mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-04 06:54:33 +00:00
Code Issues Projects Releases Wiki Activity

ovl_En_In OK (#545)

Browse source 
* Initial progress

* Further progress

* One nonmatching left

* Fix merge

* OK

* Cleanup

* Remove unused asm

* Use generated reloc

* nightFlag changes and requiredObject -> objectIdx

* Some suggestions

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Revert nightflag changes, early return after Actor_Kill, objectIdx -> ingoObjBankIndex

* Fix accidental nightFlag change in z_sram

Co-authored-by: Thar0 <maximilianc64@gmail.com>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
This commit is contained in:
Tharo 2021-01-04 19:52:36 +00:00 • committed by GitHub
parent 8cd367c43b
commit 510b3c4bd5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
52 changed files with 959 additions and 3075 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/code/z_actor.c
View file

@ -4861,7 +4861,7 @@ u32 func_80035BFC(GlobalContext* globalCtx, s16 arg1) {
}
} else {
if (!Flags_GetEventChkInf(0x18)) {
if (gSaveContext.nightFlag) {
if (gSaveContext.nightFlag != 0) {
retTextId = 0x204E;
} else if (Flags_GetInfTable(0x9A)) {
retTextId = 0x2031;

2
src/code/z_demo.c
View file

@ -364,7 +364,7 @@ void func_80064824(GlobalContext* globalCtx, CutsceneContext* csCtx, CsCmdBase*
gSaveContext.unk_1422 = 1;
break;
case 34:
if (!gSaveContext.nightFlag) {
if (gSaveContext.nightFlag == 0) {
gSaveContext.dayTime -= D_8011FB40;
} else {
gSaveContext.dayTime -= D_8011FB40 * 2;

2
src/code/z_scene_table.c
View file

@ -926,7 +926,7 @@ Gfx sDefaultDisplayList[] = {
void func_800994A0(GlobalContext* globalCtx) {
s16 computedEntranceIndex;
if (gSaveContext.nightFlag) {
if (gSaveContext.nightFlag != 0) {
if (LINK_IS_CHILD) {
computedEntranceIndex = globalCtx->nextEntranceIndex + 1;
} else {