From 598aa4aa8c939b4257e0cd1e009e53c948cd3e90 Mon Sep 17 00:00:00 2001 From: hatal175 Date: Fri, 2 Jun 2023 23:28:29 +0300 Subject: [PATCH] d_shop_system, d_s_name, s_save_HIO (#343) * d_s_name OK * d_save_HIO ok * d_shop_system functions matching except sinit order issue --- Progress.md | 8 +- .../changeGameScene__10dScnName_cFv.s | 53 -- asm/d/s/d_s_name/create__10dScnName_cFv.s | 168 ----- .../__ct__22dSvBit_childOtherHIO_cFv.s | 17 - .../__ct__23dSvBit_childItZoneHIO_cFv.s | 15 - .../__ct__23dSvBit_childSwZoneHIO_cFv.s | 15 - .../__ct__25dSvBit_childDarknessHIO_cFv.s | 15 - .../__ct__26dSvBit_childItDungeonHIO_cFv.s | 15 - .../__ct__26dSvBit_childItOneZoneHIO_cFv.s | 15 - .../__ct__26dSvBit_childSwDungeonHIO_cFv.s | 15 - .../__ct__26dSvBit_childSwOneZoneHIO_cFv.s | 15 - .../__ct__26dSvBit_childTransformHIO_cFv.s | 15 - .../__ct__29dSvBit_childItPerfectionHIO_cFv.s | 15 - .../save/d_save_HIO/__dt__12dSvBit_HIO_cFv.s | 108 --- .../__dt__21dSvBit_childItemHIO_cFv.s | 45 -- .../__dt__22dSvBit_childOtherHIO_cFv.s | 20 - .../__dt__23dSvBit_childItZoneHIO_cFv.s | 20 - .../__dt__23dSvBit_childSwZoneHIO_cFv.s | 20 - .../__dt__23dSvBit_childSwitchHIO_cFv.s | 45 -- .../__dt__25dSvBit_childDarknessHIO_cFv.s | 20 - .../__dt__25dSvBit_childTreasureHIO_cFv.s | 27 - .../__dt__26dSvBit_childItDungeonHIO_cFv.s | 20 - .../__dt__26dSvBit_childItOneZoneHIO_cFv.s | 20 - .../__dt__26dSvBit_childSwDungeonHIO_cFv.s | 20 - .../__dt__26dSvBit_childSwOneZoneHIO_cFv.s | 20 - .../__dt__26dSvBit_childTransformHIO_cFv.s | 20 - .../__dt__29dSvBit_childItPerfectionHIO_cFv.s | 20 - .../__dt__29dSvBit_childSwPerfectionHIO_cFv.s | 20 - .../__dt__29dSvBit_childTbPerfectionHIO_cFv.s | 20 - .../save/d_save_HIO/__sinit_d_save_HIO_cpp.s | 65 -- .../save/d_save_HIO/init__12dSvBit_HIO_cFv.s | 42 -- .../init__22dSvBit_childOtherHIO_cFv.s | 34 - .../init__23dSvBit_childItZoneHIO_cFv.s | 13 - .../init__23dSvBit_childSwZoneHIO_cFv.s | 13 - .../init__25dSvBit_childDarknessHIO_cFv.s | 28 - .../init__26dSvBit_childItDungeonHIO_cFv.s | 28 - .../init__26dSvBit_childItOneZoneHIO_cFv.s | 13 - .../init__26dSvBit_childSwDungeonHIO_cFv.s | 28 - .../init__26dSvBit_childSwOneZoneHIO_cFv.s | 13 - .../init__26dSvBit_childTransformHIO_cFv.s | 28 - .../init__29dSvBit_childItPerfectionHIO_cFv.s | 28 - .../init__29dSvBit_childSwPerfectionHIO_cFv.s | 28 - .../init__29dSvBit_childTbPerfectionHIO_cFv.s | 28 - .../chooseItem3__13dShopSystem_cFUc.s | 396 ---------- .../chooseItem4__13dShopSystem_cFUc.s | 134 ---- .../chooseItem5__13dShopSystem_cFUc.s | 313 -------- .../initShopSystem__13dShopSystem_cFv.s | 114 --- .../itemZoom__13dShopSystem_cFP4cXyz.s | 442 ------------ .../moveCursor0__13dShopSystem_cFiUc.s | 176 ----- .../moveCursor1__13dShopSystem_cFiUc.s | 103 --- .../searchItemActor__13dShopSystem_cFv.s | 361 ---------- ...dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s | 104 --- ...dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s | 128 ---- ...dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s | 312 -------- ...dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s | 127 ---- ...dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s | 185 ----- ...dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s | 62 -- include/d/s/d_s_name.h | 43 ++ include/d/save/d_save_HIO.h | 91 ++- include/d/shop/d_shop_item_ctrl.h | 1 + include/d/shop/d_shop_system.h | 2 +- .../tag/d_a_tag_shop_item/d_a_tag_shop_item.h | 1 + src/d/s/d_s_name.cpp | 293 ++------ src/d/save/d_save_HIO.cpp | 676 ++++-------------- src/d/shop/d_shop_system.cpp | 406 ++++------- 65 files changed, 419 insertions(+), 5286 deletions(-) delete mode 100644 asm/d/s/d_s_name/changeGameScene__10dScnName_cFv.s delete mode 100644 asm/d/s/d_s_name/create__10dScnName_cFv.s delete mode 100644 asm/d/save/d_save_HIO/__ct__22dSvBit_childOtherHIO_cFv.s delete mode 100644 asm/d/save/d_save_HIO/__ct__23dSvBit_childItZoneHIO_cFv.s delete mode 100644 asm/d/save/d_save_HIO/__ct__23dSvBit_childSwZoneHIO_cFv.s delete mode 100644 asm/d/save/d_save_HIO/__ct__25dSvBit_childDarknessHIO_cFv.s delete mode 100644 asm/d/save/d_save_HIO/__ct__26dSvBit_childItDungeonHIO_cFv.s delete mode 100644 asm/d/save/d_save_HIO/__ct__26dSvBit_childItOneZoneHIO_cFv.s delete mode 100644 asm/d/save/d_save_HIO/__ct__26dSvBit_childSwDungeonHIO_cFv.s delete mode 100644 asm/d/save/d_save_HIO/__ct__26dSvBit_childSwOneZoneHIO_cFv.s delete mode 100644 asm/d/save/d_save_HIO/__ct__26dSvBit_childTransformHIO_cFv.s delete mode 100644 asm/d/save/d_save_HIO/__ct__29dSvBit_childItPerfectionHIO_cFv.s delete mode 100644 asm/d/save/d_save_HIO/__dt__12dSvBit_HIO_cFv.s delete mode 100644 asm/d/save/d_save_HIO/__dt__21dSvBit_childItemHIO_cFv.s delete mode 100644 asm/d/save/d_save_HIO/__dt__22dSvBit_childOtherHIO_cFv.s delete mode 100644 asm/d/save/d_save_HIO/__dt__23dSvBit_childItZoneHIO_cFv.s delete mode 100644 asm/d/save/d_save_HIO/__dt__23dSvBit_childSwZoneHIO_cFv.s delete mode 100644 asm/d/save/d_save_HIO/__dt__23dSvBit_childSwitchHIO_cFv.s delete mode 100644 asm/d/save/d_save_HIO/__dt__25dSvBit_childDarknessHIO_cFv.s delete mode 100644 asm/d/save/d_save_HIO/__dt__25dSvBit_childTreasureHIO_cFv.s delete mode 100644 asm/d/save/d_save_HIO/__dt__26dSvBit_childItDungeonHIO_cFv.s delete mode 100644 asm/d/save/d_save_HIO/__dt__26dSvBit_childItOneZoneHIO_cFv.s delete mode 100644 asm/d/save/d_save_HIO/__dt__26dSvBit_childSwDungeonHIO_cFv.s delete mode 100644 asm/d/save/d_save_HIO/__dt__26dSvBit_childSwOneZoneHIO_cFv.s delete mode 100644 asm/d/save/d_save_HIO/__dt__26dSvBit_childTransformHIO_cFv.s delete mode 100644 asm/d/save/d_save_HIO/__dt__29dSvBit_childItPerfectionHIO_cFv.s delete mode 100644 asm/d/save/d_save_HIO/__dt__29dSvBit_childSwPerfectionHIO_cFv.s delete mode 100644 asm/d/save/d_save_HIO/__dt__29dSvBit_childTbPerfectionHIO_cFv.s delete mode 100644 asm/d/save/d_save_HIO/__sinit_d_save_HIO_cpp.s delete mode 100644 asm/d/save/d_save_HIO/init__12dSvBit_HIO_cFv.s delete mode 100644 asm/d/save/d_save_HIO/init__22dSvBit_childOtherHIO_cFv.s delete mode 100644 asm/d/save/d_save_HIO/init__23dSvBit_childItZoneHIO_cFv.s delete mode 100644 asm/d/save/d_save_HIO/init__23dSvBit_childSwZoneHIO_cFv.s delete mode 100644 asm/d/save/d_save_HIO/init__25dSvBit_childDarknessHIO_cFv.s delete mode 100644 asm/d/save/d_save_HIO/init__26dSvBit_childItDungeonHIO_cFv.s delete mode 100644 asm/d/save/d_save_HIO/init__26dSvBit_childItOneZoneHIO_cFv.s delete mode 100644 asm/d/save/d_save_HIO/init__26dSvBit_childSwDungeonHIO_cFv.s delete mode 100644 asm/d/save/d_save_HIO/init__26dSvBit_childSwOneZoneHIO_cFv.s delete mode 100644 asm/d/save/d_save_HIO/init__26dSvBit_childTransformHIO_cFv.s delete mode 100644 asm/d/save/d_save_HIO/init__29dSvBit_childItPerfectionHIO_cFv.s delete mode 100644 asm/d/save/d_save_HIO/init__29dSvBit_childSwPerfectionHIO_cFv.s delete mode 100644 asm/d/save/d_save_HIO/init__29dSvBit_childTbPerfectionHIO_cFv.s delete mode 100644 asm/d/shop/d_shop_system/chooseItem3__13dShopSystem_cFUc.s delete mode 100644 asm/d/shop/d_shop_system/chooseItem4__13dShopSystem_cFUc.s delete mode 100644 asm/d/shop/d_shop_system/chooseItem5__13dShopSystem_cFUc.s delete mode 100644 asm/d/shop/d_shop_system/initShopSystem__13dShopSystem_cFv.s delete mode 100644 asm/d/shop/d_shop_system/itemZoom__13dShopSystem_cFP4cXyz.s delete mode 100644 asm/d/shop/d_shop_system/moveCursor0__13dShopSystem_cFiUc.s delete mode 100644 asm/d/shop/d_shop_system/moveCursor1__13dShopSystem_cFiUc.s delete mode 100644 asm/d/shop/d_shop_system/searchItemActor__13dShopSystem_cFv.s delete mode 100644 asm/d/shop/d_shop_system/seq_decide_yes__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s delete mode 100644 asm/d/shop/d_shop_system/seq_moving__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s delete mode 100644 asm/d/shop/d_shop_system/seq_select__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s delete mode 100644 asm/d/shop/d_shop_system/seq_select_start__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s delete mode 100644 asm/d/shop/d_shop_system/seq_start__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s delete mode 100644 asm/d/shop/d_shop_system/shop_process__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c.s diff --git a/Progress.md b/Progress.md index e6d82f93866..55df8fa4bdc 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.904050% | 967616 | 3596544 +.text | 27.333351% | 983056 | 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.609936% | 1391552 | 4020672 +Total | 34.993951% | 1406992 | 4020672 ## Total Section | Percentage | Decompiled (bytes) | Total (bytes) ---|---|---|--- -main.dol | 34.609936% | 1391552 | 4020672 +main.dol | 34.993951% | 1406992 | 4020672 RELs | 33.600166% | 3864128 | 11500324 -Total | 33.861744% | 5255680 | 15520996 +Total | 33.961223% | 5271120 | 15520996 ## RELs 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 ab36a9279ba..00000000000 --- 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 a0e9b46fab6..00000000000 --- 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 504cc0ef4c1..00000000000 --- 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 257fd46904d..00000000000 --- 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 06098cec51e..00000000000 --- 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 e9d90dac70b..00000000000 --- 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 4aa5bb1ff36..00000000000 --- 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 1556403eb05..00000000000 --- 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 36c86f0c2d5..00000000000 --- 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 2d379c7e8b2..00000000000 --- 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 c4ed8498ca1..00000000000 --- 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 f7e2430698e..00000000000 --- 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 f42d8213758..00000000000 --- 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 5804262d1a7..00000000000 --- 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 aca7f42b65a..00000000000 --- 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 c600bc174be..00000000000 --- 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 923256718c3..00000000000 --- 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 4ef98aedf6c..00000000000 --- 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 a992d48ab00..00000000000 --- 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 d761deeb11e..00000000000 --- 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 a8d6b4c7e78..00000000000 --- 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 aaaee9f22c4..00000000000 --- 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 61ab8beae5e..00000000000 --- 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 6e68da61b9c..00000000000 --- 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 db816a74810..00000000000 --- 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 2f8bbb9120a..00000000000 --- 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 fcaa4bc78aa..00000000000 --- 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 a7a7248f8e1..00000000000 --- 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 69f1b34c782..00000000000 --- 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 e6259f920f1..00000000000 --- 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 0d4cdf4d36f..00000000000 --- 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 7595d0a5cd4..00000000000 --- 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 65a84a3e838..00000000000 --- 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 382d8273ceb..00000000000 --- 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 3e786b7f9f2..00000000000 --- 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 8975c81b1f7..00000000000 --- 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 b415cc80eeb..00000000000 --- 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 cbdfb868329..00000000000 --- 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 5359fa0825a..00000000000 --- 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 4f76fd98c2f..00000000000 --- 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 f0ed57ae9cc..00000000000 --- 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 187aa6895a5..00000000000 --- 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 e354b4d7e8a..00000000000 --- 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 c6ee81129eb..00000000000 --- 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 56e8c640b65..00000000000 --- 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 0f3873cb513..00000000000 --- 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 c9795848566..00000000000 --- 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 1c0388c9575..00000000000 --- 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 4a3c94c2e6c..00000000000 --- 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 a187ffefcdb..00000000000 --- 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 3e2a58a084c..00000000000 --- 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 660846c9c76..00000000000 --- 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 ce782bd41ee..00000000000 --- 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 ba0dcb7b167..00000000000 --- 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 4a4725a9899..00000000000 --- 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 d51146c1b7c..00000000000 --- 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/include/d/s/d_s_name.h b/include/d/s/d_s_name.h index d894b00859f..fd56c057019 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_HIO.h b/include/d/save/d_save_HIO.h index dfa7c8b1478..4943ca414d6 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 5a486dc093d..54b164a2f79 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 048398c6ad6..5401ee44a2f 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/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 0b3799c0095..261e5288140 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/src/d/s/d_s_name.cpp b/src/d/s/d_s_name.cpp index 87cadcd654d..dc42744c4f0 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); } @@ -532,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())) { @@ -557,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) { @@ -598,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/save/d_save_HIO.cpp b/src/d/save/d_save_HIO.cpp index f7092ae5397..14060b8b945 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 34b2ac1c67a..c7dfe7e6383 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 */