diff --git a/asm/d/a/d_a_alink/checkBootsOrArmorHeavy__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkBootsOrArmorHeavy__9daAlink_cCFv.s deleted file mode 100644 index af58ddb91a1..00000000000 --- a/asm/d/a/d_a_alink/checkBootsOrArmorHeavy__9daAlink_cCFv.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_800BB458: -/* 800BB458 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800BB45C 7C 08 02 A6 */ mflr r0 -/* 800BB460 90 01 00 14 */ stw r0, 0x14(r1) -/* 800BB464 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800BB468 93 C1 00 08 */ stw r30, 8(r1) -/* 800BB46C 7C 7E 1B 78 */ mr r30, r3 -/* 800BB470 3B E0 00 00 */ li r31, 0 -/* 800BB474 80 03 05 70 */ lwz r0, 0x570(r3) -/* 800BB478 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 800BB47C 40 82 00 1C */ bne lbl_800BB498 -/* 800BB480 4B FF FF 89 */ bl checkMagicArmorHeavy__9daAlink_cCFv -/* 800BB484 2C 03 00 00 */ cmpwi r3, 0 -/* 800BB488 40 82 00 10 */ bne lbl_800BB498 -/* 800BB48C A0 1E 1F BC */ lhz r0, 0x1fbc(r30) -/* 800BB490 28 00 01 9C */ cmplwi r0, 0x19c -/* 800BB494 40 82 00 08 */ bne lbl_800BB49C -lbl_800BB498: -/* 800BB498 3B E0 00 01 */ li r31, 1 -lbl_800BB49C: -/* 800BB49C 57 E3 06 3E */ clrlwi r3, r31, 0x18 -/* 800BB4A0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800BB4A4 83 C1 00 08 */ lwz r30, 8(r1) -/* 800BB4A8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800BB4AC 7C 08 03 A6 */ mtlr r0 -/* 800BB4B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 800BB4B4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkMagicArmorHeavy__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkMagicArmorHeavy__9daAlink_cCFv.s deleted file mode 100644 index 3e64d383e4f..00000000000 --- a/asm/d/a/d_a_alink/checkMagicArmorHeavy__9daAlink_cCFv.s +++ /dev/null @@ -1,22 +0,0 @@ -lbl_800BB408: -/* 800BB408 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800BB40C 7C 08 02 A6 */ mflr r0 -/* 800BB410 90 01 00 14 */ stw r0, 0x14(r1) -/* 800BB414 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800BB418 3B E0 00 00 */ li r31, 0 -/* 800BB41C 48 00 49 E1 */ bl checkMagicArmorWearAbility__9daAlink_cCFv -/* 800BB420 2C 03 00 00 */ cmpwi r3, 0 -/* 800BB424 41 82 00 1C */ beq lbl_800BB440 -/* 800BB428 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800BB42C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800BB430 A0 03 00 04 */ lhz r0, 4(r3) -/* 800BB434 28 00 00 00 */ cmplwi r0, 0 -/* 800BB438 40 82 00 08 */ bne lbl_800BB440 -/* 800BB43C 3B E0 00 01 */ li r31, 1 -lbl_800BB440: -/* 800BB440 57 E3 06 3E */ clrlwi r3, r31, 0x18 -/* 800BB444 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800BB448 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800BB44C 7C 08 03 A6 */ mtlr r0 -/* 800BB450 38 21 00 10 */ addi r1, r1, 0x10 -/* 800BB454 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkStageName__9daAlink_cFPCc.s b/asm/d/a/d_a_alink/checkStageName__9daAlink_cFPCc.s deleted file mode 100644 index 601d669cafd..00000000000 --- a/asm/d/a/d_a_alink/checkStageName__9daAlink_cFPCc.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_8009DA60: -/* 8009DA60 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009DA64 7C 08 02 A6 */ mflr r0 -/* 8009DA68 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009DA6C 7C 64 1B 78 */ mr r4, r3 -/* 8009DA70 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009DA74 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009DA78 38 63 4E 00 */ addi r3, r3, 0x4e00 -/* 8009DA7C 48 2C AF 19 */ bl strcmp -/* 8009DA80 7C 60 00 34 */ cntlzw r0, r3 -/* 8009DA84 54 03 D9 7E */ srwi r3, r0, 5 -/* 8009DA88 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009DA8C 7C 08 03 A6 */ mtlr r0 -/* 8009DA90 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009DA94 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/dComIfGp_getEventManager__Fv.s b/asm/d/a/d_a_alink/dComIfGp_getEventManager__Fv.s deleted file mode 100644 index 89d43a7b6e0..00000000000 --- a/asm/d/a/d_a_alink/dComIfGp_getEventManager__Fv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_8014134C: -/* 8014134C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80141350 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80141354 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 80141358 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/dComIfGp_getRStatus__Fv.s b/asm/d/a/d_a_alink/dComIfGp_getRStatus__Fv.s deleted file mode 100644 index 67219031a67..00000000000 --- a/asm/d/a/d_a_alink/dComIfGp_getRStatus__Fv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_800CFF3C: -/* 800CFF3C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800CFF40 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800CFF44 88 63 5E 1C */ lbz r3, 0x5e1c(r3) -/* 800CFF48 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/dComIfGp_setItemLifeCount__FfUc.s b/asm/d/a/d_a_alink/dComIfGp_setItemLifeCount__FfUc.s deleted file mode 100644 index e8e1ae42231..00000000000 --- a/asm/d/a/d_a_alink/dComIfGp_setItemLifeCount__FfUc.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_800CFFA4: -/* 800CFFA4 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800CFFA8 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800CFFAC C0 04 5D C0 */ lfs f0, 0x5dc0(r4) -/* 800CFFB0 EC 00 08 2A */ fadds f0, f0, f1 -/* 800CFFB4 D0 04 5D C0 */ stfs f0, 0x5dc0(r4) -/* 800CFFB8 98 64 5E B6 */ stb r3, 0x5eb6(r4) -/* 800CFFBC 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/dComIfGs_getLife__Fv.s b/asm/d/a/d_a_alink/dComIfGs_getLife__Fv.s deleted file mode 100644 index 34f83f27218..00000000000 --- a/asm/d/a/d_a_alink/dComIfGs_getLife__Fv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_800CFF2C: -/* 800CFF2C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800CFF30 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800CFF34 A0 63 00 02 */ lhz r3, 2(r3) -/* 800CFF38 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/dComIfGs_isItemFirstBit__FUc.s b/asm/d/a/d_a_alink/dComIfGs_isItemFirstBit__FUc.s deleted file mode 100644 index 14311067641..00000000000 --- a/asm/d/a/d_a_alink/dComIfGs_isItemFirstBit__FUc.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80141264: -/* 80141264 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80141268 7C 08 02 A6 */ mflr r0 -/* 8014126C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80141270 7C 64 1B 78 */ mr r4, r3 -/* 80141274 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80141278 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8014127C 38 63 00 CC */ addi r3, r3, 0xcc -/* 80141280 4B EF 2C 49 */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 80141284 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80141288 7C 08 03 A6 */ mtlr r0 -/* 8014128C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80141290 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setBStatus__9daAlink_cFUc.s b/asm/d/a/d_a_alink/setBStatus__9daAlink_cFUc.s deleted file mode 100644 index 00a85fb1463..00000000000 --- a/asm/d/a/d_a_alink/setBStatus__9daAlink_cFUc.s +++ /dev/null @@ -1,7 +0,0 @@ -lbl_800B3298: -/* 800B3298 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800B329C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800B32A0 98 83 5E 1D */ stb r4, 0x5e1d(r3) -/* 800B32A4 38 00 00 00 */ li r0, 0 -/* 800B32A8 98 03 5E 43 */ stb r0, 0x5e43(r3) -/* 800B32AC 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setDoStatusContinuation__9daAlink_cFUc.s b/asm/d/a/d_a_alink/setDoStatusContinuation__9daAlink_cFUc.s deleted file mode 100644 index 23fb39ed674..00000000000 --- a/asm/d/a/d_a_alink/setDoStatusContinuation__9daAlink_cFUc.s +++ /dev/null @@ -1,7 +0,0 @@ -lbl_800B3280: -/* 800B3280 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800B3284 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800B3288 98 83 5E 24 */ stb r4, 0x5e24(r3) -/* 800B328C 38 00 00 04 */ li r0, 4 -/* 800B3290 98 03 5E 4A */ stb r0, 0x5e4a(r3) -/* 800B3294 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setDoStatusEmphasys__9daAlink_cFUc.s b/asm/d/a/d_a_alink/setDoStatusEmphasys__9daAlink_cFUc.s deleted file mode 100644 index 5665297a6ec..00000000000 --- a/asm/d/a/d_a_alink/setDoStatusEmphasys__9daAlink_cFUc.s +++ /dev/null @@ -1,7 +0,0 @@ -lbl_800B3268: -/* 800B3268 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800B326C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800B3270 98 83 5E 24 */ stb r4, 0x5e24(r3) -/* 800B3274 38 00 00 02 */ li r0, 2 -/* 800B3278 98 03 5E 4A */ stb r0, 0x5e4a(r3) -/* 800B327C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setDoStatus__9daAlink_cFUc.s b/asm/d/a/d_a_alink/setDoStatus__9daAlink_cFUc.s deleted file mode 100644 index c84f71f4776..00000000000 --- a/asm/d/a/d_a_alink/setDoStatus__9daAlink_cFUc.s +++ /dev/null @@ -1,7 +0,0 @@ -lbl_800B3250: -/* 800B3250 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800B3254 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800B3258 98 83 5E 24 */ stb r4, 0x5e24(r3) -/* 800B325C 38 00 00 00 */ li r0, 0 -/* 800B3260 98 03 5E 4A */ stb r0, 0x5e4a(r3) -/* 800B3264 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setMidnaTalkStatus__9daAlink_cFUc.s b/asm/d/a/d_a_alink/setMidnaTalkStatus__9daAlink_cFUc.s deleted file mode 100644 index b6a51c569e7..00000000000 --- a/asm/d/a/d_a_alink/setMidnaTalkStatus__9daAlink_cFUc.s +++ /dev/null @@ -1,7 +0,0 @@ -lbl_800D014C: -/* 800D014C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800D0150 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800D0154 98 83 5E 33 */ stb r4, 0x5e33(r3) -/* 800D0158 38 00 00 00 */ li r0, 0 -/* 800D015C 98 03 5E 4E */ stb r0, 0x5e4e(r3) -/* 800D0160 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setRStatusEmphasys__9daAlink_cFUc.s b/asm/d/a/d_a_alink/setRStatusEmphasys__9daAlink_cFUc.s deleted file mode 100644 index 769227bc11d..00000000000 --- a/asm/d/a/d_a_alink/setRStatusEmphasys__9daAlink_cFUc.s +++ /dev/null @@ -1,7 +0,0 @@ -lbl_800B3238: -/* 800B3238 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800B323C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800B3240 98 83 5E 1C */ stb r4, 0x5e1c(r3) -/* 800B3244 38 00 00 02 */ li r0, 2 -/* 800B3248 98 03 5E 42 */ stb r0, 0x5e42(r3) -/* 800B324C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setRStatus__9daAlink_cFUc.s b/asm/d/a/d_a_alink/setRStatus__9daAlink_cFUc.s deleted file mode 100644 index bd1ebb22fe2..00000000000 --- a/asm/d/a/d_a_alink/setRStatus__9daAlink_cFUc.s +++ /dev/null @@ -1,7 +0,0 @@ -lbl_800B3220: -/* 800B3220 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800B3224 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800B3228 98 83 5E 1C */ stb r4, 0x5e1c(r3) -/* 800B322C 38 00 00 00 */ li r0, 0 -/* 800B3230 98 03 5E 42 */ stb r0, 0x5e42(r3) -/* 800B3234 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setSpecialGravity__9daAlink_cFffi.s b/asm/d/a/d_a_alink/setSpecialGravity__9daAlink_cFffi.s deleted file mode 100644 index afe0b98c0bf..00000000000 --- a/asm/d/a/d_a_alink/setSpecialGravity__9daAlink_cFffi.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_800BB770: -/* 800BB770 2C 04 00 00 */ cmpwi r4, 0 -/* 800BB774 41 82 00 14 */ beq lbl_800BB788 -/* 800BB778 80 03 05 7C */ lwz r0, 0x57c(r3) -/* 800BB77C 54 00 04 A0 */ rlwinm r0, r0, 0, 0x12, 0x10 -/* 800BB780 90 03 05 7C */ stw r0, 0x57c(r3) -/* 800BB784 48 00 00 10 */ b lbl_800BB794 -lbl_800BB788: -/* 800BB788 80 03 05 7C */ lwz r0, 0x57c(r3) -/* 800BB78C 60 00 40 00 */ ori r0, r0, 0x4000 -/* 800BB790 90 03 05 7C */ stw r0, 0x57c(r3) -lbl_800BB794: -/* 800BB794 D0 23 05 30 */ stfs f1, 0x530(r3) -/* 800BB798 D0 43 05 34 */ stfs f2, 0x534(r3) -/* 800BB79C 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/ct__13dComIfG_inf_cFv.s b/asm/d/com/d_com_inf_game/ct__13dComIfG_inf_cFv.s deleted file mode 100644 index e48bc3d4734..00000000000 --- a/asm/d/com/d_com_inf_game/ct__13dComIfG_inf_cFv.s +++ /dev/null @@ -1,29 +0,0 @@ -lbl_8002CBE4: -/* 8002CBE4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002CBE8 7C 08 02 A6 */ mflr r0 -/* 8002CBEC 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002CBF0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8002CBF4 7C 7F 1B 78 */ mr r31, r3 -/* 8002CBF8 38 00 00 FF */ li r0, 0xff -/* 8002CBFC 3C 7F 00 02 */ addis r3, r31, 2 -/* 8002CC00 98 03 DD F8 */ stb r0, -0x2208(r3) -/* 8002CC04 38 7F 0F 38 */ addi r3, r31, 0xf38 -/* 8002CC08 4B FF E5 D5 */ bl ct__14dComIfG_play_cFv -/* 8002CC0C 38 80 00 00 */ li r4, 0 -/* 8002CC10 3C 7F 00 02 */ addis r3, r31, 2 -/* 8002CC14 98 83 DD F9 */ stb r4, -0x2207(r3) -/* 8002CC18 38 00 FF FF */ li r0, -1 -/* 8002CC1C 98 03 DD FA */ stb r0, -0x2206(r3) -/* 8002CC20 98 83 DD FB */ stb r4, -0x2205(r3) -/* 8002CC24 90 83 DE 00 */ stw r4, -0x2200(r3) -/* 8002CC28 90 83 DE 04 */ stw r4, -0x21fc(r3) -/* 8002CC2C 98 83 DE 08 */ stb r4, -0x21f8(r3) -/* 8002CC30 98 83 DD FC */ stb r4, -0x2204(r3) -/* 8002CC34 38 00 00 FF */ li r0, 0xff -/* 8002CC38 98 03 DE 09 */ stb r0, -0x21f7(r3) -/* 8002CC3C 98 03 DE 0A */ stb r0, -0x21f6(r3) -/* 8002CC40 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8002CC44 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8002CC48 7C 08 03 A6 */ mtlr r0 -/* 8002CC4C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002CC50 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/dComIfG_TimerDeleteCheck__Fi.s b/asm/d/com/d_com_inf_game/dComIfG_TimerDeleteCheck__Fi.s deleted file mode 100644 index df387be802d..00000000000 --- a/asm/d/com/d_com_inf_game/dComIfG_TimerDeleteCheck__Fi.s +++ /dev/null @@ -1,32 +0,0 @@ -lbl_8002F72C: -/* 8002F72C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002F730 7C 08 02 A6 */ mflr r0 -/* 8002F734 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002F738 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8002F73C 93 C1 00 08 */ stw r30, 8(r1) -/* 8002F740 7C 7E 1B 78 */ mr r30, r3 -/* 8002F744 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002F748 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002F74C 3B E3 0F 38 */ addi r31, r3, 0xf38 -/* 8002F750 7F E3 FB 78 */ mr r3, r31 -/* 8002F754 4B FF D4 69 */ bl getTimerMode__14dComIfG_play_cFv -/* 8002F758 7C 1E 18 00 */ cmpw r30, r3 -/* 8002F75C 40 82 00 24 */ bne lbl_8002F780 -/* 8002F760 7F E3 FB 78 */ mr r3, r31 -/* 8002F764 4B FF D4 79 */ bl getTimerPtr__14dComIfG_play_cFv -/* 8002F768 28 03 00 00 */ cmplwi r3, 0 -/* 8002F76C 41 82 00 0C */ beq lbl_8002F778 -/* 8002F770 48 22 DD B5 */ bl deleteCheck__8dTimer_cFv -/* 8002F774 48 00 00 10 */ b lbl_8002F784 -lbl_8002F778: -/* 8002F778 38 60 00 00 */ li r3, 0 -/* 8002F77C 48 00 00 08 */ b lbl_8002F784 -lbl_8002F780: -/* 8002F780 38 60 00 00 */ li r3, 0 -lbl_8002F784: -/* 8002F784 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8002F788 83 C1 00 08 */ lwz r30, 8(r1) -/* 8002F78C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8002F790 7C 08 03 A6 */ mtlr r0 -/* 8002F794 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002F798 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/dComIfG_TimerDeleteRequest__Fi.s b/asm/d/com/d_com_inf_game/dComIfG_TimerDeleteRequest__Fi.s deleted file mode 100644 index c02f5193c8a..00000000000 --- a/asm/d/com/d_com_inf_game/dComIfG_TimerDeleteRequest__Fi.s +++ /dev/null @@ -1,33 +0,0 @@ -lbl_8002F79C: -/* 8002F79C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002F7A0 7C 08 02 A6 */ mflr r0 -/* 8002F7A4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002F7A8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8002F7AC 93 C1 00 08 */ stw r30, 8(r1) -/* 8002F7B0 7C 7E 1B 78 */ mr r30, r3 -/* 8002F7B4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002F7B8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002F7BC 3B E3 0F 38 */ addi r31, r3, 0xf38 -/* 8002F7C0 7F E3 FB 78 */ mr r3, r31 -/* 8002F7C4 4B FF D3 F9 */ bl getTimerMode__14dComIfG_play_cFv -/* 8002F7C8 7C 1E 18 00 */ cmpw r30, r3 -/* 8002F7CC 40 82 00 28 */ bne lbl_8002F7F4 -/* 8002F7D0 7F E3 FB 78 */ mr r3, r31 -/* 8002F7D4 4B FF D4 09 */ bl getTimerPtr__14dComIfG_play_cFv -/* 8002F7D8 28 03 00 00 */ cmplwi r3, 0 -/* 8002F7DC 41 82 00 10 */ beq lbl_8002F7EC -/* 8002F7E0 48 22 E2 01 */ bl deleteRequest__8dTimer_cFv -/* 8002F7E4 38 60 00 01 */ li r3, 1 -/* 8002F7E8 48 00 00 10 */ b lbl_8002F7F8 -lbl_8002F7EC: -/* 8002F7EC 38 60 00 00 */ li r3, 0 -/* 8002F7F0 48 00 00 08 */ b lbl_8002F7F8 -lbl_8002F7F4: -/* 8002F7F4 38 60 00 00 */ li r3, 0 -lbl_8002F7F8: -/* 8002F7F8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8002F7FC 83 C1 00 08 */ lwz r30, 8(r1) -/* 8002F800 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8002F804 7C 08 03 A6 */ mtlr r0 -/* 8002F808 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002F80C 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/dComIfG_TimerEnd__Fii.s b/asm/d/com/d_com_inf_game/dComIfG_TimerEnd__Fii.s deleted file mode 100644 index 175df5d03c6..00000000000 --- a/asm/d/com/d_com_inf_game/dComIfG_TimerEnd__Fii.s +++ /dev/null @@ -1,35 +0,0 @@ -lbl_8002F6B0: -/* 8002F6B0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8002F6B4 7C 08 02 A6 */ mflr r0 -/* 8002F6B8 90 01 00 24 */ stw r0, 0x24(r1) -/* 8002F6BC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8002F6C0 48 33 2B 1D */ bl _savegpr_29 -/* 8002F6C4 7C 7D 1B 78 */ mr r29, r3 -/* 8002F6C8 7C 9E 23 78 */ mr r30, r4 -/* 8002F6CC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002F6D0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002F6D4 3B E3 0F 38 */ addi r31, r3, 0xf38 -/* 8002F6D8 7F E3 FB 78 */ mr r3, r31 -/* 8002F6DC 4B FF D4 E1 */ bl getTimerMode__14dComIfG_play_cFv -/* 8002F6E0 7C 1D 18 00 */ cmpw r29, r3 -/* 8002F6E4 40 82 00 2C */ bne lbl_8002F710 -/* 8002F6E8 7F E3 FB 78 */ mr r3, r31 -/* 8002F6EC 4B FF D4 F1 */ bl getTimerPtr__14dComIfG_play_cFv -/* 8002F6F0 28 03 00 00 */ cmplwi r3, 0 -/* 8002F6F4 41 82 00 14 */ beq lbl_8002F708 -/* 8002F6F8 7F C4 F3 78 */ mr r4, r30 -/* 8002F6FC 48 22 E2 25 */ bl end__8dTimer_cFi -/* 8002F700 38 60 00 01 */ li r3, 1 -/* 8002F704 48 00 00 10 */ b lbl_8002F714 -lbl_8002F708: -/* 8002F708 38 60 00 00 */ li r3, 0 -/* 8002F70C 48 00 00 08 */ b lbl_8002F714 -lbl_8002F710: -/* 8002F710 38 60 00 00 */ li r3, 0 -lbl_8002F714: -/* 8002F714 39 61 00 20 */ addi r11, r1, 0x20 -/* 8002F718 48 33 2B 11 */ bl _restgpr_29 -/* 8002F71C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8002F720 7C 08 03 A6 */ mtlr r0 -/* 8002F724 38 21 00 20 */ addi r1, r1, 0x20 -/* 8002F728 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/dComIfG_TimerReStart__Fi.s b/asm/d/com/d_com_inf_game/dComIfG_TimerReStart__Fi.s deleted file mode 100644 index 181e44e5983..00000000000 --- a/asm/d/com/d_com_inf_game/dComIfG_TimerReStart__Fi.s +++ /dev/null @@ -1,34 +0,0 @@ -lbl_8002F638: -/* 8002F638 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002F63C 7C 08 02 A6 */ mflr r0 -/* 8002F640 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002F644 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8002F648 93 C1 00 08 */ stw r30, 8(r1) -/* 8002F64C 7C 7E 1B 78 */ mr r30, r3 -/* 8002F650 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002F654 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002F658 3B E3 0F 38 */ addi r31, r3, 0xf38 -/* 8002F65C 7F E3 FB 78 */ mr r3, r31 -/* 8002F660 4B FF D5 5D */ bl getTimerMode__14dComIfG_play_cFv -/* 8002F664 7C 1E 18 00 */ cmpw r30, r3 -/* 8002F668 40 82 00 2C */ bne lbl_8002F694 -/* 8002F66C 7F E3 FB 78 */ mr r3, r31 -/* 8002F670 4B FF D5 6D */ bl getTimerPtr__14dComIfG_play_cFv -/* 8002F674 28 03 00 00 */ cmplwi r3, 0 -/* 8002F678 41 82 00 14 */ beq lbl_8002F68C -/* 8002F67C 38 80 00 04 */ li r4, 4 -/* 8002F680 48 22 E1 ED */ bl restart__8dTimer_cFUc -/* 8002F684 38 60 00 01 */ li r3, 1 -/* 8002F688 48 00 00 10 */ b lbl_8002F698 -lbl_8002F68C: -/* 8002F68C 38 60 00 00 */ li r3, 0 -/* 8002F690 48 00 00 08 */ b lbl_8002F698 -lbl_8002F694: -/* 8002F694 38 60 00 00 */ li r3, 0 -lbl_8002F698: -/* 8002F698 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8002F69C 83 C1 00 08 */ lwz r30, 8(r1) -/* 8002F6A0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8002F6A4 7C 08 03 A6 */ mtlr r0 -/* 8002F6A8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002F6AC 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/dComIfG_TimerStart__Fis.s b/asm/d/com/d_com_inf_game/dComIfG_TimerStart__Fis.s deleted file mode 100644 index 41eb985d867..00000000000 --- a/asm/d/com/d_com_inf_game/dComIfG_TimerStart__Fis.s +++ /dev/null @@ -1,43 +0,0 @@ -lbl_8002F52C: -/* 8002F52C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8002F530 7C 08 02 A6 */ mflr r0 -/* 8002F534 90 01 00 24 */ stw r0, 0x24(r1) -/* 8002F538 39 61 00 20 */ addi r11, r1, 0x20 -/* 8002F53C 48 33 2C A1 */ bl _savegpr_29 -/* 8002F540 7C 7D 1B 78 */ mr r29, r3 -/* 8002F544 7C 9E 23 78 */ mr r30, r4 -/* 8002F548 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002F54C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002F550 3B E3 0F 38 */ addi r31, r3, 0xf38 -/* 8002F554 7F E3 FB 78 */ mr r3, r31 -/* 8002F558 4B FF D6 65 */ bl getTimerMode__14dComIfG_play_cFv -/* 8002F55C 7C 1D 18 00 */ cmpw r29, r3 -/* 8002F560 40 82 00 44 */ bne lbl_8002F5A4 -/* 8002F564 7F E3 FB 78 */ mr r3, r31 -/* 8002F568 4B FF D6 75 */ bl getTimerPtr__14dComIfG_play_cFv -/* 8002F56C 28 03 00 00 */ cmplwi r3, 0 -/* 8002F570 41 82 00 2C */ beq lbl_8002F59C -/* 8002F574 7F C0 07 35 */ extsh. r0, r30 -/* 8002F578 40 82 00 10 */ bne lbl_8002F588 -/* 8002F57C 7F A4 EB 78 */ mr r4, r29 -/* 8002F580 48 22 DF B9 */ bl start__8dTimer_cFi -/* 8002F584 48 00 00 10 */ b lbl_8002F594 -lbl_8002F588: -/* 8002F588 7F A4 EB 78 */ mr r4, r29 -/* 8002F58C 7F C5 F3 78 */ mr r5, r30 -/* 8002F590 48 22 E0 89 */ bl start__8dTimer_cFis -lbl_8002F594: -/* 8002F594 38 60 00 01 */ li r3, 1 -/* 8002F598 48 00 00 10 */ b lbl_8002F5A8 -lbl_8002F59C: -/* 8002F59C 38 60 00 00 */ li r3, 0 -/* 8002F5A0 48 00 00 08 */ b lbl_8002F5A8 -lbl_8002F5A4: -/* 8002F5A4 38 60 00 00 */ li r3, 0 -lbl_8002F5A8: -/* 8002F5A8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8002F5AC 48 33 2C 7D */ bl _restgpr_29 -/* 8002F5B0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8002F5B4 7C 08 03 A6 */ mtlr r0 -/* 8002F5B8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8002F5BC 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/dComIfG_TimerStop__Fi.s b/asm/d/com/d_com_inf_game/dComIfG_TimerStop__Fi.s deleted file mode 100644 index 5b3305e2e8f..00000000000 --- a/asm/d/com/d_com_inf_game/dComIfG_TimerStop__Fi.s +++ /dev/null @@ -1,34 +0,0 @@ -lbl_8002F5C0: -/* 8002F5C0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002F5C4 7C 08 02 A6 */ mflr r0 -/* 8002F5C8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002F5CC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8002F5D0 93 C1 00 08 */ stw r30, 8(r1) -/* 8002F5D4 7C 7E 1B 78 */ mr r30, r3 -/* 8002F5D8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002F5DC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002F5E0 3B E3 0F 38 */ addi r31, r3, 0xf38 -/* 8002F5E4 7F E3 FB 78 */ mr r3, r31 -/* 8002F5E8 4B FF D5 D5 */ bl getTimerMode__14dComIfG_play_cFv -/* 8002F5EC 7C 1E 18 00 */ cmpw r30, r3 -/* 8002F5F0 40 82 00 2C */ bne lbl_8002F61C -/* 8002F5F4 7F E3 FB 78 */ mr r3, r31 -/* 8002F5F8 4B FF D5 E5 */ bl getTimerPtr__14dComIfG_play_cFv -/* 8002F5FC 28 03 00 00 */ cmplwi r3, 0 -/* 8002F600 41 82 00 14 */ beq lbl_8002F614 -/* 8002F604 38 80 00 04 */ li r4, 4 -/* 8002F608 48 22 E1 E1 */ bl stop__8dTimer_cFUc -/* 8002F60C 38 60 00 01 */ li r3, 1 -/* 8002F610 48 00 00 10 */ b lbl_8002F620 -lbl_8002F614: -/* 8002F614 38 60 00 00 */ li r3, 0 -/* 8002F618 48 00 00 08 */ b lbl_8002F620 -lbl_8002F61C: -/* 8002F61C 38 60 00 00 */ li r3, 0 -lbl_8002F620: -/* 8002F620 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8002F624 83 C1 00 08 */ lwz r30, 8(r1) -/* 8002F628 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8002F62C 7C 08 03 A6 */ mtlr r0 -/* 8002F630 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002F634 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/dComIfG_getRoomArcName__Fi.s b/asm/d/com/d_com_inf_game/dComIfG_getRoomArcName__Fi.s deleted file mode 100644 index 7a74ec4e456..00000000000 --- a/asm/d/com/d_com_inf_game/dComIfG_getRoomArcName__Fi.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_8002F4BC: -/* 8002F4BC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002F4C0 7C 08 02 A6 */ mflr r0 -/* 8002F4C4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002F4C8 7C 65 1B 78 */ mr r5, r3 -/* 8002F4CC 3C 60 80 42 */ lis r3, buf@ha /* 0x80423FD0@ha */ -/* 8002F4D0 38 63 3F D0 */ addi r3, r3, buf@l /* 0x80423FD0@l */ -/* 8002F4D4 3C 80 80 38 */ lis r4, d_com_d_com_inf_game__stringBase0@ha /* 0x80378F38@ha */ -/* 8002F4D8 38 84 8F 38 */ addi r4, r4, d_com_d_com_inf_game__stringBase0@l /* 0x80378F38@l */ -/* 8002F4DC 38 84 01 6E */ addi r4, r4, 0x16e -/* 8002F4E0 4C C6 31 82 */ crclr 6 -/* 8002F4E4 48 33 6F F9 */ bl sprintf -/* 8002F4E8 3C 60 80 42 */ lis r3, buf@ha /* 0x80423FD0@ha */ -/* 8002F4EC 38 63 3F D0 */ addi r3, r3, buf@l /* 0x80423FD0@l */ -/* 8002F4F0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8002F4F4 7C 08 03 A6 */ mtlr r0 -/* 8002F4F8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002F4FC 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/dComIfG_getTrigA__FUl.s b/asm/d/com/d_com_inf_game/dComIfG_getTrigA__FUl.s deleted file mode 100644 index 01b06f5e0ac..00000000000 --- a/asm/d/com/d_com_inf_game/dComIfG_getTrigA__FUl.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_8002E9D4: -/* 8002E9D4 54 64 30 32 */ slwi r4, r3, 6 -/* 8002E9D8 3C 60 80 3E */ lis r3, m_cpadInfo__8mDoCPd_c@ha /* 0x803DD2E8@ha */ -/* 8002E9DC 38 03 D2 E8 */ addi r0, r3, m_cpadInfo__8mDoCPd_c@l /* 0x803DD2E8@l */ -/* 8002E9E0 7C 60 22 14 */ add r3, r0, r4 -/* 8002E9E4 80 03 00 34 */ lwz r0, 0x34(r3) -/* 8002E9E8 54 03 05 EE */ rlwinm r3, r0, 0, 0x17, 0x17 -/* 8002E9EC 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/dComIfGp_SelectWarpPt_get__Fv.s b/asm/d/com/d_com_inf_game/dComIfGp_SelectWarpPt_get__Fv.s deleted file mode 100644 index 65e8f74c8bf..00000000000 --- a/asm/d/com/d_com_inf_game/dComIfGp_SelectWarpPt_get__Fv.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_8002FAD4: -/* 8002FAD4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002FAD8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002FADC 3C 63 00 02 */ addis r3, r3, 2 -/* 8002FAE0 88 63 DE 0A */ lbz r3, -0x21f6(r3) -/* 8002FAE4 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/dComIfGp_SelectWarpPt_set__FUc.s b/asm/d/com/d_com_inf_game/dComIfGp_SelectWarpPt_set__FUc.s deleted file mode 100644 index c2b5959b263..00000000000 --- a/asm/d/com/d_com_inf_game/dComIfGp_SelectWarpPt_set__FUc.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_8002FAAC: -/* 8002FAAC 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002FAB0 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002FAB4 3C 84 00 02 */ addis r4, r4, 2 -/* 8002FAB8 98 64 DE 0A */ stb r3, -0x21f6(r4) -/* 8002FABC 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/dComIfGp_TargetWarpPt_get__Fv.s b/asm/d/com/d_com_inf_game/dComIfGp_TargetWarpPt_get__Fv.s deleted file mode 100644 index d83e71eb270..00000000000 --- a/asm/d/com/d_com_inf_game/dComIfGp_TargetWarpPt_get__Fv.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_8002FAC0: -/* 8002FAC0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002FAC4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002FAC8 3C 63 00 02 */ addis r3, r3, 2 -/* 8002FACC 88 63 DE 09 */ lbz r3, -0x21f7(r3) -/* 8002FAD0 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/dComIfGp_TargetWarpPt_set__FUc.s b/asm/d/com/d_com_inf_game/dComIfGp_TargetWarpPt_set__FUc.s deleted file mode 100644 index 87569fde7e4..00000000000 --- a/asm/d/com/d_com_inf_game/dComIfGp_TargetWarpPt_set__FUc.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_8002FA98: -/* 8002FA98 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002FA9C 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002FAA0 3C 84 00 02 */ addis r4, r4, 2 -/* 8002FAA4 98 64 DE 09 */ stb r3, -0x21f7(r4) -/* 8002FAA8 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/dComIfGp_TransportWarp_check__Fv.s b/asm/d/com/d_com_inf_game/dComIfGp_TransportWarp_check__Fv.s deleted file mode 100644 index ba171e942df..00000000000 --- a/asm/d/com/d_com_inf_game/dComIfGp_TransportWarp_check__Fv.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_8002FAE8: -/* 8002FAE8 38 60 00 00 */ li r3, 0 -/* 8002FAEC 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002FAF0 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002FAF4 3C 84 00 02 */ addis r4, r4, 2 -/* 8002FAF8 88 A4 DE 09 */ lbz r5, -0x21f7(r4) -/* 8002FAFC 28 05 00 FF */ cmplwi r5, 0xff -/* 8002FB00 4D 82 00 20 */ beqlr -/* 8002FB04 88 04 DE 0A */ lbz r0, -0x21f6(r4) -/* 8002FB08 28 00 00 FF */ cmplwi r0, 0xff -/* 8002FB0C 4D 82 00 20 */ beqlr -/* 8002FB10 7C 05 00 40 */ cmplw r5, r0 -/* 8002FB14 4C 82 00 20 */ bnelr -/* 8002FB18 38 60 00 01 */ li r3, 1 -/* 8002FB1C 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/dComIfGp_addSelectItemNum__Fis.s b/asm/d/com/d_com_inf_game/dComIfGp_addSelectItemNum__Fis.s deleted file mode 100644 index ee8e419d3a5..00000000000 --- a/asm/d/com/d_com_inf_game/dComIfGp_addSelectItemNum__Fis.s +++ /dev/null @@ -1,58 +0,0 @@ -lbl_8002E83C: -/* 8002E83C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002E840 7C 08 02 A6 */ mflr r0 -/* 8002E844 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002E848 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8002E84C 93 C1 00 08 */ stw r30, 8(r1) -/* 8002E850 7C 7E 1B 78 */ mr r30, r3 -/* 8002E854 7C 9F 23 78 */ mr r31, r4 -/* 8002E858 4B FF F6 C5 */ bl dComIfGp_getSelectItem__Fi -/* 8002E85C 38 03 FF 90 */ addi r0, r3, -112 -/* 8002E860 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 8002E864 28 00 00 02 */ cmplwi r0, 2 -/* 8002E868 40 81 00 10 */ ble lbl_8002E878 -/* 8002E86C 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8002E870 28 00 00 59 */ cmplwi r0, 0x59 -/* 8002E874 40 82 00 2C */ bne lbl_8002E8A0 -lbl_8002E878: -/* 8002E878 7F C3 F3 78 */ mr r3, r30 -/* 8002E87C 4B FF F4 C1 */ bl dComIfGs_getSelectMixItemNoArrowIndex__Fi -/* 8002E880 38 03 FF F1 */ addi r0, r3, -15 -/* 8002E884 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 8002E888 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002E88C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002E890 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 8002E894 7F E5 FB 78 */ mr r5, r31 -/* 8002E898 4B FF CA D5 */ bl setItemBombNumCount__14dComIfG_play_cFUcs -/* 8002E89C 48 00 00 5C */ b lbl_8002E8F8 -lbl_8002E8A0: -/* 8002E8A0 28 00 00 4B */ cmplwi r0, 0x4b -/* 8002E8A4 40 82 00 1C */ bne lbl_8002E8C0 -/* 8002E8A8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002E8AC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002E8B0 A8 03 5D F6 */ lha r0, 0x5df6(r3) -/* 8002E8B4 7C 00 FA 14 */ add r0, r0, r31 -/* 8002E8B8 B0 03 5D F6 */ sth r0, 0x5df6(r3) -/* 8002E8BC 48 00 00 3C */ b lbl_8002E8F8 -lbl_8002E8C0: -/* 8002E8C0 28 00 00 76 */ cmplwi r0, 0x76 -/* 8002E8C4 40 82 00 34 */ bne lbl_8002E8F8 -/* 8002E8C8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002E8CC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002E8D0 7F C4 F3 78 */ mr r4, r30 -/* 8002E8D4 48 00 41 89 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi -/* 8002E8D8 7C 64 1B 78 */ mr r4, r3 -/* 8002E8DC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002E8E0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002E8E4 38 63 00 EC */ addi r3, r3, 0xec -/* 8002E8E8 38 04 FF F5 */ addi r0, r4, -11 -/* 8002E8EC 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 8002E8F0 7F E5 FB 78 */ mr r5, r31 -/* 8002E8F4 48 00 56 A9 */ bl addBottleNum__24dSv_player_item_record_cFUcs -lbl_8002E8F8: -/* 8002E8F8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8002E8FC 83 C1 00 08 */ lwz r30, 8(r1) -/* 8002E900 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8002E904 7C 08 03 A6 */ mtlr r0 -/* 8002E908 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002E90C 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/dComIfGp_checkEmptySubHeap2D__Fv.s b/asm/d/com/d_com_inf_game/dComIfGp_checkEmptySubHeap2D__Fv.s deleted file mode 100644 index 88ac607100f..00000000000 --- a/asm/d/com/d_com_inf_game/dComIfGp_checkEmptySubHeap2D__Fv.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_8002E348: -/* 8002E348 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002E34C 38 A3 61 C0 */ addi r5, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002E350 88 05 5E 8F */ lbz r0, 0x5e8f(r5) -/* 8002E354 28 00 00 05 */ cmplwi r0, 5 -/* 8002E358 40 82 00 28 */ bne lbl_8002E380 -/* 8002E35C 38 60 00 00 */ li r3, 0 -/* 8002E360 38 00 00 02 */ li r0, 2 -/* 8002E364 7C 09 03 A6 */ mtctr r0 -lbl_8002E368: -/* 8002E368 7C 85 1A 14 */ add r4, r5, r3 -/* 8002E36C 88 04 5E 90 */ lbz r0, 0x5e90(r4) -/* 8002E370 28 00 00 00 */ cmplwi r0, 0 -/* 8002E374 4D 82 00 20 */ beqlr -/* 8002E378 38 63 00 01 */ addi r3, r3, 1 -/* 8002E37C 42 00 FF EC */ bdnz lbl_8002E368 -lbl_8002E380: -/* 8002E380 38 60 FF FF */ li r3, -1 -/* 8002E384 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/dComIfGp_checkMapShow__Fv.s b/asm/d/com/d_com_inf_game/dComIfGp_checkMapShow__Fv.s deleted file mode 100644 index 6f39756676a..00000000000 --- a/asm/d/com/d_com_inf_game/dComIfGp_checkMapShow__Fv.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_8002E0A8: -/* 8002E0A8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002E0AC 7C 08 02 A6 */ mflr r0 -/* 8002E0B0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002E0B4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002E0B8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002E0BC 38 63 07 F0 */ addi r3, r3, 0x7f0 -/* 8002E0C0 38 80 1D 01 */ li r4, 0x1d01 -/* 8002E0C4 48 00 68 F9 */ bl isEventBit__11dSv_event_cCFUs -/* 8002E0C8 7C 60 00 34 */ cntlzw r0, r3 -/* 8002E0CC 54 03 D9 7E */ srwi r3, r0, 5 -/* 8002E0D0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8002E0D4 7C 08 03 A6 */ mtlr r0 -/* 8002E0D8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002E0DC 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/dComIfGp_createSubExpHeap2D__Fv.s b/asm/d/com/d_com_inf_game/dComIfGp_createSubExpHeap2D__Fv.s deleted file mode 100644 index 81119f85bea..00000000000 --- a/asm/d/com/d_com_inf_game/dComIfGp_createSubExpHeap2D__Fv.s +++ /dev/null @@ -1,47 +0,0 @@ -lbl_8002E22C: -/* 8002E22C 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 8002E230 7C 08 02 A6 */ mflr r0 -/* 8002E234 90 01 00 34 */ stw r0, 0x34(r1) -/* 8002E238 39 61 00 30 */ addi r11, r1, 0x30 -/* 8002E23C 48 33 3F 95 */ bl _savegpr_26 -/* 8002E240 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002E244 3B A3 61 C0 */ addi r29, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002E248 80 7D 5E BC */ lwz r3, 0x5ebc(r29) -/* 8002E24C 48 2A 05 39 */ bl getTotalFreeSize__7JKRHeapFv -/* 8002E250 C8 22 83 10 */ lfd f1, lit_6337(r2) -/* 8002E254 6C 60 80 00 */ xoris r0, r3, 0x8000 -/* 8002E258 90 01 00 0C */ stw r0, 0xc(r1) -/* 8002E25C 3C 00 43 30 */ lis r0, 0x4330 -/* 8002E260 90 01 00 08 */ stw r0, 8(r1) -/* 8002E264 C8 01 00 08 */ lfd f0, 8(r1) -/* 8002E268 EC 20 08 28 */ fsubs f1, f0, f1 -/* 8002E26C C0 02 83 08 */ lfs f0, lit_6335(r2) -/* 8002E270 EC 20 00 72 */ fmuls f1, f0, f1 -/* 8002E274 48 33 3E 39 */ bl __cvt_fp2unsigned -/* 8002E278 7C 7B 1B 78 */ mr r27, r3 -/* 8002E27C 3B 40 00 00 */ li r26, 0 -/* 8002E280 3B E0 00 00 */ li r31, 0 -/* 8002E284 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002E288 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -lbl_8002E28C: -/* 8002E28C 7C 7E FA 14 */ add r3, r30, r31 -/* 8002E290 3B 83 5E C0 */ addi r28, r3, 0x5ec0 -/* 8002E294 80 03 5E C0 */ lwz r0, 0x5ec0(r3) -/* 8002E298 28 00 00 00 */ cmplwi r0, 0 -/* 8002E29C 40 82 00 18 */ bne lbl_8002E2B4 -/* 8002E2A0 7F 63 DB 78 */ mr r3, r27 -/* 8002E2A4 80 9D 5E BC */ lwz r4, 0x5ebc(r29) -/* 8002E2A8 38 A0 00 00 */ li r5, 0 -/* 8002E2AC 48 2A 0B 81 */ bl create__10JKRExpHeapFUlP7JKRHeapb -/* 8002E2B0 90 7C 00 00 */ stw r3, 0(r28) -lbl_8002E2B4: -/* 8002E2B4 3B 5A 00 01 */ addi r26, r26, 1 -/* 8002E2B8 2C 1A 00 02 */ cmpwi r26, 2 -/* 8002E2BC 3B FF 00 04 */ addi r31, r31, 4 -/* 8002E2C0 41 80 FF CC */ blt lbl_8002E28C -/* 8002E2C4 39 61 00 30 */ addi r11, r1, 0x30 -/* 8002E2C8 48 33 3F 55 */ bl _restgpr_26 -/* 8002E2CC 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8002E2D0 7C 08 03 A6 */ mtlr r0 -/* 8002E2D4 38 21 00 30 */ addi r1, r1, 0x30 -/* 8002E2D8 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/dComIfGp_destroySubExpHeap2D__Fv.s b/asm/d/com/d_com_inf_game/dComIfGp_destroySubExpHeap2D__Fv.s deleted file mode 100644 index 02c0c68feb9..00000000000 --- a/asm/d/com/d_com_inf_game/dComIfGp_destroySubExpHeap2D__Fv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_8002E2DC: -/* 8002E2DC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8002E2E0 7C 08 02 A6 */ mflr r0 -/* 8002E2E4 90 01 00 24 */ stw r0, 0x24(r1) -/* 8002E2E8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8002E2EC 48 33 3E E9 */ bl _savegpr_27 -/* 8002E2F0 3B 60 00 00 */ li r27, 0 -/* 8002E2F4 3B E0 00 00 */ li r31, 0 -/* 8002E2F8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002E2FC 3B A3 61 C0 */ addi r29, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002E300 7F FE FB 78 */ mr r30, r31 -lbl_8002E304: -/* 8002E304 7C 7D FA 14 */ add r3, r29, r31 -/* 8002E308 3B 83 5E C0 */ addi r28, r3, 0x5ec0 -/* 8002E30C 80 63 5E C0 */ lwz r3, 0x5ec0(r3) -/* 8002E310 28 03 00 00 */ cmplwi r3, 0 -/* 8002E314 41 82 00 0C */ beq lbl_8002E320 -/* 8002E318 4B FE 0E 95 */ bl mDoExt_destroyExpHeap__FP10JKRExpHeap -/* 8002E31C 93 DC 00 00 */ stw r30, 0(r28) -lbl_8002E320: -/* 8002E320 3B 7B 00 01 */ addi r27, r27, 1 -/* 8002E324 2C 1B 00 02 */ cmpwi r27, 2 -/* 8002E328 3B FF 00 04 */ addi r31, r31, 4 -/* 8002E32C 41 80 FF D8 */ blt lbl_8002E304 -/* 8002E330 39 61 00 20 */ addi r11, r1, 0x20 -/* 8002E334 48 33 3E ED */ bl _restgpr_27 -/* 8002E338 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8002E33C 7C 08 03 A6 */ mtlr r0 -/* 8002E340 38 21 00 20 */ addi r1, r1, 0x20 -/* 8002E344 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/dComIfGp_getReverb__Fi.s b/asm/d/com/d_com_inf_game/dComIfGp_getReverb__Fi.s deleted file mode 100644 index 159a401d961..00000000000 --- a/asm/d/com/d_com_inf_game/dComIfGp_getReverb__Fi.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_8002D06C: -/* 8002D06C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002D070 7C 08 02 A6 */ mflr r0 -/* 8002D074 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002D078 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8002D07C 7C 7F 1B 78 */ mr r31, r3 -/* 8002D080 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002D084 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002D088 85 83 4E 20 */ lwzu r12, 0x4e20(r3) -/* 8002D08C 81 8C 00 30 */ lwz r12, 0x30(r12) -/* 8002D090 7D 89 03 A6 */ mtctr r12 -/* 8002D094 4E 80 04 21 */ bctrl -/* 8002D098 7F E4 FB 78 */ mr r4, r31 -/* 8002D09C 4B FF 8D A5 */ bl dStage_roomRead_dt_c_GetReverbStage__FR14roomRead_classi -/* 8002D0A0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8002D0A4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8002D0A8 7C 08 03 A6 */ mtlr r0 -/* 8002D0AC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002D0B0 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/dComIfGp_getSelectItemMaxNum__Fi.s b/asm/d/com/d_com_inf_game/dComIfGp_getSelectItemMaxNum__Fi.s deleted file mode 100644 index efec81509d3..00000000000 --- a/asm/d/com/d_com_inf_game/dComIfGp_getSelectItemMaxNum__Fi.s +++ /dev/null @@ -1,41 +0,0 @@ -lbl_8002E688: -/* 8002E688 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002E68C 7C 08 02 A6 */ mflr r0 -/* 8002E690 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002E694 4B FF F8 89 */ bl dComIfGp_getSelectItem__Fi -/* 8002E698 7C 64 1B 78 */ mr r4, r3 -/* 8002E69C 38 60 00 00 */ li r3, 0 -/* 8002E6A0 54 85 06 3E */ clrlwi r5, r4, 0x18 -/* 8002E6A4 28 05 00 50 */ cmplwi r5, 0x50 -/* 8002E6A8 40 82 00 0C */ bne lbl_8002E6B4 -/* 8002E6AC 38 60 00 01 */ li r3, 1 -/* 8002E6B0 48 00 00 54 */ b lbl_8002E704 -lbl_8002E6B4: -/* 8002E6B4 38 04 FF 90 */ addi r0, r4, -112 -/* 8002E6B8 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 8002E6BC 28 00 00 02 */ cmplwi r0, 2 -/* 8002E6C0 40 81 00 0C */ ble lbl_8002E6CC -/* 8002E6C4 28 05 00 59 */ cmplwi r5, 0x59 -/* 8002E6C8 40 82 00 1C */ bne lbl_8002E6E4 -lbl_8002E6CC: -/* 8002E6CC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002E6D0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002E6D4 38 63 00 F8 */ addi r3, r3, 0xf8 -/* 8002E6D8 48 00 5A 21 */ bl getBombNum__21dSv_player_item_max_cCFUc -/* 8002E6DC 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 8002E6E0 48 00 00 24 */ b lbl_8002E704 -lbl_8002E6E4: -/* 8002E6E4 28 05 00 4B */ cmplwi r5, 0x4b -/* 8002E6E8 40 82 00 0C */ bne lbl_8002E6F4 -/* 8002E6EC 38 60 00 32 */ li r3, 0x32 -/* 8002E6F0 48 00 00 14 */ b lbl_8002E704 -lbl_8002E6F4: -/* 8002E6F4 28 05 00 76 */ cmplwi r5, 0x76 -/* 8002E6F8 40 82 00 0C */ bne lbl_8002E704 -/* 8002E6FC 4B FF FE BD */ bl dComIfGs_getBottleMax__Fv -/* 8002E700 54 63 06 3E */ clrlwi r3, r3, 0x18 -lbl_8002E704: -/* 8002E704 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8002E708 7C 08 03 A6 */ mtlr r0 -/* 8002E70C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002E710 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/dComIfGp_getSelectItemNum__Fi.s b/asm/d/com/d_com_inf_game/dComIfGp_getSelectItemNum__Fi.s deleted file mode 100644 index cb3d23e4452..00000000000 --- a/asm/d/com/d_com_inf_game/dComIfGp_getSelectItemNum__Fi.s +++ /dev/null @@ -1,55 +0,0 @@ -lbl_8002E5C0: -/* 8002E5C0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002E5C4 7C 08 02 A6 */ mflr r0 -/* 8002E5C8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002E5CC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8002E5D0 7C 7F 1B 78 */ mr r31, r3 -/* 8002E5D4 4B FF F9 49 */ bl dComIfGp_getSelectItem__Fi -/* 8002E5D8 38 80 00 00 */ li r4, 0 -/* 8002E5DC 38 03 FF 90 */ addi r0, r3, -112 -/* 8002E5E0 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 8002E5E4 28 00 00 02 */ cmplwi r0, 2 -/* 8002E5E8 40 81 00 10 */ ble lbl_8002E5F8 -/* 8002E5EC 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8002E5F0 28 00 00 59 */ cmplwi r0, 0x59 -/* 8002E5F4 40 82 00 2C */ bne lbl_8002E620 -lbl_8002E5F8: -/* 8002E5F8 7F E3 FB 78 */ mr r3, r31 -/* 8002E5FC 4B FF F7 41 */ bl dComIfGs_getSelectMixItemNoArrowIndex__Fi -/* 8002E600 38 03 FF F1 */ addi r0, r3, -15 -/* 8002E604 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 8002E608 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002E60C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002E610 38 63 00 EC */ addi r3, r3, 0xec -/* 8002E614 48 00 59 69 */ bl getBombNum__24dSv_player_item_record_cCFUc -/* 8002E618 54 64 06 3E */ clrlwi r4, r3, 0x18 -/* 8002E61C 48 00 00 54 */ b lbl_8002E670 -lbl_8002E620: -/* 8002E620 28 00 00 4B */ cmplwi r0, 0x4b -/* 8002E624 40 82 00 14 */ bne lbl_8002E638 -/* 8002E628 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002E62C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002E630 88 83 00 F4 */ lbz r4, 0xf4(r3) -/* 8002E634 48 00 00 3C */ b lbl_8002E670 -lbl_8002E638: -/* 8002E638 28 00 00 76 */ cmplwi r0, 0x76 -/* 8002E63C 40 82 00 34 */ bne lbl_8002E670 -/* 8002E640 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002E644 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002E648 7F E4 FB 78 */ mr r4, r31 -/* 8002E64C 48 00 44 11 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi -/* 8002E650 7C 64 1B 78 */ mr r4, r3 -/* 8002E654 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002E658 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002E65C 38 63 00 EC */ addi r3, r3, 0xec -/* 8002E660 38 04 FF F5 */ addi r0, r4, -11 -/* 8002E664 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 8002E668 48 00 59 C9 */ bl getBottleNum__24dSv_player_item_record_cCFUc -/* 8002E66C 54 64 06 3E */ clrlwi r4, r3, 0x18 -lbl_8002E670: -/* 8002E670 7C 83 23 78 */ mr r3, r4 -/* 8002E674 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8002E678 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8002E67C 7C 08 03 A6 */ mtlr r0 -/* 8002E680 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002E684 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/dComIfGp_getSubHeap2D__Fi.s b/asm/d/com/d_com_inf_game/dComIfGp_getSubHeap2D__Fi.s deleted file mode 100644 index c45cc6eb134..00000000000 --- a/asm/d/com/d_com_inf_game/dComIfGp_getSubHeap2D__Fi.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_8002E3D0: -/* 8002E3D0 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002E3D4 38 A4 61 C0 */ addi r5, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002E3D8 88 05 5E 8F */ lbz r0, 0x5e8f(r5) -/* 8002E3DC 28 00 00 05 */ cmplwi r0, 5 -/* 8002E3E0 40 82 00 40 */ bne lbl_8002E420 -/* 8002E3E4 38 C0 00 00 */ li r6, 0 -/* 8002E3E8 38 00 00 02 */ li r0, 2 -/* 8002E3EC 7C 09 03 A6 */ mtctr r0 -lbl_8002E3F0: -/* 8002E3F0 7C 85 32 14 */ add r4, r5, r6 -/* 8002E3F4 88 04 5E 90 */ lbz r0, 0x5e90(r4) -/* 8002E3F8 7C 03 00 00 */ cmpw r3, r0 -/* 8002E3FC 40 82 00 1C */ bne lbl_8002E418 -/* 8002E400 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002E404 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002E408 54 C0 10 3A */ slwi r0, r6, 2 -/* 8002E40C 7C 63 02 14 */ add r3, r3, r0 -/* 8002E410 80 63 5E C0 */ lwz r3, 0x5ec0(r3) -/* 8002E414 4E 80 00 20 */ blr -lbl_8002E418: -/* 8002E418 38 C6 00 01 */ addi r6, r6, 1 -/* 8002E41C 42 00 FF D4 */ bdnz lbl_8002E3F0 -lbl_8002E420: -/* 8002E420 38 60 00 00 */ li r3, 0 -/* 8002E424 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/dComIfGp_isLightDropMapVisible__Fv.s b/asm/d/com/d_com_inf_game/dComIfGp_isLightDropMapVisible__Fv.s deleted file mode 100644 index 2c93dc3da3f..00000000000 --- a/asm/d/com/d_com_inf_game/dComIfGp_isLightDropMapVisible__Fv.s +++ /dev/null @@ -1,36 +0,0 @@ -lbl_8002EDE0: -/* 8002EDE0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002EDE4 7C 08 02 A6 */ mflr r0 -/* 8002EDE8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002EDEC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8002EDF0 93 C1 00 08 */ stw r30, 8(r1) -/* 8002EDF4 3B C0 00 00 */ li r30, 0 -/* 8002EDF8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002EDFC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002EE00 3B E3 01 14 */ addi r31, r3, 0x114 -lbl_8002EE04: -/* 8002EE04 7F E3 FB 78 */ mr r3, r31 -/* 8002EE08 57 C4 06 3E */ clrlwi r4, r30, 0x18 -/* 8002EE0C 48 00 55 91 */ bl isLightDropGetFlag__16dSv_light_drop_cCFUc -/* 8002EE10 2C 03 00 00 */ cmpwi r3, 0 -/* 8002EE14 41 82 00 24 */ beq lbl_8002EE38 -/* 8002EE18 7F E3 FB 78 */ mr r3, r31 -/* 8002EE1C 57 C4 06 3E */ clrlwi r4, r30, 0x18 -/* 8002EE20 48 00 55 21 */ bl getLightDropNum__16dSv_light_drop_cCFUc -/* 8002EE24 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8002EE28 28 00 00 10 */ cmplwi r0, 0x10 -/* 8002EE2C 40 80 00 0C */ bge lbl_8002EE38 -/* 8002EE30 38 60 00 01 */ li r3, 1 -/* 8002EE34 48 00 00 14 */ b lbl_8002EE48 -lbl_8002EE38: -/* 8002EE38 3B DE 00 01 */ addi r30, r30, 1 -/* 8002EE3C 2C 1E 00 03 */ cmpwi r30, 3 -/* 8002EE40 41 80 FF C4 */ blt lbl_8002EE04 -/* 8002EE44 38 60 00 00 */ li r3, 0 -lbl_8002EE48: -/* 8002EE48 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8002EE4C 83 C1 00 08 */ lwz r30, 8(r1) -/* 8002EE50 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8002EE54 7C 08 03 A6 */ mtlr r0 -/* 8002EE58 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002EE5C 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/dComIfGp_mapHide__Fv.s b/asm/d/com/d_com_inf_game/dComIfGp_mapHide__Fv.s deleted file mode 100644 index 3492c27cc68..00000000000 --- a/asm/d/com/d_com_inf_game/dComIfGp_mapHide__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_8002E078: -/* 8002E078 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002E07C 7C 08 02 A6 */ mflr r0 -/* 8002E080 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002E084 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002E088 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002E08C 38 63 07 F0 */ addi r3, r3, 0x7f0 -/* 8002E090 38 80 1D 01 */ li r4, 0x1d01 -/* 8002E094 48 00 68 F9 */ bl onEventBit__11dSv_event_cFUs -/* 8002E098 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8002E09C 7C 08 03 A6 */ mtlr r0 -/* 8002E0A0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002E0A4 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/dComIfGp_mapShow__Fv.s b/asm/d/com/d_com_inf_game/dComIfGp_mapShow__Fv.s deleted file mode 100644 index fd285a23b85..00000000000 --- a/asm/d/com/d_com_inf_game/dComIfGp_mapShow__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_8002E048: -/* 8002E048 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002E04C 7C 08 02 A6 */ mflr r0 -/* 8002E050 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002E054 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002E058 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002E05C 38 63 07 F0 */ addi r3, r3, 0x7f0 -/* 8002E060 38 80 1D 01 */ li r4, 0x1d01 -/* 8002E064 48 00 69 41 */ bl offEventBit__11dSv_event_cFUs -/* 8002E068 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8002E06C 7C 08 03 A6 */ mtlr r0 -/* 8002E070 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002E074 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/dComIfGp_offHeapLockFlag__Fi.s b/asm/d/com/d_com_inf_game/dComIfGp_offHeapLockFlag__Fi.s deleted file mode 100644 index 4acb1c96685..00000000000 --- a/asm/d/com/d_com_inf_game/dComIfGp_offHeapLockFlag__Fi.s +++ /dev/null @@ -1,46 +0,0 @@ -lbl_8002E188: -/* 8002E188 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002E18C 7C 08 02 A6 */ mflr r0 -/* 8002E190 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002E194 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8002E198 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002E19C 3B E4 61 C0 */ addi r31, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002E1A0 88 1F 5E 8F */ lbz r0, 0x5e8f(r31) -/* 8002E1A4 28 00 00 05 */ cmplwi r0, 5 -/* 8002E1A8 40 82 00 64 */ bne lbl_8002E20C -/* 8002E1AC 2C 03 00 07 */ cmpwi r3, 7 -/* 8002E1B0 41 82 00 0C */ beq lbl_8002E1BC -/* 8002E1B4 2C 03 00 08 */ cmpwi r3, 8 -/* 8002E1B8 40 82 00 5C */ bne lbl_8002E214 -lbl_8002E1BC: -/* 8002E1BC 48 00 01 CD */ bl dComIfGp_searchUseSubHeap2D__Fi -/* 8002E1C0 2C 03 00 00 */ cmpwi r3, 0 -/* 8002E1C4 41 80 00 18 */ blt lbl_8002E1DC -/* 8002E1C8 38 A0 00 00 */ li r5, 0 -/* 8002E1CC 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002E1D0 38 04 61 C0 */ addi r0, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002E1D4 7C 60 1A 14 */ add r3, r0, r3 -/* 8002E1D8 98 A3 5E 90 */ stb r5, 0x5e90(r3) -lbl_8002E1DC: -/* 8002E1DC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002E1E0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002E1E4 88 03 5E 90 */ lbz r0, 0x5e90(r3) -/* 8002E1E8 28 00 00 00 */ cmplwi r0, 0 -/* 8002E1EC 40 82 00 28 */ bne lbl_8002E214 -/* 8002E1F0 88 03 5E 91 */ lbz r0, 0x5e91(r3) -/* 8002E1F4 28 00 00 00 */ cmplwi r0, 0 -/* 8002E1F8 40 82 00 1C */ bne lbl_8002E214 -/* 8002E1FC 48 00 00 E1 */ bl dComIfGp_destroySubExpHeap2D__Fv -/* 8002E200 38 00 00 00 */ li r0, 0 -/* 8002E204 98 1F 5E 8F */ stb r0, 0x5e8f(r31) -/* 8002E208 48 00 00 0C */ b lbl_8002E214 -lbl_8002E20C: -/* 8002E20C 38 00 00 00 */ li r0, 0 -/* 8002E210 98 1F 5E 8F */ stb r0, 0x5e8f(r31) -lbl_8002E214: -/* 8002E214 38 60 00 01 */ li r3, 1 -/* 8002E218 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8002E21C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8002E220 7C 08 03 A6 */ mtlr r0 -/* 8002E224 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002E228 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/dComIfGp_searchUseSubHeap2D__Fi.s b/asm/d/com/d_com_inf_game/dComIfGp_searchUseSubHeap2D__Fi.s deleted file mode 100644 index f6ba63773c8..00000000000 --- a/asm/d/com/d_com_inf_game/dComIfGp_searchUseSubHeap2D__Fi.s +++ /dev/null @@ -1,22 +0,0 @@ -lbl_8002E388: -/* 8002E388 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002E38C 38 A4 61 C0 */ addi r5, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002E390 88 05 5E 8F */ lbz r0, 0x5e8f(r5) -/* 8002E394 28 00 00 05 */ cmplwi r0, 5 -/* 8002E398 40 82 00 30 */ bne lbl_8002E3C8 -/* 8002E39C 38 C0 00 00 */ li r6, 0 -/* 8002E3A0 38 00 00 02 */ li r0, 2 -/* 8002E3A4 7C 09 03 A6 */ mtctr r0 -lbl_8002E3A8: -/* 8002E3A8 7C 85 32 14 */ add r4, r5, r6 -/* 8002E3AC 88 04 5E 90 */ lbz r0, 0x5e90(r4) -/* 8002E3B0 7C 03 00 00 */ cmpw r3, r0 -/* 8002E3B4 40 82 00 0C */ bne lbl_8002E3C0 -/* 8002E3B8 7C C3 33 78 */ mr r3, r6 -/* 8002E3BC 4E 80 00 20 */ blr -lbl_8002E3C0: -/* 8002E3C0 38 C6 00 01 */ addi r6, r6, 1 -/* 8002E3C4 42 00 FF E4 */ bdnz lbl_8002E3A8 -lbl_8002E3C8: -/* 8002E3C8 38 60 FF FF */ li r3, -1 -/* 8002E3CC 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/dComIfGp_setHeapLockFlag__FUc.s b/asm/d/com/d_com_inf_game/dComIfGp_setHeapLockFlag__FUc.s deleted file mode 100644 index 97dbfe3873b..00000000000 --- a/asm/d/com/d_com_inf_game/dComIfGp_setHeapLockFlag__FUc.s +++ /dev/null @@ -1,48 +0,0 @@ -lbl_8002E0E0: -/* 8002E0E0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002E0E4 7C 08 02 A6 */ mflr r0 -/* 8002E0E8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002E0EC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8002E0F0 93 C1 00 08 */ stw r30, 8(r1) -/* 8002E0F4 7C 7E 1B 78 */ mr r30, r3 -/* 8002E0F8 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8002E0FC 28 00 00 07 */ cmplwi r0, 7 -/* 8002E100 41 82 00 0C */ beq lbl_8002E10C -/* 8002E104 28 00 00 08 */ cmplwi r0, 8 -/* 8002E108 40 82 00 44 */ bne lbl_8002E14C -lbl_8002E10C: -/* 8002E10C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002E110 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002E114 88 1F 5E 8F */ lbz r0, 0x5e8f(r31) -/* 8002E118 28 00 00 00 */ cmplwi r0, 0 -/* 8002E11C 40 82 00 08 */ bne lbl_8002E124 -/* 8002E120 48 00 01 0D */ bl dComIfGp_createSubExpHeap2D__Fv -lbl_8002E124: -/* 8002E124 38 00 00 05 */ li r0, 5 -/* 8002E128 98 1F 5E 8F */ stb r0, 0x5e8f(r31) -/* 8002E12C 48 00 02 1D */ bl dComIfGp_checkEmptySubHeap2D__Fv -/* 8002E130 2C 03 00 00 */ cmpwi r3, 0 -/* 8002E134 41 80 00 38 */ blt lbl_8002E16C -/* 8002E138 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002E13C 38 04 61 C0 */ addi r0, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002E140 7C 60 1A 14 */ add r3, r0, r3 -/* 8002E144 9B C3 5E 90 */ stb r30, 0x5e90(r3) -/* 8002E148 48 00 00 24 */ b lbl_8002E16C -lbl_8002E14C: -/* 8002E14C 28 00 00 00 */ cmplwi r0, 0 -/* 8002E150 40 82 00 10 */ bne lbl_8002E160 -/* 8002E154 38 60 00 00 */ li r3, 0 -/* 8002E158 48 00 00 31 */ bl dComIfGp_offHeapLockFlag__Fi -/* 8002E15C 48 00 00 10 */ b lbl_8002E16C -lbl_8002E160: -/* 8002E160 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002E164 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002E168 9B C3 5E 8F */ stb r30, 0x5e8f(r3) -lbl_8002E16C: -/* 8002E16C 38 60 00 01 */ li r3, 1 -/* 8002E170 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8002E174 83 C1 00 08 */ lwz r30, 8(r1) -/* 8002E178 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8002E17C 7C 08 03 A6 */ mtlr r0 -/* 8002E180 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002E184 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/dComIfGp_setNextStage__FPCcsScSc.s b/asm/d/com/d_com_inf_game/dComIfGp_setNextStage__FPCcsScSc.s deleted file mode 100644 index 2ab69858fcb..00000000000 --- a/asm/d/com/d_com_inf_game/dComIfGp_setNextStage__FPCcsScSc.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_8002D554: -/* 8002D554 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002D558 7C 08 02 A6 */ mflr r0 -/* 8002D55C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002D560 38 00 00 01 */ li r0, 1 -/* 8002D564 90 01 00 08 */ stw r0, 8(r1) -/* 8002D568 38 00 00 00 */ li r0, 0 -/* 8002D56C 90 01 00 0C */ stw r0, 0xc(r1) -/* 8002D570 C0 22 83 04 */ lfs f1, lit_5226(r2) -/* 8002D574 38 E0 00 00 */ li r7, 0 -/* 8002D578 39 00 00 01 */ li r8, 1 -/* 8002D57C 39 20 00 00 */ li r9, 0 -/* 8002D580 39 40 00 00 */ li r10, 0 -/* 8002D584 4B FF FD 79 */ bl dComIfGp_setNextStage__FPCcsScScfUliScsii -/* 8002D588 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8002D58C 7C 08 03 A6 */ mtlr r0 -/* 8002D590 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002D594 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/dComIfGp_setSelectItem__Fi.s b/asm/d/com/d_com_inf_game/dComIfGp_setSelectItem__Fi.s deleted file mode 100644 index 3201568930e..00000000000 --- a/asm/d/com/d_com_inf_game/dComIfGp_setSelectItem__Fi.s +++ /dev/null @@ -1,79 +0,0 @@ -lbl_8002DDF4: -/* 8002DDF4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002DDF8 7C 08 02 A6 */ mflr r0 -/* 8002DDFC 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002DE00 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8002DE04 7C 7F 1B 78 */ mr r31, r3 -/* 8002DE08 2C 1F 00 02 */ cmpwi r31, 2 -/* 8002DE0C 40 82 00 74 */ bne lbl_8002DE80 -/* 8002DE10 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002DE14 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002DE18 7F E4 FB 78 */ mr r4, r31 -/* 8002DE1C 48 00 4C 41 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi -/* 8002DE20 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8002DE24 28 00 00 FF */ cmplwi r0, 0xff -/* 8002DE28 41 82 00 40 */ beq lbl_8002DE68 -/* 8002DE2C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002DE30 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002DE34 7F E4 FB 78 */ mr r4, r31 -/* 8002DE38 48 00 4C 25 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi -/* 8002DE3C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002DE40 38 04 61 C0 */ addi r0, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002DE44 7C 80 FA 14 */ add r4, r0, r31 -/* 8002DE48 98 64 5E 6C */ stb r3, 0x5e6c(r4) -/* 8002DE4C 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8002DE50 28 00 00 FF */ cmplwi r0, 0xff -/* 8002DE54 40 82 00 B4 */ bne lbl_8002DF08 -/* 8002DE58 7F E3 FB 78 */ mr r3, r31 -/* 8002DE5C 38 80 00 FF */ li r4, 0xff -/* 8002DE60 4B FF FE 65 */ bl dComIfGs_setSelectItemIndex__FiUc -/* 8002DE64 48 00 00 A4 */ b lbl_8002DF08 -lbl_8002DE68: -/* 8002DE68 38 80 00 FF */ li r4, 0xff -/* 8002DE6C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002DE70 38 03 61 C0 */ addi r0, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002DE74 7C 60 FA 14 */ add r3, r0, r31 -/* 8002DE78 98 83 5E 6C */ stb r4, 0x5e6c(r3) -/* 8002DE7C 48 00 00 8C */ b lbl_8002DF08 -lbl_8002DE80: -/* 8002DE80 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002DE84 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002DE88 7F E4 FB 78 */ mr r4, r31 -/* 8002DE8C 48 00 4B D1 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi -/* 8002DE90 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8002DE94 28 00 00 FF */ cmplwi r0, 0xff -/* 8002DE98 41 82 00 5C */ beq lbl_8002DEF4 -/* 8002DE9C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002DEA0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002DEA4 7F E4 FB 78 */ mr r4, r31 -/* 8002DEA8 48 00 4B B5 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi -/* 8002DEAC 7C 60 1B 78 */ mr r0, r3 -/* 8002DEB0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002DEB4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002DEB8 38 63 00 9C */ addi r3, r3, 0x9c -/* 8002DEBC 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 8002DEC0 38 A0 00 00 */ li r5, 0 -/* 8002DEC4 48 00 51 6D */ bl getItem__17dSv_player_item_cCFib -/* 8002DEC8 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002DECC 38 04 61 C0 */ addi r0, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002DED0 7C 80 FA 14 */ add r4, r0, r31 -/* 8002DED4 98 64 5E 6C */ stb r3, 0x5e6c(r4) -/* 8002DED8 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8002DEDC 28 00 00 FF */ cmplwi r0, 0xff -/* 8002DEE0 40 82 00 28 */ bne lbl_8002DF08 -/* 8002DEE4 7F E3 FB 78 */ mr r3, r31 -/* 8002DEE8 38 80 00 FF */ li r4, 0xff -/* 8002DEEC 4B FF FD D9 */ bl dComIfGs_setSelectItemIndex__FiUc -/* 8002DEF0 48 00 00 18 */ b lbl_8002DF08 -lbl_8002DEF4: -/* 8002DEF4 38 80 00 FF */ li r4, 0xff -/* 8002DEF8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002DEFC 38 03 61 C0 */ addi r0, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002DF00 7C 60 FA 14 */ add r3, r0, r31 -/* 8002DF04 98 83 5E 6C */ stb r4, 0x5e6c(r3) -lbl_8002DF08: -/* 8002DF08 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8002DF0C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8002DF10 7C 08 03 A6 */ mtlr r0 -/* 8002DF14 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002DF18 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/dComIfGp_world_dark_get__Fv.s b/asm/d/com/d_com_inf_game/dComIfGp_world_dark_get__Fv.s deleted file mode 100644 index 8bd053566ef..00000000000 --- a/asm/d/com/d_com_inf_game/dComIfGp_world_dark_get__Fv.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_8002F518: -/* 8002F518 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002F51C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002F520 3C 63 00 02 */ addis r3, r3, 2 -/* 8002F524 88 63 DD F9 */ lbz r3, -0x2207(r3) -/* 8002F528 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/dComIfGp_world_dark_set__FUc.s b/asm/d/com/d_com_inf_game/dComIfGp_world_dark_set__FUc.s deleted file mode 100644 index c731122fda8..00000000000 --- a/asm/d/com/d_com_inf_game/dComIfGp_world_dark_set__FUc.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_8002F504: -/* 8002F504 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002F508 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002F50C 3C 84 00 02 */ addis r4, r4, 2 -/* 8002F510 98 64 DD F9 */ stb r3, -0x2207(r4) -/* 8002F514 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/dComIfGs_BossLife_public_Get__Fv.s b/asm/d/com/d_com_inf_game/dComIfGs_BossLife_public_Get__Fv.s deleted file mode 100644 index 044466762b8..00000000000 --- a/asm/d/com/d_com_inf_game/dComIfGs_BossLife_public_Get__Fv.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_8002D910: -/* 8002D910 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002D914 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002D918 3C 63 00 02 */ addis r3, r3, 2 -/* 8002D91C 88 63 DD FA */ lbz r3, -0x2206(r3) -/* 8002D920 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/dComIfGs_BossLife_public_Set__FSc.s b/asm/d/com/d_com_inf_game/dComIfGs_BossLife_public_Set__FSc.s deleted file mode 100644 index 62dba744a51..00000000000 --- a/asm/d/com/d_com_inf_game/dComIfGs_BossLife_public_Set__FSc.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_8002D8FC: -/* 8002D8FC 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002D900 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002D904 3C 84 00 02 */ addis r4, r4, 2 -/* 8002D908 98 64 DD FA */ stb r3, -0x2206(r4) -/* 8002D90C 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/dComIfGs_Grass_hide_Set__FSc.s b/asm/d/com/d_com_inf_game/dComIfGs_Grass_hide_Set__FSc.s deleted file mode 100644 index d046e0c2a54..00000000000 --- a/asm/d/com/d_com_inf_game/dComIfGs_Grass_hide_Set__FSc.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_8002FA84: -/* 8002FA84 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002FA88 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002FA8C 3C 84 00 02 */ addis r4, r4, 2 -/* 8002FA90 98 64 DD FC */ stb r3, -0x2204(r4) -/* 8002FA94 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/dComIfGs_PolyDamageOff_Check__Fv.s b/asm/d/com/d_com_inf_game/dComIfGs_PolyDamageOff_Check__Fv.s deleted file mode 100644 index 69fe216ffc6..00000000000 --- a/asm/d/com/d_com_inf_game/dComIfGs_PolyDamageOff_Check__Fv.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_8002FA04: -/* 8002FA04 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002FA08 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002FA0C 3C 63 00 02 */ addis r3, r3, 2 -/* 8002FA10 88 63 DD FB */ lbz r3, -0x2205(r3) -/* 8002FA14 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/dComIfGs_PolyDamageOff_Set__FSc.s b/asm/d/com/d_com_inf_game/dComIfGs_PolyDamageOff_Set__FSc.s deleted file mode 100644 index 859b40bdf9a..00000000000 --- a/asm/d/com/d_com_inf_game/dComIfGs_PolyDamageOff_Set__FSc.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_8002F9F0: -/* 8002F9F0 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002F9F4 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002F9F8 3C 84 00 02 */ addis r4, r4, 2 -/* 8002F9FC 98 64 DD FB */ stb r3, -0x2205(r4) -/* 8002FA00 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/dComIfGs_checkGetInsectNum__Fv.s b/asm/d/com/d_com_inf_game/dComIfGs_checkGetInsectNum__Fv.s deleted file mode 100644 index 92a88e764b8..00000000000 --- a/asm/d/com/d_com_inf_game/dComIfGs_checkGetInsectNum__Fv.s +++ /dev/null @@ -1,44 +0,0 @@ -lbl_8002E428: -/* 8002E428 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 8002E42C 7C 08 02 A6 */ mflr r0 -/* 8002E430 90 01 00 34 */ stw r0, 0x34(r1) -/* 8002E434 39 61 00 30 */ addi r11, r1, 0x30 -/* 8002E438 48 33 3D 95 */ bl _savegpr_25 -/* 8002E43C 3B 60 00 00 */ li r27, 0 -/* 8002E440 3C 60 80 3A */ lis r3, l_itemno@ha /* 0x803A71D0@ha */ -/* 8002E444 38 03 71 D0 */ addi r0, r3, l_itemno@l /* 0x803A71D0@l */ -/* 8002E448 7C 1A 03 78 */ mr r26, r0 -/* 8002E44C 3B 20 00 00 */ li r25, 0 -/* 8002E450 3B E0 00 00 */ li r31, 0 -/* 8002E454 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002E458 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002E45C 3B A3 00 CC */ addi r29, r3, 0xcc -/* 8002E460 3B 83 07 F0 */ addi r28, r3, 0x7f0 -/* 8002E464 3C 60 80 3A */ lis r3, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 8002E468 3B C3 72 88 */ addi r30, r3, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -lbl_8002E46C: -/* 8002E46C 88 9A 00 00 */ lbz r4, 0(r26) -/* 8002E470 7F A3 EB 78 */ mr r3, r29 -/* 8002E474 3B 5A 00 01 */ addi r26, r26, 1 -/* 8002E478 48 00 5A 51 */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 8002E47C 2C 03 00 00 */ cmpwi r3, 0 -/* 8002E480 41 82 00 20 */ beq lbl_8002E4A0 -/* 8002E484 7F 83 E3 78 */ mr r3, r28 -/* 8002E488 7C 9E FA 14 */ add r4, r30, r31 -/* 8002E48C A0 84 03 22 */ lhz r4, 0x322(r4) -/* 8002E490 48 00 65 2D */ bl isEventBit__11dSv_event_cCFUs -/* 8002E494 2C 03 00 00 */ cmpwi r3, 0 -/* 8002E498 41 82 00 08 */ beq lbl_8002E4A0 -/* 8002E49C 3B 7B 00 01 */ addi r27, r27, 1 -lbl_8002E4A0: -/* 8002E4A0 3B 39 00 01 */ addi r25, r25, 1 -/* 8002E4A4 28 19 00 18 */ cmplwi r25, 0x18 -/* 8002E4A8 3B FF 00 02 */ addi r31, r31, 2 -/* 8002E4AC 41 80 FF C0 */ blt lbl_8002E46C -/* 8002E4B0 7F 63 DB 78 */ mr r3, r27 -/* 8002E4B4 39 61 00 30 */ addi r11, r1, 0x30 -/* 8002E4B8 48 33 3D 61 */ bl _restgpr_25 -/* 8002E4BC 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8002E4C0 7C 08 03 A6 */ mtlr r0 -/* 8002E4C4 38 21 00 30 */ addi r1, r1, 0x30 -/* 8002E4C8 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/dComIfGs_checkGetItem__FUc.s b/asm/d/com/d_com_inf_game/dComIfGs_checkGetItem__FUc.s deleted file mode 100644 index c7f3e822e8d..00000000000 --- a/asm/d/com/d_com_inf_game/dComIfGs_checkGetItem__FUc.s +++ /dev/null @@ -1,65 +0,0 @@ -lbl_8002E4CC: -/* 8002E4CC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8002E4D0 7C 08 02 A6 */ mflr r0 -/* 8002E4D4 90 01 00 24 */ stw r0, 0x24(r1) -/* 8002E4D8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8002E4DC 48 33 3C F9 */ bl _savegpr_27 -/* 8002E4E0 7C 7E 1B 78 */ mr r30, r3 -/* 8002E4E4 3B E0 00 00 */ li r31, 0 -/* 8002E4E8 3B 60 00 00 */ li r27, 0 -/* 8002E4EC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002E4F0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002E4F4 3B 83 00 9C */ addi r28, r3, 0x9c -/* 8002E4F8 57 DD 06 3E */ clrlwi r29, r30, 0x18 -lbl_8002E4FC: -/* 8002E4FC 7F 83 E3 78 */ mr r3, r28 -/* 8002E500 7F 64 DB 78 */ mr r4, r27 -/* 8002E504 38 A0 00 01 */ li r5, 1 -/* 8002E508 48 00 4B 29 */ bl getItem__17dSv_player_item_cCFib -/* 8002E50C 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8002E510 7C 1D 00 40 */ cmplw r29, r0 -/* 8002E514 40 82 00 10 */ bne lbl_8002E524 -/* 8002E518 57 E3 06 3E */ clrlwi r3, r31, 0x18 -/* 8002E51C 38 03 00 01 */ addi r0, r3, 1 -/* 8002E520 54 1F 06 3E */ clrlwi r31, r0, 0x18 -lbl_8002E524: -/* 8002E524 3B 7B 00 01 */ addi r27, r27, 1 -/* 8002E528 2C 1B 00 3C */ cmpwi r27, 0x3c -/* 8002E52C 41 80 FF D0 */ blt lbl_8002E4FC -/* 8002E530 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002E534 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002E538 88 63 00 13 */ lbz r3, 0x13(r3) -/* 8002E53C 57 C0 06 3E */ clrlwi r0, r30, 0x18 -/* 8002E540 7C 00 18 40 */ cmplw r0, r3 -/* 8002E544 40 82 00 10 */ bne lbl_8002E554 -/* 8002E548 57 E3 06 3E */ clrlwi r3, r31, 0x18 -/* 8002E54C 38 03 00 01 */ addi r0, r3, 1 -/* 8002E550 54 1F 06 3E */ clrlwi r31, r0, 0x18 -lbl_8002E554: -/* 8002E554 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002E558 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002E55C 88 63 00 14 */ lbz r3, 0x14(r3) -/* 8002E560 57 C0 06 3E */ clrlwi r0, r30, 0x18 -/* 8002E564 7C 00 18 40 */ cmplw r0, r3 -/* 8002E568 40 82 00 10 */ bne lbl_8002E578 -/* 8002E56C 57 E3 06 3E */ clrlwi r3, r31, 0x18 -/* 8002E570 38 03 00 01 */ addi r0, r3, 1 -/* 8002E574 54 1F 06 3E */ clrlwi r31, r0, 0x18 -lbl_8002E578: -/* 8002E578 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002E57C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002E580 88 63 00 15 */ lbz r3, 0x15(r3) -/* 8002E584 57 C0 06 3E */ clrlwi r0, r30, 0x18 -/* 8002E588 7C 00 18 40 */ cmplw r0, r3 -/* 8002E58C 40 82 00 10 */ bne lbl_8002E59C -/* 8002E590 57 E3 06 3E */ clrlwi r3, r31, 0x18 -/* 8002E594 38 03 00 01 */ addi r0, r3, 1 -/* 8002E598 54 1F 06 3E */ clrlwi r31, r0, 0x18 -lbl_8002E59C: -/* 8002E59C 7F E3 FB 78 */ mr r3, r31 -/* 8002E5A0 39 61 00 20 */ addi r11, r1, 0x20 -/* 8002E5A4 48 33 3C 7D */ bl _restgpr_27 -/* 8002E5A8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8002E5AC 7C 08 03 A6 */ mtlr r0 -/* 8002E5B0 38 21 00 20 */ addi r1, r1, 0x20 -/* 8002E5B4 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/dComIfGs_getMaxLifeGauge__Fv.s b/asm/d/com/d_com_inf_game/dComIfGs_getMaxLifeGauge__Fv.s deleted file mode 100644 index e5a6079a25f..00000000000 --- a/asm/d/com/d_com_inf_game/dComIfGs_getMaxLifeGauge__Fv.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_8002DCA8: -/* 8002DCA8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002DCAC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002DCB0 A0 63 00 00 */ lhz r3, 0(r3) -/* 8002DCB4 38 00 00 05 */ li r0, 5 -/* 8002DCB8 7C 03 03 D6 */ divw r0, r3, r0 -/* 8002DCBC 54 03 14 3A */ rlwinm r3, r0, 2, 0x10, 0x1d -/* 8002DCC0 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/dComIfGs_getMixItemIndex__Fi.s b/asm/d/com/d_com_inf_game/dComIfGs_getMixItemIndex__Fi.s deleted file mode 100644 index 326d17e3ab0..00000000000 --- a/asm/d/com/d_com_inf_game/dComIfGs_getMixItemIndex__Fi.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_8002DDC8: -/* 8002DDC8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002DDCC 7C 08 02 A6 */ mflr r0 -/* 8002DDD0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002DDD4 7C 64 1B 78 */ mr r4, r3 -/* 8002DDD8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002DDDC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002DDE0 48 00 4C AD */ bl getMixItemIndex__21dSv_player_status_a_cCFi -/* 8002DDE4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8002DDE8 7C 08 03 A6 */ mtlr r0 -/* 8002DDEC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002DDF0 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/dComIfGs_getWarpMarkFlag__Fv.s b/asm/d/com/d_com_inf_game/dComIfGs_getWarpMarkFlag__Fv.s deleted file mode 100644 index 7ca37a274a9..00000000000 --- a/asm/d/com/d_com_inf_game/dComIfGs_getWarpMarkFlag__Fv.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_8002F2F0: -/* 8002F2F0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002F2F4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002F2F8 88 03 00 98 */ lbz r0, 0x98(r3) -/* 8002F2FC 7C 00 07 74 */ extsb r0, r0 -/* 8002F300 54 00 0F FE */ srwi r0, r0, 0x1f -/* 8002F304 68 00 00 01 */ xori r0, r0, 1 -/* 8002F308 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 8002F30C 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/dComIfGs_getWarpPlayerAngleY__Fv.s b/asm/d/com/d_com_inf_game/dComIfGs_getWarpPlayerAngleY__Fv.s deleted file mode 100644 index b8898067472..00000000000 --- a/asm/d/com/d_com_inf_game/dComIfGs_getWarpPlayerAngleY__Fv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_8002F2CC: -/* 8002F2CC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002F2D0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002F2D4 A8 63 00 8C */ lha r3, 0x8c(r3) -/* 8002F2D8 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/dComIfGs_getWarpRoomNo__Fv.s b/asm/d/com/d_com_inf_game/dComIfGs_getWarpRoomNo__Fv.s deleted file mode 100644 index 40cdd1a30c0..00000000000 --- a/asm/d/com/d_com_inf_game/dComIfGs_getWarpRoomNo__Fv.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_8002F2DC: -/* 8002F2DC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002F2E0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002F2E4 88 03 00 97 */ lbz r0, 0x97(r3) -/* 8002F2E8 7C 03 07 74 */ extsb r3, r0 -/* 8002F2EC 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/dComIfGs_getWarpStageName__Fv.s b/asm/d/com/d_com_inf_game/dComIfGs_getWarpStageName__Fv.s deleted file mode 100644 index 18c1071d053..00000000000 --- a/asm/d/com/d_com_inf_game/dComIfGs_getWarpStageName__Fv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_8002F2AC: -/* 8002F2AC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002F2B0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002F2B4 38 63 00 8E */ addi r3, r3, 0x8e -/* 8002F2B8 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/dComIfGs_isDungeonItemWarp__Fi.s b/asm/d/com/d_com_inf_game/dComIfGs_isDungeonItemWarp__Fi.s deleted file mode 100644 index 023a14b1c0b..00000000000 --- a/asm/d/com/d_com_inf_game/dComIfGs_isDungeonItemWarp__Fi.s +++ /dev/null @@ -1,36 +0,0 @@ -lbl_8002D878: -/* 8002D878 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002D87C 7C 08 02 A6 */ mflr r0 -/* 8002D880 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002D884 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8002D888 7C 7F 1B 78 */ mr r31, r3 -/* 8002D88C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002D890 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002D894 85 83 4E 20 */ lwzu r12, 0x4e20(r3) -/* 8002D898 81 8C 00 BC */ lwz r12, 0xbc(r12) -/* 8002D89C 7D 89 03 A6 */ mtctr r12 -/* 8002D8A0 4E 80 04 21 */ bctrl -/* 8002D8A4 88 03 00 09 */ lbz r0, 9(r3) -/* 8002D8A8 54 00 FE FE */ rlwinm r0, r0, 0x1f, 0x1b, 0x1f -/* 8002D8AC 7C 1F 00 00 */ cmpw r31, r0 -/* 8002D8B0 40 82 00 1C */ bne lbl_8002D8CC -/* 8002D8B4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002D8B8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002D8BC 38 63 09 58 */ addi r3, r3, 0x958 -/* 8002D8C0 38 80 00 06 */ li r4, 6 -/* 8002D8C4 48 00 70 71 */ bl isDungeonItem__12dSv_memBit_cCFi -/* 8002D8C8 48 00 00 20 */ b lbl_8002D8E8 -lbl_8002D8CC: -/* 8002D8CC 57 E4 28 34 */ slwi r4, r31, 5 -/* 8002D8D0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002D8D4 38 03 61 C0 */ addi r0, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002D8D8 7C 60 22 14 */ add r3, r0, r4 -/* 8002D8DC 38 63 01 F0 */ addi r3, r3, 0x1f0 -/* 8002D8E0 38 80 00 06 */ li r4, 6 -/* 8002D8E4 48 00 70 51 */ bl isDungeonItem__12dSv_memBit_cCFi -lbl_8002D8E8: -/* 8002D8E8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8002D8EC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8002D8F0 7C 08 03 A6 */ mtlr r0 -/* 8002D8F4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002D8F8 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/dComIfGs_isStageSwitch__Fii.s b/asm/d/com/d_com_inf_game/dComIfGs_isStageSwitch__Fii.s deleted file mode 100644 index ba1bf0fbe36..00000000000 --- a/asm/d/com/d_com_inf_game/dComIfGs_isStageSwitch__Fii.s +++ /dev/null @@ -1,39 +0,0 @@ -lbl_8002D740: -/* 8002D740 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002D744 7C 08 02 A6 */ mflr r0 -/* 8002D748 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002D74C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8002D750 93 C1 00 08 */ stw r30, 8(r1) -/* 8002D754 7C 7E 1B 78 */ mr r30, r3 -/* 8002D758 7C 9F 23 78 */ mr r31, r4 -/* 8002D75C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002D760 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002D764 85 83 4E 20 */ lwzu r12, 0x4e20(r3) -/* 8002D768 81 8C 00 BC */ lwz r12, 0xbc(r12) -/* 8002D76C 7D 89 03 A6 */ mtctr r12 -/* 8002D770 4E 80 04 21 */ bctrl -/* 8002D774 88 03 00 09 */ lbz r0, 9(r3) -/* 8002D778 54 00 FE FE */ rlwinm r0, r0, 0x1f, 0x1b, 0x1f -/* 8002D77C 7C 1E 00 00 */ cmpw r30, r0 -/* 8002D780 40 82 00 1C */ bne lbl_8002D79C -/* 8002D784 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002D788 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002D78C 7F E4 FB 78 */ mr r4, r31 -/* 8002D790 38 A0 FF FF */ li r5, -1 -/* 8002D794 48 00 7B CD */ bl isSwitch__10dSv_info_cCFii -/* 8002D798 48 00 00 20 */ b lbl_8002D7B8 -lbl_8002D79C: -/* 8002D79C 57 C4 28 34 */ slwi r4, r30, 5 -/* 8002D7A0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002D7A4 38 03 61 C0 */ addi r0, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002D7A8 7C 60 22 14 */ add r3, r0, r4 -/* 8002D7AC 38 63 01 F0 */ addi r3, r3, 0x1f0 -/* 8002D7B0 7F E4 FB 78 */ mr r4, r31 -/* 8002D7B4 48 00 70 AD */ bl isSwitch__12dSv_memBit_cCFi -lbl_8002D7B8: -/* 8002D7B8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8002D7BC 83 C1 00 08 */ lwz r30, 8(r1) -/* 8002D7C0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8002D7C4 7C 08 03 A6 */ mtlr r0 -/* 8002D7C8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002D7CC 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/dComIfGs_isStageTbox__Fii.s b/asm/d/com/d_com_inf_game/dComIfGs_isStageTbox__Fii.s deleted file mode 100644 index 40ce16da1a3..00000000000 --- a/asm/d/com/d_com_inf_game/dComIfGs_isStageTbox__Fii.s +++ /dev/null @@ -1,39 +0,0 @@ -lbl_8002D598: -/* 8002D598 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002D59C 7C 08 02 A6 */ mflr r0 -/* 8002D5A0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002D5A4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8002D5A8 93 C1 00 08 */ stw r30, 8(r1) -/* 8002D5AC 7C 7E 1B 78 */ mr r30, r3 -/* 8002D5B0 7C 9F 23 78 */ mr r31, r4 -/* 8002D5B4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002D5B8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002D5BC 85 83 4E 20 */ lwzu r12, 0x4e20(r3) -/* 8002D5C0 81 8C 00 BC */ lwz r12, 0xbc(r12) -/* 8002D5C4 7D 89 03 A6 */ mtctr r12 -/* 8002D5C8 4E 80 04 21 */ bctrl -/* 8002D5CC 88 03 00 09 */ lbz r0, 9(r3) -/* 8002D5D0 54 00 FE FE */ rlwinm r0, r0, 0x1f, 0x1b, 0x1f -/* 8002D5D4 7C 1E 00 00 */ cmpw r30, r0 -/* 8002D5D8 40 82 00 1C */ bne lbl_8002D5F4 -/* 8002D5DC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002D5E0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002D5E4 38 63 09 58 */ addi r3, r3, 0x958 -/* 8002D5E8 7F E4 FB 78 */ mr r4, r31 -/* 8002D5EC 48 00 71 FD */ bl isTbox__12dSv_memBit_cCFi -/* 8002D5F0 48 00 00 20 */ b lbl_8002D610 -lbl_8002D5F4: -/* 8002D5F4 57 C4 28 34 */ slwi r4, r30, 5 -/* 8002D5F8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002D5FC 38 03 61 C0 */ addi r0, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002D600 7C 60 22 14 */ add r3, r0, r4 -/* 8002D604 38 63 01 F0 */ addi r3, r3, 0x1f0 -/* 8002D608 7F E4 FB 78 */ mr r4, r31 -/* 8002D60C 48 00 71 DD */ bl isTbox__12dSv_memBit_cCFi -lbl_8002D610: -/* 8002D610 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8002D614 83 C1 00 08 */ lwz r30, 8(r1) -/* 8002D618 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8002D61C 7C 08 03 A6 */ mtlr r0 -/* 8002D620 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002D624 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/dComIfGs_offStageSwitch__Fii.s b/asm/d/com/d_com_inf_game/dComIfGs_offStageSwitch__Fii.s deleted file mode 100644 index 2ff53576597..00000000000 --- a/asm/d/com/d_com_inf_game/dComIfGs_offStageSwitch__Fii.s +++ /dev/null @@ -1,37 +0,0 @@ -lbl_8002D6B4: -/* 8002D6B4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002D6B8 7C 08 02 A6 */ mflr r0 -/* 8002D6BC 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002D6C0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8002D6C4 93 C1 00 08 */ stw r30, 8(r1) -/* 8002D6C8 7C 7E 1B 78 */ mr r30, r3 -/* 8002D6CC 7C 9F 23 78 */ mr r31, r4 -/* 8002D6D0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002D6D4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002D6D8 85 83 4E 20 */ lwzu r12, 0x4e20(r3) -/* 8002D6DC 81 8C 00 BC */ lwz r12, 0xbc(r12) -/* 8002D6E0 7D 89 03 A6 */ mtctr r12 -/* 8002D6E4 4E 80 04 21 */ bctrl -/* 8002D6E8 88 03 00 09 */ lbz r0, 9(r3) -/* 8002D6EC 54 00 FE FE */ rlwinm r0, r0, 0x1f, 0x1b, 0x1f -/* 8002D6F0 7C 1E 00 00 */ cmpw r30, r0 -/* 8002D6F4 40 82 00 18 */ bne lbl_8002D70C -/* 8002D6F8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002D6FC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002D700 7F E4 FB 78 */ mr r4, r31 -/* 8002D704 38 A0 FF FF */ li r5, -1 -/* 8002D708 48 00 7B A9 */ bl offSwitch__10dSv_info_cFii -lbl_8002D70C: -/* 8002D70C 57 C4 28 34 */ slwi r4, r30, 5 -/* 8002D710 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002D714 38 03 61 C0 */ addi r0, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002D718 7C 60 22 14 */ add r3, r0, r4 -/* 8002D71C 38 63 01 F0 */ addi r3, r3, 0x1f0 -/* 8002D720 7F E4 FB 78 */ mr r4, r31 -/* 8002D724 48 00 71 15 */ bl offSwitch__12dSv_memBit_cFi -/* 8002D728 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8002D72C 83 C1 00 08 */ lwz r30, 8(r1) -/* 8002D730 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8002D734 7C 08 03 A6 */ mtlr r0 -/* 8002D738 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002D73C 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/dComIfGs_onStageBossEnemy__Fi.s b/asm/d/com/d_com_inf_game/dComIfGs_onStageBossEnemy__Fi.s deleted file mode 100644 index 93d8eab029a..00000000000 --- a/asm/d/com/d_com_inf_game/dComIfGs_onStageBossEnemy__Fi.s +++ /dev/null @@ -1,44 +0,0 @@ -lbl_8002D7D0: -/* 8002D7D0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002D7D4 7C 08 02 A6 */ mflr r0 -/* 8002D7D8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002D7DC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8002D7E0 93 C1 00 08 */ stw r30, 8(r1) -/* 8002D7E4 7C 7E 1B 78 */ mr r30, r3 -/* 8002D7E8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002D7EC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002D7F0 85 83 4E 20 */ lwzu r12, 0x4e20(r3) -/* 8002D7F4 81 8C 00 BC */ lwz r12, 0xbc(r12) -/* 8002D7F8 7D 89 03 A6 */ mtctr r12 -/* 8002D7FC 4E 80 04 21 */ bctrl -/* 8002D800 88 03 00 09 */ lbz r0, 9(r3) -/* 8002D804 54 00 FE FE */ rlwinm r0, r0, 0x1f, 0x1b, 0x1f -/* 8002D808 7C 1E 00 00 */ cmpw r30, r0 -/* 8002D80C 40 82 00 28 */ bne lbl_8002D834 -/* 8002D810 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002D814 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002D818 3B E3 09 58 */ addi r31, r3, 0x958 -/* 8002D81C 7F E3 FB 78 */ mr r3, r31 -/* 8002D820 38 80 00 03 */ li r4, 3 -/* 8002D824 48 00 70 F5 */ bl onDungeonItem__12dSv_memBit_cFi -/* 8002D828 7F E3 FB 78 */ mr r3, r31 -/* 8002D82C 38 80 00 06 */ li r4, 6 -/* 8002D830 48 00 70 E9 */ bl onDungeonItem__12dSv_memBit_cFi -lbl_8002D834: -/* 8002D834 57 C4 28 34 */ slwi r4, r30, 5 -/* 8002D838 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002D83C 38 03 61 C0 */ addi r0, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002D840 7C 60 22 14 */ add r3, r0, r4 -/* 8002D844 3B E3 01 F0 */ addi r31, r3, 0x1f0 -/* 8002D848 7F E3 FB 78 */ mr r3, r31 -/* 8002D84C 38 80 00 03 */ li r4, 3 -/* 8002D850 48 00 70 C9 */ bl onDungeonItem__12dSv_memBit_cFi -/* 8002D854 7F E3 FB 78 */ mr r3, r31 -/* 8002D858 38 80 00 06 */ li r4, 6 -/* 8002D85C 48 00 70 BD */ bl onDungeonItem__12dSv_memBit_cFi -/* 8002D860 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8002D864 83 C1 00 08 */ lwz r30, 8(r1) -/* 8002D868 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8002D86C 7C 08 03 A6 */ mtlr r0 -/* 8002D870 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002D874 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/dComIfGs_onStageSwitch__Fii.s b/asm/d/com/d_com_inf_game/dComIfGs_onStageSwitch__Fii.s deleted file mode 100644 index cae032ed3c7..00000000000 --- a/asm/d/com/d_com_inf_game/dComIfGs_onStageSwitch__Fii.s +++ /dev/null @@ -1,37 +0,0 @@ -lbl_8002D628: -/* 8002D628 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002D62C 7C 08 02 A6 */ mflr r0 -/* 8002D630 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002D634 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8002D638 93 C1 00 08 */ stw r30, 8(r1) -/* 8002D63C 7C 7E 1B 78 */ mr r30, r3 -/* 8002D640 7C 9F 23 78 */ mr r31, r4 -/* 8002D644 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002D648 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002D64C 85 83 4E 20 */ lwzu r12, 0x4e20(r3) -/* 8002D650 81 8C 00 BC */ lwz r12, 0xbc(r12) -/* 8002D654 7D 89 03 A6 */ mtctr r12 -/* 8002D658 4E 80 04 21 */ bctrl -/* 8002D65C 88 03 00 09 */ lbz r0, 9(r3) -/* 8002D660 54 00 FE FE */ rlwinm r0, r0, 0x1f, 0x1b, 0x1f -/* 8002D664 7C 1E 00 00 */ cmpw r30, r0 -/* 8002D668 40 82 00 18 */ bne lbl_8002D680 -/* 8002D66C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002D670 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002D674 7F E4 FB 78 */ mr r4, r31 -/* 8002D678 38 A0 FF FF */ li r5, -1 -/* 8002D67C 48 00 7B 85 */ bl onSwitch__10dSv_info_cFii -lbl_8002D680: -/* 8002D680 57 C4 28 34 */ slwi r4, r30, 5 -/* 8002D684 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002D688 38 03 61 C0 */ addi r0, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002D68C 7C 60 22 14 */ add r3, r0, r4 -/* 8002D690 38 63 01 F0 */ addi r3, r3, 0x1f0 -/* 8002D694 7F E4 FB 78 */ mr r4, r31 -/* 8002D698 48 00 71 79 */ bl onSwitch__12dSv_memBit_cFi -/* 8002D69C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8002D6A0 83 C1 00 08 */ lwz r30, 8(r1) -/* 8002D6A4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8002D6A8 7C 08 03 A6 */ mtlr r0 -/* 8002D6AC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002D6B0 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/dComIfGs_sense_type_change_Get__Fv.s b/asm/d/com/d_com_inf_game/dComIfGs_sense_type_change_Get__Fv.s deleted file mode 100644 index 132b733e0d9..00000000000 --- a/asm/d/com/d_com_inf_game/dComIfGs_sense_type_change_Get__Fv.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_8002D938: -/* 8002D938 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002D93C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002D940 3C 63 00 02 */ addis r3, r3, 2 -/* 8002D944 88 63 DD FA */ lbz r3, -0x2206(r3) -/* 8002D948 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/dComIfGs_sense_type_change_Set__FSc.s b/asm/d/com/d_com_inf_game/dComIfGs_sense_type_change_Set__FSc.s deleted file mode 100644 index 8dfd4a650d0..00000000000 --- a/asm/d/com/d_com_inf_game/dComIfGs_sense_type_change_Set__FSc.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_8002D924: -/* 8002D924 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002D928 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002D92C 3C 84 00 02 */ addis r4, r4, 2 -/* 8002D930 98 64 DD FA */ stb r3, -0x2206(r4) -/* 8002D934 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/dComIfGs_setKeyNum__FiUc.s b/asm/d/com/d_com_inf_game/dComIfGs_setKeyNum__FiUc.s deleted file mode 100644 index 39fd2eb40c1..00000000000 --- a/asm/d/com/d_com_inf_game/dComIfGs_setKeyNum__FiUc.s +++ /dev/null @@ -1,42 +0,0 @@ -lbl_8002F040: -/* 8002F040 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8002F044 7C 08 02 A6 */ mflr r0 -/* 8002F048 90 01 00 24 */ stw r0, 0x24(r1) -/* 8002F04C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8002F050 48 33 31 8D */ bl _savegpr_29 -/* 8002F054 7C 7D 1B 78 */ mr r29, r3 -/* 8002F058 7C 9E 23 78 */ mr r30, r4 -/* 8002F05C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002F060 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002F064 3B E3 4E 20 */ addi r31, r3, 0x4e20 -/* 8002F068 7F E3 FB 78 */ mr r3, r31 -/* 8002F06C 81 9F 00 00 */ lwz r12, 0(r31) -/* 8002F070 81 8C 00 BC */ lwz r12, 0xbc(r12) -/* 8002F074 7D 89 03 A6 */ mtctr r12 -/* 8002F078 4E 80 04 21 */ bctrl -/* 8002F07C 28 03 00 00 */ cmplwi r3, 0 -/* 8002F080 41 82 00 34 */ beq lbl_8002F0B4 -/* 8002F084 7F E3 FB 78 */ mr r3, r31 -/* 8002F088 81 9F 00 00 */ lwz r12, 0(r31) -/* 8002F08C 81 8C 00 BC */ lwz r12, 0xbc(r12) -/* 8002F090 7D 89 03 A6 */ mtctr r12 -/* 8002F094 4E 80 04 21 */ bctrl -/* 8002F098 88 03 00 09 */ lbz r0, 9(r3) -/* 8002F09C 54 00 FE FE */ rlwinm r0, r0, 0x1f, 0x1b, 0x1f -/* 8002F0A0 7C 1D 00 00 */ cmpw r29, r0 -/* 8002F0A4 40 82 00 10 */ bne lbl_8002F0B4 -/* 8002F0A8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002F0AC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002F0B0 9B C3 09 74 */ stb r30, 0x974(r3) -lbl_8002F0B4: -/* 8002F0B4 57 A4 28 34 */ slwi r4, r29, 5 -/* 8002F0B8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002F0BC 38 03 61 C0 */ addi r0, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002F0C0 7C 60 22 14 */ add r3, r0, r4 -/* 8002F0C4 9B C3 02 0C */ stb r30, 0x20c(r3) -/* 8002F0C8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8002F0CC 48 33 31 5D */ bl _restgpr_29 -/* 8002F0D0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8002F0D4 7C 08 03 A6 */ mtlr r0 -/* 8002F0D8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8002F0DC 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/dComIfGs_setLastWarpMarkItemData__FPCc4cXyzsScUcUc.s b/asm/d/com/d_com_inf_game/dComIfGs_setLastWarpMarkItemData__FPCc4cXyzsScUcUc.s deleted file mode 100644 index 72f3cd44620..00000000000 --- a/asm/d/com/d_com_inf_game/dComIfGs_setLastWarpMarkItemData__FPCc4cXyzsScUcUc.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_8002F24C: -/* 8002F24C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002F250 7C 08 02 A6 */ mflr r0 -/* 8002F254 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002F258 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8002F25C 7C 7F 1B 78 */ mr r31, r3 -/* 8002F260 7C 8C 23 78 */ mr r12, r4 -/* 8002F264 7C AB 2B 78 */ mr r11, r5 -/* 8002F268 7C CA 33 78 */ mr r10, r6 -/* 8002F26C 7C E0 3B 78 */ mr r0, r7 -/* 8002F270 7D 09 43 78 */ mr r9, r8 -/* 8002F274 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002F278 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002F27C 38 63 00 80 */ addi r3, r3, 0x80 -/* 8002F280 7F E4 FB 78 */ mr r4, r31 -/* 8002F284 7D 85 63 78 */ mr r5, r12 -/* 8002F288 7D 66 5B 78 */ mr r6, r11 -/* 8002F28C 7D 47 53 78 */ mr r7, r10 -/* 8002F290 7C 08 03 78 */ mr r8, r0 -/* 8002F294 48 00 3C 99 */ bl setWarpItemData__27dSv_player_last_mark_info_cFPCcRC4cXyzsScUcUc -/* 8002F298 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8002F29C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8002F2A0 7C 08 03 A6 */ mtlr r0 -/* 8002F2A4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002F2A8 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/dComIfGs_setMixItemIndex__FiUc.s b/asm/d/com/d_com_inf_game/dComIfGs_setMixItemIndex__FiUc.s deleted file mode 100644 index 1a78a5c7e05..00000000000 --- a/asm/d/com/d_com_inf_game/dComIfGs_setMixItemIndex__FiUc.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_8002DD08: -/* 8002DD08 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002DD0C 7C 08 02 A6 */ mflr r0 -/* 8002DD10 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002DD14 7C 60 1B 78 */ mr r0, r3 -/* 8002DD18 7C 85 23 78 */ mr r5, r4 -/* 8002DD1C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002DD20 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002DD24 7C 04 03 78 */ mr r4, r0 -/* 8002DD28 48 00 4D 51 */ bl setMixItemIndex__21dSv_player_status_a_cFiUc -/* 8002DD2C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8002DD30 7C 08 03 A6 */ mtlr r0 -/* 8002DD34 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002DD38 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/dComIfGs_setSelectEquipClothes__FUc.s b/asm/d/com/d_com_inf_game/dComIfGs_setSelectEquipClothes__FUc.s deleted file mode 100644 index 2bed8db3066..00000000000 --- a/asm/d/com/d_com_inf_game/dComIfGs_setSelectEquipClothes__FUc.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_8002EEB0: -/* 8002EEB0 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002EEB4 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002EEB8 98 64 00 13 */ stb r3, 0x13(r4) -/* 8002EEBC 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/dComIfGs_setSelectEquipShield__FUc.s b/asm/d/com/d_com_inf_game/dComIfGs_setSelectEquipShield__FUc.s deleted file mode 100644 index d9788b5998c..00000000000 --- a/asm/d/com/d_com_inf_game/dComIfGs_setSelectEquipShield__FUc.s +++ /dev/null @@ -1,49 +0,0 @@ -lbl_8002EF94: -/* 8002EF94 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002EF98 7C 08 02 A6 */ mflr r0 -/* 8002EF9C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002EFA0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8002EFA4 7C 7F 1B 78 */ mr r31, r3 -/* 8002EFA8 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8002EFAC 2C 00 00 2B */ cmpwi r0, 0x2b -/* 8002EFB0 41 82 00 3C */ beq lbl_8002EFEC -/* 8002EFB4 40 80 00 10 */ bge lbl_8002EFC4 -/* 8002EFB8 2C 00 00 2A */ cmpwi r0, 0x2a -/* 8002EFBC 40 80 00 14 */ bge lbl_8002EFD0 -/* 8002EFC0 48 00 00 60 */ b lbl_8002F020 -lbl_8002EFC4: -/* 8002EFC4 2C 00 00 2D */ cmpwi r0, 0x2d -/* 8002EFC8 40 80 00 58 */ bge lbl_8002F020 -/* 8002EFCC 48 00 00 3C */ b lbl_8002F008 -lbl_8002EFD0: -/* 8002EFD0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002EFD4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002EFD8 38 63 01 00 */ addi r3, r3, 0x100 -/* 8002EFDC 38 80 00 02 */ li r4, 2 -/* 8002EFE0 38 A0 00 00 */ li r5, 0 -/* 8002EFE4 48 00 52 05 */ bl setCollect__20dSv_player_collect_cFiUc -/* 8002EFE8 48 00 00 38 */ b lbl_8002F020 -lbl_8002EFEC: -/* 8002EFEC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002EFF0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002EFF4 38 63 01 00 */ addi r3, r3, 0x100 -/* 8002EFF8 38 80 00 02 */ li r4, 2 -/* 8002EFFC 38 A0 00 01 */ li r5, 1 -/* 8002F000 48 00 51 E9 */ bl setCollect__20dSv_player_collect_cFiUc -/* 8002F004 48 00 00 1C */ b lbl_8002F020 -lbl_8002F008: -/* 8002F008 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002F00C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002F010 38 63 01 00 */ addi r3, r3, 0x100 -/* 8002F014 38 80 00 02 */ li r4, 2 -/* 8002F018 38 A0 00 02 */ li r5, 2 -/* 8002F01C 48 00 51 CD */ bl setCollect__20dSv_player_collect_cFiUc -lbl_8002F020: -/* 8002F020 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002F024 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002F028 9B E3 00 15 */ stb r31, 0x15(r3) -/* 8002F02C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8002F030 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8002F034 7C 08 03 A6 */ mtlr r0 -/* 8002F038 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002F03C 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/dComIfGs_setSelectEquipSword__FUc.s b/asm/d/com/d_com_inf_game/dComIfGs_setSelectEquipSword__FUc.s deleted file mode 100644 index e626be097c7..00000000000 --- a/asm/d/com/d_com_inf_game/dComIfGs_setSelectEquipSword__FUc.s +++ /dev/null @@ -1,60 +0,0 @@ -lbl_8002EEC0: -/* 8002EEC0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002EEC4 7C 08 02 A6 */ mflr r0 -/* 8002EEC8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002EECC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8002EED0 7C 7F 1B 78 */ mr r31, r3 -/* 8002EED4 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8002EED8 2C 00 00 3F */ cmpwi r0, 0x3f -/* 8002EEDC 41 82 00 64 */ beq lbl_8002EF40 -/* 8002EEE0 40 80 00 1C */ bge lbl_8002EEFC -/* 8002EEE4 2C 00 00 29 */ cmpwi r0, 0x29 -/* 8002EEE8 41 82 00 3C */ beq lbl_8002EF24 -/* 8002EEEC 40 80 00 88 */ bge lbl_8002EF74 -/* 8002EEF0 2C 00 00 28 */ cmpwi r0, 0x28 -/* 8002EEF4 40 80 00 14 */ bge lbl_8002EF08 -/* 8002EEF8 48 00 00 7C */ b lbl_8002EF74 -lbl_8002EEFC: -/* 8002EEFC 2C 00 00 49 */ cmpwi r0, 0x49 -/* 8002EF00 41 82 00 5C */ beq lbl_8002EF5C -/* 8002EF04 48 00 00 70 */ b lbl_8002EF74 -lbl_8002EF08: -/* 8002EF08 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002EF0C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002EF10 38 63 01 00 */ addi r3, r3, 0x100 -/* 8002EF14 38 80 00 01 */ li r4, 1 -/* 8002EF18 38 A0 00 00 */ li r5, 0 -/* 8002EF1C 48 00 52 CD */ bl setCollect__20dSv_player_collect_cFiUc -/* 8002EF20 48 00 00 54 */ b lbl_8002EF74 -lbl_8002EF24: -/* 8002EF24 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002EF28 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002EF2C 38 63 01 00 */ addi r3, r3, 0x100 -/* 8002EF30 38 80 00 01 */ li r4, 1 -/* 8002EF34 38 A0 00 01 */ li r5, 1 -/* 8002EF38 48 00 52 B1 */ bl setCollect__20dSv_player_collect_cFiUc -/* 8002EF3C 48 00 00 38 */ b lbl_8002EF74 -lbl_8002EF40: -/* 8002EF40 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002EF44 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002EF48 38 63 01 00 */ addi r3, r3, 0x100 -/* 8002EF4C 38 80 00 01 */ li r4, 1 -/* 8002EF50 38 A0 00 02 */ li r5, 2 -/* 8002EF54 48 00 52 95 */ bl setCollect__20dSv_player_collect_cFiUc -/* 8002EF58 48 00 00 1C */ b lbl_8002EF74 -lbl_8002EF5C: -/* 8002EF5C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002EF60 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002EF64 38 63 01 00 */ addi r3, r3, 0x100 -/* 8002EF68 38 80 00 01 */ li r4, 1 -/* 8002EF6C 38 A0 00 03 */ li r5, 3 -/* 8002EF70 48 00 52 79 */ bl setCollect__20dSv_player_collect_cFiUc -lbl_8002EF74: -/* 8002EF74 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002EF78 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002EF7C 9B E3 00 14 */ stb r31, 0x14(r3) -/* 8002EF80 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8002EF84 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8002EF88 7C 08 03 A6 */ mtlr r0 -/* 8002EF8C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002EF90 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/dComIfGs_setSelectItemIndex__FiUc.s b/asm/d/com/d_com_inf_game/dComIfGs_setSelectItemIndex__FiUc.s deleted file mode 100644 index 5406e1c0d6e..00000000000 --- a/asm/d/com/d_com_inf_game/dComIfGs_setSelectItemIndex__FiUc.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_8002DCC4: -/* 8002DCC4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002DCC8 7C 08 02 A6 */ mflr r0 -/* 8002DCCC 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002DCD0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8002DCD4 7C 7F 1B 78 */ mr r31, r3 -/* 8002DCD8 7C 85 23 78 */ mr r5, r4 -/* 8002DCDC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002DCE0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002DCE4 7F E4 FB 78 */ mr r4, r31 -/* 8002DCE8 48 00 4D 61 */ bl setSelectItemIndex__21dSv_player_status_a_cFiUc -/* 8002DCEC 7F E3 FB 78 */ mr r3, r31 -/* 8002DCF0 48 00 01 05 */ bl dComIfGp_setSelectItem__Fi -/* 8002DCF4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8002DCF8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8002DCFC 7C 08 03 A6 */ mtlr r0 -/* 8002DD00 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002DD04 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/dComIfGs_setWarpItemData__FPCc4cXyzsScUcUc.s b/asm/d/com/d_com_inf_game/dComIfGs_setWarpItemData__FPCc4cXyzsScUcUc.s deleted file mode 100644 index c847bcebe25..00000000000 --- a/asm/d/com/d_com_inf_game/dComIfGs_setWarpItemData__FPCc4cXyzsScUcUc.s +++ /dev/null @@ -1,45 +0,0 @@ -lbl_8002F19C: -/* 8002F19C 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 8002F1A0 7C 08 02 A6 */ mflr r0 -/* 8002F1A4 90 01 00 44 */ stw r0, 0x44(r1) -/* 8002F1A8 39 61 00 40 */ addi r11, r1, 0x40 -/* 8002F1AC 48 33 30 25 */ bl _savegpr_26 -/* 8002F1B0 7C 7A 1B 78 */ mr r26, r3 -/* 8002F1B4 7C 9B 23 78 */ mr r27, r4 -/* 8002F1B8 7C BC 2B 78 */ mr r28, r5 -/* 8002F1BC 7C DD 33 78 */ mr r29, r6 -/* 8002F1C0 7C FE 3B 78 */ mr r30, r7 -/* 8002F1C4 7D 1F 43 78 */ mr r31, r8 -/* 8002F1C8 C0 04 00 00 */ lfs f0, 0(r4) -/* 8002F1CC D0 01 00 14 */ stfs f0, 0x14(r1) -/* 8002F1D0 C0 04 00 04 */ lfs f0, 4(r4) -/* 8002F1D4 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 8002F1D8 C0 04 00 08 */ lfs f0, 8(r4) -/* 8002F1DC D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 8002F1E0 38 60 00 00 */ li r3, 0 -/* 8002F1E4 7F 44 D3 78 */ mr r4, r26 -/* 8002F1E8 38 A1 00 14 */ addi r5, r1, 0x14 -/* 8002F1EC 7F 86 E3 78 */ mr r6, r28 -/* 8002F1F0 7F A7 EB 78 */ mr r7, r29 -/* 8002F1F4 7F C8 F3 78 */ mr r8, r30 -/* 8002F1F8 7F E9 FB 78 */ mr r9, r31 -/* 8002F1FC 4B FF FE E5 */ bl dComIfGs_setWarpItemData__FiPCc4cXyzsScUcUc -/* 8002F200 C0 1B 00 00 */ lfs f0, 0(r27) -/* 8002F204 D0 01 00 08 */ stfs f0, 8(r1) -/* 8002F208 C0 1B 00 04 */ lfs f0, 4(r27) -/* 8002F20C D0 01 00 0C */ stfs f0, 0xc(r1) -/* 8002F210 C0 1B 00 08 */ lfs f0, 8(r27) -/* 8002F214 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 8002F218 7F 43 D3 78 */ mr r3, r26 -/* 8002F21C 38 81 00 08 */ addi r4, r1, 8 -/* 8002F220 7F 85 E3 78 */ mr r5, r28 -/* 8002F224 7F A6 EB 78 */ mr r6, r29 -/* 8002F228 7F C7 F3 78 */ mr r7, r30 -/* 8002F22C 7F E8 FB 78 */ mr r8, r31 -/* 8002F230 48 00 00 1D */ bl dComIfGs_setLastWarpMarkItemData__FPCc4cXyzsScUcUc -/* 8002F234 39 61 00 40 */ addi r11, r1, 0x40 -/* 8002F238 48 33 2F E5 */ bl _restgpr_26 -/* 8002F23C 80 01 00 44 */ lwz r0, 0x44(r1) -/* 8002F240 7C 08 03 A6 */ mtlr r0 -/* 8002F244 38 21 00 40 */ addi r1, r1, 0x40 -/* 8002F248 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/dComIfGs_setWarpItemData__FiPCc4cXyzsScUcUc.s b/asm/d/com/d_com_inf_game/dComIfGs_setWarpItemData__FiPCc4cXyzsScUcUc.s deleted file mode 100644 index e935f462760..00000000000 --- a/asm/d/com/d_com_inf_game/dComIfGs_setWarpItemData__FiPCc4cXyzsScUcUc.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_8002F0E0: -/* 8002F0E0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8002F0E4 7C 08 02 A6 */ mflr r0 -/* 8002F0E8 90 01 00 24 */ stw r0, 0x24(r1) -/* 8002F0EC C0 05 00 00 */ lfs f0, 0(r5) -/* 8002F0F0 D0 01 00 08 */ stfs f0, 8(r1) -/* 8002F0F4 C0 05 00 04 */ lfs f0, 4(r5) -/* 8002F0F8 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 8002F0FC C0 05 00 08 */ lfs f0, 8(r5) -/* 8002F100 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 8002F104 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002F108 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002F10C 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 8002F110 38 A1 00 08 */ addi r5, r1, 8 -/* 8002F114 48 00 00 15 */ bl setWarpItemData__14dComIfG_play_cFPCc4cXyzsScUcUc -/* 8002F118 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8002F11C 7C 08 03 A6 */ mtlr r0 -/* 8002F120 38 21 00 20 */ addi r1, r1, 0x20 -/* 8002F124 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/dComIfGs_shake_kandelaar__Fv.s b/asm/d/com/d_com_inf_game/dComIfGs_shake_kandelaar__Fv.s deleted file mode 100644 index 38c217490e5..00000000000 --- a/asm/d/com/d_com_inf_game/dComIfGs_shake_kandelaar__Fv.s +++ /dev/null @@ -1,7 +0,0 @@ -lbl_8002FA18: -/* 8002FA18 38 00 00 01 */ li r0, 1 -/* 8002FA1C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002FA20 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002FA24 3C 63 00 02 */ addis r3, r3, 2 -/* 8002FA28 98 03 DD FA */ stb r0, -0x2206(r3) -/* 8002FA2C 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/dComIfGs_shake_kandelaar_check__Fv.s b/asm/d/com/d_com_inf_game/dComIfGs_shake_kandelaar_check__Fv.s deleted file mode 100644 index 5d0fa5960a1..00000000000 --- a/asm/d/com/d_com_inf_game/dComIfGs_shake_kandelaar_check__Fv.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_8002FA30: -/* 8002FA30 38 60 00 00 */ li r3, 0 -/* 8002FA34 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002FA38 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002FA3C 3C 84 00 02 */ addis r4, r4, 2 -/* 8002FA40 88 04 DD FA */ lbz r0, -0x2206(r4) -/* 8002FA44 2C 00 00 02 */ cmpwi r0, 2 -/* 8002FA48 4C 82 00 20 */ bnelr -/* 8002FA4C 38 60 00 01 */ li r3, 1 -/* 8002FA50 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/getZoneNo__20dStage_roomControl_cFi.s b/asm/d/com/d_com_inf_game/getZoneNo__20dStage_roomControl_cFi.s deleted file mode 100644 index 29c87ae93fd..00000000000 --- a/asm/d/com/d_com_inf_game/getZoneNo__20dStage_roomControl_cFi.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_8002D9B0: -/* 8002D9B0 3C 80 80 3F */ lis r4, mStatus__20dStage_roomControl_c@ha /* 0x803F6094@ha */ -/* 8002D9B4 38 84 60 94 */ addi r4, r4, mStatus__20dStage_roomControl_c@l /* 0x803F6094@l */ -/* 8002D9B8 1C 03 04 04 */ mulli r0, r3, 0x404 -/* 8002D9BC 7C 64 02 14 */ add r3, r4, r0 -/* 8002D9C0 88 63 03 F7 */ lbz r3, 0x3f7(r3) -/* 8002D9C4 7C 63 07 74 */ extsb r3, r3 -/* 8002D9C8 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/init__14dComIfG_play_cFv.s b/asm/d/com/d_com_inf_game/init__14dComIfG_play_cFv.s deleted file mode 100644 index fcf2ef1589b..00000000000 --- a/asm/d/com/d_com_inf_game/init__14dComIfG_play_cFv.s +++ /dev/null @@ -1,34 +0,0 @@ -lbl_8002B22C: -/* 8002B22C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002B230 7C 08 02 A6 */ mflr r0 -/* 8002B234 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002B238 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8002B23C 7C 7F 1B 78 */ mr r31, r3 -/* 8002B240 38 80 00 00 */ li r4, 0 -/* 8002B244 38 00 FF FF */ li r0, -1 -/* 8002B248 90 83 4E 74 */ stw r4, 0x4e74(r3) -/* 8002B24C 98 03 4E 78 */ stb r0, 0x4e78(r3) -/* 8002B250 90 83 4E 3C */ stw r4, 0x4e3c(r3) -/* 8002B254 38 60 00 00 */ li r3, 0 -/* 8002B258 38 00 00 02 */ li r0, 2 -/* 8002B25C 7C 09 03 A6 */ mtctr r0 -lbl_8002B260: -/* 8002B260 38 03 4E 7C */ addi r0, r3, 0x4e7c -/* 8002B264 7C 9F 01 2E */ stwx r4, r31, r0 -/* 8002B268 38 63 00 04 */ addi r3, r3, 4 -/* 8002B26C 42 00 FF F4 */ bdnz lbl_8002B260 -/* 8002B270 88 1F 4F 51 */ lbz r0, 0x4f51(r31) -/* 8002B274 28 00 00 02 */ cmplwi r0, 2 -/* 8002B278 40 82 00 14 */ bne lbl_8002B28C -/* 8002B27C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002B280 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002B284 38 63 4E C4 */ addi r3, r3, 0x4ec4 -/* 8002B288 4B FF 90 B1 */ bl initZone__20dStage_roomControl_cFv -lbl_8002B28C: -/* 8002B28C 38 00 00 00 */ li r0, 0 -/* 8002B290 98 1F 4F 51 */ stb r0, 0x4f51(r31) -/* 8002B294 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8002B298 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8002B29C 7C 08 03 A6 */ mtlr r0 -/* 8002B2A0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002B2A4 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/itemInit__14dComIfG_play_cFv.s b/asm/d/com/d_com_inf_game/itemInit__14dComIfG_play_cFv.s deleted file mode 100644 index 9ab55618798..00000000000 --- a/asm/d/com/d_com_inf_game/itemInit__14dComIfG_play_cFv.s +++ /dev/null @@ -1,44 +0,0 @@ -lbl_8002B2C8: -/* 8002B2C8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002B2CC 7C 08 02 A6 */ mflr r0 -/* 8002B2D0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002B2D4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8002B2D8 93 C1 00 08 */ stw r30, 8(r1) -/* 8002B2DC 7C 7E 1B 78 */ mr r30, r3 -/* 8002B2E0 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 8002B2E4 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 8002B2E8 48 1F 0B 81 */ bl init__13dMeter2Info_cFv -/* 8002B2EC 83 FE 4F 84 */ lwz r31, 0x4f84(r30) -/* 8002B2F0 38 7E 4E 84 */ addi r3, r30, 0x4e84 -/* 8002B2F4 38 80 00 00 */ li r4, 0 -/* 8002B2F8 38 A0 01 2C */ li r5, 0x12c -/* 8002B2FC 4B FD 81 5D */ bl memset -/* 8002B300 93 FE 4F 84 */ stw r31, 0x4f84(r30) -/* 8002B304 38 00 02 58 */ li r0, 0x258 -/* 8002B308 90 1E 4E A8 */ stw r0, 0x4ea8(r30) -/* 8002B30C 90 1E 4E AC */ stw r0, 0x4eac(r30) -/* 8002B310 90 1E 4E B0 */ stw r0, 0x4eb0(r30) -/* 8002B314 38 60 00 3E */ li r3, 0x3e -/* 8002B318 48 00 31 B5 */ bl dComIfGs_checkGetItem__FUc -/* 8002B31C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8002B320 41 82 00 10 */ beq lbl_8002B330 -/* 8002B324 38 00 00 00 */ li r0, 0 -/* 8002B328 98 1E 4F 4B */ stb r0, 0x4f4b(r30) -/* 8002B32C 48 00 00 0C */ b lbl_8002B338 -lbl_8002B330: -/* 8002B330 38 00 00 15 */ li r0, 0x15 -/* 8002B334 98 1E 4F 4B */ stb r0, 0x4f4b(r30) -lbl_8002B338: -/* 8002B338 38 00 00 07 */ li r0, 7 -/* 8002B33C 98 1E 4F 4C */ stb r0, 0x4f4c(r30) -/* 8002B340 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002B344 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002B348 38 63 01 E0 */ addi r3, r3, 0x1e0 -/* 8002B34C 48 00 93 49 */ bl getVibration__19dSv_player_config_cFv -/* 8002B350 98 7E 4F 5A */ stb r3, 0x4f5a(r30) -/* 8002B354 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8002B358 83 C1 00 08 */ lwz r30, 8(r1) -/* 8002B35C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8002B360 7C 08 03 A6 */ mtlr r0 -/* 8002B364 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002B368 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/phase_1__FPc.s b/asm/d/com/d_com_inf_game/phase_1__FPc.s deleted file mode 100644 index 1ddcc71bcec..00000000000 --- a/asm/d/com/d_com_inf_game/phase_1__FPc.s +++ /dev/null @@ -1,35 +0,0 @@ -lbl_8002CDB8: -/* 8002CDB8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002CDBC 7C 08 02 A6 */ mflr r0 -/* 8002CDC0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002CDC4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8002CDC8 7C 7F 1B 78 */ mr r31, r3 -/* 8002CDCC 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002CDD0 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002CDD4 3C 84 00 02 */ addis r4, r4, 2 -/* 8002CDD8 38 A0 00 80 */ li r5, 0x80 -/* 8002CDDC 3C C0 80 38 */ lis r6, d_com_d_com_inf_game__stringBase0@ha /* 0x80378F38@ha */ -/* 8002CDE0 38 C6 8F 38 */ addi r6, r6, d_com_d_com_inf_game__stringBase0@l /* 0x80378F38@l */ -/* 8002CDE4 38 C6 01 13 */ addi r6, r6, 0x113 -/* 8002CDE8 38 E0 00 00 */ li r7, 0 -/* 8002CDEC 39 00 00 00 */ li r8, 0 -/* 8002CDF0 38 84 C2 F8 */ addi r4, r4, -15624 -/* 8002CDF4 48 00 F2 85 */ bl setRes__14dRes_control_cFPCcP11dRes_info_ciPCcUcP7JKRHeap -/* 8002CDF8 2C 03 00 00 */ cmpwi r3, 0 -/* 8002CDFC 40 82 00 24 */ bne lbl_8002CE20 -/* 8002CE00 3C 60 80 38 */ lis r3, d_com_d_com_inf_game__stringBase0@ha /* 0x80378F38@ha */ -/* 8002CE04 38 63 8F 38 */ addi r3, r3, d_com_d_com_inf_game__stringBase0@l /* 0x80378F38@l */ -/* 8002CE08 38 63 01 20 */ addi r3, r3, 0x120 -/* 8002CE0C 7F E4 FB 78 */ mr r4, r31 -/* 8002CE10 4C C6 31 82 */ crclr 6 -/* 8002CE14 4B FD 9D F9 */ bl OSReport_Error -/* 8002CE18 38 60 00 05 */ li r3, 5 -/* 8002CE1C 48 00 00 08 */ b lbl_8002CE24 -lbl_8002CE20: -/* 8002CE20 38 60 00 02 */ li r3, 2 -lbl_8002CE24: -/* 8002CE24 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8002CE28 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8002CE2C 7C 08 03 A6 */ mtlr r0 -/* 8002CE30 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002CE34 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/phase_2__FPc.s b/asm/d/com/d_com_inf_game/phase_2__FPc.s deleted file mode 100644 index f153ffd4d7d..00000000000 --- a/asm/d/com/d_com_inf_game/phase_2__FPc.s +++ /dev/null @@ -1,34 +0,0 @@ -lbl_8002CE38: -/* 8002CE38 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8002CE3C 7C 08 02 A6 */ mflr r0 -/* 8002CE40 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002CE44 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8002CE48 7C 7F 1B 78 */ mr r31, r3 -/* 8002CE4C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8002CE50 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8002CE54 3C 84 00 02 */ addis r4, r4, 2 -/* 8002CE58 38 A0 00 80 */ li r5, 0x80 -/* 8002CE5C 38 84 C2 F8 */ addi r4, r4, -15624 -/* 8002CE60 48 00 F3 01 */ bl syncRes__14dRes_control_cFPCcP11dRes_info_ci -/* 8002CE64 2C 03 00 00 */ cmpwi r3, 0 -/* 8002CE68 40 80 00 24 */ bge lbl_8002CE8C -/* 8002CE6C 3C 60 80 38 */ lis r3, d_com_d_com_inf_game__stringBase0@ha /* 0x80378F38@ha */ -/* 8002CE70 38 63 8F 38 */ addi r3, r3, d_com_d_com_inf_game__stringBase0@l /* 0x80378F38@l */ -/* 8002CE74 38 63 01 36 */ addi r3, r3, 0x136 -/* 8002CE78 7F E4 FB 78 */ mr r4, r31 -/* 8002CE7C 4C C6 31 82 */ crclr 6 -/* 8002CE80 4B FD 9D 8D */ bl OSReport_Error -/* 8002CE84 38 60 00 05 */ li r3, 5 -/* 8002CE88 48 00 00 18 */ b lbl_8002CEA0 -lbl_8002CE8C: -/* 8002CE8C 7C 03 00 D0 */ neg r0, r3 -/* 8002CE90 7C 00 18 78 */ andc r0, r0, r3 -/* 8002CE94 7C 03 FE 70 */ srawi r3, r0, 0x1f -/* 8002CE98 38 00 00 02 */ li r0, 2 -/* 8002CE9C 7C 03 18 78 */ andc r3, r0, r3 -lbl_8002CEA0: -/* 8002CEA0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8002CEA4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8002CEA8 7C 08 03 A6 */ mtlr r0 -/* 8002CEAC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002CEB0 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/setStartStage__14dComIfG_play_cFP19dStage_startStage_c.s b/asm/d/com/d_com_inf_game/setStartStage__14dComIfG_play_cFP19dStage_startStage_c.s deleted file mode 100644 index 458dd8ce769..00000000000 --- a/asm/d/com/d_com_inf_game/setStartStage__14dComIfG_play_cFP19dStage_startStage_c.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_8002B3B8: -/* 8002B3B8 88 03 3E D3 */ lbz r0, 0x3ed3(r3) -/* 8002B3BC 98 03 4E 0D */ stb r0, 0x4e0d(r3) -/* 8002B3C0 80 A4 00 00 */ lwz r5, 0(r4) -/* 8002B3C4 80 04 00 04 */ lwz r0, 4(r4) -/* 8002B3C8 90 A3 3E C8 */ stw r5, 0x3ec8(r3) -/* 8002B3CC 90 03 3E CC */ stw r0, 0x3ecc(r3) -/* 8002B3D0 A8 04 00 08 */ lha r0, 8(r4) -/* 8002B3D4 B0 03 3E D0 */ sth r0, 0x3ed0(r3) -/* 8002B3D8 88 04 00 0A */ lbz r0, 0xa(r4) -/* 8002B3DC 98 03 3E D2 */ stb r0, 0x3ed2(r3) -/* 8002B3E0 88 04 00 0B */ lbz r0, 0xb(r4) -/* 8002B3E4 98 03 3E D3 */ stb r0, 0x3ed3(r3) -/* 8002B3E8 88 04 00 0C */ lbz r0, 0xc(r4) -/* 8002B3EC 98 03 3E D4 */ stb r0, 0x3ed4(r3) -/* 8002B3F0 4E 80 00 20 */ blr diff --git a/asm/d/com/d_com_inf_game/setWarpItemData__14dComIfG_play_cFPCc4cXyzsScUcUc.s b/asm/d/com/d_com_inf_game/setWarpItemData__14dComIfG_play_cFPCc4cXyzsScUcUc.s deleted file mode 100644 index 84fd8c7443f..00000000000 --- a/asm/d/com/d_com_inf_game/setWarpItemData__14dComIfG_play_cFPCc4cXyzsScUcUc.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_8002F128: -/* 8002F128 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8002F12C 7C 08 02 A6 */ mflr r0 -/* 8002F130 90 01 00 24 */ stw r0, 0x24(r1) -/* 8002F134 39 61 00 20 */ addi r11, r1, 0x20 -/* 8002F138 48 33 30 99 */ bl _savegpr_26 -/* 8002F13C 7C 7A 1B 78 */ mr r26, r3 -/* 8002F140 7C BB 2B 78 */ mr r27, r5 -/* 8002F144 7C DC 33 78 */ mr r28, r6 -/* 8002F148 7C FD 3B 78 */ mr r29, r7 -/* 8002F14C 7D 1E 43 78 */ mr r30, r8 -/* 8002F150 7D 3F 4B 78 */ mr r31, r9 -/* 8002F154 38 7A 4F 94 */ addi r3, r26, 0x4f94 -/* 8002F158 48 33 99 D5 */ bl strcpy -/* 8002F15C C0 1B 00 00 */ lfs f0, 0(r27) -/* 8002F160 D0 1A 4F 9C */ stfs f0, 0x4f9c(r26) -/* 8002F164 C0 1B 00 04 */ lfs f0, 4(r27) -/* 8002F168 D0 1A 4F A0 */ stfs f0, 0x4fa0(r26) -/* 8002F16C C0 1B 00 08 */ lfs f0, 8(r27) -/* 8002F170 D0 1A 4F A4 */ stfs f0, 0x4fa4(r26) -/* 8002F174 B3 9A 4F A8 */ sth r28, 0x4fa8(r26) -/* 8002F178 9B BA 4F AA */ stb r29, 0x4faa(r26) -/* 8002F17C 9B FA 4F AC */ stb r31, 0x4fac(r26) -/* 8002F180 9B DA 4F AB */ stb r30, 0x4fab(r26) -/* 8002F184 39 61 00 20 */ addi r11, r1, 0x20 -/* 8002F188 48 33 30 95 */ bl _restgpr_26 -/* 8002F18C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8002F190 7C 08 03 A6 */ mtlr r0 -/* 8002F194 38 21 00 20 */ addi r1, r1, 0x20 -/* 8002F198 4E 80 00 20 */ blr diff --git a/asm/d/d_item/checkItemGet__FUci.s b/asm/d/d_item/checkItemGet__FUci.s deleted file mode 100644 index c6f72aad793..00000000000 --- a/asm/d/d_item/checkItemGet__FUci.s +++ /dev/null @@ -1,21 +0,0 @@ -lbl_80097EE0: -/* 80097EE0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80097EE4 7C 08 02 A6 */ mflr r0 -/* 80097EE8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80097EEC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80097EF0 7C 9F 23 78 */ mr r31, r4 -/* 80097EF4 54 60 15 BA */ rlwinm r0, r3, 2, 0x16, 0x1d -/* 80097EF8 3C 60 80 3B */ lis r3, item_getcheck_func_ptr@ha /* 0x803AF578@ha */ -/* 80097EFC 38 63 F5 78 */ addi r3, r3, item_getcheck_func_ptr@l /* 0x803AF578@l */ -/* 80097F00 7D 83 00 2E */ lwzx r12, r3, r0 -/* 80097F04 7D 89 03 A6 */ mtctr r12 -/* 80097F08 4E 80 04 21 */ bctrl -/* 80097F0C 2C 03 FF FF */ cmpwi r3, -1 -/* 80097F10 40 82 00 08 */ bne lbl_80097F18 -/* 80097F14 7F E3 FB 78 */ mr r3, r31 -lbl_80097F18: -/* 80097F18 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80097F1C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80097F20 7C 08 03 A6 */ mtlr r0 -/* 80097F24 38 21 00 10 */ addi r1, r1, 0x10 -/* 80097F28 4E 80 00 20 */ blr diff --git a/asm/d/d_item/check_itemno__Fi.s b/asm/d/d_item/check_itemno__Fi.s deleted file mode 100644 index ff7b744eee9..00000000000 --- a/asm/d/d_item/check_itemno__Fi.s +++ /dev/null @@ -1,108 +0,0 @@ -lbl_8009B7C4: -/* 8009B7C4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009B7C8 7C 08 02 A6 */ mflr r0 -/* 8009B7CC 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009B7D0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8009B7D4 7C 7F 1B 78 */ mr r31, r3 -/* 8009B7D8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009B7DC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009B7E0 38 80 00 00 */ li r4, 0 -/* 8009B7E4 4B F9 73 15 */ bl isMagicFlag__21dSv_player_status_a_cCFUc -/* 8009B7E8 2C 03 00 00 */ cmpwi r3, 0 -/* 8009B7EC 40 82 00 1C */ bne lbl_8009B808 -/* 8009B7F0 2C 1F 00 08 */ cmpwi r31, 8 -/* 8009B7F4 41 82 00 0C */ beq lbl_8009B800 -/* 8009B7F8 2C 1F 00 09 */ cmpwi r31, 9 -/* 8009B7FC 40 82 00 0C */ bne lbl_8009B808 -lbl_8009B800: -/* 8009B800 38 60 00 01 */ li r3, 1 -/* 8009B804 48 00 01 28 */ b lbl_8009B92C -lbl_8009B808: -/* 8009B808 2C 1F 00 11 */ cmpwi r31, 0x11 -/* 8009B80C 40 82 00 28 */ bne lbl_8009B834 -/* 8009B810 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009B814 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009B818 38 63 00 CC */ addi r3, r3, 0xcc -/* 8009B81C 38 80 00 43 */ li r4, 0x43 -/* 8009B820 4B F9 86 A9 */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 8009B824 2C 03 00 00 */ cmpwi r3, 0 -/* 8009B828 40 82 00 8C */ bne lbl_8009B8B4 -/* 8009B82C 38 60 00 01 */ li r3, 1 -/* 8009B830 48 00 00 FC */ b lbl_8009B92C -lbl_8009B834: -/* 8009B834 57 E3 06 3E */ clrlwi r3, r31, 0x18 -/* 8009B838 4B FF FE 9D */ bl isArrow__FUc -/* 8009B83C 2C 03 00 00 */ cmpwi r3, 0 -/* 8009B840 41 82 00 74 */ beq lbl_8009B8B4 -/* 8009B844 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009B848 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009B84C 38 63 00 CC */ addi r3, r3, 0xcc -/* 8009B850 38 80 00 43 */ li r4, 0x43 -/* 8009B854 4B F9 86 75 */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 8009B858 2C 03 00 00 */ cmpwi r3, 0 -/* 8009B85C 40 82 00 0C */ bne lbl_8009B868 -/* 8009B860 38 60 00 01 */ li r3, 1 -/* 8009B864 48 00 00 C8 */ b lbl_8009B92C -lbl_8009B868: -/* 8009B868 38 60 00 00 */ li r3, 0 -/* 8009B86C 4B F9 11 11 */ bl getLayerNo__14dComIfG_play_cFi -/* 8009B870 2C 03 00 0D */ cmpwi r3, 0xd -/* 8009B874 41 82 00 14 */ beq lbl_8009B888 -/* 8009B878 38 60 00 00 */ li r3, 0 -/* 8009B87C 4B F9 11 01 */ bl getLayerNo__14dComIfG_play_cFi -/* 8009B880 2C 03 00 0E */ cmpwi r3, 0xe -/* 8009B884 40 82 00 30 */ bne lbl_8009B8B4 -lbl_8009B888: -/* 8009B888 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009B88C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009B890 38 63 4E 00 */ addi r3, r3, 0x4e00 -/* 8009B894 3C 80 80 38 */ lis r4, d_d_item__stringBase0@ha /* 0x8037B0D0@ha */ -/* 8009B898 38 84 B0 D0 */ addi r4, r4, d_d_item__stringBase0@l /* 0x8037B0D0@l */ -/* 8009B89C 38 A0 00 06 */ li r5, 6 -/* 8009B8A0 48 2C D0 B5 */ bl strncmp -/* 8009B8A4 2C 03 00 00 */ cmpwi r3, 0 -/* 8009B8A8 41 82 00 0C */ beq lbl_8009B8B4 -/* 8009B8AC 38 60 00 01 */ li r3, 1 -/* 8009B8B0 48 00 00 7C */ b lbl_8009B92C -lbl_8009B8B4: -/* 8009B8B4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009B8B8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009B8BC 38 63 00 CC */ addi r3, r3, 0xcc -/* 8009B8C0 38 80 00 50 */ li r4, 0x50 -/* 8009B8C4 4B F9 86 05 */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 8009B8C8 2C 03 00 00 */ cmpwi r3, 0 -/* 8009B8CC 40 82 00 1C */ bne lbl_8009B8E8 -/* 8009B8D0 57 E3 06 3E */ clrlwi r3, r31, 0x18 -/* 8009B8D4 4B FF FD B5 */ bl isBomb__FUc -/* 8009B8D8 2C 03 00 00 */ cmpwi r3, 0 -/* 8009B8DC 41 82 00 0C */ beq lbl_8009B8E8 -/* 8009B8E0 38 60 00 01 */ li r3, 1 -/* 8009B8E4 48 00 00 48 */ b lbl_8009B92C -lbl_8009B8E8: -/* 8009B8E8 2C 1F 00 1F */ cmpwi r31, 0x1f -/* 8009B8EC 40 82 00 08 */ bne lbl_8009B8F4 -/* 8009B8F0 3B E0 00 00 */ li r31, 0 -lbl_8009B8F4: -/* 8009B8F4 38 60 00 4B */ li r3, 0x4b -/* 8009B8F8 38 80 00 01 */ li r4, 1 -/* 8009B8FC 4B FF C5 E5 */ bl checkItemGet__FUci -/* 8009B900 2C 03 00 00 */ cmpwi r3, 0 -/* 8009B904 40 82 00 10 */ bne lbl_8009B914 -/* 8009B908 2C 1F 00 12 */ cmpwi r31, 0x12 -/* 8009B90C 40 82 00 08 */ bne lbl_8009B914 -/* 8009B910 3B E0 00 01 */ li r31, 1 -lbl_8009B914: -/* 8009B914 2C 1F 00 08 */ cmpwi r31, 8 -/* 8009B918 41 82 00 0C */ beq lbl_8009B924 -/* 8009B91C 2C 1F 00 09 */ cmpwi r31, 9 -/* 8009B920 40 82 00 08 */ bne lbl_8009B928 -lbl_8009B924: -/* 8009B924 3B E0 00 01 */ li r31, 1 -lbl_8009B928: -/* 8009B928 57 E3 06 3E */ clrlwi r3, r31, 0x18 -lbl_8009B92C: -/* 8009B92C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8009B930 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009B934 7C 08 03 A6 */ mtlr r0 -/* 8009B938 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009B93C 4E 80 00 20 */ blr diff --git a/asm/d/d_item/execItemGet__FUc.s b/asm/d/d_item/execItemGet__FUc.s deleted file mode 100644 index 52ca25e72fe..00000000000 --- a/asm/d/d_item/execItemGet__FUc.s +++ /dev/null @@ -1,22 +0,0 @@ -lbl_80097E8C: -/* 80097E8C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80097E90 7C 08 02 A6 */ mflr r0 -/* 80097E94 90 01 00 14 */ stw r0, 0x14(r1) -/* 80097E98 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80097E9C 7C 7F 1B 78 */ mr r31, r3 -/* 80097EA0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80097EA4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80097EA8 38 63 00 CC */ addi r3, r3, 0xcc -/* 80097EAC 7F E4 FB 78 */ mr r4, r31 -/* 80097EB0 4B F9 BF B1 */ bl onFirstBit__21dSv_player_get_item_cFUc -/* 80097EB4 57 E0 15 BA */ rlwinm r0, r31, 2, 0x16, 0x1d -/* 80097EB8 3C 60 80 3B */ lis r3, item_func_ptr@ha /* 0x803AF178@ha */ -/* 80097EBC 38 63 F1 78 */ addi r3, r3, item_func_ptr@l /* 0x803AF178@l */ -/* 80097EC0 7D 83 00 2E */ lwzx r12, r3, r0 -/* 80097EC4 7D 89 03 A6 */ mtctr r12 -/* 80097EC8 4E 80 04 21 */ bctrl -/* 80097ECC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80097ED0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80097ED4 7C 08 03 A6 */ mtlr r0 -/* 80097ED8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80097EDC 4E 80 00 20 */ blr diff --git a/asm/d/d_item/isArrow__FUc.s b/asm/d/d_item/isArrow__FUc.s deleted file mode 100644 index f0771d5d89a..00000000000 --- a/asm/d/d_item/isArrow__FUc.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_8009B6D4: -/* 8009B6D4 38 A0 00 00 */ li r5, 0 -/* 8009B6D8 54 64 06 3E */ clrlwi r4, r3, 0x18 -/* 8009B6DC 28 04 00 11 */ cmplwi r4, 0x11 -/* 8009B6E0 41 82 00 1C */ beq lbl_8009B6FC -/* 8009B6E4 38 03 FF F2 */ addi r0, r3, -14 -/* 8009B6E8 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 8009B6EC 28 00 00 01 */ cmplwi r0, 1 -/* 8009B6F0 40 81 00 0C */ ble lbl_8009B6FC -/* 8009B6F4 28 04 00 10 */ cmplwi r4, 0x10 -/* 8009B6F8 40 82 00 08 */ bne lbl_8009B700 -lbl_8009B6FC: -/* 8009B6FC 38 A0 00 01 */ li r5, 1 -lbl_8009B700: -/* 8009B700 7C A3 2B 78 */ mr r3, r5 -/* 8009B704 4E 80 00 20 */ blr diff --git a/asm/d/d_item/isBomb__FUc.s b/asm/d/d_item/isBomb__FUc.s deleted file mode 100644 index 4725c61b2b5..00000000000 --- a/asm/d/d_item/isBomb__FUc.s +++ /dev/null @@ -1,22 +0,0 @@ -lbl_8009B688: -/* 8009B688 38 A0 00 00 */ li r5, 0 -/* 8009B68C 38 03 FF F6 */ addi r0, r3, -10 -/* 8009B690 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 8009B694 28 00 00 03 */ cmplwi r0, 3 -/* 8009B698 40 81 00 30 */ ble lbl_8009B6C8 -/* 8009B69C 54 64 06 3E */ clrlwi r4, r3, 0x18 -/* 8009B6A0 20 04 00 70 */ subfic r0, r4, 0x70 -/* 8009B6A4 7C 00 00 34 */ cntlzw r0, r0 -/* 8009B6A8 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f -/* 8009B6AC 20 04 00 71 */ subfic r0, r4, 0x71 -/* 8009B6B0 7C 00 00 34 */ cntlzw r0, r0 -/* 8009B6B4 54 00 DE 3E */ rlwinm r0, r0, 0x1b, 0x18, 0x1f -/* 8009B6B8 7C 60 03 79 */ or. r0, r3, r0 -/* 8009B6BC 40 82 00 0C */ bne lbl_8009B6C8 -/* 8009B6C0 28 04 00 72 */ cmplwi r4, 0x72 -/* 8009B6C4 40 82 00 08 */ bne lbl_8009B6CC -lbl_8009B6C8: -/* 8009B6C8 38 A0 00 01 */ li r5, 1 -lbl_8009B6CC: -/* 8009B6CC 7C A3 2B 78 */ mr r3, r5 -/* 8009B6D0 4E 80 00 20 */ blr diff --git a/asm/d/d_item/isHeart__FUc.s b/asm/d/d_item/isHeart__FUc.s deleted file mode 100644 index 3adc7d7037b..00000000000 --- a/asm/d/d_item/isHeart__FUc.s +++ /dev/null @@ -1,11 +0,0 @@ -lbl_8009B77C: -/* 8009B77C 38 80 00 00 */ li r4, 0 -/* 8009B780 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8009B784 41 82 00 0C */ beq lbl_8009B790 -/* 8009B788 28 00 00 1F */ cmplwi r0, 0x1f -/* 8009B78C 40 82 00 08 */ bne lbl_8009B794 -lbl_8009B790: -/* 8009B790 38 80 00 01 */ li r4, 1 -lbl_8009B794: -/* 8009B794 7C 83 23 78 */ mr r3, r4 -/* 8009B798 4E 80 00 20 */ blr diff --git a/asm/d/d_item/isInsect__FUc.s b/asm/d/d_item/isInsect__FUc.s deleted file mode 100644 index 0a937b9e07d..00000000000 --- a/asm/d/d_item/isInsect__FUc.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_8009B79C: -/* 8009B79C 38 80 00 00 */ li r4, 0 -/* 8009B7A0 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8009B7A4 2C 00 00 D8 */ cmpwi r0, 0xd8 -/* 8009B7A8 40 80 00 14 */ bge lbl_8009B7BC -/* 8009B7AC 2C 00 00 C0 */ cmpwi r0, 0xc0 -/* 8009B7B0 40 80 00 08 */ bge lbl_8009B7B8 -/* 8009B7B4 48 00 00 08 */ b lbl_8009B7BC -lbl_8009B7B8: -/* 8009B7B8 38 80 00 01 */ li r4, 1 -lbl_8009B7BC: -/* 8009B7BC 7C 83 23 78 */ mr r3, r4 -/* 8009B7C0 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_AIR_LETTER__Fv.s b/asm/d/d_item/item_func_AIR_LETTER__Fv.s deleted file mode 100644 index 2330fab442b..00000000000 --- a/asm/d/d_item/item_func_AIR_LETTER__Fv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_800994BC: -/* 800994BC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800994C0 7C 08 02 A6 */ mflr r0 -/* 800994C4 90 01 00 14 */ stw r0, 0x14(r1) -/* 800994C8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800994CC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800994D0 38 63 00 9C */ addi r3, r3, 0x9c -/* 800994D4 38 80 00 16 */ li r4, 0x16 -/* 800994D8 38 A0 00 EA */ li r5, 0xea -/* 800994DC 4B F9 9A DD */ bl setItem__17dSv_player_item_cFiUc -/* 800994E0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800994E4 7C 08 03 A6 */ mtlr r0 -/* 800994E8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800994EC 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_ANCIENT_DOCUMENT2__Fv.s b/asm/d/d_item/item_func_ANCIENT_DOCUMENT2__Fv.s deleted file mode 100644 index 09c783d9c8f..00000000000 --- a/asm/d/d_item/item_func_ANCIENT_DOCUMENT2__Fv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_800994F0: -/* 800994F0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800994F4 7C 08 02 A6 */ mflr r0 -/* 800994F8 90 01 00 14 */ stw r0, 0x14(r1) -/* 800994FC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80099500 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80099504 38 63 00 9C */ addi r3, r3, 0x9c -/* 80099508 38 80 00 16 */ li r4, 0x16 -/* 8009950C 38 A0 00 EB */ li r5, 0xeb -/* 80099510 4B F9 9A A9 */ bl setItem__17dSv_player_item_cFiUc -/* 80099514 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80099518 7C 08 03 A6 */ mtlr r0 -/* 8009951C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80099520 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_ANCIENT_DOCUMENT__Fv.s b/asm/d/d_item/item_func_ANCIENT_DOCUMENT__Fv.s deleted file mode 100644 index cf89b1d2cda..00000000000 --- a/asm/d/d_item/item_func_ANCIENT_DOCUMENT__Fv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_80099488: -/* 80099488 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009948C 7C 08 02 A6 */ mflr r0 -/* 80099490 90 01 00 14 */ stw r0, 0x14(r1) -/* 80099494 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80099498 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009949C 38 63 00 9C */ addi r3, r3, 0x9c -/* 800994A0 38 80 00 16 */ li r4, 0x16 -/* 800994A4 38 A0 00 E9 */ li r5, 0xe9 -/* 800994A8 4B F9 9B 11 */ bl setItem__17dSv_player_item_cFiUc -/* 800994AC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800994B0 7C 08 03 A6 */ mtlr r0 -/* 800994B4 38 21 00 10 */ addi r1, r1, 0x10 -/* 800994B8 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_ARROW_10__Fv.s b/asm/d/d_item/item_func_ARROW_10__Fv.s deleted file mode 100644 index 2995abc757e..00000000000 --- a/asm/d/d_item/item_func_ARROW_10__Fv.s +++ /dev/null @@ -1,7 +0,0 @@ -lbl_800980C8: -/* 800980C8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800980CC 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800980D0 A8 64 5D F4 */ lha r3, 0x5df4(r4) -/* 800980D4 38 03 00 0A */ addi r0, r3, 0xa -/* 800980D8 B0 04 5D F4 */ sth r0, 0x5df4(r4) -/* 800980DC 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_ARROW_1__Fv.s b/asm/d/d_item/item_func_ARROW_1__Fv.s deleted file mode 100644 index f086f2910ae..00000000000 --- a/asm/d/d_item/item_func_ARROW_1__Fv.s +++ /dev/null @@ -1,7 +0,0 @@ -lbl_80098110: -/* 80098110 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80098114 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80098118 A8 64 5D F4 */ lha r3, 0x5df4(r4) -/* 8009811C 38 03 00 01 */ addi r0, r3, 1 -/* 80098120 B0 04 5D F4 */ sth r0, 0x5df4(r4) -/* 80098124 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_ARROW_20__Fv.s b/asm/d/d_item/item_func_ARROW_20__Fv.s deleted file mode 100644 index 75d3ca8e9d5..00000000000 --- a/asm/d/d_item/item_func_ARROW_20__Fv.s +++ /dev/null @@ -1,7 +0,0 @@ -lbl_800980E0: -/* 800980E0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800980E4 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800980E8 A8 64 5D F4 */ lha r3, 0x5df4(r4) -/* 800980EC 38 03 00 14 */ addi r0, r3, 0x14 -/* 800980F0 B0 04 5D F4 */ sth r0, 0x5df4(r4) -/* 800980F4 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_ARROW_30__Fv.s b/asm/d/d_item/item_func_ARROW_30__Fv.s deleted file mode 100644 index 2308bca1710..00000000000 --- a/asm/d/d_item/item_func_ARROW_30__Fv.s +++ /dev/null @@ -1,7 +0,0 @@ -lbl_800980F8: -/* 800980F8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800980FC 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80098100 A8 64 5D F4 */ lha r3, 0x5df4(r4) -/* 80098104 38 03 00 1E */ addi r0, r3, 0x1e -/* 80098108 B0 04 5D F4 */ sth r0, 0x5df4(r4) -/* 8009810C 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_ARROW_LV1__Fv.s b/asm/d/d_item/item_func_ARROW_LV1__Fv.s deleted file mode 100644 index 6a539fa281d..00000000000 --- a/asm/d/d_item/item_func_ARROW_LV1__Fv.s +++ /dev/null @@ -1,7 +0,0 @@ -lbl_80098AB0: -/* 80098AB0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80098AB4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80098AB8 38 00 00 3C */ li r0, 0x3c -/* 80098ABC 98 03 00 EC */ stb r0, 0xec(r3) -/* 80098AC0 98 03 00 F8 */ stb r0, 0xf8(r3) -/* 80098AC4 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_ARROW_LV2__Fv.s b/asm/d/d_item/item_func_ARROW_LV2__Fv.s deleted file mode 100644 index 138fa939bd7..00000000000 --- a/asm/d/d_item/item_func_ARROW_LV2__Fv.s +++ /dev/null @@ -1,7 +0,0 @@ -lbl_80098AC8: -/* 80098AC8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80098ACC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80098AD0 38 00 00 3C */ li r0, 0x3c -/* 80098AD4 98 03 00 EC */ stb r0, 0xec(r3) -/* 80098AD8 98 03 00 F8 */ stb r0, 0xf8(r3) -/* 80098ADC 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_ARROW_LV3__Fv.s b/asm/d/d_item/item_func_ARROW_LV3__Fv.s deleted file mode 100644 index 831683ae3e5..00000000000 --- a/asm/d/d_item/item_func_ARROW_LV3__Fv.s +++ /dev/null @@ -1,7 +0,0 @@ -lbl_80098AE0: -/* 80098AE0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80098AE4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80098AE8 38 00 00 64 */ li r0, 0x64 -/* 80098AEC 98 03 00 EC */ stb r0, 0xec(r3) -/* 80098AF0 98 03 00 F8 */ stb r0, 0xf8(r3) -/* 80098AF4 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_ASHS_SCRIBBLING__Fv.s b/asm/d/d_item/item_func_ASHS_SCRIBBLING__Fv.s deleted file mode 100644 index d750104b3bf..00000000000 --- a/asm/d/d_item/item_func_ASHS_SCRIBBLING__Fv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_80099284: -/* 80099284 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80099288 7C 08 02 A6 */ mflr r0 -/* 8009928C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80099290 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80099294 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80099298 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009929C 38 80 00 13 */ li r4, 0x13 -/* 800992A0 38 A0 00 91 */ li r5, 0x91 -/* 800992A4 4B F9 9D 15 */ bl setItem__17dSv_player_item_cFiUc -/* 800992A8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800992AC 7C 08 03 A6 */ mtlr r0 -/* 800992B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 800992B4 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_BEE_CHILD__Fv.s b/asm/d/d_item/item_func_BEE_CHILD__Fv.s deleted file mode 100644 index 3cc19012457..00000000000 --- a/asm/d/d_item/item_func_BEE_CHILD__Fv.s +++ /dev/null @@ -1,44 +0,0 @@ -lbl_80098EE4: -/* 80098EE4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80098EE8 7C 08 02 A6 */ mflr r0 -/* 80098EEC 90 01 00 24 */ stw r0, 0x24(r1) -/* 80098EF0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80098EF4 48 2C 92 E9 */ bl _savegpr_29 -/* 80098EF8 3B C0 00 FF */ li r30, 0xff -/* 80098EFC 3B A0 00 00 */ li r29, 0 -/* 80098F00 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80098F04 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80098F08 3B E3 00 9C */ addi r31, r3, 0x9c -lbl_80098F0C: -/* 80098F0C 7F E3 FB 78 */ mr r3, r31 -/* 80098F10 38 9D 00 0B */ addi r4, r29, 0xb -/* 80098F14 38 A0 00 01 */ li r5, 1 -/* 80098F18 4B F9 A1 19 */ bl getItem__17dSv_player_item_cCFib -/* 80098F1C 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80098F20 28 00 00 60 */ cmplwi r0, 0x60 -/* 80098F24 40 82 00 0C */ bne lbl_80098F30 -/* 80098F28 7F BE EB 78 */ mr r30, r29 -/* 80098F2C 48 00 00 10 */ b lbl_80098F3C -lbl_80098F30: -/* 80098F30 3B BD 00 01 */ addi r29, r29, 1 -/* 80098F34 2C 1D 00 04 */ cmpwi r29, 4 -/* 80098F38 41 80 FF D4 */ blt lbl_80098F0C -lbl_80098F3C: -/* 80098F3C 2C 1E 00 FF */ cmpwi r30, 0xff -/* 80098F40 41 82 00 28 */ beq lbl_80098F68 -/* 80098F44 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80098F48 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80098F4C 38 63 00 EC */ addi r3, r3, 0xec -/* 80098F50 57 C4 06 3E */ clrlwi r4, r30, 0x18 -/* 80098F54 38 A0 00 0A */ li r5, 0xa -/* 80098F58 4B F9 B0 35 */ bl setBottleNum__24dSv_player_item_record_cFUcUc -/* 80098F5C 7F E3 FB 78 */ mr r3, r31 -/* 80098F60 38 80 00 76 */ li r4, 0x76 -/* 80098F64 4B F9 A4 ED */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc -lbl_80098F68: -/* 80098F68 39 61 00 20 */ addi r11, r1, 0x20 -/* 80098F6C 48 2C 92 BD */ bl _restgpr_29 -/* 80098F70 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80098F74 7C 08 03 A6 */ mtlr r0 -/* 80098F78 38 21 00 20 */ addi r1, r1, 0x20 -/* 80098F7C 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_BILL__Fv.s b/asm/d/d_item/item_func_BILL__Fv.s deleted file mode 100644 index 7782d212a00..00000000000 --- a/asm/d/d_item/item_func_BILL__Fv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_80099164: -/* 80099164 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80099168 7C 08 02 A6 */ mflr r0 -/* 8009916C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80099170 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80099174 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80099178 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009917C 38 80 00 15 */ li r4, 0x15 -/* 80099180 38 A0 00 81 */ li r5, 0x81 -/* 80099184 4B F9 9E 35 */ bl setItem__17dSv_player_item_cFiUc -/* 80099188 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009918C 7C 08 03 A6 */ mtlr r0 -/* 80099190 38 21 00 10 */ addi r1, r1, 0x10 -/* 80099194 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_BLUE_BOTTLE__Fv.s b/asm/d/d_item/item_func_BLUE_BOTTLE__Fv.s deleted file mode 100644 index 97345f6a17a..00000000000 --- a/asm/d/d_item/item_func_BLUE_BOTTLE__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80098BA4: -/* 80098BA4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80098BA8 7C 08 02 A6 */ mflr r0 -/* 80098BAC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80098BB0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80098BB4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80098BB8 38 63 00 9C */ addi r3, r3, 0x9c -/* 80098BBC 38 80 00 63 */ li r4, 0x63 -/* 80098BC0 4B F9 A8 91 */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc -/* 80098BC4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80098BC8 7C 08 03 A6 */ mtlr r0 -/* 80098BCC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80098BD0 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_BLUE_RUPEE__Fv.s b/asm/d/d_item/item_func_BLUE_RUPEE__Fv.s deleted file mode 100644 index 9fd178434f6..00000000000 --- a/asm/d/d_item/item_func_BLUE_RUPEE__Fv.s +++ /dev/null @@ -1,7 +0,0 @@ -lbl_80097F68: -/* 80097F68 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80097F6C 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80097F70 80 64 5D C4 */ lwz r3, 0x5dc4(r4) -/* 80097F74 38 03 00 05 */ addi r0, r3, 5 -/* 80097F78 90 04 5D C4 */ stw r0, 0x5dc4(r4) -/* 80097F7C 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_BOMB_10__Fv.s b/asm/d/d_item/item_func_BOMB_10__Fv.s deleted file mode 100644 index eb48601e6d2..00000000000 --- a/asm/d/d_item/item_func_BOMB_10__Fv.s +++ /dev/null @@ -1,11 +0,0 @@ -lbl_80098050: -/* 80098050 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80098054 7C 08 02 A6 */ mflr r0 -/* 80098058 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009805C 38 60 00 70 */ li r3, 0x70 -/* 80098060 38 80 00 0A */ li r4, 0xa -/* 80098064 48 00 38 DD */ bl addBombCount__FUcUc -/* 80098068 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009806C 7C 08 03 A6 */ mtlr r0 -/* 80098070 38 21 00 10 */ addi r1, r1, 0x10 -/* 80098074 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_BOMB_20__Fv.s b/asm/d/d_item/item_func_BOMB_20__Fv.s deleted file mode 100644 index 8a9950db8ab..00000000000 --- a/asm/d/d_item/item_func_BOMB_20__Fv.s +++ /dev/null @@ -1,11 +0,0 @@ -lbl_80098078: -/* 80098078 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009807C 7C 08 02 A6 */ mflr r0 -/* 80098080 90 01 00 14 */ stw r0, 0x14(r1) -/* 80098084 38 60 00 70 */ li r3, 0x70 -/* 80098088 38 80 00 14 */ li r4, 0x14 -/* 8009808C 48 00 38 B5 */ bl addBombCount__FUcUc -/* 80098090 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80098094 7C 08 03 A6 */ mtlr r0 -/* 80098098 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009809C 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_BOMB_30__Fv.s b/asm/d/d_item/item_func_BOMB_30__Fv.s deleted file mode 100644 index 50fe7fee0e2..00000000000 --- a/asm/d/d_item/item_func_BOMB_30__Fv.s +++ /dev/null @@ -1,11 +0,0 @@ -lbl_800980A0: -/* 800980A0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800980A4 7C 08 02 A6 */ mflr r0 -/* 800980A8 90 01 00 14 */ stw r0, 0x14(r1) -/* 800980AC 38 60 00 70 */ li r3, 0x70 -/* 800980B0 38 80 00 1E */ li r4, 0x1e -/* 800980B4 48 00 38 8D */ bl addBombCount__FUcUc -/* 800980B8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800980BC 7C 08 03 A6 */ mtlr r0 -/* 800980C0 38 21 00 10 */ addi r1, r1, 0x10 -/* 800980C4 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_BOMB_5__Fv.s b/asm/d/d_item/item_func_BOMB_5__Fv.s deleted file mode 100644 index fbd82536e4c..00000000000 --- a/asm/d/d_item/item_func_BOMB_5__Fv.s +++ /dev/null @@ -1,11 +0,0 @@ -lbl_80098028: -/* 80098028 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009802C 7C 08 02 A6 */ mflr r0 -/* 80098030 90 01 00 14 */ stw r0, 0x14(r1) -/* 80098034 38 60 00 70 */ li r3, 0x70 -/* 80098038 38 80 00 05 */ li r4, 5 -/* 8009803C 48 00 39 05 */ bl addBombCount__FUcUc -/* 80098040 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80098044 7C 08 03 A6 */ mtlr r0 -/* 80098048 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009804C 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_BOMB_BAG_LV1__Fv.s b/asm/d/d_item/item_func_BOMB_BAG_LV1__Fv.s deleted file mode 100644 index eb530a56e96..00000000000 --- a/asm/d/d_item/item_func_BOMB_BAG_LV1__Fv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_80098A14: -/* 80098A14 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80098A18 7C 08 02 A6 */ mflr r0 -/* 80098A1C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80098A20 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80098A24 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80098A28 38 63 00 9C */ addi r3, r3, 0x9c -/* 80098A2C 38 80 00 70 */ li r4, 0x70 -/* 80098A30 38 A0 00 1E */ li r5, 0x1e -/* 80098A34 4B F9 B0 D5 */ bl setEmptyBombBag__17dSv_player_item_cFUcUc -/* 80098A38 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80098A3C 7C 08 03 A6 */ mtlr r0 -/* 80098A40 38 21 00 10 */ addi r1, r1, 0x10 -/* 80098A44 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_BOMB_INSECT_10__Fv.s b/asm/d/d_item/item_func_BOMB_INSECT_10__Fv.s deleted file mode 100644 index 9e03710fc24..00000000000 --- a/asm/d/d_item/item_func_BOMB_INSECT_10__Fv.s +++ /dev/null @@ -1,11 +0,0 @@ -lbl_80098208: -/* 80098208 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009820C 7C 08 02 A6 */ mflr r0 -/* 80098210 90 01 00 14 */ stw r0, 0x14(r1) -/* 80098214 38 60 00 72 */ li r3, 0x72 -/* 80098218 38 80 00 0A */ li r4, 0xa -/* 8009821C 48 00 37 25 */ bl addBombCount__FUcUc -/* 80098220 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80098224 7C 08 03 A6 */ mtlr r0 -/* 80098228 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009822C 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_BOMB_INSECT_20__Fv.s b/asm/d/d_item/item_func_BOMB_INSECT_20__Fv.s deleted file mode 100644 index 4923ce62c97..00000000000 --- a/asm/d/d_item/item_func_BOMB_INSECT_20__Fv.s +++ /dev/null @@ -1,11 +0,0 @@ -lbl_80098230: -/* 80098230 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80098234 7C 08 02 A6 */ mflr r0 -/* 80098238 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009823C 38 60 00 72 */ li r3, 0x72 -/* 80098240 38 80 00 03 */ li r4, 3 -/* 80098244 48 00 36 FD */ bl addBombCount__FUcUc -/* 80098248 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009824C 7C 08 03 A6 */ mtlr r0 -/* 80098250 38 21 00 10 */ addi r1, r1, 0x10 -/* 80098254 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_BOMB_INSECT_5__Fv.s b/asm/d/d_item/item_func_BOMB_INSECT_5__Fv.s deleted file mode 100644 index e9c61562d92..00000000000 --- a/asm/d/d_item/item_func_BOMB_INSECT_5__Fv.s +++ /dev/null @@ -1,11 +0,0 @@ -lbl_800981E0: -/* 800981E0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800981E4 7C 08 02 A6 */ mflr r0 -/* 800981E8 90 01 00 14 */ stw r0, 0x14(r1) -/* 800981EC 38 60 00 72 */ li r3, 0x72 -/* 800981F0 38 80 00 05 */ li r4, 5 -/* 800981F4 48 00 37 4D */ bl addBombCount__FUcUc -/* 800981F8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800981FC 7C 08 03 A6 */ mtlr r0 -/* 80098200 38 21 00 10 */ addi r1, r1, 0x10 -/* 80098204 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_BOMB_IN_BAG__Fv.s b/asm/d/d_item/item_func_BOMB_IN_BAG__Fv.s deleted file mode 100644 index 4c629f007d5..00000000000 --- a/asm/d/d_item/item_func_BOMB_IN_BAG__Fv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_80098A48: -/* 80098A48 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80098A4C 7C 08 02 A6 */ mflr r0 -/* 80098A50 90 01 00 14 */ stw r0, 0x14(r1) -/* 80098A54 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80098A58 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80098A5C 38 63 00 9C */ addi r3, r3, 0x9c -/* 80098A60 38 80 00 70 */ li r4, 0x70 -/* 80098A64 38 A0 00 1E */ li r5, 0x1e -/* 80098A68 4B F9 B0 A1 */ bl setEmptyBombBag__17dSv_player_item_cFUcUc -/* 80098A6C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80098A70 7C 08 03 A6 */ mtlr r0 -/* 80098A74 38 21 00 10 */ addi r1, r1, 0x10 -/* 80098A78 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_BOOMERANG__Fv.s b/asm/d/d_item/item_func_BOOMERANG__Fv.s deleted file mode 100644 index 078a32425e6..00000000000 --- a/asm/d/d_item/item_func_BOOMERANG__Fv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_80098718: -/* 80098718 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009871C 7C 08 02 A6 */ mflr r0 -/* 80098720 90 01 00 14 */ stw r0, 0x14(r1) -/* 80098724 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80098728 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009872C 38 63 00 9C */ addi r3, r3, 0x9c -/* 80098730 38 80 00 00 */ li r4, 0 -/* 80098734 38 A0 00 40 */ li r5, 0x40 -/* 80098738 4B F9 A8 81 */ bl setItem__17dSv_player_item_cFiUc -/* 8009873C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80098740 7C 08 03 A6 */ mtlr r0 -/* 80098744 38 21 00 10 */ addi r1, r1, 0x10 -/* 80098748 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_BOSS_KEY__Fv.s b/asm/d/d_item/item_func_BOSS_KEY__Fv.s deleted file mode 100644 index 4019f1f2b3f..00000000000 --- a/asm/d/d_item/item_func_BOSS_KEY__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_800983EC: -/* 800983EC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800983F0 7C 08 02 A6 */ mflr r0 -/* 800983F4 90 01 00 14 */ stw r0, 0x14(r1) -/* 800983F8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800983FC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80098400 38 63 09 58 */ addi r3, r3, 0x958 -/* 80098404 38 80 00 02 */ li r4, 2 -/* 80098408 4B F9 C5 11 */ bl onDungeonItem__12dSv_memBit_cFi -/* 8009840C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80098410 7C 08 03 A6 */ mtlr r0 -/* 80098414 38 21 00 10 */ addi r1, r1, 0x10 -/* 80098418 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_BOW__Fv.s b/asm/d/d_item/item_func_BOW__Fv.s deleted file mode 100644 index c2a15cbdbda..00000000000 --- a/asm/d/d_item/item_func_BOW__Fv.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_800987B4: -/* 800987B4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800987B8 7C 08 02 A6 */ mflr r0 -/* 800987BC 90 01 00 14 */ stw r0, 0x14(r1) -/* 800987C0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800987C4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800987C8 38 63 00 9C */ addi r3, r3, 0x9c -/* 800987CC 38 80 00 04 */ li r4, 4 -/* 800987D0 38 A0 00 43 */ li r5, 0x43 -/* 800987D4 4B F9 A7 E5 */ bl setItem__17dSv_player_item_cFiUc -/* 800987D8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800987DC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800987E0 38 00 00 1E */ li r0, 0x1e -/* 800987E4 98 03 00 EC */ stb r0, 0xec(r3) -/* 800987E8 98 03 00 F8 */ stb r0, 0xf8(r3) -/* 800987EC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800987F0 7C 08 03 A6 */ mtlr r0 -/* 800987F4 38 21 00 10 */ addi r1, r1, 0x10 -/* 800987F8 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_CHUCHU_BLACK__Fv.s b/asm/d/d_item/item_func_CHUCHU_BLACK__Fv.s deleted file mode 100644 index 74c901a9a96..00000000000 --- a/asm/d/d_item/item_func_CHUCHU_BLACK__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80099338: -/* 80099338 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009933C 7C 08 02 A6 */ mflr r0 -/* 80099340 90 01 00 14 */ stw r0, 0x14(r1) -/* 80099344 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80099348 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009934C 38 63 00 9C */ addi r3, r3, 0x9c -/* 80099350 38 80 00 9F */ li r4, 0x9f -/* 80099354 4B F9 A0 FD */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc -/* 80099358 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009935C 7C 08 03 A6 */ mtlr r0 -/* 80099360 38 21 00 10 */ addi r1, r1, 0x10 -/* 80099364 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_CHUCHU_BLUE__Fv.s b/asm/d/d_item/item_func_CHUCHU_BLUE__Fv.s deleted file mode 100644 index 153cf747265..00000000000 --- a/asm/d/d_item/item_func_CHUCHU_BLUE__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80098FE0: -/* 80098FE0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80098FE4 7C 08 02 A6 */ mflr r0 -/* 80098FE8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80098FEC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80098FF0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80098FF4 38 63 00 9C */ addi r3, r3, 0x9c -/* 80098FF8 38 80 00 79 */ li r4, 0x79 -/* 80098FFC 4B F9 A4 55 */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc -/* 80099000 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80099004 7C 08 03 A6 */ mtlr r0 -/* 80099008 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009900C 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_CHUCHU_GREEN__Fv.s b/asm/d/d_item/item_func_CHUCHU_GREEN__Fv.s deleted file mode 100644 index bd1c4a5f18d..00000000000 --- a/asm/d/d_item/item_func_CHUCHU_GREEN__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80099010: -/* 80099010 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80099014 7C 08 02 A6 */ mflr r0 -/* 80099018 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009901C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80099020 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80099024 38 63 00 9C */ addi r3, r3, 0x9c -/* 80099028 38 80 00 7A */ li r4, 0x7a -/* 8009902C 4B F9 A4 25 */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc -/* 80099030 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80099034 7C 08 03 A6 */ mtlr r0 -/* 80099038 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009903C 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_CHUCHU_PURPLE__Fv.s b/asm/d/d_item/item_func_CHUCHU_PURPLE__Fv.s deleted file mode 100644 index a777d516e8a..00000000000 --- a/asm/d/d_item/item_func_CHUCHU_PURPLE__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80099070: -/* 80099070 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80099074 7C 08 02 A6 */ mflr r0 -/* 80099078 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009907C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80099080 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80099084 38 63 00 9C */ addi r3, r3, 0x9c -/* 80099088 38 80 00 7C */ li r4, 0x7c -/* 8009908C 4B F9 A3 C5 */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc -/* 80099090 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80099094 7C 08 03 A6 */ mtlr r0 -/* 80099098 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009909C 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_CHUCHU_RARE__Fv.s b/asm/d/d_item/item_func_CHUCHU_RARE__Fv.s deleted file mode 100644 index 3d4f2847b02..00000000000 --- a/asm/d/d_item/item_func_CHUCHU_RARE__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80098F80: -/* 80098F80 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80098F84 7C 08 02 A6 */ mflr r0 -/* 80098F88 90 01 00 14 */ stw r0, 0x14(r1) -/* 80098F8C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80098F90 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80098F94 38 63 00 9C */ addi r3, r3, 0x9c -/* 80098F98 38 80 00 77 */ li r4, 0x77 -/* 80098F9C 4B F9 A4 B5 */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc -/* 80098FA0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80098FA4 7C 08 03 A6 */ mtlr r0 -/* 80098FA8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80098FAC 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_CHUCHU_RED__Fv.s b/asm/d/d_item/item_func_CHUCHU_RED__Fv.s deleted file mode 100644 index 3ef208eef19..00000000000 --- a/asm/d/d_item/item_func_CHUCHU_RED__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80098FB0: -/* 80098FB0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80098FB4 7C 08 02 A6 */ mflr r0 -/* 80098FB8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80098FBC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80098FC0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80098FC4 38 63 00 9C */ addi r3, r3, 0x9c -/* 80098FC8 38 80 00 78 */ li r4, 0x78 -/* 80098FCC 4B F9 A4 85 */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc -/* 80098FD0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80098FD4 7C 08 03 A6 */ mtlr r0 -/* 80098FD8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80098FDC 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_CHUCHU_YELLOW2__Fv.s b/asm/d/d_item/item_func_CHUCHU_YELLOW2__Fv.s deleted file mode 100644 index 7481ef45117..00000000000 --- a/asm/d/d_item/item_func_CHUCHU_YELLOW2__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_800992B8: -/* 800992B8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800992BC 7C 08 02 A6 */ mflr r0 -/* 800992C0 90 01 00 14 */ stw r0, 0x14(r1) -/* 800992C4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800992C8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800992CC 38 63 00 9C */ addi r3, r3, 0x9c -/* 800992D0 38 80 00 7B */ li r4, 0x7b -/* 800992D4 4B F9 A1 7D */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc -/* 800992D8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800992DC 7C 08 03 A6 */ mtlr r0 -/* 800992E0 38 21 00 10 */ addi r1, r1, 0x10 -/* 800992E4 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_CHUCHU_YELLOW__Fv.s b/asm/d/d_item/item_func_CHUCHU_YELLOW__Fv.s deleted file mode 100644 index 19d866ff58b..00000000000 --- a/asm/d/d_item/item_func_CHUCHU_YELLOW__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80099040: -/* 80099040 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80099044 7C 08 02 A6 */ mflr r0 -/* 80099048 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009904C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80099050 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80099054 38 63 00 9C */ addi r3, r3, 0x9c -/* 80099058 38 80 00 7B */ li r4, 0x7b -/* 8009905C 4B F9 A3 F5 */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc -/* 80099060 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80099064 7C 08 03 A6 */ mtlr r0 -/* 80099068 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009906C 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_COMPUS__Fv.s b/asm/d/d_item/item_func_COMPUS__Fv.s deleted file mode 100644 index a796d1a25e0..00000000000 --- a/asm/d/d_item/item_func_COMPUS__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80098374: -/* 80098374 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80098378 7C 08 02 A6 */ mflr r0 -/* 8009837C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80098380 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80098384 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80098388 38 63 09 58 */ addi r3, r3, 0x958 -/* 8009838C 38 80 00 01 */ li r4, 1 -/* 80098390 4B F9 C5 89 */ bl onDungeonItem__12dSv_memBit_cFi -/* 80098394 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80098398 7C 08 03 A6 */ mtlr r0 -/* 8009839C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800983A0 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_COPY_ROD_2__Fv.s b/asm/d/d_item/item_func_COPY_ROD_2__Fv.s deleted file mode 100644 index 086516ed11f..00000000000 --- a/asm/d/d_item/item_func_COPY_ROD_2__Fv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_800989DC: -/* 800989DC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800989E0 7C 08 02 A6 */ mflr r0 -/* 800989E4 90 01 00 14 */ stw r0, 0x14(r1) -/* 800989E8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800989EC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800989F0 38 63 00 9C */ addi r3, r3, 0x9c -/* 800989F4 38 80 00 08 */ li r4, 8 -/* 800989F8 38 A0 00 46 */ li r5, 0x46 -/* 800989FC 4B F9 A5 BD */ bl setItem__17dSv_player_item_cFiUc -/* 80098A00 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80098A04 7C 08 03 A6 */ mtlr r0 -/* 80098A08 38 21 00 10 */ addi r1, r1, 0x10 -/* 80098A0C 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_COPY_ROD__Fv.s b/asm/d/d_item/item_func_COPY_ROD__Fv.s deleted file mode 100644 index 4768ff05610..00000000000 --- a/asm/d/d_item/item_func_COPY_ROD__Fv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_80098864: -/* 80098864 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80098868 7C 08 02 A6 */ mflr r0 -/* 8009886C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80098870 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80098874 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80098878 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009887C 38 80 00 08 */ li r4, 8 -/* 80098880 38 A0 00 46 */ li r5, 0x46 -/* 80098884 4B F9 A7 35 */ bl setItem__17dSv_player_item_cFiUc -/* 80098888 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009888C 7C 08 03 A6 */ mtlr r0 -/* 80098890 38 21 00 10 */ addi r1, r1, 0x10 -/* 80098894 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_DROP_BOTTLE__Fv.s b/asm/d/d_item/item_func_DROP_BOTTLE__Fv.s deleted file mode 100644 index 090ee365cd9..00000000000 --- a/asm/d/d_item/item_func_DROP_BOTTLE__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80098EB4: -/* 80098EB4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80098EB8 7C 08 02 A6 */ mflr r0 -/* 80098EBC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80098EC0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80098EC4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80098EC8 38 63 00 9C */ addi r3, r3, 0x9c -/* 80098ECC 38 80 00 73 */ li r4, 0x73 -/* 80098ED0 4B F9 A6 45 */ bl setEmptyBottle__17dSv_player_item_cFUc -/* 80098ED4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80098ED8 7C 08 03 A6 */ mtlr r0 -/* 80098EDC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80098EE0 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_DROP_CONTAINER02__Fv.s b/asm/d/d_item/item_func_DROP_CONTAINER02__Fv.s deleted file mode 100644 index 31338b60cbb..00000000000 --- a/asm/d/d_item/item_func_DROP_CONTAINER02__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_8009939C: -/* 8009939C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800993A0 7C 08 02 A6 */ mflr r0 -/* 800993A4 90 01 00 14 */ stw r0, 0x14(r1) -/* 800993A8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800993AC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800993B0 38 63 01 14 */ addi r3, r3, 0x114 -/* 800993B4 38 80 00 01 */ li r4, 1 -/* 800993B8 4B F9 AF B1 */ bl onLightDropGetFlag__16dSv_light_drop_cFUc -/* 800993BC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800993C0 7C 08 03 A6 */ mtlr r0 -/* 800993C4 38 21 00 10 */ addi r1, r1, 0x10 -/* 800993C8 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_DROP_CONTAINER03__Fv.s b/asm/d/d_item/item_func_DROP_CONTAINER03__Fv.s deleted file mode 100644 index fa570f8c732..00000000000 --- a/asm/d/d_item/item_func_DROP_CONTAINER03__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_800993CC: -/* 800993CC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800993D0 7C 08 02 A6 */ mflr r0 -/* 800993D4 90 01 00 14 */ stw r0, 0x14(r1) -/* 800993D8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800993DC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800993E0 38 63 01 14 */ addi r3, r3, 0x114 -/* 800993E4 38 80 00 02 */ li r4, 2 -/* 800993E8 4B F9 AF 81 */ bl onLightDropGetFlag__16dSv_light_drop_cFUc -/* 800993EC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800993F0 7C 08 03 A6 */ mtlr r0 -/* 800993F4 38 21 00 10 */ addi r1, r1, 0x10 -/* 800993F8 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_DROP_CONTAINER__Fv.s b/asm/d/d_item/item_func_DROP_CONTAINER__Fv.s deleted file mode 100644 index c000eef1b01..00000000000 --- a/asm/d/d_item/item_func_DROP_CONTAINER__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_8009936C: -/* 8009936C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80099370 7C 08 02 A6 */ mflr r0 -/* 80099374 90 01 00 14 */ stw r0, 0x14(r1) -/* 80099378 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009937C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80099380 38 63 01 14 */ addi r3, r3, 0x114 -/* 80099384 38 80 00 00 */ li r4, 0 -/* 80099388 4B F9 AF E1 */ bl onLightDropGetFlag__16dSv_light_drop_cFUc -/* 8009938C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80099390 7C 08 03 A6 */ mtlr r0 -/* 80099394 38 21 00 10 */ addi r1, r1, 0x10 -/* 80099398 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_DUNGEON_BACK__Fv.s b/asm/d/d_item/item_func_DUNGEON_BACK__Fv.s deleted file mode 100644 index 02e835ddfed..00000000000 --- a/asm/d/d_item/item_func_DUNGEON_BACK__Fv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_8009841C: -/* 8009841C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80098420 7C 08 02 A6 */ mflr r0 -/* 80098424 90 01 00 14 */ stw r0, 0x14(r1) -/* 80098428 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009842C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80098430 38 63 00 9C */ addi r3, r3, 0x9c -/* 80098434 38 80 00 12 */ li r4, 0x12 -/* 80098438 38 A0 00 27 */ li r5, 0x27 -/* 8009843C 4B F9 AB 7D */ bl setItem__17dSv_player_item_cFiUc -/* 80098440 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80098444 7C 08 03 A6 */ mtlr r0 -/* 80098448 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009844C 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_DUNGEON_EXIT_2__Fv.s b/asm/d/d_item/item_func_DUNGEON_EXIT_2__Fv.s deleted file mode 100644 index 721ab9a5f0c..00000000000 --- a/asm/d/d_item/item_func_DUNGEON_EXIT_2__Fv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_800985CC: -/* 800985CC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800985D0 7C 08 02 A6 */ mflr r0 -/* 800985D4 90 01 00 14 */ stw r0, 0x14(r1) -/* 800985D8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800985DC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800985E0 38 63 00 9C */ addi r3, r3, 0x9c -/* 800985E4 38 80 00 12 */ li r4, 0x12 -/* 800985E8 38 A0 00 25 */ li r5, 0x25 -/* 800985EC 4B F9 A9 CD */ bl setItem__17dSv_player_item_cFiUc -/* 800985F0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800985F4 7C 08 03 A6 */ mtlr r0 -/* 800985F8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800985FC 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_DUNGEON_EXIT__Fv.s b/asm/d/d_item/item_func_DUNGEON_EXIT__Fv.s deleted file mode 100644 index 744d2797457..00000000000 --- a/asm/d/d_item/item_func_DUNGEON_EXIT__Fv.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_800983A4: -/* 800983A4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800983A8 7C 08 02 A6 */ mflr r0 -/* 800983AC 90 01 00 14 */ stw r0, 0x14(r1) -/* 800983B0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800983B4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800983B8 38 63 09 58 */ addi r3, r3, 0x958 -/* 800983BC 38 80 00 06 */ li r4, 6 -/* 800983C0 4B F9 C5 59 */ bl onDungeonItem__12dSv_memBit_cFi -/* 800983C4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800983C8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800983CC 38 63 00 9C */ addi r3, r3, 0x9c -/* 800983D0 38 80 00 12 */ li r4, 0x12 -/* 800983D4 38 A0 00 25 */ li r5, 0x25 -/* 800983D8 4B F9 AB E1 */ bl setItem__17dSv_player_item_cFiUc -/* 800983DC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800983E0 7C 08 03 A6 */ mtlr r0 -/* 800983E4 38 21 00 10 */ addi r1, r1, 0x10 -/* 800983E8 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_EMPTY_BOTTLE__Fv.s b/asm/d/d_item/item_func_EMPTY_BOTTLE__Fv.s deleted file mode 100644 index 0413885b7ba..00000000000 --- a/asm/d/d_item/item_func_EMPTY_BOTTLE__Fv.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_80098B18: -/* 80098B18 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80098B1C 7C 08 02 A6 */ mflr r0 -/* 80098B20 90 01 00 14 */ stw r0, 0x14(r1) -/* 80098B24 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80098B28 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80098B2C 38 63 00 9C */ addi r3, r3, 0x9c -/* 80098B30 4B F9 A9 65 */ bl setEmptyBottle__17dSv_player_item_cFv -/* 80098B34 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80098B38 7C 08 03 A6 */ mtlr r0 -/* 80098B3C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80098B40 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_FAIRY_BOTTLE__Fv.s b/asm/d/d_item/item_func_FAIRY_BOTTLE__Fv.s deleted file mode 100644 index f4584e72996..00000000000 --- a/asm/d/d_item/item_func_FAIRY_BOTTLE__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80098D54: -/* 80098D54 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80098D58 7C 08 02 A6 */ mflr r0 -/* 80098D5C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80098D60 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80098D64 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80098D68 38 63 00 9C */ addi r3, r3, 0x9c -/* 80098D6C 38 80 00 6C */ li r4, 0x6c -/* 80098D70 4B F9 A6 E1 */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc -/* 80098D74 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80098D78 7C 08 03 A6 */ mtlr r0 -/* 80098D7C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80098D80 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_FAIRY_DROP__Fv.s b/asm/d/d_item/item_func_FAIRY_DROP__Fv.s deleted file mode 100644 index e614a249657..00000000000 --- a/asm/d/d_item/item_func_FAIRY_DROP__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80098E80: -/* 80098E80 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80098E84 7C 08 02 A6 */ mflr r0 -/* 80098E88 90 01 00 14 */ stw r0, 0x14(r1) -/* 80098E8C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80098E90 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80098E94 38 63 00 9C */ addi r3, r3, 0x9c -/* 80098E98 38 80 00 73 */ li r4, 0x73 -/* 80098E9C 4B F9 A5 B5 */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc -/* 80098EA0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80098EA4 7C 08 03 A6 */ mtlr r0 -/* 80098EA8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80098EAC 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_FISHING_ROD_1__Fv.s b/asm/d/d_item/item_func_FISHING_ROD_1__Fv.s deleted file mode 100644 index 0f8f0529040..00000000000 --- a/asm/d/d_item/item_func_FISHING_ROD_1__Fv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_80098968: -/* 80098968 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009896C 7C 08 02 A6 */ mflr r0 -/* 80098970 90 01 00 14 */ stw r0, 0x14(r1) -/* 80098974 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80098978 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009897C 38 63 00 9C */ addi r3, r3, 0x9c -/* 80098980 38 80 00 14 */ li r4, 0x14 -/* 80098984 38 A0 00 4A */ li r5, 0x4a -/* 80098988 4B F9 A6 31 */ bl setItem__17dSv_player_item_cFiUc -/* 8009898C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80098990 7C 08 03 A6 */ mtlr r0 -/* 80098994 38 21 00 10 */ addi r1, r1, 0x10 -/* 80098998 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_GREEN_BOTTLE__Fv.s b/asm/d/d_item/item_func_GREEN_BOTTLE__Fv.s deleted file mode 100644 index 585e0a0aa66..00000000000 --- a/asm/d/d_item/item_func_GREEN_BOTTLE__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80098B74: -/* 80098B74 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80098B78 7C 08 02 A6 */ mflr r0 -/* 80098B7C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80098B80 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80098B84 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80098B88 38 63 00 9C */ addi r3, r3, 0x9c -/* 80098B8C 38 80 00 62 */ li r4, 0x62 -/* 80098B90 4B F9 A8 C1 */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc -/* 80098B94 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80098B98 7C 08 03 A6 */ mtlr r0 -/* 80098B9C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80098BA0 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_GREEN_RUPEE__Fv.s b/asm/d/d_item/item_func_GREEN_RUPEE__Fv.s deleted file mode 100644 index c54dec092c7..00000000000 --- a/asm/d/d_item/item_func_GREEN_RUPEE__Fv.s +++ /dev/null @@ -1,7 +0,0 @@ -lbl_80097F50: -/* 80097F50 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80097F54 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80097F58 80 64 5D C4 */ lwz r3, 0x5dc4(r4) -/* 80097F5C 38 03 00 01 */ addi r0, r3, 1 -/* 80097F60 90 04 5D C4 */ stw r0, 0x5dc4(r4) -/* 80097F64 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_HALF_MILK_BOTTLE__Fv.s b/asm/d/d_item/item_func_HALF_MILK_BOTTLE__Fv.s deleted file mode 100644 index e704c3e30dd..00000000000 --- a/asm/d/d_item/item_func_HALF_MILK_BOTTLE__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80098C04: -/* 80098C04 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80098C08 7C 08 02 A6 */ mflr r0 -/* 80098C0C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80098C10 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80098C14 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80098C18 38 63 00 9C */ addi r3, r3, 0x9c -/* 80098C1C 38 80 00 65 */ li r4, 0x65 -/* 80098C20 4B F9 A8 F5 */ bl setEmptyBottle__17dSv_player_item_cFUc -/* 80098C24 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80098C28 7C 08 03 A6 */ mtlr r0 -/* 80098C2C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80098C30 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_HAWK_EYE__Fv.s b/asm/d/d_item/item_func_HAWK_EYE__Fv.s deleted file mode 100644 index ee44bc71743..00000000000 --- a/asm/d/d_item/item_func_HAWK_EYE__Fv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_80098690: -/* 80098690 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80098694 7C 08 02 A6 */ mflr r0 -/* 80098698 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009869C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800986A0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800986A4 38 63 00 9C */ addi r3, r3, 0x9c -/* 800986A8 38 80 00 05 */ li r4, 5 -/* 800986AC 38 A0 00 3E */ li r5, 0x3e -/* 800986B0 4B F9 A9 09 */ bl setItem__17dSv_player_item_cFiUc -/* 800986B4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800986B8 7C 08 03 A6 */ mtlr r0 -/* 800986BC 38 21 00 10 */ addi r1, r1, 0x10 -/* 800986C0 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_HEART__Fv.s b/asm/d/d_item/item_func_HEART__Fv.s deleted file mode 100644 index 8a5076e9795..00000000000 --- a/asm/d/d_item/item_func_HEART__Fv.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_80097F2C: -/* 80097F2C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80097F30 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80097F34 C0 23 5D C0 */ lfs f1, 0x5dc0(r3) -/* 80097F38 C0 02 91 D8 */ lfs f0, lit_3655(r2) -/* 80097F3C EC 01 00 2A */ fadds f0, f1, f0 -/* 80097F40 D0 03 5D C0 */ stfs f0, 0x5dc0(r3) -/* 80097F44 38 00 00 00 */ li r0, 0 -/* 80097F48 98 03 5E B6 */ stb r0, 0x5eb6(r3) -/* 80097F4C 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_HOOKSHOT__Fv.s b/asm/d/d_item/item_func_HOOKSHOT__Fv.s deleted file mode 100644 index 3e95e6066d0..00000000000 --- a/asm/d/d_item/item_func_HOOKSHOT__Fv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_800987FC: -/* 800987FC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80098800 7C 08 02 A6 */ mflr r0 -/* 80098804 90 01 00 14 */ stw r0, 0x14(r1) -/* 80098808 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009880C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80098810 38 63 00 9C */ addi r3, r3, 0x9c -/* 80098814 38 80 00 09 */ li r4, 9 -/* 80098818 38 A0 00 44 */ li r5, 0x44 -/* 8009881C 4B F9 A7 9D */ bl setItem__17dSv_player_item_cFiUc -/* 80098820 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80098824 7C 08 03 A6 */ mtlr r0 -/* 80098828 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009882C 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_HORSE_FLUTE__Fv.s b/asm/d/d_item/item_func_HORSE_FLUTE__Fv.s deleted file mode 100644 index 91eabc1bf83..00000000000 --- a/asm/d/d_item/item_func_HORSE_FLUTE__Fv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_8009921C: -/* 8009921C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80099220 7C 08 02 A6 */ mflr r0 -/* 80099224 90 01 00 14 */ stw r0, 0x14(r1) -/* 80099228 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009922C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80099230 38 63 00 9C */ addi r3, r3, 0x9c -/* 80099234 38 80 00 15 */ li r4, 0x15 -/* 80099238 38 A0 00 84 */ li r5, 0x84 -/* 8009923C 4B F9 9D 7D */ bl setItem__17dSv_player_item_cFiUc -/* 80099240 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80099244 7C 08 03 A6 */ mtlr r0 -/* 80099248 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009924C 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_HOT_SPRING2__Fv.s b/asm/d/d_item/item_func_HOT_SPRING2__Fv.s deleted file mode 100644 index 0bf15aea54d..00000000000 --- a/asm/d/d_item/item_func_HOT_SPRING2__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80098D84: -/* 80098D84 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80098D88 7C 08 02 A6 */ mflr r0 -/* 80098D8C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80098D90 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80098D94 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80098D98 38 63 00 9C */ addi r3, r3, 0x9c -/* 80098D9C 38 80 00 6B */ li r4, 0x6b -/* 80098DA0 4B F9 A6 B1 */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc -/* 80098DA4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80098DA8 7C 08 03 A6 */ mtlr r0 -/* 80098DAC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80098DB0 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_HOT_SPRING__Fv.s b/asm/d/d_item/item_func_HOT_SPRING__Fv.s deleted file mode 100644 index 57742a9cac9..00000000000 --- a/asm/d/d_item/item_func_HOT_SPRING__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80098D24: -/* 80098D24 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80098D28 7C 08 02 A6 */ mflr r0 -/* 80098D2C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80098D30 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80098D34 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80098D38 38 63 00 9C */ addi r3, r3, 0x9c -/* 80098D3C 38 80 00 6B */ li r4, 0x6b -/* 80098D40 4B F9 A7 11 */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc -/* 80098D44 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80098D48 7C 08 03 A6 */ mtlr r0 -/* 80098D4C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80098D50 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_HVY_BOOTS__Fv.s b/asm/d/d_item/item_func_HVY_BOOTS__Fv.s deleted file mode 100644 index 9e3be3c4f63..00000000000 --- a/asm/d/d_item/item_func_HVY_BOOTS__Fv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_80098830: -/* 80098830 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80098834 7C 08 02 A6 */ mflr r0 -/* 80098838 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009883C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80098840 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80098844 38 63 00 9C */ addi r3, r3, 0x9c -/* 80098848 38 80 00 03 */ li r4, 3 -/* 8009884C 38 A0 00 45 */ li r5, 0x45 -/* 80098850 4B F9 A7 69 */ bl setItem__17dSv_player_item_cFiUc -/* 80098854 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80098858 7C 08 03 A6 */ mtlr r0 -/* 8009885C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80098860 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_IRIAS_PENDANT__Fv.s b/asm/d/d_item/item_func_IRIAS_PENDANT__Fv.s deleted file mode 100644 index e01da521ff9..00000000000 --- a/asm/d/d_item/item_func_IRIAS_PENDANT__Fv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_800991E8: -/* 800991E8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800991EC 7C 08 02 A6 */ mflr r0 -/* 800991F0 90 01 00 14 */ stw r0, 0x14(r1) -/* 800991F4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800991F8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800991FC 38 63 00 9C */ addi r3, r3, 0x9c -/* 80099200 38 80 00 15 */ li r4, 0x15 -/* 80099204 38 A0 00 83 */ li r5, 0x83 -/* 80099208 4B F9 9D B1 */ bl setItem__17dSv_player_item_cFiUc -/* 8009920C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80099210 7C 08 03 A6 */ mtlr r0 -/* 80099214 38 21 00 10 */ addi r1, r1, 0x10 -/* 80099218 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_IRONBALL__Fv.s b/asm/d/d_item/item_func_IRONBALL__Fv.s deleted file mode 100644 index 6dfff7e704b..00000000000 --- a/asm/d/d_item/item_func_IRONBALL__Fv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_80098780: -/* 80098780 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80098784 7C 08 02 A6 */ mflr r0 -/* 80098788 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009878C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80098790 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80098794 38 63 00 9C */ addi r3, r3, 0x9c -/* 80098798 38 80 00 06 */ li r4, 6 -/* 8009879C 38 A0 00 42 */ li r5, 0x42 -/* 800987A0 4B F9 A8 19 */ bl setItem__17dSv_player_item_cFiUc -/* 800987A4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800987A8 7C 08 03 A6 */ mtlr r0 -/* 800987AC 38 21 00 10 */ addi r1, r1, 0x10 -/* 800987B0 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_KAKERA_HEART__Fv.s b/asm/d/d_item/item_func_KAKERA_HEART__Fv.s deleted file mode 100644 index 40f2345ba39..00000000000 --- a/asm/d/d_item/item_func_KAKERA_HEART__Fv.s +++ /dev/null @@ -1,7 +0,0 @@ -lbl_8009829C: -/* 8009829C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800982A0 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800982A4 A8 64 5D CA */ lha r3, 0x5dca(r4) -/* 800982A8 38 03 00 01 */ addi r0, r3, 1 -/* 800982AC B0 04 5D CA */ sth r0, 0x5dca(r4) -/* 800982B0 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_KANTERA__Fv.s b/asm/d/d_item/item_func_KANTERA__Fv.s deleted file mode 100644 index f06a376ced1..00000000000 --- a/asm/d/d_item/item_func_KANTERA__Fv.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_800988E8: -/* 800988E8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800988EC 7C 08 02 A6 */ mflr r0 -/* 800988F0 90 01 00 14 */ stw r0, 0x14(r1) -/* 800988F4 38 00 54 60 */ li r0, 0x5460 -/* 800988F8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800988FC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80098900 B0 03 00 06 */ sth r0, 6(r3) -/* 80098904 B0 03 00 08 */ sth r0, 8(r3) -/* 80098908 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009890C 38 80 00 01 */ li r4, 1 -/* 80098910 38 A0 00 48 */ li r5, 0x48 -/* 80098914 4B F9 A6 A5 */ bl setItem__17dSv_player_item_cFiUc -/* 80098918 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009891C 7C 08 03 A6 */ mtlr r0 -/* 80098920 38 21 00 10 */ addi r1, r1, 0x10 -/* 80098924 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_KEY_OF_FILONE__Fv.s b/asm/d/d_item/item_func_KEY_OF_FILONE__Fv.s deleted file mode 100644 index 032b2a97114..00000000000 --- a/asm/d/d_item/item_func_KEY_OF_FILONE__Fv.s +++ /dev/null @@ -1,7 +0,0 @@ -lbl_8009961C: -/* 8009961C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80099620 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80099624 A8 64 5D C8 */ lha r3, 0x5dc8(r4) -/* 80099628 38 03 00 01 */ addi r0, r3, 1 -/* 8009962C B0 04 5D C8 */ sth r0, 0x5dc8(r4) -/* 80099630 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_LETTER__Fv.s b/asm/d/d_item/item_func_LETTER__Fv.s deleted file mode 100644 index f35250f762b..00000000000 --- a/asm/d/d_item/item_func_LETTER__Fv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_80099130: -/* 80099130 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80099134 7C 08 02 A6 */ mflr r0 -/* 80099138 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009913C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80099140 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80099144 38 63 00 9C */ addi r3, r3, 0x9c -/* 80099148 38 80 00 15 */ li r4, 0x15 -/* 8009914C 38 A0 00 80 */ li r5, 0x80 -/* 80099150 4B F9 9E 69 */ bl setItem__17dSv_player_item_cFiUc -/* 80099154 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80099158 7C 08 03 A6 */ mtlr r0 -/* 8009915C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80099160 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_LIGHT_ARROW__Fv.s b/asm/d/d_item/item_func_LIGHT_ARROW__Fv.s deleted file mode 100644 index 65ffd5afc73..00000000000 --- a/asm/d/d_item/item_func_LIGHT_ARROW__Fv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_80098A7C: -/* 80098A7C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80098A80 7C 08 02 A6 */ mflr r0 -/* 80098A84 90 01 00 14 */ stw r0, 0x14(r1) -/* 80098A88 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80098A8C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80098A90 38 63 00 9C */ addi r3, r3, 0x9c -/* 80098A94 38 80 00 04 */ li r4, 4 -/* 80098A98 38 A0 00 53 */ li r5, 0x53 -/* 80098A9C 4B F9 A5 1D */ bl setItem__17dSv_player_item_cFiUc -/* 80098AA0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80098AA4 7C 08 03 A6 */ mtlr r0 -/* 80098AA8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80098AAC 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_LIGHT_SWORD__Fv.s b/asm/d/d_item/item_func_LIGHT_SWORD__Fv.s deleted file mode 100644 index 9ba89da0cda..00000000000 --- a/asm/d/d_item/item_func_LIGHT_SWORD__Fv.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_80098928: -/* 80098928 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009892C 7C 08 02 A6 */ mflr r0 -/* 80098930 90 01 00 14 */ stw r0, 0x14(r1) -/* 80098934 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80098938 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009893C 38 63 01 00 */ addi r3, r3, 0x100 -/* 80098940 38 80 00 01 */ li r4, 1 -/* 80098944 38 A0 00 03 */ li r5, 3 -/* 80098948 4B F9 B8 A1 */ bl setCollect__20dSv_player_collect_cFiUc -/* 8009894C 38 60 00 49 */ li r3, 0x49 -/* 80098950 38 80 00 00 */ li r4, 0 -/* 80098954 48 18 5B DD */ bl dMeter2Info_setSword__FUcb -/* 80098958 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009895C 7C 08 03 A6 */ mtlr r0 -/* 80098960 38 21 00 10 */ addi r1, r1, 0x10 -/* 80098964 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_LINKS_SAVINGS__Fv.s b/asm/d/d_item/item_func_LINKS_SAVINGS__Fv.s deleted file mode 100644 index b978d119e7b..00000000000 --- a/asm/d/d_item/item_func_LINKS_SAVINGS__Fv.s +++ /dev/null @@ -1,7 +0,0 @@ -lbl_80099558: -/* 80099558 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009955C 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80099560 80 64 5D C4 */ lwz r3, 0x5dc4(r4) -/* 80099564 38 03 00 32 */ addi r0, r3, 0x32 -/* 80099568 90 04 5D C4 */ stw r0, 0x5dc4(r4) -/* 8009956C 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_LV1_SOUP__Fv.s b/asm/d/d_item/item_func_LV1_SOUP__Fv.s deleted file mode 100644 index ad93fac441b..00000000000 --- a/asm/d/d_item/item_func_LV1_SOUP__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_800990A0: -/* 800990A0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800990A4 7C 08 02 A6 */ mflr r0 -/* 800990A8 90 01 00 14 */ stw r0, 0x14(r1) -/* 800990AC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800990B0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800990B4 38 63 00 9C */ addi r3, r3, 0x9c -/* 800990B8 38 80 00 7D */ li r4, 0x7d -/* 800990BC 4B F9 A3 95 */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc -/* 800990C0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800990C4 7C 08 03 A6 */ mtlr r0 -/* 800990C8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800990CC 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_LV2_BOSS_KEY__Fv.s b/asm/d/d_item/item_func_LV2_BOSS_KEY__Fv.s deleted file mode 100644 index 5466220f421..00000000000 --- a/asm/d/d_item/item_func_LV2_BOSS_KEY__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_800995EC: -/* 800995EC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800995F0 7C 08 02 A6 */ mflr r0 -/* 800995F4 90 01 00 14 */ stw r0, 0x14(r1) -/* 800995F8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800995FC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80099600 38 63 09 58 */ addi r3, r3, 0x958 -/* 80099604 38 80 00 02 */ li r4, 2 -/* 80099608 4B F9 B3 11 */ bl onDungeonItem__12dSv_memBit_cFi -/* 8009960C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80099610 7C 08 03 A6 */ mtlr r0 -/* 80099614 38 21 00 10 */ addi r1, r1, 0x10 -/* 80099618 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_LV2_SOUP__Fv.s b/asm/d/d_item/item_func_LV2_SOUP__Fv.s deleted file mode 100644 index eb5eb505258..00000000000 --- a/asm/d/d_item/item_func_LV2_SOUP__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_800990D0: -/* 800990D0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800990D4 7C 08 02 A6 */ mflr r0 -/* 800990D8 90 01 00 14 */ stw r0, 0x14(r1) -/* 800990DC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800990E0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800990E4 38 63 00 9C */ addi r3, r3, 0x9c -/* 800990E8 38 80 00 7E */ li r4, 0x7e -/* 800990EC 4B F9 A3 65 */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc -/* 800990F0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800990F4 7C 08 03 A6 */ mtlr r0 -/* 800990F8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800990FC 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_LV3_SOUP__Fv.s b/asm/d/d_item/item_func_LV3_SOUP__Fv.s deleted file mode 100644 index 181b2b8c164..00000000000 --- a/asm/d/d_item/item_func_LV3_SOUP__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80099100: -/* 80099100 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80099104 7C 08 02 A6 */ mflr r0 -/* 80099108 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009910C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80099110 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80099114 38 63 00 9C */ addi r3, r3, 0x9c -/* 80099118 38 80 00 7F */ li r4, 0x7f -/* 8009911C 4B F9 A3 35 */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc -/* 80099120 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80099124 7C 08 03 A6 */ mtlr r0 -/* 80099128 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009912C 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_LV5_BOSS_KEY__Fv.s b/asm/d/d_item/item_func_LV5_BOSS_KEY__Fv.s deleted file mode 100644 index 7a0b4382155..00000000000 --- a/asm/d/d_item/item_func_LV5_BOSS_KEY__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_800995A4: -/* 800995A4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800995A8 7C 08 02 A6 */ mflr r0 -/* 800995AC 90 01 00 14 */ stw r0, 0x14(r1) -/* 800995B0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800995B4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800995B8 38 63 09 58 */ addi r3, r3, 0x958 -/* 800995BC 38 80 00 02 */ li r4, 2 -/* 800995C0 4B F9 B3 59 */ bl onDungeonItem__12dSv_memBit_cFi -/* 800995C4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800995C8 7C 08 03 A6 */ mtlr r0 -/* 800995CC 38 21 00 10 */ addi r1, r1, 0x10 -/* 800995D0 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_LV7_DUNGEON_EXIT__Fv.s b/asm/d/d_item/item_func_LV7_DUNGEON_EXIT__Fv.s deleted file mode 100644 index 0d7c99daa65..00000000000 --- a/asm/d/d_item/item_func_LV7_DUNGEON_EXIT__Fv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_80099524: -/* 80099524 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80099528 7C 08 02 A6 */ mflr r0 -/* 8009952C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80099530 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80099534 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80099538 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009953C 38 80 00 12 */ li r4, 0x12 -/* 80099540 38 A0 00 EC */ li r5, 0xec -/* 80099544 4B F9 9A 75 */ bl setItem__17dSv_player_item_cFiUc -/* 80099548 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009954C 7C 08 03 A6 */ mtlr r0 -/* 80099550 38 21 00 10 */ addi r1, r1, 0x10 -/* 80099554 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_L_MAGIC__Fv.s b/asm/d/d_item/item_func_L_MAGIC__Fv.s deleted file mode 100644 index af60c06b9ec..00000000000 --- a/asm/d/d_item/item_func_L_MAGIC__Fv.s +++ /dev/null @@ -1,7 +0,0 @@ -lbl_80098010: -/* 80098010 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80098014 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80098018 A8 64 5D CC */ lha r3, 0x5dcc(r4) -/* 8009801C 38 03 00 08 */ addi r0, r3, 8 -/* 80098020 B0 04 5D CC */ sth r0, 0x5dcc(r4) -/* 80098024 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_MAGIC_LV1__Fv.s b/asm/d/d_item/item_func_MAGIC_LV1__Fv.s deleted file mode 100644 index a909fc7d956..00000000000 --- a/asm/d/d_item/item_func_MAGIC_LV1__Fv.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_800985A8: -/* 800985A8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800985AC 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800985B0 A8 64 5D CC */ lha r3, 0x5dcc(r4) -/* 800985B4 38 03 00 10 */ addi r0, r3, 0x10 -/* 800985B8 B0 04 5D CC */ sth r0, 0x5dcc(r4) -/* 800985BC A8 64 5D D0 */ lha r3, 0x5dd0(r4) -/* 800985C0 38 03 00 10 */ addi r0, r3, 0x10 -/* 800985C4 B0 04 5D D0 */ sth r0, 0x5dd0(r4) -/* 800985C8 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_MAP__Fv.s b/asm/d/d_item/item_func_MAP__Fv.s deleted file mode 100644 index 8654d6fcb46..00000000000 --- a/asm/d/d_item/item_func_MAP__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80098344: -/* 80098344 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80098348 7C 08 02 A6 */ mflr r0 -/* 8009834C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80098350 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80098354 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80098358 38 63 09 58 */ addi r3, r3, 0x958 -/* 8009835C 38 80 00 00 */ li r4, 0 -/* 80098360 4B F9 C5 B9 */ bl onDungeonItem__12dSv_memBit_cFi -/* 80098364 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80098368 7C 08 03 A6 */ mtlr r0 -/* 8009836C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80098370 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_MASTER_SWORD__Fv.s b/asm/d/d_item/item_func_MASTER_SWORD__Fv.s deleted file mode 100644 index ac33ebc9439..00000000000 --- a/asm/d/d_item/item_func_MASTER_SWORD__Fv.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_8009848C: -/* 8009848C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80098490 7C 08 02 A6 */ mflr r0 -/* 80098494 90 01 00 14 */ stw r0, 0x14(r1) -/* 80098498 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009849C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800984A0 38 63 01 00 */ addi r3, r3, 0x100 -/* 800984A4 38 80 00 01 */ li r4, 1 -/* 800984A8 38 A0 00 01 */ li r5, 1 -/* 800984AC 4B F9 BD 3D */ bl setCollect__20dSv_player_collect_cFiUc -/* 800984B0 38 60 00 29 */ li r3, 0x29 -/* 800984B4 4B F9 6A 0D */ bl dComIfGs_setSelectEquipSword__FUc -/* 800984B8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800984BC 7C 08 03 A6 */ mtlr r0 -/* 800984C0 38 21 00 10 */ addi r1, r1, 0x10 -/* 800984C4 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_MILK_BOTTLE__Fv.s b/asm/d/d_item/item_func_MILK_BOTTLE__Fv.s deleted file mode 100644 index a03b1d2d7d6..00000000000 --- a/asm/d/d_item/item_func_MILK_BOTTLE__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80098BD4: -/* 80098BD4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80098BD8 7C 08 02 A6 */ mflr r0 -/* 80098BDC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80098BE0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80098BE4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80098BE8 38 63 00 9C */ addi r3, r3, 0x9c -/* 80098BEC 38 80 00 64 */ li r4, 0x64 -/* 80098BF0 4B F9 A8 61 */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc -/* 80098BF4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80098BF8 7C 08 03 A6 */ mtlr r0 -/* 80098BFC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80098C00 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_NORMAL_BOMB__Fv.s b/asm/d/d_item/item_func_NORMAL_BOMB__Fv.s deleted file mode 100644 index b503bdf9726..00000000000 --- a/asm/d/d_item/item_func_NORMAL_BOMB__Fv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_80098DBC: -/* 80098DBC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80098DC0 7C 08 02 A6 */ mflr r0 -/* 80098DC4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80098DC8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80098DCC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80098DD0 38 63 00 9C */ addi r3, r3, 0x9c -/* 80098DD4 38 80 00 70 */ li r4, 0x70 -/* 80098DD8 38 A0 00 3C */ li r5, 0x3c -/* 80098DDC 4B F9 AD 2D */ bl setEmptyBombBag__17dSv_player_item_cFUcUc -/* 80098DE0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80098DE4 7C 08 03 A6 */ mtlr r0 -/* 80098DE8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80098DEC 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_OIL_BOTTLE2__Fv.s b/asm/d/d_item/item_func_OIL_BOTTLE2__Fv.s deleted file mode 100644 index 513d6748484..00000000000 --- a/asm/d/d_item/item_func_OIL_BOTTLE2__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80098C94: -/* 80098C94 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80098C98 7C 08 02 A6 */ mflr r0 -/* 80098C9C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80098CA0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80098CA4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80098CA8 38 63 00 9C */ addi r3, r3, 0x9c -/* 80098CAC 38 80 00 66 */ li r4, 0x66 -/* 80098CB0 4B F9 A7 A1 */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc -/* 80098CB4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80098CB8 7C 08 03 A6 */ mtlr r0 -/* 80098CBC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80098CC0 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_OIL_BOTTLE3__Fv.s b/asm/d/d_item/item_func_OIL_BOTTLE3__Fv.s deleted file mode 100644 index d5d7b67541d..00000000000 --- a/asm/d/d_item/item_func_OIL_BOTTLE3__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_800992E8: -/* 800992E8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800992EC 7C 08 02 A6 */ mflr r0 -/* 800992F0 90 01 00 14 */ stw r0, 0x14(r1) -/* 800992F4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800992F8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800992FC 38 63 00 9C */ addi r3, r3, 0x9c -/* 80099300 38 80 00 66 */ li r4, 0x66 -/* 80099304 4B F9 A2 11 */ bl setEmptyBottle__17dSv_player_item_cFUc -/* 80099308 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009930C 7C 08 03 A6 */ mtlr r0 -/* 80099310 38 21 00 10 */ addi r1, r1, 0x10 -/* 80099314 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_OIL_BOTTLE__Fv.s b/asm/d/d_item/item_func_OIL_BOTTLE__Fv.s deleted file mode 100644 index 1b7cc5a95c9..00000000000 --- a/asm/d/d_item/item_func_OIL_BOTTLE__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80098C34: -/* 80098C34 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80098C38 7C 08 02 A6 */ mflr r0 -/* 80098C3C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80098C40 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80098C44 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80098C48 38 63 00 9C */ addi r3, r3, 0x9c -/* 80098C4C 38 80 00 66 */ li r4, 0x66 -/* 80098C50 4B F9 A8 01 */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc -/* 80098C54 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80098C58 7C 08 03 A6 */ mtlr r0 -/* 80098C5C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80098C60 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_ORANGE_RUPEE__Fv.s b/asm/d/d_item/item_func_ORANGE_RUPEE__Fv.s deleted file mode 100644 index c2de0475bac..00000000000 --- a/asm/d/d_item/item_func_ORANGE_RUPEE__Fv.s +++ /dev/null @@ -1,7 +0,0 @@ -lbl_80097FC8: -/* 80097FC8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80097FCC 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80097FD0 80 64 5D C4 */ lwz r3, 0x5dc4(r4) -/* 80097FD4 38 03 00 64 */ addi r0, r3, 0x64 -/* 80097FD8 90 04 5D C4 */ stw r0, 0x5dc4(r4) -/* 80097FDC 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_PACHINKO_SHOT__Fv.s b/asm/d/d_item/item_func_PACHINKO_SHOT__Fv.s deleted file mode 100644 index c1d3f8b92e7..00000000000 --- a/asm/d/d_item/item_func_PACHINKO_SHOT__Fv.s +++ /dev/null @@ -1,7 +0,0 @@ -lbl_80098128: -/* 80098128 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009812C 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80098130 A8 64 5D F6 */ lha r3, 0x5df6(r4) -/* 80098134 38 03 00 32 */ addi r0, r3, 0x32 -/* 80098138 B0 04 5D F6 */ sth r0, 0x5df6(r4) -/* 8009813C 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_PACHINKO__Fv.s b/asm/d/d_item/item_func_PACHINKO__Fv.s deleted file mode 100644 index 914f82df3fa..00000000000 --- a/asm/d/d_item/item_func_PACHINKO__Fv.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_8009899C: -/* 8009899C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800989A0 7C 08 02 A6 */ mflr r0 -/* 800989A4 90 01 00 14 */ stw r0, 0x14(r1) -/* 800989A8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800989AC 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800989B0 A8 64 5D F6 */ lha r3, 0x5df6(r4) -/* 800989B4 38 03 00 32 */ addi r0, r3, 0x32 -/* 800989B8 B0 04 5D F6 */ sth r0, 0x5df6(r4) -/* 800989BC 38 64 00 9C */ addi r3, r4, 0x9c -/* 800989C0 38 80 00 17 */ li r4, 0x17 -/* 800989C4 38 A0 00 4B */ li r5, 0x4b -/* 800989C8 4B F9 A5 F1 */ bl setItem__17dSv_player_item_cFiUc -/* 800989CC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800989D0 7C 08 03 A6 */ mtlr r0 -/* 800989D4 38 21 00 10 */ addi r1, r1, 0x10 -/* 800989D8 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_POKE_BOMB__Fv.s b/asm/d/d_item/item_func_POKE_BOMB__Fv.s deleted file mode 100644 index 263f762eeb0..00000000000 --- a/asm/d/d_item/item_func_POKE_BOMB__Fv.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_80098E38: -/* 80098E38 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80098E3C 7C 08 02 A6 */ mflr r0 -/* 80098E40 90 01 00 14 */ stw r0, 0x14(r1) -/* 80098E44 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80098E48 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80098E4C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80098E50 3B E3 00 9C */ addi r31, r3, 0x9c -/* 80098E54 7F E3 FB 78 */ mr r3, r31 -/* 80098E58 4B F9 AC 31 */ bl setEmptyBombBag__17dSv_player_item_cFv -/* 80098E5C 7F E3 FB 78 */ mr r3, r31 -/* 80098E60 38 80 00 72 */ li r4, 0x72 -/* 80098E64 38 A0 00 01 */ li r5, 1 -/* 80098E68 4B F9 AB B9 */ bl setEmptyBombBagItemIn__17dSv_player_item_cFUcb -/* 80098E6C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80098E70 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80098E74 7C 08 03 A6 */ mtlr r0 -/* 80098E78 38 21 00 10 */ addi r1, r1, 0x10 -/* 80098E7C 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_PURPLE_RUPEE__Fv.s b/asm/d/d_item/item_func_PURPLE_RUPEE__Fv.s deleted file mode 100644 index 8bb653c2012..00000000000 --- a/asm/d/d_item/item_func_PURPLE_RUPEE__Fv.s +++ /dev/null @@ -1,7 +0,0 @@ -lbl_80097FB0: -/* 80097FB0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80097FB4 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80097FB8 80 64 5D C4 */ lwz r3, 0x5dc4(r4) -/* 80097FBC 38 03 00 32 */ addi r0, r3, 0x32 -/* 80097FC0 90 04 5D C4 */ stw r0, 0x5dc4(r4) -/* 80097FC4 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_RAFRELS_MEMO__Fv.s b/asm/d/d_item/item_func_RAFRELS_MEMO__Fv.s deleted file mode 100644 index 1c7eaba8723..00000000000 --- a/asm/d/d_item/item_func_RAFRELS_MEMO__Fv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_80099250: -/* 80099250 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80099254 7C 08 02 A6 */ mflr r0 -/* 80099258 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009925C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80099260 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80099264 38 63 00 9C */ addi r3, r3, 0x9c -/* 80099268 38 80 00 13 */ li r4, 0x13 -/* 8009926C 38 A0 00 90 */ li r5, 0x90 -/* 80099270 4B F9 9D 49 */ bl setItem__17dSv_player_item_cFiUc -/* 80099274 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80099278 7C 08 03 A6 */ mtlr r0 -/* 8009927C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80099280 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_RECOVER_FAILY__Fv.s b/asm/d/d_item/item_func_RECOVER_FAILY__Fv.s deleted file mode 100644 index 51438192b47..00000000000 --- a/asm/d/d_item/item_func_RECOVER_FAILY__Fv.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_8009825C: -/* 8009825C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80098260 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80098264 C0 23 5D C0 */ lfs f1, 0x5dc0(r3) -/* 80098268 C0 02 91 DC */ lfs f0, lit_3794(r2) -/* 8009826C EC 01 00 2A */ fadds f0, f1, f0 -/* 80098270 D0 03 5D C0 */ stfs f0, 0x5dc0(r3) -/* 80098274 38 00 00 00 */ li r0, 0 -/* 80098278 98 03 5E B6 */ stb r0, 0x5eb6(r3) -/* 8009827C 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_RED_BOTTLE2__Fv.s b/asm/d/d_item/item_func_RED_BOTTLE2__Fv.s deleted file mode 100644 index 0a1f021c000..00000000000 --- a/asm/d/d_item/item_func_RED_BOTTLE2__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80098CC4: -/* 80098CC4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80098CC8 7C 08 02 A6 */ mflr r0 -/* 80098CCC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80098CD0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80098CD4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80098CD8 38 63 00 9C */ addi r3, r3, 0x9c -/* 80098CDC 38 80 00 61 */ li r4, 0x61 -/* 80098CE0 4B F9 A7 71 */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc -/* 80098CE4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80098CE8 7C 08 03 A6 */ mtlr r0 -/* 80098CEC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80098CF0 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_RED_BOTTLE__Fv.s b/asm/d/d_item/item_func_RED_BOTTLE__Fv.s deleted file mode 100644 index d28f1f88fe0..00000000000 --- a/asm/d/d_item/item_func_RED_BOTTLE__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80098B44: -/* 80098B44 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80098B48 7C 08 02 A6 */ mflr r0 -/* 80098B4C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80098B50 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80098B54 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80098B58 38 63 00 9C */ addi r3, r3, 0x9c -/* 80098B5C 38 80 00 61 */ li r4, 0x61 -/* 80098B60 4B F9 A8 F1 */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc -/* 80098B64 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80098B68 7C 08 03 A6 */ mtlr r0 -/* 80098B6C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80098B70 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_RED_RUPEE__Fv.s b/asm/d/d_item/item_func_RED_RUPEE__Fv.s deleted file mode 100644 index 414f00c1f69..00000000000 --- a/asm/d/d_item/item_func_RED_RUPEE__Fv.s +++ /dev/null @@ -1,7 +0,0 @@ -lbl_80097F98: -/* 80097F98 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80097F9C 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80097FA0 80 64 5D C4 */ lwz r3, 0x5dc4(r4) -/* 80097FA4 38 03 00 14 */ addi r0, r3, 0x14 -/* 80097FA8 90 04 5D C4 */ stw r0, 0x5dc4(r4) -/* 80097FAC 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_SHOP_BEE_CHILD__Fv.s b/asm/d/d_item/item_func_SHOP_BEE_CHILD__Fv.s deleted file mode 100644 index 927d3b3aaf3..00000000000 --- a/asm/d/d_item/item_func_SHOP_BEE_CHILD__Fv.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80099318: -/* 80099318 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009931C 7C 08 02 A6 */ mflr r0 -/* 80099320 90 01 00 14 */ stw r0, 0x14(r1) -/* 80099324 4B FF FB C1 */ bl item_func_BEE_CHILD__Fv -/* 80099328 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009932C 7C 08 03 A6 */ mtlr r0 -/* 80099330 38 21 00 10 */ addi r1, r1, 0x10 -/* 80099334 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_SILVER_RUPEE__Fv.s b/asm/d/d_item/item_func_SILVER_RUPEE__Fv.s deleted file mode 100644 index 333c950a6cc..00000000000 --- a/asm/d/d_item/item_func_SILVER_RUPEE__Fv.s +++ /dev/null @@ -1,7 +0,0 @@ -lbl_80097FE0: -/* 80097FE0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80097FE4 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80097FE8 80 64 5D C4 */ lwz r3, 0x5dc4(r4) -/* 80097FEC 38 03 00 C8 */ addi r0, r3, 0xc8 -/* 80097FF0 90 04 5D C4 */ stw r0, 0x5dc4(r4) -/* 80097FF4 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_SMALL_KEY2__Fv.s b/asm/d/d_item/item_func_SMALL_KEY2__Fv.s deleted file mode 100644 index 0b52f9dd5c7..00000000000 --- a/asm/d/d_item/item_func_SMALL_KEY2__Fv.s +++ /dev/null @@ -1,7 +0,0 @@ -lbl_80099570: -/* 80099570 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80099574 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80099578 A8 64 5D C8 */ lha r3, 0x5dc8(r4) -/* 8009957C 38 03 00 01 */ addi r0, r3, 1 -/* 80099580 B0 04 5D C8 */ sth r0, 0x5dc8(r4) -/* 80099584 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_SMALL_KEY__Fv.s b/asm/d/d_item/item_func_SMALL_KEY__Fv.s deleted file mode 100644 index 9c80273d3b0..00000000000 --- a/asm/d/d_item/item_func_SMALL_KEY__Fv.s +++ /dev/null @@ -1,7 +0,0 @@ -lbl_80098284: -/* 80098284 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80098288 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009828C A8 64 5D C8 */ lha r3, 0x5dc8(r4) -/* 80098290 38 03 00 01 */ addi r0, r3, 1 -/* 80098294 B0 04 5D C8 */ sth r0, 0x5dc8(r4) -/* 80098298 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_SPINNER__Fv.s b/asm/d/d_item/item_func_SPINNER__Fv.s deleted file mode 100644 index 85560e0e036..00000000000 --- a/asm/d/d_item/item_func_SPINNER__Fv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_8009874C: -/* 8009874C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80098750 7C 08 02 A6 */ mflr r0 -/* 80098754 90 01 00 14 */ stw r0, 0x14(r1) -/* 80098758 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009875C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80098760 38 63 00 9C */ addi r3, r3, 0x9c -/* 80098764 38 80 00 02 */ li r4, 2 -/* 80098768 38 A0 00 41 */ li r5, 0x41 -/* 8009876C 4B F9 A8 4D */ bl setItem__17dSv_player_item_cFiUc -/* 80098770 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80098774 7C 08 03 A6 */ mtlr r0 -/* 80098778 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009877C 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_SWORD__Fv.s b/asm/d/d_item/item_func_SWORD__Fv.s deleted file mode 100644 index 7b6c143b916..00000000000 --- a/asm/d/d_item/item_func_SWORD__Fv.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_80098450: -/* 80098450 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80098454 7C 08 02 A6 */ mflr r0 -/* 80098458 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009845C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80098460 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80098464 38 63 01 00 */ addi r3, r3, 0x100 -/* 80098468 38 80 00 01 */ li r4, 1 -/* 8009846C 38 A0 00 00 */ li r5, 0 -/* 80098470 4B F9 BD 79 */ bl setCollect__20dSv_player_collect_cFiUc -/* 80098474 38 60 00 28 */ li r3, 0x28 -/* 80098478 4B F9 6A 49 */ bl dComIfGs_setSelectEquipSword__FUc -/* 8009847C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80098480 7C 08 03 A6 */ mtlr r0 -/* 80098484 38 21 00 10 */ addi r1, r1, 0x10 -/* 80098488 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_S_MAGIC__Fv.s b/asm/d/d_item/item_func_S_MAGIC__Fv.s deleted file mode 100644 index 7dbfc076175..00000000000 --- a/asm/d/d_item/item_func_S_MAGIC__Fv.s +++ /dev/null @@ -1,7 +0,0 @@ -lbl_80097FF8: -/* 80097FF8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80097FFC 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80098000 A8 64 5D CC */ lha r3, 0x5dcc(r4) -/* 80098004 38 03 00 04 */ addi r0, r3, 4 -/* 80098008 B0 04 5D CC */ sth r0, 0x5dcc(r4) -/* 8009800C 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_TKS_LETTER__Fv.s b/asm/d/d_item/item_func_TKS_LETTER__Fv.s deleted file mode 100644 index 01e9259902f..00000000000 --- a/asm/d/d_item/item_func_TKS_LETTER__Fv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_8009850C: -/* 8009850C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80098510 7C 08 02 A6 */ mflr r0 -/* 80098514 90 01 00 14 */ stw r0, 0x14(r1) -/* 80098518 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009851C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80098520 38 63 00 9C */ addi r3, r3, 0x9c -/* 80098524 38 80 00 12 */ li r4, 0x12 -/* 80098528 38 A0 00 2D */ li r5, 0x2d -/* 8009852C 4B F9 AA 8D */ bl setItem__17dSv_player_item_cFiUc -/* 80098530 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80098534 7C 08 03 A6 */ mtlr r0 -/* 80098538 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009853C 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_UGLY_SOUP__Fv.s b/asm/d/d_item/item_func_UGLY_SOUP__Fv.s deleted file mode 100644 index 4c8f9a1e8ab..00000000000 --- a/asm/d/d_item/item_func_UGLY_SOUP__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80098CF4: -/* 80098CF4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80098CF8 7C 08 02 A6 */ mflr r0 -/* 80098CFC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80098D00 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80098D04 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80098D08 38 63 00 9C */ addi r3, r3, 0x9c -/* 80098D0C 38 80 00 6A */ li r4, 0x6a -/* 80098D10 4B F9 A7 41 */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc -/* 80098D14 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80098D18 7C 08 03 A6 */ mtlr r0 -/* 80098D1C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80098D20 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_UTUWA_HEART__Fv.s b/asm/d/d_item/item_func_UTUWA_HEART__Fv.s deleted file mode 100644 index 936c90fa78b..00000000000 --- a/asm/d/d_item/item_func_UTUWA_HEART__Fv.s +++ /dev/null @@ -1,37 +0,0 @@ -lbl_800982B4: -/* 800982B4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800982B8 7C 08 02 A6 */ mflr r0 -/* 800982BC 90 01 00 14 */ stw r0, 0x14(r1) -/* 800982C0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800982C4 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800982C8 A8 64 5D CA */ lha r3, 0x5dca(r4) -/* 800982CC 38 03 00 05 */ addi r0, r3, 5 -/* 800982D0 B0 04 5D CA */ sth r0, 0x5dca(r4) -/* 800982D4 4B F9 59 D5 */ bl dComIfGs_getMaxLifeGauge__Fv -/* 800982D8 54 60 04 3E */ clrlwi r0, r3, 0x10 -/* 800982DC C8 22 91 E0 */ lfd f1, lit_3828(r2) -/* 800982E0 90 01 00 0C */ stw r0, 0xc(r1) -/* 800982E4 3C 00 43 30 */ lis r0, 0x4330 -/* 800982E8 90 01 00 08 */ stw r0, 8(r1) -/* 800982EC C8 01 00 08 */ lfd f0, 8(r1) -/* 800982F0 EC 20 08 28 */ fsubs f1, f0, f1 -/* 800982F4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800982F8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800982FC C0 03 5D C0 */ lfs f0, 0x5dc0(r3) -/* 80098300 EC 00 08 2A */ fadds f0, f0, f1 -/* 80098304 D0 03 5D C0 */ stfs f0, 0x5dc0(r3) -/* 80098308 38 00 00 00 */ li r0, 0 -/* 8009830C 98 03 5E B6 */ stb r0, 0x5eb6(r3) -/* 80098310 85 83 4E 20 */ lwzu r12, 0x4e20(r3) -/* 80098314 81 8C 00 BC */ lwz r12, 0xbc(r12) -/* 80098318 7D 89 03 A6 */ mtctr r12 -/* 8009831C 4E 80 04 21 */ bctrl -/* 80098320 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80098324 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80098328 38 63 09 58 */ addi r3, r3, 0x958 -/* 8009832C 38 80 00 04 */ li r4, 4 -/* 80098330 4B F9 C5 E9 */ bl onDungeonItem__12dSv_memBit_cFi -/* 80098334 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80098338 7C 08 03 A6 */ mtlr r0 -/* 8009833C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80098340 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_WALLET_LV1__Fv.s b/asm/d/d_item/item_func_WALLET_LV1__Fv.s deleted file mode 100644 index a806aa5309d..00000000000 --- a/asm/d/d_item/item_func_WALLET_LV1__Fv.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_80098600: -/* 80098600 38 00 00 00 */ li r0, 0 -/* 80098604 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80098608 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009860C 98 03 00 19 */ stb r0, 0x19(r3) -/* 80098610 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_WALLET_LV2__Fv.s b/asm/d/d_item/item_func_WALLET_LV2__Fv.s deleted file mode 100644 index 9971b870ac8..00000000000 --- a/asm/d/d_item/item_func_WALLET_LV2__Fv.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_80098614: -/* 80098614 38 00 00 01 */ li r0, 1 -/* 80098618 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009861C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80098620 98 03 00 19 */ stb r0, 0x19(r3) -/* 80098624 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_WALLET_LV3__Fv.s b/asm/d/d_item/item_func_WALLET_LV3__Fv.s deleted file mode 100644 index 40ef8025892..00000000000 --- a/asm/d/d_item/item_func_WALLET_LV3__Fv.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_80098628: -/* 80098628 38 00 00 02 */ li r0, 2 -/* 8009862C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80098630 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80098634 98 03 00 19 */ stb r0, 0x19(r3) -/* 80098638 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_WATER_BOMB_10__Fv.s b/asm/d/d_item/item_func_WATER_BOMB_10__Fv.s deleted file mode 100644 index 3f097566b2f..00000000000 --- a/asm/d/d_item/item_func_WATER_BOMB_10__Fv.s +++ /dev/null @@ -1,11 +0,0 @@ -lbl_80098168: -/* 80098168 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009816C 7C 08 02 A6 */ mflr r0 -/* 80098170 90 01 00 14 */ stw r0, 0x14(r1) -/* 80098174 38 60 00 71 */ li r3, 0x71 -/* 80098178 38 80 00 0A */ li r4, 0xa -/* 8009817C 48 00 37 C5 */ bl addBombCount__FUcUc -/* 80098180 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80098184 7C 08 03 A6 */ mtlr r0 -/* 80098188 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009818C 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_WATER_BOMB_20__Fv.s b/asm/d/d_item/item_func_WATER_BOMB_20__Fv.s deleted file mode 100644 index 742ad1aa4ea..00000000000 --- a/asm/d/d_item/item_func_WATER_BOMB_20__Fv.s +++ /dev/null @@ -1,11 +0,0 @@ -lbl_80098190: -/* 80098190 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80098194 7C 08 02 A6 */ mflr r0 -/* 80098198 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009819C 38 60 00 71 */ li r3, 0x71 -/* 800981A0 38 80 00 0F */ li r4, 0xf -/* 800981A4 48 00 37 9D */ bl addBombCount__FUcUc -/* 800981A8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800981AC 7C 08 03 A6 */ mtlr r0 -/* 800981B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 800981B4 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_WATER_BOMB_30__Fv.s b/asm/d/d_item/item_func_WATER_BOMB_30__Fv.s deleted file mode 100644 index b6d803b2022..00000000000 --- a/asm/d/d_item/item_func_WATER_BOMB_30__Fv.s +++ /dev/null @@ -1,11 +0,0 @@ -lbl_800981B8: -/* 800981B8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800981BC 7C 08 02 A6 */ mflr r0 -/* 800981C0 90 01 00 14 */ stw r0, 0x14(r1) -/* 800981C4 38 60 00 71 */ li r3, 0x71 -/* 800981C8 38 80 00 03 */ li r4, 3 -/* 800981CC 48 00 37 75 */ bl addBombCount__FUcUc -/* 800981D0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800981D4 7C 08 03 A6 */ mtlr r0 -/* 800981D8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800981DC 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_WATER_BOMB_5__Fv.s b/asm/d/d_item/item_func_WATER_BOMB_5__Fv.s deleted file mode 100644 index 1e35bf70641..00000000000 --- a/asm/d/d_item/item_func_WATER_BOMB_5__Fv.s +++ /dev/null @@ -1,11 +0,0 @@ -lbl_80098140: -/* 80098140 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80098144 7C 08 02 A6 */ mflr r0 -/* 80098148 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009814C 38 60 00 71 */ li r3, 0x71 -/* 80098150 38 80 00 05 */ li r4, 5 -/* 80098154 48 00 37 ED */ bl addBombCount__FUcUc -/* 80098158 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009815C 7C 08 03 A6 */ mtlr r0 -/* 80098160 38 21 00 10 */ addi r1, r1, 0x10 -/* 80098164 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_WATER_BOMB__Fv.s b/asm/d/d_item/item_func_WATER_BOMB__Fv.s deleted file mode 100644 index 9ffe90d7864..00000000000 --- a/asm/d/d_item/item_func_WATER_BOMB__Fv.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_80098DF0: -/* 80098DF0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80098DF4 7C 08 02 A6 */ mflr r0 -/* 80098DF8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80098DFC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80098E00 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80098E04 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80098E08 3B E3 00 9C */ addi r31, r3, 0x9c -/* 80098E0C 7F E3 FB 78 */ mr r3, r31 -/* 80098E10 4B F9 AC 79 */ bl setEmptyBombBag__17dSv_player_item_cFv -/* 80098E14 7F E3 FB 78 */ mr r3, r31 -/* 80098E18 38 80 00 71 */ li r4, 0x71 -/* 80098E1C 38 A0 00 01 */ li r5, 1 -/* 80098E20 4B F9 AC 01 */ bl setEmptyBombBagItemIn__17dSv_player_item_cFUcb -/* 80098E24 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80098E28 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80098E2C 7C 08 03 A6 */ mtlr r0 -/* 80098E30 38 21 00 10 */ addi r1, r1, 0x10 -/* 80098E34 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_WATER_BOTTLE__Fv.s b/asm/d/d_item/item_func_WATER_BOTTLE__Fv.s deleted file mode 100644 index 85db59c06e0..00000000000 --- a/asm/d/d_item/item_func_WATER_BOTTLE__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80098C64: -/* 80098C64 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80098C68 7C 08 02 A6 */ mflr r0 -/* 80098C6C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80098C70 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80098C74 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80098C78 38 63 00 9C */ addi r3, r3, 0x9c -/* 80098C7C 38 80 00 67 */ li r4, 0x67 -/* 80098C80 4B F9 A7 D1 */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc -/* 80098C84 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80098C88 7C 08 03 A6 */ mtlr r0 -/* 80098C8C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80098C90 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_WEAR_CASUAL__Fv.s b/asm/d/d_item/item_func_WEAR_CASUAL__Fv.s deleted file mode 100644 index ae837fbfa05..00000000000 --- a/asm/d/d_item/item_func_WEAR_CASUAL__Fv.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_80098540: -/* 80098540 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80098544 7C 08 02 A6 */ mflr r0 -/* 80098548 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009854C 38 60 00 2E */ li r3, 0x2e -/* 80098550 4B F9 69 61 */ bl dComIfGs_setSelectEquipClothes__FUc -/* 80098554 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80098558 7C 08 03 A6 */ mtlr r0 -/* 8009855C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80098560 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_WEAR_KOKIRI__Fv.s b/asm/d/d_item/item_func_WEAR_KOKIRI__Fv.s deleted file mode 100644 index b02970db5c0..00000000000 --- a/asm/d/d_item/item_func_WEAR_KOKIRI__Fv.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_80098564: -/* 80098564 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80098568 7C 08 02 A6 */ mflr r0 -/* 8009856C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80098570 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80098574 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80098578 38 63 01 00 */ addi r3, r3, 0x100 -/* 8009857C 38 80 00 00 */ li r4, 0 -/* 80098580 38 A0 00 00 */ li r5, 0 -/* 80098584 4B F9 BC 65 */ bl setCollect__20dSv_player_collect_cFiUc -/* 80098588 38 60 00 2F */ li r3, 0x2f -/* 8009858C 4B F9 69 25 */ bl dComIfGs_setSelectEquipClothes__FUc -/* 80098590 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80098594 7C 08 03 A6 */ mtlr r0 -/* 80098598 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009859C 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_WOOD_SHIELD__Fv.s b/asm/d/d_item/item_func_WOOD_SHIELD__Fv.s deleted file mode 100644 index a9151becf42..00000000000 --- a/asm/d/d_item/item_func_WOOD_SHIELD__Fv.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_800984C8: -/* 800984C8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800984CC 7C 08 02 A6 */ mflr r0 -/* 800984D0 90 01 00 14 */ stw r0, 0x14(r1) -/* 800984D4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800984D8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800984DC 38 63 01 00 */ addi r3, r3, 0x100 -/* 800984E0 38 80 00 02 */ li r4, 2 -/* 800984E4 38 A0 00 00 */ li r5, 0 -/* 800984E8 4B F9 BD 01 */ bl setCollect__20dSv_player_collect_cFiUc -/* 800984EC 38 60 00 2A */ li r3, 0x2a -/* 800984F0 4B F9 6A A5 */ bl dComIfGs_setSelectEquipShield__FUc -/* 800984F4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800984F8 7C 08 03 A6 */ mtlr r0 -/* 800984FC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80098500 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_WOOD_STATUE__Fv.s b/asm/d/d_item/item_func_WOOD_STATUE__Fv.s deleted file mode 100644 index 3e8635f7320..00000000000 --- a/asm/d/d_item/item_func_WOOD_STATUE__Fv.s +++ /dev/null @@ -1,21 +0,0 @@ -lbl_80099198: -/* 80099198 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009919C 7C 08 02 A6 */ mflr r0 -/* 800991A0 90 01 00 14 */ stw r0, 0x14(r1) -/* 800991A4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800991A8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800991AC 38 63 07 F0 */ addi r3, r3, 0x7f0 -/* 800991B0 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 800991B4 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 800991B8 A0 84 02 36 */ lhz r4, 0x236(r4) -/* 800991BC 4B F9 B7 D1 */ bl onEventBit__11dSv_event_cFUs -/* 800991C0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800991C4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800991C8 38 63 00 9C */ addi r3, r3, 0x9c -/* 800991CC 38 80 00 15 */ li r4, 0x15 -/* 800991D0 38 A0 00 82 */ li r5, 0x82 -/* 800991D4 4B F9 9D E5 */ bl setItem__17dSv_player_item_cFiUc -/* 800991D8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800991DC 7C 08 03 A6 */ mtlr r0 -/* 800991E0 38 21 00 10 */ addi r1, r1, 0x10 -/* 800991E4 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_W_HOOKSHOT__Fv.s b/asm/d/d_item/item_func_W_HOOKSHOT__Fv.s deleted file mode 100644 index fd28028e0cc..00000000000 --- a/asm/d/d_item/item_func_W_HOOKSHOT__Fv.s +++ /dev/null @@ -1,21 +0,0 @@ -lbl_80098898: -/* 80098898 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009889C 7C 08 02 A6 */ mflr r0 -/* 800988A0 90 01 00 14 */ stw r0, 0x14(r1) -/* 800988A4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800988A8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800988AC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800988B0 3B E3 00 9C */ addi r31, r3, 0x9c -/* 800988B4 7F E3 FB 78 */ mr r3, r31 -/* 800988B8 38 80 00 09 */ li r4, 9 -/* 800988BC 38 A0 00 FF */ li r5, 0xff -/* 800988C0 4B F9 A6 F9 */ bl setItem__17dSv_player_item_cFiUc -/* 800988C4 7F E3 FB 78 */ mr r3, r31 -/* 800988C8 38 80 00 0A */ li r4, 0xa -/* 800988CC 38 A0 00 47 */ li r5, 0x47 -/* 800988D0 4B F9 A6 E9 */ bl setItem__17dSv_player_item_cFiUc -/* 800988D4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800988D8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800988DC 7C 08 03 A6 */ mtlr r0 -/* 800988E0 38 21 00 10 */ addi r1, r1, 0x10 -/* 800988E4 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_YELLOW_RUPEE__Fv.s b/asm/d/d_item/item_func_YELLOW_RUPEE__Fv.s deleted file mode 100644 index 74c853f2846..00000000000 --- a/asm/d/d_item/item_func_YELLOW_RUPEE__Fv.s +++ /dev/null @@ -1,7 +0,0 @@ -lbl_80097F80: -/* 80097F80 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80097F84 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80097F88 80 64 5D C4 */ lwz r3, 0x5dc4(r4) -/* 80097F8C 38 03 00 0A */ addi r0, r3, 0xa -/* 80097F90 90 04 5D C4 */ stw r0, 0x5dc4(r4) -/* 80097F94 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_func_ZORAS_JEWEL__Fv.s b/asm/d/d_item/item_func_ZORAS_JEWEL__Fv.s deleted file mode 100644 index 17695ea62ac..00000000000 --- a/asm/d/d_item/item_func_ZORAS_JEWEL__Fv.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_8009863C: -/* 8009863C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80098640 7C 08 02 A6 */ mflr r0 -/* 80098644 90 01 00 14 */ stw r0, 0x14(r1) -/* 80098648 48 00 1A 81 */ bl item_getcheck_func_FISHING_ROD_1__Fv -/* 8009864C 2C 03 00 00 */ cmpwi r3, 0 -/* 80098650 41 82 00 18 */ beq lbl_80098668 -/* 80098654 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80098658 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009865C 38 63 00 9C */ addi r3, r3, 0x9c -/* 80098660 4B F9 B6 5D */ bl setRodTypeLevelUp__17dSv_player_item_cFv -/* 80098664 48 00 00 1C */ b lbl_80098680 -lbl_80098668: -/* 80098668 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009866C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80098670 38 63 00 9C */ addi r3, r3, 0x9c -/* 80098674 38 80 00 14 */ li r4, 0x14 -/* 80098678 38 A0 00 3D */ li r5, 0x3d -/* 8009867C 4B F9 A9 3D */ bl setItem__17dSv_player_item_cFiUc -lbl_80098680: -/* 80098680 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80098684 7C 08 03 A6 */ mtlr r0 -/* 80098688 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009868C 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_AIR_LETTER__Fv.s b/asm/d/d_item/item_getcheck_func_AIR_LETTER__Fv.s deleted file mode 100644 index b207a103881..00000000000 --- a/asm/d/d_item/item_getcheck_func_AIR_LETTER__Fv.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_8009B3E4: -/* 8009B3E4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009B3E8 7C 08 02 A6 */ mflr r0 -/* 8009B3EC 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009B3F0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009B3F4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009B3F8 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009B3FC 38 80 00 16 */ li r4, 0x16 -/* 8009B400 38 A0 00 01 */ li r5, 1 -/* 8009B404 4B F9 7C 2D */ bl getItem__17dSv_player_item_cCFib -/* 8009B408 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8009B40C 20 00 00 EA */ subfic r0, r0, 0xea -/* 8009B410 7C 00 00 34 */ cntlzw r0, r0 -/* 8009B414 54 03 D9 7E */ srwi r3, r0, 5 -/* 8009B418 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009B41C 7C 08 03 A6 */ mtlr r0 -/* 8009B420 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009B424 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_ANCIENT_DOCUMENT2__Fv.s b/asm/d/d_item/item_getcheck_func_ANCIENT_DOCUMENT2__Fv.s deleted file mode 100644 index e0e3b0528ed..00000000000 --- a/asm/d/d_item/item_getcheck_func_ANCIENT_DOCUMENT2__Fv.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_8009B428: -/* 8009B428 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009B42C 7C 08 02 A6 */ mflr r0 -/* 8009B430 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009B434 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009B438 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009B43C 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009B440 38 80 00 16 */ li r4, 0x16 -/* 8009B444 38 A0 00 01 */ li r5, 1 -/* 8009B448 4B F9 7B E9 */ bl getItem__17dSv_player_item_cCFib -/* 8009B44C 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8009B450 20 00 00 EB */ subfic r0, r0, 0xeb -/* 8009B454 7C 00 00 34 */ cntlzw r0, r0 -/* 8009B458 54 03 D9 7E */ srwi r3, r0, 5 -/* 8009B45C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009B460 7C 08 03 A6 */ mtlr r0 -/* 8009B464 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009B468 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_ANCIENT_DOCUMENT__Fv.s b/asm/d/d_item/item_getcheck_func_ANCIENT_DOCUMENT__Fv.s deleted file mode 100644 index aab59ecfa9c..00000000000 --- a/asm/d/d_item/item_getcheck_func_ANCIENT_DOCUMENT__Fv.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_8009B3A0: -/* 8009B3A0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009B3A4 7C 08 02 A6 */ mflr r0 -/* 8009B3A8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009B3AC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009B3B0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009B3B4 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009B3B8 38 80 00 16 */ li r4, 0x16 -/* 8009B3BC 38 A0 00 01 */ li r5, 1 -/* 8009B3C0 4B F9 7C 71 */ bl getItem__17dSv_player_item_cCFib -/* 8009B3C4 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8009B3C8 20 00 00 E9 */ subfic r0, r0, 0xe9 -/* 8009B3CC 7C 00 00 34 */ cntlzw r0, r0 -/* 8009B3D0 54 03 D9 7E */ srwi r3, r0, 5 -/* 8009B3D4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009B3D8 7C 08 03 A6 */ mtlr r0 -/* 8009B3DC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009B3E0 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_ARMOR__Fv.s b/asm/d/d_item/item_getcheck_func_ARMOR__Fv.s deleted file mode 100644 index fb058680354..00000000000 --- a/asm/d/d_item/item_getcheck_func_ARMOR__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80099CC8: -/* 80099CC8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80099CCC 7C 08 02 A6 */ mflr r0 -/* 80099CD0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80099CD4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80099CD8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80099CDC 38 63 00 CC */ addi r3, r3, 0xcc -/* 80099CE0 38 80 00 30 */ li r4, 0x30 -/* 80099CE4 4B F9 A1 E5 */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 80099CE8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80099CEC 7C 08 03 A6 */ mtlr r0 -/* 80099CF0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80099CF4 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_ARROW_10__Fv.s b/asm/d/d_item/item_getcheck_func_ARROW_10__Fv.s deleted file mode 100644 index b6474048f46..00000000000 --- a/asm/d/d_item/item_getcheck_func_ARROW_10__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80099868: -/* 80099868 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009986C 7C 08 02 A6 */ mflr r0 -/* 80099870 90 01 00 14 */ stw r0, 0x14(r1) -/* 80099874 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80099878 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009987C 38 63 00 CC */ addi r3, r3, 0xcc -/* 80099880 38 80 00 0E */ li r4, 0xe -/* 80099884 4B F9 A6 45 */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 80099888 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009988C 7C 08 03 A6 */ mtlr r0 -/* 80099890 38 21 00 10 */ addi r1, r1, 0x10 -/* 80099894 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_ARROW_1__Fv.s b/asm/d/d_item/item_getcheck_func_ARROW_1__Fv.s deleted file mode 100644 index 98a92f1d1a9..00000000000 --- a/asm/d/d_item/item_getcheck_func_ARROW_1__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_800998F8: -/* 800998F8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800998FC 7C 08 02 A6 */ mflr r0 -/* 80099900 90 01 00 14 */ stw r0, 0x14(r1) -/* 80099904 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80099908 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009990C 38 63 00 CC */ addi r3, r3, 0xcc -/* 80099910 38 80 00 11 */ li r4, 0x11 -/* 80099914 4B F9 A5 B5 */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 80099918 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009991C 7C 08 03 A6 */ mtlr r0 -/* 80099920 38 21 00 10 */ addi r1, r1, 0x10 -/* 80099924 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_ARROW_20__Fv.s b/asm/d/d_item/item_getcheck_func_ARROW_20__Fv.s deleted file mode 100644 index 1039d197068..00000000000 --- a/asm/d/d_item/item_getcheck_func_ARROW_20__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80099898: -/* 80099898 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009989C 7C 08 02 A6 */ mflr r0 -/* 800998A0 90 01 00 14 */ stw r0, 0x14(r1) -/* 800998A4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800998A8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800998AC 38 63 00 CC */ addi r3, r3, 0xcc -/* 800998B0 38 80 00 0F */ li r4, 0xf -/* 800998B4 4B F9 A6 15 */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 800998B8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800998BC 7C 08 03 A6 */ mtlr r0 -/* 800998C0 38 21 00 10 */ addi r1, r1, 0x10 -/* 800998C4 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_ARROW_30__Fv.s b/asm/d/d_item/item_getcheck_func_ARROW_30__Fv.s deleted file mode 100644 index 1353f906234..00000000000 --- a/asm/d/d_item/item_getcheck_func_ARROW_30__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_800998C8: -/* 800998C8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800998CC 7C 08 02 A6 */ mflr r0 -/* 800998D0 90 01 00 14 */ stw r0, 0x14(r1) -/* 800998D4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800998D8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800998DC 38 63 00 CC */ addi r3, r3, 0xcc -/* 800998E0 38 80 00 10 */ li r4, 0x10 -/* 800998E4 4B F9 A5 E5 */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 800998E8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800998EC 7C 08 03 A6 */ mtlr r0 -/* 800998F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 800998F4 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_ARROW_LV1__Fv.s b/asm/d/d_item/item_getcheck_func_ARROW_LV1__Fv.s deleted file mode 100644 index 104e217254e..00000000000 --- a/asm/d/d_item/item_getcheck_func_ARROW_LV1__Fv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_8009A308: -/* 8009A308 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009A30C 7C 08 02 A6 */ mflr r0 -/* 8009A310 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009A314 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8009A318 3B E0 00 00 */ li r31, 0 -/* 8009A31C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009A320 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009A324 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009A328 38 80 00 04 */ li r4, 4 -/* 8009A32C 38 A0 00 00 */ li r5, 0 -/* 8009A330 4B F9 8D 01 */ bl getItem__17dSv_player_item_cCFib -/* 8009A334 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8009A338 28 00 00 43 */ cmplwi r0, 0x43 -/* 8009A33C 40 82 00 1C */ bne lbl_8009A358 -/* 8009A340 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009A344 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009A348 88 03 00 F8 */ lbz r0, 0xf8(r3) -/* 8009A34C 28 00 00 1E */ cmplwi r0, 0x1e -/* 8009A350 41 80 00 08 */ blt lbl_8009A358 -/* 8009A354 3B E0 00 01 */ li r31, 1 -lbl_8009A358: -/* 8009A358 57 E3 06 3E */ clrlwi r3, r31, 0x18 -/* 8009A35C 30 03 FF FF */ addic r0, r3, -1 -/* 8009A360 7C 60 19 10 */ subfe r3, r0, r3 -/* 8009A364 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8009A368 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009A36C 7C 08 03 A6 */ mtlr r0 -/* 8009A370 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009A374 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_ARROW_LV2__Fv.s b/asm/d/d_item/item_getcheck_func_ARROW_LV2__Fv.s deleted file mode 100644 index 5b30fad8cba..00000000000 --- a/asm/d/d_item/item_getcheck_func_ARROW_LV2__Fv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_8009A378: -/* 8009A378 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009A37C 7C 08 02 A6 */ mflr r0 -/* 8009A380 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009A384 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8009A388 3B E0 00 00 */ li r31, 0 -/* 8009A38C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009A390 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009A394 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009A398 38 80 00 04 */ li r4, 4 -/* 8009A39C 38 A0 00 00 */ li r5, 0 -/* 8009A3A0 4B F9 8C 91 */ bl getItem__17dSv_player_item_cCFib -/* 8009A3A4 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8009A3A8 28 00 00 43 */ cmplwi r0, 0x43 -/* 8009A3AC 40 82 00 1C */ bne lbl_8009A3C8 -/* 8009A3B0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009A3B4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009A3B8 88 03 00 F8 */ lbz r0, 0xf8(r3) -/* 8009A3BC 28 00 00 3C */ cmplwi r0, 0x3c -/* 8009A3C0 41 80 00 08 */ blt lbl_8009A3C8 -/* 8009A3C4 3B E0 00 01 */ li r31, 1 -lbl_8009A3C8: -/* 8009A3C8 57 E3 06 3E */ clrlwi r3, r31, 0x18 -/* 8009A3CC 30 03 FF FF */ addic r0, r3, -1 -/* 8009A3D0 7C 60 19 10 */ subfe r3, r0, r3 -/* 8009A3D4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8009A3D8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009A3DC 7C 08 03 A6 */ mtlr r0 -/* 8009A3E0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009A3E4 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_ARROW_LV3__Fv.s b/asm/d/d_item/item_getcheck_func_ARROW_LV3__Fv.s deleted file mode 100644 index 2eeb4372cca..00000000000 --- a/asm/d/d_item/item_getcheck_func_ARROW_LV3__Fv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_8009A3E8: -/* 8009A3E8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009A3EC 7C 08 02 A6 */ mflr r0 -/* 8009A3F0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009A3F4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8009A3F8 3B E0 00 00 */ li r31, 0 -/* 8009A3FC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009A400 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009A404 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009A408 38 80 00 04 */ li r4, 4 -/* 8009A40C 38 A0 00 00 */ li r5, 0 -/* 8009A410 4B F9 8C 21 */ bl getItem__17dSv_player_item_cCFib -/* 8009A414 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8009A418 28 00 00 43 */ cmplwi r0, 0x43 -/* 8009A41C 40 82 00 1C */ bne lbl_8009A438 -/* 8009A420 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009A424 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009A428 88 03 00 F8 */ lbz r0, 0xf8(r3) -/* 8009A42C 28 00 00 64 */ cmplwi r0, 0x64 -/* 8009A430 41 80 00 08 */ blt lbl_8009A438 -/* 8009A434 3B E0 00 01 */ li r31, 1 -lbl_8009A438: -/* 8009A438 57 E3 06 3E */ clrlwi r3, r31, 0x18 -/* 8009A43C 30 03 FF FF */ addic r0, r3, -1 -/* 8009A440 7C 60 19 10 */ subfe r3, r0, r3 -/* 8009A444 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8009A448 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009A44C 7C 08 03 A6 */ mtlr r0 -/* 8009A450 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009A454 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_ASHS_SCRIBBLING__Fv.s b/asm/d/d_item/item_getcheck_func_ASHS_SCRIBBLING__Fv.s deleted file mode 100644 index 2080105d69c..00000000000 --- a/asm/d/d_item/item_getcheck_func_ASHS_SCRIBBLING__Fv.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_8009ACE0: -/* 8009ACE0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009ACE4 7C 08 02 A6 */ mflr r0 -/* 8009ACE8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009ACEC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009ACF0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009ACF4 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009ACF8 38 80 00 13 */ li r4, 0x13 -/* 8009ACFC 38 A0 00 01 */ li r5, 1 -/* 8009AD00 4B F9 83 31 */ bl getItem__17dSv_player_item_cCFib -/* 8009AD04 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8009AD08 20 00 00 91 */ subfic r0, r0, 0x91 -/* 8009AD0C 7C 00 00 34 */ cntlzw r0, r0 -/* 8009AD10 54 03 D9 7E */ srwi r3, r0, 5 -/* 8009AD14 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009AD18 7C 08 03 A6 */ mtlr r0 -/* 8009AD1C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009AD20 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_BEE_ROD__Fv.s b/asm/d/d_item/item_getcheck_func_BEE_ROD__Fv.s deleted file mode 100644 index 1d90d7bd309..00000000000 --- a/asm/d/d_item/item_getcheck_func_BEE_ROD__Fv.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_8009A470: -/* 8009A470 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009A474 7C 08 02 A6 */ mflr r0 -/* 8009A478 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009A47C 4B FF FC 4D */ bl item_getcheck_func_FISHING_ROD_1__Fv -/* 8009A480 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009A484 7C 08 03 A6 */ mtlr r0 -/* 8009A488 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009A48C 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_BILL__Fv.s b/asm/d/d_item/item_getcheck_func_BILL__Fv.s deleted file mode 100644 index 5405b842847..00000000000 --- a/asm/d/d_item/item_getcheck_func_BILL__Fv.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_8009AB8C: -/* 8009AB8C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009AB90 7C 08 02 A6 */ mflr r0 -/* 8009AB94 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009AB98 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009AB9C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009ABA0 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009ABA4 38 80 00 15 */ li r4, 0x15 -/* 8009ABA8 38 A0 00 01 */ li r5, 1 -/* 8009ABAC 4B F9 84 85 */ bl getItem__17dSv_player_item_cCFib -/* 8009ABB0 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8009ABB4 20 00 00 81 */ subfic r0, r0, 0x81 -/* 8009ABB8 7C 00 00 34 */ cntlzw r0, r0 -/* 8009ABBC 54 03 D9 7E */ srwi r3, r0, 5 -/* 8009ABC0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009ABC4 7C 08 03 A6 */ mtlr r0 -/* 8009ABC8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009ABCC 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_BLUE_BOTTLE__Fv.s b/asm/d/d_item/item_getcheck_func_BLUE_BOTTLE__Fv.s deleted file mode 100644 index 4bf8fd7c7c9..00000000000 --- a/asm/d/d_item/item_getcheck_func_BLUE_BOTTLE__Fv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_8009A5AC: -/* 8009A5AC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009A5B0 7C 08 02 A6 */ mflr r0 -/* 8009A5B4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009A5B8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009A5BC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009A5C0 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009A5C4 38 80 00 63 */ li r4, 0x63 -/* 8009A5C8 4B F9 91 19 */ bl checkBottle__17dSv_player_item_cFUc -/* 8009A5CC 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 8009A5D0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009A5D4 7C 08 03 A6 */ mtlr r0 -/* 8009A5D8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009A5DC 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_BLUE_RUPEE__Fv.s b/asm/d/d_item/item_getcheck_func_BLUE_RUPEE__Fv.s deleted file mode 100644 index fa26317fcdd..00000000000 --- a/asm/d/d_item/item_getcheck_func_BLUE_RUPEE__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80099678: -/* 80099678 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009967C 7C 08 02 A6 */ mflr r0 -/* 80099680 90 01 00 14 */ stw r0, 0x14(r1) -/* 80099684 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80099688 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009968C 38 63 00 CC */ addi r3, r3, 0xcc -/* 80099690 38 80 00 02 */ li r4, 2 -/* 80099694 4B F9 A8 35 */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 80099698 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009969C 7C 08 03 A6 */ mtlr r0 -/* 800996A0 38 21 00 10 */ addi r1, r1, 0x10 -/* 800996A4 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_BOMB_10__Fv.s b/asm/d/d_item/item_getcheck_func_BOMB_10__Fv.s deleted file mode 100644 index 1e98f00ffbb..00000000000 --- a/asm/d/d_item/item_getcheck_func_BOMB_10__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_800997D8: -/* 800997D8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800997DC 7C 08 02 A6 */ mflr r0 -/* 800997E0 90 01 00 14 */ stw r0, 0x14(r1) -/* 800997E4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800997E8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800997EC 38 63 00 CC */ addi r3, r3, 0xcc -/* 800997F0 38 80 00 0B */ li r4, 0xb -/* 800997F4 4B F9 A6 D5 */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 800997F8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800997FC 7C 08 03 A6 */ mtlr r0 -/* 80099800 38 21 00 10 */ addi r1, r1, 0x10 -/* 80099804 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_BOMB_20__Fv.s b/asm/d/d_item/item_getcheck_func_BOMB_20__Fv.s deleted file mode 100644 index 9c3c81baf8c..00000000000 --- a/asm/d/d_item/item_getcheck_func_BOMB_20__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80099808: -/* 80099808 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009980C 7C 08 02 A6 */ mflr r0 -/* 80099810 90 01 00 14 */ stw r0, 0x14(r1) -/* 80099814 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80099818 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009981C 38 63 00 CC */ addi r3, r3, 0xcc -/* 80099820 38 80 00 0C */ li r4, 0xc -/* 80099824 4B F9 A6 A5 */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 80099828 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009982C 7C 08 03 A6 */ mtlr r0 -/* 80099830 38 21 00 10 */ addi r1, r1, 0x10 -/* 80099834 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_BOMB_30__Fv.s b/asm/d/d_item/item_getcheck_func_BOMB_30__Fv.s deleted file mode 100644 index ec77a1654bf..00000000000 --- a/asm/d/d_item/item_getcheck_func_BOMB_30__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80099838: -/* 80099838 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009983C 7C 08 02 A6 */ mflr r0 -/* 80099840 90 01 00 14 */ stw r0, 0x14(r1) -/* 80099844 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80099848 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009984C 38 63 00 CC */ addi r3, r3, 0xcc -/* 80099850 38 80 00 0D */ li r4, 0xd -/* 80099854 4B F9 A6 75 */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 80099858 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009985C 7C 08 03 A6 */ mtlr r0 -/* 80099860 38 21 00 10 */ addi r1, r1, 0x10 -/* 80099864 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_BOMB_5__Fv.s b/asm/d/d_item/item_getcheck_func_BOMB_5__Fv.s deleted file mode 100644 index 49938beff65..00000000000 --- a/asm/d/d_item/item_getcheck_func_BOMB_5__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_800997A8: -/* 800997A8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800997AC 7C 08 02 A6 */ mflr r0 -/* 800997B0 90 01 00 14 */ stw r0, 0x14(r1) -/* 800997B4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800997B8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800997BC 38 63 00 CC */ addi r3, r3, 0xcc -/* 800997C0 38 80 00 0A */ li r4, 0xa -/* 800997C4 4B F9 A7 05 */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 800997C8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800997CC 7C 08 03 A6 */ mtlr r0 -/* 800997D0 38 21 00 10 */ addi r1, r1, 0x10 -/* 800997D4 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_BOMB_BAG_LV1__Fv.s b/asm/d/d_item/item_getcheck_func_BOMB_BAG_LV1__Fv.s deleted file mode 100644 index 5c081067b6d..00000000000 --- a/asm/d/d_item/item_getcheck_func_BOMB_BAG_LV1__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_8009A278: -/* 8009A278 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009A27C 7C 08 02 A6 */ mflr r0 -/* 8009A280 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009A284 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009A288 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009A28C 38 63 00 CC */ addi r3, r3, 0xcc -/* 8009A290 38 80 00 50 */ li r4, 0x50 -/* 8009A294 4B F9 9C 35 */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 8009A298 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009A29C 7C 08 03 A6 */ mtlr r0 -/* 8009A2A0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009A2A4 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_BOMB_BAG_LV2__Fv.s b/asm/d/d_item/item_getcheck_func_BOMB_BAG_LV2__Fv.s deleted file mode 100644 index f41bd905565..00000000000 --- a/asm/d/d_item/item_getcheck_func_BOMB_BAG_LV2__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_8009A248: -/* 8009A248 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009A24C 7C 08 02 A6 */ mflr r0 -/* 8009A250 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009A254 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009A258 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009A25C 38 63 00 CC */ addi r3, r3, 0xcc -/* 8009A260 38 80 00 4F */ li r4, 0x4f -/* 8009A264 4B F9 9C 65 */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 8009A268 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009A26C 7C 08 03 A6 */ mtlr r0 -/* 8009A270 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009A274 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_BOMB_INSECT_10__Fv.s b/asm/d/d_item/item_getcheck_func_BOMB_INSECT_10__Fv.s deleted file mode 100644 index a91163df252..00000000000 --- a/asm/d/d_item/item_getcheck_func_BOMB_INSECT_10__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80099980: -/* 80099980 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80099984 7C 08 02 A6 */ mflr r0 -/* 80099988 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009998C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80099990 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80099994 38 63 00 CC */ addi r3, r3, 0xcc -/* 80099998 38 80 00 1B */ li r4, 0x1b -/* 8009999C 4B F9 A5 2D */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 800999A0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800999A4 7C 08 03 A6 */ mtlr r0 -/* 800999A8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800999AC 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_BOMB_INSECT_20__Fv.s b/asm/d/d_item/item_getcheck_func_BOMB_INSECT_20__Fv.s deleted file mode 100644 index 3a1b391662d..00000000000 --- a/asm/d/d_item/item_getcheck_func_BOMB_INSECT_20__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_800999B0: -/* 800999B0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800999B4 7C 08 02 A6 */ mflr r0 -/* 800999B8 90 01 00 14 */ stw r0, 0x14(r1) -/* 800999BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800999C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800999C4 38 63 00 CC */ addi r3, r3, 0xcc -/* 800999C8 38 80 00 1C */ li r4, 0x1c -/* 800999CC 4B F9 A4 FD */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 800999D0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800999D4 7C 08 03 A6 */ mtlr r0 -/* 800999D8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800999DC 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_BOMB_INSECT_30__Fv.s b/asm/d/d_item/item_getcheck_func_BOMB_INSECT_30__Fv.s deleted file mode 100644 index 61d5fb00e4c..00000000000 --- a/asm/d/d_item/item_getcheck_func_BOMB_INSECT_30__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_800999E0: -/* 800999E0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800999E4 7C 08 02 A6 */ mflr r0 -/* 800999E8 90 01 00 14 */ stw r0, 0x14(r1) -/* 800999EC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800999F0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800999F4 38 63 00 CC */ addi r3, r3, 0xcc -/* 800999F8 38 80 00 1D */ li r4, 0x1d -/* 800999FC 4B F9 A4 CD */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 80099A00 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80099A04 7C 08 03 A6 */ mtlr r0 -/* 80099A08 38 21 00 10 */ addi r1, r1, 0x10 -/* 80099A0C 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_BOMB_IN_BAG__Fv.s b/asm/d/d_item/item_getcheck_func_BOMB_IN_BAG__Fv.s deleted file mode 100644 index 7405fb71f4d..00000000000 --- a/asm/d/d_item/item_getcheck_func_BOMB_IN_BAG__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_8009A2A8: -/* 8009A2A8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009A2AC 7C 08 02 A6 */ mflr r0 -/* 8009A2B0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009A2B4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009A2B8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009A2BC 38 63 00 CC */ addi r3, r3, 0xcc -/* 8009A2C0 38 80 00 51 */ li r4, 0x51 -/* 8009A2C4 4B F9 9C 05 */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 8009A2C8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009A2CC 7C 08 03 A6 */ mtlr r0 -/* 8009A2D0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009A2D4 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_BOOMERANG__Fv.s b/asm/d/d_item/item_getcheck_func_BOOMERANG__Fv.s deleted file mode 100644 index ee1fd78fe87..00000000000 --- a/asm/d/d_item/item_getcheck_func_BOOMERANG__Fv.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_80099E30: -/* 80099E30 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80099E34 7C 08 02 A6 */ mflr r0 -/* 80099E38 90 01 00 14 */ stw r0, 0x14(r1) -/* 80099E3C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80099E40 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80099E44 38 63 00 9C */ addi r3, r3, 0x9c -/* 80099E48 38 80 00 00 */ li r4, 0 -/* 80099E4C 38 A0 00 01 */ li r5, 1 -/* 80099E50 4B F9 91 E1 */ bl getItem__17dSv_player_item_cCFib -/* 80099E54 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80099E58 20 00 00 40 */ subfic r0, r0, 0x40 -/* 80099E5C 7C 00 00 34 */ cntlzw r0, r0 -/* 80099E60 54 03 D9 7E */ srwi r3, r0, 5 -/* 80099E64 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80099E68 7C 08 03 A6 */ mtlr r0 -/* 80099E6C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80099E70 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_BOSS_KEY__Fv.s b/asm/d/d_item/item_getcheck_func_BOSS_KEY__Fv.s deleted file mode 100644 index 2d8425e8c87..00000000000 --- a/asm/d/d_item/item_getcheck_func_BOSS_KEY__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80099AB4: -/* 80099AB4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80099AB8 7C 08 02 A6 */ mflr r0 -/* 80099ABC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80099AC0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80099AC4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80099AC8 38 63 09 58 */ addi r3, r3, 0x958 -/* 80099ACC 38 80 00 02 */ li r4, 2 -/* 80099AD0 4B F9 AE 65 */ bl isDungeonItem__12dSv_memBit_cCFi -/* 80099AD4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80099AD8 7C 08 03 A6 */ mtlr r0 -/* 80099ADC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80099AE0 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_BOW__Fv.s b/asm/d/d_item/item_getcheck_func_BOW__Fv.s deleted file mode 100644 index d995e735710..00000000000 --- a/asm/d/d_item/item_getcheck_func_BOW__Fv.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_80099EFC: -/* 80099EFC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80099F00 7C 08 02 A6 */ mflr r0 -/* 80099F04 90 01 00 14 */ stw r0, 0x14(r1) -/* 80099F08 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80099F0C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80099F10 38 63 00 9C */ addi r3, r3, 0x9c -/* 80099F14 38 80 00 04 */ li r4, 4 -/* 80099F18 38 A0 00 00 */ li r5, 0 -/* 80099F1C 4B F9 91 15 */ bl getItem__17dSv_player_item_cCFib -/* 80099F20 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80099F24 20 00 00 43 */ subfic r0, r0, 0x43 -/* 80099F28 7C 00 00 34 */ cntlzw r0, r0 -/* 80099F2C 54 03 D9 7E */ srwi r3, r0, 5 -/* 80099F30 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80099F34 7C 08 03 A6 */ mtlr r0 -/* 80099F38 38 21 00 10 */ addi r1, r1, 0x10 -/* 80099F3C 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_CHUCHU_BLACK__Fv.s b/asm/d/d_item/item_getcheck_func_CHUCHU_BLACK__Fv.s deleted file mode 100644 index aa4d4d405d5..00000000000 --- a/asm/d/d_item/item_getcheck_func_CHUCHU_BLACK__Fv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_8009AD68: -/* 8009AD68 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009AD6C 7C 08 02 A6 */ mflr r0 -/* 8009AD70 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009AD74 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009AD78 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009AD7C 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009AD80 38 80 00 9F */ li r4, 0x9f -/* 8009AD84 4B F9 89 5D */ bl checkBottle__17dSv_player_item_cFUc -/* 8009AD88 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 8009AD8C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009AD90 7C 08 03 A6 */ mtlr r0 -/* 8009AD94 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009AD98 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_CHUCHU_BLUE__Fv.s b/asm/d/d_item/item_getcheck_func_CHUCHU_BLUE__Fv.s deleted file mode 100644 index 73d9187744d..00000000000 --- a/asm/d/d_item/item_getcheck_func_CHUCHU_BLUE__Fv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_8009A9E8: -/* 8009A9E8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009A9EC 7C 08 02 A6 */ mflr r0 -/* 8009A9F0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009A9F4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009A9F8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009A9FC 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009AA00 38 80 00 79 */ li r4, 0x79 -/* 8009AA04 4B F9 8C DD */ bl checkBottle__17dSv_player_item_cFUc -/* 8009AA08 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 8009AA0C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009AA10 7C 08 03 A6 */ mtlr r0 -/* 8009AA14 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009AA18 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_CHUCHU_GREEN__Fv.s b/asm/d/d_item/item_getcheck_func_CHUCHU_GREEN__Fv.s deleted file mode 100644 index 1ddcfb839bb..00000000000 --- a/asm/d/d_item/item_getcheck_func_CHUCHU_GREEN__Fv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_8009AA1C: -/* 8009AA1C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009AA20 7C 08 02 A6 */ mflr r0 -/* 8009AA24 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009AA28 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009AA2C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009AA30 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009AA34 38 80 00 7A */ li r4, 0x7a -/* 8009AA38 4B F9 8C A9 */ bl checkBottle__17dSv_player_item_cFUc -/* 8009AA3C 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 8009AA40 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009AA44 7C 08 03 A6 */ mtlr r0 -/* 8009AA48 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009AA4C 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_CHUCHU_PURPLE__Fv.s b/asm/d/d_item/item_getcheck_func_CHUCHU_PURPLE__Fv.s deleted file mode 100644 index 97dcefb651a..00000000000 --- a/asm/d/d_item/item_getcheck_func_CHUCHU_PURPLE__Fv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_8009AA84: -/* 8009AA84 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009AA88 7C 08 02 A6 */ mflr r0 -/* 8009AA8C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009AA90 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009AA94 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009AA98 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009AA9C 38 80 00 7C */ li r4, 0x7c -/* 8009AAA0 4B F9 8C 41 */ bl checkBottle__17dSv_player_item_cFUc -/* 8009AAA4 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 8009AAA8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009AAAC 7C 08 03 A6 */ mtlr r0 -/* 8009AAB0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009AAB4 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_CHUCHU_RARE__Fv.s b/asm/d/d_item/item_getcheck_func_CHUCHU_RARE__Fv.s deleted file mode 100644 index c1c5243e4f6..00000000000 --- a/asm/d/d_item/item_getcheck_func_CHUCHU_RARE__Fv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_8009A980: -/* 8009A980 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009A984 7C 08 02 A6 */ mflr r0 -/* 8009A988 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009A98C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009A990 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009A994 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009A998 38 80 00 77 */ li r4, 0x77 -/* 8009A99C 4B F9 8D 45 */ bl checkBottle__17dSv_player_item_cFUc -/* 8009A9A0 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 8009A9A4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009A9A8 7C 08 03 A6 */ mtlr r0 -/* 8009A9AC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009A9B0 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_CHUCHU_RED__Fv.s b/asm/d/d_item/item_getcheck_func_CHUCHU_RED__Fv.s deleted file mode 100644 index 07b07da5961..00000000000 --- a/asm/d/d_item/item_getcheck_func_CHUCHU_RED__Fv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_8009A9B4: -/* 8009A9B4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009A9B8 7C 08 02 A6 */ mflr r0 -/* 8009A9BC 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009A9C0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009A9C4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009A9C8 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009A9CC 38 80 00 78 */ li r4, 0x78 -/* 8009A9D0 4B F9 8D 11 */ bl checkBottle__17dSv_player_item_cFUc -/* 8009A9D4 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 8009A9D8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009A9DC 7C 08 03 A6 */ mtlr r0 -/* 8009A9E0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009A9E4 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_CHUCHU_YELLOW2__Fv.s b/asm/d/d_item/item_getcheck_func_CHUCHU_YELLOW2__Fv.s deleted file mode 100644 index 87b16f7d54a..00000000000 --- a/asm/d/d_item/item_getcheck_func_CHUCHU_YELLOW2__Fv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_8009AD24: -/* 8009AD24 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009AD28 7C 08 02 A6 */ mflr r0 -/* 8009AD2C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009AD30 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009AD34 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009AD38 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009AD3C 38 80 00 9C */ li r4, 0x9c -/* 8009AD40 4B F9 89 A1 */ bl checkBottle__17dSv_player_item_cFUc -/* 8009AD44 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 8009AD48 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009AD4C 7C 08 03 A6 */ mtlr r0 -/* 8009AD50 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009AD54 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_CHUCHU_YELLOW__Fv.s b/asm/d/d_item/item_getcheck_func_CHUCHU_YELLOW__Fv.s deleted file mode 100644 index 4cc1068a6f4..00000000000 --- a/asm/d/d_item/item_getcheck_func_CHUCHU_YELLOW__Fv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_8009AA50: -/* 8009AA50 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009AA54 7C 08 02 A6 */ mflr r0 -/* 8009AA58 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009AA5C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009AA60 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009AA64 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009AA68 38 80 00 7B */ li r4, 0x7b -/* 8009AA6C 4B F9 8C 75 */ bl checkBottle__17dSv_player_item_cFUc -/* 8009AA70 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 8009AA74 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009AA78 7C 08 03 A6 */ mtlr r0 -/* 8009AA7C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009AA80 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_COPY_ROD__Fv.s b/asm/d/d_item/item_getcheck_func_COPY_ROD__Fv.s deleted file mode 100644 index 74283c3049f..00000000000 --- a/asm/d/d_item/item_getcheck_func_COPY_ROD__Fv.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_80099FC8: -/* 80099FC8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80099FCC 7C 08 02 A6 */ mflr r0 -/* 80099FD0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80099FD4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80099FD8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80099FDC 38 63 00 9C */ addi r3, r3, 0x9c -/* 80099FE0 38 80 00 08 */ li r4, 8 -/* 80099FE4 38 A0 00 01 */ li r5, 1 -/* 80099FE8 4B F9 90 49 */ bl getItem__17dSv_player_item_cCFib -/* 80099FEC 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80099FF0 20 00 00 46 */ subfic r0, r0, 0x46 -/* 80099FF4 7C 00 00 34 */ cntlzw r0, r0 -/* 80099FF8 54 03 D9 7E */ srwi r3, r0, 5 -/* 80099FFC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009A000 7C 08 03 A6 */ mtlr r0 -/* 8009A004 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009A008 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_DROP_BOTTLE__Fv.s b/asm/d/d_item/item_getcheck_func_DROP_BOTTLE__Fv.s deleted file mode 100644 index 5a8bc6f6ffb..00000000000 --- a/asm/d/d_item/item_getcheck_func_DROP_BOTTLE__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_8009A948: -/* 8009A948 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009A94C 7C 08 02 A6 */ mflr r0 -/* 8009A950 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009A954 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009A958 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009A95C 38 63 00 CC */ addi r3, r3, 0xcc -/* 8009A960 38 80 00 75 */ li r4, 0x75 -/* 8009A964 4B F9 95 65 */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 8009A968 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009A96C 7C 08 03 A6 */ mtlr r0 -/* 8009A970 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009A974 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_DROP_CONTAINER02__Fv.s b/asm/d/d_item/item_getcheck_func_DROP_CONTAINER02__Fv.s deleted file mode 100644 index 5a8a1b167d5..00000000000 --- a/asm/d/d_item/item_getcheck_func_DROP_CONTAINER02__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_8009ADFC: -/* 8009ADFC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009AE00 7C 08 02 A6 */ mflr r0 -/* 8009AE04 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009AE08 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009AE0C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009AE10 38 63 01 14 */ addi r3, r3, 0x114 -/* 8009AE14 38 80 00 01 */ li r4, 1 -/* 8009AE18 4B F9 95 85 */ bl isLightDropGetFlag__16dSv_light_drop_cCFUc -/* 8009AE1C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009AE20 7C 08 03 A6 */ mtlr r0 -/* 8009AE24 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009AE28 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_DROP_CONTAINER03__Fv.s b/asm/d/d_item/item_getcheck_func_DROP_CONTAINER03__Fv.s deleted file mode 100644 index fa993a8f4fb..00000000000 --- a/asm/d/d_item/item_getcheck_func_DROP_CONTAINER03__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_8009AE2C: -/* 8009AE2C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009AE30 7C 08 02 A6 */ mflr r0 -/* 8009AE34 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009AE38 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009AE3C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009AE40 38 63 01 14 */ addi r3, r3, 0x114 -/* 8009AE44 38 80 00 02 */ li r4, 2 -/* 8009AE48 4B F9 95 55 */ bl isLightDropGetFlag__16dSv_light_drop_cCFUc -/* 8009AE4C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009AE50 7C 08 03 A6 */ mtlr r0 -/* 8009AE54 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009AE58 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_DROP_CONTAINER__Fv.s b/asm/d/d_item/item_getcheck_func_DROP_CONTAINER__Fv.s deleted file mode 100644 index b93c0306633..00000000000 --- a/asm/d/d_item/item_getcheck_func_DROP_CONTAINER__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_8009ADCC: -/* 8009ADCC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009ADD0 7C 08 02 A6 */ mflr r0 -/* 8009ADD4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009ADD8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009ADDC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009ADE0 38 63 01 14 */ addi r3, r3, 0x114 -/* 8009ADE4 38 80 00 00 */ li r4, 0 -/* 8009ADE8 4B F9 95 B5 */ bl isLightDropGetFlag__16dSv_light_drop_cCFUc -/* 8009ADEC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009ADF0 7C 08 03 A6 */ mtlr r0 -/* 8009ADF4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009ADF8 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_DUNGEON_BACK__Fv.s b/asm/d/d_item/item_getcheck_func_DUNGEON_BACK__Fv.s deleted file mode 100644 index 00f8529c0c5..00000000000 --- a/asm/d/d_item/item_getcheck_func_DUNGEON_BACK__Fv.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_80099AE4: -/* 80099AE4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80099AE8 7C 08 02 A6 */ mflr r0 -/* 80099AEC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80099AF0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80099AF4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80099AF8 38 63 00 9C */ addi r3, r3, 0x9c -/* 80099AFC 38 80 00 12 */ li r4, 0x12 -/* 80099B00 38 A0 00 01 */ li r5, 1 -/* 80099B04 4B F9 95 2D */ bl getItem__17dSv_player_item_cCFib -/* 80099B08 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80099B0C 20 00 00 27 */ subfic r0, r0, 0x27 -/* 80099B10 7C 00 00 34 */ cntlzw r0, r0 -/* 80099B14 54 03 D9 7E */ srwi r3, r0, 5 -/* 80099B18 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80099B1C 7C 08 03 A6 */ mtlr r0 -/* 80099B20 38 21 00 10 */ addi r1, r1, 0x10 -/* 80099B24 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_DUNGEON_EXIT_2__Fv.s b/asm/d/d_item/item_getcheck_func_DUNGEON_EXIT_2__Fv.s deleted file mode 100644 index 248d7fea0ac..00000000000 --- a/asm/d/d_item/item_getcheck_func_DUNGEON_EXIT_2__Fv.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_80099D30: -/* 80099D30 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80099D34 7C 08 02 A6 */ mflr r0 -/* 80099D38 90 01 00 14 */ stw r0, 0x14(r1) -/* 80099D3C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80099D40 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80099D44 38 63 00 9C */ addi r3, r3, 0x9c -/* 80099D48 38 80 00 12 */ li r4, 0x12 -/* 80099D4C 38 A0 00 01 */ li r5, 1 -/* 80099D50 4B F9 92 E1 */ bl getItem__17dSv_player_item_cCFib -/* 80099D54 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80099D58 20 00 00 25 */ subfic r0, r0, 0x25 -/* 80099D5C 7C 00 00 34 */ cntlzw r0, r0 -/* 80099D60 54 03 D9 7E */ srwi r3, r0, 5 -/* 80099D64 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80099D68 7C 08 03 A6 */ mtlr r0 -/* 80099D6C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80099D70 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_DUNGEON_EXIT__Fv.s b/asm/d/d_item/item_getcheck_func_DUNGEON_EXIT__Fv.s deleted file mode 100644 index d4f6aba35da..00000000000 --- a/asm/d/d_item/item_getcheck_func_DUNGEON_EXIT__Fv.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_80099A70: -/* 80099A70 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80099A74 7C 08 02 A6 */ mflr r0 -/* 80099A78 90 01 00 14 */ stw r0, 0x14(r1) -/* 80099A7C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80099A80 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80099A84 38 63 00 9C */ addi r3, r3, 0x9c -/* 80099A88 38 80 00 12 */ li r4, 0x12 -/* 80099A8C 38 A0 00 01 */ li r5, 1 -/* 80099A90 4B F9 95 A1 */ bl getItem__17dSv_player_item_cCFib -/* 80099A94 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80099A98 20 00 00 25 */ subfic r0, r0, 0x25 -/* 80099A9C 7C 00 00 34 */ cntlzw r0, r0 -/* 80099AA0 54 03 D9 7E */ srwi r3, r0, 5 -/* 80099AA4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80099AA8 7C 08 03 A6 */ mtlr r0 -/* 80099AAC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80099AB0 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_EMPTY_BOTTLE__Fv.s b/asm/d/d_item/item_getcheck_func_EMPTY_BOTTLE__Fv.s deleted file mode 100644 index bc001843d95..00000000000 --- a/asm/d/d_item/item_getcheck_func_EMPTY_BOTTLE__Fv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_8009A510: -/* 8009A510 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009A514 7C 08 02 A6 */ mflr r0 -/* 8009A518 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009A51C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009A520 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009A524 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009A528 38 80 00 60 */ li r4, 0x60 -/* 8009A52C 4B F9 91 B5 */ bl checkBottle__17dSv_player_item_cFUc -/* 8009A530 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 8009A534 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009A538 7C 08 03 A6 */ mtlr r0 -/* 8009A53C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009A540 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_FAIRY_BOTTLE__Fv.s b/asm/d/d_item/item_getcheck_func_FAIRY_BOTTLE__Fv.s deleted file mode 100644 index 3035613386f..00000000000 --- a/asm/d/d_item/item_getcheck_func_FAIRY_BOTTLE__Fv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_8009A780: -/* 8009A780 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009A784 7C 08 02 A6 */ mflr r0 -/* 8009A788 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009A78C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009A790 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009A794 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009A798 38 80 00 6C */ li r4, 0x6c -/* 8009A79C 4B F9 8F 45 */ bl checkBottle__17dSv_player_item_cFUc -/* 8009A7A0 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 8009A7A4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009A7A8 7C 08 03 A6 */ mtlr r0 -/* 8009A7AC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009A7B0 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_FAIRY_DROP__Fv.s b/asm/d/d_item/item_getcheck_func_FAIRY_DROP__Fv.s deleted file mode 100644 index f75fe658e23..00000000000 --- a/asm/d/d_item/item_getcheck_func_FAIRY_DROP__Fv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_8009A8E0: -/* 8009A8E0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009A8E4 7C 08 02 A6 */ mflr r0 -/* 8009A8E8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009A8EC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009A8F0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009A8F4 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009A8F8 38 80 00 73 */ li r4, 0x73 -/* 8009A8FC 4B F9 8D E5 */ bl checkBottle__17dSv_player_item_cFUc -/* 8009A900 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 8009A904 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009A908 7C 08 03 A6 */ mtlr r0 -/* 8009A90C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009A910 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_F_ANT__Fv.s b/asm/d/d_item/item_getcheck_func_F_ANT__Fv.s deleted file mode 100644 index 26d3f29c7ae..00000000000 --- a/asm/d/d_item/item_getcheck_func_F_ANT__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_8009B300: -/* 8009B300 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009B304 7C 08 02 A6 */ mflr r0 -/* 8009B308 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009B30C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009B310 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009B314 38 63 00 CC */ addi r3, r3, 0xcc -/* 8009B318 38 80 00 D5 */ li r4, 0xd5 -/* 8009B31C 4B F9 8B AD */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 8009B320 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009B324 7C 08 03 A6 */ mtlr r0 -/* 8009B328 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009B32C 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_F_BEETLE__Fv.s b/asm/d/d_item/item_getcheck_func_F_BEETLE__Fv.s deleted file mode 100644 index eeaa5c66e4d..00000000000 --- a/asm/d/d_item/item_getcheck_func_F_BEETLE__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_8009AF40: -/* 8009AF40 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009AF44 7C 08 02 A6 */ mflr r0 -/* 8009AF48 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009AF4C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009AF50 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009AF54 38 63 00 CC */ addi r3, r3, 0xcc -/* 8009AF58 38 80 00 C1 */ li r4, 0xc1 -/* 8009AF5C 4B F9 8F 6D */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 8009AF60 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009AF64 7C 08 03 A6 */ mtlr r0 -/* 8009AF68 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009AF6C 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_F_BUTTERFLY__Fv.s b/asm/d/d_item/item_getcheck_func_F_BUTTERFLY__Fv.s deleted file mode 100644 index 7b42b1d679e..00000000000 --- a/asm/d/d_item/item_getcheck_func_F_BUTTERFLY__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_8009AFA0: -/* 8009AFA0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009AFA4 7C 08 02 A6 */ mflr r0 -/* 8009AFA8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009AFAC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009AFB0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009AFB4 38 63 00 CC */ addi r3, r3, 0xcc -/* 8009AFB8 38 80 00 C3 */ li r4, 0xc3 -/* 8009AFBC 4B F9 8F 0D */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 8009AFC0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009AFC4 7C 08 03 A6 */ mtlr r0 -/* 8009AFC8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009AFCC 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_F_DANGOMUSHI__Fv.s b/asm/d/d_item/item_getcheck_func_F_DANGOMUSHI__Fv.s deleted file mode 100644 index 4546d7bfc22..00000000000 --- a/asm/d/d_item/item_getcheck_func_F_DANGOMUSHI__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_8009B120: -/* 8009B120 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009B124 7C 08 02 A6 */ mflr r0 -/* 8009B128 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009B12C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009B130 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009B134 38 63 00 CC */ addi r3, r3, 0xcc -/* 8009B138 38 80 00 CB */ li r4, 0xcb -/* 8009B13C 4B F9 8D 8D */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 8009B140 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009B144 7C 08 03 A6 */ mtlr r0 -/* 8009B148 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009B14C 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_F_DRAGONFLY__Fv.s b/asm/d/d_item/item_getcheck_func_F_DRAGONFLY__Fv.s deleted file mode 100644 index 841a27696fe..00000000000 --- a/asm/d/d_item/item_getcheck_func_F_DRAGONFLY__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_8009B2A0: -/* 8009B2A0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009B2A4 7C 08 02 A6 */ mflr r0 -/* 8009B2A8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009B2AC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009B2B0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009B2B4 38 63 00 CC */ addi r3, r3, 0xcc -/* 8009B2B8 38 80 00 D3 */ li r4, 0xd3 -/* 8009B2BC 4B F9 8C 0D */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 8009B2C0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009B2C4 7C 08 03 A6 */ mtlr r0 -/* 8009B2C8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009B2CC 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_F_GRASSHOPPER__Fv.s b/asm/d/d_item/item_getcheck_func_F_GRASSHOPPER__Fv.s deleted file mode 100644 index f021302fd48..00000000000 --- a/asm/d/d_item/item_getcheck_func_F_GRASSHOPPER__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_8009B060: -/* 8009B060 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009B064 7C 08 02 A6 */ mflr r0 -/* 8009B068 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009B06C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009B070 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009B074 38 63 00 CC */ addi r3, r3, 0xcc -/* 8009B078 38 80 00 C7 */ li r4, 0xc7 -/* 8009B07C 4B F9 8E 4D */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 8009B080 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009B084 7C 08 03 A6 */ mtlr r0 -/* 8009B088 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009B08C 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_F_LADYBUG__Fv.s b/asm/d/d_item/item_getcheck_func_F_LADYBUG__Fv.s deleted file mode 100644 index bacc270a242..00000000000 --- a/asm/d/d_item/item_getcheck_func_F_LADYBUG__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_8009B1E0: -/* 8009B1E0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009B1E4 7C 08 02 A6 */ mflr r0 -/* 8009B1E8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009B1EC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009B1F0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009B1F4 38 63 00 CC */ addi r3, r3, 0xcc -/* 8009B1F8 38 80 00 CF */ li r4, 0xcf -/* 8009B1FC 4B F9 8C CD */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 8009B200 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009B204 7C 08 03 A6 */ mtlr r0 -/* 8009B208 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009B20C 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_F_MANTIS__Fv.s b/asm/d/d_item/item_getcheck_func_F_MANTIS__Fv.s deleted file mode 100644 index 233afb1dc63..00000000000 --- a/asm/d/d_item/item_getcheck_func_F_MANTIS__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_8009B180: -/* 8009B180 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009B184 7C 08 02 A6 */ mflr r0 -/* 8009B188 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009B18C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009B190 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009B194 38 63 00 CC */ addi r3, r3, 0xcc -/* 8009B198 38 80 00 CD */ li r4, 0xcd -/* 8009B19C 4B F9 8D 2D */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 8009B1A0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009B1A4 7C 08 03 A6 */ mtlr r0 -/* 8009B1A8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009B1AC 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_F_MAYFLY__Fv.s b/asm/d/d_item/item_getcheck_func_F_MAYFLY__Fv.s deleted file mode 100644 index f602eefb775..00000000000 --- a/asm/d/d_item/item_getcheck_func_F_MAYFLY__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_8009B360: -/* 8009B360 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009B364 7C 08 02 A6 */ mflr r0 -/* 8009B368 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009B36C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009B370 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009B374 38 63 00 CC */ addi r3, r3, 0xcc -/* 8009B378 38 80 00 D7 */ li r4, 0xd7 -/* 8009B37C 4B F9 8B 4D */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 8009B380 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009B384 7C 08 03 A6 */ mtlr r0 -/* 8009B388 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009B38C 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_F_NANAFUSHI__Fv.s b/asm/d/d_item/item_getcheck_func_F_NANAFUSHI__Fv.s deleted file mode 100644 index 91e7f100873..00000000000 --- a/asm/d/d_item/item_getcheck_func_F_NANAFUSHI__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_8009B0C0: -/* 8009B0C0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009B0C4 7C 08 02 A6 */ mflr r0 -/* 8009B0C8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009B0CC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009B0D0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009B0D4 38 63 00 CC */ addi r3, r3, 0xcc -/* 8009B0D8 38 80 00 C9 */ li r4, 0xc9 -/* 8009B0DC 4B F9 8D ED */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 8009B0E0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009B0E4 7C 08 03 A6 */ mtlr r0 -/* 8009B0E8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009B0EC 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_F_SNAIL__Fv.s b/asm/d/d_item/item_getcheck_func_F_SNAIL__Fv.s deleted file mode 100644 index 0b296c05705..00000000000 --- a/asm/d/d_item/item_getcheck_func_F_SNAIL__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_8009B240: -/* 8009B240 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009B244 7C 08 02 A6 */ mflr r0 -/* 8009B248 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009B24C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009B250 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009B254 38 63 00 CC */ addi r3, r3, 0xcc -/* 8009B258 38 80 00 D1 */ li r4, 0xd1 -/* 8009B25C 4B F9 8C 6D */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 8009B260 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009B264 7C 08 03 A6 */ mtlr r0 -/* 8009B268 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009B26C 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_F_STAG_BEETLE__Fv.s b/asm/d/d_item/item_getcheck_func_F_STAG_BEETLE__Fv.s deleted file mode 100644 index 7725b810b00..00000000000 --- a/asm/d/d_item/item_getcheck_func_F_STAG_BEETLE__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_8009B000: -/* 8009B000 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009B004 7C 08 02 A6 */ mflr r0 -/* 8009B008 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009B00C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009B010 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009B014 38 63 00 CC */ addi r3, r3, 0xcc -/* 8009B018 38 80 00 C5 */ li r4, 0xc5 -/* 8009B01C 4B F9 8E AD */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 8009B020 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009B024 7C 08 03 A6 */ mtlr r0 -/* 8009B028 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009B02C 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_GREEN_BOTTLE__Fv.s b/asm/d/d_item/item_getcheck_func_GREEN_BOTTLE__Fv.s deleted file mode 100644 index 79339f6a116..00000000000 --- a/asm/d/d_item/item_getcheck_func_GREEN_BOTTLE__Fv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_8009A578: -/* 8009A578 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009A57C 7C 08 02 A6 */ mflr r0 -/* 8009A580 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009A584 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009A588 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009A58C 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009A590 38 80 00 62 */ li r4, 0x62 -/* 8009A594 4B F9 91 4D */ bl checkBottle__17dSv_player_item_cFUc -/* 8009A598 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 8009A59C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009A5A0 7C 08 03 A6 */ mtlr r0 -/* 8009A5A4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009A5A8 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_GREEN_RUPEE__Fv.s b/asm/d/d_item/item_getcheck_func_GREEN_RUPEE__Fv.s deleted file mode 100644 index a1b0b4e33be..00000000000 --- a/asm/d/d_item/item_getcheck_func_GREEN_RUPEE__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80099648: -/* 80099648 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009964C 7C 08 02 A6 */ mflr r0 -/* 80099650 90 01 00 14 */ stw r0, 0x14(r1) -/* 80099654 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80099658 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009965C 38 63 00 CC */ addi r3, r3, 0xcc -/* 80099660 38 80 00 01 */ li r4, 1 -/* 80099664 4B F9 A8 65 */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 80099668 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009966C 7C 08 03 A6 */ mtlr r0 -/* 80099670 38 21 00 10 */ addi r1, r1, 0x10 -/* 80099674 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_HALF_MILK_BOTTLE__Fv.s b/asm/d/d_item/item_getcheck_func_HALF_MILK_BOTTLE__Fv.s deleted file mode 100644 index 834b9255c1a..00000000000 --- a/asm/d/d_item/item_getcheck_func_HALF_MILK_BOTTLE__Fv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_8009A614: -/* 8009A614 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009A618 7C 08 02 A6 */ mflr r0 -/* 8009A61C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009A620 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009A624 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009A628 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009A62C 38 80 00 65 */ li r4, 0x65 -/* 8009A630 4B F9 90 B1 */ bl checkBottle__17dSv_player_item_cFUc -/* 8009A634 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 8009A638 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009A63C 7C 08 03 A6 */ mtlr r0 -/* 8009A640 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009A644 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_HAWK_EYE__Fv.s b/asm/d/d_item/item_getcheck_func_HAWK_EYE__Fv.s deleted file mode 100644 index 9b8302962df..00000000000 --- a/asm/d/d_item/item_getcheck_func_HAWK_EYE__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80099DD0: -/* 80099DD0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80099DD4 7C 08 02 A6 */ mflr r0 -/* 80099DD8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80099DDC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80099DE0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80099DE4 38 63 00 CC */ addi r3, r3, 0xcc -/* 80099DE8 38 80 00 3E */ li r4, 0x3e -/* 80099DEC 4B F9 A0 DD */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 80099DF0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80099DF4 7C 08 03 A6 */ mtlr r0 -/* 80099DF8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80099DFC 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_HOOKSHOT__Fv.s b/asm/d/d_item/item_getcheck_func_HOOKSHOT__Fv.s deleted file mode 100644 index 3afcde0b3d4..00000000000 --- a/asm/d/d_item/item_getcheck_func_HOOKSHOT__Fv.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_80099F40: -/* 80099F40 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80099F44 7C 08 02 A6 */ mflr r0 -/* 80099F48 90 01 00 14 */ stw r0, 0x14(r1) -/* 80099F4C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80099F50 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80099F54 38 63 00 9C */ addi r3, r3, 0x9c -/* 80099F58 38 80 00 09 */ li r4, 9 -/* 80099F5C 38 A0 00 01 */ li r5, 1 -/* 80099F60 4B F9 90 D1 */ bl getItem__17dSv_player_item_cCFib -/* 80099F64 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80099F68 20 00 00 44 */ subfic r0, r0, 0x44 -/* 80099F6C 7C 00 00 34 */ cntlzw r0, r0 -/* 80099F70 54 03 D9 7E */ srwi r3, r0, 5 -/* 80099F74 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80099F78 7C 08 03 A6 */ mtlr r0 -/* 80099F7C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80099F80 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_HORSE_FLUTE__Fv.s b/asm/d/d_item/item_getcheck_func_HORSE_FLUTE__Fv.s deleted file mode 100644 index e905ff56046..00000000000 --- a/asm/d/d_item/item_getcheck_func_HORSE_FLUTE__Fv.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_8009AC58: -/* 8009AC58 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009AC5C 7C 08 02 A6 */ mflr r0 -/* 8009AC60 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009AC64 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009AC68 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009AC6C 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009AC70 38 80 00 16 */ li r4, 0x16 -/* 8009AC74 38 A0 00 01 */ li r5, 1 -/* 8009AC78 4B F9 83 B9 */ bl getItem__17dSv_player_item_cCFib -/* 8009AC7C 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8009AC80 20 00 00 84 */ subfic r0, r0, 0x84 -/* 8009AC84 7C 00 00 34 */ cntlzw r0, r0 -/* 8009AC88 54 03 D9 7E */ srwi r3, r0, 5 -/* 8009AC8C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009AC90 7C 08 03 A6 */ mtlr r0 -/* 8009AC94 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009AC98 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_HOT_SPRING2__Fv.s b/asm/d/d_item/item_getcheck_func_HOT_SPRING2__Fv.s deleted file mode 100644 index 56a3cfcbccc..00000000000 --- a/asm/d/d_item/item_getcheck_func_HOT_SPRING2__Fv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_8009A7B4: -/* 8009A7B4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009A7B8 7C 08 02 A6 */ mflr r0 -/* 8009A7BC 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009A7C0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009A7C4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009A7C8 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009A7CC 38 80 00 6B */ li r4, 0x6b -/* 8009A7D0 4B F9 8F 11 */ bl checkBottle__17dSv_player_item_cFUc -/* 8009A7D4 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 8009A7D8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009A7DC 7C 08 03 A6 */ mtlr r0 -/* 8009A7E0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009A7E4 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_HOT_SPRING__Fv.s b/asm/d/d_item/item_getcheck_func_HOT_SPRING__Fv.s deleted file mode 100644 index ee91a5a86f3..00000000000 --- a/asm/d/d_item/item_getcheck_func_HOT_SPRING__Fv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_8009A74C: -/* 8009A74C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009A750 7C 08 02 A6 */ mflr r0 -/* 8009A754 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009A758 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009A75C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009A760 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009A764 38 80 00 6B */ li r4, 0x6b -/* 8009A768 4B F9 8F 79 */ bl checkBottle__17dSv_player_item_cFUc -/* 8009A76C 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 8009A770 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009A774 7C 08 03 A6 */ mtlr r0 -/* 8009A778 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009A77C 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_HVY_BOOTS__Fv.s b/asm/d/d_item/item_getcheck_func_HVY_BOOTS__Fv.s deleted file mode 100644 index 8970fc222ee..00000000000 --- a/asm/d/d_item/item_getcheck_func_HVY_BOOTS__Fv.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_80099F84: -/* 80099F84 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80099F88 7C 08 02 A6 */ mflr r0 -/* 80099F8C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80099F90 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80099F94 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80099F98 38 63 00 9C */ addi r3, r3, 0x9c -/* 80099F9C 38 80 00 03 */ li r4, 3 -/* 80099FA0 38 A0 00 01 */ li r5, 1 -/* 80099FA4 4B F9 90 8D */ bl getItem__17dSv_player_item_cCFib -/* 80099FA8 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80099FAC 20 00 00 45 */ subfic r0, r0, 0x45 -/* 80099FB0 7C 00 00 34 */ cntlzw r0, r0 -/* 80099FB4 54 03 D9 7E */ srwi r3, r0, 5 -/* 80099FB8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80099FBC 7C 08 03 A6 */ mtlr r0 -/* 80099FC0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80099FC4 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_HYLIA_SHIELD__Fv.s b/asm/d/d_item/item_getcheck_func_HYLIA_SHIELD__Fv.s deleted file mode 100644 index 6c793a683a3..00000000000 --- a/asm/d/d_item/item_getcheck_func_HYLIA_SHIELD__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80099BF0: -/* 80099BF0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80099BF4 7C 08 02 A6 */ mflr r0 -/* 80099BF8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80099BFC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80099C00 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80099C04 38 63 00 CC */ addi r3, r3, 0xcc -/* 80099C08 38 80 00 2C */ li r4, 0x2c -/* 80099C0C 4B F9 A2 BD */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 80099C10 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80099C14 7C 08 03 A6 */ mtlr r0 -/* 80099C18 38 21 00 10 */ addi r1, r1, 0x10 -/* 80099C1C 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_IRIAS_PENDANT__Fv.s b/asm/d/d_item/item_getcheck_func_IRIAS_PENDANT__Fv.s deleted file mode 100644 index e0c6d36b9c0..00000000000 --- a/asm/d/d_item/item_getcheck_func_IRIAS_PENDANT__Fv.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_8009AC14: -/* 8009AC14 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009AC18 7C 08 02 A6 */ mflr r0 -/* 8009AC1C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009AC20 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009AC24 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009AC28 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009AC2C 38 80 00 15 */ li r4, 0x15 -/* 8009AC30 38 A0 00 01 */ li r5, 1 -/* 8009AC34 4B F9 83 FD */ bl getItem__17dSv_player_item_cCFib -/* 8009AC38 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8009AC3C 20 00 00 83 */ subfic r0, r0, 0x83 -/* 8009AC40 7C 00 00 34 */ cntlzw r0, r0 -/* 8009AC44 54 03 D9 7E */ srwi r3, r0, 5 -/* 8009AC48 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009AC4C 7C 08 03 A6 */ mtlr r0 -/* 8009AC50 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009AC54 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_IRONBALL__Fv.s b/asm/d/d_item/item_getcheck_func_IRONBALL__Fv.s deleted file mode 100644 index f01f7a6ea85..00000000000 --- a/asm/d/d_item/item_getcheck_func_IRONBALL__Fv.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_80099EB8: -/* 80099EB8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80099EBC 7C 08 02 A6 */ mflr r0 -/* 80099EC0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80099EC4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80099EC8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80099ECC 38 63 00 9C */ addi r3, r3, 0x9c -/* 80099ED0 38 80 00 06 */ li r4, 6 -/* 80099ED4 38 A0 00 01 */ li r5, 1 -/* 80099ED8 4B F9 91 59 */ bl getItem__17dSv_player_item_cCFib -/* 80099EDC 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80099EE0 20 00 00 42 */ subfic r0, r0, 0x42 -/* 80099EE4 7C 00 00 34 */ cntlzw r0, r0 -/* 80099EE8 54 03 D9 7E */ srwi r3, r0, 5 -/* 80099EEC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80099EF0 7C 08 03 A6 */ mtlr r0 -/* 80099EF4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80099EF8 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_JEWEL_BEE_ROD__Fv.s b/asm/d/d_item/item_getcheck_func_JEWEL_BEE_ROD__Fv.s deleted file mode 100644 index de9e10f82b9..00000000000 --- a/asm/d/d_item/item_getcheck_func_JEWEL_BEE_ROD__Fv.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_8009A4D0: -/* 8009A4D0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009A4D4 7C 08 02 A6 */ mflr r0 -/* 8009A4D8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009A4DC 4B FF FB ED */ bl item_getcheck_func_FISHING_ROD_1__Fv -/* 8009A4E0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009A4E4 7C 08 03 A6 */ mtlr r0 -/* 8009A4E8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009A4EC 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_JEWEL_ROD__Fv.s b/asm/d/d_item/item_getcheck_func_JEWEL_ROD__Fv.s deleted file mode 100644 index cffdd0b2e74..00000000000 --- a/asm/d/d_item/item_getcheck_func_JEWEL_ROD__Fv.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_8009A490: -/* 8009A490 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009A494 7C 08 02 A6 */ mflr r0 -/* 8009A498 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009A49C 4B FF FC 2D */ bl item_getcheck_func_FISHING_ROD_1__Fv -/* 8009A4A0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009A4A4 7C 08 03 A6 */ mtlr r0 -/* 8009A4A8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009A4AC 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_JEWEL_WORM_ROD__Fv.s b/asm/d/d_item/item_getcheck_func_JEWEL_WORM_ROD__Fv.s deleted file mode 100644 index ed6bbe947c9..00000000000 --- a/asm/d/d_item/item_getcheck_func_JEWEL_WORM_ROD__Fv.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_8009A4F0: -/* 8009A4F0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009A4F4 7C 08 02 A6 */ mflr r0 -/* 8009A4F8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009A4FC 4B FF FB CD */ bl item_getcheck_func_FISHING_ROD_1__Fv -/* 8009A500 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009A504 7C 08 03 A6 */ mtlr r0 -/* 8009A508 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009A50C 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_KANTERA__Fv.s b/asm/d/d_item/item_getcheck_func_KANTERA__Fv.s deleted file mode 100644 index ef4690c0f4c..00000000000 --- a/asm/d/d_item/item_getcheck_func_KANTERA__Fv.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_8009A050: -/* 8009A050 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009A054 7C 08 02 A6 */ mflr r0 -/* 8009A058 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009A05C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009A060 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009A064 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009A068 38 80 00 01 */ li r4, 1 -/* 8009A06C 38 A0 00 01 */ li r5, 1 -/* 8009A070 4B F9 8F C1 */ bl getItem__17dSv_player_item_cCFib -/* 8009A074 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8009A078 20 00 00 48 */ subfic r0, r0, 0x48 -/* 8009A07C 7C 00 00 34 */ cntlzw r0, r0 -/* 8009A080 54 03 D9 7E */ srwi r3, r0, 5 -/* 8009A084 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009A088 7C 08 03 A6 */ mtlr r0 -/* 8009A08C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009A090 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_KEY_OF_CARAVAN__Fv.s b/asm/d/d_item/item_getcheck_func_KEY_OF_CARAVAN__Fv.s deleted file mode 100644 index cde210b49dd..00000000000 --- a/asm/d/d_item/item_getcheck_func_KEY_OF_CARAVAN__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_8009B618: -/* 8009B618 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009B61C 7C 08 02 A6 */ mflr r0 -/* 8009B620 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009B624 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009B628 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009B62C 38 63 00 CC */ addi r3, r3, 0xcc -/* 8009B630 38 80 00 FC */ li r4, 0xfc -/* 8009B634 4B F9 88 95 */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 8009B638 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009B63C 7C 08 03 A6 */ mtlr r0 -/* 8009B640 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009B644 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_KEY_OF_FILONE__Fv.s b/asm/d/d_item/item_getcheck_func_KEY_OF_FILONE__Fv.s deleted file mode 100644 index e379333d05e..00000000000 --- a/asm/d/d_item/item_getcheck_func_KEY_OF_FILONE__Fv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_8009B678: -/* 8009B678 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009B67C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009B680 88 63 09 74 */ lbz r3, 0x974(r3) -/* 8009B684 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_L2_KEY_PIECES1__Fv.s b/asm/d/d_item/item_getcheck_func_L2_KEY_PIECES1__Fv.s deleted file mode 100644 index 1f2c87fbc00..00000000000 --- a/asm/d/d_item/item_getcheck_func_L2_KEY_PIECES1__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_8009B588: -/* 8009B588 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009B58C 7C 08 02 A6 */ mflr r0 -/* 8009B590 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009B594 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009B598 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009B59C 38 63 00 CC */ addi r3, r3, 0xcc -/* 8009B5A0 38 80 00 F9 */ li r4, 0xf9 -/* 8009B5A4 4B F9 89 25 */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 8009B5A8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009B5AC 7C 08 03 A6 */ mtlr r0 -/* 8009B5B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009B5B4 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_L2_KEY_PIECES2__Fv.s b/asm/d/d_item/item_getcheck_func_L2_KEY_PIECES2__Fv.s deleted file mode 100644 index f05930dcbc9..00000000000 --- a/asm/d/d_item/item_getcheck_func_L2_KEY_PIECES2__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_8009B5B8: -/* 8009B5B8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009B5BC 7C 08 02 A6 */ mflr r0 -/* 8009B5C0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009B5C4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009B5C8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009B5CC 38 63 00 CC */ addi r3, r3, 0xcc -/* 8009B5D0 38 80 00 FA */ li r4, 0xfa -/* 8009B5D4 4B F9 88 F5 */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 8009B5D8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009B5DC 7C 08 03 A6 */ mtlr r0 -/* 8009B5E0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009B5E4 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_L2_KEY_PIECES3__Fv.s b/asm/d/d_item/item_getcheck_func_L2_KEY_PIECES3__Fv.s deleted file mode 100644 index b81ca0b03af..00000000000 --- a/asm/d/d_item/item_getcheck_func_L2_KEY_PIECES3__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_8009B5E8: -/* 8009B5E8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009B5EC 7C 08 02 A6 */ mflr r0 -/* 8009B5F0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009B5F4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009B5F8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009B5FC 38 63 00 CC */ addi r3, r3, 0xcc -/* 8009B600 38 80 00 FB */ li r4, 0xfb -/* 8009B604 4B F9 88 C5 */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 8009B608 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009B60C 7C 08 03 A6 */ mtlr r0 -/* 8009B610 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009B614 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_LETTER__Fv.s b/asm/d/d_item/item_getcheck_func_LETTER__Fv.s deleted file mode 100644 index 1546f816fc4..00000000000 --- a/asm/d/d_item/item_getcheck_func_LETTER__Fv.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_8009AB48: -/* 8009AB48 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009AB4C 7C 08 02 A6 */ mflr r0 -/* 8009AB50 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009AB54 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009AB58 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009AB5C 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009AB60 38 80 00 15 */ li r4, 0x15 -/* 8009AB64 38 A0 00 01 */ li r5, 1 -/* 8009AB68 4B F9 84 C9 */ bl getItem__17dSv_player_item_cCFib -/* 8009AB6C 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8009AB70 20 00 00 80 */ subfic r0, r0, 0x80 -/* 8009AB74 7C 00 00 34 */ cntlzw r0, r0 -/* 8009AB78 54 03 D9 7E */ srwi r3, r0, 5 -/* 8009AB7C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009AB80 7C 08 03 A6 */ mtlr r0 -/* 8009AB84 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009AB88 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_LIGHT_ARROW__Fv.s b/asm/d/d_item/item_getcheck_func_LIGHT_ARROW__Fv.s deleted file mode 100644 index 9d6e1c10b8d..00000000000 --- a/asm/d/d_item/item_getcheck_func_LIGHT_ARROW__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_8009A2D8: -/* 8009A2D8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009A2DC 7C 08 02 A6 */ mflr r0 -/* 8009A2E0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009A2E4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009A2E8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009A2EC 38 63 00 CC */ addi r3, r3, 0xcc -/* 8009A2F0 38 80 00 53 */ li r4, 0x53 -/* 8009A2F4 4B F9 9B D5 */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 8009A2F8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009A2FC 7C 08 03 A6 */ mtlr r0 -/* 8009A300 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009A304 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_LIGHT_DROP__Fv.s b/asm/d/d_item/item_getcheck_func_LIGHT_DROP__Fv.s deleted file mode 100644 index e9bf1a4bd1c..00000000000 --- a/asm/d/d_item/item_getcheck_func_LIGHT_DROP__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_8009AD9C: -/* 8009AD9C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009ADA0 7C 08 02 A6 */ mflr r0 -/* 8009ADA4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009ADA8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009ADAC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009ADB0 38 63 00 CC */ addi r3, r3, 0xcc -/* 8009ADB4 38 80 00 A0 */ li r4, 0xa0 -/* 8009ADB8 4B F9 91 11 */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 8009ADBC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009ADC0 7C 08 03 A6 */ mtlr r0 -/* 8009ADC4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009ADC8 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_LIGHT_SWORD__Fv.s b/asm/d/d_item/item_getcheck_func_LIGHT_SWORD__Fv.s deleted file mode 100644 index 27486267897..00000000000 --- a/asm/d/d_item/item_getcheck_func_LIGHT_SWORD__Fv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_8009A094: -/* 8009A094 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009A098 7C 08 02 A6 */ mflr r0 -/* 8009A09C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009A0A0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009A0A4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009A0A8 38 63 01 00 */ addi r3, r3, 0x100 -/* 8009A0AC 38 80 00 01 */ li r4, 1 -/* 8009A0B0 38 A0 00 03 */ li r5, 3 -/* 8009A0B4 4B F9 A1 55 */ bl isCollect__20dSv_player_collect_cCFiUc -/* 8009A0B8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009A0BC 7C 08 03 A6 */ mtlr r0 -/* 8009A0C0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009A0C4 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_LV1_SOUP__Fv.s b/asm/d/d_item/item_getcheck_func_LV1_SOUP__Fv.s deleted file mode 100644 index 4f94a2016c3..00000000000 --- a/asm/d/d_item/item_getcheck_func_LV1_SOUP__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_8009AAB8: -/* 8009AAB8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009AABC 7C 08 02 A6 */ mflr r0 -/* 8009AAC0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009AAC4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009AAC8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009AACC 38 63 00 CC */ addi r3, r3, 0xcc -/* 8009AAD0 38 80 00 7D */ li r4, 0x7d -/* 8009AAD4 4B F9 93 F5 */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 8009AAD8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009AADC 7C 08 03 A6 */ mtlr r0 -/* 8009AAE0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009AAE4 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_LV2_BOSS_KEY__Fv.s b/asm/d/d_item/item_getcheck_func_LV2_BOSS_KEY__Fv.s deleted file mode 100644 index a96cc96fb26..00000000000 --- a/asm/d/d_item/item_getcheck_func_LV2_BOSS_KEY__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_8009B648: -/* 8009B648 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009B64C 7C 08 02 A6 */ mflr r0 -/* 8009B650 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009B654 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009B658 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009B65C 38 63 09 58 */ addi r3, r3, 0x958 -/* 8009B660 38 80 00 02 */ li r4, 2 -/* 8009B664 4B F9 92 D1 */ bl isDungeonItem__12dSv_memBit_cCFi -/* 8009B668 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009B66C 7C 08 03 A6 */ mtlr r0 -/* 8009B670 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009B674 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_LV2_SOUP__Fv.s b/asm/d/d_item/item_getcheck_func_LV2_SOUP__Fv.s deleted file mode 100644 index 44cc14e348c..00000000000 --- a/asm/d/d_item/item_getcheck_func_LV2_SOUP__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_8009AAE8: -/* 8009AAE8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009AAEC 7C 08 02 A6 */ mflr r0 -/* 8009AAF0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009AAF4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009AAF8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009AAFC 38 63 00 CC */ addi r3, r3, 0xcc -/* 8009AB00 38 80 00 7E */ li r4, 0x7e -/* 8009AB04 4B F9 93 C5 */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 8009AB08 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009AB0C 7C 08 03 A6 */ mtlr r0 -/* 8009AB10 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009AB14 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_LV3_SOUP__Fv.s b/asm/d/d_item/item_getcheck_func_LV3_SOUP__Fv.s deleted file mode 100644 index 7137974b230..00000000000 --- a/asm/d/d_item/item_getcheck_func_LV3_SOUP__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_8009AB18: -/* 8009AB18 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009AB1C 7C 08 02 A6 */ mflr r0 -/* 8009AB20 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009AB24 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009AB28 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009AB2C 38 63 00 CC */ addi r3, r3, 0xcc -/* 8009AB30 38 80 00 7F */ li r4, 0x7f -/* 8009AB34 4B F9 93 95 */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 8009AB38 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009AB3C 7C 08 03 A6 */ mtlr r0 -/* 8009AB40 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009AB44 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_LV5_BOSS_KEY__Fv.s b/asm/d/d_item/item_getcheck_func_LV5_BOSS_KEY__Fv.s deleted file mode 100644 index dcf43243e22..00000000000 --- a/asm/d/d_item/item_getcheck_func_LV5_BOSS_KEY__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_8009B548: -/* 8009B548 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009B54C 7C 08 02 A6 */ mflr r0 -/* 8009B550 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009B554 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009B558 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009B55C 38 63 09 58 */ addi r3, r3, 0x958 -/* 8009B560 38 80 00 02 */ li r4, 2 -/* 8009B564 4B F9 93 D1 */ bl isDungeonItem__12dSv_memBit_cCFi -/* 8009B568 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009B56C 7C 08 03 A6 */ mtlr r0 -/* 8009B570 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009B574 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_LV7_DUNGEON_EXIT__Fv.s b/asm/d/d_item/item_getcheck_func_LV7_DUNGEON_EXIT__Fv.s deleted file mode 100644 index 156fe7f6f6f..00000000000 --- a/asm/d/d_item/item_getcheck_func_LV7_DUNGEON_EXIT__Fv.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_8009B46C: -/* 8009B46C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009B470 7C 08 02 A6 */ mflr r0 -/* 8009B474 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009B478 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009B47C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009B480 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009B484 38 80 00 12 */ li r4, 0x12 -/* 8009B488 38 A0 00 01 */ li r5, 1 -/* 8009B48C 4B F9 7B A5 */ bl getItem__17dSv_player_item_cCFib -/* 8009B490 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8009B494 20 00 00 EC */ subfic r0, r0, 0xec -/* 8009B498 7C 00 00 34 */ cntlzw r0, r0 -/* 8009B49C 54 03 D9 7E */ srwi r3, r0, 5 -/* 8009B4A0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009B4A4 7C 08 03 A6 */ mtlr r0 -/* 8009B4A8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009B4AC 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_MAP__Fv.s b/asm/d/d_item/item_getcheck_func_MAP__Fv.s deleted file mode 100644 index 22b9ba795c5..00000000000 --- a/asm/d/d_item/item_getcheck_func_MAP__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80099A38: -/* 80099A38 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80099A3C 7C 08 02 A6 */ mflr r0 -/* 80099A40 90 01 00 14 */ stw r0, 0x14(r1) -/* 80099A44 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80099A48 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80099A4C 38 63 09 58 */ addi r3, r3, 0x958 -/* 80099A50 38 80 00 00 */ li r4, 0 -/* 80099A54 4B F9 AE E1 */ bl isDungeonItem__12dSv_memBit_cCFi -/* 80099A58 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80099A5C 7C 08 03 A6 */ mtlr r0 -/* 80099A60 38 21 00 10 */ addi r1, r1, 0x10 -/* 80099A64 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_MASTER_SWORD__Fv.s b/asm/d/d_item/item_getcheck_func_MASTER_SWORD__Fv.s deleted file mode 100644 index f9a7fec5fe9..00000000000 --- a/asm/d/d_item/item_getcheck_func_MASTER_SWORD__Fv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_80099B5C: -/* 80099B5C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80099B60 7C 08 02 A6 */ mflr r0 -/* 80099B64 90 01 00 14 */ stw r0, 0x14(r1) -/* 80099B68 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80099B6C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80099B70 38 63 01 00 */ addi r3, r3, 0x100 -/* 80099B74 38 80 00 01 */ li r4, 1 -/* 80099B78 38 A0 00 01 */ li r5, 1 -/* 80099B7C 4B F9 A6 8D */ bl isCollect__20dSv_player_collect_cCFiUc -/* 80099B80 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80099B84 7C 08 03 A6 */ mtlr r0 -/* 80099B88 38 21 00 10 */ addi r1, r1, 0x10 -/* 80099B8C 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_MILK_BOTTLE__Fv.s b/asm/d/d_item/item_getcheck_func_MILK_BOTTLE__Fv.s deleted file mode 100644 index 36f604b163a..00000000000 --- a/asm/d/d_item/item_getcheck_func_MILK_BOTTLE__Fv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_8009A5E0: -/* 8009A5E0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009A5E4 7C 08 02 A6 */ mflr r0 -/* 8009A5E8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009A5EC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009A5F0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009A5F4 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009A5F8 38 80 00 64 */ li r4, 0x64 -/* 8009A5FC 4B F9 90 E5 */ bl checkBottle__17dSv_player_item_cFUc -/* 8009A600 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 8009A604 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009A608 7C 08 03 A6 */ mtlr r0 -/* 8009A60C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009A610 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_M_ANT__Fv.s b/asm/d/d_item/item_getcheck_func_M_ANT__Fv.s deleted file mode 100644 index 4589cfef50c..00000000000 --- a/asm/d/d_item/item_getcheck_func_M_ANT__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_8009B2D0: -/* 8009B2D0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009B2D4 7C 08 02 A6 */ mflr r0 -/* 8009B2D8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009B2DC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009B2E0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009B2E4 38 63 00 CC */ addi r3, r3, 0xcc -/* 8009B2E8 38 80 00 D4 */ li r4, 0xd4 -/* 8009B2EC 4B F9 8B DD */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 8009B2F0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009B2F4 7C 08 03 A6 */ mtlr r0 -/* 8009B2F8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009B2FC 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_M_BEETLE__Fv.s b/asm/d/d_item/item_getcheck_func_M_BEETLE__Fv.s deleted file mode 100644 index 1f7910cbd2f..00000000000 --- a/asm/d/d_item/item_getcheck_func_M_BEETLE__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_8009AF10: -/* 8009AF10 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009AF14 7C 08 02 A6 */ mflr r0 -/* 8009AF18 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009AF1C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009AF20 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009AF24 38 63 00 CC */ addi r3, r3, 0xcc -/* 8009AF28 38 80 00 C0 */ li r4, 0xc0 -/* 8009AF2C 4B F9 8F 9D */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 8009AF30 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009AF34 7C 08 03 A6 */ mtlr r0 -/* 8009AF38 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009AF3C 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_M_BUTTERFLY__Fv.s b/asm/d/d_item/item_getcheck_func_M_BUTTERFLY__Fv.s deleted file mode 100644 index 340214a7f14..00000000000 --- a/asm/d/d_item/item_getcheck_func_M_BUTTERFLY__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_8009AF70: -/* 8009AF70 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009AF74 7C 08 02 A6 */ mflr r0 -/* 8009AF78 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009AF7C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009AF80 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009AF84 38 63 00 CC */ addi r3, r3, 0xcc -/* 8009AF88 38 80 00 C2 */ li r4, 0xc2 -/* 8009AF8C 4B F9 8F 3D */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 8009AF90 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009AF94 7C 08 03 A6 */ mtlr r0 -/* 8009AF98 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009AF9C 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_M_DANGOMUSHI__Fv.s b/asm/d/d_item/item_getcheck_func_M_DANGOMUSHI__Fv.s deleted file mode 100644 index 94358901ac0..00000000000 --- a/asm/d/d_item/item_getcheck_func_M_DANGOMUSHI__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_8009B0F0: -/* 8009B0F0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009B0F4 7C 08 02 A6 */ mflr r0 -/* 8009B0F8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009B0FC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009B100 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009B104 38 63 00 CC */ addi r3, r3, 0xcc -/* 8009B108 38 80 00 CA */ li r4, 0xca -/* 8009B10C 4B F9 8D BD */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 8009B110 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009B114 7C 08 03 A6 */ mtlr r0 -/* 8009B118 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009B11C 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_M_DRAGONFLY__Fv.s b/asm/d/d_item/item_getcheck_func_M_DRAGONFLY__Fv.s deleted file mode 100644 index 2070d561cf3..00000000000 --- a/asm/d/d_item/item_getcheck_func_M_DRAGONFLY__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_8009B270: -/* 8009B270 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009B274 7C 08 02 A6 */ mflr r0 -/* 8009B278 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009B27C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009B280 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009B284 38 63 00 CC */ addi r3, r3, 0xcc -/* 8009B288 38 80 00 D2 */ li r4, 0xd2 -/* 8009B28C 4B F9 8C 3D */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 8009B290 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009B294 7C 08 03 A6 */ mtlr r0 -/* 8009B298 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009B29C 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_M_GRASSHOPPER__Fv.s b/asm/d/d_item/item_getcheck_func_M_GRASSHOPPER__Fv.s deleted file mode 100644 index 8c811deb31a..00000000000 --- a/asm/d/d_item/item_getcheck_func_M_GRASSHOPPER__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_8009B030: -/* 8009B030 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009B034 7C 08 02 A6 */ mflr r0 -/* 8009B038 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009B03C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009B040 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009B044 38 63 00 CC */ addi r3, r3, 0xcc -/* 8009B048 38 80 00 C6 */ li r4, 0xc6 -/* 8009B04C 4B F9 8E 7D */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 8009B050 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009B054 7C 08 03 A6 */ mtlr r0 -/* 8009B058 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009B05C 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_M_LADYBUG__Fv.s b/asm/d/d_item/item_getcheck_func_M_LADYBUG__Fv.s deleted file mode 100644 index 8a2d9d1569c..00000000000 --- a/asm/d/d_item/item_getcheck_func_M_LADYBUG__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_8009B1B0: -/* 8009B1B0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009B1B4 7C 08 02 A6 */ mflr r0 -/* 8009B1B8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009B1BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009B1C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009B1C4 38 63 00 CC */ addi r3, r3, 0xcc -/* 8009B1C8 38 80 00 CE */ li r4, 0xce -/* 8009B1CC 4B F9 8C FD */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 8009B1D0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009B1D4 7C 08 03 A6 */ mtlr r0 -/* 8009B1D8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009B1DC 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_M_MANTIS__Fv.s b/asm/d/d_item/item_getcheck_func_M_MANTIS__Fv.s deleted file mode 100644 index 2cae59323af..00000000000 --- a/asm/d/d_item/item_getcheck_func_M_MANTIS__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_8009B150: -/* 8009B150 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009B154 7C 08 02 A6 */ mflr r0 -/* 8009B158 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009B15C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009B160 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009B164 38 63 00 CC */ addi r3, r3, 0xcc -/* 8009B168 38 80 00 CC */ li r4, 0xcc -/* 8009B16C 4B F9 8D 5D */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 8009B170 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009B174 7C 08 03 A6 */ mtlr r0 -/* 8009B178 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009B17C 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_M_MAYFLY__Fv.s b/asm/d/d_item/item_getcheck_func_M_MAYFLY__Fv.s deleted file mode 100644 index 6d817549383..00000000000 --- a/asm/d/d_item/item_getcheck_func_M_MAYFLY__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_8009B330: -/* 8009B330 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009B334 7C 08 02 A6 */ mflr r0 -/* 8009B338 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009B33C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009B340 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009B344 38 63 00 CC */ addi r3, r3, 0xcc -/* 8009B348 38 80 00 D6 */ li r4, 0xd6 -/* 8009B34C 4B F9 8B 7D */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 8009B350 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009B354 7C 08 03 A6 */ mtlr r0 -/* 8009B358 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009B35C 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_M_NANAFUSHI__Fv.s b/asm/d/d_item/item_getcheck_func_M_NANAFUSHI__Fv.s deleted file mode 100644 index c575c14da15..00000000000 --- a/asm/d/d_item/item_getcheck_func_M_NANAFUSHI__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_8009B090: -/* 8009B090 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009B094 7C 08 02 A6 */ mflr r0 -/* 8009B098 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009B09C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009B0A0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009B0A4 38 63 00 CC */ addi r3, r3, 0xcc -/* 8009B0A8 38 80 00 C8 */ li r4, 0xc8 -/* 8009B0AC 4B F9 8E 1D */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 8009B0B0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009B0B4 7C 08 03 A6 */ mtlr r0 -/* 8009B0B8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009B0BC 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_M_SNAIL__Fv.s b/asm/d/d_item/item_getcheck_func_M_SNAIL__Fv.s deleted file mode 100644 index 948eec3d860..00000000000 --- a/asm/d/d_item/item_getcheck_func_M_SNAIL__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_8009B210: -/* 8009B210 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009B214 7C 08 02 A6 */ mflr r0 -/* 8009B218 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009B21C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009B220 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009B224 38 63 00 CC */ addi r3, r3, 0xcc -/* 8009B228 38 80 00 D0 */ li r4, 0xd0 -/* 8009B22C 4B F9 8C 9D */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 8009B230 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009B234 7C 08 03 A6 */ mtlr r0 -/* 8009B238 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009B23C 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_M_STAG_BEETLE__Fv.s b/asm/d/d_item/item_getcheck_func_M_STAG_BEETLE__Fv.s deleted file mode 100644 index 573b6e28d8a..00000000000 --- a/asm/d/d_item/item_getcheck_func_M_STAG_BEETLE__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_8009AFD0: -/* 8009AFD0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009AFD4 7C 08 02 A6 */ mflr r0 -/* 8009AFD8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009AFDC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009AFE0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009AFE4 38 63 00 CC */ addi r3, r3, 0xcc -/* 8009AFE8 38 80 00 C4 */ li r4, 0xc4 -/* 8009AFEC 4B F9 8E DD */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 8009AFF0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009AFF4 7C 08 03 A6 */ mtlr r0 -/* 8009AFF8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009AFFC 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_NORMAL_BOMB__Fv.s b/asm/d/d_item/item_getcheck_func_NORMAL_BOMB__Fv.s deleted file mode 100644 index d074e3cefa3..00000000000 --- a/asm/d/d_item/item_getcheck_func_NORMAL_BOMB__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_8009A850: -/* 8009A850 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009A854 7C 08 02 A6 */ mflr r0 -/* 8009A858 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009A85C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009A860 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009A864 38 63 00 CC */ addi r3, r3, 0xcc -/* 8009A868 38 80 00 70 */ li r4, 0x70 -/* 8009A86C 4B F9 96 5D */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 8009A870 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009A874 7C 08 03 A6 */ mtlr r0 -/* 8009A878 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009A87C 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_OIL2__Fv.s b/asm/d/d_item/item_getcheck_func_OIL2__Fv.s deleted file mode 100644 index 0b5d385ad5e..00000000000 --- a/asm/d/d_item/item_getcheck_func_OIL2__Fv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_8009A7E8: -/* 8009A7E8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009A7EC 7C 08 02 A6 */ mflr r0 -/* 8009A7F0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009A7F4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009A7F8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009A7FC 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009A800 38 80 00 6E */ li r4, 0x6e -/* 8009A804 4B F9 8E DD */ bl checkBottle__17dSv_player_item_cFUc -/* 8009A808 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 8009A80C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009A810 7C 08 03 A6 */ mtlr r0 -/* 8009A814 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009A818 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_OIL_BOTTLE2__Fv.s b/asm/d/d_item/item_getcheck_func_OIL_BOTTLE2__Fv.s deleted file mode 100644 index e1304da79fc..00000000000 --- a/asm/d/d_item/item_getcheck_func_OIL_BOTTLE2__Fv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_8009A6B0: -/* 8009A6B0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009A6B4 7C 08 02 A6 */ mflr r0 -/* 8009A6B8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009A6BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009A6C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009A6C4 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009A6C8 38 80 00 68 */ li r4, 0x68 -/* 8009A6CC 4B F9 90 15 */ bl checkBottle__17dSv_player_item_cFUc -/* 8009A6D0 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 8009A6D4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009A6D8 7C 08 03 A6 */ mtlr r0 -/* 8009A6DC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009A6E0 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_OIL_BOTTLE__Fv.s b/asm/d/d_item/item_getcheck_func_OIL_BOTTLE__Fv.s deleted file mode 100644 index b3b445775ac..00000000000 --- a/asm/d/d_item/item_getcheck_func_OIL_BOTTLE__Fv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_8009A648: -/* 8009A648 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009A64C 7C 08 02 A6 */ mflr r0 -/* 8009A650 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009A654 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009A658 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009A65C 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009A660 38 80 00 66 */ li r4, 0x66 -/* 8009A664 4B F9 90 7D */ bl checkBottle__17dSv_player_item_cFUc -/* 8009A668 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 8009A66C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009A670 7C 08 03 A6 */ mtlr r0 -/* 8009A674 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009A678 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_OIL__Fv.s b/asm/d/d_item/item_getcheck_func_OIL__Fv.s deleted file mode 100644 index 52342f7286c..00000000000 --- a/asm/d/d_item/item_getcheck_func_OIL__Fv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_8009A81C: -/* 8009A81C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009A820 7C 08 02 A6 */ mflr r0 -/* 8009A824 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009A828 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009A82C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009A830 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009A834 38 80 00 6F */ li r4, 0x6f -/* 8009A838 4B F9 8E A9 */ bl checkBottle__17dSv_player_item_cFUc -/* 8009A83C 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 8009A840 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009A844 7C 08 03 A6 */ mtlr r0 -/* 8009A848 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009A84C 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_ORANGE_RUPEE__Fv.s b/asm/d/d_item/item_getcheck_func_ORANGE_RUPEE__Fv.s deleted file mode 100644 index 06218c9a7ac..00000000000 --- a/asm/d/d_item/item_getcheck_func_ORANGE_RUPEE__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80099738: -/* 80099738 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009973C 7C 08 02 A6 */ mflr r0 -/* 80099740 90 01 00 14 */ stw r0, 0x14(r1) -/* 80099744 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80099748 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009974C 38 63 00 CC */ addi r3, r3, 0xcc -/* 80099750 38 80 00 06 */ li r4, 6 -/* 80099754 4B F9 A7 75 */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 80099758 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009975C 7C 08 03 A6 */ mtlr r0 -/* 80099760 38 21 00 10 */ addi r1, r1, 0x10 -/* 80099764 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_PACHINKO_SHOT__Fv.s b/asm/d/d_item/item_getcheck_func_PACHINKO_SHOT__Fv.s deleted file mode 100644 index aea37746c47..00000000000 --- a/asm/d/d_item/item_getcheck_func_PACHINKO_SHOT__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80099928: -/* 80099928 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009992C 7C 08 02 A6 */ mflr r0 -/* 80099930 90 01 00 14 */ stw r0, 0x14(r1) -/* 80099934 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80099938 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009993C 38 63 00 CC */ addi r3, r3, 0xcc -/* 80099940 38 80 00 12 */ li r4, 0x12 -/* 80099944 4B F9 A5 85 */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 80099948 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009994C 7C 08 03 A6 */ mtlr r0 -/* 80099950 38 21 00 10 */ addi r1, r1, 0x10 -/* 80099954 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_PACHINKO__Fv.s b/asm/d/d_item/item_getcheck_func_PACHINKO__Fv.s deleted file mode 100644 index d0ceeb4f19d..00000000000 --- a/asm/d/d_item/item_getcheck_func_PACHINKO__Fv.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_8009A1FC: -/* 8009A1FC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009A200 7C 08 02 A6 */ mflr r0 -/* 8009A204 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009A208 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009A20C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009A210 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009A214 38 80 00 17 */ li r4, 0x17 -/* 8009A218 38 A0 00 01 */ li r5, 1 -/* 8009A21C 4B F9 8E 15 */ bl getItem__17dSv_player_item_cCFib -/* 8009A220 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8009A224 20 00 00 4B */ subfic r0, r0, 0x4b -/* 8009A228 7C 00 00 34 */ cntlzw r0, r0 -/* 8009A22C 54 03 D9 7E */ srwi r3, r0, 5 -/* 8009A230 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009A234 7C 08 03 A6 */ mtlr r0 -/* 8009A238 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009A23C 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_POKE_BOMB__Fv.s b/asm/d/d_item/item_getcheck_func_POKE_BOMB__Fv.s deleted file mode 100644 index d33ff463ac3..00000000000 --- a/asm/d/d_item/item_getcheck_func_POKE_BOMB__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_8009A8B0: -/* 8009A8B0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009A8B4 7C 08 02 A6 */ mflr r0 -/* 8009A8B8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009A8BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009A8C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009A8C4 38 63 00 CC */ addi r3, r3, 0xcc -/* 8009A8C8 38 80 00 72 */ li r4, 0x72 -/* 8009A8CC 4B F9 95 FD */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 8009A8D0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009A8D4 7C 08 03 A6 */ mtlr r0 -/* 8009A8D8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009A8DC 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_POU_SPIRIT__Fv.s b/asm/d/d_item/item_getcheck_func_POU_SPIRIT__Fv.s deleted file mode 100644 index fc3183ab1f2..00000000000 --- a/asm/d/d_item/item_getcheck_func_POU_SPIRIT__Fv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_8009B390: -/* 8009B390 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009B394 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009B398 88 63 01 0C */ lbz r3, 0x10c(r3) -/* 8009B39C 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_PURPLE_RUPEE__Fv.s b/asm/d/d_item/item_getcheck_func_PURPLE_RUPEE__Fv.s deleted file mode 100644 index ae80b2afb47..00000000000 --- a/asm/d/d_item/item_getcheck_func_PURPLE_RUPEE__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80099708: -/* 80099708 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009970C 7C 08 02 A6 */ mflr r0 -/* 80099710 90 01 00 14 */ stw r0, 0x14(r1) -/* 80099714 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80099718 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009971C 38 63 00 CC */ addi r3, r3, 0xcc -/* 80099720 38 80 00 05 */ li r4, 5 -/* 80099724 4B F9 A7 A5 */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 80099728 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009972C 7C 08 03 A6 */ mtlr r0 -/* 80099730 38 21 00 10 */ addi r1, r1, 0x10 -/* 80099734 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_RAFRELS_MEMO__Fv.s b/asm/d/d_item/item_getcheck_func_RAFRELS_MEMO__Fv.s deleted file mode 100644 index bc83dd36453..00000000000 --- a/asm/d/d_item/item_getcheck_func_RAFRELS_MEMO__Fv.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_8009AC9C: -/* 8009AC9C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009ACA0 7C 08 02 A6 */ mflr r0 -/* 8009ACA4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009ACA8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009ACAC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009ACB0 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009ACB4 38 80 00 13 */ li r4, 0x13 -/* 8009ACB8 38 A0 00 01 */ li r5, 1 -/* 8009ACBC 4B F9 83 75 */ bl getItem__17dSv_player_item_cCFib -/* 8009ACC0 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8009ACC4 20 00 00 90 */ subfic r0, r0, 0x90 -/* 8009ACC8 7C 00 00 34 */ cntlzw r0, r0 -/* 8009ACCC 54 03 D9 7E */ srwi r3, r0, 5 -/* 8009ACD0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009ACD4 7C 08 03 A6 */ mtlr r0 -/* 8009ACD8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009ACDC 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_RED_BOTTLE2__Fv.s b/asm/d/d_item/item_getcheck_func_RED_BOTTLE2__Fv.s deleted file mode 100644 index 55a20a59463..00000000000 --- a/asm/d/d_item/item_getcheck_func_RED_BOTTLE2__Fv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_8009A6E4: -/* 8009A6E4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009A6E8 7C 08 02 A6 */ mflr r0 -/* 8009A6EC 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009A6F0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009A6F4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009A6F8 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009A6FC 38 80 00 69 */ li r4, 0x69 -/* 8009A700 4B F9 8F E1 */ bl checkBottle__17dSv_player_item_cFUc -/* 8009A704 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 8009A708 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009A70C 7C 08 03 A6 */ mtlr r0 -/* 8009A710 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009A714 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_RED_BOTTLE__Fv.s b/asm/d/d_item/item_getcheck_func_RED_BOTTLE__Fv.s deleted file mode 100644 index 3bfb4a940ad..00000000000 --- a/asm/d/d_item/item_getcheck_func_RED_BOTTLE__Fv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_8009A544: -/* 8009A544 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009A548 7C 08 02 A6 */ mflr r0 -/* 8009A54C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009A550 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009A554 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009A558 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009A55C 38 80 00 61 */ li r4, 0x61 -/* 8009A560 4B F9 91 81 */ bl checkBottle__17dSv_player_item_cFUc -/* 8009A564 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 8009A568 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009A56C 7C 08 03 A6 */ mtlr r0 -/* 8009A570 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009A574 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_RED_RUPEE__Fv.s b/asm/d/d_item/item_getcheck_func_RED_RUPEE__Fv.s deleted file mode 100644 index d2fe58f5a6f..00000000000 --- a/asm/d/d_item/item_getcheck_func_RED_RUPEE__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_800996D8: -/* 800996D8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800996DC 7C 08 02 A6 */ mflr r0 -/* 800996E0 90 01 00 14 */ stw r0, 0x14(r1) -/* 800996E4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800996E8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800996EC 38 63 00 CC */ addi r3, r3, 0xcc -/* 800996F0 38 80 00 04 */ li r4, 4 -/* 800996F4 4B F9 A7 D5 */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 800996F8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800996FC 7C 08 03 A6 */ mtlr r0 -/* 80099700 38 21 00 10 */ addi r1, r1, 0x10 -/* 80099704 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_SHIELD__Fv.s b/asm/d/d_item/item_getcheck_func_SHIELD__Fv.s deleted file mode 100644 index e8f23986cec..00000000000 --- a/asm/d/d_item/item_getcheck_func_SHIELD__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80099BC0: -/* 80099BC0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80099BC4 7C 08 02 A6 */ mflr r0 -/* 80099BC8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80099BCC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80099BD0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80099BD4 38 63 00 CC */ addi r3, r3, 0xcc -/* 80099BD8 38 80 00 2B */ li r4, 0x2b -/* 80099BDC 4B F9 A2 ED */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 80099BE0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80099BE4 7C 08 03 A6 */ mtlr r0 -/* 80099BE8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80099BEC 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_SILVER_RUPEE__Fv.s b/asm/d/d_item/item_getcheck_func_SILVER_RUPEE__Fv.s deleted file mode 100644 index ad0f1148091..00000000000 --- a/asm/d/d_item/item_getcheck_func_SILVER_RUPEE__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80099768: -/* 80099768 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009976C 7C 08 02 A6 */ mflr r0 -/* 80099770 90 01 00 14 */ stw r0, 0x14(r1) -/* 80099774 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80099778 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009977C 38 63 00 CC */ addi r3, r3, 0xcc -/* 80099780 38 80 00 07 */ li r4, 7 -/* 80099784 4B F9 A7 45 */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 80099788 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009978C 7C 08 03 A6 */ mtlr r0 -/* 80099790 38 21 00 10 */ addi r1, r1, 0x10 -/* 80099794 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_SMELL_CHILDREN__Fv.s b/asm/d/d_item/item_getcheck_func_SMELL_CHILDREN__Fv.s deleted file mode 100644 index 796b23e2872..00000000000 --- a/asm/d/d_item/item_getcheck_func_SMELL_CHILDREN__Fv.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_8009AED8: -/* 8009AED8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009AEDC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009AEE0 88 03 00 16 */ lbz r0, 0x16(r3) -/* 8009AEE4 20 00 00 B4 */ subfic r0, r0, 0xb4 -/* 8009AEE8 7C 00 00 34 */ cntlzw r0, r0 -/* 8009AEEC 54 03 D9 7E */ srwi r3, r0, 5 -/* 8009AEF0 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_SMELL_FISH__Fv.s b/asm/d/d_item/item_getcheck_func_SMELL_FISH__Fv.s deleted file mode 100644 index 269facec885..00000000000 --- a/asm/d/d_item/item_getcheck_func_SMELL_FISH__Fv.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_8009AEBC: -/* 8009AEBC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009AEC0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009AEC4 88 03 00 16 */ lbz r0, 0x16(r3) -/* 8009AEC8 20 00 00 B3 */ subfic r0, r0, 0xb3 -/* 8009AECC 7C 00 00 34 */ cntlzw r0, r0 -/* 8009AED0 54 03 D9 7E */ srwi r3, r0, 5 -/* 8009AED4 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_SMELL_MEDICINE__Fv.s b/asm/d/d_item/item_getcheck_func_SMELL_MEDICINE__Fv.s deleted file mode 100644 index 6f816dcc6a8..00000000000 --- a/asm/d/d_item/item_getcheck_func_SMELL_MEDICINE__Fv.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_8009AEF4: -/* 8009AEF4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009AEF8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009AEFC 88 03 00 16 */ lbz r0, 0x16(r3) -/* 8009AF00 20 00 00 B5 */ subfic r0, r0, 0xb5 -/* 8009AF04 7C 00 00 34 */ cntlzw r0, r0 -/* 8009AF08 54 03 D9 7E */ srwi r3, r0, 5 -/* 8009AF0C 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_SMELL_POH__Fv.s b/asm/d/d_item/item_getcheck_func_SMELL_POH__Fv.s deleted file mode 100644 index cc654a9e6a7..00000000000 --- a/asm/d/d_item/item_getcheck_func_SMELL_POH__Fv.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_8009AEA0: -/* 8009AEA0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009AEA4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009AEA8 88 03 00 16 */ lbz r0, 0x16(r3) -/* 8009AEAC 20 00 00 B2 */ subfic r0, r0, 0xb2 -/* 8009AEB0 7C 00 00 34 */ cntlzw r0, r0 -/* 8009AEB4 54 03 D9 7E */ srwi r3, r0, 5 -/* 8009AEB8 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_SMELL_YELIA_POUCH__Fv.s b/asm/d/d_item/item_getcheck_func_SMELL_YELIA_POUCH__Fv.s deleted file mode 100644 index ed63c7558f9..00000000000 --- a/asm/d/d_item/item_getcheck_func_SMELL_YELIA_POUCH__Fv.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_8009AE7C: -/* 8009AE7C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009AE80 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009AE84 88 03 00 16 */ lbz r0, 0x16(r3) -/* 8009AE88 20 00 00 B0 */ subfic r0, r0, 0xb0 -/* 8009AE8C 7C 00 00 34 */ cntlzw r0, r0 -/* 8009AE90 54 03 D9 7E */ srwi r3, r0, 5 -/* 8009AE94 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_SPINNER__Fv.s b/asm/d/d_item/item_getcheck_func_SPINNER__Fv.s deleted file mode 100644 index c59b263712a..00000000000 --- a/asm/d/d_item/item_getcheck_func_SPINNER__Fv.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_80099E74: -/* 80099E74 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80099E78 7C 08 02 A6 */ mflr r0 -/* 80099E7C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80099E80 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80099E84 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80099E88 38 63 00 9C */ addi r3, r3, 0x9c -/* 80099E8C 38 80 00 02 */ li r4, 2 -/* 80099E90 38 A0 00 01 */ li r5, 1 -/* 80099E94 4B F9 91 9D */ bl getItem__17dSv_player_item_cCFib -/* 80099E98 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80099E9C 20 00 00 41 */ subfic r0, r0, 0x41 -/* 80099EA0 7C 00 00 34 */ cntlzw r0, r0 -/* 80099EA4 54 03 D9 7E */ srwi r3, r0, 5 -/* 80099EA8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80099EAC 7C 08 03 A6 */ mtlr r0 -/* 80099EB0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80099EB4 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_SWORD__Fv.s b/asm/d/d_item/item_getcheck_func_SWORD__Fv.s deleted file mode 100644 index 768b7b3640b..00000000000 --- a/asm/d/d_item/item_getcheck_func_SWORD__Fv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_80099B28: -/* 80099B28 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80099B2C 7C 08 02 A6 */ mflr r0 -/* 80099B30 90 01 00 14 */ stw r0, 0x14(r1) -/* 80099B34 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80099B38 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80099B3C 38 63 01 00 */ addi r3, r3, 0x100 -/* 80099B40 38 80 00 01 */ li r4, 1 -/* 80099B44 38 A0 00 00 */ li r5, 0 -/* 80099B48 4B F9 A6 C1 */ bl isCollect__20dSv_player_collect_cCFiUc -/* 80099B4C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80099B50 7C 08 03 A6 */ mtlr r0 -/* 80099B54 38 21 00 10 */ addi r1, r1, 0x10 -/* 80099B58 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_TASTE__Fv.s b/asm/d/d_item/item_getcheck_func_TASTE__Fv.s deleted file mode 100644 index 5ba9e9a5d78..00000000000 --- a/asm/d/d_item/item_getcheck_func_TASTE__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_8009B518: -/* 8009B518 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009B51C 7C 08 02 A6 */ mflr r0 -/* 8009B520 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009B524 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009B528 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009B52C 38 63 00 CC */ addi r3, r3, 0xcc -/* 8009B530 38 80 00 F5 */ li r4, 0xf5 -/* 8009B534 4B F9 89 95 */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 8009B538 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009B53C 7C 08 03 A6 */ mtlr r0 -/* 8009B540 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009B544 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_TKS_LETTER__Fv.s b/asm/d/d_item/item_getcheck_func_TKS_LETTER__Fv.s deleted file mode 100644 index af654fd90ea..00000000000 --- a/asm/d/d_item/item_getcheck_func_TKS_LETTER__Fv.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_80099C20: -/* 80099C20 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80099C24 7C 08 02 A6 */ mflr r0 -/* 80099C28 90 01 00 14 */ stw r0, 0x14(r1) -/* 80099C2C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80099C30 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80099C34 38 63 00 9C */ addi r3, r3, 0x9c -/* 80099C38 38 80 00 12 */ li r4, 0x12 -/* 80099C3C 38 A0 00 01 */ li r5, 1 -/* 80099C40 4B F9 93 F1 */ bl getItem__17dSv_player_item_cCFib -/* 80099C44 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80099C48 20 00 00 2D */ subfic r0, r0, 0x2d -/* 80099C4C 7C 00 00 34 */ cntlzw r0, r0 -/* 80099C50 54 03 D9 7E */ srwi r3, r0, 5 -/* 80099C54 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80099C58 7C 08 03 A6 */ mtlr r0 -/* 80099C5C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80099C60 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_TOMATO_PUREE__Fv.s b/asm/d/d_item/item_getcheck_func_TOMATO_PUREE__Fv.s deleted file mode 100644 index f42f33355ea..00000000000 --- a/asm/d/d_item/item_getcheck_func_TOMATO_PUREE__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_8009B4E8: -/* 8009B4E8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009B4EC 7C 08 02 A6 */ mflr r0 -/* 8009B4F0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009B4F4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009B4F8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009B4FC 38 63 00 CC */ addi r3, r3, 0xcc -/* 8009B500 38 80 00 F4 */ li r4, 0xf4 -/* 8009B504 4B F9 89 C5 */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 8009B508 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009B50C 7C 08 03 A6 */ mtlr r0 -/* 8009B510 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009B514 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_UGLY_SOUP__Fv.s b/asm/d/d_item/item_getcheck_func_UGLY_SOUP__Fv.s deleted file mode 100644 index be19402ae6d..00000000000 --- a/asm/d/d_item/item_getcheck_func_UGLY_SOUP__Fv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_8009A718: -/* 8009A718 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009A71C 7C 08 02 A6 */ mflr r0 -/* 8009A720 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009A724 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009A728 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009A72C 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009A730 38 80 00 6A */ li r4, 0x6a -/* 8009A734 4B F9 8F AD */ bl checkBottle__17dSv_player_item_cFUc -/* 8009A738 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 8009A73C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009A740 7C 08 03 A6 */ mtlr r0 -/* 8009A744 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009A748 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_WATER_BOMB__Fv.s b/asm/d/d_item/item_getcheck_func_WATER_BOMB__Fv.s deleted file mode 100644 index 6ecd15f621b..00000000000 --- a/asm/d/d_item/item_getcheck_func_WATER_BOMB__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_8009A880: -/* 8009A880 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009A884 7C 08 02 A6 */ mflr r0 -/* 8009A888 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009A88C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009A890 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009A894 38 63 00 CC */ addi r3, r3, 0xcc -/* 8009A898 38 80 00 71 */ li r4, 0x71 -/* 8009A89C 4B F9 96 2D */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 8009A8A0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009A8A4 7C 08 03 A6 */ mtlr r0 -/* 8009A8A8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009A8AC 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_WATER_BOTTLE__Fv.s b/asm/d/d_item/item_getcheck_func_WATER_BOTTLE__Fv.s deleted file mode 100644 index a7dcf7166fd..00000000000 --- a/asm/d/d_item/item_getcheck_func_WATER_BOTTLE__Fv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_8009A67C: -/* 8009A67C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009A680 7C 08 02 A6 */ mflr r0 -/* 8009A684 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009A688 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009A68C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009A690 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009A694 38 80 00 67 */ li r4, 0x67 -/* 8009A698 4B F9 90 49 */ bl checkBottle__17dSv_player_item_cFUc -/* 8009A69C 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 8009A6A0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009A6A4 7C 08 03 A6 */ mtlr r0 -/* 8009A6A8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009A6AC 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_WEAR_CASUAL__Fv.s b/asm/d/d_item/item_getcheck_func_WEAR_CASUAL__Fv.s deleted file mode 100644 index 6f6071999b9..00000000000 --- a/asm/d/d_item/item_getcheck_func_WEAR_CASUAL__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80099C64: -/* 80099C64 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80099C68 7C 08 02 A6 */ mflr r0 -/* 80099C6C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80099C70 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80099C74 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80099C78 38 63 00 CC */ addi r3, r3, 0xcc -/* 80099C7C 38 80 00 2E */ li r4, 0x2e -/* 80099C80 4B F9 A2 49 */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 80099C84 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80099C88 7C 08 03 A6 */ mtlr r0 -/* 80099C8C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80099C90 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_WEAR_KOKIRI__Fv.s b/asm/d/d_item/item_getcheck_func_WEAR_KOKIRI__Fv.s deleted file mode 100644 index 8a79abfd3c9..00000000000 --- a/asm/d/d_item/item_getcheck_func_WEAR_KOKIRI__Fv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_80099C94: -/* 80099C94 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80099C98 7C 08 02 A6 */ mflr r0 -/* 80099C9C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80099CA0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80099CA4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80099CA8 38 63 01 00 */ addi r3, r3, 0x100 -/* 80099CAC 38 80 00 00 */ li r4, 0 -/* 80099CB0 38 A0 00 00 */ li r5, 0 -/* 80099CB4 4B F9 A5 55 */ bl isCollect__20dSv_player_collect_cCFiUc -/* 80099CB8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80099CBC 7C 08 03 A6 */ mtlr r0 -/* 80099CC0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80099CC4 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_WEAR_ZORA__Fv.s b/asm/d/d_item/item_getcheck_func_WEAR_ZORA__Fv.s deleted file mode 100644 index e456d606ce6..00000000000 --- a/asm/d/d_item/item_getcheck_func_WEAR_ZORA__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80099CF8: -/* 80099CF8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80099CFC 7C 08 02 A6 */ mflr r0 -/* 80099D00 90 01 00 14 */ stw r0, 0x14(r1) -/* 80099D04 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80099D08 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80099D0C 38 63 00 CC */ addi r3, r3, 0xcc -/* 80099D10 38 80 00 31 */ li r4, 0x31 -/* 80099D14 4B F9 A1 B5 */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 80099D18 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80099D1C 7C 08 03 A6 */ mtlr r0 -/* 80099D20 38 21 00 10 */ addi r1, r1, 0x10 -/* 80099D24 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_WOOD_SHIELD__Fv.s b/asm/d/d_item/item_getcheck_func_WOOD_SHIELD__Fv.s deleted file mode 100644 index b6c0a475daa..00000000000 --- a/asm/d/d_item/item_getcheck_func_WOOD_SHIELD__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80099B90: -/* 80099B90 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80099B94 7C 08 02 A6 */ mflr r0 -/* 80099B98 90 01 00 14 */ stw r0, 0x14(r1) -/* 80099B9C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80099BA0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80099BA4 38 63 00 CC */ addi r3, r3, 0xcc -/* 80099BA8 38 80 00 2A */ li r4, 0x2a -/* 80099BAC 4B F9 A3 1D */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 80099BB0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80099BB4 7C 08 03 A6 */ mtlr r0 -/* 80099BB8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80099BBC 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_WOOD_STATUE__Fv.s b/asm/d/d_item/item_getcheck_func_WOOD_STATUE__Fv.s deleted file mode 100644 index 725332ddbe8..00000000000 --- a/asm/d/d_item/item_getcheck_func_WOOD_STATUE__Fv.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_8009ABD0: -/* 8009ABD0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009ABD4 7C 08 02 A6 */ mflr r0 -/* 8009ABD8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009ABDC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009ABE0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009ABE4 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009ABE8 38 80 00 15 */ li r4, 0x15 -/* 8009ABEC 38 A0 00 01 */ li r5, 1 -/* 8009ABF0 4B F9 84 41 */ bl getItem__17dSv_player_item_cCFib -/* 8009ABF4 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8009ABF8 20 00 00 82 */ subfic r0, r0, 0x82 -/* 8009ABFC 7C 00 00 34 */ cntlzw r0, r0 -/* 8009AC00 54 03 D9 7E */ srwi r3, r0, 5 -/* 8009AC04 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009AC08 7C 08 03 A6 */ mtlr r0 -/* 8009AC0C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009AC10 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_WOOD_STICK__Fv.s b/asm/d/d_item/item_getcheck_func_WOOD_STICK__Fv.s deleted file mode 100644 index 392ecf6a29b..00000000000 --- a/asm/d/d_item/item_getcheck_func_WOOD_STICK__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80099E00: -/* 80099E00 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80099E04 7C 08 02 A6 */ mflr r0 -/* 80099E08 90 01 00 14 */ stw r0, 0x14(r1) -/* 80099E0C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80099E10 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80099E14 38 63 00 CC */ addi r3, r3, 0xcc -/* 80099E18 38 80 00 3F */ li r4, 0x3f -/* 80099E1C 4B F9 A0 AD */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 80099E20 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80099E24 7C 08 03 A6 */ mtlr r0 -/* 80099E28 38 21 00 10 */ addi r1, r1, 0x10 -/* 80099E2C 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_WORM_ROD__Fv.s b/asm/d/d_item/item_getcheck_func_WORM_ROD__Fv.s deleted file mode 100644 index 4fc67c5f654..00000000000 --- a/asm/d/d_item/item_getcheck_func_WORM_ROD__Fv.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_8009A4B0: -/* 8009A4B0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009A4B4 7C 08 02 A6 */ mflr r0 -/* 8009A4B8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009A4BC 4B FF FC 0D */ bl item_getcheck_func_FISHING_ROD_1__Fv -/* 8009A4C0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009A4C4 7C 08 03 A6 */ mtlr r0 -/* 8009A4C8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009A4CC 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_WORM__Fv.s b/asm/d/d_item/item_getcheck_func_WORM__Fv.s deleted file mode 100644 index 3068426aabb..00000000000 --- a/asm/d/d_item/item_getcheck_func_WORM__Fv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_8009A914: -/* 8009A914 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009A918 7C 08 02 A6 */ mflr r0 -/* 8009A91C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009A920 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009A924 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009A928 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009A92C 38 80 00 74 */ li r4, 0x74 -/* 8009A930 4B F9 8D B1 */ bl checkBottle__17dSv_player_item_cFUc -/* 8009A934 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 8009A938 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009A93C 7C 08 03 A6 */ mtlr r0 -/* 8009A940 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009A944 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_W_HOOKSHOT__Fv.s b/asm/d/d_item/item_getcheck_func_W_HOOKSHOT__Fv.s deleted file mode 100644 index f82e71dd8e3..00000000000 --- a/asm/d/d_item/item_getcheck_func_W_HOOKSHOT__Fv.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_8009A00C: -/* 8009A00C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009A010 7C 08 02 A6 */ mflr r0 -/* 8009A014 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009A018 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8009A01C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8009A020 38 63 00 9C */ addi r3, r3, 0x9c -/* 8009A024 38 80 00 0A */ li r4, 0xa -/* 8009A028 38 A0 00 01 */ li r5, 1 -/* 8009A02C 4B F9 90 05 */ bl getItem__17dSv_player_item_cCFib -/* 8009A030 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8009A034 20 00 00 47 */ subfic r0, r0, 0x47 -/* 8009A038 7C 00 00 34 */ cntlzw r0, r0 -/* 8009A03C 54 03 D9 7E */ srwi r3, r0, 5 -/* 8009A040 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009A044 7C 08 03 A6 */ mtlr r0 -/* 8009A048 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009A04C 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_YELLOW_RUPEE__Fv.s b/asm/d/d_item/item_getcheck_func_YELLOW_RUPEE__Fv.s deleted file mode 100644 index 0951d7fca8a..00000000000 --- a/asm/d/d_item/item_getcheck_func_YELLOW_RUPEE__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_800996A8: -/* 800996A8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800996AC 7C 08 02 A6 */ mflr r0 -/* 800996B0 90 01 00 14 */ stw r0, 0x14(r1) -/* 800996B4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800996B8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800996BC 38 63 00 CC */ addi r3, r3, 0xcc -/* 800996C0 38 80 00 03 */ li r4, 3 -/* 800996C4 4B F9 A8 05 */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 800996C8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800996CC 7C 08 03 A6 */ mtlr r0 -/* 800996D0 38 21 00 10 */ addi r1, r1, 0x10 -/* 800996D4 4E 80 00 20 */ blr diff --git a/asm/d/d_item/item_getcheck_func_ZORAS_JEWEL__Fv.s b/asm/d/d_item/item_getcheck_func_ZORAS_JEWEL__Fv.s deleted file mode 100644 index 10349bf5cc1..00000000000 --- a/asm/d/d_item/item_getcheck_func_ZORAS_JEWEL__Fv.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_80099D8C: -/* 80099D8C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80099D90 7C 08 02 A6 */ mflr r0 -/* 80099D94 90 01 00 14 */ stw r0, 0x14(r1) -/* 80099D98 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80099D9C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80099DA0 38 63 00 9C */ addi r3, r3, 0x9c -/* 80099DA4 38 80 00 14 */ li r4, 0x14 -/* 80099DA8 38 A0 00 01 */ li r5, 1 -/* 80099DAC 4B F9 92 85 */ bl getItem__17dSv_player_item_cCFib -/* 80099DB0 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80099DB4 20 00 00 3D */ subfic r0, r0, 0x3d -/* 80099DB8 7C 00 00 34 */ cntlzw r0, r0 -/* 80099DBC 54 03 D9 7E */ srwi r3, r0, 5 -/* 80099DC0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80099DC4 7C 08 03 A6 */ mtlr r0 -/* 80099DC8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80099DCC 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/dStage_GetKeepDoorInfo__Fv.s b/asm/d/d_stage/dStage_GetKeepDoorInfo__Fv.s deleted file mode 100644 index be733a3b5c5..00000000000 --- a/asm/d/d_stage/dStage_GetKeepDoorInfo__Fv.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_80023EF4: -/* 80023EF4 3C 60 80 3F */ lis r3, DoorInfo@ha /* 0x803F4E74@ha */ -/* 80023EF8 38 63 4E 74 */ addi r3, r3, DoorInfo@l /* 0x803F4E74@l */ -/* 80023EFC 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/dStage_GetRoomKeepDoorInfo__Fv.s b/asm/d/d_stage/dStage_GetRoomKeepDoorInfo__Fv.s deleted file mode 100644 index 83a42c44bca..00000000000 --- a/asm/d/d_stage/dStage_GetRoomKeepDoorInfo__Fv.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_8002405C: -/* 8002405C 3C 60 80 3F */ lis r3, l_RoomKeepDoorInfo@ha /* 0x803F5784@ha */ -/* 80024060 38 63 57 84 */ addi r3, r3, l_RoomKeepDoorInfo@l /* 0x803F5784@l */ -/* 80024064 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/dStage_KeepDoorInfoInit__FP11dStage_dt_c.s b/asm/d/d_stage/dStage_KeepDoorInfoInit__FP11dStage_dt_c.s deleted file mode 100644 index 497212383f1..00000000000 --- a/asm/d/d_stage/dStage_KeepDoorInfoInit__FP11dStage_dt_c.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_80023F50: -/* 80023F50 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80023F54 7C 08 02 A6 */ mflr r0 -/* 80023F58 90 01 00 14 */ stw r0, 0x14(r1) -/* 80023F5C 4B FF FF A5 */ bl dStage_isBossStage__FP11dStage_dt_c -/* 80023F60 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80023F64 40 82 00 10 */ bne lbl_80023F74 -/* 80023F68 38 00 00 00 */ li r0, 0 -/* 80023F6C 3C 60 80 3F */ lis r3, DoorInfo@ha /* 0x803F4E74@ha */ -/* 80023F70 90 03 4E 74 */ stw r0, DoorInfo@l(r3) /* 0x803F4E74@l */ -lbl_80023F74: -/* 80023F74 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80023F78 7C 08 03 A6 */ mtlr r0 -/* 80023F7C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80023F80 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/dStage_initRoomKeepDoorInfo__Fv.s b/asm/d/d_stage/dStage_initRoomKeepDoorInfo__Fv.s deleted file mode 100644 index c57af0c4fc2..00000000000 --- a/asm/d/d_stage/dStage_initRoomKeepDoorInfo__Fv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_80024068: -/* 80024068 38 00 00 00 */ li r0, 0 -/* 8002406C 3C 60 80 3F */ lis r3, l_RoomKeepDoorInfo@ha /* 0x803F5784@ha */ -/* 80024070 90 03 57 84 */ stw r0, l_RoomKeepDoorInfo@l(r3) /* 0x803F5784@l */ -/* 80024074 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/dStage_isBossStage__FP11dStage_dt_c.s b/asm/d/d_stage/dStage_isBossStage__FP11dStage_dt_c.s deleted file mode 100644 index 01be76c6abf..00000000000 --- a/asm/d/d_stage/dStage_isBossStage__FP11dStage_dt_c.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_80023F00: -/* 80023F00 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80023F04 7C 08 02 A6 */ mflr r0 -/* 80023F08 90 01 00 14 */ stw r0, 0x14(r1) -/* 80023F0C 81 83 00 00 */ lwz r12, 0(r3) -/* 80023F10 81 8C 00 BC */ lwz r12, 0xbc(r12) -/* 80023F14 7D 89 03 A6 */ mtctr r12 -/* 80023F18 4E 80 04 21 */ bctrl -/* 80023F1C 28 03 00 00 */ cmplwi r3, 0 -/* 80023F20 40 82 00 0C */ bne lbl_80023F2C -/* 80023F24 38 60 00 00 */ li r3, 0 -/* 80023F28 48 00 00 18 */ b lbl_80023F40 -lbl_80023F2C: -/* 80023F2C 80 03 00 0C */ lwz r0, 0xc(r3) -/* 80023F30 54 00 87 7E */ rlwinm r0, r0, 0x10, 0x1d, 0x1f -/* 80023F34 20 00 00 03 */ subfic r0, r0, 3 -/* 80023F38 7C 00 00 34 */ cntlzw r0, r0 -/* 80023F3C 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f -lbl_80023F40: -/* 80023F40 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80023F44 7C 08 03 A6 */ mtlr r0 -/* 80023F48 38 21 00 10 */ addi r1, r1, 0x10 -/* 80023F4C 4E 80 00 20 */ blr diff --git a/asm/d/d_stage/set__18dStage_nextStage_cFPCcScsScScUc.s b/asm/d/d_stage/set__18dStage_nextStage_cFPCcScsScScUc.s deleted file mode 100644 index 78fed56be52..00000000000 --- a/asm/d/d_stage/set__18dStage_nextStage_cFPCcScsScScUc.s +++ /dev/null @@ -1,29 +0,0 @@ -lbl_80023E28: -/* 80023E28 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80023E2C 7C 08 02 A6 */ mflr r0 -/* 80023E30 90 01 00 14 */ stw r0, 0x14(r1) -/* 80023E34 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80023E38 7C 9F 23 78 */ mr r31, r4 -/* 80023E3C 88 03 00 0E */ lbz r0, 0xe(r3) -/* 80023E40 7C 00 07 75 */ extsb. r0, r0 -/* 80023E44 40 82 00 3C */ bne lbl_80023E80 -/* 80023E48 38 00 00 01 */ li r0, 1 -/* 80023E4C 98 03 00 0E */ stb r0, 0xe(r3) -/* 80023E50 99 03 00 0F */ stb r8, 0xf(r3) -/* 80023E54 99 23 00 10 */ stb r9, 0x10(r3) -/* 80023E58 48 00 03 45 */ bl set__19dStage_startStage_cFPCcScsSc -/* 80023E5C 7F E3 FB 78 */ mr r3, r31 -/* 80023E60 3C 80 80 38 */ lis r4, d_d_stage__stringBase0@ha /* 0x80378A50@ha */ -/* 80023E64 38 84 8A 50 */ addi r4, r4, d_d_stage__stringBase0@l /* 0x80378A50@l */ -/* 80023E68 48 34 4B 2D */ bl strcmp -/* 80023E6C 2C 03 00 00 */ cmpwi r3, 0 -/* 80023E70 40 82 00 10 */ bne lbl_80023E80 -/* 80023E74 38 00 00 01 */ li r0, 1 -/* 80023E78 80 6D 86 F8 */ lwz r3, mResetData__6mDoRst(r13) -/* 80023E7C 90 03 00 00 */ stw r0, 0(r3) -lbl_80023E80: -/* 80023E80 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80023E84 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80023E88 7C 08 03 A6 */ mtlr r0 -/* 80023E8C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80023E90 4E 80 00 20 */ blr diff --git a/asm/d/event/d_event/func_80041488.s b/asm/d/event/d_event/func_80041488.s deleted file mode 100644 index d342ec80fde..00000000000 --- a/asm/d/event/d_event/func_80041488.s +++ /dev/null @@ -1,63 +0,0 @@ -lbl_80041488: -/* 80041488 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8004148C 7C 08 02 A6 */ mflr r0 -/* 80041490 90 01 00 14 */ stw r0, 0x14(r1) -/* 80041494 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80041498 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8004149C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800414A0 3B E3 0D D8 */ addi r31, r3, 0xdd8 -/* 800414A4 7F E3 FB 78 */ mr r3, r31 -/* 800414A8 3C 80 80 38 */ lis r4, tempBitLabels__20dSv_event_tmp_flag_c@ha /* 0x803790C0@ha */ -/* 800414AC 38 84 90 C0 */ addi r4, r4, tempBitLabels__20dSv_event_tmp_flag_c@l /* 0x803790C0@l */ -/* 800414B0 A0 84 00 16 */ lhz r4, 0x16(r4) -/* 800414B4 4B FF 34 F1 */ bl offEventBit__11dSv_event_cFUs -/* 800414B8 7F E3 FB 78 */ mr r3, r31 -/* 800414BC 3C 80 80 38 */ lis r4, tempBitLabels__20dSv_event_tmp_flag_c@ha /* 0x803790C0@ha */ -/* 800414C0 38 84 90 C0 */ addi r4, r4, tempBitLabels__20dSv_event_tmp_flag_c@l /* 0x803790C0@l */ -/* 800414C4 A0 84 00 18 */ lhz r4, 0x18(r4) -/* 800414C8 4B FF 34 DD */ bl offEventBit__11dSv_event_cFUs -/* 800414CC 7F E3 FB 78 */ mr r3, r31 -/* 800414D0 3C 80 80 38 */ lis r4, tempBitLabels__20dSv_event_tmp_flag_c@ha /* 0x803790C0@ha */ -/* 800414D4 38 84 90 C0 */ addi r4, r4, tempBitLabels__20dSv_event_tmp_flag_c@l /* 0x803790C0@l */ -/* 800414D8 A0 84 00 1A */ lhz r4, 0x1a(r4) -/* 800414DC 4B FF 34 C9 */ bl offEventBit__11dSv_event_cFUs -/* 800414E0 7F E3 FB 78 */ mr r3, r31 -/* 800414E4 3C 80 80 38 */ lis r4, tempBitLabels__20dSv_event_tmp_flag_c@ha /* 0x803790C0@ha */ -/* 800414E8 38 84 90 C0 */ addi r4, r4, tempBitLabels__20dSv_event_tmp_flag_c@l /* 0x803790C0@l */ -/* 800414EC A0 84 00 1C */ lhz r4, 0x1c(r4) -/* 800414F0 4B FF 34 B5 */ bl offEventBit__11dSv_event_cFUs -/* 800414F4 7F E3 FB 78 */ mr r3, r31 -/* 800414F8 3C 80 80 38 */ lis r4, tempBitLabels__20dSv_event_tmp_flag_c@ha /* 0x803790C0@ha */ -/* 800414FC 38 84 90 C0 */ addi r4, r4, tempBitLabels__20dSv_event_tmp_flag_c@l /* 0x803790C0@l */ -/* 80041500 A0 84 00 1E */ lhz r4, 0x1e(r4) -/* 80041504 4B FF 34 A1 */ bl offEventBit__11dSv_event_cFUs -/* 80041508 7F E3 FB 78 */ mr r3, r31 -/* 8004150C 3C 80 80 38 */ lis r4, tempBitLabels__20dSv_event_tmp_flag_c@ha /* 0x803790C0@ha */ -/* 80041510 38 84 90 C0 */ addi r4, r4, tempBitLabels__20dSv_event_tmp_flag_c@l /* 0x803790C0@l */ -/* 80041514 A0 84 00 66 */ lhz r4, 0x66(r4) -/* 80041518 4B FF 34 8D */ bl offEventBit__11dSv_event_cFUs -/* 8004151C 7F E3 FB 78 */ mr r3, r31 -/* 80041520 3C 80 80 38 */ lis r4, tempBitLabels__20dSv_event_tmp_flag_c@ha /* 0x803790C0@ha */ -/* 80041524 38 84 90 C0 */ addi r4, r4, tempBitLabels__20dSv_event_tmp_flag_c@l /* 0x803790C0@l */ -/* 80041528 A0 84 00 68 */ lhz r4, 0x68(r4) -/* 8004152C 4B FF 34 79 */ bl offEventBit__11dSv_event_cFUs -/* 80041530 7F E3 FB 78 */ mr r3, r31 -/* 80041534 3C 80 80 38 */ lis r4, tempBitLabels__20dSv_event_tmp_flag_c@ha /* 0x803790C0@ha */ -/* 80041538 38 84 90 C0 */ addi r4, r4, tempBitLabels__20dSv_event_tmp_flag_c@l /* 0x803790C0@l */ -/* 8004153C A0 84 00 6A */ lhz r4, 0x6a(r4) -/* 80041540 4B FF 34 65 */ bl offEventBit__11dSv_event_cFUs -/* 80041544 7F E3 FB 78 */ mr r3, r31 -/* 80041548 3C 80 80 38 */ lis r4, tempBitLabels__20dSv_event_tmp_flag_c@ha /* 0x803790C0@ha */ -/* 8004154C 38 84 90 C0 */ addi r4, r4, tempBitLabels__20dSv_event_tmp_flag_c@l /* 0x803790C0@l */ -/* 80041550 A0 84 00 6C */ lhz r4, 0x6c(r4) -/* 80041554 4B FF 34 51 */ bl offEventBit__11dSv_event_cFUs -/* 80041558 7F E3 FB 78 */ mr r3, r31 -/* 8004155C 3C 80 80 38 */ lis r4, tempBitLabels__20dSv_event_tmp_flag_c@ha /* 0x803790C0@ha */ -/* 80041560 38 84 90 C0 */ addi r4, r4, tempBitLabels__20dSv_event_tmp_flag_c@l /* 0x803790C0@l */ -/* 80041564 A0 84 00 6E */ lhz r4, 0x6e(r4) -/* 80041568 4B FF 34 3D */ bl offEventBit__11dSv_event_cFUs -/* 8004156C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80041570 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80041574 7C 08 03 A6 */ mtlr r0 -/* 80041578 38 21 00 10 */ addi r1, r1, 0x10 -/* 8004157C 4E 80 00 20 */ blr diff --git a/asm/d/event/d_event/orderOld__14dEvt_control_cFUsUsUsUsPvPvPCv.s b/asm/d/event/d_event/orderOld__14dEvt_control_cFUsUsUsUsPvPvPCv.s deleted file mode 100644 index c9c21f96fe9..00000000000 --- a/asm/d/event/d_event/orderOld__14dEvt_control_cFUsUsUsUsPvPvPCv.s +++ /dev/null @@ -1,37 +0,0 @@ -lbl_800415D8: -/* 800415D8 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 800415DC 7C 08 02 A6 */ mflr r0 -/* 800415E0 90 01 00 34 */ stw r0, 0x34(r1) -/* 800415E4 39 61 00 30 */ addi r11, r1, 0x30 -/* 800415E8 48 32 0B E5 */ bl _savegpr_25 -/* 800415EC 7C 79 1B 78 */ mr r25, r3 -/* 800415F0 7C 9A 23 78 */ mr r26, r4 -/* 800415F4 7C BB 2B 78 */ mr r27, r5 -/* 800415F8 7C DC 33 78 */ mr r28, r6 -/* 800415FC 7C FD 3B 78 */ mr r29, r7 -/* 80041600 7D 1E 43 78 */ mr r30, r8 -/* 80041604 7D 3F 4B 78 */ mr r31, r9 -/* 80041608 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8004160C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80041610 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 80041614 7D 44 53 78 */ mr r4, r10 -/* 80041618 38 A0 00 FF */ li r5, 0xff -/* 8004161C 38 C0 FF FF */ li r6, -1 -/* 80041620 48 00 5E F5 */ bl getEventIdx__16dEvent_manager_cFPCcUcl -/* 80041624 7C 6A 07 34 */ extsh r10, r3 -/* 80041628 38 00 00 FF */ li r0, 0xff -/* 8004162C 90 01 00 08 */ stw r0, 8(r1) -/* 80041630 7F 23 CB 78 */ mr r3, r25 -/* 80041634 7F 44 D3 78 */ mr r4, r26 -/* 80041638 7F 65 DB 78 */ mr r5, r27 -/* 8004163C 7F 86 E3 78 */ mr r6, r28 -/* 80041640 7F A7 EB 78 */ mr r7, r29 -/* 80041644 7F C8 F3 78 */ mr r8, r30 -/* 80041648 7F E9 FB 78 */ mr r9, r31 -/* 8004164C 48 00 00 1D */ bl order__14dEvt_control_cFUsUsUsUsPvPvsUc -/* 80041650 39 61 00 30 */ addi r11, r1, 0x30 -/* 80041654 48 32 0B C5 */ bl _restgpr_25 -/* 80041658 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8004165C 7C 08 03 A6 */ mtlr r0 -/* 80041660 38 21 00 30 */ addi r1, r1, 0x30 -/* 80041664 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save/addBottleNum__24dSv_player_item_record_cFUcs.s b/asm/d/save/d_save/addBottleNum__24dSv_player_item_record_cFUcs.s deleted file mode 100644 index fcada294383..00000000000 --- a/asm/d/save/d_save/addBottleNum__24dSv_player_item_record_cFUcs.s +++ /dev/null @@ -1,41 +0,0 @@ -lbl_80033F9C: -/* 80033F9C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80033FA0 7C 08 02 A6 */ mflr r0 -/* 80033FA4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80033FA8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80033FAC 93 C1 00 08 */ stw r30, 8(r1) -/* 80033FB0 54 80 06 3E */ clrlwi r0, r4, 0x18 -/* 80033FB4 7F E3 02 14 */ add r31, r3, r0 -/* 80033FB8 88 7F 00 04 */ lbz r3, 4(r31) -/* 80033FBC 7C A0 07 34 */ extsh r0, r5 -/* 80033FC0 7F C3 02 14 */ add r30, r3, r0 -/* 80033FC4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80033FC8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80033FCC 38 63 00 9C */ addi r3, r3, 0x9c -/* 80033FD0 38 04 00 0B */ addi r0, r4, 0xb -/* 80033FD4 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 80033FD8 38 A0 00 01 */ li r5, 1 -/* 80033FDC 4B FF F0 55 */ bl getItem__17dSv_player_item_cCFib -/* 80033FE0 2C 1E 00 00 */ cmpwi r30, 0 -/* 80033FE4 40 80 00 10 */ bge lbl_80033FF4 -/* 80033FE8 38 00 00 00 */ li r0, 0 -/* 80033FEC 98 1F 00 04 */ stb r0, 4(r31) -/* 80033FF0 48 00 00 24 */ b lbl_80034014 -lbl_80033FF4: -/* 80033FF4 4B FF A5 C5 */ bl dComIfGs_getBottleMax__Fv -/* 80033FF8 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80033FFC 7C 1E 00 00 */ cmpw r30, r0 -/* 80034000 40 81 00 10 */ ble lbl_80034010 -/* 80034004 4B FF A5 B5 */ bl dComIfGs_getBottleMax__Fv -/* 80034008 98 7F 00 04 */ stb r3, 4(r31) -/* 8003400C 48 00 00 08 */ b lbl_80034014 -lbl_80034010: -/* 80034010 9B DF 00 04 */ stb r30, 4(r31) -lbl_80034014: -/* 80034014 88 7F 00 04 */ lbz r3, 4(r31) -/* 80034018 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8003401C 83 C1 00 08 */ lwz r30, 8(r1) -/* 80034020 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80034024 7C 08 03 A6 */ mtlr r0 -/* 80034028 38 21 00 10 */ addi r1, r1, 0x10 -/* 8003402C 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save/checkInsectBottle__17dSv_player_item_cFv.s b/asm/d/save/d_save/checkInsectBottle__17dSv_player_item_cFv.s deleted file mode 100644 index c9dccae7cba..00000000000 --- a/asm/d/save/d_save/checkInsectBottle__17dSv_player_item_cFv.s +++ /dev/null @@ -1,42 +0,0 @@ -lbl_80033754: -/* 80033754 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80033758 7C 08 02 A6 */ mflr r0 -/* 8003375C 90 01 00 24 */ stw r0, 0x24(r1) -/* 80033760 39 61 00 20 */ addi r11, r1, 0x20 -/* 80033764 48 32 EA 71 */ bl _savegpr_27 -/* 80033768 3B 60 00 00 */ li r27, 0 -/* 8003376C 3B E0 00 00 */ li r31, 0 -/* 80033770 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80033774 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80033778 3B A3 00 CC */ addi r29, r3, 0xcc -/* 8003377C 3B 83 07 F0 */ addi r28, r3, 0x7f0 -/* 80033780 3C 60 80 3A */ lis r3, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 80033784 3B C3 72 88 */ addi r30, r3, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -lbl_80033788: -/* 80033788 7F A3 EB 78 */ mr r3, r29 -/* 8003378C 38 1B 00 C0 */ addi r0, r27, 0xc0 -/* 80033790 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 80033794 48 00 07 35 */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 80033798 2C 03 00 00 */ cmpwi r3, 0 -/* 8003379C 41 82 00 24 */ beq lbl_800337C0 -/* 800337A0 7F 83 E3 78 */ mr r3, r28 -/* 800337A4 7C 9E FA 14 */ add r4, r30, r31 -/* 800337A8 A0 84 03 22 */ lhz r4, 0x322(r4) -/* 800337AC 48 00 12 11 */ bl isEventBit__11dSv_event_cCFUs -/* 800337B0 2C 03 00 00 */ cmpwi r3, 0 -/* 800337B4 40 82 00 0C */ bne lbl_800337C0 -/* 800337B8 38 60 00 01 */ li r3, 1 -/* 800337BC 48 00 00 18 */ b lbl_800337D4 -lbl_800337C0: -/* 800337C0 3B 7B 00 01 */ addi r27, r27, 1 -/* 800337C4 2C 1B 00 18 */ cmpwi r27, 0x18 -/* 800337C8 3B FF 00 02 */ addi r31, r31, 2 -/* 800337CC 41 80 FF BC */ blt lbl_80033788 -/* 800337D0 38 60 00 00 */ li r3, 0 -lbl_800337D4: -/* 800337D4 39 61 00 20 */ addi r11, r1, 0x20 -/* 800337D8 48 32 EA 49 */ bl _restgpr_27 -/* 800337DC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800337E0 7C 08 03 A6 */ mtlr r0 -/* 800337E4 38 21 00 20 */ addi r1, r1, 0x20 -/* 800337E8 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save/checkVibration__19dSv_player_config_cCFv.s b/asm/d/save/d_save/checkVibration__19dSv_player_config_cCFv.s deleted file mode 100644 index 56dd78bdfeb..00000000000 --- a/asm/d/save/d_save/checkVibration__19dSv_player_config_cCFv.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_80034644: -/* 80034644 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80034648 7C 08 02 A6 */ mflr r0 -/* 8003464C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80034650 80 0D 8F 60 */ lwz r0, sRumbleSupported__10JUTGamePad(r13) -/* 80034654 54 00 00 01 */ rlwinm. r0, r0, 0, 0, 0 -/* 80034658 41 82 00 18 */ beq lbl_80034670 -/* 8003465C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80034660 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80034664 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80034668 4B FF 6D 49 */ bl getNowVibration__14dComIfG_play_cFv -/* 8003466C 48 00 00 08 */ b lbl_80034674 -lbl_80034670: -/* 80034670 38 60 00 00 */ li r3, 0 -lbl_80034674: -/* 80034674 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80034678 7C 08 03 A6 */ mtlr r0 -/* 8003467C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80034680 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save/getBombNum__21dSv_player_item_max_cCFUc.s b/asm/d/save/d_save/getBombNum__21dSv_player_item_max_cCFUc.s deleted file mode 100644 index b83ba0b37de..00000000000 --- a/asm/d/save/d_save/getBombNum__21dSv_player_item_max_cCFUc.s +++ /dev/null @@ -1,53 +0,0 @@ -lbl_800340F8: -/* 800340F8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 800340FC 7C 08 02 A6 */ mflr r0 -/* 80034100 90 01 00 24 */ stw r0, 0x24(r1) -/* 80034104 39 61 00 20 */ addi r11, r1, 0x20 -/* 80034108 48 32 E0 D5 */ bl _savegpr_29 -/* 8003410C 7C 7D 1B 78 */ mr r29, r3 -/* 80034110 7C 9E 23 78 */ mr r30, r4 -/* 80034114 3B E0 00 01 */ li r31, 1 -/* 80034118 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8003411C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80034120 38 63 00 CC */ addi r3, r3, 0xcc -/* 80034124 38 80 00 4F */ li r4, 0x4f -/* 80034128 4B FF FD A1 */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 8003412C 2C 03 00 00 */ cmpwi r3, 0 -/* 80034130 41 82 00 08 */ beq lbl_80034138 -/* 80034134 3B E0 00 02 */ li r31, 2 -lbl_80034138: -/* 80034138 57 C0 06 3E */ clrlwi r0, r30, 0x18 -/* 8003413C 2C 00 00 71 */ cmpwi r0, 0x71 -/* 80034140 41 82 00 30 */ beq lbl_80034170 -/* 80034144 40 80 00 10 */ bge lbl_80034154 -/* 80034148 2C 00 00 70 */ cmpwi r0, 0x70 -/* 8003414C 40 80 00 14 */ bge lbl_80034160 -/* 80034150 48 00 00 40 */ b lbl_80034190 -lbl_80034154: -/* 80034154 2C 00 00 73 */ cmpwi r0, 0x73 -/* 80034158 40 80 00 38 */ bge lbl_80034190 -/* 8003415C 48 00 00 24 */ b lbl_80034180 -lbl_80034160: -/* 80034160 88 1D 00 01 */ lbz r0, 1(r29) -/* 80034164 7C 00 F9 D6 */ mullw r0, r0, r31 -/* 80034168 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 8003416C 48 00 00 28 */ b lbl_80034194 -lbl_80034170: -/* 80034170 88 1D 00 02 */ lbz r0, 2(r29) -/* 80034174 7C 00 F9 D6 */ mullw r0, r0, r31 -/* 80034178 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 8003417C 48 00 00 18 */ b lbl_80034194 -lbl_80034180: -/* 80034180 88 1D 00 06 */ lbz r0, 6(r29) -/* 80034184 7C 00 F9 D6 */ mullw r0, r0, r31 -/* 80034188 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 8003418C 48 00 00 08 */ b lbl_80034194 -lbl_80034190: -/* 80034190 38 60 00 00 */ li r3, 0 -lbl_80034194: -/* 80034194 39 61 00 20 */ addi r11, r1, 0x20 -/* 80034198 48 32 E0 91 */ bl _restgpr_29 -/* 8003419C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800341A0 7C 08 03 A6 */ mtlr r0 -/* 800341A4 38 21 00 20 */ addi r1, r1, 0x20 -/* 800341A8 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save/getItem__17dSv_player_item_cCFib.s b/asm/d/save/d_save/getItem__17dSv_player_item_cCFib.s deleted file mode 100644 index 05bc385bae3..00000000000 --- a/asm/d/save/d_save/getItem__17dSv_player_item_cCFib.s +++ /dev/null @@ -1,207 +0,0 @@ -lbl_80033030: -/* 80033030 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80033034 7C 08 02 A6 */ mflr r0 -/* 80033038 90 01 00 24 */ stw r0, 0x24(r1) -/* 8003303C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80033040 48 32 F1 91 */ bl _savegpr_26 -/* 80033044 7C 7A 1B 78 */ mr r26, r3 -/* 80033048 7C 9B 23 78 */ mr r27, r4 -/* 8003304C 2C 1B 00 18 */ cmpwi r27, 0x18 -/* 80033050 40 80 02 8C */ bge lbl_800332DC -/* 80033054 54 A0 06 3F */ clrlwi. r0, r5, 0x18 -/* 80033058 41 82 02 7C */ beq lbl_800332D4 -/* 8003305C 3B C0 00 00 */ li r30, 0 -/* 80033060 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80033064 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -lbl_80033068: -/* 80033068 7F E3 FB 78 */ mr r3, r31 -/* 8003306C 7F C4 F3 78 */ mr r4, r30 -/* 80033070 4B FF F9 ED */ bl getSelectItemIndex__21dSv_player_status_a_cCFi -/* 80033074 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80033078 7C 1B 00 00 */ cmpw r27, r0 -/* 8003307C 41 82 00 18 */ beq lbl_80033094 -/* 80033080 7F C3 F3 78 */ mr r3, r30 -/* 80033084 4B FF AD 45 */ bl dComIfGs_getMixItemIndex__Fi -/* 80033088 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8003308C 7C 1B 00 00 */ cmpw r27, r0 -/* 80033090 40 82 02 38 */ bne lbl_800332C8 -lbl_80033094: -/* 80033094 7F C3 F3 78 */ mr r3, r30 -/* 80033098 4B FF AD 31 */ bl dComIfGs_getMixItemIndex__Fi -/* 8003309C 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 800330A0 28 00 00 FF */ cmplwi r0, 0xff -/* 800330A4 41 82 02 24 */ beq lbl_800332C8 -/* 800330A8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800330AC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800330B0 7F C4 F3 78 */ mr r4, r30 -/* 800330B4 4B FF F9 A9 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi -/* 800330B8 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 800330BC 7F BA 00 AE */ lbzx r29, r26, r0 -/* 800330C0 7F C3 F3 78 */ mr r3, r30 -/* 800330C4 4B FF AD 05 */ bl dComIfGs_getMixItemIndex__Fi -/* 800330C8 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 800330CC 7C 7A 00 AE */ lbzx r3, r26, r0 -/* 800330D0 7C 7C 1B 78 */ mr r28, r3 -/* 800330D4 57 A0 06 3E */ clrlwi r0, r29, 0x18 -/* 800330D8 28 00 00 43 */ cmplwi r0, 0x43 -/* 800330DC 40 82 00 10 */ bne lbl_800330EC -/* 800330E0 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 800330E4 28 00 00 70 */ cmplwi r0, 0x70 -/* 800330E8 41 82 00 1C */ beq lbl_80033104 -lbl_800330EC: -/* 800330EC 57 80 06 3E */ clrlwi r0, r28, 0x18 -/* 800330F0 28 00 00 43 */ cmplwi r0, 0x43 -/* 800330F4 40 82 00 18 */ bne lbl_8003310C -/* 800330F8 57 A0 06 3E */ clrlwi r0, r29, 0x18 -/* 800330FC 28 00 00 70 */ cmplwi r0, 0x70 -/* 80033100 40 82 00 0C */ bne lbl_8003310C -lbl_80033104: -/* 80033104 38 60 00 59 */ li r3, 0x59 -/* 80033108 48 00 01 D8 */ b lbl_800332E0 -lbl_8003310C: -/* 8003310C 57 A0 06 3E */ clrlwi r0, r29, 0x18 -/* 80033110 28 00 00 43 */ cmplwi r0, 0x43 -/* 80033114 40 82 00 10 */ bne lbl_80033124 -/* 80033118 57 80 06 3E */ clrlwi r0, r28, 0x18 -/* 8003311C 28 00 00 71 */ cmplwi r0, 0x71 -/* 80033120 41 82 00 1C */ beq lbl_8003313C -lbl_80033124: -/* 80033124 57 80 06 3E */ clrlwi r0, r28, 0x18 -/* 80033128 28 00 00 43 */ cmplwi r0, 0x43 -/* 8003312C 40 82 00 18 */ bne lbl_80033144 -/* 80033130 57 A0 06 3E */ clrlwi r0, r29, 0x18 -/* 80033134 28 00 00 71 */ cmplwi r0, 0x71 -/* 80033138 40 82 00 0C */ bne lbl_80033144 -lbl_8003313C: -/* 8003313C 38 60 00 59 */ li r3, 0x59 -/* 80033140 48 00 01 A0 */ b lbl_800332E0 -lbl_80033144: -/* 80033144 57 A0 06 3E */ clrlwi r0, r29, 0x18 -/* 80033148 28 00 00 43 */ cmplwi r0, 0x43 -/* 8003314C 40 82 00 10 */ bne lbl_8003315C -/* 80033150 57 80 06 3E */ clrlwi r0, r28, 0x18 -/* 80033154 28 00 00 72 */ cmplwi r0, 0x72 -/* 80033158 41 82 00 1C */ beq lbl_80033174 -lbl_8003315C: -/* 8003315C 57 80 06 3E */ clrlwi r0, r28, 0x18 -/* 80033160 28 00 00 43 */ cmplwi r0, 0x43 -/* 80033164 40 82 00 18 */ bne lbl_8003317C -/* 80033168 57 A0 06 3E */ clrlwi r0, r29, 0x18 -/* 8003316C 28 00 00 72 */ cmplwi r0, 0x72 -/* 80033170 40 82 00 0C */ bne lbl_8003317C -lbl_80033174: -/* 80033174 38 60 00 59 */ li r3, 0x59 -/* 80033178 48 00 01 68 */ b lbl_800332E0 -lbl_8003317C: -/* 8003317C 57 A0 06 3E */ clrlwi r0, r29, 0x18 -/* 80033180 28 00 00 43 */ cmplwi r0, 0x43 -/* 80033184 40 82 00 10 */ bne lbl_80033194 -/* 80033188 57 80 06 3E */ clrlwi r0, r28, 0x18 -/* 8003318C 28 00 00 3E */ cmplwi r0, 0x3e -/* 80033190 41 82 00 1C */ beq lbl_800331AC -lbl_80033194: -/* 80033194 57 80 06 3E */ clrlwi r0, r28, 0x18 -/* 80033198 28 00 00 43 */ cmplwi r0, 0x43 -/* 8003319C 40 82 00 18 */ bne lbl_800331B4 -/* 800331A0 57 A0 06 3E */ clrlwi r0, r29, 0x18 -/* 800331A4 28 00 00 3E */ cmplwi r0, 0x3e -/* 800331A8 40 82 00 0C */ bne lbl_800331B4 -lbl_800331AC: -/* 800331AC 38 60 00 5A */ li r3, 0x5a -/* 800331B0 48 00 01 30 */ b lbl_800332E0 -lbl_800331B4: -/* 800331B4 57 A0 06 3E */ clrlwi r0, r29, 0x18 -/* 800331B8 28 00 00 4A */ cmplwi r0, 0x4a -/* 800331BC 40 82 00 10 */ bne lbl_800331CC -/* 800331C0 57 80 06 3E */ clrlwi r0, r28, 0x18 -/* 800331C4 28 00 00 76 */ cmplwi r0, 0x76 -/* 800331C8 41 82 00 1C */ beq lbl_800331E4 -lbl_800331CC: -/* 800331CC 57 80 06 3E */ clrlwi r0, r28, 0x18 -/* 800331D0 28 00 00 4A */ cmplwi r0, 0x4a -/* 800331D4 40 82 00 18 */ bne lbl_800331EC -/* 800331D8 57 A0 06 3E */ clrlwi r0, r29, 0x18 -/* 800331DC 28 00 00 76 */ cmplwi r0, 0x76 -/* 800331E0 40 82 00 0C */ bne lbl_800331EC -lbl_800331E4: -/* 800331E4 38 60 00 5B */ li r3, 0x5b -/* 800331E8 48 00 00 F8 */ b lbl_800332E0 -lbl_800331EC: -/* 800331EC 57 A0 06 3E */ clrlwi r0, r29, 0x18 -/* 800331F0 28 00 00 4A */ cmplwi r0, 0x4a -/* 800331F4 40 82 00 10 */ bne lbl_80033204 -/* 800331F8 57 80 06 3E */ clrlwi r0, r28, 0x18 -/* 800331FC 28 00 00 3D */ cmplwi r0, 0x3d -/* 80033200 41 82 00 1C */ beq lbl_8003321C -lbl_80033204: -/* 80033204 57 80 06 3E */ clrlwi r0, r28, 0x18 -/* 80033208 28 00 00 4A */ cmplwi r0, 0x4a -/* 8003320C 40 82 00 18 */ bne lbl_80033224 -/* 80033210 57 A0 06 3E */ clrlwi r0, r29, 0x18 -/* 80033214 28 00 00 3D */ cmplwi r0, 0x3d -/* 80033218 40 82 00 0C */ bne lbl_80033224 -lbl_8003321C: -/* 8003321C 38 60 00 5C */ li r3, 0x5c -/* 80033220 48 00 00 C0 */ b lbl_800332E0 -lbl_80033224: -/* 80033224 57 A0 06 3E */ clrlwi r0, r29, 0x18 -/* 80033228 28 00 00 4A */ cmplwi r0, 0x4a -/* 8003322C 40 82 00 10 */ bne lbl_8003323C -/* 80033230 57 80 06 3E */ clrlwi r0, r28, 0x18 -/* 80033234 28 00 00 74 */ cmplwi r0, 0x74 -/* 80033238 41 82 00 1C */ beq lbl_80033254 -lbl_8003323C: -/* 8003323C 57 80 06 3E */ clrlwi r0, r28, 0x18 -/* 80033240 28 00 00 4A */ cmplwi r0, 0x4a -/* 80033244 40 82 00 18 */ bne lbl_8003325C -/* 80033248 57 A0 06 3E */ clrlwi r0, r29, 0x18 -/* 8003324C 28 00 00 74 */ cmplwi r0, 0x74 -/* 80033250 40 82 00 0C */ bne lbl_8003325C -lbl_80033254: -/* 80033254 38 60 00 5D */ li r3, 0x5d -/* 80033258 48 00 00 88 */ b lbl_800332E0 -lbl_8003325C: -/* 8003325C 2C 1E 00 03 */ cmpwi r30, 3 -/* 80033260 40 82 00 4C */ bne lbl_800332AC -/* 80033264 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80033268 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8003326C 7F C4 F3 78 */ mr r4, r30 -/* 80033270 4B FF F7 ED */ bl getSelectItemIndex__21dSv_player_status_a_cCFi -/* 80033274 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80033278 40 82 00 34 */ bne lbl_800332AC -/* 8003327C 7F C3 F3 78 */ mr r3, r30 -/* 80033280 4B FF AB 49 */ bl dComIfGs_getMixItemIndex__Fi -/* 80033284 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80033288 40 82 00 24 */ bne lbl_800332AC -/* 8003328C 7F C3 F3 78 */ mr r3, r30 -/* 80033290 38 80 00 FF */ li r4, 0xff -/* 80033294 4B FF AA 31 */ bl dComIfGs_setSelectItemIndex__FiUc -/* 80033298 7F C3 F3 78 */ mr r3, r30 -/* 8003329C 38 80 00 FF */ li r4, 0xff -/* 800332A0 4B FF AA 69 */ bl dComIfGs_setMixItemIndex__FiUc -/* 800332A4 38 60 00 FF */ li r3, 0xff -/* 800332A8 48 00 00 38 */ b lbl_800332E0 -lbl_800332AC: -/* 800332AC 3C 60 80 38 */ lis r3, d_save_d_save__stringBase0@ha /* 0x80379234@ha */ -/* 800332B0 38 63 92 34 */ addi r3, r3, d_save_d_save__stringBase0@l /* 0x80379234@l */ -/* 800332B4 38 63 00 09 */ addi r3, r3, 9 -/* 800332B8 57 A4 06 3E */ clrlwi r4, r29, 0x18 -/* 800332BC 57 85 06 3E */ clrlwi r5, r28, 0x18 -/* 800332C0 4C C6 31 82 */ crclr 6 -/* 800332C4 4B FD 39 49 */ bl OSReport_Error -lbl_800332C8: -/* 800332C8 3B DE 00 01 */ addi r30, r30, 1 -/* 800332CC 2C 1E 00 02 */ cmpwi r30, 2 -/* 800332D0 41 80 FD 98 */ blt lbl_80033068 -lbl_800332D4: -/* 800332D4 7C 7A D8 AE */ lbzx r3, r26, r27 -/* 800332D8 48 00 00 08 */ b lbl_800332E0 -lbl_800332DC: -/* 800332DC 38 60 00 FF */ li r3, 0xff -lbl_800332E0: -/* 800332E0 39 61 00 20 */ addi r11, r1, 0x20 -/* 800332E4 48 32 EF 39 */ bl _restgpr_26 -/* 800332E8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800332EC 7C 08 03 A6 */ mtlr r0 -/* 800332F0 38 21 00 20 */ addi r1, r1, 0x20 -/* 800332F4 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save/getSave__10dSv_info_cFi.s b/asm/d/save/d_save/getSave__10dSv_info_cFi.s deleted file mode 100644 index ec8f34e8ad4..00000000000 --- a/asm/d/save/d_save/getSave__10dSv_info_cFi.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_800350BC: -/* 800350BC 54 84 28 34 */ slwi r4, r4, 5 -/* 800350C0 38 84 01 F0 */ addi r4, r4, 0x1f0 -/* 800350C4 7C 83 22 14 */ add r4, r3, r4 -/* 800350C8 38 A3 09 54 */ addi r5, r3, 0x954 -/* 800350CC 38 84 FF FC */ addi r4, r4, -4 -/* 800350D0 38 00 00 04 */ li r0, 4 -/* 800350D4 7C 09 03 A6 */ mtctr r0 -lbl_800350D8: -/* 800350D8 80 64 00 04 */ lwz r3, 4(r4) -/* 800350DC 84 04 00 08 */ lwzu r0, 8(r4) -/* 800350E0 90 65 00 04 */ stw r3, 4(r5) -/* 800350E4 94 05 00 08 */ stwu r0, 8(r5) -/* 800350E8 42 00 FF F0 */ bdnz lbl_800350D8 -/* 800350EC 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save/init__17dSv_horse_place_cFv.s b/asm/d/save/d_save/init__17dSv_horse_place_cFv.s deleted file mode 100644 index ee41a1d309d..00000000000 --- a/asm/d/save/d_save/init__17dSv_horse_place_cFv.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_80032C0C: -/* 80032C0C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80032C10 7C 08 02 A6 */ mflr r0 -/* 80032C14 90 01 00 14 */ stw r0, 0x14(r1) -/* 80032C18 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80032C1C 7C 7F 1B 78 */ mr r31, r3 -/* 80032C20 38 7F 00 0E */ addi r3, r31, 0xe -/* 80032C24 3C 80 80 38 */ lis r4, d_save_d_save__stringBase0@ha /* 0x80379234@ha */ -/* 80032C28 38 84 92 34 */ addi r4, r4, d_save_d_save__stringBase0@l /* 0x80379234@l */ -/* 80032C2C 48 33 5F 01 */ bl strcpy -/* 80032C30 C0 02 83 5C */ lfs f0, lit_3813(r2) -/* 80032C34 D0 1F 00 00 */ stfs f0, 0(r31) -/* 80032C38 D0 1F 00 04 */ stfs f0, 4(r31) -/* 80032C3C D0 1F 00 08 */ stfs f0, 8(r31) -/* 80032C40 38 00 00 00 */ li r0, 0 -/* 80032C44 B0 1F 00 0C */ sth r0, 0xc(r31) -/* 80032C48 98 1F 00 16 */ stb r0, 0x16(r31) -/* 80032C4C 98 1F 00 17 */ stb r0, 0x17(r31) -/* 80032C50 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80032C54 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80032C58 7C 08 03 A6 */ mtlr r0 -/* 80032C5C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80032C60 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save/init__17dSv_player_info_cFv.s b/asm/d/save/d_save/init__17dSv_player_info_cFv.s deleted file mode 100644 index 6d21dc6e70e..00000000000 --- a/asm/d/save/d_save/init__17dSv_player_info_cFv.s +++ /dev/null @@ -1,39 +0,0 @@ -lbl_80034518: -/* 80034518 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8003451C 7C 08 02 A6 */ mflr r0 -/* 80034520 90 01 00 14 */ stw r0, 0x14(r1) -/* 80034524 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80034528 7C 7F 1B 78 */ mr r31, r3 -/* 8003452C 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 80034530 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 80034534 38 80 03 82 */ li r4, 0x382 -/* 80034538 38 BF 00 14 */ addi r5, r31, 0x14 -/* 8003453C 38 C0 00 00 */ li r6, 0 -/* 80034540 48 1E 7D 11 */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c -/* 80034544 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 80034548 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 8003454C 38 80 03 83 */ li r4, 0x383 -/* 80034550 38 BF 00 25 */ addi r5, r31, 0x25 -/* 80034554 38 C0 00 00 */ li r6, 0 -/* 80034558 48 1E 7C F9 */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c -/* 8003455C 38 60 00 00 */ li r3, 0 -/* 80034560 90 7F 00 04 */ stw r3, 4(r31) -/* 80034564 90 7F 00 00 */ stw r3, 0(r31) -/* 80034568 90 7F 00 0C */ stw r3, 0xc(r31) -/* 8003456C 90 7F 00 08 */ stw r3, 8(r31) -/* 80034570 B0 7F 00 10 */ sth r3, 0x10(r31) -/* 80034574 B0 7F 00 12 */ sth r3, 0x12(r31) -/* 80034578 98 7F 00 36 */ stb r3, 0x36(r31) -/* 8003457C 38 80 00 00 */ li r4, 0 -/* 80034580 38 00 00 05 */ li r0, 5 -/* 80034584 7C 09 03 A6 */ mtctr r0 -lbl_80034588: -/* 80034588 38 04 00 37 */ addi r0, r4, 0x37 -/* 8003458C 7C 7F 01 AE */ stbx r3, r31, r0 -/* 80034590 38 84 00 01 */ addi r4, r4, 1 -/* 80034594 42 00 FF F4 */ bdnz lbl_80034588 -/* 80034598 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8003459C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800345A0 7C 08 03 A6 */ mtlr r0 -/* 800345A4 38 21 00 10 */ addi r1, r1, 0x10 -/* 800345A8 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save/init__19dSv_player_config_cFv.s b/asm/d/save/d_save/init__19dSv_player_config_cFv.s deleted file mode 100644 index 865092d5679..00000000000 --- a/asm/d/save/d_save/init__19dSv_player_config_cFv.s +++ /dev/null @@ -1,41 +0,0 @@ -lbl_800345AC: -/* 800345AC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800345B0 7C 08 02 A6 */ mflr r0 -/* 800345B4 90 01 00 14 */ stw r0, 0x14(r1) -/* 800345B8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800345BC 7C 7F 1B 78 */ mr r31, r3 -/* 800345C0 38 00 00 01 */ li r0, 1 -/* 800345C4 98 03 00 00 */ stb r0, 0(r3) -/* 800345C8 48 30 BF C9 */ bl OSGetSoundMode -/* 800345CC 28 03 00 00 */ cmplwi r3, 0 -/* 800345D0 40 82 00 1C */ bne lbl_800345EC -/* 800345D4 38 00 00 00 */ li r0, 0 -/* 800345D8 98 1F 00 01 */ stb r0, 1(r31) -/* 800345DC 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 800345E0 38 80 00 00 */ li r4, 0 -/* 800345E4 48 29 92 A5 */ bl setOutputMode__10Z2AudioMgrFUl -/* 800345E8 48 00 00 18 */ b lbl_80034600 -lbl_800345EC: -/* 800345EC 38 00 00 01 */ li r0, 1 -/* 800345F0 98 1F 00 01 */ stb r0, 1(r31) -/* 800345F4 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 800345F8 38 80 00 01 */ li r4, 1 -/* 800345FC 48 29 92 8D */ bl setOutputMode__10Z2AudioMgrFUl -lbl_80034600: -/* 80034600 38 80 00 00 */ li r4, 0 -/* 80034604 98 9F 00 02 */ stb r4, 2(r31) -/* 80034608 38 60 00 01 */ li r3, 1 -/* 8003460C 98 7F 00 03 */ stb r3, 3(r31) -/* 80034610 98 9F 00 04 */ stb r4, 4(r31) -/* 80034614 98 9F 00 05 */ stb r4, 5(r31) -/* 80034618 98 9F 00 09 */ stb r4, 9(r31) -/* 8003461C 38 00 01 5E */ li r0, 0x15e -/* 80034620 B0 1F 00 06 */ sth r0, 6(r31) -/* 80034624 98 9F 00 08 */ stb r4, 8(r31) -/* 80034628 98 9F 00 0A */ stb r4, 0xa(r31) -/* 8003462C 98 7F 00 0B */ stb r3, 0xb(r31) -/* 80034630 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80034634 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80034638 7C 08 03 A6 */ mtlr r0 -/* 8003463C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80034640 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save/init__27dSv_player_last_mark_info_cFv.s b/asm/d/save/d_save/init__27dSv_player_last_mark_info_cFv.s deleted file mode 100644 index 522ac118f0e..00000000000 --- a/asm/d/save/d_save/init__27dSv_player_last_mark_info_cFv.s +++ /dev/null @@ -1,33 +0,0 @@ -lbl_80032EB0: -/* 80032EB0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80032EB4 7C 08 02 A6 */ mflr r0 -/* 80032EB8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80032EBC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80032EC0 7C 7F 1B 78 */ mr r31, r3 -/* 80032EC4 38 7F 00 0E */ addi r3, r31, 0xe -/* 80032EC8 3C 80 80 38 */ lis r4, d_save_d_save__stringBase0@ha /* 0x80379234@ha */ -/* 80032ECC 38 84 92 34 */ addi r4, r4, d_save_d_save__stringBase0@l /* 0x80379234@l */ -/* 80032ED0 48 33 5C 5D */ bl strcpy -/* 80032ED4 C0 02 83 5C */ lfs f0, lit_3813(r2) -/* 80032ED8 D0 1F 00 00 */ stfs f0, 0(r31) -/* 80032EDC D0 1F 00 04 */ stfs f0, 4(r31) -/* 80032EE0 D0 1F 00 08 */ stfs f0, 8(r31) -/* 80032EE4 38 60 00 00 */ li r3, 0 -/* 80032EE8 B0 7F 00 0C */ sth r3, 0xc(r31) -/* 80032EEC 98 7F 00 17 */ stb r3, 0x17(r31) -/* 80032EF0 98 7F 00 16 */ stb r3, 0x16(r31) -/* 80032EF4 38 00 FF FF */ li r0, -1 -/* 80032EF8 98 1F 00 18 */ stb r0, 0x18(r31) -/* 80032EFC 38 80 00 00 */ li r4, 0 -/* 80032F00 38 00 00 03 */ li r0, 3 -/* 80032F04 7C 09 03 A6 */ mtctr r0 -lbl_80032F08: -/* 80032F08 38 04 00 19 */ addi r0, r4, 0x19 -/* 80032F0C 7C 7F 01 AE */ stbx r3, r31, r0 -/* 80032F10 38 84 00 01 */ addi r4, r4, 1 -/* 80032F14 42 00 FF F4 */ bdnz lbl_80032F08 -/* 80032F18 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80032F1C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80032F20 7C 08 03 A6 */ mtlr r0 -/* 80032F24 38 21 00 10 */ addi r1, r1, 0x10 -/* 80032F28 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save/init__33dSv_player_field_last_stay_info_cFv.s b/asm/d/save/d_save/init__33dSv_player_field_last_stay_info_cFv.s deleted file mode 100644 index c43c6421407..00000000000 --- a/asm/d/save/d_save/init__33dSv_player_field_last_stay_info_cFv.s +++ /dev/null @@ -1,34 +0,0 @@ -lbl_80032D60: -/* 80032D60 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80032D64 7C 08 02 A6 */ mflr r0 -/* 80032D68 90 01 00 14 */ stw r0, 0x14(r1) -/* 80032D6C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80032D70 7C 7F 1B 78 */ mr r31, r3 -/* 80032D74 38 7F 00 0E */ addi r3, r31, 0xe -/* 80032D78 3C 80 80 38 */ lis r4, d_save_d_save__stringBase0@ha /* 0x80379234@ha */ -/* 80032D7C 38 84 92 34 */ addi r4, r4, d_save_d_save__stringBase0@l /* 0x80379234@l */ -/* 80032D80 48 33 5D AD */ bl strcpy -/* 80032D84 C0 02 83 5C */ lfs f0, lit_3813(r2) -/* 80032D88 D0 1F 00 00 */ stfs f0, 0(r31) -/* 80032D8C D0 1F 00 04 */ stfs f0, 4(r31) -/* 80032D90 D0 1F 00 08 */ stfs f0, 8(r31) -/* 80032D94 38 60 00 00 */ li r3, 0 -/* 80032D98 B0 7F 00 0C */ sth r3, 0xc(r31) -/* 80032D9C 98 7F 00 16 */ stb r3, 0x16(r31) -/* 80032DA0 38 00 00 01 */ li r0, 1 -/* 80032DA4 98 1F 00 17 */ stb r0, 0x17(r31) -/* 80032DA8 98 7F 00 18 */ stb r3, 0x18(r31) -/* 80032DAC 98 7F 00 19 */ stb r3, 0x19(r31) -/* 80032DB0 38 80 00 00 */ li r4, 0 -/* 80032DB4 38 00 00 02 */ li r0, 2 -/* 80032DB8 7C 09 03 A6 */ mtctr r0 -lbl_80032DBC: -/* 80032DBC 38 04 00 1A */ addi r0, r4, 0x1a -/* 80032DC0 7C 7F 01 AE */ stbx r3, r31, r0 -/* 80032DC4 38 84 00 01 */ addi r4, r4, 1 -/* 80032DC8 42 00 FF F4 */ bdnz lbl_80032DBC -/* 80032DCC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80032DD0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80032DD4 7C 08 03 A6 */ mtlr r0 -/* 80032DD8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80032DDC 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save/isMagicFlag__21dSv_player_status_a_cCFUc.s b/asm/d/save/d_save/isMagicFlag__21dSv_player_status_a_cCFUc.s deleted file mode 100644 index c9ccf4ce182..00000000000 --- a/asm/d/save/d_save/isMagicFlag__21dSv_player_status_a_cCFUc.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_80032AF8: -/* 80032AF8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80032AFC 7C 08 02 A6 */ mflr r0 -/* 80032B00 90 01 00 14 */ stw r0, 0x14(r1) -/* 80032B04 54 84 06 3F */ clrlwi. r4, r4, 0x18 -/* 80032B08 40 82 00 1C */ bne lbl_80032B24 -/* 80032B0C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80032B10 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80032B14 38 63 07 F0 */ addi r3, r3, 0x7f0 -/* 80032B18 38 80 23 04 */ li r4, 0x2304 -/* 80032B1C 48 00 1E A1 */ bl isEventBit__11dSv_event_cCFUs -/* 80032B20 48 00 00 20 */ b lbl_80032B40 -lbl_80032B24: -/* 80032B24 88 63 00 1C */ lbz r3, 0x1c(r3) -/* 80032B28 38 00 00 01 */ li r0, 1 -/* 80032B2C 7C 00 20 30 */ slw r0, r0, r4 -/* 80032B30 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 80032B34 7C 63 00 38 */ and r3, r3, r0 -/* 80032B38 30 03 FF FF */ addic r0, r3, -1 -/* 80032B3C 7C 60 19 10 */ subfe r3, r0, r3 -lbl_80032B40: -/* 80032B40 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80032B44 7C 08 03 A6 */ mtlr r0 -/* 80032B48 38 21 00 10 */ addi r1, r1, 0x10 -/* 80032B4C 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save/putSave__10dSv_info_cFi.s b/asm/d/save/d_save/putSave__10dSv_info_cFi.s deleted file mode 100644 index c1fefe62184..00000000000 --- a/asm/d/save/d_save/putSave__10dSv_info_cFi.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_800350F0: -/* 800350F0 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 800350F4 38 E1 00 04 */ addi r7, r1, 4 -/* 800350F8 38 C3 09 54 */ addi r6, r3, 0x954 -/* 800350FC 38 00 00 04 */ li r0, 4 -/* 80035100 7C 09 03 A6 */ mtctr r0 -lbl_80035104: -/* 80035104 80 A6 00 04 */ lwz r5, 4(r6) -/* 80035108 84 06 00 08 */ lwzu r0, 8(r6) -/* 8003510C 90 A7 00 04 */ stw r5, 4(r7) -/* 80035110 94 07 00 08 */ stwu r0, 8(r7) -/* 80035114 42 00 FF F0 */ bdnz lbl_80035104 -/* 80035118 54 80 28 34 */ slwi r0, r4, 5 -/* 8003511C 7C 63 02 14 */ add r3, r3, r0 -/* 80035120 38 A3 01 EC */ addi r5, r3, 0x1ec -/* 80035124 38 81 00 04 */ addi r4, r1, 4 -/* 80035128 38 00 00 04 */ li r0, 4 -/* 8003512C 7C 09 03 A6 */ mtctr r0 -lbl_80035130: -/* 80035130 80 64 00 04 */ lwz r3, 4(r4) -/* 80035134 84 04 00 08 */ lwzu r0, 8(r4) -/* 80035138 90 65 00 04 */ stw r3, 4(r5) -/* 8003513C 94 05 00 08 */ stwu r0, 8(r5) -/* 80035140 42 00 FF F0 */ bdnz lbl_80035130 -/* 80035144 38 21 00 30 */ addi r1, r1, 0x30 -/* 80035148 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save/setBaitItem__17dSv_player_item_cFUc.s b/asm/d/save/d_save/setBaitItem__17dSv_player_item_cFUc.s deleted file mode 100644 index ed50c8aeafa..00000000000 --- a/asm/d/save/d_save/setBaitItem__17dSv_player_item_cFUc.s +++ /dev/null @@ -1,74 +0,0 @@ -lbl_80033D40: -/* 80033D40 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80033D44 7C 08 02 A6 */ mflr r0 -/* 80033D48 90 01 00 14 */ stw r0, 0x14(r1) -/* 80033D4C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80033D50 7C 7F 1B 78 */ mr r31, r3 -/* 80033D54 54 80 06 3E */ clrlwi r0, r4, 0x18 -/* 80033D58 2C 00 00 76 */ cmpwi r0, 0x76 -/* 80033D5C 41 82 00 20 */ beq lbl_80033D7C -/* 80033D60 40 80 00 10 */ bge lbl_80033D70 -/* 80033D64 2C 00 00 74 */ cmpwi r0, 0x74 -/* 80033D68 41 82 00 48 */ beq lbl_80033DB0 -/* 80033D6C 48 00 00 A8 */ b lbl_80033E14 -lbl_80033D70: -/* 80033D70 2C 00 00 FF */ cmpwi r0, 0xff -/* 80033D74 41 82 00 70 */ beq lbl_80033DE4 -/* 80033D78 48 00 00 9C */ b lbl_80033E14 -lbl_80033D7C: -/* 80033D7C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80033D80 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80033D84 38 63 00 CC */ addi r3, r3, 0xcc -/* 80033D88 38 80 00 3D */ li r4, 0x3d -/* 80033D8C 48 00 01 3D */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 80033D90 2C 03 00 00 */ cmpwi r3, 0 -/* 80033D94 41 82 00 10 */ beq lbl_80033DA4 -/* 80033D98 38 00 00 5E */ li r0, 0x5e -/* 80033D9C 98 1F 00 14 */ stb r0, 0x14(r31) -/* 80033DA0 48 00 00 74 */ b lbl_80033E14 -lbl_80033DA4: -/* 80033DA4 38 00 00 5B */ li r0, 0x5b -/* 80033DA8 98 1F 00 14 */ stb r0, 0x14(r31) -/* 80033DAC 48 00 00 68 */ b lbl_80033E14 -lbl_80033DB0: -/* 80033DB0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80033DB4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80033DB8 38 63 00 CC */ addi r3, r3, 0xcc -/* 80033DBC 38 80 00 3D */ li r4, 0x3d -/* 80033DC0 48 00 01 09 */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 80033DC4 2C 03 00 00 */ cmpwi r3, 0 -/* 80033DC8 41 82 00 10 */ beq lbl_80033DD8 -/* 80033DCC 38 00 00 5F */ li r0, 0x5f -/* 80033DD0 98 1F 00 14 */ stb r0, 0x14(r31) -/* 80033DD4 48 00 00 40 */ b lbl_80033E14 -lbl_80033DD8: -/* 80033DD8 38 00 00 5D */ li r0, 0x5d -/* 80033DDC 98 1F 00 14 */ stb r0, 0x14(r31) -/* 80033DE0 48 00 00 34 */ b lbl_80033E14 -lbl_80033DE4: -/* 80033DE4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80033DE8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80033DEC 38 63 00 CC */ addi r3, r3, 0xcc -/* 80033DF0 38 80 00 3D */ li r4, 0x3d -/* 80033DF4 48 00 00 D5 */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 80033DF8 2C 03 00 00 */ cmpwi r3, 0 -/* 80033DFC 41 82 00 10 */ beq lbl_80033E0C -/* 80033E00 38 00 00 5C */ li r0, 0x5c -/* 80033E04 98 1F 00 14 */ stb r0, 0x14(r31) -/* 80033E08 48 00 00 0C */ b lbl_80033E14 -lbl_80033E0C: -/* 80033E0C 38 00 00 4A */ li r0, 0x4a -/* 80033E10 98 1F 00 14 */ stb r0, 0x14(r31) -lbl_80033E14: -/* 80033E14 3B E0 00 00 */ li r31, 0 -lbl_80033E18: -/* 80033E18 7F E3 FB 78 */ mr r3, r31 -/* 80033E1C 4B FF 9F D9 */ bl dComIfGp_setSelectItem__Fi -/* 80033E20 3B FF 00 01 */ addi r31, r31, 1 -/* 80033E24 2C 1F 00 04 */ cmpwi r31, 4 -/* 80033E28 41 80 FF F0 */ blt lbl_80033E18 -/* 80033E2C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80033E30 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80033E34 7C 08 03 A6 */ mtlr r0 -/* 80033E38 38 21 00 10 */ addi r1, r1, 0x10 -/* 80033E3C 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save/setBombBagItemIn__17dSv_player_item_cFUcUcUcb.s b/asm/d/save/d_save/setBombBagItemIn__17dSv_player_item_cFUcUcUcb.s deleted file mode 100644 index 3f6eb551b6d..00000000000 --- a/asm/d/save/d_save/setBombBagItemIn__17dSv_player_item_cFUcUcUcb.s +++ /dev/null @@ -1,76 +0,0 @@ -lbl_80033910: -/* 80033910 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80033914 7C 08 02 A6 */ mflr r0 -/* 80033918 90 01 00 24 */ stw r0, 0x24(r1) -/* 8003391C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80033920 48 32 E8 B5 */ bl _savegpr_27 -/* 80033924 7C BB 2B 78 */ mr r27, r5 -/* 80033928 7C DC 33 78 */ mr r28, r6 -/* 8003392C 7C FD 3B 78 */ mr r29, r7 -/* 80033930 3B E0 00 00 */ li r31, 0 -/* 80033934 54 85 06 3E */ clrlwi r5, r4, 0x18 -/* 80033938 38 00 00 03 */ li r0, 3 -/* 8003393C 7C 09 03 A6 */ mtctr r0 -lbl_80033940: -/* 80033940 38 9F 00 0F */ addi r4, r31, 0xf -/* 80033944 7C 03 20 AE */ lbzx r0, r3, r4 -/* 80033948 7C 05 00 40 */ cmplw r5, r0 -/* 8003394C 40 82 00 B4 */ bne lbl_80033A00 -/* 80033950 7F 65 DB 78 */ mr r5, r27 -/* 80033954 4B FF F6 65 */ bl setItem__17dSv_player_item_cFiUc -/* 80033958 57 A0 06 3E */ clrlwi r0, r29, 0x18 -/* 8003395C 28 00 00 01 */ cmplwi r0, 1 -/* 80033960 40 82 00 60 */ bne lbl_800339C0 -/* 80033964 57 60 06 3E */ clrlwi r0, r27, 0x18 -/* 80033968 28 00 00 50 */ cmplwi r0, 0x50 -/* 8003396C 41 82 00 54 */ beq lbl_800339C0 -/* 80033970 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80033974 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80033978 3B C3 00 F8 */ addi r30, r3, 0xf8 -/* 8003397C 7F C3 F3 78 */ mr r3, r30 -/* 80033980 7F 64 DB 78 */ mr r4, r27 -/* 80033984 48 00 07 75 */ bl getBombNum__21dSv_player_item_max_cCFUc -/* 80033988 57 84 06 3E */ clrlwi r4, r28, 0x18 -/* 8003398C 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80033990 7C 04 00 40 */ cmplw r4, r0 -/* 80033994 40 81 00 14 */ ble lbl_800339A8 -/* 80033998 7F C3 F3 78 */ mr r3, r30 -/* 8003399C 7F 64 DB 78 */ mr r4, r27 -/* 800339A0 48 00 07 59 */ bl getBombNum__21dSv_player_item_max_cCFUc -/* 800339A4 7C 7C 1B 78 */ mr r28, r3 -lbl_800339A8: -/* 800339A8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800339AC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800339B0 38 63 00 EC */ addi r3, r3, 0xec -/* 800339B4 57 E4 06 3E */ clrlwi r4, r31, 0x18 -/* 800339B8 7F 85 E3 78 */ mr r5, r28 -/* 800339BC 48 00 05 B1 */ bl setBombNum__24dSv_player_item_record_cFUcUc -lbl_800339C0: -/* 800339C0 3B A0 00 00 */ li r29, 0 -/* 800339C4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800339C8 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800339CC 3B FF 00 0F */ addi r31, r31, 0xf -lbl_800339D0: -/* 800339D0 7F C3 F3 78 */ mr r3, r30 -/* 800339D4 7F A4 EB 78 */ mr r4, r29 -/* 800339D8 4B FF F0 85 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi -/* 800339DC 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 800339E0 7C 1F 00 00 */ cmpw r31, r0 -/* 800339E4 40 82 00 0C */ bne lbl_800339F0 -/* 800339E8 7F A3 EB 78 */ mr r3, r29 -/* 800339EC 4B FF A4 09 */ bl dComIfGp_setSelectItem__Fi -lbl_800339F0: -/* 800339F0 3B BD 00 01 */ addi r29, r29, 1 -/* 800339F4 2C 1D 00 03 */ cmpwi r29, 3 -/* 800339F8 41 80 FF D8 */ blt lbl_800339D0 -/* 800339FC 48 00 00 0C */ b lbl_80033A08 -lbl_80033A00: -/* 80033A00 3B FF 00 01 */ addi r31, r31, 1 -/* 80033A04 42 00 FF 3C */ bdnz lbl_80033940 -lbl_80033A08: -/* 80033A08 39 61 00 20 */ addi r11, r1, 0x20 -/* 80033A0C 48 32 E8 15 */ bl _restgpr_27 -/* 80033A10 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80033A14 7C 08 03 A6 */ mtlr r0 -/* 80033A18 38 21 00 20 */ addi r1, r1, 0x20 -/* 80033A1C 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save/setBombBagItemIn__17dSv_player_item_cFUcUcb.s b/asm/d/save/d_save/setBombBagItemIn__17dSv_player_item_cFUcUcb.s deleted file mode 100644 index b7089e23ec6..00000000000 --- a/asm/d/save/d_save/setBombBagItemIn__17dSv_player_item_cFUcUcb.s +++ /dev/null @@ -1,65 +0,0 @@ -lbl_80033828: -/* 80033828 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8003382C 7C 08 02 A6 */ mflr r0 -/* 80033830 90 01 00 24 */ stw r0, 0x24(r1) -/* 80033834 39 61 00 20 */ addi r11, r1, 0x20 -/* 80033838 48 32 E9 A5 */ bl _savegpr_29 -/* 8003383C 7C BE 2B 78 */ mr r30, r5 -/* 80033840 7C DD 33 78 */ mr r29, r6 -/* 80033844 3B E0 00 00 */ li r31, 0 -/* 80033848 54 85 06 3E */ clrlwi r5, r4, 0x18 -/* 8003384C 38 00 00 03 */ li r0, 3 -/* 80033850 7C 09 03 A6 */ mtctr r0 -lbl_80033854: -/* 80033854 38 9F 00 0F */ addi r4, r31, 0xf -/* 80033858 7C 03 20 AE */ lbzx r0, r3, r4 -/* 8003385C 7C 05 00 40 */ cmplw r5, r0 -/* 80033860 40 82 00 90 */ bne lbl_800338F0 -/* 80033864 7F C5 F3 78 */ mr r5, r30 -/* 80033868 4B FF F7 51 */ bl setItem__17dSv_player_item_cFiUc -/* 8003386C 57 A0 06 3E */ clrlwi r0, r29, 0x18 -/* 80033870 28 00 00 01 */ cmplwi r0, 1 -/* 80033874 40 82 00 3C */ bne lbl_800338B0 -/* 80033878 57 C0 06 3E */ clrlwi r0, r30, 0x18 -/* 8003387C 28 00 00 50 */ cmplwi r0, 0x50 -/* 80033880 41 82 00 30 */ beq lbl_800338B0 -/* 80033884 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80033888 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8003388C 38 63 00 F8 */ addi r3, r3, 0xf8 -/* 80033890 7F C4 F3 78 */ mr r4, r30 -/* 80033894 48 00 08 65 */ bl getBombNum__21dSv_player_item_max_cCFUc -/* 80033898 7C 65 1B 78 */ mr r5, r3 -/* 8003389C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800338A0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800338A4 38 63 00 EC */ addi r3, r3, 0xec -/* 800338A8 57 E4 06 3E */ clrlwi r4, r31, 0x18 -/* 800338AC 48 00 06 C1 */ bl setBombNum__24dSv_player_item_record_cFUcUc -lbl_800338B0: -/* 800338B0 3B A0 00 00 */ li r29, 0 -/* 800338B4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800338B8 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800338BC 3B FF 00 0F */ addi r31, r31, 0xf -lbl_800338C0: -/* 800338C0 7F C3 F3 78 */ mr r3, r30 -/* 800338C4 7F A4 EB 78 */ mr r4, r29 -/* 800338C8 4B FF F1 95 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi -/* 800338CC 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 800338D0 7C 1F 00 00 */ cmpw r31, r0 -/* 800338D4 40 82 00 0C */ bne lbl_800338E0 -/* 800338D8 7F A3 EB 78 */ mr r3, r29 -/* 800338DC 4B FF A5 19 */ bl dComIfGp_setSelectItem__Fi -lbl_800338E0: -/* 800338E0 3B BD 00 01 */ addi r29, r29, 1 -/* 800338E4 2C 1D 00 03 */ cmpwi r29, 3 -/* 800338E8 41 80 FF D8 */ blt lbl_800338C0 -/* 800338EC 48 00 00 0C */ b lbl_800338F8 -lbl_800338F0: -/* 800338F0 3B FF 00 01 */ addi r31, r31, 1 -/* 800338F4 42 00 FF 60 */ bdnz lbl_80033854 -lbl_800338F8: -/* 800338F8 39 61 00 20 */ addi r11, r1, 0x20 -/* 800338FC 48 32 E9 2D */ bl _restgpr_29 -/* 80033900 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80033904 7C 08 03 A6 */ mtlr r0 -/* 80033908 38 21 00 20 */ addi r1, r1, 0x20 -/* 8003390C 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save/setEmptyBombBag__17dSv_player_item_cFUcUc.s b/asm/d/save/d_save/setEmptyBombBag__17dSv_player_item_cFUcUc.s deleted file mode 100644 index c91828bcbac..00000000000 --- a/asm/d/save/d_save/setEmptyBombBag__17dSv_player_item_cFUcUc.s +++ /dev/null @@ -1,62 +0,0 @@ -lbl_80033B08: -/* 80033B08 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80033B0C 7C 08 02 A6 */ mflr r0 -/* 80033B10 90 01 00 24 */ stw r0, 0x24(r1) -/* 80033B14 39 61 00 20 */ addi r11, r1, 0x20 -/* 80033B18 48 32 E6 BD */ bl _savegpr_27 -/* 80033B1C 7C 9B 23 78 */ mr r27, r4 -/* 80033B20 7C BE 2B 78 */ mr r30, r5 -/* 80033B24 3B E0 00 00 */ li r31, 0 -/* 80033B28 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80033B2C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80033B30 3B A3 00 9C */ addi r29, r3, 0x9c -lbl_80033B34: -/* 80033B34 7F A3 EB 78 */ mr r3, r29 -/* 80033B38 38 1F 00 0F */ addi r0, r31, 0xf -/* 80033B3C 54 1C 06 3E */ clrlwi r28, r0, 0x18 -/* 80033B40 7F 84 E3 78 */ mr r4, r28 -/* 80033B44 38 A0 00 01 */ li r5, 1 -/* 80033B48 4B FF F4 E9 */ bl getItem__17dSv_player_item_cCFib -/* 80033B4C 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80033B50 28 00 00 FF */ cmplwi r0, 0xff -/* 80033B54 40 82 00 74 */ bne lbl_80033BC8 -/* 80033B58 7F A3 EB 78 */ mr r3, r29 -/* 80033B5C 7F 84 E3 78 */ mr r4, r28 -/* 80033B60 7F 65 DB 78 */ mr r5, r27 -/* 80033B64 4B FF F4 55 */ bl setItem__17dSv_player_item_cFiUc -/* 80033B68 57 60 06 3E */ clrlwi r0, r27, 0x18 -/* 80033B6C 28 00 00 50 */ cmplwi r0, 0x50 -/* 80033B70 41 82 00 64 */ beq lbl_80033BD4 -/* 80033B74 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80033B78 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80033B7C 3B 83 00 F8 */ addi r28, r3, 0xf8 -/* 80033B80 7F 83 E3 78 */ mr r3, r28 -/* 80033B84 7F 64 DB 78 */ mr r4, r27 -/* 80033B88 48 00 05 71 */ bl getBombNum__21dSv_player_item_max_cCFUc -/* 80033B8C 57 C4 06 3E */ clrlwi r4, r30, 0x18 -/* 80033B90 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80033B94 7C 04 00 40 */ cmplw r4, r0 -/* 80033B98 40 81 00 14 */ ble lbl_80033BAC -/* 80033B9C 7F 83 E3 78 */ mr r3, r28 -/* 80033BA0 7F 64 DB 78 */ mr r4, r27 -/* 80033BA4 48 00 05 55 */ bl getBombNum__21dSv_player_item_max_cCFUc -/* 80033BA8 7C 7E 1B 78 */ mr r30, r3 -lbl_80033BAC: -/* 80033BAC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80033BB0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80033BB4 38 63 00 EC */ addi r3, r3, 0xec -/* 80033BB8 57 E4 06 3E */ clrlwi r4, r31, 0x18 -/* 80033BBC 7F C5 F3 78 */ mr r5, r30 -/* 80033BC0 48 00 03 AD */ bl setBombNum__24dSv_player_item_record_cFUcUc -/* 80033BC4 48 00 00 10 */ b lbl_80033BD4 -lbl_80033BC8: -/* 80033BC8 3B FF 00 01 */ addi r31, r31, 1 -/* 80033BCC 2C 1F 00 03 */ cmpwi r31, 3 -/* 80033BD0 41 80 FF 64 */ blt lbl_80033B34 -lbl_80033BD4: -/* 80033BD4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80033BD8 48 32 E6 49 */ bl _restgpr_27 -/* 80033BDC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80033BE0 7C 08 03 A6 */ mtlr r0 -/* 80033BE4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80033BE8 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save/setEmptyBombBag__17dSv_player_item_cFv.s b/asm/d/save/d_save/setEmptyBombBag__17dSv_player_item_cFv.s deleted file mode 100644 index ea89df13a7b..00000000000 --- a/asm/d/save/d_save/setEmptyBombBag__17dSv_player_item_cFv.s +++ /dev/null @@ -1,36 +0,0 @@ -lbl_80033A88: -/* 80033A88 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80033A8C 7C 08 02 A6 */ mflr r0 -/* 80033A90 90 01 00 24 */ stw r0, 0x24(r1) -/* 80033A94 39 61 00 20 */ addi r11, r1, 0x20 -/* 80033A98 48 32 E7 45 */ bl _savegpr_29 -/* 80033A9C 3B A0 00 00 */ li r29, 0 -/* 80033AA0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80033AA4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80033AA8 3B E3 00 9C */ addi r31, r3, 0x9c -lbl_80033AAC: -/* 80033AAC 7F E3 FB 78 */ mr r3, r31 -/* 80033AB0 38 1D 00 0F */ addi r0, r29, 0xf -/* 80033AB4 54 1E 06 3E */ clrlwi r30, r0, 0x18 -/* 80033AB8 7F C4 F3 78 */ mr r4, r30 -/* 80033ABC 38 A0 00 01 */ li r5, 1 -/* 80033AC0 4B FF F5 71 */ bl getItem__17dSv_player_item_cCFib -/* 80033AC4 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80033AC8 28 00 00 FF */ cmplwi r0, 0xff -/* 80033ACC 40 82 00 18 */ bne lbl_80033AE4 -/* 80033AD0 7F E3 FB 78 */ mr r3, r31 -/* 80033AD4 7F C4 F3 78 */ mr r4, r30 -/* 80033AD8 38 A0 00 50 */ li r5, 0x50 -/* 80033ADC 4B FF F4 DD */ bl setItem__17dSv_player_item_cFiUc -/* 80033AE0 48 00 00 10 */ b lbl_80033AF0 -lbl_80033AE4: -/* 80033AE4 3B BD 00 01 */ addi r29, r29, 1 -/* 80033AE8 2C 1D 00 03 */ cmpwi r29, 3 -/* 80033AEC 41 80 FF C0 */ blt lbl_80033AAC -lbl_80033AF0: -/* 80033AF0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80033AF4 48 32 E7 35 */ bl _restgpr_29 -/* 80033AF8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80033AFC 7C 08 03 A6 */ mtlr r0 -/* 80033B00 38 21 00 20 */ addi r1, r1, 0x20 -/* 80033B04 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save/setEmptyBottle__17dSv_player_item_cFUc.s b/asm/d/save/d_save/setEmptyBottle__17dSv_player_item_cFUc.s deleted file mode 100644 index 13336eb5188..00000000000 --- a/asm/d/save/d_save/setEmptyBottle__17dSv_player_item_cFUc.s +++ /dev/null @@ -1,37 +0,0 @@ -lbl_80033514: -/* 80033514 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80033518 7C 08 02 A6 */ mflr r0 -/* 8003351C 90 01 00 24 */ stw r0, 0x24(r1) -/* 80033520 39 61 00 20 */ addi r11, r1, 0x20 -/* 80033524 48 32 EC B5 */ bl _savegpr_28 -/* 80033528 7C 9C 23 78 */ mr r28, r4 -/* 8003352C 3B A0 00 00 */ li r29, 0 -/* 80033530 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80033534 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80033538 3B E3 00 9C */ addi r31, r3, 0x9c -lbl_8003353C: -/* 8003353C 7F E3 FB 78 */ mr r3, r31 -/* 80033540 38 1D 00 0B */ addi r0, r29, 0xb -/* 80033544 54 1E 06 3E */ clrlwi r30, r0, 0x18 -/* 80033548 7F C4 F3 78 */ mr r4, r30 -/* 8003354C 38 A0 00 01 */ li r5, 1 -/* 80033550 4B FF FA E1 */ bl getItem__17dSv_player_item_cCFib -/* 80033554 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80033558 28 00 00 FF */ cmplwi r0, 0xff -/* 8003355C 40 82 00 18 */ bne lbl_80033574 -/* 80033560 7F E3 FB 78 */ mr r3, r31 -/* 80033564 7F C4 F3 78 */ mr r4, r30 -/* 80033568 7F 85 E3 78 */ mr r5, r28 -/* 8003356C 4B FF FA 4D */ bl setItem__17dSv_player_item_cFiUc -/* 80033570 48 00 00 10 */ b lbl_80033580 -lbl_80033574: -/* 80033574 3B BD 00 01 */ addi r29, r29, 1 -/* 80033578 2C 1D 00 04 */ cmpwi r29, 4 -/* 8003357C 41 80 FF C0 */ blt lbl_8003353C -lbl_80033580: -/* 80033580 39 61 00 20 */ addi r11, r1, 0x20 -/* 80033584 48 32 EC A1 */ bl _restgpr_28 -/* 80033588 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8003358C 7C 08 03 A6 */ mtlr r0 -/* 80033590 38 21 00 20 */ addi r1, r1, 0x20 -/* 80033594 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save/setEmptyBottle__17dSv_player_item_cFv.s b/asm/d/save/d_save/setEmptyBottle__17dSv_player_item_cFv.s deleted file mode 100644 index 5629e2ed53a..00000000000 --- a/asm/d/save/d_save/setEmptyBottle__17dSv_player_item_cFv.s +++ /dev/null @@ -1,36 +0,0 @@ -lbl_80033494: -/* 80033494 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80033498 7C 08 02 A6 */ mflr r0 -/* 8003349C 90 01 00 24 */ stw r0, 0x24(r1) -/* 800334A0 39 61 00 20 */ addi r11, r1, 0x20 -/* 800334A4 48 32 ED 39 */ bl _savegpr_29 -/* 800334A8 3B A0 00 00 */ li r29, 0 -/* 800334AC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800334B0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800334B4 3B E3 00 9C */ addi r31, r3, 0x9c -lbl_800334B8: -/* 800334B8 7F E3 FB 78 */ mr r3, r31 -/* 800334BC 38 1D 00 0B */ addi r0, r29, 0xb -/* 800334C0 54 1E 06 3E */ clrlwi r30, r0, 0x18 -/* 800334C4 7F C4 F3 78 */ mr r4, r30 -/* 800334C8 38 A0 00 01 */ li r5, 1 -/* 800334CC 4B FF FB 65 */ bl getItem__17dSv_player_item_cCFib -/* 800334D0 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 800334D4 28 00 00 FF */ cmplwi r0, 0xff -/* 800334D8 40 82 00 18 */ bne lbl_800334F0 -/* 800334DC 7F E3 FB 78 */ mr r3, r31 -/* 800334E0 7F C4 F3 78 */ mr r4, r30 -/* 800334E4 38 A0 00 60 */ li r5, 0x60 -/* 800334E8 4B FF FA D1 */ bl setItem__17dSv_player_item_cFiUc -/* 800334EC 48 00 00 10 */ b lbl_800334FC -lbl_800334F0: -/* 800334F0 3B BD 00 01 */ addi r29, r29, 1 -/* 800334F4 2C 1D 00 04 */ cmpwi r29, 4 -/* 800334F8 41 80 FF C0 */ blt lbl_800334B8 -lbl_800334FC: -/* 800334FC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80033500 48 32 ED 29 */ bl _restgpr_29 -/* 80033504 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80033508 7C 08 03 A6 */ mtlr r0 -/* 8003350C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80033510 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save/setItem__17dSv_player_item_cFiUc.s b/asm/d/save/d_save/setItem__17dSv_player_item_cFiUc.s deleted file mode 100644 index 528eaa57579..00000000000 --- a/asm/d/save/d_save/setItem__17dSv_player_item_cFiUc.s +++ /dev/null @@ -1,34 +0,0 @@ -lbl_80032FB8: -/* 80032FB8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80032FBC 7C 08 02 A6 */ mflr r0 -/* 80032FC0 90 01 00 24 */ stw r0, 0x24(r1) -/* 80032FC4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80032FC8 48 32 F2 15 */ bl _savegpr_29 -/* 80032FCC 7C 9D 23 78 */ mr r29, r4 -/* 80032FD0 2C 1D 00 18 */ cmpwi r29, 0x18 -/* 80032FD4 40 80 00 0C */ bge lbl_80032FE0 -/* 80032FD8 7C A3 E9 AE */ stbx r5, r3, r29 -/* 80032FDC 48 00 03 1D */ bl setLineUpItem__17dSv_player_item_cFv -lbl_80032FE0: -/* 80032FE0 3B C0 00 00 */ li r30, 0 -/* 80032FE4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80032FE8 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -lbl_80032FEC: -/* 80032FEC 7F E3 FB 78 */ mr r3, r31 -/* 80032FF0 7F C4 F3 78 */ mr r4, r30 -/* 80032FF4 4B FF FA 69 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi -/* 80032FF8 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80032FFC 7C 1D 00 00 */ cmpw r29, r0 -/* 80033000 40 82 00 0C */ bne lbl_8003300C -/* 80033004 7F C3 F3 78 */ mr r3, r30 -/* 80033008 4B FF AD ED */ bl dComIfGp_setSelectItem__Fi -lbl_8003300C: -/* 8003300C 3B DE 00 01 */ addi r30, r30, 1 -/* 80033010 2C 1E 00 03 */ cmpwi r30, 3 -/* 80033014 41 80 FF D8 */ blt lbl_80032FEC -/* 80033018 39 61 00 20 */ addi r11, r1, 0x20 -/* 8003301C 48 32 F2 0D */ bl _restgpr_29 -/* 80033020 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80033024 7C 08 03 A6 */ mtlr r0 -/* 80033028 38 21 00 20 */ addi r1, r1, 0x20 -/* 8003302C 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save/setWarashibeItem__17dSv_player_item_cFUc.s b/asm/d/save/d_save/setWarashibeItem__17dSv_player_item_cFUc.s deleted file mode 100644 index 4c7bc7d2015..00000000000 --- a/asm/d/save/d_save/setWarashibeItem__17dSv_player_item_cFUc.s +++ /dev/null @@ -1,39 +0,0 @@ -lbl_80033C2C: -/* 80033C2C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80033C30 7C 08 02 A6 */ mflr r0 -/* 80033C34 90 01 00 24 */ stw r0, 0x24(r1) -/* 80033C38 39 61 00 20 */ addi r11, r1, 0x20 -/* 80033C3C 48 32 E5 A1 */ bl _savegpr_29 -/* 80033C40 7C 9D 23 78 */ mr r29, r4 -/* 80033C44 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80033C48 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80033C4C 38 63 00 9C */ addi r3, r3, 0x9c -/* 80033C50 38 80 00 15 */ li r4, 0x15 -/* 80033C54 7F A5 EB 78 */ mr r5, r29 -/* 80033C58 4B FF F3 61 */ bl setItem__17dSv_player_item_cFiUc -/* 80033C5C 38 00 00 15 */ li r0, 0x15 -/* 80033C60 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80033C64 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80033C68 98 1F 5E 7D */ stb r0, 0x5e7d(r31) -/* 80033C6C 9B BF 5E 7E */ stb r29, 0x5e7e(r31) -/* 80033C70 3B A0 00 00 */ li r29, 0 -lbl_80033C74: -/* 80033C74 7F E3 FB 78 */ mr r3, r31 -/* 80033C78 57 BE 06 3E */ clrlwi r30, r29, 0x18 -/* 80033C7C 7F C4 F3 78 */ mr r4, r30 -/* 80033C80 4B FF ED DD */ bl getSelectItemIndex__21dSv_player_status_a_cCFi -/* 80033C84 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80033C88 28 00 00 15 */ cmplwi r0, 0x15 -/* 80033C8C 40 82 00 0C */ bne lbl_80033C98 -/* 80033C90 7F C3 F3 78 */ mr r3, r30 -/* 80033C94 4B FF A1 61 */ bl dComIfGp_setSelectItem__Fi -lbl_80033C98: -/* 80033C98 3B BD 00 01 */ addi r29, r29, 1 -/* 80033C9C 2C 1D 00 04 */ cmpwi r29, 4 -/* 80033CA0 41 80 FF D4 */ blt lbl_80033C74 -/* 80033CA4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80033CA8 48 32 E5 81 */ bl _restgpr_29 -/* 80033CAC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80033CB0 7C 08 03 A6 */ mtlr r0 -/* 80033CB4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80033CB8 4E 80 00 20 */ blr diff --git a/include/JSystem/JKernel/JKRExpHeap.h b/include/JSystem/JKernel/JKRExpHeap.h index dcadbef8d44..eeeab96a394 100644 --- a/include/JSystem/JKernel/JKRExpHeap.h +++ b/include/JSystem/JKernel/JKRExpHeap.h @@ -91,4 +91,8 @@ public: static JKRExpHeap* create(void*, u32, JKRHeap*, bool); }; +inline JKRExpHeap* JKRCreateExpHeap(u32 param_0, JKRHeap* param_1, bool param_2) { + return JKRExpHeap::create(param_0, param_1, param_2); +} + #endif /* JKREXPHEAP_H */ diff --git a/include/JSystem/JUtility/JUTGamePad.h b/include/JSystem/JUtility/JUTGamePad.h index 5153cb08f09..875da3ab5a9 100644 --- a/include/JSystem/JUtility/JUTGamePad.h +++ b/include/JSystem/JUtility/JUTGamePad.h @@ -40,7 +40,7 @@ public: static u8 mPadAssign[4]; static u8 sSuppressPadReset[4]; static s32 sAnalogMode; - static u8 sRumbleSupported[4]; + static u32 sRumbleSupported; enum EStickMode {}; enum EWhichStick {}; diff --git a/include/d/a/d_a_alink.h b/include/d/a/d_a_alink.h index 7b185f5bc58..726d58950c3 100644 --- a/include/d/a/d_a_alink.h +++ b/include/d/a/d_a_alink.h @@ -545,7 +545,7 @@ public: /* 800BB084 */ void getBodyAngleXAtnActor(int); /* 800BB2B0 */ void setBodyAngleXReadyAnime(int); /* 800BB324 */ void setMagicArmorBrk(int); - /* 800BB408 */ void checkMagicArmorHeavy() const; + /* 800BB408 */ BOOL checkMagicArmorHeavy() const; /* 800BB4B8 */ void checkHeavyStateOn(int, int); /* 800BB644 */ void initGravity(); /* 800BB770 */ void setSpecialGravity(f32, f32, int); @@ -577,7 +577,7 @@ public: /* 800BF9F0 */ void setItemActor(); /* 800BFD74 */ void makeItemType(); /* 800BFDB0 */ void checkZoraWearAbility() const; - /* 800BFDFC */ void checkMagicArmorWearAbility() const; + /* 800BFDFC */ BOOL checkMagicArmorWearAbility() const; /* 800BFE48 */ void loadAramBmd(u16, u32); /* 800BFF04 */ void loadAram(u16, u32); /* 800BFF70 */ void loadAramItemBrk(u16, J3DModel*); @@ -2156,7 +2156,7 @@ public: virtual bool getSwordChangeWaitTimer(void) const; virtual bool checkMetamorphose(void) const; virtual bool checkWolfDownAttackPullOut(void) const; - virtual bool checkBootsOrArmorHeavy(void) const; + virtual BOOL checkBootsOrArmorHeavy(void) const; virtual s32 getBottleOpenAppearItem(void) const; virtual bool checkItemSwordEquip(void) const; virtual float getSinkShapeOffset(void) const; @@ -2171,6 +2171,7 @@ public: // inlined version of checkModeFlg u32 i_checkModeFlg(u32 pFlag) const { return mModeFlg & pFlag; } bool checkUpperAnime(u16 pIdx) const { return mUpperAnime[UPPER_NOW].getIdx() == pIdx; } + bool checkIronBallWaitAnime() const { return checkUpperAnime(0x19C); } static u8 const m_mainBckShield[80]; static u8 const m_mainBckSword[20]; @@ -2909,7 +2910,7 @@ public: private: /* 0x0000 */ fopAc_ac_c mActor; - /* 0x0570 */ u8 field_0x570[0xCE4]; + /* 0x0568 */ u8 field_0x568[0xCEC]; /* 0x1254 */ daPy_actorKeep_c mZeldaActorKeep; }; @@ -2932,7 +2933,7 @@ public: private: /* 0x0000 */ fopAc_ac_c mActor; - /* 0x0570 */ u8 field_0x570[0x324]; + /* 0x0568 */ u8 field_0x568[0x32C]; /* 0x0894 */ u32 mStateFlg1; /* 0x0898 */ u32 mEndResetStateFlg0; }; diff --git a/include/d/a/d_a_itembase.h b/include/d/a/d_a_itembase.h index 3cdfec42dd2..aa5871a8bc7 100644 --- a/include/d/a/d_a_itembase.h +++ b/include/d/a/d_a_itembase.h @@ -36,6 +36,26 @@ public: static u8 const m_data[56]; private: +#ifdef NONMATCHING + /* 0x568 */ void* field_0x568; + /* 0x56C */ request_of_phase_process_class* field_0x56c; + /* 0x570 */ u8 field_0x578[4]; + /* 0x574 */ J3DModel* field_0x574; + /* 0x578 */ mDoExt_btkAnm* field_0x578; + /* 0x57C */ mDoExt_bpkAnm* field_0x57c; + /* 0x580 */ mDoExt_brkAnm* field_0x580; + /* 0x584 */ mDoExt_bckAnm* field_0x584; + /* 0x588 */ mDoExt_btpAnm* field_0x588; + /* 0x58C */ dBgS_ObjAcch field_0x58c; + /* 0x764 */ dBgS_AcchCir field_0x764; + /* 0x7A4 */ dCcD_Stts field_0x7a4; + /* 0x7E0 */ dCcD_Cyl field_0x7e0; + /* 0x91C */ u32 field_0x91c; + /* 0x920 */ u8 field_0x920[0xA]; + /* 0x92A */ u8 m_itemNo; + /* 0x92B */ u8 field_0x92b; +#endif + u8 unk0[0x92a]; u8 mItemNo; u8 unk2347; diff --git a/include/d/a/d_a_player.h b/include/d/a/d_a_player.h index f48328e34c0..c83e8502003 100644 --- a/include/d/a/d_a_player.h +++ b/include/d/a/d_a_player.h @@ -126,6 +126,7 @@ private: class daPy_py_c : public fopAc_ac_c { public: + /* 0x0568 */ u8 field_0x568[8]; /* 0x0570 */ int mNoResetFlg0; /* 0x0574 */ int mNoResetFlg1; /* 0x0578 */ int mNoResetFlg2; @@ -399,8 +400,11 @@ public: int i_checkNoResetFlg1(daPy_FLG1 pFlag) const { return mNoResetFlg1 & pFlag; } int i_checkNoResetFlg2(daPy_FLG2 pFlag) const { return mNoResetFlg2 & pFlag; } void i_onNoResetFlg0(int pFlg) { mNoResetFlg0 |= pFlg; } + void i_onNoResetFlg3(int pFlg) { mNoResetFlg3 |= pFlg; } + void i_offNoResetFlg3(int pFlg) { mNoResetFlg3 &= ~pFlg; } void i_onEndResetFlg1(daPy_ERFLG1 pFlg) { mEndResetFlg1 |= pFlg; } int i_checkWolf() { return i_checkNoResetFlg1(Wolf); } + BOOL i_checkEquipHeavyBoots() const { return i_checkNoResetFlg0(EquipHeavyBoots); } static u8 m_midnaActor[4]; }; diff --git a/include/d/com/d_com_inf_game.h b/include/d/com/d_com_inf_game.h index fb3aa7e4b6b..70a50b7c5c1 100644 --- a/include/d/com/d_com_inf_game.h +++ b/include/d/com/d_com_inf_game.h @@ -15,7 +15,7 @@ #include "dolphin/types.h" struct dTimer_c { - /* 8025D524 */ void deleteCheck(); + /* 8025D524 */ int deleteCheck(); /* 8025D618 */ void start(int, s16); /* 8025D538 */ void start(int); /* 8025D7E8 */ void stop(u8); @@ -39,70 +39,78 @@ public: u8 mTimerType; }; +struct camera_class {}; + class dComIfG_camera_info_class { public: - dComIfG_camera_info_class(void) {} - /* 80030208 */ ~dComIfG_camera_info_class() {} + dComIfG_camera_info_class() {} + ~dComIfG_camera_info_class() {} -private: - u8 field_0x0[12]; - cXyz field_0xc; - cXyz field_0x18; - u8 field_0x24[0x14]; + /* 0x00 */ camera_class* mCamera; + /* 0x04 */ u8 field_0x4; + /* 0x05 */ u8 field_0x5[3]; + /* 0x08 */ u32 mCameraAttentionStatus; + /* 0x0C */ f32 mCameraZoomScale; + /* 0x10 */ f32 mCameraZoomForcus; + /* 0x14 */ char* mCameraParamFileName; + /* 0x18 */ cXyz mCameraPos; + /* 0x24 */ cXyz mCameraTarget; + /* 0x30 */ f32 field_0x30; + /* 0x34 */ s16 field_0x34; }; STATIC_ASSERT(sizeof(dComIfG_camera_info_class) == 0x38); class dComIfG_play_c { public: dComIfG_play_c() { this->ct(); } - void ct(void); - void init(void); - void itemInit(void); + void ct(); + void init(); + void itemInit(); void setItemBombNumCount(u8, s16); s16 getItemBombNumCount(u8); void clearItemBombNumCount(u8); void setNowVibration(u8); - u32 getNowVibration(void); + u32 getNowVibration(); void setStartStage(dStage_startStage_c*); - int getLayerNo_common_common(char const*, int, int); - int getLayerNo_common(char const*, int, int); - int getLayerNo(int); - void createParticle(void); - u32 createSimpleModel(void); - void deleteSimpleModel(void); - void drawSimpleModel(void); + static int getLayerNo_common_common(char const*, int, int); + static int getLayerNo_common(char const*, int, int); + static int getLayerNo(int); + void createParticle(); + u32 createSimpleModel(); + void deleteSimpleModel(); + void drawSimpleModel(); u32 addSimpleModel(J3DModelData*, int, u8); u32 removeSimpleModel(J3DModelData*, int); u32 entrySimpleModel(J3DModel*, int); void setTimerNowTimeMs(int); - int getTimerNowTimeMs(void); + int getTimerNowTimeMs(); void setTimerLimitTimeMs(int); - int getTimerLimitTimeMs(void); + int getTimerLimitTimeMs(); void setTimerMode(int); - int getTimerMode(void); + int getTimerMode(); void setTimerType(u8); - u8 getTimerType(void); + u8 getTimerType(); void setTimerPtr(dTimer_c*); - dTimer_c* getTimerPtr(void); + dTimer_c* getTimerPtr(); void setWarpItemData(const char*, cXyz, s16, s8, u8, u8); - void setSelectItem(int, u8); - void setSelectItemTest(int, u8); ~dComIfG_play_c() {} // inlines bool& isPauseFlag() { return mPauseFlag; } void* getMsgObjectClass() { return mMsgObjectClass; } dStage_roomControl_c* getRoomControl() { return &mRoomControl; } + dStage_stageDt_c& getStage() { return mStageData; } dEvt_control_c getEvent() { return mEvent; } - daHorse_c* getHorseActor() { return mHorseActor; } + daHorse_c* getHorseActor() { return (daHorse_c*)mPlayerPtr[1]; } u8& getItemLifeCountType() { return mItemLifeCountType; } void setItem(u8 slot, u8 i_no) { mItemSlot = slot; mItemID = i_no; } - void setUnkWarashibe1(u8 num) { mItemSlot = num; } - void setUnkWarashibe2(u8 num) { mItemID = num; } + void setSelectItem(int idx, u8 itemId) { mSelectItem[idx] = itemId; } + + u8 getSelectItem(int idx) { return mSelectItem[idx]; } void setZStatus(u8 status, u8 flag) { mZStatus = status; @@ -137,17 +145,28 @@ public: void setItemMaxLifeCount(s16 max) { mItemMaxLifeCount += max; } void setOxygen(int oxygen) { mOxygen = oxygen; } void setMaxOxygen(int max) { mMaxOxygen = max; } - u8 getDoStatus(void) { return mDoStatus; } - u8 getRStatus(void) { return mRStatus; } + u8 getDoStatus() { return mDoStatus; } + u8 getRStatus() { return mRStatus; } inline char* getStartStageName() { return mStartStage.getName(); } + inline s8 getStartStageRoomNo() { return mStartStage.getRoomNo(); } + inline s8 getStartStageLayer() { return mStartStage.getLayer(); } + inline u8 isHeapLockFlag() { return mHeapLockFlag; } + inline void setHeapLockFlag(u8 status) { mHeapLockFlag = status; } + inline void setSubHeapLockFlag(int idx, u8 status) { mSubHeapLockFlag[idx] = status; } + inline u8 getSubHeapLockFlag(int idx) { return mSubHeapLockFlag[idx]; } + inline void offHeapLockFlag() { mHeapLockFlag = 0; } + inline JKRExpHeap* getSubExpHeap2D(int idx) { return mSubExpHeap2D[idx]; } + inline void setSubExpHeap2D(int idx, void* heap) { mSubExpHeap2D[idx] = (JKRExpHeap*)heap; } + inline void offEnableNextStage() { mNextStage.offEnable(); } + inline JKRHeap* getExpHeap2D() { return mExpHeap2D; } + inline dEvent_manager_c& getEvtManager() { return mEvtManager; } + inline dAttention_c& getAttention() { return mAttention; } public: /* 0x00000 */ dBgS mDBgS; /* 0x01404 */ dCcS mDCcS; /* 0x03EC8 */ dStage_startStage_c mStartStage; - /* 0x03ED5 */ u8 field_0x3ed5; // probably padding /* 0x03ED6 */ dStage_nextStage_c mNextStage; - /* 0x03EE7 */ u8 field_0x3ee7; // probably padding /* 0x03EE8 */ dStage_stageDt_c mStageData; /* 0x03F8C */ dStage_roomControl_c mRoomControl; /* 0x03F90 */ dEvt_control_c mEvent; @@ -188,10 +207,9 @@ public: /* 0x04E0E */ u16 mStatus; /* 0x04E10 */ dDlst_window_c mWindow[1]; /* 0x04E3C */ dComIfG_camera_info_class mCameraInfo[1]; - /* 0x04E74 */ daAlink_c* mPlayer; + /* 0x04E74 */ daAlink_c* mPlayer[1]; /* 0x04E78 */ s8 mPlayerCameraID[4]; - /* 0x04E7C */ daAlink_c* mPlayerPtr; - /* 0x04E80 */ daHorse_c* mHorseActor; + /* 0x04E7C */ void* mPlayerPtr[2]; // 0: Player, 1: Horse ; type may be wrong /* 0x04E84 */ void* mMsgObjectClass; /* 0x04E88 */ float mItemLifeCount; /* 0x04E8C */ int mItemRupeeCount; @@ -334,8 +352,8 @@ public: /* 0x04F90 */ JKRExpHeap* mMsgExpHeap; /* 0x04F94 */ char field_0x4F94[8]; // related to setWarpItemData /* 0x04F9C */ cXyz field_0x4f9c; // related to setWarpItemData - /* 0x04FA8 */ u8 field_0x4fa8[2]; - /* 0x04FAA */ u8 field_0x4faa; // related to setWarpItemData + /* 0x04FA8 */ s16 field_0x4fa8; + /* 0x04FAA */ s8 field_0x4faa; // related to setWarpItemData /* 0x04FAB */ u8 field_0x4fab; // related to setWarpItemData /* 0x04FAC */ u8 field_0x4fac; // related to setWarpItemData /* 0x04FAD */ u8 field_0x4fad[3]; @@ -367,279 +385,556 @@ class dRes_control_c { public: dRes_control_c() {} /* 8003BFB0 */ ~dRes_control_c(); - /* 8003C078 */ void setRes(char const*, dRes_info_c*, int, char const*, u8, JKRHeap*); - /* 8003C160 */ void syncRes(char const*, dRes_info_c*, int); + /* 8003C078 */ static int setRes(char const*, dRes_info_c*, int, char const*, u8, JKRHeap*); + /* 8003C160 */ static int syncRes(char const*, dRes_info_c*, int); /* 8003C194 */ void deleteRes(char const*, dRes_info_c*, int); /* 8003C37C */ void getRes(char const*, char const*, dRes_info_c*, int); + int setObjectRes(const char* name, u8 param_1, JKRHeap* heap) { + return setRes(name, &mResInfos1[0], ARRAY_SIZE(mResInfos1), "/res/Object/", param_1, heap); + } + + int syncObjectRes(const char* name) { + return syncRes(name, &mResInfos1[0], ARRAY_SIZE(mResInfos1)); + } + private: /* 0x0000 */ dRes_info_c mResInfos1[0x80]; /* 0x1200 */ dRes_info_c mResInfos2[0x40]; }; // Size: 0x1B00 -#pragma pack(push, 1) class dComIfG_inf_c { public: - dComIfG_inf_c(void) { this->ct(); } + dComIfG_inf_c() { this->ct(); } ~dComIfG_inf_c() {} - void ct(void); + void ct(); - // temp for setWarashibeItem - void setPlayUnkWarashibe1(u8 num) { play.setUnkWarashibe1(num); } - void setPlayUnkWarashibe2(u8 num) { play.setUnkWarashibe2(num); } - void setWorldDark(u8 state) { mWorldDark = state; } - u8 setWorldDark() { return mWorldDark; } - - dSv_player_c& getPlayer() { return info.getPlayer(); } - dSv_save_c& getSaveFile() { return info.getSavedata(); } - u32 getNowVibration() { return play.getNowVibration(); } - dDlst_peekZ_c& getdlstPeekZ() { return draw_list_list.dlstPeekZ; } - dComIfG_play_c& getPlay() { return play; } - dSv_memory_c& getMemory() { return info.getMemory(); } - dSv_event_c& getEvent() { return info.getTmp(); } - dSv_info_c& getInfo() { return info; } - inline dDlst_list_c& getDrawlist() { return draw_list_list; } - -private: /* 0x00000 */ dSv_info_c info; /* 0x00F38 */ dComIfG_play_c play; /* 0x05F64 */ dDlst_list_c draw_list_list; /* 0x1C110 */ u8 field_0x1C114[0x1E8 - 0xA]; /* 0x1C2F8 */ dRes_control_c mResControl; - /* 0x1DDF8 */ u8 field_0x1ddf8; + /* 0x1DDF8 */ u8 field_0x1ddf8; // related to fade, controls brightness /* 0x1DDF9 */ u8 mWorldDark; - /* 0x1DDFA */ u8 field_0x1ddfa; - /* 0x1DDFB */ u8 field_0x1ddfb; - /* 0x1DDFC */ u8 field_0x1ddfc; + /* 0x1DDFA */ s8 field_0x1ddfa; + /* 0x1DDFB */ s8 field_0x1ddfb; + /* 0x1DDFC */ s8 field_0x1ddfc; /* 0x1DE00 */ u32 field_0x1de00; /* 0x1DE04 */ u32 field_0x1de04; /* 0x1DE08 */ u8 field_0x1de08; /* 0x1DE09 */ u8 field_0x1de09; /* 0x1DE0A */ u8 field_0x1de0a; - u8 _pad[8]; + /* 0x1DE0B */ u8 field_0x1de0b; + /* 0x1DE0C */ u8 field_0x1de0c; static __d_timer_info_c dComIfG_mTimerInfo; }; -#pragma pack(pop) STATIC_ASSERT(122384 == sizeof(dComIfG_inf_c)); extern dComIfG_inf_c g_dComIfG_gameInfo; -/* void dComIfGp_setItemLifeCount(float, u8); +void dComIfGp_setItemLifeCount(float, u8); void dComIfGp_setItemRupeeCount(long); int dComIfGs_isItemFirstBit(u8); +u16 dComIfGs_getRupee(); +void dComIfGp_setSelectItem(int); +u8 dComIfGs_getMixItemIndex(int); +void dComIfGs_setSelectItemIndex(int, u8); +void dComIfGs_setMixItemIndex(int, u8); +u8 dComIfGs_getBottleMax(); +u8 dComIfGs_checkGetItem(u8); +void dComIfGs_setSelectEquipClothes(u8); +void dComIfG_get_timelayer(int*); +s32 dComIfGp_offHeapLockFlag(int); +void dComIfGp_createSubExpHeap2D(); +void dComIfGp_destroySubExpHeap2D(); +int dComIfGp_checkEmptySubHeap2D(); +int dComIfGp_searchUseSubHeap2D(int); +void dComIfGs_setLastWarpMarkItemData(const char*, cXyz, s16, s8, u8, u8); +u16 dComIfGs_getMaxLifeGauge(); inline void dComIfGp_setRStatus(u8 status, u8 flag) { - g_dComIfG_gameInfo.getPlay().setRStatus(status, flag); + g_dComIfG_gameInfo.play.setRStatus(status, flag); } + inline void dComIfGp_setDoStatus(u8 status, u8 flag) { - g_dComIfG_gameInfo.getPlay().setDoStatus(status, flag); + g_dComIfG_gameInfo.play.setDoStatus(status, flag); } + inline void dComIfGp_setAStatus(u8 status, u8 flag) { - g_dComIfG_gameInfo.getPlay().setAStatus(status, flag); + g_dComIfG_gameInfo.play.setAStatus(status, flag); } + inline void dComIfGp_setZStatus(u8 status, u8 flag) { - g_dComIfG_gameInfo.getPlay().setZStatus(status, flag); + g_dComIfG_gameInfo.play.setZStatus(status, flag); } + inline void dComIfGp_setItemMagicCount(s16 amount) { - g_dComIfG_gameInfo.getPlay().setItemMagicCount(amount); + g_dComIfG_gameInfo.play.setItemMagicCount(amount); } + inline void dComIfGp_setItemMaxMagicCount(s16 max) { - g_dComIfG_gameInfo.getPlay().setItemMaxMagicCount(max); + g_dComIfG_gameInfo.play.setItemMaxMagicCount(max); } + inline void dComIfGp_setItemArrowNumCount(s16 amount) { - g_dComIfG_gameInfo.getPlay().setItemArrowNumCount(amount); + g_dComIfG_gameInfo.play.setItemArrowNumCount(amount); } + inline void dComIfGp_setItemPachinkoNumCount(s16 amount) { - g_dComIfG_gameInfo.getPlay().setItemPachinkoNumCount(amount); + g_dComIfG_gameInfo.play.setItemPachinkoNumCount(amount); } + +inline void dComIfGp_setItemBombNumCount(u8 param_0, s16 amount) { + g_dComIfG_gameInfo.play.setItemBombNumCount(param_0, amount); +} + inline void dComIfGp_setItemKeyNumCount(s16 amount) { - g_dComIfG_gameInfo.getPlay().setItemKeyNumCount(amount); + g_dComIfG_gameInfo.play.setItemKeyNumCount(amount); } + inline void dComIfGp_setItemMaxLifeCount(s16 max) { - g_dComIfG_gameInfo.getPlay().setItemMaxLifeCount(max); + g_dComIfG_gameInfo.play.setItemMaxLifeCount(max); } -inline void dComIfGs_onDungeonItemMap(void) { - g_dComIfG_gameInfo.getMemory().getTempFlags().onDungeonItemMap(); + +inline void dComIfGs_onDungeonItemMap() { + g_dComIfG_gameInfo.info.getMemory().getBit().onDungeonItemMap(); } -inline void dComIfGs_onDungeonItemCompass(void) { - g_dComIfG_gameInfo.getMemory().getTempFlags().onDungeonItemCompass(); + +inline void dComIfGs_onDungeonItemCompass() { + g_dComIfG_gameInfo.info.getMemory().getBit().onDungeonItemCompass(); } -inline void dComIfGs_onDungeonItemWarp(void) { - g_dComIfG_gameInfo.getMemory().getTempFlags().onDungeonItemWarp(); + +inline void dComIfGs_onDungeonItemWarp() { + g_dComIfG_gameInfo.info.getMemory().getBit().onDungeonItemWarp(); } + inline void dComIfGs_setItem(int slot, u8 i_no) { - g_dComIfG_gameInfo.getSaveFile().getPlayerItem().setItem(slot, i_no); + g_dComIfG_gameInfo.info.getPlayer().getItem().setItem(slot, i_no); } + inline void dComIfGs_setOxygen(int amount) { - g_dComIfG_gameInfo.getPlay().setOxygen(amount); + g_dComIfG_gameInfo.play.setOxygen(amount); } + inline void dComIfGs_setMaxOxygen(int max) { - g_dComIfG_gameInfo.getPlay().setMaxOxygen(max); + g_dComIfG_gameInfo.play.setMaxOxygen(max); } + inline void dComIfGs_setOil(u16 amount) { - g_dComIfG_gameInfo.getSaveFile().getPlayerStatusA().setOil(amount); + g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().setOil(amount); } + inline void dComIfGs_setMaxOil(u16 max) { - g_dComIfG_gameInfo.getSaveFile().getPlayerStatusA().setMaxOil(max); + g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().setMaxOil(max); } + inline void dComIfGs_setWalletSize(u8 size) { - g_dComIfG_gameInfo.getSaveFile().getPlayerStatusA().setWalletSize(size); + g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().setWalletSize(size); } + inline void dComIfGs_setMagic(u8 amount) { - g_dComIfG_gameInfo.getSaveFile().getPlayerStatusA().setMagic(amount); + g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().setMagic(amount); } + inline void dComIfGs_setMaxMagic(u8 max) { - g_dComIfG_gameInfo.getSaveFile().getPlayerStatusA().setMaxMagic(max); + g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().setMaxMagic(max); } + inline void dComIfGs_setRupee(u16 amount) { - g_dComIfG_gameInfo.getSaveFile().getPlayerStatusA().setRupee(amount); + g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().setRupee(amount); } + inline void dComIfGs_setLife(u16 amount) { - g_dComIfG_gameInfo.getSaveFile().getPlayerStatusA().setLife(amount); + g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().setLife(amount); } + inline void dComIfGs_setMaxLife(u8 max) { - g_dComIfG_gameInfo.getSaveFile().getPlayerStatusA().setMaxLife(max); + g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().setMaxLife(max); } -inline void dComIfGs_onDungeonItemBossKey(void) { - g_dComIfG_gameInfo.getMemory().getTempFlags().onDungeonItemBossKey(); + +inline void dComIfGs_onDungeonItemBossKey() { + g_dComIfG_gameInfo.info.getMemory().getBit().onDungeonItemBossKey(); } + inline void dComIfGs_setCollectSword(u8 sword_id) { - g_dComIfG_gameInfo.getSaveFile().getPlayerCollect().setCollect(SWORD_BITFIELD, sword_id); + g_dComIfG_gameInfo.info.getPlayer().getCollect().setCollect(COLLECT_SWORD, sword_id); } + inline void dComIfGs_setCollectShield(u8 shield_id) { - g_dComIfG_gameInfo.getSaveFile().getPlayerCollect().setCollect(SHIELD_BITFIELD, shield_id); + g_dComIfG_gameInfo.info.getPlayer().getCollect().setCollect(COLLECT_SHIELD, shield_id); } + inline void dComIfGs_setCollectClothes(u8 clothes_id) { - g_dComIfG_gameInfo.getSaveFile().getPlayerCollect().setCollect(CLOTHING_BITFIELD, clothes_id); + g_dComIfG_gameInfo.info.getPlayer().getCollect().setCollect(COLLECT_CLOTHING, clothes_id); } -inline void dComIfGs_setRodTypeLevelUp(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayerItem().setRodTypeLevelUp(); + +inline void dComIfGs_setRodTypeLevelUp() { + g_dComIfG_gameInfo.info.getPlayer().getItem().setRodTypeLevelUp(); } + inline void dComIfGs_setArrowNum(u8 amount) { - g_dComIfG_gameInfo.getSaveFile().getPlayerItemRecord().setArrowNum(amount); + g_dComIfG_gameInfo.info.getPlayer().getItemRecord().setArrowNum(amount); } + inline void dComIfGs_setArrowMax(u8 max) { - g_dComIfG_gameInfo.getSaveFile().getPlayerItemMax().setArrowNum(max); + g_dComIfG_gameInfo.info.getPlayer().getItemMax().setArrowNum(max); } -inline u8 dComIfGs_getPachinkoMax(void) { + +inline u8 dComIfGs_getPachinkoMax() { return 50; } -inline void dComIfGs_setEmptyBombBag(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayerItem().setEmptyBombBag(); + +inline void dComIfGs_setEmptyBombBag() { + g_dComIfG_gameInfo.info.getPlayer().getItem().setEmptyBombBag(); } + inline void dComIfGs_setEmptyBombBag(u8 type, u8 amount) { - g_dComIfG_gameInfo.getSaveFile().getPlayerItem().setEmptyBombBag(type, amount); + g_dComIfG_gameInfo.info.getPlayer().getItem().setEmptyBombBag(type, amount); } + inline void dComIfGs_setEmptyBombBagItemIn(u8 type, bool unk) { - g_dComIfG_gameInfo.getSaveFile().getPlayerItem().setEmptyBombBagItemIn(type, unk); + g_dComIfG_gameInfo.info.getPlayer().getItem().setEmptyBombBagItemIn(type, unk); } -inline void dComIfGs_setEmptyBottle(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayerItem().setEmptyBottle(); + +inline void dComIfGs_setEmptyBottle() { + g_dComIfG_gameInfo.info.getPlayer().getItem().setEmptyBottle(); } + inline void dComIfGs_setEmptyBottle(u8 type) { - g_dComIfG_gameInfo.getSaveFile().getPlayerItem().setEmptyBottle(type); + g_dComIfG_gameInfo.info.getPlayer().getItem().setEmptyBottle(type); } + inline void dComIfGs_setEmptyBottleItemIn(u8 type) { - g_dComIfG_gameInfo.getSaveFile().getPlayerItem().setEmptyBottleItemIn(type); + g_dComIfG_gameInfo.info.getPlayer().getItem().setEmptyBottleItemIn(type); } + +inline void dComIfGs_setBottleNum(u8 param_0, u8 param_1) { + g_dComIfG_gameInfo.info.getPlayer().getItemRecord().setBottleNum(param_0, param_1); +} + inline void dComIfGs_onEventBit(u16 id) { - g_dComIfG_gameInfo.getSaveFile().getEventFlags().onEventBit(id); + g_dComIfG_gameInfo.info.getSavedata().getEvent().onEventBit(id); } + inline void dComIfGs_onLightDropFlag(u8 area_id) { - g_dComIfG_gameInfo.getSaveFile().getLightDrop().onLightDropGetFlag(area_id); + g_dComIfG_gameInfo.info.getPlayer().getLightDrop().onLightDropGetFlag(area_id); } + inline void dComIfGs_onSwitch(int param1, int param2) { - g_dComIfG_gameInfo.getInfo().onSwitch(param1, param2); + g_dComIfG_gameInfo.info.onSwitch(param1, param2); } -inline bool dComIfGs_isDungeonItemMap(void) { - return g_dComIfG_gameInfo.getMemory().getTempFlags().isDungeonItemMap(); + +inline void dComIfGs_offSwitch(int param1, int param2) { + g_dComIfG_gameInfo.info.offSwitch(param1, param2); } -inline bool dComIfGs_isDungeonItemBossKey(void) { - return g_dComIfG_gameInfo.getMemory().getTempFlags().isDungeonItemBossKey(); + +inline BOOL dComIfGs_isSwitch(int param1, int param2) { + return g_dComIfG_gameInfo.info.isSwitch(param1, param2); } + +inline s32 dComIfGs_isDungeonItemMap() { + return g_dComIfG_gameInfo.info.getMemory().getBit().isDungeonItemMap(); +} + +inline s32 dComIfGs_isDungeonItemBossKey() { + return g_dComIfG_gameInfo.info.getMemory().getBit().isDungeonItemBossKey(); +} + inline u8 dComIfGs_getItem(int slot, bool unk) { - return g_dComIfG_gameInfo.getSaveFile().getPlayerItem().getItem(slot, unk); + return g_dComIfG_gameInfo.info.getPlayer().getItem().getItem(slot, unk); } + inline BOOL dComIfGs_isCollectSword(u8 sword_id) { - return g_dComIfG_gameInfo.getSaveFile().getPlayerCollect().isCollect(SWORD_BITFIELD, sword_id); + return g_dComIfG_gameInfo.info.getPlayer().getCollect().isCollect(COLLECT_SWORD, sword_id); } + inline BOOL dComIfGs_isCollectClothing(u8 clothing_id) { - return g_dComIfG_gameInfo.getSaveFile().getPlayerCollect().isCollect(CLOTHING_BITFIELD, - clothing_id); + return g_dComIfG_gameInfo.info.getPlayer().getCollect().isCollect(COLLECT_CLOTHING, + clothing_id); } + inline u8 dComIfGs_checkBottle(u8 type) { - return g_dComIfG_gameInfo.getSaveFile().getPlayerItem().checkBottle(type); + return g_dComIfG_gameInfo.info.getPlayer().getItem().checkBottle(type); } + inline BOOL dComIfGs_isLightDropGetFlag(u8 area_id) { - return g_dComIfG_gameInfo.getSaveFile().getLightDrop().isLightDropGetFlag(area_id); + return g_dComIfG_gameInfo.info.getPlayer().getLightDrop().isLightDropGetFlag(area_id); } -inline u8 dComIfGs_getArrowMax(void) { - return g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItemMax().getArrowNum(); + +inline u8 dComIfGs_getArrowMax() { + return g_dComIfG_gameInfo.info.getPlayer().getItemMax().getArrowNum(); } -inline u8 dComIfGs_getCollectSmell(void) { - return g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerStatusA().getSelectEquip(3); + +inline u8 dComIfGs_getCollectSmell() { + return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().getSelectEquip(3); } -inline u8 dComIfGs_getPohSpiritNum(void) { - return g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerCollect().getPohNum(); + +inline u8 dComIfGs_getPohSpiritNum() { + return g_dComIfG_gameInfo.info.getPlayer().getCollect().getPohNum(); } -inline u8 dComIfGs_getKeyNum(void) { - return g_dComIfG_gameInfo.getMemory().getTempFlags().getKeyNum(); + +inline u8 dComIfGs_getKeyNum() { + return g_dComIfG_gameInfo.info.getMemory().getBit().getKeyNum(); } + inline void dComIfGs_onItemFirstBit(u8 i_no) { - g_dComIfG_gameInfo.getSaveFile().getPlayerGetItem().onFirstBit(i_no); + g_dComIfG_gameInfo.info.getPlayer().getGetItem().onFirstBit(i_no); } -inline u16 dComIfGs_getMaxLife(void) { - return g_dComIfG_gameInfo.getSaveFile().getPlayerStatusA().getMaxLife(); + +inline u16 dComIfGs_getMaxLife() { + return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().getMaxLife(); } + inline void dComIfGs_offEventBit(u16 event) { - g_dComIfG_gameInfo.getSaveFile().getEventFlags().offEventBit(event); + g_dComIfG_gameInfo.info.getSavedata().getEvent().offEventBit(event); } + // inline int dComIfGs_isEventBit__FUs(u16 event) { -// return g_dComIfG_gameInfo.getSaveFile().getEventFlags().isEventBit(event); +// return g_dComIfG_gameInfo.getSaveFile().getTmp().isEventBit(event); // } -inline const char* dComIfGs_getLastWarpMarkStageName(void) { - return g_dComIfG_gameInfo.getSaveFile().getPlayerLastMarkInfo().getName(); + +inline const char* dComIfGs_getLastWarpMarkStageName() { + return g_dComIfG_gameInfo.info.getPlayer().getPlayerLastMarkInfo().getName(); } -inline cXyz dComIfGs_getLastWarpMarkPlayerPos(void) { - return g_dComIfG_gameInfo.getSaveFile().getPlayerLastMarkInfo().getPos(); + +inline cXyz dComIfGs_getLastWarpMarkPlayerPos() { + return g_dComIfG_gameInfo.info.getPlayer().getPlayerLastMarkInfo().getPos(); } -inline s16 dComIfGs_getLastWarpMarkPlayerAngleY(void) { - return g_dComIfG_gameInfo.getSaveFile().getPlayerLastMarkInfo().getAngleY(); + +inline s16 dComIfGs_getLastWarpMarkPlayerAngleY() { + return g_dComIfG_gameInfo.info.getPlayer().getPlayerLastMarkInfo().getAngleY(); } -inline s8 dComIfGs_getLastWarpMarkRoomNo(void) { - return g_dComIfG_gameInfo.getSaveFile().getPlayerLastMarkInfo().getRoomNo(); + +inline s8 dComIfGs_getLastWarpMarkRoomNo() { + return g_dComIfG_gameInfo.info.getPlayer().getPlayerLastMarkInfo().getRoomNo(); } -inline char dComIfGs_getLastWarpAcceptStage(void) { - return g_dComIfG_gameInfo.getSaveFile().getPlayerLastMarkInfo().getWarpAcceptStage(); + +inline char dComIfGs_getLastWarpAcceptStage() { + return g_dComIfG_gameInfo.info.getPlayer().getPlayerLastMarkInfo().getWarpAcceptStage(); } -inline u8 dComIfGs_getSelectEquipClothes(void) { - return g_dComIfG_gameInfo.getSaveFile().getPlayerStatusA().getSelectEquip(CLOTHING_BITFIELD); + +inline u8 dComIfGs_getSelectEquipClothes() { + return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().getSelectEquip(COLLECT_CLOTHING); } -inline u8 dComIfGs_getSelectEquipSword(void) { - return g_dComIfG_gameInfo.getSaveFile().getPlayerStatusA().getSelectEquip(SWORD_BITFIELD); + +inline u8 dComIfGs_getSelectEquipSword() { + return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().getSelectEquip(COLLECT_SWORD); } -inline u8 dComIfGs_getSelectEquipShield(void) { - return g_dComIfG_gameInfo.getSaveFile().getPlayerStatusA().getSelectEquip(SHIELD_BITFIELD); + +inline u8 dComIfGs_getSelectEquipShield() { + return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().getSelectEquip(COLLECT_SHIELD); } + inline u8 dComIfGs_getLightDropNum(u8 area_id) { - return g_dComIfG_gameInfo.getSaveFile().getLightDrop().getLightDropNum(area_id); + return g_dComIfG_gameInfo.info.getPlayer().getLightDrop().getLightDropNum(area_id); } + inline u8 dComIfGs_getSelectItemIndex(int idx) { - return g_dComIfG_gameInfo.getPlayer().getPlayerStatusA().getSelectItemIndex(idx); + return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().getSelectItemIndex(idx); } + inline void dComIfGp_setItem(u8 slot, u8 i_no) { - g_dComIfG_gameInfo.getPlay().setItem(slot, i_no); + g_dComIfG_gameInfo.play.setItem(slot, i_no); } -inline u32 dComIfGp_getNowVibration(void) { - return g_dComIfG_gameInfo.getPlay().getNowVibration(); + +inline u32 dComIfGp_getNowVibration() { + return g_dComIfG_gameInfo.play.getNowVibration(); } -inline char* dComIfGp_getStartStageName(void) { - return g_dComIfG_gameInfo.getPlay().getStartStageName(); + +inline char* dComIfGp_getStartStageName() { + return g_dComIfG_gameInfo.play.getStartStageName(); +} + +inline void dComIfGd_reset() { + g_dComIfG_gameInfo.draw_list_list.reset(); +} + +inline u8 dComIfGs_getOptVibration() { + return g_dComIfG_gameInfo.info.getPlayer().getConfig().getVibration(); +} + +inline s8 dComIfGp_roomControl_getStayNo() { + return dStage_roomControl_c::getStayNo(); +} + +inline s8 dComIfGp_getStartStageRoomNo() { + return g_dComIfG_gameInfo.play.getStartStageRoomNo(); +} + +inline s8 dComIfGp_getStartStageLayer() { + return g_dComIfG_gameInfo.play.getStartStageLayer(); +} + +inline roomRead_class* dComIfGp_getStageRoom() { + return g_dComIfG_gameInfo.play.getStage().getRoom(); +} + +inline stage_stag_info_class* dComIfGp_getStageStagInfo() { + return g_dComIfG_gameInfo.play.getStage().getStagInfo(); +} + +inline BOOL dComIfGs_isTbox(int i_no) { + return g_dComIfG_gameInfo.info.getMemory().getBit().isTbox(i_no); +} + +inline BOOL dComIfGs_isSaveTbox(int i_stageNo, int i_no) { + return g_dComIfG_gameInfo.info.getSavedata().getSave(i_stageNo).getBit().isTbox(i_no); +} + +inline void dComIfGs_onSaveSwitch(int i_stageNo, int i_no) { + g_dComIfG_gameInfo.info.getSavedata().getSave(i_stageNo).getBit().onSwitch(i_no); +} + +inline void dComIfGs_offSaveSwitch(int i_stageNo, int i_no) { + g_dComIfG_gameInfo.info.getSavedata().getSave(i_stageNo).getBit().offSwitch(i_no); +} + +inline BOOL dComIfGs_isSaveSwitch(int i_stageNo, int i_no) { + return g_dComIfG_gameInfo.info.getSavedata().getSave(i_stageNo).getBit().isSwitch(i_no); +} + +inline void dComIfGs_onStageBossEnemy() { + g_dComIfG_gameInfo.info.getMemory().getBit().onStageBossEnemy(); +} + +inline s32 dComIfGs_isDungeonItemWarp() { + return g_dComIfG_gameInfo.info.getMemory().getBit().isDungeonItemWarp(); +} + +inline u8 dComIfGp_isHeapLockFlag() { + return g_dComIfG_gameInfo.play.isHeapLockFlag(); +} + +inline void dComIfGp_setSubHeapLockFlag(int idx, u8 status) { + g_dComIfG_gameInfo.play.setSubHeapLockFlag(idx, status); +} + +inline u8 dComIfGp_getSubHeapLockFlag(int idx) { + return g_dComIfG_gameInfo.play.getSubHeapLockFlag(idx); +} + +inline JKRExpHeap* dComIfGp_getSubExpHeap2D(int idx) { + return g_dComIfG_gameInfo.play.getSubExpHeap2D(idx); +} + +inline void dComIfGp_setSubExpHeap2D(int idx, void* heap) { + g_dComIfG_gameInfo.play.setSubExpHeap2D(idx, heap); +} + +inline void dComIfGp_offEnableNextStage() { + g_dComIfG_gameInfo.play.offEnableNextStage(); +} + +inline void dComIfGs_setKeyNum(u8 keyNum) { + g_dComIfG_gameInfo.info.getMemory().getBit().setKeyNum(keyNum); +} + +void dComIfGs_setKeyNum(int i_stageNo, u8 keyNum); + +inline int dComIfG_getTimerMode() { + return g_dComIfG_gameInfo.play.getTimerMode(); +} + +inline dTimer_c* dComIfG_getTimerPtr() { + return g_dComIfG_gameInfo.play.getTimerPtr(); +} + +inline void dComIfGp_roomControl_initZone() { + g_dComIfG_gameInfo.play.getRoomControl()->initZone(); +} + +inline bool dComIfG_setObjectRes(const char* name, u8 param_1, JKRHeap* heap) { + return g_dComIfG_gameInfo.mResControl.setObjectRes(name, param_1, heap); +} + +inline int dComIfG_syncObjectRes(const char* name) { + return g_dComIfG_gameInfo.mResControl.syncObjectRes(name); +} + +inline JKRHeap* dComIfGp_getExpHeap2D() { + return g_dComIfG_gameInfo.play.getExpHeap2D(); +} + +inline u16 dComIfGs_getOil() { + return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().getOil(); +} + +inline s64 dComIfGs_getSaveStartTime() { + return g_dComIfG_gameInfo.info.getStartTime(); +} + +inline s64 dComIfGs_getSaveTotalTime() { + return g_dComIfG_gameInfo.info.getSaveTotalTime(); +} + +inline dSv_save_c& dComIfGs_getSaveData() { + return g_dComIfG_gameInfo.info.getSavedata(); +} + +inline void dComIfGs_setLineUpItem() { + g_dComIfG_gameInfo.info.getPlayer().getItem().setLineUpItem(); +} + +inline void dComIfGp_setNowVibration(u8 status) { + g_dComIfG_gameInfo.play.setNowVibration(status); +} + +inline s32 dComIfGs_isGetMagicUseFlag() { + return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().isMagicFlag(0); +} + +inline void dComIfGs_offTmpBit(u16 flag) { + g_dComIfG_gameInfo.info.getTmp().offEventBit(flag); +} + +inline dAttention_c& dComIfGp_getAttention() { + return g_dComIfG_gameInfo.play.getAttention(); +} + +inline BOOL dComIfGs_isDarkClearLV(int param_0) { + return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusB().isDarkClearLV(param_0); +} + +inline BOOL dComIfGs_isTmpBit(u16 flag) { + return g_dComIfG_gameInfo.info.getTmp().isEventBit(flag); +} + +inline BOOL dComIfGs_isTransformLV(int param_0) { + return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusB().isTransformLV(param_0); +} + +inline void dComIfGs_onStageLife() { + g_dComIfG_gameInfo.info.getMemory().getBit().onStageLife(); +} + +inline u8 dComIfGs_getBombNum(u8 param_0) { + return g_dComIfG_gameInfo.info.getPlayer().getItemRecord().getBombNum(param_0); +} + +inline u8 dComIfGs_getPachinkoNum() { + return g_dComIfG_gameInfo.info.getPlayer().getItemRecord().getPachinkoNum(); +} + +inline u8 dComIfGs_getBottleNum(u8 param_0) { + return g_dComIfG_gameInfo.info.getPlayer().getItemRecord().getBottleNum(param_0); +} + +inline u8 dComIfGs_getBombMax(u8 param_0) { + return g_dComIfG_gameInfo.info.getPlayer().getItemMax().getBombNum(param_0); +} + +inline void dComIfGs_setBombNum(u8 param_0, u8 param_1) { + g_dComIfG_gameInfo.info.getPlayer().getItemRecord().setBombNum(param_0, param_1); +} + +inline void dComIfGs_setPachinkoNum(u8 param_0) { + g_dComIfG_gameInfo.info.getPlayer().getItemRecord().setPachinkoNum(param_0); +} + +inline void dComIfGs_addBottleNum(u8 param_0, s16 param_1) { + g_dComIfG_gameInfo.info.getPlayer().getItemRecord().addBottleNum(param_0, param_1); } -inline void dComIfGd_reset(void) { - g_dComIfG_gameInfo.getDrawlist().reset(); -} */ #endif /* D_COM_D_COM_INF_GAME_H */ diff --git a/include/d/d_attention.h b/include/d/d_attention.h index a2b2147b88e..7758314a47c 100644 --- a/include/d/d_attention.h +++ b/include/d/d_attention.h @@ -27,11 +27,13 @@ private: class dAttCatch_c { public: dAttCatch_c() {} - void convPId(unsigned int); + s32 convPId(unsigned int); void init(); void proc(); void request(fopAc_ac_c*, u8, f32, f32, f32, s16, int); + s32 getCatghTarget() { return convPId(field_0x10); } + private: void* field_0x0; u32 field_0x4; @@ -188,6 +190,8 @@ public: /* 800737E4 */ void LockonTruth(); /* 80073838 */ void checkDistance(cXyz*, s16, cXyz*, f32, f32, f32, f32); + dAttCatch_c& getCatghTarget() { return mCatghTarget; } + static u8 loc_type_tbl[12]; static u8 act_type_tbl[20]; static u8 dist_table[6552]; diff --git a/include/d/d_bomb.h b/include/d/d_bomb.h index b021b0a4119..7a9b57caee4 100644 --- a/include/d/d_bomb.h +++ b/include/d/d_bomb.h @@ -15,7 +15,7 @@ public: u32 checkWaterBomb() const { return checkStateFlg0(WATER_BOMB); } /* 0x000 */ fopAc_ac_c mActor; - /* 0x570 */ u8 field_0x570[8]; + /* 0x568 */ u8 field_0x568[0x10]; /* 0x578 */ dBgS_Acch mAcch; /* 0x750 */ dBgS_AcchCir mAcchCir; /* 0x790 */ dCcD_Stts mStts; diff --git a/include/d/d_item.h b/include/d/d_item.h index 20e8cf36cb7..af66f97e0f0 100644 --- a/include/d/d_item.h +++ b/include/d/d_item.h @@ -1,6 +1,390 @@ #ifndef D_D_ITEM_H #define D_D_ITEM_H +#include "d/com/d_com_inf_game.h" #include "dolphin/types.h" +void item_func_HEART(); +void item_func_GREEN_RUPEE(); +void item_func_BLUE_RUPEE(); +void item_func_YELLOW_RUPEE(); +void item_func_RED_RUPEE(); +void item_func_PURPLE_RUPEE(); +void item_func_ORANGE_RUPEE(); +void item_func_SILVER_RUPEE(); +void item_func_S_MAGIC(); +void item_func_L_MAGIC(); +void item_func_BOMB_5(); +void item_func_BOMB_10(); +void item_func_BOMB_20(); +void item_func_BOMB_30(); +void item_func_ARROW_10(); +void item_func_ARROW_20(); +void item_func_ARROW_30(); +void item_func_ARROW_1(); +void item_func_PACHINKO_SHOT(); +void item_func_WATER_BOMB_5(); +void item_func_WATER_BOMB_10(); +void item_func_WATER_BOMB_20(); +void item_func_WATER_BOMB_30(); +void item_func_BOMB_INSECT_5(); +void item_func_BOMB_INSECT_10(); +void item_func_BOMB_INSECT_20(); +void item_func_BOMB_INSECT_30(); +void item_func_RECOVER_FAILY(); +void item_func_TRIPLE_HEART(); +void item_func_SMALL_KEY(); +void item_func_KAKERA_HEART(); +void item_func_UTUWA_HEART(); +void item_func_MAP(); +void item_func_COMPUS(); +void item_func_DUNGEON_EXIT(); +void item_func_BOSS_KEY(); +void item_func_DUNGEON_BACK(); +void item_func_SWORD(); +void item_func_MASTER_SWORD(); +void item_func_WOOD_SHIELD(); +void item_func_SHIELD(); +void item_func_HYLIA_SHIELD(); +void item_func_TKS_LETTER(); +void item_func_WEAR_CASUAL(); +void item_func_WEAR_KOKIRI(); +void item_func_ARMOR(); +void item_func_WEAR_ZORA(); +void item_func_MAGIC_LV1(); +void item_func_DUNGEON_EXIT_2(); +void item_func_WALLET_LV1(); +void item_func_WALLET_LV2(); +void item_func_WALLET_LV3(); +void item_func_ZORAS_JEWEL(); +void item_func_HAWK_EYE(); +void item_func_WOOD_STICK(); +void item_func_BOOMERANG(); +void item_func_SPINNER(); +void item_func_IRONBALL(); +void item_func_BOW(); +void item_func_HOOKSHOT(); +void item_func_HVY_BOOTS(); +void item_func_COPY_ROD(); +void item_func_W_HOOKSHOT(); +void item_func_KANTERA(); +void item_func_LIGHT_SWORD(); +void item_func_FISHING_ROD_1(); +void item_func_PACHINKO(); +void item_func_COPY_ROD_2(); +void item_func_BOMB_BAG_LV2(); +void item_func_BOMB_BAG_LV1(); +void item_func_BOMB_IN_BAG(); +void item_func_LIGHT_ARROW(); +void item_func_ARROW_LV1(); +void item_func_ARROW_LV2(); +void item_func_ARROW_LV3(); +void item_func_LURE_ROD(); +void item_func_BOMB_ARROW(); +void item_func_HAWK_ARROW(); +void item_func_BEE_ROD(); +void item_func_JEWEL_ROD(); +void item_func_WORM_ROD(); +void item_func_JEWEL_BEE_ROD(); +void item_func_JEWEL_WORM_ROD(); +void item_func_EMPTY_BOTTLE(); +void item_func_RED_BOTTLE(); +void item_func_GREEN_BOTTLE(); +void item_func_BLUE_BOTTLE(); +void item_func_MILK_BOTTLE(); +void item_func_HALF_MILK_BOTTLE(); +void item_func_OIL_BOTTLE(); +void item_func_WATER_BOTTLE(); +void item_func_OIL_BOTTLE2(); +void item_func_RED_BOTTLE2(); +void item_func_UGLY_SOUP(); +void item_func_HOT_SPRING(); +void item_func_FAIRY_BOTTLE(); +void item_func_HOT_SPRING2(); +void item_func_OIL2(); +void item_func_OIL(); +void item_func_NORMAL_BOMB(); +void item_func_WATER_BOMB(); +void item_func_POKE_BOMB(); +void item_func_FAIRY_DROP(); +void item_func_WORM(); +void item_func_DROP_BOTTLE(); +void item_func_BEE_CHILD(); +void item_func_CHUCHU_RARE(); +void item_func_CHUCHU_RED(); +void item_func_CHUCHU_BLUE(); +void item_func_CHUCHU_GREEN(); +void item_func_CHUCHU_YELLOW(); +void item_func_CHUCHU_PURPLE(); +void item_func_LV1_SOUP(); +void item_func_LV2_SOUP(); +void item_func_LV3_SOUP(); +void item_func_LETTER(); +void item_func_BILL(); +void item_func_WOOD_STATUE(); +void item_func_IRIAS_PENDANT(); +void item_func_HORSE_FLUTE(); +void item_func_RAFRELS_MEMO(); +void item_func_ASHS_SCRIBBLING(); +void item_func_CHUCHU_YELLOW2(); +void item_func_OIL_BOTTLE3(); +void item_func_SHOP_BEE_CHILD(); +void item_func_CHUCHU_BLACK(); +void item_func_LIGHT_DROP(); +void item_func_DROP_CONTAINER(); +void item_func_DROP_CONTAINER02(); +void item_func_DROP_CONTAINER03(); +void item_func_FILLED_CONTAINER(); +void item_func_MIRROR_PIECE_2(); +void item_func_MIRROR_PIECE_3(); +void item_func_MIRROR_PIECE_4(); +void item_func_SMELL_YELIA_POUCH(); +void item_func_SMELL_PUMPKIN(); +void item_func_SMELL_POH(); +void item_func_SMELL_FISH(); +void item_func_SMELL_CHILDREN(); +void item_func_SMELL_MEDICINE(); +void item_func_M_BEETLE(); +void item_func_F_BEETLE(); +void item_func_M_BUTTERFLY(); +void item_func_F_BUTTERFLY(); +void item_func_M_STAG_BEETLE(); +void item_func_F_STAG_BEETLE(); +void item_func_M_GRASSHOPPER(); +void item_func_F_GRASSHOPPER(); +void item_func_M_NANAFUSHI(); +void item_func_F_NANAFUSHI(); +void item_func_M_DANGOMUSHI(); +void item_func_F_DANGOMUSHI(); +void item_func_M_MANTIS(); +void item_func_F_MANTIS(); +void item_func_M_LADYBUG(); +void item_func_F_LADYBUG(); +void item_func_M_SNAIL(); +void item_func_F_SNAIL(); +void item_func_M_DRAGONFLY(); +void item_func_F_DRAGONFLY(); +void item_func_M_ANT(); +void item_func_F_ANT(); +void item_func_M_MAYFLY(); +void item_func_F_MAYFLY(); +void item_func_POU_SPIRIT(); +void item_func_ANCIENT_DOCUMENT(); +void item_func_AIR_LETTER(); +void item_func_ANCIENT_DOCUMENT2(); +void item_func_LV7_DUNGEON_EXIT(); +void item_func_LINKS_SAVINGS(); +void item_func_SMALL_KEY2(); +void item_func_POU_FIRE1(); +void item_func_POU_FIRE2(); +void item_func_POU_FIRE3(); +void item_func_POU_FIRE4(); +void item_func_BOSSRIDER_KEY(); +void item_func_TOMATO_PUREE(); +void item_func_TASTE(); +void item_func_LV5_BOSS_KEY(); +void item_func_SURFBOARD(); +void item_func_KANTERA2(); +void item_func_L2_KEY_PIECES1(); +void item_func_L2_KEY_PIECES2(); +void item_func_L2_KEY_PIECES3(); +void item_func_KEY_OF_CARAVAN(); +void item_func_LV2_BOSS_KEY(); +void item_func_KEY_OF_FILONE(); +void item_func_noentry(); + +s32 item_getcheck_func_HEART(); +s32 item_getcheck_func_GREEN_RUPEE(); +s32 item_getcheck_func_BLUE_RUPEE(); +s32 item_getcheck_func_YELLOW_RUPEE(); +s32 item_getcheck_func_RED_RUPEE(); +s32 item_getcheck_func_PURPLE_RUPEE(); +s32 item_getcheck_func_ORANGE_RUPEE(); +s32 item_getcheck_func_SILVER_RUPEE(); +s32 item_getcheck_func_S_MAGIC(); +s32 item_getcheck_func_L_MAGIC(); +s32 item_getcheck_func_BOMB_5(); +s32 item_getcheck_func_BOMB_10(); +s32 item_getcheck_func_BOMB_20(); +s32 item_getcheck_func_BOMB_30(); +s32 item_getcheck_func_ARROW_10(); +s32 item_getcheck_func_ARROW_20(); +s32 item_getcheck_func_ARROW_30(); +s32 item_getcheck_func_ARROW_1(); +s32 item_getcheck_func_PACHINKO_SHOT(); +s32 item_getcheck_func_WATER_BOMB_5(); +s32 item_getcheck_func_WATER_BOMB_10(); +s32 item_getcheck_func_WATER_BOMB_20(); +s32 item_getcheck_func_WATER_BOMB_30(); +s32 item_getcheck_func_BOMB_INSECT_5(); +s32 item_getcheck_func_BOMB_INSECT_10(); +s32 item_getcheck_func_BOMB_INSECT_20(); +s32 item_getcheck_func_BOMB_INSECT_30(); +s32 item_getcheck_func_RECOVER_FAILY(); +s32 item_getcheck_func_TRIPLE_HEART(); +s32 item_getcheck_func_SMALL_KEY(); +s32 item_getcheck_func_KAKERA_HEART(); +s32 item_getcheck_func_UTUWA_HEART(); +s32 item_getcheck_func_MAP(); +s32 item_getcheck_func_COMPUS(); +s32 item_getcheck_func_DUNGEON_EXIT(); +s32 item_getcheck_func_BOSS_KEY(); +s32 item_getcheck_func_DUNGEON_BACK(); +s32 item_getcheck_func_SWORD(); +s32 item_getcheck_func_MASTER_SWORD(); +s32 item_getcheck_func_WOOD_SHIELD(); +s32 item_getcheck_func_SHIELD(); +s32 item_getcheck_func_HYLIA_SHIELD(); +s32 item_getcheck_func_TKS_LETTER(); +s32 item_getcheck_func_WEAR_CASUAL(); +s32 item_getcheck_func_WEAR_KOKIRI(); +s32 item_getcheck_func_ARMOR(); +s32 item_getcheck_func_WEAR_ZORA(); +s32 item_getcheck_func_MAGIC_LV1(); +s32 item_getcheck_func_DUNGEON_EXIT_2(); +s32 item_getcheck_func_WALLET_LV1(); +s32 item_getcheck_func_WALLET_LV2(); +s32 item_getcheck_func_WALLET_LV3(); +s32 item_getcheck_func_ZORAS_JEWEL(); +s32 item_getcheck_func_HAWK_EYE(); +s32 item_getcheck_func_WOOD_STICK(); +s32 item_getcheck_func_BOOMERANG(); +s32 item_getcheck_func_SPINNER(); +s32 item_getcheck_func_IRONBALL(); +s32 item_getcheck_func_BOW(); +s32 item_getcheck_func_HOOKSHOT(); +s32 item_getcheck_func_HVY_BOOTS(); +s32 item_getcheck_func_COPY_ROD(); +s32 item_getcheck_func_W_HOOKSHOT(); +s32 item_getcheck_func_KANTERA(); +s32 item_getcheck_func_LIGHT_SWORD(); +s32 item_getcheck_func_FISHING_ROD_1(); +s32 item_getcheck_func_PACHINKO(); +s32 item_getcheck_func_COPY_ROD_2(); +s32 item_getcheck_func_BOMB_BAG_LV2(); +s32 item_getcheck_func_BOMB_BAG_LV1(); +s32 item_getcheck_func_BOMB_IN_BAG(); +s32 item_getcheck_func_LIGHT_ARROW(); +s32 item_getcheck_func_ARROW_LV1(); +s32 item_getcheck_func_ARROW_LV2(); +s32 item_getcheck_func_ARROW_LV3(); +s32 item_getcheck_func_LURE_ROD(); +s32 item_getcheck_func_BOMB_ARROW(); +s32 item_getcheck_func_HAWK_ARROW(); +s32 item_getcheck_func_BEE_ROD(); +s32 item_getcheck_func_JEWEL_ROD(); +s32 item_getcheck_func_WORM_ROD(); +s32 item_getcheck_func_JEWEL_BEE_ROD(); +s32 item_getcheck_func_JEWEL_WORM_ROD(); +s32 item_getcheck_func_EMPTY_BOTTLE(); +s32 item_getcheck_func_RED_BOTTLE(); +s32 item_getcheck_func_GREEN_BOTTLE(); +s32 item_getcheck_func_BLUE_BOTTLE(); +s32 item_getcheck_func_MILK_BOTTLE(); +s32 item_getcheck_func_HALF_MILK_BOTTLE(); +s32 item_getcheck_func_OIL_BOTTLE(); +s32 item_getcheck_func_WATER_BOTTLE(); +s32 item_getcheck_func_OIL_BOTTLE2(); +s32 item_getcheck_func_RED_BOTTLE2(); +s32 item_getcheck_func_UGLY_SOUP(); +s32 item_getcheck_func_HOT_SPRING(); +s32 item_getcheck_func_FAIRY_BOTTLE(); +s32 item_getcheck_func_HOT_SPRING2(); +s32 item_getcheck_func_OIL2(); +s32 item_getcheck_func_OIL(); +s32 item_getcheck_func_NORMAL_BOMB(); +s32 item_getcheck_func_WATER_BOMB(); +s32 item_getcheck_func_POKE_BOMB(); +s32 item_getcheck_func_FAIRY_DROP(); +s32 item_getcheck_func_WORM(); +s32 item_getcheck_func_DROP_BOTTLE(); +s32 item_getcheck_func_BEE_CHILD(); +s32 item_getcheck_func_CHUCHU_RARE(); +s32 item_getcheck_func_CHUCHU_RED(); +s32 item_getcheck_func_CHUCHU_BLUE(); +s32 item_getcheck_func_CHUCHU_GREEN(); +s32 item_getcheck_func_CHUCHU_YELLOW(); +s32 item_getcheck_func_CHUCHU_PURPLE(); +s32 item_getcheck_func_LV1_SOUP(); +s32 item_getcheck_func_LV2_SOUP(); +s32 item_getcheck_func_LV3_SOUP(); +s32 item_getcheck_func_LETTER(); +s32 item_getcheck_func_BILL(); +s32 item_getcheck_func_WOOD_STATUE(); +s32 item_getcheck_func_IRIAS_PENDANT(); +s32 item_getcheck_func_HORSE_FLUTE(); +s32 item_getcheck_func_RAFRELS_MEMO(); +s32 item_getcheck_func_ASHS_SCRIBBLING(); +s32 item_getcheck_func_CHUCHU_YELLOW2(); +s32 item_getcheck_func_OIL_BOTTLE3(); +s32 item_getcheck_func_SHOP_BEE_CHILD(); +s32 item_getcheck_func_CHUCHU_BLACK(); +s32 item_getcheck_func_LIGHT_DROP(); +s32 item_getcheck_func_DROP_CONTAINER(); +s32 item_getcheck_func_DROP_CONTAINER02(); +s32 item_getcheck_func_DROP_CONTAINER03(); +s32 item_getcheck_func_FILLED_CONTAINER(); +s32 item_getcheck_func_MIRROR_PIECE_2(); +s32 item_getcheck_func_MIRROR_PIECE_3(); +s32 item_getcheck_func_MIRROR_PIECE_4(); +s32 item_getcheck_func_SMELL_YELIA_POUCH(); +s32 item_getcheck_func_SMELL_PUMPKIN(); +s32 item_getcheck_func_SMELL_POH(); +s32 item_getcheck_func_SMELL_FISH(); +s32 item_getcheck_func_SMELL_CHILDREN(); +s32 item_getcheck_func_SMELL_MEDICINE(); +s32 item_getcheck_func_M_BEETLE(); +s32 item_getcheck_func_F_BEETLE(); +s32 item_getcheck_func_M_BUTTERFLY(); +s32 item_getcheck_func_F_BUTTERFLY(); +s32 item_getcheck_func_M_STAG_BEETLE(); +s32 item_getcheck_func_F_STAG_BEETLE(); +s32 item_getcheck_func_M_GRASSHOPPER(); +s32 item_getcheck_func_F_GRASSHOPPER(); +s32 item_getcheck_func_M_NANAFUSHI(); +s32 item_getcheck_func_F_NANAFUSHI(); +s32 item_getcheck_func_M_DANGOMUSHI(); +s32 item_getcheck_func_F_DANGOMUSHI(); +s32 item_getcheck_func_M_MANTIS(); +s32 item_getcheck_func_F_MANTIS(); +s32 item_getcheck_func_M_LADYBUG(); +s32 item_getcheck_func_F_LADYBUG(); +s32 item_getcheck_func_M_SNAIL(); +s32 item_getcheck_func_F_SNAIL(); +s32 item_getcheck_func_M_DRAGONFLY(); +s32 item_getcheck_func_F_DRAGONFLY(); +s32 item_getcheck_func_M_ANT(); +s32 item_getcheck_func_F_ANT(); +s32 item_getcheck_func_M_MAYFLY(); +s32 item_getcheck_func_F_MAYFLY(); +s32 item_getcheck_func_POU_SPIRIT(); +s32 item_getcheck_func_ANCIENT_DOCUMENT(); +s32 item_getcheck_func_AIR_LETTER(); +s32 item_getcheck_func_ANCIENT_DOCUMENT2(); +s32 item_getcheck_func_LV7_DUNGEON_EXIT(); +s32 item_getcheck_func_LINKS_SAVINGS(); +s32 item_getcheck_func_SMALL_KEY2(); +s32 item_getcheck_func_POU_FIRE1(); +s32 item_getcheck_func_POU_FIRE2(); +s32 item_getcheck_func_POU_FIRE3(); +s32 item_getcheck_func_POU_FIRE4(); +s32 item_getcheck_func_BOSSRIDER_KEY(); +s32 item_getcheck_func_TOMATO_PUREE(); +s32 item_getcheck_func_TASTE(); +s32 item_getcheck_func_LV5_BOSS_KEY(); +s32 item_getcheck_func_SURFBOARD(); +s32 item_getcheck_func_KANTERA2(); +s32 item_getcheck_func_L2_KEY_PIECES1(); +s32 item_getcheck_func_L2_KEY_PIECES2(); +s32 item_getcheck_func_L2_KEY_PIECES3(); +s32 item_getcheck_func_KEY_OF_CARAVAN(); +s32 item_getcheck_func_LV2_BOSS_KEY(); +s32 item_getcheck_func_KEY_OF_FILONE(); +s32 item_getcheck_func_noentry(); + +s32 checkItemGet(u8, int); +s32 isBomb(u8); +s32 isArrow(u8); +void addBombCount(u8, u8); + #endif /* D_D_ITEM_H */ diff --git a/include/d/d_stage.h b/include/d/d_stage.h index 06909c5f0ff..56aec5199f5 100644 --- a/include/d/d_stage.h +++ b/include/d/d_stage.h @@ -6,6 +6,7 @@ #include "d/save/d_save.h" #include "dolphin/types.h" #include "f_op/f_op_actor.h" +#include "f_op/f_op_actor_mng.h" #include "msl_c/string.h" struct stage_vrboxcol_info_class {}; @@ -17,14 +18,32 @@ struct stage_tresure_class {}; struct stage_tgsc_data_class { /* 8002847C */ ~stage_tgsc_data_class() {} /* 800284B8 */ stage_tgsc_data_class() {} - u8 unk_0[0x24]; + /* 0x00 */ u32 field_0x0; + /* 0x04 */ u32 field_0x4; + /* 0x08 */ fopAcM_prmBase_class field_0x8; + /* 0x20 */ u16 field_0x20; + /* 0x22 */ u8 field_0x22; }; // Size = 0x24 STATIC_ASSERT(sizeof(stage_tgsc_data_class) == 0x24); struct stage_tgsc_class {}; -struct stage_stag_info_class {}; +struct stage_stag_info_class { + /* 0x00 */ u8 field_0x00[8]; + /* 0x08 */ u8 mCameraType; + /* 0x09 */ u8 field_0x09; + /* 0x0A */ u16 field_0x0a; + /* 0x0C */ u32 field_0x0c; + /* 0x10 */ u32 field_0x10; + /* 0x14 */ u8 field_0x14[6]; + /* 0x1A */ s16 mGapLevel; + /* 0x1C */ s16 mRangeUp; + /* 0x1E */ s16 mRangeDown; + /* 0x20 */ u8 field_0x20[8]; + /* 0x28 */ u8 mMsgGroup; + /* 0x2A */ u16 mStageTitleNo; +}; // Size: Unknown struct stage_scls_info_dummy_class {}; @@ -327,102 +346,101 @@ private: class dStage_roomDt_c : public dStage_dt_c { public: dStage_roomDt_c() {} - stage_pure_lightvec_info_class* getLightVecInfo(void) const; - int getLightVecInfoNum(void) const; - stage_map_info_class* getMapInfo(void) const; - stage_map_info_dummy_class* getMapInfoBase(void) const; - int getMapPath(void); - stage_vrbox_info_class* getVrboxInfo(void) const; - stage_vrboxcol_info_class* getVrboxcolInfo(void) const; - dStage_FileList2_dt_c* getFileList2Info(void) const; - dStage_FileList_dt_c* getFileListInfo(void) const; - stage_actor_class* getPlayer(void) const; - dStage_dPnt_c* getPnt2Inf(void) const; - dStage_dPath_c* getPath2Inf(void) const; - stage_camera_class* getCamera(void) const; - stage_arrow_class* getArrow(void) const; - dStage_MapEventInfo_c* getMapEventInfo(void) const; - dStage_SoundInfo_c* getSoundInf(void) const; - dStage_SoundInfo_c* getSoundInfCL(void) const; - stage_scls_info_dummy_class* getSclsInfo(void) const; - dStage_Lbnk_c* getLbnk(void) const; - stage_tresure_class* getTresure(void) const; - stage_tgsc_class* getDrTg(void) const; - stage_tgsc_class* getDoor(void) const; - dStage_FloorInfo_c* getFloorInfo(void) const; - u16 getPlayerNum(void) const; - int getEnvrNumInfo(void) const; - int getVrboxNumInfo(void) const; - int getVrboxcolNumInfo(void) const; - int getMapInfo2(int) const; - int getPlightNumInfo(void) const; - stage_stag_info_class* getStagInfo(void) const; - dStage_dPnt_c* getPntInf(void) const; - dStage_dPath_c* getPathInf(void) const; - dStage_MemoryConfig_c* getMemoryConfig(void) const; - dStage_MemoryMap_c* getMemoryMap(void) const; - dStage_Multi_c* getMulti(void) const; - dStage_Multi_c* getOldMulti(void) const; - dStage_DMap_c* getDMap(void) const; - dStage_Elst_c* getElst(void); - roomRead_class* getRoom(void) const; - stage_palette_info_class* getPaletteInfo(void) const; - stage_pselect_info_class* getPselectInfo(void) const; - stage_envr_info_class* getEnvrInfo(void) const; - stage_plight_info_class* getPlightInfo(void) const; - int getPaletteNumInfo(void) const; - int getPselectNumInfo(void) const; - void initFileList2(void); - void init(void); - - void setLightVecInfo(stage_pure_lightvec_info_class*); - void setLightVecInfoNum(int); - void setMapInfo(stage_map_info_class*); - void setMapInfoBase(stage_map_info_dummy_class*); - void setVrboxInfo(stage_vrbox_info_class*); - void setVrboxcolInfo(stage_vrboxcol_info_class*); - void setFileList2Info(dStage_FileList2_dt_c*); - void setFileListInfo(dStage_FileList_dt_c*); - void setPlayer(stage_actor_class*); void setPnt2Inf(dStage_dPnt_c*); - void setPath2Info(dStage_dPath_c*); - void setCamera(stage_camera_class*); - void setArrow(stage_arrow_class*); - void setMapEventInfo(dStage_MapEventInfo_c*); - void setSoundInf(dStage_SoundInfo_c*); - void setSoundInfCL(dStage_SoundInfo_c*); - void setSclsInfo(stage_scls_info_dummy_class*); - void setLbnk(dStage_Lbnk_c*); void setTreasure(stage_tresure_class*); - void setDrTg(stage_tgsc_class*); - void setDoor(stage_tgsc_class*); - void setFloorInfo(dStage_FloorInfo_c*); - void setPlayerNum(u16); - void setVrboxNumInfo(int); - void setVrboxcolNumInfo(int); - void setStagInfo(stage_stag_info_class*); - void setPntInfo(dStage_dPnt_c*); - void setPathInfo(dStage_dPath_c*); - void setPnt2Info(dStage_dPnt_c*); - void setPlightNumInfo(int); - void setMemoryConfig(dStage_MemoryConfig_c*); - void setMemoryMap(dStage_MemoryMap_c*); - void setMulti(dStage_Multi_c*); - void setOldMulti(void); - void resetOldMulti(void); - void setTresure(stage_tresure_class*); - void setDMap(dStage_DMap_c*); - void setMapPath(void*); - void setElst(dStage_Elst_c*); - void setRoom(roomRead_class*); - void setPaletteInfo(stage_palette_info_class*); - void setPselectInfo(stage_pselect_info_class*); - void setEnvrInfo(stage_envr_info_class*); - void setPlightInfo(stage_plight_info_class*); - void setPaletteNumInfo(int); - void setPselectNumInfo(int); - void setEnvrNumInfo(int); + + virtual void init(void); + virtual void setCamera(stage_camera_class*); + virtual stage_camera_class* getCamera(void) const; + virtual void setArrow(stage_arrow_class*); + virtual stage_arrow_class* getArrow(void) const; + virtual void setPlayer(stage_actor_class*); + virtual stage_actor_class* getPlayer(void) const; + virtual void setPlayerNum(u16); + virtual u16 getPlayerNum(void) const; + virtual void setRoom(roomRead_class*); + virtual roomRead_class* getRoom(void) const; + virtual void setMapInfo(stage_map_info_class*); + virtual stage_map_info_class* getMapInfo(void) const; + virtual int getMapInfo2(int) const; + virtual void setMapInfoBase(stage_map_info_dummy_class*); + virtual stage_map_info_dummy_class* getMapInfoBase(void) const; + virtual void setPaletteInfo(stage_palette_info_class*); + virtual stage_palette_info_class* getPaletteInfo(void) const; + virtual void setPselectInfo(stage_pselect_info_class*); + virtual stage_pselect_info_class* getPselectInfo(void) const; + virtual void setEnvrInfo(stage_envr_info_class*); + virtual stage_envr_info_class* getEnvrInfo(void) const; + virtual void setVrboxInfo(stage_vrbox_info_class*); + virtual stage_vrbox_info_class* getVrboxInfo(void) const; + virtual void setVrboxcolInfo(stage_vrboxcol_info_class*); + virtual stage_vrboxcol_info_class* getVrboxcolInfo(void) const; + virtual void setPlightInfo(stage_plight_info_class*); + virtual stage_plight_info_class* getPlightInfo(void) const; + virtual void setPaletteNumInfo(int); + virtual int getPaletteNumInfo(void) const; + virtual void setPselectNumInfo(int); + virtual int getPselectNumInfo(void) const; + virtual void setEnvrNumInfo(int); + virtual int getEnvrNumInfo(void) const; + virtual void setVrboxNumInfo(int); + virtual int getVrboxNumInfo(void) const; + virtual void setVrboxcolNumInfo(int); + virtual int getVrboxcolNumInfo(void) const; + virtual void setPlightNumInfo(int); + virtual int getPlightNumInfo(void) const; + virtual void setLightVecInfo(stage_pure_lightvec_info_class*); + virtual stage_pure_lightvec_info_class* getLightVecInfo(void) const; + virtual void setLightVecInfoNum(int); + virtual int getLightVecInfoNum(void) const; + virtual void setStagInfo(stage_stag_info_class*); + virtual stage_stag_info_class* getStagInfo(void) const; + virtual void setSclsInfo(stage_scls_info_dummy_class*); + virtual stage_scls_info_dummy_class* getSclsInfo(void) const; + virtual void setPntInfo(dStage_dPnt_c*); + virtual dStage_dPnt_c* getPntInf(void) const; + virtual void setPathInfo(dStage_dPath_c*); + virtual dStage_dPath_c* getPathInf(void) const; + virtual void setPnt2Info(dStage_dPnt_c*); + virtual dStage_dPnt_c* getPnt2Inf(void) const; + virtual void setPath2Info(dStage_dPath_c*); + virtual dStage_dPath_c* getPath2Inf(void) const; + virtual void setSoundInf(dStage_SoundInfo_c*); + virtual dStage_SoundInfo_c* getSoundInf(void) const; + virtual void setSoundInfCL(dStage_SoundInfo_c*); + virtual dStage_SoundInfo_c* getSoundInfCL(void) const; + virtual void setMapEventInfo(dStage_MapEventInfo_c*); + virtual dStage_MapEventInfo_c* getMapEventInfo(void) const; + virtual void setFileList2Info(dStage_FileList2_dt_c*); + virtual dStage_FileList2_dt_c* getFileList2Info(void) const; + virtual void setFileListInfo(dStage_FileList_dt_c*); + virtual dStage_FileList_dt_c* getFileListInfo(void) const; + virtual void setFloorInfo(dStage_FloorInfo_c*); + virtual dStage_FloorInfo_c* getFloorInfo(void) const; + virtual void setMemoryConfig(dStage_MemoryConfig_c*); + virtual dStage_MemoryConfig_c* getMemoryConfig(void) const; + virtual void setMemoryMap(dStage_MemoryMap_c*); + virtual dStage_MemoryMap_c* getMemoryMap(void) const; + virtual void setMulti(dStage_Multi_c*); + virtual dStage_Multi_c* getMulti(void) const; + virtual void setOldMulti(void); + virtual void resetOldMulti(void); + virtual dStage_Multi_c* getOldMulti(void) const; + virtual void setLbnk(dStage_Lbnk_c*); + virtual dStage_Lbnk_c* getLbnk(void) const; + virtual void setTresure(stage_tresure_class*); + virtual stage_tresure_class* getTresure(void) const; + virtual void setDMap(dStage_DMap_c*); + virtual dStage_DMap_c* getDMap(void) const; + virtual void setDrTg(stage_tgsc_class*); + virtual stage_tgsc_class* getDrTg(void) const; + virtual void setDoor(stage_tgsc_class*); + virtual stage_tgsc_class* getDoor(void) const; + virtual void setMapPath(void*); + virtual int getMapPath(void); + virtual void setElst(dStage_Elst_c*); + virtual dStage_Elst_c* getElst(void); private: stage_pure_lightvec_info_class* mLightVecInfo; @@ -454,14 +472,13 @@ private: }; // Size: 0x6C class dStage_roomStatus_c { -private: +public: /* 0x000 */ dStage_roomDt_c mRoomDt; /* 0x06C */ dKy_tevstr_c mKyTevStr; /* 0x3F4 */ u8 unk_0x3F4[3]; /* 0x3F7 */ s8 mZoneNo; /* 0x3F8 */ u8 unk_3F8[0x404 - 0x3F8]; -public: int getZoneNo() const { return mZoneNo; } /* 80028360 */ ~dStage_roomStatus_c() {} /* 8002839C */ dStage_roomStatus_c() {} @@ -469,6 +486,8 @@ public: STATIC_ASSERT(sizeof(dStage_roomStatus_c) == 0x404); +extern s8 struct_80450D64; // sStayNo + class dStage_roomControl_c { public: class roomDzs_c { @@ -500,51 +519,27 @@ public: /* 80024954 */ void resetArchiveBank(int); /* 80024DB0 */ static void SetTimePass(int); + inline static s8 getStayNo() { return struct_80450D64; } + static JKRExpHeap* mMemoryBlock[19]; static u8 mArcBank[320]; static dStage_roomStatus_c mStatus[0x40]; static u8 mDemoArcName[10 + 2 /* padding */]; static u32 mProcID; - static u8 mArcBankName[4]; - static u8 mArcBankData[4]; + static char* mArcBankName; + static char* mArcBankData; static roomDzs_c m_roomDzs; private: u8 field_0x0[4]; }; -#pragma pack(push, 1) -class dStage_nextStage_c { -public: - dStage_nextStage_c() { - enabled = 0; // TODO: maybe wrong - } - void set(const char*, s8, s16, s8, s8, u8); - -private: - char mStage[8]; - s16 mPoint; - u8 mRoomNo; - u8 mLayer; - u8 field_0xc; - s8 enabled; - u8 wipe; - u8 wipe_speed; -}; -#pragma pack(pop) - class dStage_startStage_c { public: void set(const char*, s8, s16, s8); inline char* getName() { return mStage; } s8 getLayer() { return mLayer; } - void operator=(const dStage_startStage_c& other) { - strcpy(mStage, other.mStage); - mPoint = other.mPoint; - mRoomNo = other.mRoomNo; - mLayer = other.mLayer; - mDarkArea = other.mDarkArea; - } + s8 getRoomNo() { return mRoomNo; } private: /* 0x0 */ char mStage[8]; @@ -554,6 +549,20 @@ private: /* 0xC */ s8 mDarkArea; }; +class dStage_nextStage_c : public dStage_startStage_c { +public: + dStage_nextStage_c() { + enabled = 0; // TODO: maybe wrong + } + void set(const char*, s8, s16, s8, s8, u8); + void offEnable() { enabled = 0; } + +private: + s8 enabled; + u8 wipe; + u8 wipe_speed; +}; + // unknown name struct dStage_objectNameInf { char mName[8]; @@ -564,7 +573,7 @@ struct dStage_objectNameInf { class dStage_KeepDoorInfo { public: /* 80028418 */ ~dStage_KeepDoorInfo() {} - /* 0x000 */ u8 unk_0x0[4]; + /* 0x000 */ stage_tgsc_class* unk_0x0; /* 0x004 */ stage_tgsc_data_class unk_0x4[0x40]; }; // Size = 0x904 @@ -625,8 +634,14 @@ static void dStage_fieldMapTresureInit(dStage_dt_c*, void*, int, void*); static void dStage_fieldMapFiliInfo2Init(dStage_dt_c*, void*, int, void*); static void dStage_fieldMapMapPathInit(dStage_dt_c*, void*, int, void*); +u8 dStage_roomRead_dt_c_GetReverbStage(roomRead_class&, int); + inline u8 dStage_roomRead_dt_c_GetLoadRoomIndex(u8 param_0) { return param_0 & 0x3f; } +inline u32 dStage_stagInfo_GetSTType(stage_stag_info_class* pstag) { + return pstag->field_0x0c >> 0x10 & 7; +} + #endif /* D_D_STAGE_H */ diff --git a/include/d/event/d_event.h b/include/d/event/d_event.h index b7cf2df3c43..0d8841412db 100644 --- a/include/d/event/d_event.h +++ b/include/d/event/d_event.h @@ -77,6 +77,7 @@ public: void setPtI_Id(unsigned int); void setPtD(void*); void setGtItm(u8); + void isOrderOK(); u16 chkFlag2(u16 flag) { return flag & mFlag2; } diff --git a/include/d/event/d_event_manager.h b/include/d/event/d_event_manager.h index 02f8e4233d0..8adf1c142c5 100644 --- a/include/d/event/d_event_manager.h +++ b/include/d/event/d_event_manager.h @@ -39,7 +39,7 @@ public: void Experts(); void getEventData(s16); dEvDtEvent_c* getEventData(s16, int); - void getEventIdx(char const*, u8, s32); + int getEventIdx(char const*, u8, s32); void getEventIdx(fopAc_ac_c*, u8); void getEventIdx(fopAc_ac_c*, char const*, u8); void isMapToolCamera(u8, s32); diff --git a/include/d/kankyo/d_kankyo.h b/include/d/kankyo/d_kankyo.h index 63208f2691e..a54f18f9d79 100644 --- a/include/d/kankyo/d_kankyo.h +++ b/include/d/kankyo/d_kankyo.h @@ -63,4 +63,6 @@ private: STATIC_ASSERT(sizeof(dKy_tevstr_c) == 0x388); +BOOL dKy_darkworld_stage_check(char const*, int); + #endif /* D_KANKYO_D_KANKYO_H */ diff --git a/include/d/meter/d_meter2_info.h b/include/d/meter/d_meter2_info.h index 61ba0bd8a90..c058da0d985 100644 --- a/include/d/meter/d_meter2_info.h +++ b/include/d/meter/d_meter2_info.h @@ -9,10 +9,6 @@ #include "f_op/f_op_actor.h" //#include "JSystem/JUtility/JUTFont.h" -struct dSv_event_flag_c { - static u8 saveBitLabels[1644 + 4 /* padding */]; -}; - struct dMsgObject_c { /* 802384C4 */ void setLetterNameID(u16); /* 802379AC */ void setKillMessageFlag(); @@ -115,6 +111,7 @@ public: dMeterMap_c* getMeterMapClass() { return mMeterMap; } dMw_c* getMenuWindowClass() { return mMenuWindowClass; } void offUseButton(int pButton) { mUseButton &= ~(u16)pButton; } + u16 getOilGaugeBackUp() { return mOilGaugeBackUp; } private: /* 0x04 */ u8 unk4[4]; @@ -201,6 +198,8 @@ private: extern dMeter2Info_c g_meter2_info; +void dMeter2Info_setSword(u8, bool); + inline void dMeter2Info_Initialize() { g_meter2_info.init(); } @@ -217,4 +216,20 @@ inline void dMeter2Info_setWindowStatus(u8 status) { g_meter2_info.setWindowStatus(status); } +inline void dMeter2Info_getString(u32 param_0, char* param_1, JMSMesgEntry_c* param_2) { + g_meter2_info.getString(param_0, param_1, param_2); +} + +inline void dMeter2Info_setHotSpringTimer(u8 time) { + g_meter2_info.setHotSpringTimer(time); +} + +inline u16 dMeter2Info_getOilGaugeBackUp() { + return g_meter2_info.getOilGaugeBackUp(); +} + +inline void dMeter2Info_setSaveStageName(const char* name) { + g_meter2_info.setSaveStageName(name); +} + #endif /* D_METER_D_METER2_INFO_H */ diff --git a/include/d/save/d_save.h b/include/d/save/d_save.h index 7a690fdcd76..e6cfc1e6814 100644 --- a/include/d/save/d_save.h +++ b/include/d/save/d_save.h @@ -3,6 +3,7 @@ #include "SSystem/SComponent/c_xyz.h" #include "dolphin/types.h" +#include "msl_c/string.h" #define DEFAULT_SELECT_ITEM_INDEX 0 #define MAX_SELECT_ITEM 4 @@ -15,6 +16,11 @@ #define BOTTLE_MAX 4 #define TBOX_MAX 64 #define DSV_MEMBIT_ENUM_MAX 8 +#define ITEM_MAX_DAN 128 +#define SWITCH_ZONE_MAX 0x20 +#define SWITCH_ONE_ZONE_MAX 0x10 +#define ITEM_ZONE_MAX 0x20 +#define ITEM_ONE_ZONE_MAX 0x10 enum Wallets { WALLET, BIG_WALLET, GIANT_WALLET }; @@ -306,9 +312,14 @@ enum ItemTable { enum CollectItem { COLLECT_CLOTHING, COLLECT_SWORD, COLLECT_SHIELD, COLLECT_SMELL, B_BUTTON_ITEM }; -enum Swords { ORDON_SWORD_FLAG, MASTER_SWORD_FLAG, WOODEN_SWORD_FLAG, LIGHT_SWORD_FLAG }; +enum Swords { + COLLECT_ORDON_SWORD, + COLLECT_MASTER_SWORD, + COLLECT_WOODEN_SWORD, + COLLECT_LIGHT_SWORD +}; -enum Shields { ORDON_SHIELD_FLAG, HYLIAN_SHIELD_FLAG, WOODEN_SHIELD_FLAG }; +enum Shields { COLLECT_WOODEN_SHIELD, COLLECT_ORDON_SHIELD, COLLECT_HYLIAN_SHIELD }; enum Armors { KOKIRI_CLOTHES_FLAG }; @@ -318,12 +329,12 @@ enum ItemMax { ARROW_MAX, NORMAL_BOMB_MAX, WATER_BOMB_MAX, POKE_BOMB_MAX = 6 }; class dSv_player_status_a_c { public: - void init(void); + void init(); void setSelectItemIndex(signed int, u8); u8 getSelectItemIndex(signed int) const; void setMixItemIndex(signed int, u8); u8 getMixItemIndex(signed int) const; - u16 getRupeeMax(void) const; + u16 getRupeeMax() const; int isMagicFlag(u8) const; u16& getMaxLife() { return mMaxLife; } @@ -331,7 +342,6 @@ public: u16& getRupee() { return mRupee; } u16& getOil() { return mOil; } u8 getSelectEquip(int item) const { return mSelectEquip[item]; } - void setWalletLV(u8 lv) { mWalletSize = lv; } void setOil(u16 oil) { mOil = oil; } void setMaxOil(u16 max) { mMaxOil = max; } void setWalletSize(u8 size) { mWalletSize = size; } @@ -361,141 +371,143 @@ private: /* 0x1D */ u8 unk29; /* 0x1E */ u8 mTransformStatus; /* 0x1F */ u8 unk31[3]; - /* 0x22 */ u8 padding[6]; -}; +}; // Size: 0x28 class dSv_player_status_b_c { public: - void init(void); + void init(); void onDarkClearLV(int); BOOL isDarkClearLV(int) const; void onTransformLV(int); BOOL isTransformLV(int) const; + void setDateIpl(s64 time) { mDateIpl = time; } + private: - u64 mDateIpl; - u8 mTransformLevelFlag; - u8 mDarkClearLevelFlag; - u8 unk10; - u8 unk11; - float mTime; - u16 mDate; - u8 unk18[3]; - u8 padding[3]; -}; + /* 0x00 */ s64 mDateIpl; + /* 0x08 */ u8 mTransformLevelFlag; + /* 0x09 */ u8 mDarkClearLevelFlag; + /* 0x0A */ u8 unk10; + /* 0x0B */ u8 unk11; + /* 0x0C */ float mTime; + /* 0x10 */ u16 mDate; + /* 0x12 */ u8 unk18[3]; +}; // Size: 0x18 class dSv_horse_place_c { public: - void init(void); + void init(); void set(const char*, const cXyz&, s16, s8); private: - cXyz mPosition; - u16 mXRotation; - char mCurrentStage[8]; - u8 mSpawnId; - u8 mRoomId; -}; + /* 0x00 */ cXyz mPos; + /* 0x0C */ u16 mAngleY; + /* 0x0E */ char mName[8]; + /* 0x16 */ u8 mSpawnId; + /* 0x17 */ u8 mRoomNo; +}; // Size: 0x18 class dSv_player_return_place_c { public: - void init(void); + void init(); void set(const char*, s8, u8); + u8 getRoomNo() { return mRoomNo; } + u8 getPlayerStatus() { return mPlayerStatus; } + char* getName() { return mName; } private: - char mCurrentStage[8]; - u8 mSpawnId; - u8 mRoomId; - u8 unk10; - u8 unk11; -}; + /* 0x00 */ char mName[8]; + /* 0x08 */ u8 mPlayerStatus; + /* 0x09 */ s8 mRoomNo; + /* 0x0A */ u8 unk10; + /* 0x0B */ u8 unk11; +}; // Size: 0xC class dSv_player_field_last_stay_info_c { public: - void init(void); + void init(); BOOL isRegionBit(int unk) const; void onRegionBit(int unk); void set(const char*, const cXyz&, s16, s8, u8); private: - cXyz mPos; - s16 mAngleY; - char mName[8]; - u8 mLastSpawnId; - u8 mRegionNo; - bool mFieldDataExistFlag; - u8 mRegion; - u8 unk26[2]; -}; + /* 0x00 */ cXyz mPos; + /* 0x0C */ s16 mAngleY; + /* 0x0E */ char mName[8]; + /* 0x16 */ u8 mLastSpawnId; + /* 0x17 */ u8 mRegionNo; + /* 0x18 */ bool mFieldDataExistFlag; + /* 0x19 */ u8 mRegion; + /* 0x1A */ u8 unk26[2]; +}; // Size: 0x1C class dSv_player_last_mark_info_c { public: - void init(void); + void init(); void setWarpItemData(const char*, const cXyz&, s16, s8, u8, u8); - const char* getName(void) { return mOoccooStage; } - cXyz getPos(void) { return mOoccooPosition; } - s16 getAngleY(void) { return mOoccooXRotation; } - s8 getRoomNo(void) { return mOoccooRoomId; } - char getWarpAcceptStage(void) { return mWarpAcceptStage; } + const char* getName() { return mName; } + cXyz getPos() { return mPos; } + s16 getAngleY() { return mAngleY; } + s8 getRoomNo() { return mRoomNo; } + char getWarpAcceptStage() { return mWarpAcceptStage; } private: - cXyz mOoccooPosition; - s16 mOoccooXRotation; - char mOoccooStage[8]; - u8 mOoccooSpawnId; - s8 mOoccooRoomId; - char mWarpAcceptStage; - u8 unk25[3]; -}; + /* 0x00 */ cXyz mPos; + /* 0x0C */ s16 mAngleY; + /* 0x0E */ char mName[8]; + /* 0x16 */ u8 mSpawnId; + /* 0x17 */ s8 mRoomNo; + /* 0x18 */ char mWarpAcceptStage; + /* 0x19 */ u8 unk25[3]; +}; // Size: 0x1C class dSv_player_item_c { public: - void init(void); + void init(); void setItem(int, u8); u8 getItem(int, bool) const; - void setLineUpItem(void); + void setLineUpItem(); u8 getLineUpItem(int) const; void setBottleItemIn(u8, u8); void setEmptyBottleItemIn(u8); - void setEmptyBottle(void); + void setEmptyBottle(); void setEmptyBottle(u8); void setEquipBottleItemIn(u8, u8); void setEquipBottleItemEmpty(u8); u8 checkBottle(u8); - int checkInsectBottle(void); - u8 checkEmptyBottle(void); + int checkInsectBottle(); + u8 checkEmptyBottle(); void setBombBagItemIn(u8, u8, bool); void setBombBagItemIn(u8, u8, u8, bool); void setEmptyBombBagItemIn(u8, bool); void setEmptyBombBagItemIn(u8, u8, bool); - void setEmptyBombBag(void); + void setEmptyBombBag(); void setEmptyBombBag(u8, u8); u8 checkBombBag(u8); void setWarashibeItem(u8); - void setRodTypeLevelUp(void); + void setRodTypeLevelUp(); void setBaitItem(u8); private: - u8 mItems[24]; - u8 mItemSlots[24]; -}; + /* 0x00 */ u8 mItems[24]; + /* 0x18 */ u8 mItemSlots[24]; +}; // Size: 0x30 class dSv_player_get_item_c { public: - void init(void); + void init(); void onFirstBit(u8); void offFirstBit(u8); int isFirstBit(u8) const; private: - u32 mPauseMenuBitFields[4]; - u8 padding[16]; -}; + /* 0x0 */ u32 mItemFlags[8]; +}; // Size: 0x20 class dSv_player_item_record_c { public: - void init(void); + void init(); void setBombNum(u8, u8); u8 getBombNum(u8) const; void setBottleNum(u8, u8); @@ -503,18 +515,20 @@ public: u8 getBottleNum(u8) const; void setArrowNum(u8 amount) { mArrowNum = amount; } + u8 getPachinkoNum() const { return mPachinkoNum; } + void setPachinkoNum(u8 num) { mPachinkoNum = num; } private: - u8 mArrowNum; - u8 mBombNum[3]; - u8 mBottleNum[4]; - u8 mPachinkoNum; - u8 unk5[3]; -}; + /* 0x0 */ u8 mArrowNum; + /* 0x1 */ u8 mBombNum[3]; + /* 0x4 */ u8 mBottleNum[4]; + /* 0x8 */ u8 mPachinkoNum; + /* 0x9 */ u8 unk5[3]; +}; // Size: 0xC class dSv_player_item_max_c { public: - void init(void); + void init(); void setBombNum(u8, u8); u8 getBombNum(u8) const; @@ -522,12 +536,12 @@ public: u8 getArrowNum() { return mItemMax[ARROW_MAX]; } private: - u8 mItemMax[8]; -}; + /* 0x0 */ u8 mItemMax[8]; +}; // Size: 0x8 class dSv_player_collect_c { public: - void init(void); + void init(); void setCollect(int, u8); BOOL isCollect(int, u8) const; void onCollectCrystal(u8); @@ -538,90 +552,91 @@ public: u8 getPohNum() { return mPohNum; } private: - u8 mItem[8]; - u8 unk8; - u8 mCrystal; - u8 mMirror; - u8 unk11; - u8 mPohNum; - u8 padding[3]; -}; + /* 0x0 */ u8 mItem[8]; + /* 0x8 */ u8 unk8; + /* 0x9 */ u8 mCrystal; + /* 0xA */ u8 mMirror; + /* 0xB */ u8 unk11; + /* 0xC */ u8 mPohNum; + /* 0xD */ u8 padding[3]; +}; // Size: 0x10 class dSv_player_wolf_c { public: - void init(void); + void init(); private: - u8 unk0[3]; - u8 unk3; -}; + /* 0x0 */ u8 unk0[3]; + /* 0x3 */ u8 unk3; +}; // Size: 0x4 class dSv_light_drop_c { public: - void init(void); + void init(); void setLightDropNum(u8, u8); u8 getLightDropNum(u8) const; void onLightDropGetFlag(u8); BOOL isLightDropGetFlag(u8) const; private: - u8 mLightDropNum[4]; - u8 mLightDropGetFlag; - u8 unk5[3]; -}; + /* 0x0 */ u8 mLightDropNum[4]; + /* 0x4 */ u8 mLightDropGetFlag; + /* 0x5 */ u8 unk5[3]; +}; // Size: 0x8 class dSv_letter_info_c { public: - void init(void); + void init(); void onLetterGetFlag(int); BOOL isLetterGetFlag(int) const; void onLetterReadFlag(int); int isLetterReadFlag(int) const; private: - u32 mLetterGetBitfields[2]; - u32 mLetterReadBitfields[2]; - u8 unk16[64]; -}; + /* 0x00 */ u32 mLetterGetFlags[2]; + /* 0x08 */ u32 mLetterReadFlags[2]; + /* 0x10 */ u8 mGetNumber[64]; +}; // Size: 0x50 class dSv_fishing_info_c { public: - void init(void); + void init(); void addFishCount(u8); private: - u16 mFishCount[16]; - u8 mMaxSize[16]; - u8 padding[4]; -}; + /* 0x00 */ u16 mFishCount[16]; + /* 0x20 */ u8 mMaxSize[16]; +}; // Size: 0x34 class dSv_player_info_c { public: - void init(void); + void init(); char* getLinkName() { return (char*)mPlayerName; } + void setPlayerName(const char* name) { strcpy((char*)mPlayerName, name); } + void setHorseName(const char* name) { strcpy((char*)mHorseName, name); } + void setTotalTime(s64 time) { mTotalTime = time; } private: - u32 unk0; - u32 unk4; - u64 mTotalTime; - u16 unk16; - u16 mDeathCount; - u8 mPlayerName[16]; - u8 unk36; - u8 mHorseName[16]; - u8 unk53; - u8 mClearCount; - u8 unk55[5]; - u8 padding[4]; -}; + /* 0x00 */ u32 unk0; + /* 0x04 */ u32 unk4; + /* 0x08 */ u64 mTotalTime; + /* 0x10 */ u16 unk16; + /* 0x12 */ u16 mDeathCount; + /* 0x14 */ u8 mPlayerName[16]; + /* 0x24 */ u8 unk36; + /* 0x25 */ u8 mHorseName[16]; + /* 0x35 */ u8 unk53; + /* 0x36 */ u8 mClearCount; + /* 0x37 */ u8 unk55[5]; +}; // Size: 0x40 class dSv_player_config_c { public: - void init(void); - u32 checkVibration(void) const; - u8 getSound(void); + void init(); + u32 checkVibration() const; + u8 getSound(); void setSound(u8); - u8 getVibration(void); + u8 getVibration(); void setVibration(u8); inline u8 getAttentionType(void) { return mAttentionType; } inline void setAttentionType(u8 i_mAttentionType) { mAttentionType = i_mAttentionType; } @@ -637,68 +652,69 @@ public: inline void setPointer(bool i_mPointer) { mPointer = i_mPointer; } private: - u8 unk0; - u8 mSoundMode; - u8 mAttentionType; // 0 : hold, 1 : switch - u8 mVibration; - u8 unk4; - u8 unk5; - u16 mCalibrateDist; // Wii pointer horizontal calibration. Default is 0x015E - u8 mCalValue; // Wii pointer vertical calibration. Default is 0x00 - bool mShortCut; // Wii icon shortcut enabled/disabled. - u8 mCameraControl; // 0 : normal, 1 : inverted - bool mPointer; // Wii pointer enabled/disabled. - u8 padding[4]; -}; + /* 0x0 */ u8 unk0; + /* 0x1 */ u8 mSoundMode; + /* 0x2 */ u8 mAttentionType; // Lock-On Type; 0 : hold, 1 : switch + /* 0x3 */ u8 mVibration; // Rumble status + /* 0x4 */ u8 unk4; + /* 0x5 */ u8 unk5; + /* 0x6 */ u16 mCalibrateDist; // Wii pointer horizontal calibration. Default is 0x015E + /* 0x8 */ u8 mCalValue; // Wii pointer vertical calibration. Default is 0x00 + /* 0x9 */ bool mShortCut; // Wii icon shortcut enabled/disabled. + /* 0xA */ u8 mCameraControl; // 0 : normal, 1 : inverted + /* 0xB */ bool mPointer; // Wii pointer enabled/disabled. +}; // Size: 0xC class dSv_player_c { public: - void init(void); + void init(); dSv_player_info_c& getPlayerInfo() { return mPlayerInfo; } - dSv_player_status_a_c& getPlayerStatusA() { return player_status_a; } - dSv_player_item_c& getPlayerItem() { return player_item; } - dSv_player_collect_c& getPlayerCollect() { return player_collect; } - dSv_player_item_record_c& getPlayerItemRecord() { return player_item_record; } - dSv_player_item_max_c& getPlayerItemMax() { return player_item_max; } - dSv_player_last_mark_info_c& getPlayerLastMarkInfo() { return player_last_mark; } - dSv_light_drop_c& getLightDrop() { return light_drop; } - dSv_player_get_item_c& getPlayerGetItem() { return player_get_item; } + dSv_player_status_a_c& getPlayerStatusA() { return mPlayerStatusA; } + dSv_player_status_b_c& getPlayerStatusB() { return mPlayerStatusB; } + dSv_player_item_c& getItem() { return mItem; } + dSv_player_collect_c& getCollect() { return mCollect; } + dSv_player_item_record_c& getItemRecord() { return mItemRecord; } + dSv_player_item_max_c& getItemMax() { return mItemMax; } + dSv_player_last_mark_info_c& getPlayerLastMarkInfo() { return mPlayerLastMarkInfo; } + dSv_player_return_place_c& getPlayerReturnPlace() { return mPlayerReturnPlace; } + dSv_light_drop_c& getLightDrop() { return mLightDrop; } + dSv_player_get_item_c& getGetItem() { return mGetItem; } + dSv_player_config_c& getConfig() { return mConfig; } private: - dSv_player_status_a_c player_status_a; - dSv_player_status_b_c player_status_b; - dSv_horse_place_c horse_place; - dSv_player_return_place_c player_return; - dSv_player_field_last_stay_info_c player_last_field; - dSv_player_last_mark_info_c player_last_mark; - dSv_player_item_c player_item; - dSv_player_get_item_c player_get_item; - dSv_player_item_record_c player_item_record; - dSv_player_item_max_c player_item_max; - dSv_player_collect_c player_collect; - dSv_player_wolf_c player_wolf; - dSv_light_drop_c light_drop; - dSv_letter_info_c letter_info; - dSv_fishing_info_c fishing_info; - dSv_player_info_c mPlayerInfo; - dSv_player_config_c player_config; -}; + /* 0x000 */ dSv_player_status_a_c mPlayerStatusA; + /* 0x028 */ dSv_player_status_b_c mPlayerStatusB; + /* 0x040 */ dSv_horse_place_c mHorsePlace; + /* 0x058 */ dSv_player_return_place_c mPlayerReturnPlace; + /* 0x064 */ dSv_player_field_last_stay_info_c mPlayerFieldLastStayInfo; + /* 0x080 */ dSv_player_last_mark_info_c mPlayerLastMarkInfo; + /* 0x09C */ dSv_player_item_c mItem; + /* 0x0CC */ dSv_player_get_item_c mGetItem; + /* 0x0EC */ dSv_player_item_record_c mItemRecord; + /* 0x0F8 */ dSv_player_item_max_c mItemMax; + /* 0x100 */ dSv_player_collect_c mCollect; + /* 0x110 */ dSv_player_wolf_c mWolf; + /* 0x114 */ dSv_light_drop_c mLightDrop; + /* 0x11C */ dSv_letter_info_c mLetterInfo; + /* 0x16C */ dSv_fishing_info_c mFishingInfo; + /* 0x1A0 */ dSv_player_info_c mPlayerInfo; + /* 0x1E0 */ dSv_player_config_c mConfig; +}; // Size: 0x1EC -#pragma pack(push, 1) class dSv_memBit_c { public: enum { - MAP_FLAG, - COMPASS_FLAG, - BOSS_KEY_FLAG, + MAP, + COMPASS, + BOSS_KEY, STAGE_BOSS_ENEMY, STAGE_LIFE, STAGE_BOSS_DEMO, - OOCCOO_NOTE_FLAG, + OOCCOO_NOTE, STAGE_BOSS_ENEMY_2 }; - void init(void); + void init(); void onTbox(int); void offTbox(int); BOOL isTbox(int) const; @@ -709,28 +725,34 @@ public: void onItem(int); BOOL isItem(int) const; void onDungeonItem(int); - bool isDungeonItem(int) const; + s32 isDungeonItem(int) const; u8 getKeyNum() { return mKeyNum; } - void onDungeonItemMap() { onDungeonItem(MAP_FLAG); } - bool isDungeonItemMap() const { return isDungeonItem(MAP_FLAG); } - void onDungeonItemCompass() { onDungeonItem(COMPASS_FLAG); } - void onDungeonItemWarp() { onDungeonItem(OOCCOO_NOTE_FLAG); } - void onDungeonItemBossKey() { onDungeonItem(BOSS_KEY_FLAG); } - bool isDungeonItemBossKey() const { return isDungeonItem(BOSS_KEY_FLAG); } + void setKeyNum(u8 keyNum) { mKeyNum = keyNum; } + void onDungeonItemMap() { onDungeonItem(MAP); } + s32 isDungeonItemMap() const { return isDungeonItem(MAP); } + void onDungeonItemCompass() { onDungeonItem(COMPASS); } + void onDungeonItemWarp() { onDungeonItem(OOCCOO_NOTE); } + void onDungeonItemBossKey() { onDungeonItem(BOSS_KEY); } + s32 isDungeonItemBossKey() const { return isDungeonItem(BOSS_KEY); } + void onStageBossEnemy() { + onDungeonItem(STAGE_BOSS_ENEMY); + onDungeonItem(OOCCOO_NOTE); + } + s32 isDungeonItemWarp() const { return isDungeonItem(OOCCOO_NOTE); } + void onStageLife() { onDungeonItem(STAGE_LIFE); } private: /* 0x00 */ u32 mTbox[2]; /* 0x08 */ u32 mSwitch[4]; - /* 0x18 */ u32 mItem[1]; // not sure if this is right + /* 0x18 */ u32 mItem[1]; /* 0x1C */ u8 mKeyNum; /* 0x1D */ u8 mDungeonItem; -}; -#pragma pack(pop) +}; // Size: 0x20 class dSv_event_c { public: - void init(void); + void init(); void onEventBit(u16); void offEventBit(u16); int isEventBit(u16) const; @@ -738,48 +760,47 @@ public: u8 getEventReg(u16) const; private: - u8 mEvent[256]; -}; + /* 0x0 */ u8 mEvent[256]; +}; // Size: 0x100 class dSv_MiniGame_c { public: - void init(void); + void init(); private: - u8 unk0; - u8 unk1[3]; - u32 unk4; - u32 mBalloonScore; - u32 mRaceGameTime; - u32 unk16; - u32 unk20; -}; + /* 0x00 */ u8 unk0; + /* 0x01 */ u8 unk1[3]; + /* 0x04 */ u32 mStarTime; + /* 0x08 */ u32 mBalloonScore; + /* 0x0C */ u32 mRaceGameTime; + /* 0x10 */ u32 unk16; + /* 0x14 */ u32 unk20; +}; // Size: 0x18 class dSv_memory_c { public: - dSv_memory_c(void) { this->init(); } - void init(void); - dSv_memBit_c& getMemBit() { return mMemBit; } - const dSv_memBit_c& getMemBitConst() const { return mMemBit; } + dSv_memory_c() { this->init(); } + void init(); + dSv_memBit_c& getBit() { return mBit; } + const dSv_memBit_c& getBit() const { return mBit; } private: - dSv_memBit_c mMemBit; - u8 padding30[2]; -}; + /* 0x0 */ dSv_memBit_c mBit; +}; // Size: 0x20 STATIC_ASSERT(sizeof(dSv_memory_c) == 0x20); class dSv_memory2_c { public: - dSv_memory2_c(void) { this->init(); } - void init(void); + dSv_memory2_c() { this->init(); } + void init(); void onVisitedRoom(int); void offVisitedRoom(int); BOOL isVisitedRoom(int); private: - u32 mVisitedRoom[2]; -}; + /* 0x0 */ u32 mVisitedRoom[2]; +}; // Size: 0x8 STATIC_ASSERT(sizeof(dSv_memory2_c) == 8); @@ -794,19 +815,19 @@ public: BOOL isItem(int) const; private: - s8 mStageNo; - u8 unk1; - u8 unk2[2]; - u32 mSwitch[2]; - u32 mItem[4]; - s16 unk28[16]; -}; + /* 0x00 */ s8 mStageNo; + /* 0x01 */ u8 unk1; + /* 0x02 */ u8 unk2[2]; + /* 0x04 */ u32 mSwitch[2]; + /* 0x0C */ u32 mItem[4]; + /* 0x1C */ s16 unk28[16]; +}; // Size: 0x3C class dSv_zoneBit_c { public: - void init(void); - void clearRoomSwitch(void); - void clearRoomItem(void); + void init(); + void clearRoomSwitch(); + void clearRoomItem(); void onSwitch(int); void offSwitch(int); BOOL isSwitch(int) const; @@ -821,16 +842,16 @@ public: BOOL isOneItem(int) const; private: - u16 mSwitch[2]; - u16 mRoomSwitch; - u16 mItem[2]; - u16 mRoomItem; - u16 unk12; -}; + /* 0x00 */ u16 mSwitch[2]; + /* 0x04 */ u16 mRoomSwitch; + /* 0x06 */ u16 mItem[2]; + /* 0x0A */ u16 mRoomItem; + /* 0x0C */ u16 unk12; +}; // Size: 0xE class dSv_zoneActor_c { public: - void init(void); + void init(); void on(int); void off(int); BOOL is(int) const; @@ -838,26 +859,26 @@ public: static const int ACTOR_MAX = 0xFFFF; private: - u32 actor_bitfield[4]; -}; + /* 0x00 */ u32 mActorFlags[4]; +}; // Size: 0x10 class dSv_zone_c { public: dSv_zone_c(void) { mRoomNo = -1; } // the assembly for this is in d_com_inf_game.s void init(int); dSv_zoneBit_c& getZoneBit() { return mBit; } - const dSv_zoneBit_c& getZoneBitConst() const { return mBit; } - dSv_zoneActor_c& getZoneActor() { return mActor; } - const dSv_zoneActor_c& getZoneActorConst() const { return mActor; } + const dSv_zoneBit_c& getBit() const { return mBit; } + dSv_zoneActor_c& getActor() { return mActor; } + const dSv_zoneActor_c& getActor() const { return mActor; } s8& getRoomNo() { return mRoomNo; } private: - s8 mRoomNo; - u8 unk1; - dSv_zoneBit_c mBit; - dSv_zoneActor_c mActor; -}; + /* 0x00 */ s8 mRoomNo; + /* 0x01 */ u8 unk1; + /* 0x02 */ dSv_zoneBit_c mBit; + /* 0x10 */ dSv_zoneActor_c mActor; +}; // Size: 0x20 STATIC_ASSERT(sizeof(dSv_zone_c) == 0x20); @@ -875,15 +896,15 @@ private: /* 0x18 */ f32 mLastSpeedF; /* 0x1C */ u32 mLastMode; /* 0x20 */ s16 mLastAngleY; -}; +}; // Size: 0x24 class dSv_turnRestart_c { public: class dSv_turnRestart_camera_c { - cXyz mCameraCtr; - cXyz mCameraEye; - cXyz mCameraUp; - }; + /* 0x00 */ cXyz mCameraCtr; + /* 0x0C */ cXyz mCameraEye; + /* 0x18 */ cXyz mCameraUp; + }; // Size: 0x24 void set(const cXyz&, s16, s8, u32); @@ -894,7 +915,7 @@ private: /* 0x12 */ s8 unk18; /* 0x14 */ dSv_turnRestart_camera_c mCamera; /* 0x38 */ f32 mCameraFvy; -}; +}; // Size: 0x3C class dSv_reserve_c { public: @@ -904,39 +925,32 @@ private: class dSv_save_c { public: - void init(void); + void init(); dSv_memory2_c* getSave2(int); + dSv_player_c& getPlayer() { return mPlayer; } - dSv_player_status_a_c& getPlayerStatusA() { return mPlayer.getPlayerStatusA(); } - dSv_player_get_item_c& getPlayerGetItem() { return mPlayer.getPlayerGetItem(); } - dSv_player_item_record_c& getPlayerItemRecord() { return mPlayer.getPlayerItemRecord(); } - dSv_player_item_max_c& getPlayerItemMax() { return mPlayer.getPlayerItemMax(); } - dSv_player_last_mark_info_c& getPlayerLastMarkInfo() { return mPlayer.getPlayerLastMarkInfo(); } - dSv_player_item_c& getPlayerItem() { return mPlayer.getPlayerItem(); } - dSv_player_collect_c& getPlayerCollect() { return mPlayer.getPlayerCollect(); } - dSv_light_drop_c& getLightDrop() { return mPlayer.getLightDrop(); } dSv_event_c& getEvent() { return mEvent; } + dSv_memory_c& getSave(int i_stageNo) { return mSave[i_stageNo]; } + void putSave(int i_stageNo, dSv_memory_c mem) { mSave[i_stageNo] = mem; } static const int STAGE_MAX = 32; static const int STAGE2_MAX = 64; // private: - dSv_player_c mPlayer; - dSv_memory_c mSave[STAGE_MAX]; - dSv_memory2_c mSave2[STAGE2_MAX]; - dSv_event_c mEvent; - dSv_reserve_c reserve; - dSv_MiniGame_c mMiniGame; -}; -#pragma pack(push, 1) + /* 0x000 */ dSv_player_c mPlayer; + /* 0x1F0 */ dSv_memory_c mSave[STAGE_MAX]; + /* 0x5F0 */ dSv_memory2_c mSave2[STAGE2_MAX]; + /* 0x7F0 */ dSv_event_c mEvent; + /* 0x8F0 */ dSv_reserve_c reserve; + /* 0x940 */ dSv_MiniGame_c mMiniGame; +}; // Size: 0x958 + class dSv_info_c { public: - dSv_info_c() {} - ~dSv_info_c() {} - void init(void); + void init(); void getSave(int); void putSave(int); - void initZone(void); + void initZone(); u32 createZone(int); void onSwitch(int, int); void offSwitch(int, int); @@ -947,8 +961,8 @@ public: void onActor(int, int); void offActor(int, int); BOOL isActor(int, int) const; - void memory_to_card(char*, int); - void card_to_memory(char*, int); + int memory_to_card(char*, int); + int card_to_memory(char*, int); void initdata_to_card(char*, int); dSv_save_c& getSavedata() { return mSavedata; } @@ -956,6 +970,9 @@ public: dSv_zone_c* getZones() { return mZone; } dSv_player_c& getPlayer() { return mSavedata.getPlayer(); } dSv_event_c& getTmp() { return mTmp; } + s64 getStartTime() { return mStartTime; } + s64 getSaveTotalTime() { return mSaveTotalTime; } + void initDan(s8 param_0) { mDan.init(param_0); } private: /* 0x000 */ dSv_save_c mSavedata; @@ -970,9 +987,18 @@ private: /* 0xF19 */ u8 mNewFile; /* 0xF1A */ u8 mNoFile; /* 0xF1B */ u8 field_0xf1b[13]; - /* 0xF28 */ u64 mStartTime; - /* 0xF30 */ u64 mSaveTotalTime; + /* 0xF28 */ s64 mStartTime; + /* 0xF30 */ s64 mSaveTotalTime; +}; // Size: 0xF38 + +class dSv_event_flag_c { +public: + static u16 saveBitLabels[822]; +}; + +class dSv_event_tmp_flag_c { +public: + static u16 const tempBitLabels[185]; }; -#pragma pack(pop) #endif /* D_SAVE_D_SAVE_H */ diff --git a/include/dolphin/mtx/vec.h b/include/dolphin/mtx/vec.h index 05af4f6838e..174f84ad9c4 100644 --- a/include/dolphin/mtx/vec.h +++ b/include/dolphin/mtx/vec.h @@ -16,6 +16,11 @@ struct Vec { y = pY; z = pZ; } + void set(const Vec& other) { + x = other.x; + y = other.y; + z = other.z; + } }; extern "C" { diff --git a/include/f_op/f_op_actor.h b/include/f_op/f_op_actor.h index 903c6e03844..ac32c1408f7 100644 --- a/include/f_op/f_op_actor.h +++ b/include/f_op/f_op_actor.h @@ -107,7 +107,7 @@ public: /* 0x534 */ f32 mMaxFallSpeed; /* 0x538 */ cXyz mEyePos; /* 0x544 */ actor_attention_types mAttentionInfo; - /* 0x560 */ u8 field_0x560[0x10]; // not 100% sure on this + /* 0x560 */ u8 field_0x560[0x8]; // not 100% sure on this fopAc_ac_c(); ~fopAc_ac_c(); @@ -116,6 +116,6 @@ public: const cXyz& getPosition() const { return mCurrent.mPosition; } const csXyz& getAngle() const { return mCurrent.mAngle; } -}; // Size: 0x570? +}; // Size: 0x568 #endif diff --git a/include/msl_c/string.h b/include/msl_c/string.h index f39ec80e07b..6f66cb20a0e 100644 --- a/include/msl_c/string.h +++ b/include/msl_c/string.h @@ -15,6 +15,8 @@ char* strncpy(char* dest, const char* source, u32 n); char* strcpy(char* dest, const char* source); u32 strlen(const char* s); int tolower(int); +int sprintf(char*, const char*, ...); +int printf(const char*, ...); } #endif \ No newline at end of file diff --git a/libs/JSystem/JUtility/JUTGamePad.cpp b/libs/JSystem/JUtility/JUTGamePad.cpp index 5f7febaa63a..5ce1ce7539d 100644 --- a/libs/JSystem/JUtility/JUTGamePad.cpp +++ b/libs/JSystem/JUtility/JUTGamePad.cpp @@ -234,7 +234,7 @@ SECTION_SDATA u32 JUTGamePad::sStickMode = 0x00000001; SECTION_SDATA u32 JUTGamePad::sClampMode = 0x00000001; /* 804514E0-804514E4 0009E0 0004+00 1/1 2/2 0/0 .sbss sRumbleSupported__10JUTGamePad */ -u8 JUTGamePad::sRumbleSupported[4]; +u32 JUTGamePad::sRumbleSupported; /* 802E08E4-802E0BBC 2DB224 02D8+00 0/0 2/2 0/0 .text read__10JUTGamePadFv */ #pragma push diff --git a/src/d/a/d_a_alink.cpp b/src/d/a/d_a_alink.cpp index b29bffa711b..394247747bf 100644 --- a/src/d/a/d_a_alink.cpp +++ b/src/d/a/d_a_alink.cpp @@ -4,6 +4,7 @@ // #include "d/a/d_a_alink.h" +#include "d/com/d_com_inf_game.h" #include "dol2asm.h" #include "dolphin/types.h" #include "f_op/f_op_actor_mng.h" @@ -93,13 +94,6 @@ struct daMirror_c { /* 8003194C */ void entry(J3DModel*); }; -struct daItemBase_c { - /* 80037A5C */ void getItemNo(); - /* 80037A64 */ void hide(); - /* 80037A74 */ void show(); - /* 80037AE4 */ void dead(); -}; - struct daCrod_c { /* 80141A94 */ void setControllActorData(); }; @@ -569,28 +563,11 @@ struct daAlinkHIO_atnMove_c0 { static u8 const m[84]; }; -struct dVibration_c { - /* 8006FA24 */ void StartShock(int, int, cXyz); - /* 8006FB10 */ void StartQuake(int, int, cXyz); - /* 8006FD94 */ void StopQuake(int); -}; - -struct dSv_event_tmp_flag_c { - static u8 const tempBitLabels[370 + 2 /* padding */]; -}; - struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); }; -struct dRes_control_c { - /* 8003C1E4 */ void getResInfo(char const*, dRes_info_c*, int); - /* 8003C37C */ void getRes(char const*, char const*, dRes_info_c*, int); - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); - /* 8003C400 */ void getIDRes(char const*, u16, dRes_info_c*, int); -}; - struct dPa_control_c { struct level_c { /* 8004B8B4 */ void forceOnEventMove(u32); @@ -631,35 +608,6 @@ struct dInsect_c { /* 80110648 */ void Insect_Release(); }; -struct dEvt_control_c { - /* 80042468 */ void reset(); - /* 80042518 */ void reset(void*); - /* 80042914 */ void setSkipProc(void*, int (*)(void*, int), int); - /* 8004316C */ void compulsory(void*, char const*, u16); - /* 800432EC */ void convPId(unsigned int); - /* 800436F4 */ void setPtD(void*); - /* 801412D4 */ void isOrderOK(); -}; - -struct dEvent_manager_c { - /* 80046800 */ void setObjectArchive(char*); - /* 80046A58 */ void orderStartDemo(); - /* 80047758 */ void getEventIdx(fopAc_ac_c*, char const*, u8); - /* 80047A38 */ void startCheckOld(char const*); - /* 80047B1C */ void getMyStaffId(char const*, fopAc_ac_c*, int); - /* 80047F5C */ void getMyNowCutName(int); - /* 800480EC */ void getMySubstanceP(int, char const*, int); - /* 8004817C */ void cutEnd(int); - /* 800483C4 */ void setGoal(cXyz*); - /* 800483E0 */ void getGoal(); - /* 800483E8 */ void getRunEventName(); - /* 8004882C */ void checkStartDemo(); -}; - -struct dEvent_exception_c { - /* 800463F0 */ void setStartDemo(int); -}; - struct dDlst_shadowControl_c { /* 80055F1C */ void addReal(u32, J3DModel*); @@ -677,10 +625,6 @@ struct dDemo_c { static u8 m_object[4]; }; -struct dComIfG_play_c { - /* 8002C97C */ void getLayerNo(int); -}; - struct dCamera_c { /* 80088A7C */ void StartEventCamera(int, int, ...); /* 80088BBC */ void EndEventCamera(int); @@ -696,12 +640,6 @@ struct dBgS_ObjAcch { /* 800D0C6C */ ~dBgS_ObjAcch(); }; -struct camera_class {}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - struct _GXTexObj {}; struct Z2SeqMgr { @@ -1293,7 +1231,7 @@ extern "C" static void mDoAud_setLinkHp__Fll(); extern "C" static void dComIfGs_getLife__Fv(); extern "C" static void dComIfGp_getRStatus__Fv(); extern "C" void checkAttentionLock__9daAlink_cFv(); -extern "C" static void dComIfGp_setItemLifeCount__FfUc(); +extern "C" void dComIfGp_setItemLifeCount__FfUc(f32, u8); extern "C" static void cMtx_multVec__FPA4_CfPC3VecP3Vec(); extern "C" void getAnmMtx__8J3DModelFi(); extern "C" void setBaseTRMtx__8J3DModelFPA4_f(); @@ -2812,7 +2750,7 @@ extern "C" void __ct__8cM3dGPlaFv(); extern "C" void offCondition__11dEvt_info_cFUs(); extern "C" void checkShieldGet__9daPy_py_cFv(); extern "C" static void fopAcM_onSwitch__FPC10fopAc_ac_ci(); -extern "C" static void dComIfGs_isItemFirstBit__FUc(); +extern "C" void dComIfGs_isItemFirstBit__FUc(u8); extern "C" static void dStage_stagInfo_GetSaveTbl__FP21stage_stag_info_class(); extern "C" static void dComIfGp_getStage__Fv(); extern "C" void checkEquipHeavyBoots__9daPy_py_cCFv(); @@ -3004,8 +2942,8 @@ extern "C" static void dComIfGp_getDoStatus__Fv(); extern "C" void __ct__4cXyzFfff(f32, f32, f32); extern "C" static void dMeter2Info_offUseButton__Fi(); extern "C" void setLinkState__14Z2CreatureLinkFUc(); -extern "C" static void dComIfGs_getRupee__Fv(); -extern "C" static void dComIfGp_setItemRupeeCount__Fl(); +extern "C" void dComIfGs_getRupee__Fv(); +extern "C" void dComIfGp_setItemRupeeCount__Fl(s32); extern "C" static void dMeter2Info_setFloatingMessage__FUssb(); extern "C" void onForcePanic__9daMidna_cFv(); extern "C" void checkForceNormalColor__9daMidna_cCFv(); @@ -3825,7 +3763,6 @@ extern "C" u8 mLineCheck__11fopAcM_lc_c[112]; extern "C" u8 mGndCheck__11fopAcM_gc_c[84]; extern "C" u8 mWaterCheck__11fopAcM_wt_c[84 + 4 /* padding */]; extern "C" u8 mDemoArcName__20dStage_roomControl_c[10 + 2 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; extern "C" extern u8 g_env_light[4880]; extern "C" f32 Zero__4cXyz[3]; @@ -3840,7 +3777,6 @@ extern "C" extern u32 __float_max; extern "C" extern u8 data_80450B38[4]; extern "C" f32 mGroundY__11fopAcM_gc_c; extern "C" f32 mWaterY__11fopAcM_wt_c[1 + 1 /* padding */]; -extern "C" extern u8 struct_80450D64[4]; extern "C" u8 m_top__12daTagHstop_c[4 + 4 /* padding */]; extern "C" u8 m_object__7dDemo_c[4]; extern "C" u8 mWaterBubblePcallBack__13dPa_control_c[4]; @@ -3995,22 +3931,9 @@ asm void daAlink_matAnm_c::calc(J3DMaterial* param_0) const { } #pragma pop -/* 8009DA60-8009DA98 0983A0 0038+00 48/48 0/0 5/5 .text checkStageName__9daAlink_cFPCc */ -// need gameinfo setup -#ifdef NONMATCHING bool daAlink_c::checkStageName(const char* stage) { return strcmp(dComIfGp_getStartStageName(), stage) == 0; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::checkStageName(char const* param_0) { - nofralloc -#include "asm/d/a/d_a_alink/checkStageName__9daAlink_cFPCc.s" -} -#pragma pop -#endif /* 8009DA98-8009DB64 0983D8 00CC+00 1/1 0/0 0/0 .text * tgHitCallback__9daAlink_cFP10fopAc_ac_cP12dCcD_GObjInfP12dCcD_GObjInf */ @@ -16199,65 +16122,35 @@ asm void daAlink_c::setAtnList() { #pragma pop /* 800B3220-800B3238 0ADB60 0018+00 5/5 0/0 0/0 .text setRStatus__9daAlink_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setRStatus(u8 param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setRStatus__9daAlink_cFUc.s" +void daAlink_c::setRStatus(u8 status) { + dComIfGp_setRStatus(status, 0); } -#pragma pop /* 800B3238-800B3250 0ADB78 0018+00 1/1 0/0 0/0 .text setRStatusEmphasys__9daAlink_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setRStatusEmphasys(u8 param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setRStatusEmphasys__9daAlink_cFUc.s" +void daAlink_c::setRStatusEmphasys(u8 status) { + dComIfGp_setRStatus(status, 2); } -#pragma pop /* 800B3250-800B3268 0ADB90 0018+00 61/61 0/0 0/0 .text setDoStatus__9daAlink_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setDoStatus(u8 param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setDoStatus__9daAlink_cFUc.s" +void daAlink_c::setDoStatus(u8 status) { + dComIfGp_setDoStatus(status, 0); } -#pragma pop /* 800B3268-800B3280 0ADBA8 0018+00 19/19 0/0 0/0 .text setDoStatusEmphasys__9daAlink_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setDoStatusEmphasys(u8 param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setDoStatusEmphasys__9daAlink_cFUc.s" +void daAlink_c::setDoStatusEmphasys(u8 status) { + dComIfGp_setDoStatus(status, 2); } -#pragma pop /* 800B3280-800B3298 0ADBC0 0018+00 2/2 0/0 0/0 .text setDoStatusContinuation__9daAlink_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setDoStatusContinuation(u8 param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setDoStatusContinuation__9daAlink_cFUc.s" +void daAlink_c::setDoStatusContinuation(u8 status) { + dComIfGp_setDoStatus(status, 4); } -#pragma pop /* 800B3298-800B32B0 0ADBD8 0018+00 8/8 0/0 0/0 .text setBStatus__9daAlink_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setBStatus(u8 param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setBStatus__9daAlink_cFUc.s" +void daAlink_c::setBStatus(u8 status) { + dComIfGp_setAStatus(status, 0); } -#pragma pop /* 800B32B0-800B3358 0ADBF0 00A8+00 2/2 0/0 0/0 .text checkAtnWaitAnime__9daAlink_cFv */ #pragma push @@ -17085,26 +16978,32 @@ asm void daAlink_c::setMagicArmorBrk(int param_0) { } #pragma pop +inline u16 i_dComIfGs_getRupee() { + return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().getRupee(); +} + /* 800BB408-800BB458 0B5D48 0050+00 6/6 0/0 0/0 .text checkMagicArmorHeavy__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkMagicArmorHeavy() const { - nofralloc -#include "asm/d/a/d_a_alink/checkMagicArmorHeavy__9daAlink_cCFv.s" +BOOL daAlink_c::checkMagicArmorHeavy() const { + bool check = false; + + if (checkMagicArmorWearAbility() && i_dComIfGs_getRupee() == 0) { + check = true; + } + + return check; } -#pragma pop /* 800BB458-800BB4B8 0B5D98 0060+00 1/0 0/0 0/0 .text checkBootsOrArmorHeavy__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::checkBootsOrArmorHeavy() const { - nofralloc -#include "asm/d/a/d_a_alink/checkBootsOrArmorHeavy__9daAlink_cCFv.s" +BOOL daAlink_c::checkBootsOrArmorHeavy() const { + bool check = false; + + if (i_checkEquipHeavyBoots() || checkMagicArmorHeavy() || checkIronBallWaitAnime()) { + check = true; + } + + return check; } -#pragma pop /* 800BB4B8-800BB560 0B5DF8 00A8+00 29/29 0/0 0/0 .text checkHeavyStateOn__9daAlink_cFii */ @@ -17139,14 +17038,15 @@ asm void daAlink_c::initGravity() { /* 800BB770-800BB7A0 0B60B0 0030+00 64/64 0/0 0/0 .text setSpecialGravity__9daAlink_cFffi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setSpecialGravity(f32 param_0, f32 param_1, int param_2) { - nofralloc -#include "asm/d/a/d_a_alink/setSpecialGravity__9daAlink_cFffi.s" +void daAlink_c::setSpecialGravity(f32 gravity, f32 speed, int param_2) { + if (param_2 != 0) { + i_offNoResetFlg3(0x4000); + } else { + i_onNoResetFlg3(0x4000); + } + mGravity = gravity; + mMaxFallSpeed = speed; } -#pragma pop /* 800BB7A0-800BBD40 0B60E0 05A0+00 1/1 0/0 0/0 .text transAnimeProc__9daAlink_cFP4cXyzff */ @@ -17511,7 +17411,7 @@ asm void daAlink_c::checkZoraWearAbility() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkMagicArmorWearAbility() const { +asm BOOL daAlink_c::checkMagicArmorWearAbility() const { nofralloc #include "asm/d/a/d_a_alink/checkMagicArmorWearAbility__9daAlink_cCFv.s" } @@ -19274,6 +19174,11 @@ BOOL daAlink_c::checkRideOn() const { } /* 800CFEC4-800CFEF4 0CA804 0030+00 1/1 0/0 0/0 .text dComIfGp_att_getCatghTarget__Fv */ +#ifdef NONMATCHING +static s32 dComIfGp_att_getCatghTarget() { + return dComIfGp_getAttention().getCatghTarget().getCatghTarget(); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -19282,6 +19187,7 @@ static asm void dComIfGp_att_getCatghTarget() { #include "asm/d/a/d_a_alink/dComIfGp_att_getCatghTarget__Fv.s" } #pragma pop +#endif /* 800CFEF4-800CFF2C 0CA834 0038+00 1/1 0/0 0/0 .text mDoAud_setLinkHp__Fll */ static void mDoAud_setLinkHp(s32 param_0, s32 param_1) { @@ -19291,24 +19197,14 @@ static void mDoAud_setLinkHp(s32 param_0, s32 param_1) { } /* 800CFF2C-800CFF3C 0CA86C 0010+00 1/1 0/0 0/0 .text dComIfGs_getLife__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void dComIfGs_getLife() { - nofralloc -#include "asm/d/a/d_a_alink/dComIfGs_getLife__Fv.s" +static u16 dComIfGs_getLife() { + return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().getLife(); } -#pragma pop /* 800CFF3C-800CFF4C 0CA87C 0010+00 1/1 0/0 0/0 .text dComIfGp_getRStatus__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void dComIfGp_getRStatus() { - nofralloc -#include "asm/d/a/d_a_alink/dComIfGp_getRStatus__Fv.s" +static u8 dComIfGp_getRStatus() { + return g_dComIfG_gameInfo.play.getRStatus(); } -#pragma pop /* 800CFF4C-800CFFA4 0CA88C 0058+00 1/1 0/0 0/0 .text checkAttentionLock__9daAlink_cFv */ #pragma push @@ -19321,14 +19217,9 @@ asm BOOL daAlink_c::checkAttentionLock() { #pragma pop /* 800CFFA4-800CFFC0 0CA8E4 001C+00 1/1 0/0 0/0 .text dComIfGp_setItemLifeCount__FfUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void dComIfGp_setItemLifeCount(f32 param_0, u8 param_1) { - nofralloc -#include "asm/d/a/d_a_alink/dComIfGp_setItemLifeCount__FfUc.s" +void dComIfGp_setItemLifeCount(f32 amount, u8 type) { + g_dComIfG_gameInfo.play.setItemLifeCount(amount, type); } -#pragma pop /* 800CFFC0-800CFFE0 0CA900 0020+00 1/1 0/0 0/0 .text cMtx_multVec__FPA4_CfPC3VecP3Vec */ #pragma push @@ -19462,14 +19353,9 @@ u16 daAlink_c::checkSpecialDemoMode() const { /* 800D014C-800D0164 0CAA8C 0018+00 1/1 0/0 0/0 .text setMidnaTalkStatus__9daAlink_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setMidnaTalkStatus(u8 param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setMidnaTalkStatus__9daAlink_cFUc.s" +void daAlink_c::setMidnaTalkStatus(u8 status) { + dComIfGp_setZStatus(status, 0); } -#pragma pop /* 800D0164-800D0180 0CAAA4 001C+00 1/1 0/0 0/0 .text set3DStatus__9daAlink_cFUcUc */ #pragma push @@ -35018,21 +34904,16 @@ static asm void fopAcM_onSwitch(fopAc_ac_c const* param_0, int param_1) { #pragma pop /* 80141264-80141294 13BBA4 0030+00 1/1 0/0 0/0 .text dComIfGs_isItemFirstBit__FUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void dComIfGs_isItemFirstBit(u8 param_0) { - nofralloc -#include "asm/d/a/d_a_alink/dComIfGs_isItemFirstBit__FUc.s" +int dComIfGs_isItemFirstBit(u8 i_no) { + return g_dComIfG_gameInfo.info.getPlayer().getGetItem().isFirstBit(i_no); } -#pragma pop /* 80141294-801412A0 13BBD4 000C+00 1/1 0/0 0/0 .text * dStage_stagInfo_GetSaveTbl__FP21stage_stag_info_class */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void dStage_stagInfo_GetSaveTbl(stage_stag_info_class* param_0) { +static asm u8 dStage_stagInfo_GetSaveTbl(stage_stag_info_class* param_0) { nofralloc #include "asm/d/a/d_a_alink/dStage_stagInfo_GetSaveTbl__FP21stage_stag_info_class.s" } @@ -35119,14 +35000,9 @@ int daPy_py_c::checkEndResetFlg1(daPy_ERFLG1 pFlag) const { } /* 8014134C-8014135C 13BC8C 0010+00 1/1 0/0 0/0 .text dComIfGp_getEventManager__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void dComIfGp_getEventManager() { - nofralloc -#include "asm/d/a/d_a_alink/dComIfGp_getEventManager__Fv.s" +static dEvent_manager_c& dComIfGp_getEventManager() { + return g_dComIfG_gameInfo.play.getEvtManager(); } -#pragma pop /* 8014135C-8014136C 13BC9C 0010+00 1/1 0/0 0/0 .text * offNoResetFlg1__9daPy_py_cFQ29daPy_py_c9daPy_FLG1 */ @@ -35178,7 +35054,7 @@ asm bool dEvt_info_c::checkCommandCatch() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dComIfGs_isEventBit(u16 param_0) { +asm BOOL dComIfGs_isEventBit(u16 param_0) { nofralloc #include "asm/d/a/d_a_alink/dComIfGs_isEventBit__FUs.s" } @@ -36184,7 +36060,7 @@ void Z2CreatureLink::setLinkState(u8 pState) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void dComIfGs_getRupee() { +asm u16 dComIfGs_getRupee() { nofralloc #include "asm/d/a/d_a_alink/dComIfGs_getRupee__Fv.s" } @@ -36194,7 +36070,7 @@ static asm void dComIfGs_getRupee() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void dComIfGp_setItemRupeeCount(s32 param_0) { +asm void dComIfGp_setItemRupeeCount(s32 param_0) { nofralloc #include "asm/d/a/d_a_alink/dComIfGp_setItemRupeeCount__Fl.s" } diff --git a/src/d/com/d_com_inf_game.cpp b/src/d/com/d_com_inf_game.cpp index 7fbdc252f34..df876851d1f 100644 --- a/src/d/com/d_com_inf_game.cpp +++ b/src/d/com/d_com_inf_game.cpp @@ -4,6 +4,8 @@ // #include "d/com/d_com_inf_game.h" +#include "d/d_item.h" +#include "d/kankyo/d_kankyo.h" #include "d/meter/d_meter2_info.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -15,8 +17,6 @@ struct scene_class {}; -struct request_of_phase_process_class {}; - struct phaseParam_c {}; struct mDoRst { @@ -78,7 +78,7 @@ extern "C" void clearItemBombNumCount__14dComIfG_play_cFUc(); extern "C" void setNowVibration__14dComIfG_play_cFUc(); extern "C" void getNowVibration__14dComIfG_play_cFv(); extern "C" void setStartStage__14dComIfG_play_cFP19dStage_startStage_c(); -extern "C" static void dComIfG_get_timelayer__FPi(); +extern "C" void dComIfG_get_timelayer__FPi(); extern "C" void getLayerNo_common_common__14dComIfG_play_cFPCcii(); extern "C" void getLayerNo_common__14dComIfG_play_cFPCcii(); extern "C" void getLayerNo__14dComIfG_play_cFi(); @@ -142,17 +142,17 @@ extern "C" void dComIfGs_setSelectItemIndex__FiUc(); extern "C" void dComIfGs_setMixItemIndex__FiUc(); extern "C" void dComIfGs_getSelectMixItemNoArrowIndex__Fi(); extern "C" void dComIfGs_getMixItemIndex__Fi(); -extern "C" void dComIfGp_setSelectItem__Fi(); +extern "C" void dComIfGp_setSelectItem__Fi(int); extern "C" void dComIfGp_getSelectItem__Fi(); extern "C" void dComIfGp_mapShow__Fv(); extern "C" void dComIfGp_mapHide__Fv(); extern "C" void dComIfGp_checkMapShow__Fv(); extern "C" void dComIfGp_setHeapLockFlag__FUc(); -extern "C" void dComIfGp_offHeapLockFlag__Fi(); +extern "C" s32 dComIfGp_offHeapLockFlag__Fi(int); extern "C" static void dComIfGp_createSubExpHeap2D__Fv(); extern "C" static void dComIfGp_destroySubExpHeap2D__Fv(); -extern "C" static void dComIfGp_checkEmptySubHeap2D__Fv(); -extern "C" static void dComIfGp_searchUseSubHeap2D__Fi(); +extern "C" static int dComIfGp_checkEmptySubHeap2D__Fv(); +extern "C" static int dComIfGp_searchUseSubHeap2D__Fi(int); extern "C" void dComIfGp_getSubHeap2D__Fi(); extern "C" void dComIfGs_checkGetInsectNum__Fv(); extern "C" static u8 dComIfGs_checkGetItem__FUc(u8); @@ -176,7 +176,8 @@ extern "C" void dComIfGs_setKeyNum__FiUc(); extern "C" static void dComIfGs_setWarpItemData__FiPCc4cXyzsScUcUc(); extern "C" void setWarpItemData__14dComIfG_play_cFPCc4cXyzsScUcUc(); extern "C" void dComIfGs_setWarpItemData__FPCc4cXyzsScUcUc(); -extern "C" static void dComIfGs_setLastWarpMarkItemData__FPCc4cXyzsScUcUc(); +extern "C" static void dComIfGs_setLastWarpMarkItemData__FPCc4cXyzsScUcUc(const char*, cXyz, s16, + s8, u8, u8); extern "C" void dComIfGs_getWarpStageName__Fv(); extern "C" void dComIfGs_getWarpPlayerPos__Fv(); extern "C" void dComIfGs_getWarpPlayerAngleY__Fv(); @@ -270,7 +271,7 @@ extern "C" void fopScnM_ReRequest__FsUl(); extern "C" void set__18dStage_nextStage_cFPCcScsScScUc(); extern "C" void initZone__20dStage_roomControl_cFv(); extern "C" void getStatusRoomDt__20dStage_roomControl_cFi(); -extern "C" void dStage_roomRead_dt_c_GetReverbStage__FR14roomRead_classi(); +extern "C" u8 dStage_roomRead_dt_c_GetReverbStage__FR14roomRead_classi(roomRead_class&, int); extern "C" void setSelectItemIndex__21dSv_player_status_a_cFiUc(); extern "C" void getSelectItemIndex__21dSv_player_status_a_cCFi(); extern "C" void setMixItemIndex__21dSv_player_status_a_cFiUc(); @@ -383,7 +384,6 @@ extern "C" void _restgpr_26(); extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" void sprintf(); extern "C" extern void* __vt__12J3DFrameCtrl[3]; extern "C" extern void* __vt__8cM3dGPla[3]; extern "C" extern void* __vt__16dStage_stageDt_c[93]; @@ -404,15 +404,25 @@ extern "C" u8 mStatus__20dStage_roomControl_c[65792]; extern "C" extern u8 g_env_light[4880]; extern "C" u8 mFader__13mDoGph_gInf_c[4]; extern "C" u8 mResetData__6mDoRst[4 + 4 /* padding */]; -extern "C" extern u8 struct_80450D64[4]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; // // Declarations: // -/* 8002B1DC-8002B22C 025B1C 0050+00 2/2 0/0 0/0 .text ct__14dComIfG_play_cFv */ -void dComIfG_play_c::ct(void) { +inline u8 dStage_stagInfo_GetSaveTbl(stage_stag_info_class* param_0) { + return param_0->field_0x09 >> 1 & 0x1f; +} + +inline BOOL dComIfGs_isEventBit(u16 id) { + return g_dComIfG_gameInfo.info.getSavedata().getEvent().isEventBit(id); +} + +inline int dComIfGs_isItemFirstBit(u8 i_no) { + return g_dComIfG_gameInfo.info.getPlayer().getGetItem().isFirstBit(i_no); +} + +void dComIfG_play_c::ct() { mWindowNum = 0; mParticle = NULL; mLayerOld = 0; @@ -421,128 +431,78 @@ void dComIfG_play_c::ct(void) { init(); } -/* ############################################################################################## */ -/* 804061A0-804061B4 032EC0 0014+00 1/1 0/0 0/0 .bss dComIfG_mTimerInfo */ static __d_timer_info_c dComIfG_mTimerInfo; -/* 804061B4-804061C0 032ED4 000C+00 1/1 0/0 0/0 .bss @5065 */ -// static u8 lit_5065[12]; - -/* 804061C0-80423FD0 032EE0 1DE10+00 99/99 2264/2264 7115/7115 .bss g_dComIfG_gameInfo - */ -// extern u8 g_dComIfG_gameInfo[122384]; dComIfG_inf_c g_dComIfG_gameInfo; -/* 8002B22C-8002B2A8 025B6C 007C+00 1/1 1/1 0/0 .text init__14dComIfG_play_cFv */ -#ifdef NONMATCHING void dComIfG_play_c::init() { - mPlayer = NULL; - mPlayerCameraID[0] = -1; - mCameraInfo = NULL; + for (int i = 0; i < 1; i++) { + mPlayer[i] = NULL; + mPlayerCameraID[i] = -1; + } + mCameraInfo[0].mCamera = NULL; for (int i = 0; i < 2; i++) { + mPlayerPtr[i] = NULL; } if (mGameoverStatus == 2) { - g_dComIfG_gameInfo.getPlay().getRoomControl()->initZone(); + dComIfGp_roomControl_initZone(); } mGameoverStatus = 0; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dComIfG_play_c::init() { - nofralloc -#include "asm/d/com/d_com_inf_game/init__14dComIfG_play_cFv.s" -} -#pragma pop -#endif -/* 8002B2A8-8002B2C8 025BE8 0020+00 0/0 1/1 0/0 .text dComIfGp_checkItemGet__FUci */ void dComIfGp_checkItemGet(u8 param_0, int param_1) { - checkItemGet__FUci(param_0, param_1); + checkItemGet(param_0, param_1); } -/* 8002B2C8-8002B36C 025C08 00A4+00 0/0 1/1 0/0 .text itemInit__14dComIfG_play_cFv */ -#ifdef NONMATCHING void dComIfG_play_c::itemInit() { dMeter2Info_Initialize(); JKRExpHeap* heap = mExpHeap2D; - memset(mMsgObjectClass, 0, 300); + memset(&mMsgObjectClass, 0, 300); mExpHeap2D = heap; mOxygen = 600; mNowOxygen = 600; mMaxOxygen = 600; - if (dComIfGs_checkGetItem(0x3e) == 0) { - field_0x4f4b = 21; - } else { + if (dComIfGs_checkGetItem(HAWK_EYE)) { field_0x4f4b = 0; + } else { + field_0x4f4b = 21; } field_0x4f4c = 7; mNowVibration = dComIfGs_getOptVibration(); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dComIfG_play_c::itemInit() { - nofralloc -#include "asm/d/com/d_com_inf_game/itemInit__14dComIfG_play_cFv.s" -} -#pragma pop -#endif -/* 8002B36C-8002B384 025CAC 0018+00 1/1 3/3 1/1 .text setItemBombNumCount__14dComIfG_play_cFUcs */ void dComIfG_play_c::setItemBombNumCount(u8 i_item, s16 pCount) { mItemBombNumCount[i_item] += pCount; } -/* 8002B384-8002B394 025CC4 0010+00 0/0 1/1 0/0 .text getItemBombNumCount__14dComIfG_play_cFUc */ s16 dComIfG_play_c::getItemBombNumCount(u8 i_item) { return mItemBombNumCount[i_item]; } -/* 8002B394-8002B3A8 025CD4 0014+00 0/0 1/1 0/0 .text clearItemBombNumCount__14dComIfG_play_cFUc - */ void dComIfG_play_c::clearItemBombNumCount(u8 i_item) { mItemBombNumCount[i_item] = 0; } -/* 8002B3A8-8002B3B0 -00001 0008+00 0/0 0/0 0/0 .text setNowVibration__14dComIfG_play_cFUc */ void dComIfG_play_c::setNowVibration(u8 pStatus) { mNowVibration = pStatus; } -/* 8002B3B0-8002B3B8 025CF0 0008+00 0/0 2/2 0/0 .text getNowVibration__14dComIfG_play_cFv - */ u32 dComIfG_play_c::getNowVibration() { return mNowVibration; } -/* 8002B3B8-8002B3F4 025CF8 003C+00 0/0 1/1 0/0 .text - * setStartStage__14dComIfG_play_cFP19dStage_startStage_c */ -#ifdef NONMATCHING void dComIfG_play_c::setStartStage(dStage_startStage_c* pStartStage) { mLayerOld = mStartStage.getLayer(); mStartStage = *pStartStage; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dComIfG_play_c::setStartStage(dStage_startStage_c* param_0) { - nofralloc -#include "asm/d/com/d_com_inf_game/setStartStage__14dComIfG_play_cFP19dStage_startStage_c.s" -} -#pragma pop -#endif /* 8002B3F4-8002B434 025D34 0040+00 1/1 0/0 0/0 .text dComIfG_get_timelayer__FPi */ -static void dComIfG_get_timelayer(int* pLayer) { +void dComIfG_get_timelayer(int* pLayer) { if (dKy_daynight_check__Fv()) { *pLayer += 1; } @@ -590,6 +550,643 @@ SECTION_DEAD static char const* const stringBase_8037903B = "D_MN08A"; /* 8002B434-8002C950 025D74 151C+00 1/1 1/1 0/0 .text * getLayerNo_common_common__14dComIfG_play_cFPCcii */ +// only issue should be regalloc +#ifdef NONMATCHING +int dComIfG_play_c::getLayerNo_common_common(const char* stageName, int roomId, int layer) { + if (layer < 0) { + layer = -1; + + // Stage is in a Twilight state + if (dKy_darkworld_stage_check(stageName, roomId) == 1) { + layer = 14; + } + + if (layer < 13) { + // Stage is Snowpeak Ruins or Snowpeak + if (!strcmp(stageName, "D_MN11") || !strcmp(stageName, "F_SP114")) { + // Cleared Snowpeak Ruins + if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[266])) { + layer = 3; + } + + // Talked with Yeta after giving Cheese + else if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[163])) { + layer = 2; + } + + // Talked with Yeta after giving Pumpkin + else if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[162])) { + layer = 1; + } + } + + // Stage is Faron Woods + else if (!strcmp(stageName, "F_SP108")) { + // Cleared Snowpeak Ruins + if (dComIfGs_isEventBit(0x2008)) { + layer = 5; + } + + // Completed Midna's Desperate Hour + else if (dComIfGs_isEventBit(0x1E08)) { + layer = 3; + } + + // Cleared Forest Temple + else if (dComIfGs_isEventBit(0x0602)) { + layer = 2; + } + + // Haven't finished Ordon Day 2 + else if (!dComIfGs_isEventBit(0x4510)) { + layer = 1; + } + } + + // Stage is Faron Woods Interiors + else if (!strcmp(stageName, "R_SP108")) { + // Cleared Forest Temple + if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[55])) { + layer = 2; + } + + // Haven't finished Ordon Day 2 + else if (!dComIfGs_isEventBit(0x4510)) { + layer = 1; + } + } + + // Stage is Kakariko Village or Kakariko Graveyard + else if (!strcmp(stageName, "F_SP109") || !strcmp(stageName, "F_SP111")) { + // Obtained Zora's Armor + if (dComIfGs_isEventBit(0x0804)) { + layer = 2; + dComIfG_get_timelayer(&layer); + } + + // Finished Telma Wagon Escort + else if (dComIfGs_isEventBit(0x0810)) { + layer = 4; + } + + // Watched cutscene after leaving Goron Mines + else if (dComIfGs_isEventBit(0x1320)) { + layer = 2; + dComIfG_get_timelayer(&layer); + } + + // Cleared Goron Mines + else if (dComIfGs_isEventBit(0x0701)) { + layer = 12; + } + + // Defeated King Bulblin 1 + else if (dComIfGs_isEventBit(0x0A08)) { + layer = 2; + dComIfG_get_timelayer(&layer); + } + + // King Bulblin 1 trigger activated + else if (dComIfGs_isEventBit(0x0608)) { + layer = 1; + } + } + + // Stage is Kakariko Village Interiors or Graveyard Interiors + else if (!strcmp(stageName, "R_SP109") || !strcmp(stageName, "R_SP209")) { + // Stage is Kakariko Interiors and room is Barnes shop and Cleared Lakebed Temple + if (!strcmp(stageName, "R_SP109") && roomId == 1 && dComIfGs_isEventBit(0x0904)) { + layer = 4; + dComIfG_get_timelayer(&layer); + + } else { + // Defeated King Bulblin 1 + if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[85])) { + layer = 2; + dComIfG_get_timelayer(&layer); + } + + // King Bulblin 1 trigger activated + else if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[53])) { + layer = 1; + } + } + } + + // Stage is Death Mountain + else if (!strcmp(stageName, "F_SP110")) { + // Cleared Goron Mines + if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[64])) { + layer = 2; + } + } + + // Stage is Death Mountain Interiors + else if (!strcmp(stageName, "R_SP110")) { + // Returned Wood Statue to Ilia + if (dComIfGs_isEventBit(0x2320)) { + layer = 3; + } + + // Cleared Temple of Time + else if (dComIfGs_isEventBit(0x2004)) { + layer = 4; + } + + // Obtained Master Sword + else if (dComIfGs_isEventBit(0x2020)) { + layer = 2; + } + + // Cleared Goron Mines + else if (dComIfGs_isEventBit(0x0701)) { + layer = 1; + } + } + + // Stage is Lake Hylia, Castle Town, Telma's Bar, or R_SP115 (removed) + else if (!strcmp(stageName, "F_SP115") || !strcmp(stageName, "F_SP116") || + (!strcmp(stageName, "R_SP116") && roomId == 5) || + !strcmp(stageName, "R_SP115")) { + // Stage is Lake Hylia and room is Lake + if (!strcmp(stageName, "F_SP115") && roomId == 0) { + // Repaired Sky Cannon + if (dComIfGs_isEventBit(0x3B08)) { + layer = 3; + } + + // Warped Sky Cannon to Lake Hylia + else if (dComIfGs_isEventBit(0x3120)) { + layer = 1; + } + + // Cleared Lakebed Temple + else if (dComIfGs_isEventBit(0x0904)) { + layer = 2; + } + } + + // Stage is Telma's Bar and room is Bar and Obtained Master Sword + else if (!strcmp(stageName, "R_SP116") && roomId == 5 && + dComIfGs_isEventBit(0x2020)) { + layer = 4; + } + + // Completed Midna's Desperate Hour and Stage is Castle Town + else if (dComIfGs_isEventBit(0x1E08) && !strcmp(stageName, "F_SP116")) { + // Room is not East, South, or North Castle Town + if (roomId != 4 && roomId != 3 && roomId != 1) { + layer = 0; + } else { + layer = 1; + } + } else { + // Cleared Lakebed Temple + if (dComIfGs_isEventBit(0x0904)) { + // Stage is Lake Hylia and room is Fountain and haven't started Midna's + // Desperate Hour + if ((!strcmp(stageName, "F_SP115") && roomId == 1) && + !dComIfGs_isEventBit(0x0C01)) { + layer = 9; + } else { + layer = 2; + } + } else { + // Stage is Castle Town and room is South Castle Town and Finished Telma + // Wagon Escort + if ((!strcmp(stageName, "F_SP116") && roomId == 3) && + dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[68])) { + layer = 1; + } + } + } + } + + // Stage is Zora's Domain + else if (!strcmp(stageName, "F_SP113")) { + // Cleared Snowpeak Ruins + if (dComIfGs_isEventBit(0x2008)) { + layer = 2; + } + } + + // Stage is Upper Zora's River + else if (!strcmp(stageName, "F_SP126")) { + // Unlocked Iza's River Ride (1) + if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[95])) { + layer = 1; + } + } + + // Stage is Gerudo Desert and room is Desert + else if (!strcmp(stageName, "F_SP124") && roomId == 0) { + layer = 8; + + // Used Sky Cannon to go to Desert + if (dComIfGs_isEventBit(0x4008)) { + layer = 0; + } + } + + // Stage is Zora's River + else if (!strcmp(stageName, "F_SP112")) { + // Unlocked Iza's River Ride (1) + if (dComIfGs_isEventBit(0x0B01)) { + layer = 1; + } + + // Started Iza's River Ride (1) + else if (dComIfGs_isEventBit(0x0902)) { + layer = 2; + } + } + + // Stage is Ordon Village + else if (!strcmp(stageName, "F_SP103")) { + // Room is Main Village + if (roomId == 0) { + // Tamed Epona + if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[56])) { + layer = 4; + dComIfG_get_timelayer(&layer); + } + + // Cleared Faron Twilight + else if (dComIfGs_isDarkClearLV(0)) { + layer = 2; + dComIfG_get_timelayer(&layer); + } + + // Escaped Hyrule Castle Sewers (1st Time) + else if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[47])) { + layer = 1; + } + + // Finished Ordon Day 2 + else if (dComIfGs_isEventBit(0x4510)) { + layer = 7; + } + + // Finished Ordon Day 1 + else if (dComIfGs_isEventBit(0x4A40)) { + layer = 0; + } else { + layer = 6; + } + } + + // Room is Outside Link's House + else if (roomId == 1) { + // Cleared Faron Twilight + if (dComIfGs_isDarkClearLV(0)) { + layer = 2; + } + + // Escaped Hyrule Castle Sewers (1st Time) + else if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[47])) { + layer = 1; + } + + // Finished Ordon Day 2 + else if (dComIfGs_isEventBit(0x4510)) { + layer = 0; + } + + // Finished Ordon Day 1 + else if (dComIfGs_isEventBit(0x4A40)) { + layer = 4; + } else { + layer = 3; + } + } + } + + // Stage is Ordon Village Interiors + else if (!strcmp(stageName, "R_SP01")) { + // Room is Sera's Shop + if (roomId == 1) { + // Cleared Faron Twilight + if (dComIfGs_isDarkClearLV(0)) { + layer = 2; + } + } + + // Room is Shield house + else if (roomId == 2) { + // Watched cutscene after defeating King Bulblin 1 + if (dComIfGs_isEventBit(0x0780)) { + layer = 3; + } + + // Cleared Faron Twilight + else if (dComIfGs_isDarkClearLV(0)) { + layer = 2; + } + + // Escaped Hyrule Castle Sewers (1st Time) + else if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[47])) { + layer = 1; + } + } + + // Room is Rusl and Uli's house + else if (roomId == 5) { + // Tamed Epona + if (dComIfGs_isEventBit(0x0601)) { + layer = 4; + } + + // Cleared Faron Twilight + else if (dComIfGs_isDarkClearLV(0)) { + layer = 2; + } + } + } + + // Stage is Ordon Spring + else if (!strcmp(stageName, "F_SP104")) { + // Room is Ordon Spring + if (roomId == 1) { + // Cleared Faron Twilight + if (dComIfGs_isDarkClearLV(0)) { + layer = 2; + } + + // Escaped Hyrule Castle Sewers (1st Time) + else if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[47])) { + layer = 4; + } + + // Finished Ordon Day 2 + else if (dComIfGs_isEventBit(0x4510)) { + layer = 0; + } + + // Finished Ordon Day 1 + else if (dComIfGs_isEventBit(0x4A20)) { + layer = 3; + } else { + layer = 1; + } + } + + // Cleared Faron Twilight + else if (dComIfGs_isDarkClearLV(0)) { + layer = 2; + } + + // Escaped Hyrule Castle Sewers (1st Time) + else if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[47])) { + layer = 4; + } + } + + // Stage is Ordon Ranch + else if (!strcmp(stageName, "F_SP00")) { + // Cleared Faron Twilight + if (dComIfGs_isDarkClearLV(0)) { + layer = 2; + dComIfG_get_timelayer(&layer); + } + + // Escaped Hyrule Castle Sewers (1st Time) + else if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[47])) { + layer = 1; + } + + // Watched cutscene after herding goats on Ordon Day 3 + else if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[169])) { + layer = 10; + } + + // Finished Ordon Day 2 + else if (dComIfGs_isEventBit(0x4510)) { + layer = 9; + } + + // Finished Ordon Day 1 + else if (dComIfGs_isEventBit(0x4A40)) { + layer = 11; + } else { + layer = 12; + } + } + + // Stage is Hyrule Field + else if (!strcmp(stageName, "F_SP121")) { + // Completed Midna's Desperate Hour + if (dComIfGs_isEventBit(0x1E08)) { + layer = 6; + } + + // Started Midna's Desperate Hour + else if (dComIfGs_isEventBit(0x0C01)) { + layer = 4; + } + + // Finished Telma Wagon Escort + else if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[68])) { + layer = 0; + } + + else if (dComIfGs_isTmpBit(0x0601)) { + if (dComIfGs_isTmpBit(0x0602)) { + layer = 2; + } + } else { + layer = 3; + } + } + + // Stage is Outside Castle Town + else if (!strcmp(stageName, "F_SP122")) { + // Room is Outside Castle Town - West + if (roomId == 8) { + // Completed Midna's Desperate Hour + if (dComIfGs_isEventBit(0x1E08)) { + layer = 6; + } + + // Started Midna's Desperate Hour + else if (dComIfGs_isEventBit(0x0C01)) { + layer = 4; + } + } + + // Room is Outside Castle Town - South + else if (roomId == 16) { + // Obtained Wood Statue + if (dComIfGs_isEventBit(0x2204)) { + layer = 6; + } + + // Talked to Louise after getting Medicine Scent + else if (dComIfGs_isEventBit(0x2102)) { + layer = 1; + } + + // Completed Midna's Desperate Hour + else if (dComIfGs_isEventBit(0x1E08)) { + layer = 6; + } + + // Started Midna's Desperate Hour + else if (dComIfGs_isEventBit(0x0C01)) { + layer = 4; + } + } + + // Room is Outside Castle Town - East + else if (roomId == 17) { + // Completed Midna's Desperate Hour + if (dComIfGs_isEventBit(0x1E08)) { + layer = 0; + } + + // Started Midna's Desperate Hour + else if (dComIfGs_isEventBit(0x0C01)) { + layer = 4; + } + } + } + + // Stage is Hidden Village + else if (!strcmp(stageName, "F_SP128")) { + if (dComIfGs_isEventBit(0x2320)) { + layer = 1; + } + } + + // Stage is Castle Town Interiors + else if (!strcmp(stageName, "R_SP160")) { + // Room is Jovani's house + if (roomId == 5) { + // Completed Midna's Desperate Hour + if (dComIfGs_isEventBit(0x1E08)) { + layer = 0; + } else { + layer = 1; + } + } + + // Fundraised Malo Mart Castle Town branch + else if (dComIfGs_isEventBit(0x2210)) { + layer = 1; + } + } + + // Stage is Sacred Grove + else if (!strcmp(stageName, "F_SP117")) { + // Cleared Snowpeak Ruins + if (dComIfGs_isEventBit(0x2008)) { + layer = 2; + } + } + + // Stage is Bulblin Camp + else if (!strcmp(stageName, "F_SP118")) { + // Fixed the Mirror of Twilight + if (dComIfGs_isEventBit(0x2B08)) { + layer = 3; + } + + // Cleared Arbiter's Grounds + else if (dComIfGs_isEventBit(0x2010)) { + layer = 2; + } + + // Escaped the burning tent + else if (dComIfGs_isEventBit(0x0B40)) { + layer = 1; + } + } + + // Stage is Faron Woods Cave + else if (!strcmp(stageName, "D_SB10")) { + // Finished Ordon Day 2 + if (dComIfGs_isEventBit(0x4510)) { + layer = 1; + } + } + + // Stage is Hyrule Castle Sewers + else if (!strcmp(stageName, "R_SP107")) { + if (dComIfGs_isTransformLV(3)) { + layer = 13; + } + } + + // Stage is Hyrule Castle + else if (!strcmp(stageName, "D_MN09")) { + // Room is not Entrance, Outside Left Wing, or Outside Right Wing + if (roomId != 11 && roomId != 13 && roomId != 14) { + layer = 1; + } + } + + // Stage is Fishing Pond or Hena's Hut + else if (!strcmp(stageName, "F_SP127") || !strcmp(stageName, "R_SP127")) { + switch (g_env_light[0x12fe]) { + case 1: + layer = 0; + break; + case 2: + layer = 1; + break; + case 3: + layer = 2; + break; + case 4: + layer = 3; + break; + } + } + } + } + + if (layer == 14) { + int tmp = layer; + // Warped meteor to Zora's Domain + if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[65])) { + // Stage is Zora's River, Zora's Domain, Lake Hylia, Castle Town, Telma's Bar, R_SP115, + // Hyrule Field, Upper Zora's River, or Outside Castle Town + if (!strcmp(stageName, "F_SP112") || !strcmp(stageName, "F_SP113") || + !strcmp(stageName, "F_SP115") || !strcmp(stageName, "F_SP116") || + (!strcmp(stageName, "R_SP116") && roomId == 5) || !strcmp(stageName, "R_SP115") || + !strcmp(stageName, "F_SP121") || !strcmp(stageName, "F_SP126") || + !strcmp(stageName, "F_SP122")) { + // Stage is Hyrule Field + if (!strcmp(stageName, "F_SP121")) { + if (tmp >= 9 && tmp <= 14) { + layer = 13; + } + } else { + layer = 13; + } + } + + // Stage is Hyrule Castle Sewers and room is Prison Cell + if (!strcmp(stageName, "R_SP107") && roomId == 0) { + // Haven't been to Hyrule Castle Sewers + if (!dComIfGs_isEventBit(0x4D08)) { + layer = 11; + } + } + // Stage and room is Zant Throne Room + else if (!strcmp(stageName, "D_MN08A") && roomId == 10) { + // Defeated Zant + if (dComIfGs_isEventBit(0x5410)) { + layer = 1; + } else { + layer = 0; + } + } + } + } + + return layer; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -598,6 +1195,7 @@ asm int dComIfG_play_c::getLayerNo_common_common(char const* param_0, int param_ #include "asm/d/com/d_com_inf_game/getLayerNo_common_common__14dComIfG_play_cFPCcii.s" } #pragma pop +#endif /* 8002C950-8002C97C 027290 002C+00 1/1 3/3 0/0 .text getLayerNo_common__14dComIfG_play_cFPCcii */ int dComIfG_play_c::getLayerNo_common(char const* i_stageName, int i_roomID, int i_layerOverride) { @@ -612,6 +1210,20 @@ int dComIfG_play_c::getLayerNo_common(char const* i_stageName, int i_roomID, int /* 8002C97C-8002C9D8 0272BC 005C+00 1/1 22/22 68/68 .text getLayerNo__14dComIfG_play_cFi */ +#ifdef NONMATCHING +int dComIfG_play_c::getLayerNo(int param_0) { + int roomNo = dComIfGp_roomControl_getStayNo(); + + if (roomNo <= -1) { + roomNo = dComIfGp_getStartStageRoomNo(); + } + + int layer = dComIfGp_getStartStageLayer(); + char* stage = dComIfGp_getStartStageName(); + + return getLayerNo_common(stage, roomNo, layer); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -620,6 +1232,7 @@ asm int dComIfG_play_c::getLayerNo(int param_0) { #include "asm/d/com/d_com_inf_game/getLayerNo__14dComIfG_play_cFi.s" } #pragma pop +#endif /* 8002C9D8-8002CA1C 027318 0044+00 0/0 1/1 0/0 .text createParticle__14dComIfG_play_cFv */ @@ -716,7 +1329,7 @@ void dComIfG_play_c::setTimerMode(int mode) { mTimerInfo.mTimerMode = mode; } -int dComIfG_play_c::getTimerMode(void) { +int dComIfG_play_c::getTimerMode() { return mTimerInfo.mTimerMode; } @@ -724,7 +1337,7 @@ void dComIfG_play_c::setTimerType(u8 type) { mTimerInfo.mTimerType = type; } -u8 dComIfG_play_c::getTimerType(void) { +u8 dComIfG_play_c::getTimerType() { return mTimerInfo.mTimerType; } @@ -739,15 +1352,19 @@ dTimer_c* dComIfG_play_c::getTimerPtr() { return mTimerInfo.mTimerPtr; } -/* 8002CBE4-8002CC54 027524 0070+00 1/1 1/1 0/0 .text ct__13dComIfG_inf_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dComIfG_inf_c::ct() { - nofralloc -#include "asm/d/com/d_com_inf_game/ct__13dComIfG_inf_cFv.s" +void dComIfG_inf_c::ct() { + field_0x1ddf8 = 0xFF; + play.ct(); + mWorldDark = 0; + field_0x1ddfa = -1; + field_0x1ddfb = 0; + field_0x1de00 = 0; + field_0x1de04 = 0; + field_0x1de08 = 0; + field_0x1ddfc = 0; + field_0x1de09 = 0xFF; + field_0x1de0a = 0xFF; } -#pragma pop /* ############################################################################################## */ /* 80378F38-80378F38 005598 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ @@ -788,52 +1405,44 @@ asm void dComIfG_resetToOpening(scene_class* param_0) { } #pragma pop -/* ############################################################################################## */ -/* 80378F38-80378F38 005598 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037904B = "/res/Object/"; -SECTION_DEAD static char const* const stringBase_80379058 = "%s.arc Read Error !!\n"; -#pragma pop +static int phase_1(char* arc_name) { + int ret; -/* 8002CDB8-8002CE38 0276F8 0080+00 1/0 0/0 0/0 .text phase_1__FPc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void phase_1(char* param_0) { - nofralloc -#include "asm/d/com/d_com_inf_game/phase_1__FPc.s" + if (!dComIfG_setObjectRes(arc_name, 0, NULL)) { + OSReport_Error("%s.arc Read Error !!\n", arc_name); + ret = 5; + } else { + ret = 2; + } + return ret; } -#pragma pop - -/* ############################################################################################## */ -/* 80378F38-80378F38 005598 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037906E = "%s.arc Sync Read Error !!\n"; -#pragma pop /* 8002CE38-8002CEB4 027778 007C+00 1/0 0/0 0/0 .text phase_2__FPc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void phase_2(char* param_0) { - nofralloc -#include "asm/d/com/d_com_inf_game/phase_2__FPc.s" +static int phase_2(char* arc_name) { + int tmp = dComIfG_syncObjectRes(arc_name); + + if (tmp < 0) { + OSReport_Error("%s.arc Sync Read Error !!\n", arc_name); + tmp = 5; + } else { + tmp = tmp > 0 ? 0 : 2; + } + return tmp; } -#pragma pop /* 8002CEB4-8002CEBC 0277F4 0008+00 1/0 0/0 0/0 .text phase_3__FPc */ -static s32 phase_3(char* param_0) { +static int phase_3(char* param_0) { return 4; } +typedef int (*dComIfG_phaseMethod)(char*); + /* ############################################################################################## */ /* 803A71B8-803A71C4 -00001 000C+00 1/1 0/0 0/0 .data l_method$5017 */ -SECTION_DATA static void* l_method_5017[3] = { - (void*)phase_1__FPc, - (void*)phase_2__FPc, - (void*)phase_3__FPc, +SECTION_DATA static dComIfG_phaseMethod l_method_5017[3] = { + phase_1, + phase_2, + phase_3, }; /* 8002CEBC-8002CEFC 0277FC 0040+00 0/0 7/7 550/550 .text @@ -903,15 +1512,9 @@ asm void dComIfG_resDelete(request_of_phase_process_class* param_0, char const* } #pragma pop -/* 8002D06C-8002D0B4 0279AC 0048+00 0/0 14/14 596/596 .text dComIfGp_getReverb__Fi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dComIfGp_getReverb(int param_0) { - nofralloc -#include "asm/d/com/d_com_inf_game/dComIfGp_getReverb__Fi.s" +u8 dComIfGp_getReverb(int param_0) { + return dStage_roomRead_dt_c_GetReverbStage(*dComIfGp_getStageRoom(), param_0); } -#pragma pop /* ############################################################################################## */ /* 80451D00-80451D04 000300 0004+00 2/2 0/0 0/0 .sdata2 @5090 */ @@ -987,118 +1590,89 @@ SECTION_SDATA2 static u8 lit_5226[4] = { 0x00, }; -/* 8002D554-8002D598 027E94 0044+00 1/1 1/1 9/9 .text dComIfGp_setNextStage__FPCcsScSc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dComIfGp_setNextStage(char const* param_0, s16 param_1, s8 param_2, s8 param_3) { - nofralloc -#include "asm/d/com/d_com_inf_game/dComIfGp_setNextStage__FPCcsScSc.s" +void dComIfGp_setNextStage(char const* param_0, s16 param_1, s8 param_2, s8 param_3) { + dComIfGp_setNextStage(param_0, param_1, param_2, param_3, FLOAT_LABEL(lit_5226), 0, 1, 0, 0, 1, + 0); } -#pragma pop -/* 8002D598-8002D628 027ED8 0090+00 0/0 1/1 0/0 .text dComIfGs_isStageTbox__Fii */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dComIfGs_isStageTbox(int param_0, int param_1) { - nofralloc -#include "asm/d/com/d_com_inf_game/dComIfGs_isStageTbox__Fii.s" -} -#pragma pop +BOOL dComIfGs_isStageTbox(int i_stageNo, int i_no) { + stage_stag_info_class* stag_info = dComIfGp_getStageStagInfo(); -/* 8002D628-8002D6B4 027F68 008C+00 0/0 1/1 1/1 .text dComIfGs_onStageSwitch__Fii */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dComIfGs_onStageSwitch(int param_0, int param_1) { - nofralloc -#include "asm/d/com/d_com_inf_game/dComIfGs_onStageSwitch__Fii.s" + if (i_stageNo == dStage_stagInfo_GetSaveTbl(stag_info)) { + return dComIfGs_isTbox(i_no); + } else { + return dComIfGs_isSaveTbox(i_stageNo, i_no); + } } -#pragma pop -/* 8002D6B4-8002D740 027FF4 008C+00 0/0 1/1 2/2 .text dComIfGs_offStageSwitch__Fii */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dComIfGs_offStageSwitch(int param_0, int param_1) { - nofralloc -#include "asm/d/com/d_com_inf_game/dComIfGs_offStageSwitch__Fii.s" -} -#pragma pop +void dComIfGs_onStageSwitch(int i_stageNo, int i_no) { + stage_stag_info_class* stag_info = dComIfGp_getStageStagInfo(); -/* 8002D740-8002D7D0 028080 0090+00 0/0 6/6 5/5 .text dComIfGs_isStageSwitch__Fii */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dComIfGs_isStageSwitch(int param_0, int param_1) { - nofralloc -#include "asm/d/com/d_com_inf_game/dComIfGs_isStageSwitch__Fii.s" -} -#pragma pop + if (i_stageNo == dStage_stagInfo_GetSaveTbl(stag_info)) { + dComIfGs_onSwitch(i_no, -1); + } -/* 8002D7D0-8002D878 028110 00A8+00 0/0 0/0 2/2 .text dComIfGs_onStageBossEnemy__Fi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dComIfGs_onStageBossEnemy(int param_0) { - nofralloc -#include "asm/d/com/d_com_inf_game/dComIfGs_onStageBossEnemy__Fi.s" + dComIfGs_onSaveSwitch(i_stageNo, i_no); } -#pragma pop -/* 8002D878-8002D8FC 0281B8 0084+00 0/0 1/1 0/0 .text dComIfGs_isDungeonItemWarp__Fi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dComIfGs_isDungeonItemWarp(int param_0) { - nofralloc -#include "asm/d/com/d_com_inf_game/dComIfGs_isDungeonItemWarp__Fi.s" -} -#pragma pop +void dComIfGs_offStageSwitch(int i_stageNo, int i_no) { + stage_stag_info_class* stag_info = dComIfGp_getStageStagInfo(); -/* 8002D8FC-8002D910 02823C 0014+00 0/0 1/1 6/6 .text dComIfGs_BossLife_public_Set__FSc - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dComIfGs_BossLife_public_Set(s8 param_0) { - nofralloc -#include "asm/d/com/d_com_inf_game/dComIfGs_BossLife_public_Set__FSc.s" -} -#pragma pop + if (i_stageNo == dStage_stagInfo_GetSaveTbl(stag_info)) { + dComIfGs_offSwitch(i_no, -1); + } -/* 8002D910-8002D924 028250 0014+00 0/0 0/0 4/4 .text dComIfGs_BossLife_public_Get__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dComIfGs_BossLife_public_Get() { - nofralloc -#include "asm/d/com/d_com_inf_game/dComIfGs_BossLife_public_Get__Fv.s" + dComIfGs_offSaveSwitch(i_stageNo, i_no); } -#pragma pop -/* 8002D924-8002D938 028264 0014+00 0/0 0/0 2/2 .text dComIfGs_sense_type_change_Set__FSc - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dComIfGs_sense_type_change_Set(s8 param_0) { - nofralloc -#include "asm/d/com/d_com_inf_game/dComIfGs_sense_type_change_Set__FSc.s" -} -#pragma pop +BOOL dComIfGs_isStageSwitch(int i_stageNo, int i_no) { + stage_stag_info_class* stag_info = dComIfGp_getStageStagInfo(); -/* 8002D938-8002D94C 028278 0014+00 0/0 1/1 0/0 .text dComIfGs_sense_type_change_Get__Fv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dComIfGs_sense_type_change_Get() { - nofralloc -#include "asm/d/com/d_com_inf_game/dComIfGs_sense_type_change_Get__Fv.s" + if (i_stageNo == dStage_stagInfo_GetSaveTbl(stag_info)) { + return dComIfGs_isSwitch(i_no, -1); + } else { + return dComIfGs_isSaveSwitch(i_stageNo, i_no); + } +} + +void dComIfGs_onStageBossEnemy(int i_stageNo) { + stage_stag_info_class* stag_info = dComIfGp_getStageStagInfo(); + + if (i_stageNo == dStage_stagInfo_GetSaveTbl(stag_info)) { + dComIfGs_onStageBossEnemy(); + } + + g_dComIfG_gameInfo.info.getSavedata().getSave(i_stageNo).getBit().onStageBossEnemy(); +} + +s32 dComIfGs_isDungeonItemWarp(int i_stageNo) { + stage_stag_info_class* stag_info = dComIfGp_getStageStagInfo(); + + if (i_stageNo == dStage_stagInfo_GetSaveTbl(stag_info)) { + return dComIfGs_isDungeonItemWarp(); + } else { + return g_dComIfG_gameInfo.info.getSavedata() + .getSave(i_stageNo) + .getBit() + .isDungeonItemWarp(); + } +} + +void dComIfGs_BossLife_public_Set(s8 param_0) { + g_dComIfG_gameInfo.field_0x1ddfa = param_0; +} + +s8 dComIfGs_BossLife_public_Get() { + return g_dComIfG_gameInfo.field_0x1ddfa; +} + +void dComIfGs_sense_type_change_Set(s8 param_0) { + g_dComIfG_gameInfo.field_0x1ddfa = param_0; +} + +s8 dComIfGs_sense_type_change_Get() { + return g_dComIfG_gameInfo.field_0x1ddfa; } -#pragma pop /* 8002D94C-8002D9B0 02828C 0064+00 0/0 1/1 17/17 .text dComIfGs_onZoneSwitch__Fii */ #pragma push @@ -1110,15 +1684,9 @@ asm void dComIfGs_onZoneSwitch(int param_0, int param_1) { } #pragma pop -/* 8002D9B0-8002D9CC 0282F0 001C+00 8/8 11/11 0/0 .text getZoneNo__20dStage_roomControl_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int dStage_roomControl_c::getZoneNo(int param_0) { - nofralloc -#include "asm/d/com/d_com_inf_game/getZoneNo__20dStage_roomControl_cFi.s" +int dStage_roomControl_c::getZoneNo(int i_roomNo) { + return mStatus[i_roomNo].getZoneNo(); } -#pragma pop /* 8002D9CC-8002DA30 02830C 0064+00 0/0 1/1 1/1 .text dComIfGs_offZoneSwitch__Fii */ #pragma push @@ -1190,241 +1758,311 @@ asm void dComIfGs_isOneZoneItem(int param_0, int param_1) { } #pragma pop -/* 8002DCA8-8002DCC4 0285E8 001C+00 0/0 5/5 3/3 .text dComIfGs_getMaxLifeGauge__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dComIfGs_getMaxLifeGauge() { - nofralloc -#include "asm/d/com/d_com_inf_game/dComIfGs_getMaxLifeGauge__Fv.s" +u16 dComIfGs_getMaxLifeGauge() { + return (dComIfGs_getMaxLife() / 5) * 4; } -#pragma pop -/* 8002DCC4-8002DD08 028604 0044+00 1/1 7/7 0/0 .text dComIfGs_setSelectItemIndex__FiUc - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dComIfGs_setSelectItemIndex(int param_0, u8 param_1) { - nofralloc -#include "asm/d/com/d_com_inf_game/dComIfGs_setSelectItemIndex__FiUc.s" +void dComIfGs_setSelectItemIndex(int i_no, u8 item_index) { + g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().setSelectItemIndex(i_no, item_index); + dComIfGp_setSelectItem(i_no); } -#pragma pop -/* 8002DD08-8002DD3C 028648 0034+00 0/0 6/6 0/0 .text dComIfGs_setMixItemIndex__FiUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dComIfGs_setMixItemIndex(int param_0, u8 param_1) { - nofralloc -#include "asm/d/com/d_com_inf_game/dComIfGs_setMixItemIndex__FiUc.s" +void dComIfGs_setMixItemIndex(int i_no, u8 item_index) { + g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().setMixItemIndex(i_no, item_index); } -#pragma pop /* 8002DD3C-8002DDC8 02867C 008C+00 3/3 1/1 0/0 .text dComIfGs_getSelectMixItemNoArrowIndex__Fi */ +#ifdef NONMATCHING +u8 dComIfGs_getSelectMixItemNoArrowIndex(int p1) { + u8 item_index = dComIfGs_getSelectItemIndex(p1); + u8 mix_index = dComIfGs_getMixItemIndex(p1); + + if (item_index >= 0xf && item_index < 0x12) { + return item_index; + } + + else if (mix_index != 255 && (mix_index >= 0xf && mix_index < 0x12)) { + return 255; + } + + // return p1; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dComIfGs_getSelectMixItemNoArrowIndex(int param_0) { +asm u8 dComIfGs_getSelectMixItemNoArrowIndex(int param_0) { nofralloc #include "asm/d/com/d_com_inf_game/dComIfGs_getSelectMixItemNoArrowIndex__Fi.s" } #pragma pop +#endif -/* 8002DDC8-8002DDF4 028708 002C+00 2/2 11/11 0/0 .text dComIfGs_getMixItemIndex__Fi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dComIfGs_getMixItemIndex(int param_0) { - nofralloc -#include "asm/d/com/d_com_inf_game/dComIfGs_getMixItemIndex__Fi.s" +u8 dComIfGs_getMixItemIndex(int i_no) { + return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().getMixItemIndex(i_no); } -#pragma pop /* 8002DDF4-8002DF1C 028734 0128+00 1/1 13/13 0/0 .text dComIfGp_setSelectItem__Fi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dComIfGp_setSelectItem(int param_0) { - nofralloc -#include "asm/d/com/d_com_inf_game/dComIfGp_setSelectItem__Fi.s" +void dComIfGp_setSelectItem(int idx) { + if (idx == 2) { + if (dComIfGs_getSelectItemIndex(idx) != 0xFF) { + u8 selectItemIdx = dComIfGs_getSelectItemIndex(idx); + g_dComIfG_gameInfo.play.setSelectItem(idx, selectItemIdx); + + if (selectItemIdx == 0xFF) { + dComIfGs_setSelectItemIndex(idx, -1); + } + } else { + g_dComIfG_gameInfo.play.setSelectItem(idx, -1); + } + } else { + if (dComIfGs_getSelectItemIndex(idx) != 0xFF) { + u8 selectItemIdx = dComIfGs_getSelectItemIndex(idx); + u8 item = dComIfGs_getItem(selectItemIdx, 0); + g_dComIfG_gameInfo.play.setSelectItem(idx, item); + + if (item == 0xFF) { + dComIfGs_setSelectItemIndex(idx, -1); + } + } else { + g_dComIfG_gameInfo.play.setSelectItem(idx, -1); + } + } } -#pragma pop /* 8002DF1C-8002E048 02885C 012C+00 4/4 19/19 0/0 .text dComIfGp_getSelectItem__Fi */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dComIfGp_getSelectItem(int param_0) { +asm u8 dComIfGp_getSelectItem(int param_0) { nofralloc #include "asm/d/com/d_com_inf_game/dComIfGp_getSelectItem__Fi.s" } #pragma pop -/* 8002E048-8002E078 028988 0030+00 0/0 2/2 0/0 .text dComIfGp_mapShow__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dComIfGp_mapShow() { - nofralloc -#include "asm/d/com/d_com_inf_game/dComIfGp_mapShow__Fv.s" +void dComIfGp_mapShow() { + dComIfGs_offEventBit(0x1D01); } -#pragma pop -/* 8002E078-8002E0A8 0289B8 0030+00 0/0 2/2 0/0 .text dComIfGp_mapHide__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dComIfGp_mapHide() { - nofralloc -#include "asm/d/com/d_com_inf_game/dComIfGp_mapHide__Fv.s" +void dComIfGp_mapHide() { + dComIfGs_onEventBit(0x1D01); } -#pragma pop -/* 8002E0A8-8002E0E0 0289E8 0038+00 0/0 1/1 0/0 .text dComIfGp_checkMapShow__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dComIfGp_checkMapShow() { - nofralloc -#include "asm/d/com/d_com_inf_game/dComIfGp_checkMapShow__Fv.s" +bool dComIfGp_checkMapShow() { + return !dComIfGs_isEventBit(0x1D01); } -#pragma pop /* 8002E0E0-8002E188 028A20 00A8+00 0/0 9/9 0/0 .text dComIfGp_setHeapLockFlag__FUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dComIfGp_setHeapLockFlag(u8 param_0) { - nofralloc -#include "asm/d/com/d_com_inf_game/dComIfGp_setHeapLockFlag__FUc.s" -} -#pragma pop +s32 dComIfGp_setHeapLockFlag(u8 param_0) { + if (param_0 == 7 || param_0 == 8) { + if (!dComIfGp_isHeapLockFlag()) { + dComIfGp_createSubExpHeap2D(); + } + g_dComIfG_gameInfo.play.setHeapLockFlag(5); -/* 8002E188-8002E22C 028AC8 00A4+00 1/1 7/7 0/0 .text dComIfGp_offHeapLockFlag__Fi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dComIfGp_offHeapLockFlag(int param_0) { - nofralloc -#include "asm/d/com/d_com_inf_game/dComIfGp_offHeapLockFlag__Fi.s" + int check = dComIfGp_checkEmptySubHeap2D(); + if (check >= 0) { + dComIfGp_setSubHeapLockFlag(check, param_0); + } + } else { + if (param_0 == 0) { + dComIfGp_offHeapLockFlag(0); + } else { + g_dComIfG_gameInfo.play.setHeapLockFlag(param_0); + } + } + return 1; } -#pragma pop -/* ############################################################################################## */ -/* 80451D08-80451D10 000308 0004+04 1/1 0/0 0/0 .sdata2 @6335 */ -SECTION_SDATA2 static f32 lit_6335[1 + 1 /* padding */] = { - 2.0f / 5.0f, - /* padding */ - 0.0f, +s32 dComIfGp_offHeapLockFlag(int param_0) { + if (dComIfGp_isHeapLockFlag() == 5) { + if (param_0 == 7 || param_0 == 8) { + int check = dComIfGp_searchUseSubHeap2D(param_0); + if (check >= 0) { + dComIfGp_setSubHeapLockFlag(check, 0); + } + + if (!dComIfGp_getSubHeapLockFlag(0) && !dComIfGp_getSubHeapLockFlag(1)) { + dComIfGp_destroySubExpHeap2D(); + g_dComIfG_gameInfo.play.offHeapLockFlag(); + } + } + } else { + g_dComIfG_gameInfo.play.offHeapLockFlag(); + } + return 1; +} + +void dComIfGp_createSubExpHeap2D() { + u32 size = dComIfGp_getExpHeap2D()->getTotalFreeSize() * (2.0f / 5.0f); + + for (int i = 0; i < 2; i++) { + if (dComIfGp_getSubExpHeap2D(i) == NULL) { + JKRExpHeap* i_heap = JKRExpHeap::create(size, dComIfGp_getExpHeap2D(), false); + dComIfGp_setSubExpHeap2D(i, i_heap); + } + } +} + +void dComIfGp_destroySubExpHeap2D() { + for (int i = 0; i < 2; i++) { + JKRExpHeap* heap = dComIfGp_getSubExpHeap2D(i); + if (heap != NULL) { + mDoExt_destroyExpHeap(heap); + dComIfGp_setSubExpHeap2D(i, NULL); + } + } +} + +int dComIfGp_checkEmptySubHeap2D() { + if (dComIfGp_isHeapLockFlag() == 5) { + for (int i = 0; i < 2; i++) { + if (dComIfGp_getSubHeapLockFlag(i) == 0) { + return i; + } + } + } + return -1; +} + +int dComIfGp_searchUseSubHeap2D(int param_0) { + if (dComIfGp_isHeapLockFlag() == 5) { + for (int i = 0; i < 2; i++) { + if (param_0 == dComIfGp_getSubHeapLockFlag(i)) { + return i; + } + } + } + return -1; +} + +JKRExpHeap* dComIfGp_getSubHeap2D(int param_0) { + if (dComIfGp_isHeapLockFlag() == 5) { + for (int i = 0; i < 2; i++) { + if (param_0 == dComIfGp_getSubHeapLockFlag(i)) { + return dComIfGp_getSubExpHeap2D(i); + } + } + } + return NULL; +} + +static u8 l_itemno[24] = { + M_BEETLE, F_BEETLE, M_BUTTERFLY, F_BUTTERFLY, M_STAG_BEETLE, F_STAG_BEETLE, + M_GRASSHOPPER, F_GRASSHOPPER, M_NANAFUSHI, F_NANAFUSHI, M_DANGOMUSHI, F_DANGOMUSHI, + M_MANTIS, F_MANTIS, M_LADYBUG, F_LADYBUG, M_SNAIL, F_SNAIL, + M_DRAGONFLY, F_DRAGONFLY, M_ANT, F_ANT, M_MAYFLY, F_MAYFLY, }; -/* 80451D10-80451D18 000310 0008+00 1/1 0/0 0/0 .sdata2 @6337 */ -SECTION_SDATA2 static f64 lit_6337 = 4503601774854144.0 /* cast s32 to float */; +int dComIfGs_checkGetInsectNum() { + int insectCount = 0; + u8* insectList = &l_itemno[0]; + u8 insectId; -/* 8002E22C-8002E2DC 028B6C 00B0+00 1/1 0/0 0/0 .text dComIfGp_createSubExpHeap2D__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void dComIfGp_createSubExpHeap2D() { - nofralloc -#include "asm/d/com/d_com_inf_game/dComIfGp_createSubExpHeap2D__Fv.s" + for (int i = 0; i < ARRAY_SIZE(l_itemno); i++) { + insectId = *insectList; + insectList++; + if (dComIfGs_isItemFirstBit(insectId) && + dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[0x191 + i])) { + insectCount++; + } + } + return insectCount; } -#pragma pop -/* 8002E2DC-8002E348 028C1C 006C+00 1/1 0/0 0/0 .text dComIfGp_destroySubExpHeap2D__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void dComIfGp_destroySubExpHeap2D() { - nofralloc -#include "asm/d/com/d_com_inf_game/dComIfGp_destroySubExpHeap2D__Fv.s" +u8 dComIfGs_checkGetItem(u8 i_no) { + u8 count = 0; + + for (int i = 0; i < 60; i++) { + if (i_no == dComIfGs_getItem(i, true)) { + count++; + } + } + if (dComIfGs_getSelectEquipClothes() == i_no) { + count++; + } + if (dComIfGs_getSelectEquipSword() == i_no) { + count++; + } + if (dComIfGs_getSelectEquipShield() == i_no) { + count++; + } + + return count; } -#pragma pop -/* 8002E348-8002E388 028C88 0040+00 1/1 0/0 0/0 .text dComIfGp_checkEmptySubHeap2D__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void dComIfGp_checkEmptySubHeap2D() { - nofralloc -#include "asm/d/com/d_com_inf_game/dComIfGp_checkEmptySubHeap2D__Fv.s" -} -#pragma pop - -/* 8002E388-8002E3D0 028CC8 0048+00 1/1 0/0 0/0 .text dComIfGp_searchUseSubHeap2D__Fi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void dComIfGp_searchUseSubHeap2D(int param_0) { - nofralloc -#include "asm/d/com/d_com_inf_game/dComIfGp_searchUseSubHeap2D__Fi.s" -} -#pragma pop - -/* 8002E3D0-8002E428 028D10 0058+00 0/0 9/9 0/0 .text dComIfGp_getSubHeap2D__Fi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dComIfGp_getSubHeap2D(int param_0) { - nofralloc -#include "asm/d/com/d_com_inf_game/dComIfGp_getSubHeap2D__Fi.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 803A71D0-803A71E8 0042F0 0018+00 1/1 0/0 0/0 .data l_itemno$6402 */ -SECTION_DATA static u8 l_itemno[24] = { - 0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xCB, - 0xCC, 0xCD, 0xCE, 0xCF, 0xD0, 0xD1, 0xD2, 0xD3, 0xD4, 0xD5, 0xD6, 0xD7, -}; - -/* 8002E428-8002E4CC 028D68 00A4+00 0/0 4/4 0/0 .text dComIfGs_checkGetInsectNum__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dComIfGs_checkGetInsectNum() { - nofralloc -#include "asm/d/com/d_com_inf_game/dComIfGs_checkGetInsectNum__Fv.s" -} -#pragma pop - -/* 8002E4CC-8002E5B8 028E0C 00EC+00 1/1 0/0 0/0 .text dComIfGs_checkGetItem__FUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm u8 dComIfGs_checkGetItem(u8 param_0) { - nofralloc -#include "asm/d/com/d_com_inf_game/dComIfGs_checkGetItem__FUc.s" -} -#pragma pop - -/* 8002E5B8-8002E5C0 028EF8 0008+00 2/2 3/3 0/0 .text dComIfGs_getBottleMax__Fv */ -s32 dComIfGs_getBottleMax() { +u8 dComIfGs_getBottleMax() { return 10; } /* 8002E5C0-8002E688 028F00 00C8+00 0/0 11/11 0/0 .text dComIfGp_getSelectItemNum__Fi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dComIfGp_getSelectItemNum(int param_0) { - nofralloc -#include "asm/d/com/d_com_inf_game/dComIfGp_getSelectItemNum__Fi.s" +int dComIfGp_getSelectItemNum(int param_0) { + u8 selectItem = dComIfGp_getSelectItem(param_0); + int itemNum = 0; + + if (selectItem == NORMAL_BOMB || selectItem == WATER_BOMB || selectItem == POKE_BOMB || + selectItem == BOMB_ARROW) { + selectItem = dComIfGs_getSelectMixItemNoArrowIndex(param_0) - SLOT_15; + itemNum = dComIfGs_getBombNum(selectItem); + } else if (selectItem == PACHINKO) { + itemNum = dComIfGs_getPachinkoNum(); + } else if (selectItem == BEE_CHILD) { + selectItem = dComIfGs_getSelectItemIndex(param_0); + itemNum = dComIfGs_getBottleNum(selectItem - SLOT_11); + } + + return itemNum; } -#pragma pop /* 8002E688-8002E714 028FC8 008C+00 0/0 5/5 0/0 .text dComIfGp_getSelectItemMaxNum__Fi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dComIfGp_getSelectItemMaxNum(int param_0) { - nofralloc -#include "asm/d/com/d_com_inf_game/dComIfGp_getSelectItemMaxNum__Fi.s" +int dComIfGp_getSelectItemMaxNum(int param_0) { + u8 selectItem = dComIfGp_getSelectItem(param_0); + int itemNum = 0; + + if (selectItem == BOMB_BAG_LV1) { + itemNum = 1; + } else if (selectItem == NORMAL_BOMB || selectItem == WATER_BOMB || selectItem == POKE_BOMB || + selectItem == BOMB_ARROW) { + itemNum = dComIfGs_getBombMax(selectItem); + } else if (selectItem == PACHINKO) { + itemNum = dComIfGs_getPachinkoMax(); + } else if (selectItem == BEE_CHILD) { + itemNum = dComIfGs_getBottleMax(); + } + + return itemNum; } -#pragma pop /* 8002E714-8002E83C 029054 0128+00 0/0 2/2 0/0 .text dComIfGp_setSelectItemNum__Fis */ +// two swapped instructions +#ifdef NONMATCHING +void dComIfGp_setSelectItemNum(int param_0, s16 param_1) { + u8 selectItem = dComIfGp_getSelectItem(param_0); + u8 selectMixItem; + int itemNum; + + if (selectItem == NORMAL_BOMB || selectItem == WATER_BOMB || selectItem == POKE_BOMB || + selectItem == BOMB_ARROW) { + selectMixItem = dComIfGs_getSelectMixItemNoArrowIndex(param_0) - SLOT_15; + itemNum = dComIfGs_getBombMax(selectItem); + + if (itemNum > param_1) { + param_1 = dComIfGs_getBombMax(selectItem); + } + dComIfGs_setBombNum(selectMixItem, param_1); + } else if (selectItem == PACHINKO) { + dComIfGs_setPachinkoNum(param_1); + } else if (selectItem == BEE_CHILD) { + selectItem = dComIfGs_getSelectItemIndex(param_0) - SLOT_11; + itemNum = dComIfGs_getBottleMax(); + + if (itemNum > param_1) { + param_1 = dComIfGs_getBottleMax(); + } + dComIfGs_setBottleNum(selectItem, param_1); + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -1433,16 +2071,25 @@ asm void dComIfGp_setSelectItemNum(int param_0, s16 param_1) { #include "asm/d/com/d_com_inf_game/dComIfGp_setSelectItemNum__Fis.s" } #pragma pop +#endif /* 8002E83C-8002E910 02917C 00D4+00 0/0 5/5 0/0 .text dComIfGp_addSelectItemNum__Fis */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dComIfGp_addSelectItemNum(int param_0, s16 param_1) { - nofralloc -#include "asm/d/com/d_com_inf_game/dComIfGp_addSelectItemNum__Fis.s" +void dComIfGp_addSelectItemNum(int param_0, s16 param_1) { + u8 selectItem = dComIfGp_getSelectItem(param_0); + u8 selectMixItem; + int itemNum; + + if (selectItem == NORMAL_BOMB || selectItem == WATER_BOMB || selectItem == POKE_BOMB || + selectItem == BOMB_ARROW) { + selectMixItem = dComIfGs_getSelectMixItemNoArrowIndex(param_0) - SLOT_15; + dComIfGp_setItemBombNumCount(selectMixItem, param_1); + } else if (selectItem == PACHINKO) { + dComIfGp_setItemPachinkoNumCount(param_1); + } else if (selectItem == BEE_CHILD) { + selectItem = dComIfGs_getSelectItemIndex(param_0); + dComIfGs_addBottleNum(selectItem - SLOT_11, param_1); + } } -#pragma pop /* 8002E910-8002E974 029250 0064+00 0/0 5/5 137/137 .text * dComIfGd_setShadow__FUlScP8J3DModelP4cXyzffffR13cBgS_PolyInfoP12dKy_tevstr_csfP9_GXTexObj */ @@ -1459,6 +2106,17 @@ asm void dComIfGd_setShadow(u32 param_0, s8 param_1, J3DModel* param_2, cXyz* pa #pragma pop /* 8002E974-8002E9D4 0292B4 0060+00 0/0 1/1 0/0 .text dComIfGs_gameStart__Fv */ +// instruction in wrong place +#ifdef NONMATCHING +void dComIfGs_gameStart() { + dComIfGp_offEnableNextStage(); + + s8 roomNo = g_dComIfG_gameInfo.info.getPlayer().getPlayerReturnPlace().getRoomNo(); + u8 status = g_dComIfG_gameInfo.info.getPlayer().getPlayerReturnPlace().getPlayerStatus(); + char* name = g_dComIfG_gameInfo.info.getPlayer().getPlayerReturnPlace().getName(); + dComIfGp_setNextStage(name, status, roomNo, -1, FLOAT_LABEL(lit_5226), 0, 1, 0, 0, 0, 0); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -1467,16 +2125,11 @@ asm void dComIfGs_gameStart() { #include "asm/d/com/d_com_inf_game/dComIfGs_gameStart__Fv.s" } #pragma pop +#endif -/* 8002E9D4-8002E9F0 029314 001C+00 0/0 0/0 1/1 .text dComIfG_getTrigA__FUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dComIfG_getTrigA(u32 param_0) { - nofralloc -#include "asm/d/com/d_com_inf_game/dComIfG_getTrigA__FUl.s" +u32 dComIfG_getTrigA(u32 pad) { + return mDoCPd_c::getTrigA(pad); } -#pragma pop /* ############################################################################################## */ /* 80378F38-80378F38 005598 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ @@ -1511,16 +2164,14 @@ static asm void dComIfG_getNowCalcRegion() { } #pragma pop -/* 8002EDE0-8002EE60 029720 0080+00 0/0 4/4 0/0 .text dComIfGp_isLightDropMapVisible__Fv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dComIfGp_isLightDropMapVisible() { - nofralloc -#include "asm/d/com/d_com_inf_game/dComIfGp_isLightDropMapVisible__Fv.s" +BOOL dComIfGp_isLightDropMapVisible() { + for (int i = 0; i < 3; i++) { + if (dComIfGs_isLightDropGetFlag(i) != FALSE && dComIfGs_getLightDropNum(i) < 16) { + return TRUE; + } + } + return FALSE; } -#pragma pop /* 8002EE60-8002EEB0 0297A0 0050+00 1/1 11/11 0/0 .text dComIfGp_getNowLevel__Fv */ #pragma push @@ -1532,108 +2183,100 @@ asm void dComIfGp_getNowLevel() { } #pragma pop -/* 8002EEB0-8002EEC0 0297F0 0010+00 0/0 4/4 0/0 .text dComIfGs_setSelectEquipClothes__FUc - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dComIfGs_setSelectEquipClothes(u8 param_0) { - nofralloc -#include "asm/d/com/d_com_inf_game/dComIfGs_setSelectEquipClothes__FUc.s" +void dComIfGs_setSelectEquipClothes(u8 item) { + g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().setSelectEquip(COLLECT_CLOTHING, item); } -#pragma pop /* 8002EEC0-8002EF94 029800 00D4+00 0/0 4/4 1/1 .text dComIfGs_setSelectEquipSword__FUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dComIfGs_setSelectEquipSword(u8 param_0) { - nofralloc -#include "asm/d/com/d_com_inf_game/dComIfGs_setSelectEquipSword__FUc.s" +void dComIfGs_setSelectEquipSword(u8 i_itemId) { + switch (i_itemId) { + case SWORD: + dComIfGs_setCollectSword(COLLECT_ORDON_SWORD); + break; + case MASTER_SWORD: + dComIfGs_setCollectSword(COLLECT_MASTER_SWORD); + break; + case WOOD_STICK: + dComIfGs_setCollectSword(COLLECT_WOODEN_SWORD); + break; + case LIGHT_SWORD: + dComIfGs_setCollectSword(COLLECT_LIGHT_SWORD); + break; + } + + g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().setSelectEquip(1, i_itemId); } -#pragma pop /* 8002EF94-8002F040 0298D4 00AC+00 0/0 2/2 0/0 .text dComIfGs_setSelectEquipShield__FUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dComIfGs_setSelectEquipShield(u8 param_0) { - nofralloc -#include "asm/d/com/d_com_inf_game/dComIfGs_setSelectEquipShield__FUc.s" -} -#pragma pop +void dComIfGs_setSelectEquipShield(u8 i_itemId) { + switch (i_itemId) { + case WOOD_SHIELD: + dComIfGs_setCollectShield(COLLECT_WOODEN_SHIELD); + break; + case SHIELD: + dComIfGs_setCollectShield(COLLECT_ORDON_SHIELD); + break; + case HYLIA_SHIELD: + dComIfGs_setCollectShield(COLLECT_HYLIAN_SHIELD); + break; + } -/* 8002F040-8002F0E0 029980 00A0+00 1/1 1/1 0/0 .text dComIfGs_setKeyNum__FiUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dComIfGs_setKeyNum(int param_0, u8 param_1) { - nofralloc -#include "asm/d/com/d_com_inf_game/dComIfGs_setKeyNum__FiUc.s" + g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().setSelectEquip(2, i_itemId); +} + +void dComIfGs_setKeyNum(int i_stageNo, u8 keyNum) { + if (dComIfGp_getStageStagInfo()) { + stage_stag_info_class* stag_info = dComIfGp_getStageStagInfo(); + + if (i_stageNo == dStage_stagInfo_GetSaveTbl(stag_info)) { + dComIfGs_setKeyNum(keyNum); + } + } + + g_dComIfG_gameInfo.info.getSavedata().getSave(i_stageNo).getBit().setKeyNum(keyNum); } -#pragma pop /* 8002F0E0-8002F128 029A20 0048+00 1/1 0/0 0/0 .text dComIfGs_setWarpItemData__FiPCc4cXyzsScUcUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void dComIfGs_setWarpItemData(int param_0, char const* param_1, cXyz param_2, - s16 param_3, s8 param_4, u8 param_5, u8 param_6) { - nofralloc -#include "asm/d/com/d_com_inf_game/dComIfGs_setWarpItemData__FiPCc4cXyzsScUcUc.s" +static void dComIfGs_setWarpItemData(int param_0, char const* param_1, cXyz param_2, s16 param_3, + s8 param_4, u8 param_5, u8 param_6) { + g_dComIfG_gameInfo.play.setWarpItemData(param_1, param_2, param_3, param_4, param_5, param_6); } -#pragma pop -/* 8002F128-8002F19C 029A68 0074+00 1/1 0/0 0/0 .text - * setWarpItemData__14dComIfG_play_cFPCc4cXyzsScUcUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dComIfG_play_c::setWarpItemData(char const* param_0, cXyz param_1, s16 param_2, s8 param_3, - u8 param_4, u8 param_5) { - nofralloc -#include "asm/d/com/d_com_inf_game/setWarpItemData__14dComIfG_play_cFPCc4cXyzsScUcUc.s" +void dComIfG_play_c::setWarpItemData(char const* param_0, cXyz param_1, s16 param_2, s8 param_3, + u8 param_4, u8 param_5) { + strcpy(field_0x4F94, param_0); + field_0x4f9c.set(param_1); + field_0x4fa8 = param_2; + field_0x4faa = param_3; + field_0x4fac = param_5; + field_0x4fab = param_4; } -#pragma pop -/* 8002F19C-8002F24C 029ADC 00B0+00 0/0 1/1 0/0 .text dComIfGs_setWarpItemData__FPCc4cXyzsScUcUc - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dComIfGs_setWarpItemData(char const* param_0, cXyz param_1, s16 param_2, s8 param_3, - u8 param_4, u8 param_5) { - nofralloc -#include "asm/d/com/d_com_inf_game/dComIfGs_setWarpItemData__FPCc4cXyzsScUcUc.s" +void dComIfGs_setWarpItemData(char const* param_0, cXyz param_1, s16 param_2, s8 param_3, + u8 param_4, u8 param_5) { + dComIfGs_setWarpItemData(0, param_0, param_1, param_2, param_3, param_4, param_5); + dComIfGs_setLastWarpMarkItemData(param_0, param_1, param_2, param_3, param_4, param_5); } -#pragma pop -/* 8002F24C-8002F2AC 029B8C 0060+00 1/1 0/0 0/0 .text - * dComIfGs_setLastWarpMarkItemData__FPCc4cXyzsScUcUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void dComIfGs_setLastWarpMarkItemData(char const* param_0, cXyz param_1, s16 param_2, - s8 param_3, u8 param_4, u8 param_5) { - nofralloc -#include "asm/d/com/d_com_inf_game/dComIfGs_setLastWarpMarkItemData__FPCc4cXyzsScUcUc.s" +void dComIfGs_setLastWarpMarkItemData(const char* stage, cXyz pos, s16 angle, s8 room, u8 unk1, + u8 unk2) { + g_dComIfG_gameInfo.info.getPlayer().getPlayerLastMarkInfo().setWarpItemData(stage, pos, angle, + room, unk1, unk2); } -#pragma pop -/* 8002F2AC-8002F2BC 029BEC 0010+00 0/0 2/2 0/0 .text dComIfGs_getWarpStageName__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dComIfGs_getWarpStageName() { - nofralloc -#include "asm/d/com/d_com_inf_game/dComIfGs_getWarpStageName__Fv.s" +const char* dComIfGs_getWarpStageName() { + return dComIfGs_getLastWarpMarkStageName(); } -#pragma pop /* 8002F2BC-8002F2CC 029BFC 0010+00 0/0 1/1 0/0 .text dComIfGs_getWarpPlayerPos__Fv */ +#ifdef NONMATCHING +cXyz dComIfGs_getWarpPlayerPos() { + return dComIfGs_getLastWarpMarkPlayerPos(); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -1642,38 +2285,20 @@ asm void dComIfGs_getWarpPlayerPos() { #include "asm/d/com/d_com_inf_game/dComIfGs_getWarpPlayerPos__Fv.s" } #pragma pop +#endif -/* 8002F2CC-8002F2DC 029C0C 0010+00 0/0 1/1 0/0 .text dComIfGs_getWarpPlayerAngleY__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dComIfGs_getWarpPlayerAngleY() { - nofralloc -#include "asm/d/com/d_com_inf_game/dComIfGs_getWarpPlayerAngleY__Fv.s" +s16 dComIfGs_getWarpPlayerAngleY() { + return dComIfGs_getLastWarpMarkPlayerAngleY(); } -#pragma pop -/* 8002F2DC-8002F2F0 029C1C 0014+00 0/0 1/1 0/0 .text dComIfGs_getWarpRoomNo__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dComIfGs_getWarpRoomNo() { - nofralloc -#include "asm/d/com/d_com_inf_game/dComIfGs_getWarpRoomNo__Fv.s" +int dComIfGs_getWarpRoomNo() { + return dComIfGs_getLastWarpMarkRoomNo(); } -#pragma pop -/* 8002F2F0-8002F310 029C30 0020+00 0/0 1/1 0/0 .text dComIfGs_getWarpMarkFlag__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dComIfGs_getWarpMarkFlag() { - nofralloc -#include "asm/d/com/d_com_inf_game/dComIfGs_getWarpMarkFlag__Fv.s" +BOOL dComIfGs_getWarpMarkFlag() { + return dComIfGs_getLastWarpAcceptStage() >= 0; } -#pragma pop -/* 8002F310-8002F314 029C50 0004+00 0/0 1/1 0/0 .text dComIfGs_setWarpMarkFlag__FUc */ void dComIfGs_setWarpMarkFlag(u8 param_0) { /* empty function */ } @@ -1742,112 +2367,131 @@ asm void dComIfG_getOldStageRes(char const* param_0) { } #pragma pop -/* ############################################################################################## */ -/* 80378F38-80378F38 005598 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_803790A6 = "R%02d_00"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_803790AF = ""; -#pragma pop +static char buf[32]; -/* 80423FD0-80423FF0 050CF0 0020+00 1/1 0/0 0/0 .bss buf$7371 */ -static u8 buf[32]; - -/* 8002F4BC-8002F500 029DFC 0044+00 0/0 5/5 1/1 .text dComIfG_getRoomArcName__Fi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dComIfG_getRoomArcName(int param_0) { - nofralloc -#include "asm/d/com/d_com_inf_game/dComIfG_getRoomArcName__Fi.s" +char* dComIfG_getRoomArcName(int param_0) { + sprintf((char*)buf, (char*)"R%02d_00", param_0); + return buf; } -#pragma pop /* 8002F500-8002F504 029E40 0004+00 0/0 1/1 0/0 .text dComIfGp_ret_wp_set__FSc */ void dComIfGp_ret_wp_set(s8 param_0) { /* empty function */ } -/* 8002F504-8002F518 029E44 0014+00 0/0 1/1 0/0 .text dComIfGp_world_dark_set__FUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dComIfGp_world_dark_set(u8 param_0) { - nofralloc -#include "asm/d/com/d_com_inf_game/dComIfGp_world_dark_set__FUc.s" +void dComIfGp_world_dark_set(u8 param_0) { + g_dComIfG_gameInfo.mWorldDark = param_0; } -#pragma pop -/* 8002F518-8002F52C 029E58 0014+00 0/0 1/1 0/0 .text dComIfGp_world_dark_get__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dComIfGp_world_dark_get() { - nofralloc -#include "asm/d/com/d_com_inf_game/dComIfGp_world_dark_get__Fv.s" +u8 dComIfGp_world_dark_get() { + return g_dComIfG_gameInfo.mWorldDark; } -#pragma pop -/* 8002F52C-8002F5C0 029E6C 0094+00 0/0 0/0 8/8 .text dComIfG_TimerStart__Fis */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dComIfG_TimerStart(int param_0, s16 param_1) { - nofralloc -#include "asm/d/com/d_com_inf_game/dComIfG_TimerStart__Fis.s" -} -#pragma pop +int dComIfG_TimerStart(int param_0, s16 param_1) { + int uvar2; -/* 8002F5C0-8002F638 029F00 0078+00 0/0 0/0 2/2 .text dComIfG_TimerStop__Fi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dComIfG_TimerStop(int param_0) { - nofralloc -#include "asm/d/com/d_com_inf_game/dComIfG_TimerStop__Fi.s" + if (param_0 == dComIfG_getTimerMode()) { + dTimer_c* timer = dComIfG_getTimerPtr(); + if (timer != NULL) { + if (param_1 == 0) { + timer->start(param_0); + } else { + timer->start(param_0, param_1); + } + uvar2 = 1; + } else { + uvar2 = 0; + } + } else { + uvar2 = 0; + } + return uvar2; } -#pragma pop -/* 8002F638-8002F6B0 029F78 0078+00 0/0 0/0 3/3 .text dComIfG_TimerReStart__Fi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dComIfG_TimerReStart(int param_0) { - nofralloc -#include "asm/d/com/d_com_inf_game/dComIfG_TimerReStart__Fi.s" -} -#pragma pop +int dComIfG_TimerStop(int param_0) { + int uvar2; -/* 8002F6B0-8002F72C 029FF0 007C+00 0/0 0/0 4/4 .text dComIfG_TimerEnd__Fii */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dComIfG_TimerEnd(int param_0, int param_1) { - nofralloc -#include "asm/d/com/d_com_inf_game/dComIfG_TimerEnd__Fii.s" + if (param_0 == dComIfG_getTimerMode()) { + dTimer_c* timer = dComIfG_getTimerPtr(); + if (timer != NULL) { + timer->stop(4); + uvar2 = 1; + } else { + uvar2 = 0; + } + } else { + uvar2 = 0; + } + return uvar2; +} + +int dComIfG_TimerReStart(int param_0) { + int uvar2; + + if (param_0 == dComIfG_getTimerMode()) { + dTimer_c* timer = dComIfG_getTimerPtr(); + if (timer != NULL) { + timer->restart(4); + uvar2 = 1; + } else { + uvar2 = 0; + } + } else { + uvar2 = 0; + } + return uvar2; +} + +int dComIfG_TimerEnd(int param_0, int param_1) { + int uvar2; + + if (param_0 == dComIfG_getTimerMode()) { + dTimer_c* timer = dComIfG_getTimerPtr(); + if (timer != NULL) { + timer->end(param_1); + uvar2 = 1; + } else { + uvar2 = 0; + } + } else { + uvar2 = 0; + } + return uvar2; } -#pragma pop /* 8002F72C-8002F79C 02A06C 0070+00 0/0 0/0 2/2 .text dComIfG_TimerDeleteCheck__Fi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dComIfG_TimerDeleteCheck(int param_0) { - nofralloc -#include "asm/d/com/d_com_inf_game/dComIfG_TimerDeleteCheck__Fi.s" -} -#pragma pop +int dComIfG_TimerDeleteCheck(int param_0) { + int uvar2; -/* 8002F79C-8002F810 02A0DC 0074+00 0/0 1/1 17/17 .text dComIfG_TimerDeleteRequest__Fi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dComIfG_TimerDeleteRequest(int param_0) { - nofralloc -#include "asm/d/com/d_com_inf_game/dComIfG_TimerDeleteRequest__Fi.s" + if (param_0 == dComIfG_getTimerMode()) { + dTimer_c* timer = dComIfG_getTimerPtr(); + if (timer != NULL) { + uvar2 = timer->deleteCheck(); + } else { + uvar2 = 0; + } + } else { + uvar2 = 0; + } + return uvar2; +} + +int dComIfG_TimerDeleteRequest(int param_0) { + int uvar2; + + if (param_0 == dComIfG_getTimerMode()) { + dTimer_c* timer = dComIfG_getTimerPtr(); + if (timer != NULL) { + timer->deleteRequest(); + uvar2 = 1; + } else { + uvar2 = 0; + } + } else { + uvar2 = 0; + } + return uvar2; } -#pragma pop /* 8002F810-8002F9F0 02A150 01E0+00 0/0 1/1 0/0 .text dComIfGs_Wolf_Change_Check__Fv */ #pragma push @@ -1859,46 +2503,25 @@ asm void dComIfGs_Wolf_Change_Check() { } #pragma pop -/* 8002F9F0-8002FA04 02A330 0014+00 0/0 2/2 0/0 .text dComIfGs_PolyDamageOff_Set__FSc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dComIfGs_PolyDamageOff_Set(s8 param_0) { - nofralloc -#include "asm/d/com/d_com_inf_game/dComIfGs_PolyDamageOff_Set__FSc.s" +void dComIfGs_PolyDamageOff_Set(s8 param_0) { + g_dComIfG_gameInfo.field_0x1ddfb = param_0; } -#pragma pop -/* 8002FA04-8002FA18 02A344 0014+00 0/0 1/1 0/0 .text dComIfGs_PolyDamageOff_Check__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dComIfGs_PolyDamageOff_Check() { - nofralloc -#include "asm/d/com/d_com_inf_game/dComIfGs_PolyDamageOff_Check__Fv.s" +u8 dComIfGs_PolyDamageOff_Check() { + return g_dComIfG_gameInfo.field_0x1ddfb; } -#pragma pop -/* 8002FA18-8002FA30 02A358 0018+00 0/0 0/0 1/1 .text dComIfGs_shake_kandelaar__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dComIfGs_shake_kandelaar() { - nofralloc -#include "asm/d/com/d_com_inf_game/dComIfGs_shake_kandelaar__Fv.s" +void dComIfGs_shake_kandelaar() { + g_dComIfG_gameInfo.field_0x1ddfa = 1; } -#pragma pop -/* 8002FA30-8002FA54 02A370 0024+00 0/0 0/0 1/1 .text dComIfGs_shake_kandelaar_check__Fv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dComIfGs_shake_kandelaar_check() { - nofralloc -#include "asm/d/com/d_com_inf_game/dComIfGs_shake_kandelaar_check__Fv.s" +bool dComIfGs_shake_kandelaar_check() { + bool check = false; + if (g_dComIfG_gameInfo.field_0x1ddfa == 2) { + check = true; + } + return check; } -#pragma pop /* ############################################################################################## */ /* 80451D20-80451D28 000320 0008+00 1/1 0/0 0/0 .sdata2 @7580 */ @@ -1915,65 +2538,34 @@ asm void dComIfGs_wolfeye_effect_check() { } #pragma pop -/* 8002FA84-8002FA98 02A3C4 0014+00 0/0 0/0 1/1 .text dComIfGs_Grass_hide_Set__FSc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dComIfGs_Grass_hide_Set(s8 param_0) { - nofralloc -#include "asm/d/com/d_com_inf_game/dComIfGs_Grass_hide_Set__FSc.s" +void dComIfGs_Grass_hide_Set(s8 param_0) { + g_dComIfG_gameInfo.field_0x1ddfc = param_0; } -#pragma pop -/* 8002FA98-8002FAAC 02A3D8 0014+00 0/0 1/1 8/8 .text dComIfGp_TargetWarpPt_set__FUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dComIfGp_TargetWarpPt_set(u8 param_0) { - nofralloc -#include "asm/d/com/d_com_inf_game/dComIfGp_TargetWarpPt_set__FUc.s" +void dComIfGp_TargetWarpPt_set(u8 param_0) { + g_dComIfG_gameInfo.field_0x1de09 = param_0; } -#pragma pop -/* 8002FAAC-8002FAC0 02A3EC 0014+00 0/0 1/1 0/0 .text dComIfGp_SelectWarpPt_set__FUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dComIfGp_SelectWarpPt_set(u8 param_0) { - nofralloc -#include "asm/d/com/d_com_inf_game/dComIfGp_SelectWarpPt_set__FUc.s" +void dComIfGp_SelectWarpPt_set(u8 param_0) { + g_dComIfG_gameInfo.field_0x1de0a = param_0; } -#pragma pop -/* 8002FAC0-8002FAD4 02A400 0014+00 0/0 3/3 0/0 .text dComIfGp_TargetWarpPt_get__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dComIfGp_TargetWarpPt_get() { - nofralloc -#include "asm/d/com/d_com_inf_game/dComIfGp_TargetWarpPt_get__Fv.s" +u8 dComIfGp_TargetWarpPt_get() { + return g_dComIfG_gameInfo.field_0x1de09; } -#pragma pop -/* 8002FAD4-8002FAE8 02A414 0014+00 0/0 1/1 0/0 .text dComIfGp_SelectWarpPt_get__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dComIfGp_SelectWarpPt_get() { - nofralloc -#include "asm/d/com/d_com_inf_game/dComIfGp_SelectWarpPt_get__Fv.s" +u8 dComIfGp_SelectWarpPt_get() { + return g_dComIfG_gameInfo.field_0x1de0a; } -#pragma pop -/* 8002FAE8-8002FB20 02A428 0038+00 0/0 2/2 6/6 .text dComIfGp_TransportWarp_check__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dComIfGp_TransportWarp_check() { - nofralloc -#include "asm/d/com/d_com_inf_game/dComIfGp_TransportWarp_check__Fv.s" +BOOL dComIfGp_TransportWarp_check() { + BOOL check = false; + if (g_dComIfG_gameInfo.field_0x1de09 != 0xFF && g_dComIfG_gameInfo.field_0x1de0a != 0xFF && + g_dComIfG_gameInfo.field_0x1de09 == g_dComIfG_gameInfo.field_0x1de0a) { + check = true; + } + return check; } -#pragma pop /* 8002FB20-8002FB80 02A460 0060+00 2/2 6/6 0/0 .text * dComLbG_PhaseHandler__FP30request_of_phase_process_classPPFPv_iPv */ diff --git a/src/d/d_attention.cpp b/src/d/d_attention.cpp index eced61deb4c..39bd24168dd 100644 --- a/src/d/d_attention.cpp +++ b/src/d/d_attention.cpp @@ -195,7 +195,6 @@ extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" extern u32 __float_nan; extern "C" extern u32 __float_max; -extern "C" extern u8 struct_80450D64[4]; extern "C" extern u8 data_80450F58[8]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; @@ -1039,7 +1038,7 @@ asm void dAttHint_c::proc() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dAttCatch_c::convPId(unsigned int param_0) { +asm s32 dAttCatch_c::convPId(unsigned int param_0) { nofralloc #include "asm/d/d_attention/convPId__11dAttCatch_cFUi.s" } diff --git a/src/d/d_item.cpp b/src/d/d_item.cpp index 3507e3ee47b..33b751fd37c 100644 --- a/src/d/d_item.cpp +++ b/src/d/d_item.cpp @@ -4,6 +4,7 @@ // #include "d/d_item.h" +#include "d/meter/d_meter2_info.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -11,74 +12,10 @@ // Types: // -struct dSv_player_status_a_c { - /* 80032AF8 */ void isMagicFlag(u8) const; -}; - -struct dSv_player_item_record_c { - /* 80033F7C */ void getBombNum(u8) const; - /* 80033F8C */ void setBottleNum(u8, u8); -}; - -struct dSv_player_item_max_c { - /* 800340F8 */ void getBombNum(u8) const; -}; - -struct dSv_player_item_c { - /* 80032FB8 */ void setItem(int, u8); - /* 80033030 */ void getItem(int, bool) const; - /* 80033450 */ void setEmptyBottleItemIn(u8); - /* 80033494 */ void setEmptyBottle(); - /* 80033514 */ void setEmptyBottle(u8); - /* 800336E0 */ void checkBottle(u8); - /* 80033A20 */ void setEmptyBombBagItemIn(u8, bool); - /* 80033A50 */ void setEmptyBombBagItemIn(u8, u8, bool); - /* 80033A88 */ void setEmptyBombBag(); - /* 80033B08 */ void setEmptyBombBag(u8, u8); - /* 80033CBC */ void setRodTypeLevelUp(); -}; - -struct dSv_player_get_item_c { - /* 80033E60 */ void onFirstBit(u8); - /* 80033EC8 */ void isFirstBit(u8) const; -}; - -struct dSv_player_collect_c { - /* 800341E8 */ void setCollect(int, u8); - /* 80034208 */ void isCollect(int, u8) const; -}; - -struct dSv_memBit_c { - /* 80034918 */ void onDungeonItem(int); - /* 80034934 */ void isDungeonItem(int) const; -}; - -struct dSv_light_drop_c { - /* 80034368 */ void onLightDropGetFlag(u8); - /* 8003439C */ void isLightDropGetFlag(u8) const; -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); -}; - -struct dSv_event_flag_c { - static u8 saveBitLabels[1644 + 4 /* padding */]; -}; - -struct dSv_event_c { - /* 8003498C */ void onEventBit(u16); -}; - struct dEnemyItem_c { static u8 mData[4 + 4 /* padding */]; }; -struct dComIfG_play_c { - /* 8002B36C */ void setItemBombNumCount(u8, s16); - /* 8002C97C */ void getLayerNo(int); -}; - // // Forward References: // @@ -339,7 +276,7 @@ extern "C" static void item_getcheck_func_COPY_ROD__Fv(); extern "C" static void item_getcheck_func_W_HOOKSHOT__Fv(); extern "C" static void item_getcheck_func_KANTERA__Fv(); extern "C" static void item_getcheck_func_LIGHT_SWORD__Fv(); -extern "C" static void item_getcheck_func_FISHING_ROD_1__Fv(); +extern "C" static int item_getcheck_func_FISHING_ROD_1__Fv(); extern "C" static void item_getcheck_func_PACHINKO__Fv(); extern "C" static s32 item_getcheck_func_COPY_ROD_2__Fv(); extern "C" static void item_getcheck_func_BOMB_BAG_LV2__Fv(); @@ -461,13 +398,13 @@ extern "C" static void item_getcheck_func_L2_KEY_PIECES3__Fv(); extern "C" static void item_getcheck_func_KEY_OF_CARAVAN__Fv(); extern "C" static void item_getcheck_func_LV2_BOSS_KEY__Fv(); extern "C" static void item_getcheck_func_KEY_OF_FILONE__Fv(); -extern "C" static void isBomb__FUc(); -extern "C" static void isArrow__FUc(); +extern "C" bool isBomb__FUc(u8); +extern "C" bool isArrow__FUc(u8); extern "C" void isBottleItem__FUc(); extern "C" void isHeart__FUc(); extern "C" void isInsect__FUc(); extern "C" void check_itemno__Fi(); -extern "C" static void addBombCount__FUcUc(); +extern "C" static void addBombCount__FUcUc(u8, u8); extern "C" extern char const* const d_d_item__stringBase0; extern "C" u8 mData__12dEnemyItem_c[4 + 4 /* padding */]; @@ -477,10 +414,10 @@ extern "C" u8 mData__12dEnemyItem_c[4 + 4 /* padding */]; extern "C" void setItemBombNumCount__14dComIfG_play_cFUcs(); extern "C" void getLayerNo__14dComIfG_play_cFi(); -extern "C" void dComIfGs_getMaxLifeGauge__Fv(); -extern "C" void dComIfGs_setSelectEquipClothes__FUc(); -extern "C" void dComIfGs_setSelectEquipSword__FUc(); -extern "C" void dComIfGs_setSelectEquipShield__FUc(); +extern "C" u16 dComIfGs_getMaxLifeGauge__Fv(); +extern "C" void dComIfGs_setSelectEquipClothes__FUc(u8); +extern "C" void dComIfGs_setSelectEquipSword__FUc(u8); +extern "C" void dComIfGs_setSelectEquipShield__FUc(u8); extern "C" void isMagicFlag__21dSv_player_status_a_cCFUc(); extern "C" void setItem__17dSv_player_item_cFiUc(); extern "C" void getItem__17dSv_player_item_cCFib(); @@ -506,3890 +443,2080 @@ extern "C" void onDungeonItem__12dSv_memBit_cFi(); extern "C" void isDungeonItem__12dSv_memBit_cCFi(); extern "C" void onEventBit__11dSv_event_cFUs(); extern "C" void onSwitch__10dSv_info_cFii(); -extern "C" void dMeter2Info_setSword__FUcb(); +extern "C" void dMeter2Info_setSword__FUcb(u8, bool); extern "C" void _savegpr_20(); extern "C" void _savegpr_26(); extern "C" void _savegpr_29(); extern "C" void _restgpr_20(); extern "C" void _restgpr_26(); extern "C" void _restgpr_29(); -extern "C" void strncmp(); extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 struct_80450D64[4]; // // Declarations: // -/* ############################################################################################## */ -/* 803AF178-803AF578 -00001 0400+00 1/1 0/0 0/0 .data item_func_ptr */ -SECTION_DATA static void* item_func_ptr[256] = { - (void*)item_func_HEART__Fv, - (void*)item_func_GREEN_RUPEE__Fv, - (void*)item_func_BLUE_RUPEE__Fv, - (void*)item_func_YELLOW_RUPEE__Fv, - (void*)item_func_RED_RUPEE__Fv, - (void*)item_func_PURPLE_RUPEE__Fv, - (void*)item_func_ORANGE_RUPEE__Fv, - (void*)item_func_SILVER_RUPEE__Fv, - (void*)item_func_S_MAGIC__Fv, - (void*)item_func_L_MAGIC__Fv, - (void*)item_func_BOMB_5__Fv, - (void*)item_func_BOMB_10__Fv, - (void*)item_func_BOMB_20__Fv, - (void*)item_func_BOMB_30__Fv, - (void*)item_func_ARROW_10__Fv, - (void*)item_func_ARROW_20__Fv, - (void*)item_func_ARROW_30__Fv, - (void*)item_func_ARROW_1__Fv, - (void*)item_func_PACHINKO_SHOT__Fv, - (void*)item_func_noentry__Fv, - (void*)item_func_noentry__Fv, - (void*)item_func_noentry__Fv, - (void*)item_func_WATER_BOMB_5__Fv, - (void*)item_func_WATER_BOMB_10__Fv, - (void*)item_func_WATER_BOMB_20__Fv, - (void*)item_func_WATER_BOMB_30__Fv, - (void*)item_func_BOMB_INSECT_5__Fv, - (void*)item_func_BOMB_INSECT_10__Fv, - (void*)item_func_BOMB_INSECT_20__Fv, - (void*)item_func_BOMB_INSECT_30__Fv, - (void*)item_func_RECOVER_FAILY__Fv, - (void*)item_func_TRIPLE_HEART__Fv, - (void*)item_func_SMALL_KEY__Fv, - (void*)item_func_KAKERA_HEART__Fv, - (void*)item_func_UTUWA_HEART__Fv, - (void*)item_func_MAP__Fv, - (void*)item_func_COMPUS__Fv, - (void*)item_func_DUNGEON_EXIT__Fv, - (void*)item_func_BOSS_KEY__Fv, - (void*)item_func_DUNGEON_BACK__Fv, - (void*)item_func_SWORD__Fv, - (void*)item_func_MASTER_SWORD__Fv, - (void*)item_func_WOOD_SHIELD__Fv, - (void*)item_func_SHIELD__Fv, - (void*)item_func_HYLIA_SHIELD__Fv, - (void*)item_func_TKS_LETTER__Fv, - (void*)item_func_WEAR_CASUAL__Fv, - (void*)item_func_WEAR_KOKIRI__Fv, - (void*)item_func_ARMOR__Fv, - (void*)item_func_WEAR_ZORA__Fv, - (void*)item_func_MAGIC_LV1__Fv, - (void*)item_func_DUNGEON_EXIT_2__Fv, - (void*)item_func_WALLET_LV1__Fv, - (void*)item_func_WALLET_LV2__Fv, - (void*)item_func_WALLET_LV3__Fv, - (void*)item_func_noentry__Fv, - (void*)item_func_noentry__Fv, - (void*)item_func_noentry__Fv, - (void*)item_func_noentry__Fv, - (void*)item_func_noentry__Fv, - (void*)item_func_noentry__Fv, - (void*)item_func_ZORAS_JEWEL__Fv, - (void*)item_func_HAWK_EYE__Fv, - (void*)item_func_WOOD_STICK__Fv, - (void*)item_func_BOOMERANG__Fv, - (void*)item_func_SPINNER__Fv, - (void*)item_func_IRONBALL__Fv, - (void*)item_func_BOW__Fv, - (void*)item_func_HOOKSHOT__Fv, - (void*)item_func_HVY_BOOTS__Fv, - (void*)item_func_COPY_ROD__Fv, - (void*)item_func_W_HOOKSHOT__Fv, - (void*)item_func_KANTERA__Fv, - (void*)item_func_LIGHT_SWORD__Fv, - (void*)item_func_FISHING_ROD_1__Fv, - (void*)item_func_PACHINKO__Fv, - (void*)item_func_COPY_ROD_2__Fv, - (void*)item_func_noentry__Fv, - (void*)item_func_noentry__Fv, - (void*)item_func_BOMB_BAG_LV2__Fv, - (void*)item_func_BOMB_BAG_LV1__Fv, - (void*)item_func_BOMB_IN_BAG__Fv, - (void*)item_func_noentry__Fv, - (void*)item_func_LIGHT_ARROW__Fv, - (void*)item_func_ARROW_LV1__Fv, - (void*)item_func_ARROW_LV2__Fv, - (void*)item_func_ARROW_LV3__Fv, - (void*)item_func_noentry__Fv, - (void*)item_func_LURE_ROD__Fv, - (void*)item_func_BOMB_ARROW__Fv, - (void*)item_func_HAWK_ARROW__Fv, - (void*)item_func_BEE_ROD__Fv, - (void*)item_func_JEWEL_ROD__Fv, - (void*)item_func_WORM_ROD__Fv, - (void*)item_func_JEWEL_BEE_ROD__Fv, - (void*)item_func_JEWEL_WORM_ROD__Fv, - (void*)item_func_EMPTY_BOTTLE__Fv, - (void*)item_func_RED_BOTTLE__Fv, - (void*)item_func_GREEN_BOTTLE__Fv, - (void*)item_func_BLUE_BOTTLE__Fv, - (void*)item_func_MILK_BOTTLE__Fv, - (void*)item_func_HALF_MILK_BOTTLE__Fv, - (void*)item_func_OIL_BOTTLE__Fv, - (void*)item_func_WATER_BOTTLE__Fv, - (void*)item_func_OIL_BOTTLE2__Fv, - (void*)item_func_RED_BOTTLE2__Fv, - (void*)item_func_UGLY_SOUP__Fv, - (void*)item_func_HOT_SPRING__Fv, - (void*)item_func_FAIRY_BOTTLE__Fv, - (void*)item_func_HOT_SPRING2__Fv, - (void*)item_func_OIL2__Fv, - (void*)item_func_OIL__Fv, - (void*)item_func_NORMAL_BOMB__Fv, - (void*)item_func_WATER_BOMB__Fv, - (void*)item_func_POKE_BOMB__Fv, - (void*)item_func_FAIRY_DROP__Fv, - (void*)item_func_WORM__Fv, - (void*)item_func_DROP_BOTTLE__Fv, - (void*)item_func_BEE_CHILD__Fv, - (void*)item_func_CHUCHU_RARE__Fv, - (void*)item_func_CHUCHU_RED__Fv, - (void*)item_func_CHUCHU_BLUE__Fv, - (void*)item_func_CHUCHU_GREEN__Fv, - (void*)item_func_CHUCHU_YELLOW__Fv, - (void*)item_func_CHUCHU_PURPLE__Fv, - (void*)item_func_LV1_SOUP__Fv, - (void*)item_func_LV2_SOUP__Fv, - (void*)item_func_LV3_SOUP__Fv, - (void*)item_func_LETTER__Fv, - (void*)item_func_BILL__Fv, - (void*)item_func_WOOD_STATUE__Fv, - (void*)item_func_IRIAS_PENDANT__Fv, - (void*)item_func_HORSE_FLUTE__Fv, - (void*)item_func_noentry__Fv, - (void*)item_func_noentry__Fv, - (void*)item_func_noentry__Fv, - (void*)item_func_noentry__Fv, - (void*)item_func_noentry__Fv, - (void*)item_func_noentry__Fv, - (void*)item_func_noentry__Fv, - (void*)item_func_noentry__Fv, - (void*)item_func_noentry__Fv, - (void*)item_func_noentry__Fv, - (void*)item_func_noentry__Fv, - (void*)item_func_RAFRELS_MEMO__Fv, - (void*)item_func_ASHS_SCRIBBLING__Fv, - (void*)item_func_noentry__Fv, - (void*)item_func_noentry__Fv, - (void*)item_func_noentry__Fv, - (void*)item_func_noentry__Fv, - (void*)item_func_noentry__Fv, - (void*)item_func_noentry__Fv, - (void*)item_func_noentry__Fv, - (void*)item_func_noentry__Fv, - (void*)item_func_noentry__Fv, - (void*)item_func_noentry__Fv, - (void*)item_func_CHUCHU_YELLOW2__Fv, - (void*)item_func_OIL_BOTTLE3__Fv, - (void*)item_func_SHOP_BEE_CHILD__Fv, - (void*)item_func_CHUCHU_BLACK__Fv, - (void*)item_func_LIGHT_DROP__Fv, - (void*)item_func_DROP_CONTAINER__Fv, - (void*)item_func_DROP_CONTAINER02__Fv, - (void*)item_func_DROP_CONTAINER03__Fv, - (void*)item_func_FILLED_CONTAINER__Fv, - (void*)item_func_MIRROR_PIECE_2__Fv, - (void*)item_func_MIRROR_PIECE_3__Fv, - (void*)item_func_MIRROR_PIECE_4__Fv, - (void*)item_func_noentry__Fv, - (void*)item_func_noentry__Fv, - (void*)item_func_noentry__Fv, - (void*)item_func_noentry__Fv, - (void*)item_func_noentry__Fv, - (void*)item_func_noentry__Fv, - (void*)item_func_noentry__Fv, - (void*)item_func_noentry__Fv, - (void*)item_func_SMELL_YELIA_POUCH__Fv, - (void*)item_func_SMELL_PUMPKIN__Fv, - (void*)item_func_SMELL_POH__Fv, - (void*)item_func_SMELL_FISH__Fv, - (void*)item_func_SMELL_CHILDREN__Fv, - (void*)item_func_SMELL_MEDICINE__Fv, - (void*)item_func_noentry__Fv, - (void*)item_func_noentry__Fv, - (void*)item_func_noentry__Fv, - (void*)item_func_noentry__Fv, - (void*)item_func_noentry__Fv, - (void*)item_func_noentry__Fv, - (void*)item_func_noentry__Fv, - (void*)item_func_noentry__Fv, - (void*)item_func_noentry__Fv, - (void*)item_func_noentry__Fv, - (void*)item_func_M_BEETLE__Fv, - (void*)item_func_F_BEETLE__Fv, - (void*)item_func_M_BUTTERFLY__Fv, - (void*)item_func_F_BUTTERFLY__Fv, - (void*)item_func_M_STAG_BEETLE__Fv, - (void*)item_func_F_STAG_BEETLE__Fv, - (void*)item_func_M_GRASSHOPPER__Fv, - (void*)item_func_F_GRASSHOPPER__Fv, - (void*)item_func_M_NANAFUSHI__Fv, - (void*)item_func_F_NANAFUSHI__Fv, - (void*)item_func_M_DANGOMUSHI__Fv, - (void*)item_func_F_DANGOMUSHI__Fv, - (void*)item_func_M_MANTIS__Fv, - (void*)item_func_F_MANTIS__Fv, - (void*)item_func_M_LADYBUG__Fv, - (void*)item_func_F_LADYBUG__Fv, - (void*)item_func_M_SNAIL__Fv, - (void*)item_func_F_SNAIL__Fv, - (void*)item_func_M_DRAGONFLY__Fv, - (void*)item_func_F_DRAGONFLY__Fv, - (void*)item_func_M_ANT__Fv, - (void*)item_func_F_ANT__Fv, - (void*)item_func_M_MAYFLY__Fv, - (void*)item_func_F_MAYFLY__Fv, - (void*)item_func_noentry__Fv, - (void*)item_func_noentry__Fv, - (void*)item_func_noentry__Fv, - (void*)item_func_noentry__Fv, - (void*)item_func_noentry__Fv, - (void*)item_func_noentry__Fv, - (void*)item_func_noentry__Fv, - (void*)item_func_noentry__Fv, - (void*)item_func_POU_SPIRIT__Fv, - (void*)item_func_noentry__Fv, - (void*)item_func_noentry__Fv, - (void*)item_func_noentry__Fv, - (void*)item_func_noentry__Fv, - (void*)item_func_noentry__Fv, - (void*)item_func_noentry__Fv, - (void*)item_func_noentry__Fv, - (void*)item_func_noentry__Fv, - (void*)item_func_ANCIENT_DOCUMENT__Fv, - (void*)item_func_AIR_LETTER__Fv, - (void*)item_func_ANCIENT_DOCUMENT2__Fv, - (void*)item_func_LV7_DUNGEON_EXIT__Fv, - (void*)item_func_LINKS_SAVINGS__Fv, - (void*)item_func_SMALL_KEY2__Fv, - (void*)item_func_POU_FIRE1__Fv, - (void*)item_func_POU_FIRE2__Fv, - (void*)item_func_POU_FIRE3__Fv, - (void*)item_func_POU_FIRE4__Fv, - (void*)item_func_BOSSRIDER_KEY__Fv, - (void*)item_func_TOMATO_PUREE__Fv, - (void*)item_func_TASTE__Fv, - (void*)item_func_LV5_BOSS_KEY__Fv, - (void*)item_func_SURFBOARD__Fv, - (void*)item_func_KANTERA2__Fv, - (void*)item_func_L2_KEY_PIECES1__Fv, - (void*)item_func_L2_KEY_PIECES2__Fv, - (void*)item_func_L2_KEY_PIECES3__Fv, - (void*)item_func_KEY_OF_CARAVAN__Fv, - (void*)item_func_LV2_BOSS_KEY__Fv, - (void*)item_func_KEY_OF_FILONE__Fv, - (void*)item_func_noentry__Fv, +inline void dComIfGp_setItemLifeCount(float amount, u8 type) { + g_dComIfG_gameInfo.play.setItemLifeCount(amount, type); +} +inline void dComIfGp_setItemRupeeCount(int amount) { + g_dComIfG_gameInfo.play.setItemRupeeCount(amount); +} +inline int dComIfGs_isItemFirstBit(u8 i_no) { + return g_dComIfG_gameInfo.info.getPlayer().getGetItem().isFirstBit(i_no); +} + +static void (*item_func_ptr[256])() = { + item_func_HEART, + item_func_GREEN_RUPEE, + item_func_BLUE_RUPEE, + item_func_YELLOW_RUPEE, + item_func_RED_RUPEE, + item_func_PURPLE_RUPEE, + item_func_ORANGE_RUPEE, + item_func_SILVER_RUPEE, + item_func_S_MAGIC, + item_func_L_MAGIC, + item_func_BOMB_5, + item_func_BOMB_10, + item_func_BOMB_20, + item_func_BOMB_30, + item_func_ARROW_10, + item_func_ARROW_20, + item_func_ARROW_30, + item_func_ARROW_1, + item_func_PACHINKO_SHOT, + item_func_noentry, + item_func_noentry, + item_func_noentry, + item_func_WATER_BOMB_5, + item_func_WATER_BOMB_10, + item_func_WATER_BOMB_20, + item_func_WATER_BOMB_30, + item_func_BOMB_INSECT_5, + item_func_BOMB_INSECT_10, + item_func_BOMB_INSECT_20, + item_func_BOMB_INSECT_30, + item_func_RECOVER_FAILY, + item_func_TRIPLE_HEART, + item_func_SMALL_KEY, + item_func_KAKERA_HEART, + item_func_UTUWA_HEART, + item_func_MAP, + item_func_COMPUS, + item_func_DUNGEON_EXIT, + item_func_BOSS_KEY, + item_func_DUNGEON_BACK, + item_func_SWORD, + item_func_MASTER_SWORD, + item_func_WOOD_SHIELD, + item_func_SHIELD, + item_func_HYLIA_SHIELD, + item_func_TKS_LETTER, + item_func_WEAR_CASUAL, + item_func_WEAR_KOKIRI, + item_func_ARMOR, + item_func_WEAR_ZORA, + item_func_MAGIC_LV1, + item_func_DUNGEON_EXIT_2, + item_func_WALLET_LV1, + item_func_WALLET_LV2, + item_func_WALLET_LV3, + item_func_noentry, + item_func_noentry, + item_func_noentry, + item_func_noentry, + item_func_noentry, + item_func_noentry, + item_func_ZORAS_JEWEL, + item_func_HAWK_EYE, + item_func_WOOD_STICK, + item_func_BOOMERANG, + item_func_SPINNER, + item_func_IRONBALL, + item_func_BOW, + item_func_HOOKSHOT, + item_func_HVY_BOOTS, + item_func_COPY_ROD, + item_func_W_HOOKSHOT, + item_func_KANTERA, + item_func_LIGHT_SWORD, + item_func_FISHING_ROD_1, + item_func_PACHINKO, + item_func_COPY_ROD_2, + item_func_noentry, + item_func_noentry, + item_func_BOMB_BAG_LV2, + item_func_BOMB_BAG_LV1, + item_func_BOMB_IN_BAG, + item_func_noentry, + item_func_LIGHT_ARROW, + item_func_ARROW_LV1, + item_func_ARROW_LV2, + item_func_ARROW_LV3, + item_func_noentry, + item_func_LURE_ROD, + item_func_BOMB_ARROW, + item_func_HAWK_ARROW, + item_func_BEE_ROD, + item_func_JEWEL_ROD, + item_func_WORM_ROD, + item_func_JEWEL_BEE_ROD, + item_func_JEWEL_WORM_ROD, + item_func_EMPTY_BOTTLE, + item_func_RED_BOTTLE, + item_func_GREEN_BOTTLE, + item_func_BLUE_BOTTLE, + item_func_MILK_BOTTLE, + item_func_HALF_MILK_BOTTLE, + item_func_OIL_BOTTLE, + item_func_WATER_BOTTLE, + item_func_OIL_BOTTLE2, + item_func_RED_BOTTLE2, + item_func_UGLY_SOUP, + item_func_HOT_SPRING, + item_func_FAIRY_BOTTLE, + item_func_HOT_SPRING2, + item_func_OIL2, + item_func_OIL, + item_func_NORMAL_BOMB, + item_func_WATER_BOMB, + item_func_POKE_BOMB, + item_func_FAIRY_DROP, + item_func_WORM, + item_func_DROP_BOTTLE, + item_func_BEE_CHILD, + item_func_CHUCHU_RARE, + item_func_CHUCHU_RED, + item_func_CHUCHU_BLUE, + item_func_CHUCHU_GREEN, + item_func_CHUCHU_YELLOW, + item_func_CHUCHU_PURPLE, + item_func_LV1_SOUP, + item_func_LV2_SOUP, + item_func_LV3_SOUP, + item_func_LETTER, + item_func_BILL, + item_func_WOOD_STATUE, + item_func_IRIAS_PENDANT, + item_func_HORSE_FLUTE, + item_func_noentry, + item_func_noentry, + item_func_noentry, + item_func_noentry, + item_func_noentry, + item_func_noentry, + item_func_noentry, + item_func_noentry, + item_func_noentry, + item_func_noentry, + item_func_noentry, + item_func_RAFRELS_MEMO, + item_func_ASHS_SCRIBBLING, + item_func_noentry, + item_func_noentry, + item_func_noentry, + item_func_noentry, + item_func_noentry, + item_func_noentry, + item_func_noentry, + item_func_noentry, + item_func_noentry, + item_func_noentry, + item_func_CHUCHU_YELLOW2, + item_func_OIL_BOTTLE3, + item_func_SHOP_BEE_CHILD, + item_func_CHUCHU_BLACK, + item_func_LIGHT_DROP, + item_func_DROP_CONTAINER, + item_func_DROP_CONTAINER02, + item_func_DROP_CONTAINER03, + item_func_FILLED_CONTAINER, + item_func_MIRROR_PIECE_2, + item_func_MIRROR_PIECE_3, + item_func_MIRROR_PIECE_4, + item_func_noentry, + item_func_noentry, + item_func_noentry, + item_func_noentry, + item_func_noentry, + item_func_noentry, + item_func_noentry, + item_func_noentry, + item_func_SMELL_YELIA_POUCH, + item_func_SMELL_PUMPKIN, + item_func_SMELL_POH, + item_func_SMELL_FISH, + item_func_SMELL_CHILDREN, + item_func_SMELL_MEDICINE, + item_func_noentry, + item_func_noentry, + item_func_noentry, + item_func_noentry, + item_func_noentry, + item_func_noentry, + item_func_noentry, + item_func_noentry, + item_func_noentry, + item_func_noentry, + item_func_M_BEETLE, + item_func_F_BEETLE, + item_func_M_BUTTERFLY, + item_func_F_BUTTERFLY, + item_func_M_STAG_BEETLE, + item_func_F_STAG_BEETLE, + item_func_M_GRASSHOPPER, + item_func_F_GRASSHOPPER, + item_func_M_NANAFUSHI, + item_func_F_NANAFUSHI, + item_func_M_DANGOMUSHI, + item_func_F_DANGOMUSHI, + item_func_M_MANTIS, + item_func_F_MANTIS, + item_func_M_LADYBUG, + item_func_F_LADYBUG, + item_func_M_SNAIL, + item_func_F_SNAIL, + item_func_M_DRAGONFLY, + item_func_F_DRAGONFLY, + item_func_M_ANT, + item_func_F_ANT, + item_func_M_MAYFLY, + item_func_F_MAYFLY, + item_func_noentry, + item_func_noentry, + item_func_noentry, + item_func_noentry, + item_func_noentry, + item_func_noentry, + item_func_noentry, + item_func_noentry, + item_func_POU_SPIRIT, + item_func_noentry, + item_func_noentry, + item_func_noentry, + item_func_noentry, + item_func_noentry, + item_func_noentry, + item_func_noentry, + item_func_noentry, + item_func_ANCIENT_DOCUMENT, + item_func_AIR_LETTER, + item_func_ANCIENT_DOCUMENT2, + item_func_LV7_DUNGEON_EXIT, + item_func_LINKS_SAVINGS, + item_func_SMALL_KEY2, + item_func_POU_FIRE1, + item_func_POU_FIRE2, + item_func_POU_FIRE3, + item_func_POU_FIRE4, + item_func_BOSSRIDER_KEY, + item_func_TOMATO_PUREE, + item_func_TASTE, + item_func_LV5_BOSS_KEY, + item_func_SURFBOARD, + item_func_KANTERA2, + item_func_L2_KEY_PIECES1, + item_func_L2_KEY_PIECES2, + item_func_L2_KEY_PIECES3, + item_func_KEY_OF_CARAVAN, + item_func_LV2_BOSS_KEY, + item_func_KEY_OF_FILONE, + item_func_noentry, }; -/* 80097E8C-80097EE0 0927CC 0054+00 0/0 4/4 7/7 .text execItemGet__FUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void execItemGet(u8 param_0) { - nofralloc -#include "asm/d/d_item/execItemGet__FUc.s" +inline u8 dStage_stagInfo_GetSaveTbl(stage_stag_info_class* param_0) { + return param_0->field_0x09 >> 1 & 0x1f; } -#pragma pop -/* ############################################################################################## */ -/* 803AF578-803AF978 -00001 0400+00 1/1 0/0 0/0 .data item_getcheck_func_ptr */ -SECTION_DATA static void* item_getcheck_func_ptr[256] = { - (void*)item_getcheck_func_HEART__Fv, - (void*)item_getcheck_func_GREEN_RUPEE__Fv, - (void*)item_getcheck_func_BLUE_RUPEE__Fv, - (void*)item_getcheck_func_YELLOW_RUPEE__Fv, - (void*)item_getcheck_func_RED_RUPEE__Fv, - (void*)item_getcheck_func_PURPLE_RUPEE__Fv, - (void*)item_getcheck_func_ORANGE_RUPEE__Fv, - (void*)item_getcheck_func_SILVER_RUPEE__Fv, - (void*)item_getcheck_func_S_MAGIC__Fv, - (void*)item_getcheck_func_L_MAGIC__Fv, - (void*)item_getcheck_func_BOMB_5__Fv, - (void*)item_getcheck_func_BOMB_10__Fv, - (void*)item_getcheck_func_BOMB_20__Fv, - (void*)item_getcheck_func_BOMB_30__Fv, - (void*)item_getcheck_func_ARROW_10__Fv, - (void*)item_getcheck_func_ARROW_20__Fv, - (void*)item_getcheck_func_ARROW_30__Fv, - (void*)item_getcheck_func_ARROW_1__Fv, - (void*)item_getcheck_func_PACHINKO_SHOT__Fv, - (void*)item_getcheck_func_noentry__Fv, - (void*)item_getcheck_func_noentry__Fv, - (void*)item_getcheck_func_noentry__Fv, - (void*)item_getcheck_func_WATER_BOMB_5__Fv, - (void*)item_getcheck_func_WATER_BOMB_10__Fv, - (void*)item_getcheck_func_WATER_BOMB_20__Fv, - (void*)item_getcheck_func_WATER_BOMB_30__Fv, - (void*)item_getcheck_func_BOMB_INSECT_5__Fv, - (void*)item_getcheck_func_BOMB_INSECT_10__Fv, - (void*)item_getcheck_func_BOMB_INSECT_20__Fv, - (void*)item_getcheck_func_BOMB_INSECT_30__Fv, - (void*)item_getcheck_func_RECOVER_FAILY__Fv, - (void*)item_getcheck_func_TRIPLE_HEART__Fv, - (void*)item_getcheck_func_SMALL_KEY__Fv, - (void*)item_getcheck_func_KAKERA_HEART__Fv, - (void*)item_getcheck_func_UTUWA_HEART__Fv, - (void*)item_getcheck_func_MAP__Fv, - (void*)item_getcheck_func_COMPUS__Fv, - (void*)item_getcheck_func_DUNGEON_EXIT__Fv, - (void*)item_getcheck_func_BOSS_KEY__Fv, - (void*)item_getcheck_func_DUNGEON_BACK__Fv, - (void*)item_getcheck_func_SWORD__Fv, - (void*)item_getcheck_func_MASTER_SWORD__Fv, - (void*)item_getcheck_func_WOOD_SHIELD__Fv, - (void*)item_getcheck_func_SHIELD__Fv, - (void*)item_getcheck_func_HYLIA_SHIELD__Fv, - (void*)item_getcheck_func_TKS_LETTER__Fv, - (void*)item_getcheck_func_WEAR_CASUAL__Fv, - (void*)item_getcheck_func_WEAR_KOKIRI__Fv, - (void*)item_getcheck_func_ARMOR__Fv, - (void*)item_getcheck_func_WEAR_ZORA__Fv, - (void*)item_getcheck_func_MAGIC_LV1__Fv, - (void*)item_getcheck_func_DUNGEON_EXIT_2__Fv, - (void*)item_getcheck_func_WALLET_LV1__Fv, - (void*)item_getcheck_func_WALLET_LV2__Fv, - (void*)item_getcheck_func_WALLET_LV3__Fv, - (void*)item_getcheck_func_noentry__Fv, - (void*)item_getcheck_func_noentry__Fv, - (void*)item_getcheck_func_noentry__Fv, - (void*)item_getcheck_func_noentry__Fv, - (void*)item_getcheck_func_noentry__Fv, - (void*)item_getcheck_func_noentry__Fv, - (void*)item_getcheck_func_ZORAS_JEWEL__Fv, - (void*)item_getcheck_func_HAWK_EYE__Fv, - (void*)item_getcheck_func_WOOD_STICK__Fv, - (void*)item_getcheck_func_BOOMERANG__Fv, - (void*)item_getcheck_func_SPINNER__Fv, - (void*)item_getcheck_func_IRONBALL__Fv, - (void*)item_getcheck_func_BOW__Fv, - (void*)item_getcheck_func_HOOKSHOT__Fv, - (void*)item_getcheck_func_HVY_BOOTS__Fv, - (void*)item_getcheck_func_COPY_ROD__Fv, - (void*)item_getcheck_func_W_HOOKSHOT__Fv, - (void*)item_getcheck_func_KANTERA__Fv, - (void*)item_getcheck_func_LIGHT_SWORD__Fv, - (void*)item_getcheck_func_FISHING_ROD_1__Fv, - (void*)item_getcheck_func_PACHINKO__Fv, - (void*)item_getcheck_func_COPY_ROD_2__Fv, - (void*)item_getcheck_func_noentry__Fv, - (void*)item_getcheck_func_noentry__Fv, - (void*)item_getcheck_func_BOMB_BAG_LV2__Fv, - (void*)item_getcheck_func_BOMB_BAG_LV1__Fv, - (void*)item_getcheck_func_BOMB_IN_BAG__Fv, - (void*)item_getcheck_func_noentry__Fv, - (void*)item_getcheck_func_LIGHT_ARROW__Fv, - (void*)item_getcheck_func_ARROW_LV1__Fv, - (void*)item_getcheck_func_ARROW_LV2__Fv, - (void*)item_getcheck_func_ARROW_LV3__Fv, - (void*)item_getcheck_func_noentry__Fv, - (void*)item_getcheck_func_LURE_ROD__Fv, - (void*)item_getcheck_func_BOMB_ARROW__Fv, - (void*)item_getcheck_func_HAWK_ARROW__Fv, - (void*)item_getcheck_func_BEE_ROD__Fv, - (void*)item_getcheck_func_JEWEL_ROD__Fv, - (void*)item_getcheck_func_WORM_ROD__Fv, - (void*)item_getcheck_func_JEWEL_BEE_ROD__Fv, - (void*)item_getcheck_func_JEWEL_WORM_ROD__Fv, - (void*)item_getcheck_func_EMPTY_BOTTLE__Fv, - (void*)item_getcheck_func_RED_BOTTLE__Fv, - (void*)item_getcheck_func_GREEN_BOTTLE__Fv, - (void*)item_getcheck_func_BLUE_BOTTLE__Fv, - (void*)item_getcheck_func_MILK_BOTTLE__Fv, - (void*)item_getcheck_func_HALF_MILK_BOTTLE__Fv, - (void*)item_getcheck_func_OIL_BOTTLE__Fv, - (void*)item_getcheck_func_WATER_BOTTLE__Fv, - (void*)item_getcheck_func_OIL_BOTTLE2__Fv, - (void*)item_getcheck_func_RED_BOTTLE2__Fv, - (void*)item_getcheck_func_UGLY_SOUP__Fv, - (void*)item_getcheck_func_HOT_SPRING__Fv, - (void*)item_getcheck_func_FAIRY_BOTTLE__Fv, - (void*)item_getcheck_func_HOT_SPRING2__Fv, - (void*)item_getcheck_func_OIL2__Fv, - (void*)item_getcheck_func_OIL__Fv, - (void*)item_getcheck_func_NORMAL_BOMB__Fv, - (void*)item_getcheck_func_WATER_BOMB__Fv, - (void*)item_getcheck_func_POKE_BOMB__Fv, - (void*)item_getcheck_func_FAIRY_DROP__Fv, - (void*)item_getcheck_func_WORM__Fv, - (void*)item_getcheck_func_DROP_BOTTLE__Fv, - (void*)item_getcheck_func_BEE_CHILD__Fv, - (void*)item_getcheck_func_CHUCHU_RARE__Fv, - (void*)item_getcheck_func_CHUCHU_RED__Fv, - (void*)item_getcheck_func_CHUCHU_BLUE__Fv, - (void*)item_getcheck_func_CHUCHU_GREEN__Fv, - (void*)item_getcheck_func_CHUCHU_YELLOW__Fv, - (void*)item_getcheck_func_CHUCHU_PURPLE__Fv, - (void*)item_getcheck_func_LV1_SOUP__Fv, - (void*)item_getcheck_func_LV2_SOUP__Fv, - (void*)item_getcheck_func_LV3_SOUP__Fv, - (void*)item_getcheck_func_LETTER__Fv, - (void*)item_getcheck_func_BILL__Fv, - (void*)item_getcheck_func_WOOD_STATUE__Fv, - (void*)item_getcheck_func_IRIAS_PENDANT__Fv, - (void*)item_getcheck_func_HORSE_FLUTE__Fv, - (void*)item_getcheck_func_noentry__Fv, - (void*)item_getcheck_func_noentry__Fv, - (void*)item_getcheck_func_noentry__Fv, - (void*)item_getcheck_func_noentry__Fv, - (void*)item_getcheck_func_noentry__Fv, - (void*)item_getcheck_func_noentry__Fv, - (void*)item_getcheck_func_noentry__Fv, - (void*)item_getcheck_func_noentry__Fv, - (void*)item_getcheck_func_noentry__Fv, - (void*)item_getcheck_func_noentry__Fv, - (void*)item_getcheck_func_noentry__Fv, - (void*)item_getcheck_func_RAFRELS_MEMO__Fv, - (void*)item_getcheck_func_ASHS_SCRIBBLING__Fv, - (void*)item_getcheck_func_noentry__Fv, - (void*)item_getcheck_func_noentry__Fv, - (void*)item_getcheck_func_noentry__Fv, - (void*)item_getcheck_func_noentry__Fv, - (void*)item_getcheck_func_noentry__Fv, - (void*)item_getcheck_func_noentry__Fv, - (void*)item_getcheck_func_noentry__Fv, - (void*)item_getcheck_func_noentry__Fv, - (void*)item_getcheck_func_noentry__Fv, - (void*)item_getcheck_func_noentry__Fv, - (void*)item_getcheck_func_CHUCHU_YELLOW2__Fv, - (void*)item_getcheck_func_OIL_BOTTLE3__Fv, - (void*)item_getcheck_func_SHOP_BEE_CHILD__Fv, - (void*)item_getcheck_func_CHUCHU_BLACK__Fv, - (void*)item_getcheck_func_LIGHT_DROP__Fv, - (void*)item_getcheck_func_DROP_CONTAINER__Fv, - (void*)item_getcheck_func_DROP_CONTAINER02__Fv, - (void*)item_getcheck_func_DROP_CONTAINER03__Fv, - (void*)item_getcheck_func_FILLED_CONTAINER__Fv, - (void*)item_getcheck_func_MIRROR_PIECE_2__Fv, - (void*)item_getcheck_func_MIRROR_PIECE_3__Fv, - (void*)item_getcheck_func_MIRROR_PIECE_4__Fv, - (void*)item_getcheck_func_noentry__Fv, - (void*)item_getcheck_func_noentry__Fv, - (void*)item_getcheck_func_noentry__Fv, - (void*)item_getcheck_func_noentry__Fv, - (void*)item_getcheck_func_noentry__Fv, - (void*)item_getcheck_func_noentry__Fv, - (void*)item_getcheck_func_noentry__Fv, - (void*)item_getcheck_func_noentry__Fv, - (void*)item_getcheck_func_SMELL_YELIA_POUCH__Fv, - (void*)item_getcheck_func_SMELL_PUMPKIN__Fv, - (void*)item_getcheck_func_SMELL_POH__Fv, - (void*)item_getcheck_func_SMELL_FISH__Fv, - (void*)item_getcheck_func_SMELL_CHILDREN__Fv, - (void*)item_getcheck_func_SMELL_MEDICINE__Fv, - (void*)item_getcheck_func_noentry__Fv, - (void*)item_getcheck_func_noentry__Fv, - (void*)item_getcheck_func_noentry__Fv, - (void*)item_getcheck_func_noentry__Fv, - (void*)item_getcheck_func_noentry__Fv, - (void*)item_getcheck_func_noentry__Fv, - (void*)item_getcheck_func_noentry__Fv, - (void*)item_getcheck_func_noentry__Fv, - (void*)item_getcheck_func_noentry__Fv, - (void*)item_getcheck_func_noentry__Fv, - (void*)item_getcheck_func_M_BEETLE__Fv, - (void*)item_getcheck_func_F_BEETLE__Fv, - (void*)item_getcheck_func_M_BUTTERFLY__Fv, - (void*)item_getcheck_func_F_BUTTERFLY__Fv, - (void*)item_getcheck_func_M_STAG_BEETLE__Fv, - (void*)item_getcheck_func_F_STAG_BEETLE__Fv, - (void*)item_getcheck_func_M_GRASSHOPPER__Fv, - (void*)item_getcheck_func_F_GRASSHOPPER__Fv, - (void*)item_getcheck_func_M_NANAFUSHI__Fv, - (void*)item_getcheck_func_F_NANAFUSHI__Fv, - (void*)item_getcheck_func_M_DANGOMUSHI__Fv, - (void*)item_getcheck_func_F_DANGOMUSHI__Fv, - (void*)item_getcheck_func_M_MANTIS__Fv, - (void*)item_getcheck_func_F_MANTIS__Fv, - (void*)item_getcheck_func_M_LADYBUG__Fv, - (void*)item_getcheck_func_F_LADYBUG__Fv, - (void*)item_getcheck_func_M_SNAIL__Fv, - (void*)item_getcheck_func_F_SNAIL__Fv, - (void*)item_getcheck_func_M_DRAGONFLY__Fv, - (void*)item_getcheck_func_F_DRAGONFLY__Fv, - (void*)item_getcheck_func_M_ANT__Fv, - (void*)item_getcheck_func_F_ANT__Fv, - (void*)item_getcheck_func_M_MAYFLY__Fv, - (void*)item_getcheck_func_F_MAYFLY__Fv, - (void*)item_getcheck_func_noentry__Fv, - (void*)item_getcheck_func_noentry__Fv, - (void*)item_getcheck_func_noentry__Fv, - (void*)item_getcheck_func_noentry__Fv, - (void*)item_getcheck_func_noentry__Fv, - (void*)item_getcheck_func_noentry__Fv, - (void*)item_getcheck_func_noentry__Fv, - (void*)item_getcheck_func_noentry__Fv, - (void*)item_getcheck_func_POU_SPIRIT__Fv, - (void*)item_getcheck_func_noentry__Fv, - (void*)item_getcheck_func_noentry__Fv, - (void*)item_getcheck_func_noentry__Fv, - (void*)item_getcheck_func_noentry__Fv, - (void*)item_getcheck_func_noentry__Fv, - (void*)item_getcheck_func_noentry__Fv, - (void*)item_getcheck_func_noentry__Fv, - (void*)item_getcheck_func_noentry__Fv, - (void*)item_getcheck_func_ANCIENT_DOCUMENT__Fv, - (void*)item_getcheck_func_AIR_LETTER__Fv, - (void*)item_getcheck_func_ANCIENT_DOCUMENT2__Fv, - (void*)item_getcheck_func_LV7_DUNGEON_EXIT__Fv, - (void*)item_getcheck_func_LINKS_SAVINGS__Fv, - (void*)item_getcheck_func_SMALL_KEY2__Fv, - (void*)item_getcheck_func_POU_FIRE1__Fv, - (void*)item_getcheck_func_POU_FIRE2__Fv, - (void*)item_getcheck_func_POU_FIRE3__Fv, - (void*)item_getcheck_func_POU_FIRE4__Fv, - (void*)item_getcheck_func_BOSSRIDER_KEY__Fv, - (void*)item_getcheck_func_TOMATO_PUREE__Fv, - (void*)item_getcheck_func_TASTE__Fv, - (void*)item_getcheck_func_LV5_BOSS_KEY__Fv, - (void*)item_getcheck_func_SURFBOARD__Fv, - (void*)item_getcheck_func_KANTERA2__Fv, - (void*)item_getcheck_func_L2_KEY_PIECES1__Fv, - (void*)item_getcheck_func_L2_KEY_PIECES2__Fv, - (void*)item_getcheck_func_L2_KEY_PIECES3__Fv, - (void*)item_getcheck_func_KEY_OF_CARAVAN__Fv, - (void*)item_getcheck_func_LV2_BOSS_KEY__Fv, - (void*)item_getcheck_func_KEY_OF_FILONE__Fv, - (void*)item_getcheck_func_noentry__Fv, +inline void getItemFunc(u8 i_no) { + dComIfGs_onItemFirstBit(i_no); + item_func_ptr[i_no](); +} + +void execItemGet(u8 item_id) { + getItemFunc(item_id); +} + +static s32 (*item_getcheck_func_ptr[256])() = { + item_getcheck_func_HEART, + item_getcheck_func_GREEN_RUPEE, + item_getcheck_func_BLUE_RUPEE, + item_getcheck_func_YELLOW_RUPEE, + item_getcheck_func_RED_RUPEE, + item_getcheck_func_PURPLE_RUPEE, + item_getcheck_func_ORANGE_RUPEE, + item_getcheck_func_SILVER_RUPEE, + item_getcheck_func_S_MAGIC, + item_getcheck_func_L_MAGIC, + item_getcheck_func_BOMB_5, + item_getcheck_func_BOMB_10, + item_getcheck_func_BOMB_20, + item_getcheck_func_BOMB_30, + item_getcheck_func_ARROW_10, + item_getcheck_func_ARROW_20, + item_getcheck_func_ARROW_30, + item_getcheck_func_ARROW_1, + item_getcheck_func_PACHINKO_SHOT, + item_getcheck_func_noentry, + item_getcheck_func_noentry, + item_getcheck_func_noentry, + item_getcheck_func_WATER_BOMB_5, + item_getcheck_func_WATER_BOMB_10, + item_getcheck_func_WATER_BOMB_20, + item_getcheck_func_WATER_BOMB_30, + item_getcheck_func_BOMB_INSECT_5, + item_getcheck_func_BOMB_INSECT_10, + item_getcheck_func_BOMB_INSECT_20, + item_getcheck_func_BOMB_INSECT_30, + item_getcheck_func_RECOVER_FAILY, + item_getcheck_func_TRIPLE_HEART, + item_getcheck_func_SMALL_KEY, + item_getcheck_func_KAKERA_HEART, + item_getcheck_func_UTUWA_HEART, + item_getcheck_func_MAP, + item_getcheck_func_COMPUS, + item_getcheck_func_DUNGEON_EXIT, + item_getcheck_func_BOSS_KEY, + item_getcheck_func_DUNGEON_BACK, + item_getcheck_func_SWORD, + item_getcheck_func_MASTER_SWORD, + item_getcheck_func_WOOD_SHIELD, + item_getcheck_func_SHIELD, + item_getcheck_func_HYLIA_SHIELD, + item_getcheck_func_TKS_LETTER, + item_getcheck_func_WEAR_CASUAL, + item_getcheck_func_WEAR_KOKIRI, + item_getcheck_func_ARMOR, + item_getcheck_func_WEAR_ZORA, + item_getcheck_func_MAGIC_LV1, + item_getcheck_func_DUNGEON_EXIT_2, + item_getcheck_func_WALLET_LV1, + item_getcheck_func_WALLET_LV2, + item_getcheck_func_WALLET_LV3, + item_getcheck_func_noentry, + item_getcheck_func_noentry, + item_getcheck_func_noentry, + item_getcheck_func_noentry, + item_getcheck_func_noentry, + item_getcheck_func_noentry, + item_getcheck_func_ZORAS_JEWEL, + item_getcheck_func_HAWK_EYE, + item_getcheck_func_WOOD_STICK, + item_getcheck_func_BOOMERANG, + item_getcheck_func_SPINNER, + item_getcheck_func_IRONBALL, + item_getcheck_func_BOW, + item_getcheck_func_HOOKSHOT, + item_getcheck_func_HVY_BOOTS, + item_getcheck_func_COPY_ROD, + item_getcheck_func_W_HOOKSHOT, + item_getcheck_func_KANTERA, + item_getcheck_func_LIGHT_SWORD, + item_getcheck_func_FISHING_ROD_1, + item_getcheck_func_PACHINKO, + item_getcheck_func_COPY_ROD_2, + item_getcheck_func_noentry, + item_getcheck_func_noentry, + item_getcheck_func_BOMB_BAG_LV2, + item_getcheck_func_BOMB_BAG_LV1, + item_getcheck_func_BOMB_IN_BAG, + item_getcheck_func_noentry, + item_getcheck_func_LIGHT_ARROW, + item_getcheck_func_ARROW_LV1, + item_getcheck_func_ARROW_LV2, + item_getcheck_func_ARROW_LV3, + item_getcheck_func_noentry, + item_getcheck_func_LURE_ROD, + item_getcheck_func_BOMB_ARROW, + item_getcheck_func_HAWK_ARROW, + item_getcheck_func_BEE_ROD, + item_getcheck_func_JEWEL_ROD, + item_getcheck_func_WORM_ROD, + item_getcheck_func_JEWEL_BEE_ROD, + item_getcheck_func_JEWEL_WORM_ROD, + item_getcheck_func_EMPTY_BOTTLE, + item_getcheck_func_RED_BOTTLE, + item_getcheck_func_GREEN_BOTTLE, + item_getcheck_func_BLUE_BOTTLE, + item_getcheck_func_MILK_BOTTLE, + item_getcheck_func_HALF_MILK_BOTTLE, + item_getcheck_func_OIL_BOTTLE, + item_getcheck_func_WATER_BOTTLE, + item_getcheck_func_OIL_BOTTLE2, + item_getcheck_func_RED_BOTTLE2, + item_getcheck_func_UGLY_SOUP, + item_getcheck_func_HOT_SPRING, + item_getcheck_func_FAIRY_BOTTLE, + item_getcheck_func_HOT_SPRING2, + item_getcheck_func_OIL2, + item_getcheck_func_OIL, + item_getcheck_func_NORMAL_BOMB, + item_getcheck_func_WATER_BOMB, + item_getcheck_func_POKE_BOMB, + item_getcheck_func_FAIRY_DROP, + item_getcheck_func_WORM, + item_getcheck_func_DROP_BOTTLE, + item_getcheck_func_BEE_CHILD, + item_getcheck_func_CHUCHU_RARE, + item_getcheck_func_CHUCHU_RED, + item_getcheck_func_CHUCHU_BLUE, + item_getcheck_func_CHUCHU_GREEN, + item_getcheck_func_CHUCHU_YELLOW, + item_getcheck_func_CHUCHU_PURPLE, + item_getcheck_func_LV1_SOUP, + item_getcheck_func_LV2_SOUP, + item_getcheck_func_LV3_SOUP, + item_getcheck_func_LETTER, + item_getcheck_func_BILL, + item_getcheck_func_WOOD_STATUE, + item_getcheck_func_IRIAS_PENDANT, + item_getcheck_func_HORSE_FLUTE, + item_getcheck_func_noentry, + item_getcheck_func_noentry, + item_getcheck_func_noentry, + item_getcheck_func_noentry, + item_getcheck_func_noentry, + item_getcheck_func_noentry, + item_getcheck_func_noentry, + item_getcheck_func_noentry, + item_getcheck_func_noentry, + item_getcheck_func_noentry, + item_getcheck_func_noentry, + item_getcheck_func_RAFRELS_MEMO, + item_getcheck_func_ASHS_SCRIBBLING, + item_getcheck_func_noentry, + item_getcheck_func_noentry, + item_getcheck_func_noentry, + item_getcheck_func_noentry, + item_getcheck_func_noentry, + item_getcheck_func_noentry, + item_getcheck_func_noentry, + item_getcheck_func_noentry, + item_getcheck_func_noentry, + item_getcheck_func_noentry, + item_getcheck_func_CHUCHU_YELLOW2, + item_getcheck_func_OIL_BOTTLE3, + item_getcheck_func_SHOP_BEE_CHILD, + item_getcheck_func_CHUCHU_BLACK, + item_getcheck_func_LIGHT_DROP, + item_getcheck_func_DROP_CONTAINER, + item_getcheck_func_DROP_CONTAINER02, + item_getcheck_func_DROP_CONTAINER03, + item_getcheck_func_FILLED_CONTAINER, + item_getcheck_func_MIRROR_PIECE_2, + item_getcheck_func_MIRROR_PIECE_3, + item_getcheck_func_MIRROR_PIECE_4, + item_getcheck_func_noentry, + item_getcheck_func_noentry, + item_getcheck_func_noentry, + item_getcheck_func_noentry, + item_getcheck_func_noentry, + item_getcheck_func_noentry, + item_getcheck_func_noentry, + item_getcheck_func_noentry, + item_getcheck_func_SMELL_YELIA_POUCH, + item_getcheck_func_SMELL_PUMPKIN, + item_getcheck_func_SMELL_POH, + item_getcheck_func_SMELL_FISH, + item_getcheck_func_SMELL_CHILDREN, + item_getcheck_func_SMELL_MEDICINE, + item_getcheck_func_noentry, + item_getcheck_func_noentry, + item_getcheck_func_noentry, + item_getcheck_func_noentry, + item_getcheck_func_noentry, + item_getcheck_func_noentry, + item_getcheck_func_noentry, + item_getcheck_func_noentry, + item_getcheck_func_noentry, + item_getcheck_func_noentry, + item_getcheck_func_M_BEETLE, + item_getcheck_func_F_BEETLE, + item_getcheck_func_M_BUTTERFLY, + item_getcheck_func_F_BUTTERFLY, + item_getcheck_func_M_STAG_BEETLE, + item_getcheck_func_F_STAG_BEETLE, + item_getcheck_func_M_GRASSHOPPER, + item_getcheck_func_F_GRASSHOPPER, + item_getcheck_func_M_NANAFUSHI, + item_getcheck_func_F_NANAFUSHI, + item_getcheck_func_M_DANGOMUSHI, + item_getcheck_func_F_DANGOMUSHI, + item_getcheck_func_M_MANTIS, + item_getcheck_func_F_MANTIS, + item_getcheck_func_M_LADYBUG, + item_getcheck_func_F_LADYBUG, + item_getcheck_func_M_SNAIL, + item_getcheck_func_F_SNAIL, + item_getcheck_func_M_DRAGONFLY, + item_getcheck_func_F_DRAGONFLY, + item_getcheck_func_M_ANT, + item_getcheck_func_F_ANT, + item_getcheck_func_M_MAYFLY, + item_getcheck_func_F_MAYFLY, + item_getcheck_func_noentry, + item_getcheck_func_noentry, + item_getcheck_func_noentry, + item_getcheck_func_noentry, + item_getcheck_func_noentry, + item_getcheck_func_noentry, + item_getcheck_func_noentry, + item_getcheck_func_noentry, + item_getcheck_func_POU_SPIRIT, + item_getcheck_func_noentry, + item_getcheck_func_noentry, + item_getcheck_func_noentry, + item_getcheck_func_noentry, + item_getcheck_func_noentry, + item_getcheck_func_noentry, + item_getcheck_func_noentry, + item_getcheck_func_noentry, + item_getcheck_func_ANCIENT_DOCUMENT, + item_getcheck_func_AIR_LETTER, + item_getcheck_func_ANCIENT_DOCUMENT2, + item_getcheck_func_LV7_DUNGEON_EXIT, + item_getcheck_func_LINKS_SAVINGS, + item_getcheck_func_SMALL_KEY2, + item_getcheck_func_POU_FIRE1, + item_getcheck_func_POU_FIRE2, + item_getcheck_func_POU_FIRE3, + item_getcheck_func_POU_FIRE4, + item_getcheck_func_BOSSRIDER_KEY, + item_getcheck_func_TOMATO_PUREE, + item_getcheck_func_TASTE, + item_getcheck_func_LV5_BOSS_KEY, + item_getcheck_func_SURFBOARD, + item_getcheck_func_KANTERA2, + item_getcheck_func_L2_KEY_PIECES1, + item_getcheck_func_L2_KEY_PIECES2, + item_getcheck_func_L2_KEY_PIECES3, + item_getcheck_func_KEY_OF_CARAVAN, + item_getcheck_func_LV2_BOSS_KEY, + item_getcheck_func_KEY_OF_FILONE, + item_getcheck_func_noentry, }; -/* 80097EE0-80097F2C 092820 004C+00 1/1 14/14 16/16 .text checkItemGet__FUci */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void checkItemGet(u8 param_0, int param_1) { - nofralloc -#include "asm/d/d_item/checkItemGet__FUci.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80452BD8-80452BDC 0011D8 0004+00 1/1 0/0 0/0 .sdata2 @3655 */ -SECTION_SDATA2 static f32 lit_3655 = 4.0f; - -/* 80097F2C-80097F50 09286C 0024+00 1/0 0/0 0/0 .text item_func_HEART__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_HEART() { - nofralloc -#include "asm/d/d_item/item_func_HEART__Fv.s" -} -#pragma pop - -/* 80097F50-80097F68 092890 0018+00 1/0 0/0 0/0 .text item_func_GREEN_RUPEE__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_GREEN_RUPEE() { - nofralloc -#include "asm/d/d_item/item_func_GREEN_RUPEE__Fv.s" -} -#pragma pop - -/* 80097F68-80097F80 0928A8 0018+00 1/0 0/0 0/0 .text item_func_BLUE_RUPEE__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_BLUE_RUPEE() { - nofralloc -#include "asm/d/d_item/item_func_BLUE_RUPEE__Fv.s" -} -#pragma pop - -/* 80097F80-80097F98 0928C0 0018+00 1/0 0/0 0/0 .text item_func_YELLOW_RUPEE__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_YELLOW_RUPEE() { - nofralloc -#include "asm/d/d_item/item_func_YELLOW_RUPEE__Fv.s" -} -#pragma pop - -/* 80097F98-80097FB0 0928D8 0018+00 1/0 0/0 0/0 .text item_func_RED_RUPEE__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_RED_RUPEE() { - nofralloc -#include "asm/d/d_item/item_func_RED_RUPEE__Fv.s" -} -#pragma pop - -/* 80097FB0-80097FC8 0928F0 0018+00 1/0 0/0 0/0 .text item_func_PURPLE_RUPEE__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_PURPLE_RUPEE() { - nofralloc -#include "asm/d/d_item/item_func_PURPLE_RUPEE__Fv.s" -} -#pragma pop - -/* 80097FC8-80097FE0 092908 0018+00 1/0 0/0 0/0 .text item_func_ORANGE_RUPEE__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_ORANGE_RUPEE() { - nofralloc -#include "asm/d/d_item/item_func_ORANGE_RUPEE__Fv.s" -} -#pragma pop - -/* 80097FE0-80097FF8 092920 0018+00 1/0 0/0 0/0 .text item_func_SILVER_RUPEE__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_SILVER_RUPEE() { - nofralloc -#include "asm/d/d_item/item_func_SILVER_RUPEE__Fv.s" -} -#pragma pop - -/* 80097FF8-80098010 092938 0018+00 1/0 0/0 0/0 .text item_func_S_MAGIC__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_S_MAGIC() { - nofralloc -#include "asm/d/d_item/item_func_S_MAGIC__Fv.s" -} -#pragma pop - -/* 80098010-80098028 092950 0018+00 1/0 0/0 0/0 .text item_func_L_MAGIC__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_L_MAGIC() { - nofralloc -#include "asm/d/d_item/item_func_L_MAGIC__Fv.s" -} -#pragma pop - -/* 80098028-80098050 092968 0028+00 1/0 0/0 0/0 .text item_func_BOMB_5__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_BOMB_5() { - nofralloc -#include "asm/d/d_item/item_func_BOMB_5__Fv.s" -} -#pragma pop - -/* 80098050-80098078 092990 0028+00 1/0 0/0 0/0 .text item_func_BOMB_10__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_BOMB_10() { - nofralloc -#include "asm/d/d_item/item_func_BOMB_10__Fv.s" -} -#pragma pop - -/* 80098078-800980A0 0929B8 0028+00 1/0 0/0 0/0 .text item_func_BOMB_20__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_BOMB_20() { - nofralloc -#include "asm/d/d_item/item_func_BOMB_20__Fv.s" -} -#pragma pop - -/* 800980A0-800980C8 0929E0 0028+00 1/0 0/0 0/0 .text item_func_BOMB_30__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_BOMB_30() { - nofralloc -#include "asm/d/d_item/item_func_BOMB_30__Fv.s" -} -#pragma pop - -/* 800980C8-800980E0 092A08 0018+00 1/0 0/0 0/0 .text item_func_ARROW_10__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_ARROW_10() { - nofralloc -#include "asm/d/d_item/item_func_ARROW_10__Fv.s" -} -#pragma pop - -/* 800980E0-800980F8 092A20 0018+00 1/0 0/0 0/0 .text item_func_ARROW_20__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_ARROW_20() { - nofralloc -#include "asm/d/d_item/item_func_ARROW_20__Fv.s" -} -#pragma pop - -/* 800980F8-80098110 092A38 0018+00 1/0 0/0 0/0 .text item_func_ARROW_30__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_ARROW_30() { - nofralloc -#include "asm/d/d_item/item_func_ARROW_30__Fv.s" -} -#pragma pop - -/* 80098110-80098128 092A50 0018+00 1/0 0/0 0/0 .text item_func_ARROW_1__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_ARROW_1() { - nofralloc -#include "asm/d/d_item/item_func_ARROW_1__Fv.s" -} -#pragma pop - -/* 80098128-80098140 092A68 0018+00 1/0 0/0 0/0 .text item_func_PACHINKO_SHOT__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_PACHINKO_SHOT() { - nofralloc -#include "asm/d/d_item/item_func_PACHINKO_SHOT__Fv.s" -} -#pragma pop - -/* 80098140-80098168 092A80 0028+00 1/0 0/0 0/0 .text item_func_WATER_BOMB_5__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_WATER_BOMB_5() { - nofralloc -#include "asm/d/d_item/item_func_WATER_BOMB_5__Fv.s" -} -#pragma pop - -/* 80098168-80098190 092AA8 0028+00 1/0 0/0 0/0 .text item_func_WATER_BOMB_10__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_WATER_BOMB_10() { - nofralloc -#include "asm/d/d_item/item_func_WATER_BOMB_10__Fv.s" -} -#pragma pop - -/* 80098190-800981B8 092AD0 0028+00 1/0 0/0 0/0 .text item_func_WATER_BOMB_20__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_WATER_BOMB_20() { - nofralloc -#include "asm/d/d_item/item_func_WATER_BOMB_20__Fv.s" -} -#pragma pop - -/* 800981B8-800981E0 092AF8 0028+00 1/0 0/0 0/0 .text item_func_WATER_BOMB_30__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_WATER_BOMB_30() { - nofralloc -#include "asm/d/d_item/item_func_WATER_BOMB_30__Fv.s" -} -#pragma pop - -/* 800981E0-80098208 092B20 0028+00 1/0 0/0 0/0 .text item_func_BOMB_INSECT_5__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_BOMB_INSECT_5() { - nofralloc -#include "asm/d/d_item/item_func_BOMB_INSECT_5__Fv.s" -} -#pragma pop - -/* 80098208-80098230 092B48 0028+00 1/0 0/0 0/0 .text item_func_BOMB_INSECT_10__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_BOMB_INSECT_10() { - nofralloc -#include "asm/d/d_item/item_func_BOMB_INSECT_10__Fv.s" -} -#pragma pop - -/* 80098230-80098258 092B70 0028+00 1/0 0/0 0/0 .text item_func_BOMB_INSECT_20__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_BOMB_INSECT_20() { - nofralloc -#include "asm/d/d_item/item_func_BOMB_INSECT_20__Fv.s" -} -#pragma pop - -/* 80098258-8009825C 092B98 0004+00 1/0 0/0 0/0 .text item_func_BOMB_INSECT_30__Fv */ -static void item_func_BOMB_INSECT_30() { - /* empty function */ +inline s32 getCheckItemFunc(u8 i_no) { + return item_getcheck_func_ptr[i_no](); } -/* ############################################################################################## */ -/* 80452BDC-80452BE0 0011DC 0004+00 1/1 0/0 0/0 .sdata2 @3794 */ -SECTION_SDATA2 static f32 lit_3794 = 32.0f; - -/* 8009825C-80098280 092B9C 0024+00 1/0 0/0 0/0 .text item_func_RECOVER_FAILY__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_RECOVER_FAILY() { - nofralloc -#include "asm/d/d_item/item_func_RECOVER_FAILY__Fv.s" -} -#pragma pop - -/* 80098280-80098284 092BC0 0004+00 1/0 0/0 0/0 .text item_func_TRIPLE_HEART__Fv */ -static void item_func_TRIPLE_HEART() { - /* empty function */ +s32 checkItemGet(u8 item_id, int param_2) { + s32 checkItem = getCheckItemFunc(item_id); + if (checkItem == -1) { + checkItem = param_2; + } + return checkItem; } -/* 80098284-8009829C 092BC4 0018+00 1/0 0/0 0/0 .text item_func_SMALL_KEY__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_SMALL_KEY() { - nofralloc -#include "asm/d/d_item/item_func_SMALL_KEY__Fv.s" -} -#pragma pop - -/* 8009829C-800982B4 092BDC 0018+00 1/0 0/0 0/0 .text item_func_KAKERA_HEART__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_KAKERA_HEART() { - nofralloc -#include "asm/d/d_item/item_func_KAKERA_HEART__Fv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80452BE0-80452BE8 0011E0 0008+00 1/1 0/0 0/0 .sdata2 @3828 */ -SECTION_SDATA2 static f64 lit_3828 = 4503599627370496.0 /* cast u32 to float */; - -/* 800982B4-80098344 092BF4 0090+00 1/0 0/0 0/0 .text item_func_UTUWA_HEART__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_UTUWA_HEART() { - nofralloc -#include "asm/d/d_item/item_func_UTUWA_HEART__Fv.s" -} -#pragma pop - -/* 80098344-80098374 092C84 0030+00 1/0 0/0 0/0 .text item_func_MAP__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_MAP() { - nofralloc -#include "asm/d/d_item/item_func_MAP__Fv.s" -} -#pragma pop - -/* 80098374-800983A4 092CB4 0030+00 1/0 0/0 0/0 .text item_func_COMPUS__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_COMPUS() { - nofralloc -#include "asm/d/d_item/item_func_COMPUS__Fv.s" -} -#pragma pop - -/* 800983A4-800983EC 092CE4 0048+00 1/0 0/0 0/0 .text item_func_DUNGEON_EXIT__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_DUNGEON_EXIT() { - nofralloc -#include "asm/d/d_item/item_func_DUNGEON_EXIT__Fv.s" -} -#pragma pop - -/* 800983EC-8009841C 092D2C 0030+00 1/0 0/0 0/0 .text item_func_BOSS_KEY__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_BOSS_KEY() { - nofralloc -#include "asm/d/d_item/item_func_BOSS_KEY__Fv.s" -} -#pragma pop - -/* 8009841C-80098450 092D5C 0034+00 1/0 0/0 0/0 .text item_func_DUNGEON_BACK__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_DUNGEON_BACK() { - nofralloc -#include "asm/d/d_item/item_func_DUNGEON_BACK__Fv.s" -} -#pragma pop - -/* 80098450-8009848C 092D90 003C+00 1/0 0/0 0/0 .text item_func_SWORD__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_SWORD() { - nofralloc -#include "asm/d/d_item/item_func_SWORD__Fv.s" -} -#pragma pop - -/* 8009848C-800984C8 092DCC 003C+00 1/0 0/0 0/0 .text item_func_MASTER_SWORD__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_MASTER_SWORD() { - nofralloc -#include "asm/d/d_item/item_func_MASTER_SWORD__Fv.s" -} -#pragma pop - -/* 800984C8-80098504 092E08 003C+00 1/0 0/0 0/0 .text item_func_WOOD_SHIELD__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_WOOD_SHIELD() { - nofralloc -#include "asm/d/d_item/item_func_WOOD_SHIELD__Fv.s" -} -#pragma pop - -/* 80098504-80098508 092E44 0004+00 1/0 0/0 0/0 .text item_func_SHIELD__Fv */ -static void item_func_SHIELD() { - /* empty function */ +void item_func_HEART() { + dComIfGp_setItemLifeCount(4.0f, 0); } -/* 80098508-8009850C 092E48 0004+00 1/0 0/0 0/0 .text item_func_HYLIA_SHIELD__Fv */ -static void item_func_HYLIA_SHIELD() { - /* empty function */ +void item_func_GREEN_RUPEE() { + dComIfGp_setItemRupeeCount(1); } -/* 8009850C-80098540 092E4C 0034+00 1/0 0/0 0/0 .text item_func_TKS_LETTER__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_TKS_LETTER() { - nofralloc -#include "asm/d/d_item/item_func_TKS_LETTER__Fv.s" -} -#pragma pop - -/* 80098540-80098564 092E80 0024+00 1/0 0/0 0/0 .text item_func_WEAR_CASUAL__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_WEAR_CASUAL() { - nofralloc -#include "asm/d/d_item/item_func_WEAR_CASUAL__Fv.s" -} -#pragma pop - -/* 80098564-800985A0 092EA4 003C+00 1/0 0/0 0/0 .text item_func_WEAR_KOKIRI__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_WEAR_KOKIRI() { - nofralloc -#include "asm/d/d_item/item_func_WEAR_KOKIRI__Fv.s" -} -#pragma pop - -/* 800985A0-800985A4 092EE0 0004+00 1/0 0/0 0/0 .text item_func_ARMOR__Fv */ -static void item_func_ARMOR() { - /* empty function */ +void item_func_BLUE_RUPEE() { + dComIfGp_setItemRupeeCount(5); } -/* 800985A4-800985A8 092EE4 0004+00 1/0 0/0 0/0 .text item_func_WEAR_ZORA__Fv */ -static void item_func_WEAR_ZORA() { - /* empty function */ +void item_func_YELLOW_RUPEE() { + dComIfGp_setItemRupeeCount(10); } -/* 800985A8-800985CC 092EE8 0024+00 1/0 0/0 0/0 .text item_func_MAGIC_LV1__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_MAGIC_LV1() { - nofralloc -#include "asm/d/d_item/item_func_MAGIC_LV1__Fv.s" +void item_func_RED_RUPEE() { + dComIfGp_setItemRupeeCount(20); } -#pragma pop -/* 800985CC-80098600 092F0C 0034+00 1/0 0/0 0/0 .text item_func_DUNGEON_EXIT_2__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_DUNGEON_EXIT_2() { - nofralloc -#include "asm/d/d_item/item_func_DUNGEON_EXIT_2__Fv.s" +void item_func_PURPLE_RUPEE() { + dComIfGp_setItemRupeeCount(50); } -#pragma pop -/* 80098600-80098614 092F40 0014+00 1/0 0/0 0/0 .text item_func_WALLET_LV1__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_WALLET_LV1() { - nofralloc -#include "asm/d/d_item/item_func_WALLET_LV1__Fv.s" +void item_func_ORANGE_RUPEE() { + dComIfGp_setItemRupeeCount(100); } -#pragma pop -/* 80098614-80098628 092F54 0014+00 1/0 0/0 0/0 .text item_func_WALLET_LV2__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_WALLET_LV2() { - nofralloc -#include "asm/d/d_item/item_func_WALLET_LV2__Fv.s" +void item_func_SILVER_RUPEE() { + dComIfGp_setItemRupeeCount(200); } -#pragma pop -/* 80098628-8009863C 092F68 0014+00 1/0 0/0 0/0 .text item_func_WALLET_LV3__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_WALLET_LV3() { - nofralloc -#include "asm/d/d_item/item_func_WALLET_LV3__Fv.s" +void item_func_S_MAGIC() { + dComIfGp_setItemMagicCount(4); } -#pragma pop -/* 8009863C-80098690 092F7C 0054+00 1/0 0/0 0/0 .text item_func_ZORAS_JEWEL__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_ZORAS_JEWEL() { - nofralloc -#include "asm/d/d_item/item_func_ZORAS_JEWEL__Fv.s" +void item_func_L_MAGIC() { + dComIfGp_setItemMagicCount(8); } -#pragma pop -/* 80098690-800986C4 092FD0 0034+00 1/0 0/0 0/0 .text item_func_HAWK_EYE__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_HAWK_EYE() { - nofralloc -#include "asm/d/d_item/item_func_HAWK_EYE__Fv.s" +void item_func_BOMB_5() { + addBombCount(NORMAL_BOMB, 5); +} + +void item_func_BOMB_10() { + addBombCount(NORMAL_BOMB, 10); +} + +void item_func_BOMB_20() { + addBombCount(NORMAL_BOMB, 20); +} + +void item_func_BOMB_30() { + addBombCount(NORMAL_BOMB, 30); +} + +void item_func_ARROW_10() { + dComIfGp_setItemArrowNumCount(10); +} + +void item_func_ARROW_20() { + dComIfGp_setItemArrowNumCount(20); +} + +void item_func_ARROW_30() { + dComIfGp_setItemArrowNumCount(30); +} + +void item_func_ARROW_1() { + dComIfGp_setItemArrowNumCount(1); +} + +void item_func_PACHINKO_SHOT() { + dComIfGp_setItemPachinkoNumCount(50); +} + +void item_func_WATER_BOMB_5() { + addBombCount(WATER_BOMB, 5); +} + +void item_func_WATER_BOMB_10() { + addBombCount(WATER_BOMB, 10); +} + +void item_func_WATER_BOMB_20() { + addBombCount(WATER_BOMB, 15); +} + +void item_func_WATER_BOMB_30() { + addBombCount(WATER_BOMB, 3); +} + +void item_func_BOMB_INSECT_5() { + addBombCount(POKE_BOMB, 5); +} + +void item_func_BOMB_INSECT_10() { + addBombCount(POKE_BOMB, 10); +} + +void item_func_BOMB_INSECT_20() { + addBombCount(POKE_BOMB, 3); +} + +void item_func_BOMB_INSECT_30() {} + +void item_func_RECOVER_FAILY() { + dComIfGp_setItemLifeCount(32.0f, 0); +} + +void item_func_TRIPLE_HEART() {} + +void item_func_SMALL_KEY() { + dComIfGp_setItemKeyNumCount(1); +} + +void item_func_KAKERA_HEART() { + dComIfGp_setItemMaxLifeCount(1); +} + +void item_func_UTUWA_HEART() { + dComIfGp_setItemMaxLifeCount(5); + + f32 max_life = dComIfGs_getMaxLifeGauge(); + dComIfGp_setItemLifeCount(max_life, 0); + + stage_stag_info_class* stag_info = dComIfGp_getStageStagInfo(); + int tmp = dStage_stagInfo_GetSaveTbl(stag_info); + dComIfGs_onStageLife(); +} + +void item_func_MAP() { + dComIfGs_onDungeonItemMap(); +} + +void item_func_COMPUS() { + dComIfGs_onDungeonItemCompass(); +} + +void item_func_DUNGEON_EXIT() { + dComIfGs_onDungeonItemWarp(); + dComIfGs_setItem(SLOT_18, DUNGEON_EXIT); +} + +void item_func_BOSS_KEY() { + dComIfGs_onDungeonItemBossKey(); +} + +void item_func_DUNGEON_BACK() { + dComIfGs_setItem(SLOT_18, DUNGEON_BACK); +} + +void item_func_SWORD() { + dComIfGs_setCollectSword(COLLECT_ORDON_SWORD); + dComIfGs_setSelectEquipSword__FUc(SWORD); +} + +void item_func_MASTER_SWORD() { + dComIfGs_setCollectSword(COLLECT_MASTER_SWORD); + dComIfGs_setSelectEquipSword__FUc(MASTER_SWORD); +} + +void item_func_WOOD_SHIELD() { + dComIfGs_setCollectShield(COLLECT_WOODEN_SHIELD); + dComIfGs_setSelectEquipShield__FUc(WOOD_SHIELD); +} + +void item_func_SHIELD() {} + +void item_func_HYLIA_SHIELD() {} + +void item_func_TKS_LETTER() { + dComIfGs_setItem(SLOT_18, TKS_LETTER); +} + +void item_func_WEAR_CASUAL() { + dComIfGs_setSelectEquipClothes(WEARS_CASUAL); +} + +void item_func_WEAR_KOKIRI() { + dComIfGs_setCollectClothes(KOKIRI_CLOTHES_FLAG); + dComIfGs_setSelectEquipClothes(WEAR_KOKIRI); +} + +void item_func_ARMOR() {} + +void item_func_WEAR_ZORA() {} + +void item_func_MAGIC_LV1() { + dComIfGp_setItemMagicCount(16); + dComIfGp_setItemMaxMagicCount(16); +} + +void item_func_DUNGEON_EXIT_2() { + dComIfGs_setItem(SLOT_18, DUNGEON_EXIT); +} + +void item_func_WALLET_LV1() { + dComIfGs_setWalletSize(WALLET); +} + +void item_func_WALLET_LV2() { + dComIfGs_setWalletSize(BIG_WALLET); +} + +void item_func_WALLET_LV3() { + dComIfGs_setWalletSize(GIANT_WALLET); +} + +void item_func_ZORAS_JEWEL() { + int checkFishingRod; + + checkFishingRod = item_getcheck_func_FISHING_ROD_1(); + if (checkFishingRod != 0) { + dComIfGs_setRodTypeLevelUp(); + } else { + dComIfGs_setItem(SLOT_20, ZORAS_JEWEL); + } +} + +void item_func_HAWK_EYE() { + dComIfGs_setItem(SLOT_5, HAWK_EYE); } -#pragma pop /* 800986C4-80098718 093004 0054+00 1/0 0/0 0/0 .text item_func_WOOD_STICK__Fv */ +// load instructions are switched +#ifdef NONMATCHING +void item_func_WOOD_STICK() { + dComIfGs_setCollectSword(COLLECT_WOODEN_SWORD); + dComIfGs_setSelectEquipSword__FUc(WOOD_STICK); + + s8 stayNo = dComIfGp_roomControl_getStayNo(); + dComIfGs_onSwitch(28, stayNo); // wrong order +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void item_func_WOOD_STICK() { +asm void item_func_WOOD_STICK() { nofralloc #include "asm/d/d_item/item_func_WOOD_STICK__Fv.s" } #pragma pop +#endif -/* 80098718-8009874C 093058 0034+00 1/0 0/0 0/0 .text item_func_BOOMERANG__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_BOOMERANG() { - nofralloc -#include "asm/d/d_item/item_func_BOOMERANG__Fv.s" -} -#pragma pop - -/* 8009874C-80098780 09308C 0034+00 1/0 0/0 0/0 .text item_func_SPINNER__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_SPINNER() { - nofralloc -#include "asm/d/d_item/item_func_SPINNER__Fv.s" -} -#pragma pop - -/* 80098780-800987B4 0930C0 0034+00 1/0 0/0 0/0 .text item_func_IRONBALL__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_IRONBALL() { - nofralloc -#include "asm/d/d_item/item_func_IRONBALL__Fv.s" -} -#pragma pop - -/* 800987B4-800987FC 0930F4 0048+00 1/0 0/0 0/0 .text item_func_BOW__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_BOW() { - nofralloc -#include "asm/d/d_item/item_func_BOW__Fv.s" -} -#pragma pop - -/* 800987FC-80098830 09313C 0034+00 1/0 0/0 0/0 .text item_func_HOOKSHOT__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_HOOKSHOT() { - nofralloc -#include "asm/d/d_item/item_func_HOOKSHOT__Fv.s" -} -#pragma pop - -/* 80098830-80098864 093170 0034+00 1/0 0/0 0/0 .text item_func_HVY_BOOTS__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_HVY_BOOTS() { - nofralloc -#include "asm/d/d_item/item_func_HVY_BOOTS__Fv.s" -} -#pragma pop - -/* 80098864-80098898 0931A4 0034+00 1/0 0/0 0/0 .text item_func_COPY_ROD__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_COPY_ROD() { - nofralloc -#include "asm/d/d_item/item_func_COPY_ROD__Fv.s" -} -#pragma pop - -/* 80098898-800988E8 0931D8 0050+00 1/0 0/0 0/0 .text item_func_W_HOOKSHOT__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_W_HOOKSHOT() { - nofralloc -#include "asm/d/d_item/item_func_W_HOOKSHOT__Fv.s" -} -#pragma pop - -/* 800988E8-80098928 093228 0040+00 1/0 0/0 0/0 .text item_func_KANTERA__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_KANTERA() { - nofralloc -#include "asm/d/d_item/item_func_KANTERA__Fv.s" -} -#pragma pop - -/* 80098928-80098968 093268 0040+00 1/0 0/0 0/0 .text item_func_LIGHT_SWORD__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_LIGHT_SWORD() { - nofralloc -#include "asm/d/d_item/item_func_LIGHT_SWORD__Fv.s" -} -#pragma pop - -/* 80098968-8009899C 0932A8 0034+00 1/0 0/0 0/0 .text item_func_FISHING_ROD_1__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_FISHING_ROD_1() { - nofralloc -#include "asm/d/d_item/item_func_FISHING_ROD_1__Fv.s" -} -#pragma pop - -/* 8009899C-800989DC 0932DC 0040+00 1/0 0/0 0/0 .text item_func_PACHINKO__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_PACHINKO() { - nofralloc -#include "asm/d/d_item/item_func_PACHINKO__Fv.s" -} -#pragma pop - -/* 800989DC-80098A10 09331C 0034+00 1/0 0/0 0/0 .text item_func_COPY_ROD_2__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_COPY_ROD_2() { - nofralloc -#include "asm/d/d_item/item_func_COPY_ROD_2__Fv.s" -} -#pragma pop - -/* 80098A10-80098A14 093350 0004+00 1/0 0/0 0/0 .text item_func_BOMB_BAG_LV2__Fv */ -static void item_func_BOMB_BAG_LV2() { - /* empty function */ -} - -/* 80098A14-80098A48 093354 0034+00 1/0 0/0 0/0 .text item_func_BOMB_BAG_LV1__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_BOMB_BAG_LV1() { - nofralloc -#include "asm/d/d_item/item_func_BOMB_BAG_LV1__Fv.s" -} -#pragma pop - -/* 80098A48-80098A7C 093388 0034+00 1/0 0/0 0/0 .text item_func_BOMB_IN_BAG__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_BOMB_IN_BAG() { - nofralloc -#include "asm/d/d_item/item_func_BOMB_IN_BAG__Fv.s" -} -#pragma pop - -/* 80098A7C-80098AB0 0933BC 0034+00 1/0 0/0 0/0 .text item_func_LIGHT_ARROW__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_LIGHT_ARROW() { - nofralloc -#include "asm/d/d_item/item_func_LIGHT_ARROW__Fv.s" -} -#pragma pop - -/* 80098AB0-80098AC8 0933F0 0018+00 1/0 0/0 0/0 .text item_func_ARROW_LV1__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_ARROW_LV1() { - nofralloc -#include "asm/d/d_item/item_func_ARROW_LV1__Fv.s" -} -#pragma pop - -/* 80098AC8-80098AE0 093408 0018+00 1/0 0/0 0/0 .text item_func_ARROW_LV2__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_ARROW_LV2() { - nofralloc -#include "asm/d/d_item/item_func_ARROW_LV2__Fv.s" -} -#pragma pop - -/* 80098AE0-80098AF8 093420 0018+00 1/0 0/0 0/0 .text item_func_ARROW_LV3__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_ARROW_LV3() { - nofralloc -#include "asm/d/d_item/item_func_ARROW_LV3__Fv.s" -} -#pragma pop +void item_func_BOOMERANG() { + dComIfGs_setItem(SLOT_0, BOOMERANG); +} -/* 80098AF8-80098AFC 093438 0004+00 1/0 0/0 0/0 .text item_func_LURE_ROD__Fv */ -static void item_func_LURE_ROD() { - /* empty function */ -} - -/* 80098AFC-80098B00 09343C 0004+00 1/0 0/0 0/0 .text item_func_BOMB_ARROW__Fv */ -static void item_func_BOMB_ARROW() { - /* empty function */ -} +void item_func_SPINNER() { + dComIfGs_setItem(SLOT_2, SPINNER); +} -/* 80098B00-80098B04 093440 0004+00 1/0 0/0 0/0 .text item_func_HAWK_ARROW__Fv */ -static void item_func_HAWK_ARROW() { - /* empty function */ -} - -/* 80098B04-80098B08 093444 0004+00 1/0 0/0 0/0 .text item_func_BEE_ROD__Fv */ -static void item_func_BEE_ROD() { - /* empty function */ -} +void item_func_IRONBALL() { + dComIfGs_setItem(SLOT_6, IRONBALL); +} -/* 80098B08-80098B0C 093448 0004+00 1/0 0/0 0/0 .text item_func_JEWEL_ROD__Fv */ -static void item_func_JEWEL_ROD() { - /* empty function */ -} - -/* 80098B0C-80098B10 09344C 0004+00 1/0 0/0 0/0 .text item_func_WORM_ROD__Fv */ -static void item_func_WORM_ROD() { - /* empty function */ -} +void item_func_BOW() { + dComIfGs_setItem(SLOT_4, BOW); + dComIfGs_setArrowNum(30); + dComIfGs_setArrowMax(30); +} -/* 80098B10-80098B14 093450 0004+00 1/0 0/0 0/0 .text item_func_JEWEL_BEE_ROD__Fv */ -static void item_func_JEWEL_BEE_ROD() { - /* empty function */ -} - -/* 80098B14-80098B18 093454 0004+00 1/0 0/0 0/0 .text item_func_JEWEL_WORM_ROD__Fv */ -static void item_func_JEWEL_WORM_ROD() { - /* empty function */ -} - -/* 80098B18-80098B44 093458 002C+00 1/0 0/0 0/0 .text item_func_EMPTY_BOTTLE__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_EMPTY_BOTTLE() { - nofralloc -#include "asm/d/d_item/item_func_EMPTY_BOTTLE__Fv.s" -} -#pragma pop - -/* 80098B44-80098B74 093484 0030+00 1/0 0/0 0/0 .text item_func_RED_BOTTLE__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_RED_BOTTLE() { - nofralloc -#include "asm/d/d_item/item_func_RED_BOTTLE__Fv.s" -} -#pragma pop - -/* 80098B74-80098BA4 0934B4 0030+00 1/0 0/0 0/0 .text item_func_GREEN_BOTTLE__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_GREEN_BOTTLE() { - nofralloc -#include "asm/d/d_item/item_func_GREEN_BOTTLE__Fv.s" -} -#pragma pop - -/* 80098BA4-80098BD4 0934E4 0030+00 1/0 0/0 0/0 .text item_func_BLUE_BOTTLE__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_BLUE_BOTTLE() { - nofralloc -#include "asm/d/d_item/item_func_BLUE_BOTTLE__Fv.s" -} -#pragma pop - -/* 80098BD4-80098C04 093514 0030+00 1/0 0/0 0/0 .text item_func_MILK_BOTTLE__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_MILK_BOTTLE() { - nofralloc -#include "asm/d/d_item/item_func_MILK_BOTTLE__Fv.s" +void item_func_HOOKSHOT() { + dComIfGs_setItem(SLOT_9, HOOKSHOT); } -#pragma pop -/* 80098C04-80098C34 093544 0030+00 1/0 0/0 0/0 .text item_func_HALF_MILK_BOTTLE__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_HALF_MILK_BOTTLE() { - nofralloc -#include "asm/d/d_item/item_func_HALF_MILK_BOTTLE__Fv.s" +void item_func_HVY_BOOTS() { + dComIfGs_setItem(SLOT_3, HVY_BOOTS); } -#pragma pop -/* 80098C34-80098C64 093574 0030+00 1/0 0/0 0/0 .text item_func_OIL_BOTTLE__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_OIL_BOTTLE() { - nofralloc -#include "asm/d/d_item/item_func_OIL_BOTTLE__Fv.s" -} -#pragma pop - -/* 80098C64-80098C94 0935A4 0030+00 1/0 0/0 0/0 .text item_func_WATER_BOTTLE__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_WATER_BOTTLE() { - nofralloc -#include "asm/d/d_item/item_func_WATER_BOTTLE__Fv.s" -} -#pragma pop - -/* 80098C94-80098CC4 0935D4 0030+00 1/0 0/0 0/0 .text item_func_OIL_BOTTLE2__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_OIL_BOTTLE2() { - nofralloc -#include "asm/d/d_item/item_func_OIL_BOTTLE2__Fv.s" -} -#pragma pop - -/* 80098CC4-80098CF4 093604 0030+00 1/0 0/0 0/0 .text item_func_RED_BOTTLE2__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_RED_BOTTLE2() { - nofralloc -#include "asm/d/d_item/item_func_RED_BOTTLE2__Fv.s" -} -#pragma pop - -/* 80098CF4-80098D24 093634 0030+00 1/0 0/0 0/0 .text item_func_UGLY_SOUP__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_UGLY_SOUP() { - nofralloc -#include "asm/d/d_item/item_func_UGLY_SOUP__Fv.s" -} -#pragma pop - -/* 80098D24-80098D54 093664 0030+00 1/0 0/0 0/0 .text item_func_HOT_SPRING__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_HOT_SPRING() { - nofralloc -#include "asm/d/d_item/item_func_HOT_SPRING__Fv.s" -} -#pragma pop - -/* 80098D54-80098D84 093694 0030+00 1/0 0/0 0/0 .text item_func_FAIRY_BOTTLE__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_FAIRY_BOTTLE() { - nofralloc -#include "asm/d/d_item/item_func_FAIRY_BOTTLE__Fv.s" -} -#pragma pop - -/* 80098D84-80098DB4 0936C4 0030+00 1/0 0/0 0/0 .text item_func_HOT_SPRING2__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_HOT_SPRING2() { - nofralloc -#include "asm/d/d_item/item_func_HOT_SPRING2__Fv.s" -} -#pragma pop - -/* 80098DB4-80098DB8 0936F4 0004+00 1/0 0/0 0/0 .text item_func_OIL2__Fv */ -static void item_func_OIL2() { - /* empty function */ -} - -/* 80098DB8-80098DBC 0936F8 0004+00 1/0 0/0 0/0 .text item_func_OIL__Fv */ -static void item_func_OIL() { - /* empty function */ -} - -/* 80098DBC-80098DF0 0936FC 0034+00 1/0 0/0 0/0 .text item_func_NORMAL_BOMB__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_NORMAL_BOMB() { - nofralloc -#include "asm/d/d_item/item_func_NORMAL_BOMB__Fv.s" -} -#pragma pop - -/* 80098DF0-80098E38 093730 0048+00 1/0 0/0 0/0 .text item_func_WATER_BOMB__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_WATER_BOMB() { - nofralloc -#include "asm/d/d_item/item_func_WATER_BOMB__Fv.s" -} -#pragma pop - -/* 80098E38-80098E80 093778 0048+00 1/0 0/0 0/0 .text item_func_POKE_BOMB__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_POKE_BOMB() { - nofralloc -#include "asm/d/d_item/item_func_POKE_BOMB__Fv.s" -} -#pragma pop - -/* 80098E80-80098EB0 0937C0 0030+00 1/0 0/0 0/0 .text item_func_FAIRY_DROP__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_FAIRY_DROP() { - nofralloc -#include "asm/d/d_item/item_func_FAIRY_DROP__Fv.s" -} -#pragma pop - -/* 80098EB0-80098EB4 0937F0 0004+00 1/0 0/0 0/0 .text item_func_WORM__Fv */ -static void item_func_WORM() { - /* empty function */ -} - -/* 80098EB4-80098EE4 0937F4 0030+00 1/0 0/0 0/0 .text item_func_DROP_BOTTLE__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_DROP_BOTTLE() { - nofralloc -#include "asm/d/d_item/item_func_DROP_BOTTLE__Fv.s" -} -#pragma pop - -/* 80098EE4-80098F80 093824 009C+00 2/1 0/0 0/0 .text item_func_BEE_CHILD__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_BEE_CHILD() { - nofralloc -#include "asm/d/d_item/item_func_BEE_CHILD__Fv.s" -} -#pragma pop - -/* 80098F80-80098FB0 0938C0 0030+00 1/0 0/0 0/0 .text item_func_CHUCHU_RARE__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_CHUCHU_RARE() { - nofralloc -#include "asm/d/d_item/item_func_CHUCHU_RARE__Fv.s" -} -#pragma pop - -/* 80098FB0-80098FE0 0938F0 0030+00 1/0 0/0 0/0 .text item_func_CHUCHU_RED__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_CHUCHU_RED() { - nofralloc -#include "asm/d/d_item/item_func_CHUCHU_RED__Fv.s" -} -#pragma pop - -/* 80098FE0-80099010 093920 0030+00 1/0 0/0 0/0 .text item_func_CHUCHU_BLUE__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_CHUCHU_BLUE() { - nofralloc -#include "asm/d/d_item/item_func_CHUCHU_BLUE__Fv.s" -} -#pragma pop - -/* 80099010-80099040 093950 0030+00 1/0 0/0 0/0 .text item_func_CHUCHU_GREEN__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_CHUCHU_GREEN() { - nofralloc -#include "asm/d/d_item/item_func_CHUCHU_GREEN__Fv.s" -} -#pragma pop - -/* 80099040-80099070 093980 0030+00 1/0 0/0 0/0 .text item_func_CHUCHU_YELLOW__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_CHUCHU_YELLOW() { - nofralloc -#include "asm/d/d_item/item_func_CHUCHU_YELLOW__Fv.s" -} -#pragma pop - -/* 80099070-800990A0 0939B0 0030+00 1/0 0/0 0/0 .text item_func_CHUCHU_PURPLE__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_CHUCHU_PURPLE() { - nofralloc -#include "asm/d/d_item/item_func_CHUCHU_PURPLE__Fv.s" -} -#pragma pop - -/* 800990A0-800990D0 0939E0 0030+00 1/0 0/0 0/0 .text item_func_LV1_SOUP__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_LV1_SOUP() { - nofralloc -#include "asm/d/d_item/item_func_LV1_SOUP__Fv.s" -} -#pragma pop - -/* 800990D0-80099100 093A10 0030+00 1/0 0/0 0/0 .text item_func_LV2_SOUP__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_LV2_SOUP() { - nofralloc -#include "asm/d/d_item/item_func_LV2_SOUP__Fv.s" -} -#pragma pop - -/* 80099100-80099130 093A40 0030+00 1/0 0/0 0/0 .text item_func_LV3_SOUP__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_LV3_SOUP() { - nofralloc -#include "asm/d/d_item/item_func_LV3_SOUP__Fv.s" -} -#pragma pop - -/* 80099130-80099164 093A70 0034+00 1/0 0/0 0/0 .text item_func_LETTER__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_LETTER() { - nofralloc -#include "asm/d/d_item/item_func_LETTER__Fv.s" -} -#pragma pop - -/* 80099164-80099198 093AA4 0034+00 1/0 0/0 0/0 .text item_func_BILL__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_BILL() { - nofralloc -#include "asm/d/d_item/item_func_BILL__Fv.s" -} -#pragma pop - -/* 80099198-800991E8 093AD8 0050+00 1/0 0/0 0/0 .text item_func_WOOD_STATUE__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_WOOD_STATUE() { - nofralloc -#include "asm/d/d_item/item_func_WOOD_STATUE__Fv.s" -} -#pragma pop - -/* 800991E8-8009921C 093B28 0034+00 1/0 0/0 0/0 .text item_func_IRIAS_PENDANT__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_IRIAS_PENDANT() { - nofralloc -#include "asm/d/d_item/item_func_IRIAS_PENDANT__Fv.s" -} -#pragma pop - -/* 8009921C-80099250 093B5C 0034+00 1/0 0/0 0/0 .text item_func_HORSE_FLUTE__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_HORSE_FLUTE() { - nofralloc -#include "asm/d/d_item/item_func_HORSE_FLUTE__Fv.s" -} -#pragma pop - -/* 80099250-80099284 093B90 0034+00 1/0 0/0 0/0 .text item_func_RAFRELS_MEMO__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_RAFRELS_MEMO() { - nofralloc -#include "asm/d/d_item/item_func_RAFRELS_MEMO__Fv.s" -} -#pragma pop - -/* 80099284-800992B8 093BC4 0034+00 1/0 0/0 0/0 .text item_func_ASHS_SCRIBBLING__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_ASHS_SCRIBBLING() { - nofralloc -#include "asm/d/d_item/item_func_ASHS_SCRIBBLING__Fv.s" -} -#pragma pop - -/* 800992B8-800992E8 093BF8 0030+00 1/0 0/0 0/0 .text item_func_CHUCHU_YELLOW2__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_CHUCHU_YELLOW2() { - nofralloc -#include "asm/d/d_item/item_func_CHUCHU_YELLOW2__Fv.s" -} -#pragma pop - -/* 800992E8-80099318 093C28 0030+00 1/0 0/0 0/0 .text item_func_OIL_BOTTLE3__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_OIL_BOTTLE3() { - nofralloc -#include "asm/d/d_item/item_func_OIL_BOTTLE3__Fv.s" +void item_func_COPY_ROD() { + dComIfGs_setItem(SLOT_8, COPY_ROD); } -#pragma pop -/* 80099318-80099338 093C58 0020+00 1/0 0/0 0/0 .text item_func_SHOP_BEE_CHILD__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_SHOP_BEE_CHILD() { - nofralloc -#include "asm/d/d_item/item_func_SHOP_BEE_CHILD__Fv.s" +void item_func_W_HOOKSHOT() { + dComIfGs_setItem(SLOT_9, NO_ITEM); + dComIfGs_setItem(SLOT_10, W_HOOKSHOT); } -#pragma pop -/* 80099338-80099368 093C78 0030+00 1/0 0/0 0/0 .text item_func_CHUCHU_BLACK__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_CHUCHU_BLACK() { - nofralloc -#include "asm/d/d_item/item_func_CHUCHU_BLACK__Fv.s" +void item_func_KANTERA() { + dComIfGs_setMaxOil(21600); + dComIfGs_setOil(21600); + dComIfGs_setItem(SLOT_1, KANTERA); } -#pragma pop -/* 80099368-8009936C 093CA8 0004+00 1/0 0/0 0/0 .text item_func_LIGHT_DROP__Fv */ -static void item_func_LIGHT_DROP() { - /* empty function */ +void item_func_LIGHT_SWORD() { + dComIfGs_setCollectSword(COLLECT_LIGHT_SWORD); + dMeter2Info_setSword(LIGHT_SWORD, false); } -/* 8009936C-8009939C 093CAC 0030+00 1/0 0/0 0/0 .text item_func_DROP_CONTAINER__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_DROP_CONTAINER() { - nofralloc -#include "asm/d/d_item/item_func_DROP_CONTAINER__Fv.s" +void item_func_FISHING_ROD_1() { + dComIfGs_setItem(SLOT_20, FISHING_ROD_1); } -#pragma pop -/* 8009939C-800993CC 093CDC 0030+00 1/0 0/0 0/0 .text item_func_DROP_CONTAINER02__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_DROP_CONTAINER02() { - nofralloc -#include "asm/d/d_item/item_func_DROP_CONTAINER02__Fv.s" +void item_func_PACHINKO() { + u8 pachinko_max = dComIfGs_getPachinkoMax(); + dComIfGp_setItemPachinkoNumCount(pachinko_max); + dComIfGs_setItem(SLOT_23, PACHINKO); } -#pragma pop -/* 800993CC-800993FC 093D0C 0030+00 1/0 0/0 0/0 .text item_func_DROP_CONTAINER03__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_DROP_CONTAINER03() { - nofralloc -#include "asm/d/d_item/item_func_DROP_CONTAINER03__Fv.s" +void item_func_COPY_ROD_2() { + dComIfGs_setItem(SLOT_8, COPY_ROD); } -#pragma pop -/* 800993FC-80099400 093D3C 0004+00 1/0 0/0 0/0 .text item_func_FILLED_CONTAINER__Fv */ -static void item_func_FILLED_CONTAINER() { - /* empty function */ +void item_func_BOMB_BAG_LV2() {} + +void item_func_BOMB_BAG_LV1() { + dComIfGs_setEmptyBombBag(NORMAL_BOMB, 30); } -/* 80099400-80099404 093D40 0004+00 1/0 0/0 0/0 .text item_func_MIRROR_PIECE_2__Fv */ -static void item_func_MIRROR_PIECE_2() { - /* empty function */ +void item_func_BOMB_IN_BAG() { + dComIfGs_setEmptyBombBag(NORMAL_BOMB, 30); } -/* 80099404-80099408 093D44 0004+00 1/0 0/0 0/0 .text item_func_MIRROR_PIECE_3__Fv */ -static void item_func_MIRROR_PIECE_3() { - /* empty function */ +void item_func_LIGHT_ARROW() { + dComIfGs_setItem(SLOT_4, LIGHT_ARROW); } -/* 80099408-8009940C 093D48 0004+00 1/0 0/0 0/0 .text item_func_MIRROR_PIECE_4__Fv */ -static void item_func_MIRROR_PIECE_4() { - /* empty function */ +void item_func_ARROW_LV1() { + dComIfGs_setArrowNum(60); + dComIfGs_setArrowMax(60); } -/* 8009940C-80099410 093D4C 0004+00 1/0 0/0 0/0 .text item_func_SMELL_YELIA_POUCH__Fv */ -static void item_func_SMELL_YELIA_POUCH() { - /* empty function */ +void item_func_ARROW_LV2() { + dComIfGs_setArrowNum(60); + dComIfGs_setArrowMax(60); } -/* 80099410-80099414 093D50 0004+00 1/0 0/0 0/0 .text item_func_SMELL_PUMPKIN__Fv */ -static void item_func_SMELL_PUMPKIN() { - /* empty function */ +void item_func_ARROW_LV3() { + dComIfGs_setArrowNum(100); + dComIfGs_setArrowMax(100); } -/* 80099414-80099418 093D54 0004+00 1/0 0/0 0/0 .text item_func_SMELL_POH__Fv */ -static void item_func_SMELL_POH() { - /* empty function */ +void item_func_LURE_ROD() {} + +void item_func_BOMB_ARROW() {} + +void item_func_HAWK_ARROW() {} + +void item_func_BEE_ROD() {} + +void item_func_JEWEL_ROD() {} + +void item_func_WORM_ROD() {} + +void item_func_JEWEL_BEE_ROD() {} + +void item_func_JEWEL_WORM_ROD() {} + +void item_func_EMPTY_BOTTLE() { + dComIfGs_setEmptyBottle(); } -/* 80099418-8009941C 093D58 0004+00 1/0 0/0 0/0 .text item_func_SMELL_FISH__Fv */ -static void item_func_SMELL_FISH() { - /* empty function */ +void item_func_RED_BOTTLE() { + dComIfGs_setEmptyBottleItemIn(RED_BOTTLE); } -/* 8009941C-80099420 093D5C 0004+00 1/0 0/0 0/0 .text item_func_SMELL_CHILDREN__Fv */ -static void item_func_SMELL_CHILDREN() { - /* empty function */ +void item_func_GREEN_BOTTLE() { + dComIfGs_setEmptyBottleItemIn(GREEN_BOTTLE); } -/* 80099420-80099424 093D60 0004+00 1/0 0/0 0/0 .text item_func_SMELL_MEDICINE__Fv */ -static void item_func_SMELL_MEDICINE() { - /* empty function */ +void item_func_BLUE_BOTTLE() { + dComIfGs_setEmptyBottleItemIn(BLUE_BOTTLE); } -/* 80099424-80099428 093D64 0004+00 1/0 0/0 0/0 .text item_func_M_BEETLE__Fv */ -static void item_func_M_BEETLE() { - /* empty function */ +void item_func_MILK_BOTTLE() { + dComIfGs_setEmptyBottleItemIn(MILK_BOTTLE); } -/* 80099428-8009942C 093D68 0004+00 1/0 0/0 0/0 .text item_func_F_BEETLE__Fv */ -static void item_func_F_BEETLE() { - /* empty function */ +void item_func_HALF_MILK_BOTTLE() { + dComIfGs_setEmptyBottle(HALF_MILK_BOTTLE); } -/* 8009942C-80099430 093D6C 0004+00 1/0 0/0 0/0 .text item_func_M_BUTTERFLY__Fv */ -static void item_func_M_BUTTERFLY() { - /* empty function */ +void item_func_OIL_BOTTLE() { + dComIfGs_setEmptyBottleItemIn(OIL_BOTTLE); } -/* 80099430-80099434 093D70 0004+00 1/0 0/0 0/0 .text item_func_F_BUTTERFLY__Fv */ -static void item_func_F_BUTTERFLY() { - /* empty function */ +void item_func_WATER_BOTTLE() { + dComIfGs_setEmptyBottleItemIn(WATER_BOTTLE); } -/* 80099434-80099438 093D74 0004+00 1/0 0/0 0/0 .text item_func_M_STAG_BEETLE__Fv */ -static void item_func_M_STAG_BEETLE() { - /* empty function */ +void item_func_OIL_BOTTLE2() { + dComIfGs_setEmptyBottleItemIn(OIL_BOTTLE); } -/* 80099438-8009943C 093D78 0004+00 1/0 0/0 0/0 .text item_func_F_STAG_BEETLE__Fv */ -static void item_func_F_STAG_BEETLE() { - /* empty function */ +void item_func_RED_BOTTLE2() { + dComIfGs_setEmptyBottleItemIn(RED_BOTTLE); } -/* 8009943C-80099440 093D7C 0004+00 1/0 0/0 0/0 .text item_func_M_GRASSHOPPER__Fv */ -static void item_func_M_GRASSHOPPER() { - /* empty function */ +void item_func_UGLY_SOUP() { + dComIfGs_setEmptyBottleItemIn(UGLY_SOUP); } -/* 80099440-80099444 093D80 0004+00 1/0 0/0 0/0 .text item_func_F_GRASSHOPPER__Fv */ -static void item_func_F_GRASSHOPPER() { - /* empty function */ +void item_func_HOT_SPRING() { + dComIfGs_setEmptyBottleItemIn(HOT_SPRING); } -/* 80099444-80099448 093D84 0004+00 1/0 0/0 0/0 .text item_func_M_NANAFUSHI__Fv */ -static void item_func_M_NANAFUSHI() { - /* empty function */ +void item_func_FAIRY_BOTTLE() { + dComIfGs_setEmptyBottleItemIn(FAIRY); } -/* 80099448-8009944C 093D88 0004+00 1/0 0/0 0/0 .text item_func_F_NANAFUSHI__Fv */ -static void item_func_F_NANAFUSHI() { - /* empty function */ +void item_func_HOT_SPRING2() { + dComIfGs_setEmptyBottleItemIn(HOT_SPRING); } -/* 8009944C-80099450 093D8C 0004+00 1/0 0/0 0/0 .text item_func_M_DANGOMUSHI__Fv */ -static void item_func_M_DANGOMUSHI() { - /* empty function */ +void item_func_OIL2() {} + +void item_func_OIL() {} + +void item_func_NORMAL_BOMB() { + dComIfGs_setEmptyBombBag(NORMAL_BOMB, 60); } -/* 80099450-80099454 093D90 0004+00 1/0 0/0 0/0 .text item_func_F_DANGOMUSHI__Fv */ -static void item_func_F_DANGOMUSHI() { - /* empty function */ +void item_func_WATER_BOMB() { + dComIfGs_setEmptyBombBag(); + dComIfGs_setEmptyBombBagItemIn(WATER_BOMB, true); } -/* 80099454-80099458 093D94 0004+00 1/0 0/0 0/0 .text item_func_M_MANTIS__Fv */ -static void item_func_M_MANTIS() { - /* empty function */ +void item_func_POKE_BOMB() { + dComIfGs_setEmptyBombBag(); + dComIfGs_setEmptyBombBagItemIn(POKE_BOMB, true); } -/* 80099458-8009945C 093D98 0004+00 1/0 0/0 0/0 .text item_func_F_MANTIS__Fv */ -static void item_func_F_MANTIS() { - /* empty function */ +void item_func_FAIRY_DROP() { + dComIfGs_setEmptyBottleItemIn(FAIRY_DROP); } -/* 8009945C-80099460 093D9C 0004+00 1/0 0/0 0/0 .text item_func_M_LADYBUG__Fv */ -static void item_func_M_LADYBUG() { - /* empty function */ +void item_func_WORM() {} + +void item_func_DROP_BOTTLE() { + dComIfGs_setEmptyBottle(FAIRY_DROP); } -/* 80099460-80099464 093DA0 0004+00 1/0 0/0 0/0 .text item_func_F_LADYBUG__Fv */ -static void item_func_F_LADYBUG() { - /* empty function */ +void item_func_BEE_CHILD() { + int bottleIdx; + int i; + + for (bottleIdx = 0xFF, i = 0; i < 4; i++) { + u8 getItem = dComIfGs_getItem(i + SLOT_11, true); + + if (getItem == EMPTY_BOTTLE) { + bottleIdx = i; + break; + } + } + + if (bottleIdx != 0xff) { + dComIfGs_setBottleNum(bottleIdx, 10); + dComIfGs_setEmptyBottleItemIn(BEE_CHILD); + } } -/* 80099464-80099468 093DA4 0004+00 1/0 0/0 0/0 .text item_func_M_SNAIL__Fv */ -static void item_func_M_SNAIL() { - /* empty function */ +void item_func_CHUCHU_RARE() { + dComIfGs_setEmptyBottleItemIn(CHUCHU_RARE); } -/* 80099468-8009946C 093DA8 0004+00 1/0 0/0 0/0 .text item_func_F_SNAIL__Fv */ -static void item_func_F_SNAIL() { - /* empty function */ +void item_func_CHUCHU_RED() { + dComIfGs_setEmptyBottleItemIn(CHUCHU_RED); } -/* 8009946C-80099470 093DAC 0004+00 1/0 0/0 0/0 .text item_func_M_DRAGONFLY__Fv */ -static void item_func_M_DRAGONFLY() { - /* empty function */ +void item_func_CHUCHU_BLUE() { + dComIfGs_setEmptyBottleItemIn(CHUCHU_BLUE); } -/* 80099470-80099474 093DB0 0004+00 1/0 0/0 0/0 .text item_func_F_DRAGONFLY__Fv */ -static void item_func_F_DRAGONFLY() { - /* empty function */ +void item_func_CHUCHU_GREEN() { + dComIfGs_setEmptyBottleItemIn(CHUCHU_GREEN); } -/* 80099474-80099478 093DB4 0004+00 1/0 0/0 0/0 .text item_func_M_ANT__Fv */ -static void item_func_M_ANT() { - /* empty function */ +void item_func_CHUCHU_YELLOW() { + dComIfGs_setEmptyBottleItemIn(CHUCHU_YELLOW); } -/* 80099478-8009947C 093DB8 0004+00 1/0 0/0 0/0 .text item_func_F_ANT__Fv */ -static void item_func_F_ANT() { - /* empty function */ +void item_func_CHUCHU_PURPLE() { + dComIfGs_setEmptyBottleItemIn(CHUCHU_PURPLE); } -/* 8009947C-80099480 093DBC 0004+00 1/0 0/0 0/0 .text item_func_M_MAYFLY__Fv */ -static void item_func_M_MAYFLY() { - /* empty function */ +void item_func_LV1_SOUP() { + dComIfGs_setEmptyBottleItemIn(LV1_SOUP); } -/* 80099480-80099484 093DC0 0004+00 1/0 0/0 0/0 .text item_func_F_MAYFLY__Fv */ -static void item_func_F_MAYFLY() { - /* empty function */ +void item_func_LV2_SOUP() { + dComIfGs_setEmptyBottleItemIn(LV2_SOUP); } -/* 80099484-80099488 093DC4 0004+00 1/0 0/0 0/0 .text item_func_POU_SPIRIT__Fv */ -static void item_func_POU_SPIRIT() { - /* empty function */ +void item_func_LV3_SOUP() { + dComIfGs_setEmptyBottleItemIn(LV3_SOUP); } -/* 80099488-800994BC 093DC8 0034+00 1/0 0/0 0/0 .text item_func_ANCIENT_DOCUMENT__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_ANCIENT_DOCUMENT() { - nofralloc -#include "asm/d/d_item/item_func_ANCIENT_DOCUMENT__Fv.s" +void item_func_LETTER() { + dComIfGs_setItem(SLOT_21, LETTER); } -#pragma pop -/* 800994BC-800994F0 093DFC 0034+00 1/0 0/0 0/0 .text item_func_AIR_LETTER__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_AIR_LETTER() { - nofralloc -#include "asm/d/d_item/item_func_AIR_LETTER__Fv.s" +void item_func_BILL() { + dComIfGs_setItem(SLOT_21, BILL); } -#pragma pop -/* 800994F0-80099524 093E30 0034+00 1/0 0/0 0/0 .text item_func_ANCIENT_DOCUMENT2__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_ANCIENT_DOCUMENT2() { - nofralloc -#include "asm/d/d_item/item_func_ANCIENT_DOCUMENT2__Fv.s" +void item_func_WOOD_STATUE() { + dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[283]); + dComIfGs_setItem(SLOT_21, WOOD_STATUE); } -#pragma pop -/* 80099524-80099558 093E64 0034+00 1/0 0/0 0/0 .text item_func_LV7_DUNGEON_EXIT__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_LV7_DUNGEON_EXIT() { - nofralloc -#include "asm/d/d_item/item_func_LV7_DUNGEON_EXIT__Fv.s" +void item_func_IRIAS_PENDANT() { + dComIfGs_setItem(SLOT_21, IRIAS_PENDANT); } -#pragma pop -/* 80099558-80099570 093E98 0018+00 1/0 0/0 0/0 .text item_func_LINKS_SAVINGS__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_LINKS_SAVINGS() { - nofralloc -#include "asm/d/d_item/item_func_LINKS_SAVINGS__Fv.s" +void item_func_HORSE_FLUTE() { + dComIfGs_setItem(SLOT_21, HORSE_FLUTE); } -#pragma pop -/* 80099570-80099588 093EB0 0018+00 1/0 0/0 0/0 .text item_func_SMALL_KEY2__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_SMALL_KEY2() { - nofralloc -#include "asm/d/d_item/item_func_SMALL_KEY2__Fv.s" +void item_func_RAFRELS_MEMO() { + dComIfGs_setItem(SLOT_19, RAFRELS_MEMO); } -#pragma pop -/* 80099588-8009958C 093EC8 0004+00 1/0 0/0 0/0 .text item_func_POU_FIRE1__Fv */ -static void item_func_POU_FIRE1() { - /* empty function */ +void item_func_ASHS_SCRIBBLING() { + dComIfGs_setItem(SLOT_19, ASHS_SCRIBBLING); } -/* 8009958C-80099590 093ECC 0004+00 1/0 0/0 0/0 .text item_func_POU_FIRE2__Fv */ -static void item_func_POU_FIRE2() { - /* empty function */ +void item_func_CHUCHU_YELLOW2() { + dComIfGs_setEmptyBottleItemIn(CHUCHU_YELLOW); } -/* 80099590-80099594 093ED0 0004+00 1/0 0/0 0/0 .text item_func_POU_FIRE3__Fv */ -static void item_func_POU_FIRE3() { - /* empty function */ +void item_func_OIL_BOTTLE3() { + dComIfGs_setEmptyBottle(OIL_BOTTLE); } -/* 80099594-80099598 093ED4 0004+00 1/0 0/0 0/0 .text item_func_POU_FIRE4__Fv */ -static void item_func_POU_FIRE4() { - /* empty function */ +void item_func_SHOP_BEE_CHILD() { + item_func_BEE_CHILD(); } -/* 80099598-8009959C 093ED8 0004+00 1/0 0/0 0/0 .text item_func_BOSSRIDER_KEY__Fv */ -static void item_func_BOSSRIDER_KEY() { - /* empty function */ +void item_func_CHUCHU_BLACK() { + dComIfGs_setEmptyBottleItemIn(CHUCHU_BLACK); } -/* 8009959C-800995A0 093EDC 0004+00 1/0 0/0 0/0 .text item_func_TOMATO_PUREE__Fv */ -static void item_func_TOMATO_PUREE() { - /* empty function */ +void item_func_LIGHT_DROP() {} + +void item_func_DROP_CONTAINER() { + dComIfGs_onLightDropFlag(FARON_VESSEL); } -/* 800995A0-800995A4 093EE0 0004+00 1/0 0/0 0/0 .text item_func_TASTE__Fv */ -static void item_func_TASTE() { - /* empty function */ +void item_func_DROP_CONTAINER02() { + dComIfGs_onLightDropFlag(ELDIN_VESSEL); } -/* 800995A4-800995D4 093EE4 0030+00 1/0 0/0 0/0 .text item_func_LV5_BOSS_KEY__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_LV5_BOSS_KEY() { - nofralloc -#include "asm/d/d_item/item_func_LV5_BOSS_KEY__Fv.s" +void item_func_DROP_CONTAINER03() { + dComIfGs_onLightDropFlag(LANAYRU_VESSEL); } -#pragma pop -/* 800995D4-800995D8 093F14 0004+00 1/0 0/0 0/0 .text item_func_SURFBOARD__Fv */ -static void item_func_SURFBOARD() { - /* empty function */ +void item_func_FILLED_CONTAINER() {} + +void item_func_MIRROR_PIECE_2() {} + +void item_func_MIRROR_PIECE_3() {} + +void item_func_MIRROR_PIECE_4() {} + +void item_func_SMELL_YELIA_POUCH() {} + +void item_func_SMELL_PUMPKIN() {} + +void item_func_SMELL_POH() {} + +void item_func_SMELL_FISH() {} + +void item_func_SMELL_CHILDREN() {} + +void item_func_SMELL_MEDICINE() {} + +void item_func_M_BEETLE() {} + +void item_func_F_BEETLE() {} + +void item_func_M_BUTTERFLY() {} + +void item_func_F_BUTTERFLY() {} + +void item_func_M_STAG_BEETLE() {} + +void item_func_F_STAG_BEETLE() {} + +void item_func_M_GRASSHOPPER() {} + +void item_func_F_GRASSHOPPER() {} + +void item_func_M_NANAFUSHI() {} + +void item_func_F_NANAFUSHI() {} + +void item_func_M_DANGOMUSHI() {} + +void item_func_F_DANGOMUSHI() {} + +void item_func_M_MANTIS() {} + +void item_func_F_MANTIS() {} + +void item_func_M_LADYBUG() {} + +void item_func_F_LADYBUG() {} + +void item_func_M_SNAIL() {} + +void item_func_F_SNAIL() {} + +void item_func_M_DRAGONFLY() {} + +void item_func_F_DRAGONFLY() {} + +void item_func_M_ANT() {} + +void item_func_F_ANT() {} + +void item_func_M_MAYFLY() {} + +void item_func_F_MAYFLY() {} + +void item_func_POU_SPIRIT() {} + +void item_func_ANCIENT_DOCUMENT() { + dComIfGs_setItem(SLOT_22, ANCIENT_DOCUMENT); } -/* 800995D8-800995DC 093F18 0004+00 1/0 0/0 0/0 .text item_func_KANTERA2__Fv */ -static void item_func_KANTERA2() { - /* empty function */ +void item_func_AIR_LETTER() { + dComIfGs_setItem(SLOT_22, AIR_LETTER); } -/* 800995DC-800995E0 093F1C 0004+00 1/0 0/0 0/0 .text item_func_L2_KEY_PIECES1__Fv */ -static void item_func_L2_KEY_PIECES1() { - /* empty function */ +void item_func_ANCIENT_DOCUMENT2() { + dComIfGs_setItem(SLOT_22, ANCIENT_DOCUMENT2); } -/* 800995E0-800995E4 093F20 0004+00 1/0 0/0 0/0 .text item_func_L2_KEY_PIECES2__Fv */ -static void item_func_L2_KEY_PIECES2() { - /* empty function */ +void item_func_LV7_DUNGEON_EXIT() { + dComIfGs_setItem(SLOT_18, LV7_DUNGEON_EXIT); } -/* 800995E4-800995E8 093F24 0004+00 1/0 0/0 0/0 .text item_func_L2_KEY_PIECES3__Fv */ -static void item_func_L2_KEY_PIECES3() { - /* empty function */ +void item_func_LINKS_SAVINGS() { + dComIfGp_setItemRupeeCount(50); } -/* 800995E8-800995EC 093F28 0004+00 1/0 0/0 0/0 .text item_func_KEY_OF_CARAVAN__Fv */ -static void item_func_KEY_OF_CARAVAN() { - /* empty function */ +void item_func_SMALL_KEY2() { + dComIfGp_setItemKeyNumCount(1); } -/* 800995EC-8009961C 093F2C 0030+00 1/0 0/0 0/0 .text item_func_LV2_BOSS_KEY__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_LV2_BOSS_KEY() { - nofralloc -#include "asm/d/d_item/item_func_LV2_BOSS_KEY__Fv.s" +void item_func_POU_FIRE1() {} + +void item_func_POU_FIRE2() {} + +void item_func_POU_FIRE3() {} + +void item_func_POU_FIRE4() {} + +void item_func_BOSSRIDER_KEY() {} + +void item_func_TOMATO_PUREE() {} + +void item_func_TASTE() {} + +void item_func_LV5_BOSS_KEY() { + dComIfGs_onDungeonItemBossKey(); } -#pragma pop -/* 8009961C-80099634 093F5C 0018+00 1/0 0/0 0/0 .text item_func_KEY_OF_FILONE__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_func_KEY_OF_FILONE() { - nofralloc -#include "asm/d/d_item/item_func_KEY_OF_FILONE__Fv.s" +void item_func_SURFBOARD() {} + +void item_func_KANTERA2() {} + +void item_func_L2_KEY_PIECES1() {} + +void item_func_L2_KEY_PIECES2() {} + +void item_func_L2_KEY_PIECES3() {} + +void item_func_KEY_OF_CARAVAN() {} + +void item_func_LV2_BOSS_KEY() { + dComIfGs_onDungeonItemBossKey(); } -#pragma pop -/* 80099634-80099638 093F74 0004+00 1/0 0/0 0/0 .text item_func_noentry__Fv */ -static void item_func_noentry() { - /* empty function */ +void item_func_KEY_OF_FILONE() { + dComIfGp_setItemKeyNumCount(1); } -/* 80099638-80099640 093F78 0008+00 1/0 0/0 0/0 .text item_getcheck_func_noentry__Fv */ -static s32 item_getcheck_func_noentry() { +void item_func_noentry() {} + +s32 item_getcheck_func_noentry() { return -1; } -/* 80099640-80099648 093F80 0008+00 1/0 0/0 0/0 .text item_getcheck_func_HEART__Fv */ -static s32 item_getcheck_func_HEART() { +s32 item_getcheck_func_HEART() { return -1; } -/* 80099648-80099678 093F88 0030+00 1/0 0/0 0/0 .text item_getcheck_func_GREEN_RUPEE__Fv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_GREEN_RUPEE() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_GREEN_RUPEE__Fv.s" +s32 item_getcheck_func_GREEN_RUPEE() { + return dComIfGs_isItemFirstBit(GREEN_RUPEE); } -#pragma pop -/* 80099678-800996A8 093FB8 0030+00 1/0 0/0 0/0 .text item_getcheck_func_BLUE_RUPEE__Fv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_BLUE_RUPEE() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_BLUE_RUPEE__Fv.s" +s32 item_getcheck_func_BLUE_RUPEE() { + return dComIfGs_isItemFirstBit(BLUE_RUPEE); } -#pragma pop -/* 800996A8-800996D8 093FE8 0030+00 1/0 0/0 0/0 .text item_getcheck_func_YELLOW_RUPEE__Fv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_YELLOW_RUPEE() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_YELLOW_RUPEE__Fv.s" +s32 item_getcheck_func_YELLOW_RUPEE() { + return dComIfGs_isItemFirstBit(YELLOW_RUPEE); } -#pragma pop -/* 800996D8-80099708 094018 0030+00 1/0 0/0 0/0 .text item_getcheck_func_RED_RUPEE__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_RED_RUPEE() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_RED_RUPEE__Fv.s" +s32 item_getcheck_func_RED_RUPEE() { + return dComIfGs_isItemFirstBit(RED_RUPEE); } -#pragma pop -/* 80099708-80099738 094048 0030+00 1/0 0/0 0/0 .text item_getcheck_func_PURPLE_RUPEE__Fv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_PURPLE_RUPEE() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_PURPLE_RUPEE__Fv.s" +s32 item_getcheck_func_PURPLE_RUPEE() { + return dComIfGs_isItemFirstBit(PURPLE_RUPEE); } -#pragma pop -/* 80099738-80099768 094078 0030+00 1/0 0/0 0/0 .text item_getcheck_func_ORANGE_RUPEE__Fv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_ORANGE_RUPEE() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_ORANGE_RUPEE__Fv.s" +s32 item_getcheck_func_ORANGE_RUPEE() { + return dComIfGs_isItemFirstBit(ORANGE_RUPEE); } -#pragma pop -/* 80099768-80099798 0940A8 0030+00 1/0 0/0 0/0 .text item_getcheck_func_SILVER_RUPEE__Fv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_SILVER_RUPEE() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_SILVER_RUPEE__Fv.s" +s32 item_getcheck_func_SILVER_RUPEE() { + return dComIfGs_isItemFirstBit(SILVER_RUPEE); } -#pragma pop -/* 80099798-800997A0 0940D8 0008+00 1/0 0/0 0/0 .text item_getcheck_func_S_MAGIC__Fv */ -static s32 item_getcheck_func_S_MAGIC() { +s32 item_getcheck_func_S_MAGIC() { return -1; } -/* 800997A0-800997A8 0940E0 0008+00 1/0 0/0 0/0 .text item_getcheck_func_L_MAGIC__Fv */ -static s32 item_getcheck_func_L_MAGIC() { +s32 item_getcheck_func_L_MAGIC() { return -1; } -/* 800997A8-800997D8 0940E8 0030+00 1/0 0/0 0/0 .text item_getcheck_func_BOMB_5__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_BOMB_5() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_BOMB_5__Fv.s" +s32 item_getcheck_func_BOMB_5() { + return dComIfGs_isItemFirstBit(BOMB_5); } -#pragma pop -/* 800997D8-80099808 094118 0030+00 1/0 0/0 0/0 .text item_getcheck_func_BOMB_10__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_BOMB_10() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_BOMB_10__Fv.s" +s32 item_getcheck_func_BOMB_10() { + return dComIfGs_isItemFirstBit(BOMB_10); } -#pragma pop -/* 80099808-80099838 094148 0030+00 1/0 0/0 0/0 .text item_getcheck_func_BOMB_20__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_BOMB_20() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_BOMB_20__Fv.s" +s32 item_getcheck_func_BOMB_20() { + return dComIfGs_isItemFirstBit(BOMB_20); } -#pragma pop -/* 80099838-80099868 094178 0030+00 1/0 0/0 0/0 .text item_getcheck_func_BOMB_30__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_BOMB_30() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_BOMB_30__Fv.s" +s32 item_getcheck_func_BOMB_30() { + return dComIfGs_isItemFirstBit(BOMB_30); } -#pragma pop -/* 80099868-80099898 0941A8 0030+00 1/0 0/0 0/0 .text item_getcheck_func_ARROW_10__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_ARROW_10() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_ARROW_10__Fv.s" +s32 item_getcheck_func_ARROW_10() { + return dComIfGs_isItemFirstBit(ARROW_10); } -#pragma pop -/* 80099898-800998C8 0941D8 0030+00 1/0 0/0 0/0 .text item_getcheck_func_ARROW_20__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_ARROW_20() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_ARROW_20__Fv.s" +s32 item_getcheck_func_ARROW_20() { + return dComIfGs_isItemFirstBit(ARROW_20); } -#pragma pop -/* 800998C8-800998F8 094208 0030+00 1/0 0/0 0/0 .text item_getcheck_func_ARROW_30__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_ARROW_30() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_ARROW_30__Fv.s" +s32 item_getcheck_func_ARROW_30() { + return dComIfGs_isItemFirstBit(ARROW_30); } -#pragma pop -/* 800998F8-80099928 094238 0030+00 1/0 0/0 0/0 .text item_getcheck_func_ARROW_1__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_ARROW_1() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_ARROW_1__Fv.s" +s32 item_getcheck_func_ARROW_1() { + return dComIfGs_isItemFirstBit(ARROW_1); } -#pragma pop -/* 80099928-80099958 094268 0030+00 1/0 0/0 0/0 .text item_getcheck_func_PACHINKO_SHOT__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_PACHINKO_SHOT() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_PACHINKO_SHOT__Fv.s" +s32 item_getcheck_func_PACHINKO_SHOT() { + return dComIfGs_isItemFirstBit(PACHINKO_SHOT); } -#pragma pop -/* 80099958-80099960 094298 0008+00 1/0 0/0 0/0 .text item_getcheck_func_WATER_BOMB_5__Fv - */ -static s32 item_getcheck_func_WATER_BOMB_5() { +s32 item_getcheck_func_WATER_BOMB_5() { return -1; } -/* 80099960-80099968 0942A0 0008+00 1/0 0/0 0/0 .text item_getcheck_func_WATER_BOMB_10__Fv */ -static s32 item_getcheck_func_WATER_BOMB_10() { +s32 item_getcheck_func_WATER_BOMB_10() { return -1; } -/* 80099968-80099970 0942A8 0008+00 1/0 0/0 0/0 .text item_getcheck_func_WATER_BOMB_20__Fv */ -static s32 item_getcheck_func_WATER_BOMB_20() { +s32 item_getcheck_func_WATER_BOMB_20() { return -1; } -/* 80099970-80099978 0942B0 0008+00 1/0 0/0 0/0 .text item_getcheck_func_WATER_BOMB_30__Fv */ -static s32 item_getcheck_func_WATER_BOMB_30() { +s32 item_getcheck_func_WATER_BOMB_30() { return -1; } -/* 80099978-80099980 0942B8 0008+00 1/0 0/0 0/0 .text item_getcheck_func_BOMB_INSECT_5__Fv */ -static s32 item_getcheck_func_BOMB_INSECT_5() { +s32 item_getcheck_func_BOMB_INSECT_5() { return -1; } -/* 80099980-800999B0 0942C0 0030+00 1/0 0/0 0/0 .text item_getcheck_func_BOMB_INSECT_10__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_BOMB_INSECT_10() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_BOMB_INSECT_10__Fv.s" +s32 item_getcheck_func_BOMB_INSECT_10() { + return dComIfGs_isItemFirstBit(BOMB_INSECT_10); } -#pragma pop -/* 800999B0-800999E0 0942F0 0030+00 1/0 0/0 0/0 .text item_getcheck_func_BOMB_INSECT_20__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_BOMB_INSECT_20() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_BOMB_INSECT_20__Fv.s" +s32 item_getcheck_func_BOMB_INSECT_20() { + return dComIfGs_isItemFirstBit(BOMB_INSECT_20); } -#pragma pop -/* 800999E0-80099A10 094320 0030+00 1/0 0/0 0/0 .text item_getcheck_func_BOMB_INSECT_30__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_BOMB_INSECT_30() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_BOMB_INSECT_30__Fv.s" +s32 item_getcheck_func_BOMB_INSECT_30() { + return dComIfGs_isItemFirstBit(BOMB_INSECT_30); } -#pragma pop -/* 80099A10-80099A18 094350 0008+00 1/0 0/0 0/0 .text item_getcheck_func_RECOVER_FAILY__Fv */ -static s32 item_getcheck_func_RECOVER_FAILY() { +s32 item_getcheck_func_RECOVER_FAILY() { return -1; } -/* 80099A18-80099A20 094358 0008+00 1/0 0/0 0/0 .text item_getcheck_func_TRIPLE_HEART__Fv - */ -static s32 item_getcheck_func_TRIPLE_HEART() { +s32 item_getcheck_func_TRIPLE_HEART() { return -1; } -/* 80099A20-80099A28 094360 0008+00 1/0 0/0 0/0 .text item_getcheck_func_SMALL_KEY__Fv */ -static s32 item_getcheck_func_SMALL_KEY() { +s32 item_getcheck_func_SMALL_KEY() { return -1; } -/* 80099A28-80099A30 094368 0008+00 1/0 0/0 0/0 .text item_getcheck_func_KAKERA_HEART__Fv - */ -static s32 item_getcheck_func_KAKERA_HEART() { +s32 item_getcheck_func_KAKERA_HEART() { return -1; } -/* 80099A30-80099A38 094370 0008+00 1/0 0/0 0/0 .text item_getcheck_func_UTUWA_HEART__Fv - */ -static s32 item_getcheck_func_UTUWA_HEART() { +s32 item_getcheck_func_UTUWA_HEART() { return -1; } -/* 80099A38-80099A68 094378 0030+00 1/0 0/0 0/0 .text item_getcheck_func_MAP__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_MAP() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_MAP__Fv.s" +s32 item_getcheck_func_MAP() { + return dComIfGs_isDungeonItemMap(); } -#pragma pop -/* 80099A68-80099A70 0943A8 0008+00 1/0 0/0 0/0 .text item_getcheck_func_COMPUS__Fv */ -static s32 item_getcheck_func_COMPUS() { +s32 item_getcheck_func_COMPUS() { return -1; } -/* 80099A70-80099AB4 0943B0 0044+00 1/0 0/0 0/0 .text item_getcheck_func_DUNGEON_EXIT__Fv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_DUNGEON_EXIT() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_DUNGEON_EXIT__Fv.s" +s32 item_getcheck_func_DUNGEON_EXIT() { + return dComIfGs_getItem(SLOT_18, true) == DUNGEON_EXIT ? 1 : 0; } -#pragma pop -/* 80099AB4-80099AE4 0943F4 0030+00 1/0 0/0 0/0 .text item_getcheck_func_BOSS_KEY__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_BOSS_KEY() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_BOSS_KEY__Fv.s" +s32 item_getcheck_func_BOSS_KEY() { + return dComIfGs_isDungeonItemBossKey(); } -#pragma pop -/* 80099AE4-80099B28 094424 0044+00 1/0 0/0 0/0 .text item_getcheck_func_DUNGEON_BACK__Fv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_DUNGEON_BACK() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_DUNGEON_BACK__Fv.s" +s32 item_getcheck_func_DUNGEON_BACK() { + return dComIfGs_getItem(SLOT_18, true) == DUNGEON_BACK ? 1 : 0; } -#pragma pop -/* 80099B28-80099B5C 094468 0034+00 1/0 0/0 0/0 .text item_getcheck_func_SWORD__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_SWORD() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_SWORD__Fv.s" +s32 item_getcheck_func_SWORD() { + return dComIfGs_isCollectSword(COLLECT_ORDON_SWORD); } -#pragma pop -/* 80099B5C-80099B90 09449C 0034+00 1/0 0/0 0/0 .text item_getcheck_func_MASTER_SWORD__Fv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_MASTER_SWORD() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_MASTER_SWORD__Fv.s" +s32 item_getcheck_func_MASTER_SWORD() { + return dComIfGs_isCollectSword(COLLECT_MASTER_SWORD); } -#pragma pop -/* 80099B90-80099BC0 0944D0 0030+00 1/0 0/0 0/0 .text item_getcheck_func_WOOD_SHIELD__Fv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_WOOD_SHIELD() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_WOOD_SHIELD__Fv.s" +s32 item_getcheck_func_WOOD_SHIELD() { + return dComIfGs_isItemFirstBit(WOOD_SHIELD); } -#pragma pop -/* 80099BC0-80099BF0 094500 0030+00 1/0 0/0 0/0 .text item_getcheck_func_SHIELD__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_SHIELD() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_SHIELD__Fv.s" +s32 item_getcheck_func_SHIELD() { + return dComIfGs_isItemFirstBit(SHIELD); } -#pragma pop -/* 80099BF0-80099C20 094530 0030+00 1/0 0/0 0/0 .text item_getcheck_func_HYLIA_SHIELD__Fv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_HYLIA_SHIELD() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_HYLIA_SHIELD__Fv.s" +s32 item_getcheck_func_HYLIA_SHIELD() { + return dComIfGs_isItemFirstBit(HYLIA_SHIELD); } -#pragma pop -/* 80099C20-80099C64 094560 0044+00 1/0 0/0 0/0 .text item_getcheck_func_TKS_LETTER__Fv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_TKS_LETTER() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_TKS_LETTER__Fv.s" +s32 item_getcheck_func_TKS_LETTER() { + return dComIfGs_getItem(SLOT_18, true) == TKS_LETTER ? 1 : 0; } -#pragma pop -/* 80099C64-80099C94 0945A4 0030+00 1/0 0/0 0/0 .text item_getcheck_func_WEAR_CASUAL__Fv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_WEAR_CASUAL() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_WEAR_CASUAL__Fv.s" +s32 item_getcheck_func_WEAR_CASUAL() { + return dComIfGs_isItemFirstBit(WEARS_CASUAL); } -#pragma pop -/* 80099C94-80099CC8 0945D4 0034+00 1/0 0/0 0/0 .text item_getcheck_func_WEAR_KOKIRI__Fv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_WEAR_KOKIRI() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_WEAR_KOKIRI__Fv.s" +s32 item_getcheck_func_WEAR_KOKIRI() { + return dComIfGs_isCollectClothing(KOKIRI_CLOTHES_FLAG); } -#pragma pop -/* 80099CC8-80099CF8 094608 0030+00 1/0 0/0 0/0 .text item_getcheck_func_ARMOR__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_ARMOR() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_ARMOR__Fv.s" +s32 item_getcheck_func_ARMOR() { + return dComIfGs_isItemFirstBit(ARMOR); } -#pragma pop -/* 80099CF8-80099D28 094638 0030+00 1/0 0/0 0/0 .text item_getcheck_func_WEAR_ZORA__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_WEAR_ZORA() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_WEAR_ZORA__Fv.s" +s32 item_getcheck_func_WEAR_ZORA() { + return dComIfGs_isItemFirstBit(WEAR_ZORA); } -#pragma pop -/* 80099D28-80099D30 094668 0008+00 1/0 0/0 0/0 .text item_getcheck_func_MAGIC_LV1__Fv */ -static s32 item_getcheck_func_MAGIC_LV1() { +s32 item_getcheck_func_MAGIC_LV1() { return -1; } -/* 80099D30-80099D74 094670 0044+00 1/0 0/0 0/0 .text item_getcheck_func_DUNGEON_EXIT_2__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_DUNGEON_EXIT_2() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_DUNGEON_EXIT_2__Fv.s" +s32 item_getcheck_func_DUNGEON_EXIT_2() { + return dComIfGs_getItem(SLOT_18, true) == DUNGEON_EXIT ? 1 : 0; } -#pragma pop -/* 80099D74-80099D7C 0946B4 0008+00 1/0 0/0 0/0 .text item_getcheck_func_WALLET_LV1__Fv - */ -static s32 item_getcheck_func_WALLET_LV1() { +s32 item_getcheck_func_WALLET_LV1() { return -1; } -/* 80099D7C-80099D84 0946BC 0008+00 1/0 0/0 0/0 .text item_getcheck_func_WALLET_LV2__Fv - */ -static s32 item_getcheck_func_WALLET_LV2() { +s32 item_getcheck_func_WALLET_LV2() { return -1; } -/* 80099D84-80099D8C 0946C4 0008+00 1/0 0/0 0/0 .text item_getcheck_func_WALLET_LV3__Fv - */ -static s32 item_getcheck_func_WALLET_LV3() { +s32 item_getcheck_func_WALLET_LV3() { return -1; } -/* 80099D8C-80099DD0 0946CC 0044+00 1/0 0/0 0/0 .text item_getcheck_func_ZORAS_JEWEL__Fv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_ZORAS_JEWEL() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_ZORAS_JEWEL__Fv.s" +s32 item_getcheck_func_ZORAS_JEWEL() { + return dComIfGs_getItem(SLOT_20, true) == ZORAS_JEWEL ? 1 : 0; } -#pragma pop -/* 80099DD0-80099E00 094710 0030+00 1/0 0/0 0/0 .text item_getcheck_func_HAWK_EYE__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_HAWK_EYE() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_HAWK_EYE__Fv.s" +s32 item_getcheck_func_HAWK_EYE() { + return dComIfGs_isItemFirstBit(HAWK_EYE); } -#pragma pop -/* 80099E00-80099E30 094740 0030+00 1/0 0/0 0/0 .text item_getcheck_func_WOOD_STICK__Fv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_WOOD_STICK() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_WOOD_STICK__Fv.s" +s32 item_getcheck_func_WOOD_STICK() { + return dComIfGs_isItemFirstBit(WOOD_STICK); } -#pragma pop -/* 80099E30-80099E74 094770 0044+00 1/0 0/0 0/0 .text item_getcheck_func_BOOMERANG__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_BOOMERANG() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_BOOMERANG__Fv.s" +s32 item_getcheck_func_BOOMERANG() { + return dComIfGs_getItem(SLOT_0, true) == BOOMERANG ? 1 : 0; } -#pragma pop -/* 80099E74-80099EB8 0947B4 0044+00 1/0 0/0 0/0 .text item_getcheck_func_SPINNER__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_SPINNER() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_SPINNER__Fv.s" +s32 item_getcheck_func_SPINNER() { + return dComIfGs_getItem(SLOT_2, true) == SPINNER ? 1 : 0; } -#pragma pop -/* 80099EB8-80099EFC 0947F8 0044+00 1/0 0/0 0/0 .text item_getcheck_func_IRONBALL__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_IRONBALL() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_IRONBALL__Fv.s" +s32 item_getcheck_func_IRONBALL() { + return dComIfGs_getItem(SLOT_6, true) == IRONBALL ? 1 : 0; } -#pragma pop -/* 80099EFC-80099F40 09483C 0044+00 1/0 0/0 0/0 .text item_getcheck_func_BOW__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_BOW() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_BOW__Fv.s" +s32 item_getcheck_func_BOW() { + return dComIfGs_getItem(SLOT_4, false) == BOW ? 1 : 0; } -#pragma pop -/* 80099F40-80099F84 094880 0044+00 1/0 0/0 0/0 .text item_getcheck_func_HOOKSHOT__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_HOOKSHOT() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_HOOKSHOT__Fv.s" +s32 item_getcheck_func_HOOKSHOT() { + return dComIfGs_getItem(SLOT_9, true) == HOOKSHOT ? 1 : 0; } -#pragma pop -/* 80099F84-80099FC8 0948C4 0044+00 1/0 0/0 0/0 .text item_getcheck_func_HVY_BOOTS__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_HVY_BOOTS() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_HVY_BOOTS__Fv.s" +s32 item_getcheck_func_HVY_BOOTS() { + return dComIfGs_getItem(SLOT_3, true) == HVY_BOOTS ? 1 : 0; } -#pragma pop -/* 80099FC8-8009A00C 094908 0044+00 1/0 0/0 0/0 .text item_getcheck_func_COPY_ROD__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_COPY_ROD() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_COPY_ROD__Fv.s" +s32 item_getcheck_func_COPY_ROD() { + return dComIfGs_getItem(SLOT_8, true) == COPY_ROD ? 1 : 0; } -#pragma pop -/* 8009A00C-8009A050 09494C 0044+00 1/0 0/0 0/0 .text item_getcheck_func_W_HOOKSHOT__Fv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_W_HOOKSHOT() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_W_HOOKSHOT__Fv.s" +s32 item_getcheck_func_W_HOOKSHOT() { + return dComIfGs_getItem(SLOT_10, true) == W_HOOKSHOT ? 1 : 0; } -#pragma pop -/* 8009A050-8009A094 094990 0044+00 1/0 0/0 0/0 .text item_getcheck_func_KANTERA__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_KANTERA() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_KANTERA__Fv.s" +s32 item_getcheck_func_KANTERA() { + return dComIfGs_getItem(SLOT_1, true) == KANTERA ? 1 : 0; } -#pragma pop -/* 8009A094-8009A0C8 0949D4 0034+00 1/0 0/0 0/0 .text item_getcheck_func_LIGHT_SWORD__Fv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_LIGHT_SWORD() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_LIGHT_SWORD__Fv.s" +s32 item_getcheck_func_LIGHT_SWORD() { + return dComIfGs_isCollectSword(COLLECT_LIGHT_SWORD); } -#pragma pop /* 8009A0C8-8009A1FC 094A08 0134+00 7/6 0/0 0/0 .text item_getcheck_func_FISHING_ROD_1__Fv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void item_getcheck_func_FISHING_ROD_1() { +asm s32 item_getcheck_func_FISHING_ROD_1() { nofralloc #include "asm/d/d_item/item_getcheck_func_FISHING_ROD_1__Fv.s" } #pragma pop -/* 8009A1FC-8009A240 094B3C 0044+00 1/0 0/0 0/0 .text item_getcheck_func_PACHINKO__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_PACHINKO() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_PACHINKO__Fv.s" +s32 item_getcheck_func_PACHINKO() { + return dComIfGs_getItem(SLOT_23, true) == PACHINKO ? 1 : 0; } -#pragma pop -/* 8009A240-8009A248 094B80 0008+00 1/0 0/0 0/0 .text item_getcheck_func_COPY_ROD_2__Fv - */ -static s32 item_getcheck_func_COPY_ROD_2() { +s32 item_getcheck_func_COPY_ROD_2() { return -1; } -/* 8009A248-8009A278 094B88 0030+00 1/0 0/0 0/0 .text item_getcheck_func_BOMB_BAG_LV2__Fv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_BOMB_BAG_LV2() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_BOMB_BAG_LV2__Fv.s" +s32 item_getcheck_func_BOMB_BAG_LV2() { + return dComIfGs_isItemFirstBit(BOMB_BAG_LV2); } -#pragma pop -/* 8009A278-8009A2A8 094BB8 0030+00 1/0 0/0 0/0 .text item_getcheck_func_BOMB_BAG_LV1__Fv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_BOMB_BAG_LV1() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_BOMB_BAG_LV1__Fv.s" +s32 item_getcheck_func_BOMB_BAG_LV1() { + return dComIfGs_isItemFirstBit(BOMB_BAG_LV1); } -#pragma pop -/* 8009A2A8-8009A2D8 094BE8 0030+00 1/0 0/0 0/0 .text item_getcheck_func_BOMB_IN_BAG__Fv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_BOMB_IN_BAG() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_BOMB_IN_BAG__Fv.s" +s32 item_getcheck_func_BOMB_IN_BAG() { + return dComIfGs_isItemFirstBit(BOMB_IN_BAG); } -#pragma pop -/* 8009A2D8-8009A308 094C18 0030+00 1/0 0/0 0/0 .text item_getcheck_func_LIGHT_ARROW__Fv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_LIGHT_ARROW() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_LIGHT_ARROW__Fv.s" +s32 item_getcheck_func_LIGHT_ARROW() { + return dComIfGs_isItemFirstBit(LIGHT_ARROW); } -#pragma pop -/* 8009A308-8009A378 094C48 0070+00 1/0 0/0 0/0 .text item_getcheck_func_ARROW_LV1__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_ARROW_LV1() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_ARROW_LV1__Fv.s" +s32 item_getcheck_func_ARROW_LV1() { + return (dComIfGs_getItem(SLOT_4, false) == BOW && dComIfGs_getArrowMax() >= 30) ? 1 : 0; } -#pragma pop -/* 8009A378-8009A3E8 094CB8 0070+00 1/0 0/0 0/0 .text item_getcheck_func_ARROW_LV2__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_ARROW_LV2() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_ARROW_LV2__Fv.s" +s32 item_getcheck_func_ARROW_LV2() { + return (dComIfGs_getItem(SLOT_4, false) == BOW && dComIfGs_getArrowMax() >= 60) ? 1 : 0; } -#pragma pop -/* 8009A3E8-8009A458 094D28 0070+00 1/0 0/0 0/0 .text item_getcheck_func_ARROW_LV3__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_ARROW_LV3() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_ARROW_LV3__Fv.s" +s32 item_getcheck_func_ARROW_LV3() { + return (dComIfGs_getItem(SLOT_4, false) == BOW && dComIfGs_getArrowMax() >= 100) ? 1 : 0; } -#pragma pop -/* 8009A458-8009A460 094D98 0008+00 1/0 0/0 0/0 .text item_getcheck_func_LURE_ROD__Fv */ -static s32 item_getcheck_func_LURE_ROD() { +s32 item_getcheck_func_LURE_ROD() { return -1; } -/* 8009A460-8009A468 094DA0 0008+00 1/0 0/0 0/0 .text item_getcheck_func_BOMB_ARROW__Fv - */ -static s32 item_getcheck_func_BOMB_ARROW() { +s32 item_getcheck_func_BOMB_ARROW() { return -1; } -/* 8009A468-8009A470 094DA8 0008+00 1/0 0/0 0/0 .text item_getcheck_func_HAWK_ARROW__Fv - */ -static s32 item_getcheck_func_HAWK_ARROW() { +s32 item_getcheck_func_HAWK_ARROW() { return -1; } -/* 8009A470-8009A490 094DB0 0020+00 1/0 0/0 0/0 .text item_getcheck_func_BEE_ROD__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_BEE_ROD() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_BEE_ROD__Fv.s" +s32 item_getcheck_func_BEE_ROD() { + return item_getcheck_func_FISHING_ROD_1(); } -#pragma pop -/* 8009A490-8009A4B0 094DD0 0020+00 1/0 0/0 0/0 .text item_getcheck_func_JEWEL_ROD__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_JEWEL_ROD() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_JEWEL_ROD__Fv.s" +s32 item_getcheck_func_JEWEL_ROD() { + return item_getcheck_func_FISHING_ROD_1(); } -#pragma pop -/* 8009A4B0-8009A4D0 094DF0 0020+00 1/0 0/0 0/0 .text item_getcheck_func_WORM_ROD__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_WORM_ROD() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_WORM_ROD__Fv.s" +s32 item_getcheck_func_WORM_ROD() { + return item_getcheck_func_FISHING_ROD_1(); } -#pragma pop -/* 8009A4D0-8009A4F0 094E10 0020+00 1/0 0/0 0/0 .text item_getcheck_func_JEWEL_BEE_ROD__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_JEWEL_BEE_ROD() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_JEWEL_BEE_ROD__Fv.s" +s32 item_getcheck_func_JEWEL_BEE_ROD() { + return item_getcheck_func_FISHING_ROD_1(); } -#pragma pop -/* 8009A4F0-8009A510 094E30 0020+00 1/0 0/0 0/0 .text item_getcheck_func_JEWEL_WORM_ROD__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_JEWEL_WORM_ROD() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_JEWEL_WORM_ROD__Fv.s" +s32 item_getcheck_func_JEWEL_WORM_ROD() { + return item_getcheck_func_FISHING_ROD_1(); } -#pragma pop -/* 8009A510-8009A544 094E50 0034+00 1/0 0/0 0/0 .text item_getcheck_func_EMPTY_BOTTLE__Fv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_EMPTY_BOTTLE() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_EMPTY_BOTTLE__Fv.s" +s32 item_getcheck_func_EMPTY_BOTTLE() { + return dComIfGs_checkBottle(EMPTY_BOTTLE); } -#pragma pop -/* 8009A544-8009A578 094E84 0034+00 1/0 0/0 0/0 .text item_getcheck_func_RED_BOTTLE__Fv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_RED_BOTTLE() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_RED_BOTTLE__Fv.s" +s32 item_getcheck_func_RED_BOTTLE() { + return dComIfGs_checkBottle(RED_BOTTLE); } -#pragma pop -/* 8009A578-8009A5AC 094EB8 0034+00 1/0 0/0 0/0 .text item_getcheck_func_GREEN_BOTTLE__Fv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_GREEN_BOTTLE() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_GREEN_BOTTLE__Fv.s" +s32 item_getcheck_func_GREEN_BOTTLE() { + return dComIfGs_checkBottle(GREEN_BOTTLE); } -#pragma pop -/* 8009A5AC-8009A5E0 094EEC 0034+00 1/0 0/0 0/0 .text item_getcheck_func_BLUE_BOTTLE__Fv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_BLUE_BOTTLE() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_BLUE_BOTTLE__Fv.s" +s32 item_getcheck_func_BLUE_BOTTLE() { + return dComIfGs_checkBottle(BLUE_BOTTLE); } -#pragma pop -/* 8009A5E0-8009A614 094F20 0034+00 1/0 0/0 0/0 .text item_getcheck_func_MILK_BOTTLE__Fv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_MILK_BOTTLE() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_MILK_BOTTLE__Fv.s" +s32 item_getcheck_func_MILK_BOTTLE() { + return dComIfGs_checkBottle(MILK_BOTTLE); } -#pragma pop -/* 8009A614-8009A648 094F54 0034+00 1/0 0/0 0/0 .text item_getcheck_func_HALF_MILK_BOTTLE__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_HALF_MILK_BOTTLE() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_HALF_MILK_BOTTLE__Fv.s" +s32 item_getcheck_func_HALF_MILK_BOTTLE() { + return dComIfGs_checkBottle(HALF_MILK_BOTTLE); } -#pragma pop -/* 8009A648-8009A67C 094F88 0034+00 1/0 0/0 0/0 .text item_getcheck_func_OIL_BOTTLE__Fv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_OIL_BOTTLE() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_OIL_BOTTLE__Fv.s" +s32 item_getcheck_func_OIL_BOTTLE() { + return dComIfGs_checkBottle(OIL_BOTTLE); } -#pragma pop -/* 8009A67C-8009A6B0 094FBC 0034+00 1/0 0/0 0/0 .text item_getcheck_func_WATER_BOTTLE__Fv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_WATER_BOTTLE() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_WATER_BOTTLE__Fv.s" +s32 item_getcheck_func_WATER_BOTTLE() { + return dComIfGs_checkBottle(WATER_BOTTLE); } -#pragma pop -/* 8009A6B0-8009A6E4 094FF0 0034+00 1/0 0/0 0/0 .text item_getcheck_func_OIL_BOTTLE2__Fv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_OIL_BOTTLE2() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_OIL_BOTTLE2__Fv.s" +s32 item_getcheck_func_OIL_BOTTLE2() { + return dComIfGs_checkBottle(OIL_BOTTLE_2); } -#pragma pop -/* 8009A6E4-8009A718 095024 0034+00 1/0 0/0 0/0 .text item_getcheck_func_RED_BOTTLE2__Fv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_RED_BOTTLE2() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_RED_BOTTLE2__Fv.s" +s32 item_getcheck_func_RED_BOTTLE2() { + return dComIfGs_checkBottle(RED_BOTTLE_2); } -#pragma pop -/* 8009A718-8009A74C 095058 0034+00 1/0 0/0 0/0 .text item_getcheck_func_UGLY_SOUP__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_UGLY_SOUP() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_UGLY_SOUP__Fv.s" +s32 item_getcheck_func_UGLY_SOUP() { + return dComIfGs_checkBottle(UGLY_SOUP); } -#pragma pop -/* 8009A74C-8009A780 09508C 0034+00 1/0 0/0 0/0 .text item_getcheck_func_HOT_SPRING__Fv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_HOT_SPRING() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_HOT_SPRING__Fv.s" +s32 item_getcheck_func_HOT_SPRING() { + return dComIfGs_checkBottle(HOT_SPRING); } -#pragma pop -/* 8009A780-8009A7B4 0950C0 0034+00 1/0 0/0 0/0 .text item_getcheck_func_FAIRY_BOTTLE__Fv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_FAIRY_BOTTLE() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_FAIRY_BOTTLE__Fv.s" +s32 item_getcheck_func_FAIRY_BOTTLE() { + return dComIfGs_checkBottle(FAIRY); } -#pragma pop -/* 8009A7B4-8009A7E8 0950F4 0034+00 1/0 0/0 0/0 .text item_getcheck_func_HOT_SPRING2__Fv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_HOT_SPRING2() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_HOT_SPRING2__Fv.s" +s32 item_getcheck_func_HOT_SPRING2() { + return dComIfGs_checkBottle(HOT_SPRING); } -#pragma pop -/* 8009A7E8-8009A81C 095128 0034+00 1/0 0/0 0/0 .text item_getcheck_func_OIL2__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_OIL2() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_OIL2__Fv.s" +s32 item_getcheck_func_OIL2() { + return dComIfGs_checkBottle(OIL2); } -#pragma pop -/* 8009A81C-8009A850 09515C 0034+00 1/0 0/0 0/0 .text item_getcheck_func_OIL__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_OIL() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_OIL__Fv.s" +s32 item_getcheck_func_OIL() { + return dComIfGs_checkBottle(OIL); } -#pragma pop -/* 8009A850-8009A880 095190 0030+00 1/0 0/0 0/0 .text item_getcheck_func_NORMAL_BOMB__Fv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_NORMAL_BOMB() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_NORMAL_BOMB__Fv.s" +s32 item_getcheck_func_NORMAL_BOMB() { + return dComIfGs_isItemFirstBit(NORMAL_BOMB); } -#pragma pop -/* 8009A880-8009A8B0 0951C0 0030+00 1/0 0/0 0/0 .text item_getcheck_func_WATER_BOMB__Fv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_WATER_BOMB() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_WATER_BOMB__Fv.s" +s32 item_getcheck_func_WATER_BOMB() { + return dComIfGs_isItemFirstBit(WATER_BOMB); } -#pragma pop -/* 8009A8B0-8009A8E0 0951F0 0030+00 1/0 0/0 0/0 .text item_getcheck_func_POKE_BOMB__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_POKE_BOMB() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_POKE_BOMB__Fv.s" +s32 item_getcheck_func_POKE_BOMB() { + return dComIfGs_isItemFirstBit(POKE_BOMB); } -#pragma pop -/* 8009A8E0-8009A914 095220 0034+00 1/0 0/0 0/0 .text item_getcheck_func_FAIRY_DROP__Fv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_FAIRY_DROP() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_FAIRY_DROP__Fv.s" +s32 item_getcheck_func_FAIRY_DROP() { + return dComIfGs_checkBottle(FAIRY_DROP); } -#pragma pop -/* 8009A914-8009A948 095254 0034+00 1/0 0/0 0/0 .text item_getcheck_func_WORM__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_WORM() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_WORM__Fv.s" +s32 item_getcheck_func_WORM() { + return dComIfGs_checkBottle(WORM); } -#pragma pop -/* 8009A948-8009A978 095288 0030+00 1/0 0/0 0/0 .text item_getcheck_func_DROP_BOTTLE__Fv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_DROP_BOTTLE() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_DROP_BOTTLE__Fv.s" +s32 item_getcheck_func_DROP_BOTTLE() { + return dComIfGs_isItemFirstBit(DROP_BOTTLE); } -#pragma pop -/* 8009A978-8009A980 0952B8 0008+00 1/0 0/0 0/0 .text item_getcheck_func_BEE_CHILD__Fv */ -static s32 item_getcheck_func_BEE_CHILD() { +s32 item_getcheck_func_BEE_CHILD() { return -1; } -/* 8009A980-8009A9B4 0952C0 0034+00 1/0 0/0 0/0 .text item_getcheck_func_CHUCHU_RARE__Fv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_CHUCHU_RARE() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_CHUCHU_RARE__Fv.s" +s32 item_getcheck_func_CHUCHU_RARE() { + return dComIfGs_checkBottle(CHUCHU_RARE); } -#pragma pop -/* 8009A9B4-8009A9E8 0952F4 0034+00 1/0 0/0 0/0 .text item_getcheck_func_CHUCHU_RED__Fv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_CHUCHU_RED() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_CHUCHU_RED__Fv.s" +s32 item_getcheck_func_CHUCHU_RED() { + return dComIfGs_checkBottle(CHUCHU_RED); } -#pragma pop -/* 8009A9E8-8009AA1C 095328 0034+00 1/0 0/0 0/0 .text item_getcheck_func_CHUCHU_BLUE__Fv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_CHUCHU_BLUE() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_CHUCHU_BLUE__Fv.s" +s32 item_getcheck_func_CHUCHU_BLUE() { + return dComIfGs_checkBottle(CHUCHU_BLUE); } -#pragma pop -/* 8009AA1C-8009AA50 09535C 0034+00 1/0 0/0 0/0 .text item_getcheck_func_CHUCHU_GREEN__Fv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_CHUCHU_GREEN() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_CHUCHU_GREEN__Fv.s" +s32 item_getcheck_func_CHUCHU_GREEN() { + return dComIfGs_checkBottle(CHUCHU_GREEN); } -#pragma pop -/* 8009AA50-8009AA84 095390 0034+00 1/0 0/0 0/0 .text item_getcheck_func_CHUCHU_YELLOW__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_CHUCHU_YELLOW() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_CHUCHU_YELLOW__Fv.s" +s32 item_getcheck_func_CHUCHU_YELLOW() { + return dComIfGs_checkBottle(CHUCHU_YELLOW); } -#pragma pop -/* 8009AA84-8009AAB8 0953C4 0034+00 1/0 0/0 0/0 .text item_getcheck_func_CHUCHU_PURPLE__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_CHUCHU_PURPLE() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_CHUCHU_PURPLE__Fv.s" +s32 item_getcheck_func_CHUCHU_PURPLE() { + return dComIfGs_checkBottle(CHUCHU_PURPLE); } -#pragma pop -/* 8009AAB8-8009AAE8 0953F8 0030+00 1/0 0/0 0/0 .text item_getcheck_func_LV1_SOUP__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_LV1_SOUP() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_LV1_SOUP__Fv.s" +s32 item_getcheck_func_LV1_SOUP() { + return dComIfGs_isItemFirstBit(LV1_SOUP); } -#pragma pop -/* 8009AAE8-8009AB18 095428 0030+00 1/0 0/0 0/0 .text item_getcheck_func_LV2_SOUP__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_LV2_SOUP() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_LV2_SOUP__Fv.s" +s32 item_getcheck_func_LV2_SOUP() { + return dComIfGs_isItemFirstBit(LV2_SOUP); } -#pragma pop -/* 8009AB18-8009AB48 095458 0030+00 1/0 0/0 0/0 .text item_getcheck_func_LV3_SOUP__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_LV3_SOUP() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_LV3_SOUP__Fv.s" +s32 item_getcheck_func_LV3_SOUP() { + return dComIfGs_isItemFirstBit(LV3_SOUP); } -#pragma pop -/* 8009AB48-8009AB8C 095488 0044+00 1/0 0/0 0/0 .text item_getcheck_func_LETTER__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_LETTER() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_LETTER__Fv.s" +s32 item_getcheck_func_LETTER() { + return dComIfGs_getItem(SLOT_21, true) == LETTER ? 1 : 0; } -#pragma pop -/* 8009AB8C-8009ABD0 0954CC 0044+00 1/0 0/0 0/0 .text item_getcheck_func_BILL__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_BILL() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_BILL__Fv.s" +s32 item_getcheck_func_BILL() { + return dComIfGs_getItem(SLOT_21, true) == BILL ? 1 : 0; } -#pragma pop -/* 8009ABD0-8009AC14 095510 0044+00 1/0 0/0 0/0 .text item_getcheck_func_WOOD_STATUE__Fv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_WOOD_STATUE() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_WOOD_STATUE__Fv.s" +s32 item_getcheck_func_WOOD_STATUE() { + return dComIfGs_getItem(SLOT_21, true) == WOOD_STATUE ? 1 : 0; } -#pragma pop -/* 8009AC14-8009AC58 095554 0044+00 1/0 0/0 0/0 .text item_getcheck_func_IRIAS_PENDANT__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_IRIAS_PENDANT() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_IRIAS_PENDANT__Fv.s" +s32 item_getcheck_func_IRIAS_PENDANT() { + return dComIfGs_getItem(SLOT_21, true) == IRIAS_PENDANT ? 1 : 0; } -#pragma pop -/* 8009AC58-8009AC9C 095598 0044+00 1/0 0/0 0/0 .text item_getcheck_func_HORSE_FLUTE__Fv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_HORSE_FLUTE() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_HORSE_FLUTE__Fv.s" +s32 item_getcheck_func_HORSE_FLUTE() { + return dComIfGs_getItem(SLOT_22, true) == HORSE_FLUTE ? 1 : 0; } -#pragma pop -/* 8009AC9C-8009ACE0 0955DC 0044+00 1/0 0/0 0/0 .text item_getcheck_func_RAFRELS_MEMO__Fv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_RAFRELS_MEMO() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_RAFRELS_MEMO__Fv.s" +s32 item_getcheck_func_RAFRELS_MEMO() { + return dComIfGs_getItem(SLOT_19, true) == RAFRELS_MEMO ? 1 : 0; } -#pragma pop -/* 8009ACE0-8009AD24 095620 0044+00 1/0 0/0 0/0 .text item_getcheck_func_ASHS_SCRIBBLING__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_ASHS_SCRIBBLING() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_ASHS_SCRIBBLING__Fv.s" +s32 item_getcheck_func_ASHS_SCRIBBLING() { + return dComIfGs_getItem(SLOT_19, true) == ASHS_SCRIBBLING ? 1 : 0; } -#pragma pop -/* 8009AD24-8009AD58 095664 0034+00 1/0 0/0 0/0 .text item_getcheck_func_CHUCHU_YELLOW2__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_CHUCHU_YELLOW2() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_CHUCHU_YELLOW2__Fv.s" +s32 item_getcheck_func_CHUCHU_YELLOW2() { + return dComIfGs_checkBottle(CHUCHU_YELLOW2); } -#pragma pop -/* 8009AD58-8009AD60 095698 0008+00 1/0 0/0 0/0 .text item_getcheck_func_OIL_BOTTLE3__Fv - */ -static s32 item_getcheck_func_OIL_BOTTLE3() { +s32 item_getcheck_func_OIL_BOTTLE3() { return -1; } -/* 8009AD60-8009AD68 0956A0 0008+00 1/0 0/0 0/0 .text item_getcheck_func_SHOP_BEE_CHILD__Fv */ -static s32 item_getcheck_func_SHOP_BEE_CHILD() { +s32 item_getcheck_func_SHOP_BEE_CHILD() { return -1; } -/* 8009AD68-8009AD9C 0956A8 0034+00 1/0 0/0 0/0 .text item_getcheck_func_CHUCHU_BLACK__Fv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_CHUCHU_BLACK() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_CHUCHU_BLACK__Fv.s" +s32 item_getcheck_func_CHUCHU_BLACK() { + return dComIfGs_checkBottle(CHUCHU_BLACK); } -#pragma pop -/* 8009AD9C-8009ADCC 0956DC 0030+00 1/0 0/0 0/0 .text item_getcheck_func_LIGHT_DROP__Fv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_LIGHT_DROP() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_LIGHT_DROP__Fv.s" +s32 item_getcheck_func_LIGHT_DROP() { + return dComIfGs_isItemFirstBit(LIGHT_DROP); } -#pragma pop -/* 8009ADCC-8009ADFC 09570C 0030+00 1/0 0/0 0/0 .text item_getcheck_func_DROP_CONTAINER__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_DROP_CONTAINER() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_DROP_CONTAINER__Fv.s" +s32 item_getcheck_func_DROP_CONTAINER() { + return dComIfGs_isLightDropGetFlag(FARON_VESSEL); } -#pragma pop -/* 8009ADFC-8009AE2C 09573C 0030+00 1/0 0/0 0/0 .text item_getcheck_func_DROP_CONTAINER02__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_DROP_CONTAINER02() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_DROP_CONTAINER02__Fv.s" +s32 item_getcheck_func_DROP_CONTAINER02() { + return dComIfGs_isLightDropGetFlag(ELDIN_VESSEL); } -#pragma pop -/* 8009AE2C-8009AE5C 09576C 0030+00 1/0 0/0 0/0 .text item_getcheck_func_DROP_CONTAINER03__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_DROP_CONTAINER03() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_DROP_CONTAINER03__Fv.s" +s32 item_getcheck_func_DROP_CONTAINER03() { + return dComIfGs_isLightDropGetFlag(LANAYRU_VESSEL); } -#pragma pop -/* 8009AE5C-8009AE64 09579C 0008+00 1/0 0/0 0/0 .text item_getcheck_func_FILLED_CONTAINER__Fv */ -static s32 item_getcheck_func_FILLED_CONTAINER() { +s32 item_getcheck_func_FILLED_CONTAINER() { return -1; } -/* 8009AE64-8009AE6C 0957A4 0008+00 1/0 0/0 0/0 .text item_getcheck_func_MIRROR_PIECE_2__Fv */ -static s32 item_getcheck_func_MIRROR_PIECE_2() { +s32 item_getcheck_func_MIRROR_PIECE_2() { return -1; } -/* 8009AE6C-8009AE74 0957AC 0008+00 1/0 0/0 0/0 .text item_getcheck_func_MIRROR_PIECE_3__Fv */ -static s32 item_getcheck_func_MIRROR_PIECE_3() { +s32 item_getcheck_func_MIRROR_PIECE_3() { return -1; } -/* 8009AE74-8009AE7C 0957B4 0008+00 1/0 0/0 0/0 .text item_getcheck_func_MIRROR_PIECE_4__Fv */ -static s32 item_getcheck_func_MIRROR_PIECE_4() { +s32 item_getcheck_func_MIRROR_PIECE_4() { return -1; } -/* 8009AE7C-8009AE98 0957BC 001C+00 1/0 0/0 0/0 .text item_getcheck_func_SMELL_YELIA_POUCH__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_SMELL_YELIA_POUCH() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_SMELL_YELIA_POUCH__Fv.s" +s32 item_getcheck_func_SMELL_YELIA_POUCH() { + return dComIfGs_getCollectSmell() == SMELL_YELIA_POUCH ? 1 : 0; } -#pragma pop -/* 8009AE98-8009AEA0 0957D8 0008+00 1/0 0/0 0/0 .text item_getcheck_func_SMELL_PUMPKIN__Fv */ -static s32 item_getcheck_func_SMELL_PUMPKIN() { +s32 item_getcheck_func_SMELL_PUMPKIN() { return -1; } -/* 8009AEA0-8009AEBC 0957E0 001C+00 1/0 0/0 0/0 .text item_getcheck_func_SMELL_POH__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_SMELL_POH() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_SMELL_POH__Fv.s" +s32 item_getcheck_func_SMELL_POH() { + return dComIfGs_getCollectSmell() == SMELL_POH ? 1 : 0; } -#pragma pop -/* 8009AEBC-8009AED8 0957FC 001C+00 1/0 0/0 0/0 .text item_getcheck_func_SMELL_FISH__Fv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_SMELL_FISH() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_SMELL_FISH__Fv.s" +s32 item_getcheck_func_SMELL_FISH() { + return dComIfGs_getCollectSmell() == SMELL_FISH ? 1 : 0; } -#pragma pop -/* 8009AED8-8009AEF4 095818 001C+00 1/0 0/0 0/0 .text item_getcheck_func_SMELL_CHILDREN__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_SMELL_CHILDREN() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_SMELL_CHILDREN__Fv.s" +s32 item_getcheck_func_SMELL_CHILDREN() { + return dComIfGs_getCollectSmell() == SMELL_CHILDREN ? 1 : 0; } -#pragma pop -/* 8009AEF4-8009AF10 095834 001C+00 1/0 0/0 0/0 .text item_getcheck_func_SMELL_MEDICINE__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_SMELL_MEDICINE() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_SMELL_MEDICINE__Fv.s" +s32 item_getcheck_func_SMELL_MEDICINE() { + return dComIfGs_getCollectSmell() == SMELL_MEDICINE ? 1 : 0; } -#pragma pop -/* 8009AF10-8009AF40 095850 0030+00 1/0 0/0 0/0 .text item_getcheck_func_M_BEETLE__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_M_BEETLE() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_M_BEETLE__Fv.s" +s32 item_getcheck_func_M_BEETLE() { + return dComIfGs_isItemFirstBit(M_BEETLE); } -#pragma pop -/* 8009AF40-8009AF70 095880 0030+00 1/0 0/0 0/0 .text item_getcheck_func_F_BEETLE__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_F_BEETLE() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_F_BEETLE__Fv.s" +s32 item_getcheck_func_F_BEETLE() { + return dComIfGs_isItemFirstBit(F_BEETLE); } -#pragma pop -/* 8009AF70-8009AFA0 0958B0 0030+00 1/0 0/0 0/0 .text item_getcheck_func_M_BUTTERFLY__Fv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_M_BUTTERFLY() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_M_BUTTERFLY__Fv.s" +s32 item_getcheck_func_M_BUTTERFLY() { + return dComIfGs_isItemFirstBit(M_BUTTERFLY); } -#pragma pop -/* 8009AFA0-8009AFD0 0958E0 0030+00 1/0 0/0 0/0 .text item_getcheck_func_F_BUTTERFLY__Fv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_F_BUTTERFLY() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_F_BUTTERFLY__Fv.s" +s32 item_getcheck_func_F_BUTTERFLY() { + return dComIfGs_isItemFirstBit(F_BUTTERFLY); } -#pragma pop -/* 8009AFD0-8009B000 095910 0030+00 1/0 0/0 0/0 .text item_getcheck_func_M_STAG_BEETLE__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_M_STAG_BEETLE() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_M_STAG_BEETLE__Fv.s" +s32 item_getcheck_func_M_STAG_BEETLE() { + return dComIfGs_isItemFirstBit(M_STAG_BEETLE); } -#pragma pop -/* 8009B000-8009B030 095940 0030+00 1/0 0/0 0/0 .text item_getcheck_func_F_STAG_BEETLE__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_F_STAG_BEETLE() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_F_STAG_BEETLE__Fv.s" +s32 item_getcheck_func_F_STAG_BEETLE() { + return dComIfGs_isItemFirstBit(F_STAG_BEETLE); } -#pragma pop -/* 8009B030-8009B060 095970 0030+00 1/0 0/0 0/0 .text item_getcheck_func_M_GRASSHOPPER__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_M_GRASSHOPPER() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_M_GRASSHOPPER__Fv.s" +s32 item_getcheck_func_M_GRASSHOPPER() { + return dComIfGs_isItemFirstBit(M_GRASSHOPPER); } -#pragma pop -/* 8009B060-8009B090 0959A0 0030+00 1/0 0/0 0/0 .text item_getcheck_func_F_GRASSHOPPER__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_F_GRASSHOPPER() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_F_GRASSHOPPER__Fv.s" +s32 item_getcheck_func_F_GRASSHOPPER() { + return dComIfGs_isItemFirstBit(F_GRASSHOPPER); } -#pragma pop -/* 8009B090-8009B0C0 0959D0 0030+00 1/0 0/0 0/0 .text item_getcheck_func_M_NANAFUSHI__Fv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_M_NANAFUSHI() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_M_NANAFUSHI__Fv.s" +s32 item_getcheck_func_M_NANAFUSHI() { + return dComIfGs_isItemFirstBit(M_NANAFUSHI); } -#pragma pop -/* 8009B0C0-8009B0F0 095A00 0030+00 1/0 0/0 0/0 .text item_getcheck_func_F_NANAFUSHI__Fv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_F_NANAFUSHI() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_F_NANAFUSHI__Fv.s" +s32 item_getcheck_func_F_NANAFUSHI() { + return dComIfGs_isItemFirstBit(F_NANAFUSHI); } -#pragma pop -/* 8009B0F0-8009B120 095A30 0030+00 1/0 0/0 0/0 .text item_getcheck_func_M_DANGOMUSHI__Fv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_M_DANGOMUSHI() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_M_DANGOMUSHI__Fv.s" +s32 item_getcheck_func_M_DANGOMUSHI() { + return dComIfGs_isItemFirstBit(M_DANGOMUSHI); } -#pragma pop -/* 8009B120-8009B150 095A60 0030+00 1/0 0/0 0/0 .text item_getcheck_func_F_DANGOMUSHI__Fv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_F_DANGOMUSHI() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_F_DANGOMUSHI__Fv.s" +s32 item_getcheck_func_F_DANGOMUSHI() { + return dComIfGs_isItemFirstBit(F_DANGOMUSHI); } -#pragma pop -/* 8009B150-8009B180 095A90 0030+00 1/0 0/0 0/0 .text item_getcheck_func_M_MANTIS__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_M_MANTIS() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_M_MANTIS__Fv.s" +s32 item_getcheck_func_M_MANTIS() { + return dComIfGs_isItemFirstBit(M_MANTIS); } -#pragma pop -/* 8009B180-8009B1B0 095AC0 0030+00 1/0 0/0 0/0 .text item_getcheck_func_F_MANTIS__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_F_MANTIS() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_F_MANTIS__Fv.s" +s32 item_getcheck_func_F_MANTIS() { + return dComIfGs_isItemFirstBit(F_MANTIS); } -#pragma pop -/* 8009B1B0-8009B1E0 095AF0 0030+00 1/0 0/0 0/0 .text item_getcheck_func_M_LADYBUG__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_M_LADYBUG() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_M_LADYBUG__Fv.s" +s32 item_getcheck_func_M_LADYBUG() { + return dComIfGs_isItemFirstBit(M_LADYBUG); } -#pragma pop -/* 8009B1E0-8009B210 095B20 0030+00 1/0 0/0 0/0 .text item_getcheck_func_F_LADYBUG__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_F_LADYBUG() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_F_LADYBUG__Fv.s" +s32 item_getcheck_func_F_LADYBUG() { + return dComIfGs_isItemFirstBit(F_LADYBUG); } -#pragma pop -/* 8009B210-8009B240 095B50 0030+00 1/0 0/0 0/0 .text item_getcheck_func_M_SNAIL__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_M_SNAIL() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_M_SNAIL__Fv.s" +s32 item_getcheck_func_M_SNAIL() { + return dComIfGs_isItemFirstBit(M_SNAIL); } -#pragma pop -/* 8009B240-8009B270 095B80 0030+00 1/0 0/0 0/0 .text item_getcheck_func_F_SNAIL__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_F_SNAIL() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_F_SNAIL__Fv.s" +s32 item_getcheck_func_F_SNAIL() { + return dComIfGs_isItemFirstBit(F_SNAIL); } -#pragma pop -/* 8009B270-8009B2A0 095BB0 0030+00 1/0 0/0 0/0 .text item_getcheck_func_M_DRAGONFLY__Fv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_M_DRAGONFLY() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_M_DRAGONFLY__Fv.s" +s32 item_getcheck_func_M_DRAGONFLY() { + return dComIfGs_isItemFirstBit(M_DRAGONFLY); } -#pragma pop -/* 8009B2A0-8009B2D0 095BE0 0030+00 1/0 0/0 0/0 .text item_getcheck_func_F_DRAGONFLY__Fv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_F_DRAGONFLY() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_F_DRAGONFLY__Fv.s" +s32 item_getcheck_func_F_DRAGONFLY() { + return dComIfGs_isItemFirstBit(F_DRAGONFLY); } -#pragma pop -/* 8009B2D0-8009B300 095C10 0030+00 1/0 0/0 0/0 .text item_getcheck_func_M_ANT__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_M_ANT() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_M_ANT__Fv.s" +s32 item_getcheck_func_M_ANT() { + return dComIfGs_isItemFirstBit(M_ANT); } -#pragma pop -/* 8009B300-8009B330 095C40 0030+00 1/0 0/0 0/0 .text item_getcheck_func_F_ANT__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_F_ANT() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_F_ANT__Fv.s" +s32 item_getcheck_func_F_ANT() { + return dComIfGs_isItemFirstBit(F_ANT); } -#pragma pop -/* 8009B330-8009B360 095C70 0030+00 1/0 0/0 0/0 .text item_getcheck_func_M_MAYFLY__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_M_MAYFLY() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_M_MAYFLY__Fv.s" +s32 item_getcheck_func_M_MAYFLY() { + return dComIfGs_isItemFirstBit(M_MAYFLY); } -#pragma pop -/* 8009B360-8009B390 095CA0 0030+00 1/0 0/0 0/0 .text item_getcheck_func_F_MAYFLY__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_F_MAYFLY() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_F_MAYFLY__Fv.s" +s32 item_getcheck_func_F_MAYFLY() { + return dComIfGs_isItemFirstBit(F_MAYFLY); } -#pragma pop -/* 8009B390-8009B3A0 095CD0 0010+00 1/0 0/0 0/0 .text item_getcheck_func_POU_SPIRIT__Fv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_POU_SPIRIT() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_POU_SPIRIT__Fv.s" +s32 item_getcheck_func_POU_SPIRIT() { + return dComIfGs_getPohSpiritNum(); } -#pragma pop -/* 8009B3A0-8009B3E4 095CE0 0044+00 1/0 0/0 0/0 .text item_getcheck_func_ANCIENT_DOCUMENT__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_ANCIENT_DOCUMENT() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_ANCIENT_DOCUMENT__Fv.s" +s32 item_getcheck_func_ANCIENT_DOCUMENT() { + return dComIfGs_getItem(SLOT_22, true) == ANCIENT_DOCUMENT ? 1 : 0; } -#pragma pop -/* 8009B3E4-8009B428 095D24 0044+00 1/0 0/0 0/0 .text item_getcheck_func_AIR_LETTER__Fv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_AIR_LETTER() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_AIR_LETTER__Fv.s" +s32 item_getcheck_func_AIR_LETTER() { + return dComIfGs_getItem(SLOT_22, true) == AIR_LETTER ? 1 : 0; } -#pragma pop -/* 8009B428-8009B46C 095D68 0044+00 1/0 0/0 0/0 .text item_getcheck_func_ANCIENT_DOCUMENT2__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_ANCIENT_DOCUMENT2() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_ANCIENT_DOCUMENT2__Fv.s" +s32 item_getcheck_func_ANCIENT_DOCUMENT2() { + return dComIfGs_getItem(SLOT_22, true) == ANCIENT_DOCUMENT2 ? 1 : 0; } -#pragma pop -/* 8009B46C-8009B4B0 095DAC 0044+00 1/0 0/0 0/0 .text item_getcheck_func_LV7_DUNGEON_EXIT__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_LV7_DUNGEON_EXIT() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_LV7_DUNGEON_EXIT__Fv.s" +s32 item_getcheck_func_LV7_DUNGEON_EXIT() { + return dComIfGs_getItem(SLOT_18, true) == LV7_DUNGEON_EXIT ? 1 : 0; } -#pragma pop -/* 8009B4B0-8009B4B8 095DF0 0008+00 1/0 0/0 0/0 .text item_getcheck_func_LINKS_SAVINGS__Fv */ -static s32 item_getcheck_func_LINKS_SAVINGS() { +s32 item_getcheck_func_LINKS_SAVINGS() { return -1; } -/* 8009B4B8-8009B4C0 095DF8 0008+00 1/0 0/0 0/0 .text item_getcheck_func_SMALL_KEY2__Fv - */ -static s32 item_getcheck_func_SMALL_KEY2() { +s32 item_getcheck_func_SMALL_KEY2() { return -1; } -/* 8009B4C0-8009B4C8 095E00 0008+00 1/0 0/0 0/0 .text item_getcheck_func_POU_FIRE1__Fv */ -static s32 item_getcheck_func_POU_FIRE1() { +s32 item_getcheck_func_POU_FIRE1() { return -1; } -/* 8009B4C8-8009B4D0 095E08 0008+00 1/0 0/0 0/0 .text item_getcheck_func_POU_FIRE2__Fv */ -static s32 item_getcheck_func_POU_FIRE2() { +s32 item_getcheck_func_POU_FIRE2() { return -1; } -/* 8009B4D0-8009B4D8 095E10 0008+00 1/0 0/0 0/0 .text item_getcheck_func_POU_FIRE3__Fv */ -static s32 item_getcheck_func_POU_FIRE3() { +s32 item_getcheck_func_POU_FIRE3() { return -1; } -/* 8009B4D8-8009B4E0 095E18 0008+00 1/0 0/0 0/0 .text item_getcheck_func_POU_FIRE4__Fv */ -static s32 item_getcheck_func_POU_FIRE4() { +s32 item_getcheck_func_POU_FIRE4() { return -1; } -/* 8009B4E0-8009B4E8 095E20 0008+00 1/0 0/0 0/0 .text item_getcheck_func_BOSSRIDER_KEY__Fv */ -static s32 item_getcheck_func_BOSSRIDER_KEY() { +s32 item_getcheck_func_BOSSRIDER_KEY() { return -1; } -/* 8009B4E8-8009B518 095E28 0030+00 1/0 0/0 0/0 .text item_getcheck_func_TOMATO_PUREE__Fv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_TOMATO_PUREE() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_TOMATO_PUREE__Fv.s" +s32 item_getcheck_func_TOMATO_PUREE() { + return dComIfGs_isItemFirstBit(TOMATO_PUREE); } -#pragma pop -/* 8009B518-8009B548 095E58 0030+00 1/0 0/0 0/0 .text item_getcheck_func_TASTE__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_TASTE() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_TASTE__Fv.s" +s32 item_getcheck_func_TASTE() { + return dComIfGs_isItemFirstBit(TASTE); } -#pragma pop -/* 8009B548-8009B578 095E88 0030+00 1/0 0/0 0/0 .text item_getcheck_func_LV5_BOSS_KEY__Fv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_LV5_BOSS_KEY() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_LV5_BOSS_KEY__Fv.s" +s32 item_getcheck_func_LV5_BOSS_KEY() { + return dComIfGs_isDungeonItemBossKey(); } -#pragma pop -/* 8009B578-8009B580 095EB8 0008+00 1/0 0/0 0/0 .text item_getcheck_func_SURFBOARD__Fv */ -static s32 item_getcheck_func_SURFBOARD() { +s32 item_getcheck_func_SURFBOARD() { return -1; } -/* 8009B580-8009B588 095EC0 0008+00 1/0 0/0 0/0 .text item_getcheck_func_KANTERA2__Fv */ -static s32 item_getcheck_func_KANTERA2() { +s32 item_getcheck_func_KANTERA2() { return -1; } -/* 8009B588-8009B5B8 095EC8 0030+00 1/0 0/0 0/0 .text item_getcheck_func_L2_KEY_PIECES1__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_L2_KEY_PIECES1() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_L2_KEY_PIECES1__Fv.s" +s32 item_getcheck_func_L2_KEY_PIECES1() { + return dComIfGs_isItemFirstBit(L2_KEY_PIECES1); } -#pragma pop -/* 8009B5B8-8009B5E8 095EF8 0030+00 1/0 0/0 0/0 .text item_getcheck_func_L2_KEY_PIECES2__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_L2_KEY_PIECES2() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_L2_KEY_PIECES2__Fv.s" +s32 item_getcheck_func_L2_KEY_PIECES2() { + return dComIfGs_isItemFirstBit(L2_KEY_PIECES2); } -#pragma pop -/* 8009B5E8-8009B618 095F28 0030+00 1/0 0/0 0/0 .text item_getcheck_func_L2_KEY_PIECES3__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_L2_KEY_PIECES3() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_L2_KEY_PIECES3__Fv.s" +s32 item_getcheck_func_L2_KEY_PIECES3() { + return dComIfGs_isItemFirstBit(L2_KEY_PIECES3); } -#pragma pop -/* 8009B618-8009B648 095F58 0030+00 1/0 0/0 0/0 .text item_getcheck_func_KEY_OF_CARAVAN__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_KEY_OF_CARAVAN() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_KEY_OF_CARAVAN__Fv.s" +s32 item_getcheck_func_KEY_OF_CARAVAN() { + return dComIfGs_isItemFirstBit(KEY_OF_CARAVAN); } -#pragma pop -/* 8009B648-8009B678 095F88 0030+00 1/0 0/0 0/0 .text item_getcheck_func_LV2_BOSS_KEY__Fv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_LV2_BOSS_KEY() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_LV2_BOSS_KEY__Fv.s" +s32 item_getcheck_func_LV2_BOSS_KEY() { + return dComIfGs_isDungeonItemBossKey(); } -#pragma pop -/* 8009B678-8009B688 095FB8 0010+00 1/0 0/0 0/0 .text item_getcheck_func_KEY_OF_FILONE__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void item_getcheck_func_KEY_OF_FILONE() { - nofralloc -#include "asm/d/d_item/item_getcheck_func_KEY_OF_FILONE__Fv.s" +s32 item_getcheck_func_KEY_OF_FILONE() { + return dComIfGs_getKeyNum(); } -#pragma pop -/* 8009B688-8009B6D4 095FC8 004C+00 1/1 0/0 0/0 .text isBomb__FUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void isBomb(u8 param_0) { - nofralloc -#include "asm/d/d_item/isBomb__FUc.s" -} -#pragma pop +s32 isBomb(u8 item_no) { + s32 is_bomb = false; -/* 8009B6D4-8009B708 096014 0034+00 1/1 0/0 0/0 .text isArrow__FUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void isArrow(u8 param_0) { - nofralloc -#include "asm/d/d_item/isArrow__FUc.s" + if (item_no == BOMB_5 || item_no == BOMB_10 || item_no == BOMB_20 || item_no == BOMB_30 || + item_no == NORMAL_BOMB | item_no == WATER_BOMB || item_no == POKE_BOMB) { + is_bomb = true; + } + + return is_bomb; +} + +s32 isArrow(u8 item_no) { + s32 is_arrow = false; + + if (item_no == ARROW_1 || item_no == ARROW_10 || item_no == ARROW_20 || item_no == ARROW_30) { + is_arrow = true; + } + + return is_arrow; } -#pragma pop /* 8009B708-8009B77C 096048 0074+00 0/0 4/4 1/1 .text isBottleItem__FUc */ +// probably wrong cases or order +#ifdef NONMATCHING +bool isBottleItem(u8 item_no) { + bool is_bottle_item; + + switch (item_no) { + case RED_BOTTLE: + case GREEN_BOTTLE: + case BLUE_BOTTLE: + case MILK_BOTTLE: + case HALF_MILK_BOTTLE: + case OIL_BOTTLE: + case WATER_BOTTLE: + case OIL_BOTTLE_2: + case RED_BOTTLE_2: + case UGLY_SOUP: + case HOT_SPRING: + case FAIRY: + case HOT_SPRING_2: + case OIL2: + case OIL: + case FAIRY_DROP: + case BEE_CHILD: + case CHUCHU_RARE: + case CHUCHU_RED: + case CHUCHU_BLUE: + case CHUCHU_GREEN: + case CHUCHU_YELLOW: + case CHUCHU_PURPLE: + case LV1_SOUP: + case LV2_SOUP: + case LV3_SOUP: + case CHUCHU_YELLOW2: + case OIL_BOTTLE3: + case SHOP_BEE_CHILD: + case CHUCHU_BLACK: + is_bottle_item = true; + break; + default: + is_bottle_item = false; + break; + } + + return is_bottle_item; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -4398,55 +2525,146 @@ asm void isBottleItem(u8 param_0) { #include "asm/d/d_item/isBottleItem__FUc.s" } #pragma pop +#endif -/* 8009B77C-8009B79C 0960BC 0020+00 0/0 2/2 0/0 .text isHeart__FUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void isHeart(u8 param_0) { - nofralloc -#include "asm/d/d_item/isHeart__FUc.s" +BOOL isHeart(u8 item_no) { + BOOL is_heart = false; + + if (item_no == HEART || item_no == TRIPLE_HEART) { + is_heart = true; + } + + return is_heart; } -#pragma pop -/* 8009B79C-8009B7C4 0960DC 0028+00 0/0 0/0 1/1 .text isInsect__FUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void isInsect(u8 param_0) { - nofralloc -#include "asm/d/d_item/isInsect__FUc.s" +bool isInsect(u8 item_no) { + bool is_insect = false; + + switch (item_no) { + case M_BEETLE: + case F_BEETLE: + case M_BUTTERFLY: + case F_BUTTERFLY: + case M_STAG_BEETLE: + case F_STAG_BEETLE: + case M_GRASSHOPPER: + case F_GRASSHOPPER: + case M_NANAFUSHI: + case F_NANAFUSHI: + case M_DANGOMUSHI: + case F_DANGOMUSHI: + case M_MANTIS: + case F_MANTIS: + case M_LADYBUG: + case F_LADYBUG: + case M_SNAIL: + case F_SNAIL: + case M_DRAGONFLY: + case F_DRAGONFLY: + case M_ANT: + case F_ANT: + case M_MAYFLY: + case F_MAYFLY: + is_insect = true; + } + + return is_insect; } -#pragma pop -/* ############################################################################################## */ -/* 8037B0D0-8037B0D0 007730 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037B0D0 = "D_MN08"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_8037B0D7 = ""; -#pragma pop +u8 check_itemno(int i_itemId) { + if (!dComIfGs_isGetMagicUseFlag() && (i_itemId == S_MAGIC || i_itemId == L_MAGIC)) { + return GREEN_RUPEE; + } -/* 8009B7C4-8009B940 096104 017C+00 0/0 3/3 0/0 .text check_itemno__Fi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void check_itemno(int param_0) { - nofralloc -#include "asm/d/d_item/check_itemno__Fi.s" + if (i_itemId == ARROW_1) { + if (!dComIfGs_isItemFirstBit(BOW)) { + return GREEN_RUPEE; + } + } else { + if (isArrow(i_itemId)) { + if (!dComIfGs_isItemFirstBit(BOW)) { + return GREEN_RUPEE; + } + + if (g_dComIfG_gameInfo.play.getLayerNo(0) == 0xD || + g_dComIfG_gameInfo.play.getLayerNo(0) == 0xE) { + char* tmp = dComIfGp_getStartStageName(); + // D_MN08: Palace of Twilight + if (strncmp(tmp, "D_MN08", 6)) { + return GREEN_RUPEE; + } + } + } + } + + if (!dComIfGs_isItemFirstBit(BOMB_BAG_LV1) && isBomb(i_itemId)) { + return GREEN_RUPEE; + } else { + if (i_itemId == TRIPLE_HEART) { + i_itemId = HEART; + } + if (!checkItemGet(PACHINKO, 1) && i_itemId == PACHINKO_SHOT) { + i_itemId = GREEN_RUPEE; + } + if (i_itemId == S_MAGIC || i_itemId == L_MAGIC) { + i_itemId = GREEN_RUPEE; + } + } + return i_itemId; } -#pragma pop /* 8009B940-8009BBD8 096280 0298+00 11/11 0/0 0/0 .text addBombCount__FUcUc */ +#ifdef NONMATCHING +static u8 addBombCount(u8 param_0, u8 param_1) { + u8 count[4]; + u8 count2[3]; + + int uvar6; + + for (int i = 0; i < 3; i++) { + u8 tmp = dComIfGs_getItem(i + SLOT_15, false); + count[i] = tmp; + + if (count[i] == 0x50) { + count2[i] = 0; + } else { + if (count[i] == param_0) { + count2[i] = dComIfGs_getBombNum(i); + } else { + count2[i] = -1; + } + } + } + + for (int i = 0; i < 3; i++) { + uvar6 = -1; + for (int j = 0; j < 3; j++) { + if (count2[j] == 0) { + uvar6 = 0; + } + } + + for (int k = 0; k < 3; k++) { + if (count2[k] > 0 && uvar6 < count2[k] && count2[k] != dComIfGs_getBombMax(count2[k])) { + uvar6 = count2[k]; + } + } + + if () + } + + return param_1; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void addBombCount(u8 param_0, u8 param_1) { +asm void addBombCount(u8 param_0, u8 param_1) { nofralloc #include "asm/d/d_item/addBombCount__FUcUc.s" } #pragma pop +#endif /* ############################################################################################## */ /* 80450F90-80450F98 000490 0004+04 0/0 2/2 0/0 .sbss mData__12dEnemyItem_c */ diff --git a/src/d/d_stage.cpp b/src/d/d_stage.cpp index 1a904b2f980..f9cc8ef13c9 100644 --- a/src/d/d_stage.cpp +++ b/src/d/d_stage.cpp @@ -7,17 +7,12 @@ #include "dol2asm.h" #include "dolphin/types.h" #include "m_Do/m_Do_ext.h" +#include "m_Do/m_Do_reset.h" // // Types: // -struct mDoRst { - static u8 mResetData[4 + 4 /* padding */]; -}; - -struct fopAcM_prm_class {}; - struct daSus_c { /* 80031434 */ void check(s8, cXyz const&); /* 800315A4 */ void execute(); @@ -454,7 +449,6 @@ extern "C" void _restgpr_26(); extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" void sprintf(); extern "C" void snprintf(char*, u32, char*, ...); extern "C" extern J3DLightInfo const j3dDefaultLightInfo; extern "C" extern u8 g_dComIfG_gameInfo[122384]; @@ -466,23 +460,18 @@ extern "C" u8 mResetData__6mDoRst[4 + 4 /* padding */]; // Declarations: // -/* ############################################################################################## */ -/* 80378A50-80378A50 0050B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80378A50 = "OPENING"; -#pragma pop - -/* 80023E28-80023E94 01E768 006C+00 0/0 1/1 0/3 .text set__18dStage_nextStage_cFPCcScsScScUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dStage_nextStage_c::set(char const* param_0, s8 param_1, s16 param_2, s8 param_3, - s8 param_4, u8 param_5) { - nofralloc -#include "asm/d/d_stage/set__18dStage_nextStage_cFPCcScsScScUc.s" +void dStage_nextStage_c::set(const char* i_stage, s8 i_roomId, s16 i_point, s8 i_layer, s8 i_wipe, + u8 i_speed) { + if (!enabled) { + enabled = true; + wipe = i_wipe; + wipe_speed = i_speed; + dStage_startStage_c::set(i_stage, i_roomId, i_point, i_layer); + if (!strcmp(i_stage, "OPENING")) { + mDoRst::onReset(); + } + } } -#pragma pop static void dStage_SetErrorRoom() { // "Room information might be corrupted. \nPlease try to re-convert. \n" @@ -494,43 +483,31 @@ static void dStage_SetErrorStage() { OSReport_Error("ステージ情報が、多分ですが壊れています。\n変換し直してみてください。"); } -/* ############################################################################################## */ -/* 803F4E68-803F4E74 021B88 000C+00 1/1 0/0 0/0 .bss @3926 */ -// static u8 lit_3926[12]; - /* 803F4E74-803F5778 021B94 0904+00 3/4 0/0 0/0 .bss DoorInfo */ static dStage_KeepDoorInfo DoorInfo; -/* 80023EF4-80023F00 01E834 000C+00 0/0 1/1 0/0 .text dStage_GetKeepDoorInfo__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dStage_GetKeepDoorInfo() { - nofralloc -#include "asm/d/d_stage/dStage_GetKeepDoorInfo__Fv.s" +dStage_KeepDoorInfo* dStage_GetKeepDoorInfo() { + return &DoorInfo; } -#pragma pop -/* 80023F00-80023F50 01E840 0050+00 2/2 0/0 0/3 .text dStage_isBossStage__FP11dStage_dt_c - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void dStage_isBossStage(dStage_dt_c* param_0) { - nofralloc -#include "asm/d/d_stage/dStage_isBossStage__FP11dStage_dt_c.s" +static u8 dStage_isBossStage(dStage_dt_c* param_0) { + u8 isBossStg; + stage_stag_info_class* pstag = param_0->getStagInfo(); + + if (pstag == 0) { + isBossStg = false; + } else { + isBossStg = dStage_stagInfo_GetSTType(pstag) == 3; + } + return isBossStg; } -#pragma pop /* 80023F50-80023F84 01E890 0034+00 1/1 0/0 0/1 .text dStage_KeepDoorInfoInit__FP11dStage_dt_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void dStage_KeepDoorInfoInit(dStage_dt_c* param_0) { - nofralloc -#include "asm/d/d_stage/dStage_KeepDoorInfoInit__FP11dStage_dt_c.s" +static void dStage_KeepDoorInfoInit(dStage_dt_c* param_0) { + if (dStage_isBossStage(param_0) == 0) { + DoorInfo.unk_0x0 = NULL; + } } -#pragma pop /* 80023F84-8002405C 01E8C4 00D8+00 1/1 0/0 0/3 .text * dStage_KeepDoorInfoProc__FP11dStage_dt_cP16stage_tgsc_class */ @@ -553,25 +530,13 @@ static asm void dStage_KeepDoorInfoProc(dStage_dt_c* param_0, stage_tgsc_class* /* 803F5784-803F6088 0224A4 0904+00 3/4 0/0 0/0 .bss l_RoomKeepDoorInfo */ static dStage_KeepDoorInfo l_RoomKeepDoorInfo; -/* 8002405C-80024068 01E99C 000C+00 0/0 1/1 0/0 .text dStage_GetRoomKeepDoorInfo__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dStage_GetRoomKeepDoorInfo() { - nofralloc -#include "asm/d/d_stage/dStage_GetRoomKeepDoorInfo__Fv.s" +dStage_KeepDoorInfo* dStage_GetRoomKeepDoorInfo() { + return &l_RoomKeepDoorInfo; } -#pragma pop -/* 80024068-80024078 01E9A8 0010+00 1/1 0/0 0/0 .text dStage_initRoomKeepDoorInfo__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void dStage_initRoomKeepDoorInfo() { - nofralloc -#include "asm/d/d_stage/dStage_initRoomKeepDoorInfo__Fv.s" +static void dStage_initRoomKeepDoorInfo() { + l_RoomKeepDoorInfo.unk_0x0 = NULL; } -#pragma pop /* 80024078-80024174 01E9B8 00FC+00 1/1 0/0 0/0 .text * dStage_RoomKeepDoorInfoProc__FP11dStage_dt_cP16stage_tgsc_class */ @@ -586,6 +551,13 @@ static asm void dStage_RoomKeepDoorInfoProc(dStage_dt_c* param_0, stage_tgsc_cla /* 80024174-8002419C 01EAB4 0028+00 2/0 0/0 0/0 .text * dStage_RoomKeepDoorInit__FP11dStage_dt_cPviPv */ +#ifdef NONMATCHING +static int dStage_RoomKeepDoorInit(dStage_dt_c* param_0, void* param_1, int param_2, + void* param_3) { + dStage_RoomKeepDoorInfoProc(param_0, (stage_tgsc_class*)param_1); + return 1; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -595,6 +567,7 @@ static asm void dStage_RoomKeepDoorInit(dStage_dt_c* param_0, void* param_1, int #include "asm/d/d_stage/dStage_RoomKeepDoorInit__FP11dStage_dt_cPviPv.s" } #pragma pop +#endif void dStage_startStage_c::set(const char* i_Stage, s8 i_RoomNo, s16 i_Point, s8 i_Layer) { strcpy(mStage, i_Stage); @@ -611,12 +584,6 @@ SECTION_DEAD static char const* const stringBase_80378ADD = "name.bin"; SECTION_DEAD static char const* const stringBase_80378AE6 = "bank.bin"; #pragma pop -// /* 803F6088-803F6094 022DA8 000C+00 0/1 0/0 0/0 .bss @5376 */ -// #pragma push -// #pragma force_active on -// static u8 lit_5376[12]; -// #pragma pop - /* 803F6094-80406194 022DB4 10100+00 12/12 31/31 16/16 .bss mStatus__20dStage_roomControl_c */ dStage_roomStatus_c dStage_roomControl_c::mStatus[0x40]; @@ -631,7 +598,6 @@ u32 dStage_roomControl_c::mProcID; /* 80450D65 0001+00 data_80450D65 None */ /* 80450D66 0001+00 data_80450D66 None */ /* 80450D67 0001+00 data_80450D67 None */ -extern s8 struct_80450D64; // sStayNo s8 struct_80450D64; extern s8 sLastStayNo; @@ -648,12 +614,28 @@ extern u8 data_80450D68[4]; u8 data_80450D68[4]; /* 80450D6C-80450D70 00026C 0004+00 1/1 2/2 0/0 .sbss mArcBankName__20dStage_roomControl_c */ -u8 dStage_roomControl_c::mArcBankName[4]; +char* dStage_roomControl_c::mArcBankName; /* 80450D70-80450D74 000270 0004+00 1/1 1/1 0/0 .sbss mArcBankData__20dStage_roomControl_c */ -u8 dStage_roomControl_c::mArcBankData[4]; +char* dStage_roomControl_c::mArcBankData; /* 800241E8-80024338 01EB28 0150+00 1/1 0/0 0/4 .text init__20dStage_roomControl_cFv */ +#ifdef NONMATCHING +void dStage_roomControl_c::init() { + if (-1 < dComIfGp_getStartStagePoint()) { + dComIfGs_initZone(); + } + + dStage_roomStatus_c* status = &mStatus[0]; + + for (int i = 0; i < 0x40; i++) { + status->mRoomDt.init(); + status->mRoomDt.initFileList2(); + status->unk_0x3F4[0] = 0; + status->unk_0x3F4[1] = 0; + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -662,6 +644,7 @@ asm void dStage_roomControl_c::init() { #include "asm/d/d_stage/init__20dStage_roomControl_cFv.s" } #pragma pop +#endif /* 80024338-80024384 01EC78 004C+00 1/1 1/1 0/7 .text initZone__20dStage_roomControl_cFv */ @@ -1095,6 +1078,18 @@ asm void dStage_roomControl_c::getMemoryBlock(int param_0) { /* 800243E8-80024424 01ED28 003C+00 2/2 0/0 0/0 .text setStayNo__20dStage_roomControl_cFi */ +#ifdef NONMATCHING +void dStage_roomControl_c::setStayNo(int param_0) { + sLastStayNo = struct_80450D64; + struct_80450D64 = param_0; + + if (struct_80450D64 > -1) { + sNextStayNo = struct_80450D64; + } + sNextStayNo = struct_80450D64; + mStatus[struct_80450D64].unk_0x3F4[1] = 1; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -1103,6 +1098,7 @@ asm void dStage_roomControl_c::setStayNo(int param_0) { #include "asm/d/d_stage/setStayNo__20dStage_roomControl_cFi.s" } #pragma pop +#endif /* 80024424-8002442C 01ED64 0008+00 0/0 0/0 1/1 .text setNextStayNo__20dStage_roomControl_cFi */ // matches but need to fix data @@ -1813,7 +1809,7 @@ static asm void dStage_roomReadInit(dStage_dt_c* param_0, void* param_1, int par #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dStage_roomRead_dt_c_GetReverbStage(roomRead_class& param_0, int param_1) { +asm u8 dStage_roomRead_dt_c_GetReverbStage(roomRead_class& param_0, int param_1) { nofralloc #include "asm/d/d_stage/dStage_roomRead_dt_c_GetReverbStage__FR14roomRead_classi.s" } diff --git a/src/d/event/d_event.cpp b/src/d/event/d_event.cpp index 244c1910116..05dc45d94bc 100644 --- a/src/d/event/d_event.cpp +++ b/src/d/event/d_event.cpp @@ -4,6 +4,7 @@ // #include "d/event/d_event.h" +#include "d/com/d_com_inf_game.h" #include "dol2asm.h" #include "dolphin/types.h" #include "f_op/f_op_actor_iter.h" @@ -17,28 +18,6 @@ struct mDoGph_gInf_c { /* 800080D0 */ void fadeOut(f32); }; -struct mDoCPd_c { - static u8 m_cpadInfo[256]; -}; - -struct dVibration_c { - /* 8006FD94 */ void StopQuake(int); -}; - -struct dSv_event_tmp_flag_c { - static u8 const tempBitLabels[370 + 2 /* padding */]; -}; - -struct dRes_control_c { - /* 8003C37C */ void getRes(char const*, char const*, dRes_info_c*, int); -}; - -struct dMsgObject_c { - /* 80237994 */ void onKillMessageFlag(); - /* 802379AC */ void setKillMessageFlag(); - /* 80238098 */ void endFlowGroup(); -}; - struct dDemo_c { /* 80039CF8 */ void end(); @@ -179,8 +158,6 @@ extern "C" u8 const tempBitLabels__20dSv_event_tmp_flag_c[370 + 2 /* padding */] extern "C" extern void* __vt__11dEvt_info_c[3 + 1 /* padding */]; extern "C" u8 m_cpadInfo__8mDoCPd_c[256]; extern "C" u8 mDemoArcName__20dStage_roomControl_c[10 + 2 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 struct_80450D64[4]; extern "C" u8 m_mode__7dDemo_c[4]; extern "C" u8 m_midnaActor__9daPy_py_c[4]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; @@ -189,6 +166,10 @@ extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; // Declarations: // +inline dEvent_manager_c& dComIfGp_getEventManager() { + return g_dComIfG_gameInfo.play.getEvtManager(); +} + /* 80041480-80041488 03BDC0 0008+00 1/1 0/0 0/0 .text event_debug_evnt__21@unnamed@d_event_cpp@Fv */ static bool func_80041480() { @@ -197,14 +178,18 @@ static bool func_80041480() { /* 80041488-80041580 03BDC8 00F8+00 1/1 0/0 0/0 .text * clear_tmpflag_for_message__21@unnamed@d_event_cpp@Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_80041488() { - nofralloc -#include "asm/d/event/d_event/func_80041488.s" +static void func_80041488() { + dComIfGs_offTmpBit(dSv_event_tmp_flag_c::tempBitLabels[11]); + dComIfGs_offTmpBit(dSv_event_tmp_flag_c::tempBitLabels[12]); + dComIfGs_offTmpBit(dSv_event_tmp_flag_c::tempBitLabels[13]); + dComIfGs_offTmpBit(dSv_event_tmp_flag_c::tempBitLabels[14]); + dComIfGs_offTmpBit(dSv_event_tmp_flag_c::tempBitLabels[15]); + dComIfGs_offTmpBit(dSv_event_tmp_flag_c::tempBitLabels[51]); + dComIfGs_offTmpBit(dSv_event_tmp_flag_c::tempBitLabels[52]); + dComIfGs_offTmpBit(dSv_event_tmp_flag_c::tempBitLabels[53]); + dComIfGs_offTmpBit(dSv_event_tmp_flag_c::tempBitLabels[54]); + dComIfGs_offTmpBit(dSv_event_tmp_flag_c::tempBitLabels[55]); } -#pragma pop dEvt_control_c::dEvt_control_c() { remove(); @@ -216,15 +201,11 @@ dEvt_order_c::dEvt_order_c() { /* 800415D8-80041668 03BF18 0090+00 1/1 0/0 0/0 .text orderOld__14dEvt_control_cFUsUsUsUsPvPvPCv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dEvt_control_c::orderOld(u16 param_0, u16 param_1, u16 param_2, u16 param_3, void* param_4, - void* param_5, void const* param_6) { - nofralloc -#include "asm/d/event/d_event/orderOld__14dEvt_control_cFUsUsUsUsPvPvPCv.s" +void dEvt_control_c::orderOld(u16 param_0, u16 param_1, u16 param_2, u16 param_3, void* param_4, + void* param_5, void const* param_6) { + s16 eventIdx = dComIfGp_getEventManager().getEventIdx((char*)param_6, -1, -1); + order(param_0, param_1, param_2, param_3, param_4, param_5, eventIdx, -1); } -#pragma pop /* 80041668-80041804 03BFA8 019C+00 3/3 13/13 0/0 .text order__14dEvt_control_cFUsUsUsUsPvPvsUc */ #pragma push diff --git a/src/d/event/d_event_data.cpp b/src/d/event/d_event_data.cpp index 44992dab528..7c3b85a8397 100644 --- a/src/d/event/d_event_data.cpp +++ b/src/d/event/d_event_data.cpp @@ -25,14 +25,6 @@ struct dVibration_c { /* 8006FD94 */ void StopQuake(int); }; -struct dSv_event_tmp_flag_c { - static u8 const tempBitLabels[370 + 2 /* padding */]; -}; - -struct dSv_event_flag_c { - static u8 saveBitLabels[1644 + 4 /* padding */]; -}; - struct dMsgObject_c { /* 8023806C */ void demoMessageGroup(); }; @@ -200,7 +192,6 @@ extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" f32 mFadeRate__13mDoGph_gInf_c; extern "C" extern u8 struct_80450BE4[4]; -extern "C" extern u8 struct_80450D64[4]; extern "C" u8 m_control__7dDemo_c[4]; extern "C" u8 m_frameNoMsg__7dDemo_c[4]; extern "C" u8 m_mode__7dDemo_c[4]; diff --git a/src/d/event/d_event_manager.cpp b/src/d/event/d_event_manager.cpp index 13a19a384f0..8a134e970e6 100644 --- a/src/d/event/d_event_manager.cpp +++ b/src/d/event/d_event_manager.cpp @@ -171,12 +171,10 @@ extern "C" void _restgpr_25(); extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" void sprintf(); extern "C" u8 mDemoArcName__20dStage_roomControl_c[10 + 2 /* padding */]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" extern u32 __float_nan; -extern "C" extern u8 struct_80450D64[4]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; // @@ -549,7 +547,7 @@ static u8 map_tool_name_4449[17 + 3 /* padding */]; #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dEvent_manager_c::getEventIdx(char const* param_0, u8 param_1, s32 param_2) { +asm int dEvent_manager_c::getEventIdx(char const* param_0, u8 param_1, s32 param_2) { nofralloc #include "asm/d/event/d_event_manager/getEventIdx__16dEvent_manager_cFPCcUcl.s" } diff --git a/src/d/kankyo/d_kankyo.cpp b/src/d/kankyo/d_kankyo.cpp index d20b83328ac..2bcbc344dd2 100644 --- a/src/d/kankyo/d_kankyo.cpp +++ b/src/d/kankyo/d_kankyo.cpp @@ -3407,7 +3407,7 @@ static asm void dKy_F_SP121Check(char const* param_0, int param_1, u8* param_2, #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dKy_darkworld_stage_check(char const* param_0, int param_1) { +asm BOOL dKy_darkworld_stage_check(char const* param_0, int param_1) { nofralloc #include "asm/d/kankyo/d_kankyo/dKy_darkworld_stage_check__FPCci.s" } diff --git a/src/d/save/d_save.cpp b/src/d/save/d_save.cpp index d20675f5d8c..20ed84ed214 100644 --- a/src/d/save/d_save.cpp +++ b/src/d/save/d_save.cpp @@ -4,9 +4,11 @@ // #include "d/save/d_save.h" +#include "Z2AudioLib/Z2AudioMgr.h" +#include "d/com/d_com_inf_game.h" +#include "d/meter/d_meter2_info.h" #include "dol2asm.h" #include "dolphin/types.h" -#include "msl_c/string.h" // // Types: @@ -17,40 +19,6 @@ struct daObjCarry_c { /* 80031D04 */ void setSaveFlag(); }; -struct dSv_event_tmp_flag_c { - static u8 const tempBitLabels[370 + 2 /* padding */]; -}; - -struct dSv_event_flag_c { - static u8 saveBitLabels[1644 + 4 /* padding */]; -}; - -struct dStage_roomControl_c { - /* 8002D9B0 */ static int getZoneNo(int); -}; - -struct JMSMesgEntry_c {}; - -struct dMeter2Info_c { - /* 8021C250 */ void getString(u32, char*, JMSMesgEntry_c*); - /* 8021DCC4 */ void setHotSpringTimer(u8); - /* 8021E290 */ void setSaveStageName(char const*); -}; - -struct dComIfG_play_c { - /* 8002B3B0 */ void getNowVibration(); -}; - -struct Z2AudioMgr { - /* 802CD888 */ void setOutputMode(u32); - - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct JUTGamePad { - static u8 sRumbleSupported[4]; -}; - // // Forward References: // @@ -223,15 +191,14 @@ extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; // External References: // -extern "C" void OSReport_Error(); extern "C" void setNowVibration__14dComIfG_play_cFUc(); extern "C" void getNowVibration__14dComIfG_play_cFv(); extern "C" void getZoneNo__20dStage_roomControl_cFi(); -extern "C" void dComIfGs_setSelectItemIndex__FiUc(); -extern "C" void dComIfGs_setMixItemIndex__FiUc(); -extern "C" void dComIfGs_getMixItemIndex__Fi(); +extern "C" void dComIfGs_setSelectItemIndex__FiUc(int, u8); +extern "C" void dComIfGs_setMixItemIndex__FiUc(int, u8); +extern "C" u8 dComIfGs_getMixItemIndex__Fi(int); extern "C" void dComIfGp_setSelectItem__Fi(int); -extern "C" s32 dComIfGs_getBottleMax__Fv(); +extern "C" u8 dComIfGs_getBottleMax__Fv(); extern "C" void dComIfGs_setKeyNum__FiUc(); extern "C" void __ct__13dSv_memory2_cFv(); extern "C" void __ct__12dSv_memory_cFv(); @@ -242,8 +209,6 @@ extern "C" void getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c(); extern "C" void setHotSpringTimer__13dMeter2Info_cFUc(); extern "C" void setSaveStageName__13dMeter2Info_cFPCc(); extern "C" void setOutputMode__10Z2AudioMgrFUl(); -extern "C" void OSGetSoundMode(); -extern "C" void OSGetTime(); extern "C" void __construct_array(); extern "C" void _savegpr_22(); extern "C" void _savegpr_26(); @@ -256,9 +221,6 @@ extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); extern "C" void __div2i(); -extern "C" void printf(); -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_meter2_info[248]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" u8 sRumbleSupported__10JUTGamePad[4]; @@ -266,12 +228,13 @@ extern "C" u8 sRumbleSupported__10JUTGamePad[4]; // Declarations: // -// needs gameinfo -#ifdef NONMATCHING inline int dComIfGs_isItemFirstBit(u8 i_no) { - return g_dComIfG_gameInfo.getSaveFile().getPlayerGetItem().isFirstBit(i_no); + return g_dComIfG_gameInfo.info.getPlayer().getGetItem().isFirstBit(i_no); +} + +inline BOOL dComIfGs_isEventBit(u16 id) { + return g_dComIfG_gameInfo.info.getSavedata().getEvent().isEventBit(id); } -#endif static u8 dSv_item_rename(u8 item_id) { switch (item_id) { @@ -297,7 +260,7 @@ void dSv_player_status_a_c::init() { for (int i = 0; i < MAX_SELECT_ITEM; i++) { mSelectItem[i] = NO_ITEM; mMixItem[i] = NO_ITEM; - dComIfGp_setSelectItem__Fi(i); + dComIfGp_setSelectItem(i); } for (int i = 0; i < MAX_EQUIPMENT; i++) { @@ -347,7 +310,7 @@ u8 dSv_player_status_a_c::getMixItemIndex(signed int i_no) const { return 0; } -u16 dSv_player_status_a_c::getRupeeMax(void) const { +u16 dSv_player_status_a_c::getRupeeMax() const { if (mWalletSize < 3) { // if you make this a default, it wont match. Compiler, pls. switch (mWalletSize) { case WALLET: @@ -361,24 +324,12 @@ u16 dSv_player_status_a_c::getRupeeMax(void) const { return 0; } -/* 80032AF8-80032B50 02D438 0058+00 0/0 1/1 0/0 .text isMagicFlag__21dSv_player_status_a_cCFUc */ -#ifdef NONMATCHING BOOL dSv_player_status_a_c::isMagicFlag(u8 i_magic) const { if (i_magic == 0) { - return dComIfGs_isEventBit__FUs(0x2304); + return dComIfGs_isEventBit(0x2304); } return (mMagicFlag & (u8)(1 << i_magic)) ? TRUE : FALSE; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm BOOL dSv_player_status_a_c::isMagicFlag(u8 param_0) const { - nofralloc -#include "asm/d/save/d_save/isMagicFlag__21dSv_player_status_a_cCFUc.s" -} -#pragma pop -#endif void dSv_player_status_b_c::init() { mDateIpl = 0; @@ -393,99 +344,55 @@ void dSv_player_status_b_c::init() { } } -void dSv_player_status_b_c::onDarkClearLV(int flagOnOff) { - mDarkClearLevelFlag |= (u8)(1 << flagOnOff); +void dSv_player_status_b_c::onDarkClearLV(int i_no) { + mDarkClearLevelFlag |= (u8)(1 << i_no); } -BOOL dSv_player_status_b_c::isDarkClearLV(int unk) const { - return mDarkClearLevelFlag & (u8)(1 << unk) ? TRUE : FALSE; +BOOL dSv_player_status_b_c::isDarkClearLV(int i_no) const { + return mDarkClearLevelFlag & (u8)(1 << i_no) ? TRUE : FALSE; } -void dSv_player_status_b_c::onTransformLV(int flagOnOff) { - mTransformLevelFlag |= (u8)(1 << flagOnOff); +void dSv_player_status_b_c::onTransformLV(int i_no) { + mTransformLevelFlag |= (u8)(1 << i_no); } -BOOL dSv_player_status_b_c::isTransformLV(int unk) const { - return mTransformLevelFlag & (u8)(1 << unk) ? TRUE : FALSE; +BOOL dSv_player_status_b_c::isTransformLV(int i_no) const { + return mTransformLevelFlag & (u8)(1 << i_no) ? TRUE : FALSE; } -/* ############################################################################################## */ -/* 80379234-80379234 005894 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80379234 = ""; -#pragma pop - -/* 80451D5C-80451D60 00035C 0004+00 3/3 0/0 0/0 .sdata2 @3813 */ -SECTION_SDATA2 static u8 lit_3813[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; - -/* 80032C0C-80032C64 02D54C 0058+00 1/1 0/0 0/0 .text init__17dSv_horse_place_cFv */ -#ifdef NONMATCHING -// zero-initialized literal -void dSv_horse_place_c::init(void) { - f32 position_val; - char* default_stage; - - default_stage = strcpy(mCurrentStage, (char*)lbl_80379234); - position_val = lbl_80451D5C; - mPosition.x = lbl_80451D5C; - mPosition.y = position_val; - mPosition.z = position_val; - mXRotation = 0; +void dSv_horse_place_c::init() { + strcpy(mName, ""); + mPos.set(0.0f, 0.0f, 0.0f); + mAngleY = 0; mSpawnId = 0; - mRoomId = 0; + mRoomNo = 0; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dSv_horse_place_c::init() { - nofralloc -#include "asm/d/save/d_save/init__17dSv_horse_place_cFv.s" -} -#pragma pop -#endif void dSv_horse_place_c::set(const char* i_name, const cXyz& i_position, s16 i_x_rot, signed char i_room_id) { - strcpy(mCurrentStage, i_name); - mPosition = i_position; - mXRotation = i_x_rot; - mRoomId = i_room_id; + strcpy(mName, i_name); + mPos = i_position; + mAngleY = i_x_rot; + mRoomNo = i_room_id; } -void dSv_player_return_place_c::init(void) { - strcpy(mCurrentStage, (char*)"F_SP108"); - mRoomId = 1; - mSpawnId = 0; +void dSv_player_return_place_c::init() { + strcpy(mName, "F_SP108"); + mRoomNo = 1; + mPlayerStatus = 0; unk10 = 21; unk11 = 0; } void dSv_player_return_place_c::set(const char* i_name, s8 i_room_id, u8 i_spawn_id) { - strcpy(mCurrentStage, i_name); - mRoomId = i_room_id; - mSpawnId = i_spawn_id; + strcpy(mName, i_name); + mRoomNo = i_room_id; + mPlayerStatus = i_spawn_id; } -/* 80032D60-80032DE0 02D6A0 0080+00 1/1 0/0 0/0 .text init__33dSv_player_field_last_stay_info_cFv - */ -// zero-initialized literal -#ifdef NONMATCHING void dSv_player_field_last_stay_info_c::init() { - f32 position_val; - - strcpy(mName, (char*)lbl_80379234); - position_val = lbl_80451D5C; - - mPos.x = lbl_80451D5C; - mPos.y = position_val; - mPos.z = position_val; + strcpy(mName, ""); + mPos.set(0.0f, 0.0f, 0.0f); mAngleY = 0; mLastSpawnId = 0; mRegionNo = 1; @@ -496,16 +403,6 @@ void dSv_player_field_last_stay_info_c::init() { unk26[i] = 0; } } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dSv_player_field_last_stay_info_c::init() { - nofralloc -#include "asm/d/save/d_save/init__33dSv_player_field_last_stay_info_cFv.s" -} -#pragma pop -#endif void dSv_player_field_last_stay_info_c::set(const char* i_name, const cXyz& i_last_position, s16 i_last_angle, signed char i_last_spawn_id, @@ -528,63 +425,42 @@ void dSv_player_field_last_stay_info_c::onRegionBit(int i_region_bit) { mRegion |= (u8)(1 << i_region_bit); } -BOOL dSv_player_field_last_stay_info_c::isRegionBit(int param_1) const { - if ((param_1 >= 0) && (param_1 < 8)) { - return (mRegion & (u8)(1 << param_1)) ? TRUE : FALSE; +BOOL dSv_player_field_last_stay_info_c::isRegionBit(int i_region_bit) const { + if ((i_region_bit >= 0) && (i_region_bit < 8)) { + return (mRegion & (u8)(1 << i_region_bit)) ? TRUE : FALSE; } return false; } -/* 80032EB0-80032F2C 02D7F0 007C+00 1/1 0/0 0/0 .text init__27dSv_player_last_mark_info_cFv */ -// zero-initialized literal -#ifdef NONMATCHING -void dSv_player_last_mark_info_c::init(void) { - f32 position; - - strcpy(mOoccooStage, (char*)lbl_80379234); - position = lbl_80451D5C; - mOoccooPosition.x = lbl_80451D5C; - mOoccooPosition.y = position; - mOoccooPosition.z = position; - mOoccooXRotation = 0; - mOoccooRoomId = 0; - mOoccooSpawnId = 0; +void dSv_player_last_mark_info_c::init() { + strcpy(mName, ""); + mPos.set(0.0f, 0.0f, 0.0f); + mAngleY = 0; + mRoomNo = 0; + mSpawnId = 0; mWarpAcceptStage = -1; for (int i = 0; i < 3; i++) { unk25[i] = 0; } } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dSv_player_last_mark_info_c::init() { - nofralloc -#include "asm/d/save/d_save/init__27dSv_player_last_mark_info_cFv.s" -} -#pragma pop -#endif void dSv_player_last_mark_info_c::setWarpItemData(const char* i_ooccoo_stage, const cXyz& i_ooccoo_position, s16 i_ooccoo_angle, s8 i_ooccoo_room_id, u8 unk1, u8 unk2) { - strcpy(mOoccooStage, i_ooccoo_stage); - mOoccooPosition = i_ooccoo_position; - mOoccooXRotation = i_ooccoo_angle; - mOoccooRoomId = i_ooccoo_room_id; + strcpy(mName, i_ooccoo_stage); + mPos.set(i_ooccoo_position); + mAngleY = i_ooccoo_angle; + mRoomNo = i_ooccoo_room_id; } -void dSv_player_item_c::init(void) { +void dSv_player_item_c::init() { for (int i = 0; i < 24; i++) { mItems[i] = NO_ITEM; mItemSlots[i] = NO_ITEM; } } -/* 80032FB8-80033030 02D8F8 0078+00 11/11 45/45 2/2 .text setItem__17dSv_player_item_cFiUc */ -// need gameinfo inline -#ifdef NONMATCHING void dSv_player_item_c::setItem(int item_slot, u8 item_id) { if (item_slot < MAX_ITEM_SLOTS) { mItems[item_slot] = item_id; @@ -595,39 +471,19 @@ void dSv_player_item_c::setItem(int item_slot, u8 item_id) { do { if (item_slot == dComIfGs_getSelectItemIndex(select_item_index)) { - dComIfGp_setSelectItem__Fi(select_item_index); + dComIfGp_setSelectItem(select_item_index); } select_item_index++; } while (select_item_index < MAX_SELECT_ITEM - 1); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dSv_player_item_c::setItem(int param_0, u8 param_1) { - nofralloc -#include "asm/d/save/d_save/setItem__17dSv_player_item_cFiUc.s" -} -#pragma pop -#endif -/* ############################################################################################## */ -/* 80379234-80379234 005894 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037923D = "合成アイテム不定＝＝＝＞%d, %d\n"; -#pragma pop - -/* 80033030-800332F8 02D970 02C8+00 7/7 70/70 2/2 .text getItem__17dSv_player_item_cCFib - */ -#ifdef NONMATCHING u8 dSv_player_item_c::getItem(int item_idx, bool isComboItem) const { if (item_idx < MAX_ITEM_SLOTS) { if (isComboItem) { for (int i = 0; i < 2; i++) { if ((dComIfGs_getSelectItemIndex(i) == item_idx || - item_idx == dComIfGs_getMixItemIndex__Fi(i)) && - dComIfGs_getMixItemIndex__Fi(i) != NO_ITEM) { + item_idx == dComIfGs_getMixItemIndex(i)) && + dComIfGs_getMixItemIndex(i) != NO_ITEM) { u8 item_id_2 = mItems[dComIfGs_getSelectItemIndex(i)]; u8 item_id_1 = mItems[dComIfGs_getMixItemIndex(i)]; @@ -675,15 +531,14 @@ u8 dSv_player_item_c::getItem(int item_idx, bool isComboItem) const { if (i == 3) { if (dComIfGs_getSelectItemIndex(i) == 0 && - dComIfGs_getMixItemIndex__Fi(i) == 0) { - dComIfGs_setSelectItemIndex__FiUc(i, 0xFF); - dComIfGs_setMixItemIndex__FiUc(i, 0xFF); + dComIfGs_getMixItemIndex(i) == 0) { + dComIfGs_setSelectItemIndex(i, 0xFF); + dComIfGs_setMixItemIndex(i, 0xFF); return 0xFF; } } - // 合成アイテム不定＝＝＝＞%d, %d\n // Uncertain combination item＝＝＝＞%d, %d\n - OSReport_Error(lbl_80379234 + 9, item_id_2, item_id_1); + OSReport_Error("合成アイテム不定＝＝＝＞%d, %d\n", item_id_2, item_id_1); } } } @@ -692,16 +547,6 @@ u8 dSv_player_item_c::getItem(int item_idx, bool isComboItem) const { return NO_ITEM; } } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm u8 dSv_player_item_c::getItem(int param_0, bool param_1) const { - nofralloc -#include "asm/d/save/d_save/getItem__17dSv_player_item_cCFib.s" -} -#pragma pop -#endif static u8 i_item_lst[23] = {0x0A, 0x08, 0x06, 0x02, 0x09, 0x04, 0x03, 0x00, 0x01, 0x17, 0x14, 0x05, 0x0F, 0x10, 0x11, 0x0B, 0x0C, 0x0D, 0x0E, 0x13, 0x12, 0x16, 0x15}; @@ -709,16 +554,18 @@ static u8 i_item_lst[23] = {0x0A, 0x08, 0x06, 0x02, 0x09, 0x04, 0x03, 0x00, 0x01 /* 800332F8-80033354 02DC38 005C+00 2/2 0/0 0/0 .text setLineUpItem__17dSv_player_item_cFv */ // this is close #ifdef NONMATCHING -void dSv_player_item_c::setLineUpItem(void) { - for (int i = 0; i < 24; i++) { - mItemSlots[i] = NO_ITEM; +void dSv_player_item_c::setLineUpItem() { + int i1 = 0; + int i2 = 0; + + for (; i1 < 24; i1++) { + mItemSlots[i1] = NO_ITEM; } - for (int i = 0; i < 23; i++) { - for (int j = 0; j < 24; j++) { - if (mItems[i_item_lst[j]] != NO_ITEM) { - mItemSlots[i] = i_item_lst[j]; - } + for (int i1 = 0; i1 < 23; i1++) { + if (mItems[i_item_lst[i1]] != NO_ITEM) { + mItemSlots[i2] = i_item_lst[i2]; + i2++; } } } @@ -751,15 +598,15 @@ void dSv_player_item_c::setBottleItemIn(u8 i_item_id_1, u8 i_item_id_2) { for (int i = 0; i < 4; i++) { // sanitize input to make sure it's only a bottle - if (current_item_index == items[i + 11]) { - setItem(i + 11, new_item_index); + if (current_item_index == items[i + SLOT_11]) { + setItem(i + SLOT_11, new_item_index); // if hotsprings water, turn on the timer if (new_item_index == 107) { - setHotSpringTimer(i + 11); + dMeter2Info_setHotSpringTimer(i + SLOT_11); } for (int j = 0; j < 4; j++) { j = getSelectItemIndex(i); - if (i + 11 == j) { + if (i + SLOT_11 == j) { dComIfGp_setSelectItem__Fi(j); } } @@ -796,52 +643,49 @@ asm void dSv_player_item_c::setEmptyBottleItemIn(u8 param_0) { #pragma pop #endif -/* 80033494-80033514 02DDD4 0080+00 0/0 1/1 1/1 .text setEmptyBottle__17dSv_player_item_cFv */ -// inline -#ifdef NONMATCHING -void dSv_player_item_c::setEmptyBottle(void) { +void dSv_player_item_c::setEmptyBottle() { for (int i = 0; i < 4; i++) { - if (dComIfGs_getItem((u8)(i + 11), true) == NO_ITEM) { - dComIfGs_setItem((u8)(i + 11), EMPTY_BOTTLE); + if (dComIfGs_getItem((u8)(i + SLOT_11), true) == NO_ITEM) { + dComIfGs_setItem((u8)(i + SLOT_11), EMPTY_BOTTLE); return; } } } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dSv_player_item_c::setEmptyBottle() { - nofralloc -#include "asm/d/save/d_save/setEmptyBottle__17dSv_player_item_cFv.s" -} -#pragma pop -#endif -/* 80033514-80033598 02DE54 0084+00 0/0 3/3 0/0 .text setEmptyBottle__17dSv_player_item_cFUc */ -// need gameinfo inline -#ifdef NONMATCHING void dSv_player_item_c::setEmptyBottle(u8 item_id) { for (int i = 0; i < 4; i++) { - if (dComIfGs_getItem((u8)(i + 11), true) == NO_ITEM) { - dComIfGs_setItem((u8)(i + 11), item_id); + if (dComIfGs_getItem((u8)(i + SLOT_11), true) == NO_ITEM) { + dComIfGs_setItem((u8)(i + SLOT_11), item_id); return; } } } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dSv_player_item_c::setEmptyBottle(u8 param_0) { - nofralloc -#include "asm/d/save/d_save/setEmptyBottle__17dSv_player_item_cFUc.s" -} -#pragma pop -#endif /* 80033598-800336BC 02DED8 0124+00 1/1 3/3 0/0 .text * setEquipBottleItemIn__17dSv_player_item_cFUcUc */ +// one instruction +#ifdef NONMATCHING +void dSv_player_item_c::setEquipBottleItemIn(u8 param_0, u8 param_1) { + u8 item = dSv_item_rename(param_1); + u8 selectItemIdx; + if (dComIfGs_getSelectItemIndex(param_0) >= 11 && dComIfGs_getSelectItemIndex(param_0) <= 14) { + if (item == HOT_SPRING) { + selectItemIdx = dComIfGs_getSelectItemIndex(param_0); + dMeter2Info_setHotSpringTimer(selectItemIdx); + } + + selectItemIdx = dComIfGs_getSelectItemIndex(param_0); + setItem(selectItemIdx, item); + + selectItemIdx = dComIfGs_getSelectItemIndex(param_0); + dComIfGs_setItem(selectItemIdx, item); + + selectItemIdx = dComIfGs_getSelectItemIndex(param_0); + dComIfGp_setItem(selectItemIdx, item); + dComIfGp_setSelectItem(param_0); + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -850,6 +694,7 @@ asm void dSv_player_item_c::setEquipBottleItemIn(u8 param_0, u8 param_1) { #include "asm/d/save/d_save/setEquipBottleItemIn__17dSv_player_item_cFUcUc.s" } #pragma pop +#endif void dSv_player_item_c::setEquipBottleItemEmpty(u8 selected_index) { setEquipBottleItemIn(selected_index, EMPTY_BOTTLE); @@ -870,1684 +715,89 @@ u8 dSv_player_item_c::checkBottle(u8 i_item_id) { /* ############################################################################################## */ /* 803A7288-803A78F8 0043A8 066C+04 2/2 45/45 148/148 .data saveBitLabels__16dSv_event_flag_c */ -SECTION_DATA u8 dSv_event_flag_c::saveBitLabels[1644 + 4 /* padding */] = { - 0xFF, - 0xFF, - 0x00, - 0x80, - 0x00, - 0x40, - 0x00, - 0x20, - 0x00, - 0x10, - 0x00, - 0x08, - 0x00, - 0x04, - 0x00, - 0x02, - 0x00, - 0x01, - 0x01, - 0x80, - 0x01, - 0x40, - 0x01, - 0x20, - 0x01, - 0x10, - 0x01, - 0x08, - 0x01, - 0x04, - 0x01, - 0x02, - 0x01, - 0x01, - 0x02, - 0x80, - 0x02, - 0x40, - 0x02, - 0x20, - 0x02, - 0x10, - 0x02, - 0x08, - 0x02, - 0x04, - 0x02, - 0x02, - 0x02, - 0x01, - 0x03, - 0x80, - 0x03, - 0x40, - 0x03, - 0x20, - 0x03, - 0x10, - 0x03, - 0x08, - 0x03, - 0x04, - 0x03, - 0x02, - 0x03, - 0x01, - 0x04, - 0x80, - 0x04, - 0x40, - 0x04, - 0x20, - 0x04, - 0x10, - 0x04, - 0x08, - 0x04, - 0x04, - 0x04, - 0x02, - 0x04, - 0x01, - 0x05, - 0x80, - 0x05, - 0x40, - 0x05, - 0x20, - 0x05, - 0x10, - 0x05, - 0x08, - 0x05, - 0x04, - 0x05, - 0x02, - 0x05, - 0x01, - 0x06, - 0x80, - 0x06, - 0x40, - 0x06, - 0x20, - 0x06, - 0x10, - 0x06, - 0x08, - 0x06, - 0x04, - 0x06, - 0x02, - 0x06, - 0x01, - 0x07, - 0x80, - 0x07, - 0x40, - 0x07, - 0x20, - 0x07, - 0x10, - 0x07, - 0x08, - 0x07, - 0x04, - 0x07, - 0x02, - 0x07, - 0x01, - 0x08, - 0x80, - 0x08, - 0x40, - 0x08, - 0x20, - 0x08, - 0x10, - 0x08, - 0x08, - 0x08, - 0x04, - 0x08, - 0x02, - 0x08, - 0x01, - 0x09, - 0x80, - 0x09, - 0x40, - 0x09, - 0x20, - 0x09, - 0x10, - 0x09, - 0x08, - 0x09, - 0x04, - 0x09, - 0x02, - 0x09, - 0x01, - 0x0A, - 0x80, - 0x0A, - 0x40, - 0x0A, - 0x20, - 0x0A, - 0x10, - 0x0A, - 0x08, - 0x0A, - 0x04, - 0x0A, - 0x02, - 0x0A, - 0x01, - 0x0B, - 0x80, - 0x0B, - 0x40, - 0x0B, - 0x20, - 0x0B, - 0x10, - 0x0B, - 0x08, - 0x0B, - 0x04, - 0x0B, - 0x02, - 0x0B, - 0x01, - 0x0C, - 0x80, - 0x0C, - 0x40, - 0x0C, - 0x20, - 0x0C, - 0x10, - 0x0C, - 0x08, - 0x0C, - 0x04, - 0x0C, - 0x02, - 0x0C, - 0x01, - 0x0D, - 0x80, - 0x0D, - 0x40, - 0x0D, - 0x20, - 0x0D, - 0x10, - 0x0D, - 0x08, - 0x0D, - 0x04, - 0x0D, - 0x02, - 0x0D, - 0x01, - 0x0E, - 0x80, - 0x0E, - 0x40, - 0x0E, - 0x20, - 0x0E, - 0x10, - 0x0E, - 0x08, - 0x0E, - 0x04, - 0x0E, - 0x02, - 0x0E, - 0x01, - 0x0F, - 0x80, - 0x0F, - 0x40, - 0x0F, - 0x20, - 0x0F, - 0x10, - 0x0F, - 0x08, - 0x0F, - 0x04, - 0x0F, - 0x02, - 0x0F, - 0x01, - 0x10, - 0x80, - 0x10, - 0x40, - 0x10, - 0x20, - 0x10, - 0x10, - 0x10, - 0x08, - 0x10, - 0x04, - 0x10, - 0x02, - 0x10, - 0x01, - 0x11, - 0x80, - 0x11, - 0x40, - 0x11, - 0x20, - 0x11, - 0x10, - 0x11, - 0x08, - 0x11, - 0x04, - 0x11, - 0x02, - 0x11, - 0x01, - 0x12, - 0x80, - 0x12, - 0x40, - 0x12, - 0x20, - 0x12, - 0x10, - 0x12, - 0x08, - 0x12, - 0x04, - 0x12, - 0x02, - 0x12, - 0x01, - 0x13, - 0x80, - 0x13, - 0x40, - 0x13, - 0x20, - 0x13, - 0x10, - 0x13, - 0x08, - 0x13, - 0x04, - 0x13, - 0x02, - 0x13, - 0x01, - 0x14, - 0x80, - 0x14, - 0x40, - 0x14, - 0x20, - 0x14, - 0x10, - 0x14, - 0x08, - 0x14, - 0x04, - 0x14, - 0x02, - 0x14, - 0x01, - 0x15, - 0x80, - 0x15, - 0x40, - 0x15, - 0x20, - 0x15, - 0x10, - 0x15, - 0x08, - 0x15, - 0x04, - 0x15, - 0x02, - 0x15, - 0x01, - 0x16, - 0x80, - 0x16, - 0x40, - 0x16, - 0x20, - 0x16, - 0x10, - 0x16, - 0x08, - 0x16, - 0x04, - 0x16, - 0x02, - 0x16, - 0x01, - 0xFF, - 0x1F, - 0x17, - 0x80, - 0x17, - 0x40, - 0x17, - 0x20, - 0x17, - 0x10, - 0x17, - 0x08, - 0x17, - 0x04, - 0x17, - 0x02, - 0x17, - 0x01, - 0x18, - 0x80, - 0x18, - 0x40, - 0x18, - 0x20, - 0x18, - 0x10, - 0xFE, - 0xFF, - 0xFD, - 0xFF, - 0xFC, - 0xFF, - 0xFB, - 0xFF, - 0x18, - 0x08, - 0x18, - 0x04, - 0x18, - 0x02, - 0x18, - 0x01, - 0x19, - 0x80, - 0x19, - 0x40, - 0x19, - 0x20, - 0x19, - 0x10, - 0x19, - 0x08, - 0x19, - 0x04, - 0x19, - 0x02, - 0x19, - 0x01, - 0x1A, - 0x80, - 0x1A, - 0x40, - 0x1A, - 0x20, - 0x1A, - 0x10, - 0x1A, - 0x08, - 0x1A, - 0x04, - 0x1A, - 0x02, - 0x1A, - 0x01, - 0x1B, - 0x80, - 0x1B, - 0x40, - 0x1B, - 0x20, - 0x1B, - 0x10, - 0x1B, - 0x08, - 0x1B, - 0x04, - 0x1B, - 0x02, - 0x1B, - 0x01, - 0x1C, - 0x80, - 0x1C, - 0x40, - 0x1C, - 0x20, - 0x1C, - 0x10, - 0x1C, - 0x08, - 0x1C, - 0x04, - 0x1C, - 0x02, - 0x1C, - 0x01, - 0x1D, - 0x80, - 0x1D, - 0x40, - 0x1D, - 0x20, - 0x1D, - 0x10, - 0x1D, - 0x08, - 0x1D, - 0x04, - 0x1D, - 0x02, - 0x1D, - 0x01, - 0x1E, - 0x80, - 0x1E, - 0x40, - 0x1E, - 0x20, - 0x1E, - 0x10, - 0x1E, - 0x08, - 0x1E, - 0x04, - 0x1E, - 0x02, - 0x1E, - 0x01, - 0x1F, - 0x80, - 0x1F, - 0x40, - 0x1F, - 0x20, - 0x1F, - 0x10, - 0x1F, - 0x08, - 0x1F, - 0x04, - 0x1F, - 0x02, - 0x1F, - 0x01, - 0x20, - 0x80, - 0x20, - 0x40, - 0x20, - 0x20, - 0x20, - 0x10, - 0x20, - 0x08, - 0x20, - 0x04, - 0x20, - 0x02, - 0x20, - 0x01, - 0x21, - 0x80, - 0x21, - 0x40, - 0x21, - 0x20, - 0x21, - 0x10, - 0x21, - 0x08, - 0x21, - 0x04, - 0x21, - 0x02, - 0x21, - 0x01, - 0x22, - 0x80, - 0x22, - 0x40, - 0x22, - 0x20, - 0x22, - 0x10, - 0x22, - 0x08, - 0x22, - 0x04, - 0x22, - 0x02, - 0x22, - 0x01, - 0x23, - 0x80, - 0x23, - 0x40, - 0x23, - 0x20, - 0x23, - 0x10, - 0x23, - 0x08, - 0x23, - 0x04, - 0x23, - 0x02, - 0x23, - 0x01, - 0x24, - 0x80, - 0x24, - 0x40, - 0x24, - 0x20, - 0x24, - 0x10, - 0x24, - 0x08, - 0x24, - 0x04, - 0x24, - 0x02, - 0x24, - 0x01, - 0x25, - 0x80, - 0x25, - 0x40, - 0x25, - 0x20, - 0x25, - 0x10, - 0x25, - 0x08, - 0x25, - 0x04, - 0x25, - 0x02, - 0x25, - 0x01, - 0x26, - 0x80, - 0x26, - 0x40, - 0x26, - 0x20, - 0x26, - 0x10, - 0x26, - 0x08, - 0x26, - 0x04, - 0x26, - 0x02, - 0x26, - 0x01, - 0x27, - 0x80, - 0x27, - 0x40, - 0x27, - 0x20, - 0x27, - 0x10, - 0x27, - 0x08, - 0x27, - 0x04, - 0x27, - 0x02, - 0x27, - 0x01, - 0x28, - 0x80, - 0x28, - 0x40, - 0x28, - 0x20, - 0x28, - 0x10, - 0x28, - 0x08, - 0x28, - 0x04, - 0x28, - 0x02, - 0x28, - 0x01, - 0x29, - 0x80, - 0x29, - 0x40, - 0x29, - 0x20, - 0x29, - 0x10, - 0x29, - 0x08, - 0x29, - 0x04, - 0x29, - 0x02, - 0x29, - 0x01, - 0x2A, - 0x80, - 0x2A, - 0x40, - 0x2A, - 0x20, - 0x2A, - 0x10, - 0x2A, - 0x08, - 0x2A, - 0x04, - 0x2A, - 0x02, - 0x2A, - 0x01, - 0x2B, - 0x80, - 0x2B, - 0x40, - 0x2B, - 0x20, - 0x2B, - 0x10, - 0x2B, - 0x08, - 0x2B, - 0x04, - 0x2B, - 0x02, - 0x2B, - 0x01, - 0x2C, - 0x80, - 0x2C, - 0x40, - 0x2C, - 0x20, - 0x2C, - 0x10, - 0x2C, - 0x08, - 0x2C, - 0x04, - 0x2C, - 0x02, - 0x2C, - 0x01, - 0x2D, - 0x80, - 0x2D, - 0x40, - 0x2D, - 0x20, - 0x2D, - 0x10, - 0x2D, - 0x08, - 0x2D, - 0x04, - 0x2D, - 0x02, - 0x2D, - 0x01, - 0x2E, - 0x80, - 0x2E, - 0x40, - 0x2E, - 0x20, - 0x2E, - 0x10, - 0x2E, - 0x08, - 0x2E, - 0x04, - 0x2E, - 0x02, - 0x2E, - 0x01, - 0x2F, - 0x80, - 0x2F, - 0x40, - 0x2F, - 0x20, - 0x2F, - 0x10, - 0x2F, - 0x08, - 0x2F, - 0x04, - 0x2F, - 0x02, - 0x2F, - 0x01, - 0x30, - 0x80, - 0x30, - 0x40, - 0x30, - 0x20, - 0x30, - 0x10, - 0x30, - 0x08, - 0x30, - 0x04, - 0x30, - 0x02, - 0x30, - 0x01, - 0x31, - 0x80, - 0x31, - 0x40, - 0x31, - 0x20, - 0x31, - 0x10, - 0x31, - 0x08, - 0x31, - 0x04, - 0x31, - 0x02, - 0x31, - 0x01, - 0x32, - 0x80, - 0x32, - 0x40, - 0x32, - 0x20, - 0x32, - 0x10, - 0x32, - 0x08, - 0x32, - 0x04, - 0x32, - 0x02, - 0x32, - 0x01, - 0x33, - 0x80, - 0x33, - 0x40, - 0x33, - 0x20, - 0x33, - 0x10, - 0x33, - 0x08, - 0x33, - 0x04, - 0x33, - 0x02, - 0x33, - 0x01, - 0x34, - 0x80, - 0x34, - 0x40, - 0x34, - 0x20, - 0x34, - 0x10, - 0x34, - 0x08, - 0x34, - 0x04, - 0x34, - 0x02, - 0x34, - 0x01, - 0x35, - 0x80, - 0x35, - 0x40, - 0x35, - 0x20, - 0x35, - 0x10, - 0x35, - 0x08, - 0x35, - 0x04, - 0x35, - 0x02, - 0x35, - 0x01, - 0x36, - 0x80, - 0x36, - 0x40, - 0x36, - 0x20, - 0x36, - 0x10, - 0x36, - 0x08, - 0x36, - 0x04, - 0x36, - 0x02, - 0x36, - 0x01, - 0x37, - 0x80, - 0x37, - 0x40, - 0x37, - 0x20, - 0x37, - 0x10, - 0x37, - 0x08, - 0xFA, - 0xFF, - 0xF9, - 0xFF, - 0x37, - 0x04, - 0x37, - 0x02, - 0x37, - 0x01, - 0x38, - 0x80, - 0x38, - 0x40, - 0x38, - 0x20, - 0x38, - 0x10, - 0x38, - 0x08, - 0x38, - 0x04, - 0x38, - 0x02, - 0x38, - 0x01, - 0x39, - 0x80, - 0x39, - 0x40, - 0x39, - 0x20, - 0x39, - 0x10, - 0x39, - 0x08, - 0x39, - 0x04, - 0x39, - 0x02, - 0x39, - 0x01, - 0x3A, - 0x80, - 0x3A, - 0x40, - 0x3A, - 0x20, - 0x3A, - 0x10, - 0x3A, - 0x08, - 0x3A, - 0x04, - 0x3A, - 0x02, - 0x3A, - 0x01, - 0x3B, - 0x80, - 0x3B, - 0x40, - 0x3B, - 0x20, - 0x3B, - 0x10, - 0x3B, - 0x08, - 0x3B, - 0x04, - 0x3B, - 0x02, - 0x3B, - 0x01, - 0x3C, - 0x80, - 0x3C, - 0x40, - 0x3C, - 0x20, - 0x3C, - 0x10, - 0x3C, - 0x08, - 0x3C, - 0x04, - 0x3C, - 0x02, - 0x3C, - 0x01, - 0x3D, - 0x80, - 0x3D, - 0x40, - 0x3D, - 0x20, - 0x3D, - 0x10, - 0x3D, - 0x08, - 0x3D, - 0x04, - 0x3D, - 0x02, - 0x3D, - 0x01, - 0x3E, - 0x80, - 0x3E, - 0x40, - 0x3E, - 0x20, - 0x3E, - 0x10, - 0x3E, - 0x08, - 0x3E, - 0x04, - 0x3E, - 0x02, - 0xF8, - 0xFF, - 0xF7, - 0xFF, - 0x3E, - 0x01, - 0x3F, - 0x80, - 0x3F, - 0x40, - 0x3F, - 0x20, - 0x3F, - 0x10, - 0x3F, - 0x08, - 0x3F, - 0x04, - 0x3F, - 0x02, - 0x3F, - 0x01, - 0x40, - 0x80, - 0x40, - 0x40, - 0x40, - 0x20, - 0x40, - 0x10, - 0x40, - 0x08, - 0x40, - 0x04, - 0x40, - 0x02, - 0x40, - 0x01, - 0x41, - 0x80, - 0x41, - 0x40, - 0x41, - 0x20, - 0x41, - 0x10, - 0x41, - 0x08, - 0x41, - 0x04, - 0x41, - 0x02, - 0x41, - 0x01, - 0x42, - 0x80, - 0x42, - 0x40, - 0x42, - 0x20, - 0x42, - 0x10, - 0x42, - 0x08, - 0x42, - 0x04, - 0x42, - 0x02, - 0x42, - 0x01, - 0x43, - 0x80, - 0x43, - 0x40, - 0x43, - 0x20, - 0x43, - 0x10, - 0x43, - 0x08, - 0x43, - 0x04, - 0x43, - 0x02, - 0x43, - 0x01, - 0x44, - 0x80, - 0x44, - 0x40, - 0x44, - 0x20, - 0x44, - 0x10, - 0x44, - 0x08, - 0x44, - 0x04, - 0x44, - 0x02, - 0x44, - 0x01, - 0x45, - 0x80, - 0x45, - 0x40, - 0x45, - 0x20, - 0x45, - 0x10, - 0x45, - 0x08, - 0x45, - 0x04, - 0x45, - 0x02, - 0x45, - 0x01, - 0x46, - 0x80, - 0x46, - 0x40, - 0x46, - 0x20, - 0x46, - 0x10, - 0x46, - 0x08, - 0x46, - 0x04, - 0x46, - 0x02, - 0x46, - 0x01, - 0x47, - 0x80, - 0x47, - 0x40, - 0x47, - 0x20, - 0x47, - 0x10, - 0x47, - 0x08, - 0x47, - 0x04, - 0x47, - 0x02, - 0x47, - 0x01, - 0x48, - 0x80, - 0x48, - 0x40, - 0x48, - 0x20, - 0x48, - 0x10, - 0x48, - 0x08, - 0x48, - 0x04, - 0x48, - 0x02, - 0x48, - 0x01, - 0x49, - 0x80, - 0x49, - 0x40, - 0x49, - 0x20, - 0x49, - 0x10, - 0x49, - 0x08, - 0x49, - 0x04, - 0x49, - 0x02, - 0x49, - 0x01, - 0xFF, - 0xFF, - 0x4A, - 0x40, - 0x4A, - 0x20, - 0x4A, - 0x10, - 0x4A, - 0x08, - 0x4A, - 0x04, - 0x4A, - 0x02, - 0x4A, - 0x01, - 0x4B, - 0x80, - 0x4B, - 0x40, - 0x4B, - 0x20, - 0x4B, - 0x10, - 0x4B, - 0x08, - 0x4B, - 0x04, - 0x4B, - 0x02, - 0x4B, - 0x01, - 0x4C, - 0x80, - 0x4C, - 0x40, - 0x4C, - 0x20, - 0x4C, - 0x10, - 0x4C, - 0x08, - 0x4C, - 0x04, - 0x4C, - 0x02, - 0x4C, - 0x01, - 0x4D, - 0x80, - 0x4D, - 0x40, - 0x4D, - 0x20, - 0x4D, - 0x10, - 0x4D, - 0x08, - 0x4A, - 0x80, - 0x4D, - 0x04, - 0x4D, - 0x02, - 0x4D, - 0x01, - 0x4E, - 0x80, - 0x4E, - 0x40, - 0x4E, - 0x20, - 0x4E, - 0x10, - 0x4E, - 0x08, - 0x4E, - 0x04, - 0x4E, - 0x02, - 0x4E, - 0x01, - 0x4F, - 0x80, - 0x4F, - 0x40, - 0x4F, - 0x20, - 0x4F, - 0x10, - 0x4F, - 0x08, - 0x4F, - 0x04, - 0x4F, - 0x02, - 0x4F, - 0x01, - 0x50, - 0x80, - 0x50, - 0x40, - 0x50, - 0x20, - 0x50, - 0x10, - 0x50, - 0x08, - 0x50, - 0x04, - 0x50, - 0x02, - 0x50, - 0x01, - 0x51, - 0x80, - 0x51, - 0x40, - 0x51, - 0x20, - 0x51, - 0x10, - 0x51, - 0x08, - 0x51, - 0x04, - 0x51, - 0x02, - 0x51, - 0x01, - 0x52, - 0x80, - 0x52, - 0x40, - 0x52, - 0x20, - 0x52, - 0x10, - 0x52, - 0x08, - 0x52, - 0x04, - 0x52, - 0x02, - 0x52, - 0x01, - 0x53, - 0x80, - 0x53, - 0x40, - 0x53, - 0x20, - 0x53, - 0x10, - 0x53, - 0x08, - 0x53, - 0x04, - 0x53, - 0x02, - 0x53, - 0x01, - 0x54, - 0x80, - 0x54, - 0x40, - 0x54, - 0x20, - 0x54, - 0x10, - 0x54, - 0x08, - 0x54, - 0x04, - 0x54, - 0x02, - 0x54, - 0x01, - 0x55, - 0x80, - 0x55, - 0x40, - 0x55, - 0x20, - 0x55, - 0x10, - 0x55, - 0x08, - 0x55, - 0x04, - 0x55, - 0x02, - 0x55, - 0x01, - 0x56, - 0x80, - 0x56, - 0x40, - 0x56, - 0x20, - 0x56, - 0x10, - 0x56, - 0x08, - 0x56, - 0x04, - 0x56, - 0x02, - 0x56, - 0x01, - 0x57, - 0x80, - 0x57, - 0x40, - 0x57, - 0x20, - 0xF6, - 0x3F, - 0xF5, - 0x7F, - 0xF4, - 0x7F, - 0xF3, - 0x7F, - 0xF2, - 0x7F, - 0x57, - 0x10, - 0x57, - 0x08, - 0x57, - 0x04, - 0x57, - 0x02, - 0x57, - 0x01, - 0x58, - 0x80, - 0x58, - 0x40, - 0x58, - 0x20, - 0x58, - 0x10, - 0x58, - 0x08, - 0x58, - 0x04, - 0x58, - 0x02, - 0x58, - 0x01, - 0x59, - 0x80, - 0x59, - 0x40, - 0x59, - 0x20, - 0xF1, - 0x1F, - 0x59, - 0x10, - 0x59, - 0x08, - 0x59, - 0x04, - 0x59, - 0x02, - 0x59, - 0x01, - 0x5A, - 0x80, - 0x5A, - 0x40, - 0x5A, - 0x20, - 0x5A, - 0x10, - 0x5A, - 0x08, - 0x5A, - 0x04, - 0x5A, - 0x02, - 0x5A, - 0x01, - 0x5B, - 0x80, - 0x5B, - 0x40, - 0x5B, - 0x20, - 0x5B, - 0x10, - 0x5B, - 0x08, - 0x5B, - 0x04, - 0x5B, - 0x02, - 0x5B, - 0x01, - 0x5C, - 0x80, - 0x5C, - 0x40, - 0x5C, - 0x20, - 0x5C, - 0x10, - 0x5C, - 0x08, - 0x5C, - 0x04, - 0x5C, - 0x02, - 0xF0, - 0xFF, - 0xEF, - 0xFF, - 0xEE, - 0xFF, - 0xED, - 0xFF, - 0xEC, - 0xFF, - 0xEB, - 0xFF, - 0x5C, - 0x01, - 0x5D, - 0x80, - 0x5D, - 0x40, - 0x5D, - 0x20, - 0x5D, - 0x10, - 0x5D, - 0x08, - 0x5D, - 0x04, - 0x5D, - 0x02, - 0x5D, - 0x01, - 0x5E, - 0x80, - 0x5E, - 0x40, - 0x5E, - 0x20, - 0x5E, - 0x10, - 0x5E, - 0x08, - 0x5E, - 0x04, - 0x5E, - 0x02, - 0x5E, - 0x01, - 0x5F, - 0x80, - 0x5F, - 0x40, - 0x5F, - 0x20, - 0x5F, - 0x10, - 0x5F, - 0x08, - 0x5F, - 0x04, - 0x5F, - 0x02, - 0x5F, - 0x01, - 0x60, - 0x80, - 0x60, - 0x40, - 0x60, - 0x20, - 0x60, - 0x10, - 0x60, - 0x08, - 0x60, - 0x04, - 0x60, - 0x02, - 0x60, - 0x01, - 0x61, - 0x80, - 0x61, - 0x40, - 0x61, - 0x20, - 0x61, - 0x10, - 0x61, - 0x08, - 0x61, - 0x04, - 0x61, - 0x02, - 0x61, - 0x01, - 0x62, - 0x80, - 0x62, - 0x40, - 0x62, - 0x20, - 0x62, - 0x10, - 0x62, - 0x08, - 0x62, - 0x04, - 0x62, - 0x02, - 0x62, - 0x01, - 0x63, - 0x80, - 0x63, - 0x40, - 0x63, - 0x20, - 0x63, - 0x10, - 0x63, - 0x08, - 0x63, - 0x04, - 0x63, - 0x02, - /* padding */ - 0x00, - 0x00, - 0x00, - 0x00, +u16 dSv_event_flag_c::saveBitLabels[822] = { + 0xFFFF, 0x0080, 0x0040, 0x0020, 0x0010, 0x0008, 0x0004, 0x0002, 0x0001, 0x0180, 0x0140, 0x0120, + 0x0110, 0x0108, 0x0104, 0x0102, 0x0101, 0x0280, 0x0240, 0x0220, 0x0210, 0x0208, 0x0204, 0x0202, + 0x0201, 0x0380, 0x0340, 0x0320, 0x0310, 0x0308, 0x0304, 0x0302, 0x0301, 0x0480, 0x0440, 0x0420, + 0x0410, 0x0408, 0x0404, 0x0402, 0x0401, 0x0580, 0x0540, 0x0520, 0x0510, 0x0508, 0x0504, 0x0502, + 0x0501, 0x0680, 0x0640, 0x0620, 0x0610, 0x0608, 0x0604, 0x0602, 0x0601, 0x0780, 0x0740, 0x0720, + 0x0710, 0x0708, 0x0704, 0x0702, 0x0701, 0x0880, 0x0840, 0x0820, 0x0810, 0x0808, 0x0804, 0x0802, + 0x0801, 0x0980, 0x0940, 0x0920, 0x0910, 0x0908, 0x0904, 0x0902, 0x0901, 0x0A80, 0x0A40, 0x0A20, + 0x0A10, 0x0A08, 0x0A04, 0x0A02, 0x0A01, 0x0B80, 0x0B40, 0x0B20, 0x0B10, 0x0B08, 0x0B04, 0x0B02, + 0x0B01, 0x0C80, 0x0C40, 0x0C20, 0x0C10, 0x0C08, 0x0C04, 0x0C02, 0x0C01, 0x0D80, 0x0D40, 0x0D20, + 0x0D10, 0x0D08, 0x0D04, 0x0D02, 0x0D01, 0x0E80, 0x0E40, 0x0E20, 0x0E10, 0x0E08, 0x0E04, 0x0E02, + 0x0E01, 0x0F80, 0x0F40, 0x0F20, 0x0F10, 0x0F08, 0x0F04, 0x0F02, 0x0F01, 0x1080, 0x1040, 0x1020, + 0x1010, 0x1008, 0x1004, 0x1002, 0x1001, 0x1180, 0x1140, 0x1120, 0x1110, 0x1108, 0x1104, 0x1102, + 0x1101, 0x1280, 0x1240, 0x1220, 0x1210, 0x1208, 0x1204, 0x1202, 0x1201, 0x1380, 0x1340, 0x1320, + 0x1310, 0x1308, 0x1304, 0x1302, 0x1301, 0x1480, 0x1440, 0x1420, 0x1410, 0x1408, 0x1404, 0x1402, + 0x1401, 0x1580, 0x1540, 0x1520, 0x1510, 0x1508, 0x1504, 0x1502, 0x1501, 0x1680, 0x1640, 0x1620, + 0x1610, 0x1608, 0x1604, 0x1602, 0x1601, 0xFF1F, 0x1780, 0x1740, 0x1720, 0x1710, 0x1708, 0x1704, + 0x1702, 0x1701, 0x1880, 0x1840, 0x1820, 0x1810, 0xFEFF, 0xFDFF, 0xFCFF, 0xFBFF, 0x1808, 0x1804, + 0x1802, 0x1801, 0x1980, 0x1940, 0x1920, 0x1910, 0x1908, 0x1904, 0x1902, 0x1901, 0x1A80, 0x1A40, + 0x1A20, 0x1A10, 0x1A08, 0x1A04, 0x1A02, 0x1A01, 0x1B80, 0x1B40, 0x1B20, 0x1B10, 0x1B08, 0x1B04, + 0x1B02, 0x1B01, 0x1C80, 0x1C40, 0x1C20, 0x1C10, 0x1C08, 0x1C04, 0x1C02, 0x1C01, 0x1D80, 0x1D40, + 0x1D20, 0x1D10, 0x1D08, 0x1D04, 0x1D02, 0x1D01, 0x1E80, 0x1E40, 0x1E20, 0x1E10, 0x1E08, 0x1E04, + 0x1E02, 0x1E01, 0x1F80, 0x1F40, 0x1F20, 0x1F10, 0x1F08, 0x1F04, 0x1F02, 0x1F01, 0x2080, 0x2040, + 0x2020, 0x2010, 0x2008, 0x2004, 0x2002, 0x2001, 0x2180, 0x2140, 0x2120, 0x2110, 0x2108, 0x2104, + 0x2102, 0x2101, 0x2280, 0x2240, 0x2220, 0x2210, 0x2208, 0x2204, 0x2202, 0x2201, 0x2380, 0x2340, + 0x2320, 0x2310, 0x2308, 0x2304, 0x2302, 0x2301, 0x2480, 0x2440, 0x2420, 0x2410, 0x2408, 0x2404, + 0x2402, 0x2401, 0x2580, 0x2540, 0x2520, 0x2510, 0x2508, 0x2504, 0x2502, 0x2501, 0x2680, 0x2640, + 0x2620, 0x2610, 0x2608, 0x2604, 0x2602, 0x2601, 0x2780, 0x2740, 0x2720, 0x2710, 0x2708, 0x2704, + 0x2702, 0x2701, 0x2880, 0x2840, 0x2820, 0x2810, 0x2808, 0x2804, 0x2802, 0x2801, 0x2980, 0x2940, + 0x2920, 0x2910, 0x2908, 0x2904, 0x2902, 0x2901, 0x2A80, 0x2A40, 0x2A20, 0x2A10, 0x2A08, 0x2A04, + 0x2A02, 0x2A01, 0x2B80, 0x2B40, 0x2B20, 0x2B10, 0x2B08, 0x2B04, 0x2B02, 0x2B01, 0x2C80, 0x2C40, + 0x2C20, 0x2C10, 0x2C08, 0x2C04, 0x2C02, 0x2C01, 0x2D80, 0x2D40, 0x2D20, 0x2D10, 0x2D08, 0x2D04, + 0x2D02, 0x2D01, 0x2E80, 0x2E40, 0x2E20, 0x2E10, 0x2E08, 0x2E04, 0x2E02, 0x2E01, 0x2F80, 0x2F40, + 0x2F20, 0x2F10, 0x2F08, 0x2F04, 0x2F02, 0x2F01, 0x3080, 0x3040, 0x3020, 0x3010, 0x3008, 0x3004, + 0x3002, 0x3001, 0x3180, 0x3140, 0x3120, 0x3110, 0x3108, 0x3104, 0x3102, 0x3101, 0x3280, 0x3240, + 0x3220, 0x3210, 0x3208, 0x3204, 0x3202, 0x3201, 0x3380, 0x3340, 0x3320, 0x3310, 0x3308, 0x3304, + 0x3302, 0x3301, 0x3480, 0x3440, 0x3420, 0x3410, 0x3408, 0x3404, 0x3402, 0x3401, 0x3580, 0x3540, + 0x3520, 0x3510, 0x3508, 0x3504, 0x3502, 0x3501, 0x3680, 0x3640, 0x3620, 0x3610, 0x3608, 0x3604, + 0x3602, 0x3601, 0x3780, 0x3740, 0x3720, 0x3710, 0x3708, 0xFAFF, 0xF9FF, 0x3704, 0x3702, 0x3701, + 0x3880, 0x3840, 0x3820, 0x3810, 0x3808, 0x3804, 0x3802, 0x3801, 0x3980, 0x3940, 0x3920, 0x3910, + 0x3908, 0x3904, 0x3902, 0x3901, 0x3A80, 0x3A40, 0x3A20, 0x3A10, 0x3A08, 0x3A04, 0x3A02, 0x3A01, + 0x3B80, 0x3B40, 0x3B20, 0x3B10, 0x3B08, 0x3B04, 0x3B02, 0x3B01, 0x3C80, 0x3C40, 0x3C20, 0x3C10, + 0x3C08, 0x3C04, 0x3C02, 0x3C01, 0x3D80, 0x3D40, 0x3D20, 0x3D10, 0x3D08, 0x3D04, 0x3D02, 0x3D01, + 0x3E80, 0x3E40, 0x3E20, 0x3E10, 0x3E08, 0x3E04, 0x3E02, 0xF8FF, 0xF7FF, 0x3E01, 0x3F80, 0x3F40, + 0x3F20, 0x3F10, 0x3F08, 0x3F04, 0x3F02, 0x3F01, 0x4080, 0x4040, 0x4020, 0x4010, 0x4008, 0x4004, + 0x4002, 0x4001, 0x4180, 0x4140, 0x4120, 0x4110, 0x4108, 0x4104, 0x4102, 0x4101, 0x4280, 0x4240, + 0x4220, 0x4210, 0x4208, 0x4204, 0x4202, 0x4201, 0x4380, 0x4340, 0x4320, 0x4310, 0x4308, 0x4304, + 0x4302, 0x4301, 0x4480, 0x4440, 0x4420, 0x4410, 0x4408, 0x4404, 0x4402, 0x4401, 0x4580, 0x4540, + 0x4520, 0x4510, 0x4508, 0x4504, 0x4502, 0x4501, 0x4680, 0x4640, 0x4620, 0x4610, 0x4608, 0x4604, + 0x4602, 0x4601, 0x4780, 0x4740, 0x4720, 0x4710, 0x4708, 0x4704, 0x4702, 0x4701, 0x4880, 0x4840, + 0x4820, 0x4810, 0x4808, 0x4804, 0x4802, 0x4801, 0x4980, 0x4940, 0x4920, 0x4910, 0x4908, 0x4904, + 0x4902, 0x4901, 0xFFFF, 0x4A40, 0x4A20, 0x4A10, 0x4A08, 0x4A04, 0x4A02, 0x4A01, 0x4B80, 0x4B40, + 0x4B20, 0x4B10, 0x4B08, 0x4B04, 0x4B02, 0x4B01, 0x4C80, 0x4C40, 0x4C20, 0x4C10, 0x4C08, 0x4C04, + 0x4C02, 0x4C01, 0x4D80, 0x4D40, 0x4D20, 0x4D10, 0x4D08, 0x4A80, 0x4D04, 0x4D02, 0x4D01, 0x4E80, + 0x4E40, 0x4E20, 0x4E10, 0x4E08, 0x4E04, 0x4E02, 0x4E01, 0x4F80, 0x4F40, 0x4F20, 0x4F10, 0x4F08, + 0x4F04, 0x4F02, 0x4F01, 0x5080, 0x5040, 0x5020, 0x5010, 0x5008, 0x5004, 0x5002, 0x5001, 0x5180, + 0x5140, 0x5120, 0x5110, 0x5108, 0x5104, 0x5102, 0x5101, 0x5280, 0x5240, 0x5220, 0x5210, 0x5208, + 0x5204, 0x5202, 0x5201, 0x5380, 0x5340, 0x5320, 0x5310, 0x5308, 0x5304, 0x5302, 0x5301, 0x5480, + 0x5440, 0x5420, 0x5410, 0x5408, 0x5404, 0x5402, 0x5401, 0x5580, 0x5540, 0x5520, 0x5510, 0x5508, + 0x5504, 0x5502, 0x5501, 0x5680, 0x5640, 0x5620, 0x5610, 0x5608, 0x5604, 0x5602, 0x5601, 0x5780, + 0x5740, 0x5720, 0xF63F, 0xF57F, 0xF47F, 0xF37F, 0xF27F, 0x5710, 0x5708, 0x5704, 0x5702, 0x5701, + 0x5880, 0x5840, 0x5820, 0x5810, 0x5808, 0x5804, 0x5802, 0x5801, 0x5980, 0x5940, 0x5920, 0xF11F, + 0x5910, 0x5908, 0x5904, 0x5902, 0x5901, 0x5A80, 0x5A40, 0x5A20, 0x5A10, 0x5A08, 0x5A04, 0x5A02, + 0x5A01, 0x5B80, 0x5B40, 0x5B20, 0x5B10, 0x5B08, 0x5B04, 0x5B02, 0x5B01, 0x5C80, 0x5C40, 0x5C20, + 0x5C10, 0x5C08, 0x5C04, 0x5C02, 0xF0FF, 0xEFFF, 0xEEFF, 0xEDFF, 0xECFF, 0xEBFF, 0x5C01, 0x5D80, + 0x5D40, 0x5D20, 0x5D10, 0x5D08, 0x5D04, 0x5D02, 0x5D01, 0x5E80, 0x5E40, 0x5E20, 0x5E10, 0x5E08, + 0x5E04, 0x5E02, 0x5E01, 0x5F80, 0x5F40, 0x5F20, 0x5F10, 0x5F08, 0x5F04, 0x5F02, 0x5F01, 0x6080, + 0x6040, 0x6020, 0x6010, 0x6008, 0x6004, 0x6002, 0x6001, 0x6180, 0x6140, 0x6120, 0x6110, 0x6108, + 0x6104, 0x6102, 0x6101, 0x6280, 0x6240, 0x6220, 0x6210, 0x6208, 0x6204, 0x6202, 0x6201, 0x6380, + 0x6340, 0x6320, 0x6310, 0x6308, 0x6304, 0x6302, }; -/* 80033754-800337EC 02E094 0098+00 0/0 1/1 0/0 .text checkInsectBottle__17dSv_player_item_cFv */ -#ifdef NONMATCHING BOOL dSv_player_item_c::checkInsectBottle() { - int i = 0; - int j = 0; - for (; i < 0x18; i++) { - if (dComIfGs_isItemFirstBit(192 + i) && - !dComIfGs_isEventBit(lbl_803A7288.unk0[0x191 + j])) { - return 1; + for (int i = 0; i < 24; i++) { + if (dComIfGs_isItemFirstBit(M_BEETLE + i) && + !dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[0x191 + i])) { + return TRUE; } - j += 1; } - return 0; + return FALSE; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int dSv_player_item_c::checkInsectBottle() { - nofralloc -#include "asm/d/save/d_save/checkInsectBottle__17dSv_player_item_cFv.s" -} -#pragma pop -#endif -u8 dSv_player_item_c::checkEmptyBottle(void) { +u8 dSv_player_item_c::checkEmptyBottle() { u8 num = 0; for (int i = 0; i < BOTTLE_MAX; i++) { @@ -2559,27 +809,52 @@ u8 dSv_player_item_c::checkEmptyBottle(void) { return num; } -/* 80033828-80033910 02E168 00E8+00 1/1 0/0 0/0 .text setBombBagItemIn__17dSv_player_item_cFUcUcb - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dSv_player_item_c::setBombBagItemIn(u8 param_0, u8 param_1, bool param_2) { - nofralloc -#include "asm/d/save/d_save/setBombBagItemIn__17dSv_player_item_cFUcUcb.s" -} -#pragma pop +void dSv_player_item_c::setBombBagItemIn(u8 param_0, u8 param_1, bool param_2) { + int i = 0; + for (; i < 3; i++) { + if (param_0 == mItems[i + SLOT_15]) { + setItem(i + SLOT_15, param_1); -/* 80033910-80033A20 02E250 0110+00 1/1 0/0 0/0 .text - * setBombBagItemIn__17dSv_player_item_cFUcUcUcb */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dSv_player_item_c::setBombBagItemIn(u8 param_0, u8 param_1, u8 param_2, bool param_3) { - nofralloc -#include "asm/d/save/d_save/setBombBagItemIn__17dSv_player_item_cFUcUcUcb.s" + if (param_2 == 1 && param_1 != BOMB_BAG_LV1) { + u8 bombMax = dComIfGs_getBombMax(param_1); + dComIfGs_setBombNum(i, bombMax); + } + + for (int j = 0; j < 3; j++) { + u8 selectItem = dComIfGs_getSelectItemIndex(j); + if (i + SLOT_15 == selectItem) { + dComIfGp_setSelectItem(j); + } + } + break; + } + } +} + +void dSv_player_item_c::setBombBagItemIn(u8 param_0, u8 param_1, u8 param_2, bool param_3) { + int i = 0; + for (; i < 3; i++) { + if (param_0 == mItems[i + SLOT_15]) { + setItem(i + SLOT_15, param_1); + + if (param_3 == 1 && param_1 != BOMB_BAG_LV1) { + u8 bombMax = dComIfGs_getBombMax(param_1); + if (param_2 > bombMax) { + param_2 = dComIfGs_getBombMax(param_1); + } + dComIfGs_setBombNum(i, param_2); + } + + for (int j = 0; j < 3; j++) { + u8 selectItem = dComIfGs_getSelectItemIndex(j); + if (i + SLOT_15 == selectItem) { + dComIfGp_setSelectItem(j); + } + } + break; + } + } } -#pragma pop void dSv_player_item_c::setEmptyBombBagItemIn(u8 param_1, bool param_2) { setBombBagItemIn(BOMB_BAG_LV1, param_1, param_2); @@ -2589,43 +864,33 @@ void dSv_player_item_c::setEmptyBombBagItemIn(u8 param_1, u8 param_2, bool param setBombBagItemIn(BOMB_BAG_LV1, param_1, param_2, param_3); } -/* 80033A88-80033B08 02E3C8 0080+00 0/0 2/2 0/0 .text setEmptyBombBag__17dSv_player_item_cFv */ -// this is a few instructions off -#ifdef NONMATCHING -void dSv_player_item_c::setEmptyBombBag(void) { - int current_item_index; - u8 uVar1; - +void dSv_player_item_c::setEmptyBombBag() { for (int i = 0; i < 3; i++) { - current_item_index = (u8)(i + 15); - uVar1 = getItem(current_item_index, true); - - if (uVar1 == 0xff) { - setItem(current_item_index, 80); + if (dComIfGs_getItem((u8)(i + SLOT_15), true) == 0xff) { + dComIfGs_setItem((u8)(i + SLOT_15), BOMB_BAG_LV1); return; } } } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dSv_player_item_c::setEmptyBombBag() { - nofralloc -#include "asm/d/save/d_save/setEmptyBombBag__17dSv_player_item_cFv.s" -} -#pragma pop -#endif -/* 80033B08-80033BEC 02E448 00E4+00 0/0 3/3 0/0 .text setEmptyBombBag__17dSv_player_item_cFUcUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dSv_player_item_c::setEmptyBombBag(u8 param_0, u8 param_1) { - nofralloc -#include "asm/d/save/d_save/setEmptyBombBag__17dSv_player_item_cFUcUc.s" +void dSv_player_item_c::setEmptyBombBag(u8 param_0, u8 param_1) { + for (int i = 0; i < 3; i++) { + if (dComIfGs_getItem((u8)(i + SLOT_15), true) == 0xff) { + dComIfGs_setItem((u8)(i + SLOT_15), param_0); + + if (param_0 == BOMB_BAG_LV1) { + return; + } + + if (param_1 > dComIfGs_getBombMax(param_0)) { + param_1 = dComIfGs_getBombMax(param_0); + } + + dComIfGs_setBombNum(i, param_1); + return; + } + } } -#pragma pop u8 dSv_player_item_c::checkBombBag(u8 param_1) { u8 counter = 0; @@ -2639,37 +904,21 @@ u8 dSv_player_item_c::checkBombBag(u8 param_1) { return counter; } -/* 80033C2C-80033CBC 02E56C 0090+00 0/0 2/2 1/1 .text setWarashibeItem__17dSv_player_item_cFUc */ -// need gameinfo inline -#ifdef NONMATCHING void dSv_player_item_c::setWarashibeItem(u8 i_item_id) { u32 select_item_index; dComIfGs_setItem(SLOT_21, i_item_id); - // inline should be used, but it wrongly swaps instruction order ?? - // dComIfGp_setItem(SLOT_21, i_item_id); - g_dComIfG_gameInfo.setPlayUnkWarashibe1(SLOT_21); - g_dComIfG_gameInfo.setPlayUnkWarashibe2(i_item_id); + dComIfGp_setItem(SLOT_21, i_item_id); for (int i = 0; i < 4; i++) { select_item_index = dComIfGs_getSelectItemIndex((u8)i); if (select_item_index == SLOT_21) { - dComIfGp_setSelectItem__Fi((u8)i); + dComIfGp_setSelectItem((u8)i); } } } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dSv_player_item_c::setWarashibeItem(u8 param_0) { - nofralloc -#include "asm/d/save/d_save/setWarashibeItem__17dSv_player_item_cFUc.s" -} -#pragma pop -#endif -void dSv_player_item_c::setRodTypeLevelUp(void) { +void dSv_player_item_c::setRodTypeLevelUp() { int current_fishing_rod_item_id = mItems[SLOT_20]; switch (current_fishing_rod_item_id) { @@ -2688,14 +937,10 @@ void dSv_player_item_c::setRodTypeLevelUp(void) { } for (int i = 0; i < 4; i++) { - dComIfGp_setSelectItem__Fi(i); + dComIfGp_setSelectItem(i); } } -/* 80033D40-80033E40 02E680 0100+00 0/0 2/2 0/0 .text setBaitItem__17dSv_player_item_cFUc - */ -// need gameinfo inline -#ifdef NONMATCHING void dSv_player_item_c::setBaitItem(u8 param_1) { switch (param_1) { case BEE_CHILD: { @@ -2716,23 +961,13 @@ void dSv_player_item_c::setBaitItem(u8 param_1) { } for (int i = 0; i < 4; i++) { - dComIfGp_setSelectItem__Fi(i); + dComIfGp_setSelectItem(i); } } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dSv_player_item_c::setBaitItem(u8 param_0) { - nofralloc -#include "asm/d/save/d_save/setBaitItem__17dSv_player_item_cFUc.s" -} -#pragma pop -#endif -void dSv_player_get_item_c::init(void) { +void dSv_player_get_item_c::init() { for (int i = 0; i < 8; i++) { - mPauseMenuBitFields[i] = 0; + mItemFlags[i] = 0; } } @@ -2743,7 +978,7 @@ void dSv_player_get_item_c::onFirstBit(u8 i_itemno) { int tmp = (int)i_itemno; int tmp2 = (i_itemno >> 3) & 0xE0; // int uVar1 = ; - mPauseMenuBitFields[tmp2] |= 1 << (tmp & 0x1F); + mItemFlags[tmp2] |= 1 << (tmp & 0x1F); } #else #pragma push @@ -2776,7 +1011,7 @@ asm int dSv_player_get_item_c::isFirstBit(u8 param_0) const { } #pragma pop -void dSv_player_item_record_c::init(void) { +void dSv_player_item_record_c::init() { mArrowNum = 0; for (int i = 0; i < 3; i++) { @@ -2806,10 +1041,6 @@ void dSv_player_item_record_c::setBottleNum(u8 i_bottleIdx, u8 bottle_num) { mBottleNum[i_bottleIdx] = bottle_num; } -/* 80033F9C-80034030 02E8DC 0094+00 0/0 1/1 0/0 .text addBottleNum__24dSv_player_item_record_cFUcs - */ -// need gameinfo inline -#ifdef NONMATCHING u8 dSv_player_item_record_c::addBottleNum(u8 i_bottleIdx, s16 param_2) { int iVar3 = mBottleNum[i_bottleIdx] + param_2; @@ -2817,29 +1048,19 @@ u8 dSv_player_item_record_c::addBottleNum(u8 i_bottleIdx, s16 param_2) { if (iVar3 < 0) { mBottleNum[i_bottleIdx] = 0; - } else if (iVar3 > dComIfGs_getBottleMax__Fv()) { - mBottleNum[i_bottleIdx] = dComIfGs_getBottleMax__Fv(); + } else if (iVar3 > dComIfGs_getBottleMax()) { + mBottleNum[i_bottleIdx] = dComIfGs_getBottleMax(); } else { mBottleNum[i_bottleIdx] = iVar3; } return mBottleNum[i_bottleIdx]; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm u8 dSv_player_item_record_c::addBottleNum(u8 param_0, s16 param_1) { - nofralloc -#include "asm/d/save/d_save/addBottleNum__24dSv_player_item_record_cFUcs.s" -} -#pragma pop -#endif u8 dSv_player_item_record_c::getBottleNum(u8 i_bottleIdx) const { return mBottleNum[i_bottleIdx]; } -void dSv_player_item_max_c::init(void) { +void dSv_player_item_max_c::init() { for (int i = 0; i < 7; i++) { mItemMax[i] = 30; } @@ -2863,9 +1084,6 @@ void dSv_player_item_max_c::setBombNum(u8 bomb_id, u8 bomb_max) { } } -/* 800340F8-800341AC 02EA38 00B4+00 3/3 14/14 2/2 .text getBombNum__21dSv_player_item_max_cCFUc */ -// need gameinfo inline -#ifdef NONMATCHING u8 dSv_player_item_max_c::getBombNum(u8 param_1) const { u8 iVar3; @@ -2885,18 +1103,8 @@ u8 dSv_player_item_max_c::getBombNum(u8 param_1) const { return 0; } } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm u8 dSv_player_item_max_c::getBombNum(u8 param_0) const { - nofralloc -#include "asm/d/save/d_save/getBombNum__21dSv_player_item_max_cCFUc.s" -} -#pragma pop -#endif -void dSv_player_collect_c::init(void) { +void dSv_player_collect_c::init() { for (int i = 0; i < 8; i++) { mItem[i] = 0; } @@ -2932,7 +1140,7 @@ BOOL dSv_player_collect_c::isCollectMirror(u8 i_item) const { return mMirror & (u8)(1 << i_item) ? TRUE : FALSE; } -void dSv_player_wolf_c::init(void) { +void dSv_player_wolf_c::init() { for (int i = 0; i < 3; i++) { unk0[i] = 0; } @@ -2940,7 +1148,7 @@ void dSv_player_wolf_c::init(void) { unk3 = 0; } -void dSv_light_drop_c::init(void) { +void dSv_light_drop_c::init() { for (int i = 0; i < 4; i++) { mLightDropNum[i] = 0; } @@ -2978,34 +1186,34 @@ BOOL dSv_light_drop_c::isLightDropGetFlag(u8 i_nowLevel) const { return mLightDropGetFlag & (u8)(1 << i_nowLevel) ? TRUE : FALSE; } -void dSv_letter_info_c::init(void) { +void dSv_letter_info_c::init() { for (int i = 0; i < 2; i++) { - mLetterGetBitfields[i] = 0; - mLetterReadBitfields[i] = 0; + mLetterGetFlags[i] = 0; + mLetterReadFlags[i] = 0; } for (int i = 0; i < LETTER_INFO_BIT; i++) { - unk16[i] = 0; + mGetNumber[i] = 0; } } void dSv_letter_info_c::onLetterGetFlag(int i_no) { - mLetterGetBitfields[i_no >> 0x5] |= 0x1 << (i_no & 0x1F); + mLetterGetFlags[i_no >> 0x5] |= 0x1 << (i_no & 0x1F); } BOOL dSv_letter_info_c::isLetterGetFlag(int i_no) const { - return mLetterGetBitfields[i_no >> 0x5] & (1 << (i_no & 0x1F)) ? TRUE : FALSE; + return mLetterGetFlags[i_no >> 0x5] & (1 << (i_no & 0x1F)) ? TRUE : FALSE; } void dSv_letter_info_c::onLetterReadFlag(int i_no) { - mLetterReadBitfields[i_no >> 0x5] |= 0x1 << (i_no & 0x1F); + mLetterReadFlags[i_no >> 0x5] |= 0x1 << (i_no & 0x1F); } BOOL dSv_letter_info_c::isLetterReadFlag(int i_no) const { - return mLetterReadBitfields[i_no >> 5] & 1 << (i_no & 0x1F) ? TRUE : FALSE; + return mLetterReadFlags[i_no >> 5] & 1 << (i_no & 0x1F) ? TRUE : FALSE; } -void dSv_fishing_info_c::init(void) { +void dSv_fishing_info_c::init() { for (int i = 0; i < 16; i++) { mFishCount[i] = 0; mMaxSize[i] = 0; @@ -3018,20 +1226,9 @@ void dSv_fishing_info_c::addFishCount(u8 fish_index) { } } -/* 80034518-800345AC 02EE58 0094+00 1/1 0/0 0/0 .text init__17dSv_player_info_cFv */ -// a few instructions off -#ifdef NONMATCHING -void dSv_player_info_c::init(void) { - unsigned long a = 0x382; - unsigned long b = 0x383; - - JMSMesgEntry_c* c = 0; - JMSMesgEntry_c* d = 0; - - d_meter2_info::dMeter2Info_c ok; - - ok.getString(a, (char*)mPlayerName, c); - ok.getString(b, (char*)mHorseName, d); +void dSv_player_info_c::init() { + dMeter2Info_getString(0x382, (char*)mPlayerName, NULL); + dMeter2Info_getString(0x383, (char*)mHorseName, NULL); unk4 = 0; unk0 = 0; @@ -3044,31 +1241,18 @@ void dSv_player_info_c::init(void) { unk55[i] = 0; } } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dSv_player_info_c::init() { - nofralloc -#include "asm/d/save/d_save/init__17dSv_player_info_cFv.s" -} -#pragma pop -#endif -/* 800345AC-80034644 02EEEC 0098+00 1/1 0/0 0/0 .text init__19dSv_player_config_cFv */ -// needs mAudioMgrPtr setup -#ifdef NONMATCHING -void dSv_player_config_c::init(void) { - u32 os_mSoundMode; +void dSv_player_config_c::init() { + u32 os_soundMode; unk0 = 1; - os_mSoundMode = OSGetSoundMode(); - if (os_mSoundMode == SOUND_MODE_MONO) { + os_soundMode = OSGetSoundMode(); + if (os_soundMode == SOUND_MODE_MONO) { mSoundMode = SOUND_MODE_MONO; - lbl_80451368->setOutputMode(SOUND_MODE_MONO); + Z2AudioMgr::mAudioMgrPtr->setOutputMode(SOUND_MODE_MONO); } else { mSoundMode = SOUND_MODE_STEREO; - lbl_80451368->setOutputMode(SOUND_MODE_STEREO); + Z2AudioMgr::mAudioMgrPtr->setOutputMode(SOUND_MODE_STEREO); } mAttentionType = 0; @@ -3076,76 +1260,53 @@ void dSv_player_config_c::init(void) { unk4 = 0; unk5 = 0; mShortCut = 0; - mCalibrateDist = 0x15e; + mCalibrateDist = 350; mCalValue = 0; mCameraControl = 0; mPointer = 1; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dSv_player_config_c::init() { - nofralloc -#include "asm/d/save/d_save/init__19dSv_player_config_cFv.s" -} -#pragma pop -#endif -/* 80034644-80034684 02EF84 0040+00 0/0 4/4 0/0 .text checkVibration__19dSv_player_config_cCFv */ -// need gameinfo inline -#ifdef NONMATCHING -u32 dSv_player_config_c::checkVibration(void) const { - return _sRumbleSupported & 0x80000000 ? dComIfGp_getNowVibration() : 0; +u32 dSv_player_config_c::checkVibration() const { + return JUTGamePad::sRumbleSupported & 0x80000000 ? dComIfGp_getNowVibration() : 0; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm u32 dSv_player_config_c::checkVibration() const { - nofralloc -#include "asm/d/save/d_save/checkVibration__19dSv_player_config_cCFv.s" -} -#pragma pop -#endif -u8 dSv_player_config_c::getSound(void) { +u8 dSv_player_config_c::getSound() { return mSoundMode; } -void dSv_player_config_c::setSound(u8 i_mSoundMode) { - mSoundMode = i_mSoundMode; +void dSv_player_config_c::setSound(u8 i_mode) { + mSoundMode = i_mode; } -u8 dSv_player_config_c::getVibration(void) { +u8 dSv_player_config_c::getVibration() { return mVibration; } -void dSv_player_config_c::setVibration(u8 i_mVibrationStatus) { - mVibration = i_mVibrationStatus; +void dSv_player_config_c::setVibration(u8 i_status) { + mVibration = i_status; } -void dSv_player_c::init(void) { - player_status_a.init(); - player_status_b.init(); - horse_place.init(); - player_return.init(); - player_last_field.init(); - player_last_mark.init(); - player_item.init(); - player_get_item.init(); - player_item_record.init(); - player_item_max.init(); - player_collect.init(); - player_wolf.init(); - light_drop.init(); - letter_info.init(); - fishing_info.init(); +void dSv_player_c::init() { + mPlayerStatusA.init(); + mPlayerStatusB.init(); + mHorsePlace.init(); + mPlayerReturnPlace.init(); + mPlayerFieldLastStayInfo.init(); + mPlayerLastMarkInfo.init(); + mItem.init(); + mGetItem.init(); + mItemRecord.init(); + mItemMax.init(); + mCollect.init(); + mWolf.init(); + mLightDrop.init(); + mLetterInfo.init(); + mFishingInfo.init(); mPlayerInfo.init(); - player_config.init(); + mConfig.init(); } -void dSv_memBit_c::init(void) { +void dSv_memBit_c::init() { for (int i = 0; i < 2; i++) { mTbox[i] = 0; } @@ -3213,11 +1374,11 @@ void dSv_memBit_c::onDungeonItem(int i_no) { mDungeonItem |= (u8)(1 << i_no); } -bool dSv_memBit_c::isDungeonItem(int i_no) const { - return mDungeonItem & (u8)(1 << i_no) ? true : false; +s32 dSv_memBit_c::isDungeonItem(int i_no) const { + return mDungeonItem & (u8)(1 << i_no) ? 1 : 0; } -void dSv_event_c::init(void) { +void dSv_event_c::init() { for (int i = 0; i < MAX_EVENTS; i++) { mEvent[i] = 0; } @@ -3246,23 +1407,23 @@ u8 dSv_event_c::getEventReg(u16 param_1) const { return (u8)param_1 & mEvent[param_1 >> 8]; } -void dSv_MiniGame_c::init(void) { +void dSv_MiniGame_c::init() { unk0 = 0; for (int i = 0; i < 3; i++) { unk1[i] = 0; } - unk4 = 120000; + mStarTime = 120000; mBalloonScore = 0; mRaceGameTime = 0; unk16 = 0; unk20 = 0; } -void dSv_memory_c::init(void) { - mMemBit.init(); +void dSv_memory_c::init() { + mBit.init(); } -void dSv_memory2_c::init(void) { +void dSv_memory2_c::init() { for (int i = 0; i < 2; i++) { mVisitedRoom[i] = 0; } @@ -3330,7 +1491,7 @@ BOOL dSv_danBit_c::isItem(int i_no) const { return mItem[i_no >> 5] & 1 << (i_no & 0x1F) ? TRUE : FALSE; } -void dSv_zoneBit_c::init(void) { +void dSv_zoneBit_c::init() { for (int i = 0; i < 2; i++) { mSwitch[i] = 0; } @@ -3343,11 +1504,11 @@ void dSv_zoneBit_c::init(void) { mRoomItem = 0; } -void dSv_zoneBit_c::clearRoomSwitch(void) { +void dSv_zoneBit_c::clearRoomSwitch() { mRoomSwitch = 0; } -void dSv_zoneBit_c::clearRoomItem(void) { +void dSv_zoneBit_c::clearRoomItem() { mRoomItem = 0; } @@ -3416,22 +1577,22 @@ BOOL dSv_zoneBit_c::isOneItem(int i_no) const { return mRoomItem & 1 << i_no ? TRUE : FALSE; } -void dSv_zoneActor_c::init(void) { +void dSv_zoneActor_c::init() { for (int i = 0; i < 4; i++) { - actor_bitfield[i] = 0; + mActorFlags[i] = 0; } } void dSv_zoneActor_c::on(int i_id) { - actor_bitfield[i_id >> 5] |= 1 << (i_id & 0x1F); + mActorFlags[i_id >> 5] |= 1 << (i_id & 0x1F); } void dSv_zoneActor_c::off(int i_id) { - actor_bitfield[i_id >> 5] &= ~(1 << (i_id & 0x1F)); + mActorFlags[i_id >> 5] &= ~(1 << (i_id & 0x1F)); } BOOL dSv_zoneActor_c::is(int i_id) const { - return actor_bitfield[i_id >> 5] & 1 << (i_id & 0x1F) ? TRUE : FALSE; + return mActorFlags[i_id >> 5] & 1 << (i_id & 0x1F) ? TRUE : FALSE; } void dSv_zone_c::init(int i_roomNo) { @@ -3453,15 +1614,15 @@ void dSv_turnRestart_c::set(const cXyz& i_position, s16 i_angleY, s8 param_3, u3 mParam = i_param; } -void dSv_info_c::init(void) { +void dSv_info_c::init() { mSavedata.init(); mMemory.init(); - mDan.init(-1); + initDan(-1); initZone(); mTmp.init(); } -void dSv_save_c::init(void) { +void dSv_save_c::init() { mPlayer.init(); for (int i = 0; i < STAGE_MAX; i++) { mSave[i].init(); @@ -3479,27 +1640,15 @@ dSv_memory2_c* dSv_save_c::getSave2(int i_stage2No) { return &mSave2[i_stage2No]; } -/* 800350BC-800350F0 02F9FC 0034+00 0/0 1/1 0/0 .text getSave__10dSv_info_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dSv_info_c::getSave(int param_0) { - nofralloc -#include "asm/d/save/d_save/getSave__10dSv_info_cFi.s" +void dSv_info_c::getSave(int i_stageNo) { + mMemory = mSavedata.getSave(i_stageNo); } -#pragma pop -/* 800350F0-8003514C 02FA30 005C+00 0/0 2/2 0/0 .text putSave__10dSv_info_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dSv_info_c::putSave(int param_0) { - nofralloc -#include "asm/d/save/d_save/putSave__10dSv_info_cFi.s" +void dSv_info_c::putSave(int i_stageNo) { + mSavedata.putSave(i_stageNo, mMemory); } -#pragma pop -void dSv_info_c::initZone(void) { +void dSv_info_c::initZone() { for (int i = 0; i < 0x20; i++) { mZone[i].init(-1); } @@ -3522,7 +1671,7 @@ void dSv_info_c::onSwitch(int i_no, int i_roomNo) { } if (i_no < 0x80) { - mMemory.getMemBit().onSwitch(i_no); + mMemory.getBit().onSwitch(i_no); } else if (i_no < 0xc0) { mDan.onSwitch(i_no - 0x80); } else { @@ -3541,7 +1690,7 @@ void dSv_info_c::offSwitch(int i_no, int i_roomNo) { } if (i_no < 0x80) { - mMemory.getMemBit().offSwitch(i_no); + mMemory.getBit().offSwitch(i_no); } else if (i_no < 0xc0) { mDan.offSwitch(i_no - 0x80); } else { @@ -3561,7 +1710,7 @@ BOOL dSv_info_c::isSwitch(int i_no, int i_roomNo) const { } if (i_no < 0x80) { - value = mMemory.getMemBitConst().isSwitch(i_no); + value = mMemory.getBit().isSwitch(i_no); } else if (i_no < 0xc0) { value = mDan.isSwitch(i_no - 0x80); } else { @@ -3570,9 +1719,9 @@ BOOL dSv_info_c::isSwitch(int i_no, int i_roomNo) const { value = FALSE; } else { if (i_no < 0xE0) { - value = mZone[zoneId].getZoneBitConst().isSwitch(i_no - 0xC0); + value = mZone[zoneId].getBit().isSwitch(i_no - 0xC0); } else { - value = mZone[zoneId].getZoneBitConst().isOneSwitch(i_no - 0xE0); + value = mZone[zoneId].getBit().isOneSwitch(i_no - 0xE0); } } } @@ -3586,7 +1735,7 @@ BOOL dSv_info_c::revSwitch(int i_no, int i_roomNo) { } if (i_no < 0x80) { - value = mMemory.getMemBit().revSwitch(i_no); + value = mMemory.getBit().revSwitch(i_no); } else if (i_no < 0xC0) { value = mDan.revSwitch(i_no - 0x80); } else { @@ -3609,7 +1758,7 @@ void dSv_info_c::onItem(int i_no, int i_roomNo) { if (i_no < 0x80) { mDan.onItem(i_no); } else if (i_no < 0xA0) { - mMemory.getMemBit().onItem(i_no - 0x80); + mMemory.getBit().onItem(i_no - 0x80); } else { int zoneNo = dStage_roomControl_c::getZoneNo(i_roomNo); if (i_no < 0xC0) { @@ -3629,13 +1778,13 @@ BOOL dSv_info_c::isItem(int i_no, int i_roomNo) const { if (i_no < 0x80) { value = mDan.isItem(i_no); } else if (i_no < 0xA0) { - value = mMemory.getMemBitConst().isItem(i_no - 0x80); + value = mMemory.getBit().isItem(i_no - 0x80); } else { int zoneNo = dStage_roomControl_c::getZoneNo(i_roomNo); if (i_no < 0xC0) { - value = mZone[zoneNo].getZoneBitConst().isItem(i_no - 0xA0); + value = mZone[zoneNo].getBit().isItem(i_no - 0xA0); } else { - value = mZone[zoneNo].getZoneBitConst().isOneItem(i_no - 0xC0); + value = mZone[zoneNo].getBit().isOneItem(i_no - 0xC0); } } @@ -3648,7 +1797,7 @@ void dSv_info_c::onActor(int i_id, int i_roomNo) { } int zoneNo = dStage_roomControl_c::getZoneNo(i_roomNo); - mZone[zoneNo].getZoneActor().on(i_id); + mZone[zoneNo].getActor().on(i_id); } void dSv_info_c::offActor(int i_id, int i_roomNo) { @@ -3657,7 +1806,7 @@ void dSv_info_c::offActor(int i_id, int i_roomNo) { } int zoneNo = dStage_roomControl_c::getZoneNo(i_roomNo); - mZone[zoneNo].getZoneActor().off(i_id); + mZone[zoneNo].getActor().off(i_id); } BOOL dSv_info_c::isActor(int i_id, int i_roomNo) const { @@ -3665,8 +1814,8 @@ BOOL dSv_info_c::isActor(int i_id, int i_roomNo) const { return FALSE; } - int ActorZoneNo = dStage_roomControl_c::getZoneNo(i_roomNo); - return mZone[ActorZoneNo].getZoneActorConst().is(i_id); + int zoneNo = dStage_roomControl_c::getZoneNo(i_roomNo); + return mZone[zoneNo].getActor().is(i_id); } /* ############################################################################################## */ @@ -3678,55 +1827,73 @@ SECTION_DEAD static char const* const stringBase_8037926C = "SAVE size:%d\n"; #pragma pop /* 80035798-80035A04 0300D8 026C+00 0/0 1/1 0/0 .text memory_to_card__10dSv_info_cFPci */ +// few wrong instructions, lots of regalloc issues #ifdef NONMATCHING -extern u8 lbl_803F6094[0x10100]; -void dSv_info_c::memory_to_card(char* param_1, int param_2) { +int dSv_info_c::memory_to_card(char* param_0, int param_1) { BOOL bVar1 = FALSE; - int uVar12 = 0; - BOOL bVar6 = dComIfGs_isEventBit__FUs(0x1B08); - if (!tmp) { - BOOL bVar7 = dComIfGs_isEventBit__FUs(0x1B20); - BOOL tmp = bVar7; - bVar7 = dComIfGs_isEventBit__FUs(0x1B10); - BOOL tmp2 = bVar7; - dComIfGs_offEventBit(0x1B20); - dComIfGs_offEventBit(0x1B10); + u32 unaff27; + int unaff23; + int unkr27 = 0; + u16 current_lantern_oil = 0; + + if (!dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[226])) { + unaff27 = dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[224]); + unaff23 = dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[225]); + dComIfGs_offEventBit(dSv_event_flag_c::saveBitLabels[224]); + dComIfGs_offEventBit(dSv_event_flag_c::saveBitLabels[225]); + unkr27 = 1; } - BOOL iVar4 = dComIfGs_isItemFirstBit(KANTERA); - - if (iVar4) { + if (dComIfGs_isItemFirstBit(KANTERA) && dComIfGs_getItem(1, 1) == 0xFF) { dComIfGs_setItem(SLOT_1, KANTERA); - u16 current_lantern_oil = dComIfGs_getOil(); - u8 oil_gauge_backup = dMeter2Info_getOilGaugeBackUp(); - dComIfGs_setOil(oil_gauge_backup & 0xFFFF); + current_lantern_oil = dComIfGs_getOil(); + u16 oil_gauge_backup = dMeter2Info_getOilGaugeBackUp(); + dComIfGs_setOil(oil_gauge_backup); bVar1 = TRUE; } - int uVar3 = g_dComIfG_gameInfo + 0xF2C; - int iVar2 = g_dComIfG_gameInfo + 0xF28; + char* ptr = param_0 + param_1 * 0xa94; - u32* ptr = lbl_803F6094 + 0x9f6c; - OSTime time = OSGetTime(); + // weird time stuff going on here. not really sure about any of it + s64 start_time = dComIfGs_getSaveStartTime(); + s64 new_time = OSGetTime() - start_time; + // new_time = 0; + s64 ivar7 = new_time + start_time; - OSTime newTime = time >> 0x20; - int newTime2 = newTime - uVar3; + s64 total_time = dComIfGs_getSaveTotalTime(); + new_time += total_time; - int newTime3 = newTime2 + g_dComIfG_gameInfo + - 0xF30 + if (new_time < start_time) { + g_dComIfG_gameInfo.info.getPlayer().getPlayerInfo().setTotalTime(new_time); + } - int newTime4 = g_dComIfG_gameInfo + 0xF78 + s64 tmp = OSGetTime(); + g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusB().setDateIpl(tmp); + memcpy(ptr, &g_dComIfG_gameInfo, sizeof(dSv_save_c)); + printf("Write size:%d\n", sizeof(dSv_save_c)); - s64 sVar13 = __div2i((int)((ulonglong)uVar8 >> 0x20), (int)uVar8, - 0x0, _DAT_800000f8 >> 0x2); + if ((u8)unkr27 == 1) { + if (unaff27) { + dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[224]); + } + if ((u8)unaff23 != 0) { + dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[225]); + } + } - BOOL bVar7 = + if (!bVar1) { + dComIfGs_setItem(SLOT_1, NO_ITEM); + dComIfGs_setOil(current_lantern_oil); + } + + printf("SAVE size:%d\n", sizeof(dSv_save_c)); + return 0; } #else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dSv_info_c::memory_to_card(char* param_0, int param_1) { +asm int dSv_info_c::memory_to_card(char* param_0, int param_1) { nofralloc #include "asm/d/save/d_save/memory_to_card__10dSv_info_cFPci.s" } @@ -3741,14 +1908,63 @@ SECTION_DEAD static char const* const stringBase_8037927A = "LOAD size:%d\n"; #pragma pop /* 80035A04-80035BD0 030344 01CC+00 0/0 2/2 0/0 .text card_to_memory__10dSv_info_cFPci */ +// close, some instructions out of order / regalloc +#ifdef NONMATCHING +int dSv_info_c::card_to_memory(char* param_0, int param_1) { + char* ptr = param_0 + param_1 * 0xa94; + dSv_save_c* tmp = &g_dComIfG_gameInfo.info.getSavedata(); + memcpy(tmp, ptr, sizeof(dSv_save_c)); + + if (!OSGetSoundMode()) { + g_dComIfG_gameInfo.info.getPlayer().getConfig().setSound(SOUND_MODE_MONO); + Z2AudioMgr::mAudioMgrPtr->setOutputMode(SOUND_MODE_MONO); + } else { + u8 save_sound = g_dComIfG_gameInfo.info.getPlayer().getConfig().getSound(); + + if (save_sound == 2) { + Z2AudioMgr::mAudioMgrPtr->setOutputMode(2); + } else { + g_dComIfG_gameInfo.info.getPlayer().getConfig().setSound(SOUND_MODE_STEREO); + Z2AudioMgr::mAudioMgrPtr->setOutputMode(SOUND_MODE_STEREO); + } + } + + if (dComIfGs_getSaveData().getPlayer().getPlayerStatusA().getLife() < 12) { + dComIfGs_setLife(12); + } + + dComIfGs_setKeyNum(6, 0); + + if (dComIfGs_getItem(SLOT_9, 1) == W_HOOKSHOT) { + dComIfGs_setItem(SLOT_10, W_HOOKSHOT); + dComIfGs_setItem(SLOT_9, NO_ITEM); + } + + if (dComIfGs_getItem(SLOT_9, 1) == HOOKSHOT && dComIfGs_getItem(SLOT_9, 1) == W_HOOKSHOT) { + dComIfGs_setItem(SLOT_9, NO_ITEM); + } + + dComIfGs_setLineUpItem(); + + u8 save_vibration = dComIfGs_getSaveData().getPlayer().getConfig().getVibration(); + dComIfGp_setNowVibration(save_vibration); + + char* save_stage = dComIfGs_getSaveData().getPlayer().getPlayerReturnPlace().getName(); + dMeter2Info_setSaveStageName(save_stage); + + printf("LOAD size:%d\n", sizeof(dSv_save_c)); + return 0; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dSv_info_c::card_to_memory(char* param_0, int param_1) { +asm int dSv_info_c::card_to_memory(char* param_0, int param_1) { nofralloc #include "asm/d/save/d_save/card_to_memory__10dSv_info_cFPci.s" } #pragma pop +#endif /* ############################################################################################## */ /* 80379234-80379234 005894 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ @@ -3761,6 +1977,17 @@ SECTION_DEAD static char const* const pad_80379296 = "\0"; /* 80035BD0-80035C88 030510 00B8+00 0/0 3/3 0/0 .text initdata_to_card__10dSv_info_cFPci */ +#ifdef NONMATCHING +void dSv_info_c::initdata_to_card(char* param_0, int fileNo) { + dSv_save_c tmp; + + tmp.init(); + tmp.getPlayer().getPlayerInfo().setPlayerName(""); + tmp.getPlayer().getPlayerInfo().setHorseName(""); + memcpy(¶m_0 + fileNo * 0xa94, &tmp, 0x958); + printf("INIT size:%d\n", 0x958); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -3769,384 +1996,24 @@ asm void dSv_info_c::initdata_to_card(char* param_0, int param_1) { #include "asm/d/save/d_save/initdata_to_card__10dSv_info_cFPci.s" } #pragma pop +#endif -/* ############################################################################################## */ -/* 803790C0-80379234 005720 0172+02 0/0 17/17 7/7 .rodata tempBitLabels__20dSv_event_tmp_flag_c */ -SECTION_RODATA u8 const dSv_event_tmp_flag_c::tempBitLabels[370 + 2 /* padding */] = { - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0x0F, - 0xFE, - 0xFF, - 0x00, - 0x40, - 0xFD, - 0xFF, - 0xFC, - 0xFF, - 0x00, - 0x20, - 0x00, - 0x80, - 0x00, - 0x10, - 0x00, - 0x08, - 0x00, - 0x04, - 0x00, - 0x02, - 0x00, - 0x01, - 0x01, - 0x80, - 0x01, - 0x40, - 0x01, - 0x20, - 0x01, - 0x10, - 0x01, - 0x08, - 0x01, - 0x04, - 0x01, - 0x02, - 0x01, - 0x01, - 0x02, - 0x80, - 0x02, - 0x40, - 0x02, - 0x20, - 0x02, - 0x10, - 0x02, - 0x08, - 0x02, - 0x04, - 0x02, - 0x02, - 0x02, - 0x01, - 0x03, - 0x80, - 0x03, - 0x40, - 0x03, - 0x20, - 0x03, - 0x10, - 0xFB, - 0xFF, - 0x03, - 0x08, - 0x03, - 0x04, - 0x03, - 0x02, - 0x03, - 0x01, - 0x04, - 0x80, - 0x04, - 0x40, - 0x04, - 0x20, - 0x04, - 0x10, - 0x04, - 0x08, - 0x04, - 0x04, - 0x04, - 0x02, - 0x04, - 0x01, - 0x05, - 0x80, - 0x05, - 0x40, - 0x05, - 0x20, - 0x05, - 0x10, - 0x05, - 0x08, - 0x05, - 0x04, - 0x05, - 0x02, - 0x05, - 0x01, - 0x06, - 0x80, - 0x06, - 0x40, - 0x06, - 0x20, - 0x06, - 0x10, - 0x06, - 0x08, - 0x06, - 0x04, - 0x06, - 0x02, - 0x06, - 0x01, - 0x07, - 0x80, - 0x07, - 0x40, - 0x07, - 0x20, - 0x07, - 0x10, - 0x07, - 0x08, - 0x07, - 0x04, - 0x07, - 0x02, - 0x07, - 0x01, - 0x08, - 0x80, - 0x08, - 0x40, - 0x08, - 0x20, - 0x08, - 0x10, - 0x08, - 0x08, - 0x08, - 0x04, - 0x08, - 0x02, - 0x08, - 0x01, - 0x09, - 0x80, - 0x09, - 0x40, - 0x09, - 0x20, - 0x09, - 0x10, - 0x09, - 0x08, - 0x09, - 0x04, - 0x09, - 0x02, - 0x09, - 0x01, - 0x0A, - 0x80, - 0x0A, - 0x40, - 0x0A, - 0x20, - 0x0A, - 0x10, - 0x0A, - 0x08, - 0x0A, - 0x04, - 0x0A, - 0x02, - 0x0A, - 0x01, - 0x0B, - 0x80, - 0x0B, - 0x40, - 0x0B, - 0x20, - 0x0B, - 0x10, - 0x0B, - 0x08, - 0x0B, - 0x04, - 0xFA, - 0xFF, - 0xF9, - 0xFF, - 0xF8, - 0xFF, - 0xF7, - 0xFF, - 0xF6, - 0xFF, - 0xF5, - 0xFF, - 0x0B, - 0x02, - 0x0B, - 0x01, - 0x0C, - 0x80, - 0x0C, - 0x40, - 0x0C, - 0x20, - 0x0C, - 0x10, - 0x0C, - 0x08, - 0xF4, - 0xFF, - 0xF3, - 0xFF, - 0x0C, - 0x04, - 0x0C, - 0x02, - 0x0C, - 0x01, - 0x0D, - 0x80, - 0x0D, - 0x40, - 0x0D, - 0x20, - 0x0D, - 0x10, - 0x0D, - 0x08, - 0x0D, - 0x04, - 0x0D, - 0x02, - 0x0D, - 0x01, - 0x0E, - 0x80, - 0x0E, - 0x40, - 0x0E, - 0x20, - 0x0E, - 0x10, - 0x0E, - 0x08, - 0x0E, - 0x04, - 0x0E, - 0x02, - 0x0E, - 0x01, - 0x0F, - 0x80, - 0x0F, - 0x40, - 0x0F, - 0x20, - 0x0F, - 0x10, - 0x0F, - 0x08, - 0x0F, - 0x04, - 0x0F, - 0x02, - 0x0F, - 0x01, - 0x10, - 0x80, - 0x10, - 0x40, - 0x10, - 0x20, - 0x10, - 0x10, - 0x10, - 0x08, - 0x10, - 0x04, - 0x10, - 0x02, - 0x10, - 0x01, - 0x11, - 0x80, - 0x11, - 0x40, - 0x11, - 0x20, - 0x11, - 0x10, - 0x11, - 0x08, - 0x11, - 0x04, - 0x11, - 0x02, - 0x11, - 0x01, - 0x12, - 0x80, - 0x12, - 0x40, - 0x12, - 0x20, - 0x12, - 0x10, - 0x12, - 0x08, - 0x12, - 0x04, - 0x12, - 0x02, - 0x12, - 0x01, - 0x13, - 0x80, - 0x13, - 0x40, - 0x13, - 0x20, - 0x13, - 0x10, - 0x13, - 0x08, - 0x13, - 0x04, - 0x13, - 0x02, - 0x13, - 0x01, - 0x14, - 0x80, - 0x14, - 0x40, - 0x14, - 0x20, - 0x14, - 0x10, - 0x14, - 0x08, - 0x14, - 0x04, - 0x14, - 0x02, - 0x14, - 0x01, - 0x15, - 0x80, - 0xF2, - 0xFF, - /* padding */ - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x803790C0, &dSv_event_tmp_flag_c::tempBitLabels); +u16 const dSv_event_tmp_flag_c::tempBitLabels[185] = { + 0xFFFF, 0xFFFF, 0xFF0F, 0xFEFF, 0x0040, 0xFDFF, 0xFCFF, 0x0020, 0x0080, 0x0010, 0x0008, 0x0004, + 0x0002, 0x0001, 0x0180, 0x0140, 0x0120, 0x0110, 0x0108, 0x0104, 0x0102, 0x0101, 0x0280, 0x0240, + 0x0220, 0x0210, 0x0208, 0x0204, 0x0202, 0x0201, 0x0380, 0x0340, 0x0320, 0x0310, 0xFBFF, 0x0308, + 0x0304, 0x0302, 0x0301, 0x0480, 0x0440, 0x0420, 0x0410, 0x0408, 0x0404, 0x0402, 0x0401, 0x0580, + 0x0540, 0x0520, 0x0510, 0x0508, 0x0504, 0x0502, 0x0501, 0x0680, 0x0640, 0x0620, 0x0610, 0x0608, + 0x0604, 0x0602, 0x0601, 0x0780, 0x0740, 0x0720, 0x0710, 0x0708, 0x0704, 0x0702, 0x0701, 0x0880, + 0x0840, 0x0820, 0x0810, 0x0808, 0x0804, 0x0802, 0x0801, 0x0980, 0x0940, 0x0920, 0x0910, 0x0908, + 0x0904, 0x0902, 0x0901, 0x0A80, 0x0A40, 0x0A20, 0x0A10, 0x0A08, 0x0A04, 0x0A02, 0x0A01, 0x0B80, + 0x0B40, 0x0B20, 0x0B10, 0x0B08, 0x0B04, 0xFAFF, 0xF9FF, 0xF8FF, 0xF7FF, 0xF6FF, 0xF5FF, 0x0B02, + 0x0B01, 0x0C80, 0x0C40, 0x0C20, 0x0C10, 0x0C08, 0xF4FF, 0xF3FF, 0x0C04, 0x0C02, 0x0C01, 0x0D80, + 0x0D40, 0x0D20, 0x0D10, 0x0D08, 0x0D04, 0x0D02, 0x0D01, 0x0E80, 0x0E40, 0x0E20, 0x0E10, 0x0E08, + 0x0E04, 0x0E02, 0x0E01, 0x0F80, 0x0F40, 0x0F20, 0x0F10, 0x0F08, 0x0F04, 0x0F02, 0x0F01, 0x1080, + 0x1040, 0x1020, 0x1010, 0x1008, 0x1004, 0x1002, 0x1001, 0x1180, 0x1140, 0x1120, 0x1110, 0x1108, + 0x1104, 0x1102, 0x1101, 0x1280, 0x1240, 0x1220, 0x1210, 0x1208, 0x1204, 0x1202, 0x1201, 0x1380, + 0x1340, 0x1320, 0x1310, 0x1308, 0x1304, 0x1302, 0x1301, 0x1480, 0x1440, 0x1420, 0x1410, 0x1408, + 0x1404, 0x1402, 0x1401, 0x1580, 0xF2FF}; /* 80379234-80379234 005894 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/f_op/f_op_actor.cpp b/src/f_op/f_op_actor.cpp index 5002fdeffa1..1767dbbd9b9 100644 --- a/src/f_op/f_op_actor.cpp +++ b/src/f_op/f_op_actor.cpp @@ -24,8 +24,6 @@ struct daSus_c { /* 800314D4 */ void check(fopAc_ac_c*); }; -struct J3DModelData {}; - struct dScnKy_env_light_c { /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); }; @@ -150,7 +148,6 @@ extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" extern u8 g_env_light[4880]; extern "C" f32 Zero__4cXyz[3]; extern "C" extern u8 g_dComIfAc_gameInfo[8]; -extern "C" extern u8 struct_80450D64[4]; extern "C" u8 m_object__7dDemo_c[4]; extern "C" extern u8 struct_80451124[4]; diff --git a/src/f_op/f_op_actor_mng.cpp b/src/f_op/f_op_actor_mng.cpp index eb2af277f47..83b0c78123e 100644 --- a/src/f_op/f_op_actor_mng.cpp +++ b/src/f_op/f_op_actor_mng.cpp @@ -394,7 +394,6 @@ extern "C" u8 sincosTable___5JMath[65536]; extern "C" f32 mSystemFar__14mDoLib_clipper; extern "C" u8 mProcID__20dStage_roomControl_c[4]; extern "C" void* mClipper__14mDoLib_clipper; -extern "C" extern u8 struct_80450D64[4]; extern "C" u8 m_top__13daTagStream_c[4]; extern "C" u8 mData__12dEnemyItem_c[4 + 4 /* padding */]; extern "C" u8 Zero__5csXyz[4];