mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot synced 2026-08-18 21:48:08 -04:00
Code Issues Packages 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
52 changed files with 959 additions and 3075 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code/z_actor.c
+1 -1
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;
src/code/z_demo.c
+1 -1
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;
src/code/z_scene_table.c
+1 -1
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 {