encounter/tp
0
0
Fork 0
mirror of https://github.com/encounter/tp.git synced 2026-07-11 06:18:46 -07:00
Code Issues Packages Projects Releases Wiki Activity

migrate all d_file_sel_info asm functions to inline

Browse Source
This commit is contained in:
unknown
2020-11-29 23:26:19 -05:00
parent 44b14ec128
commit 635472d71f
61 changed files with 990 additions and 850 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/J2DGraph/J2DScreen.s
+2 -2
View File
@@ -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)
asm/d/a/d_a_alink.s
+1 -1
View File
@@ -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)
asm/d/bright/d_bright_check.s
+1 -1
View File
@@ -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)
asm/d/d_gameover.s
+1 -1
View File
@@ -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)
asm/d/d_name.s
+1 -1
View File
@@ -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)
asm/d/d_timer.s
+4 -4
View File
@@ -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)
asm/d/file/d_file_select.s
+11 -11
View File
@@ -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
asm/d/file/sel/d_file_sel_info.s
-745
View File
File diff suppressed because it is too large Load Diff
asm/d/file/sel/d_file_sel_warning.s
+1 -1
View File
@@ -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)
asm/d/kantera/icon/d_kantera_icon_meter.s
+1 -1
View File
@@ -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
asm/d/menu/d_menu_collect.s
+2 -2
View File
@@ -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)
asm/d/menu/d_menu_dmap.s
+4 -4
View File
@@ -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)
asm/d/menu/d_menu_fishing.s
+2 -2
View File
@@ -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)
asm/d/menu/d_menu_fmap2D.s
+4 -4
View File
@@ -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)
asm/d/menu/d_menu_insect.s
+3 -3
View File
@@ -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)
asm/d/menu/d_menu_letter.s
+7 -7
View File
@@ -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)
asm/d/menu/d_menu_option.s
+7 -7
View File
@@ -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)
asm/d/menu/d_menu_ring.s
+3 -3
View File
@@ -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)
asm/d/menu/d_menu_save.s
+4 -4
View File
@@ -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
asm/d/menu/d_menu_skill.s
+3 -3
View File
@@ -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)

Some files were not shown because too many files have changed in this diff Show More