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

d_item (#18)

Browse Source 
* item_funcs ok

* item_getcheck_func ok

* remove unnecessary asm file

* execItemGet / checkItemGet ok, add enums for readability

* fix return types
This commit is contained in:
TakaRikka
2020-12-05 23:30:55 -05:00
committed by GitHub
parent fb1217e3f9
commit 2fbecbc1da
227 changed files with 11251 additions and 11624 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/d/menu/d_menu_calibration.s
+2 -2
View File
@@ -652,8 +652,8 @@ lbl_801AF6FC:
.global dMenu_Calibration_c_NS_setCalibrationValue
dMenu_Calibration_c_NS_setCalibrationValue:
/* 801AF710 001AC650 3C 80 80 40 */ lis r4, lbl_804061C0@ha
/* 801AF714 001AC654 38 A4 61 C0 */ addi r5, r4, lbl_804061C0@l
/* 801AF710 001AC650 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha
/* 801AF714 001AC654 38 A4 61 C0 */ addi r5, r4, g_dComIfG_gameInfo@l
/* 801AF718 001AC658 80 83 00 E8 */ lwz r4, 0xe8(r3)
/* 801AF71C 001AC65C 98 85 01 E8 */ stb r4, 0x1e8(r5)
/* 801AF720 001AC660 A0 03 00 F4 */ lhz r0, 0xf4(r3)
asm/d/menu/d_menu_collect.s
+139 -139
View File
File diff suppressed because it is too large Load Diff
asm/d/menu/d_menu_dmap.s
+45 -45
View File
@@ -81,16 +81,16 @@ lbl_801B8018:
/* 801B803C 001B4F7C 38 84 57 60 */ addi r4, r4, lbl_80395760@l
/* 801B8040 001B4F80 48 1B 0A ED */ bl strcpy
/* 801B8044 001B4F84 38 61 00 08 */ addi r3, r1, 8
/* 801B8048 001B4F88 3C 80 80 40 */ lis r4, lbl_804061C0@ha
/* 801B804C 001B4F8C 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l
/* 801B8048 001B4F88 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha
/* 801B804C 001B4F8C 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l
/* 801B8050 001B4F90 38 84 4E 00 */ addi r4, r4, 0x4e00
/* 801B8054 001B4F94 48 1B 0A D9 */ bl strcpy
/* 801B8058 001B4F98 88 01 00 0C */ lbz r0, 0xc(r1)
/* 801B805C 001B4F9C 98 01 00 22 */ stb r0, 0x22(r1)
/* 801B8060 001B4FA0 88 01 00 0D */ lbz r0, 0xd(r1)
/* 801B8064 001B4FA4 98 01 00 23 */ stb r0, 0x23(r1)
/* 801B8068 001B4FA8 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801B806C 001B4FAC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801B8068 001B4FA8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801B806C 001B4FAC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801B8070 001B4FB0 3B C3 09 58 */ addi r30, r3, 0x958
/* 801B8074 001B4FB4 7F C3 F3 78 */ mr r3, r30
/* 801B8078 001B4FB8 38 80 00 00 */ li r4, 0
@@ -145,8 +145,8 @@ dMenu_DmapBg_c_NS_mapScreenInit:
/* 801B8124 001B5064 7C 7D 1B 78 */ mr r29, r3
/* 801B8128 001B5068 3B 40 00 00 */ li r26, 0
/* 801B812C 001B506C 3B C0 00 00 */ li r30, 0
/* 801B8130 001B5070 3C 80 80 40 */ lis r4, lbl_804061C0@ha
/* 801B8134 001B5074 3B E4 61 C0 */ addi r31, r4, lbl_804061C0@l
/* 801B8130 001B5070 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha
/* 801B8134 001B5074 3B E4 61 C0 */ addi r31, r4, g_dComIfG_gameInfo@l
/* 801B8138 001B5078 3C 80 80 39 */ lis r4, lbl_80395760@ha
/* 801B813C 001B507C 3B 84 57 60 */ addi r28, r4, lbl_80395760@l
lbl_801B8140:
@@ -763,8 +763,8 @@ lbl_801B8A44:
/* 801B8A50 001B5990 38 84 57 60 */ addi r4, r4, lbl_80395760@l
/* 801B8A54 001B5994 38 84 00 4D */ addi r4, r4, 0x4d
/* 801B8A58 001B5998 3C A0 00 02 */ lis r5, 2
/* 801B8A5C 001B599C 3C C0 80 40 */ lis r6, lbl_804061C0@ha
/* 801B8A60 001B59A0 38 C6 61 C0 */ addi r6, r6, lbl_804061C0@l
/* 801B8A5C 001B599C 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha
/* 801B8A60 001B59A0 38 C6 61 C0 */ addi r6, r6, g_dComIfG_gameInfo@l
/* 801B8A64 001B59A4 80 C6 5C C0 */ lwz r6, 0x5cc0(r6)
/* 801B8A68 001B59A8 48 13 FB E1 */ bl J2DScreen_NS_setPriority
/* 801B8A6C 001B59AC 80 7E 0C B4 */ lwz r3, 0xcb4(r30)
@@ -1232,8 +1232,8 @@ dMenu_DmapBg_c_NS_createExplain:
/* 801B9118 001B6058 7C 60 1B 79 */ or. r0, r3, r3
/* 801B911C 001B605C 41 82 00 24 */ beq lbl_801B9140
/* 801B9120 001B6060 80 9E 0C 9C */ lwz r4, 0xc9c(r30)
/* 801B9124 001B6064 3C A0 80 40 */ lis r5, lbl_804061C0@ha
/* 801B9128 001B6068 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l
/* 801B9124 001B6064 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha
/* 801B9128 001B6068 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l
/* 801B912C 001B606C 80 A5 5C C0 */ lwz r5, 0x5cc0(r5)
/* 801B9130 001B6070 80 DE 0C A0 */ lwz r6, 0xca0(r30)
/* 801B9134 001B6074 38 E0 00 01 */ li r7, 1
@@ -1307,8 +1307,8 @@ lbl_801B920C:
/* 801B9218 001B6158 38 84 57 60 */ addi r4, r4, lbl_80395760@l
/* 801B921C 001B615C 38 84 00 70 */ addi r4, r4, 0x70
/* 801B9220 001B6160 3C A0 00 02 */ lis r5, 2
/* 801B9224 001B6164 3C C0 80 40 */ lis r6, lbl_804061C0@ha
/* 801B9228 001B6168 3B C6 61 C0 */ addi r30, r6, lbl_804061C0@l
/* 801B9224 001B6164 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha
/* 801B9228 001B6168 3B C6 61 C0 */ addi r30, r6, g_dComIfG_gameInfo@l
/* 801B922C 001B616C 80 DE 5C C0 */ lwz r6, 0x5cc0(r30)
/* 801B9230 001B6170 48 13 F4 19 */ bl J2DScreen_NS_setPriority
/* 801B9234 001B6174 80 7F 0C A4 */ lwz r3, 0xca4(r31)
@@ -1423,8 +1423,8 @@ lbl_801B9334:
/* 801B93D8 001B6318 38 A5 00 6F */ addi r5, r5, 0x6f
/* 801B93DC 001B631C 4C C6 31 82 */ crclr 6
/* 801B93E0 001B6320 48 14 73 6D */ bl J2DTextBox_NS_setString_X1_
/* 801B93E4 001B6324 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801B93E8 001B6328 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801B93E4 001B6324 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801B93E8 001B6328 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801B93EC 001B632C 85 83 4E 20 */ lwzu r12, 0x4e20(r3)
/* 801B93F0 001B6330 81 8C 00 BC */ lwz r12, 0xbc(r12)
/* 801B93F4 001B6334 7D 89 03 A6 */ mtctr r12
@@ -2273,8 +2273,8 @@ dMenu_DmapBg_c_NS_dtor:
/* 801BA0E4 001B7024 90 7F 00 00 */ stw r3, 0(r31)
/* 801BA0E8 001B7028 38 03 00 0C */ addi r0, r3, 0xc
/* 801BA0EC 001B702C 90 1F 00 04 */ stw r0, 4(r31)
/* 801BA0F0 001B7030 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801BA0F4 001B7034 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801BA0F0 001B7030 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801BA0F4 001B7034 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801BA0F8 001B7038 80 63 5C C0 */ lwz r3, 0x5cc0(r3)
/* 801BA0FC 001B703C 81 83 00 00 */ lwz r12, 0(r3)
/* 801BA100 001B7040 81 8C 00 24 */ lwz r12, 0x24(r12)
@@ -3006,8 +3006,8 @@ lbl_801BAAF4:
/* 801BAB3C 001B7A7C 39 61 02 90 */ addi r11, r1, 0x290
/* 801BAB40 001B7A80 48 1A 76 9D */ bl _savegpr_29
/* 801BAB44 001B7A84 7C 7E 1B 78 */ mr r30, r3
/* 801BAB48 001B7A88 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801BAB4C 001B7A8C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801BAB48 001B7A88 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801BAB4C 001B7A8C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801BAB50 001B7A90 83 E3 5F 50 */ lwz r31, 0x5f50(r3)
/* 801BAB54 001B7A94 7F E3 FB 78 */ mr r3, r31
/* 801BAB58 001B7A98 81 9F 00 00 */ lwz r12, 0(r31)
@@ -3830,8 +3830,8 @@ lbl_801BB768:
/* 801BB784 001B86C4 3B 40 00 00 */ li r26, 0
/* 801BB788 001B86C8 3B 60 00 00 */ li r27, 0
/* 801BB78C 001B86CC 3B 20 00 00 */ li r25, 0
/* 801BB790 001B86D0 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801BB794 001B86D4 3B A3 61 C0 */ addi r29, r3, lbl_804061C0@l
/* 801BB790 001B86D0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801BB794 001B86D4 3B A3 61 C0 */ addi r29, r3, g_dComIfG_gameInfo@l
lbl_801BB798:
/* 801BB798 001B86D8 38 60 00 6C */ li r3, 0x6c
/* 801BB79C 001B86DC 48 11 34 B1 */ bl __nw__FUl
@@ -4233,8 +4233,8 @@ lbl_801BBD60:
/* 801BBD94 001B8CD4 7C 60 1B 78 */ mr r0, r3
lbl_801BBD98:
/* 801BBD98 001B8CD8 90 1F 00 8C */ stw r0, 0x8c(r31)
/* 801BBD9C 001B8CDC 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801BBDA0 001B8CE0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801BBD9C 001B8CDC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801BBDA0 001B8CE0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801BBDA4 001B8CE4 3B A3 4E 20 */ addi r29, r3, 0x4e20
/* 801BBDA8 001B8CE8 7F A3 EB 78 */ mr r3, r29
/* 801BBDAC 001B8CEC 81 9D 00 00 */ lwz r12, 0(r29)
@@ -4360,14 +4360,14 @@ lbl_801BBEB8:
/* 801BBF70 001B8EB0 3B 00 00 00 */ li r24, 0
/* 801BBF74 001B8EB4 38 60 00 F9 */ li r3, 0xf9
/* 801BBF78 001B8EB8 38 80 00 01 */ li r4, 1
/* 801BBF7C 001B8EBC 4B ED BF 65 */ bl checkItemGet
/* 801BBF7C 001B8EBC 4B ED BF 65 */ bl checkItemGet__FUci
/* 801BBF80 001B8EC0 2C 03 00 00 */ cmpwi r3, 0
/* 801BBF84 001B8EC4 41 82 00 08 */ beq lbl_801BBF8C
/* 801BBF88 001B8EC8 3B 00 00 01 */ li r24, 1
lbl_801BBF8C:
/* 801BBF8C 001B8ECC 38 60 00 FA */ li r3, 0xfa
/* 801BBF90 001B8ED0 38 80 00 01 */ li r4, 1
/* 801BBF94 001B8ED4 4B ED BF 4D */ bl checkItemGet
/* 801BBF94 001B8ED4 4B ED BF 4D */ bl checkItemGet__FUci
/* 801BBF98 001B8ED8 2C 03 00 00 */ cmpwi r3, 0
/* 801BBF9C 001B8EDC 41 82 00 10 */ beq lbl_801BBFAC
/* 801BBFA0 001B8EE0 57 03 06 3E */ clrlwi r3, r24, 0x18
@@ -4376,7 +4376,7 @@ lbl_801BBF8C:
lbl_801BBFAC:
/* 801BBFAC 001B8EEC 38 60 00 FB */ li r3, 0xfb
/* 801BBFB0 001B8EF0 38 80 00 01 */ li r4, 1
/* 801BBFB4 001B8EF4 4B ED BF 2D */ bl checkItemGet
/* 801BBFB4 001B8EF4 4B ED BF 2D */ bl checkItemGet__FUci
/* 801BBFB8 001B8EF8 2C 03 00 00 */ cmpwi r3, 0
/* 801BBFBC 001B8EFC 41 82 00 10 */ beq lbl_801BBFCC
/* 801BBFC0 001B8F00 57 03 06 3E */ clrlwi r3, r24, 0x18
@@ -4452,8 +4452,8 @@ lbl_801BC090:
/* 801BC0BC 001B8FFC 98 03 00 B0 */ stb r0, 0xb0(r3)
/* 801BC0C0 001B9000 48 00 04 50 */ b lbl_801BC510
lbl_801BC0C4:
/* 801BC0C4 001B9004 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801BC0C8 001B9008 3B 23 61 C0 */ addi r25, r3, lbl_804061C0@l
/* 801BC0C4 001B9004 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801BC0C8 001B9008 3B 23 61 C0 */ addi r25, r3, g_dComIfG_gameInfo@l
/* 801BC0CC 001B900C 83 59 5D 30 */ lwz r26, 0x5d30(r25)
/* 801BC0D0 001B9010 7F A3 EB 78 */ mr r3, r29
/* 801BC0D4 001B9014 48 06 21 F5 */ bl dMeter2Info_getNumberTextureName
@@ -4600,8 +4600,8 @@ lbl_801BC228:
/* 801BC304 001B9244 9B 9F 01 76 */ stb r28, 0x176(r31)
/* 801BC308 001B9248 48 00 00 CC */ b lbl_801BC3D4
lbl_801BC30C:
/* 801BC30C 001B924C 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801BC310 001B9250 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801BC30C 001B924C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801BC310 001B9250 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801BC314 001B9254 3B 03 09 58 */ addi r24, r3, 0x958
/* 801BC318 001B9258 7F 03 C3 78 */ mr r3, r24
/* 801BC31C 001B925C 38 80 00 02 */ li r4, 2
@@ -4622,11 +4622,11 @@ lbl_801BC30C:
lbl_801BC358:
/* 801BC358 001B9298 38 60 00 F4 */ li r3, 0xf4
/* 801BC35C 001B929C 38 80 00 01 */ li r4, 1
/* 801BC360 001B92A0 4B ED BB 81 */ bl checkItemGet
/* 801BC360 001B92A0 4B ED BB 81 */ bl checkItemGet__FUci
/* 801BC364 001B92A4 2C 03 00 00 */ cmpwi r3, 0
/* 801BC368 001B92A8 41 82 00 30 */ beq lbl_801BC398
/* 801BC36C 001B92AC 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801BC370 001B92B0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801BC36C 001B92AC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801BC370 001B92B0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801BC374 001B92B4 38 63 07 F0 */ addi r3, r3, 0x7f0
/* 801BC378 001B92B8 38 80 00 02 */ li r4, 2
/* 801BC37C 001B92BC 4B E7 86 41 */ bl isEventBit__11dSv_event_cCFUs
@@ -4639,11 +4639,11 @@ lbl_801BC358:
lbl_801BC398:
/* 801BC398 001B92D8 38 60 00 F5 */ li r3, 0xf5
/* 801BC39C 001B92DC 38 80 00 01 */ li r4, 1
/* 801BC3A0 001B92E0 4B ED BB 41 */ bl checkItemGet
/* 801BC3A0 001B92E0 4B ED BB 41 */ bl checkItemGet__FUci
/* 801BC3A4 001B92E4 2C 03 00 00 */ cmpwi r3, 0
/* 801BC3A8 001B92E8 41 82 00 2C */ beq lbl_801BC3D4
/* 801BC3AC 001B92EC 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801BC3B0 001B92F0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801BC3AC 001B92EC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801BC3B0 001B92F0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801BC3B4 001B92F4 38 63 07 F0 */ addi r3, r3, 0x7f0
/* 801BC3B8 001B92F8 38 80 00 01 */ li r4, 1
/* 801BC3BC 001B92FC 4B E7 86 01 */ bl isEventBit__11dSv_event_cCFUs
@@ -4723,8 +4723,8 @@ lbl_801BC454:
/* 801BC4D8 001B9418 4E 80 04 21 */ bctrl
/* 801BC4DC 001B941C 38 00 00 00 */ li r0, 0
/* 801BC4E0 001B9420 98 03 00 B0 */ stb r0, 0xb0(r3)
/* 801BC4E4 001B9424 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801BC4E8 001B9428 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801BC4E4 001B9424 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801BC4E8 001B9428 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801BC4EC 001B942C 38 63 09 58 */ addi r3, r3, 0x958
/* 801BC4F0 001B9430 38 80 00 02 */ li r4, 2
/* 801BC4F4 001B9434 4B E7 84 41 */ bl isDungeonItem__12dSv_memBit_cCFi
@@ -4735,8 +4735,8 @@ lbl_801BC454:
/* 801BC508 001B9448 7C 00 18 38 */ and r0, r0, r3
/* 801BC50C 001B944C 98 1F 01 76 */ stb r0, 0x176(r31)
lbl_801BC510:
/* 801BC510 001B9450 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801BC514 001B9454 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801BC510 001B9450 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801BC514 001B9454 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801BC518 001B9458 3B 03 09 58 */ addi r24, r3, 0x958
/* 801BC51C 001B945C 7F 03 C3 78 */ mr r3, r24
/* 801BC520 001B9460 38 80 00 00 */ li r4, 0
@@ -5270,8 +5270,8 @@ lbl_801BCCAC:
/* 801BCCD4 001B9C14 28 04 00 FF */ cmplwi r4, 0xff
/* 801BCCD8 001B9C18 41 82 00 24 */ beq lbl_801BCCFC
/* 801BCCDC 001B9C1C 41 82 00 4C */ beq lbl_801BCD28
/* 801BCCE0 001B9C20 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801BCCE4 001B9C24 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801BCCE0 001B9C20 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801BCCE4 001B9C24 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801BCCE8 001B9C28 88 A1 00 08 */ lbz r5, 8(r1)
/* 801BCCEC 001B9C2C 7C A5 07 74 */ extsb r5, r5
/* 801BCCF0 001B9C30 4B E7 86 71 */ bl isSwitch__10dSv_info_cCFii
@@ -6220,8 +6220,8 @@ lbl_801BDA30:
/* 801BDA3C 001BA97C 28 00 00 06 */ cmplwi r0, 6
/* 801BDA40 001BA980 40 82 00 A0 */ bne lbl_801BDAE0
/* 801BDA44 001BA984 3B 80 00 00 */ li r28, 0
/* 801BDA48 001BA988 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801BDA4C 001BA98C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801BDA48 001BA988 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801BDA4C 001BA98C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801BDA50 001BA990 3B A3 09 58 */ addi r29, r3, 0x958
/* 801BDA54 001BA994 7F A3 EB 78 */ mr r3, r29
/* 801BDA58 001BA998 38 80 00 67 */ li r4, 0x67
@@ -7345,8 +7345,8 @@ lbl_801BE928:
/* 801BEAA8 001BB9E8 38 80 FF FF */ li r4, -1
/* 801BEAAC 001BB9EC 48 09 4F 6D */ bl CPaneMgr_NS_dtor
lbl_801BEAB0:
/* 801BEAB0 001BB9F0 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801BEAB4 001BB9F4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801BEAB0 001BB9F0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801BEAB4 001BB9F4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801BEAB8 001BB9F8 38 63 5F 64 */ addi r3, r3, 0x5f64
/* 801BEABC 001BB9FC 38 83 01 B4 */ addi r4, r3, 0x1b4
/* 801BEAC0 001BBA00 38 A3 01 B8 */ addi r5, r3, 0x1b8
asm/d/menu/d_menu_fishing.s
+8 -8
View File
@@ -298,8 +298,8 @@ dMenu_Fishing_c_NS__draw:
/* 801C5164 001C20A4 80 03 00 08 */ lwz r0, 8(r3)
/* 801C5168 001C20A8 28 00 00 00 */ cmplwi r0, 0
/* 801C516C 001C20AC 41 82 00 80 */ beq lbl_801C51EC
/* 801C5170 001C20B0 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801C5174 001C20B4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801C5170 001C20B0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801C5174 001C20B4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801C5178 001C20B8 83 E3 5F 50 */ lwz r31, 0x5f50(r3)
/* 801C517C 001C20BC 80 7E 01 F0 */ lwz r3, 0x1f0(r30)
/* 801C5180 001C20C0 38 80 00 FF */ li r4, 0xff
@@ -361,8 +361,8 @@ dMenu_Fishing_c_NS_init:
/* 801C5240 001C2180 7C 7C 1B 78 */ mr r28, r3
/* 801C5244 001C2184 3B A0 00 00 */ li r29, 0
/* 801C5248 001C2188 3B E0 00 00 */ li r31, 0
/* 801C524C 001C218C 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801C5250 001C2190 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801C524C 001C218C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801C5250 001C2190 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801C5254 001C2194 3B C3 01 6C */ addi r30, r3, 0x16c
lbl_801C5258:
/* 801C5258 001C2198 57 A3 06 3E */ clrlwi r3, r29, 0x18
@@ -616,8 +616,8 @@ dMenu_Fishing_c_NS_screenSetBase:
/* 801C55EC 001C252C 7C 7F 1B 78 */ mr r31, r3
/* 801C55F0 001C2530 3C 60 80 39 */ lis r3, lbl_80395D90@ha
/* 801C55F4 001C2534 3B C3 5D 90 */ addi r30, r3, lbl_80395D90@l
/* 801C55F8 001C2538 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801C55FC 001C253C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801C55F8 001C2538 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801C55FC 001C253C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801C5600 001C2540 80 63 5D 30 */ lwz r3, 0x5d30(r3)
/* 801C5604 001C2544 3C 80 54 49 */ lis r4, 0x54494D47@ha
/* 801C5608 001C2548 38 84 4D 47 */ addi r4, r4, 0x54494D47@l
@@ -1340,8 +1340,8 @@ dMenu_Fishing_c_NS_setFishParam:
/* 801C6090 001C2FD0 57 04 06 3E */ clrlwi r4, r24, 0x18
/* 801C6094 001C2FD4 4B FF FF 85 */ bl dMenu_Fishing_c_NS_getFigure
/* 801C6098 001C2FD8 57 05 06 3E */ clrlwi r5, r24, 0x18
/* 801C609C 001C2FDC 3C 80 80 40 */ lis r4, lbl_804061C0@ha
/* 801C60A0 001C2FE0 3B 24 61 C0 */ addi r25, r4, lbl_804061C0@l
/* 801C609C 001C2FDC 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha
/* 801C60A0 001C2FE0 3B 24 61 C0 */ addi r25, r4, g_dComIfG_gameInfo@l
/* 801C60A4 001C2FE4 57 40 10 3A */ slwi r0, r26, 2
/* 801C60A8 001C2FE8 7F FD 02 14 */ add r31, r29, r0
/* 801C60AC 001C2FEC 54 7A 06 3E */ clrlwi r26, r3, 0x18
asm/d/menu/d_menu_fmap.s
+42 -42
View File
@@ -27,8 +27,8 @@ dMenuFmap_getStartStageName:
/* 801C6638 001C3578 39 61 00 20 */ addi r11, r1, 0x20
/* 801C663C 001C357C 48 19 BB 95 */ bl _savegpr_26
/* 801C6640 001C3580 7C 7A 1B 78 */ mr r26, r3
/* 801C6644 001C3584 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801C6648 001C3588 3B C3 61 C0 */ addi r30, r3, lbl_804061C0@l
/* 801C6644 001C3584 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801C6648 001C3588 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l
/* 801C664C 001C358C 38 7E 4E 20 */ addi r3, r30, 0x4e20
/* 801C6650 001C3590 81 9E 4E 20 */ lwz r12, 0x4e20(r30)
/* 801C6654 001C3594 81 8C 00 BC */ lwz r12, 0xbc(r12)
@@ -194,8 +194,8 @@ lbl_801C6820:
/* 801C68AC 001C37EC 90 1D 00 64 */ stw r0, 0x64(r29)
/* 801C68B0 001C37F0 48 00 00 14 */ b lbl_801C68C4
lbl_801C68B4:
/* 801C68B4 001C37F4 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801C68B8 001C37F8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801C68B4 001C37F4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801C68B8 001C37F8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801C68BC 001C37FC 80 03 5C 68 */ lwz r0, 0x5c68(r3)
/* 801C68C0 001C3800 90 1D 00 64 */ stw r0, 0x64(r29)
lbl_801C68C4:
@@ -450,8 +450,8 @@ lbl_801C6C44:
/* 801C6C44 001C3B84 38 00 00 00 */ li r0, 0
/* 801C6C48 001C3B88 90 1E 00 B8 */ stw r0, 0xb8(r30)
lbl_801C6C4C:
/* 801C6C4C 001C3B8C 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801C6C50 001C3B90 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801C6C4C 001C3B8C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801C6C50 001C3B90 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801C6C54 001C3B94 80 63 5C BC */ lwz r3, 0x5cbc(r3)
/* 801C6C58 001C3B98 81 83 00 00 */ lwz r12, 0(r3)
/* 801C6C5C 001C3B9C 81 8C 00 24 */ lwz r12, 0x24(r12)
@@ -1225,8 +1225,8 @@ lbl_801C778C:
/* 801C7798 001C46D8 7C 84 00 38 */ and r4, r4, r0
/* 801C779C 001C46DC 80 7F 00 14 */ lwz r3, 0x14(r31)
/* 801C77A0 001C46E0 98 83 12 39 */ stb r4, 0x1239(r3)
/* 801C77A4 001C46E4 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801C77A8 001C46E8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801C77A4 001C46E4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801C77A8 001C46E8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801C77AC 001C46EC 3B C3 5F 64 */ addi r30, r3, 0x5f64
/* 801C77B0 001C46F0 7F C3 F3 78 */ mr r3, r30
/* 801C77B4 001C46F4 38 9E 01 B4 */ addi r4, r30, 0x1b4
@@ -1714,8 +1714,8 @@ lbl_801C7E94:
/* 801C7EA4 001C4DE4 48 01 01 E5 */ bl dMenu_Fmap2DTop_c_NS_isWarpAccept
/* 801C7EA8 001C4DE8 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 801C7EAC 001C4DEC 41 82 02 D4 */ beq lbl_801C8180
/* 801C7EB0 001C4DF0 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801C7EB4 001C4DF4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801C7EB0 001C4DF0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801C7EB4 001C4DF4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801C7EB8 001C4DF8 3B E3 07 F0 */ addi r31, r3, 0x7f0
/* 801C7EBC 001C4DFC 7F E3 FB 78 */ mr r3, r31
/* 801C7EC0 001C4E00 3C 80 80 3A */ lis r4, lbl_803A7288@ha
@@ -2268,8 +2268,8 @@ lbl_801C86D4:
/* 801C86E4 001C5624 48 00 F9 A5 */ bl dMenu_Fmap2DTop_c_NS_isWarpAccept
/* 801C86E8 001C5628 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 801C86EC 001C562C 41 82 02 98 */ beq lbl_801C8984
/* 801C86F0 001C5630 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801C86F4 001C5634 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801C86F0 001C5630 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801C86F4 001C5634 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801C86F8 001C5638 3B E3 07 F0 */ addi r31, r3, 0x7f0
/* 801C86FC 001C563C 7F E3 FB 78 */ mr r3, r31
/* 801C8700 001C5640 3C 80 80 3A */ lis r4, lbl_803A7288@ha
@@ -2670,8 +2670,8 @@ lbl_801C8C84:
/* 801C8CE4 001C5C24 7C 7F 02 14 */ add r3, r31, r0
/* 801C8CE8 001C5C28 A0 63 00 0C */ lhz r3, 0xc(r3)
/* 801C8CEC 001C5C2C 48 06 F7 B1 */ bl dMsgObject_c_NS_setPortalMessageID
/* 801C8CF0 001C5C30 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801C8CF4 001C5C34 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801C8CF0 001C5C30 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801C8CF4 001C5C34 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801C8CF8 001C5C38 3B E3 07 F0 */ addi r31, r3, 0x7f0
/* 801C8CFC 001C5C3C 7F E3 FB 78 */ mr r3, r31
/* 801C8D00 001C5C40 3C 80 80 3A */ lis r4, lbl_803A7288@ha
@@ -2729,8 +2729,8 @@ lbl_801C8DC8:
/* 801C8DC8 001C5D08 88 1E 03 08 */ lbz r0, 0x308(r30)
/* 801C8DCC 001C5D0C 28 00 00 06 */ cmplwi r0, 6
/* 801C8DD0 001C5D10 40 82 00 B4 */ bne lbl_801C8E84
/* 801C8DD4 001C5D14 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801C8DD8 001C5D18 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801C8DD4 001C5D14 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801C8DD8 001C5D18 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801C8DDC 001C5D1C 38 63 4E 00 */ addi r3, r3, 0x4e00
/* 801C8DE0 001C5D20 3C 80 80 39 */ lis r4, lbl_803960E8@ha
/* 801C8DE4 001C5D24 38 84 60 E8 */ addi r4, r4, lbl_803960E8@l
@@ -2785,8 +2785,8 @@ lbl_801C8E84:
/* 801C8E94 001C5DD4 88 03 00 BF */ lbz r0, 0xbf(r3)
/* 801C8E98 001C5DD8 28 00 00 03 */ cmplwi r0, 3
/* 801C8E9C 001C5DDC 40 82 00 40 */ bne lbl_801C8EDC
/* 801C8EA0 001C5DE0 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801C8EA4 001C5DE4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801C8EA0 001C5DE0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801C8EA4 001C5DE4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801C8EA8 001C5DE8 85 83 4E 20 */ lwzu r12, 0x4e20(r3)
/* 801C8EAC 001C5DEC 81 8C 00 BC */ lwz r12, 0xbc(r12)
/* 801C8EB0 001C5DF0 7D 89 03 A6 */ mtctr r12
@@ -3378,8 +3378,8 @@ lbl_801C976C:
/* 801C9770 001C66B0 80 9F 00 08 */ lwz r4, 8(r31)
/* 801C9774 001C66B4 80 BF 00 0C */ lwz r5, 0xc(r31)
/* 801C9778 001C66B8 48 00 DE C9 */ bl dMenu_Fmap2DTop_c_NS_createExplain
/* 801C977C 001C66BC 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801C9780 001C66C0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801C977C 001C66BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801C9780 001C66C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801C9784 001C66C4 3B C3 07 F0 */ addi r30, r3, 0x7f0
/* 801C9788 001C66C8 7F C3 F3 78 */ mr r3, r30
/* 801C978C 001C66CC 3C 80 80 3A */ lis r4, lbl_803A7288@ha
@@ -4182,8 +4182,8 @@ lbl_801CA338:
/* 801CA384 001C72C4 A8 7D 02 14 */ lha r3, 0x214(r29)
/* 801CA388 001C72C8 38 03 00 01 */ addi r0, r3, 1
/* 801CA38C 001C72CC B0 1D 02 14 */ sth r0, 0x214(r29)
/* 801CA390 001C72D0 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801CA394 001C72D4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801CA390 001C72D0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801CA394 001C72D4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801CA398 001C72D8 3B C3 07 F0 */ addi r30, r3, 0x7f0
/* 801CA39C 001C72DC 7F C3 F3 78 */ mr r3, r30
/* 801CA3A0 001C72E0 3C 80 80 3A */ lis r4, lbl_803A7288@ha
@@ -5761,8 +5761,8 @@ lbl_801CB9F8:
/* 801CBA04 001C8944 90 01 00 C0 */ stw r0, 0xc0(r1)
/* 801CBA08 001C8948 56 1A 15 BA */ rlwinm r26, r16, 2, 0x16, 0x1d
/* 801CBA0C 001C894C 7F 6F D2 14 */ add r27, r15, r26
/* 801CBA10 001C8950 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801CBA14 001C8954 38 03 61 C0 */ addi r0, r3, lbl_804061C0@l
/* 801CBA10 001C8950 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801CBA14 001C8954 38 03 61 C0 */ addi r0, r3, g_dComIfG_gameInfo@l
/* 801CBA18 001C8958 90 01 00 C4 */ stw r0, 0xc4(r1)
/* 801CBA1C 001C895C 80 61 00 C0 */ lwz r3, 0xc0(r1)
/* 801CBA20 001C8960 39 C3 FF FF */ addi r14, r3, -1
@@ -6233,8 +6233,8 @@ dMenu_Fmap_c_NS_readFieldMapData:
/* 801CC0B0 001C8FF0 7C B9 2B 78 */ mr r25, r5
/* 801CC0B4 001C8FF4 7C DA 33 78 */ mr r26, r6
/* 801CC0B8 001C8FF8 80 63 00 64 */ lwz r3, 0x64(r3)
/* 801CC0BC 001C8FFC 3C 80 80 40 */ lis r4, lbl_804061C0@ha
/* 801CC0C0 001C9000 3B A4 61 C0 */ addi r29, r4, lbl_804061C0@l
/* 801CC0BC 001C8FFC 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha
/* 801CC0C0 001C9000 3B A4 61 C0 */ addi r29, r4, g_dComIfG_gameInfo@l
/* 801CC0C4 001C9004 80 1D 5C 68 */ lwz r0, 0x5c68(r29)
/* 801CC0C8 001C9008 7C 03 00 40 */ cmplw r3, r0
/* 801CC0CC 001C900C 41 82 00 9C */ beq lbl_801CC168
@@ -6550,8 +6550,8 @@ dMenu_Fmap_c_NS_readRoomDzsData:
/* 801CC534 001C9474 7C 9C 23 78 */ mr r28, r4
/* 801CC538 001C9478 7C DE 33 78 */ mr r30, r6
/* 801CC53C 001C947C 80 63 00 64 */ lwz r3, 0x64(r3)
/* 801CC540 001C9480 3C 80 80 40 */ lis r4, lbl_804061C0@ha
/* 801CC544 001C9484 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l
/* 801CC540 001C9480 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha
/* 801CC544 001C9484 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l
/* 801CC548 001C9488 80 04 5C 68 */ lwz r0, 0x5c68(r4)
/* 801CC54C 001C948C 7C 03 00 40 */ cmplw r3, r0
/* 801CC550 001C9490 41 82 00 54 */ beq lbl_801CC5A4
@@ -7002,8 +7002,8 @@ dMenu_Fmap_c_NS_drawIcon:
/* 801CCB40 001C9A80 7F C3 F3 78 */ mr r3, r30
/* 801CCB44 001C9A84 48 00 03 55 */ bl dMenu_Fmap_c_NS_drawPlayEnterIcon
lbl_801CCB48:
/* 801CCB48 001C9A88 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801CCB4C 001C9A8C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801CCB48 001C9A88 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801CCB4C 001C9A8C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801CCB50 001C9A90 88 03 00 7C */ lbz r0, 0x7c(r3)
/* 801CCB54 001C9A94 28 00 00 00 */ cmplwi r0, 0
/* 801CCB58 001C9A98 41 82 00 44 */ beq lbl_801CCB9C
@@ -7253,15 +7253,15 @@ dMenu_Fmap_c_NS_drawPlayEnterIcon:
/* 801CCEA8 001C9DE8 93 C1 00 38 */ stw r30, 0x38(r1)
/* 801CCEAC 001C9DEC 7C 7E 1B 78 */ mr r30, r3
/* 801CCEB0 001C9DF0 80 83 02 0C */ lwz r4, 0x20c(r3)
/* 801CCEB4 001C9DF4 3C A0 80 40 */ lis r5, lbl_804061C0@ha
/* 801CCEB8 001C9DF8 38 A5 61 C0 */ addi r5, r5, lbl_804061C0@l
/* 801CCEB4 001C9DF4 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha
/* 801CCEB8 001C9DF8 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l
/* 801CCEBC 001C9DFC 88 05 4E 0A */ lbz r0, 0x4e0a(r5)
/* 801CCEC0 001C9E00 7C 05 07 74 */ extsb r5, r0
/* 801CCEC4 001C9E04 4B FF E3 FD */ bl dMenu_Fmap_c_NS_isRoomCheck
/* 801CCEC8 001C9E08 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 801CCECC 001C9E0C 41 82 00 CC */ beq lbl_801CCF98
/* 801CCED0 001C9E10 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801CCED4 001C9E14 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801CCED0 001C9E10 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801CCED4 001C9E14 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801CCED8 001C9E18 88 03 00 7C */ lbz r0, 0x7c(r3)
/* 801CCEDC 001C9E1C 28 00 00 00 */ cmplwi r0, 0
/* 801CCEE0 001C9E20 41 82 00 48 */ beq lbl_801CCF28
@@ -7273,8 +7273,8 @@ dMenu_Fmap_c_NS_drawPlayEnterIcon:
/* 801CCEF8 001C9E38 D0 01 00 20 */ stfs f0, 0x20(r1)
/* 801CCEFC 001C9E3C C0 01 00 18 */ lfs f0, 0x18(r1)
/* 801CCF00 001C9E40 D0 01 00 24 */ stfs f0, 0x24(r1)
/* 801CCF04 001C9E44 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801CCF08 001C9E48 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801CCF04 001C9E44 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801CCF08 001C9E48 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801CCF0C 001C9E4C AB E3 0D BA */ lha r31, 0xdba(r3)
/* 801CCF10 001C9E50 80 7E 00 8C */ lwz r3, 0x8c(r30)
/* 801CCF14 001C9E54 4B FF 97 19 */ bl dMenuFmap_getStartStageName
@@ -7699,8 +7699,8 @@ lbl_801CD4A0:
/* 801CD4B0 001CA3F0 38 1F 00 01 */ addi r0, r31, 1
/* 801CD4B4 001CA3F4 7C 00 18 00 */ cmpw r0, r3
/* 801CD4B8 001CA3F8 40 82 00 DC */ bne lbl_801CD594
/* 801CD4BC 001CA3FC 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801CD4C0 001CA400 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801CD4BC 001CA3FC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801CD4C0 001CA400 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801CD4C4 001CA404 88 03 00 7C */ lbz r0, 0x7c(r3)
/* 801CD4C8 001CA408 28 00 00 00 */ cmplwi r0, 0
/* 801CD4CC 001CA40C 41 82 00 3C */ beq lbl_801CD508
@@ -7795,8 +7795,8 @@ dMenu_Fmap_c_NS_tableArrowPosInit:
lbl_801CD610:
/* 801CD610 001CA550 2C 00 00 04 */ cmpwi r0, 4
/* 801CD614 001CA554 40 80 00 98 */ bge lbl_801CD6AC
/* 801CD618 001CA558 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801CD61C 001CA55C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801CD618 001CA558 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801CD61C 001CA55C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801CD620 001CA560 3B A3 07 F0 */ addi r29, r3, 0x7f0
/* 801CD624 001CA564 7F A3 EB 78 */ mr r3, r29
/* 801CD628 001CA568 3C 80 80 3A */ lis r4, lbl_803A7288@ha
@@ -8042,8 +8042,8 @@ dMenu_Fmap_c_NS_getPlayerPos2D:
/* 801CD964 001CA8A4 90 01 00 34 */ stw r0, 0x34(r1)
/* 801CD968 001CA8A8 93 E1 00 2C */ stw r31, 0x2c(r1)
/* 801CD96C 001CA8AC 7C 7F 1B 78 */ mr r31, r3
/* 801CD970 001CA8B0 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801CD974 001CA8B4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801CD970 001CA8B0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801CD974 001CA8B4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801CD978 001CA8B8 88 03 00 7C */ lbz r0, 0x7c(r3)
/* 801CD97C 001CA8BC 28 00 00 00 */ cmplwi r0, 0
/* 801CD980 001CA8C0 41 82 00 3C */ beq lbl_801CD9BC
asm/d/menu/d_menu_fmap2D.s
+22 -22
View File
@@ -237,8 +237,8 @@ lbl_801CF6EC:
/* 801CF8F8 001CC838 98 1F 12 3A */ stb r0, 0x123a(r31)
/* 801CF8FC 001CC83C 98 9F 12 2F */ stb r4, 0x122f(r31)
/* 801CF900 001CC840 38 7F 00 04 */ addi r3, r31, 4
/* 801CF904 001CC844 3C 80 80 40 */ lis r4, lbl_804061C0@ha
/* 801CF908 001CC848 3B C4 61 C0 */ addi r30, r4, lbl_804061C0@l
/* 801CF904 001CC844 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha
/* 801CF908 001CC848 3B C4 61 C0 */ addi r30, r4, g_dComIfG_gameInfo@l
/* 801CF90C 001CC84C 80 9E 5C BC */ lwz r4, 0x5cbc(r30)
/* 801CF910 001CC850 4B FF 2F C9 */ bl dMenuMapCommon_c_NS_initiate
/* 801CF914 001CC854 38 60 01 18 */ li r3, 0x118
@@ -342,8 +342,8 @@ lbl_801CFA6C:
/* 801CFA88 001CC9C8 7C 60 1B 78 */ mr r0, r3
lbl_801CFA8C:
/* 801CFA8C 001CC9CC 90 1F 0C E0 */ stw r0, 0xce0(r31)
/* 801CFA90 001CC9D0 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801CFA94 001CC9D4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801CFA90 001CC9D0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801CFA94 001CC9D4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801CFA98 001CC9D8 80 63 5D 30 */ lwz r3, 0x5d30(r3)
/* 801CFA9C 001CC9DC 3C 80 54 49 */ lis r4, 0x54494D47@ha
/* 801CFAA0 001CC9E0 38 84 4D 47 */ addi r4, r4, 0x54494D47@l
@@ -672,8 +672,8 @@ lbl_801CFF18:
/* 801CFF5C 001CCE9C 48 19 22 71 */ bl func_803621CC
/* 801CFF60 001CCEA0 7C 7D 1B 78 */ mr r29, r3
/* 801CFF64 001CCEA4 48 00 3D 55 */ bl dMenu_Fmap2DBack_c_NS_calcBlink
/* 801CFF68 001CCEA8 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801CFF6C 001CCEAC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801CFF68 001CCEA8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801CFF6C 001CCEAC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801CFF70 001CCEB0 83 C3 5F 50 */ lwz r30, 0x5f50(r3)
/* 801CFF74 001CCEB4 7F C3 F3 78 */ mr r3, r30
/* 801CFF78 001CCEB8 81 9E 00 00 */ lwz r12, 0(r30)
@@ -3271,8 +3271,8 @@ lbl_801D2590:
/* 801D2598 001CF4D8 88 03 12 2C */ lbz r0, 0x122c(r3)
/* 801D259C 001CF4DC 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c
/* 801D25A0 001CF4E0 41 82 00 28 */ beq lbl_801D25C8
/* 801D25A4 001CF4E4 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801D25A8 001CF4E8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801D25A4 001CF4E4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801D25A8 001CF4E8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801D25AC 001CF4EC 38 63 00 64 */ addi r3, r3, 0x64
/* 801D25B0 001CF4F0 38 80 00 04 */ li r4, 4
/* 801D25B4 001CF4F4 4B E6 08 C5 */ bl isRegionBit__33dSv_player_field_last_stay_info_cCFi
@@ -3297,8 +3297,8 @@ lbl_801D25E8:
/* 801D25F4 001CF534 54 00 06 3E */ clrlwi r0, r0, 0x18
/* 801D25F8 001CF538 7C 60 00 39 */ and. r0, r3, r0
/* 801D25FC 001CF53C 41 82 00 28 */ beq lbl_801D2624
/* 801D2600 001CF540 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801D2604 001CF544 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801D2600 001CF540 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801D2604 001CF544 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801D2608 001CF548 38 63 00 64 */ addi r3, r3, 0x64
/* 801D260C 001CF54C 38 9F 00 01 */ addi r4, r31, 1
/* 801D2610 001CF550 4B E6 08 69 */ bl isRegionBit__33dSv_player_field_last_stay_info_cCFi
@@ -7040,8 +7040,8 @@ lbl_801D5C3C:
/* 801D5C48 001D2B88 38 84 65 D0 */ addi r4, r4, lbl_803965D0@l
/* 801D5C4C 001D2B8C 38 84 00 85 */ addi r4, r4, 0x85
/* 801D5C50 001D2B90 3C A0 01 02 */ lis r5, 0x102
/* 801D5C54 001D2B94 3C C0 80 40 */ lis r6, lbl_804061C0@ha
/* 801D5C58 001D2B98 3B A6 61 C0 */ addi r29, r6, lbl_804061C0@l
/* 801D5C54 001D2B94 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha
/* 801D5C58 001D2B98 3B A6 61 C0 */ addi r29, r6, g_dComIfG_gameInfo@l
/* 801D5C5C 001D2B9C 80 DD 5C BC */ lwz r6, 0x5cbc(r29)
/* 801D5C60 001D2BA0 48 12 29 E9 */ bl J2DScreen_NS_setPriority
/* 801D5C64 001D2BA4 80 7F 00 08 */ lwz r3, 8(r31)
@@ -8164,8 +8164,8 @@ lbl_801D6C74:
/* 801D6CA4 001D3BE4 93 E1 00 5C */ stw r31, 0x5c(r1)
/* 801D6CA8 001D3BE8 93 C1 00 58 */ stw r30, 0x58(r1)
/* 801D6CAC 001D3BEC 7C 7E 1B 78 */ mr r30, r3
/* 801D6CB0 001D3BF0 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801D6CB4 001D3BF4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801D6CB0 001D3BF0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801D6CB4 001D3BF4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801D6CB8 001D3BF8 83 E3 5F 50 */ lwz r31, 0x5f50(r3)
/* 801D6CBC 001D3BFC 7F E3 FB 78 */ mr r3, r31
/* 801D6CC0 001D3C00 81 9F 00 00 */ lwz r12, 0(r31)
@@ -9109,8 +9109,8 @@ lbl_801D79BC:
/* 801D79CC 001D490C 38 60 00 00 */ li r3, 0
/* 801D79D0 001D4910 48 00 00 24 */ b lbl_801D79F4
lbl_801D79D4:
/* 801D79D4 001D4914 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801D79D8 001D4918 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801D79D4 001D4914 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801D79D8 001D4918 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801D79DC 001D491C 80 63 5D B4 */ lwz r3, 0x5db4(r3)
/* 801D79E0 001D4920 38 80 00 00 */ li r4, 0
/* 801D79E4 001D4924 81 83 06 28 */ lwz r12, 0x628(r3)
@@ -9195,8 +9195,8 @@ dMenu_Fmap2DTop_c_NS_checkWarpAcceptRegion4:
/* 801D7AEC 001D4A2C 38 60 00 00 */ li r3, 0
/* 801D7AF0 001D4A30 48 00 00 54 */ b lbl_801D7B44
lbl_801D7AF4:
/* 801D7AF4 001D4A34 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801D7AF8 001D4A38 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801D7AF4 001D4A34 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801D7AF8 001D4A38 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801D7AFC 001D4A3C 3B E3 07 F0 */ addi r31, r3, 0x7f0
/* 801D7B00 001D4A40 7F E3 FB 78 */ mr r3, r31
/* 801D7B04 001D4A44 3C 80 80 3A */ lis r4, lbl_803A7288@ha
@@ -9229,8 +9229,8 @@ dMenu_Fmap2DTop_c_NS_checkWarpAcceptCannon:
/* 801D7B5C 001D4A9C 7C 08 02 A6 */ mflr r0
/* 801D7B60 001D4AA0 90 01 00 14 */ stw r0, 0x14(r1)
/* 801D7B64 001D4AA4 93 E1 00 0C */ stw r31, 0xc(r1)
/* 801D7B68 001D4AA8 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801D7B6C 001D4AAC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801D7B68 001D4AA8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801D7B6C 001D4AAC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801D7B70 001D4AB0 3B E3 07 F0 */ addi r31, r3, 0x7f0
/* 801D7B74 001D4AB4 7F E3 FB 78 */ mr r3, r31
/* 801D7B78 001D4AB8 3C 80 80 3A */ lis r4, lbl_803A7288@ha
@@ -9585,8 +9585,8 @@ dMenu_Fmap2DTop_c_NS_isWarpAccept:
/* 801D8088 001D4FC8 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 801D808C 001D4FCC 7C 08 02 A6 */ mflr r0
/* 801D8090 001D4FD0 90 01 00 14 */ stw r0, 0x14(r1)
/* 801D8094 001D4FD4 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801D8098 001D4FD8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801D8094 001D4FD4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801D8098 001D4FD8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801D809C 001D4FDC 38 63 07 F0 */ addi r3, r3, 0x7f0
/* 801D80A0 001D4FE0 3C 80 80 3A */ lis r4, lbl_803A7288@ha
/* 801D80A4 001D4FE4 38 84 72 88 */ addi r4, r4, lbl_803A7288@l
asm/d/menu/d_menu_insect.s
+16 -16
View File
@@ -36,8 +36,8 @@ dMenu_Insect_c:
/* 801D8184 001D50C4 98 1F 00 FA */ stb r0, 0xfa(r31)
/* 801D8188 001D50C8 98 1F 00 FB */ stb r0, 0xfb(r31)
/* 801D818C 001D50CC 98 7F 00 F7 */ stb r3, 0xf7(r31)
/* 801D8190 001D50D0 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801D8194 001D50D4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801D8190 001D50D0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801D8194 001D50D4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801D8198 001D50D8 80 63 5D 30 */ lwz r3, 0x5d30(r3)
/* 801D819C 001D50DC 3C 80 54 49 */ lis r4, 0x54494D47@ha
/* 801D81A0 001D50E0 38 84 4D 47 */ addi r4, r4, 0x54494D47@l
@@ -348,8 +348,8 @@ lbl_801D85EC:
/* 801D8608 001D5548 38 00 00 00 */ li r0, 0
/* 801D860C 001D554C 90 1E 00 08 */ stw r0, 8(r30)
lbl_801D8610:
/* 801D8610 001D5550 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801D8614 001D5554 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801D8610 001D5550 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801D8614 001D5554 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801D8618 001D5558 80 63 5C 6C */ lwz r3, 0x5c6c(r3)
/* 801D861C 001D555C 81 83 00 00 */ lwz r12, 0(r3)
/* 801D8620 001D5560 81 8C 00 24 */ lwz r12, 0x24(r12)
@@ -453,8 +453,8 @@ dMenu_Insect_c_NS__draw:
/* 801D8778 001D56B8 80 03 00 08 */ lwz r0, 8(r3)
/* 801D877C 001D56BC 28 00 00 00 */ cmplwi r0, 0
/* 801D8780 001D56C0 41 82 01 54 */ beq lbl_801D88D4
/* 801D8784 001D56C4 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801D8788 001D56C8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801D8784 001D56C4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801D8788 001D56C8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801D878C 001D56CC 83 E3 5F 50 */ lwz r31, 0x5f50(r3)
/* 801D8790 001D56D0 80 7E 00 60 */ lwz r3, 0x60(r30)
/* 801D8794 001D56D4 38 80 00 FF */ li r4, 0xff
@@ -1938,8 +1938,8 @@ dMenu_Insect_c_NS_getGetInsectNum:
/* 801D9D68 001D6CA8 38 03 D8 7C */ addi r0, r3, lbl_803BD87C@l
/* 801D9D6C 001D6CAC 7C 1D 03 78 */ mr r29, r0
/* 801D9D70 001D6CB0 3B 80 00 00 */ li r28, 0
/* 801D9D74 001D6CB4 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801D9D78 001D6CB8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801D9D74 001D6CB4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801D9D78 001D6CB8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801D9D7C 001D6CBC 3B E3 00 CC */ addi r31, r3, 0xcc
lbl_801D9D80:
/* 801D9D80 001D6CC0 88 9D 00 00 */ lbz r4, 0(r29)
@@ -1979,8 +1979,8 @@ dMenu_Insect_c_NS_isGetInsect:
/* 801D9DEC 001D6D2C 90 01 00 14 */ stw r0, 0x14(r1)
/* 801D9DF0 001D6D30 4B FF FF DD */ bl dMenu_Insect_c_NS_getInsectItemID
/* 801D9DF4 001D6D34 7C 64 1B 78 */ mr r4, r3
/* 801D9DF8 001D6D38 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801D9DFC 001D6D3C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801D9DF8 001D6D38 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801D9DFC 001D6D3C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801D9E00 001D6D40 38 63 00 CC */ addi r3, r3, 0xcc
/* 801D9E04 001D6D44 4B E5 A0 C5 */ bl isFirstBit__21dSv_player_get_item_cCFUc
/* 801D9E08 001D6D48 30 03 FF FF */ addic r0, r3, -1
@@ -1995,8 +1995,8 @@ dMenu_Insect_c_NS_isGiveInsect:
/* 801D9E20 001D6D60 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 801D9E24 001D6D64 7C 08 02 A6 */ mflr r0
/* 801D9E28 001D6D68 90 01 00 14 */ stw r0, 0x14(r1)
/* 801D9E2C 001D6D6C 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801D9E30 001D6D70 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801D9E2C 001D6D6C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801D9E30 001D6D70 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801D9E34 001D6D74 38 63 07 F0 */ addi r3, r3, 0x7f0
/* 801D9E38 001D6D78 1C 05 00 06 */ mulli r0, r5, 6
/* 801D9E3C 001D6D7C 7C 04 02 14 */ add r0, r4, r0
@@ -2027,8 +2027,8 @@ dMenu_Insect_c_NS_isCatchInsect:
/* 801D9E94 001D6DD4 41 80 00 2C */ blt lbl_801D9EC0
/* 801D9E98 001D6DD8 28 00 00 D7 */ cmplwi r0, 0xd7
/* 801D9E9C 001D6DDC 41 81 00 24 */ bgt lbl_801D9EC0
/* 801D9EA0 001D6DE0 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801D9EA4 001D6DE4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801D9EA0 001D6DE0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801D9EA4 001D6DE4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801D9EA8 001D6DE8 38 63 00 CC */ addi r3, r3, 0xcc
/* 801D9EAC 001D6DEC 4B E5 A0 1D */ bl isFirstBit__21dSv_player_get_item_cCFUc
/* 801D9EB0 001D6DF0 30 03 FF FF */ addic r0, r3, -1
@@ -2053,8 +2053,8 @@ dMenu_Insect_c_NS_isGiveInsect_X1_:
/* 801D9EE8 001D6E28 41 80 00 40 */ blt lbl_801D9F28
/* 801D9EEC 001D6E2C 28 04 00 D7 */ cmplwi r4, 0xd7
/* 801D9EF0 001D6E30 41 81 00 38 */ bgt lbl_801D9F28
/* 801D9EF4 001D6E34 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801D9EF8 001D6E38 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801D9EF4 001D6E34 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801D9EF8 001D6E38 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801D9EFC 001D6E3C 38 63 07 F0 */ addi r3, r3, 0x7f0
/* 801D9F00 001D6E40 38 04 00 D1 */ addi r0, r4, 0xd1
/* 801D9F04 001D6E44 54 00 08 3C */ slwi r0, r0, 1
asm/d/menu/d_menu_letter.s
+20 -20
View File
@@ -388,8 +388,8 @@ lbl_801DD300:
/* 801DD31C 001DA25C 38 00 00 00 */ li r0, 0
/* 801DD320 001DA260 90 1F 00 08 */ stw r0, 8(r31)
lbl_801DD324:
/* 801DD324 001DA264 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801DD328 001DA268 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801DD324 001DA264 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801DD328 001DA268 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801DD32C 001DA26C 80 63 5C 6C */ lwz r3, 0x5c6c(r3)
/* 801DD330 001DA270 81 83 00 00 */ lwz r12, 0(r3)
/* 801DD334 001DA274 81 8C 00 24 */ lwz r12, 0x24(r12)
@@ -537,8 +537,8 @@ dMenu_Letter_c_NS__draw:
/* 801DD534 001DA474 80 03 00 08 */ lwz r0, 8(r3)
/* 801DD538 001DA478 28 00 00 00 */ cmplwi r0, 0
/* 801DD53C 001DA47C 41 82 03 D0 */ beq lbl_801DD90C
/* 801DD540 001DA480 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801DD544 001DA484 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801DD540 001DA480 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801DD544 001DA484 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801DD548 001DA488 83 E3 5F 50 */ lwz r31, 0x5f50(r3)
/* 801DD54C 001DA48C 80 7D 02 B4 */ lwz r3, 0x2b4(r29)
/* 801DD550 001DA490 8B 83 00 B2 */ lbz r28, 0xb2(r3)
@@ -824,8 +824,8 @@ dMenu_Letter_c_NS_letter_init_calc:
/* 801DD970 001DA8B0 48 00 3D 09 */ bl dMenu_Letter_c_NS_getLetterNum
/* 801DD974 001DA8B4 98 7F 03 75 */ stb r3, 0x375(r31)
/* 801DD978 001DA8B8 38 C0 00 00 */ li r6, 0
/* 801DD97C 001DA8BC 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801DD980 001DA8C0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801DD97C 001DA8BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801DD980 001DA8C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801DD984 001DA8C4 38 A3 01 1C */ addi r5, r3, 0x11c
/* 801DD988 001DA8C8 38 60 00 FF */ li r3, 0xff
/* 801DD98C 001DA8CC 38 00 00 36 */ li r0, 0x36
@@ -1340,8 +1340,8 @@ lbl_801DE0A0:
/* 801DE0F4 001DB034 38 03 00 01 */ addi r0, r3, 1
/* 801DE0F8 001DB038 1C 00 00 64 */ mulli r0, r0, 0x64
/* 801DE0FC 001DB03C 7C 04 02 14 */ add r0, r4, r0
/* 801DE100 001DB040 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801DE104 001DB044 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801DE100 001DB040 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801DE104 001DB044 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801DE108 001DB048 90 03 5E 0C */ stw r0, 0x5e0c(r3)
/* 801DE10C 001DB04C 80 7E 03 10 */ lwz r3, 0x310(r30)
/* 801DE110 001DB050 38 80 04 D6 */ li r4, 0x4d6
@@ -1594,8 +1594,8 @@ lbl_801DE4BC:
/* 801DE4C8 001DB408 38 63 00 04 */ addi r3, r3, 4
/* 801DE4CC 001DB40C 42 00 FF F0 */ bdnz lbl_801DE4BC
lbl_801DE4D0:
/* 801DE4D0 001DB410 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801DE4D4 001DB414 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801DE4D0 001DB410 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801DE4D4 001DB414 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801DE4D8 001DB418 3B 43 01 1C */ addi r26, r3, 0x11c
/* 801DE4DC 001DB41C 7F 43 D3 78 */ mr r3, r26
/* 801DE4E0 001DB420 7F C4 F3 78 */ mr r4, r30
@@ -3129,8 +3129,8 @@ lbl_801DFB2C:
/* 801DFBC8 001DCB08 38 03 00 01 */ addi r0, r3, 1
/* 801DFBCC 001DCB0C 1C 00 00 64 */ mulli r0, r0, 0x64
/* 801DFBD0 001DCB10 7C 04 02 14 */ add r0, r4, r0
/* 801DFBD4 001DCB14 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801DFBD8 001DCB18 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801DFBD4 001DCB14 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801DFBD8 001DCB18 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801DFBDC 001DCB1C 90 03 5E 0C */ stw r0, 0x5e0c(r3)
/* 801DFBE0 001DCB20 80 7F 03 10 */ lwz r3, 0x310(r31)
/* 801DFBE4 001DCB24 38 80 04 D6 */ li r4, 0x4d6
@@ -3987,8 +3987,8 @@ lbl_801E0884:
/* 801E08BC 001DD7FC 2C 1B 00 02 */ cmpwi r27, 2
/* 801E08C0 001DD800 3B DE 00 04 */ addi r30, r30, 4
/* 801E08C4 001DD804 41 80 FF 8C */ blt lbl_801E0850
/* 801E08C8 001DD808 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801E08CC 001DD80C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801E08C8 001DD808 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801E08CC 001DD80C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801E08D0 001DD810 80 63 5D 30 */ lwz r3, 0x5d30(r3)
/* 801E08D4 001DD814 3C 80 54 49 */ lis r4, 0x54494D47@ha
/* 801E08D8 001DD818 38 84 4D 47 */ addi r4, r4, 0x54494D47@l
@@ -4452,8 +4452,8 @@ lbl_801E0F8C:
/* 801E0F94 001DDED4 41 80 FF 28 */ blt lbl_801E0EBC
/* 801E0F98 001DDED8 3B A0 00 00 */ li r29, 0
/* 801E0F9C 001DDEDC 3B 60 00 00 */ li r27, 0
/* 801E0FA0 001DDEE0 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801E0FA4 001DDEE4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801E0FA0 001DDEE0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801E0FA4 001DDEE4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801E0FA8 001DDEE8 3B E3 01 1C */ addi r31, r3, 0x11c
lbl_801E0FAC:
/* 801E0FAC 001DDEEC 88 1C 03 73 */ lbz r0, 0x373(r28)
@@ -4570,8 +4570,8 @@ lbl_801E1140:
/* 801E1148 001DE088 41 80 FF 28 */ blt lbl_801E1070
/* 801E114C 001DE08C 3B A0 00 00 */ li r29, 0
/* 801E1150 001DE090 3B 60 00 00 */ li r27, 0
/* 801E1154 001DE094 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801E1158 001DE098 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801E1154 001DE094 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801E1158 001DE098 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801E115C 001DE09C 3B E3 01 1C */ addi r31, r3, 0x11c
lbl_801E1160:
/* 801E1160 001DE0A0 88 1C 03 73 */ lbz r0, 0x373(r28)
@@ -4946,8 +4946,8 @@ dMenu_Letter_c_NS_getLetterNum:
/* 801E16A0 001DE5E0 40 81 00 84 */ ble lbl_801E1724
/* 801E16A4 001DE5E4 3B 40 00 00 */ li r26, 0
/* 801E16A8 001DE5E8 3B E0 00 00 */ li r31, 0
/* 801E16AC 001DE5EC 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801E16B0 001DE5F0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801E16AC 001DE5EC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801E16B0 001DE5F0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801E16B4 001DE5F4 3B 83 01 1C */ addi r28, r3, 0x11c
/* 801E16B8 001DE5F8 3C 60 80 3C */ lis r3, lbl_803BF81C@ha
/* 801E16BC 001DE5FC 3B C3 F8 1C */ addi r30, r3, lbl_803BF81C@l
asm/d/menu/d_menu_option.s
+18 -18
View File
@@ -490,8 +490,8 @@ lbl_801E2540:
/* 801E2634 001DF574 7F E3 FB 78 */ mr r3, r31
/* 801E2638 001DF578 38 80 03 F9 */ li r4, 0x3f9
/* 801E263C 001DF57C 48 00 59 61 */ bl dMenu_Option_c_NS_setBButtonString
/* 801E2640 001DF580 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801E2644 001DF584 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801E2640 001DF580 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801E2644 001DF584 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801E2648 001DF588 80 63 5D 30 */ lwz r3, 0x5d30(r3)
/* 801E264C 001DF58C 3C 80 54 49 */ lis r4, 0x54494D47@ha
/* 801E2650 001DF590 38 84 4D 47 */ addi r4, r4, 0x54494D47@l
@@ -1440,8 +1440,8 @@ lbl_801E33BC:
/* 801E33DC 001E031C 90 1F 00 50 */ stw r0, 0x50(r31)
lbl_801E33E0:
/* 801E33E0 001E0320 38 00 00 00 */ li r0, 0
/* 801E33E4 001E0324 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801E33E8 001E0328 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801E33E4 001E0324 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801E33E8 001E0328 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801E33EC 001E032C 90 03 5C C4 */ stw r0, 0x5cc4(r3)
/* 801E33F0 001E0330 39 61 00 30 */ addi r11, r1, 0x30
/* 801E33F4 001E0334 48 17 EE 21 */ bl func_80362214
@@ -1648,8 +1648,8 @@ dMenu_Option_c_NS__draw:
/* 801E36E4 001E0624 80 03 00 50 */ lwz r0, 0x50(r3)
/* 801E36E8 001E0628 28 00 00 00 */ cmplwi r0, 0
/* 801E36EC 001E062C 41 82 01 C8 */ beq lbl_801E38B4
/* 801E36F0 001E0630 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801E36F4 001E0634 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801E36F0 001E0630 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801E36F4 001E0634 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801E36F8 001E0638 83 E3 5F 50 */ lwz r31, 0x5f50(r3)
/* 801E36FC 001E063C 80 7E 00 38 */ lwz r3, 0x38(r30)
/* 801E3700 001E0640 38 80 00 FF */ li r4, 0xff
@@ -1995,8 +1995,8 @@ lbl_801E3BE0:
/* 801E3BE4 001E0B24 88 04 00 0C */ lbz r0, 0xc(r4)
/* 801E3BE8 001E0B28 2C 00 00 00 */ cmpwi r0, 0
/* 801E3BEC 001E0B2C 41 82 00 58 */ beq lbl_801E3C44
/* 801E3BF0 001E0B30 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801E3BF4 001E0B34 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801E3BF0 001E0B30 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801E3BF4 001E0B34 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801E3BF8 001E0B38 80 03 5C C4 */ lwz r0, 0x5cc4(r3)
/* 801E3BFC 001E0B3C 28 00 00 00 */ cmplwi r0, 0
/* 801E3C00 001E0B40 40 82 00 4C */ bne lbl_801E3C4C
@@ -3384,8 +3384,8 @@ lbl_801E5020:
/* 801E5050 001E1F90 40 82 00 78 */ bne lbl_801E50C8
/* 801E5054 001E1F94 38 00 00 03 */ li r0, 3
/* 801E5058 001E1F98 98 1F 03 EC */ stb r0, 0x3ec(r31)
/* 801E505C 001E1F9C 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801E5060 001E1FA0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801E505C 001E1F9C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801E5060 001E1FA0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801E5064 001E1FA4 3B C3 01 E0 */ addi r30, r3, 0x1e0
/* 801E5068 001E1FA8 88 1F 03 E4 */ lbz r0, 0x3e4(r31)
/* 801E506C 001E1FAC 98 03 01 E2 */ stb r0, 0x1e2(r3)
@@ -3400,8 +3400,8 @@ lbl_801E508C:
/* 801E508C 001E1FCC 7F C3 F3 78 */ mr r3, r30
/* 801E5090 001E1FD0 88 9F 03 E9 */ lbz r4, 0x3e9(r31)
/* 801E5094 001E1FD4 4B E4 F5 F9 */ bl setSound__19dSv_player_config_cFUc
/* 801E5098 001E1FD8 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801E509C 001E1FDC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801E5098 001E1FD8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801E509C 001E1FDC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801E50A0 001E1FE0 38 63 0F 38 */ addi r3, r3, 0xf38
/* 801E50A4 001E1FE4 88 9F 03 EA */ lbz r4, 0x3ea(r31)
/* 801E50A8 001E1FE8 4B E4 63 01 */ bl dComIfG_play_c_NS_setNowVibration
@@ -3429,8 +3429,8 @@ lbl_801E50F0:
/* 801E50F8 001E2038 40 82 00 88 */ bne lbl_801E5180
/* 801E50FC 001E203C 38 00 00 03 */ li r0, 3
/* 801E5100 001E2040 98 1F 03 EC */ stb r0, 0x3ec(r31)
/* 801E5104 001E2044 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801E5108 001E2048 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801E5104 001E2044 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801E5108 001E2048 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801E510C 001E204C 3B C3 01 E0 */ addi r30, r3, 0x1e0
/* 801E5110 001E2050 7F C3 F3 78 */ mr r3, r30
/* 801E5114 001E2054 4B E4 F5 71 */ bl getSound__19dSv_player_config_cFv
@@ -6801,8 +6801,8 @@ dMenu_Option_c_NS_initialize:
/* 801E8218 001E5158 90 01 00 14 */ stw r0, 0x14(r1)
/* 801E821C 001E515C 93 E1 00 0C */ stw r31, 0xc(r1)
/* 801E8220 001E5160 7C 7F 1B 78 */ mr r31, r3
/* 801E8224 001E5164 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801E8228 001E5168 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801E8224 001E5164 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801E8228 001E5168 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801E822C 001E516C 38 63 01 E0 */ addi r3, r3, 0x1e0
/* 801E8230 001E5170 88 03 00 02 */ lbz r0, 2(r3)
/* 801E8234 001E5174 98 1F 03 E4 */ stb r0, 0x3e4(r31)
@@ -6819,8 +6819,8 @@ dMenu_Option_c_NS_initialize:
/* 801E8260 001E51A0 4B FF FE 41 */ bl dMenu_Option_c_NS_isRumbleSupported
/* 801E8264 001E51A4 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 801E8268 001E51A8 41 82 00 1C */ beq lbl_801E8284
/* 801E826C 001E51AC 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801E8270 001E51B0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801E826C 001E51AC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801E8270 001E51B0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801E8274 001E51B4 38 63 0F 38 */ addi r3, r3, 0xf38
/* 801E8278 001E51B8 4B E4 31 39 */ bl dComIfG_play_c_NS_getNowVibration
/* 801E827C 001E51BC 98 7F 03 EA */ stb r3, 0x3ea(r31)
asm/d/menu/d_menu_ring.s
+110 -110
View File
File diff suppressed because it is too large Load Diff
asm/d/menu/d_menu_save.s
+36 -36
View File
@@ -1112,8 +1112,8 @@ lbl_801F05D0:
/* 801F06C8 001ED608 81 8C 00 0C */ lwz r12, 0xc(r12)
/* 801F06CC 001ED60C 7D 89 03 A6 */ mtctr r12
/* 801F06D0 001ED610 4E 80 04 21 */ bctrl
/* 801F06D4 001ED614 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801F06D8 001ED618 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801F06D4 001ED614 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801F06D8 001ED618 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801F06DC 001ED61C 88 03 0F 18 */ lbz r0, 0xf18(r3)
/* 801F06E0 001ED620 98 1F 00 54 */ stb r0, 0x54(r31)
/* 801F06E4 001ED624 38 60 00 B8 */ li r3, 0xb8
@@ -3293,8 +3293,8 @@ lbl_801F2638:
lbl_801F2658:
/* 801F2658 001EF598 2C 00 00 01 */ cmpwi r0, 1
/* 801F265C 001EF59C 40 82 00 28 */ bne lbl_801F2684
/* 801F2660 001EF5A0 3C 80 80 40 */ lis r4, lbl_804061C0@ha
/* 801F2664 001EF5A4 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l
/* 801F2660 001EF5A0 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha
/* 801F2664 001EF5A4 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l
/* 801F2668 001EF5A8 88 04 0F 19 */ lbz r0, 0xf19(r4)
/* 801F266C 001EF5AC 60 00 00 01 */ ori r0, r0, 1
/* 801F2670 001EF5B0 98 04 0F 19 */ stb r0, 0xf19(r4)
@@ -3427,19 +3427,19 @@ dMenu_save_c_NS_dataWrite:
/* 801F284C 001EF78C 39 61 00 20 */ addi r11, r1, 0x20
/* 801F2850 001EF790 48 16 F9 8D */ bl _savegpr_29
/* 801F2854 001EF794 7C 7D 1B 78 */ mr r29, r3
/* 801F2858 001EF798 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801F285C 001EF79C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801F2858 001EF798 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801F285C 001EF79C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801F2860 001EF7A0 85 83 4E 20 */ lwzu r12, 0x4e20(r3)
/* 801F2864 001EF7A4 81 8C 00 BC */ lwz r12, 0xbc(r12)
/* 801F2868 001EF7A8 7D 89 03 A6 */ mtctr r12
/* 801F286C 001EF7AC 4E 80 04 21 */ bctrl
/* 801F2870 001EF7B0 88 03 00 09 */ lbz r0, 9(r3)
/* 801F2874 001EF7B4 54 04 FE FE */ rlwinm r4, r0, 0x1f, 0x1b, 0x1f
/* 801F2878 001EF7B8 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801F287C 001EF7BC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801F2878 001EF7B8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801F287C 001EF7BC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801F2880 001EF7C0 4B E4 28 71 */ bl putSave__10dSv_info_cFi
/* 801F2884 001EF7C4 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801F2888 001EF7C8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801F2884 001EF7C4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801F2888 001EF7C8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801F288C 001EF7CC 38 9D 01 D0 */ addi r4, r29, 0x1d0
/* 801F2890 001EF7D0 88 BD 00 54 */ lbz r5, 0x54(r29)
/* 801F2894 001EF7D4 4B E4 2F 05 */ bl memory_to_card__10dSv_info_cFPci
@@ -3550,8 +3550,8 @@ lbl_801F29F0:
/* 801F2A28 001EF968 39 00 00 00 */ li r8, 0
/* 801F2A2C 001EF96C 48 0B 8F 59 */ bl Z2SeMgr_NS_seStart
/* 801F2A30 001EF970 88 1F 00 54 */ lbz r0, 0x54(r31)
/* 801F2A34 001EF974 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801F2A38 001EF978 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801F2A34 001EF974 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801F2A38 001EF978 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801F2A3C 001EF97C 98 03 0F 18 */ stb r0, 0xf18(r3)
/* 801F2A40 001EF980 38 00 00 00 */ li r0, 0
/* 801F2A44 001EF984 98 03 0F 1A */ stb r0, 0xf1a(r3)
@@ -4001,8 +4001,8 @@ dMenu_save_c_NS_restartInit:
/* 801F30BC 001EFFFC 7C 08 02 A6 */ mflr r0
/* 801F30C0 001F0000 90 01 00 14 */ stw r0, 0x14(r1)
/* 801F30C4 001F0004 93 E1 00 0C */ stw r31, 0xc(r1)
/* 801F30C8 001F0008 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801F30CC 001F000C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801F30C8 001F0008 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801F30CC 001F000C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801F30D0 001F0010 3B E3 07 F0 */ addi r31, r3, 0x7f0
/* 801F30D4 001F0014 7F E3 FB 78 */ mr r3, r31
/* 801F30D8 001F0018 3C 80 80 3A */ lis r4, lbl_803A7288@ha
@@ -4022,15 +4022,15 @@ dMenu_save_c_NS_restartInit:
/* 801F3110 001F0050 A0 84 01 C2 */ lhz r4, 0x1c2(r4)
/* 801F3114 001F0054 4B E4 18 91 */ bl offEventBit__11dSv_event_cFUs
lbl_801F3118:
/* 801F3118 001F0058 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801F311C 001F005C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801F3118 001F0058 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801F311C 001F005C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801F3120 001F0060 38 63 00 CC */ addi r3, r3, 0xcc
/* 801F3124 001F0064 38 80 00 48 */ li r4, 0x48
/* 801F3128 001F0068 4B E4 0D A1 */ bl isFirstBit__21dSv_player_get_item_cCFUc
/* 801F312C 001F006C 2C 03 00 00 */ cmpwi r3, 0
/* 801F3130 001F0070 41 82 00 54 */ beq lbl_801F3184
/* 801F3134 001F0074 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801F3138 001F0078 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801F3134 001F0074 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801F3138 001F0078 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801F313C 001F007C 3B E3 00 9C */ addi r31, r3, 0x9c
/* 801F3140 001F0080 7F E3 FB 78 */ mr r3, r31
/* 801F3144 001F0084 38 80 00 01 */ li r4, 1
@@ -4046,8 +4046,8 @@ lbl_801F3118:
/* 801F316C 001F00AC 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801F3170 001F00B0 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801F3174 001F00B4 A0 03 00 B6 */ lhz r0, 0xb6(r3)
/* 801F3178 001F00B8 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801F317C 001F00BC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801F3178 001F00B8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801F317C 001F00BC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801F3180 001F00C0 B0 03 00 08 */ sth r0, 8(r3)
lbl_801F3184:
/* 801F3184 001F00C4 3C 60 80 43 */ lis r3, lbl_80430188@ha
@@ -4441,8 +4441,8 @@ lbl_801F369C:
/* 801F36F4 001F0634 7F E3 FB 78 */ mr r3, r31
/* 801F36F8 001F0638 38 80 00 01 */ li r4, 1
/* 801F36FC 001F063C 48 00 29 A9 */ bl dMenu_save_c_NS_modoruTxtDispAnmInit
/* 801F3700 001F0640 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801F3704 001F0644 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801F3700 001F0640 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801F3704 001F0644 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801F3708 001F0648 88 03 0F 18 */ lbz r0, 0xf18(r3)
/* 801F370C 001F064C 98 1F 00 54 */ stb r0, 0x54(r31)
/* 801F3710 001F0650 88 1F 00 54 */ lbz r0, 0x54(r31)
@@ -7823,8 +7823,8 @@ dMenu_save_c_NS_setSaveData:
/* 801F6808 001F3748 3B BB 01 D0 */ addi r29, r27, 0x1d0
/* 801F680C 001F374C 3B 80 00 00 */ li r28, 0
/* 801F6810 001F3750 3B 40 00 00 */ li r26, 0
/* 801F6814 001F3754 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801F6818 001F3758 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l
/* 801F6814 001F3754 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801F6818 001F3758 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l
lbl_801F681C:
/* 801F681C 001F375C 7F A3 EB 78 */ mr r3, r29
/* 801F6820 001F3760 4B E2 14 CD */ bl mDoMemCdRWm_TestCheckSumGameData
@@ -7921,8 +7921,8 @@ dMenu_save_c_NS_setInitSaveData:
/* 801F6964 001F38A4 48 16 B8 79 */ bl _savegpr_29
/* 801F6968 001F38A8 7C 7D 1B 78 */ mr r29, r3
/* 801F696C 001F38AC 3B C0 00 00 */ li r30, 0
/* 801F6970 001F38B0 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801F6974 001F38B4 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l
/* 801F6970 001F38B0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801F6974 001F38B4 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l
lbl_801F6978:
/* 801F6978 001F38B8 7F E3 FB 78 */ mr r3, r31
/* 801F697C 001F38BC 38 9D 01 D0 */ addi r4, r29, 0x1d0
@@ -7952,8 +7952,8 @@ dMenu_save_c_NS__draw:
/* 801F69D0 001F3910 80 63 21 8C */ lwz r3, 0x218c(r3)
/* 801F69D4 001F3914 28 03 00 00 */ cmplwi r3, 0
/* 801F69D8 001F3918 41 82 00 14 */ beq lbl_801F69EC
/* 801F69DC 001F391C 3C 80 80 40 */ lis r4, lbl_804061C0@ha
/* 801F69E0 001F3920 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l
/* 801F69DC 001F391C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha
/* 801F69E0 001F3920 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l
/* 801F69E4 001F3924 80 84 5F 50 */ lwz r4, 0x5f50(r4)
/* 801F69E8 001F3928 48 04 6F 31 */ bl dMsgScrnExplain_c_NS_draw
lbl_801F69EC:
@@ -7976,8 +7976,8 @@ dMenu_save_c_NS__draw2:
/* 801F6A20 001F3960 80 1A 21 8C */ lwz r0, 0x218c(r26)
/* 801F6A24 001F3964 28 00 00 00 */ cmplwi r0, 0
/* 801F6A28 001F3968 41 82 00 20 */ beq lbl_801F6A48
/* 801F6A2C 001F396C 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801F6A30 001F3970 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801F6A2C 001F396C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801F6A30 001F3970 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801F6A34 001F3974 38 63 5F 64 */ addi r3, r3, 0x5f64
/* 801F6A38 001F3978 38 83 01 B4 */ addi r4, r3, 0x1b4
/* 801F6A3C 001F397C 38 A3 01 B8 */ addi r5, r3, 0x1b8
@@ -7987,8 +7987,8 @@ lbl_801F6A48:
/* 801F6A48 001F3988 88 1A 01 B0 */ lbz r0, 0x1b0(r26)
/* 801F6A4C 001F398C 28 00 00 00 */ cmplwi r0, 0
/* 801F6A50 001F3990 41 82 00 64 */ beq lbl_801F6AB4
/* 801F6A54 001F3994 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801F6A58 001F3998 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801F6A54 001F3994 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801F6A58 001F3998 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801F6A5C 001F399C 3B C3 5F 64 */ addi r30, r3, 0x5f64
/* 801F6A60 001F39A0 7F C3 F3 78 */ mr r3, r30
/* 801F6A64 001F39A4 3B 9E 01 B4 */ addi r28, r30, 0x1b4
@@ -8028,8 +8028,8 @@ lbl_801F6AC4:
/* 801F6AE0 001F3A20 7C 08 02 A6 */ mflr r0
/* 801F6AE4 001F3A24 90 01 00 14 */ stw r0, 0x14(r1)
/* 801F6AE8 001F3A28 80 63 00 04 */ lwz r3, 4(r3)
/* 801F6AEC 001F3A2C 3C 80 80 40 */ lis r4, lbl_804061C0@ha
/* 801F6AF0 001F3A30 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l
/* 801F6AEC 001F3A2C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha
/* 801F6AF0 001F3A30 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l
/* 801F6AF4 001F3A34 80 84 5F 50 */ lwz r4, 0x5f50(r4)
/* 801F6AF8 001F3A38 48 04 6E 21 */ bl dMsgScrnExplain_c_NS_draw
/* 801F6AFC 001F3A3C 80 01 00 14 */ lwz r0, 0x14(r1)
@@ -8042,8 +8042,8 @@ lbl_801F6AC4:
/* 801F6B18 001F3A58 80 63 00 04 */ lwz r3, 4(r3)
/* 801F6B1C 001F3A5C C0 22 AA 48 */ lfs f1, lbl_80454448-_SDA2_BASE_(r2)
/* 801F6B20 001F3A60 FC 40 08 90 */ fmr f2, f1
/* 801F6B24 001F3A64 3C 80 80 40 */ lis r4, lbl_804061C0@ha
/* 801F6B28 001F3A68 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l
/* 801F6B24 001F3A64 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha
/* 801F6B28 001F3A68 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l
/* 801F6B2C 001F3A6C 80 84 5F 50 */ lwz r4, 0x5f50(r4)
/* 801F6B30 001F3A70 48 10 23 A5 */ bl J2DScreen_NS_draw
/* 801F6B34 001F3A74 80 01 00 14 */ lwz r0, 0x14(r1)
asm/d/menu/d_menu_skill.s
+6 -6
View File
@@ -409,8 +409,8 @@ dMenu_Skill_c_NS__draw:
/* 801F77C8 001F4708 80 03 00 08 */ lwz r0, 8(r3)
/* 801F77CC 001F470C 28 00 00 00 */ cmplwi r0, 0
/* 801F77D0 001F4710 41 82 01 68 */ beq lbl_801F7938
/* 801F77D4 001F4714 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801F77D8 001F4718 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801F77D4 001F4714 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801F77D8 001F4718 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801F77DC 001F471C 83 E3 5F 50 */ lwz r31, 0x5f50(r3)
/* 801F77E0 001F4720 80 7D 01 58 */ lwz r3, 0x158(r29)
/* 801F77E4 001F4724 8B C3 00 B2 */ lbz r30, 0xb2(r3)
@@ -1783,8 +1783,8 @@ lbl_801F8C38:
/* 801F8C3C 001F5B7C 80 7F 01 7C */ lwz r3, 0x17c(r31)
/* 801F8C40 001F5B80 C0 22 AA 88 */ lfs f1, lbl_80454488-_SDA2_BASE_(r2)
/* 801F8C44 001F5B84 48 05 CB 8D */ bl CPaneMgrAlpha_NS_setAlphaRate
/* 801F8C48 001F5B88 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801F8C4C 001F5B8C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801F8C48 001F5B88 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801F8C4C 001F5B8C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801F8C50 001F5B90 80 63 5D 30 */ lwz r3, 0x5d30(r3)
/* 801F8C54 001F5B94 3C 80 54 49 */ lis r4, 0x54494D47@ha
/* 801F8C58 001F5B98 38 84 4D 47 */ addi r4, r4, 0x54494D47@l
@@ -2358,8 +2358,8 @@ dMenu_Skill_c_NS_getSkillNum:
/* 801F9484 001F63C4 3B 60 00 00 */ li r27, 0
/* 801F9488 001F63C8 3B 40 00 00 */ li r26, 0
/* 801F948C 001F63CC 3B E0 00 00 */ li r31, 0
/* 801F9490 001F63D0 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801F9494 001F63D4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801F9490 001F63D0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801F9494 001F63D4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801F9498 001F63D8 3B 83 07 F0 */ addi r28, r3, 0x7f0
/* 801F949C 001F63DC 3C 60 80 3C */ lis r3, lbl_803BE8A4@ha
/* 801F94A0 001F63E0 3B A3 E8 A4 */ addi r29, r3, lbl_803BE8A4@l
asm/d/menu/d_menu_window.s
+48 -48
View File
@@ -778,16 +778,16 @@ lbl_801FAAE0:
/* 801FAAE4 001F7A24 80 03 00 04 */ lwz r0, 4(r3)
/* 801FAAE8 001F7A28 2C 00 00 01 */ cmpwi r0, 1
/* 801FAAEC 001F7A2C 40 82 04 D8 */ bne lbl_801FAFC4
/* 801FAAF0 001F7A30 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801FAAF4 001F7A34 3B C3 61 C0 */ addi r30, r3, lbl_804061C0@l
/* 801FAAF0 001F7A30 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801FAAF4 001F7A34 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l
/* 801FAAF8 001F7A38 88 1E 5E 8F */ lbz r0, 0x5e8f(r30)
/* 801FAAFC 001F7A3C 28 00 00 00 */ cmplwi r0, 0
/* 801FAB00 001F7A40 41 82 00 0C */ beq lbl_801FAB0C
/* 801FAB04 001F7A44 28 00 00 05 */ cmplwi r0, 5
/* 801FAB08 001F7A48 40 82 04 BC */ bne lbl_801FAFC4
lbl_801FAB0C:
/* 801FAB0C 001F7A4C 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801FAB10 001F7A50 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l
/* 801FAB0C 001F7A4C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801FAB10 001F7A50 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l
/* 801FAB14 001F7A54 88 1F 5E 1A */ lbz r0, 0x5e1a(r31)
/* 801FAB18 001F7A58 28 00 00 00 */ cmplwi r0, 0
/* 801FAB1C 001F7A5C 40 82 04 A8 */ bne lbl_801FAFC4
@@ -799,8 +799,8 @@ lbl_801FAB0C:
/* 801FAB34 001F7A74 80 03 01 A4 */ lwz r0, 0x1a4(r3)
/* 801FAB38 001F7A78 2C 00 00 08 */ cmpwi r0, 8
/* 801FAB3C 001F7A7C 41 82 04 88 */ beq lbl_801FAFC4
/* 801FAB40 001F7A80 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801FAB44 001F7A84 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801FAB40 001F7A80 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801FAB44 001F7A84 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801FAB48 001F7A88 80 03 5D 7C */ lwz r0, 0x5d7c(r3)
/* 801FAB4C 001F7A8C 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c
/* 801FAB50 001F7A90 40 82 04 74 */ bne lbl_801FAFC4
@@ -820,8 +820,8 @@ lbl_801FAB0C:
/* 801FAB88 001F7AC8 88 0D 86 66 */ lbz r0, lbl_80450BE6-_SDA_BASE_(r13)
/* 801FAB8C 001F7ACC 28 00 00 00 */ cmplwi r0, 0
/* 801FAB90 001F7AD0 40 82 04 34 */ bne lbl_801FAFC4
/* 801FAB94 001F7AD4 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801FAB98 001F7AD8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801FAB94 001F7AD4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801FAB98 001F7AD8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801FAB9C 001F7ADC 80 63 5D AC */ lwz r3, 0x5dac(r3)
/* 801FABA0 001F7AE0 81 83 06 28 */ lwz r12, 0x628(r3)
/* 801FABA4 001F7AE4 81 8C 00 74 */ lwz r12, 0x74(r12)
@@ -891,8 +891,8 @@ lbl_801FAC88:
/* 801FAC90 001F7BD0 A0 03 00 B4 */ lhz r0, 0xb4(r3)
/* 801FAC94 001F7BD4 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c
/* 801FAC98 001F7BD8 41 82 00 4C */ beq lbl_801FACE4
/* 801FAC9C 001F7BDC 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801FACA0 001F7BE0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801FAC9C 001F7BDC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801FACA0 001F7BE0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801FACA4 001F7BE4 88 03 4E 1C */ lbz r0, 0x4e1c(r3)
/* 801FACA8 001F7BE8 7C 00 07 75 */ extsb. r0, r0
/* 801FACAC 001F7BEC 40 82 00 38 */ bne lbl_801FACE4
@@ -945,8 +945,8 @@ lbl_801FAD44:
/* 801FAD5C 001F7C9C 80 63 00 1C */ lwz r3, 0x1c(r3)
/* 801FAD60 001F7CA0 48 02 49 8D */ bl dMeter2_c_NS_emphasisButtonDelete
lbl_801FAD64:
/* 801FAD64 001F7CA4 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801FAD68 001F7CA8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801FAD64 001F7CA4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801FAD68 001F7CA8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801FAD6C 001F7CAC 3B C3 4E 20 */ addi r30, r3, 0x4e20
/* 801FAD70 001F7CB0 7F C3 F3 78 */ mr r3, r30
/* 801FAD74 001F7CB4 81 9E 00 00 */ lwz r12, 0(r30)
@@ -1072,8 +1072,8 @@ lbl_801FAF34:
/* 801FAF34 001F7E74 48 02 37 55 */ bl dMeter2Info_isItemOpenCheck
/* 801FAF38 001F7E78 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 801FAF3C 001F7E7C 41 82 00 88 */ beq lbl_801FAFC4
/* 801FAF40 001F7E80 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801FAF44 001F7E84 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801FAF40 001F7E80 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801FAF44 001F7E84 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801FAF48 001F7E88 88 03 4E 1C */ lbz r0, 0x4e1c(r3)
/* 801FAF4C 001F7E8C 7C 00 07 75 */ extsb. r0, r0
/* 801FAF50 001F7E90 40 82 00 74 */ bne lbl_801FAFC4
@@ -2061,8 +2061,8 @@ dMw_c_NS_dMw_capture_create:
/* 801FBD88 001F8CC8 90 01 00 14 */ stw r0, 0x14(r1)
/* 801FBD8C 001F8CCC 93 E1 00 0C */ stw r31, 0xc(r1)
/* 801FBD90 001F8CD0 7C 7F 1B 78 */ mr r31, r3
/* 801FBD94 001F8CD4 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801FBD98 001F8CD8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801FBD94 001F8CD4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801FBD98 001F8CD8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801FBD9C 001F8CDC 88 03 5E B5 */ lbz r0, 0x5eb5(r3)
/* 801FBDA0 001F8CE0 28 00 00 00 */ cmplwi r0, 0
/* 801FBDA4 001F8CE4 40 82 00 5C */ bne lbl_801FBE00
@@ -2104,8 +2104,8 @@ dMw_c_NS_dMw_capture_delete:
/* 801FBE20 001F8D60 93 E1 00 0C */ stw r31, 0xc(r1)
/* 801FBE24 001F8D64 93 C1 00 08 */ stw r30, 8(r1)
/* 801FBE28 001F8D68 7C 7E 1B 78 */ mr r30, r3
/* 801FBE2C 001F8D6C 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801FBE30 001F8D70 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l
/* 801FBE2C 001F8D6C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801FBE30 001F8D70 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l
/* 801FBE34 001F8D74 88 1F 5E B5 */ lbz r0, 0x5eb5(r31)
/* 801FBE38 001F8D78 28 00 00 00 */ cmplwi r0, 0
/* 801FBE3C 001F8D7C 41 82 00 40 */ beq lbl_801FBE7C
@@ -2723,8 +2723,8 @@ dMw_c_NS_dMw_option_create:
/* 801FC684 001F95C4 48 0D 25 C9 */ bl __nw__FUl
/* 801FC688 001F95C8 7C 60 1B 79 */ or. r0, r3, r3
/* 801FC68C 001F95CC 41 82 00 1C */ beq lbl_801FC6A8
/* 801FC690 001F95D0 3C 80 80 40 */ lis r4, lbl_804061C0@ha
/* 801FC694 001F95D4 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l
/* 801FC690 001F95D0 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha
/* 801FC694 001F95D4 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l
/* 801FC698 001F95D8 80 84 5C B8 */ lwz r4, 0x5cb8(r4)
/* 801FC69C 001F95DC 80 BF 01 04 */ lwz r5, 0x104(r31)
/* 801FC6A0 001F95E0 4B FE 58 71 */ bl dMenu_Option_c
@@ -3236,8 +3236,8 @@ dMw_c_NS_dMw_isPush_S_Button:
/* 801FCD38 001F9C78 80 03 00 04 */ lwz r0, 4(r3)
/* 801FCD3C 001F9C7C 2C 00 00 01 */ cmpwi r0, 1
/* 801FCD40 001F9C80 40 82 00 80 */ bne lbl_801FCDC0
/* 801FCD44 001F9C84 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801FCD48 001F9C88 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l
/* 801FCD44 001F9C84 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801FCD48 001F9C88 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l
/* 801FCD4C 001F9C8C 80 7F 5D B4 */ lwz r3, 0x5db4(r31)
/* 801FCD50 001F9C90 81 83 06 28 */ lwz r12, 0x628(r3)
/* 801FCD54 001F9C94 81 8C 02 6C */ lwz r12, 0x26c(r12)
@@ -3279,8 +3279,8 @@ lbl_801FCDC4:
.global dMw_c_NS_isPauseReady
dMw_c_NS_isPauseReady:
/* 801FCDD8 001F9D18 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801FCDDC 001F9D1C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801FCDD8 001F9D18 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801FCDDC 001F9D1C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801FCDE0 001F9D20 88 03 4F F0 */ lbz r0, 0x4ff0(r3)
/* 801FCDE4 001F9D24 28 00 00 00 */ cmplwi r0, 0
/* 801FCDE8 001F9D28 40 82 00 10 */ bne lbl_801FCDF8
@@ -3426,8 +3426,8 @@ lbl_801FCFA8:
/* 801FCFC8 001F9F08 38 00 00 00 */ li r0, 0
/* 801FCFCC 001F9F0C 98 03 01 48 */ stb r0, 0x148(r3)
lbl_801FCFD0:
/* 801FCFD0 001F9F10 3C 80 80 40 */ lis r4, lbl_804061C0@ha
/* 801FCFD4 001F9F14 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l
/* 801FCFD0 001F9F10 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha
/* 801FCFD4 001F9F14 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l
/* 801FCFD8 001F9F18 88 04 4F AD */ lbz r0, 0x4fad(r4)
/* 801FCFDC 001F9F1C 28 00 00 00 */ cmplwi r0, 0
/* 801FCFE0 001F9F20 41 82 00 8C */ beq lbl_801FD06C
@@ -3541,8 +3541,8 @@ dMw_c_NS__create:
/* 801FD14C 001FA08C 93 E1 00 0C */ stw r31, 0xc(r1)
/* 801FD150 001FA090 93 C1 00 08 */ stw r30, 8(r1)
/* 801FD154 001FA094 7C 7E 1B 78 */ mr r30, r3
/* 801FD158 001FA098 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801FD15C 001FA09C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801FD158 001FA098 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801FD15C 001FA09C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801FD160 001FA0A0 80 03 5E BC */ lwz r0, 0x5ebc(r3)
/* 801FD164 001FA0A4 90 1E 01 00 */ stw r0, 0x100(r30)
/* 801FD168 001FA0A8 38 60 00 30 */ li r3, 0x30
@@ -3668,8 +3668,8 @@ lbl_801FD304:
/* 801FD330 001FA270 7F C3 F3 78 */ mr r3, r30
/* 801FD334 001FA274 4B FF FB B5 */ bl dMw_c_NS_checkCStickTrigger
lbl_801FD338:
/* 801FD338 001FA278 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801FD33C 001FA27C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801FD338 001FA278 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801FD33C 001FA27C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801FD340 001FA280 88 03 4F AD */ lbz r0, 0x4fad(r3)
/* 801FD344 001FA284 28 00 00 00 */ cmplwi r0, 0
/* 801FD348 001FA288 41 82 00 10 */ beq lbl_801FD358
@@ -3765,23 +3765,23 @@ dMw_c_NS__draw:
/* 801FD48C 001FA3CC 88 06 00 06 */ lbz r0, 6(r6)
/* 801FD490 001FA3D0 28 00 00 00 */ cmplwi r0, 0
/* 801FD494 001FA3D4 41 82 00 20 */ beq lbl_801FD4B4
/* 801FD498 001FA3D8 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801FD49C 001FA3DC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801FD498 001FA3D8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801FD49C 001FA3DC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801FD4A0 001FA3E0 38 63 5F 64 */ addi r3, r3, 0x5f64
/* 801FD4A4 001FA3E4 38 83 00 AC */ addi r4, r3, 0xac
/* 801FD4A8 001FA3E8 38 A3 00 B0 */ addi r5, r3, 0xb0
/* 801FD4AC 001FA3EC 4B E5 92 E9 */ bl dDlst_list_c_NS_set
/* 801FD4B0 001FA3F0 48 00 00 1C */ b lbl_801FD4CC
lbl_801FD4B4:
/* 801FD4B4 001FA3F4 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801FD4B8 001FA3F8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801FD4B4 001FA3F4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801FD4B8 001FA3F8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801FD4BC 001FA3FC 38 63 5F 64 */ addi r3, r3, 0x5f64
/* 801FD4C0 001FA400 38 83 01 B4 */ addi r4, r3, 0x1b4
/* 801FD4C4 001FA404 38 A3 01 B8 */ addi r5, r3, 0x1b8
/* 801FD4C8 001FA408 4B E5 92 CD */ bl dDlst_list_c_NS_set
lbl_801FD4CC:
/* 801FD4CC 001FA40C 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801FD4D0 001FA410 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l
/* 801FD4CC 001FA40C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801FD4D0 001FA410 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l
/* 801FD4D4 001FA414 88 04 5E B5 */ lbz r0, 0x5eb5(r4)
/* 801FD4D8 001FA418 28 00 00 01 */ cmplwi r0, 1
/* 801FD4DC 001FA41C 40 82 01 84 */ bne lbl_801FD660
@@ -3822,8 +3822,8 @@ lbl_801FD558:
/* 801FD558 001FA498 80 DF 01 24 */ lwz r6, 0x124(r31)
/* 801FD55C 001FA49C 28 06 00 00 */ cmplwi r6, 0
/* 801FD560 001FA4A0 41 82 00 1C */ beq lbl_801FD57C
/* 801FD564 001FA4A4 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801FD568 001FA4A8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801FD564 001FA4A4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801FD568 001FA4A8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801FD56C 001FA4AC 38 63 5F 64 */ addi r3, r3, 0x5f64
/* 801FD570 001FA4B0 38 83 01 B4 */ addi r4, r3, 0x1b4
/* 801FD574 001FA4B4 38 A3 01 B8 */ addi r5, r3, 0x1b8
@@ -3832,8 +3832,8 @@ lbl_801FD57C:
/* 801FD57C 001FA4BC 80 DF 01 28 */ lwz r6, 0x128(r31)
/* 801FD580 001FA4C0 28 06 00 00 */ cmplwi r6, 0
/* 801FD584 001FA4C4 41 82 00 1C */ beq lbl_801FD5A0
/* 801FD588 001FA4C8 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801FD58C 001FA4CC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801FD588 001FA4C8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801FD58C 001FA4CC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801FD590 001FA4D0 38 63 5F 64 */ addi r3, r3, 0x5f64
/* 801FD594 001FA4D4 38 83 01 B4 */ addi r4, r3, 0x1b4
/* 801FD598 001FA4D8 38 A3 01 B8 */ addi r5, r3, 0x1b8
@@ -3842,8 +3842,8 @@ lbl_801FD5A0:
/* 801FD5A0 001FA4E0 80 DF 01 2C */ lwz r6, 0x12c(r31)
/* 801FD5A4 001FA4E4 28 06 00 00 */ cmplwi r6, 0
/* 801FD5A8 001FA4E8 41 82 00 1C */ beq lbl_801FD5C4
/* 801FD5AC 001FA4EC 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801FD5B0 001FA4F0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801FD5AC 001FA4EC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801FD5B0 001FA4F0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801FD5B4 001FA4F4 38 63 5F 64 */ addi r3, r3, 0x5f64
/* 801FD5B8 001FA4F8 38 83 01 B4 */ addi r4, r3, 0x1b4
/* 801FD5BC 001FA4FC 38 A3 01 B8 */ addi r5, r3, 0x1b8
@@ -3852,8 +3852,8 @@ lbl_801FD5C4:
/* 801FD5C4 001FA504 80 DF 01 30 */ lwz r6, 0x130(r31)
/* 801FD5C8 001FA508 28 06 00 00 */ cmplwi r6, 0
/* 801FD5CC 001FA50C 41 82 00 1C */ beq lbl_801FD5E8
/* 801FD5D0 001FA510 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801FD5D4 001FA514 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801FD5D0 001FA510 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801FD5D4 001FA514 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801FD5D8 001FA518 38 63 5F 64 */ addi r3, r3, 0x5f64
/* 801FD5DC 001FA51C 38 83 01 B4 */ addi r4, r3, 0x1b4
/* 801FD5E0 001FA520 38 A3 01 B8 */ addi r5, r3, 0x1b8
@@ -3862,8 +3862,8 @@ lbl_801FD5E8:
/* 801FD5E8 001FA528 80 DF 01 34 */ lwz r6, 0x134(r31)
/* 801FD5EC 001FA52C 28 06 00 00 */ cmplwi r6, 0
/* 801FD5F0 001FA530 41 82 00 70 */ beq lbl_801FD660
/* 801FD5F4 001FA534 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801FD5F8 001FA538 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801FD5F4 001FA534 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801FD5F8 001FA538 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801FD5FC 001FA53C 38 63 5F 64 */ addi r3, r3, 0x5f64
/* 801FD600 001FA540 38 83 01 B4 */ addi r4, r3, 0x1b4
/* 801FD604 001FA544 38 A3 01 B8 */ addi r5, r3, 0x1b8
@@ -4520,8 +4520,8 @@ lbl_801FD8B0:
/* 801FDFEC 001FAF2C 38 00 00 03 */ li r0, 3
/* 801FDFF0 001FAF30 98 1F 00 04 */ stb r0, 4(r31)
/* 801FDFF4 001FAF34 38 00 00 01 */ li r0, 1
/* 801FDFF8 001FAF38 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801FDFFC 001FAF3C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801FDFF8 001FAF38 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801FDFFC 001FAF3C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801FE000 001FAF40 98 03 5E B5 */ stb r0, 0x5eb5(r3)
/* 801FE004 001FAF44 38 60 00 00 */ li r3, 0
/* 801FE008 001FAF48 38 80 00 00 */ li r4, 0
asm/d/menu/dmap/d_menu_dmap_map.s
+22 -22
View File
@@ -50,8 +50,8 @@ lbl_801C08CC:
/* 801C08F4 001BD834 88 9D 00 00 */ lbz r4, 0(r29)
/* 801C08F8 001BD838 28 04 00 FF */ cmplwi r4, 0xff
/* 801C08FC 001BD83C 41 82 02 28 */ beq lbl_801C0B24
/* 801C0900 001BD840 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801C0904 001BD844 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801C0900 001BD840 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801C0904 001BD844 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801C0908 001BD848 38 63 09 58 */ addi r3, r3, 0x958
/* 801C090C 001BD84C 4B E7 3E DD */ bl isTbox__12dSv_memBit_cCFi
/* 801C0910 001BD850 2C 03 00 00 */ cmpwi r3, 0
@@ -60,8 +60,8 @@ lbl_801C08CC:
/* 801C091C 001BD85C 48 00 02 08 */ b lbl_801C0B24
/* 801C0920 001BD860 57 40 06 3F */ clrlwi. r0, r26, 0x18
/* 801C0924 001BD864 41 82 02 00 */ beq lbl_801C0B24
/* 801C0928 001BD868 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801C092C 001BD86C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801C0928 001BD868 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801C092C 001BD86C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801C0930 001BD870 38 63 09 58 */ addi r3, r3, 0x958
/* 801C0934 001BD874 88 9D 00 00 */ lbz r4, 0(r29)
/* 801C0938 001BD878 4B E7 3E B1 */ bl isTbox__12dSv_memBit_cCFi
@@ -79,8 +79,8 @@ lbl_801C08CC:
/* 801C0968 001BD8A8 28 04 00 FF */ cmplwi r4, 0xff
/* 801C096C 001BD8AC 41 82 00 20 */ beq lbl_801C098C
/* 801C0970 001BD8B0 41 82 01 B4 */ beq lbl_801C0B24
/* 801C0974 001BD8B4 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801C0978 001BD8B8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801C0974 001BD8B4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801C0978 001BD8B8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801C097C 001BD8BC 38 63 09 58 */ addi r3, r3, 0x958
/* 801C0980 001BD8C0 4B E7 3E 69 */ bl isTbox__12dSv_memBit_cCFi
/* 801C0984 001BD8C4 2C 03 00 00 */ cmpwi r3, 0
@@ -90,8 +90,8 @@ lbl_801C098C:
/* 801C0990 001BD8D0 28 04 00 FF */ cmplwi r4, 0xff
/* 801C0994 001BD8D4 41 82 00 24 */ beq lbl_801C09B8
/* 801C0998 001BD8D8 41 82 01 8C */ beq lbl_801C0B24
/* 801C099C 001BD8DC 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801C09A0 001BD8E0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801C099C 001BD8DC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801C09A0 001BD8E0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801C09A4 001BD8E4 88 BD 00 01 */ lbz r5, 1(r29)
/* 801C09A8 001BD8E8 7C A5 07 74 */ extsb r5, r5
/* 801C09AC 001BD8EC 4B E7 49 B5 */ bl isSwitch__10dSv_info_cCFii
@@ -108,16 +108,16 @@ lbl_801C09B8:
/* 801C09D4 001BD914 28 04 00 FF */ cmplwi r4, 0xff
/* 801C09D8 001BD918 41 82 00 24 */ beq lbl_801C09FC
/* 801C09DC 001BD91C 41 82 01 48 */ beq lbl_801C0B24
/* 801C09E0 001BD920 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801C09E4 001BD924 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801C09E0 001BD920 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801C09E4 001BD924 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801C09E8 001BD928 88 BD 00 01 */ lbz r5, 1(r29)
/* 801C09EC 001BD92C 7C A5 07 74 */ extsb r5, r5
/* 801C09F0 001BD930 4B E7 49 71 */ bl isSwitch__10dSv_info_cCFii
/* 801C09F4 001BD934 2C 03 00 00 */ cmpwi r3, 0
/* 801C09F8 001BD938 41 82 01 2C */ beq lbl_801C0B24
lbl_801C09FC:
/* 801C09FC 001BD93C 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801C0A00 001BD940 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801C09FC 001BD93C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801C0A00 001BD940 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801C0A04 001BD944 38 63 09 58 */ addi r3, r3, 0x958
/* 801C0A08 001BD948 38 80 00 03 */ li r4, 3
/* 801C0A0C 001BD94C 4B E7 3F 29 */ bl isDungeonItem__12dSv_memBit_cCFi
@@ -131,8 +131,8 @@ lbl_801C09FC:
/* 801C0A2C 001BD96C 28 04 00 FF */ cmplwi r4, 0xff
/* 801C0A30 001BD970 41 82 00 20 */ beq lbl_801C0A50
/* 801C0A34 001BD974 41 82 00 F0 */ beq lbl_801C0B24
/* 801C0A38 001BD978 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801C0A3C 001BD97C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801C0A38 001BD978 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801C0A3C 001BD97C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801C0A40 001BD980 38 63 09 58 */ addi r3, r3, 0x958
/* 801C0A44 001BD984 4B E7 3D A5 */ bl isTbox__12dSv_memBit_cCFi
/* 801C0A48 001BD988 2C 03 00 00 */ cmpwi r3, 0
@@ -150,8 +150,8 @@ lbl_801C0A50:
/* 801C0A74 001BD9B4 28 04 00 FF */ cmplwi r4, 0xff
/* 801C0A78 001BD9B8 41 82 00 20 */ beq lbl_801C0A98
/* 801C0A7C 001BD9BC 41 82 00 A8 */ beq lbl_801C0B24
/* 801C0A80 001BD9C0 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801C0A84 001BD9C4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801C0A80 001BD9C0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801C0A84 001BD9C4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801C0A88 001BD9C8 38 63 09 58 */ addi r3, r3, 0x958
/* 801C0A8C 001BD9CC 4B E7 3D 5D */ bl isTbox__12dSv_memBit_cCFi
/* 801C0A90 001BD9D0 2C 03 00 00 */ cmpwi r3, 0
@@ -165,8 +165,8 @@ lbl_801C0A98:
/* 801C0AAC 001BD9EC 28 04 00 FF */ cmplwi r4, 0xff
/* 801C0AB0 001BD9F0 41 82 00 20 */ beq lbl_801C0AD0
/* 801C0AB4 001BD9F4 41 82 00 70 */ beq lbl_801C0B24
/* 801C0AB8 001BD9F8 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801C0ABC 001BD9FC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801C0AB8 001BD9F8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801C0ABC 001BD9FC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801C0AC0 001BDA00 38 63 09 58 */ addi r3, r3, 0x958
/* 801C0AC4 001BDA04 4B E7 3D 25 */ bl isTbox__12dSv_memBit_cCFi
/* 801C0AC8 001BDA08 2C 03 00 00 */ cmpwi r3, 0
@@ -174,8 +174,8 @@ lbl_801C0A98:
lbl_801C0AD0:
/* 801C0AD0 001BDA10 3B E0 00 01 */ li r31, 1
/* 801C0AD4 001BDA14 48 00 00 50 */ b lbl_801C0B24
/* 801C0AD8 001BDA18 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801C0ADC 001BDA1C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801C0AD8 001BDA18 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801C0ADC 001BDA1C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801C0AE0 001BDA20 3B C3 09 58 */ addi r30, r3, 0x958
/* 801C0AE4 001BDA24 7F C3 F3 78 */ mr r3, r30
/* 801C0AE8 001BDA28 38 80 00 03 */ li r4, 3
@@ -1377,8 +1377,8 @@ lbl_801C1B8C:
lbl_801C1BCC:
/* 801C1BCC 001BEB0C FF E0 00 90 */ fmr f31, f0
lbl_801C1BD0:
/* 801C1BD0 001BEB10 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801C1BD4 001BEB14 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801C1BD0 001BEB10 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801C1BD4 001BEB14 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801C1BD8 001BEB18 85 83 4E 20 */ lwzu r12, 0x4e20(r3)
/* 801C1BDC 001BEB1C 81 8C 00 BC */ lwz r12, 0xbc(r12)
/* 801C1BE0 001BEB20 7D 89 03 A6 */ mtctr r12
asm/d/menu/fmap/d_menu_fmap_map.s
+8 -8
View File
@@ -115,8 +115,8 @@ renderingFmap_c_NS_entry:
/* 801CE1F0 001CB130 EC 00 10 28 */ fsubs f0, f0, f2
/* 801CE1F4 001CB134 EC 01 00 32 */ fmuls f0, f1, f0
/* 801CE1F8 001CB138 D0 06 00 0C */ stfs f0, 0xc(r6)
/* 801CE1FC 001CB13C 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801CE200 001CB140 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801CE1FC 001CB13C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801CE200 001CB140 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801CE204 001CB144 38 63 5F 64 */ addi r3, r3, 0x5f64
/* 801CE208 001CB148 38 83 00 64 */ addi r4, r3, 0x64
/* 801CE20C 001CB14C 38 A3 00 68 */ addi r5, r3, 0x68
@@ -135,8 +135,8 @@ renderingFmap_c_NS_isSwitchSpecialOff:
/* 801CE234 001CB174 93 C1 00 08 */ stw r30, 8(r1)
/* 801CE238 001CB178 7C 9E 23 78 */ mr r30, r4
/* 801CE23C 001CB17C 3B E0 00 00 */ li r31, 0
/* 801CE240 001CB180 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801CE244 001CB184 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801CE240 001CB180 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801CE244 001CB184 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801CE248 001CB188 38 63 4E 00 */ addi r3, r3, 0x4e00
/* 801CE24C 001CB18C 3C 80 80 39 */ lis r4, lbl_8039623C@ha
/* 801CE250 001CB190 38 84 62 3C */ addi r4, r4, lbl_8039623C@l
@@ -194,8 +194,8 @@ lbl_801CE2EC:
/* 801CE310 001CB250 88 1F 00 01 */ lbz r0, 1(r31)
/* 801CE314 001CB254 28 00 00 00 */ cmplwi r0, 0
/* 801CE318 001CB258 40 82 00 24 */ bne lbl_801CE33C
/* 801CE31C 001CB25C 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801CE320 001CB260 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801CE31C 001CB25C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801CE320 001CB260 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801CE324 001CB264 88 9F 00 00 */ lbz r4, 0(r31)
/* 801CE328 001CB268 80 BE 00 9C */ lwz r5, 0x9c(r30)
/* 801CE32C 001CB26C 4B E6 70 35 */ bl isSwitch__10dSv_info_cCFii
@@ -203,8 +203,8 @@ lbl_801CE2EC:
/* 801CE334 001CB274 54 03 D9 7E */ srwi r3, r0, 5
/* 801CE338 001CB278 48 00 00 70 */ b lbl_801CE3A8
lbl_801CE33C:
/* 801CE33C 001CB27C 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801CE340 001CB280 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801CE33C 001CB27C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801CE340 001CB280 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801CE344 001CB284 88 9F 00 00 */ lbz r4, 0(r31)
/* 801CE348 001CB288 80 BE 00 9C */ lwz r5, 0x9c(r30)
/* 801CE34C 001CB28C 4B E6 70 15 */ bl isSwitch__10dSv_info_cCFii
asm/d/menu/item/d_menu_item_explain.s
+34 -34
View File
@@ -32,8 +32,8 @@ dMenu_ItemExplain_c:
/* 801DA7B4 001D76F4 38 03 D9 F4 */ addi r0, r3, lbl_803BD9F4@l
/* 801DA7B8 001D76F8 90 1F 00 00 */ stw r0, 0(r31)
/* 801DA7BC 001D76FC 90 9F 00 04 */ stw r4, 4(r31)
/* 801DA7C0 001D7700 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801DA7C4 001D7704 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801DA7C0 001D7700 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801DA7C4 001D7704 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801DA7C8 001D7708 80 03 5C 98 */ lwz r0, 0x5c98(r3)
/* 801DA7CC 001D770C 90 1F 00 08 */ stw r0, 8(r31)
/* 801DA7D0 001D7710 93 DF 00 B8 */ stw r30, 0xb8(r31)
@@ -49,8 +49,8 @@ dMenu_ItemExplain_c:
/* 801DA7F8 001D7738 98 1F 00 E0 */ stb r0, 0xe0(r31)
/* 801DA7FC 001D773C 98 1F 00 E7 */ stb r0, 0xe7(r31)
/* 801DA800 001D7740 98 1F 00 E3 */ stb r0, 0xe3(r31)
/* 801DA804 001D7744 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801DA808 001D7748 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801DA804 001D7744 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801DA808 001D7748 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801DA80C 001D774C 80 03 5C C0 */ lwz r0, 0x5cc0(r3)
/* 801DA810 001D7750 7C 15 00 40 */ cmplw r21, r0
/* 801DA814 001D7754 40 82 00 10 */ bne lbl_801DA824
@@ -412,8 +412,8 @@ lbl_801DAD48:
/* 801DAD5C 001D7C9C 80 63 00 04 */ lwz r3, 4(r3)
/* 801DAD60 001D7CA0 80 9F 00 84 */ lwz r4, 0x84(r31)
/* 801DAD64 001D7CA4 48 11 B9 09 */ bl J2DPane_NS_appendChild
/* 801DAD68 001D7CA8 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801DAD6C 001D7CAC 3B 83 61 C0 */ addi r28, r3, lbl_804061C0@l
/* 801DAD68 001D7CA8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801DAD6C 001D7CAC 3B 83 61 C0 */ addi r28, r3, g_dComIfG_gameInfo@l
/* 801DAD70 001D7CB0 82 DC 5D 30 */ lwz r22, 0x5d30(r28)
/* 801DAD74 001D7CB4 38 60 00 00 */ li r3, 0
/* 801DAD78 001D7CB8 48 04 35 51 */ bl dMeter2Info_getNumberTextureName
@@ -885,8 +885,8 @@ lbl_801DB40C:
/* 801DB40C 001D834C 38 00 00 00 */ li r0, 0
/* 801DB410 001D8350 90 1F 00 9C */ stw r0, 0x9c(r31)
lbl_801DB414:
/* 801DB414 001D8354 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801DB418 001D8358 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801DB414 001D8354 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801DB418 001D8358 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801DB41C 001D835C 80 63 5C 6C */ lwz r3, 0x5c6c(r3)
/* 801DB420 001D8360 81 83 00 00 */ lwz r12, 0(r3)
/* 801DB424 001D8364 81 8C 00 24 */ lwz r12, 0x24(r12)
@@ -1139,8 +1139,8 @@ dMenu_ItemExplain_c_NS_drawKantera:
/* 801DB7B0 001D86F0 C0 22 A8 C4 */ lfs f1, lbl_804542C4-_SDA2_BASE_(r2)
/* 801DB7B4 001D86F4 FC 40 08 90 */ fmr f2, f1
/* 801DB7B8 001D86F8 4B FD 34 3D */ bl dKantera_icon_c_NS_setScale
/* 801DB7BC 001D86FC 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801DB7C0 001D8700 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801DB7BC 001D86FC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801DB7C0 001D8700 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801DB7C4 001D8704 A0 A3 00 08 */ lhz r5, 8(r3)
/* 801DB7C8 001D8708 A0 83 00 06 */ lhz r4, 6(r3)
/* 801DB7CC 001D870C 80 7F 00 6C */ lwz r3, 0x6c(r31)
@@ -1186,8 +1186,8 @@ dMenu_ItemExplain_c_NS_open_init:
/* 801DB85C 001D879C 3B 80 FF FF */ li r28, -1
/* 801DB860 001D87A0 28 00 00 26 */ cmplwi r0, 0x26
/* 801DB864 001D87A4 40 82 00 B4 */ bne lbl_801DB918
/* 801DB868 001D87A8 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801DB86C 001D87AC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801DB868 001D87A8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801DB86C 001D87AC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801DB870 001D87B0 3B C3 4E 20 */ addi r30, r3, 0x4e20
/* 801DB874 001D87B4 7F C3 F3 78 */ mr r3, r30
/* 801DB878 001D87B8 81 9E 00 00 */ lwz r12, 0(r30)
@@ -1204,7 +1204,7 @@ lbl_801DB8A0:
/* 801DB8A0 001D87E0 38 1E 00 F9 */ addi r0, r30, 0xf9
/* 801DB8A4 001D87E4 54 03 06 3E */ clrlwi r3, r0, 0x18
/* 801DB8A8 001D87E8 38 80 00 01 */ li r4, 1
/* 801DB8AC 001D87EC 4B EB C6 35 */ bl checkItemGet
/* 801DB8AC 001D87EC 4B EB C6 35 */ bl checkItemGet__FUci
/* 801DB8B0 001D87F0 2C 03 00 00 */ cmpwi r3, 0
/* 801DB8B4 001D87F4 41 82 00 08 */ beq lbl_801DB8BC
/* 801DB8B8 001D87F8 3B BD 00 01 */ addi r29, r29, 1
@@ -1944,8 +1944,8 @@ dMenu_ItemExplain_c_NS_openExplain:
/* 801DC35C 001D929C 7C BD 2B 78 */ mr r29, r5
/* 801DC360 001D92A0 7C DE 33 78 */ mr r30, r6
/* 801DC364 001D92A4 7C FF 3B 78 */ mr r31, r7
/* 801DC368 001D92A8 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801DC36C 001D92AC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801DC368 001D92A8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801DC36C 001D92AC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801DC370 001D92B0 38 63 00 9C */ addi r3, r3, 0x9c
/* 801DC374 001D92B4 54 84 06 3E */ clrlwi r4, r4, 0x18
/* 801DC378 001D92B8 38 A0 00 00 */ li r5, 0
@@ -1987,8 +1987,8 @@ dMenu_ItemExplain_c_NS_openExplainDmap:
/* 801DC3F4 001D9334 7F 1E C3 78 */ mr r30, r24
/* 801DC3F8 001D9338 3B A0 00 00 */ li r29, 0
/* 801DC3FC 001D933C 3A C0 00 00 */ li r22, 0
/* 801DC400 001D9340 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801DC404 001D9344 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801DC400 001D9340 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801DC404 001D9344 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801DC408 001D9348 3B E3 4E 20 */ addi r31, r3, 0x4e20
/* 801DC40C 001D934C 7F E3 FB 78 */ mr r3, r31
/* 801DC410 001D9350 81 9F 00 00 */ lwz r12, 0(r31)
@@ -2007,7 +2007,7 @@ lbl_801DC440:
/* 801DC440 001D9380 38 1E 00 F9 */ addi r0, r30, 0xf9
/* 801DC444 001D9384 54 03 06 3E */ clrlwi r3, r0, 0x18
/* 801DC448 001D9388 38 80 00 01 */ li r4, 1
/* 801DC44C 001D938C 4B EB BA 95 */ bl checkItemGet
/* 801DC44C 001D938C 4B EB BA 95 */ bl checkItemGet__FUci
/* 801DC450 001D9390 2C 03 00 00 */ cmpwi r3, 0
/* 801DC454 001D9394 41 82 00 08 */ beq lbl_801DC45C
/* 801DC458 001D9398 3A D6 00 01 */ addi r22, r22, 1
@@ -2030,8 +2030,8 @@ lbl_801DC48C:
/* 801DC48C 001D93CC 57 C0 06 3E */ clrlwi r0, r30, 0x18
/* 801DC490 001D93D0 28 00 00 50 */ cmplwi r0, 0x50
/* 801DC494 001D93D4 40 82 00 38 */ bne lbl_801DC4CC
/* 801DC498 001D93D8 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801DC49C 001D93DC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801DC498 001D93D8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801DC49C 001D93DC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801DC4A0 001D93E0 38 63 00 CC */ addi r3, r3, 0xcc
/* 801DC4A4 001D93E4 38 80 00 4F */ li r4, 0x4f
/* 801DC4A8 001D93E8 4B E5 7A 21 */ bl isFirstBit__21dSv_player_get_item_cCFUc
@@ -2092,8 +2092,8 @@ lbl_801DC54C:
/* 801DC578 001D94B8 38 00 01 6D */ li r0, 0x16d
/* 801DC57C 001D94BC 90 17 00 CC */ stw r0, 0xcc(r23)
/* 801DC580 001D94C0 88 84 00 DC */ lbz r4, 0xdc(r4)
/* 801DC584 001D94C4 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801DC588 001D94C8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801DC584 001D94C4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801DC588 001D94C8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801DC58C 001D94CC 38 63 00 EC */ addi r3, r3, 0xec
/* 801DC590 001D94D0 4B E5 79 ED */ bl getBombNum__24dSv_player_item_record_cCFUc
/* 801DC594 001D94D4 54 60 06 3F */ clrlwi. r0, r3, 0x18
@@ -2108,8 +2108,8 @@ lbl_801DC5B0:
/* 801DC5B0 001D94F0 57 C0 06 3E */ clrlwi r0, r30, 0x18
/* 801DC5B4 001D94F4 28 00 00 46 */ cmplwi r0, 0x46
/* 801DC5B8 001D94F8 40 82 00 30 */ bne lbl_801DC5E8
/* 801DC5BC 001D94FC 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801DC5C0 001D9500 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801DC5BC 001D94FC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801DC5C0 001D9500 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801DC5C4 001D9504 80 63 5D AC */ lwz r3, 0x5dac(r3)
/* 801DC5C8 001D9508 81 83 06 28 */ lwz r12, 0x628(r3)
/* 801DC5CC 001D950C 81 8C 02 A0 */ lwz r12, 0x2a0(r12)
@@ -2172,8 +2172,8 @@ lbl_801DC67C:
/* 801DC69C 001D95DC 38 04 00 0F */ addi r0, r4, 0xf
/* 801DC6A0 001D95E0 7C 03 00 00 */ cmpw r3, r0
/* 801DC6A4 001D95E4 40 82 00 30 */ bne lbl_801DC6D4
/* 801DC6A8 001D95E8 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801DC6AC 001D95EC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801DC6A8 001D95E8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801DC6AC 001D95EC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801DC6B0 001D95F0 38 63 00 EC */ addi r3, r3, 0xec
/* 801DC6B4 001D95F4 4B E5 78 C9 */ bl getBombNum__24dSv_player_item_record_cCFUc
/* 801DC6B8 001D95F8 54 60 06 3F */ clrlwi. r0, r3, 0x18
@@ -2379,8 +2379,8 @@ lbl_801DC93C:
/* 801DC970 001D98B0 41 80 FF CC */ blt lbl_801DC93C
/* 801DC974 001D98B4 2C 1F 00 64 */ cmpwi r31, 0x64
/* 801DC978 001D98B8 40 80 00 BC */ bge lbl_801DCA34
/* 801DC97C 001D98BC 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801DC980 001D98C0 3B 83 61 C0 */ addi r28, r3, lbl_804061C0@l
/* 801DC97C 001D98BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801DC980 001D98C0 3B 83 61 C0 */ addi r28, r3, g_dComIfG_gameInfo@l
/* 801DC984 001D98C4 83 7C 5D 30 */ lwz r27, 0x5d30(r28)
/* 801DC988 001D98C8 38 00 00 0A */ li r0, 0xa
/* 801DC98C 001D98CC 7C 7F 03 D6 */ divw r3, r31, r0
@@ -2426,8 +2426,8 @@ lbl_801DC93C:
/* 801DCA2C 001D996C 98 03 00 B0 */ stb r0, 0xb0(r3)
/* 801DCA30 001D9970 48 00 01 0C */ b lbl_801DCB3C
lbl_801DCA34:
/* 801DCA34 001D9974 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801DCA38 001D9978 3B 83 61 C0 */ addi r28, r3, lbl_804061C0@l
/* 801DCA34 001D9974 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801DCA38 001D9978 3B 83 61 C0 */ addi r28, r3, g_dComIfG_gameInfo@l
/* 801DCA3C 001D997C 83 7C 5D 30 */ lwz r27, 0x5d30(r28)
/* 801DCA40 001D9980 38 00 00 64 */ li r0, 0x64
/* 801DCA44 001D9984 7C 7F 03 D6 */ divw r3, r31, r0
@@ -2505,8 +2505,8 @@ dMenu_ItemExplain_c_NS_getWarpMarkFlag:
/* 801DCB54 001D9A94 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 801DCB58 001D9A98 7C 08 02 A6 */ mflr r0
/* 801DCB5C 001D9A9C 90 01 00 14 */ stw r0, 0x14(r1)
/* 801DCB60 001D9AA0 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801DCB64 001D9AA4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801DCB60 001D9AA0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801DCB64 001D9AA4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801DCB68 001D9AA8 85 83 4E 20 */ lwzu r12, 0x4e20(r3)
/* 801DCB6C 001D9AAC 81 8C 00 BC */ lwz r12, 0xbc(r12)
/* 801DCB70 001D9AB0 7D 89 03 A6 */ mtctr r12
@@ -2518,8 +2518,8 @@ dMenu_ItemExplain_c_NS_getWarpMarkFlag:
/* 801DCB88 001D9AC8 4B E5 27 69 */ bl dComIfGs_getWarpMarkFlag
/* 801DCB8C 001D9ACC 48 00 00 20 */ b lbl_801DCBAC
lbl_801DCB90:
/* 801DCB90 001D9AD0 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801DCB94 001D9AD4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801DCB90 001D9AD0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801DCB94 001D9AD4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801DCB98 001D9AD8 88 03 00 98 */ lbz r0, 0x98(r3)
/* 801DCB9C 001D9ADC 7C 00 07 74 */ extsb r0, r0
/* 801DCBA0 001D9AE0 54 00 0F FE */ srwi r0, r0, 0x1f
asm/d/menu/map/d_menu_map_common.s
+2 -2
View File
@@ -1163,8 +1163,8 @@ lbl_801C3804:
/* 801C3888 001C07C8 7C 60 1B 78 */ mr r0, r3
lbl_801C388C:
/* 801C388C 001C07CC 90 1F 00 64 */ stw r0, 0x64(r31)
/* 801C3890 001C07D0 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801C3894 001C07D4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801C3890 001C07D0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801C3894 001C07D4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801C3898 001C07D8 80 03 5C BC */ lwz r0, 0x5cbc(r3)
/* 801C389C 001C07DC 7C 1E 00 40 */ cmplw r30, r0
/* 801C38A0 001C07E0 40 82 00 2C */ bne lbl_801C38CC
asm/d/menu/window/d_menu_window_HIO.s
+2 -2
View File
@@ -106,8 +106,8 @@ lbl_801F9C44:
/* 801F9C6C 001F6BAC 98 1F 00 F4 */ stb r0, 0xf4(r31)
/* 801F9C70 001F6BB0 98 1F 00 EA */ stb r0, 0xea(r31)
/* 801F9C74 001F6BB4 3B 60 00 00 */ li r27, 0
/* 801F9C78 001F6BB8 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801F9C7C 001F6BBC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801F9C78 001F6BB8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801F9C7C 001F6BBC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801F9C80 001F6BC0 3B 83 00 CC */ addi r28, r3, 0xcc
/* 801F9C84 001F6BC4 3B AD 81 CC */ addi r29, r13, lbl_8045074C-_SDA_BASE_
lbl_801F9C88: