diff options
| author | Tharo <17233964+Thar0@users.noreply.github.com> | 2021-01-04 19:52:36 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-04 14:52:36 -0500 |
| commit | 510b3c4bd5f24b9a6a3d3e49452e012e830793e9 (patch) | |
| tree | d121241dc6c992523b470c4df04a92c711357644 /src/code | |
| parent | 8cd367c43bb63076d1c8a431ef91c08ea6166ae2 (diff) | |
ovl_En_In OK (#545)
* 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>
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/z_actor.c | 2 | ||||
| -rw-r--r-- | src/code/z_demo.c | 2 | ||||
| -rw-r--r-- | src/code/z_scene_table.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/code/z_actor.c b/src/code/z_actor.c index 9a4066393..973f903c2 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -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; diff --git a/src/code/z_demo.c b/src/code/z_demo.c index 2ef4cbe52..4c6bfe529 100644 --- a/src/code/z_demo.c +++ b/src/code/z_demo.c @@ -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; diff --git a/src/code/z_scene_table.c b/src/code/z_scene_table.c index 5d10ded73..107611d22 100644 --- a/src/code/z_scene_table.c +++ b/src/code/z_scene_table.c @@ -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 { |