diff options
| author | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2022-01-09 17:56:12 -0800 |
|---|---|---|
| committer | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2022-01-09 17:56:12 -0800 |
| commit | 107f85a5f8a276b5ea24933c7eb42b4df8a1a03e (patch) | |
| tree | 2c01a60ea3eb17d5035df8506badf8e83502baa1 /asm/d | |
| parent | d6f68167c6b3866f5b6a02e7b16808effe4b1d8d (diff) | |
remove asm
Diffstat (limited to 'asm/d')
93 files changed, 0 insertions, 3425 deletions
diff --git a/asm/d/menu/d_menu_skill/__ct__13dMenu_Skill_cFP10JKRExpHeapP9STControlP10CSTControl.s b/asm/d/menu/d_menu_skill/__ct__13dMenu_Skill_cFP10JKRExpHeapP9STControlP10CSTControl.s deleted file mode 100644 index e499da4d75..0000000000 --- a/asm/d/menu/d_menu_skill/__ct__13dMenu_Skill_cFP10JKRExpHeapP9STControlP10CSTControl.s +++ /dev/null @@ -1,74 +0,0 @@ -lbl_801F7224: -/* 801F7224 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801F7228 7C 08 02 A6 */ mflr r0 -/* 801F722C 90 01 00 24 */ stw r0, 0x24(r1) -/* 801F7230 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F7234 48 16 AF A5 */ bl _savegpr_28 -/* 801F7238 7C 7F 1B 78 */ mr r31, r3 -/* 801F723C 7C 9C 23 78 */ mr r28, r4 -/* 801F7240 7C BD 2B 78 */ mr r29, r5 -/* 801F7244 7C DE 33 78 */ mr r30, r6 -/* 801F7248 3C 60 80 3A */ lis r3, __vt__12dDlst_base_c@ha /* 0x803A6F88@ha */ -/* 801F724C 38 03 6F 88 */ addi r0, r3, __vt__12dDlst_base_c@l /* 0x803A6F88@l */ -/* 801F7250 90 1F 00 00 */ stw r0, 0(r31) -/* 801F7254 3C 60 80 3C */ lis r3, __vt__13dMenu_Skill_c@ha /* 0x803BE8C0@ha */ -/* 801F7258 38 03 E8 C0 */ addi r0, r3, __vt__13dMenu_Skill_c@l /* 0x803BE8C0@l */ -/* 801F725C 90 1F 00 00 */ stw r0, 0(r31) -/* 801F7260 38 7F 01 A0 */ addi r3, r31, 0x1a0 -/* 801F7264 3C 80 80 19 */ lis r4, __ct__Q28JUtility6TColorFv@ha /* 0x80193960@ha */ -/* 801F7268 38 84 39 60 */ addi r4, r4, __ct__Q28JUtility6TColorFv@l /* 0x80193960@l */ -/* 801F726C 38 A0 00 00 */ li r5, 0 -/* 801F7270 38 C0 00 04 */ li r6, 4 -/* 801F7274 38 E0 00 05 */ li r7, 5 -/* 801F7278 48 16 AA E9 */ bl __construct_array -/* 801F727C 38 7F 01 B4 */ addi r3, r31, 0x1b4 -/* 801F7280 3C 80 80 19 */ lis r4, __ct__Q28JUtility6TColorFv@ha /* 0x80193960@ha */ -/* 801F7284 38 84 39 60 */ addi r4, r4, __ct__Q28JUtility6TColorFv@l /* 0x80193960@l */ -/* 801F7288 38 A0 00 00 */ li r5, 0 -/* 801F728C 38 C0 00 04 */ li r6, 4 -/* 801F7290 38 E0 00 05 */ li r7, 5 -/* 801F7294 48 16 AA CD */ bl __construct_array -/* 801F7298 38 7F 01 C8 */ addi r3, r31, 0x1c8 -/* 801F729C 3C 80 80 19 */ lis r4, __ct__Q28JUtility6TColorFv@ha /* 0x80193960@ha */ -/* 801F72A0 38 84 39 60 */ addi r4, r4, __ct__Q28JUtility6TColorFv@l /* 0x80193960@l */ -/* 801F72A4 38 A0 00 00 */ li r5, 0 -/* 801F72A8 38 C0 00 04 */ li r6, 4 -/* 801F72AC 38 E0 00 05 */ li r7, 5 -/* 801F72B0 48 16 AA B1 */ bl __construct_array -/* 801F72B4 38 7F 01 DC */ addi r3, r31, 0x1dc -/* 801F72B8 3C 80 80 19 */ lis r4, __ct__Q28JUtility6TColorFv@ha /* 0x80193960@ha */ -/* 801F72BC 38 84 39 60 */ addi r4, r4, __ct__Q28JUtility6TColorFv@l /* 0x80193960@l */ -/* 801F72C0 38 A0 00 00 */ li r5, 0 -/* 801F72C4 38 C0 00 04 */ li r6, 4 -/* 801F72C8 38 E0 00 05 */ li r7, 5 -/* 801F72CC 48 16 AA 95 */ bl __construct_array -/* 801F72D0 93 9F 00 04 */ stw r28, 4(r31) -/* 801F72D4 38 60 00 00 */ li r3, 0 -/* 801F72D8 90 7F 00 08 */ stw r3, 8(r31) -/* 801F72DC 90 7F 00 14 */ stw r3, 0x14(r31) -/* 801F72E0 93 BF 00 0C */ stw r29, 0xc(r31) -/* 801F72E4 93 DF 00 10 */ stw r30, 0x10(r31) -/* 801F72E8 38 00 00 01 */ li r0, 1 -/* 801F72EC 98 1F 02 04 */ stb r0, 0x204(r31) -/* 801F72F0 98 7F 02 05 */ stb r3, 0x205(r31) -/* 801F72F4 B0 7F 02 00 */ sth r3, 0x200(r31) -/* 801F72F8 90 7F 01 FC */ stw r3, 0x1fc(r31) -/* 801F72FC B0 7F 02 02 */ sth r3, 0x202(r31) -/* 801F7300 98 7F 02 06 */ stb r3, 0x206(r31) -/* 801F7304 38 00 00 FF */ li r0, 0xff -/* 801F7308 98 1F 02 09 */ stb r0, 0x209(r31) -/* 801F730C 98 1F 02 0A */ stb r0, 0x20a(r31) -/* 801F7310 7F E3 FB 78 */ mr r3, r31 -/* 801F7314 48 00 06 65 */ bl skill_init_calc__13dMenu_Skill_cFv -/* 801F7318 C0 02 AA 88 */ lfs f0, lit_3808(r2) -/* 801F731C D0 1F 01 F0 */ stfs f0, 0x1f0(r31) -/* 801F7320 C0 02 AA 8C */ lfs f0, lit_3809(r2) -/* 801F7324 D0 1F 01 F8 */ stfs f0, 0x1f8(r31) -/* 801F7328 D0 1F 01 F4 */ stfs f0, 0x1f4(r31) -/* 801F732C 7F E3 FB 78 */ mr r3, r31 -/* 801F7330 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F7334 48 16 AE F1 */ bl _restgpr_28 -/* 801F7338 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801F733C 7C 08 03 A6 */ mtlr r0 -/* 801F7340 38 21 00 20 */ addi r1, r1, 0x20 -/* 801F7344 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/_create__5dMw_cFv.s b/asm/d/menu/d_menu_window/_create__5dMw_cFv.s deleted file mode 100644 index 11294bdce4..0000000000 --- a/asm/d/menu/d_menu_window/_create__5dMw_cFv.s +++ /dev/null @@ -1,105 +0,0 @@ -lbl_801FD140: -/* 801FD140 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FD144 7C 08 02 A6 */ mflr r0 -/* 801FD148 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FD14C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FD150 93 C1 00 08 */ stw r30, 8(r1) -/* 801FD154 7C 7E 1B 78 */ mr r30, r3 -/* 801FD158 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801FD15C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801FD160 80 03 5E BC */ lwz r0, 0x5ebc(r3) -/* 801FD164 90 1E 01 00 */ stw r0, 0x100(r30) -/* 801FD168 38 60 00 30 */ li r3, 0x30 -/* 801FD16C 48 0D 1A E1 */ bl __nw__FUl -/* 801FD170 7C 60 1B 79 */ or. r0, r3, r3 -/* 801FD174 41 82 00 2C */ beq lbl_801FD1A0 -/* 801FD178 38 80 00 05 */ li r4, 5 -/* 801FD17C 38 A0 00 02 */ li r5, 2 -/* 801FD180 38 C0 00 01 */ li r6, 1 -/* 801FD184 38 E0 00 01 */ li r7, 1 -/* 801FD188 C0 22 AA D4 */ lfs f1, lit_6086(r2) -/* 801FD18C C0 42 AA D8 */ lfs f2, lit_6087(r2) -/* 801FD190 39 00 00 00 */ li r8, 0 -/* 801FD194 39 20 08 00 */ li r9, 0x800 -/* 801FD198 4B E3 4E AD */ bl __ct__9STControlFssssffss -/* 801FD19C 7C 60 1B 78 */ mr r0, r3 -lbl_801FD1A0: -/* 801FD1A0 90 1E 01 04 */ stw r0, 0x104(r30) -/* 801FD1A4 38 00 00 08 */ li r0, 8 -/* 801FD1A8 80 7E 01 04 */ lwz r3, 0x104(r30) -/* 801FD1AC B0 03 00 28 */ sth r0, 0x28(r3) -/* 801FD1B0 38 60 00 30 */ li r3, 0x30 -/* 801FD1B4 48 0D 1A 99 */ bl __nw__FUl -/* 801FD1B8 7C 7F 1B 79 */ or. r31, r3, r3 -/* 801FD1BC 41 82 00 34 */ beq lbl_801FD1F0 -/* 801FD1C0 38 80 00 05 */ li r4, 5 -/* 801FD1C4 38 A0 00 02 */ li r5, 2 -/* 801FD1C8 38 C0 00 03 */ li r6, 3 -/* 801FD1CC 38 E0 00 02 */ li r7, 2 -/* 801FD1D0 C0 22 AA D4 */ lfs f1, lit_6086(r2) -/* 801FD1D4 C0 42 AA D8 */ lfs f2, lit_6087(r2) -/* 801FD1D8 39 00 00 00 */ li r8, 0 -/* 801FD1DC 39 20 20 00 */ li r9, 0x2000 -/* 801FD1E0 4B E3 4E 65 */ bl __ct__9STControlFssssffss -/* 801FD1E4 3C 60 80 3A */ lis r3, __vt__10CSTControl@ha /* 0x803A7250@ha */ -/* 801FD1E8 38 03 72 50 */ addi r0, r3, __vt__10CSTControl@l /* 0x803A7250@l */ -/* 801FD1EC 90 1F 00 00 */ stw r0, 0(r31) -lbl_801FD1F0: -/* 801FD1F0 93 FE 01 08 */ stw r31, 0x108(r30) -/* 801FD1F4 80 7E 01 08 */ lwz r3, 0x108(r30) -/* 801FD1F8 38 80 00 05 */ li r4, 5 -/* 801FD1FC 38 A0 00 02 */ li r5, 2 -/* 801FD200 38 C0 00 03 */ li r6, 3 -/* 801FD204 38 E0 00 02 */ li r7, 2 -/* 801FD208 C0 22 AA D4 */ lfs f1, lit_6086(r2) -/* 801FD20C C0 42 AA D8 */ lfs f2, lit_6087(r2) -/* 801FD210 39 00 00 00 */ li r8, 0 -/* 801FD214 39 20 20 00 */ li r9, 0x2000 -/* 801FD218 4B E3 4E 71 */ bl setWaitParm__9STControlFssssffss -/* 801FD21C 38 80 00 00 */ li r4, 0 -/* 801FD220 98 9E 01 45 */ stb r4, 0x145(r30) -/* 801FD224 98 9E 01 46 */ stb r4, 0x146(r30) -/* 801FD228 38 00 00 01 */ li r0, 1 -/* 801FD22C 98 1E 01 47 */ stb r0, 0x147(r30) -/* 801FD230 98 9E 01 48 */ stb r4, 0x148(r30) -/* 801FD234 98 9E 01 4C */ stb r4, 0x14c(r30) -/* 801FD238 98 9E 01 4D */ stb r4, 0x14d(r30) -/* 801FD23C 98 9E 01 4E */ stb r4, 0x14e(r30) -/* 801FD240 98 9E 01 4F */ stb r4, 0x14f(r30) -/* 801FD244 98 9E 01 50 */ stb r4, 0x150(r30) -/* 801FD248 98 9E 01 51 */ stb r4, 0x151(r30) -/* 801FD24C 98 9E 01 52 */ stb r4, 0x152(r30) -/* 801FD250 C0 02 AA C0 */ lfs f0, lit_4152(r2) -/* 801FD254 D0 1E 01 3C */ stfs f0, 0x13c(r30) -/* 801FD258 D0 1E 01 40 */ stfs f0, 0x140(r30) -/* 801FD25C 98 9E 01 53 */ stb r4, 0x153(r30) -/* 801FD260 98 1E 01 54 */ stb r0, 0x154(r30) -/* 801FD264 98 9E 01 49 */ stb r4, 0x149(r30) -/* 801FD268 98 9E 01 4A */ stb r4, 0x14a(r30) -/* 801FD26C 98 9E 01 4B */ stb r4, 0x14b(r30) -/* 801FD270 90 9E 01 0C */ stw r4, 0x10c(r30) -/* 801FD274 90 9E 01 10 */ stw r4, 0x110(r30) -/* 801FD278 90 9E 01 14 */ stw r4, 0x114(r30) -/* 801FD27C 90 9E 01 18 */ stw r4, 0x118(r30) -/* 801FD280 90 9E 01 1C */ stw r4, 0x11c(r30) -/* 801FD284 90 9E 01 20 */ stw r4, 0x120(r30) -/* 801FD288 90 9E 01 24 */ stw r4, 0x124(r30) -/* 801FD28C 90 9E 01 28 */ stw r4, 0x128(r30) -/* 801FD290 90 9E 01 2C */ stw r4, 0x12c(r30) -/* 801FD294 90 9E 01 30 */ stw r4, 0x130(r30) -/* 801FD298 90 9E 01 34 */ stw r4, 0x134(r30) -/* 801FD29C 90 9E 01 38 */ stw r4, 0x138(r30) -/* 801FD2A0 38 00 00 03 */ li r0, 3 -/* 801FD2A4 98 1E 01 44 */ stb r0, 0x144(r30) -/* 801FD2A8 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801FD2AC 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801FD2B0 88 03 00 B9 */ lbz r0, 0xb9(r3) -/* 801FD2B4 98 03 00 BA */ stb r0, 0xba(r3) -/* 801FD2B8 98 83 00 B9 */ stb r4, 0xb9(r3) -/* 801FD2BC 38 60 00 04 */ li r3, 4 -/* 801FD2C0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FD2C4 83 C1 00 08 */ lwz r30, 8(r1) -/* 801FD2C8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FD2CC 7C 08 03 A6 */ mtlr r0 -/* 801FD2D0 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FD2D4 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/_delete__5dMw_cFv.s b/asm/d/menu/d_menu_window/_delete__5dMw_cFv.s deleted file mode 100644 index 37b26c435d..0000000000 --- a/asm/d/menu/d_menu_window/_delete__5dMw_cFv.s +++ /dev/null @@ -1,125 +0,0 @@ -lbl_801FD67C: -/* 801FD67C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FD680 7C 08 02 A6 */ mflr r0 -/* 801FD684 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FD688 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FD68C 93 C1 00 08 */ stw r30, 8(r1) -/* 801FD690 7C 7E 1B 78 */ mr r30, r3 -/* 801FD694 4B E1 1B 59 */ bl mDoExt_getCurrentHeap__Fv -/* 801FD698 7C 7F 1B 78 */ mr r31, r3 -/* 801FD69C 80 7E 01 04 */ lwz r3, 0x104(r30) -/* 801FD6A0 48 0D 16 9D */ bl __dl__FPv -/* 801FD6A4 38 00 00 00 */ li r0, 0 -/* 801FD6A8 90 1E 01 04 */ stw r0, 0x104(r30) -/* 801FD6AC 80 7E 01 08 */ lwz r3, 0x108(r30) -/* 801FD6B0 48 0D 16 8D */ bl __dl__FPv -/* 801FD6B4 38 00 00 00 */ li r0, 0 -/* 801FD6B8 90 1E 01 08 */ stw r0, 0x108(r30) -/* 801FD6BC 80 7E 01 00 */ lwz r3, 0x100(r30) -/* 801FD6C0 4B E1 1B 0D */ bl mDoExt_setCurrentHeap__FP7JKRHeap -/* 801FD6C4 7F C3 F3 78 */ mr r3, r30 -/* 801FD6C8 38 80 00 00 */ li r4, 0 -/* 801FD6CC 4B FF E9 C5 */ bl dMw_collect_delete__5dMw_cFb -/* 801FD6D0 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801FD6D4 40 82 00 14 */ bne lbl_801FD6E8 -/* 801FD6D8 7F E3 FB 78 */ mr r3, r31 -/* 801FD6DC 4B E1 1A F1 */ bl mDoExt_setCurrentHeap__FP7JKRHeap -/* 801FD6E0 38 60 00 00 */ li r3, 0 -/* 801FD6E4 48 00 01 44 */ b lbl_801FD828 -lbl_801FD6E8: -/* 801FD6E8 7F C3 F3 78 */ mr r3, r30 -/* 801FD6EC 38 80 00 00 */ li r4, 0 -/* 801FD6F0 4B FF ED 7D */ bl dMw_dmap_delete__5dMw_cFb -/* 801FD6F4 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801FD6F8 40 82 00 14 */ bne lbl_801FD70C -/* 801FD6FC 7F E3 FB 78 */ mr r3, r31 -/* 801FD700 4B E1 1A CD */ bl mDoExt_setCurrentHeap__FP7JKRHeap -/* 801FD704 38 60 00 00 */ li r3, 0 -/* 801FD708 48 00 01 20 */ b lbl_801FD828 -lbl_801FD70C: -/* 801FD70C 7F C3 F3 78 */ mr r3, r30 -/* 801FD710 38 80 00 00 */ li r4, 0 -/* 801FD714 4B FF EB 51 */ bl dMw_fmap_delete__5dMw_cFb -/* 801FD718 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801FD71C 40 82 00 14 */ bne lbl_801FD730 -/* 801FD720 7F E3 FB 78 */ mr r3, r31 -/* 801FD724 4B E1 1A A9 */ bl mDoExt_setCurrentHeap__FP7JKRHeap -/* 801FD728 38 60 00 00 */ li r3, 0 -/* 801FD72C 48 00 00 FC */ b lbl_801FD828 -lbl_801FD730: -/* 801FD730 7F C3 F3 78 */ mr r3, r30 -/* 801FD734 4B FF EE 9D */ bl dMw_save_delete__5dMw_cFv -/* 801FD738 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801FD73C 40 82 00 14 */ bne lbl_801FD750 -/* 801FD740 7F E3 FB 78 */ mr r3, r31 -/* 801FD744 4B E1 1A 89 */ bl mDoExt_setCurrentHeap__FP7JKRHeap -/* 801FD748 38 60 00 00 */ li r3, 0 -/* 801FD74C 48 00 00 DC */ b lbl_801FD828 -lbl_801FD750: -/* 801FD750 7F C3 F3 78 */ mr r3, r30 -/* 801FD754 4B FF EF B9 */ bl dMw_option_delete__5dMw_cFv -/* 801FD758 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801FD75C 40 82 00 14 */ bne lbl_801FD770 -/* 801FD760 7F E3 FB 78 */ mr r3, r31 -/* 801FD764 4B E1 1A 69 */ bl mDoExt_setCurrentHeap__FP7JKRHeap -/* 801FD768 38 60 00 00 */ li r3, 0 -/* 801FD76C 48 00 00 BC */ b lbl_801FD828 -lbl_801FD770: -/* 801FD770 7F C3 F3 78 */ mr r3, r30 -/* 801FD774 4B FF F0 E9 */ bl dMw_letter_delete__5dMw_cFv -/* 801FD778 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801FD77C 40 82 00 14 */ bne lbl_801FD790 -/* 801FD780 7F E3 FB 78 */ mr r3, r31 -/* 801FD784 4B E1 1A 49 */ bl mDoExt_setCurrentHeap__FP7JKRHeap -/* 801FD788 38 60 00 00 */ li r3, 0 -/* 801FD78C 48 00 00 9C */ b lbl_801FD828 -lbl_801FD790: -/* 801FD790 7F C3 F3 78 */ mr r3, r30 -/* 801FD794 4B FF F2 11 */ bl dMw_fishing_delete__5dMw_cFv -/* 801FD798 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801FD79C 40 82 00 14 */ bne lbl_801FD7B0 -/* 801FD7A0 7F E3 FB 78 */ mr r3, r31 -/* 801FD7A4 4B E1 1A 29 */ bl mDoExt_setCurrentHeap__FP7JKRHeap -/* 801FD7A8 38 60 00 00 */ li r3, 0 -/* 801FD7AC 48 00 00 7C */ b lbl_801FD828 -lbl_801FD7B0: -/* 801FD7B0 7F C3 F3 78 */ mr r3, r30 -/* 801FD7B4 4B FF F3 39 */ bl dMw_skill_delete__5dMw_cFv -/* 801FD7B8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801FD7BC 40 82 00 14 */ bne lbl_801FD7D0 -/* 801FD7C0 7F E3 FB 78 */ mr r3, r31 -/* 801FD7C4 4B E1 1A 09 */ bl mDoExt_setCurrentHeap__FP7JKRHeap -/* 801FD7C8 38 60 00 00 */ li r3, 0 -/* 801FD7CC 48 00 00 5C */ b lbl_801FD828 -lbl_801FD7D0: -/* 801FD7D0 7F C3 F3 78 */ mr r3, r30 -/* 801FD7D4 4B FF F4 71 */ bl dMw_insect_delete__5dMw_cFv -/* 801FD7D8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801FD7DC 40 82 00 14 */ bne lbl_801FD7F0 -/* 801FD7E0 7F E3 FB 78 */ mr r3, r31 -/* 801FD7E4 4B E1 19 E9 */ bl mDoExt_setCurrentHeap__FP7JKRHeap -/* 801FD7E8 38 60 00 00 */ li r3, 0 -/* 801FD7EC 48 00 00 3C */ b lbl_801FD828 -lbl_801FD7F0: -/* 801FD7F0 7F C3 F3 78 */ mr r3, r30 -/* 801FD7F4 4B FF E7 6D */ bl dMw_ring_delete__5dMw_cFv -/* 801FD7F8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801FD7FC 40 82 00 14 */ bne lbl_801FD810 -/* 801FD800 7F E3 FB 78 */ mr r3, r31 -/* 801FD804 4B E1 19 C9 */ bl mDoExt_setCurrentHeap__FP7JKRHeap -/* 801FD808 38 60 00 00 */ li r3, 0 -/* 801FD80C 48 00 00 1C */ b lbl_801FD828 -lbl_801FD810: -/* 801FD810 7F C3 F3 78 */ mr r3, r30 -/* 801FD814 4B FF E6 01 */ bl dMw_capture_delete__5dMw_cFv -/* 801FD818 7F E3 FB 78 */ mr r3, r31 -/* 801FD81C 4B E1 19 B1 */ bl mDoExt_setCurrentHeap__FP7JKRHeap -/* 801FD820 4B E1 72 0D */ bl mDoExt_removeMesgFont__Fv -/* 801FD824 38 60 00 01 */ li r3, 1 -lbl_801FD828: -/* 801FD828 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FD82C 83 C1 00 08 */ lwz r30, 8(r1) -/* 801FD830 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FD834 7C 08 03 A6 */ mtlr r0 -/* 801FD838 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FD83C 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/_draw__5dMw_cFv.s b/asm/d/menu/d_menu_window/_draw__5dMw_cFv.s deleted file mode 100644 index 9571d75f4a..0000000000 --- a/asm/d/menu/d_menu_window/_draw__5dMw_cFv.s +++ /dev/null @@ -1,152 +0,0 @@ -lbl_801FD450: -/* 801FD450 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801FD454 7C 08 02 A6 */ mflr r0 -/* 801FD458 90 01 00 24 */ stw r0, 0x24(r1) -/* 801FD45C 39 61 00 20 */ addi r11, r1, 0x20 -/* 801FD460 48 16 4D 79 */ bl _savegpr_28 -/* 801FD464 7C 7F 1B 78 */ mr r31, r3 -/* 801FD468 80 C3 01 0C */ lwz r6, 0x10c(r3) -/* 801FD46C 28 06 00 00 */ cmplwi r6, 0 -/* 801FD470 41 82 00 5C */ beq lbl_801FD4CC -/* 801FD474 88 06 00 04 */ lbz r0, 4(r6) -/* 801FD478 28 00 00 00 */ cmplwi r0, 0 -/* 801FD47C 41 82 00 50 */ beq lbl_801FD4CC -/* 801FD480 88 06 00 05 */ lbz r0, 5(r6) -/* 801FD484 28 00 00 00 */ cmplwi r0, 0 -/* 801FD488 41 82 00 44 */ beq lbl_801FD4CC -/* 801FD48C 88 06 00 06 */ lbz r0, 6(r6) -/* 801FD490 28 00 00 00 */ cmplwi r0, 0 -/* 801FD494 41 82 00 20 */ beq lbl_801FD4B4 -/* 801FD498 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801FD49C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801FD4A0 38 63 5F 64 */ addi r3, r3, 0x5f64 -/* 801FD4A4 38 83 00 AC */ addi r4, r3, 0xac -/* 801FD4A8 38 A3 00 B0 */ addi r5, r3, 0xb0 -/* 801FD4AC 4B E5 92 E9 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c -/* 801FD4B0 48 00 00 1C */ b lbl_801FD4CC -lbl_801FD4B4: -/* 801FD4B4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801FD4B8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801FD4BC 38 63 5F 64 */ addi r3, r3, 0x5f64 -/* 801FD4C0 38 83 01 B4 */ addi r4, r3, 0x1b4 -/* 801FD4C4 38 A3 01 B8 */ addi r5, r3, 0x1b8 -/* 801FD4C8 4B E5 92 CD */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c -lbl_801FD4CC: -/* 801FD4CC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801FD4D0 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801FD4D4 88 04 5E B5 */ lbz r0, 0x5eb5(r4) -/* 801FD4D8 28 00 00 01 */ cmplwi r0, 1 -/* 801FD4DC 40 82 01 84 */ bne lbl_801FD660 -/* 801FD4E0 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801FD4E4 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801FD4E8 88 03 00 B9 */ lbz r0, 0xb9(r3) -/* 801FD4EC 28 00 00 03 */ cmplwi r0, 3 -/* 801FD4F0 40 82 00 18 */ bne lbl_801FD508 -/* 801FD4F4 80 7F 01 14 */ lwz r3, 0x114(r31) -/* 801FD4F8 28 03 00 00 */ cmplwi r3, 0 -/* 801FD4FC 41 82 01 64 */ beq lbl_801FD660 -/* 801FD500 4B FB A5 C1 */ bl draw__15dMenu_Collect_cFv -/* 801FD504 48 00 01 5C */ b lbl_801FD660 -lbl_801FD508: -/* 801FD508 28 00 00 04 */ cmplwi r0, 4 -/* 801FD50C 40 82 00 18 */ bne lbl_801FD524 -/* 801FD510 80 7F 01 1C */ lwz r3, 0x11c(r31) -/* 801FD514 28 03 00 00 */ cmplwi r3, 0 -/* 801FD518 41 82 01 48 */ beq lbl_801FD660 -/* 801FD51C 4B FC A1 35 */ bl _draw__12dMenu_Fmap_cFv -/* 801FD520 48 00 01 40 */ b lbl_801FD660 -lbl_801FD524: -/* 801FD524 28 00 00 05 */ cmplwi r0, 5 -/* 801FD528 40 82 00 18 */ bne lbl_801FD540 -/* 801FD52C 80 7F 01 18 */ lwz r3, 0x118(r31) -/* 801FD530 28 03 00 00 */ cmplwi r3, 0 -/* 801FD534 41 82 01 2C */ beq lbl_801FD660 -/* 801FD538 4B FC 12 A9 */ bl _draw__12dMenu_Dmap_cFv -/* 801FD53C 48 00 01 24 */ b lbl_801FD660 -lbl_801FD540: -/* 801FD540 28 00 00 0A */ cmplwi r0, 0xa -/* 801FD544 40 82 00 CC */ bne lbl_801FD610 -/* 801FD548 80 7F 01 20 */ lwz r3, 0x120(r31) -/* 801FD54C 28 03 00 00 */ cmplwi r3, 0 -/* 801FD550 41 82 00 08 */ beq lbl_801FD558 -/* 801FD554 4B FF 94 A9 */ bl _draw2__12dMenu_save_cFv -lbl_801FD558: -/* 801FD558 80 DF 01 24 */ lwz r6, 0x124(r31) -/* 801FD55C 28 06 00 00 */ cmplwi r6, 0 -/* 801FD560 41 82 00 1C */ beq lbl_801FD57C -/* 801FD564 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801FD568 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801FD56C 38 63 5F 64 */ addi r3, r3, 0x5f64 -/* 801FD570 38 83 01 B4 */ addi r4, r3, 0x1b4 -/* 801FD574 38 A3 01 B8 */ addi r5, r3, 0x1b8 -/* 801FD578 4B E5 92 1D */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c -lbl_801FD57C: -/* 801FD57C 80 DF 01 28 */ lwz r6, 0x128(r31) -/* 801FD580 28 06 00 00 */ cmplwi r6, 0 -/* 801FD584 41 82 00 1C */ beq lbl_801FD5A0 -/* 801FD588 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801FD58C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801FD590 38 63 5F 64 */ addi r3, r3, 0x5f64 -/* 801FD594 38 83 01 B4 */ addi r4, r3, 0x1b4 -/* 801FD598 38 A3 01 B8 */ addi r5, r3, 0x1b8 -/* 801FD59C 4B E5 91 F9 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c -lbl_801FD5A0: -/* 801FD5A0 80 DF 01 2C */ lwz r6, 0x12c(r31) -/* 801FD5A4 28 06 00 00 */ cmplwi r6, 0 -/* 801FD5A8 41 82 00 1C */ beq lbl_801FD5C4 -/* 801FD5AC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801FD5B0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801FD5B4 38 63 5F 64 */ addi r3, r3, 0x5f64 -/* 801FD5B8 38 83 01 B4 */ addi r4, r3, 0x1b4 -/* 801FD5BC 38 A3 01 B8 */ addi r5, r3, 0x1b8 -/* 801FD5C0 4B E5 91 D5 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c -lbl_801FD5C4: -/* 801FD5C4 80 DF 01 30 */ lwz r6, 0x130(r31) -/* 801FD5C8 28 06 00 00 */ cmplwi r6, 0 -/* 801FD5CC 41 82 00 1C */ beq lbl_801FD5E8 -/* 801FD5D0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801FD5D4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801FD5D8 38 63 5F 64 */ addi r3, r3, 0x5f64 -/* 801FD5DC 38 83 01 B4 */ addi r4, r3, 0x1b4 -/* 801FD5E0 38 A3 01 B8 */ addi r5, r3, 0x1b8 -/* 801FD5E4 4B E5 91 B1 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c -lbl_801FD5E8: -/* 801FD5E8 80 DF 01 34 */ lwz r6, 0x134(r31) -/* 801FD5EC 28 06 00 00 */ cmplwi r6, 0 -/* 801FD5F0 41 82 00 70 */ beq lbl_801FD660 -/* 801FD5F4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801FD5F8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801FD5FC 38 63 5F 64 */ addi r3, r3, 0x5f64 -/* 801FD600 38 83 01 B4 */ addi r4, r3, 0x1b4 -/* 801FD604 38 A3 01 B8 */ addi r5, r3, 0x1b8 -/* 801FD608 4B E5 91 8D */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c -/* 801FD60C 48 00 00 54 */ b lbl_801FD660 -lbl_801FD610: -/* 801FD610 28 00 00 02 */ cmplwi r0, 2 -/* 801FD614 40 82 00 4C */ bne lbl_801FD660 -/* 801FD618 80 7F 01 10 */ lwz r3, 0x110(r31) -/* 801FD61C 28 03 00 00 */ cmplwi r3, 0 -/* 801FD620 41 82 00 40 */ beq lbl_801FD660 -/* 801FD624 38 00 00 00 */ li r0, 0 -/* 801FD628 98 03 06 BD */ stb r0, 0x6bd(r3) -/* 801FD62C 3B C4 5F 64 */ addi r30, r4, 0x5f64 -/* 801FD630 7F C3 F3 78 */ mr r3, r30 -/* 801FD634 3B 9E 01 B4 */ addi r28, r30, 0x1b4 -/* 801FD638 7F 84 E3 78 */ mr r4, r28 -/* 801FD63C 3B BE 01 B8 */ addi r29, r30, 0x1b8 -/* 801FD640 7F A5 EB 78 */ mr r5, r29 -/* 801FD644 80 DF 01 10 */ lwz r6, 0x110(r31) -/* 801FD648 4B E5 91 4D */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c -/* 801FD64C 7F C3 F3 78 */ mr r3, r30 -/* 801FD650 7F 84 E3 78 */ mr r4, r28 -/* 801FD654 7F A5 EB 78 */ mr r5, r29 -/* 801FD658 80 DF 01 10 */ lwz r6, 0x110(r31) -/* 801FD65C 4B E5 91 39 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c -lbl_801FD660: -/* 801FD660 38 60 00 01 */ li r3, 1 -/* 801FD664 39 61 00 20 */ addi r11, r1, 0x20 -/* 801FD668 48 16 4B BD */ bl _restgpr_28 -/* 801FD66C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801FD670 7C 08 03 A6 */ mtlr r0 -/* 801FD674 38 21 00 20 */ addi r1, r1, 0x20 -/* 801FD678 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/checkCStickTrigger__5dMw_cFv.s b/asm/d/menu/d_menu_window/checkCStickTrigger__5dMw_cFv.s deleted file mode 100644 index 16536d34e6..0000000000 --- a/asm/d/menu/d_menu_window/checkCStickTrigger__5dMw_cFv.s +++ /dev/null @@ -1,43 +0,0 @@ -lbl_801FCEE8: -/* 801FCEE8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FCEEC 7C 08 02 A6 */ mflr r0 -/* 801FCEF0 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FCEF4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FCEF8 7C 7F 1B 78 */ mr r31, r3 -/* 801FCEFC 38 00 00 00 */ li r0, 0 -/* 801FCF00 98 03 01 4A */ stb r0, 0x14a(r3) -/* 801FCF04 88 03 01 49 */ lbz r0, 0x149(r3) -/* 801FCF08 28 00 00 00 */ cmplwi r0, 0 -/* 801FCF0C 40 82 00 38 */ bne lbl_801FCF44 -/* 801FCF10 80 7F 01 08 */ lwz r3, 0x108(r31) -/* 801FCF14 81 83 00 00 */ lwz r12, 0(r3) -/* 801FCF18 81 8C 00 08 */ lwz r12, 8(r12) -/* 801FCF1C 7D 89 03 A6 */ mtctr r12 -/* 801FCF20 4E 80 04 21 */ bctrl -/* 801FCF24 C0 02 AA CC */ lfs f0, lit_6000(r2) -/* 801FCF28 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 801FCF2C 40 81 00 40 */ ble lbl_801FCF6C -/* 801FCF30 38 00 00 01 */ li r0, 1 -/* 801FCF34 98 1F 01 49 */ stb r0, 0x149(r31) -/* 801FCF38 98 1F 01 4A */ stb r0, 0x14a(r31) -/* 801FCF3C 38 60 00 01 */ li r3, 1 -/* 801FCF40 48 00 00 30 */ b lbl_801FCF70 -lbl_801FCF44: -/* 801FCF44 80 7F 01 08 */ lwz r3, 0x108(r31) -/* 801FCF48 81 83 00 00 */ lwz r12, 0(r3) -/* 801FCF4C 81 8C 00 08 */ lwz r12, 8(r12) -/* 801FCF50 7D 89 03 A6 */ mtctr r12 -/* 801FCF54 4E 80 04 21 */ bctrl -/* 801FCF58 C0 02 AA D0 */ lfs f0, lit_6001(r2) -/* 801FCF5C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 801FCF60 40 80 00 0C */ bge lbl_801FCF6C -/* 801FCF64 38 00 00 00 */ li r0, 0 -/* 801FCF68 98 1F 01 49 */ stb r0, 0x149(r31) -lbl_801FCF6C: -/* 801FCF6C 38 60 00 00 */ li r3, 0 -lbl_801FCF70: -/* 801FCF70 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FCF74 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FCF78 7C 08 03 A6 */ mtlr r0 -/* 801FCF7C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FCF80 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/checkMemSize__5dMw_cFv.s b/asm/d/menu/d_menu_window/checkMemSize__5dMw_cFv.s deleted file mode 100644 index 5e5b0fdce7..0000000000 --- a/asm/d/menu/d_menu_window/checkMemSize__5dMw_cFv.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_801FD0D4: -/* 801FD0D4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FD0D8 7C 08 02 A6 */ mflr r0 -/* 801FD0DC 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FD0E0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FD0E4 7C 7F 1B 78 */ mr r31, r3 -/* 801FD0E8 80 03 01 38 */ lwz r0, 0x138(r3) -/* 801FD0EC 2C 00 00 00 */ cmpwi r0, 0 -/* 801FD0F0 40 81 00 3C */ ble lbl_801FD12C -/* 801FD0F4 80 7F 01 00 */ lwz r3, 0x100(r31) -/* 801FD0F8 48 0D 16 8D */ bl getTotalFreeSize__7JKRHeapFv -/* 801FD0FC 80 1F 01 38 */ lwz r0, 0x138(r31) -/* 801FD100 7C 00 18 51 */ subf. r0, r0, r3 -/* 801FD104 40 80 00 08 */ bge lbl_801FD10C -/* 801FD108 1C 00 FF FF */ mulli r0, r0, -1 -lbl_801FD10C: -/* 801FD10C 2C 00 00 20 */ cmpwi r0, 0x20 -/* 801FD110 40 81 00 14 */ ble lbl_801FD124 -/* 801FD114 3C 60 80 39 */ lis r3, d_menu_d_menu_window__stringBase0@ha /* 0x80397E38@ha */ -/* 801FD118 38 63 7E 38 */ addi r3, r3, d_menu_d_menu_window__stringBase0@l /* 0x80397E38@l */ -/* 801FD11C 4C C6 31 82 */ crclr 6 -/* 801FD120 4B E0 9A ED */ bl OSReport_Error -lbl_801FD124: -/* 801FD124 38 00 00 00 */ li r0, 0 -/* 801FD128 90 1F 01 38 */ stw r0, 0x138(r31) -lbl_801FD12C: -/* 801FD12C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FD130 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FD134 7C 08 03 A6 */ mtlr r0 -/* 801FD138 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FD13C 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/collect_close_init__5dMw_cFUc.s b/asm/d/menu/d_menu_window/collect_close_init__5dMw_cFUc.s deleted file mode 100644 index 66879e2a41..0000000000 --- a/asm/d/menu/d_menu_window/collect_close_init__5dMw_cFUc.s +++ /dev/null @@ -1,55 +0,0 @@ -lbl_801FA46C: -/* 801FA46C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FA470 7C 08 02 A6 */ mflr r0 -/* 801FA474 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FA478 80 63 01 14 */ lwz r3, 0x114(r3) -/* 801FA47C 80 63 00 04 */ lwz r3, 4(r3) -/* 801FA480 88 03 02 5E */ lbz r0, 0x25e(r3) -/* 801FA484 28 00 00 01 */ cmplwi r0, 1 -/* 801FA488 41 82 00 9C */ beq lbl_801FA524 -/* 801FA48C 28 00 00 02 */ cmplwi r0, 2 -/* 801FA490 41 82 00 94 */ beq lbl_801FA524 -/* 801FA494 28 00 00 03 */ cmplwi r0, 3 -/* 801FA498 41 82 00 1C */ beq lbl_801FA4B4 -/* 801FA49C 28 00 00 04 */ cmplwi r0, 4 -/* 801FA4A0 41 82 00 14 */ beq lbl_801FA4B4 -/* 801FA4A4 28 00 00 05 */ cmplwi r0, 5 -/* 801FA4A8 41 82 00 0C */ beq lbl_801FA4B4 -/* 801FA4AC 28 00 00 06 */ cmplwi r0, 6 -/* 801FA4B0 40 82 00 3C */ bne lbl_801FA4EC -lbl_801FA4B4: -/* 801FA4B4 38 00 00 A4 */ li r0, 0xa4 -/* 801FA4B8 90 01 00 0C */ stw r0, 0xc(r1) -/* 801FA4BC 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 801FA4C0 38 81 00 0C */ addi r4, r1, 0xc -/* 801FA4C4 38 A0 00 00 */ li r5, 0 -/* 801FA4C8 38 C0 00 00 */ li r6, 0 -/* 801FA4CC 38 E0 00 00 */ li r7, 0 -/* 801FA4D0 C0 22 AA C4 */ lfs f1, lit_4386(r2) -/* 801FA4D4 FC 40 08 90 */ fmr f2, f1 -/* 801FA4D8 C0 62 AA C8 */ lfs f3, lit_4387(r2) -/* 801FA4DC FC 80 18 90 */ fmr f4, f3 -/* 801FA4E0 39 00 00 00 */ li r8, 0 -/* 801FA4E4 48 0B 14 A1 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801FA4E8 48 00 00 3C */ b lbl_801FA524 -lbl_801FA4EC: -/* 801FA4EC 38 00 00 5C */ li r0, 0x5c -/* 801FA4F0 90 01 00 08 */ stw r0, 8(r1) -/* 801FA4F4 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 801FA4F8 38 81 00 08 */ addi r4, r1, 8 -/* 801FA4FC 38 A0 00 00 */ li r5, 0 -/* 801FA500 38 C0 00 00 */ li r6, 0 -/* 801FA504 38 E0 00 00 */ li r7, 0 -/* 801FA508 C0 22 AA C4 */ lfs f1, lit_4386(r2) -/* 801FA50C FC 40 08 90 */ fmr f2, f1 -/* 801FA510 C0 62 AA C8 */ lfs f3, lit_4387(r2) -/* 801FA514 FC 80 18 90 */ fmr f4, f3 -/* 801FA518 39 00 00 00 */ li r8, 0 -/* 801FA51C 48 0B 14 69 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801FA520 48 02 44 B5 */ bl dMeter2Info_set2DVibrationM__Fv -lbl_801FA524: -/* 801FA524 48 00 28 E5 */ bl dMw_fade_out__5dMw_cFv -/* 801FA528 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FA52C 7C 08 03 A6 */ mtlr r0 -/* 801FA530 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FA534 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/collect_close_proc__5dMw_cFv.s b/asm/d/menu/d_menu_window/collect_close_proc__5dMw_cFv.s deleted file mode 100644 index c06b90fb28..0000000000 --- a/asm/d/menu/d_menu_window/collect_close_proc__5dMw_cFv.s +++ /dev/null @@ -1,47 +0,0 @@ -lbl_801FB1A0: -/* 801FB1A0 80 8D 86 48 */ lwz r4, mFader__13mDoGph_gInf_c(r13) -/* 801FB1A4 80 04 00 04 */ lwz r0, 4(r4) -/* 801FB1A8 2C 00 00 00 */ cmpwi r0, 0 -/* 801FB1AC 4C 82 00 20 */ bnelr -/* 801FB1B0 80 83 01 14 */ lwz r4, 0x114(r3) -/* 801FB1B4 80 84 00 04 */ lwz r4, 4(r4) -/* 801FB1B8 88 04 02 5E */ lbz r0, 0x25e(r4) -/* 801FB1BC 28 00 00 01 */ cmplwi r0, 1 -/* 801FB1C0 40 82 00 10 */ bne lbl_801FB1D0 -/* 801FB1C4 38 00 00 0D */ li r0, 0xd -/* 801FB1C8 98 03 01 46 */ stb r0, 0x146(r3) -/* 801FB1CC 4E 80 00 20 */ blr -lbl_801FB1D0: -/* 801FB1D0 28 00 00 02 */ cmplwi r0, 2 -/* 801FB1D4 40 82 00 10 */ bne lbl_801FB1E4 -/* 801FB1D8 38 00 00 10 */ li r0, 0x10 -/* 801FB1DC 98 03 01 46 */ stb r0, 0x146(r3) -/* 801FB1E0 4E 80 00 20 */ blr -lbl_801FB1E4: -/* 801FB1E4 28 00 00 03 */ cmplwi r0, 3 -/* 801FB1E8 40 82 00 10 */ bne lbl_801FB1F8 -/* 801FB1EC 38 00 00 13 */ li r0, 0x13 -/* 801FB1F0 98 03 01 46 */ stb r0, 0x146(r3) -/* 801FB1F4 4E 80 00 20 */ blr -lbl_801FB1F8: -/* 801FB1F8 28 00 00 04 */ cmplwi r0, 4 -/* 801FB1FC 40 82 00 10 */ bne lbl_801FB20C -/* 801FB200 38 00 00 16 */ li r0, 0x16 -/* 801FB204 98 03 01 46 */ stb r0, 0x146(r3) -/* 801FB208 4E 80 00 20 */ blr -lbl_801FB20C: -/* 801FB20C 28 00 00 05 */ cmplwi r0, 5 -/* 801FB210 40 82 00 10 */ bne lbl_801FB220 -/* 801FB214 38 00 00 19 */ li r0, 0x19 -/* 801FB218 98 03 01 46 */ stb r0, 0x146(r3) -/* 801FB21C 4E 80 00 20 */ blr -lbl_801FB220: -/* 801FB220 28 00 00 06 */ cmplwi r0, 6 -/* 801FB224 40 82 00 10 */ bne lbl_801FB234 -/* 801FB228 38 00 00 1C */ li r0, 0x1c -/* 801FB22C 98 03 01 46 */ stb r0, 0x146(r3) -/* 801FB230 4E 80 00 20 */ blr -lbl_801FB234: -/* 801FB234 38 00 00 00 */ li r0, 0 -/* 801FB238 98 03 01 46 */ stb r0, 0x146(r3) -/* 801FB23C 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/collect_fishing_close_init__5dMw_cFUc.s b/asm/d/menu/d_menu_window/collect_fishing_close_init__5dMw_cFUc.s deleted file mode 100644 index d6537c6cfa..0000000000 --- a/asm/d/menu/d_menu_window/collect_fishing_close_init__5dMw_cFUc.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_801FA798: -/* 801FA798 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FA79C 7C 08 02 A6 */ mflr r0 -/* 801FA7A0 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FA7A4 38 00 00 A5 */ li r0, 0xa5 -/* 801FA7A8 90 01 00 08 */ stw r0, 8(r1) -/* 801FA7AC 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 801FA7B0 38 81 00 08 */ addi r4, r1, 8 -/* 801FA7B4 38 A0 00 00 */ li r5, 0 -/* 801FA7B8 38 C0 00 00 */ li r6, 0 -/* 801FA7BC 38 E0 00 00 */ li r7, 0 -/* 801FA7C0 C0 22 AA C4 */ lfs f1, lit_4386(r2) -/* 801FA7C4 FC 40 08 90 */ fmr f2, f1 -/* 801FA7C8 C0 62 AA C8 */ lfs f3, lit_4387(r2) -/* 801FA7CC FC 80 18 90 */ fmr f4, f3 -/* 801FA7D0 39 00 00 00 */ li r8, 0 -/* 801FA7D4 48 0B 11 B1 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801FA7D8 48 02 41 F9 */ bl dMeter2Info_set2DVibration__Fv -/* 801FA7DC 48 00 26 2D */ bl dMw_fade_out__5dMw_cFv -/* 801FA7E0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FA7E4 7C 08 03 A6 */ mtlr r0 -/* 801FA7E8 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FA7EC 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/collect_fishing_close_proc__5dMw_cFv.s b/asm/d/menu/d_menu_window/collect_fishing_close_proc__5dMw_cFv.s deleted file mode 100644 index 28d2cd55e3..0000000000 --- a/asm/d/menu/d_menu_window/collect_fishing_close_proc__5dMw_cFv.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_801FBA00: -/* 801FBA00 80 8D 86 48 */ lwz r4, mFader__13mDoGph_gInf_c(r13) -/* 801FBA04 80 04 00 04 */ lwz r0, 4(r4) -/* 801FBA08 2C 00 00 00 */ cmpwi r0, 0 -/* 801FBA0C 4C 82 00 20 */ bnelr -/* 801FBA10 38 00 00 05 */ li r0, 5 -/* 801FBA14 98 03 01 46 */ stb r0, 0x146(r3) -/* 801FBA18 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/collect_fishing_move_proc__5dMw_cFv.s b/asm/d/menu/d_menu_window/collect_fishing_move_proc__5dMw_cFv.s deleted file mode 100644 index 75f9f3b646..0000000000 --- a/asm/d/menu/d_menu_window/collect_fishing_move_proc__5dMw_cFv.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_801FB9AC: -/* 801FB9AC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FB9B0 7C 08 02 A6 */ mflr r0 -/* 801FB9B4 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FB9B8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FB9BC 7C 7F 1B 78 */ mr r31, r3 -/* 801FB9C0 80 63 01 2C */ lwz r3, 0x12c(r3) -/* 801FB9C4 88 03 01 FA */ lbz r0, 0x1fa(r3) -/* 801FB9C8 28 00 00 02 */ cmplwi r0, 2 -/* 801FB9CC 40 82 00 08 */ bne lbl_801FB9D4 -/* 801FB9D0 4B FC 96 E5 */ bl _move__15dMenu_Fishing_cFv -lbl_801FB9D4: -/* 801FB9D4 80 7F 01 2C */ lwz r3, 0x12c(r31) -/* 801FB9D8 88 03 01 FA */ lbz r0, 0x1fa(r3) -/* 801FB9DC 28 00 00 03 */ cmplwi r0, 3 -/* 801FB9E0 40 82 00 0C */ bne lbl_801FB9EC -/* 801FB9E4 38 00 00 18 */ li r0, 0x18 -/* 801FB9E8 98 1F 01 46 */ stb r0, 0x146(r31) -lbl_801FB9EC: -/* 801FB9EC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FB9F0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FB9F4 7C 08 03 A6 */ mtlr r0 -/* 801FB9F8 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FB9FC 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/collect_fishing_open_init__5dMw_cFUc.s b/asm/d/menu/d_menu_window/collect_fishing_open_init__5dMw_cFUc.s deleted file mode 100644 index 69bae984c9..0000000000 --- a/asm/d/menu/d_menu_window/collect_fishing_open_init__5dMw_cFUc.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_801FA738: -/* 801FA738 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FA73C 7C 08 02 A6 */ mflr r0 -/* 801FA740 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FA744 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FA748 7C 7F 1B 78 */ mr r31, r3 -/* 801FA74C 38 A0 00 0A */ li r5, 0xa -/* 801FA750 98 A3 01 44 */ stb r5, 0x144(r3) -/* 801FA754 3C 80 80 43 */ lis r4, g_meter2_info@ha /* 0x80430188@ha */ -/* 801FA758 38 84 01 88 */ addi r4, r4, g_meter2_info@l /* 0x80430188@l */ -/* 801FA75C 88 04 00 B9 */ lbz r0, 0xb9(r4) -/* 801FA760 98 04 00 BA */ stb r0, 0xba(r4) -/* 801FA764 98 A4 00 B9 */ stb r5, 0xb9(r4) -/* 801FA768 38 00 00 00 */ li r0, 0 -/* 801FA76C 98 03 01 52 */ stb r0, 0x152(r3) -/* 801FA770 38 80 00 01 */ li r4, 1 -/* 801FA774 48 00 19 1D */ bl dMw_collect_delete__5dMw_cFb -/* 801FA778 7F E3 FB 78 */ mr r3, r31 -/* 801FA77C 48 00 21 89 */ bl dMw_fishing_create__5dMw_cFv -/* 801FA780 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FA784 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FA788 7C 08 03 A6 */ mtlr r0 -/* 801FA78C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FA790 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/collect_fishing_open_proc__5dMw_cFv.s b/asm/d/menu/d_menu_window/collect_fishing_open_proc__5dMw_cFv.s deleted file mode 100644 index 59e0769f37..0000000000 --- a/asm/d/menu/d_menu_window/collect_fishing_open_proc__5dMw_cFv.s +++ /dev/null @@ -1,39 +0,0 @@ -lbl_801FB91C: -/* 801FB91C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FB920 7C 08 02 A6 */ mflr r0 -/* 801FB924 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FB928 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FB92C 7C 7F 1B 78 */ mr r31, r3 -/* 801FB930 80 63 01 2C */ lwz r3, 0x12c(r3) -/* 801FB934 88 03 01 FA */ lbz r0, 0x1fa(r3) -/* 801FB938 28 00 00 01 */ cmplwi r0, 1 -/* 801FB93C 40 82 00 30 */ bne lbl_801FB96C -/* 801FB940 4B FC 99 A5 */ bl _open__15dMenu_Fishing_cFv -/* 801FB944 88 1F 01 52 */ lbz r0, 0x152(r31) -/* 801FB948 28 00 00 00 */ cmplwi r0, 0 -/* 801FB94C 40 82 00 20 */ bne lbl_801FB96C -/* 801FB950 80 7F 01 2C */ lwz r3, 0x12c(r31) -/* 801FB954 4B FC 98 B1 */ bl isSync__15dMenu_Fishing_cFv -/* 801FB958 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801FB95C 41 82 00 10 */ beq lbl_801FB96C -/* 801FB960 48 00 15 19 */ bl dMw_fade_in__5dMw_cFv -/* 801FB964 38 00 00 01 */ li r0, 1 -/* 801FB968 98 1F 01 52 */ stb r0, 0x152(r31) -lbl_801FB96C: -/* 801FB96C 80 7F 01 2C */ lwz r3, 0x12c(r31) -/* 801FB970 88 03 01 FA */ lbz r0, 0x1fa(r3) -/* 801FB974 28 00 00 02 */ cmplwi r0, 2 -/* 801FB978 40 82 00 20 */ bne lbl_801FB998 -/* 801FB97C 88 1F 01 52 */ lbz r0, 0x152(r31) -/* 801FB980 28 00 00 01 */ cmplwi r0, 1 -/* 801FB984 40 82 00 14 */ bne lbl_801FB998 -/* 801FB988 38 00 00 17 */ li r0, 0x17 -/* 801FB98C 98 1F 01 46 */ stb r0, 0x146(r31) -/* 801FB990 38 00 00 00 */ li r0, 0 -/* 801FB994 98 1F 01 52 */ stb r0, 0x152(r31) -lbl_801FB998: -/* 801FB998 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FB99C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FB9A0 7C 08 03 A6 */ mtlr r0 -/* 801FB9A4 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FB9A8 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/collect_insect_close_init__5dMw_cFUc.s b/asm/d/menu/d_menu_window/collect_insect_close_init__5dMw_cFUc.s deleted file mode 100644 index 4769caa0d9..0000000000 --- a/asm/d/menu/d_menu_window/collect_insect_close_init__5dMw_cFUc.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_801FA90C: -/* 801FA90C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FA910 7C 08 02 A6 */ mflr r0 -/* 801FA914 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FA918 38 00 00 A5 */ li r0, 0xa5 -/* 801FA91C 90 01 00 08 */ stw r0, 8(r1) -/* 801FA920 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 801FA924 38 81 00 08 */ addi r4, r1, 8 -/* 801FA928 38 A0 00 00 */ li r5, 0 -/* 801FA92C 38 C0 00 00 */ li r6, 0 -/* 801FA930 38 E0 00 00 */ li r7, 0 -/* 801FA934 C0 22 AA C4 */ lfs f1, lit_4386(r2) -/* 801FA938 FC 40 08 90 */ fmr f2, f1 -/* 801FA93C C0 62 AA C8 */ lfs f3, lit_4387(r2) -/* 801FA940 FC 80 18 90 */ fmr f4, f3 -/* 801FA944 39 00 00 00 */ li r8, 0 -/* 801FA948 48 0B 10 3D */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801FA94C 48 02 40 85 */ bl dMeter2Info_set2DVibration__Fv -/* 801FA950 48 00 24 B9 */ bl dMw_fade_out__5dMw_cFv -/* 801FA954 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FA958 7C 08 03 A6 */ mtlr r0 -/* 801FA95C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FA960 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/collect_insect_close_proc__5dMw_cFv.s b/asm/d/menu/d_menu_window/collect_insect_close_proc__5dMw_cFv.s deleted file mode 100644 index baaea5e792..0000000000 --- a/asm/d/menu/d_menu_window/collect_insect_close_proc__5dMw_cFv.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_801FBC00: -/* 801FBC00 80 8D 86 48 */ lwz r4, mFader__13mDoGph_gInf_c(r13) -/* 801FBC04 80 04 00 04 */ lwz r0, 4(r4) -/* 801FBC08 2C 00 00 00 */ cmpwi r0, 0 -/* 801FBC0C 4C 82 00 20 */ bnelr -/* 801FBC10 38 00 00 05 */ li r0, 5 -/* 801FBC14 98 03 01 46 */ stb r0, 0x146(r3) -/* 801FBC18 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/collect_insect_move_proc__5dMw_cFv.s b/asm/d/menu/d_menu_window/collect_insect_move_proc__5dMw_cFv.s deleted file mode 100644 index baea21ec50..0000000000 --- a/asm/d/menu/d_menu_window/collect_insect_move_proc__5dMw_cFv.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_801FBBAC: -/* 801FBBAC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FBBB0 7C 08 02 A6 */ mflr r0 -/* 801FBBB4 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FBBB8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FBBBC 7C 7F 1B 78 */ mr r31, r3 -/* 801FBBC0 80 63 01 34 */ lwz r3, 0x134(r3) -/* 801FBBC4 88 03 00 F2 */ lbz r0, 0xf2(r3) -/* 801FBBC8 28 00 00 02 */ cmplwi r0, 2 -/* 801FBBCC 40 82 00 08 */ bne lbl_801FBBD4 -/* 801FBBD0 4B FD CA F9 */ bl _move__14dMenu_Insect_cFv -lbl_801FBBD4: -/* 801FBBD4 80 7F 01 34 */ lwz r3, 0x134(r31) -/* 801FBBD8 88 03 00 F2 */ lbz r0, 0xf2(r3) -/* 801FBBDC 28 00 00 03 */ cmplwi r0, 3 -/* 801FBBE0 40 82 00 0C */ bne lbl_801FBBEC -/* 801FBBE4 38 00 00 1E */ li r0, 0x1e -/* 801FBBE8 98 1F 01 46 */ stb r0, 0x146(r31) -lbl_801FBBEC: -/* 801FBBEC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FBBF0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FBBF4 7C 08 03 A6 */ mtlr r0 -/* 801FBBF8 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FBBFC 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/collect_insect_open_init__5dMw_cFUc.s b/asm/d/menu/d_menu_window/collect_insect_open_init__5dMw_cFUc.s deleted file mode 100644 index 515011593a..0000000000 --- a/asm/d/menu/d_menu_window/collect_insect_open_init__5dMw_cFUc.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_801FA8A8: -/* 801FA8A8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FA8AC 7C 08 02 A6 */ mflr r0 -/* 801FA8B0 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FA8B4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FA8B8 7C 7F 1B 78 */ mr r31, r3 -/* 801FA8BC 38 A0 00 0A */ li r5, 0xa -/* 801FA8C0 98 A3 01 44 */ stb r5, 0x144(r3) -/* 801FA8C4 3C 80 80 43 */ lis r4, g_meter2_info@ha /* 0x80430188@ha */ -/* 801FA8C8 38 84 01 88 */ addi r4, r4, g_meter2_info@l /* 0x80430188@l */ -/* 801FA8CC 88 04 00 B9 */ lbz r0, 0xb9(r4) -/* 801FA8D0 98 04 00 BA */ stb r0, 0xba(r4) -/* 801FA8D4 98 A4 00 B9 */ stb r5, 0xb9(r4) -/* 801FA8D8 38 00 00 00 */ li r0, 0 -/* 801FA8DC 98 03 01 52 */ stb r0, 0x152(r3) -/* 801FA8E0 38 80 00 01 */ li r4, 1 -/* 801FA8E4 48 00 17 AD */ bl dMw_collect_delete__5dMw_cFb -/* 801FA8E8 7F E3 FB 78 */ mr r3, r31 -/* 801FA8EC 38 80 00 00 */ li r4, 0 -/* 801FA8F0 48 00 22 A5 */ bl dMw_insect_create__5dMw_cFUc -/* 801FA8F4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FA8F8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FA8FC 7C 08 03 A6 */ mtlr r0 -/* 801FA900 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FA904 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/collect_insect_open_proc__5dMw_cFv.s b/asm/d/menu/d_menu_window/collect_insect_open_proc__5dMw_cFv.s deleted file mode 100644 index 6fff24be57..0000000000 --- a/asm/d/menu/d_menu_window/collect_insect_open_proc__5dMw_cFv.s +++ /dev/null @@ -1,39 +0,0 @@ -lbl_801FBB1C: -/* 801FBB1C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FBB20 7C 08 02 A6 */ mflr r0 -/* 801FBB24 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FBB28 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FBB2C 7C 7F 1B 78 */ mr r31, r3 -/* 801FBB30 80 63 01 34 */ lwz r3, 0x134(r3) -/* 801FBB34 88 03 00 F2 */ lbz r0, 0xf2(r3) -/* 801FBB38 28 00 00 01 */ cmplwi r0, 1 -/* 801FBB3C 40 82 00 30 */ bne lbl_801FBB6C -/* 801FBB40 4B FD CE 0D */ bl _open__14dMenu_Insect_cFv -/* 801FBB44 88 1F 01 52 */ lbz r0, 0x152(r31) -/* 801FBB48 28 00 00 00 */ cmplwi r0, 0 -/* 801FBB4C 40 82 00 20 */ bne lbl_801FBB6C -/* 801FBB50 80 7F 01 34 */ lwz r3, 0x134(r31) -/* 801FBB54 4B FD CD 99 */ bl isSync__14dMenu_Insect_cFv -/* 801FBB58 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801FBB5C 41 82 00 10 */ beq lbl_801FBB6C -/* 801FBB60 48 00 13 19 */ bl dMw_fade_in__5dMw_cFv -/* 801FBB64 38 00 00 01 */ li r0, 1 -/* 801FBB68 98 1F 01 52 */ stb r0, 0x152(r31) -lbl_801FBB6C: -/* 801FBB6C 80 7F 01 34 */ lwz r3, 0x134(r31) -/* 801FBB70 88 03 00 F2 */ lbz r0, 0xf2(r3) -/* 801FBB74 28 00 00 02 */ cmplwi r0, 2 -/* 801FBB78 40 82 00 20 */ bne lbl_801FBB98 -/* 801FBB7C 88 1F 01 52 */ lbz r0, 0x152(r31) -/* 801FBB80 28 00 00 01 */ cmplwi r0, 1 -/* 801FBB84 40 82 00 14 */ bne lbl_801FBB98 -/* 801FBB88 38 00 00 1D */ li r0, 0x1d -/* 801FBB8C 98 1F 01 46 */ stb r0, 0x146(r31) -/* 801FBB90 38 00 00 00 */ li r0, 0 -/* 801FBB94 98 1F 01 52 */ stb r0, 0x152(r31) -lbl_801FBB98: -/* 801FBB98 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FBB9C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FBBA0 7C 08 03 A6 */ mtlr r0 -/* 801FBBA4 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FBBA8 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/collect_letter_close_init__5dMw_cFUc.s b/asm/d/menu/d_menu_window/collect_letter_close_init__5dMw_cFUc.s deleted file mode 100644 index 137c0c06d5..0000000000 --- a/asm/d/menu/d_menu_window/collect_letter_close_init__5dMw_cFUc.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_801FA6E0: -/* 801FA6E0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FA6E4 7C 08 02 A6 */ mflr r0 -/* 801FA6E8 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FA6EC 38 00 00 A5 */ li r0, 0xa5 -/* 801FA6F0 90 01 00 08 */ stw r0, 8(r1) -/* 801FA6F4 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 801FA6F8 38 81 00 08 */ addi r4, r1, 8 -/* 801FA6FC 38 A0 00 00 */ li r5, 0 -/* 801FA700 38 C0 00 00 */ li r6, 0 -/* 801FA704 38 E0 00 00 */ li r7, 0 -/* 801FA708 C0 22 AA C4 */ lfs f1, lit_4386(r2) -/* 801FA70C FC 40 08 90 */ fmr f2, f1 -/* 801FA710 C0 62 AA C8 */ lfs f3, lit_4387(r2) -/* 801FA714 FC 80 18 90 */ fmr f4, f3 -/* 801FA718 39 00 00 00 */ li r8, 0 -/* 801FA71C 48 0B 12 69 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801FA720 48 02 42 B1 */ bl dMeter2Info_set2DVibration__Fv -/* 801FA724 48 00 26 E5 */ bl dMw_fade_out__5dMw_cFv -/* 801FA728 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FA72C 7C 08 03 A6 */ mtlr r0 -/* 801FA730 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FA734 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/collect_letter_close_proc__5dMw_cFv.s b/asm/d/menu/d_menu_window/collect_letter_close_proc__5dMw_cFv.s deleted file mode 100644 index 738c26eef4..0000000000 --- a/asm/d/menu/d_menu_window/collect_letter_close_proc__5dMw_cFv.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_801FB900: -/* 801FB900 80 8D 86 48 */ lwz r4, mFader__13mDoGph_gInf_c(r13) -/* 801FB904 80 04 00 04 */ lwz r0, 4(r4) -/* 801FB908 2C 00 00 00 */ cmpwi r0, 0 -/* 801FB90C 4C 82 00 20 */ bnelr -/* 801FB910 38 00 00 05 */ li r0, 5 -/* 801FB914 98 03 01 46 */ stb r0, 0x146(r3) -/* 801FB918 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/collect_letter_move_proc__5dMw_cFv.s b/asm/d/menu/d_menu_window/collect_letter_move_proc__5dMw_cFv.s deleted file mode 100644 index cf9b11967e..0000000000 --- a/asm/d/menu/d_menu_window/collect_letter_move_proc__5dMw_cFv.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_801FB8AC: -/* 801FB8AC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FB8B0 7C 08 02 A6 */ mflr r0 -/* 801FB8B4 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FB8B8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FB8BC 7C 7F 1B 78 */ mr r31, r3 -/* 801FB8C0 80 63 01 28 */ lwz r3, 0x128(r3) -/* 801FB8C4 88 03 03 6C */ lbz r0, 0x36c(r3) -/* 801FB8C8 28 00 00 02 */ cmplwi r0, 2 -/* 801FB8CC 40 82 00 08 */ bne lbl_801FB8D4 -/* 801FB8D0 4B FE 1B A5 */ bl _move__14dMenu_Letter_cFv -lbl_801FB8D4: -/* 801FB8D4 80 7F 01 28 */ lwz r3, 0x128(r31) -/* 801FB8D8 88 03 03 6C */ lbz r0, 0x36c(r3) -/* 801FB8DC 28 00 00 03 */ cmplwi r0, 3 -/* 801FB8E0 40 82 00 0C */ bne lbl_801FB8EC -/* 801FB8E4 38 00 00 15 */ li r0, 0x15 -/* 801FB8E8 98 1F 01 46 */ stb r0, 0x146(r31) -lbl_801FB8EC: -/* 801FB8EC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FB8F0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FB8F4 7C 08 03 A6 */ mtlr r0 -/* 801FB8F8 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FB8FC 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/collect_letter_open_init__5dMw_cFUc.s b/asm/d/menu/d_menu_window/collect_letter_open_init__5dMw_cFUc.s deleted file mode 100644 index 61cbfbea0b..0000000000 --- a/asm/d/menu/d_menu_window/collect_letter_open_init__5dMw_cFUc.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_801FA680: -/* 801FA680 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FA684 7C 08 02 A6 */ mflr r0 -/* 801FA688 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FA68C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FA690 7C 7F 1B 78 */ mr r31, r3 -/* 801FA694 38 A0 00 0A */ li r5, 0xa -/* 801FA698 98 A3 01 44 */ stb r5, 0x144(r3) -/* 801FA69C 3C 80 80 43 */ lis r4, g_meter2_info@ha /* 0x80430188@ha */ -/* 801FA6A0 38 84 01 88 */ addi r4, r4, g_meter2_info@l /* 0x80430188@l */ -/* 801FA6A4 88 04 00 B9 */ lbz r0, 0xb9(r4) -/* 801FA6A8 98 04 00 BA */ stb r0, 0xba(r4) -/* 801FA6AC 98 A4 00 B9 */ stb r5, 0xb9(r4) -/* 801FA6B0 38 00 00 00 */ li r0, 0 -/* 801FA6B4 98 03 01 52 */ stb r0, 0x152(r3) -/* 801FA6B8 38 80 00 01 */ li r4, 1 -/* 801FA6BC 48 00 19 D5 */ bl dMw_collect_delete__5dMw_cFb -/* 801FA6C0 7F E3 FB 78 */ mr r3, r31 -/* 801FA6C4 48 00 20 F9 */ bl dMw_letter_create__5dMw_cFv -/* 801FA6C8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FA6CC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FA6D0 7C 08 03 A6 */ mtlr r0 -/* 801FA6D4 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FA6D8 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/collect_letter_open_proc__5dMw_cFv.s b/asm/d/menu/d_menu_window/collect_letter_open_proc__5dMw_cFv.s deleted file mode 100644 index 9413e05944..0000000000 --- a/asm/d/menu/d_menu_window/collect_letter_open_proc__5dMw_cFv.s +++ /dev/null @@ -1,39 +0,0 @@ -lbl_801FB81C: -/* 801FB81C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FB820 7C 08 02 A6 */ mflr r0 -/* 801FB824 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FB828 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FB82C 7C 7F 1B 78 */ mr r31, r3 -/* 801FB830 80 63 01 28 */ lwz r3, 0x128(r3) -/* 801FB834 88 03 03 6C */ lbz r0, 0x36c(r3) -/* 801FB838 28 00 00 01 */ cmplwi r0, 1 -/* 801FB83C 40 82 00 30 */ bne lbl_801FB86C -/* 801FB840 4B FE 22 35 */ bl _open__14dMenu_Letter_cFv -/* 801FB844 88 1F 01 52 */ lbz r0, 0x152(r31) -/* 801FB848 28 00 00 00 */ cmplwi r0, 0 -/* 801FB84C 40 82 00 20 */ bne lbl_801FB86C -/* 801FB850 80 7F 01 28 */ lwz r3, 0x128(r31) -/* 801FB854 4B FE 20 E1 */ bl isSync__14dMenu_Letter_cFv -/* 801FB858 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801FB85C 41 82 00 10 */ beq lbl_801FB86C -/* 801FB860 48 00 16 19 */ bl dMw_fade_in__5dMw_cFv -/* 801FB864 38 00 00 01 */ li r0, 1 -/* 801FB868 98 1F 01 52 */ stb r0, 0x152(r31) -lbl_801FB86C: -/* 801FB86C 80 7F 01 28 */ lwz r3, 0x128(r31) -/* 801FB870 88 03 03 6C */ lbz r0, 0x36c(r3) -/* 801FB874 28 00 00 02 */ cmplwi r0, 2 -/* 801FB878 40 82 00 20 */ bne lbl_801FB898 -/* 801FB87C 88 1F 01 52 */ lbz r0, 0x152(r31) -/* 801FB880 28 00 00 01 */ cmplwi r0, 1 -/* 801FB884 40 82 00 14 */ bne lbl_801FB898 -/* 801FB888 38 00 00 14 */ li r0, 0x14 -/* 801FB88C 98 1F 01 46 */ stb r0, 0x146(r31) -/* 801FB890 38 00 00 00 */ li r0, 0 -/* 801FB894 98 1F 01 52 */ stb r0, 0x152(r31) -lbl_801FB898: -/* 801FB898 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FB89C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FB8A0 7C 08 03 A6 */ mtlr r0 -/* 801FB8A4 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FB8A8 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/collect_move_init__5dMw_cFUc.s b/asm/d/menu/d_menu_window/collect_move_init__5dMw_cFUc.s deleted file mode 100644 index 97379d2282..0000000000 --- a/asm/d/menu/d_menu_window/collect_move_init__5dMw_cFUc.s +++ /dev/null @@ -1,105 +0,0 @@ -lbl_801FA2D0: -/* 801FA2D0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FA2D4 7C 08 02 A6 */ mflr r0 -/* 801FA2D8 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FA2DC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FA2E0 7C 7F 1B 78 */ mr r31, r3 -/* 801FA2E4 54 83 06 3E */ clrlwi r3, r4, 0x18 -/* 801FA2E8 38 03 FF FC */ addi r0, r3, -4 -/* 801FA2EC 28 00 00 1A */ cmplwi r0, 0x1a -/* 801FA2F0 41 81 01 68 */ bgt lbl_801FA458 -/* 801FA2F4 3C 60 80 3C */ lis r3, lit_4418@ha /* 0x803BF014@ha */ -/* 801FA2F8 38 63 F0 14 */ addi r3, r3, lit_4418@l /* 0x803BF014@l */ -/* 801FA2FC 54 00 10 3A */ slwi r0, r0, 2 -/* 801FA300 7C 03 00 2E */ lwzx r0, r3, r0 -/* 801FA304 7C 09 03 A6 */ mtctr r0 -/* 801FA308 4E 80 04 20 */ bctr -/* 801FA30C 48 00 2B 6D */ bl dMw_fade_in__5dMw_cFv -/* 801FA310 38 60 00 01 */ li r3, 1 -/* 801FA314 4B E3 3D CD */ bl dComIfGp_setHeapLockFlag__FUc -/* 801FA318 7F E3 FB 78 */ mr r3, r31 -/* 801FA31C 48 00 1C DD */ bl dMw_collect_create__5dMw_cFv -/* 801FA320 48 00 01 38 */ b lbl_801FA458 -/* 801FA324 48 00 2B 55 */ bl dMw_fade_in__5dMw_cFv -/* 801FA328 7F E3 FB 78 */ mr r3, r31 -/* 801FA32C 48 00 22 A5 */ bl dMw_save_delete__5dMw_cFv -/* 801FA330 38 80 00 03 */ li r4, 3 -/* 801FA334 98 9F 01 44 */ stb r4, 0x144(r31) -/* 801FA338 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801FA33C 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801FA340 88 03 00 B9 */ lbz r0, 0xb9(r3) -/* 801FA344 98 03 00 BA */ stb r0, 0xba(r3) -/* 801FA348 98 83 00 B9 */ stb r4, 0xb9(r3) -/* 801FA34C 7F E3 FB 78 */ mr r3, r31 -/* 801FA350 48 00 1C A9 */ bl dMw_collect_create__5dMw_cFv -/* 801FA354 48 00 01 04 */ b lbl_801FA458 -/* 801FA358 48 00 2B 21 */ bl dMw_fade_in__5dMw_cFv -/* 801FA35C 7F E3 FB 78 */ mr r3, r31 -/* 801FA360 48 00 23 AD */ bl dMw_option_delete__5dMw_cFv -/* 801FA364 38 80 00 03 */ li r4, 3 -/* 801FA368 98 9F 01 44 */ stb r4, 0x144(r31) -/* 801FA36C 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801FA370 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801FA374 88 03 00 B9 */ lbz r0, 0xb9(r3) -/* 801FA378 98 03 00 BA */ stb r0, 0xba(r3) -/* 801FA37C 98 83 00 B9 */ stb r4, 0xb9(r3) -/* 801FA380 7F E3 FB 78 */ mr r3, r31 -/* 801FA384 48 00 1C 75 */ bl dMw_collect_create__5dMw_cFv -/* 801FA388 48 00 00 D0 */ b lbl_801FA458 -/* 801FA38C 48 00 2A ED */ bl dMw_fade_in__5dMw_cFv -/* 801FA390 7F E3 FB 78 */ mr r3, r31 -/* 801FA394 48 00 24 C9 */ bl dMw_letter_delete__5dMw_cFv -/* 801FA398 38 80 00 03 */ li r4, 3 -/* 801FA39C 98 9F 01 44 */ stb r4, 0x144(r31) -/* 801FA3A0 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801FA3A4 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801FA3A8 88 03 00 B9 */ lbz r0, 0xb9(r3) -/* 801FA3AC 98 03 00 BA */ stb r0, 0xba(r3) -/* 801FA3B0 98 83 00 B9 */ stb r4, 0xb9(r3) -/* 801FA3B4 7F E3 FB 78 */ mr r3, r31 -/* 801FA3B8 48 00 1C 41 */ bl dMw_collect_create__5dMw_cFv -/* 801FA3BC 48 00 00 9C */ b lbl_801FA458 -/* 801FA3C0 48 00 2A B9 */ bl dMw_fade_in__5dMw_cFv -/* 801FA3C4 7F E3 FB 78 */ mr r3, r31 -/* 801FA3C8 48 00 25 DD */ bl dMw_fishing_delete__5dMw_cFv -/* 801FA3CC 38 80 00 03 */ li r4, 3 -/* 801FA3D0 98 9F 01 44 */ stb r4, 0x144(r31) -/* 801FA3D4 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801FA3D8 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801FA3DC 88 03 00 B9 */ lbz r0, 0xb9(r3) -/* 801FA3E0 98 03 00 BA */ stb r0, 0xba(r3) -/* 801FA3E4 98 83 00 B9 */ stb r4, 0xb9(r3) -/* 801FA3E8 7F E3 FB 78 */ mr r3, r31 -/* 801FA3EC 48 00 1C 0D */ bl dMw_collect_create__5dMw_cFv -/* 801FA3F0 48 00 00 68 */ b lbl_801FA458 -/* 801FA3F4 48 00 2A 85 */ bl dMw_fade_in__5dMw_cFv -/* 801FA3F8 7F E3 FB 78 */ mr r3, r31 -/* 801FA3FC 48 00 26 F1 */ bl dMw_skill_delete__5dMw_cFv -/* 801FA400 38 80 00 03 */ li r4, 3 -/* 801FA404 98 9F 01 44 */ stb r4, 0x144(r31) -/* 801FA408 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801FA40C 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801FA410 88 03 00 B9 */ lbz r0, 0xb9(r3) -/* 801FA414 98 03 00 BA */ stb r0, 0xba(r3) -/* 801FA418 98 83 00 B9 */ stb r4, 0xb9(r3) -/* 801FA41C 7F E3 FB 78 */ mr r3, r31 -/* 801FA420 48 00 1B D9 */ bl dMw_collect_create__5dMw_cFv -/* 801FA424 48 00 00 34 */ b lbl_801FA458 -/* 801FA428 48 00 2A 51 */ bl dMw_fade_in__5dMw_cFv -/* 801FA42C 7F E3 FB 78 */ mr r3, r31 -/* 801FA430 48 00 28 15 */ bl dMw_insect_delete__5dMw_cFv -/* 801FA434 38 80 00 03 */ li r4, 3 -/* 801FA438 98 9F 01 44 */ stb r4, 0x144(r31) -/* 801FA43C 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801FA440 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801FA444 88 03 00 B9 */ lbz r0, 0xb9(r3) -/* 801FA448 98 03 00 BA */ stb r0, 0xba(r3) -/* 801FA44C 98 83 00 B9 */ stb r4, 0xb9(r3) -/* 801FA450 7F E3 FB 78 */ mr r3, r31 -/* 801FA454 48 00 1B A5 */ bl dMw_collect_create__5dMw_cFv -lbl_801FA458: -/* 801FA458 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FA45C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FA460 7C 08 03 A6 */ mtlr r0 -/* 801FA464 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FA468 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/collect_move_proc__5dMw_cFv.s b/asm/d/menu/d_menu_window/collect_move_proc__5dMw_cFv.s deleted file mode 100644 index 8a348071f5..0000000000 --- a/asm/d/menu/d_menu_window/collect_move_proc__5dMw_cFv.s +++ /dev/null @@ -1,42 +0,0 @@ -lbl_801FB110: -/* 801FB110 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FB114 7C 08 02 A6 */ mflr r0 -/* 801FB118 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FB11C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FB120 7C 7F 1B 78 */ mr r31, r3 -/* 801FB124 80 83 01 14 */ lwz r4, 0x114(r3) -/* 801FB128 80 84 00 04 */ lwz r4, 4(r4) -/* 801FB12C 88 04 02 5E */ lbz r0, 0x25e(r4) -/* 801FB130 28 00 00 00 */ cmplwi r0, 0 -/* 801FB134 41 82 00 10 */ beq lbl_801FB144 -/* 801FB138 38 00 00 06 */ li r0, 6 -/* 801FB13C 98 1F 01 46 */ stb r0, 0x146(r31) -/* 801FB140 48 00 00 4C */ b lbl_801FB18C -lbl_801FB144: -/* 801FB144 48 00 1B E1 */ bl dMw_isPush_S_Button__5dMw_cFv -/* 801FB148 2C 03 00 00 */ cmpwi r3, 0 -/* 801FB14C 41 82 00 18 */ beq lbl_801FB164 -/* 801FB150 80 7F 01 14 */ lwz r3, 0x114(r31) -/* 801FB154 80 63 00 04 */ lwz r3, 4(r3) -/* 801FB158 4B FB AE 2D */ bl isKeyCheck__17dMenu_Collect2D_cFv -/* 801FB15C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801FB160 41 82 00 18 */ beq lbl_801FB178 -lbl_801FB164: -/* 801FB164 80 7F 01 14 */ lwz r3, 0x114(r31) -/* 801FB168 80 63 00 04 */ lwz r3, 4(r3) -/* 801FB16C 4B FB AE 41 */ bl isOutCheck__17dMenu_Collect2D_cFv -/* 801FB170 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801FB174 41 82 00 10 */ beq lbl_801FB184 -lbl_801FB178: -/* 801FB178 38 00 00 06 */ li r0, 6 -/* 801FB17C 98 1F 01 46 */ stb r0, 0x146(r31) -/* 801FB180 48 00 00 0C */ b lbl_801FB18C -lbl_801FB184: -/* 801FB184 80 7F 01 14 */ lwz r3, 0x114(r31) -/* 801FB188 4B FB C8 F5 */ bl _move__15dMenu_Collect_cFv -lbl_801FB18C: -/* 801FB18C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FB190 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FB194 7C 08 03 A6 */ mtlr r0 -/* 801FB198 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FB19C 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/collect_open_init__5dMw_cFUc.s b/asm/d/menu/d_menu_window/collect_open_init__5dMw_cFUc.s deleted file mode 100644 index 20ff7eab97..0000000000 --- a/asm/d/menu/d_menu_window/collect_open_init__5dMw_cFUc.s +++ /dev/null @@ -1,36 +0,0 @@ -lbl_801FA244: -/* 801FA244 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801FA248 7C 08 02 A6 */ mflr r0 -/* 801FA24C 90 01 00 24 */ stw r0, 0x24(r1) -/* 801FA250 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 801FA254 7C 7F 1B 78 */ mr r31, r3 -/* 801FA258 38 80 00 03 */ li r4, 3 -/* 801FA25C 98 83 01 44 */ stb r4, 0x144(r3) -/* 801FA260 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801FA264 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801FA268 88 03 00 B9 */ lbz r0, 0xb9(r3) -/* 801FA26C 98 03 00 BA */ stb r0, 0xba(r3) -/* 801FA270 98 83 00 B9 */ stb r4, 0xb9(r3) -/* 801FA274 38 00 00 5B */ li r0, 0x5b -/* 801FA278 90 01 00 08 */ stw r0, 8(r1) -/* 801FA27C 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 801FA280 38 81 00 08 */ addi r4, r1, 8 -/* 801FA284 38 A0 00 00 */ li r5, 0 -/* 801FA288 38 C0 00 00 */ li r6, 0 -/* 801FA28C 38 E0 00 00 */ li r7, 0 -/* 801FA290 C0 22 AA C4 */ lfs f1, lit_4386(r2) -/* 801FA294 FC 40 08 90 */ fmr f2, f1 -/* 801FA298 C0 62 AA C8 */ lfs f3, lit_4387(r2) -/* 801FA29C FC 80 18 90 */ fmr f4, f3 -/* 801FA2A0 39 00 00 00 */ li r8, 0 -/* 801FA2A4 48 0B 16 E1 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801FA2A8 48 00 2B 61 */ bl dMw_fade_out__5dMw_cFv -/* 801FA2AC 7F E3 FB 78 */ mr r3, r31 -/* 801FA2B0 48 00 1A D1 */ bl dMw_capture_create__5dMw_cFv -/* 801FA2B4 38 00 00 00 */ li r0, 0 -/* 801FA2B8 98 1F 01 53 */ stb r0, 0x153(r31) -/* 801FA2BC 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 801FA2C0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801FA2C4 7C 08 03 A6 */ mtlr r0 -/* 801FA2C8 38 21 00 20 */ addi r1, r1, 0x20 -/* 801FA2CC 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/collect_open_proc__5dMw_cFv.s b/asm/d/menu/d_menu_window/collect_open_proc__5dMw_cFv.s deleted file mode 100644 index 68f0f5bf09..0000000000 --- a/asm/d/menu/d_menu_window/collect_open_proc__5dMw_cFv.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_801FB0B8: -/* 801FB0B8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FB0BC 7C 08 02 A6 */ mflr r0 -/* 801FB0C0 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FB0C4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FB0C8 7C 7F 1B 78 */ mr r31, r3 -/* 801FB0CC 88 03 01 53 */ lbz r0, 0x153(r3) -/* 801FB0D0 28 00 00 00 */ cmplwi r0, 0 -/* 801FB0D4 40 82 00 10 */ bne lbl_801FB0E4 -/* 801FB0D8 38 00 00 01 */ li r0, 1 -/* 801FB0DC 98 1F 01 53 */ stb r0, 0x153(r31) -/* 801FB0E0 48 02 38 F5 */ bl dMeter2Info_set2DVibrationM__Fv -lbl_801FB0E4: -/* 801FB0E4 80 6D 86 48 */ lwz r3, mFader__13mDoGph_gInf_c(r13) -/* 801FB0E8 80 03 00 04 */ lwz r0, 4(r3) -/* 801FB0EC 2C 00 00 00 */ cmpwi r0, 0 -/* 801FB0F0 40 82 00 0C */ bne lbl_801FB0FC -/* 801FB0F4 38 00 00 05 */ li r0, 5 -/* 801FB0F8 98 1F 01 46 */ stb r0, 0x146(r31) -lbl_801FB0FC: -/* 801FB0FC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FB100 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FB104 7C 08 03 A6 */ mtlr r0 -/* 801FB108 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FB10C 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/collect_option_close_init__5dMw_cFUc.s b/asm/d/menu/d_menu_window/collect_option_close_init__5dMw_cFUc.s deleted file mode 100644 index 8e882623b7..0000000000 --- a/asm/d/menu/d_menu_window/collect_option_close_init__5dMw_cFUc.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_801FA660: -/* 801FA660 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FA664 7C 08 02 A6 */ mflr r0 -/* 801FA668 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FA66C 48 00 27 9D */ bl dMw_fade_out__5dMw_cFv -/* 801FA670 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FA674 7C 08 03 A6 */ mtlr r0 -/* 801FA678 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FA67C 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/collect_option_close_proc__5dMw_cFv.s b/asm/d/menu/d_menu_window/collect_option_close_proc__5dMw_cFv.s deleted file mode 100644 index 95ec718186..0000000000 --- a/asm/d/menu/d_menu_window/collect_option_close_proc__5dMw_cFv.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_801FB800: -/* 801FB800 80 8D 86 48 */ lwz r4, mFader__13mDoGph_gInf_c(r13) -/* 801FB804 80 04 00 04 */ lwz r0, 4(r4) -/* 801FB808 2C 00 00 00 */ cmpwi r0, 0 -/* 801FB80C 4C 82 00 20 */ bnelr -/* 801FB810 38 00 00 05 */ li r0, 5 -/* 801FB814 98 03 01 46 */ stb r0, 0x146(r3) -/* 801FB818 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/collect_option_move_proc__5dMw_cFv.s b/asm/d/menu/d_menu_window/collect_option_move_proc__5dMw_cFv.s deleted file mode 100644 index c2ab492985..0000000000 --- a/asm/d/menu/d_menu_window/collect_option_move_proc__5dMw_cFv.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_801FB7AC: -/* 801FB7AC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FB7B0 7C 08 02 A6 */ mflr r0 -/* 801FB7B4 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FB7B8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FB7BC 7C 7F 1B 78 */ mr r31, r3 -/* 801FB7C0 80 63 01 24 */ lwz r3, 0x124(r3) -/* 801FB7C4 88 03 03 EC */ lbz r0, 0x3ec(r3) -/* 801FB7C8 28 00 00 02 */ cmplwi r0, 2 -/* 801FB7CC 40 82 00 08 */ bne lbl_801FB7D4 -/* 801FB7D0 4B FE 7C 39 */ bl _move__14dMenu_Option_cFv -lbl_801FB7D4: -/* 801FB7D4 80 7F 01 24 */ lwz r3, 0x124(r31) -/* 801FB7D8 88 03 03 EC */ lbz r0, 0x3ec(r3) -/* 801FB7DC 28 00 00 03 */ cmplwi r0, 3 -/* 801FB7E0 40 82 00 0C */ bne lbl_801FB7EC -/* 801FB7E4 38 00 00 12 */ li r0, 0x12 -/* 801FB7E8 98 1F 01 46 */ stb r0, 0x146(r31) -lbl_801FB7EC: -/* 801FB7EC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FB7F0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FB7F4 7C 08 03 A6 */ mtlr r0 -/* 801FB7F8 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FB7FC 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/collect_option_open_init__5dMw_cFUc.s b/asm/d/menu/d_menu_window/collect_option_open_init__5dMw_cFUc.s deleted file mode 100644 index 7935dded96..0000000000 --- a/asm/d/menu/d_menu_window/collect_option_open_init__5dMw_cFUc.s +++ /dev/null @@ -1,22 +0,0 @@ -lbl_801FA608: -/* 801FA608 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FA60C 7C 08 02 A6 */ mflr r0 -/* 801FA610 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FA614 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FA618 7C 7F 1B 78 */ mr r31, r3 -/* 801FA61C 38 A0 00 0A */ li r5, 0xa -/* 801FA620 98 A3 01 44 */ stb r5, 0x144(r3) -/* 801FA624 3C 80 80 43 */ lis r4, g_meter2_info@ha /* 0x80430188@ha */ -/* 801FA628 38 84 01 88 */ addi r4, r4, g_meter2_info@l /* 0x80430188@l */ -/* 801FA62C 88 04 00 B9 */ lbz r0, 0xb9(r4) -/* 801FA630 98 04 00 BA */ stb r0, 0xba(r4) -/* 801FA634 98 A4 00 B9 */ stb r5, 0xb9(r4) -/* 801FA638 38 80 00 01 */ li r4, 1 -/* 801FA63C 48 00 1A 55 */ bl dMw_collect_delete__5dMw_cFb -/* 801FA640 7F E3 FB 78 */ mr r3, r31 -/* 801FA644 48 00 20 25 */ bl dMw_option_create__5dMw_cFv -/* 801FA648 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FA64C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FA650 7C 08 03 A6 */ mtlr r0 -/* 801FA654 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FA658 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/collect_option_open_proc__5dMw_cFv.s b/asm/d/menu/d_menu_window/collect_option_open_proc__5dMw_cFv.s deleted file mode 100644 index 940e416e78..0000000000 --- a/asm/d/menu/d_menu_window/collect_option_open_proc__5dMw_cFv.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_801FB73C: -/* 801FB73C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FB740 7C 08 02 A6 */ mflr r0 -/* 801FB744 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FB748 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FB74C 7C 7F 1B 78 */ mr r31, r3 -/* 801FB750 80 63 01 24 */ lwz r3, 0x124(r3) -/* 801FB754 88 03 03 EC */ lbz r0, 0x3ec(r3) -/* 801FB758 28 00 00 01 */ cmplwi r0, 1 -/* 801FB75C 40 82 00 14 */ bne lbl_801FB770 -/* 801FB760 4B FE 84 39 */ bl _open__14dMenu_Option_cFv -/* 801FB764 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801FB768 41 82 00 08 */ beq lbl_801FB770 -/* 801FB76C 48 00 17 0D */ bl dMw_fade_in__5dMw_cFv -lbl_801FB770: -/* 801FB770 80 7F 01 24 */ lwz r3, 0x124(r31) -/* 801FB774 88 03 03 EC */ lbz r0, 0x3ec(r3) -/* 801FB778 28 00 00 02 */ cmplwi r0, 2 -/* 801FB77C 40 82 00 1C */ bne lbl_801FB798 -/* 801FB780 80 6D 86 48 */ lwz r3, mFader__13mDoGph_gInf_c(r13) -/* 801FB784 80 03 00 04 */ lwz r0, 4(r3) -/* 801FB788 2C 00 00 01 */ cmpwi r0, 1 -/* 801FB78C 40 82 00 0C */ bne lbl_801FB798 -/* 801FB790 38 00 00 11 */ li r0, 0x11 -/* 801FB794 98 1F 01 46 */ stb r0, 0x146(r31) -lbl_801FB798: -/* 801FB798 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FB79C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FB7A0 7C 08 03 A6 */ mtlr r0 -/* 801FB7A4 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FB7A8 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/collect_save_close_init__5dMw_cFUc.s b/asm/d/menu/d_menu_window/collect_save_close_init__5dMw_cFUc.s deleted file mode 100644 index 23845d7b6b..0000000000 --- a/asm/d/menu/d_menu_window/collect_save_close_init__5dMw_cFUc.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_801FA5E8: -/* 801FA5E8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FA5EC 7C 08 02 A6 */ mflr r0 -/* 801FA5F0 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FA5F4 48 00 28 15 */ bl dMw_fade_out__5dMw_cFv -/* 801FA5F8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FA5FC 7C 08 03 A6 */ mtlr r0 -/* 801FA600 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FA604 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/collect_save_close_proc__5dMw_cFv.s b/asm/d/menu/d_menu_window/collect_save_close_proc__5dMw_cFv.s deleted file mode 100644 index 60d9036e9b..0000000000 --- a/asm/d/menu/d_menu_window/collect_save_close_proc__5dMw_cFv.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_801FB6D8: -/* 801FB6D8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FB6DC 7C 08 02 A6 */ mflr r0 -/* 801FB6E0 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FB6E4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FB6E8 7C 7F 1B 78 */ mr r31, r3 -/* 801FB6EC 80 6D 86 48 */ lwz r3, mFader__13mDoGph_gInf_c(r13) -/* 801FB6F0 80 03 00 04 */ lwz r0, 4(r3) -/* 801FB6F4 2C 00 00 00 */ cmpwi r0, 0 -/* 801FB6F8 40 82 00 30 */ bne lbl_801FB728 -/* 801FB6FC 80 7F 01 20 */ lwz r3, 0x120(r31) -/* 801FB700 4B FF 59 49 */ bl _move__12dMenu_save_cFv -/* 801FB704 80 7F 01 20 */ lwz r3, 0x120(r31) -/* 801FB708 88 03 01 BA */ lbz r0, 0x1ba(r3) -/* 801FB70C 28 00 00 03 */ cmplwi r0, 3 -/* 801FB710 40 82 00 10 */ bne lbl_801FB720 -/* 801FB714 38 00 00 05 */ li r0, 5 -/* 801FB718 98 1F 01 46 */ stb r0, 0x146(r31) -/* 801FB71C 48 00 00 0C */ b lbl_801FB728 -lbl_801FB720: -/* 801FB720 38 00 00 00 */ li r0, 0 -/* 801FB724 98 1F 01 46 */ stb r0, 0x146(r31) -lbl_801FB728: -/* 801FB728 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FB72C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FB730 7C 08 03 A6 */ mtlr r0 -/* 801FB734 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FB738 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/collect_save_move_proc__5dMw_cFv.s b/asm/d/menu/d_menu_window/collect_save_move_proc__5dMw_cFv.s deleted file mode 100644 index e0e4559d64..0000000000 --- a/asm/d/menu/d_menu_window/collect_save_move_proc__5dMw_cFv.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_801FB67C: -/* 801FB67C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FB680 7C 08 02 A6 */ mflr r0 -/* 801FB684 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FB688 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FB68C 7C 7F 1B 78 */ mr r31, r3 -/* 801FB690 80 63 01 20 */ lwz r3, 0x120(r3) -/* 801FB694 88 03 01 BA */ lbz r0, 0x1ba(r3) -/* 801FB698 28 00 00 02 */ cmplwi r0, 2 -/* 801FB69C 40 82 00 08 */ bne lbl_801FB6A4 -/* 801FB6A0 4B FF 59 A9 */ bl _move__12dMenu_save_cFv -lbl_801FB6A4: -/* 801FB6A4 80 7F 01 20 */ lwz r3, 0x120(r31) -/* 801FB6A8 88 03 01 BA */ lbz r0, 0x1ba(r3) -/* 801FB6AC 28 00 00 03 */ cmplwi r0, 3 -/* 801FB6B0 41 82 00 0C */ beq lbl_801FB6BC -/* 801FB6B4 28 00 00 04 */ cmplwi r0, 4 -/* 801FB6B8 40 82 00 0C */ bne lbl_801FB6C4 -lbl_801FB6BC: -/* 801FB6BC 38 00 00 0F */ li r0, 0xf -/* 801FB6C0 98 1F 01 46 */ stb r0, 0x146(r31) -lbl_801FB6C4: -/* 801FB6C4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FB6C8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FB6CC 7C 08 03 A6 */ mtlr r0 -/* 801FB6D0 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FB6D4 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/collect_save_open_init__5dMw_cFUc.s b/asm/d/menu/d_menu_window/collect_save_open_init__5dMw_cFUc.s deleted file mode 100644 index 83dd2110d8..0000000000 --- a/asm/d/menu/d_menu_window/collect_save_open_init__5dMw_cFUc.s +++ /dev/null @@ -1,22 +0,0 @@ -lbl_801FA590: -/* 801FA590 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FA594 7C 08 02 A6 */ mflr r0 -/* 801FA598 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FA59C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FA5A0 7C 7F 1B 78 */ mr r31, r3 -/* 801FA5A4 38 A0 00 0A */ li r5, 0xa -/* 801FA5A8 98 A3 01 44 */ stb r5, 0x144(r3) -/* 801FA5AC 3C 80 80 43 */ lis r4, g_meter2_info@ha /* 0x80430188@ha */ -/* 801FA5B0 38 84 01 88 */ addi r4, r4, g_meter2_info@l /* 0x80430188@l */ -/* 801FA5B4 88 04 00 B9 */ lbz r0, 0xb9(r4) -/* 801FA5B8 98 04 00 BA */ stb r0, 0xba(r4) -/* 801FA5BC 98 A4 00 B9 */ stb r5, 0xb9(r4) -/* 801FA5C0 38 80 00 01 */ li r4, 1 -/* 801FA5C4 48 00 1A CD */ bl dMw_collect_delete__5dMw_cFb -/* 801FA5C8 7F E3 FB 78 */ mr r3, r31 -/* 801FA5CC 48 00 1F 55 */ bl dMw_save_create__5dMw_cFv -/* 801FA5D0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FA5D4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FA5D8 7C 08 03 A6 */ mtlr r0 -/* 801FA5DC 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FA5E0 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/collect_save_open_proc__5dMw_cFv.s b/asm/d/menu/d_menu_window/collect_save_open_proc__5dMw_cFv.s deleted file mode 100644 index 878eea0079..0000000000 --- a/asm/d/menu/d_menu_window/collect_save_open_proc__5dMw_cFv.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_801FB61C: -/* 801FB61C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FB620 7C 08 02 A6 */ mflr r0 -/* 801FB624 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FB628 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FB62C 7C 7F 1B 78 */ mr r31, r3 -/* 801FB630 80 63 01 20 */ lwz r3, 0x120(r3) -/* 801FB634 88 03 01 BA */ lbz r0, 0x1ba(r3) -/* 801FB638 28 00 00 01 */ cmplwi r0, 1 -/* 801FB63C 40 82 00 14 */ bne lbl_801FB650 -/* 801FB640 4B FF 53 6D */ bl _open__12dMenu_save_cFv -/* 801FB644 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801FB648 41 82 00 08 */ beq lbl_801FB650 -/* 801FB64C 48 00 18 2D */ bl dMw_fade_in__5dMw_cFv -lbl_801FB650: -/* 801FB650 80 7F 01 20 */ lwz r3, 0x120(r31) -/* 801FB654 88 03 01 BA */ lbz r0, 0x1ba(r3) -/* 801FB658 28 00 00 02 */ cmplwi r0, 2 -/* 801FB65C 40 82 00 0C */ bne lbl_801FB668 -/* 801FB660 38 00 00 0E */ li r0, 0xe -/* 801FB664 98 1F 01 46 */ stb r0, 0x146(r31) -lbl_801FB668: -/* 801FB668 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FB66C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FB670 7C 08 03 A6 */ mtlr r0 -/* 801FB674 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FB678 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/collect_skill_close_init__5dMw_cFUc.s b/asm/d/menu/d_menu_window/collect_skill_close_init__5dMw_cFUc.s deleted file mode 100644 index d24d141454..0000000000 --- a/asm/d/menu/d_menu_window/collect_skill_close_init__5dMw_cFUc.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_801FA850: -/* 801FA850 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FA854 7C 08 02 A6 */ mflr r0 -/* 801FA858 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FA85C 38 00 00 A5 */ li r0, 0xa5 -/* 801FA860 90 01 00 08 */ stw r0, 8(r1) -/* 801FA864 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 801FA868 38 81 00 08 */ addi r4, r1, 8 -/* 801FA86C 38 A0 00 00 */ li r5, 0 -/* 801FA870 38 C0 00 00 */ li r6, 0 -/* 801FA874 38 E0 00 00 */ li r7, 0 -/* 801FA878 C0 22 AA C4 */ lfs f1, lit_4386(r2) -/* 801FA87C FC 40 08 90 */ fmr f2, f1 -/* 801FA880 C0 62 AA C8 */ lfs f3, lit_4387(r2) -/* 801FA884 FC 80 18 90 */ fmr f4, f3 -/* 801FA888 39 00 00 00 */ li r8, 0 -/* 801FA88C 48 0B 10 F9 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801FA890 48 02 41 41 */ bl dMeter2Info_set2DVibration__Fv -/* 801FA894 48 00 25 75 */ bl dMw_fade_out__5dMw_cFv -/* 801FA898 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FA89C 7C 08 03 A6 */ mtlr r0 -/* 801FA8A0 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FA8A4 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/collect_skill_close_proc__5dMw_cFv.s b/asm/d/menu/d_menu_window/collect_skill_close_proc__5dMw_cFv.s deleted file mode 100644 index 96d2bfebd2..0000000000 --- a/asm/d/menu/d_menu_window/collect_skill_close_proc__5dMw_cFv.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_801FBB00: -/* 801FBB00 80 8D 86 48 */ lwz r4, mFader__13mDoGph_gInf_c(r13) -/* 801FBB04 80 04 00 04 */ lwz r0, 4(r4) -/* 801FBB08 2C 00 00 00 */ cmpwi r0, 0 -/* 801FBB0C 4C 82 00 20 */ bnelr -/* 801FBB10 38 00 00 05 */ li r0, 5 -/* 801FBB14 98 03 01 46 */ stb r0, 0x146(r3) -/* 801FBB18 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/collect_skill_move_proc__5dMw_cFv.s b/asm/d/menu/d_menu_window/collect_skill_move_proc__5dMw_cFv.s deleted file mode 100644 index ba67a9c74f..0000000000 --- a/asm/d/menu/d_menu_window/collect_skill_move_proc__5dMw_cFv.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_801FBAAC: -/* 801FBAAC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FBAB0 7C 08 02 A6 */ mflr r0 -/* 801FBAB4 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FBAB8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FBABC 7C 7F 1B 78 */ mr r31, r3 -/* 801FBAC0 80 63 01 30 */ lwz r3, 0x130(r3) -/* 801FBAC4 88 03 02 04 */ lbz r0, 0x204(r3) -/* 801FBAC8 28 00 00 02 */ cmplwi r0, 2 -/* 801FBACC 40 82 00 08 */ bne lbl_801FBAD4 -/* 801FBAD0 4B FF BC 49 */ bl _move__13dMenu_Skill_cFv -lbl_801FBAD4: -/* 801FBAD4 80 7F 01 30 */ lwz r3, 0x130(r31) -/* 801FBAD8 88 03 02 04 */ lbz r0, 0x204(r3) -/* 801FBADC 28 00 00 03 */ cmplwi r0, 3 -/* 801FBAE0 40 82 00 0C */ bne lbl_801FBAEC -/* 801FBAE4 38 00 00 1B */ li r0, 0x1b -/* 801FBAE8 98 1F 01 46 */ stb r0, 0x146(r31) -lbl_801FBAEC: -/* 801FBAEC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FBAF0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FBAF4 7C 08 03 A6 */ mtlr r0 -/* 801FBAF8 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FBAFC 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/collect_skill_open_init__5dMw_cFUc.s b/asm/d/menu/d_menu_window/collect_skill_open_init__5dMw_cFUc.s deleted file mode 100644 index 0822188e8c..0000000000 --- a/asm/d/menu/d_menu_window/collect_skill_open_init__5dMw_cFUc.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_801FA7F0: -/* 801FA7F0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FA7F4 7C 08 02 A6 */ mflr r0 -/* 801FA7F8 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FA7FC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FA800 7C 7F 1B 78 */ mr r31, r3 -/* 801FA804 38 A0 00 0A */ li r5, 0xa -/* 801FA808 98 A3 01 44 */ stb r5, 0x144(r3) -/* 801FA80C 3C 80 80 43 */ lis r4, g_meter2_info@ha /* 0x80430188@ha */ -/* 801FA810 38 84 01 88 */ addi r4, r4, g_meter2_info@l /* 0x80430188@l */ -/* 801FA814 88 04 00 B9 */ lbz r0, 0xb9(r4) -/* 801FA818 98 04 00 BA */ stb r0, 0xba(r4) -/* 801FA81C 98 A4 00 B9 */ stb r5, 0xb9(r4) -/* 801FA820 38 00 00 00 */ li r0, 0 -/* 801FA824 98 03 01 52 */ stb r0, 0x152(r3) -/* 801FA828 38 80 00 01 */ li r4, 1 -/* 801FA82C 48 00 18 65 */ bl dMw_collect_delete__5dMw_cFb -/* 801FA830 7F E3 FB 78 */ mr r3, r31 -/* 801FA834 48 00 22 19 */ bl dMw_skill_create__5dMw_cFv -/* 801FA838 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FA83C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FA840 7C 08 03 A6 */ mtlr r0 -/* 801FA844 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FA848 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/collect_skill_open_proc__5dMw_cFv.s b/asm/d/menu/d_menu_window/collect_skill_open_proc__5dMw_cFv.s deleted file mode 100644 index 80554af991..0000000000 --- a/asm/d/menu/d_menu_window/collect_skill_open_proc__5dMw_cFv.s +++ /dev/null @@ -1,39 +0,0 @@ -lbl_801FBA1C: -/* 801FBA1C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FBA20 7C 08 02 A6 */ mflr r0 -/* 801FBA24 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FBA28 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FBA2C 7C 7F 1B 78 */ mr r31, r3 -/* 801FBA30 80 63 01 30 */ lwz r3, 0x130(r3) -/* 801FBA34 88 03 02 04 */ lbz r0, 0x204(r3) -/* 801FBA38 28 00 00 01 */ cmplwi r0, 1 -/* 801FBA3C 40 82 00 30 */ bne lbl_801FBA6C -/* 801FBA40 4B FF C0 01 */ bl _open__13dMenu_Skill_cFv -/* 801FBA44 88 1F 01 52 */ lbz r0, 0x152(r31) -/* 801FBA48 28 00 00 00 */ cmplwi r0, 0 -/* 801FBA4C 40 82 00 20 */ bne lbl_801FBA6C -/* 801FBA50 80 7F 01 30 */ lwz r3, 0x130(r31) -/* 801FBA54 4B FF BE FD */ bl isSync__13dMenu_Skill_cFv -/* 801FBA58 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801FBA5C 41 82 00 10 */ beq lbl_801FBA6C -/* 801FBA60 48 00 14 19 */ bl dMw_fade_in__5dMw_cFv -/* 801FBA64 38 00 00 01 */ li r0, 1 -/* 801FBA68 98 1F 01 52 */ stb r0, 0x152(r31) -lbl_801FBA6C: -/* 801FBA6C 80 7F 01 30 */ lwz r3, 0x130(r31) -/* 801FBA70 88 03 02 04 */ lbz r0, 0x204(r3) -/* 801FBA74 28 00 00 02 */ cmplwi r0, 2 -/* 801FBA78 40 82 00 20 */ bne lbl_801FBA98 -/* 801FBA7C 88 1F 01 52 */ lbz r0, 0x152(r31) -/* 801FBA80 28 00 00 01 */ cmplwi r0, 1 -/* 801FBA84 40 82 00 14 */ bne lbl_801FBA98 -/* 801FBA88 38 00 00 1A */ li r0, 0x1a -/* 801FBA8C 98 1F 01 46 */ stb r0, 0x146(r31) -/* 801FBA90 38 00 00 00 */ li r0, 0 -/* 801FBA94 98 1F 01 52 */ stb r0, 0x152(r31) -lbl_801FBA98: -/* 801FBA98 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FBA9C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FBAA0 7C 08 03 A6 */ mtlr r0 -/* 801FBAA4 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FBAA8 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/dMw_Create__FP9msg_class.s b/asm/d/menu/d_menu_window/dMw_Create__FP9msg_class.s deleted file mode 100644 index 4a2c945e0a..0000000000 --- a/asm/d/menu/d_menu_window/dMw_Create__FP9msg_class.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_801FD8C0: -/* 801FD8C0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FD8C4 7C 08 02 A6 */ mflr r0 -/* 801FD8C8 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FD8CC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FD8D0 7C 7F 1B 78 */ mr r31, r3 -/* 801FD8D4 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801FD8D8 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801FD8DC 93 E3 00 24 */ stw r31, 0x24(r3) -/* 801FD8E0 38 00 FF FF */ li r0, -1 -/* 801FD8E4 3C 60 80 43 */ lis r3, g_mwHIO@ha /* 0x8042E86C@ha */ -/* 801FD8E8 38 63 E8 6C */ addi r3, r3, g_mwHIO@l /* 0x8042E86C@l */ -/* 801FD8EC 98 03 00 04 */ stb r0, 4(r3) -/* 801FD8F0 3C 60 80 43 */ lis r3, g_mwDHIO@ha /* 0x8042E9A8@ha */ -/* 801FD8F4 38 63 E9 A8 */ addi r3, r3, g_mwDHIO@l /* 0x8042E9A8@l */ -/* 801FD8F8 98 03 00 04 */ stb r0, 4(r3) -/* 801FD8FC 38 60 00 00 */ li r3, 0 -/* 801FD900 4B E3 08 89 */ bl dComIfGp_offHeapLockFlag__Fi -/* 801FD904 7F E3 FB 78 */ mr r3, r31 -/* 801FD908 4B E2 20 AD */ bl fopMsgM_setStageLayer__FPv -/* 801FD90C 7F E3 FB 78 */ mr r3, r31 -/* 801FD910 4B FF F8 31 */ bl _create__5dMw_cFv -/* 801FD914 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FD918 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FD91C 7C 08 03 A6 */ mtlr r0 -/* 801FD920 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FD924 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/dMw_Delete__FP5dMw_c.s b/asm/d/menu/d_menu_window/dMw_Delete__FP5dMw_c.s deleted file mode 100644 index 34cee744b3..0000000000 --- a/asm/d/menu/d_menu_window/dMw_Delete__FP5dMw_c.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_801FD888: -/* 801FD888 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FD88C 7C 08 02 A6 */ mflr r0 -/* 801FD890 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FD894 4B FF FD E9 */ bl _delete__5dMw_cFv -/* 801FD898 2C 03 00 00 */ cmpwi r3, 0 -/* 801FD89C 41 82 00 14 */ beq lbl_801FD8B0 -/* 801FD8A0 38 00 00 00 */ li r0, 0 -/* 801FD8A4 3C 80 80 43 */ lis r4, g_meter2_info@ha /* 0x80430188@ha */ -/* 801FD8A8 38 84 01 88 */ addi r4, r4, g_meter2_info@l /* 0x80430188@l */ -/* 801FD8AC 90 04 00 24 */ stw r0, 0x24(r4) -lbl_801FD8B0: -/* 801FD8B0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FD8B4 7C 08 03 A6 */ mtlr r0 -/* 801FD8B8 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FD8BC 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/dMw_Draw__FP5dMw_c.s b/asm/d/menu/d_menu_window/dMw_Draw__FP5dMw_c.s deleted file mode 100644 index 942444ad24..0000000000 --- a/asm/d/menu/d_menu_window/dMw_Draw__FP5dMw_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_801FD840: -/* 801FD840 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FD844 7C 08 02 A6 */ mflr r0 -/* 801FD848 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FD84C 4B FF FC 05 */ bl _draw__5dMw_cFv -/* 801FD850 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FD854 7C 08 03 A6 */ mtlr r0 -/* 801FD858 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FD85C 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/dMw_Execute__FP5dMw_c.s b/asm/d/menu/d_menu_window/dMw_Execute__FP5dMw_c.s deleted file mode 100644 index bfc717f460..0000000000 --- a/asm/d/menu/d_menu_window/dMw_Execute__FP5dMw_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_801FD860: -/* 801FD860 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FD864 7C 08 02 A6 */ mflr r0 -/* 801FD868 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FD86C 4B FF FA 6D */ bl _execute__5dMw_cFv -/* 801FD870 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FD874 7C 08 03 A6 */ mtlr r0 -/* 801FD878 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FD87C 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/dMw_capture_create__5dMw_cFv.s b/asm/d/menu/d_menu_window/dMw_capture_create__5dMw_cFv.s deleted file mode 100644 index 82aae8612b..0000000000 --- a/asm/d/menu/d_menu_window/dMw_capture_create__5dMw_cFv.s +++ /dev/null @@ -1,40 +0,0 @@ -lbl_801FBD80: -/* 801FBD80 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FBD84 7C 08 02 A6 */ mflr r0 -/* 801FBD88 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FBD8C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FBD90 7C 7F 1B 78 */ mr r31, r3 -/* 801FBD94 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801FBD98 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801FBD9C 88 03 5E B5 */ lbz r0, 0x5eb5(r3) -/* 801FBDA0 28 00 00 00 */ cmplwi r0, 0 -/* 801FBDA4 40 82 00 5C */ bne lbl_801FBE00 -/* 801FBDA8 80 1F 01 0C */ lwz r0, 0x10c(r31) -/* 801FBDAC 28 00 00 00 */ cmplwi r0, 0 -/* 801FBDB0 40 82 00 50 */ bne lbl_801FBE00 -/* 801FBDB4 38 60 00 08 */ li r3, 8 -/* 801FBDB8 48 0D 2E 95 */ bl __nw__FUl -/* 801FBDBC 28 03 00 00 */ cmplwi r3, 0 -/* 801FBDC0 41 82 00 30 */ beq lbl_801FBDF0 -/* 801FBDC4 3C 80 80 3A */ lis r4, __vt__12dDlst_base_c@ha /* 0x803A6F88@ha */ -/* 801FBDC8 38 04 6F 88 */ addi r0, r4, __vt__12dDlst_base_c@l /* 0x803A6F88@l */ -/* 801FBDCC 90 03 00 00 */ stw r0, 0(r3) -/* 801FBDD0 3C 80 80 3C */ lis r4, __vt__20dDlst_MENU_CAPTURE_c@ha /* 0x803BF0D4@ha */ -/* 801FBDD4 38 04 F0 D4 */ addi r0, r4, __vt__20dDlst_MENU_CAPTURE_c@l /* 0x803BF0D4@l */ -/* 801FBDD8 90 03 00 00 */ stw r0, 0(r3) -/* 801FBDDC 38 80 00 00 */ li r4, 0 -/* 801FBDE0 98 83 00 04 */ stb r4, 4(r3) -/* 801FBDE4 38 00 00 FF */ li r0, 0xff -/* 801FBDE8 98 03 00 05 */ stb r0, 5(r3) -/* 801FBDEC 98 83 00 06 */ stb r4, 6(r3) -lbl_801FBDF0: -/* 801FBDF0 90 7F 01 0C */ stw r3, 0x10c(r31) -/* 801FBDF4 38 00 00 01 */ li r0, 1 -/* 801FBDF8 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 801FBDFC 98 03 00 04 */ stb r0, 4(r3) -lbl_801FBE00: -/* 801FBE00 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FBE04 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FBE08 7C 08 03 A6 */ mtlr r0 -/* 801FBE0C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FBE10 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/dMw_capture_delete__5dMw_cFv.s b/asm/d/menu/d_menu_window/dMw_capture_delete__5dMw_cFv.s deleted file mode 100644 index dc937b3434..0000000000 --- a/asm/d/menu/d_menu_window/dMw_capture_delete__5dMw_cFv.s +++ /dev/null @@ -1,36 +0,0 @@ -lbl_801FBE14: -/* 801FBE14 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FBE18 7C 08 02 A6 */ mflr r0 -/* 801FBE1C 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FBE20 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FBE24 93 C1 00 08 */ stw r30, 8(r1) -/* 801FBE28 7C 7E 1B 78 */ mr r30, r3 -/* 801FBE2C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801FBE30 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801FBE34 88 1F 5E B5 */ lbz r0, 0x5eb5(r31) -/* 801FBE38 28 00 00 00 */ cmplwi r0, 0 -/* 801FBE3C 41 82 00 40 */ beq lbl_801FBE7C -/* 801FBE40 80 7E 01 0C */ lwz r3, 0x10c(r30) -/* 801FBE44 28 03 00 00 */ cmplwi r3, 0 -/* 801FBE48 41 82 00 24 */ beq lbl_801FBE6C -/* 801FBE4C 41 82 00 18 */ beq lbl_801FBE64 -/* 801FBE50 38 80 00 01 */ li r4, 1 -/* 801FBE54 81 83 00 00 */ lwz r12, 0(r3) -/* 801FBE58 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 801FBE5C 7D 89 03 A6 */ mtctr r12 -/* 801FBE60 4E 80 04 21 */ bctrl -lbl_801FBE64: -/* 801FBE64 38 00 00 00 */ li r0, 0 -/* 801FBE68 90 1E 01 0C */ stw r0, 0x10c(r30) -lbl_801FBE6C: -/* 801FBE6C 38 00 00 00 */ li r0, 0 -/* 801FBE70 98 1F 5E B5 */ stb r0, 0x5eb5(r31) -/* 801FBE74 38 00 00 02 */ li r0, 2 -/* 801FBE78 98 1E 01 51 */ stb r0, 0x151(r30) -lbl_801FBE7C: -/* 801FBE7C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FBE80 83 C1 00 08 */ lwz r30, 8(r1) -/* 801FBE84 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FBE88 7C 08 03 A6 */ mtlr r0 -/* 801FBE8C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FBE90 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/dMw_collect_create__5dMw_cFv.s b/asm/d/menu/d_menu_window/dMw_collect_create__5dMw_cFv.s deleted file mode 100644 index 0811f36964..0000000000 --- a/asm/d/menu/d_menu_window/dMw_collect_create__5dMw_cFv.s +++ /dev/null @@ -1,42 +0,0 @@ -lbl_801FBFF8: -/* 801FBFF8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FBFFC 7C 08 02 A6 */ mflr r0 -/* 801FC000 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FC004 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FC008 7C 7F 1B 78 */ mr r31, r3 -/* 801FC00C 48 00 10 89 */ bl markMemSize__5dMw_cFv -/* 801FC010 38 60 00 0C */ li r3, 0xc -/* 801FC014 48 0D 2C 39 */ bl __nw__FUl -/* 801FC018 7C 60 1B 79 */ or. r0, r3, r3 -/* 801FC01C 41 82 00 18 */ beq lbl_801FC034 -/* 801FC020 80 9F 01 00 */ lwz r4, 0x100(r31) -/* 801FC024 80 BF 01 04 */ lwz r5, 0x104(r31) -/* 801FC028 80 DF 01 08 */ lwz r6, 0x108(r31) -/* 801FC02C 4B FB B8 95 */ bl __ct__15dMenu_Collect_cFP10JKRExpHeapP9STControlP10CSTControl -/* 801FC030 7C 60 1B 78 */ mr r0, r3 -lbl_801FC034: -/* 801FC034 90 1F 01 14 */ stw r0, 0x114(r31) -/* 801FC038 80 7F 01 14 */ lwz r3, 0x114(r31) -/* 801FC03C 4B FB B9 D1 */ bl _create__15dMenu_Collect_cFv -/* 801FC040 3C 60 80 3E */ lis r3, m_cpadInfo__8mDoCPd_c@ha /* 0x803DD2E8@ha */ -/* 801FC044 38 63 D2 E8 */ addi r3, r3, m_cpadInfo__8mDoCPd_c@l /* 0x803DD2E8@l */ -/* 801FC048 88 03 00 39 */ lbz r0, 0x39(r3) -/* 801FC04C 28 00 00 00 */ cmplwi r0, 0 -/* 801FC050 41 82 00 14 */ beq lbl_801FC064 -/* 801FC054 7F E3 FB 78 */ mr r3, r31 -/* 801FC058 38 80 00 01 */ li r4, 1 -/* 801FC05C 48 00 0C 91 */ bl dMw_onButtonBit__5dMw_cFUc -/* 801FC060 48 00 00 1C */ b lbl_801FC07C -lbl_801FC064: -/* 801FC064 88 03 00 3B */ lbz r0, 0x3b(r3) -/* 801FC068 28 00 00 00 */ cmplwi r0, 0 -/* 801FC06C 41 82 00 10 */ beq lbl_801FC07C -/* 801FC070 7F E3 FB 78 */ mr r3, r31 -/* 801FC074 38 80 00 02 */ li r4, 2 -/* 801FC078 48 00 0C 75 */ bl dMw_onButtonBit__5dMw_cFUc -lbl_801FC07C: -/* 801FC07C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FC080 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FC084 7C 08 03 A6 */ mtlr r0 -/* 801FC088 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FC08C 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/dMw_collect_delete__5dMw_cFb.s b/asm/d/menu/d_menu_window/dMw_collect_delete__5dMw_cFb.s deleted file mode 100644 index 7f83c0c038..0000000000 --- a/asm/d/menu/d_menu_window/dMw_collect_delete__5dMw_cFb.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_801FC090: -/* 801FC090 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FC094 7C 08 02 A6 */ mflr r0 -/* 801FC098 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FC09C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FC0A0 7C 7F 1B 78 */ mr r31, r3 -/* 801FC0A4 80 63 01 14 */ lwz r3, 0x114(r3) -/* 801FC0A8 28 03 00 00 */ cmplwi r3, 0 -/* 801FC0AC 41 82 00 30 */ beq lbl_801FC0DC -/* 801FC0B0 4B FB B9 95 */ bl _delete__15dMenu_Collect_cFv -/* 801FC0B4 80 7F 01 14 */ lwz r3, 0x114(r31) -/* 801FC0B8 28 03 00 00 */ cmplwi r3, 0 -/* 801FC0BC 41 82 00 18 */ beq lbl_801FC0D4 -/* 801FC0C0 38 80 00 01 */ li r4, 1 -/* 801FC0C4 81 83 00 00 */ lwz r12, 0(r3) -/* 801FC0C8 81 8C 00 08 */ lwz r12, 8(r12) -/* 801FC0CC 7D 89 03 A6 */ mtctr r12 -/* 801FC0D0 4E 80 04 21 */ bctrl -lbl_801FC0D4: -/* 801FC0D4 38 00 00 00 */ li r0, 0 -/* 801FC0D8 90 1F 01 14 */ stw r0, 0x114(r31) -lbl_801FC0DC: -/* 801FC0DC 7F E3 FB 78 */ mr r3, r31 -/* 801FC0E0 48 00 0F F5 */ bl checkMemSize__5dMw_cFv -/* 801FC0E4 38 60 00 01 */ li r3, 1 -/* 801FC0E8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FC0EC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FC0F0 7C 08 03 A6 */ mtlr r0 -/* 801FC0F4 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FC0F8 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/dMw_dmap_create__5dMw_cFv.s b/asm/d/menu/d_menu_window/dMw_dmap_create__5dMw_cFv.s deleted file mode 100644 index aedbb5f499..0000000000 --- a/asm/d/menu/d_menu_window/dMw_dmap_create__5dMw_cFv.s +++ /dev/null @@ -1,79 +0,0 @@ -lbl_801FC350: -/* 801FC350 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FC354 7C 08 02 A6 */ mflr r0 -/* 801FC358 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FC35C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FC360 93 C1 00 08 */ stw r30, 8(r1) -/* 801FC364 7C 7E 1B 78 */ mr r30, r3 -/* 801FC368 48 00 0D 2D */ bl markMemSize__5dMw_cFv -/* 801FC36C 38 60 00 03 */ li r3, 3 -/* 801FC370 4B E3 1D 71 */ bl dComIfGp_setHeapLockFlag__FUc -/* 801FC374 80 1E 01 0C */ lwz r0, 0x10c(r30) -/* 801FC378 28 00 00 00 */ cmplwi r0, 0 -/* 801FC37C 40 82 00 44 */ bne lbl_801FC3C0 -/* 801FC380 38 60 00 08 */ li r3, 8 -/* 801FC384 48 0D 28 C9 */ bl __nw__FUl -/* 801FC388 28 03 00 00 */ cmplwi r3, 0 -/* 801FC38C 41 82 00 30 */ beq lbl_801FC3BC -/* 801FC390 3C 80 80 3A */ lis r4, __vt__12dDlst_base_c@ha /* 0x803A6F88@ha */ -/* 801FC394 38 04 6F 88 */ addi r0, r4, __vt__12dDlst_base_c@l /* 0x803A6F88@l */ -/* 801FC398 90 03 00 00 */ stw r0, 0(r3) -/* 801FC39C 3C 80 80 3C */ lis r4, __vt__20dDlst_MENU_CAPTURE_c@ha /* 0x803BF0D4@ha */ -/* 801FC3A0 38 04 F0 D4 */ addi r0, r4, __vt__20dDlst_MENU_CAPTURE_c@l /* 0x803BF0D4@l */ -/* 801FC3A4 90 03 00 00 */ stw r0, 0(r3) -/* 801FC3A8 38 80 00 00 */ li r4, 0 -/* 801FC3AC 98 83 00 04 */ stb r4, 4(r3) -/* 801FC3B0 38 00 00 FF */ li r0, 0xff -/* 801FC3B4 98 03 00 05 */ stb r0, 5(r3) -/* 801FC3B8 98 83 00 06 */ stb r4, 6(r3) -lbl_801FC3BC: -/* 801FC3BC 90 7E 01 0C */ stw r3, 0x10c(r30) -lbl_801FC3C0: -/* 801FC3C0 38 00 00 01 */ li r0, 1 -/* 801FC3C4 80 7E 01 0C */ lwz r3, 0x10c(r30) -/* 801FC3C8 98 03 00 04 */ stb r0, 4(r3) -/* 801FC3CC 3B E0 00 00 */ li r31, 0 -/* 801FC3D0 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801FC3D4 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801FC3D8 A0 03 00 AA */ lhz r0, 0xaa(r3) -/* 801FC3DC 28 00 02 00 */ cmplwi r0, 0x200 -/* 801FC3E0 40 82 00 0C */ bne lbl_801FC3EC -/* 801FC3E4 3B E0 00 03 */ li r31, 3 -/* 801FC3E8 48 00 00 30 */ b lbl_801FC418 -lbl_801FC3EC: -/* 801FC3EC 28 00 04 00 */ cmplwi r0, 0x400 -/* 801FC3F0 40 82 00 0C */ bne lbl_801FC3FC -/* 801FC3F4 3B E0 00 01 */ li r31, 1 -/* 801FC3F8 48 00 00 20 */ b lbl_801FC418 -lbl_801FC3FC: -/* 801FC3FC 28 00 01 00 */ cmplwi r0, 0x100 -/* 801FC400 40 82 00 0C */ bne lbl_801FC40C -/* 801FC404 3B E0 00 02 */ li r31, 2 -/* 801FC408 48 00 00 10 */ b lbl_801FC418 -lbl_801FC40C: -/* 801FC40C 28 00 00 80 */ cmplwi r0, 0x80 -/* 801FC410 40 82 00 08 */ bne lbl_801FC418 -/* 801FC414 3B E0 00 00 */ li r31, 0 -lbl_801FC418: -/* 801FC418 38 60 01 88 */ li r3, 0x188 -/* 801FC41C 48 0D 28 31 */ bl __nw__FUl -/* 801FC420 7C 60 1B 79 */ or. r0, r3, r3 -/* 801FC424 41 82 00 20 */ beq lbl_801FC444 -/* 801FC428 80 9E 01 00 */ lwz r4, 0x100(r30) -/* 801FC42C 80 BE 01 04 */ lwz r5, 0x104(r30) -/* 801FC430 80 DE 01 08 */ lwz r6, 0x108(r30) -/* 801FC434 88 FE 01 4C */ lbz r7, 0x14c(r30) -/* 801FC438 7F E8 FB 78 */ mr r8, r31 -/* 801FC43C 4B FB F0 5D */ bl __ct__12dMenu_Dmap_cFP10JKRExpHeapP9STControlP10CSTControlUcUc -/* 801FC440 7C 60 1B 78 */ mr r0, r3 -lbl_801FC444: -/* 801FC444 90 1E 01 18 */ stw r0, 0x118(r30) -/* 801FC448 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801FC44C 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801FC450 48 02 05 8D */ bl resetWarpStatus__13dMeter2Info_cFv -/* 801FC454 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FC458 83 C1 00 08 */ lwz r30, 8(r1) -/* 801FC45C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FC460 7C 08 03 A6 */ mtlr r0 -/* 801FC464 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FC468 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/dMw_dmap_delete__5dMw_cFb.s b/asm/d/menu/d_menu_window/dMw_dmap_delete__5dMw_cFb.s deleted file mode 100644 index 67287288e5..0000000000 --- a/asm/d/menu/d_menu_window/dMw_dmap_delete__5dMw_cFb.s +++ /dev/null @@ -1,52 +0,0 @@ -lbl_801FC46C: -/* 801FC46C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FC470 7C 08 02 A6 */ mflr r0 -/* 801FC474 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FC478 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FC47C 7C 7F 1B 78 */ mr r31, r3 -/* 801FC480 80 63 01 18 */ lwz r3, 0x118(r3) -/* 801FC484 28 03 00 00 */ cmplwi r3, 0 -/* 801FC488 41 82 00 4C */ beq lbl_801FC4D4 -/* 801FC48C 4B FC 2F 85 */ bl isSync__12dMenu_Dmap_cFv -/* 801FC490 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801FC494 40 82 00 0C */ bne lbl_801FC4A0 -/* 801FC498 38 60 00 00 */ li r3, 0 -/* 801FC49C 48 00 00 70 */ b lbl_801FC50C -lbl_801FC4A0: -/* 801FC4A0 80 7F 01 18 */ lwz r3, 0x118(r31) -/* 801FC4A4 88 03 01 7F */ lbz r0, 0x17f(r3) -/* 801FC4A8 98 1F 01 4C */ stb r0, 0x14c(r31) -/* 801FC4AC 80 7F 01 18 */ lwz r3, 0x118(r31) -/* 801FC4B0 28 03 00 00 */ cmplwi r3, 0 -/* 801FC4B4 41 82 00 18 */ beq lbl_801FC4CC -/* 801FC4B8 38 80 00 01 */ li r4, 1 -/* 801FC4BC 81 83 00 00 */ lwz r12, 0(r3) -/* 801FC4C0 81 8C 00 08 */ lwz r12, 8(r12) -/* 801FC4C4 7D 89 03 A6 */ mtctr r12 -/* 801FC4C8 4E 80 04 21 */ bctrl -lbl_801FC4CC: -/* 801FC4CC 38 00 00 00 */ li r0, 0 -/* 801FC4D0 90 1F 01 18 */ stw r0, 0x118(r31) -lbl_801FC4D4: -/* 801FC4D4 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 801FC4D8 28 03 00 00 */ cmplwi r3, 0 -/* 801FC4DC 41 82 00 24 */ beq lbl_801FC500 -/* 801FC4E0 41 82 00 18 */ beq lbl_801FC4F8 -/* 801FC4E4 38 80 00 01 */ li r4, 1 -/* 801FC4E8 81 83 00 00 */ lwz r12, 0(r3) -/* 801FC4EC 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 801FC4F0 7D 89 03 A6 */ mtctr r12 -/* 801FC4F4 4E 80 04 21 */ bctrl -lbl_801FC4F8: -/* 801FC4F8 38 00 00 00 */ li r0, 0 -/* 801FC4FC 90 1F 01 0C */ stw r0, 0x10c(r31) -lbl_801FC500: -/* 801FC500 7F E3 FB 78 */ mr r3, r31 -/* 801FC504 48 00 0B D1 */ bl checkMemSize__5dMw_cFv -/* 801FC508 38 60 00 01 */ li r3, 1 -lbl_801FC50C: -/* 801FC50C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FC510 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FC514 7C 08 03 A6 */ mtlr r0 -/* 801FC518 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FC51C 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/dMw_fishing_create__5dMw_cFv.s b/asm/d/menu/d_menu_window/dMw_fishing_create__5dMw_cFv.s deleted file mode 100644 index 6d11fec867..0000000000 --- a/asm/d/menu/d_menu_window/dMw_fishing_create__5dMw_cFv.s +++ /dev/null @@ -1,44 +0,0 @@ -lbl_801FC904: -/* 801FC904 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FC908 7C 08 02 A6 */ mflr r0 -/* 801FC90C 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FC910 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FC914 7C 7F 1B 78 */ mr r31, r3 -/* 801FC918 48 00 07 7D */ bl markMemSize__5dMw_cFv -/* 801FC91C 38 60 01 FC */ li r3, 0x1fc -/* 801FC920 48 0D 23 2D */ bl __nw__FUl -/* 801FC924 7C 60 1B 79 */ or. r0, r3, r3 -/* 801FC928 41 82 00 18 */ beq lbl_801FC940 -/* 801FC92C 80 9F 01 00 */ lwz r4, 0x100(r31) -/* 801FC930 80 BF 01 04 */ lwz r5, 0x104(r31) -/* 801FC934 80 DF 01 08 */ lwz r6, 0x108(r31) -/* 801FC938 4B FC 84 1D */ bl __ct__15dMenu_Fishing_cFP10JKRExpHeapP9STControlP10CSTControl -/* 801FC93C 7C 60 1B 78 */ mr r0, r3 -lbl_801FC940: -/* 801FC940 90 1F 01 2C */ stw r0, 0x12c(r31) -/* 801FC944 80 1F 01 0C */ lwz r0, 0x10c(r31) -/* 801FC948 28 00 00 00 */ cmplwi r0, 0 -/* 801FC94C 40 82 00 44 */ bne lbl_801FC990 -/* 801FC950 38 60 00 08 */ li r3, 8 -/* 801FC954 48 0D 22 F9 */ bl __nw__FUl -/* 801FC958 28 03 00 00 */ cmplwi r3, 0 -/* 801FC95C 41 82 00 30 */ beq lbl_801FC98C -/* 801FC960 3C 80 80 3A */ lis r4, __vt__12dDlst_base_c@ha /* 0x803A6F88@ha */ -/* 801FC964 38 04 6F 88 */ addi r0, r4, __vt__12dDlst_base_c@l /* 0x803A6F88@l */ -/* 801FC968 90 03 00 00 */ stw r0, 0(r3) -/* 801FC96C 3C 80 80 3C */ lis r4, __vt__20dDlst_MENU_CAPTURE_c@ha /* 0x803BF0D4@ha */ -/* 801FC970 38 04 F0 D4 */ addi r0, r4, __vt__20dDlst_MENU_CAPTURE_c@l /* 0x803BF0D4@l */ -/* 801FC974 90 03 00 00 */ stw r0, 0(r3) -/* 801FC978 38 80 00 00 */ li r4, 0 -/* 801FC97C 98 83 00 04 */ stb r4, 4(r3) -/* 801FC980 38 00 00 FF */ li r0, 0xff -/* 801FC984 98 03 00 05 */ stb r0, 5(r3) -/* 801FC988 98 83 00 06 */ stb r4, 6(r3) -lbl_801FC98C: -/* 801FC98C 90 7F 01 0C */ stw r3, 0x10c(r31) -lbl_801FC990: -/* 801FC990 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FC994 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FC998 7C 08 03 A6 */ mtlr r0 -/* 801FC99C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FC9A0 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/dMw_fishing_delete__5dMw_cFv.s b/asm/d/menu/d_menu_window/dMw_fishing_delete__5dMw_cFv.s deleted file mode 100644 index 01c64325bd..0000000000 --- a/asm/d/menu/d_menu_window/dMw_fishing_delete__5dMw_cFv.s +++ /dev/null @@ -1,49 +0,0 @@ -lbl_801FC9A4: -/* 801FC9A4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FC9A8 7C 08 02 A6 */ mflr r0 -/* 801FC9AC 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FC9B0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FC9B4 7C 7F 1B 78 */ mr r31, r3 -/* 801FC9B8 80 63 01 2C */ lwz r3, 0x12c(r3) -/* 801FC9BC 28 03 00 00 */ cmplwi r3, 0 -/* 801FC9C0 41 82 00 40 */ beq lbl_801FCA00 -/* 801FC9C4 4B FC 88 41 */ bl isSync__15dMenu_Fishing_cFv -/* 801FC9C8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801FC9CC 40 82 00 0C */ bne lbl_801FC9D8 -/* 801FC9D0 38 60 00 00 */ li r3, 0 -/* 801FC9D4 48 00 00 64 */ b lbl_801FCA38 -lbl_801FC9D8: -/* 801FC9D8 80 7F 01 2C */ lwz r3, 0x12c(r31) -/* 801FC9DC 28 03 00 00 */ cmplwi r3, 0 -/* 801FC9E0 41 82 00 18 */ beq lbl_801FC9F8 -/* 801FC9E4 38 80 00 01 */ li r4, 1 -/* 801FC9E8 81 83 00 00 */ lwz r12, 0(r3) -/* 801FC9EC 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 801FC9F0 7D 89 03 A6 */ mtctr r12 -/* 801FC9F4 4E 80 04 21 */ bctrl -lbl_801FC9F8: -/* 801FC9F8 38 00 00 00 */ li r0, 0 -/* 801FC9FC 90 1F 01 2C */ stw r0, 0x12c(r31) -lbl_801FCA00: -/* 801FCA00 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 801FCA04 28 03 00 00 */ cmplwi r3, 0 -/* 801FCA08 41 82 00 24 */ beq lbl_801FCA2C -/* 801FCA0C 41 82 00 18 */ beq lbl_801FCA24 -/* 801FCA10 38 80 00 01 */ li r4, 1 -/* 801FCA14 81 83 00 00 */ lwz r12, 0(r3) -/* 801FCA18 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 801FCA1C 7D 89 03 A6 */ mtctr r12 -/* 801FCA20 4E 80 04 21 */ bctrl -lbl_801FCA24: -/* 801FCA24 38 00 00 00 */ li r0, 0 -/* 801FCA28 90 1F 01 0C */ stw r0, 0x10c(r31) -lbl_801FCA2C: -/* 801FCA2C 7F E3 FB 78 */ mr r3, r31 -/* 801FCA30 48 00 06 A5 */ bl checkMemSize__5dMw_cFv -/* 801FCA34 38 60 00 01 */ li r3, 1 -lbl_801FCA38: -/* 801FCA38 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FCA3C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FCA40 7C 08 03 A6 */ mtlr r0 -/* 801FCA44 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FCA48 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/dMw_fmap_create__5dMw_cFv.s b/asm/d/menu/d_menu_window/dMw_fmap_create__5dMw_cFv.s deleted file mode 100644 index 561e8a6e93..0000000000 --- a/asm/d/menu/d_menu_window/dMw_fmap_create__5dMw_cFv.s +++ /dev/null @@ -1,99 +0,0 @@ -lbl_801FC0FC: -/* 801FC0FC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FC100 7C 08 02 A6 */ mflr r0 -/* 801FC104 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FC108 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FC10C 93 C1 00 08 */ stw r30, 8(r1) -/* 801FC110 7C 7E 1B 78 */ mr r30, r3 -/* 801FC114 48 00 0F 81 */ bl markMemSize__5dMw_cFv -/* 801FC118 38 60 00 02 */ li r3, 2 -/* 801FC11C 4B E3 1F C5 */ bl dComIfGp_setHeapLockFlag__FUc -/* 801FC120 3B E0 00 00 */ li r31, 0 -/* 801FC124 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801FC128 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801FC12C A0 83 00 AA */ lhz r4, 0xaa(r3) -/* 801FC130 28 04 04 00 */ cmplwi r4, 0x400 -/* 801FC134 41 82 00 40 */ beq lbl_801FC174 -/* 801FC138 88 03 00 BF */ lbz r0, 0xbf(r3) -/* 801FC13C 28 00 00 03 */ cmplwi r0, 3 -/* 801FC140 41 82 00 34 */ beq lbl_801FC174 -/* 801FC144 28 00 00 04 */ cmplwi r0, 4 -/* 801FC148 41 82 00 2C */ beq lbl_801FC174 -/* 801FC14C 28 00 00 05 */ cmplwi r0, 5 -/* 801FC150 41 82 00 24 */ beq lbl_801FC174 -/* 801FC154 28 00 00 07 */ cmplwi r0, 7 -/* 801FC158 41 82 00 1C */ beq lbl_801FC174 -/* 801FC15C 28 00 00 08 */ cmplwi r0, 8 -/* 801FC160 41 82 00 14 */ beq lbl_801FC174 -/* 801FC164 28 00 00 09 */ cmplwi r0, 9 -/* 801FC168 41 82 00 0C */ beq lbl_801FC174 -/* 801FC16C 28 00 00 06 */ cmplwi r0, 6 -/* 801FC170 40 82 00 0C */ bne lbl_801FC17C -lbl_801FC174: -/* 801FC174 3B E0 00 01 */ li r31, 1 -/* 801FC178 48 00 00 30 */ b lbl_801FC1A8 -lbl_801FC17C: -/* 801FC17C 28 04 02 00 */ cmplwi r4, 0x200 -/* 801FC180 40 82 00 0C */ bne lbl_801FC18C -/* 801FC184 3B E0 00 03 */ li r31, 3 -/* 801FC188 48 00 00 20 */ b lbl_801FC1A8 -lbl_801FC18C: -/* 801FC18C 28 04 01 00 */ cmplwi r4, 0x100 -/* 801FC190 40 82 00 0C */ bne lbl_801FC19C -/* 801FC194 3B E0 00 02 */ li r31, 2 -/* 801FC198 48 00 00 10 */ b lbl_801FC1A8 -lbl_801FC19C: -/* 801FC19C 28 04 00 80 */ cmplwi r4, 0x80 -/* 801FC1A0 40 82 00 08 */ bne lbl_801FC1A8 -/* 801FC1A4 3B E0 00 03 */ li r31, 3 -lbl_801FC1A8: -/* 801FC1A8 38 60 03 14 */ li r3, 0x314 -/* 801FC1AC 48 0D 2A A1 */ bl __nw__FUl -/* 801FC1B0 7C 60 1B 79 */ or. r0, r3, r3 -/* 801FC1B4 41 82 00 30 */ beq lbl_801FC1E4 -/* 801FC1B8 80 9E 01 00 */ lwz r4, 0x100(r30) -/* 801FC1BC 80 BE 01 04 */ lwz r5, 0x104(r30) -/* 801FC1C0 80 DE 01 08 */ lwz r6, 0x108(r30) -/* 801FC1C4 88 FE 01 4E */ lbz r7, 0x14e(r30) -/* 801FC1C8 89 1E 01 4F */ lbz r8, 0x14f(r30) -/* 801FC1CC 89 3E 01 50 */ lbz r9, 0x150(r30) -/* 801FC1D0 C0 3E 01 3C */ lfs f1, 0x13c(r30) -/* 801FC1D4 C0 5E 01 40 */ lfs f2, 0x140(r30) -/* 801FC1D8 7F EA FB 78 */ mr r10, r31 -/* 801FC1DC 4B FC A5 09 */ bl __ct__12dMenu_Fmap_cFP10JKRExpHeapP9STControlP10CSTControlUcUcUcffUc -/* 801FC1E0 7C 60 1B 78 */ mr r0, r3 -lbl_801FC1E4: -/* 801FC1E4 90 1E 01 1C */ stw r0, 0x11c(r30) -/* 801FC1E8 80 1E 01 0C */ lwz r0, 0x10c(r30) -/* 801FC1EC 28 00 00 00 */ cmplwi r0, 0 -/* 801FC1F0 40 82 00 44 */ bne lbl_801FC234 -/* 801FC1F4 38 60 00 08 */ li r3, 8 -/* 801FC1F8 48 0D 2A 55 */ bl __nw__FUl -/* 801FC1FC 28 03 00 00 */ cmplwi r3, 0 -/* 801FC200 41 82 00 30 */ beq lbl_801FC230 -/* 801FC204 3C 80 80 3A */ lis r4, __vt__12dDlst_base_c@ha /* 0x803A6F88@ha */ -/* 801FC208 38 04 6F 88 */ addi r0, r4, __vt__12dDlst_base_c@l /* 0x803A6F88@l */ -/* 801FC20C 90 03 00 00 */ stw r0, 0(r3) -/* 801FC210 3C 80 80 3C */ lis r4, __vt__20dDlst_MENU_CAPTURE_c@ha /* 0x803BF0D4@ha */ -/* 801FC214 38 04 F0 D4 */ addi r0, r4, __vt__20dDlst_MENU_CAPTURE_c@l /* 0x803BF0D4@l */ -/* 801FC218 90 03 00 00 */ stw r0, 0(r3) -/* 801FC21C 38 80 00 00 */ li r4, 0 -/* 801FC220 98 83 00 04 */ stb r4, 4(r3) -/* 801FC224 38 00 00 FF */ li r0, 0xff -/* 801FC228 98 03 00 05 */ stb r0, 5(r3) -/* 801FC22C 98 83 00 06 */ stb r4, 6(r3) -lbl_801FC230: -/* 801FC230 90 7E 01 0C */ stw r3, 0x10c(r30) -lbl_801FC234: -/* 801FC234 38 00 00 01 */ li r0, 1 -/* 801FC238 80 7E 01 0C */ lwz r3, 0x10c(r30) -/* 801FC23C 98 03 00 04 */ stb r0, 4(r3) -/* 801FC240 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801FC244 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801FC248 48 02 07 95 */ bl resetWarpStatus__13dMeter2Info_cFv -/* 801FC24C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FC250 83 C1 00 08 */ lwz r30, 8(r1) -/* 801FC254 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FC258 7C 08 03 A6 */ mtlr r0 -/* 801FC25C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FC260 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/dMw_fmap_delete__5dMw_cFb.s b/asm/d/menu/d_menu_window/dMw_fmap_delete__5dMw_cFb.s deleted file mode 100644 index acafb1960d..0000000000 --- a/asm/d/menu/d_menu_window/dMw_fmap_delete__5dMw_cFb.s +++ /dev/null @@ -1,66 +0,0 @@ -lbl_801FC264: -/* 801FC264 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FC268 7C 08 02 A6 */ mflr r0 -/* 801FC26C 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FC270 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FC274 7C 7F 1B 78 */ mr r31, r3 -/* 801FC278 80 63 01 1C */ lwz r3, 0x11c(r3) -/* 801FC27C 28 03 00 00 */ cmplwi r3, 0 -/* 801FC280 41 82 00 84 */ beq lbl_801FC304 -/* 801FC284 4B FC B8 79 */ bl isSync__12dMenu_Fmap_cFv -/* 801FC288 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801FC28C 40 82 00 0C */ bne lbl_801FC298 -/* 801FC290 38 60 00 00 */ li r3, 0 -/* 801FC294 48 00 00 A8 */ b lbl_801FC33C -lbl_801FC298: -/* 801FC298 80 7F 01 1C */ lwz r3, 0x11c(r31) -/* 801FC29C 4B FC EF 41 */ bl getProcess__12dMenu_Fmap_cFv -/* 801FC2A0 98 7F 01 4E */ stb r3, 0x14e(r31) -/* 801FC2A4 80 7F 01 1C */ lwz r3, 0x11c(r31) -/* 801FC2A8 4B FC EF 59 */ bl getRegionCursor__12dMenu_Fmap_cFv -/* 801FC2AC 98 7F 01 4F */ stb r3, 0x14f(r31) -/* 801FC2B0 80 7F 01 1C */ lwz r3, 0x11c(r31) -/* 801FC2B4 4B FC EF 7D */ bl getStageCursor__12dMenu_Fmap_cFv -/* 801FC2B8 98 7F 01 50 */ stb r3, 0x150(r31) -/* 801FC2BC 80 7F 01 1C */ lwz r3, 0x11c(r31) -/* 801FC2C0 4B FC EF A1 */ bl getStageTransX__12dMenu_Fmap_cFv -/* 801FC2C4 D0 3F 01 3C */ stfs f1, 0x13c(r31) -/* 801FC2C8 80 7F 01 1C */ lwz r3, 0x11c(r31) -/* 801FC2CC 4B FC EF C5 */ bl getStageTransZ__12dMenu_Fmap_cFv -/* 801FC2D0 D0 3F 01 40 */ stfs f1, 0x140(r31) -/* 801FC2D4 80 7F 01 1C */ lwz r3, 0x11c(r31) -/* 801FC2D8 4B FC B1 CD */ bl _delete__12dMenu_Fmap_cFv -/* 801FC2DC 80 7F 01 1C */ lwz r3, 0x11c(r31) -/* 801FC2E0 28 03 00 00 */ cmplwi r3, 0 -/* 801FC2E4 41 82 00 18 */ beq lbl_801FC2FC -/* 801FC2E8 38 80 00 01 */ li r4, 1 -/* 801FC2EC 81 83 00 00 */ lwz r12, 0(r3) -/* 801FC2F0 81 8C 00 08 */ lwz r12, 8(r12) -/* 801FC2F4 7D 89 03 A6 */ mtctr r12 -/* 801FC2F8 4E 80 04 21 */ bctrl -lbl_801FC2FC: -/* 801FC2FC 38 00 00 00 */ li r0, 0 -/* 801FC300 90 1F 01 1C */ stw r0, 0x11c(r31) -lbl_801FC304: -/* 801FC304 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 801FC308 28 03 00 00 */ cmplwi r3, 0 -/* 801FC30C 41 82 00 24 */ beq lbl_801FC330 -/* 801FC310 41 82 00 18 */ beq lbl_801FC328 -/* 801FC314 38 80 00 01 */ li r4, 1 -/* 801FC318 81 83 00 00 */ lwz r12, 0(r3) -/* 801FC31C 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 801FC320 7D 89 03 A6 */ mtctr r12 -/* 801FC324 4E 80 04 21 */ bctrl -lbl_801FC328: -/* 801FC328 38 00 00 00 */ li r0, 0 -/* 801FC32C 90 1F 01 0C */ stw r0, 0x10c(r31) -lbl_801FC330: -/* 801FC330 7F E3 FB 78 */ mr r3, r31 -/* 801FC334 48 00 0D A1 */ bl checkMemSize__5dMw_cFv -/* 801FC338 38 60 00 01 */ li r3, 1 -lbl_801FC33C: -/* 801FC33C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FC340 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FC344 7C 08 03 A6 */ mtlr r0 -/* 801FC348 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FC34C 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/dMw_insect_create__5dMw_cFUc.s b/asm/d/menu/d_menu_window/dMw_insect_create__5dMw_cFUc.s deleted file mode 100644 index 61db62a3b2..0000000000 --- a/asm/d/menu/d_menu_window/dMw_insect_create__5dMw_cFUc.s +++ /dev/null @@ -1,48 +0,0 @@ -lbl_801FCB94: -/* 801FCB94 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FCB98 7C 08 02 A6 */ mflr r0 -/* 801FCB9C 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FCBA0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FCBA4 93 C1 00 08 */ stw r30, 8(r1) -/* 801FCBA8 7C 7E 1B 78 */ mr r30, r3 -/* 801FCBAC 7C 9F 23 78 */ mr r31, r4 -/* 801FCBB0 48 00 04 E5 */ bl markMemSize__5dMw_cFv -/* 801FCBB4 38 60 01 00 */ li r3, 0x100 -/* 801FCBB8 48 0D 20 95 */ bl __nw__FUl -/* 801FCBBC 7C 60 1B 79 */ or. r0, r3, r3 -/* 801FCBC0 41 82 00 1C */ beq lbl_801FCBDC -/* 801FCBC4 80 9E 01 00 */ lwz r4, 0x100(r30) -/* 801FCBC8 80 BE 01 04 */ lwz r5, 0x104(r30) -/* 801FCBCC 80 DE 01 08 */ lwz r6, 0x108(r30) -/* 801FCBD0 7F E7 FB 78 */ mr r7, r31 -/* 801FCBD4 4B FD B5 41 */ bl __ct__14dMenu_Insect_cFP10JKRExpHeapP9STControlP10CSTControlUc -/* 801FCBD8 7C 60 1B 78 */ mr r0, r3 -lbl_801FCBDC: -/* 801FCBDC 90 1E 01 34 */ stw r0, 0x134(r30) -/* 801FCBE0 80 1E 01 0C */ lwz r0, 0x10c(r30) -/* 801FCBE4 28 00 00 00 */ cmplwi r0, 0 -/* 801FCBE8 40 82 00 44 */ bne lbl_801FCC2C -/* 801FCBEC 38 60 00 08 */ li r3, 8 -/* 801FCBF0 48 0D 20 5D */ bl __nw__FUl -/* 801FCBF4 28 03 00 00 */ cmplwi r3, 0 -/* 801FCBF8 41 82 00 30 */ beq lbl_801FCC28 -/* 801FCBFC 3C 80 80 3A */ lis r4, __vt__12dDlst_base_c@ha /* 0x803A6F88@ha */ -/* 801FCC00 38 04 6F 88 */ addi r0, r4, __vt__12dDlst_base_c@l /* 0x803A6F88@l */ -/* 801FCC04 90 03 00 00 */ stw r0, 0(r3) -/* 801FCC08 3C 80 80 3C */ lis r4, __vt__20dDlst_MENU_CAPTURE_c@ha /* 0x803BF0D4@ha */ -/* 801FCC0C 38 04 F0 D4 */ addi r0, r4, __vt__20dDlst_MENU_CAPTURE_c@l /* 0x803BF0D4@l */ -/* 801FCC10 90 03 00 00 */ stw r0, 0(r3) -/* 801FCC14 38 80 00 00 */ li r4, 0 -/* 801FCC18 98 83 00 04 */ stb r4, 4(r3) -/* 801FCC1C 38 00 00 FF */ li r0, 0xff -/* 801FCC20 98 03 00 05 */ stb r0, 5(r3) -/* 801FCC24 98 83 00 06 */ stb r4, 6(r3) -lbl_801FCC28: -/* 801FCC28 90 7E 01 0C */ stw r3, 0x10c(r30) -lbl_801FCC2C: -/* 801FCC2C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FCC30 83 C1 00 08 */ lwz r30, 8(r1) -/* 801FCC34 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FCC38 7C 08 03 A6 */ mtlr r0 -/* 801FCC3C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FCC40 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/dMw_insect_delete__5dMw_cFv.s b/asm/d/menu/d_menu_window/dMw_insect_delete__5dMw_cFv.s deleted file mode 100644 index 7ff7d8f520..0000000000 --- a/asm/d/menu/d_menu_window/dMw_insect_delete__5dMw_cFv.s +++ /dev/null @@ -1,49 +0,0 @@ -lbl_801FCC44: -/* 801FCC44 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FCC48 7C 08 02 A6 */ mflr r0 -/* 801FCC4C 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FCC50 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FCC54 7C 7F 1B 78 */ mr r31, r3 -/* 801FCC58 80 63 01 34 */ lwz r3, 0x134(r3) -/* 801FCC5C 28 03 00 00 */ cmplwi r3, 0 -/* 801FCC60 41 82 00 40 */ beq lbl_801FCCA0 -/* 801FCC64 4B FD BC 89 */ bl isSync__14dMenu_Insect_cFv -/* 801FCC68 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801FCC6C 40 82 00 0C */ bne lbl_801FCC78 -/* 801FCC70 38 60 00 00 */ li r3, 0 -/* 801FCC74 48 00 00 64 */ b lbl_801FCCD8 -lbl_801FCC78: -/* 801FCC78 80 7F 01 34 */ lwz r3, 0x134(r31) -/* 801FCC7C 28 03 00 00 */ cmplwi r3, 0 -/* 801FCC80 41 82 00 18 */ beq lbl_801FCC98 -/* 801FCC84 38 80 00 01 */ li r4, 1 -/* 801FCC88 81 83 00 00 */ lwz r12, 0(r3) -/* 801FCC8C 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 801FCC90 7D 89 03 A6 */ mtctr r12 -/* 801FCC94 4E 80 04 21 */ bctrl -lbl_801FCC98: -/* 801FCC98 38 00 00 00 */ li r0, 0 -/* 801FCC9C 90 1F 01 34 */ stw r0, 0x134(r31) -lbl_801FCCA0: -/* 801FCCA0 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 801FCCA4 28 03 00 00 */ cmplwi r3, 0 -/* 801FCCA8 41 82 00 24 */ beq lbl_801FCCCC -/* 801FCCAC 41 82 00 18 */ beq lbl_801FCCC4 -/* 801FCCB0 38 80 00 01 */ li r4, 1 -/* 801FCCB4 81 83 00 00 */ lwz r12, 0(r3) -/* 801FCCB8 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 801FCCBC 7D 89 03 A6 */ mtctr r12 -/* 801FCCC0 4E 80 04 21 */ bctrl -lbl_801FCCC4: -/* 801FCCC4 38 00 00 00 */ li r0, 0 -/* 801FCCC8 90 1F 01 0C */ stw r0, 0x10c(r31) -lbl_801FCCCC: -/* 801FCCCC 7F E3 FB 78 */ mr r3, r31 -/* 801FCCD0 48 00 04 05 */ bl checkMemSize__5dMw_cFv -/* 801FCCD4 38 60 00 01 */ li r3, 1 -lbl_801FCCD8: -/* 801FCCD8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FCCDC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FCCE0 7C 08 03 A6 */ mtlr r0 -/* 801FCCE4 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FCCE8 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/dMw_isButtonBit__5dMw_cFUc.s b/asm/d/menu/d_menu_window/dMw_isButtonBit__5dMw_cFUc.s deleted file mode 100644 index 8d9e4d5a98..0000000000 --- a/asm/d/menu/d_menu_window/dMw_isButtonBit__5dMw_cFUc.s +++ /dev/null @@ -1,7 +0,0 @@ -lbl_801FCD0C: -/* 801FCD0C 88 63 01 45 */ lbz r3, 0x145(r3) -/* 801FCD10 54 80 06 3E */ clrlwi r0, r4, 0x18 -/* 801FCD14 7C 63 00 38 */ and r3, r3, r0 -/* 801FCD18 30 03 FF FF */ addic r0, r3, -1 -/* 801FCD1C 7C 60 19 10 */ subfe r3, r0, r3 -/* 801FCD20 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/dMw_isPush_S_Button__5dMw_cFv.s b/asm/d/menu/d_menu_window/dMw_isPush_S_Button__5dMw_cFv.s deleted file mode 100644 index dc7360bc1a..0000000000 --- a/asm/d/menu/d_menu_window/dMw_isPush_S_Button__5dMw_cFv.s +++ /dev/null @@ -1,49 +0,0 @@ -lbl_801FCD24: -/* 801FCD24 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FCD28 7C 08 02 A6 */ mflr r0 -/* 801FCD2C 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FCD30 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FCD34 80 6D 86 48 */ lwz r3, mFader__13mDoGph_gInf_c(r13) -/* 801FCD38 80 03 00 04 */ lwz r0, 4(r3) -/* 801FCD3C 2C 00 00 01 */ cmpwi r0, 1 -/* 801FCD40 40 82 00 80 */ bne lbl_801FCDC0 -/* 801FCD44 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801FCD48 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801FCD4C 80 7F 5D B4 */ lwz r3, 0x5db4(r31) -/* 801FCD50 81 83 06 28 */ lwz r12, 0x628(r3) -/* 801FCD54 81 8C 02 6C */ lwz r12, 0x26c(r12) -/* 801FCD58 7D 89 03 A6 */ mtctr r12 -/* 801FCD5C 4E 80 04 21 */ bctrl -/* 801FCD60 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801FCD64 40 82 00 5C */ bne lbl_801FCDC0 -/* 801FCD68 80 7F 5D B4 */ lwz r3, 0x5db4(r31) -/* 801FCD6C 81 83 06 28 */ lwz r12, 0x628(r3) -/* 801FCD70 81 8C 02 70 */ lwz r12, 0x270(r12) -/* 801FCD74 7D 89 03 A6 */ mtctr r12 -/* 801FCD78 4E 80 04 21 */ bctrl -/* 801FCD7C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801FCD80 40 82 00 40 */ bne lbl_801FCDC0 -/* 801FCD84 80 7F 5D B4 */ lwz r3, 0x5db4(r31) -/* 801FCD88 81 83 06 28 */ lwz r12, 0x628(r3) -/* 801FCD8C 81 8C 02 74 */ lwz r12, 0x274(r12) -/* 801FCD90 7D 89 03 A6 */ mtctr r12 -/* 801FCD94 4E 80 04 21 */ bctrl -/* 801FCD98 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801FCD9C 40 82 00 24 */ bne lbl_801FCDC0 -/* 801FCDA0 4B FF D2 D9 */ bl dMw_START_TRIGGER__Fv -/* 801FCDA4 2C 03 00 00 */ cmpwi r3, 0 -/* 801FCDA8 40 82 00 10 */ bne lbl_801FCDB8 -/* 801FCDAC 4B FF D2 A5 */ bl dMw_B_TRIGGER__Fv -/* 801FCDB0 2C 03 00 00 */ cmpwi r3, 0 -/* 801FCDB4 41 82 00 0C */ beq lbl_801FCDC0 -lbl_801FCDB8: -/* 801FCDB8 38 60 00 01 */ li r3, 1 -/* 801FCDBC 48 00 00 08 */ b lbl_801FCDC4 -lbl_801FCDC0: -/* 801FCDC0 38 60 00 00 */ li r3, 0 -lbl_801FCDC4: -/* 801FCDC4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FCDC8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FCDCC 7C 08 03 A6 */ mtlr r0 -/* 801FCDD0 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FCDD4 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/dMw_letter_create__5dMw_cFv.s b/asm/d/menu/d_menu_window/dMw_letter_create__5dMw_cFv.s deleted file mode 100644 index 3bcbcf9288..0000000000 --- a/asm/d/menu/d_menu_window/dMw_letter_create__5dMw_cFv.s +++ /dev/null @@ -1,44 +0,0 @@ -lbl_801FC7BC: -/* 801FC7BC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FC7C0 7C 08 02 A6 */ mflr r0 -/* 801FC7C4 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FC7C8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FC7CC 7C 7F 1B 78 */ mr r31, r3 -/* 801FC7D0 48 00 08 C5 */ bl markMemSize__5dMw_cFv -/* 801FC7D4 38 60 03 E8 */ li r3, 0x3e8 -/* 801FC7D8 48 0D 24 75 */ bl __nw__FUl -/* 801FC7DC 7C 60 1B 79 */ or. r0, r3, r3 -/* 801FC7E0 41 82 00 18 */ beq lbl_801FC7F8 -/* 801FC7E4 80 9F 01 00 */ lwz r4, 0x100(r31) -/* 801FC7E8 80 BF 01 04 */ lwz r5, 0x104(r31) -/* 801FC7EC 80 DF 01 08 */ lwz r6, 0x108(r31) -/* 801FC7F0 4B FE 05 D1 */ bl __ct__14dMenu_Letter_cFP10JKRExpHeapP9STControlP10CSTControl -/* 801FC7F4 7C 60 1B 78 */ mr r0, r3 -lbl_801FC7F8: -/* 801FC7F8 90 1F 01 28 */ stw r0, 0x128(r31) -/* 801FC7FC 80 1F 01 0C */ lwz r0, 0x10c(r31) -/* 801FC800 28 00 00 00 */ cmplwi r0, 0 -/* 801FC804 40 82 00 44 */ bne lbl_801FC848 -/* 801FC808 38 60 00 08 */ li r3, 8 -/* 801FC80C 48 0D 24 41 */ bl __nw__FUl -/* 801FC810 28 03 00 00 */ cmplwi r3, 0 -/* 801FC814 41 82 00 30 */ beq lbl_801FC844 -/* 801FC818 3C 80 80 3A */ lis r4, __vt__12dDlst_base_c@ha /* 0x803A6F88@ha */ -/* 801FC81C 38 04 6F 88 */ addi r0, r4, __vt__12dDlst_base_c@l /* 0x803A6F88@l */ -/* 801FC820 90 03 00 00 */ stw r0, 0(r3) -/* 801FC824 3C 80 80 3C */ lis r4, __vt__20dDlst_MENU_CAPTURE_c@ha /* 0x803BF0D4@ha */ -/* 801FC828 38 04 F0 D4 */ addi r0, r4, __vt__20dDlst_MENU_CAPTURE_c@l /* 0x803BF0D4@l */ -/* 801FC82C 90 03 00 00 */ stw r0, 0(r3) -/* 801FC830 38 80 00 00 */ li r4, 0 -/* 801FC834 98 83 00 04 */ stb r4, 4(r3) -/* 801FC838 38 00 00 FF */ li r0, 0xff -/* 801FC83C 98 03 00 05 */ stb r0, 5(r3) -/* 801FC840 98 83 00 06 */ stb r4, 6(r3) -lbl_801FC844: -/* 801FC844 90 7F 01 0C */ stw r3, 0x10c(r31) -lbl_801FC848: -/* 801FC848 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FC84C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FC850 7C 08 03 A6 */ mtlr r0 -/* 801FC854 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FC858 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/dMw_letter_delete__5dMw_cFv.s b/asm/d/menu/d_menu_window/dMw_letter_delete__5dMw_cFv.s deleted file mode 100644 index 47481c4b66..0000000000 --- a/asm/d/menu/d_menu_window/dMw_letter_delete__5dMw_cFv.s +++ /dev/null @@ -1,49 +0,0 @@ -lbl_801FC85C: -/* 801FC85C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FC860 7C 08 02 A6 */ mflr r0 -/* 801FC864 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FC868 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FC86C 7C 7F 1B 78 */ mr r31, r3 -/* 801FC870 80 63 01 28 */ lwz r3, 0x128(r3) -/* 801FC874 28 03 00 00 */ cmplwi r3, 0 -/* 801FC878 41 82 00 40 */ beq lbl_801FC8B8 -/* 801FC87C 4B FE 10 B9 */ bl isSync__14dMenu_Letter_cFv -/* 801FC880 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801FC884 40 82 00 0C */ bne lbl_801FC890 -/* 801FC888 38 60 00 00 */ li r3, 0 -/* 801FC88C 48 00 00 64 */ b lbl_801FC8F0 -lbl_801FC890: -/* 801FC890 80 7F 01 28 */ lwz r3, 0x128(r31) -/* 801FC894 28 03 00 00 */ cmplwi r3, 0 -/* 801FC898 41 82 00 18 */ beq lbl_801FC8B0 -/* 801FC89C 38 80 00 01 */ li r4, 1 -/* 801FC8A0 81 83 00 00 */ lwz r12, 0(r3) -/* 801FC8A4 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 801FC8A8 7D 89 03 A6 */ mtctr r12 -/* 801FC8AC 4E 80 04 21 */ bctrl -lbl_801FC8B0: -/* 801FC8B0 38 00 00 00 */ li r0, 0 -/* 801FC8B4 90 1F 01 28 */ stw r0, 0x128(r31) -lbl_801FC8B8: -/* 801FC8B8 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 801FC8BC 28 03 00 00 */ cmplwi r3, 0 -/* 801FC8C0 41 82 00 24 */ beq lbl_801FC8E4 -/* 801FC8C4 41 82 00 18 */ beq lbl_801FC8DC -/* 801FC8C8 38 80 00 01 */ li r4, 1 -/* 801FC8CC 81 83 00 00 */ lwz r12, 0(r3) -/* 801FC8D0 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 801FC8D4 7D 89 03 A6 */ mtctr r12 -/* 801FC8D8 4E 80 04 21 */ bctrl -lbl_801FC8DC: -/* 801FC8DC 38 00 00 00 */ li r0, 0 -/* 801FC8E0 90 1F 01 0C */ stw r0, 0x10c(r31) -lbl_801FC8E4: -/* 801FC8E4 7F E3 FB 78 */ mr r3, r31 -/* 801FC8E8 48 00 07 ED */ bl checkMemSize__5dMw_cFv -/* 801FC8EC 38 60 00 01 */ li r3, 1 -lbl_801FC8F0: -/* 801FC8F0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FC8F4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FC8F8 7C 08 03 A6 */ mtlr r0 -/* 801FC8FC 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FC900 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/dMw_offButtonBit__5dMw_cFUc.s b/asm/d/menu/d_menu_window/dMw_offButtonBit__5dMw_cFUc.s deleted file mode 100644 index 269d00b181..0000000000 --- a/asm/d/menu/d_menu_window/dMw_offButtonBit__5dMw_cFUc.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_801FCCFC: -/* 801FCCFC 88 03 01 45 */ lbz r0, 0x145(r3) -/* 801FCD00 7C 00 20 78 */ andc r0, r0, r4 -/* 801FCD04 98 03 01 45 */ stb r0, 0x145(r3) -/* 801FCD08 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/dMw_onButtonBit__5dMw_cFUc.s b/asm/d/menu/d_menu_window/dMw_onButtonBit__5dMw_cFUc.s deleted file mode 100644 index b763db50ac..0000000000 --- a/asm/d/menu/d_menu_window/dMw_onButtonBit__5dMw_cFUc.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_801FCCEC: -/* 801FCCEC 88 03 01 45 */ lbz r0, 0x145(r3) -/* 801FCCF0 7C 00 23 78 */ or r0, r0, r4 -/* 801FCCF4 98 03 01 45 */ stb r0, 0x145(r3) -/* 801FCCF8 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/dMw_option_create__5dMw_cFv.s b/asm/d/menu/d_menu_window/dMw_option_create__5dMw_cFv.s deleted file mode 100644 index 197c36a44d..0000000000 --- a/asm/d/menu/d_menu_window/dMw_option_create__5dMw_cFv.s +++ /dev/null @@ -1,45 +0,0 @@ -lbl_801FC668: -/* 801FC668 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FC66C 7C 08 02 A6 */ mflr r0 -/* 801FC670 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FC674 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FC678 7C 7F 1B 78 */ mr r31, r3 -/* 801FC67C 48 00 0A 19 */ bl markMemSize__5dMw_cFv -/* 801FC680 38 60 04 0C */ li r3, 0x40c -/* 801FC684 48 0D 25 C9 */ bl __nw__FUl -/* 801FC688 7C 60 1B 79 */ or. r0, r3, r3 -/* 801FC68C 41 82 00 1C */ beq lbl_801FC6A8 -/* 801FC690 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801FC694 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801FC698 80 84 5C B8 */ lwz r4, 0x5cb8(r4) -/* 801FC69C 80 BF 01 04 */ lwz r5, 0x104(r31) -/* 801FC6A0 4B FE 58 71 */ bl __ct__14dMenu_Option_cFP10JKRArchiveP9STControl -/* 801FC6A4 7C 60 1B 78 */ mr r0, r3 -lbl_801FC6A8: -/* 801FC6A8 90 1F 01 24 */ stw r0, 0x124(r31) -/* 801FC6AC 80 1F 01 0C */ lwz r0, 0x10c(r31) -/* 801FC6B0 28 00 00 00 */ cmplwi r0, 0 -/* 801FC6B4 40 82 00 44 */ bne lbl_801FC6F8 -/* 801FC6B8 38 60 00 08 */ li r3, 8 -/* 801FC6BC 48 0D 25 91 */ bl __nw__FUl -/* 801FC6C0 28 03 00 00 */ cmplwi r3, 0 -/* 801FC6C4 41 82 00 30 */ beq lbl_801FC6F4 -/* 801FC6C8 3C 80 80 3A */ lis r4, __vt__12dDlst_base_c@ha /* 0x803A6F88@ha */ -/* 801FC6CC 38 04 6F 88 */ addi r0, r4, __vt__12dDlst_base_c@l /* 0x803A6F88@l */ -/* 801FC6D0 90 03 00 00 */ stw r0, 0(r3) -/* 801FC6D4 3C 80 80 3C */ lis r4, __vt__20dDlst_MENU_CAPTURE_c@ha /* 0x803BF0D4@ha */ -/* 801FC6D8 38 04 F0 D4 */ addi r0, r4, __vt__20dDlst_MENU_CAPTURE_c@l /* 0x803BF0D4@l */ -/* 801FC6DC 90 03 00 00 */ stw r0, 0(r3) -/* 801FC6E0 38 80 00 00 */ li r4, 0 -/* 801FC6E4 98 83 00 04 */ stb r4, 4(r3) -/* 801FC6E8 38 00 00 FF */ li r0, 0xff -/* 801FC6EC 98 03 00 05 */ stb r0, 5(r3) -/* 801FC6F0 98 83 00 06 */ stb r4, 6(r3) -lbl_801FC6F4: -/* 801FC6F4 90 7F 01 0C */ stw r3, 0x10c(r31) -lbl_801FC6F8: -/* 801FC6F8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FC6FC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FC700 7C 08 03 A6 */ mtlr r0 -/* 801FC704 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FC708 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/dMw_option_delete__5dMw_cFv.s b/asm/d/menu/d_menu_window/dMw_option_delete__5dMw_cFv.s deleted file mode 100644 index 8907b6e584..0000000000 --- a/asm/d/menu/d_menu_window/dMw_option_delete__5dMw_cFv.s +++ /dev/null @@ -1,51 +0,0 @@ -lbl_801FC70C: -/* 801FC70C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FC710 7C 08 02 A6 */ mflr r0 -/* 801FC714 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FC718 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FC71C 7C 7F 1B 78 */ mr r31, r3 -/* 801FC720 80 63 01 24 */ lwz r3, 0x124(r3) -/* 801FC724 28 03 00 00 */ cmplwi r3, 0 -/* 801FC728 41 82 00 48 */ beq lbl_801FC770 -/* 801FC72C 4B FE 73 51 */ bl isSync__14dMenu_Option_cFv -/* 801FC730 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801FC734 40 82 00 0C */ bne lbl_801FC740 -/* 801FC738 38 60 00 00 */ li r3, 0 -/* 801FC73C 48 00 00 6C */ b lbl_801FC7A8 -lbl_801FC740: -/* 801FC740 80 7F 01 24 */ lwz r3, 0x124(r31) -/* 801FC744 4B FE 64 D9 */ bl _delete__14dMenu_Option_cFv -/* 801FC748 80 7F 01 24 */ lwz r3, 0x124(r31) -/* 801FC74C 28 03 00 00 */ cmplwi r3, 0 -/* 801FC750 41 82 00 18 */ beq lbl_801FC768 -/* 801FC754 38 80 00 01 */ li r4, 1 -/* 801FC758 81 83 00 00 */ lwz r12, 0(r3) -/* 801FC75C 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 801FC760 7D 89 03 A6 */ mtctr r12 -/* 801FC764 4E 80 04 21 */ bctrl -lbl_801FC768: -/* 801FC768 38 00 00 00 */ li r0, 0 -/* 801FC76C 90 1F 01 24 */ stw r0, 0x124(r31) -lbl_801FC770: -/* 801FC770 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 801FC774 28 03 00 00 */ cmplwi r3, 0 -/* 801FC778 41 82 00 24 */ beq lbl_801FC79C -/* 801FC77C 41 82 00 18 */ beq lbl_801FC794 -/* 801FC780 38 80 00 01 */ li r4, 1 -/* 801FC784 81 83 00 00 */ lwz r12, 0(r3) -/* 801FC788 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 801FC78C 7D 89 03 A6 */ mtctr r12 -/* 801FC790 4E 80 04 21 */ bctrl -lbl_801FC794: -/* 801FC794 38 00 00 00 */ li r0, 0 -/* 801FC798 90 1F 01 0C */ stw r0, 0x10c(r31) -lbl_801FC79C: -/* 801FC79C 7F E3 FB 78 */ mr r3, r31 -/* 801FC7A0 48 00 09 35 */ bl checkMemSize__5dMw_cFv -/* 801FC7A4 38 60 00 01 */ li r3, 1 -lbl_801FC7A8: -/* 801FC7A8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FC7AC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FC7B0 7C 08 03 A6 */ mtlr r0 -/* 801FC7B4 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FC7B8 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/dMw_ring_create__5dMw_cFUc.s b/asm/d/menu/d_menu_window/dMw_ring_create__5dMw_cFUc.s deleted file mode 100644 index 7216235fed..0000000000 --- a/asm/d/menu/d_menu_window/dMw_ring_create__5dMw_cFUc.s +++ /dev/null @@ -1,55 +0,0 @@ -lbl_801FBE94: -/* 801FBE94 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FBE98 7C 08 02 A6 */ mflr r0 -/* 801FBE9C 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FBEA0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FBEA4 93 C1 00 08 */ stw r30, 8(r1) -/* 801FBEA8 7C 7E 1B 78 */ mr r30, r3 -/* 801FBEAC 7C 9F 23 78 */ mr r31, r4 -/* 801FBEB0 48 00 11 E5 */ bl markMemSize__5dMw_cFv -/* 801FBEB4 38 60 00 01 */ li r3, 1 -/* 801FBEB8 4B E3 22 29 */ bl dComIfGp_setHeapLockFlag__FUc -/* 801FBEBC 38 60 06 D4 */ li r3, 0x6d4 -/* 801FBEC0 48 0D 2D 8D */ bl __nw__FUl -/* 801FBEC4 7C 60 1B 79 */ or. r0, r3, r3 -/* 801FBEC8 41 82 00 1C */ beq lbl_801FBEE4 -/* 801FBECC 80 9E 01 00 */ lwz r4, 0x100(r30) -/* 801FBED0 80 BE 01 04 */ lwz r5, 0x104(r30) -/* 801FBED4 80 DE 01 08 */ lwz r6, 0x108(r30) -/* 801FBED8 7F E7 FB 78 */ mr r7, r31 -/* 801FBEDC 4B FE D2 3D */ bl __ct__12dMenu_Ring_cFP10JKRExpHeapP9STControlP10CSTControlUc -/* 801FBEE0 7C 60 1B 78 */ mr r0, r3 -lbl_801FBEE4: -/* 801FBEE4 90 1E 01 10 */ stw r0, 0x110(r30) -/* 801FBEE8 80 7E 01 10 */ lwz r3, 0x110(r30) -/* 801FBEEC 4B FE EC 91 */ bl _create__12dMenu_Ring_cFv -/* 801FBEF0 80 1E 01 0C */ lwz r0, 0x10c(r30) -/* 801FBEF4 28 00 00 00 */ cmplwi r0, 0 -/* 801FBEF8 40 82 00 44 */ bne lbl_801FBF3C -/* 801FBEFC 38 60 00 08 */ li r3, 8 -/* 801FBF00 48 0D 2D 4D */ bl __nw__FUl -/* 801FBF04 28 03 00 00 */ cmplwi r3, 0 -/* 801FBF08 41 82 00 30 */ beq lbl_801FBF38 -/* 801FBF0C 3C 80 80 3A */ lis r4, __vt__12dDlst_base_c@ha /* 0x803A6F88@ha */ -/* 801FBF10 38 04 6F 88 */ addi r0, r4, __vt__12dDlst_base_c@l /* 0x803A6F88@l */ -/* 801FBF14 90 03 00 00 */ stw r0, 0(r3) -/* 801FBF18 3C 80 80 3C */ lis r4, __vt__20dDlst_MENU_CAPTURE_c@ha /* 0x803BF0D4@ha */ -/* 801FBF1C 38 04 F0 D4 */ addi r0, r4, __vt__20dDlst_MENU_CAPTURE_c@l /* 0x803BF0D4@l */ -/* 801FBF20 90 03 00 00 */ stw r0, 0(r3) -/* 801FBF24 38 80 00 00 */ li r4, 0 -/* 801FBF28 98 83 00 04 */ stb r4, 4(r3) -/* 801FBF2C 38 00 00 FF */ li r0, 0xff -/* 801FBF30 98 03 00 05 */ stb r0, 5(r3) -/* 801FBF34 98 83 00 06 */ stb r4, 6(r3) -lbl_801FBF38: -/* 801FBF38 90 7E 01 0C */ stw r3, 0x10c(r30) -lbl_801FBF3C: -/* 801FBF3C 38 00 00 01 */ li r0, 1 -/* 801FBF40 80 7E 01 0C */ lwz r3, 0x10c(r30) -/* 801FBF44 98 03 00 04 */ stb r0, 4(r3) -/* 801FBF48 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FBF4C 83 C1 00 08 */ lwz r30, 8(r1) -/* 801FBF50 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FBF54 7C 08 03 A6 */ mtlr r0 -/* 801FBF58 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FBF5C 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/dMw_ring_delete__5dMw_cFv.s b/asm/d/menu/d_menu_window/dMw_ring_delete__5dMw_cFv.s deleted file mode 100644 index 2e387b2ba5..0000000000 --- a/asm/d/menu/d_menu_window/dMw_ring_delete__5dMw_cFv.s +++ /dev/null @@ -1,43 +0,0 @@ -lbl_801FBF60: -/* 801FBF60 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FBF64 7C 08 02 A6 */ mflr r0 -/* 801FBF68 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FBF6C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FBF70 7C 7F 1B 78 */ mr r31, r3 -/* 801FBF74 80 63 01 10 */ lwz r3, 0x110(r3) -/* 801FBF78 28 03 00 00 */ cmplwi r3, 0 -/* 801FBF7C 41 82 00 30 */ beq lbl_801FBFAC -/* 801FBF80 4B FE EC 69 */ bl _delete__12dMenu_Ring_cFv -/* 801FBF84 80 7F 01 10 */ lwz r3, 0x110(r31) -/* 801FBF88 28 03 00 00 */ cmplwi r3, 0 -/* 801FBF8C 41 82 00 18 */ beq lbl_801FBFA4 -/* 801FBF90 38 80 00 01 */ li r4, 1 -/* 801FBF94 81 83 00 00 */ lwz r12, 0(r3) -/* 801FBF98 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 801FBF9C 7D 89 03 A6 */ mtctr r12 -/* 801FBFA0 4E 80 04 21 */ bctrl -lbl_801FBFA4: -/* 801FBFA4 38 00 00 00 */ li r0, 0 -/* 801FBFA8 90 1F 01 10 */ stw r0, 0x110(r31) -lbl_801FBFAC: -/* 801FBFAC 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 801FBFB0 28 03 00 00 */ cmplwi r3, 0 -/* 801FBFB4 41 82 00 24 */ beq lbl_801FBFD8 -/* 801FBFB8 41 82 00 18 */ beq lbl_801FBFD0 -/* 801FBFBC 38 80 00 01 */ li r4, 1 -/* 801FBFC0 81 83 00 00 */ lwz r12, 0(r3) -/* 801FBFC4 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 801FBFC8 7D 89 03 A6 */ mtctr r12 -/* 801FBFCC 4E 80 04 21 */ bctrl -lbl_801FBFD0: -/* 801FBFD0 38 00 00 00 */ li r0, 0 -/* 801FBFD4 90 1F 01 0C */ stw r0, 0x10c(r31) -lbl_801FBFD8: -/* 801FBFD8 7F E3 FB 78 */ mr r3, r31 -/* 801FBFDC 48 00 10 F9 */ bl checkMemSize__5dMw_cFv -/* 801FBFE0 38 60 00 01 */ li r3, 1 -/* 801FBFE4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FBFE8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FBFEC 7C 08 03 A6 */ mtlr r0 -/* 801FBFF0 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FBFF4 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/dMw_save_create__5dMw_cFv.s b/asm/d/menu/d_menu_window/dMw_save_create__5dMw_cFv.s deleted file mode 100644 index e2ed9eedd7..0000000000 --- a/asm/d/menu/d_menu_window/dMw_save_create__5dMw_cFv.s +++ /dev/null @@ -1,48 +0,0 @@ -lbl_801FC520: -/* 801FC520 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FC524 7C 08 02 A6 */ mflr r0 -/* 801FC528 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FC52C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FC530 7C 7F 1B 78 */ mr r31, r3 -/* 801FC534 48 00 0B 61 */ bl markMemSize__5dMw_cFv -/* 801FC538 38 60 21 A4 */ li r3, 0x21a4 -/* 801FC53C 48 0D 27 11 */ bl __nw__FUl -/* 801FC540 7C 60 1B 79 */ or. r0, r3, r3 -/* 801FC544 41 82 00 0C */ beq lbl_801FC550 -/* 801FC548 4B FF 31 59 */ bl __ct__12dMenu_save_cFv -/* 801FC54C 7C 60 1B 78 */ mr r0, r3 -lbl_801FC550: -/* 801FC550 90 1F 01 20 */ stw r0, 0x120(r31) -/* 801FC554 38 00 00 01 */ li r0, 1 -/* 801FC558 80 7F 01 20 */ lwz r3, 0x120(r31) -/* 801FC55C 98 03 01 BC */ stb r0, 0x1bc(r3) -/* 801FC560 80 7F 01 20 */ lwz r3, 0x120(r31) -/* 801FC564 4B FF 32 49 */ bl _create__12dMenu_save_cFv -/* 801FC568 80 7F 01 20 */ lwz r3, 0x120(r31) -/* 801FC56C 4B FF 43 CD */ bl initialize__12dMenu_save_cFv -/* 801FC570 80 1F 01 0C */ lwz r0, 0x10c(r31) -/* 801FC574 28 00 00 00 */ cmplwi r0, 0 -/* 801FC578 40 82 00 44 */ bne lbl_801FC5BC -/* 801FC57C 38 60 00 08 */ li r3, 8 -/* 801FC580 48 0D 26 CD */ bl __nw__FUl -/* 801FC584 28 03 00 00 */ cmplwi r3, 0 -/* 801FC588 41 82 00 30 */ beq lbl_801FC5B8 -/* 801FC58C 3C 80 80 3A */ lis r4, __vt__12dDlst_base_c@ha /* 0x803A6F88@ha */ -/* 801FC590 38 04 6F 88 */ addi r0, r4, __vt__12dDlst_base_c@l /* 0x803A6F88@l */ -/* 801FC594 90 03 00 00 */ stw r0, 0(r3) -/* 801FC598 3C 80 80 3C */ lis r4, __vt__20dDlst_MENU_CAPTURE_c@ha /* 0x803BF0D4@ha */ -/* 801FC59C 38 04 F0 D4 */ addi r0, r4, __vt__20dDlst_MENU_CAPTURE_c@l /* 0x803BF0D4@l */ -/* 801FC5A0 90 03 00 00 */ stw r0, 0(r3) -/* 801FC5A4 38 80 00 00 */ li r4, 0 -/* 801FC5A8 98 83 00 04 */ stb r4, 4(r3) -/* 801FC5AC 38 00 00 FF */ li r0, 0xff -/* 801FC5B0 98 03 00 05 */ stb r0, 5(r3) -/* 801FC5B4 98 83 00 06 */ stb r4, 6(r3) -lbl_801FC5B8: -/* 801FC5B8 90 7F 01 0C */ stw r3, 0x10c(r31) -lbl_801FC5BC: -/* 801FC5BC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FC5C0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FC5C4 7C 08 03 A6 */ mtlr r0 -/* 801FC5C8 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FC5CC 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/dMw_save_delete__5dMw_cFv.s b/asm/d/menu/d_menu_window/dMw_save_delete__5dMw_cFv.s deleted file mode 100644 index 48d2889a6a..0000000000 --- a/asm/d/menu/d_menu_window/dMw_save_delete__5dMw_cFv.s +++ /dev/null @@ -1,43 +0,0 @@ -lbl_801FC5D0: -/* 801FC5D0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FC5D4 7C 08 02 A6 */ mflr r0 -/* 801FC5D8 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FC5DC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FC5E0 7C 7F 1B 78 */ mr r31, r3 -/* 801FC5E4 80 63 01 20 */ lwz r3, 0x120(r3) -/* 801FC5E8 28 03 00 00 */ cmplwi r3, 0 -/* 801FC5EC 41 82 00 30 */ beq lbl_801FC61C -/* 801FC5F0 4B FF 45 39 */ bl _delete__12dMenu_save_cFv -/* 801FC5F4 80 7F 01 20 */ lwz r3, 0x120(r31) -/* 801FC5F8 28 03 00 00 */ cmplwi r3, 0 -/* 801FC5FC 41 82 00 18 */ beq lbl_801FC614 -/* 801FC600 38 80 00 01 */ li r4, 1 -/* 801FC604 81 83 00 00 */ lwz r12, 0(r3) -/* 801FC608 81 8C 00 08 */ lwz r12, 8(r12) -/* 801FC60C 7D 89 03 A6 */ mtctr r12 -/* 801FC610 4E 80 04 21 */ bctrl -lbl_801FC614: -/* 801FC614 38 00 00 00 */ li r0, 0 -/* 801FC618 90 1F 01 20 */ stw r0, 0x120(r31) -lbl_801FC61C: -/* 801FC61C 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 801FC620 28 03 00 00 */ cmplwi r3, 0 -/* 801FC624 41 82 00 24 */ beq lbl_801FC648 -/* 801FC628 41 82 00 18 */ beq lbl_801FC640 -/* 801FC62C 38 80 00 01 */ li r4, 1 -/* 801FC630 81 83 00 00 */ lwz r12, 0(r3) -/* 801FC634 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 801FC638 7D 89 03 A6 */ mtctr r12 -/* 801FC63C 4E 80 04 21 */ bctrl -lbl_801FC640: -/* 801FC640 38 00 00 00 */ li r0, 0 -/* 801FC644 90 1F 01 0C */ stw r0, 0x10c(r31) -lbl_801FC648: -/* 801FC648 7F E3 FB 78 */ mr r3, r31 -/* 801FC64C 48 00 0A 89 */ bl checkMemSize__5dMw_cFv -/* 801FC650 38 60 00 01 */ li r3, 1 -/* 801FC654 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FC658 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FC65C 7C 08 03 A6 */ mtlr r0 -/* 801FC660 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FC664 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/dMw_skill_create__5dMw_cFv.s b/asm/d/menu/d_menu_window/dMw_skill_create__5dMw_cFv.s deleted file mode 100644 index c36ad4e364..0000000000 --- a/asm/d/menu/d_menu_window/dMw_skill_create__5dMw_cFv.s +++ /dev/null @@ -1,44 +0,0 @@ -lbl_801FCA4C: -/* 801FCA4C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FCA50 7C 08 02 A6 */ mflr r0 -/* 801FCA54 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FCA58 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FCA5C 7C 7F 1B 78 */ mr r31, r3 -/* 801FCA60 48 00 06 35 */ bl markMemSize__5dMw_cFv -/* 801FCA64 38 60 02 0C */ li r3, 0x20c -/* 801FCA68 48 0D 21 E5 */ bl __nw__FUl -/* 801FCA6C 7C 60 1B 79 */ or. r0, r3, r3 -/* 801FCA70 41 82 00 18 */ beq lbl_801FCA88 -/* 801FCA74 80 9F 01 00 */ lwz r4, 0x100(r31) -/* 801FCA78 80 BF 01 04 */ lwz r5, 0x104(r31) -/* 801FCA7C 80 DF 01 08 */ lwz r6, 0x108(r31) -/* 801FCA80 4B FF A7 A5 */ bl __ct__13dMenu_Skill_cFP10JKRExpHeapP9STControlP10CSTControl -/* 801FCA84 7C 60 1B 78 */ mr r0, r3 -lbl_801FCA88: -/* 801FCA88 90 1F 01 30 */ stw r0, 0x130(r31) -/* 801FCA8C 80 1F 01 0C */ lwz r0, 0x10c(r31) -/* 801FCA90 28 00 00 00 */ cmplwi r0, 0 -/* 801FCA94 40 82 00 44 */ bne lbl_801FCAD8 -/* 801FCA98 38 60 00 08 */ li r3, 8 -/* 801FCA9C 48 0D 21 B1 */ bl __nw__FUl -/* 801FCAA0 28 03 00 00 */ cmplwi r3, 0 -/* 801FCAA4 41 82 00 30 */ beq lbl_801FCAD4 -/* 801FCAA8 3C 80 80 3A */ lis r4, __vt__12dDlst_base_c@ha /* 0x803A6F88@ha */ -/* 801FCAAC 38 04 6F 88 */ addi r0, r4, __vt__12dDlst_base_c@l /* 0x803A6F88@l */ -/* 801FCAB0 90 03 00 00 */ stw r0, 0(r3) -/* 801FCAB4 3C 80 80 3C */ lis r4, __vt__20dDlst_MENU_CAPTURE_c@ha /* 0x803BF0D4@ha */ -/* 801FCAB8 38 04 F0 D4 */ addi r0, r4, __vt__20dDlst_MENU_CAPTURE_c@l /* 0x803BF0D4@l */ -/* 801FCABC 90 03 00 00 */ stw r0, 0(r3) -/* 801FCAC0 38 80 00 00 */ li r4, 0 -/* 801FCAC4 98 83 00 04 */ stb r4, 4(r3) -/* 801FCAC8 38 00 00 FF */ li r0, 0xff -/* 801FCACC 98 03 00 05 */ stb r0, 5(r3) -/* 801FCAD0 98 83 00 06 */ stb r4, 6(r3) -lbl_801FCAD4: -/* 801FCAD4 90 7F 01 0C */ stw r3, 0x10c(r31) -lbl_801FCAD8: -/* 801FCAD8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FCADC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FCAE0 7C 08 03 A6 */ mtlr r0 -/* 801FCAE4 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FCAE8 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/dMw_skill_delete__5dMw_cFv.s b/asm/d/menu/d_menu_window/dMw_skill_delete__5dMw_cFv.s deleted file mode 100644 index f4f8eadf52..0000000000 --- a/asm/d/menu/d_menu_window/dMw_skill_delete__5dMw_cFv.s +++ /dev/null @@ -1,49 +0,0 @@ -lbl_801FCAEC: -/* 801FCAEC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FCAF0 7C 08 02 A6 */ mflr r0 -/* 801FCAF4 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FCAF8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FCAFC 7C 7F 1B 78 */ mr r31, r3 -/* 801FCB00 80 63 01 30 */ lwz r3, 0x130(r3) -/* 801FCB04 28 03 00 00 */ cmplwi r3, 0 -/* 801FCB08 41 82 00 40 */ beq lbl_801FCB48 -/* 801FCB0C 4B FF AE 45 */ bl isSync__13dMenu_Skill_cFv -/* 801FCB10 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801FCB14 40 82 00 0C */ bne lbl_801FCB20 -/* 801FCB18 38 60 00 00 */ li r3, 0 -/* 801FCB1C 48 00 00 64 */ b lbl_801FCB80 -lbl_801FCB20: -/* 801FCB20 80 7F 01 30 */ lwz r3, 0x130(r31) -/* 801FCB24 28 03 00 00 */ cmplwi r3, 0 -/* 801FCB28 41 82 00 18 */ beq lbl_801FCB40 -/* 801FCB2C 38 80 00 01 */ li r4, 1 -/* 801FCB30 81 83 00 00 */ lwz r12, 0(r3) -/* 801FCB34 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 801FCB38 7D 89 03 A6 */ mtctr r12 -/* 801FCB3C 4E 80 04 21 */ bctrl -lbl_801FCB40: -/* 801FCB40 38 00 00 00 */ li r0, 0 -/* 801FCB44 90 1F 01 30 */ stw r0, 0x130(r31) -lbl_801FCB48: -/* 801FCB48 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 801FCB4C 28 03 00 00 */ cmplwi r3, 0 -/* 801FCB50 41 82 00 24 */ beq lbl_801FCB74 -/* 801FCB54 41 82 00 18 */ beq lbl_801FCB6C -/* 801FCB58 38 80 00 01 */ li r4, 1 -/* 801FCB5C 81 83 00 00 */ lwz r12, 0(r3) -/* 801FCB60 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 801FCB64 7D 89 03 A6 */ mtctr r12 -/* 801FCB68 4E 80 04 21 */ bctrl -lbl_801FCB6C: -/* 801FCB6C 38 00 00 00 */ li r0, 0 -/* 801FCB70 90 1F 01 0C */ stw r0, 0x10c(r31) -lbl_801FCB74: -/* 801FCB74 7F E3 FB 78 */ mr r3, r31 -/* 801FCB78 48 00 05 5D */ bl checkMemSize__5dMw_cFv -/* 801FCB7C 38 60 00 01 */ li r3, 1 -lbl_801FCB80: -/* 801FCB80 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FCB84 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FCB88 7C 08 03 A6 */ mtlr r0 -/* 801FCB8C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FCB90 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/dmap_close_proc__5dMw_cFv.s b/asm/d/menu/d_menu_window/dmap_close_proc__5dMw_cFv.s deleted file mode 100644 index a86231b3bb..0000000000 --- a/asm/d/menu/d_menu_window/dmap_close_proc__5dMw_cFv.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_801FB5DC: -/* 801FB5DC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FB5E0 7C 08 02 A6 */ mflr r0 -/* 801FB5E4 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FB5E8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FB5EC 7C 7F 1B 78 */ mr r31, r3 -/* 801FB5F0 80 63 01 18 */ lwz r3, 0x118(r3) -/* 801FB5F4 4B FC 30 7D */ bl isClose__12dMenu_Dmap_cFv -/* 801FB5F8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801FB5FC 41 82 00 0C */ beq lbl_801FB608 -/* 801FB600 38 00 00 00 */ li r0, 0 -/* 801FB604 98 1F 01 46 */ stb r0, 0x146(r31) -lbl_801FB608: -/* 801FB608 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FB60C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FB610 7C 08 03 A6 */ mtlr r0 -/* 801FB614 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FB618 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/dmap_move_proc__5dMw_cFv.s b/asm/d/menu/d_menu_window/dmap_move_proc__5dMw_cFv.s deleted file mode 100644 index b01c86cadc..0000000000 --- a/asm/d/menu/d_menu_window/dmap_move_proc__5dMw_cFv.s +++ /dev/null @@ -1,127 +0,0 @@ -lbl_801FB404: -/* 801FB404 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801FB408 7C 08 02 A6 */ mflr r0 -/* 801FB40C 90 01 00 24 */ stw r0, 0x24(r1) -/* 801FB410 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 801FB414 7C 7F 1B 78 */ mr r31, r3 -/* 801FB418 80 63 01 18 */ lwz r3, 0x118(r3) -/* 801FB41C 4B FC 3F 19 */ bl getNextStatus__12dMenu_Dmap_cFv -/* 801FB420 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 801FB424 28 00 00 01 */ cmplwi r0, 1 -/* 801FB428 40 82 00 A0 */ bne lbl_801FB4C8 -/* 801FB42C 48 01 22 25 */ bl isEnableDispMapAndMapDispSizeTypeNo__11dMeterMap_cFv -/* 801FB430 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801FB434 41 82 00 20 */ beq lbl_801FB454 -/* 801FB438 38 00 00 01 */ li r0, 1 -/* 801FB43C 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801FB440 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801FB444 98 03 00 BF */ stb r0, 0xbf(r3) -/* 801FB448 80 63 00 20 */ lwz r3, 0x20(r3) -/* 801FB44C 48 01 24 29 */ bl setDispPosInsideFlg_SE_On__11dMeterMap_cFv -/* 801FB450 48 00 00 1C */ b lbl_801FB46C -lbl_801FB454: -/* 801FB454 38 00 00 00 */ li r0, 0 -/* 801FB458 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801FB45C 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801FB460 98 03 00 BF */ stb r0, 0xbf(r3) -/* 801FB464 80 63 00 20 */ lwz r3, 0x20(r3) -/* 801FB468 48 01 24 55 */ bl setDispPosOutsideFlg_SE_On__11dMeterMap_cFv -lbl_801FB46C: -/* 801FB46C 38 00 02 00 */ li r0, 0x200 -/* 801FB470 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801FB474 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801FB478 B0 03 00 AA */ sth r0, 0xaa(r3) -/* 801FB47C 38 00 00 0C */ li r0, 0xc -/* 801FB480 98 1F 01 46 */ stb r0, 0x146(r31) -/* 801FB484 38 00 00 03 */ li r0, 3 -/* 801FB488 80 7F 01 18 */ lwz r3, 0x118(r31) -/* 801FB48C 98 03 01 7A */ stb r0, 0x17a(r3) -/* 801FB490 38 00 00 BB */ li r0, 0xbb -/* 801FB494 90 01 00 10 */ stw r0, 0x10(r1) -/* 801FB498 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 801FB49C 38 81 00 10 */ addi r4, r1, 0x10 -/* 801FB4A0 38 A0 00 00 */ li r5, 0 -/* 801FB4A4 38 C0 00 00 */ li r6, 0 -/* 801FB4A8 38 E0 00 00 */ li r7, 0 -/* 801FB4AC C0 22 AA C4 */ lfs f1, lit_4386(r2) -/* 801FB4B0 FC 40 08 90 */ fmr f2, f1 -/* 801FB4B4 C0 62 AA C8 */ lfs f3, lit_4387(r2) -/* 801FB4B8 FC 80 18 90 */ fmr f4, f3 -/* 801FB4BC 39 00 00 00 */ li r8, 0 -/* 801FB4C0 48 0B 04 C5 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801FB4C4 48 00 01 04 */ b lbl_801FB5C8 -lbl_801FB4C8: -/* 801FB4C8 28 00 00 02 */ cmplwi r0, 2 -/* 801FB4CC 40 82 00 70 */ bne lbl_801FB53C -/* 801FB4D0 38 00 00 00 */ li r0, 0 -/* 801FB4D4 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801FB4D8 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801FB4DC 98 03 00 BF */ stb r0, 0xbf(r3) -/* 801FB4E0 38 00 04 00 */ li r0, 0x400 -/* 801FB4E4 B0 03 00 AA */ sth r0, 0xaa(r3) -/* 801FB4E8 38 00 00 0C */ li r0, 0xc -/* 801FB4EC 98 1F 01 46 */ stb r0, 0x146(r31) -/* 801FB4F0 80 63 00 20 */ lwz r3, 0x20(r3) -/* 801FB4F4 48 01 23 C9 */ bl setDispPosOutsideFlg_SE_On__11dMeterMap_cFv -/* 801FB4F8 38 00 00 01 */ li r0, 1 -/* 801FB4FC 80 7F 01 18 */ lwz r3, 0x118(r31) -/* 801FB500 98 03 01 7A */ stb r0, 0x17a(r3) -/* 801FB504 38 00 00 BB */ li r0, 0xbb -/* 801FB508 90 01 00 0C */ stw r0, 0xc(r1) -/* 801FB50C 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 801FB510 38 81 00 0C */ addi r4, r1, 0xc -/* 801FB514 38 A0 00 00 */ li r5, 0 -/* 801FB518 38 C0 00 00 */ li r6, 0 -/* 801FB51C 38 E0 00 00 */ li r7, 0 -/* 801FB520 C0 22 AA C4 */ lfs f1, lit_4386(r2) -/* 801FB524 FC 40 08 90 */ fmr f2, f1 -/* 801FB528 C0 62 AA C8 */ lfs f3, lit_4387(r2) -/* 801FB52C FC 80 18 90 */ fmr f4, f3 -/* 801FB530 39 00 00 00 */ li r8, 0 -/* 801FB534 48 0B 04 51 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801FB538 48 00 00 90 */ b lbl_801FB5C8 -lbl_801FB53C: -/* 801FB53C 28 00 00 03 */ cmplwi r0, 3 -/* 801FB540 40 82 00 80 */ bne lbl_801FB5C0 -/* 801FB544 48 01 21 0D */ bl isEnableDispMapAndMapDispSizeTypeNo__11dMeterMap_cFv -/* 801FB548 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801FB54C 41 82 00 18 */ beq lbl_801FB564 -/* 801FB550 38 00 00 01 */ li r0, 1 -/* 801FB554 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801FB558 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801FB55C 98 03 00 BF */ stb r0, 0xbf(r3) -/* 801FB560 48 00 00 14 */ b lbl_801FB574 -lbl_801FB564: -/* 801FB564 38 00 00 00 */ li r0, 0 -/* 801FB568 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801FB56C 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801FB570 98 03 00 BF */ stb r0, 0xbf(r3) -lbl_801FB574: -/* 801FB574 38 00 00 0C */ li r0, 0xc -/* 801FB578 98 1F 01 46 */ stb r0, 0x146(r31) -/* 801FB57C 38 00 00 02 */ li r0, 2 -/* 801FB580 80 7F 01 18 */ lwz r3, 0x118(r31) -/* 801FB584 98 03 01 7A */ stb r0, 0x17a(r3) -/* 801FB588 38 00 00 BB */ li r0, 0xbb -/* 801FB58C 90 01 00 08 */ stw r0, 8(r1) -/* 801FB590 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 801FB594 38 81 00 08 */ addi r4, r1, 8 -/* 801FB598 38 A0 00 00 */ li r5, 0 -/* 801FB59C 38 C0 00 00 */ li r6, 0 -/* 801FB5A0 38 E0 00 00 */ li r7, 0 -/* 801FB5A4 C0 22 AA C4 */ lfs f1, lit_4386(r2) -/* 801FB5A8 FC 40 08 90 */ fmr f2, f1 -/* 801FB5AC C0 62 AA C8 */ lfs f3, lit_4387(r2) -/* 801FB5B0 FC 80 18 90 */ fmr f4, f3 -/* 801FB5B4 39 00 00 00 */ li r8, 0 -/* 801FB5B8 48 0B 03 CD */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801FB5BC 48 00 00 0C */ b lbl_801FB5C8 -lbl_801FB5C0: -/* 801FB5C0 80 7F 01 18 */ lwz r3, 0x118(r31) -/* 801FB5C4 4B FC 27 E1 */ bl _move__12dMenu_Dmap_cFv -lbl_801FB5C8: -/* 801FB5C8 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 801FB5CC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801FB5D0 7C 08 03 A6 */ mtlr r0 -/* 801FB5D4 38 21 00 20 */ addi r1, r1, 0x20 -/* 801FB5D8 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/dmap_open_init__5dMw_cFUc.s b/asm/d/menu/d_menu_window/dmap_open_init__5dMw_cFUc.s deleted file mode 100644 index 9d4b9521c5..0000000000 --- a/asm/d/menu/d_menu_window/dmap_open_init__5dMw_cFUc.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_801FA564: -/* 801FA564 3C 80 80 43 */ lis r4, g_meter2_info@ha /* 0x80430188@ha */ -/* 801FA568 38 84 01 88 */ addi r4, r4, g_meter2_info@l /* 0x80430188@l */ -/* 801FA56C 88 04 00 B9 */ lbz r0, 0xb9(r4) -/* 801FA570 98 04 00 BA */ stb r0, 0xba(r4) -/* 801FA574 38 00 00 05 */ li r0, 5 -/* 801FA578 98 04 00 B9 */ stb r0, 0xb9(r4) -/* 801FA57C 38 00 00 00 */ li r0, 0 -/* 801FA580 98 03 01 53 */ stb r0, 0x153(r3) -/* 801FA584 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/dmap_open_proc__5dMw_cFv.s b/asm/d/menu/d_menu_window/dmap_open_proc__5dMw_cFv.s deleted file mode 100644 index 32fd84fb02..0000000000 --- a/asm/d/menu/d_menu_window/dmap_open_proc__5dMw_cFv.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_801FB3AC: -/* 801FB3AC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FB3B0 7C 08 02 A6 */ mflr r0 -/* 801FB3B4 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FB3B8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FB3BC 7C 7F 1B 78 */ mr r31, r3 -/* 801FB3C0 88 03 01 53 */ lbz r0, 0x153(r3) -/* 801FB3C4 28 00 00 00 */ cmplwi r0, 0 -/* 801FB3C8 40 82 00 10 */ bne lbl_801FB3D8 -/* 801FB3CC 38 00 00 01 */ li r0, 1 -/* 801FB3D0 98 1F 01 53 */ stb r0, 0x153(r31) -/* 801FB3D4 48 02 36 01 */ bl dMeter2Info_set2DVibrationM__Fv -lbl_801FB3D8: -/* 801FB3D8 80 7F 01 18 */ lwz r3, 0x118(r31) -/* 801FB3DC 4B FC 2F 4D */ bl isOpen__12dMenu_Dmap_cFv -/* 801FB3E0 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801FB3E4 41 82 00 0C */ beq lbl_801FB3F0 -/* 801FB3E8 38 00 00 0B */ li r0, 0xb -/* 801FB3EC 98 1F 01 46 */ stb r0, 0x146(r31) -lbl_801FB3F0: -/* 801FB3F0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FB3F4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FB3F8 7C 08 03 A6 */ mtlr r0 -/* 801FB3FC 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FB400 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/fmap_close_proc__5dMw_cFv.s b/asm/d/menu/d_menu_window/fmap_close_proc__5dMw_cFv.s deleted file mode 100644 index 32fc0c0f5b..0000000000 --- a/asm/d/menu/d_menu_window/fmap_close_proc__5dMw_cFv.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_801FB36C: -/* 801FB36C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FB370 7C 08 02 A6 */ mflr r0 -/* 801FB374 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FB378 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FB37C 7C 7F 1B 78 */ mr r31, r3 -/* 801FB380 80 63 01 1C */ lwz r3, 0x11c(r3) -/* 801FB384 4B FC FC B5 */ bl isClose__12dMenu_Fmap_cFv -/* 801FB388 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801FB38C 41 82 00 0C */ beq lbl_801FB398 -/* 801FB390 38 00 00 00 */ li r0, 0 -/* 801FB394 98 1F 01 46 */ stb r0, 0x146(r31) -lbl_801FB398: -/* 801FB398 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FB39C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FB3A0 7C 08 03 A6 */ mtlr r0 -/* 801FB3A4 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FB3A8 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/fmap_move_proc__5dMw_cFv.s b/asm/d/menu/d_menu_window/fmap_move_proc__5dMw_cFv.s deleted file mode 100644 index 75c45786fb..0000000000 --- a/asm/d/menu/d_menu_window/fmap_move_proc__5dMw_cFv.s +++ /dev/null @@ -1,57 +0,0 @@ -lbl_801FB298: -/* 801FB298 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801FB29C 7C 08 02 A6 */ mflr r0 -/* 801FB2A0 90 01 00 24 */ stw r0, 0x24(r1) -/* 801FB2A4 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 801FB2A8 7C 7F 1B 78 */ mr r31, r3 -/* 801FB2AC 80 63 01 1C */ lwz r3, 0x11c(r3) -/* 801FB2B0 4B FC C1 F9 */ bl _move__12dMenu_Fmap_cFv -/* 801FB2B4 80 6D 86 48 */ lwz r3, mFader__13mDoGph_gInf_c(r13) -/* 801FB2B8 80 03 00 04 */ lwz r0, 4(r3) -/* 801FB2BC 2C 00 00 01 */ cmpwi r0, 1 -/* 801FB2C0 40 82 00 98 */ bne lbl_801FB358 -/* 801FB2C4 80 7F 01 1C */ lwz r3, 0x11c(r31) -/* 801FB2C8 38 9F 01 4B */ addi r4, r31, 0x14b -/* 801FB2CC 4B FC C5 25 */ bl getNextStatus__12dMenu_Fmap_cFPUc -/* 801FB2D0 98 7F 01 46 */ stb r3, 0x146(r31) -/* 801FB2D4 3C 60 80 43 */ lis r3, g_fmapHIO@ha /* 0x8042FC60@ha */ -/* 801FB2D8 38 63 FC 60 */ addi r3, r3, g_fmapHIO@l /* 0x8042FC60@l */ -/* 801FB2DC 88 03 02 F9 */ lbz r0, 0x2f9(r3) -/* 801FB2E0 28 00 00 00 */ cmplwi r0, 0 -/* 801FB2E4 41 82 00 40 */ beq lbl_801FB324 -/* 801FB2E8 38 00 00 09 */ li r0, 9 -/* 801FB2EC 98 1F 01 46 */ stb r0, 0x146(r31) -/* 801FB2F0 38 00 00 BB */ li r0, 0xbb -/* 801FB2F4 90 01 00 08 */ stw r0, 8(r1) -/* 801FB2F8 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 801FB2FC 38 81 00 08 */ addi r4, r1, 8 -/* 801FB300 38 A0 00 00 */ li r5, 0 -/* 801FB304 38 C0 00 00 */ li r6, 0 -/* 801FB308 38 E0 00 00 */ li r7, 0 -/* 801FB30C C0 22 AA C4 */ lfs f1, lit_4386(r2) -/* 801FB310 FC 40 08 90 */ fmr f2, f1 -/* 801FB314 C0 62 AA C8 */ lfs f3, lit_4387(r2) -/* 801FB318 FC 80 18 90 */ fmr f4, f3 -/* 801FB31C 39 00 00 00 */ li r8, 0 -/* 801FB320 48 0B 06 65 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -lbl_801FB324: -/* 801FB324 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801FB328 38 83 01 88 */ addi r4, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801FB32C 80 64 00 20 */ lwz r3, 0x20(r4) -/* 801FB330 28 03 00 00 */ cmplwi r3, 0 -/* 801FB334 41 82 00 24 */ beq lbl_801FB358 -/* 801FB338 88 04 00 BF */ lbz r0, 0xbf(r4) -/* 801FB33C 28 00 00 01 */ cmplwi r0, 1 -/* 801FB340 40 82 00 0C */ bne lbl_801FB34C -/* 801FB344 48 01 25 31 */ bl setDispPosInsideFlg_SE_On__11dMeterMap_cFv -/* 801FB348 48 00 00 10 */ b lbl_801FB358 -lbl_801FB34C: -/* 801FB34C 28 00 00 00 */ cmplwi r0, 0 -/* 801FB350 40 82 00 08 */ bne lbl_801FB358 -/* 801FB354 48 01 25 69 */ bl setDispPosOutsideFlg_SE_On__11dMeterMap_cFv -lbl_801FB358: -/* 801FB358 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 801FB35C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801FB360 7C 08 03 A6 */ mtlr r0 -/* 801FB364 38 21 00 20 */ addi r1, r1, 0x20 -/* 801FB368 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/fmap_open_init__5dMw_cFUc.s b/asm/d/menu/d_menu_window/fmap_open_init__5dMw_cFUc.s deleted file mode 100644 index 62ebd2b1f7..0000000000 --- a/asm/d/menu/d_menu_window/fmap_open_init__5dMw_cFUc.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_801FA538: -/* 801FA538 3C 80 80 43 */ lis r4, g_meter2_info@ha /* 0x80430188@ha */ -/* 801FA53C 38 84 01 88 */ addi r4, r4, g_meter2_info@l /* 0x80430188@l */ -/* 801FA540 88 04 00 B9 */ lbz r0, 0xb9(r4) -/* 801FA544 98 04 00 BA */ stb r0, 0xba(r4) -/* 801FA548 38 00 00 04 */ li r0, 4 -/* 801FA54C 98 04 00 B9 */ stb r0, 0xb9(r4) -/* 801FA550 38 00 00 00 */ li r0, 0 -/* 801FA554 98 03 01 53 */ stb r0, 0x153(r3) -/* 801FA558 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/fmap_open_proc__5dMw_cFv.s b/asm/d/menu/d_menu_window/fmap_open_proc__5dMw_cFv.s deleted file mode 100644 index 3598bcc4e2..0000000000 --- a/asm/d/menu/d_menu_window/fmap_open_proc__5dMw_cFv.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_801FB240: -/* 801FB240 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FB244 7C 08 02 A6 */ mflr r0 -/* 801FB248 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FB24C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FB250 7C 7F 1B 78 */ mr r31, r3 -/* 801FB254 88 03 01 53 */ lbz r0, 0x153(r3) -/* 801FB258 28 00 00 00 */ cmplwi r0, 0 -/* 801FB25C 40 82 00 10 */ bne lbl_801FB26C -/* 801FB260 38 00 00 01 */ li r0, 1 -/* 801FB264 98 1F 01 53 */ stb r0, 0x153(r31) -/* 801FB268 48 02 37 6D */ bl dMeter2Info_set2DVibrationM__Fv -lbl_801FB26C: -/* 801FB26C 80 7F 01 1C */ lwz r3, 0x11c(r31) -/* 801FB270 4B FC FB 55 */ bl isOpen__12dMenu_Fmap_cFv -/* 801FB274 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801FB278 41 82 00 0C */ beq lbl_801FB284 -/* 801FB27C 38 00 00 08 */ li r0, 8 -/* 801FB280 98 1F 01 46 */ stb r0, 0x146(r31) -lbl_801FB284: -/* 801FB284 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FB288 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FB28C 7C 08 03 A6 */ mtlr r0 -/* 801FB290 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FB294 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/insect_close_init__5dMw_cFUc.s b/asm/d/menu/d_menu_window/insect_close_init__5dMw_cFUc.s deleted file mode 100644 index e04605654d..0000000000 --- a/asm/d/menu/d_menu_window/insect_close_init__5dMw_cFUc.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_801FA9F0: -/* 801FA9F0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FA9F4 7C 08 02 A6 */ mflr r0 -/* 801FA9F8 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FA9FC 38 00 00 A5 */ li r0, 0xa5 -/* 801FAA00 90 01 00 08 */ stw r0, 8(r1) -/* 801FAA04 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 801FAA08 38 81 00 08 */ addi r4, r1, 8 -/* 801FAA0C 38 A0 00 00 */ li r5, 0 -/* 801FAA10 38 C0 00 00 */ li r6, 0 -/* 801FAA14 38 E0 00 00 */ li r7, 0 -/* 801FAA18 C0 22 AA C4 */ lfs f1, lit_4386(r2) -/* 801FAA1C FC 40 08 90 */ fmr f2, f1 -/* 801FAA20 C0 62 AA C8 */ lfs f3, lit_4387(r2) -/* 801FAA24 FC 80 18 90 */ fmr f4, f3 -/* 801FAA28 39 00 00 00 */ li r8, 0 -/* 801FAA2C 48 0B 0F 59 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801FAA30 48 02 3F A1 */ bl dMeter2Info_set2DVibration__Fv -/* 801FAA34 48 00 23 D5 */ bl dMw_fade_out__5dMw_cFv -/* 801FAA38 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FAA3C 7C 08 03 A6 */ mtlr r0 -/* 801FAA40 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FAA44 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/insect_close_proc__5dMw_cFv.s b/asm/d/menu/d_menu_window/insect_close_proc__5dMw_cFv.s deleted file mode 100644 index 5b7ac84fee..0000000000 --- a/asm/d/menu/d_menu_window/insect_close_proc__5dMw_cFv.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_801FBD64: -/* 801FBD64 80 8D 86 48 */ lwz r4, mFader__13mDoGph_gInf_c(r13) -/* 801FBD68 80 04 00 04 */ lwz r0, 4(r4) -/* 801FBD6C 2C 00 00 00 */ cmpwi r0, 0 -/* 801FBD70 4C 82 00 20 */ bnelr -/* 801FBD74 38 00 00 00 */ li r0, 0 -/* 801FBD78 98 03 01 46 */ stb r0, 0x146(r3) -/* 801FBD7C 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/insect_move_proc__5dMw_cFv.s b/asm/d/menu/d_menu_window/insect_move_proc__5dMw_cFv.s deleted file mode 100644 index b92161a41c..0000000000 --- a/asm/d/menu/d_menu_window/insect_move_proc__5dMw_cFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_801FBD08: -/* 801FBD08 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FBD0C 7C 08 02 A6 */ mflr r0 -/* 801FBD10 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FBD14 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FBD18 7C 7F 1B 78 */ mr r31, r3 -/* 801FBD1C 80 63 01 34 */ lwz r3, 0x134(r3) -/* 801FBD20 28 03 00 00 */ cmplwi r3, 0 -/* 801FBD24 41 82 00 2C */ beq lbl_801FBD50 -/* 801FBD28 88 03 00 F2 */ lbz r0, 0xf2(r3) -/* 801FBD2C 28 00 00 02 */ cmplwi r0, 2 -/* 801FBD30 40 82 00 08 */ bne lbl_801FBD38 -/* 801FBD34 4B FD C9 95 */ bl _move__14dMenu_Insect_cFv -lbl_801FBD38: -/* 801FBD38 80 7F 01 34 */ lwz r3, 0x134(r31) -/* 801FBD3C 88 03 00 F2 */ lbz r0, 0xf2(r3) -/* 801FBD40 28 00 00 03 */ cmplwi r0, 3 -/* 801FBD44 40 82 00 0C */ bne lbl_801FBD50 -/* 801FBD48 38 00 00 22 */ li r0, 0x22 -/* 801FBD4C 98 1F 01 46 */ stb r0, 0x146(r31) -lbl_801FBD50: -/* 801FBD50 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FBD54 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FBD58 7C 08 03 A6 */ mtlr r0 -/* 801FBD5C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FBD60 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/insect_open2_proc__5dMw_cFv.s b/asm/d/menu/d_menu_window/insect_open2_proc__5dMw_cFv.s deleted file mode 100644 index 8684ec06e6..0000000000 --- a/asm/d/menu/d_menu_window/insect_open2_proc__5dMw_cFv.s +++ /dev/null @@ -1,39 +0,0 @@ -lbl_801FBC78: -/* 801FBC78 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FBC7C 7C 08 02 A6 */ mflr r0 -/* 801FBC80 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FBC84 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FBC88 7C 7F 1B 78 */ mr r31, r3 -/* 801FBC8C 80 63 01 34 */ lwz r3, 0x134(r3) -/* 801FBC90 88 03 00 F2 */ lbz r0, 0xf2(r3) -/* 801FBC94 28 00 00 01 */ cmplwi r0, 1 -/* 801FBC98 40 82 00 30 */ bne lbl_801FBCC8 -/* 801FBC9C 4B FD CC B1 */ bl _open__14dMenu_Insect_cFv -/* 801FBCA0 88 1F 01 52 */ lbz r0, 0x152(r31) -/* 801FBCA4 28 00 00 00 */ cmplwi r0, 0 -/* 801FBCA8 40 82 00 20 */ bne lbl_801FBCC8 -/* 801FBCAC 80 7F 01 34 */ lwz r3, 0x134(r31) -/* 801FBCB0 4B FD CC 3D */ bl isSync__14dMenu_Insect_cFv -/* 801FBCB4 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801FBCB8 41 82 00 10 */ beq lbl_801FBCC8 -/* 801FBCBC 48 00 11 BD */ bl dMw_fade_in__5dMw_cFv -/* 801FBCC0 38 00 00 01 */ li r0, 1 -/* 801FBCC4 98 1F 01 52 */ stb r0, 0x152(r31) -lbl_801FBCC8: -/* 801FBCC8 80 7F 01 34 */ lwz r3, 0x134(r31) -/* 801FBCCC 88 03 00 F2 */ lbz r0, 0xf2(r3) -/* 801FBCD0 28 00 00 02 */ cmplwi r0, 2 -/* 801FBCD4 40 82 00 20 */ bne lbl_801FBCF4 -/* 801FBCD8 88 1F 01 52 */ lbz r0, 0x152(r31) -/* 801FBCDC 28 00 00 01 */ cmplwi r0, 1 -/* 801FBCE0 40 82 00 14 */ bne lbl_801FBCF4 -/* 801FBCE4 38 00 00 21 */ li r0, 0x21 -/* 801FBCE8 98 1F 01 46 */ stb r0, 0x146(r31) -/* 801FBCEC 38 00 00 00 */ li r0, 0 -/* 801FBCF0 98 1F 01 52 */ stb r0, 0x152(r31) -lbl_801FBCF4: -/* 801FBCF4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FBCF8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FBCFC 7C 08 03 A6 */ mtlr r0 -/* 801FBD00 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FBD04 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/insect_open_init__5dMw_cFUc.s b/asm/d/menu/d_menu_window/insect_open_init__5dMw_cFUc.s deleted file mode 100644 index 7a0ce403c4..0000000000 --- a/asm/d/menu/d_menu_window/insect_open_init__5dMw_cFUc.s +++ /dev/null @@ -1,34 +0,0 @@ -lbl_801FA964: -/* 801FA964 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801FA968 7C 08 02 A6 */ mflr r0 -/* 801FA96C 90 01 00 24 */ stw r0, 0x24(r1) -/* 801FA970 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 801FA974 7C 7F 1B 78 */ mr r31, r3 -/* 801FA978 38 80 00 0A */ li r4, 0xa -/* 801FA97C 98 83 01 44 */ stb r4, 0x144(r3) -/* 801FA980 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801FA984 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801FA988 88 03 00 B9 */ lbz r0, 0xb9(r3) -/* 801FA98C 98 03 00 BA */ stb r0, 0xba(r3) -/* 801FA990 98 83 00 B9 */ stb r4, 0xb9(r3) -/* 801FA994 38 00 00 A4 */ li r0, 0xa4 -/* 801FA998 90 01 00 08 */ stw r0, 8(r1) -/* 801FA99C 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 801FA9A0 38 81 00 08 */ addi r4, r1, 8 -/* 801FA9A4 38 A0 00 00 */ li r5, 0 -/* 801FA9A8 38 C0 00 00 */ li r6, 0 -/* 801FA9AC 38 E0 00 00 */ li r7, 0 -/* 801FA9B0 C0 22 AA C4 */ lfs f1, lit_4386(r2) -/* 801FA9B4 FC 40 08 90 */ fmr f2, f1 -/* 801FA9B8 C0 62 AA C8 */ lfs f3, lit_4387(r2) -/* 801FA9BC FC 80 18 90 */ fmr f4, f3 -/* 801FA9C0 39 00 00 00 */ li r8, 0 -/* 801FA9C4 48 0B 0F C1 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801FA9C8 48 00 24 41 */ bl dMw_fade_out__5dMw_cFv -/* 801FA9CC 7F E3 FB 78 */ mr r3, r31 -/* 801FA9D0 48 00 13 B1 */ bl dMw_capture_create__5dMw_cFv -/* 801FA9D4 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 801FA9D8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801FA9DC 7C 08 03 A6 */ mtlr r0 -/* 801FA9E0 38 21 00 20 */ addi r1, r1, 0x20 -/* 801FA9E4 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/insect_open_proc__5dMw_cFv.s b/asm/d/menu/d_menu_window/insect_open_proc__5dMw_cFv.s deleted file mode 100644 index cb71a8488d..0000000000 --- a/asm/d/menu/d_menu_window/insect_open_proc__5dMw_cFv.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_801FBC1C: -/* 801FBC1C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FBC20 7C 08 02 A6 */ mflr r0 -/* 801FBC24 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FBC28 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FBC2C 7C 7F 1B 78 */ mr r31, r3 -/* 801FBC30 80 6D 86 48 */ lwz r3, mFader__13mDoGph_gInf_c(r13) -/* 801FBC34 80 03 00 04 */ lwz r0, 4(r3) -/* 801FBC38 2C 00 00 00 */ cmpwi r0, 0 -/* 801FBC3C 40 82 00 28 */ bne lbl_801FBC64 -/* 801FBC40 38 00 00 00 */ li r0, 0 -/* 801FBC44 98 1F 01 52 */ stb r0, 0x152(r31) -/* 801FBC48 38 60 00 01 */ li r3, 1 -/* 801FBC4C 4B E3 24 95 */ bl dComIfGp_setHeapLockFlag__FUc -/* 801FBC50 7F E3 FB 78 */ mr r3, r31 -/* 801FBC54 38 80 00 01 */ li r4, 1 -/* 801FBC58 48 00 0F 3D */ bl dMw_insect_create__5dMw_cFUc -/* 801FBC5C 38 00 00 20 */ li r0, 0x20 -/* 801FBC60 98 1F 01 46 */ stb r0, 0x146(r31) -lbl_801FBC64: -/* 801FBC64 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FBC68 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FBC6C 7C 08 03 A6 */ mtlr r0 -/* 801FBC70 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FBC74 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/isEventCheck__5dMw_cFv.s b/asm/d/menu/d_menu_window/isEventCheck__5dMw_cFv.s deleted file mode 100644 index fb25994bd9..0000000000 --- a/asm/d/menu/d_menu_window/isEventCheck__5dMw_cFv.s +++ /dev/null @@ -1,75 +0,0 @@ -lbl_801FCF84: -/* 801FCF84 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FCF88 7C 08 02 A6 */ mflr r0 -/* 801FCF8C 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FCF90 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FCF94 88 03 01 51 */ lbz r0, 0x151(r3) -/* 801FCF98 28 00 00 00 */ cmplwi r0, 0 -/* 801FCF9C 41 82 00 0C */ beq lbl_801FCFA8 -/* 801FCFA0 38 60 00 01 */ li r3, 1 -/* 801FCFA4 48 00 00 DC */ b lbl_801FD080 -lbl_801FCFA8: -/* 801FCFA8 3C 80 80 43 */ lis r4, g_meter2_info@ha /* 0x80430188@ha */ -/* 801FCFAC 3B E4 01 88 */ addi r31, r4, g_meter2_info@l /* 0x80430188@l */ -/* 801FCFB0 88 1F 00 BF */ lbz r0, 0xbf(r31) -/* 801FCFB4 28 00 00 04 */ cmplwi r0, 4 -/* 801FCFB8 40 82 00 18 */ bne lbl_801FCFD0 -/* 801FCFBC 88 03 01 48 */ lbz r0, 0x148(r3) -/* 801FCFC0 7C 00 07 75 */ extsb. r0, r0 -/* 801FCFC4 40 81 00 0C */ ble lbl_801FCFD0 -/* 801FCFC8 38 00 00 00 */ li r0, 0 -/* 801FCFCC 98 03 01 48 */ stb r0, 0x148(r3) -lbl_801FCFD0: -/* 801FCFD0 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801FCFD4 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801FCFD8 88 04 4F AD */ lbz r0, 0x4fad(r4) -/* 801FCFDC 28 00 00 00 */ cmplwi r0, 0 -/* 801FCFE0 41 82 00 8C */ beq lbl_801FD06C -/* 801FCFE4 48 03 B2 49 */ bl getStatus__12dMsgObject_cFv -/* 801FCFE8 54 60 04 3E */ clrlwi r0, r3, 0x10 -/* 801FCFEC 20 60 00 01 */ subfic r3, r0, 1 -/* 801FCFF0 30 03 FF FF */ addic r0, r3, -1 -/* 801FCFF4 7C 00 19 10 */ subfe r0, r0, r3 -/* 801FCFF8 54 00 06 3F */ clrlwi. r0, r0, 0x18 -/* 801FCFFC 40 82 00 68 */ bne lbl_801FD064 -/* 801FD000 88 1F 00 BF */ lbz r0, 0xbf(r31) -/* 801FD004 28 00 00 04 */ cmplwi r0, 4 -/* 801FD008 41 82 00 54 */ beq lbl_801FD05C -/* 801FD00C 28 00 00 05 */ cmplwi r0, 5 -/* 801FD010 41 82 00 4C */ beq lbl_801FD05C -/* 801FD014 28 00 00 07 */ cmplwi r0, 7 -/* 801FD018 41 82 00 44 */ beq lbl_801FD05C -/* 801FD01C 28 00 00 08 */ cmplwi r0, 8 -/* 801FD020 41 82 00 3C */ beq lbl_801FD05C -/* 801FD024 28 00 00 09 */ cmplwi r0, 9 -/* 801FD028 41 82 00 34 */ beq lbl_801FD05C -/* 801FD02C 28 00 00 06 */ cmplwi r0, 6 -/* 801FD030 41 82 00 2C */ beq lbl_801FD05C -/* 801FD034 28 00 00 03 */ cmplwi r0, 3 -/* 801FD038 41 82 00 24 */ beq lbl_801FD05C -/* 801FD03C 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801FD040 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801FD044 A0 03 00 98 */ lhz r0, 0x98(r3) -/* 801FD048 54 00 07 7B */ rlwinm. r0, r0, 0, 0x1d, 0x1d -/* 801FD04C 40 82 00 10 */ bne lbl_801FD05C -/* 801FD050 88 03 00 C1 */ lbz r0, 0xc1(r3) -/* 801FD054 28 00 00 08 */ cmplwi r0, 8 -/* 801FD058 40 82 00 0C */ bne lbl_801FD064 -lbl_801FD05C: -/* 801FD05C 38 60 00 00 */ li r3, 0 -/* 801FD060 48 00 00 20 */ b lbl_801FD080 -lbl_801FD064: -/* 801FD064 38 60 00 01 */ li r3, 1 -/* 801FD068 48 00 00 18 */ b lbl_801FD080 -lbl_801FD06C: -/* 801FD06C 88 03 01 48 */ lbz r0, 0x148(r3) -/* 801FD070 7C 03 07 74 */ extsb r3, r0 -/* 801FD074 7C 03 00 D0 */ neg r0, r3 -/* 801FD078 7C 00 18 78 */ andc r0, r0, r3 -/* 801FD07C 54 03 0F FE */ srwi r3, r0, 0x1f -lbl_801FD080: -/* 801FD080 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FD084 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FD088 7C 08 03 A6 */ mtlr r0 -/* 801FD08C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FD090 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/isPauseReady__5dMw_cFv.s b/asm/d/menu/d_menu_window/isPauseReady__5dMw_cFv.s deleted file mode 100644 index f166375c1f..0000000000 --- a/asm/d/menu/d_menu_window/isPauseReady__5dMw_cFv.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_801FCDD8: -/* 801FCDD8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801FCDDC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801FCDE0 88 03 4F F0 */ lbz r0, 0x4ff0(r3) -/* 801FCDE4 28 00 00 00 */ cmplwi r0, 0 -/* 801FCDE8 40 82 00 10 */ bne lbl_801FCDF8 -/* 801FCDEC A0 03 00 02 */ lhz r0, 2(r3) -/* 801FCDF0 28 00 00 00 */ cmplwi r0, 0 -/* 801FCDF4 40 82 00 0C */ bne lbl_801FCE00 -lbl_801FCDF8: -/* 801FCDF8 38 60 00 00 */ li r3, 0 -/* 801FCDFC 4E 80 00 20 */ blr -lbl_801FCE00: -/* 801FCE00 38 60 00 01 */ li r3, 1 -/* 801FCE04 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/key_wait_init__5dMw_cFUc.s b/asm/d/menu/d_menu_window/key_wait_init__5dMw_cFUc.s deleted file mode 100644 index 0bc5705b8c..0000000000 --- a/asm/d/menu/d_menu_window/key_wait_init__5dMw_cFUc.s +++ /dev/null @@ -1,59 +0,0 @@ -lbl_801FA13C: -/* 801FA13C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FA140 7C 08 02 A6 */ mflr r0 -/* 801FA144 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FA148 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FA14C 93 C1 00 08 */ stw r30, 8(r1) -/* 801FA150 7C 7E 1B 78 */ mr r30, r3 -/* 801FA154 7C 9F 23 78 */ mr r31, r4 -/* 801FA158 3C 80 80 43 */ lis r4, g_meter2_info@ha /* 0x80430188@ha */ -/* 801FA15C 38 84 01 88 */ addi r4, r4, g_meter2_info@l /* 0x80430188@l */ -/* 801FA160 88 04 00 B9 */ lbz r0, 0xb9(r4) -/* 801FA164 98 04 00 BA */ stb r0, 0xba(r4) -/* 801FA168 38 00 00 00 */ li r0, 0 -/* 801FA16C 98 04 00 B9 */ stb r0, 0xb9(r4) -/* 801FA170 48 00 1C A5 */ bl dMw_capture_delete__5dMw_cFv -/* 801FA174 57 E3 06 3E */ clrlwi r3, r31, 0x18 -/* 801FA178 38 03 FF FD */ addi r0, r3, -3 -/* 801FA17C 28 00 00 1F */ cmplwi r0, 0x1f -/* 801FA180 41 81 00 78 */ bgt lbl_801FA1F8 -/* 801FA184 3C 60 80 3C */ lis r3, lit_4360@ha /* 0x803BEF94@ha */ -/* 801FA188 38 63 EF 94 */ addi r3, r3, lit_4360@l /* 0x803BEF94@l */ -/* 801FA18C 54 00 10 3A */ slwi r0, r0, 2 -/* 801FA190 7C 03 00 2E */ lwzx r0, r3, r0 -/* 801FA194 7C 09 03 A6 */ mtctr r0 -/* 801FA198 4E 80 04 20 */ bctr -/* 801FA19C 48 00 2C DD */ bl dMw_fade_in__5dMw_cFv -/* 801FA1A0 7F C3 F3 78 */ mr r3, r30 -/* 801FA1A4 38 80 00 01 */ li r4, 1 -/* 801FA1A8 48 00 1E E9 */ bl dMw_collect_delete__5dMw_cFb -/* 801FA1AC 48 00 00 4C */ b lbl_801FA1F8 -/* 801FA1B0 7F C3 F3 78 */ mr r3, r30 -/* 801FA1B4 38 80 00 01 */ li r4, 1 -/* 801FA1B8 48 00 22 B5 */ bl dMw_dmap_delete__5dMw_cFb -/* 801FA1BC 48 00 00 3C */ b lbl_801FA1F8 -/* 801FA1C0 7F C3 F3 78 */ mr r3, r30 -/* 801FA1C4 38 80 00 01 */ li r4, 1 -/* 801FA1C8 48 00 20 9D */ bl dMw_fmap_delete__5dMw_cFb -/* 801FA1CC 48 00 00 2C */ b lbl_801FA1F8 -/* 801FA1D0 7F C3 F3 78 */ mr r3, r30 -/* 801FA1D4 48 00 1D 8D */ bl dMw_ring_delete__5dMw_cFv -/* 801FA1D8 48 00 00 20 */ b lbl_801FA1F8 -/* 801FA1DC 48 00 2C 9D */ bl dMw_fade_in__5dMw_cFv -/* 801FA1E0 7F C3 F3 78 */ mr r3, r30 -/* 801FA1E4 48 00 23 ED */ bl dMw_save_delete__5dMw_cFv -/* 801FA1E8 48 00 00 10 */ b lbl_801FA1F8 -/* 801FA1EC 48 00 2C 8D */ bl dMw_fade_in__5dMw_cFv -/* 801FA1F0 7F C3 F3 78 */ mr r3, r30 -/* 801FA1F4 48 00 2A 51 */ bl dMw_insect_delete__5dMw_cFv -lbl_801FA1F8: -/* 801FA1F8 80 7E 01 00 */ lwz r3, 0x100(r30) -/* 801FA1FC 48 0D 43 D1 */ bl freeAll__7JKRHeapFv -/* 801FA200 38 60 00 00 */ li r3, 0 -/* 801FA204 4B E3 3F 85 */ bl dComIfGp_offHeapLockFlag__Fi -/* 801FA208 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FA20C 83 C1 00 08 */ lwz r30, 8(r1) -/* 801FA210 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FA214 7C 08 03 A6 */ mtlr r0 -/* 801FA218 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FA21C 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/markMemSize__5dMw_cFv.s b/asm/d/menu/d_menu_window/markMemSize__5dMw_cFv.s deleted file mode 100644 index 05ac05c0d5..0000000000 --- a/asm/d/menu/d_menu_window/markMemSize__5dMw_cFv.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_801FD094: -/* 801FD094 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FD098 7C 08 02 A6 */ mflr r0 -/* 801FD09C 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FD0A0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FD0A4 7C 7F 1B 78 */ mr r31, r3 -/* 801FD0A8 80 03 01 38 */ lwz r0, 0x138(r3) -/* 801FD0AC 2C 00 00 00 */ cmpwi r0, 0 -/* 801FD0B0 40 82 00 10 */ bne lbl_801FD0C0 -/* 801FD0B4 80 7F 01 00 */ lwz r3, 0x100(r31) -/* 801FD0B8 48 0D 16 CD */ bl getTotalFreeSize__7JKRHeapFv -/* 801FD0BC 90 7F 01 38 */ stw r3, 0x138(r31) -lbl_801FD0C0: -/* 801FD0C0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FD0C4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FD0C8 7C 08 03 A6 */ mtlr r0 -/* 801FD0CC 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FD0D0 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/ring_close_proc__5dMw_cFv.s b/asm/d/menu/d_menu_window/ring_close_proc__5dMw_cFv.s deleted file mode 100644 index ed74f24a07..0000000000 --- a/asm/d/menu/d_menu_window/ring_close_proc__5dMw_cFv.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_801FB064: -/* 801FB064 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FB068 7C 08 02 A6 */ mflr r0 -/* 801FB06C 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FB070 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FB074 7C 7F 1B 78 */ mr r31, r3 -/* 801FB078 80 63 01 10 */ lwz r3, 0x110(r3) -/* 801FB07C 4B FF 03 51 */ bl isClose__12dMenu_Ring_cFv -/* 801FB080 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801FB084 41 82 00 20 */ beq lbl_801FB0A4 -/* 801FB088 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801FB08C 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801FB090 A0 03 00 98 */ lhz r0, 0x98(r3) -/* 801FB094 54 00 07 B8 */ rlwinm r0, r0, 0, 0x1e, 0x1c -/* 801FB098 B0 03 00 98 */ sth r0, 0x98(r3) -/* 801FB09C 38 00 00 00 */ li r0, 0 -/* 801FB0A0 98 1F 01 46 */ stb r0, 0x146(r31) -lbl_801FB0A4: -/* 801FB0A4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FB0A8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FB0AC 7C 08 03 A6 */ mtlr r0 -/* 801FB0B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FB0B4 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/ring_move_proc__5dMw_cFv.s b/asm/d/menu/d_menu_window/ring_move_proc__5dMw_cFv.s deleted file mode 100644 index 986f8955e1..0000000000 --- a/asm/d/menu/d_menu_window/ring_move_proc__5dMw_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_801FB01C: -/* 801FB01C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FB020 7C 08 02 A6 */ mflr r0 -/* 801FB024 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FB028 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FB02C 7C 7F 1B 78 */ mr r31, r3 -/* 801FB030 80 63 01 10 */ lwz r3, 0x110(r3) -/* 801FB034 4B FE FB B9 */ bl _move__12dMenu_Ring_cFv -/* 801FB038 80 7F 01 10 */ lwz r3, 0x110(r31) -/* 801FB03C 4B FF 02 79 */ bl isMoveEnd__12dMenu_Ring_cFv -/* 801FB040 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801FB044 41 82 00 0C */ beq lbl_801FB050 -/* 801FB048 38 00 00 03 */ li r0, 3 -/* 801FB04C 98 1F 01 46 */ stb r0, 0x146(r31) -lbl_801FB050: -/* 801FB050 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FB054 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FB058 7C 08 03 A6 */ mtlr r0 -/* 801FB05C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FB060 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/ring_open_proc__5dMw_cFv.s b/asm/d/menu/d_menu_window/ring_open_proc__5dMw_cFv.s deleted file mode 100644 index 2aab6a9c85..0000000000 --- a/asm/d/menu/d_menu_window/ring_open_proc__5dMw_cFv.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_801FAFDC: -/* 801FAFDC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801FAFE0 7C 08 02 A6 */ mflr r0 -/* 801FAFE4 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FAFE8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801FAFEC 7C 7F 1B 78 */ mr r31, r3 -/* 801FAFF0 80 63 01 10 */ lwz r3, 0x110(r3) -/* 801FAFF4 4B FF 00 B1 */ bl isOpen__12dMenu_Ring_cFv -/* 801FAFF8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801FAFFC 41 82 00 0C */ beq lbl_801FB008 -/* 801FB000 38 00 00 02 */ li r0, 2 -/* 801FB004 98 1F 01 46 */ stb r0, 0x146(r31) -lbl_801FB008: -/* 801FB008 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801FB00C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FB010 7C 08 03 A6 */ mtlr r0 -/* 801FB014 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FB018 4E 80 00 20 */ blr |