diff --git a/asm/J2DGraph/J2DScreen.s b/asm/J2DGraph/J2DScreen.s index 4512a75254..bf5fcbbc1a 100644 --- a/asm/J2DGraph/J2DScreen.s +++ b/asm/J2DGraph/J2DScreen.s @@ -3,8 +3,8 @@ .section .text, "ax" # 802f8498 -.global J2DScreen -J2DScreen: +.global __ct__9J2DScreenFv +__ct__9J2DScreenFv: /* 802F8498 002F53D8 94 21 FF D0 */ stwu r1, -0x30(r1) /* 802F849C 002F53DC 7C 08 02 A6 */ mflr r0 /* 802F84A0 002F53E0 90 01 00 34 */ stw r0, 0x34(r1) diff --git a/asm/d/a/d_a_alink.s b/asm/d/a/d_a_alink.s index b64fc3f64a..d44c07d63d 100644 --- a/asm/d/a/d_a_alink.s +++ b/asm/d/a/d_a_alink.s @@ -154625,7 +154625,7 @@ daAlink_lockCursor_c_NS_create: /* 80125F64 00122EA4 48 1A 8C E9 */ bl __nw__FUl /* 80125F68 00122EA8 7C 60 1B 79 */ or. r0, r3, r3 /* 80125F6C 00122EAC 41 82 00 0C */ beq lbl_80125F78 -/* 80125F70 00122EB0 48 1D 25 29 */ bl J2DScreen +/* 80125F70 00122EB0 48 1D 25 29 */ bl __ct__9J2DScreenFv /* 80125F74 00122EB4 7C 60 1B 78 */ mr r0, r3 lbl_80125F78: /* 80125F78 00122EB8 90 1E 00 08 */ stw r0, 8(r30) diff --git a/asm/d/bright/d_bright_check.s b/asm/d/bright/d_bright_check.s index e216942fae..054c246ed8 100644 --- a/asm/d/bright/d_bright_check.s +++ b/asm/d/bright/d_bright_check.s @@ -98,7 +98,7 @@ dBrightCheck_c_NS_screenSet: /* 8019305C 0018FF9C 48 13 BB F1 */ bl __nw__FUl /* 80193060 0018FFA0 7C 60 1B 79 */ or. r0, r3, r3 /* 80193064 0018FFA4 41 82 00 0C */ beq lbl_80193070 -/* 80193068 0018FFA8 48 16 54 31 */ bl J2DScreen +/* 80193068 0018FFA8 48 16 54 31 */ bl __ct__9J2DScreenFv /* 8019306C 0018FFAC 7C 60 1B 78 */ mr r0, r3 lbl_80193070: /* 80193070 0018FFB0 90 1E 00 0C */ stw r0, 0xc(r30) diff --git a/asm/d/d_gameover.s b/asm/d/d_gameover.s index ede6cdd173..e3323ea885 100644 --- a/asm/d/d_gameover.s +++ b/asm/d/d_gameover.s @@ -867,7 +867,7 @@ dDlst_GameOverScrnDraw_c: /* 8019B980 001988C0 48 13 32 CD */ bl __nw__FUl /* 8019B984 001988C4 7C 60 1B 79 */ or. r0, r3, r3 /* 8019B988 001988C8 41 82 00 0C */ beq lbl_8019B994 -/* 8019B98C 001988CC 48 15 CB 0D */ bl J2DScreen +/* 8019B98C 001988CC 48 15 CB 0D */ bl __ct__9J2DScreenFv /* 8019B990 001988D0 7C 60 1B 78 */ mr r0, r3 lbl_8019B994: /* 8019B994 001988D4 90 1F 00 04 */ stw r0, 4(r31) diff --git a/asm/d/d_name.s b/asm/d/d_name.s index 58015bbabe..d542e2e269 100644 --- a/asm/d/d_name.s +++ b/asm/d/d_name.s @@ -2391,7 +2391,7 @@ dName_c_NS_screenSet: /* 802505F0 0024D530 48 07 E6 5D */ bl __nw__FUl /* 802505F4 0024D534 7C 60 1B 79 */ or. r0, r3, r3 /* 802505F8 0024D538 41 82 00 0C */ beq lbl_80250604 -/* 802505FC 0024D53C 48 0A 7E 9D */ bl J2DScreen +/* 802505FC 0024D53C 48 0A 7E 9D */ bl __ct__9J2DScreenFv /* 80250600 0024D540 7C 60 1B 78 */ mr r0, r3 lbl_80250604: /* 80250604 0024D544 90 1F 00 10 */ stw r0, 0x10(r31) diff --git a/asm/d/d_timer.s b/asm/d/d_timer.s index 48333f3688..18c3be600a 100644 --- a/asm/d/d_timer.s +++ b/asm/d/d_timer.s @@ -1581,7 +1581,7 @@ lbl_8025E010: /* 8025E020 0025AF60 48 07 0C 2D */ bl __nw__FUl /* 8025E024 0025AF64 7C 60 1B 79 */ or. r0, r3, r3 /* 8025E028 0025AF68 41 82 00 0C */ beq lbl_8025E034 -/* 8025E02C 0025AF6C 48 09 A4 6D */ bl J2DScreen +/* 8025E02C 0025AF6C 48 09 A4 6D */ bl __ct__9J2DScreenFv /* 8025E030 0025AF70 7C 60 1B 78 */ mr r0, r3 lbl_8025E034: /* 8025E034 0025AF74 90 1F 00 08 */ stw r0, 8(r31) @@ -1731,7 +1731,7 @@ dDlst_TimerScrnDraw_c_NS_setScreenBase: /* 8025E258 0025B198 48 07 09 F5 */ bl __nw__FUl /* 8025E25C 0025B19C 7C 60 1B 79 */ or. r0, r3, r3 /* 8025E260 0025B1A0 41 82 00 0C */ beq lbl_8025E26C -/* 8025E264 0025B1A4 48 09 A2 35 */ bl J2DScreen +/* 8025E264 0025B1A4 48 09 A2 35 */ bl __ct__9J2DScreenFv /* 8025E268 0025B1A8 7C 60 1B 78 */ mr r0, r3 lbl_8025E26C: /* 8025E26C 0025B1AC 90 1F 00 04 */ stw r0, 4(r31) @@ -2005,7 +2005,7 @@ dDlst_TimerScrnDraw_c_NS_setScreenBoatRace: /* 8025E684 0025B5C4 48 07 05 C9 */ bl __nw__FUl /* 8025E688 0025B5C8 7C 60 1B 79 */ or. r0, r3, r3 /* 8025E68C 0025B5CC 41 82 00 0C */ beq lbl_8025E698 -/* 8025E690 0025B5D0 48 09 9E 09 */ bl J2DScreen +/* 8025E690 0025B5D0 48 09 9E 09 */ bl __ct__9J2DScreenFv /* 8025E694 0025B5D4 7C 60 1B 78 */ mr r0, r3 lbl_8025E698: /* 8025E698 0025B5D8 90 1F 00 04 */ stw r0, 4(r31) @@ -2163,7 +2163,7 @@ dDlst_TimerScrnDraw_c_NS_setScreenRider: /* 8025E8D0 0025B810 48 07 03 7D */ bl __nw__FUl /* 8025E8D4 0025B814 7C 60 1B 79 */ or. r0, r3, r3 /* 8025E8D8 0025B818 41 82 00 0C */ beq lbl_8025E8E4 -/* 8025E8DC 0025B81C 48 09 9B BD */ bl J2DScreen +/* 8025E8DC 0025B81C 48 09 9B BD */ bl __ct__9J2DScreenFv /* 8025E8E0 0025B820 7C 60 1B 78 */ mr r0, r3 lbl_8025E8E4: /* 8025E8E4 0025B824 90 1F 00 04 */ stw r0, 4(r31) diff --git a/asm/d/file/d_file_select.s b/asm/d/file/d_file_select.s index 0d65b14457..c80b4c0637 100644 --- a/asm/d/file/d_file_select.s +++ b/asm/d/file/d_file_select.s @@ -4964,7 +4964,7 @@ lbl_80187DF8: /* 80187E5C 00184D9C 7C 00 00 34 */ cntlzw r0, r0 /* 80187E60 00184DA0 54 05 DE 3E */ rlwinm r5, r0, 0x1b, 0x18, 0x1f /* 80187E64 00184DA4 57 C6 06 3E */ clrlwi r6, r30, 0x18 -/* 80187E68 00184DA8 48 00 AA ED */ bl dFile_info_c_NS_setSaveData +/* 80187E68 00184DA8 48 00 AA ED */ bl setSaveData__12dFile_info_cFP10dSv_save_ciUc /* 80187E6C 00184DAC 2C 03 FF FF */ cmpwi r3, -1 /* 80187E70 00184DB0 41 82 00 0C */ beq lbl_80187E7C /* 80187E74 00184DB4 2C 03 00 01 */ cmpwi r3, 1 @@ -8170,7 +8170,7 @@ dFile_select_c_NS_screenSet: /* 8018ADDC 00187D1C 48 14 3E 71 */ bl __nw__FUl /* 8018ADE0 00187D20 7C 60 1B 79 */ or. r0, r3, r3 /* 8018ADE4 00187D24 41 82 00 0C */ beq lbl_8018ADF0 -/* 8018ADE8 00187D28 48 16 D6 B1 */ bl J2DScreen +/* 8018ADE8 00187D28 48 16 D6 B1 */ bl __ct__9J2DScreenFv /* 8018ADEC 00187D2C 7C 60 1B 78 */ mr r0, r3 lbl_8018ADF0: /* 8018ADF0 00187D30 90 1F 00 14 */ stw r0, 0x14(r31) @@ -9142,7 +9142,7 @@ lbl_8018BC98: /* 8018BCA4 00188BE4 41 82 00 14 */ beq lbl_8018BCB8 /* 8018BCA8 00188BE8 80 9F 00 08 */ lwz r4, 8(r31) /* 8018BCAC 00188BEC 38 A0 00 00 */ li r5, 0 -/* 8018BCB0 00188BF0 48 00 67 85 */ bl dFile_info_c +/* 8018BCB0 00188BF0 48 00 67 85 */ bl __ct__12dFile_info_cFP10JKRArchiveUc /* 8018BCB4 00188BF4 7C 60 1B 78 */ mr r0, r3 lbl_8018BCB8: /* 8018BCB8 00188BF8 7C 9F CA 14 */ add r4, r31, r25 @@ -9320,7 +9320,7 @@ dFile_select_c_NS_screenSetCopySel: /* 8018BF50 00188E90 48 14 2C FD */ bl __nw__FUl /* 8018BF54 00188E94 7C 60 1B 79 */ or. r0, r3, r3 /* 8018BF58 00188E98 41 82 00 0C */ beq lbl_8018BF64 -/* 8018BF5C 00188E9C 48 16 C5 3D */ bl J2DScreen +/* 8018BF5C 00188E9C 48 16 C5 3D */ bl __ct__9J2DScreenFv /* 8018BF60 00188EA0 7C 60 1B 78 */ mr r0, r3 lbl_8018BF64: /* 8018BF64 00188EA4 90 1F 00 38 */ stw r0, 0x38(r31) @@ -9671,7 +9671,7 @@ lbl_8018C49C: /* 8018C4A8 001893E8 41 82 00 14 */ beq lbl_8018C4BC /* 8018C4AC 001893EC 80 9F 00 08 */ lwz r4, 8(r31) /* 8018C4B0 001893F0 38 A0 00 00 */ li r5, 0 -/* 8018C4B4 001893F4 48 00 5F 81 */ bl dFile_info_c +/* 8018C4B4 001893F4 48 00 5F 81 */ bl __ct__12dFile_info_cFP10JKRArchiveUc /* 8018C4B8 001893F8 7C 60 1B 78 */ mr r0, r3 lbl_8018C4BC: /* 8018C4BC 001893FC 3B 9A 00 7C */ addi r28, r26, 0x7c @@ -9715,7 +9715,7 @@ dFile_select_c_NS_screenSetYesNo: /* 8018C548 00189488 48 14 27 05 */ bl __nw__FUl /* 8018C54C 0018948C 7C 60 1B 79 */ or. r0, r3, r3 /* 8018C550 00189490 41 82 00 0C */ beq lbl_8018C55C -/* 8018C554 00189494 48 16 BF 45 */ bl J2DScreen +/* 8018C554 00189494 48 16 BF 45 */ bl __ct__9J2DScreenFv /* 8018C558 00189498 7C 60 1B 78 */ mr r0, r3 lbl_8018C55C: /* 8018C55C 0018949C 90 1F 00 4C */ stw r0, 0x4c(r31) @@ -9970,7 +9970,7 @@ dFile_select_c_NS_screenSet3Menu: /* 8018C918 00189858 48 14 23 35 */ bl __nw__FUl /* 8018C91C 0018985C 7C 60 1B 79 */ or. r0, r3, r3 /* 8018C920 00189860 41 82 00 0C */ beq lbl_8018C92C -/* 8018C924 00189864 48 16 BB 75 */ bl J2DScreen +/* 8018C924 00189864 48 16 BB 75 */ bl __ct__9J2DScreenFv /* 8018C928 00189868 7C 60 1B 78 */ mr r0, r3 lbl_8018C92C: /* 8018C92C 0018986C 90 1F 00 58 */ stw r0, 0x58(r31) @@ -10224,7 +10224,7 @@ dFile_select_c_NS_screenSetDetail: /* 8018CCE8 00189C28 48 14 1F 65 */ bl __nw__FUl /* 8018CCEC 00189C2C 7C 60 1B 79 */ or. r0, r3, r3 /* 8018CCF0 00189C30 41 82 00 0C */ beq lbl_8018CCFC -/* 8018CCF4 00189C34 48 16 B7 A5 */ bl J2DScreen +/* 8018CCF4 00189C34 48 16 B7 A5 */ bl __ct__9J2DScreenFv /* 8018CCF8 00189C38 7C 60 1B 78 */ mr r0, r3 lbl_8018CCFC: /* 8018CCFC 00189C3C 90 1F 00 28 */ stw r0, 0x28(r31) @@ -10465,7 +10465,7 @@ lbl_8018D068: /* 8018D078 00189FB8 7C 7C 00 2E */ lwzx r3, r28, r0 /* 8018D07C 00189FBC 7F C4 F3 78 */ mr r4, r30 /* 8018D080 00189FC0 57 A6 06 3E */ clrlwi r6, r29, 0x18 -/* 8018D084 00189FC4 48 00 58 D1 */ bl dFile_info_c_NS_setSaveData +/* 8018D084 00189FC4 48 00 58 D1 */ bl setSaveData__12dFile_info_cFP10dSv_save_ciUc /* 8018D088 00189FC8 2C 03 FF FF */ cmpwi r3, -1 /* 8018D08C 00189FCC 40 82 00 1C */ bne lbl_8018D0A8 /* 8018D090 00189FD0 38 00 00 01 */ li r0, 1 @@ -11385,7 +11385,7 @@ dFile_select_c_NS__draw: lbl_8018DD8C: /* 8018DD8C 0018ACCC 38 1F 00 70 */ addi r0, r31, 0x70 /* 8018DD90 0018ACD0 7C 7A 00 2E */ lwzx r3, r26, r0 -/* 8018DD94 0018ACD4 48 00 4F CD */ bl dFile_info_c_NS__draw +/* 8018DD94 0018ACD4 48 00 4F CD */ bl _draw__12dFile_info_cFv /* 8018DD98 0018ACD8 3B 7B 00 01 */ addi r27, r27, 1 /* 8018DD9C 0018ACDC 2C 1B 00 03 */ cmpwi r27, 3 /* 8018DDA0 0018ACE0 3B FF 00 04 */ addi r31, r31, 4 @@ -11410,7 +11410,7 @@ lbl_8018DD8C: lbl_8018DDEC: /* 8018DDEC 0018AD2C 38 1F 00 7C */ addi r0, r31, 0x7c /* 8018DDF0 0018AD30 7C 7A 00 2E */ lwzx r3, r26, r0 -/* 8018DDF4 0018AD34 48 00 4F 6D */ bl dFile_info_c_NS__draw +/* 8018DDF4 0018AD34 48 00 4F 6D */ bl _draw__12dFile_info_cFv /* 8018DDF8 0018AD38 3B 7B 00 01 */ addi r27, r27, 1 /* 8018DDFC 0018AD3C 2C 1B 00 02 */ cmpwi r27, 2 /* 8018DE00 0018AD40 3B FF 00 04 */ addi r31, r31, 4 diff --git a/asm/d/file/sel/d_file_sel_info.s b/asm/d/file/sel/d_file_sel_info.s deleted file mode 100644 index 266de7a4c6..0000000000 --- a/asm/d/file/sel/d_file_sel_info.s +++ /dev/null @@ -1,745 +0,0 @@ -.include "macros.inc" - -.section .text, "ax" # 80192434 - - -.global dFile_info_c -dFile_info_c: -/* 80192434 0018F374 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80192438 0018F378 7C 08 02 A6 */ mflr r0 -/* 8019243C 0018F37C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80192440 0018F380 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80192444 0018F384 7C 7F 1B 78 */ mr r31, r3 -/* 80192448 0018F388 3C C0 80 3C */ lis r6, lbl_803BB598@ha -/* 8019244C 0018F38C 38 06 B5 98 */ addi r0, r6, lbl_803BB598@l -/* 80192450 0018F390 90 03 00 00 */ stw r0, 0(r3) -/* 80192454 0018F394 3C C0 80 3A */ lis r6, lbl_803A6F88@ha -/* 80192458 0018F398 38 06 6F 88 */ addi r0, r6, lbl_803A6F88@l -/* 8019245C 0018F39C 90 03 00 08 */ stw r0, 8(r3) -/* 80192460 0018F3A0 3C C0 80 3C */ lis r6, lbl_803BB588@ha -/* 80192464 0018F3A4 38 06 B5 88 */ addi r0, r6, lbl_803BB588@l -/* 80192468 0018F3A8 90 03 00 08 */ stw r0, 8(r3) -/* 8019246C 0018F3AC 90 83 00 04 */ stw r4, 4(r3) -/* 80192470 0018F3B0 98 A3 00 22 */ stb r5, 0x22(r3) -/* 80192474 0018F3B4 38 00 00 00 */ li r0, 0 -/* 80192478 0018F3B8 90 03 00 14 */ stw r0, 0x14(r3) -/* 8019247C 0018F3BC 48 00 00 F5 */ bl dFile_info_c_NS_screenSet -/* 80192480 0018F3C0 38 00 00 00 */ li r0, 0 -/* 80192484 0018F3C4 98 1F 00 20 */ stb r0, 0x20(r31) -/* 80192488 0018F3C8 7F E3 FB 78 */ mr r3, r31 -/* 8019248C 0018F3CC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80192490 0018F3D0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80192494 0018F3D4 7C 08 03 A6 */ mtlr r0 -/* 80192498 0018F3D8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8019249C 0018F3DC 4E 80 00 20 */ blr -/* 801924A0 0018F3E0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801924A4 0018F3E4 7C 08 02 A6 */ mflr r0 -/* 801924A8 0018F3E8 90 01 00 14 */ stw r0, 0x14(r1) -/* 801924AC 0018F3EC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801924B0 0018F3F0 93 C1 00 08 */ stw r30, 8(r1) -/* 801924B4 0018F3F4 7C 7E 1B 79 */ or. r30, r3, r3 -/* 801924B8 0018F3F8 7C 9F 23 78 */ mr r31, r4 -/* 801924BC 0018F3FC 41 82 00 98 */ beq lbl_80192554 -/* 801924C0 0018F400 3C 60 80 3C */ lis r3, lbl_803BB598@ha -/* 801924C4 0018F404 38 03 B5 98 */ addi r0, r3, lbl_803BB598@l -/* 801924C8 0018F408 90 1E 00 00 */ stw r0, 0(r30) -/* 801924CC 0018F40C 80 7E 00 0C */ lwz r3, 0xc(r30) -/* 801924D0 0018F410 28 03 00 00 */ cmplwi r3, 0 -/* 801924D4 0018F414 41 82 00 18 */ beq lbl_801924EC -/* 801924D8 0018F418 38 80 00 01 */ li r4, 1 -/* 801924DC 0018F41C 81 83 00 00 */ lwz r12, 0(r3) -/* 801924E0 0018F420 81 8C 00 08 */ lwz r12, 8(r12) -/* 801924E4 0018F424 7D 89 03 A6 */ mtctr r12 -/* 801924E8 0018F428 4E 80 04 21 */ bctrl -lbl_801924EC: -/* 801924EC 0018F42C 80 7E 00 24 */ lwz r3, 0x24(r30) -/* 801924F0 0018F430 28 03 00 00 */ cmplwi r3, 0 -/* 801924F4 0018F434 41 82 00 18 */ beq lbl_8019250C -/* 801924F8 0018F438 38 80 00 01 */ li r4, 1 -/* 801924FC 0018F43C 81 83 00 00 */ lwz r12, 0(r3) -/* 80192500 0018F440 81 8C 00 08 */ lwz r12, 8(r12) -/* 80192504 0018F444 7D 89 03 A6 */ mtctr r12 -/* 80192508 0018F448 4E 80 04 21 */ bctrl -lbl_8019250C: -/* 8019250C 0018F44C 80 7E 00 28 */ lwz r3, 0x28(r30) -/* 80192510 0018F450 28 03 00 00 */ cmplwi r3, 0 -/* 80192514 0018F454 41 82 00 18 */ beq lbl_8019252C -/* 80192518 0018F458 38 80 00 01 */ li r4, 1 -/* 8019251C 0018F45C 81 83 00 00 */ lwz r12, 0(r3) -/* 80192520 0018F460 81 8C 00 08 */ lwz r12, 8(r12) -/* 80192524 0018F464 7D 89 03 A6 */ mtctr r12 -/* 80192528 0018F468 4E 80 04 21 */ bctrl -lbl_8019252C: -/* 8019252C 0018F46C 4B E8 25 01 */ bl mDoExt_removeMesgFont -/* 80192530 0018F470 34 1E 00 08 */ addic. r0, r30, 8 -/* 80192534 0018F474 41 82 00 10 */ beq lbl_80192544 -/* 80192538 0018F478 3C 60 80 3C */ lis r3, lbl_803BB588@ha -/* 8019253C 0018F47C 38 03 B5 88 */ addi r0, r3, lbl_803BB588@l -/* 80192540 0018F480 90 1E 00 08 */ stw r0, 8(r30) -lbl_80192544: -/* 80192544 0018F484 7F E0 07 35 */ extsh. r0, r31 -/* 80192548 0018F488 40 81 00 0C */ ble lbl_80192554 -/* 8019254C 0018F48C 7F C3 F3 78 */ mr r3, r30 -/* 80192550 0018F490 48 13 C7 ED */ bl __dl__FPv -lbl_80192554: -/* 80192554 0018F494 7F C3 F3 78 */ mr r3, r30 -/* 80192558 0018F498 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8019255C 0018F49C 83 C1 00 08 */ lwz r30, 8(r1) -/* 80192560 0018F4A0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80192564 0018F4A4 7C 08 03 A6 */ mtlr r0 -/* 80192568 0018F4A8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8019256C 0018F4AC 4E 80 00 20 */ blr - -.global dFile_info_c_NS_screenSet -dFile_info_c_NS_screenSet: -/* 80192570 0018F4B0 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80192574 0018F4B4 7C 08 02 A6 */ mflr r0 -/* 80192578 0018F4B8 90 01 00 34 */ stw r0, 0x34(r1) -/* 8019257C 0018F4BC 39 61 00 30 */ addi r11, r1, 0x30 -/* 80192580 0018F4C0 48 1C FC 51 */ bl _savegpr_26 -/* 80192584 0018F4C4 7C 7F 1B 78 */ mr r31, r3 -/* 80192588 0018F4C8 38 60 01 18 */ li r3, 0x118 -/* 8019258C 0018F4CC 48 13 C6 C1 */ bl __nw__FUl -/* 80192590 0018F4D0 7C 60 1B 79 */ or. r0, r3, r3 -/* 80192594 0018F4D4 41 82 00 0C */ beq lbl_801925A0 -/* 80192598 0018F4D8 48 16 5F 01 */ bl J2DScreen -/* 8019259C 0018F4DC 7C 60 1B 78 */ mr r0, r3 -lbl_801925A0: -/* 801925A0 0018F4E0 90 1F 00 0C */ stw r0, 0xc(r31) -/* 801925A4 0018F4E4 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 801925A8 0018F4E8 3C 80 80 39 */ lis r4, lbl_803948B8@ha -/* 801925AC 0018F4EC 38 84 48 B8 */ addi r4, r4, lbl_803948B8@l -/* 801925B0 0018F4F0 3C A0 01 10 */ lis r5, 0x110 -/* 801925B4 0018F4F4 80 DF 00 04 */ lwz r6, 4(r31) -/* 801925B8 0018F4F8 48 16 60 91 */ bl J2DScreen_NS_setPriority -/* 801925BC 0018F4FC 4B E8 24 35 */ bl mDoExt_getMesgFont -/* 801925C0 0018F500 90 7F 00 10 */ stw r3, 0x10(r31) -/* 801925C4 0018F504 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 801925C8 0018F508 3C 80 5F 65 */ lis r4, 0x5F656631@ha -/* 801925CC 0018F50C 38 C4 66 31 */ addi r6, r4, 0x5F656631@l -/* 801925D0 0018F510 3C 80 77 5F */ lis r4, 0x775F6370@ha -/* 801925D4 0018F514 38 A4 63 70 */ addi r5, r4, 0x775F6370@l -/* 801925D8 0018F518 81 83 00 00 */ lwz r12, 0(r3) -/* 801925DC 0018F51C 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801925E0 0018F520 7D 89 03 A6 */ mtctr r12 -/* 801925E4 0018F524 4E 80 04 21 */ bctrl -/* 801925E8 0018F528 38 00 00 00 */ li r0, 0 -/* 801925EC 0018F52C 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 801925F0 0018F530 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 801925F4 0018F534 3C 80 74 5F */ lis r4, 0x745F6931@ha -/* 801925F8 0018F538 38 C4 69 31 */ addi r6, r4, 0x745F6931@l -/* 801925FC 0018F53C 3C 80 77 5F */ lis r4, 0x775F6461@ha -/* 80192600 0018F540 38 A4 64 61 */ addi r5, r4, 0x775F6461@l -/* 80192604 0018F544 81 83 00 00 */ lwz r12, 0(r3) -/* 80192608 0018F548 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 8019260C 0018F54C 7D 89 03 A6 */ mtctr r12 -/* 80192610 0018F550 4E 80 04 21 */ bctrl -/* 80192614 0018F554 90 7F 00 18 */ stw r3, 0x18(r31) -/* 80192618 0018F558 38 60 00 1C */ li r3, 0x1c -/* 8019261C 0018F55C 48 13 C6 31 */ bl __nw__FUl -/* 80192620 0018F560 7C 60 1B 79 */ or. r0, r3, r3 -/* 80192624 0018F564 41 82 00 28 */ beq lbl_8019264C -/* 80192628 0018F568 80 9F 00 0C */ lwz r4, 0xc(r31) -/* 8019262C 0018F56C 3C A0 74 5F */ lis r5, 0x745F6931@ha -/* 80192630 0018F570 38 C5 69 31 */ addi r6, r5, 0x745F6931@l -/* 80192634 0018F574 3C A0 77 5F */ lis r5, 0x775F6461@ha -/* 80192638 0018F578 38 A5 64 61 */ addi r5, r5, 0x775F6461@l -/* 8019263C 0018F57C 38 E0 00 02 */ li r7, 2 -/* 80192640 0018F580 39 00 00 00 */ li r8, 0 -/* 80192644 0018F584 48 0C 2D B9 */ bl CPaneMgrAlpha_X1_ -/* 80192648 0018F588 7C 60 1B 78 */ mr r0, r3 -lbl_8019264C: -/* 8019264C 0018F58C 90 1F 00 24 */ stw r0, 0x24(r31) -/* 80192650 0018F590 38 60 00 1C */ li r3, 0x1c -/* 80192654 0018F594 48 13 C5 F9 */ bl __nw__FUl -/* 80192658 0018F598 7C 60 1B 79 */ or. r0, r3, r3 -/* 8019265C 0018F59C 41 82 00 28 */ beq lbl_80192684 -/* 80192660 0018F5A0 80 9F 00 0C */ lwz r4, 0xc(r31) -/* 80192664 0018F5A4 3C A0 61 5F */ lis r5, 0x615F6931@ha -/* 80192668 0018F5A8 38 C5 69 31 */ addi r6, r5, 0x615F6931@l -/* 8019266C 0018F5AC 3C A0 77 5F */ lis r5, 0x775F6E64@ha -/* 80192670 0018F5B0 38 A5 6E 64 */ addi r5, r5, 0x775F6E64@l -/* 80192674 0018F5B4 38 E0 00 02 */ li r7, 2 -/* 80192678 0018F5B8 39 00 00 00 */ li r8, 0 -/* 8019267C 0018F5BC 48 0C 2D 81 */ bl CPaneMgrAlpha_X1_ -/* 80192680 0018F5C0 7C 60 1B 78 */ mr r0, r3 -lbl_80192684: -/* 80192684 0018F5C4 90 1F 00 28 */ stw r0, 0x28(r31) -/* 80192688 0018F5C8 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 8019268C 0018F5CC 3C 80 74 5F */ lis r4, 0x745F3032@ha -/* 80192690 0018F5D0 38 C4 30 32 */ addi r6, r4, 0x745F3032@l -/* 80192694 0018F5D4 3C 80 66 5F */ lis r4, 0x665F735F@ha -/* 80192698 0018F5D8 38 A4 73 5F */ addi r5, r4, 0x665F735F@l -/* 8019269C 0018F5DC 81 83 00 00 */ lwz r12, 0(r3) -/* 801926A0 0018F5E0 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801926A4 0018F5E4 7D 89 03 A6 */ mtctr r12 -/* 801926A8 0018F5E8 4E 80 04 21 */ bctrl -/* 801926AC 0018F5EC 90 61 00 08 */ stw r3, 8(r1) -/* 801926B0 0018F5F0 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 801926B4 0018F5F4 3C 80 74 5F */ lis r4, 0x745F3032@ha -/* 801926B8 0018F5F8 38 C4 30 32 */ addi r6, r4, 0x745F3032@l -/* 801926BC 0018F5FC 3C 80 66 5F */ lis r4, 0x665F705F@ha -/* 801926C0 0018F600 38 A4 70 5F */ addi r5, r4, 0x665F705F@l -/* 801926C4 0018F604 81 83 00 00 */ lwz r12, 0(r3) -/* 801926C8 0018F608 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801926CC 0018F60C 7D 89 03 A6 */ mtctr r12 -/* 801926D0 0018F610 4E 80 04 21 */ bctrl -/* 801926D4 0018F614 90 61 00 0C */ stw r3, 0xc(r1) -/* 801926D8 0018F618 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 801926DC 0018F61C 3C 80 74 5F */ lis r4, 0x745F3031@ha -/* 801926E0 0018F620 38 C4 30 31 */ addi r6, r4, 0x745F3031@l -/* 801926E4 0018F624 3C 80 77 5F */ lis r4, 0x775F735F@ha -/* 801926E8 0018F628 38 A4 73 5F */ addi r5, r4, 0x775F735F@l -/* 801926EC 0018F62C 81 83 00 00 */ lwz r12, 0(r3) -/* 801926F0 0018F630 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801926F4 0018F634 7D 89 03 A6 */ mtctr r12 -/* 801926F8 0018F638 4E 80 04 21 */ bctrl -/* 801926FC 0018F63C 38 00 00 00 */ li r0, 0 -/* 80192700 0018F640 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 80192704 0018F644 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 80192708 0018F648 3C 80 74 5F */ lis r4, 0x745F3031@ha -/* 8019270C 0018F64C 38 C4 30 31 */ addi r6, r4, 0x745F3031@l -/* 80192710 0018F650 3C 80 77 5F */ lis r4, 0x775F705F@ha -/* 80192714 0018F654 38 A4 70 5F */ addi r5, r4, 0x775F705F@l -/* 80192718 0018F658 81 83 00 00 */ lwz r12, 0(r3) -/* 8019271C 0018F65C 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 80192720 0018F660 7D 89 03 A6 */ mtctr r12 -/* 80192724 0018F664 4E 80 04 21 */ bctrl -/* 80192728 0018F668 3B C0 00 00 */ li r30, 0 -/* 8019272C 0018F66C 9B C3 00 B0 */ stb r30, 0xb0(r3) -/* 80192730 0018F670 3B 40 00 00 */ li r26, 0 -/* 80192734 0018F674 3B A1 00 08 */ addi r29, r1, 8 -/* 80192738 0018F678 3C 60 80 39 */ lis r3, lbl_803948B8@ha -/* 8019273C 0018F67C 3B 83 48 B8 */ addi r28, r3, lbl_803948B8@l -lbl_80192740: -/* 80192740 0018F680 7F 7D F0 2E */ lwzx r27, r29, r30 -/* 80192744 0018F684 7F 63 DB 78 */ mr r3, r27 -/* 80192748 0018F688 80 9F 00 10 */ lwz r4, 0x10(r31) -/* 8019274C 0018F68C 81 9B 00 00 */ lwz r12, 0(r27) -/* 80192750 0018F690 81 8C 00 9C */ lwz r12, 0x9c(r12) -/* 80192754 0018F694 7D 89 03 A6 */ mtctr r12 -/* 80192758 0018F698 4E 80 04 21 */ bctrl -/* 8019275C 0018F69C 7F 63 DB 78 */ mr r3, r27 -/* 80192760 0018F6A0 38 80 00 20 */ li r4, 0x20 -/* 80192764 0018F6A4 38 BC 00 20 */ addi r5, r28, 0x20 -/* 80192768 0018F6A8 4C C6 31 82 */ crclr 6 -/* 8019276C 0018F6AC 48 16 DF E1 */ bl J2DTextBox_NS_setString_X1_ -/* 80192770 0018F6B0 3B 5A 00 01 */ addi r26, r26, 1 -/* 80192774 0018F6B4 2C 1A 00 02 */ cmpwi r26, 2 -/* 80192778 0018F6B8 3B DE 00 04 */ addi r30, r30, 4 -/* 8019277C 0018F6BC 41 80 FF C4 */ blt lbl_80192740 -/* 80192780 0018F6C0 80 61 00 08 */ lwz r3, 8(r1) -/* 80192784 0018F6C4 48 16 DE D5 */ bl J2DTextBox_NS_getStringPtr -/* 80192788 0018F6C8 7C 65 1B 78 */ mr r5, r3 -/* 8019278C 0018F6CC 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80192790 0018F6D0 38 63 01 88 */ addi r3, r3, lbl_80430188@l -/* 80192794 0018F6D4 38 80 03 D0 */ li r4, 0x3d0 -/* 80192798 0018F6D8 38 C0 00 00 */ li r6, 0 -/* 8019279C 0018F6DC 48 08 9A B5 */ bl dMeter2Info_c_NS_getString -/* 801927A0 0018F6E0 80 61 00 0C */ lwz r3, 0xc(r1) -/* 801927A4 0018F6E4 48 16 DE B5 */ bl J2DTextBox_NS_getStringPtr -/* 801927A8 0018F6E8 7C 65 1B 78 */ mr r5, r3 -/* 801927AC 0018F6EC 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 801927B0 0018F6F0 38 63 01 88 */ addi r3, r3, lbl_80430188@l -/* 801927B4 0018F6F4 38 80 03 D1 */ li r4, 0x3d1 -/* 801927B8 0018F6F8 38 C0 00 00 */ li r6, 0 -/* 801927BC 0018F6FC 48 08 9A 95 */ bl dMeter2Info_c_NS_getString -/* 801927C0 0018F700 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 801927C4 0018F704 3C 80 6D 65 */ lis r4, 0x6D653031@ha -/* 801927C8 0018F708 38 C4 30 31 */ addi r6, r4, 0x6D653031@l -/* 801927CC 0018F70C 3C 80 66 5F */ lis r4, 0x665F6E61@ha -/* 801927D0 0018F710 38 A4 6E 61 */ addi r5, r4, 0x665F6E61@l -/* 801927D4 0018F714 81 83 00 00 */ lwz r12, 0(r3) -/* 801927D8 0018F718 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801927DC 0018F71C 7D 89 03 A6 */ mtctr r12 -/* 801927E0 0018F720 4E 80 04 21 */ bctrl -/* 801927E4 0018F724 90 61 00 08 */ stw r3, 8(r1) -/* 801927E8 0018F728 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 801927EC 0018F72C 3C 80 65 77 */ lis r4, 0x65775F31@ha -/* 801927F0 0018F730 38 C4 5F 31 */ addi r6, r4, 0x65775F31@l -/* 801927F4 0018F734 3C 80 00 66 */ lis r4, 0x00665F6E@ha -/* 801927F8 0018F738 38 A4 5F 6E */ addi r5, r4, 0x00665F6E@l -/* 801927FC 0018F73C 81 83 00 00 */ lwz r12, 0(r3) -/* 80192800 0018F740 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 80192804 0018F744 7D 89 03 A6 */ mtctr r12 -/* 80192808 0018F748 4E 80 04 21 */ bctrl -/* 8019280C 0018F74C 90 61 00 0C */ stw r3, 0xc(r1) -/* 80192810 0018F750 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 80192814 0018F754 3C 80 6D 65 */ lis r4, 0x6D653031@ha -/* 80192818 0018F758 38 C4 30 31 */ addi r6, r4, 0x6D653031@l -/* 8019281C 0018F75C 3C 80 77 5F */ lis r4, 0x775F6E61@ha -/* 80192820 0018F760 38 A4 6E 61 */ addi r5, r4, 0x775F6E61@l -/* 80192824 0018F764 81 83 00 00 */ lwz r12, 0(r3) -/* 80192828 0018F768 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 8019282C 0018F76C 7D 89 03 A6 */ mtctr r12 -/* 80192830 0018F770 4E 80 04 21 */ bctrl -/* 80192834 0018F774 38 00 00 00 */ li r0, 0 -/* 80192838 0018F778 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 8019283C 0018F77C 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 80192840 0018F780 3C 80 65 77 */ lis r4, 0x65775F31@ha -/* 80192844 0018F784 38 C4 5F 31 */ addi r6, r4, 0x65775F31@l -/* 80192848 0018F788 3C 80 00 77 */ lis r4, 0x00775F6E@ha -/* 8019284C 0018F78C 38 A4 5F 6E */ addi r5, r4, 0x00775F6E@l -/* 80192850 0018F790 81 83 00 00 */ lwz r12, 0(r3) -/* 80192854 0018F794 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 80192858 0018F798 7D 89 03 A6 */ mtctr r12 -/* 8019285C 0018F79C 4E 80 04 21 */ bctrl -/* 80192860 0018F7A0 38 00 00 00 */ li r0, 0 -/* 80192864 0018F7A4 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 80192868 0018F7A8 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 8019286C 0018F7AC 3C 80 6D 65 */ lis r4, 0x6D653031@ha -/* 80192870 0018F7B0 38 C4 30 31 */ addi r6, r4, 0x6D653031@l -/* 80192874 0018F7B4 3C 80 77 5F */ lis r4, 0x775F7469@ha -/* 80192878 0018F7B8 38 A4 74 69 */ addi r5, r4, 0x775F7469@l -/* 8019287C 0018F7BC 81 83 00 00 */ lwz r12, 0(r3) -/* 80192880 0018F7C0 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 80192884 0018F7C4 7D 89 03 A6 */ mtctr r12 -/* 80192888 0018F7C8 4E 80 04 21 */ bctrl -/* 8019288C 0018F7CC 90 61 00 10 */ stw r3, 0x10(r1) -/* 80192890 0018F7D0 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 80192894 0018F7D4 3C 80 69 6D */ lis r4, 0x696D3031@ha -/* 80192898 0018F7D8 38 C4 30 31 */ addi r6, r4, 0x696D3031@l -/* 8019289C 0018F7DC 3C 80 77 5F */ lis r4, 0x775F7074@ha -/* 801928A0 0018F7E0 38 A4 70 74 */ addi r5, r4, 0x775F7074@l -/* 801928A4 0018F7E4 81 83 00 00 */ lwz r12, 0(r3) -/* 801928A8 0018F7E8 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801928AC 0018F7EC 7D 89 03 A6 */ mtctr r12 -/* 801928B0 0018F7F0 4E 80 04 21 */ bctrl -/* 801928B4 0018F7F4 90 61 00 14 */ stw r3, 0x14(r1) -/* 801928B8 0018F7F8 3B 40 00 00 */ li r26, 0 -/* 801928BC 0018F7FC 3B C0 00 00 */ li r30, 0 -/* 801928C0 0018F800 3B 81 00 08 */ addi r28, r1, 8 -/* 801928C4 0018F804 3C 60 80 39 */ lis r3, lbl_803948B8@ha -/* 801928C8 0018F808 3B A3 48 B8 */ addi r29, r3, lbl_803948B8@l -lbl_801928CC: -/* 801928CC 0018F80C 7F 7C F0 2E */ lwzx r27, r28, r30 -/* 801928D0 0018F810 7F 63 DB 78 */ mr r3, r27 -/* 801928D4 0018F814 80 9F 00 10 */ lwz r4, 0x10(r31) -/* 801928D8 0018F818 81 9B 00 00 */ lwz r12, 0(r27) -/* 801928DC 0018F81C 81 8C 00 9C */ lwz r12, 0x9c(r12) -/* 801928E0 0018F820 7D 89 03 A6 */ mtctr r12 -/* 801928E4 0018F824 4E 80 04 21 */ bctrl -/* 801928E8 0018F828 7F 63 DB 78 */ mr r3, r27 -/* 801928EC 0018F82C 38 80 00 40 */ li r4, 0x40 -/* 801928F0 0018F830 38 BD 00 20 */ addi r5, r29, 0x20 -/* 801928F4 0018F834 4C C6 31 82 */ crclr 6 -/* 801928F8 0018F838 48 16 DE 55 */ bl J2DTextBox_NS_setString_X1_ -/* 801928FC 0018F83C 3B 5A 00 01 */ addi r26, r26, 1 -/* 80192900 0018F840 2C 1A 00 04 */ cmpwi r26, 4 -/* 80192904 0018F844 3B DE 00 04 */ addi r30, r30, 4 -/* 80192908 0018F848 41 80 FF C4 */ blt lbl_801928CC -/* 8019290C 0018F84C 80 61 00 08 */ lwz r3, 8(r1) -/* 80192910 0018F850 48 16 DD 49 */ bl J2DTextBox_NS_getStringPtr -/* 80192914 0018F854 90 7F 00 2C */ stw r3, 0x2c(r31) -/* 80192918 0018F858 80 61 00 0C */ lwz r3, 0xc(r1) -/* 8019291C 0018F85C 48 16 DD 3D */ bl J2DTextBox_NS_getStringPtr -/* 80192920 0018F860 90 7F 00 38 */ stw r3, 0x38(r31) -/* 80192924 0018F864 80 61 00 10 */ lwz r3, 0x10(r1) -/* 80192928 0018F868 48 16 DD 31 */ bl J2DTextBox_NS_getStringPtr -/* 8019292C 0018F86C 90 7F 00 30 */ stw r3, 0x30(r31) -/* 80192930 0018F870 80 61 00 14 */ lwz r3, 0x14(r1) -/* 80192934 0018F874 48 16 DD 25 */ bl J2DTextBox_NS_getStringPtr -/* 80192938 0018F878 90 7F 00 34 */ stw r3, 0x34(r31) -/* 8019293C 0018F87C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80192940 0018F880 48 1C F8 DD */ bl _restgpr_26 -/* 80192944 0018F884 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80192948 0018F888 7C 08 03 A6 */ mtlr r0 -/* 8019294C 0018F88C 38 21 00 30 */ addi r1, r1, 0x30 -/* 80192950 0018F890 4E 80 00 20 */ blr - -.global dFile_info_c_NS_setSaveData -dFile_info_c_NS_setSaveData: -/* 80192954 0018F894 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80192958 0018F898 7C 08 02 A6 */ mflr r0 -/* 8019295C 0018F89C 90 01 00 24 */ stw r0, 0x24(r1) -/* 80192960 0018F8A0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80192964 0018F8A4 48 1C F8 79 */ bl _savegpr_29 -/* 80192968 0018F8A8 7C 7F 1B 78 */ mr r31, r3 -/* 8019296C 0018F8AC 7C 9D 23 78 */ mr r29, r4 -/* 80192970 0018F8B0 2C 05 00 00 */ cmpwi r5, 0 -/* 80192974 0018F8B4 41 82 00 F8 */ beq lbl_80192A6C -/* 80192978 0018F8B8 3B DD 01 B4 */ addi r30, r29, 0x1b4 -/* 8019297C 0018F8BC 88 1D 01 B4 */ lbz r0, 0x1b4(r29) -/* 80192980 0018F8C0 7C 00 07 75 */ extsb. r0, r0 -/* 80192984 0018F8C4 40 82 00 B8 */ bne lbl_80192A3C -/* 80192988 0018F8C8 88 1F 00 22 */ lbz r0, 0x22(r31) -/* 8019298C 0018F8CC 28 00 00 01 */ cmplwi r0, 1 -/* 80192990 0018F8D0 40 82 00 8C */ bne lbl_80192A1C -/* 80192994 0018F8D4 54 C6 06 3E */ clrlwi r6, r6, 0x18 -/* 80192998 0018F8D8 3C A0 80 40 */ lis r5, lbl_804061C0@ha -/* 8019299C 0018F8DC 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l -/* 801929A0 0018F8E0 88 05 0F 18 */ lbz r0, 0xf18(r5) -/* 801929A4 0018F8E4 7C 06 00 40 */ cmplw r6, r0 -/* 801929A8 0018F8E8 40 82 00 74 */ bne lbl_80192A1C -/* 801929AC 0018F8EC A0 05 00 02 */ lhz r0, 2(r5) -/* 801929B0 0018F8F0 B0 1D 00 02 */ sth r0, 2(r29) -/* 801929B4 0018F8F4 48 00 00 ED */ bl dFile_info_c_NS_setHeartCnt -/* 801929B8 0018F8F8 38 00 00 0C */ li r0, 0xc -/* 801929BC 0018F8FC B0 1D 00 02 */ sth r0, 2(r29) -/* 801929C0 0018F900 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 801929C4 0018F904 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 801929C8 0018F908 38 83 01 B4 */ addi r4, r3, 0x1b4 -/* 801929CC 0018F90C 80 7F 00 2C */ lwz r3, 0x2c(r31) -/* 801929D0 0018F910 48 1D 61 5D */ bl strcpy -/* 801929D4 0018F914 80 7F 00 30 */ lwz r3, 0x30(r31) -/* 801929D8 0018F918 3C 80 80 39 */ lis r4, lbl_803948B8@ha -/* 801929DC 0018F91C 38 84 48 B8 */ addi r4, r4, lbl_803948B8@l -/* 801929E0 0018F920 38 84 00 20 */ addi r4, r4, 0x20 -/* 801929E4 0018F924 48 1D 61 49 */ bl strcpy -/* 801929E8 0018F928 80 7F 00 34 */ lwz r3, 0x34(r31) -/* 801929EC 0018F92C 3C 80 80 39 */ lis r4, lbl_803948B8@ha -/* 801929F0 0018F930 38 84 48 B8 */ addi r4, r4, lbl_803948B8@l -/* 801929F4 0018F934 38 84 00 20 */ addi r4, r4, 0x20 -/* 801929F8 0018F938 48 1D 61 35 */ bl strcpy -/* 801929FC 0018F93C 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80192A00 0018F940 38 63 01 88 */ addi r3, r3, lbl_80430188@l -/* 80192A04 0018F944 38 80 00 4D */ li r4, 0x4d -/* 80192A08 0018F948 80 BF 00 38 */ lwz r5, 0x38(r31) -/* 80192A0C 0018F94C 38 C0 00 00 */ li r6, 0 -/* 80192A10 0018F950 48 08 98 41 */ bl dMeter2Info_c_NS_getString -/* 80192A14 0018F954 38 60 00 02 */ li r3, 2 -/* 80192A18 0018F958 48 00 00 70 */ b lbl_80192A88 -lbl_80192A1C: -/* 80192A1C 0018F95C 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80192A20 0018F960 38 63 01 88 */ addi r3, r3, lbl_80430188@l -/* 80192A24 0018F964 38 80 00 4D */ li r4, 0x4d -/* 80192A28 0018F968 80 BF 00 38 */ lwz r5, 0x38(r31) -/* 80192A2C 0018F96C 38 C0 00 00 */ li r6, 0 -/* 80192A30 0018F970 48 08 98 21 */ bl dMeter2Info_c_NS_getString -/* 80192A34 0018F974 38 60 00 01 */ li r3, 1 -/* 80192A38 0018F978 48 00 00 50 */ b lbl_80192A88 -lbl_80192A3C: -/* 80192A3C 0018F97C 48 00 00 65 */ bl dFile_info_c_NS_setHeartCnt -/* 80192A40 0018F980 80 7F 00 2C */ lwz r3, 0x2c(r31) -/* 80192A44 0018F984 7F C4 F3 78 */ mr r4, r30 -/* 80192A48 0018F988 48 1D 60 E5 */ bl strcpy -/* 80192A4C 0018F98C 7F E3 FB 78 */ mr r3, r31 -/* 80192A50 0018F990 7F A4 EB 78 */ mr r4, r29 -/* 80192A54 0018F994 48 00 01 B5 */ bl dFile_info_c_NS_setSaveDate -/* 80192A58 0018F998 7F E3 FB 78 */ mr r3, r31 -/* 80192A5C 0018F99C 7F A4 EB 78 */ mr r4, r29 -/* 80192A60 0018F9A0 48 00 02 11 */ bl dFile_info_c_NS_setPlayTime -/* 80192A64 0018F9A4 38 60 00 00 */ li r3, 0 -/* 80192A68 0018F9A8 48 00 00 20 */ b lbl_80192A88 -lbl_80192A6C: -/* 80192A6C 0018F9AC 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80192A70 0018F9B0 38 63 01 88 */ addi r3, r3, lbl_80430188@l -/* 80192A74 0018F9B4 38 80 00 51 */ li r4, 0x51 -/* 80192A78 0018F9B8 80 BF 00 38 */ lwz r5, 0x38(r31) -/* 80192A7C 0018F9BC 38 C0 00 00 */ li r6, 0 -/* 80192A80 0018F9C0 48 08 97 D1 */ bl dMeter2Info_c_NS_getString -/* 80192A84 0018F9C4 38 60 FF FF */ li r3, -1 -lbl_80192A88: -/* 80192A88 0018F9C8 39 61 00 20 */ addi r11, r1, 0x20 -/* 80192A8C 0018F9CC 48 1C F7 9D */ bl _restgpr_29 -/* 80192A90 0018F9D0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80192A94 0018F9D4 7C 08 03 A6 */ mtlr r0 -/* 80192A98 0018F9D8 38 21 00 20 */ addi r1, r1, 0x20 -/* 80192A9C 0018F9DC 4E 80 00 20 */ blr - -.global dFile_info_c_NS_setHeartCnt -dFile_info_c_NS_setHeartCnt: -/* 80192AA0 0018F9E0 94 21 FF 80 */ stwu r1, -0x80(r1) -/* 80192AA4 0018F9E4 7C 08 02 A6 */ mflr r0 -/* 80192AA8 0018F9E8 90 01 00 84 */ stw r0, 0x84(r1) -/* 80192AAC 0018F9EC 39 61 00 80 */ addi r11, r1, 0x80 -/* 80192AB0 0018F9F0 48 1C F7 11 */ bl func_803621C0 -/* 80192AB4 0018F9F4 7C 78 1B 78 */ mr r24, r3 -/* 80192AB8 0018F9F8 7C 99 23 78 */ mr r25, r4 -/* 80192ABC 0018F9FC A0 84 00 02 */ lhz r4, 2(r4) -/* 80192AC0 0018FA00 54 80 04 3E */ clrlwi r0, r4, 0x10 -/* 80192AC4 0018FA04 38 60 00 05 */ li r3, 5 -/* 80192AC8 0018FA08 7F 80 1B D6 */ divw r28, r0, r3 -/* 80192ACC 0018FA0C 7C 04 1B D6 */ divw r0, r4, r3 -/* 80192AD0 0018FA10 7C 00 19 D6 */ mullw r0, r0, r3 -/* 80192AD4 0018FA14 7F 60 20 51 */ subf. r27, r0, r4 -/* 80192AD8 0018FA18 41 82 00 08 */ beq lbl_80192AE0 -/* 80192ADC 0018FA1C 3B 9C 00 01 */ addi r28, r28, 1 -lbl_80192AE0: -/* 80192AE0 0018FA20 3B 40 00 00 */ li r26, 0 -/* 80192AE4 0018FA24 3A E0 00 00 */ li r23, 0 -/* 80192AE8 0018FA28 3A C0 00 00 */ li r22, 0 -/* 80192AEC 0018FA2C 57 64 10 3A */ slwi r4, r27, 2 -/* 80192AF0 0018FA30 3C 60 80 3C */ lis r3, lbl_803BB548@ha -/* 80192AF4 0018FA34 38 03 B5 48 */ addi r0, r3, lbl_803BB548@l -/* 80192AF8 0018FA38 7C 60 22 14 */ add r3, r0, r4 -/* 80192AFC 0018FA3C 3B C3 FF FC */ addi r30, r3, -4 -/* 80192B00 0018FA40 3C 60 80 3C */ lis r3, lbl_803BB4A8@ha -/* 80192B04 0018FA44 3B E3 B4 A8 */ addi r31, r3, lbl_803BB4A8@l -/* 80192B08 0018FA48 3B A1 00 08 */ addi r29, r1, 8 -lbl_80192B0C: -/* 80192B0C 0018FA4C 80 78 00 0C */ lwz r3, 0xc(r24) -/* 80192B10 0018FA50 7C 9F B2 14 */ add r4, r31, r22 -/* 80192B14 0018FA54 80 A4 00 00 */ lwz r5, 0(r4) -/* 80192B18 0018FA58 80 C4 00 04 */ lwz r6, 4(r4) -/* 80192B1C 0018FA5C 81 83 00 00 */ lwz r12, 0(r3) -/* 80192B20 0018FA60 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 80192B24 0018FA64 7D 89 03 A6 */ mtctr r12 -/* 80192B28 0018FA68 4E 80 04 21 */ bctrl -/* 80192B2C 0018FA6C 7C 7D B9 2E */ stwx r3, r29, r23 -/* 80192B30 0018FA70 A0 79 00 00 */ lhz r3, 0(r25) -/* 80192B34 0018FA74 38 00 00 05 */ li r0, 5 -/* 80192B38 0018FA78 7C 03 03 D6 */ divw r0, r3, r0 -/* 80192B3C 0018FA7C 7C 1A 00 00 */ cmpw r26, r0 -/* 80192B40 0018FA80 40 80 00 90 */ bge lbl_80192BD0 -/* 80192B44 0018FA84 38 00 00 01 */ li r0, 1 -/* 80192B48 0018FA88 7C 7D B8 2E */ lwzx r3, r29, r23 -/* 80192B4C 0018FA8C 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 80192B50 0018FA90 7C 1A E0 00 */ cmpw r26, r28 -/* 80192B54 0018FA94 40 80 00 58 */ bge lbl_80192BAC -/* 80192B58 0018FA98 2C 1B 00 00 */ cmpwi r27, 0 -/* 80192B5C 0018FA9C 41 82 00 2C */ beq lbl_80192B88 -/* 80192B60 0018FAA0 38 1C FF FF */ addi r0, r28, -1 -/* 80192B64 0018FAA4 7C 1A 00 00 */ cmpw r26, r0 -/* 80192B68 0018FAA8 40 82 00 20 */ bne lbl_80192B88 -/* 80192B6C 0018FAAC 80 9E 00 00 */ lwz r4, 0(r30) -/* 80192B70 0018FAB0 38 A0 00 00 */ li r5, 0 -/* 80192B74 0018FAB4 81 83 00 00 */ lwz r12, 0(r3) -/* 80192B78 0018FAB8 81 8C 01 14 */ lwz r12, 0x114(r12) -/* 80192B7C 0018FABC 7D 89 03 A6 */ mtctr r12 -/* 80192B80 0018FAC0 4E 80 04 21 */ bctrl -/* 80192B84 0018FAC4 48 00 00 58 */ b lbl_80192BDC -lbl_80192B88: -/* 80192B88 0018FAC8 3C 80 80 39 */ lis r4, lbl_803948B8@ha -/* 80192B8C 0018FACC 38 84 48 B8 */ addi r4, r4, lbl_803948B8@l -/* 80192B90 0018FAD0 38 84 00 21 */ addi r4, r4, 0x21 -/* 80192B94 0018FAD4 38 A0 00 00 */ li r5, 0 -/* 80192B98 0018FAD8 81 83 00 00 */ lwz r12, 0(r3) -/* 80192B9C 0018FADC 81 8C 01 14 */ lwz r12, 0x114(r12) -/* 80192BA0 0018FAE0 7D 89 03 A6 */ mtctr r12 -/* 80192BA4 0018FAE4 4E 80 04 21 */ bctrl -/* 80192BA8 0018FAE8 48 00 00 34 */ b lbl_80192BDC -lbl_80192BAC: -/* 80192BAC 0018FAEC 3C 80 80 39 */ lis r4, lbl_803948B8@ha -/* 80192BB0 0018FAF0 38 84 48 B8 */ addi r4, r4, lbl_803948B8@l -/* 80192BB4 0018FAF4 38 84 00 21 */ addi r4, r4, 0x21 -/* 80192BB8 0018FAF8 38 A0 00 00 */ li r5, 0 -/* 80192BBC 0018FAFC 81 83 00 00 */ lwz r12, 0(r3) -/* 80192BC0 0018FB00 81 8C 01 14 */ lwz r12, 0x114(r12) -/* 80192BC4 0018FB04 7D 89 03 A6 */ mtctr r12 -/* 80192BC8 0018FB08 4E 80 04 21 */ bctrl -/* 80192BCC 0018FB0C 48 00 00 10 */ b lbl_80192BDC -lbl_80192BD0: -/* 80192BD0 0018FB10 38 00 00 00 */ li r0, 0 -/* 80192BD4 0018FB14 7C 7D B8 2E */ lwzx r3, r29, r23 -/* 80192BD8 0018FB18 98 03 00 B0 */ stb r0, 0xb0(r3) -lbl_80192BDC: -/* 80192BDC 0018FB1C 3B 5A 00 01 */ addi r26, r26, 1 -/* 80192BE0 0018FB20 2C 1A 00 14 */ cmpwi r26, 0x14 -/* 80192BE4 0018FB24 3A F7 00 04 */ addi r23, r23, 4 -/* 80192BE8 0018FB28 3A D6 00 08 */ addi r22, r22, 8 -/* 80192BEC 0018FB2C 41 80 FF 20 */ blt lbl_80192B0C -/* 80192BF0 0018FB30 39 61 00 80 */ addi r11, r1, 0x80 -/* 80192BF4 0018FB34 48 1C F6 19 */ bl func_8036220C -/* 80192BF8 0018FB38 80 01 00 84 */ lwz r0, 0x84(r1) -/* 80192BFC 0018FB3C 7C 08 03 A6 */ mtlr r0 -/* 80192C00 0018FB40 38 21 00 80 */ addi r1, r1, 0x80 -/* 80192C04 0018FB44 4E 80 00 20 */ blr - -.global dFile_info_c_NS_setSaveDate -dFile_info_c_NS_setSaveDate: -/* 80192C08 0018FB48 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 80192C0C 0018FB4C 7C 08 02 A6 */ mflr r0 -/* 80192C10 0018FB50 90 01 00 44 */ stw r0, 0x44(r1) -/* 80192C14 0018FB54 93 E1 00 3C */ stw r31, 0x3c(r1) -/* 80192C18 0018FB58 7C 7F 1B 78 */ mr r31, r3 -/* 80192C1C 0018FB5C 80 64 00 28 */ lwz r3, 0x28(r4) -/* 80192C20 0018FB60 80 84 00 2C */ lwz r4, 0x2c(r4) -/* 80192C24 0018FB64 38 A1 00 08 */ addi r5, r1, 8 -/* 80192C28 0018FB68 48 1A FD 4D */ bl OSTicksToCalendarTime -/* 80192C2C 0018FB6C 80 7F 00 30 */ lwz r3, 0x30(r31) -/* 80192C30 0018FB70 3C 80 80 39 */ lis r4, lbl_803948B8@ha -/* 80192C34 0018FB74 38 84 48 B8 */ addi r4, r4, lbl_803948B8@l -/* 80192C38 0018FB78 38 84 00 31 */ addi r4, r4, 0x31 -/* 80192C3C 0018FB7C 80 A1 00 18 */ lwz r5, 0x18(r1) -/* 80192C40 0018FB80 38 A5 00 01 */ addi r5, r5, 1 -/* 80192C44 0018FB84 80 C1 00 14 */ lwz r6, 0x14(r1) -/* 80192C48 0018FB88 80 E1 00 1C */ lwz r7, 0x1c(r1) -/* 80192C4C 0018FB8C 81 01 00 10 */ lwz r8, 0x10(r1) -/* 80192C50 0018FB90 81 21 00 0C */ lwz r9, 0xc(r1) -/* 80192C54 0018FB94 4C C6 31 82 */ crclr 6 -/* 80192C58 0018FB98 48 1D 38 85 */ bl func_803664DC -/* 80192C5C 0018FB9C 83 E1 00 3C */ lwz r31, 0x3c(r1) -/* 80192C60 0018FBA0 80 01 00 44 */ lwz r0, 0x44(r1) -/* 80192C64 0018FBA4 7C 08 03 A6 */ mtlr r0 -/* 80192C68 0018FBA8 38 21 00 40 */ addi r1, r1, 0x40 -/* 80192C6C 0018FBAC 4E 80 00 20 */ blr - -.global dFile_info_c_NS_setPlayTime -dFile_info_c_NS_setPlayTime: -/* 80192C70 0018FBB0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80192C74 0018FBB4 7C 08 02 A6 */ mflr r0 -/* 80192C78 0018FBB8 90 01 00 24 */ stw r0, 0x24(r1) -/* 80192C7C 0018FBBC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80192C80 0018FBC0 48 1C F5 59 */ bl _savegpr_28 -/* 80192C84 0018FBC4 7C 7C 1B 78 */ mr r28, r3 -/* 80192C88 0018FBC8 80 64 01 A8 */ lwz r3, 0x1a8(r4) -/* 80192C8C 0018FBCC 80 84 01 AC */ lwz r4, 0x1ac(r4) -/* 80192C90 0018FBD0 3C A0 80 00 */ lis r5, 0x800000F8@ha -/* 80192C94 0018FBD4 80 05 00 F8 */ lwz r0, 0x800000F8@l(r5) -/* 80192C98 0018FBD8 54 06 F0 BE */ srwi r6, r0, 2 -/* 80192C9C 0018FBDC 38 A0 00 00 */ li r5, 0 -/* 80192CA0 0018FBE0 48 1C F6 85 */ bl func_80362324 -/* 80192CA4 0018FBE4 7C 9D 23 78 */ mr r29, r4 -/* 80192CA8 0018FBE8 7C 7E 1B 78 */ mr r30, r3 -/* 80192CAC 0018FBEC 3C A0 00 37 */ lis r5, 0x0036EE44@ha -/* 80192CB0 0018FBF0 38 E5 EE 44 */ addi r7, r5, 0x0036EE44@l -/* 80192CB4 0018FBF4 38 00 00 00 */ li r0, 0 -/* 80192CB8 0018FBF8 6F C6 80 00 */ xoris r6, r30, 0x8000 -/* 80192CBC 0018FBFC 6C 05 80 00 */ xoris r5, r0, 0x8000 -/* 80192CC0 0018FC00 7C 07 E8 10 */ subfc r0, r7, r29 -/* 80192CC4 0018FC04 7C A5 31 10 */ subfe r5, r5, r6 -/* 80192CC8 0018FC08 7C A6 31 10 */ subfe r5, r6, r6 -/* 80192CCC 0018FC0C 7C A5 00 D1 */ neg. r5, r5 -/* 80192CD0 0018FC10 40 82 00 20 */ bne lbl_80192CF0 -/* 80192CD4 0018FC14 80 7C 00 34 */ lwz r3, 0x34(r28) -/* 80192CD8 0018FC18 3C 80 80 39 */ lis r4, lbl_803948B8@ha -/* 80192CDC 0018FC1C 38 84 48 B8 */ addi r4, r4, lbl_803948B8@l -/* 80192CE0 0018FC20 38 84 00 48 */ addi r4, r4, 0x48 -/* 80192CE4 0018FC24 4C C6 31 82 */ crclr 6 -/* 80192CE8 0018FC28 48 1D 37 F5 */ bl func_803664DC -/* 80192CEC 0018FC2C 48 00 00 54 */ b lbl_80192D40 -lbl_80192CF0: -/* 80192CF0 0018FC30 38 A0 00 00 */ li r5, 0 -/* 80192CF4 0018FC34 38 C0 0E 10 */ li r6, 0xe10 -/* 80192CF8 0018FC38 48 1C F8 49 */ bl func_80362540 -/* 80192CFC 0018FC3C 38 A0 00 00 */ li r5, 0 -/* 80192D00 0018FC40 38 C0 00 3C */ li r6, 0x3c -/* 80192D04 0018FC44 48 1C F6 21 */ bl func_80362324 -/* 80192D08 0018FC48 7C 9F 23 78 */ mr r31, r4 -/* 80192D0C 0018FC4C 7F C3 F3 78 */ mr r3, r30 -/* 80192D10 0018FC50 7F A4 EB 78 */ mr r4, r29 -/* 80192D14 0018FC54 38 A0 00 00 */ li r5, 0 -/* 80192D18 0018FC58 38 C0 0E 10 */ li r6, 0xe10 -/* 80192D1C 0018FC5C 48 1C F6 09 */ bl func_80362324 -/* 80192D20 0018FC60 7C 85 23 78 */ mr r5, r4 -/* 80192D24 0018FC64 80 7C 00 34 */ lwz r3, 0x34(r28) -/* 80192D28 0018FC68 3C 80 80 39 */ lis r4, lbl_803948B8@ha -/* 80192D2C 0018FC6C 38 84 48 B8 */ addi r4, r4, lbl_803948B8@l -/* 80192D30 0018FC70 38 84 00 4F */ addi r4, r4, 0x4f -/* 80192D34 0018FC74 7F E6 FB 78 */ mr r6, r31 -/* 80192D38 0018FC78 4C C6 31 82 */ crclr 6 -/* 80192D3C 0018FC7C 48 1D 37 A1 */ bl func_803664DC -lbl_80192D40: -/* 80192D40 0018FC80 39 61 00 20 */ addi r11, r1, 0x20 -/* 80192D44 0018FC84 48 1C F4 E1 */ bl _restgpr_28 -/* 80192D48 0018FC88 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80192D4C 0018FC8C 7C 08 03 A6 */ mtlr r0 -/* 80192D50 0018FC90 38 21 00 20 */ addi r1, r1, 0x20 -/* 80192D54 0018FC94 4E 80 00 20 */ blr -/* 80192D58 0018FC98 4E 80 00 20 */ blr -/* 80192D5C 0018FC9C 4E 80 00 20 */ blr - -.global dFile_info_c_NS__draw -dFile_info_c_NS__draw: -/* 80192D60 0018FCA0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80192D64 0018FCA4 7C 08 02 A6 */ mflr r0 -/* 80192D68 0018FCA8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80192D6C 0018FCAC 7C 66 1B 78 */ mr r6, r3 -/* 80192D70 0018FCB0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80192D74 0018FCB4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80192D78 0018FCB8 38 63 5F 64 */ addi r3, r3, 0x5f64 -/* 80192D7C 0018FCBC 38 83 01 B4 */ addi r4, r3, 0x1b4 -/* 80192D80 0018FCC0 38 A3 01 B8 */ addi r5, r3, 0x1b8 -/* 80192D84 0018FCC4 38 C6 00 08 */ addi r6, r6, 8 -/* 80192D88 0018FCC8 4B EC 3A 0D */ bl dDlst_list_c_NS_set -/* 80192D8C 0018FCCC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80192D90 0018FCD0 7C 08 03 A6 */ mtlr r0 -/* 80192D94 0018FCD4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80192D98 0018FCD8 4E 80 00 20 */ blr -/* 80192D9C 0018FCDC 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 80192DA0 0018FCE0 7C 08 02 A6 */ mflr r0 -/* 80192DA4 0018FCE4 90 01 00 54 */ stw r0, 0x54(r1) -/* 80192DA8 0018FCE8 39 61 00 50 */ addi r11, r1, 0x50 -/* 80192DAC 0018FCEC 48 1C F4 31 */ bl _savegpr_29 -/* 80192DB0 0018FCF0 7C 7D 1B 78 */ mr r29, r3 -/* 80192DB4 0018FCF4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80192DB8 0018FCF8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80192DBC 0018FCFC 83 E3 5F 50 */ lwz r31, 0x5f50(r3) -/* 80192DC0 0018FD00 80 7D 00 0C */ lwz r3, 0xc(r29) -/* 80192DC4 0018FD04 28 03 00 00 */ cmplwi r3, 0 -/* 80192DC8 0018FD08 41 82 00 94 */ beq lbl_80192E5C -/* 80192DCC 0018FD0C 38 03 00 80 */ addi r0, r3, 0x80 -/* 80192DD0 0018FD10 7C 1E 03 78 */ mr r30, r0 -/* 80192DD4 0018FD14 80 9D 00 10 */ lwz r4, 0x10(r29) -/* 80192DD8 0018FD18 C0 24 00 2C */ lfs f1, 0x2c(r4) -/* 80192DDC 0018FD1C C0 04 00 24 */ lfs f0, 0x24(r4) -/* 80192DE0 0018FD20 EC 41 00 28 */ fsubs f2, f1, f0 -/* 80192DE4 0018FD24 C0 23 00 2C */ lfs f1, 0x2c(r3) -/* 80192DE8 0018FD28 C0 03 00 24 */ lfs f0, 0x24(r3) -/* 80192DEC 0018FD2C EC 61 00 28 */ fsubs f3, f1, f0 -/* 80192DF0 0018FD30 C0 24 00 28 */ lfs f1, 0x28(r4) -/* 80192DF4 0018FD34 C0 04 00 20 */ lfs f0, 0x20(r4) -/* 80192DF8 0018FD38 EC 81 00 28 */ fsubs f4, f1, f0 -/* 80192DFC 0018FD3C C0 23 00 28 */ lfs f1, 0x28(r3) -/* 80192E00 0018FD40 C0 03 00 20 */ lfs f0, 0x20(r3) -/* 80192E04 0018FD44 EC 01 00 28 */ fsubs f0, f1, f0 -/* 80192E08 0018FD48 38 61 00 08 */ addi r3, r1, 8 -/* 80192E0C 0018FD4C EC 20 20 24 */ fdivs f1, f0, f4 -/* 80192E10 0018FD50 EC 43 10 24 */ fdivs f2, f3, f2 -/* 80192E14 0018FD54 C0 62 9F F8 */ lfs f3, lbl_804539F8-_SDA2_BASE_(r2) -/* 80192E18 0018FD58 48 1B 3B 51 */ bl PSMTXScale -/* 80192E1C 0018FD5C 7F C3 F3 78 */ mr r3, r30 -/* 80192E20 0018FD60 38 81 00 08 */ addi r4, r1, 8 -/* 80192E24 0018FD64 7F C5 F3 78 */ mr r5, r30 -/* 80192E28 0018FD68 48 1B 36 BD */ bl PSMTXConcat -/* 80192E2C 0018FD6C 80 7D 00 04 */ lwz r3, 4(r29) -/* 80192E30 0018FD70 3C 80 6D 5F */ lis r4, 0x6D5F3032@ha -/* 80192E34 0018FD74 38 C4 30 32 */ addi r6, r4, 0x6D5F3032@l -/* 80192E38 0018FD78 38 A0 00 4E */ li r5, 0x4e -/* 80192E3C 0018FD7C 81 83 00 00 */ lwz r12, 0(r3) -/* 80192E40 0018FD80 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 80192E44 0018FD84 7D 89 03 A6 */ mtctr r12 -/* 80192E48 0018FD88 4E 80 04 21 */ bctrl -/* 80192E4C 0018FD8C 7C 64 1B 78 */ mr r4, r3 -/* 80192E50 0018FD90 7F C3 F3 78 */ mr r3, r30 -/* 80192E54 0018FD94 38 84 00 50 */ addi r4, r4, 0x50 -/* 80192E58 0018FD98 48 1B 36 59 */ bl PSMTXCopy -lbl_80192E5C: -/* 80192E5C 0018FD9C 80 7D 00 04 */ lwz r3, 4(r29) -/* 80192E60 0018FDA0 C0 22 9F FC */ lfs f1, lbl_804539FC-_SDA2_BASE_(r2) -/* 80192E64 0018FDA4 FC 40 08 90 */ fmr f2, f1 -/* 80192E68 0018FDA8 7F E4 FB 78 */ mr r4, r31 -/* 80192E6C 0018FDAC 48 16 60 69 */ bl J2DScreen_NS_draw -/* 80192E70 0018FDB0 39 61 00 50 */ addi r11, r1, 0x50 -/* 80192E74 0018FDB4 48 1C F3 B5 */ bl _restgpr_29 -/* 80192E78 0018FDB8 80 01 00 54 */ lwz r0, 0x54(r1) -/* 80192E7C 0018FDBC 7C 08 03 A6 */ mtlr r0 -/* 80192E80 0018FDC0 38 21 00 50 */ addi r1, r1, 0x50 -/* 80192E84 0018FDC4 4E 80 00 20 */ blr -/* 80192E88 0018FDC8 3C 60 80 3C */ lis r3, lbl_803BB498@ha -/* 80192E8C 0018FDCC 38 A3 B4 98 */ addi r5, r3, lbl_803BB498@l -/* 80192E90 0018FDD0 80 65 00 C0 */ lwz r3, 0xc0(r5) -/* 80192E94 0018FDD4 80 05 00 C4 */ lwz r0, 0xc4(r5) -/* 80192E98 0018FDD8 90 65 00 D8 */ stw r3, 0xd8(r5) -/* 80192E9C 0018FDDC 90 05 00 DC */ stw r0, 0xdc(r5) -/* 80192EA0 0018FDE0 80 05 00 C8 */ lwz r0, 0xc8(r5) -/* 80192EA4 0018FDE4 90 05 00 E0 */ stw r0, 0xe0(r5) -/* 80192EA8 0018FDE8 38 85 00 D8 */ addi r4, r5, 0xd8 -/* 80192EAC 0018FDEC 80 65 00 CC */ lwz r3, 0xcc(r5) -/* 80192EB0 0018FDF0 80 05 00 D0 */ lwz r0, 0xd0(r5) -/* 80192EB4 0018FDF4 90 64 00 0C */ stw r3, 0xc(r4) -/* 80192EB8 0018FDF8 90 04 00 10 */ stw r0, 0x10(r4) -/* 80192EBC 0018FDFC 80 05 00 D4 */ lwz r0, 0xd4(r5) -/* 80192EC0 0018FE00 90 04 00 14 */ stw r0, 0x14(r4) -/* 80192EC4 0018FE04 4E 80 00 20 */ blr -/* 80192EC8 0018FE08 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80192ECC 0018FE0C 7C 08 02 A6 */ mflr r0 -/* 80192ED0 0018FE10 90 01 00 14 */ stw r0, 0x14(r1) -/* 80192ED4 0018FE14 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80192ED8 0018FE18 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80192EDC 0018FE1C 41 82 00 1C */ beq lbl_80192EF8 -/* 80192EE0 0018FE20 3C A0 80 3C */ lis r5, lbl_803BB588@ha -/* 80192EE4 0018FE24 38 05 B5 88 */ addi r0, r5, lbl_803BB588@l -/* 80192EE8 0018FE28 90 1F 00 00 */ stw r0, 0(r31) -/* 80192EEC 0018FE2C 7C 80 07 35 */ extsh. r0, r4 -/* 80192EF0 0018FE30 40 81 00 08 */ ble lbl_80192EF8 -/* 80192EF4 0018FE34 48 13 BE 49 */ bl __dl__FPv -lbl_80192EF8: -/* 80192EF8 0018FE38 7F E3 FB 78 */ mr r3, r31 -/* 80192EFC 0018FE3C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80192F00 0018FE40 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80192F04 0018FE44 7C 08 03 A6 */ mtlr r0 -/* 80192F08 0018FE48 38 21 00 10 */ addi r1, r1, 0x10 -/* 80192F0C 0018FE4C 4E 80 00 20 */ blr - diff --git a/asm/d/file/sel/d_file_sel_warning.s b/asm/d/file/sel/d_file_sel_warning.s index e47ab49a94..ac54d45309 100644 --- a/asm/d/file/sel/d_file_sel_warning.s +++ b/asm/d/file/sel/d_file_sel_warning.s @@ -112,7 +112,7 @@ dFile_warning_c_NS_screenSet: /* 80191D2C 0018EC6C 48 13 CF 21 */ bl __nw__FUl /* 80191D30 0018EC70 7C 60 1B 79 */ or. r0, r3, r3 /* 80191D34 0018EC74 41 82 00 0C */ beq lbl_80191D40 -/* 80191D38 0018EC78 48 16 67 61 */ bl J2DScreen +/* 80191D38 0018EC78 48 16 67 61 */ bl __ct__9J2DScreenFv /* 80191D3C 0018EC7C 7C 60 1B 78 */ mr r0, r3 lbl_80191D40: /* 80191D40 0018EC80 90 1F 00 0C */ stw r0, 0xc(r31) diff --git a/asm/d/kantera/icon/d_kantera_icon_meter.s b/asm/d/kantera/icon/d_kantera_icon_meter.s index acd3cd3414..92d5487b6f 100644 --- a/asm/d/kantera/icon/d_kantera_icon_meter.s +++ b/asm/d/kantera/icon/d_kantera_icon_meter.s @@ -111,7 +111,7 @@ lbl_801AEAA8: /* 801AEAB0 001AB9F0 48 12 01 9D */ bl __nw__FUl /* 801AEAB4 001AB9F4 7C 7E 1B 79 */ or. r30, r3, r3 /* 801AEAB8 001AB9F8 41 82 00 0C */ beq lbl_801AEAC4 -/* 801AEABC 001AB9FC 48 14 99 DD */ bl J2DScreen +/* 801AEABC 001AB9FC 48 14 99 DD */ bl __ct__9J2DScreenFv /* 801AEAC0 001ABA00 7C 7E 1B 78 */ mr r30, r3 lbl_801AEAC4: /* 801AEAC4 001ABA04 7F C3 F3 78 */ mr r3, r30 diff --git a/asm/d/menu/d_menu_collect.s b/asm/d/menu/d_menu_collect.s index e1e35671ba..18a338b37a 100644 --- a/asm/d/menu/d_menu_collect.s +++ b/asm/d/menu/d_menu_collect.s @@ -110,7 +110,7 @@ dMenu_Collect2D_c_NS__create: /* 801AFEC8 001ACE08 48 11 ED 85 */ bl __nw__FUl /* 801AFECC 001ACE0C 7C 60 1B 79 */ or. r0, r3, r3 /* 801AFED0 001ACE10 41 82 00 0C */ beq lbl_801AFEDC -/* 801AFED4 001ACE14 48 14 85 C5 */ bl J2DScreen +/* 801AFED4 001ACE14 48 14 85 C5 */ bl __ct__9J2DScreenFv /* 801AFED8 001ACE18 7C 60 1B 78 */ mr r0, r3 lbl_801AFEDC: /* 801AFEDC 001ACE1C 90 1F 00 18 */ stw r0, 0x18(r31) @@ -128,7 +128,7 @@ lbl_801AFEDC: /* 801AFF0C 001ACE4C 48 11 ED 41 */ bl __nw__FUl /* 801AFF10 001ACE50 7C 60 1B 79 */ or. r0, r3, r3 /* 801AFF14 001ACE54 41 82 00 0C */ beq lbl_801AFF20 -/* 801AFF18 001ACE58 48 14 85 81 */ bl J2DScreen +/* 801AFF18 001ACE58 48 14 85 81 */ bl __ct__9J2DScreenFv /* 801AFF1C 001ACE5C 7C 60 1B 78 */ mr r0, r3 lbl_801AFF20: /* 801AFF20 001ACE60 90 1F 00 1C */ stw r0, 0x1c(r31) diff --git a/asm/d/menu/d_menu_dmap.s b/asm/d/menu/d_menu_dmap.s index d16dbfa5be..5b4fc2643e 100644 --- a/asm/d/menu/d_menu_dmap.s +++ b/asm/d/menu/d_menu_dmap.s @@ -154,7 +154,7 @@ lbl_801B8140: /* 801B8144 001B5084 48 11 6B 09 */ bl __nw__FUl /* 801B8148 001B5088 7C 60 1B 79 */ or. r0, r3, r3 /* 801B814C 001B508C 41 82 00 0C */ beq lbl_801B8158 -/* 801B8150 001B5090 48 14 03 49 */ bl J2DScreen +/* 801B8150 001B5090 48 14 03 49 */ bl __ct__9J2DScreenFv /* 801B8154 001B5094 7C 60 1B 78 */ mr r0, r3 lbl_801B8158: /* 801B8158 001B5098 3B 7E 0C A8 */ addi r27, r30, 0xca8 @@ -754,7 +754,7 @@ dMenu_DmapBg_c_NS_buttonIconScreenInit: /* 801B8A30 001B5970 48 11 62 1D */ bl __nw__FUl /* 801B8A34 001B5974 7C 60 1B 79 */ or. r0, r3, r3 /* 801B8A38 001B5978 41 82 00 0C */ beq lbl_801B8A44 -/* 801B8A3C 001B597C 48 13 FA 5D */ bl J2DScreen +/* 801B8A3C 001B597C 48 13 FA 5D */ bl __ct__9J2DScreenFv /* 801B8A40 001B5980 7C 60 1B 78 */ mr r0, r3 lbl_801B8A44: /* 801B8A44 001B5984 90 1E 0C B4 */ stw r0, 0xcb4(r30) @@ -1298,7 +1298,7 @@ dMenu_DmapBg_c_NS_baseScreenInit: /* 801B91F8 001B6138 48 11 5A 55 */ bl __nw__FUl /* 801B91FC 001B613C 7C 60 1B 79 */ or. r0, r3, r3 /* 801B9200 001B6140 41 82 00 0C */ beq lbl_801B920C -/* 801B9204 001B6144 48 13 F2 95 */ bl J2DScreen +/* 801B9204 001B6144 48 13 F2 95 */ bl __ct__9J2DScreenFv /* 801B9208 001B6148 7C 60 1B 78 */ mr r0, r3 lbl_801B920C: /* 801B920C 001B614C 90 1F 0C A4 */ stw r0, 0xca4(r31) @@ -1317,7 +1317,7 @@ lbl_801B920C: /* 801B9240 001B6180 48 11 5A 0D */ bl __nw__FUl /* 801B9244 001B6184 7C 60 1B 79 */ or. r0, r3, r3 /* 801B9248 001B6188 41 82 00 0C */ beq lbl_801B9254 -/* 801B924C 001B618C 48 13 F2 4D */ bl J2DScreen +/* 801B924C 001B618C 48 13 F2 4D */ bl __ct__9J2DScreenFv /* 801B9250 001B6190 7C 60 1B 78 */ mr r0, r3 lbl_801B9254: /* 801B9254 001B6194 90 1F 0C BC */ stw r0, 0xcbc(r31) diff --git a/asm/d/menu/d_menu_fishing.s b/asm/d/menu/d_menu_fishing.s index b360447828..0e7bee3c3d 100644 --- a/asm/d/menu/d_menu_fishing.s +++ b/asm/d/menu/d_menu_fishing.s @@ -663,7 +663,7 @@ lbl_801C5648: /* 801C56A4 001C25E4 48 10 95 A9 */ bl __nw__FUl /* 801C56A8 001C25E8 7C 60 1B 79 */ or. r0, r3, r3 /* 801C56AC 001C25EC 41 82 00 0C */ beq lbl_801C56B8 -/* 801C56B0 001C25F0 48 13 2D E9 */ bl J2DScreen +/* 801C56B0 001C25F0 48 13 2D E9 */ bl __ct__9J2DScreenFv /* 801C56B4 001C25F4 7C 60 1B 78 */ mr r0, r3 lbl_801C56B8: /* 801C56B8 001C25F8 90 1F 00 18 */ stw r0, 0x18(r31) @@ -1108,7 +1108,7 @@ dMenu_Fishing_c_NS_screenSetDoIcon: /* 801C5D58 001C2C98 48 10 8E F5 */ bl __nw__FUl /* 801C5D5C 001C2C9C 7C 60 1B 79 */ or. r0, r3, r3 /* 801C5D60 001C2CA0 41 82 00 0C */ beq lbl_801C5D6C -/* 801C5D64 001C2CA4 48 13 27 35 */ bl J2DScreen +/* 801C5D64 001C2CA4 48 13 27 35 */ bl __ct__9J2DScreenFv /* 801C5D68 001C2CA8 7C 60 1B 78 */ mr r0, r3 lbl_801C5D6C: /* 801C5D6C 001C2CAC 90 1F 00 1C */ stw r0, 0x1c(r31) diff --git a/asm/d/menu/d_menu_fmap2D.s b/asm/d/menu/d_menu_fmap2D.s index 1fa0d82573..06e321d8e7 100644 --- a/asm/d/menu/d_menu_fmap2D.s +++ b/asm/d/menu/d_menu_fmap2D.s @@ -245,7 +245,7 @@ lbl_801CF6EC: /* 801CF918 001CC858 48 0F F3 35 */ bl __nw__FUl /* 801CF91C 001CC85C 7C 60 1B 79 */ or. r0, r3, r3 /* 801CF920 001CC860 41 82 00 0C */ beq lbl_801CF92C -/* 801CF924 001CC864 48 12 8B 75 */ bl J2DScreen +/* 801CF924 001CC864 48 12 8B 75 */ bl __ct__9J2DScreenFv /* 801CF928 001CC868 7C 60 1B 78 */ mr r0, r3 lbl_801CF92C: /* 801CF92C 001CC86C 90 1F 0C 98 */ stw r0, 0xc98(r31) @@ -261,7 +261,7 @@ lbl_801CF92C: /* 801CF954 001CC894 48 0F F2 F9 */ bl __nw__FUl /* 801CF958 001CC898 7C 60 1B 79 */ or. r0, r3, r3 /* 801CF95C 001CC89C 41 82 00 0C */ beq lbl_801CF968 -/* 801CF960 001CC8A0 48 12 8B 39 */ bl J2DScreen +/* 801CF960 001CC8A0 48 12 8B 39 */ bl __ct__9J2DScreenFv /* 801CF964 001CC8A4 7C 60 1B 78 */ mr r0, r3 lbl_801CF968: /* 801CF968 001CC8A8 90 1F 0C 9C */ stw r0, 0xc9c(r31) @@ -395,7 +395,7 @@ lbl_801CFAE0: /* 801CFB54 001CCA94 48 0F F0 F9 */ bl __nw__FUl /* 801CFB58 001CCA98 7C 60 1B 79 */ or. r0, r3, r3 /* 801CFB5C 001CCA9C 41 82 00 0C */ beq lbl_801CFB68 -/* 801CFB60 001CCAA0 48 12 89 39 */ bl J2DScreen +/* 801CFB60 001CCAA0 48 12 89 39 */ bl __ct__9J2DScreenFv /* 801CFB64 001CCAA4 7C 60 1B 78 */ mr r0, r3 lbl_801CFB68: /* 801CFB68 001CCAA8 90 1F 0C D8 */ stw r0, 0xcd8(r31) @@ -7031,7 +7031,7 @@ dMenu_Fmap2DTop_c: /* 801D5C28 001D2B68 48 0F 90 25 */ bl __nw__FUl /* 801D5C2C 001D2B6C 7C 60 1B 79 */ or. r0, r3, r3 /* 801D5C30 001D2B70 41 82 00 0C */ beq lbl_801D5C3C -/* 801D5C34 001D2B74 48 12 28 65 */ bl J2DScreen +/* 801D5C34 001D2B74 48 12 28 65 */ bl __ct__9J2DScreenFv /* 801D5C38 001D2B78 7C 60 1B 78 */ mr r0, r3 lbl_801D5C3C: /* 801D5C3C 001D2B7C 90 1F 00 08 */ stw r0, 8(r31) diff --git a/asm/d/menu/d_menu_insect.s b/asm/d/menu/d_menu_insect.s index a3a2b2c85b..6885a81040 100644 --- a/asm/d/menu/d_menu_insect.s +++ b/asm/d/menu/d_menu_insect.s @@ -1460,7 +1460,7 @@ dMenu_Insect_c_NS_screenSetBase: /* 801D9660 001D65A0 48 0F 55 ED */ bl __nw__FUl /* 801D9664 001D65A4 7C 60 1B 79 */ or. r0, r3, r3 /* 801D9668 001D65A8 41 82 00 0C */ beq lbl_801D9674 -/* 801D966C 001D65AC 48 11 EE 2D */ bl J2DScreen +/* 801D966C 001D65AC 48 11 EE 2D */ bl __ct__9J2DScreenFv /* 801D9670 001D65B0 7C 60 1B 78 */ mr r0, r3 lbl_801D9674: /* 801D9674 001D65B4 90 1D 00 20 */ stw r0, 0x20(r29) @@ -1644,7 +1644,7 @@ dMenu_Insect_c_NS_screenSetExplain: /* 801D990C 001D684C 48 0F 53 41 */ bl __nw__FUl /* 801D9910 001D6850 7C 60 1B 79 */ or. r0, r3, r3 /* 801D9914 001D6854 41 82 00 0C */ beq lbl_801D9920 -/* 801D9918 001D6858 48 11 EB 81 */ bl J2DScreen +/* 801D9918 001D6858 48 11 EB 81 */ bl __ct__9J2DScreenFv /* 801D991C 001D685C 7C 60 1B 78 */ mr r0, r3 lbl_801D9920: /* 801D9920 001D6860 90 1F 00 24 */ stw r0, 0x24(r31) @@ -1837,7 +1837,7 @@ dMenu_Insect_c_NS_screenSetDoIcon: /* 801D9BEC 001D6B2C 48 0F 50 61 */ bl __nw__FUl /* 801D9BF0 001D6B30 7C 60 1B 79 */ or. r0, r3, r3 /* 801D9BF4 001D6B34 41 82 00 0C */ beq lbl_801D9C00 -/* 801D9BF8 001D6B38 48 11 E8 A1 */ bl J2DScreen +/* 801D9BF8 001D6B38 48 11 E8 A1 */ bl __ct__9J2DScreenFv /* 801D9BFC 001D6B3C 7C 60 1B 78 */ mr r0, r3 lbl_801D9C00: /* 801D9C00 001D6B40 90 1F 00 28 */ stw r0, 0x28(r31) diff --git a/asm/d/menu/d_menu_letter.s b/asm/d/menu/d_menu_letter.s index e449c776f8..c8237aabd9 100644 --- a/asm/d/menu/d_menu_letter.s +++ b/asm/d/menu/d_menu_letter.s @@ -2365,7 +2365,7 @@ dMenu_Letter_c_NS_screenSetMenu: /* 801DF034 001DBF74 48 0E FC 19 */ bl __nw__FUl /* 801DF038 001DBF78 7C 60 1B 79 */ or. r0, r3, r3 /* 801DF03C 001DBF7C 41 82 00 0C */ beq lbl_801DF048 -/* 801DF040 001DBF80 48 11 94 59 */ bl J2DScreen +/* 801DF040 001DBF80 48 11 94 59 */ bl __ct__9J2DScreenFv /* 801DF044 001DBF84 7C 60 1B 78 */ mr r0, r3 lbl_801DF048: /* 801DF048 001DBF88 90 1E 00 18 */ stw r0, 0x18(r30) @@ -2808,7 +2808,7 @@ lbl_801DF6D4: /* 801DF6EC 001DC62C 48 0E F5 61 */ bl __nw__FUl /* 801DF6F0 001DC630 7C 60 1B 79 */ or. r0, r3, r3 /* 801DF6F4 001DC634 41 82 00 0C */ beq lbl_801DF700 -/* 801DF6F8 001DC638 48 11 8D A1 */ bl J2DScreen +/* 801DF6F8 001DC638 48 11 8D A1 */ bl __ct__9J2DScreenFv /* 801DF6FC 001DC63C 7C 60 1B 78 */ mr r0, r3 lbl_801DF700: /* 801DF700 001DC640 90 1E 00 1C */ stw r0, 0x1c(r30) @@ -3050,7 +3050,7 @@ dMenu_Letter_c_NS_screenSetBase: /* 801DFA94 001DC9D4 48 0E F1 B9 */ bl __nw__FUl /* 801DFA98 001DC9D8 7C 60 1B 79 */ or. r0, r3, r3 /* 801DFA9C 001DC9DC 41 82 00 0C */ beq lbl_801DFAA8 -/* 801DFAA0 001DC9E0 48 11 89 F9 */ bl J2DScreen +/* 801DFAA0 001DC9E0 48 11 89 F9 */ bl __ct__9J2DScreenFv /* 801DFAA4 001DC9E4 7C 60 1B 78 */ mr r0, r3 lbl_801DFAA8: /* 801DFAA8 001DC9E8 90 1F 00 20 */ stw r0, 0x20(r31) @@ -3619,7 +3619,7 @@ dMenu_Letter_c_NS_screenSetShadow: /* 801E0348 001DD288 48 0E E9 05 */ bl __nw__FUl /* 801E034C 001DD28C 7C 60 1B 79 */ or. r0, r3, r3 /* 801E0350 001DD290 41 82 00 0C */ beq lbl_801E035C -/* 801E0354 001DD294 48 11 81 45 */ bl J2DScreen +/* 801E0354 001DD294 48 11 81 45 */ bl __ct__9J2DScreenFv /* 801E0358 001DD298 7C 60 1B 78 */ mr r0, r3 lbl_801E035C: /* 801E035C 001DD29C 90 1F 00 24 */ stw r0, 0x24(r31) @@ -3669,7 +3669,7 @@ dMenu_Letter_c_NS_screenSetLetter: /* 801E03FC 001DD33C 48 0E E8 51 */ bl __nw__FUl /* 801E0400 001DD340 7C 60 1B 79 */ or. r0, r3, r3 /* 801E0404 001DD344 41 82 00 0C */ beq lbl_801E0410 -/* 801E0408 001DD348 48 11 80 91 */ bl J2DScreen +/* 801E0408 001DD348 48 11 80 91 */ bl __ct__9J2DScreenFv /* 801E040C 001DD34C 7C 60 1B 78 */ mr r0, r3 lbl_801E0410: /* 801E0410 001DD350 90 1F 00 28 */ stw r0, 0x28(r31) @@ -3939,7 +3939,7 @@ lbl_801E07C0: /* 801E0808 001DD748 48 0E E4 45 */ bl __nw__FUl /* 801E080C 001DD74C 7C 60 1B 79 */ or. r0, r3, r3 /* 801E0810 001DD750 41 82 00 0C */ beq lbl_801E081C -/* 801E0814 001DD754 48 11 7C 85 */ bl J2DScreen +/* 801E0814 001DD754 48 11 7C 85 */ bl __ct__9J2DScreenFv /* 801E0818 001DD758 7C 60 1B 78 */ mr r0, r3 lbl_801E081C: /* 801E081C 001DD75C 90 1F 00 2C */ stw r0, 0x2c(r31) @@ -4057,7 +4057,7 @@ dMenu_Letter_c_NS_screenSetDoIcon: /* 801E09C4 001DD904 48 0E E2 89 */ bl __nw__FUl /* 801E09C8 001DD908 7C 60 1B 79 */ or. r0, r3, r3 /* 801E09CC 001DD90C 41 82 00 0C */ beq lbl_801E09D8 -/* 801E09D0 001DD910 48 11 7A C9 */ bl J2DScreen +/* 801E09D0 001DD910 48 11 7A C9 */ bl __ct__9J2DScreenFv /* 801E09D4 001DD914 7C 60 1B 78 */ mr r0, r3 lbl_801E09D8: /* 801E09D8 001DD918 90 1F 00 30 */ stw r0, 0x30(r31) diff --git a/asm/d/menu/d_menu_option.s b/asm/d/menu/d_menu_option.s index efc56ecd55..21aaa61e6b 100644 --- a/asm/d/menu/d_menu_option.s +++ b/asm/d/menu/d_menu_option.s @@ -133,7 +133,7 @@ lbl_801E20BC: /* 801E20CC 001DF00C 48 0E CB 81 */ bl __nw__FUl /* 801E20D0 001DF010 7C 60 1B 79 */ or. r0, r3, r3 /* 801E20D4 001DF014 41 82 00 0C */ beq lbl_801E20E0 -/* 801E20D8 001DF018 48 11 63 C1 */ bl J2DScreen +/* 801E20D8 001DF018 48 11 63 C1 */ bl __ct__9J2DScreenFv /* 801E20DC 001DF01C 7C 60 1B 78 */ mr r0, r3 lbl_801E20E0: /* 801E20E0 001DF020 90 1F 00 08 */ stw r0, 8(r31) @@ -254,7 +254,7 @@ lbl_801E2260: /* 801E22A8 001DF1E8 48 0E C9 A5 */ bl __nw__FUl /* 801E22AC 001DF1EC 7C 60 1B 79 */ or. r0, r3, r3 /* 801E22B0 001DF1F0 41 82 00 0C */ beq lbl_801E22BC -/* 801E22B4 001DF1F4 48 11 61 E5 */ bl J2DScreen +/* 801E22B4 001DF1F4 48 11 61 E5 */ bl __ct__9J2DScreenFv /* 801E22B8 001DF1F8 7C 60 1B 78 */ mr r0, r3 lbl_801E22BC: /* 801E22BC 001DF1FC 90 1F 00 04 */ stw r0, 4(r31) @@ -290,7 +290,7 @@ lbl_801E22BC: /* 801E2334 001DF274 48 0E C9 19 */ bl __nw__FUl /* 801E2338 001DF278 7C 60 1B 79 */ or. r0, r3, r3 /* 801E233C 001DF27C 41 82 00 0C */ beq lbl_801E2348 -/* 801E2340 001DF280 48 11 61 59 */ bl J2DScreen +/* 801E2340 001DF280 48 11 61 59 */ bl __ct__9J2DScreenFv /* 801E2344 001DF284 7C 60 1B 78 */ mr r0, r3 lbl_801E2348: /* 801E2348 001DF288 90 1F 00 0C */ stw r0, 0xc(r31) @@ -310,7 +310,7 @@ lbl_801E2348: /* 801E2380 001DF2C0 48 0E C8 CD */ bl __nw__FUl /* 801E2384 001DF2C4 7C 60 1B 79 */ or. r0, r3, r3 /* 801E2388 001DF2C8 41 82 00 0C */ beq lbl_801E2394 -/* 801E238C 001DF2CC 48 11 61 0D */ bl J2DScreen +/* 801E238C 001DF2CC 48 11 61 0D */ bl __ct__9J2DScreenFv /* 801E2390 001DF2D0 7C 60 1B 78 */ mr r0, r3 lbl_801E2394: /* 801E2394 001DF2D4 90 1F 00 10 */ stw r0, 0x10(r31) @@ -337,7 +337,7 @@ lbl_801E2394: /* 801E23E8 001DF328 48 0E C8 65 */ bl __nw__FUl /* 801E23EC 001DF32C 7C 60 1B 79 */ or. r0, r3, r3 /* 801E23F0 001DF330 41 82 00 0C */ beq lbl_801E23FC -/* 801E23F4 001DF334 48 11 60 A5 */ bl J2DScreen +/* 801E23F4 001DF334 48 11 60 A5 */ bl __ct__9J2DScreenFv /* 801E23F8 001DF338 7C 60 1B 78 */ mr r0, r3 lbl_801E23FC: /* 801E23FC 001DF33C 90 1F 00 14 */ stw r0, 0x14(r31) @@ -395,7 +395,7 @@ lbl_801E2490: /* 801E24C4 001DF404 48 0E C7 89 */ bl __nw__FUl /* 801E24C8 001DF408 7C 60 1B 79 */ or. r0, r3, r3 /* 801E24CC 001DF40C 41 82 00 0C */ beq lbl_801E24D8 -/* 801E24D0 001DF410 48 11 5F C9 */ bl J2DScreen +/* 801E24D0 001DF410 48 11 5F C9 */ bl __ct__9J2DScreenFv /* 801E24D4 001DF414 7C 60 1B 78 */ mr r0, r3 lbl_801E24D8: /* 801E24D8 001DF418 90 1F 00 18 */ stw r0, 0x18(r31) @@ -574,7 +574,7 @@ lbl_801E2728: /* 801E277C 001DF6BC 48 0E C4 D1 */ bl __nw__FUl /* 801E2780 001DF6C0 7C 60 1B 79 */ or. r0, r3, r3 /* 801E2784 001DF6C4 41 82 00 0C */ beq lbl_801E2790 -/* 801E2788 001DF6C8 48 11 5D 11 */ bl J2DScreen +/* 801E2788 001DF6C8 48 11 5D 11 */ bl __ct__9J2DScreenFv /* 801E278C 001DF6CC 7C 60 1B 78 */ mr r0, r3 lbl_801E2790: /* 801E2790 001DF6D0 90 1F 00 1C */ stw r0, 0x1c(r31) diff --git a/asm/d/menu/d_menu_ring.s b/asm/d/menu/d_menu_ring.s index 4c3c88e7c2..6efc378247 100644 --- a/asm/d/menu/d_menu_ring.s +++ b/asm/d/menu/d_menu_ring.s @@ -497,7 +497,7 @@ lbl_801E981C: /* 801E9824 001E6764 48 0E 54 29 */ bl __nw__FUl /* 801E9828 001E6768 7C 60 1B 79 */ or. r0, r3, r3 /* 801E982C 001E676C 41 82 00 0C */ beq lbl_801E9838 -/* 801E9830 001E6770 48 10 EC 69 */ bl J2DScreen +/* 801E9830 001E6770 48 10 EC 69 */ bl __ct__9J2DScreenFv /* 801E9834 001E6774 7C 60 1B 78 */ mr r0, r3 lbl_801E9838: /* 801E9838 001E6778 90 1F 00 58 */ stw r0, 0x58(r31) @@ -1215,7 +1215,7 @@ lbl_801EA28C: /* 801EA300 001E7240 48 0E 49 4D */ bl __nw__FUl /* 801EA304 001E7244 7C 60 1B 79 */ or. r0, r3, r3 /* 801EA308 001E7248 41 82 00 0C */ beq lbl_801EA314 -/* 801EA30C 001E724C 48 10 E1 8D */ bl J2DScreen +/* 801EA30C 001E724C 48 10 E1 8D */ bl __ct__9J2DScreenFv /* 801EA310 001E7250 7C 60 1B 78 */ mr r0, r3 lbl_801EA314: /* 801EA314 001E7254 90 1F 00 5C */ stw r0, 0x5c(r31) @@ -1248,7 +1248,7 @@ lbl_801EA374: /* 801EA37C 001E72BC 48 0E 48 D1 */ bl __nw__FUl /* 801EA380 001E72C0 7C 60 1B 79 */ or. r0, r3, r3 /* 801EA384 001E72C4 41 82 00 0C */ beq lbl_801EA390 -/* 801EA388 001E72C8 48 10 E1 11 */ bl J2DScreen +/* 801EA388 001E72C8 48 10 E1 11 */ bl __ct__9J2DScreenFv /* 801EA38C 001E72CC 7C 60 1B 78 */ mr r0, r3 lbl_801EA390: /* 801EA390 001E72D0 90 1F 00 64 */ stw r0, 0x64(r31) diff --git a/asm/d/menu/d_menu_save.s b/asm/d/menu/d_menu_save.s index 37ffac6095..7a2e420fd3 100644 --- a/asm/d/menu/d_menu_save.s +++ b/asm/d/menu/d_menu_save.s @@ -217,7 +217,7 @@ dMenu_save_c_NS_screenSet: /* 801EF940 001EC880 48 0D F3 0D */ bl __nw__FUl /* 801EF944 001EC884 7C 60 1B 79 */ or. r0, r3, r3 /* 801EF948 001EC888 41 82 00 0C */ beq lbl_801EF954 -/* 801EF94C 001EC88C 48 10 8B 4D */ bl J2DScreen +/* 801EF94C 001EC88C 48 10 8B 4D */ bl __ct__9J2DScreenFv /* 801EF950 001EC890 7C 60 1B 78 */ mr r0, r3 lbl_801EF954: /* 801EF954 001EC894 90 1F 00 1C */ stw r0, 0x1c(r31) @@ -1221,7 +1221,7 @@ lbl_801F0868: /* 801F0874 001ED7B4 41 82 00 14 */ beq lbl_801F0888 /* 801F0878 001ED7B8 80 9F 00 04 */ lwz r4, 4(r31) /* 801F087C 001ED7BC 38 A0 00 01 */ li r5, 1 -/* 801F0880 001ED7C0 4B FA 1B B5 */ bl dFile_info_c +/* 801F0880 001ED7C0 4B FA 1B B5 */ bl __ct__12dFile_info_cFP10JKRArchiveUc /* 801F0884 001ED7C4 7C 60 1B 78 */ mr r0, r3 lbl_801F0888: /* 801F0888 001ED7C8 7F 1F D2 14 */ add r24, r31, r26 @@ -7833,7 +7833,7 @@ lbl_801F681C: /* 801F682C 001F376C 80 7E 00 34 */ lwz r3, 0x34(r30) /* 801F6830 001F3770 7F A4 EB 78 */ mr r4, r29 /* 801F6834 001F3774 57 86 06 3E */ clrlwi r6, r28, 0x18 -/* 801F6838 001F3778 4B F9 C1 1D */ bl dFile_info_c_NS_setSaveData +/* 801F6838 001F3778 4B F9 C1 1D */ bl setSaveData__12dFile_info_cFP10dSv_save_ciUc /* 801F683C 001F377C 2C 03 FF FF */ cmpwi r3, -1 /* 801F6840 001F3780 40 82 00 1C */ bne lbl_801F685C /* 801F6844 001F3784 38 00 00 01 */ li r0, 1 @@ -8002,7 +8002,7 @@ lbl_801F6A48: lbl_801F6A84: /* 801F6A84 001F39C4 38 1F 00 34 */ addi r0, r31, 0x34 /* 801F6A88 001F39C8 7C 7A 00 2E */ lwzx r3, r26, r0 -/* 801F6A8C 001F39CC 4B F9 C2 D5 */ bl dFile_info_c_NS__draw +/* 801F6A8C 001F39CC 4B F9 C2 D5 */ bl _draw__12dFile_info_cFv /* 801F6A90 001F39D0 3B 7B 00 01 */ addi r27, r27, 1 /* 801F6A94 001F39D4 2C 1B 00 03 */ cmpwi r27, 3 /* 801F6A98 001F39D8 3B FF 00 04 */ addi r31, r31, 4 diff --git a/asm/d/menu/d_menu_skill.s b/asm/d/menu/d_menu_skill.s index 88b68699e1..e77441aa17 100644 --- a/asm/d/menu/d_menu_skill.s +++ b/asm/d/menu/d_menu_skill.s @@ -1215,7 +1215,7 @@ dMenu_Skill_c_NS_screenSetMenu: /* 801F83AC 001F52EC 48 0D 68 A1 */ bl __nw__FUl /* 801F83B0 001F52F0 7C 60 1B 79 */ or. r0, r3, r3 /* 801F83B4 001F52F4 41 82 00 0C */ beq lbl_801F83C0 -/* 801F83B8 001F52F8 48 10 00 E1 */ bl J2DScreen +/* 801F83B8 001F52F8 48 10 00 E1 */ bl __ct__9J2DScreenFv /* 801F83BC 001F52FC 7C 60 1B 78 */ mr r0, r3 lbl_801F83C0: /* 801F83C0 001F5300 90 1F 00 18 */ stw r0, 0x18(r31) @@ -1648,7 +1648,7 @@ dMenu_Skill_c_NS_screenSetLetter: /* 801F8A34 001F5974 48 0D 62 19 */ bl __nw__FUl /* 801F8A38 001F5978 7C 60 1B 79 */ or. r0, r3, r3 /* 801F8A3C 001F597C 41 82 00 0C */ beq lbl_801F8A48 -/* 801F8A40 001F5980 48 0F FA 59 */ bl J2DScreen +/* 801F8A40 001F5980 48 0F FA 59 */ bl __ct__9J2DScreenFv /* 801F8A44 001F5984 7C 60 1B 78 */ mr r0, r3 lbl_801F8A48: /* 801F8A48 001F5988 90 1F 00 1C */ stw r0, 0x1c(r31) @@ -1851,7 +1851,7 @@ dMenu_Skill_c_NS_screenSetDoIcon: /* 801F8D3C 001F5C7C 48 0D 5F 11 */ bl __nw__FUl /* 801F8D40 001F5C80 7C 60 1B 79 */ or. r0, r3, r3 /* 801F8D44 001F5C84 41 82 00 0C */ beq lbl_801F8D50 -/* 801F8D48 001F5C88 48 0F F7 51 */ bl J2DScreen +/* 801F8D48 001F5C88 48 0F F7 51 */ bl __ct__9J2DScreenFv /* 801F8D4C 001F5C8C 7C 60 1B 78 */ mr r0, r3 lbl_801F8D50: /* 801F8D50 001F5C90 90 1F 00 20 */ stw r0, 0x20(r31) diff --git a/asm/d/menu/item/d_menu_item_explain.s b/asm/d/menu/item/d_menu_item_explain.s index 8f8e51d7f2..d91f3b0d6e 100644 --- a/asm/d/menu/item/d_menu_item_explain.s +++ b/asm/d/menu/item/d_menu_item_explain.s @@ -123,7 +123,7 @@ lbl_801DA8FC: /* 801DA904 001D7844 48 0F 43 49 */ bl __nw__FUl /* 801DA908 001D7848 7C 60 1B 79 */ or. r0, r3, r3 /* 801DA90C 001D784C 41 82 00 0C */ beq lbl_801DA918 -/* 801DA910 001D7850 48 11 DB 89 */ bl J2DScreen +/* 801DA910 001D7850 48 11 DB 89 */ bl __ct__9J2DScreenFv /* 801DA914 001D7854 7C 60 1B 78 */ mr r0, r3 lbl_801DA918: /* 801DA918 001D7858 90 1F 00 70 */ stw r0, 0x70(r31) diff --git a/asm/d/meter/d_meter_button.s b/asm/d/meter/d_meter_button.s index b8dcae42ce..ad1b51a0a1 100644 --- a/asm/d/meter/d_meter_button.s +++ b/asm/d/meter/d_meter_button.s @@ -3786,7 +3786,7 @@ dMeterButton_c_NS_screenInitButton: /* 8020480C 0020174C 48 0C A4 41 */ bl __nw__FUl /* 80204810 00201750 7C 60 1B 79 */ or. r0, r3, r3 /* 80204814 00201754 41 82 00 0C */ beq lbl_80204820 -/* 80204818 00201758 48 0F 3C 81 */ bl J2DScreen +/* 80204818 00201758 48 0F 3C 81 */ bl __ct__9J2DScreenFv /* 8020481C 0020175C 7C 60 1B 78 */ mr r0, r3 lbl_80204820: /* 80204820 00201760 90 1F 00 08 */ stw r0, 8(r31) @@ -4865,7 +4865,7 @@ dMeterButton_c_NS_screenInitText: /* 80205860 002027A0 48 0C 93 ED */ bl __nw__FUl /* 80205864 002027A4 7C 60 1B 79 */ or. r0, r3, r3 /* 80205868 002027A8 41 82 00 0C */ beq lbl_80205874 -/* 8020586C 002027AC 48 0F 2C 2D */ bl J2DScreen +/* 8020586C 002027AC 48 0F 2C 2D */ bl __ct__9J2DScreenFv /* 80205870 002027B0 7C 60 1B 78 */ mr r0, r3 lbl_80205874: /* 80205874 002027B4 90 1F 00 10 */ stw r0, 0x10(r31) @@ -4961,7 +4961,7 @@ lbl_802059CC: /* 802059D4 00202914 48 0C 92 79 */ bl __nw__FUl /* 802059D8 00202918 7C 60 1B 79 */ or. r0, r3, r3 /* 802059DC 0020291C 41 82 00 0C */ beq lbl_802059E8 -/* 802059E0 00202920 48 0F 2A B9 */ bl J2DScreen +/* 802059E0 00202920 48 0F 2A B9 */ bl __ct__9J2DScreenFv /* 802059E4 00202924 7C 60 1B 78 */ mr r0, r3 lbl_802059E8: /* 802059E8 00202928 90 1F 00 14 */ stw r0, 0x14(r31) diff --git a/asm/d/meter/d_meter_haihai.s b/asm/d/meter/d_meter_haihai.s index 3f8a085bd8..f7bb11f1ba 100644 --- a/asm/d/meter/d_meter_haihai.s +++ b/asm/d/meter/d_meter_haihai.s @@ -73,7 +73,7 @@ lbl_8020AF50: /* 8020AF88 00207EC8 48 0C 3C C5 */ bl __nw__FUl /* 8020AF8C 00207ECC 7C 60 1B 79 */ or. r0, r3, r3 /* 8020AF90 00207ED0 41 82 00 0C */ beq lbl_8020AF9C -/* 8020AF94 00207ED4 48 0E D5 05 */ bl J2DScreen +/* 8020AF94 00207ED4 48 0E D5 05 */ bl __ct__9J2DScreenFv /* 8020AF98 00207ED8 7C 60 1B 78 */ mr r0, r3 lbl_8020AF9C: /* 8020AF9C 00207EDC 90 1F 00 04 */ stw r0, 4(r31) diff --git a/asm/d/meter/d_meter_hakusha.s b/asm/d/meter/d_meter_hakusha.s index 886e7795be..96c25a2cf6 100644 --- a/asm/d/meter/d_meter_hakusha.s +++ b/asm/d/meter/d_meter_hakusha.s @@ -114,7 +114,7 @@ lbl_8020C4AC: /* 8020C4B4 002093F4 48 0C 27 99 */ bl __nw__FUl /* 8020C4B8 002093F8 7C 60 1B 79 */ or. r0, r3, r3 /* 8020C4BC 002093FC 41 82 00 0C */ beq lbl_8020C4C8 -/* 8020C4C0 00209400 48 0E BF D9 */ bl J2DScreen +/* 8020C4C0 00209400 48 0E BF D9 */ bl __ct__9J2DScreenFv /* 8020C4C4 00209404 7C 60 1B 78 */ mr r0, r3 lbl_8020C4C8: /* 8020C4C8 00209408 90 1F 00 08 */ stw r0, 8(r31) @@ -195,7 +195,7 @@ lbl_8020C5A4: /* 8020C5E8 00209528 48 0C 26 65 */ bl __nw__FUl /* 8020C5EC 0020952C 7C 60 1B 79 */ or. r0, r3, r3 /* 8020C5F0 00209530 41 82 00 0C */ beq lbl_8020C5FC -/* 8020C5F4 00209534 48 0E BE A5 */ bl J2DScreen +/* 8020C5F4 00209534 48 0E BE A5 */ bl __ct__9J2DScreenFv /* 8020C5F8 00209538 7C 60 1B 78 */ mr r0, r3 lbl_8020C5FC: /* 8020C5FC 0020953C 90 1F 00 0C */ stw r0, 0xc(r31) diff --git a/asm/d/meter/d_meter_string.s b/asm/d/meter/d_meter_string.s index 34fd89dbe3..4acca929d0 100644 --- a/asm/d/meter/d_meter_string.s +++ b/asm/d/meter/d_meter_string.s @@ -115,7 +115,7 @@ lbl_8020EEF0: /* 8020EEF4 0020BE34 48 0B FD 59 */ bl __nw__FUl /* 8020EEF8 0020BE38 7C 60 1B 79 */ or. r0, r3, r3 /* 8020EEFC 0020BE3C 41 82 00 0C */ beq lbl_8020EF08 -/* 8020EF00 0020BE40 48 0E 95 99 */ bl J2DScreen +/* 8020EF00 0020BE40 48 0E 95 99 */ bl __ct__9J2DScreenFv /* 8020EF04 0020BE44 7C 60 1B 78 */ mr r0, r3 lbl_8020EF08: /* 8020EF08 0020BE48 90 1F 00 04 */ stw r0, 4(r31) diff --git a/asm/d/meter2/d_meter2_draw.s b/asm/d/meter2/d_meter2_draw.s index fe998ccaeb..bf5393d0b8 100644 --- a/asm/d/meter2/d_meter2_draw.s +++ b/asm/d/meter2/d_meter2_draw.s @@ -71,7 +71,7 @@ dMeter2Draw_c: /* 8020FBB0 0020CAF0 48 0B F0 9D */ bl __nw__FUl /* 8020FBB4 0020CAF4 7C 60 1B 79 */ or. r0, r3, r3 /* 8020FBB8 0020CAF8 41 82 00 0C */ beq lbl_8020FBC4 -/* 8020FBBC 0020CAFC 48 0E 88 DD */ bl J2DScreen +/* 8020FBBC 0020CAFC 48 0E 88 DD */ bl __ct__9J2DScreenFv /* 8020FBC0 0020CB00 7C 60 1B 78 */ mr r0, r3 lbl_8020FBC4: /* 8020FBC4 0020CB04 90 1F 00 78 */ stw r0, 0x78(r31) @@ -118,7 +118,7 @@ lbl_8020FC44: /* 8020FC60 0020CBA0 48 0B EF ED */ bl __nw__FUl /* 8020FC64 0020CBA4 7C 60 1B 79 */ or. r0, r3, r3 /* 8020FC68 0020CBA8 41 82 00 0C */ beq lbl_8020FC74 -/* 8020FC6C 0020CBAC 48 0E 88 2D */ bl J2DScreen +/* 8020FC6C 0020CBAC 48 0E 88 2D */ bl __ct__9J2DScreenFv /* 8020FC70 0020CBB0 7C 60 1B 78 */ mr r0, r3 lbl_8020FC74: /* 8020FC74 0020CBB4 90 1F 00 7C */ stw r0, 0x7c(r31) @@ -135,7 +135,7 @@ lbl_8020FC74: /* 8020FCA0 0020CBE0 48 0B EF AD */ bl __nw__FUl /* 8020FCA4 0020CBE4 7C 60 1B 79 */ or. r0, r3, r3 /* 8020FCA8 0020CBE8 41 82 00 0C */ beq lbl_8020FCB4 -/* 8020FCAC 0020CBEC 48 0E 87 ED */ bl J2DScreen +/* 8020FCAC 0020CBEC 48 0E 87 ED */ bl __ct__9J2DScreenFv /* 8020FCB0 0020CBF0 7C 60 1B 78 */ mr r0, r3 lbl_8020FCB4: /* 8020FCB4 0020CBF4 90 1F 00 80 */ stw r0, 0x80(r31) diff --git a/asm/d/msg/scrn/d_msg_scrn_3select.s b/asm/d/msg/scrn/d_msg_scrn_3select.s index 4f9cd4d335..f22b49498d 100644 --- a/asm/d/msg/scrn/d_msg_scrn_3select.s +++ b/asm/d/msg/scrn/d_msg_scrn_3select.s @@ -23,7 +23,7 @@ dMsgScrn3Select_c: /* 802390F0 00236030 48 09 5B 5D */ bl __nw__FUl /* 802390F4 00236034 7C 60 1B 79 */ or. r0, r3, r3 /* 802390F8 00236038 41 82 00 0C */ beq lbl_80239104 -/* 802390FC 0023603C 48 0B F3 9D */ bl J2DScreen +/* 802390FC 0023603C 48 0B F3 9D */ bl __ct__9J2DScreenFv /* 80239100 00236040 7C 60 1B 78 */ mr r0, r3 lbl_80239104: /* 80239104 00236044 90 1F 00 04 */ stw r0, 4(r31) diff --git a/asm/d/msg/scrn/d_msg_scrn_arrow.s b/asm/d/msg/scrn/d_msg_scrn_arrow.s index 3957b3e523..7bd690aa59 100644 --- a/asm/d/msg/scrn/d_msg_scrn_arrow.s +++ b/asm/d/msg/scrn/d_msg_scrn_arrow.s @@ -18,7 +18,7 @@ dMsgScrnArrow_c: /* 8023B9DC 0023891C 48 09 32 71 */ bl __nw__FUl /* 8023B9E0 00238920 7C 60 1B 79 */ or. r0, r3, r3 /* 8023B9E4 00238924 41 82 00 0C */ beq lbl_8023B9F0 -/* 8023B9E8 00238928 48 0B CA B1 */ bl J2DScreen +/* 8023B9E8 00238928 48 0B CA B1 */ bl __ct__9J2DScreenFv /* 8023B9EC 0023892C 7C 60 1B 78 */ mr r0, r3 lbl_8023B9F0: /* 8023B9F0 00238930 90 1F 00 04 */ stw r0, 4(r31) diff --git a/asm/d/msg/scrn/d_msg_scrn_boss.s b/asm/d/msg/scrn/d_msg_scrn_boss.s index 8edd0f96c6..d07c39982b 100644 --- a/asm/d/msg/scrn/d_msg_scrn_boss.s +++ b/asm/d/msg/scrn/d_msg_scrn_boss.s @@ -23,7 +23,7 @@ dMsgScrnBoss_c: /* 8023C604 00239544 48 09 26 49 */ bl __nw__FUl /* 8023C608 00239548 7C 60 1B 79 */ or. r0, r3, r3 /* 8023C60C 0023954C 41 82 00 0C */ beq lbl_8023C618 -/* 8023C610 00239550 48 0B BE 89 */ bl J2DScreen +/* 8023C610 00239550 48 0B BE 89 */ bl __ct__9J2DScreenFv /* 8023C614 00239554 7C 60 1B 78 */ mr r0, r3 lbl_8023C618: /* 8023C618 00239558 90 1E 00 04 */ stw r0, 4(r30) diff --git a/asm/d/msg/scrn/d_msg_scrn_explain.s b/asm/d/msg/scrn/d_msg_scrn_explain.s index 8a800433dc..8686ca66c3 100644 --- a/asm/d/msg/scrn/d_msg_scrn_explain.s +++ b/asm/d/msg/scrn/d_msg_scrn_explain.s @@ -64,7 +64,7 @@ lbl_8023CD44: /* 8023CD60 00239CA0 48 09 1E ED */ bl __nw__FUl /* 8023CD64 00239CA4 7C 60 1B 79 */ or. r0, r3, r3 /* 8023CD68 00239CA8 41 82 00 0C */ beq lbl_8023CD74 -/* 8023CD6C 00239CAC 48 0B B7 2D */ bl J2DScreen +/* 8023CD6C 00239CAC 48 0B B7 2D */ bl __ct__9J2DScreenFv /* 8023CD70 00239CB0 7C 60 1B 78 */ mr r0, r3 lbl_8023CD74: /* 8023CD74 00239CB4 90 1F 00 2C */ stw r0, 0x2c(r31) @@ -82,7 +82,7 @@ lbl_8023CD74: /* 8023CDA4 00239CE4 48 09 1E A9 */ bl __nw__FUl /* 8023CDA8 00239CE8 7C 60 1B 79 */ or. r0, r3, r3 /* 8023CDAC 00239CEC 41 82 00 0C */ beq lbl_8023CDB8 -/* 8023CDB0 00239CF0 48 0B B6 E9 */ bl J2DScreen +/* 8023CDB0 00239CF0 48 0B B6 E9 */ bl __ct__9J2DScreenFv /* 8023CDB4 00239CF4 7C 60 1B 78 */ mr r0, r3 lbl_8023CDB8: /* 8023CDB8 00239CF8 90 1F 00 30 */ stw r0, 0x30(r31) diff --git a/asm/d/msg/scrn/d_msg_scrn_howl.s b/asm/d/msg/scrn/d_msg_scrn_howl.s index 1e218875b6..eb3f4ca4a6 100644 --- a/asm/d/msg/scrn/d_msg_scrn_howl.s +++ b/asm/d/msg/scrn/d_msg_scrn_howl.s @@ -29,7 +29,7 @@ dMsgScrnHowl_c: /* 802409C0 0023D900 48 08 E2 8D */ bl __nw__FUl /* 802409C4 0023D904 7C 60 1B 79 */ or. r0, r3, r3 /* 802409C8 0023D908 41 82 00 0C */ beq lbl_802409D4 -/* 802409CC 0023D90C 48 0B 7A CD */ bl J2DScreen +/* 802409CC 0023D90C 48 0B 7A CD */ bl __ct__9J2DScreenFv /* 802409D0 0023D910 7C 60 1B 78 */ mr r0, r3 lbl_802409D4: /* 802409D4 0023D914 90 1F 00 04 */ stw r0, 4(r31) diff --git a/asm/d/msg/scrn/d_msg_scrn_item.s b/asm/d/msg/scrn/d_msg_scrn_item.s index 2c1a8321db..4ffbffe209 100644 --- a/asm/d/msg/scrn/d_msg_scrn_item.s +++ b/asm/d/msg/scrn/d_msg_scrn_item.s @@ -277,7 +277,7 @@ lbl_8023EB40: /* 8023EB44 0023BA84 48 09 01 09 */ bl __nw__FUl /* 8023EB48 0023BA88 7C 60 1B 79 */ or. r0, r3, r3 /* 8023EB4C 0023BA8C 41 82 00 0C */ beq lbl_8023EB58 -/* 8023EB50 0023BA90 48 0B 99 49 */ bl J2DScreen +/* 8023EB50 0023BA90 48 0B 99 49 */ bl __ct__9J2DScreenFv /* 8023EB54 0023BA94 7C 60 1B 78 */ mr r0, r3 lbl_8023EB58: /* 8023EB58 0023BA98 90 1F 00 04 */ stw r0, 4(r31) @@ -295,7 +295,7 @@ lbl_8023EB58: /* 8023EB88 0023BAC8 48 09 00 C5 */ bl __nw__FUl /* 8023EB8C 0023BACC 7C 60 1B 79 */ or. r0, r3, r3 /* 8023EB90 0023BAD0 41 82 00 0C */ beq lbl_8023EB9C -/* 8023EB94 0023BAD4 48 0B 99 05 */ bl J2DScreen +/* 8023EB94 0023BAD4 48 0B 99 05 */ bl __ct__9J2DScreenFv /* 8023EB98 0023BAD8 7C 60 1B 78 */ mr r0, r3 lbl_8023EB9C: /* 8023EB9C 0023BADC 90 1F 00 C4 */ stw r0, 0xc4(r31) diff --git a/asm/d/msg/scrn/d_msg_scrn_jimaku.s b/asm/d/msg/scrn/d_msg_scrn_jimaku.s index 519a164e3b..a5db8ec945 100644 --- a/asm/d/msg/scrn/d_msg_scrn_jimaku.s +++ b/asm/d/msg/scrn/d_msg_scrn_jimaku.s @@ -34,7 +34,7 @@ lbl_802445AC: /* 802445B8 002414F8 48 08 A6 95 */ bl __nw__FUl /* 802445BC 002414FC 7C 60 1B 79 */ or. r0, r3, r3 /* 802445C0 00241500 41 82 00 0C */ beq lbl_802445CC -/* 802445C4 00241504 48 0B 3E D5 */ bl J2DScreen +/* 802445C4 00241504 48 0B 3E D5 */ bl __ct__9J2DScreenFv /* 802445C8 00241508 7C 60 1B 78 */ mr r0, r3 lbl_802445CC: /* 802445CC 0024150C 90 1F 00 04 */ stw r0, 4(r31) diff --git a/asm/d/msg/scrn/d_msg_scrn_kanban.s b/asm/d/msg/scrn/d_msg_scrn_kanban.s index 02cee82838..0137ef9b1b 100644 --- a/asm/d/msg/scrn/d_msg_scrn_kanban.s +++ b/asm/d/msg/scrn/d_msg_scrn_kanban.s @@ -35,7 +35,7 @@ lbl_80244E88: /* 80244E9C 00241DDC 48 08 9D B1 */ bl __nw__FUl /* 80244EA0 00241DE0 7C 60 1B 79 */ or. r0, r3, r3 /* 80244EA4 00241DE4 41 82 00 0C */ beq lbl_80244EB0 -/* 80244EA8 00241DE8 48 0B 35 F1 */ bl J2DScreen +/* 80244EA8 00241DE8 48 0B 35 F1 */ bl __ct__9J2DScreenFv /* 80244EAC 00241DEC 7C 60 1B 78 */ mr r0, r3 lbl_80244EB0: /* 80244EB0 00241DF0 90 1F 00 04 */ stw r0, 4(r31) diff --git a/asm/d/msg/scrn/d_msg_scrn_light.s b/asm/d/msg/scrn/d_msg_scrn_light.s index 4f0b7372b5..14fdb2dd50 100644 --- a/asm/d/msg/scrn/d_msg_scrn_light.s +++ b/asm/d/msg/scrn/d_msg_scrn_light.s @@ -168,7 +168,7 @@ lbl_8024597C: /* 80245998 002428D8 48 08 92 B5 */ bl __nw__FUl /* 8024599C 002428DC 7C 60 1B 79 */ or. r0, r3, r3 /* 802459A0 002428E0 41 82 00 0C */ beq lbl_802459AC -/* 802459A4 002428E4 48 0B 2A F5 */ bl J2DScreen +/* 802459A4 002428E4 48 0B 2A F5 */ bl __ct__9J2DScreenFv /* 802459A8 002428E8 7C 60 1B 78 */ mr r0, r3 lbl_802459AC: /* 802459AC 002428EC 90 1F 00 04 */ stw r0, 4(r31) diff --git a/asm/d/msg/scrn/d_msg_scrn_place.s b/asm/d/msg/scrn/d_msg_scrn_place.s index 67104f2b19..ebdd1745f4 100644 --- a/asm/d/msg/scrn/d_msg_scrn_place.s +++ b/asm/d/msg/scrn/d_msg_scrn_place.s @@ -43,7 +43,7 @@ lbl_8024644C: /* 80246450 00243390 48 08 87 FD */ bl __nw__FUl /* 80246454 00243394 7C 60 1B 79 */ or. r0, r3, r3 /* 80246458 00243398 41 82 00 0C */ beq lbl_80246464 -/* 8024645C 0024339C 48 0B 20 3D */ bl J2DScreen +/* 8024645C 0024339C 48 0B 20 3D */ bl __ct__9J2DScreenFv /* 80246460 002433A0 7C 60 1B 78 */ mr r0, r3 lbl_80246464: /* 80246464 002433A4 90 1F 00 04 */ stw r0, 4(r31) diff --git a/asm/d/msg/scrn/d_msg_scrn_staff.s b/asm/d/msg/scrn/d_msg_scrn_staff.s index b7740e612d..43164a4fac 100644 --- a/asm/d/msg/scrn/d_msg_scrn_staff.s +++ b/asm/d/msg/scrn/d_msg_scrn_staff.s @@ -24,7 +24,7 @@ dMsgScrnStaff_c: /* 80246B74 00243AB4 48 08 80 D9 */ bl __nw__FUl /* 80246B78 00243AB8 7C 60 1B 79 */ or. r0, r3, r3 /* 80246B7C 00243ABC 41 82 00 0C */ beq lbl_80246B88 -/* 80246B80 00243AC0 48 0B 19 19 */ bl J2DScreen +/* 80246B80 00243AC0 48 0B 19 19 */ bl __ct__9J2DScreenFv /* 80246B84 00243AC4 7C 60 1B 78 */ mr r0, r3 lbl_80246B88: /* 80246B88 00243AC8 90 1E 00 04 */ stw r0, 4(r30) diff --git a/asm/d/msg/scrn/d_msg_scrn_talk.s b/asm/d/msg/scrn/d_msg_scrn_talk.s index f1cb3dc0d6..ebf1ea7d56 100644 --- a/asm/d/msg/scrn/d_msg_scrn_talk.s +++ b/asm/d/msg/scrn/d_msg_scrn_talk.s @@ -37,7 +37,7 @@ lbl_80247050: /* 8024705C 00243F9C 48 08 7B F1 */ bl __nw__FUl /* 80247060 00243FA0 7C 60 1B 79 */ or. r0, r3, r3 /* 80247064 00243FA4 41 82 00 0C */ beq lbl_80247070 -/* 80247068 00243FA8 48 0B 14 31 */ bl J2DScreen +/* 80247068 00243FA8 48 0B 14 31 */ bl __ct__9J2DScreenFv /* 8024706C 00243FAC 7C 60 1B 78 */ mr r0, r3 lbl_80247070: /* 80247070 00243FB0 90 1F 00 04 */ stw r0, 4(r31) @@ -55,7 +55,7 @@ lbl_80247070: /* 802470A0 00243FE0 48 08 7B AD */ bl __nw__FUl /* 802470A4 00243FE4 7C 60 1B 79 */ or. r0, r3, r3 /* 802470A8 00243FE8 41 82 00 0C */ beq lbl_802470B4 -/* 802470AC 00243FEC 48 0B 13 ED */ bl J2DScreen +/* 802470AC 00243FEC 48 0B 13 ED */ bl __ct__9J2DScreenFv /* 802470B0 00243FF0 7C 60 1B 78 */ mr r0, r3 lbl_802470B4: /* 802470B4 00243FF4 90 1F 00 C4 */ stw r0, 0xc4(r31) diff --git a/asm/d/msg/scrn/d_msg_scrn_tree.s b/asm/d/msg/scrn/d_msg_scrn_tree.s index 20590052a1..170d5412cb 100644 --- a/asm/d/msg/scrn/d_msg_scrn_tree.s +++ b/asm/d/msg/scrn/d_msg_scrn_tree.s @@ -44,7 +44,7 @@ lbl_802489D0: /* 802489D4 00245914 48 08 62 79 */ bl __nw__FUl /* 802489D8 00245918 7C 60 1B 79 */ or. r0, r3, r3 /* 802489DC 0024591C 41 82 00 0C */ beq lbl_802489E8 -/* 802489E0 00245920 48 0A FA B9 */ bl J2DScreen +/* 802489E0 00245920 48 0A FA B9 */ bl __ct__9J2DScreenFv /* 802489E4 00245924 7C 60 1B 78 */ mr r0, r3 lbl_802489E8: /* 802489E8 00245928 90 1F 00 04 */ stw r0, 4(r31) diff --git a/asm/d/select/d_select_cursor.s b/asm/d/select/d_select_cursor.s index 11d777f1f3..85becac8a8 100644 --- a/asm/d/select/d_select_cursor.s +++ b/asm/d/select/d_select_cursor.s @@ -120,7 +120,7 @@ lbl_80194374: /* 80194378 001912B8 48 13 A8 D5 */ bl __nw__FUl /* 8019437C 001912BC 7C 60 1B 79 */ or. r0, r3, r3 /* 80194380 001912C0 41 82 00 0C */ beq lbl_8019438C -/* 80194384 001912C4 48 16 41 15 */ bl J2DScreen +/* 80194384 001912C4 48 16 41 15 */ bl __ct__9J2DScreenFv /* 80194388 001912C8 7C 60 1B 78 */ mr r0, r3 lbl_8019438C: /* 8019438C 001912CC 90 1F 00 04 */ stw r0, 4(r31) diff --git a/include/d/d_drawlist/d_drawlist.h b/include/d/d_drawlist/d_drawlist.h index 0a538fcf7e..3c9958aa01 100644 --- a/include/d/d_drawlist/d_drawlist.h +++ b/include/d/d_drawlist/d_drawlist.h @@ -1,3 +1,7 @@ class dDlst_FileInfo_c { + public: + void draw(void); + ~dDlst_FileInfo_c(); + private: }; \ No newline at end of file diff --git a/include/d/d_file/d_file_sel_info/asm/func_80192434.s b/include/d/d_file/d_file_sel_info/asm/func_80192434.s new file mode 100644 index 0000000000..a7845ad8a3 --- /dev/null +++ b/include/d/d_file/d_file_sel_info/asm/func_80192434.s @@ -0,0 +1,27 @@ +/* 80192434 0018F374 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 80192438 0018F378 7C 08 02 A6 */ mflr r0 +/* 8019243C 0018F37C 90 01 00 14 */ stw r0, 0x14(r1) +/* 80192440 0018F380 93 E1 00 0C */ stw r31, 0xc(r1) +/* 80192444 0018F384 7C 7F 1B 78 */ mr r31, r3 +/* 80192448 0018F388 3C C0 80 3C */ lis r6, lbl_803BB598@ha +/* 8019244C 0018F38C 38 06 B5 98 */ addi r0, r6, lbl_803BB598@l +/* 80192450 0018F390 90 03 00 00 */ stw r0, 0(r3) +/* 80192454 0018F394 3C C0 80 3A */ lis r6, lbl_803A6F88@ha +/* 80192458 0018F398 38 06 6F 88 */ addi r0, r6, lbl_803A6F88@l +/* 8019245C 0018F39C 90 03 00 08 */ stw r0, 8(r3) +/* 80192460 0018F3A0 3C C0 80 3C */ lis r6, lbl_803BB588@ha +/* 80192464 0018F3A4 38 06 B5 88 */ addi r0, r6, lbl_803BB588@l +/* 80192468 0018F3A8 90 03 00 08 */ stw r0, 8(r3) +/* 8019246C 0018F3AC 90 83 00 04 */ stw r4, 4(r3) +/* 80192470 0018F3B0 98 A3 00 22 */ stb r5, 0x22(r3) +/* 80192474 0018F3B4 38 00 00 00 */ li r0, 0 +/* 80192478 0018F3B8 90 03 00 14 */ stw r0, 0x14(r3) +/* 8019247C 0018F3BC 48 00 00 F5 */ bl screenSet__12dFile_info_cFv +/* 80192480 0018F3C0 38 00 00 00 */ li r0, 0 +/* 80192484 0018F3C4 98 1F 00 20 */ stb r0, 0x20(r31) +/* 80192488 0018F3C8 7F E3 FB 78 */ mr r3, r31 +/* 8019248C 0018F3CC 83 E1 00 0C */ lwz r31, 0xc(r1) +/* 80192490 0018F3D0 80 01 00 14 */ lwz r0, 0x14(r1) +/* 80192494 0018F3D4 7C 08 03 A6 */ mtlr r0 +/* 80192498 0018F3D8 38 21 00 10 */ addi r1, r1, 0x10 +/* 8019249C 0018F3DC 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_file/d_file_sel_info/asm/func_801924A0.s b/include/d/d_file/d_file_sel_info/asm/func_801924A0.s new file mode 100644 index 0000000000..c8893e15e3 --- /dev/null +++ b/include/d/d_file/d_file_sel_info/asm/func_801924A0.s @@ -0,0 +1,57 @@ +/* 801924A0 0018F3E0 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 801924A4 0018F3E4 7C 08 02 A6 */ mflr r0 +/* 801924A8 0018F3E8 90 01 00 14 */ stw r0, 0x14(r1) +/* 801924AC 0018F3EC 93 E1 00 0C */ stw r31, 0xc(r1) +/* 801924B0 0018F3F0 93 C1 00 08 */ stw r30, 8(r1) +/* 801924B4 0018F3F4 7C 7E 1B 79 */ or. r30, r3, r3 +/* 801924B8 0018F3F8 7C 9F 23 78 */ mr r31, r4 +/* 801924BC 0018F3FC 41 82 00 98 */ beq lbl_80192554 +/* 801924C0 0018F400 3C 60 80 3C */ lis r3, lbl_803BB598@ha +/* 801924C4 0018F404 38 03 B5 98 */ addi r0, r3, lbl_803BB598@l +/* 801924C8 0018F408 90 1E 00 00 */ stw r0, 0(r30) +/* 801924CC 0018F40C 80 7E 00 0C */ lwz r3, 0xc(r30) +/* 801924D0 0018F410 28 03 00 00 */ cmplwi r3, 0 +/* 801924D4 0018F414 41 82 00 18 */ beq lbl_801924EC +/* 801924D8 0018F418 38 80 00 01 */ li r4, 1 +/* 801924DC 0018F41C 81 83 00 00 */ lwz r12, 0(r3) +/* 801924E0 0018F420 81 8C 00 08 */ lwz r12, 8(r12) +/* 801924E4 0018F424 7D 89 03 A6 */ mtctr r12 +/* 801924E8 0018F428 4E 80 04 21 */ bctrl +lbl_801924EC: +/* 801924EC 0018F42C 80 7E 00 24 */ lwz r3, 0x24(r30) +/* 801924F0 0018F430 28 03 00 00 */ cmplwi r3, 0 +/* 801924F4 0018F434 41 82 00 18 */ beq lbl_8019250C +/* 801924F8 0018F438 38 80 00 01 */ li r4, 1 +/* 801924FC 0018F43C 81 83 00 00 */ lwz r12, 0(r3) +/* 80192500 0018F440 81 8C 00 08 */ lwz r12, 8(r12) +/* 80192504 0018F444 7D 89 03 A6 */ mtctr r12 +/* 80192508 0018F448 4E 80 04 21 */ bctrl +lbl_8019250C: +/* 8019250C 0018F44C 80 7E 00 28 */ lwz r3, 0x28(r30) +/* 80192510 0018F450 28 03 00 00 */ cmplwi r3, 0 +/* 80192514 0018F454 41 82 00 18 */ beq lbl_8019252C +/* 80192518 0018F458 38 80 00 01 */ li r4, 1 +/* 8019251C 0018F45C 81 83 00 00 */ lwz r12, 0(r3) +/* 80192520 0018F460 81 8C 00 08 */ lwz r12, 8(r12) +/* 80192524 0018F464 7D 89 03 A6 */ mtctr r12 +/* 80192528 0018F468 4E 80 04 21 */ bctrl +lbl_8019252C: +/* 8019252C 0018F46C 4B E8 25 01 */ bl mDoExt_removeMesgFont +/* 80192530 0018F470 34 1E 00 08 */ addic. r0, r30, 8 +/* 80192534 0018F474 41 82 00 10 */ beq lbl_80192544 +/* 80192538 0018F478 3C 60 80 3C */ lis r3, lbl_803BB588@ha +/* 8019253C 0018F47C 38 03 B5 88 */ addi r0, r3, lbl_803BB588@l +/* 80192540 0018F480 90 1E 00 08 */ stw r0, 8(r30) +lbl_80192544: +/* 80192544 0018F484 7F E0 07 35 */ extsh. r0, r31 +/* 80192548 0018F488 40 81 00 0C */ ble lbl_80192554 +/* 8019254C 0018F48C 7F C3 F3 78 */ mr r3, r30 +/* 80192550 0018F490 48 13 C7 ED */ bl __dl__FPv +lbl_80192554: +/* 80192554 0018F494 7F C3 F3 78 */ mr r3, r30 +/* 80192558 0018F498 83 E1 00 0C */ lwz r31, 0xc(r1) +/* 8019255C 0018F49C 83 C1 00 08 */ lwz r30, 8(r1) +/* 80192560 0018F4A0 80 01 00 14 */ lwz r0, 0x14(r1) +/* 80192564 0018F4A4 7C 08 03 A6 */ mtlr r0 +/* 80192568 0018F4A8 38 21 00 10 */ addi r1, r1, 0x10 +/* 8019256C 0018F4AC 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_file/d_file_sel_info/asm/func_80192570.s b/include/d/d_file/d_file_sel_info/asm/func_80192570.s new file mode 100644 index 0000000000..65b2559d3e --- /dev/null +++ b/include/d/d_file/d_file_sel_info/asm/func_80192570.s @@ -0,0 +1,254 @@ +/* 80192570 0018F4B0 94 21 FF D0 */ stwu r1, -0x30(r1) +/* 80192574 0018F4B4 7C 08 02 A6 */ mflr r0 +/* 80192578 0018F4B8 90 01 00 34 */ stw r0, 0x34(r1) +/* 8019257C 0018F4BC 39 61 00 30 */ addi r11, r1, 0x30 +/* 80192580 0018F4C0 48 1C FC 51 */ bl _savegpr_26 +/* 80192584 0018F4C4 7C 7F 1B 78 */ mr r31, r3 +/* 80192588 0018F4C8 38 60 01 18 */ li r3, 0x118 +/* 8019258C 0018F4CC 48 13 C6 C1 */ bl __nw__FUl +/* 80192590 0018F4D0 7C 60 1B 79 */ or. r0, r3, r3 +/* 80192594 0018F4D4 41 82 00 0C */ beq lbl_801925A0 +/* 80192598 0018F4D8 48 16 5F 01 */ bl __ct__9J2DScreenFv +/* 8019259C 0018F4DC 7C 60 1B 78 */ mr r0, r3 +lbl_801925A0: +/* 801925A0 0018F4E0 90 1F 00 0C */ stw r0, 0xc(r31) +/* 801925A4 0018F4E4 80 7F 00 0C */ lwz r3, 0xc(r31) +/* 801925A8 0018F4E8 3C 80 80 39 */ lis r4, lbl_803948B8@ha +/* 801925AC 0018F4EC 38 84 48 B8 */ addi r4, r4, lbl_803948B8@l +/* 801925B0 0018F4F0 3C A0 01 10 */ lis r5, 0x110 +/* 801925B4 0018F4F4 80 DF 00 04 */ lwz r6, 4(r31) +/* 801925B8 0018F4F8 48 16 60 91 */ bl J2DScreen_NS_setPriority +/* 801925BC 0018F4FC 4B E8 24 35 */ bl mDoExt_getMesgFont +/* 801925C0 0018F500 90 7F 00 10 */ stw r3, 0x10(r31) +/* 801925C4 0018F504 80 7F 00 0C */ lwz r3, 0xc(r31) +/* 801925C8 0018F508 3C 80 5F 65 */ lis r4, 0x5F656631@ha +/* 801925CC 0018F50C 38 C4 66 31 */ addi r6, r4, 0x5F656631@l +/* 801925D0 0018F510 3C 80 77 5F */ lis r4, 0x775F6370@ha +/* 801925D4 0018F514 38 A4 63 70 */ addi r5, r4, 0x775F6370@l +/* 801925D8 0018F518 81 83 00 00 */ lwz r12, 0(r3) +/* 801925DC 0018F51C 81 8C 00 3C */ lwz r12, 0x3c(r12) +/* 801925E0 0018F520 7D 89 03 A6 */ mtctr r12 +/* 801925E4 0018F524 4E 80 04 21 */ bctrl +/* 801925E8 0018F528 38 00 00 00 */ li r0, 0 +/* 801925EC 0018F52C 98 03 00 B0 */ stb r0, 0xb0(r3) +/* 801925F0 0018F530 80 7F 00 0C */ lwz r3, 0xc(r31) +/* 801925F4 0018F534 3C 80 74 5F */ lis r4, 0x745F6931@ha +/* 801925F8 0018F538 38 C4 69 31 */ addi r6, r4, 0x745F6931@l +/* 801925FC 0018F53C 3C 80 77 5F */ lis r4, 0x775F6461@ha +/* 80192600 0018F540 38 A4 64 61 */ addi r5, r4, 0x775F6461@l +/* 80192604 0018F544 81 83 00 00 */ lwz r12, 0(r3) +/* 80192608 0018F548 81 8C 00 3C */ lwz r12, 0x3c(r12) +/* 8019260C 0018F54C 7D 89 03 A6 */ mtctr r12 +/* 80192610 0018F550 4E 80 04 21 */ bctrl +/* 80192614 0018F554 90 7F 00 18 */ stw r3, 0x18(r31) +/* 80192618 0018F558 38 60 00 1C */ li r3, 0x1c +/* 8019261C 0018F55C 48 13 C6 31 */ bl __nw__FUl +/* 80192620 0018F560 7C 60 1B 79 */ or. r0, r3, r3 +/* 80192624 0018F564 41 82 00 28 */ beq lbl_8019264C +/* 80192628 0018F568 80 9F 00 0C */ lwz r4, 0xc(r31) +/* 8019262C 0018F56C 3C A0 74 5F */ lis r5, 0x745F6931@ha +/* 80192630 0018F570 38 C5 69 31 */ addi r6, r5, 0x745F6931@l +/* 80192634 0018F574 3C A0 77 5F */ lis r5, 0x775F6461@ha +/* 80192638 0018F578 38 A5 64 61 */ addi r5, r5, 0x775F6461@l +/* 8019263C 0018F57C 38 E0 00 02 */ li r7, 2 +/* 80192640 0018F580 39 00 00 00 */ li r8, 0 +/* 80192644 0018F584 48 0C 2D B9 */ bl CPaneMgrAlpha_X1_ +/* 80192648 0018F588 7C 60 1B 78 */ mr r0, r3 +lbl_8019264C: +/* 8019264C 0018F58C 90 1F 00 24 */ stw r0, 0x24(r31) +/* 80192650 0018F590 38 60 00 1C */ li r3, 0x1c +/* 80192654 0018F594 48 13 C5 F9 */ bl __nw__FUl +/* 80192658 0018F598 7C 60 1B 79 */ or. r0, r3, r3 +/* 8019265C 0018F59C 41 82 00 28 */ beq lbl_80192684 +/* 80192660 0018F5A0 80 9F 00 0C */ lwz r4, 0xc(r31) +/* 80192664 0018F5A4 3C A0 61 5F */ lis r5, 0x615F6931@ha +/* 80192668 0018F5A8 38 C5 69 31 */ addi r6, r5, 0x615F6931@l +/* 8019266C 0018F5AC 3C A0 77 5F */ lis r5, 0x775F6E64@ha +/* 80192670 0018F5B0 38 A5 6E 64 */ addi r5, r5, 0x775F6E64@l +/* 80192674 0018F5B4 38 E0 00 02 */ li r7, 2 +/* 80192678 0018F5B8 39 00 00 00 */ li r8, 0 +/* 8019267C 0018F5BC 48 0C 2D 81 */ bl CPaneMgrAlpha_X1_ +/* 80192680 0018F5C0 7C 60 1B 78 */ mr r0, r3 +lbl_80192684: +/* 80192684 0018F5C4 90 1F 00 28 */ stw r0, 0x28(r31) +/* 80192688 0018F5C8 80 7F 00 0C */ lwz r3, 0xc(r31) +/* 8019268C 0018F5CC 3C 80 74 5F */ lis r4, 0x745F3032@ha +/* 80192690 0018F5D0 38 C4 30 32 */ addi r6, r4, 0x745F3032@l +/* 80192694 0018F5D4 3C 80 66 5F */ lis r4, 0x665F735F@ha +/* 80192698 0018F5D8 38 A4 73 5F */ addi r5, r4, 0x665F735F@l +/* 8019269C 0018F5DC 81 83 00 00 */ lwz r12, 0(r3) +/* 801926A0 0018F5E0 81 8C 00 3C */ lwz r12, 0x3c(r12) +/* 801926A4 0018F5E4 7D 89 03 A6 */ mtctr r12 +/* 801926A8 0018F5E8 4E 80 04 21 */ bctrl +/* 801926AC 0018F5EC 90 61 00 08 */ stw r3, 8(r1) +/* 801926B0 0018F5F0 80 7F 00 0C */ lwz r3, 0xc(r31) +/* 801926B4 0018F5F4 3C 80 74 5F */ lis r4, 0x745F3032@ha +/* 801926B8 0018F5F8 38 C4 30 32 */ addi r6, r4, 0x745F3032@l +/* 801926BC 0018F5FC 3C 80 66 5F */ lis r4, 0x665F705F@ha +/* 801926C0 0018F600 38 A4 70 5F */ addi r5, r4, 0x665F705F@l +/* 801926C4 0018F604 81 83 00 00 */ lwz r12, 0(r3) +/* 801926C8 0018F608 81 8C 00 3C */ lwz r12, 0x3c(r12) +/* 801926CC 0018F60C 7D 89 03 A6 */ mtctr r12 +/* 801926D0 0018F610 4E 80 04 21 */ bctrl +/* 801926D4 0018F614 90 61 00 0C */ stw r3, 0xc(r1) +/* 801926D8 0018F618 80 7F 00 0C */ lwz r3, 0xc(r31) +/* 801926DC 0018F61C 3C 80 74 5F */ lis r4, 0x745F3031@ha +/* 801926E0 0018F620 38 C4 30 31 */ addi r6, r4, 0x745F3031@l +/* 801926E4 0018F624 3C 80 77 5F */ lis r4, 0x775F735F@ha +/* 801926E8 0018F628 38 A4 73 5F */ addi r5, r4, 0x775F735F@l +/* 801926EC 0018F62C 81 83 00 00 */ lwz r12, 0(r3) +/* 801926F0 0018F630 81 8C 00 3C */ lwz r12, 0x3c(r12) +/* 801926F4 0018F634 7D 89 03 A6 */ mtctr r12 +/* 801926F8 0018F638 4E 80 04 21 */ bctrl +/* 801926FC 0018F63C 38 00 00 00 */ li r0, 0 +/* 80192700 0018F640 98 03 00 B0 */ stb r0, 0xb0(r3) +/* 80192704 0018F644 80 7F 00 0C */ lwz r3, 0xc(r31) +/* 80192708 0018F648 3C 80 74 5F */ lis r4, 0x745F3031@ha +/* 8019270C 0018F64C 38 C4 30 31 */ addi r6, r4, 0x745F3031@l +/* 80192710 0018F650 3C 80 77 5F */ lis r4, 0x775F705F@ha +/* 80192714 0018F654 38 A4 70 5F */ addi r5, r4, 0x775F705F@l +/* 80192718 0018F658 81 83 00 00 */ lwz r12, 0(r3) +/* 8019271C 0018F65C 81 8C 00 3C */ lwz r12, 0x3c(r12) +/* 80192720 0018F660 7D 89 03 A6 */ mtctr r12 +/* 80192724 0018F664 4E 80 04 21 */ bctrl +/* 80192728 0018F668 3B C0 00 00 */ li r30, 0 +/* 8019272C 0018F66C 9B C3 00 B0 */ stb r30, 0xb0(r3) +/* 80192730 0018F670 3B 40 00 00 */ li r26, 0 +/* 80192734 0018F674 3B A1 00 08 */ addi r29, r1, 8 +/* 80192738 0018F678 3C 60 80 39 */ lis r3, lbl_803948B8@ha +/* 8019273C 0018F67C 3B 83 48 B8 */ addi r28, r3, lbl_803948B8@l +lbl_80192740: +/* 80192740 0018F680 7F 7D F0 2E */ lwzx r27, r29, r30 +/* 80192744 0018F684 7F 63 DB 78 */ mr r3, r27 +/* 80192748 0018F688 80 9F 00 10 */ lwz r4, 0x10(r31) +/* 8019274C 0018F68C 81 9B 00 00 */ lwz r12, 0(r27) +/* 80192750 0018F690 81 8C 00 9C */ lwz r12, 0x9c(r12) +/* 80192754 0018F694 7D 89 03 A6 */ mtctr r12 +/* 80192758 0018F698 4E 80 04 21 */ bctrl +/* 8019275C 0018F69C 7F 63 DB 78 */ mr r3, r27 +/* 80192760 0018F6A0 38 80 00 20 */ li r4, 0x20 +/* 80192764 0018F6A4 38 BC 00 20 */ addi r5, r28, 0x20 +/* 80192768 0018F6A8 4C C6 31 82 */ crclr 6 +/* 8019276C 0018F6AC 48 16 DF E1 */ bl J2DTextBox_NS_setString_X1_ +/* 80192770 0018F6B0 3B 5A 00 01 */ addi r26, r26, 1 +/* 80192774 0018F6B4 2C 1A 00 02 */ cmpwi r26, 2 +/* 80192778 0018F6B8 3B DE 00 04 */ addi r30, r30, 4 +/* 8019277C 0018F6BC 41 80 FF C4 */ blt lbl_80192740 +/* 80192780 0018F6C0 80 61 00 08 */ lwz r3, 8(r1) +/* 80192784 0018F6C4 48 16 DE D5 */ bl J2DTextBox_NS_getStringPtr +/* 80192788 0018F6C8 7C 65 1B 78 */ mr r5, r3 +/* 8019278C 0018F6CC 3C 60 80 43 */ lis r3, lbl_80430188@ha +/* 80192790 0018F6D0 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 80192794 0018F6D4 38 80 03 D0 */ li r4, 0x3d0 +/* 80192798 0018F6D8 38 C0 00 00 */ li r6, 0 +/* 8019279C 0018F6DC 48 08 9A B5 */ bl dMeter2Info_c_NS_getString +/* 801927A0 0018F6E0 80 61 00 0C */ lwz r3, 0xc(r1) +/* 801927A4 0018F6E4 48 16 DE B5 */ bl J2DTextBox_NS_getStringPtr +/* 801927A8 0018F6E8 7C 65 1B 78 */ mr r5, r3 +/* 801927AC 0018F6EC 3C 60 80 43 */ lis r3, lbl_80430188@ha +/* 801927B0 0018F6F0 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 801927B4 0018F6F4 38 80 03 D1 */ li r4, 0x3d1 +/* 801927B8 0018F6F8 38 C0 00 00 */ li r6, 0 +/* 801927BC 0018F6FC 48 08 9A 95 */ bl dMeter2Info_c_NS_getString +/* 801927C0 0018F700 80 7F 00 0C */ lwz r3, 0xc(r31) +/* 801927C4 0018F704 3C 80 6D 65 */ lis r4, 0x6D653031@ha +/* 801927C8 0018F708 38 C4 30 31 */ addi r6, r4, 0x6D653031@l +/* 801927CC 0018F70C 3C 80 66 5F */ lis r4, 0x665F6E61@ha +/* 801927D0 0018F710 38 A4 6E 61 */ addi r5, r4, 0x665F6E61@l +/* 801927D4 0018F714 81 83 00 00 */ lwz r12, 0(r3) +/* 801927D8 0018F718 81 8C 00 3C */ lwz r12, 0x3c(r12) +/* 801927DC 0018F71C 7D 89 03 A6 */ mtctr r12 +/* 801927E0 0018F720 4E 80 04 21 */ bctrl +/* 801927E4 0018F724 90 61 00 08 */ stw r3, 8(r1) +/* 801927E8 0018F728 80 7F 00 0C */ lwz r3, 0xc(r31) +/* 801927EC 0018F72C 3C 80 65 77 */ lis r4, 0x65775F31@ha +/* 801927F0 0018F730 38 C4 5F 31 */ addi r6, r4, 0x65775F31@l +/* 801927F4 0018F734 3C 80 00 66 */ lis r4, 0x00665F6E@ha +/* 801927F8 0018F738 38 A4 5F 6E */ addi r5, r4, 0x00665F6E@l +/* 801927FC 0018F73C 81 83 00 00 */ lwz r12, 0(r3) +/* 80192800 0018F740 81 8C 00 3C */ lwz r12, 0x3c(r12) +/* 80192804 0018F744 7D 89 03 A6 */ mtctr r12 +/* 80192808 0018F748 4E 80 04 21 */ bctrl +/* 8019280C 0018F74C 90 61 00 0C */ stw r3, 0xc(r1) +/* 80192810 0018F750 80 7F 00 0C */ lwz r3, 0xc(r31) +/* 80192814 0018F754 3C 80 6D 65 */ lis r4, 0x6D653031@ha +/* 80192818 0018F758 38 C4 30 31 */ addi r6, r4, 0x6D653031@l +/* 8019281C 0018F75C 3C 80 77 5F */ lis r4, 0x775F6E61@ha +/* 80192820 0018F760 38 A4 6E 61 */ addi r5, r4, 0x775F6E61@l +/* 80192824 0018F764 81 83 00 00 */ lwz r12, 0(r3) +/* 80192828 0018F768 81 8C 00 3C */ lwz r12, 0x3c(r12) +/* 8019282C 0018F76C 7D 89 03 A6 */ mtctr r12 +/* 80192830 0018F770 4E 80 04 21 */ bctrl +/* 80192834 0018F774 38 00 00 00 */ li r0, 0 +/* 80192838 0018F778 98 03 00 B0 */ stb r0, 0xb0(r3) +/* 8019283C 0018F77C 80 7F 00 0C */ lwz r3, 0xc(r31) +/* 80192840 0018F780 3C 80 65 77 */ lis r4, 0x65775F31@ha +/* 80192844 0018F784 38 C4 5F 31 */ addi r6, r4, 0x65775F31@l +/* 80192848 0018F788 3C 80 00 77 */ lis r4, 0x00775F6E@ha +/* 8019284C 0018F78C 38 A4 5F 6E */ addi r5, r4, 0x00775F6E@l +/* 80192850 0018F790 81 83 00 00 */ lwz r12, 0(r3) +/* 80192854 0018F794 81 8C 00 3C */ lwz r12, 0x3c(r12) +/* 80192858 0018F798 7D 89 03 A6 */ mtctr r12 +/* 8019285C 0018F79C 4E 80 04 21 */ bctrl +/* 80192860 0018F7A0 38 00 00 00 */ li r0, 0 +/* 80192864 0018F7A4 98 03 00 B0 */ stb r0, 0xb0(r3) +/* 80192868 0018F7A8 80 7F 00 0C */ lwz r3, 0xc(r31) +/* 8019286C 0018F7AC 3C 80 6D 65 */ lis r4, 0x6D653031@ha +/* 80192870 0018F7B0 38 C4 30 31 */ addi r6, r4, 0x6D653031@l +/* 80192874 0018F7B4 3C 80 77 5F */ lis r4, 0x775F7469@ha +/* 80192878 0018F7B8 38 A4 74 69 */ addi r5, r4, 0x775F7469@l +/* 8019287C 0018F7BC 81 83 00 00 */ lwz r12, 0(r3) +/* 80192880 0018F7C0 81 8C 00 3C */ lwz r12, 0x3c(r12) +/* 80192884 0018F7C4 7D 89 03 A6 */ mtctr r12 +/* 80192888 0018F7C8 4E 80 04 21 */ bctrl +/* 8019288C 0018F7CC 90 61 00 10 */ stw r3, 0x10(r1) +/* 80192890 0018F7D0 80 7F 00 0C */ lwz r3, 0xc(r31) +/* 80192894 0018F7D4 3C 80 69 6D */ lis r4, 0x696D3031@ha +/* 80192898 0018F7D8 38 C4 30 31 */ addi r6, r4, 0x696D3031@l +/* 8019289C 0018F7DC 3C 80 77 5F */ lis r4, 0x775F7074@ha +/* 801928A0 0018F7E0 38 A4 70 74 */ addi r5, r4, 0x775F7074@l +/* 801928A4 0018F7E4 81 83 00 00 */ lwz r12, 0(r3) +/* 801928A8 0018F7E8 81 8C 00 3C */ lwz r12, 0x3c(r12) +/* 801928AC 0018F7EC 7D 89 03 A6 */ mtctr r12 +/* 801928B0 0018F7F0 4E 80 04 21 */ bctrl +/* 801928B4 0018F7F4 90 61 00 14 */ stw r3, 0x14(r1) +/* 801928B8 0018F7F8 3B 40 00 00 */ li r26, 0 +/* 801928BC 0018F7FC 3B C0 00 00 */ li r30, 0 +/* 801928C0 0018F800 3B 81 00 08 */ addi r28, r1, 8 +/* 801928C4 0018F804 3C 60 80 39 */ lis r3, lbl_803948B8@ha +/* 801928C8 0018F808 3B A3 48 B8 */ addi r29, r3, lbl_803948B8@l +lbl_801928CC: +/* 801928CC 0018F80C 7F 7C F0 2E */ lwzx r27, r28, r30 +/* 801928D0 0018F810 7F 63 DB 78 */ mr r3, r27 +/* 801928D4 0018F814 80 9F 00 10 */ lwz r4, 0x10(r31) +/* 801928D8 0018F818 81 9B 00 00 */ lwz r12, 0(r27) +/* 801928DC 0018F81C 81 8C 00 9C */ lwz r12, 0x9c(r12) +/* 801928E0 0018F820 7D 89 03 A6 */ mtctr r12 +/* 801928E4 0018F824 4E 80 04 21 */ bctrl +/* 801928E8 0018F828 7F 63 DB 78 */ mr r3, r27 +/* 801928EC 0018F82C 38 80 00 40 */ li r4, 0x40 +/* 801928F0 0018F830 38 BD 00 20 */ addi r5, r29, 0x20 +/* 801928F4 0018F834 4C C6 31 82 */ crclr 6 +/* 801928F8 0018F838 48 16 DE 55 */ bl J2DTextBox_NS_setString_X1_ +/* 801928FC 0018F83C 3B 5A 00 01 */ addi r26, r26, 1 +/* 80192900 0018F840 2C 1A 00 04 */ cmpwi r26, 4 +/* 80192904 0018F844 3B DE 00 04 */ addi r30, r30, 4 +/* 80192908 0018F848 41 80 FF C4 */ blt lbl_801928CC +/* 8019290C 0018F84C 80 61 00 08 */ lwz r3, 8(r1) +/* 80192910 0018F850 48 16 DD 49 */ bl J2DTextBox_NS_getStringPtr +/* 80192914 0018F854 90 7F 00 2C */ stw r3, 0x2c(r31) +/* 80192918 0018F858 80 61 00 0C */ lwz r3, 0xc(r1) +/* 8019291C 0018F85C 48 16 DD 3D */ bl J2DTextBox_NS_getStringPtr +/* 80192920 0018F860 90 7F 00 38 */ stw r3, 0x38(r31) +/* 80192924 0018F864 80 61 00 10 */ lwz r3, 0x10(r1) +/* 80192928 0018F868 48 16 DD 31 */ bl J2DTextBox_NS_getStringPtr +/* 8019292C 0018F86C 90 7F 00 30 */ stw r3, 0x30(r31) +/* 80192930 0018F870 80 61 00 14 */ lwz r3, 0x14(r1) +/* 80192934 0018F874 48 16 DD 25 */ bl J2DTextBox_NS_getStringPtr +/* 80192938 0018F878 90 7F 00 34 */ stw r3, 0x34(r31) +/* 8019293C 0018F87C 39 61 00 30 */ addi r11, r1, 0x30 +/* 80192940 0018F880 48 1C F8 DD */ bl _restgpr_26 +/* 80192944 0018F884 80 01 00 34 */ lwz r0, 0x34(r1) +/* 80192948 0018F888 7C 08 03 A6 */ mtlr r0 +/* 8019294C 0018F88C 38 21 00 30 */ addi r1, r1, 0x30 +/* 80192950 0018F890 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_file/d_file_sel_info/asm/func_80192954.s b/include/d/d_file/d_file_sel_info/asm/func_80192954.s new file mode 100644 index 0000000000..cda4dcc668 --- /dev/null +++ b/include/d/d_file/d_file_sel_info/asm/func_80192954.s @@ -0,0 +1,87 @@ +/* 80192954 0018F894 94 21 FF E0 */ stwu r1, -0x20(r1) +/* 80192958 0018F898 7C 08 02 A6 */ mflr r0 +/* 8019295C 0018F89C 90 01 00 24 */ stw r0, 0x24(r1) +/* 80192960 0018F8A0 39 61 00 20 */ addi r11, r1, 0x20 +/* 80192964 0018F8A4 48 1C F8 79 */ bl _savegpr_29 +/* 80192968 0018F8A8 7C 7F 1B 78 */ mr r31, r3 +/* 8019296C 0018F8AC 7C 9D 23 78 */ mr r29, r4 +/* 80192970 0018F8B0 2C 05 00 00 */ cmpwi r5, 0 +/* 80192974 0018F8B4 41 82 00 F8 */ beq lbl_80192A6C +/* 80192978 0018F8B8 3B DD 01 B4 */ addi r30, r29, 0x1b4 +/* 8019297C 0018F8BC 88 1D 01 B4 */ lbz r0, 0x1b4(r29) +/* 80192980 0018F8C0 7C 00 07 75 */ extsb. r0, r0 +/* 80192984 0018F8C4 40 82 00 B8 */ bne lbl_80192A3C +/* 80192988 0018F8C8 88 1F 00 22 */ lbz r0, 0x22(r31) +/* 8019298C 0018F8CC 28 00 00 01 */ cmplwi r0, 1 +/* 80192990 0018F8D0 40 82 00 8C */ bne lbl_80192A1C +/* 80192994 0018F8D4 54 C6 06 3E */ clrlwi r6, r6, 0x18 +/* 80192998 0018F8D8 3C A0 80 40 */ lis r5, lbl_804061C0@ha +/* 8019299C 0018F8DC 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l +/* 801929A0 0018F8E0 88 05 0F 18 */ lbz r0, 0xf18(r5) +/* 801929A4 0018F8E4 7C 06 00 40 */ cmplw r6, r0 +/* 801929A8 0018F8E8 40 82 00 74 */ bne lbl_80192A1C +/* 801929AC 0018F8EC A0 05 00 02 */ lhz r0, 2(r5) +/* 801929B0 0018F8F0 B0 1D 00 02 */ sth r0, 2(r29) +/* 801929B4 0018F8F4 48 00 00 ED */ bl setHeartCnt__12dFile_info_cFP10dSv_save_c +/* 801929B8 0018F8F8 38 00 00 0C */ li r0, 0xc +/* 801929BC 0018F8FC B0 1D 00 02 */ sth r0, 2(r29) +/* 801929C0 0018F900 3C 60 80 40 */ lis r3, lbl_804061C0@ha +/* 801929C4 0018F904 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 801929C8 0018F908 38 83 01 B4 */ addi r4, r3, 0x1b4 +/* 801929CC 0018F90C 80 7F 00 2C */ lwz r3, 0x2c(r31) +/* 801929D0 0018F910 48 1D 61 5D */ bl strcpy +/* 801929D4 0018F914 80 7F 00 30 */ lwz r3, 0x30(r31) +/* 801929D8 0018F918 3C 80 80 39 */ lis r4, lbl_803948B8@ha +/* 801929DC 0018F91C 38 84 48 B8 */ addi r4, r4, lbl_803948B8@l +/* 801929E0 0018F920 38 84 00 20 */ addi r4, r4, 0x20 +/* 801929E4 0018F924 48 1D 61 49 */ bl strcpy +/* 801929E8 0018F928 80 7F 00 34 */ lwz r3, 0x34(r31) +/* 801929EC 0018F92C 3C 80 80 39 */ lis r4, lbl_803948B8@ha +/* 801929F0 0018F930 38 84 48 B8 */ addi r4, r4, lbl_803948B8@l +/* 801929F4 0018F934 38 84 00 20 */ addi r4, r4, 0x20 +/* 801929F8 0018F938 48 1D 61 35 */ bl strcpy +/* 801929FC 0018F93C 3C 60 80 43 */ lis r3, lbl_80430188@ha +/* 80192A00 0018F940 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 80192A04 0018F944 38 80 00 4D */ li r4, 0x4d +/* 80192A08 0018F948 80 BF 00 38 */ lwz r5, 0x38(r31) +/* 80192A0C 0018F94C 38 C0 00 00 */ li r6, 0 +/* 80192A10 0018F950 48 08 98 41 */ bl dMeter2Info_c_NS_getString +/* 80192A14 0018F954 38 60 00 02 */ li r3, 2 +/* 80192A18 0018F958 48 00 00 70 */ b lbl_80192A88 +lbl_80192A1C: +/* 80192A1C 0018F95C 3C 60 80 43 */ lis r3, lbl_80430188@ha +/* 80192A20 0018F960 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 80192A24 0018F964 38 80 00 4D */ li r4, 0x4d +/* 80192A28 0018F968 80 BF 00 38 */ lwz r5, 0x38(r31) +/* 80192A2C 0018F96C 38 C0 00 00 */ li r6, 0 +/* 80192A30 0018F970 48 08 98 21 */ bl dMeter2Info_c_NS_getString +/* 80192A34 0018F974 38 60 00 01 */ li r3, 1 +/* 80192A38 0018F978 48 00 00 50 */ b lbl_80192A88 +lbl_80192A3C: +/* 80192A3C 0018F97C 48 00 00 65 */ bl setHeartCnt__12dFile_info_cFP10dSv_save_c +/* 80192A40 0018F980 80 7F 00 2C */ lwz r3, 0x2c(r31) +/* 80192A44 0018F984 7F C4 F3 78 */ mr r4, r30 +/* 80192A48 0018F988 48 1D 60 E5 */ bl strcpy +/* 80192A4C 0018F98C 7F E3 FB 78 */ mr r3, r31 +/* 80192A50 0018F990 7F A4 EB 78 */ mr r4, r29 +/* 80192A54 0018F994 48 00 01 B5 */ bl setSaveDate__12dFile_info_cFP10dSv_save_c +/* 80192A58 0018F998 7F E3 FB 78 */ mr r3, r31 +/* 80192A5C 0018F99C 7F A4 EB 78 */ mr r4, r29 +/* 80192A60 0018F9A0 48 00 02 11 */ bl setPlayTime__12dFile_info_cFP10dSv_save_c +/* 80192A64 0018F9A4 38 60 00 00 */ li r3, 0 +/* 80192A68 0018F9A8 48 00 00 20 */ b lbl_80192A88 +lbl_80192A6C: +/* 80192A6C 0018F9AC 3C 60 80 43 */ lis r3, lbl_80430188@ha +/* 80192A70 0018F9B0 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 80192A74 0018F9B4 38 80 00 51 */ li r4, 0x51 +/* 80192A78 0018F9B8 80 BF 00 38 */ lwz r5, 0x38(r31) +/* 80192A7C 0018F9BC 38 C0 00 00 */ li r6, 0 +/* 80192A80 0018F9C0 48 08 97 D1 */ bl dMeter2Info_c_NS_getString +/* 80192A84 0018F9C4 38 60 FF FF */ li r3, -1 +lbl_80192A88: +/* 80192A88 0018F9C8 39 61 00 20 */ addi r11, r1, 0x20 +/* 80192A8C 0018F9CC 48 1C F7 9D */ bl _restgpr_29 +/* 80192A90 0018F9D0 80 01 00 24 */ lwz r0, 0x24(r1) +/* 80192A94 0018F9D4 7C 08 03 A6 */ mtlr r0 +/* 80192A98 0018F9D8 38 21 00 20 */ addi r1, r1, 0x20 +/* 80192A9C 0018F9DC 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_file/d_file_sel_info/asm/func_80192AA0.s b/include/d/d_file/d_file_sel_info/asm/func_80192AA0.s new file mode 100644 index 0000000000..b6f556438b --- /dev/null +++ b/include/d/d_file/d_file_sel_info/asm/func_80192AA0.s @@ -0,0 +1,96 @@ +/* 80192AA0 0018F9E0 94 21 FF 80 */ stwu r1, -0x80(r1) +/* 80192AA4 0018F9E4 7C 08 02 A6 */ mflr r0 +/* 80192AA8 0018F9E8 90 01 00 84 */ stw r0, 0x84(r1) +/* 80192AAC 0018F9EC 39 61 00 80 */ addi r11, r1, 0x80 +/* 80192AB0 0018F9F0 48 1C F7 11 */ bl func_803621C0 +/* 80192AB4 0018F9F4 7C 78 1B 78 */ mr r24, r3 +/* 80192AB8 0018F9F8 7C 99 23 78 */ mr r25, r4 +/* 80192ABC 0018F9FC A0 84 00 02 */ lhz r4, 2(r4) +/* 80192AC0 0018FA00 54 80 04 3E */ clrlwi r0, r4, 0x10 +/* 80192AC4 0018FA04 38 60 00 05 */ li r3, 5 +/* 80192AC8 0018FA08 7F 80 1B D6 */ divw r28, r0, r3 +/* 80192ACC 0018FA0C 7C 04 1B D6 */ divw r0, r4, r3 +/* 80192AD0 0018FA10 7C 00 19 D6 */ mullw r0, r0, r3 +/* 80192AD4 0018FA14 7F 60 20 51 */ subf. r27, r0, r4 +/* 80192AD8 0018FA18 41 82 00 08 */ beq lbl_80192AE0 +/* 80192ADC 0018FA1C 3B 9C 00 01 */ addi r28, r28, 1 +lbl_80192AE0: +/* 80192AE0 0018FA20 3B 40 00 00 */ li r26, 0 +/* 80192AE4 0018FA24 3A E0 00 00 */ li r23, 0 +/* 80192AE8 0018FA28 3A C0 00 00 */ li r22, 0 +/* 80192AEC 0018FA2C 57 64 10 3A */ slwi r4, r27, 2 +/* 80192AF0 0018FA30 3C 60 80 3C */ lis r3, lbl_803BB548@ha +/* 80192AF4 0018FA34 38 03 B5 48 */ addi r0, r3, lbl_803BB548@l +/* 80192AF8 0018FA38 7C 60 22 14 */ add r3, r0, r4 +/* 80192AFC 0018FA3C 3B C3 FF FC */ addi r30, r3, -4 +/* 80192B00 0018FA40 3C 60 80 3C */ lis r3, lbl_803BB4A8@ha +/* 80192B04 0018FA44 3B E3 B4 A8 */ addi r31, r3, lbl_803BB4A8@l +/* 80192B08 0018FA48 3B A1 00 08 */ addi r29, r1, 8 +lbl_80192B0C: +/* 80192B0C 0018FA4C 80 78 00 0C */ lwz r3, 0xc(r24) +/* 80192B10 0018FA50 7C 9F B2 14 */ add r4, r31, r22 +/* 80192B14 0018FA54 80 A4 00 00 */ lwz r5, 0(r4) +/* 80192B18 0018FA58 80 C4 00 04 */ lwz r6, 4(r4) +/* 80192B1C 0018FA5C 81 83 00 00 */ lwz r12, 0(r3) +/* 80192B20 0018FA60 81 8C 00 3C */ lwz r12, 0x3c(r12) +/* 80192B24 0018FA64 7D 89 03 A6 */ mtctr r12 +/* 80192B28 0018FA68 4E 80 04 21 */ bctrl +/* 80192B2C 0018FA6C 7C 7D B9 2E */ stwx r3, r29, r23 +/* 80192B30 0018FA70 A0 79 00 00 */ lhz r3, 0(r25) +/* 80192B34 0018FA74 38 00 00 05 */ li r0, 5 +/* 80192B38 0018FA78 7C 03 03 D6 */ divw r0, r3, r0 +/* 80192B3C 0018FA7C 7C 1A 00 00 */ cmpw r26, r0 +/* 80192B40 0018FA80 40 80 00 90 */ bge lbl_80192BD0 +/* 80192B44 0018FA84 38 00 00 01 */ li r0, 1 +/* 80192B48 0018FA88 7C 7D B8 2E */ lwzx r3, r29, r23 +/* 80192B4C 0018FA8C 98 03 00 B0 */ stb r0, 0xb0(r3) +/* 80192B50 0018FA90 7C 1A E0 00 */ cmpw r26, r28 +/* 80192B54 0018FA94 40 80 00 58 */ bge lbl_80192BAC +/* 80192B58 0018FA98 2C 1B 00 00 */ cmpwi r27, 0 +/* 80192B5C 0018FA9C 41 82 00 2C */ beq lbl_80192B88 +/* 80192B60 0018FAA0 38 1C FF FF */ addi r0, r28, -1 +/* 80192B64 0018FAA4 7C 1A 00 00 */ cmpw r26, r0 +/* 80192B68 0018FAA8 40 82 00 20 */ bne lbl_80192B88 +/* 80192B6C 0018FAAC 80 9E 00 00 */ lwz r4, 0(r30) +/* 80192B70 0018FAB0 38 A0 00 00 */ li r5, 0 +/* 80192B74 0018FAB4 81 83 00 00 */ lwz r12, 0(r3) +/* 80192B78 0018FAB8 81 8C 01 14 */ lwz r12, 0x114(r12) +/* 80192B7C 0018FABC 7D 89 03 A6 */ mtctr r12 +/* 80192B80 0018FAC0 4E 80 04 21 */ bctrl +/* 80192B84 0018FAC4 48 00 00 58 */ b lbl_80192BDC +lbl_80192B88: +/* 80192B88 0018FAC8 3C 80 80 39 */ lis r4, lbl_803948B8@ha +/* 80192B8C 0018FACC 38 84 48 B8 */ addi r4, r4, lbl_803948B8@l +/* 80192B90 0018FAD0 38 84 00 21 */ addi r4, r4, 0x21 +/* 80192B94 0018FAD4 38 A0 00 00 */ li r5, 0 +/* 80192B98 0018FAD8 81 83 00 00 */ lwz r12, 0(r3) +/* 80192B9C 0018FADC 81 8C 01 14 */ lwz r12, 0x114(r12) +/* 80192BA0 0018FAE0 7D 89 03 A6 */ mtctr r12 +/* 80192BA4 0018FAE4 4E 80 04 21 */ bctrl +/* 80192BA8 0018FAE8 48 00 00 34 */ b lbl_80192BDC +lbl_80192BAC: +/* 80192BAC 0018FAEC 3C 80 80 39 */ lis r4, lbl_803948B8@ha +/* 80192BB0 0018FAF0 38 84 48 B8 */ addi r4, r4, lbl_803948B8@l +/* 80192BB4 0018FAF4 38 84 00 21 */ addi r4, r4, 0x21 +/* 80192BB8 0018FAF8 38 A0 00 00 */ li r5, 0 +/* 80192BBC 0018FAFC 81 83 00 00 */ lwz r12, 0(r3) +/* 80192BC0 0018FB00 81 8C 01 14 */ lwz r12, 0x114(r12) +/* 80192BC4 0018FB04 7D 89 03 A6 */ mtctr r12 +/* 80192BC8 0018FB08 4E 80 04 21 */ bctrl +/* 80192BCC 0018FB0C 48 00 00 10 */ b lbl_80192BDC +lbl_80192BD0: +/* 80192BD0 0018FB10 38 00 00 00 */ li r0, 0 +/* 80192BD4 0018FB14 7C 7D B8 2E */ lwzx r3, r29, r23 +/* 80192BD8 0018FB18 98 03 00 B0 */ stb r0, 0xb0(r3) +lbl_80192BDC: +/* 80192BDC 0018FB1C 3B 5A 00 01 */ addi r26, r26, 1 +/* 80192BE0 0018FB20 2C 1A 00 14 */ cmpwi r26, 0x14 +/* 80192BE4 0018FB24 3A F7 00 04 */ addi r23, r23, 4 +/* 80192BE8 0018FB28 3A D6 00 08 */ addi r22, r22, 8 +/* 80192BEC 0018FB2C 41 80 FF 20 */ blt lbl_80192B0C +/* 80192BF0 0018FB30 39 61 00 80 */ addi r11, r1, 0x80 +/* 80192BF4 0018FB34 48 1C F6 19 */ bl func_8036220C +/* 80192BF8 0018FB38 80 01 00 84 */ lwz r0, 0x84(r1) +/* 80192BFC 0018FB3C 7C 08 03 A6 */ mtlr r0 +/* 80192C00 0018FB40 38 21 00 80 */ addi r1, r1, 0x80 +/* 80192C04 0018FB44 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_file/d_file_sel_info/asm/func_80192C08.s b/include/d/d_file/d_file_sel_info/asm/func_80192C08.s new file mode 100644 index 0000000000..1c22318ce2 --- /dev/null +++ b/include/d/d_file/d_file_sel_info/asm/func_80192C08.s @@ -0,0 +1,26 @@ +/* 80192C08 0018FB48 94 21 FF C0 */ stwu r1, -0x40(r1) +/* 80192C0C 0018FB4C 7C 08 02 A6 */ mflr r0 +/* 80192C10 0018FB50 90 01 00 44 */ stw r0, 0x44(r1) +/* 80192C14 0018FB54 93 E1 00 3C */ stw r31, 0x3c(r1) +/* 80192C18 0018FB58 7C 7F 1B 78 */ mr r31, r3 +/* 80192C1C 0018FB5C 80 64 00 28 */ lwz r3, 0x28(r4) +/* 80192C20 0018FB60 80 84 00 2C */ lwz r4, 0x2c(r4) +/* 80192C24 0018FB64 38 A1 00 08 */ addi r5, r1, 8 +/* 80192C28 0018FB68 48 1A FD 4D */ bl OSTicksToCalendarTime +/* 80192C2C 0018FB6C 80 7F 00 30 */ lwz r3, 0x30(r31) +/* 80192C30 0018FB70 3C 80 80 39 */ lis r4, lbl_803948B8@ha +/* 80192C34 0018FB74 38 84 48 B8 */ addi r4, r4, lbl_803948B8@l +/* 80192C38 0018FB78 38 84 00 31 */ addi r4, r4, 0x31 +/* 80192C3C 0018FB7C 80 A1 00 18 */ lwz r5, 0x18(r1) +/* 80192C40 0018FB80 38 A5 00 01 */ addi r5, r5, 1 +/* 80192C44 0018FB84 80 C1 00 14 */ lwz r6, 0x14(r1) +/* 80192C48 0018FB88 80 E1 00 1C */ lwz r7, 0x1c(r1) +/* 80192C4C 0018FB8C 81 01 00 10 */ lwz r8, 0x10(r1) +/* 80192C50 0018FB90 81 21 00 0C */ lwz r9, 0xc(r1) +/* 80192C54 0018FB94 4C C6 31 82 */ crclr 6 +/* 80192C58 0018FB98 48 1D 38 85 */ bl func_803664DC +/* 80192C5C 0018FB9C 83 E1 00 3C */ lwz r31, 0x3c(r1) +/* 80192C60 0018FBA0 80 01 00 44 */ lwz r0, 0x44(r1) +/* 80192C64 0018FBA4 7C 08 03 A6 */ mtlr r0 +/* 80192C68 0018FBA8 38 21 00 40 */ addi r1, r1, 0x40 +/* 80192C6C 0018FBAC 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_file/d_file_sel_info/asm/func_80192C70.s b/include/d/d_file/d_file_sel_info/asm/func_80192C70.s new file mode 100644 index 0000000000..804f1ce5ca --- /dev/null +++ b/include/d/d_file/d_file_sel_info/asm/func_80192C70.s @@ -0,0 +1,60 @@ +/* 80192C70 0018FBB0 94 21 FF E0 */ stwu r1, -0x20(r1) +/* 80192C74 0018FBB4 7C 08 02 A6 */ mflr r0 +/* 80192C78 0018FBB8 90 01 00 24 */ stw r0, 0x24(r1) +/* 80192C7C 0018FBBC 39 61 00 20 */ addi r11, r1, 0x20 +/* 80192C80 0018FBC0 48 1C F5 59 */ bl _savegpr_28 +/* 80192C84 0018FBC4 7C 7C 1B 78 */ mr r28, r3 +/* 80192C88 0018FBC8 80 64 01 A8 */ lwz r3, 0x1a8(r4) +/* 80192C8C 0018FBCC 80 84 01 AC */ lwz r4, 0x1ac(r4) +/* 80192C90 0018FBD0 3C A0 80 00 */ lis r5, 0x800000F8@ha +/* 80192C94 0018FBD4 80 05 00 F8 */ lwz r0, 0x800000F8@l(r5) +/* 80192C98 0018FBD8 54 06 F0 BE */ srwi r6, r0, 2 +/* 80192C9C 0018FBDC 38 A0 00 00 */ li r5, 0 +/* 80192CA0 0018FBE0 48 1C F6 85 */ bl func_80362324 +/* 80192CA4 0018FBE4 7C 9D 23 78 */ mr r29, r4 +/* 80192CA8 0018FBE8 7C 7E 1B 78 */ mr r30, r3 +/* 80192CAC 0018FBEC 3C A0 00 37 */ lis r5, 0x0036EE44@ha +/* 80192CB0 0018FBF0 38 E5 EE 44 */ addi r7, r5, 0x0036EE44@l +/* 80192CB4 0018FBF4 38 00 00 00 */ li r0, 0 +/* 80192CB8 0018FBF8 6F C6 80 00 */ xoris r6, r30, 0x8000 +/* 80192CBC 0018FBFC 6C 05 80 00 */ xoris r5, r0, 0x8000 +/* 80192CC0 0018FC00 7C 07 E8 10 */ subfc r0, r7, r29 +/* 80192CC4 0018FC04 7C A5 31 10 */ subfe r5, r5, r6 +/* 80192CC8 0018FC08 7C A6 31 10 */ subfe r5, r6, r6 +/* 80192CCC 0018FC0C 7C A5 00 D1 */ neg. r5, r5 +/* 80192CD0 0018FC10 40 82 00 20 */ bne lbl_80192CF0 +/* 80192CD4 0018FC14 80 7C 00 34 */ lwz r3, 0x34(r28) +/* 80192CD8 0018FC18 3C 80 80 39 */ lis r4, lbl_803948B8@ha +/* 80192CDC 0018FC1C 38 84 48 B8 */ addi r4, r4, lbl_803948B8@l +/* 80192CE0 0018FC20 38 84 00 48 */ addi r4, r4, 0x48 +/* 80192CE4 0018FC24 4C C6 31 82 */ crclr 6 +/* 80192CE8 0018FC28 48 1D 37 F5 */ bl func_803664DC +/* 80192CEC 0018FC2C 48 00 00 54 */ b lbl_80192D40 +lbl_80192CF0: +/* 80192CF0 0018FC30 38 A0 00 00 */ li r5, 0 +/* 80192CF4 0018FC34 38 C0 0E 10 */ li r6, 0xe10 +/* 80192CF8 0018FC38 48 1C F8 49 */ bl func_80362540 +/* 80192CFC 0018FC3C 38 A0 00 00 */ li r5, 0 +/* 80192D00 0018FC40 38 C0 00 3C */ li r6, 0x3c +/* 80192D04 0018FC44 48 1C F6 21 */ bl func_80362324 +/* 80192D08 0018FC48 7C 9F 23 78 */ mr r31, r4 +/* 80192D0C 0018FC4C 7F C3 F3 78 */ mr r3, r30 +/* 80192D10 0018FC50 7F A4 EB 78 */ mr r4, r29 +/* 80192D14 0018FC54 38 A0 00 00 */ li r5, 0 +/* 80192D18 0018FC58 38 C0 0E 10 */ li r6, 0xe10 +/* 80192D1C 0018FC5C 48 1C F6 09 */ bl func_80362324 +/* 80192D20 0018FC60 7C 85 23 78 */ mr r5, r4 +/* 80192D24 0018FC64 80 7C 00 34 */ lwz r3, 0x34(r28) +/* 80192D28 0018FC68 3C 80 80 39 */ lis r4, lbl_803948B8@ha +/* 80192D2C 0018FC6C 38 84 48 B8 */ addi r4, r4, lbl_803948B8@l +/* 80192D30 0018FC70 38 84 00 4F */ addi r4, r4, 0x4f +/* 80192D34 0018FC74 7F E6 FB 78 */ mr r6, r31 +/* 80192D38 0018FC78 4C C6 31 82 */ crclr 6 +/* 80192D3C 0018FC7C 48 1D 37 A1 */ bl func_803664DC +lbl_80192D40: +/* 80192D40 0018FC80 39 61 00 20 */ addi r11, r1, 0x20 +/* 80192D44 0018FC84 48 1C F4 E1 */ bl _restgpr_28 +/* 80192D48 0018FC88 80 01 00 24 */ lwz r0, 0x24(r1) +/* 80192D4C 0018FC8C 7C 08 03 A6 */ mtlr r0 +/* 80192D50 0018FC90 38 21 00 20 */ addi r1, r1, 0x20 +/* 80192D54 0018FC94 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_file/d_file_sel_info/asm/func_80192D58.s b/include/d/d_file/d_file_sel_info/asm/func_80192D58.s new file mode 100644 index 0000000000..42a5f1f673 --- /dev/null +++ b/include/d/d_file/d_file_sel_info/asm/func_80192D58.s @@ -0,0 +1 @@ +/* 80192D58 0018FC98 4E 80 00 20 */ blr diff --git a/include/d/d_file/d_file_sel_info/asm/func_80192D5C.s b/include/d/d_file/d_file_sel_info/asm/func_80192D5C.s new file mode 100644 index 0000000000..3ffe120154 --- /dev/null +++ b/include/d/d_file/d_file_sel_info/asm/func_80192D5C.s @@ -0,0 +1 @@ +/* 80192D5C 0018FC9C 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_file/d_file_sel_info/asm/func_80192D60.s b/include/d/d_file/d_file_sel_info/asm/func_80192D60.s new file mode 100644 index 0000000000..f544dc7ac6 --- /dev/null +++ b/include/d/d_file/d_file_sel_info/asm/func_80192D60.s @@ -0,0 +1,15 @@ +/* 80192D60 0018FCA0 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 80192D64 0018FCA4 7C 08 02 A6 */ mflr r0 +/* 80192D68 0018FCA8 90 01 00 14 */ stw r0, 0x14(r1) +/* 80192D6C 0018FCAC 7C 66 1B 78 */ mr r6, r3 +/* 80192D70 0018FCB0 3C 60 80 40 */ lis r3, lbl_804061C0@ha +/* 80192D74 0018FCB4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80192D78 0018FCB8 38 63 5F 64 */ addi r3, r3, 0x5f64 +/* 80192D7C 0018FCBC 38 83 01 B4 */ addi r4, r3, 0x1b4 +/* 80192D80 0018FCC0 38 A3 01 B8 */ addi r5, r3, 0x1b8 +/* 80192D84 0018FCC4 38 C6 00 08 */ addi r6, r6, 8 +/* 80192D88 0018FCC8 4B EC 3A 0D */ bl dDlst_list_c_NS_set +/* 80192D8C 0018FCCC 80 01 00 14 */ lwz r0, 0x14(r1) +/* 80192D90 0018FCD0 7C 08 03 A6 */ mtlr r0 +/* 80192D94 0018FCD4 38 21 00 10 */ addi r1, r1, 0x10 +/* 80192D98 0018FCD8 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_file/d_file_sel_info/asm/func_80192D9C.s b/include/d/d_file/d_file_sel_info/asm/func_80192D9C.s new file mode 100644 index 0000000000..449c515466 --- /dev/null +++ b/include/d/d_file/d_file_sel_info/asm/func_80192D9C.s @@ -0,0 +1,60 @@ +/* 80192D9C 0018FCDC 94 21 FF B0 */ stwu r1, -0x50(r1) +/* 80192DA0 0018FCE0 7C 08 02 A6 */ mflr r0 +/* 80192DA4 0018FCE4 90 01 00 54 */ stw r0, 0x54(r1) +/* 80192DA8 0018FCE8 39 61 00 50 */ addi r11, r1, 0x50 +/* 80192DAC 0018FCEC 48 1C F4 31 */ bl _savegpr_29 +/* 80192DB0 0018FCF0 7C 7D 1B 78 */ mr r29, r3 +/* 80192DB4 0018FCF4 3C 60 80 40 */ lis r3, lbl_804061C0@ha +/* 80192DB8 0018FCF8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80192DBC 0018FCFC 83 E3 5F 50 */ lwz r31, 0x5f50(r3) +/* 80192DC0 0018FD00 80 7D 00 0C */ lwz r3, 0xc(r29) +/* 80192DC4 0018FD04 28 03 00 00 */ cmplwi r3, 0 +/* 80192DC8 0018FD08 41 82 00 94 */ beq lbl_80192E5C +/* 80192DCC 0018FD0C 38 03 00 80 */ addi r0, r3, 0x80 +/* 80192DD0 0018FD10 7C 1E 03 78 */ mr r30, r0 +/* 80192DD4 0018FD14 80 9D 00 10 */ lwz r4, 0x10(r29) +/* 80192DD8 0018FD18 C0 24 00 2C */ lfs f1, 0x2c(r4) +/* 80192DDC 0018FD1C C0 04 00 24 */ lfs f0, 0x24(r4) +/* 80192DE0 0018FD20 EC 41 00 28 */ fsubs f2, f1, f0 +/* 80192DE4 0018FD24 C0 23 00 2C */ lfs f1, 0x2c(r3) +/* 80192DE8 0018FD28 C0 03 00 24 */ lfs f0, 0x24(r3) +/* 80192DEC 0018FD2C EC 61 00 28 */ fsubs f3, f1, f0 +/* 80192DF0 0018FD30 C0 24 00 28 */ lfs f1, 0x28(r4) +/* 80192DF4 0018FD34 C0 04 00 20 */ lfs f0, 0x20(r4) +/* 80192DF8 0018FD38 EC 81 00 28 */ fsubs f4, f1, f0 +/* 80192DFC 0018FD3C C0 23 00 28 */ lfs f1, 0x28(r3) +/* 80192E00 0018FD40 C0 03 00 20 */ lfs f0, 0x20(r3) +/* 80192E04 0018FD44 EC 01 00 28 */ fsubs f0, f1, f0 +/* 80192E08 0018FD48 38 61 00 08 */ addi r3, r1, 8 +/* 80192E0C 0018FD4C EC 20 20 24 */ fdivs f1, f0, f4 +/* 80192E10 0018FD50 EC 43 10 24 */ fdivs f2, f3, f2 +/* 80192E14 0018FD54 C0 62 9F F8 */ lfs f3, lbl_804539F8-_SDA2_BASE_(r2) +/* 80192E18 0018FD58 48 1B 3B 51 */ bl PSMTXScale +/* 80192E1C 0018FD5C 7F C3 F3 78 */ mr r3, r30 +/* 80192E20 0018FD60 38 81 00 08 */ addi r4, r1, 8 +/* 80192E24 0018FD64 7F C5 F3 78 */ mr r5, r30 +/* 80192E28 0018FD68 48 1B 36 BD */ bl PSMTXConcat +/* 80192E2C 0018FD6C 80 7D 00 04 */ lwz r3, 4(r29) +/* 80192E30 0018FD70 3C 80 6D 5F */ lis r4, 0x6D5F3032@ha +/* 80192E34 0018FD74 38 C4 30 32 */ addi r6, r4, 0x6D5F3032@l +/* 80192E38 0018FD78 38 A0 00 4E */ li r5, 0x4e +/* 80192E3C 0018FD7C 81 83 00 00 */ lwz r12, 0(r3) +/* 80192E40 0018FD80 81 8C 00 3C */ lwz r12, 0x3c(r12) +/* 80192E44 0018FD84 7D 89 03 A6 */ mtctr r12 +/* 80192E48 0018FD88 4E 80 04 21 */ bctrl +/* 80192E4C 0018FD8C 7C 64 1B 78 */ mr r4, r3 +/* 80192E50 0018FD90 7F C3 F3 78 */ mr r3, r30 +/* 80192E54 0018FD94 38 84 00 50 */ addi r4, r4, 0x50 +/* 80192E58 0018FD98 48 1B 36 59 */ bl PSMTXCopy +lbl_80192E5C: +/* 80192E5C 0018FD9C 80 7D 00 04 */ lwz r3, 4(r29) +/* 80192E60 0018FDA0 C0 22 9F FC */ lfs f1, lbl_804539FC-_SDA2_BASE_(r2) +/* 80192E64 0018FDA4 FC 40 08 90 */ fmr f2, f1 +/* 80192E68 0018FDA8 7F E4 FB 78 */ mr r4, r31 +/* 80192E6C 0018FDAC 48 16 60 69 */ bl J2DScreen_NS_draw +/* 80192E70 0018FDB0 39 61 00 50 */ addi r11, r1, 0x50 +/* 80192E74 0018FDB4 48 1C F3 B5 */ bl _restgpr_29 +/* 80192E78 0018FDB8 80 01 00 54 */ lwz r0, 0x54(r1) +/* 80192E7C 0018FDBC 7C 08 03 A6 */ mtlr r0 +/* 80192E80 0018FDC0 38 21 00 50 */ addi r1, r1, 0x50 +/* 80192E84 0018FDC4 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_file/d_file_sel_info/asm/func_80192E88.s b/include/d/d_file/d_file_sel_info/asm/func_80192E88.s new file mode 100644 index 0000000000..854919ad71 --- /dev/null +++ b/include/d/d_file/d_file_sel_info/asm/func_80192E88.s @@ -0,0 +1,16 @@ +/* 80192E88 0018FDC8 3C 60 80 3C */ lis r3, lbl_803BB498@ha +/* 80192E8C 0018FDCC 38 A3 B4 98 */ addi r5, r3, lbl_803BB498@l +/* 80192E90 0018FDD0 80 65 00 C0 */ lwz r3, 0xc0(r5) +/* 80192E94 0018FDD4 80 05 00 C4 */ lwz r0, 0xc4(r5) +/* 80192E98 0018FDD8 90 65 00 D8 */ stw r3, 0xd8(r5) +/* 80192E9C 0018FDDC 90 05 00 DC */ stw r0, 0xdc(r5) +/* 80192EA0 0018FDE0 80 05 00 C8 */ lwz r0, 0xc8(r5) +/* 80192EA4 0018FDE4 90 05 00 E0 */ stw r0, 0xe0(r5) +/* 80192EA8 0018FDE8 38 85 00 D8 */ addi r4, r5, 0xd8 +/* 80192EAC 0018FDEC 80 65 00 CC */ lwz r3, 0xcc(r5) +/* 80192EB0 0018FDF0 80 05 00 D0 */ lwz r0, 0xd0(r5) +/* 80192EB4 0018FDF4 90 64 00 0C */ stw r3, 0xc(r4) +/* 80192EB8 0018FDF8 90 04 00 10 */ stw r0, 0x10(r4) +/* 80192EBC 0018FDFC 80 05 00 D4 */ lwz r0, 0xd4(r5) +/* 80192EC0 0018FE00 90 04 00 14 */ stw r0, 0x14(r4) +/* 80192EC4 0018FE04 4E 80 00 20 */ blr diff --git a/include/d/d_file/d_file_sel_info/asm/func_80192EC8.s b/include/d/d_file/d_file_sel_info/asm/func_80192EC8.s new file mode 100644 index 0000000000..a50d61f3d6 --- /dev/null +++ b/include/d/d_file/d_file_sel_info/asm/func_80192EC8.s @@ -0,0 +1,19 @@ +/* 80192EC8 0018FE08 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 80192ECC 0018FE0C 7C 08 02 A6 */ mflr r0 +/* 80192ED0 0018FE10 90 01 00 14 */ stw r0, 0x14(r1) +/* 80192ED4 0018FE14 93 E1 00 0C */ stw r31, 0xc(r1) +/* 80192ED8 0018FE18 7C 7F 1B 79 */ or. r31, r3, r3 +/* 80192EDC 0018FE1C 41 82 00 1C */ beq lbl_80192EF8 +/* 80192EE0 0018FE20 3C A0 80 3C */ lis r5, lbl_803BB588@ha +/* 80192EE4 0018FE24 38 05 B5 88 */ addi r0, r5, lbl_803BB588@l +/* 80192EE8 0018FE28 90 1F 00 00 */ stw r0, 0(r31) +/* 80192EEC 0018FE2C 7C 80 07 35 */ extsh. r0, r4 +/* 80192EF0 0018FE30 40 81 00 08 */ ble lbl_80192EF8 +/* 80192EF4 0018FE34 48 13 BE 49 */ bl __dl__FPv +lbl_80192EF8: +/* 80192EF8 0018FE38 7F E3 FB 78 */ mr r3, r31 +/* 80192EFC 0018FE3C 83 E1 00 0C */ lwz r31, 0xc(r1) +/* 80192F00 0018FE40 80 01 00 14 */ lwz r0, 0x14(r1) +/* 80192F04 0018FE44 7C 08 03 A6 */ mtlr r0 +/* 80192F08 0018FE48 38 21 00 10 */ addi r1, r1, 0x10 +/* 80192F0C 0018FE4C 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_file/d_file_sel_info/d_file_sel_info.h b/include/d/d_file/d_file_sel_info/d_file_sel_info.h index 768b69a1c3..1e697ff032 100644 --- a/include/d/d_file/d_file_sel_info/d_file_sel_info.h +++ b/include/d/d_file/d_file_sel_info/d_file_sel_info.h @@ -13,10 +13,10 @@ struct dFile_info_c_vtable { class dFile_info_c { public: - dFile_info_c(); + dFile_info_c(JKRArchive*,u8); ~dFile_info_c(); void screenSet(void); - int setSaveDate(dSv_save_c*, int, u8); + s32 setSaveData(dSv_save_c*, int, u8); void setHeartCnt(dSv_save_c*); void setSaveDate(dSv_save_c*); void setPlayTime(dSv_save_c*); @@ -30,19 +30,17 @@ class dFile_info_c { dDlst_FileInfo_c file_info_draw_list; J2DScreen* screen; JUTFont* font; - u32 unk0; - u32 unk4; - u32 unk8; - u8 unk12; - u8 unk13; - u8 unk14; - u8 unk15; + u32 unk20; + u32 unk24; + u32 unk28; + u8 unk32; + u8 unk33; + u8 unk34; + u8 unk35; CPaneMgrAlpha* w_dat_i1; CPaneMgrAlpha* w_nda_i1; - char* unk28; + char* unk44; char* save_date; char* play_time; - char* unk40; + char* unk56; }; - -int i = sizeof(dFile_info_c); diff --git a/include/d/d_save/d_save/d_save.h b/include/d/d_save/d_save/d_save.h index af9bb0651c..ba8e0d4964 100644 --- a/include/d/d_save/d_save/d_save.h +++ b/include/d/d_save/d_save/d_save.h @@ -110,6 +110,10 @@ class dSv_player_status_a_c { u16 getRupeeMax(void) const; bool isMagicFlag(u8) const; + inline u16& getCurrentHealth() { + return current_health; + } + private: u16 max_health; u16 current_health; @@ -359,6 +363,9 @@ class dSv_fishing_info_c { class dSv_player_info_c { public: void init(void); + inline char* getLinkName() { + return (char*)link_name; + } private: u32 unk0; @@ -402,6 +409,12 @@ class dSv_player_config_c { class dSv_player_c { public: void init(void); + inline dSv_player_info_c& getPlayerInfo() { + return player_info; + } + inline dSv_player_status_a_c getPlayerStatusA() { + return player_status_a; + } private: dSv_player_status_a_c player_status_a; @@ -606,10 +619,13 @@ class dSv_save_c { public: void init(void); dSv_memory2_c* getSave2(int); + inline dSv_player_c& getPlayer() { + return player; + } private: dSv_player_c player; - u8 unk476[4]; + u8 unk492[4]; dSv_memory_c area_flags[32]; dSv_memory2_c unk_flags[64]; dSv_event_c event_flags; diff --git a/include/functions.h b/include/functions.h index 95246b8b26..9964ef5f92 100644 --- a/include/functions.h +++ b/include/functions.h @@ -1,4 +1,11 @@ extern "C" { + void J2DScreen_NS_draw(void); + void PSMTXCopy(void); + void PSMTXConcat(void); + void PSMTXScale(void); + void screenSet__12dFile_info_cFv(void); + void dFile_info_c_NS_screenSet(void); + void mDoExt_removeMesgFont(void); void func_80362210(void); void JKRAramHeap_NS_getTotalFreeSize(void); void JKRAramHeap_NS_getFreeSize(void); @@ -130,6 +137,21 @@ extern "C" { void func_80361D60(void); void dComIfG_inf_c_NS_ct(void); void version_check__Fv(void); + void J2DTextBox_NS_getStringPtr(void); + void J2DTextBox_NS_setString_X1_(void); + void CPaneMgrAlpha_X1_(void); + void mDoExt_getMesgFont(void); + void J2DScreen_NS_setPriority(void); + void __ct__9J2DScreenFv(void); + void dFile_info_c_NS_setPlayTime(void); + void dFile_info_c_NS_setSaveDate(void); + void dFile_info_c_NS_setHeartCnt(void); + void setHeartCnt__12dFile_info_cFP10dSv_save_c(void); + void setSaveDate__12dFile_info_cFP10dSv_save_c(void); + void func_803664DC(void); + void setPlayTime__12dFile_info_cFP10dSv_save_c(void); + void func_80362540(void); + void dDlst_list_c_NS_set(void); } // OS @@ -155,6 +177,7 @@ extern "C" { void OSAllocFromArenaLo(void); void OSReportInit(void); void OSGetCurrentThread(void); + void OSTicksToCalendarTime(void); } // DVD diff --git a/include/variables.h b/include/variables.h index be68f627d9..838f15c9a6 100644 --- a/include/variables.h +++ b/include/variables.h @@ -66,6 +66,15 @@ extern u8 lbl_80450C78; extern u8 lbl_80450B08; extern u8 lbl_803DB420; extern u8 main01__Fv; +extern u8 lbl_803BB598; +extern u8 lbl_803A6F88; +extern u8 lbl_803BB588; +extern u8 lbl_803948B8; +extern u8 lbl_803BB548; +extern u8 lbl_803BB4A8; +extern u8 lbl_804539F8; +extern u8 lbl_804539FC; +extern u8 lbl_803BB498; #define _SDA_BASE_(dummy) 0 diff --git a/ldscript.lcf b/ldscript.lcf index 4b9d432569..a3f40d5548 100644 --- a/ldscript.lcf +++ b/ldscript.lcf @@ -33,6 +33,12 @@ FORCEACTIVE { offTbox__12dSv_memBit_cFi set__25dSv_player_return_place_cFPCcScUc offActor__10dSv_info_cFii + __dt__12dFile_info_cFv + modeWait__12dFile_info_cFv + modeMove__12dFile_info_cFv + draw__16dDlst_FileInfo_cFv + _sinit_d_file_sel_info_cpp__Fv /* tmp symbol name since the original won't compile */ + __dt__16dDlst_FileInfo_cFv } /* .init 80003100 - 80005600 diff --git a/obj_files.mk b/obj_files.mk index 1bed3e7354..cdfbacbcf3 100644 --- a/obj_files.mk +++ b/obj_files.mk @@ -158,6 +158,7 @@ TEXT_O_FILES := \ $(BUILD_DIR)/asm/d/d_envse.o \ $(BUILD_DIR)/asm/d/file/d_file_select.o \ $(BUILD_DIR)/asm/d/file/sel/d_file_sel_warning.o \ + $(BUILD_DIR)/src/d/d_file/d_file_sel_info.o \ $(BUILD_DIR)/asm/d/file/sel/d_file_sel_info.o \ $(BUILD_DIR)/asm/d/bright/d_bright_check.o \ $(BUILD_DIR)/asm/d/d_scope.o \ diff --git a/src/d/d_file/d_file_sel_info.cpp b/src/d/d_file/d_file_sel_info.cpp index a177b334ce..c1b72743df 100644 --- a/src/d/d_file/d_file_sel_info.cpp +++ b/src/d/d_file/d_file_sel_info.cpp @@ -1 +1,110 @@ -#include "d/d_file/d_file_sel_info/d_file_sel_info.h" \ No newline at end of file +#include "d/d_file/d_file_sel_info/d_file_sel_info.h" +#include "global.h" + +asm dFile_info_c::dFile_info_c(JKRArchive*,u8) { + nofralloc + #include "d/d_file/d_file_sel_info/asm/func_80192434.s" +} + +asm dFile_info_c::~dFile_info_c(void) { + nofralloc + #include "d/d_file/d_file_sel_info/asm/func_801924A0.s" +} + +asm void dFile_info_c::screenSet(void) { + nofralloc + #include "d/d_file/d_file_sel_info/asm/func_80192570.s" +} + + +// not even close +#if NONMATCHING +class JMSMesgEntry_c { + +}; + +extern void dMeter2Info_c_NS_getString(u32, char*, JMSMesgEntry_c*); +extern u8 DAT_804070D8; +extern u16 DAT_804061C2; +extern char DAT_80406374[16]; +extern char DAT_803948D8; + +s32 dFile_info_c::setSaveData(dSv_save_c* save_file, int param_2, u8 param_3) { + if (param_2 == 0) { + dMeter2Info_c_NS_getString(0x51, this->unk56, 0); + return -1; + } else { + if (!save_file->getPlayer().getPlayerInfo().getLinkName()) { + if ((this->unk34) && (param_3 == DAT_804070D8)) { + save_file->getPlayer().getPlayerStatusA().getCurrentHealth() = DAT_804061C2; + this->setHeartCnt(save_file); + save_file->getPlayer().getPlayerStatusA().getCurrentHealth() = 0xC; + strcpy(this->unk44,DAT_80406374); + strcpy(this->save_date, (char*)DAT_803948D8); + strcpy(this->play_time, (char*)DAT_803948D8); + dMeter2Info_c_NS_getString(0x4d,this->unk56,0); + return 2; + } else { + dMeter2Info_c_NS_getString(0x4d,this->unk56,0); + return 1; + } + } else { + this->setHeartCnt(save_file); + strcpy(this->unk44,save_file->getPlayer().getPlayerInfo().getLinkName()); + setSaveDate(save_file); + setPlayTime(save_file); + return 0; + } + } +} +#else +asm s32 dFile_info_c::setSaveData(dSv_save_c* save_file, int param_2, u8 param_3) { + nofralloc + #include "d/d_file/d_file_sel_info/asm/func_80192954.s" +} +#endif + +asm void dFile_info_c::setHeartCnt(dSv_save_c*) { + nofralloc + #include "d/d_file/d_file_sel_info/asm/func_80192AA0.s" +} + +asm void dFile_info_c::setSaveDate(dSv_save_c*) { + nofralloc + #include "d/d_file/d_file_sel_info/asm/func_80192C08.s" +} + +asm void dFile_info_c::setPlayTime(dSv_save_c*) { + nofralloc + #include "d/d_file/d_file_sel_info/asm/func_80192C70.s" +} + +asm void dFile_info_c::modeWait(void) { + nofralloc + #include "d/d_file/d_file_sel_info/asm/func_80192D58.s" +} + +asm void dFile_info_c::modeMove(void) { + nofralloc + #include "d/d_file/d_file_sel_info/asm/func_80192D5C.s" +} + +asm void dFile_info_c::_draw(void) { + nofralloc + #include "d/d_file/d_file_sel_info/asm/func_80192D60.s" +} + +asm void dDlst_FileInfo_c::draw(void) { + nofralloc + #include "d/d_file/d_file_sel_info/asm/func_80192D9C.s" +} + +asm void _sinit_d_file_sel_info_cpp(void) { + nofralloc + #include "d/d_file/d_file_sel_info/asm/func_80192E88.s" +} + +asm dDlst_FileInfo_c::~dDlst_FileInfo_c() { + nofralloc + #include "d/d_file/d_file_sel_info/asm/func_80192EC8.s" +} \ No newline at end of file