mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-09-03 18:13:58 -04: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 20:30:55 -08: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
@@ -21,8 +21,8 @@ dMenu_Collect2D_c:
/* 801AFD7C 001ACCBC 90 DF 00 14 */ stw r6, 0x14(r31)
/* 801AFD80 001ACCC0 38 80 00 00 */ li r4, 0
/* 801AFD84 001ACCC4 90 9F 00 0C */ stw r4, 0xc(r31)
/* 801AFD88 001ACCC8 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801AFD8C 001ACCCC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801AFD88 001ACCC8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801AFD8C 001ACCCC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801AFD90 001ACCD0 80 63 5D B4 */ lwz r3, 0x5db4(r3)
/* 801AFD94 001ACCD4 80 03 05 74 */ lwz r0, 0x574(r3)
/* 801AFD98 001ACCD8 54 00 01 8C */ rlwinm r0, r0, 0, 6, 6
@@ -118,8 +118,8 @@ lbl_801AFEDC:
/* 801AFEE4 001ACE24 3C 80 80 39 */ lis r4, lbl_80395330@ha
/* 801AFEE8 001ACE28 38 84 53 30 */ addi r4, r4, lbl_80395330@l
/* 801AFEEC 001ACE2C 3C A0 01 02 */ lis r5, 0x102
/* 801AFEF0 001ACE30 3C C0 80 40 */ lis r6, lbl_804061C0@ha
/* 801AFEF4 001ACE34 3B C6 61 C0 */ addi r30, r6, lbl_804061C0@l
/* 801AFEF0 001ACE30 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha
/* 801AFEF4 001ACE34 3B C6 61 C0 */ addi r30, r6, g_dComIfG_gameInfo@l
/* 801AFEF8 001ACE38 80 DE 5C B8 */ lwz r6, 0x5cb8(r30)
/* 801AFEFC 001ACE3C 48 14 87 4D */ bl J2DScreen_NS_setPriority
/* 801AFF00 001ACE40 80 7F 00 18 */ lwz r3, 0x18(r31)
@@ -165,8 +165,8 @@ lbl_801AFF54:
/* 801AFF98 001ACED8 93 E3 00 04 */ stw r31, 4(r3)
lbl_801AFF9C:
/* 801AFF9C 001ACEDC 90 7F 00 88 */ stw r3, 0x88(r31)
/* 801AFFA0 001ACEE0 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801AFFA4 001ACEE4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801AFFA0 001ACEE0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801AFFA4 001ACEE4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801AFFA8 001ACEE8 80 63 5D 30 */ lwz r3, 0x5d30(r3)
/* 801AFFAC 001ACEEC 3C 80 54 49 */ lis r4, 0x54494D47@ha
/* 801AFFB0 001ACEF0 38 84 4D 47 */ addi r4, r4, 0x54494D47@l
@@ -562,8 +562,8 @@ lbl_801B050C:
lbl_801B0534:
/* 801B0534 001AD474 38 00 00 00 */ li r0, 0
/* 801B0538 001AD478 90 1F 01 68 */ stw r0, 0x168(r31)
/* 801B053C 001AD47C 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801B0540 001AD480 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801B053C 001AD47C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801B0540 001AD480 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801B0544 001AD484 80 63 5C B8 */ lwz r3, 0x5cb8(r3)
/* 801B0548 001AD488 81 83 00 00 */ lwz r12, 0(r3)
/* 801B054C 001AD48C 81 8C 00 24 */ lwz r12, 0x24(r12)
@@ -595,8 +595,8 @@ dMenu_Collect2D_c_NS_initialize:
.global dMenu_Collect2D_c_NS_isFishIconVisible
dMenu_Collect2D_c_NS_isFishIconVisible:
/* 801B05A8 001AD4E8 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801B05AC 001AD4EC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801B05A8 001AD4E8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801B05AC 001AD4EC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801B05B0 001AD4F0 A0 03 01 6C */ lhz r0, 0x16c(r3)
/* 801B05B4 001AD4F4 28 00 00 00 */ cmplwi r0, 0
/* 801B05B8 001AD4F8 40 82 00 54 */ bne lbl_801B060C
@@ -633,8 +633,8 @@ dMenu_Collect2D_c_NS_isSkillIconVisible:
/* 801B0620 001AD560 7C 08 02 A6 */ mflr r0
/* 801B0624 001AD564 90 01 00 14 */ stw r0, 0x14(r1)
/* 801B0628 001AD568 93 E1 00 0C */ stw r31, 0xc(r1)
/* 801B062C 001AD56C 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801B0630 001AD570 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801B062C 001AD56C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801B0630 001AD570 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801B0634 001AD574 3B E3 07 F0 */ addi r31, r3, 0x7f0
/* 801B0638 001AD578 7F E3 FB 78 */ mr r3, r31
/* 801B063C 001AD57C 3C 80 80 3A */ lis r4, lbl_803A7288@ha
@@ -1207,8 +1207,8 @@ lbl_801B0A10:
/* 801B0EEC 001ADE2C 98 1F 02 33 */ stb r0, 0x233(r31)
/* 801B0EF0 001ADE30 98 1F 02 39 */ stb r0, 0x239(r31)
/* 801B0EF4 001ADE34 3A 80 00 01 */ li r20, 1
/* 801B0EF8 001ADE38 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801B0EFC 001ADE3C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801B0EF8 001ADE38 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801B0EFC 001ADE3C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801B0F00 001ADE40 3A A3 00 CC */ addi r21, r3, 0xcc
/* 801B0F04 001ADE44 7E A3 AB 78 */ mr r3, r21
/* 801B0F08 001ADE48 38 80 00 28 */ li r4, 0x28
@@ -1221,8 +1221,8 @@ lbl_801B0A10:
/* 801B0F24 001ADE64 4B E8 2F A5 */ bl isFirstBit__21dSv_player_get_item_cCFUc
/* 801B0F28 001ADE68 2C 03 00 00 */ cmpwi r3, 0
/* 801B0F2C 001ADE6C 41 82 00 24 */ beq lbl_801B0F50
/* 801B0F30 001ADE70 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801B0F34 001ADE74 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801B0F30 001ADE70 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801B0F34 001ADE74 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801B0F38 001ADE78 38 63 07 F0 */ addi r3, r3, 0x7f0
/* 801B0F3C 001ADE7C 38 80 03 02 */ li r4, 0x302
/* 801B0F40 001ADE80 4B E8 3A 7D */ bl isEventBit__11dSv_event_cCFUs
@@ -1273,8 +1273,8 @@ lbl_801B0FE0:
/* 801B0FE8 001ADF28 4B E8 2E E1 */ bl isFirstBit__21dSv_player_get_item_cCFUc
/* 801B0FEC 001ADF2C 2C 03 00 00 */ cmpwi r3, 0
/* 801B0FF0 001ADF30 41 82 00 70 */ beq lbl_801B1060
/* 801B0FF4 001ADF34 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801B0FF8 001ADF38 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801B0FF4 001ADF34 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801B0FF8 001ADF38 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801B0FFC 001ADF3C 38 63 07 F0 */ addi r3, r3, 0x7f0
/* 801B1000 001ADF40 38 80 03 02 */ li r4, 0x302
/* 801B1004 001ADF44 4B E8 39 B9 */ bl isEventBit__11dSv_event_cCFUs
@@ -1318,8 +1318,8 @@ lbl_801B1090:
/* 801B1094 001ADFD4 30 03 FF FF */ addic r0, r3, -1
/* 801B1098 001ADFD8 7C 00 19 10 */ subfe r0, r0, r3
/* 801B109C 001ADFDC 98 1F 02 45 */ stb r0, 0x245(r31)
/* 801B10A0 001ADFE0 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801B10A4 001ADFE4 A0 03 61 C0 */ lhz r0, lbl_804061C0@l(r3)
/* 801B10A0 001ADFE0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801B10A4 001ADFE4 A0 03 61 C0 */ lhz r0, g_dComIfG_gameInfo@l(r3)
/* 801B10A8 001ADFE8 28 00 00 0F */ cmplwi r0, 0xf
/* 801B10AC 001ADFEC 40 81 00 10 */ ble lbl_801B10BC
/* 801B10B0 001ADFF0 38 00 00 01 */ li r0, 1
@@ -1422,8 +1422,8 @@ lbl_801B1204:
/* 801B1220 001AE160 98 9F 02 2F */ stb r4, 0x22f(r31)
/* 801B1224 001AE164 98 9F 02 35 */ stb r4, 0x235(r31)
/* 801B1228 001AE168 98 9F 02 3B */ stb r4, 0x23b(r31)
/* 801B122C 001AE16C 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801B1230 001AE170 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801B122C 001AE16C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801B1230 001AE170 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801B1234 001AE174 88 03 00 13 */ lbz r0, 0x13(r3)
/* 801B1238 001AE178 28 00 00 2E */ cmplwi r0, 0x2e
/* 801B123C 001AE17C 40 82 00 14 */ bne lbl_801B1250
@@ -1451,7 +1451,7 @@ lbl_801B1280:
/* 801B128C 001AE1CC 98 1F 02 30 */ stb r0, 0x230(r31)
/* 801B1290 001AE1D0 38 60 00 43 */ li r3, 0x43
/* 801B1294 001AE1D4 38 80 00 01 */ li r4, 1
/* 801B1298 001AE1D8 4B EE 6C 49 */ bl checkItemGet
/* 801B1298 001AE1D8 4B EE 6C 49 */ bl checkItemGet__FUci
/* 801B129C 001AE1DC 2C 03 00 00 */ cmpwi r3, 0
/* 801B12A0 001AE1E0 41 82 00 10 */ beq lbl_801B12B0
/* 801B12A4 001AE1E4 38 00 00 01 */ li r0, 1
@@ -1479,8 +1479,8 @@ lbl_801B12DC:
/* 801B12EC 001AE22C 98 9F 02 48 */ stb r4, 0x248(r31)
/* 801B12F0 001AE230 98 9F 02 4E */ stb r4, 0x24e(r31)
/* 801B12F4 001AE234 98 9F 02 54 */ stb r4, 0x254(r31)
/* 801B12F8 001AE238 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801B12FC 001AE23C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801B12F8 001AE238 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801B12FC 001AE23C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801B1300 001AE240 88 03 00 16 */ lbz r0, 0x16(r3)
/* 801B1304 001AE244 28 00 00 FF */ cmplwi r0, 0xff
/* 801B1308 001AE248 41 82 00 10 */ beq lbl_801B1318
@@ -1490,8 +1490,8 @@ lbl_801B12DC:
lbl_801B1318:
/* 801B1318 001AE258 98 9F 02 31 */ stb r4, 0x231(r31)
lbl_801B131C:
/* 801B131C 001AE25C 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801B1320 001AE260 3A 83 61 C0 */ addi r20, r3, lbl_804061C0@l
/* 801B131C 001AE25C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801B1320 001AE260 3A 83 61 C0 */ addi r20, r3, g_dComIfG_gameInfo@l
/* 801B1324 001AE264 88 14 01 0C */ lbz r0, 0x10c(r20)
/* 801B1328 001AE268 98 1F 02 37 */ stb r0, 0x237(r31)
/* 801B132C 001AE26C 7F E3 FB 78 */ mr r3, r31
@@ -1631,8 +1631,8 @@ lbl_801B14D0:
/* 801B1504 001AE444 38 00 01 95 */ li r0, 0x195
/* 801B1508 001AE448 B0 1F 01 C4 */ sth r0, 0x1c4(r31)
/* 801B150C 001AE44C B0 7F 01 D0 */ sth r3, 0x1d0(r31)
/* 801B1510 001AE450 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801B1514 001AE454 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801B1510 001AE450 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801B1514 001AE454 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801B1518 001AE458 4B E8 15 91 */ bl getRupeeMax__21dSv_player_status_a_cCFv
/* 801B151C 001AE45C 54 60 04 3E */ clrlwi r0, r3, 0x10
/* 801B1520 001AE460 28 00 01 2C */ cmplwi r0, 0x12c
@@ -1641,8 +1641,8 @@ lbl_801B14D0:
/* 801B152C 001AE46C B0 1F 01 8A */ sth r0, 0x18a(r31)
/* 801B1530 001AE470 48 00 00 30 */ b lbl_801B1560
lbl_801B1534:
/* 801B1534 001AE474 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801B1538 001AE478 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801B1534 001AE474 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801B1538 001AE478 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801B153C 001AE47C 4B E8 15 6D */ bl getRupeeMax__21dSv_player_status_a_cCFv
/* 801B1540 001AE480 54 60 04 3E */ clrlwi r0, r3, 0x10
/* 801B1544 001AE484 28 00 02 58 */ cmplwi r0, 0x258
@@ -1654,8 +1654,8 @@ lbl_801B1558:
/* 801B1558 001AE498 38 00 01 9B */ li r0, 0x19b
/* 801B155C 001AE49C B0 1F 01 8A */ sth r0, 0x18a(r31)
lbl_801B1560:
/* 801B1560 001AE4A0 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801B1564 001AE4A4 3B C3 61 C0 */ addi r30, r3, lbl_804061C0@l
/* 801B1560 001AE4A0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801B1564 001AE4A4 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l
/* 801B1568 001AE4A8 88 1E 00 F8 */ lbz r0, 0xf8(r30)
/* 801B156C 001AE4AC 28 00 00 1E */ cmplwi r0, 0x1e
/* 801B1570 001AE4B0 40 82 00 10 */ bne lbl_801B1580
@@ -1790,8 +1790,8 @@ lbl_801B16B4:
/* 801B1754 001AE694 48 08 6C 91 */ bl dMsgObject_c_NS_getSmellTypeMessageID
/* 801B1758 001AE698 38 03 01 00 */ addi r0, r3, 0x100
/* 801B175C 001AE69C B0 1F 01 E0 */ sth r0, 0x1e0(r31)
/* 801B1760 001AE6A0 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801B1764 001AE6A4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801B1760 001AE6A0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801B1764 001AE6A4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801B1768 001AE6A8 38 63 07 F0 */ addi r3, r3, 0x7f0
/* 801B176C 001AE6AC 3C 80 80 3A */ lis r4, lbl_803A7288@ha
/* 801B1770 001AE6B0 38 84 72 88 */ addi r4, r4, lbl_803A7288@l
@@ -2100,8 +2100,8 @@ lbl_801B1BB0:
/* 801B1BE4 001AEB24 88 9E 00 F8 */ lbz r4, 0xf8(r30)
/* 801B1BE8 001AEB28 7F E3 FB 78 */ mr r3, r31
/* 801B1BEC 001AEB2C 48 00 14 DD */ bl dMenu_Collect2D_c_NS_setArrowMaxNum
/* 801B1BF0 001AEB30 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801B1BF4 001AEB34 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801B1BF0 001AEB30 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801B1BF4 001AEB34 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801B1BF8 001AEB38 4B E8 0E B1 */ bl getRupeeMax__21dSv_player_status_a_cCFv
/* 801B1BFC 001AEB3C 7C 64 1B 78 */ mr r4, r3
/* 801B1C00 001AEB40 7F E3 FB 78 */ mr r3, r31
@@ -2142,8 +2142,8 @@ dMenu_Collect2D_c_NS_animationSet:
/* 801B1C80 001AEBC0 3C 80 80 39 */ lis r4, lbl_80395330@ha
/* 801B1C84 001AEBC4 38 84 53 30 */ addi r4, r4, lbl_80395330@l
/* 801B1C88 001AEBC8 38 64 00 56 */ addi r3, r4, 0x56
/* 801B1C8C 001AEBCC 3C 80 80 40 */ lis r4, lbl_804061C0@ha
/* 801B1C90 001AEBD0 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l
/* 801B1C8C 001AEBCC 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha
/* 801B1C90 001AEBD0 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l
/* 801B1C94 001AEBD4 80 84 5C B8 */ lwz r4, 0x5cb8(r4)
/* 801B1C98 001AEBD8 48 12 25 D9 */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader
/* 801B1C9C 001AEBDC 48 15 6D D1 */ bl J2DAnmLoaderDataBase_NS_load
@@ -3133,15 +3133,15 @@ lbl_801B2AA4:
/* 801B2AA8 001AF9E8 40 80 02 44 */ bge lbl_801B2CEC
/* 801B2AAC 001AF9EC 48 00 01 DC */ b lbl_801B2C88
lbl_801B2AB0:
/* 801B2AB0 001AF9F0 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801B2AB4 001AF9F4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801B2AB0 001AF9F0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801B2AB4 001AF9F4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801B2AB8 001AF9F8 38 63 00 CC */ addi r3, r3, 0xcc
/* 801B2ABC 001AF9FC 38 80 00 28 */ li r4, 0x28
/* 801B2AC0 001AFA00 4B E8 14 09 */ bl isFirstBit__21dSv_player_get_item_cCFUc
/* 801B2AC4 001AFA04 2C 03 00 00 */ cmpwi r3, 0
/* 801B2AC8 001AFA08 41 82 00 6C */ beq lbl_801B2B34
/* 801B2ACC 001AFA0C 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801B2AD0 001AFA10 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801B2ACC 001AFA0C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801B2AD0 001AFA10 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801B2AD4 001AFA14 88 03 00 14 */ lbz r0, 0x14(r3)
/* 801B2AD8 001AFA18 28 00 00 28 */ cmplwi r0, 0x28
/* 801B2ADC 001AFA1C 41 82 02 10 */ beq lbl_801B2CEC
@@ -3167,8 +3167,8 @@ lbl_801B2AB0:
/* 801B2B2C 001AFA6C 48 06 BE A5 */ bl dMeter2Info_set2DVibration
/* 801B2B30 001AFA70 48 00 01 BC */ b lbl_801B2CEC
lbl_801B2B34:
/* 801B2B34 001AFA74 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801B2B38 001AFA78 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801B2B34 001AFA74 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801B2B38 001AFA78 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801B2B3C 001AFA7C 88 03 00 14 */ lbz r0, 0x14(r3)
/* 801B2B40 001AFA80 28 00 00 3F */ cmplwi r0, 0x3f
/* 801B2B44 001AFA84 41 82 01 A8 */ beq lbl_801B2CEC
@@ -3194,15 +3194,15 @@ lbl_801B2B34:
/* 801B2B94 001AFAD4 48 06 BE 3D */ bl dMeter2Info_set2DVibration
/* 801B2B98 001AFAD8 48 00 01 54 */ b lbl_801B2CEC
lbl_801B2B9C:
/* 801B2B9C 001AFADC 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801B2BA0 001AFAE0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801B2B9C 001AFADC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801B2BA0 001AFAE0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801B2BA4 001AFAE4 38 63 00 CC */ addi r3, r3, 0xcc
/* 801B2BA8 001AFAE8 38 80 00 49 */ li r4, 0x49
/* 801B2BAC 001AFAEC 4B E8 13 1D */ bl isFirstBit__21dSv_player_get_item_cCFUc
/* 801B2BB0 001AFAF0 2C 03 00 00 */ cmpwi r3, 0
/* 801B2BB4 001AFAF4 41 82 00 6C */ beq lbl_801B2C20
/* 801B2BB8 001AFAF8 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801B2BBC 001AFAFC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801B2BB8 001AFAF8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801B2BBC 001AFAFC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801B2BC0 001AFB00 88 03 00 14 */ lbz r0, 0x14(r3)
/* 801B2BC4 001AFB04 28 00 00 49 */ cmplwi r0, 0x49
/* 801B2BC8 001AFB08 41 82 01 24 */ beq lbl_801B2CEC
@@ -3228,8 +3228,8 @@ lbl_801B2B9C:
/* 801B2C18 001AFB58 48 06 BD B9 */ bl dMeter2Info_set2DVibration
/* 801B2C1C 001AFB5C 48 00 00 D0 */ b lbl_801B2CEC
lbl_801B2C20:
/* 801B2C20 001AFB60 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801B2C24 001AFB64 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801B2C20 001AFB60 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801B2C24 001AFB64 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801B2C28 001AFB68 88 03 00 14 */ lbz r0, 0x14(r3)
/* 801B2C2C 001AFB6C 28 00 00 29 */ cmplwi r0, 0x29
/* 801B2C30 001AFB70 41 82 00 BC */ beq lbl_801B2CEC
@@ -3255,8 +3255,8 @@ lbl_801B2C20:
/* 801B2C80 001AFBC0 48 06 BD 51 */ bl dMeter2Info_set2DVibration
/* 801B2C84 001AFBC4 48 00 00 68 */ b lbl_801B2CEC
lbl_801B2C88:
/* 801B2C88 001AFBC8 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801B2C8C 001AFBCC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801B2C88 001AFBC8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801B2C8C 001AFBCC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801B2C90 001AFBD0 88 03 00 14 */ lbz r0, 0x14(r3)
/* 801B2C94 001AFBD4 28 00 00 49 */ cmplwi r0, 0x49
/* 801B2C98 001AFBD8 41 82 00 54 */ beq lbl_801B2CEC
@@ -3303,16 +3303,16 @@ dMenu_Collect2D_c_NS_changeShield:
/* 801B2D2C 001AFC6C 40 80 00 08 */ bge lbl_801B2D34
/* 801B2D30 001AFC70 48 00 01 9C */ b lbl_801B2ECC
lbl_801B2D34:
/* 801B2D34 001AFC74 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801B2D38 001AFC78 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801B2D34 001AFC74 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801B2D38 001AFC78 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801B2D3C 001AFC7C 3B E3 00 CC */ addi r31, r3, 0xcc
/* 801B2D40 001AFC80 7F E3 FB 78 */ mr r3, r31
/* 801B2D44 001AFC84 38 80 00 2B */ li r4, 0x2b
/* 801B2D48 001AFC88 4B E8 11 81 */ bl isFirstBit__21dSv_player_get_item_cCFUc
/* 801B2D4C 001AFC8C 2C 03 00 00 */ cmpwi r3, 0
/* 801B2D50 001AFC90 41 82 00 7C */ beq lbl_801B2DCC
/* 801B2D54 001AFC94 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801B2D58 001AFC98 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801B2D54 001AFC94 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801B2D58 001AFC98 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801B2D5C 001AFC9C 88 03 00 15 */ lbz r0, 0x15(r3)
/* 801B2D60 001AFCA0 28 00 00 2B */ cmplwi r0, 0x2b
/* 801B2D64 001AFCA4 41 82 01 68 */ beq lbl_801B2ECC
@@ -3322,8 +3322,8 @@ lbl_801B2D34:
/* 801B2D74 001AFCB4 7F C3 F3 78 */ mr r3, r30
/* 801B2D78 001AFCB8 38 80 00 00 */ li r4, 0
/* 801B2D7C 001AFCBC 48 00 0F 79 */ bl dMenu_Collect2D_c_NS_setEquipItemFrameColorShield
/* 801B2D80 001AFCC0 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801B2D84 001AFCC4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801B2D80 001AFCC0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801B2D84 001AFCC4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801B2D88 001AFCC8 80 63 5D B4 */ lwz r3, 0x5db4(r3)
/* 801B2D8C 001AFCCC 4B F8 D2 D9 */ bl daAlink_c_NS_setShieldChange
/* 801B2D90 001AFCD0 38 00 00 4F */ li r0, 0x4f
@@ -3347,8 +3347,8 @@ lbl_801B2DCC:
/* 801B2DD4 001AFD14 4B E8 10 F5 */ bl isFirstBit__21dSv_player_get_item_cCFUc
/* 801B2DD8 001AFD18 2C 03 00 00 */ cmpwi r3, 0
/* 801B2DDC 001AFD1C 41 82 00 F0 */ beq lbl_801B2ECC
/* 801B2DE0 001AFD20 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801B2DE4 001AFD24 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801B2DE0 001AFD20 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801B2DE4 001AFD24 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801B2DE8 001AFD28 88 03 00 15 */ lbz r0, 0x15(r3)
/* 801B2DEC 001AFD2C 28 00 00 2A */ cmplwi r0, 0x2a
/* 801B2DF0 001AFD30 41 82 00 DC */ beq lbl_801B2ECC
@@ -3358,8 +3358,8 @@ lbl_801B2DCC:
/* 801B2E00 001AFD40 7F C3 F3 78 */ mr r3, r30
/* 801B2E04 001AFD44 38 80 00 00 */ li r4, 0
/* 801B2E08 001AFD48 48 00 0E ED */ bl dMenu_Collect2D_c_NS_setEquipItemFrameColorShield
/* 801B2E0C 001AFD4C 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801B2E10 001AFD50 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801B2E0C 001AFD4C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801B2E10 001AFD50 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801B2E14 001AFD54 80 63 5D B4 */ lwz r3, 0x5db4(r3)
/* 801B2E18 001AFD58 4B F8 D2 4D */ bl daAlink_c_NS_setShieldChange
/* 801B2E1C 001AFD5C 38 00 00 4F */ li r0, 0x4f
@@ -3378,8 +3378,8 @@ lbl_801B2DCC:
/* 801B2E50 001AFD90 48 06 BB 81 */ bl dMeter2Info_set2DVibration
/* 801B2E54 001AFD94 48 00 00 78 */ b lbl_801B2ECC
lbl_801B2E58:
/* 801B2E58 001AFD98 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801B2E5C 001AFD9C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801B2E58 001AFD98 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801B2E5C 001AFD9C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801B2E60 001AFDA0 88 03 00 15 */ lbz r0, 0x15(r3)
/* 801B2E64 001AFDA4 28 00 00 2C */ cmplwi r0, 0x2c
/* 801B2E68 001AFDA8 41 82 00 64 */ beq lbl_801B2ECC
@@ -3389,8 +3389,8 @@ lbl_801B2E58:
/* 801B2E78 001AFDB8 7F C3 F3 78 */ mr r3, r30
/* 801B2E7C 001AFDBC 38 80 00 01 */ li r4, 1
/* 801B2E80 001AFDC0 48 00 0E 75 */ bl dMenu_Collect2D_c_NS_setEquipItemFrameColorShield
/* 801B2E84 001AFDC4 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801B2E88 001AFDC8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801B2E84 001AFDC4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801B2E88 001AFDC8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801B2E8C 001AFDCC 80 63 5D B4 */ lwz r3, 0x5db4(r3)
/* 801B2E90 001AFDD0 4B F8 D1 D5 */ bl daAlink_c_NS_setShieldChange
/* 801B2E94 001AFDD4 38 00 00 4F */ li r0, 0x4f
@@ -3434,8 +3434,8 @@ lbl_801B2F14:
/* 801B2F18 001AFE58 40 80 01 9C */ bge lbl_801B30B4
/* 801B2F1C 001AFE5C 48 00 01 14 */ b lbl_801B3030
lbl_801B2F20:
/* 801B2F20 001AFE60 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801B2F24 001AFE64 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801B2F20 001AFE60 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801B2F24 001AFE64 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801B2F28 001AFE68 88 03 00 13 */ lbz r0, 0x13(r3)
/* 801B2F2C 001AFE6C 28 00 00 2F */ cmplwi r0, 0x2f
/* 801B2F30 001AFE70 41 82 01 84 */ beq lbl_801B30B4
@@ -3445,8 +3445,8 @@ lbl_801B2F20:
/* 801B2F40 001AFE80 7F E3 FB 78 */ mr r3, r31
/* 801B2F44 001AFE84 38 80 00 00 */ li r4, 0
/* 801B2F48 001AFE88 48 00 10 95 */ bl dMenu_Collect2D_c_NS_setEquipItemFrameColorClothes
/* 801B2F4C 001AFE8C 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801B2F50 001AFE90 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801B2F4C 001AFE8C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801B2F50 001AFE90 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801B2F54 001AFE94 80 63 5D AC */ lwz r3, 0x5dac(r3)
/* 801B2F58 001AFE98 38 80 00 00 */ li r4, 0
/* 801B2F5C 001AFE9C 81 83 06 28 */ lwz r12, 0x628(r3)
@@ -3469,8 +3469,8 @@ lbl_801B2F20:
/* 801B2FA0 001AFEE0 48 06 BA 31 */ bl dMeter2Info_set2DVibration
/* 801B2FA4 001AFEE4 48 00 01 10 */ b lbl_801B30B4
lbl_801B2FA8:
/* 801B2FA8 001AFEE8 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801B2FAC 001AFEEC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801B2FA8 001AFEE8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801B2FAC 001AFEEC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801B2FB0 001AFEF0 88 03 00 13 */ lbz r0, 0x13(r3)
/* 801B2FB4 001AFEF4 28 00 00 31 */ cmplwi r0, 0x31
/* 801B2FB8 001AFEF8 41 82 00 FC */ beq lbl_801B30B4
@@ -3480,8 +3480,8 @@ lbl_801B2FA8:
/* 801B2FC8 001AFF08 7F E3 FB 78 */ mr r3, r31
/* 801B2FCC 001AFF0C 38 80 00 01 */ li r4, 1
/* 801B2FD0 001AFF10 48 00 10 0D */ bl dMenu_Collect2D_c_NS_setEquipItemFrameColorClothes
/* 801B2FD4 001AFF14 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801B2FD8 001AFF18 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801B2FD4 001AFF14 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801B2FD8 001AFF18 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801B2FDC 001AFF1C 80 63 5D AC */ lwz r3, 0x5dac(r3)
/* 801B2FE0 001AFF20 38 80 00 00 */ li r4, 0
/* 801B2FE4 001AFF24 81 83 06 28 */ lwz r12, 0x628(r3)
@@ -3504,8 +3504,8 @@ lbl_801B2FA8:
/* 801B3028 001AFF68 48 06 B9 A9 */ bl dMeter2Info_set2DVibration
/* 801B302C 001AFF6C 48 00 00 88 */ b lbl_801B30B4
lbl_801B3030:
/* 801B3030 001AFF70 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801B3034 001AFF74 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801B3030 001AFF70 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801B3034 001AFF74 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801B3038 001AFF78 88 03 00 13 */ lbz r0, 0x13(r3)
/* 801B303C 001AFF7C 28 00 00 30 */ cmplwi r0, 0x30
/* 801B3040 001AFF80 41 82 00 74 */ beq lbl_801B30B4
@@ -3515,8 +3515,8 @@ lbl_801B3030:
/* 801B3050 001AFF90 7F E3 FB 78 */ mr r3, r31
/* 801B3054 001AFF94 38 80 00 02 */ li r4, 2
/* 801B3058 001AFF98 48 00 0F 85 */ bl dMenu_Collect2D_c_NS_setEquipItemFrameColorClothes
/* 801B305C 001AFF9C 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801B3060 001AFFA0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801B305C 001AFF9C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801B3060 001AFFA0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801B3064 001AFFA4 80 63 5D AC */ lwz r3, 0x5dac(r3)
/* 801B3068 001AFFA8 38 80 00 00 */ li r4, 0
/* 801B306C 001AFFAC 81 83 06 28 */ lwz r12, 0x628(r3)
@@ -3849,8 +3849,8 @@ dMenu_Collect2D_c_NS_setSmellType:
/* 801B3534 001B0474 48 1A EC A5 */ bl _savegpr_28
/* 801B3538 001B0478 7C 7C 1B 78 */ mr r28, r3
/* 801B353C 001B047C 3B C0 FF FF */ li r30, -1
/* 801B3540 001B0480 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801B3544 001B0484 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801B3540 001B0480 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801B3544 001B0484 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801B3548 001B0488 88 03 00 16 */ lbz r0, 0x16(r3)
/* 801B354C 001B048C 2C 00 00 B3 */ cmpwi r0, 0xb3
/* 801B3550 001B0490 41 82 00 40 */ beq lbl_801B3590
@@ -3932,8 +3932,8 @@ dMenu_Collect2D_c_NS_setHeartPiece:
/* 801B364C 001B058C 39 61 00 20 */ addi r11, r1, 0x20
/* 801B3650 001B0590 48 1A EB 89 */ bl _savegpr_28
/* 801B3654 001B0594 7C 7C 1B 78 */ mr r28, r3
/* 801B3658 001B0598 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801B365C 001B059C A0 83 61 C0 */ lhz r4, lbl_804061C0@l(r3)
/* 801B3658 001B0598 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801B365C 001B059C A0 83 61 C0 */ lhz r4, g_dComIfG_gameInfo@l(r3)
/* 801B3660 001B05A0 38 60 00 05 */ li r3, 5
/* 801B3664 001B05A4 7C 04 1B D6 */ divw r0, r4, r3
/* 801B3668 001B05A8 7C 00 19 D6 */ mullw r0, r0, r3
@@ -4004,8 +4004,8 @@ lbl_801B3734:
/* 801B3750 001B0690 7F E0 20 50 */ subf r31, r0, r4
/* 801B3754 001B0694 3B A0 00 00 */ li r29, 0
/* 801B3758 001B0698 40 81 00 7C */ ble lbl_801B37D4
/* 801B375C 001B069C 3C 80 80 40 */ lis r4, lbl_804061C0@ha
/* 801B3760 001B06A0 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l
/* 801B375C 001B069C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha
/* 801B3760 001B06A0 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l
/* 801B3764 001B06A4 83 A4 5D 30 */ lwz r29, 0x5d30(r4)
/* 801B3768 001B06A8 48 06 AB 61 */ bl dMeter2Info_getNumberTextureName
/* 801B376C 001B06AC 7C 65 1B 78 */ mr r5, r3
@@ -4055,8 +4055,8 @@ lbl_801B3800:
/* 801B3814 001B0754 57 A0 06 3F */ clrlwi. r0, r29, 0x18
/* 801B3818 001B0758 41 82 00 78 */ beq lbl_801B3890
lbl_801B381C:
/* 801B381C 001B075C 3C 80 80 40 */ lis r4, lbl_804061C0@ha
/* 801B3820 001B0760 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l
/* 801B381C 001B075C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha
/* 801B3820 001B0760 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l
/* 801B3824 001B0764 83 A4 5D 30 */ lwz r29, 0x5d30(r4)
/* 801B3828 001B0768 48 06 AA A1 */ bl dMeter2Info_getNumberTextureName
/* 801B382C 001B076C 7C 65 1B 78 */ mr r5, r3
@@ -4097,8 +4097,8 @@ lbl_801B3890:
/* 801B38B4 001B07F4 38 00 00 00 */ li r0, 0
/* 801B38B8 001B07F8 98 03 00 B0 */ stb r0, 0xb0(r3)
lbl_801B38BC:
/* 801B38BC 001B07FC 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801B38C0 001B0800 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801B38BC 001B07FC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801B38C0 001B0800 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801B38C4 001B0804 83 A3 5D 30 */ lwz r29, 0x5d30(r3)
/* 801B38C8 001B0808 7F E3 FB 78 */ mr r3, r31
/* 801B38CC 001B080C 48 06 A9 FD */ bl dMeter2Info_getNumberTextureName
@@ -4180,8 +4180,8 @@ dMenu_Collect2D_c_NS_setEquipItemFrameColorSword:
/* 801B39E8 001B0928 7C 9E 23 78 */ mr r30, r4
/* 801B39EC 001B092C 2C 1E FF FF */ cmpwi r30, -1
/* 801B39F0 001B0930 40 82 01 BC */ bne lbl_801B3BAC
/* 801B39F4 001B0934 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801B39F8 001B0938 38 A3 61 C0 */ addi r5, r3, lbl_804061C0@l
/* 801B39F4 001B0934 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801B39F8 001B0938 38 A3 61 C0 */ addi r5, r3, g_dComIfG_gameInfo@l
/* 801B39FC 001B093C 88 85 00 14 */ lbz r4, 0x14(r5)
/* 801B3A00 001B0940 88 7D 02 5B */ lbz r3, 0x25b(r29)
/* 801B3A04 001B0944 54 80 06 3E */ clrlwi r0, r4, 0x18
@@ -4398,8 +4398,8 @@ dMenu_Collect2D_c_NS_setEquipItemFrameColorShield:
/* 801B3D0C 001B0C4C 7C 9E 23 78 */ mr r30, r4
/* 801B3D10 001B0C50 2C 1E FF FF */ cmpwi r30, -1
/* 801B3D14 001B0C54 40 82 01 80 */ bne lbl_801B3E94
/* 801B3D18 001B0C58 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801B3D1C 001B0C5C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801B3D18 001B0C58 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801B3D1C 001B0C5C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801B3D20 001B0C60 88 83 00 15 */ lbz r4, 0x15(r3)
/* 801B3D24 001B0C64 88 7D 02 5C */ lbz r3, 0x25c(r29)
/* 801B3D28 001B0C68 54 80 06 3E */ clrlwi r0, r4, 0x18
@@ -4598,8 +4598,8 @@ dMenu_Collect2D_c_NS_setEquipItemFrameColorClothes:
/* 801B3FF4 001B0F34 7C 9E 23 78 */ mr r30, r4
/* 801B3FF8 001B0F38 2C 1E FF FF */ cmpwi r30, -1
/* 801B3FFC 001B0F3C 40 82 01 94 */ bne lbl_801B4190
/* 801B4000 001B0F40 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801B4004 001B0F44 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801B4000 001B0F40 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801B4004 001B0F44 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801B4008 001B0F48 88 83 00 13 */ lbz r4, 0x13(r3)
/* 801B400C 001B0F4C 88 7D 02 5D */ lbz r3, 0x25d(r29)
/* 801B4010 001B0F50 54 80 06 3E */ clrlwi r0, r4, 0x18
@@ -5368,8 +5368,8 @@ lbl_801B4B0C:
lbl_801B4B1C:
/* 801B4B1C 001B1A5C 28 05 00 00 */ cmplwi r5, 0
/* 801B4B20 001B1A60 40 82 00 34 */ bne lbl_801B4B54
/* 801B4B24 001B1A64 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801B4B28 001B1A68 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801B4B24 001B1A64 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801B4B28 001B1A68 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801B4B2C 001B1A6C 80 63 5D AC */ lwz r3, 0x5dac(r3)
/* 801B4B30 001B1A70 81 83 06 28 */ lwz r12, 0x628(r3)
/* 801B4B34 001B1A74 81 8C 02 74 */ lwz r12, 0x274(r12)
@@ -5383,8 +5383,8 @@ lbl_801B4B1C:
lbl_801B4B54:
/* 801B4B54 001B1A94 28 05 00 01 */ cmplwi r5, 1
/* 801B4B58 001B1A98 40 82 00 34 */ bne lbl_801B4B8C
/* 801B4B5C 001B1A9C 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801B4B60 001B1AA0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801B4B5C 001B1A9C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801B4B60 001B1AA0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801B4B64 001B1AA4 80 63 5D AC */ lwz r3, 0x5dac(r3)
/* 801B4B68 001B1AA8 81 83 06 28 */ lwz r12, 0x628(r3)
/* 801B4B6C 001B1AAC 81 8C 02 70 */ lwz r12, 0x270(r12)
@@ -5398,8 +5398,8 @@ lbl_801B4B54:
lbl_801B4B8C:
/* 801B4B8C 001B1ACC 28 05 00 02 */ cmplwi r5, 2
/* 801B4B90 001B1AD0 40 82 02 6C */ bne lbl_801B4DFC
/* 801B4B94 001B1AD4 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801B4B98 001B1AD8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801B4B94 001B1AD4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801B4B98 001B1AD8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801B4B9C 001B1ADC 80 63 5D AC */ lwz r3, 0x5dac(r3)
/* 801B4BA0 001B1AE0 81 83 06 28 */ lwz r12, 0x628(r3)
/* 801B4BA4 001B1AE4 81 8C 02 6C */ lwz r12, 0x26c(r12)
@@ -5411,8 +5411,8 @@ lbl_801B4B8C:
/* 801B4BBC 001B1AFC 4B FF E3 29 */ bl dMenu_Collect2D_c_NS_changeClothe
/* 801B4BC0 001B1B00 48 00 02 3C */ b lbl_801B4DFC
lbl_801B4BC4:
/* 801B4BC4 001B1B04 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801B4BC8 001B1B08 3B C3 61 C0 */ addi r30, r3, lbl_804061C0@l
/* 801B4BC4 001B1B04 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801B4BC8 001B1B08 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l
/* 801B4BCC 001B1B0C 80 7E 5D AC */ lwz r3, 0x5dac(r30)
/* 801B4BD0 001B1B10 81 83 06 28 */ lwz r12, 0x628(r3)
/* 801B4BD4 001B1B14 81 8C 02 74 */ lwz r12, 0x274(r12)
@@ -5759,8 +5759,8 @@ lbl_801B5074:
/* 801B50C8 001B2008 48 11 9B 85 */ bl __nw__FUl
/* 801B50CC 001B200C 7C 60 1B 79 */ or. r0, r3, r3
/* 801B50D0 001B2010 41 82 00 1C */ beq lbl_801B50EC
/* 801B50D4 001B2014 3C 80 80 40 */ lis r4, lbl_804061C0@ha
/* 801B50D8 001B2018 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l
/* 801B50D4 001B2014 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha
/* 801B50D8 001B2018 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l
/* 801B50DC 001B201C 80 84 5C B8 */ lwz r4, 0x5cb8(r4)
/* 801B50E0 001B2020 80 BE 00 10 */ lwz r5, 0x10(r30)
/* 801B50E4 001B2024 48 02 CE 2D */ bl dMenu_Option_c
@@ -6619,8 +6619,8 @@ dMenu_Collect2D_c_NS__draw:
/* 801B5D7C 001B2CBC 93 E1 00 0C */ stw r31, 0xc(r1)
/* 801B5D80 001B2CC0 93 C1 00 08 */ stw r30, 8(r1)
/* 801B5D84 001B2CC4 7C 7F 1B 78 */ mr r31, r3
/* 801B5D88 001B2CC8 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801B5D8C 001B2CCC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801B5D88 001B2CC8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801B5D8C 001B2CCC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801B5D90 001B2CD0 83 C3 5F 50 */ lwz r30, 0x5f50(r3)
/* 801B5D94 001B2CD4 7F C3 F3 78 */ mr r3, r30
/* 801B5D98 001B2CD8 81 9E 00 00 */ lwz r12, 0(r30)
@@ -6740,8 +6740,8 @@ dMenu_Collect2D_c_NS_drawTop:
/* 801B5F4C 001B2E8C 7C 08 02 A6 */ mflr r0
/* 801B5F50 001B2E90 90 01 00 14 */ stw r0, 0x14(r1)
/* 801B5F54 001B2E94 7C 66 1B 78 */ mr r6, r3
/* 801B5F58 001B2E98 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801B5F5C 001B2E9C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801B5F58 001B2E98 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801B5F5C 001B2E9C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801B5F60 001B2EA0 38 63 5F 64 */ addi r3, r3, 0x5f64
/* 801B5F64 001B2EA4 38 83 00 AC */ addi r4, r3, 0xac
/* 801B5F68 001B2EA8 38 A3 00 B0 */ addi r5, r3, 0xb0
@@ -7119,8 +7119,8 @@ dMenu_Collect3D_c:
/* 801B64A8 001B33E8 38 C0 00 74 */ li r6, 0x74
/* 801B64AC 001B33EC 38 E0 00 06 */ li r7, 6
/* 801B64B0 001B33F0 48 1A B8 B1 */ bl func_80361D60
/* 801B64B4 001B33F4 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801B64B8 001B33F8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801B64B4 001B33F4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801B64B8 001B33F8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801B64BC 001B33FC 80 63 5D B4 */ lwz r3, 0x5db4(r3)
/* 801B64C0 001B3400 80 03 05 74 */ lwz r0, 0x574(r3)
/* 801B64C4 001B3404 54 00 01 8C */ rlwinm r0, r0, 0, 6, 6
@@ -7202,8 +7202,8 @@ dMenu_Collect3D_c_NS__create:
/* 801B65D8 001B3518 90 7F 00 08 */ stw r3, 8(r31)
/* 801B65DC 001B351C 80 7F 00 08 */ lwz r3, 8(r31)
/* 801B65E0 001B3520 4B E5 8B ED */ bl mDoExt_setCurrentHeap
/* 801B65E4 001B3524 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801B65E8 001B3528 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801B65E4 001B3524 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801B65E8 001B3528 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801B65EC 001B352C 80 63 5D B4 */ lwz r3, 0x5db4(r3)
/* 801B65F0 001B3530 28 03 00 00 */ cmplwi r3, 0
/* 801B65F4 001B3534 41 82 00 08 */ beq lbl_801B65FC
@@ -7257,8 +7257,8 @@ dMenu_Collect3D_c_NS__delete:
/* 801B6694 001B35D4 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 801B6698 001B35D8 7C 08 02 A6 */ mflr r0
/* 801B669C 001B35DC 90 01 00 14 */ stw r0, 0x14(r1)
/* 801B66A0 001B35E0 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801B66A4 001B35E4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801B66A0 001B35E0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801B66A4 001B35E4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801B66A8 001B35E8 80 63 5D B4 */ lwz r3, 0x5db4(r3)
/* 801B66AC 001B35EC 28 03 00 00 */ cmplwi r3, 0
/* 801B66B0 001B35F0 41 82 00 08 */ beq lbl_801B66B8
@@ -7338,8 +7338,8 @@ lbl_801B67B0:
/* 801B67B8 001B36F8 38 E0 00 80 */ li r7, 0x80
/* 801B67BC 001B36FC 48 0B 9D 85 */ bl cLib_addCalcAngleS
lbl_801B67C0:
/* 801B67C0 001B3700 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801B67C4 001B3704 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801B67C0 001B3700 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801B67C4 001B3704 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801B67C8 001B3708 80 63 5D B4 */ lwz r3, 0x5db4(r3)
/* 801B67CC 001B370C 28 03 00 00 */ cmplwi r3, 0
/* 801B67D0 001B3710 41 82 00 10 */ beq lbl_801B67E0
@@ -7462,8 +7462,8 @@ dMenu_Collect3D_c_NS_draw:
/* 801B6978 001B38B8 93 E1 00 0C */ stw r31, 0xc(r1)
/* 801B697C 001B38BC 93 C1 00 08 */ stw r30, 8(r1)
/* 801B6980 001B38C0 7C 7E 1B 78 */ mr r30, r3
/* 801B6984 001B38C4 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801B6988 001B38C8 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l
/* 801B6984 001B38C4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801B6988 001B38C8 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l
/* 801B698C 001B38CC 80 04 5F 98 */ lwz r0, 0x5f98(r4)
/* 801B6990 001B38D0 3C 60 80 43 */ lis r3, lbl_80434AC8@ha
/* 801B6994 001B38D4 3B E3 4A C8 */ addi r31, r3, lbl_80434AC8@l
@@ -7495,8 +7495,8 @@ lbl_801B69B4:
/* 801B69F8 001B3938 80 7E 00 18 */ lwz r3, 0x18(r30)
/* 801B69FC 001B393C 4B E5 72 C9 */ bl mDoExt_modelUpdateDL
lbl_801B6A00:
/* 801B6A00 001B3940 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801B6A04 001B3944 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801B6A00 001B3940 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801B6A04 001B3944 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801B6A08 001B3948 80 03 5F 80 */ lwz r0, 0x5f80(r3)
/* 801B6A0C 001B394C 90 1F 00 48 */ stw r0, 0x48(r31)
/* 801B6A10 001B3950 80 03 5F 84 */ lwz r0, 0x5f84(r3)
@@ -7519,8 +7519,8 @@ dMenu_Collect3D_c_NS_setJ3D:
/* 801B6A48 001B3988 7C 80 23 78 */ mr r0, r4
/* 801B6A4C 001B398C 7C BC 2B 78 */ mr r28, r5
/* 801B6A50 001B3990 7C DB 33 78 */ mr r27, r6
/* 801B6A54 001B3994 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801B6A58 001B3998 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801B6A54 001B3994 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801B6A58 001B3998 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801B6A5C 001B399C 83 A3 5C B8 */ lwz r29, 0x5cb8(r3)
/* 801B6A60 001B39A0 7F A3 EB 78 */ mr r3, r29
/* 801B6A64 001B39A4 3C 80 42 4D */ lis r4, 0x424D4420@ha
@@ -8226,8 +8226,8 @@ dMenu_Collect3D_c_NS_getCrystalNum:
/* 801B7444 001B4384 48 1A AD 99 */ bl _savegpr_29
/* 801B7448 001B4388 3B C0 00 00 */ li r30, 0
/* 801B744C 001B438C 3B A0 00 00 */ li r29, 0
/* 801B7450 001B4390 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801B7454 001B4394 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801B7450 001B4390 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801B7454 001B4394 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801B7458 001B4398 3B E3 01 00 */ addi r31, r3, 0x100
lbl_801B745C:
/* 801B745C 001B439C 7F E3 FB 78 */ mr r3, r31
@@ -8257,8 +8257,8 @@ dMenu_Collect3D_c_NS_getMirrorNum:
/* 801B74AC 001B43EC 48 1A AD 31 */ bl _savegpr_29
/* 801B74B0 001B43F0 3B C0 00 00 */ li r30, 0
/* 801B74B4 001B43F4 3B A0 00 00 */ li r29, 0
/* 801B74B8 001B43F8 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801B74BC 001B43FC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801B74B8 001B43F8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801B74BC 001B43FC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801B74C0 001B4400 3B E3 01 00 */ addi r31, r3, 0x100
lbl_801B74C4:
/* 801B74C4 001B4404 7F E3 FB 78 */ mr r3, r31
@@ -8292,16 +8292,16 @@ dMenu_Collect3D_c_NS_getMaskMdlVisible:
/* 801B7524 001B4464 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 801B7528 001B4468 41 82 00 70 */ beq lbl_801B7598
lbl_801B752C:
/* 801B752C 001B446C 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801B7530 001B4470 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801B752C 001B446C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801B7530 001B4470 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801B7534 001B4474 3B E3 07 F0 */ addi r31, r3, 0x7f0
/* 801B7538 001B4478 7F E3 FB 78 */ mr r3, r31
/* 801B753C 001B447C 38 80 0C 01 */ li r4, 0xc01
/* 801B7540 001B4480 4B E7 D4 7D */ bl isEventBit__11dSv_event_cCFUs
/* 801B7544 001B4484 2C 03 00 00 */ cmpwi r3, 0
/* 801B7548 001B4488 41 82 00 20 */ beq lbl_801B7568
/* 801B754C 001B448C 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801B7550 001B4490 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801B754C 001B448C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801B7550 001B4490 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801B7554 001B4494 38 63 01 00 */ addi r3, r3, 0x100
/* 801B7558 001B4498 38 80 00 00 */ li r4, 0
/* 801B755C 001B449C 4B E7 CD 35 */ bl isCollectMirror__20dSv_player_collect_cCFUc
@@ -8313,8 +8313,8 @@ lbl_801B7568:
/* 801B7570 001B44B0 4B E7 D4 4D */ bl isEventBit__11dSv_event_cCFUs
/* 801B7574 001B44B4 2C 03 00 00 */ cmpwi r3, 0
/* 801B7578 001B44B8 41 82 00 28 */ beq lbl_801B75A0
/* 801B757C 001B44BC 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801B7580 001B44C0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801B757C 001B44BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801B7580 001B44C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801B7584 001B44C4 38 63 01 00 */ addi r3, r3, 0x100
/* 801B7588 001B44C8 38 80 00 03 */ li r4, 3
/* 801B758C 001B44CC 4B E7 CC C1 */ bl isCollectCrystal__20dSv_player_collect_cCFUc
@@ -8324,8 +8324,8 @@ lbl_801B7598:
/* 801B7598 001B44D8 38 60 00 00 */ li r3, 0
/* 801B759C 001B44DC 48 00 00 38 */ b lbl_801B75D4
lbl_801B75A0:
/* 801B75A0 001B44E0 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801B75A4 001B44E4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801B75A0 001B44E0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801B75A4 001B44E4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801B75A8 001B44E8 38 63 01 00 */ addi r3, r3, 0x100
/* 801B75AC 001B44EC 38 80 00 03 */ li r4, 3
/* 801B75B0 001B44F0 4B E7 CC 9D */ bl isCollectCrystal__20dSv_player_collect_cCFUc
@@ -8471,8 +8471,8 @@ dMenu_Collect3D_c_NS_calcViewMtx:
/* 801B77B0 001B46F0 93 E1 00 0C */ stw r31, 0xc(r1)
/* 801B77B4 001B46F4 93 C1 00 08 */ stw r30, 8(r1)
/* 801B77B8 001B46F8 7C 7E 1B 78 */ mr r30, r3
/* 801B77BC 001B46FC 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801B77C0 001B4700 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801B77BC 001B46FC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801B77C0 001B4700 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801B77C4 001B4704 83 E3 5F 50 */ lwz r31, 0x5f50(r3)
/* 801B77C8 001B4708 7F E3 FB 78 */ mr r3, r31
/* 801B77CC 001B470C 81 9F 00 00 */ lwz r12, 0(r31)
@@ -8698,8 +8698,8 @@ dMenu_Collect_c_NS_draw:
/* 801B7AC8 001B4A08 90 01 00 14 */ stw r0, 0x14(r1)
/* 801B7ACC 001B4A0C 93 E1 00 0C */ stw r31, 0xc(r1)
/* 801B7AD0 001B4A10 7C 7F 1B 78 */ mr r31, r3
/* 801B7AD4 001B4A14 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801B7AD8 001B4A18 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801B7AD4 001B4A14 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801B7AD8 001B4A18 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801B7ADC 001B4A1C 38 63 5F 64 */ addi r3, r3, 0x5f64
/* 801B7AE0 001B4A20 38 83 01 B4 */ addi r4, r3, 0x1b4
/* 801B7AE4 001B4A24 38 A3 01 B8 */ addi r5, r3, 0x1b8
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
@@ -94,8 +94,8 @@ lbl_801E9224:
/* 801E9258 001E6198 D0 3F 06 1C */ stfs f1, 0x61c(r31)
/* 801E925C 001E619C D0 3F 06 20 */ stfs f1, 0x620(r31)
/* 801E9260 001E61A0 D0 3F 06 24 */ stfs f1, 0x624(r31)
/* 801E9264 001E61A4 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801E9268 001E61A8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801E9264 001E61A4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801E9268 001E61A8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801E926C 001E61AC 80 63 5D B4 */ lwz r3, 0x5db4(r3)
/* 801E9270 001E61B0 80 03 05 74 */ lwz r0, 0x574(r3)
/* 801E9274 001E61B4 54 00 01 8C */ rlwinm r0, r0, 0, 6, 6
@@ -273,8 +273,8 @@ lbl_801E94A4:
/* 801E94F4 001E6434 38 A5 00 04 */ addi r5, r5, 4
/* 801E94F8 001E6438 41 80 FF 8C */ blt lbl_801E9484
/* 801E94FC 001E643C 3A 60 00 00 */ li r19, 0
/* 801E9500 001E6440 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801E9504 001E6444 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801E9500 001E6440 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801E9504 001E6444 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801E9508 001E6448 3B A3 00 9C */ addi r29, r3, 0x9c
lbl_801E950C:
/* 801E950C 001E644C 7F A3 EB 78 */ mr r3, r29
@@ -310,8 +310,8 @@ lbl_801E955C:
/* 801E9574 001E64B4 2C 13 00 18 */ cmpwi r19, 0x18
/* 801E9578 001E64B8 41 80 FF E4 */ blt lbl_801E955C
/* 801E957C 001E64BC 3A C0 00 00 */ li r22, 0
/* 801E9580 001E64C0 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801E9584 001E64C4 3A A3 61 C0 */ addi r21, r3, lbl_804061C0@l
/* 801E9580 001E64C0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801E9584 001E64C4 3A A3 61 C0 */ addi r21, r3, g_dComIfG_gameInfo@l
/* 801E9588 001E64C8 7E B3 AB 78 */ mr r19, r21
/* 801E958C 001E64CC 48 00 00 A0 */ b lbl_801E962C
lbl_801E9590:
@@ -454,8 +454,8 @@ lbl_801E973C:
/* 801E9784 001E66C4 3A B5 00 0C */ addi r21, r21, 0xc
/* 801E9788 001E66C8 3B 18 00 18 */ addi r24, r24, 0x18
/* 801E978C 001E66CC 41 80 FE F4 */ blt lbl_801E9680
/* 801E9790 001E66D0 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801E9794 001E66D4 3B 63 61 C0 */ addi r27, r3, lbl_804061C0@l
/* 801E9790 001E66D0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801E9794 001E66D4 3B 63 61 C0 */ addi r27, r3, g_dComIfG_gameInfo@l
/* 801E9798 001E66D8 82 7B 5D 30 */ lwz r19, 0x5d30(r27)
/* 801E979C 001E66DC 38 60 00 00 */ li r3, 0
/* 801E97A0 001E66E0 48 03 4B 29 */ bl dMeter2Info_getNumberTextureName
@@ -507,8 +507,8 @@ lbl_801E9838:
/* 801E9848 001E6788 3C C0 80 39 */ lis r6, lbl_803978C8@ha
/* 801E984C 001E678C 38 C6 78 C8 */ addi r6, r6, lbl_803978C8@l
/* 801E9850 001E6790 3C E0 00 02 */ lis r7, 2
/* 801E9854 001E6794 3D 00 80 40 */ lis r8, lbl_804061C0@ha
/* 801E9858 001E6798 3B 88 61 C0 */ addi r28, r8, lbl_804061C0@l
/* 801E9854 001E6794 3D 00 80 40 */ lis r8, g_dComIfG_gameInfo@ha
/* 801E9858 001E6798 3B 88 61 C0 */ addi r28, r8, g_dComIfG_gameInfo@l
/* 801E985C 001E679C 81 1C 5C E8 */ lwz r8, 0x5ce8(r28)
/* 801E9860 001E67A0 48 06 B9 25 */ bl dPaneClass_setPriority
/* 801E9864 001E67A4 80 7F 00 58 */ lwz r3, 0x58(r31)
@@ -1778,8 +1778,8 @@ lbl_801EAB04:
lbl_801EAB2C:
/* 801EAB2C 001E7A6C 38 00 00 00 */ li r0, 0
/* 801EAB30 001E7A70 90 1F 03 70 */ stw r0, 0x370(r31)
/* 801EAB34 001E7A74 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801EAB38 001E7A78 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801EAB34 001E7A74 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801EAB38 001E7A78 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801EAB3C 001E7A7C 80 63 5C E8 */ lwz r3, 0x5ce8(r3)
/* 801EAB40 001E7A80 81 83 00 00 */ lwz r12, 0(r3)
/* 801EAB44 001E7A84 81 8C 00 24 */ lwz r12, 0x24(r12)
@@ -1902,8 +1902,8 @@ dMenu_Ring_c_NS__draw:
/* 801EACDC 001E7C1C 93 E1 00 9C */ stw r31, 0x9c(r1)
/* 801EACE0 001E7C20 93 C1 00 98 */ stw r30, 0x98(r1)
/* 801EACE4 001E7C24 7C 7E 1B 78 */ mr r30, r3
/* 801EACE8 001E7C28 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801EACEC 001E7C2C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801EACE8 001E7C28 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801EACEC 001E7C2C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801EACF0 001E7C30 83 E3 5F 50 */ lwz r31, 0x5f50(r3)
/* 801EACF4 001E7C34 7F E3 FB 78 */ mr r3, r31
/* 801EACF8 001E7C38 81 9F 00 00 */ lwz r12, 0(r31)
@@ -2268,8 +2268,8 @@ lbl_801EB20C:
/* 801EB22C 001E816C EC 01 00 2A */ fadds f0, f1, f0
/* 801EB230 001E8170 D0 03 00 58 */ stfs f0, 0x58(r3)
/* 801EB234 001E8174 D0 43 00 5C */ stfs f2, 0x5c(r3)
/* 801EB238 001E8178 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801EB23C 001E817C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801EB238 001E8178 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801EB23C 001E817C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801EB240 001E8180 38 63 00 9C */ addi r3, r3, 0x9c
/* 801EB244 001E8184 88 9E 06 90 */ lbz r4, 0x690(r30)
/* 801EB248 001E8188 38 A0 00 00 */ li r5, 0
@@ -2505,8 +2505,8 @@ lbl_801EB564:
/* 801EB588 001E84C8 EC 01 00 2A */ fadds f0, f1, f0
/* 801EB58C 001E84CC D0 04 00 58 */ stfs f0, 0x58(r4)
/* 801EB590 001E84D0 D0 44 00 5C */ stfs f2, 0x5c(r4)
/* 801EB594 001E84D4 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801EB598 001E84D8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801EB594 001E84D4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801EB598 001E84D8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801EB59C 001E84DC 38 63 00 9C */ addi r3, r3, 0x9c
/* 801EB5A0 001E84E0 88 1E 06 A8 */ lbz r0, 0x6a8(r30)
/* 801EB5A4 001E84E4 7C 9E 02 14 */ add r4, r30, r0
@@ -2961,8 +2961,8 @@ lbl_801EBBB4:
/* 801EBBD4 001E8B14 88 1E 06 B3 */ lbz r0, 0x6b3(r30)
/* 801EBBD8 001E8B18 28 00 00 00 */ cmplwi r0, 0
/* 801EBBDC 001E8B1C 40 82 01 18 */ bne lbl_801EBCF4
/* 801EBBE0 001E8B20 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801EBBE4 001E8B24 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801EBBE0 001E8B20 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801EBBE4 001E8B24 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801EBBE8 001E8B28 38 80 00 01 */ li r4, 1
/* 801EBBEC 001E8B2C 4B E4 6E 71 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi
/* 801EBBF0 001E8B30 88 1E 06 A8 */ lbz r0, 0x6a8(r30)
@@ -2971,8 +2971,8 @@ lbl_801EBBB4:
/* 801EBBFC 001E8B3C 54 60 06 3E */ clrlwi r0, r3, 0x18
/* 801EBC00 001E8B40 7C 04 00 40 */ cmplw r4, r0
/* 801EBC04 001E8B44 40 82 00 64 */ bne lbl_801EBC68
/* 801EBC08 001E8B48 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801EBC0C 001E8B4C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801EBC08 001E8B48 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801EBC0C 001E8B4C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801EBC10 001E8B50 38 80 00 00 */ li r4, 0
/* 801EBC14 001E8B54 4B E4 6E 49 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi
/* 801EBC18 001E8B58 7C 7A 1B 78 */ mr r26, r3
@@ -3006,8 +3006,8 @@ lbl_801EBC68:
/* 801EBC7C 001E8BBC 88 03 06 90 */ lbz r0, 0x690(r3)
/* 801EBC80 001E8BC0 7C 00 20 40 */ cmplw r0, r4
/* 801EBC84 001E8BC4 40 82 00 58 */ bne lbl_801EBCDC
/* 801EBC88 001E8BC8 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801EBC8C 001E8BCC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801EBC88 001E8BC8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801EBC8C 001E8BCC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801EBC90 001E8BD0 38 80 00 00 */ li r4, 0
/* 801EBC94 001E8BD4 4B E4 6D C9 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi
/* 801EBC98 001E8BD8 7C 7B 1B 78 */ mr r27, r3
@@ -3039,8 +3039,8 @@ lbl_801EBCDC:
lbl_801EBCF4:
/* 801EBCF4 001E8C34 28 00 00 01 */ cmplwi r0, 1
/* 801EBCF8 001E8C38 40 82 01 14 */ bne lbl_801EBE0C
/* 801EBCFC 001E8C3C 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801EBD00 001E8C40 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801EBCFC 001E8C3C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801EBD00 001E8C40 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801EBD04 001E8C44 38 80 00 00 */ li r4, 0
/* 801EBD08 001E8C48 4B E4 6D 55 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi
/* 801EBD0C 001E8C4C 88 1E 06 A8 */ lbz r0, 0x6a8(r30)
@@ -3049,8 +3049,8 @@ lbl_801EBCF4:
/* 801EBD18 001E8C58 54 60 06 3E */ clrlwi r0, r3, 0x18
/* 801EBD1C 001E8C5C 7C 04 00 40 */ cmplw r4, r0
/* 801EBD20 001E8C60 40 82 00 64 */ bne lbl_801EBD84
/* 801EBD24 001E8C64 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801EBD28 001E8C68 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801EBD24 001E8C64 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801EBD28 001E8C68 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801EBD2C 001E8C6C 38 80 00 01 */ li r4, 1
/* 801EBD30 001E8C70 4B E4 6D 2D */ bl getSelectItemIndex__21dSv_player_status_a_cCFi
/* 801EBD34 001E8C74 7C 79 1B 78 */ mr r25, r3
@@ -3084,8 +3084,8 @@ lbl_801EBD84:
/* 801EBD98 001E8CD8 88 03 06 90 */ lbz r0, 0x690(r3)
/* 801EBD9C 001E8CDC 7C 00 20 40 */ cmplw r0, r4
/* 801EBDA0 001E8CE0 40 82 00 58 */ bne lbl_801EBDF8
/* 801EBDA4 001E8CE4 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801EBDA8 001E8CE8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801EBDA4 001E8CE4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801EBDA8 001E8CE8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801EBDAC 001E8CEC 38 80 00 01 */ li r4, 1
/* 801EBDB0 001E8CF0 4B E4 6C AD */ bl getSelectItemIndex__21dSv_player_status_a_cCFi
/* 801EBDB4 001E8CF4 7C 7C 1B 78 */ mr r28, r3
@@ -3241,8 +3241,8 @@ lbl_801EBFB8:
/* 801EBFD0 001E8F10 D0 1E 05 38 */ stfs f0, 0x538(r30)
/* 801EBFD4 001E8F14 C0 03 00 1C */ lfs f0, 0x1c(r3)
/* 801EBFD8 001E8F18 D0 1E 05 3C */ stfs f0, 0x53c(r30)
/* 801EBFDC 001E8F1C 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801EBFE0 001E8F20 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801EBFDC 001E8F1C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801EBFE0 001E8F20 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801EBFE4 001E8F24 38 80 00 00 */ li r4, 0
/* 801EBFE8 001E8F28 4B E4 6A 75 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi
/* 801EBFEC 001E8F2C 88 9E 06 B4 */ lbz r4, 0x6b4(r30)
@@ -3268,8 +3268,8 @@ lbl_801EC020:
/* 801EC034 001E8F74 D0 1E 05 38 */ stfs f0, 0x538(r30)
/* 801EC038 001E8F78 C0 03 00 14 */ lfs f0, 0x14(r3)
/* 801EC03C 001E8F7C D0 1E 05 3C */ stfs f0, 0x53c(r30)
/* 801EC040 001E8F80 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801EC044 001E8F84 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801EC040 001E8F80 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801EC044 001E8F84 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801EC048 001E8F88 38 80 00 01 */ li r4, 1
/* 801EC04C 001E8F8C 4B E4 6A 11 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi
/* 801EC050 001E8F90 88 9E 06 B5 */ lbz r4, 0x6b5(r30)
@@ -3406,8 +3406,8 @@ dMenu_Ring_c_NS_setScale:
/* 801EC224 001E9164 3B E0 00 00 */ li r31, 0
/* 801EC228 001E9168 3C 60 80 43 */ lis r3, lbl_8042FAFC@ha
/* 801EC22C 001E916C 3B 83 FA FC */ addi r28, r3, lbl_8042FAFC@l
/* 801EC230 001E9170 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801EC234 001E9174 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801EC230 001E9170 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801EC234 001E9174 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801EC238 001E9178 3B 63 00 9C */ addi r27, r3, 0x9c
/* 801EC23C 001E917C 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801EC240 001E9180 3B A3 01 88 */ addi r29, r3, lbl_80430188@l
@@ -3618,8 +3618,8 @@ dMenu_Ring_c_NS_setActiveCursor:
/* 801EC510 001E9450 93 E1 00 1C */ stw r31, 0x1c(r1)
/* 801EC514 001E9454 93 C1 00 18 */ stw r30, 0x18(r1)
/* 801EC518 001E9458 7C 7F 1B 78 */ mr r31, r3
/* 801EC51C 001E945C 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801EC520 001E9460 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801EC51C 001E945C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801EC520 001E9460 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801EC524 001E9464 38 63 00 9C */ addi r3, r3, 0x9c
/* 801EC528 001E9468 88 1F 06 A8 */ lbz r0, 0x6a8(r31)
/* 801EC52C 001E946C 7C 9F 02 14 */ add r4, r31, r0
@@ -3777,8 +3777,8 @@ dMenu_Ring_c_NS_setMixItem:
/* 801EC760 001E96A0 39 61 00 40 */ addi r11, r1, 0x40
/* 801EC764 001E96A4 48 17 5A 71 */ bl _savegpr_27
/* 801EC768 001E96A8 7C 7B 1B 78 */ mr r27, r3
/* 801EC76C 001E96AC 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801EC770 001E96B0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801EC76C 001E96AC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801EC770 001E96B0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801EC774 001E96B4 38 63 00 9C */ addi r3, r3, 0x9c
/* 801EC778 001E96B8 88 1B 06 A8 */ lbz r0, 0x6a8(r27)
/* 801EC77C 001E96BC 7C 9B 02 14 */ add r4, r27, r0
@@ -3787,13 +3787,13 @@ dMenu_Ring_c_NS_setMixItem:
/* 801EC788 001E96C8 4B E4 68 A9 */ bl getItem__17dSv_player_item_cCFib
/* 801EC78C 001E96CC 7C 7F 1B 78 */ mr r31, r3
/* 801EC790 001E96D0 3B 80 00 00 */ li r28, 0
/* 801EC794 001E96D4 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801EC798 001E96D8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801EC794 001E96D4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801EC798 001E96D8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801EC79C 001E96DC 38 80 00 00 */ li r4, 0
/* 801EC7A0 001E96E0 4B E4 62 BD */ bl getSelectItemIndex__21dSv_player_status_a_cCFi
/* 801EC7A4 001E96E4 7C 7E 1B 78 */ mr r30, r3
/* 801EC7A8 001E96E8 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801EC7AC 001E96EC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801EC7A8 001E96E8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801EC7AC 001E96EC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801EC7B0 001E96F0 38 80 00 01 */ li r4, 1
/* 801EC7B4 001E96F4 4B E4 62 A9 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi
/* 801EC7B8 001E96F8 7C 7D 1B 78 */ mr r29, r3
@@ -3804,8 +3804,8 @@ dMenu_Ring_c_NS_setMixItem:
/* 801EC7CC 001E970C 54 60 06 3E */ clrlwi r0, r3, 0x18
/* 801EC7D0 001E9710 28 00 00 04 */ cmplwi r0, 4
/* 801EC7D4 001E9714 40 82 00 94 */ bne lbl_801EC868
/* 801EC7D8 001E9718 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801EC7DC 001E971C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801EC7D8 001E9718 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801EC7DC 001E971C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801EC7E0 001E9720 38 80 00 00 */ li r4, 0
/* 801EC7E4 001E9724 4B E4 62 79 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi
/* 801EC7E8 001E9728 88 1B 06 A8 */ lbz r0, 0x6a8(r27)
@@ -3846,8 +3846,8 @@ lbl_801EC868:
/* 801EC870 001E97B0 54 60 06 3E */ clrlwi r0, r3, 0x18
/* 801EC874 001E97B4 28 00 00 04 */ cmplwi r0, 4
/* 801EC878 001E97B8 40 82 00 94 */ bne lbl_801EC90C
/* 801EC87C 001E97BC 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801EC880 001E97C0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801EC87C 001E97BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801EC880 001E97C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801EC884 001E97C4 38 80 00 01 */ li r4, 1
/* 801EC888 001E97C8 4B E4 61 D5 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi
/* 801EC88C 001E97CC 88 1B 06 A8 */ lbz r0, 0x6a8(r27)
@@ -3893,8 +3893,8 @@ lbl_801EC924:
/* 801EC924 001E9864 2C 00 00 73 */ cmpwi r0, 0x73
/* 801EC928 001E9868 40 80 01 98 */ bge lbl_801ECAC0
lbl_801EC92C:
/* 801EC92C 001E986C 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801EC930 001E9870 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801EC92C 001E986C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801EC930 001E9870 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801EC934 001E9874 38 80 00 00 */ li r4, 0
/* 801EC938 001E9878 4B E4 61 25 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi
/* 801EC93C 001E987C 54 60 06 3E */ clrlwi r0, r3, 0x18
@@ -3947,8 +3947,8 @@ lbl_801EC970:
/* 801EC9F0 001E9930 98 BB 06 AB */ stb r5, 0x6ab(r27)
/* 801EC9F4 001E9934 48 00 00 CC */ b lbl_801ECAC0
lbl_801EC9F8:
/* 801EC9F8 001E9938 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801EC9FC 001E993C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801EC9F8 001E9938 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801EC9FC 001E993C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801ECA00 001E9940 38 80 00 01 */ li r4, 1
/* 801ECA04 001E9944 4B E4 60 59 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi
/* 801ECA08 001E9948 54 60 06 3E */ clrlwi r0, r3, 0x18
@@ -4110,8 +4110,8 @@ lbl_801ECC00:
/* 801ECC4C 001E9B8C 3B A0 00 00 */ li r29, 0
/* 801ECC50 001E9B90 3B 40 00 00 */ li r26, 0
/* 801ECC54 001E9B94 3B 20 00 00 */ li r25, 0
/* 801ECC58 001E9B98 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801ECC5C 001E9B9C 3A E3 61 C0 */ addi r23, r3, lbl_804061C0@l
/* 801ECC58 001E9B98 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801ECC5C 001E9B9C 3A E3 61 C0 */ addi r23, r3, g_dComIfG_gameInfo@l
/* 801ECC60 001E9BA0 3A 77 00 9C */ addi r19, r23, 0x9c
/* 801ECC64 001E9BA4 48 00 02 F4 */ b lbl_801ECF58
lbl_801ECC68:
@@ -4380,8 +4380,8 @@ lbl_801ECFE4:
/* 801ED044 001E9F84 3C 60 80 43 */ lis r3, lbl_8042FAFC@ha
/* 801ED048 001E9F88 3B C3 FA FC */ addi r30, r3, lbl_8042FAFC@l
/* 801ED04C 001E9F8C 7F 57 A2 14 */ add r26, r23, r20
/* 801ED050 001E9F90 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801ED054 001E9F94 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l
/* 801ED050 001E9F90 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801ED054 001E9F94 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l
/* 801ED058 001E9F98 3B 9F 00 9C */ addi r28, r31, 0x9c
/* 801ED05C 001E9F9C 3B 79 06 90 */ addi r27, r25, 0x690
lbl_801ED060:
@@ -4576,8 +4576,8 @@ lbl_801ED30C:
/* 801ED328 001EA268 93 E1 00 1C */ stw r31, 0x1c(r1)
/* 801ED32C 001EA26C 93 C1 00 18 */ stw r30, 0x18(r1)
/* 801ED330 001EA270 7C 7F 1B 78 */ mr r31, r3
/* 801ED334 001EA274 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801ED338 001EA278 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801ED334 001EA274 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801ED338 001EA278 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801ED33C 001EA27C 38 63 00 9C */ addi r3, r3, 0x9c
/* 801ED340 001EA280 88 1F 06 A8 */ lbz r0, 0x6a8(r31)
/* 801ED344 001EA284 7C 9F 02 14 */ add r4, r31, r0
@@ -4836,8 +4836,8 @@ lbl_801ED6B4:
/* 801ED6F4 001EA634 C0 03 03 8C */ lfs f0, 0x38c(r3)
/* 801ED6F8 001EA638 D0 04 00 58 */ stfs f0, 0x58(r4)
/* 801ED6FC 001EA63C D0 24 00 5C */ stfs f1, 0x5c(r4)
/* 801ED700 001EA640 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801ED704 001EA644 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801ED700 001EA640 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801ED704 001EA644 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801ED708 001EA648 38 63 00 9C */ addi r3, r3, 0x9c
/* 801ED70C 001EA64C 88 1F 06 A8 */ lbz r0, 0x6a8(r31)
/* 801ED710 001EA650 7C 9F 02 14 */ add r4, r31, r0
@@ -4924,8 +4924,8 @@ lbl_801ED7FC:
/* 801ED834 001EA774 C0 03 03 8C */ lfs f0, 0x38c(r3)
/* 801ED838 001EA778 D0 04 00 58 */ stfs f0, 0x58(r4)
/* 801ED83C 001EA77C D0 24 00 5C */ stfs f1, 0x5c(r4)
/* 801ED840 001EA780 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801ED844 001EA784 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801ED840 001EA780 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801ED844 001EA784 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801ED848 001EA788 38 63 00 9C */ addi r3, r3, 0x9c
/* 801ED84C 001EA78C 88 1F 06 A8 */ lbz r0, 0x6a8(r31)
/* 801ED850 001EA790 7C 9F 02 14 */ add r4, r31, r0
@@ -5452,8 +5452,8 @@ dMenu_Ring_c_NS_getCursorPos:
/* 801EDFEC 001EAF2C 48 17 41 ED */ bl _savegpr_28
/* 801EDFF0 001EAF30 7C 7C 1B 78 */ mr r28, r3
/* 801EDFF4 001EAF34 3B A0 00 00 */ li r29, 0
/* 801EDFF8 001EAF38 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801EDFFC 001EAF3C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801EDFF8 001EAF38 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801EDFFC 001EAF3C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801EE000 001EAF40 3B C3 00 9C */ addi r30, r3, 0x9c
/* 801EE004 001EAF44 54 9F 06 3E */ clrlwi r31, r4, 0x18
/* 801EE008 001EAF48 48 00 00 28 */ b lbl_801EE030
@@ -5487,8 +5487,8 @@ dMenu_Ring_c_NS_getItemNum:
/* 801EE05C 001EAF9C 7C 08 02 A6 */ mflr r0
/* 801EE060 001EAFA0 90 01 00 14 */ stw r0, 0x14(r1)
/* 801EE064 001EAFA4 93 E1 00 0C */ stw r31, 0xc(r1)
/* 801EE068 001EAFA8 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801EE06C 001EAFAC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801EE068 001EAFA8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801EE06C 001EAFAC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801EE070 001EAFB0 38 63 00 9C */ addi r3, r3, 0x9c
/* 801EE074 001EAFB4 54 9F 06 3E */ clrlwi r31, r4, 0x18
/* 801EE078 001EAFB8 7F E4 FB 78 */ mr r4, r31
@@ -5524,8 +5524,8 @@ lbl_801EE0E0:
/* 801EE0E0 001EB020 38 80 00 00 */ li r4, 0
/* 801EE0E4 001EB024 48 00 00 60 */ b lbl_801EE144
lbl_801EE0E8:
/* 801EE0E8 001EB028 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801EE0EC 001EB02C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801EE0E8 001EB028 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801EE0EC 001EB02C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801EE0F0 001EB030 38 63 00 EC */ addi r3, r3, 0xec
/* 801EE0F4 001EB034 38 1F FF F1 */ addi r0, r31, -15
/* 801EE0F8 001EB038 54 04 06 3E */ clrlwi r4, r0, 0x18
@@ -5533,8 +5533,8 @@ lbl_801EE0E8:
/* 801EE100 001EB040 7C 64 1B 78 */ mr r4, r3
/* 801EE104 001EB044 48 00 00 40 */ b lbl_801EE144
lbl_801EE108:
/* 801EE108 001EB048 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801EE10C 001EB04C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801EE108 001EB048 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801EE10C 001EB04C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801EE110 001EB050 38 63 00 EC */ addi r3, r3, 0xec
/* 801EE114 001EB054 38 1F FF F5 */ addi r0, r31, -11
/* 801EE118 001EB058 54 04 06 3E */ clrlwi r4, r0, 0x18
@@ -5542,13 +5542,13 @@ lbl_801EE108:
/* 801EE120 001EB060 7C 64 1B 78 */ mr r4, r3
/* 801EE124 001EB064 48 00 00 20 */ b lbl_801EE144
lbl_801EE128:
/* 801EE128 001EB068 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801EE12C 001EB06C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801EE128 001EB068 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801EE12C 001EB06C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801EE130 001EB070 88 83 00 EC */ lbz r4, 0xec(r3)
/* 801EE134 001EB074 48 00 00 10 */ b lbl_801EE144
lbl_801EE138:
/* 801EE138 001EB078 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801EE13C 001EB07C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801EE138 001EB078 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801EE13C 001EB07C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801EE140 001EB080 88 83 00 F4 */ lbz r4, 0xf4(r3)
lbl_801EE144:
/* 801EE144 001EB084 7C 83 23 78 */ mr r3, r4
@@ -5563,8 +5563,8 @@ dMenu_Ring_c_NS_getItemMaxNum:
/* 801EE15C 001EB09C 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 801EE160 001EB0A0 7C 08 02 A6 */ mflr r0
/* 801EE164 001EB0A4 90 01 00 14 */ stw r0, 0x14(r1)
/* 801EE168 001EB0A8 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801EE16C 001EB0AC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801EE168 001EB0A8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801EE16C 001EB0AC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801EE170 001EB0B0 38 63 00 9C */ addi r3, r3, 0x9c
/* 801EE174 001EB0B4 54 84 06 3E */ clrlwi r4, r4, 0x18
/* 801EE178 001EB0B8 38 A0 00 00 */ li r5, 0
@@ -5600,8 +5600,8 @@ lbl_801EE1E0:
/* 801EE1E0 001EB120 38 60 00 01 */ li r3, 1
/* 801EE1E4 001EB124 48 00 00 34 */ b lbl_801EE218
lbl_801EE1E8:
/* 801EE1E8 001EB128 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801EE1EC 001EB12C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801EE1E8 001EB128 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801EE1EC 001EB12C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801EE1F0 001EB130 38 63 00 F8 */ addi r3, r3, 0xf8
/* 801EE1F4 001EB134 4B E4 5F 05 */ bl getBombNum__21dSv_player_item_max_cCFUc
/* 801EE1F8 001EB138 48 00 00 20 */ b lbl_801EE218
@@ -5609,8 +5609,8 @@ lbl_801EE1FC:
/* 801EE1FC 001EB13C 4B E4 03 BD */ bl dComIfGs_getBottleMax
/* 801EE200 001EB140 48 00 00 18 */ b lbl_801EE218
lbl_801EE204:
/* 801EE204 001EB144 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801EE208 001EB148 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801EE204 001EB144 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801EE208 001EB148 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801EE20C 001EB14C 88 63 00 F8 */ lbz r3, 0xf8(r3)
/* 801EE210 001EB150 48 00 00 08 */ b lbl_801EE218
lbl_801EE214:
@@ -5629,21 +5629,21 @@ dMenu_Ring_c_NS_checkExplainForce:
/* 801EE234 001EB174 39 61 00 20 */ addi r11, r1, 0x20
/* 801EE238 001EB178 48 17 3F A1 */ bl _savegpr_28
/* 801EE23C 001EB17C 7C 7D 1B 78 */ mr r29, r3
/* 801EE240 001EB180 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801EE244 001EB184 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801EE240 001EB180 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801EE244 001EB184 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801EE248 001EB188 38 80 00 00 */ li r4, 0
/* 801EE24C 001EB18C 4B E4 48 11 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi
/* 801EE250 001EB190 7C 60 1B 78 */ mr r0, r3
/* 801EE254 001EB194 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801EE258 001EB198 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801EE254 001EB194 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801EE258 001EB198 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801EE25C 001EB19C 3B 83 00 9C */ addi r28, r3, 0x9c
/* 801EE260 001EB1A0 7F 83 E3 78 */ mr r3, r28
/* 801EE264 001EB1A4 54 04 06 3E */ clrlwi r4, r0, 0x18
/* 801EE268 001EB1A8 38 A0 00 00 */ li r5, 0
/* 801EE26C 001EB1AC 4B E4 4D C5 */ bl getItem__17dSv_player_item_cCFib
/* 801EE270 001EB1B0 7C 7E 1B 78 */ mr r30, r3
/* 801EE274 001EB1B4 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801EE278 001EB1B8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801EE274 001EB1B4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801EE278 001EB1B8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801EE27C 001EB1BC 38 80 00 01 */ li r4, 1
/* 801EE280 001EB1C0 4B E4 47 DD */ bl getSelectItemIndex__21dSv_player_status_a_cCFi
/* 801EE284 001EB1C4 7C 60 1B 78 */ mr r0, r3
@@ -5652,8 +5652,8 @@ dMenu_Ring_c_NS_checkExplainForce:
/* 801EE290 001EB1D0 38 A0 00 00 */ li r5, 0
/* 801EE294 001EB1D4 4B E4 4D 9D */ bl getItem__17dSv_player_item_cCFib
/* 801EE298 001EB1D8 7C 7F 1B 78 */ mr r31, r3
/* 801EE29C 001EB1DC 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801EE2A0 001EB1E0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801EE29C 001EB1DC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801EE2A0 001EB1E0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801EE2A4 001EB1E4 38 80 00 02 */ li r4, 2
/* 801EE2A8 001EB1E8 4B E4 47 B5 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi
/* 801EE2AC 001EB1EC 7C 60 1B 78 */ mr r0, r3
@@ -5661,8 +5661,8 @@ dMenu_Ring_c_NS_checkExplainForce:
/* 801EE2B4 001EB1F4 54 04 06 3E */ clrlwi r4, r0, 0x18
/* 801EE2B8 001EB1F8 38 A0 00 00 */ li r5, 0
/* 801EE2BC 001EB1FC 4B E4 4D 75 */ bl getItem__17dSv_player_item_cCFib
/* 801EE2C0 001EB200 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801EE2C4 001EB204 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801EE2C0 001EB200 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801EE2C4 001EB204 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801EE2C8 001EB208 38 80 00 03 */ li r4, 3
/* 801EE2CC 001EB20C 4B E4 47 91 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi
/* 801EE2D0 001EB210 7C 60 1B 78 */ mr r0, r3
@@ -6017,8 +6017,8 @@ lbl_801EE760:
/* 801EE794 001EB6D4 41 80 FF CC */ blt lbl_801EE760
/* 801EE798 001EB6D8 2C 1D 00 64 */ cmpwi r29, 0x64
/* 801EE79C 001EB6DC 40 80 00 BC */ bge lbl_801EE858
/* 801EE7A0 001EB6E0 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801EE7A4 001EB6E4 3B 83 61 C0 */ addi r28, r3, lbl_804061C0@l
/* 801EE7A0 001EB6E0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801EE7A4 001EB6E4 3B 83 61 C0 */ addi r28, r3, g_dComIfG_gameInfo@l
/* 801EE7A8 001EB6E8 83 7C 5D 30 */ lwz r27, 0x5d30(r28)
/* 801EE7AC 001EB6EC 38 00 00 0A */ li r0, 0xa
/* 801EE7B0 001EB6F0 7C 7D 03 D6 */ divw r3, r29, r0
@@ -6064,8 +6064,8 @@ lbl_801EE760:
/* 801EE850 001EB790 98 03 00 B0 */ stb r0, 0xb0(r3)
/* 801EE854 001EB794 48 00 01 18 */ b lbl_801EE96C
lbl_801EE858:
/* 801EE858 001EB798 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801EE85C 001EB79C 3B C3 61 C0 */ addi r30, r3, lbl_804061C0@l
/* 801EE858 001EB798 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801EE85C 001EB79C 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l
/* 801EE860 001EB7A0 83 7E 5D 30 */ lwz r27, 0x5d30(r30)
/* 801EE864 001EB7A4 38 00 00 64 */ li r0, 0x64
/* 801EE868 001EB7A8 7C 7D 03 D6 */ divw r3, r29, r0
@@ -6216,8 +6216,8 @@ dMenu_Ring_c_NS_getItem:
/* 801EEA90 001EB9D0 39 61 00 20 */ addi r11, r1, 0x20
/* 801EEA94 001EB9D4 48 17 37 49 */ bl _savegpr_29
/* 801EEA98 001EB9D8 7C BD 2B 78 */ mr r29, r5
/* 801EEA9C 001EB9DC 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801EEAA0 001EB9E0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801EEA9C 001EB9DC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801EEAA0 001EB9E0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801EEAA4 001EB9E4 3B C3 00 9C */ addi r30, r3, 0x9c
/* 801EEAA8 001EB9E8 7F C3 F3 78 */ mr r3, r30
/* 801EEAAC 001EB9EC 38 A0 00 00 */ li r5, 0
@@ -6263,8 +6263,8 @@ lbl_801EEB30:
/* 801EEB38 001EBA78 B0 03 06 8E */ sth r0, 0x68e(r3)
lbl_801EEB3C:
/* 801EEB3C 001EBA7C 88 03 06 CC */ lbz r0, 0x6cc(r3)
/* 801EEB40 001EBA80 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801EEB44 001EBA84 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801EEB40 001EBA80 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801EEB44 001EBA84 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801EEB48 001EBA88 98 03 5E 3C */ stb r0, 0x5e3c(r3)
/* 801EEB4C 001EBA8C 38 00 00 00 */ li r0, 0
/* 801EEB50 001EBA90 98 03 5E 57 */ stb r0, 0x5e57(r3)
@@ -6281,8 +6281,8 @@ dMenu_Ring_c_NS_isMixItemOn:
/* 801EEB70 001EBAB0 80 03 06 2C */ lwz r0, 0x62c(r3)
/* 801EEB74 001EBAB4 28 00 00 00 */ cmplwi r0, 0
/* 801EEB78 001EBAB8 40 82 01 04 */ bne lbl_801EEC7C
/* 801EEB7C 001EBABC 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801EEB80 001EBAC0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801EEB7C 001EBABC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801EEB80 001EBAC0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801EEB84 001EBAC4 3B E3 00 9C */ addi r31, r3, 0x9c
/* 801EEB88 001EBAC8 7F E3 FB 78 */ mr r3, r31
/* 801EEB8C 001EBACC 88 1E 06 A8 */ lbz r0, 0x6a8(r30)
@@ -6309,8 +6309,8 @@ lbl_801EEBDC:
/* 801EEBDC 001EBB1C 2C 00 00 73 */ cmpwi r0, 0x73
/* 801EEBE0 001EBB20 40 80 00 9C */ bge lbl_801EEC7C
lbl_801EEBE4:
/* 801EEBE4 001EBB24 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801EEBE8 001EBB28 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801EEBE4 001EBB24 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801EEBE8 001EBB28 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801EEBEC 001EBB2C 38 80 00 00 */ li r4, 0
/* 801EEBF0 001EBB30 4B E4 3E 6D */ bl getSelectItemIndex__21dSv_player_status_a_cCFi
/* 801EEBF4 001EBB34 54 60 06 3E */ clrlwi r0, r3, 0x18
@@ -6331,8 +6331,8 @@ lbl_801EEC28:
/* 801EEC28 001EBB68 38 60 00 01 */ li r3, 1
/* 801EEC2C 001EBB6C 48 00 00 54 */ b lbl_801EEC80
lbl_801EEC30:
/* 801EEC30 001EBB70 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801EEC34 001EBB74 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801EEC30 001EBB70 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801EEC34 001EBB74 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801EEC38 001EBB78 38 80 00 01 */ li r4, 1
/* 801EEC3C 001EBB7C 4B E4 3E 21 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi
/* 801EEC40 001EBB80 54 60 06 3E */ clrlwi r0, r3, 0x18
@@ -6372,8 +6372,8 @@ dMenu_Ring_c_NS_isMixItemOff:
/* 801EECAC 001EBBEC 80 03 06 2C */ lwz r0, 0x62c(r3)
/* 801EECB0 001EBBF0 28 00 00 00 */ cmplwi r0, 0
/* 801EECB4 001EBBF4 40 82 00 B8 */ bne lbl_801EED6C
/* 801EECB8 001EBBF8 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801EECBC 001EBBFC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801EECB8 001EBBF8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801EECBC 001EBBFC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801EECC0 001EBC00 38 63 00 9C */ addi r3, r3, 0x9c
/* 801EECC4 001EBC04 88 1F 06 A8 */ lbz r0, 0x6a8(r31)
/* 801EECC8 001EBC08 7C 9F 02 14 */ add r4, r31, r0
@@ -6388,8 +6388,8 @@ dMenu_Ring_c_NS_isMixItemOff:
/* 801EECEC 001EBC2C 54 60 06 3E */ clrlwi r0, r3, 0x18
/* 801EECF0 001EBC30 28 00 00 04 */ cmplwi r0, 4
/* 801EECF4 001EBC34 40 82 00 34 */ bne lbl_801EED28
/* 801EECF8 001EBC38 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801EECFC 001EBC3C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801EECF8 001EBC38 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801EECFC 001EBC3C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801EED00 001EBC40 38 80 00 00 */ li r4, 0
/* 801EED04 001EBC44 4B E4 3D 59 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi
/* 801EED08 001EBC48 88 1F 06 A8 */ lbz r0, 0x6a8(r31)
@@ -6406,8 +6406,8 @@ lbl_801EED28:
/* 801EED30 001EBC70 54 60 06 3E */ clrlwi r0, r3, 0x18
/* 801EED34 001EBC74 28 00 00 04 */ cmplwi r0, 4
/* 801EED38 001EBC78 40 82 00 34 */ bne lbl_801EED6C
/* 801EED3C 001EBC7C 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801EED40 001EBC80 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801EED3C 001EBC7C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 801EED40 001EBC80 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 801EED44 001EBC84 38 80 00 01 */ li r4, 1
/* 801EED48 001EBC88 4B E4 3D 15 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi
/* 801EED4C 001EBC8C 88 1F 06 A8 */ lbz r0, 0x6a8(r31)
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: