diff --git a/Progress.md b/Progress.md index 5f7aef9154..534463b307 100644 --- a/Progress.md +++ b/Progress.md @@ -7,22 +7,22 @@ Section | Percentage | Decompiled (bytes) | Total (bytes) .init | 97.972973% | 9280 | 9472 .extab | 100.000000% | 96 | 96 .extabindex | 100.000000% | 96 | 96 -.text | 26.773703% | 962928 | 3596544 +.text | 27.332573% | 983028 | 3596544 .ctors | 100.000000% | 448 | 448 .dtors | 100.000000% | 32 | 32 .rodata | 100.000000% | 193856 | 193856 .data | 100.000000% | 197632 | 197632 .sdata | 100.000000% | 1408 | 1408 .sdata2 | 100.000000% | 20832 | 20832 -Total | 34.493338% | 1386864 | 4020672 +Total | 34.993255% | 1406964 | 4020672 ## Total Section | Percentage | Decompiled (bytes) | Total (bytes) ---|---|---|--- -main.dol | 34.493338% | 1386864 | 4020672 -RELs | 33.578532% | 3861640 | 11500324 -Total | 33.815510% | 5248504 | 15520996 +main.dol | 34.993255% | 1406964 | 4020672 +RELs | 33.600166% | 3864128 | 11500324 +Total | 33.961042% | 5271092 | 15520996 ## RELs @@ -389,7 +389,7 @@ d_a_obj_crystal | 44.482173% | 1048 | 2356 d_a_obj_cwall | 30.455195% | 5968 | 19596 d_a_obj_damCps | 100.000000% | 504 | 504 d_a_obj_dan | 35.198921% | 4176 | 11864 -d_a_obj_digholl | 42.781690% | 972 | 2272 +d_a_obj_digholl | 100.000000% | 2272 | 2272 d_a_obj_digplace | 35.129068% | 1252 | 3564 d_a_obj_digsnow | 44.813278% | 2160 | 4820 d_a_obj_dmelevator | 35.600390% | 4376 | 12292 @@ -465,7 +465,7 @@ d_a_obj_kgate | 35.192216% | 5932 | 16856 d_a_obj_ki | 41.573034% | 2220 | 5340 d_a_obj_kiPot | 53.782895% | 1308 | 2432 d_a_obj_kita | 40.112090% | 2004 | 4996 -d_a_obj_kjgjs | 52.250804% | 1300 | 2488 +d_a_obj_kjgjs | 100.000000% | 2488 | 2488 d_a_obj_kkanban | 47.103514% | 1984 | 4212 d_a_obj_klift00 | 37.650457% | 3128 | 8308 d_a_obj_knBullet | 43.076923% | 1568 | 3640 @@ -785,4 +785,4 @@ d_a_vrbox2 | 34.977578% | 2184 | 6244 d_a_warp_bug | 54.940711% | 1112 | 2024 d_a_ykgr | 44.400631% | 2252 | 5072 f_pc_profile_lst | 100.000000% | 28156 | 28156 -Total | 33.578532% | 3861640 | 11500324 +Total | 33.600166% | 3864128 | 11500324 diff --git a/asm/TRK_MINNOW_DOLPHIN/GCN/EXI2_DDH_GCN/main/ddh_cc_initinterrupts.s b/asm/TRK_MINNOW_DOLPHIN/GCN/EXI2_DDH_GCN/main/ddh_cc_initinterrupts.s deleted file mode 100644 index 0ec6b8480b..0000000000 --- a/asm/TRK_MINNOW_DOLPHIN/GCN/EXI2_DDH_GCN/main/ddh_cc_initinterrupts.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_8037235C: -/* 8037235C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80372360 7C 08 02 A6 */ mflr r0 -/* 80372364 90 01 00 14 */ stw r0, 0x14(r1) -/* 80372368 48 00 09 99 */ bl EXI2_EnableInterrupts -/* 8037236C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80372370 38 60 00 00 */ li r3, 0 -/* 80372374 7C 08 03 A6 */ mtlr r0 -/* 80372378 38 21 00 10 */ addi r1, r1, 0x10 -/* 8037237C 4E 80 00 20 */ blr diff --git a/asm/TRK_MINNOW_DOLPHIN/GCN/EXI2_DDH_GCN/main/ddh_cc_open.s b/asm/TRK_MINNOW_DOLPHIN/GCN/EXI2_DDH_GCN/main/ddh_cc_open.s deleted file mode 100644 index ce34737546..0000000000 --- a/asm/TRK_MINNOW_DOLPHIN/GCN/EXI2_DDH_GCN/main/ddh_cc_open.s +++ /dev/null @@ -1,11 +0,0 @@ -lbl_803725EC: -/* 803725EC 80 0D 94 40 */ lwz r0, gIsInitialized(r13) -/* 803725F0 2C 00 00 00 */ cmpwi r0, 0 -/* 803725F4 41 82 00 0C */ beq lbl_80372600 -/* 803725F8 38 60 D8 EB */ li r3, -10005 -/* 803725FC 4E 80 00 20 */ blr -lbl_80372600: -/* 80372600 38 00 00 01 */ li r0, 1 -/* 80372604 38 60 00 00 */ li r3, 0 -/* 80372608 90 0D 94 40 */ stw r0, gIsInitialized(r13) -/* 8037260C 4E 80 00 20 */ blr diff --git a/asm/TRK_MINNOW_DOLPHIN/GCN/EXI2_DDH_GCN/main/ddh_cc_post_stop.s b/asm/TRK_MINNOW_DOLPHIN/GCN/EXI2_DDH_GCN/main/ddh_cc_post_stop.s deleted file mode 100644 index 2835a699f6..0000000000 --- a/asm/TRK_MINNOW_DOLPHIN/GCN/EXI2_DDH_GCN/main/ddh_cc_post_stop.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_803723F0: -/* 803723F0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 803723F4 7C 08 02 A6 */ mflr r0 -/* 803723F8 90 01 00 14 */ stw r0, 0x14(r1) -/* 803723FC 48 00 09 21 */ bl EXI2_Reserve -/* 80372400 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80372404 38 60 00 00 */ li r3, 0 -/* 80372408 7C 08 03 A6 */ mtlr r0 -/* 8037240C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80372410 4E 80 00 20 */ blr diff --git a/asm/TRK_MINNOW_DOLPHIN/GCN/EXI2_DDH_GCN/main/ddh_cc_pre_continue.s b/asm/TRK_MINNOW_DOLPHIN/GCN/EXI2_DDH_GCN/main/ddh_cc_pre_continue.s deleted file mode 100644 index 00e7074f3c..0000000000 --- a/asm/TRK_MINNOW_DOLPHIN/GCN/EXI2_DDH_GCN/main/ddh_cc_pre_continue.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_80372414: -/* 80372414 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80372418 7C 08 02 A6 */ mflr r0 -/* 8037241C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80372420 48 00 09 01 */ bl EXI2_Unreserve -/* 80372424 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80372428 38 60 00 00 */ li r3, 0 -/* 8037242C 7C 08 03 A6 */ mtlr r0 -/* 80372430 38 21 00 10 */ addi r1, r1, 0x10 -/* 80372434 4E 80 00 20 */ blr diff --git a/asm/TRK_MINNOW_DOLPHIN/GCN/EXI2_GDEV_GCN/main/gdev_cc_initinterrupts.s b/asm/TRK_MINNOW_DOLPHIN/GCN/EXI2_GDEV_GCN/main/gdev_cc_initinterrupts.s deleted file mode 100644 index b48643919e..0000000000 --- a/asm/TRK_MINNOW_DOLPHIN/GCN/EXI2_GDEV_GCN/main/gdev_cc_initinterrupts.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_80372908: -/* 80372908 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8037290C 7C 08 02 A6 */ mflr r0 -/* 80372910 90 01 00 14 */ stw r0, 0x14(r1) -/* 80372914 48 00 07 A9 */ bl DBInitInterrupts -/* 80372918 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8037291C 38 60 00 00 */ li r3, 0 -/* 80372920 7C 08 03 A6 */ mtlr r0 -/* 80372924 38 21 00 10 */ addi r1, r1, 0x10 -/* 80372928 4E 80 00 20 */ blr diff --git a/asm/TRK_MINNOW_DOLPHIN/GCN/EXI2_GDEV_GCN/main/gdev_cc_open.s b/asm/TRK_MINNOW_DOLPHIN/GCN/EXI2_GDEV_GCN/main/gdev_cc_open.s deleted file mode 100644 index d579d3a4d4..0000000000 --- a/asm/TRK_MINNOW_DOLPHIN/GCN/EXI2_GDEV_GCN/main/gdev_cc_open.s +++ /dev/null @@ -1,11 +0,0 @@ -lbl_80372BA0: -/* 80372BA0 80 0D 94 48 */ lwz r0, gIsInitialized(r13) -/* 80372BA4 2C 00 00 00 */ cmpwi r0, 0 -/* 80372BA8 41 82 00 0C */ beq lbl_80372BB4 -/* 80372BAC 38 60 D8 EB */ li r3, -10005 -/* 80372BB0 4E 80 00 20 */ blr -lbl_80372BB4: -/* 80372BB4 38 00 00 01 */ li r0, 1 -/* 80372BB8 38 60 00 00 */ li r3, 0 -/* 80372BBC 90 0D 94 48 */ stw r0, gIsInitialized(r13) -/* 80372BC0 4E 80 00 20 */ blr diff --git a/asm/TRK_MINNOW_DOLPHIN/GCN/EXI2_GDEV_GCN/main/gdev_cc_post_stop.s b/asm/TRK_MINNOW_DOLPHIN/GCN/EXI2_GDEV_GCN/main/gdev_cc_post_stop.s deleted file mode 100644 index b6ed4dda90..0000000000 --- a/asm/TRK_MINNOW_DOLPHIN/GCN/EXI2_GDEV_GCN/main/gdev_cc_post_stop.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_8037299C: -/* 8037299C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 803729A0 7C 08 02 A6 */ mflr r0 -/* 803729A4 90 01 00 14 */ stw r0, 0x14(r1) -/* 803729A8 48 00 03 89 */ bl DBOpen -/* 803729AC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 803729B0 38 60 00 00 */ li r3, 0 -/* 803729B4 7C 08 03 A6 */ mtlr r0 -/* 803729B8 38 21 00 10 */ addi r1, r1, 0x10 -/* 803729BC 4E 80 00 20 */ blr diff --git a/asm/TRK_MINNOW_DOLPHIN/GCN/EXI2_GDEV_GCN/main/gdev_cc_pre_continue.s b/asm/TRK_MINNOW_DOLPHIN/GCN/EXI2_GDEV_GCN/main/gdev_cc_pre_continue.s deleted file mode 100644 index 2385f62506..0000000000 --- a/asm/TRK_MINNOW_DOLPHIN/GCN/EXI2_GDEV_GCN/main/gdev_cc_pre_continue.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_803729C0: -/* 803729C0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 803729C4 7C 08 02 A6 */ mflr r0 -/* 803729C8 90 01 00 14 */ stw r0, 0x14(r1) -/* 803729CC 48 00 03 61 */ bl DBClose -/* 803729D0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 803729D4 38 60 00 00 */ li r3, 0 -/* 803729D8 7C 08 03 A6 */ mtlr r0 -/* 803729DC 38 21 00 10 */ addi r1, r1, 0x10 -/* 803729E0 4E 80 00 20 */ blr diff --git a/asm/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/msghndlr/GetTRKConnected.s b/asm/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/msghndlr/GetTRKConnected.s deleted file mode 100644 index 0632f8eedf..0000000000 --- a/asm/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/msghndlr/GetTRKConnected.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_8036ECCC: -/* 8036ECCC 3C 60 80 45 */ lis r3, IsTRKConnected@ha /* 0x8044F288@ha */ -/* 8036ECD0 38 63 F2 88 */ addi r3, r3, IsTRKConnected@l /* 0x8044F288@l */ -/* 8036ECD4 80 63 00 00 */ lwz r3, 0(r3) -/* 8036ECD8 4E 80 00 20 */ blr diff --git a/asm/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/msghndlr/SetTRKConnected.s b/asm/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/msghndlr/SetTRKConnected.s deleted file mode 100644 index 54617bf884..0000000000 --- a/asm/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/msghndlr/SetTRKConnected.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_8036ECC0: -/* 8036ECC0 3C 80 80 45 */ lis r4, IsTRKConnected@ha /* 0x8044F288@ha */ -/* 8036ECC4 90 64 F2 88 */ stw r3, IsTRKConnected@l(r4) /* 0x8044F288@l */ -/* 8036ECC8 4E 80 00 20 */ blr diff --git a/asm/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/nubevent/TRKDestructEvent.s b/asm/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/nubevent/TRKDestructEvent.s deleted file mode 100644 index 9c85ccc352..0000000000 --- a/asm/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/nubevent/TRKDestructEvent.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_8036CC18: -/* 8036CC18 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8036CC1C 7C 08 02 A6 */ mflr r0 -/* 8036CC20 90 01 00 14 */ stw r0, 0x14(r1) -/* 8036CC24 80 63 00 08 */ lwz r3, 8(r3) -/* 8036CC28 48 00 0A 65 */ bl TRKReleaseBuffer -/* 8036CC2C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8036CC30 7C 08 03 A6 */ mtlr r0 -/* 8036CC34 38 21 00 10 */ addi r1, r1, 0x10 -/* 8036CC38 4E 80 00 20 */ blr diff --git a/asm/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/nubevent/TRKInitializeEventQueue.s b/asm/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/nubevent/TRKInitializeEventQueue.s deleted file mode 100644 index 9508ad7658..0000000000 --- a/asm/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/nubevent/TRKInitializeEventQueue.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_8036CDE8: -/* 8036CDE8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8036CDEC 7C 08 02 A6 */ mflr r0 -/* 8036CDF0 3C 60 80 45 */ lis r3, gTRKEventQueue@ha /* 0x8044D890@ha */ -/* 8036CDF4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8036CDF8 38 63 D8 90 */ addi r3, r3, gTRKEventQueue@l /* 0x8044D890@l */ -/* 8036CDFC 48 00 26 AD */ bl TRKInitializeMutex -/* 8036CE00 3C 60 80 45 */ lis r3, gTRKEventQueue@ha /* 0x8044D890@ha */ -/* 8036CE04 38 63 D8 90 */ addi r3, r3, gTRKEventQueue@l /* 0x8044D890@l */ -/* 8036CE08 48 00 26 99 */ bl TRKAcquireMutex -/* 8036CE0C 3C 60 80 45 */ lis r3, gTRKEventQueue@ha /* 0x8044D890@ha */ -/* 8036CE10 38 80 00 00 */ li r4, 0 -/* 8036CE14 38 63 D8 90 */ addi r3, r3, gTRKEventQueue@l /* 0x8044D890@l */ -/* 8036CE18 38 00 01 00 */ li r0, 0x100 -/* 8036CE1C 90 83 00 04 */ stw r4, 4(r3) -/* 8036CE20 90 83 00 08 */ stw r4, 8(r3) -/* 8036CE24 90 03 00 24 */ stw r0, 0x24(r3) -/* 8036CE28 48 00 26 71 */ bl TRKReleaseMutex -/* 8036CE2C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8036CE30 38 60 00 00 */ li r3, 0 -/* 8036CE34 7C 08 03 A6 */ mtlr r0 -/* 8036CE38 38 21 00 10 */ addi r1, r1, 0x10 -/* 8036CE3C 4E 80 00 20 */ blr diff --git a/asm/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/nubinit/TRKTerminateNub.s b/asm/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/nubinit/TRKTerminateNub.s deleted file mode 100644 index a599ff252b..0000000000 --- a/asm/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/nubinit/TRKTerminateNub.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_8036CE68: -/* 8036CE68 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8036CE6C 7C 08 02 A6 */ mflr r0 -/* 8036CE70 90 01 00 14 */ stw r0, 0x14(r1) -/* 8036CE74 48 00 09 E5 */ bl TRKTerminateSerialHandler -/* 8036CE78 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8036CE7C 38 60 00 00 */ li r3, 0 -/* 8036CE80 7C 08 03 A6 */ mtlr r0 -/* 8036CE84 38 21 00 10 */ addi r1, r1, 0x10 -/* 8036CE88 4E 80 00 20 */ blr diff --git a/asm/TRK_MINNOW_DOLPHIN/Os/dolphin/dolphin_trk/EnableMetroTRKInterrupts.s b/asm/TRK_MINNOW_DOLPHIN/Os/dolphin/dolphin_trk/EnableMetroTRKInterrupts.s deleted file mode 100644 index 60f5d6f9cf..0000000000 --- a/asm/TRK_MINNOW_DOLPHIN/Os/dolphin/dolphin_trk/EnableMetroTRKInterrupts.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80371B7C: -/* 80371B7C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80371B80 7C 08 02 A6 */ mflr r0 -/* 80371B84 90 01 00 14 */ stw r0, 0x14(r1) -/* 80371B88 48 00 02 89 */ bl EnableEXI2Interrupts -/* 80371B8C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80371B90 7C 08 03 A6 */ mtlr r0 -/* 80371B94 38 21 00 10 */ addi r1, r1, 0x10 -/* 80371B98 4E 80 00 20 */ blr diff --git a/asm/TRK_MINNOW_DOLPHIN/Os/dolphin/dolphin_trk/TRKInitializeTarget.s b/asm/TRK_MINNOW_DOLPHIN/Os/dolphin/dolphin_trk/TRKInitializeTarget.s deleted file mode 100644 index 6e4b9e9b9c..0000000000 --- a/asm/TRK_MINNOW_DOLPHIN/Os/dolphin/dolphin_trk/TRKInitializeTarget.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_803719AC: -/* 803719AC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 803719B0 7C 08 02 A6 */ mflr r0 -/* 803719B4 3C 60 80 45 */ lis r3, gTRKState@ha /* 0x8044F294@ha */ -/* 803719B8 90 01 00 14 */ stw r0, 0x14(r1) -/* 803719BC 38 00 00 01 */ li r0, 1 -/* 803719C0 38 63 F2 94 */ addi r3, r3, gTRKState@l /* 0x8044F294@l */ -/* 803719C4 90 03 00 98 */ stw r0, 0x98(r3) -/* 803719C8 4B FF DC 71 */ bl __TRK_get_MSR -/* 803719CC 3C A0 80 45 */ lis r5, gTRKState@ha /* 0x8044F294@ha */ -/* 803719D0 3C 80 80 45 */ lis r4, lc_base@ha /* 0x8044F810@ha */ -/* 803719D4 38 A5 F2 94 */ addi r5, r5, gTRKState@l /* 0x8044F294@l */ -/* 803719D8 3C 00 E0 00 */ lis r0, 0xe000 -/* 803719DC 90 65 00 8C */ stw r3, 0x8c(r5) -/* 803719E0 38 60 00 00 */ li r3, 0 -/* 803719E4 90 04 F8 10 */ stw r0, lc_base@l(r4) /* 0x8044F810@l */ -/* 803719E8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 803719EC 7C 08 03 A6 */ mtlr r0 -/* 803719F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 803719F4 4E 80 00 20 */ blr diff --git a/asm/TRK_MINNOW_DOLPHIN/Os/dolphin/dolphin_trk/TRKTargetTranslate.s b/asm/TRK_MINNOW_DOLPHIN/Os/dolphin/dolphin_trk/TRKTargetTranslate.s deleted file mode 100644 index 0df6d57f9f..0000000000 --- a/asm/TRK_MINNOW_DOLPHIN/Os/dolphin/dolphin_trk/TRKTargetTranslate.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_80371B24: -/* 80371B24 3C 80 80 45 */ lis r4, lc_base@ha /* 0x8044F810@ha */ -/* 80371B28 38 84 F8 10 */ addi r4, r4, lc_base@l /* 0x8044F810@l */ -/* 80371B2C 80 84 00 00 */ lwz r4, 0(r4) -/* 80371B30 7C 03 20 40 */ cmplw r3, r4 -/* 80371B34 41 80 00 24 */ blt lbl_80371B58 -/* 80371B38 38 04 40 00 */ addi r0, r4, 0x4000 -/* 80371B3C 7C 03 00 40 */ cmplw r3, r0 -/* 80371B40 40 80 00 18 */ bge lbl_80371B58 -/* 80371B44 3C 80 80 45 */ lis r4, gTRKCPUState@ha /* 0x8044F338@ha */ -/* 80371B48 38 84 F3 38 */ addi r4, r4, gTRKCPUState@l /* 0x8044F338@l */ -/* 80371B4C 80 04 02 38 */ lwz r0, 0x238(r4) -/* 80371B50 54 00 07 BF */ clrlwi. r0, r0, 0x1e -/* 80371B54 4C 82 00 20 */ bnelr -lbl_80371B58: -/* 80371B58 3C 00 7E 00 */ lis r0, 0x7e00 -/* 80371B5C 7C 03 00 40 */ cmplw r3, r0 -/* 80371B60 41 80 00 10 */ blt lbl_80371B70 -/* 80371B64 3C 00 80 00 */ lis r0, 0x8000 -/* 80371B68 7C 03 00 40 */ cmplw r3, r0 -/* 80371B6C 4C 81 00 20 */ blelr -lbl_80371B70: -/* 80371B70 54 60 00 BE */ clrlwi r0, r3, 2 -/* 80371B74 64 03 80 00 */ oris r3, r0, 0x8000 -/* 80371B78 4E 80 00 20 */ blr diff --git a/asm/TRK_MINNOW_DOLPHIN/utils/common/CircleBuffer/CBGetBytesAvailableForRead.s b/asm/TRK_MINNOW_DOLPHIN/utils/common/CircleBuffer/CBGetBytesAvailableForRead.s deleted file mode 100644 index 554fb3750f..0000000000 --- a/asm/TRK_MINNOW_DOLPHIN/utils/common/CircleBuffer/CBGetBytesAvailableForRead.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80372900: -/* 80372900 80 63 00 10 */ lwz r3, 0x10(r3) -/* 80372904 4E 80 00 20 */ blr diff --git a/asm/TRK_MINNOW_DOLPHIN/utils/common/CircleBuffer/CircleBufferInitialize.s b/asm/TRK_MINNOW_DOLPHIN/utils/common/CircleBuffer/CircleBufferInitialize.s deleted file mode 100644 index f4adbcbd9d..0000000000 --- a/asm/TRK_MINNOW_DOLPHIN/utils/common/CircleBuffer/CircleBufferInitialize.s +++ /dev/null @@ -1,21 +0,0 @@ -lbl_803728B0: -/* 803728B0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 803728B4 7C 08 02 A6 */ mflr r0 -/* 803728B8 7C 66 1B 78 */ mr r6, r3 -/* 803728BC 90 01 00 14 */ stw r0, 0x14(r1) -/* 803728C0 38 00 00 00 */ li r0, 0 -/* 803728C4 90 83 00 08 */ stw r4, 8(r3) -/* 803728C8 38 66 00 18 */ addi r3, r6, 0x18 -/* 803728CC 90 A6 00 0C */ stw r5, 0xc(r6) -/* 803728D0 80 86 00 08 */ lwz r4, 8(r6) -/* 803728D4 90 86 00 00 */ stw r4, 0(r6) -/* 803728D8 80 86 00 08 */ lwz r4, 8(r6) -/* 803728DC 90 86 00 04 */ stw r4, 4(r6) -/* 803728E0 90 06 00 10 */ stw r0, 0x10(r6) -/* 803728E4 80 06 00 0C */ lwz r0, 0xc(r6) -/* 803728E8 90 06 00 14 */ stw r0, 0x14(r6) -/* 803728EC 48 00 04 0D */ bl MWInitializeCriticalSection -/* 803728F0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 803728F4 7C 08 03 A6 */ mtlr r0 -/* 803728F8 38 21 00 10 */ addi r1, r1, 0x10 -/* 803728FC 4E 80 00 20 */ blr diff --git a/asm/TRK_MINNOW_DOLPHIN/utils/common/CircleBuffer/CircleBufferReadBytes.s b/asm/TRK_MINNOW_DOLPHIN/utils/common/CircleBuffer/CircleBufferReadBytes.s deleted file mode 100644 index 542fdc5a64..0000000000 --- a/asm/TRK_MINNOW_DOLPHIN/utils/common/CircleBuffer/CircleBufferReadBytes.s +++ /dev/null @@ -1,72 +0,0 @@ -lbl_803726A0: -/* 803726A0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 803726A4 7C 08 02 A6 */ mflr r0 -/* 803726A8 90 01 00 24 */ stw r0, 0x24(r1) -/* 803726AC 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 803726B0 7C BF 2B 78 */ mr r31, r5 -/* 803726B4 93 C1 00 18 */ stw r30, 0x18(r1) -/* 803726B8 7C 7E 1B 78 */ mr r30, r3 -/* 803726BC 93 A1 00 14 */ stw r29, 0x14(r1) -/* 803726C0 93 81 00 10 */ stw r28, 0x10(r1) -/* 803726C4 7C 9C 23 78 */ mr r28, r4 -/* 803726C8 80 03 00 10 */ lwz r0, 0x10(r3) -/* 803726CC 7C 1F 00 40 */ cmplw r31, r0 -/* 803726D0 40 81 00 0C */ ble lbl_803726DC -/* 803726D4 38 60 FF FF */ li r3, -1 -/* 803726D8 48 00 00 B0 */ b lbl_80372788 -lbl_803726DC: -/* 803726DC 38 7E 00 18 */ addi r3, r30, 0x18 -/* 803726E0 48 00 05 E9 */ bl MWEnterCriticalSection -/* 803726E4 80 7E 00 08 */ lwz r3, 8(r30) -/* 803726E8 80 9E 00 00 */ lwz r4, 0(r30) -/* 803726EC 80 1E 00 0C */ lwz r0, 0xc(r30) -/* 803726F0 7C 63 20 50 */ subf r3, r3, r4 -/* 803726F4 7F A3 00 50 */ subf r29, r3, r0 -/* 803726F8 7C 1F E8 40 */ cmplw r31, r29 -/* 803726FC 40 80 00 20 */ bge lbl_8037271C -/* 80372700 7F 83 E3 78 */ mr r3, r28 -/* 80372704 7F E5 FB 78 */ mr r5, r31 -/* 80372708 4B C9 0E 39 */ bl memcpy -/* 8037270C 80 1E 00 00 */ lwz r0, 0(r30) -/* 80372710 7C 00 FA 14 */ add r0, r0, r31 -/* 80372714 90 1E 00 00 */ stw r0, 0(r30) -/* 80372718 48 00 00 30 */ b lbl_80372748 -lbl_8037271C: -/* 8037271C 7F 83 E3 78 */ mr r3, r28 -/* 80372720 7F A5 EB 78 */ mr r5, r29 -/* 80372724 4B C9 0E 1D */ bl memcpy -/* 80372728 80 9E 00 08 */ lwz r4, 8(r30) -/* 8037272C 7C 7C EA 14 */ add r3, r28, r29 -/* 80372730 7C BD F8 50 */ subf r5, r29, r31 -/* 80372734 4B C9 0E 0D */ bl memcpy -/* 80372738 80 1E 00 08 */ lwz r0, 8(r30) -/* 8037273C 7C 00 FA 14 */ add r0, r0, r31 -/* 80372740 7C 1D 00 50 */ subf r0, r29, r0 -/* 80372744 90 1E 00 00 */ stw r0, 0(r30) -lbl_80372748: -/* 80372748 80 9E 00 08 */ lwz r4, 8(r30) -/* 8037274C 80 1E 00 00 */ lwz r0, 0(r30) -/* 80372750 80 7E 00 0C */ lwz r3, 0xc(r30) -/* 80372754 7C 04 00 50 */ subf r0, r4, r0 -/* 80372758 7C 03 00 40 */ cmplw r3, r0 -/* 8037275C 40 82 00 08 */ bne lbl_80372764 -/* 80372760 90 9E 00 00 */ stw r4, 0(r30) -lbl_80372764: -/* 80372764 80 1E 00 14 */ lwz r0, 0x14(r30) -/* 80372768 38 7E 00 18 */ addi r3, r30, 0x18 -/* 8037276C 7C 00 FA 14 */ add r0, r0, r31 -/* 80372770 90 1E 00 14 */ stw r0, 0x14(r30) -/* 80372774 80 1E 00 10 */ lwz r0, 0x10(r30) -/* 80372778 7C 1F 00 50 */ subf r0, r31, r0 -/* 8037277C 90 1E 00 10 */ stw r0, 0x10(r30) -/* 80372780 48 00 05 25 */ bl MWExitCriticalSection -/* 80372784 38 60 00 00 */ li r3, 0 -lbl_80372788: -/* 80372788 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8037278C 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80372790 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 80372794 83 A1 00 14 */ lwz r29, 0x14(r1) -/* 80372798 83 81 00 10 */ lwz r28, 0x10(r1) -/* 8037279C 7C 08 03 A6 */ mtlr r0 -/* 803727A0 38 21 00 20 */ addi r1, r1, 0x20 -/* 803727A4 4E 80 00 20 */ blr diff --git a/asm/TRK_MINNOW_DOLPHIN/utils/common/CircleBuffer/CircleBufferWriteBytes.s b/asm/TRK_MINNOW_DOLPHIN/utils/common/CircleBuffer/CircleBufferWriteBytes.s deleted file mode 100644 index 8aba9630c0..0000000000 --- a/asm/TRK_MINNOW_DOLPHIN/utils/common/CircleBuffer/CircleBufferWriteBytes.s +++ /dev/null @@ -1,72 +0,0 @@ -lbl_803727A8: -/* 803727A8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 803727AC 7C 08 02 A6 */ mflr r0 -/* 803727B0 90 01 00 24 */ stw r0, 0x24(r1) -/* 803727B4 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 803727B8 7C BF 2B 78 */ mr r31, r5 -/* 803727BC 93 C1 00 18 */ stw r30, 0x18(r1) -/* 803727C0 7C 7E 1B 78 */ mr r30, r3 -/* 803727C4 93 A1 00 14 */ stw r29, 0x14(r1) -/* 803727C8 93 81 00 10 */ stw r28, 0x10(r1) -/* 803727CC 7C 9C 23 78 */ mr r28, r4 -/* 803727D0 80 03 00 14 */ lwz r0, 0x14(r3) -/* 803727D4 7C 1F 00 40 */ cmplw r31, r0 -/* 803727D8 40 81 00 0C */ ble lbl_803727E4 -/* 803727DC 38 60 FF FF */ li r3, -1 -/* 803727E0 48 00 00 B0 */ b lbl_80372890 -lbl_803727E4: -/* 803727E4 38 7E 00 18 */ addi r3, r30, 0x18 -/* 803727E8 48 00 04 E1 */ bl MWEnterCriticalSection -/* 803727EC 80 9E 00 08 */ lwz r4, 8(r30) -/* 803727F0 80 7E 00 04 */ lwz r3, 4(r30) -/* 803727F4 80 1E 00 0C */ lwz r0, 0xc(r30) -/* 803727F8 7C 84 18 50 */ subf r4, r4, r3 -/* 803727FC 7F A4 00 50 */ subf r29, r4, r0 -/* 80372800 7C 1D F8 40 */ cmplw r29, r31 -/* 80372804 41 80 00 20 */ blt lbl_80372824 -/* 80372808 7F 84 E3 78 */ mr r4, r28 -/* 8037280C 7F E5 FB 78 */ mr r5, r31 -/* 80372810 4B C9 0D 31 */ bl memcpy -/* 80372814 80 1E 00 04 */ lwz r0, 4(r30) -/* 80372818 7C 00 FA 14 */ add r0, r0, r31 -/* 8037281C 90 1E 00 04 */ stw r0, 4(r30) -/* 80372820 48 00 00 30 */ b lbl_80372850 -lbl_80372824: -/* 80372824 7F 84 E3 78 */ mr r4, r28 -/* 80372828 7F A5 EB 78 */ mr r5, r29 -/* 8037282C 4B C9 0D 15 */ bl memcpy -/* 80372830 80 7E 00 08 */ lwz r3, 8(r30) -/* 80372834 7C 9C EA 14 */ add r4, r28, r29 -/* 80372838 7C BD F8 50 */ subf r5, r29, r31 -/* 8037283C 4B C9 0D 05 */ bl memcpy -/* 80372840 80 1E 00 08 */ lwz r0, 8(r30) -/* 80372844 7C 00 FA 14 */ add r0, r0, r31 -/* 80372848 7C 1D 00 50 */ subf r0, r29, r0 -/* 8037284C 90 1E 00 04 */ stw r0, 4(r30) -lbl_80372850: -/* 80372850 80 9E 00 08 */ lwz r4, 8(r30) -/* 80372854 80 1E 00 04 */ lwz r0, 4(r30) -/* 80372858 80 7E 00 0C */ lwz r3, 0xc(r30) -/* 8037285C 7C 04 00 50 */ subf r0, r4, r0 -/* 80372860 7C 03 00 40 */ cmplw r3, r0 -/* 80372864 40 82 00 08 */ bne lbl_8037286C -/* 80372868 90 9E 00 04 */ stw r4, 4(r30) -lbl_8037286C: -/* 8037286C 80 1E 00 14 */ lwz r0, 0x14(r30) -/* 80372870 38 7E 00 18 */ addi r3, r30, 0x18 -/* 80372874 7C 1F 00 50 */ subf r0, r31, r0 -/* 80372878 90 1E 00 14 */ stw r0, 0x14(r30) -/* 8037287C 80 1E 00 10 */ lwz r0, 0x10(r30) -/* 80372880 7C 00 FA 14 */ add r0, r0, r31 -/* 80372884 90 1E 00 10 */ stw r0, 0x10(r30) -/* 80372888 48 00 04 1D */ bl MWExitCriticalSection -/* 8037288C 38 60 00 00 */ li r3, 0 -lbl_80372890: -/* 80372890 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80372894 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80372898 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 8037289C 83 A1 00 14 */ lwz r29, 0x14(r1) -/* 803728A0 83 81 00 10 */ lwz r28, 0x10(r1) -/* 803728A4 7C 08 03 A6 */ mtlr r0 -/* 803728A8 38 21 00 20 */ addi r1, r1, 0x20 -/* 803728AC 4E 80 00 20 */ blr diff --git a/asm/TRK_MINNOW_DOLPHIN/utils/gc/MWCriticalSection_gc/MWEnterCriticalSection.s b/asm/TRK_MINNOW_DOLPHIN/utils/gc/MWCriticalSection_gc/MWEnterCriticalSection.s deleted file mode 100644 index ccf0f17aec..0000000000 --- a/asm/TRK_MINNOW_DOLPHIN/utils/gc/MWCriticalSection_gc/MWEnterCriticalSection.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80372CC8: -/* 80372CC8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80372CCC 7C 08 02 A6 */ mflr r0 -/* 80372CD0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80372CD4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80372CD8 7C 7F 1B 78 */ mr r31, r3 -/* 80372CDC 4B FC AA 19 */ bl OSDisableInterrupts -/* 80372CE0 90 7F 00 00 */ stw r3, 0(r31) -/* 80372CE4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80372CE8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80372CEC 7C 08 03 A6 */ mtlr r0 -/* 80372CF0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80372CF4 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/dMw_fade_in__5dMw_cFv.s b/asm/d/menu/d_menu_window/dMw_fade_in__5dMw_cFv.s deleted file mode 100644 index 967ddd324a..0000000000 --- a/asm/d/menu/d_menu_window/dMw_fade_in__5dMw_cFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_801FCE78: -/* 801FCE78 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FCE7C 7C 08 02 A6 */ mflr r0 -/* 801FCE80 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FCE84 80 6D 8C 40 */ lwz r3, sManager__10JFWDisplay(r13) -/* 801FCE88 80 63 00 04 */ lwz r3, 4(r3) -/* 801FCE8C 28 03 00 00 */ cmplwi r3, 0 -/* 801FCE90 41 82 00 18 */ beq lbl_801FCEA8 -/* 801FCE94 38 80 00 0D */ li r4, 0xd -/* 801FCE98 81 83 00 00 */ lwz r12, 0(r3) -/* 801FCE9C 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 801FCEA0 7D 89 03 A6 */ mtctr r12 -/* 801FCEA4 4E 80 04 21 */ bctrl -lbl_801FCEA8: -/* 801FCEA8 80 0D 80 84 */ lwz r0, g_blackColor(r13) -/* 801FCEAC 90 01 00 0C */ stw r0, 0xc(r1) -/* 801FCEB0 90 01 00 08 */ stw r0, 8(r1) -/* 801FCEB4 80 6D 86 48 */ lwz r3, mFader__13mDoGph_gInf_c(r13) -/* 801FCEB8 88 01 00 08 */ lbz r0, 8(r1) -/* 801FCEBC 98 03 00 0C */ stb r0, 0xc(r3) -/* 801FCEC0 88 01 00 09 */ lbz r0, 9(r1) -/* 801FCEC4 98 03 00 0D */ stb r0, 0xd(r3) -/* 801FCEC8 88 01 00 0A */ lbz r0, 0xa(r1) -/* 801FCECC 98 03 00 0E */ stb r0, 0xe(r3) -/* 801FCED0 88 01 00 0B */ lbz r0, 0xb(r1) -/* 801FCED4 98 03 00 0F */ stb r0, 0xf(r3) -/* 801FCED8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FCEDC 7C 08 03 A6 */ mtlr r0 -/* 801FCEE0 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FCEE4 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/dMw_fade_out__5dMw_cFv.s b/asm/d/menu/d_menu_window/dMw_fade_out__5dMw_cFv.s deleted file mode 100644 index f9efd592f0..0000000000 --- a/asm/d/menu/d_menu_window/dMw_fade_out__5dMw_cFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_801FCE08: -/* 801FCE08 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FCE0C 7C 08 02 A6 */ mflr r0 -/* 801FCE10 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FCE14 80 6D 8C 40 */ lwz r3, sManager__10JFWDisplay(r13) -/* 801FCE18 80 63 00 04 */ lwz r3, 4(r3) -/* 801FCE1C 28 03 00 00 */ cmplwi r3, 0 -/* 801FCE20 41 82 00 18 */ beq lbl_801FCE38 -/* 801FCE24 38 80 00 0D */ li r4, 0xd -/* 801FCE28 81 83 00 00 */ lwz r12, 0(r3) -/* 801FCE2C 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 801FCE30 7D 89 03 A6 */ mtctr r12 -/* 801FCE34 4E 80 04 21 */ bctrl -lbl_801FCE38: -/* 801FCE38 80 0D 80 84 */ lwz r0, g_blackColor(r13) -/* 801FCE3C 90 01 00 0C */ stw r0, 0xc(r1) -/* 801FCE40 90 01 00 08 */ stw r0, 8(r1) -/* 801FCE44 80 6D 86 48 */ lwz r3, mFader__13mDoGph_gInf_c(r13) -/* 801FCE48 88 01 00 08 */ lbz r0, 8(r1) -/* 801FCE4C 98 03 00 0C */ stb r0, 0xc(r3) -/* 801FCE50 88 01 00 09 */ lbz r0, 9(r1) -/* 801FCE54 98 03 00 0D */ stb r0, 0xd(r3) -/* 801FCE58 88 01 00 0A */ lbz r0, 0xa(r1) -/* 801FCE5C 98 03 00 0E */ stb r0, 0xe(r3) -/* 801FCE60 88 01 00 0B */ lbz r0, 0xb(r1) -/* 801FCE64 98 03 00 0F */ stb r0, 0xf(r3) -/* 801FCE68 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FCE6C 7C 08 03 A6 */ mtlr r0 -/* 801FCE70 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FCE74 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_flow/query039__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s b/asm/d/msg/d_msg_flow/query039__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s deleted file mode 100644 index aca83101cc..0000000000 --- a/asm/d/msg/d_msg_flow/query039__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s +++ /dev/null @@ -1,40 +0,0 @@ -lbl_8024BDB0: -/* 8024BDB0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8024BDB4 7C 08 02 A6 */ mflr r0 -/* 8024BDB8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024BDBC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8024BDC0 93 C1 00 08 */ stw r30, 8(r1) -/* 8024BDC4 A3 C4 00 04 */ lhz r30, 4(r4) -/* 8024BDC8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8024BDCC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8024BDD0 38 63 0D D8 */ addi r3, r3, 0xdd8 -/* 8024BDD4 3C 80 00 01 */ lis r4, 0x0001 /* 0x0000FBFF@ha */ -/* 8024BDD8 38 84 FB FF */ addi r4, r4, 0xFBFF /* 0x0000FBFF@l */ -/* 8024BDDC 4B DE 8C 29 */ bl getEventReg__11dSv_event_cCFUs -/* 8024BDE0 7C 64 1B 78 */ mr r4, r3 -/* 8024BDE4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8024BDE8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8024BDEC 38 63 00 EC */ addi r3, r3, 0xec -/* 8024BDF0 38 04 FF FF */ addi r0, r4, -1 -/* 8024BDF4 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 8024BDF8 4B DE 81 85 */ bl getBombNum__24dSv_player_item_record_cCFUc -/* 8024BDFC 7C 7F 1B 78 */ mr r31, r3 -/* 8024BE00 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8024BE04 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8024BE08 38 63 00 F8 */ addi r3, r3, 0xf8 -/* 8024BE0C 38 80 00 70 */ li r4, 0x70 -/* 8024BE10 4B DE 82 E9 */ bl getBombNum__21dSv_player_item_max_cCFUc -/* 8024BE14 54 65 06 3E */ clrlwi r5, r3, 0x18 -/* 8024BE18 57 E0 06 3E */ clrlwi r0, r31, 0x18 -/* 8024BE1C 7C 00 F2 14 */ add r0, r0, r30 -/* 8024BE20 7C A4 FE 70 */ srawi r4, r5, 0x1f -/* 8024BE24 54 03 0F FE */ srwi r3, r0, 0x1f -/* 8024BE28 7C 00 28 10 */ subfc r0, r0, r5 -/* 8024BE2C 7C 04 19 14 */ adde r0, r4, r3 -/* 8024BE30 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 8024BE34 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8024BE38 83 C1 00 08 */ lwz r30, 8(r1) -/* 8024BE3C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8024BE40 7C 08 03 A6 */ mtlr r0 -/* 8024BE44 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024BE48 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_flow/query040__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s b/asm/d/msg/d_msg_flow/query040__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s deleted file mode 100644 index 3f50c7ea65..0000000000 --- a/asm/d/msg/d_msg_flow/query040__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s +++ /dev/null @@ -1,72 +0,0 @@ -lbl_8024BE4C: -/* 8024BE4C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8024BE50 7C 08 02 A6 */ mflr r0 -/* 8024BE54 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024BE58 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8024BE5C 93 C1 00 08 */ stw r30, 8(r1) -/* 8024BE60 A0 64 00 04 */ lhz r3, 4(r4) -/* 8024BE64 2C 03 00 01 */ cmpwi r3, 1 -/* 8024BE68 41 80 00 18 */ blt lbl_8024BE80 -/* 8024BE6C 2C 03 00 04 */ cmpwi r3, 4 -/* 8024BE70 40 80 00 10 */ bge lbl_8024BE80 -/* 8024BE74 38 03 FF FF */ addi r0, r3, -1 -/* 8024BE78 54 1E 06 3E */ clrlwi r30, r0, 0x18 -/* 8024BE7C 48 00 00 48 */ b lbl_8024BEC4 -lbl_8024BE80: -/* 8024BE80 2C 03 00 04 */ cmpwi r3, 4 -/* 8024BE84 40 82 00 20 */ bne lbl_8024BEA4 -/* 8024BE88 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 8024BE8C 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 8024BE90 88 03 00 DC */ lbz r0, 0xdc(r3) -/* 8024BE94 28 00 00 FF */ cmplwi r0, 0xff -/* 8024BE98 41 82 00 2C */ beq lbl_8024BEC4 -/* 8024BE9C 7C 1E 03 78 */ mr r30, r0 -/* 8024BEA0 48 00 00 24 */ b lbl_8024BEC4 -lbl_8024BEA4: -/* 8024BEA4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8024BEA8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8024BEAC 38 63 0D D8 */ addi r3, r3, 0xdd8 -/* 8024BEB0 3C 80 00 01 */ lis r4, 0x0001 /* 0x0000FBFF@ha */ -/* 8024BEB4 38 84 FB FF */ addi r4, r4, 0xFBFF /* 0x0000FBFF@l */ -/* 8024BEB8 4B DE 8B 4D */ bl getEventReg__11dSv_event_cCFUs -/* 8024BEBC 38 03 FF FF */ addi r0, r3, -1 -/* 8024BEC0 54 1E 06 3E */ clrlwi r30, r0, 0x18 -lbl_8024BEC4: -/* 8024BEC4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8024BEC8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8024BECC 38 63 00 EC */ addi r3, r3, 0xec -/* 8024BED0 7F C4 F3 78 */ mr r4, r30 -/* 8024BED4 4B DE 80 A9 */ bl getBombNum__24dSv_player_item_record_cCFUc -/* 8024BED8 7C 7F 1B 78 */ mr r31, r3 -/* 8024BEDC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8024BEE0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8024BEE4 38 63 00 9C */ addi r3, r3, 0x9c -/* 8024BEE8 38 1E 00 0F */ addi r0, r30, 0xf -/* 8024BEEC 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 8024BEF0 38 A0 00 00 */ li r5, 0 -/* 8024BEF4 4B DE 71 3D */ bl getItem__17dSv_player_item_cCFib -/* 8024BEF8 7C 64 1B 78 */ mr r4, r3 -/* 8024BEFC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8024BF00 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8024BF04 38 63 00 F8 */ addi r3, r3, 0xf8 -/* 8024BF08 4B DE 81 F1 */ bl getBombNum__21dSv_player_item_max_cCFUc -/* 8024BF0C 57 E4 06 3F */ clrlwi. r4, r31, 0x18 -/* 8024BF10 40 82 00 0C */ bne lbl_8024BF1C -/* 8024BF14 38 00 00 00 */ li r0, 0 -/* 8024BF18 48 00 00 1C */ b lbl_8024BF34 -lbl_8024BF1C: -/* 8024BF1C 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8024BF20 7C 04 00 40 */ cmplw r4, r0 -/* 8024BF24 41 80 00 0C */ blt lbl_8024BF30 -/* 8024BF28 38 00 00 02 */ li r0, 2 -/* 8024BF2C 48 00 00 08 */ b lbl_8024BF34 -lbl_8024BF30: -/* 8024BF30 38 00 00 01 */ li r0, 1 -lbl_8024BF34: -/* 8024BF34 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 8024BF38 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8024BF3C 83 C1 00 08 */ lwz r30, 8(r1) -/* 8024BF40 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8024BF44 7C 08 03 A6 */ mtlr r0 -/* 8024BF48 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024BF4C 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_flow/query041__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s b/asm/d/msg/d_msg_flow/query041__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s deleted file mode 100644 index 7f2a6dbe09..0000000000 --- a/asm/d/msg/d_msg_flow/query041__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s +++ /dev/null @@ -1,40 +0,0 @@ -lbl_8024BF50: -/* 8024BF50 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8024BF54 7C 08 02 A6 */ mflr r0 -/* 8024BF58 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024BF5C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8024BF60 93 C1 00 08 */ stw r30, 8(r1) -/* 8024BF64 A3 C4 00 04 */ lhz r30, 4(r4) -/* 8024BF68 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8024BF6C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8024BF70 38 63 0D D8 */ addi r3, r3, 0xdd8 -/* 8024BF74 3C 80 00 01 */ lis r4, 0x0001 /* 0x0000FBFF@ha */ -/* 8024BF78 38 84 FB FF */ addi r4, r4, 0xFBFF /* 0x0000FBFF@l */ -/* 8024BF7C 4B DE 8A 89 */ bl getEventReg__11dSv_event_cCFUs -/* 8024BF80 7C 64 1B 78 */ mr r4, r3 -/* 8024BF84 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8024BF88 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8024BF8C 38 63 00 EC */ addi r3, r3, 0xec -/* 8024BF90 38 04 FF FF */ addi r0, r4, -1 -/* 8024BF94 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 8024BF98 4B DE 7F E5 */ bl getBombNum__24dSv_player_item_record_cCFUc -/* 8024BF9C 7C 7F 1B 78 */ mr r31, r3 -/* 8024BFA0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8024BFA4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8024BFA8 38 63 00 F8 */ addi r3, r3, 0xf8 -/* 8024BFAC 38 80 00 71 */ li r4, 0x71 -/* 8024BFB0 4B DE 81 49 */ bl getBombNum__21dSv_player_item_max_cCFUc -/* 8024BFB4 54 65 06 3E */ clrlwi r5, r3, 0x18 -/* 8024BFB8 57 E0 06 3E */ clrlwi r0, r31, 0x18 -/* 8024BFBC 7C 00 F2 14 */ add r0, r0, r30 -/* 8024BFC0 7C A4 FE 70 */ srawi r4, r5, 0x1f -/* 8024BFC4 54 03 0F FE */ srwi r3, r0, 0x1f -/* 8024BFC8 7C 00 28 10 */ subfc r0, r0, r5 -/* 8024BFCC 7C 04 19 14 */ adde r0, r4, r3 -/* 8024BFD0 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 8024BFD4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8024BFD8 83 C1 00 08 */ lwz r30, 8(r1) -/* 8024BFDC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8024BFE0 7C 08 03 A6 */ mtlr r0 -/* 8024BFE4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024BFE8 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_flow/query045__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s b/asm/d/msg/d_msg_flow/query045__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s deleted file mode 100644 index 5baa0870ee..0000000000 --- a/asm/d/msg/d_msg_flow/query045__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s +++ /dev/null @@ -1,41 +0,0 @@ -lbl_8024C18C: -/* 8024C18C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8024C190 7C 08 02 A6 */ mflr r0 -/* 8024C194 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024C198 4B DE 22 91 */ bl dComIfGs_checkGetInsectNum__Fv -/* 8024C19C 38 80 00 00 */ li r4, 0 -/* 8024C1A0 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8024C1A4 40 82 00 0C */ bne lbl_8024C1B0 -/* 8024C1A8 38 80 00 00 */ li r4, 0 -/* 8024C1AC 48 00 00 58 */ b lbl_8024C204 -lbl_8024C1B0: -/* 8024C1B0 28 00 00 01 */ cmplwi r0, 1 -/* 8024C1B4 41 80 00 14 */ blt lbl_8024C1C8 -/* 8024C1B8 28 00 00 0B */ cmplwi r0, 0xb -/* 8024C1BC 41 81 00 0C */ bgt lbl_8024C1C8 -/* 8024C1C0 38 80 00 01 */ li r4, 1 -/* 8024C1C4 48 00 00 40 */ b lbl_8024C204 -lbl_8024C1C8: -/* 8024C1C8 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8024C1CC 28 00 00 0C */ cmplwi r0, 0xc -/* 8024C1D0 41 80 00 14 */ blt lbl_8024C1E4 -/* 8024C1D4 28 00 00 16 */ cmplwi r0, 0x16 -/* 8024C1D8 41 81 00 0C */ bgt lbl_8024C1E4 -/* 8024C1DC 38 80 00 02 */ li r4, 2 -/* 8024C1E0 48 00 00 24 */ b lbl_8024C204 -lbl_8024C1E4: -/* 8024C1E4 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8024C1E8 28 00 00 17 */ cmplwi r0, 0x17 -/* 8024C1EC 40 82 00 0C */ bne lbl_8024C1F8 -/* 8024C1F0 38 80 00 03 */ li r4, 3 -/* 8024C1F4 48 00 00 10 */ b lbl_8024C204 -lbl_8024C1F8: -/* 8024C1F8 28 00 00 18 */ cmplwi r0, 0x18 -/* 8024C1FC 40 82 00 08 */ bne lbl_8024C204 -/* 8024C200 38 80 00 04 */ li r4, 4 -lbl_8024C204: -/* 8024C204 54 83 06 3E */ clrlwi r3, r4, 0x18 -/* 8024C208 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8024C20C 7C 08 03 A6 */ mtlr r0 -/* 8024C210 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024C214 4E 80 00 20 */ blr diff --git a/asm/d/s/d_s_logo/dScnLogo_Create__FP11scene_class.s b/asm/d/s/d_s_logo/dScnLogo_Create__FP11scene_class.s deleted file mode 100644 index 574982c32c..0000000000 --- a/asm/d/s/d_s_logo/dScnLogo_Create__FP11scene_class.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_80258420: -/* 80258420 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80258424 7C 08 02 A6 */ mflr r0 -/* 80258428 90 01 00 14 */ stw r0, 0x14(r1) -/* 8025842C 28 03 00 00 */ cmplwi r3, 0 -/* 80258430 4B FF F6 B1 */ bl create__10dScnLogo_cFv -/* 80258434 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80258438 7C 08 03 A6 */ mtlr r0 -/* 8025843C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80258440 4E 80 00 20 */ blr diff --git a/asm/d/s/d_s_logo/phase_0__FP10dScnLogo_c.s b/asm/d/s/d_s_logo/phase_0__FP10dScnLogo_c.s deleted file mode 100644 index b30a43354d..0000000000 --- a/asm/d/s/d_s_logo/phase_0__FP10dScnLogo_c.s +++ /dev/null @@ -1,44 +0,0 @@ -lbl_80257910: -/* 80257910 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80257914 7C 08 02 A6 */ mflr r0 -/* 80257918 90 01 00 24 */ stw r0, 0x24(r1) -/* 8025791C 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80257920 7C 7F 1B 78 */ mr r31, r3 -/* 80257924 80 0D 80 84 */ lwz r0, g_blackColor(r13) -/* 80257928 90 01 00 0C */ stw r0, 0xc(r1) -/* 8025792C 90 01 00 08 */ stw r0, 8(r1) -/* 80257930 80 6D 86 48 */ lwz r3, mFader__13mDoGph_gInf_c(r13) -/* 80257934 88 01 00 08 */ lbz r0, 8(r1) -/* 80257938 98 03 00 0C */ stb r0, 0xc(r3) -/* 8025793C 88 01 00 09 */ lbz r0, 9(r1) -/* 80257940 98 03 00 0D */ stb r0, 0xd(r3) -/* 80257944 88 01 00 0A */ lbz r0, 0xa(r1) -/* 80257948 98 03 00 0E */ stb r0, 0xe(r3) -/* 8025794C 88 01 00 0B */ lbz r0, 0xb(r1) -/* 80257950 98 03 00 0F */ stb r0, 0xf(r3) -/* 80257954 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80257958 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8025795C 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80257960 4B DD 50 79 */ bl createParticle__14dComIfG_play_cFv -/* 80257964 4B DB 73 ED */ bl mDoExt_getGameHeap__Fv -/* 80257968 3C 80 00 34 */ lis r4, 0x34 -/* 8025796C 38 A0 FF F0 */ li r5, -16 -/* 80257970 48 07 6B 65 */ bl alloc__7JKRHeapFUli -/* 80257974 90 7F 02 1C */ stw r3, 0x21c(r31) -/* 80257978 80 7F 02 1C */ lwz r3, 0x21c(r31) -/* 8025797C 3C 80 00 34 */ lis r4, 0x34 -/* 80257980 38 A0 00 00 */ li r5, 0 -/* 80257984 38 C0 00 00 */ li r6, 0 -/* 80257988 48 07 75 79 */ bl create__10JKRExpHeapFPvUlP7JKRHeapb -/* 8025798C 90 7F 01 D0 */ stw r3, 0x1d0(r31) -/* 80257990 3C 60 00 13 */ lis r3, 0x13 -/* 80257994 80 9F 01 D0 */ lwz r4, 0x1d0(r31) -/* 80257998 38 A0 00 00 */ li r5, 0 -/* 8025799C 48 07 74 91 */ bl create__10JKRExpHeapFUlP7JKRHeapb -/* 802579A0 90 7F 01 D4 */ stw r3, 0x1d4(r31) -/* 802579A4 38 60 00 02 */ li r3, 2 -/* 802579A8 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 802579AC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802579B0 7C 08 03 A6 */ mtlr r0 -/* 802579B4 38 21 00 20 */ addi r1, r1, 0x20 -/* 802579B8 4E 80 00 20 */ blr diff --git a/asm/d/s/d_s_name/FileSelectClose__10dScnName_cFv.s b/asm/d/s/d_s_name/FileSelectClose__10dScnName_cFv.s deleted file mode 100644 index 6cbea6c72e..0000000000 --- a/asm/d/s/d_s_name/FileSelectClose__10dScnName_cFv.s +++ /dev/null @@ -1,48 +0,0 @@ -lbl_80258F20: -/* 80258F20 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80258F24 7C 08 02 A6 */ mflr r0 -/* 80258F28 90 01 00 24 */ stw r0, 0x24(r1) -/* 80258F2C 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80258F30 7C 7F 1B 78 */ mr r31, r3 -/* 80258F34 88 63 04 1E */ lbz r3, 0x41e(r3) -/* 80258F38 38 03 FF FF */ addi r0, r3, -1 -/* 80258F3C 98 1F 04 1E */ stb r0, 0x41e(r31) -/* 80258F40 88 1F 04 1E */ lbz r0, 0x41e(r31) -/* 80258F44 28 00 00 00 */ cmplwi r0, 0 -/* 80258F48 40 82 00 78 */ bne lbl_80258FC0 -/* 80258F4C 38 00 00 03 */ li r0, 3 -/* 80258F50 98 1F 04 1D */ stb r0, 0x41d(r31) -/* 80258F54 38 00 00 0F */ li r0, 0xf -/* 80258F58 98 1F 04 1E */ stb r0, 0x41e(r31) -/* 80258F5C 38 00 00 01 */ li r0, 1 -/* 80258F60 98 1F 04 1C */ stb r0, 0x41c(r31) -/* 80258F64 80 0D 80 84 */ lwz r0, g_blackColor(r13) -/* 80258F68 90 01 00 0C */ stw r0, 0xc(r1) -/* 80258F6C 90 01 00 08 */ stw r0, 8(r1) -/* 80258F70 80 6D 86 48 */ lwz r3, mFader__13mDoGph_gInf_c(r13) -/* 80258F74 88 01 00 08 */ lbz r0, 8(r1) -/* 80258F78 98 03 00 0C */ stb r0, 0xc(r3) -/* 80258F7C 88 01 00 09 */ lbz r0, 9(r1) -/* 80258F80 98 03 00 0D */ stb r0, 0xd(r3) -/* 80258F84 88 01 00 0A */ lbz r0, 0xa(r1) -/* 80258F88 98 03 00 0E */ stb r0, 0xe(r3) -/* 80258F8C 88 01 00 0B */ lbz r0, 0xb(r1) -/* 80258F90 98 03 00 0F */ stb r0, 0xf(r3) -/* 80258F94 80 6D 8C 40 */ lwz r3, sManager__10JFWDisplay(r13) -/* 80258F98 80 63 00 04 */ lwz r3, 4(r3) -/* 80258F9C 28 03 00 00 */ cmplwi r3, 0 -/* 80258FA0 41 82 00 18 */ beq lbl_80258FB8 -/* 80258FA4 38 80 00 0F */ li r4, 0xf -/* 80258FA8 81 83 00 00 */ lwz r12, 0(r3) -/* 80258FAC 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 80258FB0 7D 89 03 A6 */ mtctr r12 -/* 80258FB4 4E 80 04 21 */ bctrl -lbl_80258FB8: -/* 80258FB8 38 00 00 00 */ li r0, 0 -/* 80258FBC 98 1F 04 20 */ stb r0, 0x420(r31) -lbl_80258FC0: -/* 80258FC0 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80258FC4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80258FC8 7C 08 03 A6 */ mtlr r0 -/* 80258FCC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80258FD0 4E 80 00 20 */ blr diff --git a/asm/d/s/d_s_name/FileSelectMainNormal__10dScnName_cFv.s b/asm/d/s/d_s_name/FileSelectMainNormal__10dScnName_cFv.s deleted file mode 100644 index d5ce69d591..0000000000 --- a/asm/d/s/d_s_name/FileSelectMainNormal__10dScnName_cFv.s +++ /dev/null @@ -1,46 +0,0 @@ -lbl_80258E78: -/* 80258E78 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80258E7C 7C 08 02 A6 */ mflr r0 -/* 80258E80 90 01 00 24 */ stw r0, 0x24(r1) -/* 80258E84 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80258E88 7C 7F 1B 78 */ mr r31, r3 -/* 80258E8C 80 63 04 14 */ lwz r3, 0x414(r3) -/* 80258E90 88 03 02 70 */ lbz r0, 0x270(r3) -/* 80258E94 2C 00 00 01 */ cmpwi r0, 1 -/* 80258E98 41 82 00 08 */ beq lbl_80258EA0 -/* 80258E9C 48 00 00 70 */ b lbl_80258F0C -lbl_80258EA0: -/* 80258EA0 38 00 00 0F */ li r0, 0xf -/* 80258EA4 98 1F 04 1E */ stb r0, 0x41e(r31) -/* 80258EA8 80 0D 80 84 */ lwz r0, g_blackColor(r13) -/* 80258EAC 90 01 00 0C */ stw r0, 0xc(r1) -/* 80258EB0 90 01 00 08 */ stw r0, 8(r1) -/* 80258EB4 80 6D 86 48 */ lwz r3, mFader__13mDoGph_gInf_c(r13) -/* 80258EB8 88 01 00 08 */ lbz r0, 8(r1) -/* 80258EBC 98 03 00 0C */ stb r0, 0xc(r3) -/* 80258EC0 88 01 00 09 */ lbz r0, 9(r1) -/* 80258EC4 98 03 00 0D */ stb r0, 0xd(r3) -/* 80258EC8 88 01 00 0A */ lbz r0, 0xa(r1) -/* 80258ECC 98 03 00 0E */ stb r0, 0xe(r3) -/* 80258ED0 88 01 00 0B */ lbz r0, 0xb(r1) -/* 80258ED4 98 03 00 0F */ stb r0, 0xf(r3) -/* 80258ED8 80 6D 8C 40 */ lwz r3, sManager__10JFWDisplay(r13) -/* 80258EDC 80 63 00 04 */ lwz r3, 4(r3) -/* 80258EE0 28 03 00 00 */ cmplwi r3, 0 -/* 80258EE4 41 82 00 18 */ beq lbl_80258EFC -/* 80258EE8 38 80 00 0F */ li r4, 0xf -/* 80258EEC 81 83 00 00 */ lwz r12, 0(r3) -/* 80258EF0 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 80258EF4 7D 89 03 A6 */ mtctr r12 -/* 80258EF8 4E 80 04 21 */ bctrl -lbl_80258EFC: -/* 80258EFC 38 00 00 02 */ li r0, 2 -/* 80258F00 98 1F 04 1D */ stb r0, 0x41d(r31) -/* 80258F04 38 00 00 01 */ li r0, 1 -/* 80258F08 98 1F 04 20 */ stb r0, 0x420(r31) -lbl_80258F0C: -/* 80258F0C 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80258F10 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80258F14 7C 08 03 A6 */ mtlr r0 -/* 80258F18 38 21 00 20 */ addi r1, r1, 0x20 -/* 80258F1C 4E 80 00 20 */ blr diff --git a/asm/d/s/d_s_name/changeGameScene__10dScnName_cFv.s b/asm/d/s/d_s_name/changeGameScene__10dScnName_cFv.s deleted file mode 100644 index ab36a9279b..0000000000 --- a/asm/d/s/d_s_name/changeGameScene__10dScnName_cFv.s +++ /dev/null @@ -1,53 +0,0 @@ -lbl_802590F8: -/* 802590F8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802590FC 7C 08 02 A6 */ mflr r0 -/* 80259100 90 01 00 14 */ stw r0, 0x14(r1) -/* 80259104 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80259108 7C 7F 1B 78 */ mr r31, r3 -/* 8025910C 80 6D 86 F8 */ lwz r3, mResetData__6mDoRst(r13) -/* 80259110 80 03 00 00 */ lwz r0, 0(r3) -/* 80259114 2C 00 00 00 */ cmpwi r0, 0 -/* 80259118 40 82 00 94 */ bne lbl_802591AC -/* 8025911C 4B DC 54 3D */ bl fopOvlpM_IsPeek__Fv -/* 80259120 2C 03 00 00 */ cmpwi r3, 0 -/* 80259124 40 82 00 88 */ bne lbl_802591AC -/* 80259128 4B DD 58 4D */ bl dComIfGs_gameStart__Fv -/* 8025912C 7F E3 FB 78 */ mr r3, r31 -/* 80259130 88 1F 04 1F */ lbz r0, 0x41f(r31) -/* 80259134 28 00 00 00 */ cmplwi r0, 0 -/* 80259138 38 00 00 0B */ li r0, 0xb -/* 8025913C 7C 04 07 34 */ extsh r4, r0 -/* 80259140 38 A0 00 00 */ li r5, 0 -/* 80259144 38 C0 00 05 */ li r6, 5 -/* 80259148 4B DC 5B 99 */ bl fopScnM_ChangeReq__FP11scene_classssUs -/* 8025914C 38 00 00 00 */ li r0, 0 -/* 80259150 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80259154 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80259158 98 03 4E 1C */ stb r0, 0x4e1c(r3) -/* 8025915C 80 7F 04 14 */ lwz r3, 0x414(r31) -/* 80259160 88 03 02 65 */ lbz r0, 0x265(r3) -/* 80259164 7C 63 02 14 */ add r3, r3, r0 -/* 80259168 88 03 02 58 */ lbz r0, 0x258(r3) -/* 8025916C 2C 00 00 00 */ cmpwi r0, 0 -/* 80259170 41 82 00 20 */ beq lbl_80259190 -/* 80259174 3C 60 80 3A */ lis r3, d_s_d_s_name__stringBase0@ha /* 0x8039A2A8@ha */ -/* 80259178 38 63 A2 A8 */ addi r3, r3, d_s_d_s_name__stringBase0@l /* 0x8039A2A8@l */ -/* 8025917C 38 63 00 15 */ addi r3, r3, 0x15 -/* 80259180 38 80 00 15 */ li r4, 0x15 -/* 80259184 38 A0 00 01 */ li r5, 1 -/* 80259188 38 C0 00 0D */ li r6, 0xd -/* 8025918C 4B DD 43 C9 */ bl dComIfGp_setNextStage__FPCcsScSc -lbl_80259190: -/* 80259190 4B F4 60 D5 */ bl dKy_clear_game_init__Fv -/* 80259194 38 00 FF FF */ li r0, -1 -/* 80259198 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8025919C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802591A0 98 03 09 78 */ stb r0, 0x978(r3) -/* 802591A4 38 00 00 00 */ li r0, 0 -/* 802591A8 90 03 0D C8 */ stw r0, 0xdc8(r3) -lbl_802591AC: -/* 802591AC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802591B0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802591B4 7C 08 03 A6 */ mtlr r0 -/* 802591B8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802591BC 4E 80 00 20 */ blr diff --git a/asm/d/s/d_s_name/create__10dScnName_cFv.s b/asm/d/s/d_s_name/create__10dScnName_cFv.s deleted file mode 100644 index a0e9b46fab..0000000000 --- a/asm/d/s/d_s_name/create__10dScnName_cFv.s +++ /dev/null @@ -1,168 +0,0 @@ -lbl_802588A0: -/* 802588A0 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 802588A4 7C 08 02 A6 */ mflr r0 -/* 802588A8 90 01 00 54 */ stw r0, 0x54(r1) -/* 802588AC DB E1 00 40 */ stfd f31, 0x40(r1) -/* 802588B0 F3 E1 00 48 */ psq_st f31, 72(r1), 0, 0 /* qr0 */ -/* 802588B4 DB C1 00 30 */ stfd f30, 0x30(r1) -/* 802588B8 F3 C1 00 38 */ psq_st f30, 56(r1), 0, 0 /* qr0 */ -/* 802588BC 39 61 00 30 */ addi r11, r1, 0x30 -/* 802588C0 48 10 99 19 */ bl _savegpr_28 -/* 802588C4 7C 7D 1B 78 */ mr r29, r3 -/* 802588C8 38 7D 01 C4 */ addi r3, r29, 0x1c4 -/* 802588CC 3C 80 80 3A */ lis r4, d_s_d_s_name__stringBase0@ha /* 0x8039A2A8@ha */ -/* 802588D0 38 84 A2 A8 */ addi r4, r4, d_s_d_s_name__stringBase0@l /* 0x8039A2A8@l */ -/* 802588D4 38 84 00 0D */ addi r4, r4, 0xd -/* 802588D8 4B FF FF A1 */ bl resLoad__FP30request_of_phase_process_classPc -/* 802588DC 7C 7E 1B 78 */ mr r30, r3 -/* 802588E0 2C 1E 00 04 */ cmpwi r30, 4 -/* 802588E4 40 82 02 1C */ bne lbl_80258B00 -/* 802588E8 4B DB 64 69 */ bl mDoExt_getGameHeap__Fv -/* 802588EC 7C 64 1B 78 */ mr r4, r3 -/* 802588F0 3C 60 00 18 */ lis r3, 0x18 -/* 802588F4 38 A0 00 00 */ li r5, 0 -/* 802588F8 48 07 65 35 */ bl create__10JKRExpHeapFUlP7JKRHeapb -/* 802588FC 90 7D 01 CC */ stw r3, 0x1cc(r29) -/* 80258900 80 7D 01 CC */ lwz r3, 0x1cc(r29) -/* 80258904 4B DB 68 C9 */ bl mDoExt_setCurrentHeap__FP7JKRHeap -/* 80258908 90 7D 01 D0 */ stw r3, 0x1d0(r29) -/* 8025890C 3C 60 80 3A */ lis r3, d_s_d_s_name__stringBase0@ha /* 0x8039A2A8@ha */ -/* 80258910 38 63 A2 A8 */ addi r3, r3, d_s_d_s_name__stringBase0@l /* 0x8039A2A8@l */ -/* 80258914 38 63 00 0D */ addi r3, r3, 0xd -/* 80258918 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8025891C 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80258920 3C 84 00 02 */ addis r4, r4, 2 -/* 80258924 38 A0 00 80 */ li r5, 0x80 -/* 80258928 38 84 C2 F8 */ addi r4, r4, -15624 -/* 8025892C 4B DE 38 B9 */ bl getResInfo__14dRes_control_cFPCcP11dRes_info_ci -/* 80258930 7C 7F 1B 78 */ mr r31, r3 -/* 80258934 38 60 23 7C */ li r3, 0x237c -/* 80258938 48 07 63 15 */ bl __nw__FUl -/* 8025893C 7C 60 1B 79 */ or. r0, r3, r3 -/* 80258940 41 82 00 10 */ beq lbl_80258950 -/* 80258944 80 9F 00 14 */ lwz r4, 0x14(r31) -/* 80258948 4B F2 AD 25 */ bl __ct__14dFile_select_cFP10JKRArchive -/* 8025894C 7C 60 1B 78 */ mr r0, r3 -lbl_80258950: -/* 80258950 90 1D 04 14 */ stw r0, 0x414(r29) -/* 80258954 80 7D 04 14 */ lwz r3, 0x414(r29) -/* 80258958 4B F2 BA 75 */ bl _create__14dFile_select_cFv -/* 8025895C A8 1D 00 08 */ lha r0, 8(r29) -/* 80258960 2C 00 00 0D */ cmpwi r0, 0xd -/* 80258964 40 82 00 1C */ bne lbl_80258980 -/* 80258968 38 00 00 00 */ li r0, 0 -/* 8025896C 80 7D 04 14 */ lwz r3, 0x414(r29) -/* 80258970 98 03 03 B0 */ stb r0, 0x3b0(r3) -/* 80258974 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80258978 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8025897C 98 03 0F 1A */ stb r0, 0xf1a(r3) -lbl_80258980: -/* 80258980 38 60 00 1C */ li r3, 0x1c -/* 80258984 48 07 62 C9 */ bl __nw__FUl -/* 80258988 7C 60 1B 79 */ or. r0, r3, r3 -/* 8025898C 41 82 00 10 */ beq lbl_8025899C -/* 80258990 80 9F 00 14 */ lwz r4, 0x14(r31) -/* 80258994 4B F3 A5 7D */ bl __ct__14dBrightCheck_cFP10JKRArchive -/* 80258998 7C 60 1B 78 */ mr r0, r3 -lbl_8025899C: -/* 8025899C 90 1D 04 18 */ stw r0, 0x418(r29) -/* 802589A0 38 00 00 00 */ li r0, 0 -/* 802589A4 98 1D 04 20 */ stb r0, 0x420(r29) -/* 802589A8 38 00 FF FF */ li r0, -1 -/* 802589AC 38 6D 8B 70 */ la r3, g_snHIO(r13) /* 804510F0-_SDA_BASE_ */ -/* 802589B0 98 03 00 04 */ stb r0, 4(r3) -/* 802589B4 80 7D 01 D0 */ lwz r3, 0x1d0(r29) -/* 802589B8 48 07 5A 81 */ bl becomeCurrentHeap__7JKRHeapFv -/* 802589BC 38 00 00 01 */ li r0, 1 -/* 802589C0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802589C4 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802589C8 98 1F 5D 44 */ stb r0, 0x5d44(r31) -/* 802589CC 80 8D 80 20 */ lwz r4, mRenderModeObj__15mDoMch_render_c(r13) -/* 802589D0 A0 04 00 06 */ lhz r0, 6(r4) -/* 802589D4 C8 22 B5 10 */ lfd f1, lit_3930(r2) -/* 802589D8 90 01 00 0C */ stw r0, 0xc(r1) -/* 802589DC 3C 60 43 30 */ lis r3, 0x4330 -/* 802589E0 90 61 00 08 */ stw r3, 8(r1) -/* 802589E4 C8 01 00 08 */ lfd f0, 8(r1) -/* 802589E8 EF C0 08 28 */ fsubs f30, f0, f1 -/* 802589EC A0 04 00 04 */ lhz r0, 4(r4) -/* 802589F0 90 01 00 14 */ stw r0, 0x14(r1) -/* 802589F4 90 61 00 10 */ stw r3, 0x10(r1) -/* 802589F8 C8 01 00 10 */ lfd f0, 0x10(r1) -/* 802589FC EF E0 08 28 */ fsubs f31, f0, f1 -/* 80258A00 3B 9F 5D 48 */ addi r28, r31, 0x5d48 -/* 80258A04 7F 83 E3 78 */ mr r3, r28 -/* 80258A08 C0 22 B4 F8 */ lfs f1, lit_3923(r2) -/* 80258A0C FC 40 08 90 */ fmr f2, f1 -/* 80258A10 FC 60 F8 90 */ fmr f3, f31 -/* 80258A14 FC 80 F0 90 */ fmr f4, f30 -/* 80258A18 FC A0 08 90 */ fmr f5, f1 -/* 80258A1C C0 C2 B4 FC */ lfs f6, lit_3924(r2) -/* 80258A20 4B DF 90 A1 */ bl setViewPort__14dDlst_window_cFffffff -/* 80258A24 7F 83 E3 78 */ mr r3, r28 -/* 80258A28 C0 22 B4 F8 */ lfs f1, lit_3923(r2) -/* 80258A2C FC 40 08 90 */ fmr f2, f1 -/* 80258A30 FC 60 F8 90 */ fmr f3, f31 -/* 80258A34 FC 80 F0 90 */ fmr f4, f30 -/* 80258A38 4B DF 90 A5 */ bl setScissor__14dDlst_window_cFffff -/* 80258A3C 38 80 00 00 */ li r4, 0 -/* 80258A40 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80258A44 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80258A48 98 83 5D 70 */ stb r4, 0x5d70(r3) -/* 80258A4C 38 00 00 02 */ li r0, 2 -/* 80258A50 98 03 5D 71 */ stb r0, 0x5d71(r3) -/* 80258A54 38 1D 01 D4 */ addi r0, r29, 0x1d4 -/* 80258A58 90 03 5D 74 */ stw r0, 0x5d74(r3) -/* 80258A5C C0 02 B4 FC */ lfs f0, lit_3924(r2) -/* 80258A60 D0 1D 02 9C */ stfs f0, 0x29c(r29) -/* 80258A64 C0 02 B5 00 */ lfs f0, lit_3925(r2) -/* 80258A68 D0 1D 02 A0 */ stfs f0, 0x2a0(r29) -/* 80258A6C C0 02 B5 04 */ lfs f0, lit_3926(r2) -/* 80258A70 D0 1D 02 A4 */ stfs f0, 0x2a4(r29) -/* 80258A74 C0 02 B5 08 */ lfs f0, lit_3927(r2) -/* 80258A78 D0 1D 02 A8 */ stfs f0, 0x2a8(r29) -/* 80258A7C C0 22 B4 F8 */ lfs f1, lit_3923(r2) -/* 80258A80 D0 3D 02 AC */ stfs f1, 0x2ac(r29) -/* 80258A84 D0 3D 02 B0 */ stfs f1, 0x2b0(r29) -/* 80258A88 C0 02 B5 0C */ lfs f0, lit_3928(r2) -/* 80258A8C D0 1D 02 B4 */ stfs f0, 0x2b4(r29) -/* 80258A90 D0 3D 02 B8 */ stfs f1, 0x2b8(r29) -/* 80258A94 D0 3D 02 BC */ stfs f1, 0x2bc(r29) -/* 80258A98 D0 3D 02 C0 */ stfs f1, 0x2c0(r29) -/* 80258A9C B0 9D 02 D0 */ sth r4, 0x2d0(r29) -/* 80258AA0 90 83 5D AC */ stw r4, 0x5dac(r3) -/* 80258AA4 93 83 61 A8 */ stw r28, 0x61a8(r3) -/* 80258AA8 93 83 61 AC */ stw r28, 0x61ac(r3) -/* 80258AAC 90 03 61 B0 */ stw r0, 0x61b0(r3) -/* 80258AB0 98 8D 86 67 */ stb r4, mBlureFlag__13mDoGph_gInf_c+0x3(r13) -/* 80258AB4 7F A3 EB 78 */ mr r3, r29 -/* 80258AB8 48 00 00 75 */ bl setView__10dScnName_cFv -/* 80258ABC 4B F4 D3 99 */ bl dKy_setLight_init__Fv -/* 80258AC0 38 6D 8B 70 */ la r3, g_snHIO(r13) /* 804510F0-_SDA_BASE_ */ -/* 80258AC4 88 03 00 05 */ lbz r0, 5(r3) -/* 80258AC8 98 1D 04 1E */ stb r0, 0x41e(r29) -/* 80258ACC 38 80 00 00 */ li r4, 0 -/* 80258AD0 98 9D 04 1C */ stb r4, 0x41c(r29) -/* 80258AD4 98 9D 04 1D */ stb r4, 0x41d(r29) -/* 80258AD8 80 AD 8C 40 */ lwz r5, sManager__10JFWDisplay(r13) -/* 80258ADC 3C 60 80 00 */ lis r3, 0x8000 /* 0x800000F8@ha */ -/* 80258AE0 80 03 00 F8 */ lwz r0, 0x00F8(r3) /* 0x800000F8@l */ -/* 80258AE4 54 03 F0 BE */ srwi r3, r0, 2 -/* 80258AE8 38 00 00 1E */ li r0, 0x1e -/* 80258AEC 7C 03 03 96 */ divwu r0, r3, r0 -/* 80258AF0 90 05 00 20 */ stw r0, 0x20(r5) -/* 80258AF4 B0 85 00 1C */ sth r4, 0x1c(r5) -/* 80258AF8 38 7F 5B D4 */ addi r3, r31, 0x5bd4 -/* 80258AFC 4B E1 74 09 */ bl Init__12dVibration_cFv -lbl_80258B00: -/* 80258B00 7F C3 F3 78 */ mr r3, r30 -/* 80258B04 E3 E1 00 48 */ psq_l f31, 72(r1), 0, 0 /* qr0 */ -/* 80258B08 CB E1 00 40 */ lfd f31, 0x40(r1) -/* 80258B0C E3 C1 00 38 */ psq_l f30, 56(r1), 0, 0 /* qr0 */ -/* 80258B10 CB C1 00 30 */ lfd f30, 0x30(r1) -/* 80258B14 39 61 00 30 */ addi r11, r1, 0x30 -/* 80258B18 48 10 97 0D */ bl _restgpr_28 -/* 80258B1C 80 01 00 54 */ lwz r0, 0x54(r1) -/* 80258B20 7C 08 03 A6 */ mtlr r0 -/* 80258B24 38 21 00 50 */ addi r1, r1, 0x50 -/* 80258B28 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save_HIO/__ct__22dSvBit_childOtherHIO_cFv.s b/asm/d/save/d_save_HIO/__ct__22dSvBit_childOtherHIO_cFv.s deleted file mode 100644 index 504cc0ef4c..0000000000 --- a/asm/d/save/d_save_HIO/__ct__22dSvBit_childOtherHIO_cFv.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_8025C13C: -/* 8025C13C 3C 80 80 3C */ lis r4, __vt__22dSvBit_childOtherHIO_c@ha /* 0x803C3300@ha */ -/* 8025C140 38 04 33 00 */ addi r0, r4, __vt__22dSvBit_childOtherHIO_c@l /* 0x803C3300@l */ -/* 8025C144 90 03 00 00 */ stw r0, 0(r3) -/* 8025C148 38 80 00 00 */ li r4, 0 -/* 8025C14C 98 83 00 05 */ stb r4, 5(r3) -/* 8025C150 98 83 00 06 */ stb r4, 6(r3) -/* 8025C154 38 C0 00 00 */ li r6, 0 -/* 8025C158 38 00 00 04 */ li r0, 4 -/* 8025C15C 7C 09 03 A6 */ mtctr r0 -lbl_8025C160: -/* 8025C160 7C A3 32 14 */ add r5, r3, r6 -/* 8025C164 98 85 00 07 */ stb r4, 7(r5) -/* 8025C168 98 85 00 0B */ stb r4, 0xb(r5) -/* 8025C16C 38 C6 00 01 */ addi r6, r6, 1 -/* 8025C170 42 00 FF F0 */ bdnz lbl_8025C160 -/* 8025C174 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save_HIO/__ct__23dSvBit_childItZoneHIO_cFv.s b/asm/d/save/d_save_HIO/__ct__23dSvBit_childItZoneHIO_cFv.s deleted file mode 100644 index 257fd46904..0000000000 --- a/asm/d/save/d_save_HIO/__ct__23dSvBit_childItZoneHIO_cFv.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_8025BEA8: -/* 8025BEA8 3C 80 80 3C */ lis r4, __vt__23dSvBit_childItZoneHIO_c@ha /* 0x803C333C@ha */ -/* 8025BEAC 38 04 33 3C */ addi r0, r4, __vt__23dSvBit_childItZoneHIO_c@l /* 0x803C333C@l */ -/* 8025BEB0 90 03 00 00 */ stw r0, 0(r3) -/* 8025BEB4 38 C0 00 00 */ li r6, 0 -/* 8025BEB8 38 80 00 00 */ li r4, 0 -/* 8025BEBC 38 00 00 20 */ li r0, 0x20 -/* 8025BEC0 7C 09 03 A6 */ mtctr r0 -lbl_8025BEC4: -/* 8025BEC4 7C A3 32 14 */ add r5, r3, r6 -/* 8025BEC8 98 85 00 05 */ stb r4, 5(r5) -/* 8025BECC 98 85 00 25 */ stb r4, 0x25(r5) -/* 8025BED0 38 C6 00 01 */ addi r6, r6, 1 -/* 8025BED4 42 00 FF F0 */ bdnz lbl_8025BEC4 -/* 8025BED8 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save_HIO/__ct__23dSvBit_childSwZoneHIO_cFv.s b/asm/d/save/d_save_HIO/__ct__23dSvBit_childSwZoneHIO_cFv.s deleted file mode 100644 index 06098cec51..0000000000 --- a/asm/d/save/d_save_HIO/__ct__23dSvBit_childSwZoneHIO_cFv.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_8025BCB0: -/* 8025BCB0 3C 80 80 3C */ lis r4, __vt__23dSvBit_childSwZoneHIO_c@ha /* 0x803C336C@ha */ -/* 8025BCB4 38 04 33 6C */ addi r0, r4, __vt__23dSvBit_childSwZoneHIO_c@l /* 0x803C336C@l */ -/* 8025BCB8 90 03 00 00 */ stw r0, 0(r3) -/* 8025BCBC 38 C0 00 00 */ li r6, 0 -/* 8025BCC0 38 80 00 00 */ li r4, 0 -/* 8025BCC4 38 00 00 20 */ li r0, 0x20 -/* 8025BCC8 7C 09 03 A6 */ mtctr r0 -lbl_8025BCCC: -/* 8025BCCC 7C A3 32 14 */ add r5, r3, r6 -/* 8025BCD0 98 85 00 05 */ stb r4, 5(r5) -/* 8025BCD4 98 85 00 25 */ stb r4, 0x25(r5) -/* 8025BCD8 38 C6 00 01 */ addi r6, r6, 1 -/* 8025BCDC 42 00 FF F0 */ bdnz lbl_8025BCCC -/* 8025BCE0 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save_HIO/__ct__25dSvBit_childDarknessHIO_cFv.s b/asm/d/save/d_save_HIO/__ct__25dSvBit_childDarknessHIO_cFv.s deleted file mode 100644 index e9d90dac70..0000000000 --- a/asm/d/save/d_save_HIO/__ct__25dSvBit_childDarknessHIO_cFv.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_8025C004: -/* 8025C004 3C 80 80 3C */ lis r4, __vt__25dSvBit_childDarknessHIO_c@ha /* 0x803C3318@ha */ -/* 8025C008 38 04 33 18 */ addi r0, r4, __vt__25dSvBit_childDarknessHIO_c@l /* 0x803C3318@l */ -/* 8025C00C 90 03 00 00 */ stw r0, 0(r3) -/* 8025C010 38 C0 00 00 */ li r6, 0 -/* 8025C014 38 80 00 00 */ li r4, 0 -/* 8025C018 38 00 00 06 */ li r0, 6 -/* 8025C01C 7C 09 03 A6 */ mtctr r0 -lbl_8025C020: -/* 8025C020 7C A3 32 14 */ add r5, r3, r6 -/* 8025C024 98 85 00 05 */ stb r4, 5(r5) -/* 8025C028 98 85 00 0B */ stb r4, 0xb(r5) -/* 8025C02C 38 C6 00 01 */ addi r6, r6, 1 -/* 8025C030 42 00 FF F0 */ bdnz lbl_8025C020 -/* 8025C034 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save_HIO/__ct__26dSvBit_childItDungeonHIO_cFv.s b/asm/d/save/d_save_HIO/__ct__26dSvBit_childItDungeonHIO_cFv.s deleted file mode 100644 index 4aa5bb1ff3..0000000000 --- a/asm/d/save/d_save_HIO/__ct__26dSvBit_childItDungeonHIO_cFv.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_8025BE0C: -/* 8025BE0C 3C 80 80 3C */ lis r4, __vt__26dSvBit_childItDungeonHIO_c@ha /* 0x803C3348@ha */ -/* 8025BE10 38 04 33 48 */ addi r0, r4, __vt__26dSvBit_childItDungeonHIO_c@l /* 0x803C3348@l */ -/* 8025BE14 90 03 00 00 */ stw r0, 0(r3) -/* 8025BE18 38 C0 00 00 */ li r6, 0 -/* 8025BE1C 38 80 00 00 */ li r4, 0 -/* 8025BE20 38 00 00 80 */ li r0, 0x80 -/* 8025BE24 7C 09 03 A6 */ mtctr r0 -lbl_8025BE28: -/* 8025BE28 7C A3 32 14 */ add r5, r3, r6 -/* 8025BE2C 98 85 00 05 */ stb r4, 5(r5) -/* 8025BE30 98 85 00 85 */ stb r4, 0x85(r5) -/* 8025BE34 38 C6 00 01 */ addi r6, r6, 1 -/* 8025BE38 42 00 FF F0 */ bdnz lbl_8025BE28 -/* 8025BE3C 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save_HIO/__ct__26dSvBit_childItOneZoneHIO_cFv.s b/asm/d/save/d_save_HIO/__ct__26dSvBit_childItOneZoneHIO_cFv.s deleted file mode 100644 index 1556403eb0..0000000000 --- a/asm/d/save/d_save_HIO/__ct__26dSvBit_childItOneZoneHIO_cFv.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_8025BF08: -/* 8025BF08 3C 80 80 3C */ lis r4, __vt__26dSvBit_childItOneZoneHIO_c@ha /* 0x803C3330@ha */ -/* 8025BF0C 38 04 33 30 */ addi r0, r4, __vt__26dSvBit_childItOneZoneHIO_c@l /* 0x803C3330@l */ -/* 8025BF10 90 03 00 00 */ stw r0, 0(r3) -/* 8025BF14 38 C0 00 00 */ li r6, 0 -/* 8025BF18 38 80 00 00 */ li r4, 0 -/* 8025BF1C 38 00 00 10 */ li r0, 0x10 -/* 8025BF20 7C 09 03 A6 */ mtctr r0 -lbl_8025BF24: -/* 8025BF24 7C A3 32 14 */ add r5, r3, r6 -/* 8025BF28 98 85 00 05 */ stb r4, 5(r5) -/* 8025BF2C 98 85 00 15 */ stb r4, 0x15(r5) -/* 8025BF30 38 C6 00 01 */ addi r6, r6, 1 -/* 8025BF34 42 00 FF F0 */ bdnz lbl_8025BF24 -/* 8025BF38 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save_HIO/__ct__26dSvBit_childSwDungeonHIO_cFv.s b/asm/d/save/d_save_HIO/__ct__26dSvBit_childSwDungeonHIO_cFv.s deleted file mode 100644 index 36c86f0c2d..0000000000 --- a/asm/d/save/d_save_HIO/__ct__26dSvBit_childSwDungeonHIO_cFv.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_8025BC14: -/* 8025BC14 3C 80 80 3C */ lis r4, __vt__26dSvBit_childSwDungeonHIO_c@ha /* 0x803C3378@ha */ -/* 8025BC18 38 04 33 78 */ addi r0, r4, __vt__26dSvBit_childSwDungeonHIO_c@l /* 0x803C3378@l */ -/* 8025BC1C 90 03 00 00 */ stw r0, 0(r3) -/* 8025BC20 38 C0 00 00 */ li r6, 0 -/* 8025BC24 38 80 00 00 */ li r4, 0 -/* 8025BC28 38 00 00 40 */ li r0, 0x40 -/* 8025BC2C 7C 09 03 A6 */ mtctr r0 -lbl_8025BC30: -/* 8025BC30 7C A3 32 14 */ add r5, r3, r6 -/* 8025BC34 98 85 00 05 */ stb r4, 5(r5) -/* 8025BC38 98 85 00 45 */ stb r4, 0x45(r5) -/* 8025BC3C 38 C6 00 01 */ addi r6, r6, 1 -/* 8025BC40 42 00 FF F0 */ bdnz lbl_8025BC30 -/* 8025BC44 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save_HIO/__ct__26dSvBit_childSwOneZoneHIO_cFv.s b/asm/d/save/d_save_HIO/__ct__26dSvBit_childSwOneZoneHIO_cFv.s deleted file mode 100644 index 2d379c7e8b..0000000000 --- a/asm/d/save/d_save_HIO/__ct__26dSvBit_childSwOneZoneHIO_cFv.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_8025BD10: -/* 8025BD10 3C 80 80 3C */ lis r4, __vt__26dSvBit_childSwOneZoneHIO_c@ha /* 0x803C3360@ha */ -/* 8025BD14 38 04 33 60 */ addi r0, r4, __vt__26dSvBit_childSwOneZoneHIO_c@l /* 0x803C3360@l */ -/* 8025BD18 90 03 00 00 */ stw r0, 0(r3) -/* 8025BD1C 38 C0 00 00 */ li r6, 0 -/* 8025BD20 38 80 00 00 */ li r4, 0 -/* 8025BD24 38 00 00 10 */ li r0, 0x10 -/* 8025BD28 7C 09 03 A6 */ mtctr r0 -lbl_8025BD2C: -/* 8025BD2C 7C A3 32 14 */ add r5, r3, r6 -/* 8025BD30 98 85 00 05 */ stb r4, 5(r5) -/* 8025BD34 98 85 00 15 */ stb r4, 0x15(r5) -/* 8025BD38 38 C6 00 01 */ addi r6, r6, 1 -/* 8025BD3C 42 00 FF F0 */ bdnz lbl_8025BD2C -/* 8025BD40 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save_HIO/__ct__26dSvBit_childTransformHIO_cFv.s b/asm/d/save/d_save_HIO/__ct__26dSvBit_childTransformHIO_cFv.s deleted file mode 100644 index c4ed8498ca..0000000000 --- a/asm/d/save/d_save_HIO/__ct__26dSvBit_childTransformHIO_cFv.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_8025C0A0: -/* 8025C0A0 3C 80 80 3C */ lis r4, __vt__26dSvBit_childTransformHIO_c@ha /* 0x803C330C@ha */ -/* 8025C0A4 38 04 33 0C */ addi r0, r4, __vt__26dSvBit_childTransformHIO_c@l /* 0x803C330C@l */ -/* 8025C0A8 90 03 00 00 */ stw r0, 0(r3) -/* 8025C0AC 38 C0 00 00 */ li r6, 0 -/* 8025C0B0 38 80 00 00 */ li r4, 0 -/* 8025C0B4 38 00 00 04 */ li r0, 4 -/* 8025C0B8 7C 09 03 A6 */ mtctr r0 -lbl_8025C0BC: -/* 8025C0BC 7C A3 32 14 */ add r5, r3, r6 -/* 8025C0C0 98 85 00 05 */ stb r4, 5(r5) -/* 8025C0C4 98 85 00 09 */ stb r4, 9(r5) -/* 8025C0C8 38 C6 00 01 */ addi r6, r6, 1 -/* 8025C0CC 42 00 FF F0 */ bdnz lbl_8025C0BC -/* 8025C0D0 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save_HIO/__ct__29dSvBit_childItPerfectionHIO_cFv.s b/asm/d/save/d_save_HIO/__ct__29dSvBit_childItPerfectionHIO_cFv.s deleted file mode 100644 index f7e2430698..0000000000 --- a/asm/d/save/d_save_HIO/__ct__29dSvBit_childItPerfectionHIO_cFv.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_8025BD70: -/* 8025BD70 3C 80 80 3C */ lis r4, __vt__29dSvBit_childItPerfectionHIO_c@ha /* 0x803C3354@ha */ -/* 8025BD74 38 04 33 54 */ addi r0, r4, __vt__29dSvBit_childItPerfectionHIO_c@l /* 0x803C3354@l */ -/* 8025BD78 90 03 00 00 */ stw r0, 0(r3) -/* 8025BD7C 38 C0 00 00 */ li r6, 0 -/* 8025BD80 38 80 00 00 */ li r4, 0 -/* 8025BD84 38 00 00 20 */ li r0, 0x20 -/* 8025BD88 7C 09 03 A6 */ mtctr r0 -lbl_8025BD8C: -/* 8025BD8C 7C A3 32 14 */ add r5, r3, r6 -/* 8025BD90 98 85 00 05 */ stb r4, 5(r5) -/* 8025BD94 98 85 00 25 */ stb r4, 0x25(r5) -/* 8025BD98 38 C6 00 01 */ addi r6, r6, 1 -/* 8025BD9C 42 00 FF F0 */ bdnz lbl_8025BD8C -/* 8025BDA0 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save_HIO/__dt__12dSvBit_HIO_cFv.s b/asm/d/save/d_save_HIO/__dt__12dSvBit_HIO_cFv.s deleted file mode 100644 index f42d821375..0000000000 --- a/asm/d/save/d_save_HIO/__dt__12dSvBit_HIO_cFv.s +++ /dev/null @@ -1,108 +0,0 @@ -lbl_8025C6FC: -/* 8025C6FC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8025C700 7C 08 02 A6 */ mflr r0 -/* 8025C704 90 01 00 14 */ stw r0, 0x14(r1) -/* 8025C708 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8025C70C 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8025C710 41 82 01 4C */ beq lbl_8025C85C -/* 8025C714 3C 60 80 3C */ lis r3, __vt__12dSvBit_HIO_c@ha /* 0x803C33B4@ha */ -/* 8025C718 38 03 33 B4 */ addi r0, r3, __vt__12dSvBit_HIO_c@l /* 0x803C33B4@l */ -/* 8025C71C 90 1F 00 00 */ stw r0, 0(r31) -/* 8025C720 34 1F 04 8C */ addic. r0, r31, 0x48c -/* 8025C724 41 82 00 10 */ beq lbl_8025C734 -/* 8025C728 3C 60 80 3C */ lis r3, __vt__22dSvBit_childOtherHIO_c@ha /* 0x803C3300@ha */ -/* 8025C72C 38 03 33 00 */ addi r0, r3, __vt__22dSvBit_childOtherHIO_c@l /* 0x803C3300@l */ -/* 8025C730 90 1F 04 8C */ stw r0, 0x48c(r31) -lbl_8025C734: -/* 8025C734 34 1F 04 7C */ addic. r0, r31, 0x47c -/* 8025C738 41 82 00 10 */ beq lbl_8025C748 -/* 8025C73C 3C 60 80 3C */ lis r3, __vt__26dSvBit_childTransformHIO_c@ha /* 0x803C330C@ha */ -/* 8025C740 38 03 33 0C */ addi r0, r3, __vt__26dSvBit_childTransformHIO_c@l /* 0x803C330C@l */ -/* 8025C744 90 1F 04 7C */ stw r0, 0x47c(r31) -lbl_8025C748: -/* 8025C748 34 1F 04 68 */ addic. r0, r31, 0x468 -/* 8025C74C 41 82 00 10 */ beq lbl_8025C75C -/* 8025C750 3C 60 80 3C */ lis r3, __vt__25dSvBit_childDarknessHIO_c@ha /* 0x803C3318@ha */ -/* 8025C754 38 03 33 18 */ addi r0, r3, __vt__25dSvBit_childDarknessHIO_c@l /* 0x803C3318@l */ -/* 8025C758 90 1F 04 68 */ stw r0, 0x468(r31) -lbl_8025C75C: -/* 8025C75C 34 1F 03 D8 */ addic. r0, r31, 0x3d8 -/* 8025C760 41 82 00 24 */ beq lbl_8025C784 -/* 8025C764 3C 60 80 3C */ lis r3, __vt__25dSvBit_childTreasureHIO_c@ha /* 0x803C3390@ha */ -/* 8025C768 38 03 33 90 */ addi r0, r3, __vt__25dSvBit_childTreasureHIO_c@l /* 0x803C3390@l */ -/* 8025C76C 90 1F 03 D8 */ stw r0, 0x3d8(r31) -/* 8025C770 34 1F 03 E0 */ addic. r0, r31, 0x3e0 -/* 8025C774 41 82 00 10 */ beq lbl_8025C784 -/* 8025C778 3C 60 80 3C */ lis r3, __vt__29dSvBit_childTbPerfectionHIO_c@ha /* 0x803C3324@ha */ -/* 8025C77C 38 03 33 24 */ addi r0, r3, __vt__29dSvBit_childTbPerfectionHIO_c@l /* 0x803C3324@l */ -/* 8025C780 90 1F 03 E0 */ stw r0, 0x3e0(r31) -lbl_8025C784: -/* 8025C784 34 1F 02 10 */ addic. r0, r31, 0x210 -/* 8025C788 41 82 00 60 */ beq lbl_8025C7E8 -/* 8025C78C 3C 60 80 3C */ lis r3, __vt__21dSvBit_childItemHIO_c@ha /* 0x803C339C@ha */ -/* 8025C790 38 03 33 9C */ addi r0, r3, __vt__21dSvBit_childItemHIO_c@l /* 0x803C339C@l */ -/* 8025C794 90 1F 02 10 */ stw r0, 0x210(r31) -/* 8025C798 34 1F 03 B0 */ addic. r0, r31, 0x3b0 -/* 8025C79C 41 82 00 10 */ beq lbl_8025C7AC -/* 8025C7A0 3C 60 80 3C */ lis r3, __vt__26dSvBit_childItOneZoneHIO_c@ha /* 0x803C3330@ha */ -/* 8025C7A4 38 03 33 30 */ addi r0, r3, __vt__26dSvBit_childItOneZoneHIO_c@l /* 0x803C3330@l */ -/* 8025C7A8 90 1F 03 B0 */ stw r0, 0x3b0(r31) -lbl_8025C7AC: -/* 8025C7AC 34 1F 03 68 */ addic. r0, r31, 0x368 -/* 8025C7B0 41 82 00 10 */ beq lbl_8025C7C0 -/* 8025C7B4 3C 60 80 3C */ lis r3, __vt__23dSvBit_childItZoneHIO_c@ha /* 0x803C333C@ha */ -/* 8025C7B8 38 03 33 3C */ addi r0, r3, __vt__23dSvBit_childItZoneHIO_c@l /* 0x803C333C@l */ -/* 8025C7BC 90 1F 03 68 */ stw r0, 0x368(r31) -lbl_8025C7C0: -/* 8025C7C0 34 1F 02 60 */ addic. r0, r31, 0x260 -/* 8025C7C4 41 82 00 10 */ beq lbl_8025C7D4 -/* 8025C7C8 3C 60 80 3C */ lis r3, __vt__26dSvBit_childItDungeonHIO_c@ha /* 0x803C3348@ha */ -/* 8025C7CC 38 03 33 48 */ addi r0, r3, __vt__26dSvBit_childItDungeonHIO_c@l /* 0x803C3348@l */ -/* 8025C7D0 90 1F 02 60 */ stw r0, 0x260(r31) -lbl_8025C7D4: -/* 8025C7D4 34 1F 02 18 */ addic. r0, r31, 0x218 -/* 8025C7D8 41 82 00 10 */ beq lbl_8025C7E8 -/* 8025C7DC 3C 60 80 3C */ lis r3, __vt__29dSvBit_childItPerfectionHIO_c@ha /* 0x803C3354@ha */ -/* 8025C7E0 38 03 33 54 */ addi r0, r3, __vt__29dSvBit_childItPerfectionHIO_c@l /* 0x803C3354@l */ -/* 8025C7E4 90 1F 02 18 */ stw r0, 0x218(r31) -lbl_8025C7E8: -/* 8025C7E8 34 1F 00 08 */ addic. r0, r31, 8 -/* 8025C7EC 41 82 00 60 */ beq lbl_8025C84C -/* 8025C7F0 3C 60 80 3C */ lis r3, __vt__23dSvBit_childSwitchHIO_c@ha /* 0x803C33A8@ha */ -/* 8025C7F4 38 03 33 A8 */ addi r0, r3, __vt__23dSvBit_childSwitchHIO_c@l /* 0x803C33A8@l */ -/* 8025C7F8 90 1F 00 08 */ stw r0, 8(r31) -/* 8025C7FC 34 1F 01 E8 */ addic. r0, r31, 0x1e8 -/* 8025C800 41 82 00 10 */ beq lbl_8025C810 -/* 8025C804 3C 60 80 3C */ lis r3, __vt__26dSvBit_childSwOneZoneHIO_c@ha /* 0x803C3360@ha */ -/* 8025C808 38 03 33 60 */ addi r0, r3, __vt__26dSvBit_childSwOneZoneHIO_c@l /* 0x803C3360@l */ -/* 8025C80C 90 1F 01 E8 */ stw r0, 0x1e8(r31) -lbl_8025C810: -/* 8025C810 34 1F 01 A0 */ addic. r0, r31, 0x1a0 -/* 8025C814 41 82 00 10 */ beq lbl_8025C824 -/* 8025C818 3C 60 80 3C */ lis r3, __vt__23dSvBit_childSwZoneHIO_c@ha /* 0x803C336C@ha */ -/* 8025C81C 38 03 33 6C */ addi r0, r3, __vt__23dSvBit_childSwZoneHIO_c@l /* 0x803C336C@l */ -/* 8025C820 90 1F 01 A0 */ stw r0, 0x1a0(r31) -lbl_8025C824: -/* 8025C824 34 1F 01 18 */ addic. r0, r31, 0x118 -/* 8025C828 41 82 00 10 */ beq lbl_8025C838 -/* 8025C82C 3C 60 80 3C */ lis r3, __vt__26dSvBit_childSwDungeonHIO_c@ha /* 0x803C3378@ha */ -/* 8025C830 38 03 33 78 */ addi r0, r3, __vt__26dSvBit_childSwDungeonHIO_c@l /* 0x803C3378@l */ -/* 8025C834 90 1F 01 18 */ stw r0, 0x118(r31) -lbl_8025C838: -/* 8025C838 34 1F 00 10 */ addic. r0, r31, 0x10 -/* 8025C83C 41 82 00 10 */ beq lbl_8025C84C -/* 8025C840 3C 60 80 3C */ lis r3, __vt__29dSvBit_childSwPerfectionHIO_c@ha /* 0x803C3384@ha */ -/* 8025C844 38 03 33 84 */ addi r0, r3, __vt__29dSvBit_childSwPerfectionHIO_c@l /* 0x803C3384@l */ -/* 8025C848 90 1F 00 10 */ stw r0, 0x10(r31) -lbl_8025C84C: -/* 8025C84C 7C 80 07 35 */ extsh. r0, r4 -/* 8025C850 40 81 00 0C */ ble lbl_8025C85C -/* 8025C854 7F E3 FB 78 */ mr r3, r31 -/* 8025C858 48 07 24 E5 */ bl __dl__FPv -lbl_8025C85C: -/* 8025C85C 7F E3 FB 78 */ mr r3, r31 -/* 8025C860 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8025C864 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8025C868 7C 08 03 A6 */ mtlr r0 -/* 8025C86C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8025C870 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save_HIO/__dt__21dSvBit_childItemHIO_cFv.s b/asm/d/save/d_save_HIO/__dt__21dSvBit_childItemHIO_cFv.s deleted file mode 100644 index 5804262d1a..0000000000 --- a/asm/d/save/d_save_HIO/__dt__21dSvBit_childItemHIO_cFv.s +++ /dev/null @@ -1,45 +0,0 @@ -lbl_8025C8D4: -/* 8025C8D4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8025C8D8 7C 08 02 A6 */ mflr r0 -/* 8025C8DC 90 01 00 14 */ stw r0, 0x14(r1) -/* 8025C8E0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8025C8E4 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8025C8E8 41 82 00 70 */ beq lbl_8025C958 -/* 8025C8EC 3C 60 80 3C */ lis r3, __vt__21dSvBit_childItemHIO_c@ha /* 0x803C339C@ha */ -/* 8025C8F0 38 03 33 9C */ addi r0, r3, __vt__21dSvBit_childItemHIO_c@l /* 0x803C339C@l */ -/* 8025C8F4 90 1F 00 00 */ stw r0, 0(r31) -/* 8025C8F8 34 1F 01 A0 */ addic. r0, r31, 0x1a0 -/* 8025C8FC 41 82 00 10 */ beq lbl_8025C90C -/* 8025C900 3C 60 80 3C */ lis r3, __vt__26dSvBit_childItOneZoneHIO_c@ha /* 0x803C3330@ha */ -/* 8025C904 38 03 33 30 */ addi r0, r3, __vt__26dSvBit_childItOneZoneHIO_c@l /* 0x803C3330@l */ -/* 8025C908 90 1F 01 A0 */ stw r0, 0x1a0(r31) -lbl_8025C90C: -/* 8025C90C 34 1F 01 58 */ addic. r0, r31, 0x158 -/* 8025C910 41 82 00 10 */ beq lbl_8025C920 -/* 8025C914 3C 60 80 3C */ lis r3, __vt__23dSvBit_childItZoneHIO_c@ha /* 0x803C333C@ha */ -/* 8025C918 38 03 33 3C */ addi r0, r3, __vt__23dSvBit_childItZoneHIO_c@l /* 0x803C333C@l */ -/* 8025C91C 90 1F 01 58 */ stw r0, 0x158(r31) -lbl_8025C920: -/* 8025C920 34 1F 00 50 */ addic. r0, r31, 0x50 -/* 8025C924 41 82 00 10 */ beq lbl_8025C934 -/* 8025C928 3C 60 80 3C */ lis r3, __vt__26dSvBit_childItDungeonHIO_c@ha /* 0x803C3348@ha */ -/* 8025C92C 38 03 33 48 */ addi r0, r3, __vt__26dSvBit_childItDungeonHIO_c@l /* 0x803C3348@l */ -/* 8025C930 90 1F 00 50 */ stw r0, 0x50(r31) -lbl_8025C934: -/* 8025C934 34 1F 00 08 */ addic. r0, r31, 8 -/* 8025C938 41 82 00 10 */ beq lbl_8025C948 -/* 8025C93C 3C 60 80 3C */ lis r3, __vt__29dSvBit_childItPerfectionHIO_c@ha /* 0x803C3354@ha */ -/* 8025C940 38 03 33 54 */ addi r0, r3, __vt__29dSvBit_childItPerfectionHIO_c@l /* 0x803C3354@l */ -/* 8025C944 90 1F 00 08 */ stw r0, 8(r31) -lbl_8025C948: -/* 8025C948 7C 80 07 35 */ extsh. r0, r4 -/* 8025C94C 40 81 00 0C */ ble lbl_8025C958 -/* 8025C950 7F E3 FB 78 */ mr r3, r31 -/* 8025C954 48 07 23 E9 */ bl __dl__FPv -lbl_8025C958: -/* 8025C958 7F E3 FB 78 */ mr r3, r31 -/* 8025C95C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8025C960 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8025C964 7C 08 03 A6 */ mtlr r0 -/* 8025C968 38 21 00 10 */ addi r1, r1, 0x10 -/* 8025C96C 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save_HIO/__dt__22dSvBit_childOtherHIO_cFv.s b/asm/d/save/d_save_HIO/__dt__22dSvBit_childOtherHIO_cFv.s deleted file mode 100644 index aca7f42b65..0000000000 --- a/asm/d/save/d_save_HIO/__dt__22dSvBit_childOtherHIO_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_8025C29C: -/* 8025C29C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8025C2A0 7C 08 02 A6 */ mflr r0 -/* 8025C2A4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8025C2A8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8025C2AC 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8025C2B0 41 82 00 1C */ beq lbl_8025C2CC -/* 8025C2B4 3C A0 80 3C */ lis r5, __vt__22dSvBit_childOtherHIO_c@ha /* 0x803C3300@ha */ -/* 8025C2B8 38 05 33 00 */ addi r0, r5, __vt__22dSvBit_childOtherHIO_c@l /* 0x803C3300@l */ -/* 8025C2BC 90 1F 00 00 */ stw r0, 0(r31) -/* 8025C2C0 7C 80 07 35 */ extsh. r0, r4 -/* 8025C2C4 40 81 00 08 */ ble lbl_8025C2CC -/* 8025C2C8 48 07 2A 75 */ bl __dl__FPv -lbl_8025C2CC: -/* 8025C2CC 7F E3 FB 78 */ mr r3, r31 -/* 8025C2D0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8025C2D4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8025C2D8 7C 08 03 A6 */ mtlr r0 -/* 8025C2DC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8025C2E0 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save_HIO/__dt__23dSvBit_childItZoneHIO_cFv.s b/asm/d/save/d_save_HIO/__dt__23dSvBit_childItZoneHIO_cFv.s deleted file mode 100644 index c600bc174b..0000000000 --- a/asm/d/save/d_save_HIO/__dt__23dSvBit_childItZoneHIO_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_8025C404: -/* 8025C404 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8025C408 7C 08 02 A6 */ mflr r0 -/* 8025C40C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8025C410 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8025C414 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8025C418 41 82 00 1C */ beq lbl_8025C434 -/* 8025C41C 3C A0 80 3C */ lis r5, __vt__23dSvBit_childItZoneHIO_c@ha /* 0x803C333C@ha */ -/* 8025C420 38 05 33 3C */ addi r0, r5, __vt__23dSvBit_childItZoneHIO_c@l /* 0x803C333C@l */ -/* 8025C424 90 1F 00 00 */ stw r0, 0(r31) -/* 8025C428 7C 80 07 35 */ extsh. r0, r4 -/* 8025C42C 40 81 00 08 */ ble lbl_8025C434 -/* 8025C430 48 07 29 0D */ bl __dl__FPv -lbl_8025C434: -/* 8025C434 7F E3 FB 78 */ mr r3, r31 -/* 8025C438 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8025C43C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8025C440 7C 08 03 A6 */ mtlr r0 -/* 8025C444 38 21 00 10 */ addi r1, r1, 0x10 -/* 8025C448 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save_HIO/__dt__23dSvBit_childSwZoneHIO_cFv.s b/asm/d/save/d_save_HIO/__dt__23dSvBit_childSwZoneHIO_cFv.s deleted file mode 100644 index 923256718c..0000000000 --- a/asm/d/save/d_save_HIO/__dt__23dSvBit_childSwZoneHIO_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_8025C524: -/* 8025C524 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8025C528 7C 08 02 A6 */ mflr r0 -/* 8025C52C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8025C530 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8025C534 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8025C538 41 82 00 1C */ beq lbl_8025C554 -/* 8025C53C 3C A0 80 3C */ lis r5, __vt__23dSvBit_childSwZoneHIO_c@ha /* 0x803C336C@ha */ -/* 8025C540 38 05 33 6C */ addi r0, r5, __vt__23dSvBit_childSwZoneHIO_c@l /* 0x803C336C@l */ -/* 8025C544 90 1F 00 00 */ stw r0, 0(r31) -/* 8025C548 7C 80 07 35 */ extsh. r0, r4 -/* 8025C54C 40 81 00 08 */ ble lbl_8025C554 -/* 8025C550 48 07 27 ED */ bl __dl__FPv -lbl_8025C554: -/* 8025C554 7F E3 FB 78 */ mr r3, r31 -/* 8025C558 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8025C55C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8025C560 7C 08 03 A6 */ mtlr r0 -/* 8025C564 38 21 00 10 */ addi r1, r1, 0x10 -/* 8025C568 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save_HIO/__dt__23dSvBit_childSwitchHIO_cFv.s b/asm/d/save/d_save_HIO/__dt__23dSvBit_childSwitchHIO_cFv.s deleted file mode 100644 index 4ef98aedf6..0000000000 --- a/asm/d/save/d_save_HIO/__dt__23dSvBit_childSwitchHIO_cFv.s +++ /dev/null @@ -1,45 +0,0 @@ -lbl_8025C970: -/* 8025C970 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8025C974 7C 08 02 A6 */ mflr r0 -/* 8025C978 90 01 00 14 */ stw r0, 0x14(r1) -/* 8025C97C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8025C980 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8025C984 41 82 00 70 */ beq lbl_8025C9F4 -/* 8025C988 3C 60 80 3C */ lis r3, __vt__23dSvBit_childSwitchHIO_c@ha /* 0x803C33A8@ha */ -/* 8025C98C 38 03 33 A8 */ addi r0, r3, __vt__23dSvBit_childSwitchHIO_c@l /* 0x803C33A8@l */ -/* 8025C990 90 1F 00 00 */ stw r0, 0(r31) -/* 8025C994 34 1F 01 E0 */ addic. r0, r31, 0x1e0 -/* 8025C998 41 82 00 10 */ beq lbl_8025C9A8 -/* 8025C99C 3C 60 80 3C */ lis r3, __vt__26dSvBit_childSwOneZoneHIO_c@ha /* 0x803C3360@ha */ -/* 8025C9A0 38 03 33 60 */ addi r0, r3, __vt__26dSvBit_childSwOneZoneHIO_c@l /* 0x803C3360@l */ -/* 8025C9A4 90 1F 01 E0 */ stw r0, 0x1e0(r31) -lbl_8025C9A8: -/* 8025C9A8 34 1F 01 98 */ addic. r0, r31, 0x198 -/* 8025C9AC 41 82 00 10 */ beq lbl_8025C9BC -/* 8025C9B0 3C 60 80 3C */ lis r3, __vt__23dSvBit_childSwZoneHIO_c@ha /* 0x803C336C@ha */ -/* 8025C9B4 38 03 33 6C */ addi r0, r3, __vt__23dSvBit_childSwZoneHIO_c@l /* 0x803C336C@l */ -/* 8025C9B8 90 1F 01 98 */ stw r0, 0x198(r31) -lbl_8025C9BC: -/* 8025C9BC 34 1F 01 10 */ addic. r0, r31, 0x110 -/* 8025C9C0 41 82 00 10 */ beq lbl_8025C9D0 -/* 8025C9C4 3C 60 80 3C */ lis r3, __vt__26dSvBit_childSwDungeonHIO_c@ha /* 0x803C3378@ha */ -/* 8025C9C8 38 03 33 78 */ addi r0, r3, __vt__26dSvBit_childSwDungeonHIO_c@l /* 0x803C3378@l */ -/* 8025C9CC 90 1F 01 10 */ stw r0, 0x110(r31) -lbl_8025C9D0: -/* 8025C9D0 34 1F 00 08 */ addic. r0, r31, 8 -/* 8025C9D4 41 82 00 10 */ beq lbl_8025C9E4 -/* 8025C9D8 3C 60 80 3C */ lis r3, __vt__29dSvBit_childSwPerfectionHIO_c@ha /* 0x803C3384@ha */ -/* 8025C9DC 38 03 33 84 */ addi r0, r3, __vt__29dSvBit_childSwPerfectionHIO_c@l /* 0x803C3384@l */ -/* 8025C9E0 90 1F 00 08 */ stw r0, 8(r31) -lbl_8025C9E4: -/* 8025C9E4 7C 80 07 35 */ extsh. r0, r4 -/* 8025C9E8 40 81 00 0C */ ble lbl_8025C9F4 -/* 8025C9EC 7F E3 FB 78 */ mr r3, r31 -/* 8025C9F0 48 07 23 4D */ bl __dl__FPv -lbl_8025C9F4: -/* 8025C9F4 7F E3 FB 78 */ mr r3, r31 -/* 8025C9F8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8025C9FC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8025CA00 7C 08 03 A6 */ mtlr r0 -/* 8025CA04 38 21 00 10 */ addi r1, r1, 0x10 -/* 8025CA08 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save_HIO/__dt__25dSvBit_childDarknessHIO_cFv.s b/asm/d/save/d_save_HIO/__dt__25dSvBit_childDarknessHIO_cFv.s deleted file mode 100644 index a992d48ab0..0000000000 --- a/asm/d/save/d_save_HIO/__dt__25dSvBit_childDarknessHIO_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_8025C32C: -/* 8025C32C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8025C330 7C 08 02 A6 */ mflr r0 -/* 8025C334 90 01 00 14 */ stw r0, 0x14(r1) -/* 8025C338 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8025C33C 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8025C340 41 82 00 1C */ beq lbl_8025C35C -/* 8025C344 3C A0 80 3C */ lis r5, __vt__25dSvBit_childDarknessHIO_c@ha /* 0x803C3318@ha */ -/* 8025C348 38 05 33 18 */ addi r0, r5, __vt__25dSvBit_childDarknessHIO_c@l /* 0x803C3318@l */ -/* 8025C34C 90 1F 00 00 */ stw r0, 0(r31) -/* 8025C350 7C 80 07 35 */ extsh. r0, r4 -/* 8025C354 40 81 00 08 */ ble lbl_8025C35C -/* 8025C358 48 07 29 E5 */ bl __dl__FPv -lbl_8025C35C: -/* 8025C35C 7F E3 FB 78 */ mr r3, r31 -/* 8025C360 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8025C364 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8025C368 7C 08 03 A6 */ mtlr r0 -/* 8025C36C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8025C370 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save_HIO/__dt__25dSvBit_childTreasureHIO_cFv.s b/asm/d/save/d_save_HIO/__dt__25dSvBit_childTreasureHIO_cFv.s deleted file mode 100644 index d761deeb11..0000000000 --- a/asm/d/save/d_save_HIO/__dt__25dSvBit_childTreasureHIO_cFv.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_8025C874: -/* 8025C874 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8025C878 7C 08 02 A6 */ mflr r0 -/* 8025C87C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8025C880 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8025C884 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8025C888 41 82 00 34 */ beq lbl_8025C8BC -/* 8025C88C 3C 60 80 3C */ lis r3, __vt__25dSvBit_childTreasureHIO_c@ha /* 0x803C3390@ha */ -/* 8025C890 38 03 33 90 */ addi r0, r3, __vt__25dSvBit_childTreasureHIO_c@l /* 0x803C3390@l */ -/* 8025C894 90 1F 00 00 */ stw r0, 0(r31) -/* 8025C898 34 1F 00 08 */ addic. r0, r31, 8 -/* 8025C89C 41 82 00 10 */ beq lbl_8025C8AC -/* 8025C8A0 3C 60 80 3C */ lis r3, __vt__29dSvBit_childTbPerfectionHIO_c@ha /* 0x803C3324@ha */ -/* 8025C8A4 38 03 33 24 */ addi r0, r3, __vt__29dSvBit_childTbPerfectionHIO_c@l /* 0x803C3324@l */ -/* 8025C8A8 90 1F 00 08 */ stw r0, 8(r31) -lbl_8025C8AC: -/* 8025C8AC 7C 80 07 35 */ extsh. r0, r4 -/* 8025C8B0 40 81 00 0C */ ble lbl_8025C8BC -/* 8025C8B4 7F E3 FB 78 */ mr r3, r31 -/* 8025C8B8 48 07 24 85 */ bl __dl__FPv -lbl_8025C8BC: -/* 8025C8BC 7F E3 FB 78 */ mr r3, r31 -/* 8025C8C0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8025C8C4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8025C8C8 7C 08 03 A6 */ mtlr r0 -/* 8025C8CC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8025C8D0 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save_HIO/__dt__26dSvBit_childItDungeonHIO_cFv.s b/asm/d/save/d_save_HIO/__dt__26dSvBit_childItDungeonHIO_cFv.s deleted file mode 100644 index a8d6b4c7e7..0000000000 --- a/asm/d/save/d_save_HIO/__dt__26dSvBit_childItDungeonHIO_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_8025C44C: -/* 8025C44C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8025C450 7C 08 02 A6 */ mflr r0 -/* 8025C454 90 01 00 14 */ stw r0, 0x14(r1) -/* 8025C458 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8025C45C 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8025C460 41 82 00 1C */ beq lbl_8025C47C -/* 8025C464 3C A0 80 3C */ lis r5, __vt__26dSvBit_childItDungeonHIO_c@ha /* 0x803C3348@ha */ -/* 8025C468 38 05 33 48 */ addi r0, r5, __vt__26dSvBit_childItDungeonHIO_c@l /* 0x803C3348@l */ -/* 8025C46C 90 1F 00 00 */ stw r0, 0(r31) -/* 8025C470 7C 80 07 35 */ extsh. r0, r4 -/* 8025C474 40 81 00 08 */ ble lbl_8025C47C -/* 8025C478 48 07 28 C5 */ bl __dl__FPv -lbl_8025C47C: -/* 8025C47C 7F E3 FB 78 */ mr r3, r31 -/* 8025C480 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8025C484 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8025C488 7C 08 03 A6 */ mtlr r0 -/* 8025C48C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8025C490 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save_HIO/__dt__26dSvBit_childItOneZoneHIO_cFv.s b/asm/d/save/d_save_HIO/__dt__26dSvBit_childItOneZoneHIO_cFv.s deleted file mode 100644 index aaaee9f22c..0000000000 --- a/asm/d/save/d_save_HIO/__dt__26dSvBit_childItOneZoneHIO_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_8025C3BC: -/* 8025C3BC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8025C3C0 7C 08 02 A6 */ mflr r0 -/* 8025C3C4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8025C3C8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8025C3CC 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8025C3D0 41 82 00 1C */ beq lbl_8025C3EC -/* 8025C3D4 3C A0 80 3C */ lis r5, __vt__26dSvBit_childItOneZoneHIO_c@ha /* 0x803C3330@ha */ -/* 8025C3D8 38 05 33 30 */ addi r0, r5, __vt__26dSvBit_childItOneZoneHIO_c@l /* 0x803C3330@l */ -/* 8025C3DC 90 1F 00 00 */ stw r0, 0(r31) -/* 8025C3E0 7C 80 07 35 */ extsh. r0, r4 -/* 8025C3E4 40 81 00 08 */ ble lbl_8025C3EC -/* 8025C3E8 48 07 29 55 */ bl __dl__FPv -lbl_8025C3EC: -/* 8025C3EC 7F E3 FB 78 */ mr r3, r31 -/* 8025C3F0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8025C3F4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8025C3F8 7C 08 03 A6 */ mtlr r0 -/* 8025C3FC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8025C400 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save_HIO/__dt__26dSvBit_childSwDungeonHIO_cFv.s b/asm/d/save/d_save_HIO/__dt__26dSvBit_childSwDungeonHIO_cFv.s deleted file mode 100644 index 61ab8beae5..0000000000 --- a/asm/d/save/d_save_HIO/__dt__26dSvBit_childSwDungeonHIO_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_8025C56C: -/* 8025C56C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8025C570 7C 08 02 A6 */ mflr r0 -/* 8025C574 90 01 00 14 */ stw r0, 0x14(r1) -/* 8025C578 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8025C57C 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8025C580 41 82 00 1C */ beq lbl_8025C59C -/* 8025C584 3C A0 80 3C */ lis r5, __vt__26dSvBit_childSwDungeonHIO_c@ha /* 0x803C3378@ha */ -/* 8025C588 38 05 33 78 */ addi r0, r5, __vt__26dSvBit_childSwDungeonHIO_c@l /* 0x803C3378@l */ -/* 8025C58C 90 1F 00 00 */ stw r0, 0(r31) -/* 8025C590 7C 80 07 35 */ extsh. r0, r4 -/* 8025C594 40 81 00 08 */ ble lbl_8025C59C -/* 8025C598 48 07 27 A5 */ bl __dl__FPv -lbl_8025C59C: -/* 8025C59C 7F E3 FB 78 */ mr r3, r31 -/* 8025C5A0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8025C5A4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8025C5A8 7C 08 03 A6 */ mtlr r0 -/* 8025C5AC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8025C5B0 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save_HIO/__dt__26dSvBit_childSwOneZoneHIO_cFv.s b/asm/d/save/d_save_HIO/__dt__26dSvBit_childSwOneZoneHIO_cFv.s deleted file mode 100644 index 6e68da61b9..0000000000 --- a/asm/d/save/d_save_HIO/__dt__26dSvBit_childSwOneZoneHIO_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_8025C4DC: -/* 8025C4DC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8025C4E0 7C 08 02 A6 */ mflr r0 -/* 8025C4E4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8025C4E8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8025C4EC 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8025C4F0 41 82 00 1C */ beq lbl_8025C50C -/* 8025C4F4 3C A0 80 3C */ lis r5, __vt__26dSvBit_childSwOneZoneHIO_c@ha /* 0x803C3360@ha */ -/* 8025C4F8 38 05 33 60 */ addi r0, r5, __vt__26dSvBit_childSwOneZoneHIO_c@l /* 0x803C3360@l */ -/* 8025C4FC 90 1F 00 00 */ stw r0, 0(r31) -/* 8025C500 7C 80 07 35 */ extsh. r0, r4 -/* 8025C504 40 81 00 08 */ ble lbl_8025C50C -/* 8025C508 48 07 28 35 */ bl __dl__FPv -lbl_8025C50C: -/* 8025C50C 7F E3 FB 78 */ mr r3, r31 -/* 8025C510 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8025C514 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8025C518 7C 08 03 A6 */ mtlr r0 -/* 8025C51C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8025C520 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save_HIO/__dt__26dSvBit_childTransformHIO_cFv.s b/asm/d/save/d_save_HIO/__dt__26dSvBit_childTransformHIO_cFv.s deleted file mode 100644 index db816a7481..0000000000 --- a/asm/d/save/d_save_HIO/__dt__26dSvBit_childTransformHIO_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_8025C2E4: -/* 8025C2E4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8025C2E8 7C 08 02 A6 */ mflr r0 -/* 8025C2EC 90 01 00 14 */ stw r0, 0x14(r1) -/* 8025C2F0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8025C2F4 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8025C2F8 41 82 00 1C */ beq lbl_8025C314 -/* 8025C2FC 3C A0 80 3C */ lis r5, __vt__26dSvBit_childTransformHIO_c@ha /* 0x803C330C@ha */ -/* 8025C300 38 05 33 0C */ addi r0, r5, __vt__26dSvBit_childTransformHIO_c@l /* 0x803C330C@l */ -/* 8025C304 90 1F 00 00 */ stw r0, 0(r31) -/* 8025C308 7C 80 07 35 */ extsh. r0, r4 -/* 8025C30C 40 81 00 08 */ ble lbl_8025C314 -/* 8025C310 48 07 2A 2D */ bl __dl__FPv -lbl_8025C314: -/* 8025C314 7F E3 FB 78 */ mr r3, r31 -/* 8025C318 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8025C31C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8025C320 7C 08 03 A6 */ mtlr r0 -/* 8025C324 38 21 00 10 */ addi r1, r1, 0x10 -/* 8025C328 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save_HIO/__dt__29dSvBit_childItPerfectionHIO_cFv.s b/asm/d/save/d_save_HIO/__dt__29dSvBit_childItPerfectionHIO_cFv.s deleted file mode 100644 index 2f8bbb9120..0000000000 --- a/asm/d/save/d_save_HIO/__dt__29dSvBit_childItPerfectionHIO_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_8025C494: -/* 8025C494 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8025C498 7C 08 02 A6 */ mflr r0 -/* 8025C49C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8025C4A0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8025C4A4 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8025C4A8 41 82 00 1C */ beq lbl_8025C4C4 -/* 8025C4AC 3C A0 80 3C */ lis r5, __vt__29dSvBit_childItPerfectionHIO_c@ha /* 0x803C3354@ha */ -/* 8025C4B0 38 05 33 54 */ addi r0, r5, __vt__29dSvBit_childItPerfectionHIO_c@l /* 0x803C3354@l */ -/* 8025C4B4 90 1F 00 00 */ stw r0, 0(r31) -/* 8025C4B8 7C 80 07 35 */ extsh. r0, r4 -/* 8025C4BC 40 81 00 08 */ ble lbl_8025C4C4 -/* 8025C4C0 48 07 28 7D */ bl __dl__FPv -lbl_8025C4C4: -/* 8025C4C4 7F E3 FB 78 */ mr r3, r31 -/* 8025C4C8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8025C4CC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8025C4D0 7C 08 03 A6 */ mtlr r0 -/* 8025C4D4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8025C4D8 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save_HIO/__dt__29dSvBit_childSwPerfectionHIO_cFv.s b/asm/d/save/d_save_HIO/__dt__29dSvBit_childSwPerfectionHIO_cFv.s deleted file mode 100644 index fcaa4bc78a..0000000000 --- a/asm/d/save/d_save_HIO/__dt__29dSvBit_childSwPerfectionHIO_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_8025C5B4: -/* 8025C5B4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8025C5B8 7C 08 02 A6 */ mflr r0 -/* 8025C5BC 90 01 00 14 */ stw r0, 0x14(r1) -/* 8025C5C0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8025C5C4 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8025C5C8 41 82 00 1C */ beq lbl_8025C5E4 -/* 8025C5CC 3C A0 80 3C */ lis r5, __vt__29dSvBit_childSwPerfectionHIO_c@ha /* 0x803C3384@ha */ -/* 8025C5D0 38 05 33 84 */ addi r0, r5, __vt__29dSvBit_childSwPerfectionHIO_c@l /* 0x803C3384@l */ -/* 8025C5D4 90 1F 00 00 */ stw r0, 0(r31) -/* 8025C5D8 7C 80 07 35 */ extsh. r0, r4 -/* 8025C5DC 40 81 00 08 */ ble lbl_8025C5E4 -/* 8025C5E0 48 07 27 5D */ bl __dl__FPv -lbl_8025C5E4: -/* 8025C5E4 7F E3 FB 78 */ mr r3, r31 -/* 8025C5E8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8025C5EC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8025C5F0 7C 08 03 A6 */ mtlr r0 -/* 8025C5F4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8025C5F8 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save_HIO/__dt__29dSvBit_childTbPerfectionHIO_cFv.s b/asm/d/save/d_save_HIO/__dt__29dSvBit_childTbPerfectionHIO_cFv.s deleted file mode 100644 index a7a7248f8e..0000000000 --- a/asm/d/save/d_save_HIO/__dt__29dSvBit_childTbPerfectionHIO_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_8025C374: -/* 8025C374 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8025C378 7C 08 02 A6 */ mflr r0 -/* 8025C37C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8025C380 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8025C384 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8025C388 41 82 00 1C */ beq lbl_8025C3A4 -/* 8025C38C 3C A0 80 3C */ lis r5, __vt__29dSvBit_childTbPerfectionHIO_c@ha /* 0x803C3324@ha */ -/* 8025C390 38 05 33 24 */ addi r0, r5, __vt__29dSvBit_childTbPerfectionHIO_c@l /* 0x803C3324@l */ -/* 8025C394 90 1F 00 00 */ stw r0, 0(r31) -/* 8025C398 7C 80 07 35 */ extsh. r0, r4 -/* 8025C39C 40 81 00 08 */ ble lbl_8025C3A4 -/* 8025C3A0 48 07 29 9D */ bl __dl__FPv -lbl_8025C3A4: -/* 8025C3A4 7F E3 FB 78 */ mr r3, r31 -/* 8025C3A8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8025C3AC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8025C3B0 7C 08 03 A6 */ mtlr r0 -/* 8025C3B4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8025C3B8 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save_HIO/__sinit_d_save_HIO_cpp.s b/asm/d/save/d_save_HIO/__sinit_d_save_HIO_cpp.s deleted file mode 100644 index 69f1b34c78..0000000000 --- a/asm/d/save/d_save_HIO/__sinit_d_save_HIO_cpp.s +++ /dev/null @@ -1,65 +0,0 @@ -lbl_8025C5FC: -/* 8025C5FC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8025C600 7C 08 02 A6 */ mflr r0 -/* 8025C604 90 01 00 14 */ stw r0, 0x14(r1) -/* 8025C608 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8025C60C 3C 60 80 3C */ lis r3, __vt__12dSvBit_HIO_c@ha /* 0x803C33B4@ha */ -/* 8025C610 38 03 33 B4 */ addi r0, r3, __vt__12dSvBit_HIO_c@l /* 0x803C33B4@l */ -/* 8025C614 3C 60 80 43 */ lis r3, g_save_bit_HIO@ha /* 0x804307EC@ha */ -/* 8025C618 3B E3 07 EC */ addi r31, r3, g_save_bit_HIO@l /* 0x804307EC@l */ -/* 8025C61C 90 1F 00 00 */ stw r0, 0(r31) -/* 8025C620 3C 60 80 3C */ lis r3, __vt__23dSvBit_childSwitchHIO_c@ha /* 0x803C33A8@ha */ -/* 8025C624 38 03 33 A8 */ addi r0, r3, __vt__23dSvBit_childSwitchHIO_c@l /* 0x803C33A8@l */ -/* 8025C628 90 1F 00 08 */ stw r0, 8(r31) -/* 8025C62C 38 7F 00 10 */ addi r3, r31, 0x10 -/* 8025C630 4B FF F5 49 */ bl __ct__29dSvBit_childSwPerfectionHIO_cFv -/* 8025C634 38 7F 01 18 */ addi r3, r31, 0x118 -/* 8025C638 4B FF F5 DD */ bl __ct__26dSvBit_childSwDungeonHIO_cFv -/* 8025C63C 38 7F 01 A0 */ addi r3, r31, 0x1a0 -/* 8025C640 4B FF F6 71 */ bl __ct__23dSvBit_childSwZoneHIO_cFv -/* 8025C644 38 7F 01 E8 */ addi r3, r31, 0x1e8 -/* 8025C648 4B FF F6 C9 */ bl __ct__26dSvBit_childSwOneZoneHIO_cFv -/* 8025C64C 3C 60 80 43 */ lis r3, g_save_bit_HIO@ha /* 0x804307EC@ha */ -/* 8025C650 3B E3 07 EC */ addi r31, r3, g_save_bit_HIO@l /* 0x804307EC@l */ -/* 8025C654 3C 60 80 3C */ lis r3, __vt__21dSvBit_childItemHIO_c@ha /* 0x803C339C@ha */ -/* 8025C658 38 03 33 9C */ addi r0, r3, __vt__21dSvBit_childItemHIO_c@l /* 0x803C339C@l */ -/* 8025C65C 90 1F 02 10 */ stw r0, 0x210(r31) -/* 8025C660 38 7F 02 18 */ addi r3, r31, 0x218 -/* 8025C664 4B FF F7 0D */ bl __ct__29dSvBit_childItPerfectionHIO_cFv -/* 8025C668 38 7F 02 60 */ addi r3, r31, 0x260 -/* 8025C66C 4B FF F7 A1 */ bl __ct__26dSvBit_childItDungeonHIO_cFv -/* 8025C670 38 7F 03 68 */ addi r3, r31, 0x368 -/* 8025C674 4B FF F8 35 */ bl __ct__23dSvBit_childItZoneHIO_cFv -/* 8025C678 38 7F 03 B0 */ addi r3, r31, 0x3b0 -/* 8025C67C 4B FF F8 8D */ bl __ct__26dSvBit_childItOneZoneHIO_cFv -/* 8025C680 3C 60 80 43 */ lis r3, g_save_bit_HIO@ha /* 0x804307EC@ha */ -/* 8025C684 38 83 07 EC */ addi r4, r3, g_save_bit_HIO@l /* 0x804307EC@l */ -/* 8025C688 3C 60 80 3C */ lis r3, __vt__25dSvBit_childTreasureHIO_c@ha /* 0x803C3390@ha */ -/* 8025C68C 38 03 33 90 */ addi r0, r3, __vt__25dSvBit_childTreasureHIO_c@l /* 0x803C3390@l */ -/* 8025C690 90 04 03 D8 */ stw r0, 0x3d8(r4) -/* 8025C694 38 64 03 E0 */ addi r3, r4, 0x3e0 -/* 8025C698 4B FF F8 D1 */ bl __ct__29dSvBit_childTbPerfectionHIO_cFv -/* 8025C69C 3C 60 80 43 */ lis r3, g_save_bit_HIO@ha /* 0x804307EC@ha */ -/* 8025C6A0 38 63 07 EC */ addi r3, r3, g_save_bit_HIO@l /* 0x804307EC@l */ -/* 8025C6A4 38 63 04 68 */ addi r3, r3, 0x468 -/* 8025C6A8 4B FF F9 5D */ bl __ct__25dSvBit_childDarknessHIO_cFv -/* 8025C6AC 3C 60 80 43 */ lis r3, g_save_bit_HIO@ha /* 0x804307EC@ha */ -/* 8025C6B0 38 63 07 EC */ addi r3, r3, g_save_bit_HIO@l /* 0x804307EC@l */ -/* 8025C6B4 38 63 04 7C */ addi r3, r3, 0x47c -/* 8025C6B8 4B FF F9 E9 */ bl __ct__26dSvBit_childTransformHIO_cFv -/* 8025C6BC 3C 60 80 43 */ lis r3, g_save_bit_HIO@ha /* 0x804307EC@ha */ -/* 8025C6C0 38 63 07 EC */ addi r3, r3, g_save_bit_HIO@l /* 0x804307EC@l */ -/* 8025C6C4 38 63 04 8C */ addi r3, r3, 0x48c -/* 8025C6C8 4B FF FA 75 */ bl __ct__22dSvBit_childOtherHIO_cFv -/* 8025C6CC 3C 60 80 43 */ lis r3, g_save_bit_HIO@ha /* 0x804307EC@ha */ -/* 8025C6D0 38 63 07 EC */ addi r3, r3, g_save_bit_HIO@l /* 0x804307EC@l */ -/* 8025C6D4 3C 80 80 26 */ lis r4, __dt__12dSvBit_HIO_cFv@ha /* 0x8025C6FC@ha */ -/* 8025C6D8 38 84 C6 FC */ addi r4, r4, __dt__12dSvBit_HIO_cFv@l /* 0x8025C6FC@l */ -/* 8025C6DC 3C A0 80 43 */ lis r5, lit_3659@ha /* 0x804307E0@ha */ -/* 8025C6E0 38 A5 07 E0 */ addi r5, r5, lit_3659@l /* 0x804307E0@l */ -/* 8025C6E4 48 10 55 41 */ bl __register_global_object -/* 8025C6E8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8025C6EC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8025C6F0 7C 08 03 A6 */ mtlr r0 -/* 8025C6F4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8025C6F8 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save_HIO/init__12dSvBit_HIO_cFv.s b/asm/d/save/d_save_HIO/init__12dSvBit_HIO_cFv.s deleted file mode 100644 index e6259f920f..0000000000 --- a/asm/d/save/d_save_HIO/init__12dSvBit_HIO_cFv.s +++ /dev/null @@ -1,42 +0,0 @@ -lbl_8025C1F8: -/* 8025C1F8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8025C1FC 7C 08 02 A6 */ mflr r0 -/* 8025C200 90 01 00 14 */ stw r0, 0x14(r1) -/* 8025C204 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8025C208 7C 7F 1B 78 */ mr r31, r3 -/* 8025C20C 38 7F 00 10 */ addi r3, r31, 0x10 -/* 8025C210 4B FF F9 9D */ bl init__29dSvBit_childSwPerfectionHIO_cFv -/* 8025C214 38 7F 01 18 */ addi r3, r31, 0x118 -/* 8025C218 4B FF FA 31 */ bl init__26dSvBit_childSwDungeonHIO_cFv -/* 8025C21C 38 7F 01 A0 */ addi r3, r31, 0x1a0 -/* 8025C220 4B FF FA C5 */ bl init__23dSvBit_childSwZoneHIO_cFv -/* 8025C224 38 7F 01 E8 */ addi r3, r31, 0x1e8 -/* 8025C228 4B FF FB 1D */ bl init__26dSvBit_childSwOneZoneHIO_cFv -/* 8025C22C 38 7F 02 18 */ addi r3, r31, 0x218 -/* 8025C230 4B FF FB 75 */ bl init__29dSvBit_childItPerfectionHIO_cFv -/* 8025C234 38 7F 02 60 */ addi r3, r31, 0x260 -/* 8025C238 4B FF FC 09 */ bl init__26dSvBit_childItDungeonHIO_cFv -/* 8025C23C 38 7F 03 68 */ addi r3, r31, 0x368 -/* 8025C240 4B FF FC 9D */ bl init__23dSvBit_childItZoneHIO_cFv -/* 8025C244 38 7F 03 B0 */ addi r3, r31, 0x3b0 -/* 8025C248 4B FF FC F5 */ bl init__26dSvBit_childItOneZoneHIO_cFv -/* 8025C24C 38 7F 03 E0 */ addi r3, r31, 0x3e0 -/* 8025C250 4B FF FD 4D */ bl init__29dSvBit_childTbPerfectionHIO_cFv -/* 8025C254 38 7F 04 68 */ addi r3, r31, 0x468 -/* 8025C258 4B FF FD E1 */ bl init__25dSvBit_childDarknessHIO_cFv -/* 8025C25C 38 7F 04 7C */ addi r3, r31, 0x47c -/* 8025C260 4B FF FE 75 */ bl init__26dSvBit_childTransformHIO_cFv -/* 8025C264 38 7F 04 8C */ addi r3, r31, 0x48c -/* 8025C268 4B FF FF 11 */ bl init__22dSvBit_childOtherHIO_cFv -/* 8025C26C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8025C270 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8025C274 38 63 07 F0 */ addi r3, r3, 0x7f0 -/* 8025C278 38 80 0D 04 */ li r4, 0xd04 -/* 8025C27C 4B DD 87 41 */ bl isEventBit__11dSv_event_cCFUs -/* 8025C280 98 7F 04 9D */ stb r3, 0x49d(r31) -/* 8025C284 98 7F 04 9C */ stb r3, 0x49c(r31) -/* 8025C288 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8025C28C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8025C290 7C 08 03 A6 */ mtlr r0 -/* 8025C294 38 21 00 10 */ addi r1, r1, 0x10 -/* 8025C298 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save_HIO/init__22dSvBit_childOtherHIO_cFv.s b/asm/d/save/d_save_HIO/init__22dSvBit_childOtherHIO_cFv.s deleted file mode 100644 index 0d4cdf4d36..0000000000 --- a/asm/d/save/d_save_HIO/init__22dSvBit_childOtherHIO_cFv.s +++ /dev/null @@ -1,34 +0,0 @@ -lbl_8025C178: -/* 8025C178 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8025C17C 7C 08 02 A6 */ mflr r0 -/* 8025C180 90 01 00 24 */ stw r0, 0x24(r1) -/* 8025C184 39 61 00 20 */ addi r11, r1, 0x20 -/* 8025C188 48 10 60 55 */ bl _savegpr_29 -/* 8025C18C 7C 7D 1B 78 */ mr r29, r3 -/* 8025C190 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8025C194 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8025C198 3B E4 01 14 */ addi r31, r4, 0x114 -/* 8025C19C 7F E3 FB 78 */ mr r3, r31 -/* 8025C1A0 88 84 4E 0C */ lbz r4, 0x4e0c(r4) -/* 8025C1A4 4B DD 81 9D */ bl getLightDropNum__16dSv_light_drop_cCFUc -/* 8025C1A8 98 7D 00 05 */ stb r3, 5(r29) -/* 8025C1AC 88 1D 00 05 */ lbz r0, 5(r29) -/* 8025C1B0 98 1D 00 06 */ stb r0, 6(r29) -/* 8025C1B4 3B C0 00 00 */ li r30, 0 -lbl_8025C1B8: -/* 8025C1B8 7F E3 FB 78 */ mr r3, r31 -/* 8025C1BC 57 C4 06 3E */ clrlwi r4, r30, 0x18 -/* 8025C1C0 4B DD 81 DD */ bl isLightDropGetFlag__16dSv_light_drop_cCFUc -/* 8025C1C4 7C 9D F2 14 */ add r4, r29, r30 -/* 8025C1C8 98 64 00 07 */ stb r3, 7(r4) -/* 8025C1CC 88 04 00 07 */ lbz r0, 7(r4) -/* 8025C1D0 98 04 00 0B */ stb r0, 0xb(r4) -/* 8025C1D4 3B DE 00 01 */ addi r30, r30, 1 -/* 8025C1D8 2C 1E 00 04 */ cmpwi r30, 4 -/* 8025C1DC 41 80 FF DC */ blt lbl_8025C1B8 -/* 8025C1E0 39 61 00 20 */ addi r11, r1, 0x20 -/* 8025C1E4 48 10 60 45 */ bl _restgpr_29 -/* 8025C1E8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8025C1EC 7C 08 03 A6 */ mtlr r0 -/* 8025C1F0 38 21 00 20 */ addi r1, r1, 0x20 -/* 8025C1F4 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save_HIO/init__23dSvBit_childItZoneHIO_cFv.s b/asm/d/save/d_save_HIO/init__23dSvBit_childItZoneHIO_cFv.s deleted file mode 100644 index 7595d0a5cd..0000000000 --- a/asm/d/save/d_save_HIO/init__23dSvBit_childItZoneHIO_cFv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_8025BEDC: -/* 8025BEDC 38 C0 00 00 */ li r6, 0 -/* 8025BEE0 38 80 00 00 */ li r4, 0 -/* 8025BEE4 38 00 00 20 */ li r0, 0x20 -/* 8025BEE8 7C 09 03 A6 */ mtctr r0 -lbl_8025BEEC: -/* 8025BEEC 7C A3 32 14 */ add r5, r3, r6 -/* 8025BEF0 98 85 00 05 */ stb r4, 5(r5) -/* 8025BEF4 88 05 00 05 */ lbz r0, 5(r5) -/* 8025BEF8 98 05 00 25 */ stb r0, 0x25(r5) -/* 8025BEFC 38 C6 00 01 */ addi r6, r6, 1 -/* 8025BF00 42 00 FF EC */ bdnz lbl_8025BEEC -/* 8025BF04 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save_HIO/init__23dSvBit_childSwZoneHIO_cFv.s b/asm/d/save/d_save_HIO/init__23dSvBit_childSwZoneHIO_cFv.s deleted file mode 100644 index 65a84a3e83..0000000000 --- a/asm/d/save/d_save_HIO/init__23dSvBit_childSwZoneHIO_cFv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_8025BCE4: -/* 8025BCE4 38 C0 00 00 */ li r6, 0 -/* 8025BCE8 38 80 00 00 */ li r4, 0 -/* 8025BCEC 38 00 00 20 */ li r0, 0x20 -/* 8025BCF0 7C 09 03 A6 */ mtctr r0 -lbl_8025BCF4: -/* 8025BCF4 7C A3 32 14 */ add r5, r3, r6 -/* 8025BCF8 98 85 00 05 */ stb r4, 5(r5) -/* 8025BCFC 88 05 00 05 */ lbz r0, 5(r5) -/* 8025BD00 98 05 00 25 */ stb r0, 0x25(r5) -/* 8025BD04 38 C6 00 01 */ addi r6, r6, 1 -/* 8025BD08 42 00 FF EC */ bdnz lbl_8025BCF4 -/* 8025BD0C 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save_HIO/init__25dSvBit_childDarknessHIO_cFv.s b/asm/d/save/d_save_HIO/init__25dSvBit_childDarknessHIO_cFv.s deleted file mode 100644 index 382d8273ce..0000000000 --- a/asm/d/save/d_save_HIO/init__25dSvBit_childDarknessHIO_cFv.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_8025C038: -/* 8025C038 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8025C03C 7C 08 02 A6 */ mflr r0 -/* 8025C040 90 01 00 24 */ stw r0, 0x24(r1) -/* 8025C044 39 61 00 20 */ addi r11, r1, 0x20 -/* 8025C048 48 10 61 95 */ bl _savegpr_29 -/* 8025C04C 7C 7D 1B 78 */ mr r29, r3 -/* 8025C050 3B C0 00 00 */ li r30, 0 -/* 8025C054 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8025C058 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8025C05C 3B E3 00 28 */ addi r31, r3, 0x28 -lbl_8025C060: -/* 8025C060 7F E3 FB 78 */ mr r3, r31 -/* 8025C064 7F C4 F3 78 */ mr r4, r30 -/* 8025C068 4B DD 6B 49 */ bl isDarkClearLV__21dSv_player_status_b_cCFi -/* 8025C06C 7C 9D F2 14 */ add r4, r29, r30 -/* 8025C070 98 64 00 05 */ stb r3, 5(r4) -/* 8025C074 88 04 00 05 */ lbz r0, 5(r4) -/* 8025C078 98 04 00 0B */ stb r0, 0xb(r4) -/* 8025C07C 3B DE 00 01 */ addi r30, r30, 1 -/* 8025C080 2C 1E 00 06 */ cmpwi r30, 6 -/* 8025C084 41 80 FF DC */ blt lbl_8025C060 -/* 8025C088 39 61 00 20 */ addi r11, r1, 0x20 -/* 8025C08C 48 10 61 9D */ bl _restgpr_29 -/* 8025C090 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8025C094 7C 08 03 A6 */ mtlr r0 -/* 8025C098 38 21 00 20 */ addi r1, r1, 0x20 -/* 8025C09C 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save_HIO/init__26dSvBit_childItDungeonHIO_cFv.s b/asm/d/save/d_save_HIO/init__26dSvBit_childItDungeonHIO_cFv.s deleted file mode 100644 index 3e786b7f9f..0000000000 --- a/asm/d/save/d_save_HIO/init__26dSvBit_childItDungeonHIO_cFv.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_8025BE40: -/* 8025BE40 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8025BE44 7C 08 02 A6 */ mflr r0 -/* 8025BE48 90 01 00 24 */ stw r0, 0x24(r1) -/* 8025BE4C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8025BE50 48 10 63 8D */ bl _savegpr_29 -/* 8025BE54 7C 7D 1B 78 */ mr r29, r3 -/* 8025BE58 3B C0 00 00 */ li r30, 0 -/* 8025BE5C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8025BE60 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8025BE64 3B E3 09 78 */ addi r31, r3, 0x978 -lbl_8025BE68: -/* 8025BE68 7F E3 FB 78 */ mr r3, r31 -/* 8025BE6C 7F C4 F3 78 */ mr r4, r30 -/* 8025BE70 4B DD 8E 05 */ bl isItem__12dSv_danBit_cCFi -/* 8025BE74 7C 9D F2 14 */ add r4, r29, r30 -/* 8025BE78 98 64 00 05 */ stb r3, 5(r4) -/* 8025BE7C 88 04 00 05 */ lbz r0, 5(r4) -/* 8025BE80 98 04 00 85 */ stb r0, 0x85(r4) -/* 8025BE84 3B DE 00 01 */ addi r30, r30, 1 -/* 8025BE88 2C 1E 00 80 */ cmpwi r30, 0x80 -/* 8025BE8C 41 80 FF DC */ blt lbl_8025BE68 -/* 8025BE90 39 61 00 20 */ addi r11, r1, 0x20 -/* 8025BE94 48 10 63 95 */ bl _restgpr_29 -/* 8025BE98 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8025BE9C 7C 08 03 A6 */ mtlr r0 -/* 8025BEA0 38 21 00 20 */ addi r1, r1, 0x20 -/* 8025BEA4 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save_HIO/init__26dSvBit_childItOneZoneHIO_cFv.s b/asm/d/save/d_save_HIO/init__26dSvBit_childItOneZoneHIO_cFv.s deleted file mode 100644 index 8975c81b1f..0000000000 --- a/asm/d/save/d_save_HIO/init__26dSvBit_childItOneZoneHIO_cFv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_8025BF3C: -/* 8025BF3C 38 C0 00 00 */ li r6, 0 -/* 8025BF40 38 80 00 00 */ li r4, 0 -/* 8025BF44 38 00 00 10 */ li r0, 0x10 -/* 8025BF48 7C 09 03 A6 */ mtctr r0 -lbl_8025BF4C: -/* 8025BF4C 7C A3 32 14 */ add r5, r3, r6 -/* 8025BF50 98 85 00 05 */ stb r4, 5(r5) -/* 8025BF54 88 05 00 05 */ lbz r0, 5(r5) -/* 8025BF58 98 05 00 15 */ stb r0, 0x15(r5) -/* 8025BF5C 38 C6 00 01 */ addi r6, r6, 1 -/* 8025BF60 42 00 FF EC */ bdnz lbl_8025BF4C -/* 8025BF64 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save_HIO/init__26dSvBit_childSwDungeonHIO_cFv.s b/asm/d/save/d_save_HIO/init__26dSvBit_childSwDungeonHIO_cFv.s deleted file mode 100644 index b415cc80ee..0000000000 --- a/asm/d/save/d_save_HIO/init__26dSvBit_childSwDungeonHIO_cFv.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_8025BC48: -/* 8025BC48 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8025BC4C 7C 08 02 A6 */ mflr r0 -/* 8025BC50 90 01 00 24 */ stw r0, 0x24(r1) -/* 8025BC54 39 61 00 20 */ addi r11, r1, 0x20 -/* 8025BC58 48 10 65 85 */ bl _savegpr_29 -/* 8025BC5C 7C 7D 1B 78 */ mr r29, r3 -/* 8025BC60 3B C0 00 00 */ li r30, 0 -/* 8025BC64 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8025BC68 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8025BC6C 3B E3 09 78 */ addi r31, r3, 0x978 -lbl_8025BC70: -/* 8025BC70 7F E3 FB 78 */ mr r3, r31 -/* 8025BC74 7F C4 F3 78 */ mr r4, r30 -/* 8025BC78 4B DD 8F 71 */ bl isSwitch__12dSv_danBit_cCFi -/* 8025BC7C 7C 9D F2 14 */ add r4, r29, r30 -/* 8025BC80 98 64 00 05 */ stb r3, 5(r4) -/* 8025BC84 88 04 00 05 */ lbz r0, 5(r4) -/* 8025BC88 98 04 00 45 */ stb r0, 0x45(r4) -/* 8025BC8C 3B DE 00 01 */ addi r30, r30, 1 -/* 8025BC90 2C 1E 00 40 */ cmpwi r30, 0x40 -/* 8025BC94 41 80 FF DC */ blt lbl_8025BC70 -/* 8025BC98 39 61 00 20 */ addi r11, r1, 0x20 -/* 8025BC9C 48 10 65 8D */ bl _restgpr_29 -/* 8025BCA0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8025BCA4 7C 08 03 A6 */ mtlr r0 -/* 8025BCA8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8025BCAC 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save_HIO/init__26dSvBit_childSwOneZoneHIO_cFv.s b/asm/d/save/d_save_HIO/init__26dSvBit_childSwOneZoneHIO_cFv.s deleted file mode 100644 index cbdfb86832..0000000000 --- a/asm/d/save/d_save_HIO/init__26dSvBit_childSwOneZoneHIO_cFv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_8025BD44: -/* 8025BD44 38 C0 00 00 */ li r6, 0 -/* 8025BD48 38 80 00 00 */ li r4, 0 -/* 8025BD4C 38 00 00 10 */ li r0, 0x10 -/* 8025BD50 7C 09 03 A6 */ mtctr r0 -lbl_8025BD54: -/* 8025BD54 7C A3 32 14 */ add r5, r3, r6 -/* 8025BD58 98 85 00 05 */ stb r4, 5(r5) -/* 8025BD5C 88 05 00 05 */ lbz r0, 5(r5) -/* 8025BD60 98 05 00 15 */ stb r0, 0x15(r5) -/* 8025BD64 38 C6 00 01 */ addi r6, r6, 1 -/* 8025BD68 42 00 FF EC */ bdnz lbl_8025BD54 -/* 8025BD6C 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save_HIO/init__26dSvBit_childTransformHIO_cFv.s b/asm/d/save/d_save_HIO/init__26dSvBit_childTransformHIO_cFv.s deleted file mode 100644 index 5359fa0825..0000000000 --- a/asm/d/save/d_save_HIO/init__26dSvBit_childTransformHIO_cFv.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_8025C0D4: -/* 8025C0D4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8025C0D8 7C 08 02 A6 */ mflr r0 -/* 8025C0DC 90 01 00 24 */ stw r0, 0x24(r1) -/* 8025C0E0 39 61 00 20 */ addi r11, r1, 0x20 -/* 8025C0E4 48 10 60 F9 */ bl _savegpr_29 -/* 8025C0E8 7C 7D 1B 78 */ mr r29, r3 -/* 8025C0EC 3B C0 00 00 */ li r30, 0 -/* 8025C0F0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8025C0F4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8025C0F8 3B E3 00 28 */ addi r31, r3, 0x28 -lbl_8025C0FC: -/* 8025C0FC 7F E3 FB 78 */ mr r3, r31 -/* 8025C100 7F C4 F3 78 */ mr r4, r30 -/* 8025C104 4B DD 6A E9 */ bl isTransformLV__21dSv_player_status_b_cCFi -/* 8025C108 7C 9D F2 14 */ add r4, r29, r30 -/* 8025C10C 98 64 00 05 */ stb r3, 5(r4) -/* 8025C110 88 04 00 05 */ lbz r0, 5(r4) -/* 8025C114 98 04 00 09 */ stb r0, 9(r4) -/* 8025C118 3B DE 00 01 */ addi r30, r30, 1 -/* 8025C11C 2C 1E 00 04 */ cmpwi r30, 4 -/* 8025C120 41 80 FF DC */ blt lbl_8025C0FC -/* 8025C124 39 61 00 20 */ addi r11, r1, 0x20 -/* 8025C128 48 10 61 01 */ bl _restgpr_29 -/* 8025C12C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8025C130 7C 08 03 A6 */ mtlr r0 -/* 8025C134 38 21 00 20 */ addi r1, r1, 0x20 -/* 8025C138 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save_HIO/init__29dSvBit_childItPerfectionHIO_cFv.s b/asm/d/save/d_save_HIO/init__29dSvBit_childItPerfectionHIO_cFv.s deleted file mode 100644 index 4f76fd98c2..0000000000 --- a/asm/d/save/d_save_HIO/init__29dSvBit_childItPerfectionHIO_cFv.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_8025BDA4: -/* 8025BDA4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8025BDA8 7C 08 02 A6 */ mflr r0 -/* 8025BDAC 90 01 00 24 */ stw r0, 0x24(r1) -/* 8025BDB0 39 61 00 20 */ addi r11, r1, 0x20 -/* 8025BDB4 48 10 64 29 */ bl _savegpr_29 -/* 8025BDB8 7C 7D 1B 78 */ mr r29, r3 -/* 8025BDBC 3B C0 00 00 */ li r30, 0 -/* 8025BDC0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8025BDC4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8025BDC8 3B E3 09 58 */ addi r31, r3, 0x958 -lbl_8025BDCC: -/* 8025BDCC 7F E3 FB 78 */ mr r3, r31 -/* 8025BDD0 7F C4 F3 78 */ mr r4, r30 -/* 8025BDD4 4B DD 8B 19 */ bl isItem__12dSv_memBit_cCFi -/* 8025BDD8 7C 9D F2 14 */ add r4, r29, r30 -/* 8025BDDC 98 64 00 05 */ stb r3, 5(r4) -/* 8025BDE0 88 04 00 05 */ lbz r0, 5(r4) -/* 8025BDE4 98 04 00 25 */ stb r0, 0x25(r4) -/* 8025BDE8 3B DE 00 01 */ addi r30, r30, 1 -/* 8025BDEC 2C 1E 00 20 */ cmpwi r30, 0x20 -/* 8025BDF0 41 80 FF DC */ blt lbl_8025BDCC -/* 8025BDF4 39 61 00 20 */ addi r11, r1, 0x20 -/* 8025BDF8 48 10 64 31 */ bl _restgpr_29 -/* 8025BDFC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8025BE00 7C 08 03 A6 */ mtlr r0 -/* 8025BE04 38 21 00 20 */ addi r1, r1, 0x20 -/* 8025BE08 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save_HIO/init__29dSvBit_childSwPerfectionHIO_cFv.s b/asm/d/save/d_save_HIO/init__29dSvBit_childSwPerfectionHIO_cFv.s deleted file mode 100644 index f0ed57ae9c..0000000000 --- a/asm/d/save/d_save_HIO/init__29dSvBit_childSwPerfectionHIO_cFv.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_8025BBAC: -/* 8025BBAC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8025BBB0 7C 08 02 A6 */ mflr r0 -/* 8025BBB4 90 01 00 24 */ stw r0, 0x24(r1) -/* 8025BBB8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8025BBBC 48 10 66 21 */ bl _savegpr_29 -/* 8025BBC0 7C 7D 1B 78 */ mr r29, r3 -/* 8025BBC4 3B C0 00 00 */ li r30, 0 -/* 8025BBC8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8025BBCC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8025BBD0 3B E3 09 58 */ addi r31, r3, 0x958 -lbl_8025BBD4: -/* 8025BBD4 7F E3 FB 78 */ mr r3, r31 -/* 8025BBD8 7F C4 F3 78 */ mr r4, r30 -/* 8025BBDC 4B DD 8C 85 */ bl isSwitch__12dSv_memBit_cCFi -/* 8025BBE0 7C 9D F2 14 */ add r4, r29, r30 -/* 8025BBE4 98 64 00 05 */ stb r3, 5(r4) -/* 8025BBE8 88 04 00 05 */ lbz r0, 5(r4) -/* 8025BBEC 98 04 00 85 */ stb r0, 0x85(r4) -/* 8025BBF0 3B DE 00 01 */ addi r30, r30, 1 -/* 8025BBF4 2C 1E 00 80 */ cmpwi r30, 0x80 -/* 8025BBF8 41 80 FF DC */ blt lbl_8025BBD4 -/* 8025BBFC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8025BC00 48 10 66 29 */ bl _restgpr_29 -/* 8025BC04 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8025BC08 7C 08 03 A6 */ mtlr r0 -/* 8025BC0C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8025BC10 4E 80 00 20 */ blr diff --git a/asm/d/save/d_save_HIO/init__29dSvBit_childTbPerfectionHIO_cFv.s b/asm/d/save/d_save_HIO/init__29dSvBit_childTbPerfectionHIO_cFv.s deleted file mode 100644 index 187aa6895a..0000000000 --- a/asm/d/save/d_save_HIO/init__29dSvBit_childTbPerfectionHIO_cFv.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_8025BF9C: -/* 8025BF9C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8025BFA0 7C 08 02 A6 */ mflr r0 -/* 8025BFA4 90 01 00 24 */ stw r0, 0x24(r1) -/* 8025BFA8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8025BFAC 48 10 62 31 */ bl _savegpr_29 -/* 8025BFB0 7C 7D 1B 78 */ mr r29, r3 -/* 8025BFB4 3B C0 00 00 */ li r30, 0 -/* 8025BFB8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8025BFBC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8025BFC0 3B E3 09 58 */ addi r31, r3, 0x958 -lbl_8025BFC4: -/* 8025BFC4 7F E3 FB 78 */ mr r3, r31 -/* 8025BFC8 7F C4 F3 78 */ mr r4, r30 -/* 8025BFCC 4B DD 88 1D */ bl isTbox__12dSv_memBit_cCFi -/* 8025BFD0 7C 9D F2 14 */ add r4, r29, r30 -/* 8025BFD4 98 64 00 05 */ stb r3, 5(r4) -/* 8025BFD8 88 04 00 05 */ lbz r0, 5(r4) -/* 8025BFDC 98 04 00 45 */ stb r0, 0x45(r4) -/* 8025BFE0 3B DE 00 01 */ addi r30, r30, 1 -/* 8025BFE4 2C 1E 00 40 */ cmpwi r30, 0x40 -/* 8025BFE8 41 80 FF DC */ blt lbl_8025BFC4 -/* 8025BFEC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8025BFF0 48 10 62 39 */ bl _restgpr_29 -/* 8025BFF4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8025BFF8 7C 08 03 A6 */ mtlr r0 -/* 8025BFFC 38 21 00 20 */ addi r1, r1, 0x20 -/* 8025C000 4E 80 00 20 */ blr diff --git a/asm/d/shop/d_shop_system/chooseItem3__13dShopSystem_cFUc.s b/asm/d/shop/d_shop_system/chooseItem3__13dShopSystem_cFUc.s deleted file mode 100644 index e354b4d7e8..0000000000 --- a/asm/d/shop/d_shop_system/chooseItem3__13dShopSystem_cFUc.s +++ /dev/null @@ -1,396 +0,0 @@ -lbl_80197808: -/* 80197808 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 8019780C 7C 08 02 A6 */ mflr r0 -/* 80197810 90 01 00 44 */ stw r0, 0x44(r1) -/* 80197814 39 61 00 40 */ addi r11, r1, 0x40 -/* 80197818 48 1C A9 C5 */ bl _savegpr_29 -/* 8019781C 7C 7D 1B 78 */ mr r29, r3 -/* 80197820 7C 9E 23 78 */ mr r30, r4 -/* 80197824 8B E3 0F 6F */ lbz r31, 0xf6f(r3) -/* 80197828 80 83 0E 40 */ lwz r4, 0xe40(r3) -/* 8019782C 48 00 33 35 */ bl checkLeftTrigger__13dShopSystem_cFP9STControl -/* 80197830 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80197834 41 82 02 1C */ beq lbl_80197A50 -/* 80197838 57 C3 06 3E */ clrlwi r3, r30, 0x18 -/* 8019783C 28 03 00 02 */ cmplwi r3, 2 -/* 80197840 41 82 02 10 */ beq lbl_80197A50 -/* 80197844 88 1D 0F 6E */ lbz r0, 0xf6e(r29) -/* 80197848 28 00 00 07 */ cmplwi r0, 7 -/* 8019784C 40 82 00 BC */ bne lbl_80197908 -/* 80197850 88 1D 0F 6F */ lbz r0, 0xf6f(r29) -/* 80197854 98 1D 0F 6E */ stb r0, 0xf6e(r29) -/* 80197858 38 00 00 07 */ li r0, 7 -/* 8019785C 98 1D 0F 6F */ stb r0, 0xf6f(r29) -/* 80197860 88 9D 0F 6E */ lbz r4, 0xf6e(r29) -/* 80197864 28 04 00 00 */ cmplwi r4, 0 -/* 80197868 41 82 00 28 */ beq lbl_80197890 -/* 8019786C 7F A3 EB 78 */ mr r3, r29 -/* 80197870 38 84 FF FF */ addi r4, r4, -1 -/* 80197874 4B FF FD 85 */ bl isFlag__13dShopSystem_cFi -/* 80197878 2C 03 00 00 */ cmpwi r3, 0 -/* 8019787C 41 82 00 14 */ beq lbl_80197890 -/* 80197880 88 1D 0F 6F */ lbz r0, 0xf6f(r29) -/* 80197884 98 1D 0F 6E */ stb r0, 0xf6e(r29) -/* 80197888 9B FD 0F 6F */ stb r31, 0xf6f(r29) -/* 8019788C 48 00 01 C4 */ b lbl_80197A50 -lbl_80197890: -/* 80197890 57 C0 06 3E */ clrlwi r0, r30, 0x18 -/* 80197894 28 00 00 01 */ cmplwi r0, 1 -/* 80197898 41 82 00 68 */ beq lbl_80197900 -/* 8019789C 88 1D 0F 6E */ lbz r0, 0xf6e(r29) -/* 801978A0 28 00 00 00 */ cmplwi r0, 0 -/* 801978A4 41 82 00 38 */ beq lbl_801978DC -/* 801978A8 38 00 00 5F */ li r0, 0x5f -/* 801978AC 90 01 00 20 */ stw r0, 0x20(r1) -/* 801978B0 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 801978B4 38 81 00 20 */ addi r4, r1, 0x20 -/* 801978B8 38 A0 00 00 */ li r5, 0 -/* 801978BC 38 C0 00 00 */ li r6, 0 -/* 801978C0 38 E0 00 00 */ li r7, 0 -/* 801978C4 C0 22 A1 08 */ lfs f1, lit_4099(r2) -/* 801978C8 FC 40 08 90 */ fmr f2, f1 -/* 801978CC C0 62 A1 14 */ lfs f3, lit_4493(r2) -/* 801978D0 FC 80 18 90 */ fmr f4, f3 -/* 801978D4 39 00 00 00 */ li r8, 0 -/* 801978D8 48 11 40 AD */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -lbl_801978DC: -/* 801978DC 88 1D 0F 6E */ lbz r0, 0xf6e(r29) -/* 801978E0 B0 1D 0F 4C */ sth r0, 0xf4c(r29) -/* 801978E4 C0 22 A1 18 */ lfs f1, lit_4494(r2) -/* 801978E8 D0 3D 0F 38 */ stfs f1, 0xf38(r29) -/* 801978EC C0 02 A1 1C */ lfs f0, lit_4495(r2) -/* 801978F0 D0 1D 0F 3C */ stfs f0, 0xf3c(r29) -/* 801978F4 D0 3D 0F 40 */ stfs f1, 0xf40(r29) -/* 801978F8 C0 02 A1 20 */ lfs f0, lit_4496(r2) -/* 801978FC D0 1D 0F 44 */ stfs f0, 0xf44(r29) -lbl_80197900: -/* 80197900 38 60 00 03 */ li r3, 3 -/* 80197904 48 00 04 B4 */ b lbl_80197DB8 -lbl_80197908: -/* 80197908 28 00 00 04 */ cmplwi r0, 4 -/* 8019790C 40 82 00 84 */ bne lbl_80197990 -/* 80197910 98 1D 0F 6F */ stb r0, 0xf6f(r29) -/* 80197914 38 00 00 00 */ li r0, 0 -/* 80197918 98 1D 0F 6E */ stb r0, 0xf6e(r29) -/* 8019791C 28 03 00 01 */ cmplwi r3, 1 -/* 80197920 41 82 00 68 */ beq lbl_80197988 -/* 80197924 88 1D 0F 6E */ lbz r0, 0xf6e(r29) -/* 80197928 28 00 00 00 */ cmplwi r0, 0 -/* 8019792C 41 82 00 38 */ beq lbl_80197964 -/* 80197930 38 00 00 5F */ li r0, 0x5f -/* 80197934 90 01 00 1C */ stw r0, 0x1c(r1) -/* 80197938 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 8019793C 38 81 00 1C */ addi r4, r1, 0x1c -/* 80197940 38 A0 00 00 */ li r5, 0 -/* 80197944 38 C0 00 00 */ li r6, 0 -/* 80197948 38 E0 00 00 */ li r7, 0 -/* 8019794C C0 22 A1 08 */ lfs f1, lit_4099(r2) -/* 80197950 FC 40 08 90 */ fmr f2, f1 -/* 80197954 C0 62 A1 14 */ lfs f3, lit_4493(r2) -/* 80197958 FC 80 18 90 */ fmr f4, f3 -/* 8019795C 39 00 00 00 */ li r8, 0 -/* 80197960 48 11 40 25 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -lbl_80197964: -/* 80197964 88 1D 0F 6E */ lbz r0, 0xf6e(r29) -/* 80197968 B0 1D 0F 4C */ sth r0, 0xf4c(r29) -/* 8019796C C0 22 A1 18 */ lfs f1, lit_4494(r2) -/* 80197970 D0 3D 0F 38 */ stfs f1, 0xf38(r29) -/* 80197974 C0 02 A1 1C */ lfs f0, lit_4495(r2) -/* 80197978 D0 1D 0F 3C */ stfs f0, 0xf3c(r29) -/* 8019797C D0 3D 0F 40 */ stfs f1, 0xf40(r29) -/* 80197980 C0 02 A1 20 */ lfs f0, lit_4496(r2) -/* 80197984 D0 1D 0F 44 */ stfs f0, 0xf44(r29) -lbl_80197988: -/* 80197988 38 60 00 03 */ li r3, 3 -/* 8019798C 48 00 04 2C */ b lbl_80197DB8 -lbl_80197990: -/* 80197990 28 00 00 00 */ cmplwi r0, 0 -/* 80197994 41 82 00 BC */ beq lbl_80197A50 -/* 80197998 98 1D 0F 6F */ stb r0, 0xf6f(r29) -/* 8019799C 88 7D 0F 6E */ lbz r3, 0xf6e(r29) -/* 801979A0 38 03 FF FF */ addi r0, r3, -1 -/* 801979A4 98 1D 0F 6E */ stb r0, 0xf6e(r29) -/* 801979A8 88 9D 0F 6E */ lbz r4, 0xf6e(r29) -/* 801979AC 28 04 00 00 */ cmplwi r4, 0 -/* 801979B0 41 82 00 28 */ beq lbl_801979D8 -/* 801979B4 7F A3 EB 78 */ mr r3, r29 -/* 801979B8 38 84 FF FF */ addi r4, r4, -1 -/* 801979BC 4B FF FC 3D */ bl isFlag__13dShopSystem_cFi -/* 801979C0 2C 03 00 00 */ cmpwi r3, 0 -/* 801979C4 41 82 00 14 */ beq lbl_801979D8 -/* 801979C8 88 1D 0F 6F */ lbz r0, 0xf6f(r29) -/* 801979CC 98 1D 0F 6E */ stb r0, 0xf6e(r29) -/* 801979D0 9B FD 0F 6F */ stb r31, 0xf6f(r29) -/* 801979D4 48 00 00 7C */ b lbl_80197A50 -lbl_801979D8: -/* 801979D8 57 C0 06 3E */ clrlwi r0, r30, 0x18 -/* 801979DC 28 00 00 01 */ cmplwi r0, 1 -/* 801979E0 41 82 00 68 */ beq lbl_80197A48 -/* 801979E4 88 1D 0F 6E */ lbz r0, 0xf6e(r29) -/* 801979E8 28 00 00 00 */ cmplwi r0, 0 -/* 801979EC 41 82 00 38 */ beq lbl_80197A24 -/* 801979F0 38 00 00 5F */ li r0, 0x5f -/* 801979F4 90 01 00 18 */ stw r0, 0x18(r1) -/* 801979F8 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 801979FC 38 81 00 18 */ addi r4, r1, 0x18 -/* 80197A00 38 A0 00 00 */ li r5, 0 -/* 80197A04 38 C0 00 00 */ li r6, 0 -/* 80197A08 38 E0 00 00 */ li r7, 0 -/* 80197A0C C0 22 A1 08 */ lfs f1, lit_4099(r2) -/* 80197A10 FC 40 08 90 */ fmr f2, f1 -/* 80197A14 C0 62 A1 14 */ lfs f3, lit_4493(r2) -/* 80197A18 FC 80 18 90 */ fmr f4, f3 -/* 80197A1C 39 00 00 00 */ li r8, 0 -/* 80197A20 48 11 3F 65 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -lbl_80197A24: -/* 80197A24 88 1D 0F 6E */ lbz r0, 0xf6e(r29) -/* 80197A28 B0 1D 0F 4C */ sth r0, 0xf4c(r29) -/* 80197A2C C0 22 A1 18 */ lfs f1, lit_4494(r2) -/* 80197A30 D0 3D 0F 38 */ stfs f1, 0xf38(r29) -/* 80197A34 C0 02 A1 1C */ lfs f0, lit_4495(r2) -/* 80197A38 D0 1D 0F 3C */ stfs f0, 0xf3c(r29) -/* 80197A3C D0 3D 0F 40 */ stfs f1, 0xf40(r29) -/* 80197A40 C0 02 A1 20 */ lfs f0, lit_4496(r2) -/* 80197A44 D0 1D 0F 44 */ stfs f0, 0xf44(r29) -lbl_80197A48: -/* 80197A48 38 60 00 03 */ li r3, 3 -/* 80197A4C 48 00 03 6C */ b lbl_80197DB8 -lbl_80197A50: -/* 80197A50 7F A3 EB 78 */ mr r3, r29 -/* 80197A54 80 9D 0E 40 */ lwz r4, 0xe40(r29) -/* 80197A58 48 00 31 2D */ bl checkRightTrigger__13dShopSystem_cFP9STControl -/* 80197A5C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80197A60 41 82 01 8C */ beq lbl_80197BEC -/* 80197A64 57 C0 06 3E */ clrlwi r0, r30, 0x18 -/* 80197A68 28 00 00 02 */ cmplwi r0, 2 -/* 80197A6C 41 82 01 80 */ beq lbl_80197BEC -/* 80197A70 88 7D 0F 6E */ lbz r3, 0xf6e(r29) -/* 80197A74 28 03 00 07 */ cmplwi r3, 7 -/* 80197A78 41 82 01 74 */ beq lbl_80197BEC -/* 80197A7C 28 03 00 03 */ cmplwi r3, 3 -/* 80197A80 41 82 00 B8 */ beq lbl_80197B38 -/* 80197A84 28 03 00 06 */ cmplwi r3, 6 -/* 80197A88 41 82 00 B0 */ beq lbl_80197B38 -/* 80197A8C 98 7D 0F 6F */ stb r3, 0xf6f(r29) -/* 80197A90 88 7D 0F 6E */ lbz r3, 0xf6e(r29) -/* 80197A94 38 03 00 01 */ addi r0, r3, 1 -/* 80197A98 98 1D 0F 6E */ stb r0, 0xf6e(r29) -/* 80197A9C 88 9D 0F 6E */ lbz r4, 0xf6e(r29) -/* 80197AA0 28 04 00 00 */ cmplwi r4, 0 -/* 80197AA4 41 82 00 28 */ beq lbl_80197ACC -/* 80197AA8 7F A3 EB 78 */ mr r3, r29 -/* 80197AAC 38 84 FF FF */ addi r4, r4, -1 -/* 80197AB0 4B FF FB 49 */ bl isFlag__13dShopSystem_cFi -/* 80197AB4 2C 03 00 00 */ cmpwi r3, 0 -/* 80197AB8 41 82 00 14 */ beq lbl_80197ACC -/* 80197ABC 88 1D 0F 6F */ lbz r0, 0xf6f(r29) -/* 80197AC0 98 1D 0F 6E */ stb r0, 0xf6e(r29) -/* 80197AC4 9B FD 0F 6F */ stb r31, 0xf6f(r29) -/* 80197AC8 48 00 01 24 */ b lbl_80197BEC -lbl_80197ACC: -/* 80197ACC 57 C0 06 3E */ clrlwi r0, r30, 0x18 -/* 80197AD0 28 00 00 01 */ cmplwi r0, 1 -/* 80197AD4 41 82 00 5C */ beq lbl_80197B30 -/* 80197AD8 38 00 00 5F */ li r0, 0x5f -/* 80197ADC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80197AE0 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 80197AE4 38 81 00 14 */ addi r4, r1, 0x14 -/* 80197AE8 38 A0 00 00 */ li r5, 0 -/* 80197AEC 38 C0 00 00 */ li r6, 0 -/* 80197AF0 38 E0 00 00 */ li r7, 0 -/* 80197AF4 C0 22 A1 08 */ lfs f1, lit_4099(r2) -/* 80197AF8 FC 40 08 90 */ fmr f2, f1 -/* 80197AFC C0 62 A1 14 */ lfs f3, lit_4493(r2) -/* 80197B00 FC 80 18 90 */ fmr f4, f3 -/* 80197B04 39 00 00 00 */ li r8, 0 -/* 80197B08 48 11 3E 7D */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80197B0C 88 1D 0F 6E */ lbz r0, 0xf6e(r29) -/* 80197B10 B0 1D 0F 4C */ sth r0, 0xf4c(r29) -/* 80197B14 C0 22 A1 18 */ lfs f1, lit_4494(r2) -/* 80197B18 D0 3D 0F 38 */ stfs f1, 0xf38(r29) -/* 80197B1C C0 02 A1 1C */ lfs f0, lit_4495(r2) -/* 80197B20 D0 1D 0F 3C */ stfs f0, 0xf3c(r29) -/* 80197B24 D0 3D 0F 40 */ stfs f1, 0xf40(r29) -/* 80197B28 C0 02 A1 20 */ lfs f0, lit_4496(r2) -/* 80197B2C D0 1D 0F 44 */ stfs f0, 0xf44(r29) -lbl_80197B30: -/* 80197B30 38 60 00 04 */ li r3, 4 -/* 80197B34 48 00 02 84 */ b lbl_80197DB8 -lbl_80197B38: -/* 80197B38 88 0D 8A D8 */ lbz r0, data_80451058(r13) -/* 80197B3C 28 00 00 07 */ cmplwi r0, 7 -/* 80197B40 40 82 00 AC */ bne lbl_80197BEC -/* 80197B44 98 7D 0F 6F */ stb r3, 0xf6f(r29) -/* 80197B48 38 00 00 07 */ li r0, 7 -/* 80197B4C 98 1D 0F 6E */ stb r0, 0xf6e(r29) -/* 80197B50 88 9D 0F 6E */ lbz r4, 0xf6e(r29) -/* 80197B54 28 04 00 00 */ cmplwi r4, 0 -/* 80197B58 41 82 00 28 */ beq lbl_80197B80 -/* 80197B5C 7F A3 EB 78 */ mr r3, r29 -/* 80197B60 38 84 FF FF */ addi r4, r4, -1 -/* 80197B64 4B FF FA 95 */ bl isFlag__13dShopSystem_cFi -/* 80197B68 2C 03 00 00 */ cmpwi r3, 0 -/* 80197B6C 41 82 00 14 */ beq lbl_80197B80 -/* 80197B70 88 1D 0F 6F */ lbz r0, 0xf6f(r29) -/* 80197B74 98 1D 0F 6E */ stb r0, 0xf6e(r29) -/* 80197B78 9B FD 0F 6F */ stb r31, 0xf6f(r29) -/* 80197B7C 48 00 00 70 */ b lbl_80197BEC -lbl_80197B80: -/* 80197B80 57 C0 06 3E */ clrlwi r0, r30, 0x18 -/* 80197B84 28 00 00 01 */ cmplwi r0, 1 -/* 80197B88 41 82 00 5C */ beq lbl_80197BE4 -/* 80197B8C 38 00 00 5F */ li r0, 0x5f -/* 80197B90 90 01 00 10 */ stw r0, 0x10(r1) -/* 80197B94 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 80197B98 38 81 00 10 */ addi r4, r1, 0x10 -/* 80197B9C 38 A0 00 00 */ li r5, 0 -/* 80197BA0 38 C0 00 00 */ li r6, 0 -/* 80197BA4 38 E0 00 00 */ li r7, 0 -/* 80197BA8 C0 22 A1 08 */ lfs f1, lit_4099(r2) -/* 80197BAC FC 40 08 90 */ fmr f2, f1 -/* 80197BB0 C0 62 A1 14 */ lfs f3, lit_4493(r2) -/* 80197BB4 FC 80 18 90 */ fmr f4, f3 -/* 80197BB8 39 00 00 00 */ li r8, 0 -/* 80197BBC 48 11 3D C9 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80197BC0 88 1D 0F 6E */ lbz r0, 0xf6e(r29) -/* 80197BC4 B0 1D 0F 4C */ sth r0, 0xf4c(r29) -/* 80197BC8 C0 22 A1 18 */ lfs f1, lit_4494(r2) -/* 80197BCC D0 3D 0F 38 */ stfs f1, 0xf38(r29) -/* 80197BD0 C0 02 A1 1C */ lfs f0, lit_4495(r2) -/* 80197BD4 D0 1D 0F 3C */ stfs f0, 0xf3c(r29) -/* 80197BD8 D0 3D 0F 40 */ stfs f1, 0xf40(r29) -/* 80197BDC C0 02 A1 20 */ lfs f0, lit_4496(r2) -/* 80197BE0 D0 1D 0F 44 */ stfs f0, 0xf44(r29) -lbl_80197BE4: -/* 80197BE4 38 60 00 04 */ li r3, 4 -/* 80197BE8 48 00 01 D0 */ b lbl_80197DB8 -lbl_80197BEC: -/* 80197BEC 88 0D 8A D8 */ lbz r0, data_80451058(r13) -/* 80197BF0 28 00 00 06 */ cmplwi r0, 6 -/* 80197BF4 41 80 01 C0 */ blt lbl_80197DB4 -/* 80197BF8 80 7D 0E 40 */ lwz r3, 0xe40(r29) -/* 80197BFC 4B E9 A9 29 */ bl checkUpTrigger__9STControlFv -/* 80197C00 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80197C04 41 82 00 D4 */ beq lbl_80197CD8 -/* 80197C08 57 C0 06 3E */ clrlwi r0, r30, 0x18 -/* 80197C0C 28 00 00 02 */ cmplwi r0, 2 -/* 80197C10 41 82 00 C8 */ beq lbl_80197CD8 -/* 80197C14 88 1D 0F 6E */ lbz r0, 0xf6e(r29) -/* 80197C18 28 00 00 03 */ cmplwi r0, 3 -/* 80197C1C 41 81 00 BC */ bgt lbl_80197CD8 -/* 80197C20 98 1D 0F 6F */ stb r0, 0xf6f(r29) -/* 80197C24 88 7D 0F 6E */ lbz r3, 0xf6e(r29) -/* 80197C28 38 03 00 03 */ addi r0, r3, 3 -/* 80197C2C 98 1D 0F 6E */ stb r0, 0xf6e(r29) -/* 80197C30 88 9D 0F 6E */ lbz r4, 0xf6e(r29) -/* 80197C34 28 04 00 00 */ cmplwi r4, 0 -/* 80197C38 41 82 00 28 */ beq lbl_80197C60 -/* 80197C3C 7F A3 EB 78 */ mr r3, r29 -/* 80197C40 38 84 FF FF */ addi r4, r4, -1 -/* 80197C44 4B FF F9 B5 */ bl isFlag__13dShopSystem_cFi -/* 80197C48 2C 03 00 00 */ cmpwi r3, 0 -/* 80197C4C 41 82 00 14 */ beq lbl_80197C60 -/* 80197C50 88 1D 0F 6F */ lbz r0, 0xf6f(r29) -/* 80197C54 98 1D 0F 6E */ stb r0, 0xf6e(r29) -/* 80197C58 9B FD 0F 6F */ stb r31, 0xf6f(r29) -/* 80197C5C 48 00 00 7C */ b lbl_80197CD8 -lbl_80197C60: -/* 80197C60 57 C0 06 3E */ clrlwi r0, r30, 0x18 -/* 80197C64 28 00 00 01 */ cmplwi r0, 1 -/* 80197C68 41 82 00 68 */ beq lbl_80197CD0 -/* 80197C6C 88 1D 0F 6E */ lbz r0, 0xf6e(r29) -/* 80197C70 28 00 00 00 */ cmplwi r0, 0 -/* 80197C74 41 82 00 38 */ beq lbl_80197CAC -/* 80197C78 38 00 00 5F */ li r0, 0x5f -/* 80197C7C 90 01 00 0C */ stw r0, 0xc(r1) -/* 80197C80 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 80197C84 38 81 00 0C */ addi r4, r1, 0xc -/* 80197C88 38 A0 00 00 */ li r5, 0 -/* 80197C8C 38 C0 00 00 */ li r6, 0 -/* 80197C90 38 E0 00 00 */ li r7, 0 -/* 80197C94 C0 22 A1 08 */ lfs f1, lit_4099(r2) -/* 80197C98 FC 40 08 90 */ fmr f2, f1 -/* 80197C9C C0 62 A1 14 */ lfs f3, lit_4493(r2) -/* 80197CA0 FC 80 18 90 */ fmr f4, f3 -/* 80197CA4 39 00 00 00 */ li r8, 0 -/* 80197CA8 48 11 3C DD */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -lbl_80197CAC: -/* 80197CAC 88 1D 0F 6E */ lbz r0, 0xf6e(r29) -/* 80197CB0 B0 1D 0F 4C */ sth r0, 0xf4c(r29) -/* 80197CB4 C0 22 A1 18 */ lfs f1, lit_4494(r2) -/* 80197CB8 D0 3D 0F 38 */ stfs f1, 0xf38(r29) -/* 80197CBC C0 02 A1 1C */ lfs f0, lit_4495(r2) -/* 80197CC0 D0 1D 0F 3C */ stfs f0, 0xf3c(r29) -/* 80197CC4 D0 3D 0F 40 */ stfs f1, 0xf40(r29) -/* 80197CC8 C0 02 A1 20 */ lfs f0, lit_4496(r2) -/* 80197CCC D0 1D 0F 44 */ stfs f0, 0xf44(r29) -lbl_80197CD0: -/* 80197CD0 38 60 00 05 */ li r3, 5 -/* 80197CD4 48 00 00 E4 */ b lbl_80197DB8 -lbl_80197CD8: -/* 80197CD8 80 7D 0E 40 */ lwz r3, 0xe40(r29) -/* 80197CDC 4B E9 A8 C5 */ bl checkDownTrigger__9STControlFv -/* 80197CE0 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80197CE4 41 82 00 D0 */ beq lbl_80197DB4 -/* 80197CE8 57 C0 06 3E */ clrlwi r0, r30, 0x18 -/* 80197CEC 28 00 00 02 */ cmplwi r0, 2 -/* 80197CF0 41 82 00 C4 */ beq lbl_80197DB4 -/* 80197CF4 88 1D 0F 6E */ lbz r0, 0xf6e(r29) -/* 80197CF8 28 00 00 03 */ cmplwi r0, 3 -/* 80197CFC 40 81 00 B8 */ ble lbl_80197DB4 -/* 80197D00 28 00 00 06 */ cmplwi r0, 6 -/* 80197D04 41 81 00 B0 */ bgt lbl_80197DB4 -/* 80197D08 98 1D 0F 6F */ stb r0, 0xf6f(r29) -/* 80197D0C 88 7D 0F 6E */ lbz r3, 0xf6e(r29) -/* 80197D10 38 03 FF FD */ addi r0, r3, -3 -/* 80197D14 98 1D 0F 6E */ stb r0, 0xf6e(r29) -/* 80197D18 88 9D 0F 6E */ lbz r4, 0xf6e(r29) -/* 80197D1C 28 04 00 00 */ cmplwi r4, 0 -/* 80197D20 41 82 00 28 */ beq lbl_80197D48 -/* 80197D24 7F A3 EB 78 */ mr r3, r29 -/* 80197D28 38 84 FF FF */ addi r4, r4, -1 -/* 80197D2C 4B FF F8 CD */ bl isFlag__13dShopSystem_cFi -/* 80197D30 2C 03 00 00 */ cmpwi r3, 0 -/* 80197D34 41 82 00 14 */ beq lbl_80197D48 -/* 80197D38 88 1D 0F 6F */ lbz r0, 0xf6f(r29) -/* 80197D3C 98 1D 0F 6E */ stb r0, 0xf6e(r29) -/* 80197D40 9B FD 0F 6F */ stb r31, 0xf6f(r29) -/* 80197D44 48 00 00 70 */ b lbl_80197DB4 -lbl_80197D48: -/* 80197D48 57 C0 06 3E */ clrlwi r0, r30, 0x18 -/* 80197D4C 28 00 00 01 */ cmplwi r0, 1 -/* 80197D50 41 82 00 5C */ beq lbl_80197DAC -/* 80197D54 38 00 00 5F */ li r0, 0x5f -/* 80197D58 90 01 00 08 */ stw r0, 8(r1) -/* 80197D5C 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 80197D60 38 81 00 08 */ addi r4, r1, 8 -/* 80197D64 38 A0 00 00 */ li r5, 0 -/* 80197D68 38 C0 00 00 */ li r6, 0 -/* 80197D6C 38 E0 00 00 */ li r7, 0 -/* 80197D70 C0 22 A1 08 */ lfs f1, lit_4099(r2) -/* 80197D74 FC 40 08 90 */ fmr f2, f1 -/* 80197D78 C0 62 A1 14 */ lfs f3, lit_4493(r2) -/* 80197D7C FC 80 18 90 */ fmr f4, f3 -/* 80197D80 39 00 00 00 */ li r8, 0 -/* 80197D84 48 11 3C 01 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80197D88 88 1D 0F 6E */ lbz r0, 0xf6e(r29) -/* 80197D8C B0 1D 0F 4C */ sth r0, 0xf4c(r29) -/* 80197D90 C0 22 A1 18 */ lfs f1, lit_4494(r2) -/* 80197D94 D0 3D 0F 38 */ stfs f1, 0xf38(r29) -/* 80197D98 C0 02 A1 1C */ lfs f0, lit_4495(r2) -/* 80197D9C D0 1D 0F 3C */ stfs f0, 0xf3c(r29) -/* 80197DA0 D0 3D 0F 40 */ stfs f1, 0xf40(r29) -/* 80197DA4 C0 02 A1 20 */ lfs f0, lit_4496(r2) -/* 80197DA8 D0 1D 0F 44 */ stfs f0, 0xf44(r29) -lbl_80197DAC: -/* 80197DAC 38 60 00 06 */ li r3, 6 -/* 80197DB0 48 00 00 08 */ b lbl_80197DB8 -lbl_80197DB4: -/* 80197DB4 38 60 00 00 */ li r3, 0 -lbl_80197DB8: -/* 80197DB8 39 61 00 40 */ addi r11, r1, 0x40 -/* 80197DBC 48 1C A4 6D */ bl _restgpr_29 -/* 80197DC0 80 01 00 44 */ lwz r0, 0x44(r1) -/* 80197DC4 7C 08 03 A6 */ mtlr r0 -/* 80197DC8 38 21 00 40 */ addi r1, r1, 0x40 -/* 80197DCC 4E 80 00 20 */ blr diff --git a/asm/d/shop/d_shop_system/chooseItem4__13dShopSystem_cFUc.s b/asm/d/shop/d_shop_system/chooseItem4__13dShopSystem_cFUc.s deleted file mode 100644 index c6ee81129e..0000000000 --- a/asm/d/shop/d_shop_system/chooseItem4__13dShopSystem_cFUc.s +++ /dev/null @@ -1,134 +0,0 @@ -lbl_80198250: -/* 80198250 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80198254 7C 08 02 A6 */ mflr r0 -/* 80198258 90 01 00 24 */ stw r0, 0x24(r1) -/* 8019825C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80198260 48 1C 9F 7D */ bl _savegpr_29 -/* 80198264 7C 7F 1B 78 */ mr r31, r3 -/* 80198268 7C 9D 23 78 */ mr r29, r4 -/* 8019826C 8B C3 0F 6F */ lbz r30, 0xf6f(r3) -/* 80198270 80 83 0E 40 */ lwz r4, 0xe40(r3) -/* 80198274 48 00 28 ED */ bl checkLeftTrigger__13dShopSystem_cFP9STControl -/* 80198278 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8019827C 41 82 00 D4 */ beq lbl_80198350 -/* 80198280 57 A0 06 3E */ clrlwi r0, r29, 0x18 -/* 80198284 28 00 00 02 */ cmplwi r0, 2 -/* 80198288 41 82 00 C8 */ beq lbl_80198350 -/* 8019828C 88 1F 0F 6E */ lbz r0, 0xf6e(r31) -/* 80198290 28 00 00 00 */ cmplwi r0, 0 -/* 80198294 41 82 00 BC */ beq lbl_80198350 -/* 80198298 98 1F 0F 6F */ stb r0, 0xf6f(r31) -/* 8019829C 88 7F 0F 6E */ lbz r3, 0xf6e(r31) -/* 801982A0 38 03 FF FF */ addi r0, r3, -1 -/* 801982A4 98 1F 0F 6E */ stb r0, 0xf6e(r31) -/* 801982A8 88 9F 0F 6E */ lbz r4, 0xf6e(r31) -/* 801982AC 28 04 00 00 */ cmplwi r4, 0 -/* 801982B0 41 82 00 28 */ beq lbl_801982D8 -/* 801982B4 7F E3 FB 78 */ mr r3, r31 -/* 801982B8 38 84 FF FF */ addi r4, r4, -1 -/* 801982BC 4B FF F3 3D */ bl isFlag__13dShopSystem_cFi -/* 801982C0 2C 03 00 00 */ cmpwi r3, 0 -/* 801982C4 41 82 00 14 */ beq lbl_801982D8 -/* 801982C8 88 1F 0F 6F */ lbz r0, 0xf6f(r31) -/* 801982CC 98 1F 0F 6E */ stb r0, 0xf6e(r31) -/* 801982D0 9B DF 0F 6F */ stb r30, 0xf6f(r31) -/* 801982D4 48 00 00 7C */ b lbl_80198350 -lbl_801982D8: -/* 801982D8 57 A0 06 3E */ clrlwi r0, r29, 0x18 -/* 801982DC 28 00 00 01 */ cmplwi r0, 1 -/* 801982E0 41 82 00 68 */ beq lbl_80198348 -/* 801982E4 88 1F 0F 6E */ lbz r0, 0xf6e(r31) -/* 801982E8 28 00 00 00 */ cmplwi r0, 0 -/* 801982EC 41 82 00 38 */ beq lbl_80198324 -/* 801982F0 38 00 00 5F */ li r0, 0x5f -/* 801982F4 90 01 00 0C */ stw r0, 0xc(r1) -/* 801982F8 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 801982FC 38 81 00 0C */ addi r4, r1, 0xc -/* 80198300 38 A0 00 00 */ li r5, 0 -/* 80198304 38 C0 00 00 */ li r6, 0 -/* 80198308 38 E0 00 00 */ li r7, 0 -/* 8019830C C0 22 A1 08 */ lfs f1, lit_4099(r2) -/* 80198310 FC 40 08 90 */ fmr f2, f1 -/* 80198314 C0 62 A1 14 */ lfs f3, lit_4493(r2) -/* 80198318 FC 80 18 90 */ fmr f4, f3 -/* 8019831C 39 00 00 00 */ li r8, 0 -/* 80198320 48 11 36 65 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -lbl_80198324: -/* 80198324 88 1F 0F 6E */ lbz r0, 0xf6e(r31) -/* 80198328 B0 1F 0F 4C */ sth r0, 0xf4c(r31) -/* 8019832C C0 22 A1 18 */ lfs f1, lit_4494(r2) -/* 80198330 D0 3F 0F 38 */ stfs f1, 0xf38(r31) -/* 80198334 C0 02 A1 1C */ lfs f0, lit_4495(r2) -/* 80198338 D0 1F 0F 3C */ stfs f0, 0xf3c(r31) -/* 8019833C D0 3F 0F 40 */ stfs f1, 0xf40(r31) -/* 80198340 C0 02 A1 20 */ lfs f0, lit_4496(r2) -/* 80198344 D0 1F 0F 44 */ stfs f0, 0xf44(r31) -lbl_80198348: -/* 80198348 38 60 00 03 */ li r3, 3 -/* 8019834C 48 00 00 E0 */ b lbl_8019842C -lbl_80198350: -/* 80198350 7F E3 FB 78 */ mr r3, r31 -/* 80198354 80 9F 0E 40 */ lwz r4, 0xe40(r31) -/* 80198358 48 00 28 2D */ bl checkRightTrigger__13dShopSystem_cFP9STControl -/* 8019835C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80198360 41 82 00 C8 */ beq lbl_80198428 -/* 80198364 57 A0 06 3E */ clrlwi r0, r29, 0x18 -/* 80198368 28 00 00 02 */ cmplwi r0, 2 -/* 8019836C 41 82 00 BC */ beq lbl_80198428 -/* 80198370 88 1F 0F 6E */ lbz r0, 0xf6e(r31) -/* 80198374 28 00 00 04 */ cmplwi r0, 4 -/* 80198378 40 80 00 B0 */ bge lbl_80198428 -/* 8019837C 98 1F 0F 6F */ stb r0, 0xf6f(r31) -/* 80198380 88 7F 0F 6E */ lbz r3, 0xf6e(r31) -/* 80198384 38 03 00 01 */ addi r0, r3, 1 -/* 80198388 98 1F 0F 6E */ stb r0, 0xf6e(r31) -/* 8019838C 88 9F 0F 6E */ lbz r4, 0xf6e(r31) -/* 80198390 28 04 00 00 */ cmplwi r4, 0 -/* 80198394 41 82 00 28 */ beq lbl_801983BC -/* 80198398 7F E3 FB 78 */ mr r3, r31 -/* 8019839C 38 84 FF FF */ addi r4, r4, -1 -/* 801983A0 4B FF F2 59 */ bl isFlag__13dShopSystem_cFi -/* 801983A4 2C 03 00 00 */ cmpwi r3, 0 -/* 801983A8 41 82 00 14 */ beq lbl_801983BC -/* 801983AC 88 1F 0F 6F */ lbz r0, 0xf6f(r31) -/* 801983B0 98 1F 0F 6E */ stb r0, 0xf6e(r31) -/* 801983B4 9B DF 0F 6F */ stb r30, 0xf6f(r31) -/* 801983B8 48 00 00 70 */ b lbl_80198428 -lbl_801983BC: -/* 801983BC 57 A0 06 3E */ clrlwi r0, r29, 0x18 -/* 801983C0 28 00 00 01 */ cmplwi r0, 1 -/* 801983C4 41 82 00 5C */ beq lbl_80198420 -/* 801983C8 38 00 00 5F */ li r0, 0x5f -/* 801983CC 90 01 00 08 */ stw r0, 8(r1) -/* 801983D0 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 801983D4 38 81 00 08 */ addi r4, r1, 8 -/* 801983D8 38 A0 00 00 */ li r5, 0 -/* 801983DC 38 C0 00 00 */ li r6, 0 -/* 801983E0 38 E0 00 00 */ li r7, 0 -/* 801983E4 C0 22 A1 08 */ lfs f1, lit_4099(r2) -/* 801983E8 FC 40 08 90 */ fmr f2, f1 -/* 801983EC C0 62 A1 14 */ lfs f3, lit_4493(r2) -/* 801983F0 FC 80 18 90 */ fmr f4, f3 -/* 801983F4 39 00 00 00 */ li r8, 0 -/* 801983F8 48 11 35 8D */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801983FC 88 1F 0F 6E */ lbz r0, 0xf6e(r31) -/* 80198400 B0 1F 0F 4C */ sth r0, 0xf4c(r31) -/* 80198404 C0 22 A1 18 */ lfs f1, lit_4494(r2) -/* 80198408 D0 3F 0F 38 */ stfs f1, 0xf38(r31) -/* 8019840C C0 02 A1 1C */ lfs f0, lit_4495(r2) -/* 80198410 D0 1F 0F 3C */ stfs f0, 0xf3c(r31) -/* 80198414 D0 3F 0F 40 */ stfs f1, 0xf40(r31) -/* 80198418 C0 02 A1 20 */ lfs f0, lit_4496(r2) -/* 8019841C D0 1F 0F 44 */ stfs f0, 0xf44(r31) -lbl_80198420: -/* 80198420 38 60 00 04 */ li r3, 4 -/* 80198424 48 00 00 08 */ b lbl_8019842C -lbl_80198428: -/* 80198428 38 60 00 00 */ li r3, 0 -lbl_8019842C: -/* 8019842C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80198430 48 1C 9D F9 */ bl _restgpr_29 -/* 80198434 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80198438 7C 08 03 A6 */ mtlr r0 -/* 8019843C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80198440 4E 80 00 20 */ blr diff --git a/asm/d/shop/d_shop_system/chooseItem5__13dShopSystem_cFUc.s b/asm/d/shop/d_shop_system/chooseItem5__13dShopSystem_cFUc.s deleted file mode 100644 index 56e8c640b6..0000000000 --- a/asm/d/shop/d_shop_system/chooseItem5__13dShopSystem_cFUc.s +++ /dev/null @@ -1,313 +0,0 @@ -lbl_80197DD0: -/* 80197DD0 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80197DD4 7C 08 02 A6 */ mflr r0 -/* 80197DD8 90 01 00 34 */ stw r0, 0x34(r1) -/* 80197DDC 39 61 00 30 */ addi r11, r1, 0x30 -/* 80197DE0 48 1C A3 FD */ bl _savegpr_29 -/* 80197DE4 7C 7D 1B 78 */ mr r29, r3 -/* 80197DE8 7C 9E 23 78 */ mr r30, r4 -/* 80197DEC 8B E3 0F 6F */ lbz r31, 0xf6f(r3) -/* 80197DF0 80 83 0E 40 */ lwz r4, 0xe40(r3) -/* 80197DF4 48 00 2D 6D */ bl checkLeftTrigger__13dShopSystem_cFP9STControl -/* 80197DF8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80197DFC 41 82 01 5C */ beq lbl_80197F58 -/* 80197E00 57 C3 06 3E */ clrlwi r3, r30, 0x18 -/* 80197E04 28 03 00 02 */ cmplwi r3, 2 -/* 80197E08 41 82 01 50 */ beq lbl_80197F58 -/* 80197E0C 88 1D 0F 6E */ lbz r0, 0xf6e(r29) -/* 80197E10 28 00 00 03 */ cmplwi r0, 3 -/* 80197E14 40 82 00 84 */ bne lbl_80197E98 -/* 80197E18 98 1D 0F 6F */ stb r0, 0xf6f(r29) -/* 80197E1C 38 00 00 00 */ li r0, 0 -/* 80197E20 98 1D 0F 6E */ stb r0, 0xf6e(r29) -/* 80197E24 28 03 00 01 */ cmplwi r3, 1 -/* 80197E28 41 82 00 68 */ beq lbl_80197E90 -/* 80197E2C 88 1D 0F 6E */ lbz r0, 0xf6e(r29) -/* 80197E30 28 00 00 00 */ cmplwi r0, 0 -/* 80197E34 41 82 00 38 */ beq lbl_80197E6C -/* 80197E38 38 00 00 5F */ li r0, 0x5f -/* 80197E3C 90 01 00 18 */ stw r0, 0x18(r1) -/* 80197E40 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 80197E44 38 81 00 18 */ addi r4, r1, 0x18 -/* 80197E48 38 A0 00 00 */ li r5, 0 -/* 80197E4C 38 C0 00 00 */ li r6, 0 -/* 80197E50 38 E0 00 00 */ li r7, 0 -/* 80197E54 C0 22 A1 08 */ lfs f1, lit_4099(r2) -/* 80197E58 FC 40 08 90 */ fmr f2, f1 -/* 80197E5C C0 62 A1 14 */ lfs f3, lit_4493(r2) -/* 80197E60 FC 80 18 90 */ fmr f4, f3 -/* 80197E64 39 00 00 00 */ li r8, 0 -/* 80197E68 48 11 3B 1D */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -lbl_80197E6C: -/* 80197E6C 88 1D 0F 6E */ lbz r0, 0xf6e(r29) -/* 80197E70 B0 1D 0F 4C */ sth r0, 0xf4c(r29) -/* 80197E74 C0 22 A1 18 */ lfs f1, lit_4494(r2) -/* 80197E78 D0 3D 0F 38 */ stfs f1, 0xf38(r29) -/* 80197E7C C0 02 A1 1C */ lfs f0, lit_4495(r2) -/* 80197E80 D0 1D 0F 3C */ stfs f0, 0xf3c(r29) -/* 80197E84 D0 3D 0F 40 */ stfs f1, 0xf40(r29) -/* 80197E88 C0 02 A1 20 */ lfs f0, lit_4496(r2) -/* 80197E8C D0 1D 0F 44 */ stfs f0, 0xf44(r29) -lbl_80197E90: -/* 80197E90 38 60 00 03 */ li r3, 3 -/* 80197E94 48 00 03 A4 */ b lbl_80198238 -lbl_80197E98: -/* 80197E98 28 00 00 00 */ cmplwi r0, 0 -/* 80197E9C 41 82 00 BC */ beq lbl_80197F58 -/* 80197EA0 98 1D 0F 6F */ stb r0, 0xf6f(r29) -/* 80197EA4 88 7D 0F 6E */ lbz r3, 0xf6e(r29) -/* 80197EA8 38 03 FF FF */ addi r0, r3, -1 -/* 80197EAC 98 1D 0F 6E */ stb r0, 0xf6e(r29) -/* 80197EB0 88 9D 0F 6E */ lbz r4, 0xf6e(r29) -/* 80197EB4 28 04 00 00 */ cmplwi r4, 0 -/* 80197EB8 41 82 00 28 */ beq lbl_80197EE0 -/* 80197EBC 7F A3 EB 78 */ mr r3, r29 -/* 80197EC0 38 84 FF FF */ addi r4, r4, -1 -/* 80197EC4 4B FF F7 35 */ bl isFlag__13dShopSystem_cFi -/* 80197EC8 2C 03 00 00 */ cmpwi r3, 0 -/* 80197ECC 41 82 00 14 */ beq lbl_80197EE0 -/* 80197ED0 88 1D 0F 6F */ lbz r0, 0xf6f(r29) -/* 80197ED4 98 1D 0F 6E */ stb r0, 0xf6e(r29) -/* 80197ED8 9B FD 0F 6F */ stb r31, 0xf6f(r29) -/* 80197EDC 48 00 00 7C */ b lbl_80197F58 -lbl_80197EE0: -/* 80197EE0 57 C0 06 3E */ clrlwi r0, r30, 0x18 -/* 80197EE4 28 00 00 01 */ cmplwi r0, 1 -/* 80197EE8 41 82 00 68 */ beq lbl_80197F50 -/* 80197EEC 88 1D 0F 6E */ lbz r0, 0xf6e(r29) -/* 80197EF0 28 00 00 00 */ cmplwi r0, 0 -/* 80197EF4 41 82 00 38 */ beq lbl_80197F2C -/* 80197EF8 38 00 00 5F */ li r0, 0x5f -/* 80197EFC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80197F00 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 80197F04 38 81 00 14 */ addi r4, r1, 0x14 -/* 80197F08 38 A0 00 00 */ li r5, 0 -/* 80197F0C 38 C0 00 00 */ li r6, 0 -/* 80197F10 38 E0 00 00 */ li r7, 0 -/* 80197F14 C0 22 A1 08 */ lfs f1, lit_4099(r2) -/* 80197F18 FC 40 08 90 */ fmr f2, f1 -/* 80197F1C C0 62 A1 14 */ lfs f3, lit_4493(r2) -/* 80197F20 FC 80 18 90 */ fmr f4, f3 -/* 80197F24 39 00 00 00 */ li r8, 0 -/* 80197F28 48 11 3A 5D */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -lbl_80197F2C: -/* 80197F2C 88 1D 0F 6E */ lbz r0, 0xf6e(r29) -/* 80197F30 B0 1D 0F 4C */ sth r0, 0xf4c(r29) -/* 80197F34 C0 22 A1 18 */ lfs f1, lit_4494(r2) -/* 80197F38 D0 3D 0F 38 */ stfs f1, 0xf38(r29) -/* 80197F3C C0 02 A1 1C */ lfs f0, lit_4495(r2) -/* 80197F40 D0 1D 0F 3C */ stfs f0, 0xf3c(r29) -/* 80197F44 D0 3D 0F 40 */ stfs f1, 0xf40(r29) -/* 80197F48 C0 02 A1 20 */ lfs f0, lit_4496(r2) -/* 80197F4C D0 1D 0F 44 */ stfs f0, 0xf44(r29) -lbl_80197F50: -/* 80197F50 38 60 00 03 */ li r3, 3 -/* 80197F54 48 00 02 E4 */ b lbl_80198238 -lbl_80197F58: -/* 80197F58 7F A3 EB 78 */ mr r3, r29 -/* 80197F5C 80 9D 0E 40 */ lwz r4, 0xe40(r29) -/* 80197F60 48 00 2C 25 */ bl checkRightTrigger__13dShopSystem_cFP9STControl -/* 80197F64 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80197F68 41 82 00 D0 */ beq lbl_80198038 -/* 80197F6C 57 C0 06 3E */ clrlwi r0, r30, 0x18 -/* 80197F70 28 00 00 02 */ cmplwi r0, 2 -/* 80197F74 41 82 00 C4 */ beq lbl_80198038 -/* 80197F78 88 1D 0F 6E */ lbz r0, 0xf6e(r29) -/* 80197F7C 28 00 00 02 */ cmplwi r0, 2 -/* 80197F80 41 82 00 B8 */ beq lbl_80198038 -/* 80197F84 28 00 00 05 */ cmplwi r0, 5 -/* 80197F88 41 82 00 B0 */ beq lbl_80198038 -/* 80197F8C 98 1D 0F 6F */ stb r0, 0xf6f(r29) -/* 80197F90 88 7D 0F 6E */ lbz r3, 0xf6e(r29) -/* 80197F94 38 03 00 01 */ addi r0, r3, 1 -/* 80197F98 98 1D 0F 6E */ stb r0, 0xf6e(r29) -/* 80197F9C 88 9D 0F 6E */ lbz r4, 0xf6e(r29) -/* 80197FA0 28 04 00 00 */ cmplwi r4, 0 -/* 80197FA4 41 82 00 28 */ beq lbl_80197FCC -/* 80197FA8 7F A3 EB 78 */ mr r3, r29 -/* 80197FAC 38 84 FF FF */ addi r4, r4, -1 -/* 80197FB0 4B FF F6 49 */ bl isFlag__13dShopSystem_cFi -/* 80197FB4 2C 03 00 00 */ cmpwi r3, 0 -/* 80197FB8 41 82 00 14 */ beq lbl_80197FCC -/* 80197FBC 88 1D 0F 6F */ lbz r0, 0xf6f(r29) -/* 80197FC0 98 1D 0F 6E */ stb r0, 0xf6e(r29) -/* 80197FC4 9B FD 0F 6F */ stb r31, 0xf6f(r29) -/* 80197FC8 48 00 00 70 */ b lbl_80198038 -lbl_80197FCC: -/* 80197FCC 57 C0 06 3E */ clrlwi r0, r30, 0x18 -/* 80197FD0 28 00 00 01 */ cmplwi r0, 1 -/* 80197FD4 41 82 00 5C */ beq lbl_80198030 -/* 80197FD8 38 00 00 5F */ li r0, 0x5f -/* 80197FDC 90 01 00 10 */ stw r0, 0x10(r1) -/* 80197FE0 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 80197FE4 38 81 00 10 */ addi r4, r1, 0x10 -/* 80197FE8 38 A0 00 00 */ li r5, 0 -/* 80197FEC 38 C0 00 00 */ li r6, 0 -/* 80197FF0 38 E0 00 00 */ li r7, 0 -/* 80197FF4 C0 22 A1 08 */ lfs f1, lit_4099(r2) -/* 80197FF8 FC 40 08 90 */ fmr f2, f1 -/* 80197FFC C0 62 A1 14 */ lfs f3, lit_4493(r2) -/* 80198000 FC 80 18 90 */ fmr f4, f3 -/* 80198004 39 00 00 00 */ li r8, 0 -/* 80198008 48 11 39 7D */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 8019800C 88 1D 0F 6E */ lbz r0, 0xf6e(r29) -/* 80198010 B0 1D 0F 4C */ sth r0, 0xf4c(r29) -/* 80198014 C0 22 A1 18 */ lfs f1, lit_4494(r2) -/* 80198018 D0 3D 0F 38 */ stfs f1, 0xf38(r29) -/* 8019801C C0 02 A1 1C */ lfs f0, lit_4495(r2) -/* 80198020 D0 1D 0F 3C */ stfs f0, 0xf3c(r29) -/* 80198024 D0 3D 0F 40 */ stfs f1, 0xf40(r29) -/* 80198028 C0 02 A1 20 */ lfs f0, lit_4496(r2) -/* 8019802C D0 1D 0F 44 */ stfs f0, 0xf44(r29) -lbl_80198030: -/* 80198030 38 60 00 04 */ li r3, 4 -/* 80198034 48 00 02 04 */ b lbl_80198238 -lbl_80198038: -/* 80198038 80 7D 0E 40 */ lwz r3, 0xe40(r29) -/* 8019803C 4B E9 A4 E9 */ bl checkUpTrigger__9STControlFv -/* 80198040 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80198044 41 82 00 F8 */ beq lbl_8019813C -/* 80198048 57 C0 06 3E */ clrlwi r0, r30, 0x18 -/* 8019804C 28 00 00 02 */ cmplwi r0, 2 -/* 80198050 41 82 00 EC */ beq lbl_8019813C -/* 80198054 88 1D 0F 6E */ lbz r0, 0xf6e(r29) -/* 80198058 28 00 00 03 */ cmplwi r0, 3 -/* 8019805C 41 82 00 0C */ beq lbl_80198068 -/* 80198060 28 00 00 05 */ cmplwi r0, 5 -/* 80198064 40 82 00 D8 */ bne lbl_8019813C -lbl_80198068: -/* 80198068 98 1D 0F 6F */ stb r0, 0xf6f(r29) -/* 8019806C 88 1D 0F 6E */ lbz r0, 0xf6e(r29) -/* 80198070 28 00 00 03 */ cmplwi r0, 3 -/* 80198074 40 82 00 10 */ bne lbl_80198084 -/* 80198078 38 00 00 01 */ li r0, 1 -/* 8019807C 98 1D 0F 6E */ stb r0, 0xf6e(r29) -/* 80198080 48 00 00 14 */ b lbl_80198094 -lbl_80198084: -/* 80198084 28 00 00 05 */ cmplwi r0, 5 -/* 80198088 40 82 00 0C */ bne lbl_80198094 -/* 8019808C 38 00 00 02 */ li r0, 2 -/* 80198090 98 1D 0F 6E */ stb r0, 0xf6e(r29) -lbl_80198094: -/* 80198094 88 9D 0F 6E */ lbz r4, 0xf6e(r29) -/* 80198098 28 04 00 00 */ cmplwi r4, 0 -/* 8019809C 41 82 00 28 */ beq lbl_801980C4 -/* 801980A0 7F A3 EB 78 */ mr r3, r29 -/* 801980A4 38 84 FF FF */ addi r4, r4, -1 -/* 801980A8 4B FF F5 51 */ bl isFlag__13dShopSystem_cFi -/* 801980AC 2C 03 00 00 */ cmpwi r3, 0 -/* 801980B0 41 82 00 14 */ beq lbl_801980C4 -/* 801980B4 88 1D 0F 6F */ lbz r0, 0xf6f(r29) -/* 801980B8 98 1D 0F 6E */ stb r0, 0xf6e(r29) -/* 801980BC 9B FD 0F 6F */ stb r31, 0xf6f(r29) -/* 801980C0 48 00 00 7C */ b lbl_8019813C -lbl_801980C4: -/* 801980C4 57 C0 06 3E */ clrlwi r0, r30, 0x18 -/* 801980C8 28 00 00 01 */ cmplwi r0, 1 -/* 801980CC 41 82 00 68 */ beq lbl_80198134 -/* 801980D0 88 1D 0F 6E */ lbz r0, 0xf6e(r29) -/* 801980D4 28 00 00 00 */ cmplwi r0, 0 -/* 801980D8 41 82 00 38 */ beq lbl_80198110 -/* 801980DC 38 00 00 5F */ li r0, 0x5f -/* 801980E0 90 01 00 0C */ stw r0, 0xc(r1) -/* 801980E4 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 801980E8 38 81 00 0C */ addi r4, r1, 0xc -/* 801980EC 38 A0 00 00 */ li r5, 0 -/* 801980F0 38 C0 00 00 */ li r6, 0 -/* 801980F4 38 E0 00 00 */ li r7, 0 -/* 801980F8 C0 22 A1 08 */ lfs f1, lit_4099(r2) -/* 801980FC FC 40 08 90 */ fmr f2, f1 -/* 80198100 C0 62 A1 14 */ lfs f3, lit_4493(r2) -/* 80198104 FC 80 18 90 */ fmr f4, f3 -/* 80198108 39 00 00 00 */ li r8, 0 -/* 8019810C 48 11 38 79 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -lbl_80198110: -/* 80198110 88 1D 0F 6E */ lbz r0, 0xf6e(r29) -/* 80198114 B0 1D 0F 4C */ sth r0, 0xf4c(r29) -/* 80198118 C0 22 A1 18 */ lfs f1, lit_4494(r2) -/* 8019811C D0 3D 0F 38 */ stfs f1, 0xf38(r29) -/* 80198120 C0 02 A1 1C */ lfs f0, lit_4495(r2) -/* 80198124 D0 1D 0F 3C */ stfs f0, 0xf3c(r29) -/* 80198128 D0 3D 0F 40 */ stfs f1, 0xf40(r29) -/* 8019812C C0 02 A1 20 */ lfs f0, lit_4496(r2) -/* 80198130 D0 1D 0F 44 */ stfs f0, 0xf44(r29) -lbl_80198134: -/* 80198134 38 60 00 05 */ li r3, 5 -/* 80198138 48 00 01 00 */ b lbl_80198238 -lbl_8019813C: -/* 8019813C 80 7D 0E 40 */ lwz r3, 0xe40(r29) -/* 80198140 4B E9 A4 61 */ bl checkDownTrigger__9STControlFv -/* 80198144 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80198148 41 82 00 EC */ beq lbl_80198234 -/* 8019814C 57 C0 06 3E */ clrlwi r0, r30, 0x18 -/* 80198150 28 00 00 02 */ cmplwi r0, 2 -/* 80198154 41 82 00 E0 */ beq lbl_80198234 -/* 80198158 88 1D 0F 6E */ lbz r0, 0xf6e(r29) -/* 8019815C 28 00 00 01 */ cmplwi r0, 1 -/* 80198160 41 82 00 0C */ beq lbl_8019816C -/* 80198164 28 00 00 02 */ cmplwi r0, 2 -/* 80198168 40 82 00 CC */ bne lbl_80198234 -lbl_8019816C: -/* 8019816C 98 1D 0F 6F */ stb r0, 0xf6f(r29) -/* 80198170 88 1D 0F 6E */ lbz r0, 0xf6e(r29) -/* 80198174 28 00 00 01 */ cmplwi r0, 1 -/* 80198178 40 82 00 10 */ bne lbl_80198188 -/* 8019817C 38 00 00 03 */ li r0, 3 -/* 80198180 98 1D 0F 6E */ stb r0, 0xf6e(r29) -/* 80198184 48 00 00 14 */ b lbl_80198198 -lbl_80198188: -/* 80198188 28 00 00 02 */ cmplwi r0, 2 -/* 8019818C 40 82 00 0C */ bne lbl_80198198 -/* 80198190 38 00 00 05 */ li r0, 5 -/* 80198194 98 1D 0F 6E */ stb r0, 0xf6e(r29) -lbl_80198198: -/* 80198198 88 9D 0F 6E */ lbz r4, 0xf6e(r29) -/* 8019819C 28 04 00 00 */ cmplwi r4, 0 -/* 801981A0 41 82 00 28 */ beq lbl_801981C8 -/* 801981A4 7F A3 EB 78 */ mr r3, r29 -/* 801981A8 38 84 FF FF */ addi r4, r4, -1 -/* 801981AC 4B FF F4 4D */ bl isFlag__13dShopSystem_cFi -/* 801981B0 2C 03 00 00 */ cmpwi r3, 0 -/* 801981B4 41 82 00 14 */ beq lbl_801981C8 -/* 801981B8 88 1D 0F 6F */ lbz r0, 0xf6f(r29) -/* 801981BC 98 1D 0F 6E */ stb r0, 0xf6e(r29) -/* 801981C0 9B FD 0F 6F */ stb r31, 0xf6f(r29) -/* 801981C4 48 00 00 70 */ b lbl_80198234 -lbl_801981C8: -/* 801981C8 57 C0 06 3E */ clrlwi r0, r30, 0x18 -/* 801981CC 28 00 00 01 */ cmplwi r0, 1 -/* 801981D0 41 82 00 5C */ beq lbl_8019822C -/* 801981D4 38 00 00 5F */ li r0, 0x5f -/* 801981D8 90 01 00 08 */ stw r0, 8(r1) -/* 801981DC 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 801981E0 38 81 00 08 */ addi r4, r1, 8 -/* 801981E4 38 A0 00 00 */ li r5, 0 -/* 801981E8 38 C0 00 00 */ li r6, 0 -/* 801981EC 38 E0 00 00 */ li r7, 0 -/* 801981F0 C0 22 A1 08 */ lfs f1, lit_4099(r2) -/* 801981F4 FC 40 08 90 */ fmr f2, f1 -/* 801981F8 C0 62 A1 14 */ lfs f3, lit_4493(r2) -/* 801981FC FC 80 18 90 */ fmr f4, f3 -/* 80198200 39 00 00 00 */ li r8, 0 -/* 80198204 48 11 37 81 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80198208 88 1D 0F 6E */ lbz r0, 0xf6e(r29) -/* 8019820C B0 1D 0F 4C */ sth r0, 0xf4c(r29) -/* 80198210 C0 22 A1 18 */ lfs f1, lit_4494(r2) -/* 80198214 D0 3D 0F 38 */ stfs f1, 0xf38(r29) -/* 80198218 C0 02 A1 1C */ lfs f0, lit_4495(r2) -/* 8019821C D0 1D 0F 3C */ stfs f0, 0xf3c(r29) -/* 80198220 D0 3D 0F 40 */ stfs f1, 0xf40(r29) -/* 80198224 C0 02 A1 20 */ lfs f0, lit_4496(r2) -/* 80198228 D0 1D 0F 44 */ stfs f0, 0xf44(r29) -lbl_8019822C: -/* 8019822C 38 60 00 06 */ li r3, 6 -/* 80198230 48 00 00 08 */ b lbl_80198238 -lbl_80198234: -/* 80198234 38 60 00 00 */ li r3, 0 -lbl_80198238: -/* 80198238 39 61 00 30 */ addi r11, r1, 0x30 -/* 8019823C 48 1C 9F ED */ bl _restgpr_29 -/* 80198240 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80198244 7C 08 03 A6 */ mtlr r0 -/* 80198248 38 21 00 30 */ addi r1, r1, 0x30 -/* 8019824C 4E 80 00 20 */ blr diff --git a/asm/d/shop/d_shop_system/initShopSystem__13dShopSystem_cFv.s b/asm/d/shop/d_shop_system/initShopSystem__13dShopSystem_cFv.s deleted file mode 100644 index 0f3873cb51..0000000000 --- a/asm/d/shop/d_shop_system/initShopSystem__13dShopSystem_cFv.s +++ /dev/null @@ -1,114 +0,0 @@ -lbl_80197338: -/* 80197338 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8019733C 7C 08 02 A6 */ mflr r0 -/* 80197340 90 01 00 14 */ stw r0, 0x14(r1) -/* 80197344 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80197348 93 C1 00 08 */ stw r30, 8(r1) -/* 8019734C 7C 7F 1B 78 */ mr r31, r3 -/* 80197350 38 00 00 03 */ li r0, 3 -/* 80197354 98 0D 8A D8 */ stb r0, data_80451058(r13) -/* 80197358 38 E0 00 00 */ li r7, 0 -/* 8019735C 98 ED 8A E0 */ stb r7, data_80451060(r13) -/* 80197360 7C E4 3B 78 */ mr r4, r7 -/* 80197364 3C 60 80 3C */ lis r3, dShopSystem_itemActor@ha /* 0x803BB8A4@ha */ -/* 80197368 38 C3 B8 A4 */ addi r6, r3, dShopSystem_itemActor@l /* 0x803BB8A4@l */ -/* 8019736C 38 A0 00 FF */ li r5, 0xff -/* 80197370 38 6D 81 68 */ la r3, dShopSystem_itemNo(r13) /* 804506E8-_SDA_BASE_ */ -/* 80197374 38 00 00 07 */ li r0, 7 -/* 80197378 7C 09 03 A6 */ mtctr r0 -lbl_8019737C: -/* 8019737C 7C E6 21 2E */ stwx r7, r6, r4 -/* 80197380 98 A3 00 00 */ stb r5, 0(r3) -/* 80197384 38 63 00 01 */ addi r3, r3, 1 -/* 80197388 38 84 00 04 */ addi r4, r4, 4 -/* 8019738C 42 00 FF F0 */ bdnz lbl_8019737C -/* 80197390 38 A0 00 00 */ li r5, 0 -/* 80197394 90 AD 8A DC */ stw r5, dShopSystem_item_count(r13) -/* 80197398 38 60 00 00 */ li r3, 0 -/* 8019739C 38 8D 81 70 */ la r4, dShopSystem_cameraActor(r13) /* 804506F0-_SDA_BASE_ */ -/* 801973A0 38 00 00 02 */ li r0, 2 -/* 801973A4 7C 09 03 A6 */ mtctr r0 -lbl_801973A8: -/* 801973A8 7C A4 19 2E */ stwx r5, r4, r3 -/* 801973AC 38 63 00 04 */ addi r3, r3, 4 -/* 801973B0 42 00 FF F8 */ bdnz lbl_801973A8 -/* 801973B4 38 00 00 00 */ li r0, 0 -/* 801973B8 90 0D 8A E4 */ stw r0, dShopSystem_camera_count(r13) -/* 801973BC 80 1F 0E 40 */ lwz r0, 0xe40(r31) -/* 801973C0 28 00 00 00 */ cmplwi r0, 0 -/* 801973C4 40 82 00 50 */ bne lbl_80197414 -/* 801973C8 38 60 00 30 */ li r3, 0x30 -/* 801973CC 48 13 78 81 */ bl __nw__FUl -/* 801973D0 7C 7E 1B 79 */ or. r30, r3, r3 -/* 801973D4 41 82 00 3C */ beq lbl_80197410 -/* 801973D8 3C 80 80 3A */ lis r4, __vt__9STControl@ha /* 0x803A7260@ha */ -/* 801973DC 38 04 72 60 */ addi r0, r4, __vt__9STControl@l /* 0x803A7260@l */ -/* 801973E0 90 1E 00 00 */ stw r0, 0(r30) -/* 801973E4 38 80 00 0F */ li r4, 0xf -/* 801973E8 38 A0 00 0F */ li r5, 0xf -/* 801973EC 38 C0 00 00 */ li r6, 0 -/* 801973F0 38 E0 00 00 */ li r7, 0 -/* 801973F4 C0 22 A1 00 */ lfs f1, lit_4097(r2) -/* 801973F8 C0 42 A1 04 */ lfs f2, lit_4098(r2) -/* 801973FC 39 00 00 00 */ li r8, 0 -/* 80197400 39 20 20 00 */ li r9, 0x2000 -/* 80197404 4B E9 AC 85 */ bl setWaitParm__9STControlFssssffss -/* 80197408 7F C3 F3 78 */ mr r3, r30 -/* 8019740C 4B E9 AC A1 */ bl init__9STControlFv -lbl_80197410: -/* 80197410 93 DF 0E 40 */ stw r30, 0xe40(r31) -lbl_80197414: -/* 80197414 80 1F 0E 44 */ lwz r0, 0xe44(r31) -/* 80197418 28 00 00 00 */ cmplwi r0, 0 -/* 8019741C 40 82 00 48 */ bne lbl_80197464 -/* 80197420 38 60 00 B8 */ li r3, 0xb8 -/* 80197424 48 13 78 29 */ bl __nw__FUl -/* 80197428 7C 60 1B 79 */ or. r0, r3, r3 -/* 8019742C 41 82 00 18 */ beq lbl_80197444 -/* 80197430 38 80 00 01 */ li r4, 1 -/* 80197434 C0 22 A1 08 */ lfs f1, lit_4099(r2) -/* 80197438 38 A0 00 00 */ li r5, 0 -/* 8019743C 4B FF CD E5 */ bl __ct__16dSelect_cursor_cFUcfP10JKRArchive -/* 80197440 7C 60 1B 78 */ mr r0, r3 -lbl_80197444: -/* 80197444 90 1F 0E 44 */ stw r0, 0xe44(r31) -/* 80197448 80 7F 0E 44 */ lwz r3, 0xe44(r31) -/* 8019744C C0 22 A1 08 */ lfs f1, lit_4099(r2) -/* 80197450 FC 40 08 90 */ fmr f2, f1 -/* 80197454 C0 62 A1 0C */ lfs f3, lit_4100(r2) -/* 80197458 C0 82 A1 10 */ lfs f4, lit_4101(r2) -/* 8019745C FC A0 20 90 */ fmr f5, f4 -/* 80197460 4B FF DD 51 */ bl setParam__16dSelect_cursor_cFfffff -lbl_80197464: -/* 80197464 38 00 FF FF */ li r0, -1 -/* 80197468 90 1F 0F 64 */ stw r0, 0xf64(r31) -/* 8019746C 38 80 00 00 */ li r4, 0 -/* 80197470 90 9F 0F 54 */ stw r4, 0xf54(r31) -/* 80197474 90 9F 0F 58 */ stw r4, 0xf58(r31) -/* 80197478 B0 9F 0F 6A */ sth r4, 0xf6a(r31) -/* 8019747C 98 9F 0F 6E */ stb r4, 0xf6e(r31) -/* 80197480 98 9F 0F 6F */ stb r4, 0xf6f(r31) -/* 80197484 B0 9F 0F 68 */ sth r4, 0xf68(r31) -/* 80197488 98 9F 0F 70 */ stb r4, 0xf70(r31) -/* 8019748C 88 1F 0F 70 */ lbz r0, 0xf70(r31) -/* 80197490 98 1F 0F 71 */ stb r0, 0xf71(r31) -/* 80197494 98 9F 0F 79 */ stb r4, 0xf79(r31) -/* 80197498 98 9F 0F 7A */ stb r4, 0xf7a(r31) -/* 8019749C 98 9F 0F 72 */ stb r4, 0xf72(r31) -/* 801974A0 38 60 00 FF */ li r3, 0xff -/* 801974A4 98 7F 0F 73 */ stb r3, 0xf73(r31) -/* 801974A8 98 9F 0F 74 */ stb r4, 0xf74(r31) -/* 801974AC 98 9F 0F 75 */ stb r4, 0xf75(r31) -/* 801974B0 B0 9F 0F 6C */ sth r4, 0xf6c(r31) -/* 801974B4 98 9F 0F 76 */ stb r4, 0xf76(r31) -/* 801974B8 38 00 00 09 */ li r0, 9 -/* 801974BC 98 1F 0F 77 */ stb r0, 0xf77(r31) -/* 801974C0 98 7F 0F 78 */ stb r3, 0xf78(r31) -/* 801974C4 38 00 00 01 */ li r0, 1 -/* 801974C8 98 1F 09 BC */ stb r0, 0x9bc(r31) -/* 801974CC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801974D0 83 C1 00 08 */ lwz r30, 8(r1) -/* 801974D4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801974D8 7C 08 03 A6 */ mtlr r0 -/* 801974DC 38 21 00 10 */ addi r1, r1, 0x10 -/* 801974E0 4E 80 00 20 */ blr diff --git a/asm/d/shop/d_shop_system/itemZoom__13dShopSystem_cFP4cXyz.s b/asm/d/shop/d_shop_system/itemZoom__13dShopSystem_cFP4cXyz.s deleted file mode 100644 index c979584856..0000000000 --- a/asm/d/shop/d_shop_system/itemZoom__13dShopSystem_cFP4cXyz.s +++ /dev/null @@ -1,442 +0,0 @@ -lbl_80198A2C: -/* 80198A2C 94 21 FF A0 */ stwu r1, -0x60(r1) -/* 80198A30 7C 08 02 A6 */ mflr r0 -/* 80198A34 90 01 00 64 */ stw r0, 0x64(r1) -/* 80198A38 39 61 00 60 */ addi r11, r1, 0x60 -/* 80198A3C 48 1C 97 9D */ bl _savegpr_28 -/* 80198A40 7C 7C 1B 78 */ mr r28, r3 -/* 80198A44 7C 9D 23 78 */ mr r29, r4 -/* 80198A48 80 03 0F 60 */ lwz r0, 0xf60(r3) -/* 80198A4C 2C 00 00 00 */ cmpwi r0, 0 -/* 80198A50 41 80 00 9C */ blt lbl_80198AEC -/* 80198A54 C0 1D 00 00 */ lfs f0, 0(r29) -/* 80198A58 D0 01 00 44 */ stfs f0, 0x44(r1) -/* 80198A5C C0 1D 00 04 */ lfs f0, 4(r29) -/* 80198A60 D0 01 00 48 */ stfs f0, 0x48(r1) -/* 80198A64 C0 1D 00 08 */ lfs f0, 8(r29) -/* 80198A68 D0 01 00 4C */ stfs f0, 0x4c(r1) -/* 80198A6C 38 8D 81 68 */ la r4, dShopSystem_itemNo(r13) /* 804506E8-_SDA_BASE_ */ -/* 80198A70 88 1C 0F 6E */ lbz r0, 0xf6e(r28) -/* 80198A74 7C 84 02 14 */ add r4, r4, r0 -/* 80198A78 88 04 FF FF */ lbz r0, -1(r4) -/* 80198A7C 28 00 00 66 */ cmplwi r0, 0x66 -/* 80198A80 40 82 00 3C */ bne lbl_80198ABC -/* 80198A84 38 80 00 08 */ li r4, 8 -/* 80198A88 4B FF EB 71 */ bl isFlag__13dShopSystem_cFi -/* 80198A8C 30 03 FF FF */ addic r0, r3, -1 -/* 80198A90 7C E0 19 10 */ subfe r7, r0, r3 -/* 80198A94 38 7C 0E 48 */ addi r3, r28, 0xe48 -/* 80198A98 88 9C 0F 6E */ lbz r4, 0xf6e(r28) -/* 80198A9C 38 A1 00 44 */ addi r5, r1, 0x44 -/* 80198AA0 3C C0 80 43 */ lis r6, g_cursorHIO@ha /* 0x80430110@ha */ -/* 80198AA4 38 C6 01 10 */ addi r6, r6, g_cursorHIO@l /* 0x80430110@l */ -/* 80198AA8 A8 C6 00 3C */ lha r6, 0x3c(r6) -/* 80198AAC 38 06 EC 78 */ addi r0, r6, -5000 -/* 80198AB0 7C 06 07 34 */ extsh r6, r0 -/* 80198AB4 4B FF E0 F1 */ bl setZoomAnime__15dShopItemCtrl_cFiP4cXyzsb -/* 80198AB8 48 00 05 DC */ b lbl_80199094 -lbl_80198ABC: -/* 80198ABC 38 80 00 08 */ li r4, 8 -/* 80198AC0 4B FF EB 39 */ bl isFlag__13dShopSystem_cFi -/* 80198AC4 30 03 FF FF */ addic r0, r3, -1 -/* 80198AC8 7C E0 19 10 */ subfe r7, r0, r3 -/* 80198ACC 38 7C 0E 48 */ addi r3, r28, 0xe48 -/* 80198AD0 88 9C 0F 6E */ lbz r4, 0xf6e(r28) -/* 80198AD4 38 A1 00 44 */ addi r5, r1, 0x44 -/* 80198AD8 3C C0 80 43 */ lis r6, g_cursorHIO@ha /* 0x80430110@ha */ -/* 80198ADC 38 C6 01 10 */ addi r6, r6, g_cursorHIO@l /* 0x80430110@l */ -/* 80198AE0 A8 C6 00 3C */ lha r6, 0x3c(r6) -/* 80198AE4 4B FF E0 C1 */ bl setZoomAnime__15dShopItemCtrl_cFiP4cXyzsb -/* 80198AE8 48 00 05 AC */ b lbl_80199094 -lbl_80198AEC: -/* 80198AEC 3C 60 80 3C */ lis r3, dShopSystem_itemActor@ha /* 0x803BB8A4@ha */ -/* 80198AF0 38 63 B8 A4 */ addi r3, r3, dShopSystem_itemActor@l /* 0x803BB8A4@l */ -/* 80198AF4 80 83 00 04 */ lwz r4, 4(r3) -/* 80198AF8 28 04 00 00 */ cmplwi r4, 0 -/* 80198AFC 41 82 02 F0 */ beq lbl_80198DEC -/* 80198B00 3B ED 81 70 */ la r31, dShopSystem_cameraActor(r13) /* 804506F0-_SDA_BASE_ */ -/* 80198B04 80 DF 00 04 */ lwz r6, 4(r31) -/* 80198B08 28 06 00 00 */ cmplwi r6, 0 -/* 80198B0C 41 82 02 E0 */ beq lbl_80198DEC -/* 80198B10 C0 04 04 A8 */ lfs f0, 0x4a8(r4) -/* 80198B14 D0 01 00 20 */ stfs f0, 0x20(r1) -/* 80198B18 C0 04 04 AC */ lfs f0, 0x4ac(r4) -/* 80198B1C D0 01 00 24 */ stfs f0, 0x24(r1) -/* 80198B20 C0 04 04 B0 */ lfs f0, 0x4b0(r4) -/* 80198B24 D0 01 00 28 */ stfs f0, 0x28(r1) -/* 80198B28 88 0D 8A D8 */ lbz r0, data_80451058(r13) -/* 80198B2C 28 00 00 04 */ cmplwi r0, 4 -/* 80198B30 40 82 00 54 */ bne lbl_80198B84 -/* 80198B34 80 63 00 08 */ lwz r3, 8(r3) -/* 80198B38 28 03 00 00 */ cmplwi r3, 0 -/* 80198B3C 41 82 00 90 */ beq lbl_80198BCC -/* 80198B40 C0 23 04 A8 */ lfs f1, 0x4a8(r3) -/* 80198B44 C0 04 04 A8 */ lfs f0, 0x4a8(r4) -/* 80198B48 EC 01 00 2A */ fadds f0, f1, f0 -/* 80198B4C C0 42 A1 04 */ lfs f2, lit_4098(r2) -/* 80198B50 EC 00 00 B2 */ fmuls f0, f0, f2 -/* 80198B54 D0 01 00 20 */ stfs f0, 0x20(r1) -/* 80198B58 C0 23 04 AC */ lfs f1, 0x4ac(r3) -/* 80198B5C C0 04 04 AC */ lfs f0, 0x4ac(r4) -/* 80198B60 EC 01 00 2A */ fadds f0, f1, f0 -/* 80198B64 EC 00 00 B2 */ fmuls f0, f0, f2 -/* 80198B68 D0 01 00 24 */ stfs f0, 0x24(r1) -/* 80198B6C C0 23 04 B0 */ lfs f1, 0x4b0(r3) -/* 80198B70 C0 04 04 B0 */ lfs f0, 0x4b0(r4) -/* 80198B74 EC 01 00 2A */ fadds f0, f1, f0 -/* 80198B78 EC 00 00 B2 */ fmuls f0, f0, f2 -/* 80198B7C D0 01 00 28 */ stfs f0, 0x28(r1) -/* 80198B80 48 00 00 4C */ b lbl_80198BCC -lbl_80198B84: -/* 80198B84 28 00 00 05 */ cmplwi r0, 5 -/* 80198B88 40 82 00 44 */ bne lbl_80198BCC -/* 80198B8C 80 A3 00 08 */ lwz r5, 8(r3) -/* 80198B90 C0 25 04 A8 */ lfs f1, 0x4a8(r5) -/* 80198B94 80 83 00 0C */ lwz r4, 0xc(r3) -/* 80198B98 C0 04 04 A8 */ lfs f0, 0x4a8(r4) -/* 80198B9C EC 01 00 2A */ fadds f0, f1, f0 -/* 80198BA0 C0 42 A1 04 */ lfs f2, lit_4098(r2) -/* 80198BA4 EC 00 00 B2 */ fmuls f0, f0, f2 -/* 80198BA8 D0 01 00 20 */ stfs f0, 0x20(r1) -/* 80198BAC 80 63 00 00 */ lwz r3, 0(r3) -/* 80198BB0 C0 03 04 AC */ lfs f0, 0x4ac(r3) -/* 80198BB4 D0 01 00 24 */ stfs f0, 0x24(r1) -/* 80198BB8 C0 25 04 B0 */ lfs f1, 0x4b0(r5) -/* 80198BBC C0 04 04 B0 */ lfs f0, 0x4b0(r4) -/* 80198BC0 EC 01 00 2A */ fadds f0, f1, f0 -/* 80198BC4 EC 00 00 B2 */ fmuls f0, f0, f2 -/* 80198BC8 D0 01 00 28 */ stfs f0, 0x28(r1) -lbl_80198BCC: -/* 80198BCC 38 61 00 08 */ addi r3, r1, 8 -/* 80198BD0 38 81 00 20 */ addi r4, r1, 0x20 -/* 80198BD4 38 A6 04 D0 */ addi r5, r6, 0x4d0 -/* 80198BD8 48 0C DF 5D */ bl __mi__4cXyzCFRC3Vec -/* 80198BDC C0 21 00 08 */ lfs f1, 8(r1) -/* 80198BE0 D0 21 00 14 */ stfs f1, 0x14(r1) -/* 80198BE4 C0 01 00 0C */ lfs f0, 0xc(r1) -/* 80198BE8 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 80198BEC C0 41 00 10 */ lfs f2, 0x10(r1) -/* 80198BF0 D0 41 00 1C */ stfs f2, 0x1c(r1) -/* 80198BF4 48 0C EA 81 */ bl cM_atan2s__Fff -/* 80198BF8 7C 7E 1B 78 */ mr r30, r3 -/* 80198BFC 3C 60 80 39 */ lis r3, d_shop_d_shop_system__stringBase0@ha /* 0x80394C10@ha */ -/* 80198C00 38 63 4C 10 */ addi r3, r3, d_shop_d_shop_system__stringBase0@l /* 0x80394C10@l */ -/* 80198C04 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80198C08 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80198C0C 38 84 4E 00 */ addi r4, r4, 0x4e00 -/* 80198C10 48 1C FD 85 */ bl strcmp -/* 80198C14 2C 03 00 00 */ cmpwi r3, 0 -/* 80198C18 40 82 00 38 */ bne lbl_80198C50 -/* 80198C1C 3C 60 80 43 */ lis r3, g_cursorHIO@ha /* 0x80430110@ha */ -/* 80198C20 38 63 01 10 */ addi r3, r3, g_cursorHIO@l /* 0x80430110@l */ -/* 80198C24 C0 03 00 14 */ lfs f0, 0x14(r3) -/* 80198C28 D0 01 00 2C */ stfs f0, 0x2c(r1) -/* 80198C2C C0 22 A1 24 */ lfs f1, lit_5000(r2) -/* 80198C30 C0 03 00 18 */ lfs f0, 0x18(r3) -/* 80198C34 EC 01 00 2A */ fadds f0, f1, f0 -/* 80198C38 D0 01 00 30 */ stfs f0, 0x30(r1) -/* 80198C3C C0 22 A1 28 */ lfs f1, lit_5001(r2) -/* 80198C40 C0 03 00 1C */ lfs f0, 0x1c(r3) -/* 80198C44 EC 01 00 2A */ fadds f0, f1, f0 -/* 80198C48 D0 01 00 34 */ stfs f0, 0x34(r1) -/* 80198C4C 48 00 01 30 */ b lbl_80198D7C -lbl_80198C50: -/* 80198C50 88 1C 0F 77 */ lbz r0, 0xf77(r28) -/* 80198C54 28 00 00 05 */ cmplwi r0, 5 -/* 80198C58 40 82 00 B4 */ bne lbl_80198D0C -/* 80198C5C 38 6D 81 68 */ la r3, dShopSystem_itemNo(r13) /* 804506E8-_SDA_BASE_ */ -/* 80198C60 88 1C 0F 6E */ lbz r0, 0xf6e(r28) -/* 80198C64 7C 63 02 14 */ add r3, r3, r0 -/* 80198C68 88 03 FF FF */ lbz r0, -1(r3) -/* 80198C6C 28 00 00 0E */ cmplwi r0, 0xe -/* 80198C70 41 82 00 14 */ beq lbl_80198C84 -/* 80198C74 28 00 00 0F */ cmplwi r0, 0xf -/* 80198C78 41 82 00 0C */ beq lbl_80198C84 -/* 80198C7C 28 00 00 10 */ cmplwi r0, 0x10 -/* 80198C80 40 82 00 48 */ bne lbl_80198CC8 -lbl_80198C84: -/* 80198C84 3C 60 80 43 */ lis r3, g_cursorHIO@ha /* 0x80430110@ha */ -/* 80198C88 38 63 01 10 */ addi r3, r3, g_cursorHIO@l /* 0x80430110@l */ -/* 80198C8C C0 03 00 14 */ lfs f0, 0x14(r3) -/* 80198C90 D0 01 00 2C */ stfs f0, 0x2c(r1) -/* 80198C94 C0 42 A1 20 */ lfs f2, lit_4496(r2) -/* 80198C98 C0 22 A1 2C */ lfs f1, lit_5002(r2) -/* 80198C9C C0 03 00 18 */ lfs f0, 0x18(r3) -/* 80198CA0 EC 01 00 2A */ fadds f0, f1, f0 -/* 80198CA4 EC 02 00 2A */ fadds f0, f2, f0 -/* 80198CA8 D0 01 00 30 */ stfs f0, 0x30(r1) -/* 80198CAC C0 22 A1 30 */ lfs f1, lit_5003(r2) -/* 80198CB0 C0 03 00 1C */ lfs f0, 0x1c(r3) -/* 80198CB4 EC 21 00 2A */ fadds f1, f1, f0 -/* 80198CB8 C0 02 A1 34 */ lfs f0, lit_5004(r2) -/* 80198CBC EC 01 00 28 */ fsubs f0, f1, f0 -/* 80198CC0 D0 01 00 34 */ stfs f0, 0x34(r1) -/* 80198CC4 48 00 00 B8 */ b lbl_80198D7C -lbl_80198CC8: -/* 80198CC8 3C 60 80 43 */ lis r3, g_cursorHIO@ha /* 0x80430110@ha */ -/* 80198CCC 38 63 01 10 */ addi r3, r3, g_cursorHIO@l /* 0x80430110@l */ -/* 80198CD0 C0 03 00 14 */ lfs f0, 0x14(r3) -/* 80198CD4 D0 01 00 2C */ stfs f0, 0x2c(r1) -/* 80198CD8 C0 42 A1 1C */ lfs f2, lit_4495(r2) -/* 80198CDC C0 22 A1 2C */ lfs f1, lit_5002(r2) -/* 80198CE0 C0 03 00 18 */ lfs f0, 0x18(r3) -/* 80198CE4 EC 01 00 2A */ fadds f0, f1, f0 -/* 80198CE8 EC 02 00 2A */ fadds f0, f2, f0 -/* 80198CEC D0 01 00 30 */ stfs f0, 0x30(r1) -/* 80198CF0 C0 22 A1 30 */ lfs f1, lit_5003(r2) -/* 80198CF4 C0 03 00 1C */ lfs f0, 0x1c(r3) -/* 80198CF8 EC 21 00 2A */ fadds f1, f1, f0 -/* 80198CFC C0 02 A1 34 */ lfs f0, lit_5004(r2) -/* 80198D00 EC 01 00 28 */ fsubs f0, f1, f0 -/* 80198D04 D0 01 00 34 */ stfs f0, 0x34(r1) -/* 80198D08 48 00 00 74 */ b lbl_80198D7C -lbl_80198D0C: -/* 80198D0C 88 1C 0F 6E */ lbz r0, 0xf6e(r28) -/* 80198D10 28 00 00 07 */ cmplwi r0, 7 -/* 80198D14 40 82 00 38 */ bne lbl_80198D4C -/* 80198D18 3C 60 80 43 */ lis r3, g_cursorHIO@ha /* 0x80430110@ha */ -/* 80198D1C 38 63 01 10 */ addi r3, r3, g_cursorHIO@l /* 0x80430110@l */ -/* 80198D20 C0 03 00 20 */ lfs f0, 0x20(r3) -/* 80198D24 D0 01 00 2C */ stfs f0, 0x2c(r1) -/* 80198D28 C0 22 A1 38 */ lfs f1, lit_5005(r2) -/* 80198D2C C0 03 00 24 */ lfs f0, 0x24(r3) -/* 80198D30 EC 01 00 2A */ fadds f0, f1, f0 -/* 80198D34 D0 01 00 30 */ stfs f0, 0x30(r1) -/* 80198D38 C0 22 A1 3C */ lfs f1, lit_5006(r2) -/* 80198D3C C0 03 00 28 */ lfs f0, 0x28(r3) -/* 80198D40 EC 01 00 2A */ fadds f0, f1, f0 -/* 80198D44 D0 01 00 34 */ stfs f0, 0x34(r1) -/* 80198D48 48 00 00 34 */ b lbl_80198D7C -lbl_80198D4C: -/* 80198D4C 3C 60 80 43 */ lis r3, g_cursorHIO@ha /* 0x80430110@ha */ -/* 80198D50 38 63 01 10 */ addi r3, r3, g_cursorHIO@l /* 0x80430110@l */ -/* 80198D54 C0 03 00 14 */ lfs f0, 0x14(r3) -/* 80198D58 D0 01 00 2C */ stfs f0, 0x2c(r1) -/* 80198D5C C0 22 A1 2C */ lfs f1, lit_5002(r2) -/* 80198D60 C0 03 00 18 */ lfs f0, 0x18(r3) -/* 80198D64 EC 01 00 2A */ fadds f0, f1, f0 -/* 80198D68 D0 01 00 30 */ stfs f0, 0x30(r1) -/* 80198D6C C0 22 A1 30 */ lfs f1, lit_5003(r2) -/* 80198D70 C0 03 00 1C */ lfs f0, 0x1c(r3) -/* 80198D74 EC 01 00 2A */ fadds f0, f1, f0 -/* 80198D78 D0 01 00 34 */ stfs f0, 0x34(r1) -lbl_80198D7C: -/* 80198D7C 38 61 00 38 */ addi r3, r1, 0x38 -/* 80198D80 80 9F 00 04 */ lwz r4, 4(r31) -/* 80198D84 38 84 04 D0 */ addi r4, r4, 0x4d0 -/* 80198D88 7F C5 F3 78 */ mr r5, r30 -/* 80198D8C 38 C1 00 2C */ addi r6, r1, 0x2c -/* 80198D90 48 0D 80 31 */ bl cLib_offsetPos__FP4cXyzPC4cXyzsPC4cXyz -/* 80198D94 88 0D 8A D8 */ lbz r0, data_80451058(r13) -/* 80198D98 28 00 00 06 */ cmplwi r0, 6 -/* 80198D9C 41 82 00 0C */ beq lbl_80198DA8 -/* 80198DA0 28 00 00 05 */ cmplwi r0, 5 -/* 80198DA4 40 82 00 14 */ bne lbl_80198DB8 -lbl_80198DA8: -/* 80198DA8 C0 3D 00 04 */ lfs f1, 4(r29) -/* 80198DAC C0 02 A1 40 */ lfs f0, lit_5007(r2) -/* 80198DB0 EC 01 00 2A */ fadds f0, f1, f0 -/* 80198DB4 D0 1D 00 04 */ stfs f0, 4(r29) -lbl_80198DB8: -/* 80198DB8 C0 21 00 40 */ lfs f1, 0x40(r1) -/* 80198DBC C0 1D 00 08 */ lfs f0, 8(r29) -/* 80198DC0 EC 61 00 2A */ fadds f3, f1, f0 -/* 80198DC4 C0 21 00 3C */ lfs f1, 0x3c(r1) -/* 80198DC8 C0 1D 00 04 */ lfs f0, 4(r29) -/* 80198DCC EC 41 00 2A */ fadds f2, f1, f0 -/* 80198DD0 C0 21 00 38 */ lfs f1, 0x38(r1) -/* 80198DD4 C0 1D 00 00 */ lfs f0, 0(r29) -/* 80198DD8 EC 01 00 2A */ fadds f0, f1, f0 -/* 80198DDC D0 01 00 44 */ stfs f0, 0x44(r1) -/* 80198DE0 D0 41 00 48 */ stfs f2, 0x48(r1) -/* 80198DE4 D0 61 00 4C */ stfs f3, 0x4c(r1) -/* 80198DE8 48 00 00 28 */ b lbl_80198E10 -lbl_80198DEC: -/* 80198DEC C0 5D 00 00 */ lfs f2, 0(r29) -/* 80198DF0 D0 41 00 38 */ stfs f2, 0x38(r1) -/* 80198DF4 C0 3D 00 04 */ lfs f1, 4(r29) -/* 80198DF8 D0 21 00 3C */ stfs f1, 0x3c(r1) -/* 80198DFC C0 1D 00 08 */ lfs f0, 8(r29) -/* 80198E00 D0 01 00 40 */ stfs f0, 0x40(r1) -/* 80198E04 D0 41 00 44 */ stfs f2, 0x44(r1) -/* 80198E08 D0 21 00 48 */ stfs f1, 0x48(r1) -/* 80198E0C D0 01 00 4C */ stfs f0, 0x4c(r1) -lbl_80198E10: -/* 80198E10 88 1C 0F 77 */ lbz r0, 0xf77(r28) -/* 80198E14 28 00 00 01 */ cmplwi r0, 1 -/* 80198E18 40 82 00 8C */ bne lbl_80198EA4 -/* 80198E1C 38 6D 81 68 */ la r3, dShopSystem_itemNo(r13) /* 804506E8-_SDA_BASE_ */ -/* 80198E20 88 1C 0F 6E */ lbz r0, 0xf6e(r28) -/* 80198E24 7C 63 02 14 */ add r3, r3, r0 -/* 80198E28 88 03 FF FF */ lbz r0, -1(r3) -/* 80198E2C 28 00 00 66 */ cmplwi r0, 0x66 -/* 80198E30 40 82 00 40 */ bne lbl_80198E70 -/* 80198E34 7F 83 E3 78 */ mr r3, r28 -/* 80198E38 38 80 00 08 */ li r4, 8 -/* 80198E3C 4B FF E7 BD */ bl isFlag__13dShopSystem_cFi -/* 80198E40 30 03 FF FF */ addic r0, r3, -1 -/* 80198E44 7C E0 19 10 */ subfe r7, r0, r3 -/* 80198E48 38 7C 0E 48 */ addi r3, r28, 0xe48 -/* 80198E4C 88 9C 0F 6E */ lbz r4, 0xf6e(r28) -/* 80198E50 38 A1 00 44 */ addi r5, r1, 0x44 -/* 80198E54 3C C0 80 43 */ lis r6, g_cursorHIO@ha /* 0x80430110@ha */ -/* 80198E58 38 C6 01 10 */ addi r6, r6, g_cursorHIO@l /* 0x80430110@l */ -/* 80198E5C A8 C6 00 3E */ lha r6, 0x3e(r6) -/* 80198E60 38 06 E4 A8 */ addi r0, r6, -7000 -/* 80198E64 7C 06 07 34 */ extsh r6, r0 -/* 80198E68 4B FF DD 3D */ bl setZoomAnime__15dShopItemCtrl_cFiP4cXyzsb -/* 80198E6C 48 00 02 28 */ b lbl_80199094 -lbl_80198E70: -/* 80198E70 7F 83 E3 78 */ mr r3, r28 -/* 80198E74 38 80 00 08 */ li r4, 8 -/* 80198E78 4B FF E7 81 */ bl isFlag__13dShopSystem_cFi -/* 80198E7C 30 03 FF FF */ addic r0, r3, -1 -/* 80198E80 7C E0 19 10 */ subfe r7, r0, r3 -/* 80198E84 38 7C 0E 48 */ addi r3, r28, 0xe48 -/* 80198E88 88 9C 0F 6E */ lbz r4, 0xf6e(r28) -/* 80198E8C 38 A1 00 44 */ addi r5, r1, 0x44 -/* 80198E90 3C C0 80 43 */ lis r6, g_cursorHIO@ha /* 0x80430110@ha */ -/* 80198E94 38 C6 01 10 */ addi r6, r6, g_cursorHIO@l /* 0x80430110@l */ -/* 80198E98 A8 C6 00 3E */ lha r6, 0x3e(r6) -/* 80198E9C 4B FF DD 09 */ bl setZoomAnime__15dShopItemCtrl_cFiP4cXyzsb -/* 80198EA0 48 00 01 F4 */ b lbl_80199094 -lbl_80198EA4: -/* 80198EA4 28 00 00 02 */ cmplwi r0, 2 -/* 80198EA8 40 82 00 8C */ bne lbl_80198F34 -/* 80198EAC 38 6D 81 68 */ la r3, dShopSystem_itemNo(r13) /* 804506E8-_SDA_BASE_ */ -/* 80198EB0 88 1C 0F 6E */ lbz r0, 0xf6e(r28) -/* 80198EB4 7C 63 02 14 */ add r3, r3, r0 -/* 80198EB8 88 03 FF FF */ lbz r0, -1(r3) -/* 80198EBC 28 00 00 61 */ cmplwi r0, 0x61 -/* 80198EC0 40 82 00 40 */ bne lbl_80198F00 -/* 80198EC4 7F 83 E3 78 */ mr r3, r28 -/* 80198EC8 38 80 00 08 */ li r4, 8 -/* 80198ECC 4B FF E7 2D */ bl isFlag__13dShopSystem_cFi -/* 80198ED0 30 03 FF FF */ addic r0, r3, -1 -/* 80198ED4 7C E0 19 10 */ subfe r7, r0, r3 -/* 80198ED8 38 7C 0E 48 */ addi r3, r28, 0xe48 -/* 80198EDC 88 9C 0F 6E */ lbz r4, 0xf6e(r28) -/* 80198EE0 38 A1 00 44 */ addi r5, r1, 0x44 -/* 80198EE4 3C C0 80 43 */ lis r6, g_cursorHIO@ha /* 0x80430110@ha */ -/* 80198EE8 38 C6 01 10 */ addi r6, r6, g_cursorHIO@l /* 0x80430110@l */ -/* 80198EEC A8 C6 00 3E */ lha r6, 0x3e(r6) -/* 80198EF0 38 06 F4 48 */ addi r0, r6, -3000 -/* 80198EF4 7C 06 07 34 */ extsh r6, r0 -/* 80198EF8 4B FF DC AD */ bl setZoomAnime__15dShopItemCtrl_cFiP4cXyzsb -/* 80198EFC 48 00 01 98 */ b lbl_80199094 -lbl_80198F00: -/* 80198F00 7F 83 E3 78 */ mr r3, r28 -/* 80198F04 38 80 00 08 */ li r4, 8 -/* 80198F08 4B FF E6 F1 */ bl isFlag__13dShopSystem_cFi -/* 80198F0C 30 03 FF FF */ addic r0, r3, -1 -/* 80198F10 7C E0 19 10 */ subfe r7, r0, r3 -/* 80198F14 38 7C 0E 48 */ addi r3, r28, 0xe48 -/* 80198F18 88 9C 0F 6E */ lbz r4, 0xf6e(r28) -/* 80198F1C 38 A1 00 44 */ addi r5, r1, 0x44 -/* 80198F20 3C C0 80 43 */ lis r6, g_cursorHIO@ha /* 0x80430110@ha */ -/* 80198F24 38 C6 01 10 */ addi r6, r6, g_cursorHIO@l /* 0x80430110@l */ -/* 80198F28 A8 C6 00 3E */ lha r6, 0x3e(r6) -/* 80198F2C 4B FF DC 79 */ bl setZoomAnime__15dShopItemCtrl_cFiP4cXyzsb -/* 80198F30 48 00 01 64 */ b lbl_80199094 -lbl_80198F34: -/* 80198F34 28 00 00 05 */ cmplwi r0, 5 -/* 80198F38 40 82 00 A4 */ bne lbl_80198FDC -/* 80198F3C 38 6D 81 68 */ la r3, dShopSystem_itemNo(r13) /* 804506E8-_SDA_BASE_ */ -/* 80198F40 88 1C 0F 6E */ lbz r0, 0xf6e(r28) -/* 80198F44 7C 63 02 14 */ add r3, r3, r0 -/* 80198F48 88 03 FF FF */ lbz r0, -1(r3) -/* 80198F4C 28 00 00 0E */ cmplwi r0, 0xe -/* 80198F50 41 82 00 14 */ beq lbl_80198F64 -/* 80198F54 28 00 00 0F */ cmplwi r0, 0xf -/* 80198F58 41 82 00 0C */ beq lbl_80198F64 -/* 80198F5C 28 00 00 10 */ cmplwi r0, 0x10 -/* 80198F60 40 82 00 40 */ bne lbl_80198FA0 -lbl_80198F64: -/* 80198F64 7F 83 E3 78 */ mr r3, r28 -/* 80198F68 38 80 00 08 */ li r4, 8 -/* 80198F6C 4B FF E6 8D */ bl isFlag__13dShopSystem_cFi -/* 80198F70 30 03 FF FF */ addic r0, r3, -1 -/* 80198F74 7C E0 19 10 */ subfe r7, r0, r3 -/* 80198F78 38 7C 0E 48 */ addi r3, r28, 0xe48 -/* 80198F7C 88 9C 0F 6E */ lbz r4, 0xf6e(r28) -/* 80198F80 38 A1 00 44 */ addi r5, r1, 0x44 -/* 80198F84 3C C0 80 43 */ lis r6, g_cursorHIO@ha /* 0x80430110@ha */ -/* 80198F88 38 C6 01 10 */ addi r6, r6, g_cursorHIO@l /* 0x80430110@l */ -/* 80198F8C A8 C6 00 3E */ lha r6, 0x3e(r6) -/* 80198F90 38 06 F0 60 */ addi r0, r6, -4000 -/* 80198F94 7C 06 07 34 */ extsh r6, r0 -/* 80198F98 4B FF DC 0D */ bl setZoomAnime__15dShopItemCtrl_cFiP4cXyzsb -/* 80198F9C 48 00 00 F8 */ b lbl_80199094 -lbl_80198FA0: -/* 80198FA0 7F 83 E3 78 */ mr r3, r28 -/* 80198FA4 38 80 00 08 */ li r4, 8 -/* 80198FA8 4B FF E6 51 */ bl isFlag__13dShopSystem_cFi -/* 80198FAC 30 03 FF FF */ addic r0, r3, -1 -/* 80198FB0 7C E0 19 10 */ subfe r7, r0, r3 -/* 80198FB4 38 7C 0E 48 */ addi r3, r28, 0xe48 -/* 80198FB8 88 9C 0F 6E */ lbz r4, 0xf6e(r28) -/* 80198FBC 38 A1 00 44 */ addi r5, r1, 0x44 -/* 80198FC0 3C C0 80 43 */ lis r6, g_cursorHIO@ha /* 0x80430110@ha */ -/* 80198FC4 38 C6 01 10 */ addi r6, r6, g_cursorHIO@l /* 0x80430110@l */ -/* 80198FC8 A8 C6 00 3E */ lha r6, 0x3e(r6) -/* 80198FCC 38 06 F8 30 */ addi r0, r6, -2000 -/* 80198FD0 7C 06 07 34 */ extsh r6, r0 -/* 80198FD4 4B FF DB D1 */ bl setZoomAnime__15dShopItemCtrl_cFiP4cXyzsb -/* 80198FD8 48 00 00 BC */ b lbl_80199094 -lbl_80198FDC: -/* 80198FDC 88 1C 0F 6E */ lbz r0, 0xf6e(r28) -/* 80198FE0 28 00 00 07 */ cmplwi r0, 7 -/* 80198FE4 40 82 00 38 */ bne lbl_8019901C -/* 80198FE8 7F 83 E3 78 */ mr r3, r28 -/* 80198FEC 38 80 00 08 */ li r4, 8 -/* 80198FF0 4B FF E6 09 */ bl isFlag__13dShopSystem_cFi -/* 80198FF4 30 03 FF FF */ addic r0, r3, -1 -/* 80198FF8 7C E0 19 10 */ subfe r7, r0, r3 -/* 80198FFC 38 7C 0E 48 */ addi r3, r28, 0xe48 -/* 80199000 88 9C 0F 6E */ lbz r4, 0xf6e(r28) -/* 80199004 38 A1 00 44 */ addi r5, r1, 0x44 -/* 80199008 3C C0 80 43 */ lis r6, g_cursorHIO@ha /* 0x80430110@ha */ -/* 8019900C 38 C6 01 10 */ addi r6, r6, g_cursorHIO@l /* 0x80430110@l */ -/* 80199010 A8 C6 00 40 */ lha r6, 0x40(r6) -/* 80199014 4B FF DB 91 */ bl setZoomAnime__15dShopItemCtrl_cFiP4cXyzsb -/* 80199018 48 00 00 7C */ b lbl_80199094 -lbl_8019901C: -/* 8019901C 88 0D 8A D8 */ lbz r0, data_80451058(r13) -/* 80199020 28 00 00 07 */ cmplwi r0, 7 -/* 80199024 40 82 00 40 */ bne lbl_80199064 -/* 80199028 7F 83 E3 78 */ mr r3, r28 -/* 8019902C 38 80 00 08 */ li r4, 8 -/* 80199030 4B FF E5 C9 */ bl isFlag__13dShopSystem_cFi -/* 80199034 30 03 FF FF */ addic r0, r3, -1 -/* 80199038 7C E0 19 10 */ subfe r7, r0, r3 -/* 8019903C 38 7C 0E 48 */ addi r3, r28, 0xe48 -/* 80199040 88 9C 0F 6E */ lbz r4, 0xf6e(r28) -/* 80199044 38 A1 00 44 */ addi r5, r1, 0x44 -/* 80199048 3C C0 80 43 */ lis r6, g_cursorHIO@ha /* 0x80430110@ha */ -/* 8019904C 38 C6 01 10 */ addi r6, r6, g_cursorHIO@l /* 0x80430110@l */ -/* 80199050 A8 C6 00 3E */ lha r6, 0x3e(r6) -/* 80199054 38 06 F4 48 */ addi r0, r6, -3000 -/* 80199058 7C 06 07 34 */ extsh r6, r0 -/* 8019905C 4B FF DB 49 */ bl setZoomAnime__15dShopItemCtrl_cFiP4cXyzsb -/* 80199060 48 00 00 34 */ b lbl_80199094 -lbl_80199064: -/* 80199064 7F 83 E3 78 */ mr r3, r28 -/* 80199068 38 80 00 08 */ li r4, 8 -/* 8019906C 4B FF E5 8D */ bl isFlag__13dShopSystem_cFi -/* 80199070 30 03 FF FF */ addic r0, r3, -1 -/* 80199074 7C E0 19 10 */ subfe r7, r0, r3 -/* 80199078 38 7C 0E 48 */ addi r3, r28, 0xe48 -/* 8019907C 88 9C 0F 6E */ lbz r4, 0xf6e(r28) -/* 80199080 38 A1 00 44 */ addi r5, r1, 0x44 -/* 80199084 3C C0 80 43 */ lis r6, g_cursorHIO@ha /* 0x80430110@ha */ -/* 80199088 38 C6 01 10 */ addi r6, r6, g_cursorHIO@l /* 0x80430110@l */ -/* 8019908C A8 C6 00 3E */ lha r6, 0x3e(r6) -/* 80199090 4B FF DB 15 */ bl setZoomAnime__15dShopItemCtrl_cFiP4cXyzsb -lbl_80199094: -/* 80199094 38 60 00 01 */ li r3, 1 -/* 80199098 39 61 00 60 */ addi r11, r1, 0x60 -/* 8019909C 48 1C 91 89 */ bl _restgpr_28 -/* 801990A0 80 01 00 64 */ lwz r0, 0x64(r1) -/* 801990A4 7C 08 03 A6 */ mtlr r0 -/* 801990A8 38 21 00 60 */ addi r1, r1, 0x60 -/* 801990AC 4E 80 00 20 */ blr diff --git a/asm/d/shop/d_shop_system/moveCursor0__13dShopSystem_cFiUc.s b/asm/d/shop/d_shop_system/moveCursor0__13dShopSystem_cFiUc.s deleted file mode 100644 index 1c0388c957..0000000000 --- a/asm/d/shop/d_shop_system/moveCursor0__13dShopSystem_cFiUc.s +++ /dev/null @@ -1,176 +0,0 @@ -lbl_80198488: -/* 80198488 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8019848C 7C 08 02 A6 */ mflr r0 -/* 80198490 90 01 00 24 */ stw r0, 0x24(r1) -/* 80198494 39 61 00 20 */ addi r11, r1, 0x20 -/* 80198498 48 1C 9D 45 */ bl _savegpr_29 -/* 8019849C 7C 7D 1B 78 */ mr r29, r3 -/* 801984A0 7C 9E 23 78 */ mr r30, r4 -/* 801984A4 7C BF 2B 78 */ mr r31, r5 -/* 801984A8 38 80 00 07 */ li r4, 7 -/* 801984AC 4B FF F1 31 */ bl offFlag__13dShopSystem_cFi -/* 801984B0 2C 1E 00 04 */ cmpwi r30, 4 -/* 801984B4 41 82 00 78 */ beq lbl_8019852C -/* 801984B8 40 80 00 1C */ bge lbl_801984D4 -/* 801984BC 2C 1E 00 02 */ cmpwi r30, 2 -/* 801984C0 41 82 01 80 */ beq lbl_80198640 -/* 801984C4 40 80 00 1C */ bge lbl_801984E0 -/* 801984C8 2C 1E 00 01 */ cmpwi r30, 1 -/* 801984CC 40 80 00 F8 */ bge lbl_801985C4 -/* 801984D0 48 00 02 1C */ b lbl_801986EC -lbl_801984D4: -/* 801984D4 2C 1E 00 07 */ cmpwi r30, 7 -/* 801984D8 41 82 00 A0 */ beq lbl_80198578 -/* 801984DC 48 00 02 10 */ b lbl_801986EC -lbl_801984E0: -/* 801984E0 88 1D 0F 6E */ lbz r0, 0xf6e(r29) -/* 801984E4 28 00 00 00 */ cmplwi r0, 0 -/* 801984E8 40 82 00 20 */ bne lbl_80198508 -/* 801984EC 80 7D 0F 54 */ lwz r3, 0xf54(r29) -/* 801984F0 20 00 00 03 */ subfic r0, r0, 3 -/* 801984F4 54 00 18 38 */ slwi r0, r0, 3 -/* 801984F8 7C 60 04 30 */ srw r0, r3, r0 -/* 801984FC 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 80198500 38 63 00 52 */ addi r3, r3, 0x52 -/* 80198504 48 00 01 EC */ b lbl_801986F0 -lbl_80198508: -/* 80198508 80 7D 0F 54 */ lwz r3, 0xf54(r29) -/* 8019850C 20 00 00 03 */ subfic r0, r0, 3 -/* 80198510 54 00 18 38 */ slwi r0, r0, 3 -/* 80198514 7C 60 04 30 */ srw r0, r3, r0 -/* 80198518 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 8019851C 38 03 FF FF */ addi r0, r3, -1 -/* 80198520 54 03 08 3C */ slwi r3, r0, 1 -/* 80198524 38 63 00 66 */ addi r3, r3, 0x66 -/* 80198528 48 00 01 C8 */ b lbl_801986F0 -lbl_8019852C: -/* 8019852C 88 1D 0F 6E */ lbz r0, 0xf6e(r29) -/* 80198530 28 00 00 00 */ cmplwi r0, 0 -/* 80198534 40 82 00 20 */ bne lbl_80198554 -/* 80198538 80 7D 0F 54 */ lwz r3, 0xf54(r29) -/* 8019853C 20 00 00 03 */ subfic r0, r0, 3 -/* 80198540 54 00 18 38 */ slwi r0, r0, 3 -/* 80198544 7C 60 04 30 */ srw r0, r3, r0 -/* 80198548 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 8019854C 38 63 00 52 */ addi r3, r3, 0x52 -/* 80198550 48 00 01 A0 */ b lbl_801986F0 -lbl_80198554: -/* 80198554 80 7D 0F 54 */ lwz r3, 0xf54(r29) -/* 80198558 20 00 00 03 */ subfic r0, r0, 3 -/* 8019855C 54 00 18 38 */ slwi r0, r0, 3 -/* 80198560 7C 60 04 30 */ srw r0, r3, r0 -/* 80198564 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 80198568 38 03 FF FF */ addi r0, r3, -1 -/* 8019856C 54 03 08 3C */ slwi r3, r0, 1 -/* 80198570 38 63 00 66 */ addi r3, r3, 0x66 -/* 80198574 48 00 01 7C */ b lbl_801986F0 -lbl_80198578: -/* 80198578 88 1D 0F 6E */ lbz r0, 0xf6e(r29) -/* 8019857C 28 00 00 00 */ cmplwi r0, 0 -/* 80198580 40 82 00 20 */ bne lbl_801985A0 -/* 80198584 80 7D 0F 54 */ lwz r3, 0xf54(r29) -/* 80198588 20 00 00 03 */ subfic r0, r0, 3 -/* 8019858C 54 00 18 38 */ slwi r0, r0, 3 -/* 80198590 7C 60 04 30 */ srw r0, r3, r0 -/* 80198594 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 80198598 38 63 00 52 */ addi r3, r3, 0x52 -/* 8019859C 48 00 01 54 */ b lbl_801986F0 -lbl_801985A0: -/* 801985A0 80 7D 0F 54 */ lwz r3, 0xf54(r29) -/* 801985A4 20 00 00 03 */ subfic r0, r0, 3 -/* 801985A8 54 00 18 38 */ slwi r0, r0, 3 -/* 801985AC 7C 60 04 30 */ srw r0, r3, r0 -/* 801985B0 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 801985B4 38 03 FF FF */ addi r0, r3, -1 -/* 801985B8 54 03 08 3C */ slwi r3, r0, 1 -/* 801985BC 38 63 00 66 */ addi r3, r3, 0x66 -/* 801985C0 48 00 01 30 */ b lbl_801986F0 -lbl_801985C4: -/* 801985C4 88 9D 0F 6E */ lbz r4, 0xf6e(r29) -/* 801985C8 28 04 00 00 */ cmplwi r4, 0 -/* 801985CC 40 82 00 20 */ bne lbl_801985EC -/* 801985D0 80 7D 0F 54 */ lwz r3, 0xf54(r29) -/* 801985D4 20 04 00 03 */ subfic r0, r4, 3 -/* 801985D8 54 00 18 38 */ slwi r0, r0, 3 -/* 801985DC 7C 60 04 30 */ srw r0, r3, r0 -/* 801985E0 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 801985E4 38 63 00 52 */ addi r3, r3, 0x52 -/* 801985E8 48 00 01 08 */ b lbl_801986F0 -lbl_801985EC: -/* 801985EC 57 E0 06 3E */ clrlwi r0, r31, 0x18 -/* 801985F0 28 00 00 02 */ cmplwi r0, 2 -/* 801985F4 41 82 00 28 */ beq lbl_8019861C -/* 801985F8 80 7D 0F 54 */ lwz r3, 0xf54(r29) -/* 801985FC 20 04 00 03 */ subfic r0, r4, 3 -/* 80198600 54 00 18 38 */ slwi r0, r0, 3 -/* 80198604 7C 60 04 30 */ srw r0, r3, r0 -/* 80198608 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 8019860C 38 03 FF FF */ addi r0, r3, -1 -/* 80198610 54 03 08 3C */ slwi r3, r0, 1 -/* 80198614 38 63 00 65 */ addi r3, r3, 0x65 -/* 80198618 48 00 00 D8 */ b lbl_801986F0 -lbl_8019861C: -/* 8019861C 80 7D 0F 54 */ lwz r3, 0xf54(r29) -/* 80198620 20 04 00 03 */ subfic r0, r4, 3 -/* 80198624 54 00 18 38 */ slwi r0, r0, 3 -/* 80198628 7C 60 04 30 */ srw r0, r3, r0 -/* 8019862C 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 80198630 38 03 FF FF */ addi r0, r3, -1 -/* 80198634 54 03 08 3C */ slwi r3, r0, 1 -/* 80198638 38 63 00 66 */ addi r3, r3, 0x66 -/* 8019863C 48 00 00 B4 */ b lbl_801986F0 -lbl_80198640: -/* 80198640 7F A3 EB 78 */ mr r3, r29 -/* 80198644 38 80 00 07 */ li r4, 7 -/* 80198648 4B FF EF 79 */ bl onFlag__13dShopSystem_cFi -/* 8019864C 88 1D 0F 6E */ lbz r0, 0xf6e(r29) -/* 80198650 B0 1D 0F 4C */ sth r0, 0xf4c(r29) -/* 80198654 C0 22 A1 18 */ lfs f1, lit_4494(r2) -/* 80198658 D0 3D 0F 38 */ stfs f1, 0xf38(r29) -/* 8019865C C0 02 A1 1C */ lfs f0, lit_4495(r2) -/* 80198660 D0 1D 0F 3C */ stfs f0, 0xf3c(r29) -/* 80198664 D0 3D 0F 40 */ stfs f1, 0xf40(r29) -/* 80198668 C0 02 A1 20 */ lfs f0, lit_4496(r2) -/* 8019866C D0 1D 0F 44 */ stfs f0, 0xf44(r29) -/* 80198670 88 9D 0F 6E */ lbz r4, 0xf6e(r29) -/* 80198674 28 04 00 00 */ cmplwi r4, 0 -/* 80198678 40 82 00 20 */ bne lbl_80198698 -/* 8019867C 80 7D 0F 54 */ lwz r3, 0xf54(r29) -/* 80198680 20 04 00 03 */ subfic r0, r4, 3 -/* 80198684 54 00 18 38 */ slwi r0, r0, 3 -/* 80198688 7C 60 04 30 */ srw r0, r3, r0 -/* 8019868C 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 80198690 38 63 00 52 */ addi r3, r3, 0x52 -/* 80198694 48 00 00 5C */ b lbl_801986F0 -lbl_80198698: -/* 80198698 57 E0 06 3E */ clrlwi r0, r31, 0x18 -/* 8019869C 28 00 00 02 */ cmplwi r0, 2 -/* 801986A0 41 82 00 28 */ beq lbl_801986C8 -/* 801986A4 80 7D 0F 54 */ lwz r3, 0xf54(r29) -/* 801986A8 20 04 00 03 */ subfic r0, r4, 3 -/* 801986AC 54 00 18 38 */ slwi r0, r0, 3 -/* 801986B0 7C 60 04 30 */ srw r0, r3, r0 -/* 801986B4 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 801986B8 38 03 FF FF */ addi r0, r3, -1 -/* 801986BC 54 03 08 3C */ slwi r3, r0, 1 -/* 801986C0 38 63 00 65 */ addi r3, r3, 0x65 -/* 801986C4 48 00 00 2C */ b lbl_801986F0 -lbl_801986C8: -/* 801986C8 80 7D 0F 54 */ lwz r3, 0xf54(r29) -/* 801986CC 20 04 00 03 */ subfic r0, r4, 3 -/* 801986D0 54 00 18 38 */ slwi r0, r0, 3 -/* 801986D4 7C 60 04 30 */ srw r0, r3, r0 -/* 801986D8 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 801986DC 38 03 FF FF */ addi r0, r3, -1 -/* 801986E0 54 03 08 3C */ slwi r3, r0, 1 -/* 801986E4 38 63 00 66 */ addi r3, r3, 0x66 -/* 801986E8 48 00 00 08 */ b lbl_801986F0 -lbl_801986EC: -/* 801986EC 38 60 00 00 */ li r3, 0 -lbl_801986F0: -/* 801986F0 39 61 00 20 */ addi r11, r1, 0x20 -/* 801986F4 48 1C 9B 35 */ bl _restgpr_29 -/* 801986F8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801986FC 7C 08 03 A6 */ mtlr r0 -/* 80198700 38 21 00 20 */ addi r1, r1, 0x20 -/* 80198704 4E 80 00 20 */ blr diff --git a/asm/d/shop/d_shop_system/moveCursor1__13dShopSystem_cFiUc.s b/asm/d/shop/d_shop_system/moveCursor1__13dShopSystem_cFiUc.s deleted file mode 100644 index 4a3c94c2e6..0000000000 --- a/asm/d/shop/d_shop_system/moveCursor1__13dShopSystem_cFiUc.s +++ /dev/null @@ -1,103 +0,0 @@ -lbl_80198708: -/* 80198708 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8019870C 7C 08 02 A6 */ mflr r0 -/* 80198710 90 01 00 24 */ stw r0, 0x24(r1) -/* 80198714 39 61 00 20 */ addi r11, r1, 0x20 -/* 80198718 48 1C 9A C5 */ bl _savegpr_29 -/* 8019871C 7C 7F 1B 78 */ mr r31, r3 -/* 80198720 7C 9D 23 78 */ mr r29, r4 -/* 80198724 7C BE 2B 78 */ mr r30, r5 -/* 80198728 38 80 00 07 */ li r4, 7 -/* 8019872C 4B FF EE B1 */ bl offFlag__13dShopSystem_cFi -/* 80198730 2C 1D 00 02 */ cmpwi r29, 2 -/* 80198734 41 82 00 A4 */ beq lbl_801987D8 -/* 80198738 40 80 00 10 */ bge lbl_80198748 -/* 8019873C 2C 1D 00 01 */ cmpwi r29, 1 -/* 80198740 40 80 00 44 */ bge lbl_80198784 -/* 80198744 48 00 01 18 */ b lbl_8019885C -lbl_80198748: -/* 80198748 2C 1D 00 08 */ cmpwi r29, 8 -/* 8019874C 40 80 01 10 */ bge lbl_8019885C -/* 80198750 88 7F 0F 6E */ lbz r3, 0xf6e(r31) -/* 80198754 28 03 00 00 */ cmplwi r3, 0 -/* 80198758 40 82 00 14 */ bne lbl_8019876C -/* 8019875C 7F E3 FB 78 */ mr r3, r31 -/* 80198760 48 00 23 A1 */ bl getFlowNodeNum__13dShopSystem_cFv -/* 80198764 38 63 00 01 */ addi r3, r3, 1 -/* 80198768 48 00 00 F8 */ b lbl_80198860 -lbl_8019876C: -/* 8019876C 38 03 FF FF */ addi r0, r3, -1 -/* 80198770 54 00 08 3C */ slwi r0, r0, 1 -/* 80198774 7C 7F 02 14 */ add r3, r31, r0 -/* 80198778 A0 63 0E 68 */ lhz r3, 0xe68(r3) -/* 8019877C 38 63 00 01 */ addi r3, r3, 1 -/* 80198780 48 00 00 E0 */ b lbl_80198860 -lbl_80198784: -/* 80198784 88 7F 0F 6E */ lbz r3, 0xf6e(r31) -/* 80198788 28 03 00 00 */ cmplwi r3, 0 -/* 8019878C 40 82 00 14 */ bne lbl_801987A0 -/* 80198790 7F E3 FB 78 */ mr r3, r31 -/* 80198794 48 00 23 6D */ bl getFlowNodeNum__13dShopSystem_cFv -/* 80198798 38 63 00 01 */ addi r3, r3, 1 -/* 8019879C 48 00 00 C4 */ b lbl_80198860 -lbl_801987A0: -/* 801987A0 57 C0 06 3E */ clrlwi r0, r30, 0x18 -/* 801987A4 28 00 00 02 */ cmplwi r0, 2 -/* 801987A8 41 82 00 18 */ beq lbl_801987C0 -/* 801987AC 38 03 FF FF */ addi r0, r3, -1 -/* 801987B0 54 00 08 3C */ slwi r0, r0, 1 -/* 801987B4 7C 7F 02 14 */ add r3, r31, r0 -/* 801987B8 A0 63 0E 68 */ lhz r3, 0xe68(r3) -/* 801987BC 48 00 00 A4 */ b lbl_80198860 -lbl_801987C0: -/* 801987C0 38 03 FF FF */ addi r0, r3, -1 -/* 801987C4 54 00 08 3C */ slwi r0, r0, 1 -/* 801987C8 7C 7F 02 14 */ add r3, r31, r0 -/* 801987CC A0 63 0E 68 */ lhz r3, 0xe68(r3) -/* 801987D0 38 63 00 01 */ addi r3, r3, 1 -/* 801987D4 48 00 00 8C */ b lbl_80198860 -lbl_801987D8: -/* 801987D8 7F E3 FB 78 */ mr r3, r31 -/* 801987DC 38 80 00 07 */ li r4, 7 -/* 801987E0 4B FF ED E1 */ bl onFlag__13dShopSystem_cFi -/* 801987E4 88 1F 0F 6E */ lbz r0, 0xf6e(r31) -/* 801987E8 B0 1F 0F 4C */ sth r0, 0xf4c(r31) -/* 801987EC C0 22 A1 18 */ lfs f1, lit_4494(r2) -/* 801987F0 D0 3F 0F 38 */ stfs f1, 0xf38(r31) -/* 801987F4 C0 02 A1 1C */ lfs f0, lit_4495(r2) -/* 801987F8 D0 1F 0F 3C */ stfs f0, 0xf3c(r31) -/* 801987FC D0 3F 0F 40 */ stfs f1, 0xf40(r31) -/* 80198800 C0 02 A1 20 */ lfs f0, lit_4496(r2) -/* 80198804 D0 1F 0F 44 */ stfs f0, 0xf44(r31) -/* 80198808 88 7F 0F 6E */ lbz r3, 0xf6e(r31) -/* 8019880C 28 03 00 00 */ cmplwi r3, 0 -/* 80198810 40 82 00 14 */ bne lbl_80198824 -/* 80198814 7F E3 FB 78 */ mr r3, r31 -/* 80198818 48 00 22 E9 */ bl getFlowNodeNum__13dShopSystem_cFv -/* 8019881C 38 63 00 01 */ addi r3, r3, 1 -/* 80198820 48 00 00 40 */ b lbl_80198860 -lbl_80198824: -/* 80198824 57 C0 06 3E */ clrlwi r0, r30, 0x18 -/* 80198828 28 00 00 02 */ cmplwi r0, 2 -/* 8019882C 41 82 00 18 */ beq lbl_80198844 -/* 80198830 38 03 FF FF */ addi r0, r3, -1 -/* 80198834 54 00 08 3C */ slwi r0, r0, 1 -/* 80198838 7C 7F 02 14 */ add r3, r31, r0 -/* 8019883C A0 63 0E 68 */ lhz r3, 0xe68(r3) -/* 80198840 48 00 00 20 */ b lbl_80198860 -lbl_80198844: -/* 80198844 38 03 FF FF */ addi r0, r3, -1 -/* 80198848 54 00 08 3C */ slwi r0, r0, 1 -/* 8019884C 7C 7F 02 14 */ add r3, r31, r0 -/* 80198850 A0 63 0E 68 */ lhz r3, 0xe68(r3) -/* 80198854 38 63 00 01 */ addi r3, r3, 1 -/* 80198858 48 00 00 08 */ b lbl_80198860 -lbl_8019885C: -/* 8019885C 38 60 00 00 */ li r3, 0 -lbl_80198860: -/* 80198860 39 61 00 20 */ addi r11, r1, 0x20 -/* 80198864 48 1C 99 C5 */ bl _restgpr_29 -/* 80198868 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8019886C 7C 08 03 A6 */ mtlr r0 -/* 80198870 38 21 00 20 */ addi r1, r1, 0x20 -/* 80198874 4E 80 00 20 */ blr diff --git a/asm/d/shop/d_shop_system/searchItemActor__13dShopSystem_cFv.s b/asm/d/shop/d_shop_system/searchItemActor__13dShopSystem_cFv.s deleted file mode 100644 index a187ffefcd..0000000000 --- a/asm/d/shop/d_shop_system/searchItemActor__13dShopSystem_cFv.s +++ /dev/null @@ -1,361 +0,0 @@ -lbl_8019A5D0: -/* 8019A5D0 94 21 FF 40 */ stwu r1, -0xc0(r1) -/* 8019A5D4 7C 08 02 A6 */ mflr r0 -/* 8019A5D8 90 01 00 C4 */ stw r0, 0xc4(r1) -/* 8019A5DC DB E1 00 B0 */ stfd f31, 0xb0(r1) -/* 8019A5E0 F3 E1 00 B8 */ psq_st f31, 184(r1), 0, 0 /* qr0 */ -/* 8019A5E4 39 61 00 B0 */ addi r11, r1, 0xb0 -/* 8019A5E8 48 1C 7B D5 */ bl _savegpr_21 -/* 8019A5EC 7C 7E 1B 78 */ mr r30, r3 -/* 8019A5F0 80 6D 8A DC */ lwz r3, dShopSystem_item_count(r13) -/* 8019A5F4 2C 03 FF FF */ cmpwi r3, -1 -/* 8019A5F8 41 82 00 58 */ beq lbl_8019A650 -/* 8019A5FC 88 8D 8A D8 */ lbz r4, data_80451058(r13) -/* 8019A600 7C 03 20 00 */ cmpw r3, r4 -/* 8019A604 41 80 00 10 */ blt lbl_8019A614 -/* 8019A608 80 0D 8A E4 */ lwz r0, dShopSystem_camera_count(r13) -/* 8019A60C 2C 00 00 02 */ cmpwi r0, 2 -/* 8019A610 40 80 00 40 */ bge lbl_8019A650 -lbl_8019A614: -/* 8019A614 7C 03 20 00 */ cmpw r3, r4 -/* 8019A618 40 80 00 14 */ bge lbl_8019A62C -/* 8019A61C 3C 60 80 19 */ lis r3, dShopSystem_searchItemActor__FPvPv@ha /* 0x80197098@ha */ -/* 8019A620 38 63 70 98 */ addi r3, r3, dShopSystem_searchItemActor__FPvPv@l /* 0x80197098@l */ -/* 8019A624 7F C4 F3 78 */ mr r4, r30 -/* 8019A628 4B E8 6D 11 */ bl fpcEx_Search__FPFPvPv_PvPv -lbl_8019A62C: -/* 8019A62C 80 0D 8A E4 */ lwz r0, dShopSystem_camera_count(r13) -/* 8019A630 2C 00 00 02 */ cmpwi r0, 2 -/* 8019A634 40 80 00 14 */ bge lbl_8019A648 -/* 8019A638 3C 60 80 19 */ lis r3, dShopSystem_searchCameraActor__FPvPv@ha /* 0x80197270@ha */ -/* 8019A63C 38 63 72 70 */ addi r3, r3, dShopSystem_searchCameraActor__FPvPv@l /* 0x80197270@l */ -/* 8019A640 7F C4 F3 78 */ mr r4, r30 -/* 8019A644 4B E8 6C F5 */ bl fpcEx_Search__FPFPvPv_PvPv -lbl_8019A648: -/* 8019A648 38 60 00 00 */ li r3, 0 -/* 8019A64C 48 00 04 94 */ b lbl_8019AAE0 -lbl_8019A650: -/* 8019A650 88 0D 8A D8 */ lbz r0, data_80451058(r13) -/* 8019A654 7C 03 00 00 */ cmpw r3, r0 -/* 8019A658 41 80 04 84 */ blt lbl_8019AADC -/* 8019A65C 80 0D 8A E4 */ lwz r0, dShopSystem_camera_count(r13) -/* 8019A660 2C 00 00 02 */ cmpwi r0, 2 -/* 8019A664 41 80 04 78 */ blt lbl_8019AADC -/* 8019A668 38 00 00 FF */ li r0, 0xff -/* 8019A66C 98 1E 0F 73 */ stb r0, 0xf73(r30) -/* 8019A670 88 0D 8A E0 */ lbz r0, data_80451060(r13) -/* 8019A674 28 00 00 00 */ cmplwi r0, 0 -/* 8019A678 41 82 01 68 */ beq lbl_8019A7E0 -/* 8019A67C 3A A0 00 00 */ li r21, 0 -/* 8019A680 3B 60 00 00 */ li r27, 0 -/* 8019A684 3C 60 80 3C */ lis r3, dShopSystem_itemActor@ha /* 0x803BB8A4@ha */ -/* 8019A688 3A E3 B8 A4 */ addi r23, r3, dShopSystem_itemActor@l /* 0x803BB8A4@l */ -/* 8019A68C 3A C1 00 2C */ addi r22, r1, 0x2c -/* 8019A690 3B 01 00 64 */ addi r24, r1, 0x64 -/* 8019A694 C3 E2 A1 44 */ lfs f31, lit_5084(r2) -/* 8019A698 3B 21 00 48 */ addi r25, r1, 0x48 -/* 8019A69C 7F 7A DB 78 */ mr r26, r27 -/* 8019A6A0 3B ED 81 68 */ la r31, dShopSystem_itemNo(r13) /* 804506E8-_SDA_BASE_ */ -/* 8019A6A4 3B A1 00 18 */ addi r29, r1, 0x18 -/* 8019A6A8 3B 81 00 10 */ addi r28, r1, 0x10 -/* 8019A6AC 48 00 00 40 */ b lbl_8019A6EC -lbl_8019A6B0: -/* 8019A6B0 7C 17 D8 2E */ lwzx r0, r23, r27 -/* 8019A6B4 7C 16 D9 2E */ stwx r0, r22, r27 -/* 8019A6B8 88 1F 00 00 */ lbz r0, 0(r31) -/* 8019A6BC 98 1D 00 00 */ stb r0, 0(r29) -/* 8019A6C0 7F C3 F3 78 */ mr r3, r30 -/* 8019A6C4 7C 96 D8 2E */ lwzx r4, r22, r27 -/* 8019A6C8 4B E8 01 19 */ bl fopAcM_searchActorDistance__FPC10fopAc_ac_cPC10fopAc_ac_c -/* 8019A6CC 7C 38 DD 2E */ stfsx f1, r24, r27 -/* 8019A6D0 7F F9 DD 2E */ stfsx f31, r25, r27 -/* 8019A6D4 9B 5C 00 00 */ stb r26, 0(r28) -/* 8019A6D8 3A B5 00 01 */ addi r21, r21, 1 -/* 8019A6DC 3B 9C 00 01 */ addi r28, r28, 1 -/* 8019A6E0 3B BD 00 01 */ addi r29, r29, 1 -/* 8019A6E4 3B FF 00 01 */ addi r31, r31, 1 -/* 8019A6E8 3B 7B 00 04 */ addi r27, r27, 4 -lbl_8019A6EC: -/* 8019A6EC 89 2D 8A D8 */ lbz r9, data_80451058(r13) -/* 8019A6F0 7C 15 48 00 */ cmpw r21, r9 -/* 8019A6F4 41 80 FF BC */ blt lbl_8019A6B0 -/* 8019A6F8 39 40 00 00 */ li r10, 0 -/* 8019A6FC 38 80 00 00 */ li r4, 0 -/* 8019A700 38 E1 00 64 */ addi r7, r1, 0x64 -/* 8019A704 38 C1 00 48 */ addi r6, r1, 0x48 -/* 8019A708 38 61 00 10 */ addi r3, r1, 0x10 -/* 8019A70C 48 00 00 7C */ b lbl_8019A788 -lbl_8019A710: -/* 8019A710 7C 07 24 2E */ lfsx f0, r7, r4 -/* 8019A714 7C 06 25 2E */ stfsx f0, r6, r4 -/* 8019A718 99 43 00 00 */ stb r10, 0(r3) -/* 8019A71C 2C 0A 00 00 */ cmpwi r10, 0 -/* 8019A720 40 81 00 5C */ ble lbl_8019A77C -/* 8019A724 7D 4B 53 78 */ mr r11, r10 -/* 8019A728 55 45 10 3A */ slwi r5, r10, 2 -/* 8019A72C 38 0A 00 01 */ addi r0, r10, 1 -/* 8019A730 7C 09 03 A6 */ mtctr r0 -/* 8019A734 41 80 00 48 */ blt lbl_8019A77C -lbl_8019A738: -/* 8019A738 39 01 00 48 */ addi r8, r1, 0x48 -/* 8019A73C 7D 08 2A 14 */ add r8, r8, r5 -/* 8019A740 C0 08 00 00 */ lfs f0, 0(r8) -/* 8019A744 C0 28 FF FC */ lfs f1, -4(r8) -/* 8019A748 FC 00 08 40 */ fcmpo cr0, f0, f1 -/* 8019A74C 40 80 00 24 */ bge lbl_8019A770 -/* 8019A750 D0 28 00 00 */ stfs f1, 0(r8) -/* 8019A754 D0 08 FF FC */ stfs f0, -4(r8) -/* 8019A758 39 01 00 10 */ addi r8, r1, 0x10 -/* 8019A75C 7D 08 5A 14 */ add r8, r8, r11 -/* 8019A760 89 88 00 00 */ lbz r12, 0(r8) -/* 8019A764 88 08 FF FF */ lbz r0, -1(r8) -/* 8019A768 98 08 00 00 */ stb r0, 0(r8) -/* 8019A76C 99 88 FF FF */ stb r12, -1(r8) -lbl_8019A770: -/* 8019A770 39 6B FF FF */ addi r11, r11, -1 -/* 8019A774 38 A5 FF FC */ addi r5, r5, -4 -/* 8019A778 42 00 FF C0 */ bdnz lbl_8019A738 -lbl_8019A77C: -/* 8019A77C 39 4A 00 01 */ addi r10, r10, 1 -/* 8019A780 38 63 00 01 */ addi r3, r3, 1 -/* 8019A784 38 84 00 04 */ addi r4, r4, 4 -lbl_8019A788: -/* 8019A788 7C 0A 48 00 */ cmpw r10, r9 -/* 8019A78C 41 80 FF 84 */ blt lbl_8019A710 -/* 8019A790 38 80 00 00 */ li r4, 0 -/* 8019A794 39 01 00 2C */ addi r8, r1, 0x2c -/* 8019A798 3C 60 80 3C */ lis r3, dShopSystem_itemActor@ha /* 0x803BB8A4@ha */ -/* 8019A79C 38 E3 B8 A4 */ addi r7, r3, dShopSystem_itemActor@l /* 0x803BB8A4@l */ -/* 8019A7A0 38 C1 00 18 */ addi r6, r1, 0x18 -/* 8019A7A4 38 A1 00 10 */ addi r5, r1, 0x10 -/* 8019A7A8 38 6D 81 68 */ la r3, dShopSystem_itemNo(r13) /* 804506E8-_SDA_BASE_ */ -/* 8019A7AC 7D 29 03 A6 */ mtctr r9 -/* 8019A7B0 2C 09 00 00 */ cmpwi r9, 0 -/* 8019A7B4 40 81 00 2C */ ble lbl_8019A7E0 -lbl_8019A7B8: -/* 8019A7B8 89 25 00 00 */ lbz r9, 0(r5) -/* 8019A7BC 55 20 10 3A */ slwi r0, r9, 2 -/* 8019A7C0 7C 08 00 2E */ lwzx r0, r8, r0 -/* 8019A7C4 7C 07 21 2E */ stwx r0, r7, r4 -/* 8019A7C8 7C 06 48 AE */ lbzx r0, r6, r9 -/* 8019A7CC 98 03 00 00 */ stb r0, 0(r3) -/* 8019A7D0 38 63 00 01 */ addi r3, r3, 1 -/* 8019A7D4 38 84 00 04 */ addi r4, r4, 4 -/* 8019A7D8 38 A5 00 01 */ addi r5, r5, 1 -/* 8019A7DC 42 00 FF DC */ bdnz lbl_8019A7B8 -lbl_8019A7E0: -/* 8019A7E0 3B E0 00 00 */ li r31, 0 -/* 8019A7E4 3B A0 00 00 */ li r29, 0 -/* 8019A7E8 3B 80 00 00 */ li r28, 0 -/* 8019A7EC 3C 60 80 3C */ lis r3, dShopSystem_itemActor@ha /* 0x803BB8A4@ha */ -/* 8019A7F0 3B 63 B8 A4 */ addi r27, r3, dShopSystem_itemActor@l /* 0x803BB8A4@l */ -/* 8019A7F4 48 00 00 A8 */ b lbl_8019A89C -lbl_8019A7F8: -/* 8019A7F8 7C 7B E0 2E */ lwzx r3, r27, r28 -/* 8019A7FC 80 83 05 6C */ lwz r4, 0x56c(r3) -/* 8019A800 38 1C 0E 4C */ addi r0, r28, 0xe4c -/* 8019A804 7C 9E 01 2E */ stwx r4, r30, r0 -/* 8019A808 7C 7B E0 2E */ lwzx r3, r27, r28 -/* 8019A80C A8 03 04 B4 */ lha r0, 0x4b4(r3) -/* 8019A810 54 00 04 3E */ clrlwi r0, r0, 0x10 -/* 8019A814 28 00 FF FF */ cmplwi r0, 0xffff -/* 8019A818 38 60 FF FF */ li r3, -1 -/* 8019A81C 41 82 00 08 */ beq lbl_8019A824 -/* 8019A820 7C 03 03 78 */ mr r3, r0 -lbl_8019A824: -/* 8019A824 38 1D 0E 68 */ addi r0, r29, 0xe68 -/* 8019A828 7C 7E 03 2E */ sthx r3, r30, r0 -/* 8019A82C 3C 04 00 01 */ addis r0, r4, 1 -/* 8019A830 28 00 FF FF */ cmplwi r0, 0xffff -/* 8019A834 40 82 00 20 */ bne lbl_8019A854 -/* 8019A838 7F C3 F3 78 */ mr r3, r30 -/* 8019A83C 7F E4 FB 78 */ mr r4, r31 -/* 8019A840 4B FF CD 81 */ bl onFlag__13dShopSystem_cFi -/* 8019A844 7F C3 F3 78 */ mr r3, r30 -/* 8019A848 7F E4 FB 78 */ mr r4, r31 -/* 8019A84C 4B FF CD CD */ bl onSoldOutItemFlag__13dShopSystem_cFi -/* 8019A850 48 00 00 40 */ b lbl_8019A890 -lbl_8019A854: -/* 8019A854 7F C3 F3 78 */ mr r3, r30 -/* 8019A858 7F E4 FB 78 */ mr r4, r31 -/* 8019A85C 4B FF CD 81 */ bl offFlag__13dShopSystem_cFi -/* 8019A860 7C 7B E0 2E */ lwzx r3, r27, r28 -/* 8019A864 80 03 00 B0 */ lwz r0, 0xb0(r3) -/* 8019A868 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 8019A86C 28 00 00 FF */ cmplwi r0, 0xff -/* 8019A870 40 82 00 14 */ bne lbl_8019A884 -/* 8019A874 7F C3 F3 78 */ mr r3, r30 -/* 8019A878 7F E4 FB 78 */ mr r4, r31 -/* 8019A87C 4B FF CD 9D */ bl onSoldOutItemFlag__13dShopSystem_cFi -/* 8019A880 48 00 00 10 */ b lbl_8019A890 -lbl_8019A884: -/* 8019A884 7F C3 F3 78 */ mr r3, r30 -/* 8019A888 7F E4 FB 78 */ mr r4, r31 -/* 8019A88C 4B FF CD A9 */ bl offSoldOutItemFlag__13dShopSystem_cFi -lbl_8019A890: -/* 8019A890 3B FF 00 01 */ addi r31, r31, 1 -/* 8019A894 3B BD 00 02 */ addi r29, r29, 2 -/* 8019A898 3B 9C 00 04 */ addi r28, r28, 4 -lbl_8019A89C: -/* 8019A89C 88 0D 8A D8 */ lbz r0, data_80451058(r13) -/* 8019A8A0 7C 1F 00 00 */ cmpw r31, r0 -/* 8019A8A4 41 80 FF 54 */ blt lbl_8019A7F8 -/* 8019A8A8 88 1E 0F 77 */ lbz r0, 0xf77(r30) -/* 8019A8AC 28 00 00 08 */ cmplwi r0, 8 -/* 8019A8B0 40 82 00 40 */ bne lbl_8019A8F0 -/* 8019A8B4 80 6D 81 70 */ lwz r3, dShopSystem_cameraActor(r13) -/* 8019A8B8 C0 02 A1 60 */ lfs f0, lit_5687(r2) -/* 8019A8BC D0 03 04 D0 */ stfs f0, 0x4d0(r3) -/* 8019A8C0 C0 02 A1 64 */ lfs f0, lit_5688(r2) -/* 8019A8C4 D0 03 04 D4 */ stfs f0, 0x4d4(r3) -/* 8019A8C8 C0 02 A1 68 */ lfs f0, lit_5689(r2) -/* 8019A8CC D0 03 04 D8 */ stfs f0, 0x4d8(r3) -/* 8019A8D0 38 6D 81 70 */ la r3, dShopSystem_cameraActor(r13) /* 804506F0-_SDA_BASE_ */ -/* 8019A8D4 80 63 00 04 */ lwz r3, 4(r3) -/* 8019A8D8 C0 02 A1 3C */ lfs f0, lit_5006(r2) -/* 8019A8DC D0 03 04 D0 */ stfs f0, 0x4d0(r3) -/* 8019A8E0 C0 02 A1 6C */ lfs f0, lit_5690(r2) -/* 8019A8E4 D0 03 04 D4 */ stfs f0, 0x4d4(r3) -/* 8019A8E8 C0 02 A1 70 */ lfs f0, lit_5691(r2) -/* 8019A8EC D0 03 04 D8 */ stfs f0, 0x4d8(r3) -lbl_8019A8F0: -/* 8019A8F0 88 0D 8A D8 */ lbz r0, data_80451058(r13) -/* 8019A8F4 28 00 00 03 */ cmplwi r0, 3 -/* 8019A8F8 40 81 01 18 */ ble lbl_8019AA10 -/* 8019A8FC 80 6D 81 70 */ lwz r3, dShopSystem_cameraActor(r13) -/* 8019A900 38 03 04 D0 */ addi r0, r3, 0x4d0 -/* 8019A904 90 01 00 08 */ stw r0, 8(r1) -/* 8019A908 38 6D 81 70 */ la r3, dShopSystem_cameraActor(r13) /* 804506F0-_SDA_BASE_ */ -/* 8019A90C 80 63 00 04 */ lwz r3, 4(r3) -/* 8019A910 38 03 04 D0 */ addi r0, r3, 0x4d0 -/* 8019A914 90 01 00 0C */ stw r0, 0xc(r1) -/* 8019A918 38 7E 0E 78 */ addi r3, r30, 0xe78 -/* 8019A91C 7F C4 F3 78 */ mr r4, r30 -/* 8019A920 3C A0 80 3C */ lis r5, dShopSystem_itemActor@ha /* 0x803BB8A4@ha */ -/* 8019A924 39 45 B8 A4 */ addi r10, r5, dShopSystem_itemActor@l /* 0x803BB8A4@l */ -/* 8019A928 80 AA 00 00 */ lwz r5, 0(r10) -/* 8019A92C 80 CA 00 04 */ lwz r6, 4(r10) -/* 8019A930 80 EA 00 08 */ lwz r7, 8(r10) -/* 8019A934 81 0A 00 0C */ lwz r8, 0xc(r10) -/* 8019A938 81 2A 00 10 */ lwz r9, 0x10(r10) -/* 8019A93C 81 4A 00 14 */ lwz r10, 0x14(r10) -/* 8019A940 4B FF BC C9 */ bl setCamDataIdx2__16ShopCam_action_cFP10fopAc_ac_cP10fopAc_ac_cP10fopAc_ac_cP10fopAc_ac_cP10fopAc_ac_cP10fopAc_ac_cP10fopAc_ac_cP4cXyzP4cXyz -/* 8019A944 88 1E 0F 77 */ lbz r0, 0xf77(r30) -/* 8019A948 28 00 00 08 */ cmplwi r0, 8 -/* 8019A94C 40 82 00 28 */ bne lbl_8019A974 -/* 8019A950 C0 02 A1 74 */ lfs f0, lit_5692(r2) -/* 8019A954 D0 01 00 20 */ stfs f0, 0x20(r1) -/* 8019A958 C0 02 A1 78 */ lfs f0, lit_5693(r2) -/* 8019A95C D0 01 00 24 */ stfs f0, 0x24(r1) -/* 8019A960 C0 02 A1 7C */ lfs f0, lit_5694(r2) -/* 8019A964 D0 01 00 28 */ stfs f0, 0x28(r1) -/* 8019A968 38 7E 0E 78 */ addi r3, r30, 0xe78 -/* 8019A96C 38 81 00 20 */ addi r4, r1, 0x20 -/* 8019A970 4B FF BF 49 */ bl setMasterCamCtrPos__16ShopCam_action_cFP4cXyz -lbl_8019A974: -/* 8019A974 3A A0 00 00 */ li r21, 0 -/* 8019A978 3B E0 00 00 */ li r31, 0 -/* 8019A97C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8019A980 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8019A984 3A E3 09 58 */ addi r23, r3, 0x958 -/* 8019A988 3C 60 80 3C */ lis r3, dShopSystem_itemActor@ha /* 0x803BB8A4@ha */ -/* 8019A98C 3B 83 B8 A4 */ addi r28, r3, dShopSystem_itemActor@l /* 0x803BB8A4@l */ -lbl_8019A990: -/* 8019A990 7C 7C F8 2E */ lwzx r3, r28, r31 -/* 8019A994 28 03 00 00 */ cmplwi r3, 0 -/* 8019A998 41 82 00 5C */ beq lbl_8019A9F4 -/* 8019A99C A8 03 04 B8 */ lha r0, 0x4b8(r3) -/* 8019A9A0 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 8019A9A4 54 1B C6 3E */ rlwinm r27, r0, 0x18, 0x18, 0x1f -/* 8019A9A8 28 04 00 FF */ cmplwi r4, 0xff -/* 8019A9AC 41 82 00 48 */ beq lbl_8019A9F4 -/* 8019A9B0 7E E3 BB 78 */ mr r3, r23 -/* 8019A9B4 4B E9 9E AD */ bl isSwitch__12dSv_memBit_cCFi -/* 8019A9B8 2C 03 00 00 */ cmpwi r3, 0 -/* 8019A9BC 40 82 00 38 */ bne lbl_8019A9F4 -/* 8019A9C0 28 1B 00 FF */ cmplwi r27, 0xff -/* 8019A9C4 41 82 00 30 */ beq lbl_8019A9F4 -/* 8019A9C8 7E E3 BB 78 */ mr r3, r23 -/* 8019A9CC 7F 64 DB 78 */ mr r4, r27 -/* 8019A9D0 4B E9 9E 91 */ bl isSwitch__12dSv_memBit_cCFi -/* 8019A9D4 2C 03 00 00 */ cmpwi r3, 0 -/* 8019A9D8 40 82 00 1C */ bne lbl_8019A9F4 -/* 8019A9DC 7F C3 F3 78 */ mr r3, r30 -/* 8019A9E0 7E A4 AB 78 */ mr r4, r21 -/* 8019A9E4 4B FF CB DD */ bl onFlag__13dShopSystem_cFi -/* 8019A9E8 7F C3 F3 78 */ mr r3, r30 -/* 8019A9EC 7E A4 AB 78 */ mr r4, r21 -/* 8019A9F0 4B FF CC 29 */ bl onSoldOutItemFlag__13dShopSystem_cFi -lbl_8019A9F4: -/* 8019A9F4 3A B5 00 01 */ addi r21, r21, 1 -/* 8019A9F8 2C 15 00 07 */ cmpwi r21, 7 -/* 8019A9FC 3B FF 00 04 */ addi r31, r31, 4 -/* 8019AA00 41 80 FF 90 */ blt lbl_8019A990 -/* 8019AA04 38 00 FF FF */ li r0, -1 -/* 8019AA08 90 0D 8A DC */ stw r0, dShopSystem_item_count(r13) -/* 8019AA0C 48 00 00 D0 */ b lbl_8019AADC -lbl_8019AA10: -/* 8019AA10 38 7E 0E 78 */ addi r3, r30, 0xe78 -/* 8019AA14 7F C4 F3 78 */ mr r4, r30 -/* 8019AA18 3C A0 80 3C */ lis r5, dShopSystem_itemActor@ha /* 0x803BB8A4@ha */ -/* 8019AA1C 38 E5 B8 A4 */ addi r7, r5, dShopSystem_itemActor@l /* 0x803BB8A4@l */ -/* 8019AA20 80 A7 00 00 */ lwz r5, 0(r7) -/* 8019AA24 80 C7 00 04 */ lwz r6, 4(r7) -/* 8019AA28 80 E7 00 08 */ lwz r7, 8(r7) -/* 8019AA2C 81 0D 81 70 */ lwz r8, dShopSystem_cameraActor(r13) -/* 8019AA30 39 08 04 D0 */ addi r8, r8, 0x4d0 -/* 8019AA34 39 2D 81 70 */ la r9, dShopSystem_cameraActor(r13) /* 804506F0-_SDA_BASE_ */ -/* 8019AA38 81 29 00 04 */ lwz r9, 4(r9) -/* 8019AA3C 39 29 04 D0 */ addi r9, r9, 0x4d0 -/* 8019AA40 4B FF BB 05 */ bl setCamDataIdx__16ShopCam_action_cFP10fopAc_ac_cP10fopAc_ac_cP10fopAc_ac_cP10fopAc_ac_cP4cXyzP4cXyz -/* 8019AA44 3A A0 00 00 */ li r21, 0 -/* 8019AA48 3B E0 00 00 */ li r31, 0 -/* 8019AA4C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8019AA50 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8019AA54 3A E3 09 58 */ addi r23, r3, 0x958 -/* 8019AA58 3C 60 80 3C */ lis r3, dShopSystem_itemActor@ha /* 0x803BB8A4@ha */ -/* 8019AA5C 3B 83 B8 A4 */ addi r28, r3, dShopSystem_itemActor@l /* 0x803BB8A4@l */ -lbl_8019AA60: -/* 8019AA60 7C 7C F8 2E */ lwzx r3, r28, r31 -/* 8019AA64 28 03 00 00 */ cmplwi r3, 0 -/* 8019AA68 41 82 00 5C */ beq lbl_8019AAC4 -/* 8019AA6C A8 03 04 B8 */ lha r0, 0x4b8(r3) -/* 8019AA70 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 8019AA74 54 1B C6 3E */ rlwinm r27, r0, 0x18, 0x18, 0x1f -/* 8019AA78 28 04 00 FF */ cmplwi r4, 0xff -/* 8019AA7C 41 82 00 48 */ beq lbl_8019AAC4 -/* 8019AA80 7E E3 BB 78 */ mr r3, r23 -/* 8019AA84 4B E9 9D DD */ bl isSwitch__12dSv_memBit_cCFi -/* 8019AA88 2C 03 00 00 */ cmpwi r3, 0 -/* 8019AA8C 40 82 00 38 */ bne lbl_8019AAC4 -/* 8019AA90 28 1B 00 FF */ cmplwi r27, 0xff -/* 8019AA94 41 82 00 30 */ beq lbl_8019AAC4 -/* 8019AA98 7E E3 BB 78 */ mr r3, r23 -/* 8019AA9C 7F 64 DB 78 */ mr r4, r27 -/* 8019AAA0 4B E9 9D C1 */ bl isSwitch__12dSv_memBit_cCFi -/* 8019AAA4 2C 03 00 00 */ cmpwi r3, 0 -/* 8019AAA8 40 82 00 1C */ bne lbl_8019AAC4 -/* 8019AAAC 7F C3 F3 78 */ mr r3, r30 -/* 8019AAB0 7E A4 AB 78 */ mr r4, r21 -/* 8019AAB4 4B FF CB 0D */ bl onFlag__13dShopSystem_cFi -/* 8019AAB8 7F C3 F3 78 */ mr r3, r30 -/* 8019AABC 7E A4 AB 78 */ mr r4, r21 -/* 8019AAC0 4B FF CB 59 */ bl onSoldOutItemFlag__13dShopSystem_cFi -lbl_8019AAC4: -/* 8019AAC4 3A B5 00 01 */ addi r21, r21, 1 -/* 8019AAC8 2C 15 00 07 */ cmpwi r21, 7 -/* 8019AACC 3B FF 00 04 */ addi r31, r31, 4 -/* 8019AAD0 41 80 FF 90 */ blt lbl_8019AA60 -/* 8019AAD4 38 00 FF FF */ li r0, -1 -/* 8019AAD8 90 0D 8A DC */ stw r0, dShopSystem_item_count(r13) -lbl_8019AADC: -/* 8019AADC 38 60 00 01 */ li r3, 1 -lbl_8019AAE0: -/* 8019AAE0 E3 E1 00 B8 */ psq_l f31, 184(r1), 0, 0 /* qr0 */ -/* 8019AAE4 CB E1 00 B0 */ lfd f31, 0xb0(r1) -/* 8019AAE8 39 61 00 B0 */ addi r11, r1, 0xb0 -/* 8019AAEC 48 1C 77 1D */ bl _restgpr_21 -/* 8019AAF0 80 01 00 C4 */ lwz r0, 0xc4(r1) -/* 8019AAF4 7C 08 03 A6 */ mtlr r0 -/* 8019AAF8 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 8019AAFC 4E 80 00 20 */ blr diff --git a/asm/d/shop/d_shop_system/seq_decide_yes__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s b/asm/d/shop/d_shop_system/seq_decide_yes__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s deleted file mode 100644 index 3e2a58a084..0000000000 --- a/asm/d/shop/d_shop_system/seq_decide_yes__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s +++ /dev/null @@ -1,104 +0,0 @@ -lbl_80199E28: -/* 80199E28 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80199E2C 7C 08 02 A6 */ mflr r0 -/* 80199E30 90 01 00 24 */ stw r0, 0x24(r1) -/* 80199E34 39 61 00 20 */ addi r11, r1, 0x20 -/* 80199E38 48 1C 83 A5 */ bl _savegpr_29 -/* 80199E3C 7C 7D 1B 78 */ mr r29, r3 -/* 80199E40 7C 9E 23 78 */ mr r30, r4 -/* 80199E44 7C BF 2B 78 */ mr r31, r5 -/* 80199E48 48 09 E5 89 */ bl getMessageID__12dMsgObject_cFv -/* 80199E4C 28 03 1B 82 */ cmplwi r3, 0x1b82 -/* 80199E50 40 82 00 30 */ bne lbl_80199E80 -/* 80199E54 38 00 00 00 */ li r0, 0 -/* 80199E58 B0 1D 0F 4C */ sth r0, 0xf4c(r29) -/* 80199E5C C0 22 A1 18 */ lfs f1, lit_4494(r2) -/* 80199E60 D0 3D 0F 38 */ stfs f1, 0xf38(r29) -/* 80199E64 C0 02 A1 1C */ lfs f0, lit_4495(r2) -/* 80199E68 D0 1D 0F 3C */ stfs f0, 0xf3c(r29) -/* 80199E6C D0 3D 0F 40 */ stfs f1, 0xf40(r29) -/* 80199E70 C0 02 A1 20 */ lfs f0, lit_4496(r2) -/* 80199E74 D0 1D 0F 44 */ stfs f0, 0xf44(r29) -/* 80199E78 38 00 00 01 */ li r0, 1 -/* 80199E7C 98 1D 0F 76 */ stb r0, 0xf76(r29) -lbl_80199E80: -/* 80199E80 38 7D 09 74 */ addi r3, r29, 0x974 -/* 80199E84 38 81 00 08 */ addi r4, r1, 8 -/* 80199E88 48 0B 06 A1 */ bl getEventId__10dMsgFlow_cFPi -/* 80199E8C 54 60 04 3E */ clrlwi r0, r3, 0x10 -/* 80199E90 28 00 00 01 */ cmplwi r0, 1 -/* 80199E94 40 82 00 98 */ bne lbl_80199F2C -/* 80199E98 7F E3 FB 78 */ mr r3, r31 -/* 80199E9C 7F C4 F3 78 */ mr r4, r30 -/* 80199EA0 38 A0 00 00 */ li r5, 0 -/* 80199EA4 38 C0 00 00 */ li r6, 0 -/* 80199EA8 48 0B 04 31 */ bl doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci -/* 80199EAC 2C 03 00 00 */ cmpwi r3, 0 -/* 80199EB0 41 82 00 D8 */ beq lbl_80199F88 -/* 80199EB4 80 7D 0D 90 */ lwz r3, 0xd90(r29) -/* 80199EB8 3C 03 00 01 */ addis r0, r3, 1 -/* 80199EBC 28 00 FF FF */ cmplwi r0, 0xffff -/* 80199EC0 40 82 00 28 */ bne lbl_80199EE8 -/* 80199EC4 38 7D 04 D0 */ addi r3, r29, 0x4d0 -/* 80199EC8 80 81 00 08 */ lwz r4, 8(r1) -/* 80199ECC 38 A0 00 00 */ li r5, 0 -/* 80199ED0 38 C0 FF FF */ li r6, -1 -/* 80199ED4 38 E0 FF FF */ li r7, -1 -/* 80199ED8 39 00 00 00 */ li r8, 0 -/* 80199EDC 39 20 00 00 */ li r9, 0 -/* 80199EE0 4B E8 1D 09 */ bl fopAcM_createItemForPresentDemo__FPC4cXyziUciiPC5csXyzPC4cXyz -/* 80199EE4 90 7D 0D 90 */ stw r3, 0xd90(r29) -lbl_80199EE8: -/* 80199EE8 80 7D 0D 90 */ lwz r3, 0xd90(r29) -/* 80199EEC 4B E8 74 B1 */ bl fpcEx_IsExist__FUi -/* 80199EF0 2C 03 00 00 */ cmpwi r3, 0 -/* 80199EF4 41 82 00 30 */ beq lbl_80199F24 -/* 80199EF8 7F A3 EB 78 */ mr r3, r29 -/* 80199EFC 38 80 00 08 */ li r4, 8 -/* 80199F00 4B FF D6 DD */ bl offFlag__13dShopSystem_cFi -/* 80199F04 7F A3 EB 78 */ mr r3, r29 -/* 80199F08 48 00 05 ED */ bl setSoldOutItemHide__13dShopSystem_cFv -/* 80199F0C 38 00 00 01 */ li r0, 1 -/* 80199F10 B0 1D 0E 30 */ sth r0, 0xe30(r29) -/* 80199F14 7F A3 EB 78 */ mr r3, r29 -/* 80199F18 4B FB 03 0D */ bl evtChange__8daNpcT_cFv -/* 80199F1C 38 60 00 02 */ li r3, 2 -/* 80199F20 48 00 00 6C */ b lbl_80199F8C -lbl_80199F24: -/* 80199F24 38 60 00 00 */ li r3, 0 -/* 80199F28 48 00 00 64 */ b lbl_80199F8C -lbl_80199F2C: -/* 80199F2C 80 1D 0F 60 */ lwz r0, 0xf60(r29) -/* 80199F30 2C 00 00 00 */ cmpwi r0, 0 -/* 80199F34 41 80 00 0C */ blt lbl_80199F40 -/* 80199F38 38 C0 00 64 */ li r6, 0x64 -/* 80199F3C 48 00 00 1C */ b lbl_80199F58 -lbl_80199F40: -/* 80199F40 88 7D 0F 6E */ lbz r3, 0xf6e(r29) -/* 80199F44 38 03 FF FF */ addi r0, r3, -1 -/* 80199F48 54 00 08 3C */ slwi r0, r0, 1 -/* 80199F4C 7C 7D 02 14 */ add r3, r29, r0 -/* 80199F50 A0 63 0E 68 */ lhz r3, 0xe68(r3) -/* 80199F54 38 C3 00 01 */ addi r6, r3, 1 -lbl_80199F58: -/* 80199F58 7F E3 FB 78 */ mr r3, r31 -/* 80199F5C 7F C4 F3 78 */ mr r4, r30 -/* 80199F60 38 A0 00 00 */ li r5, 0 -/* 80199F64 48 0B 03 75 */ bl doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci -/* 80199F68 2C 03 00 00 */ cmpwi r3, 0 -/* 80199F6C 41 82 00 1C */ beq lbl_80199F88 -/* 80199F70 7F A3 EB 78 */ mr r3, r29 -/* 80199F74 38 80 00 08 */ li r4, 8 -/* 80199F78 4B FF D6 65 */ bl offFlag__13dShopSystem_cFi -/* 80199F7C 7F A3 EB 78 */ mr r3, r29 -/* 80199F80 38 80 00 02 */ li r4, 2 -/* 80199F84 48 00 03 C1 */ bl setSeq__13dShopSystem_cFUc -lbl_80199F88: -/* 80199F88 38 60 00 00 */ li r3, 0 -lbl_80199F8C: -/* 80199F8C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80199F90 48 1C 82 99 */ bl _restgpr_29 -/* 80199F94 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80199F98 7C 08 03 A6 */ mtlr r0 -/* 80199F9C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80199FA0 4E 80 00 20 */ blr diff --git a/asm/d/shop/d_shop_system/seq_moving__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s b/asm/d/shop/d_shop_system/seq_moving__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s deleted file mode 100644 index 660846c9c7..0000000000 --- a/asm/d/shop/d_shop_system/seq_moving__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s +++ /dev/null @@ -1,128 +0,0 @@ -lbl_80199A18: -/* 80199A18 94 21 FF A0 */ stwu r1, -0x60(r1) -/* 80199A1C 7C 08 02 A6 */ mflr r0 -/* 80199A20 90 01 00 64 */ stw r0, 0x64(r1) -/* 80199A24 93 E1 00 5C */ stw r31, 0x5c(r1) -/* 80199A28 7C 7F 1B 78 */ mr r31, r3 -/* 80199A2C A8 63 0F 68 */ lha r3, 0xf68(r3) -/* 80199A30 38 03 00 01 */ addi r0, r3, 1 -/* 80199A34 B0 1F 0F 68 */ sth r0, 0xf68(r31) -/* 80199A38 38 61 00 14 */ addi r3, r1, 0x14 -/* 80199A3C 38 9F 0E 48 */ addi r4, r31, 0xe48 -/* 80199A40 88 BF 0F 6E */ lbz r5, 0xf6e(r31) -/* 80199A44 38 A5 FF FF */ addi r5, r5, -1 -/* 80199A48 4B FF CF 59 */ bl getCurrentPos__15dShopItemCtrl_cFi -/* 80199A4C C0 01 00 14 */ lfs f0, 0x14(r1) -/* 80199A50 D0 01 00 38 */ stfs f0, 0x38(r1) -/* 80199A54 C0 01 00 18 */ lfs f0, 0x18(r1) -/* 80199A58 D0 01 00 3C */ stfs f0, 0x3c(r1) -/* 80199A5C C0 01 00 1C */ lfs f0, 0x1c(r1) -/* 80199A60 D0 01 00 40 */ stfs f0, 0x40(r1) -/* 80199A64 38 61 00 38 */ addi r3, r1, 0x38 -/* 80199A68 38 81 00 20 */ addi r4, r1, 0x20 -/* 80199A6C 4B E7 B8 A5 */ bl mDoLib_project__FP3VecP3Vec -/* 80199A70 88 1F 0F 6E */ lbz r0, 0xf6e(r31) -/* 80199A74 28 00 00 07 */ cmplwi r0, 7 -/* 80199A78 40 82 00 30 */ bne lbl_80199AA8 -/* 80199A7C C0 21 00 20 */ lfs f1, 0x20(r1) -/* 80199A80 3C 60 80 43 */ lis r3, g_cursorHIO@ha /* 0x80430110@ha */ -/* 80199A84 38 63 01 10 */ addi r3, r3, g_cursorHIO@l /* 0x80430110@l */ -/* 80199A88 C0 03 00 34 */ lfs f0, 0x34(r3) -/* 80199A8C EC 01 00 2A */ fadds f0, f1, f0 -/* 80199A90 D0 01 00 20 */ stfs f0, 0x20(r1) -/* 80199A94 C0 21 00 24 */ lfs f1, 0x24(r1) -/* 80199A98 C0 03 00 38 */ lfs f0, 0x38(r3) -/* 80199A9C EC 01 00 2A */ fadds f0, f1, f0 -/* 80199AA0 D0 01 00 24 */ stfs f0, 0x24(r1) -/* 80199AA4 48 00 00 1C */ b lbl_80199AC0 -lbl_80199AA8: -/* 80199AA8 C0 21 00 24 */ lfs f1, 0x24(r1) -/* 80199AAC 3C 60 80 43 */ lis r3, g_cursorHIO@ha /* 0x80430110@ha */ -/* 80199AB0 38 63 01 10 */ addi r3, r3, g_cursorHIO@l /* 0x80430110@l */ -/* 80199AB4 C0 03 00 30 */ lfs f0, 0x30(r3) -/* 80199AB8 EC 01 00 2A */ fadds f0, f1, f0 -/* 80199ABC D0 01 00 24 */ stfs f0, 0x24(r1) -lbl_80199AC0: -/* 80199AC0 88 BF 0F 6F */ lbz r5, 0xf6f(r31) -/* 80199AC4 28 05 00 00 */ cmplwi r5, 0 -/* 80199AC8 41 82 00 EC */ beq lbl_80199BB4 -/* 80199ACC 38 61 00 08 */ addi r3, r1, 8 -/* 80199AD0 38 9F 0E 48 */ addi r4, r31, 0xe48 -/* 80199AD4 38 A5 FF FF */ addi r5, r5, -1 -/* 80199AD8 4B FF CE C9 */ bl getCurrentPos__15dShopItemCtrl_cFi -/* 80199ADC C0 01 00 08 */ lfs f0, 8(r1) -/* 80199AE0 D0 01 00 44 */ stfs f0, 0x44(r1) -/* 80199AE4 C0 01 00 0C */ lfs f0, 0xc(r1) -/* 80199AE8 D0 01 00 48 */ stfs f0, 0x48(r1) -/* 80199AEC C0 01 00 10 */ lfs f0, 0x10(r1) -/* 80199AF0 D0 01 00 4C */ stfs f0, 0x4c(r1) -/* 80199AF4 38 61 00 44 */ addi r3, r1, 0x44 -/* 80199AF8 38 81 00 2C */ addi r4, r1, 0x2c -/* 80199AFC 4B E7 B8 15 */ bl mDoLib_project__FP3VecP3Vec -/* 80199B00 88 1F 0F 6F */ lbz r0, 0xf6f(r31) -/* 80199B04 28 00 00 07 */ cmplwi r0, 7 -/* 80199B08 40 82 00 30 */ bne lbl_80199B38 -/* 80199B0C C0 21 00 2C */ lfs f1, 0x2c(r1) -/* 80199B10 3C 60 80 43 */ lis r3, g_cursorHIO@ha /* 0x80430110@ha */ -/* 80199B14 38 63 01 10 */ addi r3, r3, g_cursorHIO@l /* 0x80430110@l */ -/* 80199B18 C0 03 00 34 */ lfs f0, 0x34(r3) -/* 80199B1C EC 01 00 2A */ fadds f0, f1, f0 -/* 80199B20 D0 01 00 2C */ stfs f0, 0x2c(r1) -/* 80199B24 C0 21 00 30 */ lfs f1, 0x30(r1) -/* 80199B28 C0 03 00 38 */ lfs f0, 0x38(r3) -/* 80199B2C EC 01 00 2A */ fadds f0, f1, f0 -/* 80199B30 D0 01 00 30 */ stfs f0, 0x30(r1) -/* 80199B34 48 00 00 1C */ b lbl_80199B50 -lbl_80199B38: -/* 80199B38 C0 21 00 30 */ lfs f1, 0x30(r1) -/* 80199B3C 3C 60 80 43 */ lis r3, g_cursorHIO@ha /* 0x80430110@ha */ -/* 80199B40 38 63 01 10 */ addi r3, r3, g_cursorHIO@l /* 0x80430110@l */ -/* 80199B44 C0 03 00 30 */ lfs f0, 0x30(r3) -/* 80199B48 EC 01 00 2A */ fadds f0, f1, f0 -/* 80199B4C D0 01 00 30 */ stfs f0, 0x30(r1) -lbl_80199B50: -/* 80199B50 A8 1F 0F 68 */ lha r0, 0xf68(r31) -/* 80199B54 7C 00 01 D6 */ mullw r0, r0, r0 -/* 80199B58 C8 22 A1 50 */ lfd f1, lit_5298(r2) -/* 80199B5C 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80199B60 90 01 00 54 */ stw r0, 0x54(r1) -/* 80199B64 3C 00 43 30 */ lis r0, 0x4330 -/* 80199B68 90 01 00 50 */ stw r0, 0x50(r1) -/* 80199B6C C8 01 00 50 */ lfd f0, 0x50(r1) -/* 80199B70 EC 20 08 28 */ fsubs f1, f0, f1 -/* 80199B74 C0 02 A1 48 */ lfs f0, lit_5296(r2) -/* 80199B78 EC 61 00 24 */ fdivs f3, f1, f0 -/* 80199B7C C0 21 00 30 */ lfs f1, 0x30(r1) -/* 80199B80 C0 01 00 24 */ lfs f0, 0x24(r1) -/* 80199B84 EC 00 08 28 */ fsubs f0, f0, f1 -/* 80199B88 EC 03 00 32 */ fmuls f0, f3, f0 -/* 80199B8C EC 21 00 2A */ fadds f1, f1, f0 -/* 80199B90 80 7F 0E 44 */ lwz r3, 0xe44(r31) -/* 80199B94 C0 41 00 2C */ lfs f2, 0x2c(r1) -/* 80199B98 C0 01 00 20 */ lfs f0, 0x20(r1) -/* 80199B9C EC 00 10 28 */ fsubs f0, f0, f2 -/* 80199BA0 EC 03 00 32 */ fmuls f0, f3, f0 -/* 80199BA4 EC 02 00 2A */ fadds f0, f2, f0 -/* 80199BA8 D0 03 00 58 */ stfs f0, 0x58(r3) -/* 80199BAC D0 23 00 5C */ stfs f1, 0x5c(r3) -/* 80199BB0 48 00 00 18 */ b lbl_80199BC8 -lbl_80199BB4: -/* 80199BB4 C0 21 00 24 */ lfs f1, 0x24(r1) -/* 80199BB8 80 7F 0E 44 */ lwz r3, 0xe44(r31) -/* 80199BBC C0 01 00 20 */ lfs f0, 0x20(r1) -/* 80199BC0 D0 03 00 58 */ stfs f0, 0x58(r3) -/* 80199BC4 D0 23 00 5C */ stfs f1, 0x5c(r3) -lbl_80199BC8: -/* 80199BC8 A8 1F 0F 68 */ lha r0, 0xf68(r31) -/* 80199BCC 2C 00 00 03 */ cmpwi r0, 3 -/* 80199BD0 41 80 00 10 */ blt lbl_80199BE0 -/* 80199BD4 7F E3 FB 78 */ mr r3, r31 -/* 80199BD8 38 80 00 04 */ li r4, 4 -/* 80199BDC 48 00 07 69 */ bl setSeq__13dShopSystem_cFUc -lbl_80199BE0: -/* 80199BE0 38 60 00 00 */ li r3, 0 -/* 80199BE4 83 E1 00 5C */ lwz r31, 0x5c(r1) -/* 80199BE8 80 01 00 64 */ lwz r0, 0x64(r1) -/* 80199BEC 7C 08 03 A6 */ mtlr r0 -/* 80199BF0 38 21 00 60 */ addi r1, r1, 0x60 -/* 80199BF4 4E 80 00 20 */ blr diff --git a/asm/d/shop/d_shop_system/seq_select__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s b/asm/d/shop/d_shop_system/seq_select__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s deleted file mode 100644 index ce782bd41e..0000000000 --- a/asm/d/shop/d_shop_system/seq_select__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s +++ /dev/null @@ -1,312 +0,0 @@ -lbl_8019959C: -/* 8019959C 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 801995A0 7C 08 02 A6 */ mflr r0 -/* 801995A4 90 01 00 54 */ stw r0, 0x54(r1) -/* 801995A8 39 61 00 50 */ addi r11, r1, 0x50 -/* 801995AC 48 1C 8C 2D */ bl _savegpr_28 -/* 801995B0 7C 7C 1B 78 */ mr r28, r3 -/* 801995B4 7C 9D 23 78 */ mr r29, r4 -/* 801995B8 7C BE 2B 78 */ mr r30, r5 -/* 801995BC 88 03 0F 75 */ lbz r0, 0xf75(r3) -/* 801995C0 28 00 00 01 */ cmplwi r0, 1 -/* 801995C4 40 82 00 2C */ bne lbl_801995F0 -/* 801995C8 7F C4 F3 78 */ mr r4, r30 -/* 801995CC 80 BC 0F 5C */ lwz r5, 0xf5c(r28) -/* 801995D0 81 83 0E 3C */ lwz r12, 0xe3c(r3) -/* 801995D4 81 8C 00 CC */ lwz r12, 0xcc(r12) -/* 801995D8 7D 89 03 A6 */ mtctr r12 -/* 801995DC 4E 80 04 21 */ bctrl -/* 801995E0 2C 03 00 00 */ cmpwi r3, 0 -/* 801995E4 40 82 00 0C */ bne lbl_801995F0 -/* 801995E8 38 60 00 00 */ li r3, 0 -/* 801995EC 48 00 04 14 */ b lbl_80199A00 -lbl_801995F0: -/* 801995F0 88 1C 0F 76 */ lbz r0, 0xf76(r28) -/* 801995F4 28 00 00 00 */ cmplwi r0, 0 -/* 801995F8 41 82 00 0C */ beq lbl_80199604 -/* 801995FC 38 00 00 00 */ li r0, 0 -/* 80199600 98 1C 0F 76 */ stb r0, 0xf76(r28) -lbl_80199604: -/* 80199604 7F 83 E3 78 */ mr r3, r28 -/* 80199608 38 80 00 01 */ li r4, 1 -/* 8019960C 7F C5 F3 78 */ mr r5, r30 -/* 80199610 4B FF E0 61 */ bl checkController__13dShopSystem_cFUcP10dMsgFlow_c -/* 80199614 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80199618 38 00 00 22 */ li r0, 0x22 -/* 8019961C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80199620 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80199624 98 04 5E 3C */ stb r0, 0x5e3c(r4) -/* 80199628 38 60 00 00 */ li r3, 0 -/* 8019962C 98 64 5E 57 */ stb r3, 0x5e57(r4) -/* 80199630 38 00 00 2A */ li r0, 0x2a -/* 80199634 98 04 5E 35 */ stb r0, 0x5e35(r4) -/* 80199638 98 64 5E 50 */ stb r3, 0x5e50(r4) -/* 8019963C 41 82 02 E4 */ beq lbl_80199920 -/* 80199640 7F 83 E3 78 */ mr r3, r28 -/* 80199644 7F E4 FB 78 */ mr r4, r31 -/* 80199648 38 A0 00 01 */ li r5, 1 -/* 8019964C 4B FF ED F9 */ bl moveCursor__13dShopSystem_cFiUc -/* 80199650 7C 66 1B 78 */ mr r6, r3 -/* 80199654 88 1C 0F 75 */ lbz r0, 0xf75(r28) -/* 80199658 20 00 00 01 */ subfic r0, r0, 1 -/* 8019965C 7C 00 00 34 */ cntlzw r0, r0 -/* 80199660 54 00 DE 3F */ rlwinm. r0, r0, 0x1b, 0x18, 0x1f -/* 80199664 41 82 00 34 */ beq lbl_80199698 -/* 80199668 2C 1F 00 02 */ cmpwi r31, 2 -/* 8019966C 40 82 00 2C */ bne lbl_80199698 -/* 80199670 90 DC 0F 5C */ stw r6, 0xf5c(r28) -/* 80199674 C0 02 A1 44 */ lfs f0, lit_5084(r2) -/* 80199678 D0 1C 0F 38 */ stfs f0, 0xf38(r28) -/* 8019967C D0 1C 0F 3C */ stfs f0, 0xf3c(r28) -/* 80199680 D0 1C 0F 40 */ stfs f0, 0xf40(r28) -/* 80199684 D0 1C 0F 44 */ stfs f0, 0xf44(r28) -/* 80199688 7F 83 E3 78 */ mr r3, r28 -/* 8019968C 38 80 00 0A */ li r4, 0xa -/* 80199690 48 00 0C B5 */ bl setSeq__13dShopSystem_cFUc -/* 80199694 48 00 02 A0 */ b lbl_80199934 -lbl_80199698: -/* 80199698 2C 00 00 00 */ cmpwi r0, 0 -/* 8019969C 41 82 00 5C */ beq lbl_801996F8 -/* 801996A0 88 1C 0F 6E */ lbz r0, 0xf6e(r28) -/* 801996A4 28 00 00 00 */ cmplwi r0, 0 -/* 801996A8 40 82 00 50 */ bne lbl_801996F8 -/* 801996AC 90 DC 0F 5C */ stw r6, 0xf5c(r28) -/* 801996B0 88 1C 0F 6E */ lbz r0, 0xf6e(r28) -/* 801996B4 B0 1C 0F 4C */ sth r0, 0xf4c(r28) -/* 801996B8 C0 22 A1 18 */ lfs f1, lit_4494(r2) -/* 801996BC D0 3C 0F 38 */ stfs f1, 0xf38(r28) -/* 801996C0 C0 02 A1 1C */ lfs f0, lit_4495(r2) -/* 801996C4 D0 1C 0F 3C */ stfs f0, 0xf3c(r28) -/* 801996C8 D0 3C 0F 40 */ stfs f1, 0xf40(r28) -/* 801996CC C0 02 A1 20 */ lfs f0, lit_4496(r2) -/* 801996D0 D0 1C 0F 44 */ stfs f0, 0xf44(r28) -/* 801996D4 C0 02 A1 44 */ lfs f0, lit_5084(r2) -/* 801996D8 D0 1C 0F 38 */ stfs f0, 0xf38(r28) -/* 801996DC D0 1C 0F 3C */ stfs f0, 0xf3c(r28) -/* 801996E0 D0 1C 0F 40 */ stfs f0, 0xf40(r28) -/* 801996E4 D0 1C 0F 44 */ stfs f0, 0xf44(r28) -/* 801996E8 7F 83 E3 78 */ mr r3, r28 -/* 801996EC 38 80 00 01 */ li r4, 1 -/* 801996F0 48 00 0C 55 */ bl setSeq__13dShopSystem_cFUc -/* 801996F4 48 00 02 40 */ b lbl_80199934 -lbl_801996F8: -/* 801996F8 7F C3 F3 78 */ mr r3, r30 -/* 801996FC 7F A4 EB 78 */ mr r4, r29 -/* 80199700 38 A0 00 00 */ li r5, 0 -/* 80199704 48 0B 0B D5 */ bl doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci -/* 80199708 2C 03 00 00 */ cmpwi r3, 0 -/* 8019970C 41 82 01 A4 */ beq lbl_801998B0 -/* 80199710 2C 1F 00 03 */ cmpwi r31, 3 -/* 80199714 40 82 00 6C */ bne lbl_80199780 -/* 80199718 88 1C 0F 6E */ lbz r0, 0xf6e(r28) -/* 8019971C 28 00 00 00 */ cmplwi r0, 0 -/* 80199720 41 82 00 38 */ beq lbl_80199758 -/* 80199724 38 00 00 5F */ li r0, 0x5f -/* 80199728 90 01 00 0C */ stw r0, 0xc(r1) -/* 8019972C 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 80199730 38 81 00 0C */ addi r4, r1, 0xc -/* 80199734 38 A0 00 00 */ li r5, 0 -/* 80199738 38 C0 00 00 */ li r6, 0 -/* 8019973C 38 E0 00 00 */ li r7, 0 -/* 80199740 C0 22 A1 08 */ lfs f1, lit_4099(r2) -/* 80199744 FC 40 08 90 */ fmr f2, f1 -/* 80199748 C0 62 A1 14 */ lfs f3, lit_4493(r2) -/* 8019974C FC 80 18 90 */ fmr f4, f3 -/* 80199750 39 00 00 00 */ li r8, 0 -/* 80199754 48 11 22 31 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -lbl_80199758: -/* 80199758 88 1C 0F 6E */ lbz r0, 0xf6e(r28) -/* 8019975C B0 1C 0F 4C */ sth r0, 0xf4c(r28) -/* 80199760 C0 22 A1 18 */ lfs f1, lit_4494(r2) -/* 80199764 D0 3C 0F 38 */ stfs f1, 0xf38(r28) -/* 80199768 C0 02 A1 1C */ lfs f0, lit_4495(r2) -/* 8019976C D0 1C 0F 3C */ stfs f0, 0xf3c(r28) -/* 80199770 D0 3C 0F 40 */ stfs f1, 0xf40(r28) -/* 80199774 C0 02 A1 20 */ lfs f0, lit_4496(r2) -/* 80199778 D0 1C 0F 44 */ stfs f0, 0xf44(r28) -/* 8019977C 48 00 00 70 */ b lbl_801997EC -lbl_80199780: -/* 80199780 38 1F FF FC */ addi r0, r31, -4 -/* 80199784 28 00 00 01 */ cmplwi r0, 1 -/* 80199788 40 81 00 0C */ ble lbl_80199794 -/* 8019978C 2C 1F 00 06 */ cmpwi r31, 6 -/* 80199790 40 82 00 5C */ bne lbl_801997EC -lbl_80199794: -/* 80199794 38 00 00 5F */ li r0, 0x5f -/* 80199798 90 01 00 08 */ stw r0, 8(r1) -/* 8019979C 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 801997A0 38 81 00 08 */ addi r4, r1, 8 -/* 801997A4 38 A0 00 00 */ li r5, 0 -/* 801997A8 38 C0 00 00 */ li r6, 0 -/* 801997AC 38 E0 00 00 */ li r7, 0 -/* 801997B0 C0 22 A1 08 */ lfs f1, lit_4099(r2) -/* 801997B4 FC 40 08 90 */ fmr f2, f1 -/* 801997B8 C0 62 A1 14 */ lfs f3, lit_4493(r2) -/* 801997BC FC 80 18 90 */ fmr f4, f3 -/* 801997C0 39 00 00 00 */ li r8, 0 -/* 801997C4 48 11 21 C1 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801997C8 88 1C 0F 6E */ lbz r0, 0xf6e(r28) -/* 801997CC B0 1C 0F 4C */ sth r0, 0xf4c(r28) -/* 801997D0 C0 22 A1 18 */ lfs f1, lit_4494(r2) -/* 801997D4 D0 3C 0F 38 */ stfs f1, 0xf38(r28) -/* 801997D8 C0 02 A1 1C */ lfs f0, lit_4495(r2) -/* 801997DC D0 1C 0F 3C */ stfs f0, 0xf3c(r28) -/* 801997E0 D0 3C 0F 40 */ stfs f1, 0xf40(r28) -/* 801997E4 C0 02 A1 20 */ lfs f0, lit_4496(r2) -/* 801997E8 D0 1C 0F 44 */ stfs f0, 0xf44(r28) -lbl_801997EC: -/* 801997EC 38 00 00 01 */ li r0, 1 -/* 801997F0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801997F4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801997F8 98 03 5E 86 */ stb r0, 0x5e86(r3) -/* 801997FC 2C 1F 00 01 */ cmpwi r31, 1 -/* 80199800 40 82 00 54 */ bne lbl_80199854 -/* 80199804 7F 83 E3 78 */ mr r3, r28 -/* 80199808 88 9C 0F 6E */ lbz r4, 0xf6e(r28) -/* 8019980C 38 84 FF FF */ addi r4, r4, -1 -/* 80199810 4B FF DD E9 */ bl isFlag__13dShopSystem_cFi -/* 80199814 2C 03 00 00 */ cmpwi r3, 0 -/* 80199818 40 82 00 28 */ bne lbl_80199840 -/* 8019981C 7F 83 E3 78 */ mr r3, r28 -/* 80199820 88 9C 0F 6E */ lbz r4, 0xf6e(r28) -/* 80199824 38 84 FF FF */ addi r4, r4, -1 -/* 80199828 4B FF DE 29 */ bl isSoldOutItemFlag__13dShopSystem_cFi -/* 8019982C 2C 03 00 00 */ cmpwi r3, 0 -/* 80199830 40 82 00 10 */ bne lbl_80199840 -/* 80199834 7F 83 E3 78 */ mr r3, r28 -/* 80199838 38 80 00 08 */ li r4, 8 -/* 8019983C 4B FF DD 85 */ bl onFlag__13dShopSystem_cFi -lbl_80199840: -/* 80199840 48 08 51 95 */ bl dMeter2Info_set2DVibrationM__Fv -/* 80199844 7F 83 E3 78 */ mr r3, r28 -/* 80199848 38 80 00 06 */ li r4, 6 -/* 8019984C 48 00 0A F9 */ bl setSeq__13dShopSystem_cFUc -/* 80199850 48 00 00 E4 */ b lbl_80199934 -lbl_80199854: -/* 80199854 2C 1F 00 02 */ cmpwi r31, 2 -/* 80199858 40 82 00 14 */ bne lbl_8019986C -/* 8019985C 7F 83 E3 78 */ mr r3, r28 -/* 80199860 38 80 00 0A */ li r4, 0xa -/* 80199864 48 00 0A E1 */ bl setSeq__13dShopSystem_cFUc -/* 80199868 48 00 00 CC */ b lbl_80199934 -lbl_8019986C: -/* 8019986C 88 1C 0F 6E */ lbz r0, 0xf6e(r28) -/* 80199870 28 00 00 00 */ cmplwi r0, 0 -/* 80199874 40 82 00 14 */ bne lbl_80199888 -/* 80199878 7F 83 E3 78 */ mr r3, r28 -/* 8019987C 38 80 00 01 */ li r4, 1 -/* 80199880 48 00 0A C5 */ bl setSeq__13dShopSystem_cFUc -/* 80199884 48 00 00 B0 */ b lbl_80199934 -lbl_80199888: -/* 80199888 38 00 00 00 */ li r0, 0 -/* 8019988C B0 1C 0F 68 */ sth r0, 0xf68(r28) -/* 80199890 7F 83 E3 78 */ mr r3, r28 -/* 80199894 38 80 00 05 */ li r4, 5 -/* 80199898 48 00 0A AD */ bl setSeq__13dShopSystem_cFUc -/* 8019989C 88 1C 0F 6F */ lbz r0, 0xf6f(r28) -/* 801998A0 28 00 00 00 */ cmplwi r0, 0 -/* 801998A4 41 82 00 90 */ beq lbl_80199934 -/* 801998A8 38 60 00 00 */ li r3, 0 -/* 801998AC 48 00 01 54 */ b lbl_80199A00 -lbl_801998B0: -/* 801998B0 38 1F FF FD */ addi r0, r31, -3 -/* 801998B4 28 00 00 04 */ cmplwi r0, 4 -/* 801998B8 40 81 00 0C */ ble lbl_801998C4 -/* 801998BC 2C 1F 00 02 */ cmpwi r31, 2 -/* 801998C0 40 82 00 74 */ bne lbl_80199934 -lbl_801998C4: -/* 801998C4 88 1C 0F 6F */ lbz r0, 0xf6f(r28) -/* 801998C8 28 00 00 07 */ cmplwi r0, 7 -/* 801998CC 40 82 00 18 */ bne lbl_801998E4 -/* 801998D0 88 1C 0F 6E */ lbz r0, 0xf6e(r28) -/* 801998D4 98 1C 0F 6F */ stb r0, 0xf6f(r28) -/* 801998D8 38 00 00 07 */ li r0, 7 -/* 801998DC 98 1C 0F 6E */ stb r0, 0xf6e(r28) -/* 801998E0 48 00 00 08 */ b lbl_801998E8 -lbl_801998E4: -/* 801998E4 98 1C 0F 6E */ stb r0, 0xf6e(r28) -lbl_801998E8: -/* 801998E8 38 00 00 00 */ li r0, 0 -/* 801998EC 98 1C 0F 7A */ stb r0, 0xf7a(r28) -/* 801998F0 2C 1F 00 02 */ cmpwi r31, 2 -/* 801998F4 40 82 00 40 */ bne lbl_80199934 -/* 801998F8 88 1C 0F 6E */ lbz r0, 0xf6e(r28) -/* 801998FC B0 1C 0F 4C */ sth r0, 0xf4c(r28) -/* 80199900 C0 22 A1 18 */ lfs f1, lit_4494(r2) -/* 80199904 D0 3C 0F 38 */ stfs f1, 0xf38(r28) -/* 80199908 C0 02 A1 1C */ lfs f0, lit_4495(r2) -/* 8019990C D0 1C 0F 3C */ stfs f0, 0xf3c(r28) -/* 80199910 D0 3C 0F 40 */ stfs f1, 0xf40(r28) -/* 80199914 C0 02 A1 20 */ lfs f0, lit_4496(r2) -/* 80199918 D0 1C 0F 44 */ stfs f0, 0xf44(r28) -/* 8019991C 48 00 00 18 */ b lbl_80199934 -lbl_80199920: -/* 80199920 7F C3 F3 78 */ mr r3, r30 -/* 80199924 7F A4 EB 78 */ mr r4, r29 -/* 80199928 38 A0 00 00 */ li r5, 0 -/* 8019992C 38 C0 00 00 */ li r6, 0 -/* 80199930 48 0B 09 A9 */ bl doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci -lbl_80199934: -/* 80199934 3B A0 00 00 */ li r29, 0 -/* 80199938 88 1C 0F 6E */ lbz r0, 0xf6e(r28) -/* 8019993C 28 00 00 00 */ cmplwi r0, 0 -/* 80199940 41 82 00 0C */ beq lbl_8019994C -/* 80199944 7C 1D 03 78 */ mr r29, r0 -/* 80199948 48 00 00 14 */ b lbl_8019995C -lbl_8019994C: -/* 8019994C 88 1C 0F 6F */ lbz r0, 0xf6f(r28) -/* 80199950 28 00 00 00 */ cmplwi r0, 0 -/* 80199954 41 82 00 08 */ beq lbl_8019995C -/* 80199958 7C 1D 03 78 */ mr r29, r0 -lbl_8019995C: -/* 8019995C 57 A5 06 3F */ clrlwi. r5, r29, 0x18 -/* 80199960 41 82 00 9C */ beq lbl_801999FC -/* 80199964 38 61 00 10 */ addi r3, r1, 0x10 -/* 80199968 38 9C 0E 48 */ addi r4, r28, 0xe48 -/* 8019996C 38 A5 FF FF */ addi r5, r5, -1 -/* 80199970 4B FF D0 31 */ bl getCurrentPos__15dShopItemCtrl_cFi -/* 80199974 C0 01 00 10 */ lfs f0, 0x10(r1) -/* 80199978 D0 01 00 28 */ stfs f0, 0x28(r1) -/* 8019997C C0 01 00 14 */ lfs f0, 0x14(r1) -/* 80199980 D0 01 00 2C */ stfs f0, 0x2c(r1) -/* 80199984 C0 01 00 18 */ lfs f0, 0x18(r1) -/* 80199988 D0 01 00 30 */ stfs f0, 0x30(r1) -/* 8019998C 38 61 00 28 */ addi r3, r1, 0x28 -/* 80199990 38 81 00 1C */ addi r4, r1, 0x1c -/* 80199994 4B E7 B9 7D */ bl mDoLib_project__FP3VecP3Vec -/* 80199998 57 A0 06 3E */ clrlwi r0, r29, 0x18 -/* 8019999C 28 00 00 07 */ cmplwi r0, 7 -/* 801999A0 40 82 00 30 */ bne lbl_801999D0 -/* 801999A4 C0 21 00 1C */ lfs f1, 0x1c(r1) -/* 801999A8 3C 60 80 43 */ lis r3, g_cursorHIO@ha /* 0x80430110@ha */ -/* 801999AC 38 63 01 10 */ addi r3, r3, g_cursorHIO@l /* 0x80430110@l */ -/* 801999B0 C0 03 00 34 */ lfs f0, 0x34(r3) -/* 801999B4 EC 01 00 2A */ fadds f0, f1, f0 -/* 801999B8 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 801999BC C0 21 00 20 */ lfs f1, 0x20(r1) -/* 801999C0 C0 03 00 38 */ lfs f0, 0x38(r3) -/* 801999C4 EC 01 00 2A */ fadds f0, f1, f0 -/* 801999C8 D0 01 00 20 */ stfs f0, 0x20(r1) -/* 801999CC 48 00 00 1C */ b lbl_801999E8 -lbl_801999D0: -/* 801999D0 C0 21 00 20 */ lfs f1, 0x20(r1) -/* 801999D4 3C 60 80 43 */ lis r3, g_cursorHIO@ha /* 0x80430110@ha */ -/* 801999D8 38 63 01 10 */ addi r3, r3, g_cursorHIO@l /* 0x80430110@l */ -/* 801999DC C0 03 00 30 */ lfs f0, 0x30(r3) -/* 801999E0 EC 01 00 2A */ fadds f0, f1, f0 -/* 801999E4 D0 01 00 20 */ stfs f0, 0x20(r1) -lbl_801999E8: -/* 801999E8 C0 21 00 20 */ lfs f1, 0x20(r1) -/* 801999EC 80 7C 0E 44 */ lwz r3, 0xe44(r28) -/* 801999F0 C0 01 00 1C */ lfs f0, 0x1c(r1) -/* 801999F4 D0 03 00 58 */ stfs f0, 0x58(r3) -/* 801999F8 D0 23 00 5C */ stfs f1, 0x5c(r3) -lbl_801999FC: -/* 801999FC 38 60 00 00 */ li r3, 0 -lbl_80199A00: -/* 80199A00 39 61 00 50 */ addi r11, r1, 0x50 -/* 80199A04 48 1C 88 21 */ bl _restgpr_28 -/* 80199A08 80 01 00 54 */ lwz r0, 0x54(r1) -/* 80199A0C 7C 08 03 A6 */ mtlr r0 -/* 80199A10 38 21 00 50 */ addi r1, r1, 0x50 -/* 80199A14 4E 80 00 20 */ blr diff --git a/asm/d/shop/d_shop_system/seq_select_start__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s b/asm/d/shop/d_shop_system/seq_select_start__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s deleted file mode 100644 index ba0dcb7b16..0000000000 --- a/asm/d/shop/d_shop_system/seq_select_start__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s +++ /dev/null @@ -1,127 +0,0 @@ -lbl_801993C4: -/* 801993C4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801993C8 7C 08 02 A6 */ mflr r0 -/* 801993CC 90 01 00 14 */ stw r0, 0x14(r1) -/* 801993D0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801993D4 7C 7F 1B 78 */ mr r31, r3 -/* 801993D8 80 03 0F 60 */ lwz r0, 0xf60(r3) -/* 801993DC 2C 00 00 00 */ cmpwi r0, 0 -/* 801993E0 40 80 00 34 */ bge lbl_80199414 -/* 801993E4 88 1F 0F 76 */ lbz r0, 0xf76(r31) -/* 801993E8 28 00 00 00 */ cmplwi r0, 0 -/* 801993EC 40 82 00 28 */ bne lbl_80199414 -/* 801993F0 80 8D 8A DC */ lwz r4, dShopSystem_item_count(r13) -/* 801993F4 2C 04 FF FF */ cmpwi r4, -1 -/* 801993F8 41 82 00 1C */ beq lbl_80199414 -/* 801993FC 88 0D 8A D8 */ lbz r0, data_80451058(r13) -/* 80199400 7C 04 00 00 */ cmpw r4, r0 -/* 80199404 41 82 00 0C */ beq lbl_80199410 -/* 80199408 38 60 00 00 */ li r3, 0 -/* 8019940C 48 00 01 7C */ b lbl_80199588 -lbl_80199410: -/* 80199410 48 00 11 C1 */ bl searchItemActor__13dShopSystem_cFv -lbl_80199414: -/* 80199414 7F E3 FB 78 */ mr r3, r31 -/* 80199418 88 9F 0F 6E */ lbz r4, 0xf6e(r31) -/* 8019941C 38 84 FF FF */ addi r4, r4, -1 -/* 80199420 4B FF E1 D9 */ bl isFlag__13dShopSystem_cFi -/* 80199424 2C 03 00 00 */ cmpwi r3, 0 -/* 80199428 41 82 01 0C */ beq lbl_80199534 -/* 8019942C 88 1F 0F 6E */ lbz r0, 0xf6e(r31) -/* 80199430 2C 00 00 02 */ cmpwi r0, 2 -/* 80199434 41 82 00 6C */ beq lbl_801994A0 -/* 80199438 40 80 00 10 */ bge lbl_80199448 -/* 8019943C 2C 00 00 01 */ cmpwi r0, 1 -/* 80199440 40 80 00 14 */ bge lbl_80199454 -/* 80199444 48 00 00 F0 */ b lbl_80199534 -lbl_80199448: -/* 80199448 2C 00 00 04 */ cmpwi r0, 4 -/* 8019944C 40 80 00 E8 */ bge lbl_80199534 -/* 80199450 48 00 00 9C */ b lbl_801994EC -lbl_80199454: -/* 80199454 38 00 00 02 */ li r0, 2 -/* 80199458 98 1F 0F 6E */ stb r0, 0xf6e(r31) -/* 8019945C 7F E3 FB 78 */ mr r3, r31 -/* 80199460 88 9F 0F 6E */ lbz r4, 0xf6e(r31) -/* 80199464 38 84 FF FF */ addi r4, r4, -1 -/* 80199468 4B FF E1 91 */ bl isFlag__13dShopSystem_cFi -/* 8019946C 2C 03 00 00 */ cmpwi r3, 0 -/* 80199470 41 82 00 C4 */ beq lbl_80199534 -/* 80199474 38 00 00 03 */ li r0, 3 -/* 80199478 98 1F 0F 6E */ stb r0, 0xf6e(r31) -/* 8019947C 7F E3 FB 78 */ mr r3, r31 -/* 80199480 88 9F 0F 6E */ lbz r4, 0xf6e(r31) -/* 80199484 38 84 FF FF */ addi r4, r4, -1 -/* 80199488 4B FF E1 71 */ bl isFlag__13dShopSystem_cFi -/* 8019948C 2C 03 00 00 */ cmpwi r3, 0 -/* 80199490 41 82 00 A4 */ beq lbl_80199534 -/* 80199494 38 00 00 00 */ li r0, 0 -/* 80199498 98 1F 0F 6E */ stb r0, 0xf6e(r31) -/* 8019949C 48 00 00 98 */ b lbl_80199534 -lbl_801994A0: -/* 801994A0 38 00 00 01 */ li r0, 1 -/* 801994A4 98 1F 0F 6E */ stb r0, 0xf6e(r31) -/* 801994A8 7F E3 FB 78 */ mr r3, r31 -/* 801994AC 88 9F 0F 6E */ lbz r4, 0xf6e(r31) -/* 801994B0 38 84 FF FF */ addi r4, r4, -1 -/* 801994B4 4B FF E1 45 */ bl isFlag__13dShopSystem_cFi -/* 801994B8 2C 03 00 00 */ cmpwi r3, 0 -/* 801994BC 41 82 00 78 */ beq lbl_80199534 -/* 801994C0 38 00 00 03 */ li r0, 3 -/* 801994C4 98 1F 0F 6E */ stb r0, 0xf6e(r31) -/* 801994C8 7F E3 FB 78 */ mr r3, r31 -/* 801994CC 88 9F 0F 6E */ lbz r4, 0xf6e(r31) -/* 801994D0 38 84 FF FF */ addi r4, r4, -1 -/* 801994D4 4B FF E1 25 */ bl isFlag__13dShopSystem_cFi -/* 801994D8 2C 03 00 00 */ cmpwi r3, 0 -/* 801994DC 41 82 00 58 */ beq lbl_80199534 -/* 801994E0 38 00 00 00 */ li r0, 0 -/* 801994E4 98 1F 0F 6E */ stb r0, 0xf6e(r31) -/* 801994E8 48 00 00 4C */ b lbl_80199534 -lbl_801994EC: -/* 801994EC 38 00 00 02 */ li r0, 2 -/* 801994F0 98 1F 0F 6E */ stb r0, 0xf6e(r31) -/* 801994F4 7F E3 FB 78 */ mr r3, r31 -/* 801994F8 88 9F 0F 6E */ lbz r4, 0xf6e(r31) -/* 801994FC 38 84 FF FF */ addi r4, r4, -1 -/* 80199500 4B FF E0 F9 */ bl isFlag__13dShopSystem_cFi -/* 80199504 2C 03 00 00 */ cmpwi r3, 0 -/* 80199508 41 82 00 2C */ beq lbl_80199534 -/* 8019950C 38 00 00 01 */ li r0, 1 -/* 80199510 98 1F 0F 6E */ stb r0, 0xf6e(r31) -/* 80199514 7F E3 FB 78 */ mr r3, r31 -/* 80199518 88 9F 0F 6E */ lbz r4, 0xf6e(r31) -/* 8019951C 38 84 FF FF */ addi r4, r4, -1 -/* 80199520 4B FF E0 D9 */ bl isFlag__13dShopSystem_cFi -/* 80199524 2C 03 00 00 */ cmpwi r3, 0 -/* 80199528 41 82 00 0C */ beq lbl_80199534 -/* 8019952C 38 00 00 00 */ li r0, 0 -/* 80199530 98 1F 0F 6E */ stb r0, 0xf6e(r31) -lbl_80199534: -/* 80199534 88 1F 0F 6E */ lbz r0, 0xf6e(r31) -/* 80199538 B0 1F 0F 4C */ sth r0, 0xf4c(r31) -/* 8019953C C0 22 A1 18 */ lfs f1, lit_4494(r2) -/* 80199540 D0 3F 0F 38 */ stfs f1, 0xf38(r31) -/* 80199544 C0 02 A1 1C */ lfs f0, lit_4495(r2) -/* 80199548 D0 1F 0F 3C */ stfs f0, 0xf3c(r31) -/* 8019954C D0 3F 0F 40 */ stfs f1, 0xf40(r31) -/* 80199550 C0 02 A1 20 */ lfs f0, lit_4496(r2) -/* 80199554 D0 1F 0F 44 */ stfs f0, 0xf44(r31) -/* 80199558 7F E3 FB 78 */ mr r3, r31 -/* 8019955C 38 80 00 04 */ li r4, 4 -/* 80199560 38 A0 00 00 */ li r5, 0 -/* 80199564 4B FF EE E1 */ bl moveCursor__13dShopSystem_cFiUc -/* 80199568 7C 64 1B 78 */ mr r4, r3 -/* 8019956C 7F E3 FB 78 */ mr r3, r31 -/* 80199570 38 A0 00 00 */ li r5, 0 -/* 80199574 4B FB 26 7D */ bl initTalk__8daNpcT_cFiPP10fopAc_ac_c -/* 80199578 7F E3 FB 78 */ mr r3, r31 -/* 8019957C 38 80 00 04 */ li r4, 4 -/* 80199580 48 00 0D C5 */ bl setSeq__13dShopSystem_cFUc -/* 80199584 38 60 00 00 */ li r3, 0 -lbl_80199588: -/* 80199588 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8019958C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80199590 7C 08 03 A6 */ mtlr r0 -/* 80199594 38 21 00 10 */ addi r1, r1, 0x10 -/* 80199598 4E 80 00 20 */ blr diff --git a/asm/d/shop/d_shop_system/seq_start__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s b/asm/d/shop/d_shop_system/seq_start__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s deleted file mode 100644 index 4a4725a989..0000000000 --- a/asm/d/shop/d_shop_system/seq_start__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s +++ /dev/null @@ -1,185 +0,0 @@ -lbl_801990B8: -/* 801990B8 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 801990BC 7C 08 02 A6 */ mflr r0 -/* 801990C0 90 01 00 44 */ stw r0, 0x44(r1) -/* 801990C4 39 61 00 40 */ addi r11, r1, 0x40 -/* 801990C8 48 1C 91 11 */ bl _savegpr_28 -/* 801990CC 7C 7D 1B 78 */ mr r29, r3 -/* 801990D0 7C 9E 23 78 */ mr r30, r4 -/* 801990D4 7C BF 2B 78 */ mr r31, r5 -/* 801990D8 88 03 0F 79 */ lbz r0, 0xf79(r3) -/* 801990DC 28 00 00 00 */ cmplwi r0, 0 -/* 801990E0 41 82 00 24 */ beq lbl_80199104 -/* 801990E4 38 00 00 00 */ li r0, 0 -/* 801990E8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801990EC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801990F0 98 03 5E 3C */ stb r0, 0x5e3c(r3) -/* 801990F4 98 03 5E 57 */ stb r0, 0x5e57(r3) -/* 801990F8 98 03 5E 35 */ stb r0, 0x5e35(r3) -/* 801990FC 98 03 5E 50 */ stb r0, 0x5e50(r3) -/* 80199100 98 1D 0F 79 */ stb r0, 0xf79(r29) -lbl_80199104: -/* 80199104 38 61 00 0C */ addi r3, r1, 0xc -/* 80199108 38 9D 0E 48 */ addi r4, r29, 0xe48 -/* 8019910C 38 A0 00 00 */ li r5, 0 -/* 80199110 4B FF D8 91 */ bl getCurrentPos__15dShopItemCtrl_cFi -/* 80199114 C0 01 00 0C */ lfs f0, 0xc(r1) -/* 80199118 D0 01 00 24 */ stfs f0, 0x24(r1) -/* 8019911C C0 01 00 10 */ lfs f0, 0x10(r1) -/* 80199120 D0 01 00 28 */ stfs f0, 0x28(r1) -/* 80199124 C0 01 00 14 */ lfs f0, 0x14(r1) -/* 80199128 D0 01 00 2C */ stfs f0, 0x2c(r1) -/* 8019912C 38 61 00 24 */ addi r3, r1, 0x24 -/* 80199130 38 81 00 18 */ addi r4, r1, 0x18 -/* 80199134 4B E7 C1 DD */ bl mDoLib_project__FP3VecP3Vec -/* 80199138 C0 21 00 1C */ lfs f1, 0x1c(r1) -/* 8019913C 3C 60 80 43 */ lis r3, g_cursorHIO@ha /* 0x80430110@ha */ -/* 80199140 38 63 01 10 */ addi r3, r3, g_cursorHIO@l /* 0x80430110@l */ -/* 80199144 C0 03 00 30 */ lfs f0, 0x30(r3) -/* 80199148 EC 21 00 2A */ fadds f1, f1, f0 -/* 8019914C 80 7D 0E 44 */ lwz r3, 0xe44(r29) -/* 80199150 C0 01 00 18 */ lfs f0, 0x18(r1) -/* 80199154 D0 03 00 58 */ stfs f0, 0x58(r3) -/* 80199158 D0 23 00 5C */ stfs f1, 0x5c(r3) -/* 8019915C 88 1D 0F 75 */ lbz r0, 0xf75(r29) -/* 80199160 28 00 00 01 */ cmplwi r0, 1 -/* 80199164 40 82 00 30 */ bne lbl_80199194 -/* 80199168 7F A3 EB 78 */ mr r3, r29 -/* 8019916C 7F E4 FB 78 */ mr r4, r31 -/* 80199170 80 BD 0F 5C */ lwz r5, 0xf5c(r29) -/* 80199174 81 9D 0E 3C */ lwz r12, 0xe3c(r29) -/* 80199178 81 8C 00 C8 */ lwz r12, 0xc8(r12) -/* 8019917C 7D 89 03 A6 */ mtctr r12 -/* 80199180 4E 80 04 21 */ bctrl -/* 80199184 2C 03 00 00 */ cmpwi r3, 0 -/* 80199188 40 82 00 0C */ bne lbl_80199194 -/* 8019918C 38 60 00 00 */ li r3, 0 -/* 80199190 48 00 01 C4 */ b lbl_80199354 -lbl_80199194: -/* 80199194 48 09 F1 61 */ bl isMsgSendControl__12dMsgObject_cFv -/* 80199198 2C 03 00 00 */ cmpwi r3, 0 -/* 8019919C 41 82 01 14 */ beq lbl_801992B0 -/* 801991A0 38 80 00 00 */ li r4, 0 -/* 801991A4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801991A8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801991AC 98 83 5E 3C */ stb r4, 0x5e3c(r3) -/* 801991B0 98 83 5E 57 */ stb r4, 0x5e57(r3) -/* 801991B4 38 00 00 2A */ li r0, 0x2a -/* 801991B8 98 03 5E 35 */ stb r0, 0x5e35(r3) -/* 801991BC 98 83 5E 50 */ stb r4, 0x5e50(r3) -/* 801991C0 7F A3 EB 78 */ mr r3, r29 -/* 801991C4 38 80 00 00 */ li r4, 0 -/* 801991C8 7F E5 FB 78 */ mr r5, r31 -/* 801991CC 4B FF E4 A5 */ bl checkController__13dShopSystem_cFUcP10dMsgFlow_c -/* 801991D0 7C 7C 1B 79 */ or. r28, r3, r3 -/* 801991D4 41 82 01 7C */ beq lbl_80199350 -/* 801991D8 48 09 F1 49 */ bl onMsgSend__12dMsgObject_cFv -/* 801991DC 7F A3 EB 78 */ mr r3, r29 -/* 801991E0 7F 84 E3 78 */ mr r4, r28 -/* 801991E4 38 A0 00 00 */ li r5, 0 -/* 801991E8 4B FF F2 5D */ bl moveCursor__13dShopSystem_cFiUc -/* 801991EC 7C 66 1B 78 */ mr r6, r3 -/* 801991F0 88 1D 0F 75 */ lbz r0, 0xf75(r29) -/* 801991F4 28 00 00 01 */ cmplwi r0, 1 -/* 801991F8 40 82 00 74 */ bne lbl_8019926C -/* 801991FC 88 1D 0F 6E */ lbz r0, 0xf6e(r29) -/* 80199200 28 00 00 00 */ cmplwi r0, 0 -/* 80199204 41 82 00 2C */ beq lbl_80199230 -/* 80199208 90 DD 0F 5C */ stw r6, 0xf5c(r29) -/* 8019920C C0 02 A1 44 */ lfs f0, lit_5084(r2) -/* 80199210 D0 1D 0F 38 */ stfs f0, 0xf38(r29) -/* 80199214 D0 1D 0F 3C */ stfs f0, 0xf3c(r29) -/* 80199218 D0 1D 0F 40 */ stfs f0, 0xf40(r29) -/* 8019921C D0 1D 0F 44 */ stfs f0, 0xf44(r29) -/* 80199220 7F A3 EB 78 */ mr r3, r29 -/* 80199224 38 80 00 04 */ li r4, 4 -/* 80199228 48 00 11 1D */ bl setSeq__13dShopSystem_cFUc -/* 8019922C 48 00 01 24 */ b lbl_80199350 -lbl_80199230: -/* 80199230 7F E3 FB 78 */ mr r3, r31 -/* 80199234 7F C4 F3 78 */ mr r4, r30 -/* 80199238 38 A0 00 00 */ li r5, 0 -/* 8019923C 48 0B 10 9D */ bl doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci -/* 80199240 2C 03 00 00 */ cmpwi r3, 0 -/* 80199244 41 82 01 0C */ beq lbl_80199350 -/* 80199248 C0 02 A1 44 */ lfs f0, lit_5084(r2) -/* 8019924C D0 1D 0F 38 */ stfs f0, 0xf38(r29) -/* 80199250 D0 1D 0F 3C */ stfs f0, 0xf3c(r29) -/* 80199254 D0 1D 0F 40 */ stfs f0, 0xf40(r29) -/* 80199258 D0 1D 0F 44 */ stfs f0, 0xf44(r29) -/* 8019925C 7F A3 EB 78 */ mr r3, r29 -/* 80199260 38 80 00 0A */ li r4, 0xa -/* 80199264 48 00 10 E1 */ bl setSeq__13dShopSystem_cFUc -/* 80199268 48 00 00 E8 */ b lbl_80199350 -lbl_8019926C: -/* 8019926C 7F E3 FB 78 */ mr r3, r31 -/* 80199270 7F C4 F3 78 */ mr r4, r30 -/* 80199274 38 A0 00 00 */ li r5, 0 -/* 80199278 48 0B 10 61 */ bl doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci -/* 8019927C 2C 03 00 00 */ cmpwi r3, 0 -/* 80199280 41 82 00 D0 */ beq lbl_80199350 -/* 80199284 88 1D 0F 6E */ lbz r0, 0xf6e(r29) -/* 80199288 28 00 00 00 */ cmplwi r0, 0 -/* 8019928C 40 82 00 14 */ bne lbl_801992A0 -/* 80199290 7F A3 EB 78 */ mr r3, r29 -/* 80199294 38 80 00 0A */ li r4, 0xa -/* 80199298 48 00 10 AD */ bl setSeq__13dShopSystem_cFUc -/* 8019929C 48 00 00 B4 */ b lbl_80199350 -lbl_801992A0: -/* 801992A0 7F A3 EB 78 */ mr r3, r29 -/* 801992A4 38 80 00 04 */ li r4, 4 -/* 801992A8 48 00 10 9D */ bl setSeq__13dShopSystem_cFUc -/* 801992AC 48 00 00 A4 */ b lbl_80199350 -lbl_801992B0: -/* 801992B0 7F E3 FB 78 */ mr r3, r31 -/* 801992B4 7F C4 F3 78 */ mr r4, r30 -/* 801992B8 38 A0 00 00 */ li r5, 0 -/* 801992BC 38 C0 00 00 */ li r6, 0 -/* 801992C0 48 0B 10 19 */ bl doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci -/* 801992C4 2C 03 00 00 */ cmpwi r3, 0 -/* 801992C8 41 82 00 88 */ beq lbl_80199350 -/* 801992CC 38 7D 09 74 */ addi r3, r29, 0x974 -/* 801992D0 38 81 00 08 */ addi r4, r1, 8 -/* 801992D4 48 0B 12 55 */ bl getEventId__10dMsgFlow_cFPi -/* 801992D8 54 60 04 3E */ clrlwi r0, r3, 0x10 -/* 801992DC 28 00 00 01 */ cmplwi r0, 1 -/* 801992E0 40 82 00 68 */ bne lbl_80199348 -/* 801992E4 80 7D 0D 90 */ lwz r3, 0xd90(r29) -/* 801992E8 3C 03 00 01 */ addis r0, r3, 1 -/* 801992EC 28 00 FF FF */ cmplwi r0, 0xffff -/* 801992F0 40 82 00 28 */ bne lbl_80199318 -/* 801992F4 38 7D 04 D0 */ addi r3, r29, 0x4d0 -/* 801992F8 80 81 00 08 */ lwz r4, 8(r1) -/* 801992FC 38 A0 00 00 */ li r5, 0 -/* 80199300 38 C0 FF FF */ li r6, -1 -/* 80199304 38 E0 FF FF */ li r7, -1 -/* 80199308 39 00 00 00 */ li r8, 0 -/* 8019930C 39 20 00 00 */ li r9, 0 -/* 80199310 4B E8 28 D9 */ bl fopAcM_createItemForPresentDemo__FPC4cXyziUciiPC5csXyzPC4cXyz -/* 80199314 90 7D 0D 90 */ stw r3, 0xd90(r29) -lbl_80199318: -/* 80199318 80 7D 0D 90 */ lwz r3, 0xd90(r29) -/* 8019931C 4B E8 80 81 */ bl fpcEx_IsExist__FUi -/* 80199320 2C 03 00 00 */ cmpwi r3, 0 -/* 80199324 41 82 00 1C */ beq lbl_80199340 -/* 80199328 38 00 00 01 */ li r0, 1 -/* 8019932C B0 1D 0E 30 */ sth r0, 0xe30(r29) -/* 80199330 7F A3 EB 78 */ mr r3, r29 -/* 80199334 4B FB 0E F1 */ bl evtChange__8daNpcT_cFv -/* 80199338 38 60 00 01 */ li r3, 1 -/* 8019933C 48 00 00 18 */ b lbl_80199354 -lbl_80199340: -/* 80199340 38 60 00 00 */ li r3, 0 -/* 80199344 48 00 00 10 */ b lbl_80199354 -lbl_80199348: -/* 80199348 38 60 00 01 */ li r3, 1 -/* 8019934C 48 00 00 08 */ b lbl_80199354 -lbl_80199350: -/* 80199350 38 60 00 00 */ li r3, 0 -lbl_80199354: -/* 80199354 39 61 00 40 */ addi r11, r1, 0x40 -/* 80199358 48 1C 8E CD */ bl _restgpr_28 -/* 8019935C 80 01 00 44 */ lwz r0, 0x44(r1) -/* 80199360 7C 08 03 A6 */ mtlr r0 -/* 80199364 38 21 00 40 */ addi r1, r1, 0x40 -/* 80199368 4E 80 00 20 */ blr diff --git a/asm/d/shop/d_shop_system/shop_process__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s b/asm/d/shop/d_shop_system/shop_process__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s deleted file mode 100644 index d51146c1b7..0000000000 --- a/asm/d/shop/d_shop_system/shop_process__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s +++ /dev/null @@ -1,62 +0,0 @@ -lbl_8019A158: -/* 8019A158 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8019A15C 7C 08 02 A6 */ mflr r0 -/* 8019A160 90 01 00 14 */ stw r0, 0x14(r1) -/* 8019A164 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8019A168 93 C1 00 08 */ stw r30, 8(r1) -/* 8019A16C 7C 7F 1B 78 */ mr r31, r3 -/* 8019A170 88 03 0F 70 */ lbz r0, 0xf70(r3) -/* 8019A174 1C E0 00 0C */ mulli r7, r0, 0xc -/* 8019A178 3C C0 80 3C */ lis r6, process@ha /* 0x803BB974@ha */ -/* 8019A17C 38 06 B9 74 */ addi r0, r6, process@l /* 0x803BB974@l */ -/* 8019A180 7D 80 3A 14 */ add r12, r0, r7 -/* 8019A184 48 1C 7F 01 */ bl __ptmf_scall -/* 8019A188 60 00 00 00 */ nop -/* 8019A18C 7C 7E 1B 78 */ mr r30, r3 -/* 8019A190 88 7F 0F 72 */ lbz r3, 0xf72(r31) -/* 8019A194 28 03 00 00 */ cmplwi r3, 0 -/* 8019A198 41 82 00 0C */ beq lbl_8019A1A4 -/* 8019A19C 38 03 FF FF */ addi r0, r3, -1 -/* 8019A1A0 98 1F 0F 72 */ stb r0, 0xf72(r31) -lbl_8019A1A4: -/* 8019A1A4 88 1F 0F 7A */ lbz r0, 0xf7a(r31) -/* 8019A1A8 28 00 00 00 */ cmplwi r0, 0 -/* 8019A1AC 41 82 00 10 */ beq lbl_8019A1BC -/* 8019A1B0 48 08 48 21 */ bl dMeter2Info_set2DVibration__Fv -/* 8019A1B4 38 00 00 00 */ li r0, 0 -/* 8019A1B8 98 1F 0F 7A */ stb r0, 0xf7a(r31) -lbl_8019A1BC: -/* 8019A1BC 2C 1E 00 00 */ cmpwi r30, 0 -/* 8019A1C0 41 82 00 40 */ beq lbl_8019A200 -/* 8019A1C4 38 00 00 00 */ li r0, 0 -/* 8019A1C8 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 8019A1CC 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 8019A1D0 98 03 00 BD */ stb r0, 0xbd(r3) -/* 8019A1D4 88 1F 0F 70 */ lbz r0, 0xf70(r31) -/* 8019A1D8 28 00 00 00 */ cmplwi r0, 0 -/* 8019A1DC 41 82 00 10 */ beq lbl_8019A1EC -/* 8019A1E0 7F E3 FB 78 */ mr r3, r31 -/* 8019A1E4 38 80 00 00 */ li r4, 0 -/* 8019A1E8 48 00 01 5D */ bl setSeq__13dShopSystem_cFUc -lbl_8019A1EC: -/* 8019A1EC 2C 1E 00 02 */ cmpwi r30, 2 -/* 8019A1F0 41 82 00 10 */ beq lbl_8019A200 -/* 8019A1F4 38 00 00 00 */ li r0, 0 -/* 8019A1F8 98 1F 0F 6E */ stb r0, 0xf6e(r31) -/* 8019A1FC 98 1F 0F 6F */ stb r0, 0xf6f(r31) -lbl_8019A200: -/* 8019A200 88 7F 0F 70 */ lbz r3, 0xf70(r31) -/* 8019A204 88 1F 0F 71 */ lbz r0, 0xf71(r31) -/* 8019A208 7C 03 00 40 */ cmplw r3, r0 -/* 8019A20C 41 82 00 10 */ beq lbl_8019A21C -/* 8019A210 98 7F 0F 71 */ stb r3, 0xf71(r31) -/* 8019A214 38 00 00 01 */ li r0, 1 -/* 8019A218 98 1F 0F 79 */ stb r0, 0xf79(r31) -lbl_8019A21C: -/* 8019A21C 7F C3 F3 78 */ mr r3, r30 -/* 8019A220 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8019A224 83 C1 00 08 */ lwz r30, 8(r1) -/* 8019A228 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8019A22C 7C 08 03 A6 */ mtlr r0 -/* 8019A230 38 21 00 10 */ addi r1, r1, 0x10 -/* 8019A234 4E 80 00 20 */ blr diff --git a/asm/msg/scrn/d_msg_scrn_arrow/__ct__15dMsgScrnArrow_cFv.s b/asm/msg/scrn/d_msg_scrn_arrow/__ct__15dMsgScrnArrow_cFv.s deleted file mode 100644 index 1edf5db510..0000000000 --- a/asm/msg/scrn/d_msg_scrn_arrow/__ct__15dMsgScrnArrow_cFv.s +++ /dev/null @@ -1,182 +0,0 @@ -lbl_8023B9B4: -/* 8023B9B4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8023B9B8 7C 08 02 A6 */ mflr r0 -/* 8023B9BC 90 01 00 14 */ stw r0, 0x14(r1) -/* 8023B9C0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8023B9C4 93 C1 00 08 */ stw r30, 8(r1) -/* 8023B9C8 7C 7F 1B 78 */ mr r31, r3 -/* 8023B9CC 3C 80 80 3C */ lis r4, __vt__15dMsgScrnArrow_c@ha /* 0x803C0CF8@ha */ -/* 8023B9D0 38 04 0C F8 */ addi r0, r4, __vt__15dMsgScrnArrow_c@l /* 0x803C0CF8@l */ -/* 8023B9D4 90 03 00 00 */ stw r0, 0(r3) -/* 8023B9D8 38 60 01 18 */ li r3, 0x118 -/* 8023B9DC 48 09 32 71 */ bl __nw__FUl -/* 8023B9E0 7C 60 1B 79 */ or. r0, r3, r3 -/* 8023B9E4 41 82 00 0C */ beq lbl_8023B9F0 -/* 8023B9E8 48 0B CA B1 */ bl __ct__9J2DScreenFv -/* 8023B9EC 7C 60 1B 78 */ mr r0, r3 -lbl_8023B9F0: -/* 8023B9F0 90 1F 00 04 */ stw r0, 4(r31) -/* 8023B9F4 80 7F 00 04 */ lwz r3, 4(r31) -/* 8023B9F8 3C 80 80 3A */ lis r4, msg_scrn_d_msg_scrn_arrow__stringBase0@ha /* 0x803998A0@ha */ -/* 8023B9FC 38 84 98 A0 */ addi r4, r4, msg_scrn_d_msg_scrn_arrow__stringBase0@l /* 0x803998A0@l */ -/* 8023BA00 3C A0 00 02 */ lis r5, 2 -/* 8023BA04 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8023BA08 3B C6 61 C0 */ addi r30, r6, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8023BA0C 80 DE 5C 6C */ lwz r6, 0x5c6c(r30) -/* 8023BA10 48 0B CC 39 */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive -/* 8023BA14 80 7F 00 04 */ lwz r3, 4(r31) -/* 8023BA18 48 01 96 D1 */ bl dPaneClass_showNullPane__FP9J2DScreen -/* 8023BA1C 38 60 00 04 */ li r3, 4 -/* 8023BA20 64 63 00 04 */ oris r3, r3, 4 -/* 8023BA24 7C 72 E3 A6 */ mtspr 0x392, r3 -/* 8023BA28 38 60 00 05 */ li r3, 5 -/* 8023BA2C 64 63 00 05 */ oris r3, r3, 5 -/* 8023BA30 7C 73 E3 A6 */ mtspr 0x393, r3 -/* 8023BA34 38 60 00 06 */ li r3, 6 -/* 8023BA38 64 63 00 06 */ oris r3, r3, 6 -/* 8023BA3C 7C 74 E3 A6 */ mtspr 0x394, r3 -/* 8023BA40 38 60 00 07 */ li r3, 7 -/* 8023BA44 64 63 00 07 */ oris r3, r3, 7 -/* 8023BA48 7C 75 E3 A6 */ mtspr 0x395, r3 -/* 8023BA4C 3C 80 80 3A */ lis r4, msg_scrn_d_msg_scrn_arrow__stringBase0@ha /* 0x803998A0@ha */ -/* 8023BA50 38 84 98 A0 */ addi r4, r4, msg_scrn_d_msg_scrn_arrow__stringBase0@l /* 0x803998A0@l */ -/* 8023BA54 38 64 00 1B */ addi r3, r4, 0x1b -/* 8023BA58 80 9E 5C 6C */ lwz r4, 0x5c6c(r30) -/* 8023BA5C 48 09 88 15 */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader -/* 8023BA60 48 0C D0 0D */ bl load__20J2DAnmLoaderDataBaseFPCv -/* 8023BA64 90 7F 00 08 */ stw r3, 8(r31) -/* 8023BA68 C0 02 B1 98 */ lfs f0, lit_3662(r2) -/* 8023BA6C D0 1F 00 1C */ stfs f0, 0x1c(r31) -/* 8023BA70 3C 80 80 3A */ lis r4, msg_scrn_d_msg_scrn_arrow__stringBase0@ha /* 0x803998A0@ha */ -/* 8023BA74 38 84 98 A0 */ addi r4, r4, msg_scrn_d_msg_scrn_arrow__stringBase0@l /* 0x803998A0@l */ -/* 8023BA78 38 64 00 36 */ addi r3, r4, 0x36 -/* 8023BA7C 80 9E 5C 6C */ lwz r4, 0x5c6c(r30) -/* 8023BA80 48 09 87 F1 */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader -/* 8023BA84 48 0C CF E9 */ bl load__20J2DAnmLoaderDataBaseFPCv -/* 8023BA88 90 7F 00 0C */ stw r3, 0xc(r31) -/* 8023BA8C 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 8023BA90 80 9F 00 04 */ lwz r4, 4(r31) -/* 8023BA94 81 83 00 00 */ lwz r12, 0(r3) -/* 8023BA98 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 8023BA9C 7D 89 03 A6 */ mtctr r12 -/* 8023BAA0 4E 80 04 21 */ bctrl -/* 8023BAA4 C0 02 B1 98 */ lfs f0, lit_3662(r2) -/* 8023BAA8 D0 1F 00 20 */ stfs f0, 0x20(r31) -/* 8023BAAC 38 60 00 6C */ li r3, 0x6c -/* 8023BAB0 48 09 31 9D */ bl __nw__FUl -/* 8023BAB4 7C 60 1B 79 */ or. r0, r3, r3 -/* 8023BAB8 41 82 00 28 */ beq lbl_8023BAE0 -/* 8023BABC 80 9F 00 04 */ lwz r4, 4(r31) -/* 8023BAC0 3C A0 79 61 */ lis r5, 0x7961 /* 0x79615F6E@ha */ -/* 8023BAC4 38 C5 5F 6E */ addi r6, r5, 0x5F6E /* 0x79615F6E@l */ -/* 8023BAC8 3C A0 73 65 */ lis r5, 0x7365 /* 0x7365745F@ha */ -/* 8023BACC 38 A5 74 5F */ addi r5, r5, 0x745F /* 0x7365745F@l */ -/* 8023BAD0 38 E0 00 00 */ li r7, 0 -/* 8023BAD4 39 00 00 00 */ li r8, 0 -/* 8023BAD8 48 01 7E AD */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 8023BADC 7C 60 1B 78 */ mr r0, r3 -lbl_8023BAE0: -/* 8023BAE0 90 1F 00 10 */ stw r0, 0x10(r31) -/* 8023BAE4 38 60 00 6C */ li r3, 0x6c -/* 8023BAE8 48 09 31 65 */ bl __nw__FUl -/* 8023BAEC 7C 60 1B 79 */ or. r0, r3, r3 -/* 8023BAF0 41 82 00 28 */ beq lbl_8023BB18 -/* 8023BAF4 80 9F 00 04 */ lwz r4, 4(r31) -/* 8023BAF8 3C A0 6E 65 */ lis r5, 0x6E65 /* 0x6E657874@ha */ -/* 8023BAFC 38 C5 78 74 */ addi r6, r5, 0x7874 /* 0x6E657874@l */ -/* 8023BB00 3C A0 00 79 */ lis r5, 0x0079 /* 0x0079615F@ha */ -/* 8023BB04 38 A5 61 5F */ addi r5, r5, 0x615F /* 0x0079615F@l */ -/* 8023BB08 38 E0 00 00 */ li r7, 0 -/* 8023BB0C 39 00 00 00 */ li r8, 0 -/* 8023BB10 48 01 7E 75 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 8023BB14 7C 60 1B 78 */ mr r0, r3 -lbl_8023BB18: -/* 8023BB18 90 1F 00 14 */ stw r0, 0x14(r31) -/* 8023BB1C 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 8023BB20 48 01 9A E9 */ bl hide__13CPaneMgrAlphaFv -/* 8023BB24 80 9F 00 14 */ lwz r4, 0x14(r31) -/* 8023BB28 80 64 00 04 */ lwz r3, 4(r4) -/* 8023BB2C 80 9F 00 08 */ lwz r4, 8(r31) -/* 8023BB30 81 83 00 00 */ lwz r12, 0(r3) -/* 8023BB34 81 8C 00 60 */ lwz r12, 0x60(r12) -/* 8023BB38 7D 89 03 A6 */ mtctr r12 -/* 8023BB3C 4E 80 04 21 */ bctrl -/* 8023BB40 80 7F 00 04 */ lwz r3, 4(r31) -/* 8023BB44 3C 80 6E 65 */ lis r4, 0x6E65 /* 0x6E657874@ha */ -/* 8023BB48 38 C4 78 74 */ addi r6, r4, 0x7874 /* 0x6E657874@l */ -/* 8023BB4C 3C 80 00 79 */ lis r4, 0x0079 /* 0x0079616A@ha */ -/* 8023BB50 38 A4 61 6A */ addi r5, r4, 0x616A /* 0x0079616A@l */ -/* 8023BB54 81 83 00 00 */ lwz r12, 0(r3) -/* 8023BB58 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 8023BB5C 7D 89 03 A6 */ mtctr r12 -/* 8023BB60 4E 80 04 21 */ bctrl -/* 8023BB64 80 9F 00 0C */ lwz r4, 0xc(r31) -/* 8023BB68 81 83 00 00 */ lwz r12, 0(r3) -/* 8023BB6C 81 8C 00 64 */ lwz r12, 0x64(r12) -/* 8023BB70 7D 89 03 A6 */ mtctr r12 -/* 8023BB74 4E 80 04 21 */ bctrl -/* 8023BB78 80 7F 00 04 */ lwz r3, 4(r31) -/* 8023BB7C 3C 80 6E 65 */ lis r4, 0x6E65 /* 0x6E65786C@ha */ -/* 8023BB80 38 C4 78 6C */ addi r6, r4, 0x786C /* 0x6E65786C@l */ -/* 8023BB84 3C 80 79 61 */ lis r4, 0x7961 /* 0x79616A69@ha */ -/* 8023BB88 38 A4 6A 69 */ addi r5, r4, 0x6A69 /* 0x79616A69@l */ -/* 8023BB8C 81 83 00 00 */ lwz r12, 0(r3) -/* 8023BB90 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 8023BB94 7D 89 03 A6 */ mtctr r12 -/* 8023BB98 4E 80 04 21 */ bctrl -/* 8023BB9C 80 9F 00 0C */ lwz r4, 0xc(r31) -/* 8023BBA0 81 83 00 00 */ lwz r12, 0(r3) -/* 8023BBA4 81 8C 00 64 */ lwz r12, 0x64(r12) -/* 8023BBA8 7D 89 03 A6 */ mtctr r12 -/* 8023BBAC 4E 80 04 21 */ bctrl -/* 8023BBB0 38 60 00 6C */ li r3, 0x6c -/* 8023BBB4 48 09 30 99 */ bl __nw__FUl -/* 8023BBB8 7C 60 1B 79 */ or. r0, r3, r3 -/* 8023BBBC 41 82 00 24 */ beq lbl_8023BBE0 -/* 8023BBC0 80 9F 00 04 */ lwz r4, 4(r31) -/* 8023BBC4 3C A0 5F 65 */ lis r5, 0x5F65 /* 0x5F656E64@ha */ -/* 8023BBC8 38 C5 6E 64 */ addi r6, r5, 0x6E64 /* 0x5F656E64@l */ -/* 8023BBCC 38 A0 79 61 */ li r5, 0x7961 -/* 8023BBD0 38 E0 00 00 */ li r7, 0 -/* 8023BBD4 39 00 00 00 */ li r8, 0 -/* 8023BBD8 48 01 7D AD */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 8023BBDC 7C 60 1B 78 */ mr r0, r3 -lbl_8023BBE0: -/* 8023BBE0 90 1F 00 18 */ stw r0, 0x18(r31) -/* 8023BBE4 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 8023BBE8 48 01 9A 21 */ bl hide__13CPaneMgrAlphaFv -/* 8023BBEC 80 7F 00 04 */ lwz r3, 4(r31) -/* 8023BBF0 3C 80 5F 65 */ lis r4, 0x5F65 /* 0x5F656E64@ha */ -/* 8023BBF4 38 C4 6E 64 */ addi r6, r4, 0x6E64 /* 0x5F656E64@l */ -/* 8023BBF8 3C 80 00 79 */ lis r4, 0x0079 /* 0x0079616A@ha */ -/* 8023BBFC 38 A4 61 6A */ addi r5, r4, 0x616A /* 0x0079616A@l */ -/* 8023BC00 81 83 00 00 */ lwz r12, 0(r3) -/* 8023BC04 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 8023BC08 7D 89 03 A6 */ mtctr r12 -/* 8023BC0C 4E 80 04 21 */ bctrl -/* 8023BC10 80 9F 00 0C */ lwz r4, 0xc(r31) -/* 8023BC14 81 83 00 00 */ lwz r12, 0(r3) -/* 8023BC18 81 8C 00 64 */ lwz r12, 0x64(r12) -/* 8023BC1C 7D 89 03 A6 */ mtctr r12 -/* 8023BC20 4E 80 04 21 */ bctrl -/* 8023BC24 80 7F 00 04 */ lwz r3, 4(r31) -/* 8023BC28 3C 80 65 6E */ lis r4, 0x656E /* 0x656E646C@ha */ -/* 8023BC2C 38 C4 64 6C */ addi r6, r4, 0x646C /* 0x656E646C@l */ -/* 8023BC30 3C 80 79 61 */ lis r4, 0x7961 /* 0x79616A69@ha */ -/* 8023BC34 38 A4 6A 69 */ addi r5, r4, 0x6A69 /* 0x79616A69@l */ -/* 8023BC38 81 83 00 00 */ lwz r12, 0(r3) -/* 8023BC3C 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 8023BC40 7D 89 03 A6 */ mtctr r12 -/* 8023BC44 4E 80 04 21 */ bctrl -/* 8023BC48 80 9F 00 0C */ lwz r4, 0xc(r31) -/* 8023BC4C 81 83 00 00 */ lwz r12, 0(r3) -/* 8023BC50 81 8C 00 64 */ lwz r12, 0x64(r12) -/* 8023BC54 7D 89 03 A6 */ mtctr r12 -/* 8023BC58 4E 80 04 21 */ bctrl -/* 8023BC5C 7F E3 FB 78 */ mr r3, r31 -/* 8023BC60 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8023BC64 83 C1 00 08 */ lwz r30, 8(r1) -/* 8023BC68 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8023BC6C 7C 08 03 A6 */ mtlr r0 -/* 8023BC70 38 21 00 10 */ addi r1, r1, 0x10 -/* 8023BC74 4E 80 00 20 */ blr diff --git a/asm/msg/scrn/d_msg_scrn_arrow/__dt__15dMsgScrnArrow_cFv.s b/asm/msg/scrn/d_msg_scrn_arrow/__dt__15dMsgScrnArrow_cFv.s deleted file mode 100644 index c0521add43..0000000000 --- a/asm/msg/scrn/d_msg_scrn_arrow/__dt__15dMsgScrnArrow_cFv.s +++ /dev/null @@ -1,90 +0,0 @@ -lbl_8023BC78: -/* 8023BC78 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8023BC7C 7C 08 02 A6 */ mflr r0 -/* 8023BC80 90 01 00 14 */ stw r0, 0x14(r1) -/* 8023BC84 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8023BC88 93 C1 00 08 */ stw r30, 8(r1) -/* 8023BC8C 7C 7E 1B 79 */ or. r30, r3, r3 -/* 8023BC90 7C 9F 23 78 */ mr r31, r4 -/* 8023BC94 41 82 01 10 */ beq lbl_8023BDA4 -/* 8023BC98 3C 60 80 3C */ lis r3, __vt__15dMsgScrnArrow_c@ha /* 0x803C0CF8@ha */ -/* 8023BC9C 38 03 0C F8 */ addi r0, r3, __vt__15dMsgScrnArrow_c@l /* 0x803C0CF8@l */ -/* 8023BCA0 90 1E 00 00 */ stw r0, 0(r30) -/* 8023BCA4 80 7E 00 04 */ lwz r3, 4(r30) -/* 8023BCA8 28 03 00 00 */ cmplwi r3, 0 -/* 8023BCAC 41 82 00 18 */ beq lbl_8023BCC4 -/* 8023BCB0 38 80 00 01 */ li r4, 1 -/* 8023BCB4 81 83 00 00 */ lwz r12, 0(r3) -/* 8023BCB8 81 8C 00 08 */ lwz r12, 8(r12) -/* 8023BCBC 7D 89 03 A6 */ mtctr r12 -/* 8023BCC0 4E 80 04 21 */ bctrl -lbl_8023BCC4: -/* 8023BCC4 38 00 00 00 */ li r0, 0 -/* 8023BCC8 90 1E 00 04 */ stw r0, 4(r30) -/* 8023BCCC 80 7E 00 08 */ lwz r3, 8(r30) -/* 8023BCD0 28 03 00 00 */ cmplwi r3, 0 -/* 8023BCD4 41 82 00 18 */ beq lbl_8023BCEC -/* 8023BCD8 38 80 00 01 */ li r4, 1 -/* 8023BCDC 81 83 00 00 */ lwz r12, 0(r3) -/* 8023BCE0 81 8C 00 08 */ lwz r12, 8(r12) -/* 8023BCE4 7D 89 03 A6 */ mtctr r12 -/* 8023BCE8 4E 80 04 21 */ bctrl -lbl_8023BCEC: -/* 8023BCEC 38 00 00 00 */ li r0, 0 -/* 8023BCF0 90 1E 00 08 */ stw r0, 8(r30) -/* 8023BCF4 80 7E 00 0C */ lwz r3, 0xc(r30) -/* 8023BCF8 28 03 00 00 */ cmplwi r3, 0 -/* 8023BCFC 41 82 00 18 */ beq lbl_8023BD14 -/* 8023BD00 38 80 00 01 */ li r4, 1 -/* 8023BD04 81 83 00 00 */ lwz r12, 0(r3) -/* 8023BD08 81 8C 00 08 */ lwz r12, 8(r12) -/* 8023BD0C 7D 89 03 A6 */ mtctr r12 -/* 8023BD10 4E 80 04 21 */ bctrl -lbl_8023BD14: -/* 8023BD14 38 00 00 00 */ li r0, 0 -/* 8023BD18 90 1E 00 0C */ stw r0, 0xc(r30) -/* 8023BD1C 80 7E 00 10 */ lwz r3, 0x10(r30) -/* 8023BD20 28 03 00 00 */ cmplwi r3, 0 -/* 8023BD24 41 82 00 18 */ beq lbl_8023BD3C -/* 8023BD28 38 80 00 01 */ li r4, 1 -/* 8023BD2C 81 83 00 00 */ lwz r12, 0(r3) -/* 8023BD30 81 8C 00 08 */ lwz r12, 8(r12) -/* 8023BD34 7D 89 03 A6 */ mtctr r12 -/* 8023BD38 4E 80 04 21 */ bctrl -lbl_8023BD3C: -/* 8023BD3C 38 00 00 00 */ li r0, 0 -/* 8023BD40 90 1E 00 10 */ stw r0, 0x10(r30) -/* 8023BD44 80 7E 00 14 */ lwz r3, 0x14(r30) -/* 8023BD48 28 03 00 00 */ cmplwi r3, 0 -/* 8023BD4C 41 82 00 18 */ beq lbl_8023BD64 -/* 8023BD50 38 80 00 01 */ li r4, 1 -/* 8023BD54 81 83 00 00 */ lwz r12, 0(r3) -/* 8023BD58 81 8C 00 08 */ lwz r12, 8(r12) -/* 8023BD5C 7D 89 03 A6 */ mtctr r12 -/* 8023BD60 4E 80 04 21 */ bctrl -lbl_8023BD64: -/* 8023BD64 38 00 00 00 */ li r0, 0 -/* 8023BD68 90 1E 00 14 */ stw r0, 0x14(r30) -/* 8023BD6C 80 7E 00 18 */ lwz r3, 0x18(r30) -/* 8023BD70 28 03 00 00 */ cmplwi r3, 0 -/* 8023BD74 41 82 00 18 */ beq lbl_8023BD8C -/* 8023BD78 38 80 00 01 */ li r4, 1 -/* 8023BD7C 81 83 00 00 */ lwz r12, 0(r3) -/* 8023BD80 81 8C 00 08 */ lwz r12, 8(r12) -/* 8023BD84 7D 89 03 A6 */ mtctr r12 -/* 8023BD88 4E 80 04 21 */ bctrl -lbl_8023BD8C: -/* 8023BD8C 38 00 00 00 */ li r0, 0 -/* 8023BD90 90 1E 00 18 */ stw r0, 0x18(r30) -/* 8023BD94 7F E0 07 35 */ extsh. r0, r31 -/* 8023BD98 40 81 00 0C */ ble lbl_8023BDA4 -/* 8023BD9C 7F C3 F3 78 */ mr r3, r30 -/* 8023BDA0 48 09 2F 9D */ bl __dl__FPv -lbl_8023BDA4: -/* 8023BDA4 7F C3 F3 78 */ mr r3, r30 -/* 8023BDA8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8023BDAC 83 C1 00 08 */ lwz r30, 8(r1) -/* 8023BDB0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8023BDB4 7C 08 03 A6 */ mtlr r0 -/* 8023BDB8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8023BDBC 4E 80 00 20 */ blr diff --git a/asm/msg/scrn/d_msg_scrn_arrow/arwAnimeInit__15dMsgScrnArrow_cFv.s b/asm/msg/scrn/d_msg_scrn_arrow/arwAnimeInit__15dMsgScrnArrow_cFv.s deleted file mode 100644 index 5972ed833e..0000000000 --- a/asm/msg/scrn/d_msg_scrn_arrow/arwAnimeInit__15dMsgScrnArrow_cFv.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_8023BE34: -/* 8023BE34 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8023BE38 7C 08 02 A6 */ mflr r0 -/* 8023BE3C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8023BE40 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8023BE44 7C 7F 1B 78 */ mr r31, r3 -/* 8023BE48 80 63 00 14 */ lwz r3, 0x14(r3) -/* 8023BE4C 48 01 97 BD */ bl hide__13CPaneMgrAlphaFv -/* 8023BE50 C0 22 B1 98 */ lfs f1, lit_3662(r2) -/* 8023BE54 D0 3F 00 1C */ stfs f1, 0x1c(r31) -/* 8023BE58 C0 1F 00 1C */ lfs f0, 0x1c(r31) -/* 8023BE5C 80 7F 00 08 */ lwz r3, 8(r31) -/* 8023BE60 D0 03 00 08 */ stfs f0, 8(r3) -/* 8023BE64 D0 3F 00 20 */ stfs f1, 0x20(r31) -/* 8023BE68 C0 1F 00 20 */ lfs f0, 0x20(r31) -/* 8023BE6C 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 8023BE70 D0 03 00 08 */ stfs f0, 8(r3) -/* 8023BE74 80 7F 00 04 */ lwz r3, 4(r31) -/* 8023BE78 48 0B D8 19 */ bl animation__9J2DScreenFv -/* 8023BE7C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8023BE80 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8023BE84 7C 08 03 A6 */ mtlr r0 -/* 8023BE88 38 21 00 10 */ addi r1, r1, 0x10 -/* 8023BE8C 4E 80 00 20 */ blr diff --git a/asm/msg/scrn/d_msg_scrn_arrow/arwAnimeMove__15dMsgScrnArrow_cFv.s b/asm/msg/scrn/d_msg_scrn_arrow/arwAnimeMove__15dMsgScrnArrow_cFv.s deleted file mode 100644 index 7c5dd8dff6..0000000000 --- a/asm/msg/scrn/d_msg_scrn_arrow/arwAnimeMove__15dMsgScrnArrow_cFv.s +++ /dev/null @@ -1,82 +0,0 @@ -lbl_8023BE90: -/* 8023BE90 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8023BE94 7C 08 02 A6 */ mflr r0 -/* 8023BE98 90 01 00 24 */ stw r0, 0x24(r1) -/* 8023BE9C 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 8023BEA0 7C 7F 1B 78 */ mr r31, r3 -/* 8023BEA4 80 63 00 14 */ lwz r3, 0x14(r3) -/* 8023BEA8 48 01 97 A5 */ bl isVisible__13CPaneMgrAlphaFv -/* 8023BEAC 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8023BEB0 40 82 00 0C */ bne lbl_8023BEBC -/* 8023BEB4 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 8023BEB8 48 01 97 11 */ bl show__13CPaneMgrAlphaFv -lbl_8023BEBC: -/* 8023BEBC 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 8023BEC0 48 01 97 8D */ bl isVisible__13CPaneMgrAlphaFv -/* 8023BEC4 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8023BEC8 28 00 00 01 */ cmplwi r0, 1 -/* 8023BECC 40 82 00 0C */ bne lbl_8023BED8 -/* 8023BED0 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 8023BED4 48 01 97 35 */ bl hide__13CPaneMgrAlphaFv -lbl_8023BED8: -/* 8023BED8 C0 3F 00 1C */ lfs f1, 0x1c(r31) -/* 8023BEDC C0 02 B1 9C */ lfs f0, lit_3761(r2) -/* 8023BEE0 EC 01 00 2A */ fadds f0, f1, f0 -/* 8023BEE4 D0 1F 00 1C */ stfs f0, 0x1c(r31) -/* 8023BEE8 80 7F 00 08 */ lwz r3, 8(r31) -/* 8023BEEC A8 03 00 06 */ lha r0, 6(r3) -/* 8023BEF0 C0 5F 00 1C */ lfs f2, 0x1c(r31) -/* 8023BEF4 C8 22 B1 A0 */ lfd f1, lit_3763(r2) -/* 8023BEF8 6C 03 80 00 */ xoris r3, r0, 0x8000 -/* 8023BEFC 90 61 00 0C */ stw r3, 0xc(r1) -/* 8023BF00 3C 00 43 30 */ lis r0, 0x4330 -/* 8023BF04 90 01 00 08 */ stw r0, 8(r1) -/* 8023BF08 C8 01 00 08 */ lfd f0, 8(r1) -/* 8023BF0C EC 00 08 28 */ fsubs f0, f0, f1 -/* 8023BF10 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 8023BF14 4C 41 13 82 */ cror 2, 1, 2 -/* 8023BF18 40 82 00 1C */ bne lbl_8023BF34 -/* 8023BF1C 90 61 00 0C */ stw r3, 0xc(r1) -/* 8023BF20 90 01 00 08 */ stw r0, 8(r1) -/* 8023BF24 C8 01 00 08 */ lfd f0, 8(r1) -/* 8023BF28 EC 00 08 28 */ fsubs f0, f0, f1 -/* 8023BF2C EC 02 00 28 */ fsubs f0, f2, f0 -/* 8023BF30 D0 1F 00 1C */ stfs f0, 0x1c(r31) -lbl_8023BF34: -/* 8023BF34 C0 1F 00 1C */ lfs f0, 0x1c(r31) -/* 8023BF38 80 7F 00 08 */ lwz r3, 8(r31) -/* 8023BF3C D0 03 00 08 */ stfs f0, 8(r3) -/* 8023BF40 C0 3F 00 20 */ lfs f1, 0x20(r31) -/* 8023BF44 C0 02 B1 9C */ lfs f0, lit_3761(r2) -/* 8023BF48 EC 01 00 2A */ fadds f0, f1, f0 -/* 8023BF4C D0 1F 00 20 */ stfs f0, 0x20(r31) -/* 8023BF50 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 8023BF54 A8 03 00 06 */ lha r0, 6(r3) -/* 8023BF58 C0 5F 00 20 */ lfs f2, 0x20(r31) -/* 8023BF5C C8 22 B1 A0 */ lfd f1, lit_3763(r2) -/* 8023BF60 6C 03 80 00 */ xoris r3, r0, 0x8000 -/* 8023BF64 90 61 00 0C */ stw r3, 0xc(r1) -/* 8023BF68 3C 00 43 30 */ lis r0, 0x4330 -/* 8023BF6C 90 01 00 08 */ stw r0, 8(r1) -/* 8023BF70 C8 01 00 08 */ lfd f0, 8(r1) -/* 8023BF74 EC 00 08 28 */ fsubs f0, f0, f1 -/* 8023BF78 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 8023BF7C 4C 41 13 82 */ cror 2, 1, 2 -/* 8023BF80 40 82 00 1C */ bne lbl_8023BF9C -/* 8023BF84 90 61 00 0C */ stw r3, 0xc(r1) -/* 8023BF88 90 01 00 08 */ stw r0, 8(r1) -/* 8023BF8C C8 01 00 08 */ lfd f0, 8(r1) -/* 8023BF90 EC 00 08 28 */ fsubs f0, f0, f1 -/* 8023BF94 EC 02 00 28 */ fsubs f0, f2, f0 -/* 8023BF98 D0 1F 00 20 */ stfs f0, 0x20(r31) -lbl_8023BF9C: -/* 8023BF9C C0 1F 00 20 */ lfs f0, 0x20(r31) -/* 8023BFA0 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 8023BFA4 D0 03 00 08 */ stfs f0, 8(r3) -/* 8023BFA8 80 7F 00 04 */ lwz r3, 4(r31) -/* 8023BFAC 48 0B D6 E5 */ bl animation__9J2DScreenFv -/* 8023BFB0 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 8023BFB4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8023BFB8 7C 08 03 A6 */ mtlr r0 -/* 8023BFBC 38 21 00 20 */ addi r1, r1, 0x20 -/* 8023BFC0 4E 80 00 20 */ blr diff --git a/asm/msg/scrn/d_msg_scrn_arrow/dotAnimeInit__15dMsgScrnArrow_cFv.s b/asm/msg/scrn/d_msg_scrn_arrow/dotAnimeInit__15dMsgScrnArrow_cFv.s deleted file mode 100644 index 963e3a2062..0000000000 --- a/asm/msg/scrn/d_msg_scrn_arrow/dotAnimeInit__15dMsgScrnArrow_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_8023BFC4: -/* 8023BFC4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8023BFC8 7C 08 02 A6 */ mflr r0 -/* 8023BFCC 90 01 00 14 */ stw r0, 0x14(r1) -/* 8023BFD0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8023BFD4 7C 7F 1B 78 */ mr r31, r3 -/* 8023BFD8 80 63 00 18 */ lwz r3, 0x18(r3) -/* 8023BFDC 48 01 96 2D */ bl hide__13CPaneMgrAlphaFv -/* 8023BFE0 C0 02 B1 98 */ lfs f0, lit_3662(r2) -/* 8023BFE4 D0 1F 00 20 */ stfs f0, 0x20(r31) -/* 8023BFE8 C0 1F 00 20 */ lfs f0, 0x20(r31) -/* 8023BFEC 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 8023BFF0 D0 03 00 08 */ stfs f0, 8(r3) -/* 8023BFF4 80 7F 00 04 */ lwz r3, 4(r31) -/* 8023BFF8 48 0B D6 99 */ bl animation__9J2DScreenFv -/* 8023BFFC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8023C000 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8023C004 7C 08 03 A6 */ mtlr r0 -/* 8023C008 38 21 00 10 */ addi r1, r1, 0x10 -/* 8023C00C 4E 80 00 20 */ blr diff --git a/asm/msg/scrn/d_msg_scrn_arrow/dotAnimeMove__15dMsgScrnArrow_cFv.s b/asm/msg/scrn/d_msg_scrn_arrow/dotAnimeMove__15dMsgScrnArrow_cFv.s deleted file mode 100644 index 88a08a1a3f..0000000000 --- a/asm/msg/scrn/d_msg_scrn_arrow/dotAnimeMove__15dMsgScrnArrow_cFv.s +++ /dev/null @@ -1,55 +0,0 @@ -lbl_8023C010: -/* 8023C010 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8023C014 7C 08 02 A6 */ mflr r0 -/* 8023C018 90 01 00 24 */ stw r0, 0x24(r1) -/* 8023C01C 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 8023C020 7C 7F 1B 78 */ mr r31, r3 -/* 8023C024 80 63 00 14 */ lwz r3, 0x14(r3) -/* 8023C028 48 01 96 25 */ bl isVisible__13CPaneMgrAlphaFv -/* 8023C02C 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8023C030 28 00 00 01 */ cmplwi r0, 1 -/* 8023C034 40 82 00 0C */ bne lbl_8023C040 -/* 8023C038 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 8023C03C 48 01 95 CD */ bl hide__13CPaneMgrAlphaFv -lbl_8023C040: -/* 8023C040 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 8023C044 48 01 96 09 */ bl isVisible__13CPaneMgrAlphaFv -/* 8023C048 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8023C04C 40 82 00 0C */ bne lbl_8023C058 -/* 8023C050 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 8023C054 48 01 95 75 */ bl show__13CPaneMgrAlphaFv -lbl_8023C058: -/* 8023C058 C0 3F 00 20 */ lfs f1, 0x20(r31) -/* 8023C05C C0 02 B1 9C */ lfs f0, lit_3761(r2) -/* 8023C060 EC 01 00 2A */ fadds f0, f1, f0 -/* 8023C064 D0 1F 00 20 */ stfs f0, 0x20(r31) -/* 8023C068 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 8023C06C A8 03 00 06 */ lha r0, 6(r3) -/* 8023C070 C0 5F 00 20 */ lfs f2, 0x20(r31) -/* 8023C074 C8 22 B1 A0 */ lfd f1, lit_3763(r2) -/* 8023C078 6C 03 80 00 */ xoris r3, r0, 0x8000 -/* 8023C07C 90 61 00 0C */ stw r3, 0xc(r1) -/* 8023C080 3C 00 43 30 */ lis r0, 0x4330 -/* 8023C084 90 01 00 08 */ stw r0, 8(r1) -/* 8023C088 C8 01 00 08 */ lfd f0, 8(r1) -/* 8023C08C EC 00 08 28 */ fsubs f0, f0, f1 -/* 8023C090 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 8023C094 4C 41 13 82 */ cror 2, 1, 2 -/* 8023C098 40 82 00 1C */ bne lbl_8023C0B4 -/* 8023C09C 90 61 00 0C */ stw r3, 0xc(r1) -/* 8023C0A0 90 01 00 08 */ stw r0, 8(r1) -/* 8023C0A4 C8 01 00 08 */ lfd f0, 8(r1) -/* 8023C0A8 EC 00 08 28 */ fsubs f0, f0, f1 -/* 8023C0AC EC 02 00 28 */ fsubs f0, f2, f0 -/* 8023C0B0 D0 1F 00 20 */ stfs f0, 0x20(r31) -lbl_8023C0B4: -/* 8023C0B4 C0 1F 00 20 */ lfs f0, 0x20(r31) -/* 8023C0B8 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 8023C0BC D0 03 00 08 */ stfs f0, 8(r3) -/* 8023C0C0 80 7F 00 04 */ lwz r3, 4(r31) -/* 8023C0C4 48 0B D5 CD */ bl animation__9J2DScreenFv -/* 8023C0C8 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 8023C0CC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8023C0D0 7C 08 03 A6 */ mtlr r0 -/* 8023C0D4 38 21 00 20 */ addi r1, r1, 0x20 -/* 8023C0D8 4E 80 00 20 */ blr diff --git a/asm/msg/scrn/d_msg_scrn_arrow/draw__15dMsgScrnArrow_cFv.s b/asm/msg/scrn/d_msg_scrn_arrow/draw__15dMsgScrnArrow_cFv.s deleted file mode 100644 index 501cfe6dd3..0000000000 --- a/asm/msg/scrn/d_msg_scrn_arrow/draw__15dMsgScrnArrow_cFv.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_8023BDC0: -/* 8023BDC0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8023BDC4 7C 08 02 A6 */ mflr r0 -/* 8023BDC8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8023BDCC 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8023BDD0 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8023BDD4 80 84 5F 50 */ lwz r4, 0x5f50(r4) -/* 8023BDD8 80 63 00 04 */ lwz r3, 4(r3) -/* 8023BDDC C0 22 B1 98 */ lfs f1, lit_3662(r2) -/* 8023BDE0 FC 40 08 90 */ fmr f2, f1 -/* 8023BDE4 48 0B D0 F1 */ bl draw__9J2DScreenFffPC14J2DGrafContext -/* 8023BDE8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8023BDEC 7C 08 03 A6 */ mtlr r0 -/* 8023BDF0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8023BDF4 4E 80 00 20 */ blr diff --git a/asm/msg/scrn/d_msg_scrn_arrow/setPos__15dMsgScrnArrow_cFff.s b/asm/msg/scrn/d_msg_scrn_arrow/setPos__15dMsgScrnArrow_cFff.s deleted file mode 100644 index 96666ac419..0000000000 --- a/asm/msg/scrn/d_msg_scrn_arrow/setPos__15dMsgScrnArrow_cFff.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_8023BDF8: -/* 8023BDF8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8023BDFC 7C 08 02 A6 */ mflr r0 -/* 8023BE00 90 01 00 14 */ stw r0, 0x14(r1) -/* 8023BE04 80 63 00 10 */ lwz r3, 0x10(r3) -/* 8023BE08 80 63 00 04 */ lwz r3, 4(r3) -/* 8023BE0C D0 23 00 D4 */ stfs f1, 0xd4(r3) -/* 8023BE10 D0 43 00 D8 */ stfs f2, 0xd8(r3) -/* 8023BE14 81 83 00 00 */ lwz r12, 0(r3) -/* 8023BE18 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 8023BE1C 7D 89 03 A6 */ mtctr r12 -/* 8023BE20 4E 80 04 21 */ bctrl -/* 8023BE24 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8023BE28 7C 08 03 A6 */ mtlr r0 -/* 8023BE2C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8023BE30 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl/__dt__14daObjDigholl_cFv.s b/asm/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl/__dt__14daObjDigholl_cFv.s deleted file mode 100644 index 8533b6edfc..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl/__dt__14daObjDigholl_cFv.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_80BDC75C: -/* 80BDC75C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BDC760 7C 08 02 A6 */ mflr r0 -/* 80BDC764 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BDC768 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BDC76C 93 C1 00 08 */ stw r30, 8(r1) -/* 80BDC770 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80BDC774 7C 9F 23 78 */ mr r31, r4 -/* 80BDC778 41 82 00 1C */ beq lbl_80BDC794 -/* 80BDC77C 38 80 00 00 */ li r4, 0 -/* 80BDC780 4B 43 C5 0D */ bl __dt__10fopAc_ac_cFv -/* 80BDC784 7F E0 07 35 */ extsh. r0, r31 -/* 80BDC788 40 81 00 0C */ ble lbl_80BDC794 -/* 80BDC78C 7F C3 F3 78 */ mr r3, r30 -/* 80BDC790 4B 6F 25 AD */ bl __dl__FPv -lbl_80BDC794: -/* 80BDC794 7F C3 F3 78 */ mr r3, r30 -/* 80BDC798 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BDC79C 83 C1 00 08 */ lwz r30, 8(r1) -/* 80BDC7A0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BDC7A4 7C 08 03 A6 */ mtlr r0 -/* 80BDC7A8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BDC7AC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl/create__14daObjDigholl_cFv.s b/asm/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl/create__14daObjDigholl_cFv.s deleted file mode 100644 index 412a7d9b3a..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl/create__14daObjDigholl_cFv.s +++ /dev/null @@ -1,78 +0,0 @@ -lbl_80BDC618: -/* 80BDC618 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BDC61C 7C 08 02 A6 */ mflr r0 -/* 80BDC620 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BDC624 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BDC628 93 C1 00 08 */ stw r30, 8(r1) -/* 80BDC62C 7C 7E 1B 78 */ mr r30, r3 -/* 80BDC630 3C 80 80 BE */ lis r4, lit_3678@ha /* 0x80BDCB3C@ha */ -/* 80BDC634 3B E4 CB 3C */ addi r31, r4, lit_3678@l /* 0x80BDCB3C@l */ -/* 80BDC638 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80BDC63C 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80BDC640 40 82 00 1C */ bne lbl_80BDC65C -/* 80BDC644 28 1E 00 00 */ cmplwi r30, 0 -/* 80BDC648 41 82 00 08 */ beq lbl_80BDC650 -/* 80BDC64C 4B 43 C5 19 */ bl __ct__10fopAc_ac_cFv -lbl_80BDC650: -/* 80BDC650 80 1E 04 A0 */ lwz r0, 0x4a0(r30) -/* 80BDC654 60 00 00 08 */ ori r0, r0, 8 -/* 80BDC658 90 1E 04 A0 */ stw r0, 0x4a0(r30) -lbl_80BDC65C: -/* 80BDC65C 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 80BDC660 98 1E 05 69 */ stb r0, 0x569(r30) -/* 80BDC664 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 80BDC668 54 00 C6 3E */ rlwinm r0, r0, 0x18, 0x18, 0x1f -/* 80BDC66C 98 1E 05 6A */ stb r0, 0x56a(r30) -/* 80BDC670 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 80BDC674 54 00 86 3E */ rlwinm r0, r0, 0x10, 0x18, 0x1f -/* 80BDC678 B0 1E 05 6C */ sth r0, 0x56c(r30) -/* 80BDC67C A8 1E 05 6C */ lha r0, 0x56c(r30) -/* 80BDC680 2C 00 00 FF */ cmpwi r0, 0xff -/* 80BDC684 40 82 00 0C */ bne lbl_80BDC690 -/* 80BDC688 38 00 FF FF */ li r0, -1 -/* 80BDC68C B0 1E 05 6C */ sth r0, 0x56c(r30) -lbl_80BDC690: -/* 80BDC690 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BDC694 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BDC698 88 9E 05 69 */ lbz r4, 0x569(r30) -/* 80BDC69C 88 1E 04 BA */ lbz r0, 0x4ba(r30) -/* 80BDC6A0 7C 05 07 74 */ extsb r5, r0 -/* 80BDC6A4 4B 45 8C BD */ bl isSwitch__10dSv_info_cCFii -/* 80BDC6A8 2C 03 00 00 */ cmpwi r3, 0 -/* 80BDC6AC 41 82 00 14 */ beq lbl_80BDC6C0 -/* 80BDC6B0 38 00 00 02 */ li r0, 2 -/* 80BDC6B4 98 1E 05 68 */ stb r0, 0x568(r30) -/* 80BDC6B8 38 00 00 01 */ li r0, 1 -/* 80BDC6BC 98 1E 05 6B */ stb r0, 0x56b(r30) -lbl_80BDC6C0: -/* 80BDC6C0 7F C3 F3 78 */ mr r3, r30 -/* 80BDC6C4 C0 3F 00 00 */ lfs f1, 0(r31) -/* 80BDC6C8 C0 5F 00 04 */ lfs f2, 4(r31) -/* 80BDC6CC C0 7F 00 08 */ lfs f3, 8(r31) -/* 80BDC6D0 4B 43 DE 59 */ bl fopAcM_SetMin__FP10fopAc_ac_cfff -/* 80BDC6D4 7F C3 F3 78 */ mr r3, r30 -/* 80BDC6D8 C0 3F 00 0C */ lfs f1, 0xc(r31) -/* 80BDC6DC C0 5F 00 10 */ lfs f2, 0x10(r31) -/* 80BDC6E0 C0 7F 00 14 */ lfs f3, 0x14(r31) -/* 80BDC6E4 4B 43 DE 55 */ bl fopAcM_SetMax__FP10fopAc_ac_cfff -/* 80BDC6E8 C0 1E 04 D0 */ lfs f0, 0x4d0(r30) -/* 80BDC6EC D0 1E 05 50 */ stfs f0, 0x550(r30) -/* 80BDC6F0 C0 1E 04 D4 */ lfs f0, 0x4d4(r30) -/* 80BDC6F4 D0 1E 05 54 */ stfs f0, 0x554(r30) -/* 80BDC6F8 C0 1E 04 D8 */ lfs f0, 0x4d8(r30) -/* 80BDC6FC D0 1E 05 58 */ stfs f0, 0x558(r30) -/* 80BDC700 C0 1E 05 50 */ lfs f0, 0x550(r30) -/* 80BDC704 D0 1E 05 38 */ stfs f0, 0x538(r30) -/* 80BDC708 C0 1E 05 54 */ lfs f0, 0x554(r30) -/* 80BDC70C D0 1E 05 3C */ stfs f0, 0x53c(r30) -/* 80BDC710 C0 1E 05 58 */ lfs f0, 0x558(r30) -/* 80BDC714 D0 1E 05 40 */ stfs f0, 0x540(r30) -/* 80BDC718 38 00 00 20 */ li r0, 0x20 -/* 80BDC71C 98 1E 05 4B */ stb r0, 0x54b(r30) -/* 80BDC720 38 60 00 04 */ li r3, 4 -/* 80BDC724 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BDC728 83 C1 00 08 */ lwz r30, 8(r1) -/* 80BDC72C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BDC730 7C 08 03 A6 */ mtlr r0 -/* 80BDC734 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BDC738 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl/daObjDigholl_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl/daObjDigholl_Create__FP10fopAc_ac_c.s deleted file mode 100644 index c578d787b6..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl/daObjDigholl_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80BDC73C: -/* 80BDC73C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BDC740 7C 08 02 A6 */ mflr r0 -/* 80BDC744 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BDC748 4B FF FE D1 */ bl create__14daObjDigholl_cFv -/* 80BDC74C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BDC750 7C 08 03 A6 */ mtlr r0 -/* 80BDC754 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BDC758 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl/daObjDigholl_Delete__FP14daObjDigholl_c.s b/asm/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl/daObjDigholl_Delete__FP14daObjDigholl_c.s deleted file mode 100644 index c8621080c5..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl/daObjDigholl_Delete__FP14daObjDigholl_c.s +++ /dev/null @@ -1,11 +0,0 @@ -lbl_80BDC7B0: -/* 80BDC7B0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BDC7B4 7C 08 02 A6 */ mflr r0 -/* 80BDC7B8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BDC7BC 38 80 FF FF */ li r4, -1 -/* 80BDC7C0 4B FF FF 9D */ bl __dt__14daObjDigholl_cFv -/* 80BDC7C4 38 60 00 01 */ li r3, 1 -/* 80BDC7C8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BDC7CC 7C 08 03 A6 */ mtlr r0 -/* 80BDC7D0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BDC7D4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl/daObjDigholl_Draw__FP14daObjDigholl_c.s b/asm/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl/daObjDigholl_Draw__FP14daObjDigholl_c.s deleted file mode 100644 index 5d4afb0a3c..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl/daObjDigholl_Draw__FP14daObjDigholl_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80BDCB14: -/* 80BDCB14 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BDCB18 7C 08 02 A6 */ mflr r0 -/* 80BDCB1C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BDCB20 4B FF FF ED */ bl draw__14daObjDigholl_cFv -/* 80BDCB24 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BDCB28 7C 08 03 A6 */ mtlr r0 -/* 80BDCB2C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BDCB30 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl/daObjDigholl_Execute__FP14daObjDigholl_c.s b/asm/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl/daObjDigholl_Execute__FP14daObjDigholl_c.s deleted file mode 100644 index 90c8fbbe85..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl/daObjDigholl_Execute__FP14daObjDigholl_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80BDCAEC: -/* 80BDCAEC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BDCAF0 7C 08 02 A6 */ mflr r0 -/* 80BDCAF4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BDCAF8 4B FF FC E1 */ bl execute__14daObjDigholl_cFv -/* 80BDCAFC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BDCB00 7C 08 03 A6 */ mtlr r0 -/* 80BDCB04 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BDCB08 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl/execute__14daObjDigholl_cFv.s b/asm/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl/execute__14daObjDigholl_cFv.s deleted file mode 100644 index 77257d866e..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl/execute__14daObjDigholl_cFv.s +++ /dev/null @@ -1,215 +0,0 @@ -lbl_80BDC7D8: -/* 80BDC7D8 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 80BDC7DC 7C 08 02 A6 */ mflr r0 -/* 80BDC7E0 90 01 00 44 */ stw r0, 0x44(r1) -/* 80BDC7E4 39 61 00 40 */ addi r11, r1, 0x40 -/* 80BDC7E8 4B 78 59 F5 */ bl _savegpr_29 -/* 80BDC7EC 7C 7D 1B 78 */ mr r29, r3 -/* 80BDC7F0 3C 60 80 BE */ lis r3, lit_3678@ha /* 0x80BDCB3C@ha */ -/* 80BDC7F4 3B E3 CB 3C */ addi r31, r3, lit_3678@l /* 0x80BDCB3C@l */ -/* 80BDC7F8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BDC7FC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BDC800 83 C3 5D B4 */ lwz r30, 0x5db4(r3) -/* 80BDC804 80 1E 05 74 */ lwz r0, 0x574(r30) -/* 80BDC808 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 80BDC80C 41 82 00 50 */ beq lbl_80BDC85C -/* 80BDC810 88 9D 05 6A */ lbz r4, 0x56a(r29) -/* 80BDC814 28 04 00 FF */ cmplwi r4, 0xff -/* 80BDC818 41 82 00 18 */ beq lbl_80BDC830 -/* 80BDC81C 88 1D 04 BA */ lbz r0, 0x4ba(r29) -/* 80BDC820 7C 05 07 74 */ extsb r5, r0 -/* 80BDC824 4B 45 8B 3D */ bl isSwitch__10dSv_info_cCFii -/* 80BDC828 2C 03 00 00 */ cmpwi r3, 0 -/* 80BDC82C 41 82 00 30 */ beq lbl_80BDC85C -lbl_80BDC830: -/* 80BDC830 C0 3D 04 D4 */ lfs f1, 0x4d4(r29) -/* 80BDC834 C0 1E 04 D4 */ lfs f0, 0x4d4(r30) -/* 80BDC838 EC 01 00 28 */ fsubs f0, f1, f0 -/* 80BDC83C FC 00 02 10 */ fabs f0, f0 -/* 80BDC840 FC 20 00 18 */ frsp f1, f0 -/* 80BDC844 C0 1F 00 18 */ lfs f0, 0x18(r31) -/* 80BDC848 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80BDC84C 40 80 00 10 */ bge lbl_80BDC85C -/* 80BDC850 38 00 00 80 */ li r0, 0x80 -/* 80BDC854 90 1D 05 5C */ stw r0, 0x55c(r29) -/* 80BDC858 48 00 00 0C */ b lbl_80BDC864 -lbl_80BDC85C: -/* 80BDC85C 38 00 00 00 */ li r0, 0 -/* 80BDC860 90 1D 05 5C */ stw r0, 0x55c(r29) -lbl_80BDC864: -/* 80BDC864 88 1D 05 68 */ lbz r0, 0x568(r29) -/* 80BDC868 28 00 00 01 */ cmplwi r0, 1 -/* 80BDC86C 40 82 00 9C */ bne lbl_80BDC908 -/* 80BDC870 A8 7E 04 E6 */ lha r3, 0x4e6(r30) -/* 80BDC874 A8 9D 04 E6 */ lha r4, 0x4e6(r29) -/* 80BDC878 4B 69 45 AD */ bl cLib_distanceAngleS__Fss -/* 80BDC87C 2C 03 60 00 */ cmpwi r3, 0x6000 -/* 80BDC880 40 80 00 1C */ bge lbl_80BDC89C -/* 80BDC884 A8 7E 04 E6 */ lha r3, 0x4e6(r30) -/* 80BDC888 3C 63 00 01 */ addis r3, r3, 1 -/* 80BDC88C 38 03 80 00 */ addi r0, r3, -32768 -/* 80BDC890 B0 1D 04 E6 */ sth r0, 0x4e6(r29) -/* 80BDC894 A8 1D 04 E6 */ lha r0, 0x4e6(r29) -/* 80BDC898 B0 1D 04 DE */ sth r0, 0x4de(r29) -lbl_80BDC89C: -/* 80BDC89C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BDC8A0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BDC8A4 88 9D 05 69 */ lbz r4, 0x569(r29) -/* 80BDC8A8 88 1D 04 BA */ lbz r0, 0x4ba(r29) -/* 80BDC8AC 7C 05 07 74 */ extsb r5, r0 -/* 80BDC8B0 4B 45 89 51 */ bl onSwitch__10dSv_info_cFii -/* 80BDC8B4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BDC8B8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BDC8BC 88 03 4F AD */ lbz r0, 0x4fad(r3) -/* 80BDC8C0 28 00 00 00 */ cmplwi r0, 0 -/* 80BDC8C4 41 82 00 30 */ beq lbl_80BDC8F4 -/* 80BDC8C8 7F C3 F3 78 */ mr r3, r30 -/* 80BDC8CC 81 9E 06 28 */ lwz r12, 0x628(r30) -/* 80BDC8D0 81 8C 00 E4 */ lwz r12, 0xe4(r12) -/* 80BDC8D4 7D 89 03 A6 */ mtctr r12 -/* 80BDC8D8 4E 80 04 21 */ bctrl -/* 80BDC8DC C0 1F 00 1C */ lfs f0, 0x1c(r31) -/* 80BDC8E0 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80BDC8E4 40 81 00 90 */ ble lbl_80BDC974 -/* 80BDC8E8 38 00 00 01 */ li r0, 1 -/* 80BDC8EC 98 1D 05 6B */ stb r0, 0x56b(r29) -/* 80BDC8F0 48 00 00 84 */ b lbl_80BDC974 -lbl_80BDC8F4: -/* 80BDC8F4 38 00 00 02 */ li r0, 2 -/* 80BDC8F8 98 1D 05 68 */ stb r0, 0x568(r29) -/* 80BDC8FC 38 00 00 01 */ li r0, 1 -/* 80BDC900 98 1D 05 6B */ stb r0, 0x56b(r29) -/* 80BDC904 48 00 00 70 */ b lbl_80BDC974 -lbl_80BDC908: -/* 80BDC908 C0 5E 04 D8 */ lfs f2, 0x4d8(r30) -/* 80BDC90C C0 1E 04 D0 */ lfs f0, 0x4d0(r30) -/* 80BDC910 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 80BDC914 C0 3F 00 04 */ lfs f1, 4(r31) -/* 80BDC918 D0 21 00 10 */ stfs f1, 0x10(r1) -/* 80BDC91C D0 41 00 14 */ stfs f2, 0x14(r1) -/* 80BDC920 C0 5D 04 D8 */ lfs f2, 0x4d8(r29) -/* 80BDC924 C0 1D 04 D0 */ lfs f0, 0x4d0(r29) -/* 80BDC928 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 80BDC92C D0 21 00 1C */ stfs f1, 0x1c(r1) -/* 80BDC930 D0 41 00 20 */ stfs f2, 0x20(r1) -/* 80BDC934 38 61 00 0C */ addi r3, r1, 0xc -/* 80BDC938 38 81 00 18 */ addi r4, r1, 0x18 -/* 80BDC93C 4B 76 AA 61 */ bl PSVECSquareDistance -/* 80BDC940 C0 1F 00 20 */ lfs f0, 0x20(r31) -/* 80BDC944 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80BDC948 40 80 00 2C */ bge lbl_80BDC974 -/* 80BDC94C C0 3D 04 D4 */ lfs f1, 0x4d4(r29) -/* 80BDC950 C0 1E 04 D4 */ lfs f0, 0x4d4(r30) -/* 80BDC954 EC 01 00 28 */ fsubs f0, f1, f0 -/* 80BDC958 FC 00 02 10 */ fabs f0, f0 -/* 80BDC95C FC 20 00 18 */ frsp f1, f0 -/* 80BDC960 C0 1F 00 24 */ lfs f0, 0x24(r31) -/* 80BDC964 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80BDC968 40 80 00 0C */ bge lbl_80BDC974 -/* 80BDC96C 38 7D 05 50 */ addi r3, r29, 0x550 -/* 80BDC970 4B 58 2B 81 */ bl setLookPos__9daPy_py_cFP4cXyz -lbl_80BDC974: -/* 80BDC974 38 7E 04 D0 */ addi r3, r30, 0x4d0 -/* 80BDC978 38 9D 04 D0 */ addi r4, r29, 0x4d0 -/* 80BDC97C 4B 76 AA 21 */ bl PSVECSquareDistance -/* 80BDC980 C0 1F 00 04 */ lfs f0, 4(r31) -/* 80BDC984 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80BDC988 40 81 00 58 */ ble lbl_80BDC9E0 -/* 80BDC98C FC 00 08 34 */ frsqrte f0, f1 -/* 80BDC990 C8 9F 00 28 */ lfd f4, 0x28(r31) -/* 80BDC994 FC 44 00 32 */ fmul f2, f4, f0 -/* 80BDC998 C8 7F 00 30 */ lfd f3, 0x30(r31) -/* 80BDC99C FC 00 00 32 */ fmul f0, f0, f0 -/* 80BDC9A0 FC 01 00 32 */ fmul f0, f1, f0 -/* 80BDC9A4 FC 03 00 28 */ fsub f0, f3, f0 -/* 80BDC9A8 FC 02 00 32 */ fmul f0, f2, f0 -/* 80BDC9AC FC 44 00 32 */ fmul f2, f4, f0 -/* 80BDC9B0 FC 00 00 32 */ fmul f0, f0, f0 -/* 80BDC9B4 FC 01 00 32 */ fmul f0, f1, f0 -/* 80BDC9B8 FC 03 00 28 */ fsub f0, f3, f0 -/* 80BDC9BC FC 02 00 32 */ fmul f0, f2, f0 -/* 80BDC9C0 FC 44 00 32 */ fmul f2, f4, f0 -/* 80BDC9C4 FC 00 00 32 */ fmul f0, f0, f0 -/* 80BDC9C8 FC 01 00 32 */ fmul f0, f1, f0 -/* 80BDC9CC FC 03 00 28 */ fsub f0, f3, f0 -/* 80BDC9D0 FC 02 00 32 */ fmul f0, f2, f0 -/* 80BDC9D4 FC 21 00 32 */ fmul f1, f1, f0 -/* 80BDC9D8 FC 20 08 18 */ frsp f1, f1 -/* 80BDC9DC 48 00 00 88 */ b lbl_80BDCA64 -lbl_80BDC9E0: -/* 80BDC9E0 C8 1F 00 38 */ lfd f0, 0x38(r31) -/* 80BDC9E4 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80BDC9E8 40 80 00 10 */ bge lbl_80BDC9F8 -/* 80BDC9EC 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 80BDC9F0 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -/* 80BDC9F4 48 00 00 70 */ b lbl_80BDCA64 -lbl_80BDC9F8: -/* 80BDC9F8 D0 21 00 08 */ stfs f1, 8(r1) -/* 80BDC9FC 80 81 00 08 */ lwz r4, 8(r1) -/* 80BDCA00 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 -/* 80BDCA04 3C 00 7F 80 */ lis r0, 0x7f80 -/* 80BDCA08 7C 03 00 00 */ cmpw r3, r0 -/* 80BDCA0C 41 82 00 14 */ beq lbl_80BDCA20 -/* 80BDCA10 40 80 00 40 */ bge lbl_80BDCA50 -/* 80BDCA14 2C 03 00 00 */ cmpwi r3, 0 -/* 80BDCA18 41 82 00 20 */ beq lbl_80BDCA38 -/* 80BDCA1C 48 00 00 34 */ b lbl_80BDCA50 -lbl_80BDCA20: -/* 80BDCA20 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 80BDCA24 41 82 00 0C */ beq lbl_80BDCA30 -/* 80BDCA28 38 00 00 01 */ li r0, 1 -/* 80BDCA2C 48 00 00 28 */ b lbl_80BDCA54 -lbl_80BDCA30: -/* 80BDCA30 38 00 00 02 */ li r0, 2 -/* 80BDCA34 48 00 00 20 */ b lbl_80BDCA54 -lbl_80BDCA38: -/* 80BDCA38 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 80BDCA3C 41 82 00 0C */ beq lbl_80BDCA48 -/* 80BDCA40 38 00 00 05 */ li r0, 5 -/* 80BDCA44 48 00 00 10 */ b lbl_80BDCA54 -lbl_80BDCA48: -/* 80BDCA48 38 00 00 03 */ li r0, 3 -/* 80BDCA4C 48 00 00 08 */ b lbl_80BDCA54 -lbl_80BDCA50: -/* 80BDCA50 38 00 00 04 */ li r0, 4 -lbl_80BDCA54: -/* 80BDCA54 2C 00 00 01 */ cmpwi r0, 1 -/* 80BDCA58 40 82 00 0C */ bne lbl_80BDCA64 -/* 80BDCA5C 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 80BDCA60 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -lbl_80BDCA64: -/* 80BDCA64 C0 1F 00 40 */ lfs f0, 0x40(r31) -/* 80BDCA68 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80BDCA6C 40 80 00 64 */ bge lbl_80BDCAD0 -/* 80BDCA70 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BDCA74 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BDCA78 80 7E 5D 3C */ lwz r3, 0x5d3c(r30) -/* 80BDCA7C 38 80 07 0F */ li r4, 0x70f -/* 80BDCA80 38 BD 04 D0 */ addi r5, r29, 0x4d0 -/* 80BDCA84 38 C0 00 00 */ li r6, 0 -/* 80BDCA88 38 E0 00 FF */ li r7, 0xff -/* 80BDCA8C 3D 00 80 45 */ lis r8, g_whiteColor@ha /* 0x80450608@ha */ -/* 80BDCA90 39 08 06 08 */ addi r8, r8, g_whiteColor@l /* 0x80450608@l */ -/* 80BDCA94 7D 09 43 78 */ mr r9, r8 -/* 80BDCA98 39 40 00 00 */ li r10, 0 -/* 80BDCA9C C0 3F 00 04 */ lfs f1, 4(r31) -/* 80BDCAA0 4B 47 07 19 */ bl setSimple__13dPa_control_cFUsPC4cXyzPC12dKy_tevstr_cUcRC8_GXColorRC8_GXColorif -/* 80BDCAA4 80 7E 5D 3C */ lwz r3, 0x5d3c(r30) -/* 80BDCAA8 38 80 07 3D */ li r4, 0x73d -/* 80BDCAAC 38 BD 04 D0 */ addi r5, r29, 0x4d0 -/* 80BDCAB0 38 C0 00 00 */ li r6, 0 -/* 80BDCAB4 38 E0 00 FF */ li r7, 0xff -/* 80BDCAB8 3D 00 80 45 */ lis r8, g_whiteColor@ha /* 0x80450608@ha */ -/* 80BDCABC 39 08 06 08 */ addi r8, r8, g_whiteColor@l /* 0x80450608@l */ -/* 80BDCAC0 7D 09 43 78 */ mr r9, r8 -/* 80BDCAC4 39 40 00 00 */ li r10, 0 -/* 80BDCAC8 C0 3F 00 04 */ lfs f1, 4(r31) -/* 80BDCACC 4B 47 06 ED */ bl setSimple__13dPa_control_cFUsPC4cXyzPC12dKy_tevstr_cUcRC8_GXColorRC8_GXColorif -lbl_80BDCAD0: -/* 80BDCAD0 38 60 00 01 */ li r3, 1 -/* 80BDCAD4 39 61 00 40 */ addi r11, r1, 0x40 -/* 80BDCAD8 4B 78 57 51 */ bl _restgpr_29 -/* 80BDCADC 80 01 00 44 */ lwz r0, 0x44(r1) -/* 80BDCAE0 7C 08 03 A6 */ mtlr r0 -/* 80BDCAE4 38 21 00 40 */ addi r1, r1, 0x40 -/* 80BDCAE8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/CreateHeap__12daObjKJgjs_cFv.s b/asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/CreateHeap__12daObjKJgjs_cFv.s deleted file mode 100644 index 3a37f0c06b..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/CreateHeap__12daObjKJgjs_cFv.s +++ /dev/null @@ -1,33 +0,0 @@ -lbl_80C461E4: -/* 80C461E4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C461E8 7C 08 02 A6 */ mflr r0 -/* 80C461EC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C461F0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C461F4 7C 7F 1B 78 */ mr r31, r3 -/* 80C461F8 3C 60 80 C4 */ lis r3, l_arcName@ha /* 0x80C4658C@ha */ -/* 80C461FC 38 63 65 8C */ addi r3, r3, l_arcName@l /* 0x80C4658C@l */ -/* 80C46200 80 63 00 00 */ lwz r3, 0(r3) -/* 80C46204 80 1F 06 0C */ lwz r0, 0x60c(r31) -/* 80C46208 54 00 10 3A */ slwi r0, r0, 2 -/* 80C4620C 3C 80 80 C4 */ lis r4, l_bmdidx@ha /* 0x80C4654C@ha */ -/* 80C46210 38 84 65 4C */ addi r4, r4, l_bmdidx@l /* 0x80C4654C@l */ -/* 80C46214 7C 84 00 2E */ lwzx r4, r4, r0 -/* 80C46218 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C4621C 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C46220 3C A5 00 02 */ addis r5, r5, 2 -/* 80C46224 38 C0 00 80 */ li r6, 0x80 -/* 80C46228 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80C4622C 4B 3F 60 C1 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80C46230 3C 80 00 08 */ lis r4, 8 -/* 80C46234 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000084@ha */ -/* 80C46238 38 A5 00 84 */ addi r5, r5, 0x0084 /* 0x11000084@l */ -/* 80C4623C 4B 3C EA 19 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 80C46240 90 7F 06 08 */ stw r3, 0x608(r31) -/* 80C46244 80 7F 06 08 */ lwz r3, 0x608(r31) -/* 80C46248 30 03 FF FF */ addic r0, r3, -1 -/* 80C4624C 7C 60 19 10 */ subfe r3, r0, r3 -/* 80C46250 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C46254 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C46258 7C 08 03 A6 */ mtlr r0 -/* 80C4625C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C46260 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/Create__12daObjKJgjs_cFv.s b/asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/Create__12daObjKJgjs_cFv.s deleted file mode 100644 index 27c44814b4..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/Create__12daObjKJgjs_cFv.s +++ /dev/null @@ -1,46 +0,0 @@ -lbl_80C46264: -/* 80C46264 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C46268 7C 08 02 A6 */ mflr r0 -/* 80C4626C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C46270 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C46274 7C 7F 1B 78 */ mr r31, r3 -/* 80C46278 38 7F 05 D8 */ addi r3, r31, 0x5d8 -/* 80C4627C 90 7F 05 04 */ stw r3, 0x504(r31) -/* 80C46280 80 9F 06 08 */ lwz r4, 0x608(r31) -/* 80C46284 38 84 00 24 */ addi r4, r4, 0x24 -/* 80C46288 4B 70 02 29 */ bl PSMTXCopy -/* 80C4628C 80 7F 05 68 */ lwz r3, 0x568(r31) -/* 80C46290 88 03 00 91 */ lbz r0, 0x91(r3) -/* 80C46294 60 00 00 04 */ ori r0, r0, 4 -/* 80C46298 98 03 00 91 */ stb r0, 0x91(r3) -/* 80C4629C 80 1F 06 0C */ lwz r0, 0x60c(r31) -/* 80C462A0 2C 00 00 00 */ cmpwi r0, 0 -/* 80C462A4 40 82 00 2C */ bne lbl_80C462D0 -/* 80C462A8 7F E3 FB 78 */ mr r3, r31 -/* 80C462AC 3C 80 80 C4 */ lis r4, l_cull_box@ha /* 0x80C46554@ha */ -/* 80C462B0 C4 24 65 54 */ lfsu f1, l_cull_box@l(r4) /* 0x80C46554@l */ -/* 80C462B4 C0 44 00 04 */ lfs f2, 4(r4) -/* 80C462B8 C0 64 00 08 */ lfs f3, 8(r4) -/* 80C462BC C0 84 00 0C */ lfs f4, 0xc(r4) -/* 80C462C0 C0 A4 00 10 */ lfs f5, 0x10(r4) -/* 80C462C4 C0 C4 00 14 */ lfs f6, 0x14(r4) -/* 80C462C8 4B 3D 42 81 */ bl fopAcM_setCullSizeBox__FP10fopAc_ac_cffffff -/* 80C462CC 48 00 00 2C */ b lbl_80C462F8 -lbl_80C462D0: -/* 80C462D0 7F E3 FB 78 */ mr r3, r31 -/* 80C462D4 3C 80 80 C4 */ lis r4, l_cull_box@ha /* 0x80C46554@ha */ -/* 80C462D8 38 84 65 54 */ addi r4, r4, l_cull_box@l /* 0x80C46554@l */ -/* 80C462DC C0 24 00 18 */ lfs f1, 0x18(r4) -/* 80C462E0 C0 44 00 1C */ lfs f2, 0x1c(r4) -/* 80C462E4 C0 64 00 20 */ lfs f3, 0x20(r4) -/* 80C462E8 C0 84 00 24 */ lfs f4, 0x24(r4) -/* 80C462EC C0 A4 00 28 */ lfs f5, 0x28(r4) -/* 80C462F0 C0 C4 00 2C */ lfs f6, 0x2c(r4) -/* 80C462F4 4B 3D 42 55 */ bl fopAcM_setCullSizeBox__FP10fopAc_ac_cffffff -lbl_80C462F8: -/* 80C462F8 38 60 00 01 */ li r3, 1 -/* 80C462FC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C46300 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C46304 7C 08 03 A6 */ mtlr r0 -/* 80C46308 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C4630C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/Delete__12daObjKJgjs_cFv.s b/asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/Delete__12daObjKJgjs_cFv.s deleted file mode 100644 index 634bc19cec..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/Delete__12daObjKJgjs_cFv.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_80C463C4: -/* 80C463C4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C463C8 7C 08 02 A6 */ mflr r0 -/* 80C463CC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C463D0 28 03 00 00 */ cmplwi r3, 0 -/* 80C463D4 41 82 00 08 */ beq lbl_80C463DC -/* 80C463D8 38 63 05 A0 */ addi r3, r3, 0x5a0 -lbl_80C463DC: -/* 80C463DC 3C 80 80 C4 */ lis r4, l_arcName@ha /* 0x80C4658C@ha */ -/* 80C463E0 38 84 65 8C */ addi r4, r4, l_arcName@l /* 0x80C4658C@l */ -/* 80C463E4 80 84 00 00 */ lwz r4, 0(r4) -/* 80C463E8 4B 3E 6C 21 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 80C463EC 38 60 00 01 */ li r3, 1 -/* 80C463F0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C463F4 7C 08 03 A6 */ mtlr r0 -/* 80C463F8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C463FC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/Draw__12daObjKJgjs_cFv.s b/asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/Draw__12daObjKJgjs_cFv.s deleted file mode 100644 index 849cd5c065..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/Draw__12daObjKJgjs_cFv.s +++ /dev/null @@ -1,42 +0,0 @@ -lbl_80C46320: -/* 80C46320 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C46324 7C 08 02 A6 */ mflr r0 -/* 80C46328 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C4632C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C46330 93 C1 00 08 */ stw r30, 8(r1) -/* 80C46334 7C 7E 1B 78 */ mr r30, r3 -/* 80C46338 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80C4633C 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80C46340 38 80 00 10 */ li r4, 0x10 -/* 80C46344 38 BE 04 D0 */ addi r5, r30, 0x4d0 -/* 80C46348 38 DE 01 0C */ addi r6, r30, 0x10c -/* 80C4634C 4B 55 D4 79 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 80C46350 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80C46354 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80C46358 80 9E 06 08 */ lwz r4, 0x608(r30) -/* 80C4635C 80 84 00 04 */ lwz r4, 4(r4) -/* 80C46360 38 BE 01 0C */ addi r5, r30, 0x10c -/* 80C46364 4B 55 EA 3D */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 80C46368 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C4636C 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C46370 80 04 5F 70 */ lwz r0, 0x5f70(r4) -/* 80C46374 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ -/* 80C46378 3B E3 4A C8 */ addi r31, r3, j3dSys@l /* 0x80434AC8@l */ -/* 80C4637C 90 1F 00 48 */ stw r0, 0x48(r31) -/* 80C46380 80 04 5F 74 */ lwz r0, 0x5f74(r4) -/* 80C46384 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 80C46388 80 7E 06 08 */ lwz r3, 0x608(r30) -/* 80C4638C 4B 3C 79 39 */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 80C46390 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C46394 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C46398 80 03 5F 80 */ lwz r0, 0x5f80(r3) -/* 80C4639C 90 1F 00 48 */ stw r0, 0x48(r31) -/* 80C463A0 80 03 5F 84 */ lwz r0, 0x5f84(r3) -/* 80C463A4 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 80C463A8 38 60 00 01 */ li r3, 1 -/* 80C463AC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C463B0 83 C1 00 08 */ lwz r30, 8(r1) -/* 80C463B4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C463B8 7C 08 03 A6 */ mtlr r0 -/* 80C463BC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C463C0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/Execute__12daObjKJgjs_cFPPA3_A4_f.s b/asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/Execute__12daObjKJgjs_cFPPA3_A4_f.s deleted file mode 100644 index 84053fbdc5..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/Execute__12daObjKJgjs_cFPPA3_A4_f.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_80C46310: -/* 80C46310 38 03 05 A8 */ addi r0, r3, 0x5a8 -/* 80C46314 90 04 00 00 */ stw r0, 0(r4) -/* 80C46318 38 60 00 01 */ li r3, 1 -/* 80C4631C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/__dt__12daObjKJgjs_cFv.s b/asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/__dt__12daObjKJgjs_cFv.s deleted file mode 100644 index 6c16bac4fb..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/__dt__12daObjKJgjs_cFv.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_80C464CC: -/* 80C464CC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C464D0 7C 08 02 A6 */ mflr r0 -/* 80C464D4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C464D8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C464DC 93 C1 00 08 */ stw r30, 8(r1) -/* 80C464E0 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80C464E4 7C 9F 23 78 */ mr r31, r4 -/* 80C464E8 41 82 00 38 */ beq lbl_80C46520 -/* 80C464EC 3C 80 80 C4 */ lis r4, __vt__12daObjKJgjs_c@ha /* 0x80C465E0@ha */ -/* 80C464F0 38 04 65 E0 */ addi r0, r4, __vt__12daObjKJgjs_c@l /* 0x80C465E0@l */ -/* 80C464F4 90 1E 05 9C */ stw r0, 0x59c(r30) -/* 80C464F8 41 82 00 18 */ beq lbl_80C46510 -/* 80C464FC 3C 80 80 3B */ lis r4, __vt__16dBgS_MoveBgActor@ha /* 0x803AB9A0@ha */ -/* 80C46500 38 04 B9 A0 */ addi r0, r4, __vt__16dBgS_MoveBgActor@l /* 0x803AB9A0@l */ -/* 80C46504 90 1E 05 9C */ stw r0, 0x59c(r30) -/* 80C46508 38 80 00 00 */ li r4, 0 -/* 80C4650C 4B 3D 27 81 */ bl __dt__10fopAc_ac_cFv -lbl_80C46510: -/* 80C46510 7F E0 07 35 */ extsh. r0, r31 -/* 80C46514 40 81 00 0C */ ble lbl_80C46520 -/* 80C46518 7F C3 F3 78 */ mr r3, r30 -/* 80C4651C 4B 68 88 21 */ bl __dl__FPv -lbl_80C46520: -/* 80C46520 7F C3 F3 78 */ mr r3, r30 -/* 80C46524 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C46528 83 C1 00 08 */ lwz r30, 8(r1) -/* 80C4652C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C46530 7C 08 03 A6 */ mtlr r0 -/* 80C46534 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C46538 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/create1st__12daObjKJgjs_cFv.s b/asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/create1st__12daObjKJgjs_cFv.s deleted file mode 100644 index ffb127abf7..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/create1st__12daObjKJgjs_cFv.s +++ /dev/null @@ -1,59 +0,0 @@ -lbl_80C46098: -/* 80C46098 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C4609C 7C 08 02 A6 */ mflr r0 -/* 80C460A0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C460A4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C460A8 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80C460AC 41 82 00 08 */ beq lbl_80C460B4 -/* 80C460B0 38 63 05 A0 */ addi r3, r3, 0x5a0 -lbl_80C460B4: -/* 80C460B4 3C 80 80 C4 */ lis r4, l_arcName@ha /* 0x80C4658C@ha */ -/* 80C460B8 38 84 65 8C */ addi r4, r4, l_arcName@l /* 0x80C4658C@l */ -/* 80C460BC 80 84 00 00 */ lwz r4, 0(r4) -/* 80C460C0 4B 3E 6D FD */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 80C460C4 7C 60 1B 78 */ mr r0, r3 -/* 80C460C8 2C 00 00 04 */ cmpwi r0, 4 -/* 80C460CC 40 82 00 88 */ bne lbl_80C46154 -/* 80C460D0 7F E3 FB 78 */ mr r3, r31 -/* 80C460D4 48 00 00 99 */ bl setMtx__12daObjKJgjs_cFv -/* 80C460D8 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80C460DC 54 00 07 3E */ clrlwi r0, r0, 0x1c -/* 80C460E0 90 1F 06 0C */ stw r0, 0x60c(r31) -/* 80C460E4 80 1F 06 0C */ lwz r0, 0x60c(r31) -/* 80C460E8 2C 00 00 00 */ cmpwi r0, 0 -/* 80C460EC 40 80 00 10 */ bge lbl_80C460FC -/* 80C460F0 38 00 00 00 */ li r0, 0 -/* 80C460F4 90 1F 06 0C */ stw r0, 0x60c(r31) -/* 80C460F8 48 00 00 14 */ b lbl_80C4610C -lbl_80C460FC: -/* 80C460FC 2C 00 00 02 */ cmpwi r0, 2 -/* 80C46100 40 81 00 0C */ ble lbl_80C4610C -/* 80C46104 38 00 00 01 */ li r0, 1 -/* 80C46108 90 1F 06 0C */ stw r0, 0x60c(r31) -lbl_80C4610C: -/* 80C4610C 7F E3 FB 78 */ mr r3, r31 -/* 80C46110 3C 80 80 C4 */ lis r4, l_arcName@ha /* 0x80C4658C@ha */ -/* 80C46114 38 84 65 8C */ addi r4, r4, l_arcName@l /* 0x80C4658C@l */ -/* 80C46118 80 84 00 00 */ lwz r4, 0(r4) -/* 80C4611C 80 1F 06 0C */ lwz r0, 0x60c(r31) -/* 80C46120 54 00 10 3A */ slwi r0, r0, 2 -/* 80C46124 3C A0 80 C4 */ lis r5, l_dzbidx@ha /* 0x80C46544@ha */ -/* 80C46128 38 A5 65 44 */ addi r5, r5, l_dzbidx@l /* 0x80C46544@l */ -/* 80C4612C 7C A5 00 2E */ lwzx r5, r5, r0 -/* 80C46130 3C C0 80 07 */ lis r6, dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz@ha /* 0x80075AD8@ha */ -/* 80C46134 38 C6 5A D8 */ addi r6, r6, dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz@l /* 0x80075AD8@l */ -/* 80C46138 38 E0 47 F0 */ li r7, 0x47f0 -/* 80C4613C 39 1F 05 A8 */ addi r8, r31, 0x5a8 -/* 80C46140 4B 43 26 7D */ bl MoveBGCreate__16dBgS_MoveBgActorFPCciPFP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz_vUlPA3_A4_f -/* 80C46144 7C 60 1B 78 */ mr r0, r3 -/* 80C46148 2C 00 00 05 */ cmpwi r0, 5 -/* 80C4614C 40 82 00 08 */ bne lbl_80C46154 -/* 80C46150 48 00 00 08 */ b lbl_80C46158 -lbl_80C46154: -/* 80C46154 7C 03 03 78 */ mr r3, r0 -lbl_80C46158: -/* 80C46158 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C4615C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C46160 7C 08 03 A6 */ mtlr r0 -/* 80C46164 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C46168 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/daObjKJgjs_MoveBGDelete__FP12daObjKJgjs_c.s b/asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/daObjKJgjs_MoveBGDelete__FP12daObjKJgjs_c.s deleted file mode 100644 index f7a80b50ce..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/daObjKJgjs_MoveBGDelete__FP12daObjKJgjs_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80C46460: -/* 80C46460 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C46464 7C 08 02 A6 */ mflr r0 -/* 80C46468 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C4646C 4B 43 24 71 */ bl MoveBGDelete__16dBgS_MoveBgActorFv -/* 80C46470 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C46474 7C 08 03 A6 */ mtlr r0 -/* 80C46478 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C4647C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/daObjKJgjs_MoveBGDraw__FP12daObjKJgjs_c.s b/asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/daObjKJgjs_MoveBGDraw__FP12daObjKJgjs_c.s deleted file mode 100644 index f5dd173762..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/daObjKJgjs_MoveBGDraw__FP12daObjKJgjs_c.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_80C464A0: -/* 80C464A0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C464A4 7C 08 02 A6 */ mflr r0 -/* 80C464A8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C464AC 81 83 05 9C */ lwz r12, 0x59c(r3) -/* 80C464B0 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 80C464B4 7D 89 03 A6 */ mtctr r12 -/* 80C464B8 4E 80 04 21 */ bctrl -/* 80C464BC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C464C0 7C 08 03 A6 */ mtlr r0 -/* 80C464C4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C464C8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/daObjKJgjs_MoveBGExecute__FP12daObjKJgjs_c.s b/asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/daObjKJgjs_MoveBGExecute__FP12daObjKJgjs_c.s deleted file mode 100644 index 243db6a9d8..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/daObjKJgjs_MoveBGExecute__FP12daObjKJgjs_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80C46480: -/* 80C46480 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C46484 7C 08 02 A6 */ mflr r0 -/* 80C46488 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C4648C 4B 43 24 C5 */ bl MoveBGExecute__16dBgS_MoveBgActorFv -/* 80C46490 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C46494 7C 08 03 A6 */ mtlr r0 -/* 80C46498 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C4649C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/daObjKJgjs_create1st__FP12daObjKJgjs_c.s b/asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/daObjKJgjs_create1st__FP12daObjKJgjs_c.s deleted file mode 100644 index 45cf3fe12d..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/daObjKJgjs_create1st__FP12daObjKJgjs_c.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_80C46400: -/* 80C46400 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C46404 7C 08 02 A6 */ mflr r0 -/* 80C46408 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C4640C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C46410 7C 7F 1B 78 */ mr r31, r3 -/* 80C46414 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80C46418 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80C4641C 40 82 00 28 */ bne lbl_80C46444 -/* 80C46420 28 1F 00 00 */ cmplwi r31, 0 -/* 80C46424 41 82 00 14 */ beq lbl_80C46438 -/* 80C46428 4B 43 21 FD */ bl __ct__16dBgS_MoveBgActorFv -/* 80C4642C 3C 60 80 C4 */ lis r3, __vt__12daObjKJgjs_c@ha /* 0x80C465E0@ha */ -/* 80C46430 38 03 65 E0 */ addi r0, r3, __vt__12daObjKJgjs_c@l /* 0x80C465E0@l */ -/* 80C46434 90 1F 05 9C */ stw r0, 0x59c(r31) -lbl_80C46438: -/* 80C46438 80 1F 04 A0 */ lwz r0, 0x4a0(r31) -/* 80C4643C 60 00 00 08 */ ori r0, r0, 8 -/* 80C46440 90 1F 04 A0 */ stw r0, 0x4a0(r31) -lbl_80C46444: -/* 80C46444 7F E3 FB 78 */ mr r3, r31 -/* 80C46448 4B FF FC 51 */ bl create1st__12daObjKJgjs_cFv -/* 80C4644C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C46450 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C46454 7C 08 03 A6 */ mtlr r0 -/* 80C46458 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C4645C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/setMtx__12daObjKJgjs_cFv.s b/asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/setMtx__12daObjKJgjs_cFv.s deleted file mode 100644 index 3b23374e26..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/setMtx__12daObjKJgjs_cFv.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_80C4616C: -/* 80C4616C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C46170 7C 08 02 A6 */ mflr r0 -/* 80C46174 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C46178 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C4617C 7C 7F 1B 78 */ mr r31, r3 -/* 80C46180 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C46184 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C46188 C0 3F 04 D0 */ lfs f1, 0x4d0(r31) -/* 80C4618C C0 5F 04 D4 */ lfs f2, 0x4d4(r31) -/* 80C46190 C0 7F 04 D8 */ lfs f3, 0x4d8(r31) -/* 80C46194 4B 70 07 55 */ bl PSMTXTrans -/* 80C46198 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C4619C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C461A0 A8 9F 04 DC */ lha r4, 0x4dc(r31) -/* 80C461A4 A8 BF 04 DE */ lha r5, 0x4de(r31) -/* 80C461A8 A8 DF 04 E0 */ lha r6, 0x4e0(r31) -/* 80C461AC 4B 3C 5F B9 */ bl mDoMtx_XYZrotM__FPA4_fsss -/* 80C461B0 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C461B4 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C461B8 38 9F 05 D8 */ addi r4, r31, 0x5d8 -/* 80C461BC 4B 70 02 F5 */ bl PSMTXCopy -/* 80C461C0 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C461C4 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C461C8 38 9F 05 A8 */ addi r4, r31, 0x5a8 -/* 80C461CC 4B 70 02 E5 */ bl PSMTXCopy -/* 80C461D0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C461D4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C461D8 7C 08 03 A6 */ mtlr r0 -/* 80C461DC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C461E0 4E 80 00 20 */ blr diff --git a/include/JSystem/JUtility/JUTFader.h b/include/JSystem/JUtility/JUTFader.h index b9a3af2f65..3ee0a6a160 100644 --- a/include/JSystem/JUtility/JUTFader.h +++ b/include/JSystem/JUtility/JUTFader.h @@ -21,7 +21,7 @@ public: /* 802E56DC */ virtual void draw(); s32 getStatus() const { return mStatus; } - void setColor(JUtility::TColor color) { mColor.set(color); } + void setColor(JUtility::TColor& color) { mColor.set(color); } /* 0x04 */ s32 mStatus; /* 0x08 */ u16 field_0x8; diff --git a/include/SSystem/SComponent/c_lib.h b/include/SSystem/SComponent/c_lib.h index e0e9c2084c..886f72583d 100644 --- a/include/SSystem/SComponent/c_lib.h +++ b/include/SSystem/SComponent/c_lib.h @@ -87,7 +87,12 @@ inline T cLib_maxLimit(T val, T max) { } template -T cLib_calcTimer(T* val); +T cLib_calcTimer(T* value) { + if (*value != 0) { + *value = *value - 1; + } + return *value; +} void MtxInit(void); void MtxTrans(f32, f32, f32, u8); diff --git a/include/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/mutex_TRK.h b/include/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/mutex_TRK.h index d8863f3471..9139673dc8 100644 --- a/include/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/mutex_TRK.h +++ b/include/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/mutex_TRK.h @@ -3,4 +3,8 @@ #include "dolphin/types.h" +u8 TRKReleaseMutex(); +u8 TRKAcquireMutex(); +u8 TRKInitializeMutex(); + #endif /* METROTRK_PORTABLE_MUTEX_TRK_H */ diff --git a/include/TRK_MINNOW_DOLPHIN/Os/dolphin/target_options.h b/include/TRK_MINNOW_DOLPHIN/Os/dolphin/target_options.h index 9f18712d1d..2e81c94a79 100644 --- a/include/TRK_MINNOW_DOLPHIN/Os/dolphin/target_options.h +++ b/include/TRK_MINNOW_DOLPHIN/Os/dolphin/target_options.h @@ -3,4 +3,7 @@ #include "dolphin/types.h" +u8 GetUseSerialIO(); +void SetUseSerialIO(u8); + #endif /* OS_DOLPHIN_TARGET_OPTIONS_H */ diff --git a/include/TRK_MINNOW_DOLPHIN/utils/common/CircleBuffer.h b/include/TRK_MINNOW_DOLPHIN/utils/common/CircleBuffer.h index 7466d14694..72693ecc25 100644 --- a/include/TRK_MINNOW_DOLPHIN/utils/common/CircleBuffer.h +++ b/include/TRK_MINNOW_DOLPHIN/utils/common/CircleBuffer.h @@ -3,4 +3,19 @@ #include "dolphin/types.h" +typedef struct CircleBuffer { + int field_0x0; + int field_0x4; + int field_0x8; + u32 field_0xc; + s32 readBuf; + u32 field_0x14; + u32 criticalSection; +} CircleBuffer; + +s32 CircleBufferReadBytes(CircleBuffer*, u32, u32); +s32 CircleBufferWriteBytes(CircleBuffer* buf, s32 param_2, u32 param_3); +void CircleBufferInitialize(CircleBuffer* buf, s32 param_2, s32 param_3); +s32 CBGetBytesAvailableForRead(CircleBuffer* buf); + #endif /* UTILS_COMMON_CIRCLEBUFFER_H */ diff --git a/include/TRK_MINNOW_DOLPHIN/utils/gc/MWCriticalSection_gc.h b/include/TRK_MINNOW_DOLPHIN/utils/gc/MWCriticalSection_gc.h index d8b3c0a9a5..b019308355 100644 --- a/include/TRK_MINNOW_DOLPHIN/utils/gc/MWCriticalSection_gc.h +++ b/include/TRK_MINNOW_DOLPHIN/utils/gc/MWCriticalSection_gc.h @@ -3,4 +3,8 @@ #include "dolphin/types.h" +void MWExitCriticalSection(u32* section); +void MWEnterCriticalSection(u32* section); +void MWInitializeCriticalSection(); + #endif /* UTILS_GC_MWCRITICALSECTION_GC_H */ diff --git a/include/amcstubs/AmcExi2Stubs.h b/include/amcstubs/AmcExi2Stubs.h index 47cf965e4b..707b3022e3 100644 --- a/include/amcstubs/AmcExi2Stubs.h +++ b/include/amcstubs/AmcExi2Stubs.h @@ -3,4 +3,13 @@ #include "dolphin/types.h" +void EXI2_Init(void); +void EXI2_EnableInterrupts(void); +u8 EXI2_Poll(void); +u8 EXI2_ReadN(void*, u32); +u8 EXI2_WriteN(void*, u32); +void EXI2_Reserve(void); +void EXI2_Unreserve(void); +u8 AMC_IsStub(void); + #endif /* AMCEXI2STUBS_H */ diff --git a/include/d/com/d_com_inf_game.h b/include/d/com/d_com_inf_game.h index e03010cf77..9b5384406c 100644 --- a/include/d/com/d_com_inf_game.h +++ b/include/d/com/d_com_inf_game.h @@ -1744,6 +1744,11 @@ static dAttCatch_c* dComIfGp_att_getCatghTarget(); static void dComIfGp_setBottleStatus(u8 param_0, u8 param_1); bool dComIfGp_getMapTrans(int i_roomNo, f32* o_transX, f32* o_transY, s16* o_angle); + +inline void dComIfGp_itemDataInit() { + g_dComIfG_gameInfo.play.itemInit(); +} + inline bool i_dComIfGp_checkPlayerStatus0(int param_0, u32 flag) { return g_dComIfG_gameInfo.play.checkPlayerStatus(param_0, 0, flag); } diff --git a/include/d/d_model.h b/include/d/d_model.h index 2a68d5bf39..4623c46053 100644 --- a/include/d/d_model.h +++ b/include/d/d_model.h @@ -46,7 +46,7 @@ public: /* 8009C8D8 */ dMdl_c* entry(J3DModelData*, u16, int); /* 8009C7AC */ static void create(); /* 8009C864 */ void remove(); - /* 8009C8C0 */ void reset(); + /* 8009C8C0 */ static void reset(); static dMdl_mng_c* m_myObj; diff --git a/include/d/file/d_file_select.h b/include/d/file/d_file_select.h index b1113c2011..5c274e7574 100644 --- a/include/d/file/d_file_select.h +++ b/include/d/file/d_file_select.h @@ -395,8 +395,8 @@ public: /* 0x0250 */ char* field_0x0250; /* 0x0254 */ STControl* mStick; /* 0x0258 */ u8 mDataNew[3]; - /* 0x025B */ u8 field_0x025b; - /* 0x025C */ u8 field_0x025c[0x0264 - 0x025C]; + /* 0x025B */ u8 field_0x025b[3]; + /* 0x025C */ u8 field_0x025e[0x0264 - 0x025E]; /* 0x0264 */ u8 field_0x0264; /* 0x0265 */ u8 mSelectNum; /* 0x0266 */ u8 field_0x0266; diff --git a/include/d/s/d_s_logo.h b/include/d/s/d_s_logo.h index 9f6502979c..a4d5f249cb 100644 --- a/include/d/s/d_s_logo.h +++ b/include/d/s/d_s_logo.h @@ -39,6 +39,7 @@ public: /* 0xF */ EXEC_SCENE_CHANGE, }; + dScnLogo_c() {} /* 802560B4 */ void preLoad_dyl_create(); /* 802560F8 */ void preLoad_dyl_remove(); /* 8025611C */ bool preLoad_dyl(); @@ -128,4 +129,6 @@ static int phase_0(dScnLogo_c* logo); static int phase_1(dScnLogo_c* logo); static int phase_2(dScnLogo_c* logo); +typedef int (*dScnLogo_Method)(dScnLogo_c*);; + #endif /* D_S_D_S_LOGO_H */ diff --git a/include/d/s/d_s_name.h b/include/d/s/d_s_name.h index d894b00859..fd56c05701 100644 --- a/include/d/s/d_s_name.h +++ b/include/d/s/d_s_name.h @@ -2,5 +2,48 @@ #define D_S_D_S_NAME_H #include "dolphin/types.h" +#include "f_op/f_op_camera_mng.h" +#include "f_op/f_op_scene.h" + +class JKRExpHeap; +class dFile_select_c; +class dBrightCheck_c; + +class dScnName_camera_c : public camera_process_class { +public: + dScnName_camera_c() { field_0x22f = 84; } + /* 80259294 */ virtual ~dScnName_camera_c() {} +}; + +class dScnName_c : public scene_class { +public: + dScnName_c() {} + + /* 802588A0 */ s32 create(); + /* 80258B2C */ void setView(); + /* 80258BC8 */ s32 execute(); + /* 80258C5C */ s32 draw(); + /* 80258CC8 */ ~dScnName_c(); + /* 80258DD0 */ void FileSelectOpen(); + /* 80258E34 */ void FileSelectMain(); + /* 80258E78 */ void FileSelectMainNormal(); + /* 80258F20 */ void FileSelectClose(); + /* 80258FD4 */ void brightCheckOpen(); + /* 80259008 */ void brightCheck(); + /* 802590F8 */ void changeGameScene(); + +private: + /* 0x1C4 */ request_of_phase_process_class field_0x1c4; + /* 0x1CC */ JKRExpHeap* mHeap; + /* 0x1D0 */ JKRExpHeap* field_0x1d0; + /* 0x1D4 */ dScnName_camera_c mCamera; + /* 0x414 */ dFile_select_c* dFs_c; + /* 0x418 */ dBrightCheck_c* mBrightCheck; + /* 0x41C */ u8 field_0x41c; + /* 0x41D */ u8 field_0x41d; + /* 0x41E */ u8 field_0x41e; + /* 0x41F */ u8 field_0x41f; + /* 0x420 */ u8 field_0x420; +}; #endif /* D_S_D_S_NAME_H */ diff --git a/include/d/save/d_save.h b/include/d/save/d_save.h index fa3f80cdea..f5934842ce 100644 --- a/include/d/save/d_save.h +++ b/include/d/save/d_save.h @@ -1111,7 +1111,7 @@ public: void removeZone(int zoneNo) { mZone[zoneNo].reset(); } void setNoFile(u8 file) { mNoFile = file; } u8 getNewFile() const { return mNewFile; } - void setNewFile(u8 file) { mNewFile |= file; } + void setNewFile(u8 file) { mNewFile = file; } static const int MEMORY_SWITCH = 0x80; static const int DAN_SWITCH = 0x40; diff --git a/include/d/save/d_save_HIO.h b/include/d/save/d_save_HIO.h index dfa7c8b147..4943ca414d 100644 --- a/include/d/save/d_save_HIO.h +++ b/include/d/save/d_save_HIO.h @@ -9,12 +9,12 @@ public: /* 8025C0A0 */ dSvBit_childTransformHIO_c(); /* 8025C0D4 */ void init(); - /* 8025C2E4 */ virtual ~dSvBit_childTransformHIO_c(); + /* 8025C2E4 */ virtual ~dSvBit_childTransformHIO_c() {} private: /* 0x04 */ u8 field_0x4; - /* 0x05 */ bool WF[4]; - /* 0x09 */ bool field_0x9[4]; + /* 0x05 */ u8 WF[4]; + /* 0x09 */ u8 field_0x9[4]; }; class dSvBit_childDarknessHIO_c { @@ -22,12 +22,12 @@ public: /* 8025C004 */ dSvBit_childDarknessHIO_c(); /* 8025C038 */ void init(); - /* 8025C32C */ virtual ~dSvBit_childDarknessHIO_c(); + /* 8025C32C */ virtual ~dSvBit_childDarknessHIO_c() {} private: /* 0x04 */ u8 field_0x4; - /* 0x05 */ bool TW[6]; - /* 0x0B */ bool field_0x9[6]; + /* 0x05 */ u8 TW[6]; + /* 0x0B */ u8 field_0xB[6]; }; class dSvBit_childOtherHIO_c { @@ -35,14 +35,14 @@ public: /* 8025C13C */ dSvBit_childOtherHIO_c(); /* 8025C178 */ void init(); - /* 8025C29C */ virtual ~dSvBit_childOtherHIO_c(); + /* 8025C29C */ virtual ~dSvBit_childOtherHIO_c() {} private: /* 0x04 */ u8 field_0x4; /* 0x05 */ u8 mDropNum; /* 0x06 */ u8 field_0x6; - /* 0x07 */ bool mLightVessel[4]; - /* 0x0B */ bool field_0xb[4]; + /* 0x07 */ u8 mLightVessel[4]; + /* 0x0B */ u8 field_0xb[4]; }; class dSvBit_childTbPerfectionHIO_c { @@ -50,17 +50,20 @@ public: /* 8025BF68 */ dSvBit_childTbPerfectionHIO_c(); /* 8025BF9C */ void init(); - /* 8025C374 */ virtual ~dSvBit_childTbPerfectionHIO_c(); + /* 8025C374 */ virtual ~dSvBit_childTbPerfectionHIO_c() {} private: /* 0x04 */ u8 field_0x4; - /* 0x05 */ bool field_0x5[0x40]; - /* 0x45 */ bool field_0x45[0x40]; + /* 0x05 */ u8 field_0x5[0x40]; + /* 0x45 */ u8 field_0x45[0x40]; }; class dSvBit_childTreasureHIO_c { public: - /* 8025C874 */ virtual ~dSvBit_childTreasureHIO_c(); + /* 8025C874 */ virtual ~dSvBit_childTreasureHIO_c() {} + void init() { + mPerfectSave.init(); + } private: /* 0x04 */ u8 field_0x4; @@ -72,7 +75,7 @@ public: /* 8025BCB0 */ dSvBit_childSwZoneHIO_c(); /* 8025BCE4 */ void init(); - /* 8025C524 */ virtual ~dSvBit_childSwZoneHIO_c(); + /* 8025C524 */ virtual ~dSvBit_childSwZoneHIO_c() {} private: /* 0x04 */ u8 field_0x4; @@ -85,12 +88,12 @@ public: /* 8025BB78 */ dSvBit_childSwPerfectionHIO_c(); /* 8025BBAC */ void init(); - /* 8025C5B4 */ virtual ~dSvBit_childSwPerfectionHIO_c(); + /* 8025C5B4 */ virtual ~dSvBit_childSwPerfectionHIO_c() {} private: /* 0x04 */ u8 field_0x4; - /* 0x05 */ bool field_0x5[0x80]; - /* 0x85 */ bool field_0x85[0x80]; + /* 0x05 */ u8 field_0x5[0x80]; + /* 0x85 */ u8 field_0x85[0x80]; }; class dSvBit_childSwOneZoneHIO_c { @@ -98,7 +101,7 @@ public: /* 8025BD10 */ dSvBit_childSwOneZoneHIO_c(); /* 8025BD44 */ void init(); - /* 8025C4DC */ virtual ~dSvBit_childSwOneZoneHIO_c(); + /* 8025C4DC */ virtual ~dSvBit_childSwOneZoneHIO_c() {} private: /* 0x04 */ u8 field_0x4; @@ -111,17 +114,23 @@ public: /* 8025BC14 */ dSvBit_childSwDungeonHIO_c(); /* 8025BC48 */ void init(); - /* 8025C56C */ virtual ~dSvBit_childSwDungeonHIO_c(); + /* 8025C56C */ virtual ~dSvBit_childSwDungeonHIO_c() {} private: /* 0x04 */ u8 field_0x4; - /* 0x05 */ bool field_0x5[0x40]; - /* 0x45 */ bool field_0x45[0x40]; + /* 0x05 */ u8 field_0x5[0x40]; + /* 0x45 */ u8 field_0x45[0x40]; }; class dSvBit_childSwitchHIO_c { public: - /* 8025C970 */ virtual ~dSvBit_childSwitchHIO_c(); + /* 8025C970 */ virtual ~dSvBit_childSwitchHIO_c() {} + void init() { + field_0x8.init(); + field_0x110.init(); + field_0x198.init(); + field_0x1e0.init(); + } private: /* 0x004 */ u8 field_0x4; @@ -136,12 +145,12 @@ public: /* 8025BEA8 */ dSvBit_childItZoneHIO_c(); /* 8025BEDC */ void init(); - /* 8025C404 */ virtual ~dSvBit_childItZoneHIO_c(); + /* 8025C404 */ virtual ~dSvBit_childItZoneHIO_c() {} private: /* 0x04 */ u8 field_0x4; - /* 0x05 */ bool field_0x5[0x20]; - /* 0x25 */ bool field_0x25[0x20]; + /* 0x05 */ u8 field_0x5[0x20]; + /* 0x25 */ u8 field_0x25[0x20]; }; class dSvBit_childItPerfectionHIO_c { @@ -149,12 +158,12 @@ public: /* 8025BD70 */ dSvBit_childItPerfectionHIO_c(); /* 8025BDA4 */ void init(); - /* 8025C494 */ virtual ~dSvBit_childItPerfectionHIO_c(); + /* 8025C494 */ virtual ~dSvBit_childItPerfectionHIO_c() {} private: /* 0x04 */ u8 field_0x4; - /* 0x05 */ bool field_0x5[0x20]; - /* 0x25 */ bool field_0x25[0x20]; + /* 0x05 */ u8 field_0x5[0x20]; + /* 0x25 */ u8 field_0x25[0x20]; }; class dSvBit_childItOneZoneHIO_c { @@ -162,12 +171,12 @@ public: /* 8025BF08 */ dSvBit_childItOneZoneHIO_c(); /* 8025BF3C */ void init(); - /* 8025C3BC */ virtual ~dSvBit_childItOneZoneHIO_c(); + /* 8025C3BC */ virtual ~dSvBit_childItOneZoneHIO_c() {} private: /* 0x04 */ u8 field_0x4; - /* 0x05 */ bool field_0x5[0x10]; - /* 0x15 */ bool field_0x15[0x10]; + /* 0x05 */ u8 field_0x5[0x10]; + /* 0x15 */ u8 field_0x15[0x10]; }; class dSvBit_childItDungeonHIO_c { @@ -175,17 +184,23 @@ public: /* 8025BE0C */ dSvBit_childItDungeonHIO_c(); /* 8025BE40 */ void init(); - /* 8025C44C */ virtual ~dSvBit_childItDungeonHIO_c(); + /* 8025C44C */ virtual ~dSvBit_childItDungeonHIO_c() {} private: /* 0x04 */ u8 field_0x4; - /* 0x05 */ bool field_0x5[0x80]; - /* 0x85 */ bool field_0x85[0x80]; + /* 0x05 */ u8 field_0x5[0x80]; + /* 0x85 */ u8 field_0x85[0x80]; }; class dSvBit_childItemHIO_c { public: - /* 8025C8D4 */ virtual ~dSvBit_childItemHIO_c(); + /* 8025C8D4 */ virtual ~dSvBit_childItemHIO_c() {} + void init() { + mFullSave.init(); + mDungeonSave.init(); + mZoneSave.init(); + mOneZoneSave.init(); + } private: /* 0x004 */ u8 field_0x4; @@ -199,7 +214,7 @@ class dSvBit_HIO_c { public: /* 8025C1F8 */ void init(); - /* 8025C6FC */ virtual ~dSvBit_HIO_c(); + /* 8025C6FC */ virtual ~dSvBit_HIO_c() {} /* 0x004 */ s8 field_0x4; /* 0x008 */ dSvBit_childSwitchHIO_c mSwitch; @@ -208,8 +223,8 @@ public: /* 0x468 */ dSvBit_childDarknessHIO_c mDarkness; /* 0x47C */ dSvBit_childTransformHIO_c mTransform; /* 0x48C */ dSvBit_childOtherHIO_c mOther; - /* 0x49C */ bool mTransformFlag; - /* 0x49D */ bool field_0x49d; + /* 0x49C */ u8 mTransformFlag; + /* 0x49D */ u8 field_0x49d; }; STATIC_ASSERT(sizeof(dSvBit_HIO_c) == 0x4A0); diff --git a/include/d/shop/d_shop_item_ctrl.h b/include/d/shop/d_shop_item_ctrl.h index 5a486dc093..54b164a2f7 100644 --- a/include/d/shop/d_shop_item_ctrl.h +++ b/include/d/shop/d_shop_item_ctrl.h @@ -16,6 +16,7 @@ public: void setItemIndex(int i, u32 index) { mItemIndex[i] = index; } u32 getItemIndex(int i) { return mItemIndex[i]; } + void setMessageIndex(int i, u16 messageIndex) { mMessageIndex[i] = messageIndex; } u16 getMessageIndex(int i) { return mMessageIndex[i]; } private: diff --git a/include/d/shop/d_shop_system.h b/include/d/shop/d_shop_system.h index 048398c6ad..5401ee44a2 100644 --- a/include/d/shop/d_shop_system.h +++ b/include/d/shop/d_shop_system.h @@ -120,7 +120,7 @@ public: /* 8019A364 */ void setSoldOut(); /* 8019A4F4 */ void setSoldOutItemHide(); /* 8019A564 */ void deleteObject(); - /* 8019A5D0 */ void searchItemActor(); + /* 8019A5D0 */ int searchItemActor(); /* 8019AB00 */ int getFlowNodeNum(); /* 8019AB1C */ void setSellItemMax(u8); /* 8019AB24 */ bool checkShopOpen(); diff --git a/include/dolphin/vi/vi.h b/include/dolphin/vi/vi.h index 23abbcc408..f233b30249 100644 --- a/include/dolphin/vi/vi.h +++ b/include/dolphin/vi/vi.h @@ -52,6 +52,7 @@ void* VIGetNextFrameBuffer(); void* VIGetCurrentFrameBuffer(); void VISetBlack(BOOL); u32 VIGetRetraceCount(); +u32 VIGetDTVStatus(); vu16 __VIRegs[59] : 0xCC002000; diff --git a/include/m_Do/m_Do_graphic.h b/include/m_Do/m_Do_graphic.h index 68ebab896b..c91282e5d6 100644 --- a/include/m_Do/m_Do_graphic.h +++ b/include/m_Do/m_Do_graphic.h @@ -55,7 +55,7 @@ public: static int startFadeOut(int param_0) { return JFWDisplay::getManager()->startFadeOut(param_0); } static int startFadeIn(int param_0) { return JFWDisplay::getManager()->startFadeIn(param_0); } - static void setFadeColor(JUtility::TColor& color) { mFader->setColor(color); } + static void setFadeColor(JUtility::TColor color) { mFader->mColor.set(color); } static void setClearColor(JUtility::TColor color) { JFWDisplay::getManager()->setClearColor(color); } static void setBackColor(GXColor& color) { mBackColor = color; } static void endFrame() { JFWDisplay::getManager()->endFrame(); } diff --git a/include/msg/scrn/d_msg_scrn_arrow.h b/include/msg/scrn/d_msg_scrn_arrow.h index 2a86e86402..ec521936aa 100644 --- a/include/msg/scrn/d_msg_scrn_arrow.h +++ b/include/msg/scrn/d_msg_scrn_arrow.h @@ -3,4 +3,31 @@ #include "dolphin/types.h" +class J2DScreen; +class J2DAnmTransform; +class J2DAnmColor; +class J2DScreen; +class CPaneMgr; + +class dMsgScrnArrow_c { +public: + /* 8023B9B4 */ dMsgScrnArrow_c(); + /* 8023BC78 */ virtual ~dMsgScrnArrow_c(); + /* 8023BDC0 */ void draw(); + /* 8023BDF8 */ void setPos(f32, f32); + /* 8023BE34 */ void arwAnimeInit(); + /* 8023BE90 */ void arwAnimeMove(); + /* 8023BFC4 */ void dotAnimeInit(); + /* 8023C010 */ void dotAnimeMove(); + + /* 0x04 */ J2DScreen* mScreen; + /* 0x08 */ J2DAnmTransform* mAnmBck; + /* 0x0C */ J2DAnmColor* mAnmBpk; + /* 0x10 */ CPaneMgr* mPaneMgr0; + /* 0x14 */ CPaneMgr* mPaneMgr1; + /* 0x18 */ CPaneMgr* mPaneMgr2; + /* 0x1C */ f32 mBckFrame; + /* 0x20 */ f32 mBpkFrame; +}; + #endif /* MSG_SCRN_D_MSG_SCRN_ARROW_H */ diff --git a/include/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl.h b/include/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl.h index 285883ee1c..0dde03517f 100644 --- a/include/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl.h +++ b/include/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl.h @@ -1,6 +1,22 @@ #ifndef D_A_OBJ_DIGHOLL_H #define D_A_OBJ_DIGHOLL_H -#include "dolphin/types.h" +#include "d/com/d_com_inf_game.h" +#include "f_op/f_op_actor_mng.h" + +class daObjDigholl_c : public fopAc_ac_c { +public: + /* 80BDC618 */ int create(); + /* 80BDC75C */ ~daObjDigholl_c(); + /* 80BDC7D8 */ int execute(); + /* 80BDCB0C */ int draw(); + + /* 0x568 */ u8 field_0x568; + /* 0x569 */ u8 field_0x569; + /* 0x56A */ u8 field_0x56a; + /* 0x56B */ u8 field_0x56b; + /* 0x56C */ s16 field_0x56c; + /* 0x56E */ s16 field_0x56e; +}; // Size: 0x570 #endif /* D_A_OBJ_DIGHOLL_H */ diff --git a/include/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs.h b/include/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs.h index da044153b0..e2736ac465 100644 --- a/include/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs.h +++ b/include/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs.h @@ -1,6 +1,27 @@ #ifndef D_A_OBJ_KJGJS_H #define D_A_OBJ_KJGJS_H -#include "dolphin/types.h" +#include "d/bg/d_bg_s_movebg_actor.h" +#include "d/com/d_com_inf_game.h" +#include "f_op/f_op_actor_mng.h" + +class daObjKJgjs_c : public dBgS_MoveBgActor { +public: + /* 80C46098 */ int create1st(); + /* 80C4616C */ void setMtx(); + /* 80C461E4 */ int CreateHeap(); + /* 80C46264 */ int Create(); + /* 80C46310 */ int Execute(f32 (**)[3][4]); + /* 80C46320 */ int Draw(); + /* 80C463C4 */ int Delete(); + /* 80C464CC */ virtual ~daObjKJgjs_c(); + + u32 getType() { return fopAcM_GetParamBit(this, 0, 4); } + + /* 0x5A0 */ request_of_phase_process_class mPhaseReq; + /* 0x5A8 */ Mtx mMtx[2]; + /* 0x608 */ J3DModel* mpModel; + /* 0x60C */ s32 field_0x60c; +}; // Size: 0x610 #endif /* D_A_OBJ_KJGJS_H */ diff --git a/include/rel/d/a/tag/d_a_tag_shop_item/d_a_tag_shop_item.h b/include/rel/d/a/tag/d_a_tag_shop_item/d_a_tag_shop_item.h index 0b3799c009..261e528814 100644 --- a/include/rel/d/a/tag/d_a_tag_shop_item/d_a_tag_shop_item.h +++ b/include/rel/d/a/tag/d_a_tag_shop_item/d_a_tag_shop_item.h @@ -16,6 +16,7 @@ public: /* 80D61050 */ u8 getSwitchBit2(); /* 80D6105C */ void initialize(); /* 80D61168 */ virtual ~daTag_ShopItem_c(); + s32 getProcessID() { return field_0x56c; } /* 0x56C */ s32 field_0x56c; /* 0x570 */ s16 field_0x570; diff --git a/libs/TRK_MINNOW_DOLPHIN/GCN/EXI2_DDH_GCN/main.c b/libs/TRK_MINNOW_DOLPHIN/GCN/EXI2_DDH_GCN/main.c index 6e85dc3925..41396b2698 100644 --- a/libs/TRK_MINNOW_DOLPHIN/GCN/EXI2_DDH_GCN/main.c +++ b/libs/TRK_MINNOW_DOLPHIN/GCN/EXI2_DDH_GCN/main.c @@ -4,6 +4,9 @@ // #include "TRK_MINNOW_DOLPHIN/GCN/EXI2_DDH_GCN/main.h" +#include "TRK_MINNOW_DOLPHIN/utils/common/CircleBuffer.h" +#include "TRK_MINNOW_DOLPHIN/utils/common/MWTrace.h" +#include "amcstubs/AmcExi2Stubs.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -11,34 +14,17 @@ // Forward References: // -void ddh_cc_initinterrupts(); +int ddh_cc_initinterrupts(); void ddh_cc_peek(); -void ddh_cc_post_stop(); -void ddh_cc_pre_continue(); +int ddh_cc_post_stop(); +int ddh_cc_pre_continue(); void ddh_cc_write(); void ddh_cc_read(); u8 ddh_cc_close(); -void ddh_cc_open(); +s32 ddh_cc_open(); u8 ddh_cc_shutdown(); void ddh_cc_initialize(); -// -// External References: -// - -void CircleBufferReadBytes(); -void CircleBufferWriteBytes(); -void CircleBufferInitialize(); -void CBGetBytesAvailableForRead(); -void MWTRACE(); -void EXI2_Init(); -void EXI2_EnableInterrupts(); -u8 EXI2_Poll(); -u8 EXI2_ReadN(); -u8 EXI2_WriteN(); -void EXI2_Reserve(); -void EXI2_Unreserve(); - // // Declarations: // @@ -48,23 +34,19 @@ void EXI2_Unreserve(); static u8 gRecvBuf[2048]; /* 80450030-80450050 07CD50 001C+04 3/3 0/0 0/0 .bss gRecvCB */ -static u8 gRecvCB[28 + 4 /* padding */]; +static CircleBuffer gRecvCB; // copied from pikmin2. should try to find a real fix static makeMainBSSOrderingWork() { - u8 buff[0x500]; - memcpy(buff, gRecvBuf, 0x500); + u8 buff[0x500]; + memcpy(buff, gRecvBuf, 0x500); } /* 8037235C-80372380 36CC9C 0024+00 0/0 1/1 0/0 .text ddh_cc_initinterrupts */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void ddh_cc_initinterrupts() { - nofralloc -#include "asm/TRK_MINNOW_DOLPHIN/GCN/EXI2_DDH_GCN/main/ddh_cc_initinterrupts.s" +int ddh_cc_initinterrupts() { + EXI2_EnableInterrupts(); + return 0; } -#pragma pop /* 80372380-803723F0 36CCC0 0070+00 0/0 1/1 0/0 .text ddh_cc_peek */ #pragma push @@ -77,24 +59,16 @@ asm void ddh_cc_peek() { #pragma pop /* 803723F0-80372414 36CD30 0024+00 0/0 1/1 0/0 .text ddh_cc_post_stop */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void ddh_cc_post_stop() { - nofralloc -#include "asm/TRK_MINNOW_DOLPHIN/GCN/EXI2_DDH_GCN/main/ddh_cc_post_stop.s" +int ddh_cc_post_stop() { + EXI2_Reserve(); + return 0; } -#pragma pop /* 80372414-80372438 36CD54 0024+00 0/0 1/1 0/0 .text ddh_cc_pre_continue */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void ddh_cc_pre_continue() { - nofralloc -#include "asm/TRK_MINNOW_DOLPHIN/GCN/EXI2_DDH_GCN/main/ddh_cc_pre_continue.s" +int ddh_cc_pre_continue() { + EXI2_Unreserve(); + return 0; } -#pragma pop /* ############################################################################################## */ /* 803A2D10-803A2D24 02F370 0014+00 1/1 0/0 0/0 .rodata @318 */ @@ -116,7 +90,7 @@ COMPILER_STRIP_GATE(0x803A2D50, &lit_320); #pragma pop /* 804519C0-804519C8 000EC0 0004+04 3/3 0/0 0/0 .sbss gIsInitialized */ -static u8 gIsInitialized[4 + 4 /* padding */]; +static BOOL gIsInitialized; /* 80372438-803724F8 36CD78 00C0+00 0/0 1/1 0/0 .text ddh_cc_write */ #pragma push @@ -153,14 +127,13 @@ u8 ddh_cc_close() { } /* 803725EC-80372610 36CF2C 0024+00 0/0 1/1 0/0 .text ddh_cc_open */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void ddh_cc_open() { - nofralloc -#include "asm/TRK_MINNOW_DOLPHIN/GCN/EXI2_DDH_GCN/main/ddh_cc_open.s" +s32 ddh_cc_open() { + if (gIsInitialized != FALSE) { + return -10005; + } + gIsInitialized = TRUE; + return 0; } -#pragma pop /* 80372610-80372618 36CF50 0008+00 0/0 1/1 0/0 .text ddh_cc_shutdown */ u8 ddh_cc_shutdown() { diff --git a/libs/TRK_MINNOW_DOLPHIN/GCN/EXI2_GDEV_GCN/main.c b/libs/TRK_MINNOW_DOLPHIN/GCN/EXI2_GDEV_GCN/main.c index d1d349c3ca..7e010d1ead 100644 --- a/libs/TRK_MINNOW_DOLPHIN/GCN/EXI2_GDEV_GCN/main.c +++ b/libs/TRK_MINNOW_DOLPHIN/GCN/EXI2_GDEV_GCN/main.c @@ -4,6 +4,7 @@ // #include "TRK_MINNOW_DOLPHIN/GCN/EXI2_GDEV_GCN/main.h" +#include "TRK_MINNOW_DOLPHIN/utils/common/CircleBuffer.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -11,14 +12,14 @@ // Forward References: // -void gdev_cc_initinterrupts(); +u8 gdev_cc_initinterrupts(); void gdev_cc_peek(); -void gdev_cc_post_stop(); -void gdev_cc_pre_continue(); +u8 gdev_cc_post_stop(); +u8 gdev_cc_pre_continue(); void gdev_cc_write(); void gdev_cc_read(); u8 gdev_cc_close(); -void gdev_cc_open(); +s32 gdev_cc_open(); u8 gdev_cc_shutdown(); void gdev_cc_initialize(); @@ -26,16 +27,12 @@ void gdev_cc_initialize(); // External References: // -void CircleBufferReadBytes(); -void CircleBufferWriteBytes(); -void CircleBufferInitialize(); -void CBGetBytesAvailableForRead(); void MWTRACE(); void DBClose(); void DBOpen(); void DBWrite(); -void DBRead(); -void DBQueryData(); +int DBRead(); +int DBQueryData(); void DBInitInterrupts(); void DBInitComm(); @@ -48,23 +45,19 @@ void DBInitComm(); static u8 gRecvBuf[1280]; /* 80450550-8045056C 07D270 001C+00 3/3 0/0 0/0 .bss gRecvCB */ -static u8 gRecvCB[28]; +static CircleBuffer gRecvCB; // copied from pikmin2. should try to find a real fix static makeMainBSSOrderingWork() { - u8 buff[0x500]; - memcpy(buff, gRecvBuf, 0x500); + u8 buff[0x500]; + memcpy(buff, gRecvBuf, 0x500); } /* 80372908-8037292C 36D248 0024+00 0/0 1/1 0/0 .text gdev_cc_initinterrupts */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void gdev_cc_initinterrupts() { - nofralloc -#include "asm/TRK_MINNOW_DOLPHIN/GCN/EXI2_GDEV_GCN/main/gdev_cc_initinterrupts.s" +u8 gdev_cc_initinterrupts() { + DBInitInterrupts(); + return 0; } -#pragma pop /* 8037292C-8037299C 36D26C 0070+00 0/0 1/1 0/0 .text gdev_cc_peek */ #pragma push @@ -77,24 +70,16 @@ asm void gdev_cc_peek() { #pragma pop /* 8037299C-803729C0 36D2DC 0024+00 0/0 1/1 0/0 .text gdev_cc_post_stop */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void gdev_cc_post_stop() { - nofralloc -#include "asm/TRK_MINNOW_DOLPHIN/GCN/EXI2_GDEV_GCN/main/gdev_cc_post_stop.s" +u8 gdev_cc_post_stop() { + DBOpen(); + return 0; } -#pragma pop /* 803729C0-803729E4 36D300 0024+00 0/0 1/1 0/0 .text gdev_cc_pre_continue */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void gdev_cc_pre_continue() { - nofralloc -#include "asm/TRK_MINNOW_DOLPHIN/GCN/EXI2_GDEV_GCN/main/gdev_cc_pre_continue.s" +u8 gdev_cc_pre_continue() { + DBClose(); + return 0; } -#pragma pop /* ############################################################################################## */ /* 803A2DF0-803A2E04 02F450 0014+00 1/1 0/0 0/0 .rodata @318 */ @@ -116,7 +101,7 @@ COMPILER_STRIP_GATE(0x803A2E30, &lit_320); #pragma pop /* 804519C8-804519D0 000EC8 0004+04 3/3 0/0 0/0 .sbss gIsInitialized */ -static u8 gIsInitialized[4 + 4 /* padding */]; +static BOOL gIsInitialized; /* 803729E4-80372AA4 36D324 00C0+00 0/0 1/1 0/0 .text gdev_cc_write */ #pragma push @@ -153,14 +138,13 @@ u8 gdev_cc_close() { } /* 80372BA0-80372BC4 36D4E0 0024+00 0/0 1/1 0/0 .text gdev_cc_open */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void gdev_cc_open() { - nofralloc -#include "asm/TRK_MINNOW_DOLPHIN/GCN/EXI2_GDEV_GCN/main/gdev_cc_open.s" +s32 gdev_cc_open() { + if (gIsInitialized != FALSE) { + return -10005; + } + gIsInitialized = TRUE; + return 0; } -#pragma pop /* 80372BC4-80372BCC 36D504 0008+00 0/0 1/1 0/0 .text gdev_cc_shutdown */ u8 gdev_cc_shutdown() { diff --git a/libs/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/msghndlr.c b/libs/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/msghndlr.c index 0dc5b184d1..3ea7dc70cc 100644 --- a/libs/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/msghndlr.c +++ b/libs/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/msghndlr.c @@ -268,7 +268,7 @@ asm s32 TRKDoReset(TRKBuffer*) { /* ############################################################################################## */ /* 8044F288-8044F290 07BFA8 0004+04 4/4 0/0 0/0 .bss IsTRKConnected */ -SECTION_BSS static u8 IsTRKConnected[4 + 4 /* padding */]; +SECTION_BSS static BOOL IsTRKConnected; /* 8036EBE4-8036EC5C 369524 0078+00 0/0 1/1 0/0 .text TRKDoDisconnect */ #pragma push @@ -291,24 +291,14 @@ asm s32 TRKDoConnect(TRKBuffer*) { #pragma pop /* 8036ECC0-8036ECCC 369600 000C+00 0/0 1/1 0/0 .text SetTRKConnected */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void SetTRKConnected(BOOL) { - nofralloc -#include "asm/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/msghndlr/SetTRKConnected.s" +void SetTRKConnected(BOOL isTRKConnected) { + IsTRKConnected = isTRKConnected; } -#pragma pop /* 8036ECCC-8036ECDC 36960C 0010+00 0/0 3/3 0/0 .text GetTRKConnected */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm BOOL GetTRKConnected(void) { - nofralloc -#include "asm/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/msghndlr/GetTRKConnected.s" +BOOL GetTRKConnected(void) { + return IsTRKConnected; } -#pragma pop /* ############################################################################################## */ /* 803A2AAC-803A2AB4 02F10C 0006+02 1/1 0/0 0/0 .rodata @573 */ diff --git a/libs/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/nubevent.c b/libs/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/nubevent.c index b812ae39b2..8e486537ba 100644 --- a/libs/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/nubevent.c +++ b/libs/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/nubevent.c @@ -4,6 +4,8 @@ // #include "TRK_MINNOW_DOLPHIN/MetroTRK/Portable/nubevent.h" +#include "TRK_MINNOW_DOLPHIN/MetroTRK/Portable/msgbuf.h" +#include "TRK_MINNOW_DOLPHIN/MetroTRK/Portable/mutex_TRK.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -15,7 +17,7 @@ void TRKDestructEvent(); void TRKConstructEvent(); void TRKPostEvent(); void TRKGetNextEvent(); -void TRKInitializeEventQueue(); +u8 TRKInitializeEventQueue(); // // External References: @@ -23,23 +25,15 @@ void TRKInitializeEventQueue(); SECTION_INIT void TRK_memcpy(); void TRKReleaseBuffer(); -u8 TRKReleaseMutex(); -u8 TRKAcquireMutex(); -u8 TRKInitializeMutex(); // // Declarations: // /* 8036CC18-8036CC3C 367558 0024+00 0/0 1/1 0/0 .text TRKDestructEvent */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void TRKDestructEvent() { - nofralloc -#include "asm/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/nubevent/TRKDestructEvent.s" +void TRKDestructEvent(TRKBuffer* buf) { + TRKReleaseBuffer(buf->_08); } -#pragma pop /* 8036CC3C-8036CC54 36757C 0018+00 0/0 5/5 0/0 .text TRKConstructEvent */ #pragma push @@ -53,7 +47,7 @@ asm void TRKConstructEvent() { /* ############################################################################################## */ /* 8044D890-8044D8B8 07A5B0 0028+00 3/3 0/0 0/0 .bss gTRKEventQueue */ -static u8 gTRKEventQueue[40]; +static s32 gTRKEventQueue[10]; /* 8036CC54-8036CD34 367594 00E0+00 0/0 5/5 0/0 .text TRKPostEvent */ #pragma push @@ -76,11 +70,12 @@ asm void TRKGetNextEvent() { #pragma pop /* 8036CDE8-8036CE40 367728 0058+00 0/0 1/1 0/0 .text TRKInitializeEventQueue */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void TRKInitializeEventQueue() { - nofralloc -#include "asm/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/nubevent/TRKInitializeEventQueue.s" +u8 TRKInitializeEventQueue() { + TRKInitializeMutex(&gTRKEventQueue); + TRKAcquireMutex(&gTRKEventQueue); + gTRKEventQueue[1] = 0; + gTRKEventQueue[2] = 0; + gTRKEventQueue[9] = 0x100; + TRKReleaseMutex(); + return 0; } -#pragma pop diff --git a/libs/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/nubinit.c b/libs/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/nubinit.c index 5ccaf088b6..7ebb145e56 100644 --- a/libs/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/nubinit.c +++ b/libs/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/nubinit.c @@ -20,7 +20,7 @@ u8 TRKInitializeDispatcher(); void TRKTargetSetInputPendingPtr(); void TRKInitializeTarget(); void InitializeProgramEndTrap(); -void TRK_board_display(); +void TRK_board_display(const char*); void TRKInitializeIntDrivenUART(); void MWTRACE(); extern u8 gTRKInputPendingPtr[4 + 4 /* padding */]; @@ -45,14 +45,10 @@ asm void TRKNubWelcome(void) { #pragma pop /* 8036CE68-8036CE8C 3677A8 0024+00 0/0 1/1 0/0 .text TRKTerminateNub */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm s32 TRKTerminateNub(void) { - nofralloc -#include "asm/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/nubinit/TRKTerminateNub.s" +s32 TRKTerminateNub(void) { + TRKTerminateSerialHandler(); + return 0; } -#pragma pop /* ############################################################################################## */ /* 803A26A4-803A26B8 02ED04 0010+04 1/1 0/0 0/0 .rodata @154 */ @@ -60,8 +56,8 @@ SECTION_RODATA static char const lit_154[] = "Initialize NUB\n"; COMPILER_STRIP_GATE(0x803A26A4, &lit_154); /* 8044D8B8-8044D8C0 07A5D8 0004+04 1/1 4/4 0/0 .bss gTRKBigEndian */ -SECTION_BSS extern u8 gTRKBigEndian[4 + 4 /* padding */]; -SECTION_BSS u8 gTRKBigEndian[4 + 4 /* padding */]; +SECTION_BSS extern BOOL gTRKBigEndian; +SECTION_BSS BOOL gTRKBigEndian; /* 8036CE8C-8036CFD8 3677CC 014C+00 0/0 1/1 0/0 .text TRKInitializeNub */ #pragma push diff --git a/libs/TRK_MINNOW_DOLPHIN/Os/dolphin/dolphin_trk.c b/libs/TRK_MINNOW_DOLPHIN/Os/dolphin/dolphin_trk.c index c65da3b2b7..f0f94d0809 100644 --- a/libs/TRK_MINNOW_DOLPHIN/Os/dolphin/dolphin_trk.c +++ b/libs/TRK_MINNOW_DOLPHIN/Os/dolphin/dolphin_trk.c @@ -4,6 +4,7 @@ // #include "TRK_MINNOW_DOLPHIN/Os/dolphin/dolphin_trk.h" +#include "TRK_MINNOW_DOLPHIN/ppc/Generic/targimpl.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -15,9 +16,9 @@ void InitMetroTRK(); void InitMetroTRK_BBA(); void TRK__write_aram(); void TRK__read_aram(); -void TRKInitializeTarget(); +int TRKInitializeTarget(); void __TRK_copy_vectors(); -void TRKTargetTranslate(); +u32 TRKTargetTranslate(); void EnableMetroTRKInterrupts(); // @@ -31,20 +32,19 @@ void ARStartDMA(); void __ARClearInterrupt(); void __ARGetInterruptStatus(); void TRK_flush_cache(); -void __TRK_get_MSR(); void TRKSaveExtended1Block(); void TRK_main(); void EnableEXI2Interrupts(); void InitMetroTRKCommTable(); -extern u8 gTRKState[164]; -extern u8 gTRKCPUState[1072]; +extern u32 gTRKState[41]; +extern u32 gTRKCPUState[268]; void regist__9daBgObj_cFP4dBgW(); // // Declarations: // -/* 80371560-803715F8 36BEA0 0098+00 0/0 1/1 0/0 .text InitMetroTRK */ +/* 80371560-803715F8 36BEA0 0098+00 0/0 1/1 0/0 .text InitMetroTRK */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -86,17 +86,15 @@ asm void TRK__read_aram() { /* ############################################################################################## */ /* 8044F810-8044F818 07C530 0004+04 3/3 0/0 0/0 .bss lc_base */ -SECTION_BSS static u8 lc_base[4 + 4 /* padding */]; +SECTION_BSS static u32 lc_base[1 + 1 /*padding*/]; -/* 803719AC-803719F8 36C2EC 004C+00 0/0 1/1 0/0 .text TRKInitializeTarget */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void TRKInitializeTarget() { - nofralloc -#include "asm/TRK_MINNOW_DOLPHIN/Os/dolphin/dolphin_trk/TRKInitializeTarget.s" +/* 803719AC-803719F8 36C2EC 004C+00 0/0 1/1 0/0 .text TRKInitializeTarget */ +int TRKInitializeTarget() { + gTRKState[38] = 1; + gTRKState[35] = __TRK_get_MSR(); + *lc_base = 0xE0000000; + return 0; } -#pragma pop /* ############################################################################################## */ /* 803D3268-803D32A8 030388 003C+04 1/1 0/0 0/0 .data TRK_ISR_OFFSETS */ @@ -179,21 +177,19 @@ asm void __TRK_copy_vectors() { #pragma pop /* 80371B24-80371B7C 36C464 0058+00 0/0 1/1 0/0 .text TRKTargetTranslate */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void TRKTargetTranslate() { - nofralloc -#include "asm/TRK_MINNOW_DOLPHIN/Os/dolphin/dolphin_trk/TRKTargetTranslate.s" +u32 TRKTargetTranslate(u32 param_0) { + if (param_0 >= *lc_base) { + if ((param_0 < *lc_base + 0x4000) && ((gTRKCPUState[142] & 3) != 0)) { + return param_0; + } + } + if ((0x7E000000 <= param_0) && (param_0 <= 0x80000000)) { + return param_0; + } + return param_0 & 0x3FFFFFFF | 0x80000000; } -#pragma pop -/* 80371B7C-80371B9C 36C4BC 0020+00 0/0 1/1 0/0 .text EnableMetroTRKInterrupts */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void EnableMetroTRKInterrupts() { - nofralloc -#include "asm/TRK_MINNOW_DOLPHIN/Os/dolphin/dolphin_trk/EnableMetroTRKInterrupts.s" +/* 80371B7C-80371B9C 36C4BC 0020+00 0/0 1/1 0/0 .text EnableMetroTRKInterrupts */ +void EnableMetroTRKInterrupts() { + EnableEXI2Interrupts(); } -#pragma pop diff --git a/libs/TRK_MINNOW_DOLPHIN/utils/common/CircleBuffer.c b/libs/TRK_MINNOW_DOLPHIN/utils/common/CircleBuffer.c index 593a601247..d8b43fe108 100644 --- a/libs/TRK_MINNOW_DOLPHIN/utils/common/CircleBuffer.c +++ b/libs/TRK_MINNOW_DOLPHIN/utils/common/CircleBuffer.c @@ -1,70 +1,78 @@ -// -// Generated By: dol2asm // Translation Unit: utils/common/CircleBuffer -// #include "TRK_MINNOW_DOLPHIN/utils/common/CircleBuffer.h" -#include "dol2asm.h" +#include "TRK_MINNOW_DOLPHIN/utils/gc/MWCriticalSection_gc.h" #include "dolphin/types.h" -// -// Forward References: -// - -void CircleBufferReadBytes(); -void CircleBufferWriteBytes(); -void CircleBufferInitialize(); -void CBGetBytesAvailableForRead(); - -// -// External References: -// - -SECTION_INIT void memcpy(); -void MWExitCriticalSection(); -void MWEnterCriticalSection(); -void MWInitializeCriticalSection(); - -// -// Declarations: -// - /* 803726A0-803727A8 36CFE0 0108+00 0/0 2/2 0/0 .text CircleBufferReadBytes */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void CircleBufferReadBytes() { - nofralloc -#include "asm/TRK_MINNOW_DOLPHIN/utils/common/CircleBuffer/CircleBufferReadBytes.s" +s32 CircleBufferReadBytes(CircleBuffer* buf, u32 param_2, u32 param_3) { + int temp; + if (param_3 > buf->readBuf) { + return -1; + } else { + MWEnterCriticalSection(&buf->criticalSection); + temp = buf->field_0xc - (buf->field_0x0 - buf->field_0x8); + if (param_3 < temp) { + memcpy(param_2, buf->field_0x0, param_3); + buf->field_0x0 += param_3; + } else { + memcpy(param_2, buf->field_0x0, temp); + memcpy(param_2 + temp, buf->field_0x8, param_3 - temp); + buf->field_0x0 = buf->field_0x8 + param_3 - temp; + } + + if (buf->field_0xc == (buf->field_0x0 - buf->field_0x8)) { + buf->field_0x0 = buf->field_0x8; + } + + buf->field_0x14 += param_3; + buf->readBuf -= param_3; + MWExitCriticalSection(&buf->criticalSection); + return 0; + } } -#pragma pop /* 803727A8-803728B0 36D0E8 0108+00 0/0 4/4 0/0 .text CircleBufferWriteBytes */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void CircleBufferWriteBytes() { - nofralloc -#include "asm/TRK_MINNOW_DOLPHIN/utils/common/CircleBuffer/CircleBufferWriteBytes.s" +s32 CircleBufferWriteBytes(CircleBuffer* buf, s32 param_2, u32 param_3) { + s32 temp; + + if (param_3 > buf->field_0x14) { + return -1; + } else { + MWEnterCriticalSection(&buf->criticalSection); + temp = buf->field_0xc - (buf->field_0x4 - buf->field_0x8); + if (temp >= param_3) { + memcpy(buf->field_0x4, param_2, param_3); + buf->field_0x4 += param_3; + } else { + memcpy(buf->field_0x4, param_2, temp); + memcpy(buf->field_0x8, param_2 + temp, param_3 - temp); + buf->field_0x4 = buf->field_0x8 + param_3 - temp; + } + + if (buf->field_0xc == (buf->field_0x4 - buf->field_0x8)) { + buf->field_0x4 = buf->field_0x8; + } + + buf->field_0x14 -= param_3; + buf->readBuf += param_3; + MWExitCriticalSection(&buf->criticalSection); + return 0; + } } -#pragma pop /* 803728B0-80372900 36D1F0 0050+00 0/0 2/2 0/0 .text CircleBufferInitialize */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void CircleBufferInitialize() { - nofralloc -#include "asm/TRK_MINNOW_DOLPHIN/utils/common/CircleBuffer/CircleBufferInitialize.s" +void CircleBufferInitialize(CircleBuffer* buf, s32 param_2, s32 param_3) { + buf->field_0x8 = param_2; + buf->field_0xc = param_3; + buf->field_0x0 = buf->field_0x8; + buf->field_0x4 = buf->field_0x8; + buf->readBuf = 0; + buf->field_0x14 = buf->field_0xc; + MWInitializeCriticalSection(&buf->criticalSection); } -#pragma pop /* 80372900-80372908 36D240 0008+00 0/0 2/2 0/0 .text CBGetBytesAvailableForRead */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void CBGetBytesAvailableForRead() { - nofralloc -#include "asm/TRK_MINNOW_DOLPHIN/utils/common/CircleBuffer/CBGetBytesAvailableForRead.s" +s32 CBGetBytesAvailableForRead(CircleBuffer* buf) { + return buf->readBuf; } -#pragma pop diff --git a/libs/TRK_MINNOW_DOLPHIN/utils/gc/MWCriticalSection_gc.c b/libs/TRK_MINNOW_DOLPHIN/utils/gc/MWCriticalSection_gc.c index 80fab2ebb7..8e3633acff 100644 --- a/libs/TRK_MINNOW_DOLPHIN/utils/gc/MWCriticalSection_gc.c +++ b/libs/TRK_MINNOW_DOLPHIN/utils/gc/MWCriticalSection_gc.c @@ -12,20 +12,9 @@ void MWExitCriticalSection(u32* section) { } /* 80372CC8-80372CF8 36D608 0030+00 0/0 2/2 0/0 .text MWEnterCriticalSection */ -#ifdef NONMATCHING void MWEnterCriticalSection(u32* section) { *section = OSDisableInterrupts(); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void MWEnterCriticalSection(u32* section) { - nofralloc -#include "asm/TRK_MINNOW_DOLPHIN/utils/gc/MWCriticalSection_gc/MWEnterCriticalSection.s" -} -#pragma pop -#endif /* 80372CF8-80372CFC 36D638 0004+00 0/0 1/1 0/0 .text MWInitializeCriticalSection */ void MWInitializeCriticalSection() {} diff --git a/rel/d/a/d_a_title/d_a_title_nonmatching.cpp b/rel/d/a/d_a_title/d_a_title_nonmatching.cpp index d587c93b3d..001404baf5 100644 --- a/rel/d/a/d_a_title/d_a_title_nonmatching.cpp +++ b/rel/d/a/d_a_title/d_a_title_nonmatching.cpp @@ -4,7 +4,11 @@ // #include "rel/d/a/d_a_title/d_a_title.h" +#include "JSystem/J2DGraph/J2DScreen.h" +#include "JSystem/J2DGraph/J2DTextBox.h" +#include "JSystem/JKernel/JKRExpHeap.h" #include "JSystem/JKernel/JKRHeap.h" +#include "JSystem/JKernel/JKRMemArchive.h" #include "JSystem/JStudio/JStudio/stb.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -12,6 +16,10 @@ #include "f_op/f_op_actor_mng.h" #include "f_op/f_op_overlap_mng.h" #include "f_op/f_op_msg_mng.h" +#include "d/pane/d_pane_class_alpha.h" +#include "d/menu/d_menu_collect.h" +#include "m_Do/m_Do_Reset.h" +#include "m_Do/m_Do_controller_pad.h" // // Types: @@ -186,7 +194,6 @@ extern "C" void _savegpr_26(); extern "C" void _savegpr_29(); extern "C" void _restgpr_26(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; extern "C" u8 m_cpadInfo__8mDoCPd_c[256]; extern "C" f32 mViewOffsetY__17dMenu_Collect3D_c[1 + 1 /* padding */]; extern "C" u8 mFader__13mDoGph_gInf_c[4]; @@ -468,8 +475,6 @@ void daTitle_c::nextScene_init() { } /* 80D67550-80D675EC 000B30 009C+00 1/0 0/0 0/0 .text nextScene_proc__9daTitle_cFv */ -// setFadeColor store order issue -#ifdef NONMATCHING void daTitle_c::nextScene_proc() { if (!fopOvlpM_IsPeek() && !mDoRst::isReset()) { scene_class* playScene = fopScnM_SearchByID(dStage_roomControl_c::getProcID()); @@ -477,16 +482,6 @@ void daTitle_c::nextScene_proc() { mDoGph_gInf_c::setFadeColor(*(JUtility::TColor*)&g_blackColor); } } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTitle_c::nextScene_proc() { - nofralloc -#include "asm/rel/d/a/d_a_title/d_a_title/nextScene_proc__9daTitle_cFv.s" -} -#pragma pop -#endif /* 80D675EC-80D676AC 000BCC 00C0+00 1/1 0/0 0/0 .text fastLogoDispInit__9daTitle_cFv */ void daTitle_c::fastLogoDispInit() { diff --git a/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl.cpp b/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl.cpp index d7b8dff527..3918423618 100644 --- a/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl.cpp +++ b/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl.cpp @@ -1,292 +1,133 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_digholl -// +/** + * d_a_obj_digholl.cpp + * Object - Dig Hole + */ #include "rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl.h" -#include "dol2asm.h" -#include "dolphin/types.h" - -// -// Types: -// - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct cXyz {}; - -struct daPy_py_c { - /* 8015F4F0 */ void setLookPos(cXyz*); -}; - -struct daObjDigholl_c { - /* 80BDC618 */ void create(); - /* 80BDC75C */ ~daObjDigholl_c(); - /* 80BDC7D8 */ void execute(); - /* 80BDCB0C */ bool draw(); -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct _GXColor {}; - -struct dPa_control_c { - /* 8004D1B8 */ void setSimple(u16, cXyz const*, dKy_tevstr_c const*, u8, _GXColor const&, - _GXColor const&, int, f32); -}; - -// -// Forward References: -// - -extern "C" void create__14daObjDigholl_cFv(); -extern "C" static void daObjDigholl_Create__FP10fopAc_ac_c(); -extern "C" void __dt__14daObjDigholl_cFv(); -extern "C" static void daObjDigholl_Delete__FP14daObjDigholl_c(); -extern "C" void execute__14daObjDigholl_cFv(); -extern "C" static void daObjDigholl_Execute__FP14daObjDigholl_c(); -extern "C" bool draw__14daObjDigholl_cFv(); -extern "C" static void daObjDigholl_Draw__FP14daObjDigholl_c(); -extern "C" extern void* g_profile_Obj_Digholl[12]; - -// -// External References: -// - -extern "C" void __ct__10fopAc_ac_cFv(); -extern "C" void __dt__10fopAc_ac_cFv(); -extern "C" void fopAcM_SetMin__FP10fopAc_ac_cfff(); -extern "C" void fopAcM_SetMax__FP10fopAc_ac_cfff(); -extern "C" void onSwitch__10dSv_info_cFii(); -extern "C" void isSwitch__10dSv_info_cCFii(); -extern "C" void setSimple__13dPa_control_cFUsPC4cXyzPC12dKy_tevstr_cUcRC8_GXColorRC8_GXColorif(); -extern "C" void setLookPos__9daPy_py_cFP4cXyz(); -extern "C" void cLib_distanceAngleS__Fss(); -extern "C" void __dl__FPv(); -extern "C" void PSVECSquareDistance(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u32 g_whiteColor; -extern "C" extern u32 __float_nan; - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 80BDCB3C-80BDCB40 000000 0004+00 2/2 0/0 0/0 .rodata @3678 */ -SECTION_RODATA static f32 const lit_3678 = -60.0f; -COMPILER_STRIP_GATE(0x80BDCB3C, &lit_3678); - -/* 80BDCB40-80BDCB44 000004 0004+00 0/2 0/0 0/0 .rodata @3679 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3679[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x80BDCB40, &lit_3679); -#pragma pop - -/* 80BDCB44-80BDCB48 000008 0004+00 0/1 0/0 0/0 .rodata @3680 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3680 = -100.0f; -COMPILER_STRIP_GATE(0x80BDCB44, &lit_3680); -#pragma pop - -/* 80BDCB48-80BDCB4C 00000C 0004+00 0/1 0/0 0/0 .rodata @3681 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3681 = 60.0f; -COMPILER_STRIP_GATE(0x80BDCB48, &lit_3681); -#pragma pop - -/* 80BDCB4C-80BDCB50 000010 0004+00 0/1 0/0 0/0 .rodata @3682 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3682 = 10.0f; -COMPILER_STRIP_GATE(0x80BDCB4C, &lit_3682); -#pragma pop - -/* 80BDCB50-80BDCB54 000014 0004+00 0/1 0/0 0/0 .rodata @3683 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3683 = 100.0f; -COMPILER_STRIP_GATE(0x80BDCB50, &lit_3683); -#pragma pop +#include "JSystem/JKernel/JKRHeap.h" +#include "d/a/d_a_player.h" +#include "d/com/d_com_inf_game.h" +#include "d/d_procname.h" +#include "f_op/f_op_actor_mng.h" /* 80BDC618-80BDC73C 000078 0124+00 1/1 0/0 0/0 .text create__14daObjDigholl_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjDigholl_c::create() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl/create__14daObjDigholl_cFv.s" +int daObjDigholl_c::create() { + if (!fopAcM_CheckCondition(this, 8)) { + new (this) daObjDigholl_c(); + fopAcM_OnCondition(this, 8); + } + field_0x569 = fopAcM_GetParam(this); + field_0x56a = fopAcM_GetParam(this) >> 8; + field_0x56c = fopAcM_GetParam(this) >> 0x10 & 0xff; + if (field_0x56c == 0xff) { + field_0x56c = -1; + } + if (i_fopAcM_isSwitch(this, field_0x569)) { + field_0x568 = 2; + field_0x56b = 1; + } + fopAcM_SetMin(this, -60.0f, 0.0f, -100.0f); + fopAcM_SetMax(this, 60.0f, 10.0f, 100.0f); + mAttentionInfo.mPosition = current.pos; + mEyePos = mAttentionInfo.mPosition; + mAttentionInfo.field_0x4[3] = 0x20; + return cPhs_COMPLEATE_e; } -#pragma pop -/* 80BDC73C-80BDC75C 00019C 0020+00 1/0 0/0 0/0 .text daObjDigholl_Create__FP10fopAc_ac_c - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjDigholl_Create(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl/daObjDigholl_Create__FP10fopAc_ac_c.s" +/* 80BDC73C-80BDC75C 00019C 0020+00 1/0 0/0 0/0 .text daObjDigholl_Create__FP10fopAc_ac_c */ +static int daObjDigholl_Create(fopAc_ac_c* i_this) { + return static_cast(i_this)->create(); } -#pragma pop /* 80BDC75C-80BDC7B0 0001BC 0054+00 1/1 0/0 0/0 .text __dt__14daObjDigholl_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daObjDigholl_c::~daObjDigholl_c() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl/__dt__14daObjDigholl_cFv.s" -} -#pragma pop +daObjDigholl_c::~daObjDigholl_c() {} /* 80BDC7B0-80BDC7D8 000210 0028+00 1/0 0/0 0/0 .text daObjDigholl_Delete__FP14daObjDigholl_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjDigholl_Delete(daObjDigholl_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl/daObjDigholl_Delete__FP14daObjDigholl_c.s" +static int daObjDigholl_Delete(daObjDigholl_c* i_this) { + i_this->~daObjDigholl_c(); + return 1; } -#pragma pop - -/* ############################################################################################## */ -/* 80BDCB54-80BDCB58 000018 0004+00 0/1 0/0 0/0 .rodata @3793 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3793 = 40.0f; -COMPILER_STRIP_GATE(0x80BDCB54, &lit_3793); -#pragma pop - -/* 80BDCB58-80BDCB5C 00001C 0004+00 0/1 0/0 0/0 .rodata @3794 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3794 = 35.0f; -COMPILER_STRIP_GATE(0x80BDCB58, &lit_3794); -#pragma pop - -/* 80BDCB5C-80BDCB60 000020 0004+00 0/1 0/0 0/0 .rodata @3795 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3795 = 250000.0f; -COMPILER_STRIP_GATE(0x80BDCB5C, &lit_3795); -#pragma pop - -/* 80BDCB60-80BDCB64 000024 0004+00 0/1 0/0 0/0 .rodata @3796 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3796 = 200.0f; -COMPILER_STRIP_GATE(0x80BDCB60, &lit_3796); -#pragma pop - -/* 80BDCB64-80BDCB6C 000028 0008+00 0/1 0/0 0/0 .rodata @3797 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3797[8] = { - 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80BDCB64, &lit_3797); -#pragma pop - -/* 80BDCB6C-80BDCB74 000030 0008+00 0/1 0/0 0/0 .rodata @3798 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3798[8] = { - 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80BDCB6C, &lit_3798); -#pragma pop - -/* 80BDCB74-80BDCB7C 000038 0008+00 0/1 0/0 0/0 .rodata @3799 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3799[8] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80BDCB74, &lit_3799); -#pragma pop - -/* 80BDCB7C-80BDCB80 000040 0004+00 0/1 0/0 0/0 .rodata @3800 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3800 = 1000.0f; -COMPILER_STRIP_GATE(0x80BDCB7C, &lit_3800); -#pragma pop /* 80BDC7D8-80BDCAEC 000238 0314+00 1/1 0/0 0/0 .text execute__14daObjDigholl_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjDigholl_c::execute() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl/execute__14daObjDigholl_cFv.s" +int daObjDigholl_c::execute() { + daPy_py_c* player = daPy_getLinkPlayerActorClass(); + if (player->i_checkNowWolf() && + (field_0x56a == 0xff || i_fopAcM_isSwitch(this, field_0x56a)) && + (f32)fabsf(current.pos.y - player->current.pos.y) < 40.0f) + { + mAttentionInfo.mFlags = 0x80; + } else { + mAttentionInfo.mFlags = 0; + } + if (field_0x568 == 1) { + if (cLib_distanceAngleS(player->shape_angle.y, shape_angle.y) < 0x6000) { + shape_angle.y = player->shape_angle.y + 0x10000 - 0x8000; + current.angle.y = shape_angle.y; + } + i_fopAcM_onSwitch(this, field_0x569); + + if (i_dComIfGp_event_runCheck()) { + if (player->getBaseAnimeFrame() > 35.0f) { + field_0x56b = 1; + } + } else { + field_0x568 = 2; + field_0x56b = 1; + } + } else { + if ((player->current.pos.abs2XZ(current.pos) < 250000.0f) && + (fabsf(current.pos.y - player->current.pos.y) < 200.0f)) + { + daPy_py_c::setLookPos(&mAttentionInfo.mPosition); + } + } + + if (player->current.pos.abs(current.pos) < 1000.0f) { + dComIfGp_particle_setSimple(0x70f, ¤t.pos, 0xff, g_whiteColor, g_whiteColor, NULL, + 0.0f); + dComIfGp_particle_setSimple(0x73d, ¤t.pos, 0xff, g_whiteColor, g_whiteColor, NULL, + 0.0f); + } + + return 1; } -#pragma pop /* 80BDCAEC-80BDCB0C 00054C 0020+00 1/0 0/0 0/0 .text daObjDigholl_Execute__FP14daObjDigholl_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjDigholl_Execute(daObjDigholl_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl/daObjDigholl_Execute__FP14daObjDigholl_c.s" +static int daObjDigholl_Execute(daObjDigholl_c* i_this) { + return i_this->execute(); } -#pragma pop /* 80BDCB0C-80BDCB14 00056C 0008+00 1/1 0/0 0/0 .text draw__14daObjDigholl_cFv */ -bool daObjDigholl_c::draw() { - return true; +int daObjDigholl_c::draw() { + return 1; } /* 80BDCB14-80BDCB34 000574 0020+00 1/0 0/0 0/0 .text daObjDigholl_Draw__FP14daObjDigholl_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjDigholl_Draw(daObjDigholl_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl/daObjDigholl_Draw__FP14daObjDigholl_c.s" +static int daObjDigholl_Draw(daObjDigholl_c* i_this) { + return i_this->draw(); } -#pragma pop -/* ############################################################################################## */ /* 80BDCB80-80BDCBA0 -00001 0020+00 1/0 0/0 0/0 .data l_daObjDigholl_Method */ -SECTION_DATA static void* l_daObjDigholl_Method[8] = { - (void*)daObjDigholl_Create__FP10fopAc_ac_c, - (void*)daObjDigholl_Delete__FP14daObjDigholl_c, - (void*)daObjDigholl_Execute__FP14daObjDigholl_c, - (void*)NULL, - (void*)daObjDigholl_Draw__FP14daObjDigholl_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObjDigholl_Method = { + (process_method_func)daObjDigholl_Create, (process_method_func)daObjDigholl_Delete, + (process_method_func)daObjDigholl_Execute, (process_method_func)NULL, + (process_method_func)daObjDigholl_Draw, }; /* 80BDCBA0-80BDCBD0 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Digholl */ -SECTION_DATA extern void* g_profile_Obj_Digholl[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00520000, (void*)&g_fpcLf_Method, - (void*)0x00000570, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x00F90000, (void*)&l_daObjDigholl_Method, - (void*)0x00044100, (void*)0x030E0000, +extern actor_process_profile_definition g_profile_Obj_Digholl = { + -3, + 3, + -3, + PROC_Obj_Digholl, + &g_fpcLf_Method.mBase, + sizeof(daObjDigholl_c), + 0, + 0, + &g_fopAc_Method.base, + 0x00F9, + &l_daObjDigholl_Method, + 0x00044100, + 3, + 14, }; diff --git a/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs.cpp b/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs.cpp index 42dc358db9..408f98d579 100644 --- a/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs.cpp +++ b/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs.cpp @@ -1,321 +1,153 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_kjgjs -// +/** + * d_a_obj_kjgjs.cpp + * Object - Kjgjs + */ #include "rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs.h" -#include "dol2asm.h" -#include "dolphin/types.h" +#include "JSystem/JKernel/JKRHeap.h" +#include "d/bg/d_bg_w.h" +#include "d/d_procname.h" -// -// Types: -// +static const u32 l_dzbidx[2] = {8, 9}; +static const char* l_arcName = "K_jgjs"; -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - static u8 now[48]; -}; - -struct fopAc_ac_c { - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct daObjKJgjs_c { - /* 80C46098 */ void create1st(); - /* 80C4616C */ void setMtx(); - /* 80C461E4 */ void CreateHeap(); - /* 80C46264 */ void Create(); - /* 80C46310 */ void Execute(f32 (**)[3][4]); - /* 80C46320 */ void Draw(); - /* 80C463C4 */ void Delete(); - /* 80C464CC */ ~daObjKJgjs_c(); -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct cXyz {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dBgW {}; - -struct cBgS_PolyInfo {}; - -struct csXyz {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct J3DModel {}; - -// -// Forward References: -// - -extern "C" void create1st__12daObjKJgjs_cFv(); -extern "C" void setMtx__12daObjKJgjs_cFv(); -extern "C" void CreateHeap__12daObjKJgjs_cFv(); -extern "C" void Create__12daObjKJgjs_cFv(); -extern "C" void Execute__12daObjKJgjs_cFPPA3_A4_f(); -extern "C" void Draw__12daObjKJgjs_cFv(); -extern "C" void Delete__12daObjKJgjs_cFv(); -extern "C" static void daObjKJgjs_create1st__FP12daObjKJgjs_c(); -extern "C" static void daObjKJgjs_MoveBGDelete__FP12daObjKJgjs_c(); -extern "C" static void daObjKJgjs_MoveBGExecute__FP12daObjKJgjs_c(); -extern "C" static void daObjKJgjs_MoveBGDraw__FP12daObjKJgjs_c(); -extern "C" void __dt__12daObjKJgjs_cFv(); -extern "C" extern char const* const d_a_obj_kjgjs__stringBase0; - -// -// External References: -// - -extern "C" void mDoMtx_XYZrotM__FPA4_fsss(); -extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); -extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(); -extern "C" void __dt__10fopAc_ac_cFv(); -extern "C" void fopAcM_setCullSizeBox__FP10fopAc_ac_cffffff(); -extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc(); -extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci(); -extern "C" void dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz(); -extern "C" void __ct__16dBgS_MoveBgActorFv(); -extern "C" bool IsDelete__16dBgS_MoveBgActorFv(); -extern "C" bool ToFore__16dBgS_MoveBgActorFv(); -extern "C" bool ToBack__16dBgS_MoveBgActorFv(); -extern "C" void -MoveBGCreate__16dBgS_MoveBgActorFPCciPFP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz_vUlPA3_A4_f(); -extern "C" void MoveBGDelete__16dBgS_MoveBgActorFv(); -extern "C" void MoveBGExecute__16dBgS_MoveBgActorFv(); -extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c(); -extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c(); -extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__16dBgS_MoveBgActor[10]; -extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 80C46544-80C4654C 000000 0008+00 1/1 0/0 0/0 .rodata l_dzbidx */ -SECTION_RODATA static u8 const l_dzbidx[8] = { - 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x09, -}; -COMPILER_STRIP_GATE(0x80C46544, &l_dzbidx); - -/* 80C46584-80C46584 000040 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80C46584 = "K_jgjs"; -#pragma pop - -/* 80C4658C-80C46590 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ -SECTION_DATA static void* l_arcName = (void*)&d_a_obj_kjgjs__stringBase0; +inline request_of_phase_process_class* daObjKJgjs_getRes(daObjKJgjs_c* i_kjgjs) { + daObjKJgjs_c* mpKjgjs = (daObjKJgjs_c*)i_kjgjs; + return i_kjgjs ? &mpKjgjs->mPhaseReq : (request_of_phase_process_class*)mpKjgjs; +} /* 80C46098-80C4616C 000078 00D4+00 1/1 0/0 0/0 .text create1st__12daObjKJgjs_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjKJgjs_c::create1st() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/create1st__12daObjKJgjs_cFv.s" +int daObjKJgjs_c::create1st() { + int phase = dComIfG_resLoad(daObjKJgjs_getRes(this), l_arcName); + if (phase == cPhs_COMPLEATE_e) { + setMtx(); + field_0x60c = getType(); + if (field_0x60c < 0) { + field_0x60c = 0; + } else if (field_0x60c > 2) { + field_0x60c = 1; + } + phase = MoveBGCreate(l_arcName, l_dzbidx[field_0x60c], dBgS_MoveBGProc_TypicalRotY, 0x47f0, + &mMtx[0]); + + if (phase == cPhs_ERROR_e) { + return phase; + } + } + return phase; } -#pragma pop /* 80C4616C-80C461E4 00014C 0078+00 1/1 0/0 0/0 .text setMtx__12daObjKJgjs_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjKJgjs_c::setMtx() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/setMtx__12daObjKJgjs_cFv.s" +void daObjKJgjs_c::setMtx() { + mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); + mDoMtx_stack_c::XYZrotM(current.angle.x, current.angle.y, current.angle.z); + PSMTXCopy(mDoMtx_stack_c::now, mMtx[1]); + PSMTXCopy(mDoMtx_stack_c::now, mMtx[0]); } -#pragma pop -/* ############################################################################################## */ /* 80C4654C-80C46554 000008 0008+00 1/1 0/0 0/0 .rodata l_bmdidx */ -SECTION_RODATA static u8 const l_bmdidx[8] = { - 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x05, -}; -COMPILER_STRIP_GATE(0x80C4654C, &l_bmdidx); +static const u32 l_bmdidx[2] = {4, 5}; /* 80C461E4-80C46264 0001C4 0080+00 1/0 0/0 0/0 .text CreateHeap__12daObjKJgjs_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjKJgjs_c::CreateHeap() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/CreateHeap__12daObjKJgjs_cFv.s" +int daObjKJgjs_c::CreateHeap() { + mpModel = mDoExt_J3DModel__create( + (J3DModelData*)dComIfG_getObjectRes(l_arcName, l_bmdidx[field_0x60c]), 0x80000, 0x11000084); + return mpModel != NULL ? 1 : 0; } -#pragma pop -/* ############################################################################################## */ -/* 80C46554-80C46584 000010 0030+00 1/1 0/0 0/0 .rodata l_cull_box */ -SECTION_RODATA static u8 const l_cull_box[48] = { - 0xC4, 0x9D, 0x80, 0x00, 0xC5, 0x3E, 0xA0, 0x00, 0xC4, 0x9D, 0x80, 0x00, 0x44, 0x9D, 0x80, 0x00, - 0x45, 0x2F, 0x00, 0x00, 0x44, 0x9D, 0x80, 0x00, 0xC2, 0x98, 0xBD, 0x71, 0xC1, 0x2D, 0x47, 0xAE, - 0xC2, 0x9D, 0x05, 0x1F, 0x42, 0x97, 0x0A, 0x3D, 0x41, 0x2F, 0x33, 0x33, 0x42, 0x9C, 0x1E, 0xB8, +static const Vec l_cull_box[4] = { + {-1260.0f, -3050.0f, -1260.0f}, + {1260.0f, 2800.0f, 1260.0f}, + {-76.37f, -10.83f, -78.51}, + {75.52f, 10.95f, 78.06f}, }; -COMPILER_STRIP_GATE(0x80C46554, &l_cull_box); /* 80C46264-80C46310 000244 00AC+00 1/0 0/0 0/0 .text Create__12daObjKJgjs_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjKJgjs_c::Create() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/Create__12daObjKJgjs_cFv.s" +int daObjKJgjs_c::Create() { + fopAcM_SetMtx(this, mMtx[1]); + PSMTXCopy(mMtx[1], mpModel->mBaseTransformMtx); + dBgW* mpBgW = field_0x568; + mpBgW->field_0x91 |= 4; + if (!field_0x60c) { + fopAcM_setCullSizeBox(this, l_cull_box[0].x, l_cull_box[0].y, l_cull_box[0].z, + l_cull_box[1].x, l_cull_box[1].y, l_cull_box[1].z); + } else { + fopAcM_setCullSizeBox(this, l_cull_box[2].x, l_cull_box[2].y, l_cull_box[2].z, + l_cull_box[3].x, l_cull_box[3].y, l_cull_box[3].z); + } + return 1; } -#pragma pop -/* 80C46310-80C46320 0002F0 0010+00 1/0 0/0 0/0 .text Execute__12daObjKJgjs_cFPPA3_A4_f - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjKJgjs_c::Execute(f32 (**param_0)[3][4]) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/Execute__12daObjKJgjs_cFPPA3_A4_f.s" +/* 80C46310-80C46320 0002F0 0010+00 1/0 0/0 0/0 .text Execute__12daObjKJgjs_cFPPA3_A4_f */ +int daObjKJgjs_c::Execute(f32 (**i_mtx)[3][4]) { + *i_mtx = mMtx; + return 1; } -#pragma pop /* 80C46320-80C463C4 000300 00A4+00 1/0 0/0 0/0 .text Draw__12daObjKJgjs_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjKJgjs_c::Draw() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/Draw__12daObjKJgjs_cFv.s" +int daObjKJgjs_c::Draw() { + g_env_light.settingTevStruct(0x10, ¤t.pos, &mTevStr); + g_env_light.setLightTevColorType_MAJI(mpModel, &mTevStr); + dComIfGd_setListBG(); + mDoExt_modelUpdateDL(mpModel); + dComIfGd_setList(); + return 1; } -#pragma pop /* 80C463C4-80C46400 0003A4 003C+00 1/0 0/0 0/0 .text Delete__12daObjKJgjs_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjKJgjs_c::Delete() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/Delete__12daObjKJgjs_cFv.s" +int daObjKJgjs_c::Delete() { + dComIfG_resDelete(daObjKJgjs_getRes(this), l_arcName); + return 1; } -#pragma pop -/* ############################################################################################## */ +/* 80C46400-80C46460 0003E0 0060+00 1/0 0/0 0/0 .text daObjKJgjs_create1st__FP12daObjKJgjs_c */ +static int daObjKJgjs_create1st(daObjKJgjs_c* i_this) { + if (!fopAcM_CheckCondition(i_this, 8)) { + new (i_this) daObjKJgjs_c(); + fopAcM_OnCondition(i_this, 8); + } + return i_this->create1st(); +} + +/* 80C46460-80C46480 000440 0020+00 1/0 0/0 0/0 .text daObjKJgjs_MoveBGDelete__FP12daObjKJgjs_c */ +static int daObjKJgjs_MoveBGDelete(daObjKJgjs_c* i_this) { + return static_cast(i_this)->MoveBGDelete(); +} + +/* 80C46480-80C464A0 000460 0020+00 1/0 0/0 0/0 .text daObjKJgjs_MoveBGExecute__FP12daObjKJgjs_c*/ +static int daObjKJgjs_MoveBGExecute(daObjKJgjs_c* i_this) { + return static_cast(i_this)->MoveBGExecute(); +} + +/* 80C464A0-80C464CC 000480 002C+00 1/0 0/0 0/0 .text daObjKJgjs_MoveBGDraw__FP12daObjKJgjs_c */ +static int daObjKJgjs_MoveBGDraw(daObjKJgjs_c* i_this) { + return static_cast(i_this)->MoveBGDraw(); +} + +/* 80C464CC-80C4653C 0004AC 0070+00 1/0 0/0 0/0 .text __dt__12daObjKJgjs_cFv */ +daObjKJgjs_c::~daObjKJgjs_c() {} + /* 80C46590-80C465B0 -00001 0020+00 1/0 0/0 0/0 .data daObjKJgjs_METHODS */ -SECTION_DATA static void* daObjKJgjs_METHODS[8] = { - (void*)daObjKJgjs_create1st__FP12daObjKJgjs_c, - (void*)daObjKJgjs_MoveBGDelete__FP12daObjKJgjs_c, - (void*)daObjKJgjs_MoveBGExecute__FP12daObjKJgjs_c, - (void*)NULL, - (void*)daObjKJgjs_MoveBGDraw__FP12daObjKJgjs_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class daObjKJgjs_METHODS = { + (process_method_func)daObjKJgjs_create1st, (process_method_func)daObjKJgjs_MoveBGDelete, + (process_method_func)daObjKJgjs_MoveBGExecute, (process_method_func)NULL, + (process_method_func)daObjKJgjs_MoveBGDraw, }; /* 80C465B0-80C465E0 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_KJgjs */ -SECTION_DATA extern void* g_profile_Obj_KJgjs[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00DD0000, (void*)&g_fpcLf_Method, - (void*)0x00000610, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02A50000, (void*)&daObjKJgjs_METHODS, - (void*)0x00040100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_KJgjs = { + -3, + 3, + -3, + PROC_Obj_KJgjs, + &g_fpcLf_Method.mBase, + sizeof(daObjKJgjs_c), + 0, + 0, + &g_fopAc_Method.base, + 0x02A5, + &daObjKJgjs_METHODS, + 0x00040100, + 0, + 14, }; - -/* 80C465E0-80C4660C 000054 002C+00 2/2 0/0 0/0 .data __vt__12daObjKJgjs_c */ -SECTION_DATA extern void* __vt__12daObjKJgjs_c[11] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)CreateHeap__12daObjKJgjs_cFv, - (void*)Create__12daObjKJgjs_cFv, - (void*)Execute__12daObjKJgjs_cFPPA3_A4_f, - (void*)Draw__12daObjKJgjs_cFv, - (void*)Delete__12daObjKJgjs_cFv, - (void*)IsDelete__16dBgS_MoveBgActorFv, - (void*)ToFore__16dBgS_MoveBgActorFv, - (void*)ToBack__16dBgS_MoveBgActorFv, - (void*)__dt__12daObjKJgjs_cFv, -}; - -/* 80C46400-80C46460 0003E0 0060+00 1/0 0/0 0/0 .text daObjKJgjs_create1st__FP12daObjKJgjs_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjKJgjs_create1st(daObjKJgjs_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/daObjKJgjs_create1st__FP12daObjKJgjs_c.s" -} -#pragma pop - -/* 80C46460-80C46480 000440 0020+00 1/0 0/0 0/0 .text daObjKJgjs_MoveBGDelete__FP12daObjKJgjs_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjKJgjs_MoveBGDelete(daObjKJgjs_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/daObjKJgjs_MoveBGDelete__FP12daObjKJgjs_c.s" -} -#pragma pop - -/* 80C46480-80C464A0 000460 0020+00 1/0 0/0 0/0 .text daObjKJgjs_MoveBGExecute__FP12daObjKJgjs_c - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjKJgjs_MoveBGExecute(daObjKJgjs_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/daObjKJgjs_MoveBGExecute__FP12daObjKJgjs_c.s" -} -#pragma pop - -/* 80C464A0-80C464CC 000480 002C+00 1/0 0/0 0/0 .text daObjKJgjs_MoveBGDraw__FP12daObjKJgjs_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjKJgjs_MoveBGDraw(daObjKJgjs_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/daObjKJgjs_MoveBGDraw__FP12daObjKJgjs_c.s" -} -#pragma pop - -/* 80C464CC-80C4653C 0004AC 0070+00 1/0 0/0 0/0 .text __dt__12daObjKJgjs_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daObjKJgjs_c::~daObjKJgjs_c() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs/__dt__12daObjKJgjs_cFv.s" -} -#pragma pop - -/* 80C46584-80C46584 000040 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/file/d_file_select.cpp b/src/d/file/d_file_select.cpp index de8ebe15e6..52707f9efd 100644 --- a/src/d/file/d_file_select.cpp +++ b/src/d/file/d_file_select.cpp @@ -19,6 +19,7 @@ #include "dolphin/types.h" #include "m_Do/m_Do_MemCard.h" #include "m_Do/m_Do_controller_pad.h" +#include "m_Do/m_Do_graphic.h" // @@ -1904,11 +1905,28 @@ SECTION_SDATA2 static f32 lit_4166[1 + 1 /* padding */] = { }; /* 801843CC-801844FC 17ED0C 0130+00 0/0 1/1 0/0 .text _create__14dFile_select_cFv */ +// Matches with literals #ifdef NONMATCHING void dFile_select_c::_create() { mDoGph_gInf_c::setFadeColor(static_cast(g_blackColor)); - mStick = new STControl(); + mStick = new STControl(2, 2, 1, 1, 0.9f, 0.5f, 0, 0x2000); g_fsHIO.field_0x0004 = -1; + for (int iVar2 = 0; iVar2 < 3; iVar2++) { + mDataNew[iVar2] = 0; + field_0x025b[iVar2] = 0; + } + + mSelectNum = 0; + dComIfGs_init(); + dComIfGp_itemDataInit(); + dComIfGs_setNewFile(0); + mHasDrawn = 0; + screenSet(); + screenSetCopySel(); + screenSet3Menu(); + screenSetYesNo(); + screenSetDetail(); + displayInit(); } #else #pragma push diff --git a/src/d/menu/d_menu_save.cpp b/src/d/menu/d_menu_save.cpp index 3891965541..520b913408 100644 --- a/src/d/menu/d_menu_save.cpp +++ b/src/d/menu/d_menu_save.cpp @@ -1883,7 +1883,7 @@ void dMenu_save_c::memCardMakeGameFileWait() { errorTxtSet(0x3C6); // An error might have occurred when creating a save file. mMenuProc = PROC_MEMCARD_COMMAND_END; } else if (mCmdState == 1) { - dComIfGs_setNewFile(1); + dComIfGs_setNewFile(dComIfGs_getNewFile() | 1); errorTxtSet(0x3C7); // A save file has been created. mMenuProc = PROC_MEMCARD_COMMAND_END; } diff --git a/src/d/menu/d_menu_window.cpp b/src/d/menu/d_menu_window.cpp index 5f4291ca6f..99ecf51c60 100644 --- a/src/d/menu/d_menu_window.cpp +++ b/src/d/menu/d_menu_window.cpp @@ -2436,39 +2436,16 @@ bool dMw_c::isPauseReady() { } /* 801FCE08-801FCE78 1F7748 0070+00 10/10 3/3 0/0 .text dMw_fade_out__5dMw_cFv */ -// instructions switched -#ifdef NONMATCHING void dMw_c::dMw_fade_out() { mDoGph_gInf_c::startFadeOut(13); mDoGph_gInf_c::setFadeColor(static_cast(g_blackColor)); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_c::dMw_fade_out() { - nofralloc -#include "asm/d/menu/d_menu_window/dMw_fade_out__5dMw_cFv.s" -} -#pragma pop -#endif /* 801FCE78-801FCEE8 1F77B8 0070+00 9/9 4/4 0/0 .text dMw_fade_in__5dMw_cFv */ -#ifdef NONMATCHING void dMw_c::dMw_fade_in() { mDoGph_gInf_c::startFadeIn(13); mDoGph_gInf_c::setFadeColor(static_cast(g_blackColor)); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_c::dMw_fade_in() { - nofralloc -#include "asm/d/menu/d_menu_window/dMw_fade_in__5dMw_cFv.s" -} -#pragma pop -#endif /* 801FCEE8-801FCF84 1F7828 009C+00 1/1 0/0 0/0 .text checkCStickTrigger__5dMw_cFv */ int dMw_c::checkCStickTrigger() { diff --git a/src/d/msg/d_msg_flow.cpp b/src/d/msg/d_msg_flow.cpp index ae8ddbd6ab..a3d75a80d5 100644 --- a/src/d/msg/d_msg_flow.cpp +++ b/src/d/msg/d_msg_flow.cpp @@ -18,6 +18,7 @@ #include "f_op/f_op_actor_mng.h" #include "f_op/f_op_msg_mng.h" #include "m_Do/m_Do_audio.h" +#include "m_Do/m_Do_graphic.h" // // Forward References: @@ -1559,36 +1560,50 @@ int dMsgFlow_c::query038(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, in /* 8024BDB0-8024BE4C 2466F0 009C+00 1/0 0/0 0/0 .text * query039__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int dMsgFlow_c::query039(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { - nofralloc -#include "asm/d/msg/d_msg_flow/query039__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s" +int dMsgFlow_c::query039(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { + u16 uVar2 = *(u16*)param_0->params; + u8 iVar4 = dComIfGs_getTmpReg(0xfbff); + u8 bombNum = dComIfGs_getBombNum(iVar4 - 1); + return dComIfGs_getBombMax(NORMAL_BOMB) >= bombNum + uVar2; } -#pragma pop /* 8024BE4C-8024BF50 24678C 0104+00 1/0 0/0 0/0 .text * query040__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int dMsgFlow_c::query040(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { - nofralloc -#include "asm/d/msg/d_msg_flow/query040__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s" +int dMsgFlow_c::query040(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { + s32 uVar7 = *(u16*)param_0->params; + u8 unaff_r30; + if (uVar7 >= 1 && uVar7 < 4) { + unaff_r30 = uVar7 - 1; + } else if (uVar7 == 4) { + if (dMeter2Info_getRentalBombBag() != 0xff) { + unaff_r30 = dMeter2Info_getRentalBombBag(); + } + } else { + unaff_r30 = dComIfGs_getTmpReg(0xfbff) - 1; + } + + u8 bombNum = dComIfGs_getBombNum(unaff_r30); + u8 uVar4 = dComIfGs_getItem((u8)(unaff_r30 + SLOT_15), 0); + u8 bombMax = dComIfGs_getBombMax(uVar4); + u8 rv; + if (bombNum == 0) { + rv = 0; + } else if (bombNum >= bombMax) { + rv = 2; + } else { + rv = 1; + } + return rv; } -#pragma pop /* 8024BF50-8024BFEC 246890 009C+00 1/0 0/0 0/0 .text * query041__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int dMsgFlow_c::query041(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { - nofralloc -#include "asm/d/msg/d_msg_flow/query041__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s" +int dMsgFlow_c::query041(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { + u16 uVar2 = *(u16*)param_0->params; + u8 iVar4 = dComIfGs_getTmpReg(0xfbff); + u8 bombNum = dComIfGs_getBombNum(iVar4 - 1); + return dComIfGs_getBombMax(WATER_BOMB) >= bombNum + uVar2; } -#pragma pop /* 8024BFEC-8024C0A8 24692C 00BC+00 1/0 0/0 0/0 .text * query042__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */ @@ -1627,14 +1642,23 @@ int dMsgFlow_c::query044(mesg_flow_node_branch*, fopAc_ac_c*, int) { /* 8024C18C-8024C218 246ACC 008C+00 1/0 0/0 0/0 .text * query045__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int dMsgFlow_c::query045(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { - nofralloc -#include "asm/d/msg/d_msg_flow/query045__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s" +int dMsgFlow_c::query045(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { + u8 insectNum = dComIfGs_checkGetInsectNum(); + u8 rv = 0; + if (insectNum == 0) { + rv = 0; + } else if (insectNum >= 1 && insectNum <= 11) { + rv = 1; + } else if (insectNum >= 12 && insectNum <= 22) { + rv = 2; + } else if (insectNum == 23) { + rv = 3; + } else if (insectNum == 24) { + rv = 4; + } + + return rv; } -#pragma pop /* 8024C218-8024C248 246B58 0030+00 1/0 0/0 0/0 .text * query046__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */ @@ -2094,6 +2118,12 @@ int dMsgFlow_c::event020(mesg_flow_node_event* flow_node, fopAc_ac_c* actor) { /* 8024CD84-8024CDAC 2476C4 0028+00 1/0 0/0 0/0 .text * event021__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c */ +#ifdef NONMATCHING +int dMsgFlow_c::event021(mesg_flow_node_event* param_0, fopAc_ac_c* param_1) { + cLib_calcTimer(&field_0x3c); + return 1; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -2102,6 +2132,7 @@ asm int dMsgFlow_c::event021(mesg_flow_node_event* param_0, fopAc_ac_c* param_1) #include "asm/d/msg/d_msg_flow/event021__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s" } #pragma pop +#endif /* ############################################################################################## */ /* 80454DA8-80454DAC 0033A8 0004+00 1/1 0/0 0/0 .sdata2 @6273 */ @@ -2435,6 +2466,29 @@ asm int dMsgFlow_c::event032(mesg_flow_node_event* param_0, fopAc_ac_c* param_1) /* 8024D6BC-8024D788 247FFC 00CC+00 1/0 0/0 0/0 .text * event033__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c */ +#ifdef NONMATCHING +// Matches with literals +int dMsgFlow_c::event033(mesg_flow_node_event* param_0, fopAc_ac_c* param_1) { + u16 uVar1; + u16 uVar2; + GXColor color; + + getParam(&uVar2, &uVar1, param_0->params); + if (uVar1 + 1 == field_0x3c) { + if (uVar2 == 0) { + color.r = 0; + color.g = 0; + color.b = 0; + color.a = 0; + } else { + color = g_saftyWhiteColor; + } + mDoGph_gInf_c::fadeOut(1.0f / uVar1, color); + } + cLib_calcTimer(&field_0x3c); + return 1; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -2443,6 +2497,7 @@ asm int dMsgFlow_c::event033(mesg_flow_node_event* param_0, fopAc_ac_c* param_1) #include "asm/d/msg/d_msg_flow/event033__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c.s" } #pragma pop +#endif /* 8024D788-8024D7C8 2480C8 0040+00 1/0 0/0 0/0 .text * event034__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c */ diff --git a/src/d/s/d_s_logo.cpp b/src/d/s/d_s_logo.cpp index 0187320254..38c7a73545 100644 --- a/src/d/s/d_s_logo.cpp +++ b/src/d/s/d_s_logo.cpp @@ -18,6 +18,8 @@ #include "m_Do/m_Do_controller_pad.h" #include "m_Do/m_Do_graphic.h" #include "m_Do/m_Do_machine.h" +#include "dolphin/os/OSRtc.h" +#include "dolphin/vi/vi.h" // // Types: @@ -34,123 +36,10 @@ public: // Forward References: // -extern "C" void __ct__10dLog_HIO_cFv(); -extern "C" void preLoad_dyl_create__10dScnLogo_cFv(); -extern "C" void preLoad_dyl_remove__10dScnLogo_cFv(); -extern "C" void preLoad_dyl__10dScnLogo_cFv(); -extern "C" void checkProgSelect__10dScnLogo_cFv(); -extern "C" void draw__10dScnLogo_cFv(); -extern "C" void progInDraw__10dScnLogo_cFv(); -extern "C" void progSelDraw__10dScnLogo_cFv(); -extern "C" void progOutDraw__10dScnLogo_cFv(); -extern "C" void progSetDraw__10dScnLogo_cFv(); -extern "C" void progSet2Draw__10dScnLogo_cFv(); -extern "C" void progChangeDraw__10dScnLogo_cFv(); -extern "C" void warningInDraw__10dScnLogo_cFv(); -extern "C" void warningDispDraw__10dScnLogo_cFv(); -extern "C" void warningOutDraw__10dScnLogo_cFv(); -extern "C" void nintendoInDraw__10dScnLogo_cFv(); -extern "C" void nintendoOutDraw__10dScnLogo_cFv(); -extern "C" void dolbyInDraw__10dScnLogo_cFv(); -extern "C" void dolbyOutDraw__10dScnLogo_cFv(); -extern "C" void dolbyOutDraw2__10dScnLogo_cFv(); -extern "C" void dvdWaitDraw__10dScnLogo_cFv(); -extern "C" void nextSceneChange__10dScnLogo_cFv(); -extern "C" void __dt__10dScnLogo_cFv(); -extern "C" static void phase_0__FP10dScnLogo_c(); -extern "C" static void phase_1__FP10dScnLogo_c(); -extern "C" static void phase_2__FP10dScnLogo_c(); -extern "C" static void resLoad__FP30request_of_phase_process_classP10dScnLogo_c(); -extern "C" void create__10dScnLogo_cFv(); -extern "C" void logoInitGC__10dScnLogo_cFv(); -extern "C" void dvdDataLoad__10dScnLogo_cFv(); -extern "C" static void dScnLogo_Create__FP11scene_class(); -extern "C" static void dScnLogo_Execute__FP10dScnLogo_c(); -extern "C" static void dScnLogo_Draw__FP10dScnLogo_c(); -extern "C" static void dScnLogo_Delete__FP10dScnLogo_c(); -extern "C" static bool dScnLogo_IsDelete__FP10dScnLogo_c(); -extern "C" void setProgressiveMode__10dScnLogo_cFUc(); -extern "C" void getProgressiveMode__10dScnLogo_cFv(); -extern "C" void isProgressiveMode__10dScnLogo_cFv(); -extern "C" void setRenderMode__10dScnLogo_cFv(); -extern "C" void __dt__10dLog_HIO_cFv(); -extern "C" void func_802585A4(u16*); -extern "C" void __sinit_d_s_logo_cpp(); -extern "C" extern char const* const d_s_d_s_logo__stringBase0; - // // External References: // -extern "C" void mDoExt_getGameHeap__Fv(); -extern "C" void mDoExt_getJ2dHeap__Fv(); -extern "C" void mDoExt_setCurrentHeap__FP7JKRHeap(); -extern "C" void mDoExt_getMesgFont__Fv(); -extern "C" void mDoExt_getRubyFont__Fv(); -extern "C" void mDoExt_getSubFont__Fv(); -extern "C" void mDoExt_setAraCacheSize__FUl(); -extern "C" void mDoRst_reset__FiUli(); -extern "C" void mDoRst_resetCallBack__FiPv(); -extern "C" void create__25mDoDvdThd_mountXArchive_cFPCcUcQ210JKRArchive10EMountModeP7JKRHeap(); -extern "C" void create__21mDoDvdThd_toMainRam_cFPCcUcP7JKRHeap(); -extern "C" void cDyl_InitAsyncIsDone__Fv(); -extern "C" void Link__7cDylPhsFP30request_of_phase_process_classs(); -extern "C" void fopScnM_ChangeReq__FP11scene_classssUs(); -extern "C" void createParticle__14dComIfG_play_cFv(); -extern "C" void dComIfG_changeOpeningScene__FP11scene_classs(); -extern "C" void dComLbG_PhaseHandler__FP30request_of_phase_process_classPPFPv_iPv(); -extern "C" void setRes__14dRes_control_cFPCcP11dRes_info_ciPCcUcP7JKRHeap(); -extern "C" void deleteRes__14dRes_control_cFPCcP11dRes_info_ci(); -extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci(); -extern "C" void syncAllRes__14dRes_control_cFP11dRes_info_ci(); -extern "C" void createWork__8dMpath_cFv(); -extern "C" void createCommon__13dPa_control_cFPCv(); -extern "C" void __ct__10dDlst_2D_cFP7ResTIMGssssUc(); -extern "C" void setSimpleTex__21dDlst_shadowControl_cFPC7ResTIMG(); -extern "C" void set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c(); -extern "C" void createWork__7dTres_cFv(); -extern "C" void waitBlanking__10JFWDisplayFi(); -extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); -extern "C" void loadStaticWaves__10Z2SceneMgrFv(); -extern "C" bool checkFirstWaves__10Z2SceneMgrFv(); -extern "C" void resetProcess__10Z2AudioMgrFUlb(); -extern "C" void becomeCurrentHeap__7JKRHeapFv(); -extern "C" void destroy__7JKRHeapFv(); -extern "C" void alloc__7JKRHeapFUli(); -extern "C" void free__7JKRHeapFPvP7JKRHeap(); -extern "C" void* __nw__FUl(); -extern "C" void* __nwa__FUl(); -extern "C" void __dl__FPv(); -extern "C" void __dla__FPv(); -extern "C" void create__10JKRExpHeapFUlP7JKRHeapb(); -extern "C" void create__10JKRExpHeapFPvUlP7JKRHeapb(); -extern "C" void getTotalFreeSize__11JKRAramHeapFv(); -extern "C" void __dt__10J2DPictureFv(); -extern "C" u32 OSGetProgressiveMode(); -extern "C" void OSSetProgressiveMode(u32); -extern "C" u32 VIGetDTVStatus(); -extern "C" void __register_global_object(); -extern "C" void __ptmf_scall(); -extern "C" void _savegpr_26(); -extern "C" void _savegpr_27(); -extern "C" void _savegpr_28(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_26(); -extern "C" void _restgpr_27(); -extern "C" void _restgpr_28(); -extern "C" void _restgpr_29(); -extern "C" extern void* __vt__10dDlst_2D_c[3]; -extern "C" u8 m_cpadInfo__8mDoCPd_c[256]; -extern "C" void* mRenderModeObj__15mDoMch_render_c[1 + 1 /* padding */]; -extern "C" extern u8 mInitFlag__17mDoAud_zelAudio_c[4]; -extern "C" u8 mFader__13mDoGph_gInf_c[4]; -extern "C" u8 mResetData__6mDoRst[4 + 4 /* padding */]; -extern "C" u8 mData__12dEnemyItem_c[4 + 4 /* padding */]; -extern "C" u8 sManager__10JFWDisplay[4]; -extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" u8 sAramObject__7JKRAram[4]; -extern "C" u8 sCallback__Q210JUTGamePad13C3ButtonReset[4]; -extern "C" u8 sCallbackArg__Q210JUTGamePad13C3ButtonReset[4 + 4 /* padding */]; // // Declarations: @@ -158,7 +47,7 @@ extern "C" u8 sCallbackArg__Q210JUTGamePad13C3ButtonReset[4 + 4 /* padding */]; /* ############################################################################################## */ /* 803C2E38-803C2E44 01FF58 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { +static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; @@ -166,7 +55,7 @@ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { static dLog_HIO_c g_LogHIO; typedef void (dScnLogo_c::*execFunc)(); -SECTION_DATA static execFunc l_execFunc[16] = { +static execFunc l_execFunc[16] = { &dScnLogo_c::warningInDraw, &dScnLogo_c::warningDispDraw, &dScnLogo_c::warningOutDraw, &dScnLogo_c::nintendoInDraw, &dScnLogo_c::nintendoOutDraw, &dScnLogo_c::dolbyInDraw, &dScnLogo_c::dolbyOutDraw, &dScnLogo_c::dolbyOutDraw2, &dScnLogo_c::progInDraw, @@ -632,8 +521,6 @@ dScnLogo_c::~dScnLogo_c() { } /* 80257910-802579BC 252250 00AC+00 1/0 0/0 0/0 .text phase_0__FP10dScnLogo_c */ -// setFadeColor instruction reordering -#ifdef NONMATCHING static int phase_0(dScnLogo_c* logo) { mDoGph_gInf_c::setFadeColor(*(JUtility::TColor*)&g_blackColor); dComIfGp_particle_create(); @@ -644,16 +531,6 @@ static int phase_0(dScnLogo_c* logo) { return 2; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm int phase_0(dScnLogo_c* param_0) { - nofralloc -#include "asm/d/s/d_s_logo/phase_0__FP10dScnLogo_c.s" -} -#pragma pop -#endif /* 802579BC-80257A70 2522FC 00B4+00 1/0 0/0 0/0 .text phase_1__FP10dScnLogo_c */ static int phase_1(dScnLogo_c* logo) { @@ -822,20 +699,9 @@ void dScnLogo_c::dvdDataLoad() { } /* 80258420-80258444 252D60 0024+00 1/0 0/0 0/0 .text dScnLogo_Create__FP11scene_class */ -#ifdef NONMATCHING static int dScnLogo_Create(scene_class* scn) { - return static_cast(scn)->create(); + return (new (scn) dScnLogo_c())->create(); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void dScnLogo_Create(scene_class* param_0) { - nofralloc -#include "asm/d/s/d_s_logo/dScnLogo_Create__FP11scene_class.s" -} -#pragma pop -#endif /* 80258444-80258484 252D84 0040+00 1/0 0/0 0/0 .text dScnLogo_Execute__FP10dScnLogo_c */ static int dScnLogo_Execute(dScnLogo_c* logo) { @@ -889,34 +755,26 @@ void dScnLogo_c::setRenderMode() { /* 8025855C-802585A4 252E9C 0048+00 2/1 0/0 0/0 .text __dt__10dLog_HIO_cFv */ dLog_HIO_c::~dLog_HIO_c() {} -/* 802585A4-802585C0 252EE4 001C+00 1/1 0/0 0/0 .text cLib_calcTimer__FPUs */ -template -T cLib_calcTimer(T* value) { - if (*value != 0) { - *value = *value - 1; - } - return *value; -} - /* 803C2FD0-803C2FE4 -00001 0014+00 1/0 0/0 0/0 .data l_dScnLogo_Method */ -SECTION_DATA static void* l_dScnLogo_Method[5] = { - (void*)dScnLogo_Create__FP11scene_class, (void*)dScnLogo_Delete__FP10dScnLogo_c, - (void*)dScnLogo_Execute__FP10dScnLogo_c, (void*)dScnLogo_IsDelete__FP10dScnLogo_c, - (void*)dScnLogo_Draw__FP10dScnLogo_c, +static dScnLogo_Method l_dScnLogo_Method[5] = { + (dScnLogo_Method) dScnLogo_Create, dScnLogo_Delete, + dScnLogo_Execute, dScnLogo_IsDelete, + dScnLogo_Draw, }; /* 803C2FE4-803C300C -00001 0028+00 0/0 0/0 1/0 .data g_profile_LOGO_SCENE */ -SECTION_DATA extern void* g_profile_LOGO_SCENE[10] = { - (void*)NULL, - (void*)0x0001FFFD, - (void*)0x00090000, - (void*)&g_fpcNd_Method, - (void*)0x000002A8, - (void*)NULL, - (void*)NULL, - (void*)&g_fopScn_Method, - (void*)&l_dScnLogo_Method, - (void*)NULL, +extern scene_process_profile_definition g_profile_LOGO_SCENE = { + 0, + 1, + -3, + PROC_LOGO_SCENE, + &g_fpcNd_Method.mBase, + sizeof(dScnLogo_c), + 0, + 0, + &g_fopScn_Method.mBase, + (process_method_class*)&l_dScnLogo_Method, + NULL, }; /* 80399FFC-80399FFC 02665C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/s/d_s_name.cpp b/src/d/s/d_s_name.cpp index 77bc75d70d..dc42744c4f 100644 --- a/src/d/s/d_s_name.cpp +++ b/src/d/s/d_s_name.cpp @@ -8,10 +8,9 @@ #include "d/com/d_com_inf_game.h" #include "d/d_procname.h" #include "d/meter/d_meter2_info.h" -#include "dol2asm.h" #include "dolphin/types.h" #include "f_op/f_op_overlap_mng.h" -#include "f_op/f_op_scene.h" +#include "f_op/f_op_scene_mng.h" #include "f_pc/f_pc_manager.h" #include "global.h" #include "m_Do/m_Do_Reset.h" @@ -33,12 +32,7 @@ public: /* 0x5 */ u8 mFileSelWaitTime; }; -class dScnName_camera_c : public camera_process_class { -public: - dScnName_camera_c() { field_0x22f = 84; } - /* 80259294 */ virtual ~dScnName_camera_c() {} -}; - +// TODO: Remove when dFile_select_c virtual functions are properly defined in header class dFile_select_c { public: /* 8018366C */ dFile_select_c(JKRArchive*); @@ -67,6 +61,7 @@ private: /* 0x2375 */ u8 field_0x2375[0x237c - 0x2375]; }; +// TODO: Remove when dBrightCheck_c virtual functions are properly defined in header class dBrightCheck_c { public: /* 80192F10 */ dBrightCheck_c(JKRArchive*); @@ -80,129 +75,19 @@ public: /* 0x19 */ bool mEnd; }; -class dScnName_c : public scene_class { -public: - dScnName_c() {} - /* 802588A0 */ s32 create(); - /* 80258B2C */ void setView(); - /* 80258BC8 */ s32 execute(); - /* 80258C5C */ s32 draw(); - /* 80258CC8 */ ~dScnName_c(); - /* 80258DD0 */ void FileSelectOpen(); - /* 80258E34 */ void FileSelectMain(); - /* 80258E78 */ void FileSelectMainNormal(); - /* 80258F20 */ void FileSelectClose(); - /* 80258FD4 */ void brightCheckOpen(); - /* 80259008 */ void brightCheck(); - /* 802590F8 */ void changeGameScene(); - -private: - /* 0x1C4 */ request_of_phase_process_class field_0x1c4; - /* 0x1CC */ JKRExpHeap* mHeap; - /* 0x1D0 */ JKRExpHeap* field_0x1d0; - /* 0x1D4 */ dScnName_camera_c mCamera; - /* 0x414 */ dFile_select_c* dFs_c; - /* 0x418 */ dBrightCheck_c* mBrightCheck; - /* 0x41C */ u8 field_0x41c; - /* 0x41D */ u8 field_0x41d; - /* 0x41E */ u8 field_0x41e; - /* 0x41F */ u8 field_0x41f; - /* 0x420 */ u8 field_0x420; -}; // // Forward References: // -extern "C" void __ct__9dSn_HIO_cFv(); -extern "C" static void phase_1__FPc(); -extern "C" static void phase_2__FPc(); -extern "C" static void resLoad__FP30request_of_phase_process_classPc(); -extern "C" void create__10dScnName_cFv(); -extern "C" void setView__10dScnName_cFv(); -extern "C" void execute__10dScnName_cFv(); -extern "C" void draw__10dScnName_cFv(); -extern "C" void __dt__10dScnName_cFv(); -extern "C" void FileSelectOpen__10dScnName_cFv(); -extern "C" void FileSelectMain__10dScnName_cFv(); -extern "C" void FileSelectMainNormal__10dScnName_cFv(); -extern "C" void FileSelectClose__10dScnName_cFv(); -extern "C" void brightCheckOpen__10dScnName_cFv(); -extern "C" void brightCheck__10dScnName_cFv(); -extern "C" void changeGameScene__10dScnName_cFv(); -extern "C" static void dScnName_Draw__FP10dScnName_c(); -extern "C" static void dScnName_Execute__FP10dScnName_c(); -extern "C" static void dScnName_IsDelete__FP10dScnName_c(); -extern "C" static void dScnName_Delete__FP10dScnName_c(); -extern "C" static void dScnName_Create__FP11scene_class(); -extern "C" void __dt__17dScnName_camera_cFv(); -extern "C" void __dt__9dSn_HIO_cFv(); -extern "C" void __sinit_d_s_name_cpp(); -extern "C" extern char const* const d_s_d_s_name__stringBase0; - -// -// External References: -// - -extern "C" void mDoMtx_lookAt__FPA4_fPC3VecPC3Vecs(); -extern "C" void mDoMtx_concatProjView__FPA4_CfPA4_CfPA4_f(); -extern "C" void mDoExt_getGameHeap__Fv(); -extern "C" void mDoExt_setCurrentHeap__FP7JKRHeap(); -extern "C" void fopOvlpM_IsPeek__Fv(); -extern "C" void fopScnM_ChangeReq__FP11scene_classssUs(); -extern "C" void dComIfG_resetToOpening__FP11scene_class(); -extern "C" void dComIfGp_setNextStage__FPCcsScSc(); -extern "C" void dComIfGs_gameStart__Fv(); -extern "C" void dComLbG_PhaseHandler__FP30request_of_phase_process_classPPFPv_iPv(); -extern "C" void offFirstBit__21dSv_player_get_item_cFUc(); -extern "C" void setRes__14dRes_control_cFPCcP11dRes_info_ciPCcUcP7JKRHeap(); -extern "C" void syncRes__14dRes_control_cFPCcP11dRes_info_ci(); -extern "C" void deleteRes__14dRes_control_cFPCcP11dRes_info_ci(); -extern "C" void getResInfo__14dRes_control_cFPCcP11dRes_info_ci(); -extern "C" void cleanup__13dPa_control_cFv(); -extern "C" void setViewPort__14dDlst_window_cFffffff(); -extern "C" void setScissor__14dDlst_window_cFffff(); -extern "C" void Run__12dVibration_cFv(); -extern "C" void Init__12dVibration_cFv(); -extern "C" void __ct__14dFile_select_cFP10JKRArchive(); -extern "C" void _create__14dFile_select_cFv(); -extern "C" void _move__14dFile_select_cFv(); -extern "C" void _draw__14dFile_select_cFv(); -extern "C" void __ct__14dBrightCheck_cFP10JKRArchive(); -extern "C" void _move__14dBrightCheck_cFv(); -extern "C" void _draw__14dBrightCheck_cFv(); -extern "C" void dKy_clear_game_init__Fv(); -extern "C" void dKy_setLight_init__Fv(); -extern "C" void changeWater__13dMeter2Info_cFUc(); -extern "C" void bgmStart__8Z2SeqMgrFUlUll(); -extern "C" void bgmStop__8Z2SeqMgrFUll(); -extern "C" void bgmStreamPrepare__8Z2SeqMgrFUl(); -extern "C" void bgmStreamPlay__8Z2SeqMgrFv(); -extern "C" void becomeCurrentHeap__7JKRHeapFv(); -extern "C" void destroy__7JKRHeapFv(); -extern "C" void* __nw__FUl(); -extern "C" void __dl__FPv(); -extern "C" void create__10JKRExpHeapFUlP7JKRHeapb(); -extern "C" void __register_global_object(); -extern "C" void __ptmf_scall(); -extern "C" void _savegpr_28(); -extern "C" void _restgpr_28(); -// extern "C" extern void* g_fopScn_Method[5 + 1 /* padding */]; -// extern "C" extern void* g_fpcNd_Method[5 + 1 /* padding */]; -extern "C" void* mRenderModeObj__15mDoMch_render_c[1 + 1 /* padding */]; -extern "C" u8 mFader__13mDoGph_gInf_c[4]; -extern "C" u8 mResetData__6mDoRst[4 + 4 /* padding */]; -extern "C" u8 sManager__10JFWDisplay[4]; -extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; - // // Declarations: // /* ############################################################################################## */ /* 803C3040-803C304C 020160 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { +static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; @@ -211,46 +96,11 @@ static dSn_HIO_c g_snHIO; /* 803C3094-803C30DC 0201B4 0048+00 1/2 0/0 0/0 .data MainProc */ typedef void (dScnName_c::*mainProcFunc)(void); -SECTION_DATA static mainProcFunc MainProc[6] = { +static mainProcFunc MainProc[6] = { &dScnName_c::FileSelectOpen, &dScnName_c::FileSelectMain, &dScnName_c::FileSelectClose, &dScnName_c::brightCheckOpen, &dScnName_c::brightCheck, &dScnName_c::changeGameScene, }; -/* 803C30DC-803C30F0 -00001 0014+00 2/0 0/0 0/0 .data l_dScnName_Method */ -SECTION_DATA static void* l_dScnName_Method[5] = { - (void*)dScnName_Create__FP11scene_class, (void*)dScnName_Delete__FP10dScnName_c, - (void*)dScnName_Execute__FP10dScnName_c, (void*)dScnName_IsDelete__FP10dScnName_c, - (void*)dScnName_Draw__FP10dScnName_c, -}; - -/* 803C30F0-803C3118 -00001 0028+00 0/0 0/0 1/0 .data g_profile_NAME_SCENE */ -SECTION_DATA extern void* g_profile_NAME_SCENE[10] = { - (void*)NULL, - (void*)0x0001FFFD, - (void*)0x000D0000, - (void*)&g_fpcNd_Method, - (void*)0x00000424, - (void*)NULL, - (void*)NULL, - (void*)&g_fopScn_Method, - (void*)&l_dScnName_Method, - (void*)NULL, -}; - -/* 803C3118-803C3140 -00001 0028+00 0/0 0/0 1/0 .data g_profile_NAMEEX_SCENE */ -SECTION_DATA extern void* g_profile_NAMEEX_SCENE[10] = { - (void*)NULL, - (void*)0x0001FFFD, - (void*)0x000E0000, - (void*)&g_fpcNd_Method, - (void*)0x00000424, - (void*)NULL, - (void*)NULL, - (void*)&g_fopScn_Method, - (void*)&l_dScnName_Method, - (void*)NULL, -}; - /* 8025878C-802587A4 2530CC 0018+00 1/1 0/0 0/0 .text __ct__9dSn_HIO_cFv */ dSn_HIO_c::dSn_HIO_c() { mFileSelWaitTime = 15; @@ -286,47 +136,12 @@ static s32 resLoad(request_of_phase_process_class* i_phase, char* param_1) { } /* ############################################################################################## */ -/* 8039A2A8-8039A2A8 026908 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8039A2B5 = "fileSel"; -#pragma pop -/* 80454EF8-80454EFC 0034F8 0004+00 2/2 0/0 0/0 .sdata2 @3923 */ -SECTION_SDATA2 static u8 lit_3923[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; - -/* 80454EFC-80454F00 0034FC 0004+00 1/1 0/0 0/0 .sdata2 @3924 */ -SECTION_SDATA2 static f32 lit_3924 = 1.0f; - -/* 80454F00-80454F04 003500 0004+00 1/1 0/0 0/0 .sdata2 @3925 */ -SECTION_SDATA2 static f32 lit_3925 = 100000.0f; - -/* 80454F04-80454F08 003504 0004+00 1/1 0/0 0/0 .sdata2 @3926 */ -SECTION_SDATA2 static f32 lit_3926 = 45.0f; - -/* 80454F08-80454F0C 003508 0004+00 1/1 0/0 0/0 .sdata2 @3927 */ -SECTION_SDATA2 static f32 lit_3927 = 19.0f / 14.0f; - -/* 80454F0C-80454F10 00350C 0004+00 1/1 0/0 0/0 .sdata2 @3928 */ -SECTION_SDATA2 static f32 lit_3928 = -1000.0f; - -/* 80454F10-80454F18 003510 0008+00 1/1 0/0 0/0 .sdata2 @3930 */ -SECTION_SDATA2 static f64 lit_3930 = 4503599627370496.0 /* cast u32 to float */; - -/* 802588A0-80258B2C 2531E0 028C+00 1/1 0/0 0/0 .text create__10dScnName_cFv */ -#ifdef NONMATCHING s32 dScnName_c::create() { int phase_state = resLoad(&field_0x1c4, "fileSel"); if (phase_state == cPhs_COMPLEATE_e) { mHeap = JKRExpHeap::create(0x180000, mDoExt_getGameHeap(), false); - JKRExpHeap* heap = mHeap; - mDoExt_setCurrentHeap(heap); - field_0x1d0 = heap; + field_0x1d0 = (JKRExpHeap*)mDoExt_setCurrentHeap(mHeap); dRes_info_c* res = dComIfG_getObjectResInfo("fileSel"); dFs_c = new dFile_select_c(res->getArchive()); @@ -346,28 +161,20 @@ s32 dScnName_c::create() { dComIfGp_setWindowNum(1); dComIfGp_setWindow(0, 0.0f, 0.0f, mDoMch_render_c::getFbWidth(), mDoMch_render_c::getEfbHeight(), 0.0f, 1.0f, 0, 2); - dComIfGp_setCamera(0, &mCamera); - // dDlst_window_c* window = &g_dComIfG_gameInfo.play.mWindow[0]; - - /* fopCamM_SetNear(&mCamera, 1.0f); - fopCamM_SetFar(&mCamera, 100000.0f); - fopCamM_SetFovy(&mCamera, 45.0f); - fopCamM_SetAspect(&mCamera, mDoGph_gInf_c::getWidthF() / mDoGph_gInf_c::getHeightF()); - fopCamM_SetEye(&mCamera, 0.0f, 0.0f, -1000.0f); - fopCamM_SetCenter(&mCamera, 0.0f, 0.0f, 0.0f); - fopCamM_SetBank(&mCamera, 0); */ + dDlst_window_c* window = dComIfGp_getWindow(0); + dComIfGp_setCamera(0, (camera_class*)&mCamera); mCamera.mNear = 1.0f; mCamera.mFar = 100000.0f; mCamera.mFovy = 45.0f; mCamera.mAspect = mDoGph_gInf_c::getWidthF() / mDoGph_gInf_c::getHeightF(); - mCamera.field_0xd8.mEye.set(0.0f, 0.0f, -1000.0f); - mCamera.field_0xd8.mCenter.set(0.0f, 0.0f, 0.0f); + mCamera.mLookat.mEye.set(0.0f, 0.0f, -1000.0f); + mCamera.mLookat.mCenter.set(0.0f, 0.0f, 0.0f); mCamera.mBank = 0; dComIfGp_setPlayer(0, NULL); - dComIfGd_setWindow(g_dComIfG_gameInfo.play.mWindow); - dComIfGd_setViewport(g_dComIfG_gameInfo.play.mWindow->getViewPort()); + dComIfGd_setWindow(window); + dComIfGd_setViewport(window->getViewPort()); dComIfGd_setView(&mCamera); mDoGph_gInf_c::offAutoForcus(); setView(); @@ -381,16 +188,6 @@ s32 dScnName_c::create() { } return phase_state; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm s32 dScnName_c::create() { - nofralloc -#include "asm/d/s/d_s_name/create__10dScnName_cFv.s" -} -#pragma pop -#endif /* 80258B2C-80258BC8 25346C 009C+00 1/1 0/0 0/0 .text setView__10dScnName_cFv */ void dScnName_c::setView() { @@ -400,10 +197,9 @@ void dScnName_c::setView() { mCamera.mBank); PSMTXInverse(mCamera.mViewMtx, mCamera.mInvViewMtx); PSMTXCopy(mCamera.mViewMtx, mCamera.mViewMtxNoTrans); - f32 tmp_0 = FLOAT_LABEL(lit_3923); - mCamera.mViewMtxNoTrans[0][3] = tmp_0; - mCamera.mViewMtxNoTrans[1][3] = tmp_0; - mCamera.mViewMtxNoTrans[2][3] = tmp_0; + mCamera.mViewMtxNoTrans[0][3] = 0.0f; + mCamera.mViewMtxNoTrans[1][3] = 0.0f; + mCamera.mViewMtxNoTrans[2][3] = 0.0f; PSMTXCopy(mCamera.mViewMtx, j3dSys.mViewMtx); mDoMtx_concatProjView(mCamera.mProjMtx, mCamera.mViewMtx, mCamera.mProjViewMtx); } @@ -474,29 +270,19 @@ void dScnName_c::FileSelectMain() { } /* 80258E78-80258F20 2537B8 00A8+00 1/1 0/0 0/0 .text FileSelectMainNormal__10dScnName_cFv */ -#ifdef NONMATCHING void dScnName_c::FileSelectMainNormal() { - if (dFs_c->isSelectEnd() == true) { + switch(dFs_c->isSelectEnd()) { + case 1: field_0x41e = 15; mDoGph_gInf_c::setFadeColor(*(JUtility::TColor*)&g_blackColor); mDoGph_gInf_c::startFadeOut(15); field_0x41d = 2; field_0x420 = 1; + break; } } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dScnName_c::FileSelectMainNormal() { - nofralloc -#include "asm/d/s/d_s_name/FileSelectMainNormal__10dScnName_cFv.s" -} -#pragma pop -#endif /* 80258F20-80258FD4 253860 00B4+00 1/0 0/0 0/0 .text FileSelectClose__10dScnName_cFv */ -#ifdef NONMATCHING void dScnName_c::FileSelectClose() { field_0x41e--; @@ -509,16 +295,6 @@ void dScnName_c::FileSelectClose() { field_0x420 = 0; } } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dScnName_c::FileSelectClose() { - nofralloc -#include "asm/d/s/d_s_name/FileSelectClose__10dScnName_cFv.s" -} -#pragma pop -#endif /* 80258FD4-80259008 253914 0034+00 1/0 0/0 0/0 .text brightCheckOpen__10dScnName_cFv */ void dScnName_c::brightCheckOpen() { @@ -552,21 +328,12 @@ void dScnName_c::brightCheck() { } /* ############################################################################################## */ -/* 8039A2A8-8039A2A8 026908 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8039A2BD = "F_SP108"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_8039A2C5 = "\0\0"; -#pragma pop /* 802590F8-802591C0 253A38 00C8+00 1/0 0/0 0/0 .text changeGameScene__10dScnName_cFv */ -// weird comparison in changeReq -#ifdef NONMATCHING void dScnName_c::changeGameScene() { if (!mDoRst::isReset() && !fopOvlpM_IsPeek()) { dComIfGs_gameStart(); - fopScnM_ChangeReq(this, field_0x41f == 0 ? PROC_PLAY_SCENE : 10, 0, 5); + fopScnM_ChangeReq(this, field_0x41f == 0 ? PROC_PLAY_SCENE : PROC_PLAY_SCENE, 0, 5); dComIfGp_offEnableNextStage(); if (dFs_c->isDataNew(dFs_c->getSelectNum())) { @@ -577,16 +344,6 @@ void dScnName_c::changeGameScene() { dComIfGs_setRestartRoomParam(0); } } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dScnName_c::changeGameScene() { - nofralloc -#include "asm/d/s/d_s_name/changeGameScene__10dScnName_cFv.s" -} -#pragma pop -#endif /* 802591C0-802591E0 253B00 0020+00 1/0 0/0 0/0 .text dScnName_Draw__FP10dScnName_c */ static void dScnName_Draw(dScnName_c* scn) { @@ -618,3 +375,41 @@ static void dScnName_Create(scene_class* scn) { } /* 8039A2A8-8039A2A8 026908 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ + + +/* 803C30DC-803C30F0 -00001 0014+00 2/0 0/0 0/0 .data l_dScnName_Method */ +static leafdraw_method_class l_dScnName_Method = { + (process_method_func)dScnName_Create, (process_method_func)dScnName_Delete, + (process_method_func)dScnName_Execute, (process_method_func)dScnName_IsDelete, + (process_method_func)dScnName_Draw, +}; + +/* 803C30F0-803C3118 -00001 0028+00 0/0 0/0 1/0 .data g_profile_NAME_SCENE */ +extern scene_process_profile_definition g_profile_NAME_SCENE = { + 0, + 1, + -3, + PROC_NAME_SCENE, + &g_fpcNd_Method.mBase, + sizeof(dScnName_c), + 0, + 0, + &g_fopScn_Method.mBase, + (process_method_class*)&l_dScnName_Method, + NULL, +}; + +/* 803C3118-803C3140 -00001 0028+00 0/0 0/0 1/0 .data g_profile_NAMEEX_SCENE */ +extern scene_process_profile_definition g_profile_NAMEEX_SCENE = { + 0, + 1, + -3, + PROC_NAMEEX_SCENE, + &g_fpcNd_Method.mBase, + sizeof(dScnName_c), + 0, + 0, + &g_fopScn_Method.mBase, + (process_method_class*)&l_dScnName_Method, + NULL, +}; diff --git a/src/d/s/d_s_play.cpp b/src/d/s/d_s_play.cpp index fc16b0726d..631ab6c406 100644 --- a/src/d/s/d_s_play.cpp +++ b/src/d/s/d_s_play.cpp @@ -24,6 +24,7 @@ #include "m_Do/m_Do_Reset.h" #include "m_Do/m_Do_audio.h" #include "m_Do/m_Do_graphic.h" +#include "d/d_eye_hl.h" // // Types: @@ -387,7 +388,7 @@ asm dScnPly_env_debugHIO_c::dScnPly_env_debugHIO_c() { SECTION_SDATA2 static u32 lit_4100 = 0x2A1E46FF; /* 802594AC-802597B8 253DEC 030C+00 1/0 0/0 0/0 .text dScnPly_Draw__FP9dScnPly_c */ -// some small issues like instruction reordering +// bool comparison issues #ifdef NONMATCHING static int dScnPly_Draw(dScnPly_c* scn) { dComIfG_Ccsp()->Move(); @@ -425,7 +426,7 @@ static int dScnPly_Draw(dScnPly_c* scn) { } dMdl_mng_c::reset(); - if (!dComIfGp_isPauseFlag() && pauseTimer == 0) { + if (!dComIfGp_isPauseFlag() && dScnPly_c::pauseTimer == 0) { if (fpcM_GetName(scn) == PROC_PLAY_SCENE) { dComIfGp_getVibration().Run(); } @@ -436,9 +437,9 @@ static int dScnPly_Draw(dScnPly_c* scn) { cCt_execCounter(); } else { dPa_control_c::onStatus(1); - if (pauseTimer == 0) { + if (dScnPly_c::pauseTimer == 0) { dPa_control_c::onStatus(2); - if (pauseTimer == 0) { + if (dScnPly_c::pauseTimer == 0) { dComIfGp_getVibration().Pause(); } } diff --git a/src/d/save/d_save_HIO.cpp b/src/d/save/d_save_HIO.cpp index f7092ae539..14060b8b94 100644 --- a/src/d/save/d_save_HIO.cpp +++ b/src/d/save/d_save_HIO.cpp @@ -5,651 +5,229 @@ #include "d/save/d_save_HIO.h" #include "d/com/d_com_inf_game.h" -#include "dol2asm.h" #include "dolphin/types.h" // // Forward References: // -extern "C" void __ct__29dSvBit_childSwPerfectionHIO_cFv(); -extern "C" void init__29dSvBit_childSwPerfectionHIO_cFv(); -extern "C" void __ct__26dSvBit_childSwDungeonHIO_cFv(); -extern "C" void init__26dSvBit_childSwDungeonHIO_cFv(); -extern "C" void __ct__23dSvBit_childSwZoneHIO_cFv(); -extern "C" void init__23dSvBit_childSwZoneHIO_cFv(); -extern "C" void __ct__26dSvBit_childSwOneZoneHIO_cFv(); -extern "C" void init__26dSvBit_childSwOneZoneHIO_cFv(); -extern "C" void __ct__29dSvBit_childItPerfectionHIO_cFv(); -extern "C" void init__29dSvBit_childItPerfectionHIO_cFv(); -extern "C" void __ct__26dSvBit_childItDungeonHIO_cFv(); -extern "C" void init__26dSvBit_childItDungeonHIO_cFv(); -extern "C" void __ct__23dSvBit_childItZoneHIO_cFv(); -extern "C" void init__23dSvBit_childItZoneHIO_cFv(); -extern "C" void __ct__26dSvBit_childItOneZoneHIO_cFv(); -extern "C" void init__26dSvBit_childItOneZoneHIO_cFv(); -extern "C" void __ct__29dSvBit_childTbPerfectionHIO_cFv(); -extern "C" void init__29dSvBit_childTbPerfectionHIO_cFv(); -extern "C" void __ct__25dSvBit_childDarknessHIO_cFv(); -extern "C" void init__25dSvBit_childDarknessHIO_cFv(); -extern "C" void __ct__26dSvBit_childTransformHIO_cFv(); -extern "C" void init__26dSvBit_childTransformHIO_cFv(); -extern "C" void __ct__22dSvBit_childOtherHIO_cFv(); -extern "C" void init__22dSvBit_childOtherHIO_cFv(); -extern "C" void init__12dSvBit_HIO_cFv(); -extern "C" void __dt__22dSvBit_childOtherHIO_cFv(); -extern "C" void __dt__26dSvBit_childTransformHIO_cFv(); -extern "C" void __dt__25dSvBit_childDarknessHIO_cFv(); -extern "C" void __dt__29dSvBit_childTbPerfectionHIO_cFv(); -extern "C" void __dt__26dSvBit_childItOneZoneHIO_cFv(); -extern "C" void __dt__23dSvBit_childItZoneHIO_cFv(); -extern "C" void __dt__26dSvBit_childItDungeonHIO_cFv(); -extern "C" void __dt__29dSvBit_childItPerfectionHIO_cFv(); -extern "C" void __dt__26dSvBit_childSwOneZoneHIO_cFv(); -extern "C" void __dt__23dSvBit_childSwZoneHIO_cFv(); -extern "C" void __dt__26dSvBit_childSwDungeonHIO_cFv(); -extern "C" void __dt__29dSvBit_childSwPerfectionHIO_cFv(); -extern "C" void __sinit_d_save_HIO_cpp(); -extern "C" void __dt__12dSvBit_HIO_cFv(); -extern "C" void __dt__25dSvBit_childTreasureHIO_cFv(); -extern "C" void __dt__21dSvBit_childItemHIO_cFv(); -extern "C" void __dt__23dSvBit_childSwitchHIO_cFv(); - -// -// External References: -// - -extern "C" void isDarkClearLV__21dSv_player_status_b_cCFi(); -extern "C" void isTransformLV__21dSv_player_status_b_cCFi(); -extern "C" void getLightDropNum__16dSv_light_drop_cCFUc(); -extern "C" void isLightDropGetFlag__16dSv_light_drop_cCFUc(); -extern "C" void isTbox__12dSv_memBit_cCFi(); -extern "C" void isSwitch__12dSv_memBit_cCFi(); -extern "C" void isItem__12dSv_memBit_cCFi(); -extern "C" void isEventBit__11dSv_event_cCFUs(); -extern "C" void isSwitch__12dSv_danBit_cCFi(); -extern "C" void isItem__12dSv_danBit_cCFi(); -extern "C" void __dl__FPv(); -extern "C" void __register_global_object(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_29(); - // // Declarations: // -/* ############################################################################################## */ -/* 803C3300-803C330C 020420 000C+00 3/3 0/0 0/0 .data __vt__22dSvBit_childOtherHIO_c */ -SECTION_DATA extern void* __vt__22dSvBit_childOtherHIO_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__22dSvBit_childOtherHIO_cFv, -}; - -/* 803C330C-803C3318 02042C 000C+00 3/3 0/0 0/0 .data __vt__26dSvBit_childTransformHIO_c - */ -SECTION_DATA extern void* __vt__26dSvBit_childTransformHIO_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__26dSvBit_childTransformHIO_cFv, -}; - -/* 803C3318-803C3324 020438 000C+00 3/3 0/0 0/0 .data __vt__25dSvBit_childDarknessHIO_c - */ -SECTION_DATA extern void* __vt__25dSvBit_childDarknessHIO_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__25dSvBit_childDarknessHIO_cFv, -}; - -/* 803C3324-803C3330 020444 000C+00 4/4 0/0 0/0 .data __vt__29dSvBit_childTbPerfectionHIO_c */ -SECTION_DATA extern void* __vt__29dSvBit_childTbPerfectionHIO_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__29dSvBit_childTbPerfectionHIO_cFv, -}; - -/* 803C3330-803C333C 020450 000C+00 4/4 0/0 0/0 .data __vt__26dSvBit_childItOneZoneHIO_c - */ -SECTION_DATA extern void* __vt__26dSvBit_childItOneZoneHIO_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__26dSvBit_childItOneZoneHIO_cFv, -}; - -/* 803C333C-803C3348 02045C 000C+00 4/4 0/0 0/0 .data __vt__23dSvBit_childItZoneHIO_c */ -SECTION_DATA extern void* __vt__23dSvBit_childItZoneHIO_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__23dSvBit_childItZoneHIO_cFv, -}; - -/* 803C3348-803C3354 020468 000C+00 4/4 0/0 0/0 .data __vt__26dSvBit_childItDungeonHIO_c - */ -SECTION_DATA extern void* __vt__26dSvBit_childItDungeonHIO_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__26dSvBit_childItDungeonHIO_cFv, -}; - -/* 803C3354-803C3360 020474 000C+00 4/4 0/0 0/0 .data __vt__29dSvBit_childItPerfectionHIO_c */ -SECTION_DATA extern void* __vt__29dSvBit_childItPerfectionHIO_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__29dSvBit_childItPerfectionHIO_cFv, -}; - -/* 803C3360-803C336C 020480 000C+00 4/4 0/0 0/0 .data __vt__26dSvBit_childSwOneZoneHIO_c - */ -SECTION_DATA extern void* __vt__26dSvBit_childSwOneZoneHIO_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__26dSvBit_childSwOneZoneHIO_cFv, -}; - -/* 803C336C-803C3378 02048C 000C+00 4/4 0/0 0/0 .data __vt__23dSvBit_childSwZoneHIO_c */ -SECTION_DATA extern void* __vt__23dSvBit_childSwZoneHIO_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__23dSvBit_childSwZoneHIO_cFv, -}; - -/* 803C3378-803C3384 020498 000C+00 4/4 0/0 0/0 .data __vt__26dSvBit_childSwDungeonHIO_c - */ -SECTION_DATA extern void* __vt__26dSvBit_childSwDungeonHIO_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__26dSvBit_childSwDungeonHIO_cFv, -}; - -/* 803C3384-803C3390 0204A4 000C+00 4/4 0/0 0/0 .data __vt__29dSvBit_childSwPerfectionHIO_c */ -SECTION_DATA extern void* __vt__29dSvBit_childSwPerfectionHIO_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__29dSvBit_childSwPerfectionHIO_cFv, -}; - /* 8025BB78-8025BBAC 2564B8 0034+00 1/1 0/0 0/0 .text __ct__29dSvBit_childSwPerfectionHIO_cFv */ dSvBit_childSwPerfectionHIO_c::dSvBit_childSwPerfectionHIO_c() { for (int i = 0; i < 0x80; i++) { - field_0x5[i] = false; - field_0x85[i] = false; + field_0x5[i] = 0; + field_0x85[i] = 0; } } /* 8025BBAC-8025BC14 2564EC 0068+00 1/1 0/0 0/0 .text init__29dSvBit_childSwPerfectionHIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dSvBit_childSwPerfectionHIO_c::init() { - nofralloc -#include "asm/d/save/d_save_HIO/init__29dSvBit_childSwPerfectionHIO_cFv.s" +void dSvBit_childSwPerfectionHIO_c::init() { + for (int i = 0; i < 0x80; i++) { + field_0x5[i] = dComIfGs_isSaveSwitch(i); + field_0x85[i] = field_0x5[i]; + } } -#pragma pop /* 8025BC14-8025BC48 256554 0034+00 1/1 0/0 0/0 .text __ct__26dSvBit_childSwDungeonHIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dSvBit_childSwDungeonHIO_c::dSvBit_childSwDungeonHIO_c() { - nofralloc -#include "asm/d/save/d_save_HIO/__ct__26dSvBit_childSwDungeonHIO_cFv.s" +dSvBit_childSwDungeonHIO_c::dSvBit_childSwDungeonHIO_c() { + for (int i = 0; i < 0x40; i++) { + field_0x5[i] = 0; + field_0x45[i] = 0; + } } -#pragma pop /* 8025BC48-8025BCB0 256588 0068+00 1/1 0/0 0/0 .text init__26dSvBit_childSwDungeonHIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dSvBit_childSwDungeonHIO_c::init() { - nofralloc -#include "asm/d/save/d_save_HIO/init__26dSvBit_childSwDungeonHIO_cFv.s" +void dSvBit_childSwDungeonHIO_c::init() { + for (int i = 0; i < 0x40; i++) { + field_0x5[i] = dComIfGs_isSaveDunSwitch(i); + field_0x45[i] = field_0x5[i]; + } } -#pragma pop /* 8025BCB0-8025BCE4 2565F0 0034+00 1/1 0/0 0/0 .text __ct__23dSvBit_childSwZoneHIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dSvBit_childSwZoneHIO_c::dSvBit_childSwZoneHIO_c() { - nofralloc -#include "asm/d/save/d_save_HIO/__ct__23dSvBit_childSwZoneHIO_cFv.s" +dSvBit_childSwZoneHIO_c::dSvBit_childSwZoneHIO_c() { + for (int i = 0; i < 0x20; i++) { + field_0x5[i] = 0; + field_0x25[i] = 0; + } } -#pragma pop /* 8025BCE4-8025BD10 256624 002C+00 1/1 0/0 0/0 .text init__23dSvBit_childSwZoneHIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dSvBit_childSwZoneHIO_c::init() { - nofralloc -#include "asm/d/save/d_save_HIO/init__23dSvBit_childSwZoneHIO_cFv.s" +void dSvBit_childSwZoneHIO_c::init() { + for (int i = 0; i < 0x20; i++) { + field_0x5[i] = 0; + field_0x25[i] = field_0x5[i]; + } } -#pragma pop /* 8025BD10-8025BD44 256650 0034+00 1/1 0/0 0/0 .text __ct__26dSvBit_childSwOneZoneHIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dSvBit_childSwOneZoneHIO_c::dSvBit_childSwOneZoneHIO_c() { - nofralloc -#include "asm/d/save/d_save_HIO/__ct__26dSvBit_childSwOneZoneHIO_cFv.s" +dSvBit_childSwOneZoneHIO_c::dSvBit_childSwOneZoneHIO_c() { + for (int i = 0; i < 0x10; i++) { + field_0x5[i] = 0; + field_0x15[i] = 0; + } } -#pragma pop /* 8025BD44-8025BD70 256684 002C+00 1/1 0/0 0/0 .text init__26dSvBit_childSwOneZoneHIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dSvBit_childSwOneZoneHIO_c::init() { - nofralloc -#include "asm/d/save/d_save_HIO/init__26dSvBit_childSwOneZoneHIO_cFv.s" +void dSvBit_childSwOneZoneHIO_c::init() { + for (int i = 0; i < 0x10; i++) { + field_0x5[i] = 0; + field_0x15[i] = field_0x5[i]; + } } -#pragma pop /* 8025BD70-8025BDA4 2566B0 0034+00 1/1 0/0 0/0 .text __ct__29dSvBit_childItPerfectionHIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dSvBit_childItPerfectionHIO_c::dSvBit_childItPerfectionHIO_c() { - nofralloc -#include "asm/d/save/d_save_HIO/__ct__29dSvBit_childItPerfectionHIO_cFv.s" +dSvBit_childItPerfectionHIO_c::dSvBit_childItPerfectionHIO_c() { + for (int i = 0; i < 0x20; i++) { + field_0x5[i] = 0; + field_0x25[i] = 0; + } } -#pragma pop /* 8025BDA4-8025BE0C 2566E4 0068+00 1/1 0/0 0/0 .text init__29dSvBit_childItPerfectionHIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dSvBit_childItPerfectionHIO_c::init() { - nofralloc -#include "asm/d/save/d_save_HIO/init__29dSvBit_childItPerfectionHIO_cFv.s" +void dSvBit_childItPerfectionHIO_c::init() { + for (int i = 0; i < 0x20; i++) { + field_0x5[i] = dComIfGs_isSaveItem(i); + field_0x25[i] = field_0x5[i]; + } } -#pragma pop /* 8025BE0C-8025BE40 25674C 0034+00 1/1 0/0 0/0 .text __ct__26dSvBit_childItDungeonHIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dSvBit_childItDungeonHIO_c::dSvBit_childItDungeonHIO_c() { - nofralloc -#include "asm/d/save/d_save_HIO/__ct__26dSvBit_childItDungeonHIO_cFv.s" +dSvBit_childItDungeonHIO_c::dSvBit_childItDungeonHIO_c() { + for (int i = 0; i < 0x80; i++) { + field_0x5[i] = 0; + field_0x85[i] = 0; + } } -#pragma pop /* 8025BE40-8025BEA8 256780 0068+00 1/1 0/0 0/0 .text init__26dSvBit_childItDungeonHIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dSvBit_childItDungeonHIO_c::init() { - nofralloc -#include "asm/d/save/d_save_HIO/init__26dSvBit_childItDungeonHIO_cFv.s" +void dSvBit_childItDungeonHIO_c::init() { + for (int i = 0; i < 0x80; i++) { + field_0x5[i] = dComIfGs_isSaveDunItem(i); + field_0x85[i] = field_0x5[i]; + } } -#pragma pop /* 8025BEA8-8025BEDC 2567E8 0034+00 1/1 0/0 0/0 .text __ct__23dSvBit_childItZoneHIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dSvBit_childItZoneHIO_c::dSvBit_childItZoneHIO_c() { - nofralloc -#include "asm/d/save/d_save_HIO/__ct__23dSvBit_childItZoneHIO_cFv.s" +dSvBit_childItZoneHIO_c::dSvBit_childItZoneHIO_c() { + for (int i = 0; i < 0x20; i++) { + field_0x5[i] = 0; + field_0x25[i] = 0; + } } -#pragma pop /* 8025BEDC-8025BF08 25681C 002C+00 1/1 0/0 0/0 .text init__23dSvBit_childItZoneHIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dSvBit_childItZoneHIO_c::init() { - nofralloc -#include "asm/d/save/d_save_HIO/init__23dSvBit_childItZoneHIO_cFv.s" +void dSvBit_childItZoneHIO_c::init() { + for (int i = 0; i < 0x20; i++) { + field_0x5[i] = 0; + field_0x25[i] = field_0x5[i]; + } } -#pragma pop /* 8025BF08-8025BF3C 256848 0034+00 1/1 0/0 0/0 .text __ct__26dSvBit_childItOneZoneHIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dSvBit_childItOneZoneHIO_c::dSvBit_childItOneZoneHIO_c() { - nofralloc -#include "asm/d/save/d_save_HIO/__ct__26dSvBit_childItOneZoneHIO_cFv.s" +dSvBit_childItOneZoneHIO_c::dSvBit_childItOneZoneHIO_c() { + for (int i = 0; i < 0x10; i++) { + field_0x5[i] = 0; + field_0x15[i] = 0; + } } -#pragma pop /* 8025BF3C-8025BF68 25687C 002C+00 1/1 0/0 0/0 .text init__26dSvBit_childItOneZoneHIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dSvBit_childItOneZoneHIO_c::init() { - nofralloc -#include "asm/d/save/d_save_HIO/init__26dSvBit_childItOneZoneHIO_cFv.s" +void dSvBit_childItOneZoneHIO_c::init() { + for (int i = 0; i < 0x10; i++) { + field_0x5[i] = 0; + field_0x15[i] = field_0x5[i]; + } } -#pragma pop /* 8025BF68-8025BF9C 2568A8 0034+00 1/1 0/0 0/0 .text __ct__29dSvBit_childTbPerfectionHIO_cFv */ dSvBit_childTbPerfectionHIO_c::dSvBit_childTbPerfectionHIO_c() { for (int i = 0; i < 0x40; i++) { - field_0x5[i] = false; - field_0x45[i] = false; + field_0x5[i] = 0; + field_0x45[i] = 0; } } /* 8025BF9C-8025C004 2568DC 0068+00 1/1 0/0 0/0 .text init__29dSvBit_childTbPerfectionHIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dSvBit_childTbPerfectionHIO_c::init() { - nofralloc -#include "asm/d/save/d_save_HIO/init__29dSvBit_childTbPerfectionHIO_cFv.s" +void dSvBit_childTbPerfectionHIO_c::init() { + for (int i = 0; i < 0x40; i++) { + field_0x5[i] = dComIfGs_isTbox(i); + field_0x45[i] = field_0x5[i]; + } } -#pragma pop /* 8025C004-8025C038 256944 0034+00 1/1 0/0 0/0 .text __ct__25dSvBit_childDarknessHIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dSvBit_childDarknessHIO_c::dSvBit_childDarknessHIO_c() { - nofralloc -#include "asm/d/save/d_save_HIO/__ct__25dSvBit_childDarknessHIO_cFv.s" +dSvBit_childDarknessHIO_c::dSvBit_childDarknessHIO_c() { + for (int i = 0; i < 6; i++) { + TW[i] = 0; + field_0xB[i] = 0; + } } -#pragma pop /* 8025C038-8025C0A0 256978 0068+00 1/1 0/0 0/0 .text init__25dSvBit_childDarknessHIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dSvBit_childDarknessHIO_c::init() { - nofralloc -#include "asm/d/save/d_save_HIO/init__25dSvBit_childDarknessHIO_cFv.s" +void dSvBit_childDarknessHIO_c::init() { + for (int i = 0; i < 6; i++) { + TW[i] = dComIfGs_isDarkClearLV(i); + field_0xB[i] = TW[i]; + } } -#pragma pop /* 8025C0A0-8025C0D4 2569E0 0034+00 1/1 0/0 0/0 .text __ct__26dSvBit_childTransformHIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dSvBit_childTransformHIO_c::dSvBit_childTransformHIO_c() { - nofralloc -#include "asm/d/save/d_save_HIO/__ct__26dSvBit_childTransformHIO_cFv.s" +dSvBit_childTransformHIO_c::dSvBit_childTransformHIO_c() { + for (int i = 0; i < 4; i++) { + WF[i] = 0; + field_0x9[i] = 0; + } } -#pragma pop /* 8025C0D4-8025C13C 256A14 0068+00 1/1 0/0 0/0 .text init__26dSvBit_childTransformHIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dSvBit_childTransformHIO_c::init() { - nofralloc -#include "asm/d/save/d_save_HIO/init__26dSvBit_childTransformHIO_cFv.s" +void dSvBit_childTransformHIO_c::init() { + for (int i = 0; i < 4; i++) { + WF[i] = dComIfGs_isTransformLV(i); + field_0x9[i] = WF[i]; + } } -#pragma pop /* 8025C13C-8025C178 256A7C 003C+00 1/1 0/0 0/0 .text __ct__22dSvBit_childOtherHIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dSvBit_childOtherHIO_c::dSvBit_childOtherHIO_c() { - nofralloc -#include "asm/d/save/d_save_HIO/__ct__22dSvBit_childOtherHIO_cFv.s" +dSvBit_childOtherHIO_c::dSvBit_childOtherHIO_c() { + mDropNum = 0; + field_0x6 = 0; + for (int i = 0; i < 4; i++) { + mLightVessel[i] = 0; + field_0xb[i] = 0; + } } -#pragma pop /* 8025C178-8025C1F8 256AB8 0080+00 1/1 0/0 0/0 .text init__22dSvBit_childOtherHIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dSvBit_childOtherHIO_c::init() { - nofralloc -#include "asm/d/save/d_save_HIO/init__22dSvBit_childOtherHIO_cFv.s" +void dSvBit_childOtherHIO_c::init() { + mDropNum = dComIfGs_getLightDropNum(dComIfGp_getStartStageDarkArea()); + field_0x6 = mDropNum; + for (int i = 0; i < 4; i++) { + mLightVessel[i] = dComIfGs_isLightDropGetFlag(i); + field_0xb[i] = mLightVessel[i]; + } } -#pragma pop /* 8025C1F8-8025C29C 256B38 00A4+00 0/0 1/1 0/0 .text init__12dSvBit_HIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dSvBit_HIO_c::init() { - nofralloc -#include "asm/d/save/d_save_HIO/init__12dSvBit_HIO_cFv.s" +void dSvBit_HIO_c::init() { + mSwitch.init(); + mItem.init(); + mTreasure.init(); + mDarkness.init(); + mTransform.init(); + mOther.init(); + mTransformFlag = field_0x49d = i_dComIfGs_isEventBit(dSv_event_flag_c::M_077); } -#pragma pop - -/* 8025C29C-8025C2E4 256BDC 0048+00 1/0 0/0 0/0 .text __dt__22dSvBit_childOtherHIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm dSvBit_childOtherHIO_c::~dSvBit_childOtherHIO_c() { -extern "C" asm void __dt__22dSvBit_childOtherHIO_cFv() { - nofralloc -#include "asm/d/save/d_save_HIO/__dt__22dSvBit_childOtherHIO_cFv.s" -} -#pragma pop - -/* 8025C2E4-8025C32C 256C24 0048+00 1/0 0/0 0/0 .text __dt__26dSvBit_childTransformHIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm dSvBit_childTransformHIO_c::~dSvBit_childTransformHIO_c() { -extern "C" asm void __dt__26dSvBit_childTransformHIO_cFv() { - nofralloc -#include "asm/d/save/d_save_HIO/__dt__26dSvBit_childTransformHIO_cFv.s" -} -#pragma pop - -/* 8025C32C-8025C374 256C6C 0048+00 1/0 0/0 0/0 .text __dt__25dSvBit_childDarknessHIO_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm dSvBit_childDarknessHIO_c::~dSvBit_childDarknessHIO_c() { -extern "C" asm void __dt__25dSvBit_childDarknessHIO_cFv() { - nofralloc -#include "asm/d/save/d_save_HIO/__dt__25dSvBit_childDarknessHIO_cFv.s" -} -#pragma pop - -/* 8025C374-8025C3BC 256CB4 0048+00 1/0 0/0 0/0 .text __dt__29dSvBit_childTbPerfectionHIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm dSvBit_childTbPerfectionHIO_c::~dSvBit_childTbPerfectionHIO_c() { -extern "C" asm void __dt__29dSvBit_childTbPerfectionHIO_cFv() { - nofralloc -#include "asm/d/save/d_save_HIO/__dt__29dSvBit_childTbPerfectionHIO_cFv.s" -} -#pragma pop - -/* 8025C3BC-8025C404 256CFC 0048+00 1/0 0/0 0/0 .text __dt__26dSvBit_childItOneZoneHIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm dSvBit_childItOneZoneHIO_c::~dSvBit_childItOneZoneHIO_c() { -extern "C" asm void __dt__26dSvBit_childItOneZoneHIO_cFv() { - nofralloc -#include "asm/d/save/d_save_HIO/__dt__26dSvBit_childItOneZoneHIO_cFv.s" -} -#pragma pop - -/* 8025C404-8025C44C 256D44 0048+00 1/0 0/0 0/0 .text __dt__23dSvBit_childItZoneHIO_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm dSvBit_childItZoneHIO_c::~dSvBit_childItZoneHIO_c() { -extern "C" asm void __dt__23dSvBit_childItZoneHIO_cFv() { - nofralloc -#include "asm/d/save/d_save_HIO/__dt__23dSvBit_childItZoneHIO_cFv.s" -} -#pragma pop - -/* 8025C44C-8025C494 256D8C 0048+00 1/0 0/0 0/0 .text __dt__26dSvBit_childItDungeonHIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm dSvBit_childItDungeonHIO_c::~dSvBit_childItDungeonHIO_c() { -extern "C" asm void __dt__26dSvBit_childItDungeonHIO_cFv() { - nofralloc -#include "asm/d/save/d_save_HIO/__dt__26dSvBit_childItDungeonHIO_cFv.s" -} -#pragma pop - -/* 8025C494-8025C4DC 256DD4 0048+00 1/0 0/0 0/0 .text __dt__29dSvBit_childItPerfectionHIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm dSvBit_childItPerfectionHIO_c::~dSvBit_childItPerfectionHIO_c() { -extern "C" asm void __dt__29dSvBit_childItPerfectionHIO_cFv() { - nofralloc -#include "asm/d/save/d_save_HIO/__dt__29dSvBit_childItPerfectionHIO_cFv.s" -} -#pragma pop - -/* 8025C4DC-8025C524 256E1C 0048+00 1/0 0/0 0/0 .text __dt__26dSvBit_childSwOneZoneHIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm dSvBit_childSwOneZoneHIO_c::~dSvBit_childSwOneZoneHIO_c() { -extern "C" asm void __dt__26dSvBit_childSwOneZoneHIO_cFv() { - nofralloc -#include "asm/d/save/d_save_HIO/__dt__26dSvBit_childSwOneZoneHIO_cFv.s" -} -#pragma pop - -/* 8025C524-8025C56C 256E64 0048+00 1/0 0/0 0/0 .text __dt__23dSvBit_childSwZoneHIO_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm dSvBit_childSwZoneHIO_c::~dSvBit_childSwZoneHIO_c() { -extern "C" asm void __dt__23dSvBit_childSwZoneHIO_cFv() { - nofralloc -#include "asm/d/save/d_save_HIO/__dt__23dSvBit_childSwZoneHIO_cFv.s" -} -#pragma pop - -/* 8025C56C-8025C5B4 256EAC 0048+00 1/0 0/0 0/0 .text __dt__26dSvBit_childSwDungeonHIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm dSvBit_childSwDungeonHIO_c::~dSvBit_childSwDungeonHIO_c() { -extern "C" asm void __dt__26dSvBit_childSwDungeonHIO_cFv() { - nofralloc -#include "asm/d/save/d_save_HIO/__dt__26dSvBit_childSwDungeonHIO_cFv.s" -} -#pragma pop - -/* 8025C5B4-8025C5FC 256EF4 0048+00 1/0 0/0 0/0 .text __dt__29dSvBit_childSwPerfectionHIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm dSvBit_childSwPerfectionHIO_c::~dSvBit_childSwPerfectionHIO_c() { -extern "C" asm void __dt__29dSvBit_childSwPerfectionHIO_cFv() { - nofralloc -#include "asm/d/save/d_save_HIO/__dt__29dSvBit_childSwPerfectionHIO_cFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 803C3390-803C339C 0204B0 000C+00 3/3 0/0 0/0 .data __vt__25dSvBit_childTreasureHIO_c - */ -SECTION_DATA extern void* __vt__25dSvBit_childTreasureHIO_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__25dSvBit_childTreasureHIO_cFv, -}; - -/* 803C339C-803C33A8 0204BC 000C+00 3/3 0/0 0/0 .data __vt__21dSvBit_childItemHIO_c */ -SECTION_DATA extern void* __vt__21dSvBit_childItemHIO_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__21dSvBit_childItemHIO_cFv, -}; - -/* 803C33A8-803C33B4 0204C8 000C+00 3/3 0/0 0/0 .data __vt__23dSvBit_childSwitchHIO_c */ -SECTION_DATA extern void* __vt__23dSvBit_childSwitchHIO_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__23dSvBit_childSwitchHIO_cFv, -}; - -/* 803C33B4-803C33C0 0204D4 000C+00 2/2 0/0 0/0 .data __vt__12dSvBit_HIO_c */ -SECTION_DATA extern void* __vt__12dSvBit_HIO_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__12dSvBit_HIO_cFv, -}; - -/* 804307E0-804307EC 05D500 000C+00 1/1 0/0 0/0 .bss @3659 */ -static u8 lit_3659[12]; /* 804307EC-80430C90 05D50C 04A0+04 1/1 2/2 0/0 .bss g_save_bit_HIO */ -extern u8 g_save_bit_HIO[1184 + 4 /* padding */]; -u8 g_save_bit_HIO[1184 + 4 /* padding */]; +dSvBit_HIO_c g_save_bit_HIO; -/* 8025C5FC-8025C6FC 256F3C 0100+00 0/0 1/0 0/0 .text __sinit_d_save_HIO_cpp */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void __sinit_d_save_HIO_cpp() { - nofralloc -#include "asm/d/save/d_save_HIO/__sinit_d_save_HIO_cpp.s" -} -#pragma pop - -#pragma push -#pragma force_active on -REGISTER_CTORS(0x8025C5FC, __sinit_d_save_HIO_cpp); -#pragma pop - -/* 8025C6FC-8025C874 25703C 0178+00 2/1 0/0 0/0 .text __dt__12dSvBit_HIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm dSvBit_HIO_c::~dSvBit_HIO_c() { -extern "C" asm void __dt__12dSvBit_HIO_cFv() { - nofralloc -#include "asm/d/save/d_save_HIO/__dt__12dSvBit_HIO_cFv.s" -} -#pragma pop - -/* 8025C874-8025C8D4 2571B4 0060+00 1/0 0/0 0/0 .text __dt__25dSvBit_childTreasureHIO_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm dSvBit_childTreasureHIO_c::~dSvBit_childTreasureHIO_c() { -extern "C" asm void __dt__25dSvBit_childTreasureHIO_cFv() { - nofralloc -#include "asm/d/save/d_save_HIO/__dt__25dSvBit_childTreasureHIO_cFv.s" -} -#pragma pop - -/* 8025C8D4-8025C970 257214 009C+00 1/0 0/0 0/0 .text __dt__21dSvBit_childItemHIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm dSvBit_childItemHIO_c::~dSvBit_childItemHIO_c() { -extern "C" asm void __dt__21dSvBit_childItemHIO_cFv() { - nofralloc -#include "asm/d/save/d_save_HIO/__dt__21dSvBit_childItemHIO_cFv.s" -} -#pragma pop - -/* 8025C970-8025CA0C 2572B0 009C+00 1/0 0/0 0/0 .text __dt__23dSvBit_childSwitchHIO_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm dSvBit_childSwitchHIO_c::~dSvBit_childSwitchHIO_c() { -extern "C" asm void __dt__23dSvBit_childSwitchHIO_cFv() { - nofralloc -#include "asm/d/save/d_save_HIO/__dt__23dSvBit_childSwitchHIO_cFv.s" -} -#pragma pop diff --git a/src/d/shop/d_shop_system.cpp b/src/d/shop/d_shop_system.cpp index 34b2ac1c67..c7dfe7e638 100644 --- a/src/d/shop/d_shop_system.cpp +++ b/src/d/shop/d_shop_system.cpp @@ -4,6 +4,7 @@ // #include "d/shop/d_shop_system.h" +#include "rel/d/a/tag/d_a_tag_shop_item/d_a_tag_shop_item.h" #include "SSystem/SComponent/c_math.h" #include "d/a/d_a_shop_item_static.h" #include "d/com/d_com_inf_game.h" @@ -208,7 +209,7 @@ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { }; /* 803BB8A4-803BB8C0 0189C4 001C+00 6/6 0/0 0/0 .data dShopSystem_itemActor */ -SECTION_DATA static fopAc_ac_c* dShopSystem_itemActor[7] = { +SECTION_DATA static daTag_ShopItem_c* dShopSystem_itemActor[7] = { NULL, NULL, NULL, NULL, NULL, NULL, NULL, }; @@ -249,10 +250,10 @@ static int dShopSystem_searchItemActor(void* param_0, void* param_1) { } else { if (param2 == 0) { data_80451060 = 1; - dShopSystem_itemActor[dShopSystem_item_count] = (fopAc_ac_c*) param_0; + dShopSystem_itemActor[dShopSystem_item_count] = (daTag_ShopItem_c*) param_0; dShopSystem_itemNo[dShopSystem_item_count] = item_no; } else if (dShopSystem_itemActor[param2 - 1] == NULL) { - dShopSystem_itemActor[param2 - 1] = (fopAc_ac_c*) param_0; + dShopSystem_itemActor[param2 - 1] = (daTag_ShopItem_c*) param_0; dShopSystem_itemNo[param2 - 1] = item_no; } dShopSystem_item_count++; @@ -298,25 +299,9 @@ static int dShopSystem_searchCameraActor(void* param_0, void* param_1) { } /* ############################################################################################## */ -/* 80453B00-80453B04 002100 0004+00 1/1 0/0 0/0 .sdata2 @4097 */ -SECTION_SDATA2 static f32 lit_4097 = 9.0f / 10.0f; - -/* 80453B04-80453B08 002104 0004+00 2/2 0/0 0/0 .sdata2 @4098 */ -SECTION_SDATA2 static f32 lit_4098 = 0.5f; - -/* 80453B08-80453B0C 002108 0004+00 5/5 0/0 0/0 .sdata2 @4099 */ -SECTION_SDATA2 static f32 lit_4099 = 1.0f; - -/* 80453B0C-80453B10 00210C 0004+00 1/1 0/0 0/0 .sdata2 @4100 */ -SECTION_SDATA2 static f32 lit_4100 = 1.0f / 10.0f; - -/* 80453B10-80453B14 002110 0004+00 1/1 0/0 0/0 .sdata2 @4101 */ -SECTION_SDATA2 static f32 lit_4101 = 7.0f / 10.0f; /* 80197338-801974E4 191C78 01AC+00 0/0 0/0 19/19 .text initShopSystem__13dShopSystem_cFv */ -// matches with literals -#ifdef NONMATCHING void dShopSystem_c::initShopSystem() { data_80451058 = 3; data_80451060 = 0; @@ -362,16 +347,6 @@ void dShopSystem_c::initShopSystem() { field_0xf78 = -1; mFlow.onNonStopJunpFlowFlag(); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dShopSystem_c::initShopSystem() { - nofralloc -#include "asm/d/shop/d_shop_system/initShopSystem__13dShopSystem_cFv.s" -} -#pragma pop -#endif struct shop_item_data { Vec mItemPos[3]; @@ -396,16 +371,6 @@ static processFunc process[22] = { &dShopSystem_c::seq_decide_no, &dShopSystem_c::seq_finish, (processFunc)&dShopSystem_c::seq_event, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, }; #else /* 803BB8E4-803BB8F0 -00001 000C+00 0/1 0/0 0/0 .data @4056 */ @@ -900,21 +865,8 @@ int dShopSystem_c::checkController(u8 seq, dMsgFlow_c* p_flow) { } /* ############################################################################################## */ -/* 80453B14-80453B18 002114 0004+00 4/4 0/0 0/0 .sdata2 @4493 */ -SECTION_SDATA2 static f32 lit_4493 = -1.0f; - -/* 80453B18-80453B1C 002118 0004+00 8/8 0/0 0/0 .sdata2 @4494 */ -SECTION_SDATA2 static f32 lit_4494 = 0.25f; - -/* 80453B1C-80453B20 00211C 0004+00 9/9 0/0 0/0 .sdata2 @4495 */ -SECTION_SDATA2 static f32 lit_4495 = 20.0f; - -/* 80453B20-80453B24 002120 0004+00 9/9 0/0 0/0 .sdata2 @4496 */ -SECTION_SDATA2 static f32 lit_4496 = 5.0f; /* 80197808-80197DD0 192148 05C8+00 1/1 0/0 0/0 .text chooseItem3__13dShopSystem_cFUc */ -// matches with literals -#ifdef NONMATCHING int dShopSystem_c::chooseItem3(u8 seq) { u8 old_cursor = mLastCursorPos; if (checkLeftTrigger(mpStick) && seq != SEQ_SELECT_WAIT) { @@ -1051,20 +1003,8 @@ up: ret: return 0; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int dShopSystem_c::chooseItem3(u8 param_0) { - nofralloc -#include "asm/d/shop/d_shop_system/chooseItem3__13dShopSystem_cFUc.s" -} -#pragma pop -#endif /* 80197DD0-80198250 192710 0480+00 1/1 0/0 0/0 .text chooseItem5__13dShopSystem_cFUc */ -// matches with literals -#ifdef NONMATCHING int dShopSystem_c::chooseItem5(u8 seq) { u8 old_cursor = mLastCursorPos; if (checkLeftTrigger(mpStick) && seq != SEQ_SELECT_WAIT) { @@ -1178,20 +1118,8 @@ down: ret: return 0; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int dShopSystem_c::chooseItem5(u8 seq) { - nofralloc -#include "asm/d/shop/d_shop_system/chooseItem5__13dShopSystem_cFUc.s" -} -#pragma pop -#endif /* 80198250-80198444 192B90 01F4+00 1/1 0/0 0/0 .text chooseItem4__13dShopSystem_cFUc */ -// matches with literals. gotos can probably be removed -#ifdef NONMATCHING int dShopSystem_c::chooseItem4(u8 seq) { u8 old_cursor = mLastCursorPos; if (checkLeftTrigger(mpStick) && seq != SEQ_SELECT_WAIT && mCursorPos != 0) { @@ -1233,16 +1161,6 @@ right: ret: return 0; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int dShopSystem_c::chooseItem4(u8 seq) { - nofralloc -#include "asm/d/shop/d_shop_system/chooseItem4__13dShopSystem_cFUc.s" -} -#pragma pop -#endif /* 80198444-80198488 192D84 0044+00 5/5 0/0 0/0 .text moveCursor__13dShopSystem_cFiUc */ int dShopSystem_c::moveCursor(int control_status, u8 param_1) { @@ -1258,8 +1176,6 @@ int dShopSystem_c::moveCursor(int control_status, u8 param_1) { } /* 80198488-80198708 192DC8 0280+00 1/1 0/0 0/0 .text moveCursor0__13dShopSystem_cFiUc */ -// matches with literals -#ifdef NONMATCHING int dShopSystem_c::moveCursor0(int control_status, u8 param_1) { offFlag(7); @@ -1313,23 +1229,16 @@ int dShopSystem_c::moveCursor0(int control_status, u8 param_1) { return 0; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int dShopSystem_c::moveCursor0(int param_0, u8 param_1) { - nofralloc -#include "asm/d/shop/d_shop_system/moveCursor0__13dShopSystem_cFiUc.s" -} -#pragma pop -#endif /* 80198708-80198878 193048 0170+00 1/1 0/0 0/0 .text moveCursor1__13dShopSystem_cFiUc */ -#ifdef NONMATCHING int dShopSystem_c::moveCursor1(int control_status, u8 param_1) { offFlag(7); switch (control_status) { + case 3: + case 4: + case 5: + case 6: case 7: if (mCursorPos == 0) { return getFlowNodeNum() + 1; @@ -1362,16 +1271,6 @@ int dShopSystem_c::moveCursor1(int control_status, u8 param_1) { return 0; } } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int dShopSystem_c::moveCursor1(int param_0, u8 param_1) { - nofralloc -#include "asm/d/shop/d_shop_system/moveCursor1__13dShopSystem_cFiUc.s" -} -#pragma pop -#endif /* 80198878-80198950 1931B8 00D8+00 0/0 0/0 9/9 .text drawCursor__13dShopSystem_cFv */ int dShopSystem_c::drawCursor() { @@ -1426,39 +1325,8 @@ int dShopSystem_c::itemRotate() { } /* ############################################################################################## */ -/* 80394C10-80394C10 021270 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80394C10 = "R_SP01"; -#pragma pop - -/* 80453B24-80453B28 002124 0004+00 1/1 0/0 0/0 .sdata2 @5000 */ -SECTION_SDATA2 static f32 lit_5000 = -25.0f; - -/* 80453B28-80453B2C 002128 0004+00 1/1 0/0 0/0 .sdata2 @5001 */ -SECTION_SDATA2 static f32 lit_5001 = 150.0f; - -/* 80453B2C-80453B30 00212C 0004+00 1/1 0/0 0/0 .sdata2 @5002 */ -SECTION_SDATA2 static f32 lit_5002 = -50.0f; - -/* 80453B30-80453B34 002130 0004+00 1/1 0/0 0/0 .sdata2 @5003 */ -SECTION_SDATA2 static f32 lit_5003 = 250.0f; - -/* 80453B34-80453B38 002134 0004+00 1/1 0/0 0/0 .sdata2 @5004 */ -SECTION_SDATA2 static f32 lit_5004 = 60.0f; - -/* 80453B38-80453B3C 002138 0004+00 1/1 0/0 0/0 .sdata2 @5005 */ -SECTION_SDATA2 static f32 lit_5005 = -130.0f; - -/* 80453B3C-80453B40 00213C 0004+00 2/2 0/0 0/0 .sdata2 @5006 */ -SECTION_SDATA2 static f32 lit_5006 = 215.0f; - -/* 80453B40-80453B44 002140 0004+00 1/1 0/0 0/0 .sdata2 @5007 */ -SECTION_SDATA2 static f32 lit_5007 = 15.0f; /* 80198A2C-801990B0 19336C 0684+00 0/0 0/0 9/9 .text itemZoom__13dShopSystem_cFP4cXyz */ -// matches with literals -#ifdef NONMATCHING int dShopSystem_c::itemZoom(cXyz* param_0) { cXyz local_1c; @@ -1519,11 +1387,11 @@ int dShopSystem_c::itemZoom(cXyz* param_0) { if (dShopSystem_itemNo[mCursorPos - 1] == ARROW_10 || dShopSystem_itemNo[mCursorPos - 1] == ARROW_20 || dShopSystem_itemNo[mCursorPos - 1] == ARROW_30) { - local_34.set(g_cursorHIO.mObjZoom.x, 5.0f + g_cursorHIO.mObjZoom.y + -50.0f, + local_34.set(g_cursorHIO.mObjZoom.x, -50.0f + g_cursorHIO.mObjZoom.y + 5.0f, (g_cursorHIO.mObjZoom.z + 250.0f) - 60.0f); } else { local_34.set(g_cursorHIO.mObjZoom.x, - 20.0f + g_cursorHIO.mObjZoom.y + -50.0f, + -50.0f + g_cursorHIO.mObjZoom.y + 20.0f, (g_cursorHIO.mObjZoom.z + 250.0f) - 60.0f); } } else if (mCursorPos == 7) { @@ -1589,16 +1457,6 @@ int dShopSystem_c::itemZoom(cXyz* param_0) { return 1; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int dShopSystem_c::itemZoom(cXyz* param_0) { - nofralloc -#include "asm/d/shop/d_shop_system/itemZoom__13dShopSystem_cFP4cXyz.s" -} -#pragma pop -#endif /* 801990B0-801990B8 1939F0 0008+00 1/0 0/0 0/0 .text * seq_wait__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c */ @@ -1607,13 +1465,6 @@ int dShopSystem_c::seq_wait(fopAc_ac_c* param_0, dMsgFlow_c* param_1) { } /* ############################################################################################## */ -/* 80453B44-80453B48 002144 0004+00 3/3 0/0 0/0 .sdata2 @5084 */ -SECTION_SDATA2 static u8 lit_5084[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; inline void pos3Dto2D(Vec* a, Vec* b) { mDoLib_project(a, b); @@ -1621,8 +1472,6 @@ inline void pos3Dto2D(Vec* a, Vec* b) { /* 801990B8-8019936C 1939F8 02B4+00 1/0 0/0 0/0 .text * seq_start__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c */ -// matches with literals -#ifdef NONMATCHING int dShopSystem_c::seq_start(fopAc_ac_c* actor, dMsgFlow_c* p_flow) { if (field_0xf79 != 0) { dComIfGp_setDoStatusForce(0, 0); @@ -1690,16 +1539,6 @@ int dShopSystem_c::seq_start(fopAc_ac_c* actor, dMsgFlow_c* p_flow) { return 0; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int dShopSystem_c::seq_start(fopAc_ac_c* param_0, dMsgFlow_c* param_1) { - nofralloc -#include "asm/d/shop/d_shop_system/seq_start__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s" -} -#pragma pop -#endif /* 8019936C-801993C4 193CAC 0058+00 1/0 0/0 0/0 .text * seq_select_wait__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c */ @@ -1714,8 +1553,6 @@ int dShopSystem_c::seq_select_wait(fopAc_ac_c*, dMsgFlow_c*) { /* 801993C4-8019959C 193D04 01D8+00 1/0 0/0 0/0 .text * seq_select_start__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c */ -// matches with literals -#ifdef NONMATCHING int dShopSystem_c::seq_select_start(fopAc_ac_c*, dMsgFlow_c*) { if (field_0xf60 < 0 && field_0xf76 == 0 && dShopSystem_item_count != -1) { if (dShopSystem_item_count != data_80451058) { @@ -1765,21 +1602,9 @@ int dShopSystem_c::seq_select_start(fopAc_ac_c*, dMsgFlow_c*) { return 0; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int dShopSystem_c::seq_select_start(fopAc_ac_c* param_0, dMsgFlow_c* param_1) { - nofralloc -#include "asm/d/shop/d_shop_system/seq_select_start__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s" -} -#pragma pop -#endif /* 8019959C-80199A18 193EDC 047C+00 1/0 0/0 0/0 .text * seq_select__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c */ -// matches with literals -#ifdef NONMATCHING int dShopSystem_c::seq_select(fopAc_ac_c* actor, dMsgFlow_c* p_flow) { if (chkSpMode() && !beforeSelectSeqAction(p_flow, field_0xf5c)) { return 0; @@ -1883,32 +1708,11 @@ int dShopSystem_c::seq_select(fopAc_ac_c* actor, dMsgFlow_c* p_flow) { return 0; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int dShopSystem_c::seq_select(fopAc_ac_c* param_0, dMsgFlow_c* param_1) { - nofralloc -#include "asm/d/shop/d_shop_system/seq_select__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s" -} -#pragma pop -#endif /* ############################################################################################## */ -/* 80453B48-80453B50 002148 0004+04 1/1 0/0 0/0 .sdata2 @5296 */ -SECTION_SDATA2 static f32 lit_5296[1 + 1 /* padding */] = { - 9.0f, - /* padding */ - 0.0f, -}; - -/* 80453B50-80453B58 002150 0008+00 1/1 0/0 0/0 .sdata2 @5298 */ -SECTION_SDATA2 static f64 lit_5298 = 4503601774854144.0 /* cast s32 to float */; /* 80199A18-80199BF8 194358 01E0+00 1/0 0/0 0/0 .text * seq_moving__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c */ -// matches with literals -#ifdef NONMATCHING int dShopSystem_c::seq_moving(fopAc_ac_c*, dMsgFlow_c*) { field_0xf68++; @@ -1952,16 +1756,6 @@ int dShopSystem_c::seq_moving(fopAc_ac_c*, dMsgFlow_c*) { return 0; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int dShopSystem_c::seq_moving(fopAc_ac_c* param_0, dMsgFlow_c* param_1) { - nofralloc -#include "asm/d/shop/d_shop_system/seq_moving__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s" -} -#pragma pop -#endif /* 80199BF8-80199D14 194538 011C+00 1/0 0/0 0/0 .text * seq_decide__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c */ @@ -2019,8 +1813,6 @@ int dShopSystem_c::seq_choose(fopAc_ac_c* actor, dMsgFlow_c* p_flow) { /* 80199E28-80199FA4 194768 017C+00 1/0 0/0 0/0 .text * seq_decide_yes__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c */ -// matches with literals -#ifdef NONMATCHING int dShopSystem_c::seq_decide_yes(fopAc_ac_c* actor, dMsgFlow_c* p_flow) { if (dMsgObject_getMessageID() == 0x1B82) { mShopCamAction.SetSelectIdx(0); @@ -2061,16 +1853,6 @@ int dShopSystem_c::seq_decide_yes(fopAc_ac_c* actor, dMsgFlow_c* p_flow) { return 0; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int dShopSystem_c::seq_decide_yes(fopAc_ac_c* param_0, dMsgFlow_c* param_1) { - nofralloc -#include "asm/d/shop/d_shop_system/seq_decide_yes__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s" -} -#pragma pop -#endif /* 80199FA4-8019A020 1948E4 007C+00 1/0 0/0 0/0 .text * seq_decide_no__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c */ @@ -2120,11 +1902,9 @@ int dShopSystem_c::shop_init(bool param_0) { /* 8019A158-8019A238 194A98 00E0+00 0/0 0/0 9/9 .text * shop_process__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c */ -// process array match issues -#ifdef NONMATCHING int dShopSystem_c::shop_process(fopAc_ac_c* param_0, dMsgFlow_c* param_1) { int iVar1; - iVar1 = (this->*process[mSeq])(param_0, param_1); + iVar1 = (this->*((processFunc*)process)[mSeq])(param_0, param_1); if (mWaitTimer != 0) { mWaitTimer--; @@ -2149,16 +1929,6 @@ int dShopSystem_c::shop_process(fopAc_ac_c* param_0, dMsgFlow_c* param_1) { } return iVar1; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int dShopSystem_c::shop_process(fopAc_ac_c* param_0, dMsgFlow_c* param_1) { - nofralloc -#include "asm/d/shop/d_shop_system/shop_process__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s" -} -#pragma pop -#endif /* ############################################################################################## */ /* 804506F8-80450700 -00001 0004+04 1/1 0/0 0/0 .sdata shop_item_pos_data_tbl */ @@ -2278,40 +2048,134 @@ void dShopSystem_c::deleteObject() { } /* ############################################################################################## */ -/* 80453B60-80453B64 002160 0004+00 1/1 0/0 0/0 .sdata2 @5687 */ -SECTION_SDATA2 static f32 lit_5687 = -175.0f; - -/* 80453B64-80453B68 002164 0004+00 1/1 0/0 0/0 .sdata2 @5688 */ -SECTION_SDATA2 static f32 lit_5688 = 165.0f; - -/* 80453B68-80453B6C 002168 0004+00 1/1 0/0 0/0 .sdata2 @5689 */ -SECTION_SDATA2 static f32 lit_5689 = 10.0f; - -/* 80453B6C-80453B70 00216C 0004+00 1/1 0/0 0/0 .sdata2 @5690 */ -SECTION_SDATA2 static f32 lit_5690 = 225.0f; - -/* 80453B70-80453B74 002170 0004+00 1/1 0/0 0/0 .sdata2 @5691 */ -SECTION_SDATA2 static f32 lit_5691 = 370.0f; - -/* 80453B74-80453B78 002174 0004+00 1/1 0/0 0/0 .sdata2 @5692 */ -SECTION_SDATA2 static f32 lit_5692 = -180.0f; - -/* 80453B78-80453B7C 002178 0004+00 1/1 0/0 0/0 .sdata2 @5693 */ -SECTION_SDATA2 static f32 lit_5693 = 245.0f; - -/* 80453B7C-80453B80 00217C 0004+00 1/1 0/0 0/0 .sdata2 @5694 */ -SECTION_SDATA2 static f32 lit_5694 = -380.0f; /* 8019A5D0-8019AB00 194F10 0530+00 1/1 0/0 8/8 .text searchItemActor__13dShopSystem_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dShopSystem_c::searchItemActor() { - nofralloc -#include "asm/d/shop/d_shop_system/searchItemActor__13dShopSystem_cFv.s" +int dShopSystem_c::searchItemActor() { + u8 temp_data; + if ((dShopSystem_item_count != -1 && ((dShopSystem_item_count < (temp_data = data_80451058)) || dShopSystem_camera_count < 2))) { + if (dShopSystem_item_count < temp_data) { + fpcEx_Search((fpcLyIt_JudgeFunc)dShopSystem_searchItemActor, this); + } + if (dShopSystem_camera_count < 2) { + fpcEx_Search((fpcLyIt_JudgeFunc)dShopSystem_searchCameraActor, this); + } + return 0; + } + + if (dShopSystem_item_count >= data_80451058 && dShopSystem_camera_count >= 2) { + mSoldOutFlag = -1; + if (data_80451060) { + f32 actorDistArr[7]; + u8 itemNoArr[7]; + f32 arr2[7]; + daTag_ShopItem_c* actorArr[7]; + u8 arr3[7]; + for (int i = 0; i < data_80451058; i++) { + actorArr[i] = dShopSystem_itemActor[i]; + itemNoArr[i] = dShopSystem_itemNo[i]; + actorDistArr[i] = fopAcM_searchActorDistance(this, actorArr[i]); + arr2[i] = 0.0f; + arr3[i] = 0; + } + for (int i = 0; i < data_80451058; i++) { + arr2[i] = actorDistArr[i]; + arr3[i] = i; + if (i > 0) { + for (int j = i; j >= 0; j--) { + if (arr2[j] < arr2[j-1]) { + f32 temp = arr2[j]; + arr2[j] = arr2[j-1]; + arr2[j-1] = temp; + u8 temp2 = arr3[j]; + arr3[j] = arr3[j-1]; + arr3[j-1] = temp2; + } + } + } + } + for (int i = 0; i < data_80451058; i++) { + dShopSystem_itemActor[i] = actorArr[arr3[i]]; + dShopSystem_itemNo[i] = itemNoArr[arr3[i]]; + } + } + + for (int i = 0; i < data_80451058; i++) { + u32 processId = dShopSystem_itemActor[i]->getProcessID(); + mItemCtrl.setItemIndex(i, processId); + mItemCtrl.setMessageIndex(i, (u16)dShopSystem_itemActor[i]->orig.angle.GetX() != 0xffff ? (u16)dShopSystem_itemActor[i]->orig.angle.GetX() : -1); + + if (processId + 0x10000 == 0xffff) { + onFlag(i); + onSoldOutItemFlag(i); + } else { + offFlag(i); + if ((u8)fopAcM_GetParam(dShopSystem_itemActor[i]) == 0xff) { + onSoldOutItemFlag(i); + } else { + offSoldOutItemFlag(i); + } + } + } + + if (field_0xf77 == 8) { + dShopSystem_cameraActor[0]->current.pos.set(-175.0f, 165.0f, 10.0f); + dShopSystem_cameraActor[1]->current.pos.set(215.0f, 225.0f, 370.0f); + } + + if (data_80451058 > 3) { + mShopCamAction.setCamDataIdx2( + this, dShopSystem_itemActor[0], dShopSystem_itemActor[1], dShopSystem_itemActor[2], + dShopSystem_itemActor[3], dShopSystem_itemActor[4], dShopSystem_itemActor[5], &dShopSystem_cameraActor[0]->current.pos, + &dShopSystem_cameraActor[1]->current.pos + ); + + if (field_0xf77 == 8) { + cXyz camCtrPos; + camCtrPos.set(-180.0f, 245.0f, -380.0f); + mShopCamAction.setMasterCamCtrPos(&camCtrPos); + } + + for (int i = 0; i < 7; i++) { + if (dShopSystem_itemActor[i] != NULL) { + u8 cVar8 = dShopSystem_itemActor[i]->orig.angle.GetZ(); + u8 cVar4 = ((u16)dShopSystem_itemActor[i]->orig.angle.GetZ()) >> 8; + if (((cVar8 != 0xff) && + (dComIfGs_isSaveSwitch(cVar8) == 0)) && + ((cVar4 != 0xff && + (dComIfGs_isSaveSwitch(cVar4) == 0)))) { + onFlag(i); + onSoldOutItemFlag(i); + } + } + } + dShopSystem_item_count = -1; + } else { + mShopCamAction.setCamDataIdx( + this, dShopSystem_itemActor[0], dShopSystem_itemActor[1], dShopSystem_itemActor[2], + &dShopSystem_cameraActor[0]->current.pos, + &dShopSystem_cameraActor[1]->current.pos + ); + + for (int i = 0; i < 7; i++) { + if (dShopSystem_itemActor[i] != NULL) { + u8 cVar8 = dShopSystem_itemActor[i]->orig.angle.GetZ(); + u8 cVar4 = ((u16)dShopSystem_itemActor[i]->orig.angle.GetZ()) >> 8; + if (((cVar8 != 0xff) && + (dComIfGs_isSaveSwitch(cVar8) == 0)) && + ((cVar4 != 0xff && + (dComIfGs_isSaveSwitch(cVar4) == 0)))) { + onFlag(i); + onSoldOutItemFlag(i); + } + } + } + dShopSystem_item_count = -1; + } + } + + return 1; } -#pragma pop /* 8019AB00-8019AB1C 195440 001C+00 1/1 0/0 0/0 .text getFlowNodeNum__13dShopSystem_cFv */ diff --git a/src/msg/scrn/d_msg_scrn_arrow.cpp b/src/msg/scrn/d_msg_scrn_arrow.cpp index 4634e35c7c..7995a3beed 100644 --- a/src/msg/scrn/d_msg_scrn_arrow.cpp +++ b/src/msg/scrn/d_msg_scrn_arrow.cpp @@ -1,212 +1,129 @@ -// -// Generated By: dol2asm // Translation Unit: msg/scrn/d_msg_scrn_arrow -// #include "msg/scrn/d_msg_scrn_arrow.h" -#include "dol2asm.h" +#include "JSystem/J2DGraph/J2DAnmLoader.h" +#include "JSystem/J2DGraph/J2DGrafContext.h" +#include "JSystem/J2DGraph/J2DScreen.h" +#include "JSystem/JKernel/JKRExpHeap.h" +#include "d/com/d_com_inf_game.h" +#include "d/pane/d_pane_class.h" +#include "dolphin/os/OS.h" #include "dolphin/types.h" -// -// Types: -// +/* 8023B9B4-8023BC78 2362F4 02C4+00 0/0 4/4 0/0 .text __ct__15dMsgScrnArrow_cFv */ +dMsgScrnArrow_c::dMsgScrnArrow_c() { + mScreen = new J2DScreen(); + mScreen->setPriority("zelda_window_yajirushi.blo", 0x20000, dComIfGp_getMsgArchive(0)); + dPaneClass_showNullPane(mScreen); + i_OSInitFastCast(); -struct dMsgScrnArrow_c { - /* 8023B9B4 */ dMsgScrnArrow_c(); - /* 8023BC78 */ ~dMsgScrnArrow_c(); - /* 8023BDC0 */ void draw(); - /* 8023BDF8 */ void setPos(f32, f32); - /* 8023BE34 */ void arwAnimeInit(); - /* 8023BE90 */ void arwAnimeMove(); - /* 8023BFC4 */ void dotAnimeInit(); - /* 8023C010 */ void dotAnimeMove(); -}; + mAnmBck = (J2DAnmTransform*)J2DAnmLoaderDataBase::load( + JKRFileLoader::getGlbResource("zelda_window_yajirushi.bck", dComIfGp_getMsgArchive(0))); + mBckFrame = 0.0f; -struct JKRFileLoader { - /* 802D4270 */ void getGlbResource(char const*, JKRFileLoader*); -}; + mAnmBpk = (J2DAnmColor*)J2DAnmLoaderDataBase::load( + JKRFileLoader::getGlbResource("zelda_window_yajirushi.bpk", dComIfGp_getMsgArchive(0))); + mAnmBpk->searchUpdateMaterialID(mScreen); + mBpkFrame = 0.0f; -struct JKRExpHeap {}; + mPaneMgr0 = new CPaneMgr(mScreen, 'set_ya_n', 0, NULL); + mPaneMgr1 = new CPaneMgr(mScreen, '\0ya_next', 0, NULL); + mPaneMgr1->hide(); + mPaneMgr1->mPane->setAnimation(mAnmBck); + mScreen->search('\0yajnext')->setAnimation(mAnmBpk); + mScreen->search('yajinexl')->setAnimation(mAnmBpk); -struct JKRArchive {}; - -struct J2DGrafContext {}; - -struct J2DScreen { - /* 802F8498 */ J2DScreen(); - /* 802F8648 */ void setPriority(char const*, u32, JKRArchive*); - /* 802F8ED4 */ void draw(f32, f32, J2DGrafContext const*); - /* 802F9690 */ void animation(); -}; - -struct J2DAnmLoaderDataBase { - /* 80308A6C */ void load(void const*); -}; - -struct CPaneMgrAlpha { - /* 802555C8 */ void show(); - /* 80255608 */ void hide(); - /* 8025564C */ void isVisible(); -}; - -struct CPaneMgr { - /* 80253984 */ CPaneMgr(J2DScreen*, u64, u8, JKRExpHeap*); -}; - -// -// Forward References: -// - -extern "C" void __ct__15dMsgScrnArrow_cFv(); -extern "C" void __dt__15dMsgScrnArrow_cFv(); -extern "C" void draw__15dMsgScrnArrow_cFv(); -extern "C" void setPos__15dMsgScrnArrow_cFff(); -extern "C" void arwAnimeInit__15dMsgScrnArrow_cFv(); -extern "C" void arwAnimeMove__15dMsgScrnArrow_cFv(); -extern "C" void dotAnimeInit__15dMsgScrnArrow_cFv(); -extern "C" void dotAnimeMove__15dMsgScrnArrow_cFv(); -extern "C" extern char const* const msg_scrn_d_msg_scrn_arrow__stringBase0; - -// -// External References: -// - -extern "C" void __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap(); -extern "C" void dPaneClass_showNullPane__FP9J2DScreen(); -extern "C" void show__13CPaneMgrAlphaFv(); -extern "C" void hide__13CPaneMgrAlphaFv(); -extern "C" void isVisible__13CPaneMgrAlphaFv(); -extern "C" void* __nw__FUl(); -extern "C" void __dl__FPv(); -extern "C" void getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader(); -extern "C" void __ct__9J2DScreenFv(); -extern "C" void setPriority__9J2DScreenFPCcUlP10JKRArchive(); -extern "C" void draw__9J2DScreenFffPC14J2DGrafContext(); -extern "C" void animation__9J2DScreenFv(); -extern "C" void load__20J2DAnmLoaderDataBaseFPCv(); -extern "C" extern u8 g_dComIfG_gameInfo[122384]; - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 803998A0-803998A0 025F00 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_803998A0 = "zelda_window_yajirushi.blo"; -SECTION_DEAD static char const* const stringBase_803998BB = "zelda_window_yajirushi.bck"; -SECTION_DEAD static char const* const stringBase_803998D6 = "zelda_window_yajirushi.bpk"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_803998F1 = "\0\0\0\0\0\0"; -#pragma pop - -/* 803C0CF8-803C0D08 01DE18 000C+04 2/2 0/0 0/0 .data __vt__15dMsgScrnArrow_c */ -SECTION_DATA extern void* __vt__15dMsgScrnArrow_c[3 + 1 /* padding */] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__15dMsgScrnArrow_cFv, - /* padding */ - NULL, -}; - -/* 80454B98-80454B9C 003198 0004+00 4/4 0/0 0/0 .sdata2 @3662 */ -SECTION_SDATA2 static u8 lit_3662[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; - -/* 8023B9B4-8023BC78 2362F4 02C4+00 0/0 4/4 0/0 .text __ct__15dMsgScrnArrow_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dMsgScrnArrow_c::dMsgScrnArrow_c() { - nofralloc -#include "asm/msg/scrn/d_msg_scrn_arrow/__ct__15dMsgScrnArrow_cFv.s" + mPaneMgr2 = new CPaneMgr(mScreen, 'ya_end', 0, NULL); + mPaneMgr2->hide(); + mScreen->search('\0yaj_end')->setAnimation(mAnmBpk); + mScreen->search('yajiendl')->setAnimation(mAnmBpk); } -#pragma pop -/* 8023BC78-8023BDC0 2365B8 0148+00 1/0 0/0 0/0 .text __dt__15dMsgScrnArrow_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dMsgScrnArrow_c::~dMsgScrnArrow_c() { - nofralloc -#include "asm/msg/scrn/d_msg_scrn_arrow/__dt__15dMsgScrnArrow_cFv.s" +/* 8023BC78-8023BDC0 2365B8 0148+00 1/0 0/0 0/0 .text __dt__15dMsgScrnArrow_cFv */ +dMsgScrnArrow_c::~dMsgScrnArrow_c() { + delete mScreen; + mScreen = NULL; + + delete mAnmBck; + mAnmBck = NULL; + + delete mAnmBpk; + mAnmBpk = NULL; + + delete mPaneMgr0; + mPaneMgr0 = NULL; + + delete mPaneMgr1; + mPaneMgr1 = NULL; + + delete mPaneMgr2; + mPaneMgr2 = NULL; } -#pragma pop -/* 8023BDC0-8023BDF8 236700 0038+00 0/0 5/5 0/0 .text draw__15dMsgScrnArrow_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgScrnArrow_c::draw() { - nofralloc -#include "asm/msg/scrn/d_msg_scrn_arrow/draw__15dMsgScrnArrow_cFv.s" +/* 8023BDC0-8023BDF8 236700 0038+00 0/0 5/5 0/0 .text draw__15dMsgScrnArrow_cFv */ +void dMsgScrnArrow_c::draw() { + J2DGrafContext* ctx = dComIfGp_getCurrentGrafPort(); + mScreen->draw(0.0f, 0.0f, ctx); } -#pragma pop -/* 8023BDF8-8023BE34 236738 003C+00 0/0 5/5 0/0 .text setPos__15dMsgScrnArrow_cFff */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgScrnArrow_c::setPos(f32 param_0, f32 param_1) { - nofralloc -#include "asm/msg/scrn/d_msg_scrn_arrow/setPos__15dMsgScrnArrow_cFff.s" +/* 8023BDF8-8023BE34 236738 003C+00 0/0 5/5 0/0 .text setPos__15dMsgScrnArrow_cFff */ +void dMsgScrnArrow_c::setPos(f32 x, f32 y) { + mPaneMgr0->translate(x, y); } -#pragma pop -/* 8023BE34-8023BE90 236774 005C+00 0/0 9/9 0/0 .text arwAnimeInit__15dMsgScrnArrow_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgScrnArrow_c::arwAnimeInit() { - nofralloc -#include "asm/msg/scrn/d_msg_scrn_arrow/arwAnimeInit__15dMsgScrnArrow_cFv.s" +/* 8023BE34-8023BE90 236774 005C+00 0/0 9/9 0/0 .text arwAnimeInit__15dMsgScrnArrow_cFv */ +void dMsgScrnArrow_c::arwAnimeInit() { + mPaneMgr1->hide(); + mBckFrame = 0.0f; + mAnmBck->setFrame(mBckFrame); + mBpkFrame = 0.0f; + mAnmBpk->setFrame(mBpkFrame); + mScreen->animation(); } -#pragma pop -/* ############################################################################################## */ -/* 80454B9C-80454BA0 00319C 0004+00 2/2 0/0 0/0 .sdata2 @3761 */ -SECTION_SDATA2 static f32 lit_3761 = 1.0f; - -/* 80454BA0-80454BA8 0031A0 0008+00 2/2 0/0 0/0 .sdata2 @3763 */ -SECTION_SDATA2 static f64 lit_3763 = 4503601774854144.0 /* cast s32 to float */; - -/* 8023BE90-8023BFC4 2367D0 0134+00 0/0 4/4 0/0 .text arwAnimeMove__15dMsgScrnArrow_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgScrnArrow_c::arwAnimeMove() { - nofralloc -#include "asm/msg/scrn/d_msg_scrn_arrow/arwAnimeMove__15dMsgScrnArrow_cFv.s" +/* 8023BE90-8023BFC4 2367D0 0134+00 0/0 4/4 0/0 .text arwAnimeMove__15dMsgScrnArrow_cFv */ +void dMsgScrnArrow_c::arwAnimeMove() { + if (!mPaneMgr1->isVisible()) { + mPaneMgr1->show(); + } + if (mPaneMgr2->isVisible() == true) { + mPaneMgr2->hide(); + } + mBckFrame += 1.0f; + if (mBckFrame >= (f32)mAnmBck->getFrameMax()) { + mBckFrame -= (f32)mAnmBck->getFrameMax(); + } + mAnmBck->setFrame(mBckFrame); + mBpkFrame += 1.0f; + if (mBpkFrame >= (f32)mAnmBpk->getFrameMax()) { + mBpkFrame -= (f32)mAnmBpk->getFrameMax(); + } + mAnmBpk->setFrame(mBpkFrame); + mScreen->animation(); } -#pragma pop -/* 8023BFC4-8023C010 236904 004C+00 0/0 3/3 0/0 .text dotAnimeInit__15dMsgScrnArrow_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgScrnArrow_c::dotAnimeInit() { - nofralloc -#include "asm/msg/scrn/d_msg_scrn_arrow/dotAnimeInit__15dMsgScrnArrow_cFv.s" +/* 8023BFC4-8023C010 236904 004C+00 0/0 3/3 0/0 .text dotAnimeInit__15dMsgScrnArrow_cFv */ +void dMsgScrnArrow_c::dotAnimeInit() { + mPaneMgr2->hide(); + mBpkFrame = 0.0f; + mAnmBpk->setFrame(mBpkFrame); + mScreen->animation(); } -#pragma pop -/* 8023C010-8023C0DC 236950 00CC+00 0/0 3/3 0/0 .text dotAnimeMove__15dMsgScrnArrow_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgScrnArrow_c::dotAnimeMove() { - nofralloc -#include "asm/msg/scrn/d_msg_scrn_arrow/dotAnimeMove__15dMsgScrnArrow_cFv.s" +/* 8023C010-8023C0DC 236950 00CC+00 0/0 3/3 0/0 .text dotAnimeMove__15dMsgScrnArrow_cFv */ +void dMsgScrnArrow_c::dotAnimeMove() { + if (mPaneMgr1->isVisible() == true) { + mPaneMgr1->hide(); + } + if (!mPaneMgr2->isVisible()) { + mPaneMgr2->show(); + } + mBpkFrame += 1.0f; + if (mBpkFrame >= (f32)mAnmBpk->getFrameMax()) { + mBpkFrame -= (f32)mAnmBpk->getFrameMax(); + } + mAnmBpk->setFrame(mBpkFrame); + mScreen->animation(); } -#pragma pop /* 803998A0-803998A0 025F00 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/tools/tp.py b/tools/tp.py index 250d6c7b67..9f8c7dd7ba 100644 --- a/tools/tp.py +++ b/tools/tp.py @@ -25,7 +25,7 @@ from pathlib import Path def _handle_import_error(ex: ImportError): MISSING_PREREQUISITES = ( - f"Missing prerequisite python module {e}.\n" + f"Missing prerequisite python module {ex}.\n" f"Run `python3 -m pip install --user -r tools/requirements.txt` to install prerequisites." )