mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-08-09 02:48:21 -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/msg/scrn/d_msg_scrn_3select.s
+4 -4
View File
@@ -31,8 +31,8 @@ lbl_80239104:
/* 8023910C 0023604C 3C 80 80 3A */ lis r4, lbl_80399840@ha
/* 80239110 00236050 38 84 98 40 */ addi r4, r4, lbl_80399840@l
/* 80239114 00236054 3C A0 00 02 */ lis r5, 2
/* 80239118 00236058 3C C0 80 40 */ lis r6, lbl_804061C0@ha
/* 8023911C 0023605C 3A 86 61 C0 */ addi r20, r6, lbl_804061C0@l
/* 80239118 00236058 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha
/* 8023911C 0023605C 3A 86 61 C0 */ addi r20, r6, g_dComIfG_gameInfo@l
/* 80239120 00236060 80 D4 5C 6C */ lwz r6, 0x5c6c(r20)
/* 80239124 00236064 48 0B F5 25 */ bl J2DScreen_NS_setPriority
/* 80239128 00236068 80 7F 00 04 */ lwz r3, 4(r31)
@@ -918,8 +918,8 @@ dMsgScrn3Select_c_NS_draw:
/* 80239DF8 00236D38 7C 7D 1B 78 */ mr r29, r3
/* 80239DFC 00236D3C FF C0 08 90 */ fmr f30, f1
/* 80239E00 00236D40 FF E0 10 90 */ fmr f31, f2
/* 80239E04 00236D44 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80239E08 00236D48 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80239E04 00236D44 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80239E08 00236D48 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80239E0C 00236D4C 83 E3 5F 50 */ lwz r31, 0x5f50(r3)
/* 80239E10 00236D50 7F E3 FB 78 */ mr r3, r31
/* 80239E14 00236D54 81 9F 00 00 */ lwz r12, 0(r31)
asm/d/msg/scrn/d_msg_scrn_arrow.s
+4 -4
View File
@@ -26,8 +26,8 @@ lbl_8023B9F0:
/* 8023B9F8 00238938 3C 80 80 3A */ lis r4, lbl_803998A0@ha
/* 8023B9FC 0023893C 38 84 98 A0 */ addi r4, r4, lbl_803998A0@l
/* 8023BA00 00238940 3C A0 00 02 */ lis r5, 2
/* 8023BA04 00238944 3C C0 80 40 */ lis r6, lbl_804061C0@ha
/* 8023BA08 00238948 3B C6 61 C0 */ addi r30, r6, lbl_804061C0@l
/* 8023BA04 00238944 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha
/* 8023BA08 00238948 3B C6 61 C0 */ addi r30, r6, g_dComIfG_gameInfo@l
/* 8023BA0C 0023894C 80 DE 5C 6C */ lwz r6, 0x5c6c(r30)
/* 8023BA10 00238950 48 0B CC 39 */ bl J2DScreen_NS_setPriority
/* 8023BA14 00238954 80 7F 00 04 */ lwz r3, 4(r31)
@@ -281,8 +281,8 @@ dMsgScrnArrow_c_NS_draw:
/* 8023BDC0 00238D00 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8023BDC4 00238D04 7C 08 02 A6 */ mflr r0
/* 8023BDC8 00238D08 90 01 00 14 */ stw r0, 0x14(r1)
/* 8023BDCC 00238D0C 3C 80 80 40 */ lis r4, lbl_804061C0@ha
/* 8023BDD0 00238D10 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l
/* 8023BDCC 00238D0C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha
/* 8023BDD0 00238D10 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l
/* 8023BDD4 00238D14 80 84 5F 50 */ lwz r4, 0x5f50(r4)
/* 8023BDD8 00238D18 80 63 00 04 */ lwz r3, 4(r3)
/* 8023BDDC 00238D1C C0 22 B1 98 */ lfs f1, lbl_80454B98-_SDA2_BASE_(r2)
asm/d/msg/scrn/d_msg_scrn_base.s
+4 -4
View File
@@ -106,8 +106,8 @@ lbl_8023C1FC:
/* 8023C240 00239180 80 C3 00 48 */ lwz r6, 0x48(r3)
/* 8023C244 00239184 28 06 00 00 */ cmplwi r6, 0
/* 8023C248 00239188 41 82 00 1C */ beq lbl_8023C264
/* 8023C24C 0023918C 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 8023C250 00239190 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8023C24C 0023918C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8023C250 00239190 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8023C254 00239194 38 63 5F 64 */ addi r3, r3, 0x5f64
/* 8023C258 00239198 38 83 01 B4 */ addi r4, r3, 0x1b4
/* 8023C25C 0023919C 38 A3 01 B8 */ addi r5, r3, 0x1b8
@@ -123,8 +123,8 @@ lbl_8023C264:
/* 8023C280 002391C0 93 E1 00 0C */ stw r31, 0xc(r1)
/* 8023C284 002391C4 93 C1 00 08 */ stw r30, 8(r1)
/* 8023C288 002391C8 7C 7E 1B 78 */ mr r30, r3
/* 8023C28C 002391CC 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 8023C290 002391D0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8023C28C 002391CC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8023C290 002391D0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8023C294 002391D4 83 E3 5F 50 */ lwz r31, 0x5f50(r3)
/* 8023C298 002391D8 7F E3 FB 78 */ mr r3, r31
/* 8023C29C 002391DC 81 9F 00 00 */ lwz r12, 0(r31)
asm/d/msg/scrn/d_msg_scrn_boss.s
+6 -6
View File
@@ -31,8 +31,8 @@ lbl_8023C618:
/* 8023C620 00239560 3C 80 80 3A */ lis r4, lbl_803998F8@ha
/* 8023C624 00239564 38 84 98 F8 */ addi r4, r4, lbl_803998F8@l
/* 8023C628 00239568 3C A0 00 02 */ lis r5, 2
/* 8023C62C 0023956C 3C C0 80 40 */ lis r6, lbl_804061C0@ha
/* 8023C630 00239570 38 C6 61 C0 */ addi r6, r6, lbl_804061C0@l
/* 8023C62C 0023956C 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha
/* 8023C630 00239570 38 C6 61 C0 */ addi r6, r6, g_dComIfG_gameInfo@l
/* 8023C634 00239574 80 C6 5C 7C */ lwz r6, 0x5c7c(r6)
/* 8023C638 00239578 48 0B C0 11 */ bl J2DScreen_NS_setPriority
/* 8023C63C 0023957C 80 7E 00 04 */ lwz r3, 4(r30)
@@ -301,8 +301,8 @@ lbl_8023CA20:
/* 8023CA28 00239968 2C 1B 00 07 */ cmpwi r27, 7
/* 8023CA2C 0023996C 3B DE 00 04 */ addi r30, r30, 4
/* 8023CA30 00239970 41 80 FF CC */ blt lbl_8023C9FC
/* 8023CA34 00239974 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 8023CA38 00239978 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8023CA34 00239974 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8023CA38 00239978 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8023CA3C 0023997C 80 63 5C 7C */ lwz r3, 0x5c7c(r3)
/* 8023CA40 00239980 81 83 00 00 */ lwz r12, 0(r3)
/* 8023CA44 00239984 81 8C 00 24 */ lwz r12, 0x24(r12)
@@ -397,8 +397,8 @@ lbl_8023CB84:
/* 8023CBA0 00239AE0 90 01 00 14 */ stw r0, 0x14(r1)
/* 8023CBA4 00239AE4 93 E1 00 0C */ stw r31, 0xc(r1)
/* 8023CBA8 00239AE8 7C 7F 1B 78 */ mr r31, r3
/* 8023CBAC 00239AEC 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 8023CBB0 00239AF0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8023CBAC 00239AEC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8023CBB0 00239AF0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8023CBB4 00239AF4 80 63 5F 50 */ lwz r3, 0x5f50(r3)
/* 8023CBB8 00239AF8 81 83 00 00 */ lwz r12, 0(r3)
/* 8023CBBC 00239AFC 81 8C 00 18 */ lwz r12, 0x18(r12)
asm/d/msg/scrn/d_msg_scrn_explain.s
+14 -14
View File
@@ -72,8 +72,8 @@ lbl_8023CD74:
/* 8023CD7C 00239CBC 3C 80 80 3A */ lis r4, lbl_80399910@ha
/* 8023CD80 00239CC0 38 84 99 10 */ addi r4, r4, lbl_80399910@l
/* 8023CD84 00239CC4 3C A0 00 02 */ lis r5, 2
/* 8023CD88 00239CC8 3C C0 80 40 */ lis r6, lbl_804061C0@ha
/* 8023CD8C 00239CCC 38 C6 61 C0 */ addi r6, r6, lbl_804061C0@l
/* 8023CD88 00239CC8 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha
/* 8023CD8C 00239CCC 38 C6 61 C0 */ addi r6, r6, g_dComIfG_gameInfo@l
/* 8023CD90 00239CD0 80 C6 5C 70 */ lwz r6, 0x5c70(r6)
/* 8023CD94 00239CD4 48 0B B8 B5 */ bl J2DScreen_NS_setPriority
/* 8023CD98 00239CD8 80 7F 00 2C */ lwz r3, 0x2c(r31)
@@ -99,8 +99,8 @@ lbl_8023CDD8:
/* 8023CDE0 00239D20 38 84 99 10 */ addi r4, r4, lbl_80399910@l
/* 8023CDE4 00239D24 38 84 00 1D */ addi r4, r4, 0x1d
/* 8023CDE8 00239D28 3C A0 00 02 */ lis r5, 2
/* 8023CDEC 00239D2C 3C C0 80 40 */ lis r6, lbl_804061C0@ha
/* 8023CDF0 00239D30 38 C6 61 C0 */ addi r6, r6, lbl_804061C0@l
/* 8023CDEC 00239D2C 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha
/* 8023CDF0 00239D30 38 C6 61 C0 */ addi r6, r6, g_dComIfG_gameInfo@l
/* 8023CDF4 00239D34 80 C6 5C E4 */ lwz r6, 0x5ce4(r6)
/* 8023CDF8 00239D38 48 0B B8 51 */ bl J2DScreen_NS_setPriority
/* 8023CDFC 00239D3C 80 7F 00 30 */ lwz r3, 0x30(r31)
@@ -181,8 +181,8 @@ lbl_8023CF14:
/* 8023CF1C 00239E5C 38 84 99 10 */ addi r4, r4, lbl_80399910@l
/* 8023CF20 00239E60 38 84 00 45 */ addi r4, r4, 0x45
/* 8023CF24 00239E64 3C A0 00 02 */ lis r5, 2
/* 8023CF28 00239E68 3C C0 80 40 */ lis r6, lbl_804061C0@ha
/* 8023CF2C 00239E6C 38 C6 61 C0 */ addi r6, r6, lbl_804061C0@l
/* 8023CF28 00239E68 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha
/* 8023CF2C 00239E6C 38 C6 61 C0 */ addi r6, r6, g_dComIfG_gameInfo@l
/* 8023CF30 00239E70 80 C6 5C E4 */ lwz r6, 0x5ce4(r6)
/* 8023CF34 00239E74 48 0B B7 15 */ bl J2DScreen_NS_setPriority
/* 8023CF38 00239E78 80 7F 00 30 */ lwz r3, 0x30(r31)
@@ -460,8 +460,8 @@ lbl_8023D344:
/* 8023D348 0023A288 57 A0 06 3E */ clrlwi r0, r29, 0x18
/* 8023D34C 0023A28C 28 00 00 01 */ cmplwi r0, 1
/* 8023D350 0023A290 40 82 00 C8 */ bne lbl_8023D418
/* 8023D354 0023A294 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 8023D358 0023A298 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8023D354 0023A294 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8023D358 0023A298 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8023D35C 0023A29C 80 63 5D 30 */ lwz r3, 0x5d30(r3)
/* 8023D360 0023A2A0 3C 80 54 49 */ lis r4, 0x54494D47@ha
/* 8023D364 0023A2A4 38 84 4D 47 */ addi r4, r4, 0x54494D47@l
@@ -740,22 +740,22 @@ lbl_8023D750:
/* 8023D750 0023A690 38 00 00 00 */ li r0, 0
/* 8023D754 0023A694 90 1E 00 38 */ stw r0, 0x38(r30)
lbl_8023D758:
/* 8023D758 0023A698 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 8023D75C 0023A69C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8023D758 0023A698 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8023D75C 0023A69C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8023D760 0023A6A0 80 63 5C 6C */ lwz r3, 0x5c6c(r3)
/* 8023D764 0023A6A4 81 83 00 00 */ lwz r12, 0(r3)
/* 8023D768 0023A6A8 81 8C 00 24 */ lwz r12, 0x24(r12)
/* 8023D76C 0023A6AC 7D 89 03 A6 */ mtctr r12
/* 8023D770 0023A6B0 4E 80 04 21 */ bctrl
/* 8023D774 0023A6B4 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 8023D778 0023A6B8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8023D774 0023A6B4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8023D778 0023A6B8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8023D77C 0023A6BC 80 63 5C 70 */ lwz r3, 0x5c70(r3)
/* 8023D780 0023A6C0 81 83 00 00 */ lwz r12, 0(r3)
/* 8023D784 0023A6C4 81 8C 00 24 */ lwz r12, 0x24(r12)
/* 8023D788 0023A6C8 7D 89 03 A6 */ mtctr r12
/* 8023D78C 0023A6CC 4E 80 04 21 */ bctrl
/* 8023D790 0023A6D0 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 8023D794 0023A6D4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8023D790 0023A6D0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8023D794 0023A6D4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8023D798 0023A6D8 80 63 5C E4 */ lwz r3, 0x5ce4(r3)
/* 8023D79C 0023A6DC 81 83 00 00 */ lwz r12, 0(r3)
/* 8023D7A0 0023A6E0 81 8C 00 24 */ lwz r12, 0x24(r12)
asm/d/msg/scrn/d_msg_scrn_howl.s
+44 -44
View File
@@ -37,8 +37,8 @@ lbl_802409D4:
/* 802409DC 0023D91C 3C 80 80 3A */ lis r4, lbl_80399A20@ha
/* 802409E0 0023D920 38 84 9A 20 */ addi r4, r4, lbl_80399A20@l
/* 802409E4 0023D924 3C A0 00 02 */ lis r5, 2
/* 802409E8 0023D928 3C C0 80 40 */ lis r6, lbl_804061C0@ha
/* 802409EC 0023D92C 3B 86 61 C0 */ addi r28, r6, lbl_804061C0@l
/* 802409E8 0023D928 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha
/* 802409EC 0023D92C 3B 86 61 C0 */ addi r28, r6, g_dComIfG_gameInfo@l
/* 802409F0 0023D930 80 DC 5C 80 */ lwz r6, 0x5c80(r28)
/* 802409F4 0023D934 48 0B 7C 55 */ bl J2DScreen_NS_setPriority
/* 802409F8 0023D938 80 7F 00 04 */ lwz r3, 4(r31)
@@ -308,8 +308,8 @@ lbl_80240D8C:
/* 80240DF8 0023DD38 98 9F 27 9A */ stb r4, 0x279a(r31)
/* 80240DFC 0023DD3C C0 02 B2 50 */ lfs f0, lbl_80454C50-_SDA2_BASE_(r2)
/* 80240E00 0023DD40 D0 1F 19 9C */ stfs f0, 0x199c(r31)
/* 80240E04 0023DD44 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80240E08 0023DD48 3B A3 61 C0 */ addi r29, r3, lbl_804061C0@l
/* 80240E04 0023DD44 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80240E08 0023DD48 3B A3 61 C0 */ addi r29, r3, g_dComIfG_gameInfo@l
/* 80240E0C 0023DD4C 80 7D 5D B4 */ lwz r3, 0x5db4(r29)
/* 80240E10 0023DD50 A8 03 30 10 */ lha r0, 0x3010(r3)
/* 80240E14 0023DD54 7C 00 07 35 */ extsh. r0, r0
@@ -702,8 +702,8 @@ lbl_8024135C:
/* 802413F0 0023E330 81 8C 01 30 */ lwz r12, 0x130(r12)
/* 802413F4 0023E334 7D 89 03 A6 */ mtctr r12
/* 802413F8 0023E338 4E 80 04 21 */ bctrl
/* 802413FC 0023E33C 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80241400 0023E340 3B 83 61 C0 */ addi r28, r3, lbl_804061C0@l
/* 802413FC 0023E33C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80241400 0023E340 3B 83 61 C0 */ addi r28, r3, g_dComIfG_gameInfo@l
/* 80241404 0023E344 80 7C 5D 30 */ lwz r3, 0x5d30(r28)
/* 80241408 0023E348 3C 80 54 49 */ lis r4, 0x54494D47@ha
/* 8024140C 0023E34C 38 84 4D 47 */ addi r4, r4, 0x54494D47@l
@@ -1116,8 +1116,8 @@ lbl_802419E0:
lbl_80241A14:
/* 80241A14 0023E954 38 00 00 00 */ li r0, 0
/* 80241A18 0023E958 90 1E 01 24 */ stw r0, 0x124(r30)
/* 80241A1C 0023E95C 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80241A20 0023E960 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80241A1C 0023E95C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80241A20 0023E960 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80241A24 0023E964 80 63 5C 80 */ lwz r3, 0x5c80(r3)
/* 80241A28 0023E968 81 83 00 00 */ lwz r12, 0(r3)
/* 80241A2C 0023E96C 81 8C 00 24 */ lwz r12, 0x24(r12)
@@ -1263,8 +1263,8 @@ lbl_80241BC4:
/* 80241C3C 0023EB7C 93 E1 00 3C */ stw r31, 0x3c(r1)
/* 80241C40 0023EB80 93 C1 00 38 */ stw r30, 0x38(r1)
/* 80241C44 0023EB84 7C 7E 1B 78 */ mr r30, r3
/* 80241C48 0023EB88 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80241C4C 0023EB8C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80241C48 0023EB88 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80241C4C 0023EB8C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80241C50 0023EB90 83 E3 5F 50 */ lwz r31, 0x5f50(r3)
/* 80241C54 0023EB94 38 7E 21 14 */ addi r3, r30, 0x2114
/* 80241C58 0023EB98 38 9E 21 18 */ addi r4, r30, 0x2118
@@ -1341,8 +1341,8 @@ lbl_80241CB0:
/* 80241D64 0023ECA4 90 01 00 14 */ stw r0, 0x14(r1)
/* 80241D68 0023ECA8 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80241D6C 0023ECAC 7C 7F 1B 78 */ mr r31, r3
/* 80241D70 0023ECB0 3C 80 80 40 */ lis r4, lbl_804061C0@ha
/* 80241D74 0023ECB4 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l
/* 80241D70 0023ECB0 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha
/* 80241D74 0023ECB4 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l
/* 80241D78 0023ECB8 80 84 5D B4 */ lwz r4, 0x5db4(r4)
/* 80241D7C 0023ECBC 80 04 2E 0C */ lwz r0, 0x2e0c(r4)
/* 80241D80 0023ECC0 28 00 00 00 */ cmplwi r0, 0
@@ -1388,8 +1388,8 @@ lbl_80241DE8:
/* 80241E10 0023ED50 93 C1 00 08 */ stw r30, 8(r1)
/* 80241E14 0023ED54 7C 7E 1B 78 */ mr r30, r3
/* 80241E18 0023ED58 48 00 1A 21 */ bl dMsgScrnHowl_c_NS_calcMain
/* 80241E1C 0023ED5C 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80241E20 0023ED60 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l
/* 80241E1C 0023ED5C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80241E20 0023ED60 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l
/* 80241E24 0023ED64 80 7F 5D B4 */ lwz r3, 0x5db4(r31)
/* 80241E28 0023ED68 81 83 06 28 */ lwz r12, 0x628(r3)
/* 80241E2C 0023ED6C 81 8C 02 98 */ lwz r12, 0x298(r12)
@@ -1420,8 +1420,8 @@ lbl_80241E64:
/* 80241E88 0023EDC8 90 01 00 14 */ stw r0, 0x14(r1)
/* 80241E8C 0023EDCC 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80241E90 0023EDD0 7C 7F 1B 78 */ mr r31, r3
/* 80241E94 0023EDD4 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80241E98 0023EDD8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80241E94 0023EDD4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80241E98 0023EDD8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80241E9C 0023EDDC 80 63 5D B4 */ lwz r3, 0x5db4(r3)
/* 80241EA0 0023EDE0 81 83 06 28 */ lwz r12, 0x628(r3)
/* 80241EA4 0023EDE4 81 8C 02 98 */ lwz r12, 0x298(r12)
@@ -1473,8 +1473,8 @@ lbl_80241F14:
/* 80241F54 0023EE94 80 04 00 30 */ lwz r0, 0x30(r4)
/* 80241F58 0023EE98 54 00 05 EF */ rlwinm. r0, r0, 0, 0x17, 0x17
/* 80241F5C 0023EE9C 41 82 00 28 */ beq lbl_80241F84
/* 80241F60 0023EEA0 3C 80 80 40 */ lis r4, lbl_804061C0@ha
/* 80241F64 0023EEA4 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l
/* 80241F60 0023EEA0 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha
/* 80241F64 0023EEA4 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l
/* 80241F68 0023EEA8 80 84 5D B4 */ lwz r4, 0x5db4(r4)
/* 80241F6C 0023EEAC 80 04 2E 0C */ lwz r0, 0x2e0c(r4)
/* 80241F70 0023EEB0 28 00 00 00 */ cmplwi r0, 0
@@ -1491,8 +1491,8 @@ lbl_80241F84:
/* 80241F98 0023EED8 40 82 00 08 */ bne lbl_80241FA0
/* 80241F9C 0023EEDC 3B C0 00 01 */ li r30, 1
lbl_80241FA0:
/* 80241FA0 0023EEE0 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80241FA4 0023EEE4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80241FA0 0023EEE0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80241FA4 0023EEE4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80241FA8 0023EEE8 80 63 5D B4 */ lwz r3, 0x5db4(r3)
/* 80241FAC 0023EEEC 81 83 06 28 */ lwz r12, 0x628(r3)
/* 80241FB0 0023EEF0 81 8C 02 98 */ lwz r12, 0x298(r12)
@@ -1552,8 +1552,8 @@ lbl_80242014:
.global dMsgScrnHowl_c_NS_isKeyCheck
dMsgScrnHowl_c_NS_isKeyCheck:
/* 80242080 0023EFC0 3C 80 80 40 */ lis r4, lbl_804061C0@ha
/* 80242084 0023EFC4 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l
/* 80242080 0023EFC0 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha
/* 80242084 0023EFC4 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l
/* 80242088 0023EFC8 80 84 5D B4 */ lwz r4, 0x5db4(r4)
/* 8024208C 0023EFCC 80 04 2E 0C */ lwz r0, 0x2e0c(r4)
/* 80242090 0023EFD0 28 00 00 00 */ cmplwi r0, 0
@@ -1668,8 +1668,8 @@ dMsgScrnHowl_c_NS_drawWave:
/* 8024221C 0023F15C 39 61 00 70 */ addi r11, r1, 0x70
/* 80242220 0023F160 48 11 FF 9D */ bl func_803621BC
/* 80242224 0023F164 7C 79 1B 78 */ mr r25, r3
/* 80242228 0023F168 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 8024222C 0023F16C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80242228 0023F168 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8024222C 0023F16C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80242230 0023F170 83 E3 5F 50 */ lwz r31, 0x5f50(r3)
/* 80242234 0023F174 80 79 00 C4 */ lwz r3, 0xc4(r25)
/* 80242238 0023F178 48 01 20 B1 */ bl CPaneMgr_NS_getGlobalPosX
@@ -1688,8 +1688,8 @@ dMsgScrnHowl_c_NS_drawWave:
/* 8024226C 0023F1AC A8 79 21 28 */ lha r3, 0x2128(r25)
/* 80242270 0023F1B0 38 03 FF FF */ addi r0, r3, -1
/* 80242274 0023F1B4 7F 9D 00 50 */ subf r28, r29, r0
/* 80242278 0023F1B8 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 8024227C 0023F1BC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80242278 0023F1B8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8024227C 0023F1BC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80242280 0023F1C0 80 63 5D B4 */ lwz r3, 0x5db4(r3)
/* 80242284 0023F1C4 81 83 06 28 */ lwz r12, 0x628(r3)
/* 80242288 0023F1C8 81 8C 02 98 */ lwz r12, 0x298(r12)
@@ -2064,8 +2064,8 @@ dMsgScrnHowl_c_NS_drawGuide:
/* 802427FC 0023F73C 39 61 01 20 */ addi r11, r1, 0x120
/* 80242800 0023F740 48 11 F9 D5 */ bl _savegpr_27
/* 80242804 0023F744 7C 7C 1B 78 */ mr r28, r3
/* 80242808 0023F748 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 8024280C 0023F74C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80242808 0023F748 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8024280C 0023F74C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80242810 0023F750 83 63 5F 50 */ lwz r27, 0x5f50(r3)
/* 80242814 0023F754 80 7C 01 28 */ lwz r3, 0x128(r28)
/* 80242818 0023F758 80 1C 01 2C */ lwz r0, 0x12c(r28)
@@ -2606,8 +2606,8 @@ dMsgScrnHowl_c_NS_drawGuide2:
/* 80243028 0023FF68 39 61 00 A0 */ addi r11, r1, 0xa0
/* 8024302C 0023FF6C 48 11 F1 9D */ bl func_803621C8
/* 80243030 0023FF70 7C 7A 1B 78 */ mr r26, r3
/* 80243034 0023FF74 3C 80 80 40 */ lis r4, lbl_804061C0@ha
/* 80243038 0023FF78 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l
/* 80243034 0023FF74 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha
/* 80243038 0023FF78 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l
/* 8024303C 0023FF7C 83 24 5F 50 */ lwz r25, 0x5f50(r4)
/* 80243040 0023FF80 88 03 27 98 */ lbz r0, 0x2798(r3)
/* 80243044 0023FF84 28 00 00 03 */ cmplwi r0, 3
@@ -2987,8 +2987,8 @@ dMsgScrnHowl_c_NS_drawEffect:
/* 802435D8 00240518 39 61 00 70 */ addi r11, r1, 0x70
/* 802435DC 0024051C 48 11 EC 01 */ bl _savegpr_29
/* 802435E0 00240520 7C 7F 1B 78 */ mr r31, r3
/* 802435E4 00240524 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 802435E8 00240528 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 802435E4 00240524 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 802435E8 00240528 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 802435EC 0024052C 83 C3 5F 50 */ lwz r30, 0x5f50(r3)
/* 802435F0 00240530 80 7F 01 28 */ lwz r3, 0x128(r31)
/* 802435F4 00240534 80 1F 01 2C */ lwz r0, 0x12c(r31)
@@ -3038,8 +3038,8 @@ dMsgScrnHowl_c_NS_drawEffect:
/* 802436A4 002405E4 81 8C 00 1C */ lwz r12, 0x1c(r12)
/* 802436A8 002405E8 7D 89 03 A6 */ mtctr r12
/* 802436AC 002405EC 4E 80 04 21 */ bctrl
/* 802436B0 002405F0 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 802436B4 002405F4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 802436B0 002405F0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 802436B4 002405F4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 802436B8 002405F8 80 63 5D B4 */ lwz r3, 0x5db4(r3)
/* 802436BC 002405FC 81 83 06 28 */ lwz r12, 0x628(r3)
/* 802436C0 00240600 81 8C 02 98 */ lwz r12, 0x298(r12)
@@ -3227,8 +3227,8 @@ lbl_80243964:
/* 80243964 002408A4 88 1F 27 98 */ lbz r0, 0x2798(r31)
/* 80243968 002408A8 28 00 00 03 */ cmplwi r0, 3
/* 8024396C 002408AC 41 82 00 74 */ beq lbl_802439E0
/* 80243970 002408B0 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80243974 002408B4 3B C3 61 C0 */ addi r30, r3, lbl_804061C0@l
/* 80243970 002408B0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80243974 002408B4 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l
/* 80243978 002408B8 80 7E 5D B4 */ lwz r3, 0x5db4(r30)
/* 8024397C 002408BC 38 63 2D 84 */ addi r3, r3, 0x2d84
/* 80243980 002408C0 48 08 7C D1 */ bl Z2WolfHowlMgr_NS_getOnLineNum
@@ -3257,8 +3257,8 @@ lbl_802439D0:
/* 802439D8 00240918 7C 7F 02 14 */ add r3, r31, r0
/* 802439DC 0024091C 98 83 24 98 */ stb r4, 0x2498(r3)
lbl_802439E0:
/* 802439E0 00240920 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 802439E4 00240924 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 802439E0 00240920 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 802439E4 00240924 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 802439E8 00240928 80 63 5D B4 */ lwz r3, 0x5db4(r3)
/* 802439EC 0024092C 81 83 06 28 */ lwz r12, 0x628(r3)
/* 802439F0 00240930 81 8C 02 98 */ lwz r12, 0x298(r12)
@@ -3297,8 +3297,8 @@ dMsgScrnHowl_c_NS_calcGuide:
/* 80243A68 002409A8 A0 03 21 38 */ lhz r0, 0x2138(r3)
/* 80243A6C 002409AC 28 00 00 00 */ cmplwi r0, 0
/* 80243A70 002409B0 41 82 01 58 */ beq lbl_80243BC8
/* 80243A74 002409B4 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80243A78 002409B8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80243A74 002409B4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80243A78 002409B8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80243A7C 002409BC 80 63 5D B4 */ lwz r3, 0x5db4(r3)
/* 80243A80 002409C0 80 03 2E 0C */ lwz r0, 0x2e0c(r3)
/* 80243A84 002409C4 28 00 00 00 */ cmplwi r0, 0
@@ -3914,8 +3914,8 @@ dMsgScrnHowl_c_NS_getGuideDataSize:
/* 80244318 00241258 7C 7C 1B 78 */ mr r28, r3
/* 8024431C 0024125C 8B C3 21 97 */ lbz r30, 0x2197(r3)
/* 80244320 00241260 3B A0 00 00 */ li r29, 0
/* 80244324 00241264 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80244328 00241268 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l
/* 80244324 00241264 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80244328 00241268 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l
/* 8024432C 0024126C 48 00 00 38 */ b lbl_80244364
lbl_80244330:
/* 80244330 00241270 80 7F 5D B4 */ lwz r3, 0x5db4(r31)
@@ -3956,8 +3956,8 @@ dMsgScrnHowl_c_NS_getGuideDataType:
/* 802443AC 002412EC 7C 1E 03 78 */ mr r30, r0
/* 802443B0 002412F0 7C 1D 03 78 */ mr r29, r0
/* 802443B4 002412F4 3B 80 00 00 */ li r28, 0
/* 802443B8 002412F8 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 802443BC 002412FC 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l
/* 802443B8 002412F8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 802443BC 002412FC 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l
/* 802443C0 00241300 48 00 00 6C */ b lbl_8024442C
lbl_802443C4:
/* 802443C4 00241304 80 7F 5D B4 */ lwz r3, 0x5db4(r31)
asm/d/msg/scrn/d_msg_scrn_item.s
+16 -16
View File
@@ -168,8 +168,8 @@ lbl_8023E9A8:
/* 8023E9C8 0023B908 2C 00 00 3A */ cmpwi r0, 0x3a
/* 8023E9CC 0023B90C 40 82 00 6C */ bne lbl_8023EA38
lbl_8023E9D0:
/* 8023E9D0 0023B910 3C 80 80 40 */ lis r4, lbl_804061C0@ha
/* 8023E9D4 0023B914 A0 A4 61 C0 */ lhz r5, lbl_804061C0@l(r4)
/* 8023E9D0 0023B910 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha
/* 8023E9D4 0023B914 A0 A4 61 C0 */ lhz r5, g_dComIfG_gameInfo@l(r4)
/* 8023E9D8 0023B918 38 80 00 05 */ li r4, 5
/* 8023E9DC 0023B91C 7C 05 23 D6 */ divw r0, r5, r4
/* 8023E9E0 0023B920 7C 00 21 D6 */ mullw r0, r0, r4
@@ -204,8 +204,8 @@ lbl_8023EA38:
/* 8023EA38 0023B978 48 00 1E 6D */ bl dMsgScrnItem_c_NS_isOugiID
/* 8023EA3C 0023B97C 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 8023EA40 0023B980 41 82 00 4C */ beq lbl_8023EA8C
/* 8023EA44 0023B984 3C 80 80 40 */ lis r4, lbl_804061C0@ha
/* 8023EA48 0023B988 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l
/* 8023EA44 0023B984 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha
/* 8023EA48 0023B988 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l
/* 8023EA4C 0023B98C 80 64 5C D0 */ lwz r3, 0x5cd0(r4)
/* 8023EA50 0023B990 80 9F 00 D4 */ lwz r4, 0xd4(r31)
/* 8023EA54 0023B994 38 A0 0C 00 */ li r5, 0xc00
@@ -285,8 +285,8 @@ lbl_8023EB58:
/* 8023EB60 0023BAA0 3C 80 80 3A */ lis r4, lbl_80399990@ha
/* 8023EB64 0023BAA4 38 84 99 90 */ addi r4, r4, lbl_80399990@l
/* 8023EB68 0023BAA8 3C A0 01 02 */ lis r5, 0x102
/* 8023EB6C 0023BAAC 3C C0 80 40 */ lis r6, lbl_804061C0@ha
/* 8023EB70 0023BAB0 3B C6 61 C0 */ addi r30, r6, lbl_804061C0@l
/* 8023EB6C 0023BAAC 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha
/* 8023EB70 0023BAB0 3B C6 61 C0 */ addi r30, r6, g_dComIfG_gameInfo@l
/* 8023EB74 0023BAB4 80 DE 5C 78 */ lwz r6, 0x5c78(r30)
/* 8023EB78 0023BAB8 48 0B 9A D1 */ bl J2DScreen_NS_setPriority
/* 8023EB7C 0023BABC 80 7F 00 04 */ lwz r3, 4(r31)
@@ -1134,22 +1134,22 @@ lbl_8023F7EC:
/* 8023F7F0 0023C730 2C 1A 00 03 */ cmpwi r26, 3
/* 8023F7F4 0023C734 3B BD 00 04 */ addi r29, r29, 4
/* 8023F7F8 0023C738 41 80 FF 9C */ blt lbl_8023F794
/* 8023F7FC 0023C73C 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 8023F800 0023C740 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8023F7FC 0023C73C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8023F800 0023C740 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8023F804 0023C744 80 63 5C 6C */ lwz r3, 0x5c6c(r3)
/* 8023F808 0023C748 81 83 00 00 */ lwz r12, 0(r3)
/* 8023F80C 0023C74C 81 8C 00 24 */ lwz r12, 0x24(r12)
/* 8023F810 0023C750 7D 89 03 A6 */ mtctr r12
/* 8023F814 0023C754 4E 80 04 21 */ bctrl
/* 8023F818 0023C758 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 8023F81C 0023C75C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8023F818 0023C758 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8023F81C 0023C75C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8023F820 0023C760 80 63 5C 78 */ lwz r3, 0x5c78(r3)
/* 8023F824 0023C764 81 83 00 00 */ lwz r12, 0(r3)
/* 8023F828 0023C768 81 8C 00 24 */ lwz r12, 0x24(r12)
/* 8023F82C 0023C76C 7D 89 03 A6 */ mtctr r12
/* 8023F830 0023C770 4E 80 04 21 */ bctrl
/* 8023F834 0023C774 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 8023F838 0023C778 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8023F834 0023C774 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8023F838 0023C778 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8023F83C 0023C77C 80 63 5C E4 */ lwz r3, 0x5ce4(r3)
/* 8023F840 0023C780 81 83 00 00 */ lwz r12, 0(r3)
/* 8023F844 0023C784 81 8C 00 24 */ lwz r12, 0x24(r12)
@@ -1355,8 +1355,8 @@ lbl_8023FA64:
/* 8023FB38 0023CA78 39 61 00 30 */ addi r11, r1, 0x30
/* 8023FB3C 0023CA7C 48 12 26 91 */ bl func_803621CC
/* 8023FB40 0023CA80 7C 7B 1B 78 */ mr r27, r3
/* 8023FB44 0023CA84 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 8023FB48 0023CA88 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8023FB44 0023CA84 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8023FB48 0023CA88 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8023FB4C 0023CA8C 83 A3 5F 50 */ lwz r29, 0x5f50(r3)
/* 8023FB50 0023CA90 7F A3 EB 78 */ mr r3, r29
/* 8023FB54 0023CA94 81 9D 00 00 */ lwz r12, 0(r29)
@@ -1801,8 +1801,8 @@ lbl_802401D8:
/* 802401D8 0023D118 57 A0 06 3E */ clrlwi r0, r29, 0x18
/* 802401DC 0023D11C 28 00 00 03 */ cmplwi r0, 3
/* 802401E0 0023D120 40 82 01 B0 */ bne lbl_80240390
/* 802401E4 0023D124 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 802401E8 0023D128 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 802401E4 0023D124 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 802401E8 0023D128 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 802401EC 0023D12C 80 63 5D AC */ lwz r3, 0x5dac(r3)
/* 802401F0 0023D130 38 63 05 38 */ addi r3, r3, 0x538
/* 802401F4 0023D134 38 81 00 44 */ addi r4, r1, 0x44
asm/d/msg/scrn/d_msg_scrn_jimaku.s
+10 -10
View File
@@ -42,8 +42,8 @@ lbl_802445CC:
/* 802445D4 00241514 3C 80 80 3A */ lis r4, lbl_80399A80@ha
/* 802445D8 00241518 38 84 9A 80 */ addi r4, r4, lbl_80399A80@l
/* 802445DC 0024151C 3C A0 00 02 */ lis r5, 2
/* 802445E0 00241520 3C C0 80 40 */ lis r6, lbl_804061C0@ha
/* 802445E4 00241524 38 C6 61 C0 */ addi r6, r6, lbl_804061C0@l
/* 802445E0 00241520 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha
/* 802445E4 00241524 38 C6 61 C0 */ addi r6, r6, g_dComIfG_gameInfo@l
/* 802445E8 00241528 80 C6 5C E4 */ lwz r6, 0x5ce4(r6)
/* 802445EC 0024152C 48 0B 40 5D */ bl J2DScreen_NS_setPriority
/* 802445F0 00241530 80 7F 00 04 */ lwz r3, 4(r31)
@@ -428,22 +428,22 @@ lbl_80244B90:
/* 80244B94 00241AD4 2C 1B 00 02 */ cmpwi r27, 2
/* 80244B98 00241AD8 3B BD 00 04 */ addi r29, r29, 4
/* 80244B9C 00241ADC 41 80 FF 9C */ blt lbl_80244B38
/* 80244BA0 00241AE0 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80244BA4 00241AE4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80244BA0 00241AE0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80244BA4 00241AE4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80244BA8 00241AE8 80 63 5C 6C */ lwz r3, 0x5c6c(r3)
/* 80244BAC 00241AEC 81 83 00 00 */ lwz r12, 0(r3)
/* 80244BB0 00241AF0 81 8C 00 24 */ lwz r12, 0x24(r12)
/* 80244BB4 00241AF4 7D 89 03 A6 */ mtctr r12
/* 80244BB8 00241AF8 4E 80 04 21 */ bctrl
/* 80244BBC 00241AFC 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80244BC0 00241B00 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80244BBC 00241AFC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80244BC0 00241B00 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80244BC4 00241B04 80 63 5C 70 */ lwz r3, 0x5c70(r3)
/* 80244BC8 00241B08 81 83 00 00 */ lwz r12, 0(r3)
/* 80244BCC 00241B0C 81 8C 00 24 */ lwz r12, 0x24(r12)
/* 80244BD0 00241B10 7D 89 03 A6 */ mtctr r12
/* 80244BD4 00241B14 4E 80 04 21 */ bctrl
/* 80244BD8 00241B18 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80244BDC 00241B1C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80244BD8 00241B18 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80244BDC 00241B1C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80244BE0 00241B20 80 63 5C E4 */ lwz r3, 0x5ce4(r3)
/* 80244BE4 00241B24 81 83 00 00 */ lwz r12, 0(r3)
/* 80244BE8 00241B28 81 8C 00 24 */ lwz r12, 0x24(r12)
@@ -538,8 +538,8 @@ lbl_80244D08:
/* 80244D3C 00241C7C 90 01 00 14 */ stw r0, 0x14(r1)
/* 80244D40 00241C80 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80244D44 00241C84 7C 7F 1B 78 */ mr r31, r3
/* 80244D48 00241C88 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80244D4C 00241C8C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80244D48 00241C88 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80244D4C 00241C8C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80244D50 00241C90 80 63 5F 50 */ lwz r3, 0x5f50(r3)
/* 80244D54 00241C94 81 83 00 00 */ lwz r12, 0(r3)
/* 80244D58 00241C98 81 8C 00 18 */ lwz r12, 0x18(r12)
asm/d/msg/scrn/d_msg_scrn_kanban.s
+6 -6
View File
@@ -43,8 +43,8 @@ lbl_80244EB0:
/* 80244EB8 00241DF8 3C 80 80 3A */ lis r4, lbl_80399AB8@ha
/* 80244EBC 00241DFC 38 84 9A B8 */ addi r4, r4, lbl_80399AB8@l
/* 80244EC0 00241E00 3C A0 01 02 */ lis r5, 0x102
/* 80244EC4 00241E04 3C C0 80 40 */ lis r6, lbl_804061C0@ha
/* 80244EC8 00241E08 3B A6 61 C0 */ addi r29, r6, lbl_804061C0@l
/* 80244EC4 00241E04 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha
/* 80244EC8 00241E08 3B A6 61 C0 */ addi r29, r6, g_dComIfG_gameInfo@l
/* 80244ECC 00241E0C 80 DD 5C 74 */ lwz r6, 0x5c74(r29)
/* 80244ED0 00241E10 48 0B 37 79 */ bl J2DScreen_NS_setPriority
/* 80244ED4 00241E14 80 7F 00 04 */ lwz r3, 4(r31)
@@ -450,8 +450,8 @@ lbl_802454C4:
/* 802454C8 00242408 2C 1B 00 03 */ cmpwi r27, 3
/* 802454CC 0024240C 3B BD 00 04 */ addi r29, r29, 4
/* 802454D0 00242410 41 80 FF 9C */ blt lbl_8024546C
/* 802454D4 00242414 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 802454D8 00242418 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 802454D4 00242414 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 802454D8 00242418 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 802454DC 0024241C 80 63 5C 74 */ lwz r3, 0x5c74(r3)
/* 802454E0 00242420 81 83 00 00 */ lwz r12, 0(r3)
/* 802454E4 00242424 81 8C 00 24 */ lwz r12, 0x24(r12)
@@ -540,8 +540,8 @@ lbl_802455D4:
/* 80245624 00242564 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80245628 00242568 93 C1 00 08 */ stw r30, 8(r1)
/* 8024562C 0024256C 7C 7E 1B 78 */ mr r30, r3
/* 80245630 00242570 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80245634 00242574 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80245630 00242570 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80245634 00242574 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80245638 00242578 83 E3 5F 50 */ lwz r31, 0x5f50(r3)
/* 8024563C 0024257C 7F E3 FB 78 */ mr r3, r31
/* 80245640 00242580 81 9F 00 00 */ lwz r12, 0(r31)
asm/d/msg/scrn/d_msg_scrn_light.s
+4 -4
View File
@@ -176,8 +176,8 @@ lbl_802459AC:
/* 802459B4 002428F4 3C 80 80 3A */ lis r4, lbl_80399B08@ha
/* 802459B8 002428F8 38 84 9B 08 */ addi r4, r4, lbl_80399B08@l
/* 802459BC 002428FC 3C A0 00 02 */ lis r5, 2
/* 802459C0 00242900 3C C0 80 40 */ lis r6, lbl_804061C0@ha
/* 802459C4 00242904 3B C6 61 C0 */ addi r30, r6, lbl_804061C0@l
/* 802459C0 00242900 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha
/* 802459C4 00242904 3B C6 61 C0 */ addi r30, r6, g_dComIfG_gameInfo@l
/* 802459C8 00242908 80 DE 5D 30 */ lwz r6, 0x5d30(r30)
/* 802459CC 0024290C 48 0B 2C 7D */ bl J2DScreen_NS_setPriority
/* 802459D0 00242910 80 7F 00 04 */ lwz r3, 4(r31)
@@ -680,8 +680,8 @@ dMsgScrnLight_c_NS_drawCommon:
/* 8024612C 0024306C FF 80 18 90 */ fmr f28, f3
/* 80246130 00243070 FF A0 20 90 */ fmr f29, f4
/* 80246134 00243074 FF C0 28 90 */ fmr f30, f5
/* 80246138 00243078 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 8024613C 0024307C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80246138 00243078 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8024613C 0024307C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80246140 00243080 83 E3 5F 50 */ lwz r31, 0x5f50(r3)
/* 80246144 00243084 7F E3 FB 78 */ mr r3, r31
/* 80246148 00243088 81 9F 00 00 */ lwz r12, 0(r31)
asm/d/msg/scrn/d_msg_scrn_place.s
+6 -6
View File
@@ -51,8 +51,8 @@ lbl_80246464:
/* 8024646C 002433AC 3C 80 80 3A */ lis r4, lbl_80399B78@ha
/* 80246470 002433B0 38 84 9B 78 */ addi r4, r4, lbl_80399B78@l
/* 80246474 002433B4 3C A0 00 02 */ lis r5, 2
/* 80246478 002433B8 3C C0 80 40 */ lis r6, lbl_804061C0@ha
/* 8024647C 002433BC 38 C6 61 C0 */ addi r6, r6, lbl_804061C0@l
/* 80246478 002433B8 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha
/* 8024647C 002433BC 38 C6 61 C0 */ addi r6, r6, g_dComIfG_gameInfo@l
/* 80246480 002433C0 80 C6 5C 7C */ lwz r6, 0x5c7c(r6)
/* 80246484 002433C4 48 0B 21 C5 */ bl J2DScreen_NS_setPriority
/* 80246488 002433C8 80 7F 00 04 */ lwz r3, 4(r31)
@@ -341,8 +341,8 @@ lbl_802468BC:
/* 802468C4 00243804 2C 1B 00 07 */ cmpwi r27, 7
/* 802468C8 00243808 3B DE 00 04 */ addi r30, r30, 4
/* 802468CC 0024380C 41 80 FF CC */ blt lbl_80246898
/* 802468D0 00243810 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 802468D4 00243814 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 802468D0 00243810 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 802468D4 00243814 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 802468D8 00243818 80 63 5C 7C */ lwz r3, 0x5c7c(r3)
/* 802468DC 0024381C 81 83 00 00 */ lwz r12, 0(r3)
/* 802468E0 00243820 81 8C 00 24 */ lwz r12, 0x24(r12)
@@ -441,8 +441,8 @@ lbl_80246A30:
/* 80246A4C 0024398C 90 01 00 14 */ stw r0, 0x14(r1)
/* 80246A50 00243990 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80246A54 00243994 7C 7F 1B 78 */ mr r31, r3
/* 80246A58 00243998 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80246A5C 0024399C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80246A58 00243998 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80246A5C 0024399C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80246A60 002439A0 80 63 5F 50 */ lwz r3, 0x5f50(r3)
/* 80246A64 002439A4 81 83 00 00 */ lwz r12, 0(r3)
/* 80246A68 002439A8 81 8C 00 18 */ lwz r12, 0x18(r12)
asm/d/msg/scrn/d_msg_scrn_staff.s
+6 -6
View File
@@ -32,8 +32,8 @@ lbl_80246B88:
/* 80246B90 00243AD0 3C 80 80 3A */ lis r4, lbl_80399B98@ha
/* 80246B94 00243AD4 38 84 9B 98 */ addi r4, r4, lbl_80399B98@l
/* 80246B98 00243AD8 3C A0 00 02 */ lis r5, 2
/* 80246B9C 00243ADC 3C C0 80 40 */ lis r6, lbl_804061C0@ha
/* 80246BA0 00243AE0 38 C6 61 C0 */ addi r6, r6, lbl_804061C0@l
/* 80246B9C 00243ADC 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha
/* 80246BA0 00243AE0 38 C6 61 C0 */ addi r6, r6, g_dComIfG_gameInfo@l
/* 80246BA4 00243AE4 80 C6 5C 84 */ lwz r6, 0x5c84(r6)
/* 80246BA8 00243AE8 48 0B 1A A1 */ bl J2DScreen_NS_setPriority
/* 80246BAC 00243AEC 80 7E 00 04 */ lwz r3, 4(r30)
@@ -230,8 +230,8 @@ lbl_80246E80:
/* 80246E88 00243DC8 2C 1C 00 06 */ cmpwi r28, 6
/* 80246E8C 00243DCC 3B FF 00 04 */ addi r31, r31, 4
/* 80246E90 00243DD0 41 80 FF CC */ blt lbl_80246E5C
/* 80246E94 00243DD4 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80246E98 00243DD8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80246E94 00243DD4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80246E98 00243DD8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80246E9C 00243DDC 80 63 5C 84 */ lwz r3, 0x5c84(r3)
/* 80246EA0 00243DE0 81 83 00 00 */ lwz r12, 0(r3)
/* 80246EA4 00243DE4 81 8C 00 24 */ lwz r12, 0x24(r12)
@@ -290,8 +290,8 @@ lbl_80246F54:
/* 80246F70 00243EB0 90 01 00 14 */ stw r0, 0x14(r1)
/* 80246F74 00243EB4 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80246F78 00243EB8 7C 7F 1B 78 */ mr r31, r3
/* 80246F7C 00243EBC 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80246F80 00243EC0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80246F7C 00243EBC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80246F80 00243EC0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80246F84 00243EC4 80 63 5F 50 */ lwz r3, 0x5f50(r3)
/* 80246F88 00243EC8 81 83 00 00 */ lwz r12, 0(r3)
/* 80246F8C 00243ECC 81 8C 00 18 */ lwz r12, 0x18(r12)
asm/d/msg/scrn/d_msg_scrn_talk.s
+22 -22
View File
@@ -45,8 +45,8 @@ lbl_80247070:
/* 80247078 00243FB8 3C 80 80 3A */ lis r4, lbl_80399BB0@ha
/* 8024707C 00243FBC 38 84 9B B0 */ addi r4, r4, lbl_80399BB0@l
/* 80247080 00243FC0 3C A0 00 02 */ lis r5, 2
/* 80247084 00243FC4 3C C0 80 40 */ lis r6, lbl_804061C0@ha
/* 80247088 00243FC8 38 C6 61 C0 */ addi r6, r6, lbl_804061C0@l
/* 80247084 00243FC4 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha
/* 80247088 00243FC8 38 C6 61 C0 */ addi r6, r6, g_dComIfG_gameInfo@l
/* 8024708C 00243FCC 80 C6 5C 70 */ lwz r6, 0x5c70(r6)
/* 80247090 00243FD0 48 0B 15 B9 */ bl J2DScreen_NS_setPriority
/* 80247094 00243FD4 80 7F 00 04 */ lwz r3, 4(r31)
@@ -59,8 +59,8 @@ lbl_80247070:
/* 802470B0 00243FF0 7C 60 1B 78 */ mr r0, r3
lbl_802470B4:
/* 802470B4 00243FF4 90 1F 00 C4 */ stw r0, 0xc4(r31)
/* 802470B8 00243FF8 3C 80 80 40 */ lis r4, lbl_804061C0@ha
/* 802470BC 00243FFC 3B C4 61 C0 */ addi r30, r4, lbl_804061C0@l
/* 802470B8 00243FF8 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha
/* 802470BC 00243FFC 3B C4 61 C0 */ addi r30, r4, g_dComIfG_gameInfo@l
/* 802470C0 00244000 80 9E 5D BC */ lwz r4, 0x5dbc(r30)
/* 802470C4 00244004 88 04 01 9A */ lbz r0, 0x19a(r4)
/* 802470C8 00244008 28 00 00 08 */ cmplwi r0, 8
@@ -92,8 +92,8 @@ lbl_8024710C:
/* 80247128 00244068 7C 60 1B 78 */ mr r0, r3
lbl_8024712C:
/* 8024712C 0024406C 90 1F 00 C8 */ stw r0, 0xc8(r31)
/* 80247130 00244070 3C 80 80 40 */ lis r4, lbl_804061C0@ha
/* 80247134 00244074 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l
/* 80247130 00244070 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha
/* 80247134 00244074 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l
/* 80247138 00244078 88 04 5E 8F */ lbz r0, 0x5e8f(r4)
/* 8024713C 0024407C 28 00 00 03 */ cmplwi r0, 3
/* 80247140 00244080 41 82 00 24 */ beq lbl_80247164
@@ -881,22 +881,22 @@ lbl_80247C98:
/* 80247C9C 00244BDC 2C 1A 00 06 */ cmpwi r26, 6
/* 80247CA0 00244BE0 3B BD 00 04 */ addi r29, r29, 4
/* 80247CA4 00244BE4 41 80 FF 98 */ blt lbl_80247C3C
/* 80247CA8 00244BE8 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80247CAC 00244BEC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80247CA8 00244BE8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80247CAC 00244BEC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80247CB0 00244BF0 80 63 5C 6C */ lwz r3, 0x5c6c(r3)
/* 80247CB4 00244BF4 81 83 00 00 */ lwz r12, 0(r3)
/* 80247CB8 00244BF8 81 8C 00 24 */ lwz r12, 0x24(r12)
/* 80247CBC 00244BFC 7D 89 03 A6 */ mtctr r12
/* 80247CC0 00244C00 4E 80 04 21 */ bctrl
/* 80247CC4 00244C04 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80247CC8 00244C08 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80247CC4 00244C04 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80247CC8 00244C08 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80247CCC 00244C0C 80 63 5C 70 */ lwz r3, 0x5c70(r3)
/* 80247CD0 00244C10 81 83 00 00 */ lwz r12, 0(r3)
/* 80247CD4 00244C14 81 8C 00 24 */ lwz r12, 0x24(r12)
/* 80247CD8 00244C18 7D 89 03 A6 */ mtctr r12
/* 80247CDC 00244C1C 4E 80 04 21 */ bctrl
/* 80247CE0 00244C20 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80247CE4 00244C24 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80247CE0 00244C20 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80247CE4 00244C24 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80247CE8 00244C28 80 63 5C E4 */ lwz r3, 0x5ce4(r3)
/* 80247CEC 00244C2C 81 83 00 00 */ lwz r12, 0(r3)
/* 80247CF0 00244C30 81 8C 00 24 */ lwz r12, 0x24(r12)
@@ -999,8 +999,8 @@ lbl_80247E20:
/* 80247E60 00244DA0 39 61 00 50 */ addi r11, r1, 0x50
/* 80247E64 00244DA4 48 11 A3 59 */ bl func_803621BC
/* 80247E68 00244DA8 7C 78 1B 78 */ mr r24, r3
/* 80247E6C 00244DAC 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80247E70 00244DB0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80247E6C 00244DAC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80247E70 00244DB0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80247E74 00244DB4 83 63 5F 50 */ lwz r27, 0x5f50(r3)
/* 80247E78 00244DB8 7F 63 DB 78 */ mr r3, r27
/* 80247E7C 00244DBC 81 9B 00 00 */ lwz r12, 0(r27)
@@ -1018,8 +1018,8 @@ lbl_80247E20:
/* 80247EAC 00244DEC 3A E0 00 00 */ li r23, 0
/* 80247EB0 00244DF0 3A C0 00 00 */ li r22, 0
/* 80247EB4 00244DF4 3A A0 00 00 */ li r21, 0
/* 80247EB8 00244DF8 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80247EBC 00244DFC 3B A3 61 C0 */ addi r29, r3, lbl_804061C0@l
/* 80247EB8 00244DF8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80247EBC 00244DFC 3B A3 61 C0 */ addi r29, r3, g_dComIfG_gameInfo@l
/* 80247EC0 00244E00 3C 60 80 43 */ lis r3, lbl_8043028C@ha
/* 80247EC4 00244E04 3B C3 02 8C */ addi r30, r3, lbl_8043028C@l
/* 80247EC8 00244E08 3C 60 80 43 */ lis r3, lbl_80430188@ha
@@ -1120,8 +1120,8 @@ lbl_8024801C:
/* 80248024 00244F64 41 80 FE B0 */ blt lbl_80247ED4
/* 80248028 00244F68 48 00 00 60 */ b lbl_80248088
lbl_8024802C:
/* 8024802C 00244F6C 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80248030 00244F70 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8024802C 00244F6C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80248030 00244F70 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80248034 00244F74 80 63 5D BC */ lwz r3, 0x5dbc(r3)
/* 80248038 00244F78 88 03 01 9A */ lbz r0, 0x19a(r3)
/* 8024803C 00244F7C 28 00 00 08 */ cmplwi r0, 8
@@ -1368,8 +1368,8 @@ lbl_802483C0:
/* 802483C0 00245300 57 A0 06 3E */ clrlwi r0, r29, 0x18
/* 802483C4 00245304 28 00 00 03 */ cmplwi r0, 3
/* 802483C8 00245308 40 82 01 A4 */ bne lbl_8024856C
/* 802483CC 0024530C 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 802483D0 00245310 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 802483CC 0024530C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 802483D0 00245310 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 802483D4 00245314 80 63 5D AC */ lwz r3, 0x5dac(r3)
/* 802483D8 00245318 38 63 05 38 */ addi r3, r3, 0x538
/* 802483DC 0024531C 38 81 00 44 */ addi r4, r1, 0x44
@@ -1579,8 +1579,8 @@ lbl_802486B4:
/* 802486D8 00245618 C0 42 B3 40 */ lfs f2, lbl_80454D40-_SDA2_BASE_(r2)
/* 802486DC 0024561C 4B FF 16 BD */ bl dMsgScrn3Select_c_NS_translate
lbl_802486E0:
/* 802486E0 00245620 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 802486E4 00245624 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 802486E0 00245620 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 802486E4 00245624 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 802486E8 00245628 88 03 5E 8F */ lbz r0, 0x5e8f(r3)
/* 802486EC 0024562C 28 00 00 02 */ cmplwi r0, 2
/* 802486F0 00245630 41 82 00 0C */ beq lbl_802486FC
asm/d/msg/scrn/d_msg_scrn_tree.s
+6 -6
View File
@@ -52,8 +52,8 @@ lbl_802489E8:
/* 802489F0 00245930 3C 80 80 3A */ lis r4, lbl_80399C30@ha
/* 802489F4 00245934 38 84 9C 30 */ addi r4, r4, lbl_80399C30@l
/* 802489F8 00245938 3C A0 01 02 */ lis r5, 0x102
/* 802489FC 0024593C 3C C0 80 40 */ lis r6, lbl_804061C0@ha
/* 80248A00 00245940 3B 66 61 C0 */ addi r27, r6, lbl_804061C0@l
/* 802489FC 0024593C 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha
/* 80248A00 00245940 3B 66 61 C0 */ addi r27, r6, g_dComIfG_gameInfo@l
/* 80248A04 00245944 80 DB 5C 74 */ lwz r6, 0x5c74(r27)
/* 80248A08 00245948 48 0A FC 41 */ bl J2DScreen_NS_setPriority
/* 80248A0C 0024594C 80 7F 00 04 */ lwz r3, 4(r31)
@@ -506,8 +506,8 @@ lbl_802490B4:
/* 802490B8 00245FF8 2C 1B 00 03 */ cmpwi r27, 3
/* 802490BC 00245FFC 3B BD 00 04 */ addi r29, r29, 4
/* 802490C0 00246000 41 80 FF 9C */ blt lbl_8024905C
/* 802490C4 00246004 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 802490C8 00246008 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 802490C4 00246004 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 802490C8 00246008 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 802490CC 0024600C 80 63 5C 74 */ lwz r3, 0x5c74(r3)
/* 802490D0 00246010 81 83 00 00 */ lwz r12, 0(r3)
/* 802490D4 00246014 81 8C 00 24 */ lwz r12, 0x24(r12)
@@ -623,8 +623,8 @@ lbl_8024922C:
/* 8024927C 002461BC 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80249280 002461C0 93 C1 00 08 */ stw r30, 8(r1)
/* 80249284 002461C4 7C 7E 1B 78 */ mr r30, r3
/* 80249288 002461C8 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 8024928C 002461CC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80249288 002461C8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8024928C 002461CC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80249290 002461D0 83 E3 5F 50 */ lwz r31, 0x5f50(r3)
/* 80249294 002461D4 7F E3 FB 78 */ mr r3, r31
/* 80249298 002461D8 81 9F 00 00 */ lwz r12, 0(r31)