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

fopMsgM_messageGet OK + rename g_meter2_info global

Browse Source
This commit is contained in:
Pheenoh
2021-03-27 19:53:05 -04:00
parent 7c15fdc3f2
commit a94009b139
154 changed files with 1184 additions and 1182 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/bss.s
+2 -2
View File
@@ -482,8 +482,8 @@ lbl_80430158:
.global lbl_80430178
lbl_80430178:
.skip 0x10
.global lbl_80430188
lbl_80430188:
.global g_meter2_info
g_meter2_info:
.skip 0xF8
.global lbl_80430280
lbl_80430280:
asm/d/d_gameover.s
+20 -20
View File
@@ -252,8 +252,8 @@ lbl_8019B0A8:
lbl_8019B0B0:
/* 8019B0B0 00197FF0 2C 03 00 04 */ cmpwi r3, 4
/* 8019B0B4 00197FF4 40 82 02 28 */ bne lbl_8019B2DC
/* 8019B0B8 00197FF8 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 8019B0BC 00197FFC 3B E3 01 88 */ addi r31, r3, lbl_80430188@l
/* 8019B0B8 00197FF8 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 8019B0BC 00197FFC 3B E3 01 88 */ addi r31, r3, g_meter2_info@l
/* 8019B0C0 00198000 88 1F 00 C2 */ lbz r0, 0xc2(r31)
/* 8019B0C4 00198004 28 00 00 00 */ cmplwi r0, 0
/* 8019B0C8 00198008 40 82 00 48 */ bne lbl_8019B110
@@ -635,8 +635,8 @@ lbl_8019B5DC:
lbl_8019B644:
/* 8019B644 00198584 28 00 00 01 */ cmplwi r0, 1
/* 8019B648 00198588 40 82 01 18 */ bne lbl_8019B760
/* 8019B64C 0019858C 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 8019B650 00198590 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 8019B64C 0019858C 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 8019B650 00198590 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 8019B654 00198594 88 03 00 C2 */ lbz r0, 0xc2(r3)
/* 8019B658 00198598 28 00 00 01 */ cmplwi r0, 1
/* 8019B65C 0019859C 41 82 00 0C */ beq lbl_8019B668
@@ -698,20 +698,20 @@ lbl_8019B6E4:
/* 8019B72C 0019866C 38 80 00 01 */ li r4, 1
/* 8019B730 00198670 38 A0 00 48 */ li r5, 0x48
/* 8019B734 00198674 4B E9 78 85 */ bl setItem__17dSv_player_item_cFiUc
/* 8019B738 00198678 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 8019B73C 0019867C 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 8019B738 00198678 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 8019B73C 0019867C 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 8019B740 00198680 A0 03 00 B6 */ lhz r0, 0xb6(r3)
/* 8019B744 00198684 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8019B748 00198688 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8019B74C 0019868C B0 03 00 08 */ sth r0, 8(r3)
lbl_8019B750:
/* 8019B750 00198690 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 8019B754 00198694 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 8019B750 00198690 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 8019B754 00198694 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 8019B758 00198698 38 80 00 00 */ li r4, 0
/* 8019B75C 0019869C 48 08 29 69 */ bl resetMiniGameItem__13dMeter2Info_cFb
lbl_8019B760:
/* 8019B760 001986A0 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 8019B764 001986A4 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 8019B760 001986A0 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 8019B764 001986A4 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 8019B768 001986A8 88 03 00 C2 */ lbz r0, 0xc2(r3)
/* 8019B76C 001986AC 28 00 00 01 */ cmplwi r0, 1
/* 8019B770 001986B0 40 82 00 2C */ bne lbl_8019B79C
@@ -885,8 +885,8 @@ lbl_8019B994:
/* 8019B9C4 00198904 98 1F 00 15 */ stb r0, 0x15(r31)
/* 8019B9C8 00198908 98 1F 00 16 */ stb r0, 0x16(r31)
/* 8019B9CC 0019890C 98 1F 00 17 */ stb r0, 0x17(r31)
/* 8019B9D0 00198910 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 8019B9D4 00198914 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 8019B9D0 00198910 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 8019B9D4 00198914 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 8019B9D8 00198918 88 03 00 C2 */ lbz r0, 0xc2(r3)
/* 8019B9DC 0019891C 28 00 00 00 */ cmplwi r0, 0
/* 8019B9E0 00198920 41 82 00 74 */ beq lbl_8019BA54
@@ -998,8 +998,8 @@ lbl_8019BB18:
/* 8019BB80 00198AC0 81 8C 00 9C */ lwz r12, 0x9c(r12)
/* 8019BB84 00198AC4 7D 89 03 A6 */ mtctr r12
/* 8019BB88 00198AC8 4E 80 04 21 */ bctrl
/* 8019BB8C 00198ACC 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 8019BB90 00198AD0 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 8019BB8C 00198ACC 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 8019BB90 00198AD0 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 8019BB94 00198AD4 38 80 03 81 */ li r4, 0x381
/* 8019BB98 00198AD8 38 A1 00 34 */ addi r5, r1, 0x34
/* 8019BB9C 00198ADC 38 C0 00 00 */ li r6, 0
@@ -1111,8 +1111,8 @@ setBackAlpha__24dDlst_GameOverScrnDraw_cFf:
/* 8019BD28 00198C68 81 8C 00 18 */ lwz r12, 0x18(r12)
/* 8019BD2C 00198C6C 7D 89 03 A6 */ mtctr r12
/* 8019BD30 00198C70 4E 80 04 21 */ bctrl
/* 8019BD34 00198C74 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 8019BD38 00198C78 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 8019BD34 00198C74 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 8019BD38 00198C78 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 8019BD3C 00198C7C 88 03 00 C2 */ lbz r0, 0xc2(r3)
/* 8019BD40 00198C80 28 00 00 01 */ cmplwi r0, 1
/* 8019BD44 00198C84 41 82 00 0C */ beq lbl_8019BD50
@@ -1286,8 +1286,8 @@ d_GameOver_Create__FUc:
/* 8019BFC4 00198F04 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8019BFC8 00198F08 7C 08 02 A6 */ mflr r0
/* 8019BFCC 00198F0C 90 01 00 14 */ stw r0, 0x14(r1)
/* 8019BFD0 00198F10 3C 80 80 43 */ lis r4, lbl_80430188@ha
/* 8019BFD4 00198F14 38 84 01 88 */ addi r4, r4, lbl_80430188@l
/* 8019BFD0 00198F10 3C 80 80 43 */ lis r4, g_meter2_info@ha
/* 8019BFD4 00198F14 38 84 01 88 */ addi r4, r4, g_meter2_info@l
/* 8019BFD8 00198F18 98 64 00 C2 */ stb r3, 0xc2(r4)
/* 8019BFDC 00198F1C 38 60 03 17 */ li r3, 0x317
/* 8019BFE0 00198F20 38 80 00 00 */ li r4, 0
@@ -1317,8 +1317,8 @@ d_GameOver_Delete__FRUi:
/* 8019C034 00198F74 38 00 FF FF */ li r0, -1
/* 8019C038 00198F78 90 1F 00 00 */ stw r0, 0(r31)
/* 8019C03C 00198F7C 38 00 00 00 */ li r0, 0
/* 8019C040 00198F80 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 8019C044 00198F84 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 8019C040 00198F80 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 8019C044 00198F84 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 8019C048 00198F88 98 03 00 C2 */ stb r0, 0xc2(r3)
/* 8019C04C 00198F8C 38 60 00 01 */ li r3, 1
/* 8019C050 00198F90 48 00 00 08 */ b lbl_8019C058
asm/d/d_meter2.s
+76 -76
View File
@@ -47,8 +47,8 @@ lbl_8021EA84:
/* 8021EAA8 0021B9E8 2C 03 00 00 */ cmpwi r3, 0
/* 8021EAAC 0021B9EC 40 82 00 18 */ bne lbl_8021EAC4
/* 8021EAB0 0021B9F0 38 00 00 00 */ li r0, 0
/* 8021EAB4 0021B9F4 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 8021EAB8 0021B9F8 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 8021EAB4 0021B9F4 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 8021EAB8 0021B9F8 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 8021EABC 0021B9FC 98 03 00 BC */ stb r0, 0xbc(r3)
/* 8021EAC0 0021BA00 98 03 00 BB */ stb r0, 0xbb(r3)
lbl_8021EAC4:
@@ -261,8 +261,8 @@ lbl_8021ED98:
/* 8021EDE0 0021BD20 D0 1F 01 88 */ stfs f0, 0x188(r31)
/* 8021EDE4 0021BD24 D0 1F 01 8C */ stfs f0, 0x18c(r31)
/* 8021EDE8 0021BD28 3B 20 00 00 */ li r25, 0
/* 8021EDEC 0021BD2C 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 8021EDF0 0021BD30 3B 63 01 88 */ addi r27, r3, lbl_80430188@l
/* 8021EDEC 0021BD2C 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 8021EDF0 0021BD30 3B 63 01 88 */ addi r27, r3, g_meter2_info@l
lbl_8021EDF4:
/* 8021EDF4 0021BD34 7F 63 DB 78 */ mr r3, r27
/* 8021EDF8 0021BD38 7F 24 CB 78 */ mr r4, r25
@@ -311,8 +311,8 @@ lbl_8021EE40:
/* 8021EEA0 0021BDE0 98 1F 01 D0 */ stb r0, 0x1d0(r31)
/* 8021EEA4 0021BDE4 88 03 5E 20 */ lbz r0, 0x5e20(r3)
/* 8021EEA8 0021BDE8 98 1F 01 D1 */ stb r0, 0x1d1(r31)
/* 8021EEAC 0021BDEC 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 8021EEB0 0021BDF0 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 8021EEAC 0021BDEC 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 8021EEB0 0021BDF0 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 8021EEB4 0021BDF4 A0 03 00 AE */ lhz r0, 0xae(r3)
/* 8021EEB8 0021BDF8 54 00 E7 FE */ rlwinm r0, r0, 0x1c, 0x1f, 0x1f
/* 8021EEBC 0021BDFC 90 1F 01 AC */ stw r0, 0x1ac(r31)
@@ -448,8 +448,8 @@ lbl_8021F094:
/* 8021F094 0021BFD4 90 1F 01 20 */ stw r0, 0x120(r31)
/* 8021F098 0021BFD8 48 00 00 20 */ b lbl_8021F0B8
lbl_8021F09C:
/* 8021F09C 0021BFDC 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 8021F0A0 0021BFE0 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 8021F09C 0021BFDC 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 8021F0A0 0021BFE0 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 8021F0A4 0021BFE4 88 03 00 BF */ lbz r0, 0xbf(r3)
/* 8021F0A8 0021BFE8 28 00 00 02 */ cmplwi r0, 2
/* 8021F0AC 0021BFEC 40 82 00 0C */ bne lbl_8021F0B8
@@ -457,8 +457,8 @@ lbl_8021F09C:
/* 8021F0B4 0021BFF4 98 03 00 BF */ stb r0, 0xbf(r3)
lbl_8021F0B8:
/* 8021F0B8 0021BFF8 80 1F 01 20 */ lwz r0, 0x120(r31)
/* 8021F0BC 0021BFFC 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 8021F0C0 0021C000 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 8021F0BC 0021BFFC 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 8021F0C0 0021C000 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 8021F0C4 0021C004 90 03 00 20 */ stw r0, 0x20(r3)
/* 8021F0C8 0021C008 80 7F 01 00 */ lwz r3, 0x100(r31)
/* 8021F0CC 0021C00C 48 0A F6 B9 */ bl getTotalFreeSize__7JKRHeapCFv
@@ -598,14 +598,14 @@ lbl_8021F2A4:
/* 8021F2C8 0021C208 88 03 4F AD */ lbz r0, 0x4fad(r3)
/* 8021F2CC 0021C20C 28 00 00 00 */ cmplwi r0, 0
/* 8021F2D0 0021C210 40 82 00 10 */ bne lbl_8021F2E0
/* 8021F2D4 0021C214 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 8021F2D8 0021C218 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 8021F2D4 0021C214 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 8021F2D8 0021C218 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 8021F2DC 0021C21C 4B FF EA 05 */ bl decHotSpringTimer__13dMeter2Info_cFv
lbl_8021F2E0:
/* 8021F2E0 0021C220 3C 60 00 01 */ lis r3, 0x0000FFFF@ha
/* 8021F2E4 0021C224 38 03 FF FF */ addi r0, r3, 0x0000FFFF@l
/* 8021F2E8 0021C228 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 8021F2EC 0021C22C 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 8021F2E8 0021C228 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 8021F2EC 0021C22C 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 8021F2F0 0021C230 B0 03 00 AE */ sth r0, 0xae(r3)
/* 8021F2F4 0021C234 54 00 04 3E */ clrlwi r0, r0, 0x10
/* 8021F2F8 0021C238 54 00 05 66 */ rlwinm r0, r0, 0, 0x15, 0x13
@@ -685,8 +685,8 @@ lbl_8021F3F8:
/* 8021F408 0021C348 38 A3 00 B0 */ addi r5, r3, 0xb0
/* 8021F40C 0021C34C 4B E3 73 89 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c
lbl_8021F410:
/* 8021F410 0021C350 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 8021F414 0021C354 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 8021F410 0021C350 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 8021F414 0021C354 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 8021F418 0021C358 88 03 00 B9 */ lbz r0, 0xb9(r3)
/* 8021F41C 0021C35C 28 00 00 02 */ cmplwi r0, 2
/* 8021F420 0021C360 40 82 00 24 */ bne lbl_8021F444
@@ -1007,8 +1007,8 @@ lbl_8021F84C:
/* 8021F894 0021C7D4 7C 00 19 10 */ subfe r0, r0, r3
/* 8021F898 0021C7D8 54 00 06 3F */ clrlwi. r0, r0, 0x18
/* 8021F89C 0021C7DC 41 82 00 40 */ beq lbl_8021F8DC
/* 8021F8A0 0021C7E0 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 8021F8A4 0021C7E4 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 8021F8A0 0021C7E0 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 8021F8A4 0021C7E4 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 8021F8A8 0021C7E8 4B FF C9 35 */ bl isFloatingMessageVisible__13dMeter2Info_cFv
/* 8021F8AC 0021C7EC 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 8021F8B0 0021C7F0 40 82 00 2C */ bne lbl_8021F8DC
@@ -1038,8 +1038,8 @@ lbl_8021F8DC:
/* 8021F90C 0021C84C 7C 00 19 10 */ subfe r0, r0, r3
/* 8021F910 0021C850 54 00 06 3F */ clrlwi. r0, r0, 0x18
/* 8021F914 0021C854 41 82 00 40 */ beq lbl_8021F954
/* 8021F918 0021C858 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 8021F91C 0021C85C 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 8021F918 0021C858 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 8021F91C 0021C85C 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 8021F920 0021C860 4B FF C8 BD */ bl isFloatingMessageVisible__13dMeter2Info_cFv
/* 8021F924 0021C864 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 8021F928 0021C868 40 82 00 2C */ bne lbl_8021F954
@@ -1207,8 +1207,8 @@ lbl_8021FB38:
/* 8021FB78 0021CAB8 64 00 02 00 */ oris r0, r0, 0x200
/* 8021FB7C 0021CABC 90 1F 01 24 */ stw r0, 0x124(r31)
lbl_8021FB80:
/* 8021FB80 0021CAC0 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 8021FB84 0021CAC4 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 8021FB80 0021CAC0 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 8021FB84 0021CAC4 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 8021FB88 0021CAC8 88 03 00 B9 */ lbz r0, 0xb9(r3)
/* 8021FB8C 0021CACC 28 00 00 0A */ cmplwi r0, 0xa
/* 8021FB90 0021CAD0 41 81 01 50 */ bgt lbl_8021FCE0
@@ -1455,8 +1455,8 @@ lbl_8021FEF4:
/* 8021FF10 0021CE50 38 04 00 01 */ addi r0, r4, 1
/* 8021FF14 0021CE54 B0 1E 01 94 */ sth r0, 0x194(r30)
/* 8021FF18 0021CE58 38 00 00 01 */ li r0, 1
/* 8021FF1C 0021CE5C 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 8021FF20 0021CE60 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 8021FF1C 0021CE5C 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 8021FF20 0021CE60 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 8021FF24 0021CE64 98 03 00 E6 */ stb r0, 0xe6(r3)
/* 8021FF28 0021CE68 38 00 00 01 */ li r0, 1
/* 8021FF2C 0021CE6C 48 00 00 14 */ b lbl_8021FF40
@@ -1481,8 +1481,8 @@ lbl_8021FF40:
/* 8021FF70 0021CEB0 80 1F 5F 18 */ lwz r0, 0x5f18(r31)
/* 8021FF74 0021CEB4 54 00 00 85 */ rlwinm. r0, r0, 0, 2, 2
/* 8021FF78 0021CEB8 40 82 00 18 */ bne lbl_8021FF90
/* 8021FF7C 0021CEBC 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 8021FF80 0021CEC0 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 8021FF7C 0021CEBC 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 8021FF80 0021CEC0 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 8021FF84 0021CEC4 88 03 00 E6 */ lbz r0, 0xe6(r3)
/* 8021FF88 0021CEC8 28 00 00 00 */ cmplwi r0, 0
/* 8021FF8C 0021CECC 41 82 00 58 */ beq lbl_8021FFE4
@@ -1551,8 +1551,8 @@ lbl_80220070:
/* 80220070 0021CFB0 38 00 00 01 */ li r0, 1
/* 80220074 0021CFB4 48 00 00 20 */ b lbl_80220094
lbl_80220078:
/* 80220078 0021CFB8 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 8022007C 0021CFBC 38 83 01 88 */ addi r4, r3, lbl_80430188@l
/* 80220078 0021CFB8 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 8022007C 0021CFBC 38 83 01 88 */ addi r4, r3, g_meter2_info@l
/* 80220080 0021CFC0 88 64 00 E6 */ lbz r3, 0xe6(r4)
/* 80220084 0021CFC4 28 03 00 00 */ cmplwi r3, 0
/* 80220088 0021CFC8 41 82 00 0C */ beq lbl_80220094
@@ -2253,8 +2253,8 @@ lbl_80220A1C:
/* 80220A5C 0021D99C 4E 80 04 21 */ bctrl
/* 80220A60 0021D9A0 2C 03 00 00 */ cmpwi r3, 0
/* 80220A64 0021D9A4 40 82 00 18 */ bne lbl_80220A7C
/* 80220A68 0021D9A8 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 80220A6C 0021D9AC 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 80220A68 0021D9A8 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 80220A6C 0021D9AC 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 80220A70 0021D9B0 88 03 00 E8 */ lbz r0, 0xe8(r3)
/* 80220A74 0021D9B4 28 00 00 00 */ cmplwi r0, 0
/* 80220A78 0021D9B8 41 82 00 20 */ beq lbl_80220A98
@@ -4056,8 +4056,8 @@ lbl_802223B4:
/* 802223C4 0021F304 7C 04 00 40 */ cmplw r4, r0
/* 802223C8 0021F308 40 82 00 74 */ bne lbl_8022243C
/* 802223CC 0021F30C 80 9E 01 AC */ lwz r4, 0x1ac(r30)
/* 802223D0 0021F310 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 802223D4 0021F314 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 802223D0 0021F310 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 802223D4 0021F314 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 802223D8 0021F318 A0 03 00 AE */ lhz r0, 0xae(r3)
/* 802223DC 0021F31C 54 00 E7 FE */ rlwinm r0, r0, 0x1c, 0x1f, 0x1f
/* 802223E0 0021F320 7C 04 00 00 */ cmpw r4, r0
@@ -4091,8 +4091,8 @@ lbl_8022243C:
/* 80222444 0021F384 B0 7E 01 9A */ sth r3, 0x19a(r30)
/* 80222448 0021F388 88 1F 5E 2F */ lbz r0, 0x5e2f(r31)
/* 8022244C 0021F38C 98 1E 01 CB */ stb r0, 0x1cb(r30)
/* 80222450 0021F390 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 80222454 0021F394 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 80222450 0021F390 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 80222454 0021F394 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 80222458 0021F398 A0 03 00 AE */ lhz r0, 0xae(r3)
/* 8022245C 0021F39C 54 00 E7 FE */ rlwinm r0, r0, 0x1c, 0x1f, 0x1f
/* 80222460 0021F3A0 90 1E 01 AC */ stw r0, 0x1ac(r30)
@@ -4592,16 +4592,16 @@ lbl_80222B24:
/* 80222B3C 0021FA7C 38 61 00 0C */ addi r3, r1, 0xc
/* 80222B40 0021FA80 7C 03 E9 AE */ stbx r0, r3, r29
lbl_80222B44:
/* 80222B44 0021FA84 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 80222B48 0021FA88 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 80222B44 0021FA84 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 80222B48 0021FA88 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 80222B4C 0021FA8C 7F A4 EB 78 */ mr r4, r29
/* 80222B50 0021FA90 4B FF 9E 01 */ bl isDirectUseItem__13dMeter2Info_cFi
/* 80222B54 0021FA94 7F 3C EA 14 */ add r25, r28, r29
/* 80222B58 0021FA98 88 19 01 D6 */ lbz r0, 0x1d6(r25)
/* 80222B5C 0021FA9C 7C 00 18 00 */ cmpw r0, r3
/* 80222B60 0021FAA0 41 82 00 2C */ beq lbl_80222B8C
/* 80222B64 0021FAA4 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 80222B68 0021FAA8 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 80222B64 0021FAA4 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 80222B68 0021FAA8 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 80222B6C 0021FAAC 7F A4 EB 78 */ mr r4, r29
/* 80222B70 0021FAB0 4B FF 9D E1 */ bl isDirectUseItem__13dMeter2Info_cFi
/* 80222B74 0021FAB4 98 79 01 D6 */ stb r3, 0x1d6(r25)
@@ -4808,8 +4808,8 @@ lbl_80222E44:
/* 80222E58 0021FD98 7F 83 E3 78 */ mr r3, r28
/* 80222E5C 0021FD9C 48 00 22 99 */ bl alphaAnimeButton__9dMeter2_cFv
/* 80222E60 0021FDA0 38 00 00 00 */ li r0, 0
/* 80222E64 0021FDA4 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 80222E68 0021FDA8 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 80222E64 0021FDA4 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 80222E68 0021FDA8 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 80222E6C 0021FDAC 98 03 00 B8 */ stb r0, 0xb8(r3)
/* 80222E70 0021FDB0 39 61 00 30 */ addi r11, r1, 0x30
/* 80222E74 0021FDB4 48 13 F3 A5 */ bl func_80362218
@@ -5025,8 +5025,8 @@ lbl_80223148:
/* 80223158 00220098 28 00 00 05 */ cmplwi r0, 5
/* 8022315C 0022009C 40 82 00 34 */ bne lbl_80223190
/* 80223160 002200A0 A0 1E 01 B6 */ lhz r0, 0x1b6(r30)
/* 80223164 002200A4 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 80223168 002200A8 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 80223164 002200A4 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 80223168 002200A8 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 8022316C 002200AC 80 63 00 8C */ lwz r3, 0x8c(r3)
/* 80223170 002200B0 7C 00 18 00 */ cmpw r0, r3
/* 80223174 002200B4 41 82 00 1C */ beq lbl_80223190
@@ -5566,8 +5566,8 @@ lbl_80223944:
/* 8022394C 0022088C 48 0A B3 01 */ bl __nw__FUl
/* 80223950 00220890 7C 60 1B 79 */ or. r0, r3, r3
/* 80223954 00220894 41 82 00 18 */ beq lbl_8022396C
/* 80223958 00220898 3C 80 80 43 */ lis r4, lbl_80430188@ha
/* 8022395C 0022089C 38 84 01 88 */ addi r4, r4, lbl_80430188@l
/* 80223958 00220898 3C 80 80 43 */ lis r4, g_meter2_info@ha
/* 8022395C 0022089C 38 84 01 88 */ addi r4, r4, g_meter2_info@l
/* 80223960 002208A0 80 84 00 8C */ lwz r4, 0x8c(r4)
/* 80223964 002208A4 4B FE B3 FD */ bl __ct__14dMeterString_cFi
/* 80223968 002208A8 7C 60 1B 78 */ mr r0, r3
@@ -5575,8 +5575,8 @@ lbl_8022396C:
/* 8022396C 002208AC 90 1F 01 14 */ stw r0, 0x114(r31)
/* 80223970 002208B0 38 00 00 05 */ li r0, 5
/* 80223974 002208B4 98 1F 01 E5 */ stb r0, 0x1e5(r31)
/* 80223978 002208B8 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 8022397C 002208BC 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 80223978 002208B8 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 8022397C 002208BC 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 80223980 002208C0 80 03 00 8C */ lwz r0, 0x8c(r3)
/* 80223984 002208C4 B0 1F 01 B6 */ sth r0, 0x1b6(r31)
/* 80223988 002208C8 48 00 02 24 */ b lbl_80223BAC
@@ -5603,8 +5603,8 @@ lbl_802239CC:
/* 802239D4 00220914 98 1F 01 E5 */ stb r0, 0x1e5(r31)
/* 802239D8 00220918 48 00 01 D4 */ b lbl_80223BAC
lbl_802239DC:
/* 802239DC 0022091C 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 802239E0 00220920 3B C3 01 88 */ addi r30, r3, lbl_80430188@l
/* 802239DC 0022091C 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 802239E0 00220920 3B C3 01 88 */ addi r30, r3, g_meter2_info@l
/* 802239E4 00220924 80 1E 00 8C */ lwz r0, 0x8c(r30)
/* 802239E8 00220928 2C 00 00 00 */ cmpwi r0, 0
/* 802239EC 0022092C 41 82 00 48 */ beq lbl_80223A34
@@ -5759,8 +5759,8 @@ check2DContents__9dMeter2_cFv:
/* 80223BF8 00220B38 28 00 00 05 */ cmplwi r0, 5
/* 80223BFC 00220B3C 40 82 01 F0 */ bne lbl_80223DEC
lbl_80223C00:
/* 80223C00 00220B40 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 80223C04 00220B44 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 80223C00 00220B40 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 80223C04 00220B44 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 80223C08 00220B48 4B FF 85 D5 */ bl isFloatingMessageVisible__13dMeter2Info_cFv
/* 80223C0C 00220B4C 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 80223C10 00220B50 40 82 00 88 */ bne lbl_80223C98
@@ -5823,8 +5823,8 @@ lbl_80223CDC:
/* 80223CE4 00220C24 88 03 5E 8F */ lbz r0, 0x5e8f(r3)
/* 80223CE8 00220C28 28 00 00 05 */ cmplwi r0, 5
/* 80223CEC 00220C2C 40 82 01 00 */ bne lbl_80223DEC
/* 80223CF0 00220C30 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 80223CF4 00220C34 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 80223CF0 00220C30 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 80223CF4 00220C34 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 80223CF8 00220C38 4B FF 84 E5 */ bl isFloatingMessageVisible__13dMeter2Info_cFv
/* 80223CFC 00220C3C 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 80223D00 00220C40 40 82 00 EC */ bne lbl_80223DEC
@@ -5907,8 +5907,8 @@ moveBombNum__9dMeter2_cFv:
/* 80223E1C 00220D5C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80223E20 00220D60 3B A3 61 C0 */ addi r29, r3, g_dComIfG_gameInfo@l
/* 80223E24 00220D64 3B 7D 00 9C */ addi r27, r29, 0x9c
/* 80223E28 00220D68 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 80223E2C 00220D6C 3B C3 01 88 */ addi r30, r3, lbl_80430188@l
/* 80223E28 00220D68 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 80223E2C 00220D6C 3B C3 01 88 */ addi r30, r3, g_meter2_info@l
/* 80223E30 00220D70 3B 5D 00 EC */ addi r26, r29, 0xec
/* 80223E34 00220D74 3B 3D 00 F8 */ addi r25, r29, 0xf8
/* 80223E38 00220D78 3B 1D 0F 38 */ addi r24, r29, 0xf38
@@ -6283,8 +6283,8 @@ moveArrowNum__9dMeter2_cFv:
/* 80224374 002212B4 4B FD 5A A9 */ bl getArrowFlag__9dMw_HIO_cFv
/* 80224378 002212B8 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 8022437C 002212BC 40 82 00 18 */ bne lbl_80224394
/* 80224380 002212C0 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 80224384 002212C4 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 80224380 002212C0 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 80224384 002212C4 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 80224388 002212C8 88 03 00 DD */ lbz r0, 0xdd(r3)
/* 8022438C 002212CC 28 00 00 01 */ cmplwi r0, 1
/* 80224390 002212D0 40 82 00 44 */ bne lbl_802243D4
@@ -7113,8 +7113,8 @@ lbl_80224EE0:
/* 80224F18 00221E58 40 82 00 20 */ bne lbl_80224F38
/* 80224F1C 00221E5C 54 60 00 C7 */ rlwinm. r0, r3, 0, 3, 3
/* 80224F20 00221E60 40 82 00 18 */ bne lbl_80224F38
/* 80224F24 00221E64 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 80224F28 00221E68 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 80224F24 00221E64 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 80224F28 00221E68 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 80224F2C 00221E6C A0 03 00 A2 */ lhz r0, 0xa2(r3)
/* 80224F30 00221E70 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e
/* 80224F34 00221E74 41 82 00 10 */ beq lbl_80224F44
@@ -7221,8 +7221,8 @@ lbl_80225064:
/* 8022509C 00221FDC 40 82 00 20 */ bne lbl_802250BC
/* 802250A0 00221FE0 54 60 00 C7 */ rlwinm. r0, r3, 0, 3, 3
/* 802250A4 00221FE4 40 82 00 18 */ bne lbl_802250BC
/* 802250A8 00221FE8 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 802250AC 00221FEC 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 802250A8 00221FE8 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 802250AC 00221FEC 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 802250B0 00221FF0 A0 03 00 A2 */ lhz r0, 0xa2(r3)
/* 802250B4 00221FF4 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e
/* 802250B8 00221FF8 41 82 00 10 */ beq lbl_802250C8
@@ -7326,8 +7326,8 @@ lbl_80225204:
/* 8022520C 0022214C 3B E0 00 01 */ li r31, 1
/* 80225210 00222150 48 00 00 30 */ b lbl_80225240
lbl_80225214:
/* 80225214 00222154 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 80225218 00222158 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 80225214 00222154 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 80225218 00222158 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 8022521C 0022215C 88 03 00 E8 */ lbz r0, 0xe8(r3)
/* 80225220 00222160 28 00 00 00 */ cmplwi r0, 0
/* 80225224 00222164 41 82 00 14 */ beq lbl_80225238
@@ -7344,8 +7344,8 @@ lbl_80225240:
/* 80225248 00222188 57 E0 06 3E */ clrlwi r0, r31, 0x18
/* 8022524C 0022218C 28 00 00 01 */ cmplwi r0, 1
/* 80225250 00222190 40 82 00 D4 */ bne lbl_80225324
/* 80225254 00222194 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 80225258 00222198 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 80225254 00222194 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 80225258 00222198 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 8022525C 0022219C 88 03 00 E8 */ lbz r0, 0xe8(r3)
/* 80225260 002221A0 28 00 00 00 */ cmplwi r0, 0
/* 80225264 002221A4 41 82 00 10 */ beq lbl_80225274
@@ -7428,8 +7428,8 @@ lbl_8022534C:
lbl_80225374:
/* 80225374 002222B4 3B 60 00 00 */ li r27, 0
/* 80225378 002222B8 3B E0 00 00 */ li r31, 0
/* 8022537C 002222BC 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 80225380 002222C0 3B A3 01 88 */ addi r29, r3, lbl_80430188@l
/* 8022537C 002222BC 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 80225380 002222C0 3B A3 01 88 */ addi r29, r3, g_meter2_info@l
lbl_80225384:
/* 80225384 002222C4 80 1E 01 28 */ lwz r0, 0x128(r30)
/* 80225388 002222C8 7C 00 00 34 */ cntlzw r0, r0
@@ -7586,8 +7586,8 @@ lbl_8022553C:
/* 802255B4 002224F4 80 05 05 80 */ lwz r0, 0x580(r5)
/* 802255B8 002224F8 54 00 04 E7 */ rlwinm. r0, r0, 0, 0x13, 0x13
/* 802255BC 002224FC 40 82 00 18 */ bne lbl_802255D4
/* 802255C0 00222500 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 802255C4 00222504 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 802255C0 00222500 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 802255C4 00222504 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 802255C8 00222508 A0 03 00 B0 */ lhz r0, 0xb0(r3)
/* 802255CC 0022250C 54 00 07 FF */ clrlwi. r0, r0, 0x1f
/* 802255D0 00222510 41 82 00 58 */ beq lbl_80225628
@@ -7599,8 +7599,8 @@ lbl_802255D4:
/* 802255E4 00222524 A0 03 4F A0 */ lhz r0, 0x4fa0(r3)
/* 802255E8 00222528 54 00 06 73 */ rlwinm. r0, r0, 0, 0x19, 0x19
/* 802255EC 0022252C 41 82 00 24 */ beq lbl_80225610
/* 802255F0 00222530 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 802255F4 00222534 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 802255F0 00222530 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 802255F4 00222534 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 802255F8 00222538 A0 03 00 B0 */ lhz r0, 0xb0(r3)
/* 802255FC 0022253C 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e
/* 80225600 00222540 40 82 00 10 */ bne lbl_80225610
@@ -7688,8 +7688,8 @@ isShowLightDrop__9dMeter2_cFv:
/* 80225724 00222664 4B E0 EC 79 */ bl isLightDropGetFlag__16dSv_light_drop_cCFUc
/* 80225728 00222668 2C 03 00 00 */ cmpwi r3, 0
/* 8022572C 0022266C 41 82 01 50 */ beq lbl_8022587C
/* 80225730 00222670 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 80225734 00222674 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 80225730 00222670 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 80225734 00222674 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 80225738 00222678 88 1E 4E 0C */ lbz r0, 0x4e0c(r30)
/* 8022573C 0022267C 7C 00 07 74 */ extsb r0, r0
/* 80225740 00222680 7C 63 02 14 */ add r3, r3, r0
@@ -7771,8 +7771,8 @@ lbl_802257FC:
/* 8022585C 0022279C 40 82 00 20 */ bne lbl_8022587C
/* 80225860 002227A0 54 60 00 C7 */ rlwinm. r0, r3, 0, 3, 3
/* 80225864 002227A4 40 82 00 18 */ bne lbl_8022587C
/* 80225868 002227A8 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 8022586C 002227AC 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 80225868 002227A8 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 8022586C 002227AC 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 80225870 002227B0 A0 03 00 A2 */ lhz r0, 0xa2(r3)
/* 80225874 002227B4 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e
/* 80225878 002227B8 41 82 00 0C */ beq lbl_80225884
@@ -7973,8 +7973,8 @@ lbl_80225A8C:
/* 80225B10 00222A50 90 01 00 14 */ stw r0, 0x14(r1)
/* 80225B14 00222A54 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80225B18 00222A58 7C 7F 1B 78 */ mr r31, r3
/* 80225B1C 00222A5C 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 80225B20 00222A60 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 80225B1C 00222A5C 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 80225B20 00222A60 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 80225B24 00222A64 93 E3 00 1C */ stw r31, 0x1c(r3)
/* 80225B28 00222A68 38 00 00 01 */ li r0, 1
/* 80225B2C 00222A6C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
asm/d/d_scope.s
+2 -2
View File
@@ -334,8 +334,8 @@ lbl_80193B14:
lbl_80193B3C:
/* 80193B3C 00190A7C 38 00 00 00 */ li r0, 0
/* 80193B40 00190A80 90 1E 00 3C */ stw r0, 0x3c(r30)
/* 80193B44 00190A84 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 80193B48 00190A88 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 80193B44 00190A84 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 80193B48 00190A88 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 80193B4C 00190A8C 98 03 00 E7 */ stb r0, 0xe7(r3)
/* 80193B50 00190A90 28 1E 00 00 */ cmplwi r30, 0
/* 80193B54 00190A94 41 82 00 10 */ beq lbl_80193B64
asm/d/d_timer.s
+10 -10
View File
@@ -629,8 +629,8 @@ lbl_8025D2F4:
/* 8025D304 0025A244 48 00 1B ED */ bl setTimer__21dDlst_TimerScrnDraw_cFi
lbl_8025D308:
/* 8025D308 0025A248 80 7F 00 FC */ lwz r3, 0xfc(r31)
/* 8025D30C 0025A24C 3C 80 80 43 */ lis r4, lbl_80430188@ha
/* 8025D310 0025A250 38 A4 01 88 */ addi r5, r4, lbl_80430188@l
/* 8025D30C 0025A24C 3C 80 80 43 */ lis r4, g_meter2_info@ha
/* 8025D310 0025A250 38 A4 01 88 */ addi r5, r4, g_meter2_info@l
/* 8025D314 0025A254 88 85 00 BC */ lbz r4, 0xbc(r5)
/* 8025D318 0025A258 88 A5 00 BB */ lbz r5, 0xbb(r5)
/* 8025D31C 0025A25C 48 00 1E 65 */ bl setCounter__21dDlst_TimerScrnDraw_cFUcUc
@@ -2600,8 +2600,8 @@ setTimer__21dDlst_TimerScrnDraw_cFi:
/* 8025EEFC 0025BE3C 39 61 00 40 */ addi r11, r1, 0x40
/* 8025EF00 0025BE40 48 10 32 C1 */ bl _savegpr_22
/* 8025EF04 0025BE44 7C 79 1B 78 */ mr r25, r3
/* 8025EF08 0025BE48 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 8025EF0C 0025BE4C 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 8025EF08 0025BE48 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 8025EF0C 0025BE4C 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 8025EF10 0025BE50 90 83 00 84 */ stw r4, 0x84(r3)
/* 8025EF14 0025BE54 38 00 03 E8 */ li r0, 0x3e8
/* 8025EF18 0025BE58 7C A4 03 D6 */ divw r5, r4, r0
@@ -3910,8 +3910,8 @@ createGetIn__21dDlst_TimerScrnDraw_cF4cXyz:
/* 80260204 0025D144 93 C1 00 B8 */ stw r30, 0xb8(r1)
/* 80260208 0025D148 7C 7E 1B 78 */ mr r30, r3
/* 8026020C 0025D14C 7C 9F 23 78 */ mr r31, r4
/* 80260210 0025D150 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 80260214 0025D154 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 80260210 0025D150 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 80260214 0025D154 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 80260218 0025D158 38 80 03 E4 */ li r4, 0x3e4
/* 8026021C 0025D15C 38 A1 00 40 */ addi r5, r1, 0x40
/* 80260220 0025D160 38 C0 00 00 */ li r6, 0
@@ -4148,8 +4148,8 @@ createStart__21dDlst_TimerScrnDraw_cFUs:
/* 8026057C 0025D4BC 90 01 00 84 */ stw r0, 0x84(r1)
/* 80260580 0025D4C0 93 E1 00 7C */ stw r31, 0x7c(r1)
/* 80260584 0025D4C4 7C 7F 1B 78 */ mr r31, r3
/* 80260588 0025D4C8 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 8026058C 0025D4CC 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 80260588 0025D4C8 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 8026058C 0025D4CC 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 80260590 0025D4D0 54 84 04 3E */ clrlwi r4, r4, 0x10
/* 80260594 0025D4D4 38 A1 00 08 */ addi r5, r1, 8
/* 80260598 0025D4D8 38 C0 00 00 */ li r6, 0
@@ -4655,8 +4655,8 @@ lbl_80260CD4:
/* 80260CF8 0025DC38 3B 5A 00 8C */ addi r26, r26, 0x8c
/* 80260CFC 0025DC3C 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha
/* 80260D00 0025DC40 3B 83 EB C8 */ addi r28, r3, lbl_8042EBC8@l
/* 80260D04 0025DC44 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 80260D08 0025DC48 3B A3 01 88 */ addi r29, r3, lbl_80430188@l
/* 80260D04 0025DC44 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 80260D08 0025DC48 3B A3 01 88 */ addi r29, r3, g_meter2_info@l
/* 80260D0C 0025DC4C C3 A1 00 44 */ lfs f29, 0x44(r1)
/* 80260D10 0025DC50 CB E2 B5 58 */ lfd f31, lbl_80454F58-_SDA2_BASE_(r2)
/* 80260D14 0025DC54 3F C0 43 30 */ lis r30, 0x4330
asm/d/file/d_file_select.s
+16 -16
View File
@@ -1076,8 +1076,8 @@ _move__14dFile_select_cFv:
/* 80184508 00181448 93 E1 00 0C */ stw r31, 0xc(r1)
/* 8018450C 0018144C 93 C1 00 08 */ stw r30, 8(r1)
/* 80184510 00181450 7C 7F 1B 78 */ mr r31, r3
/* 80184514 00181454 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 80184518 00181458 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 80184514 00181454 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 80184518 00181458 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 8018451C 0018145C 48 09 7D 1D */ bl decMsgKeyWaitTimer__13dMeter2Info_cFv
/* 80184520 00181460 48 1C 6C A9 */ bl DVDGetDriveStatus
/* 80184524 00181464 2C 03 00 00 */ cmpwi r3, 0
@@ -2386,8 +2386,8 @@ lbl_80185740:
/* 80185828 00182768 81 8C 00 0C */ lwz r12, 0xc(r12)
/* 8018582C 0018276C 7D 89 03 A6 */ mtctr r12
/* 80185830 00182770 4E 80 04 21 */ bctrl
/* 80185834 00182774 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 80185838 00182778 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 80185834 00182774 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 80185838 00182778 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 8018583C 0018277C 38 80 03 82 */ li r4, 0x382
/* 80185840 00182780 38 A1 00 10 */ addi r5, r1, 0x10
/* 80185844 00182784 38 C0 00 00 */ li r6, 0
@@ -4418,8 +4418,8 @@ lbl_80187584:
/* 80187628 00184568 38 A0 00 01 */ li r5, 1
/* 8018762C 0018456C 38 C0 00 01 */ li r6, 1
/* 80187630 00184570 48 00 5A B5 */ bl headerTxtSet__14dFile_select_cFUsUcUc
/* 80187634 00184574 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 80187638 00184578 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 80187634 00184574 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 80187638 00184578 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 8018763C 0018457C 38 80 03 83 */ li r4, 0x383
/* 80187640 00184580 38 A1 00 08 */ addi r5, r1, 8
/* 80187644 00184584 38 C0 00 00 */ li r6, 0
@@ -10633,8 +10633,8 @@ lbl_8018D288:
/* 8018D2D8 0018A218 38 C0 00 FF */ li r6, 0xff
/* 8018D2DC 0018A21C 38 E0 00 00 */ li r7, 0
/* 8018D2E0 0018A220 48 0C 85 99 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc
/* 8018D2E4 0018A224 3C 80 80 43 */ lis r4, lbl_80430188@ha
/* 8018D2E8 0018A228 38 84 01 88 */ addi r4, r4, lbl_80430188@l
/* 8018D2E4 0018A224 3C 80 80 43 */ lis r4, g_meter2_info@ha
/* 8018D2E8 0018A228 38 84 01 88 */ addi r4, r4, g_meter2_info@l
/* 8018D2EC 0018A22C A8 84 00 94 */ lha r4, 0x94(r4)
/* 8018D2F0 0018A230 57 C0 06 3E */ clrlwi r0, r30, 0x18
/* 8018D2F4 0018A234 28 00 00 01 */ cmplwi r0, 1
@@ -12183,8 +12183,8 @@ lbl_8018E928:
/* 8018E954 0018B894 48 0D 49 59 */ bl cAPICPad_ANY_BUTTON__FUl
/* 8018E958 0018B898 28 03 00 00 */ cmplwi r3, 0
/* 8018E95C 0018B89C 41 82 00 40 */ beq lbl_8018E99C
/* 8018E960 0018B8A0 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 8018E964 0018B8A4 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 8018E960 0018B8A0 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 8018E964 0018B8A4 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 8018E968 0018B8A8 A8 03 00 94 */ lha r0, 0x94(r3)
/* 8018E96C 0018B8AC 2C 00 00 00 */ cmpwi r0, 0
/* 8018E970 0018B8B0 40 82 00 2C */ bne lbl_8018E99C
@@ -12506,8 +12506,8 @@ lbl_8018EDF0:
/* 8018EE14 0018BD54 80 7F 00 60 */ lwz r3, 0x60(r31)
/* 8018EE18 0018BD58 C0 22 9F 40 */ lfs f1, lbl_80453940-_SDA2_BASE_(r2)
/* 8018EE1C 0018BD5C 48 00 64 85 */ bl setAlphaRate__16dSelect_cursor_cFf
/* 8018EE20 0018BD60 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 8018EE24 0018BD64 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 8018EE20 0018BD60 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 8018EE24 0018BD64 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 8018EE28 0018BD68 38 80 03 82 */ li r4, 0x382
/* 8018EE2C 0018BD6C 38 A1 00 08 */ addi r5, r1, 8
/* 8018EE30 0018BD70 38 C0 00 00 */ li r6, 0
@@ -12517,8 +12517,8 @@ lbl_8018EDF0:
/* 8018EE40 0018BD80 38 7E 01 B4 */ addi r3, r30, 0x1b4
/* 8018EE44 0018BD84 38 81 00 08 */ addi r4, r1, 8
/* 8018EE48 0018BD88 48 1D 9C E5 */ bl strcpy
/* 8018EE4C 0018BD8C 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 8018EE50 0018BD90 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 8018EE4C 0018BD8C 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 8018EE50 0018BD90 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 8018EE54 0018BD94 38 80 03 83 */ li r4, 0x383
/* 8018EE58 0018BD98 38 A1 00 08 */ addi r5, r1, 8
/* 8018EE5C 0018BD9C 38 C0 00 00 */ li r6, 0
@@ -13583,8 +13583,8 @@ lbl_8018FD5C:
/* 8018FDAC 0018CCEC 38 C0 00 FF */ li r6, 0xff
/* 8018FDB0 0018CCF0 38 E0 00 00 */ li r7, 0
/* 8018FDB4 0018CCF4 48 0C 5A C5 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc
/* 8018FDB8 0018CCF8 3C 80 80 43 */ lis r4, lbl_80430188@ha
/* 8018FDBC 0018CCFC 38 84 01 88 */ addi r4, r4, lbl_80430188@l
/* 8018FDB8 0018CCF8 3C 80 80 43 */ lis r4, g_meter2_info@ha
/* 8018FDBC 0018CCFC 38 84 01 88 */ addi r4, r4, g_meter2_info@l
/* 8018FDC0 0018CD00 A8 84 00 94 */ lha r4, 0x94(r4)
/* 8018FDC4 0018CD04 57 C0 06 3E */ clrlwi r0, r30, 0x18
/* 8018FDC8 0018CD08 28 00 00 01 */ cmplwi r0, 1
asm/d/menu/d_menu_calibration.s
+6 -6
View File
@@ -691,8 +691,8 @@ lbl_801AF768:
lbl_801AF790:
/* 801AF790 001AC6D0 3B 80 00 00 */ li r28, 0
/* 801AF794 001AC6D4 3B E0 00 00 */ li r31, 0
/* 801AF798 001AC6D8 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801AF79C 001AC6DC 3B C3 01 88 */ addi r30, r3, lbl_80430188@l
/* 801AF798 001AC6D8 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801AF79C 001AC6DC 3B C3 01 88 */ addi r30, r3, g_meter2_info@l
lbl_801AF7A0:
/* 801AF7A0 001AC6E0 38 1F 00 14 */ addi r0, r31, 0x14
/* 801AF7A4 001AC6E4 7C 7B 00 2E */ lwzx r3, r27, r0
@@ -742,8 +742,8 @@ lbl_801AF818:
lbl_801AF840:
/* 801AF840 001AC780 3B 80 00 00 */ li r28, 0
/* 801AF844 001AC784 3B E0 00 00 */ li r31, 0
/* 801AF848 001AC788 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801AF84C 001AC78C 3B C3 01 88 */ addi r30, r3, lbl_80430188@l
/* 801AF848 001AC788 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801AF84C 001AC78C 3B C3 01 88 */ addi r30, r3, g_meter2_info@l
lbl_801AF850:
/* 801AF850 001AC790 38 1F 00 28 */ addi r0, r31, 0x28
/* 801AF854 001AC794 7C 7B 00 2E */ lwzx r3, r27, r0
@@ -793,8 +793,8 @@ lbl_801AF8C8:
lbl_801AF8F0:
/* 801AF8F0 001AC830 3B 80 00 00 */ li r28, 0
/* 801AF8F4 001AC834 3B E0 00 00 */ li r31, 0
/* 801AF8F8 001AC838 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801AF8FC 001AC83C 3B C3 01 88 */ addi r30, r3, lbl_80430188@l
/* 801AF8F8 001AC838 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801AF8FC 001AC83C 3B C3 01 88 */ addi r30, r3, g_meter2_info@l
lbl_801AF900:
/* 801AF900 001AC840 38 1F 00 48 */ addi r0, r31, 0x48
/* 801AF904 001AC844 7C 7B 00 2E */ lwzx r3, r27, r0
asm/d/menu/d_menu_collect.s
+20 -20
View File
@@ -269,8 +269,8 @@ _delete__17dMenu_Collect2D_cFv:
/* 801B011C 001AD05C 48 11 E6 69 */ bl getTotalFreeSize__7JKRHeapCFv
/* 801B0120 001AD060 88 9F 02 58 */ lbz r4, 0x258(r31)
/* 801B0124 001AD064 88 1F 02 57 */ lbz r0, 0x257(r31)
/* 801B0128 001AD068 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801B012C 001AD06C 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801B0128 001AD068 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801B012C 001AD06C 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 801B0130 001AD070 98 03 00 DF */ stb r0, 0xdf(r3)
/* 801B0134 001AD074 98 83 00 E0 */ stb r4, 0xe0(r3)
/* 801B0138 001AD078 80 7F 00 18 */ lwz r3, 0x18(r31)
@@ -761,8 +761,8 @@ screenSet__17dMenu_Collect2D_cFv:
/* 801B07FC 001AD73C 4E 80 04 21 */ bctrl
/* 801B0800 001AD740 48 14 FE 59 */ bl getStringPtr__10J2DTextBoxCFv
/* 801B0804 001AD744 7C 65 1B 78 */ mr r5, r3
/* 801B0808 001AD748 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801B080C 001AD74C 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801B0808 001AD748 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801B080C 001AD74C 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 801B0810 001AD750 38 80 03 E1 */ li r4, 0x3e1
/* 801B0814 001AD754 38 C0 00 00 */ li r6, 0
/* 801B0818 001AD758 48 06 BD 2D */ bl getStringKanji__13dMeter2Info_cFUlPcP14JMSMesgEntry_c
@@ -779,8 +779,8 @@ screenSet__17dMenu_Collect2D_cFv:
/* 801B0844 001AD784 3A E0 00 00 */ li r23, 0
/* 801B0848 001AD788 3C 60 80 39 */ lis r3, lbl_80395330@ha
/* 801B084C 001AD78C 3A 83 53 30 */ addi r20, r3, lbl_80395330@l
/* 801B0850 001AD790 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801B0854 001AD794 3B 43 01 88 */ addi r26, r3, lbl_80430188@l
/* 801B0850 001AD790 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801B0854 001AD794 3B 43 01 88 */ addi r26, r3, g_meter2_info@l
/* 801B0858 001AD798 3B 36 00 10 */ addi r25, r22, 0x10
/* 801B085C 001AD79C 3B 16 00 28 */ addi r24, r22, 0x28
lbl_801B0860:
@@ -1824,8 +1824,8 @@ lbl_801B179C:
/* 801B17D4 001AE714 B0 7F 02 12 */ sth r3, 0x212(r31)
/* 801B17D8 001AE718 B0 7F 02 1E */ sth r3, 0x21e(r31)
/* 801B17DC 001AE71C B0 7F 02 2A */ sth r3, 0x22a(r31)
/* 801B17E0 001AE720 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801B17E4 001AE724 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801B17E0 001AE720 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801B17E4 001AE724 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 801B17E8 001AE728 88 03 00 DF */ lbz r0, 0xdf(r3)
/* 801B17EC 001AE72C 98 1F 02 57 */ stb r0, 0x257(r31)
/* 801B17F0 001AE730 88 03 00 E0 */ lbz r0, 0xe0(r3)
@@ -6815,8 +6815,8 @@ lbl_801B6040:
/* 801B6044 001B2F84 3B C0 00 00 */ li r30, 0
/* 801B6048 001B2F88 3C 60 80 39 */ lis r3, lbl_80395268@ha
/* 801B604C 001B2F8C 3B 83 52 68 */ addi r28, r3, lbl_80395268@l
/* 801B6050 001B2F90 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801B6054 001B2F94 3B A3 01 88 */ addi r29, r3, lbl_80430188@l
/* 801B6050 001B2F90 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801B6054 001B2F94 3B A3 01 88 */ addi r29, r3, g_meter2_info@l
lbl_801B6058:
/* 801B6058 001B2F98 80 7F 00 1C */ lwz r3, 0x1c(r31)
/* 801B605C 001B2F9C 7C 9C F2 14 */ add r4, r28, r30
@@ -6887,8 +6887,8 @@ lbl_801B6144:
/* 801B6148 001B3088 3B C0 00 00 */ li r30, 0
/* 801B614C 001B308C 3C 60 80 39 */ lis r3, lbl_80395290@ha
/* 801B6150 001B3090 3B 83 52 90 */ addi r28, r3, lbl_80395290@l
/* 801B6154 001B3094 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801B6158 001B3098 3B A3 01 88 */ addi r29, r3, lbl_80430188@l
/* 801B6154 001B3094 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801B6158 001B3098 3B A3 01 88 */ addi r29, r3, g_meter2_info@l
lbl_801B615C:
/* 801B615C 001B309C 80 7F 00 1C */ lwz r3, 0x1c(r31)
/* 801B6160 001B30A0 7C 9C F2 14 */ add r4, r28, r30
@@ -6959,8 +6959,8 @@ lbl_801B622C:
/* 801B624C 001B318C 4E 80 04 21 */ bctrl
/* 801B6250 001B3190 48 14 A4 09 */ bl getStringPtr__10J2DTextBoxCFv
/* 801B6254 001B3194 7C 65 1B 78 */ mr r5, r3
/* 801B6258 001B3198 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801B625C 001B319C 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801B6258 001B3198 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801B625C 001B319C 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 801B6260 001B31A0 7F E4 FB 78 */ mr r4, r31
/* 801B6264 001B31A4 38 C0 00 00 */ li r6, 0
/* 801B6268 001B31A8 48 06 62 DD */ bl getStringKanji__13dMeter2Info_cFUlPcP14JMSMesgEntry_c
@@ -6975,8 +6975,8 @@ lbl_801B622C:
/* 801B628C 001B31CC 4E 80 04 21 */ bctrl
/* 801B6290 001B31D0 48 14 A3 C9 */ bl getStringPtr__10J2DTextBoxCFv
/* 801B6294 001B31D4 7C 65 1B 78 */ mr r5, r3
/* 801B6298 001B31D8 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801B629C 001B31DC 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801B6298 001B31D8 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801B629C 001B31DC 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 801B62A0 001B31E0 7F E4 FB 78 */ mr r4, r31
/* 801B62A4 001B31E4 38 C0 00 00 */ li r6, 0
/* 801B62A8 001B31E8 48 06 62 9D */ bl getStringKanji__13dMeter2Info_cFUlPcP14JMSMesgEntry_c
@@ -6991,8 +6991,8 @@ lbl_801B622C:
/* 801B62CC 001B320C 4E 80 04 21 */ bctrl
/* 801B62D0 001B3210 48 14 A3 89 */ bl getStringPtr__10J2DTextBoxCFv
/* 801B62D4 001B3214 7C 65 1B 78 */ mr r5, r3
/* 801B62D8 001B3218 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801B62DC 001B321C 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801B62D8 001B3218 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801B62DC 001B321C 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 801B62E0 001B3220 7F E4 FB 78 */ mr r4, r31
/* 801B62E4 001B3224 38 C0 00 00 */ li r6, 0
/* 801B62E8 001B3228 48 06 62 5D */ bl getStringKanji__13dMeter2Info_cFUlPcP14JMSMesgEntry_c
@@ -7007,8 +7007,8 @@ lbl_801B622C:
/* 801B630C 001B324C 4E 80 04 21 */ bctrl
/* 801B6310 001B3250 48 14 A3 49 */ bl getStringPtr__10J2DTextBoxCFv
/* 801B6314 001B3254 7C 65 1B 78 */ mr r5, r3
/* 801B6318 001B3258 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801B631C 001B325C 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801B6318 001B3258 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801B631C 001B325C 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 801B6320 001B3260 7F E4 FB 78 */ mr r4, r31
/* 801B6324 001B3264 38 C0 00 00 */ li r6, 0
/* 801B6328 001B3268 48 06 62 1D */ bl getStringKanji__13dMeter2Info_cFUlPcP14JMSMesgEntry_c
asm/d/menu/d_menu_dmap.s
+26 -26
View File
@@ -1041,8 +1041,8 @@ lbl_801B8E50:
/* 801B8E74 001B5DB4 4E 80 04 21 */ bctrl
/* 801B8E78 001B5DB8 48 14 77 E1 */ bl getStringPtr__10J2DTextBoxCFv
/* 801B8E7C 001B5DBC 7C 65 1B 78 */ mr r5, r3
/* 801B8E80 001B5DC0 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801B8E84 001B5DC4 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801B8E80 001B5DC0 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801B8E84 001B5DC4 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 801B8E88 001B5DC8 7F A4 EB 78 */ mr r4, r29
/* 801B8E8C 001B5DCC 38 C0 00 00 */ li r6, 0
/* 801B8E90 001B5DD0 48 06 36 B5 */ bl getStringKanji__13dMeter2Info_cFUlPcP14JMSMesgEntry_c
@@ -1101,8 +1101,8 @@ lbl_801B8F28:
/* 801B8F4C 001B5E8C 4E 80 04 21 */ bctrl
/* 801B8F50 001B5E90 48 14 77 09 */ bl getStringPtr__10J2DTextBoxCFv
/* 801B8F54 001B5E94 7C 65 1B 78 */ mr r5, r3
/* 801B8F58 001B5E98 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801B8F5C 001B5E9C 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801B8F58 001B5E98 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801B8F5C 001B5E9C 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 801B8F60 001B5EA0 7F A4 EB 78 */ mr r4, r29
/* 801B8F64 001B5EA4 38 C0 00 00 */ li r6, 0
/* 801B8F68 001B5EA8 48 06 35 DD */ bl getStringKanji__13dMeter2Info_cFUlPcP14JMSMesgEntry_c
@@ -1169,8 +1169,8 @@ lbl_801B9038:
/* 801B903C 001B5F7C 3B C0 00 00 */ li r30, 0
/* 801B9040 001B5F80 3C 60 80 39 */ lis r3, lbl_80395618@ha
/* 801B9044 001B5F84 3B 83 56 18 */ addi r28, r3, lbl_80395618@l
/* 801B9048 001B5F88 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801B904C 001B5F8C 3B A3 01 88 */ addi r29, r3, lbl_80430188@l
/* 801B9048 001B5F88 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801B904C 001B5F8C 3B A3 01 88 */ addi r29, r3, g_meter2_info@l
lbl_801B9050:
/* 801B9050 001B5F90 80 7F 0C B4 */ lwz r3, 0xcb4(r31)
/* 801B9054 001B5F94 7C 9C F2 14 */ add r4, r28, r30
@@ -2190,8 +2190,8 @@ lbl_801B9F5C:
/* 801B9FB8 001B6EF8 48 14 67 95 */ bl setString__10J2DTextBoxFsPCce
/* 801B9FBC 001B6EFC 48 00 00 D0 */ b lbl_801BA08C
lbl_801B9FC0:
/* 801B9FC0 001B6F00 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801B9FC4 001B6F04 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801B9FC0 001B6F00 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801B9FC4 001B6F04 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 801B9FC8 001B6F08 54 80 08 3C */ slwi r0, r4, 1
/* 801B9FCC 001B6F0C 38 81 00 08 */ addi r4, r1, 8
/* 801B9FD0 001B6F10 7C 84 02 AE */ lhax r4, r4, r0
@@ -3627,8 +3627,8 @@ __ct__12dMenu_Dmap_cFP10JKRExpHeapP9STControlP10CSTControlUcUc:
/* 801BB49C 001B83DC 38 09 CB 10 */ addi r0, r9, lbl_803BCB10@l
/* 801BB4A0 001B83E0 90 03 00 00 */ stw r0, 0(r3)
/* 801BB4A4 001B83E4 39 40 00 00 */ li r10, 0
/* 801BB4A8 001B83E8 3D 20 80 43 */ lis r9, lbl_80430188@ha
/* 801BB4AC 001B83EC 39 29 01 88 */ addi r9, r9, lbl_80430188@l
/* 801BB4A8 001B83E8 3D 20 80 43 */ lis r9, g_meter2_info@ha
/* 801BB4AC 001B83EC 39 29 01 88 */ addi r9, r9, g_meter2_info@l
/* 801BB4B0 001B83F0 99 49 00 F2 */ stb r10, 0xf2(r9)
/* 801BB4B4 001B83F4 90 6D 8B 00 */ stw r3, lbl_80451080-_SDA_BASE_(r13)
/* 801BB4B8 001B83F8 90 83 00 E8 */ stw r4, 0xe8(r3)
@@ -4432,8 +4432,8 @@ lbl_801BC06C:
lbl_801BC074:
/* 801BC074 001B8FB4 57 00 06 3F */ clrlwi. r0, r24, 0x18
/* 801BC078 001B8FB8 41 82 00 18 */ beq lbl_801BC090
/* 801BC07C 001B8FBC 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801BC080 001B8FC0 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801BC07C 001B8FBC 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801BC080 001B8FC0 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 801BC084 001B8FC4 80 03 00 90 */ lwz r0, 0x90(r3)
/* 801BC088 001B8FC8 54 00 07 FF */ clrlwi. r0, r0, 0x1f
/* 801BC08C 001B8FCC 41 82 00 38 */ beq lbl_801BC0C4
@@ -4676,8 +4676,8 @@ lbl_801BC3EC:
/* 801BC420 001B9360 90 01 00 0C */ stw r0, 0xc(r1)
/* 801BC424 001B9364 38 00 FF FF */ li r0, -1
/* 801BC428 001B9368 90 01 00 10 */ stw r0, 0x10(r1)
/* 801BC42C 001B936C 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801BC430 001B9370 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801BC42C 001B936C 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801BC430 001B9370 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 801BC434 001B9374 7F 84 E3 78 */ mr r4, r28
/* 801BC438 001B9378 80 BF 00 FC */ lwz r5, 0xfc(r31)
/* 801BC43C 001B937C 38 E0 00 00 */ li r7, 0
@@ -5567,8 +5567,8 @@ lbl_801BD0EC:
/* 801BD100 001BA040 90 1F 00 EC */ stw r0, 0xec(r31)
lbl_801BD104:
/* 801BD104 001BA044 38 00 00 00 */ li r0, 0
/* 801BD108 001BA048 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801BD10C 001BA04C 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801BD108 001BA048 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801BD10C 001BA04C 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 801BD110 001BA050 98 03 00 F2 */ stb r0, 0xf2(r3)
/* 801BD114 001BA054 90 0D 8B 00 */ stw r0, lbl_80451080-_SDA_BASE_(r13)
/* 801BD118 001BA058 7F C0 07 35 */ extsh. r0, r30
@@ -6214,8 +6214,8 @@ lbl_801BDA0C:
/* 801BDA28 001BA968 B0 1F 01 66 */ sth r0, 0x166(r31)
/* 801BDA2C 001BA96C B0 1F 01 68 */ sth r0, 0x168(r31)
lbl_801BDA30:
/* 801BDA30 001BA970 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801BDA34 001BA974 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801BDA30 001BA970 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801BDA34 001BA974 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 801BDA38 001BA978 88 03 00 BF */ lbz r0, 0xbf(r3)
/* 801BDA3C 001BA97C 28 00 00 06 */ cmplwi r0, 6
/* 801BDA40 001BA980 40 82 00 A0 */ bne lbl_801BDAE0
@@ -7565,8 +7565,8 @@ lbl_801BEDE8:
/* 801BEDF0 001BBD30 80 03 00 34 */ lwz r0, 0x34(r3)
/* 801BEDF4 001BBD34 54 00 05 EF */ rlwinm. r0, r0, 0, 0x17, 0x17
/* 801BEDF8 001BBD38 41 82 01 18 */ beq lbl_801BEF10
/* 801BEDFC 001BBD3C 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801BEE00 001BBD40 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801BEDFC 001BBD3C 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801BEE00 001BBD40 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 801BEE04 001BBD44 A0 03 00 B2 */ lhz r0, 0xb2(r3)
/* 801BEE08 001BBD48 54 00 04 E7 */ rlwinm. r0, r0, 0, 0x13, 0x13
/* 801BEE0C 001BBD4C 40 82 01 04 */ bne lbl_801BEF10
@@ -7963,8 +7963,8 @@ lbl_801BF39C:
/* 801BF3B8 001BC2F8 38 60 00 02 */ li r3, 2
/* 801BF3BC 001BC2FC 48 00 00 40 */ b lbl_801BF3FC
lbl_801BF3C0:
/* 801BF3C0 001BC300 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801BF3C4 001BC304 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801BF3C0 001BC300 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801BF3C4 001BC304 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 801BF3C8 001BC308 A0 03 00 B2 */ lhz r0, 0xb2(r3)
/* 801BF3CC 001BC30C 54 00 04 63 */ rlwinm. r0, r0, 0, 0x11, 0x11
/* 801BF3D0 001BC310 41 82 00 28 */ beq lbl_801BF3F8
@@ -8762,8 +8762,8 @@ lbl_801BFF5C:
/* 801BFFB0 001BCEF0 80 83 00 34 */ lwz r4, 0x34(r3)
/* 801BFFB4 001BCEF4 54 80 05 EF */ rlwinm. r0, r4, 0, 0x17, 0x17
/* 801BFFB8 001BCEF8 41 82 00 48 */ beq lbl_801C0000
/* 801BFFBC 001BCEFC 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801BFFC0 001BCF00 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801BFFBC 001BCEFC 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801BFFC0 001BCF00 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 801BFFC4 001BCF04 A0 03 00 B2 */ lhz r0, 0xb2(r3)
/* 801BFFC8 001BCF08 54 00 04 E7 */ rlwinm. r0, r0, 0, 0x13, 0x13
/* 801BFFCC 001BCF0C 40 82 00 34 */ bne lbl_801C0000
@@ -8782,8 +8782,8 @@ lbl_801BFF5C:
lbl_801C0000:
/* 801C0000 001BCF40 54 80 05 AD */ rlwinm. r0, r4, 0, 0x16, 0x16
/* 801C0004 001BCF44 41 82 00 74 */ beq lbl_801C0078
/* 801C0008 001BCF48 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801C000C 001BCF4C 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801C0008 001BCF48 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801C000C 001BCF4C 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 801C0010 001BCF50 A0 03 00 B2 */ lhz r0, 0xb2(r3)
/* 801C0014 001BCF54 54 00 04 E7 */ rlwinm. r0, r0, 0, 0x13, 0x13
/* 801C0018 001BCF58 40 82 00 60 */ bne lbl_801C0078
asm/d/menu/d_menu_fishing.s
+10 -10
View File
@@ -893,8 +893,8 @@ lbl_801C5938:
/* 801C5A0C 001C294C 3B 9E 01 E0 */ addi r28, r30, 0x1e0
/* 801C5A10 001C2950 3B 7E 02 10 */ addi r27, r30, 0x210
/* 801C5A14 001C2954 3A 9E 02 40 */ addi r20, r30, 0x240
/* 801C5A18 001C2958 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801C5A1C 001C295C 3A 43 01 88 */ addi r18, r3, lbl_80430188@l
/* 801C5A18 001C2958 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801C5A1C 001C295C 3A 43 01 88 */ addi r18, r3, g_meter2_info@l
/* 801C5A20 001C2960 3B DE 02 70 */ addi r30, r30, 0x270
lbl_801C5A24:
/* 801C5A24 001C2964 80 7F 00 18 */ lwz r3, 0x18(r31)
@@ -1069,8 +1069,8 @@ lbl_801C5A24:
/* 801C5CC8 001C2C08 80 7F 01 E4 */ lwz r3, 0x1e4(r31)
/* 801C5CCC 001C2C0C 48 13 A9 8D */ bl getStringPtr__10J2DTextBoxCFv
/* 801C5CD0 001C2C10 7C 65 1B 78 */ mr r5, r3
/* 801C5CD4 001C2C14 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801C5CD8 001C2C18 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801C5CD4 001C2C14 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801C5CD8 001C2C18 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 801C5CDC 001C2C1C 38 80 05 9F */ li r4, 0x59f
/* 801C5CE0 001C2C20 38 C0 00 00 */ li r6, 0
/* 801C5CE4 001C2C24 48 05 68 61 */ bl getStringKanji__13dMeter2Info_cFUlPcP14JMSMesgEntry_c
@@ -1084,8 +1084,8 @@ lbl_801C5A24:
/* 801C5D04 001C2C44 80 7F 01 E8 */ lwz r3, 0x1e8(r31)
/* 801C5D08 001C2C48 48 13 A9 51 */ bl getStringPtr__10J2DTextBoxCFv
/* 801C5D0C 001C2C4C 7C 65 1B 78 */ mr r5, r3
/* 801C5D10 001C2C50 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801C5D14 001C2C54 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801C5D10 001C2C50 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801C5D14 001C2C54 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 801C5D18 001C2C58 38 80 05 A0 */ li r4, 0x5a0
/* 801C5D1C 001C2C5C 38 C0 00 00 */ li r6, 0
/* 801C5D20 001C2C60 48 05 68 25 */ bl getStringKanji__13dMeter2Info_cFUlPcP14JMSMesgEntry_c
@@ -1225,8 +1225,8 @@ lbl_801C5EE8:
lbl_801C5F10:
/* 801C5F10 001C2E50 3B 80 00 00 */ li r28, 0
/* 801C5F14 001C2E54 3B E0 00 00 */ li r31, 0
/* 801C5F18 001C2E58 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801C5F1C 001C2E5C 3B C3 01 88 */ addi r30, r3, lbl_80430188@l
/* 801C5F18 001C2E58 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801C5F1C 001C2E5C 3B C3 01 88 */ addi r30, r3, g_meter2_info@l
lbl_801C5F20:
/* 801C5F20 001C2E60 38 1F 00 20 */ addi r0, r31, 0x20
/* 801C5F24 001C2E64 7C 7B 00 2E */ lwzx r3, r27, r0
@@ -1276,8 +1276,8 @@ lbl_801C5F98:
lbl_801C5FC0:
/* 801C5FC0 001C2F00 3B 80 00 00 */ li r28, 0
/* 801C5FC4 001C2F04 3B E0 00 00 */ li r31, 0
/* 801C5FC8 001C2F08 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801C5FCC 001C2F0C 3B C3 01 88 */ addi r30, r3, lbl_80430188@l
/* 801C5FC8 001C2F08 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801C5FCC 001C2F0C 3B C3 01 88 */ addi r30, r3, g_meter2_info@l
lbl_801C5FD0:
/* 801C5FD0 001C2F10 38 1F 00 34 */ addi r0, r31, 0x34
/* 801C5FD4 001C2F14 7C 7B 00 2E */ lwzx r3, r27, r0
asm/d/menu/d_menu_fmap.s
+58 -58
View File
@@ -203,8 +203,8 @@ lbl_801C68C4:
/* 801C68C8 001C3808 98 1D 03 01 */ stb r0, 0x301(r29)
/* 801C68CC 001C380C 88 1D 03 00 */ lbz r0, 0x300(r29)
/* 801C68D0 001C3810 98 1D 03 02 */ stb r0, 0x302(r29)
/* 801C68D4 001C3814 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801C68D8 001C3818 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801C68D4 001C3814 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801C68D8 001C3818 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 801C68DC 001C381C 88 03 00 BF */ lbz r0, 0xbf(r3)
/* 801C68E0 001C3820 28 00 00 04 */ cmplwi r0, 4
/* 801C68E4 001C3824 40 82 00 18 */ bne lbl_801C68FC
@@ -568,8 +568,8 @@ lbl_801C6DD0:
/* 801C6DE8 001C3D28 7C 60 1B 78 */ mr r0, r3
lbl_801C6DEC:
/* 801C6DEC 001C3D2C 90 1F 00 B8 */ stw r0, 0xb8(r31)
/* 801C6DF0 001C3D30 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801C6DF4 001C3D34 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801C6DF0 001C3D30 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801C6DF4 001C3D34 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 801C6DF8 001C3D38 C0 03 00 74 */ lfs f0, 0x74(r3)
/* 801C6DFC 001C3D3C C0 23 00 70 */ lfs f1, 0x70(r3)
/* 801C6E00 001C3D40 80 7F 00 B8 */ lwz r3, 0xb8(r31)
@@ -1269,8 +1269,8 @@ getNextStatus__12dMenu_Fmap_cFPUc:
/* 801C7838 001C4778 38 00 00 01 */ li r0, 1
/* 801C783C 001C477C 98 1F 03 04 */ stb r0, 0x304(r31)
/* 801C7840 001C4780 38 00 00 00 */ li r0, 0
/* 801C7844 001C4784 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801C7848 001C4788 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801C7844 001C4784 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801C7848 001C4788 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 801C784C 001C478C 98 03 00 BF */ stb r0, 0xbf(r3)
/* 801C7850 001C4790 38 00 04 00 */ li r0, 0x400
/* 801C7854 001C4794 B0 03 00 AA */ sth r0, 0xaa(r3)
@@ -1282,19 +1282,19 @@ lbl_801C785C:
/* 801C7868 001C47A8 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 801C786C 001C47AC 41 82 00 18 */ beq lbl_801C7884
/* 801C7870 001C47B0 38 00 00 01 */ li r0, 1
/* 801C7874 001C47B4 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801C7878 001C47B8 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801C7874 001C47B4 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801C7878 001C47B8 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 801C787C 001C47BC 98 03 00 BF */ stb r0, 0xbf(r3)
/* 801C7880 001C47C0 48 00 00 14 */ b lbl_801C7894
lbl_801C7884:
/* 801C7884 001C47C4 38 00 00 00 */ li r0, 0
/* 801C7888 001C47C8 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801C788C 001C47CC 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801C7888 001C47C8 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801C788C 001C47CC 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 801C7890 001C47D0 98 03 00 BF */ stb r0, 0xbf(r3)
lbl_801C7894:
/* 801C7894 001C47D4 38 00 02 00 */ li r0, 0x200
/* 801C7898 001C47D8 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801C789C 001C47DC 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801C7898 001C47D8 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801C789C 001C47DC 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 801C78A0 001C47E0 B0 03 00 AA */ sth r0, 0xaa(r3)
lbl_801C78A4:
/* 801C78A4 001C47E4 3B C0 00 09 */ li r30, 9
@@ -1316,8 +1316,8 @@ lbl_801C78E0:
/* 801C78E0 001C4820 88 9F 03 00 */ lbz r4, 0x300(r31)
/* 801C78E4 001C4824 28 04 00 08 */ cmplwi r4, 8
/* 801C78E8 001C4828 40 82 00 C8 */ bne lbl_801C79B0
/* 801C78EC 001C482C 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801C78F0 001C4830 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801C78EC 001C482C 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801C78F0 001C4830 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 801C78F4 001C4834 88 03 00 C0 */ lbz r0, 0xc0(r3)
/* 801C78F8 001C4838 28 00 00 03 */ cmplwi r0, 3
/* 801C78FC 001C483C 40 82 00 B4 */ bne lbl_801C79B0
@@ -1338,19 +1338,19 @@ lbl_801C7928:
/* 801C7934 001C4874 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 801C7938 001C4878 41 82 00 18 */ beq lbl_801C7950
/* 801C793C 001C487C 38 00 00 01 */ li r0, 1
/* 801C7940 001C4880 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801C7944 001C4884 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801C7940 001C4880 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801C7944 001C4884 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 801C7948 001C4888 98 03 00 BF */ stb r0, 0xbf(r3)
/* 801C794C 001C488C 48 00 00 14 */ b lbl_801C7960
lbl_801C7950:
/* 801C7950 001C4890 38 00 00 00 */ li r0, 0
/* 801C7954 001C4894 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801C7958 001C4898 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801C7954 001C4894 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801C7958 001C4898 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 801C795C 001C489C 98 03 00 BF */ stb r0, 0xbf(r3)
lbl_801C7960:
/* 801C7960 001C48A0 38 00 02 00 */ li r0, 0x200
/* 801C7964 001C48A4 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801C7968 001C48A8 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801C7964 001C48A4 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801C7968 001C48A8 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 801C796C 001C48AC B0 03 00 AA */ sth r0, 0xaa(r3)
lbl_801C7970:
/* 801C7970 001C48B0 38 00 00 BB */ li r0, 0xbb
@@ -1390,21 +1390,21 @@ lbl_801C79D0:
/* 801C79F0 001C4930 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 801C79F4 001C4934 41 82 00 18 */ beq lbl_801C7A0C
/* 801C79F8 001C4938 38 00 00 01 */ li r0, 1
/* 801C79FC 001C493C 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801C7A00 001C4940 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801C79FC 001C493C 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801C7A00 001C4940 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 801C7A04 001C4944 98 03 00 BF */ stb r0, 0xbf(r3)
/* 801C7A08 001C4948 48 00 00 14 */ b lbl_801C7A1C
lbl_801C7A0C:
/* 801C7A0C 001C494C 38 00 00 00 */ li r0, 0
/* 801C7A10 001C4950 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801C7A14 001C4954 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801C7A10 001C4950 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801C7A14 001C4954 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 801C7A18 001C4958 98 03 00 BF */ stb r0, 0xbf(r3)
lbl_801C7A1C:
/* 801C7A1C 001C495C 38 00 00 03 */ li r0, 3
/* 801C7A20 001C4960 98 1F 03 04 */ stb r0, 0x304(r31)
/* 801C7A24 001C4964 38 00 02 00 */ li r0, 0x200
/* 801C7A28 001C4968 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801C7A2C 001C496C 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801C7A28 001C4968 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801C7A2C 001C496C 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 801C7A30 001C4970 B0 03 00 AA */ sth r0, 0xaa(r3)
/* 801C7A34 001C4974 38 00 00 BB */ li r0, 0xbb
/* 801C7A38 001C4978 90 01 00 0C */ stw r0, 0xc(r1)
@@ -1427,8 +1427,8 @@ lbl_801C7A74:
/* 801C7A78 001C49B8 2C 03 00 00 */ cmpwi r3, 0
/* 801C7A7C 001C49BC 41 82 00 64 */ beq lbl_801C7AE0
/* 801C7A80 001C49C0 38 00 00 00 */ li r0, 0
/* 801C7A84 001C49C4 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801C7A88 001C49C8 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801C7A84 001C49C4 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801C7A88 001C49C8 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 801C7A8C 001C49CC 98 03 00 BF */ stb r0, 0xbf(r3)
/* 801C7A90 001C49D0 38 00 00 01 */ li r0, 1
/* 801C7A94 001C49D4 98 1F 03 04 */ stb r0, 0x304(r31)
@@ -1608,8 +1608,8 @@ lbl_801C7D10:
/* 801C7D10 001C4C50 48 03 23 2D */ bl dMw_A_TRIGGER__Fv
/* 801C7D14 001C4C54 2C 03 00 00 */ cmpwi r3, 0
/* 801C7D18 001C4C58 41 82 01 30 */ beq lbl_801C7E48
/* 801C7D1C 001C4C5C 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801C7D20 001C4C60 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801C7D1C 001C4C5C 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801C7D20 001C4C60 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 801C7D24 001C4C64 A0 03 00 B2 */ lhz r0, 0xb2(r3)
/* 801C7D28 001C4C68 54 00 04 E7 */ rlwinm. r0, r0, 0, 0x13, 0x13
/* 801C7D2C 001C4C6C 40 82 01 1C */ bne lbl_801C7E48
@@ -1690,8 +1690,8 @@ lbl_801C7E48:
/* 801C7E48 001C4D88 48 03 22 09 */ bl dMw_B_TRIGGER__Fv
/* 801C7E4C 001C4D8C 2C 03 00 00 */ cmpwi r3, 0
/* 801C7E50 001C4D90 41 82 00 44 */ beq lbl_801C7E94
/* 801C7E54 001C4D94 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801C7E58 001C4D98 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801C7E54 001C4D94 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801C7E58 001C4D98 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 801C7E5C 001C4D9C A0 03 00 B2 */ lhz r0, 0xb2(r3)
/* 801C7E60 001C4DA0 54 00 04 E7 */ rlwinm. r0, r0, 0, 0x13, 0x13
/* 801C7E64 001C4DA4 40 82 00 30 */ bne lbl_801C7E94
@@ -2223,8 +2223,8 @@ lbl_801C8580:
/* 801C8638 001C5578 48 03 1A 19 */ bl dMw_B_TRIGGER__Fv
/* 801C863C 001C557C 2C 03 00 00 */ cmpwi r3, 0
/* 801C8640 001C5580 41 82 00 50 */ beq lbl_801C8690
/* 801C8644 001C5584 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801C8648 001C5588 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801C8644 001C5584 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801C8648 001C5588 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 801C864C 001C558C A0 03 00 B2 */ lhz r0, 0xb2(r3)
/* 801C8650 001C5590 54 00 04 E7 */ rlwinm. r0, r0, 0, 0x13, 0x13
/* 801C8654 001C5594 40 82 00 3C */ bne lbl_801C8690
@@ -2246,8 +2246,8 @@ lbl_801C8690:
/* 801C8690 001C55D0 48 03 19 AD */ bl dMw_A_TRIGGER__Fv
/* 801C8694 001C55D4 2C 03 00 00 */ cmpwi r3, 0
/* 801C8698 001C55D8 41 82 00 3C */ beq lbl_801C86D4
/* 801C869C 001C55DC 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801C86A0 001C55E0 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801C869C 001C55DC 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801C86A0 001C55E0 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 801C86A4 001C55E4 A0 03 00 B2 */ lhz r0, 0xb2(r3)
/* 801C86A8 001C55E8 54 00 04 E7 */ rlwinm. r0, r0, 0, 0x13, 0x13
/* 801C86AC 001C55EC 40 82 00 28 */ bne lbl_801C86D4
@@ -2623,8 +2623,8 @@ lbl_801C8B9C:
/* 801C8C2C 001C5B6C 48 03 14 25 */ bl dMw_B_TRIGGER__Fv
/* 801C8C30 001C5B70 2C 03 00 00 */ cmpwi r3, 0
/* 801C8C34 001C5B74 41 82 00 50 */ beq lbl_801C8C84
/* 801C8C38 001C5B78 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801C8C3C 001C5B7C 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801C8C38 001C5B78 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801C8C3C 001C5B7C 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 801C8C40 001C5B80 A0 03 00 B2 */ lhz r0, 0xb2(r3)
/* 801C8C44 001C5B84 54 00 04 E7 */ rlwinm. r0, r0, 0, 0x13, 0x13
/* 801C8C48 001C5B88 40 82 00 3C */ bne lbl_801C8C84
@@ -2646,8 +2646,8 @@ lbl_801C8C84:
/* 801C8C84 001C5BC4 48 03 13 B9 */ bl dMw_A_TRIGGER__Fv
/* 801C8C88 001C5BC8 2C 03 00 00 */ cmpwi r3, 0
/* 801C8C8C 001C5BCC 41 82 03 64 */ beq lbl_801C8FF0
/* 801C8C90 001C5BD0 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801C8C94 001C5BD4 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801C8C90 001C5BD0 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801C8C94 001C5BD4 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 801C8C98 001C5BD8 A0 03 00 B2 */ lhz r0, 0xb2(r3)
/* 801C8C9C 001C5BDC 54 00 04 E7 */ rlwinm. r0, r0, 0, 0x13, 0x13
/* 801C8CA0 001C5BE0 40 82 03 50 */ bne lbl_801C8FF0
@@ -2780,8 +2780,8 @@ lbl_801C8E60:
lbl_801C8E84:
/* 801C8E84 001C5DC4 28 00 00 03 */ cmplwi r0, 3
/* 801C8E88 001C5DC8 40 82 00 B8 */ bne lbl_801C8F40
/* 801C8E8C 001C5DCC 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801C8E90 001C5DD0 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801C8E8C 001C5DCC 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801C8E90 001C5DD0 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 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
@@ -2940,8 +2940,8 @@ lbl_801C9078:
/* 801C90D8 001C6018 28 00 00 00 */ cmplwi r0, 0
/* 801C90DC 001C601C 40 82 00 D0 */ bne lbl_801C91AC
/* 801C90E0 001C6020 48 00 E5 E1 */ bl deleteExplain__17dMenu_Fmap2DTop_cFv
/* 801C90E4 001C6024 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801C90E8 001C6028 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801C90E4 001C6024 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801C90E8 001C6028 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 801C90EC 001C602C 88 03 00 C0 */ lbz r0, 0xc0(r3)
/* 801C90F0 001C6030 28 00 00 03 */ cmplwi r0, 3
/* 801C90F4 001C6034 40 82 00 90 */ bne lbl_801C9184
@@ -3299,8 +3299,8 @@ lbl_801C957C:
/* 801C9640 001C6580 48 03 0A 11 */ bl dMw_B_TRIGGER__Fv
/* 801C9644 001C6584 2C 03 00 00 */ cmpwi r3, 0
/* 801C9648 001C6588 41 82 00 50 */ beq lbl_801C9698
/* 801C964C 001C658C 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801C9650 001C6590 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801C964C 001C658C 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801C9650 001C6590 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 801C9654 001C6594 A0 03 00 B2 */ lhz r0, 0xb2(r3)
/* 801C9658 001C6598 54 00 04 E7 */ rlwinm. r0, r0, 0, 0x13, 0x13
/* 801C965C 001C659C 40 82 00 3C */ bne lbl_801C9698
@@ -3322,8 +3322,8 @@ lbl_801C9698:
/* 801C9698 001C65D8 48 03 09 A5 */ bl dMw_A_TRIGGER__Fv
/* 801C969C 001C65DC 2C 03 00 00 */ cmpwi r3, 0
/* 801C96A0 001C65E0 41 82 00 44 */ beq lbl_801C96E4
/* 801C96A4 001C65E4 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801C96A8 001C65E8 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801C96A4 001C65E4 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801C96A8 001C65E8 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 801C96AC 001C65EC A0 03 00 B2 */ lhz r0, 0xb2(r3)
/* 801C96B0 001C65F0 54 00 04 E7 */ rlwinm. r0, r0, 0, 0x13, 0x13
/* 801C96B4 001C65F4 40 82 00 30 */ bne lbl_801C96E4
@@ -3958,8 +3958,8 @@ lbl_801C9F54:
/* 801CA024 001C6F64 48 02 FF D1 */ bl dMw_RIGHT_TRIGGER__Fv
/* 801CA028 001C6F68 2C 03 00 00 */ cmpwi r3, 0
/* 801CA02C 001C6F6C 40 82 00 18 */ bne lbl_801CA044
/* 801CA030 001C6F70 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801CA034 001C6F74 3B C3 01 88 */ addi r30, r3, lbl_80430188@l
/* 801CA030 001C6F70 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801CA034 001C6F74 3B C3 01 88 */ addi r30, r3, g_meter2_info@l
/* 801CA038 001C6F78 A0 1E 00 B2 */ lhz r0, 0xb2(r30)
/* 801CA03C 001C6F7C 54 00 A7 FF */ rlwinm. r0, r0, 0x14, 0x1f, 0x1f
/* 801CA040 001C6F80 41 82 00 28 */ beq lbl_801CA068
@@ -4511,8 +4511,8 @@ lbl_801CA860:
/* 801CA888 001C77C8 7C 7F 1B 78 */ mr r31, r3
/* 801CA88C 001C77CC 38 00 FF F6 */ li r0, -10
/* 801CA890 001C77D0 B0 03 02 14 */ sth r0, 0x214(r3)
/* 801CA894 001C77D4 3C 80 80 43 */ lis r4, lbl_80430188@ha
/* 801CA898 001C77D8 38 84 01 88 */ addi r4, r4, lbl_80430188@l
/* 801CA894 001C77D4 3C 80 80 43 */ lis r4, g_meter2_info@ha
/* 801CA898 001C77D8 38 84 01 88 */ addi r4, r4, g_meter2_info@l
/* 801CA89C 001C77DC 88 04 00 E1 */ lbz r0, 0xe1(r4)
/* 801CA8A0 001C77E0 80 83 00 14 */ lwz r4, 0x14(r3)
/* 801CA8A4 001C77E4 98 04 12 27 */ stb r0, 0x1227(r4)
@@ -7783,8 +7783,8 @@ tableArrowPosInit__12dMenu_Fmap_cFb:
/* 801CD5E0 001CA520 7C 7E 1B 78 */ mr r30, r3
/* 801CD5E4 001CA524 7C 9F 23 78 */ mr r31, r4
/* 801CD5E8 001CA528 3B 80 FF FF */ li r28, -1
/* 801CD5EC 001CA52C 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801CD5F0 001CA530 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801CD5EC 001CA52C 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801CD5F0 001CA530 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 801CD5F4 001CA534 88 03 00 E1 */ lbz r0, 0xe1(r3)
/* 801CD5F8 001CA538 2C 00 00 02 */ cmpwi r0, 2
/* 801CD5FC 001CA53C 41 82 00 9C */ beq lbl_801CD698
@@ -7943,8 +7943,8 @@ howlArrowPosInit__12dMenu_Fmap_cFv:
/* 801CD820 001CA760 93 E1 00 1C */ stw r31, 0x1c(r1)
/* 801CD824 001CA764 93 C1 00 18 */ stw r30, 0x18(r1)
/* 801CD828 001CA768 7C 7E 1B 78 */ mr r30, r3
/* 801CD82C 001CA76C 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801CD830 001CA770 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801CD82C 001CA76C 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801CD830 001CA770 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 801CD834 001CA774 88 A3 00 E2 */ lbz r5, 0xe2(r3)
/* 801CD838 001CA778 38 7E 02 50 */ addi r3, r30, 0x250
/* 801CD83C 001CA77C 3C 80 80 3C */ lis r4, lbl_803BD64C@ha
@@ -7981,8 +7981,8 @@ lbl_801CD89C:
.global getHowlRegionID__12dMenu_Fmap_cFv
getHowlRegionID__12dMenu_Fmap_cFv:
/* 801CD8B4 001CA7F4 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801CD8B8 001CA7F8 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801CD8B4 001CA7F4 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801CD8B8 001CA7F8 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 801CD8BC 001CA7FC 88 03 00 E2 */ lbz r0, 0xe2(r3)
/* 801CD8C0 001CA800 2C 00 00 05 */ cmpwi r0, 5
/* 801CD8C4 001CA804 41 82 00 48 */ beq lbl_801CD90C
asm/d/menu/d_menu_fmap2D.s
+30 -30
View File
@@ -31,8 +31,8 @@ __ct__18dMenu_Fmap2DBack_cFv:
/* 801CF5C8 001CC508 90 1F 12 08 */ stw r0, 0x1208(r31)
/* 801CF5CC 001CC50C 90 1F 12 0C */ stw r0, 0x120c(r31)
/* 801CF5D0 001CC510 38 60 00 00 */ li r3, 0
/* 801CF5D4 001CC514 3C 80 80 43 */ lis r4, lbl_80430188@ha
/* 801CF5D8 001CC518 38 84 01 88 */ addi r4, r4, lbl_80430188@l
/* 801CF5D4 001CC514 3C 80 80 43 */ lis r4, g_meter2_info@ha
/* 801CF5D8 001CC518 38 84 01 88 */ addi r4, r4, g_meter2_info@l
/* 801CF5DC 001CC51C 98 64 00 F2 */ stb r3, 0xf2(r4)
/* 801CF5E0 001CC520 38 80 00 00 */ li r4, 0
/* 801CF5E4 001CC524 38 A0 00 00 */ li r5, 0
@@ -464,23 +464,23 @@ lbl_801CFC08:
/* 801CFC5C 001CCB9C 41 80 FF AC */ blt lbl_801CFC08
/* 801CFC60 001CCBA0 7F E3 FB 78 */ mr r3, r31
/* 801CFC64 001CCBA4 48 00 2B 85 */ bl getMapScissorAreaSizeX__18dMenu_Fmap2DBack_cFv
/* 801CFC68 001CCBA8 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801CFC6C 001CCBAC 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801CFC68 001CCBA8 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801CFC6C 001CCBAC 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 801CFC70 001CCBB0 D0 23 00 70 */ stfs f1, 0x70(r3)
/* 801CFC74 001CCBB4 7F E3 FB 78 */ mr r3, r31
/* 801CFC78 001CCBB8 48 00 2C A9 */ bl getMapScissorAreaSizeY__18dMenu_Fmap2DBack_cFv
/* 801CFC7C 001CCBBC 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801CFC80 001CCBC0 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801CFC7C 001CCBBC 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801CFC80 001CCBC0 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 801CFC84 001CCBC4 D0 23 00 74 */ stfs f1, 0x74(r3)
/* 801CFC88 001CCBC8 7F E3 FB 78 */ mr r3, r31
/* 801CFC8C 001CCBCC 48 00 2A AD */ bl getMapScissorAreaLX__18dMenu_Fmap2DBack_cFv
/* 801CFC90 001CCBD0 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801CFC94 001CCBD4 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801CFC90 001CCBD0 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801CFC94 001CCBD4 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 801CFC98 001CCBD8 D0 23 00 78 */ stfs f1, 0x78(r3)
/* 801CFC9C 001CCBDC 7F E3 FB 78 */ mr r3, r31
/* 801CFCA0 001CCBE0 48 00 2A F1 */ bl getMapScissorAreaLY__18dMenu_Fmap2DBack_cFv
/* 801CFCA4 001CCBE4 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801CFCA8 001CCBE8 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801CFCA4 001CCBE4 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801CFCA8 001CCBE8 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 801CFCAC 001CCBEC D0 23 00 7C */ stfs f1, 0x7c(r3)
/* 801CFCB0 001CCBF0 38 00 00 00 */ li r0, 0
/* 801CFCB4 001CCBF4 90 1F 12 3C */ stw r0, 0x123c(r31)
@@ -641,8 +641,8 @@ lbl_801CFED4:
/* 801CFEE4 001CCE24 7F C3 F3 78 */ mr r3, r30
/* 801CFEE8 001CCE28 48 00 12 0D */ bl deleteSpotPane__18dMenu_Fmap2DBack_cFv
/* 801CFEEC 001CCE2C 38 00 00 00 */ li r0, 0
/* 801CFEF0 001CCE30 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801CFEF4 001CCE34 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801CFEF0 001CCE30 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801CFEF4 001CCE34 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 801CFEF8 001CCE38 98 03 00 F2 */ stb r0, 0xf2(r3)
/* 801CFEFC 001CCE3C 38 7E 00 04 */ addi r3, r30, 4
/* 801CFF00 001CCE40 38 80 00 00 */ li r4, 0
@@ -7321,8 +7321,8 @@ lbl_801D6038:
/* 801D606C 001D2FAC 7C 60 1B 78 */ mr r0, r3
lbl_801D6070:
/* 801D6070 001D2FB0 90 1F 00 54 */ stw r0, 0x54(r31)
/* 801D6074 001D2FB4 3C 80 80 43 */ lis r4, lbl_80430188@ha
/* 801D6078 001D2FB8 38 84 01 88 */ addi r4, r4, lbl_80430188@l
/* 801D6074 001D2FB4 3C 80 80 43 */ lis r4, g_meter2_info@ha
/* 801D6078 001D2FB8 38 84 01 88 */ addi r4, r4, g_meter2_info@l
/* 801D607C 001D2FBC 88 04 00 BF */ lbz r0, 0xbf(r4)
/* 801D6080 001D2FC0 28 00 00 09 */ cmplwi r0, 9
/* 801D6084 001D2FC4 40 82 00 14 */ bne lbl_801D6098
@@ -8380,8 +8380,8 @@ lbl_801D6FA4:
/* 801D6FC8 001D3F08 4E 80 04 21 */ bctrl
/* 801D6FCC 001D3F0C 48 12 96 8D */ bl getStringPtr__10J2DTextBoxCFv
/* 801D6FD0 001D3F10 7C 65 1B 78 */ mr r5, r3
/* 801D6FD4 001D3F14 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801D6FD8 001D3F18 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801D6FD4 001D3F14 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801D6FD8 001D3F18 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 801D6FDC 001D3F1C 7F A4 EB 78 */ mr r4, r29
/* 801D6FE0 001D3F20 38 C0 00 00 */ li r6, 0
/* 801D6FE4 001D3F24 48 04 55 61 */ bl getStringKanji__13dMeter2Info_cFUlPcP14JMSMesgEntry_c
@@ -8440,8 +8440,8 @@ lbl_801D707C:
/* 801D70A0 001D3FE0 4E 80 04 21 */ bctrl
/* 801D70A4 001D3FE4 48 12 95 B5 */ bl getStringPtr__10J2DTextBoxCFv
/* 801D70A8 001D3FE8 7C 65 1B 78 */ mr r5, r3
/* 801D70AC 001D3FEC 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801D70B0 001D3FF0 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801D70AC 001D3FEC 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801D70B0 001D3FF0 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 801D70B4 001D3FF4 7F A4 EB 78 */ mr r4, r29
/* 801D70B8 001D3FF8 38 C0 00 00 */ li r6, 0
/* 801D70BC 001D3FFC 48 04 54 89 */ bl getStringKanji__13dMeter2Info_cFUlPcP14JMSMesgEntry_c
@@ -8497,8 +8497,8 @@ lbl_801D7160:
/* 801D7164 001D40A4 3B 80 00 00 */ li r28, 0
/* 801D7168 001D40A8 3C 60 80 39 */ lis r3, lbl_80396508@ha
/* 801D716C 001D40AC 3B 43 65 08 */ addi r26, r3, lbl_80396508@l
/* 801D7170 001D40B0 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801D7174 001D40B4 3B 63 01 88 */ addi r27, r3, lbl_80430188@l
/* 801D7170 001D40B0 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801D7174 001D40B4 3B 63 01 88 */ addi r27, r3, g_meter2_info@l
lbl_801D7178:
/* 801D7178 001D40B8 80 7D 00 08 */ lwz r3, 8(r29)
/* 801D717C 001D40BC 7C 9A E2 14 */ add r4, r26, r28
@@ -8561,8 +8561,8 @@ lbl_801D7240:
/* 801D7244 001D4184 3B E0 00 00 */ li r31, 0
/* 801D7248 001D4188 3C 60 80 39 */ lis r3, lbl_80396530@ha
/* 801D724C 001D418C 3B A3 65 30 */ addi r29, r3, lbl_80396530@l
/* 801D7250 001D4190 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801D7254 001D4194 3B C3 01 88 */ addi r30, r3, lbl_80430188@l
/* 801D7250 001D4190 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801D7254 001D4194 3B C3 01 88 */ addi r30, r3, g_meter2_info@l
lbl_801D7258:
/* 801D7258 001D4198 80 79 00 08 */ lwz r3, 8(r25)
/* 801D725C 001D419C 7C 9D FA 14 */ add r4, r29, r31
@@ -8617,8 +8617,8 @@ lbl_801D7304:
/* 801D7308 001D4248 3B E0 00 00 */ li r31, 0
/* 801D730C 001D424C 3C 60 80 39 */ lis r3, lbl_80396558@ha
/* 801D7310 001D4250 3B A3 65 58 */ addi r29, r3, lbl_80396558@l
/* 801D7314 001D4254 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801D7318 001D4258 3B C3 01 88 */ addi r30, r3, lbl_80430188@l
/* 801D7314 001D4254 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801D7318 001D4258 3B C3 01 88 */ addi r30, r3, g_meter2_info@l
lbl_801D731C:
/* 801D731C 001D425C 80 79 00 08 */ lwz r3, 8(r25)
/* 801D7320 001D4260 7C 9D FA 14 */ add r4, r29, r31
@@ -8704,8 +8704,8 @@ lbl_801D7440:
/* 801D7444 001D4384 3B C0 00 00 */ li r30, 0
/* 801D7448 001D4388 3C 60 80 39 */ lis r3, lbl_80396580@ha
/* 801D744C 001D438C 3B 83 65 80 */ addi r28, r3, lbl_80396580@l
/* 801D7450 001D4390 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801D7454 001D4394 3B A3 01 88 */ addi r29, r3, lbl_80430188@l
/* 801D7450 001D4390 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801D7454 001D4394 3B A3 01 88 */ addi r29, r3, g_meter2_info@l
lbl_801D7458:
/* 801D7458 001D4398 80 7F 00 08 */ lwz r3, 8(r31)
/* 801D745C 001D439C 7C 9C F2 14 */ add r4, r28, r30
@@ -8796,8 +8796,8 @@ lbl_801D7594:
/* 801D7598 001D44D8 3B C0 00 00 */ li r30, 0
/* 801D759C 001D44DC 3C 60 80 39 */ lis r3, lbl_803965A8@ha
/* 801D75A0 001D44E0 3B 83 65 A8 */ addi r28, r3, lbl_803965A8@l
/* 801D75A4 001D44E4 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801D75A8 001D44E8 3B A3 01 88 */ addi r29, r3, lbl_80430188@l
/* 801D75A4 001D44E4 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801D75A8 001D44E8 3B A3 01 88 */ addi r29, r3, g_meter2_info@l
lbl_801D75AC:
/* 801D75AC 001D44EC 80 7F 00 08 */ lwz r3, 8(r31)
/* 801D75B0 001D44F0 7C 9C F2 14 */ add r4, r28, r30
@@ -9594,8 +9594,8 @@ isWarpAccept__17dMenu_Fmap2DTop_cFv:
/* 801D80AC 001D4FEC 4B E5 C9 11 */ bl isEventBit__11dSv_event_cCFUs
/* 801D80B0 001D4FF0 2C 03 00 00 */ cmpwi r3, 0
/* 801D80B4 001D4FF4 41 82 00 28 */ beq lbl_801D80DC
/* 801D80B8 001D4FF8 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801D80BC 001D4FFC 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801D80B8 001D4FF8 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801D80BC 001D4FFC 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 801D80C0 001D5000 88 03 00 BF */ lbz r0, 0xbf(r3)
/* 801D80C4 001D5004 28 00 00 09 */ cmplwi r0, 9
/* 801D80C8 001D5008 41 82 00 14 */ beq lbl_801D80DC
asm/d/menu/d_menu_insect.s
+20 -20
View File
@@ -839,8 +839,8 @@ lbl_801D8D10:
/* 801D8D1C 001D5C5C 28 00 00 01 */ cmplwi r0, 1
/* 801D8D20 001D5C60 40 82 00 14 */ bne lbl_801D8D34
/* 801D8D24 001D5C64 38 00 00 00 */ li r0, 0
/* 801D8D28 001D5C68 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801D8D2C 001D5C6C 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801D8D28 001D5C68 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801D8D2C 001D5C6C 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 801D8D30 001D5C70 98 03 00 C3 */ stb r0, 0xc3(r3)
lbl_801D8D34:
/* 801D8D34 001D5C74 38 00 00 03 */ li r0, 3
@@ -925,8 +925,8 @@ lbl_801D8DEC:
/* 801D8E60 001D5DA0 90 01 00 0C */ stw r0, 0xc(r1)
/* 801D8E64 001D5DA4 38 00 FF FF */ li r0, -1
/* 801D8E68 001D5DA8 90 01 00 10 */ stw r0, 0x10(r1)
/* 801D8E6C 001D5DAC 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801D8E70 001D5DB0 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801D8E6C 001D5DAC 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801D8E70 001D5DB0 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 801D8E74 001D5DB4 7F 84 E3 78 */ mr r4, r28
/* 801D8E78 001D5DB8 80 BF 00 EC */ lwz r5, 0xec(r31)
/* 801D8E7C 001D5DBC 38 C0 00 00 */ li r6, 0
@@ -1012,14 +1012,14 @@ lbl_801D8EDC:
/* 801D8FB8 001D5EF8 98 01 00 38 */ stb r0, 0x38(r1)
/* 801D8FBC 001D5EFC 98 01 00 19 */ stb r0, 0x19(r1)
/* 801D8FC0 001D5F00 98 1F 00 F7 */ stb r0, 0xf7(r31)
/* 801D8FC4 001D5F04 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801D8FC8 001D5F08 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801D8FC4 001D5F04 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801D8FC8 001D5F08 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 801D8FCC 001D5F0C 38 80 04 BD */ li r4, 0x4bd
/* 801D8FD0 001D5F10 38 A1 00 78 */ addi r5, r1, 0x78
/* 801D8FD4 001D5F14 38 C0 00 00 */ li r6, 0
/* 801D8FD8 001D5F18 48 04 32 79 */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c
/* 801D8FDC 001D5F1C 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801D8FE0 001D5F20 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801D8FDC 001D5F1C 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801D8FE0 001D5F20 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 801D8FE4 001D5F24 38 80 04 BE */ li r4, 0x4be
/* 801D8FE8 001D5F28 38 A1 00 58 */ addi r5, r1, 0x58
/* 801D8FEC 001D5F2C 38 C0 00 00 */ li r6, 0
@@ -1032,8 +1032,8 @@ lbl_801D8EDC:
/* 801D9008 001D5F48 FF E0 08 90 */ fmr f31, f1
/* 801D900C 001D5F4C 4B E3 B9 E5 */ bl mDoExt_getMesgFont__Fv
/* 801D9010 001D5F50 7C 64 1B 78 */ mr r4, r3
/* 801D9014 001D5F54 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801D9018 001D5F58 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801D9014 001D5F54 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801D9018 001D5F58 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 801D901C 001D5F5C FC 20 F8 90 */ fmr f1, f31
/* 801D9020 001D5F60 FC 40 F0 90 */ fmr f2, f30
/* 801D9024 001D5F64 38 A1 00 78 */ addi r5, r1, 0x78
@@ -1047,8 +1047,8 @@ lbl_801D8EDC:
/* 801D9044 001D5F84 FF C0 08 90 */ fmr f30, f1
/* 801D9048 001D5F88 4B E3 B9 A9 */ bl mDoExt_getMesgFont__Fv
/* 801D904C 001D5F8C 7C 64 1B 78 */ mr r4, r3
/* 801D9050 001D5F90 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801D9054 001D5F94 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801D9050 001D5F90 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801D9054 001D5F94 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 801D9058 001D5F98 FC 20 F0 90 */ fmr f1, f30
/* 801D905C 001D5F9C FC 40 F8 90 */ fmr f2, f31
/* 801D9060 001D5FA0 38 A1 00 58 */ addi r5, r1, 0x58
@@ -1205,8 +1205,8 @@ lbl_801D9284:
/* 801D929C 001D61DC 93 E1 00 0C */ stw r31, 0xc(r1)
/* 801D92A0 001D61E0 7C 7F 1B 78 */ mr r31, r3
/* 801D92A4 001D61E4 38 00 00 FF */ li r0, 0xff
/* 801D92A8 001D61E8 3C 80 80 43 */ lis r4, lbl_80430188@ha
/* 801D92AC 001D61EC 38 84 01 88 */ addi r4, r4, lbl_80430188@l
/* 801D92A8 001D61E8 3C 80 80 43 */ lis r4, g_meter2_info@ha
/* 801D92AC 001D61EC 38 84 01 88 */ addi r4, r4, g_meter2_info@l
/* 801D92B0 001D61F0 98 04 00 C3 */ stb r0, 0xc3(r4)
/* 801D92B4 001D61F4 38 80 04 0C */ li r4, 0x40c
/* 801D92B8 001D61F8 48 00 10 4D */ bl setAButtonString__14dMenu_Insect_cFUs
@@ -1380,8 +1380,8 @@ lbl_801D94F0:
/* 801D953C 001D647C 88 9F 00 F4 */ lbz r4, 0xf4(r31)
/* 801D9540 001D6480 88 BF 00 F5 */ lbz r5, 0xf5(r31)
/* 801D9544 001D6484 48 00 08 89 */ bl getInsectItemID__14dMenu_Insect_cFii
/* 801D9548 001D6488 3C 80 80 43 */ lis r4, lbl_80430188@ha
/* 801D954C 001D648C 38 84 01 88 */ addi r4, r4, lbl_80430188@l
/* 801D9548 001D6488 3C 80 80 43 */ lis r4, g_meter2_info@ha
/* 801D954C 001D648C 38 84 01 88 */ addi r4, r4, g_meter2_info@l
/* 801D9550 001D6490 98 64 00 C3 */ stb r3, 0xc3(r4)
lbl_801D9554:
/* 801D9554 001D6494 38 00 00 52 */ li r0, 0x52
@@ -2374,8 +2374,8 @@ lbl_801DA334:
lbl_801DA35C:
/* 801DA35C 001D729C 3B 80 00 00 */ li r28, 0
/* 801DA360 001D72A0 3B E0 00 00 */ li r31, 0
/* 801DA364 001D72A4 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801DA368 001D72A8 3B C3 01 88 */ addi r30, r3, lbl_80430188@l
/* 801DA364 001D72A4 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801DA368 001D72A8 3B C3 01 88 */ addi r30, r3, g_meter2_info@l
lbl_801DA36C:
/* 801DA36C 001D72AC 38 1F 00 2C */ addi r0, r31, 0x2c
/* 801DA370 001D72B0 7C 7B 00 2E */ lwzx r3, r27, r0
@@ -2425,8 +2425,8 @@ lbl_801DA3E4:
lbl_801DA40C:
/* 801DA40C 001D734C 3B 80 00 00 */ li r28, 0
/* 801DA410 001D7350 3B E0 00 00 */ li r31, 0
/* 801DA414 001D7354 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801DA418 001D7358 3B C3 01 88 */ addi r30, r3, lbl_80430188@l
/* 801DA414 001D7354 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801DA418 001D7358 3B C3 01 88 */ addi r30, r3, g_meter2_info@l
lbl_801DA41C:
/* 801DA41C 001D735C 38 1F 00 40 */ addi r0, r31, 0x40
/* 801DA420 001D7360 7C 7B 00 2E */ lwzx r3, r27, r0
asm/d/menu/d_menu_letter.s
+12 -12
View File
@@ -3286,32 +3286,32 @@ lbl_801DFB2C:
/* 801DFE3C 001DCD7C 7F 83 E3 78 */ mr r3, r28
/* 801DFE40 001DCD80 48 12 08 19 */ bl getStringPtr__10J2DTextBoxCFv
/* 801DFE44 001DCD84 7C 65 1B 78 */ mr r5, r3
/* 801DFE48 001DCD88 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801DFE4C 001DCD8C 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801DFE48 001DCD88 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801DFE4C 001DCD8C 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 801DFE50 001DCD90 38 80 04 D7 */ li r4, 0x4d7
/* 801DFE54 001DCD94 38 C0 00 00 */ li r6, 0
/* 801DFE58 001DCD98 48 03 C6 ED */ bl getStringKanji__13dMeter2Info_cFUlPcP14JMSMesgEntry_c
/* 801DFE5C 001DCD9C 7F 63 DB 78 */ mr r3, r27
/* 801DFE60 001DCDA0 48 12 07 F9 */ bl getStringPtr__10J2DTextBoxCFv
/* 801DFE64 001DCDA4 7C 65 1B 78 */ mr r5, r3
/* 801DFE68 001DCDA8 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801DFE6C 001DCDAC 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801DFE68 001DCDA8 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801DFE6C 001DCDAC 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 801DFE70 001DCDB0 38 80 04 D7 */ li r4, 0x4d7
/* 801DFE74 001DCDB4 38 C0 00 00 */ li r6, 0
/* 801DFE78 001DCDB8 48 03 C6 CD */ bl getStringKanji__13dMeter2Info_cFUlPcP14JMSMesgEntry_c
/* 801DFE7C 001DCDBC 7F 43 D3 78 */ mr r3, r26
/* 801DFE80 001DCDC0 48 12 07 D9 */ bl getStringPtr__10J2DTextBoxCFv
/* 801DFE84 001DCDC4 7C 65 1B 78 */ mr r5, r3
/* 801DFE88 001DCDC8 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801DFE8C 001DCDCC 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801DFE88 001DCDC8 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801DFE8C 001DCDCC 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 801DFE90 001DCDD0 38 80 04 D7 */ li r4, 0x4d7
/* 801DFE94 001DCDD4 38 C0 00 00 */ li r6, 0
/* 801DFE98 001DCDD8 48 03 C6 AD */ bl getStringKanji__13dMeter2Info_cFUlPcP14JMSMesgEntry_c
/* 801DFE9C 001DCDDC 7F A3 EB 78 */ mr r3, r29
/* 801DFEA0 001DCDE0 48 12 07 B9 */ bl getStringPtr__10J2DTextBoxCFv
/* 801DFEA4 001DCDE4 7C 65 1B 78 */ mr r5, r3
/* 801DFEA8 001DCDE8 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801DFEAC 001DCDEC 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801DFEA8 001DCDE8 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801DFEAC 001DCDEC 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 801DFEB0 001DCDF0 38 80 04 D7 */ li r4, 0x4d7
/* 801DFEB4 001DCDF4 38 C0 00 00 */ li r6, 0
/* 801DFEB8 001DCDF8 48 03 C6 8D */ bl getStringKanji__13dMeter2Info_cFUlPcP14JMSMesgEntry_c
@@ -4857,8 +4857,8 @@ lbl_801E1548:
lbl_801E1570:
/* 801E1570 001DE4B0 3B 80 00 00 */ li r28, 0
/* 801E1574 001DE4B4 3B E0 00 00 */ li r31, 0
/* 801E1578 001DE4B8 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801E157C 001DE4BC 3B C3 01 88 */ addi r30, r3, lbl_80430188@l
/* 801E1578 001DE4B8 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801E157C 001DE4BC 3B C3 01 88 */ addi r30, r3, g_meter2_info@l
lbl_801E1580:
/* 801E1580 001DE4C0 38 1F 02 8C */ addi r0, r31, 0x28c
/* 801E1584 001DE4C4 7C 7B 00 2E */ lwzx r3, r27, r0
@@ -4908,8 +4908,8 @@ lbl_801E15F8:
lbl_801E1620:
/* 801E1620 001DE560 3B 80 00 00 */ li r28, 0
/* 801E1624 001DE564 3B E0 00 00 */ li r31, 0
/* 801E1628 001DE568 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801E162C 001DE56C 3B C3 01 88 */ addi r30, r3, lbl_80430188@l
/* 801E1628 001DE568 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801E162C 001DE56C 3B C3 01 88 */ addi r30, r3, g_meter2_info@l
lbl_801E1630:
/* 801E1630 001DE570 38 1F 02 A0 */ addi r0, r31, 0x2a0
/* 801E1634 001DE574 7C 7B 00 2E */ lwzx r3, r27, r0
asm/d/menu/d_menu_option.s
+4 -4
View File
@@ -6592,8 +6592,8 @@ lbl_801E7F24:
/* 801E7F28 001E4E68 3B C0 00 00 */ li r30, 0
/* 801E7F2C 001E4E6C 3C 60 80 39 */ lis r3, lbl_80397588@ha
/* 801E7F30 001E4E70 3B 83 75 88 */ addi r28, r3, lbl_80397588@l
/* 801E7F34 001E4E74 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801E7F38 001E4E78 3B A3 01 88 */ addi r29, r3, lbl_80430188@l
/* 801E7F34 001E4E74 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801E7F38 001E4E78 3B A3 01 88 */ addi r29, r3, g_meter2_info@l
lbl_801E7F3C:
/* 801E7F3C 001E4E7C 80 7F 00 18 */ lwz r3, 0x18(r31)
/* 801E7F40 001E4E80 7C 9C F2 14 */ add r4, r28, r30
@@ -6664,8 +6664,8 @@ lbl_801E8028:
/* 801E802C 001E4F6C 3B C0 00 00 */ li r30, 0
/* 801E8030 001E4F70 3C 60 80 39 */ lis r3, lbl_803975B0@ha
/* 801E8034 001E4F74 3B 83 75 B0 */ addi r28, r3, lbl_803975B0@l
/* 801E8038 001E4F78 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801E803C 001E4F7C 3B A3 01 88 */ addi r29, r3, lbl_80430188@l
/* 801E8038 001E4F78 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801E803C 001E4F7C 3B A3 01 88 */ addi r29, r3, g_meter2_info@l
lbl_801E8040:
/* 801E8040 001E4F80 80 7F 00 18 */ lwz r3, 0x18(r31)
/* 801E8044 001E4F84 7C 9C F2 14 */ add r4, r28, r30
asm/d/menu/d_menu_ring.s
+28 -28
View File
@@ -27,8 +27,8 @@ __ct__12dMenu_Ring_cFP10JKRExpHeapP9STControlP10CSTControlUc:
/* 801E9164 001E60A4 90 DF 00 0C */ stw r6, 0xc(r31)
/* 801E9168 001E60A8 98 FF 06 BC */ stb r7, 0x6bc(r31)
/* 801E916C 001E60AC 38 00 00 00 */ li r0, 0
/* 801E9170 001E60B0 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801E9174 001E60B4 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801E9170 001E60B0 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801E9174 001E60B4 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 801E9178 001E60B8 98 03 00 E8 */ stb r0, 0xe8(r3)
/* 801E917C 001E60BC 80 7F 00 04 */ lwz r3, 4(r31)
/* 801E9180 001E60C0 48 0E 56 05 */ bl getTotalFreeSize__7JKRHeapCFv
@@ -639,8 +639,8 @@ lbl_801E9A24:
/* 801E9A34 001E6974 90 01 00 0C */ stw r0, 0xc(r1)
/* 801E9A38 001E6978 38 00 FF FF */ li r0, -1
/* 801E9A3C 001E697C 90 01 00 10 */ stw r0, 0x10(r1)
/* 801E9A40 001E6980 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801E9A44 001E6984 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801E9A40 001E6980 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801E9A44 001E6984 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 801E9A48 001E6988 7E A4 AB 78 */ mr r4, r21
/* 801E9A4C 001E698C 38 C0 00 00 */ li r6, 0
/* 801E9A50 001E6990 80 E9 02 54 */ lwz r7, 0x254(r9)
@@ -675,8 +675,8 @@ lbl_801E9AB8:
/* 801E9AB8 001E69F8 7C 14 B0 00 */ cmpw r20, r22
/* 801E9ABC 001E69FC 41 80 FF B8 */ blt lbl_801E9A74
/* 801E9AC0 001E6A00 7C FF BA 14 */ add r7, r31, r23
/* 801E9AC4 001E6A04 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801E9AC8 001E6A08 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801E9AC4 001E6A04 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801E9AC8 001E6A08 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 801E9ACC 001E6A0C 7E A4 AB 78 */ mr r4, r21
/* 801E9AD0 001E6A10 80 A7 00 98 */ lwz r5, 0x98(r7)
/* 801E9AD4 001E6A14 80 C7 00 9C */ lwz r6, 0x9c(r7)
@@ -1495,8 +1495,8 @@ lbl_801EA6E4:
/* 801EA734 001E7674 80 7F 00 04 */ lwz r3, 4(r31)
/* 801EA738 001E7678 48 0E 40 4D */ bl getTotalFreeSize__7JKRHeapCFv
/* 801EA73C 001E767C 38 00 00 00 */ li r0, 0
/* 801EA740 001E7680 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801EA744 001E7684 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801EA740 001E7680 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801EA744 001E7684 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 801EA748 001E7688 98 03 00 E8 */ stb r0, 0xe8(r3)
/* 801EA74C 001E768C 3A 60 00 00 */ li r19, 0
/* 801EA750 001E7690 3B 80 00 00 */ li r28, 0
@@ -2095,8 +2095,8 @@ lbl_801EAF28:
/* 801EAFB4 001E7EF4 90 01 00 10 */ stw r0, 0x10(r1)
/* 801EAFB8 001E7EF8 80 09 00 D4 */ lwz r0, 0xd4(r9)
/* 801EAFBC 001E7EFC 90 01 00 14 */ stw r0, 0x14(r1)
/* 801EAFC0 001E7F00 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801EAFC4 001E7F04 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801EAFC0 001E7F00 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801EAFC4 001E7F04 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 801EAFC8 001E7F08 80 63 00 1C */ lwz r3, 0x1c(r3)
/* 801EAFCC 001E7F0C 80 63 01 0C */ lwz r3, 0x10c(r3)
/* 801EAFD0 001E7F10 C0 21 00 18 */ lfs f1, 0x18(r1)
@@ -2328,8 +2328,8 @@ isMoveEnd__12dMenu_Ring_cFv:
/* 801EB308 001E8248 48 00 ED 49 */ bl dMw_B_TRIGGER__Fv
/* 801EB30C 001E824C 2C 03 00 00 */ cmpwi r3, 0
/* 801EB310 001E8250 40 82 00 2C */ bne lbl_801EB33C
/* 801EB314 001E8254 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801EB318 001E8258 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801EB314 001E8254 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801EB318 001E8258 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 801EB31C 001E825C 88 03 00 C0 */ lbz r0, 0xc0(r3)
/* 801EB320 001E8260 28 00 00 02 */ cmplwi r0, 2
/* 801EB324 001E8264 41 82 00 18 */ beq lbl_801EB33C
@@ -3409,8 +3409,8 @@ setScale__12dMenu_Ring_cFv:
/* 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
/* 801EC23C 001E917C 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801EC240 001E9180 3B A3 01 88 */ addi r29, r3, g_meter2_info@l
/* 801EC244 001E9184 48 00 01 48 */ b lbl_801EC38C
lbl_801EC248:
/* 801EC248 001E9188 88 1E 06 CF */ lbz r0, 0x6cf(r30)
@@ -4600,8 +4600,8 @@ lbl_801ED380:
/* 801ED380 001EA2C0 48 00 CC BD */ bl dMw_A_TRIGGER__Fv
/* 801ED384 001EA2C4 2C 03 00 00 */ cmpwi r3, 0
/* 801ED388 001EA2C8 41 82 00 60 */ beq lbl_801ED3E8
/* 801ED38C 001EA2CC 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801ED390 001EA2D0 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801ED38C 001EA2CC 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801ED390 001EA2D0 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 801ED394 001EA2D4 A0 03 00 B2 */ lhz r0, 0xb2(r3)
/* 801ED398 001EA2D8 54 00 04 63 */ rlwinm. r0, r0, 0, 0x11, 0x11
/* 801ED39C 001EA2DC 40 82 00 4C */ bne lbl_801ED3E8
@@ -4611,8 +4611,8 @@ lbl_801ED380:
/* 801ED3AC 001EA2EC 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 801ED3B0 001EA2F0 41 82 00 38 */ beq lbl_801ED3E8
/* 801ED3B4 001EA2F4 38 00 00 01 */ li r0, 1
/* 801ED3B8 001EA2F8 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801ED3BC 001EA2FC 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801ED3B8 001EA2F8 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801ED3BC 001EA2FC 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 801ED3C0 001EA300 98 03 00 E8 */ stb r0, 0xe8(r3)
/* 801ED3C4 001EA304 88 1F 06 A8 */ lbz r0, 0x6a8(r31)
/* 801ED3C8 001EA308 98 1F 06 C4 */ stb r0, 0x6c4(r31)
@@ -4627,8 +4627,8 @@ lbl_801ED3E8:
/* 801ED3E8 001EA328 48 00 CC 55 */ bl dMw_A_TRIGGER__Fv
/* 801ED3EC 001EA32C 2C 03 00 00 */ cmpwi r3, 0
/* 801ED3F0 001EA330 41 82 00 4C */ beq lbl_801ED43C
/* 801ED3F4 001EA334 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801ED3F8 001EA338 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801ED3F4 001EA334 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801ED3F8 001EA338 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 801ED3FC 001EA33C A0 03 00 B2 */ lhz r0, 0xb2(r3)
/* 801ED400 001EA340 54 00 04 63 */ rlwinm. r0, r0, 0, 0x11, 0x11
/* 801ED404 001EA344 40 82 00 38 */ bne lbl_801ED43C
@@ -5004,8 +5004,8 @@ lbl_801ED920:
/* 801ED964 001EA8A4 88 03 00 E0 */ lbz r0, 0xe0(r3)
/* 801ED968 001EA8A8 28 00 00 00 */ cmplwi r0, 0
/* 801ED96C 001EA8AC 40 82 00 40 */ bne lbl_801ED9AC
/* 801ED970 001EA8B0 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801ED974 001EA8B4 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801ED970 001EA8B0 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801ED974 001EA8B4 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 801ED978 001EA8B8 88 03 00 C0 */ lbz r0, 0xc0(r3)
/* 801ED97C 001EA8BC 28 00 00 01 */ cmplwi r0, 1
/* 801ED980 001EA8C0 40 82 00 0C */ bne lbl_801ED98C
@@ -5017,8 +5017,8 @@ lbl_801ED98C:
/* 801ED994 001EA8D4 48 02 F0 71 */ bl warpInProc__13dMeter2Info_cFv
lbl_801ED998:
/* 801ED998 001EA8D8 38 00 00 00 */ li r0, 0
/* 801ED99C 001EA8DC 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801ED9A0 001EA8E0 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801ED99C 001EA8DC 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801ED9A0 001EA8E0 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 801ED9A4 001EA8E4 98 03 00 E8 */ stb r0, 0xe8(r3)
/* 801ED9A8 001EA8E8 98 1F 06 B0 */ stb r0, 0x6b0(r31)
lbl_801ED9AC:
@@ -5152,8 +5152,8 @@ lbl_801EDB68:
/* 801EDB8C 001EAACC 90 01 00 0C */ stw r0, 0xc(r1)
/* 801EDB90 001EAAD0 38 00 FF FF */ li r0, -1
/* 801EDB94 001EAAD4 90 01 00 10 */ stw r0, 0x10(r1)
/* 801EDB98 001EAAD8 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801EDB9C 001EAADC 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801EDB98 001EAAD8 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801EDB9C 001EAADC 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 801EDBA0 001EAAE0 7F E4 FB 78 */ mr r4, r31
/* 801EDBA4 001EAAE4 7D 5D 32 14 */ add r10, r29, r6
/* 801EDBA8 001EAAE8 80 CA 00 68 */ lwz r6, 0x68(r10)
@@ -5249,8 +5249,8 @@ lbl_801EDCF0:
/* 801EDCFC 001EAC3C 41 82 01 D0 */ beq lbl_801EDECC
/* 801EDD00 001EAC40 2C 03 00 0A */ cmpwi r3, 0xa
/* 801EDD04 001EAC44 40 80 01 BC */ bge lbl_801EDEC0
/* 801EDD08 001EAC48 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801EDD0C 001EAC4C 38 03 01 88 */ addi r0, r3, lbl_80430188@l
/* 801EDD08 001EAC48 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801EDD0C 001EAC4C 38 03 01 88 */ addi r0, r3, g_meter2_info@l
/* 801EDD10 001EAC50 7C 60 DA 14 */ add r3, r0, r27
/* 801EDD14 001EAC54 80 83 00 28 */ lwz r4, 0x28(r3)
/* 801EDD18 001EAC58 C0 24 00 34 */ lfs f1, 0x34(r4)
asm/d/menu/d_menu_save.s
+16 -16
View File
@@ -1393,8 +1393,8 @@ lbl_801F0ACC:
lbl_801F0AD4:
/* 801F0AD4 001EDA14 38 00 00 02 */ li r0, 2
/* 801F0AD8 001EDA18 98 1F 01 BA */ stb r0, 0x1ba(r31)
/* 801F0ADC 001EDA1C 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801F0AE0 001EDA20 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801F0ADC 001EDA1C 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801F0AE0 001EDA20 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 801F0AE4 001EDA24 88 03 00 DD */ lbz r0, 0xdd(r3)
/* 801F0AE8 001EDA28 28 00 00 00 */ cmplwi r0, 0
/* 801F0AEC 001EDA2C 41 82 00 0C */ beq lbl_801F0AF8
@@ -2398,8 +2398,8 @@ lbl_801F1908:
/* 801F1934 001EE874 48 07 19 79 */ bl cAPICPad_ANY_BUTTON__FUl
/* 801F1938 001EE878 28 03 00 00 */ cmplwi r3, 0
/* 801F193C 001EE87C 41 82 00 58 */ beq lbl_801F1994
/* 801F1940 001EE880 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801F1944 001EE884 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801F1940 001EE880 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801F1944 001EE884 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 801F1948 001EE888 A8 03 00 94 */ lha r0, 0x94(r3)
/* 801F194C 001EE88C 2C 00 00 00 */ cmpwi r0, 0
/* 801F1950 001EE890 40 82 00 44 */ bne lbl_801F1994
@@ -2570,8 +2570,8 @@ closeSelect__12dMenu_save_cFv:
/* 801F1B9C 001EEADC 41 82 00 30 */ beq lbl_801F1BCC
/* 801F1BA0 001EEAE0 38 00 00 03 */ li r0, 3
/* 801F1BA4 001EEAE4 98 1F 01 BA */ stb r0, 0x1ba(r31)
/* 801F1BA8 001EEAE8 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801F1BAC 001EEAEC 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801F1BA8 001EEAE8 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801F1BAC 001EEAEC 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 801F1BB0 001EEAF0 88 83 00 DD */ lbz r4, 0xdd(r3)
/* 801F1BB4 001EEAF4 28 04 00 00 */ cmplwi r4, 0
/* 801F1BB8 001EEAF8 41 82 00 08 */ beq lbl_801F1BC0
@@ -3708,8 +3708,8 @@ lbl_801F2C7C:
lbl_801F2C84:
/* 801F2C84 001EFBC4 38 00 00 01 */ li r0, 1
/* 801F2C88 001EFBC8 98 1F 01 BB */ stb r0, 0x1bb(r31)
/* 801F2C8C 001EFBCC 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801F2C90 001EFBD0 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801F2C8C 001EFBCC 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801F2C90 001EFBD0 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 801F2C94 001EFBD4 88 83 00 DD */ lbz r4, 0xdd(r3)
/* 801F2C98 001EFBD8 28 04 00 00 */ cmplwi r4, 0
/* 801F2C9C 001EFBDC 41 82 00 08 */ beq lbl_801F2CA4
@@ -4043,15 +4043,15 @@ lbl_801F3118:
/* 801F3160 001F00A0 38 80 00 01 */ li r4, 1
/* 801F3164 001F00A4 38 A0 00 48 */ li r5, 0x48
/* 801F3168 001F00A8 4B E3 FE 51 */ bl setItem__17dSv_player_item_cFiUc
/* 801F316C 001F00AC 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801F3170 001F00B0 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801F316C 001F00AC 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801F3170 001F00B0 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 801F3174 001F00B4 A0 03 00 B6 */ lhz r0, 0xb6(r3)
/* 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
/* 801F3188 001F00C8 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801F3184 001F00C4 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801F3188 001F00C8 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 801F318C 001F00CC 88 83 00 DD */ lbz r4, 0xdd(r3)
/* 801F3190 001F00D0 28 04 00 00 */ cmplwi r4, 0
/* 801F3194 001F00D4 41 82 00 08 */ beq lbl_801F319C
@@ -5695,8 +5695,8 @@ lbl_801F4954:
/* 801F49A4 001F18E4 38 C0 00 FF */ li r6, 0xff
/* 801F49A8 001F18E8 38 E0 00 00 */ li r7, 0
/* 801F49AC 001F18EC 48 06 0E CD */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc
/* 801F49B0 001F18F0 3C 80 80 43 */ lis r4, lbl_80430188@ha
/* 801F49B4 001F18F4 38 84 01 88 */ addi r4, r4, lbl_80430188@l
/* 801F49B0 001F18F0 3C 80 80 43 */ lis r4, g_meter2_info@ha
/* 801F49B4 001F18F4 38 84 01 88 */ addi r4, r4, g_meter2_info@l
/* 801F49B8 001F18F8 A8 84 00 94 */ lha r4, 0x94(r4)
/* 801F49BC 001F18FC 57 C0 06 3E */ clrlwi r0, r30, 0x18
/* 801F49C0 001F1900 28 00 00 01 */ cmplwi r0, 1
@@ -6283,8 +6283,8 @@ lbl_801F51BC:
/* 801F520C 001F214C 38 C0 00 FF */ li r6, 0xff
/* 801F5210 001F2150 38 E0 00 00 */ li r7, 0
/* 801F5214 001F2154 48 06 06 65 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc
/* 801F5218 001F2158 3C 80 80 43 */ lis r4, lbl_80430188@ha
/* 801F521C 001F215C 38 84 01 88 */ addi r4, r4, lbl_80430188@l
/* 801F5218 001F2158 3C 80 80 43 */ lis r4, g_meter2_info@ha
/* 801F521C 001F215C 38 84 01 88 */ addi r4, r4, g_meter2_info@l
/* 801F5220 001F2160 A8 84 00 94 */ lha r4, 0x94(r4)
/* 801F5224 001F2164 57 C0 06 3E */ clrlwi r0, r30, 0x18
/* 801F5228 001F2168 28 00 00 01 */ cmplwi r0, 1
asm/d/menu/d_menu_skill.s
+6 -6
View File
@@ -2223,8 +2223,8 @@ lbl_801F9290:
lbl_801F92B8:
/* 801F92B8 001F61F8 3B 80 00 00 */ li r28, 0
/* 801F92BC 001F61FC 3B E0 00 00 */ li r31, 0
/* 801F92C0 001F6200 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801F92C4 001F6204 3B C3 01 88 */ addi r30, r3, lbl_80430188@l
/* 801F92C0 001F6200 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801F92C4 001F6204 3B C3 01 88 */ addi r30, r3, g_meter2_info@l
lbl_801F92C8:
/* 801F92C8 001F6208 38 1F 01 20 */ addi r0, r31, 0x120
/* 801F92CC 001F620C 7C 7B 00 2E */ lwzx r3, r27, r0
@@ -2274,8 +2274,8 @@ lbl_801F9340:
lbl_801F9368:
/* 801F9368 001F62A8 3B 80 00 00 */ li r28, 0
/* 801F936C 001F62AC 3B E0 00 00 */ li r31, 0
/* 801F9370 001F62B0 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801F9374 001F62B4 3B C3 01 88 */ addi r30, r3, lbl_80430188@l
/* 801F9370 001F62B0 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801F9374 001F62B4 3B C3 01 88 */ addi r30, r3, g_meter2_info@l
lbl_801F9378:
/* 801F9378 001F62B8 38 1F 01 34 */ addi r0, r31, 0x134
/* 801F937C 001F62BC 7C 7B 00 2E */ lwzx r3, r27, r0
@@ -2325,8 +2325,8 @@ lbl_801F93F0:
lbl_801F9418:
/* 801F9418 001F6358 3B 80 00 00 */ li r28, 0
/* 801F941C 001F635C 3B E0 00 00 */ li r31, 0
/* 801F9420 001F6360 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801F9424 001F6364 3B C3 01 88 */ addi r30, r3, lbl_80430188@l
/* 801F9420 001F6360 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801F9424 001F6364 3B C3 01 88 */ addi r30, r3, g_meter2_info@l
lbl_801F9428:
/* 801F9428 001F6368 38 1F 01 48 */ addi r0, r31, 0x148
/* 801F942C 001F636C 7C 7B 00 2E */ lwzx r3, r27, r0
asm/d/menu/d_menu_window.s
+104 -104
View File
File diff suppressed because it is too large Load Diff
asm/d/menu/item/d_menu_item_explain.s
+24 -24
View File
@@ -1244,8 +1244,8 @@ lbl_801DB918:
/* 801DB92C 001D886C 80 1F 00 84 */ lwz r0, 0x84(r31)
/* 801DB930 001D8870 90 01 00 0C */ stw r0, 0xc(r1)
/* 801DB934 001D8874 93 81 00 10 */ stw r28, 0x10(r1)
/* 801DB938 001D8878 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801DB93C 001D887C 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801DB938 001D8878 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801DB93C 001D887C 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 801DB940 001D8880 7F A4 EB 78 */ mr r4, r29
/* 801DB944 001D8884 80 FF 00 8C */ lwz r7, 0x8c(r31)
/* 801DB948 001D8888 81 1F 00 7C */ lwz r8, 0x7c(r31)
@@ -1508,14 +1508,14 @@ lbl_801DBCA0:
/* 801DBD04 001D8C44 90 1F 00 C8 */ stw r0, 0xc8(r31)
/* 801DBD08 001D8C48 38 00 00 00 */ li r0, 0
/* 801DBD0C 001D8C4C 98 1F 00 E2 */ stb r0, 0xe2(r31)
/* 801DBD10 001D8C50 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801DBD14 001D8C54 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801DBD10 001D8C50 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801DBD14 001D8C54 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 801DBD18 001D8C58 38 80 05 18 */ li r4, 0x518
/* 801DBD1C 001D8C5C 38 A1 00 10 */ addi r5, r1, 0x10
/* 801DBD20 001D8C60 38 C0 00 00 */ li r6, 0
/* 801DBD24 001D8C64 48 04 05 2D */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c
/* 801DBD28 001D8C68 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801DBD2C 001D8C6C 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801DBD28 001D8C68 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801DBD2C 001D8C6C 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 801DBD30 001D8C70 38 80 05 19 */ li r4, 0x519
/* 801DBD34 001D8C74 38 A1 00 08 */ addi r5, r1, 8
/* 801DBD38 001D8C78 38 C0 00 00 */ li r6, 0
@@ -1526,14 +1526,14 @@ lbl_801DBD44:
/* 801DBD48 001D8C88 90 1F 00 C8 */ stw r0, 0xc8(r31)
/* 801DBD4C 001D8C8C 38 00 00 00 */ li r0, 0
/* 801DBD50 001D8C90 98 1F 00 E2 */ stb r0, 0xe2(r31)
/* 801DBD54 001D8C94 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801DBD58 001D8C98 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801DBD54 001D8C94 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801DBD58 001D8C98 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 801DBD5C 001D8C9C 38 80 05 1B */ li r4, 0x51b
/* 801DBD60 001D8CA0 38 A1 00 10 */ addi r5, r1, 0x10
/* 801DBD64 001D8CA4 38 C0 00 00 */ li r6, 0
/* 801DBD68 001D8CA8 48 04 04 E9 */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c
/* 801DBD6C 001D8CAC 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801DBD70 001D8CB0 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801DBD6C 001D8CAC 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801DBD70 001D8CB0 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 801DBD74 001D8CB4 38 80 05 1C */ li r4, 0x51c
/* 801DBD78 001D8CB8 38 A1 00 08 */ addi r5, r1, 8
/* 801DBD7C 001D8CBC 38 C0 00 00 */ li r6, 0
@@ -1547,8 +1547,8 @@ lbl_801DBD84:
/* 801DBD98 001D8CD8 FF E0 08 90 */ fmr f31, f1
/* 801DBD9C 001D8CDC 4B E3 8C 55 */ bl mDoExt_getMesgFont__Fv
/* 801DBDA0 001D8CE0 7C 64 1B 78 */ mr r4, r3
/* 801DBDA4 001D8CE4 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801DBDA8 001D8CE8 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801DBDA4 001D8CE4 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801DBDA8 001D8CE8 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 801DBDAC 001D8CEC FC 20 F8 90 */ fmr f1, f31
/* 801DBDB0 001D8CF0 FC 40 F0 90 */ fmr f2, f30
/* 801DBDB4 001D8CF4 38 A1 00 10 */ addi r5, r1, 0x10
@@ -1562,8 +1562,8 @@ lbl_801DBD84:
/* 801DBDD4 001D8D14 FF C0 08 90 */ fmr f30, f1
/* 801DBDD8 001D8D18 4B E3 8C 19 */ bl mDoExt_getMesgFont__Fv
/* 801DBDDC 001D8D1C 7C 64 1B 78 */ mr r4, r3
/* 801DBDE0 001D8D20 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801DBDE4 001D8D24 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801DBDE0 001D8D20 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801DBDE4 001D8D24 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 801DBDE8 001D8D28 FC 20 F0 90 */ fmr f1, f30
/* 801DBDEC 001D8D2C FC 40 F8 90 */ fmr f2, f31
/* 801DBDF0 001D8D30 38 A1 00 08 */ addi r5, r1, 8
@@ -1677,14 +1677,14 @@ lbl_801DBF18:
/* 801DBF90 001D8ED0 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 801DBF94 001D8ED4 40 82 00 18 */ bne lbl_801DBFAC
/* 801DBF98 001D8ED8 38 00 00 01 */ li r0, 1
/* 801DBF9C 001D8EDC 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801DBFA0 001D8EE0 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801DBF9C 001D8EDC 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801DBFA0 001D8EE0 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 801DBFA4 001D8EE4 98 03 00 C0 */ stb r0, 0xc0(r3)
/* 801DBFA8 001D8EE8 48 00 00 14 */ b lbl_801DBFBC
lbl_801DBFAC:
/* 801DBFAC 001D8EEC 38 00 00 02 */ li r0, 2
/* 801DBFB0 001D8EF0 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801DBFB4 001D8EF4 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801DBFB0 001D8EF0 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801DBFB4 001D8EF4 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 801DBFB8 001D8EF8 98 03 00 C0 */ stb r0, 0xc0(r3)
lbl_801DBFBC:
/* 801DBFBC 001D8EFC 88 1F 00 E5 */ lbz r0, 0xe5(r31)
@@ -2037,8 +2037,8 @@ lbl_801DC48C:
/* 801DC4A8 001D93E8 4B E5 7A 21 */ bl isFirstBit__21dSv_player_get_item_cCFUc
/* 801DC4AC 001D93EC 2C 03 00 00 */ cmpwi r3, 0
/* 801DC4B0 001D93F0 41 82 00 1C */ beq lbl_801DC4CC
/* 801DC4B4 001D93F4 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801DC4B8 001D93F8 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801DC4B4 001D93F4 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801DC4B8 001D93F8 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 801DC4BC 001D93FC 88 03 00 DC */ lbz r0, 0xdc(r3)
/* 801DC4C0 001D9400 28 00 00 FF */ cmplwi r0, 0xff
/* 801DC4C4 001D9404 40 82 00 08 */ bne lbl_801DC4CC
@@ -2080,8 +2080,8 @@ lbl_801DC528:
lbl_801DC54C:
/* 801DC54C 001D948C 38 18 02 65 */ addi r0, r24, 0x265
/* 801DC550 001D9490 90 17 00 C8 */ stw r0, 0xc8(r23)
/* 801DC554 001D9494 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801DC558 001D9498 38 83 01 88 */ addi r4, r3, lbl_80430188@l
/* 801DC554 001D9494 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801DC558 001D9498 38 83 01 88 */ addi r4, r3, g_meter2_info@l
/* 801DC55C 001D949C 88 A4 00 DC */ lbz r5, 0xdc(r4)
/* 801DC560 001D94A0 28 05 00 FF */ cmplwi r5, 0xff
/* 801DC564 001D94A4 41 82 00 4C */ beq lbl_801DC5B0
@@ -2163,8 +2163,8 @@ lbl_801DC64C:
lbl_801DC67C:
/* 801DC67C 001D95BC 38 18 02 65 */ addi r0, r24, 0x265
/* 801DC680 001D95C0 90 17 00 C8 */ stw r0, 0xc8(r23)
/* 801DC684 001D95C4 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 801DC688 001D95C8 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 801DC684 001D95C4 3C 60 80 43 */ lis r3, g_meter2_info@ha
/* 801DC688 001D95C8 38 63 01 88 */ addi r3, r3, g_meter2_info@l
/* 801DC68C 001D95CC 88 83 00 DC */ lbz r4, 0xdc(r3)
/* 801DC690 001D95D0 28 04 00 FF */ cmplwi r4, 0xff
/* 801DC694 001D95D4 41 82 00 40 */ beq lbl_801DC6D4

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