diff --git a/asm/d/file/d_file_select/CmdExecPaneMove0__14dFile_select_cFv.s b/asm/d/file/d_file_select/CmdExecPaneMove0__14dFile_select_cFv.s deleted file mode 100644 index 91c1560b8c3..00000000000 --- a/asm/d/file/d_file_select/CmdExecPaneMove0__14dFile_select_cFv.s +++ /dev/null @@ -1,142 +0,0 @@ -lbl_80189C14: -/* 80189C14 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80189C18 7C 08 02 A6 */ mflr r0 -/* 80189C1C 90 01 00 34 */ stw r0, 0x34(r1) -/* 80189C20 39 61 00 30 */ addi r11, r1, 0x30 -/* 80189C24 48 1D 85 A5 */ bl _savegpr_24 -/* 80189C28 7C 7E 1B 78 */ mr r30, r3 -/* 80189C2C 48 00 36 31 */ bl headerTxtChangeAnm__14dFile_select_cFv -/* 80189C30 54 7F 06 3E */ clrlwi r31, r3, 0x18 -/* 80189C34 88 1E 02 6E */ lbz r0, 0x26e(r30) -/* 80189C38 2C 00 00 01 */ cmpwi r0, 1 -/* 80189C3C 41 82 00 20 */ beq lbl_80189C5C -/* 80189C40 40 80 00 10 */ bge lbl_80189C50 -/* 80189C44 2C 00 00 00 */ cmpwi r0, 0 -/* 80189C48 40 80 00 B4 */ bge lbl_80189CFC -/* 80189C4C 48 00 01 48 */ b lbl_80189D94 -lbl_80189C50: -/* 80189C50 2C 00 00 03 */ cmpwi r0, 3 -/* 80189C54 40 80 01 40 */ bge lbl_80189D94 -/* 80189C58 48 00 00 58 */ b lbl_80189CB0 -lbl_80189C5C: -/* 80189C5C 88 1E 02 65 */ lbz r0, 0x265(r30) -/* 80189C60 54 00 10 3A */ slwi r0, r0, 2 -/* 80189C64 7C 7E 02 14 */ add r3, r30, r0 -/* 80189C68 80 63 01 4C */ lwz r3, 0x14c(r3) -/* 80189C6C 3C 80 80 43 */ lis r4, g_fsHIO@ha /* 0x8042C9EC@ha */ -/* 80189C70 38 84 C9 EC */ addi r4, r4, g_fsHIO@l /* 0x8042C9EC@l */ -/* 80189C74 88 84 00 09 */ lbz r4, 9(r4) -/* 80189C78 38 A0 00 00 */ li r5, 0 -/* 80189C7C 38 C0 00 FF */ li r6, 0xff -/* 80189C80 38 E0 00 00 */ li r7, 0 -/* 80189C84 48 0C BB F5 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc -/* 80189C88 54 7C 06 3E */ clrlwi r28, r3, 0x18 -/* 80189C8C 7F C3 F3 78 */ mr r3, r30 -/* 80189C90 4B FF F0 A9 */ bl yesnoMenuMoveAnm__14dFile_select_cFv -/* 80189C94 54 7D 06 3E */ clrlwi r29, r3, 0x18 -/* 80189C98 7F C3 F3 78 */ mr r3, r30 -/* 80189C9C 4B FF D0 11 */ bl menuMoveAnm__14dFile_select_cFv -/* 80189CA0 54 7B 06 3E */ clrlwi r27, r3, 0x18 -/* 80189CA4 3B 40 00 01 */ li r26, 1 -/* 80189CA8 3B 20 00 01 */ li r25, 1 -/* 80189CAC 48 00 00 E8 */ b lbl_80189D94 -lbl_80189CB0: -/* 80189CB0 88 1E 02 65 */ lbz r0, 0x265(r30) -/* 80189CB4 54 00 10 3A */ slwi r0, r0, 2 -/* 80189CB8 7C 7E 02 14 */ add r3, r30, r0 -/* 80189CBC 80 63 01 4C */ lwz r3, 0x14c(r3) -/* 80189CC0 3C 80 80 43 */ lis r4, g_fsHIO@ha /* 0x8042C9EC@ha */ -/* 80189CC4 38 84 C9 EC */ addi r4, r4, g_fsHIO@l /* 0x8042C9EC@l */ -/* 80189CC8 88 84 00 09 */ lbz r4, 9(r4) -/* 80189CCC 38 A0 00 00 */ li r5, 0 -/* 80189CD0 38 C0 00 FF */ li r6, 0xff -/* 80189CD4 38 E0 00 00 */ li r7, 0 -/* 80189CD8 48 0C BB A1 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc -/* 80189CDC 54 7C 06 3E */ clrlwi r28, r3, 0x18 -/* 80189CE0 3B A0 00 01 */ li r29, 1 -/* 80189CE4 7F C3 F3 78 */ mr r3, r30 -/* 80189CE8 4B FF F0 51 */ bl yesnoMenuMoveAnm__14dFile_select_cFv -/* 80189CEC 54 7B 06 3E */ clrlwi r27, r3, 0x18 -/* 80189CF0 3B 40 00 01 */ li r26, 1 -/* 80189CF4 3B 20 00 01 */ li r25, 1 -/* 80189CF8 48 00 00 9C */ b lbl_80189D94 -lbl_80189CFC: -/* 80189CFC 88 1E 02 6D */ lbz r0, 0x26d(r30) -/* 80189D00 54 00 10 3A */ slwi r0, r0, 2 -/* 80189D04 7C 7E 02 14 */ add r3, r30, r0 -/* 80189D08 80 63 01 58 */ lwz r3, 0x158(r3) -/* 80189D0C 3C 80 80 43 */ lis r4, g_fsHIO@ha /* 0x8042C9EC@ha */ -/* 80189D10 3B A4 C9 EC */ addi r29, r4, g_fsHIO@l /* 0x8042C9EC@l */ -/* 80189D14 88 9D 00 09 */ lbz r4, 9(r29) -/* 80189D18 38 A0 00 00 */ li r5, 0 -/* 80189D1C 38 C0 00 FF */ li r6, 0xff -/* 80189D20 38 E0 00 00 */ li r7, 0 -/* 80189D24 48 0C BB 55 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc -/* 80189D28 54 7C 06 3E */ clrlwi r28, r3, 0x18 -/* 80189D2C 88 1E 02 65 */ lbz r0, 0x265(r30) -/* 80189D30 54 00 10 3A */ slwi r0, r0, 2 -/* 80189D34 7C 7E 02 14 */ add r3, r30, r0 -/* 80189D38 80 63 01 58 */ lwz r3, 0x158(r3) -/* 80189D3C 88 9D 00 09 */ lbz r4, 9(r29) -/* 80189D40 38 A0 00 00 */ li r5, 0 -/* 80189D44 38 C0 00 FF */ li r6, 0xff -/* 80189D48 38 E0 00 00 */ li r7, 0 -/* 80189D4C 48 0C BB 2D */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc -/* 80189D50 54 7D 06 3E */ clrlwi r29, r3, 0x18 -/* 80189D54 88 1E 01 08 */ lbz r0, 0x108(r30) -/* 80189D58 28 00 00 00 */ cmplwi r0, 0 -/* 80189D5C 41 82 00 14 */ beq lbl_80189D70 -/* 80189D60 7F C3 F3 78 */ mr r3, r30 -/* 80189D64 4B FF EF D5 */ bl yesnoMenuMoveAnm__14dFile_select_cFv -/* 80189D68 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80189D6C 48 00 00 08 */ b lbl_80189D74 -lbl_80189D70: -/* 80189D70 38 00 00 01 */ li r0, 1 -lbl_80189D74: -/* 80189D74 7C 1B 03 78 */ mr r27, r0 -/* 80189D78 7F C3 F3 78 */ mr r3, r30 -/* 80189D7C 88 9E 02 6D */ lbz r4, 0x26d(r30) -/* 80189D80 48 00 39 0D */ bl selectWakuAlpahAnm__14dFile_select_cFUc -/* 80189D84 54 7A 06 3E */ clrlwi r26, r3, 0x18 -/* 80189D88 7F C3 F3 78 */ mr r3, r30 -/* 80189D8C 48 00 63 99 */ bl nameMoveAnm__14dFile_select_cFv -/* 80189D90 54 79 06 3E */ clrlwi r25, r3, 0x18 -lbl_80189D94: -/* 80189D94 7F C3 F3 78 */ mr r3, r30 -/* 80189D98 48 00 36 85 */ bl modoruTxtDispAnm__14dFile_select_cFv -/* 80189D9C 54 78 06 3E */ clrlwi r24, r3, 0x18 -/* 80189DA0 7F C3 F3 78 */ mr r3, r30 -/* 80189DA4 48 00 37 D1 */ bl ketteiTxtDispAnm__14dFile_select_cFv -/* 80189DA8 54 64 06 3E */ clrlwi r4, r3, 0x18 -/* 80189DAC 80 7E 00 6C */ lwz r3, 0x6c(r30) -/* 80189DB0 88 63 00 3D */ lbz r3, 0x3d(r3) -/* 80189DB4 30 03 FF FF */ addic r0, r3, -1 -/* 80189DB8 7C 00 19 10 */ subfe r0, r0, r3 -/* 80189DBC 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 80189DC0 2C 1F 00 01 */ cmpwi r31, 1 -/* 80189DC4 40 82 00 4C */ bne lbl_80189E10 -/* 80189DC8 2C 1C 00 01 */ cmpwi r28, 1 -/* 80189DCC 40 82 00 44 */ bne lbl_80189E10 -/* 80189DD0 2C 1D 00 01 */ cmpwi r29, 1 -/* 80189DD4 40 82 00 3C */ bne lbl_80189E10 -/* 80189DD8 2C 1B 00 01 */ cmpwi r27, 1 -/* 80189DDC 40 82 00 34 */ bne lbl_80189E10 -/* 80189DE0 2C 1A 00 01 */ cmpwi r26, 1 -/* 80189DE4 40 82 00 2C */ bne lbl_80189E10 -/* 80189DE8 2C 19 00 01 */ cmpwi r25, 1 -/* 80189DEC 40 82 00 24 */ bne lbl_80189E10 -/* 80189DF0 2C 18 00 01 */ cmpwi r24, 1 -/* 80189DF4 40 82 00 1C */ bne lbl_80189E10 -/* 80189DF8 2C 04 00 01 */ cmpwi r4, 1 -/* 80189DFC 40 82 00 14 */ bne lbl_80189E10 -/* 80189E00 2C 00 00 01 */ cmpwi r0, 1 -/* 80189E04 40 82 00 0C */ bne lbl_80189E10 -/* 80189E08 38 00 00 1E */ li r0, 0x1e -/* 80189E0C 98 1E 02 6F */ stb r0, 0x26f(r30) -lbl_80189E10: -/* 80189E10 39 61 00 30 */ addi r11, r1, 0x30 -/* 80189E14 48 1D 84 01 */ bl _restgpr_24 -/* 80189E18 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80189E1C 7C 08 03 A6 */ mtlr r0 -/* 80189E20 38 21 00 30 */ addi r1, r1, 0x30 -/* 80189E24 4E 80 00 20 */ blr diff --git a/asm/d/file/d_file_select/ErasePaneMoveOk2__14dFile_select_cFv.s b/asm/d/file/d_file_select/ErasePaneMoveOk2__14dFile_select_cFv.s deleted file mode 100644 index f193666f5a5..00000000000 --- a/asm/d/file/d_file_select/ErasePaneMoveOk2__14dFile_select_cFv.s +++ /dev/null @@ -1,55 +0,0 @@ -lbl_8018A2DC: -/* 8018A2DC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8018A2E0 7C 08 02 A6 */ mflr r0 -/* 8018A2E4 90 01 00 24 */ stw r0, 0x24(r1) -/* 8018A2E8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8018A2EC 48 1D 7E F1 */ bl _savegpr_29 -/* 8018A2F0 7C 7F 1B 78 */ mr r31, r3 -/* 8018A2F4 48 00 2F 69 */ bl headerTxtChangeAnm__14dFile_select_cFv -/* 8018A2F8 7C 7D 1B 78 */ mr r29, r3 -/* 8018A2FC 88 1F 02 65 */ lbz r0, 0x265(r31) -/* 8018A300 54 00 10 3A */ slwi r0, r0, 2 -/* 8018A304 7C 7F 02 14 */ add r3, r31, r0 -/* 8018A308 80 63 02 2C */ lwz r3, 0x22c(r3) -/* 8018A30C 3C 80 80 43 */ lis r4, g_fsHIO@ha /* 0x8042C9EC@ha */ -/* 8018A310 38 84 C9 EC */ addi r4, r4, g_fsHIO@l /* 0x8042C9EC@l */ -/* 8018A314 88 84 00 07 */ lbz r4, 7(r4) -/* 8018A318 38 A0 00 00 */ li r5, 0 -/* 8018A31C 38 C0 00 FF */ li r6, 0xff -/* 8018A320 38 E0 00 00 */ li r7, 0 -/* 8018A324 48 0C B5 55 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc -/* 8018A328 7C 7E 1B 78 */ mr r30, r3 -/* 8018A32C 7F E3 FB 78 */ mr r3, r31 -/* 8018A330 88 9F 02 65 */ lbz r4, 0x265(r31) -/* 8018A334 48 00 33 59 */ bl selectWakuAlpahAnm__14dFile_select_cFUc -/* 8018A338 80 9F 00 6C */ lwz r4, 0x6c(r31) -/* 8018A33C 88 84 00 3D */ lbz r4, 0x3d(r4) -/* 8018A340 30 04 FF FF */ addic r0, r4, -1 -/* 8018A344 7C 00 21 10 */ subfe r0, r0, r4 -/* 8018A348 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 8018A34C 57 A0 06 3E */ clrlwi r0, r29, 0x18 -/* 8018A350 28 00 00 01 */ cmplwi r0, 1 -/* 8018A354 40 82 00 44 */ bne lbl_8018A398 -/* 8018A358 57 C0 06 3E */ clrlwi r0, r30, 0x18 -/* 8018A35C 28 00 00 01 */ cmplwi r0, 1 -/* 8018A360 40 82 00 38 */ bne lbl_8018A398 -/* 8018A364 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8018A368 28 00 00 01 */ cmplwi r0, 1 -/* 8018A36C 40 82 00 2C */ bne lbl_8018A398 -/* 8018A370 28 04 00 01 */ cmplwi r4, 1 -/* 8018A374 40 82 00 24 */ bne lbl_8018A398 -/* 8018A378 3C 60 80 43 */ lis r3, g_fsHIO@ha /* 0x8042C9EC@ha */ -/* 8018A37C 38 63 C9 EC */ addi r3, r3, g_fsHIO@l /* 0x8042C9EC@l */ -/* 8018A380 88 03 00 0A */ lbz r0, 0xa(r3) -/* 8018A384 B0 1F 03 AC */ sth r0, 0x3ac(r31) -/* 8018A388 38 00 00 00 */ li r0, 0 -/* 8018A38C 98 1F 02 67 */ stb r0, 0x267(r31) -/* 8018A390 38 00 00 28 */ li r0, 0x28 -/* 8018A394 98 1F 02 6F */ stb r0, 0x26f(r31) -lbl_8018A398: -/* 8018A398 39 61 00 20 */ addi r11, r1, 0x20 -/* 8018A39C 48 1D 7E 8D */ bl _restgpr_29 -/* 8018A3A0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8018A3A4 7C 08 03 A6 */ mtlr r0 -/* 8018A3A8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8018A3AC 4E 80 00 20 */ blr diff --git a/asm/d/file/d_file_select/ErasePaneMoveOk__14dFile_select_cFv.s b/asm/d/file/d_file_select/ErasePaneMoveOk__14dFile_select_cFv.s deleted file mode 100644 index 7036adc161f..00000000000 --- a/asm/d/file/d_file_select/ErasePaneMoveOk__14dFile_select_cFv.s +++ /dev/null @@ -1,86 +0,0 @@ -lbl_8018A194: -/* 8018A194 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8018A198 7C 08 02 A6 */ mflr r0 -/* 8018A19C 90 01 00 24 */ stw r0, 0x24(r1) -/* 8018A1A0 39 61 00 20 */ addi r11, r1, 0x20 -/* 8018A1A4 48 1D 80 39 */ bl _savegpr_29 -/* 8018A1A8 7C 7F 1B 78 */ mr r31, r3 -/* 8018A1AC 88 03 02 65 */ lbz r0, 0x265(r3) -/* 8018A1B0 54 00 10 3A */ slwi r0, r0, 2 -/* 8018A1B4 7C 7F 02 14 */ add r3, r31, r0 -/* 8018A1B8 80 63 01 4C */ lwz r3, 0x14c(r3) -/* 8018A1BC 3C 80 80 43 */ lis r4, g_fsHIO@ha /* 0x8042C9EC@ha */ -/* 8018A1C0 3B C4 C9 EC */ addi r30, r4, g_fsHIO@l /* 0x8042C9EC@l */ -/* 8018A1C4 88 9E 00 09 */ lbz r4, 9(r30) -/* 8018A1C8 38 A0 00 FF */ li r5, 0xff -/* 8018A1CC 38 C0 00 00 */ li r6, 0 -/* 8018A1D0 38 E0 00 00 */ li r7, 0 -/* 8018A1D4 48 0C B6 A5 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc -/* 8018A1D8 54 7D 06 3E */ clrlwi r29, r3, 0x18 -/* 8018A1DC 88 9F 02 65 */ lbz r4, 0x265(r31) -/* 8018A1E0 7C 7F 22 14 */ add r3, r31, r4 -/* 8018A1E4 88 03 02 5B */ lbz r0, 0x25b(r3) -/* 8018A1E8 28 00 00 00 */ cmplwi r0, 0 -/* 8018A1EC 41 82 00 2C */ beq lbl_8018A218 -/* 8018A1F0 54 80 10 3A */ slwi r0, r4, 2 -/* 8018A1F4 7C 7F 02 14 */ add r3, r31, r0 -/* 8018A1F8 80 63 02 2C */ lwz r3, 0x22c(r3) -/* 8018A1FC 88 9E 00 09 */ lbz r4, 9(r30) -/* 8018A200 38 A0 00 FF */ li r5, 0xff -/* 8018A204 38 C0 00 00 */ li r6, 0 -/* 8018A208 38 E0 00 00 */ li r7, 0 -/* 8018A20C 48 0C B6 6D */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc -/* 8018A210 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8018A214 48 00 00 28 */ b lbl_8018A23C -lbl_8018A218: -/* 8018A218 54 80 10 3A */ slwi r0, r4, 2 -/* 8018A21C 7C 7F 02 14 */ add r3, r31, r0 -/* 8018A220 80 63 02 20 */ lwz r3, 0x220(r3) -/* 8018A224 88 9E 00 09 */ lbz r4, 9(r30) -/* 8018A228 38 A0 00 FF */ li r5, 0xff -/* 8018A22C 38 C0 00 00 */ li r6, 0 -/* 8018A230 38 E0 00 00 */ li r7, 0 -/* 8018A234 48 0C B6 45 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc -/* 8018A238 54 60 06 3E */ clrlwi r0, r3, 0x18 -lbl_8018A23C: -/* 8018A23C 2C 1D 00 01 */ cmpwi r29, 1 -/* 8018A240 40 82 00 84 */ bne lbl_8018A2C4 -/* 8018A244 2C 00 00 01 */ cmpwi r0, 1 -/* 8018A248 40 82 00 7C */ bne lbl_8018A2C4 -/* 8018A24C 38 00 00 00 */ li r0, 0 -/* 8018A250 98 1F 02 08 */ stb r0, 0x208(r31) -/* 8018A254 7F E3 FB 78 */ mr r3, r31 -/* 8018A258 48 00 2D ED */ bl setSaveData__14dFile_select_cFv -/* 8018A25C 7F E3 FB 78 */ mr r3, r31 -/* 8018A260 88 9F 02 65 */ lbz r4, 0x265(r31) -/* 8018A264 4B FF BE 25 */ bl makeRecInfo__14dFile_select_cFUc -/* 8018A268 7F E3 FB 78 */ mr r3, r31 -/* 8018A26C 38 80 00 4B */ li r4, 0x4b -/* 8018A270 38 A0 00 00 */ li r5, 0 -/* 8018A274 38 C0 00 00 */ li r6, 0 -/* 8018A278 48 00 2E 6D */ bl headerTxtSet__14dFile_select_cFUsUcUc -/* 8018A27C 80 7F 00 6C */ lwz r3, 0x6c(r31) -/* 8018A280 48 00 7E 8D */ bl closeInit__15dFile_warning_cFv -/* 8018A284 38 80 00 00 */ li r4, 0 -/* 8018A288 88 1F 02 65 */ lbz r0, 0x265(r31) -/* 8018A28C 54 00 10 3A */ slwi r0, r0, 2 -/* 8018A290 7C 7F 02 14 */ add r3, r31, r0 -/* 8018A294 80 63 02 2C */ lwz r3, 0x22c(r3) -/* 8018A298 B0 83 00 16 */ sth r4, 0x16(r3) -/* 8018A29C 7F E3 FB 78 */ mr r3, r31 -/* 8018A2A0 88 9F 02 65 */ lbz r4, 0x265(r31) -/* 8018A2A4 38 A0 00 00 */ li r5, 0 -/* 8018A2A8 38 C0 00 FF */ li r6, 0xff -/* 8018A2AC 3C E0 80 43 */ lis r7, g_fsHIO@ha /* 0x8042C9EC@ha */ -/* 8018A2B0 38 E7 C9 EC */ addi r7, r7, g_fsHIO@l /* 0x8042C9EC@l */ -/* 8018A2B4 88 E7 00 07 */ lbz r7, 7(r7) -/* 8018A2B8 48 00 33 99 */ bl selectWakuAlpahAnmInit__14dFile_select_cFUcUcUcUc -/* 8018A2BC 38 00 00 26 */ li r0, 0x26 -/* 8018A2C0 98 1F 02 6F */ stb r0, 0x26f(r31) -lbl_8018A2C4: -/* 8018A2C4 39 61 00 20 */ addi r11, r1, 0x20 -/* 8018A2C8 48 1D 7F 61 */ bl _restgpr_29 -/* 8018A2CC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8018A2D0 7C 08 03 A6 */ mtlr r0 -/* 8018A2D4 38 21 00 20 */ addi r1, r1, 0x20 -/* 8018A2D8 4E 80 00 20 */ blr diff --git a/asm/d/file/d_file_select/ErrorMsgPaneMove__14dFile_select_cFv.s b/asm/d/file/d_file_select/ErrorMsgPaneMove__14dFile_select_cFv.s deleted file mode 100644 index faf22ffb5c0..00000000000 --- a/asm/d/file/d_file_select/ErrorMsgPaneMove__14dFile_select_cFv.s +++ /dev/null @@ -1,93 +0,0 @@ -lbl_8018A960: -/* 8018A960 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8018A964 7C 08 02 A6 */ mflr r0 -/* 8018A968 90 01 00 24 */ stw r0, 0x24(r1) -/* 8018A96C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8018A970 48 1D 78 65 */ bl _savegpr_27 -/* 8018A974 7C 7E 1B 78 */ mr r30, r3 -/* 8018A978 48 00 28 E5 */ bl headerTxtChangeAnm__14dFile_select_cFv -/* 8018A97C 54 7F 06 3E */ clrlwi r31, r3, 0x18 -/* 8018A980 88 1E 02 6E */ lbz r0, 0x26e(r30) -/* 8018A984 2C 00 00 00 */ cmpwi r0, 0 -/* 8018A988 41 82 00 48 */ beq lbl_8018A9D0 -/* 8018A98C 41 80 00 9C */ blt lbl_8018AA28 -/* 8018A990 2C 00 00 03 */ cmpwi r0, 3 -/* 8018A994 40 80 00 94 */ bge lbl_8018AA28 -/* 8018A998 88 1E 02 65 */ lbz r0, 0x265(r30) -/* 8018A99C 54 00 10 3A */ slwi r0, r0, 2 -/* 8018A9A0 7C 7E 02 14 */ add r3, r30, r0 -/* 8018A9A4 80 63 01 4C */ lwz r3, 0x14c(r3) -/* 8018A9A8 3C 80 80 43 */ lis r4, g_fsHIO@ha /* 0x8042C9EC@ha */ -/* 8018A9AC 38 84 C9 EC */ addi r4, r4, g_fsHIO@l /* 0x8042C9EC@l */ -/* 8018A9B0 88 84 00 09 */ lbz r4, 9(r4) -/* 8018A9B4 38 A0 00 FF */ li r5, 0xff -/* 8018A9B8 38 C0 00 00 */ li r6, 0 -/* 8018A9BC 38 E0 00 00 */ li r7, 0 -/* 8018A9C0 48 0C AE B9 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc -/* 8018A9C4 54 7C 06 3E */ clrlwi r28, r3, 0x18 -/* 8018A9C8 3B A0 00 01 */ li r29, 1 -/* 8018A9CC 48 00 00 5C */ b lbl_8018AA28 -lbl_8018A9D0: -/* 8018A9D0 88 1E 02 6D */ lbz r0, 0x26d(r30) -/* 8018A9D4 54 00 10 3A */ slwi r0, r0, 2 -/* 8018A9D8 7C 7E 02 14 */ add r3, r30, r0 -/* 8018A9DC 80 63 01 58 */ lwz r3, 0x158(r3) -/* 8018A9E0 3C 80 80 43 */ lis r4, g_fsHIO@ha /* 0x8042C9EC@ha */ -/* 8018A9E4 3B A4 C9 EC */ addi r29, r4, g_fsHIO@l /* 0x8042C9EC@l */ -/* 8018A9E8 88 9D 00 09 */ lbz r4, 9(r29) -/* 8018A9EC 38 A0 00 FF */ li r5, 0xff -/* 8018A9F0 38 C0 00 00 */ li r6, 0 -/* 8018A9F4 38 E0 00 00 */ li r7, 0 -/* 8018A9F8 48 0C AE 81 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc -/* 8018A9FC 54 7C 06 3E */ clrlwi r28, r3, 0x18 -/* 8018AA00 88 1E 02 65 */ lbz r0, 0x265(r30) -/* 8018AA04 54 00 10 3A */ slwi r0, r0, 2 -/* 8018AA08 7C 7E 02 14 */ add r3, r30, r0 -/* 8018AA0C 80 63 01 58 */ lwz r3, 0x158(r3) -/* 8018AA10 88 9D 00 09 */ lbz r4, 9(r29) -/* 8018AA14 38 A0 00 FF */ li r5, 0xff -/* 8018AA18 38 C0 00 00 */ li r6, 0 -/* 8018AA1C 38 E0 00 00 */ li r7, 0 -/* 8018AA20 48 0C AE 59 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc -/* 8018AA24 54 7D 06 3E */ clrlwi r29, r3, 0x18 -lbl_8018AA28: -/* 8018AA28 7F C3 F3 78 */ mr r3, r30 -/* 8018AA2C 48 00 29 F1 */ bl modoruTxtDispAnm__14dFile_select_cFv -/* 8018AA30 54 7B 06 3E */ clrlwi r27, r3, 0x18 -/* 8018AA34 7F C3 F3 78 */ mr r3, r30 -/* 8018AA38 48 00 2B 3D */ bl ketteiTxtDispAnm__14dFile_select_cFv -/* 8018AA3C 54 64 06 3E */ clrlwi r4, r3, 0x18 -/* 8018AA40 80 7E 00 6C */ lwz r3, 0x6c(r30) -/* 8018AA44 88 63 00 3D */ lbz r3, 0x3d(r3) -/* 8018AA48 30 03 FF FF */ addic r0, r3, -1 -/* 8018AA4C 7C 00 19 10 */ subfe r0, r0, r3 -/* 8018AA50 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 8018AA54 2C 1F 00 01 */ cmpwi r31, 1 -/* 8018AA58 40 82 00 54 */ bne lbl_8018AAAC -/* 8018AA5C 2C 1C 00 01 */ cmpwi r28, 1 -/* 8018AA60 40 82 00 4C */ bne lbl_8018AAAC -/* 8018AA64 2C 1D 00 01 */ cmpwi r29, 1 -/* 8018AA68 40 82 00 44 */ bne lbl_8018AAAC -/* 8018AA6C 2C 1B 00 01 */ cmpwi r27, 1 -/* 8018AA70 40 82 00 3C */ bne lbl_8018AAAC -/* 8018AA74 2C 04 00 01 */ cmpwi r4, 1 -/* 8018AA78 40 82 00 34 */ bne lbl_8018AAAC -/* 8018AA7C 2C 00 00 01 */ cmpwi r0, 1 -/* 8018AA80 40 82 00 2C */ bne lbl_8018AAAC -/* 8018AA84 38 00 00 00 */ li r0, 0 -/* 8018AA88 98 1E 02 08 */ stb r0, 0x208(r30) -/* 8018AA8C 98 1E 02 09 */ stb r0, 0x209(r30) -/* 8018AA90 98 1E 03 B1 */ stb r0, 0x3b1(r30) -/* 8018AA94 3C 60 80 43 */ lis r3, g_fsHIO@ha /* 0x8042C9EC@ha */ -/* 8018AA98 38 63 C9 EC */ addi r3, r3, g_fsHIO@l /* 0x8042C9EC@l */ -/* 8018AA9C 88 03 00 0A */ lbz r0, 0xa(r3) -/* 8018AAA0 B0 1E 03 AC */ sth r0, 0x3ac(r30) -/* 8018AAA4 38 00 00 2B */ li r0, 0x2b -/* 8018AAA8 98 1E 02 6F */ stb r0, 0x26f(r30) -lbl_8018AAAC: -/* 8018AAAC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8018AAB0 48 1D 77 71 */ bl _restgpr_27 -/* 8018AAB4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8018AAB8 7C 08 03 A6 */ mtlr r0 -/* 8018AABC 38 21 00 20 */ addi r1, r1, 0x20 -/* 8018AAC0 4E 80 00 20 */ blr diff --git a/asm/d/file/d_file_select/MemCardCheckMain__14dFile_select_cFv.s b/asm/d/file/d_file_select/MemCardCheckMain__14dFile_select_cFv.s deleted file mode 100644 index 94b20c7953d..00000000000 --- a/asm/d/file/d_file_select/MemCardCheckMain__14dFile_select_cFv.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_8018E4CC: -/* 8018E4CC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8018E4D0 7C 08 02 A6 */ mflr r0 -/* 8018E4D4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8018E4D8 88 03 02 71 */ lbz r0, 0x271(r3) -/* 8018E4DC 1C A0 00 0C */ mulli r5, r0, 0xc -/* 8018E4E0 3C 80 80 3C */ lis r4, MemCardCheckProc@ha /* 0x803BB12C@ha */ -/* 8018E4E4 38 04 B1 2C */ addi r0, r4, MemCardCheckProc@l /* 0x803BB12C@l */ -/* 8018E4E8 7D 80 2A 14 */ add r12, r0, r5 -/* 8018E4EC 48 1D 3B 99 */ bl __ptmf_scall -/* 8018E4F0 60 00 00 00 */ nop -/* 8018E4F4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8018E4F8 7C 08 03 A6 */ mtlr r0 -/* 8018E4FC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8018E500 4E 80 00 20 */ blr diff --git a/asm/d/file/d_file_select/MemCardErrMsgWaitFormatSel2__14dFile_select_cFv.s b/asm/d/file/d_file_select/MemCardErrMsgWaitFormatSel2__14dFile_select_cFv.s deleted file mode 100644 index 43d75dbe14a..00000000000 --- a/asm/d/file/d_file_select/MemCardErrMsgWaitFormatSel2__14dFile_select_cFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_8018F1CC: -/* 8018F1CC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8018F1D0 7C 08 02 A6 */ mflr r0 -/* 8018F1D4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8018F1D8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8018F1DC 7C 7F 1B 78 */ mr r31, r3 -/* 8018F1E0 48 00 08 4D */ bl errYesNoSelect__14dFile_select_cFv -/* 8018F1E4 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8018F1E8 41 82 00 2C */ beq lbl_8018F214 -/* 8018F1EC 88 1F 02 68 */ lbz r0, 0x268(r31) -/* 8018F1F0 28 00 00 00 */ cmplwi r0, 0 -/* 8018F1F4 41 82 00 18 */ beq lbl_8018F20C -/* 8018F1F8 38 00 00 01 */ li r0, 1 -/* 8018F1FC 98 1F 03 B1 */ stb r0, 0x3b1(r31) -/* 8018F200 7F E3 FB 78 */ mr r3, r31 -/* 8018F204 4B FF FF 79 */ bl formatYesSel2DispInitSet__14dFile_select_cFv -/* 8018F208 48 00 00 0C */ b lbl_8018F214 -lbl_8018F20C: -/* 8018F20C 7F E3 FB 78 */ mr r3, r31 -/* 8018F210 4B FF FD 9D */ bl formatNoSelDispInitSet__14dFile_select_cFv -lbl_8018F214: -/* 8018F214 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8018F218 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8018F21C 7C 08 03 A6 */ mtlr r0 -/* 8018F220 38 21 00 10 */ addi r1, r1, 0x10 -/* 8018F224 4E 80 00 20 */ blr diff --git a/asm/d/file/d_file_select/MemCardErrMsgWaitFormatSel__14dFile_select_cFv.s b/asm/d/file/d_file_select/MemCardErrMsgWaitFormatSel__14dFile_select_cFv.s deleted file mode 100644 index 7fb9142373c..00000000000 --- a/asm/d/file/d_file_select/MemCardErrMsgWaitFormatSel__14dFile_select_cFv.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_8018F128: -/* 8018F128 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8018F12C 7C 08 02 A6 */ mflr r0 -/* 8018F130 90 01 00 14 */ stw r0, 0x14(r1) -/* 8018F134 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8018F138 7C 7F 1B 78 */ mr r31, r3 -/* 8018F13C 48 00 08 F1 */ bl errYesNoSelect__14dFile_select_cFv -/* 8018F140 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8018F144 41 82 00 24 */ beq lbl_8018F168 -/* 8018F148 88 1F 02 68 */ lbz r0, 0x268(r31) -/* 8018F14C 28 00 00 00 */ cmplwi r0, 0 -/* 8018F150 41 82 00 10 */ beq lbl_8018F160 -/* 8018F154 7F E3 FB 78 */ mr r3, r31 -/* 8018F158 4B FF FE 05 */ bl formatYesSelDispInitSet__14dFile_select_cFv -/* 8018F15C 48 00 00 0C */ b lbl_8018F168 -lbl_8018F160: -/* 8018F160 7F E3 FB 78 */ mr r3, r31 -/* 8018F164 4B FF FE 49 */ bl formatNoSelDispInitSet__14dFile_select_cFv -lbl_8018F168: -/* 8018F168 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8018F16C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8018F170 7C 08 03 A6 */ mtlr r0 -/* 8018F174 38 21 00 10 */ addi r1, r1, 0x10 -/* 8018F178 4E 80 00 20 */ blr diff --git a/asm/d/file/d_file_select/MemCardErrMsgWaitKey__14dFile_select_cFv.s b/asm/d/file/d_file_select/MemCardErrMsgWaitKey__14dFile_select_cFv.s deleted file mode 100644 index c3047480860..00000000000 --- a/asm/d/file/d_file_select/MemCardErrMsgWaitKey__14dFile_select_cFv.s +++ /dev/null @@ -1,32 +0,0 @@ -lbl_8018E93C: -/* 8018E93C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8018E940 7C 08 02 A6 */ mflr r0 -/* 8018E944 90 01 00 14 */ stw r0, 0x14(r1) -/* 8018E948 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8018E94C 7C 7F 1B 78 */ mr r31, r3 -/* 8018E950 38 60 00 00 */ li r3, 0 -/* 8018E954 48 0D 49 59 */ bl cAPICPad_ANY_BUTTON__FUl -/* 8018E958 28 03 00 00 */ cmplwi r3, 0 -/* 8018E95C 41 82 00 40 */ beq lbl_8018E99C -/* 8018E960 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 8018E964 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 8018E968 A8 03 00 94 */ lha r0, 0x94(r3) -/* 8018E96C 2C 00 00 00 */ cmpwi r0, 0 -/* 8018E970 40 82 00 2C */ bne lbl_8018E99C -/* 8018E974 38 7F 02 90 */ addi r3, r31, 0x290 -/* 8018E978 48 1D 36 A1 */ bl __ptmf_test -/* 8018E97C 2C 03 00 00 */ cmpwi r3, 0 -/* 8018E980 41 82 00 14 */ beq lbl_8018E994 -/* 8018E984 7F E3 FB 78 */ mr r3, r31 -/* 8018E988 39 9F 02 90 */ addi r12, r31, 0x290 -/* 8018E98C 48 1D 36 F9 */ bl __ptmf_scall -/* 8018E990 60 00 00 00 */ nop -lbl_8018E994: -/* 8018E994 88 1F 02 74 */ lbz r0, 0x274(r31) -/* 8018E998 98 1F 02 71 */ stb r0, 0x271(r31) -lbl_8018E99C: -/* 8018E99C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8018E9A0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8018E9A4 7C 08 03 A6 */ mtlr r0 -/* 8018E9A8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8018E9AC 4E 80 00 20 */ blr diff --git a/asm/d/file/d_file_select/MemCardErrYesNoCursorMoveAnm__14dFile_select_cFv.s b/asm/d/file/d_file_select/MemCardErrYesNoCursorMoveAnm__14dFile_select_cFv.s deleted file mode 100644 index 4645df14658..00000000000 --- a/asm/d/file/d_file_select/MemCardErrYesNoCursorMoveAnm__14dFile_select_cFv.s +++ /dev/null @@ -1,29 +0,0 @@ -lbl_8018FBF8: -/* 8018FBF8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8018FBFC 7C 08 02 A6 */ mflr r0 -/* 8018FC00 90 01 00 14 */ stw r0, 0x14(r1) -/* 8018FC04 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8018FC08 93 C1 00 08 */ stw r30, 8(r1) -/* 8018FC0C 7C 7E 1B 78 */ mr r30, r3 -/* 8018FC10 4B FF 92 C1 */ bl yesnoSelectMoveAnm__14dFile_select_cFv -/* 8018FC14 7C 7F 1B 78 */ mr r31, r3 -/* 8018FC18 7F C3 F3 78 */ mr r3, r30 -/* 8018FC1C 88 9E 02 69 */ lbz r4, 0x269(r30) -/* 8018FC20 4B FF DF AD */ bl yesnoWakuAlpahAnm__14dFile_select_cFUc -/* 8018FC24 57 E0 06 3E */ clrlwi r0, r31, 0x18 -/* 8018FC28 28 00 00 01 */ cmplwi r0, 1 -/* 8018FC2C 40 82 00 20 */ bne lbl_8018FC4C -/* 8018FC30 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8018FC34 28 00 00 01 */ cmplwi r0, 1 -/* 8018FC38 40 82 00 14 */ bne lbl_8018FC4C -/* 8018FC3C 7F C3 F3 78 */ mr r3, r30 -/* 8018FC40 4B FF 94 ED */ bl yesnoCursorShow__14dFile_select_cFv -/* 8018FC44 88 1E 02 72 */ lbz r0, 0x272(r30) -/* 8018FC48 98 1E 02 71 */ stb r0, 0x271(r30) -lbl_8018FC4C: -/* 8018FC4C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8018FC50 83 C1 00 08 */ lwz r30, 8(r1) -/* 8018FC54 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8018FC58 7C 08 03 A6 */ mtlr r0 -/* 8018FC5C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8018FC60 4E 80 00 20 */ blr diff --git a/asm/d/file/d_file_select/MemCardFormatCheck__14dFile_select_cFv.s b/asm/d/file/d_file_select/MemCardFormatCheck__14dFile_select_cFv.s deleted file mode 100644 index bf8d4292409..00000000000 --- a/asm/d/file/d_file_select/MemCardFormatCheck__14dFile_select_cFv.s +++ /dev/null @@ -1,37 +0,0 @@ -lbl_8018F374: -/* 8018F374 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8018F378 7C 08 02 A6 */ mflr r0 -/* 8018F37C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8018F380 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8018F384 7C 7F 1B 78 */ mr r31, r3 -/* 8018F388 48 00 09 A9 */ bl errorTxtChangeAnm__14dFile_select_cFv -/* 8018F38C 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8018F390 28 00 00 01 */ cmplwi r0, 1 -/* 8018F394 40 82 00 58 */ bne lbl_8018F3EC -/* 8018F398 3C 60 80 3A */ lis r3, __ptmf_null@ha /* 0x803A2180@ha */ -/* 8018F39C 38 83 21 80 */ addi r4, r3, __ptmf_null@l /* 0x803A2180@l */ -/* 8018F3A0 80 64 00 00 */ lwz r3, 0(r4) -/* 8018F3A4 80 04 00 04 */ lwz r0, 4(r4) -/* 8018F3A8 90 7F 02 84 */ stw r3, 0x284(r31) -/* 8018F3AC 90 1F 02 88 */ stw r0, 0x288(r31) -/* 8018F3B0 80 04 00 08 */ lwz r0, 8(r4) -/* 8018F3B4 90 1F 02 8C */ stw r0, 0x28c(r31) -/* 8018F3B8 80 64 00 00 */ lwz r3, 0(r4) -/* 8018F3BC 80 04 00 04 */ lwz r0, 4(r4) -/* 8018F3C0 90 7F 02 90 */ stw r3, 0x290(r31) -/* 8018F3C4 90 1F 02 94 */ stw r0, 0x294(r31) -/* 8018F3C8 80 04 00 08 */ lwz r0, 8(r4) -/* 8018F3CC 90 1F 02 98 */ stw r0, 0x298(r31) -/* 8018F3D0 38 60 00 00 */ li r3, 0 -/* 8018F3D4 98 7F 02 73 */ stb r3, 0x273(r31) -/* 8018F3D8 38 00 00 18 */ li r0, 0x18 -/* 8018F3DC 98 1F 02 74 */ stb r0, 0x274(r31) -/* 8018F3E0 38 00 00 02 */ li r0, 2 -/* 8018F3E4 98 1F 02 71 */ stb r0, 0x271(r31) -/* 8018F3E8 98 7F 03 B1 */ stb r3, 0x3b1(r31) -lbl_8018F3EC: -/* 8018F3EC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8018F3F0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8018F3F4 7C 08 03 A6 */ mtlr r0 -/* 8018F3F8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8018F3FC 4E 80 00 20 */ blr diff --git a/asm/d/file/d_file_select/MemCardFormatWait__14dFile_select_cFv.s b/asm/d/file/d_file_select/MemCardFormatWait__14dFile_select_cFv.s deleted file mode 100644 index 77e0d13e2c8..00000000000 --- a/asm/d/file/d_file_select/MemCardFormatWait__14dFile_select_cFv.s +++ /dev/null @@ -1,33 +0,0 @@ -lbl_8018F304: -/* 8018F304 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8018F308 7C 08 02 A6 */ mflr r0 -/* 8018F30C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8018F310 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8018F314 7C 7F 1B 78 */ mr r31, r3 -/* 8018F318 A8 83 03 AC */ lha r4, 0x3ac(r3) -/* 8018F31C 2C 04 00 00 */ cmpwi r4, 0 -/* 8018F320 41 82 00 10 */ beq lbl_8018F330 -/* 8018F324 38 04 FF FF */ addi r0, r4, -1 -/* 8018F328 B0 1F 03 AC */ sth r0, 0x3ac(r31) -/* 8018F32C 48 00 00 34 */ b lbl_8018F360 -lbl_8018F330: -/* 8018F330 80 1F 03 B4 */ lwz r0, 0x3b4(r31) -/* 8018F334 2C 00 00 02 */ cmpwi r0, 2 -/* 8018F338 40 82 00 10 */ bne lbl_8018F348 -/* 8018F33C 38 80 00 0B */ li r4, 0xb -/* 8018F340 48 00 09 25 */ bl errorTxtSet__14dFile_select_cFUs -/* 8018F344 48 00 00 14 */ b lbl_8018F358 -lbl_8018F348: -/* 8018F348 2C 00 00 01 */ cmpwi r0, 1 -/* 8018F34C 40 82 00 0C */ bne lbl_8018F358 -/* 8018F350 38 80 00 0C */ li r4, 0xc -/* 8018F354 48 00 09 11 */ bl errorTxtSet__14dFile_select_cFUs -lbl_8018F358: -/* 8018F358 38 00 00 0C */ li r0, 0xc -/* 8018F35C 98 1F 02 71 */ stb r0, 0x271(r31) -lbl_8018F360: -/* 8018F360 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8018F364 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8018F368 7C 08 03 A6 */ mtlr r0 -/* 8018F36C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8018F370 4E 80 00 20 */ blr diff --git a/asm/d/file/d_file_select/MemCardFormatYesSel2Disp__14dFile_select_cFv.s b/asm/d/file/d_file_select/MemCardFormatYesSel2Disp__14dFile_select_cFv.s deleted file mode 100644 index dfa1c8322be..00000000000 --- a/asm/d/file/d_file_select/MemCardFormatYesSel2Disp__14dFile_select_cFv.s +++ /dev/null @@ -1,33 +0,0 @@ -lbl_8018F228: -/* 8018F228 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8018F22C 7C 08 02 A6 */ mflr r0 -/* 8018F230 90 01 00 14 */ stw r0, 0x14(r1) -/* 8018F234 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8018F238 93 C1 00 08 */ stw r30, 8(r1) -/* 8018F23C 7C 7E 1B 78 */ mr r30, r3 -/* 8018F240 48 00 0A F1 */ bl errorTxtChangeAnm__14dFile_select_cFv -/* 8018F244 7C 7F 1B 78 */ mr r31, r3 -/* 8018F248 7F C3 F3 78 */ mr r3, r30 -/* 8018F24C 4B FF 9A ED */ bl yesnoMenuMoveAnm__14dFile_select_cFv -/* 8018F250 57 E0 06 3E */ clrlwi r0, r31, 0x18 -/* 8018F254 28 00 00 01 */ cmplwi r0, 1 -/* 8018F258 40 82 00 34 */ bne lbl_8018F28C -/* 8018F25C 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8018F260 28 00 00 01 */ cmplwi r0, 1 -/* 8018F264 40 82 00 28 */ bne lbl_8018F28C -/* 8018F268 3C 60 80 43 */ lis r3, g_fsHIO@ha /* 0x8042C9EC@ha */ -/* 8018F26C 38 63 C9 EC */ addi r3, r3, g_fsHIO@l /* 0x8042C9EC@l */ -/* 8018F270 88 03 00 0C */ lbz r0, 0xc(r3) -/* 8018F274 B0 1E 03 AC */ sth r0, 0x3ac(r30) -/* 8018F278 3C 60 80 3F */ lis r3, g_mDoMemCd_control@ha /* 0x803EAF40@ha */ -/* 8018F27C 38 63 AF 40 */ addi r3, r3, g_mDoMemCd_control@l /* 0x803EAF40@l */ -/* 8018F280 4B E8 7B D9 */ bl command_format__15mDoMemCd_Ctrl_cFv -/* 8018F284 38 00 00 0A */ li r0, 0xa -/* 8018F288 98 1E 02 71 */ stb r0, 0x271(r30) -lbl_8018F28C: -/* 8018F28C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8018F290 83 C1 00 08 */ lwz r30, 8(r1) -/* 8018F294 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8018F298 7C 08 03 A6 */ mtlr r0 -/* 8018F29C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8018F2A0 4E 80 00 20 */ blr diff --git a/asm/d/file/d_file_select/MemCardFormatYesSelDisp__14dFile_select_cFv.s b/asm/d/file/d_file_select/MemCardFormatYesSelDisp__14dFile_select_cFv.s deleted file mode 100644 index a14fc5185ea..00000000000 --- a/asm/d/file/d_file_select/MemCardFormatYesSelDisp__14dFile_select_cFv.s +++ /dev/null @@ -1,35 +0,0 @@ -lbl_8018EFFC: -/* 8018EFFC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8018F000 7C 08 02 A6 */ mflr r0 -/* 8018F004 90 01 00 24 */ stw r0, 0x24(r1) -/* 8018F008 39 61 00 20 */ addi r11, r1, 0x20 -/* 8018F00C 48 1D 31 D1 */ bl _savegpr_29 -/* 8018F010 7C 7D 1B 78 */ mr r29, r3 -/* 8018F014 48 00 0D 1D */ bl errorTxtChangeAnm__14dFile_select_cFv -/* 8018F018 7C 7E 1B 78 */ mr r30, r3 -/* 8018F01C 7F A3 EB 78 */ mr r3, r29 -/* 8018F020 4B FF 9E B1 */ bl yesnoSelectMoveAnm__14dFile_select_cFv -/* 8018F024 7C 7F 1B 78 */ mr r31, r3 -/* 8018F028 7F A3 EB 78 */ mr r3, r29 -/* 8018F02C 88 9D 02 69 */ lbz r4, 0x269(r29) -/* 8018F030 4B FF EB 9D */ bl yesnoWakuAlpahAnm__14dFile_select_cFUc -/* 8018F034 57 C0 06 3E */ clrlwi r0, r30, 0x18 -/* 8018F038 28 00 00 01 */ cmplwi r0, 1 -/* 8018F03C 40 82 00 2C */ bne lbl_8018F068 -/* 8018F040 57 E0 06 3E */ clrlwi r0, r31, 0x18 -/* 8018F044 28 00 00 01 */ cmplwi r0, 1 -/* 8018F048 40 82 00 20 */ bne lbl_8018F068 -/* 8018F04C 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8018F050 28 00 00 01 */ cmplwi r0, 1 -/* 8018F054 40 82 00 14 */ bne lbl_8018F068 -/* 8018F058 7F A3 EB 78 */ mr r3, r29 -/* 8018F05C 4B FF A0 D1 */ bl yesnoCursorShow__14dFile_select_cFv -/* 8018F060 38 00 00 08 */ li r0, 8 -/* 8018F064 98 1D 02 71 */ stb r0, 0x271(r29) -lbl_8018F068: -/* 8018F068 39 61 00 20 */ addi r11, r1, 0x20 -/* 8018F06C 48 1D 31 BD */ bl _restgpr_29 -/* 8018F070 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8018F074 7C 08 03 A6 */ mtlr r0 -/* 8018F078 38 21 00 20 */ addi r1, r1, 0x20 -/* 8018F07C 4E 80 00 20 */ blr diff --git a/asm/d/file/d_file_select/MemCardFormat__14dFile_select_cFv.s b/asm/d/file/d_file_select/MemCardFormat__14dFile_select_cFv.s deleted file mode 100644 index 822f3bc9fdb..00000000000 --- a/asm/d/file/d_file_select/MemCardFormat__14dFile_select_cFv.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_8018F2A4: -/* 8018F2A4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8018F2A8 7C 08 02 A6 */ mflr r0 -/* 8018F2AC 90 01 00 14 */ stw r0, 0x14(r1) -/* 8018F2B0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8018F2B4 7C 7F 1B 78 */ mr r31, r3 -/* 8018F2B8 A8 63 03 AC */ lha r3, 0x3ac(r3) -/* 8018F2BC 2C 03 00 00 */ cmpwi r3, 0 -/* 8018F2C0 41 82 00 0C */ beq lbl_8018F2CC -/* 8018F2C4 38 03 FF FF */ addi r0, r3, -1 -/* 8018F2C8 B0 1F 03 AC */ sth r0, 0x3ac(r31) -lbl_8018F2CC: -/* 8018F2CC 3C 60 80 3F */ lis r3, g_mDoMemCd_control@ha /* 0x803EAF40@ha */ -/* 8018F2D0 38 63 AF 40 */ addi r3, r3, g_mDoMemCd_control@l /* 0x803EAF40@l */ -/* 8018F2D4 4B E8 7C 59 */ bl FormatSync__15mDoMemCd_Ctrl_cFv -/* 8018F2D8 90 7F 03 B4 */ stw r3, 0x3b4(r31) -/* 8018F2DC 80 1F 03 B4 */ lwz r0, 0x3b4(r31) -/* 8018F2E0 2C 00 00 00 */ cmpwi r0, 0 -/* 8018F2E4 41 82 00 0C */ beq lbl_8018F2F0 -/* 8018F2E8 38 00 00 0B */ li r0, 0xb -/* 8018F2EC 98 1F 02 71 */ stb r0, 0x271(r31) -lbl_8018F2F0: -/* 8018F2F0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8018F2F4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8018F2F8 7C 08 03 A6 */ mtlr r0 -/* 8018F2FC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8018F300 4E 80 00 20 */ blr diff --git a/asm/d/file/d_file_select/MemCardGotoIPLSelectDisp__14dFile_select_cFv.s b/asm/d/file/d_file_select/MemCardGotoIPLSelectDisp__14dFile_select_cFv.s deleted file mode 100644 index 3c49d067387..00000000000 --- a/asm/d/file/d_file_select/MemCardGotoIPLSelectDisp__14dFile_select_cFv.s +++ /dev/null @@ -1,34 +0,0 @@ -lbl_8018EA90: -/* 8018EA90 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8018EA94 7C 08 02 A6 */ mflr r0 -/* 8018EA98 90 01 00 24 */ stw r0, 0x24(r1) -/* 8018EA9C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8018EAA0 48 1D 37 3D */ bl _savegpr_29 -/* 8018EAA4 7C 7D 1B 78 */ mr r29, r3 -/* 8018EAA8 48 00 12 89 */ bl errorTxtChangeAnm__14dFile_select_cFv -/* 8018EAAC 7C 7E 1B 78 */ mr r30, r3 -/* 8018EAB0 7F A3 EB 78 */ mr r3, r29 -/* 8018EAB4 4B FF A2 85 */ bl yesnoMenuMoveAnm__14dFile_select_cFv -/* 8018EAB8 7C 7F 1B 78 */ mr r31, r3 -/* 8018EABC 7F A3 EB 78 */ mr r3, r29 -/* 8018EAC0 4B FF EA B5 */ bl ketteiTxtDispAnm__14dFile_select_cFv -/* 8018EAC4 57 C0 06 3E */ clrlwi r0, r30, 0x18 -/* 8018EAC8 28 00 00 01 */ cmplwi r0, 1 -/* 8018EACC 40 82 00 2C */ bne lbl_8018EAF8 -/* 8018EAD0 57 E0 06 3E */ clrlwi r0, r31, 0x18 -/* 8018EAD4 28 00 00 01 */ cmplwi r0, 1 -/* 8018EAD8 40 82 00 20 */ bne lbl_8018EAF8 -/* 8018EADC 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8018EAE0 28 00 00 01 */ cmplwi r0, 1 -/* 8018EAE4 40 82 00 14 */ bne lbl_8018EAF8 -/* 8018EAE8 7F A3 EB 78 */ mr r3, r29 -/* 8018EAEC 4B FF A6 41 */ bl yesnoCursorShow__14dFile_select_cFv -/* 8018EAF0 38 00 00 14 */ li r0, 0x14 -/* 8018EAF4 98 1D 02 71 */ stb r0, 0x271(r29) -lbl_8018EAF8: -/* 8018EAF8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8018EAFC 48 1D 37 2D */ bl _restgpr_29 -/* 8018EB00 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8018EB04 7C 08 03 A6 */ mtlr r0 -/* 8018EB08 38 21 00 20 */ addi r1, r1, 0x20 -/* 8018EB0C 4E 80 00 20 */ blr diff --git a/asm/d/file/d_file_select/MemCardGotoIPLSelect__14dFile_select_cFv.s b/asm/d/file/d_file_select/MemCardGotoIPLSelect__14dFile_select_cFv.s deleted file mode 100644 index 68b92dbd3b4..00000000000 --- a/asm/d/file/d_file_select/MemCardGotoIPLSelect__14dFile_select_cFv.s +++ /dev/null @@ -1,51 +0,0 @@ -lbl_8018EB10: -/* 8018EB10 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8018EB14 7C 08 02 A6 */ mflr r0 -/* 8018EB18 90 01 00 14 */ stw r0, 0x14(r1) -/* 8018EB1C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8018EB20 7C 7F 1B 78 */ mr r31, r3 -/* 8018EB24 48 00 0F 09 */ bl errYesNoSelect__14dFile_select_cFv -/* 8018EB28 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8018EB2C 41 82 00 8C */ beq lbl_8018EBB8 -/* 8018EB30 88 9F 02 68 */ lbz r4, 0x268(r31) -/* 8018EB34 28 04 00 00 */ cmplwi r4, 0 -/* 8018EB38 41 82 00 54 */ beq lbl_8018EB8C -/* 8018EB3C 38 00 00 01 */ li r0, 1 -/* 8018EB40 98 1F 03 B1 */ stb r0, 0x3b1(r31) -/* 8018EB44 3C 60 80 43 */ lis r3, g_fsHIO@ha /* 0x8042C9EC@ha */ -/* 8018EB48 38 63 C9 EC */ addi r3, r3, g_fsHIO@l /* 0x8042C9EC@l */ -/* 8018EB4C 88 03 00 0D */ lbz r0, 0xd(r3) -/* 8018EB50 B0 1F 03 AC */ sth r0, 0x3ac(r31) -/* 8018EB54 A8 9F 03 AC */ lha r4, 0x3ac(r31) -/* 8018EB58 80 6D 8C 40 */ lwz r3, sManager__10JFWDisplay(r13) -/* 8018EB5C 80 63 00 04 */ lwz r3, 4(r3) -/* 8018EB60 28 03 00 00 */ cmplwi r3, 0 -/* 8018EB64 41 82 00 14 */ beq lbl_8018EB78 -/* 8018EB68 81 83 00 00 */ lwz r12, 0(r3) -/* 8018EB6C 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 8018EB70 7D 89 03 A6 */ mtctr r12 -/* 8018EB74 4E 80 04 21 */ bctrl -lbl_8018EB78: -/* 8018EB78 38 00 00 01 */ li r0, 1 -/* 8018EB7C 98 1F 23 74 */ stb r0, 0x2374(r31) -/* 8018EB80 38 00 00 15 */ li r0, 0x15 -/* 8018EB84 98 1F 02 71 */ stb r0, 0x271(r31) -/* 8018EB88 48 00 00 30 */ b lbl_8018EBB8 -lbl_8018EB8C: -/* 8018EB8C 7F E3 FB 78 */ mr r3, r31 -/* 8018EB90 38 A0 00 FF */ li r5, 0xff -/* 8018EB94 38 C0 00 00 */ li r6, 0 -/* 8018EB98 3C E0 80 43 */ lis r7, g_fsHIO@ha /* 0x8042C9EC@ha */ -/* 8018EB9C 38 E7 C9 EC */ addi r7, r7, g_fsHIO@l /* 0x8042C9EC@l */ -/* 8018EBA0 88 E7 00 08 */ lbz r7, 8(r7) -/* 8018EBA4 4B FF EF DD */ bl yesnoWakuAlpahAnmInit__14dFile_select_cFUcUcUcUc -/* 8018EBA8 7F E3 FB 78 */ mr r3, r31 -/* 8018EBAC 48 00 00 A1 */ bl noSaveSelDispInit__14dFile_select_cFv -/* 8018EBB0 38 00 00 03 */ li r0, 3 -/* 8018EBB4 98 1F 02 71 */ stb r0, 0x271(r31) -lbl_8018EBB8: -/* 8018EBB8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8018EBBC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8018EBC0 7C 08 03 A6 */ mtlr r0 -/* 8018EBC4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8018EBC8 4E 80 00 20 */ blr diff --git a/asm/d/file/d_file_select/MemCardGotoIPL__14dFile_select_cFv.s b/asm/d/file/d_file_select/MemCardGotoIPL__14dFile_select_cFv.s deleted file mode 100644 index b4b880ef81d..00000000000 --- a/asm/d/file/d_file_select/MemCardGotoIPL__14dFile_select_cFv.s +++ /dev/null @@ -1,36 +0,0 @@ -lbl_8018EBCC: -/* 8018EBCC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8018EBD0 7C 08 02 A6 */ mflr r0 -/* 8018EBD4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8018EBD8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8018EBDC 7C 7F 1B 78 */ mr r31, r3 -/* 8018EBE0 A8 63 03 AC */ lha r3, 0x3ac(r3) -/* 8018EBE4 2C 03 00 00 */ cmpwi r3, 0 -/* 8018EBE8 41 82 00 10 */ beq lbl_8018EBF8 -/* 8018EBEC 38 03 FF FF */ addi r0, r3, -1 -/* 8018EBF0 B0 1F 03 AC */ sth r0, 0x3ac(r31) -/* 8018EBF4 48 00 00 44 */ b lbl_8018EC38 -lbl_8018EBF8: -/* 8018EBF8 38 00 00 01 */ li r0, 1 -/* 8018EBFC 98 1F 23 75 */ stb r0, 0x2375(r31) -/* 8018EC00 80 6D 8C 40 */ lwz r3, sManager__10JFWDisplay(r13) -/* 8018EC04 80 63 00 04 */ lwz r3, 4(r3) -/* 8018EC08 28 03 00 00 */ cmplwi r3, 0 -/* 8018EC0C 41 82 00 18 */ beq lbl_8018EC24 -/* 8018EC10 38 80 00 00 */ li r4, 0 -/* 8018EC14 81 83 00 00 */ lwz r12, 0(r3) -/* 8018EC18 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 8018EC1C 7D 89 03 A6 */ mtctr r12 -/* 8018EC20 4E 80 04 21 */ bctrl -lbl_8018EC24: -/* 8018EC24 38 00 00 00 */ li r0, 0 -/* 8018EC28 98 1F 23 74 */ stb r0, 0x2374(r31) -/* 8018EC2C 38 00 00 01 */ li r0, 1 -/* 8018EC30 80 6D 86 F8 */ lwz r3, mResetData__6mDoRst(r13) -/* 8018EC34 98 03 00 10 */ stb r0, 0x10(r3) -lbl_8018EC38: -/* 8018EC38 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8018EC3C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8018EC40 7C 08 03 A6 */ mtlr r0 -/* 8018EC44 38 21 00 10 */ addi r1, r1, 0x10 -/* 8018EC48 4E 80 00 20 */ blr diff --git a/asm/d/file/d_file_select/MemCardMakeGameFileCheck__14dFile_select_cFv.s b/asm/d/file/d_file_select/MemCardMakeGameFileCheck__14dFile_select_cFv.s deleted file mode 100644 index 8895f6fe356..00000000000 --- a/asm/d/file/d_file_select/MemCardMakeGameFileCheck__14dFile_select_cFv.s +++ /dev/null @@ -1,37 +0,0 @@ -lbl_8018F650: -/* 8018F650 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8018F654 7C 08 02 A6 */ mflr r0 -/* 8018F658 90 01 00 14 */ stw r0, 0x14(r1) -/* 8018F65C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8018F660 7C 7F 1B 78 */ mr r31, r3 -/* 8018F664 48 00 06 CD */ bl errorTxtChangeAnm__14dFile_select_cFv -/* 8018F668 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8018F66C 28 00 00 01 */ cmplwi r0, 1 -/* 8018F670 40 82 00 58 */ bne lbl_8018F6C8 -/* 8018F674 3C 60 80 3A */ lis r3, __ptmf_null@ha /* 0x803A2180@ha */ -/* 8018F678 38 83 21 80 */ addi r4, r3, __ptmf_null@l /* 0x803A2180@l */ -/* 8018F67C 80 64 00 00 */ lwz r3, 0(r4) -/* 8018F680 80 04 00 04 */ lwz r0, 4(r4) -/* 8018F684 90 7F 02 84 */ stw r3, 0x284(r31) -/* 8018F688 90 1F 02 88 */ stw r0, 0x288(r31) -/* 8018F68C 80 04 00 08 */ lwz r0, 8(r4) -/* 8018F690 90 1F 02 8C */ stw r0, 0x28c(r31) -/* 8018F694 80 64 00 00 */ lwz r3, 0(r4) -/* 8018F698 80 04 00 04 */ lwz r0, 4(r4) -/* 8018F69C 90 7F 02 90 */ stw r3, 0x290(r31) -/* 8018F6A0 90 1F 02 94 */ stw r0, 0x294(r31) -/* 8018F6A4 80 04 00 08 */ lwz r0, 8(r4) -/* 8018F6A8 90 1F 02 98 */ stw r0, 0x298(r31) -/* 8018F6AC 38 60 00 00 */ li r3, 0 -/* 8018F6B0 98 7F 02 73 */ stb r3, 0x273(r31) -/* 8018F6B4 38 00 00 18 */ li r0, 0x18 -/* 8018F6B8 98 1F 02 74 */ stb r0, 0x274(r31) -/* 8018F6BC 38 00 00 02 */ li r0, 2 -/* 8018F6C0 98 1F 02 71 */ stb r0, 0x271(r31) -/* 8018F6C4 98 7F 03 B1 */ stb r3, 0x3b1(r31) -lbl_8018F6C8: -/* 8018F6C8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8018F6CC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8018F6D0 7C 08 03 A6 */ mtlr r0 -/* 8018F6D4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8018F6D8 4E 80 00 20 */ blr diff --git a/asm/d/file/d_file_select/MemCardMakeGameFileSel__14dFile_select_cFv.s b/asm/d/file/d_file_select/MemCardMakeGameFileSel__14dFile_select_cFv.s deleted file mode 100644 index 16ab63a93e2..00000000000 --- a/asm/d/file/d_file_select/MemCardMakeGameFileSel__14dFile_select_cFv.s +++ /dev/null @@ -1,38 +0,0 @@ -lbl_8018F400: -/* 8018F400 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8018F404 7C 08 02 A6 */ mflr r0 -/* 8018F408 90 01 00 14 */ stw r0, 0x14(r1) -/* 8018F40C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8018F410 7C 7F 1B 78 */ mr r31, r3 -/* 8018F414 48 00 06 19 */ bl errYesNoSelect__14dFile_select_cFv -/* 8018F418 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8018F41C 41 82 00 58 */ beq lbl_8018F474 -/* 8018F420 88 1F 02 68 */ lbz r0, 0x268(r31) -/* 8018F424 28 00 00 00 */ cmplwi r0, 0 -/* 8018F428 41 82 00 1C */ beq lbl_8018F444 -/* 8018F42C 7F E3 FB 78 */ mr r3, r31 -/* 8018F430 38 80 00 1B */ li r4, 0x1b -/* 8018F434 48 00 08 31 */ bl errorTxtSet__14dFile_select_cFUs -/* 8018F438 38 00 00 01 */ li r0, 1 -/* 8018F43C 98 1F 03 B1 */ stb r0, 0x3b1(r31) -/* 8018F440 48 00 00 10 */ b lbl_8018F450 -lbl_8018F444: -/* 8018F444 7F E3 FB 78 */ mr r3, r31 -/* 8018F448 38 80 00 19 */ li r4, 0x19 -/* 8018F44C 48 00 08 19 */ bl errorTxtSet__14dFile_select_cFUs -lbl_8018F450: -/* 8018F450 7F E3 FB 78 */ mr r3, r31 -/* 8018F454 38 80 00 00 */ li r4, 0 -/* 8018F458 4B FF E0 A1 */ bl ketteiTxtDispAnmInit__14dFile_select_cFUc -/* 8018F45C 7F E3 FB 78 */ mr r3, r31 -/* 8018F460 38 80 04 7D */ li r4, 0x47d -/* 8018F464 38 A0 04 73 */ li r5, 0x473 -/* 8018F468 4B FF 97 55 */ bl yesnoMenuMoveAnmInitSet__14dFile_select_cFii -/* 8018F46C 38 00 00 0E */ li r0, 0xe -/* 8018F470 98 1F 02 71 */ stb r0, 0x271(r31) -lbl_8018F474: -/* 8018F474 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8018F478 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8018F47C 7C 08 03 A6 */ mtlr r0 -/* 8018F480 38 21 00 10 */ addi r1, r1, 0x10 -/* 8018F484 4E 80 00 20 */ blr diff --git a/asm/d/file/d_file_select/MemCardMakeGameFileWait__14dFile_select_cFv.s b/asm/d/file/d_file_select/MemCardMakeGameFileWait__14dFile_select_cFv.s deleted file mode 100644 index 5a4e2957054..00000000000 --- a/asm/d/file/d_file_select/MemCardMakeGameFileWait__14dFile_select_cFv.s +++ /dev/null @@ -1,33 +0,0 @@ -lbl_8018F5E0: -/* 8018F5E0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8018F5E4 7C 08 02 A6 */ mflr r0 -/* 8018F5E8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8018F5EC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8018F5F0 7C 7F 1B 78 */ mr r31, r3 -/* 8018F5F4 A8 83 03 AC */ lha r4, 0x3ac(r3) -/* 8018F5F8 2C 04 00 00 */ cmpwi r4, 0 -/* 8018F5FC 41 82 00 10 */ beq lbl_8018F60C -/* 8018F600 38 04 FF FF */ addi r0, r4, -1 -/* 8018F604 B0 1F 03 AC */ sth r0, 0x3ac(r31) -/* 8018F608 48 00 00 34 */ b lbl_8018F63C -lbl_8018F60C: -/* 8018F60C 80 1F 03 B4 */ lwz r0, 0x3b4(r31) -/* 8018F610 2C 00 00 01 */ cmpwi r0, 1 -/* 8018F614 40 82 00 10 */ bne lbl_8018F624 -/* 8018F618 38 80 00 1C */ li r4, 0x1c -/* 8018F61C 48 00 06 49 */ bl errorTxtSet__14dFile_select_cFUs -/* 8018F620 48 00 00 14 */ b lbl_8018F634 -lbl_8018F624: -/* 8018F624 2C 00 00 02 */ cmpwi r0, 2 -/* 8018F628 40 82 00 0C */ bne lbl_8018F634 -/* 8018F62C 38 80 00 1A */ li r4, 0x1a -/* 8018F630 48 00 06 35 */ bl errorTxtSet__14dFile_select_cFUs -lbl_8018F634: -/* 8018F634 38 00 00 11 */ li r0, 0x11 -/* 8018F638 98 1F 02 71 */ stb r0, 0x271(r31) -lbl_8018F63C: -/* 8018F63C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8018F640 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8018F644 7C 08 03 A6 */ mtlr r0 -/* 8018F648 38 21 00 10 */ addi r1, r1, 0x10 -/* 8018F64C 4E 80 00 20 */ blr diff --git a/asm/d/file/d_file_select/MemCardMakeGameFile__14dFile_select_cFv.s b/asm/d/file/d_file_select/MemCardMakeGameFile__14dFile_select_cFv.s deleted file mode 100644 index 4e805616edc..00000000000 --- a/asm/d/file/d_file_select/MemCardMakeGameFile__14dFile_select_cFv.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_8018F580: -/* 8018F580 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8018F584 7C 08 02 A6 */ mflr r0 -/* 8018F588 90 01 00 14 */ stw r0, 0x14(r1) -/* 8018F58C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8018F590 7C 7F 1B 78 */ mr r31, r3 -/* 8018F594 A8 63 03 AC */ lha r3, 0x3ac(r3) -/* 8018F598 2C 03 00 00 */ cmpwi r3, 0 -/* 8018F59C 41 82 00 0C */ beq lbl_8018F5A8 -/* 8018F5A0 38 03 FF FF */ addi r0, r3, -1 -/* 8018F5A4 B0 1F 03 AC */ sth r0, 0x3ac(r31) -lbl_8018F5A8: -/* 8018F5A8 3C 60 80 3F */ lis r3, g_mDoMemCd_control@ha /* 0x803EAF40@ha */ -/* 8018F5AC 38 63 AF 40 */ addi r3, r3, g_mDoMemCd_control@l /* 0x803EAF40@l */ -/* 8018F5B0 4B E8 77 31 */ bl SaveSync__15mDoMemCd_Ctrl_cFv -/* 8018F5B4 90 7F 03 B4 */ stw r3, 0x3b4(r31) -/* 8018F5B8 80 1F 03 B4 */ lwz r0, 0x3b4(r31) -/* 8018F5BC 2C 00 00 00 */ cmpwi r0, 0 -/* 8018F5C0 41 82 00 0C */ beq lbl_8018F5CC -/* 8018F5C4 38 00 00 10 */ li r0, 0x10 -/* 8018F5C8 98 1F 02 71 */ stb r0, 0x271(r31) -lbl_8018F5CC: -/* 8018F5CC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8018F5D0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8018F5D4 7C 08 03 A6 */ mtlr r0 -/* 8018F5D8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8018F5DC 4E 80 00 20 */ blr diff --git a/asm/d/file/d_file_select/MemCardMsgWindowClose__14dFile_select_cFv.s b/asm/d/file/d_file_select/MemCardMsgWindowClose__14dFile_select_cFv.s deleted file mode 100644 index 9e0e2b1625e..00000000000 --- a/asm/d/file/d_file_select/MemCardMsgWindowClose__14dFile_select_cFv.s +++ /dev/null @@ -1,50 +0,0 @@ -lbl_8018F974: -/* 8018F974 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8018F978 7C 08 02 A6 */ mflr r0 -/* 8018F97C 90 01 00 24 */ stw r0, 0x24(r1) -/* 8018F980 39 61 00 20 */ addi r11, r1, 0x20 -/* 8018F984 48 1D 28 59 */ bl _savegpr_29 -/* 8018F988 7C 7D 1B 78 */ mr r29, r3 -/* 8018F98C 4B FF E8 35 */ bl errorMoveAnm__14dFile_select_cFv -/* 8018F990 7C 7F 1B 78 */ mr r31, r3 -/* 8018F994 3B C0 00 01 */ li r30, 1 -/* 8018F998 38 60 00 01 */ li r3, 1 -/* 8018F99C 88 1D 01 08 */ lbz r0, 0x108(r29) -/* 8018F9A0 28 00 00 00 */ cmplwi r0, 0 -/* 8018F9A4 41 82 00 18 */ beq lbl_8018F9BC -/* 8018F9A8 7F A3 EB 78 */ mr r3, r29 -/* 8018F9AC 4B FF 93 8D */ bl yesnoMenuMoveAnm__14dFile_select_cFv -/* 8018F9B0 7C 7E 1B 78 */ mr r30, r3 -/* 8018F9B4 7F A3 EB 78 */ mr r3, r29 -/* 8018F9B8 4B FF DB BD */ bl ketteiTxtDispAnm__14dFile_select_cFv -lbl_8018F9BC: -/* 8018F9BC 57 E0 06 3E */ clrlwi r0, r31, 0x18 -/* 8018F9C0 28 00 00 01 */ cmplwi r0, 1 -/* 8018F9C4 40 82 00 50 */ bne lbl_8018FA14 -/* 8018F9C8 57 C0 06 3E */ clrlwi r0, r30, 0x18 -/* 8018F9CC 28 00 00 01 */ cmplwi r0, 1 -/* 8018F9D0 40 82 00 44 */ bne lbl_8018FA14 -/* 8018F9D4 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8018F9D8 28 00 00 01 */ cmplwi r0, 1 -/* 8018F9DC 40 82 00 38 */ bne lbl_8018FA14 -/* 8018F9E0 38 00 00 00 */ li r0, 0 -/* 8018F9E4 98 1D 02 80 */ stb r0, 0x280(r29) -/* 8018F9E8 38 7D 02 84 */ addi r3, r29, 0x284 -/* 8018F9EC 48 1D 26 2D */ bl __ptmf_test -/* 8018F9F0 2C 03 00 00 */ cmpwi r3, 0 -/* 8018F9F4 41 82 00 18 */ beq lbl_8018FA0C -/* 8018F9F8 7F A3 EB 78 */ mr r3, r29 -/* 8018F9FC 39 9D 02 84 */ addi r12, r29, 0x284 -/* 8018FA00 48 1D 26 85 */ bl __ptmf_scall -/* 8018FA04 60 00 00 00 */ nop -/* 8018FA08 48 00 00 0C */ b lbl_8018FA14 -lbl_8018FA0C: -/* 8018FA0C 88 1D 02 73 */ lbz r0, 0x273(r29) -/* 8018FA10 98 1D 02 71 */ stb r0, 0x271(r29) -lbl_8018FA14: -/* 8018FA14 39 61 00 20 */ addi r11, r1, 0x20 -/* 8018FA18 48 1D 28 11 */ bl _restgpr_29 -/* 8018FA1C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8018FA20 7C 08 03 A6 */ mtlr r0 -/* 8018FA24 38 21 00 20 */ addi r1, r1, 0x20 -/* 8018FA28 4E 80 00 20 */ blr diff --git a/asm/d/file/d_file_select/MemCardMsgWindowInitOpen__14dFile_select_cFv.s b/asm/d/file/d_file_select/MemCardMsgWindowInitOpen__14dFile_select_cFv.s deleted file mode 100644 index a0f4f46d266..00000000000 --- a/asm/d/file/d_file_select/MemCardMsgWindowInitOpen__14dFile_select_cFv.s +++ /dev/null @@ -1,143 +0,0 @@ -lbl_8018F6DC: -/* 8018F6DC 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 8018F6E0 7C 08 02 A6 */ mflr r0 -/* 8018F6E4 90 01 00 34 */ stw r0, 0x34(r1) -/* 8018F6E8 39 61 00 30 */ addi r11, r1, 0x30 -/* 8018F6EC 48 1D 2A DD */ bl _savegpr_24 -/* 8018F6F0 7C 7A 1B 78 */ mr r26, r3 -/* 8018F6F4 88 03 02 1E */ lbz r0, 0x21e(r3) -/* 8018F6F8 28 00 00 00 */ cmplwi r0, 0 -/* 8018F6FC 40 82 00 10 */ bne lbl_8018F70C -/* 8018F700 4B FF DB 5D */ bl headerTxtChangeAnm__14dFile_select_cFv -/* 8018F704 7C 7F 1B 78 */ mr r31, r3 -/* 8018F708 48 00 00 08 */ b lbl_8018F710 -lbl_8018F70C: -/* 8018F70C 3B E0 00 01 */ li r31, 1 -lbl_8018F710: -/* 8018F710 3B C0 00 01 */ li r30, 1 -/* 8018F714 3B A0 00 01 */ li r29, 1 -/* 8018F718 3B 80 00 01 */ li r28, 1 -/* 8018F71C 3B 60 00 01 */ li r27, 1 -/* 8018F720 88 1A 00 B8 */ lbz r0, 0xb8(r26) -/* 8018F724 28 00 00 00 */ cmplwi r0, 0 -/* 8018F728 40 82 00 10 */ bne lbl_8018F738 -/* 8018F72C 88 1A 00 B9 */ lbz r0, 0xb9(r26) -/* 8018F730 28 00 00 00 */ cmplwi r0, 0 -/* 8018F734 41 82 00 10 */ beq lbl_8018F744 -lbl_8018F738: -/* 8018F738 7F 43 D3 78 */ mr r3, r26 -/* 8018F73C 4B FF 56 11 */ bl selectDataBaseMoveAnm__14dFile_select_cFv -/* 8018F740 7C 7E 1B 78 */ mr r30, r3 -lbl_8018F744: -/* 8018F744 88 1A 01 08 */ lbz r0, 0x108(r26) -/* 8018F748 28 00 00 00 */ cmplwi r0, 0 -/* 8018F74C 40 82 00 10 */ bne lbl_8018F75C -/* 8018F750 88 1A 02 81 */ lbz r0, 0x281(r26) -/* 8018F754 28 00 00 00 */ cmplwi r0, 0 -/* 8018F758 41 82 00 10 */ beq lbl_8018F768 -lbl_8018F75C: -/* 8018F75C 7F 43 D3 78 */ mr r3, r26 -/* 8018F760 4B FF 95 D9 */ bl yesnoMenuMoveAnm__14dFile_select_cFv -/* 8018F764 7C 7D 1B 78 */ mr r29, r3 -lbl_8018F768: -/* 8018F768 88 1A 03 60 */ lbz r0, 0x360(r26) -/* 8018F76C 28 00 00 00 */ cmplwi r0, 0 -/* 8018F770 40 82 00 10 */ bne lbl_8018F780 -/* 8018F774 88 1A 02 83 */ lbz r0, 0x283(r26) -/* 8018F778 28 00 00 00 */ cmplwi r0, 0 -/* 8018F77C 41 82 00 10 */ beq lbl_8018F78C -lbl_8018F780: -/* 8018F780 7F 43 D3 78 */ mr r3, r26 -/* 8018F784 4B FF 75 29 */ bl menuMoveAnm__14dFile_select_cFv -/* 8018F788 7C 7C 1B 78 */ mr r28, r3 -lbl_8018F78C: -/* 8018F78C 88 1A 01 4A */ lbz r0, 0x14a(r26) -/* 8018F790 28 00 00 00 */ cmplwi r0, 0 -/* 8018F794 40 82 00 10 */ bne lbl_8018F7A4 -/* 8018F798 88 1A 01 4B */ lbz r0, 0x14b(r26) -/* 8018F79C 28 00 00 00 */ cmplwi r0, 0 -/* 8018F7A0 41 82 00 10 */ beq lbl_8018F7B0 -lbl_8018F7A4: -/* 8018F7A4 7F 43 D3 78 */ mr r3, r26 -/* 8018F7A8 4B FF EA 19 */ bl errorMoveAnm__14dFile_select_cFv -/* 8018F7AC 7C 7B 1B 78 */ mr r27, r3 -lbl_8018F7B0: -/* 8018F7B0 7F 43 D3 78 */ mr r3, r26 -/* 8018F7B4 4B FF DC 69 */ bl modoruTxtDispAnm__14dFile_select_cFv -/* 8018F7B8 7C 78 1B 78 */ mr r24, r3 -/* 8018F7BC 7F 43 D3 78 */ mr r3, r26 -/* 8018F7C0 4B FF DD B5 */ bl ketteiTxtDispAnm__14dFile_select_cFv -/* 8018F7C4 7C 79 1B 78 */ mr r25, r3 -/* 8018F7C8 38 60 00 01 */ li r3, 1 -/* 8018F7CC 88 1A 01 28 */ lbz r0, 0x128(r26) -/* 8018F7D0 28 00 00 00 */ cmplwi r0, 0 -/* 8018F7D4 40 82 00 10 */ bne lbl_8018F7E4 -/* 8018F7D8 88 1A 00 3C */ lbz r0, 0x3c(r26) -/* 8018F7DC 28 00 00 00 */ cmplwi r0, 0 -/* 8018F7E0 41 82 00 0C */ beq lbl_8018F7EC -lbl_8018F7E4: -/* 8018F7E4 7F 43 D3 78 */ mr r3, r26 -/* 8018F7E8 48 00 09 3D */ bl nameMoveAnm__14dFile_select_cFv -lbl_8018F7EC: -/* 8018F7EC 57 E0 06 3E */ clrlwi r0, r31, 0x18 -/* 8018F7F0 28 00 00 01 */ cmplwi r0, 1 -/* 8018F7F4 40 82 00 CC */ bne lbl_8018F8C0 -/* 8018F7F8 57 C0 06 3E */ clrlwi r0, r30, 0x18 -/* 8018F7FC 28 00 00 01 */ cmplwi r0, 1 -/* 8018F800 40 82 00 C0 */ bne lbl_8018F8C0 -/* 8018F804 57 A0 06 3E */ clrlwi r0, r29, 0x18 -/* 8018F808 28 00 00 01 */ cmplwi r0, 1 -/* 8018F80C 40 82 00 B4 */ bne lbl_8018F8C0 -/* 8018F810 57 80 06 3E */ clrlwi r0, r28, 0x18 -/* 8018F814 28 00 00 01 */ cmplwi r0, 1 -/* 8018F818 40 82 00 A8 */ bne lbl_8018F8C0 -/* 8018F81C 57 60 06 3E */ clrlwi r0, r27, 0x18 -/* 8018F820 28 00 00 01 */ cmplwi r0, 1 -/* 8018F824 40 82 00 9C */ bne lbl_8018F8C0 -/* 8018F828 57 00 06 3E */ clrlwi r0, r24, 0x18 -/* 8018F82C 28 00 00 01 */ cmplwi r0, 1 -/* 8018F830 40 82 00 90 */ bne lbl_8018F8C0 -/* 8018F834 57 20 06 3E */ clrlwi r0, r25, 0x18 -/* 8018F838 28 00 00 01 */ cmplwi r0, 1 -/* 8018F83C 40 82 00 84 */ bne lbl_8018F8C0 -/* 8018F840 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8018F844 28 00 00 01 */ cmplwi r0, 1 -/* 8018F848 40 82 00 78 */ bne lbl_8018F8C0 -/* 8018F84C 80 7A 00 14 */ lwz r3, 0x14(r26) -/* 8018F850 81 83 00 00 */ lwz r12, 0(r3) -/* 8018F854 81 8C 00 54 */ lwz r12, 0x54(r12) -/* 8018F858 7D 89 03 A6 */ mtctr r12 -/* 8018F85C 4E 80 04 21 */ bctrl -/* 8018F860 7F 43 D3 78 */ mr r3, r26 -/* 8018F864 4B FF D5 D5 */ bl setWakuAnm__14dFile_select_cFv -/* 8018F868 7F 43 D3 78 */ mr r3, r26 -/* 8018F86C 38 80 0B 21 */ li r4, 0xb21 -/* 8018F870 38 A0 0B 2B */ li r5, 0xb2b -/* 8018F874 4B FF E8 BD */ bl errorMoveAnmInitSet__14dFile_select_cFii -/* 8018F878 88 1A 02 80 */ lbz r0, 0x280(r26) -/* 8018F87C 28 00 00 00 */ cmplwi r0, 0 -/* 8018F880 41 82 00 24 */ beq lbl_8018F8A4 -/* 8018F884 7F 43 D3 78 */ mr r3, r26 -/* 8018F888 38 80 04 73 */ li r4, 0x473 -/* 8018F88C 38 A0 04 7D */ li r5, 0x47d -/* 8018F890 4B FF 93 2D */ bl yesnoMenuMoveAnmInitSet__14dFile_select_cFii -/* 8018F894 7F 43 D3 78 */ mr r3, r26 -/* 8018F898 38 80 00 01 */ li r4, 1 -/* 8018F89C 4B FF DC 5D */ bl ketteiTxtDispAnmInit__14dFile_select_cFUc -/* 8018F8A0 48 00 00 10 */ b lbl_8018F8B0 -lbl_8018F8A4: -/* 8018F8A4 7F 43 D3 78 */ mr r3, r26 -/* 8018F8A8 38 80 00 00 */ li r4, 0 -/* 8018F8AC 4B FF DC 4D */ bl ketteiTxtDispAnmInit__14dFile_select_cFUc -lbl_8018F8B0: -/* 8018F8B0 38 00 00 01 */ li r0, 1 -/* 8018F8B4 98 1A 02 1E */ stb r0, 0x21e(r26) -/* 8018F8B8 38 00 00 17 */ li r0, 0x17 -/* 8018F8BC 98 1A 02 71 */ stb r0, 0x271(r26) -lbl_8018F8C0: -/* 8018F8C0 39 61 00 30 */ addi r11, r1, 0x30 -/* 8018F8C4 48 1D 29 51 */ bl _restgpr_24 -/* 8018F8C8 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8018F8CC 7C 08 03 A6 */ mtlr r0 -/* 8018F8D0 38 21 00 30 */ addi r1, r1, 0x30 -/* 8018F8D4 4E 80 00 20 */ blr diff --git a/asm/d/file/d_file_select/MemCardMsgWindowOpen__14dFile_select_cFv.s b/asm/d/file/d_file_select/MemCardMsgWindowOpen__14dFile_select_cFv.s deleted file mode 100644 index a03f1a6b4ea..00000000000 --- a/asm/d/file/d_file_select/MemCardMsgWindowOpen__14dFile_select_cFv.s +++ /dev/null @@ -1,43 +0,0 @@ -lbl_8018F8D8: -/* 8018F8D8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8018F8DC 7C 08 02 A6 */ mflr r0 -/* 8018F8E0 90 01 00 24 */ stw r0, 0x24(r1) -/* 8018F8E4 39 61 00 20 */ addi r11, r1, 0x20 -/* 8018F8E8 48 1D 28 F5 */ bl _savegpr_29 -/* 8018F8EC 7C 7D 1B 78 */ mr r29, r3 -/* 8018F8F0 4B FF E8 D1 */ bl errorMoveAnm__14dFile_select_cFv -/* 8018F8F4 7C 7F 1B 78 */ mr r31, r3 -/* 8018F8F8 3B C0 00 01 */ li r30, 1 -/* 8018F8FC 88 1D 02 80 */ lbz r0, 0x280(r29) -/* 8018F900 28 00 00 00 */ cmplwi r0, 0 -/* 8018F904 41 82 00 10 */ beq lbl_8018F914 -/* 8018F908 7F A3 EB 78 */ mr r3, r29 -/* 8018F90C 4B FF 94 2D */ bl yesnoMenuMoveAnm__14dFile_select_cFv -/* 8018F910 7C 7E 1B 78 */ mr r30, r3 -lbl_8018F914: -/* 8018F914 7F A3 EB 78 */ mr r3, r29 -/* 8018F918 4B FF DC 5D */ bl ketteiTxtDispAnm__14dFile_select_cFv -/* 8018F91C 57 E0 06 3E */ clrlwi r0, r31, 0x18 -/* 8018F920 28 00 00 01 */ cmplwi r0, 1 -/* 8018F924 40 82 00 38 */ bne lbl_8018F95C -/* 8018F928 57 C0 06 3E */ clrlwi r0, r30, 0x18 -/* 8018F92C 28 00 00 01 */ cmplwi r0, 1 -/* 8018F930 40 82 00 2C */ bne lbl_8018F95C -/* 8018F934 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8018F938 28 00 00 01 */ cmplwi r0, 1 -/* 8018F93C 40 82 00 20 */ bne lbl_8018F95C -/* 8018F940 88 1D 02 80 */ lbz r0, 0x280(r29) -/* 8018F944 28 00 00 00 */ cmplwi r0, 0 -/* 8018F948 41 82 00 0C */ beq lbl_8018F954 -/* 8018F94C 7F A3 EB 78 */ mr r3, r29 -/* 8018F950 4B FF 97 DD */ bl yesnoCursorShow__14dFile_select_cFv -lbl_8018F954: -/* 8018F954 88 1D 02 73 */ lbz r0, 0x273(r29) -/* 8018F958 98 1D 02 71 */ stb r0, 0x271(r29) -lbl_8018F95C: -/* 8018F95C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8018F960 48 1D 28 C9 */ bl _restgpr_29 -/* 8018F964 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8018F968 7C 08 03 A6 */ mtlr r0 -/* 8018F96C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8018F970 4E 80 00 20 */ blr diff --git a/asm/d/file/d_file_select/MemCardNoSaveSelDisp__14dFile_select_cFv.s b/asm/d/file/d_file_select/MemCardNoSaveSelDisp__14dFile_select_cFv.s deleted file mode 100644 index c5dacc912c4..00000000000 --- a/asm/d/file/d_file_select/MemCardNoSaveSelDisp__14dFile_select_cFv.s +++ /dev/null @@ -1,54 +0,0 @@ -lbl_8018ECBC: -/* 8018ECBC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8018ECC0 7C 08 02 A6 */ mflr r0 -/* 8018ECC4 90 01 00 24 */ stw r0, 0x24(r1) -/* 8018ECC8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8018ECCC 48 1D 35 0D */ bl _savegpr_28 -/* 8018ECD0 7C 7C 1B 78 */ mr r28, r3 -/* 8018ECD4 48 00 10 5D */ bl errorTxtChangeAnm__14dFile_select_cFv -/* 8018ECD8 7C 7F 1B 78 */ mr r31, r3 -/* 8018ECDC 3B C0 00 01 */ li r30, 1 -/* 8018ECE0 3B A0 00 01 */ li r29, 1 -/* 8018ECE4 88 1C 02 82 */ lbz r0, 0x282(r28) -/* 8018ECE8 28 00 00 00 */ cmplwi r0, 0 -/* 8018ECEC 41 82 00 2C */ beq lbl_8018ED18 -/* 8018ECF0 88 1C 02 80 */ lbz r0, 0x280(r28) -/* 8018ECF4 28 00 00 00 */ cmplwi r0, 0 -/* 8018ECF8 41 82 00 30 */ beq lbl_8018ED28 -/* 8018ECFC 7F 83 E3 78 */ mr r3, r28 -/* 8018ED00 4B FF A0 39 */ bl yesnoMenuMoveAnm__14dFile_select_cFv -/* 8018ED04 7C 7E 1B 78 */ mr r30, r3 -/* 8018ED08 7F 83 E3 78 */ mr r3, r28 -/* 8018ED0C 4B FF E8 69 */ bl ketteiTxtDispAnm__14dFile_select_cFv -/* 8018ED10 7C 7D 1B 78 */ mr r29, r3 -/* 8018ED14 48 00 00 14 */ b lbl_8018ED28 -lbl_8018ED18: -/* 8018ED18 7F 83 E3 78 */ mr r3, r28 -/* 8018ED1C 88 9C 02 68 */ lbz r4, 0x268(r28) -/* 8018ED20 4B FF EE AD */ bl yesnoWakuAlpahAnm__14dFile_select_cFUc -/* 8018ED24 7C 7E 1B 78 */ mr r30, r3 -lbl_8018ED28: -/* 8018ED28 57 E0 06 3E */ clrlwi r0, r31, 0x18 -/* 8018ED2C 28 00 00 01 */ cmplwi r0, 1 -/* 8018ED30 40 82 00 38 */ bne lbl_8018ED68 -/* 8018ED34 57 C0 06 3E */ clrlwi r0, r30, 0x18 -/* 8018ED38 28 00 00 01 */ cmplwi r0, 1 -/* 8018ED3C 40 82 00 2C */ bne lbl_8018ED68 -/* 8018ED40 57 A0 06 3E */ clrlwi r0, r29, 0x18 -/* 8018ED44 28 00 00 01 */ cmplwi r0, 1 -/* 8018ED48 40 82 00 20 */ bne lbl_8018ED68 -/* 8018ED4C 88 1C 02 80 */ lbz r0, 0x280(r28) -/* 8018ED50 28 00 00 00 */ cmplwi r0, 0 -/* 8018ED54 41 82 00 0C */ beq lbl_8018ED60 -/* 8018ED58 7F 83 E3 78 */ mr r3, r28 -/* 8018ED5C 4B FF A3 D1 */ bl yesnoCursorShow__14dFile_select_cFv -lbl_8018ED60: -/* 8018ED60 38 00 00 04 */ li r0, 4 -/* 8018ED64 98 1C 02 71 */ stb r0, 0x271(r28) -lbl_8018ED68: -/* 8018ED68 39 61 00 20 */ addi r11, r1, 0x20 -/* 8018ED6C 48 1D 34 B9 */ bl _restgpr_28 -/* 8018ED70 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8018ED74 7C 08 03 A6 */ mtlr r0 -/* 8018ED78 38 21 00 20 */ addi r1, r1, 0x20 -/* 8018ED7C 4E 80 00 20 */ blr diff --git a/asm/d/file/d_file_select/MemCardSaveDataClear__14dFile_select_cFv.s b/asm/d/file/d_file_select/MemCardSaveDataClear__14dFile_select_cFv.s deleted file mode 100644 index 4f9d76aa341..00000000000 --- a/asm/d/file/d_file_select/MemCardSaveDataClear__14dFile_select_cFv.s +++ /dev/null @@ -1,21 +0,0 @@ -lbl_80190208: -/* 80190208 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8019020C 7C 08 02 A6 */ mflr r0 -/* 80190210 90 01 00 14 */ stw r0, 0x14(r1) -/* 80190214 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80190218 7C 7F 1B 78 */ mr r31, r3 -/* 8019021C 3C 60 80 3F */ lis r3, g_mDoMemCd_control@ha /* 0x803EAF40@ha */ -/* 80190220 38 63 AF 40 */ addi r3, r3, g_mDoMemCd_control@l /* 0x803EAF40@l */ -/* 80190224 4B E8 6A BD */ bl SaveSync__15mDoMemCd_Ctrl_cFv -/* 80190228 90 7F 03 B4 */ stw r3, 0x3b4(r31) -/* 8019022C 80 1F 03 B4 */ lwz r0, 0x3b4(r31) -/* 80190230 2C 00 00 00 */ cmpwi r0, 0 -/* 80190234 41 82 00 0C */ beq lbl_80190240 -/* 80190238 38 00 00 00 */ li r0, 0 -/* 8019023C 98 1F 02 71 */ stb r0, 0x271(r31) -lbl_80190240: -/* 80190240 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80190244 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80190248 7C 08 03 A6 */ mtlr r0 -/* 8019024C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80190250 4E 80 00 20 */ blr diff --git a/asm/d/file/d_file_select/__ct__9dFs_HIO_cFv.s b/asm/d/file/d_file_select/__ct__9dFs_HIO_cFv.s deleted file mode 100644 index cbe3a77a2a1..00000000000 --- a/asm/d/file/d_file_select/__ct__9dFs_HIO_cFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_801835F8: -/* 801835F8 3C 80 80 3C */ lis r4, __vt__9dFs_HIO_c@ha /* 0x803BB400@ha */ -/* 801835FC 38 04 B4 00 */ addi r0, r4, __vt__9dFs_HIO_c@l /* 0x803BB400@l */ -/* 80183600 90 03 00 00 */ stw r0, 0(r3) -/* 80183604 38 80 00 05 */ li r4, 5 -/* 80183608 98 83 00 06 */ stb r4, 6(r3) -/* 8018360C 98 83 00 07 */ stb r4, 7(r3) -/* 80183610 38 00 00 3C */ li r0, 0x3c -/* 80183614 98 03 00 0A */ stb r0, 0xa(r3) -/* 80183618 98 83 00 08 */ stb r4, 8(r3) -/* 8018361C 38 00 00 0F */ li r0, 0xf -/* 80183620 98 03 00 09 */ stb r0, 9(r3) -/* 80183624 98 83 00 05 */ stb r4, 5(r3) -/* 80183628 98 03 00 0B */ stb r0, 0xb(r3) -/* 8018362C 98 03 00 0D */ stb r0, 0xd(r3) -/* 80183630 38 00 00 5A */ li r0, 0x5a -/* 80183634 98 03 00 0C */ stb r0, 0xc(r3) -/* 80183638 C0 02 9F 28 */ lfs f0, lit_3812(r2) -/* 8018363C D0 03 00 10 */ stfs f0, 0x10(r3) -/* 80183640 D0 03 00 14 */ stfs f0, 0x14(r3) -/* 80183644 D0 03 00 18 */ stfs f0, 0x18(r3) -/* 80183648 38 00 00 00 */ li r0, 0 -/* 8018364C 98 03 00 1C */ stb r0, 0x1c(r3) -/* 80183650 98 03 00 1D */ stb r0, 0x1d(r3) -/* 80183654 98 03 00 1E */ stb r0, 0x1e(r3) -/* 80183658 98 03 00 1F */ stb r0, 0x1f(r3) -/* 8018365C 98 03 00 20 */ stb r0, 0x20(r3) -/* 80183660 98 03 00 21 */ stb r0, 0x21(r3) -/* 80183664 98 03 00 22 */ stb r0, 0x22(r3) -/* 80183668 4E 80 00 20 */ blr diff --git a/asm/d/file/d_file_select/backDatSelWait2__14dFile_select_cFv.s b/asm/d/file/d_file_select/backDatSelWait2__14dFile_select_cFv.s deleted file mode 100644 index 3dcba993cc9..00000000000 --- a/asm/d/file/d_file_select/backDatSelWait2__14dFile_select_cFv.s +++ /dev/null @@ -1,29 +0,0 @@ -lbl_8018AD38: -/* 8018AD38 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8018AD3C 7C 08 02 A6 */ mflr r0 -/* 8018AD40 90 01 00 14 */ stw r0, 0x14(r1) -/* 8018AD44 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8018AD48 7C 7F 1B 78 */ mr r31, r3 -/* 8018AD4C A8 63 03 AC */ lha r3, 0x3ac(r3) -/* 8018AD50 2C 03 00 00 */ cmpwi r3, 0 -/* 8018AD54 41 82 00 0C */ beq lbl_8018AD60 -/* 8018AD58 38 03 FF FF */ addi r0, r3, -1 -/* 8018AD5C B0 1F 03 AC */ sth r0, 0x3ac(r31) -lbl_8018AD60: -/* 8018AD60 38 60 00 00 */ li r3, 0 -/* 8018AD64 48 0D 85 49 */ bl cAPICPad_ANY_BUTTON__FUl -/* 8018AD68 28 03 00 00 */ cmplwi r3, 0 -/* 8018AD6C 40 82 00 10 */ bne lbl_8018AD7C -/* 8018AD70 A8 1F 03 AC */ lha r0, 0x3ac(r31) -/* 8018AD74 2C 00 00 00 */ cmpwi r0, 0 -/* 8018AD78 40 82 00 10 */ bne lbl_8018AD88 -lbl_8018AD7C: -/* 8018AD7C 38 00 00 00 */ li r0, 0 -/* 8018AD80 98 1F 02 6F */ stb r0, 0x26f(r31) -/* 8018AD84 98 1F 02 71 */ stb r0, 0x271(r31) -lbl_8018AD88: -/* 8018AD88 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8018AD8C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8018AD90 7C 08 03 A6 */ mtlr r0 -/* 8018AD94 38 21 00 10 */ addi r1, r1, 0x10 -/* 8018AD98 4E 80 00 20 */ blr diff --git a/asm/d/file/d_file_select/backDatSelWait__14dFile_select_cFv.s b/asm/d/file/d_file_select/backDatSelWait__14dFile_select_cFv.s deleted file mode 100644 index 09f3dafcd1e..00000000000 --- a/asm/d/file/d_file_select/backDatSelWait__14dFile_select_cFv.s +++ /dev/null @@ -1,66 +0,0 @@ -lbl_8018AC3C: -/* 8018AC3C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8018AC40 7C 08 02 A6 */ mflr r0 -/* 8018AC44 90 01 00 14 */ stw r0, 0x14(r1) -/* 8018AC48 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8018AC4C 93 C1 00 08 */ stw r30, 8(r1) -/* 8018AC50 7C 7E 1B 78 */ mr r30, r3 -/* 8018AC54 A8 83 03 AC */ lha r4, 0x3ac(r3) -/* 8018AC58 7C 80 07 35 */ extsh. r0, r4 -/* 8018AC5C 41 82 00 10 */ beq lbl_8018AC6C -/* 8018AC60 38 04 FF FF */ addi r0, r4, -1 -/* 8018AC64 B0 1E 03 AC */ sth r0, 0x3ac(r30) -/* 8018AC68 48 00 00 B8 */ b lbl_8018AD20 -lbl_8018AC6C: -/* 8018AC6C 7C 80 07 35 */ extsh. r0, r4 -/* 8018AC70 40 82 00 B0 */ bne lbl_8018AD20 -/* 8018AC74 88 1E 02 65 */ lbz r0, 0x265(r30) -/* 8018AC78 54 00 08 3C */ slwi r0, r0, 1 -/* 8018AC7C 38 8D 81 40 */ la r4, msgTbl(r13) /* 804506C0-_SDA_BASE_ */ -/* 8018AC80 7C 84 02 2E */ lhzx r4, r4, r0 -/* 8018AC84 38 A0 00 01 */ li r5, 1 -/* 8018AC88 38 C0 00 00 */ li r6, 0 -/* 8018AC8C 48 00 24 59 */ bl headerTxtSet__14dFile_select_cFUsUcUc -/* 8018AC90 7F C3 F3 78 */ mr r3, r30 -/* 8018AC94 88 9E 02 6D */ lbz r4, 0x26d(r30) -/* 8018AC98 38 A0 00 FF */ li r5, 0xff -/* 8018AC9C 38 C0 00 00 */ li r6, 0 -/* 8018ACA0 3C E0 80 43 */ lis r7, g_fsHIO@ha /* 0x8042C9EC@ha */ -/* 8018ACA4 3B E7 C9 EC */ addi r31, r7, g_fsHIO@l /* 0x8042C9EC@l */ -/* 8018ACA8 88 FF 00 08 */ lbz r7, 8(r31) -/* 8018ACAC 48 00 29 A5 */ bl selectWakuAlpahAnmInit__14dFile_select_cFUcUcUcUc -/* 8018ACB0 7F C3 F3 78 */ mr r3, r30 -/* 8018ACB4 88 9E 02 65 */ lbz r4, 0x265(r30) -/* 8018ACB8 38 A0 00 FF */ li r5, 0xff -/* 8018ACBC 38 C0 00 00 */ li r6, 0 -/* 8018ACC0 88 FF 00 08 */ lbz r7, 8(r31) -/* 8018ACC4 48 00 29 8D */ bl selectWakuAlpahAnmInit__14dFile_select_cFUcUcUcUc -/* 8018ACC8 7F C3 F3 78 */ mr r3, r30 -/* 8018ACCC 38 80 03 1F */ li r4, 0x31f -/* 8018ACD0 38 A0 03 29 */ li r5, 0x329 -/* 8018ACD4 4B FF BE 75 */ bl menuMoveAnmInitSet__14dFile_select_cFii -/* 8018ACD8 88 1E 02 65 */ lbz r0, 0x265(r30) -/* 8018ACDC 54 00 10 3A */ slwi r0, r0, 2 -/* 8018ACE0 7F C3 F3 78 */ mr r3, r30 -/* 8018ACE4 3C 80 80 3C */ lis r4, SelOpenStartFrameTbl@ha /* 0x803BA86C@ha */ -/* 8018ACE8 38 84 A8 6C */ addi r4, r4, SelOpenStartFrameTbl@l /* 0x803BA86C@l */ -/* 8018ACEC 7C 84 00 2E */ lwzx r4, r4, r0 -/* 8018ACF0 3C A0 80 3C */ lis r5, SelOpenEndFrameTbl@ha /* 0x803BA878@ha */ -/* 8018ACF4 38 A5 A8 78 */ addi r5, r5, SelOpenEndFrameTbl@l /* 0x803BA878@l */ -/* 8018ACF8 7C A5 00 2E */ lwzx r5, r5, r0 -/* 8018ACFC 4B FF AC 99 */ bl selectDataMoveAnmInitSet__14dFile_select_cFii -/* 8018AD00 7F C3 F3 78 */ mr r3, r30 -/* 8018AD04 38 80 00 01 */ li r4, 1 -/* 8018AD08 48 00 26 99 */ bl modoruTxtDispAnmInit__14dFile_select_cFUc -/* 8018AD0C 7F C3 F3 78 */ mr r3, r30 -/* 8018AD10 38 80 00 01 */ li r4, 1 -/* 8018AD14 48 00 27 E5 */ bl ketteiTxtDispAnmInit__14dFile_select_cFUc -/* 8018AD18 38 00 00 2C */ li r0, 0x2c -/* 8018AD1C 98 1E 02 6F */ stb r0, 0x26f(r30) -lbl_8018AD20: -/* 8018AD20 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8018AD24 83 C1 00 08 */ lwz r30, 8(r1) -/* 8018AD28 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8018AD2C 7C 08 03 A6 */ mtlr r0 -/* 8018AD30 38 21 00 10 */ addi r1, r1, 0x10 -/* 8018AD34 4E 80 00 20 */ blr diff --git a/asm/d/file/d_file_select/copyPaneMoveOk2__14dFile_select_cFv.s b/asm/d/file/d_file_select/copyPaneMoveOk2__14dFile_select_cFv.s deleted file mode 100644 index 7f040108dd8..00000000000 --- a/asm/d/file/d_file_select/copyPaneMoveOk2__14dFile_select_cFv.s +++ /dev/null @@ -1,67 +0,0 @@ -lbl_8018A868: -/* 8018A868 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8018A86C 7C 08 02 A6 */ mflr r0 -/* 8018A870 90 01 00 14 */ stw r0, 0x14(r1) -/* 8018A874 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8018A878 93 C1 00 08 */ stw r30, 8(r1) -/* 8018A87C 7C 7E 1B 78 */ mr r30, r3 -/* 8018A880 48 00 29 DD */ bl headerTxtChangeAnm__14dFile_select_cFv -/* 8018A884 7C 7F 1B 78 */ mr r31, r3 -/* 8018A888 88 9E 02 6D */ lbz r4, 0x26d(r30) -/* 8018A88C 7C 7E 22 14 */ add r3, r30, r4 -/* 8018A890 88 03 02 5B */ lbz r0, 0x25b(r3) -/* 8018A894 28 00 00 00 */ cmplwi r0, 0 -/* 8018A898 40 82 00 10 */ bne lbl_8018A8A8 -/* 8018A89C 88 03 02 58 */ lbz r0, 0x258(r3) -/* 8018A8A0 28 00 00 00 */ cmplwi r0, 0 -/* 8018A8A4 41 82 00 30 */ beq lbl_8018A8D4 -lbl_8018A8A8: -/* 8018A8A8 54 80 10 3A */ slwi r0, r4, 2 -/* 8018A8AC 7C 7E 02 14 */ add r3, r30, r0 -/* 8018A8B0 80 63 02 2C */ lwz r3, 0x22c(r3) -/* 8018A8B4 3C 80 80 43 */ lis r4, g_fsHIO@ha /* 0x8042C9EC@ha */ -/* 8018A8B8 38 84 C9 EC */ addi r4, r4, g_fsHIO@l /* 0x8042C9EC@l */ -/* 8018A8BC 88 84 00 07 */ lbz r4, 7(r4) -/* 8018A8C0 38 A0 00 00 */ li r5, 0 -/* 8018A8C4 38 C0 00 FF */ li r6, 0xff -/* 8018A8C8 38 E0 00 00 */ li r7, 0 -/* 8018A8CC 48 0C AF AD */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc -/* 8018A8D0 48 00 00 2C */ b lbl_8018A8FC -lbl_8018A8D4: -/* 8018A8D4 54 80 10 3A */ slwi r0, r4, 2 -/* 8018A8D8 7C 7E 02 14 */ add r3, r30, r0 -/* 8018A8DC 80 63 02 20 */ lwz r3, 0x220(r3) -/* 8018A8E0 3C 80 80 43 */ lis r4, g_fsHIO@ha /* 0x8042C9EC@ha */ -/* 8018A8E4 38 84 C9 EC */ addi r4, r4, g_fsHIO@l /* 0x8042C9EC@l */ -/* 8018A8E8 88 84 00 07 */ lbz r4, 7(r4) -/* 8018A8EC 38 A0 00 00 */ li r5, 0 -/* 8018A8F0 38 C0 00 FF */ li r6, 0xff -/* 8018A8F4 38 E0 00 00 */ li r7, 0 -/* 8018A8F8 48 0C AF 81 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc -lbl_8018A8FC: -/* 8018A8FC 80 9E 00 6C */ lwz r4, 0x6c(r30) -/* 8018A900 88 84 00 3D */ lbz r4, 0x3d(r4) -/* 8018A904 30 04 FF FF */ addic r0, r4, -1 -/* 8018A908 7C 00 21 10 */ subfe r0, r0, r4 -/* 8018A90C 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 8018A910 57 E0 06 3E */ clrlwi r0, r31, 0x18 -/* 8018A914 28 00 00 01 */ cmplwi r0, 1 -/* 8018A918 40 82 00 30 */ bne lbl_8018A948 -/* 8018A91C 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8018A920 28 00 00 01 */ cmplwi r0, 1 -/* 8018A924 40 82 00 24 */ bne lbl_8018A948 -/* 8018A928 28 04 00 01 */ cmplwi r4, 1 -/* 8018A92C 40 82 00 1C */ bne lbl_8018A948 -/* 8018A930 3C 60 80 43 */ lis r3, g_fsHIO@ha /* 0x8042C9EC@ha */ -/* 8018A934 38 63 C9 EC */ addi r3, r3, g_fsHIO@l /* 0x8042C9EC@l */ -/* 8018A938 88 03 00 0A */ lbz r0, 0xa(r3) -/* 8018A93C B0 1E 03 AC */ sth r0, 0x3ac(r30) -/* 8018A940 38 00 00 2A */ li r0, 0x2a -/* 8018A944 98 1E 02 6F */ stb r0, 0x26f(r30) -lbl_8018A948: -/* 8018A948 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8018A94C 83 C1 00 08 */ lwz r30, 8(r1) -/* 8018A950 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8018A954 7C 08 03 A6 */ mtlr r0 -/* 8018A958 38 21 00 10 */ addi r1, r1, 0x10 -/* 8018A95C 4E 80 00 20 */ blr diff --git a/asm/d/file/d_file_select/copyPaneMoveOk__14dFile_select_cFv.s b/asm/d/file/d_file_select/copyPaneMoveOk__14dFile_select_cFv.s deleted file mode 100644 index 55ce4fa83df..00000000000 --- a/asm/d/file/d_file_select/copyPaneMoveOk__14dFile_select_cFv.s +++ /dev/null @@ -1,97 +0,0 @@ -lbl_8018A6F8: -/* 8018A6F8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8018A6FC 7C 08 02 A6 */ mflr r0 -/* 8018A700 90 01 00 24 */ stw r0, 0x24(r1) -/* 8018A704 39 61 00 20 */ addi r11, r1, 0x20 -/* 8018A708 48 1D 7A D1 */ bl _savegpr_28 -/* 8018A70C 7C 7F 1B 78 */ mr r31, r3 -/* 8018A710 88 03 02 6D */ lbz r0, 0x26d(r3) -/* 8018A714 54 00 10 3A */ slwi r0, r0, 2 -/* 8018A718 7C 7F 02 14 */ add r3, r31, r0 -/* 8018A71C 80 63 01 58 */ lwz r3, 0x158(r3) -/* 8018A720 3C 80 80 43 */ lis r4, g_fsHIO@ha /* 0x8042C9EC@ha */ -/* 8018A724 3B 84 C9 EC */ addi r28, r4, g_fsHIO@l /* 0x8042C9EC@l */ -/* 8018A728 88 9C 00 09 */ lbz r4, 9(r28) -/* 8018A72C 38 A0 00 FF */ li r5, 0xff -/* 8018A730 38 C0 00 00 */ li r6, 0 -/* 8018A734 38 E0 00 00 */ li r7, 0 -/* 8018A738 48 0C B1 41 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc -/* 8018A73C 7C 7D 1B 78 */ mr r29, r3 -/* 8018A740 88 1F 02 65 */ lbz r0, 0x265(r31) -/* 8018A744 54 00 10 3A */ slwi r0, r0, 2 -/* 8018A748 7C 7F 02 14 */ add r3, r31, r0 -/* 8018A74C 80 63 01 58 */ lwz r3, 0x158(r3) -/* 8018A750 88 9C 00 09 */ lbz r4, 9(r28) -/* 8018A754 38 A0 00 FF */ li r5, 0xff -/* 8018A758 38 C0 00 00 */ li r6, 0 -/* 8018A75C 38 E0 00 00 */ li r7, 0 -/* 8018A760 48 0C B1 19 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc -/* 8018A764 7C 7E 1B 78 */ mr r30, r3 -/* 8018A768 88 9F 02 6D */ lbz r4, 0x26d(r31) -/* 8018A76C 7C 7F 22 14 */ add r3, r31, r4 -/* 8018A770 88 03 02 5B */ lbz r0, 0x25b(r3) -/* 8018A774 28 00 00 00 */ cmplwi r0, 0 -/* 8018A778 40 82 00 10 */ bne lbl_8018A788 -/* 8018A77C 88 03 02 58 */ lbz r0, 0x258(r3) -/* 8018A780 28 00 00 00 */ cmplwi r0, 0 -/* 8018A784 41 82 00 28 */ beq lbl_8018A7AC -lbl_8018A788: -/* 8018A788 54 80 10 3A */ slwi r0, r4, 2 -/* 8018A78C 7C 7F 02 14 */ add r3, r31, r0 -/* 8018A790 80 63 02 2C */ lwz r3, 0x22c(r3) -/* 8018A794 88 9C 00 09 */ lbz r4, 9(r28) -/* 8018A798 38 A0 00 FF */ li r5, 0xff -/* 8018A79C 38 C0 00 00 */ li r6, 0 -/* 8018A7A0 38 E0 00 00 */ li r7, 0 -/* 8018A7A4 48 0C B0 D5 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc -/* 8018A7A8 48 00 00 24 */ b lbl_8018A7CC -lbl_8018A7AC: -/* 8018A7AC 54 80 10 3A */ slwi r0, r4, 2 -/* 8018A7B0 7C 7F 02 14 */ add r3, r31, r0 -/* 8018A7B4 80 63 02 20 */ lwz r3, 0x220(r3) -/* 8018A7B8 88 9C 00 09 */ lbz r4, 9(r28) -/* 8018A7BC 38 A0 00 FF */ li r5, 0xff -/* 8018A7C0 38 C0 00 00 */ li r6, 0 -/* 8018A7C4 38 E0 00 00 */ li r7, 0 -/* 8018A7C8 48 0C B0 B1 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc -lbl_8018A7CC: -/* 8018A7CC 57 A0 06 3E */ clrlwi r0, r29, 0x18 -/* 8018A7D0 28 00 00 01 */ cmplwi r0, 1 -/* 8018A7D4 40 82 00 7C */ bne lbl_8018A850 -/* 8018A7D8 57 C0 06 3E */ clrlwi r0, r30, 0x18 -/* 8018A7DC 28 00 00 01 */ cmplwi r0, 1 -/* 8018A7E0 40 82 00 70 */ bne lbl_8018A850 -/* 8018A7E4 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8018A7E8 28 00 00 01 */ cmplwi r0, 1 -/* 8018A7EC 40 82 00 64 */ bne lbl_8018A850 -/* 8018A7F0 38 00 00 00 */ li r0, 0 -/* 8018A7F4 98 1F 02 09 */ stb r0, 0x209(r31) -/* 8018A7F8 7F E3 FB 78 */ mr r3, r31 -/* 8018A7FC 38 80 00 47 */ li r4, 0x47 -/* 8018A800 38 A0 00 00 */ li r5, 0 -/* 8018A804 38 C0 00 00 */ li r6, 0 -/* 8018A808 48 00 28 DD */ bl headerTxtSet__14dFile_select_cFUsUcUc -/* 8018A80C 80 7F 00 6C */ lwz r3, 0x6c(r31) -/* 8018A810 48 00 78 FD */ bl closeInit__15dFile_warning_cFv -/* 8018A814 7F E3 FB 78 */ mr r3, r31 -/* 8018A818 48 00 28 2D */ bl setSaveData__14dFile_select_cFv -/* 8018A81C 38 80 00 00 */ li r4, 0 -/* 8018A820 88 1F 02 6D */ lbz r0, 0x26d(r31) -/* 8018A824 54 00 10 3A */ slwi r0, r0, 2 -/* 8018A828 7C 7F 02 14 */ add r3, r31, r0 -/* 8018A82C 80 63 02 2C */ lwz r3, 0x22c(r3) -/* 8018A830 B0 83 00 16 */ sth r4, 0x16(r3) -/* 8018A834 88 1F 02 6D */ lbz r0, 0x26d(r31) -/* 8018A838 54 00 10 3A */ slwi r0, r0, 2 -/* 8018A83C 7C 7F 02 14 */ add r3, r31, r0 -/* 8018A840 80 63 02 20 */ lwz r3, 0x220(r3) -/* 8018A844 B0 83 00 16 */ sth r4, 0x16(r3) -/* 8018A848 38 00 00 24 */ li r0, 0x24 -/* 8018A84C 98 1F 02 6F */ stb r0, 0x26f(r31) -lbl_8018A850: -/* 8018A850 39 61 00 20 */ addi r11, r1, 0x20 -/* 8018A854 48 1D 79 D1 */ bl _restgpr_28 -/* 8018A858 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8018A85C 7C 08 03 A6 */ mtlr r0 -/* 8018A860 38 21 00 20 */ addi r1, r1, 0x20 -/* 8018A864 4E 80 00 20 */ blr diff --git a/asm/d/file/d_file_select/copySelectWakuAlpahAnmInit__14dFile_select_cFUcUcUcUc.s b/asm/d/file/d_file_select/copySelectWakuAlpahAnmInit__14dFile_select_cFUcUcUcUc.s deleted file mode 100644 index 99a23b554cc..00000000000 --- a/asm/d/file/d_file_select/copySelectWakuAlpahAnmInit__14dFile_select_cFUcUcUcUc.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_80188834: -/* 80188834 54 89 06 3E */ clrlwi r9, r4, 0x18 -/* 80188838 28 09 00 FF */ cmplwi r9, 0xff -/* 8018883C 4D 82 00 20 */ beqlr -/* 80188840 38 00 00 00 */ li r0, 0 -/* 80188844 54 84 15 BA */ rlwinm r4, r4, 2, 0x16, 0x1d -/* 80188848 7D 03 22 14 */ add r8, r3, r4 -/* 8018884C 80 88 02 C0 */ lwz r4, 0x2c0(r8) -/* 80188850 B0 04 00 16 */ sth r0, 0x16(r4) -/* 80188854 80 88 02 C8 */ lwz r4, 0x2c8(r8) -/* 80188858 B0 04 00 16 */ sth r0, 0x16(r4) -/* 8018885C 80 88 02 D0 */ lwz r4, 0x2d0(r8) -/* 80188860 B0 04 00 16 */ sth r0, 0x16(r4) -/* 80188864 7C 63 4A 14 */ add r3, r3, r9 -/* 80188868 98 A3 02 E0 */ stb r5, 0x2e0(r3) -/* 8018886C 98 C3 02 E2 */ stb r6, 0x2e2(r3) -/* 80188870 98 E3 02 E4 */ stb r7, 0x2e4(r3) -/* 80188874 4E 80 00 20 */ blr diff --git a/asm/d/file/d_file_select/copySelectWakuAlpahAnm__14dFile_select_cFUc.s b/asm/d/file/d_file_select/copySelectWakuAlpahAnm__14dFile_select_cFUc.s deleted file mode 100644 index a03fe3318f5..00000000000 --- a/asm/d/file/d_file_select/copySelectWakuAlpahAnm__14dFile_select_cFUc.s +++ /dev/null @@ -1,58 +0,0 @@ -lbl_80188878: -/* 80188878 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8018887C 7C 08 02 A6 */ mflr r0 -/* 80188880 90 01 00 24 */ stw r0, 0x24(r1) -/* 80188884 39 61 00 20 */ addi r11, r1, 0x20 -/* 80188888 48 1D 99 49 */ bl _savegpr_26 -/* 8018888C 7C 7A 1B 78 */ mr r26, r3 -/* 80188890 54 80 06 3E */ clrlwi r0, r4, 0x18 -/* 80188894 28 00 00 FF */ cmplwi r0, 0xff -/* 80188898 40 82 00 0C */ bne lbl_801888A4 -/* 8018889C 38 60 00 01 */ li r3, 1 -/* 801888A0 48 00 00 98 */ b lbl_80188938 -lbl_801888A4: -/* 801888A4 3B 60 00 00 */ li r27, 0 -/* 801888A8 54 9C 15 BA */ rlwinm r28, r4, 2, 0x16, 0x1d -/* 801888AC 7C 7A E2 14 */ add r3, r26, r28 -/* 801888B0 80 63 02 C0 */ lwz r3, 0x2c0(r3) -/* 801888B4 7F BA 02 14 */ add r29, r26, r0 -/* 801888B8 88 9D 02 E4 */ lbz r4, 0x2e4(r29) -/* 801888BC 88 BD 02 E0 */ lbz r5, 0x2e0(r29) -/* 801888C0 88 DD 02 E2 */ lbz r6, 0x2e2(r29) -/* 801888C4 38 E0 00 00 */ li r7, 0 -/* 801888C8 48 0C CF B1 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc -/* 801888CC 7C 7E 1B 78 */ mr r30, r3 -/* 801888D0 7C 7A E2 14 */ add r3, r26, r28 -/* 801888D4 80 63 02 C8 */ lwz r3, 0x2c8(r3) -/* 801888D8 88 9D 02 E4 */ lbz r4, 0x2e4(r29) -/* 801888DC 88 BD 02 E0 */ lbz r5, 0x2e0(r29) -/* 801888E0 88 DD 02 E2 */ lbz r6, 0x2e2(r29) -/* 801888E4 38 E0 00 00 */ li r7, 0 -/* 801888E8 48 0C CF 91 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc -/* 801888EC 7C 7F 1B 78 */ mr r31, r3 -/* 801888F0 7C 7A E2 14 */ add r3, r26, r28 -/* 801888F4 80 63 02 D0 */ lwz r3, 0x2d0(r3) -/* 801888F8 88 9D 02 E4 */ lbz r4, 0x2e4(r29) -/* 801888FC 88 BD 02 E0 */ lbz r5, 0x2e0(r29) -/* 80188900 88 DD 02 E2 */ lbz r6, 0x2e2(r29) -/* 80188904 38 E0 00 00 */ li r7, 0 -/* 80188908 48 0C CF 71 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc -/* 8018890C 57 C0 06 3E */ clrlwi r0, r30, 0x18 -/* 80188910 28 00 00 01 */ cmplwi r0, 1 -/* 80188914 40 82 00 20 */ bne lbl_80188934 -/* 80188918 57 E0 06 3E */ clrlwi r0, r31, 0x18 -/* 8018891C 28 00 00 01 */ cmplwi r0, 1 -/* 80188920 40 82 00 14 */ bne lbl_80188934 -/* 80188924 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80188928 28 00 00 01 */ cmplwi r0, 1 -/* 8018892C 40 82 00 08 */ bne lbl_80188934 -/* 80188930 3B 60 00 01 */ li r27, 1 -lbl_80188934: -/* 80188934 7F 63 DB 78 */ mr r3, r27 -lbl_80188938: -/* 80188938 39 61 00 20 */ addi r11, r1, 0x20 -/* 8018893C 48 1D 98 E1 */ bl _restgpr_26 -/* 80188940 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80188944 7C 08 03 A6 */ mtlr r0 -/* 80188948 38 21 00 20 */ addi r1, r1, 0x20 -/* 8018894C 4E 80 00 20 */ blr diff --git a/asm/d/file/d_file_select/copyToSelPaneMove__14dFile_select_cFv.s b/asm/d/file/d_file_select/copyToSelPaneMove__14dFile_select_cFv.s deleted file mode 100644 index 9afa70f7e7f..00000000000 --- a/asm/d/file/d_file_select/copyToSelPaneMove__14dFile_select_cFv.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_80188B54: -/* 80188B54 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80188B58 7C 08 02 A6 */ mflr r0 -/* 80188B5C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80188B60 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80188B64 93 C1 00 08 */ stw r30, 8(r1) -/* 80188B68 7C 7E 1B 78 */ mr r30, r3 -/* 80188B6C 48 00 46 F1 */ bl headerTxtChangeAnm__14dFile_select_cFv -/* 80188B70 7C 7F 1B 78 */ mr r31, r3 -/* 80188B74 7F C3 F3 78 */ mr r3, r30 -/* 80188B78 48 00 01 C1 */ bl yesnoMenuMoveAnm__14dFile_select_cFv -/* 80188B7C 57 E0 06 3E */ clrlwi r0, r31, 0x18 -/* 80188B80 28 00 00 01 */ cmplwi r0, 1 -/* 80188B84 40 82 00 20 */ bne lbl_80188BA4 -/* 80188B88 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80188B8C 28 00 00 01 */ cmplwi r0, 1 -/* 80188B90 40 82 00 14 */ bne lbl_80188BA4 -/* 80188B94 7F C3 F3 78 */ mr r3, r30 -/* 80188B98 48 00 05 95 */ bl yesnoCursorShow__14dFile_select_cFv -/* 80188B9C 38 00 00 1A */ li r0, 0x1a -/* 80188BA0 98 1E 02 6F */ stb r0, 0x26f(r30) -lbl_80188BA4: -/* 80188BA4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80188BA8 83 C1 00 08 */ lwz r30, 8(r1) -/* 80188BAC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80188BB0 7C 08 03 A6 */ mtlr r0 -/* 80188BB4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80188BB8 4E 80 00 20 */ blr diff --git a/asm/d/file/d_file_select/dataSave__14dFile_select_cFv.s b/asm/d/file/d_file_select/dataSave__14dFile_select_cFv.s deleted file mode 100644 index c1e56734918..00000000000 --- a/asm/d/file/d_file_select/dataSave__14dFile_select_cFv.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_801902B8: -/* 801902B8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801902BC 7C 08 02 A6 */ mflr r0 -/* 801902C0 90 01 00 14 */ stw r0, 0x14(r1) -/* 801902C4 7C 64 1B 78 */ mr r4, r3 -/* 801902C8 3C 60 80 3F */ lis r3, g_mDoMemCd_control@ha /* 0x803EAF40@ha */ -/* 801902CC 38 63 AF 40 */ addi r3, r3, g_mDoMemCd_control@l /* 0x803EAF40@l */ -/* 801902D0 38 84 03 B8 */ addi r4, r4, 0x3b8 -/* 801902D4 38 A0 1F BC */ li r5, 0x1fbc -/* 801902D8 38 C0 00 00 */ li r6, 0 -/* 801902DC 4B E8 68 7D */ bl save__15mDoMemCd_Ctrl_cFPvUlUl -/* 801902E0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801902E4 7C 08 03 A6 */ mtlr r0 -/* 801902E8 38 21 00 10 */ addi r1, r1, 0x10 -/* 801902EC 4E 80 00 20 */ blr diff --git a/asm/d/file/d_file_select/displayInit__14dFile_select_cFv.s b/asm/d/file/d_file_select/displayInit__14dFile_select_cFv.s deleted file mode 100644 index 00c61e94374..00000000000 --- a/asm/d/file/d_file_select/displayInit__14dFile_select_cFv.s +++ /dev/null @@ -1,62 +0,0 @@ -lbl_8018CF50: -/* 8018CF50 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8018CF54 7C 08 02 A6 */ mflr r0 -/* 8018CF58 90 01 00 14 */ stw r0, 0x14(r1) -/* 8018CF5C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8018CF60 7C 7F 1B 78 */ mr r31, r3 -/* 8018CF64 38 80 00 00 */ li r4, 0 -/* 8018CF68 98 83 03 B1 */ stb r4, 0x3b1(r3) -/* 8018CF6C 98 83 02 70 */ stb r4, 0x270(r3) -/* 8018CF70 3C 60 80 43 */ lis r3, g_fsHIO@ha /* 0x8042C9EC@ha */ -/* 8018CF74 38 63 C9 EC */ addi r3, r3, g_fsHIO@l /* 0x8042C9EC@l */ -/* 8018CF78 88 03 00 0B */ lbz r0, 0xb(r3) -/* 8018CF7C B0 1F 03 AC */ sth r0, 0x3ac(r31) -/* 8018CF80 98 9F 00 B8 */ stb r4, 0xb8(r31) -/* 8018CF84 98 9F 01 4A */ stb r4, 0x14a(r31) -/* 8018CF88 98 9F 03 60 */ stb r4, 0x360(r31) -/* 8018CF8C 98 9F 01 08 */ stb r4, 0x108(r31) -/* 8018CF90 98 9F 02 1E */ stb r4, 0x21e(r31) -/* 8018CF94 98 9F 00 B9 */ stb r4, 0xb9(r31) -/* 8018CF98 98 9F 01 4B */ stb r4, 0x14b(r31) -/* 8018CF9C 98 9F 02 81 */ stb r4, 0x281(r31) -/* 8018CFA0 98 9F 02 83 */ stb r4, 0x283(r31) -/* 8018CFA4 38 00 00 02 */ li r0, 2 -/* 8018CFA8 3C 60 80 3F */ lis r3, g_mDoMemCd_control@ha /* 0x803EAF40@ha */ -/* 8018CFAC 38 63 AF 40 */ addi r3, r3, g_mDoMemCd_control@l /* 0x803EAF40@l */ -/* 8018CFB0 98 03 1F BE */ stb r0, 0x1fbe(r3) -/* 8018CFB4 98 9F 02 48 */ stb r4, 0x248(r31) -/* 8018CFB8 98 9F 02 4A */ stb r4, 0x24a(r31) -/* 8018CFBC 98 9F 02 49 */ stb r4, 0x249(r31) -/* 8018CFC0 98 9F 02 4B */ stb r4, 0x24b(r31) -/* 8018CFC4 80 7F 02 40 */ lwz r3, 0x240(r31) -/* 8018CFC8 38 80 00 00 */ li r4, 0 -/* 8018CFCC 81 83 00 00 */ lwz r12, 0(r3) -/* 8018CFD0 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 8018CFD4 7D 89 03 A6 */ mtctr r12 -/* 8018CFD8 4E 80 04 21 */ bctrl -/* 8018CFDC 80 7F 02 44 */ lwz r3, 0x244(r31) -/* 8018CFE0 38 80 00 00 */ li r4, 0 -/* 8018CFE4 81 83 00 00 */ lwz r12, 0(r3) -/* 8018CFE8 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 8018CFEC 7D 89 03 A6 */ mtctr r12 -/* 8018CFF0 4E 80 04 21 */ bctrl -/* 8018CFF4 80 7F 02 38 */ lwz r3, 0x238(r31) -/* 8018CFF8 38 80 00 80 */ li r4, 0x80 -/* 8018CFFC 81 83 00 00 */ lwz r12, 0(r3) -/* 8018D000 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 8018D004 7D 89 03 A6 */ mtctr r12 -/* 8018D008 4E 80 04 21 */ bctrl -/* 8018D00C 80 7F 02 3C */ lwz r3, 0x23c(r31) -/* 8018D010 38 80 00 80 */ li r4, 0x80 -/* 8018D014 81 83 00 00 */ lwz r12, 0(r3) -/* 8018D018 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 8018D01C 7D 89 03 A6 */ mtctr r12 -/* 8018D020 4E 80 04 21 */ bctrl -/* 8018D024 38 00 00 00 */ li r0, 0 -/* 8018D028 98 1F 02 6F */ stb r0, 0x26f(r31) -/* 8018D02C 98 1F 02 71 */ stb r0, 0x271(r31) -/* 8018D030 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8018D034 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8018D038 7C 08 03 A6 */ mtlr r0 -/* 8018D03C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8018D040 4E 80 00 20 */ blr diff --git a/asm/d/file/d_file_select/eraseEndBackSelectWait__14dFile_select_cFv.s b/asm/d/file/d_file_select/eraseEndBackSelectWait__14dFile_select_cFv.s deleted file mode 100644 index 8fd2dab7387..00000000000 --- a/asm/d/file/d_file_select/eraseEndBackSelectWait__14dFile_select_cFv.s +++ /dev/null @@ -1,40 +0,0 @@ -lbl_8018A3B0: -/* 8018A3B0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8018A3B4 7C 08 02 A6 */ mflr r0 -/* 8018A3B8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8018A3BC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8018A3C0 7C 7F 1B 78 */ mr r31, r3 -/* 8018A3C4 A8 83 03 AC */ lha r4, 0x3ac(r3) -/* 8018A3C8 7C 80 07 35 */ extsh. r0, r4 -/* 8018A3CC 41 82 00 10 */ beq lbl_8018A3DC -/* 8018A3D0 38 04 FF FF */ addi r0, r4, -1 -/* 8018A3D4 B0 1F 03 AC */ sth r0, 0x3ac(r31) -/* 8018A3D8 48 00 00 58 */ b lbl_8018A430 -lbl_8018A3DC: -/* 8018A3DC 7C 80 07 35 */ extsh. r0, r4 -/* 8018A3E0 40 82 00 50 */ bne lbl_8018A430 -/* 8018A3E4 88 1F 02 65 */ lbz r0, 0x265(r31) -/* 8018A3E8 54 00 10 3A */ slwi r0, r0, 2 -/* 8018A3EC 3C 80 80 3C */ lis r4, SelOpenEndFrameTbl@ha /* 0x803BA878@ha */ -/* 8018A3F0 38 84 A8 78 */ addi r4, r4, SelOpenEndFrameTbl@l /* 0x803BA878@l */ -/* 8018A3F4 7C 84 00 2E */ lwzx r4, r4, r0 -/* 8018A3F8 3C A0 80 3C */ lis r5, SelOpenStartFrameTbl@ha /* 0x803BA86C@ha */ -/* 8018A3FC 38 A5 A8 6C */ addi r5, r5, SelOpenStartFrameTbl@l /* 0x803BA86C@l */ -/* 8018A400 7C A5 00 2E */ lwzx r5, r5, r0 -/* 8018A404 4B FF B5 91 */ bl selectDataMoveAnmInitSet__14dFile_select_cFii -/* 8018A408 7F E3 FB 78 */ mr r3, r31 -/* 8018A40C 38 80 00 43 */ li r4, 0x43 -/* 8018A410 38 A0 00 01 */ li r5, 1 -/* 8018A414 38 C0 00 00 */ li r6, 0 -/* 8018A418 48 00 2C CD */ bl headerTxtSet__14dFile_select_cFUsUcUc -/* 8018A41C 7F E3 FB 78 */ mr r3, r31 -/* 8018A420 38 80 00 01 */ li r4, 1 -/* 8018A424 48 00 30 D5 */ bl ketteiTxtDispAnmInit__14dFile_select_cFUc -/* 8018A428 38 00 00 29 */ li r0, 0x29 -/* 8018A42C 98 1F 02 6F */ stb r0, 0x26f(r31) -lbl_8018A430: -/* 8018A430 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8018A434 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8018A438 7C 08 03 A6 */ mtlr r0 -/* 8018A43C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8018A440 4E 80 00 20 */ blr diff --git a/asm/d/file/d_file_select/eraseEndBackSelect__14dFile_select_cFv.s b/asm/d/file/d_file_select/eraseEndBackSelect__14dFile_select_cFv.s deleted file mode 100644 index 703352b87b9..00000000000 --- a/asm/d/file/d_file_select/eraseEndBackSelect__14dFile_select_cFv.s +++ /dev/null @@ -1,37 +0,0 @@ -lbl_8018A444: -/* 8018A444 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8018A448 7C 08 02 A6 */ mflr r0 -/* 8018A44C 90 01 00 24 */ stw r0, 0x24(r1) -/* 8018A450 39 61 00 20 */ addi r11, r1, 0x20 -/* 8018A454 48 1D 7D 89 */ bl _savegpr_29 -/* 8018A458 7C 7D 1B 78 */ mr r29, r3 -/* 8018A45C 48 00 2E 01 */ bl headerTxtChangeAnm__14dFile_select_cFv -/* 8018A460 7C 7E 1B 78 */ mr r30, r3 -/* 8018A464 7F A3 EB 78 */ mr r3, r29 -/* 8018A468 4B FF B6 45 */ bl selectDataMoveAnm__14dFile_select_cFv -/* 8018A46C 7C 7F 1B 78 */ mr r31, r3 -/* 8018A470 7F A3 EB 78 */ mr r3, r29 -/* 8018A474 48 00 31 01 */ bl ketteiTxtDispAnm__14dFile_select_cFv -/* 8018A478 57 C0 06 3E */ clrlwi r0, r30, 0x18 -/* 8018A47C 28 00 00 01 */ cmplwi r0, 1 -/* 8018A480 40 82 00 38 */ bne lbl_8018A4B8 -/* 8018A484 57 E0 06 3E */ clrlwi r0, r31, 0x18 -/* 8018A488 28 00 00 01 */ cmplwi r0, 1 -/* 8018A48C 40 82 00 2C */ bne lbl_8018A4B8 -/* 8018A490 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8018A494 28 00 00 01 */ cmplwi r0, 1 -/* 8018A498 40 82 00 20 */ bne lbl_8018A4B8 -/* 8018A49C 7F A3 EB 78 */ mr r3, r29 -/* 8018A4A0 48 00 32 C5 */ bl selFileCursorShow__14dFile_select_cFv -/* 8018A4A4 38 00 00 00 */ li r0, 0 -/* 8018A4A8 80 7D 00 0C */ lwz r3, 0xc(r29) -/* 8018A4AC 90 03 00 08 */ stw r0, 8(r3) -/* 8018A4B0 38 00 00 03 */ li r0, 3 -/* 8018A4B4 98 1D 02 6F */ stb r0, 0x26f(r29) -lbl_8018A4B8: -/* 8018A4B8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8018A4BC 48 1D 7D 6D */ bl _restgpr_29 -/* 8018A4C0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8018A4C4 7C 08 03 A6 */ mtlr r0 -/* 8018A4C8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8018A4CC 4E 80 00 20 */ blr diff --git a/asm/d/file/d_file_select/errorTxtChangeAnm__14dFile_select_cFv.s b/asm/d/file/d_file_select/errorTxtChangeAnm__14dFile_select_cFv.s deleted file mode 100644 index 690237601d1..00000000000 --- a/asm/d/file/d_file_select/errorTxtChangeAnm__14dFile_select_cFv.s +++ /dev/null @@ -1,62 +0,0 @@ -lbl_8018FD30: -/* 8018FD30 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8018FD34 7C 08 02 A6 */ mflr r0 -/* 8018FD38 90 01 00 24 */ stw r0, 0x24(r1) -/* 8018FD3C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8018FD40 48 1D 24 99 */ bl _savegpr_28 -/* 8018FD44 7C 7F 1B 78 */ mr r31, r3 -/* 8018FD48 88 03 01 49 */ lbz r0, 0x149(r3) -/* 8018FD4C 28 00 00 00 */ cmplwi r0, 0 -/* 8018FD50 41 82 00 0C */ beq lbl_8018FD5C -/* 8018FD54 38 60 00 01 */ li r3, 1 -/* 8018FD58 48 00 00 A8 */ b lbl_8018FE00 -lbl_8018FD5C: -/* 8018FD5C 3B 80 00 00 */ li r28, 0 -/* 8018FD60 88 1F 01 48 */ lbz r0, 0x148(r31) -/* 8018FD64 54 00 10 3A */ slwi r0, r0, 2 -/* 8018FD68 7C 7F 02 14 */ add r3, r31, r0 -/* 8018FD6C 80 63 01 38 */ lwz r3, 0x138(r3) -/* 8018FD70 3C 80 80 43 */ lis r4, g_fsHIO@ha /* 0x8042C9EC@ha */ -/* 8018FD74 3B A4 C9 EC */ addi r29, r4, g_fsHIO@l /* 0x8042C9EC@l */ -/* 8018FD78 88 9D 00 07 */ lbz r4, 7(r29) -/* 8018FD7C 38 A0 00 FF */ li r5, 0xff -/* 8018FD80 38 C0 00 00 */ li r6, 0 -/* 8018FD84 38 E0 00 00 */ li r7, 0 -/* 8018FD88 48 0C 5A F1 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc -/* 8018FD8C 7C 7E 1B 78 */ mr r30, r3 -/* 8018FD90 88 1F 01 48 */ lbz r0, 0x148(r31) -/* 8018FD94 68 00 00 01 */ xori r0, r0, 1 -/* 8018FD98 54 00 10 3A */ slwi r0, r0, 2 -/* 8018FD9C 7C 7F 02 14 */ add r3, r31, r0 -/* 8018FDA0 80 63 01 38 */ lwz r3, 0x138(r3) -/* 8018FDA4 88 9D 00 07 */ lbz r4, 7(r29) -/* 8018FDA8 38 A0 00 00 */ li r5, 0 -/* 8018FDAC 38 C0 00 FF */ li r6, 0xff -/* 8018FDB0 38 E0 00 00 */ li r7, 0 -/* 8018FDB4 48 0C 5A C5 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc -/* 8018FDB8 3C 80 80 43 */ lis r4, g_meter2_info@ha /* 0x80430188@ha */ -/* 8018FDBC 38 84 01 88 */ addi r4, r4, g_meter2_info@l /* 0x80430188@l */ -/* 8018FDC0 A8 84 00 94 */ lha r4, 0x94(r4) -/* 8018FDC4 57 C0 06 3E */ clrlwi r0, r30, 0x18 -/* 8018FDC8 28 00 00 01 */ cmplwi r0, 1 -/* 8018FDCC 40 82 00 30 */ bne lbl_8018FDFC -/* 8018FDD0 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8018FDD4 28 00 00 01 */ cmplwi r0, 1 -/* 8018FDD8 40 82 00 24 */ bne lbl_8018FDFC -/* 8018FDDC 2C 04 00 00 */ cmpwi r4, 0 -/* 8018FDE0 40 82 00 1C */ bne lbl_8018FDFC -/* 8018FDE4 88 1F 01 48 */ lbz r0, 0x148(r31) -/* 8018FDE8 68 00 00 01 */ xori r0, r0, 1 -/* 8018FDEC 98 1F 01 48 */ stb r0, 0x148(r31) -/* 8018FDF0 38 00 00 01 */ li r0, 1 -/* 8018FDF4 98 1F 01 49 */ stb r0, 0x149(r31) -/* 8018FDF8 3B 80 00 01 */ li r28, 1 -lbl_8018FDFC: -/* 8018FDFC 7F 83 E3 78 */ mr r3, r28 -lbl_8018FE00: -/* 8018FE00 39 61 00 20 */ addi r11, r1, 0x20 -/* 8018FE04 48 1D 24 21 */ bl _restgpr_28 -/* 8018FE08 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8018FE0C 7C 08 03 A6 */ mtlr r0 -/* 8018FE10 38 21 00 20 */ addi r1, r1, 0x20 -/* 8018FE14 4E 80 00 20 */ blr diff --git a/asm/d/file/d_file_select/fileRecScaleAnm2__14dFile_select_cFv.s b/asm/d/file/d_file_select/fileRecScaleAnm2__14dFile_select_cFv.s deleted file mode 100644 index bef30e267a8..00000000000 --- a/asm/d/file/d_file_select/fileRecScaleAnm2__14dFile_select_cFv.s +++ /dev/null @@ -1,46 +0,0 @@ -lbl_8018FEF4: -/* 8018FEF4 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 8018FEF8 7C 08 02 A6 */ mflr r0 -/* 8018FEFC 90 01 00 34 */ stw r0, 0x34(r1) -/* 8018FF00 39 61 00 30 */ addi r11, r1, 0x30 -/* 8018FF04 48 1D 22 D1 */ bl _savegpr_27 -/* 8018FF08 7C 7B 1B 78 */ mr r27, r3 -/* 8018FF0C 3B 80 00 00 */ li r28, 0 -/* 8018FF10 3B C0 00 00 */ li r30, 0 -/* 8018FF14 3C 60 80 43 */ lis r3, g_fsHIO@ha /* 0x8042C9EC@ha */ -/* 8018FF18 3B A3 C9 EC */ addi r29, r3, g_fsHIO@l /* 0x8042C9EC@l */ -/* 8018FF1C 3B E1 00 08 */ addi r31, r1, 8 -lbl_8018FF20: -/* 8018FF20 7C BB F2 14 */ add r5, r27, r30 -/* 8018FF24 80 65 00 BC */ lwz r3, 0xbc(r5) -/* 8018FF28 88 9D 00 05 */ lbz r4, 5(r29) -/* 8018FF2C C0 25 00 C8 */ lfs f1, 0xc8(r5) -/* 8018FF30 C0 45 00 D4 */ lfs f2, 0xd4(r5) -/* 8018FF34 38 A0 00 00 */ li r5, 0 -/* 8018FF38 48 0C 48 95 */ bl scaleAnime__8CPaneMgrFsffUc -/* 8018FF3C 98 7F 00 00 */ stb r3, 0(r31) -/* 8018FF40 3B 9C 00 01 */ addi r28, r28, 1 -/* 8018FF44 2C 1C 00 03 */ cmpwi r28, 3 -/* 8018FF48 3B FF 00 01 */ addi r31, r31, 1 -/* 8018FF4C 3B DE 00 04 */ addi r30, r30, 4 -/* 8018FF50 41 80 FF D0 */ blt lbl_8018FF20 -/* 8018FF54 88 01 00 08 */ lbz r0, 8(r1) -/* 8018FF58 28 00 00 01 */ cmplwi r0, 1 -/* 8018FF5C 40 82 00 24 */ bne lbl_8018FF80 -/* 8018FF60 88 01 00 09 */ lbz r0, 9(r1) -/* 8018FF64 28 00 00 01 */ cmplwi r0, 1 -/* 8018FF68 40 82 00 18 */ bne lbl_8018FF80 -/* 8018FF6C 88 01 00 0A */ lbz r0, 0xa(r1) -/* 8018FF70 28 00 00 01 */ cmplwi r0, 1 -/* 8018FF74 40 82 00 0C */ bne lbl_8018FF80 -/* 8018FF78 38 60 00 01 */ li r3, 1 -/* 8018FF7C 48 00 00 08 */ b lbl_8018FF84 -lbl_8018FF80: -/* 8018FF80 38 60 00 00 */ li r3, 0 -lbl_8018FF84: -/* 8018FF84 39 61 00 30 */ addi r11, r1, 0x30 -/* 8018FF88 48 1D 22 99 */ bl _restgpr_27 -/* 8018FF8C 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8018FF90 7C 08 03 A6 */ mtlr r0 -/* 8018FF94 38 21 00 30 */ addi r1, r1, 0x30 -/* 8018FF98 4E 80 00 20 */ blr diff --git a/asm/d/file/d_file_select/formatNoSelDispInitSet__14dFile_select_cFv.s b/asm/d/file/d_file_select/formatNoSelDispInitSet__14dFile_select_cFv.s deleted file mode 100644 index 65ca5b7dc66..00000000000 --- a/asm/d/file/d_file_select/formatNoSelDispInitSet__14dFile_select_cFv.s +++ /dev/null @@ -1,21 +0,0 @@ -lbl_8018EFAC: -/* 8018EFAC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8018EFB0 7C 08 02 A6 */ mflr r0 -/* 8018EFB4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8018EFB8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8018EFBC 7C 7F 1B 78 */ mr r31, r3 -/* 8018EFC0 38 80 00 11 */ li r4, 0x11 -/* 8018EFC4 48 00 0C A1 */ bl errorTxtSet__14dFile_select_cFUs -/* 8018EFC8 38 00 00 00 */ li r0, 0 -/* 8018EFCC 98 1F 02 80 */ stb r0, 0x280(r31) -/* 8018EFD0 7F E3 FB 78 */ mr r3, r31 -/* 8018EFD4 38 80 04 7D */ li r4, 0x47d -/* 8018EFD8 38 A0 04 73 */ li r5, 0x473 -/* 8018EFDC 4B FF 9B E1 */ bl yesnoMenuMoveAnmInitSet__14dFile_select_cFii -/* 8018EFE0 38 00 00 07 */ li r0, 7 -/* 8018EFE4 98 1F 02 71 */ stb r0, 0x271(r31) -/* 8018EFE8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8018EFEC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8018EFF0 7C 08 03 A6 */ mtlr r0 -/* 8018EFF4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8018EFF8 4E 80 00 20 */ blr diff --git a/asm/d/file/d_file_select/formatYesSel2DispInitSet__14dFile_select_cFv.s b/asm/d/file/d_file_select/formatYesSel2DispInitSet__14dFile_select_cFv.s deleted file mode 100644 index 78392792b19..00000000000 --- a/asm/d/file/d_file_select/formatYesSel2DispInitSet__14dFile_select_cFv.s +++ /dev/null @@ -1,21 +0,0 @@ -lbl_8018F17C: -/* 8018F17C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8018F180 7C 08 02 A6 */ mflr r0 -/* 8018F184 90 01 00 14 */ stw r0, 0x14(r1) -/* 8018F188 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8018F18C 7C 7F 1B 78 */ mr r31, r3 -/* 8018F190 38 80 00 0D */ li r4, 0xd -/* 8018F194 48 00 0A D1 */ bl errorTxtSet__14dFile_select_cFUs -/* 8018F198 38 00 00 00 */ li r0, 0 -/* 8018F19C 98 1F 02 80 */ stb r0, 0x280(r31) -/* 8018F1A0 7F E3 FB 78 */ mr r3, r31 -/* 8018F1A4 38 80 04 7D */ li r4, 0x47d -/* 8018F1A8 38 A0 04 73 */ li r5, 0x473 -/* 8018F1AC 4B FF 9A 11 */ bl yesnoMenuMoveAnmInitSet__14dFile_select_cFii -/* 8018F1B0 38 00 00 09 */ li r0, 9 -/* 8018F1B4 98 1F 02 71 */ stb r0, 0x271(r31) -/* 8018F1B8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8018F1BC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8018F1C0 7C 08 03 A6 */ mtlr r0 -/* 8018F1C4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8018F1C8 4E 80 00 20 */ blr diff --git a/asm/d/file/d_file_select/formatYesSelDispInitSet__14dFile_select_cFv.s b/asm/d/file/d_file_select/formatYesSelDispInitSet__14dFile_select_cFv.s deleted file mode 100644 index a79c1a499cf..00000000000 --- a/asm/d/file/d_file_select/formatYesSelDispInitSet__14dFile_select_cFv.s +++ /dev/null @@ -1,21 +0,0 @@ -lbl_8018EF5C: -/* 8018EF5C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8018EF60 7C 08 02 A6 */ mflr r0 -/* 8018EF64 90 01 00 14 */ stw r0, 0x14(r1) -/* 8018EF68 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8018EF6C 7C 7F 1B 78 */ mr r31, r3 -/* 8018EF70 38 80 00 0E */ li r4, 0xe -/* 8018EF74 48 00 0C F1 */ bl errorTxtSet__14dFile_select_cFUs -/* 8018EF78 38 00 00 00 */ li r0, 0 -/* 8018EF7C 98 1F 02 68 */ stb r0, 0x268(r31) -/* 8018EF80 38 00 00 01 */ li r0, 1 -/* 8018EF84 98 1F 02 69 */ stb r0, 0x269(r31) -/* 8018EF88 7F E3 FB 78 */ mr r3, r31 -/* 8018EF8C 4B FF A8 01 */ bl yesnoSelectAnmSet__14dFile_select_cFv -/* 8018EF90 38 00 00 06 */ li r0, 6 -/* 8018EF94 98 1F 02 71 */ stb r0, 0x271(r31) -/* 8018EF98 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8018EF9C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8018EFA0 7C 08 03 A6 */ mtlr r0 -/* 8018EFA4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8018EFA8 4E 80 00 20 */ blr diff --git a/asm/d/file/d_file_select/getCptoNum__14dFile_select_cFUc.s b/asm/d/file/d_file_select/getCptoNum__14dFile_select_cFUc.s deleted file mode 100644 index f6f0cc840d4..00000000000 --- a/asm/d/file/d_file_select/getCptoNum__14dFile_select_cFUc.s +++ /dev/null @@ -1,22 +0,0 @@ -lbl_80188950: -/* 80188950 88 03 02 6A */ lbz r0, 0x26a(r3) -/* 80188954 2C 00 00 01 */ cmpwi r0, 1 -/* 80188958 41 82 00 2C */ beq lbl_80188984 -/* 8018895C 40 80 00 10 */ bge lbl_8018896C -/* 80188960 2C 00 00 00 */ cmpwi r0, 0 -/* 80188964 40 80 00 14 */ bge lbl_80188978 -/* 80188968 4E 80 00 20 */ blr -lbl_8018896C: -/* 8018896C 2C 00 00 03 */ cmpwi r0, 3 -/* 80188970 4C 80 00 20 */ bgelr -/* 80188974 48 00 00 18 */ b lbl_8018898C -lbl_80188978: -/* 80188978 38 04 00 01 */ addi r0, r4, 1 -/* 8018897C 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 80188980 4E 80 00 20 */ blr -lbl_80188984: -/* 80188984 54 83 0E 3C */ rlwinm r3, r4, 1, 0x18, 0x1e -/* 80188988 4E 80 00 20 */ blr -lbl_8018898C: -/* 8018898C 7C 83 23 78 */ mr r3, r4 -/* 80188990 4E 80 00 20 */ blr diff --git a/asm/d/file/d_file_select/iplSelDispInit__14dFile_select_cFv.s b/asm/d/file/d_file_select/iplSelDispInit__14dFile_select_cFv.s deleted file mode 100644 index b85c1a42f41..00000000000 --- a/asm/d/file/d_file_select/iplSelDispInit__14dFile_select_cFv.s +++ /dev/null @@ -1,22 +0,0 @@ -lbl_8018EA3C: -/* 8018EA3C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8018EA40 7C 08 02 A6 */ mflr r0 -/* 8018EA44 90 01 00 14 */ stw r0, 0x14(r1) -/* 8018EA48 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8018EA4C 7C 7F 1B 78 */ mr r31, r3 -/* 8018EA50 38 80 00 12 */ li r4, 0x12 -/* 8018EA54 48 00 12 11 */ bl errorTxtSet__14dFile_select_cFUs -/* 8018EA58 7F E3 FB 78 */ mr r3, r31 -/* 8018EA5C 38 80 00 01 */ li r4, 1 -/* 8018EA60 4B FF EA 99 */ bl ketteiTxtDispAnmInit__14dFile_select_cFUc -/* 8018EA64 38 00 00 01 */ li r0, 1 -/* 8018EA68 98 1F 02 80 */ stb r0, 0x280(r31) -/* 8018EA6C 7F E3 FB 78 */ mr r3, r31 -/* 8018EA70 38 80 04 73 */ li r4, 0x473 -/* 8018EA74 38 A0 04 7D */ li r5, 0x47d -/* 8018EA78 4B FF A1 45 */ bl yesnoMenuMoveAnmInitSet__14dFile_select_cFii -/* 8018EA7C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8018EA80 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8018EA84 7C 08 03 A6 */ mtlr r0 -/* 8018EA88 38 21 00 10 */ addi r1, r1, 0x10 -/* 8018EA8C 4E 80 00 20 */ blr diff --git a/asm/d/file/d_file_select/ketteiTxtDispAnmInit__14dFile_select_cFUc.s b/asm/d/file/d_file_select/ketteiTxtDispAnmInit__14dFile_select_cFUc.s deleted file mode 100644 index 6a0e72771b5..00000000000 --- a/asm/d/file/d_file_select/ketteiTxtDispAnmInit__14dFile_select_cFUc.s +++ /dev/null @@ -1,35 +0,0 @@ -lbl_8018D4F8: -/* 8018D4F8 98 83 02 4B */ stb r4, 0x24b(r3) -/* 8018D4FC 54 80 06 3F */ clrlwi. r0, r4, 0x18 -/* 8018D500 40 82 00 18 */ bne lbl_8018D518 -/* 8018D504 80 A3 02 44 */ lwz r5, 0x244(r3) -/* 8018D508 80 A5 00 04 */ lwz r5, 4(r5) -/* 8018D50C 88 05 00 B2 */ lbz r0, 0xb2(r5) -/* 8018D510 28 00 00 00 */ cmplwi r0, 0 -/* 8018D514 41 82 00 3C */ beq lbl_8018D550 -lbl_8018D518: -/* 8018D518 54 80 06 3E */ clrlwi r0, r4, 0x18 -/* 8018D51C 28 00 00 01 */ cmplwi r0, 1 -/* 8018D520 40 82 00 18 */ bne lbl_8018D538 -/* 8018D524 80 83 02 44 */ lwz r4, 0x244(r3) -/* 8018D528 80 84 00 04 */ lwz r4, 4(r4) -/* 8018D52C 88 04 00 B2 */ lbz r0, 0xb2(r4) -/* 8018D530 28 00 00 FF */ cmplwi r0, 0xff -/* 8018D534 41 82 00 1C */ beq lbl_8018D550 -lbl_8018D538: -/* 8018D538 38 00 00 00 */ li r0, 0 -/* 8018D53C 80 83 02 44 */ lwz r4, 0x244(r3) -/* 8018D540 B0 04 00 16 */ sth r0, 0x16(r4) -/* 8018D544 80 63 02 3C */ lwz r3, 0x23c(r3) -/* 8018D548 B0 03 00 16 */ sth r0, 0x16(r3) -/* 8018D54C 4E 80 00 20 */ blr -lbl_8018D550: -/* 8018D550 3C 80 80 43 */ lis r4, g_fsHIO@ha /* 0x8042C9EC@ha */ -/* 8018D554 38 A4 C9 EC */ addi r5, r4, g_fsHIO@l /* 0x8042C9EC@l */ -/* 8018D558 88 05 00 07 */ lbz r0, 7(r5) -/* 8018D55C 80 83 02 44 */ lwz r4, 0x244(r3) -/* 8018D560 B0 04 00 16 */ sth r0, 0x16(r4) -/* 8018D564 88 05 00 07 */ lbz r0, 7(r5) -/* 8018D568 80 63 02 3C */ lwz r3, 0x23c(r3) -/* 8018D56C B0 03 00 16 */ sth r0, 0x16(r3) -/* 8018D570 4E 80 00 20 */ blr diff --git a/asm/d/file/d_file_select/ketteiTxtDispAnm__14dFile_select_cFv.s b/asm/d/file/d_file_select/ketteiTxtDispAnm__14dFile_select_cFv.s deleted file mode 100644 index ba9802a336c..00000000000 --- a/asm/d/file/d_file_select/ketteiTxtDispAnm__14dFile_select_cFv.s +++ /dev/null @@ -1,60 +0,0 @@ -lbl_8018D574: -/* 8018D574 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8018D578 7C 08 02 A6 */ mflr r0 -/* 8018D57C 90 01 00 24 */ stw r0, 0x24(r1) -/* 8018D580 39 61 00 20 */ addi r11, r1, 0x20 -/* 8018D584 48 1D 4C 59 */ bl _savegpr_29 -/* 8018D588 7C 7D 1B 78 */ mr r29, r3 -/* 8018D58C 88 03 02 4B */ lbz r0, 0x24b(r3) -/* 8018D590 28 00 00 00 */ cmplwi r0, 0 -/* 8018D594 41 82 00 44 */ beq lbl_8018D5D8 -/* 8018D598 80 7D 02 44 */ lwz r3, 0x244(r29) -/* 8018D59C 3C 80 80 43 */ lis r4, g_fsHIO@ha /* 0x8042C9EC@ha */ -/* 8018D5A0 3B E4 C9 EC */ addi r31, r4, g_fsHIO@l /* 0x8042C9EC@l */ -/* 8018D5A4 88 9F 00 07 */ lbz r4, 7(r31) -/* 8018D5A8 38 A0 00 00 */ li r5, 0 -/* 8018D5AC 38 C0 00 FF */ li r6, 0xff -/* 8018D5B0 38 E0 00 00 */ li r7, 0 -/* 8018D5B4 48 0C 82 C5 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc -/* 8018D5B8 7C 7E 1B 78 */ mr r30, r3 -/* 8018D5BC 80 7D 02 3C */ lwz r3, 0x23c(r29) -/* 8018D5C0 88 9F 00 07 */ lbz r4, 7(r31) -/* 8018D5C4 38 A0 00 80 */ li r5, 0x80 -/* 8018D5C8 38 C0 00 FF */ li r6, 0xff -/* 8018D5CC 38 E0 00 00 */ li r7, 0 -/* 8018D5D0 48 0C 82 A9 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc -/* 8018D5D4 48 00 00 40 */ b lbl_8018D614 -lbl_8018D5D8: -/* 8018D5D8 80 7D 02 44 */ lwz r3, 0x244(r29) -/* 8018D5DC 3C 80 80 43 */ lis r4, g_fsHIO@ha /* 0x8042C9EC@ha */ -/* 8018D5E0 3B E4 C9 EC */ addi r31, r4, g_fsHIO@l /* 0x8042C9EC@l */ -/* 8018D5E4 88 9F 00 07 */ lbz r4, 7(r31) -/* 8018D5E8 38 A0 00 FF */ li r5, 0xff -/* 8018D5EC 38 C0 00 00 */ li r6, 0 -/* 8018D5F0 38 E0 00 00 */ li r7, 0 -/* 8018D5F4 48 0C 82 85 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc -/* 8018D5F8 7C 7E 1B 78 */ mr r30, r3 -/* 8018D5FC 80 7D 02 3C */ lwz r3, 0x23c(r29) -/* 8018D600 88 9F 00 07 */ lbz r4, 7(r31) -/* 8018D604 38 A0 00 FF */ li r5, 0xff -/* 8018D608 38 C0 00 80 */ li r6, 0x80 -/* 8018D60C 38 E0 00 00 */ li r7, 0 -/* 8018D610 48 0C 82 69 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc -lbl_8018D614: -/* 8018D614 57 C0 06 3E */ clrlwi r0, r30, 0x18 -/* 8018D618 28 00 00 01 */ cmplwi r0, 1 -/* 8018D61C 40 82 00 18 */ bne lbl_8018D634 -/* 8018D620 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8018D624 28 00 00 01 */ cmplwi r0, 1 -/* 8018D628 40 82 00 0C */ bne lbl_8018D634 -/* 8018D62C 38 60 00 01 */ li r3, 1 -/* 8018D630 48 00 00 08 */ b lbl_8018D638 -lbl_8018D634: -/* 8018D634 38 60 00 00 */ li r3, 0 -lbl_8018D638: -/* 8018D638 39 61 00 20 */ addi r11, r1, 0x20 -/* 8018D63C 48 1D 4B ED */ bl _restgpr_29 -/* 8018D640 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8018D644 7C 08 03 A6 */ mtlr r0 -/* 8018D648 38 21 00 20 */ addi r1, r1, 0x20 -/* 8018D64C 4E 80 00 20 */ blr diff --git a/asm/d/file/d_file_select/makeRecInfo__14dFile_select_cFUc.s b/asm/d/file/d_file_select/makeRecInfo__14dFile_select_cFUc.s deleted file mode 100644 index c06822ccefc..00000000000 --- a/asm/d/file/d_file_select/makeRecInfo__14dFile_select_cFUc.s +++ /dev/null @@ -1,304 +0,0 @@ -lbl_80186088: -/* 80186088 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8018608C 7C 08 02 A6 */ mflr r0 -/* 80186090 90 01 00 24 */ stw r0, 0x24(r1) -/* 80186094 39 61 00 20 */ addi r11, r1, 0x20 -/* 80186098 48 1D C1 39 */ bl _savegpr_26 -/* 8018609C 7C 7E 1B 78 */ mr r30, r3 -/* 801860A0 54 80 06 3E */ clrlwi r0, r4, 0x18 -/* 801860A4 1C 60 0A 94 */ mulli r3, r0, 0xa94 -/* 801860A8 3B E3 03 B8 */ addi r31, r3, 0x3b8 -/* 801860AC 7F FE FA 14 */ add r31, r30, r31 -/* 801860B0 80 7E 00 28 */ lwz r3, 0x28(r30) -/* 801860B4 3C 80 6E 5F */ lis r4, 0x6E5F /* 0x6E5F3030@ha */ -/* 801860B8 38 C4 30 30 */ addi r6, r4, 0x3030 /* 0x6E5F3030@l */ -/* 801860BC 38 A0 6B 65 */ li r5, 0x6b65 -/* 801860C0 81 83 00 00 */ lwz r12, 0(r3) -/* 801860C4 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801860C8 7D 89 03 A6 */ mtctr r12 -/* 801860CC 4E 80 04 21 */ bctrl -/* 801860D0 7C 7D 1B 78 */ mr r29, r3 -/* 801860D4 80 7E 00 28 */ lwz r3, 0x28(r30) -/* 801860D8 3C 80 6E 5F */ lis r4, 0x6E5F /* 0x6E5F3031@ha */ -/* 801860DC 38 C4 30 31 */ addi r6, r4, 0x3031 /* 0x6E5F3031@l */ -/* 801860E0 38 A0 6B 65 */ li r5, 0x6b65 -/* 801860E4 81 83 00 00 */ lwz r12, 0(r3) -/* 801860E8 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801860EC 7D 89 03 A6 */ mtctr r12 -/* 801860F0 4E 80 04 21 */ bctrl -/* 801860F4 7C 7C 1B 78 */ mr r28, r3 -/* 801860F8 38 00 00 00 */ li r0, 0 -/* 801860FC 98 1D 00 B0 */ stb r0, 0xb0(r29) -/* 80186100 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 80186104 38 7F 00 CC */ addi r3, r31, 0xcc -/* 80186108 38 80 00 28 */ li r4, 0x28 -/* 8018610C 4B EA DD BD */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 80186110 2C 03 00 00 */ cmpwi r3, 0 -/* 80186114 41 82 00 18 */ beq lbl_8018612C -/* 80186118 38 00 00 00 */ li r0, 0 -/* 8018611C 98 1D 00 B0 */ stb r0, 0xb0(r29) -/* 80186120 38 00 00 01 */ li r0, 1 -/* 80186124 98 1C 00 B0 */ stb r0, 0xb0(r28) -/* 80186128 48 00 00 3C */ b lbl_80186164 -lbl_8018612C: -/* 8018612C 38 7F 00 CC */ addi r3, r31, 0xcc -/* 80186130 38 80 00 3F */ li r4, 0x3f -/* 80186134 4B EA DD 95 */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 80186138 2C 03 00 00 */ cmpwi r3, 0 -/* 8018613C 41 82 00 28 */ beq lbl_80186164 -/* 80186140 38 7F 07 F0 */ addi r3, r31, 0x7f0 -/* 80186144 38 80 03 02 */ li r4, 0x302 -/* 80186148 4B EA E8 75 */ bl isEventBit__11dSv_event_cCFUs -/* 8018614C 2C 03 00 00 */ cmpwi r3, 0 -/* 80186150 40 82 00 14 */ bne lbl_80186164 -/* 80186154 38 00 00 01 */ li r0, 1 -/* 80186158 98 1D 00 B0 */ stb r0, 0xb0(r29) -/* 8018615C 38 00 00 00 */ li r0, 0 -/* 80186160 98 1C 00 B0 */ stb r0, 0xb0(r28) -lbl_80186164: -/* 80186164 80 7E 00 28 */ lwz r3, 0x28(r30) -/* 80186168 3C 80 6E 5F */ lis r4, 0x6E5F /* 0x6E5F3032@ha */ -/* 8018616C 38 C4 30 32 */ addi r6, r4, 0x3032 /* 0x6E5F3032@l */ -/* 80186170 38 A0 6B 65 */ li r5, 0x6b65 -/* 80186174 81 83 00 00 */ lwz r12, 0(r3) -/* 80186178 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 8018617C 7D 89 03 A6 */ mtctr r12 -/* 80186180 4E 80 04 21 */ bctrl -/* 80186184 7C 7C 1B 78 */ mr r28, r3 -/* 80186188 38 7F 00 CC */ addi r3, r31, 0xcc -/* 8018618C 38 80 00 29 */ li r4, 0x29 -/* 80186190 4B EA DD 39 */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 80186194 2C 03 00 00 */ cmpwi r3, 0 -/* 80186198 40 82 00 18 */ bne lbl_801861B0 -/* 8018619C 38 7F 00 CC */ addi r3, r31, 0xcc -/* 801861A0 38 80 00 49 */ li r4, 0x49 -/* 801861A4 4B EA DD 25 */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 801861A8 2C 03 00 00 */ cmpwi r3, 0 -/* 801861AC 41 82 00 10 */ beq lbl_801861BC -lbl_801861B0: -/* 801861B0 38 00 00 01 */ li r0, 1 -/* 801861B4 98 1C 00 B0 */ stb r0, 0xb0(r28) -/* 801861B8 48 00 00 0C */ b lbl_801861C4 -lbl_801861BC: -/* 801861BC 38 00 00 00 */ li r0, 0 -/* 801861C0 98 1C 00 B0 */ stb r0, 0xb0(r28) -lbl_801861C4: -/* 801861C4 80 7E 00 28 */ lwz r3, 0x28(r30) -/* 801861C8 3C 80 65 5F */ lis r4, 0x655F /* 0x655F3030@ha */ -/* 801861CC 38 C4 30 30 */ addi r6, r4, 0x3030 /* 0x655F3030@l */ -/* 801861D0 3C 80 00 74 */ lis r4, 0x0074 /* 0x00746174@ha */ -/* 801861D4 38 A4 61 74 */ addi r5, r4, 0x6174 /* 0x00746174@l */ -/* 801861D8 81 83 00 00 */ lwz r12, 0(r3) -/* 801861DC 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801861E0 7D 89 03 A6 */ mtctr r12 -/* 801861E4 4E 80 04 21 */ bctrl -/* 801861E8 7C 7C 1B 78 */ mr r28, r3 -/* 801861EC 80 7E 00 28 */ lwz r3, 0x28(r30) -/* 801861F0 3C 80 65 5F */ lis r4, 0x655F /* 0x655F3031@ha */ -/* 801861F4 38 C4 30 31 */ addi r6, r4, 0x3031 /* 0x655F3031@l */ -/* 801861F8 3C 80 00 74 */ lis r4, 0x0074 /* 0x00746174@ha */ -/* 801861FC 38 A4 61 74 */ addi r5, r4, 0x6174 /* 0x00746174@l */ -/* 80186200 81 83 00 00 */ lwz r12, 0(r3) -/* 80186204 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 80186208 7D 89 03 A6 */ mtctr r12 -/* 8018620C 4E 80 04 21 */ bctrl -/* 80186210 7C 7D 1B 78 */ mr r29, r3 -/* 80186214 38 00 00 00 */ li r0, 0 -/* 80186218 98 1C 00 B0 */ stb r0, 0xb0(r28) -/* 8018621C 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 80186220 38 7F 00 CC */ addi r3, r31, 0xcc -/* 80186224 38 80 00 2B */ li r4, 0x2b -/* 80186228 4B EA DC A1 */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 8018622C 2C 03 00 00 */ cmpwi r3, 0 -/* 80186230 41 82 00 18 */ beq lbl_80186248 -/* 80186234 38 00 00 01 */ li r0, 1 -/* 80186238 98 1C 00 B0 */ stb r0, 0xb0(r28) -/* 8018623C 38 00 00 00 */ li r0, 0 -/* 80186240 98 1D 00 B0 */ stb r0, 0xb0(r29) -/* 80186244 48 00 00 28 */ b lbl_8018626C -lbl_80186248: -/* 80186248 38 7F 00 CC */ addi r3, r31, 0xcc -/* 8018624C 38 80 00 2A */ li r4, 0x2a -/* 80186250 4B EA DC 79 */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 80186254 2C 03 00 00 */ cmpwi r3, 0 -/* 80186258 41 82 00 14 */ beq lbl_8018626C -/* 8018625C 38 00 00 00 */ li r0, 0 -/* 80186260 98 1C 00 B0 */ stb r0, 0xb0(r28) -/* 80186264 38 00 00 01 */ li r0, 1 -/* 80186268 98 1D 00 B0 */ stb r0, 0xb0(r29) -lbl_8018626C: -/* 8018626C 80 7E 00 28 */ lwz r3, 0x28(r30) -/* 80186270 3C 80 65 5F */ lis r4, 0x655F /* 0x655F3032@ha */ -/* 80186274 38 C4 30 32 */ addi r6, r4, 0x3032 /* 0x655F3032@l */ -/* 80186278 3C 80 00 74 */ lis r4, 0x0074 /* 0x00746174@ha */ -/* 8018627C 38 A4 61 74 */ addi r5, r4, 0x6174 /* 0x00746174@l */ -/* 80186280 81 83 00 00 */ lwz r12, 0(r3) -/* 80186284 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 80186288 7D 89 03 A6 */ mtctr r12 -/* 8018628C 4E 80 04 21 */ bctrl -/* 80186290 7C 7D 1B 78 */ mr r29, r3 -/* 80186294 38 7F 00 CC */ addi r3, r31, 0xcc -/* 80186298 38 80 00 2C */ li r4, 0x2c -/* 8018629C 4B EA DC 2D */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 801862A0 2C 03 00 00 */ cmpwi r3, 0 -/* 801862A4 41 82 00 10 */ beq lbl_801862B4 -/* 801862A8 38 00 00 01 */ li r0, 1 -/* 801862AC 98 1D 00 B0 */ stb r0, 0xb0(r29) -/* 801862B0 48 00 00 0C */ b lbl_801862BC -lbl_801862B4: -/* 801862B4 38 00 00 00 */ li r0, 0 -/* 801862B8 98 1D 00 B0 */ stb r0, 0xb0(r29) -lbl_801862BC: -/* 801862BC 80 7E 00 28 */ lwz r3, 0x28(r30) -/* 801862C0 3C 80 75 5F */ lis r4, 0x755F /* 0x755F3030@ha */ -/* 801862C4 38 C4 30 30 */ addi r6, r4, 0x3030 /* 0x755F3030@l */ -/* 801862C8 3C 80 00 66 */ lis r4, 0x0066 /* 0x0066756B@ha */ -/* 801862CC 38 A4 75 6B */ addi r5, r4, 0x756B /* 0x0066756B@l */ -/* 801862D0 81 83 00 00 */ lwz r12, 0(r3) -/* 801862D4 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801862D8 7D 89 03 A6 */ mtctr r12 -/* 801862DC 4E 80 04 21 */ bctrl -/* 801862E0 7C 7D 1B 78 */ mr r29, r3 -/* 801862E4 38 7F 00 CC */ addi r3, r31, 0xcc -/* 801862E8 38 80 00 2F */ li r4, 0x2f -/* 801862EC 4B EA DB DD */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 801862F0 2C 03 00 00 */ cmpwi r3, 0 -/* 801862F4 41 82 00 10 */ beq lbl_80186304 -/* 801862F8 38 00 00 01 */ li r0, 1 -/* 801862FC 98 1D 00 B0 */ stb r0, 0xb0(r29) -/* 80186300 48 00 00 0C */ b lbl_8018630C -lbl_80186304: -/* 80186304 38 00 00 00 */ li r0, 0 -/* 80186308 98 1D 00 B0 */ stb r0, 0xb0(r29) -lbl_8018630C: -/* 8018630C 80 7E 00 28 */ lwz r3, 0x28(r30) -/* 80186310 3C 80 75 5F */ lis r4, 0x755F /* 0x755F3031@ha */ -/* 80186314 38 C4 30 31 */ addi r6, r4, 0x3031 /* 0x755F3031@l */ -/* 80186318 3C 80 00 66 */ lis r4, 0x0066 /* 0x0066756B@ha */ -/* 8018631C 38 A4 75 6B */ addi r5, r4, 0x756B /* 0x0066756B@l */ -/* 80186320 81 83 00 00 */ lwz r12, 0(r3) -/* 80186324 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 80186328 7D 89 03 A6 */ mtctr r12 -/* 8018632C 4E 80 04 21 */ bctrl -/* 80186330 7C 7D 1B 78 */ mr r29, r3 -/* 80186334 38 7F 00 CC */ addi r3, r31, 0xcc -/* 80186338 38 80 00 31 */ li r4, 0x31 -/* 8018633C 4B EA DB 8D */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 80186340 2C 03 00 00 */ cmpwi r3, 0 -/* 80186344 41 82 00 10 */ beq lbl_80186354 -/* 80186348 38 00 00 01 */ li r0, 1 -/* 8018634C 98 1D 00 B0 */ stb r0, 0xb0(r29) -/* 80186350 48 00 00 0C */ b lbl_8018635C -lbl_80186354: -/* 80186354 38 00 00 00 */ li r0, 0 -/* 80186358 98 1D 00 B0 */ stb r0, 0xb0(r29) -lbl_8018635C: -/* 8018635C 80 7E 00 28 */ lwz r3, 0x28(r30) -/* 80186360 3C 80 75 5F */ lis r4, 0x755F /* 0x755F3032@ha */ -/* 80186364 38 C4 30 32 */ addi r6, r4, 0x3032 /* 0x755F3032@l */ -/* 80186368 3C 80 00 66 */ lis r4, 0x0066 /* 0x0066756B@ha */ -/* 8018636C 38 A4 75 6B */ addi r5, r4, 0x756B /* 0x0066756B@l */ -/* 80186370 81 83 00 00 */ lwz r12, 0(r3) -/* 80186374 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 80186378 7D 89 03 A6 */ mtctr r12 -/* 8018637C 4E 80 04 21 */ bctrl -/* 80186380 7C 7D 1B 78 */ mr r29, r3 -/* 80186384 38 7F 00 CC */ addi r3, r31, 0xcc -/* 80186388 38 80 00 30 */ li r4, 0x30 -/* 8018638C 4B EA DB 3D */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 80186390 2C 03 00 00 */ cmpwi r3, 0 -/* 80186394 41 82 00 10 */ beq lbl_801863A4 -/* 80186398 38 00 00 01 */ li r0, 1 -/* 8018639C 98 1D 00 B0 */ stb r0, 0xb0(r29) -/* 801863A0 48 00 00 0C */ b lbl_801863AC -lbl_801863A4: -/* 801863A4 38 00 00 00 */ li r0, 0 -/* 801863A8 98 1D 00 B0 */ stb r0, 0xb0(r29) -lbl_801863AC: -/* 801863AC 3B A0 00 00 */ li r29, 0 -/* 801863B0 3B 60 00 00 */ li r27, 0 -/* 801863B4 3B 9F 01 00 */ addi r28, r31, 0x100 -lbl_801863B8: -/* 801863B8 7F 83 E3 78 */ mr r3, r28 -/* 801863BC 57 64 06 3E */ clrlwi r4, r27, 0x18 -/* 801863C0 4B EA DE D1 */ bl isCollectMirror__20dSv_player_collect_cCFUc -/* 801863C4 2C 03 00 00 */ cmpwi r3, 0 -/* 801863C8 41 82 00 14 */ beq lbl_801863DC -/* 801863CC 3B 7B 00 01 */ addi r27, r27, 1 -/* 801863D0 2C 1B 00 04 */ cmpwi r27, 4 -/* 801863D4 3B BD 00 01 */ addi r29, r29, 1 -/* 801863D8 41 80 FF E0 */ blt lbl_801863B8 -lbl_801863DC: -/* 801863DC 3B 60 00 00 */ li r27, 0 -/* 801863E0 3B 40 00 00 */ li r26, 0 -/* 801863E4 3B 9F 01 00 */ addi r28, r31, 0x100 -lbl_801863E8: -/* 801863E8 7F 83 E3 78 */ mr r3, r28 -/* 801863EC 57 44 06 3E */ clrlwi r4, r26, 0x18 -/* 801863F0 4B EA DE 5D */ bl isCollectCrystal__20dSv_player_collect_cCFUc -/* 801863F4 2C 03 00 00 */ cmpwi r3, 0 -/* 801863F8 41 82 00 14 */ beq lbl_8018640C -/* 801863FC 3B 5A 00 01 */ addi r26, r26, 1 -/* 80186400 2C 1A 00 04 */ cmpwi r26, 4 -/* 80186404 3B 7B 00 01 */ addi r27, r27, 1 -/* 80186408 41 80 FF E0 */ blt lbl_801863E8 -lbl_8018640C: -/* 8018640C 57 60 06 3F */ clrlwi. r0, r27, 0x18 -/* 80186410 40 82 00 0C */ bne lbl_8018641C -/* 80186414 57 A0 06 3F */ clrlwi. r0, r29, 0x18 -/* 80186418 41 82 00 54 */ beq lbl_8018646C -lbl_8018641C: -/* 8018641C 38 7F 07 F0 */ addi r3, r31, 0x7f0 -/* 80186420 38 80 0C 01 */ li r4, 0xc01 -/* 80186424 4B EA E5 99 */ bl isEventBit__11dSv_event_cCFUs -/* 80186428 2C 03 00 00 */ cmpwi r3, 0 -/* 8018642C 41 82 00 18 */ beq lbl_80186444 -/* 80186430 38 7F 01 00 */ addi r3, r31, 0x100 -/* 80186434 38 80 00 00 */ li r4, 0 -/* 80186438 4B EA DE 59 */ bl isCollectMirror__20dSv_player_collect_cCFUc -/* 8018643C 2C 03 00 00 */ cmpwi r3, 0 -/* 80186440 41 82 00 2C */ beq lbl_8018646C -lbl_80186444: -/* 80186444 38 7F 07 F0 */ addi r3, r31, 0x7f0 -/* 80186448 38 80 2B 08 */ li r4, 0x2b08 -/* 8018644C 4B EA E5 71 */ bl isEventBit__11dSv_event_cCFUs -/* 80186450 2C 03 00 00 */ cmpwi r3, 0 -/* 80186454 41 82 00 28 */ beq lbl_8018647C -/* 80186458 38 7F 01 00 */ addi r3, r31, 0x100 -/* 8018645C 38 80 00 03 */ li r4, 3 -/* 80186460 4B EA DD ED */ bl isCollectCrystal__20dSv_player_collect_cCFUc -/* 80186464 2C 03 00 00 */ cmpwi r3, 0 -/* 80186468 40 82 00 14 */ bne lbl_8018647C -lbl_8018646C: -/* 8018646C 38 00 00 00 */ li r0, 0 -/* 80186470 80 7E 00 0C */ lwz r3, 0xc(r30) -/* 80186474 90 03 00 08 */ stw r0, 8(r3) -/* 80186478 48 00 00 4C */ b lbl_801864C4 -lbl_8018647C: -/* 8018647C 80 7E 00 0C */ lwz r3, 0xc(r30) -/* 80186480 48 00 A0 21 */ bl freeHeap__16dFile_select3D_cFv -/* 80186484 38 7F 01 00 */ addi r3, r31, 0x100 -/* 80186488 38 80 00 03 */ li r4, 3 -/* 8018648C 4B EA DD C1 */ bl isCollectCrystal__20dSv_player_collect_cCFUc -/* 80186490 2C 03 00 00 */ cmpwi r3, 0 -/* 80186494 40 82 00 0C */ bne lbl_801864A0 -/* 80186498 57 A0 06 3F */ clrlwi. r0, r29, 0x18 -/* 8018649C 40 82 00 18 */ bne lbl_801864B4 -lbl_801864A0: -/* 801864A0 80 7E 00 0C */ lwz r3, 0xc(r30) -/* 801864A4 38 80 00 00 */ li r4, 0 -/* 801864A8 7F 65 DB 78 */ mr r5, r27 -/* 801864AC 48 00 9F 31 */ bl _create__16dFile_select3D_cFUcUc -/* 801864B0 48 00 00 14 */ b lbl_801864C4 -lbl_801864B4: -/* 801864B4 80 7E 00 0C */ lwz r3, 0xc(r30) -/* 801864B8 7F A4 EB 78 */ mr r4, r29 -/* 801864BC 38 A0 00 00 */ li r5, 0 -/* 801864C0 48 00 9F 1D */ bl _create__16dFile_select3D_cFUcUc -lbl_801864C4: -/* 801864C4 39 61 00 20 */ addi r11, r1, 0x20 -/* 801864C8 48 1D BD 55 */ bl _restgpr_26 -/* 801864CC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801864D0 7C 08 03 A6 */ mtlr r0 -/* 801864D4 38 21 00 20 */ addi r1, r1, 0x20 -/* 801864D8 4E 80 00 20 */ blr diff --git a/asm/d/file/d_file_select/menuWakuAlpahAnm__14dFile_select_cFUc.s b/asm/d/file/d_file_select/menuWakuAlpahAnm__14dFile_select_cFUc.s deleted file mode 100644 index 9090ee0bd7a..00000000000 --- a/asm/d/file/d_file_select/menuWakuAlpahAnm__14dFile_select_cFUc.s +++ /dev/null @@ -1,84 +0,0 @@ -lbl_8018D8C8: -/* 8018D8C8 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 8018D8CC 7C 08 02 A6 */ mflr r0 -/* 8018D8D0 90 01 00 54 */ stw r0, 0x54(r1) -/* 8018D8D4 39 61 00 50 */ addi r11, r1, 0x50 -/* 8018D8D8 48 1D 48 F5 */ bl _savegpr_25 -/* 8018D8DC 7C 79 1B 78 */ mr r25, r3 -/* 8018D8E0 3B E0 00 00 */ li r31, 0 -/* 8018D8E4 54 80 06 3E */ clrlwi r0, r4, 0x18 -/* 8018D8E8 54 9A 15 BA */ rlwinm r26, r4, 2, 0x16, 0x1d -/* 8018D8EC 7C 79 D2 14 */ add r3, r25, r26 -/* 8018D8F0 80 63 03 64 */ lwz r3, 0x364(r3) -/* 8018D8F4 7F 79 02 14 */ add r27, r25, r0 -/* 8018D8F8 88 9B 03 8E */ lbz r4, 0x38e(r27) -/* 8018D8FC 88 BB 03 88 */ lbz r5, 0x388(r27) -/* 8018D900 88 DB 03 8B */ lbz r6, 0x38b(r27) -/* 8018D904 38 E0 00 00 */ li r7, 0 -/* 8018D908 48 0C 7F 71 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc -/* 8018D90C 7C 7C 1B 78 */ mr r28, r3 -/* 8018D910 7C 79 D2 14 */ add r3, r25, r26 -/* 8018D914 80 63 03 70 */ lwz r3, 0x370(r3) -/* 8018D918 88 9B 03 8E */ lbz r4, 0x38e(r27) -/* 8018D91C 88 BB 03 88 */ lbz r5, 0x388(r27) -/* 8018D920 88 DB 03 8B */ lbz r6, 0x38b(r27) -/* 8018D924 38 E0 00 00 */ li r7, 0 -/* 8018D928 48 0C 7F 51 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc -/* 8018D92C 7C 7D 1B 78 */ mr r29, r3 -/* 8018D930 7C 79 D2 14 */ add r3, r25, r26 -/* 8018D934 80 63 03 7C */ lwz r3, 0x37c(r3) -/* 8018D938 88 9B 03 8E */ lbz r4, 0x38e(r27) -/* 8018D93C 88 BB 03 88 */ lbz r5, 0x388(r27) -/* 8018D940 88 DB 03 8B */ lbz r6, 0x38b(r27) -/* 8018D944 38 E0 00 00 */ li r7, 0 -/* 8018D948 48 0C 7F 31 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc -/* 8018D94C 7C 7E 1B 78 */ mr r30, r3 -/* 8018D950 38 00 00 96 */ li r0, 0x96 -/* 8018D954 98 01 00 08 */ stb r0, 8(r1) -/* 8018D958 98 01 00 09 */ stb r0, 9(r1) -/* 8018D95C 98 01 00 0A */ stb r0, 0xa(r1) -/* 8018D960 38 60 00 FF */ li r3, 0xff -/* 8018D964 98 61 00 0B */ stb r3, 0xb(r1) -/* 8018D968 80 01 00 08 */ lwz r0, 8(r1) -/* 8018D96C 90 01 00 0C */ stw r0, 0xc(r1) -/* 8018D970 98 61 00 10 */ stb r3, 0x10(r1) -/* 8018D974 98 61 00 11 */ stb r3, 0x11(r1) -/* 8018D978 98 61 00 12 */ stb r3, 0x12(r1) -/* 8018D97C 98 61 00 13 */ stb r3, 0x13(r1) -/* 8018D980 80 01 00 10 */ lwz r0, 0x10(r1) -/* 8018D984 90 01 00 14 */ stw r0, 0x14(r1) -/* 8018D988 7C 99 D2 14 */ add r4, r25, r26 -/* 8018D98C 80 64 03 94 */ lwz r3, 0x394(r4) -/* 8018D990 80 03 00 5C */ lwz r0, 0x5c(r3) -/* 8018D994 90 01 00 18 */ stw r0, 0x18(r1) -/* 8018D998 90 01 00 1C */ stw r0, 0x1c(r1) -/* 8018D99C 80 64 03 94 */ lwz r3, 0x394(r4) -/* 8018D9A0 80 03 00 5C */ lwz r0, 0x5c(r3) -/* 8018D9A4 90 01 00 20 */ stw r0, 0x20(r1) -/* 8018D9A8 90 01 00 24 */ stw r0, 0x24(r1) -/* 8018D9AC 80 64 03 94 */ lwz r3, 0x394(r4) -/* 8018D9B0 88 9B 03 8E */ lbz r4, 0x38e(r27) -/* 8018D9B4 38 A1 00 24 */ addi r5, r1, 0x24 -/* 8018D9B8 38 C1 00 1C */ addi r6, r1, 0x1c -/* 8018D9BC 38 E1 00 14 */ addi r7, r1, 0x14 -/* 8018D9C0 39 01 00 0C */ addi r8, r1, 0xc -/* 8018D9C4 39 20 00 00 */ li r9, 0 -/* 8018D9C8 48 0C 6E F5 */ bl colorAnime__8CPaneMgrFsQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorUc -/* 8018D9CC 57 80 06 3E */ clrlwi r0, r28, 0x18 -/* 8018D9D0 28 00 00 01 */ cmplwi r0, 1 -/* 8018D9D4 40 82 00 20 */ bne lbl_8018D9F4 -/* 8018D9D8 57 A0 06 3E */ clrlwi r0, r29, 0x18 -/* 8018D9DC 28 00 00 01 */ cmplwi r0, 1 -/* 8018D9E0 40 82 00 14 */ bne lbl_8018D9F4 -/* 8018D9E4 57 C0 06 3E */ clrlwi r0, r30, 0x18 -/* 8018D9E8 28 00 00 01 */ cmplwi r0, 1 -/* 8018D9EC 40 82 00 08 */ bne lbl_8018D9F4 -/* 8018D9F0 3B E0 00 01 */ li r31, 1 -lbl_8018D9F4: -/* 8018D9F4 7F E3 FB 78 */ mr r3, r31 -/* 8018D9F8 39 61 00 50 */ addi r11, r1, 0x50 -/* 8018D9FC 48 1D 48 1D */ bl _restgpr_25 -/* 8018DA00 80 01 00 54 */ lwz r0, 0x54(r1) -/* 8018DA04 7C 08 03 A6 */ mtlr r0 -/* 8018DA08 38 21 00 50 */ addi r1, r1, 0x50 -/* 8018DA0C 4E 80 00 20 */ blr diff --git a/asm/d/file/d_file_select/modoruTxtChange__14dFile_select_cFUc.s b/asm/d/file/d_file_select/modoruTxtChange__14dFile_select_cFUc.s deleted file mode 100644 index f718f224661..00000000000 --- a/asm/d/file/d_file_select/modoruTxtChange__14dFile_select_cFUc.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_8018D344: -/* 8018D344 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8018D348 7C 08 02 A6 */ mflr r0 -/* 8018D34C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8018D350 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8018D354 7C 7F 1B 78 */ mr r31, r3 -/* 8018D358 54 80 06 3F */ clrlwi. r0, r4, 0x18 -/* 8018D35C 41 82 00 1C */ beq lbl_8018D378 -/* 8018D360 80 7F 02 50 */ lwz r3, 0x250(r31) -/* 8018D364 38 80 03 D5 */ li r4, 0x3d5 -/* 8018D368 4B E9 2D 59 */ bl fopMsgM_messageGet__FPcUl -/* 8018D36C 38 00 00 01 */ li r0, 1 -/* 8018D370 98 1F 02 4C */ stb r0, 0x24c(r31) -/* 8018D374 48 00 00 18 */ b lbl_8018D38C -lbl_8018D378: -/* 8018D378 80 7F 02 50 */ lwz r3, 0x250(r31) -/* 8018D37C 38 80 00 54 */ li r4, 0x54 -/* 8018D380 4B E9 2D 41 */ bl fopMsgM_messageGet__FPcUl -/* 8018D384 38 00 00 00 */ li r0, 0 -/* 8018D388 98 1F 02 4C */ stb r0, 0x24c(r31) -lbl_8018D38C: -/* 8018D38C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8018D390 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8018D394 7C 08 03 A6 */ mtlr r0 -/* 8018D398 38 21 00 10 */ addi r1, r1, 0x10 -/* 8018D39C 4E 80 00 20 */ blr diff --git a/asm/d/file/d_file_select/modoruTxtDispAnmInit__14dFile_select_cFUc.s b/asm/d/file/d_file_select/modoruTxtDispAnmInit__14dFile_select_cFUc.s deleted file mode 100644 index 05813d97102..00000000000 --- a/asm/d/file/d_file_select/modoruTxtDispAnmInit__14dFile_select_cFUc.s +++ /dev/null @@ -1,35 +0,0 @@ -lbl_8018D3A0: -/* 8018D3A0 98 83 02 4A */ stb r4, 0x24a(r3) -/* 8018D3A4 54 80 06 3F */ clrlwi. r0, r4, 0x18 -/* 8018D3A8 40 82 00 18 */ bne lbl_8018D3C0 -/* 8018D3AC 80 A3 02 40 */ lwz r5, 0x240(r3) -/* 8018D3B0 80 A5 00 04 */ lwz r5, 4(r5) -/* 8018D3B4 88 05 00 B2 */ lbz r0, 0xb2(r5) -/* 8018D3B8 28 00 00 00 */ cmplwi r0, 0 -/* 8018D3BC 41 82 00 3C */ beq lbl_8018D3F8 -lbl_8018D3C0: -/* 8018D3C0 54 80 06 3E */ clrlwi r0, r4, 0x18 -/* 8018D3C4 28 00 00 01 */ cmplwi r0, 1 -/* 8018D3C8 40 82 00 18 */ bne lbl_8018D3E0 -/* 8018D3CC 80 83 02 40 */ lwz r4, 0x240(r3) -/* 8018D3D0 80 84 00 04 */ lwz r4, 4(r4) -/* 8018D3D4 88 04 00 B2 */ lbz r0, 0xb2(r4) -/* 8018D3D8 28 00 00 FF */ cmplwi r0, 0xff -/* 8018D3DC 41 82 00 1C */ beq lbl_8018D3F8 -lbl_8018D3E0: -/* 8018D3E0 38 00 00 00 */ li r0, 0 -/* 8018D3E4 80 83 02 40 */ lwz r4, 0x240(r3) -/* 8018D3E8 B0 04 00 16 */ sth r0, 0x16(r4) -/* 8018D3EC 80 63 02 38 */ lwz r3, 0x238(r3) -/* 8018D3F0 B0 03 00 16 */ sth r0, 0x16(r3) -/* 8018D3F4 4E 80 00 20 */ blr -lbl_8018D3F8: -/* 8018D3F8 3C 80 80 43 */ lis r4, g_fsHIO@ha /* 0x8042C9EC@ha */ -/* 8018D3FC 38 A4 C9 EC */ addi r5, r4, g_fsHIO@l /* 0x8042C9EC@l */ -/* 8018D400 88 05 00 07 */ lbz r0, 7(r5) -/* 8018D404 80 83 02 40 */ lwz r4, 0x240(r3) -/* 8018D408 B0 04 00 16 */ sth r0, 0x16(r4) -/* 8018D40C 88 05 00 07 */ lbz r0, 7(r5) -/* 8018D410 80 63 02 38 */ lwz r3, 0x238(r3) -/* 8018D414 B0 03 00 16 */ sth r0, 0x16(r3) -/* 8018D418 4E 80 00 20 */ blr diff --git a/asm/d/file/d_file_select/modoruTxtDispAnm__14dFile_select_cFv.s b/asm/d/file/d_file_select/modoruTxtDispAnm__14dFile_select_cFv.s deleted file mode 100644 index 3e8e42b2434..00000000000 --- a/asm/d/file/d_file_select/modoruTxtDispAnm__14dFile_select_cFv.s +++ /dev/null @@ -1,60 +0,0 @@ -lbl_8018D41C: -/* 8018D41C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8018D420 7C 08 02 A6 */ mflr r0 -/* 8018D424 90 01 00 24 */ stw r0, 0x24(r1) -/* 8018D428 39 61 00 20 */ addi r11, r1, 0x20 -/* 8018D42C 48 1D 4D B1 */ bl _savegpr_29 -/* 8018D430 7C 7D 1B 78 */ mr r29, r3 -/* 8018D434 88 03 02 4A */ lbz r0, 0x24a(r3) -/* 8018D438 28 00 00 00 */ cmplwi r0, 0 -/* 8018D43C 41 82 00 44 */ beq lbl_8018D480 -/* 8018D440 80 7D 02 40 */ lwz r3, 0x240(r29) -/* 8018D444 3C 80 80 43 */ lis r4, g_fsHIO@ha /* 0x8042C9EC@ha */ -/* 8018D448 3B E4 C9 EC */ addi r31, r4, g_fsHIO@l /* 0x8042C9EC@l */ -/* 8018D44C 88 9F 00 07 */ lbz r4, 7(r31) -/* 8018D450 38 A0 00 00 */ li r5, 0 -/* 8018D454 38 C0 00 FF */ li r6, 0xff -/* 8018D458 38 E0 00 00 */ li r7, 0 -/* 8018D45C 48 0C 84 1D */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc -/* 8018D460 7C 7E 1B 78 */ mr r30, r3 -/* 8018D464 80 7D 02 38 */ lwz r3, 0x238(r29) -/* 8018D468 88 9F 00 07 */ lbz r4, 7(r31) -/* 8018D46C 38 A0 00 80 */ li r5, 0x80 -/* 8018D470 38 C0 00 FF */ li r6, 0xff -/* 8018D474 38 E0 00 00 */ li r7, 0 -/* 8018D478 48 0C 84 01 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc -/* 8018D47C 48 00 00 40 */ b lbl_8018D4BC -lbl_8018D480: -/* 8018D480 80 7D 02 40 */ lwz r3, 0x240(r29) -/* 8018D484 3C 80 80 43 */ lis r4, g_fsHIO@ha /* 0x8042C9EC@ha */ -/* 8018D488 3B E4 C9 EC */ addi r31, r4, g_fsHIO@l /* 0x8042C9EC@l */ -/* 8018D48C 88 9F 00 07 */ lbz r4, 7(r31) -/* 8018D490 38 A0 00 FF */ li r5, 0xff -/* 8018D494 38 C0 00 00 */ li r6, 0 -/* 8018D498 38 E0 00 00 */ li r7, 0 -/* 8018D49C 48 0C 83 DD */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc -/* 8018D4A0 7C 7E 1B 78 */ mr r30, r3 -/* 8018D4A4 80 7D 02 38 */ lwz r3, 0x238(r29) -/* 8018D4A8 88 9F 00 07 */ lbz r4, 7(r31) -/* 8018D4AC 38 A0 00 FF */ li r5, 0xff -/* 8018D4B0 38 C0 00 80 */ li r6, 0x80 -/* 8018D4B4 38 E0 00 00 */ li r7, 0 -/* 8018D4B8 48 0C 83 C1 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc -lbl_8018D4BC: -/* 8018D4BC 57 C0 06 3E */ clrlwi r0, r30, 0x18 -/* 8018D4C0 28 00 00 01 */ cmplwi r0, 1 -/* 8018D4C4 40 82 00 18 */ bne lbl_8018D4DC -/* 8018D4C8 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8018D4CC 28 00 00 01 */ cmplwi r0, 1 -/* 8018D4D0 40 82 00 0C */ bne lbl_8018D4DC -/* 8018D4D4 38 60 00 01 */ li r3, 1 -/* 8018D4D8 48 00 00 08 */ b lbl_8018D4E0 -lbl_8018D4DC: -/* 8018D4DC 38 60 00 00 */ li r3, 0 -lbl_8018D4E0: -/* 8018D4E0 39 61 00 20 */ addi r11, r1, 0x20 -/* 8018D4E4 48 1D 4D 45 */ bl _restgpr_29 -/* 8018D4E8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8018D4EC 7C 08 03 A6 */ mtlr r0 -/* 8018D4F0 38 21 00 20 */ addi r1, r1, 0x20 -/* 8018D4F4 4E 80 00 20 */ blr diff --git a/asm/d/file/d_file_select/noFileSpaceDispInit__14dFile_select_cFv.s b/asm/d/file/d_file_select/noFileSpaceDispInit__14dFile_select_cFv.s deleted file mode 100644 index a05f01d877d..00000000000 --- a/asm/d/file/d_file_select/noFileSpaceDispInit__14dFile_select_cFv.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_8018E9B0: -/* 8018E9B0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8018E9B4 7C 08 02 A6 */ mflr r0 -/* 8018E9B8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8018E9BC 38 80 00 0A */ li r4, 0xa -/* 8018E9C0 48 00 12 A5 */ bl errorTxtSet__14dFile_select_cFUs -/* 8018E9C4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8018E9C8 7C 08 03 A6 */ mtlr r0 -/* 8018E9CC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8018E9D0 4E 80 00 20 */ blr diff --git a/asm/d/file/d_file_select/noSaveSelDispInit__14dFile_select_cFv.s b/asm/d/file/d_file_select/noSaveSelDispInit__14dFile_select_cFv.s deleted file mode 100644 index 628a1fa9457..00000000000 --- a/asm/d/file/d_file_select/noSaveSelDispInit__14dFile_select_cFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_8018EC4C: -/* 8018EC4C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8018EC50 7C 08 02 A6 */ mflr r0 -/* 8018EC54 90 01 00 14 */ stw r0, 0x14(r1) -/* 8018EC58 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8018EC5C 7C 7F 1B 78 */ mr r31, r3 -/* 8018EC60 38 80 00 13 */ li r4, 0x13 -/* 8018EC64 48 00 10 01 */ bl errorTxtSet__14dFile_select_cFUs -/* 8018EC68 38 00 00 00 */ li r0, 0 -/* 8018EC6C 98 1F 02 82 */ stb r0, 0x282(r31) -/* 8018EC70 88 1F 01 08 */ lbz r0, 0x108(r31) -/* 8018EC74 28 00 00 00 */ cmplwi r0, 0 -/* 8018EC78 40 82 00 30 */ bne lbl_8018ECA8 -/* 8018EC7C 7F E3 FB 78 */ mr r3, r31 -/* 8018EC80 38 80 00 01 */ li r4, 1 -/* 8018EC84 4B FF E8 75 */ bl ketteiTxtDispAnmInit__14dFile_select_cFUc -/* 8018EC88 38 00 00 01 */ li r0, 1 -/* 8018EC8C 98 1F 02 80 */ stb r0, 0x280(r31) -/* 8018EC90 7F E3 FB 78 */ mr r3, r31 -/* 8018EC94 38 80 04 73 */ li r4, 0x473 -/* 8018EC98 38 A0 04 7D */ li r5, 0x47d -/* 8018EC9C 4B FF 9F 21 */ bl yesnoMenuMoveAnmInitSet__14dFile_select_cFii -/* 8018ECA0 38 00 00 01 */ li r0, 1 -/* 8018ECA4 98 1F 02 82 */ stb r0, 0x282(r31) -lbl_8018ECA8: -/* 8018ECA8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8018ECAC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8018ECB0 7C 08 03 A6 */ mtlr r0 -/* 8018ECB4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8018ECB8 4E 80 00 20 */ blr diff --git a/asm/d/file/d_file_select/screenSetDetail__14dFile_select_cFv.s b/asm/d/file/d_file_select/screenSetDetail__14dFile_select_cFv.s deleted file mode 100644 index 9cd52d7e1a0..00000000000 --- a/asm/d/file/d_file_select/screenSetDetail__14dFile_select_cFv.s +++ /dev/null @@ -1,93 +0,0 @@ -lbl_8018CCD0: -/* 8018CCD0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8018CCD4 7C 08 02 A6 */ mflr r0 -/* 8018CCD8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8018CCDC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8018CCE0 7C 7F 1B 78 */ mr r31, r3 -/* 8018CCE4 38 60 01 18 */ li r3, 0x118 -/* 8018CCE8 48 14 1F 65 */ bl __nw__FUl -/* 8018CCEC 7C 60 1B 79 */ or. r0, r3, r3 -/* 8018CCF0 41 82 00 0C */ beq lbl_8018CCFC -/* 8018CCF4 48 16 B7 A5 */ bl __ct__9J2DScreenFv -/* 8018CCF8 7C 60 1B 78 */ mr r0, r3 -lbl_8018CCFC: -/* 8018CCFC 90 1F 00 28 */ stw r0, 0x28(r31) -/* 8018CD00 80 7F 00 28 */ lwz r3, 0x28(r31) -/* 8018CD04 3C 80 80 39 */ lis r4, d_file_d_file_select__stringBase0@ha /* 0x80394388@ha */ -/* 8018CD08 38 84 43 88 */ addi r4, r4, d_file_d_file_select__stringBase0@l /* 0x80394388@l */ -/* 8018CD0C 38 84 02 F4 */ addi r4, r4, 0x2f4 -/* 8018CD10 3C A0 01 10 */ lis r5, 0x110 -/* 8018CD14 80 DF 00 08 */ lwz r6, 8(r31) -/* 8018CD18 48 16 B9 31 */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive -/* 8018CD1C 3C 60 80 39 */ lis r3, d_file_d_file_select__stringBase0@ha /* 0x80394388@ha */ -/* 8018CD20 38 63 43 88 */ addi r3, r3, d_file_d_file_select__stringBase0@l /* 0x80394388@l */ -/* 8018CD24 38 63 03 12 */ addi r3, r3, 0x312 -/* 8018CD28 80 9F 00 08 */ lwz r4, 8(r31) -/* 8018CD2C 48 14 75 45 */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader -/* 8018CD30 48 17 BD 3D */ bl load__20J2DAnmLoaderDataBaseFPCv -/* 8018CD34 90 7F 03 A0 */ stw r3, 0x3a0(r31) -/* 8018CD38 80 7F 00 28 */ lwz r3, 0x28(r31) -/* 8018CD3C 80 9F 03 A0 */ lwz r4, 0x3a0(r31) -/* 8018CD40 81 83 00 00 */ lwz r12, 0(r3) -/* 8018CD44 81 8C 00 6C */ lwz r12, 0x6c(r12) -/* 8018CD48 7D 89 03 A6 */ mtctr r12 -/* 8018CD4C 4E 80 04 21 */ bctrl -/* 8018CD50 38 00 00 00 */ li r0, 0 -/* 8018CD54 90 1F 03 A4 */ stw r0, 0x3a4(r31) -/* 8018CD58 80 7F 00 28 */ lwz r3, 0x28(r31) -/* 8018CD5C 3C 80 5F 61 */ lis r4, 0x5F61 /* 0x5F616C6C@ha */ -/* 8018CD60 38 C4 6C 6C */ addi r6, r4, 0x6C6C /* 0x5F616C6C@l */ -/* 8018CD64 38 A0 00 6E */ li r5, 0x6e -/* 8018CD68 81 83 00 00 */ lwz r12, 0(r3) -/* 8018CD6C 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 8018CD70 7D 89 03 A6 */ mtctr r12 -/* 8018CD74 4E 80 04 21 */ bctrl -/* 8018CD78 90 7F 00 30 */ stw r3, 0x30(r31) -/* 8018CD7C 38 60 00 6C */ li r3, 0x6c -/* 8018CD80 48 14 1E CD */ bl __nw__FUl -/* 8018CD84 7C 60 1B 79 */ or. r0, r3, r3 -/* 8018CD88 41 82 00 28 */ beq lbl_8018CDB0 -/* 8018CD8C 80 9F 00 28 */ lwz r4, 0x28(r31) -/* 8018CD90 3C A0 5F 70 */ lis r5, 0x5F70 /* 0x5F705F6E@ha */ -/* 8018CD94 38 C5 5F 6E */ addi r6, r5, 0x5F6E /* 0x5F705F6E@l */ -/* 8018CD98 3C A0 6D 73 */ lis r5, 0x6D73 /* 0x6D736574@ha */ -/* 8018CD9C 38 A5 65 74 */ addi r5, r5, 0x6574 /* 0x6D736574@l */ -/* 8018CDA0 38 E0 00 00 */ li r7, 0 -/* 8018CDA4 39 00 00 00 */ li r8, 0 -/* 8018CDA8 48 0C 6B DD */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 8018CDAC 7C 60 1B 78 */ mr r0, r3 -lbl_8018CDB0: -/* 8018CDB0 90 1F 03 A8 */ stw r0, 0x3a8(r31) -/* 8018CDB4 80 1F 03 A8 */ lwz r0, 0x3a8(r31) -/* 8018CDB8 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 8018CDBC 90 03 03 9C */ stw r0, 0x39c(r3) -/* 8018CDC0 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 8018CDC4 3C 80 75 62 */ lis r4, 0x7562 /* 0x75625F6E@ha */ -/* 8018CDC8 38 C4 5F 6E */ addi r6, r4, 0x5F6E /* 0x75625F6E@l */ -/* 8018CDCC 3C 80 00 77 */ lis r4, 0x0077 /* 0x00775F73@ha */ -/* 8018CDD0 38 A4 5F 73 */ addi r5, r4, 0x5F73 /* 0x00775F73@l */ -/* 8018CDD4 81 83 00 00 */ lwz r12, 0(r3) -/* 8018CDD8 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 8018CDDC 7D 89 03 A6 */ mtctr r12 -/* 8018CDE0 4E 80 04 21 */ bctrl -/* 8018CDE4 80 9F 00 0C */ lwz r4, 0xc(r31) -/* 8018CDE8 90 64 03 A0 */ stw r3, 0x3a0(r4) -/* 8018CDEC 80 7F 00 28 */ lwz r3, 0x28(r31) -/* 8018CDF0 3C 80 69 6E */ lis r4, 0x696E /* 0x696E5F6E@ha */ -/* 8018CDF4 38 C4 5F 6E */ addi r6, r4, 0x5F6E /* 0x696E5F6E@l */ -/* 8018CDF8 3C 80 00 64 */ lis r4, 0x0064 /* 0x00645F77@ha */ -/* 8018CDFC 38 A4 5F 77 */ addi r5, r4, 0x5F77 /* 0x00645F77@l */ -/* 8018CE00 81 83 00 00 */ lwz r12, 0(r3) -/* 8018CE04 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 8018CE08 7D 89 03 A6 */ mtctr r12 -/* 8018CE0C 4E 80 04 21 */ bctrl -/* 8018CE10 3C 80 6E 5F */ lis r4, 0x6E5F /* 0x6E5F3433@ha */ -/* 8018CE14 38 84 34 33 */ addi r4, r4, 0x3433 /* 0x6E5F3433@l */ -/* 8018CE18 38 00 00 00 */ li r0, 0 -/* 8018CE1C 90 83 00 1C */ stw r4, 0x1c(r3) -/* 8018CE20 90 03 00 18 */ stw r0, 0x18(r3) -/* 8018CE24 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8018CE28 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8018CE2C 7C 08 03 A6 */ mtlr r0 -/* 8018CE30 38 21 00 10 */ addi r1, r1, 0x10 -/* 8018CE34 4E 80 00 20 */ blr diff --git a/asm/d/file/d_file_select/selectWakuAlpahAnmInit__14dFile_select_cFUcUcUcUc.s b/asm/d/file/d_file_select/selectWakuAlpahAnmInit__14dFile_select_cFUcUcUcUc.s deleted file mode 100644 index e0a076ee9a5..00000000000 --- a/asm/d/file/d_file_select/selectWakuAlpahAnmInit__14dFile_select_cFUcUcUcUc.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_8018D650: -/* 8018D650 38 00 00 00 */ li r0, 0 -/* 8018D654 54 89 06 3E */ clrlwi r9, r4, 0x18 -/* 8018D658 54 84 15 BA */ rlwinm r4, r4, 2, 0x16, 0x1d -/* 8018D65C 7D 03 22 14 */ add r8, r3, r4 -/* 8018D660 80 88 01 64 */ lwz r4, 0x164(r8) -/* 8018D664 B0 04 00 16 */ sth r0, 0x16(r4) -/* 8018D668 80 88 01 70 */ lwz r4, 0x170(r8) -/* 8018D66C B0 04 00 16 */ sth r0, 0x16(r4) -/* 8018D670 80 88 01 7C */ lwz r4, 0x17c(r8) -/* 8018D674 B0 04 00 16 */ sth r0, 0x16(r4) -/* 8018D678 7C 63 4A 14 */ add r3, r3, r9 -/* 8018D67C 98 A3 01 94 */ stb r5, 0x194(r3) -/* 8018D680 98 C3 01 97 */ stb r6, 0x197(r3) -/* 8018D684 98 E3 01 9A */ stb r7, 0x19a(r3) -/* 8018D688 4E 80 00 20 */ blr diff --git a/asm/d/file/d_file_select/selectWakuAlpahAnm__14dFile_select_cFUc.s b/asm/d/file/d_file_select/selectWakuAlpahAnm__14dFile_select_cFUc.s deleted file mode 100644 index fb152b3cb78..00000000000 --- a/asm/d/file/d_file_select/selectWakuAlpahAnm__14dFile_select_cFUc.s +++ /dev/null @@ -1,58 +0,0 @@ -lbl_8018D68C: -/* 8018D68C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8018D690 7C 08 02 A6 */ mflr r0 -/* 8018D694 90 01 00 24 */ stw r0, 0x24(r1) -/* 8018D698 39 61 00 20 */ addi r11, r1, 0x20 -/* 8018D69C 48 1D 4B 35 */ bl _savegpr_26 -/* 8018D6A0 7C 7A 1B 78 */ mr r26, r3 -/* 8018D6A4 54 80 06 3E */ clrlwi r0, r4, 0x18 -/* 8018D6A8 28 00 00 FF */ cmplwi r0, 0xff -/* 8018D6AC 40 82 00 0C */ bne lbl_8018D6B8 -/* 8018D6B0 38 60 00 01 */ li r3, 1 -/* 8018D6B4 48 00 00 98 */ b lbl_8018D74C -lbl_8018D6B8: -/* 8018D6B8 3B 60 00 00 */ li r27, 0 -/* 8018D6BC 54 9C 15 BA */ rlwinm r28, r4, 2, 0x16, 0x1d -/* 8018D6C0 7C 7A E2 14 */ add r3, r26, r28 -/* 8018D6C4 80 63 01 64 */ lwz r3, 0x164(r3) -/* 8018D6C8 7F BA 02 14 */ add r29, r26, r0 -/* 8018D6CC 88 9D 01 9A */ lbz r4, 0x19a(r29) -/* 8018D6D0 88 BD 01 94 */ lbz r5, 0x194(r29) -/* 8018D6D4 88 DD 01 97 */ lbz r6, 0x197(r29) -/* 8018D6D8 38 E0 00 00 */ li r7, 0 -/* 8018D6DC 48 0C 81 9D */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc -/* 8018D6E0 7C 7E 1B 78 */ mr r30, r3 -/* 8018D6E4 7C 7A E2 14 */ add r3, r26, r28 -/* 8018D6E8 80 63 01 70 */ lwz r3, 0x170(r3) -/* 8018D6EC 88 9D 01 9A */ lbz r4, 0x19a(r29) -/* 8018D6F0 88 BD 01 94 */ lbz r5, 0x194(r29) -/* 8018D6F4 88 DD 01 97 */ lbz r6, 0x197(r29) -/* 8018D6F8 38 E0 00 00 */ li r7, 0 -/* 8018D6FC 48 0C 81 7D */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc -/* 8018D700 7C 7F 1B 78 */ mr r31, r3 -/* 8018D704 7C 7A E2 14 */ add r3, r26, r28 -/* 8018D708 80 63 01 7C */ lwz r3, 0x17c(r3) -/* 8018D70C 88 9D 01 9A */ lbz r4, 0x19a(r29) -/* 8018D710 88 BD 01 94 */ lbz r5, 0x194(r29) -/* 8018D714 88 DD 01 97 */ lbz r6, 0x197(r29) -/* 8018D718 38 E0 00 00 */ li r7, 0 -/* 8018D71C 48 0C 81 5D */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc -/* 8018D720 57 C0 06 3E */ clrlwi r0, r30, 0x18 -/* 8018D724 28 00 00 01 */ cmplwi r0, 1 -/* 8018D728 40 82 00 20 */ bne lbl_8018D748 -/* 8018D72C 57 E0 06 3E */ clrlwi r0, r31, 0x18 -/* 8018D730 28 00 00 01 */ cmplwi r0, 1 -/* 8018D734 40 82 00 14 */ bne lbl_8018D748 -/* 8018D738 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8018D73C 28 00 00 01 */ cmplwi r0, 1 -/* 8018D740 40 82 00 08 */ bne lbl_8018D748 -/* 8018D744 3B 60 00 01 */ li r27, 1 -lbl_8018D748: -/* 8018D748 7F 63 DB 78 */ mr r3, r27 -lbl_8018D74C: -/* 8018D74C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8018D750 48 1D 4A CD */ bl _restgpr_26 -/* 8018D754 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8018D758 7C 08 03 A6 */ mtlr r0 -/* 8018D75C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8018D760 4E 80 00 20 */ blr diff --git a/asm/d/file/d_file_select/setInitSaveData__14dFile_select_cFv.s b/asm/d/file/d_file_select/setInitSaveData__14dFile_select_cFv.s deleted file mode 100644 index 1f10e639bfe..00000000000 --- a/asm/d/file/d_file_select/setInitSaveData__14dFile_select_cFv.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_80190254: -/* 80190254 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80190258 7C 08 02 A6 */ mflr r0 -/* 8019025C 90 01 00 24 */ stw r0, 0x24(r1) -/* 80190260 39 61 00 20 */ addi r11, r1, 0x20 -/* 80190264 48 1D 1F 79 */ bl _savegpr_29 -/* 80190268 7C 7D 1B 78 */ mr r29, r3 -/* 8019026C 3B C0 00 00 */ li r30, 0 -/* 80190270 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80190274 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -lbl_80190278: -/* 80190278 7F E3 FB 78 */ mr r3, r31 -/* 8019027C 38 9D 03 B8 */ addi r4, r29, 0x3b8 -/* 80190280 7F C5 F3 78 */ mr r5, r30 -/* 80190284 4B EA 59 4D */ bl initdata_to_card__10dSv_info_cFPci -/* 80190288 38 7D 03 B8 */ addi r3, r29, 0x3b8 -/* 8019028C 57 C4 06 3E */ clrlwi r4, r30, 0x18 -/* 80190290 4B E8 7A A9 */ bl mDoMemCdRWm_SetCheckSumGameData__FPUcUc -/* 80190294 3B DE 00 01 */ addi r30, r30, 1 -/* 80190298 2C 1E 00 03 */ cmpwi r30, 3 -/* 8019029C 41 80 FF DC */ blt lbl_80190278 -/* 801902A0 39 61 00 20 */ addi r11, r1, 0x20 -/* 801902A4 48 1D 1F 85 */ bl _restgpr_29 -/* 801902A8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801902AC 7C 08 03 A6 */ mtlr r0 -/* 801902B0 38 21 00 20 */ addi r1, r1, 0x20 -/* 801902B4 4E 80 00 20 */ blr diff --git a/asm/d/file/d_file_select/setSaveDataForCopySel__14dFile_select_cFv.s b/asm/d/file/d_file_select/setSaveDataForCopySel__14dFile_select_cFv.s deleted file mode 100644 index 1886aa68cac..00000000000 --- a/asm/d/file/d_file_select/setSaveDataForCopySel__14dFile_select_cFv.s +++ /dev/null @@ -1,78 +0,0 @@ -lbl_80187DB8: -/* 80187DB8 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80187DBC 7C 08 02 A6 */ mflr r0 -/* 80187DC0 90 01 00 34 */ stw r0, 0x34(r1) -/* 80187DC4 39 61 00 30 */ addi r11, r1, 0x30 -/* 80187DC8 48 1D A4 01 */ bl _savegpr_24 -/* 80187DCC 7C 7D 1B 78 */ mr r29, r3 -/* 80187DD0 3B FD 03 B8 */ addi r31, r29, 0x3b8 -/* 80187DD4 3B 80 00 00 */ li r28, 0 -/* 80187DD8 3B 60 00 00 */ li r27, 0 -/* 80187DDC 3B C0 00 00 */ li r30, 0 -/* 80187DE0 3B 40 00 00 */ li r26, 0 -lbl_80187DE4: -/* 80187DE4 88 1D 02 65 */ lbz r0, 0x265(r29) -/* 80187DE8 7C 1E 00 00 */ cmpw r30, r0 -/* 80187DEC 40 82 00 0C */ bne lbl_80187DF8 -/* 80187DF0 3B FF 0A 94 */ addi r31, r31, 0xa94 -/* 80187DF4 48 00 00 B8 */ b lbl_80187EAC -lbl_80187DF8: -/* 80187DF8 80 7D 00 38 */ lwz r3, 0x38(r29) -/* 80187DFC 3C 80 80 3C */ lis r4, l_tagName101@ha /* 0x803BAD20@ha */ -/* 80187E00 38 04 AD 20 */ addi r0, r4, l_tagName101@l /* 0x803BAD20@l */ -/* 80187E04 7C 80 DA 14 */ add r4, r0, r27 -/* 80187E08 80 A4 00 00 */ lwz r5, 0(r4) -/* 80187E0C 80 C4 00 04 */ lwz r6, 4(r4) -/* 80187E10 81 83 00 00 */ lwz r12, 0(r3) -/* 80187E14 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 80187E18 7D 89 03 A6 */ mtctr r12 -/* 80187E1C 4E 80 04 21 */ bctrl -/* 80187E20 3C 80 80 3C */ lis r4, l_numTex@ha /* 0x803BAD30@ha */ -/* 80187E24 38 84 AD 30 */ addi r4, r4, l_numTex@l /* 0x803BAD30@l */ -/* 80187E28 7C 84 D0 2E */ lwzx r4, r4, r26 -/* 80187E2C 38 A0 00 00 */ li r5, 0 -/* 80187E30 81 83 00 00 */ lwz r12, 0(r3) -/* 80187E34 81 8C 01 14 */ lwz r12, 0x114(r12) -/* 80187E38 7D 89 03 A6 */ mtctr r12 -/* 80187E3C 4E 80 04 21 */ bctrl -/* 80187E40 38 1C 00 7C */ addi r0, r28, 0x7c -/* 80187E44 7C 7D 00 2E */ lwzx r3, r29, r0 -/* 80187E48 83 23 00 24 */ lwz r25, 0x24(r3) -/* 80187E4C 83 03 00 28 */ lwz r24, 0x28(r3) -/* 80187E50 7F E4 FB 78 */ mr r4, r31 -/* 80187E54 38 1E 02 5B */ addi r0, r30, 0x25b -/* 80187E58 7C 1D 00 AE */ lbzx r0, r29, r0 -/* 80187E5C 7C 00 00 34 */ cntlzw r0, r0 -/* 80187E60 54 05 DE 3E */ rlwinm r5, r0, 0x1b, 0x18, 0x1f -/* 80187E64 57 C6 06 3E */ clrlwi r6, r30, 0x18 -/* 80187E68 48 00 AA ED */ bl setSaveData__12dFile_info_cFP10dSv_save_ciUc -/* 80187E6C 2C 03 FF FF */ cmpwi r3, -1 -/* 80187E70 41 82 00 0C */ beq lbl_80187E7C -/* 80187E74 2C 03 00 01 */ cmpwi r3, 1 -/* 80187E78 40 82 00 18 */ bne lbl_80187E90 -lbl_80187E7C: -/* 80187E7C 7F 23 CB 78 */ mr r3, r25 -/* 80187E80 48 0C D7 89 */ bl hide__13CPaneMgrAlphaFv -/* 80187E84 7F 03 C3 78 */ mr r3, r24 -/* 80187E88 48 0C D7 41 */ bl show__13CPaneMgrAlphaFv -/* 80187E8C 48 00 00 14 */ b lbl_80187EA0 -lbl_80187E90: -/* 80187E90 7F 23 CB 78 */ mr r3, r25 -/* 80187E94 48 0C D7 35 */ bl show__13CPaneMgrAlphaFv -/* 80187E98 7F 03 C3 78 */ mr r3, r24 -/* 80187E9C 48 0C D7 6D */ bl hide__13CPaneMgrAlphaFv -lbl_80187EA0: -/* 80187EA0 3B FF 0A 94 */ addi r31, r31, 0xa94 -/* 80187EA4 3B 9C 00 04 */ addi r28, r28, 4 -/* 80187EA8 3B 7B 00 08 */ addi r27, r27, 8 -lbl_80187EAC: -/* 80187EAC 3B DE 00 01 */ addi r30, r30, 1 -/* 80187EB0 2C 1E 00 03 */ cmpwi r30, 3 -/* 80187EB4 3B 5A 00 04 */ addi r26, r26, 4 -/* 80187EB8 41 80 FF 2C */ blt lbl_80187DE4 -/* 80187EBC 39 61 00 30 */ addi r11, r1, 0x30 -/* 80187EC0 48 1D A3 55 */ bl _restgpr_24 -/* 80187EC4 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80187EC8 7C 08 03 A6 */ mtlr r0 -/* 80187ECC 38 21 00 30 */ addi r1, r1, 0x30 -/* 80187ED0 4E 80 00 20 */ blr diff --git a/asm/d/file/d_file_select/setSaveData__14dFile_select_cFv.s b/asm/d/file/d_file_select/setSaveData__14dFile_select_cFv.s deleted file mode 100644 index 38049644075..00000000000 --- a/asm/d/file/d_file_select/setSaveData__14dFile_select_cFv.s +++ /dev/null @@ -1,44 +0,0 @@ -lbl_8018D044: -/* 8018D044 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8018D048 7C 08 02 A6 */ mflr r0 -/* 8018D04C 90 01 00 24 */ stw r0, 0x24(r1) -/* 8018D050 39 61 00 20 */ addi r11, r1, 0x20 -/* 8018D054 48 1D 51 85 */ bl _savegpr_28 -/* 8018D058 7C 7C 1B 78 */ mr r28, r3 -/* 8018D05C 3B DC 03 B8 */ addi r30, r28, 0x3b8 -/* 8018D060 3B A0 00 00 */ li r29, 0 -/* 8018D064 3B E0 00 00 */ li r31, 0 -lbl_8018D068: -/* 8018D068 7F C3 F3 78 */ mr r3, r30 -/* 8018D06C 4B E8 AC 81 */ bl mDoMemCdRWm_TestCheckSumGameData__FPv -/* 8018D070 7C 65 1B 78 */ mr r5, r3 -/* 8018D074 38 1F 00 70 */ addi r0, r31, 0x70 -/* 8018D078 7C 7C 00 2E */ lwzx r3, r28, r0 -/* 8018D07C 7F C4 F3 78 */ mr r4, r30 -/* 8018D080 57 A6 06 3E */ clrlwi r6, r29, 0x18 -/* 8018D084 48 00 58 D1 */ bl setSaveData__12dFile_info_cFP10dSv_save_ciUc -/* 8018D088 2C 03 FF FF */ cmpwi r3, -1 -/* 8018D08C 40 82 00 1C */ bne lbl_8018D0A8 -/* 8018D090 38 00 00 01 */ li r0, 1 -/* 8018D094 7C 7C EA 14 */ add r3, r28, r29 -/* 8018D098 98 03 02 5B */ stb r0, 0x25b(r3) -/* 8018D09C 38 00 00 00 */ li r0, 0 -/* 8018D0A0 98 03 02 58 */ stb r0, 0x258(r3) -/* 8018D0A4 48 00 00 14 */ b lbl_8018D0B8 -lbl_8018D0A8: -/* 8018D0A8 7C 9C EA 14 */ add r4, r28, r29 -/* 8018D0AC 98 64 02 58 */ stb r3, 0x258(r4) -/* 8018D0B0 38 00 00 00 */ li r0, 0 -/* 8018D0B4 98 04 02 5B */ stb r0, 0x25b(r4) -lbl_8018D0B8: -/* 8018D0B8 3B BD 00 01 */ addi r29, r29, 1 -/* 8018D0BC 2C 1D 00 03 */ cmpwi r29, 3 -/* 8018D0C0 3B DE 0A 94 */ addi r30, r30, 0xa94 -/* 8018D0C4 3B FF 00 04 */ addi r31, r31, 4 -/* 8018D0C8 41 80 FF A0 */ blt lbl_8018D068 -/* 8018D0CC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8018D0D0 48 1D 51 55 */ bl _restgpr_28 -/* 8018D0D4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8018D0D8 7C 08 03 A6 */ mtlr r0 -/* 8018D0DC 38 21 00 20 */ addi r1, r1, 0x20 -/* 8018D0E0 4E 80 00 20 */ blr diff --git a/asm/d/file/d_file_select/setWakuAnm__14dFile_select_cFv.s b/asm/d/file/d_file_select/setWakuAnm__14dFile_select_cFv.s deleted file mode 100644 index 525dd1a4a0d..00000000000 --- a/asm/d/file/d_file_select/setWakuAnm__14dFile_select_cFv.s +++ /dev/null @@ -1,72 +0,0 @@ -lbl_8018CE38: -/* 8018CE38 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8018CE3C 7C 08 02 A6 */ mflr r0 -/* 8018CE40 90 01 00 24 */ stw r0, 0x24(r1) -/* 8018CE44 39 61 00 20 */ addi r11, r1, 0x20 -/* 8018CE48 48 1D 53 91 */ bl _savegpr_28 -/* 8018CE4C 7C 7C 1B 78 */ mr r28, r3 -/* 8018CE50 C0 02 9F B0 */ lfs f0, lit_7201(r2) -/* 8018CE54 80 63 00 98 */ lwz r3, 0x98(r3) -/* 8018CE58 D0 03 00 08 */ stfs f0, 8(r3) -/* 8018CE5C 3B A0 00 00 */ li r29, 0 -/* 8018CE60 3B E0 00 00 */ li r31, 0 -lbl_8018CE64: -/* 8018CE64 7F DC FA 14 */ add r30, r28, r31 -/* 8018CE68 80 7E 01 64 */ lwz r3, 0x164(r30) -/* 8018CE6C 80 63 00 04 */ lwz r3, 4(r3) -/* 8018CE70 80 9C 00 98 */ lwz r4, 0x98(r28) -/* 8018CE74 81 83 00 00 */ lwz r12, 0(r3) -/* 8018CE78 81 8C 00 60 */ lwz r12, 0x60(r12) -/* 8018CE7C 7D 89 03 A6 */ mtctr r12 -/* 8018CE80 4E 80 04 21 */ bctrl -/* 8018CE84 80 7E 01 70 */ lwz r3, 0x170(r30) -/* 8018CE88 80 63 00 04 */ lwz r3, 4(r3) -/* 8018CE8C 80 9C 00 98 */ lwz r4, 0x98(r28) -/* 8018CE90 81 83 00 00 */ lwz r12, 0(r3) -/* 8018CE94 81 8C 00 60 */ lwz r12, 0x60(r12) -/* 8018CE98 7D 89 03 A6 */ mtctr r12 -/* 8018CE9C 4E 80 04 21 */ bctrl -/* 8018CEA0 80 7E 01 7C */ lwz r3, 0x17c(r30) -/* 8018CEA4 80 63 00 04 */ lwz r3, 4(r3) -/* 8018CEA8 80 9C 00 98 */ lwz r4, 0x98(r28) -/* 8018CEAC 81 83 00 00 */ lwz r12, 0(r3) -/* 8018CEB0 81 8C 00 60 */ lwz r12, 0x60(r12) -/* 8018CEB4 7D 89 03 A6 */ mtctr r12 -/* 8018CEB8 4E 80 04 21 */ bctrl -/* 8018CEBC 80 7E 01 64 */ lwz r3, 0x164(r30) -/* 8018CEC0 80 63 00 04 */ lwz r3, 4(r3) -/* 8018CEC4 48 16 B1 09 */ bl animationTransform__7J2DPaneFv -/* 8018CEC8 80 7E 01 70 */ lwz r3, 0x170(r30) -/* 8018CECC 80 63 00 04 */ lwz r3, 4(r3) -/* 8018CED0 48 16 B0 FD */ bl animationTransform__7J2DPaneFv -/* 8018CED4 80 7E 01 7C */ lwz r3, 0x17c(r30) -/* 8018CED8 80 63 00 04 */ lwz r3, 4(r3) -/* 8018CEDC 48 16 B0 F1 */ bl animationTransform__7J2DPaneFv -/* 8018CEE0 80 7E 01 64 */ lwz r3, 0x164(r30) -/* 8018CEE4 38 80 00 00 */ li r4, 0 -/* 8018CEE8 81 83 00 00 */ lwz r12, 0(r3) -/* 8018CEEC 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 8018CEF0 7D 89 03 A6 */ mtctr r12 -/* 8018CEF4 4E 80 04 21 */ bctrl -/* 8018CEF8 80 7E 01 70 */ lwz r3, 0x170(r30) -/* 8018CEFC 38 80 00 00 */ li r4, 0 -/* 8018CF00 81 83 00 00 */ lwz r12, 0(r3) -/* 8018CF04 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 8018CF08 7D 89 03 A6 */ mtctr r12 -/* 8018CF0C 4E 80 04 21 */ bctrl -/* 8018CF10 80 7E 01 7C */ lwz r3, 0x17c(r30) -/* 8018CF14 38 80 00 00 */ li r4, 0 -/* 8018CF18 81 83 00 00 */ lwz r12, 0(r3) -/* 8018CF1C 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 8018CF20 7D 89 03 A6 */ mtctr r12 -/* 8018CF24 4E 80 04 21 */ bctrl -/* 8018CF28 3B BD 00 01 */ addi r29, r29, 1 -/* 8018CF2C 2C 1D 00 03 */ cmpwi r29, 3 -/* 8018CF30 3B FF 00 04 */ addi r31, r31, 4 -/* 8018CF34 41 80 FF 30 */ blt lbl_8018CE64 -/* 8018CF38 39 61 00 20 */ addi r11, r1, 0x20 -/* 8018CF3C 48 1D 52 E9 */ bl _restgpr_28 -/* 8018CF40 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8018CF44 7C 08 03 A6 */ mtlr r0 -/* 8018CF48 38 21 00 20 */ addi r1, r1, 0x20 -/* 8018CF4C 4E 80 00 20 */ blr diff --git a/asm/d/file/d_file_select/yesNoCursorMoveAnm__14dFile_select_cFv.s b/asm/d/file/d_file_select/yesNoCursorMoveAnm__14dFile_select_cFv.s deleted file mode 100644 index 391ad16677e..00000000000 --- a/asm/d/file/d_file_select/yesNoCursorMoveAnm__14dFile_select_cFv.s +++ /dev/null @@ -1,29 +0,0 @@ -lbl_80189BA8: -/* 80189BA8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80189BAC 7C 08 02 A6 */ mflr r0 -/* 80189BB0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80189BB4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80189BB8 93 C1 00 08 */ stw r30, 8(r1) -/* 80189BBC 7C 7E 1B 78 */ mr r30, r3 -/* 80189BC0 4B FF F3 11 */ bl yesnoSelectMoveAnm__14dFile_select_cFv -/* 80189BC4 7C 7F 1B 78 */ mr r31, r3 -/* 80189BC8 7F C3 F3 78 */ mr r3, r30 -/* 80189BCC 88 9E 02 69 */ lbz r4, 0x269(r30) -/* 80189BD0 48 00 3F FD */ bl yesnoWakuAlpahAnm__14dFile_select_cFUc -/* 80189BD4 57 E0 06 3E */ clrlwi r0, r31, 0x18 -/* 80189BD8 28 00 00 01 */ cmplwi r0, 1 -/* 80189BDC 40 82 00 20 */ bne lbl_80189BFC -/* 80189BE0 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80189BE4 28 00 00 01 */ cmplwi r0, 1 -/* 80189BE8 40 82 00 14 */ bne lbl_80189BFC -/* 80189BEC 7F C3 F3 78 */ mr r3, r30 -/* 80189BF0 4B FF F5 3D */ bl yesnoCursorShow__14dFile_select_cFv -/* 80189BF4 38 00 00 1A */ li r0, 0x1a -/* 80189BF8 98 1E 02 6F */ stb r0, 0x26f(r30) -lbl_80189BFC: -/* 80189BFC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80189C00 83 C1 00 08 */ lwz r30, 8(r1) -/* 80189C04 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80189C08 7C 08 03 A6 */ mtlr r0 -/* 80189C0C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80189C10 4E 80 00 20 */ blr diff --git a/asm/d/file/d_file_select/yesnoWakuAlpahAnmInit__14dFile_select_cFUcUcUcUc.s b/asm/d/file/d_file_select/yesnoWakuAlpahAnmInit__14dFile_select_cFUcUcUcUc.s deleted file mode 100644 index 2c8dbe9ede2..00000000000 --- a/asm/d/file/d_file_select/yesnoWakuAlpahAnmInit__14dFile_select_cFUcUcUcUc.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_8018DB80: -/* 8018DB80 54 89 06 3E */ clrlwi r9, r4, 0x18 -/* 8018DB84 28 09 00 FF */ cmplwi r9, 0xff -/* 8018DB88 4D 82 00 20 */ beqlr -/* 8018DB8C 38 00 00 00 */ li r0, 0 -/* 8018DB90 54 84 15 BA */ rlwinm r4, r4, 2, 0x16, 0x1d -/* 8018DB94 7D 03 22 14 */ add r8, r3, r4 -/* 8018DB98 80 88 01 A0 */ lwz r4, 0x1a0(r8) -/* 8018DB9C B0 04 00 16 */ sth r0, 0x16(r4) -/* 8018DBA0 80 88 01 A8 */ lwz r4, 0x1a8(r8) -/* 8018DBA4 B0 04 00 16 */ sth r0, 0x16(r4) -/* 8018DBA8 80 88 01 B0 */ lwz r4, 0x1b0(r8) -/* 8018DBAC B0 04 00 16 */ sth r0, 0x16(r4) -/* 8018DBB0 7C 63 4A 14 */ add r3, r3, r9 -/* 8018DBB4 98 A3 01 B8 */ stb r5, 0x1b8(r3) -/* 8018DBB8 98 C3 01 BA */ stb r6, 0x1ba(r3) -/* 8018DBBC 98 E3 01 BC */ stb r7, 0x1bc(r3) -/* 8018DBC0 80 68 01 C0 */ lwz r3, 0x1c0(r8) -/* 8018DBC4 B0 03 00 6A */ sth r0, 0x6a(r3) -/* 8018DBC8 4E 80 00 20 */ blr diff --git a/asm/d/file/d_file_select/yesnoWakuAlpahAnm__14dFile_select_cFUc.s b/asm/d/file/d_file_select/yesnoWakuAlpahAnm__14dFile_select_cFUc.s deleted file mode 100644 index 49b371d98d5..00000000000 --- a/asm/d/file/d_file_select/yesnoWakuAlpahAnm__14dFile_select_cFUc.s +++ /dev/null @@ -1,94 +0,0 @@ -lbl_8018DBCC: -/* 8018DBCC 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 8018DBD0 7C 08 02 A6 */ mflr r0 -/* 8018DBD4 90 01 00 54 */ stw r0, 0x54(r1) -/* 8018DBD8 39 61 00 50 */ addi r11, r1, 0x50 -/* 8018DBDC 48 1D 45 F1 */ bl _savegpr_25 -/* 8018DBE0 7C 79 1B 78 */ mr r25, r3 -/* 8018DBE4 3B A0 00 00 */ li r29, 0 -/* 8018DBE8 3B 80 00 01 */ li r28, 1 -/* 8018DBEC 3B 60 00 01 */ li r27, 1 -/* 8018DBF0 3B 40 00 01 */ li r26, 1 -/* 8018DBF4 38 60 00 01 */ li r3, 1 -/* 8018DBF8 54 80 06 3E */ clrlwi r0, r4, 0x18 -/* 8018DBFC 28 00 00 FF */ cmplwi r0, 0xff -/* 8018DC00 41 82 00 E8 */ beq lbl_8018DCE8 -/* 8018DC04 54 9E 15 BA */ rlwinm r30, r4, 2, 0x16, 0x1d -/* 8018DC08 7C 79 F2 14 */ add r3, r25, r30 -/* 8018DC0C 80 63 01 A0 */ lwz r3, 0x1a0(r3) -/* 8018DC10 7F F9 02 14 */ add r31, r25, r0 -/* 8018DC14 88 9F 01 BC */ lbz r4, 0x1bc(r31) -/* 8018DC18 88 BF 01 B8 */ lbz r5, 0x1b8(r31) -/* 8018DC1C 88 DF 01 BA */ lbz r6, 0x1ba(r31) -/* 8018DC20 38 E0 00 00 */ li r7, 0 -/* 8018DC24 48 0C 7C 55 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc -/* 8018DC28 7C 7C 1B 78 */ mr r28, r3 -/* 8018DC2C 7C 79 F2 14 */ add r3, r25, r30 -/* 8018DC30 80 63 01 A8 */ lwz r3, 0x1a8(r3) -/* 8018DC34 88 9F 01 BC */ lbz r4, 0x1bc(r31) -/* 8018DC38 88 BF 01 B8 */ lbz r5, 0x1b8(r31) -/* 8018DC3C 88 DF 01 BA */ lbz r6, 0x1ba(r31) -/* 8018DC40 38 E0 00 00 */ li r7, 0 -/* 8018DC44 48 0C 7C 35 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc -/* 8018DC48 7C 7B 1B 78 */ mr r27, r3 -/* 8018DC4C 7C 79 F2 14 */ add r3, r25, r30 -/* 8018DC50 80 63 01 B0 */ lwz r3, 0x1b0(r3) -/* 8018DC54 88 9F 01 BC */ lbz r4, 0x1bc(r31) -/* 8018DC58 88 BF 01 B8 */ lbz r5, 0x1b8(r31) -/* 8018DC5C 88 DF 01 BA */ lbz r6, 0x1ba(r31) -/* 8018DC60 38 E0 00 00 */ li r7, 0 -/* 8018DC64 48 0C 7C 15 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc -/* 8018DC68 7C 7A 1B 78 */ mr r26, r3 -/* 8018DC6C 38 00 00 96 */ li r0, 0x96 -/* 8018DC70 98 01 00 08 */ stb r0, 8(r1) -/* 8018DC74 98 01 00 09 */ stb r0, 9(r1) -/* 8018DC78 98 01 00 0A */ stb r0, 0xa(r1) -/* 8018DC7C 38 60 00 FF */ li r3, 0xff -/* 8018DC80 98 61 00 0B */ stb r3, 0xb(r1) -/* 8018DC84 80 01 00 08 */ lwz r0, 8(r1) -/* 8018DC88 90 01 00 0C */ stw r0, 0xc(r1) -/* 8018DC8C 98 61 00 10 */ stb r3, 0x10(r1) -/* 8018DC90 98 61 00 11 */ stb r3, 0x11(r1) -/* 8018DC94 98 61 00 12 */ stb r3, 0x12(r1) -/* 8018DC98 98 61 00 13 */ stb r3, 0x13(r1) -/* 8018DC9C 80 01 00 10 */ lwz r0, 0x10(r1) -/* 8018DCA0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8018DCA4 7C 99 F2 14 */ add r4, r25, r30 -/* 8018DCA8 80 64 01 C0 */ lwz r3, 0x1c0(r4) -/* 8018DCAC 80 03 00 5C */ lwz r0, 0x5c(r3) -/* 8018DCB0 90 01 00 18 */ stw r0, 0x18(r1) -/* 8018DCB4 90 01 00 1C */ stw r0, 0x1c(r1) -/* 8018DCB8 80 64 01 C0 */ lwz r3, 0x1c0(r4) -/* 8018DCBC 80 03 00 5C */ lwz r0, 0x5c(r3) -/* 8018DCC0 90 01 00 20 */ stw r0, 0x20(r1) -/* 8018DCC4 90 01 00 24 */ stw r0, 0x24(r1) -/* 8018DCC8 80 64 01 C0 */ lwz r3, 0x1c0(r4) -/* 8018DCCC 88 9F 01 BC */ lbz r4, 0x1bc(r31) -/* 8018DCD0 38 A1 00 24 */ addi r5, r1, 0x24 -/* 8018DCD4 38 C1 00 1C */ addi r6, r1, 0x1c -/* 8018DCD8 38 E1 00 14 */ addi r7, r1, 0x14 -/* 8018DCDC 39 01 00 0C */ addi r8, r1, 0xc -/* 8018DCE0 39 20 00 00 */ li r9, 0 -/* 8018DCE4 48 0C 6B D9 */ bl colorAnime__8CPaneMgrFsQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorUc -lbl_8018DCE8: -/* 8018DCE8 57 80 06 3E */ clrlwi r0, r28, 0x18 -/* 8018DCEC 28 00 00 01 */ cmplwi r0, 1 -/* 8018DCF0 40 82 00 2C */ bne lbl_8018DD1C -/* 8018DCF4 57 60 06 3E */ clrlwi r0, r27, 0x18 -/* 8018DCF8 28 00 00 01 */ cmplwi r0, 1 -/* 8018DCFC 40 82 00 20 */ bne lbl_8018DD1C -/* 8018DD00 57 40 06 3E */ clrlwi r0, r26, 0x18 -/* 8018DD04 28 00 00 01 */ cmplwi r0, 1 -/* 8018DD08 40 82 00 14 */ bne lbl_8018DD1C -/* 8018DD0C 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8018DD10 28 00 00 01 */ cmplwi r0, 1 -/* 8018DD14 40 82 00 08 */ bne lbl_8018DD1C -/* 8018DD18 3B A0 00 01 */ li r29, 1 -lbl_8018DD1C: -/* 8018DD1C 7F A3 EB 78 */ mr r3, r29 -/* 8018DD20 39 61 00 50 */ addi r11, r1, 0x50 -/* 8018DD24 48 1D 44 F5 */ bl _restgpr_25 -/* 8018DD28 80 01 00 54 */ lwz r0, 0x54(r1) -/* 8018DD2C 7C 08 03 A6 */ mtlr r0 -/* 8018DD30 38 21 00 50 */ addi r1, r1, 0x50 -/* 8018DD34 4E 80 00 20 */ blr diff --git a/include/d/d_name.h b/include/d/d_name.h index 4e2d0ba6c83..137de045594 100644 --- a/include/d/d_name.h +++ b/include/d/d_name.h @@ -158,7 +158,7 @@ class dName_c { /* 0x2B5 */ char mInputStr[23]; /* 0x2CC */ ChrInfo_c mChrInfo[8]; /* 0x30C */ u8 field_0x30c[4][4]; // ? - /* 0x31C */ char mNextNameStr[28]; -}; // Size: 0x338 + /* 0x31C */ char mNextNameStr[24]; +}; // Size: 0x334 #endif /* D_D_NAME_H */ diff --git a/include/d/file/d_file_sel_info.h b/include/d/file/d_file_sel_info.h index cb9460259e4..ded203c3089 100644 --- a/include/d/file/d_file_sel_info.h +++ b/include/d/file/d_file_sel_info.h @@ -33,8 +33,10 @@ class dFile_info_c { /* 801924A0 */ virtual ~dFile_info_c(); // fake? needed to get vtable size correct + #ifdef DFILE_INFO_C_DUMMY_VIRTUAL virtual void dummy() = 0; virtual void dummy2() = 0; + #endif void setBasePane(J2DPane* pane) { mFileInfo.mBasePane = pane; } CPaneMgrAlpha* getDatBase() { return mDatBase; } diff --git a/include/d/file/d_file_sel_warning.h b/include/d/file/d_file_sel_warning.h index 2b32eca7676..8164ed4afda 100644 --- a/include/d/file/d_file_sel_warning.h +++ b/include/d/file/d_file_sel_warning.h @@ -39,8 +39,10 @@ class dFile_warning_c { /* 80191C18 */ virtual ~dFile_warning_c(); // fake? needed to get vtable size correct + #ifdef DFILE_WARNING_C_DUMMY_VIRTUAL virtual void dummy() = 0; virtual void dummy2() = 0; + #endif u8 getStatus() { return mStatus; } void draw() { _draw(); } diff --git a/include/d/file/d_file_select.h b/include/d/file/d_file_select.h index 2b7e532e60e..165a1c97c07 100644 --- a/include/d/file/d_file_select.h +++ b/include/d/file/d_file_select.h @@ -4,17 +4,20 @@ #include "d/com/d_com_inf_game.h" #include "d/file/d_file_sel_warning.h" #include "d/d_name.h" +#include "d/save/d_save.h" #include "d/msg/d_msg_string.h" #include "JSystem/J3DGraphLoader/J3DModelLoader.h" #include "JSystem/J3DGraphLoader/J3DAnmLoader.h" +class dFile_info_c; + class dDlst_FileSel_c { public: /* 8018DEBC */ void draw(); /* 8019135C */ ~dDlst_FileSel_c(); /* 0x00 */ void* vtable; - /* 0x04 */ J2DScreen* mpScreen; + /* 0x04 */ J2DScreen* Scr; }; class dFile_select3D_c { @@ -36,6 +39,8 @@ class dFile_select3D_c { /* 801910D4 */ void calcViewMtx(Mtx); void drawOff() { mpModel = 0; } + void setBasePane(CPaneMgr* paneMgr) { mPaneMgr = paneMgr; } + void setBase2Pane(J2DPane* pane) { mPane = pane; } /* 0x0000 */ void* vtable; /* 0x0004 */ JKRSolidHeap* mpHeap; @@ -62,7 +67,7 @@ class dDlst_FileSelYn_c { /* 801911F4 */ ~dDlst_FileSelYn_c(); /* 0x00 */ void* vtable; - /* 0x04 */ J2DScreen* mpScreen; + /* 0x04 */ J2DScreen* ScrYn; /* 0x08 */ u8 field_0x08[4]; }; @@ -72,9 +77,9 @@ class dDlst_FileSelDt_c { /* 801912E4 */ ~dDlst_FileSelDt_c(); /* 0x00 */ void* vtable; - /* 0x04 */ J2DScreen* mpScreen; + /* 0x04 */ J2DScreen* ScrDt; /* 0x08 */ J2DPane* mpPane; - /* 0x0C */ u8 field_0x0c[4]; + /* 0x0C */ J2DPane* mpPane2; }; class dDlst_FileSelCp_c { @@ -83,7 +88,7 @@ class dDlst_FileSelCp_c { /* 8019126C */ ~dDlst_FileSelCp_c(); /* 0x00 */ void* vtable; - /* 0x04 */ J2DScreen* mpScreen; + /* 0x04 */ J2DScreen* Scr; /* 0x08 */ bool field_0x08; /* 0x0C */ J2DPane* mpPane1; /* 0x10 */ J2DPane* mpPane2; @@ -95,16 +100,7 @@ class dDlst_FileSel3m_c { /* 8019117C */ ~dDlst_FileSel3m_c(); /* 0x00 */ void* vtable; - /* 0x04 */ J2DScreen* mpScreen; -}; - -class dFile_info_c { -public: - /* 80192434 */ dFile_info_c(JKRArchive*, u8); - /* 80192954 */ void setSaveData(dSv_save_c*, int, u8); - /* 80192D60 */ void _draw(); - - void draw() { _draw(); } + /* 0x04 */ J2DScreen* Scr3m; }; // temp struct in order to get matches @@ -122,9 +118,7 @@ class dFs_HIO_c_tmp { /* 0x000C */ u8 field_0x000c; /* 0x000D */ u8 field_0x000d; /* 0x000E */ u8 field_0x000e[2]; - /* 0x0010 */ float field_0x0010; - /* 0x0014 */ float field_0x0014; - /* 0x0018 */ float field_0x0018; + /* 0x0010 */ float field_0x0010[3]; /* 0x001C */ u8 field_0x001c; /* 0x001D */ u8 field_0x001d; /* 0x001E */ u8 field_0x001e; @@ -152,9 +146,7 @@ class dFs_HIO_c { /* 0x000C */ u8 field_0x000c; /* 0x000D */ u8 field_0x000d; /* 0x000E */ u8 field_0x000e[2]; - /* 0x0010 */ float field_0x0010; - /* 0x0014 */ float field_0x0014; - /* 0x0018 */ float field_0x0018; + /* 0x0010 */ float field_0x0010[3]; /* 0x001C */ u8 field_0x001c; /* 0x001D */ u8 field_0x001d; /* 0x001E */ u8 field_0x001e; @@ -165,8 +157,13 @@ class dFs_HIO_c { /* 0x0023 */ u8 field_0x0023; }; +// Trying to define this using dSv_save_c causes alignment issues +typedef char SaveData[0xa94]; + class dFile_select_c { public: + typedef void (dFile_select_c::*DispFunc)(); + /* 8018366C */ dFile_select_c(JKRArchive*); /* 8018375C */ ~dFile_select_c(); /* 801843CC */ void _create(); @@ -221,12 +218,12 @@ class dFile_select_c { /* 801884D0 */ void copyDataToSelectMoveAnm(); /* 80188834 */ void copySelectWakuAlpahAnmInit(u8, u8, u8, u8); /* 80188878 */ bool copySelectWakuAlpahAnm(u8); - /* 80188950 */ void getCptoNum(u8); + /* 80188950 */ u8 getCptoNum(u8); /* 80188994 */ void copyToSelBack(); /* 80188B54 */ void copyToSelPaneMove(); - /* 80188BBC */ void yesnoMenuMoveAnmInitSet(int, int); + /* 80188BBC */ bool yesnoMenuMoveAnmInitSet(int, int); /* 80188D38 */ bool yesnoMenuMoveAnm(); - /* 80188ED0 */ void yesnoSelectMoveAnm(); + /* 80188ED0 */ bool yesnoSelectMoveAnm(); /* 8018912C */ void yesnoCursorShow(); /* 8018929C */ void YesNoSelect(); /* 801893E4 */ void yesNoSelectStart(); @@ -273,7 +270,7 @@ class dFile_select_c { /* 8018D8C8 */ bool menuWakuAlpahAnm(u8); /* 8018DA10 */ void menuCursorShow(); /* 8018DB80 */ void yesnoWakuAlpahAnmInit(u8, u8, u8, u8); - /* 8018DBCC */ void yesnoWakuAlpahAnm(u8); + /* 8018DBCC */ bool yesnoWakuAlpahAnm(u8); /* 8018DD38 */ void _draw(); /* 8018E130 */ void errorMoveAnmInitSet(int, int); /* 8018E1C0 */ bool errorMoveAnm(); @@ -310,11 +307,11 @@ class dFile_select_c { /* 8018F6DC */ void MemCardMsgWindowInitOpen(); /* 8018F8D8 */ void MemCardMsgWindowOpen(); /* 8018F974 */ void MemCardMsgWindowClose(); - /* 8018FA2C */ void errYesNoSelect(); + /* 8018FA2C */ bool errYesNoSelect(); /* 8018FB80 */ void errCurMove(u8); /* 8018FBF8 */ void MemCardErrYesNoCursorMoveAnm(); /* 8018FC64 */ void errorTxtSet(u16); - /* 8018FD30 */ void errorTxtChangeAnm(); + /* 8018FD30 */ bool errorTxtChangeAnm(); /* 8018FE18 */ bool fileRecScaleAnm(); /* 8018FE64 */ void fileRecScaleAnmInitSet2(f32, f32); /* 8018FEF4 */ bool fileRecScaleAnm2(); @@ -335,23 +332,29 @@ class dFile_select_c { /* 0x0004 */ u8 field_0x04[4]; /* 0x0008 */ JKRArchive* mpArchive; /* 0x000C */ dFile_select3D_c* mpFileSelect3d; - /* 0x0010 */ dDlst_FileSel_c mFileSelectDlst; + /* 0x0010 */ dDlst_FileSel_c fileSel; /* 0x0018 */ JUTFont* mpMessageFont; /* 0x001C */ JUTFont* mpSubFont; /* 0x0020 */ dMsgString_c* mpMessageString; - /* 0x0024 */ dDlst_FileSelDt_c mFileSelDeleteDlst; - /* 0x0034 */ dDlst_FileSelCp_c mFileSelCopyDlst; - /* 0x0048 */ dDlst_FileSelYn_c mFileSelYesNoDlst; - /* 0x0054 */ dDlst_FileSel3m_c mFileSel3mDlst; - /* 0x005C */ u8 field_0x005c[4]; - /* 0x0060 */ dSelect_cursor_c* mpCursor1; - /* 0x0064 */ dSelect_cursor_c* mpCursor2; - /* 0x0068 */ dName_c* mpName; + /* 0x0024 */ dDlst_FileSelDt_c mSelDt; + /* 0x0034 */ dDlst_FileSelCp_c mCpSel; + /* 0x0048 */ dDlst_FileSelYn_c mYnSel; + /* 0x0054 */ dDlst_FileSel3m_c m3mSel; + /* 0x005C */ u8 field_0x005c[4]; + /* 0x0060 */ dSelect_cursor_c* mSelIcon; + /* 0x0064 */ dSelect_cursor_c* mSelIcon2; + /* 0x0068 */ dName_c* mpName; /* 0x006C */ dFile_warning_c* mpFileWarning; - /* 0x0070 */ u8 field_0x70[0xc]; + /* 0x0070 */ dFile_info_c* field_0x0070[3]; /* 0x007C */ dFile_info_c* mpFileInfo[2]; - /* 0x0084 */ J2DAnmTransform* mpAnmBase[7]; // this might be 7 individual pointers and not an array - /* 0x00A0 */ u8 field_0x00a0[4]; + /* 0x0084 */ J2DAnmTransform* field_0x0084; + /* 0x0088 */ J2DAnmTransform* field_0x0088; + /* 0x008C */ J2DAnmTransform* field_0x008c; + /* 0x0090 */ J2DAnmTransform* field_0x0090; + /* 0x0094 */ J2DAnmTransform* field_0x0094; + /* 0x0098 */ J2DAnmTransform* field_0x0098; + /* 0x009C */ J2DAnmTransform* field_0x009c; + /* 0x00A0 */ s32 field_0x00a0; /* 0x00A4 */ CPaneMgr* field_0x00a4; /* 0x00A8 */ u8 field_0x00a8[0xb0-0xa8]; /* 0x00B0 */ s32 field_0x00b0; @@ -361,19 +364,20 @@ class dFile_select_c { /* 0x00BA */ u8 field_0x00ba; /* 0x00BB */ u8 field_0x00bb; /* 0x00BC */ CPaneMgr* field_0x00bc[3]; - /* 0x00C8 */ f32 field_0x00c8; - /* 0x00CC */ u8 field_0x00cc[8]; - /* 0x00D4 */ float field_0x00d4; - /* 0x00D8 */ u8 field_0x00d8[8]; + /* 0x00C8 */ f32 field_0x00c8[3]; + /* 0x00D4 */ f32 field_0x00d4[3]; /* 0x00E0 */ s32 field_0x00e0[3]; /* 0x00EC */ s32 field_0x00ec; - /* 0x00F0 */ u8 field_0x00f0[0x108 - 0xf0]; + /* 0x00F0 */ CPaneMgr* field_0x00f0[2]; + /* 0x00F8 */ s32 field_0x00f8[2]; + /* 0x0100 */ s32 field_0x0100; + /* 0x0104 */ s32 field_0x0104; /* 0x0108 */ bool field_0x0108; /* 0x0109 */ bool field_0x0109; /* 0x010A */ u8 field_0x10a[2]; /* 0x010C */ J2DPane* mpPane; /* 0x0110 */ int field_0x0110; - /* 0x0110 */ int field_0x0114; + /* 0x0114 */ int field_0x0114; /* 0x0118 */ J2DPane* field_0x0118; /* 0x011C */ J2DPane* field_0x011c; /* 0x0120 */ int field_0x0120; @@ -383,34 +387,52 @@ class dFile_select_c { /* 0x012C */ J2DPane* field_0x012c; /* 0x0130 */ int field_0x0130; /* 0x0134 */ int field_0x0134; - /* 0x0138 */ u8 field_0x0138[0x014A - 0x0138]; + /* 0x0138 */ CPaneMgrAlpha* field_0x0138[2]; + /* 0x0140 */ char* field_0x0140[2]; + /* 0x0148 */ u8 field_0x0148; + /* 0x0149 */ u8 field_0x0149; /* 0x014A */ bool field_0x014a; /* 0x014B */ bool field_0x014b; - /* 0x014C */ u8 field_0x014C[0x0188 - 0x014C]; + /* 0x014C */ CPaneMgrAlpha* field_0x014c[3]; + /* 0x0158 */ CPaneMgrAlpha* field_0x0158[3]; + /* 0x0164 */ CPaneMgr* field_0x0164[3]; + /* 0x0170 */ CPaneMgr* field_0x0170[3]; + /* 0x017C */ CPaneMgr* field_0x017c[3]; /* 0x0188 */ CPaneMgr* field_0x0188[3]; - /* 0x0194 */ u8 field_0x0194[0x01C8 - 0x0194]; - /* 0x01C8 */ J2DAnmBase* field_0x01c8; + /* 0x0194 */ u8 field_0x0194[3]; + /* 0x0197 */ u8 field_0x0197[3]; + /* 0x019A */ u8 field_0x019a[3]; + /* 0x019D */ u8 field_0x019d[3]; + /* 0x01A0 */ CPaneMgrAlpha* field_0x01a0[2]; + /* 0x01A8 */ CPaneMgrAlpha* field_0x01a8[2]; + /* 0x01B0 */ CPaneMgrAlpha* field_0x01b0[2]; + /* 0x01B8 */ u8 field_0x01b8[2]; + /* 0x01BA */ u8 field_0x01ba[2]; + /* 0x01BC */ u8 field_0x01bc[2]; + /* 0x01BE */ u8 field_0x01be[2]; + /* 0x01C0 */ CPaneMgr* field_0x01c0[2]; + /* 0x01C8 */ J2DAnmColor* field_0x01c8; /* 0x01CC */ s32 field_0x01cc; - /* 0x01D0 */ J2DAnmBase* field_0x01d0; + /* 0x01D0 */ J2DAnmTextureSRTKey* field_0x01d0; /* 0x01D4 */ s32 field_0x01d4; - /* 0x01D8 */ J2DAnmBase* field_0x01d8; + /* 0x01D8 */ J2DAnmColor* field_0x01d8; /* 0x01DC */ s32 field_0x01dc; - /* 0x01E0 */ J2DAnmBase* field_0x01e0; + /* 0x01E0 */ J2DAnmTextureSRTKey* field_0x01e0; /* 0x01E4 */ s32 field_0x01e4; - /* 0x01E8 */ J2DAnmBase* field_0x01e8; + /* 0x01E8 */ J2DAnmTevRegKey* field_0x01e8; /* 0x01EC */ s32 field_0x01ec; - /* 0x01F0 */ J2DAnmBase* field_0x01f0; + /* 0x01F0 */ J2DAnmTextureSRTKey* field_0x01f0; /* 0x01F4 */ s32 field_0x01f4; - /* 0x01F8 */ J2DAnmBase* field_0x01f8; + /* 0x01F8 */ J2DAnmTextureSRTKey* field_0x01f8; /* 0x01FC */ s32 field_0x01fc; - /* 0x0200 */ J2DAnmBase* field_0x0200; + /* 0x0200 */ J2DAnmTevRegKey* field_0x0200; /* 0x0204 */ s32 field_0x0204; /* 0x0208 */ u8 field_0x0208; /* 0x0209 */ u8 field_0x0209; /* 0x020A */ u8 field_0x020a; /* 0x020B */ u8 field_0x020b; - /* 0x020C */ CPaneMgrAlpha* field_0x020c; - /* 0x0210 */ u8 field_0x0210[0x021C - 0x0210]; + /* 0x020C */ CPaneMgrAlpha* field_0x020c[2]; + /* 0x0214 */ char* field_0x0214[2]; /* 0x021C */ u8 field_0x021c; /* 0x021D */ u8 field_0x021d; /* 0x021E */ u8 field_0x021e; @@ -421,8 +443,9 @@ class dFile_select_c { /* 0x023C */ CPaneMgrAlpha* field_0x023c; /* 0x0240 */ CPaneMgrAlpha* field_0x0240; /* 0x0244 */ CPaneMgrAlpha* field_0x0244; - /* 0x0248 */ u8 field_0x0248[0x024A - 0x0248]; - /* 0x024A */ bool field_0x024a; + /* 0x024A */ bool field_0x0248; + /* 0x024A */ bool field_0x0249; + /* 0x024A */ u8 field_0x024a; /* 0x024B */ u8 field_0x024b; /* 0x024C */ u8 field_0x024c; /* 0x024B */ u8 field_0x024d[3]; @@ -435,50 +458,60 @@ class dFile_select_c { /* 0x0265 */ u8 mSelectNum; // currently selected quest log /* 0x0266 */ u8 mLastSelectMenuNum; // previously select menu number (for copy / start / delete) /* 0x0267 */ u8 mSelectMenuNum; // currently selected menu number (for copy / start / delete) - /* 0x0268 */ u8 field_0x0268[0x026A - 0x0268]; + /* 0x0268 */ u8 field_0x0268; + /* 0x0269 */ u8 field_0x0269; /* 0x026A */ u8 field_0x026a; - /* 0x026B */ u8 field_0x026b[0x026e - 0x026b]; + /* 0x026B */ u8 field_0x026b; + /* 0x026C */ u8 field_0x026c; + /* 0x026D */ u8 field_0x026d; /* 0x026E */ u8 field_0x026e; /* 0x026F */ u8 field_0x026f; /* 0x0270 */ bool mSelectEnd; /* 0x0271 */ u8 field_0x0271; - /* 0x0272 */ u8 field_0x0272[0x0281 - 0x0272]; + /* 0x0272 */ u8 field_0x0272; + /* 0x0273 */ u8 field_0x0273; + /* 0x0274 */ u8 field_0x0274; + /* 0x0272 */ u8 field_0x0275[0x0280 - 0x0275]; + /* 0x0281 */ bool field_0x0280; /* 0x0281 */ bool field_0x0281; /* 0x0282 */ bool field_0x0282; /* 0x0283 */ bool field_0x0283; - /* 0x0284 */ u8 field_0x0284[0x029C - 0x0284]; + /* 0x0284 */ DispFunc field_0x0284; + /* 0x0290 */ DispFunc field_0x0290; /* 0x029C */ J2DAnmTransform* field_0x029c; /* 0x02A0 */ J2DAnmTransform* field_0x02a0; /* 0x02A4 */ CPaneMgr* field_0x02a4[3]; - /* 0x02B0 */ u8 field_0x02b0[0x2c0-0x2b0]; - /* 0x02C0 */ CPaneMgr* field_0x02c0; - /* 0x02C4 */ CPaneMgr* field_0x02c4; - /* 0x02C8 */ CPaneMgr* field_0x02c8; - /* 0x02CC */ CPaneMgr* field_0x02cc; - /* 0x02D0 */ CPaneMgr* field_0x02d0; - /* 0x02D4 */ CPaneMgr* field_0x02d4; - /* 0x02D8 */ u8 field_0x02d8[0x2e8-0x2d8]; - /* 0x02E8 */ J2DAnmBase* field_0x02e8; + /* 0x02B0 */ u8 field_0x02b0[0x2b4-0x2b0]; + /* 0x02B4 */ int field_0x02b4[3]; + /* 0x02C0 */ CPaneMgr* field_0x02c0[2]; + /* 0x02C8 */ CPaneMgr* field_0x02c8[2]; + /* 0x02D0 */ CPaneMgr* field_0x02d0[2]; + /* 0x02D8 */ CPaneMgr* field_0x02d8[2]; + /* 0x02E0 */ u8 field_0x02e0[2]; + /* 0x02E2 */ u8 field_0x02e2[2]; + /* 0x02E4 */ u8 field_0x02e4[2]; + /* 0x02E4 */ u8 field_0x02e6[0x2e8-0x2e6]; + /* 0x02E8 */ J2DAnmColor* field_0x02e8; /* 0x02EC */ s32 field_0x02ec; - /* 0x02F0 */ J2DAnmBase* field_0x02f0; + /* 0x02F0 */ J2DAnmTextureSRTKey* field_0x02f0; /* 0x02F4 */ s32 field_0x02f4; - /* 0x02F8 */ J2DAnmBase* field_0x02f8; + /* 0x02F8 */ J2DAnmColor* field_0x02f8; /* 0x02FC */ s32 field_0x02fc; - /* 0x0300 */ J2DAnmBase* field_0x0300; + /* 0x0300 */ J2DAnmTextureSRTKey* field_0x0300; /* 0x0304 */ s32 field_0x0304; - /* 0x0308 */ J2DAnmBase* field_0x0308; + /* 0x0308 */ J2DAnmTevRegKey* field_0x0308; /* 0x030C */ s32 field_0x030c; - /* 0x0310 */ J2DAnmBase* field_0x0310; - /* 0x0314 */ J2DAnmBase* field_0x0314; - /* 0x0318 */ J2DAnmBase* field_0x0318; - /* 0x031C */ s32 field_0x031c; // J2DAnmTransform*? - /* 0x0320 */ J2DAnmBase* field_0x0320; + /* 0x0310 */ J2DAnmTransform* field_0x0310; + /* 0x0314 */ J2DAnmTransform* field_0x0314; + /* 0x0318 */ J2DAnmColor* field_0x0318; + /* 0x031C */ s32 field_0x031c; + /* 0x0320 */ J2DAnmTextureSRTKey* field_0x0320; /* 0x0324 */ s32 field_0x0324; /* 0x0328 */ J2DAnmTransform* field_0x0328; /* 0x032C */ J2DAnmTransform* field_0x032c; - /* 0x0330 */ J2DAnmBase* field_0x0330; + /* 0x0330 */ J2DAnmColor* field_0x0330; /* 0x0334 */ s32 field_0x0334; - /* 0x0338 */ J2DAnmBase* field_0x0338; + /* 0x0338 */ J2DAnmTextureSRTKey* field_0x0338; /* 0x033C */ s32 field_0x033c; /* 0x0340 */ CPaneMgr* field_0x0340[3]; /* 0x034C */ s32 field_0x034c[3]; @@ -486,42 +519,31 @@ class dFile_select_c { /* 0x035C */ int field_0x035c; /* 0x0360 */ bool field_0x0360; /* 0x0361 */ u8 field_0x0361[3]; - /* 0x0364 */ CPaneMgrAlpha* mpPaneAlpha1; - /* 0x0368 */ u8 field_0x0368[8]; - /* 0x0370 */ CPaneMgrAlpha* mpPaneAlpha2; - /* 0x0374 */ u8 field_0x0374[8]; - /* 0x037C */ CPaneMgrAlpha* mpPaneAlpha3; - /* 0x0380 */ u8 field_0x0380[8]; - /* 0x0388 */ u8 field_0x0388; - /* 0x0389 */ u8 field_0x0389; - /* 0x038A */ u8 field_0x038a; - /* 0x038B */ u8 field_0x038b; - /* 0x038C */ u8 field_0x038c; - /* 0x038D */ u8 field_0x038d; - /* 0x038E */ u8 field_0x038e; - /* 0x038F */ u8 field_0x038f; - /* 0x0390 */ u8 field_0x0390[4]; - /* 0x0394 */ CPaneMgr* mpPaneMgr2; - /* 0x0398 */ u8 field_0x0398[0x03A0 - 0x0398]; - /* 0x03A0 */ J2DAnmBase* field_0x03a0; + /* 0x0364 */ CPaneMgr* mpPaneAlpha1[3]; + /* 0x0370 */ CPaneMgr* mpPaneAlpha2[3]; + /* 0x037C */ CPaneMgr* mpPaneAlpha3[3]; + /* 0x0388 */ u8 field_0x0388[3]; + /* 0x038B */ u8 field_0x038b[3]; + /* 0x038E */ u8 field_0x038e[3]; + /* 0x0390 */ u8 field_0x0391[3]; + /* 0x0394 */ CPaneMgr* mpPaneMgr2[3]; + /* 0x03A0 */ J2DAnmTextureSRTKey* field_0x03a0; /* 0x03A4 */ s32 field_0x03a4; /* 0x03A8 */ CPaneMgr* field_0x03a8; /* 0x03AC */ s16 field_0x03ac; /* 0x03AE */ u8 field_0x03AE[0x03B0 - 0x03AE]; /* 0x03B0 */ u8 mUseType; /* 0x03B1 */ u8 field_0x03b1; - /* 0x03B2 */ u8 field_0x03b2[6]; - /* 0x03B8 */ char mpMemCard; - /* 0x03B9 */ u8 field_0x03b9[3]; - /* 0x03BC */ u8 field_0x03bc[0x3E0 - 0x3BC]; - /* 0x03E0 */ dSv_save_c* mpSave; - /* 0x03E4 */ u8 field_0x03e4[4]; - /* 0x03E8 */ u8 field_0x03e8[0x2374 - 0x3E8]; + /* 0x03B2 */ u16 field_0x03b2; + /* 0x03B4 */ s32 field_0x03b4; + /* 0x03B8 */ SaveData mSave[3]; + /* 0x0D10 */ //u8 field_0x0D10[0x2374 - 0xD10]; /* 0x2374 */ bool mFadeFlag; /* 0x2375 */ bool mHasDrawn; /* 0x2376 */ u8 field_0x2376[0x2378 - 0x2376]; /* 0x2378 */ J2DPicture* field_0x2378; }; + STATIC_ASSERT(sizeof(dFile_select_c) == 0x237C); #endif /* D_FILE_D_FILE_SELECT_H */ diff --git a/include/m_Do/m_Do_MemCard.h b/include/m_Do/m_Do_MemCard.h index 05d9cad76a2..4643877124c 100644 --- a/include/m_Do/m_Do_MemCard.h +++ b/include/m_Do/m_Do_MemCard.h @@ -40,6 +40,8 @@ class mDoMemCd_Ctrl_c { bool isCardCommNone() { return mCardCommand == CARD_NO_COMMAND; } u8 getProbeStat() { return mProbeStat; } void clearProbeStat() { mProbeStat = 2; } + void setCopyToPos(u8 param_0) { mCopyToPos = param_0; } + u32 getDataVersion() { return mDataVersion; } /* 0x0000 */ u8 mData[0x1FBC]; /* 0x1FBC */ u8 mChannel; @@ -81,4 +83,36 @@ inline void mDoMemCd_save(void* i_data, u32 param_1, u32 param_2) { g_mDoMemCd_control.save(i_data,param_1,param_2); } +inline void mDoMemCd_Format() { + g_mDoMemCd_control.command_format(); +} + +inline s32 mDoMemCd_FormatSync() { + return g_mDoMemCd_control.FormatSync(); +} + +inline s32 mDoMemCd_SaveSync() { + return g_mDoMemCd_control.SaveSync(); +} + +inline void mDoMemCd_Load() { + g_mDoMemCd_control.load(); +} + +inline void mDoMemCd_setCopyToPos(u8 param_0) { + g_mDoMemCd_control.setCopyToPos(param_0); +} + +inline u32 mDoMemCd_getStatus(u8 param_0) { + return g_mDoMemCd_control.getStatus(param_0); +} + +inline u32 mDoMemCd_LoadSync(void* buffer, u32 size, u32 index) { + return g_mDoMemCd_control.LoadSync(buffer, size, index); +} + +inline s32 mDoMemCd_getDataVersion() { + return g_mDoMemCd_control.getDataVersion(); +} + #endif /* M_DO_M_DO_MEMCARD_H */ diff --git a/src/d/file/d_file_sel_info.cpp b/src/d/file/d_file_sel_info.cpp index 24ac05cd630..e8a87f84f94 100644 --- a/src/d/file/d_file_sel_info.cpp +++ b/src/d/file/d_file_sel_info.cpp @@ -4,6 +4,7 @@ */ #define NO_INLINE_DLSTBASE_DRAW +#define DFILE_INFO_C_DUMMY_VIRTUAL #include "d/file/d_file_sel_info.h" #include "JSystem/J2DGraph/J2DScreen.h" diff --git a/src/d/file/d_file_sel_warning.cpp b/src/d/file/d_file_sel_warning.cpp index 300e5fa9833..e4ba7653443 100644 --- a/src/d/file/d_file_sel_warning.cpp +++ b/src/d/file/d_file_sel_warning.cpp @@ -3,6 +3,8 @@ // Translation Unit: d/file/d_file_sel_warning // +#define DFILE_WARNING_C_DUMMY_VIRTUAL + // #include "d/file/d_file_sel_warning.h" #include "JSystem/J2DGraph/J2DScreen.h" #include "JSystem/J2DGraph/J2DTextBox.h" diff --git a/src/d/file/d_file_select.cpp b/src/d/file/d_file_select.cpp index 7f96811f20e..8d644fb0774 100644 --- a/src/d/file/d_file_select.cpp +++ b/src/d/file/d_file_select.cpp @@ -7,12 +7,16 @@ #define __dt__15J2DAnmTransformFv_DEFINED #include "d/file/d_file_select.h" +#include "d/file/d_file_sel_info.h" #include "JSystem/J2DGraph/J2DTextBox.h" +#include "JSystem/J2DGraph/J2DAnmLoader.h" #include "JSystem/J3DGraphAnimator/J3DMaterialAnm.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" #include "JSystem/JKernel/JKRSolidHeap.h" #include "d/meter/d_meter2_info.h" #include "d/s/d_s_play.h" +#include "d/d_lib.h" +#include "f_op/f_op_msg_mng.h" #include "dol2asm.h" #include "dolphin/dvd.h" #include "dolphin/types.h" @@ -20,6 +24,7 @@ #include "m_Do/m_Do_controller_pad.h" #include "m_Do/m_Do_graphic.h" #include "m_Do/m_Do_Reset.h" +#include "m_Do/m_Do_MemCardRWmng.h" // @@ -487,9 +492,8 @@ SECTION_DATA static s32 MenuSelEndFrameTbl[4] = { /* 803BA8A0-803BA8B8 0179C0 0018+00 0/2 0/0 0/0 .data l_tagName13 */ #pragma push #pragma force_active on -SECTION_DATA static u8 l_tagName13[24] = { - 0x77, 0x5F, 0x64, 0x61, 0x74, 0x5F, 0x69, 0x30, 0x77, 0x5F, 0x64, 0x61, - 0x74, 0x5F, 0x69, 0x31, 0x77, 0x5F, 0x64, 0x61, 0x74, 0x5F, 0x69, 0x32, +SECTION_DATA static u64 l_tagName13[3] = { + 'w_dat_i0', 'w_dat_i1', 'w_dat_i2', }; #pragma pop @@ -968,15 +972,15 @@ typedef void (dFile_select_c::*DataSelProcFunc)(void); SECTION_DATA static DataSelProcFunc DataSelProc[47] = {}; /* 803BAD20-803BAD30 017E40 0010+00 1/1 0/0 0/0 .data l_tagName101$5620 */ -SECTION_DATA static u8 l_tagName101[16] = { - 0x00, 0x77, 0x5F, 0x6E, 0x75, 0x6E, 0x30, 0x31, 0x00, 0x77, 0x5F, 0x6E, 0x75, 0x6E, 0x30, 0x32, +SECTION_DATA static u64 l_tagName101[2] = { + 'w_nun01', 'w_nun02', }; /* 803BAD30-803BAD40 -00001 000C+04 1/1 0/0 0/0 .data l_numTex$5621 */ -SECTION_DATA static void* l_numTex[3 + 1 /* padding */] = { - (void*)&d_file_d_file_select__stringBase0, - (void*)(((char*)&d_file_d_file_select__stringBase0) + 0x15), - (void*)(((char*)&d_file_d_file_select__stringBase0) + 0x2A), +SECTION_DATA static char* l_numTex[3 + 1 /* padding */] = { + (char*)&d_file_d_file_select__stringBase0, + (char*)(((char*)&d_file_d_file_select__stringBase0) + 0x15), + (char*)(((char*)&d_file_d_file_select__stringBase0) + 0x2A), /* padding */ NULL, }; @@ -984,253 +988,238 @@ SECTION_DATA static void* l_numTex[3 + 1 /* padding */] = { /* 803BAD40-803BAD58 017E60 0018+00 0/1 0/0 0/0 .data l_tagName0$6517 */ #pragma push #pragma force_active on -SECTION_DATA static u8 l_tagName0[24] = { - 0x77, 0x5F, 0x73, 0x65, 0x6C, 0x5F, 0x30, 0x30, 0x77, 0x5F, 0x73, 0x65, - 0x6C, 0x5F, 0x30, 0x31, 0x77, 0x5F, 0x73, 0x65, 0x6C, 0x5F, 0x30, 0x32, +SECTION_DATA static u64 l_tagName0[3] = { + 'w_sel_00', + 'w_sel_01', + 'w_sel_02', }; #pragma pop /* 803BAD58-803BAD70 017E78 0018+00 0/1 0/0 0/0 .data l_tagName3$6528 */ #pragma push #pragma force_active on -SECTION_DATA static u8 l_tagName3[24] = { - 0x77, 0x5F, 0x6D, 0x6F, 0x79, 0x6F, 0x30, 0x30, 0x77, 0x5F, 0x6D, 0x6F, - 0x79, 0x6F, 0x30, 0x31, 0x77, 0x5F, 0x6D, 0x6F, 0x79, 0x6F, 0x30, 0x32, +SECTION_DATA static u64 l_tagName3[3] = { + 'w_moyo00', + 'w_moyo01', + 'w_moyo02', }; #pragma pop /* 803BAD70-803BAD88 017E90 0018+00 0/1 0/0 0/0 .data l_tagName4$6529 */ #pragma push #pragma force_active on -SECTION_DATA static u8 l_tagName4[24] = { - 0x77, 0x5F, 0x67, 0x6F, 0x6C, 0x64, 0x30, 0x30, 0x77, 0x5F, 0x67, 0x6F, - 0x6C, 0x64, 0x30, 0x31, 0x77, 0x5F, 0x67, 0x6F, 0x6C, 0x64, 0x30, 0x32, +SECTION_DATA static u64 l_tagName4[3] = { + 'w_gold00', + 'w_gold01', + 'w_gold02', }; #pragma pop /* 803BAD88-803BADA0 017EA8 0018+00 0/1 0/0 0/0 .data l_tagName5$6530 */ #pragma push #pragma force_active on -SECTION_DATA static u8 l_tagName5[24] = { - 0x77, 0x5F, 0x67, 0x6F, 0x32, 0x5F, 0x30, 0x30, 0x77, 0x5F, 0x67, 0x6F, - 0x32, 0x5F, 0x30, 0x31, 0x77, 0x5F, 0x67, 0x6F, 0x32, 0x5F, 0x30, 0x32, -}; +SECTION_DATA static u64 l_tagName5[3] = {'w_go2_00', 'w_go2_01', 'w_go2_02'}; #pragma pop /* 803BADA0-803BADB8 017EC0 0018+00 0/1 0/0 0/0 .data l_tagName12$6539 */ #pragma push #pragma force_active on -SECTION_DATA static u8 l_tagName12[24] = { - 0x77, 0x5F, 0x62, 0x6B, 0x5F, 0x6C, 0x30, 0x30, 0x77, 0x5F, 0x62, 0x6B, - 0x5F, 0x6C, 0x30, 0x31, 0x77, 0x5F, 0x62, 0x6B, 0x5F, 0x6C, 0x30, 0x32, +SECTION_DATA static u64 l_tagName12[3] = { + 'w_bk_l00', + 'w_bk_l01', + 'w_bk_l02', }; #pragma pop /* 803BADB8-803BAE30 017ED8 0078+00 0/1 0/0 0/0 .data l_nouseTag$6546 */ #pragma push #pragma force_active on -SECTION_DATA static u8 l_nouseTag[120] = { - 0x77, 0x5F, 0x6D, 0x63, 0x68, 0x65, 0x63, 0x6B, 0x00, 0x77, 0x5F, 0x74, 0x61, 0x62, 0x69, - 0x31, 0x00, 0x77, 0x5F, 0x74, 0x61, 0x62, 0x69, 0x32, 0x00, 0x77, 0x5F, 0x74, 0x61, 0x62, - 0x69, 0x33, 0x77, 0x5F, 0x64, 0x6F, 0x6B, 0x6F, 0x5F, 0x63, 0x00, 0x77, 0x5F, 0x75, 0x77, - 0x61, 0x5F, 0x63, 0x77, 0x5F, 0x63, 0x70, 0x5F, 0x63, 0x68, 0x75, 0x77, 0x5F, 0x63, 0x70, - 0x73, 0x69, 0x74, 0x61, 0x00, 0x00, 0x77, 0x5F, 0x63, 0x70, 0x5F, 0x78, 0x00, 0x00, 0x00, - 0x00, 0x77, 0x5F, 0x64, 0x65, 0x77, 0x5F, 0x64, 0x65, 0x5F, 0x63, 0x68, 0x75, 0x77, 0x5F, - 0x64, 0x65, 0x73, 0x69, 0x74, 0x61, 0x00, 0x00, 0x77, 0x5F, 0x64, 0x65, 0x5F, 0x78, 0x00, - 0x00, 0x77, 0x5F, 0x6E, 0x61, 0x6D, 0x65, 0x77, 0x5F, 0x68, 0x5F, 0x6E, 0x61, 0x6D, 0x65, -}; +SECTION_DATA static u64 l_nouseTag[15] = { + 'w_mcheck', 'w_tabi1', 'w_tabi2', 'w_tabi3', 'w_doko_c', 'w_uwa_c', 'w_cp_chu', 'w_cpsita', + 'w_cp_x', 'w_de', 'w_de_chu', 'w_desita', 'w_de_x', 'w_name', 'w_h_name'}; #pragma pop /* 803BAE30-803BAE40 017F50 0010+00 0/1 0/0 0/0 .data l_tagName21$6552 */ #pragma push #pragma force_active on -SECTION_DATA static u8 l_tagName21[16] = { - 0x00, 0x00, 0x00, 0x74, 0x5F, 0x66, 0x6F, 0x72, 0x00, 0x00, 0x74, 0x5F, 0x66, 0x6F, 0x72, 0x31, +SECTION_DATA static u64 l_tagName21[2] = { + 't_for', 't_for1', }; #pragma pop /* 803BAE40-803BAE58 017F60 0018+00 0/1 0/0 0/0 .data l_tagName18$6559 */ #pragma push #pragma force_active on -SECTION_DATA static u8 l_tagName18[24] = { - 0x77, 0x5F, 0x64, 0x65, 0x5F, 0x65, 0x66, 0x30, 0x77, 0x5F, 0x64, 0x65, - 0x5F, 0x65, 0x66, 0x31, 0x77, 0x5F, 0x64, 0x65, 0x5F, 0x65, 0x66, 0x32, +SECTION_DATA static u64 l_tagName18[3] = { + 'w_de_ef0', 'w_de_ef1', 'w_de_ef2', }; #pragma pop /* 803BAE58-803BAE70 017F78 0018+00 0/1 0/0 0/0 .data l_tagName19$6560 */ #pragma push #pragma force_active on -SECTION_DATA static u8 l_tagName19[24] = { - 0x77, 0x5F, 0x63, 0x70, 0x5F, 0x65, 0x66, 0x30, 0x77, 0x5F, 0x63, 0x70, - 0x5F, 0x65, 0x66, 0x31, 0x77, 0x5F, 0x63, 0x70, 0x5F, 0x65, 0x66, 0x32, +SECTION_DATA static u64 l_tagName19[3] = { + 'w_cp_ef0', 'w_cp_ef1', 'w_cp_ef2', }; #pragma pop /* 803BAE70-803BAE80 017F90 0010+00 0/1 0/0 0/0 .data l_tagName20$6568 */ #pragma push #pragma force_active on -SECTION_DATA static u8 l_tagName20[16] = { - 0x00, 0x65, 0x72, 0x5F, 0x66, 0x6F, 0x72, 0x30, 0x00, 0x65, 0x72, 0x5F, 0x66, 0x6F, 0x72, 0x31, +SECTION_DATA static u64 l_tagName20[2] = { + 'er_for0', 'er_for1', }; #pragma pop /* 803BAE80-803BAE98 017FA0 0018+00 0/1 0/0 0/0 .data l_tagName131$6576 */ #pragma push #pragma force_active on -SECTION_DATA static u8 l_tagName131[24] = { - 0x4E, 0x5F, 0x73, 0x65, 0x6C, 0x5F, 0x30, 0x30, 0x4E, 0x5F, 0x73, 0x65, - 0x6C, 0x5F, 0x30, 0x31, 0x4E, 0x5F, 0x73, 0x65, 0x6C, 0x5F, 0x30, 0x32, +SECTION_DATA static u64 l_tagName131[3] = { + 'N_sel_00', 'N_sel_01', 'N_sel_02', }; #pragma pop /* 803BAE98-803BAEA8 017FB8 0010+00 0/1 0/0 0/0 .data l_tagName000$6897 */ #pragma push #pragma force_active on -SECTION_DATA static u8 l_tagName000[16] = { - 0x77, 0x5F, 0x73, 0x65, 0x6C, 0x5F, 0x30, 0x31, 0x77, 0x5F, 0x73, 0x65, 0x6C, 0x5F, 0x30, 0x32, +SECTION_DATA static u64 l_tagName000[2] = { + 'w_sel_01', 'w_sel_02', }; #pragma pop /* 803BAEA8-803BAEB8 017FC8 0010+00 0/1 0/0 0/0 .data l_tagName001$6898 */ #pragma push #pragma force_active on -SECTION_DATA static u8 l_tagName001[16] = { - 0x77, 0x5F, 0x6D, 0x6F, 0x79, 0x6F, 0x30, 0x31, 0x77, 0x5F, 0x6D, 0x6F, 0x79, 0x6F, 0x30, 0x32, +SECTION_DATA static u64 l_tagName001[2] = { + 'w_moyo01', 'w_moyo02', }; #pragma pop /* 803BAEB8-803BAEC8 017FD8 0010+00 0/1 0/0 0/0 .data l_tagName002$6899 */ #pragma push #pragma force_active on -SECTION_DATA static u8 l_tagName002[16] = { - 0x77, 0x5F, 0x67, 0x6F, 0x6C, 0x64, 0x30, 0x31, 0x77, 0x5F, 0x67, 0x6F, 0x6C, 0x64, 0x30, 0x32, +SECTION_DATA static u64 l_tagName002[2] = { + 'w_gold01', 'w_gold02', }; #pragma pop /* 803BAEC8-803BAED8 017FE8 0010+00 0/1 0/0 0/0 .data l_tagName003$6900 */ #pragma push #pragma force_active on -SECTION_DATA static u8 l_tagName003[16] = { - 0x77, 0x5F, 0x67, 0x6F, 0x32, 0x5F, 0x30, 0x31, 0x77, 0x5F, 0x67, 0x6F, 0x32, 0x5F, 0x30, 0x32, +SECTION_DATA static u64 l_tagName003[2] = { + 'w_go2_01', 'w_go2_02', }; #pragma pop /* 803BAED8-803BAEE8 017FF8 0010+00 0/1 0/0 0/0 .data l_tagName004$6901 */ #pragma push #pragma force_active on -SECTION_DATA static u8 l_tagName004[16] = { - 0x77, 0x5F, 0x62, 0x6B, 0x5F, 0x6C, 0x30, 0x31, 0x77, 0x5F, 0x62, 0x6B, 0x5F, 0x6C, 0x30, 0x32, +SECTION_DATA static u64 l_tagName004[2] = { + 'w_bk_l01', 'w_bk_l02', }; #pragma pop /* 803BAEE8-803BAEF8 018008 0010+00 0/1 0/0 0/0 .data l_tagName005$6902 */ #pragma push #pragma force_active on -SECTION_DATA static u8 l_tagName005[16] = { - 0x77, 0x5F, 0x63, 0x70, 0x5F, 0x65, 0x66, 0x31, 0x77, 0x5F, 0x63, 0x70, 0x5F, 0x65, 0x66, 0x32, +SECTION_DATA static u64 l_tagName005[2] = { + 'w_cp_ef1', 'w_cp_ef2', }; #pragma pop /* 803BAEF8-803BAF08 018018 0010+00 0/1 0/0 0/0 .data l_tagName012$6999 */ #pragma push #pragma force_active on -SECTION_DATA static u8 l_tagName012[16] = { - 0x00, 0x00, 0x77, 0x5F, 0x6E, 0x6F, 0x5F, 0x6E, 0x00, 0x77, 0x5F, 0x79, 0x65, 0x73, 0x5F, 0x6E, +SECTION_DATA static u64 l_tagName012[2] = { + 'w_no_n', 'w_yes_n', }; #pragma pop /* 803BAF08-803BAF18 018028 0010+00 0/1 0/0 0/0 .data l_tagName013$7000 */ #pragma push #pragma force_active on -SECTION_DATA static u8 l_tagName013[16] = { - 0x00, 0x00, 0x77, 0x5F, 0x6E, 0x6F, 0x5F, 0x74, 0x00, 0x77, 0x5F, 0x79, 0x65, 0x73, 0x5F, 0x74, +SECTION_DATA static u64 l_tagName013[2] = { + 'w_no_t', 'w_yes_t', }; #pragma pop /* 803BAF18-803BAF28 018038 0010+00 0/1 0/0 0/0 .data l_tagName013U$7001 */ #pragma push #pragma force_active on -SECTION_DATA static u8 l_tagName013U[16] = { - 0x00, 0x00, 0x66, 0x5F, 0x6E, 0x6F, 0x5F, 0x74, 0x00, 0x66, 0x5F, 0x79, 0x65, 0x73, 0x5F, 0x74, +SECTION_DATA static u64 l_tagName013U[2] = { + 'f_no_t', 'f_yes_t', }; #pragma pop /* 803BAF28-803BAF38 018048 0010+00 0/1 0/0 0/0 .data l_tagName9$7010 */ #pragma push #pragma force_active on -SECTION_DATA static u8 l_tagName9[16] = { - 0x00, 0x00, 0x77, 0x5F, 0x6E, 0x6F, 0x5F, 0x6D, 0x00, 0x77, 0x5F, 0x79, 0x65, 0x73, 0x5F, 0x6D, +SECTION_DATA static u64 l_tagName9[2] = { + 'w_no_m', 'w_yes_m', }; #pragma pop /* 803BAF38-803BAF48 018058 0010+00 0/1 0/0 0/0 .data l_tagName10$7011 */ #pragma push #pragma force_active on -SECTION_DATA static u8 l_tagName10[16] = { - 0x00, 0x00, 0x77, 0x5F, 0x6E, 0x6F, 0x5F, 0x67, 0x00, 0x77, 0x5F, 0x79, 0x65, 0x73, 0x5F, 0x67, +SECTION_DATA static u64 l_tagName10[2] = { + 'w_no_g', 'w_yes_g', }; #pragma pop /* 803BAF48-803BAF58 018068 0010+00 0/1 0/0 0/0 .data l_tagName11$7012 */ #pragma push #pragma force_active on -SECTION_DATA static u8 l_tagName11[16] = { - 0x00, 0x77, 0x5F, 0x6E, 0x6F, 0x5F, 0x67, 0x72, 0x77, 0x5F, 0x79, 0x65, 0x73, 0x5F, 0x67, 0x72, +SECTION_DATA static u64 l_tagName11[2] = { + 'w_no_gr', 'w_yes_gr', }; #pragma pop /* 803BAF58-803BAF70 018078 0018+00 0/1 0/0 0/0 .data l_tagName6$7076 */ #pragma push #pragma force_active on -SECTION_DATA static u8 l_tagName6[24] = { - 0x77, 0x5F, 0x73, 0x61, 0x74, 0x5F, 0x6D, 0x6F, 0x77, 0x5F, 0x64, 0x65, - 0x6C, 0x5F, 0x6D, 0x6F, 0x77, 0x5F, 0x63, 0x6F, 0x70, 0x5F, 0x6D, 0x6F, +SECTION_DATA static u64 l_tagName6[3] = { + 'w_sat_mo', 'w_del_mo', 'w_cop_mo', }; #pragma pop /* 803BAF70-803BAF88 018090 0018+00 0/1 0/0 0/0 .data l_tagName7$7077 */ #pragma push #pragma force_active on -SECTION_DATA static u8 l_tagName7[24] = { - 0x00, 0x77, 0x5F, 0x73, 0x61, 0x74, 0x5F, 0x67, 0x00, 0x77, 0x5F, 0x64, - 0x65, 0x6C, 0x5F, 0x67, 0x00, 0x77, 0x5F, 0x63, 0x6F, 0x70, 0x5F, 0x67, +SECTION_DATA static u64 l_tagName7[3] = { + 'w_sat_g', 'w_del_g', 'w_cop_g', }; #pragma pop /* 803BAF88-803BAFA0 0180A8 0018+00 0/1 0/0 0/0 .data l_tagName8$7078 */ #pragma push #pragma force_active on -SECTION_DATA static u8 l_tagName8[24] = { - 0x77, 0x5F, 0x73, 0x61, 0x74, 0x5F, 0x67, 0x72, 0x77, 0x5F, 0x64, 0x65, - 0x6C, 0x5F, 0x67, 0x72, 0x77, 0x5F, 0x63, 0x6F, 0x70, 0x5F, 0x67, 0x72, +SECTION_DATA static u64 l_tagName8[3] = { + 'w_sat_gr', 'w_del_gr', 'w_cop_gr', }; #pragma pop /* 803BAFA0-803BAFB8 0180C0 0018+00 0/1 0/0 0/0 .data l_tagName1$7079 */ #pragma push #pragma force_active on -SECTION_DATA static u8 l_tagName1[24] = { - 0x00, 0x77, 0x5F, 0x73, 0x74, 0x61, 0x5F, 0x6E, 0x00, 0x77, 0x5F, 0x64, - 0x65, 0x6C, 0x5F, 0x6E, 0x00, 0x77, 0x5F, 0x63, 0x6F, 0x70, 0x5F, 0x6E, +SECTION_DATA static u64 l_tagName1[3] = { + 'w_sta_n', 'w_del_n', 'w_cop_n', }; #pragma pop /* 803BAFB8-803BAFD0 0180D8 0018+00 0/1 0/0 0/0 .data l_tagName011$7080 */ #pragma push #pragma force_active on -SECTION_DATA static u8 l_tagName011[24] = { - 0x00, 0x00, 0x00, 0x77, 0x5F, 0x73, 0x74, 0x61, 0x00, 0x00, 0x00, 0x77, - 0x5F, 0x64, 0x65, 0x6C, 0x00, 0x77, 0x5F, 0x63, 0x6F, 0x70, 0x5F, 0x74, +SECTION_DATA static u64 l_tagName011[3] = { + 'w_sta', 'w_del', 'w_cop_t', }; #pragma pop /* 803BAFD0-803BAFE8 0180F0 0018+00 0/1 0/0 0/0 .data l_tagName011U$7081 */ #pragma push #pragma force_active on -SECTION_DATA static u8 l_tagName011U[24] = { - 0x00, 0x00, 0x00, 0x66, 0x5F, 0x73, 0x74, 0x61, 0x00, 0x00, 0x00, 0x66, - 0x5F, 0x64, 0x65, 0x6C, 0x00, 0x66, 0x5F, 0x63, 0x6F, 0x70, 0x5F, 0x74, +SECTION_DATA static u64 l_tagName011U[3] = { + 'f_sta', 'f_del', 'f_cop_t', }; #pragma pop @@ -1504,6 +1493,8 @@ SECTION_DATA static void* lit_7785[3] = { }; #pragma pop +typedef void (dFile_select_c::*MemCardCheckFuncT)(); + /* 803BB12C-803BB270 01824C 0144+00 1/2 0/0 0/0 .data MemCardCheckProc */ SECTION_DATA static u8 MemCardCheckProc[324] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -1744,12 +1735,7 @@ SECTION_DATA extern void* __vt__9dFs_HIO_c[3 + 1 /* padding */] = { NULL, }; -/* 80453928-8045392C 001F28 0004+00 1/1 0/0 0/0 .sdata2 @3812 */ -SECTION_SDATA2 static f32 lit_3812 = 111.0f / 100.0f; - /* 801835F8-8018366C 17DF38 0074+00 1/1 0/0 0/0 .text __ct__9dFs_HIO_cFv */ -#ifdef NONMATCHING -// matches with literals dFs_HIO_c::dFs_HIO_c() { field_0x0006 = 5; field_0x0007 = 5; @@ -1760,9 +1746,9 @@ dFs_HIO_c::dFs_HIO_c() { field_0x000b = 15; field_0x000d = 15; field_0x000c = 90; - field_0x0010 = 1.11f; - field_0x0014 = 1.11f; - field_0x0018 = 1.11f; + field_0x0010[0] = 1.11f; + field_0x0010[1] = 1.11f; + field_0x0010[2] = 1.11f; field_0x001c = 0; field_0x001d = 0; field_0x001e = 0; @@ -1771,16 +1757,6 @@ dFs_HIO_c::dFs_HIO_c() { field_0x0021 = 0; field_0x0022 = 0; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dFs_HIO_c::dFs_HIO_c() { - nofralloc -#include "asm/d/file/d_file_select/__ct__9dFs_HIO_cFv.s" -} -#pragma pop -#endif /* 8018366C-8018375C 17DFAC 00F0+00 0/0 1/1 0/0 .text __ct__14dFile_select_cFP10JKRArchive */ #ifdef NONMATCHING @@ -1802,6 +1778,90 @@ asm dFile_select_c::dFile_select_c(JKRArchive* param_0) { #endif /* 8018375C-801841EC 17E09C 0A90+00 1/0 0/0 0/0 .text __dt__14dFile_select_cFv */ +// I think it matches but misses all the inline dtors +#ifdef NONMATCHING +dFile_select_c::~dFile_select_c() { + for (int i = 0; i < 3; i = i + 1) { + delete field_0x0164[i]; + delete field_0x0170[i]; + delete field_0x017c[i]; + delete mpPaneAlpha1[i]; + delete mpPaneAlpha2[i]; + delete mpPaneAlpha3[i]; + delete mpPaneMgr2[i]; + delete field_0x0188[i]; + delete field_0x014c[i]; + delete field_0x0158[i]; + delete field_0x00bc[i]; + delete field_0x0340[i]; + delete field_0x0070[i]; + } + delete field_0x00a4; + for (int i = 0; i < 2; i = i + 1) { + delete field_0x00f0[i]; + delete field_0x01a0[i]; + delete field_0x01a8[i]; + delete field_0x01b0[i]; + delete field_0x020c[i]; + delete field_0x0138[i]; + delete field_0x01c0[i]; + delete mpFileInfo[i]; + delete field_0x02a4[i]; + delete field_0x02c0[i]; + delete field_0x02c8[i]; + delete field_0x02d0[i]; + delete field_0x02d8[i]; + } + delete field_0x0238; + delete field_0x0240; + delete field_0x023c; + delete field_0x0244; + delete field_0x0084; + delete field_0x0088; + delete field_0x008c; + delete field_0x01c8; + delete field_0x01d0; + delete field_0x01d8; + delete field_0x01e0; + delete field_0x01e8; + delete field_0x01f0; + delete field_0x01f8; + delete field_0x0200; + delete field_0x0090; + delete field_0x0094; + delete field_0x0098; + delete field_0x009c; + mDoExt_removeMesgFont(); + mDoExt_removeSubFont(); + delete mStick; + delete mSelIcon; + delete mSelIcon2; + delete mpName; + delete mpFileWarning; + delete field_0x029c; + delete field_0x02a0; + delete field_0x02e8; + delete field_0x02f0; + delete field_0x02f8; + delete field_0x0300; + delete field_0x0308; + delete field_0x0310; + delete field_0x0314; + delete field_0x0318; + delete field_0x0320; + delete field_0x0328; + delete field_0x032c; + delete field_0x0330; + delete field_0x0338; + delete field_0x03a0; + delete field_0x03a8; + mpFileSelect3d->_delete(); + delete mpFileSelect3d; + + dComIfGp_getMain2DArchive()->removeResourceAll(); + dComIfGp_getCollectResArchive()->removeResourceAll(); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -1810,6 +1870,7 @@ asm dFile_select_c::~dFile_select_c() { #include "asm/d/file/d_file_select/__dt__14dFile_select_cFv.s" } #pragma pop +#endif /* 801841EC-80184274 17EB2C 0088+00 0/0 1/0 0/0 .text __dt__15J2DAnmTevRegKeyFv */ #pragma push @@ -1875,7 +1936,7 @@ SECTION_SDATA2 static f32 lit_4166[1 + 1 /* padding */] = { /* 801843CC-801844FC 17ED0C 0130+00 0/0 1/1 0/0 .text _create__14dFile_select_cFv */ #ifdef NONMATCHING -// setFadeColor instruction reordering +// Matches with literals void dFile_select_c::_create() { mDoGph_gInf_c::setFadeColor(static_cast(g_blackColor)); mStick = new STControl(2, 2, 1, 1, 0.9f, 0.5f, 0, 0x2000); @@ -1939,15 +2000,15 @@ void dFile_select_c::_move() { dataDelEffAnm(); dataCopyEffAnm(); - mFileSelectDlst.mpScreen->animation(); - mFileSelYesNoDlst.mpScreen->animation(); - mFileSel3mDlst.mpScreen->animation(); - mFileSelDeleteDlst.mpScreen->animation(); + fileSel.Scr->animation(); + mYnSel.ScrYn->animation(); + m3mSel.Scr3m->animation(); + mSelDt.ScrDt->animation(); - if (mFileSelCopyDlst.field_0x08) { + if (mCpSel.field_0x08) { selCopyFileWakuAnm(); copyBookIconAnm(); - mFileSelCopyDlst.mpScreen->animation(); + mCpSel.Scr->animation(); } mpFileWarning->_move(); @@ -2183,10 +2244,10 @@ asm void dFile_select_c::dataCopyEffAnm() { #ifdef NONMATCHING // matches with literals void dFile_select_c::selectDataBaseMoveAnmInitSet(int param_0, int param_1) { - field_0x00a4->getPanePtr()->setAnimation((J2DAnmTransform*)mpAnmBase[0]); + field_0x00a4->getPanePtr()->setAnimation((J2DAnmTransform*)field_0x0084); field_0x00b0 = param_0; field_0x00b4 = param_1; - mpAnmBase[0]->setFrame(field_0x00b0); + field_0x0084->setFrame(field_0x00b0); field_0x00a4->getPanePtr()->animationTransform(); field_0x00b9 = 1; } @@ -2220,7 +2281,7 @@ bool dFile_select_c::selectDataBaseMoveAnm() { } - mpAnmBase[0]->setFrame(field_0x00b0); + field_0x0084->setFrame(field_0x00b0); field_0x00a4->getPanePtr()->animationTransform(); return false; } else { @@ -2250,44 +2311,31 @@ SECTION_SDATA2 static f32 lit_4611 = 1.0f; SECTION_SDATA2 static f32 lit_4612 = -1.0f; /* 80184E38-80185040 17F778 0208+00 1/1 0/0 0/0 .text dataSelectInAnmSet__14dFile_select_cFv */ +// Matches with literals #ifdef NONMATCHING void dFile_select_c::dataSelectInAnmSet() { setSaveData(); - char* card_ptr = &mpMemCard; - OSTime date_ipl = mpSave->getPlayer().getPlayerStatusB().getDateIpl(); // guess - - // pdVar1 = (dSv_player_c *)dSv_save_c::getPlayer((dSv_save_c *)this_00); - // pdVar2 = (dSv_player_status_b_c *)dSv_player_c::getPlayerStatusB(pdVar1); - // uVar4 = dSv_player_status_b_c::getDateIpl(pdVar2); + dSv_save_c* pSave = (dSv_save_c*)mSave; + OSTime date_ipl = pSave->getPlayer().getPlayerStatusB().getDateIpl(); mSelectNum = 0; for (int i = 0; i < 3; i++) { + field_0x0164[i]->setAlpha(0); + field_0x0170[i]->setAlpha(0); + field_0x017c[i]->setAlpha(0); if (field_0x025b[i] == 0) { - // pdVar1 = (dSv_player_c *)dSv_save_c::getPlayer((dSv_save_c *)this_00); - // pdVar2 = (dSv_player_status_b_c *)dSv_player_c::getPlayerStatusB(pdVar1); - // uVar5 = dSv_player_status_b_c::getDateIpl(pdVar2); - - OSTime date_ipl2 = mpSave->getPlayer().getPlayerStatusB().getDateIpl(); - OSTime div_res = date_ipl2 / date_ipl; + OSTime date_ipl2 = pSave->getPlayer().getPlayerStatusB().getDateIpl(); + OSTime date2Secs = OSTicksToSeconds(date_ipl2); + OSTime dateSec = OSTicksToSeconds(date_ipl); - // wrong, fix - if (div_res < date_ipl) { + if (dateSec < date2Secs) { date_ipl = date_ipl2; mSelectNum = i; } - // uVar6 = Runtime.PPCEABI.H::__div2i - // ((int)((ulonglong)uVar5 >> 0x20),(int)uVar5,0,DAT_800000f8 >> 2); - // uVar7 = Runtime.PPCEABI.H::__div2i - // ((int)((ulonglong)uVar4 >> 0x20),(int)uVar4,0,DAT_800000f8 >> 2); - // if (((uint)((ulonglong)uVar7 >> 0x20) ^ 0x80000000) < - // (uint)((uint)uVar7 < (uint)uVar6) + ((uint)((ulonglong)uVar6 >> 0x20) ^ 0x80000000)) { - // mSelectNum = (byte)iVar3; - // uVar4 = uVar5; - // } } - card_ptr += 0xa94; + (char*)pSave += 0xa94; - if (field_0x025b[i] == 0 && mDataNew[i] != 0) { + if (field_0x025b[i] != 0 || mDataNew[i] != 0) { field_0x0220[i]->setAlpha(0); field_0x022c[i]->setAlpha(0xFF); } else { @@ -2328,7 +2376,7 @@ void dFile_select_c::dataSelectIn() { } bool nameMove = true; - if (field_0x0128 || mFileSelCopyDlst.field_0x08) { + if (field_0x0128 || mCpSel.field_0x08) { nameMove = nameMoveAnm(); } @@ -2349,7 +2397,7 @@ void dFile_select_c::dataSelectIn() { headerTxtSet(0x43,1,0); mLastSelectNum = mSelectNum; - field_0x00bc[mSelectNum]->getPanePtr()->setAnimation((J2DAnmTransform*)mpAnmBase[0]); + field_0x00bc[mSelectNum]->getPanePtr()->setAnimation((J2DAnmTransform*)field_0x0084); field_0x00e0[mSelectNum] = SelStartFrameTbl[mSelectNum]; field_0x0188[mSelectNum]->alphaAnimeStart(0); ketteiTxtDispAnmInit(1); @@ -2377,7 +2425,7 @@ void dFile_select_c::dataSelectInit() { if (field_0x00e0[mSelectNum] > SelEndFrameTbl[mSelectNum]) field_0x00e0[mSelectNum] = SelEndFrameTbl[mSelectNum]; - mpAnmBase[0]->setFrame(field_0x00e0[mSelectNum]); + field_0x0084->setFrame(field_0x00e0[mSelectNum]); field_0x00bc[mSelectNum]->getPanePtr()->animationTransform(); check = false; } @@ -2448,13 +2496,13 @@ asm void dFile_select_c::dataSelect() { /* ############################################################################################## */ /* 804506B0-804506B8 000130 0008+00 2/2 0/0 0/0 .sdata YnSelStartFrameTbl */ -SECTION_SDATA static u32 YnSelStartFrameTbl[2] = { +SECTION_SDATA static s32 YnSelStartFrameTbl[2] = { 0x000004E3, 0x000004D4, }; /* 804506B8-804506C0 000138 0008+00 2/2 0/0 0/0 .sdata YnSelEndFrameTbl */ -SECTION_SDATA static u32 YnSelEndFrameTbl[2] = { +SECTION_SDATA static s32 YnSelEndFrameTbl[2] = { 0x000004D4, 0x000004E3, }; @@ -2476,9 +2524,60 @@ SECTION_SDATA2 static u8 lit_4778[4] = { /* 80185508-80185994 17FE48 048C+00 1/1 0/0 0/0 .text dataSelectStart__14dFile_select_cFv */ +// Matches with literals #ifdef NONMATCHING void dFile_select_c::dataSelectStart() { - + mSelIcon->setAlphaRate(0.0f); + if (field_0x025b[mSelectNum] != 0) { + headerTxtSet(0x52, 0, 0); + selectDataMoveAnmInitSet(SelOpenStartFrameTbl[mSelectNum], SelOpenEndFrameTbl[mSelectNum]); + yesnoMenuMoveAnmInitSet(0x473, 0x47d); + selectWakuAlpahAnmInit(mSelectNum, 0xff, 0, g_fsHIO.field_0x0008); + mSelDt.ScrDt->search('ken_00')->hide(); + mSelDt.ScrDt->search('ken_01')->hide(); + mSelDt.ScrDt->search('ken_02')->hide(); + mSelDt.ScrDt->search('tate_00')->hide(); + mSelDt.ScrDt->search('tate_01')->hide(); + mSelDt.ScrDt->search('tate_02')->hide(); + mSelDt.ScrDt->search('fuku_00')->hide(); + mSelDt.ScrDt->search('fuku_01')->hide(); + mSelDt.ScrDt->search('fuku_02')->hide(); + mpFileSelect3d->drawOff(); + field_0x026f = 7; + } else if (mDataNew[mSelectNum] != 0) { + dComIfGs_setNewFile(0x80); + dComIfGs_setDataNum(mSelectNum); + mDoAud_seStart(Z2SE_SY_NEW_FILE, 0, 0, 0); + headerTxtSet(0x385, 1, 0); + fileRecScaleAnmInitSet2(1.0f, + -1.0f); + nameMoveAnmInitSet(3359, 3369); + field_0x0164[mSelectNum]->setAlpha(0); + field_0x0170[mSelectNum]->setAlpha(0); + field_0x017c[mSelectNum]->setAlpha(0); + char auStack_28[32]; + dMeter2Info_getString(0x382, auStack_28, 0); + dComIfGs_setPlayerName(auStack_28); + mpName->setNextNameStr(dComIfGs_getPlayerName()); + mpName->initial(); + modoruTxtChange(1); + field_0x026f = 6; + } else { + dComIfGs_setNewFile(0); + mDoAud_seStart(Z2SE_SY_CURSOR_OK, 0, 0, 0); + mSelectMenuNum = 1; + mLastSelectMenuNum = mSelectMenuNum; + headerTxtSet(msgTbl[mSelectNum], + 1, 0); + selectDataMoveAnmInitSet( + SelOpenStartFrameTbl[mSelectNum], + SelOpenEndFrameTbl[mSelectNum]); + menuMoveAnmInitSet(799, 809); + selectWakuAlpahAnmInit(mSelectNum, 0xff, 0, g_fsHIO.field_0x0008); + makeRecInfo(mSelectNum); + field_0x026f = 5; + } + modoruTxtDispAnmInit(1); } #else #pragma push @@ -2496,13 +2595,13 @@ asm void dFile_select_c::dataSelectStart() { #ifdef NONMATCHING // matches with literals void dFile_select_c::selectDataMoveAnmInitSet(int param_0, int param_1) { - field_0x00bc[0]->getPanePtr()->setAnimation((J2DAnmTransform*)mpAnmBase[0]); - field_0x00bc[1]->getPanePtr()->setAnimation((J2DAnmTransform*)mpAnmBase[0]); - field_0x00bc[2]->getPanePtr()->setAnimation((J2DAnmTransform*)mpAnmBase[0]); - mpPane->setAnimation((J2DAnmTransform*)mpAnmBase[0]); + field_0x00bc[0]->getPanePtr()->setAnimation((J2DAnmTransform*)field_0x0084); + field_0x00bc[1]->getPanePtr()->setAnimation((J2DAnmTransform*)field_0x0084); + field_0x00bc[2]->getPanePtr()->setAnimation((J2DAnmTransform*)field_0x0084); + mpPane->setAnimation((J2DAnmTransform*)field_0x0084); field_0x00e0[mSelectNum] = param_0; field_0x00ec = (s32*)param_1; - mpAnmBase[0]->setFrame(field_0x00e0[mSelectNum]); + field_0x0084->setFrame(field_0x00e0[mSelectNum]); field_0x00bc[0]->getPanePtr()->animationTransform(); field_0x00bc[1]->getPanePtr()->animationTransform(); field_0x00bc[2]->getPanePtr()->animationTransform(); @@ -2537,7 +2636,7 @@ bool dFile_select_c::selectDataMoveAnm() { field_0x00e0[mSelectNum] = field_0x00ec; } - mpAnmBase[0]->setFrame(field_0x00e0[mSelectNum]); + field_0x0084->setFrame(field_0x00e0[mSelectNum]); for (int i = 0; i < 3; i++) { field_0x00bc[i]->getPanePtr()->animationTransform(); @@ -2571,21 +2670,21 @@ asm bool dFile_select_c::selectDataMoveAnm() { // matches with literals void dFile_select_c::dataSelectAnmSet() { if (mSelectNum != 0xff) { - field_0x00bc[mSelectNum]->getPanePtr()->setAnimation((J2DAnmTransform*)mpAnmBase[0]); + field_0x00bc[mSelectNum]->getPanePtr()->setAnimation((J2DAnmTransform*)field_0x0084); field_0x00e0[mSelectNum] = SelStartFrameTbl[mSelectNum]; - mpAnmBase[0]->setFrame(field_0x00e0[mSelectNum]); + field_0x0084->setFrame(field_0x00e0[mSelectNum]); field_0x00bc[mSelectNum]->getPanePtr()->animationTransform(); field_0x0188[mSelectNum]->alphaAnimeStart(0); } if (mLastSelectNum != 0xff) { selectWakuAlpahAnmInit(mLastSelectNum,0xff,0,g_fsHIO.field_0x0008); - field_0x00bc[mLastSelectNum]->getPanePtr()->setAnimation((J2DAnmTransform*)mpAnmBase[1]); // wrong? + field_0x00bc[mLastSelectNum]->getPanePtr()->setAnimation((J2DAnmTransform*)field_0x0088); // wrong? field_0x00e0[mLastSelectNum] = SelEndFrameTbl[mLastSelectNum]; - mpAnmBase[1]->setFrame(field_0x00e0[mLastSelectNum]); + field_0x0088->setFrame(field_0x00e0[mLastSelectNum]); field_0x00bc[mLastSelectNum]->getPanePtr()->animationTransform(); field_0x0188[mLastSelectNum]->alphaAnimeStart(0); - mpCursor1->setAlphaRate(0.0f); + mSelIcon->setAlphaRate(0.0f); } } #else @@ -2616,7 +2715,7 @@ void dFile_select_c::dataSelectMoveAnime() { if (field_0x00e0[mLastSelectNum] < SelStartFrameTbl[mLastSelectNum]) field_0x00e0[mLastSelectNum] = SelStartFrameTbl[mLastSelectNum]; - mpAnmBase[1]->setFrame(field_0x00e0[mLastSelectNum]); + field_0x0088->setFrame(field_0x00e0[mLastSelectNum]); field_0x00bc[mLastSelectNum]->getPanePtr()->animationTransform(); bVar1 = false; } @@ -2634,7 +2733,7 @@ void dFile_select_c::dataSelectMoveAnime() { if (SelEndFrameTbl[mSelectNum] < field_0x00e0[mSelectNum]) field_0x00e0[mSelectNum] = SelEndFrameTbl[mSelectNum]; - mpAnmBase[0]->setFrame(field_0x00e0[mSelectNum]); + field_0x0084->setFrame(field_0x00e0[mSelectNum]); field_0x00bc[mSelectNum]->getPanePtr()->animationTransform(); bVar2 = false; } @@ -2665,14 +2764,96 @@ asm void dFile_select_c::dataSelectMoveAnime() { #endif /* 80186088-801864DC 1809C8 0454+00 2/2 0/0 0/0 .text makeRecInfo__14dFile_select_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dFile_select_c::makeRecInfo(u8 param_0) { - nofralloc -#include "asm/d/file/d_file_select/makeRecInfo__14dFile_select_cFUc.s" +void dFile_select_c::makeRecInfo(u8 param_1) { + dSv_save_c* pSave = (dSv_save_c*)&mSave[param_1]; + J2DPane* ken0 = mSelDt.ScrDt->search('ken_00'); + J2DPane* ken1 = mSelDt.ScrDt->search('ken_01'); + ken0->hide(); + ken1->hide(); + if (pSave->getPlayer().getGetItem().isFirstBit(40)) { + ken0->hide(); + ken1->show(); + } else if (pSave->getPlayer().getGetItem().isFirstBit(63) && !pSave->getEvent().isEventBit(0x302)) { + ken0->show(); + ken1->hide(); + } + + J2DPane* ken2 = mSelDt.ScrDt->search('ken_02'); + if (pSave->getPlayer().getGetItem().isFirstBit(41) || pSave->getPlayer().getGetItem().isFirstBit(73)) { + ken2->show(); + } else { + ken2->hide(); + } + + J2DPane* tate0 = mSelDt.ScrDt->search('tate_00'); + J2DPane* tate1 = mSelDt.ScrDt->search('tate_01'); + tate0->hide(); + tate1->hide(); + + if (pSave->getPlayer().getGetItem().isFirstBit(43)) { + tate0->show(); + tate1->hide(); + } else if (pSave->getPlayer().getGetItem().isFirstBit(42)) { + tate0->hide(); + tate1->show(); + } + + J2DPane* tate2 = mSelDt.ScrDt->search('tate_02'); + if (pSave->getPlayer().getGetItem().isFirstBit(44)) { + tate2->show(); + } else { + tate2->hide(); + } + + J2DPane* fuku0 = mSelDt.ScrDt->search('fuku_00'); + if (pSave->getPlayer().getGetItem().isFirstBit(47)) { + fuku0->show(); + } else { + fuku0->hide(); + } + + J2DPane* fuku1 = mSelDt.ScrDt->search('fuku_01'); + if (pSave->getPlayer().getGetItem().isFirstBit(49)) { + fuku1->show(); + } else { + fuku1->hide(); + } + + J2DPane* fuku2 = mSelDt.ScrDt->search('fuku_02'); + if (pSave->getPlayer().getGetItem().isFirstBit(48)) { + fuku2->show(); + } else { + fuku2->hide(); + } + + u8 mirrorsCollected = 0; + for (int i = 0; i < 4; i++) { + if (!pSave->getPlayer().getCollect().isCollectMirror(i)) { + break; + } + mirrorsCollected++; + } + u8 crystalCollected = 0; + for (int i = 0; i < 4; i++) { + if (!pSave->getPlayer().getCollect().isCollectCrystal(i)) { + break; + } + crystalCollected++; + } + + if ((crystalCollected == 0 && mirrorsCollected == 0) || (pSave->getEvent().isEventBit(0xc01) && !pSave->getPlayer().getCollect().isCollectMirror(0)) || + (pSave->getEvent().isEventBit(0x2b08) && !pSave->getPlayer().getCollect().isCollectCrystal(3))) { + mpFileSelect3d->drawOff(); + } else { + mpFileSelect3d->freeHeap(); + if (pSave->getPlayer().getCollect().isCollectCrystal(3) || mirrorsCollected == 0) { + mpFileSelect3d->_create(0, crystalCollected); + } else { + mpFileSelect3d->_create(mirrorsCollected, 0); + } + + } } -#pragma pop /* 801864DC-80186638 180E1C 015C+00 1/0 0/0 0/0 .text selectDataOpenMove__14dFile_select_cFv */ #ifdef NONMATCHING @@ -2789,13 +2970,13 @@ void dFile_select_c::menuSelectStart() { mDoAud_seStart(Z2SE_SY_CURSOR_OK,0,0,0); if (mSelectMenuNum == 1) { - dComIfGs_setCardToMemory(&mpMemCard,mSelectNum); + dComIfGs_setCardToMemory((char*)mSave,mSelectNum); field_0x0270 = 1; field_0x026f = 46; dComIfGs_setDataNum(mSelectNum); } else if (mSelectMenuNum == 0) { - mpCursor1->setAlphaRate(0.0f); + mSelIcon->setAlphaRate(0.0f); yesnoMenuMoveAnmInitSet(0x473,0x47d); headerTxtSet(0x49, 0,0); field_0x026e = 1; @@ -2805,7 +2986,7 @@ void dFile_select_c::menuSelectStart() { field_0x026a = mSelectNum; menuMoveAnmInitSet(0x329,799); headerTxtSet(0x44,0,0); - mpCursor1->setAlphaRate(0.0f); + mSelIcon->setAlphaRate(0.0f); selectDataMoveAnmInitSet(SelOpenEndFrameTbl[mSelectNum],SelOpenStartFrameTbl[mSelectNum]); selectWakuAlpahAnmInit(mSelectNum,0,255,g_fsHIO.field_0x0008); copySelMoveAnmInitSet(0xd1f,0xd29); @@ -2834,7 +3015,7 @@ void dFile_select_c::menuSelectCansel() { menuMoveAnmInitSet(0x329,799); modoruTxtDispAnmInit(0); headerTxtSet(0x43,1,0); - mpCursor1->setAlphaRate(0.0); + mSelIcon->setAlphaRate(0.0); field_0x026f = 0xd; } #else @@ -2959,7 +3140,7 @@ void dFile_select_c::menuSelectAnmSet() { field_0x032c->setFrame(field_0x034c[mLastSelectMenuNum]); (&field_0x0340)[mLastSelectMenuNum]->getPanePtr()->animationTransform(); menuWakuAlpahAnmInit(mLastSelectMenuNum,0xFF,0,g_fsHIO.field_0x0008); - mpCursor1->setAlphaRate(0.0f); + mSelIcon->setAlphaRate(0.0f); } } #else @@ -3310,21 +3491,23 @@ asm void dFile_select_c::backNameInputMove() { /* 801879B8-80187ADC 1822F8 0124+00 1/0 0/0 0/0 .text ToCopyPaneMove__14dFile_select_cFv */ +// Matches with literals #ifdef NONMATCHING -// unfinished void dFile_select_c::ToCopyPaneMove() { - cPaneMgr* pPane; - bool headerTxtChange = headerTxtChangeAnm(); bool menuMove = menuMoveAnm(); bool selectDataMove = selectDataMoveAnm(); bool selectWakuAlpha = selectWakuAlpahAnm(mSelectNum); bool nameMove = nameMoveAnm(); - if (headerTxtChange == true && menuMove == true && selectDataMove == true && selectWakuAlpha == true && nameMove == true) { + if (headerTxtChange == true && menuMove == true && selectDataMove == true && + selectWakuAlpha == true && nameMove == true) + { field_0x026b = 0; - Vec vec = pPane->getGlobalVtxCenter(); - + Vec local_2c = field_0x02a4[field_0x026b]->getGlobalVtxCenter(false, 0); + mSelIcon2->setPos(local_2c.x, local_2c.y, field_0x02a4[field_0x026b]->getPanePtr(), true); + mSelIcon2->setAlphaRate(1.0f); + field_0x026f = 22; } } #else @@ -3378,12 +3561,12 @@ SECTION_SDATA2 static f32 lit_5615 = 109.0f; // matches with literals void dFile_select_c::copySelMoveAnmInitSet(int param_0, int param_1) { if (param_0 == 0xd1f) { - field_0x02c0->setAlpha(0xff); - field_0x02c8->setAlpha(0xff); - field_0x02d0->setAlpha(0xff); - field_0x02c4->setAlpha(0); - field_0x02cc->setAlpha(0); - field_0x02d4->setAlpha(0); + field_0x02c0[0]->setAlpha(0xff); + field_0x02c8[0]->setAlpha(0xff); + field_0x02d0[0]->setAlpha(0xff); + field_0x02c0[1]->setAlpha(0); + field_0x02c8[1]->setAlpha(0); + field_0x02d0[1]->setAlpha(0); field_0x02a4[0]->getPanePtr()->setAnimation(field_0x029c); field_0x029c->setFrame(99.0f); @@ -3396,13 +3579,13 @@ void dFile_select_c::copySelMoveAnmInitSet(int param_0, int param_1) { field_0x02a4[1]->getPanePtr()->setAnimation((J2DAnmTransform*)0); setSaveDataForCopySel(); - mFileSelCopyDlst.field_0x08 = true; + mCpSel.field_0x08 = true; } - field_0x011c->setAnimation(mpAnmBase[4]); + field_0x011c->setAnimation(field_0x0094); field_0x0120 = param_0; field_0x0124 = param_1; - mpAnmBase[4]->setFrame(field_0x0120); + field_0x0094->setFrame(field_0x0120); field_0x011c->animationTransform(); } #else @@ -3417,16 +3600,62 @@ asm void dFile_select_c::copySelMoveAnmInitSet(int param_0, int param_1) { #endif /* 80187DB8-80187ED4 1826F8 011C+00 1/1 0/0 0/0 .text setSaveDataForCopySel__14dFile_select_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dFile_select_c::setSaveDataForCopySel() { - nofralloc -#include "asm/d/file/d_file_select/setSaveDataForCopySel__14dFile_select_cFv.s" +void dFile_select_c::setSaveDataForCopySel() { + SaveData* pSave = mSave; + int notSelectedIndex = 0; + for (int i = 0; i < 3; i++) { + if (i == mSelectNum) { + pSave++; + continue; + } + J2DPicture* tagName = (J2DPicture*) mCpSel.Scr->search(l_tagName101[notSelectedIndex]); + tagName->changeTexture(l_numTex[i], 0); + CPaneMgrAlpha* datBase = mpFileInfo[notSelectedIndex]->getDatBase(); + CPaneMgrAlpha* noDatBase = mpFileInfo[notSelectedIndex]->getNoDatBase(); + int saveResult = + mpFileInfo[notSelectedIndex]->setSaveData((dSv_save_c*)*pSave, field_0x025b[i] == 0, i); + if (saveResult == -1 || saveResult == 1) { + datBase->hide(); + noDatBase->show(); + } else { + datBase->show(); + noDatBase->hide(); + } + pSave++; + notSelectedIndex++; + } } -#pragma pop /* 80187ED4-8018801C 182814 0148+00 1/0 0/0 0/0 .text copyDataToSelect__14dFile_select_cFv */ +// Matches with literals +#ifdef NONMATCHING +void dFile_select_c::copyDataToSelect() { + mStick->checkTrigger(); + if (mDoCPd_c::getTrigA(0) != 0) { + copyDataToSelectStart(); + return; + } + if (mDoCPd_c::getTrigB(0) != 0) { + copyDataToSelectCansel(); + return; + } + if (mStick->checkUpTrigger()) { + if (field_0x026b != 0) { + mDoAud_seStart(Z2SE_FILE_SELECT_CURSOR, 0, 0, 0); + field_0x026c = field_0x026b; + field_0x026b = 0; + copyDataToSelectMoveAnmSet(); + field_0x026f = 23; + } + } else if (mStick->checkDownTrigger() && field_0x026b != 1) { + mDoAud_seStart(Z2SE_FILE_SELECT_CURSOR, 0, 0, 0); + field_0x026c = field_0x026b; + field_0x026b = 1; + copyDataToSelectMoveAnmSet(); + field_0x026f = 23; + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -3435,8 +3664,40 @@ asm void dFile_select_c::copyDataToSelect() { #include "asm/d/file/d_file_select/copyDataToSelect__14dFile_select_cFv.s" } #pragma pop +#endif /* 8018801C-80188234 18295C 0218+00 1/1 0/0 0/0 .text copyDataToSelectStart__14dFile_select_cFv */ +// Matches with literals +#ifdef NONMATCHING +void dFile_select_c::copyDataToSelectStart() { + mDoAud_seStart(Z2SE_SY_CURSOR_OK, 0, 0, 0); + field_0x026d = getCptoNum(field_0x026b); + mSelIcon2->setAlphaRate(0.0f); + if (mDataNew[field_0x026d] != 0) { + headerTxtSet(70, 0, 0); + mpFileWarning->openInit(); + field_0x0158[mSelectNum]->getPanePtr()->scale(1.0f, 1.0f); + field_0x0158[mSelectNum]->alphaAnimeStart(0); + field_0x0158[mSelectNum]->setAlpha(0); + field_0x0158[field_0x026d]->getPanePtr()->scale(1.0f, 1.0f); + field_0x0158[field_0x026d]->alphaAnimeStart(0); + field_0x0158[field_0x026d]->setAlpha(0); + selectWakuAlpahAnmInit(field_0x026d, 0, 0xff, g_fsHIO.field_0x0008); + copySelMoveAnmInitSet(3369, 3359); + field_0x01fc = 0; + field_0x0204 = 0; + field_0x0209 = 1; + field_0x03b1 = 1; + modoruTxtDispAnmInit(0); + ketteiTxtDispAnmInit(0); + field_0x026f = 29; + } else { + yesnoMenuMoveAnmInitSet(1139, 1149); + headerTxtSet(69, 0, 0); + field_0x026f = 25; + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -3445,9 +3706,23 @@ asm void dFile_select_c::copyDataToSelectStart() { #include "asm/d/file/d_file_select/copyDataToSelectStart__14dFile_select_cFv.s" } #pragma pop +#endif /* 80188234-8018832C 182B74 00F8+00 1/1 0/0 0/0 .text copyDataToSelectCansel__14dFile_select_cFv */ +// Matches with literals +#ifdef NONMATCHING +void dFile_select_c::copyDataToSelectCansel() { + mDoAud_seStart(Z2SE_SY_CURSOR_CANCEL, 0, 0, 0); + selectDataMoveAnmInitSet(SelOpenStartFrameTbl[mSelectNum], SelOpenEndFrameTbl[mSelectNum]); + menuMoveAnmInitSet(799, 809); + copySelMoveAnmInitSet(3369, 3359); + headerTxtSet(msgTbl[mSelectNum], 1, 0); + mSelIcon2->setAlphaRate(0.0f); + selectWakuAlpahAnmInit(mSelectNum, 0xff, 0, g_fsHIO.field_0x0008); + field_0x026f = 24; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -3456,9 +3731,31 @@ asm void dFile_select_c::copyDataToSelectCansel() { #include "asm/d/file/d_file_select/copyDataToSelectCansel__14dFile_select_cFv.s" } #pragma pop +#endif /* 8018832C-801884D0 182C6C 01A4+00 1/1 0/0 0/0 .text * copyDataToSelectMoveAnmSet__14dFile_select_cFv */ +// Matches with literals +#ifdef NONMATCHING +void dFile_select_c::copyDataToSelectMoveAnmSet() { + if (field_0x026b != 0xff) { + field_0x02d8[field_0x026b]->alphaAnimeStart(0); + field_0x02a4[field_0x026b]->getPanePtr()->setAnimation(field_0x029c); + field_0x02b4[field_0x026b] = 109; + field_0x029c->setFrame(field_0x02b4[field_0x026b]); + field_0x02a4[field_0x026b]->getPanePtr()->animationTransform(); + } + if (field_0x026c != 0xff) { + copySelectWakuAlpahAnmInit(field_0x026c, 0xff, 0, g_fsHIO.field_0x0008); + field_0x02d8[field_0x026c]->alphaAnimeStart(0); + field_0x02a4[field_0x026c]->getPanePtr()->setAnimation(field_0x02a0); + field_0x02b4[field_0x026c] = 99; + field_0x02a0->setFrame(field_0x02b4[field_0x026c]); + field_0x02a4[field_0x026c]->getPanePtr()->animationTransform(); + mSelIcon2->setAlphaRate(0.0f); + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -3467,9 +3764,62 @@ asm void dFile_select_c::copyDataToSelectMoveAnmSet() { #include "asm/d/file/d_file_select/copyDataToSelectMoveAnmSet__14dFile_select_cFv.s" } #pragma pop +#endif /* 801884D0-80188834 182E10 0364+00 1/0 0/0 0/0 .text copyDataToSelectMoveAnm__14dFile_select_cFv */ +// Matches with literals +#ifdef NONMATCHING +void dFile_select_c::copyDataToSelectMoveAnm() { + bool iVar7 = true; + bool iVar6 = true; + bool bVar1 = true; + if (field_0x026c != 0xff) { + iVar7 = field_0x02d8[field_0x026c]->alphaAnime(g_fsHIO.field_0x0006, 0xff, 0, 1); + iVar6 = copySelectWakuAlpahAnm(field_0x026c); + if (field_0x02b4[field_0x026c] != 109) { + field_0x02b4[field_0x026c] += 2; + if (field_0x02b4[field_0x026c] > 109) { + field_0x02b4[field_0x026c] = 109; + } + field_0x02a0->setFrame(field_0x02b4[field_0x026c]); + field_0x02a4[field_0x026c]->getPanePtr()->animationTransform(); + bVar1 = false; + } + } + bool iVar5 = true; + bool bVar2 = true; + if (field_0x026b != 0xff) { + iVar5 = field_0x02d8[field_0x026b]->alphaAnime(g_fsHIO.field_0x0006, 0, 0xff, 1); + if (field_0x02b4[field_0x026b] != 99) { + field_0x02b4[field_0x026b] -= 2; + if (field_0x02b4[field_0x026b] < 99) { + field_0x02b4[field_0x026b] = 99; + } + field_0x029c->setFrame(field_0x02b4[field_0x026b]); + field_0x02a4[field_0x026b]->getPanePtr()->animationTransform(); + bVar2 = false; + } + } + + if (iVar7 == true && iVar6 == true && bVar1 == true && iVar5 == true && bVar2 == true) { + if (field_0x026c != 0xff) { + field_0x02a4[field_0x026c]->getPanePtr()->setAnimation((J2DAnmTransform*)NULL); + } + if (field_0x026b != 0xff) { + field_0x02a4[field_0x026b]->getPanePtr()->setAnimation((J2DAnmTransform*)NULL); + field_0x02c0[field_0x026b]->setAlpha(0xff); + field_0x02c8[field_0x026b]->setAlpha(0xff); + field_0x02d0[field_0x026b]->setAlpha(0xff); + Vec local_3c = field_0x02a4[field_0x026b]->getGlobalVtxCenter(false, 0); + mSelIcon2->setPos(local_3c.x, local_3c.y, field_0x02a4[field_0x026b]->getPanePtr(), + true); + mSelIcon2->setAlphaRate(1.0f); + } + field_0x026f = 22; + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -3478,42 +3828,79 @@ asm void dFile_select_c::copyDataToSelectMoveAnm() { #include "asm/d/file/d_file_select/copyDataToSelectMoveAnm__14dFile_select_cFv.s" } #pragma pop +#endif /* 80188834-80188878 183174 0044+00 1/1 0/0 0/0 .text * copySelectWakuAlpahAnmInit__14dFile_select_cFUcUcUcUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dFile_select_c::copySelectWakuAlpahAnmInit(u8 param_0, u8 param_1, u8 param_2, - u8 param_3) { - nofralloc -#include "asm/d/file/d_file_select/copySelectWakuAlpahAnmInit__14dFile_select_cFUcUcUcUc.s" +void dFile_select_c::copySelectWakuAlpahAnmInit(u8 param_1, u8 param_2, u8 param_3, u8 param_4) { + if (param_1 != 0xff) { + field_0x02c0[param_1]->alphaAnimeStart(0); + field_0x02c8[param_1]->alphaAnimeStart(0); + field_0x02d0[param_1]->alphaAnimeStart(0); + field_0x02e0[param_1] = param_2; + field_0x02e2[param_1] = param_3; + field_0x02e4[param_1] = param_4; + } } -#pragma pop /* 80188878-80188950 1831B8 00D8+00 1/1 0/0 0/0 .text copySelectWakuAlpahAnm__14dFile_select_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool dFile_select_c::copySelectWakuAlpahAnm(u8 param_0) { - nofralloc -#include "asm/d/file/d_file_select/copySelectWakuAlpahAnm__14dFile_select_cFUc.s" +bool dFile_select_c::copySelectWakuAlpahAnm(u8 param_1) { + if (param_1 == 0xff) { + return true; + } + bool rv = false; + bool iVar2 = field_0x02c0[param_1]->alphaAnime(field_0x02e4[param_1], field_0x02e0[param_1], field_0x02e2[param_1], 0); + bool iVar3 = field_0x02c8[param_1]->alphaAnime(field_0x02e4[param_1], field_0x02e0[param_1], field_0x02e2[param_1], 0); + bool iVar4 = field_0x02d0[param_1]->alphaAnime(field_0x02e4[param_1], field_0x02e0[param_1], field_0x02e2[param_1], 0); + if (iVar2 == true && iVar3 == true && iVar4 == true) { + rv = true; + } + return rv; } -#pragma pop /* 80188950-80188994 183290 0044+00 1/1 0/0 0/0 .text getCptoNum__14dFile_select_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dFile_select_c::getCptoNum(u8 param_0) { - nofralloc -#include "asm/d/file/d_file_select/getCptoNum__14dFile_select_cFUc.s" +u8 dFile_select_c::getCptoNum(u8 param_0) { + // !@bug It returns the value in this if field_0x026a is not in the range + switch (field_0x026a) { + case 0: + return param_0 + 1; + case 1: + return param_0 * 2; + case 2: + return param_0; + } } -#pragma pop /* 80188994-80188B54 1832D4 01C0+00 1/0 0/0 0/0 .text copyToSelBack__14dFile_select_cFv */ +// Matches with literals +#ifdef NONMATCHING +void dFile_select_c::copyToSelBack() { + bool txtChanged = headerTxtChangeAnm(); + bool selectDataMoved = selectDataMoveAnm(); + bool menuMoved = menuMoveAnm(); + bool selectWakuAnimated = selectWakuAlpahAnm(mSelectNum); + bool nameMoved = nameMoveAnm(); + if (txtChanged == true && selectDataMoved == true && menuMoved == true && + selectWakuAnimated == true && nameMoved == true) + { + for (int i = 0; i < 3; i++) { + field_0x0340[i]->getPanePtr()->setAnimation(field_0x0328); + if (i == mSelectMenuNum) { + field_0x0328->setFrame(MenuSelStartFrameTbl[i]); + } else { + field_0x0328->setFrame(MenuSelEndFrameTbl[i]); + } + field_0x0340[i]->getPanePtr()->animationTransform(); + field_0x0340[i]->getPanePtr()->setAnimation((J2DAnmTransform*)NULL); + ((J2DTextBox*)mpPaneMgr2[i]->getPanePtr())->setWhite(JUtility::TColor(0x96, 0x96, 0x96, 0xff)); + } + menuCursorShow(); + field_0x026f = 8; + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -3522,29 +3909,92 @@ asm void dFile_select_c::copyToSelBack() { #include "asm/d/file/d_file_select/copyToSelBack__14dFile_select_cFv.s" } #pragma pop +#endif /* 80188B54-80188BBC 183494 0068+00 1/0 0/0 0/0 .text copyToSelPaneMove__14dFile_select_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dFile_select_c::copyToSelPaneMove() { - nofralloc -#include "asm/d/file/d_file_select/copyToSelPaneMove__14dFile_select_cFv.s" +void dFile_select_c::copyToSelPaneMove() { + bool txtChanged = headerTxtChangeAnm(); + bool menuMoved = yesnoMenuMoveAnm(); + if (txtChanged == true && menuMoved == true) { + yesnoCursorShow(); + field_0x026f = 26; + } } -#pragma pop /* 80188BBC-80188D38 1834FC 017C+00 14/14 0/0 0/0 .text * yesnoMenuMoveAnmInitSet__14dFile_select_cFii */ +// Matches with literals +#ifdef NONMATCHING +bool dFile_select_c::yesnoMenuMoveAnmInitSet(int param_1, int param_2) { + if (!field_0x0108) { + field_0x0268 = false; + field_0x0269 = true; + } + if (param_1 == 1139) { + field_0x0281 = true; + ((J2DTextBox*)field_0x01c0[field_0x0268]->getPanePtr())->setWhite(JUtility::TColor(0xff, 0xff, 0xff, 0xff)); + ((J2DTextBox*)field_0x01c0[field_0x0269]->getPanePtr())->setWhite(JUtility::TColor(0x96, 0x96, 0x96, 0xff)); + } + mSelIcon->setAlphaRate(0.0f); + field_0x00f0[0]->getPanePtr()->setAnimation(field_0x008c); + field_0x00f0[1]->getPanePtr()->setAnimation(field_0x008c); + field_0x0100 = param_1; + field_0x0104 = param_2; + field_0x008c->setFrame(field_0x0100); + field_0x00f0[0]->getPanePtr()->animationTransform(); + field_0x00f0[1]->getPanePtr()->animationTransform(); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dFile_select_c::yesnoMenuMoveAnmInitSet(int param_0, int param_1) { +asm bool dFile_select_c::yesnoMenuMoveAnmInitSet(int param_0, int param_1) { nofralloc #include "asm/d/file/d_file_select/yesnoMenuMoveAnmInitSet__14dFile_select_cFii.s" } #pragma pop +#endif /* 80188D38-80188ED0 183678 0198+00 15/15 0/0 0/0 .text yesnoMenuMoveAnm__14dFile_select_cFv */ +// Matches with literals +#ifdef NONMATCHING +bool dFile_select_c::yesnoMenuMoveAnm() { + bool rv; + if (field_0x0100 != field_0x0104) { + if (field_0x0100 < field_0x0104) { + field_0x0100 += 2; + if (field_0x0100 > field_0x0104) { + field_0x0100 = field_0x0104; + } + } else { + field_0x0100 -= 2; + if (field_0x0100 < field_0x0104) { + field_0x0100 = field_0x0104; + } + } + field_0x008c->setFrame(field_0x0100); + field_0x00f0[0]->getPanePtr()->animationTransform(); + field_0x00f0[1]->getPanePtr()->animationTransform(); + rv = false; + } else { + field_0x00f0[0]->getPanePtr()->setAnimation((J2DAnmTransform*)NULL); + field_0x00f0[1]->getPanePtr()->setAnimation((J2DAnmTransform*)NULL); + if (field_0x0100 == 1149) { + field_0x0108 = true; + field_0x0281 = false; + } else { + field_0x0108 = false; + if (field_0x0268 != 0xff) { + field_0x01a0[field_0x0268]->setAlpha(0); + field_0x01a8[field_0x0268]->setAlpha(0); + field_0x01b0[field_0x0268]->setAlpha(0); + } + } + rv = true; + } + return rv; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -3553,16 +4003,69 @@ asm bool dFile_select_c::yesnoMenuMoveAnm() { #include "asm/d/file/d_file_select/yesnoMenuMoveAnm__14dFile_select_cFv.s" } #pragma pop +#endif /* 80188ED0-8018912C 183810 025C+00 3/3 0/0 0/0 .text yesnoSelectMoveAnm__14dFile_select_cFv */ +// Matches with literals +#ifdef NONMATCHING +bool dFile_select_c::yesnoSelectMoveAnm() { + bool rv = false; + bool bVar1 = true; + if (field_0x0269 != 0xff && field_0x00f8[field_0x0269] != YnSelStartFrameTbl[field_0x0269]) { + if (field_0x00f8[field_0x0269] < YnSelStartFrameTbl[field_0x0269]) { + field_0x00f8[field_0x0269] += 2; + if (field_0x00f8[field_0x0269] > YnSelStartFrameTbl[field_0x0269]) { + field_0x00f8[field_0x0269] = YnSelStartFrameTbl[field_0x0269]; + } + } else { + field_0x00f8[field_0x0269] -= 2; + if (field_0x00f8[field_0x0269] < YnSelStartFrameTbl[field_0x0269]) { + field_0x00f8[field_0x0269] = YnSelStartFrameTbl[field_0x0269]; + } + } + field_0x0310->setFrame(field_0x00f8[field_0x0269]); + field_0x00f0[field_0x0269]->getPanePtr()->animationTransform(); + bVar1 = false; + } + bool bVar2 = true; + if (field_0x0268 != 0xff && YnSelEndFrameTbl[field_0x0268] != field_0x00f8[field_0x0268]) + { + if (field_0x00f8[field_0x0268] < YnSelEndFrameTbl[field_0x0268]) { + field_0x00f8[field_0x0268] += 2; + if (field_0x00f8[field_0x0268] > YnSelEndFrameTbl[field_0x0268]) { + field_0x00f8[field_0x0268] = YnSelEndFrameTbl[field_0x0268]; + } + } else { + field_0x00f8[field_0x0268] -= 2; + if (field_0x00f8[field_0x0268] < YnSelEndFrameTbl[field_0x0268]) { + field_0x00f8[field_0x0268] = YnSelEndFrameTbl[field_0x0268]; + } + } + field_0x0314->setFrame(field_0x00f8[field_0x0268]); + field_0x00f0[field_0x0268]->getPanePtr()->animationTransform(); + bVar2 = false; + } + if (bVar1 == true && bVar2 == true) { + if (field_0x0269 != 0xff) { + field_0x00f0[field_0x0269]->getPanePtr()->setAnimation((J2DAnmTransform*)NULL); + } + if (field_0x0268 != 0xff) { + field_0x00f0[field_0x0268]->getPanePtr()->setAnimation((J2DAnmTransform*)NULL); + } + rv = true; + } + return rv; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dFile_select_c::yesnoSelectMoveAnm() { +asm bool dFile_select_c::yesnoSelectMoveAnm() { nofralloc #include "asm/d/file/d_file_select/yesnoSelectMoveAnm__14dFile_select_cFv.s" } #pragma pop +#endif /* ############################################################################################## */ /* 80453968-8045396C 001F68 0004+00 6/6 0/0 0/0 .sdata2 @6069 */ @@ -3576,6 +4079,22 @@ SECTION_SDATA2 static f32 lit_6071 = 3.0f / 50.0f; /* 8018912C-8018929C 183A6C 0170+00 9/9 0/0 0/0 .text yesnoCursorShow__14dFile_select_cFv */ +// Matches with literals +#ifdef NONMATCHING +void dFile_select_c::yesnoCursorShow() { + if (field_0x0268 == 0xff) { + return; + } + ((J2DTextBox*)field_0x01c0[field_0x0268]->getPanePtr())->setWhite(JUtility::TColor(0xff, 0xff, 0xff, 0xff)); + field_0x01a0[field_0x0268]->setAlpha(0xff); + field_0x01a8[field_0x0268]->setAlpha(0xff); + field_0x01b0[field_0x0268]->setAlpha(0xff); + Vec local_24 = field_0x00f0[field_0x0268]->getGlobalVtxCenter(0, 0); + mSelIcon->setPos(local_24.x, local_24.y, field_0x00f0[field_0x0268]->getPanePtr(), true); + mSelIcon->setAlphaRate(1.0f); + mSelIcon->setParam(0.96f, 0.84f, 0.06f, 0.5f, 0.5f); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -3584,8 +4103,40 @@ asm void dFile_select_c::yesnoCursorShow() { #include "asm/d/file/d_file_select/yesnoCursorShow__14dFile_select_cFv.s" } #pragma pop +#endif /* 8018929C-801893E4 183BDC 0148+00 1/0 0/0 0/0 .text YesNoSelect__14dFile_select_cFv */ +// Matches with literals +#ifdef NONMATCHING +void dFile_select_c::YesNoSelect() { + mStick->checkTrigger(); + if (mDoCPd_c::getTrigA(0) != 0) { + yesNoSelectStart(); + return; + } + + if (mDoCPd_c::getTrigB(0) != 0) { + yesnoCancelAnmSet(); + return; + } + + if (mStick->checkRightTrigger()) { + if (field_0x0268 != 0) { + mDoAud_seStart(Z2SE_SY_MENU_CURSOR_COMMON, 0, 0, 0); + field_0x0269 = field_0x0268; + field_0x0268 = 0; + yesnoSelectAnmSet(); + field_0x026f = 28; + } + } else if (mStick->checkLeftTrigger() && field_0x0268 != 1) { + mDoAud_seStart(Z2SE_SY_MENU_CURSOR_COMMON, 0, 0, 0); + field_0x0269 = field_0x0268; + field_0x0268 = 1; + yesnoSelectAnmSet(); + field_0x026f = 28; + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -3594,8 +4145,68 @@ asm void dFile_select_c::YesNoSelect() { #include "asm/d/file/d_file_select/YesNoSelect__14dFile_select_cFv.s" } #pragma pop +#endif /* 801893E4-8018978C 183D24 03A8+00 1/1 0/0 0/0 .text yesNoSelectStart__14dFile_select_cFv */ +// Matches with literals +#ifdef NONMATCHING +void dFile_select_c::yesNoSelectStart() { + if (field_0x0268 != 0) { + mDoAud_seStart(Z2SE_SY_CURSOR_OK, 0, 0, 0); + field_0x03b1 = 1; + switch(field_0x026e) { + case 1: + headerTxtSet(74, 0, 0); + mpFileWarning->openInit(); + field_0x014c[mSelectNum]->getPanePtr()->scale(1.0f, 1.0f); + field_0x014c[mSelectNum]->alphaAnimeStart(0); + field_0x014c[mSelectNum]->setAlpha(0); + menuMoveAnmInitSet(809, 799); + yesnoMenuMoveAnmInitSet(1149, 1139); + mSelIcon->setAlphaRate(0.0f); + field_0x01f4 = 0; + field_0x0204 = 0; + field_0x0208 = 1; + break; + case 2: + headerTxtSet(0x4a, 0, 0); + mpFileWarning->openInit(); + field_0x014c[mSelectNum]->getPanePtr()->scale(1.0f, 1.0f); + field_0x014c[mSelectNum]->alphaAnimeStart(0); + field_0x014c[mSelectNum]->setAlpha(0); + yesnoMenuMoveAnmInitSet(1149, 1139); + mSelIcon->setAlphaRate(0.0f); + field_0x01f4 = 0; + field_0x0204 = 0; + field_0x0208 = 1; + break; + case 0: + headerTxtSet(0x46, 0, 0); + mpFileWarning->openInit(); + field_0x0158[mSelectNum]->getPanePtr()->scale(1.0f, 1.0f); + field_0x0158[mSelectNum]->alphaAnimeStart(0); + field_0x0158[mSelectNum]->setAlpha(0); + field_0x0158[field_0x026d]->getPanePtr()->scale(1.0f, 1.0f); + field_0x0158[field_0x026d]->alphaAnimeStart(0); + field_0x0158[field_0x026d]->setAlpha(0); + yesnoMenuMoveAnmInitSet(1149, 1139); + mSelIcon->setAlphaRate(0.0f); + mSelIcon2->setAlphaRate(0.0f); + selectWakuAlpahAnmInit(field_0x026d, 0, 0xff, g_fsHIO.field_0x0008); + copySelMoveAnmInitSet(0xd29, 0xd1f); + field_0x01fc = 0; + field_0x0204 = 0; + field_0x0209 = 1; + break; + } + modoruTxtDispAnmInit(0); + ketteiTxtDispAnmInit(0); + field_0x026f = 29; + } else { + yesnoCancelAnmSet(); + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -3604,8 +4215,28 @@ asm void dFile_select_c::yesNoSelectStart() { #include "asm/d/file/d_file_select/yesNoSelectStart__14dFile_select_cFv.s" } #pragma pop +#endif /* 8018978C-80189904 1840CC 0178+00 3/3 0/0 0/0 .text yesnoSelectAnmSet__14dFile_select_cFv */ +// Matches with literals +#ifdef NONMATCHING +void dFile_select_c::yesnoSelectAnmSet() { + if (field_0x0269 != 0xff) { + yesnoWakuAlpahAnmInit(field_0x0269, 0xff, 0, g_fsHIO.field_0x0008); + field_0x00f0[field_0x0269]->getPanePtr()->setAnimation(field_0x0310); + field_0x00f8[field_0x0269] = YnSelEndFrameTbl[field_0x0269]; + field_0x0310->setFrame(field_0x00f8[field_0x0269]); + field_0x00f0[field_0x0269]->getPanePtr()->animationTransform(); + mSelIcon->setAlphaRate(0.0f); + } + if (field_0x0268 != 0xff) { + field_0x00f0[field_0x0268]->getPanePtr()->setAnimation(field_0x0314); + field_0x00f8[field_0x0268] = YnSelStartFrameTbl[field_0x0268]; + field_0x0314->setFrame(field_0x00f8[field_0x0268]); + field_0x00f0[field_0x0268]->getPanePtr()->animationTransform(); + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -3614,8 +4245,30 @@ asm void dFile_select_c::yesnoSelectAnmSet() { #include "asm/d/file/d_file_select/yesnoSelectAnmSet__14dFile_select_cFv.s" } #pragma pop +#endif /* 80189904-80189A24 184244 0120+00 2/2 0/0 0/0 .text yesnoCancelAnmSet__14dFile_select_cFv */ +// Matches with literals +#ifdef NONMATCHING +void dFile_select_c::yesnoCancelAnmSet() { + mDoAud_seStart(Z2SE_SY_CURSOR_CANCEL, 0, 0, 0); + mSelIcon->setAlphaRate(0.0f); + switch (field_0x026e) { + case 1: + headerTxtSet(msgTbl[mSelectNum], 1, 0); + break; + case 2: + headerTxtSet(67, 1, 0); + selectDataMoveAnmInitSet(SelOpenEndFrameTbl[mSelectNum], SelOpenStartFrameTbl[mSelectNum]); + break; + case 0: + headerTxtSet(68, 0, 0); + break; + } + yesnoMenuMoveAnmInitSet(1149, 1139); + field_0x026f = 27; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -3624,9 +4277,52 @@ asm void dFile_select_c::yesnoCancelAnmSet() { #include "asm/d/file/d_file_select/yesnoCancelAnmSet__14dFile_select_cFv.s" } #pragma pop +#endif /* 80189A24-80189BA8 184364 0184+00 1/0 0/0 0/0 .text YesNoCancelMove__14dFile_select_cFv */ +// Matches with literals +#ifdef NONMATCHING +void dFile_select_c::YesNoCancelMove() { + bool txtChanged = headerTxtChangeAnm(); + bool moveAnimated = yesnoMenuMoveAnm(); + bool selectMoveAnimated; + switch (field_0x026e) { + case 1: + selectMoveAnimated = true; + break; + case 2: + selectMoveAnimated = selectDataMoveAnm(); + break; + case 0: + selectMoveAnimated = true; + break; + } + if (txtChanged == true && moveAnimated == true && selectMoveAnimated == true) { + switch (field_0x026e) { + case 1: + if (mSelectMenuNum != 0xff) { + Vec vtxCenter; + vtxCenter = field_0x0340[mSelectMenuNum]->getGlobalVtxCenter(false, 0); + mSelIcon->setPos(vtxCenter.x, vtxCenter.y, field_0x0340[mSelectMenuNum]->getPanePtr(), + true); + mSelIcon->setAlphaRate(1.0f); + mSelIcon->setParam(0.96f, 0.84f, 0.06f, 0.5f, 0.5f); + } + field_0x026f = 8; + break; + case 2: + selFileCursorShow(); + field_0x026f = 3; + break; + case 0: + mSelIcon2->setAlphaRate(1.0f); + field_0x026f = 22; + break; + } + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -3635,28 +4331,88 @@ asm void dFile_select_c::YesNoCancelMove() { #include "asm/d/file/d_file_select/YesNoCancelMove__14dFile_select_cFv.s" } #pragma pop +#endif /* 80189BA8-80189C14 1844E8 006C+00 1/0 0/0 0/0 .text yesNoCursorMoveAnm__14dFile_select_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dFile_select_c::yesNoCursorMoveAnm() { - nofralloc -#include "asm/d/file/d_file_select/yesNoCursorMoveAnm__14dFile_select_cFv.s" +void dFile_select_c::yesNoCursorMoveAnm() { + bool moveAnimated = yesnoSelectMoveAnm(); + bool wakuAnimated = yesnoWakuAlpahAnm(field_0x0269); + if (moveAnimated == true && wakuAnimated == true) { + yesnoCursorShow(); + field_0x026f = 26; + } } -#pragma pop /* 80189C14-80189E28 184554 0214+00 1/0 0/0 0/0 .text CmdExecPaneMove0__14dFile_select_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dFile_select_c::CmdExecPaneMove0() { - nofralloc -#include "asm/d/file/d_file_select/CmdExecPaneMove0__14dFile_select_cFv.s" +void dFile_select_c::CmdExecPaneMove0() { + int txtChanged = headerTxtChangeAnm(); + int unaff_r29; + int unaff_r28; + int unaff_r30; + int unaff_r27; + int nameMoved; + switch (field_0x026e) { + case 1: + unaff_r29 = field_0x014c[mSelectNum]->alphaAnime(g_fsHIO.field_0x0009, 0, 0xff, 0); + unaff_r28 = yesnoMenuMoveAnm(); + unaff_r30 = menuMoveAnm(); + unaff_r27 = true; + nameMoved = true; + break; + case 2: + unaff_r29 = field_0x014c[mSelectNum]->alphaAnime(g_fsHIO.field_0x0009, 0, 0xff, 0); + unaff_r28 = true; + unaff_r30 = yesnoMenuMoveAnm(); + unaff_r27 = true; + nameMoved = true; + break; + case 0: + unaff_r29 = field_0x0158[field_0x026d]->alphaAnime(g_fsHIO.field_0x0009, 0, 0xff, 0); + unaff_r28 = field_0x0158[mSelectNum]->alphaAnime(g_fsHIO.field_0x0009, 0, 0xff, 0); + if (field_0x0108) { + unaff_r30 = yesnoMenuMoveAnm(); + } else { + unaff_r30 = true; + } + unaff_r27 = selectWakuAlpahAnm(field_0x026d); + nameMoved = nameMoveAnm(); + break; + } + int modoruTxt = modoruTxtDispAnm(); + int kettaiTxt = ketteiTxtDispAnm(); + int warningStatus = mpFileWarning->getStatus() != 0; + if (txtChanged == true && unaff_r29 == true && unaff_r28 == true && unaff_r30 == true && + unaff_r27 == true && nameMoved == true && modoruTxt == true && kettaiTxt == true && warningStatus == true) + { + field_0x026f = 30; + } } -#pragma pop /* 80189E28-80189F68 184768 0140+00 1/0 0/0 0/0 .text CommandExec__14dFile_select_cFv */ +// Matches with literals +#ifdef NONMATCHING +void dFile_select_c::CommandExec() { + switch (field_0x026e) { + case 1: + case 2: + mDoAud_seStartLevel(Z2SE_SY_FILE_DELETE_LEVEL, 0, 0, 0); + dComIfGs_setInitDataToCard((u8*)mSave, mSelectNum); + mDoMemCdRWm_SetCheckSumGameData((u8*)mSave, mSelectNum); + dataSave(); + field_0x026f = 31; + break; + case 0: + mDoAud_seStartLevel(Z2SE_SY_FILE_COPY_LEVEL, 0, 0, 0); + memcpy(&mSave[field_0x026d], &mSave[field_0x026a], sizeof(SaveData)); + mDoMemCdRWm_SetCheckSumGameData((u8*)mSave, field_0x026d); + mDoMemCd_setCopyToPos(field_0x026d); + dataSave(); + field_0x026f = 33; + break; + } + field_0x03ac = g_fsHIO.field_0x000c; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -3665,9 +4421,23 @@ asm void dFile_select_c::CommandExec() { #include "asm/d/file/d_file_select/CommandExec__14dFile_select_cFv.s" } #pragma pop +#endif /* 80189F68-80189FFC 1848A8 0094+00 1/0 0/0 0/0 .text DataEraseWait__14dFile_select_cFv */ +// Matches with literals +#ifdef NONMATCHING +void dFile_select_c::DataEraseWait() { + if (field_0x03ac != 0) { + field_0x03ac--; + } + mDoAud_seStartLevel(Z2SE_SY_FILE_DELETE_LEVEL, 0, 0, 0); + field_0x03b4 = mDoMemCd_SaveSync(); + if (field_0x03b4 != 0) { + field_0x026f = 32; + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -3676,9 +4446,34 @@ asm void dFile_select_c::DataEraseWait() { #include "asm/d/file/d_file_select/DataEraseWait__14dFile_select_cFv.s" } #pragma pop +#endif /* 80189FFC-8018A194 18493C 0198+00 1/0 0/0 0/0 .text DataEraseWait2__14dFile_select_cFv */ +// Matches with literals +#ifdef NONMATCHING +void dFile_select_c::DataEraseWait2() { + if (field_0x03ac != 0) { + mDoAud_seStartLevel(Z2SE_SY_FILE_DELETE_LEVEL, 0, 0, 0); + field_0x03ac--; + } else if (field_0x03b4 == 2) { + mDoAud_seStart(Z2SE_SY_FILE_ERROR, 0, 0, 0); + headerTxtSet(76, 0, 0); + mpFileWarning->closeInit(); + modoruTxtDispAnmInit(1); + ketteiTxtDispAnmInit(1); + field_0x014c[mSelectNum]->alphaAnimeStart(0); + field_0x026f = 39; + } else if (field_0x03b4 == 1) { + mDoAud_seStart(Z2SE_SY_FILE_DELETE_OK, 0, 0, 0); + field_0x03b1 = 0; + field_0x014c[mSelectNum]->alphaAnimeStart(0); + field_0x022c[mSelectNum]->alphaAnimeStart(0); + field_0x0220[mSelectNum]->alphaAnimeStart(0); + field_0x026f = 37; + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -3687,50 +4482,84 @@ asm void dFile_select_c::DataEraseWait2() { #include "asm/d/file/d_file_select/DataEraseWait2__14dFile_select_cFv.s" } #pragma pop +#endif /* 8018A194-8018A2DC 184AD4 0148+00 1/0 0/0 0/0 .text ErasePaneMoveOk__14dFile_select_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dFile_select_c::ErasePaneMoveOk() { - nofralloc -#include "asm/d/file/d_file_select/ErasePaneMoveOk__14dFile_select_cFv.s" +void dFile_select_c::ErasePaneMoveOk() { + int iVar1 = field_0x014c[mSelectNum]->alphaAnime(g_fsHIO.field_0x0009, 0xff, 0, 0); + int iVar2; + if (field_0x025b[mSelectNum] != 0) { + iVar2 = field_0x022c[mSelectNum]->alphaAnime(g_fsHIO.field_0x0009, 0xff, 0, 0); + } else { + iVar2 = field_0x0220[mSelectNum]->alphaAnime(g_fsHIO.field_0x0009, 0xff, 0, 0); + } + if (iVar1 == 1 && iVar2 == 1) { + field_0x0208 = 0; + setSaveData(); + makeRecInfo(mSelectNum); + headerTxtSet(0x4b, 0, 0); + mpFileWarning->closeInit(); + field_0x022c[mSelectNum]->alphaAnimeStart(0); + selectWakuAlpahAnmInit(mSelectNum, 0, 0xff, g_fsHIO.field_0x0007); + field_0x026f = 38; + } } -#pragma pop /* 8018A2DC-8018A3B0 184C1C 00D4+00 1/0 0/0 0/0 .text ErasePaneMoveOk2__14dFile_select_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dFile_select_c::ErasePaneMoveOk2() { - nofralloc -#include "asm/d/file/d_file_select/ErasePaneMoveOk2__14dFile_select_cFv.s" +void dFile_select_c::ErasePaneMoveOk2() { + bool txtChanged = headerTxtChangeAnm(); + bool iVar2 = + field_0x022c[mSelectNum]->alphaAnime( + g_fsHIO.field_0x0007, 0, 0xff, 0); + bool wakuAnm = selectWakuAlpahAnm(mSelectNum); + bool warningStatus = mpFileWarning->getStatus(); + if (txtChanged == true && iVar2 == true && wakuAnm == true && warningStatus == true) { + field_0x03ac = g_fsHIO.field_0x000a; + mSelectMenuNum = 0; + field_0x026f = 40; + } } -#pragma pop /* 8018A3B0-8018A444 184CF0 0094+00 1/0 0/0 0/0 .text eraseEndBackSelectWait__14dFile_select_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dFile_select_c::eraseEndBackSelectWait() { - nofralloc -#include "asm/d/file/d_file_select/eraseEndBackSelectWait__14dFile_select_cFv.s" +void dFile_select_c::eraseEndBackSelectWait() { + if (field_0x03ac != 0) { + field_0x03ac--; + } else if (field_0x03ac == 0) { + selectDataMoveAnmInitSet(SelOpenEndFrameTbl[mSelectNum], SelOpenStartFrameTbl[mSelectNum]); + headerTxtSet(67, 1, 0); + ketteiTxtDispAnmInit(1); + field_0x026f = 41; + } } -#pragma pop /* 8018A444-8018A4D0 184D84 008C+00 1/0 0/0 0/0 .text eraseEndBackSelect__14dFile_select_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dFile_select_c::eraseEndBackSelect() { - nofralloc -#include "asm/d/file/d_file_select/eraseEndBackSelect__14dFile_select_cFv.s" +void dFile_select_c::eraseEndBackSelect() { + bool txtChanged = headerTxtChangeAnm(); + bool dataMoved = selectDataMoveAnm(); + bool ketteiTxtAnm = ketteiTxtDispAnm(); + if (txtChanged == true && dataMoved == true && ketteiTxtAnm == true) { + selFileCursorShow(); + mpFileSelect3d->drawOff(); + field_0x026f = 3; + } } -#pragma pop /* 8018A4D0-8018A564 184E10 0094+00 1/0 0/0 0/0 .text DataCopyWait__14dFile_select_cFv */ +// Matches with literals +#ifdef NONMATCHING +void dFile_select_c::DataCopyWait() { + if (field_0x03ac != 0) { + field_0x03ac--; + } + mDoAud_seStartLevel(Z2SE_SY_FILE_COPY_LEVEL, 0, 0, 0); + field_0x03b4 = mDoMemCd_SaveSync(); + if (field_0x03b4 != 0) { + field_0x026f = 34; + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -3739,9 +4568,37 @@ asm void dFile_select_c::DataCopyWait() { #include "asm/d/file/d_file_select/DataCopyWait__14dFile_select_cFv.s" } #pragma pop +#endif /* 8018A564-8018A6F8 184EA4 0194+00 1/0 0/0 0/0 .text DataCopyWait2__14dFile_select_cFv */ +// Matches with literals +#ifdef NONMATCHING +void dFile_select_c::DataCopyWait2() { + if (field_0x03ac != 0) { + mDoAud_seStartLevel(Z2SE_SY_FILE_COPY_LEVEL, 0, 0, 0); + field_0x03ac--; + } else { + if (field_0x03b4 == 2) { + mDoAud_seStart(Z2SE_SY_FILE_ERROR, 0, 0, 0); + headerTxtSet(0x48, 0, 0); + mpFileWarning->closeInit(); + modoruTxtDispAnmInit(1); + ketteiTxtDispAnmInit(1); + field_0x026f = 39; + } else if (field_0x03b4 == 1) { + mDoAud_seStart(Z2SE_SY_FILE_COPY_OK, 0, 0, 0); + field_0x03b1 = 0; + field_0x0158[mSelectNum]->alphaAnimeStart(0); + field_0x0158[field_0x026d]->alphaAnimeStart(0); + field_0x022c[field_0x026d]->alphaAnimeStart(0); + field_0x0220[field_0x026d]->alphaAnimeStart(0); + field_0x026f = 35; + } + + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -3750,40 +4607,103 @@ asm void dFile_select_c::DataCopyWait2() { #include "asm/d/file/d_file_select/DataCopyWait2__14dFile_select_cFv.s" } #pragma pop +#endif /* 8018A6F8-8018A868 185038 0170+00 1/0 0/0 0/0 .text copyPaneMoveOk__14dFile_select_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dFile_select_c::copyPaneMoveOk() { - nofralloc -#include "asm/d/file/d_file_select/copyPaneMoveOk__14dFile_select_cFv.s" +void dFile_select_c::copyPaneMoveOk() { + bool iVar1 = field_0x0158[field_0x026d]->alphaAnime(g_fsHIO.field_0x0009, 0xff, 0, 0); + bool iVar2 = field_0x0158[mSelectNum]->alphaAnime(g_fsHIO.field_0x0009, 0xff, 0, 0); + bool iVar3; + if (field_0x025b[field_0x026d] != 0 || mDataNew[field_0x026d] != 0) { + iVar3 = field_0x022c[field_0x026d]->alphaAnime(g_fsHIO.field_0x0009, 0xff, 0, 0); + } else { + iVar3 = field_0x0220[field_0x026d]->alphaAnime(g_fsHIO.field_0x0009, 0xff, 0, 0); + } + if (iVar1 == true && iVar2 == true && iVar3 == true) { + field_0x0209 = 0; + headerTxtSet(71, 0, 0); + mpFileWarning->closeInit(); + setSaveData(); + field_0x022c[field_0x026d]->alphaAnimeStart(0); + field_0x0220[field_0x026d]->alphaAnimeStart(0); + field_0x026f = 36; + } } -#pragma pop /* 8018A868-8018A960 1851A8 00F8+00 1/0 0/0 0/0 .text copyPaneMoveOk2__14dFile_select_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dFile_select_c::copyPaneMoveOk2() { - nofralloc -#include "asm/d/file/d_file_select/copyPaneMoveOk2__14dFile_select_cFv.s" +void dFile_select_c::copyPaneMoveOk2() { + bool iVar1 = headerTxtChangeAnm(); + bool iVar2; + if (field_0x025b[field_0x026d] != 0 || mDataNew[field_0x026d] != 0) { + iVar2 = field_0x022c[field_0x026d]->alphaAnime(g_fsHIO.field_0x0007, 0, 0xff, 0); + } else { + iVar2 = field_0x0220[field_0x026d]->alphaAnime(g_fsHIO.field_0x0007, 0, 0xff, 0); + } + bool iVar3 = mpFileWarning->getStatus(); + if (iVar1 == true && iVar2 == true && iVar3 == true) { + field_0x03ac = g_fsHIO.field_0x000a; + field_0x026f = 42; + } } -#pragma pop /* 8018A960-8018AAC4 1852A0 0164+00 1/0 0/0 0/0 .text ErrorMsgPaneMove__14dFile_select_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dFile_select_c::ErrorMsgPaneMove() { - nofralloc -#include "asm/d/file/d_file_select/ErrorMsgPaneMove__14dFile_select_cFv.s" +void dFile_select_c::ErrorMsgPaneMove() { + int txtChanged = headerTxtChangeAnm(); + int unaff_r30; + int unaff_r29; + switch (field_0x026e) { + case 1: + case 2: + unaff_r30 = field_0x014c[mSelectNum]->alphaAnime(g_fsHIO.field_0x0009, 0xff, 0, 0); + unaff_r29 = 1; + break; + + case 0: + unaff_r30 = field_0x0158[field_0x026d]->alphaAnime(g_fsHIO.field_0x0009, 0xff, 0, 0); + unaff_r29 = field_0x0158[mSelectNum]->alphaAnime(g_fsHIO.field_0x0009, 0xff, 0, 0); + break; + } + int modoruTxtAnm = modoruTxtDispAnm(); + int ketteiTxtAnm = ketteiTxtDispAnm(); + int warningStatus = mpFileWarning->getStatus() != 0; + if (txtChanged == 1 && unaff_r30 == 1 && unaff_r29 == 1 && modoruTxtAnm == 1 && ketteiTxtAnm == 1 && + warningStatus == 1) + { + field_0x0208 = 0; + field_0x0209 = 0; + field_0x03b1 = 0; + field_0x03ac = g_fsHIO.field_0x000a; + field_0x026f = 43; + } } -#pragma pop /* 8018AAC4-8018AC3C 185404 0178+00 1/0 0/0 0/0 .text backDatSelPaneMove__14dFile_select_cFv */ +// Matches with literals +#ifdef NONMATCHING +void dFile_select_c::backDatSelPaneMove() { + int headerTxtAnm = headerTxtChangeAnm(); + int menuMoved = menuMoveAnm(); + int selectDataMoved = selectDataMoveAnm(); + int wakuAlpha1 = selectWakuAlpahAnm(mSelectNum); + int wakuAlpha2 = selectWakuAlpahAnm(field_0x026d); + int modoruTxtAnm = modoruTxtDispAnm(); + int ketteiTxtAnm = ketteiTxtDispAnm(); + if (headerTxtAnm == 1 && menuMoved == 1 && selectDataMoved == 1 && wakuAlpha1 == 1 && + wakuAlpha2 == 1 && modoruTxtAnm == 1 && ketteiTxtAnm == 1) + { + if (mSelectMenuNum != 0xff) { + field_0x0340[mSelectMenuNum]->getPanePtr()->setAnimation(field_0x0328); + field_0x0328->setFrame(MenuSelStartFrameTbl[mSelectMenuNum]); + field_0x0340[mSelectMenuNum]->getPanePtr()->animationTransform(); + field_0x0340[mSelectMenuNum]->getPanePtr()->setAnimation((J2DAnmTransform*)NULL); + menuCursorShow(); + } + field_0x026f = 8; + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -3792,28 +4712,36 @@ asm void dFile_select_c::backDatSelPaneMove() { #include "asm/d/file/d_file_select/backDatSelPaneMove__14dFile_select_cFv.s" } #pragma pop +#endif /* 8018AC3C-8018AD38 18557C 00FC+00 1/0 0/0 0/0 .text backDatSelWait__14dFile_select_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dFile_select_c::backDatSelWait() { - nofralloc -#include "asm/d/file/d_file_select/backDatSelWait__14dFile_select_cFv.s" +void dFile_select_c::backDatSelWait() { + if (field_0x03ac != 0) { + field_0x03ac--; + } else if (field_0x03ac == 0) { + headerTxtSet(msgTbl[mSelectNum], 1, 0); + selectWakuAlpahAnmInit(field_0x026d, 0xff, 0, g_fsHIO.field_0x0008); + selectWakuAlpahAnmInit(mSelectNum, 0xff, 0, g_fsHIO.field_0x0008); + menuMoveAnmInitSet(799, 809); + selectDataMoveAnmInitSet(SelOpenStartFrameTbl[mSelectNum], SelOpenEndFrameTbl[mSelectNum]); + modoruTxtDispAnmInit(1); + ketteiTxtDispAnmInit(1); + field_0x026f = 44; + } } -#pragma pop /* 8018AD38-8018AD9C 185678 0064+00 1/0 0/0 0/0 .text backDatSelWait2__14dFile_select_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dFile_select_c::backDatSelWait2() { - nofralloc -#include "asm/d/file/d_file_select/backDatSelWait2__14dFile_select_cFv.s" +void dFile_select_c::backDatSelWait2() { + if (field_0x03ac != 0) { + field_0x03ac--; + } + if (cAPICPad_ANY_BUTTON(0) != 0 || field_0x03ac == 0) { + field_0x026f = 0; + field_0x0271 = 0; + } } -#pragma pop /* 8018AD9C-8018ADA0 1856DC 0004+00 1/0 0/0 0/0 .text nextModeWait__14dFile_select_cFv */ void dFile_select_c::nextModeWait() { @@ -3864,6 +4792,188 @@ SECTION_SDATA2 static f32 lit_6879 = 608.0f; SECTION_SDATA2 static f32 lit_6880 = 448.0f; /* 8018ADA0-8018BEE0 1856E0 1140+00 1/1 0/0 0/0 .text screenSet__14dFile_select_cFv */ +// Matches with literals +#ifdef NONMATCHING +void dFile_select_c::screenSet() { + fileSel.Scr = new J2DScreen(); + JUT_ASSERT(4917, fileSel.Scr != 0); + fileSel.Scr->setPriority("zelda_file_select.blo", 0x1100000, mpArchive); + dPaneClass_showNullPane(fileSel.Scr); + void* uVar14 = JKRGetNameResource("zelda_file_select.bck", mpArchive); + field_0x0084 = (J2DAnmTransform*)J2DAnmLoaderDataBase::load(uVar14); + field_0x0088 = (J2DAnmTransform*)J2DAnmLoaderDataBase::load(uVar14); + field_0x0090 = (J2DAnmTransform*)J2DAnmLoaderDataBase::load(uVar14); + field_0x0094 = (J2DAnmTransform*)J2DAnmLoaderDataBase::load(uVar14); + field_0x0098 = (J2DAnmTransform*)J2DAnmLoaderDataBase::load(uVar14); + field_0x009c = (J2DAnmTransform*)J2DAnmLoaderDataBase::load(uVar14); + field_0x0084->searchUpdateMaterialID(fileSel.Scr); + field_0x0088->searchUpdateMaterialID(fileSel.Scr); + field_0x0090->searchUpdateMaterialID(fileSel.Scr); + field_0x009c->searchUpdateMaterialID(fileSel.Scr); + field_0x00a4 = new CPaneMgr(fileSel.Scr, 'w_move_n', 0, NULL); + mpPane = fileSel.Scr->search('w_sub_n'); + for (int i = 0; i < 3; i++) { + field_0x00bc[i] = new CPaneMgr(fileSel.Scr, l_tagName0[i], 1, NULL); + } + fileSel.Scr->search('Wi_btn_n')->hide(); + field_0x0238 = new CPaneMgrAlpha(fileSel.Scr, 'w_n_bbtn', 2, NULL); + field_0x023c = new CPaneMgrAlpha(fileSel.Scr, 'w_n_abtn', 2, NULL); + field_0x0240 = new CPaneMgrAlpha(fileSel.Scr, 'f_modo', 2, NULL); + field_0x0244 = new CPaneMgrAlpha(fileSel.Scr, 'f_kete', 2, NULL); + fileSel.Scr->search('w_modo')->hide(); + fileSel.Scr->search('w_kete')->hide(); + ((J2DTextBox*)field_0x0240->getPanePtr())->setFont(mpMessageFont); + ((J2DTextBox*)field_0x0244->getPanePtr())->setFont(mpMessageFont); + ((J2DTextBox*)field_0x0240->getPanePtr())->setString(32, ""); + field_0x0250 = ((J2DTextBox*)field_0x0240->getPanePtr())->getStringPtr(); + fopMsgM_messageGet(field_0x0250, 0x54); + field_0x024c = 0; + char acStack_38[32]; + fopMsgM_messageGet(acStack_38, 0x55); + ((J2DTextBox*)field_0x0244->getPanePtr())->setString(acStack_38); + void* bpk = JKRGetNameResource("zelda_file_select.bpk", mpArchive); + JUT_ASSERT(4994, bpk != 0); + field_0x01c8 = (J2DAnmColor*)J2DAnmLoaderDataBase::load(bpk); + field_0x01c8->searchUpdateMaterialID(fileSel.Scr); + field_0x01cc = 0; + void* btk = JKRGetNameResource("zelda_file_select_05.btk", mpArchive); + JUT_ASSERT(5004, btk != 0); + field_0x01d0 = (J2DAnmTextureSRTKey*)J2DAnmLoaderDataBase::load(btk); + field_0x01d0->searchUpdateMaterialID(fileSel.Scr); + field_0x01d4 = 0; + for (int i = 0; i < 3; i++) { + field_0x0164[i] = new CPaneMgr(fileSel.Scr, l_tagName3[i], 0, NULL); + field_0x0170[i] = new CPaneMgr(fileSel.Scr, l_tagName4[i], 0, NULL); + field_0x017c[i] = new CPaneMgr(fileSel.Scr, l_tagName5[i], 0, NULL); + field_0x0164[i]->getPanePtr()->setAnimation(field_0x01c8); + field_0x0170[i]->getPanePtr()->setAnimation(field_0x01c8); + field_0x017c[i]->getPanePtr()->setAnimation(field_0x01c8); + field_0x0170[i]->getPanePtr()->setAnimation(field_0x01d0); + field_0x017c[i]->getPanePtr()->setAnimation(field_0x01d0); + } + field_0x01d8 = (J2DAnmColor*)J2DAnmLoaderDataBase::load(bpk); + field_0x01d8->searchUpdateMaterialID(fileSel.Scr); + btk = JKRGetNameResource("zelda_file_select.btk", mpArchive); + JUT_ASSERT(5039, btk != 0); + field_0x01e0 = (J2DAnmTextureSRTKey*)J2DAnmLoaderDataBase::load(btk); + field_0x01e0->searchUpdateMaterialID(fileSel.Scr); + void* brk = JKRGetNameResource("zelda_file_select.brk", mpArchive); + JUT_ASSERT(5048, brk != 0); + field_0x01e8 = (J2DAnmTevRegKey*)J2DAnmLoaderDataBase::load(brk); + field_0x0200 = (J2DAnmTevRegKey*)J2DAnmLoaderDataBase::load(brk); + field_0x01e8->searchUpdateMaterialID(fileSel.Scr); + field_0x0200->searchUpdateMaterialID(fileSel.Scr); + field_0x01dc = 0; + field_0x01e4 = 0; + field_0x01ec = 0; + for (int i = 0; i < 3; i++) { + field_0x0188[i] = new CPaneMgr(fileSel.Scr, l_tagName12[i], 0, NULL); + field_0x0188[i]->getPanePtr()->setAnimation(field_0x01d8); + field_0x0188[i]->getPanePtr()->setAnimation(field_0x01e0); + field_0x0188[i]->getPanePtr()->setAnimation(field_0x01e8); + } + for (int i = 0; i < 15; i++) { + fileSel.Scr->search(l_nouseTag[i])->hide(); + } + fileSel.Scr->search('w_tabi_s')->hide(); + fileSel.Scr->search('w_tabi_x')->hide(); + fileSel.Scr->search('w_mgn1')->hide(); + fileSel.Scr->search('w_mgn2')->hide(); + for (int i = 0; i < 2; i++) { + field_0x020c[i] = new CPaneMgrAlpha(fileSel.Scr, l_tagName21[i], 0, NULL); + ((J2DTextBox*)field_0x020c[i]->getPanePtr())->setFont(mpMessageFont); + ((J2DTextBox*)field_0x020c[i]->getPanePtr())->setString(512, ""); + ((J2DTextBox*)field_0x020c[i]->getPanePtr())->setFontSize(24.0f, 24.0f); + ((J2DTextBox*)field_0x020c[i]->getPanePtr())->setLineSpace(20.0f); + ((J2DTextBox*)field_0x020c[i]->getPanePtr())->setCharSpace(0.0f); + field_0x0214[i] = ((J2DTextBox*)field_0x020c[i]->getPanePtr())->getStringPtr(); + } + field_0x020c[0]->setAlpha(0xff); + field_0x020c[1]->setAlpha(0); + field_0x021c = 0; + bpk = JKRGetNameResource("zelda_file_select_02.btk", mpArchive); + JUT_ASSERT(5124, bpk != 0); + field_0x01f8 = (J2DAnmTextureSRTKey*)J2DAnmLoaderDataBase::load(bpk); + field_0x01f8->searchUpdateMaterialID(fileSel.Scr); + bpk = JKRGetNameResource("zelda_file_select_03.btk", mpArchive); + JUT_ASSERT(5133, bpk != 0); + field_0x01f0 = (J2DAnmTextureSRTKey*)J2DAnmLoaderDataBase::load(bpk); + field_0x01f0->searchUpdateMaterialID(fileSel.Scr); + field_0x01f4 = 0; + field_0x01fc = 0; + field_0x0204 = 0; + for (int i = 0; i < 3; i++) { + field_0x014c[i] = new CPaneMgrAlpha(fileSel.Scr, l_tagName18[i], 0, NULL); + field_0x0158[i] = new CPaneMgrAlpha(fileSel.Scr, l_tagName19[i], 0, NULL); + field_0x014c[i]->getPanePtr()->setAnimation(field_0x01f0); + field_0x014c[i]->getPanePtr()->setAnimation(field_0x0200); + field_0x0158[i]->getPanePtr()->setAnimation(field_0x01f8); + field_0x0158[i]->getPanePtr()->setAnimation(field_0x0200); + } + field_0x0208 = 0; + field_0x0209 = 0; + field_0x012c = fileSel.Scr->search('w_er_n'); + fileSel.Scr->search('w_er_msg')->hide(); + fileSel.Scr->search('w_er_msR')->hide(); + fileSel.Scr->search('w_er_msE')->hide(); + for (int i = 0; i < 2; i++) { + field_0x0138[i] = new CPaneMgrAlpha(fileSel.Scr, l_tagName20[i], 0, NULL); + ((J2DTextBox*)field_0x0138[i]->getPanePtr())->setFont(mpMessageFont); + ((J2DTextBox*)field_0x0138[i]->getPanePtr())->setString(512, ""); + field_0x0138[i]->getPanePtr()->resize(440.0f, 198.0f); + ((J2DTextBox*)field_0x0138[i]->getPanePtr())->setFontSize(21.0f, 21.0f); + ((J2DTextBox*)field_0x0138[i]->getPanePtr())->setLineSpace(21.0f); + ((J2DTextBox*)field_0x0138[i]->getPanePtr())->setCharSpace(1.0f); + field_0x0140[i] = ((J2DTextBox*)field_0x0138[i]->getPanePtr())->getStringPtr(); + field_0x0138[i]->show(); + } + field_0x0148 = 0; + field_0x0138[field_0x0148]->setAlpha(0xff); + field_0x0138[field_0x0148 ^ 1]->setAlpha(0); + mSelIcon = new dSelect_cursor_c(0, 1.0f, NULL); + JUT_ASSERT(5209, mSelIcon != 0); + mSelIcon->setParam(0.96f, 0.94f, 0.03f, 0.7f, 0.7f); + Vec vtxCenter; + vtxCenter = field_0x00bc[mSelectNum]->getGlobalVtxCenter(false, 0); + mSelIcon->setPos(vtxCenter.x, vtxCenter.y, field_0x00bc[mSelectNum]->getPanePtr(), true); + mSelIcon->setAlphaRate(0.0f); + J2DPane* piVar5 = fileSel.Scr->search('Nm_02'); + piVar5->setAnimation(field_0x0084); + setWakuAnm(); + field_0x00a0 = 1; + field_0x0084->setFrame(field_0x00a0); + piVar5->animationTransform(); + piVar5->setAnimation((J2DAnmTransform*)NULL); + field_0x020c[0]->getPanePtr()->scale(1.0f, 1.0f); + field_0x020c[1]->getPanePtr()->scale(1.0f, 1.0f); + J2DPane* apJStack_54[3]; + for (int i = 0; i < 3; i++) { + apJStack_54[i] = new J2DPane(l_tagName13[i], JGeometry::TBox2(238.0f, 43.0f, 712.0f, 130.0f)); + apJStack_54[i]->setUserInfo('n_43'); + field_0x00bc[i]->getPanePtr()->insertChild(fileSel.Scr->search(l_tagName131[i]), apJStack_54[i]); + } + for (int i = 0; i < 3; i++) { + field_0x0070[i] = new dFile_info_c(mpArchive, 0); + field_0x0070[i]->setBasePane(apJStack_54[i]); + field_0x0220[i] = field_0x0070[i]->getDatBase(); + field_0x022c[i] = field_0x0070[i]->getNoDatBase(); + } + + field_0x011c = fileSel.Scr->search('name_n'); + mpName = new dName_c(field_0x011c); + field_0x0128 = false; + mpFileWarning = new dFile_warning_c(mpArchive, 0); + mSelDt.mpPane = fileSel.Scr->search('w_moyo03'); + JUtility::TColor black = mDoGph_gInf_c::getFadeColor(); + JUtility::TColor white = mDoGph_gInf_c::getFadeColor(); + black.a = 0; + white.a = 0xff; + ResTIMG* uVar20 = (ResTIMG*)dComIfGp_getMain2DArchive()->getResource('TIMG', "tt_block8x8.bti"); + field_0x2378 = new J2DPicture('PICT01', JGeometry::TBox2(0.0f, 608.0f, 0.0f, 448.0f), uVar20, NULL); + field_0x2378->setBlackWhite(black, white); + field_0x2378->setAlpha(0); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -3872,6 +4982,7 @@ asm void dFile_select_c::screenSet() { #include "asm/d/file/d_file_select/screenSet__14dFile_select_cFv.s" } #pragma pop +#endif /* 8018BEE0-8018BF28 186820 0048+00 0/0 1/0 0/0 .text * setBlackWhite__10J2DPictureFQ28JUtility6TColorQ28JUtility6TColor */ @@ -3893,6 +5004,80 @@ extern "C" void setAnimation__7J2DPaneFP19J2DAnmTextureSRTKey() { } /* 8018BF2C-8018C524 18686C 05F8+00 1/1 0/0 0/0 .text screenSetCopySel__14dFile_select_cFv */ +// Matches with literals +#ifdef NONMATCHING +void dFile_select_c::screenSetCopySel() { + mCpSel.Scr = new J2DScreen(); + JUT_ASSERT(5286, mCpSel.Scr != 0); + mCpSel.Scr->setPriority("zelda_file_select_copy_select.blo", 0x1100000, mpArchive); + dPaneClass_showNullPane(mCpSel.Scr); + mCpSel.mpPane2 = mCpSel.Scr->search('name_n'); + mCpSel.mpPane1 = fileSel.Scr->search('name_n'); + void* bck = JKRGetNameResource("zelda_file_select_copy_select.bck", + mpArchive); + field_0x029c = (J2DAnmTransform*)J2DAnmLoaderDataBase::load(bck); + field_0x02a0 = (J2DAnmTransform*)J2DAnmLoaderDataBase::load(bck); + field_0x029c->searchUpdateMaterialID(mCpSel.Scr); + field_0x02a0->searchUpdateMaterialID(mCpSel.Scr); + void* bpk = JKRGetNameResource("zelda_file_select_copy_select.bpk", mpArchive); + JUT_ASSERT(5315, bpk != 0); + field_0x02e8 = (J2DAnmColor*)J2DAnmLoaderDataBase::load(bpk); + field_0x02e8->searchUpdateMaterialID(mCpSel.Scr); + field_0x02ec = 0; + void* btk = JKRGetNameResource("zelda_file_select_copy_select_03.btk", mpArchive); + JUT_ASSERT(5325, btk != 0); + field_0x02f0 = (J2DAnmTextureSRTKey*)J2DAnmLoaderDataBase::load(btk); + field_0x02f0->searchUpdateMaterialID(mCpSel.Scr); + field_0x02f4 = 0; + field_0x02f8 = (J2DAnmColor*)J2DAnmLoaderDataBase::load(bpk); + field_0x02f8->searchUpdateMaterialID(mCpSel.Scr); + btk = JKRGetNameResource("zelda_file_select_copy_select.btk", mpArchive); + JUT_ASSERT(5343, btk != 0); + field_0x0300 = (J2DAnmTextureSRTKey*)J2DAnmLoaderDataBase::load(btk); + field_0x0300->searchUpdateMaterialID(mCpSel.Scr); + void* brk = JKRGetNameResource("zelda_file_select_copy_select.brk", mpArchive); + JUT_ASSERT(5352, brk != 0); + field_0x0308 = (J2DAnmTevRegKey*)J2DAnmLoaderDataBase::load(brk); + field_0x0308->searchUpdateMaterialID(mCpSel.Scr); + field_0x02fc = 0; + field_0x0304 = 0; + field_0x030c = 0; + for (int i = 0; i < 2; i++) { + field_0x02a4[i] = new CPaneMgr(mCpSel.Scr, l_tagName000[i], 0, NULL); + field_0x02c0[i] = new CPaneMgr(mCpSel.Scr, l_tagName001[i], 0, NULL); + field_0x02c8[i] = new CPaneMgr(mCpSel.Scr, l_tagName002[i], 0, NULL); + field_0x02d0[i] = new CPaneMgr(mCpSel.Scr, l_tagName003[i], 0, NULL); + field_0x02d8[i] = new CPaneMgr(mCpSel.Scr, l_tagName004[i], 0, NULL); + + field_0x02c0[i]->getPanePtr()->setAnimation(field_0x02e8); + field_0x02c8[i]->getPanePtr()->setAnimation(field_0x02e8); + field_0x02d0[i]->getPanePtr()->setAnimation(field_0x02e8); + field_0x02c8[i]->getPanePtr()->setAnimation(field_0x02f0); + field_0x02d0[i]->getPanePtr()->setAnimation(field_0x02f0); + field_0x02d8[i]->getPanePtr()->setAnimation(field_0x02f8); + field_0x02d8[i]->getPanePtr()->setAnimation(field_0x0300); + field_0x02d8[i]->getPanePtr()->setAnimation(field_0x0308); + + mCpSel.Scr->search(l_tagName005[i])->hide(); + } + J2DPane* namePane = mCpSel.Scr->search('name_n'); + namePane->setAnimation(field_0x029c); + field_0x029c->setFrame(0.0f); + namePane->animationTransform(); + namePane->setAnimation((J2DAnmTransform*)NULL); + mSelIcon2 = new dSelect_cursor_c(0, 1.0f, NULL); + JUT_ASSERT(5406, mSelIcon2 != 0); + mSelIcon2->setParam(0.96f, 0.94f, 0.03f, 0.7f, 0.7f); + Vec local_24 = field_0x02a4[0]->getGlobalVtxCenter(false, 0); + mSelIcon2->setPos(local_24.x, local_24.y, field_0x02a4[0]->getPanePtr(), true); + mSelIcon2->setAlphaRate(0.0f); + for (int i = 0; i < 2; i++) { + mpFileInfo[i] = new dFile_info_c(mpArchive, 0); + mpFileInfo[i]->setBasePane(mCpSel.Scr->search(l_tagName13[i + 1])); + } + mCpSel.field_0x08 = false; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -3901,6 +5086,7 @@ asm void dFile_select_c::screenSetCopySel() { #include "asm/d/file/d_file_select/screenSetCopySel__14dFile_select_cFv.s" } #pragma pop +#endif /* ############################################################################################## */ /* 804506C8-804506CC 000148 0002+02 1/1 0/0 0/0 .sdata l_msgNum2$7002 */ @@ -3914,6 +5100,52 @@ SECTION_SDATA static u8 l_msgNum2[2 + 2 /* padding */] = { /* 8018C524-8018C8F4 186E64 03D0+00 1/1 0/0 0/0 .text screenSetYesNo__14dFile_select_cFv */ +// Matches with literals +#ifdef NONMATCHING +void dFile_select_c::screenSetYesNo() { + mYnSel.ScrYn = new J2DScreen(); + JUT_ASSERT(5435, mYnSel.ScrYn != 0); + mYnSel.ScrYn->setPriority("zelda_file_select_yes_no_window.blo", 0x1100000, mpArchive); + dPaneClass_showNullPane(mYnSel.ScrYn); + void* bck = JKRGetNameResource("zelda_file_select_yes_no_window.bck", mpArchive); + field_0x0310 = (J2DAnmTransform*)J2DAnmLoaderDataBase::load(bck); + field_0x0314 = (J2DAnmTransform*)J2DAnmLoaderDataBase::load(bck); + field_0x008c = (J2DAnmTransform*)J2DAnmLoaderDataBase::load(bck); + field_0x0310->searchUpdateMaterialID(mYnSel.ScrYn); + field_0x0314->searchUpdateMaterialID(mYnSel.ScrYn); + field_0x008c->searchUpdateMaterialID(mYnSel.ScrYn); + for (int i = 0; i < 2; i++) { + field_0x00f0[i] = new CPaneMgr(mYnSel.ScrYn, l_tagName012[i], 0, NULL); + field_0x01c0[i] = new CPaneMgr(mYnSel.ScrYn, l_tagName013U[i], 0, NULL); + mYnSel.ScrYn->search(l_tagName013[i])->hide(); + ((J2DTextBox*)field_0x01c0[i]->getPanePtr())->setFont(mDoExt_getMesgFont()); + char acStack_30[16]; + fopMsgM_messageGet(acStack_30, l_msgNum2[i]); + ((J2DTextBox*)field_0x01c0[i]->getPanePtr())->setString(acStack_30); + } + void* bpk = JKRGetNameResource("zelda_file_select_yes_no_window.bpk", mpArchive); + JUT_ASSERT(5483, bpk != 0); + field_0x0318 = (J2DAnmColor*)J2DAnmLoaderDataBase::load(bpk); + field_0x0318->searchUpdateMaterialID(mYnSel.ScrYn); + field_0x031c = 0; + void* btk = JKRGetNameResource("zelda_file_select_yes_no_window.btk", mpArchive); + JUT_ASSERT(5493, btk != 0); + field_0x0320 = (J2DAnmTextureSRTKey*)J2DAnmLoaderDataBase::load(btk); + field_0x0320->searchUpdateMaterialID(mYnSel.ScrYn); + field_0x0324 = 0; + for (int i = 0; i < 2; i++) { + field_0x01a0[i] = new CPaneMgr(mYnSel.ScrYn, l_tagName9[i], 0, NULL); + field_0x01a8[i] = new CPaneMgr(mYnSel.ScrYn, l_tagName10[i], 0, NULL); + field_0x01b0[i] = new CPaneMgr(mYnSel.ScrYn, l_tagName11[i], 0, NULL); + + field_0x01a0[i]->getPanePtr()->setAnimation(field_0x0318); + field_0x01a8[i]->getPanePtr()->setAnimation(field_0x0318); + field_0x01b0[i]->getPanePtr()->setAnimation(field_0x0318); + field_0x01a8[i]->getPanePtr()->setAnimation(field_0x0320); + field_0x01b0[i]->getPanePtr()->setAnimation(field_0x0320); + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -3922,6 +5154,7 @@ asm void dFile_select_c::screenSetYesNo() { #include "asm/d/file/d_file_select/screenSetYesNo__14dFile_select_cFv.s" } #pragma pop +#endif /* ############################################################################################## */ /* 804506CC-804506D0 00014C 0003+01 1/1 0/0 0/0 .sdata l_msgNum$7082 */ @@ -3938,6 +5171,54 @@ SECTION_SDATA2 static f32 lit_7146 = 799.0f; /* 8018C8F4-8018CCD0 187234 03DC+00 1/1 0/0 0/0 .text screenSet3Menu__14dFile_select_cFv */ +// Matches with literals +#ifdef NONMATCHING +void dFile_select_c::screenSet3Menu() { + m3mSel.Scr3m = new J2DScreen(); + JUT_ASSERT(5530, m3mSel.Scr3m != 0); + m3mSel.Scr3m->setPriority("zelda_file_select_3menu_window.blo", 0x1100000, mpArchive); + dPaneClass_showNullPane(m3mSel.Scr3m); + void* bck = JKRGetNameResource("zelda_file_select_3menu_window.bck", mpArchive); + field_0x0328 = (J2DAnmTransform*)J2DAnmLoaderDataBase::load(bck); + field_0x032c = (J2DAnmTransform*)J2DAnmLoaderDataBase::load(bck); + field_0x0328->searchUpdateMaterialID(m3mSel.Scr3m); + field_0x032c->searchUpdateMaterialID(m3mSel.Scr3m); + void* bpk = JKRGetNameResource("zelda_file_select_3menu_window.bpk", mpArchive); + JUT_ASSERT(5552, bpk != 0); + field_0x0330 = (J2DAnmColor*)J2DAnmLoaderDataBase::load(bpk); + field_0x0330->searchUpdateMaterialID(m3mSel.Scr3m); + field_0x0334 = 0; + void* btk = JKRGetNameResource("zelda_file_select_3menu_window.btk", mpArchive); + JUT_ASSERT(5562, btk != 0); + field_0x0338 = (J2DAnmTextureSRTKey*)J2DAnmLoaderDataBase::load(btk); + field_0x0338->searchUpdateMaterialID(m3mSel.Scr3m); + field_0x033c = 0; + field_0x0118 = m3mSel.Scr3m->search('wmenu_n'); + field_0x0118->setAnimation(field_0x0328); + field_0x0328->setFrame(799.0f); + field_0x0118->animationTransform(); + for (int i = 0; i < 3; i++) { + field_0x0340[i] = new CPaneMgr(m3mSel.Scr3m, l_tagName1[i], 0, NULL); + mpPaneMgr2[i] = new CPaneMgr(m3mSel.Scr3m, l_tagName011U[i], 0, NULL); + m3mSel.Scr3m->search(l_tagName011[i])->hide(); + + ((J2DTextBox*)mpPaneMgr2[i]->getPanePtr())->setFont(mDoExt_getMesgFont()); + char acStack_30[32]; + fopMsgM_messageGet(acStack_30, l_msgNum[i]); + ((J2DTextBox*)mpPaneMgr2[i]->getPanePtr())->setString(acStack_30); + + mpPaneAlpha1[i] = new CPaneMgr(m3mSel.Scr3m, l_tagName6[i], 0, NULL); + mpPaneAlpha2[i] = new CPaneMgr(m3mSel.Scr3m, l_tagName7[i], 0, NULL); + mpPaneAlpha3[i] = new CPaneMgr(m3mSel.Scr3m, l_tagName8[i], 0, NULL); + + mpPaneAlpha1[i]->getPanePtr()->setAnimation(field_0x0330); + mpPaneAlpha2[i]->getPanePtr()->setAnimation(field_0x0330); + mpPaneAlpha3[i]->getPanePtr()->setAnimation(field_0x0330); + mpPaneAlpha2[i]->getPanePtr()->setAnimation(field_0x0338); + mpPaneAlpha3[i]->getPanePtr()->setAnimation(field_0x0338); + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -3946,51 +5227,84 @@ asm void dFile_select_c::screenSet3Menu() { #include "asm/d/file/d_file_select/screenSet3Menu__14dFile_select_cFv.s" } #pragma pop +#endif /* 8018CCD0-8018CE38 187610 0168+00 1/1 0/0 0/0 .text screenSetDetail__14dFile_select_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dFile_select_c::screenSetDetail() { - nofralloc -#include "asm/d/file/d_file_select/screenSetDetail__14dFile_select_cFv.s" +void dFile_select_c::screenSetDetail() { + mSelDt.ScrDt = new J2DScreen(); + JUT_ASSERT(5622, mSelDt.ScrDt != 0); + mSelDt.ScrDt->setPriority("zelda_file_select_details.blo", 0x1100000, mpArchive); + void* btk = JKRGetNameResource("zelda_file_select_details.btk", mpArchive); + JUT_ASSERT(5628, btk != 0); + field_0x03a0 = (J2DAnmTextureSRTKey*)J2DAnmLoaderDataBase::load(btk); + mSelDt.ScrDt->setAnimation(field_0x03a0); + field_0x03a4 = 0; + mSelDt.mpPane2 = mSelDt.ScrDt->search('n_all'); + field_0x03a8 = new CPaneMgr(mSelDt.ScrDt, 'mset_p_n', 0, NULL); + mpFileSelect3d->setBasePane(field_0x03a8); + mpFileSelect3d->setBase2Pane(fileSel.Scr->search('w_sub_n')); + mSelDt.ScrDt->search('d_win_n')->setUserInfo('n_43'); } -#pragma pop - -/* ############################################################################################## */ -/* 804539B0-804539B4 001FB0 0004+00 1/1 0/0 0/0 .sdata2 @7201 */ -SECTION_SDATA2 static f32 lit_7201 = 3000.0f; /* 8018CE38-8018CF50 187778 0118+00 2/2 0/0 0/0 .text setWakuAnm__14dFile_select_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dFile_select_c::setWakuAnm() { - nofralloc -#include "asm/d/file/d_file_select/setWakuAnm__14dFile_select_cFv.s" +void dFile_select_c::setWakuAnm() { + field_0x0098->setFrame(3000.0f); + for (int i = 0; i < 3; i++) { + field_0x0164[i]->getPanePtr()->setAnimation(field_0x0098); + field_0x0170[i]->getPanePtr()->setAnimation(field_0x0098); + field_0x017c[i]->getPanePtr()->setAnimation(field_0x0098); + field_0x0164[i]->getPanePtr()->animationTransform(); + field_0x0170[i]->getPanePtr()->animationTransform(); + field_0x017c[i]->getPanePtr()->animationTransform(); + field_0x0164[i]->setAlpha(0); + field_0x0170[i]->setAlpha(0); + field_0x017c[i]->setAlpha(0); + } } -#pragma pop /* 8018CF50-8018D044 187890 00F4+00 1/1 0/0 0/0 .text displayInit__14dFile_select_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dFile_select_c::displayInit() { - nofralloc -#include "asm/d/file/d_file_select/displayInit__14dFile_select_cFv.s" +void dFile_select_c::displayInit() { + field_0x03b1 = 0; + mSelectEnd = false; + field_0x03ac = g_fsHIO.field_0x000b; + field_0x00b8 = 0; + field_0x014a = false; + field_0x0360 = false; + field_0x0108 = false; + field_0x021e = 0; + field_0x00b9 = 0; + field_0x014b = false; + field_0x0281 = false; + field_0x0283 = false; + mDoMemCd_clearProbeStat(); + field_0x0248 = false; + field_0x024a = false; + field_0x0249 = false; + field_0x024b = false; + field_0x0240->setAlpha(0); + field_0x0244->setAlpha(0); + field_0x0238->setAlpha(0x80); + field_0x023c->setAlpha(0x80); + field_0x026f = 0; + field_0x0271 = 0; } -#pragma pop /* 8018D044-8018D0E4 187984 00A0+00 3/3 0/0 0/0 .text setSaveData__14dFile_select_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dFile_select_c::setSaveData() { - nofralloc -#include "asm/d/file/d_file_select/setSaveData__14dFile_select_cFv.s" +void dFile_select_c::setSaveData() { + dSv_save_c* pSave = (dSv_save_c*)mSave; + for (int i = 0; i < 3; i++) { + int res = field_0x0070[i]->setSaveData(pSave, mDoMemCdRWm_TestCheckSumGameData(pSave), i); + if (res == -1) { + field_0x025b[i] = 1; + mDataNew[i] = 0; + } else { + mDataNew[i] = res; + field_0x025b[i] = 0; + } + (char*)pSave += 0xa94; + } } -#pragma pop /* ############################################################################################## */ /* 804506D0-804506D8 000150 0008+00 1/1 0/0 0/0 .sdata fontsize$7230 */ @@ -4012,6 +5326,29 @@ static f32 charspace[2] = { }; /* 8018D0E4-8018D25C 187A24 0178+00 20/20 0/0 0/0 .text headerTxtSet__14dFile_select_cFUsUcUc */ +// Matches with literals +#ifdef NONMATCHING +void dFile_select_c::headerTxtSet(u16 param_1, u8 param_2, u8 param_3) { + u8 uVar1 = field_0x021c ^ 1; + if (param_3 != 0) { + uVar1 = field_0x021c; + } + if (param_1 == 0xffff) { + strcpy(field_0x0214[uVar1], ""); + } else { + ((J2DTextBox*)field_0x020c[uVar1]->getPanePtr())->setFont((&mpMessageFont)[param_2]); + ((J2DTextBox*)field_0x020c[uVar1]->getPanePtr())->setFontSize(fontsize[param_2], fontsize[param_2]); + ((J2DTextBox*)field_0x020c[uVar1]->getPanePtr())->setLineSpace(linespace[param_2]); + ((J2DTextBox*)field_0x020c[uVar1]->getPanePtr())->setCharSpace(charspace[param_2]); + mpMessageString->getString(param_1, ((J2DTextBox*)field_0x020c[uVar1]->getPanePtr()), NULL, (&mpMessageFont)[param_2], NULL, 0); + } + if (param_3 == 0) { + field_0x020c[field_0x021c]->alphaAnimeStart(0); + field_0x020c[field_0x021c ^ 1]->alphaAnimeStart(0); + field_0x021d = 0; + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -4020,6 +5357,7 @@ asm void dFile_select_c::headerTxtSet(u16 param_0, u8 param_1, u8 param_2) { #include "asm/d/file/d_file_select/headerTxtSet__14dFile_select_cFUsUcUc.s" } #pragma pop +#endif /* 8018D25C-8018D344 187B9C 00E8+00 21/21 0/0 0/0 .text headerTxtChangeAnm__14dFile_select_cFv */ bool dFile_select_c::headerTxtChangeAnm() { @@ -4028,8 +5366,9 @@ bool dFile_select_c::headerTxtChangeAnm() { } else { bool ret = false; - bool alphaAnime1 = (&field_0x020c)[field_0x021c]->alphaAnime(g_fsHIO.field_0x0007,0xFF,0,0); - bool alphaAnime2 = (&field_0x020c)[field_0x021c^1]->alphaAnime(g_fsHIO.field_0x0007,0,0xFF,0); + bool alphaAnime1 = field_0x020c[field_0x021c]->alphaAnime(g_fsHIO.field_0x0007, 0xFF, 0, 0); + bool alphaAnime2 = + field_0x020c[field_0x021c ^ 1]->alphaAnime(g_fsHIO.field_0x0007, 0, 0xFF, 0); int msgKeyWaitTimer = dMeter2Info_getMsgKeyWaitTimer(); if (alphaAnime1 == true && alphaAnime2 == true && msgKeyWaitTimer == 0) { @@ -4043,79 +5382,122 @@ bool dFile_select_c::headerTxtChangeAnm() { } /* 8018D344-8018D3A0 187C84 005C+00 7/7 0/0 0/0 .text modoruTxtChange__14dFile_select_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dFile_select_c::modoruTxtChange(u8 param_0) { - nofralloc -#include "asm/d/file/d_file_select/modoruTxtChange__14dFile_select_cFUc.s" +void dFile_select_c::modoruTxtChange(u8 param_1) { + if (param_1 != 0) { + fopMsgM_messageGet(field_0x0250, 981); + field_0x024c = 1; + } else { + fopMsgM_messageGet(field_0x0250, 84); + field_0x024c = 0; + } } -#pragma pop /* 8018D3A0-8018D41C 187CE0 007C+00 11/11 0/0 0/0 .text modoruTxtDispAnmInit__14dFile_select_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dFile_select_c::modoruTxtDispAnmInit(u8 param_0) { - nofralloc -#include "asm/d/file/d_file_select/modoruTxtDispAnmInit__14dFile_select_cFUc.s" +void dFile_select_c::modoruTxtDispAnmInit(u8 param_1) { + field_0x024a = param_1; + if ((param_1 != 0 || field_0x0240->getAlpha() != 0) && + (param_1 != 1 || field_0x0240->getAlpha() != 0xff)) + { + field_0x0240->alphaAnimeStart(0); + field_0x0238->alphaAnimeStart(0); + } else { + field_0x0240->alphaAnimeStart(g_fsHIO.field_0x0007); + field_0x0238->alphaAnimeStart(g_fsHIO.field_0x0007); + } } -#pragma pop /* 8018D41C-8018D4F8 187D5C 00DC+00 11/11 0/0 0/0 .text modoruTxtDispAnm__14dFile_select_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool dFile_select_c::modoruTxtDispAnm() { - nofralloc -#include "asm/d/file/d_file_select/modoruTxtDispAnm__14dFile_select_cFv.s" +bool dFile_select_c::modoruTxtDispAnm() { + bool iVar1; + bool iVar2; + if (field_0x024a != 0) { + iVar1 = field_0x0240->alphaAnime(g_fsHIO.field_0x0007, 0, 0xff, 0); + iVar2 = field_0x0238->alphaAnime(g_fsHIO.field_0x0007, 0x80, 0xff, 0); + } else { + iVar1 = field_0x0240->alphaAnime(g_fsHIO.field_0x0007, 0xff, 0, 0); + iVar2 = field_0x0238->alphaAnime(g_fsHIO.field_0x0007, 0xff, 0x80, 0); + } + + if (iVar1 == true && iVar2 == true) { + return true; + } + return false; } -#pragma pop /* 8018D4F8-8018D574 187E38 007C+00 13/13 0/0 0/0 .text ketteiTxtDispAnmInit__14dFile_select_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dFile_select_c::ketteiTxtDispAnmInit(u8 param_0) { - nofralloc -#include "asm/d/file/d_file_select/ketteiTxtDispAnmInit__14dFile_select_cFUc.s" +void dFile_select_c::ketteiTxtDispAnmInit(u8 param_1) { + field_0x024b = param_1; + if ((param_1 != 0 || field_0x0244->getAlpha() != 0) && + (param_1 != 1 || field_0x0244->getAlpha() != 0xff)) + { + field_0x0244->alphaAnimeStart(0); + field_0x023c->alphaAnimeStart(0); + } else { + field_0x0244->alphaAnimeStart(g_fsHIO.field_0x0007); + field_0x023c->alphaAnimeStart(g_fsHIO.field_0x0007); + } } -#pragma pop /* 8018D574-8018D650 187EB4 00DC+00 12/12 0/0 0/0 .text ketteiTxtDispAnm__14dFile_select_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool dFile_select_c::ketteiTxtDispAnm() { - nofralloc -#include "asm/d/file/d_file_select/ketteiTxtDispAnm__14dFile_select_cFv.s" -} -#pragma pop +bool dFile_select_c::ketteiTxtDispAnm() { + bool iVar1; + bool iVar2; + if (field_0x024b != 0) { + iVar1 = field_0x0244->alphaAnime(g_fsHIO.field_0x0007, 0, 0xff, 0); + iVar2 = field_0x023c->alphaAnime(g_fsHIO.field_0x0007, 0x80, 0xff, 0); + } else { + iVar1 = field_0x0244->alphaAnime(g_fsHIO.field_0x0007, 0xff, 0, 0); + iVar2 = field_0x023c->alphaAnime(g_fsHIO.field_0x0007, 0xff, 0x80, 0); + } + + if (iVar1 == true && iVar2 == true) { + return true; + } + return false; +} /* 8018D650-8018D68C 187F90 003C+00 8/8 0/0 0/0 .text * selectWakuAlpahAnmInit__14dFile_select_cFUcUcUcUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dFile_select_c::selectWakuAlpahAnmInit(u8 param_0, u8 param_1, u8 param_2, u8 param_3) { - nofralloc -#include "asm/d/file/d_file_select/selectWakuAlpahAnmInit__14dFile_select_cFUcUcUcUc.s" +void dFile_select_c::selectWakuAlpahAnmInit(u8 param_1, u8 param_2, u8 param_3, u8 param_4) { + field_0x0164[param_1]->alphaAnimeStart(0); + field_0x0170[param_1]->alphaAnimeStart(0); + field_0x017c[param_1]->alphaAnimeStart(0); + field_0x0194[param_1] = param_2; + field_0x0197[param_1] = param_3; + field_0x019a[param_1] = param_4; } -#pragma pop /* 8018D68C-8018D764 187FCC 00D8+00 8/8 0/0 0/0 .text selectWakuAlpahAnm__14dFile_select_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool dFile_select_c::selectWakuAlpahAnm(u8 param_0) { - nofralloc -#include "asm/d/file/d_file_select/selectWakuAlpahAnm__14dFile_select_cFUc.s" +bool dFile_select_c::selectWakuAlpahAnm(u8 param_1) { + if (param_1 == 0xff) { + return true; + } + bool rv = false; + bool iVar2 = field_0x0164[param_1]->alphaAnime(field_0x019a[param_1], field_0x0194[param_1], field_0x0197[param_1], 0); + bool iVar3 = field_0x0170[param_1]->alphaAnime(field_0x019a[param_1], field_0x0194[param_1], field_0x0197[param_1], 0); + bool iVar4 = field_0x017c[param_1]->alphaAnime(field_0x019a[param_1], field_0x0194[param_1], field_0x0197[param_1], 0); + if (iVar2 == true && iVar3 == true && iVar4 == true) { + rv = true; + } + return rv; } -#pragma pop /* 8018D764-8018D884 1880A4 0120+00 6/6 0/0 0/0 .text selFileCursorShow__14dFile_select_cFv */ +// Matches with literals +#ifdef NONMATCHING +void dFile_select_c::selFileCursorShow() { + field_0x0164[mSelectNum]->setAlpha(0xff); + field_0x0170[mSelectNum]->setAlpha(0xff); + field_0x017c[mSelectNum]->setAlpha(0xff); + + Vec local_1c = field_0x00bc[mSelectNum]->getGlobalVtxCenter(false, 0); + mSelIcon->setPos(local_1c.x, local_1c.y, field_0x00bc[mSelectNum]->getPanePtr(), true); + mSelIcon->setAlphaRate(1.0f); + mSelIcon->setParam(0.96f, 0.94f, 0.03f, 0.7f, 0.7f); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -4124,31 +5506,58 @@ asm void dFile_select_c::selFileCursorShow() { #include "asm/d/file/d_file_select/selFileCursorShow__14dFile_select_cFv.s" } #pragma pop +#endif /* 8018D884-8018D8C8 1881C4 0044+00 1/1 0/0 0/0 .text * menuWakuAlpahAnmInit__14dFile_select_cFUcUcUcUc */ void dFile_select_c::menuWakuAlpahAnmInit(u8 i_idx, u8 param_1, u8 param_2, u8 param_3) { - (&mpPaneAlpha1)[i_idx]->alphaAnimeStart(0); - (&mpPaneAlpha2)[i_idx]->alphaAnimeStart(0); - (&mpPaneAlpha3)[i_idx]->alphaAnimeStart(0); - (&field_0x0388)[i_idx] = param_1; - (&field_0x038b)[i_idx] = param_2; - (&field_0x038e)[i_idx] = param_3; - (&mpPaneMgr2)[i_idx]->colorAnimeStart(0); + mpPaneAlpha1[i_idx]->alphaAnimeStart(0); + mpPaneAlpha2[i_idx]->alphaAnimeStart(0); + mpPaneAlpha3[i_idx]->alphaAnimeStart(0); + field_0x0388[i_idx] = param_1; + field_0x038b[i_idx] = param_2; + field_0x038e[i_idx] = param_3; + mpPaneMgr2[i_idx]->colorAnimeStart(0); } /* 8018D8C8-8018DA10 188208 0148+00 1/1 0/0 0/0 .text menuWakuAlpahAnm__14dFile_select_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool dFile_select_c::menuWakuAlpahAnm(u8 param_0) { - nofralloc -#include "asm/d/file/d_file_select/menuWakuAlpahAnm__14dFile_select_cFUc.s" +bool dFile_select_c::menuWakuAlpahAnm(u8 param_1) { + bool rv = false; + bool iVar1 = mpPaneAlpha1[param_1]->alphaAnime(field_0x038e[param_1], field_0x0388[param_1], + field_0x038b[param_1], 0); + bool iVar2 = mpPaneAlpha2[param_1]->alphaAnime(field_0x038e[param_1], field_0x0388[param_1], + field_0x038b[param_1], 0); + bool iVar3 = mpPaneAlpha3[param_1]->alphaAnime(field_0x038e[param_1], field_0x0388[param_1], + field_0x038b[param_1], 0); + mpPaneMgr2[param_1]->colorAnime(field_0x038e[param_1], mpPaneMgr2[param_1]->getInitBlack(), + mpPaneMgr2[param_1]->getInitBlack(), + JUtility::TColor(0xff, 0xff, 0xff, 0xff), + JUtility::TColor(0x96, 0x96, 0x96, 0xff), 0); + if (((iVar1 == 1) && (iVar2 == 1)) && (iVar3 == 1)) { + rv = true; + } + return rv; } -#pragma pop /* 8018DA10-8018DB80 188350 0170+00 4/4 0/0 0/0 .text menuCursorShow__14dFile_select_cFv */ +// Matches with literals +#ifdef NONMATCHING +void dFile_select_c::menuCursorShow() { + if (mSelectMenuNum == 0xff) { + return; + } + ((J2DTextBox*)mpPaneMgr2[mSelectMenuNum]->getPanePtr()) + ->setWhite(JUtility::TColor(0xff, 0xff, 0xff, 0xff)); + mpPaneAlpha1[mSelectMenuNum]->setAlpha(0xff); + mpPaneAlpha2[mSelectMenuNum]->setAlpha(0xff); + mpPaneAlpha3[mSelectMenuNum]->setAlpha(0xff); + Vec local_24 = field_0x0340[mSelectMenuNum]->getGlobalVtxCenter(false, 0); + mSelIcon->setPos(local_24.x, local_24.y, field_0x0340[mSelectMenuNum]->getPanePtr(), true); + mSelIcon->setAlphaRate(1.0f); + mSelIcon->setParam(0.96f, 0.84f, 0.06f, 0.5f, 0.5f); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -4157,58 +5566,78 @@ asm void dFile_select_c::menuCursorShow() { #include "asm/d/file/d_file_select/menuCursorShow__14dFile_select_cFv.s" } #pragma pop +#endif /* 8018DB80-8018DBCC 1884C0 004C+00 2/2 0/0 0/0 .text * yesnoWakuAlpahAnmInit__14dFile_select_cFUcUcUcUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dFile_select_c::yesnoWakuAlpahAnmInit(u8 param_0, u8 param_1, u8 param_2, u8 param_3) { - nofralloc -#include "asm/d/file/d_file_select/yesnoWakuAlpahAnmInit__14dFile_select_cFUcUcUcUc.s" +void dFile_select_c::yesnoWakuAlpahAnmInit(u8 param_1, u8 param_2, u8 param_3, u8 param_4) { + if (param_1 != 0xff) { + field_0x01a0[param_1]->alphaAnimeStart(0); + field_0x01a8[param_1]->alphaAnimeStart(0); + field_0x01b0[param_1]->alphaAnimeStart(0); + field_0x01b8[param_1] = param_2; + field_0x01ba[param_1] = param_3; + field_0x01bc[param_1] = param_4; + field_0x01c0[param_1]->colorAnimeStart(0); + } } -#pragma pop /* 8018DBCC-8018DD38 18850C 016C+00 4/4 0/0 0/0 .text yesnoWakuAlpahAnm__14dFile_select_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dFile_select_c::yesnoWakuAlpahAnm(u8 param_0) { - nofralloc -#include "asm/d/file/d_file_select/yesnoWakuAlpahAnm__14dFile_select_cFUc.s" +bool dFile_select_c::yesnoWakuAlpahAnm(u8 param_1) { + bool rv = false; + bool iVar5 = true; + bool iVar4 = true; + bool iVar3 = true; + bool iVar2 = true; + if (param_1 != 0xff) { + iVar5 = field_0x01a0[param_1]->alphaAnime(field_0x01bc[param_1], field_0x01b8[param_1], + field_0x01ba[param_1], 0); + iVar4 = field_0x01a8[param_1]->alphaAnime(field_0x01bc[param_1], field_0x01b8[param_1], + field_0x01ba[param_1], 0); + iVar3 = field_0x01b0[param_1]->alphaAnime(field_0x01bc[param_1], field_0x01b8[param_1], + field_0x01ba[param_1], 0); + iVar2 = field_0x01c0[param_1]->colorAnime( + field_0x01bc[param_1], field_0x01c0[param_1]->getInitBlack(), + field_0x01c0[param_1]->getInitBlack(), JUtility::TColor(0xff, 0xff, 0xff, 0xff), + JUtility::TColor(0x96, 0x96, 0x96, 0xff), 0); + } + if (iVar5 == true && iVar4 == true && iVar3 == true && iVar2 == true) { + rv = true; + } + return rv; } -#pragma pop /* 8018DD38-8018DEBC 188678 0184+00 0/0 1/1 0/0 .text _draw__14dFile_select_cFv */ +// Need to fix dDlst inheritances #ifdef NONMATCHING void dFile_select_c::_draw() { if (!mHasDrawn) { - dComIfGd_set2DOpa(&mFileSelectDlst); + dComIfGd_set2DOpa(&fileSel); for (int i = 0; i < 3; i++) { mpFileInfo[i]->draw(); } - dComIfGd_set2DOpa(&mFileSelDeleteDlst); + dComIfGd_set2DOpa(&mSelDt); mpFileSelect3d.draw(); - if (mFileSelCopyDlst.field_0x08 != false) { - dComIfGd_set2DOpa(&mFileSelCopyDlst); + if (mCpSel.field_0x08 != false) { + dComIfGd_set2DOpa(&mCpSel); for (int i = 0; i < 2; i++) { mpFileInfo[i]->draw(); } } - if (field137_0x128 != false) { + if (field_0x0128 != false) { mpName.draw(); } - dComIfGd_set2DOpa(&mFileSel3mDlst); - dComIfGd_set2DOpa(&mFileSelYesNoDlst); + dComIfGd_set2DOpa(&m3mSel); + dComIfGd_set2DOpa(&mYnSel); mpFileWarning.draw(); - dComIfGd_set2DOpa(mpCursor1); - dComIfGd_set2DOpa(mpCursor2); + dComIfGd_set2DOpa(mSelIcon); + dComIfGd_set2DOpa(mSelIcon2); } } #else @@ -4224,6 +5653,13 @@ asm void dFile_select_c::_draw() { #endif /* 8018DEBC-8018DEF4 1887FC 0038+00 1/0 0/0 0/0 .text draw__15dDlst_FileSel_cFv */ +// Matches with literals +#ifdef NONMATCHING +void dDlst_FileSel_c::draw() { + J2DGrafContext* graf = dComIfGp_getCurrentGrafPort(); + Scr->draw(0.0f, 0.0f, graf); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -4232,8 +5668,25 @@ asm void dDlst_FileSel_c::draw() { #include "asm/d/file/d_file_select/draw__15dDlst_FileSel_cFv.s" } #pragma pop +#endif /* 8018DEF4-8018DFFC 188834 0108+00 1/0 0/0 0/0 .text draw__17dDlst_FileSelDt_cFv */ +// Matches with literals +#ifdef NONMATCHING +void dDlst_FileSelDt_c::draw() { + J2DGrafContext* grafContext = dComIfGp_getCurrentGrafPort(); + MtxP local_98 = (MtxP)&mpPane->getGlbMtx()[0][0]; + Mtx auStack_60; + Mtx auStack_90; + MTXTrans(auStack_60, mpPane->getWidth() / 2, mpPane->getHeight() / 2, + 0.0f); + MTXConcat(local_98, auStack_60, local_98); + MTXScale(auStack_90, mpPane->getWidth() / mpPane2->getWidth(), mpPane->getHeight() / mpPane2->getHeight(), 1.0f); + MTXConcat(local_98, auStack_90, local_98); + mpPane2->setMtx(local_98); + mpScreen->draw(0.0f, 0.0f, grafContext); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -4242,8 +5695,21 @@ asm void dDlst_FileSelDt_c::draw() { #include "asm/d/file/d_file_select/draw__17dDlst_FileSelDt_cFv.s" } #pragma pop +#endif /* 8018DFFC-8018E0C0 18893C 00C4+00 1/0 0/0 0/0 .text draw__17dDlst_FileSelCp_cFv */ +// Matches with literals +#ifdef NONMATCHING +void dDlst_FileSelCp_c::draw() { + J2DGrafContext* grafContext = dComIfGp_getCurrentGrafPort(); + MtxP local_98 = (MtxP)&mpPane1->getGlbMtx()[0][0]; + Mtx auStack_90; + MTXScale(auStack_90, mpPane1->getWidth() / mpPane2->getWidth(), mpPane1->getHeight() / mpPane2->getHeight(), 1.0f); + MTXConcat(local_98, auStack_90, local_98); + mpPane2->setMtx(local_98); + mpScreen->draw(0.0f, 0.0f, grafContext); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -4252,8 +5718,15 @@ asm void dDlst_FileSelCp_c::draw() { #include "asm/d/file/d_file_select/draw__17dDlst_FileSelCp_cFv.s" } #pragma pop +#endif /* 8018E0C0-8018E0F8 188A00 0038+00 1/0 0/0 0/0 .text draw__17dDlst_FileSelYn_cFv */ +#ifdef NONMATCHING +void dDlst_FileSelYn_c::draw() { + J2DGrafContext* graf = dComIfGp_getCurrentGrafPort(); + mpScreen->draw(0.0f, 0.0f, graf); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -4262,8 +5735,15 @@ asm void dDlst_FileSelYn_c::draw() { #include "asm/d/file/d_file_select/draw__17dDlst_FileSelYn_cFv.s" } #pragma pop +#endif /* 8018E0F8-8018E130 188A38 0038+00 1/0 0/0 0/0 .text draw__17dDlst_FileSel3m_cFv */ +#ifdef NONMATCHING +void dDlst_FileSel3m_c::draw() { + J2DGrafContext* graf = dComIfGp_getCurrentGrafPort(); + mpScreen->draw(0.0f, 0.0f, graf); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -4272,8 +5752,20 @@ asm void dDlst_FileSel3m_c::draw() { #include "asm/d/file/d_file_select/draw__17dDlst_FileSel3m_cFv.s" } #pragma pop +#endif /* 8018E130-8018E1C0 188A70 0090+00 4/4 0/0 0/0 .text errorMoveAnmInitSet__14dFile_select_cFii */ +// Matches with literals +#ifdef NONMATCHING +void dFile_select_c::errorMoveAnmInitSet(int param_1, int param_2) { + field_0x012c->setAnimation(field_0x0090); + field_0x0130 = param_1; + field_0x0134 = param_2; + field_0x0090->setFrame(field_0x0130); + field_0x012c->animationTransform(); + field_0x014b = true; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -4282,6 +5774,7 @@ asm void dFile_select_c::errorMoveAnmInitSet(int param_0, int param_1) { #include "asm/d/file/d_file_select/errorMoveAnmInitSet__14dFile_select_cFii.s" } #pragma pop +#endif /* 8018E1C0-8018E2B4 188B00 00F4+00 5/5 0/0 0/0 .text errorMoveAnm__14dFile_select_cFv */ #ifdef NONMATCHING @@ -4300,7 +5793,7 @@ bool dFile_select_c::errorMoveAnm() { field_0x0130 = field_0x0134; } - mpAnmBase[3]->setFrame(field_0x0130); + field_0x0090->setFrame(field_0x0130); field_0x012c->animationTransform(); return false; } else { @@ -4323,6 +5816,46 @@ asm bool dFile_select_c::errorMoveAnm() { /* 8018E2B4-8018E4CC 188BF4 0218+00 1/1 0/0 0/0 .text errDispInitSet__14dFile_select_cFii */ +// Matches with literals +#ifdef NONMATCHING +void dFile_select_c::errDispInitSet(int param_1, int param_2) { + if (param_2 != 0) { + headerTxtSet(0xffff, 0, 0); + } else { + headerTxtSet(1, 0, 0); + } + field_0x021e = 0; + field_0x0138[field_0x0148]->setAlpha(0xff); + field_0x0138[field_0x0148 ^ 1]->setAlpha(0); + mpMessageString->getString(param_1, (J2DTextBox*)field_0x0138[field_0x0148]->getPanePtr(), NULL, + mpMessageFont, NULL, 0); + if (field_0x014a || field_0x014b) { + errorMoveAnmInitSet(2859, 2849); + } + if (field_0x00b8 != 0 || field_0x00b9 != 0) { + mpFileSelect3d->drawOff(); + selectDataBaseMoveAnmInitSet(33, 1); + } + if (field_0x0108 || field_0x0281) { + yesnoMenuMoveAnmInitSet(1149, 1139); + } + if (field_0x0360 || field_0x0283) { + menuMoveAnmInitSet(809, 799); + } + if (field_0x0128 != 0) { + nameMoveAnmInitSet(3369, 3359); + } + if (mCpSel.field_0x08) { + copySelMoveAnmInitSet(3369, 3359); + } + modoruTxtDispAnmInit(0); + ketteiTxtDispAnmInit(0); + mpFileWarning->init(); + mSelIcon->setAlphaRate(0.0f); + mSelIcon2->setAlphaRate(0.0f); + field_0x0271 = 22; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -4331,18 +5864,81 @@ asm void dFile_select_c::errDispInitSet(int param_0, int param_1) { #include "asm/d/file/d_file_select/errDispInitSet__14dFile_select_cFii.s" } #pragma pop +#endif /* 8018E4CC-8018E504 188E0C 0038+00 1/0 0/0 0/0 .text MemCardCheckMain__14dFile_select_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dFile_select_c::MemCardCheckMain() { - nofralloc -#include "asm/d/file/d_file_select/MemCardCheckMain__14dFile_select_cFv.s" +void dFile_select_c::MemCardCheckMain() { + (this->*(((MemCardCheckFuncT*)MemCardCheckProc)[field_0x0271]))(); } -#pragma pop /* 8018E504-8018E7C4 188E44 02C0+00 2/0 0/0 0/0 .text MemCardStatCheck__14dFile_select_cFv */ +// Matches with literals +#ifdef NONMATCHING +void dFile_select_c::MemCardStatCheck() { + u32 status = mDoMemCd_getStatus(0); + if (status == 14) { + return; + } + switch(status) { + case 0: + errDispInitSet(2, 0); + field_0x0280 = false; + field_0x0284 = NULL; + field_0x0273 = 2; + field_0x0290 = &dFile_select_c::noSaveSelDispInit; + field_0x0274 = 3; + break; + case 8: + errDispInitSet(3, 0); + field_0x0280 = false; + field_0x0284 = NULL; + field_0x0273 = 2; + field_0x0290 = &dFile_select_c::noSaveSelDispInit; + field_0x0274 = 3; + break; + case 9: + errDispInitSet(4, 0); + field_0x0280 = false; + field_0x0284 = NULL; + field_0x0273 = 2; + field_0x0290 = &dFile_select_c::noSaveSelDispInit; + field_0x0274 = 3; + break; + case 10: + errDispInitSet(5, 0); + field_0x0280 = false; + field_0x0284 = NULL; + field_0x0273 = 2; + field_0x0290 = &dFile_select_c::noSaveSelDispInit; + field_0x0274 = 3; + break; + case 6: + case 7: + errDispInitSet(6, 0); + field_0x0280 = true; + field_0x0273 = 5; + break; + case 11: + case 12: + errDispInitSet(9, 0); + field_0x0280 = false; + field_0x0284 = NULL; + field_0x0273 = 2; + field_0x0290 = &dFile_select_c::noSaveSelDispInit; + field_0x0274 = 18; + break; + case 2: + mDoMemCd_Load(); + field_0x0271 = 1; + break; + case 1: + errDispInitSet(22, 0); + field_0x0280 = true; + field_0x0273 = 13; + break; + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -4351,9 +5947,48 @@ asm void dFile_select_c::MemCardStatCheck() { #include "asm/d/file/d_file_select/MemCardStatCheck__14dFile_select_cFv.s" } #pragma pop +#endif /* 8018E7C4-8018E93C 189104 0178+00 1/0 0/0 0/0 .text MemCardLoadWait__14dFile_select_cFv */ +// Matches with literals +#ifdef NONMATCHING +void dFile_select_c::MemCardLoadWait() { + int loadRes = mDoMemCd_LoadSync(mSave, sizeof(mSave), 0); + if (loadRes == 0) { + return; + } + if (loadRes == 1) { + if (dComIfGs_getNoFile() != 0) { + dComIfGs_setNoFile(0); + } + dataSelectInAnmSet(); + if (field_0x014a || field_0x014b) { + errorMoveAnmInitSet(2859, 2849); + } + if (field_0x0108 || field_0x0281) { + yesnoMenuMoveAnmInitSet(1149, 1139); + } + if (field_0x0128) { + nameMoveAnmInitSet(3369, 3359); + } + if (mCpSel.field_0x08) { + mSelIcon2->setAlphaRate(0.0f); + copySelMoveAnmInitSet(3369, 3359); + } + + if (field_0x0360 || field_0x0283) { + menuMoveAnmInitSet(809, 799); + } + modoruTxtDispAnmInit(0); + headerTxtSet(0xffff, 0, 0); + field_0x021e = 0; + field_0x026f = 1; + } else if (loadRes == 2) { + field_0x0271 = 0; + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -4362,29 +5997,35 @@ asm void dFile_select_c::MemCardLoadWait() { #include "asm/d/file/d_file_select/MemCardLoadWait__14dFile_select_cFv.s" } #pragma pop +#endif /* 8018E93C-8018E9B0 18927C 0074+00 1/0 0/0 0/0 .text MemCardErrMsgWaitKey__14dFile_select_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dFile_select_c::MemCardErrMsgWaitKey() { - nofralloc -#include "asm/d/file/d_file_select/MemCardErrMsgWaitKey__14dFile_select_cFv.s" +void dFile_select_c::MemCardErrMsgWaitKey() { + if (cAPICPad_ANY_BUTTON(0) != 0 && dMeter2Info_getMsgKeyWaitTimer() == 0) { + if (field_0x0290 != NULL) { + (this->*field_0x0290)(); + } + field_0x0271 = field_0x0274; + } } -#pragma pop /* 8018E9B0-8018E9D4 1892F0 0024+00 1/0 0/0 0/0 .text noFileSpaceDispInit__14dFile_select_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dFile_select_c::noFileSpaceDispInit() { - nofralloc -#include "asm/d/file/d_file_select/noFileSpaceDispInit__14dFile_select_cFv.s" +void dFile_select_c::noFileSpaceDispInit() { + errorTxtSet(10); } -#pragma pop /* 8018E9D4-8018EA3C 189314 0068+00 1/0 0/0 0/0 .text MemCardNoFileSpaceDisp__14dFile_select_cFv */ +// Matches with literals +#ifdef NONMATCHING +void dFile_select_c::MemCardNoFileSpaceDisp() { + if (errorTxtChangeAnm() == true) { + field_0x0290 = &dFile_select_c::iplSelDispInit; + field_0x0274 = 19; + field_0x0271 = 2; + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -4393,72 +6034,135 @@ asm void dFile_select_c::MemCardNoFileSpaceDisp() { #include "asm/d/file/d_file_select/MemCardNoFileSpaceDisp__14dFile_select_cFv.s" } #pragma pop +#endif /* 8018EA3C-8018EA90 18937C 0054+00 1/0 0/0 0/0 .text iplSelDispInit__14dFile_select_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dFile_select_c::iplSelDispInit() { - nofralloc -#include "asm/d/file/d_file_select/iplSelDispInit__14dFile_select_cFv.s" +void dFile_select_c::iplSelDispInit() { + errorTxtSet(18); + ketteiTxtDispAnmInit(1); + field_0x0280 = true; + yesnoMenuMoveAnmInitSet(0x473, 0x47d); } -#pragma pop /* 8018EA90-8018EB10 1893D0 0080+00 1/0 0/0 0/0 .text MemCardGotoIPLSelectDisp__14dFile_select_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dFile_select_c::MemCardGotoIPLSelectDisp() { - nofralloc -#include "asm/d/file/d_file_select/MemCardGotoIPLSelectDisp__14dFile_select_cFv.s" +void dFile_select_c::MemCardGotoIPLSelectDisp() { + bool txhChanged = errorTxtChangeAnm(); + bool yesNoMenuMoved = yesnoMenuMoveAnm(); + bool ketteiTxtDisplayed = ketteiTxtDispAnm(); + if (txhChanged == true && yesNoMenuMoved == true && ketteiTxtDisplayed == true) { + yesnoCursorShow(); + field_0x0271 = 20; + } } -#pragma pop /* 8018EB10-8018EBCC 189450 00BC+00 1/0 0/0 0/0 .text MemCardGotoIPLSelect__14dFile_select_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dFile_select_c::MemCardGotoIPLSelect() { - nofralloc -#include "asm/d/file/d_file_select/MemCardGotoIPLSelect__14dFile_select_cFv.s" +void dFile_select_c::MemCardGotoIPLSelect() { + if (errYesNoSelect()) { + if (field_0x0268) { + field_0x03b1 = 1; + field_0x03ac = g_fsHIO.field_0x000d; + mDoGph_gInf_c::startFadeOut(field_0x03ac); + mFadeFlag = true; + field_0x0271 = 21; + } else { + yesnoWakuAlpahAnmInit(field_0x0268, 0xff, 0, g_fsHIO.field_0x0008); + noSaveSelDispInit(); + field_0x0271 = 3; + } + } } -#pragma pop /* 8018EBCC-8018EC4C 18950C 0080+00 1/0 0/0 0/0 .text MemCardGotoIPL__14dFile_select_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dFile_select_c::MemCardGotoIPL() { - nofralloc -#include "asm/d/file/d_file_select/MemCardGotoIPL__14dFile_select_cFv.s" +void dFile_select_c::MemCardGotoIPL() { + if (field_0x03ac != 0) { + field_0x03ac--; + } else { + mHasDrawn = true; + mDoGph_gInf_c::startFadeIn(0); + mFadeFlag = false; + mDoRst::onShutdown(); + } } -#pragma pop /* 8018EC4C-8018ECBC 18958C 0070+00 7/1 0/0 0/0 .text noSaveSelDispInit__14dFile_select_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dFile_select_c::noSaveSelDispInit() { - nofralloc -#include "asm/d/file/d_file_select/noSaveSelDispInit__14dFile_select_cFv.s" +void dFile_select_c::noSaveSelDispInit() { + errorTxtSet(19); + field_0x0282 = false; + if (!field_0x0108) { + ketteiTxtDispAnmInit(1); + field_0x0280 = true; + yesnoMenuMoveAnmInitSet(0x473, 0x47d); + field_0x0282 = true; + } } -#pragma pop /* 8018ECBC-8018ED80 1895FC 00C4+00 1/0 0/0 0/0 .text MemCardNoSaveSelDisp__14dFile_select_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dFile_select_c::MemCardNoSaveSelDisp() { - nofralloc -#include "asm/d/file/d_file_select/MemCardNoSaveSelDisp__14dFile_select_cFv.s" +void dFile_select_c::MemCardNoSaveSelDisp() { + bool iVar1 = errorTxtChangeAnm(); + bool iVar3 = true; + bool iVar2 = true; + if (field_0x0282) { + if (field_0x0280) { + iVar3 = yesnoMenuMoveAnm(); + iVar2 = ketteiTxtDispAnm(); + } + } else { + iVar3 = yesnoWakuAlpahAnm(field_0x0268); + } + if (iVar1 == true && iVar3 == true && iVar2 == true) { + if (field_0x0280) { + yesnoCursorShow(); + } + field_0x0271 = 4; + } } -#pragma pop /* 8018ED80-8018EF5C 1896C0 01DC+00 1/0 0/0 0/0 .text * MemCardErrMsgWaitNoSaveSel__14dFile_select_cFv */ +// Matches with literals +#ifdef NONMATCHING +void dFile_select_c::MemCardErrMsgWaitNoSaveSel() { + if (!errYesNoSelect()) { + return; + } + + if (field_0x0268 != 0) { + setInitSaveData(); + dComIfGs_setCardToMemory((char*)mSave, 0); + dComIfGs_setNoFile(1); + dComIfGs_setDataNum(0); + for (int i = 0; i < 3; i++) { + mDataNew[i] = 1; + } + headerTxtSet(901, 1, 0); + mSelIcon->setAlphaRate(1.0f); + char auStack_38[32]; + dMeter2Info_getString(0x382, auStack_38, 0); + dComIfGs_setPlayerName(auStack_38); + dMeter2Info_getString(899, auStack_38, 0); + dComIfGs_setHorseName(auStack_38); + mpName->setNextNameStr(dComIfGs_getPlayerName()); + mpName->initial(); + modoruTxtChange(1); + nameMoveAnmInitSet(3359, 3369); + yesnoMenuMoveAnmInitSet(1149, 1139); + errorMoveAnmInitSet(2859, 2849); + modoruTxtDispAnmInit(1); + ketteiTxtDispAnmInit(1); + field_0x026f = 45; + } else { + field_0x0284 = NULL; + field_0x0273 = 0; + ketteiTxtDispAnmInit(0); + errorMoveAnmInitSet(2859, 2849); + yesnoMenuMoveAnmInitSet(1149, 1139); + field_0x0271 = 24; + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -4467,42 +6171,54 @@ asm void dFile_select_c::MemCardErrMsgWaitNoSaveSel() { #include "asm/d/file/d_file_select/MemCardErrMsgWaitNoSaveSel__14dFile_select_cFv.s" } #pragma pop +#endif /* 8018EF5C-8018EFAC 18989C 0050+00 1/1 0/0 0/0 .text formatYesSelDispInitSet__14dFile_select_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dFile_select_c::formatYesSelDispInitSet() { - nofralloc -#include "asm/d/file/d_file_select/formatYesSelDispInitSet__14dFile_select_cFv.s" +void dFile_select_c::formatYesSelDispInitSet() { + errorTxtSet(14); + field_0x0268 = 0; + field_0x0269 = 1; + yesnoSelectAnmSet(); + field_0x0271 = 6; } -#pragma pop /* 8018EFAC-8018EFFC 1898EC 0050+00 2/2 0/0 0/0 .text formatNoSelDispInitSet__14dFile_select_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dFile_select_c::formatNoSelDispInitSet() { - nofralloc -#include "asm/d/file/d_file_select/formatNoSelDispInitSet__14dFile_select_cFv.s" +void dFile_select_c::formatNoSelDispInitSet() { + errorTxtSet(17); + field_0x0280 = false; + yesnoMenuMoveAnmInitSet(0x47d, 0x473); + field_0x0271 = 7; } -#pragma pop /* 8018EFFC-8018F080 18993C 0084+00 1/0 0/0 0/0 .text MemCardFormatYesSelDisp__14dFile_select_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dFile_select_c::MemCardFormatYesSelDisp() { - nofralloc -#include "asm/d/file/d_file_select/MemCardFormatYesSelDisp__14dFile_select_cFv.s" +void dFile_select_c::MemCardFormatYesSelDisp() { + bool iVar1 = errorTxtChangeAnm(); + bool iVar2 = yesnoSelectMoveAnm(); + bool iVar3 = yesnoWakuAlpahAnm(field_0x0269); + if (iVar1 == true && iVar2 == true && iVar3 == true) { + yesnoCursorShow(); + field_0x0271 = 8; + } } -#pragma pop /* 8018F080-8018F128 1899C0 00A8+00 1/0 0/0 0/0 .text MemCardFormatNoSelDisp__14dFile_select_cFv */ +// Matches with literals +#ifdef NONMATCHING +void dFile_select_c::MemCardFormatNoSelDisp() { + bool iVar1 = errorTxtChangeAnm(); + bool iVar2 = yesnoMenuMoveAnm(); + if (iVar1 == true && iVar2 == true) { + field_0x0284 = NULL; + field_0x0290 = &dFile_select_c::noSaveSelDispInit; + field_0x0274 = 3; + field_0x0271 = 2; + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -4511,95 +6227,131 @@ asm void dFile_select_c::MemCardFormatNoSelDisp() { #include "asm/d/file/d_file_select/MemCardFormatNoSelDisp__14dFile_select_cFv.s" } #pragma pop +#endif /* 8018F128-8018F17C 189A68 0054+00 1/0 0/0 0/0 .text * MemCardErrMsgWaitFormatSel__14dFile_select_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dFile_select_c::MemCardErrMsgWaitFormatSel() { - nofralloc -#include "asm/d/file/d_file_select/MemCardErrMsgWaitFormatSel__14dFile_select_cFv.s" +void dFile_select_c::MemCardErrMsgWaitFormatSel() { + if (errYesNoSelect()) { + if (field_0x0268) { + formatYesSelDispInitSet(); + } else { + formatNoSelDispInitSet(); + } + } } -#pragma pop /* 8018F17C-8018F1CC 189ABC 0050+00 1/1 0/0 0/0 .text formatYesSel2DispInitSet__14dFile_select_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dFile_select_c::formatYesSel2DispInitSet() { - nofralloc -#include "asm/d/file/d_file_select/formatYesSel2DispInitSet__14dFile_select_cFv.s" +void dFile_select_c::formatYesSel2DispInitSet() { + errorTxtSet(13); + field_0x0280 = false; + yesnoMenuMoveAnmInitSet(0x47d, 0x473); + field_0x0271 = 9; } -#pragma pop /* 8018F1CC-8018F228 189B0C 005C+00 1/0 0/0 0/0 .text * MemCardErrMsgWaitFormatSel2__14dFile_select_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dFile_select_c::MemCardErrMsgWaitFormatSel2() { - nofralloc -#include "asm/d/file/d_file_select/MemCardErrMsgWaitFormatSel2__14dFile_select_cFv.s" +void dFile_select_c::MemCardErrMsgWaitFormatSel2() { + if (errYesNoSelect()) { + if (field_0x0268) { + field_0x03b1 = 1; + formatYesSel2DispInitSet(); + } else { + formatNoSelDispInitSet(); + } + } } -#pragma pop /* 8018F228-8018F2A4 189B68 007C+00 1/0 0/0 0/0 .text MemCardFormatYesSel2Disp__14dFile_select_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dFile_select_c::MemCardFormatYesSel2Disp() { - nofralloc -#include "asm/d/file/d_file_select/MemCardFormatYesSel2Disp__14dFile_select_cFv.s" +void dFile_select_c::MemCardFormatYesSel2Disp() { + bool iVar1 = errorTxtChangeAnm(); + bool iVar2 = yesnoMenuMoveAnm(); + if (iVar1 == true && iVar2 == true) { + field_0x03ac = g_fsHIO.field_0x000c; + mDoMemCd_Format(); + field_0x0271 = 10; + } } -#pragma pop /* 8018F2A4-8018F304 189BE4 0060+00 1/0 0/0 0/0 .text MemCardFormat__14dFile_select_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dFile_select_c::MemCardFormat() { - nofralloc -#include "asm/d/file/d_file_select/MemCardFormat__14dFile_select_cFv.s" +void dFile_select_c::MemCardFormat() { + if (field_0x03ac != 0) { + field_0x03ac--; + } + field_0x03b4 = mDoMemCd_FormatSync(); + if (field_0x03b4 != 0) { + field_0x0271 = 11; + } } -#pragma pop /* 8018F304-8018F374 189C44 0070+00 1/0 0/0 0/0 .text MemCardFormatWait__14dFile_select_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dFile_select_c::MemCardFormatWait() { - nofralloc -#include "asm/d/file/d_file_select/MemCardFormatWait__14dFile_select_cFv.s" +void dFile_select_c::MemCardFormatWait() { + if (field_0x03ac != 0) { + field_0x03ac--; + } else { + if (field_0x03b4 == 2) { + errorTxtSet(11); + } else if (field_0x03b4 == 1) { + errorTxtSet(12); + } + field_0x0271 = 12; + } } -#pragma pop /* 8018F374-8018F400 189CB4 008C+00 1/0 0/0 0/0 .text MemCardFormatCheck__14dFile_select_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dFile_select_c::MemCardFormatCheck() { - nofralloc -#include "asm/d/file/d_file_select/MemCardFormatCheck__14dFile_select_cFv.s" +void dFile_select_c::MemCardFormatCheck() { + if (errorTxtChangeAnm() == true) { + field_0x0284 = NULL; + field_0x0290 = NULL; + field_0x0273 = 0; + field_0x0274 = 24; + field_0x0271 = 2; + field_0x03b1 = 0; + } } -#pragma pop /* 8018F400-8018F488 189D40 0088+00 1/0 0/0 0/0 .text MemCardMakeGameFileSel__14dFile_select_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dFile_select_c::MemCardMakeGameFileSel() { - nofralloc -#include "asm/d/file/d_file_select/MemCardMakeGameFileSel__14dFile_select_cFv.s" +void dFile_select_c::MemCardMakeGameFileSel() { + if (errYesNoSelect()) { + if (field_0x0268 != 0) { + errorTxtSet(27); + field_0x03b1 = 1; + } else { + errorTxtSet(25); + } + ketteiTxtDispAnmInit(0); + yesnoMenuMoveAnmInitSet(0x47d, 0x473); + field_0x0271 = 14; + } } -#pragma pop /* 8018F488-8018F580 189DC8 00F8+00 1/0 0/0 0/0 .text * MemCardMakeGameFileSelDisp__14dFile_select_cFv */ +// Matches with literals +#ifdef NONMATCHING +void dFile_select_c::MemCardMakeGameFileSelDisp() { + bool iVar1 = errorTxtChangeAnm(); + bool iVar2 = yesnoMenuMoveAnm(); + bool iVar3 = ketteiTxtDispAnm(); + if (iVar1 == true && iVar2 == true && iVar3 == true) { + if (field_0x0268 != 0) { + field_0x03ac = g_fsHIO.field_0x000c; + setInitSaveData(); + dataSave(); + field_0x0271 = 15; + } else { + field_0x0284 = NULL; + field_0x0290 = &dFile_select_c::noSaveSelDispInit; + field_0x0274 = 3; + field_0x0271 = 2; + } + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -4608,82 +6360,177 @@ asm void dFile_select_c::MemCardMakeGameFileSelDisp() { #include "asm/d/file/d_file_select/MemCardMakeGameFileSelDisp__14dFile_select_cFv.s" } #pragma pop +#endif /* 8018F580-8018F5E0 189EC0 0060+00 1/0 0/0 0/0 .text MemCardMakeGameFile__14dFile_select_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dFile_select_c::MemCardMakeGameFile() { - nofralloc -#include "asm/d/file/d_file_select/MemCardMakeGameFile__14dFile_select_cFv.s" +void dFile_select_c::MemCardMakeGameFile() { + if (field_0x03ac != 0) { + field_0x03ac--; + } + field_0x03b4 = mDoMemCd_SaveSync(); + if (field_0x03b4 != 0) { + field_0x0271 = 16; + } } -#pragma pop /* 8018F5E0-8018F650 189F20 0070+00 1/0 0/0 0/0 .text MemCardMakeGameFileWait__14dFile_select_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dFile_select_c::MemCardMakeGameFileWait() { - nofralloc -#include "asm/d/file/d_file_select/MemCardMakeGameFileWait__14dFile_select_cFv.s" +void dFile_select_c::MemCardMakeGameFileWait() { + if (field_0x03ac != 0) { + field_0x03ac--; + } else { + if (field_0x03b4 == 1) { + errorTxtSet(0x1c); + } else if (field_0x03b4 == 2) { + errorTxtSet(0x1a); + } + field_0x0271 = 17; + } } -#pragma pop /* 8018F650-8018F6DC 189F90 008C+00 1/0 0/0 0/0 .text MemCardMakeGameFileCheck__14dFile_select_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dFile_select_c::MemCardMakeGameFileCheck() { - nofralloc -#include "asm/d/file/d_file_select/MemCardMakeGameFileCheck__14dFile_select_cFv.s" +void dFile_select_c::MemCardMakeGameFileCheck() { + if (errorTxtChangeAnm() == 1) { + field_0x0284 = NULL; + field_0x0290 = NULL; + field_0x0273 = 0; + field_0x0274 = 24; + field_0x0271 = 2; + field_0x03b1 = 0; + } } -#pragma pop /* 8018F6DC-8018F8D8 18A01C 01FC+00 1/0 0/0 0/0 .text MemCardMsgWindowInitOpen__14dFile_select_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dFile_select_c::MemCardMsgWindowInitOpen() { - nofralloc -#include "asm/d/file/d_file_select/MemCardMsgWindowInitOpen__14dFile_select_cFv.s" +void dFile_select_c::MemCardMsgWindowInitOpen() { + bool iVar1; + if (field_0x021e == 0x0) { + iVar1 = headerTxtChangeAnm(); + } else { + iVar1 = true; + } + bool iVar8 = true; + bool iVar7 = true; + bool iVar6 = true; + bool iVar5 = true; + if (field_0x00b8 || field_0x00b9) { + iVar8 = selectDataBaseMoveAnm(); + } + if (field_0x0108 || field_0x0281) { + iVar7 = yesnoMenuMoveAnm(); + } + if (field_0x0360 || field_0x0283) { + iVar6 = menuMoveAnm(); + } + if (field_0x014a || field_0x014b) { + iVar5 = errorMoveAnm(); + } + bool iVar2 = modoruTxtDispAnm(); + bool iVar3 = ketteiTxtDispAnm(); + bool iVar4 = true; + if (field_0x0128 || mCpSel.field_0x08) { + iVar4 = nameMoveAnm(); + } + if (iVar1 == true && iVar8 == true && iVar7 == true && iVar6 == true && iVar5 == true && + iVar2 == true && iVar3 == true && iVar4 == true) + { + fileSel.Scr->clearAnmTransform(); + setWakuAnm(); + errorMoveAnmInitSet(0xb21, 0xb2b); + if (field_0x0280) { + yesnoMenuMoveAnmInitSet(0x473, 0x47d); + ketteiTxtDispAnmInit(1); + } else { + ketteiTxtDispAnmInit(0); + } + field_0x021e = 1; + field_0x0271 = 23; + } } -#pragma pop /* 8018F8D8-8018F974 18A218 009C+00 1/0 0/0 0/0 .text MemCardMsgWindowOpen__14dFile_select_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dFile_select_c::MemCardMsgWindowOpen() { - nofralloc -#include "asm/d/file/d_file_select/MemCardMsgWindowOpen__14dFile_select_cFv.s" +void dFile_select_c::MemCardMsgWindowOpen() { + bool iVar1 = errorMoveAnm(); + bool iVar3 = true; + if (field_0x0280) { + iVar3 = yesnoMenuMoveAnm(); + } + bool iVar2 = ketteiTxtDispAnm(); + if (iVar1 == true && iVar3 == true && iVar2 == true) { + if (field_0x0280) { + yesnoCursorShow(); + } + field_0x0271 = field_0x0273; + } } -#pragma pop /* 8018F974-8018FA2C 18A2B4 00B8+00 1/0 0/0 0/0 .text MemCardMsgWindowClose__14dFile_select_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dFile_select_c::MemCardMsgWindowClose() { - nofralloc -#include "asm/d/file/d_file_select/MemCardMsgWindowClose__14dFile_select_cFv.s" +void dFile_select_c::MemCardMsgWindowClose() { + bool errorRes = errorMoveAnm(); + bool menuMoveRes = true; + bool textAnmRes = true; + if (field_0x0108) { + menuMoveRes = yesnoMenuMoveAnm(); + textAnmRes = ketteiTxtDispAnm(); + } + if (errorRes == true && menuMoveRes == true && textAnmRes == true) { + field_0x0280 = false; + if (field_0x0284 != NULL) { + (this->*field_0x0284)(); + } else { + field_0x0271 = field_0x0273; + } + } } -#pragma pop /* 8018FA2C-8018FB80 18A36C 0154+00 5/5 0/0 0/0 .text errYesNoSelect__14dFile_select_cFv */ +// Matches with literals +#ifdef NONMATCHING +bool dFile_select_c::errYesNoSelect() { + bool rv = false; + mStick->checkTrigger(); + if (mDoCPd_c::getTrigA(0) != 0) { + if (field_0x0268 != 0) { + mDoAud_seStart(Z2SE_SY_CURSOR_OK, 0, 0, 0); + } else { + mDoAud_seStart(Z2SE_SY_CURSOR_CANCEL, 0, 0, 0); + } + mSelIcon->setAlphaRate(0.0f); + rv = true; + } else if (mStick->checkRightTrigger() && field_0x0268) { + field_0x0269 = field_0x0268; + field_0x0268 = field_0x0268 ^ 1; + errCurMove(0); + } else if (mStick->checkLeftTrigger() && field_0x0268 != 1) { + field_0x0269 = field_0x0268; + field_0x0268 = field_0x0268 ^ 1; + errCurMove(0); + } + return rv; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dFile_select_c::errYesNoSelect() { +asm bool dFile_select_c::errYesNoSelect() { nofralloc #include "asm/d/file/d_file_select/errYesNoSelect__14dFile_select_cFv.s" } #pragma pop +#endif /* 8018FB80-8018FBF8 18A4C0 0078+00 1/1 0/0 0/0 .text errCurMove__14dFile_select_cFUc */ +// Matches with literals +#ifdef NONMATCHING +void dFile_select_c::errCurMove(u8 param_1) { + mDoAud_seStart(Z2SE_SY_MENU_CURSOR_COMMON, 0, param_1, 0); + yesnoSelectAnmSet(); + field_0x0272 = field_0x0271; + field_0x0271 = 25; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -4692,19 +6539,35 @@ asm void dFile_select_c::errCurMove(u8 param_0) { #include "asm/d/file/d_file_select/errCurMove__14dFile_select_cFUc.s" } #pragma pop +#endif /* 8018FBF8-8018FC64 18A538 006C+00 1/0 0/0 0/0 .text * MemCardErrYesNoCursorMoveAnm__14dFile_select_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dFile_select_c::MemCardErrYesNoCursorMoveAnm() { - nofralloc -#include "asm/d/file/d_file_select/MemCardErrYesNoCursorMoveAnm__14dFile_select_cFv.s" +void dFile_select_c::MemCardErrYesNoCursorMoveAnm() { + bool moveRes = yesnoSelectMoveAnm(); + bool anmRes = yesnoWakuAlpahAnm(field_0x0269); + if (moveRes == true && anmRes == true) { + yesnoCursorShow(); + field_0x0271 = field_0x0272; + } } -#pragma pop /* 8018FC64-8018FD30 18A5A4 00CC+00 9/9 0/0 0/0 .text errorTxtSet__14dFile_select_cFUs */ +// Matches with literals +#ifdef NONMATCHING +void dFile_select_c::errorTxtSet(u16 param_1) { + if (param_1 == 0xffff) { + strcpy(field_0x0140[field_0x0148 ^ 1], ""); + } else { + mpMessageString->getString(param_1, + (J2DTextBox*)field_0x0138[field_0x0148 ^ 1]->getPanePtr(), NULL, + mpMessageFont, NULL, 0); + } + field_0x0138[field_0x0148]->alphaAnimeStart(0); + field_0x0138[field_0x0148 ^ 1]->alphaAnimeStart(0); + field_0x0149 = 0; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -4713,25 +6576,52 @@ asm void dFile_select_c::errorTxtSet(u16 param_0) { #include "asm/d/file/d_file_select/errorTxtSet__14dFile_select_cFUs.s" } #pragma pop +#endif /* 8018FD30-8018FE18 18A670 00E8+00 9/9 0/0 0/0 .text errorTxtChangeAnm__14dFile_select_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dFile_select_c::errorTxtChangeAnm() { - nofralloc -#include "asm/d/file/d_file_select/errorTxtChangeAnm__14dFile_select_cFv.s" +bool dFile_select_c::errorTxtChangeAnm() { + if (field_0x0149) { + return true; + } + bool rv = false; + bool animeRes1 = field_0x0138[field_0x0148]->alphaAnime(g_fsHIO.field_0x0007, 0xff, 0, 0); + bool animeRes2 = field_0x0138[field_0x0148 ^ 1]->alphaAnime(g_fsHIO.field_0x0007, 0, 0xff, 0); + s32 timer = dMeter2Info_getMsgKeyWaitTimer(); + if (animeRes1 == true && animeRes2 == true && timer == 0) { + field_0x0148 ^= 1; + field_0x0149 = 1; + rv = true; + } + + return rv; } -#pragma pop /* 8018FE18-8018FE64 18A758 004C+00 1/1 0/0 0/0 .text fileRecScaleAnm__14dFile_select_cFv */ bool dFile_select_c::fileRecScaleAnm() { - return field_0x00bc[mSelectNum]->scaleAnime(g_fsHIO.field_0x0005,field_0x00c8,field_0x00d4,0); + return field_0x00bc[mSelectNum]->scaleAnime(g_fsHIO.field_0x0005, field_0x00c8[0], + field_0x00d4[0], 0); } /* 8018FE64-8018FEF4 18A7A4 0090+00 2/2 0/0 0/0 .text fileRecScaleAnmInitSet2__14dFile_select_cFff */ +#ifdef NONMATCHING +void dFile_select_c::fileRecScaleAnmInitSet2(f32 param_1, f32 param_2) { + for (int i = 0; (int)i < 3; i++) { + field_0x00c8[i] = param_1; + field_0x00d4[i] = param_2; + if (i == mSelectNum) { + if (param_1 > 0.0f) { + field_0x00c8[i] = g_fsHIO.field_0x0010[mSelectNum]; + } + if (param_2 > 0.0f) { + field_0x00d4[i] = g_fsHIO.field_0x0010[mSelectNum]; + } + } + field_0x00bc[i]->scaleAnimeStart(0); + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -4740,16 +6630,20 @@ asm void dFile_select_c::fileRecScaleAnmInitSet2(f32 param_0, f32 param_1) { #include "asm/d/file/d_file_select/fileRecScaleAnmInitSet2__14dFile_select_cFff.s" } #pragma pop +#endif /* 8018FEF4-8018FF9C 18A834 00A8+00 2/2 0/0 0/0 .text fileRecScaleAnm2__14dFile_select_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool dFile_select_c::fileRecScaleAnm2() { - nofralloc -#include "asm/d/file/d_file_select/fileRecScaleAnm2__14dFile_select_cFv.s" +bool dFile_select_c::fileRecScaleAnm2() { + bool scaleRes[3]; + for (int i = 0; i < 3; i++) { + scaleRes[i] = + field_0x00bc[i]->scaleAnime(g_fsHIO.field_0x0005, field_0x00c8[i], field_0x00d4[i], 0); + } + if (scaleRes[0] == true && scaleRes[1] == true && scaleRes[2] == true) { + return true; + } + return false; } -#pragma pop /* 8018FF9C-80190074 18A8DC 00D8+00 1/1 0/0 0/0 .text fileInfoScaleAnm__14dFile_select_cFv */ #ifdef NONMATCHING @@ -4770,7 +6664,7 @@ bool dFile_select_c::fileInfoScaleAnm() { field_0x0110 = field_0x0114; } - mpAnmBase[6]->setFrame(field_0x0110); + field_0x0098->setFrame(field_0x0110); mpPane->animationTransform(); ret = false; } @@ -4794,6 +6688,22 @@ asm bool dFile_select_c::fileInfoScaleAnm() { #endif /* 80190074-80190124 18A9B4 00B0+00 5/5 0/0 0/0 .text nameMoveAnmInitSet__14dFile_select_cFii */ +// Matches with literals +#ifdef NONMATCHING +void dFile_select_c::nameMoveAnmInitSet(int param_1, int param_2) { + if (param_1 == 3359) { + field_0x0128 = true; + } + if (param_1 == 3369) { + mpName->hideIcon(); + } + field_0x011c->setAnimation(field_0x0094); + field_0x0120 = param_1; + field_0x0124 = param_2; + field_0x0094->setFrame(field_0x0120); + field_0x011c->animationTransform(); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -4802,6 +6712,7 @@ asm void dFile_select_c::nameMoveAnmInitSet(int param_0, int param_1) { #include "asm/d/file/d_file_select/nameMoveAnmInitSet__14dFile_select_cFii.s" } #pragma pop +#endif /* 80190124-80190208 18AA64 00E4+00 9/9 0/0 0/0 .text nameMoveAnm__14dFile_select_cFv */ #ifdef NONMATCHING @@ -4821,7 +6732,7 @@ bool dFile_select_c::nameMoveAnm() { field_0x0120 = field_0x0124; } } - mpAnmBase[4]->setFrame(field_0x0120); + field_0x0094->setFrame(field_0x0120); field_0x011c->animationTransform(); return false; } else { @@ -4829,7 +6740,7 @@ bool dFile_select_c::nameMoveAnm() { if (field_0x0124 == 0xd1f) { field_0x0128 = false; - mFileSelCopyDlst.field_0x08 = false; + mCpSel.field_0x08 = false; } return true; } @@ -4846,41 +6757,26 @@ asm bool dFile_select_c::nameMoveAnm() { #endif /* 80190208-80190254 18AB48 004C+00 1/0 0/0 0/0 .text MemCardSaveDataClear__14dFile_select_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dFile_select_c::MemCardSaveDataClear() { - nofralloc -#include "asm/d/file/d_file_select/MemCardSaveDataClear__14dFile_select_cFv.s" +void dFile_select_c::MemCardSaveDataClear() { + field_0x03b4 = mDoMemCd_SaveSync(); + if (field_0x03b4 != 0) { + field_0x0271 = 0; + } } -#pragma pop /* 80190254-801902B8 18AB94 0064+00 2/2 0/0 0/0 .text setInitSaveData__14dFile_select_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dFile_select_c::setInitSaveData() { - nofralloc -#include "asm/d/file/d_file_select/setInitSaveData__14dFile_select_cFv.s" +void dFile_select_c::setInitSaveData() { + for (int i = 0; i < 3; i++) { + dComIfGs_setInitDataToCard((u8*)mSave, i); + mDoMemCdRWm_SetCheckSumGameData((u8*)mSave, i); + } } -#pragma pop /* 801902B8-801902F0 18ABF8 0038+00 2/2 0/0 0/0 .text dataSave__14dFile_select_cFv */ -#ifndef NONMATCHING void dFile_select_c::dataSave() { - mDoMemCd_save(&mpMemCard,0x1fbc,0); + mDoMemCd_save(mSave, sizeof(mSave), 0); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dFile_select_c::dataSave() { - nofralloc -#include "asm/d/file/d_file_select/dataSave__14dFile_select_cFv.s" -} -#pragma pop -#endif /* 801902F0-80190380 18AC30 0090+00 1/1 0/0 0/0 .text __ct__16dFile_select3D_cFv */ // vtable data @@ -5003,22 +6899,22 @@ void dFile_select3D_c::draw() { /* 8019065C-8019095C 18AF9C 0300+00 2/2 0/0 0/0 .text setJ3D__16dFile_select3D_cFPCcPCcPCc */ #ifdef NONMATCHING -// double branch, regswap +// regswap void dFile_select3D_c::setJ3D(char const* param_0, char const* param_1, char const* param_2) { JKRArchive* archive = dComIfGp_getCollectResArchive(); J3DModelData* modelData = (J3DModelData*)J3DModelLoaderDataBase::load( archive->getResource('BMD ', param_0), 0x51020010); for (u16 i = 0; i < modelData->getMaterialNum(); i++) { - J3DMaterialAnm* local_48 = new J3DMaterialAnm(); + J3DMaterialAnm* material = new J3DMaterialAnm(); modelData->getMaterialNodePointer(i)->change(); - modelData->getMaterialNodePointer(i)->setMaterialAnm(local_48); + modelData->getMaterialNodePointer(i)->setMaterialAnm(material); } mpModel = new J3DModel(modelData, 0, 1); if (param_1) { J3DAnmTransform* pbck = (J3DAnmTransform*)J3DAnmLoaderDataBase::load(archive->getResource('BCK ', param_1)); mBckAnm = new mDoExt_bckAnm(); - if (mBckAnm && !mBckAnm->init(pbck, 1, 2, 1.0f, 0, -1, false)) { + if (mBckAnm == NULL || !mBckAnm->init(pbck, 1, 2, 1.0f, 0, -1, false)) { return; } }