Code cleanup

Author: fenhl

ASM/build/asm_symbols.txt

@@ -6,30 +6,24 @@ extern uint8_t DOT_CONDITION;
 int32_t DemoKankyo_CutsceneFlags_Get_Hook(void* play, int16_t flag) {
     switch (DOT_CONDITION) {
         case 0: // open
-            return 1;
+        case 3: // stones
+            return has_items_for_door_of_time();
         case 1: // sot
-            return CutsceneFlags_Get(play, flag);
         case 2: // oot_sot
-            return z64_file.items[Z64_SLOT_OCARINA] == 0x08 && CutsceneFlags_Get(play, flag);
-        case 3: // stones
-            return (z64_file.quest_items & 0x1C0000) == 0x1C0000;
         case 4: // stones_sot
-            return (z64_file.quest_items & 0x1C0000) == 0x1C0000 && CutsceneFlags_Get(play, flag);
         case 5: // stones_oot_sot
-            return (z64_file.quest_items & 0x1C0000) == 0x1C0000 && z64_file.items[Z64_SLOT_OCARINA] == 0x08 && CutsceneFlags_Get(play, flag);
+            return has_items_for_door_of_time() && CutsceneFlags_Get(play, flag);
     }
 }
 
-int32_t ShouldOpenDoorOfTime(void* play, int16_t flag) {
+bool has_items_for_door_of_time() {
     switch (DOT_CONDITION) {
         case 0: // open
-            return 1;
         case 1: // sot
-            return 1;
+            return true;
         case 2: // oot_sot
             return z64_file.items[Z64_SLOT_OCARINA] == 0x08;
         case 3: // stones
-            return (z64_file.quest_items & 0x1C0000) == 0x1C0000;
         case 4: // stones_sot
             return (z64_file.quest_items & 0x1C0000) == 0x1C0000;
         case 5: // stones_oot_sot

ASM/build/bundle.o

@@ -1,3 +1,5 @@
+#include <stdbool.h>
 #include <stdint.h>
 
 int32_t DemoKankyo_CutsceneFlags_Get_Hook(void* play, int16_t flag);
+bool has_items_for_door_of_time();

ASM/build/c_symbols.txt

@@ -6,11 +6,11 @@ extern EnOkarinaTagActionFunc OVL_EnOkarinaTag_Action1;
 extern EnOkarinaTagActionFunc OVL_EnOkarinaTag_Action2;
 
 void EnOkarinaTag_ActionHook(EnOkarinaTag* this, z64_game_t* play) {
-    if(play->msgContext.ocarinaMode == 3 && this->type == 4 && !ShouldOpenDoorOfTime(play, 2)) {
+    if (play->msgContext.ocarinaMode == 3 && this->type == 4 && !has_items_for_door_of_time()) {
         play->msgContext.ocarinaMode = 4;
         this->actionFunc = resolve_overlay_addr(&OVL_EnOkarinaTag_Action1, this->actor.actor_id);
         return;
     }
     EnOkarinaTagActionFunc EnOkarinaTag_Action = resolve_overlay_addr(&OVL_EnOkarinaTag_Action2, this->actor.actor_id);
     EnOkarinaTag_Action(this, play);
-}
+}

ASM/c/door_of_time.c

@@ -4162,4 +4162,4 @@ DemoEffect_DrawJewel_AfterHook:
 .include "hacks/z_title.asm"
 .include "hacks/z_file_choose.asm"
 .include "hacks/ovl_en_changer.asm"
-.include "hacks/ovl_en_okarina_tag.asm"
+.include "hacks/ovl_en_okarina_tag.asm"

ASM/c/door_of_time.h

@@ -3,14 +3,14 @@
 .headersize(0x80A86C00 - 0xE09540)
 
 .org 0x80a87260
-;   Replaces:
-;   lui        t4,0x80a8
-;   or         t3,t2,at
-;   sw         t3,0x670(t0)
-;   addiu      t4,t4,0x72d0
-    or          t3, t2, at
-    sw          t3, 0x670(t0)
-    li          t4, EnOkarinaTag_ActionHook
+; Replaces:
+;   lui     t4,0x80a8
+;   or      t3,t2,at
+;   sw      t3,0x670(t0)
+;   addiu   t4,t4,0x72d0
+    or      t3, t2, at
+    sw      t3, 0x670(t0)
+    li      t4, EnOkarinaTag_ActionHook
 
 ; Patch relocs
 .org 0x80a8806c