Merge pull request #171 from TakaRikka/wip1

d_a_player / d_meter_map + misc
This commit is contained in:
TakaRikka
2022-01-04 03:46:52 -08:00
committed by GitHub
123 changed files with 3281 additions and 4696 deletions
@@ -1,15 +0,0 @@
lbl_80115C20:
/* 80115C20 38 A0 00 00 */ li r5, 0
/* 80115C24 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 80115C28 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 80115C2C 88 04 4F AD */ lbz r0, 0x4fad(r4)
/* 80115C30 28 00 00 00 */ cmplwi r0, 0
/* 80115C34 40 82 00 10 */ bne lbl_80115C44
/* 80115C38 A0 03 06 04 */ lhz r0, 0x604(r3)
/* 80115C3C 2C 00 00 00 */ cmpwi r0, 0
/* 80115C40 41 82 00 08 */ beq lbl_80115C48
lbl_80115C44:
/* 80115C44 38 A0 00 01 */ li r5, 1
lbl_80115C48:
/* 80115C48 54 A3 06 3E */ clrlwi r3, r5, 0x18
/* 80115C4C 4E 80 00 20 */ blr
@@ -1,23 +0,0 @@
lbl_800B97EC:
/* 800B97EC 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 800B97F0 7C 08 02 A6 */ mflr r0
/* 800B97F4 90 01 00 14 */ stw r0, 0x14(r1)
/* 800B97F8 93 E1 00 0C */ stw r31, 0xc(r1)
/* 800B97FC 3B E0 00 00 */ li r31, 0
/* 800B9800 A0 03 2F E8 */ lhz r0, 0x2fe8(r3)
/* 800B9804 28 00 00 00 */ cmplwi r0, 0
/* 800B9808 41 82 00 18 */ beq lbl_800B9820
/* 800B980C 28 00 00 3B */ cmplwi r0, 0x3b
/* 800B9810 41 82 00 10 */ beq lbl_800B9820
/* 800B9814 48 05 C4 0D */ bl checkEventRun__9daAlink_cCFv
/* 800B9818 2C 03 00 00 */ cmpwi r3, 0
/* 800B981C 41 82 00 08 */ beq lbl_800B9824
lbl_800B9820:
/* 800B9820 3B E0 00 01 */ li r31, 1
lbl_800B9824:
/* 800B9824 7F E3 FB 78 */ mr r3, r31
/* 800B9828 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 800B982C 80 01 00 14 */ lwz r0, 0x14(r1)
/* 800B9830 7C 08 03 A6 */ mtlr r0
/* 800B9834 38 21 00 10 */ addi r1, r1, 0x10
/* 800B9838 4E 80 00 20 */ blr
@@ -1,29 +0,0 @@
lbl_800A2280:
/* 800A2280 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 800A2284 7C 08 02 A6 */ mflr r0
/* 800A2288 90 01 00 14 */ stw r0, 0x14(r1)
/* 800A228C 93 E1 00 0C */ stw r31, 0xc(r1)
/* 800A2290 7C 7F 1B 78 */ mr r31, r3
/* 800A2294 80 03 19 9C */ lwz r0, 0x199c(r3)
/* 800A2298 54 00 06 B5 */ rlwinm. r0, r0, 0, 0x1a, 0x1a
/* 800A229C 41 82 00 34 */ beq lbl_800A22D0
/* 800A22A0 38 7F 1A 60 */ addi r3, r31, 0x1a60
/* 800A22A4 38 80 00 00 */ li r4, 0
/* 800A22A8 4B FF FF 39 */ bl getMoveBGActorName__9daAlink_cFR13cBgS_PolyInfoi
/* 800A22AC 7C 60 07 34 */ extsh r0, r3
/* 800A22B0 2C 00 00 21 */ cmpwi r0, 0x21
/* 800A22B4 40 82 00 1C */ bne lbl_800A22D0
/* 800A22B8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 800A22BC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 800A22C0 38 63 0F 38 */ addi r3, r3, 0xf38
/* 800A22C4 A0 9F 1A 62 */ lhz r4, 0x1a62(r31)
/* 800A22C8 4B FD 23 51 */ bl GetActorPointer__4cBgSCFi
/* 800A22CC 48 00 00 08 */ b lbl_800A22D4
lbl_800A22D0:
/* 800A22D0 38 60 00 00 */ li r3, 0
lbl_800A22D4:
/* 800A22D4 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 800A22D8 80 01 00 14 */ lwz r0, 0x14(r1)
/* 800A22DC 7C 08 03 A6 */ mtlr r0
/* 800A22E0 38 21 00 10 */ addi r1, r1, 0x10
/* 800A22E4 4E 80 00 20 */ blr
@@ -1,16 +0,0 @@
lbl_800BA09C:
/* 800BA09C 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 800BA0A0 7C 08 02 A6 */ mflr r0
/* 800BA0A4 90 01 00 14 */ stw r0, 0x14(r1)
/* 800BA0A8 80 03 05 74 */ lwz r0, 0x574(r3)
/* 800BA0AC 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6
/* 800BA0B0 41 82 00 0C */ beq lbl_800BA0BC
/* 800BA0B4 48 06 FA 91 */ bl checkNextActionWolf__9daAlink_cFi
/* 800BA0B8 48 00 00 08 */ b lbl_800BA0C0
lbl_800BA0BC:
/* 800BA0BC 48 00 00 15 */ bl checkNextAction__9daAlink_cFi
lbl_800BA0C0:
/* 800BA0C0 80 01 00 14 */ lwz r0, 0x14(r1)
/* 800BA0C4 7C 08 03 A6 */ mtlr r0
/* 800BA0C8 38 21 00 10 */ addi r1, r1, 0x10
/* 800BA0CC 4E 80 00 20 */ blr
@@ -1,19 +0,0 @@
lbl_800A2198:
/* 800A2198 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 800A219C 7C 08 02 A6 */ mflr r0
/* 800A21A0 90 01 00 14 */ stw r0, 0x14(r1)
/* 800A21A4 93 E1 00 0C */ stw r31, 0xc(r1)
/* 800A21A8 7C 7F 1B 78 */ mr r31, r3
/* 800A21AC 38 7F 1B 48 */ addi r3, r31, 0x1b48
/* 800A21B0 7F E6 FB 78 */ mr r6, r31
/* 800A21B4 4B FD 5B B1 */ bl Set__11dBgS_LinChkFPC4cXyzPC4cXyzPC10fopAc_ac_c
/* 800A21B8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 800A21BC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 800A21C0 38 63 0F 38 */ addi r3, r3, 0xf38
/* 800A21C4 38 9F 1B 48 */ addi r4, r31, 0x1b48
/* 800A21C8 4B FD 21 ED */ bl LineCross__4cBgSFP11cBgS_LinChk
/* 800A21CC 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 800A21D0 80 01 00 14 */ lwz r0, 0x14(r1)
/* 800A21D4 7C 08 03 A6 */ mtlr r0
/* 800A21D8 38 21 00 10 */ addi r1, r1, 0x10
/* 800A21DC 4E 80 00 20 */ blr
@@ -1,44 +0,0 @@
lbl_800A21E0:
/* 800A21E0 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 800A21E4 7C 08 02 A6 */ mflr r0
/* 800A21E8 90 01 00 14 */ stw r0, 0x14(r1)
/* 800A21EC 93 E1 00 0C */ stw r31, 0xc(r1)
/* 800A21F0 93 C1 00 08 */ stw r30, 8(r1)
/* 800A21F4 7C 7E 1B 78 */ mr r30, r3
/* 800A21F8 2C 04 00 00 */ cmpwi r4, 0
/* 800A21FC 40 82 00 20 */ bne lbl_800A221C
/* 800A2200 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 800A2204 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 800A2208 38 63 0F 38 */ addi r3, r3, 0xf38
/* 800A220C 7F C4 F3 78 */ mr r4, r30
/* 800A2210 4B FD 24 51 */ bl ChkPolySafe__4cBgSFRC13cBgS_PolyInfo
/* 800A2214 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 800A2218 41 82 00 4C */ beq lbl_800A2264
lbl_800A221C:
/* 800A221C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 800A2220 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 800A2224 3B E3 0F 38 */ addi r31, r3, 0xf38
/* 800A2228 7F E3 FB 78 */ mr r3, r31
/* 800A222C 7F C4 F3 78 */ mr r4, r30
/* 800A2230 4B FD 29 11 */ bl ChkMoveBG_NoDABg__4dBgSFRC13cBgS_PolyInfo
/* 800A2234 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 800A2238 41 82 00 2C */ beq lbl_800A2264
/* 800A223C 7F E3 FB 78 */ mr r3, r31
/* 800A2240 A0 9E 00 02 */ lhz r4, 2(r30)
/* 800A2244 4B FD 23 D5 */ bl GetActorPointer__4cBgSCFi
/* 800A2248 28 03 00 00 */ cmplwi r3, 0
/* 800A224C 41 82 00 18 */ beq lbl_800A2264
/* 800A2250 7F E3 FB 78 */ mr r3, r31
/* 800A2254 A0 9E 00 02 */ lhz r4, 2(r30)
/* 800A2258 4B FD 23 C1 */ bl GetActorPointer__4cBgSCFi
/* 800A225C A8 63 00 08 */ lha r3, 8(r3)
/* 800A2260 48 00 00 08 */ b lbl_800A2268
lbl_800A2264:
/* 800A2264 38 60 00 FD */ li r3, 0xfd
lbl_800A2268:
/* 800A2268 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 800A226C 83 C1 00 08 */ lwz r30, 8(r1)
/* 800A2270 80 01 00 14 */ lwz r0, 0x14(r1)
/* 800A2274 7C 08 03 A6 */ mtlr r0
/* 800A2278 38 21 00 10 */ addi r1, r1, 0x10
/* 800A227C 4E 80 00 20 */ blr
@@ -1,16 +0,0 @@
lbl_800A2160:
/* 800A2160 C0 23 33 AC */ lfs f1, 0x33ac(r3)
/* 800A2164 C0 02 92 A4 */ lfs f0, lit_6021(r2)
/* 800A2168 FC 01 00 40 */ fcmpo cr0, f1, f0
/* 800A216C 40 81 00 1C */ ble lbl_800A2188
/* 800A2170 A8 A3 04 E6 */ lha r5, 0x4e6(r3)
/* 800A2174 A8 03 2F E2 */ lha r0, 0x2fe2(r3)
/* 800A2178 7C 05 00 50 */ subf r0, r5, r0
/* 800A217C B0 04 00 00 */ sth r0, 0(r4)
/* 800A2180 38 60 00 01 */ li r3, 1
/* 800A2184 4E 80 00 20 */ blr
lbl_800A2188:
/* 800A2188 38 00 00 00 */ li r0, 0
/* 800A218C B0 04 00 00 */ sth r0, 0(r4)
/* 800A2190 38 60 00 00 */ li r3, 0
/* 800A2194 4E 80 00 20 */ blr
@@ -1,11 +0,0 @@
lbl_800A3CE4:
/* 800A3CE4 A0 04 00 00 */ lhz r0, 0(r4)
/* 800A3CE8 28 00 FF FF */ cmplwi r0, 0xffff
/* 800A3CEC 4C 82 00 20 */ bnelr
/* 800A3CF0 A0 05 00 00 */ lhz r0, 0(r5)
/* 800A3CF4 54 03 A7 3F */ rlwinm. r3, r0, 0x14, 0x1c, 0x1f
/* 800A3CF8 54 00 05 3E */ clrlwi r0, r0, 0x14
/* 800A3CFC B0 05 00 00 */ sth r0, 0(r5)
/* 800A3D00 4D 82 00 20 */ beqlr
/* 800A3D04 B0 64 00 00 */ sth r3, 0(r4)
/* 800A3D08 4E 80 00 20 */ blr
@@ -1,24 +0,0 @@
lbl_800A3C8C:
/* 800A3C8C 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 800A3C90 7C 08 02 A6 */ mflr r0
/* 800A3C94 90 01 00 14 */ stw r0, 0x14(r1)
/* 800A3C98 7C 64 1B 78 */ mr r4, r3
/* 800A3C9C 80 03 05 80 */ lwz r0, 0x580(r3)
/* 800A3CA0 54 00 04 63 */ rlwinm. r0, r0, 0, 0x11, 0x11
/* 800A3CA4 40 82 00 1C */ bne lbl_800A3CC0
/* 800A3CA8 88 04 2F A0 */ lbz r0, 0x2fa0(r4)
/* 800A3CAC 68 00 00 01 */ xori r0, r0, 1
/* 800A3CB0 98 04 2F A0 */ stb r0, 0x2fa0(r4)
/* 800A3CB4 80 04 05 80 */ lwz r0, 0x580(r4)
/* 800A3CB8 60 00 40 00 */ ori r0, r0, 0x4000
/* 800A3CBC 90 04 05 80 */ stw r0, 0x580(r4)
lbl_800A3CC0:
/* 800A3CC0 88 04 2F A0 */ lbz r0, 0x2fa0(r4)
/* 800A3CC4 1C 60 00 14 */ mulli r3, r0, 0x14
/* 800A3CC8 38 63 21 B0 */ addi r3, r3, 0x21b0
/* 800A3CCC 7C 64 1A 14 */ add r3, r4, r3
/* 800A3CD0 48 0B B4 99 */ bl setAnimeHeap__14daPy_anmHeap_cFv
/* 800A3CD4 80 01 00 14 */ lwz r0, 0x14(r1)
/* 800A3CD8 7C 08 03 A6 */ mtlr r0
/* 800A3CDC 38 21 00 10 */ addi r1, r1, 0x10
/* 800A3CE0 4E 80 00 20 */ blr
@@ -1,57 +0,0 @@
lbl_800B24F4:
/* 800B24F4 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 800B24F8 7C 08 02 A6 */ mflr r0
/* 800B24FC 90 01 00 14 */ stw r0, 0x14(r1)
/* 800B2500 93 E1 00 0C */ stw r31, 0xc(r1)
/* 800B2504 93 C1 00 08 */ stw r30, 8(r1)
/* 800B2508 7C 7E 1B 78 */ mr r30, r3
/* 800B250C 7C 9F 23 78 */ mr r31, r4
/* 800B2510 48 06 37 11 */ bl checkEventRun__9daAlink_cCFv
/* 800B2514 2C 03 00 00 */ cmpwi r3, 0
/* 800B2518 40 82 00 10 */ bne lbl_800B2528
/* 800B251C 88 1E 05 6A */ lbz r0, 0x56a(r30)
/* 800B2520 28 00 00 00 */ cmplwi r0, 0
/* 800B2524 41 82 00 90 */ beq lbl_800B25B4
lbl_800B2528:
/* 800B2528 C0 1F 00 0C */ lfs f0, 0xc(r31)
/* 800B252C D0 1E 04 D0 */ stfs f0, 0x4d0(r30)
/* 800B2530 C0 1F 00 1C */ lfs f0, 0x1c(r31)
/* 800B2534 D0 1E 04 D4 */ stfs f0, 0x4d4(r30)
/* 800B2538 C0 1F 00 2C */ lfs f0, 0x2c(r31)
/* 800B253C D0 1E 04 D8 */ stfs f0, 0x4d8(r30)
/* 800B2540 C0 1E 04 D0 */ lfs f0, 0x4d0(r30)
/* 800B2544 D0 1E 04 BC */ stfs f0, 0x4bc(r30)
/* 800B2548 C0 1E 04 D4 */ lfs f0, 0x4d4(r30)
/* 800B254C D0 1E 04 C0 */ stfs f0, 0x4c0(r30)
/* 800B2550 C0 1E 04 D8 */ lfs f0, 0x4d8(r30)
/* 800B2554 D0 1E 04 C4 */ stfs f0, 0x4c4(r30)
/* 800B2558 C0 1E 04 D0 */ lfs f0, 0x4d0(r30)
/* 800B255C D0 1E 37 98 */ stfs f0, 0x3798(r30)
/* 800B2560 C0 1E 04 D4 */ lfs f0, 0x4d4(r30)
/* 800B2564 D0 1E 37 9C */ stfs f0, 0x379c(r30)
/* 800B2568 C0 1E 04 D8 */ lfs f0, 0x4d8(r30)
/* 800B256C D0 1E 37 A0 */ stfs f0, 0x37a0(r30)
/* 800B2570 80 1E 05 88 */ lwz r0, 0x588(r30)
/* 800B2574 64 00 00 80 */ oris r0, r0, 0x80
/* 800B2578 90 1E 05 88 */ stw r0, 0x588(r30)
/* 800B257C 80 1E 05 90 */ lwz r0, 0x590(r30)
/* 800B2580 60 00 01 00 */ ori r0, r0, 0x100
/* 800B2584 90 1E 05 90 */ stw r0, 0x590(r30)
/* 800B2588 7F E3 FB 78 */ mr r3, r31
/* 800B258C 38 9E 04 E4 */ addi r4, r30, 0x4e4
/* 800B2590 4B F5 A6 71 */ bl mDoMtx_MtxToRot__FPA4_CfP5csXyz
/* 800B2594 A8 1E 04 E6 */ lha r0, 0x4e6(r30)
/* 800B2598 B0 1E 04 DE */ sth r0, 0x4de(r30)
/* 800B259C A8 1E 04 E6 */ lha r0, 0x4e6(r30)
/* 800B25A0 B0 1E 2F E6 */ sth r0, 0x2fe6(r30)
/* 800B25A4 C0 02 92 C0 */ lfs f0, lit_6108(r2)
/* 800B25A8 D0 1E 04 FC */ stfs f0, 0x4fc(r30)
/* 800B25AC 38 7E 08 14 */ addi r3, r30, 0x814
/* 800B25B0 48 1B 13 AD */ bl ClrCcMove__9cCcD_SttsFv
lbl_800B25B4:
/* 800B25B4 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 800B25B8 83 C1 00 08 */ lwz r30, 8(r1)
/* 800B25BC 80 01 00 14 */ lwz r0, 0x14(r1)
/* 800B25C0 7C 08 03 A6 */ mtlr r0
/* 800B25C4 38 21 00 10 */ addi r1, r1, 0x10
/* 800B25C8 4E 80 00 20 */ blr
@@ -1,67 +0,0 @@
lbl_800B23FC:
/* 800B23FC 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 800B2400 7C 08 02 A6 */ mflr r0
/* 800B2404 90 01 00 24 */ stw r0, 0x24(r1)
/* 800B2408 39 61 00 20 */ addi r11, r1, 0x20
/* 800B240C 48 2A FD D1 */ bl _savegpr_29
/* 800B2410 7C 7D 1B 78 */ mr r29, r3
/* 800B2414 7C 9E 23 78 */ mr r30, r4
/* 800B2418 7C BF 2B 78 */ mr r31, r5
/* 800B241C 48 06 38 05 */ bl checkEventRun__9daAlink_cCFv
/* 800B2420 2C 03 00 00 */ cmpwi r3, 0
/* 800B2424 40 82 00 10 */ bne lbl_800B2434
/* 800B2428 88 1D 05 6A */ lbz r0, 0x56a(r29)
/* 800B242C 28 00 00 00 */ cmplwi r0, 0
/* 800B2430 41 82 00 AC */ beq lbl_800B24DC
lbl_800B2434:
/* 800B2434 28 1E 00 00 */ cmplwi r30, 0
/* 800B2438 41 82 00 6C */ beq lbl_800B24A4
/* 800B243C C0 1E 00 00 */ lfs f0, 0(r30)
/* 800B2440 D0 1D 04 D0 */ stfs f0, 0x4d0(r29)
/* 800B2444 C0 1E 00 04 */ lfs f0, 4(r30)
/* 800B2448 D0 1D 04 D4 */ stfs f0, 0x4d4(r29)
/* 800B244C C0 1E 00 08 */ lfs f0, 8(r30)
/* 800B2450 D0 1D 04 D8 */ stfs f0, 0x4d8(r29)
/* 800B2454 C0 1D 04 D0 */ lfs f0, 0x4d0(r29)
/* 800B2458 D0 1D 04 BC */ stfs f0, 0x4bc(r29)
/* 800B245C C0 1D 04 D4 */ lfs f0, 0x4d4(r29)
/* 800B2460 D0 1D 04 C0 */ stfs f0, 0x4c0(r29)
/* 800B2464 C0 1D 04 D8 */ lfs f0, 0x4d8(r29)
/* 800B2468 D0 1D 04 C4 */ stfs f0, 0x4c4(r29)
/* 800B246C C0 1D 04 D0 */ lfs f0, 0x4d0(r29)
/* 800B2470 D0 1D 37 98 */ stfs f0, 0x3798(r29)
/* 800B2474 C0 1D 04 D4 */ lfs f0, 0x4d4(r29)
/* 800B2478 D0 1D 37 9C */ stfs f0, 0x379c(r29)
/* 800B247C C0 1D 04 D8 */ lfs f0, 0x4d8(r29)
/* 800B2480 D0 1D 37 A0 */ stfs f0, 0x37a0(r29)
/* 800B2484 80 1D 05 88 */ lwz r0, 0x588(r29)
/* 800B2488 64 00 00 80 */ oris r0, r0, 0x80
/* 800B248C 90 1D 05 88 */ stw r0, 0x588(r29)
/* 800B2490 80 1D 05 90 */ lwz r0, 0x590(r29)
/* 800B2494 60 00 01 00 */ ori r0, r0, 0x100
/* 800B2498 90 1D 05 90 */ stw r0, 0x590(r29)
/* 800B249C C0 02 92 C0 */ lfs f0, lit_6108(r2)
/* 800B24A0 D0 1D 04 FC */ stfs f0, 0x4fc(r29)
lbl_800B24A4:
/* 800B24A4 28 1F 00 00 */ cmplwi r31, 0
/* 800B24A8 41 82 00 2C */ beq lbl_800B24D4
/* 800B24AC A8 1F 00 00 */ lha r0, 0(r31)
/* 800B24B0 B0 1D 04 E4 */ sth r0, 0x4e4(r29)
/* 800B24B4 A8 1F 00 02 */ lha r0, 2(r31)
/* 800B24B8 B0 1D 04 E6 */ sth r0, 0x4e6(r29)
/* 800B24BC A8 1F 00 04 */ lha r0, 4(r31)
/* 800B24C0 B0 1D 04 E8 */ sth r0, 0x4e8(r29)
/* 800B24C4 A8 1D 04 E6 */ lha r0, 0x4e6(r29)
/* 800B24C8 B0 1D 04 DE */ sth r0, 0x4de(r29)
/* 800B24CC A8 1D 04 E6 */ lha r0, 0x4e6(r29)
/* 800B24D0 B0 1D 2F E6 */ sth r0, 0x2fe6(r29)
lbl_800B24D4:
/* 800B24D4 38 7D 08 14 */ addi r3, r29, 0x814
/* 800B24D8 48 1B 14 85 */ bl ClrCcMove__9cCcD_SttsFv
lbl_800B24DC:
/* 800B24DC 39 61 00 20 */ addi r11, r1, 0x20
/* 800B24E0 48 2A FD 49 */ bl _restgpr_29
/* 800B24E4 80 01 00 24 */ lwz r0, 0x24(r1)
/* 800B24E8 7C 08 03 A6 */ mtlr r0
/* 800B24EC 38 21 00 20 */ addi r1, r1, 0x20
/* 800B24F0 4E 80 00 20 */ blr
@@ -1,13 +0,0 @@
lbl_8015F8E4:
/* 8015F8E4 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8015F8E8 7C 08 02 A6 */ mflr r0
/* 8015F8EC 90 01 00 14 */ stw r0, 0x14(r1)
/* 8015F8F0 7C 64 1B 78 */ mr r4, r3
/* 8015F8F4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 8015F8F8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 8015F8FC 80 63 5D B4 */ lwz r3, 0x5db4(r3)
/* 8015F900 4B F8 08 CD */ bl cancelBoomerangLock__9daAlink_cFP10fopAc_ac_c
/* 8015F904 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8015F908 7C 08 03 A6 */ mtlr r0
/* 8015F90C 38 21 00 10 */ addi r1, r1, 0x10
/* 8015F910 4E 80 00 20 */ blr
@@ -1,15 +0,0 @@
lbl_8015F4B8:
/* 8015F4B8 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8015F4BC 7C 08 02 A6 */ mflr r0
/* 8015F4C0 90 01 00 14 */ stw r0, 0x14(r1)
/* 8015F4C4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 8015F4C8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 8015F4CC 80 63 5D B4 */ lwz r3, 0x5db4(r3)
/* 8015F4D0 38 00 00 00 */ li r0, 0
/* 8015F4D4 98 03 2F A3 */ stb r0, 0x2fa3(r3)
/* 8015F4D8 38 63 28 44 */ addi r3, r3, 0x2844
/* 8015F4DC 4B FF F8 21 */ bl clearData__16daPy_actorKeep_cFv
/* 8015F4E0 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8015F4E4 7C 08 03 A6 */ mtlr r0
/* 8015F4E8 38 21 00 10 */ addi r1, r1, 0x10
/* 8015F4EC 4E 80 00 20 */ blr
@@ -1,12 +0,0 @@
lbl_8015F89C:
/* 8015F89C 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8015F8A0 7C 08 02 A6 */ mflr r0
/* 8015F8A4 90 01 00 14 */ stw r0, 0x14(r1)
/* 8015F8A8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 8015F8AC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 8015F8B0 80 63 5D B4 */ lwz r3, 0x5db4(r3)
/* 8015F8B4 4B F8 09 91 */ bl checkBoomerangChargeEnd__9daAlink_cFv
/* 8015F8B8 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8015F8BC 7C 08 03 A6 */ mtlr r0
/* 8015F8C0 38 21 00 10 */ addi r1, r1, 0x10
/* 8015F8C4 4E 80 00 20 */ blr
@@ -1,24 +0,0 @@
lbl_8015EA88:
/* 8015EA88 38 00 00 00 */ li r0, 0
/* 8015EA8C 2C 03 00 60 */ cmpwi r3, 0x60
/* 8015EA90 41 80 00 0C */ blt lbl_8015EA9C
/* 8015EA94 2C 03 00 6C */ cmpwi r3, 0x6c
/* 8015EA98 40 81 00 34 */ ble lbl_8015EACC
lbl_8015EA9C:
/* 8015EA9C 2C 03 00 76 */ cmpwi r3, 0x76
/* 8015EAA0 41 82 00 2C */ beq lbl_8015EACC
/* 8015EAA4 2C 03 00 74 */ cmpwi r3, 0x74
/* 8015EAA8 41 82 00 24 */ beq lbl_8015EACC
/* 8015EAAC 2C 03 00 73 */ cmpwi r3, 0x73
/* 8015EAB0 41 82 00 1C */ beq lbl_8015EACC
/* 8015EAB4 2C 03 00 9F */ cmpwi r3, 0x9f
/* 8015EAB8 41 82 00 14 */ beq lbl_8015EACC
/* 8015EABC 2C 03 00 77 */ cmpwi r3, 0x77
/* 8015EAC0 41 80 00 10 */ blt lbl_8015EAD0
/* 8015EAC4 2C 03 00 7F */ cmpwi r3, 0x7f
/* 8015EAC8 41 81 00 08 */ bgt lbl_8015EAD0
lbl_8015EACC:
/* 8015EACC 38 00 00 01 */ li r0, 1
lbl_8015EAD0:
/* 8015EAD0 54 03 06 3E */ clrlwi r3, r0, 0x18
/* 8015EAD4 4E 80 00 20 */ blr
@@ -1,42 +0,0 @@
lbl_8015F698:
/* 8015F698 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8015F69C 7C 08 02 A6 */ mflr r0
/* 8015F6A0 90 01 00 14 */ stw r0, 0x14(r1)
/* 8015F6A4 93 E1 00 0C */ stw r31, 0xc(r1)
/* 8015F6A8 4B FF FF B9 */ bl checkRoomRestartStart__9daPy_py_cFv
/* 8015F6AC 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 8015F6B0 40 82 00 54 */ bne lbl_8015F704
/* 8015F6B4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 8015F6B8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 8015F6BC 37 E3 4E 20 */ addic. r31, r3, 0x4e20
/* 8015F6C0 41 82 00 44 */ beq lbl_8015F704
/* 8015F6C4 7F E3 FB 78 */ mr r3, r31
/* 8015F6C8 81 9F 00 00 */ lwz r12, 0(r31)
/* 8015F6CC 81 8C 00 BC */ lwz r12, 0xbc(r12)
/* 8015F6D0 7D 89 03 A6 */ mtctr r12
/* 8015F6D4 4E 80 04 21 */ bctrl
/* 8015F6D8 28 03 00 00 */ cmplwi r3, 0
/* 8015F6DC 41 82 00 28 */ beq lbl_8015F704
/* 8015F6E0 7F E3 FB 78 */ mr r3, r31
/* 8015F6E4 81 9F 00 00 */ lwz r12, 0(r31)
/* 8015F6E8 81 8C 00 BC */ lwz r12, 0xbc(r12)
/* 8015F6EC 7D 89 03 A6 */ mtctr r12
/* 8015F6F0 4E 80 04 21 */ bctrl
/* 8015F6F4 88 03 00 09 */ lbz r0, 9(r3)
/* 8015F6F8 54 00 FE FE */ rlwinm r0, r0, 0x1f, 0x1b, 0x1f
/* 8015F6FC 2C 00 00 17 */ cmpwi r0, 0x17
/* 8015F700 41 82 00 0C */ beq lbl_8015F70C
lbl_8015F704:
/* 8015F704 38 60 00 00 */ li r3, 0
/* 8015F708 48 00 00 14 */ b lbl_8015F71C
lbl_8015F70C:
/* 8015F70C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 8015F710 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 8015F714 80 03 0D D0 */ lwz r0, 0xdd0(r3)
/* 8015F718 54 03 02 D6 */ rlwinm r3, r0, 0, 0xb, 0xb
lbl_8015F71C:
/* 8015F71C 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 8015F720 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8015F724 7C 08 03 A6 */ mtlr r0
/* 8015F728 38 21 00 10 */ addi r1, r1, 0x10
/* 8015F72C 4E 80 00 20 */ blr
@@ -1,42 +0,0 @@
lbl_8015F730:
/* 8015F730 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8015F734 7C 08 02 A6 */ mflr r0
/* 8015F738 90 01 00 14 */ stw r0, 0x14(r1)
/* 8015F73C 93 E1 00 0C */ stw r31, 0xc(r1)
/* 8015F740 4B FF FF 21 */ bl checkRoomRestartStart__9daPy_py_cFv
/* 8015F744 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 8015F748 40 82 00 54 */ bne lbl_8015F79C
/* 8015F74C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 8015F750 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 8015F754 37 E3 4E 20 */ addic. r31, r3, 0x4e20
/* 8015F758 41 82 00 44 */ beq lbl_8015F79C
/* 8015F75C 7F E3 FB 78 */ mr r3, r31
/* 8015F760 81 9F 00 00 */ lwz r12, 0(r31)
/* 8015F764 81 8C 00 BC */ lwz r12, 0xbc(r12)
/* 8015F768 7D 89 03 A6 */ mtctr r12
/* 8015F76C 4E 80 04 21 */ bctrl
/* 8015F770 28 03 00 00 */ cmplwi r3, 0
/* 8015F774 41 82 00 28 */ beq lbl_8015F79C
/* 8015F778 7F E3 FB 78 */ mr r3, r31
/* 8015F77C 81 9F 00 00 */ lwz r12, 0(r31)
/* 8015F780 81 8C 00 BC */ lwz r12, 0xbc(r12)
/* 8015F784 7D 89 03 A6 */ mtctr r12
/* 8015F788 4E 80 04 21 */ bctrl
/* 8015F78C 88 03 00 09 */ lbz r0, 9(r3)
/* 8015F790 54 00 FE FE */ rlwinm r0, r0, 0x1f, 0x1b, 0x1f
/* 8015F794 2C 00 00 17 */ cmpwi r0, 0x17
/* 8015F798 41 82 00 0C */ beq lbl_8015F7A4
lbl_8015F79C:
/* 8015F79C 38 60 00 00 */ li r3, 0
/* 8015F7A0 48 00 00 14 */ b lbl_8015F7B4
lbl_8015F7A4:
/* 8015F7A4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 8015F7A8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 8015F7AC 80 03 0D D0 */ lwz r0, 0xdd0(r3)
/* 8015F7B0 54 03 03 18 */ rlwinm r3, r0, 0, 0xc, 0xc
lbl_8015F7B4:
/* 8015F7B4 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 8015F7B8 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8015F7BC 7C 08 03 A6 */ mtlr r0
/* 8015F7C0 38 21 00 10 */ addi r1, r1, 0x10
/* 8015F7C4 4E 80 00 20 */ blr
@@ -1,30 +0,0 @@
lbl_8015EAD8:
/* 8015EAD8 38 00 00 00 */ li r0, 0
/* 8015EADC 2C 03 00 61 */ cmpwi r3, 0x61
/* 8015EAE0 41 80 00 0C */ blt lbl_8015EAEC
/* 8015EAE4 2C 03 00 65 */ cmpwi r3, 0x65
/* 8015EAE8 40 81 00 4C */ ble lbl_8015EB34
lbl_8015EAEC:
/* 8015EAEC 2C 03 00 69 */ cmpwi r3, 0x69
/* 8015EAF0 41 82 00 44 */ beq lbl_8015EB34
/* 8015EAF4 2C 03 00 6A */ cmpwi r3, 0x6a
/* 8015EAF8 41 82 00 3C */ beq lbl_8015EB34
/* 8015EAFC 2C 03 00 6B */ cmpwi r3, 0x6b
/* 8015EB00 41 82 00 34 */ beq lbl_8015EB34
/* 8015EB04 2C 03 00 76 */ cmpwi r3, 0x76
/* 8015EB08 41 82 00 2C */ beq lbl_8015EB34
/* 8015EB0C 2C 03 00 9F */ cmpwi r3, 0x9f
/* 8015EB10 41 82 00 24 */ beq lbl_8015EB34
/* 8015EB14 2C 03 00 73 */ cmpwi r3, 0x73
/* 8015EB18 41 82 00 1C */ beq lbl_8015EB34
/* 8015EB1C 2C 03 00 77 */ cmpwi r3, 0x77
/* 8015EB20 41 80 00 18 */ blt lbl_8015EB38
/* 8015EB24 2C 03 00 7B */ cmpwi r3, 0x7b
/* 8015EB28 41 82 00 10 */ beq lbl_8015EB38
/* 8015EB2C 2C 03 00 7F */ cmpwi r3, 0x7f
/* 8015EB30 41 81 00 08 */ bgt lbl_8015EB38
lbl_8015EB34:
/* 8015EB34 38 00 00 01 */ li r0, 1
lbl_8015EB38:
/* 8015EB38 54 03 06 3E */ clrlwi r3, r0, 0x18
/* 8015EB3C 4E 80 00 20 */ blr
@@ -1,13 +0,0 @@
lbl_8015EA20:
/* 8015EA20 38 00 00 00 */ li r0, 0
/* 8015EA24 2C 03 00 4A */ cmpwi r3, 0x4a
/* 8015EA28 41 82 00 14 */ beq lbl_8015EA3C
/* 8015EA2C 2C 03 00 5B */ cmpwi r3, 0x5b
/* 8015EA30 41 80 00 10 */ blt lbl_8015EA40
/* 8015EA34 2C 03 00 5F */ cmpwi r3, 0x5f
/* 8015EA38 41 81 00 08 */ bgt lbl_8015EA40
lbl_8015EA3C:
/* 8015EA3C 38 00 00 01 */ li r0, 1
lbl_8015EA40:
/* 8015EA40 54 03 06 3E */ clrlwi r3, r0, 0x18
/* 8015EA44 4E 80 00 20 */ blr
@@ -1,17 +0,0 @@
lbl_8015F660:
/* 8015F660 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 8015F664 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 8015F668 80 03 0D D0 */ lwz r0, 0xdd0(r3)
/* 8015F66C 54 00 07 3E */ clrlwi r0, r0, 0x1c
/* 8015F670 28 00 00 04 */ cmplwi r0, 4
/* 8015F674 41 82 00 14 */ beq lbl_8015F688
/* 8015F678 28 00 00 08 */ cmplwi r0, 8
/* 8015F67C 41 82 00 0C */ beq lbl_8015F688
/* 8015F680 28 00 00 05 */ cmplwi r0, 5
/* 8015F684 40 82 00 0C */ bne lbl_8015F690
lbl_8015F688:
/* 8015F688 38 60 00 01 */ li r3, 1
/* 8015F68C 4E 80 00 20 */ blr
lbl_8015F690:
/* 8015F690 38 60 00 00 */ li r3, 0
/* 8015F694 4E 80 00 20 */ blr

Some files were not shown because too many files have changed in this diff Show More