diff --git a/asm/bss.s b/asm/bss.s index bfdb5a8657..b1f0d707ed 100644 --- a/asm/bss.s +++ b/asm/bss.s @@ -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: diff --git a/asm/d/d_gameover.s b/asm/d/d_gameover.s index ce79be774c..01f45245bd 100644 --- a/asm/d/d_gameover.s +++ b/asm/d/d_gameover.s @@ -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 diff --git a/asm/d/d_meter2.s b/asm/d/d_meter2.s index 264fbf8935..eb4db29c9b 100644 --- a/asm/d/d_meter2.s +++ b/asm/d/d_meter2.s @@ -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 diff --git a/asm/d/d_scope.s b/asm/d/d_scope.s index c54450f5fe..705cda25f5 100644 --- a/asm/d/d_scope.s +++ b/asm/d/d_scope.s @@ -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 diff --git a/asm/d/d_timer.s b/asm/d/d_timer.s index 20507c9b56..857a08a567 100644 --- a/asm/d/d_timer.s +++ b/asm/d/d_timer.s @@ -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 diff --git a/asm/d/file/d_file_select.s b/asm/d/file/d_file_select.s index d8b35708e4..e4d35addbf 100644 --- a/asm/d/file/d_file_select.s +++ b/asm/d/file/d_file_select.s @@ -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 diff --git a/asm/d/menu/d_menu_calibration.s b/asm/d/menu/d_menu_calibration.s index 9d08b05a3e..5046d05ccb 100644 --- a/asm/d/menu/d_menu_calibration.s +++ b/asm/d/menu/d_menu_calibration.s @@ -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 diff --git a/asm/d/menu/d_menu_collect.s b/asm/d/menu/d_menu_collect.s index 80150f9e39..9bd2941342 100644 --- a/asm/d/menu/d_menu_collect.s +++ b/asm/d/menu/d_menu_collect.s @@ -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 diff --git a/asm/d/menu/d_menu_dmap.s b/asm/d/menu/d_menu_dmap.s index fbf3ef7713..7a13761bc9 100644 --- a/asm/d/menu/d_menu_dmap.s +++ b/asm/d/menu/d_menu_dmap.s @@ -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 diff --git a/asm/d/menu/d_menu_fishing.s b/asm/d/menu/d_menu_fishing.s index 8354b68e32..4fdb157a5e 100644 --- a/asm/d/menu/d_menu_fishing.s +++ b/asm/d/menu/d_menu_fishing.s @@ -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 diff --git a/asm/d/menu/d_menu_fmap.s b/asm/d/menu/d_menu_fmap.s index e8820f42b3..59ecb921c2 100644 --- a/asm/d/menu/d_menu_fmap.s +++ b/asm/d/menu/d_menu_fmap.s @@ -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 diff --git a/asm/d/menu/d_menu_fmap2D.s b/asm/d/menu/d_menu_fmap2D.s index cb9c3476d2..a920a7ae3d 100644 --- a/asm/d/menu/d_menu_fmap2D.s +++ b/asm/d/menu/d_menu_fmap2D.s @@ -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 diff --git a/asm/d/menu/d_menu_insect.s b/asm/d/menu/d_menu_insect.s index 80cd9e9736..1f985b0861 100644 --- a/asm/d/menu/d_menu_insect.s +++ b/asm/d/menu/d_menu_insect.s @@ -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 diff --git a/asm/d/menu/d_menu_letter.s b/asm/d/menu/d_menu_letter.s index 07600f62e0..3f83f21910 100644 --- a/asm/d/menu/d_menu_letter.s +++ b/asm/d/menu/d_menu_letter.s @@ -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 diff --git a/asm/d/menu/d_menu_option.s b/asm/d/menu/d_menu_option.s index f9b41ab06d..cfeb98616a 100644 --- a/asm/d/menu/d_menu_option.s +++ b/asm/d/menu/d_menu_option.s @@ -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 diff --git a/asm/d/menu/d_menu_ring.s b/asm/d/menu/d_menu_ring.s index 9478d04b02..b1ba386ffe 100644 --- a/asm/d/menu/d_menu_ring.s +++ b/asm/d/menu/d_menu_ring.s @@ -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) diff --git a/asm/d/menu/d_menu_save.s b/asm/d/menu/d_menu_save.s index c4afc5d9cd..9092d40084 100644 --- a/asm/d/menu/d_menu_save.s +++ b/asm/d/menu/d_menu_save.s @@ -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 diff --git a/asm/d/menu/d_menu_skill.s b/asm/d/menu/d_menu_skill.s index 7fea14c012..9f84745434 100644 --- a/asm/d/menu/d_menu_skill.s +++ b/asm/d/menu/d_menu_skill.s @@ -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 diff --git a/asm/d/menu/d_menu_window.s b/asm/d/menu/d_menu_window.s index f0f06997aa..760a627acf 100644 --- a/asm/d/menu/d_menu_window.s +++ b/asm/d/menu/d_menu_window.s @@ -96,24 +96,24 @@ dMw_START_TRIGGER__Fv: /* 801FA080 001F6FC0 80 03 00 34 */ lwz r0, 0x34(r3) /* 801FA084 001F6FC4 54 03 A7 FE */ rlwinm r3, r0, 0x14, 0x1f, 0x1f /* 801FA088 001F6FC8 4E 80 00 20 */ blr -/* 801FA08C 001F6FCC 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 801FA090 001F6FD0 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 801FA08C 001F6FCC 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 801FA090 001F6FD0 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 801FA094 001F6FD4 80 63 00 24 */ lwz r3, 0x24(r3) /* 801FA098 001F6FD8 28 03 00 00 */ cmplwi r3, 0 /* 801FA09C 001F6FDC 4D 82 00 20 */ beqlr /* 801FA0A0 001F6FE0 38 00 00 01 */ li r0, 1 /* 801FA0A4 001F6FE4 98 03 01 54 */ stb r0, 0x154(r3) /* 801FA0A8 001F6FE8 4E 80 00 20 */ blr -/* 801FA0AC 001F6FEC 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 801FA0B0 001F6FF0 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 801FA0AC 001F6FEC 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 801FA0B0 001F6FF0 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 801FA0B4 001F6FF4 80 63 00 24 */ lwz r3, 0x24(r3) /* 801FA0B8 001F6FF8 28 03 00 00 */ cmplwi r3, 0 /* 801FA0BC 001F6FFC 4D 82 00 20 */ beqlr /* 801FA0C0 001F7000 38 00 00 00 */ li r0, 0 /* 801FA0C4 001F7004 98 03 01 54 */ stb r0, 0x154(r3) /* 801FA0C8 001F7008 4E 80 00 20 */ blr -/* 801FA0CC 001F700C 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 801FA0D0 001F7010 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 801FA0CC 001F700C 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 801FA0D0 001F7010 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 801FA0D4 001F7014 80 63 00 24 */ lwz r3, 0x24(r3) /* 801FA0D8 001F7018 28 03 00 00 */ cmplwi r3, 0 /* 801FA0DC 001F701C 4D 82 00 20 */ beqlr @@ -121,8 +121,8 @@ dMw_START_TRIGGER__Fv: /* 801FA0E4 001F7024 60 00 00 01 */ ori r0, r0, 1 /* 801FA0E8 001F7028 98 03 01 47 */ stb r0, 0x147(r3) /* 801FA0EC 001F702C 4E 80 00 20 */ blr -/* 801FA0F0 001F7030 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 801FA0F4 001F7034 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 801FA0F0 001F7030 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 801FA0F4 001F7034 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 801FA0F8 001F7038 80 63 00 24 */ lwz r3, 0x24(r3) /* 801FA0FC 001F703C 28 03 00 00 */ cmplwi r3, 0 /* 801FA100 001F7040 4D 82 00 20 */ beqlr @@ -133,8 +133,8 @@ dMw_START_TRIGGER__Fv: .global dMw_isMenuRing__Fv dMw_isMenuRing__Fv: -/* 801FA114 001F7054 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 801FA118 001F7058 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 801FA114 001F7054 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 801FA118 001F7058 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 801FA11C 001F705C 80 63 00 24 */ lwz r3, 0x24(r3) /* 801FA120 001F7060 28 03 00 00 */ cmplwi r3, 0 /* 801FA124 001F7064 41 82 00 10 */ beq lbl_801FA134 @@ -151,8 +151,8 @@ lbl_801FA134: /* 801FA14C 001F708C 93 C1 00 08 */ stw r30, 8(r1) /* 801FA150 001F7090 7C 7E 1B 78 */ mr r30, r3 /* 801FA154 001F7094 7C 9F 23 78 */ mr r31, r4 -/* 801FA158 001F7098 3C 80 80 43 */ lis r4, lbl_80430188@ha -/* 801FA15C 001F709C 38 84 01 88 */ addi r4, r4, lbl_80430188@l +/* 801FA158 001F7098 3C 80 80 43 */ lis r4, g_meter2_info@ha +/* 801FA15C 001F709C 38 84 01 88 */ addi r4, r4, g_meter2_info@l /* 801FA160 001F70A0 88 04 00 B9 */ lbz r0, 0xb9(r4) /* 801FA164 001F70A4 98 04 00 BA */ stb r0, 0xba(r4) /* 801FA168 001F70A8 38 00 00 00 */ li r0, 0 @@ -202,8 +202,8 @@ lbl_801FA1F8: /* 801FA214 001F7154 7C 08 03 A6 */ mtlr r0 /* 801FA218 001F7158 38 21 00 10 */ addi r1, r1, 0x10 /* 801FA21C 001F715C 4E 80 00 20 */ blr -/* 801FA220 001F7160 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 801FA224 001F7164 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 801FA220 001F7160 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 801FA224 001F7164 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 801FA228 001F7168 88 03 00 B9 */ lbz r0, 0xb9(r3) /* 801FA22C 001F716C 98 03 00 BA */ stb r0, 0xba(r3) /* 801FA230 001F7170 38 00 00 02 */ li r0, 2 @@ -218,8 +218,8 @@ lbl_801FA1F8: /* 801FA254 001F7194 7C 7F 1B 78 */ mr r31, r3 /* 801FA258 001F7198 38 80 00 03 */ li r4, 3 /* 801FA25C 001F719C 98 83 01 44 */ stb r4, 0x144(r3) -/* 801FA260 001F71A0 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 801FA264 001F71A4 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 801FA260 001F71A0 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 801FA264 001F71A4 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 801FA268 001F71A8 88 03 00 B9 */ lbz r0, 0xb9(r3) /* 801FA26C 001F71AC 98 03 00 BA */ stb r0, 0xba(r3) /* 801FA270 001F71B0 98 83 00 B9 */ stb r4, 0xb9(r3) @@ -272,8 +272,8 @@ lbl_801FA1F8: /* 801FA32C 001F726C 48 00 22 A5 */ bl dMw_save_delete__5dMw_cFv /* 801FA330 001F7270 38 80 00 03 */ li r4, 3 /* 801FA334 001F7274 98 9F 01 44 */ stb r4, 0x144(r31) -/* 801FA338 001F7278 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 801FA33C 001F727C 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 801FA338 001F7278 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 801FA33C 001F727C 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 801FA340 001F7280 88 03 00 B9 */ lbz r0, 0xb9(r3) /* 801FA344 001F7284 98 03 00 BA */ stb r0, 0xba(r3) /* 801FA348 001F7288 98 83 00 B9 */ stb r4, 0xb9(r3) @@ -285,8 +285,8 @@ lbl_801FA1F8: /* 801FA360 001F72A0 48 00 23 AD */ bl dMw_option_delete__5dMw_cFv /* 801FA364 001F72A4 38 80 00 03 */ li r4, 3 /* 801FA368 001F72A8 98 9F 01 44 */ stb r4, 0x144(r31) -/* 801FA36C 001F72AC 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 801FA370 001F72B0 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 801FA36C 001F72AC 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 801FA370 001F72B0 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 801FA374 001F72B4 88 03 00 B9 */ lbz r0, 0xb9(r3) /* 801FA378 001F72B8 98 03 00 BA */ stb r0, 0xba(r3) /* 801FA37C 001F72BC 98 83 00 B9 */ stb r4, 0xb9(r3) @@ -298,8 +298,8 @@ lbl_801FA1F8: /* 801FA394 001F72D4 48 00 24 C9 */ bl dMw_letter_delete__5dMw_cFv /* 801FA398 001F72D8 38 80 00 03 */ li r4, 3 /* 801FA39C 001F72DC 98 9F 01 44 */ stb r4, 0x144(r31) -/* 801FA3A0 001F72E0 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 801FA3A4 001F72E4 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 801FA3A0 001F72E0 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 801FA3A4 001F72E4 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 801FA3A8 001F72E8 88 03 00 B9 */ lbz r0, 0xb9(r3) /* 801FA3AC 001F72EC 98 03 00 BA */ stb r0, 0xba(r3) /* 801FA3B0 001F72F0 98 83 00 B9 */ stb r4, 0xb9(r3) @@ -311,8 +311,8 @@ lbl_801FA1F8: /* 801FA3C8 001F7308 48 00 25 DD */ bl dMw_fishing_delete__5dMw_cFv /* 801FA3CC 001F730C 38 80 00 03 */ li r4, 3 /* 801FA3D0 001F7310 98 9F 01 44 */ stb r4, 0x144(r31) -/* 801FA3D4 001F7314 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 801FA3D8 001F7318 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 801FA3D4 001F7314 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 801FA3D8 001F7318 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 801FA3DC 001F731C 88 03 00 B9 */ lbz r0, 0xb9(r3) /* 801FA3E0 001F7320 98 03 00 BA */ stb r0, 0xba(r3) /* 801FA3E4 001F7324 98 83 00 B9 */ stb r4, 0xb9(r3) @@ -324,8 +324,8 @@ lbl_801FA1F8: /* 801FA3FC 001F733C 48 00 26 F1 */ bl dMw_skill_delete__5dMw_cFv /* 801FA400 001F7340 38 80 00 03 */ li r4, 3 /* 801FA404 001F7344 98 9F 01 44 */ stb r4, 0x144(r31) -/* 801FA408 001F7348 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 801FA40C 001F734C 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 801FA408 001F7348 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 801FA40C 001F734C 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 801FA410 001F7350 88 03 00 B9 */ lbz r0, 0xb9(r3) /* 801FA414 001F7354 98 03 00 BA */ stb r0, 0xba(r3) /* 801FA418 001F7358 98 83 00 B9 */ stb r4, 0xb9(r3) @@ -337,8 +337,8 @@ lbl_801FA1F8: /* 801FA430 001F7370 48 00 28 15 */ bl dMw_insect_delete__5dMw_cFv /* 801FA434 001F7374 38 80 00 03 */ li r4, 3 /* 801FA438 001F7378 98 9F 01 44 */ stb r4, 0x144(r31) -/* 801FA43C 001F737C 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 801FA440 001F7380 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 801FA43C 001F737C 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 801FA440 001F7380 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 801FA444 001F7384 88 03 00 B9 */ lbz r0, 0xb9(r3) /* 801FA448 001F7388 98 03 00 BA */ stb r0, 0xba(r3) /* 801FA44C 001F738C 98 83 00 B9 */ stb r4, 0xb9(r3) @@ -404,8 +404,8 @@ lbl_801FA524: /* 801FA52C 001F746C 7C 08 03 A6 */ mtlr r0 /* 801FA530 001F7470 38 21 00 10 */ addi r1, r1, 0x10 /* 801FA534 001F7474 4E 80 00 20 */ blr -/* 801FA538 001F7478 3C 80 80 43 */ lis r4, lbl_80430188@ha -/* 801FA53C 001F747C 38 84 01 88 */ addi r4, r4, lbl_80430188@l +/* 801FA538 001F7478 3C 80 80 43 */ lis r4, g_meter2_info@ha +/* 801FA53C 001F747C 38 84 01 88 */ addi r4, r4, g_meter2_info@l /* 801FA540 001F7480 88 04 00 B9 */ lbz r0, 0xb9(r4) /* 801FA544 001F7484 98 04 00 BA */ stb r0, 0xba(r4) /* 801FA548 001F7488 38 00 00 04 */ li r0, 4 @@ -415,8 +415,8 @@ lbl_801FA524: /* 801FA558 001F7498 4E 80 00 20 */ blr /* 801FA55C 001F749C 4E 80 00 20 */ blr /* 801FA560 001F74A0 4E 80 00 20 */ blr -/* 801FA564 001F74A4 3C 80 80 43 */ lis r4, lbl_80430188@ha -/* 801FA568 001F74A8 38 84 01 88 */ addi r4, r4, lbl_80430188@l +/* 801FA564 001F74A4 3C 80 80 43 */ lis r4, g_meter2_info@ha +/* 801FA568 001F74A8 38 84 01 88 */ addi r4, r4, g_meter2_info@l /* 801FA56C 001F74AC 88 04 00 B9 */ lbz r0, 0xb9(r4) /* 801FA570 001F74B0 98 04 00 BA */ stb r0, 0xba(r4) /* 801FA574 001F74B4 38 00 00 05 */ li r0, 5 @@ -433,8 +433,8 @@ lbl_801FA524: /* 801FA5A0 001F74E0 7C 7F 1B 78 */ mr r31, r3 /* 801FA5A4 001F74E4 38 A0 00 0A */ li r5, 0xa /* 801FA5A8 001F74E8 98 A3 01 44 */ stb r5, 0x144(r3) -/* 801FA5AC 001F74EC 3C 80 80 43 */ lis r4, lbl_80430188@ha -/* 801FA5B0 001F74F0 38 84 01 88 */ addi r4, r4, lbl_80430188@l +/* 801FA5AC 001F74EC 3C 80 80 43 */ lis r4, g_meter2_info@ha +/* 801FA5B0 001F74F0 38 84 01 88 */ addi r4, r4, g_meter2_info@l /* 801FA5B4 001F74F4 88 04 00 B9 */ lbz r0, 0xb9(r4) /* 801FA5B8 001F74F8 98 04 00 BA */ stb r0, 0xba(r4) /* 801FA5BC 001F74FC 98 A4 00 B9 */ stb r5, 0xb9(r4) @@ -463,8 +463,8 @@ lbl_801FA524: /* 801FA618 001F7558 7C 7F 1B 78 */ mr r31, r3 /* 801FA61C 001F755C 38 A0 00 0A */ li r5, 0xa /* 801FA620 001F7560 98 A3 01 44 */ stb r5, 0x144(r3) -/* 801FA624 001F7564 3C 80 80 43 */ lis r4, lbl_80430188@ha -/* 801FA628 001F7568 38 84 01 88 */ addi r4, r4, lbl_80430188@l +/* 801FA624 001F7564 3C 80 80 43 */ lis r4, g_meter2_info@ha +/* 801FA628 001F7568 38 84 01 88 */ addi r4, r4, g_meter2_info@l /* 801FA62C 001F756C 88 04 00 B9 */ lbz r0, 0xb9(r4) /* 801FA630 001F7570 98 04 00 BA */ stb r0, 0xba(r4) /* 801FA634 001F7574 98 A4 00 B9 */ stb r5, 0xb9(r4) @@ -493,8 +493,8 @@ lbl_801FA524: /* 801FA690 001F75D0 7C 7F 1B 78 */ mr r31, r3 /* 801FA694 001F75D4 38 A0 00 0A */ li r5, 0xa /* 801FA698 001F75D8 98 A3 01 44 */ stb r5, 0x144(r3) -/* 801FA69C 001F75DC 3C 80 80 43 */ lis r4, lbl_80430188@ha -/* 801FA6A0 001F75E0 38 84 01 88 */ addi r4, r4, lbl_80430188@l +/* 801FA69C 001F75DC 3C 80 80 43 */ lis r4, g_meter2_info@ha +/* 801FA6A0 001F75E0 38 84 01 88 */ addi r4, r4, g_meter2_info@l /* 801FA6A4 001F75E4 88 04 00 B9 */ lbz r0, 0xb9(r4) /* 801FA6A8 001F75E8 98 04 00 BA */ stb r0, 0xba(r4) /* 801FA6AC 001F75EC 98 A4 00 B9 */ stb r5, 0xb9(r4) @@ -539,8 +539,8 @@ lbl_801FA524: /* 801FA748 001F7688 7C 7F 1B 78 */ mr r31, r3 /* 801FA74C 001F768C 38 A0 00 0A */ li r5, 0xa /* 801FA750 001F7690 98 A3 01 44 */ stb r5, 0x144(r3) -/* 801FA754 001F7694 3C 80 80 43 */ lis r4, lbl_80430188@ha -/* 801FA758 001F7698 38 84 01 88 */ addi r4, r4, lbl_80430188@l +/* 801FA754 001F7694 3C 80 80 43 */ lis r4, g_meter2_info@ha +/* 801FA758 001F7698 38 84 01 88 */ addi r4, r4, g_meter2_info@l /* 801FA75C 001F769C 88 04 00 B9 */ lbz r0, 0xb9(r4) /* 801FA760 001F76A0 98 04 00 BA */ stb r0, 0xba(r4) /* 801FA764 001F76A4 98 A4 00 B9 */ stb r5, 0xb9(r4) @@ -585,8 +585,8 @@ lbl_801FA524: /* 801FA800 001F7740 7C 7F 1B 78 */ mr r31, r3 /* 801FA804 001F7744 38 A0 00 0A */ li r5, 0xa /* 801FA808 001F7748 98 A3 01 44 */ stb r5, 0x144(r3) -/* 801FA80C 001F774C 3C 80 80 43 */ lis r4, lbl_80430188@ha -/* 801FA810 001F7750 38 84 01 88 */ addi r4, r4, lbl_80430188@l +/* 801FA80C 001F774C 3C 80 80 43 */ lis r4, g_meter2_info@ha +/* 801FA810 001F7750 38 84 01 88 */ addi r4, r4, g_meter2_info@l /* 801FA814 001F7754 88 04 00 B9 */ lbz r0, 0xb9(r4) /* 801FA818 001F7758 98 04 00 BA */ stb r0, 0xba(r4) /* 801FA81C 001F775C 98 A4 00 B9 */ stb r5, 0xb9(r4) @@ -631,8 +631,8 @@ lbl_801FA524: /* 801FA8B8 001F77F8 7C 7F 1B 78 */ mr r31, r3 /* 801FA8BC 001F77FC 38 A0 00 0A */ li r5, 0xa /* 801FA8C0 001F7800 98 A3 01 44 */ stb r5, 0x144(r3) -/* 801FA8C4 001F7804 3C 80 80 43 */ lis r4, lbl_80430188@ha -/* 801FA8C8 001F7808 38 84 01 88 */ addi r4, r4, lbl_80430188@l +/* 801FA8C4 001F7804 3C 80 80 43 */ lis r4, g_meter2_info@ha +/* 801FA8C8 001F7808 38 84 01 88 */ addi r4, r4, g_meter2_info@l /* 801FA8CC 001F780C 88 04 00 B9 */ lbz r0, 0xb9(r4) /* 801FA8D0 001F7810 98 04 00 BA */ stb r0, 0xba(r4) /* 801FA8D4 001F7814 98 A4 00 B9 */ stb r5, 0xb9(r4) @@ -678,8 +678,8 @@ lbl_801FA524: /* 801FA974 001F78B4 7C 7F 1B 78 */ mr r31, r3 /* 801FA978 001F78B8 38 80 00 0A */ li r4, 0xa /* 801FA97C 001F78BC 98 83 01 44 */ stb r4, 0x144(r3) -/* 801FA980 001F78C0 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 801FA984 001F78C4 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 801FA980 001F78C0 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 801FA984 001F78C4 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 801FA988 001F78C8 88 03 00 B9 */ lbz r0, 0xb9(r3) /* 801FA98C 001F78CC 98 03 00 BA */ stb r0, 0xba(r3) /* 801FA990 001F78D0 98 83 00 B9 */ stb r4, 0xb9(r3) @@ -837,8 +837,8 @@ lbl_801FAB0C: /* 801FABCC 001F7B0C 54 60 05 AD */ rlwinm. r0, r3, 0, 0x16, 0x16 /* 801FABD0 001F7B10 41 82 00 18 */ beq lbl_801FABE8 lbl_801FABD4: -/* 801FABD4 001F7B14 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 801FABD8 001F7B18 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 801FABD4 001F7B14 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 801FABD8 001F7B18 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 801FABDC 001F7B1C 88 03 00 BF */ lbz r0, 0xbf(r3) /* 801FABE0 001F7B20 28 00 00 04 */ cmplwi r0, 4 /* 801FABE4 001F7B24 40 82 03 E0 */ bne lbl_801FAFC4 @@ -850,8 +850,8 @@ lbl_801FABE8: /* 801FABF8 001F7B38 88 1F 5E 1A */ lbz r0, 0x5e1a(r31) /* 801FABFC 001F7B3C 28 00 00 00 */ cmplwi r0, 0 /* 801FAC00 001F7B40 40 82 03 C4 */ bne lbl_801FAFC4 -/* 801FAC04 001F7B44 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 801FAC08 001F7B48 3B E3 01 88 */ addi r31, r3, lbl_80430188@l +/* 801FAC04 001F7B44 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 801FAC08 001F7B48 3B E3 01 88 */ addi r31, r3, g_meter2_info@l /* 801FAC0C 001F7B4C 88 1F 00 C1 */ lbz r0, 0xc1(r31) /* 801FAC10 001F7B50 28 00 00 08 */ cmplwi r0, 8 /* 801FAC14 001F7B54 40 82 00 40 */ bne lbl_801FAC54 @@ -859,8 +859,8 @@ lbl_801FABE8: /* 801FAC1C 001F7B5C 88 1E 5E 8F */ lbz r0, 0x5e8f(r30) /* 801FAC20 001F7B60 28 00 00 05 */ cmplwi r0, 5 /* 801FAC24 001F7B64 40 82 00 14 */ bne lbl_801FAC38 -/* 801FAC28 001F7B68 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 801FAC2C 001F7B6C 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 801FAC28 001F7B68 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 801FAC2C 001F7B6C 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 801FAC30 001F7B70 80 63 00 1C */ lwz r3, 0x1c(r3) /* 801FAC34 001F7B74 48 02 4A B9 */ bl emphasisButtonDelete__9dMeter2_cFv lbl_801FAC38: @@ -878,16 +878,16 @@ lbl_801FAC54: /* 801FAC60 001F7BA0 4B FF F3 DD */ bl dMw_A_TRIGGER__Fv /* 801FAC64 001F7BA4 2C 03 00 00 */ cmpwi r3, 0 /* 801FAC68 001F7BA8 40 82 00 7C */ bne lbl_801FACE4 -/* 801FAC6C 001F7BAC 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 801FAC70 001F7BB0 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 801FAC6C 001F7BAC 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 801FAC70 001F7BB0 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 801FAC74 001F7BB4 88 03 00 BF */ lbz r0, 0xbf(r3) /* 801FAC78 001F7BB8 28 00 00 00 */ cmplwi r0, 0 /* 801FAC7C 001F7BBC 41 82 00 0C */ beq lbl_801FAC88 /* 801FAC80 001F7BC0 28 00 00 01 */ cmplwi r0, 1 /* 801FAC84 001F7BC4 40 82 00 60 */ bne lbl_801FACE4 lbl_801FAC88: -/* 801FAC88 001F7BC8 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 801FAC8C 001F7BCC 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 801FAC88 001F7BC8 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 801FAC8C 001F7BCC 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 801FAC90 001F7BD0 A0 03 00 B4 */ lhz r0, 0xb4(r3) /* 801FAC94 001F7BD4 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c /* 801FAC98 001F7BD8 41 82 00 4C */ beq lbl_801FACE4 @@ -900,8 +900,8 @@ lbl_801FAC88: /* 801FACB4 001F7BF4 88 1E 5E 8F */ lbz r0, 0x5e8f(r30) /* 801FACB8 001F7BF8 28 00 00 05 */ cmplwi r0, 5 /* 801FACBC 001F7BFC 40 82 00 14 */ bne lbl_801FACD0 -/* 801FACC0 001F7C00 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 801FACC4 001F7C04 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 801FACC0 001F7C00 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 801FACC4 001F7C04 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 801FACC8 001F7C08 80 63 00 1C */ lwz r3, 0x1c(r3) /* 801FACCC 001F7C0C 48 02 4A 21 */ bl emphasisButtonDelete__9dMeter2_cFv lbl_801FACD0: @@ -911,8 +911,8 @@ lbl_801FACD0: /* 801FACDC 001F7C1C 98 1D 01 46 */ stb r0, 0x146(r29) /* 801FACE0 001F7C20 48 00 02 E4 */ b lbl_801FAFC4 lbl_801FACE4: -/* 801FACE4 001F7C24 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 801FACE8 001F7C28 3B E3 01 88 */ addi r31, r3, lbl_80430188@l +/* 801FACE4 001F7C24 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 801FACE8 001F7C28 3B E3 01 88 */ addi r31, r3, g_meter2_info@l /* 801FACEC 001F7C2C 88 1F 00 BF */ lbz r0, 0xbf(r31) /* 801FACF0 001F7C30 28 00 00 02 */ cmplwi r0, 2 /* 801FACF4 001F7C34 41 82 00 50 */ beq lbl_801FAD44 @@ -940,8 +940,8 @@ lbl_801FAD44: /* 801FAD48 001F7C88 88 1E 5E 8F */ lbz r0, 0x5e8f(r30) /* 801FAD4C 001F7C8C 28 00 00 05 */ cmplwi r0, 5 /* 801FAD50 001F7C90 40 82 00 14 */ bne lbl_801FAD64 -/* 801FAD54 001F7C94 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 801FAD58 001F7C98 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 801FAD54 001F7C94 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 801FAD58 001F7C98 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 801FAD5C 001F7C9C 80 63 00 1C */ lwz r3, 0x1c(r3) /* 801FAD60 001F7CA0 48 02 49 8D */ bl emphasisButtonDelete__9dMeter2_cFv lbl_801FAD64: @@ -1049,8 +1049,8 @@ lbl_801FAED4: /* 801FAEE4 001F7E24 2C 03 00 00 */ cmpwi r3, 0 /* 801FAEE8 001F7E28 41 82 00 24 */ beq lbl_801FAF0C lbl_801FAEEC: -/* 801FAEEC 001F7E2C 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 801FAEF0 001F7E30 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 801FAEEC 001F7E2C 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 801FAEF0 001F7E30 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 801FAEF4 001F7E34 A0 03 00 98 */ lhz r0, 0x98(r3) /* 801FAEF8 001F7E38 54 00 07 7B */ rlwinm. r0, r0, 0, 0x1d, 0x1d /* 801FAEFC 001F7E3C 40 82 00 10 */ bne lbl_801FAF0C @@ -1058,8 +1058,8 @@ lbl_801FAEEC: /* 801FAF04 001F7E44 54 00 07 7B */ rlwinm. r0, r0, 0, 0x1d, 0x1d /* 801FAF08 001F7E48 41 82 00 BC */ beq lbl_801FAFC4 lbl_801FAF0C: -/* 801FAF0C 001F7E4C 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 801FAF10 001F7E50 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 801FAF0C 001F7E4C 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 801FAF10 001F7E50 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 801FAF14 001F7E54 A0 03 00 B4 */ lhz r0, 0xb4(r3) /* 801FAF18 001F7E58 54 00 07 7B */ rlwinm. r0, r0, 0, 0x1d, 0x1d /* 801FAF1C 001F7E5C 41 82 00 A8 */ beq lbl_801FAFC4 @@ -1081,8 +1081,8 @@ lbl_801FAF34: /* 801FAF58 001F7E98 88 1E 5E 8F */ lbz r0, 0x5e8f(r30) /* 801FAF5C 001F7E9C 28 00 00 05 */ cmplwi r0, 5 /* 801FAF60 001F7EA0 40 82 00 14 */ bne lbl_801FAF74 -/* 801FAF64 001F7EA4 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 801FAF68 001F7EA8 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 801FAF64 001F7EA4 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 801FAF68 001F7EA8 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 801FAF6C 001F7EAC 80 63 00 1C */ lwz r3, 0x1c(r3) /* 801FAF70 001F7EB0 48 02 47 7D */ bl emphasisButtonDelete__9dMeter2_cFv lbl_801FAF74: @@ -1160,8 +1160,8 @@ lbl_801FB050: /* 801FB07C 001F7FBC 4B FF 03 51 */ bl isClose__12dMenu_Ring_cFv /* 801FB080 001F7FC0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801FB084 001F7FC4 41 82 00 20 */ beq lbl_801FB0A4 -/* 801FB088 001F7FC8 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 801FB08C 001F7FCC 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 801FB088 001F7FC8 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 801FB08C 001F7FCC 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 801FB090 001F7FD0 A0 03 00 98 */ lhz r0, 0x98(r3) /* 801FB094 001F7FD4 54 00 07 B8 */ rlwinm r0, r0, 0, 0x1e, 0x1c /* 801FB098 001F7FD8 B0 03 00 98 */ sth r0, 0x98(r3) @@ -1344,8 +1344,8 @@ lbl_801FB284: /* 801FB31C 001F825C 39 00 00 00 */ li r8, 0 /* 801FB320 001F8260 48 0B 06 65 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc lbl_801FB324: -/* 801FB324 001F8264 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 801FB328 001F8268 38 83 01 88 */ addi r4, r3, lbl_80430188@l +/* 801FB324 001F8264 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 801FB328 001F8268 38 83 01 88 */ addi r4, r3, g_meter2_info@l /* 801FB32C 001F826C 80 64 00 20 */ lwz r3, 0x20(r4) /* 801FB330 001F8270 28 03 00 00 */ cmplwi r3, 0 /* 801FB334 001F8274 41 82 00 24 */ beq lbl_801FB358 @@ -1419,23 +1419,23 @@ lbl_801FB3F0: /* 801FB430 001F8370 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801FB434 001F8374 41 82 00 20 */ beq lbl_801FB454 /* 801FB438 001F8378 38 00 00 01 */ li r0, 1 -/* 801FB43C 001F837C 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 801FB440 001F8380 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 801FB43C 001F837C 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 801FB440 001F8380 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 801FB444 001F8384 98 03 00 BF */ stb r0, 0xbf(r3) /* 801FB448 001F8388 80 63 00 20 */ lwz r3, 0x20(r3) /* 801FB44C 001F838C 48 01 24 29 */ bl setDispPosInsideFlg_SE_On__11dMeterMap_cFv /* 801FB450 001F8390 48 00 00 1C */ b lbl_801FB46C lbl_801FB454: /* 801FB454 001F8394 38 00 00 00 */ li r0, 0 -/* 801FB458 001F8398 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 801FB45C 001F839C 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 801FB458 001F8398 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 801FB45C 001F839C 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 801FB460 001F83A0 98 03 00 BF */ stb r0, 0xbf(r3) /* 801FB464 001F83A4 80 63 00 20 */ lwz r3, 0x20(r3) /* 801FB468 001F83A8 48 01 24 55 */ bl setDispPosOutsideFlg_SE_On__11dMeterMap_cFv lbl_801FB46C: /* 801FB46C 001F83AC 38 00 02 00 */ li r0, 0x200 -/* 801FB470 001F83B0 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 801FB474 001F83B4 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 801FB470 001F83B0 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 801FB474 001F83B4 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 801FB478 001F83B8 B0 03 00 AA */ sth r0, 0xaa(r3) /* 801FB47C 001F83BC 38 00 00 0C */ li r0, 0xc /* 801FB480 001F83C0 98 1F 01 46 */ stb r0, 0x146(r31) @@ -1460,8 +1460,8 @@ lbl_801FB4C8: /* 801FB4C8 001F8408 28 00 00 02 */ cmplwi r0, 2 /* 801FB4CC 001F840C 40 82 00 70 */ bne lbl_801FB53C /* 801FB4D0 001F8410 38 00 00 00 */ li r0, 0 -/* 801FB4D4 001F8414 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 801FB4D8 001F8418 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 801FB4D4 001F8414 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 801FB4D8 001F8418 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 801FB4DC 001F841C 98 03 00 BF */ stb r0, 0xbf(r3) /* 801FB4E0 001F8420 38 00 04 00 */ li r0, 0x400 /* 801FB4E4 001F8424 B0 03 00 AA */ sth r0, 0xaa(r3) @@ -1493,14 +1493,14 @@ lbl_801FB53C: /* 801FB548 001F8488 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801FB54C 001F848C 41 82 00 18 */ beq lbl_801FB564 /* 801FB550 001F8490 38 00 00 01 */ li r0, 1 -/* 801FB554 001F8494 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 801FB558 001F8498 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 801FB554 001F8494 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 801FB558 001F8498 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 801FB55C 001F849C 98 03 00 BF */ stb r0, 0xbf(r3) /* 801FB560 001F84A0 48 00 00 14 */ b lbl_801FB574 lbl_801FB564: /* 801FB564 001F84A4 38 00 00 00 */ li r0, 0 -/* 801FB568 001F84A8 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 801FB56C 001F84AC 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 801FB568 001F84A8 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 801FB56C 001F84AC 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 801FB570 001F84B0 98 03 00 BF */ stb r0, 0xbf(r3) lbl_801FB574: /* 801FB574 001F84B4 38 00 00 0C */ li r0, 0xc @@ -2324,8 +2324,8 @@ dMw_fmap_create__5dMw_cFv: /* 801FC118 001F9058 38 60 00 02 */ li r3, 2 /* 801FC11C 001F905C 4B E3 1F C5 */ bl dComIfGp_setHeapLockFlag__FUc /* 801FC120 001F9060 3B E0 00 00 */ li r31, 0 -/* 801FC124 001F9064 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 801FC128 001F9068 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 801FC124 001F9064 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 801FC128 001F9068 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 801FC12C 001F906C A0 83 00 AA */ lhz r4, 0xaa(r3) /* 801FC130 001F9070 28 04 04 00 */ cmplwi r4, 0x400 /* 801FC134 001F9074 41 82 00 40 */ beq lbl_801FC174 @@ -2403,8 +2403,8 @@ lbl_801FC234: /* 801FC234 001F9174 38 00 00 01 */ li r0, 1 /* 801FC238 001F9178 80 7E 01 0C */ lwz r3, 0x10c(r30) /* 801FC23C 001F917C 98 03 00 04 */ stb r0, 4(r3) -/* 801FC240 001F9180 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 801FC244 001F9184 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 801FC240 001F9180 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 801FC244 001F9184 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 801FC248 001F9188 48 02 07 95 */ bl resetWarpStatus__13dMeter2Info_cFv /* 801FC24C 001F918C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801FC250 001F9190 83 C1 00 08 */ lwz r30, 8(r1) @@ -2517,8 +2517,8 @@ lbl_801FC3C0: /* 801FC3C4 001F9304 80 7E 01 0C */ lwz r3, 0x10c(r30) /* 801FC3C8 001F9308 98 03 00 04 */ stb r0, 4(r3) /* 801FC3CC 001F930C 3B E0 00 00 */ li r31, 0 -/* 801FC3D0 001F9310 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 801FC3D4 001F9314 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 801FC3D0 001F9310 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 801FC3D4 001F9314 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 801FC3D8 001F9318 A0 03 00 AA */ lhz r0, 0xaa(r3) /* 801FC3DC 001F931C 28 00 02 00 */ cmplwi r0, 0x200 /* 801FC3E0 001F9320 40 82 00 0C */ bne lbl_801FC3EC @@ -2552,8 +2552,8 @@ lbl_801FC418: /* 801FC440 001F9380 7C 60 1B 78 */ mr r0, r3 lbl_801FC444: /* 801FC444 001F9384 90 1E 01 18 */ stw r0, 0x118(r30) -/* 801FC448 001F9388 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 801FC44C 001F938C 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 801FC448 001F9388 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 801FC44C 001F938C 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 801FC450 001F9390 48 02 05 8D */ bl resetWarpStatus__13dMeter2Info_cFv /* 801FC454 001F9394 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801FC458 001F9398 83 C1 00 08 */ lwz r30, 8(r1) @@ -3415,8 +3415,8 @@ isEventCheck__5dMw_cFv: /* 801FCFA0 001F9EE0 38 60 00 01 */ li r3, 1 /* 801FCFA4 001F9EE4 48 00 00 DC */ b lbl_801FD080 lbl_801FCFA8: -/* 801FCFA8 001F9EE8 3C 80 80 43 */ lis r4, lbl_80430188@ha -/* 801FCFAC 001F9EEC 3B E4 01 88 */ addi r31, r4, lbl_80430188@l +/* 801FCFA8 001F9EE8 3C 80 80 43 */ lis r4, g_meter2_info@ha +/* 801FCFAC 001F9EEC 3B E4 01 88 */ addi r31, r4, g_meter2_info@l /* 801FCFB0 001F9EF0 88 1F 00 BF */ lbz r0, 0xbf(r31) /* 801FCFB4 001F9EF4 28 00 00 04 */ cmplwi r0, 4 /* 801FCFB8 001F9EF8 40 82 00 18 */ bne lbl_801FCFD0 @@ -3453,8 +3453,8 @@ lbl_801FCFD0: /* 801FD030 001F9F70 41 82 00 2C */ beq lbl_801FD05C /* 801FD034 001F9F74 28 00 00 03 */ cmplwi r0, 3 /* 801FD038 001F9F78 41 82 00 24 */ beq lbl_801FD05C -/* 801FD03C 001F9F7C 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 801FD040 001F9F80 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 801FD03C 001F9F7C 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 801FD040 001F9F80 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 801FD044 001F9F84 A0 03 00 98 */ lhz r0, 0x98(r3) /* 801FD048 001F9F88 54 00 07 7B */ rlwinm. r0, r0, 0, 0x1d, 0x1d /* 801FD04C 001F9F8C 40 82 00 10 */ bne lbl_801FD05C @@ -3627,8 +3627,8 @@ lbl_801FD1F0: /* 801FD29C 001FA1DC 90 9E 01 38 */ stw r4, 0x138(r30) /* 801FD2A0 001FA1E0 38 00 00 03 */ li r0, 3 /* 801FD2A4 001FA1E4 98 1E 01 44 */ stb r0, 0x144(r30) -/* 801FD2A8 001FA1E8 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 801FD2AC 001FA1EC 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 801FD2A8 001FA1E8 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 801FD2AC 001FA1EC 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 801FD2B0 001FA1F0 88 03 00 B9 */ lbz r0, 0xb9(r3) /* 801FD2B4 001FA1F4 98 03 00 BA */ stb r0, 0xba(r3) /* 801FD2B8 001FA1F8 98 83 00 B9 */ stb r4, 0xb9(r3) @@ -3785,8 +3785,8 @@ lbl_801FD4CC: /* 801FD4D4 001FA414 88 04 5E B5 */ lbz r0, 0x5eb5(r4) /* 801FD4D8 001FA418 28 00 00 01 */ cmplwi r0, 1 /* 801FD4DC 001FA41C 40 82 01 84 */ bne lbl_801FD660 -/* 801FD4E0 001FA420 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 801FD4E4 001FA424 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 801FD4E0 001FA420 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 801FD4E4 001FA424 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 801FD4E8 001FA428 88 03 00 B9 */ lbz r0, 0xb9(r3) /* 801FD4EC 001FA42C 28 00 00 03 */ cmplwi r0, 3 /* 801FD4F0 001FA430 40 82 00 18 */ bne lbl_801FD508 @@ -4050,8 +4050,8 @@ lbl_801FD828: /* 801FD898 001FA7D8 2C 03 00 00 */ cmpwi r3, 0 /* 801FD89C 001FA7DC 41 82 00 14 */ beq lbl_801FD8B0 /* 801FD8A0 001FA7E0 38 00 00 00 */ li r0, 0 -/* 801FD8A4 001FA7E4 3C 80 80 43 */ lis r4, lbl_80430188@ha -/* 801FD8A8 001FA7E8 38 84 01 88 */ addi r4, r4, lbl_80430188@l +/* 801FD8A4 001FA7E4 3C 80 80 43 */ lis r4, g_meter2_info@ha +/* 801FD8A8 001FA7E8 38 84 01 88 */ addi r4, r4, g_meter2_info@l /* 801FD8AC 001FA7EC 90 04 00 24 */ stw r0, 0x24(r4) lbl_801FD8B0: /* 801FD8B0 001FA7F0 80 01 00 14 */ lwz r0, 0x14(r1) @@ -4063,8 +4063,8 @@ lbl_801FD8B0: /* 801FD8C8 001FA808 90 01 00 14 */ stw r0, 0x14(r1) /* 801FD8CC 001FA80C 93 E1 00 0C */ stw r31, 0xc(r1) /* 801FD8D0 001FA810 7C 7F 1B 78 */ mr r31, r3 -/* 801FD8D4 001FA814 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 801FD8D8 001FA818 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 801FD8D4 001FA814 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 801FD8D8 001FA818 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 801FD8DC 001FA81C 93 E3 00 24 */ stw r31, 0x24(r3) /* 801FD8E0 001FA820 38 00 FF FF */ li r0, -1 /* 801FD8E4 001FA824 3C 60 80 43 */ lis r3, lbl_8042E86C@ha diff --git a/asm/d/menu/item/d_menu_item_explain.s b/asm/d/menu/item/d_menu_item_explain.s index 0e3494e4ae..1554bcb2f6 100644 --- a/asm/d/menu/item/d_menu_item_explain.s +++ b/asm/d/menu/item/d_menu_item_explain.s @@ -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 diff --git a/asm/d/meter/d_meter_button.s b/asm/d/meter/d_meter_button.s index 2d4f04515a..0032738ae9 100644 --- a/asm/d/meter/d_meter_button.s +++ b/asm/d/meter/d_meter_button.s @@ -1082,8 +1082,8 @@ lbl_802021FC: /* 802022B8 001FF1F8 7E A4 AB 78 */ mr r4, r21 /* 802022BC 001FF1FC 48 0F 6C 19 */ bl draw__9J2DScreenFffPC14J2DGrafContext lbl_802022C0: -/* 802022C0 001FF200 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 802022C4 001FF204 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 802022C0 001FF200 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 802022C4 001FF204 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 802022C8 001FF208 88 03 00 F1 */ lbz r0, 0xf1(r3) /* 802022CC 001FF20C 28 00 00 00 */ cmplwi r0, 0 /* 802022D0 001FF210 41 82 00 18 */ beq lbl_802022E8 @@ -1140,8 +1140,8 @@ lbl_80202384: /* 80202394 001FF2D4 3B 23 61 C0 */ addi r25, r3, g_dComIfG_gameInfo@l /* 80202398 001FF2D8 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 8020239C 001FF2DC 3B E3 EB C8 */ addi r31, r3, lbl_8042EBC8@l -/* 802023A0 001FF2E0 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 802023A4 001FF2E4 3B A3 01 88 */ addi r29, r3, lbl_80430188@l +/* 802023A0 001FF2E0 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 802023A4 001FF2E4 3B A3 01 88 */ addi r29, r3, g_meter2_info@l /* 802023A8 001FF2E8 C3 A2 AD 48 */ lfs f29, lbl_80454748-_SDA2_BASE_(r2) lbl_802023AC: /* 802023AC 001FF2EC 3A C0 00 00 */ li r22, 0 @@ -1625,8 +1625,8 @@ _delete__14dMeterButton_cFv: /* 80202AA8 001FF9E8 39 61 00 20 */ addi r11, r1, 0x20 /* 80202AAC 001FF9EC 48 15 F7 29 */ bl _savegpr_27 /* 80202AB0 001FF9F0 7C 7F 1B 78 */ mr r31, r3 -/* 80202AB4 001FF9F4 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80202AB8 001FF9F8 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 80202AB4 001FF9F4 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80202AB8 001FF9F8 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 80202ABC 001FF9FC 48 01 97 5D */ bl resetFloatingMessage__13dMeter2Info_cFv /* 80202AC0 001FFA00 48 03 57 99 */ bl getScrnDrawPtr__12dMsgObject_cFv /* 80202AC4 001FFA04 30 03 FF FF */ addic r0, r3, -1 @@ -4274,8 +4274,8 @@ lbl_80204F20: /* 80204F5C 00201E9C 38 A0 00 00 */ li r5, 0 /* 80204F60 00201EA0 4B E2 E0 D1 */ bl getItem__17dSv_player_item_cCFib /* 80204F64 00201EA4 7C 79 1B 78 */ mr r25, r3 -/* 80204F68 00201EA8 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80204F6C 00201EAC 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 80204F68 00201EA8 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80204F6C 00201EAC 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 80204F70 00201EB0 80 63 00 1C */ lwz r3, 0x1c(r3) /* 80204F74 00201EB4 80 63 01 0C */ lwz r3, 0x10c(r3) /* 80204F78 00201EB8 48 01 6C 3D */ bl getCanoeFishing__13dMeter2Draw_cFv @@ -4295,8 +4295,8 @@ lbl_80204F98: /* 80204FA8 00201EE8 90 01 00 0C */ stw r0, 0xc(r1) /* 80204FAC 00201EEC 38 00 FF FF */ li r0, -1 /* 80204FB0 00201EF0 90 01 00 10 */ stw r0, 0x10(r1) -/* 80204FB4 00201EF4 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80204FB8 00201EF8 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 80204FB4 00201EF4 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80204FB8 00201EF8 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 80204FBC 00201EFC 7F 24 CB 78 */ mr r4, r25 /* 80204FC0 00201F00 80 BF 01 10 */ lwz r5, 0x110(r31) /* 80204FC4 00201F04 38 E0 00 00 */ li r7, 0 @@ -5184,8 +5184,8 @@ lbl_80205D0C: /* 80205D20 00202C60 C3 C2 AD 48 */ lfs f30, lbl_80454748-_SDA2_BASE_(r2) /* 80205D24 00202C64 3B C0 00 01 */ li r30, 1 lbl_80205D28: -/* 80205D28 00202C68 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80205D2C 00202C6C 3B 83 01 88 */ addi r28, r3, lbl_80430188@l +/* 80205D28 00202C68 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80205D2C 00202C6C 3B 83 01 88 */ addi r28, r3, g_meter2_info@l /* 80205D30 00202C70 80 7C 00 1C */ lwz r3, 0x1c(r28) /* 80205D34 00202C74 88 63 01 E5 */ lbz r3, 0x1e5(r3) /* 80205D38 00202C78 88 1D 04 D6 */ lbz r0, 0x4d6(r29) @@ -6050,8 +6050,8 @@ updateText__14dMeterButton_cFUl: /* 80206990 002038D0 48 15 B8 45 */ bl _savegpr_27 /* 80206994 002038D4 7C 7E 1B 78 */ mr r30, r3 /* 80206998 002038D8 7C 9F 23 78 */ mr r31, r4 -/* 8020699C 002038DC 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 802069A0 002038E0 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8020699C 002038DC 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 802069A0 002038E0 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 802069A4 002038E4 88 03 00 F1 */ lbz r0, 0xf1(r3) /* 802069A8 002038E8 28 00 00 00 */ cmplwi r0, 0 /* 802069AC 002038EC 41 82 00 20 */ beq lbl_802069CC @@ -6092,8 +6092,8 @@ lbl_802069E4: /* 80206A30 00203970 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 80206A34 00203974 7D 89 03 A6 */ mtctr r12 /* 80206A38 00203978 4E 80 04 21 */ bctrl -/* 80206A3C 0020397C 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80206A40 00203980 3B A3 01 88 */ addi r29, r3, lbl_80430188@l +/* 80206A3C 0020397C 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80206A40 00203980 3B A3 01 88 */ addi r29, r3, g_meter2_info@l /* 80206A44 00203984 A8 1D 00 A8 */ lha r0, 0xa8(r29) /* 80206A48 00203988 2C 00 00 00 */ cmpwi r0, 0 /* 80206A4C 0020398C 40 81 01 FC */ ble lbl_80206C48 @@ -6152,8 +6152,8 @@ lbl_80206B0C: /* 80206B14 00203A54 3B BD 00 04 */ addi r29, r29, 4 /* 80206B18 00203A58 41 80 FF D4 */ blt lbl_80206AEC lbl_80206B1C: -/* 80206B1C 00203A5C 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80206B20 00203A60 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 80206B1C 00203A5C 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80206B20 00203A60 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 80206B24 00203A64 48 01 56 CD */ bl decFloatingMessageTimer__13dMeter2Info_cFv /* 80206B28 00203A68 C3 E2 AD 4C */ lfs f31, lbl_8045474C-_SDA2_BASE_(r2) /* 80206B2C 00203A6C 57 E0 04 63 */ rlwinm. r0, r31, 0, 0x11, 0x11 @@ -6191,8 +6191,8 @@ lbl_80206BA4: /* 80206BA4 00203AE4 A8 1E 04 B6 */ lha r0, 0x4b6(r30) /* 80206BA8 00203AE8 2C 00 00 00 */ cmpwi r0, 0 /* 80206BAC 00203AEC 40 82 00 50 */ bne lbl_80206BFC -/* 80206BB0 00203AF0 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80206BB4 00203AF4 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 80206BB0 00203AF0 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80206BB4 00203AF4 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 80206BB8 00203AF8 48 01 56 61 */ bl resetFloatingMessage__13dMeter2Info_cFv /* 80206BBC 00203AFC 48 00 00 40 */ b lbl_80206BFC lbl_80206BC0: @@ -6565,8 +6565,8 @@ lbl_802070B8: /* 802070B8 00203FF8 80 7F 00 1C */ lwz r3, 0x1c(r31) /* 802070BC 00203FFC FC 20 00 90 */ fmr f1, f0 /* 802070C0 00204000 48 04 E7 11 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 802070C4 00204004 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 802070C8 00204008 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 802070C4 00204004 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 802070C8 00204008 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 802070CC 0020400C 80 63 00 1C */ lwz r3, 0x1c(r3) /* 802070D0 00204010 80 63 01 0C */ lwz r3, 0x10c(r3) /* 802070D4 00204014 80 9F 00 1C */ lwz r4, 0x1c(r31) @@ -6671,8 +6671,8 @@ lbl_80207234: /* 80207234 00204174 80 7F 00 24 */ lwz r3, 0x24(r31) /* 80207238 00204178 FC 20 00 90 */ fmr f1, f0 /* 8020723C 0020417C 48 04 E5 95 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 80207240 00204180 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80207244 00204184 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 80207240 00204180 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80207244 00204184 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 80207248 00204188 80 63 00 1C */ lwz r3, 0x1c(r3) /* 8020724C 0020418C 80 63 01 0C */ lwz r3, 0x10c(r3) /* 80207250 00204190 80 9F 00 24 */ lwz r4, 0x24(r31) @@ -6777,8 +6777,8 @@ lbl_802073B0: /* 802073B0 002042F0 80 7F 00 20 */ lwz r3, 0x20(r31) /* 802073B4 002042F4 FC 20 00 90 */ fmr f1, f0 /* 802073B8 002042F8 48 04 E4 19 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 802073BC 002042FC 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 802073C0 00204300 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 802073BC 002042FC 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 802073C0 00204300 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 802073C4 00204304 80 63 00 1C */ lwz r3, 0x1c(r3) /* 802073C8 00204308 80 63 01 0C */ lwz r3, 0x10c(r3) /* 802073CC 0020430C 80 9F 00 20 */ lwz r4, 0x20(r31) @@ -6883,8 +6883,8 @@ lbl_8020752C: /* 8020752C 0020446C 80 7F 00 28 */ lwz r3, 0x28(r31) /* 80207530 00204470 FC 20 00 90 */ fmr f1, f0 /* 80207534 00204474 48 04 E2 9D */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 80207538 00204478 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8020753C 0020447C 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 80207538 00204478 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8020753C 0020447C 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 80207540 00204480 80 63 00 1C */ lwz r3, 0x1c(r3) /* 80207544 00204484 80 63 01 0C */ lwz r3, 0x10c(r3) /* 80207548 00204488 80 9F 00 28 */ lwz r4, 0x28(r31) @@ -6990,8 +6990,8 @@ lbl_802076AC: /* 802076AC 002045EC 80 7F 00 2C */ lwz r3, 0x2c(r31) /* 802076B0 002045F0 FC 20 00 90 */ fmr f1, f0 /* 802076B4 002045F4 48 04 E1 1D */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 802076B8 002045F8 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 802076BC 002045FC 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 802076B8 002045F8 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 802076BC 002045FC 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 802076C0 00204600 80 63 00 1C */ lwz r3, 0x1c(r3) /* 802076C4 00204604 80 63 01 0C */ lwz r3, 0x10c(r3) /* 802076C8 00204608 80 9F 00 2C */ lwz r4, 0x2c(r31) @@ -7113,8 +7113,8 @@ lbl_80207850: /* 80207850 00204790 80 7F 00 30 */ lwz r3, 0x30(r31) /* 80207854 00204794 FC 20 00 90 */ fmr f1, f0 /* 80207858 00204798 48 04 DF 79 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 8020785C 0020479C 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80207860 002047A0 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8020785C 0020479C 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80207860 002047A0 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 80207864 002047A4 80 63 00 1C */ lwz r3, 0x1c(r3) /* 80207868 002047A8 80 63 01 0C */ lwz r3, 0x10c(r3) /* 8020786C 002047AC 80 9F 00 30 */ lwz r4, 0x30(r31) @@ -7308,8 +7308,8 @@ lbl_80207B10: /* 80207B10 00204A50 80 7F 00 34 */ lwz r3, 0x34(r31) /* 80207B14 00204A54 FC 20 00 90 */ fmr f1, f0 /* 80207B18 00204A58 48 04 DC B9 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 80207B1C 00204A5C 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80207B20 00204A60 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 80207B1C 00204A5C 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80207B20 00204A60 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 80207B24 00204A64 80 63 00 1C */ lwz r3, 0x1c(r3) /* 80207B28 00204A68 80 63 01 0C */ lwz r3, 0x10c(r3) /* 80207B2C 00204A6C 80 9F 00 34 */ lwz r4, 0x34(r31) @@ -7414,8 +7414,8 @@ lbl_80207C8C: /* 80207C8C 00204BCC 80 7F 00 38 */ lwz r3, 0x38(r31) /* 80207C90 00204BD0 FC 20 00 90 */ fmr f1, f0 /* 80207C94 00204BD4 48 04 DB 3D */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 80207C98 00204BD8 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80207C9C 00204BDC 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 80207C98 00204BD8 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80207C9C 00204BDC 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 80207CA0 00204BE0 80 63 00 1C */ lwz r3, 0x1c(r3) /* 80207CA4 00204BE4 80 63 01 0C */ lwz r3, 0x10c(r3) /* 80207CA8 00204BE8 80 9F 00 38 */ lwz r4, 0x38(r31) @@ -7520,8 +7520,8 @@ lbl_80207E08: /* 80207E08 00204D48 80 7F 00 3C */ lwz r3, 0x3c(r31) /* 80207E0C 00204D4C FC 20 00 90 */ fmr f1, f0 /* 80207E10 00204D50 48 04 D9 C1 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 80207E14 00204D54 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80207E18 00204D58 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 80207E14 00204D54 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80207E18 00204D58 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 80207E1C 00204D5C 80 63 00 1C */ lwz r3, 0x1c(r3) /* 80207E20 00204D60 80 63 01 0C */ lwz r3, 0x10c(r3) /* 80207E24 00204D64 80 9F 00 3C */ lwz r4, 0x3c(r31) @@ -7630,8 +7630,8 @@ lbl_80207F94: /* 80207F94 00204ED4 80 7F 00 40 */ lwz r3, 0x40(r31) /* 80207F98 00204ED8 FC 20 00 90 */ fmr f1, f0 /* 80207F9C 00204EDC 48 04 D8 35 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 80207FA0 00204EE0 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80207FA4 00204EE4 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 80207FA0 00204EE0 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80207FA4 00204EE4 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 80207FA8 00204EE8 80 63 00 1C */ lwz r3, 0x1c(r3) /* 80207FAC 00204EEC 80 63 01 0C */ lwz r3, 0x10c(r3) /* 80207FB0 00204EF0 80 9F 00 40 */ lwz r4, 0x40(r31) @@ -7740,8 +7740,8 @@ lbl_80208120: /* 80208120 00205060 80 7F 00 44 */ lwz r3, 0x44(r31) /* 80208124 00205064 FC 20 00 90 */ fmr f1, f0 /* 80208128 00205068 48 04 D6 A9 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 8020812C 0020506C 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80208130 00205070 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8020812C 0020506C 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80208130 00205070 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 80208134 00205074 80 63 00 1C */ lwz r3, 0x1c(r3) /* 80208138 00205078 80 63 01 0C */ lwz r3, 0x10c(r3) /* 8020813C 0020507C 80 9F 00 44 */ lwz r4, 0x44(r31) @@ -7850,8 +7850,8 @@ lbl_802082AC: /* 802082AC 002051EC 80 7F 00 48 */ lwz r3, 0x48(r31) /* 802082B0 002051F0 FC 20 00 90 */ fmr f1, f0 /* 802082B4 002051F4 48 04 D5 1D */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 802082B8 002051F8 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 802082BC 002051FC 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 802082B8 002051F8 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 802082BC 002051FC 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 802082C0 00205200 80 63 00 1C */ lwz r3, 0x1c(r3) /* 802082C4 00205204 80 63 01 0C */ lwz r3, 0x10c(r3) /* 802082C8 00205208 80 9F 00 48 */ lwz r4, 0x48(r31) @@ -7964,8 +7964,8 @@ lbl_80208444: /* 80208444 00205384 80 7F 00 4C */ lwz r3, 0x4c(r31) /* 80208448 00205388 FC 20 00 90 */ fmr f1, f0 /* 8020844C 0020538C 48 04 D3 85 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 80208450 00205390 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80208454 00205394 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 80208450 00205390 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80208454 00205394 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 80208458 00205398 80 63 00 1C */ lwz r3, 0x1c(r3) /* 8020845C 0020539C 80 63 01 0C */ lwz r3, 0x10c(r3) /* 80208460 002053A0 80 9F 00 4C */ lwz r4, 0x4c(r31) @@ -8078,8 +8078,8 @@ lbl_802085DC: /* 802085DC 0020551C 80 7F 00 50 */ lwz r3, 0x50(r31) /* 802085E0 00205520 FC 20 00 90 */ fmr f1, f0 /* 802085E4 00205524 48 04 D1 ED */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 802085E8 00205528 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 802085EC 0020552C 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 802085E8 00205528 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 802085EC 0020552C 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 802085F0 00205530 80 63 00 1C */ lwz r3, 0x1c(r3) /* 802085F4 00205534 80 63 01 0C */ lwz r3, 0x10c(r3) /* 802085F8 00205538 80 9F 00 50 */ lwz r4, 0x50(r31) @@ -8192,8 +8192,8 @@ lbl_80208774: /* 80208774 002056B4 80 7F 00 54 */ lwz r3, 0x54(r31) /* 80208778 002056B8 FC 20 00 90 */ fmr f1, f0 /* 8020877C 002056BC 48 04 D0 55 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 80208780 002056C0 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80208784 002056C4 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 80208780 002056C0 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80208784 002056C4 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 80208788 002056C8 80 63 00 1C */ lwz r3, 0x1c(r3) /* 8020878C 002056CC 80 63 01 0C */ lwz r3, 0x10c(r3) /* 80208790 002056D0 80 9F 00 54 */ lwz r4, 0x54(r31) @@ -8306,8 +8306,8 @@ lbl_8020890C: /* 8020890C 0020584C 80 7F 00 58 */ lwz r3, 0x58(r31) /* 80208910 00205850 FC 20 00 90 */ fmr f1, f0 /* 80208914 00205854 48 04 CE BD */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 80208918 00205858 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8020891C 0020585C 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 80208918 00205858 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8020891C 0020585C 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 80208920 00205860 80 63 00 1C */ lwz r3, 0x1c(r3) /* 80208924 00205864 80 63 01 0C */ lwz r3, 0x10c(r3) /* 80208928 00205868 80 9F 00 58 */ lwz r4, 0x58(r31) @@ -8696,8 +8696,8 @@ lbl_80208E88: /* 80208E88 00205DC8 80 7F 00 68 */ lwz r3, 0x68(r31) /* 80208E8C 00205DCC FC 20 00 90 */ fmr f1, f0 /* 80208E90 00205DD0 48 04 C9 41 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 80208E94 00205DD4 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80208E98 00205DD8 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 80208E94 00205DD4 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80208E98 00205DD8 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 80208E9C 00205DDC 80 63 00 1C */ lwz r3, 0x1c(r3) /* 80208EA0 00205DE0 80 63 01 0C */ lwz r3, 0x10c(r3) /* 80208EA4 00205DE4 80 9F 00 68 */ lwz r4, 0x68(r31) @@ -8810,8 +8810,8 @@ lbl_80209020: /* 80209020 00205F60 80 7F 00 6C */ lwz r3, 0x6c(r31) /* 80209024 00205F64 FC 20 00 90 */ fmr f1, f0 /* 80209028 00205F68 48 04 C7 A9 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 8020902C 00205F6C 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80209030 00205F70 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8020902C 00205F6C 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80209030 00205F70 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 80209034 00205F74 80 63 00 1C */ lwz r3, 0x1c(r3) /* 80209038 00205F78 80 63 01 0C */ lwz r3, 0x10c(r3) /* 8020903C 00205F7C 80 9F 00 6C */ lwz r4, 0x6c(r31) @@ -8924,8 +8924,8 @@ lbl_802091B8: /* 802091B8 002060F8 80 7F 00 70 */ lwz r3, 0x70(r31) /* 802091BC 002060FC FC 20 00 90 */ fmr f1, f0 /* 802091C0 00206100 48 04 C6 11 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 802091C4 00206104 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 802091C8 00206108 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 802091C4 00206104 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 802091C8 00206108 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 802091CC 0020610C 80 63 00 1C */ lwz r3, 0x1c(r3) /* 802091D0 00206110 80 63 01 0C */ lwz r3, 0x10c(r3) /* 802091D4 00206114 80 9F 00 70 */ lwz r4, 0x70(r31) @@ -9026,8 +9026,8 @@ lbl_80209328: /* 80209328 00206268 80 7F 00 78 */ lwz r3, 0x78(r31) /* 8020932C 0020626C C0 22 AD 4C */ lfs f1, lbl_8045474C-_SDA2_BASE_(r2) /* 80209330 00206270 48 04 C4 A1 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 80209334 00206274 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80209338 00206278 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 80209334 00206274 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80209338 00206278 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8020933C 0020627C 80 63 00 1C */ lwz r3, 0x1c(r3) /* 80209340 00206280 80 63 01 0C */ lwz r3, 0x10c(r3) /* 80209344 00206284 80 9F 00 78 */ lwz r4, 0x78(r31) @@ -9104,8 +9104,8 @@ lbl_80209438: /* 80209438 00206378 80 7F 00 F4 */ lwz r3, 0xf4(r31) /* 8020943C 0020637C C0 22 AD 4C */ lfs f1, lbl_8045474C-_SDA2_BASE_(r2) /* 80209440 00206380 48 04 C3 91 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 80209444 00206384 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80209448 00206388 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 80209444 00206384 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80209448 00206388 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8020944C 0020638C 80 63 00 1C */ lwz r3, 0x1c(r3) /* 80209450 00206390 80 63 01 0C */ lwz r3, 0x10c(r3) /* 80209454 00206394 80 9F 00 F4 */ lwz r4, 0xf4(r31) @@ -9784,8 +9784,8 @@ getCenterPosCalc__14dMeterButton_cFUcPci: /* 80209DA8 00206CE8 7C 7B 1B 78 */ mr r27, r3 /* 80209DAC 00206CEC 7C 9D 23 78 */ mr r29, r4 /* 80209DB0 00206CF0 7C DC 33 78 */ mr r28, r6 -/* 80209DB4 00206CF4 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80209DB8 00206CF8 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 80209DB4 00206CF4 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80209DB8 00206CF8 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 80209DBC 00206CFC 80 9B 00 84 */ lwz r4, 0x84(r27) /* 80209DC0 00206D00 48 01 28 E5 */ bl getStringLength__13dMeter2Info_cFP10J2DTextBoxPc /* 80209DC4 00206D04 57 9A 10 3A */ slwi r26, r28, 2 diff --git a/asm/d/meter2/d_meter2_draw.s b/asm/d/meter2/d_meter2_draw.s index 053f01cf4c..0a61ec797a 100644 --- a/asm/d/meter2/d_meter2_draw.s +++ b/asm/d/meter2/d_meter2_draw.s @@ -36,8 +36,8 @@ __ct__13dMeter2Draw_cFP10JKRExpHeap: /* 8020FB24 0020CA64 3C 80 80 3A */ lis r4, lbl_803988D0@ha /* 8020FB28 0020CA68 38 84 88 D0 */ addi r4, r4, lbl_803988D0@l /* 8020FB2C 0020CA6C 48 0C 60 0D */ bl getGlbResource__10JKRArchiveFUlPCcP10JKRArchive -/* 8020FB30 0020CA70 3C 80 80 43 */ lis r4, lbl_80430188@ha -/* 8020FB34 0020CA74 38 84 01 88 */ addi r4, r4, lbl_80430188@l +/* 8020FB30 0020CA70 3C 80 80 43 */ lis r4, g_meter2_info@ha +/* 8020FB34 0020CA74 38 84 01 88 */ addi r4, r4, g_meter2_info@l /* 8020FB38 0020CA78 90 64 00 10 */ stw r3, 0x10(r4) /* 8020FB3C 0020CA7C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 8020FB40 0020CA80 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l @@ -52,8 +52,8 @@ __ct__13dMeter2Draw_cFP10JKRExpHeap: /* 8020FB64 0020CAA4 38 65 4F 54 */ addi r3, r5, 0x524F4F54@l /* 8020FB68 0020CAA8 7F 45 D3 78 */ mr r5, r26 /* 8020FB6C 0020CAAC 48 0C 5F CD */ bl getGlbResource__10JKRArchiveFUlPCcP10JKRArchive -/* 8020FB70 0020CAB0 3C 80 80 43 */ lis r4, lbl_80430188@ha -/* 8020FB74 0020CAB4 38 84 01 88 */ addi r4, r4, lbl_80430188@l +/* 8020FB70 0020CAB0 3C 80 80 43 */ lis r4, g_meter2_info@ha +/* 8020FB74 0020CAB4 38 84 01 88 */ addi r4, r4, g_meter2_info@l /* 8020FB78 0020CAB8 90 64 00 14 */ stw r3, 0x14(r4) /* 8020FB7C 0020CABC 80 B7 5C F4 */ lwz r5, 0x5cf4(r23) /* 8020FB80 0020CAC0 3C 80 52 4F */ lis r4, 0x524F4F54@ha @@ -62,8 +62,8 @@ __ct__13dMeter2Draw_cFP10JKRExpHeap: /* 8020FB8C 0020CACC 38 84 88 D0 */ addi r4, r4, lbl_803988D0@l /* 8020FB90 0020CAD0 38 84 00 6E */ addi r4, r4, 0x6e /* 8020FB94 0020CAD4 48 0C 5F A5 */ bl getGlbResource__10JKRArchiveFUlPCcP10JKRArchive -/* 8020FB98 0020CAD8 3C 80 80 43 */ lis r4, lbl_80430188@ha -/* 8020FB9C 0020CADC 38 84 01 88 */ addi r4, r4, lbl_80430188@l +/* 8020FB98 0020CAD8 3C 80 80 43 */ lis r4, g_meter2_info@ha +/* 8020FB9C 0020CADC 38 84 01 88 */ addi r4, r4, g_meter2_info@l /* 8020FBA0 0020CAE0 90 64 00 18 */ stw r3, 0x18(r4) /* 8020FBA4 0020CAE4 7F 23 CB 78 */ mr r3, r25 /* 8020FBA8 0020CAE8 4B DF F6 25 */ bl mDoExt_setCurrentHeap__FP7JKRHeap @@ -582,16 +582,16 @@ lbl_802102B0: /* 80210324 0020D264 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80210328 0020D268 3B 43 61 C0 */ addi r26, r3, g_dComIfG_gameInfo@l /* 8021032C 0020D26C 80 7A 5C F4 */ lwz r3, 0x5cf4(r26) -/* 80210330 0020D270 3C 80 80 43 */ lis r4, lbl_80430188@ha -/* 80210334 0020D274 38 84 01 88 */ addi r4, r4, lbl_80430188@l +/* 80210330 0020D270 3C 80 80 43 */ lis r4, g_meter2_info@ha +/* 80210334 0020D274 38 84 01 88 */ addi r4, r4, g_meter2_info@l /* 80210338 0020D278 80 84 00 10 */ lwz r4, 0x10(r4) /* 8021033C 0020D27C 81 83 00 00 */ lwz r12, 0(r3) /* 80210340 0020D280 81 8C 00 28 */ lwz r12, 0x28(r12) /* 80210344 0020D284 7D 89 03 A6 */ mtctr r12 /* 80210348 0020D288 4E 80 04 21 */ bctrl /* 8021034C 0020D28C 80 7A 5C F4 */ lwz r3, 0x5cf4(r26) -/* 80210350 0020D290 3C 80 80 43 */ lis r4, lbl_80430188@ha -/* 80210354 0020D294 38 84 01 88 */ addi r4, r4, lbl_80430188@l +/* 80210350 0020D290 3C 80 80 43 */ lis r4, g_meter2_info@ha +/* 80210354 0020D294 38 84 01 88 */ addi r4, r4, g_meter2_info@l /* 80210358 0020D298 80 84 00 18 */ lwz r4, 0x18(r4) /* 8021035C 0020D29C 81 83 00 00 */ lwz r12, 0(r3) /* 80210360 0020D2A0 81 8C 00 28 */ lwz r12, 0x28(r12) @@ -2809,8 +2809,8 @@ lbl_80212318: /* 80212350 0020F290 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80212354 0020F294 3B 43 01 14 */ addi r26, r3, 0x114 /* 80212358 0020F298 3B 60 00 FF */ li r27, 0xff -/* 8021235C 0020F29C 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80212360 0020F2A0 3B 83 01 88 */ addi r28, r3, lbl_80430188@l +/* 8021235C 0020F29C 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80212360 0020F2A0 3B 83 01 88 */ addi r28, r3, g_meter2_info@l /* 80212364 0020F2A4 3B A0 00 00 */ li r29, 0 lbl_80212368: /* 80212368 0020F2A8 7F 43 D3 78 */ mr r3, r26 @@ -3099,8 +3099,8 @@ lbl_8021274C: /* 80212780 0020F6C0 41 80 FF C0 */ blt lbl_80212740 /* 80212784 0020F6C4 3B 00 00 00 */ li r24, 0 /* 80212788 0020F6C8 3B 60 00 00 */ li r27, 0 -/* 8021278C 0020F6CC 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80212790 0020F6D0 3B 43 01 88 */ addi r26, r3, lbl_80430188@l +/* 8021278C 0020F6CC 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80212790 0020F6D0 3B 43 01 88 */ addi r26, r3, g_meter2_info@l lbl_80212794: /* 80212794 0020F6D4 7F 43 D3 78 */ mr r3, r26 /* 80212798 0020F6D8 7F 04 C3 78 */ mr r4, r24 @@ -3227,8 +3227,8 @@ lbl_8021295C: /* 80212968 0020F8A8 38 80 00 04 */ li r4, 4 /* 8021296C 0020F8AC 48 0E 4D 8D */ bl setBasePosition__7J2DPaneF15J2DBasePosition /* 80212970 0020F8B0 80 1F 03 2C */ lwz r0, 0x32c(r31) -/* 80212974 0020F8B4 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80212978 0020F8B8 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 80212974 0020F8B4 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80212978 0020F8B8 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8021297C 0020F8BC 90 03 00 28 */ stw r0, 0x28(r3) /* 80212980 0020F8C0 38 60 00 6C */ li r3, 0x6c /* 80212984 0020F8C4 48 0B C2 C9 */ bl __nw__FUl @@ -3250,8 +3250,8 @@ lbl_802129B4: /* 802129C0 0020F900 38 80 00 04 */ li r4, 4 /* 802129C4 0020F904 48 0E 4D 35 */ bl setBasePosition__7J2DPaneF15J2DBasePosition /* 802129C8 0020F908 80 1F 03 30 */ lwz r0, 0x330(r31) -/* 802129CC 0020F90C 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 802129D0 0020F910 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 802129CC 0020F90C 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 802129D0 0020F910 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 802129D4 0020F914 90 03 00 2C */ stw r0, 0x2c(r3) /* 802129D8 0020F918 38 00 00 00 */ li r0, 0 /* 802129DC 0020F91C 90 1F 03 34 */ stw r0, 0x334(r31) @@ -3352,8 +3352,8 @@ lbl_80212B40: /* 80212B4C 0020FA8C 38 80 00 04 */ li r4, 4 /* 80212B50 0020FA90 48 0E 4B A9 */ bl setBasePosition__7J2DPaneF15J2DBasePosition /* 80212B54 0020FA94 80 1F 03 34 */ lwz r0, 0x334(r31) -/* 80212B58 0020FA98 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80212B5C 0020FA9C 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 80212B58 0020FA98 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80212B5C 0020FA9C 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 80212B60 0020FAA0 90 03 00 30 */ stw r0, 0x30(r3) /* 80212B64 0020FAA4 38 60 01 50 */ li r3, 0x150 /* 80212B68 0020FAA8 48 0B C0 E5 */ bl __nw__FUl @@ -4199,8 +4199,8 @@ lbl_80213554: /* 802137E4 00210724 4E 80 04 21 */ bctrl /* 802137E8 00210728 48 0E CE 71 */ bl getStringPtr__10J2DTextBoxCFv /* 802137EC 0021072C 7C 65 1B 78 */ mr r5, r3 -/* 802137F0 00210730 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 802137F4 00210734 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 802137F0 00210730 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 802137F4 00210734 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 802137F8 00210738 38 80 00 61 */ li r4, 0x61 /* 802137FC 0021073C 38 C0 00 00 */ li r6, 0 /* 80213800 00210740 48 00 8A 51 */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c @@ -4215,8 +4215,8 @@ lbl_80213554: /* 80213824 00210764 4E 80 04 21 */ bctrl /* 80213828 00210768 48 0E CE 31 */ bl getStringPtr__10J2DTextBoxCFv /* 8021382C 0021076C 7C 65 1B 78 */ mr r5, r3 -/* 80213830 00210770 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80213834 00210774 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 80213830 00210770 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80213834 00210774 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 80213838 00210778 38 80 00 61 */ li r4, 0x61 /* 8021383C 0021077C 38 C0 00 00 */ li r6, 0 /* 80213840 00210780 48 00 8A 11 */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c @@ -4231,8 +4231,8 @@ lbl_80213554: /* 80213864 002107A4 4E 80 04 21 */ bctrl /* 80213868 002107A8 48 0E CD F1 */ bl getStringPtr__10J2DTextBoxCFv /* 8021386C 002107AC 7C 65 1B 78 */ mr r5, r3 -/* 80213870 002107B0 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80213874 002107B4 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 80213870 002107B0 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80213874 002107B4 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 80213878 002107B8 38 80 00 61 */ li r4, 0x61 /* 8021387C 002107BC 38 C0 00 00 */ li r6, 0 /* 80213880 002107C0 48 00 89 D1 */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c @@ -4247,8 +4247,8 @@ lbl_80213554: /* 802138A4 002107E4 4E 80 04 21 */ bctrl /* 802138A8 002107E8 48 0E CD B1 */ bl getStringPtr__10J2DTextBoxCFv /* 802138AC 002107EC 7C 65 1B 78 */ mr r5, r3 -/* 802138B0 002107F0 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 802138B4 002107F4 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 802138B0 002107F0 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 802138B4 002107F4 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 802138B8 002107F8 38 80 00 61 */ li r4, 0x61 /* 802138BC 002107FC 38 C0 00 00 */ li r6, 0 /* 802138C0 00210800 48 00 89 91 */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c @@ -4263,8 +4263,8 @@ lbl_80213554: /* 802138E4 00210824 4E 80 04 21 */ bctrl /* 802138E8 00210828 48 0E CD 71 */ bl getStringPtr__10J2DTextBoxCFv /* 802138EC 0021082C 7C 65 1B 78 */ mr r5, r3 -/* 802138F0 00210830 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 802138F4 00210834 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 802138F0 00210830 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 802138F4 00210834 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 802138F8 00210838 38 80 00 61 */ li r4, 0x61 /* 802138FC 0021083C 38 C0 00 00 */ li r6, 0 /* 80213900 00210840 48 00 89 51 */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c @@ -4434,8 +4434,8 @@ lbl_80213554: /* 80213B90 00210AD0 4E 80 04 21 */ bctrl /* 80213B94 00210AD4 48 0E CA C5 */ bl getStringPtr__10J2DTextBoxCFv /* 80213B98 00210AD8 7C 65 1B 78 */ mr r5, r3 -/* 80213B9C 00210ADC 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80213BA0 00210AE0 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 80213B9C 00210ADC 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80213BA0 00210AE0 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 80213BA4 00210AE4 38 80 00 62 */ li r4, 0x62 /* 80213BA8 00210AE8 38 C0 00 00 */ li r6, 0 /* 80213BAC 00210AEC 48 00 86 A5 */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c @@ -4450,8 +4450,8 @@ lbl_80213554: /* 80213BD0 00210B10 4E 80 04 21 */ bctrl /* 80213BD4 00210B14 48 0E CA 85 */ bl getStringPtr__10J2DTextBoxCFv /* 80213BD8 00210B18 7C 65 1B 78 */ mr r5, r3 -/* 80213BDC 00210B1C 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80213BE0 00210B20 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 80213BDC 00210B1C 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80213BE0 00210B20 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 80213BE4 00210B24 38 80 00 62 */ li r4, 0x62 /* 80213BE8 00210B28 38 C0 00 00 */ li r6, 0 /* 80213BEC 00210B2C 48 00 86 65 */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c @@ -4466,8 +4466,8 @@ lbl_80213554: /* 80213C10 00210B50 4E 80 04 21 */ bctrl /* 80213C14 00210B54 48 0E CA 45 */ bl getStringPtr__10J2DTextBoxCFv /* 80213C18 00210B58 7C 65 1B 78 */ mr r5, r3 -/* 80213C1C 00210B5C 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80213C20 00210B60 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 80213C1C 00210B5C 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80213C20 00210B60 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 80213C24 00210B64 38 80 00 62 */ li r4, 0x62 /* 80213C28 00210B68 38 C0 00 00 */ li r6, 0 /* 80213C2C 00210B6C 48 00 86 25 */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c @@ -4482,8 +4482,8 @@ lbl_80213554: /* 80213C50 00210B90 4E 80 04 21 */ bctrl /* 80213C54 00210B94 48 0E CA 05 */ bl getStringPtr__10J2DTextBoxCFv /* 80213C58 00210B98 7C 65 1B 78 */ mr r5, r3 -/* 80213C5C 00210B9C 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80213C60 00210BA0 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 80213C5C 00210B9C 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80213C60 00210BA0 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 80213C64 00210BA4 38 80 00 62 */ li r4, 0x62 /* 80213C68 00210BA8 38 C0 00 00 */ li r6, 0 /* 80213C6C 00210BAC 48 00 85 E5 */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c @@ -4498,8 +4498,8 @@ lbl_80213554: /* 80213C90 00210BD0 4E 80 04 21 */ bctrl /* 80213C94 00210BD4 48 0E C9 C5 */ bl getStringPtr__10J2DTextBoxCFv /* 80213C98 00210BD8 7C 65 1B 78 */ mr r5, r3 -/* 80213C9C 00210BDC 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80213CA0 00210BE0 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 80213C9C 00210BDC 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80213CA0 00210BE0 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 80213CA4 00210BE4 38 80 00 62 */ li r4, 0x62 /* 80213CA8 00210BE8 38 C0 00 00 */ li r6, 0 /* 80213CAC 00210BEC 48 00 85 A5 */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c @@ -6951,8 +6951,8 @@ setAlphaLightDropAnimeMax__13dMeter2Draw_cFv: /* 80215FB0 00212EF0 C0 23 00 18 */ lfs f1, 0x18(r3) /* 80215FB4 00212EF4 C0 1D 06 FC */ lfs f0, 0x6fc(r29) /* 80215FB8 00212EF8 EF E1 00 32 */ fmuls f31, f1, f0 -/* 80215FBC 00212EFC 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80215FC0 00212F00 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 80215FBC 00212EFC 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80215FC0 00212F00 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 80215FC4 00212F04 3B C3 00 E3 */ addi r30, r3, 0xe3 /* 80215FC8 00212F08 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80215FCC 00212F0C 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l @@ -9122,20 +9122,20 @@ lbl_80217E38: /* 80217EC0 00214E00 C0 44 01 50 */ lfs f2, 0x150(r4) /* 80217EC4 00214E04 48 03 C6 ED */ bl paneTrans__8CPaneMgrFff /* 80217EC8 00214E08 C3 FF 00 0C */ lfs f31, 0xc(r31) -/* 80217ECC 00214E0C 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80217ED0 00214E10 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 80217ECC 00214E0C 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80217ED0 00214E10 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 80217ED4 00214E14 38 80 00 00 */ li r4, 0 /* 80217ED8 00214E18 48 00 4A 79 */ bl isDirectUseItem__13dMeter2Info_cFi /* 80217EDC 00214E1C 88 1F 07 73 */ lbz r0, 0x773(r31) /* 80217EE0 00214E20 7C 00 18 00 */ cmpw r0, r3 /* 80217EE4 00214E24 41 82 00 58 */ beq lbl_80217F3C -/* 80217EE8 00214E28 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80217EEC 00214E2C 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 80217EE8 00214E28 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80217EEC 00214E2C 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 80217EF0 00214E30 38 80 00 00 */ li r4, 0 /* 80217EF4 00214E34 48 00 4A 5D */ bl isDirectUseItem__13dMeter2Info_cFi /* 80217EF8 00214E38 98 7F 07 73 */ stb r3, 0x773(r31) -/* 80217EFC 00214E3C 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80217F00 00214E40 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 80217EFC 00214E3C 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80217F00 00214E40 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 80217F04 00214E44 38 80 00 00 */ li r4, 0 /* 80217F08 00214E48 48 00 4A 49 */ bl isDirectUseItem__13dMeter2Info_cFi /* 80217F0C 00214E4C 2C 03 00 00 */ cmpwi r3, 0 @@ -9151,8 +9151,8 @@ lbl_80217E38: /* 80217F34 00214E74 EC 01 00 28 */ fsubs f0, f1, f0 /* 80217F38 00214E78 D0 1F 06 10 */ stfs f0, 0x610(r31) lbl_80217F3C: -/* 80217F3C 00214E7C 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80217F40 00214E80 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 80217F3C 00214E7C 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80217F40 00214E80 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 80217F44 00214E84 38 80 00 00 */ li r4, 0 /* 80217F48 00214E88 48 00 4A 09 */ bl isDirectUseItem__13dMeter2Info_cFi /* 80217F4C 00214E8C 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha @@ -9240,20 +9240,20 @@ lbl_8021804C: /* 80218090 00214FD0 C0 44 01 60 */ lfs f2, 0x160(r4) /* 80218094 00214FD4 48 03 C5 1D */ bl paneTrans__8CPaneMgrFff /* 80218098 00214FD8 C3 FF 00 28 */ lfs f31, 0x28(r31) -/* 8021809C 00214FDC 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 802180A0 00214FE0 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8021809C 00214FDC 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 802180A0 00214FE0 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 802180A4 00214FE4 38 80 00 01 */ li r4, 1 /* 802180A8 00214FE8 48 00 48 A9 */ bl isDirectUseItem__13dMeter2Info_cFi /* 802180AC 00214FEC 88 1F 07 74 */ lbz r0, 0x774(r31) /* 802180B0 00214FF0 7C 00 18 00 */ cmpw r0, r3 /* 802180B4 00214FF4 41 82 00 58 */ beq lbl_8021810C -/* 802180B8 00214FF8 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 802180BC 00214FFC 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 802180B8 00214FF8 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 802180BC 00214FFC 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 802180C0 00215000 38 80 00 01 */ li r4, 1 /* 802180C4 00215004 48 00 48 8D */ bl isDirectUseItem__13dMeter2Info_cFi /* 802180C8 00215008 98 7F 07 74 */ stb r3, 0x774(r31) -/* 802180CC 0021500C 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 802180D0 00215010 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 802180CC 0021500C 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 802180D0 00215010 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 802180D4 00215014 38 80 00 01 */ li r4, 1 /* 802180D8 00215018 48 00 48 79 */ bl isDirectUseItem__13dMeter2Info_cFi /* 802180DC 0021501C 2C 03 00 00 */ cmpwi r3, 0 @@ -9269,8 +9269,8 @@ lbl_8021804C: /* 80218104 00215044 EC 01 00 28 */ fsubs f0, f1, f0 /* 80218108 00215048 D0 1F 06 14 */ stfs f0, 0x614(r31) lbl_8021810C: -/* 8021810C 0021504C 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80218110 00215050 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8021810C 0021504C 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80218110 00215050 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 80218114 00215054 38 80 00 01 */ li r4, 1 /* 80218118 00215058 48 00 48 39 */ bl isDirectUseItem__13dMeter2Info_cFi /* 8021811C 0021505C 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha @@ -10418,8 +10418,8 @@ lbl_80219120: /* 80219124 00216064 A8 03 00 16 */ lha r0, 0x16(r3) /* 80219128 00216068 2C 00 00 05 */ cmpwi r0, 5 /* 8021912C 0021606C 40 82 00 34 */ bne lbl_80219160 -/* 80219130 00216070 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80219134 00216074 38 83 01 88 */ addi r4, r3, lbl_80430188@l +/* 80219130 00216070 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80219134 00216074 38 83 01 88 */ addi r4, r3, g_meter2_info@l /* 80219138 00216078 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8021913C 0021607C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80219140 00216080 88 03 4E 0C */ lbz r0, 0x4e0c(r3) @@ -10769,8 +10769,8 @@ setButtonIconAAlpha__13dMeter2Draw_cFUcUlb: /* 80219628 00216568 80 7E 02 F8 */ lwz r3, 0x2f8(r30) /* 8021962C 0021656C 48 03 C1 FD */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80219630 00216570 FF E0 08 90 */ fmr f31, f1 -/* 80219634 00216574 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80219638 00216578 3B E3 01 88 */ addi r31, r3, lbl_80430188@l +/* 80219634 00216574 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80219638 00216578 3B E3 01 88 */ addi r31, r3, g_meter2_info@l /* 8021963C 0021657C A0 1F 00 AE */ lhz r0, 0xae(r31) /* 80219640 00216580 54 00 07 FF */ clrlwi. r0, r0, 0x1f /* 80219644 00216584 40 82 00 24 */ bne lbl_80219668 @@ -10929,8 +10929,8 @@ lbl_8021981C: /* 80219880 002167C0 80 7D 02 F8 */ lwz r3, 0x2f8(r29) /* 80219884 002167C4 48 03 BF A5 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80219888 002167C8 FF E0 08 90 */ fmr f31, f1 -/* 8021988C 002167CC 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80219890 002167D0 3B E3 01 88 */ addi r31, r3, lbl_80430188@l +/* 8021988C 002167CC 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80219890 002167D0 3B E3 01 88 */ addi r31, r3, g_meter2_info@l /* 80219894 002167D4 A0 1F 00 AE */ lhz r0, 0xae(r31) /* 80219898 002167D8 54 00 FF FF */ rlwinm. r0, r0, 0x1f, 0x1f, 0x1f /* 8021989C 002167DC 40 82 00 28 */ bne lbl_802198C4 @@ -10998,8 +10998,8 @@ lbl_802198D0: /* 8021998C 002168CC 4E 80 04 21 */ bctrl /* 80219990 002168D0 3B C0 00 00 */ li r30, 0 /* 80219994 002168D4 3B 80 00 00 */ li r28, 0 -/* 80219998 002168D8 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8021999C 002168DC 3B 23 01 88 */ addi r25, r3, lbl_80430188@l +/* 80219998 002168D8 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8021999C 002168DC 3B 23 01 88 */ addi r25, r3, g_meter2_info@l /* 802199A0 002168E0 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 802199A4 002168E4 3B 43 EB C8 */ addi r26, r3, lbl_8042EBC8@l /* 802199A8 002168E8 CB C2 AE C0 */ lfd f30, lbl_804548C0-_SDA2_BASE_(r2) @@ -11130,8 +11130,8 @@ setButtonIconMidonaAlpha__13dMeter2Draw_cFUl: /* 80219B84 00216AC4 4B E1 AE 39 */ bl isEventBit__11dSv_event_cCFUs /* 80219B88 00216AC8 2C 03 00 00 */ cmpwi r3, 0 /* 80219B8C 00216ACC 40 82 00 18 */ bne lbl_80219BA4 -/* 80219B90 00216AD0 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80219B94 00216AD4 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 80219B90 00216AD0 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80219B94 00216AD4 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 80219B98 00216AD8 A0 03 00 AE */ lhz r0, 0xae(r3) /* 80219B9C 00216ADC 54 00 05 29 */ rlwinm. r0, r0, 0, 0x14, 0x14 /* 80219BA0 00216AE0 41 82 00 2C */ beq lbl_80219BCC @@ -11158,8 +11158,8 @@ lbl_80219BD4: /* 80219BE8 00216B28 C3 A2 AE 80 */ lfs f29, lbl_80454880-_SDA2_BASE_(r2) /* 80219BEC 00216B2C 48 00 00 CC */ b lbl_80219CB8 lbl_80219BF0: -/* 80219BF0 00216B30 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80219BF4 00216B34 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 80219BF0 00216B30 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80219BF4 00216B34 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 80219BF8 00216B38 A0 03 00 AE */ lhz r0, 0xae(r3) /* 80219BFC 00216B3C 54 00 05 29 */ rlwinm. r0, r0, 0, 0x14, 0x14 /* 80219C00 00216B40 40 82 00 34 */ bne lbl_80219C34 @@ -11281,8 +11281,8 @@ lbl_80219D54: /* 80219DB0 00216CF0 C3 A2 AE 80 */ lfs f29, lbl_80454880-_SDA2_BASE_(r2) /* 80219DB4 00216CF4 48 00 00 44 */ b lbl_80219DF8 lbl_80219DB8: -/* 80219DB8 00216CF8 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80219DBC 00216CFC 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 80219DB8 00216CF8 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80219DBC 00216CFC 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 80219DC0 00216D00 A0 03 00 AE */ lhz r0, 0xae(r3) /* 80219DC4 00216D04 54 00 05 29 */ rlwinm. r0, r0, 0, 0x14, 0x14 /* 80219DC8 00216D08 40 82 00 30 */ bne lbl_80219DF8 @@ -11443,8 +11443,8 @@ lbl_80219F9C: /* 8021A00C 00216F4C FF E0 08 90 */ fmr f31, f1 /* 8021A010 00216F50 2C 19 00 00 */ cmpwi r25, 0 /* 8021A014 00216F54 40 82 00 50 */ bne lbl_8021A064 -/* 8021A018 00216F58 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8021A01C 00216F5C 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8021A018 00216F58 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8021A01C 00216F5C 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8021A020 00216F60 A0 03 00 AE */ lhz r0, 0xae(r3) /* 8021A024 00216F64 54 00 07 7B */ rlwinm. r0, r0, 0, 0x1d, 0x1d /* 8021A028 00216F68 40 82 00 8C */ bne lbl_8021A0B4 @@ -11467,8 +11467,8 @@ lbl_8021A050: lbl_8021A064: /* 8021A064 00216FA4 2C 19 00 01 */ cmpwi r25, 1 /* 8021A068 00216FA8 40 82 00 4C */ bne lbl_8021A0B4 -/* 8021A06C 00216FAC 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8021A070 00216FB0 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8021A06C 00216FAC 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8021A070 00216FB0 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8021A074 00216FB4 A0 03 00 AE */ lhz r0, 0xae(r3) /* 8021A078 00216FB8 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c /* 8021A07C 00216FBC 40 82 00 38 */ bne lbl_8021A0B4 @@ -11539,8 +11539,8 @@ lbl_8021A0B4: /* 8021A174 002170B4 3B 40 00 01 */ li r26, 1 /* 8021A178 002170B8 2C 19 00 00 */ cmpwi r25, 0 /* 8021A17C 002170BC 40 82 00 20 */ bne lbl_8021A19C -/* 8021A180 002170C0 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8021A184 002170C4 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8021A180 002170C0 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8021A184 002170C4 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8021A188 002170C8 A0 03 00 AE */ lhz r0, 0xae(r3) /* 8021A18C 002170CC 54 00 07 7B */ rlwinm. r0, r0, 0, 0x1d, 0x1d /* 8021A190 002170D0 40 82 00 2C */ bne lbl_8021A1BC @@ -11549,8 +11549,8 @@ lbl_8021A0B4: lbl_8021A19C: /* 8021A19C 002170DC 2C 19 00 01 */ cmpwi r25, 1 /* 8021A1A0 002170E0 40 82 00 1C */ bne lbl_8021A1BC -/* 8021A1A4 002170E4 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8021A1A8 002170E8 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8021A1A4 002170E4 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8021A1A8 002170E8 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8021A1AC 002170EC A0 03 00 AE */ lhz r0, 0xae(r3) /* 8021A1B0 002170F0 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c /* 8021A1B4 002170F4 40 82 00 08 */ bne lbl_8021A1BC @@ -11673,16 +11673,16 @@ lbl_8021A33C: /* 8021A35C 0021729C 57 80 06 3E */ clrlwi r0, r28, 0x18 /* 8021A360 002172A0 28 00 00 01 */ cmplwi r0, 1 /* 8021A364 002172A4 40 82 00 20 */ bne lbl_8021A384 -/* 8021A368 002172A8 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8021A36C 002172AC 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8021A368 002172A8 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8021A36C 002172AC 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8021A370 002172B0 3C A0 80 43 */ lis r5, lbl_80430158@ha /* 8021A374 002172B4 38 A5 01 58 */ addi r5, r5, lbl_80430158@l /* 8021A378 002172B8 38 C1 00 1C */ addi r6, r1, 0x1c /* 8021A37C 002172BC 48 00 1F F5 */ bl getStringKana__13dMeter2Info_cFUlPcP14JMSMesgEntry_c /* 8021A380 002172C0 48 00 00 1C */ b lbl_8021A39C lbl_8021A384: -/* 8021A384 002172C4 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8021A388 002172C8 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8021A384 002172C4 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8021A388 002172C8 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8021A38C 002172CC 3C A0 80 43 */ lis r5, lbl_80430158@ha /* 8021A390 002172D0 38 A5 01 58 */ addi r5, r5, lbl_80430158@l /* 8021A394 002172D4 38 C1 00 1C */ addi r6, r1, 0x1c @@ -11710,16 +11710,16 @@ lbl_8021A3C4: /* 8021A3E4 00217324 57 80 06 3E */ clrlwi r0, r28, 0x18 /* 8021A3E8 00217328 28 00 00 01 */ cmplwi r0, 1 /* 8021A3EC 0021732C 40 82 00 20 */ bne lbl_8021A40C -/* 8021A3F0 00217330 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8021A3F4 00217334 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8021A3F0 00217330 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8021A3F4 00217334 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8021A3F8 00217338 3C A0 80 43 */ lis r5, lbl_80430158@ha /* 8021A3FC 0021733C 38 A5 01 58 */ addi r5, r5, lbl_80430158@l /* 8021A400 00217340 38 C1 00 08 */ addi r6, r1, 8 /* 8021A404 00217344 48 00 1F 6D */ bl getStringKana__13dMeter2Info_cFUlPcP14JMSMesgEntry_c /* 8021A408 00217348 48 00 00 1C */ b lbl_8021A424 lbl_8021A40C: -/* 8021A40C 0021734C 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8021A410 00217350 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8021A40C 0021734C 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8021A410 00217350 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8021A414 00217354 3C A0 80 43 */ lis r5, lbl_80430158@ha /* 8021A418 00217358 38 A5 01 58 */ addi r5, r5, lbl_80430158@l /* 8021A41C 0021735C 38 C1 00 08 */ addi r6, r1, 8 @@ -11795,8 +11795,8 @@ lbl_8021A4E0: /* 8021A50C 0021744C 90 01 00 0C */ stw r0, 0xc(r1) /* 8021A510 00217450 38 00 FF FF */ li r0, -1 /* 8021A514 00217454 90 01 00 10 */ stw r0, 0x10(r1) -/* 8021A518 00217458 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8021A51C 0021745C 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8021A518 00217458 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8021A51C 0021745C 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8021A520 00217460 7F C4 F3 78 */ mr r4, r30 /* 8021A524 00217464 80 E7 04 E8 */ lwz r7, 0x4e8(r7) /* 8021A528 00217468 81 1D 05 14 */ lwz r8, 0x514(r29) @@ -11970,8 +11970,8 @@ lbl_8021A770: /* 8021A7A0 002176E0 90 01 00 0C */ stw r0, 0xc(r1) /* 8021A7A4 002176E4 38 00 FF FF */ li r0, -1 /* 8021A7A8 002176E8 90 01 00 10 */ stw r0, 0x10(r1) -/* 8021A7AC 002176EC 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8021A7B0 002176F0 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8021A7AC 002176EC 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8021A7B0 002176F0 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8021A7B4 002176F4 7F 64 DB 78 */ mr r4, r27 /* 8021A7B8 002176F8 7C 19 42 14 */ add r0, r25, r8 /* 8021A7BC 002176FC 7C E0 3A 14 */ add r7, r0, r7 @@ -13309,8 +13309,8 @@ getFishingType__13dMeter2Draw_cFv: /* 8021BB6C 00218AAC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8021BB70 00218AB0 7C 08 02 A6 */ mflr r0 /* 8021BB74 00218AB4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8021BB78 00218AB8 3C 80 80 43 */ lis r4, lbl_80430188@ha -/* 8021BB7C 00218ABC 38 84 01 88 */ addi r4, r4, lbl_80430188@l +/* 8021BB78 00218AB8 3C 80 80 43 */ lis r4, g_meter2_info@ha +/* 8021BB7C 00218ABC 38 84 01 88 */ addi r4, r4, g_meter2_info@l /* 8021BB80 00218AC0 A0 04 00 B0 */ lhz r0, 0xb0(r4) /* 8021BB84 00218AC4 54 00 07 FF */ clrlwi. r0, r0, 0x1f /* 8021BB88 00218AC8 41 82 00 18 */ beq lbl_8021BBA0 @@ -13427,8 +13427,8 @@ isBButtonShow__13dMeter2Draw_cFb: /* 8021BCEC 00218C2C 38 60 00 00 */ li r3, 0 /* 8021BCF0 00218C30 48 00 00 C8 */ b lbl_8021BDB8 lbl_8021BCF4: -/* 8021BCF4 00218C34 3C 80 80 43 */ lis r4, lbl_80430188@ha -/* 8021BCF8 00218C38 38 84 01 88 */ addi r4, r4, lbl_80430188@l +/* 8021BCF4 00218C34 3C 80 80 43 */ lis r4, g_meter2_info@ha +/* 8021BCF8 00218C38 38 84 01 88 */ addi r4, r4, g_meter2_info@l /* 8021BCFC 00218C3C 88 04 00 BD */ lbz r0, 0xbd(r4) /* 8021BD00 00218C40 28 00 00 00 */ cmplwi r0, 0 /* 8021BD04 00218C44 40 82 00 A8 */ bne lbl_8021BDAC @@ -13444,8 +13444,8 @@ lbl_8021BCF4: /* 8021BD2C 00218C6C 4E 80 04 21 */ bctrl /* 8021BD30 00218C70 2C 03 00 00 */ cmpwi r3, 0 /* 8021BD34 00218C74 40 82 00 78 */ bne lbl_8021BDAC -/* 8021BD38 00218C78 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8021BD3C 00218C7C 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8021BD38 00218C78 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8021BD3C 00218C7C 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8021BD40 00218C80 88 03 00 E8 */ lbz r0, 0xe8(r3) /* 8021BD44 00218C84 28 00 00 00 */ cmplwi r0, 0 /* 8021BD48 00218C88 40 82 00 64 */ bne lbl_8021BDAC diff --git a/asm/d/msg/d_msg_class.s b/asm/d/msg/d_msg_class.s index 92c61e6d89..13743f8455 100644 --- a/asm/d/msg/d_msg_class.s +++ b/asm/d/msg/d_msg_class.s @@ -2775,8 +2775,8 @@ lbl_8022AC20: /* 8022AC4C 00227B8C 40 82 00 28 */ bne lbl_8022AC74 /* 8022AC50 00227B90 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 8022AC54 00227B94 38 80 00 04 */ li r4, 4 -/* 8022AC58 00227B98 3C A0 80 43 */ lis r5, lbl_80430188@ha -/* 8022AC5C 00227B9C 38 A5 01 88 */ addi r5, r5, lbl_80430188@l +/* 8022AC58 00227B98 3C A0 80 43 */ lis r5, g_meter2_info@ha +/* 8022AC5C 00227B9C 38 A5 01 88 */ addi r5, r5, g_meter2_info@l /* 8022AC60 00227BA0 80 A5 00 88 */ lwz r5, 0x88(r5) /* 8022AC64 00227BA4 38 C1 00 38 */ addi r6, r1, 0x38 /* 8022AC68 00227BA8 38 E0 00 01 */ li r7, 1 @@ -2798,8 +2798,8 @@ lbl_8022AC74: lbl_8022ACA4: /* 8022ACA4 00227BE4 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 8022ACA8 00227BE8 38 80 00 04 */ li r4, 4 -/* 8022ACAC 00227BEC 3C A0 80 43 */ lis r5, lbl_80430188@ha -/* 8022ACB0 00227BF0 38 A5 01 88 */ addi r5, r5, lbl_80430188@l +/* 8022ACAC 00227BEC 3C A0 80 43 */ lis r5, g_meter2_info@ha +/* 8022ACB0 00227BF0 38 A5 01 88 */ addi r5, r5, g_meter2_info@l /* 8022ACB4 00227BF4 80 A5 00 84 */ lwz r5, 0x84(r5) /* 8022ACB8 00227BF8 38 C1 00 38 */ addi r6, r1, 0x38 /* 8022ACBC 00227BFC 38 E0 00 01 */ li r7, 1 @@ -2948,8 +2948,8 @@ lbl_8022ADE8: /* 8022AEE8 00227E28 48 00 00 30 */ b lbl_8022AF18 /* 8022AEEC 00227E2C 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 8022AEF0 00227E30 38 80 00 08 */ li r4, 8 -/* 8022AEF4 00227E34 3C A0 80 43 */ lis r5, lbl_80430188@ha -/* 8022AEF8 00227E38 38 A5 01 88 */ addi r5, r5, lbl_80430188@l +/* 8022AEF4 00227E34 3C A0 80 43 */ lis r5, g_meter2_info@ha +/* 8022AEF8 00227E38 38 A5 01 88 */ addi r5, r5, g_meter2_info@l /* 8022AEFC 00227E3C 88 A5 00 BC */ lbz r5, 0xbc(r5) /* 8022AF00 00227E40 38 C1 00 38 */ addi r6, r1, 0x38 /* 8022AF04 00227E44 38 E0 00 01 */ li r7, 1 @@ -4460,8 +4460,8 @@ lbl_8022C440: /* 8022C458 00229398 38 60 00 01 */ li r3, 1 /* 8022C45C 0022939C 48 00 04 88 */ b lbl_8022C8E4 /* 8022C460 002293A0 A0 1E 00 00 */ lhz r0, 0(r30) -/* 8022C464 002293A4 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8022C468 002293A8 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8022C464 002293A4 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8022C468 002293A8 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8022C46C 002293AC B0 03 00 94 */ sth r0, 0x94(r3) /* 8022C470 002293B0 B0 1F 05 D6 */ sth r0, 0x5d6(r31) /* 8022C474 002293B4 38 00 00 06 */ li r0, 6 @@ -8840,8 +8840,8 @@ lbl_802303E8: /* 80230414 0022D354 40 82 00 28 */ bne lbl_8023043C /* 80230418 0022D358 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 8023041C 0022D35C 38 80 00 04 */ li r4, 4 -/* 80230420 0022D360 3C A0 80 43 */ lis r5, lbl_80430188@ha -/* 80230424 0022D364 38 A5 01 88 */ addi r5, r5, lbl_80430188@l +/* 80230420 0022D360 3C A0 80 43 */ lis r5, g_meter2_info@ha +/* 80230424 0022D364 38 A5 01 88 */ addi r5, r5, g_meter2_info@l /* 80230428 0022D368 80 A5 00 88 */ lwz r5, 0x88(r5) /* 8023042C 0022D36C 38 C1 00 38 */ addi r6, r1, 0x38 /* 80230430 0022D370 38 E0 00 01 */ li r7, 1 @@ -8863,8 +8863,8 @@ lbl_8023043C: lbl_8023046C: /* 8023046C 0022D3AC 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 80230470 0022D3B0 38 80 00 04 */ li r4, 4 -/* 80230474 0022D3B4 3C A0 80 43 */ lis r5, lbl_80430188@ha -/* 80230478 0022D3B8 38 A5 01 88 */ addi r5, r5, lbl_80430188@l +/* 80230474 0022D3B4 3C A0 80 43 */ lis r5, g_meter2_info@ha +/* 80230478 0022D3B8 38 A5 01 88 */ addi r5, r5, g_meter2_info@l /* 8023047C 0022D3BC 80 A5 00 84 */ lwz r5, 0x84(r5) /* 80230480 0022D3C0 38 C1 00 38 */ addi r6, r1, 0x38 /* 80230484 0022D3C4 38 E0 00 01 */ li r7, 1 @@ -9015,8 +9015,8 @@ lbl_802305B8: /* 802306B8 0022D5F8 48 00 00 30 */ b lbl_802306E8 /* 802306BC 0022D5FC 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 802306C0 0022D600 38 80 00 08 */ li r4, 8 -/* 802306C4 0022D604 3C A0 80 43 */ lis r5, lbl_80430188@ha -/* 802306C8 0022D608 38 A5 01 88 */ addi r5, r5, lbl_80430188@l +/* 802306C4 0022D604 3C A0 80 43 */ lis r5, g_meter2_info@ha +/* 802306C8 0022D608 38 A5 01 88 */ addi r5, r5, g_meter2_info@l /* 802306CC 0022D60C 88 A5 00 BC */ lbz r5, 0xbc(r5) /* 802306D0 0022D610 38 C1 00 38 */ addi r6, r1, 0x38 /* 802306D4 0022D614 38 E0 00 01 */ li r7, 1 @@ -9353,8 +9353,8 @@ lbl_80230B98: /* 80230BA0 0022DAE0 48 00 00 14 */ b lbl_80230BB4 lbl_80230BA4: /* 80230BA4 0022DAE4 A0 05 00 00 */ lhz r0, 0(r5) -/* 80230BA8 0022DAE8 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80230BAC 0022DAEC 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 80230BA8 0022DAE8 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80230BAC 0022DAEC 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 80230BB0 0022DAF0 B0 03 00 94 */ sth r0, 0x94(r3) lbl_80230BB4: /* 80230BB4 0022DAF4 38 60 00 01 */ li r3, 1 @@ -10199,8 +10199,8 @@ lbl_80231800: /* 8023182C 0022E76C 40 82 00 28 */ bne lbl_80231854 /* 80231830 0022E770 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 80231834 0022E774 38 80 00 04 */ li r4, 4 -/* 80231838 0022E778 3C A0 80 43 */ lis r5, lbl_80430188@ha -/* 8023183C 0022E77C 38 A5 01 88 */ addi r5, r5, lbl_80430188@l +/* 80231838 0022E778 3C A0 80 43 */ lis r5, g_meter2_info@ha +/* 8023183C 0022E77C 38 A5 01 88 */ addi r5, r5, g_meter2_info@l /* 80231840 0022E780 80 A5 00 88 */ lwz r5, 0x88(r5) /* 80231844 0022E784 38 C1 00 38 */ addi r6, r1, 0x38 /* 80231848 0022E788 38 E0 00 01 */ li r7, 1 @@ -10222,8 +10222,8 @@ lbl_80231854: lbl_80231884: /* 80231884 0022E7C4 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 80231888 0022E7C8 38 80 00 04 */ li r4, 4 -/* 8023188C 0022E7CC 3C A0 80 43 */ lis r5, lbl_80430188@ha -/* 80231890 0022E7D0 38 A5 01 88 */ addi r5, r5, lbl_80430188@l +/* 8023188C 0022E7CC 3C A0 80 43 */ lis r5, g_meter2_info@ha +/* 80231890 0022E7D0 38 A5 01 88 */ addi r5, r5, g_meter2_info@l /* 80231894 0022E7D4 80 A5 00 84 */ lwz r5, 0x84(r5) /* 80231898 0022E7D8 38 C1 00 38 */ addi r6, r1, 0x38 /* 8023189C 0022E7DC 38 E0 00 01 */ li r7, 1 @@ -10374,8 +10374,8 @@ lbl_802319D0: /* 80231AD0 0022EA10 48 00 00 30 */ b lbl_80231B00 /* 80231AD4 0022EA14 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 80231AD8 0022EA18 38 80 00 08 */ li r4, 8 -/* 80231ADC 0022EA1C 3C A0 80 43 */ lis r5, lbl_80430188@ha -/* 80231AE0 0022EA20 38 A5 01 88 */ addi r5, r5, lbl_80430188@l +/* 80231ADC 0022EA1C 3C A0 80 43 */ lis r5, g_meter2_info@ha +/* 80231AE0 0022EA20 38 A5 01 88 */ addi r5, r5, g_meter2_info@l /* 80231AE4 0022EA24 88 A5 00 BC */ lbz r5, 0xbc(r5) /* 80231AE8 0022EA28 38 C1 00 38 */ addi r6, r1, 0x38 /* 80231AEC 0022EA2C 38 E0 00 01 */ li r7, 1 diff --git a/asm/d/msg/d_msg_flow.s b/asm/d/msg/d_msg_flow.s index a45a5d6112..d8223b09c5 100644 --- a/asm/d/msg/d_msg_flow.s +++ b/asm/d/msg/d_msg_flow.s @@ -802,8 +802,8 @@ setSelectMsg__10dMsgFlow_cFP14mesg_flow_nodeP14mesg_flow_nodeP10fopAc_ac_c: /* 8024A9D4 00247914 4B DD 54 B1 */ bl fopMsgM_messageSet__FUlUl /* 8024A9D8 00247918 48 00 00 50 */ b lbl_8024AA28 lbl_8024A9DC: -/* 8024A9DC 0024791C 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8024A9E0 00247920 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8024A9DC 0024791C 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8024A9E0 00247920 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8024A9E4 00247924 A0 03 00 A4 */ lhz r0, 0xa4(r3) /* 8024A9E8 00247928 28 00 FF FF */ cmplwi r0, 0xffff /* 8024A9EC 0024792C 40 82 00 3C */ bne lbl_8024AA28 @@ -865,8 +865,8 @@ setNormalMsg__10dMsgFlow_cFP14mesg_flow_nodeP10fopAc_ac_c: /* 8024AAB4 002479F4 4B DD 53 D1 */ bl fopMsgM_messageSet__FUlUl /* 8024AAB8 002479F8 48 00 00 50 */ b lbl_8024AB08 lbl_8024AABC: -/* 8024AABC 002479FC 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8024AAC0 00247A00 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8024AABC 002479FC 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8024AAC0 00247A00 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8024AAC4 00247A04 A0 03 00 A4 */ lhz r0, 0xa4(r3) /* 8024AAC8 00247A08 28 00 FF FF */ cmplwi r0, 0xffff /* 8024AACC 00247A0C 40 82 00 3C */ bne lbl_8024AB08 @@ -1941,8 +1941,8 @@ lbl_8024BA14: /* 8024BA44 00248984 38 21 00 10 */ addi r1, r1, 0x10 /* 8024BA48 00248988 4E 80 00 20 */ blr /* 8024BA4C 0024898C A0 04 00 04 */ lhz r0, 4(r4) -/* 8024BA50 00248990 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8024BA54 00248994 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8024BA50 00248990 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8024BA54 00248994 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8024BA58 00248998 80 A3 00 84 */ lwz r5, 0x84(r3) /* 8024BA5C 0024899C 1C 80 03 E8 */ mulli r4, r0, 0x3e8 /* 8024BA60 002489A0 38 C4 03 E7 */ addi r6, r4, 0x3e7 @@ -1958,8 +1958,8 @@ lbl_8024BA14: /* 8024BA88 002489C8 41 81 00 08 */ bgt lbl_8024BA90 /* 8024BA8C 002489CC 7C 05 30 50 */ subf r0, r5, r6 lbl_8024BA90: -/* 8024BA90 002489D0 3C 80 80 43 */ lis r4, lbl_80430188@ha -/* 8024BA94 002489D4 38 84 01 88 */ addi r4, r4, lbl_80430188@l +/* 8024BA90 002489D0 3C 80 80 43 */ lis r4, g_meter2_info@ha +/* 8024BA94 002489D4 38 84 01 88 */ addi r4, r4, g_meter2_info@l /* 8024BA98 002489D8 90 04 00 88 */ stw r0, 0x88(r4) /* 8024BA9C 002489DC 4E 80 00 20 */ blr /* 8024BAA0 002489E0 38 A0 00 01 */ li r5, 1 @@ -2121,8 +2121,8 @@ lbl_8024BCB4: lbl_8024BCF4: /* 8024BCF4 00248C34 2C 03 00 04 */ cmpwi r3, 4 /* 8024BCF8 00248C38 40 82 00 20 */ bne lbl_8024BD18 -/* 8024BCFC 00248C3C 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8024BD00 00248C40 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8024BCFC 00248C3C 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8024BD00 00248C40 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8024BD04 00248C44 88 03 00 DC */ lbz r0, 0xdc(r3) /* 8024BD08 00248C48 28 00 00 FF */ cmplwi r0, 0xff /* 8024BD0C 00248C4C 41 82 00 2C */ beq lbl_8024BD38 @@ -2228,8 +2228,8 @@ lbl_8024BD94: lbl_8024BE80: /* 8024BE80 00248DC0 2C 03 00 04 */ cmpwi r3, 4 /* 8024BE84 00248DC4 40 82 00 20 */ bne lbl_8024BEA4 -/* 8024BE88 00248DC8 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8024BE8C 00248DCC 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8024BE88 00248DC8 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8024BE8C 00248DCC 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8024BE90 00248DD0 88 03 00 DC */ lbz r0, 0xdc(r3) /* 8024BE94 00248DD4 28 00 00 FF */ cmplwi r0, 0xff /* 8024BE98 00248DD8 41 82 00 2C */ beq lbl_8024BEC4 @@ -3077,8 +3077,8 @@ lbl_8024CAE0: /* 8024CAE8 00249A28 48 00 00 54 */ b lbl_8024CB3C lbl_8024CAEC: /* 8024CAEC 00249A2C 38 00 00 01 */ li r0, 1 -/* 8024CAF0 00249A30 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8024CAF4 00249A34 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8024CAF0 00249A30 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8024CAF4 00249A34 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8024CAF8 00249A38 98 03 00 E3 */ stb r0, 0xe3(r3) /* 8024CAFC 00249A3C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8024CB00 00249A40 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l @@ -3088,8 +3088,8 @@ lbl_8024CAEC: /* 8024CB10 00249A50 48 00 00 5C */ b lbl_8024CB6C lbl_8024CB14: /* 8024CB14 00249A54 38 00 00 01 */ li r0, 1 -/* 8024CB18 00249A58 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8024CB1C 00249A5C 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8024CB18 00249A58 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8024CB1C 00249A5C 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8024CB20 00249A60 98 03 00 E4 */ stb r0, 0xe4(r3) /* 8024CB24 00249A64 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8024CB28 00249A68 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l @@ -3099,8 +3099,8 @@ lbl_8024CB14: /* 8024CB38 00249A78 48 00 00 34 */ b lbl_8024CB6C lbl_8024CB3C: /* 8024CB3C 00249A7C 38 00 00 01 */ li r0, 1 -/* 8024CB40 00249A80 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8024CB44 00249A84 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8024CB40 00249A80 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8024CB44 00249A84 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8024CB48 00249A88 98 03 00 E5 */ stb r0, 0xe5(r3) /* 8024CB4C 00249A8C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8024CB50 00249A90 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l @@ -3449,8 +3449,8 @@ lbl_8024CFF0: lbl_8024D060: /* 8024D060 00249FA0 28 03 00 04 */ cmplwi r3, 4 /* 8024D064 00249FA4 40 82 00 20 */ bne lbl_8024D084 -/* 8024D068 00249FA8 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8024D06C 00249FAC 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8024D068 00249FA8 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8024D06C 00249FAC 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8024D070 00249FB0 88 03 00 DC */ lbz r0, 0xdc(r3) /* 8024D074 00249FB4 28 00 00 FF */ cmplwi r0, 0xff /* 8024D078 00249FB8 41 82 00 2C */ beq lbl_8024D0A4 @@ -3809,8 +3809,8 @@ lbl_8024D5A8: /* 8024D5BC 0024A4FC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8024D5C0 0024A500 7C 08 02 A6 */ mflr r0 /* 8024D5C4 0024A504 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024D5C8 0024A508 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8024D5CC 0024A50C 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8024D5C8 0024A508 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8024D5CC 0024A50C 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8024D5D0 0024A510 38 80 00 00 */ li r4, 0 /* 8024D5D4 0024A514 4B FD 0A F1 */ bl resetMiniGameItem__13dMeter2Info_cFb /* 8024D5D8 0024A518 38 60 00 01 */ li r3, 1 @@ -4047,8 +4047,8 @@ lbl_8024D85C: /* 8024D944 0024A884 90 01 00 14 */ stw r0, 0x14(r1) /* 8024D948 0024A888 38 84 00 04 */ addi r4, r4, 4 /* 8024D94C 0024A88C 4B FF D7 E5 */ bl getParam__10dMsgFlow_cFPUc -/* 8024D950 0024A890 3C 80 80 43 */ lis r4, lbl_80430188@ha -/* 8024D954 0024A894 38 84 01 88 */ addi r4, r4, lbl_80430188@l +/* 8024D950 0024A890 3C 80 80 43 */ lis r4, g_meter2_info@ha +/* 8024D954 0024A894 38 84 01 88 */ addi r4, r4, g_meter2_info@l /* 8024D958 0024A898 98 64 00 E1 */ stb r3, 0xe1(r4) /* 8024D95C 0024A89C 38 60 00 01 */ li r3, 1 /* 8024D960 0024A8A0 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/asm/d/msg/d_msg_object.s b/asm/d/msg/d_msg_object.s index 273f087098..736a906d14 100644 --- a/asm/d/msg/d_msg_object.s +++ b/asm/d/msg/d_msg_object.s @@ -615,8 +615,8 @@ lbl_8023332C: /* 80233364 002302A4 98 7E 01 A4 */ stb r3, 0x1a4(r30) /* 80233368 002302A8 98 7E 01 A1 */ stb r3, 0x1a1(r30) /* 8023336C 002302AC 98 7E 01 A5 */ stb r3, 0x1a5(r30) -/* 80233370 002302B0 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80233374 002302B4 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 80233370 002302B0 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80233374 002302B4 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 80233378 002302B8 80 03 00 10 */ lwz r0, 0x10(r3) /* 8023337C 002302BC 90 1E 01 28 */ stw r0, 0x128(r30) /* 80233380 002302C0 38 60 00 00 */ li r3, 0 @@ -796,8 +796,8 @@ lbl_80233600: /* 80233600 00230540 38 00 00 00 */ li r0, 0 /* 80233604 00230544 98 1F 04 D2 */ stb r0, 0x4d2(r31) lbl_80233608: -/* 80233608 00230548 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8023360C 0023054C 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 80233608 00230548 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8023360C 0023054C 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 80233610 00230550 4B FE 8C 29 */ bl decMsgKeyWaitTimer__13dMeter2Info_cFv /* 80233614 00230554 80 7F 01 14 */ lwz r3, 0x114(r31) /* 80233618 00230558 48 07 40 1D */ bl update__Q28JMessage8TControlFv @@ -2848,8 +2848,8 @@ lbl_80235350: lbl_80235380: /* 80235380 002322C0 80 7F 01 18 */ lwz r3, 0x118(r31) /* 80235384 002322C4 4B FF 3D E5 */ bl selectMessage__19jmessage_tReferenceFv -/* 80235388 002322C8 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8023538C 002322CC 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 80235388 002322C8 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8023538C 002322CC 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 80235390 002322D0 88 03 00 BD */ lbz r0, 0xbd(r3) /* 80235394 002322D4 28 00 00 00 */ cmplwi r0, 0 /* 80235398 002322D8 41 82 00 1C */ beq lbl_802353B4 @@ -3228,8 +3228,8 @@ inputProc__12dMsgObject_cFv: /* 802358E4 00232824 48 12 C8 F1 */ bl _savegpr_27 /* 802358E8 00232828 7C 7C 1B 78 */ mr r28, r3 /* 802358EC 0023282C 38 00 00 01 */ li r0, 1 -/* 802358F0 00232830 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 802358F4 00232834 3B C3 01 88 */ addi r30, r3, lbl_80430188@l +/* 802358F0 00232830 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 802358F4 00232834 3B C3 01 88 */ addi r30, r3, g_meter2_info@l /* 802358F8 00232838 98 1E 00 BD */ stb r0, 0xbd(r30) /* 802358FC 0023283C 80 7C 01 18 */ lwz r3, 0x118(r28) /* 80235900 00232840 4B FF 3B A9 */ bl inputNumber__19jmessage_tReferenceFv @@ -3809,8 +3809,8 @@ lbl_80236118: /* 80236128 00233068 41 82 00 2C */ beq lbl_80236154 /* 8023612C 0023306C 28 00 00 05 */ cmplwi r0, 5 /* 80236130 00233070 40 82 00 34 */ bne lbl_80236164 -/* 80236134 00233074 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80236138 00233078 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 80236134 00233074 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80236138 00233078 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8023613C 0023307C 4B FE 60 A1 */ bl isFloatingMessageVisible__13dMeter2Info_cFv /* 80236140 00233080 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80236144 00233084 41 82 00 20 */ beq lbl_80236164 @@ -3818,8 +3818,8 @@ lbl_80236118: /* 8023614C 0023308C 28 00 00 00 */ cmplwi r0, 0 /* 80236150 00233090 40 82 00 14 */ bne lbl_80236164 lbl_80236154: -/* 80236154 00233094 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80236158 00233098 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 80236154 00233094 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80236158 00233098 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8023615C 0023309C 80 63 00 1C */ lwz r3, 0x1c(r3) /* 80236160 002330A0 4B FE 95 8D */ bl emphasisButtonDelete__9dMeter2_cFv lbl_80236164: @@ -3849,8 +3849,8 @@ lbl_802361B4: /* 802361B4 002330F4 80 1F 01 04 */ lwz r0, 0x104(r31) /* 802361B8 002330F8 28 00 00 00 */ cmplwi r0, 0 /* 802361BC 002330FC 40 82 05 30 */ bne lbl_802366EC -/* 802361C0 00233100 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 802361C4 00233104 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 802361C0 00233100 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 802361C4 00233104 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 802361C8 00233108 A0 03 00 A6 */ lhz r0, 0xa6(r3) /* 802361CC 0023310C 28 00 13 EB */ cmplwi r0, 0x13eb /* 802361D0 00233110 41 82 05 1C */ beq lbl_802366EC @@ -4696,8 +4696,8 @@ lbl_80236D60: /* 80236D78 00233CB8 38 00 00 01 */ li r0, 1 /* 80236D7C 00233CBC 98 1E 01 9D */ stb r0, 0x19d(r30) lbl_80236D80: -/* 80236D80 00233CC0 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80236D84 00233CC4 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 80236D80 00233CC0 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80236D84 00233CC4 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 80236D88 00233CC8 80 03 00 14 */ lwz r0, 0x14(r3) /* 80236D8C 00233CCC 90 1E 01 30 */ stw r0, 0x130(r30) /* 80236D90 00233CD0 48 00 00 0C */ b lbl_80236D9C @@ -5693,8 +5693,8 @@ setKillMessageFlagLocal__12dMsgObject_cFv: /* 80237A20 00234960 40 82 00 18 */ bne lbl_80237A38 /* 80237A24 00234964 38 00 00 00 */ li r0, 0 /* 80237A28 00234968 98 1F 04 CD */ stb r0, 0x4cd(r31) -/* 80237A2C 0023496C 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80237A30 00234970 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 80237A2C 0023496C 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80237A30 00234970 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 80237A34 00234974 4B FE 47 E5 */ bl resetFloatingMessage__13dMeter2Info_cFv lbl_80237A38: /* 80237A38 00234978 7F E3 FB 78 */ mr r3, r31 diff --git a/asm/d/msg/d_msg_unit.s b/asm/d/msg/d_msg_unit.s index 28483b410e..202f9e0b82 100644 --- a/asm/d/msg/d_msg_unit.s +++ b/asm/d/msg/d_msg_unit.s @@ -155,8 +155,8 @@ lbl_80238E8C: /* 80238EB0 00235DF0 4C C6 31 82 */ crclr 6 /* 80238EB4 00235DF4 48 12 D6 29 */ bl sprintf lbl_80238EB8: -/* 80238EB8 00235DF8 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80238EBC 00235DFC 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 80238EB8 00235DF8 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80238EBC 00235DFC 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 80238EC0 00235E00 80 63 00 18 */ lwz r3, 0x18(r3) /* 80238EC4 00235E04 38 C0 00 00 */ li r6, 0 /* 80238EC8 00235E08 38 E0 00 00 */ li r7, 0 diff --git a/asm/d/msg/scrn/d_msg_scrn_explain.s b/asm/d/msg/scrn/d_msg_scrn_explain.s index 7a6a52bab4..32694c0737 100644 --- a/asm/d/msg/scrn/d_msg_scrn_explain.s +++ b/asm/d/msg/scrn/d_msg_scrn_explain.s @@ -1254,28 +1254,28 @@ lbl_8023DE7C: /* 8023DECC 0023AE0C 88 03 00 66 */ lbz r0, 0x66(r3) /* 8023DED0 0023AE10 28 00 00 04 */ cmplwi r0, 4 /* 8023DED4 0023AE14 40 82 00 38 */ bne lbl_8023DF0C -/* 8023DED8 0023AE18 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8023DEDC 0023AE1C 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8023DED8 0023AE18 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8023DEDC 0023AE1C 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8023DEE0 0023AE20 38 80 04 B0 */ li r4, 0x4b0 /* 8023DEE4 0023AE24 38 A1 00 10 */ addi r5, r1, 0x10 /* 8023DEE8 0023AE28 38 C0 00 00 */ li r6, 0 /* 8023DEEC 0023AE2C 4B FD E3 65 */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c -/* 8023DEF0 0023AE30 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8023DEF4 0023AE34 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8023DEF0 0023AE30 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8023DEF4 0023AE34 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8023DEF8 0023AE38 38 80 04 B1 */ li r4, 0x4b1 /* 8023DEFC 0023AE3C 38 A1 00 08 */ addi r5, r1, 8 /* 8023DF00 0023AE40 38 C0 00 00 */ li r6, 0 /* 8023DF04 0023AE44 4B FD E3 4D */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c /* 8023DF08 0023AE48 48 00 00 34 */ b lbl_8023DF3C lbl_8023DF0C: -/* 8023DF0C 0023AE4C 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8023DF10 0023AE50 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8023DF0C 0023AE4C 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8023DF10 0023AE50 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8023DF14 0023AE54 38 80 05 1F */ li r4, 0x51f /* 8023DF18 0023AE58 38 A1 00 10 */ addi r5, r1, 0x10 /* 8023DF1C 0023AE5C 38 C0 00 00 */ li r6, 0 /* 8023DF20 0023AE60 4B FD E3 31 */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c -/* 8023DF24 0023AE64 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8023DF28 0023AE68 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8023DF24 0023AE64 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8023DF28 0023AE68 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8023DF2C 0023AE6C 38 80 05 20 */ li r4, 0x520 /* 8023DF30 0023AE70 38 A1 00 08 */ addi r5, r1, 8 /* 8023DF34 0023AE74 38 C0 00 00 */ li r6, 0 @@ -1289,8 +1289,8 @@ lbl_8023DF3C: /* 8023DF50 0023AE90 FF E0 08 90 */ fmr f31, f1 /* 8023DF54 0023AE94 4B DD 6A 9D */ bl mDoExt_getMesgFont__Fv /* 8023DF58 0023AE98 7C 64 1B 78 */ mr r4, r3 -/* 8023DF5C 0023AE9C 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8023DF60 0023AEA0 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8023DF5C 0023AE9C 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8023DF60 0023AEA0 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8023DF64 0023AEA4 FC 20 F8 90 */ fmr f1, f31 /* 8023DF68 0023AEA8 FC 40 F0 90 */ fmr f2, f30 /* 8023DF6C 0023AEAC 38 A1 00 10 */ addi r5, r1, 0x10 @@ -1304,8 +1304,8 @@ lbl_8023DF3C: /* 8023DF8C 0023AECC FF C0 08 90 */ fmr f30, f1 /* 8023DF90 0023AED0 4B DD 6A 61 */ bl mDoExt_getMesgFont__Fv /* 8023DF94 0023AED4 7C 64 1B 78 */ mr r4, r3 -/* 8023DF98 0023AED8 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8023DF9C 0023AEDC 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8023DF98 0023AED8 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8023DF9C 0023AEDC 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8023DFA0 0023AEE0 FC 20 F0 90 */ fmr f1, f30 /* 8023DFA4 0023AEE4 FC 40 F8 90 */ fmr f2, f31 /* 8023DFA8 0023AEE8 38 A1 00 08 */ addi r5, r1, 8 @@ -1419,8 +1419,8 @@ lbl_8023E120: /* 8023E148 0023B088 28 00 00 00 */ cmplwi r0, 0 /* 8023E14C 0023B08C 40 82 00 4C */ bne lbl_8023E198 /* 8023E150 0023B090 38 00 00 03 */ li r0, 3 -/* 8023E154 0023B094 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8023E158 0023B098 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8023E154 0023B094 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8023E158 0023B098 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8023E15C 0023B09C 98 03 00 C0 */ stb r0, 0xc0(r3) /* 8023E160 0023B0A0 38 00 00 48 */ li r0, 0x48 /* 8023E164 0023B0A4 90 01 00 24 */ stw r0, 0x24(r1) diff --git a/asm/d/msg/scrn/d_msg_scrn_howl.s b/asm/d/msg/scrn/d_msg_scrn_howl.s index 409a58c5d9..b5fc124cde 100644 --- a/asm/d/msg/scrn/d_msg_scrn_howl.s +++ b/asm/d/msg/scrn/d_msg_scrn_howl.s @@ -208,8 +208,8 @@ lbl_80240B90: /* 80240C74 0023DBB4 7F 23 CB 78 */ mr r3, r25 /* 80240C78 0023DBB8 48 0B F9 E1 */ bl getStringPtr__10J2DTextBoxCFv /* 80240C7C 0023DBBC 7C 65 1B 78 */ mr r5, r3 -/* 80240C80 0023DBC0 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80240C84 0023DBC4 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 80240C80 0023DBC0 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80240C84 0023DBC4 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 80240C88 0023DBC8 38 80 04 D4 */ li r4, 0x4d4 /* 80240C8C 0023DBCC 38 C0 00 00 */ li r6, 0 /* 80240C90 0023DBD0 4B FD B8 B5 */ bl getStringKanji__13dMeter2Info_cFUlPcP14JMSMesgEntry_c @@ -230,8 +230,8 @@ lbl_80240B90: /* 80240CCC 0023DC0C 7F A3 EB 78 */ mr r3, r29 /* 80240CD0 0023DC10 48 0B F9 89 */ bl getStringPtr__10J2DTextBoxCFv /* 80240CD4 0023DC14 7C 65 1B 78 */ mr r5, r3 -/* 80240CD8 0023DC18 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80240CDC 0023DC1C 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 80240CD8 0023DC18 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80240CDC 0023DC1C 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 80240CE0 0023DC20 38 80 04 D5 */ li r4, 0x4d5 /* 80240CE4 0023DC24 38 C0 00 00 */ li r6, 0 /* 80240CE8 0023DC28 4B FD B8 5D */ bl getStringKanji__13dMeter2Info_cFUlPcP14JMSMesgEntry_c @@ -2920,8 +2920,8 @@ lbl_802434D0: /* 802434E0 00240420 3B 60 00 00 */ li r27, 0 /* 802434E4 00240424 3C 60 80 43 */ lis r3, lbl_8043028C@ha /* 802434E8 00240428 3B A3 02 8C */ addi r29, r3, lbl_8043028C@l -/* 802434EC 0024042C 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 802434F0 00240430 3B 83 01 88 */ addi r28, r3, lbl_80430188@l +/* 802434EC 0024042C 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 802434F0 00240430 3B 83 01 88 */ addi r28, r3, g_meter2_info@l /* 802434F4 00240434 C3 42 B2 50 */ lfs f26, lbl_80454C50-_SDA2_BASE_(r2) lbl_802434F8: /* 802434F8 00240438 7C 9A DA 14 */ add r4, r26, r27 diff --git a/asm/d/msg/scrn/d_msg_scrn_item.s b/asm/d/msg/scrn/d_msg_scrn_item.s index eea0905117..904f3d7813 100644 --- a/asm/d/msg/scrn/d_msg_scrn_item.s +++ b/asm/d/msg/scrn/d_msg_scrn_item.s @@ -230,8 +230,8 @@ lbl_8023EA8C: /* 8023EA98 0023B9D8 90 01 00 08 */ stw r0, 8(r1) /* 8023EA9C 0023B9DC 90 01 00 0C */ stw r0, 0xc(r1) /* 8023EAA0 0023B9E0 93 C1 00 10 */ stw r30, 0x10(r1) -/* 8023EAA4 0023B9E4 3C A0 80 43 */ lis r5, lbl_80430188@ha -/* 8023EAA8 0023B9E8 38 65 01 88 */ addi r3, r5, lbl_80430188@l +/* 8023EAA4 0023B9E4 3C A0 80 43 */ lis r5, g_meter2_info@ha +/* 8023EAA8 0023B9E8 38 65 01 88 */ addi r3, r5, g_meter2_info@l /* 8023EAAC 0023B9EC 80 BF 00 D4 */ lwz r5, 0xd4(r31) /* 8023EAB0 0023B9F0 38 C0 00 00 */ li r6, 0 /* 8023EAB4 0023B9F4 80 FF 00 D8 */ lwz r7, 0xd8(r31) @@ -263,8 +263,8 @@ lbl_8023EB04: lbl_8023EB14: /* 8023EB14 0023BA54 7C 19 F0 00 */ cmpw r25, r30 /* 8023EB18 0023BA58 41 80 FF C0 */ blt lbl_8023EAD8 -/* 8023EB1C 0023BA5C 3C 80 80 43 */ lis r4, lbl_80430188@ha -/* 8023EB20 0023BA60 38 64 01 88 */ addi r3, r4, lbl_80430188@l +/* 8023EB1C 0023BA5C 3C 80 80 43 */ lis r4, g_meter2_info@ha +/* 8023EB20 0023BA60 38 64 01 88 */ addi r3, r4, g_meter2_info@l /* 8023EB24 0023BA64 80 1F 01 98 */ lwz r0, 0x198(r31) /* 8023EB28 0023BA68 54 04 06 3E */ clrlwi r4, r0, 0x18 /* 8023EB2C 0023BA6C 80 BF 00 C8 */ lwz r5, 0xc8(r31) diff --git a/asm/d/msg/scrn/d_msg_scrn_talk.s b/asm/d/msg/scrn/d_msg_scrn_talk.s index e423a3e6ec..6daa237c8e 100644 --- a/asm/d/msg/scrn/d_msg_scrn_talk.s +++ b/asm/d/msg/scrn/d_msg_scrn_talk.s @@ -1022,8 +1022,8 @@ lbl_80247E20: /* 80247EBC 00244DFC 3B A3 61 C0 */ addi r29, r3, g_dComIfG_gameInfo@l /* 80247EC0 00244E00 3C 60 80 43 */ lis r3, lbl_8043028C@ha /* 80247EC4 00244E04 3B C3 02 8C */ addi r30, r3, lbl_8043028C@l -/* 80247EC8 00244E08 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80247ECC 00244E0C 3B E3 01 88 */ addi r31, r3, lbl_80430188@l +/* 80247EC8 00244E08 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80247ECC 00244E0C 3B E3 01 88 */ addi r31, r3, g_meter2_info@l /* 80247ED0 00244E10 48 00 01 4C */ b lbl_8024801C lbl_80247ED4: /* 80247ED4 00244E14 80 7D 5D BC */ lwz r3, 0x5dbc(r29) diff --git a/asm/d/msg/string/d_msg_string_base.s b/asm/d/msg/string/d_msg_string_base.s index 815ea4de0b..ba3879d477 100644 --- a/asm/d/msg/string/d_msg_string_base.s +++ b/asm/d/msg/string/d_msg_string_base.s @@ -212,8 +212,8 @@ lbl_80249674: lbl_8024969C: /* 8024969C 002465DC 38 00 00 00 */ li r0, 0 /* 802496A0 002465E0 90 1E 00 18 */ stw r0, 0x18(r30) -/* 802496A4 002465E4 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 802496A8 002465E8 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 802496A4 002465E4 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 802496A8 002465E8 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 802496AC 002465EC 80 03 00 10 */ lwz r0, 0x10(r3) /* 802496B0 002465F0 28 00 00 00 */ cmplwi r0, 0 /* 802496B4 002465F4 40 82 00 20 */ bne lbl_802496D4 @@ -245,8 +245,8 @@ getResource__16dMsgStringBase_cFv: /* 80249708 00246648 90 01 00 14 */ stw r0, 0x14(r1) /* 8024970C 0024664C 93 E1 00 0C */ stw r31, 0xc(r1) /* 80249710 00246650 7C 7F 1B 78 */ mr r31, r3 -/* 80249714 00246654 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80249718 00246658 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 80249714 00246654 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80249718 00246658 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8024971C 0024665C 80 03 00 10 */ lwz r0, 0x10(r3) /* 80249720 00246660 90 1F 00 1C */ stw r0, 0x1c(r31) /* 80249724 00246664 80 1F 00 1C */ lwz r0, 0x1c(r31) @@ -283,8 +283,8 @@ getStringLocal__16dMsgStringBase_cFUlP10J2DTextBoxP10J2DTextBoxP7JUTFontP10COutF /* 80249790 002466D0 7C FB 3B 78 */ mr r27, r7 /* 80249794 002466D4 7D 1C 43 78 */ mr r28, r8 /* 80249798 002466D8 7D 3D 4B 78 */ mr r29, r9 -/* 8024979C 002466DC 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 802497A0 002466E0 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8024979C 002466DC 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 802497A0 002466E0 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 802497A4 002466E4 80 83 00 10 */ lwz r4, 0x10(r3) /* 802497A8 002466E8 28 04 00 00 */ cmplwi r4, 0 /* 802497AC 002466EC 41 82 00 64 */ beq lbl_80249810 @@ -383,8 +383,8 @@ getStringPageLocal__16dMsgStringBase_cFUlUcUcP10J2DTextBoxP10J2DTextBoxP7JUTFont /* 80249904 00246844 7D 3E 4B 78 */ mr r30, r9 /* 80249908 00246848 7D 5F 53 78 */ mr r31, r10 /* 8024990C 0024684C 8A E1 00 4B */ lbz r23, 0x4b(r1) -/* 80249910 00246850 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80249914 00246854 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 80249910 00246850 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80249914 00246854 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 80249918 00246858 80 83 00 10 */ lwz r4, 0x10(r3) /* 8024991C 0024685C 28 04 00 00 */ cmplwi r4, 0 /* 80249920 00246860 41 82 00 64 */ beq lbl_80249984 @@ -489,8 +489,8 @@ getMessageLocal__16dMsgStringBase_cFUlPc: /* 80249A84 002469C4 7C 7D 1B 78 */ mr r29, r3 /* 80249A88 002469C8 7C 9E 23 78 */ mr r30, r4 /* 80249A8C 002469CC 7C BF 2B 78 */ mr r31, r5 -/* 80249A90 002469D0 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80249A94 002469D4 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 80249A90 002469D0 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80249A94 002469D4 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 80249A98 002469D8 80 83 00 10 */ lwz r4, 0x10(r3) /* 80249A9C 002469DC 28 04 00 00 */ cmplwi r4, 0 /* 80249AA0 002469E0 41 82 00 64 */ beq lbl_80249B04 diff --git a/asm/d/s/d_s_name.s b/asm/d/s/d_s_name.s index a87bf05a5e..4379d77e10 100644 --- a/asm/d/s/d_s_name.s +++ b/asm/d/s/d_s_name.s @@ -409,8 +409,8 @@ lbl_80258D28: /* 80258D4C 00255C8C 80 7F 01 CC */ lwz r3, 0x1cc(r31) /* 80258D50 00255C90 48 07 56 F9 */ bl destroy__7JKRHeapFv /* 80258D54 00255C94 3B A0 00 00 */ li r29, 0 -/* 80258D58 00255C98 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80258D5C 00255C9C 3B C3 01 88 */ addi r30, r3, lbl_80430188@l +/* 80258D58 00255C98 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80258D5C 00255C9C 3B C3 01 88 */ addi r30, r3, g_meter2_info@l lbl_80258D60: /* 80258D60 00255CA0 7F C3 F3 78 */ mr r3, r30 /* 80258D64 00255CA4 38 1D 00 0B */ addi r0, r29, 0xb diff --git a/asm/d/shop/d_shop_system.s b/asm/d/shop/d_shop_system.s index 2ccf7401d9..c7ae8fdd2c 100644 --- a/asm/d/shop/d_shop_system.s +++ b/asm/d/shop/d_shop_system.s @@ -3365,8 +3365,8 @@ lbl_8019A0A8: /* 8019A0EC 0019702C 38 80 00 03 */ li r4, 3 /* 8019A0F0 00197030 48 00 02 55 */ bl setSeq__13dShopSystem_cFUc /* 8019A0F4 00197034 38 00 00 01 */ li r0, 1 -/* 8019A0F8 00197038 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8019A0FC 0019703C 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8019A0F8 00197038 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8019A0FC 0019703C 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8019A100 00197040 98 03 00 BD */ stb r0, 0xbd(r3) /* 8019A104 00197044 7F E3 FB 78 */ mr r3, r31 /* 8019A108 00197048 48 00 02 5D */ bl setSoldOut__13dShopSystem_cFv @@ -3379,8 +3379,8 @@ lbl_8019A114: /* 8019A120 00197060 38 80 00 01 */ li r4, 1 /* 8019A124 00197064 48 00 02 21 */ bl setSeq__13dShopSystem_cFUc /* 8019A128 00197068 38 00 00 01 */ li r0, 1 -/* 8019A12C 0019706C 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8019A130 00197070 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8019A12C 0019706C 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8019A130 00197070 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8019A134 00197074 98 03 00 BD */ stb r0, 0xbd(r3) /* 8019A138 00197078 38 60 00 01 */ li r3, 1 /* 8019A13C 0019707C 48 00 00 08 */ b lbl_8019A144 @@ -3422,8 +3422,8 @@ lbl_8019A1BC: /* 8019A1BC 001970FC 2C 1E 00 00 */ cmpwi r30, 0 /* 8019A1C0 00197100 41 82 00 40 */ beq lbl_8019A200 /* 8019A1C4 00197104 38 00 00 00 */ li r0, 0 -/* 8019A1C8 00197108 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8019A1CC 0019710C 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8019A1C8 00197108 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8019A1CC 0019710C 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8019A1D0 00197110 98 03 00 BD */ stb r0, 0xbd(r3) /* 8019A1D4 00197114 88 1F 0F 70 */ lbz r0, 0xf70(r31) /* 8019A1D8 00197118 28 00 00 00 */ cmplwi r0, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_800B271C.s b/include/d/d_a/d_a_alink/asm/func_800B271C.s index 705e196754..ca93c3c0f5 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B271C.s +++ b/include/d/d_a/d_a_alink/asm/func_800B271C.s @@ -99,8 +99,8 @@ lbl_800B287C: /* 800B2880 000AF7C0 48 06 64 19 */ bl checkDeadHP__9daAlink_cFv /* 800B2884 000AF7C4 2C 03 00 00 */ cmpwi r3, 0 /* 800B2888 000AF7C8 40 82 00 18 */ bne lbl_800B28A0 -/* 800B288C 000AF7CC 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 800B2890 000AF7D0 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 800B288C 000AF7CC 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 800B2890 000AF7D0 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 800B2894 000AF7D4 88 03 00 C1 */ lbz r0, 0xc1(r3) /* 800B2898 000AF7D8 28 00 00 01 */ cmplwi r0, 1 /* 800B289C 000AF7DC 40 82 00 20 */ bne lbl_800B28BC diff --git a/include/d/d_a/d_a_alink/asm/func_800B80C4.s b/include/d/d_a/d_a_alink/asm/func_800B80C4.s index 9c8d14096b..8f6288d751 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B80C4.s +++ b/include/d/d_a/d_a_alink/asm/func_800B80C4.s @@ -112,8 +112,8 @@ lbl_800B8228: /* 800B8260 000B51A0 38 00 00 00 */ li r0, 0 /* 800B8264 000B51A4 98 03 5E 4E */ stb r0, 0x5e4e(r3) lbl_800B8268: -/* 800B8268 000B51A8 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 800B826C 000B51AC 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 800B8268 000B51A8 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 800B826C 000B51AC 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 800B8270 000B51B0 A0 03 00 AE */ lhz r0, 0xae(r3) /* 800B8274 000B51B4 60 00 08 00 */ ori r0, r0, 0x800 /* 800B8278 000B51B8 B0 03 00 AE */ sth r0, 0xae(r3) diff --git a/include/d/d_a/d_a_alink/asm/func_800C8700.s b/include/d/d_a/d_a_alink/asm/func_800C8700.s index ea5d9ba4cf..743ae64ba2 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C8700.s +++ b/include/d/d_a/d_a_alink/asm/func_800C8700.s @@ -907,8 +907,8 @@ lbl_800C93FC: /* 800C9404 000C6344 48 01 91 7D */ bl setHeavyBoots__9daAlink_cFi /* 800C9408 000C6348 48 00 00 14 */ b lbl_800C941C lbl_800C940C: -/* 800C940C 000C634C 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 800C9410 000C6350 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 800C940C 000C634C 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 800C9410 000C6350 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 800C9414 000C6354 7F 64 DB 78 */ mr r4, r27 /* 800C9418 000C6358 48 15 35 1D */ bl onDirectUseItem__13dMeter2Info_cFi lbl_800C941C: diff --git a/include/d/d_a/d_a_alink/asm/func_800EAD84.s b/include/d/d_a/d_a_alink/asm/func_800EAD84.s index 5dd16a8b77..aca4e34fb5 100644 --- a/include/d/d_a/d_a_alink/asm/func_800EAD84.s +++ b/include/d/d_a/d_a_alink/asm/func_800EAD84.s @@ -132,8 +132,8 @@ lbl_800EAF5C: /* 800EAF5C 000E7E9C C0 01 00 08 */ lfs f0, 8(r1) /* 800EAF60 000E7EA0 D0 1E 00 0C */ stfs f0, 0xc(r30) lbl_800EAF64: -/* 800EAF64 000E7EA4 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 800EAF68 000E7EA8 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 800EAF64 000E7EA4 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 800EAF68 000E7EA8 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 800EAF6C 000E7EAC A0 03 00 AC */ lhz r0, 0xac(r3) /* 800EAF70 000E7EB0 60 00 00 01 */ ori r0, r0, 1 /* 800EAF74 000E7EB4 B0 03 00 AC */ sth r0, 0xac(r3) diff --git a/include/d/d_a/d_a_alink/asm/func_8010DF4C.s b/include/d/d_a/d_a_alink/asm/func_8010DF4C.s index 70cf124f01..4d864627c7 100644 --- a/include/d/d_a/d_a_alink/asm/func_8010DF4C.s +++ b/include/d/d_a/d_a_alink/asm/func_8010DF4C.s @@ -141,8 +141,8 @@ lbl_8010E130: /* 8010E158 0010B098 48 00 03 1C */ b lbl_8010E474 lbl_8010E15C: /* 8010E15C 0010B09C 3B 9E 1F D0 */ addi r28, r30, 0x1fd0 -/* 8010E160 0010B0A0 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8010E164 0010B0A4 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8010E160 0010B0A0 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8010E164 0010B0A4 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8010E168 0010B0A8 7F A4 EB 78 */ mr r4, r29 /* 8010E16C 0010B0AC 48 10 E7 C9 */ bl onDirectUseItem__13dMeter2Info_cFi /* 8010E170 0010B0B0 80 1F 0A 64 */ lwz r0, 0xa64(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_8011F0F4.s b/include/d/d_a/d_a_alink/asm/func_8011F0F4.s index 8ff95ab49d..ff04774e3d 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011F0F4.s +++ b/include/d/d_a/d_a_alink/asm/func_8011F0F4.s @@ -114,15 +114,15 @@ lbl_8011F21C: /* 8011F2A8 0011C1E8 A8 DF 04 E6 */ lha r6, 0x4e6(r31) /* 8011F2AC 0011C1EC 38 E0 FF FF */ li r7, -1 /* 8011F2B0 0011C1F0 4B F0 7E C1 */ bl dStage_changeScene__FifUlScsi -/* 8011F2B4 0011C1F4 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8011F2B8 0011C1F8 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8011F2B4 0011C1F4 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8011F2B8 0011C1F8 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8011F2BC 0011C1FC 48 0F D7 B5 */ bl warpOutProc__13dMeter2Info_cFv /* 8011F2C0 0011C200 48 00 00 18 */ b lbl_8011F2D8 lbl_8011F2C4: /* 8011F2C4 0011C204 7F E3 FB 78 */ mr r3, r31 /* 8011F2C8 0011C208 48 00 05 11 */ bl dungeonReturnWarp__9daAlink_cFv -/* 8011F2CC 0011C20C 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8011F2D0 0011C210 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8011F2CC 0011C20C 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8011F2D0 0011C210 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8011F2D4 0011C214 48 0F D7 31 */ bl warpInProc__13dMeter2Info_cFv lbl_8011F2D8: /* 8011F2D8 0011C218 38 00 00 01 */ li r0, 1 diff --git a/include/d/d_a/d_a_alink/asm/func_8011F8B8.s b/include/d/d_a/d_a_alink/asm/func_8011F8B8.s index ede1063391..07284cc3f9 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011F8B8.s +++ b/include/d/d_a/d_a_alink/asm/func_8011F8B8.s @@ -31,16 +31,16 @@ lbl_8011F8E8: /* 8011F92C 0011C86C 4B F0 78 45 */ bl dStage_changeScene__FifUlScsi /* 8011F930 0011C870 48 00 00 90 */ b lbl_8011F9C0 lbl_8011F934: -/* 8011F934 0011C874 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8011F938 0011C878 3B C3 01 88 */ addi r30, r3, lbl_80430188@l +/* 8011F934 0011C874 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8011F938 0011C878 3B C3 01 88 */ addi r30, r3, g_meter2_info@l /* 8011F93C 0011C87C 88 7E 00 4E */ lbz r3, 0x4e(r30) /* 8011F940 0011C880 38 80 00 00 */ li r4, 0 /* 8011F944 0011C884 38 A0 00 CA */ li r5, 0xca /* 8011F948 0011C888 38 C0 00 00 */ li r6, 0 /* 8011F94C 0011C88C 48 03 F0 C1 */ bl setParamData__9daPy_py_cFiiii /* 8011F950 0011C890 7C 67 1B 78 */ mr r7, r3 -/* 8011F954 0011C894 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8011F958 0011C898 38 A3 01 88 */ addi r5, r3, lbl_80430188@l +/* 8011F954 0011C894 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8011F958 0011C898 38 A3 01 88 */ addi r5, r3, g_meter2_info@l /* 8011F95C 0011C89C 38 85 00 40 */ addi r4, r5, 0x40 /* 8011F960 0011C8A0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8011F964 0011C8A4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l @@ -53,8 +53,8 @@ lbl_8011F934: /* 8011F980 0011C8C0 90 01 00 08 */ stw r0, 8(r1) /* 8011F984 0011C8C4 38 00 00 00 */ li r0, 0 /* 8011F988 0011C8C8 90 01 00 0C */ stw r0, 0xc(r1) -/* 8011F98C 0011C8CC 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8011F990 0011C8D0 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8011F98C 0011C8CC 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8011F990 0011C8D0 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8011F994 0011C8D4 38 63 00 38 */ addi r3, r3, 0x38 /* 8011F998 0011C8D8 38 80 FF FC */ li r4, -4 /* 8011F99C 0011C8DC 88 1E 00 4E */ lbz r0, 0x4e(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_8011F9EC.s b/include/d/d_a/d_a_alink/asm/func_8011F9EC.s index 46f708e08e..9c491d5697 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011F9EC.s +++ b/include/d/d_a/d_a_alink/asm/func_8011F9EC.s @@ -6,8 +6,8 @@ /* 8011FA00 0011C940 7C 7E 1B 78 */ mr r30, r3 /* 8011FA04 0011C944 3C 60 80 3B */ lis r3, lbl_803AF990@ha /* 8011FA08 0011C948 3B E3 F9 90 */ addi r31, r3, lbl_803AF990@l -/* 8011FA0C 0011C94C 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8011FA10 0011C950 3B A3 01 88 */ addi r29, r3, lbl_80430188@l +/* 8011FA0C 0011C94C 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8011FA10 0011C950 3B A3 01 88 */ addi r29, r3, g_meter2_info@l /* 8011FA14 0011C954 88 1D 00 C0 */ lbz r0, 0xc0(r29) /* 8011FA18 0011C958 28 00 00 00 */ cmplwi r0, 0 /* 8011FA1C 0011C95C 41 82 01 8C */ beq lbl_8011FBA8 @@ -116,8 +116,8 @@ lbl_8011FB94: /* 8011FB94 0011CAD4 7F C3 F3 78 */ mr r3, r30 /* 8011FB98 0011CAD8 4B FF FC 41 */ bl dungeonReturnWarp__9daAlink_cFv lbl_8011FB9C: -/* 8011FB9C 0011CADC 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8011FBA0 0011CAE0 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8011FB9C 0011CADC 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8011FBA0 0011CAE0 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8011FBA4 0011CAE4 48 0F CE 39 */ bl resetWarpStatus__13dMeter2Info_cFv lbl_8011FBA8: /* 8011FBA8 0011CAE8 39 61 00 20 */ addi r11, r1, 0x20 diff --git a/include/d/d_a/d_a_alink/asm/func_8014196C.s b/include/d/d_a/d_a_alink/asm/func_8014196C.s index 5b1299744c..1b67c4aa13 100644 --- a/include/d/d_a/d_a_alink/asm/func_8014196C.s +++ b/include/d/d_a/d_a_alink/asm/func_8014196C.s @@ -1,5 +1,5 @@ -/* 8014196C 0013E8AC 3C 80 80 43 */ lis r4, lbl_80430188@ha -/* 80141970 0013E8B0 38 A4 01 88 */ addi r5, r4, lbl_80430188@l +/* 8014196C 0013E8AC 3C 80 80 43 */ lis r4, g_meter2_info@ha +/* 80141970 0013E8B0 38 A4 01 88 */ addi r5, r4, g_meter2_info@l /* 80141974 0013E8B4 A0 85 00 AE */ lhz r4, 0xae(r5) /* 80141978 0013E8B8 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 8014197C 0013E8BC 7C 80 00 78 */ andc r0, r4, r0 diff --git a/include/d/d_a/d_a_alink/asm/func_801419B8.s b/include/d/d_a/d_a_alink/asm/func_801419B8.s index 7df826d0cb..91f2835a41 100644 --- a/include/d/d_a/d_a_alink/asm/func_801419B8.s +++ b/include/d/d_a/d_a_alink/asm/func_801419B8.s @@ -4,8 +4,8 @@ /* 801419C4 0013E904 7C 67 1B 78 */ mr r7, r3 /* 801419C8 0013E908 7C 80 23 78 */ mr r0, r4 /* 801419CC 0013E90C 7C A6 2B 78 */ mr r6, r5 -/* 801419D0 0013E910 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 801419D4 0013E914 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 801419D0 0013E910 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 801419D4 0013E914 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 801419D8 0013E918 7C E4 3B 78 */ mr r4, r7 /* 801419DC 0013E91C 7C 05 03 78 */ mr r5, r0 /* 801419E0 0013E920 48 0D A7 01 */ bl setFloatingMessage__13dMeter2Info_cFUssb diff --git a/include/d/d_com/d_com_inf_game/asm/func_8002B2C8.s b/include/d/d_com/d_com_inf_game/asm/func_8002B2C8.s index fd94b6ac4d..579c5d19e9 100644 --- a/include/d/d_com/d_com_inf_game/asm/func_8002B2C8.s +++ b/include/d/d_com/d_com_inf_game/asm/func_8002B2C8.s @@ -4,8 +4,8 @@ /* 8002B2D4 00028214 93 E1 00 0C */ stw r31, 0xc(r1) /* 8002B2D8 00028218 93 C1 00 08 */ stw r30, 8(r1) /* 8002B2DC 0002821C 7C 7E 1B 78 */ mr r30, r3 -/* 8002B2E0 00028220 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8002B2E4 00028224 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8002B2E0 00028220 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8002B2E4 00028224 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8002B2E8 00028228 48 1F 0B 81 */ bl init__13dMeter2Info_cFv /* 8002B2EC 0002822C 83 FE 4F 84 */ lwz r31, 0x4f84(r30) /* 8002B2F0 00028230 38 7E 4E 84 */ addi r3, r30, 0x4e84 diff --git a/include/d/d_com/d_com_inf_game/asm/func_8002D2FC.s b/include/d/d_com/d_com_inf_game/asm/func_8002D2FC.s index 14d1dfc9c8..4702a4efde 100644 --- a/include/d/d_com/d_com_inf_game/asm/func_8002D2FC.s +++ b/include/d/d_com/d_com_inf_game/asm/func_8002D2FC.s @@ -88,8 +88,8 @@ lbl_8002D430: /* 8002D444 0002A384 38 81 00 08 */ addi r4, r1, 8 /* 8002D448 0002A388 48 09 0A 01 */ bl setLastSceneMode__9daAlink_cFPUl lbl_8002D44C: -/* 8002D44C 0002A38C 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8002D450 0002A390 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8002D44C 0002A38C 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8002D450 0002A390 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8002D454 0002A394 3A A3 00 E9 */ addi r21, r3, 0xe9 /* 8002D458 0002A398 7E A3 AB 78 */ mr r3, r21 /* 8002D45C 0002A39C 3C 80 80 38 */ lis r4, lbl_80378F38@ha @@ -103,8 +103,8 @@ lbl_8002D44C: /* 8002D47C 0002A3BC 48 33 B5 19 */ bl strcmp /* 8002D480 0002A3C0 2C 03 00 00 */ cmpwi r3, 0 /* 8002D484 0002A3C4 41 82 00 1C */ beq lbl_8002D4A0 -/* 8002D488 0002A3C8 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8002D48C 0002A3CC 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8002D488 0002A3C8 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8002D48C 0002A3CC 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8002D490 0002A3D0 3C 80 80 38 */ lis r4, lbl_80378F38@ha /* 8002D494 0002A3D4 38 84 8F 38 */ addi r4, r4, lbl_80378F38@l /* 8002D498 0002A3D8 38 84 01 51 */ addi r4, r4, 0x151 diff --git a/include/d/d_file/d_file_sel_info/asm/func_80192570.s b/include/d/d_file/d_file_sel_info/asm/func_80192570.s index 79764931f2..e533c7737d 100644 --- a/include/d/d_file/d_file_sel_info/asm/func_80192570.s +++ b/include/d/d_file/d_file_sel_info/asm/func_80192570.s @@ -137,16 +137,16 @@ lbl_80192740: /* 80192780 0018F6C0 80 61 00 08 */ lwz r3, 8(r1) /* 80192784 0018F6C4 48 16 DE D5 */ bl getStringPtr__10J2DTextBoxCFv /* 80192788 0018F6C8 7C 65 1B 78 */ mr r5, r3 -/* 8019278C 0018F6CC 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80192790 0018F6D0 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8019278C 0018F6CC 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80192790 0018F6D0 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 80192794 0018F6D4 38 80 03 D0 */ li r4, 0x3d0 /* 80192798 0018F6D8 38 C0 00 00 */ li r6, 0 /* 8019279C 0018F6DC 48 08 9A B5 */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c /* 801927A0 0018F6E0 80 61 00 0C */ lwz r3, 0xc(r1) /* 801927A4 0018F6E4 48 16 DE B5 */ bl getStringPtr__10J2DTextBoxCFv /* 801927A8 0018F6E8 7C 65 1B 78 */ mr r5, r3 -/* 801927AC 0018F6EC 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 801927B0 0018F6F0 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 801927AC 0018F6EC 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 801927B0 0018F6F0 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 801927B4 0018F6F4 38 80 03 D1 */ li r4, 0x3d1 /* 801927B8 0018F6F8 38 C0 00 00 */ li r6, 0 /* 801927BC 0018F6FC 48 08 9A 95 */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c diff --git a/include/d/d_file/d_file_sel_info/asm/func_80192954.s b/include/d/d_file/d_file_sel_info/asm/func_80192954.s index 3f310a09d0..f8c85d7642 100644 --- a/include/d/d_file/d_file_sel_info/asm/func_80192954.s +++ b/include/d/d_file/d_file_sel_info/asm/func_80192954.s @@ -40,8 +40,8 @@ /* 801929F0 0018F930 38 84 48 B8 */ addi r4, r4, lbl_803948B8@l /* 801929F4 0018F934 38 84 00 20 */ addi r4, r4, 0x20 /* 801929F8 0018F938 48 1D 61 35 */ bl strcpy -/* 801929FC 0018F93C 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80192A00 0018F940 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 801929FC 0018F93C 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80192A00 0018F940 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 80192A04 0018F944 38 80 00 4D */ li r4, 0x4d /* 80192A08 0018F948 80 BF 00 38 */ lwz r5, 0x38(r31) /* 80192A0C 0018F94C 38 C0 00 00 */ li r6, 0 @@ -49,8 +49,8 @@ /* 80192A14 0018F954 38 60 00 02 */ li r3, 2 /* 80192A18 0018F958 48 00 00 70 */ b lbl_80192A88 lbl_80192A1C: -/* 80192A1C 0018F95C 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80192A20 0018F960 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 80192A1C 0018F95C 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80192A20 0018F960 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 80192A24 0018F964 38 80 00 4D */ li r4, 0x4d /* 80192A28 0018F968 80 BF 00 38 */ lwz r5, 0x38(r31) /* 80192A2C 0018F96C 38 C0 00 00 */ li r6, 0 @@ -71,8 +71,8 @@ lbl_80192A3C: /* 80192A64 0018F9A4 38 60 00 00 */ li r3, 0 /* 80192A68 0018F9A8 48 00 00 20 */ b lbl_80192A88 lbl_80192A6C: -/* 80192A6C 0018F9AC 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80192A70 0018F9B0 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 80192A6C 0018F9AC 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80192A70 0018F9B0 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 80192A74 0018F9B4 38 80 00 51 */ li r4, 0x51 /* 80192A78 0018F9B8 80 BF 00 38 */ lwz r5, 0x38(r31) /* 80192A7C 0018F9BC 38 C0 00 00 */ li r6, 0 diff --git a/include/d/d_kankyo/asm/func_801A6278.s b/include/d/d_kankyo/asm/func_801A6278.s index b2d62769ec..b43d88fe81 100644 --- a/include/d/d_kankyo/asm/func_801A6278.s +++ b/include/d/d_kankyo/asm/func_801A6278.s @@ -155,8 +155,8 @@ lbl_801A64BC: /* 801A64BC 001A33FC 38 A0 00 00 */ li r5, 0 /* 801A64C0 001A3400 38 C0 00 00 */ li r6, 0 /* 801A64C4 001A3404 38 E0 00 00 */ li r7, 0 -/* 801A64C8 001A3408 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 801A64CC 001A340C 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 801A64C8 001A3408 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 801A64CC 001A340C 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 801A64D0 001A3410 3C 80 80 43 */ lis r4, lbl_8042CA54@ha /* 801A64D4 001A3414 38 04 CA 54 */ addi r0, r4, lbl_8042CA54@l /* 801A64D8 001A3418 38 80 00 02 */ li r4, 2 diff --git a/include/d/d_meter/d_meter_button/asm/func_80202240.s b/include/d/d_meter/d_meter_button/asm/func_80202240.s index b92382e171..698012d439 100644 --- a/include/d/d_meter/d_meter_button/asm/func_80202240.s +++ b/include/d/d_meter/d_meter_button/asm/func_80202240.s @@ -31,8 +31,8 @@ /* 802022B8 001FF1F8 7E A4 AB 78 */ mr r4, r21 /* 802022BC 001FF1FC 48 0F 6C 19 */ bl draw__9J2DScreenFffPC14J2DGrafContext lbl_802022C0: -/* 802022C0 001FF200 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 802022C4 001FF204 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 802022C0 001FF200 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 802022C4 001FF204 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 802022C8 001FF208 88 03 00 F1 */ lbz r0, 0xf1(r3) /* 802022CC 001FF20C 28 00 00 00 */ cmplwi r0, 0 /* 802022D0 001FF210 41 82 00 18 */ beq lbl_802022E8 @@ -89,8 +89,8 @@ lbl_80202384: /* 80202394 001FF2D4 3B 23 61 C0 */ addi r25, r3, g_dComIfG_gameInfo@l /* 80202398 001FF2D8 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 8020239C 001FF2DC 3B E3 EB C8 */ addi r31, r3, lbl_8042EBC8@l -/* 802023A0 001FF2E0 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 802023A4 001FF2E4 3B A3 01 88 */ addi r29, r3, lbl_80430188@l +/* 802023A0 001FF2E0 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 802023A4 001FF2E4 3B A3 01 88 */ addi r29, r3, g_meter2_info@l /* 802023A8 001FF2E8 C3 A2 AD 48 */ lfs f29, lbl_80454748-_SDA2_BASE_(r2) lbl_802023AC: /* 802023AC 001FF2EC 3A C0 00 00 */ li r22, 0 diff --git a/include/d/d_meter/d_meter_button/asm/func_80202A9C.s b/include/d/d_meter/d_meter_button/asm/func_80202A9C.s index 0ad5cbe25f..91d17b2588 100644 --- a/include/d/d_meter/d_meter_button/asm/func_80202A9C.s +++ b/include/d/d_meter/d_meter_button/asm/func_80202A9C.s @@ -4,8 +4,8 @@ /* 80202AA8 001FF9E8 39 61 00 20 */ addi r11, r1, 0x20 /* 80202AAC 001FF9EC 48 15 F7 29 */ bl _savegpr_27 /* 80202AB0 001FF9F0 7C 7F 1B 78 */ mr r31, r3 -/* 80202AB4 001FF9F4 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80202AB8 001FF9F8 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 80202AB4 001FF9F4 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80202AB8 001FF9F8 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 80202ABC 001FF9FC 48 01 97 5D */ bl resetFloatingMessage__13dMeter2Info_cFv /* 80202AC0 001FFA00 48 03 57 99 */ bl getScrnDrawPtr__12dMsgObject_cFv /* 80202AC4 001FFA04 30 03 FF FF */ addic r0, r3, -1 diff --git a/include/d/d_meter/d_meter_button/asm/func_802047E8.s b/include/d/d_meter/d_meter_button/asm/func_802047E8.s index 460886a915..a1a7d14bb4 100644 --- a/include/d/d_meter/d_meter_button/asm/func_802047E8.s +++ b/include/d/d_meter/d_meter_button/asm/func_802047E8.s @@ -498,8 +498,8 @@ lbl_80204F20: /* 80204F5C 00201E9C 38 A0 00 00 */ li r5, 0 /* 80204F60 00201EA0 4B E2 E0 D1 */ bl getItem__17dSv_player_item_cCFib /* 80204F64 00201EA4 7C 79 1B 78 */ mr r25, r3 -/* 80204F68 00201EA8 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80204F6C 00201EAC 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 80204F68 00201EA8 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80204F6C 00201EAC 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 80204F70 00201EB0 80 63 00 1C */ lwz r3, 0x1c(r3) /* 80204F74 00201EB4 80 63 01 0C */ lwz r3, 0x10c(r3) /* 80204F78 00201EB8 48 01 6C 3D */ bl getCanoeFishing__13dMeter2Draw_cFv @@ -519,8 +519,8 @@ lbl_80204F98: /* 80204FA8 00201EE8 90 01 00 0C */ stw r0, 0xc(r1) /* 80204FAC 00201EEC 38 00 FF FF */ li r0, -1 /* 80204FB0 00201EF0 90 01 00 10 */ stw r0, 0x10(r1) -/* 80204FB4 00201EF4 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80204FB8 00201EF8 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 80204FB4 00201EF4 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80204FB8 00201EF8 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 80204FBC 00201EFC 7F 24 CB 78 */ mr r4, r25 /* 80204FC0 00201F00 80 BF 01 10 */ lwz r5, 0x110(r31) /* 80204FC4 00201F04 38 E0 00 00 */ li r7, 0 diff --git a/include/d/d_meter/d_meter_button/asm/func_80205CA0.s b/include/d/d_meter/d_meter_button/asm/func_80205CA0.s index b584e7acbd..a6d72dbab9 100644 --- a/include/d/d_meter/d_meter_button/asm/func_80205CA0.s +++ b/include/d/d_meter/d_meter_button/asm/func_80205CA0.s @@ -34,8 +34,8 @@ lbl_80205D0C: /* 80205D20 00202C60 C3 C2 AD 48 */ lfs f30, lbl_80454748-_SDA2_BASE_(r2) /* 80205D24 00202C64 3B C0 00 01 */ li r30, 1 lbl_80205D28: -/* 80205D28 00202C68 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80205D2C 00202C6C 3B 83 01 88 */ addi r28, r3, lbl_80430188@l +/* 80205D28 00202C68 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80205D2C 00202C6C 3B 83 01 88 */ addi r28, r3, g_meter2_info@l /* 80205D30 00202C70 80 7C 00 1C */ lwz r3, 0x1c(r28) /* 80205D34 00202C74 88 63 01 E5 */ lbz r3, 0x1e5(r3) /* 80205D38 00202C78 88 1D 04 D6 */ lbz r0, 0x4d6(r29) diff --git a/include/d/d_meter/d_meter_button/asm/func_80206978.s b/include/d/d_meter/d_meter_button/asm/func_80206978.s index c3676fcb1e..b13c77a604 100644 --- a/include/d/d_meter/d_meter_button/asm/func_80206978.s +++ b/include/d/d_meter/d_meter_button/asm/func_80206978.s @@ -7,8 +7,8 @@ /* 80206990 002038D0 48 15 B8 45 */ bl _savegpr_27 /* 80206994 002038D4 7C 7E 1B 78 */ mr r30, r3 /* 80206998 002038D8 7C 9F 23 78 */ mr r31, r4 -/* 8020699C 002038DC 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 802069A0 002038E0 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8020699C 002038DC 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 802069A0 002038E0 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 802069A4 002038E4 88 03 00 F1 */ lbz r0, 0xf1(r3) /* 802069A8 002038E8 28 00 00 00 */ cmplwi r0, 0 /* 802069AC 002038EC 41 82 00 20 */ beq lbl_802069CC @@ -49,8 +49,8 @@ lbl_802069E4: /* 80206A30 00203970 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 80206A34 00203974 7D 89 03 A6 */ mtctr r12 /* 80206A38 00203978 4E 80 04 21 */ bctrl -/* 80206A3C 0020397C 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80206A40 00203980 3B A3 01 88 */ addi r29, r3, lbl_80430188@l +/* 80206A3C 0020397C 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80206A40 00203980 3B A3 01 88 */ addi r29, r3, g_meter2_info@l /* 80206A44 00203984 A8 1D 00 A8 */ lha r0, 0xa8(r29) /* 80206A48 00203988 2C 00 00 00 */ cmpwi r0, 0 /* 80206A4C 0020398C 40 81 01 FC */ ble lbl_80206C48 @@ -109,8 +109,8 @@ lbl_80206B0C: /* 80206B14 00203A54 3B BD 00 04 */ addi r29, r29, 4 /* 80206B18 00203A58 41 80 FF D4 */ blt lbl_80206AEC lbl_80206B1C: -/* 80206B1C 00203A5C 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80206B20 00203A60 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 80206B1C 00203A5C 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80206B20 00203A60 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 80206B24 00203A64 48 01 56 CD */ bl decFloatingMessageTimer__13dMeter2Info_cFv /* 80206B28 00203A68 C3 E2 AD 4C */ lfs f31, lbl_8045474C-_SDA2_BASE_(r2) /* 80206B2C 00203A6C 57 E0 04 63 */ rlwinm. r0, r31, 0, 0x11, 0x11 @@ -148,8 +148,8 @@ lbl_80206BA4: /* 80206BA4 00203AE4 A8 1E 04 B6 */ lha r0, 0x4b6(r30) /* 80206BA8 00203AE8 2C 00 00 00 */ cmpwi r0, 0 /* 80206BAC 00203AEC 40 82 00 50 */ bne lbl_80206BFC -/* 80206BB0 00203AF0 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80206BB4 00203AF4 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 80206BB0 00203AF0 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80206BB4 00203AF4 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 80206BB8 00203AF8 48 01 56 61 */ bl resetFloatingMessage__13dMeter2Info_cFv /* 80206BBC 00203AFC 48 00 00 40 */ b lbl_80206BFC lbl_80206BC0: diff --git a/include/d/d_meter/d_meter_button/asm/func_80207060.s b/include/d/d_meter/d_meter_button/asm/func_80207060.s index e2f8d0813b..6e59d4e3cb 100644 --- a/include/d/d_meter/d_meter_button/asm/func_80207060.s +++ b/include/d/d_meter/d_meter_button/asm/func_80207060.s @@ -24,8 +24,8 @@ lbl_802070B8: /* 802070B8 00203FF8 80 7F 00 1C */ lwz r3, 0x1c(r31) /* 802070BC 00203FFC FC 20 00 90 */ fmr f1, f0 /* 802070C0 00204000 48 04 E7 11 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 802070C4 00204004 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 802070C8 00204008 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 802070C4 00204004 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 802070C8 00204008 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 802070CC 0020400C 80 63 00 1C */ lwz r3, 0x1c(r3) /* 802070D0 00204010 80 63 01 0C */ lwz r3, 0x10c(r3) /* 802070D4 00204014 80 9F 00 1C */ lwz r4, 0x1c(r31) diff --git a/include/d/d_meter/d_meter_button/asm/func_802071DC.s b/include/d/d_meter/d_meter_button/asm/func_802071DC.s index e72b9f5634..624f439d78 100644 --- a/include/d/d_meter/d_meter_button/asm/func_802071DC.s +++ b/include/d/d_meter/d_meter_button/asm/func_802071DC.s @@ -24,8 +24,8 @@ lbl_80207234: /* 80207234 00204174 80 7F 00 24 */ lwz r3, 0x24(r31) /* 80207238 00204178 FC 20 00 90 */ fmr f1, f0 /* 8020723C 0020417C 48 04 E5 95 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 80207240 00204180 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80207244 00204184 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 80207240 00204180 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80207244 00204184 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 80207248 00204188 80 63 00 1C */ lwz r3, 0x1c(r3) /* 8020724C 0020418C 80 63 01 0C */ lwz r3, 0x10c(r3) /* 80207250 00204190 80 9F 00 24 */ lwz r4, 0x24(r31) diff --git a/include/d/d_meter/d_meter_button/asm/func_80207358.s b/include/d/d_meter/d_meter_button/asm/func_80207358.s index f0ebc3764b..78da121763 100644 --- a/include/d/d_meter/d_meter_button/asm/func_80207358.s +++ b/include/d/d_meter/d_meter_button/asm/func_80207358.s @@ -24,8 +24,8 @@ lbl_802073B0: /* 802073B0 002042F0 80 7F 00 20 */ lwz r3, 0x20(r31) /* 802073B4 002042F4 FC 20 00 90 */ fmr f1, f0 /* 802073B8 002042F8 48 04 E4 19 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 802073BC 002042FC 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 802073C0 00204300 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 802073BC 002042FC 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 802073C0 00204300 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 802073C4 00204304 80 63 00 1C */ lwz r3, 0x1c(r3) /* 802073C8 00204308 80 63 01 0C */ lwz r3, 0x10c(r3) /* 802073CC 0020430C 80 9F 00 20 */ lwz r4, 0x20(r31) diff --git a/include/d/d_meter/d_meter_button/asm/func_802074D4.s b/include/d/d_meter/d_meter_button/asm/func_802074D4.s index dca8704711..2da9beaa92 100644 --- a/include/d/d_meter/d_meter_button/asm/func_802074D4.s +++ b/include/d/d_meter/d_meter_button/asm/func_802074D4.s @@ -24,8 +24,8 @@ lbl_8020752C: /* 8020752C 0020446C 80 7F 00 28 */ lwz r3, 0x28(r31) /* 80207530 00204470 FC 20 00 90 */ fmr f1, f0 /* 80207534 00204474 48 04 E2 9D */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 80207538 00204478 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8020753C 0020447C 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 80207538 00204478 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8020753C 0020447C 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 80207540 00204480 80 63 00 1C */ lwz r3, 0x1c(r3) /* 80207544 00204484 80 63 01 0C */ lwz r3, 0x10c(r3) /* 80207548 00204488 80 9F 00 28 */ lwz r4, 0x28(r31) diff --git a/include/d/d_meter/d_meter_button/asm/func_80207654.s b/include/d/d_meter/d_meter_button/asm/func_80207654.s index 89361b39ff..bd7604d8e6 100644 --- a/include/d/d_meter/d_meter_button/asm/func_80207654.s +++ b/include/d/d_meter/d_meter_button/asm/func_80207654.s @@ -24,8 +24,8 @@ lbl_802076AC: /* 802076AC 002045EC 80 7F 00 2C */ lwz r3, 0x2c(r31) /* 802076B0 002045F0 FC 20 00 90 */ fmr f1, f0 /* 802076B4 002045F4 48 04 E1 1D */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 802076B8 002045F8 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 802076BC 002045FC 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 802076B8 002045F8 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 802076BC 002045FC 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 802076C0 00204600 80 63 00 1C */ lwz r3, 0x1c(r3) /* 802076C4 00204604 80 63 01 0C */ lwz r3, 0x10c(r3) /* 802076C8 00204608 80 9F 00 2C */ lwz r4, 0x2c(r31) diff --git a/include/d/d_meter/d_meter_button/asm/func_802077EC.s b/include/d/d_meter/d_meter_button/asm/func_802077EC.s index 7ca7ed2c94..65dfe706fc 100644 --- a/include/d/d_meter/d_meter_button/asm/func_802077EC.s +++ b/include/d/d_meter/d_meter_button/asm/func_802077EC.s @@ -27,8 +27,8 @@ lbl_80207850: /* 80207850 00204790 80 7F 00 30 */ lwz r3, 0x30(r31) /* 80207854 00204794 FC 20 00 90 */ fmr f1, f0 /* 80207858 00204798 48 04 DF 79 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 8020785C 0020479C 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80207860 002047A0 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8020785C 0020479C 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80207860 002047A0 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 80207864 002047A4 80 63 00 1C */ lwz r3, 0x1c(r3) /* 80207868 002047A8 80 63 01 0C */ lwz r3, 0x10c(r3) /* 8020786C 002047AC 80 9F 00 30 */ lwz r4, 0x30(r31) diff --git a/include/d/d_meter/d_meter_button/asm/func_80207AB8.s b/include/d/d_meter/d_meter_button/asm/func_80207AB8.s index a1fc66ceb7..5eac848a3f 100644 --- a/include/d/d_meter/d_meter_button/asm/func_80207AB8.s +++ b/include/d/d_meter/d_meter_button/asm/func_80207AB8.s @@ -24,8 +24,8 @@ lbl_80207B10: /* 80207B10 00204A50 80 7F 00 34 */ lwz r3, 0x34(r31) /* 80207B14 00204A54 FC 20 00 90 */ fmr f1, f0 /* 80207B18 00204A58 48 04 DC B9 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 80207B1C 00204A5C 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80207B20 00204A60 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 80207B1C 00204A5C 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80207B20 00204A60 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 80207B24 00204A64 80 63 00 1C */ lwz r3, 0x1c(r3) /* 80207B28 00204A68 80 63 01 0C */ lwz r3, 0x10c(r3) /* 80207B2C 00204A6C 80 9F 00 34 */ lwz r4, 0x34(r31) diff --git a/include/d/d_meter/d_meter_button/asm/func_80207C34.s b/include/d/d_meter/d_meter_button/asm/func_80207C34.s index 4716cbf362..661760e239 100644 --- a/include/d/d_meter/d_meter_button/asm/func_80207C34.s +++ b/include/d/d_meter/d_meter_button/asm/func_80207C34.s @@ -24,8 +24,8 @@ lbl_80207C8C: /* 80207C8C 00204BCC 80 7F 00 38 */ lwz r3, 0x38(r31) /* 80207C90 00204BD0 FC 20 00 90 */ fmr f1, f0 /* 80207C94 00204BD4 48 04 DB 3D */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 80207C98 00204BD8 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80207C9C 00204BDC 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 80207C98 00204BD8 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80207C9C 00204BDC 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 80207CA0 00204BE0 80 63 00 1C */ lwz r3, 0x1c(r3) /* 80207CA4 00204BE4 80 63 01 0C */ lwz r3, 0x10c(r3) /* 80207CA8 00204BE8 80 9F 00 38 */ lwz r4, 0x38(r31) diff --git a/include/d/d_meter/d_meter_button/asm/func_80207DB0.s b/include/d/d_meter/d_meter_button/asm/func_80207DB0.s index eeda417ccd..7872f1ab1c 100644 --- a/include/d/d_meter/d_meter_button/asm/func_80207DB0.s +++ b/include/d/d_meter/d_meter_button/asm/func_80207DB0.s @@ -24,8 +24,8 @@ lbl_80207E08: /* 80207E08 00204D48 80 7F 00 3C */ lwz r3, 0x3c(r31) /* 80207E0C 00204D4C FC 20 00 90 */ fmr f1, f0 /* 80207E10 00204D50 48 04 D9 C1 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 80207E14 00204D54 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80207E18 00204D58 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 80207E14 00204D54 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80207E18 00204D58 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 80207E1C 00204D5C 80 63 00 1C */ lwz r3, 0x1c(r3) /* 80207E20 00204D60 80 63 01 0C */ lwz r3, 0x10c(r3) /* 80207E24 00204D64 80 9F 00 3C */ lwz r4, 0x3c(r31) diff --git a/include/d/d_meter/d_meter_button/asm/func_80207F34.s b/include/d/d_meter/d_meter_button/asm/func_80207F34.s index 355334592a..130497ba6e 100644 --- a/include/d/d_meter/d_meter_button/asm/func_80207F34.s +++ b/include/d/d_meter/d_meter_button/asm/func_80207F34.s @@ -26,8 +26,8 @@ lbl_80207F94: /* 80207F94 00204ED4 80 7F 00 40 */ lwz r3, 0x40(r31) /* 80207F98 00204ED8 FC 20 00 90 */ fmr f1, f0 /* 80207F9C 00204EDC 48 04 D8 35 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 80207FA0 00204EE0 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80207FA4 00204EE4 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 80207FA0 00204EE0 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80207FA4 00204EE4 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 80207FA8 00204EE8 80 63 00 1C */ lwz r3, 0x1c(r3) /* 80207FAC 00204EEC 80 63 01 0C */ lwz r3, 0x10c(r3) /* 80207FB0 00204EF0 80 9F 00 40 */ lwz r4, 0x40(r31) diff --git a/include/d/d_meter/d_meter_button/asm/func_802080C0.s b/include/d/d_meter/d_meter_button/asm/func_802080C0.s index 69de36c92a..f0226f45bb 100644 --- a/include/d/d_meter/d_meter_button/asm/func_802080C0.s +++ b/include/d/d_meter/d_meter_button/asm/func_802080C0.s @@ -26,8 +26,8 @@ lbl_80208120: /* 80208120 00205060 80 7F 00 44 */ lwz r3, 0x44(r31) /* 80208124 00205064 FC 20 00 90 */ fmr f1, f0 /* 80208128 00205068 48 04 D6 A9 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 8020812C 0020506C 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80208130 00205070 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8020812C 0020506C 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80208130 00205070 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 80208134 00205074 80 63 00 1C */ lwz r3, 0x1c(r3) /* 80208138 00205078 80 63 01 0C */ lwz r3, 0x10c(r3) /* 8020813C 0020507C 80 9F 00 44 */ lwz r4, 0x44(r31) diff --git a/include/d/d_meter/d_meter_button/asm/func_8020824C.s b/include/d/d_meter/d_meter_button/asm/func_8020824C.s index 928f22b2db..7bcf46c198 100644 --- a/include/d/d_meter/d_meter_button/asm/func_8020824C.s +++ b/include/d/d_meter/d_meter_button/asm/func_8020824C.s @@ -26,8 +26,8 @@ lbl_802082AC: /* 802082AC 002051EC 80 7F 00 48 */ lwz r3, 0x48(r31) /* 802082B0 002051F0 FC 20 00 90 */ fmr f1, f0 /* 802082B4 002051F4 48 04 D5 1D */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 802082B8 002051F8 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 802082BC 002051FC 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 802082B8 002051F8 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 802082BC 002051FC 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 802082C0 00205200 80 63 00 1C */ lwz r3, 0x1c(r3) /* 802082C4 00205204 80 63 01 0C */ lwz r3, 0x10c(r3) /* 802082C8 00205208 80 9F 00 48 */ lwz r4, 0x48(r31) diff --git a/include/d/d_meter/d_meter_button/asm/func_802083D8.s b/include/d/d_meter/d_meter_button/asm/func_802083D8.s index 6d0801a64f..49230258f0 100644 --- a/include/d/d_meter/d_meter_button/asm/func_802083D8.s +++ b/include/d/d_meter/d_meter_button/asm/func_802083D8.s @@ -30,8 +30,8 @@ lbl_80208444: /* 80208444 00205384 80 7F 00 4C */ lwz r3, 0x4c(r31) /* 80208448 00205388 FC 20 00 90 */ fmr f1, f0 /* 8020844C 0020538C 48 04 D3 85 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 80208450 00205390 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80208454 00205394 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 80208450 00205390 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80208454 00205394 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 80208458 00205398 80 63 00 1C */ lwz r3, 0x1c(r3) /* 8020845C 0020539C 80 63 01 0C */ lwz r3, 0x10c(r3) /* 80208460 002053A0 80 9F 00 4C */ lwz r4, 0x4c(r31) diff --git a/include/d/d_meter/d_meter_button/asm/func_80208570.s b/include/d/d_meter/d_meter_button/asm/func_80208570.s index 646962afc8..d65b47a233 100644 --- a/include/d/d_meter/d_meter_button/asm/func_80208570.s +++ b/include/d/d_meter/d_meter_button/asm/func_80208570.s @@ -30,8 +30,8 @@ lbl_802085DC: /* 802085DC 0020551C 80 7F 00 50 */ lwz r3, 0x50(r31) /* 802085E0 00205520 FC 20 00 90 */ fmr f1, f0 /* 802085E4 00205524 48 04 D1 ED */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 802085E8 00205528 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 802085EC 0020552C 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 802085E8 00205528 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 802085EC 0020552C 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 802085F0 00205530 80 63 00 1C */ lwz r3, 0x1c(r3) /* 802085F4 00205534 80 63 01 0C */ lwz r3, 0x10c(r3) /* 802085F8 00205538 80 9F 00 50 */ lwz r4, 0x50(r31) diff --git a/include/d/d_meter/d_meter_button/asm/func_80208708.s b/include/d/d_meter/d_meter_button/asm/func_80208708.s index bd11ec5ad5..4791a1ff24 100644 --- a/include/d/d_meter/d_meter_button/asm/func_80208708.s +++ b/include/d/d_meter/d_meter_button/asm/func_80208708.s @@ -30,8 +30,8 @@ lbl_80208774: /* 80208774 002056B4 80 7F 00 54 */ lwz r3, 0x54(r31) /* 80208778 002056B8 FC 20 00 90 */ fmr f1, f0 /* 8020877C 002056BC 48 04 D0 55 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 80208780 002056C0 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80208784 002056C4 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 80208780 002056C0 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80208784 002056C4 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 80208788 002056C8 80 63 00 1C */ lwz r3, 0x1c(r3) /* 8020878C 002056CC 80 63 01 0C */ lwz r3, 0x10c(r3) /* 80208790 002056D0 80 9F 00 54 */ lwz r4, 0x54(r31) diff --git a/include/d/d_meter/d_meter_button/asm/func_802088A0.s b/include/d/d_meter/d_meter_button/asm/func_802088A0.s index fd1d9cd5e1..574b2d3caa 100644 --- a/include/d/d_meter/d_meter_button/asm/func_802088A0.s +++ b/include/d/d_meter/d_meter_button/asm/func_802088A0.s @@ -30,8 +30,8 @@ lbl_8020890C: /* 8020890C 0020584C 80 7F 00 58 */ lwz r3, 0x58(r31) /* 80208910 00205850 FC 20 00 90 */ fmr f1, f0 /* 80208914 00205854 48 04 CE BD */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 80208918 00205858 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8020891C 0020585C 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 80208918 00205858 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8020891C 0020585C 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 80208920 00205860 80 63 00 1C */ lwz r3, 0x1c(r3) /* 80208924 00205864 80 63 01 0C */ lwz r3, 0x10c(r3) /* 80208928 00205868 80 9F 00 58 */ lwz r4, 0x58(r31) diff --git a/include/d/d_meter/d_meter_button/asm/func_80208E1C.s b/include/d/d_meter/d_meter_button/asm/func_80208E1C.s index c8009994d4..ef951fe301 100644 --- a/include/d/d_meter/d_meter_button/asm/func_80208E1C.s +++ b/include/d/d_meter/d_meter_button/asm/func_80208E1C.s @@ -30,8 +30,8 @@ lbl_80208E88: /* 80208E88 00205DC8 80 7F 00 68 */ lwz r3, 0x68(r31) /* 80208E8C 00205DCC FC 20 00 90 */ fmr f1, f0 /* 80208E90 00205DD0 48 04 C9 41 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 80208E94 00205DD4 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80208E98 00205DD8 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 80208E94 00205DD4 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80208E98 00205DD8 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 80208E9C 00205DDC 80 63 00 1C */ lwz r3, 0x1c(r3) /* 80208EA0 00205DE0 80 63 01 0C */ lwz r3, 0x10c(r3) /* 80208EA4 00205DE4 80 9F 00 68 */ lwz r4, 0x68(r31) diff --git a/include/d/d_meter/d_meter_button/asm/func_80208FB4.s b/include/d/d_meter/d_meter_button/asm/func_80208FB4.s index ff3bd4083a..0b623c3855 100644 --- a/include/d/d_meter/d_meter_button/asm/func_80208FB4.s +++ b/include/d/d_meter/d_meter_button/asm/func_80208FB4.s @@ -30,8 +30,8 @@ lbl_80209020: /* 80209020 00205F60 80 7F 00 6C */ lwz r3, 0x6c(r31) /* 80209024 00205F64 FC 20 00 90 */ fmr f1, f0 /* 80209028 00205F68 48 04 C7 A9 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 8020902C 00205F6C 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80209030 00205F70 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8020902C 00205F6C 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80209030 00205F70 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 80209034 00205F74 80 63 00 1C */ lwz r3, 0x1c(r3) /* 80209038 00205F78 80 63 01 0C */ lwz r3, 0x10c(r3) /* 8020903C 00205F7C 80 9F 00 6C */ lwz r4, 0x6c(r31) diff --git a/include/d/d_meter/d_meter_button/asm/func_8020914C.s b/include/d/d_meter/d_meter_button/asm/func_8020914C.s index 45a2539b8b..b887babb20 100644 --- a/include/d/d_meter/d_meter_button/asm/func_8020914C.s +++ b/include/d/d_meter/d_meter_button/asm/func_8020914C.s @@ -30,8 +30,8 @@ lbl_802091B8: /* 802091B8 002060F8 80 7F 00 70 */ lwz r3, 0x70(r31) /* 802091BC 002060FC FC 20 00 90 */ fmr f1, f0 /* 802091C0 00206100 48 04 C6 11 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 802091C4 00206104 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 802091C8 00206108 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 802091C4 00206104 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 802091C8 00206108 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 802091CC 0020610C 80 63 00 1C */ lwz r3, 0x1c(r3) /* 802091D0 00206110 80 63 01 0C */ lwz r3, 0x10c(r3) /* 802091D4 00206114 80 9F 00 70 */ lwz r4, 0x70(r31) diff --git a/include/d/d_meter/d_meter_button/asm/func_802092C0.s b/include/d/d_meter/d_meter_button/asm/func_802092C0.s index 2093ef5839..ac93808dd8 100644 --- a/include/d/d_meter/d_meter_button/asm/func_802092C0.s +++ b/include/d/d_meter/d_meter_button/asm/func_802092C0.s @@ -28,8 +28,8 @@ lbl_80209328: /* 80209328 00206268 80 7F 00 78 */ lwz r3, 0x78(r31) /* 8020932C 0020626C C0 22 AD 4C */ lfs f1, lbl_8045474C-_SDA2_BASE_(r2) /* 80209330 00206270 48 04 C4 A1 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 80209334 00206274 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80209338 00206278 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 80209334 00206274 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80209338 00206278 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8020933C 0020627C 80 63 00 1C */ lwz r3, 0x1c(r3) /* 80209340 00206280 80 63 01 0C */ lwz r3, 0x10c(r3) /* 80209344 00206284 80 9F 00 78 */ lwz r4, 0x78(r31) diff --git a/include/d/d_meter/d_meter_button/asm/func_802093D8.s b/include/d/d_meter/d_meter_button/asm/func_802093D8.s index 76c8256025..7653670fce 100644 --- a/include/d/d_meter/d_meter_button/asm/func_802093D8.s +++ b/include/d/d_meter/d_meter_button/asm/func_802093D8.s @@ -26,8 +26,8 @@ lbl_80209438: /* 80209438 00206378 80 7F 00 F4 */ lwz r3, 0xf4(r31) /* 8020943C 0020637C C0 22 AD 4C */ lfs f1, lbl_8045474C-_SDA2_BASE_(r2) /* 80209440 00206380 48 04 C3 91 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 80209444 00206384 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80209448 00206388 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 80209444 00206384 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80209448 00206388 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8020944C 0020638C 80 63 00 1C */ lwz r3, 0x1c(r3) /* 80209450 00206390 80 63 01 0C */ lwz r3, 0x10c(r3) /* 80209454 00206394 80 9F 00 F4 */ lwz r4, 0xf4(r31) diff --git a/include/d/d_meter/d_meter_button/asm/func_80209D7C.s b/include/d/d_meter/d_meter_button/asm/func_80209D7C.s index 2f4a652bc2..3dc6a86177 100644 --- a/include/d/d_meter/d_meter_button/asm/func_80209D7C.s +++ b/include/d/d_meter/d_meter_button/asm/func_80209D7C.s @@ -12,8 +12,8 @@ /* 80209DA8 00206CE8 7C 7B 1B 78 */ mr r27, r3 /* 80209DAC 00206CEC 7C 9D 23 78 */ mr r29, r4 /* 80209DB0 00206CF0 7C DC 33 78 */ mr r28, r6 -/* 80209DB4 00206CF4 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80209DB8 00206CF8 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 80209DB4 00206CF4 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80209DB8 00206CF8 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 80209DBC 00206CFC 80 9B 00 84 */ lwz r4, 0x84(r27) /* 80209DC0 00206D00 48 01 28 E5 */ bl getStringLength__13dMeter2Info_cFP10J2DTextBoxPc /* 80209DC4 00206D04 57 9A 10 3A */ slwi r26, r28, 2 diff --git a/include/d/d_meter/d_meter_hakusha/asm/func_8020C400.s b/include/d/d_meter/d_meter_hakusha/asm/func_8020C400.s index 8964c3eac6..e33d5db9d7 100644 --- a/include/d/d_meter/d_meter_hakusha/asm/func_8020C400.s +++ b/include/d/d_meter/d_meter_hakusha/asm/func_8020C400.s @@ -122,8 +122,8 @@ lbl_8020C5A4: /* 8020C5C8 00209508 38 63 00 04 */ addi r3, r3, 4 /* 8020C5CC 0020950C 38 84 00 0C */ addi r4, r4, 0xc /* 8020C5D0 00209510 42 00 FF D4 */ bdnz lbl_8020C5A4 -/* 8020C5D4 00209514 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8020C5D8 00209518 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8020C5D4 00209514 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8020C5D8 00209518 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8020C5DC 0020951C A8 03 00 96 */ lha r0, 0x96(r3) /* 8020C5E0 00209520 B0 1F 01 08 */ sth r0, 0x108(r31) /* 8020C5E4 00209524 38 60 01 18 */ li r3, 0x118 diff --git a/include/d/d_meter/d_meter_hakusha/asm/func_8020C850.s b/include/d/d_meter/d_meter_hakusha/asm/func_8020C850.s index 39086f9f1b..a62aaf3640 100644 --- a/include/d/d_meter/d_meter_hakusha/asm/func_8020C850.s +++ b/include/d/d_meter/d_meter_hakusha/asm/func_8020C850.s @@ -32,8 +32,8 @@ /* 8020C8CC 0020980C 3B 00 00 00 */ li r24, 0 /* 8020C8D0 00209810 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 8020C8D4 00209814 3B C3 EB C8 */ addi r30, r3, lbl_8042EBC8@l -/* 8020C8D8 00209818 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8020C8DC 0020981C 3B E3 01 88 */ addi r31, r3, lbl_80430188@l +/* 8020C8D8 00209818 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8020C8DC 0020981C 3B E3 01 88 */ addi r31, r3, g_meter2_info@l /* 8020C8E0 00209820 48 00 01 B4 */ b lbl_8020CA94 lbl_8020C8E4: /* 8020C8E4 00209824 7F 9A C2 14 */ add r28, r26, r24 diff --git a/include/d/d_meter/d_meter_hakusha/asm/func_8020CD6C.s b/include/d/d_meter/d_meter_hakusha/asm/func_8020CD6C.s index 9aa58b2f84..ef8d7237b0 100644 --- a/include/d/d_meter/d_meter_hakusha/asm/func_8020CD6C.s +++ b/include/d/d_meter/d_meter_hakusha/asm/func_8020CD6C.s @@ -52,8 +52,8 @@ /* 8020CE38 00209D78 EC 01 00 28 */ fsubs f0, f1, f0 /* 8020CE3C 00209D7C EF 80 10 24 */ fdivs f28, f0, f2 /* 8020CE40 00209D80 A8 DC 01 08 */ lha r6, 0x108(r28) -/* 8020CE44 00209D84 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8020CE48 00209D88 3B C3 01 88 */ addi r30, r3, lbl_80430188@l +/* 8020CE44 00209D84 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8020CE48 00209D88 3B C3 01 88 */ addi r30, r3, g_meter2_info@l /* 8020CE4C 00209D8C A8 1E 00 96 */ lha r0, 0x96(r30) /* 8020CE50 00209D90 7C 06 00 00 */ cmpw r6, r0 /* 8020CE54 00209D94 41 82 00 8C */ beq lbl_8020CEE0 diff --git a/include/d/d_meter/d_meter_hakusha/asm/func_8020D258.s b/include/d/d_meter/d_meter_hakusha/asm/func_8020D258.s index e590c4e2cb..381030843c 100644 --- a/include/d/d_meter/d_meter_hakusha/asm/func_8020D258.s +++ b/include/d/d_meter/d_meter_hakusha/asm/func_8020D258.s @@ -13,8 +13,8 @@ /* 8020D288 0020A1C8 38 84 EB C8 */ addi r4, r4, lbl_8042EBC8@l /* 8020D28C 0020A1CC C0 24 03 A0 */ lfs f1, 0x3a0(r4) /* 8020D290 0020A1D0 48 04 85 41 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 8020D294 0020A1D4 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8020D298 0020A1D8 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8020D294 0020A1D4 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8020D298 0020A1D8 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8020D29C 0020A1DC 80 63 00 1C */ lwz r3, 0x1c(r3) /* 8020D2A0 0020A1E0 80 63 01 0C */ lwz r3, 0x10c(r3) /* 8020D2A4 0020A1E4 80 9F 00 2C */ lwz r4, 0x2c(r31) @@ -31,8 +31,8 @@ lbl_8020D2B0: /* 8020D2CC 0020A20C 38 84 EB C8 */ addi r4, r4, lbl_8042EBC8@l /* 8020D2D0 0020A210 C0 24 03 A8 */ lfs f1, 0x3a8(r4) /* 8020D2D4 0020A214 48 04 84 FD */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 8020D2D8 0020A218 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8020D2DC 0020A21C 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8020D2D8 0020A218 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8020D2DC 0020A21C 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8020D2E0 0020A220 80 63 00 1C */ lwz r3, 0x1c(r3) /* 8020D2E4 0020A224 80 63 01 0C */ lwz r3, 0x10c(r3) /* 8020D2E8 0020A228 80 9F 00 30 */ lwz r4, 0x30(r31) diff --git a/include/d/d_meter/d_meter_hakusha/asm/func_8020D308.s b/include/d/d_meter/d_meter_hakusha/asm/func_8020D308.s index 6d7482a4ae..cbb5c04b78 100644 --- a/include/d/d_meter/d_meter_hakusha/asm/func_8020D308.s +++ b/include/d/d_meter/d_meter_hakusha/asm/func_8020D308.s @@ -13,8 +13,8 @@ /* 8020D338 0020A278 80 7F 00 2C */ lwz r3, 0x2c(r31) /* 8020D33C 0020A27C FC 20 00 90 */ fmr f1, f0 /* 8020D340 0020A280 48 04 84 91 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 8020D344 0020A284 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8020D348 0020A288 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8020D344 0020A284 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8020D348 0020A288 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8020D34C 0020A28C 80 63 00 1C */ lwz r3, 0x1c(r3) /* 8020D350 0020A290 80 63 01 0C */ lwz r3, 0x10c(r3) /* 8020D354 0020A294 80 9F 00 2C */ lwz r4, 0x2c(r31) @@ -31,8 +31,8 @@ lbl_8020D360: /* 8020D37C 0020A2BC 80 7F 00 30 */ lwz r3, 0x30(r31) /* 8020D380 0020A2C0 FC 20 00 90 */ fmr f1, f0 /* 8020D384 0020A2C4 48 04 84 4D */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 8020D388 0020A2C8 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8020D38C 0020A2CC 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8020D388 0020A2C8 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8020D38C 0020A2CC 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8020D390 0020A2D0 80 63 00 1C */ lwz r3, 0x1c(r3) /* 8020D394 0020A2D4 80 63 01 0C */ lwz r3, 0x10c(r3) /* 8020D398 0020A2D8 80 9F 00 30 */ lwz r4, 0x30(r31) diff --git a/include/d/d_meter/d_meter_hakusha/asm/func_8020D3B8.s b/include/d/d_meter/d_meter_hakusha/asm/func_8020D3B8.s index 3f73d8365f..8eddd9474c 100644 --- a/include/d/d_meter/d_meter_hakusha/asm/func_8020D3B8.s +++ b/include/d/d_meter/d_meter_hakusha/asm/func_8020D3B8.s @@ -11,8 +11,8 @@ /* 8020D3E0 0020A320 80 7F 00 34 */ lwz r3, 0x34(r31) /* 8020D3E4 0020A324 C0 22 AE 08 */ lfs f1, lbl_80454808-_SDA2_BASE_(r2) /* 8020D3E8 0020A328 48 04 83 E9 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 8020D3EC 0020A32C 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8020D3F0 0020A330 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8020D3EC 0020A32C 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8020D3F0 0020A330 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8020D3F4 0020A334 80 63 00 1C */ lwz r3, 0x1c(r3) /* 8020D3F8 0020A338 80 63 01 0C */ lwz r3, 0x10c(r3) /* 8020D3FC 0020A33C 80 9F 00 34 */ lwz r4, 0x34(r31) diff --git a/include/d/d_meter/d_meter_hakusha/asm/func_8020D41C.s b/include/d/d_meter/d_meter_hakusha/asm/func_8020D41C.s index 42a23eff2b..ae90fd844b 100644 --- a/include/d/d_meter/d_meter_hakusha/asm/func_8020D41C.s +++ b/include/d/d_meter/d_meter_hakusha/asm/func_8020D41C.s @@ -11,8 +11,8 @@ /* 8020D444 0020A384 80 7F 00 34 */ lwz r3, 0x34(r31) /* 8020D448 0020A388 FC 20 00 90 */ fmr f1, f0 /* 8020D44C 0020A38C 48 04 83 85 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 8020D450 0020A390 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8020D454 0020A394 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8020D450 0020A390 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8020D454 0020A394 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8020D458 0020A398 80 63 00 1C */ lwz r3, 0x1c(r3) /* 8020D45C 0020A39C 80 63 01 0C */ lwz r3, 0x10c(r3) /* 8020D460 0020A3A0 80 9F 00 34 */ lwz r4, 0x34(r31) diff --git a/include/d/d_meter/d_meter_map/asm/func_8020D9EC.s b/include/d/d_meter/d_meter_map/asm/func_8020D9EC.s index acf3808ac5..2294442e6a 100644 --- a/include/d/d_meter/d_meter_map/asm/func_8020D9EC.s +++ b/include/d/d_meter/d_meter_map/asm/func_8020D9EC.s @@ -132,8 +132,8 @@ lbl_8020DBB0: /* 8020DBC8 0020AB08 4B FF FC 1D */ bl getDispPosInside_OffsetX__11dMeterMap_cFv /* 8020DBCC 0020AB0C B0 7F 00 28 */ sth r3, 0x28(r31) /* 8020DBD0 0020AB10 38 00 00 01 */ li r0, 1 -/* 8020DBD4 0020AB14 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8020DBD8 0020AB18 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8020DBD4 0020AB14 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8020DBD8 0020AB18 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8020DBDC 0020AB1C 98 03 00 BF */ stb r0, 0xbf(r3) /* 8020DBE0 0020AB20 48 00 00 28 */ b lbl_8020DC08 lbl_8020DBE4: @@ -143,8 +143,8 @@ lbl_8020DBE4: /* 8020DBF0 0020AB30 4B FF FB FD */ bl getDispPosOutSide_OffsetX__11dMeterMap_cFv /* 8020DBF4 0020AB34 B0 7F 00 28 */ sth r3, 0x28(r31) /* 8020DBF8 0020AB38 38 00 00 00 */ li r0, 0 -/* 8020DBFC 0020AB3C 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8020DC00 0020AB40 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8020DBFC 0020AB3C 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8020DC00 0020AB40 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8020DC04 0020AB44 98 03 00 BF */ stb r0, 0xbf(r3) lbl_8020DC08: /* 8020DC08 0020AB48 38 00 00 00 */ li r0, 0 diff --git a/include/d/d_meter/d_meter_map/asm/func_8020DCE4.s b/include/d/d_meter/d_meter_map/asm/func_8020DCE4.s index 1ebcac77f5..47c9e49d1b 100644 --- a/include/d/d_meter/d_meter_map/asm/func_8020DCE4.s +++ b/include/d/d_meter/d_meter_map/asm/func_8020DCE4.s @@ -38,8 +38,8 @@ lbl_8020DD6C: /* 8020DD74 0020ACB4 4B E2 6C 49 */ bl isEventBit__11dSv_event_cCFUs /* 8020DD78 0020ACB8 98 7E 00 2B */ stb r3, 0x2b(r30) /* 8020DD7C 0020ACBC 38 00 00 02 */ li r0, 2 -/* 8020DD80 0020ACC0 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8020DD84 0020ACC4 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8020DD80 0020ACC0 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8020DD84 0020ACC4 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8020DD88 0020ACC8 98 03 00 C1 */ stb r0, 0xc1(r3) lbl_8020DD8C: /* 8020DD8C 0020ACCC 8B AD 87 E4 */ lbz r29, lbl_80450D64-_SDA_BASE_(r13) @@ -55,8 +55,8 @@ lbl_8020DD8C: /* 8020DDB4 0020ACF4 41 82 00 48 */ beq lbl_8020DDFC /* 8020DDB8 0020ACF8 28 00 00 03 */ cmplwi r0, 3 /* 8020DDBC 0020ACFC 41 82 00 40 */ beq lbl_8020DDFC -/* 8020DDC0 0020AD00 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8020DDC4 0020AD04 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8020DDC0 0020AD00 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8020DDC4 0020AD04 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8020DDC8 0020AD08 88 03 00 C1 */ lbz r0, 0xc1(r3) /* 8020DDCC 0020AD0C 28 00 00 07 */ cmplwi r0, 7 /* 8020DDD0 0020AD10 41 82 00 2C */ beq lbl_8020DDFC diff --git a/include/d/d_meter/d_meter_map/asm/func_8020E070.s b/include/d/d_meter/d_meter_map/asm/func_8020E070.s index 36c6f66ea0..2aae54d84a 100644 --- a/include/d/d_meter/d_meter_map/asm/func_8020E070.s +++ b/include/d/d_meter/d_meter_map/asm/func_8020E070.s @@ -4,8 +4,8 @@ /* 8020E07C 0020AFBC 39 61 00 30 */ addi r11, r1, 0x30 /* 8020E080 0020AFC0 48 15 41 5D */ bl _savegpr_29 /* 8020E084 0020AFC4 7C 7D 1B 78 */ mr r29, r3 -/* 8020E088 0020AFC8 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8020E08C 0020AFCC 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8020E088 0020AFC8 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8020E08C 0020AFCC 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8020E090 0020AFD0 A0 03 00 B0 */ lhz r0, 0xb0(r3) /* 8020E094 0020AFD4 54 00 07 FF */ clrlwi. r0, r0, 0x1f /* 8020E098 0020AFD8 40 82 03 AC */ bne lbl_8020E444 @@ -38,8 +38,8 @@ lbl_8020E0D0: /* 8020E100 0020B040 48 09 D8 85 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc /* 8020E104 0020B044 48 00 03 40 */ b lbl_8020E444 lbl_8020E108: -/* 8020E108 0020B048 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8020E10C 0020B04C 3B C3 01 88 */ addi r30, r3, lbl_80430188@l +/* 8020E108 0020B048 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8020E10C 0020B04C 3B C3 01 88 */ addi r30, r3, g_meter2_info@l /* 8020E110 0020B050 88 1E 00 C1 */ lbz r0, 0xc1(r30) /* 8020E114 0020B054 28 00 00 01 */ cmplwi r0, 1 /* 8020E118 0020B058 41 82 00 2C */ beq lbl_8020E144 @@ -54,8 +54,8 @@ lbl_8020E108: /* 8020E13C 0020B07C 28 00 00 06 */ cmplwi r0, 6 /* 8020E140 0020B080 40 82 01 4C */ bne lbl_8020E28C lbl_8020E144: -/* 8020E144 0020B084 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8020E148 0020B088 3B E3 01 88 */ addi r31, r3, lbl_80430188@l +/* 8020E144 0020B084 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8020E148 0020B088 3B E3 01 88 */ addi r31, r3, g_meter2_info@l /* 8020E14C 0020B08C 88 1F 00 BF */ lbz r0, 0xbf(r31) /* 8020E150 0020B090 28 00 00 00 */ cmplwi r0, 0 /* 8020E154 0020B094 40 82 00 58 */ bne lbl_8020E1AC @@ -118,8 +118,8 @@ lbl_8020E1AC: /* 8020E234 0020B174 98 1F 00 BF */ stb r0, 0xbf(r31) lbl_8020E238: /* 8020E238 0020B178 38 00 04 00 */ li r0, 0x400 -/* 8020E23C 0020B17C 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8020E240 0020B180 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8020E23C 0020B17C 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8020E240 0020B180 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8020E244 0020B184 B0 03 00 AA */ sth r0, 0xaa(r3) /* 8020E248 0020B188 38 00 00 B8 */ li r0, 0xb8 /* 8020E24C 0020B18C 90 01 00 10 */ stw r0, 0x10(r1) @@ -147,8 +147,8 @@ lbl_8020E28C: /* 8020E29C 0020B1DC 48 00 04 71 */ bl isDmapScreen__11dMeterMap_cFv /* 8020E2A0 0020B1E0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8020E2A4 0020B1E4 41 82 00 FC */ beq lbl_8020E3A0 -/* 8020E2A8 0020B1E8 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8020E2AC 0020B1EC 3B C3 01 88 */ addi r30, r3, lbl_80430188@l +/* 8020E2A8 0020B1E8 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8020E2AC 0020B1EC 3B C3 01 88 */ addi r30, r3, g_meter2_info@l /* 8020E2B0 0020B1F0 88 1E 00 BF */ lbz r0, 0xbf(r30) /* 8020E2B4 0020B1F4 28 00 00 00 */ cmplwi r0, 0 /* 8020E2B8 0020B1F8 40 82 00 58 */ bne lbl_8020E310 @@ -183,8 +183,8 @@ lbl_8020E310: /* 8020E328 0020B268 38 00 00 06 */ li r0, 6 /* 8020E32C 0020B26C 98 1E 00 BF */ stb r0, 0xbf(r30) /* 8020E330 0020B270 38 00 04 00 */ li r0, 0x400 -/* 8020E334 0020B274 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8020E338 0020B278 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8020E334 0020B274 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8020E338 0020B278 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8020E33C 0020B27C B0 03 00 AA */ sth r0, 0xaa(r3) /* 8020E340 0020B280 38 00 00 B8 */ li r0, 0xb8 /* 8020E344 0020B284 90 01 00 08 */ stw r0, 8(r1) @@ -227,8 +227,8 @@ lbl_8020E3A0: /* 8020E3D0 0020B310 7F A3 EB 78 */ mr r3, r29 /* 8020E3D4 0020B314 4B FF F4 A1 */ bl setDispPosInsideFlg_SE_On__11dMeterMap_cFv /* 8020E3D8 0020B318 38 00 00 01 */ li r0, 1 -/* 8020E3DC 0020B31C 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8020E3E0 0020B320 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8020E3DC 0020B31C 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8020E3E0 0020B320 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8020E3E4 0020B324 98 03 00 BF */ stb r0, 0xbf(r3) lbl_8020E3E8: /* 8020E3E8 0020B328 7F C3 F3 78 */ mr r3, r30 @@ -248,8 +248,8 @@ lbl_8020E3F8: /* 8020E41C 0020B35C 7F A3 EB 78 */ mr r3, r29 /* 8020E420 0020B360 4B FF F4 55 */ bl setDispPosInsideFlg_SE_On__11dMeterMap_cFv /* 8020E424 0020B364 38 00 00 01 */ li r0, 1 -/* 8020E428 0020B368 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8020E42C 0020B36C 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8020E428 0020B368 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8020E42C 0020B36C 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8020E430 0020B370 98 03 00 BF */ stb r0, 0xbf(r3) lbl_8020E434: /* 8020E434 0020B374 7F C3 F3 78 */ mr r3, r30 diff --git a/include/d/d_meter/d_meter_map/asm/func_8020E4C8.s b/include/d/d_meter/d_meter_map/asm/func_8020E4C8.s index ec740eec98..ea414f5bc6 100644 --- a/include/d/d_meter/d_meter_map/asm/func_8020E4C8.s +++ b/include/d/d_meter/d_meter_map/asm/func_8020E4C8.s @@ -75,8 +75,8 @@ lbl_8020E558: /* 8020E5E0 0020B520 80 04 05 80 */ lwz r0, 0x580(r4) /* 8020E5E4 0020B524 54 00 04 E7 */ rlwinm. r0, r0, 0, 0x13, 0x13 /* 8020E5E8 0020B528 40 82 00 18 */ bne lbl_8020E600 -/* 8020E5EC 0020B52C 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8020E5F0 0020B530 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8020E5EC 0020B52C 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8020E5F0 0020B530 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8020E5F4 0020B534 A0 03 00 B0 */ lhz r0, 0xb0(r3) /* 8020E5F8 0020B538 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e /* 8020E5FC 0020B53C 41 82 00 0C */ beq lbl_8020E608 diff --git a/include/d/d_meter/d_meter_map/asm/func_8020E754.s b/include/d/d_meter/d_meter_map/asm/func_8020E754.s index e74cb428a4..0e1560a7d2 100644 --- a/include/d/d_meter/d_meter_map/asm/func_8020E754.s +++ b/include/d/d_meter/d_meter_map/asm/func_8020E754.s @@ -8,8 +8,8 @@ /* 8020E770 0020B6B0 4B FF F1 91 */ bl isMapOpenCheck__11dMeterMap_cFv /* 8020E774 0020B6B4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8020E778 0020B6B8 41 82 02 40 */ beq lbl_8020E9B8 -/* 8020E77C 0020B6BC 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8020E780 0020B6C0 3B E3 01 88 */ addi r31, r3, lbl_80430188@l +/* 8020E77C 0020B6BC 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8020E780 0020B6C0 3B E3 01 88 */ addi r31, r3, g_meter2_info@l /* 8020E784 0020B6C4 88 1F 00 C1 */ lbz r0, 0xc1(r31) /* 8020E788 0020B6C8 28 00 00 06 */ cmplwi r0, 6 /* 8020E78C 0020B6CC 40 82 00 78 */ bne lbl_8020E804 @@ -20,8 +20,8 @@ /* 8020E7A0 0020B6E0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8020E7A4 0020B6E4 41 82 00 54 */ beq lbl_8020E7F8 /* 8020E7A8 0020B6E8 38 00 00 03 */ li r0, 3 -/* 8020E7AC 0020B6EC 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8020E7B0 0020B6F0 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8020E7AC 0020B6EC 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8020E7B0 0020B6F0 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8020E7B4 0020B6F4 98 03 00 BF */ stb r0, 0xbf(r3) /* 8020E7B8 0020B6F8 38 00 04 00 */ li r0, 0x400 /* 8020E7BC 0020B6FC B0 03 00 AA */ sth r0, 0xaa(r3) @@ -59,8 +59,8 @@ lbl_8020E804: /* 8020E834 0020B774 7C 00 19 10 */ subfe r0, r0, r3 /* 8020E838 0020B778 54 00 06 3F */ clrlwi. r0, r0, 0x18 /* 8020E83C 0020B77C 40 82 00 A8 */ bne lbl_8020E8E4 -/* 8020E840 0020B780 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8020E844 0020B784 3B E3 01 88 */ addi r31, r3, lbl_80430188@l +/* 8020E840 0020B780 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8020E844 0020B784 3B E3 01 88 */ addi r31, r3, g_meter2_info@l /* 8020E848 0020B788 88 1F 00 BF */ lbz r0, 0xbf(r31) /* 8020E84C 0020B78C 28 00 00 00 */ cmplwi r0, 0 /* 8020E850 0020B790 41 82 00 0C */ beq lbl_8020E85C @@ -69,8 +69,8 @@ lbl_8020E804: lbl_8020E85C: /* 8020E85C 0020B79C 28 00 00 00 */ cmplwi r0, 0 /* 8020E860 0020B7A0 40 82 01 58 */ bne lbl_8020E9B8 -/* 8020E864 0020B7A4 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8020E868 0020B7A8 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8020E864 0020B7A4 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8020E868 0020B7A8 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8020E86C 0020B7AC A0 03 00 A2 */ lhz r0, 0xa2(r3) /* 8020E870 0020B7B0 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e /* 8020E874 0020B7B4 40 82 01 44 */ bne lbl_8020E9B8 @@ -84,8 +84,8 @@ lbl_8020E890: /* 8020E890 0020B7D0 38 00 00 02 */ li r0, 2 /* 8020E894 0020B7D4 98 1F 00 BF */ stb r0, 0xbf(r31) /* 8020E898 0020B7D8 38 00 02 00 */ li r0, 0x200 -/* 8020E89C 0020B7DC 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8020E8A0 0020B7E0 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8020E89C 0020B7DC 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8020E8A0 0020B7E0 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8020E8A4 0020B7E4 B0 03 00 AA */ sth r0, 0xaa(r3) /* 8020E8A8 0020B7E8 38 00 00 B8 */ li r0, 0xb8 /* 8020E8AC 0020B7EC 90 01 00 0C */ stw r0, 0xc(r1) @@ -118,16 +118,16 @@ lbl_8020E8E4: /* 8020E914 0020B854 7C 00 19 10 */ subfe r0, r0, r3 /* 8020E918 0020B858 54 00 06 3F */ clrlwi. r0, r0, 0x18 /* 8020E91C 0020B85C 40 82 00 9C */ bne lbl_8020E9B8 -/* 8020E920 0020B860 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8020E924 0020B864 3B E3 01 88 */ addi r31, r3, lbl_80430188@l +/* 8020E920 0020B860 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8020E924 0020B864 3B E3 01 88 */ addi r31, r3, g_meter2_info@l /* 8020E928 0020B868 88 1F 00 BF */ lbz r0, 0xbf(r31) /* 8020E92C 0020B86C 28 00 00 00 */ cmplwi r0, 0 /* 8020E930 0020B870 41 82 00 0C */ beq lbl_8020E93C /* 8020E934 0020B874 28 00 00 01 */ cmplwi r0, 1 /* 8020E938 0020B878 40 82 00 80 */ bne lbl_8020E9B8 lbl_8020E93C: -/* 8020E93C 0020B87C 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8020E940 0020B880 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8020E93C 0020B87C 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8020E940 0020B880 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8020E944 0020B884 A0 03 00 A2 */ lhz r0, 0xa2(r3) /* 8020E948 0020B888 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e /* 8020E94C 0020B88C 40 82 00 6C */ bne lbl_8020E9B8 @@ -141,8 +141,8 @@ lbl_8020E968: /* 8020E968 0020B8A8 38 00 00 02 */ li r0, 2 /* 8020E96C 0020B8AC 98 1F 00 BF */ stb r0, 0xbf(r31) /* 8020E970 0020B8B0 38 00 04 00 */ li r0, 0x400 -/* 8020E974 0020B8B4 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8020E978 0020B8B8 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8020E974 0020B8B4 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8020E978 0020B8B8 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8020E97C 0020B8BC B0 03 00 AA */ sth r0, 0xaa(r3) /* 8020E980 0020B8C0 38 00 00 B8 */ li r0, 0xb8 /* 8020E984 0020B8C4 90 01 00 08 */ stw r0, 8(r1) diff --git a/include/d/d_meter/d_meter_map/asm/func_8020E9CC.s b/include/d/d_meter/d_meter_map/asm/func_8020E9CC.s index abf51f2009..2a1540ec5b 100644 --- a/include/d/d_meter/d_meter_map/asm/func_8020E9CC.s +++ b/include/d/d_meter/d_meter_map/asm/func_8020E9CC.s @@ -11,8 +11,8 @@ /* 8020E9F4 0020B934 4B FF EC A5 */ bl isEventRunCheck__11dMeterMap_cFv /* 8020E9F8 0020B938 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8020E9FC 0020B93C 40 82 01 50 */ bne lbl_8020EB4C -/* 8020EA00 0020B940 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8020EA04 0020B944 3B E3 01 88 */ addi r31, r3, lbl_80430188@l +/* 8020EA00 0020B940 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8020EA04 0020B944 3B E3 01 88 */ addi r31, r3, g_meter2_info@l /* 8020EA08 0020B948 88 1F 00 BF */ lbz r0, 0xbf(r31) /* 8020EA0C 0020B94C 28 00 00 00 */ cmplwi r0, 0 /* 8020EA10 0020B950 41 82 00 0C */ beq lbl_8020EA1C @@ -45,8 +45,8 @@ lbl_8020EA1C: lbl_8020EA78: /* 8020EA78 0020B9B8 28 00 00 00 */ cmplwi r0, 0 /* 8020EA7C 0020B9BC 40 82 02 CC */ bne lbl_8020ED48 -/* 8020EA80 0020B9C0 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8020EA84 0020B9C4 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8020EA80 0020B9C0 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8020EA84 0020B9C4 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8020EA88 0020B9C8 A0 03 00 A2 */ lhz r0, 0xa2(r3) /* 8020EA8C 0020B9CC 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e /* 8020EA90 0020B9D0 40 82 00 70 */ bne lbl_8020EB00 @@ -60,8 +60,8 @@ lbl_8020EAAC: /* 8020EAAC 0020B9EC 38 00 00 02 */ li r0, 2 /* 8020EAB0 0020B9F0 98 1F 00 BF */ stb r0, 0xbf(r31) /* 8020EAB4 0020B9F4 38 00 02 00 */ li r0, 0x200 -/* 8020EAB8 0020B9F8 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8020EABC 0020B9FC 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8020EAB8 0020B9F8 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8020EABC 0020B9FC 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8020EAC0 0020BA00 B0 03 00 AA */ sth r0, 0xaa(r3) /* 8020EAC4 0020BA04 38 00 00 B8 */ li r0, 0xb8 /* 8020EAC8 0020BA08 90 01 00 1C */ stw r0, 0x1c(r1) @@ -106,8 +106,8 @@ lbl_8020EB4C: /* 8020EB5C 0020BA9C 4B FF EB 3D */ bl isEventRunCheck__11dMeterMap_cFv /* 8020EB60 0020BAA0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8020EB64 0020BAA4 40 82 01 E4 */ bne lbl_8020ED48 -/* 8020EB68 0020BAA8 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8020EB6C 0020BAAC 3B E3 01 88 */ addi r31, r3, lbl_80430188@l +/* 8020EB68 0020BAA8 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8020EB6C 0020BAAC 3B E3 01 88 */ addi r31, r3, g_meter2_info@l /* 8020EB70 0020BAB0 88 1F 00 BF */ lbz r0, 0xbf(r31) /* 8020EB74 0020BAB4 28 00 00 00 */ cmplwi r0, 0 /* 8020EB78 0020BAB8 41 82 00 0C */ beq lbl_8020EB84 @@ -142,8 +142,8 @@ lbl_8020EB84: /* 8020EBE8 0020BB28 98 1F 00 BF */ stb r0, 0xbf(r31) /* 8020EBEC 0020BB2C 48 00 01 5C */ b lbl_8020ED48 lbl_8020EBF0: -/* 8020EBF0 0020BB30 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8020EBF4 0020BB34 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8020EBF0 0020BB30 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8020EBF4 0020BB34 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8020EBF8 0020BB38 A0 03 00 A2 */ lhz r0, 0xa2(r3) /* 8020EBFC 0020BB3C 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e /* 8020EC00 0020BB40 40 82 01 48 */ bne lbl_8020ED48 @@ -157,8 +157,8 @@ lbl_8020EC1C: /* 8020EC1C 0020BB5C 38 00 00 02 */ li r0, 2 /* 8020EC20 0020BB60 98 1F 00 BF */ stb r0, 0xbf(r31) /* 8020EC24 0020BB64 38 00 04 00 */ li r0, 0x400 -/* 8020EC28 0020BB68 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8020EC2C 0020BB6C 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8020EC28 0020BB68 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8020EC2C 0020BB6C 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8020EC30 0020BB70 B0 03 00 AA */ sth r0, 0xaa(r3) /* 8020EC34 0020BB74 38 00 00 B8 */ li r0, 0xb8 /* 8020EC38 0020BB78 90 01 00 10 */ stw r0, 0x10(r1) @@ -181,8 +181,8 @@ lbl_8020EC70: /* 8020EC78 0020BBB8 88 1E 00 2D */ lbz r0, 0x2d(r30) /* 8020EC7C 0020BBBC 28 00 00 00 */ cmplwi r0, 0 /* 8020EC80 0020BBC0 41 82 00 C8 */ beq lbl_8020ED48 -/* 8020EC84 0020BBC4 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8020EC88 0020BBC8 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8020EC84 0020BBC4 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8020EC88 0020BBC8 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8020EC8C 0020BBCC A0 03 00 A2 */ lhz r0, 0xa2(r3) /* 8020EC90 0020BBD0 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e /* 8020EC94 0020BBD4 40 82 00 70 */ bne lbl_8020ED04 @@ -196,8 +196,8 @@ lbl_8020ECB0: /* 8020ECB0 0020BBF0 38 00 00 02 */ li r0, 2 /* 8020ECB4 0020BBF4 98 1F 00 BF */ stb r0, 0xbf(r31) /* 8020ECB8 0020BBF8 38 00 04 00 */ li r0, 0x400 -/* 8020ECBC 0020BBFC 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8020ECC0 0020BC00 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8020ECBC 0020BBFC 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8020ECC0 0020BC00 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8020ECC4 0020BC04 B0 03 00 AA */ sth r0, 0xaa(r3) /* 8020ECC8 0020BC08 38 00 00 B8 */ li r0, 0xb8 /* 8020ECCC 0020BC0C 90 01 00 0C */ stw r0, 0xc(r1) diff --git a/include/d/d_meter/d_meter_string/asm/func_8020F1B0.s b/include/d/d_meter/d_meter_string/asm/func_8020F1B0.s index 0af2917b45..3d5cd77ea7 100644 --- a/include/d/d_meter/d_meter_string/asm/func_8020F1B0.s +++ b/include/d/d_meter/d_meter_string/asm/func_8020F1B0.s @@ -178,8 +178,8 @@ lbl_8020F458: /* 8020F45C 0020C39C FC 00 F8 40 */ fcmpo cr0, f0, f31 /* 8020F460 0020C3A0 4C 41 13 82 */ cror 2, 1, 2 /* 8020F464 0020C3A4 40 82 00 10 */ bne lbl_8020F474 -/* 8020F468 0020C3A8 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8020F46C 0020C3AC 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8020F468 0020C3A8 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8020F46C 0020C3AC 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8020F470 0020C3B0 48 00 D7 91 */ bl resetMeterString__13dMeter2Info_cFv lbl_8020F474: /* 8020F474 0020C3B4 E3 E1 00 58 */ psq_l f31, 88(r1), 0, 0 diff --git a/include/d/d_meter/d_meter_string/asm/func_8020F5A4.s b/include/d/d_meter/d_meter_string/asm/func_8020F5A4.s index af37f45759..1e14f5da41 100644 --- a/include/d/d_meter/d_meter_string/asm/func_8020F5A4.s +++ b/include/d/d_meter/d_meter_string/asm/func_8020F5A4.s @@ -5,8 +5,8 @@ /* 8020F5B4 0020C4F4 93 C1 00 28 */ stw r30, 0x28(r1) /* 8020F5B8 0020C4F8 7C 7E 1B 78 */ mr r30, r3 /* 8020F5BC 0020C4FC 7C 9F 23 78 */ mr r31, r4 -/* 8020F5C0 0020C500 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8020F5C4 0020C504 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8020F5C0 0020C500 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8020F5C4 0020C504 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8020F5C8 0020C508 38 A1 00 08 */ addi r5, r1, 8 /* 8020F5CC 0020C50C 38 C0 00 00 */ li r6, 0 /* 8020F5D0 0020C510 48 00 CC 81 */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c diff --git a/include/d/d_meter/d_meter_string/asm/func_8020F6EC.s b/include/d/d_meter/d_meter_string/asm/func_8020F6EC.s index b0634cdd75..571a95086f 100644 --- a/include/d/d_meter/d_meter_string/asm/func_8020F6EC.s +++ b/include/d/d_meter/d_meter_string/asm/func_8020F6EC.s @@ -123,8 +123,8 @@ lbl_8020F898: /* 8020F8B8 0020C7F8 3B 40 00 00 */ li r26, 0 /* 8020F8BC 0020C7FC 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 8020F8C0 0020C800 3B 83 EB C8 */ addi r28, r3, lbl_8042EBC8@l -/* 8020F8C4 0020C804 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8020F8C8 0020C808 3B A3 01 88 */ addi r29, r3, lbl_80430188@l +/* 8020F8C4 0020C804 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8020F8C8 0020C808 3B A3 01 88 */ addi r29, r3, g_meter2_info@l /* 8020F8CC 0020C80C C3 41 00 34 */ lfs f26, 0x34(r1) /* 8020F8D0 0020C810 CB 62 AE 70 */ lfd f27, lbl_80454870-_SDA2_BASE_(r2) /* 8020F8D4 0020C814 3F C0 43 30 */ lis r30, 0x4330 diff --git a/include/d/d_meter2/d_meter2/asm/func_8021EA14.s b/include/d/d_meter2/d_meter2/asm/func_8021EA14.s index 2411a99e3c..9ccce03cf7 100644 --- a/include/d/d_meter2/d_meter2/asm/func_8021EA14.s +++ b/include/d/d_meter2/d_meter2/asm/func_8021EA14.s @@ -40,8 +40,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: @@ -254,8 +254,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 @@ -304,8 +304,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) @@ -441,8 +441,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 @@ -450,8 +450,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 diff --git a/include/d/d_meter2/d_meter2/asm/func_8021F128.s b/include/d/d_meter2/d_meter2/asm/func_8021F128.s index 17d9a648c3..db3a7ee91e 100644 --- a/include/d/d_meter2/d_meter2/asm/func_8021F128.s +++ b/include/d/d_meter2/d_meter2/asm/func_8021F128.s @@ -109,14 +109,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 diff --git a/include/d/d_meter2/d_meter2/asm/func_8021F370.s b/include/d/d_meter2/d_meter2/asm/func_8021F370.s index dc8ce362a0..f8d897159d 100644 --- a/include/d/d_meter2/d_meter2/asm/func_8021F370.s +++ b/include/d/d_meter2/d_meter2/asm/func_8021F370.s @@ -42,8 +42,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 diff --git a/include/d/d_meter2/d_meter2/asm/func_8021F7B0.s b/include/d/d_meter2/d_meter2/asm/func_8021F7B0.s index d90318fc07..3606ea0b59 100644 --- a/include/d/d_meter2/d_meter2/asm/func_8021F7B0.s +++ b/include/d/d_meter2/d_meter2/asm/func_8021F7B0.s @@ -61,8 +61,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 @@ -92,8 +92,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 @@ -261,8 +261,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 diff --git a/include/d/d_meter2/d_meter2/asm/func_8021FD60.s b/include/d/d_meter2/d_meter2/asm/func_8021FD60.s index 20d0e260b4..2a9ce7022d 100644 --- a/include/d/d_meter2/d_meter2/asm/func_8021FD60.s +++ b/include/d/d_meter2/d_meter2/asm/func_8021FD60.s @@ -117,8 +117,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 @@ -143,8 +143,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 @@ -213,8 +213,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 diff --git a/include/d/d_meter2/d_meter2/asm/func_80220888.s b/include/d/d_meter2/d_meter2/asm/func_80220888.s index a83fd85763..ae5b60494b 100644 --- a/include/d/d_meter2/d_meter2/asm/func_80220888.s +++ b/include/d/d_meter2/d_meter2/asm/func_80220888.s @@ -123,8 +123,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 diff --git a/include/d/d_meter2/d_meter2/asm/func_80222364.s b/include/d/d_meter2/d_meter2/asm/func_80222364.s index 167f9a8d79..2a009b8493 100644 --- a/include/d/d_meter2/d_meter2/asm/func_80222364.s +++ b/include/d/d_meter2/d_meter2/asm/func_80222364.s @@ -26,8 +26,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 @@ -61,8 +61,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) diff --git a/include/d/d_meter2/d_meter2/asm/func_80222518.s b/include/d/d_meter2/d_meter2/asm/func_80222518.s index 66f8d2a6b8..284471cc2c 100644 --- a/include/d/d_meter2/d_meter2/asm/func_80222518.s +++ b/include/d/d_meter2/d_meter2/asm/func_80222518.s @@ -439,16 +439,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) @@ -655,8 +655,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 _restgpr_25 diff --git a/include/d/d_meter2/d_meter2/asm/func_802230FC.s b/include/d/d_meter2/d_meter2/asm/func_802230FC.s index d4d25b0f1e..ae3143c74d 100644 --- a/include/d/d_meter2/d_meter2/asm/func_802230FC.s +++ b/include/d/d_meter2/d_meter2/asm/func_802230FC.s @@ -25,8 +25,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 diff --git a/include/d/d_meter2/d_meter2/asm/func_802237D4.s b/include/d/d_meter2/d_meter2/asm/func_802237D4.s index abe0c3f1f2..015b035b95 100644 --- a/include/d/d_meter2/d_meter2/asm/func_802237D4.s +++ b/include/d/d_meter2/d_meter2/asm/func_802237D4.s @@ -102,8 +102,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 @@ -111,8 +111,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 @@ -139,8 +139,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 diff --git a/include/d/d_meter2/d_meter2/asm/func_80223BC4.s b/include/d/d_meter2/d_meter2/asm/func_80223BC4.s index 4844a23584..ee8c385c8d 100644 --- a/include/d/d_meter2/d_meter2/asm/func_80223BC4.s +++ b/include/d/d_meter2/d_meter2/asm/func_80223BC4.s @@ -14,8 +14,8 @@ /* 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 @@ -78,8 +78,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 diff --git a/include/d/d_meter2/d_meter2/asm/func_80223E00.s b/include/d/d_meter2/d_meter2/asm/func_80223E00.s index 724d8d3386..2876fd1662 100644 --- a/include/d/d_meter2/d_meter2/asm/func_80223E00.s +++ b/include/d/d_meter2/d_meter2/asm/func_80223E00.s @@ -8,8 +8,8 @@ /* 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 diff --git a/include/d/d_meter2/d_meter2/asm/func_80224354.s b/include/d/d_meter2/d_meter2/asm/func_80224354.s index 808b1fad55..e1f8c1477a 100644 --- a/include/d/d_meter2/d_meter2/asm/func_80224354.s +++ b/include/d/d_meter2/d_meter2/asm/func_80224354.s @@ -9,8 +9,8 @@ /* 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 diff --git a/include/d/d_meter2/d_meter2/asm/func_80224DC0.s b/include/d/d_meter2/d_meter2/asm/func_80224DC0.s index c20e3e0b3c..3b55adf74e 100644 --- a/include/d/d_meter2/d_meter2/asm/func_80224DC0.s +++ b/include/d/d_meter2/d_meter2/asm/func_80224DC0.s @@ -97,8 +97,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 diff --git a/include/d/d_meter2/d_meter2/asm/func_80224F70.s b/include/d/d_meter2/d_meter2/asm/func_80224F70.s index bc61608dce..5f4c0eb70b 100644 --- a/include/d/d_meter2/d_meter2/asm/func_80224F70.s +++ b/include/d/d_meter2/d_meter2/asm/func_80224F70.s @@ -81,8 +81,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 diff --git a/include/d/d_meter2/d_meter2/asm/func_802250F4.s b/include/d/d_meter2/d_meter2/asm/func_802250F4.s index f794b73a0a..a007b5c67e 100644 --- a/include/d/d_meter2/d_meter2/asm/func_802250F4.s +++ b/include/d/d_meter2/d_meter2/asm/func_802250F4.s @@ -78,8 +78,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 @@ -96,8 +96,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 @@ -180,8 +180,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 diff --git a/include/d/d_meter2/d_meter2/asm/func_802254C0.s b/include/d/d_meter2/d_meter2/asm/func_802254C0.s index da48806292..5fc22308b3 100644 --- a/include/d/d_meter2/d_meter2/asm/func_802254C0.s +++ b/include/d/d_meter2/d_meter2/asm/func_802254C0.s @@ -66,8 +66,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 @@ -79,8 +79,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 diff --git a/include/d/d_meter2/d_meter2/asm/func_802256DC.s b/include/d/d_meter2/d_meter2/asm/func_802256DC.s index 2726b5bf46..4496b8e924 100644 --- a/include/d/d_meter2/d_meter2/asm/func_802256DC.s +++ b/include/d/d_meter2/d_meter2/asm/func_802256DC.s @@ -19,8 +19,8 @@ /* 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 @@ -102,8 +102,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 diff --git a/include/d/d_meter2/d_meter2/asm/func_80225B08.s b/include/d/d_meter2/d_meter2/asm/func_80225B08.s index 3c33a6d0c0..dd4c7e437a 100644 --- a/include/d/d_meter2/d_meter2/asm/func_80225B08.s +++ b/include/d/d_meter2/d_meter2/asm/func_80225B08.s @@ -3,8 +3,8 @@ /* 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 diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_8020FAB4.s b/include/d/d_meter2/d_meter2_draw/asm/func_8020FAB4.s index b10cf97003..596679802e 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_8020FAB4.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_8020FAB4.s @@ -29,8 +29,8 @@ /* 8020FB24 0020CA64 3C 80 80 3A */ lis r4, lbl_803988D0@ha /* 8020FB28 0020CA68 38 84 88 D0 */ addi r4, r4, lbl_803988D0@l /* 8020FB2C 0020CA6C 48 0C 60 0D */ bl getGlbResource__10JKRArchiveFUlPCcP10JKRArchive -/* 8020FB30 0020CA70 3C 80 80 43 */ lis r4, lbl_80430188@ha -/* 8020FB34 0020CA74 38 84 01 88 */ addi r4, r4, lbl_80430188@l +/* 8020FB30 0020CA70 3C 80 80 43 */ lis r4, g_meter2_info@ha +/* 8020FB34 0020CA74 38 84 01 88 */ addi r4, r4, g_meter2_info@l /* 8020FB38 0020CA78 90 64 00 10 */ stw r3, 0x10(r4) /* 8020FB3C 0020CA7C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 8020FB40 0020CA80 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l @@ -45,8 +45,8 @@ /* 8020FB64 0020CAA4 38 65 4F 54 */ addi r3, r5, 0x524F4F54@l /* 8020FB68 0020CAA8 7F 45 D3 78 */ mr r5, r26 /* 8020FB6C 0020CAAC 48 0C 5F CD */ bl getGlbResource__10JKRArchiveFUlPCcP10JKRArchive -/* 8020FB70 0020CAB0 3C 80 80 43 */ lis r4, lbl_80430188@ha -/* 8020FB74 0020CAB4 38 84 01 88 */ addi r4, r4, lbl_80430188@l +/* 8020FB70 0020CAB0 3C 80 80 43 */ lis r4, g_meter2_info@ha +/* 8020FB74 0020CAB4 38 84 01 88 */ addi r4, r4, g_meter2_info@l /* 8020FB78 0020CAB8 90 64 00 14 */ stw r3, 0x14(r4) /* 8020FB7C 0020CABC 80 B7 5C F4 */ lwz r5, 0x5cf4(r23) /* 8020FB80 0020CAC0 3C 80 52 4F */ lis r4, 0x524F4F54@ha @@ -55,8 +55,8 @@ /* 8020FB8C 0020CACC 38 84 88 D0 */ addi r4, r4, lbl_803988D0@l /* 8020FB90 0020CAD0 38 84 00 6E */ addi r4, r4, 0x6e /* 8020FB94 0020CAD4 48 0C 5F A5 */ bl getGlbResource__10JKRArchiveFUlPCcP10JKRArchive -/* 8020FB98 0020CAD8 3C 80 80 43 */ lis r4, lbl_80430188@ha -/* 8020FB9C 0020CADC 38 84 01 88 */ addi r4, r4, lbl_80430188@l +/* 8020FB98 0020CAD8 3C 80 80 43 */ lis r4, g_meter2_info@ha +/* 8020FB9C 0020CADC 38 84 01 88 */ addi r4, r4, g_meter2_info@l /* 8020FBA0 0020CAE0 90 64 00 18 */ stw r3, 0x18(r4) /* 8020FBA4 0020CAE4 7F 23 CB 78 */ mr r3, r25 /* 8020FBA8 0020CAE8 4B DF F6 25 */ bl mDoExt_setCurrentHeap__FP7JKRHeap diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_802102F8.s b/include/d/d_meter2/d_meter2_draw/asm/func_802102F8.s index c9dfb82daf..ba2939bdb0 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_802102F8.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_802102F8.s @@ -12,16 +12,16 @@ /* 80210324 0020D264 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80210328 0020D268 3B 43 61 C0 */ addi r26, r3, g_dComIfG_gameInfo@l /* 8021032C 0020D26C 80 7A 5C F4 */ lwz r3, 0x5cf4(r26) -/* 80210330 0020D270 3C 80 80 43 */ lis r4, lbl_80430188@ha -/* 80210334 0020D274 38 84 01 88 */ addi r4, r4, lbl_80430188@l +/* 80210330 0020D270 3C 80 80 43 */ lis r4, g_meter2_info@ha +/* 80210334 0020D274 38 84 01 88 */ addi r4, r4, g_meter2_info@l /* 80210338 0020D278 80 84 00 10 */ lwz r4, 0x10(r4) /* 8021033C 0020D27C 81 83 00 00 */ lwz r12, 0(r3) /* 80210340 0020D280 81 8C 00 28 */ lwz r12, 0x28(r12) /* 80210344 0020D284 7D 89 03 A6 */ mtctr r12 /* 80210348 0020D288 4E 80 04 21 */ bctrl /* 8021034C 0020D28C 80 7A 5C F4 */ lwz r3, 0x5cf4(r26) -/* 80210350 0020D290 3C 80 80 43 */ lis r4, lbl_80430188@ha -/* 80210354 0020D294 38 84 01 88 */ addi r4, r4, lbl_80430188@l +/* 80210350 0020D290 3C 80 80 43 */ lis r4, g_meter2_info@ha +/* 80210354 0020D294 38 84 01 88 */ addi r4, r4, g_meter2_info@l /* 80210358 0020D298 80 84 00 18 */ lwz r4, 0x18(r4) /* 8021035C 0020D29C 81 83 00 00 */ lwz r12, 0(r3) /* 80210360 0020D2A0 81 8C 00 28 */ lwz r12, 0x28(r12) diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_80212190.s b/include/d/d_meter2/d_meter2_draw/asm/func_80212190.s index ccc50f4d69..80775cb11b 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_80212190.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_80212190.s @@ -120,8 +120,8 @@ lbl_80212318: /* 80212350 0020F290 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80212354 0020F294 3B 43 01 14 */ addi r26, r3, 0x114 /* 80212358 0020F298 3B 60 00 FF */ li r27, 0xff -/* 8021235C 0020F29C 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80212360 0020F2A0 3B 83 01 88 */ addi r28, r3, lbl_80430188@l +/* 8021235C 0020F29C 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80212360 0020F2A0 3B 83 01 88 */ addi r28, r3, g_meter2_info@l /* 80212364 0020F2A4 3B A0 00 00 */ li r29, 0 lbl_80212368: /* 80212368 0020F2A8 7F 43 D3 78 */ mr r3, r26 diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_802126E4.s b/include/d/d_meter2/d_meter2_draw/asm/func_802126E4.s index 5c8a5000c2..1245733eb8 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_802126E4.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_802126E4.s @@ -43,8 +43,8 @@ lbl_8021274C: /* 80212780 0020F6C0 41 80 FF C0 */ blt lbl_80212740 /* 80212784 0020F6C4 3B 00 00 00 */ li r24, 0 /* 80212788 0020F6C8 3B 60 00 00 */ li r27, 0 -/* 8021278C 0020F6CC 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80212790 0020F6D0 3B 43 01 88 */ addi r26, r3, lbl_80430188@l +/* 8021278C 0020F6CC 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80212790 0020F6D0 3B 43 01 88 */ addi r26, r3, g_meter2_info@l lbl_80212794: /* 80212794 0020F6D4 7F 43 D3 78 */ mr r3, r26 /* 80212798 0020F6D8 7F 04 C3 78 */ mr r4, r24 @@ -171,8 +171,8 @@ lbl_8021295C: /* 80212968 0020F8A8 38 80 00 04 */ li r4, 4 /* 8021296C 0020F8AC 48 0E 4D 8D */ bl setBasePosition__7J2DPaneF15J2DBasePosition /* 80212970 0020F8B0 80 1F 03 2C */ lwz r0, 0x32c(r31) -/* 80212974 0020F8B4 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80212978 0020F8B8 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 80212974 0020F8B4 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80212978 0020F8B8 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8021297C 0020F8BC 90 03 00 28 */ stw r0, 0x28(r3) /* 80212980 0020F8C0 38 60 00 6C */ li r3, 0x6c /* 80212984 0020F8C4 48 0B C2 C9 */ bl __nw__FUl @@ -194,8 +194,8 @@ lbl_802129B4: /* 802129C0 0020F900 38 80 00 04 */ li r4, 4 /* 802129C4 0020F904 48 0E 4D 35 */ bl setBasePosition__7J2DPaneF15J2DBasePosition /* 802129C8 0020F908 80 1F 03 30 */ lwz r0, 0x330(r31) -/* 802129CC 0020F90C 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 802129D0 0020F910 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 802129CC 0020F90C 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 802129D0 0020F910 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 802129D4 0020F914 90 03 00 2C */ stw r0, 0x2c(r3) /* 802129D8 0020F918 38 00 00 00 */ li r0, 0 /* 802129DC 0020F91C 90 1F 03 34 */ stw r0, 0x334(r31) @@ -296,8 +296,8 @@ lbl_80212B40: /* 80212B4C 0020FA8C 38 80 00 04 */ li r4, 4 /* 80212B50 0020FA90 48 0E 4B A9 */ bl setBasePosition__7J2DPaneF15J2DBasePosition /* 80212B54 0020FA94 80 1F 03 34 */ lwz r0, 0x334(r31) -/* 80212B58 0020FA98 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80212B5C 0020FA9C 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 80212B58 0020FA98 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80212B5C 0020FA9C 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 80212B60 0020FAA0 90 03 00 30 */ stw r0, 0x30(r3) /* 80212B64 0020FAA4 38 60 01 50 */ li r3, 0x150 /* 80212B68 0020FAA8 48 0B C0 E5 */ bl __nw__FUl diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_8021350C.s b/include/d/d_meter2/d_meter2_draw/asm/func_8021350C.s index 867316f4ab..b7f891e084 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_8021350C.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_8021350C.s @@ -184,8 +184,8 @@ lbl_80213554: /* 802137E4 00210724 4E 80 04 21 */ bctrl /* 802137E8 00210728 48 0E CE 71 */ bl getStringPtr__10J2DTextBoxCFv /* 802137EC 0021072C 7C 65 1B 78 */ mr r5, r3 -/* 802137F0 00210730 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 802137F4 00210734 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 802137F0 00210730 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 802137F4 00210734 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 802137F8 00210738 38 80 00 61 */ li r4, 0x61 /* 802137FC 0021073C 38 C0 00 00 */ li r6, 0 /* 80213800 00210740 48 00 8A 51 */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c @@ -200,8 +200,8 @@ lbl_80213554: /* 80213824 00210764 4E 80 04 21 */ bctrl /* 80213828 00210768 48 0E CE 31 */ bl getStringPtr__10J2DTextBoxCFv /* 8021382C 0021076C 7C 65 1B 78 */ mr r5, r3 -/* 80213830 00210770 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80213834 00210774 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 80213830 00210770 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80213834 00210774 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 80213838 00210778 38 80 00 61 */ li r4, 0x61 /* 8021383C 0021077C 38 C0 00 00 */ li r6, 0 /* 80213840 00210780 48 00 8A 11 */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c @@ -216,8 +216,8 @@ lbl_80213554: /* 80213864 002107A4 4E 80 04 21 */ bctrl /* 80213868 002107A8 48 0E CD F1 */ bl getStringPtr__10J2DTextBoxCFv /* 8021386C 002107AC 7C 65 1B 78 */ mr r5, r3 -/* 80213870 002107B0 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80213874 002107B4 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 80213870 002107B0 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80213874 002107B4 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 80213878 002107B8 38 80 00 61 */ li r4, 0x61 /* 8021387C 002107BC 38 C0 00 00 */ li r6, 0 /* 80213880 002107C0 48 00 89 D1 */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c @@ -232,8 +232,8 @@ lbl_80213554: /* 802138A4 002107E4 4E 80 04 21 */ bctrl /* 802138A8 002107E8 48 0E CD B1 */ bl getStringPtr__10J2DTextBoxCFv /* 802138AC 002107EC 7C 65 1B 78 */ mr r5, r3 -/* 802138B0 002107F0 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 802138B4 002107F4 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 802138B0 002107F0 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 802138B4 002107F4 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 802138B8 002107F8 38 80 00 61 */ li r4, 0x61 /* 802138BC 002107FC 38 C0 00 00 */ li r6, 0 /* 802138C0 00210800 48 00 89 91 */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c @@ -248,8 +248,8 @@ lbl_80213554: /* 802138E4 00210824 4E 80 04 21 */ bctrl /* 802138E8 00210828 48 0E CD 71 */ bl getStringPtr__10J2DTextBoxCFv /* 802138EC 0021082C 7C 65 1B 78 */ mr r5, r3 -/* 802138F0 00210830 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 802138F4 00210834 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 802138F0 00210830 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 802138F4 00210834 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 802138F8 00210838 38 80 00 61 */ li r4, 0x61 /* 802138FC 0021083C 38 C0 00 00 */ li r6, 0 /* 80213900 00210840 48 00 89 51 */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c @@ -419,8 +419,8 @@ lbl_80213554: /* 80213B90 00210AD0 4E 80 04 21 */ bctrl /* 80213B94 00210AD4 48 0E CA C5 */ bl getStringPtr__10J2DTextBoxCFv /* 80213B98 00210AD8 7C 65 1B 78 */ mr r5, r3 -/* 80213B9C 00210ADC 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80213BA0 00210AE0 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 80213B9C 00210ADC 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80213BA0 00210AE0 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 80213BA4 00210AE4 38 80 00 62 */ li r4, 0x62 /* 80213BA8 00210AE8 38 C0 00 00 */ li r6, 0 /* 80213BAC 00210AEC 48 00 86 A5 */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c @@ -435,8 +435,8 @@ lbl_80213554: /* 80213BD0 00210B10 4E 80 04 21 */ bctrl /* 80213BD4 00210B14 48 0E CA 85 */ bl getStringPtr__10J2DTextBoxCFv /* 80213BD8 00210B18 7C 65 1B 78 */ mr r5, r3 -/* 80213BDC 00210B1C 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80213BE0 00210B20 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 80213BDC 00210B1C 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80213BE0 00210B20 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 80213BE4 00210B24 38 80 00 62 */ li r4, 0x62 /* 80213BE8 00210B28 38 C0 00 00 */ li r6, 0 /* 80213BEC 00210B2C 48 00 86 65 */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c @@ -451,8 +451,8 @@ lbl_80213554: /* 80213C10 00210B50 4E 80 04 21 */ bctrl /* 80213C14 00210B54 48 0E CA 45 */ bl getStringPtr__10J2DTextBoxCFv /* 80213C18 00210B58 7C 65 1B 78 */ mr r5, r3 -/* 80213C1C 00210B5C 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80213C20 00210B60 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 80213C1C 00210B5C 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80213C20 00210B60 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 80213C24 00210B64 38 80 00 62 */ li r4, 0x62 /* 80213C28 00210B68 38 C0 00 00 */ li r6, 0 /* 80213C2C 00210B6C 48 00 86 25 */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c @@ -467,8 +467,8 @@ lbl_80213554: /* 80213C50 00210B90 4E 80 04 21 */ bctrl /* 80213C54 00210B94 48 0E CA 05 */ bl getStringPtr__10J2DTextBoxCFv /* 80213C58 00210B98 7C 65 1B 78 */ mr r5, r3 -/* 80213C5C 00210B9C 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80213C60 00210BA0 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 80213C5C 00210B9C 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80213C60 00210BA0 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 80213C64 00210BA4 38 80 00 62 */ li r4, 0x62 /* 80213C68 00210BA8 38 C0 00 00 */ li r6, 0 /* 80213C6C 00210BAC 48 00 85 E5 */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c @@ -483,8 +483,8 @@ lbl_80213554: /* 80213C90 00210BD0 4E 80 04 21 */ bctrl /* 80213C94 00210BD4 48 0E C9 C5 */ bl getStringPtr__10J2DTextBoxCFv /* 80213C98 00210BD8 7C 65 1B 78 */ mr r5, r3 -/* 80213C9C 00210BDC 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80213CA0 00210BE0 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 80213C9C 00210BDC 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80213CA0 00210BE0 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 80213CA4 00210BE4 38 80 00 62 */ li r4, 0x62 /* 80213CA8 00210BE8 38 C0 00 00 */ li r6, 0 /* 80213CAC 00210BEC 48 00 85 A5 */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_80215F88.s b/include/d/d_meter2/d_meter2_draw/asm/func_80215F88.s index 934d93cbb1..4e92e6bc15 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_80215F88.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_80215F88.s @@ -11,8 +11,8 @@ /* 80215FB0 00212EF0 C0 23 00 18 */ lfs f1, 0x18(r3) /* 80215FB4 00212EF4 C0 1D 06 FC */ lfs f0, 0x6fc(r29) /* 80215FB8 00212EF8 EF E1 00 32 */ fmuls f31, f1, f0 -/* 80215FBC 00212EFC 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80215FC0 00212F00 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 80215FBC 00212EFC 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80215FC0 00212F00 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 80215FC4 00212F04 3B C3 00 E3 */ addi r30, r3, 0xe3 /* 80215FC8 00212F08 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80215FCC 00212F0C 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_80217AB4.s b/include/d/d_meter2/d_meter2_draw/asm/func_80217AB4.s index b269ef9ff3..eac7f49dab 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_80217AB4.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_80217AB4.s @@ -280,20 +280,20 @@ lbl_80217E38: /* 80217EC0 00214E00 C0 44 01 50 */ lfs f2, 0x150(r4) /* 80217EC4 00214E04 48 03 C6 ED */ bl paneTrans__8CPaneMgrFff /* 80217EC8 00214E08 C3 FF 00 0C */ lfs f31, 0xc(r31) -/* 80217ECC 00214E0C 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80217ED0 00214E10 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 80217ECC 00214E0C 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80217ED0 00214E10 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 80217ED4 00214E14 38 80 00 00 */ li r4, 0 /* 80217ED8 00214E18 48 00 4A 79 */ bl isDirectUseItem__13dMeter2Info_cFi /* 80217EDC 00214E1C 88 1F 07 73 */ lbz r0, 0x773(r31) /* 80217EE0 00214E20 7C 00 18 00 */ cmpw r0, r3 /* 80217EE4 00214E24 41 82 00 58 */ beq lbl_80217F3C -/* 80217EE8 00214E28 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80217EEC 00214E2C 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 80217EE8 00214E28 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80217EEC 00214E2C 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 80217EF0 00214E30 38 80 00 00 */ li r4, 0 /* 80217EF4 00214E34 48 00 4A 5D */ bl isDirectUseItem__13dMeter2Info_cFi /* 80217EF8 00214E38 98 7F 07 73 */ stb r3, 0x773(r31) -/* 80217EFC 00214E3C 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80217F00 00214E40 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 80217EFC 00214E3C 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80217F00 00214E40 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 80217F04 00214E44 38 80 00 00 */ li r4, 0 /* 80217F08 00214E48 48 00 4A 49 */ bl isDirectUseItem__13dMeter2Info_cFi /* 80217F0C 00214E4C 2C 03 00 00 */ cmpwi r3, 0 @@ -309,8 +309,8 @@ lbl_80217E38: /* 80217F34 00214E74 EC 01 00 28 */ fsubs f0, f1, f0 /* 80217F38 00214E78 D0 1F 06 10 */ stfs f0, 0x610(r31) lbl_80217F3C: -/* 80217F3C 00214E7C 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80217F40 00214E80 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 80217F3C 00214E7C 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80217F40 00214E80 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 80217F44 00214E84 38 80 00 00 */ li r4, 0 /* 80217F48 00214E88 48 00 4A 09 */ bl isDirectUseItem__13dMeter2Info_cFi /* 80217F4C 00214E8C 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha @@ -398,20 +398,20 @@ lbl_8021804C: /* 80218090 00214FD0 C0 44 01 60 */ lfs f2, 0x160(r4) /* 80218094 00214FD4 48 03 C5 1D */ bl paneTrans__8CPaneMgrFff /* 80218098 00214FD8 C3 FF 00 28 */ lfs f31, 0x28(r31) -/* 8021809C 00214FDC 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 802180A0 00214FE0 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8021809C 00214FDC 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 802180A0 00214FE0 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 802180A4 00214FE4 38 80 00 01 */ li r4, 1 /* 802180A8 00214FE8 48 00 48 A9 */ bl isDirectUseItem__13dMeter2Info_cFi /* 802180AC 00214FEC 88 1F 07 74 */ lbz r0, 0x774(r31) /* 802180B0 00214FF0 7C 00 18 00 */ cmpw r0, r3 /* 802180B4 00214FF4 41 82 00 58 */ beq lbl_8021810C -/* 802180B8 00214FF8 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 802180BC 00214FFC 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 802180B8 00214FF8 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 802180BC 00214FFC 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 802180C0 00215000 38 80 00 01 */ li r4, 1 /* 802180C4 00215004 48 00 48 8D */ bl isDirectUseItem__13dMeter2Info_cFi /* 802180C8 00215008 98 7F 07 74 */ stb r3, 0x774(r31) -/* 802180CC 0021500C 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 802180D0 00215010 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 802180CC 0021500C 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 802180D0 00215010 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 802180D4 00215014 38 80 00 01 */ li r4, 1 /* 802180D8 00215018 48 00 48 79 */ bl isDirectUseItem__13dMeter2Info_cFi /* 802180DC 0021501C 2C 03 00 00 */ cmpwi r3, 0 @@ -427,8 +427,8 @@ lbl_8021804C: /* 80218104 00215044 EC 01 00 28 */ fsubs f0, f1, f0 /* 80218108 00215048 D0 1F 06 14 */ stfs f0, 0x614(r31) lbl_8021810C: -/* 8021810C 0021504C 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80218110 00215050 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8021810C 0021504C 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80218110 00215050 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 80218114 00215054 38 80 00 01 */ li r4, 1 /* 80218118 00215058 48 00 48 39 */ bl isDirectUseItem__13dMeter2Info_cFi /* 8021811C 0021505C 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_802190A8.s b/include/d/d_meter2/d_meter2_draw/asm/func_802190A8.s index 449c24fefa..de57eae3af 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_802190A8.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_802190A8.s @@ -33,8 +33,8 @@ lbl_80219120: /* 80219124 00216064 A8 03 00 16 */ lha r0, 0x16(r3) /* 80219128 00216068 2C 00 00 05 */ cmpwi r0, 5 /* 8021912C 0021606C 40 82 00 34 */ bne lbl_80219160 -/* 80219130 00216070 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80219134 00216074 38 83 01 88 */ addi r4, r3, lbl_80430188@l +/* 80219130 00216070 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80219134 00216074 38 83 01 88 */ addi r4, r3, g_meter2_info@l /* 80219138 00216078 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8021913C 0021607C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80219140 00216080 88 03 4E 0C */ lbz r0, 0x4e0c(r3) diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_802195A4.s b/include/d/d_meter2/d_meter2_draw/asm/func_802195A4.s index 9a40f4026f..125a476480 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_802195A4.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_802195A4.s @@ -34,8 +34,8 @@ /* 80219628 00216568 80 7E 02 F8 */ lwz r3, 0x2f8(r30) /* 8021962C 0021656C 48 03 C1 FD */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80219630 00216570 FF E0 08 90 */ fmr f31, f1 -/* 80219634 00216574 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80219638 00216578 3B E3 01 88 */ addi r31, r3, lbl_80430188@l +/* 80219634 00216574 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80219638 00216578 3B E3 01 88 */ addi r31, r3, g_meter2_info@l /* 8021963C 0021657C A0 1F 00 AE */ lhz r0, 0xae(r31) /* 80219640 00216580 54 00 07 FF */ clrlwi. r0, r0, 0x1f /* 80219644 00216584 40 82 00 24 */ bne lbl_80219668 diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_80219788.s b/include/d/d_meter2/d_meter2_draw/asm/func_80219788.s index 75d5a5fbec..e9885d1f66 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_80219788.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_80219788.s @@ -66,8 +66,8 @@ lbl_8021981C: /* 80219880 002167C0 80 7D 02 F8 */ lwz r3, 0x2f8(r29) /* 80219884 002167C4 48 03 BF A5 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80219888 002167C8 FF E0 08 90 */ fmr f31, f1 -/* 8021988C 002167CC 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80219890 002167D0 3B E3 01 88 */ addi r31, r3, lbl_80430188@l +/* 8021988C 002167CC 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80219890 002167D0 3B E3 01 88 */ addi r31, r3, g_meter2_info@l /* 80219894 002167D4 A0 1F 00 AE */ lhz r0, 0xae(r31) /* 80219898 002167D8 54 00 FF FF */ rlwinm. r0, r0, 0x1f, 0x1f, 0x1f /* 8021989C 002167DC 40 82 00 28 */ bne lbl_802198C4 @@ -135,8 +135,8 @@ lbl_802198D0: /* 8021998C 002168CC 4E 80 04 21 */ bctrl /* 80219990 002168D0 3B C0 00 00 */ li r30, 0 /* 80219994 002168D4 3B 80 00 00 */ li r28, 0 -/* 80219998 002168D8 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8021999C 002168DC 3B 23 01 88 */ addi r25, r3, lbl_80430188@l +/* 80219998 002168D8 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8021999C 002168DC 3B 23 01 88 */ addi r25, r3, g_meter2_info@l /* 802199A0 002168E0 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 802199A4 002168E4 3B 43 EB C8 */ addi r26, r3, lbl_8042EBC8@l /* 802199A8 002168E8 CB C2 AE C0 */ lfd f30, lbl_804548C0-_SDA2_BASE_(r2) diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_80219A84.s b/include/d/d_meter2/d_meter2_draw/asm/func_80219A84.s index 7ffdbb765e..bdb744e088 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_80219A84.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_80219A84.s @@ -65,8 +65,8 @@ /* 80219B84 00216AC4 4B E1 AE 39 */ bl isEventBit__11dSv_event_cCFUs /* 80219B88 00216AC8 2C 03 00 00 */ cmpwi r3, 0 /* 80219B8C 00216ACC 40 82 00 18 */ bne lbl_80219BA4 -/* 80219B90 00216AD0 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80219B94 00216AD4 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 80219B90 00216AD0 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80219B94 00216AD4 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 80219B98 00216AD8 A0 03 00 AE */ lhz r0, 0xae(r3) /* 80219B9C 00216ADC 54 00 05 29 */ rlwinm. r0, r0, 0, 0x14, 0x14 /* 80219BA0 00216AE0 41 82 00 2C */ beq lbl_80219BCC @@ -93,8 +93,8 @@ lbl_80219BD4: /* 80219BE8 00216B28 C3 A2 AE 80 */ lfs f29, lbl_80454880-_SDA2_BASE_(r2) /* 80219BEC 00216B2C 48 00 00 CC */ b lbl_80219CB8 lbl_80219BF0: -/* 80219BF0 00216B30 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80219BF4 00216B34 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 80219BF0 00216B30 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80219BF4 00216B34 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 80219BF8 00216B38 A0 03 00 AE */ lhz r0, 0xae(r3) /* 80219BFC 00216B3C 54 00 05 29 */ rlwinm. r0, r0, 0, 0x14, 0x14 /* 80219C00 00216B40 40 82 00 34 */ bne lbl_80219C34 @@ -216,8 +216,8 @@ lbl_80219D54: /* 80219DB0 00216CF0 C3 A2 AE 80 */ lfs f29, lbl_80454880-_SDA2_BASE_(r2) /* 80219DB4 00216CF4 48 00 00 44 */ b lbl_80219DF8 lbl_80219DB8: -/* 80219DB8 00216CF8 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80219DBC 00216CFC 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 80219DB8 00216CF8 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80219DBC 00216CFC 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 80219DC0 00216D00 A0 03 00 AE */ lhz r0, 0xae(r3) /* 80219DC4 00216D04 54 00 05 29 */ rlwinm. r0, r0, 0, 0x14, 0x14 /* 80219DC8 00216D08 40 82 00 30 */ bne lbl_80219DF8 diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_80219E98.s b/include/d/d_meter2/d_meter2_draw/asm/func_80219E98.s index 0a6721c3e9..4ffdd7f380 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_80219E98.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_80219E98.s @@ -99,8 +99,8 @@ lbl_80219F9C: /* 8021A00C 00216F4C FF E0 08 90 */ fmr f31, f1 /* 8021A010 00216F50 2C 19 00 00 */ cmpwi r25, 0 /* 8021A014 00216F54 40 82 00 50 */ bne lbl_8021A064 -/* 8021A018 00216F58 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8021A01C 00216F5C 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8021A018 00216F58 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8021A01C 00216F5C 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8021A020 00216F60 A0 03 00 AE */ lhz r0, 0xae(r3) /* 8021A024 00216F64 54 00 07 7B */ rlwinm. r0, r0, 0, 0x1d, 0x1d /* 8021A028 00216F68 40 82 00 8C */ bne lbl_8021A0B4 @@ -123,8 +123,8 @@ lbl_8021A050: lbl_8021A064: /* 8021A064 00216FA4 2C 19 00 01 */ cmpwi r25, 1 /* 8021A068 00216FA8 40 82 00 4C */ bne lbl_8021A0B4 -/* 8021A06C 00216FAC 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8021A070 00216FB0 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8021A06C 00216FAC 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8021A070 00216FB0 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8021A074 00216FB4 A0 03 00 AE */ lhz r0, 0xae(r3) /* 8021A078 00216FB8 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c /* 8021A07C 00216FBC 40 82 00 38 */ bne lbl_8021A0B4 @@ -195,8 +195,8 @@ lbl_8021A0B4: /* 8021A174 002170B4 3B 40 00 01 */ li r26, 1 /* 8021A178 002170B8 2C 19 00 00 */ cmpwi r25, 0 /* 8021A17C 002170BC 40 82 00 20 */ bne lbl_8021A19C -/* 8021A180 002170C0 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8021A184 002170C4 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8021A180 002170C0 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8021A184 002170C4 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8021A188 002170C8 A0 03 00 AE */ lhz r0, 0xae(r3) /* 8021A18C 002170CC 54 00 07 7B */ rlwinm. r0, r0, 0, 0x1d, 0x1d /* 8021A190 002170D0 40 82 00 2C */ bne lbl_8021A1BC @@ -205,8 +205,8 @@ lbl_8021A0B4: lbl_8021A19C: /* 8021A19C 002170DC 2C 19 00 01 */ cmpwi r25, 1 /* 8021A1A0 002170E0 40 82 00 1C */ bne lbl_8021A1BC -/* 8021A1A4 002170E4 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8021A1A8 002170E8 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8021A1A4 002170E4 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8021A1A8 002170E8 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8021A1AC 002170EC A0 03 00 AE */ lhz r0, 0xae(r3) /* 8021A1B0 002170F0 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c /* 8021A1B4 002170F4 40 82 00 08 */ bne lbl_8021A1BC diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_8021A2F4.s b/include/d/d_meter2/d_meter2_draw/asm/func_8021A2F4.s index ac03806bee..69ab6221be 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_8021A2F4.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_8021A2F4.s @@ -28,16 +28,16 @@ lbl_8021A33C: /* 8021A35C 0021729C 57 80 06 3E */ clrlwi r0, r28, 0x18 /* 8021A360 002172A0 28 00 00 01 */ cmplwi r0, 1 /* 8021A364 002172A4 40 82 00 20 */ bne lbl_8021A384 -/* 8021A368 002172A8 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8021A36C 002172AC 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8021A368 002172A8 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8021A36C 002172AC 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8021A370 002172B0 3C A0 80 43 */ lis r5, lbl_80430158@ha /* 8021A374 002172B4 38 A5 01 58 */ addi r5, r5, lbl_80430158@l /* 8021A378 002172B8 38 C1 00 1C */ addi r6, r1, 0x1c /* 8021A37C 002172BC 48 00 1F F5 */ bl getStringKana__13dMeter2Info_cFUlPcP14JMSMesgEntry_c /* 8021A380 002172C0 48 00 00 1C */ b lbl_8021A39C lbl_8021A384: -/* 8021A384 002172C4 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8021A388 002172C8 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8021A384 002172C4 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8021A388 002172C8 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8021A38C 002172CC 3C A0 80 43 */ lis r5, lbl_80430158@ha /* 8021A390 002172D0 38 A5 01 58 */ addi r5, r5, lbl_80430158@l /* 8021A394 002172D4 38 C1 00 1C */ addi r6, r1, 0x1c @@ -65,16 +65,16 @@ lbl_8021A3C4: /* 8021A3E4 00217324 57 80 06 3E */ clrlwi r0, r28, 0x18 /* 8021A3E8 00217328 28 00 00 01 */ cmplwi r0, 1 /* 8021A3EC 0021732C 40 82 00 20 */ bne lbl_8021A40C -/* 8021A3F0 00217330 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8021A3F4 00217334 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8021A3F0 00217330 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8021A3F4 00217334 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8021A3F8 00217338 3C A0 80 43 */ lis r5, lbl_80430158@ha /* 8021A3FC 0021733C 38 A5 01 58 */ addi r5, r5, lbl_80430158@l /* 8021A400 00217340 38 C1 00 08 */ addi r6, r1, 8 /* 8021A404 00217344 48 00 1F 6D */ bl getStringKana__13dMeter2Info_cFUlPcP14JMSMesgEntry_c /* 8021A408 00217348 48 00 00 1C */ b lbl_8021A424 lbl_8021A40C: -/* 8021A40C 0021734C 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8021A410 00217350 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8021A40C 0021734C 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8021A410 00217350 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8021A414 00217354 3C A0 80 43 */ lis r5, lbl_80430158@ha /* 8021A418 00217358 38 A5 01 58 */ addi r5, r5, lbl_80430158@l /* 8021A41C 0021735C 38 C1 00 08 */ addi r6, r1, 8 diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_8021A468.s b/include/d/d_meter2/d_meter2_draw/asm/func_8021A468.s index 948aa84351..e5215acfd8 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_8021A468.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_8021A468.s @@ -47,8 +47,8 @@ lbl_8021A4E0: /* 8021A50C 0021744C 90 01 00 0C */ stw r0, 0xc(r1) /* 8021A510 00217450 38 00 FF FF */ li r0, -1 /* 8021A514 00217454 90 01 00 10 */ stw r0, 0x10(r1) -/* 8021A518 00217458 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8021A51C 0021745C 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8021A518 00217458 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8021A51C 0021745C 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8021A520 00217460 7F C4 F3 78 */ mr r4, r30 /* 8021A524 00217464 80 E7 04 E8 */ lwz r7, 0x4e8(r7) /* 8021A528 00217468 81 1D 05 14 */ lwz r8, 0x514(r29) diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_8021A71C.s b/include/d/d_meter2/d_meter2_draw/asm/func_8021A71C.s index 76e4556109..acc5d4bfa1 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_8021A71C.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_8021A71C.s @@ -37,8 +37,8 @@ lbl_8021A770: /* 8021A7A0 002176E0 90 01 00 0C */ stw r0, 0xc(r1) /* 8021A7A4 002176E4 38 00 FF FF */ li r0, -1 /* 8021A7A8 002176E8 90 01 00 10 */ stw r0, 0x10(r1) -/* 8021A7AC 002176EC 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8021A7B0 002176F0 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8021A7AC 002176EC 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8021A7B0 002176F0 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8021A7B4 002176F4 7F 64 DB 78 */ mr r4, r27 /* 8021A7B8 002176F8 7C 19 42 14 */ add r0, r25, r8 /* 8021A7BC 002176FC 7C E0 3A 14 */ add r7, r0, r7 diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_8021BB6C.s b/include/d/d_meter2/d_meter2_draw/asm/func_8021BB6C.s index 23f15664dc..da5c7d0d5c 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_8021BB6C.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_8021BB6C.s @@ -1,8 +1,8 @@ /* 8021BB6C 00218AAC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8021BB70 00218AB0 7C 08 02 A6 */ mflr r0 /* 8021BB74 00218AB4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8021BB78 00218AB8 3C 80 80 43 */ lis r4, lbl_80430188@ha -/* 8021BB7C 00218ABC 38 84 01 88 */ addi r4, r4, lbl_80430188@l +/* 8021BB78 00218AB8 3C 80 80 43 */ lis r4, g_meter2_info@ha +/* 8021BB7C 00218ABC 38 84 01 88 */ addi r4, r4, g_meter2_info@l /* 8021BB80 00218AC0 A0 04 00 B0 */ lhz r0, 0xb0(r4) /* 8021BB84 00218AC4 54 00 07 FF */ clrlwi. r0, r0, 0x1f /* 8021BB88 00218AC8 41 82 00 18 */ beq lbl_8021BBA0 diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_8021BCC0.s b/include/d/d_meter2/d_meter2_draw/asm/func_8021BCC0.s index efbb053165..d27210f716 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_8021BCC0.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_8021BCC0.s @@ -12,8 +12,8 @@ /* 8021BCEC 00218C2C 38 60 00 00 */ li r3, 0 /* 8021BCF0 00218C30 48 00 00 C8 */ b lbl_8021BDB8 lbl_8021BCF4: -/* 8021BCF4 00218C34 3C 80 80 43 */ lis r4, lbl_80430188@ha -/* 8021BCF8 00218C38 38 84 01 88 */ addi r4, r4, lbl_80430188@l +/* 8021BCF4 00218C34 3C 80 80 43 */ lis r4, g_meter2_info@ha +/* 8021BCF8 00218C38 38 84 01 88 */ addi r4, r4, g_meter2_info@l /* 8021BCFC 00218C3C 88 04 00 BD */ lbz r0, 0xbd(r4) /* 8021BD00 00218C40 28 00 00 00 */ cmplwi r0, 0 /* 8021BD04 00218C44 40 82 00 A8 */ bne lbl_8021BDAC @@ -29,8 +29,8 @@ lbl_8021BCF4: /* 8021BD2C 00218C6C 4E 80 04 21 */ bctrl /* 8021BD30 00218C70 2C 03 00 00 */ cmpwi r3, 0 /* 8021BD34 00218C74 40 82 00 78 */ bne lbl_8021BDAC -/* 8021BD38 00218C78 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8021BD3C 00218C7C 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8021BD38 00218C78 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8021BD3C 00218C7C 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8021BD40 00218C80 88 03 00 E8 */ lbz r0, 0xe8(r3) /* 8021BD44 00218C84 28 00 00 00 */ cmplwi r0, 0 /* 8021BD48 00218C88 40 82 00 64 */ bne lbl_8021BDAC diff --git a/include/d/d_meter2/d_meter2_info/asm/func_8021C970.s b/include/d/d_meter2/d_meter2_info/asm/func_8021C970.s index 47bb4e2690..5f1df40106 100644 --- a/include/d/d_meter2/d_meter2_info/asm/func_8021C970.s +++ b/include/d/d_meter2/d_meter2_info/asm/func_8021C970.s @@ -9,8 +9,8 @@ lbl_8021C984: /* 8021C98C 002198CC 38 60 00 00 */ li r3, 0 /* 8021C990 002198D0 4E 80 00 20 */ blr lbl_8021C994: -/* 8021C994 002198D4 3C A0 80 43 */ lis r5, lbl_80430188@ha -/* 8021C998 002198D8 38 A5 01 88 */ addi r5, r5, lbl_80430188@l +/* 8021C994 002198D4 3C A0 80 43 */ lis r5, g_meter2_info@ha +/* 8021C998 002198D8 38 A5 01 88 */ addi r5, r5, g_meter2_info@l /* 8021C99C 002198DC 80 A5 00 1C */ lwz r5, 0x1c(r5) /* 8021C9A0 002198E0 28 05 00 00 */ cmplwi r5, 0 /* 8021C9A4 002198E4 41 82 00 30 */ beq lbl_8021C9D4 diff --git a/include/d/d_meter2/d_meter2_info/asm/func_8021E2B4.s b/include/d/d_meter2/d_meter2_info/asm/func_8021E2B4.s index 54fa815dcb..133a3e9628 100644 --- a/include/d/d_meter2/d_meter2_info/asm/func_8021E2B4.s +++ b/include/d/d_meter2/d_meter2_info/asm/func_8021E2B4.s @@ -1,5 +1,5 @@ -/* 8021E2B4 0021B1F4 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8021E2B8 0021B1F8 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8021E2B4 0021B1F4 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8021E2B8 0021B1F8 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8021E2BC 0021B1FC 80 63 00 1C */ lwz r3, 0x1c(r3) /* 8021E2C0 0021B200 A8 63 01 92 */ lha r3, 0x192(r3) /* 8021E2C4 0021B204 4E 80 00 20 */ blr diff --git a/include/d/d_meter2/d_meter2_info/asm/func_8021E688.s b/include/d/d_meter2/d_meter2_info/asm/func_8021E688.s index 47fd92d511..80fbf47e78 100644 --- a/include/d/d_meter2/d_meter2_info/asm/func_8021E688.s +++ b/include/d/d_meter2/d_meter2_info/asm/func_8021E688.s @@ -13,8 +13,8 @@ lbl_8021E6B8: /* 8021E6B8 0021B5F8 54 00 06 3F */ clrlwi. r0, r0, 0x18 /* 8021E6BC 0021B5FC 40 82 00 18 */ bne lbl_8021E6D4 -/* 8021E6C0 0021B600 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8021E6C4 0021B604 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8021E6C0 0021B600 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8021E6C4 0021B604 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8021E6C8 0021B608 A0 03 00 A2 */ lhz r0, 0xa2(r3) /* 8021E6CC 0021B60C 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e /* 8021E6D0 0021B610 41 82 00 0C */ beq lbl_8021E6DC diff --git a/include/d/d_meter2/d_meter2_info/asm/func_8021E9D8.s b/include/d/d_meter2/d_meter2_info/asm/func_8021E9D8.s index aa64ea0c9f..6cd8f95a1e 100644 --- a/include/d/d_meter2/d_meter2_info/asm/func_8021E9D8.s +++ b/include/d/d_meter2/d_meter2_info/asm/func_8021E9D8.s @@ -1,8 +1,8 @@ /* 8021E9D8 0021B918 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8021E9DC 0021B91C 7C 08 02 A6 */ mflr r0 /* 8021E9E0 0021B920 90 01 00 14 */ stw r0, 0x14(r1) -/* 8021E9E4 0021B924 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8021E9E8 0021B928 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8021E9E4 0021B924 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8021E9E8 0021B928 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8021E9EC 0021B92C 4B FF D3 F1 */ bl __ct__13dMeter2Info_cFv /*.global __dt__13dMeter2Info_cFv*/ /* 8021E9F0 0021B930 3C 80 80 22 */ lis r4, __dt__13dMeter2Info_cFv@ha diff --git a/include/d/d_meter2/d_meter2_info/d_meter2_info.h b/include/d/d_meter2/d_meter2_info/d_meter2_info.h index 3cd17909f5..889b025080 100644 --- a/include/d/d_meter2/d_meter2_info/d_meter2_info.h +++ b/include/d/d_meter2/d_meter2_info/d_meter2_info.h @@ -6,6 +6,7 @@ #include "JSystem/J2DGraph/J2DTextBox/J2DTextBox.h" #include "JSystem/JMessage/control/control.h" #include "JSystem/JUtility/JUTFont/JUTFont.h" +#include "SComponent/c_xyz.h" #include "dolphin/types.h" struct dMeter2Info_c_vtable { diff --git a/include/d/d_save/d_save/asm/func_80033370.s b/include/d/d_save/d_save/asm/func_80033370.s index 7cdfc76596..f0295720e8 100644 --- a/include/d/d_save/d_save/asm/func_80033370.s +++ b/include/d/d_save/d_save/asm/func_80033370.s @@ -26,8 +26,8 @@ lbl_800333B4: /* 800333D0 00030310 57 A0 06 3E */ clrlwi r0, r29, 0x18 /* 800333D4 00030314 28 00 00 6B */ cmplwi r0, 0x6b /* 800333D8 00030318 40 82 00 18 */ bne lbl_800333F0 -/* 800333DC 0003031C 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 800333E0 00030320 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 800333DC 0003031C 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 800333E0 00030320 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 800333E4 00030324 38 1F 00 0B */ addi r0, r31, 0xb /* 800333E8 00030328 54 04 06 3E */ clrlwi r4, r0, 0x18 /* 800333EC 0003032C 48 1E A8 D9 */ bl setHotSpringTimer__13dMeter2Info_cFUc diff --git a/include/d/d_save/d_save/asm/func_80033598.s b/include/d/d_save/d_save/asm/func_80033598.s index 02e7137d89..766858e4cd 100644 --- a/include/d/d_save/d_save/asm/func_80033598.s +++ b/include/d/d_save/d_save/asm/func_80033598.s @@ -32,8 +32,8 @@ /* 80033614 00030554 7F E4 FB 78 */ mr r4, r31 /* 80033618 00030558 4B FF F4 45 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi /* 8003361C 0003055C 7C 64 1B 78 */ mr r4, r3 -/* 80033620 00030560 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80033624 00030564 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 80033620 00030560 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80033624 00030564 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 80033628 00030568 48 1E A6 9D */ bl setHotSpringTimer__13dMeter2Info_cFUc lbl_8003362C: /* 8003362C 0003056C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha diff --git a/include/d/d_save/d_save/asm/func_80034518.s b/include/d/d_save/d_save/asm/func_80034518.s index 9e6a7c54ce..a01fb3114b 100644 --- a/include/d/d_save/d_save/asm/func_80034518.s +++ b/include/d/d_save/d_save/asm/func_80034518.s @@ -3,14 +3,14 @@ /* 80034520 00031460 90 01 00 14 */ stw r0, 0x14(r1) /* 80034524 00031464 93 E1 00 0C */ stw r31, 0xc(r1) /* 80034528 00031468 7C 7F 1B 78 */ mr r31, r3 -/* 8003452C 0003146C 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80034530 00031470 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8003452C 0003146C 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80034530 00031470 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 80034534 00031474 38 80 03 82 */ li r4, 0x382 /* 80034538 00031478 38 BF 00 14 */ addi r5, r31, 0x14 /* 8003453C 0003147C 38 C0 00 00 */ li r6, 0 /* 80034540 00031480 48 1E 7D 11 */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c -/* 80034544 00031484 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80034548 00031488 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 80034544 00031484 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80034548 00031488 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8003454C 0003148C 38 80 03 83 */ li r4, 0x383 /* 80034550 00031490 38 BF 00 25 */ addi r5, r31, 0x25 /* 80034554 00031494 38 C0 00 00 */ li r6, 0 diff --git a/include/d/d_save/d_save/asm/func_80035798.s b/include/d/d_save/d_save/asm/func_80035798.s index 24c0739572..42b2c82bb6 100644 --- a/include/d/d_save/d_save/asm/func_80035798.s +++ b/include/d/d_save/d_save/asm/func_80035798.s @@ -62,8 +62,8 @@ lbl_80035834: /* 80035888 000327C8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8003588C 000327CC 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 80035890 000327D0 A3 E4 00 08 */ lhz r31, 8(r4) -/* 80035894 000327D4 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80035898 000327D8 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 80035894 000327D4 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80035898 000327D8 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8003589C 000327DC A0 03 00 B6 */ lhz r0, 0xb6(r3) /* 800358A0 000327E0 B0 04 00 08 */ sth r0, 8(r4) /* 800358A4 000327E4 3B C0 00 01 */ li r30, 1 diff --git a/include/d/d_save/d_save/asm/func_80035A04.s b/include/d/d_save/d_save/asm/func_80035A04.s index 4c5103b2c2..3cdf547888 100644 --- a/include/d/d_save/d_save/asm/func_80035A04.s +++ b/include/d/d_save/d_save/asm/func_80035A04.s @@ -103,8 +103,8 @@ lbl_80035B60: /* 80035B84 00032AC4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80035B88 00032AC8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80035B8C 00032ACC 38 83 00 58 */ addi r4, r3, 0x58 -/* 80035B90 00032AD0 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80035B94 00032AD4 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 80035B90 00032AD0 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 80035B94 00032AD4 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 80035B98 00032AD8 48 1E 86 F9 */ bl setSaveStageName__13dMeter2Info_cFPCc /* 80035B9C 00032ADC 3C 60 80 38 */ lis r3, lbl_80379234@ha /* 80035BA0 00032AE0 38 63 92 34 */ addi r3, r3, lbl_80379234@l diff --git a/include/f/f_op/f_op_msg_mng/asm/func_8001FD34.s b/include/f/f_op/f_op_msg_mng/asm/func_8001FD34.s index 74b82b4909..e84920e89c 100644 --- a/include/f/f_op/f_op_msg_mng/asm/func_8001FD34.s +++ b/include/f/f_op/f_op_msg_mng/asm/func_8001FD34.s @@ -11,8 +11,8 @@ /* 8001FD5C 0001CC9C 88 1F 5E 8F */ lbz r0, 0x5e8f(r31) /* 8001FD60 0001CCA0 28 00 00 08 */ cmplwi r0, 8 /* 8001FD64 0001CCA4 40 82 00 14 */ bne lbl_8001FD78 -/* 8001FD68 0001CCA8 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8001FD6C 0001CCAC 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8001FD68 0001CCA8 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8001FD6C 0001CCAC 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8001FD70 0001CCB0 80 63 00 1C */ lwz r3, 0x1c(r3) /* 8001FD74 0001CCB4 48 1F F9 79 */ bl emphasisButtonDelete__9dMeter2_cFv lbl_8001FD78: diff --git a/include/f/f_op/f_op_msg_mng/asm/func_8001FE84.s b/include/f/f_op/f_op_msg_mng/asm/func_8001FE84.s index 2349e92ef1..a0bf68a9d0 100644 --- a/include/f/f_op/f_op_msg_mng/asm/func_8001FE84.s +++ b/include/f/f_op/f_op_msg_mng/asm/func_8001FE84.s @@ -10,8 +10,8 @@ /* 8001FEA8 0001CDE8 88 1F 5E 8F */ lbz r0, 0x5e8f(r31) /* 8001FEAC 0001CDEC 28 00 00 08 */ cmplwi r0, 8 /* 8001FEB0 0001CDF0 40 82 00 14 */ bne lbl_8001FEC4 -/* 8001FEB4 0001CDF4 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8001FEB8 0001CDF8 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8001FEB4 0001CDF4 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8001FEB8 0001CDF8 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8001FEBC 0001CDFC 80 63 00 1C */ lwz r3, 0x1c(r3) /* 8001FEC0 0001CE00 48 1F F8 2D */ bl emphasisButtonDelete__9dMeter2_cFv lbl_8001FEC4: diff --git a/include/f/f_op/f_op_msg_mng/asm/func_8001FFC4.s b/include/f/f_op/f_op_msg_mng/asm/func_8001FFC4.s index 4b89d08802..ea88aa5258 100644 --- a/include/f/f_op/f_op_msg_mng/asm/func_8001FFC4.s +++ b/include/f/f_op/f_op_msg_mng/asm/func_8001FFC4.s @@ -10,8 +10,8 @@ /* 8001FFE8 0001CF28 88 1F 5E 8F */ lbz r0, 0x5e8f(r31) /* 8001FFEC 0001CF2C 28 00 00 08 */ cmplwi r0, 8 /* 8001FFF0 0001CF30 40 82 00 14 */ bne lbl_80020004 -/* 8001FFF4 0001CF34 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 8001FFF8 0001CF38 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 8001FFF4 0001CF34 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 8001FFF8 0001CF38 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 8001FFFC 0001CF3C 80 63 00 1C */ lwz r3, 0x1c(r3) /* 80020000 0001CF40 48 1F F6 ED */ bl emphasisButtonDelete__9dMeter2_cFv lbl_80020004: diff --git a/include/f/f_op/f_op_msg_mng/asm/func_800200C0.s b/include/f/f_op/f_op_msg_mng/asm/func_800200C0.s index 4e6f4d97b2..726ac3beaa 100644 --- a/include/f/f_op/f_op_msg_mng/asm/func_800200C0.s +++ b/include/f/f_op/f_op_msg_mng/asm/func_800200C0.s @@ -3,8 +3,8 @@ /* 800200C8 0001D008 90 01 00 14 */ stw r0, 0x14(r1) /* 800200CC 0001D00C 93 E1 00 0C */ stw r31, 0xc(r1) /* 800200D0 0001D010 7C 7F 1B 78 */ mr r31, r3 -/* 800200D4 0001D014 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 800200D8 0001D018 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 800200D4 0001D014 3C 60 80 43 */ lis r3, g_meter2_info@ha +/* 800200D8 0001D018 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 800200DC 0001D01C 7F E5 FB 78 */ mr r5, r31 /* 800200E0 0001D020 38 C0 00 00 */ li r6, 0 /* 800200E4 0001D024 48 1F C1 6D */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c diff --git a/src/d/d_a/d_a_alink.cpp b/src/d/d_a/d_a_alink.cpp index 1d4b838a6a..c4dd3045c0 100644 --- a/src/d/d_a/d_a_alink.cpp +++ b/src/d/d_a/d_a_alink.cpp @@ -9,6 +9,7 @@ #include "Z2AudioLib/Z2SoundObject/Z2SoundObject.h" #include "d/d_bg/d_bg_s/d_bg_s_poly_pass_chk.h" #include "d/d_kankyo/d_kankyo.h" +#include "d/d_meter2/d_meter2_info/d_meter2_info.h" #include "f/f_op/f_op_actor_iter.h" #include "f/f_op/f_op_actor_mng.h" #include "f/f_op/f_op_overlap_mng.h" @@ -2002,7 +2003,6 @@ extern u8 lbl_80451180; extern u8 lbl_803A7288; extern u8 lbl_80450D64; extern u8 lbl_80451360; -extern u8 lbl_80430188; extern u8 lbl_803A6F88; u32 daAlink_c::getE3Zhint(void) { diff --git a/src/d/d_com/d_com_inf_game.cpp b/src/d/d_com/d_com_inf_game.cpp index 05d0c821ea..0a4015bce4 100644 --- a/src/d/d_com/d_com_inf_game.cpp +++ b/src/d/d_com/d_com_inf_game.cpp @@ -4,6 +4,7 @@ #include "d/d_bg/d_bg_s/d_bg_s.h" #include "d/d_item/d_item/d_item.h" #include "d/d_kankyo/d_kankyo.h" +#include "d/d_meter2/d_meter2_info/d_meter2_info.h" #include "f/f_op/f_op_scene_mng.h" #include "global.h" #include "m_Do/m_Do_Reset/m_Do_Reset.h" @@ -286,7 +287,6 @@ void fopScnM_ReRequest__FsUl(void); void fopScnM_ChangeReq__FP11scene_classssUs(void); } -extern u8 lbl_80430188; extern u8 lbl_80378F38; extern u8 lbl_803A7288; extern u8 lbl_80450D64; diff --git a/src/d/d_file/d_file_sel_info.cpp b/src/d/d_file/d_file_sel_info.cpp index 1a7732f048..0aa034bbf1 100644 --- a/src/d/d_file/d_file_sel_info.cpp +++ b/src/d/d_file/d_file_sel_info.cpp @@ -1,5 +1,6 @@ #include "d/d_file/d_file_sel_info/d_file_sel_info.h" #include "d/d_com/d_com_inf_game/d_com_inf_game.h" +#include "d/d_meter2/d_meter2_info/d_meter2_info.h" #include "global.h" extern "C" { @@ -31,7 +32,6 @@ extern u8 lbl_803BB588; extern u8 lbl_803948B8; extern u8 lbl_803BB548; extern u8 lbl_803BB4A8; -extern u8 lbl_80430188; extern u8 lbl_804539F8; extern u8 lbl_804539FC; extern u8 lbl_803BB498; diff --git a/src/d/d_kankyo.cpp b/src/d/d_kankyo.cpp index cc6e22e5a0..2900a0f253 100644 --- a/src/d/d_kankyo.cpp +++ b/src/d/d_kankyo.cpp @@ -4,6 +4,7 @@ #include "JSystem/JMath/JMath.h" #include "Z2AudioLib/Z2SeMgr/Z2SeMgr.h" #include "d/d_com/d_com_inf_game/d_com_inf_game.h" +#include "d/d_meter2/d_meter2_info/d_meter2_info.h" #include "global.h" #include "m_Do/m_Do_audio/m_Do_audio.h" #include "m_Do/m_Do_graphic/m_Do_graphic.h" @@ -351,7 +352,7 @@ extern u8 lbl_80450AE0; extern u8 lbl_803A3354; extern u8 lbl_80430CD8; extern u8 lbl_803DD470; -extern u8 lbl_80430188; +// extern u8 g_meter2_info; extern u8 lbl_803790C0; extern "C" { diff --git a/src/d/d_meter/d_meter_button.cpp b/src/d/d_meter/d_meter_button.cpp index 2a2de0abc3..6b49d96817 100644 --- a/src/d/d_meter/d_meter_button.cpp +++ b/src/d/d_meter/d_meter_button.cpp @@ -2,6 +2,7 @@ #include "Z2AudioLib/Z2SeMgr/Z2SeMgr.h" #include "d/d_com/d_com_inf_game/d_com_inf_game.h" +#include "d/d_meter2/d_meter2_info/d_meter2_info.h" #include "global.h" #include "m_Do/m_Do_audio/m_Do_audio.h" @@ -179,9 +180,9 @@ extern u8 lbl_804547A8; extern u8 lbl_804547AC; extern u8 lbl_803A6F88; extern u8 lbl_803790C0; -extern u8 lbl_80430188; +// extern u8 g_meter2_info; extern u8 lbl_8042EBC8; -extern u8 lbl_80430188; +// extern u8 g_meter2_info; extern u8 lbl_8043028C; extern "C" { diff --git a/src/d/d_meter/d_meter_hakusha.cpp b/src/d/d_meter/d_meter_hakusha.cpp index 5a494295a6..bfb8f457c3 100644 --- a/src/d/d_meter/d_meter_hakusha.cpp +++ b/src/d/d_meter/d_meter_hakusha.cpp @@ -1,6 +1,7 @@ /* d_meter_hakusha.cpp autogenerated by split.py v0.3 at 2021-01-02 05:39:40.804826 */ #include "d/d_com/d_com_inf_game/d_com_inf_game.h" +#include "d/d_meter2/d_meter2_info/d_meter2_info.h" #include "global.h" extern "C" { @@ -46,7 +47,7 @@ extern u8 lbl_80454808; extern u8 lbl_80454818; extern u8 lbl_803A6F88; extern u8 lbl_803BB6D4; -extern u8 lbl_80430188; +// extern u8 g_meter2_info; extern u8 lbl_8042EBC8; extern "C" { diff --git a/src/d/d_meter/d_meter_map.cpp b/src/d/d_meter/d_meter_map.cpp index 0ae2c21190..1299bb2de0 100644 --- a/src/d/d_meter/d_meter_map.cpp +++ b/src/d/d_meter/d_meter_map.cpp @@ -2,10 +2,12 @@ #include "Z2AudioLib/Z2SeMgr/Z2SeMgr.h" #include "d/d_com/d_com_inf_game/d_com_inf_game.h" +#include "d/d_meter2/d_meter2_info/d_meter2_info.h" #include "f/f_op/f_op_overlap_mng.h" #include "global.h" #include "m_Do/m_Do_audio/m_Do_audio.h" #include "m_Do/m_Do_controller_pad/m_Do_controller_pad.h" + extern "C" { void fopOvlpM_IsDoingReq__Fv(void); bool dComIfGp_checkMapShow__Fv(void); @@ -55,7 +57,7 @@ extern u8 lbl_80454840; extern u8 lbl_80454834; extern u8 lbl_80450D64; extern u8 lbl_803A6F88; -extern u8 lbl_80430188; +// extern u8 g_meter2_info; extern u8 lbl_803A7288; extern "C" { diff --git a/src/d/d_meter/d_meter_string.cpp b/src/d/d_meter/d_meter_string.cpp index a420e77056..44eb577f4f 100644 --- a/src/d/d_meter/d_meter_string.cpp +++ b/src/d/d_meter/d_meter_string.cpp @@ -1,6 +1,7 @@ /* d_meter_string.cpp autogenerated by split.py v0.3 at 2021-01-02 05:50:34.120259 */ #include "d/d_com/d_com_inf_game/d_com_inf_game.h" +#include "d/d_meter2/d_meter2_info/d_meter2_info.h" #include "global.h" extern "C" { @@ -53,7 +54,7 @@ extern u8 lbl_80454868; extern u8 lbl_803A6F88; extern u8 lbl_803BB6D4; extern u8 lbl_8042EBC8; -extern u8 lbl_80430188; +// extern u8 g_meter2_info; extern "C" { // __ct__14dMeterString_cFi diff --git a/src/d/d_meter2.cpp b/src/d/d_meter2.cpp index fc18aa7f42..be3159d462 100644 --- a/src/d/d_meter2.cpp +++ b/src/d/d_meter2.cpp @@ -2,6 +2,7 @@ #include "Z2AudioLib/Z2SeMgr/Z2SeMgr.h" #include "d/d_com/d_com_inf_game/d_com_inf_game.h" +#include "d/d_meter2/d_meter2_info/d_meter2_info.h" #include "global.h" #include "m_Do/m_Do_audio/m_Do_audio.h" @@ -204,7 +205,7 @@ extern u8 lbl_804549F0; extern u8 lbl_8042FAFC; extern u8 lbl_804549CC; extern u8 lbl_804549D8; -extern u8 lbl_80430188; +// extern u8 g_meter2_info; extern u8 lbl_8042EBC8; extern "C" { diff --git a/src/d/d_meter2/d_meter2_draw.cpp b/src/d/d_meter2/d_meter2_draw.cpp index ade8adb729..6f92d233dc 100644 --- a/src/d/d_meter2/d_meter2_draw.cpp +++ b/src/d/d_meter2/d_meter2_draw.cpp @@ -2,6 +2,7 @@ #include "Z2AudioLib/Z2SeMgr/Z2SeMgr.h" #include "d/d_com/d_com_inf_game/d_com_inf_game.h" +#include "d/d_meter2/d_meter2_info/d_meter2_info.h" #include "global.h" #include "m_Do/m_Do_audio/m_Do_audio.h" @@ -215,7 +216,7 @@ extern u8 lbl_803BF750; extern u8 lbl_804548B4; extern u8 lbl_80454960; extern u8 lbl_803A6F88; -extern u8 lbl_80430188; +// extern u8 g_meter2_info; extern u8 lbl_803A0004; extern "C" { diff --git a/src/d/d_meter2/d_meter2_info.cpp b/src/d/d_meter2/d_meter2_info.cpp index 0ba6e20921..c9a47f4693 100644 --- a/src/d/d_meter2/d_meter2_info.cpp +++ b/src/d/d_meter2/d_meter2_info.cpp @@ -1,6 +1,7 @@ /* d_meter2_info.cpp autogenerated by split.py v0.3 at 2021-01-02 00:19:27.098885 */ // #include "d/d_meter2/d_meter2_info/d_meter2_info.h" +#include "d/d_meter2/d_meter2_info/d_meter2_info.h" #include "d/d_com/d_com_inf_game/d_com_inf_game.h" #include "global.h" #include "msl_c/string.h" @@ -74,7 +75,7 @@ extern u8 lbl_804549A8; extern u8 lbl_804549A0; extern u8 lbl_804510B8; extern u8 lbl_804549AC; -extern u8 lbl_80430188; +// extern u8 g_meter2_info; extern u8 lbl_803AC5A0; extern u8 lbl_803A7288; diff --git a/src/d/d_save/d_save.cpp b/src/d/d_save/d_save.cpp index 23a3e0f621..391d412063 100644 --- a/src/d/d_save/d_save.cpp +++ b/src/d/d_save/d_save.cpp @@ -1,6 +1,7 @@ #include "d/d_save/d_save/d_save.h" #include "Z2AudioLib/Z2AudioMgr/Z2AudioMgr.h" #include "d/d_com/d_com_inf_game/d_com_inf_game.h" +#include "d/d_meter2/d_meter2_info/d_meter2_info.h" #include "d/d_save/d_save_init/d_save_init.h" #include "msl_c/string.h" #include "os/OS.h" @@ -46,7 +47,7 @@ extern f32 lbl_80451D58; extern char lbl_80379234[0x64]; extern f32 lbl_80451D5C; extern u8 i_item_lst[24]; -extern u8 lbl_80430188[16]; + struct unkEvent { // figure out what this is later u16 unk0[0x11A]; u8 unk565; diff --git a/src/f/f_op/f_op_msg_mng.cpp b/src/f/f_op/f_op_msg_mng.cpp index 40f3614a60..c96355fc81 100644 --- a/src/f/f_op/f_op_msg_mng.cpp +++ b/src/f/f_op/f_op_msg_mng.cpp @@ -2,6 +2,7 @@ #include "f/f_op/f_op_msg_mng.h" #include "d/d_com/d_com_inf_game/d_com_inf_game.h" +#include "d/d_meter2/d_meter2_info/d_meter2_info.h" #include "d/d_msg_object/d_msg_object.h" #include "f/f_op/f_op_scene_iter.h" #include "f/f_op/f_op_scene_mng.h" @@ -50,7 +51,6 @@ void fopMsgM_messageSet__FUlUl(void); void fopMsgM_setMessageID__FUi(void); void fopMsgM_setStageLayer__FPv(void); void fopMsgM_valueIncrease__FiiUc(void); -// void fopScnM_SearchByID(void); void fop_Timer_create__FsUcUlUcUcffffPFPv_i(void); void fpcEx_SearchByID__FUi(void); void fpcM_Delete__FPv(void); @@ -76,7 +76,6 @@ extern u8 lbl_80451C7C; extern u8 lbl_80451C80; extern u8 lbl_80451C84; extern u8 lbl_80451C88; -extern u8 lbl_80430188; #ifdef NON_MATCHING // 1 instruction off, needs alot of cleanup @@ -121,8 +120,6 @@ u32 fopMsgM_GetAppend(void* pProc) { return ((unk*)pProc)->field_0xac; } -// fopMsgM_Delete__FPv -// fopMsgM_Delete__FPv(void*) void fopMsgM_Delete(void* pProc) { fpcM_Delete(pProc); } @@ -192,15 +189,11 @@ asm void fopMsgM_messageSetDemo(u32) { #include "f/f_op/f_op_msg_mng/asm/func_8001FFC4.s" } -// fopMsgM_messageGet__FPcUl -// fopMsgM_messageGet__FPcUl(s8*, u32) -asm void fopMsgM_messageGet(char*, u32) { - nofralloc -#include "f/f_op/f_op_msg_mng/asm/func_800200C0.s" +char* fopMsgM_messageGet(char* pMsg, u32 param_2) { + g_meter2_info.getString(param_2, pMsg, 0); + return pMsg; } -// fopMsgM_setMessageID__FUi -// fopMsgM_setMessageID__FUi(unsigned int) void fopMsgM_setMessageID(unsigned int messageId) { i_msgID = messageId; } @@ -212,8 +205,6 @@ asm void fopMsgM_Create(s16, int (*)(void*), void*) { #include "f/f_op/f_op_msg_mng/asm/func_80020108.s" } -// setAlpha__7J2DPaneFUc -// J2DPane::setAlpha(u8) void J2DPane::setAlpha(u8 i_alpha) { this->mAlpha = i_alpha; }