diff --git a/asm/nonmatchings/code_135EE0/pause_badges_draw_contents.s b/asm/nonmatchings/code_135EE0/pause_badges_draw_contents.s index c8057bab5d..78ef3a0ee8 100644 --- a/asm/nonmatchings/code_135EE0/pause_badges_draw_contents.s +++ b/asm/nonmatchings/code_135EE0/pause_badges_draw_contents.s @@ -6,8 +6,8 @@ glabel pause_badges_draw_contents /* 13A84C 8024750C 240A0001 */ addiu $t2, $zero, 1 /* 13A850 80247510 3C028027 */ lui $v0, 0x8027 /* 13A854 80247514 8C420280 */ lw $v0, 0x280($v0) -/* 13A858 80247518 3C038027 */ lui $v1, 0x8027 -/* 13A85C 8024751C 24630288 */ addiu $v1, $v1, 0x288 +/* 13A858 80247518 3C038027 */ lui $v1, %hi(gBadgeMenuPages) +/* 13A85C 8024751C 24630288 */ addiu $v1, $v1, %lo(gBadgeMenuPages) /* 13A860 80247520 AFBF00BC */ sw $ra, 0xbc($sp) /* 13A864 80247524 AFBE00B8 */ sw $fp, 0xb8($sp) /* 13A868 80247528 AFB700B4 */ sw $s7, 0xb4($sp) @@ -187,8 +187,8 @@ glabel pause_badges_draw_contents /* 13AB04 802477C4 AFA00050 */ sw $zero, 0x50($sp) .L802477C8: /* 13AB08 802477C8 8FAB0050 */ lw $t3, 0x50($sp) -/* 13AB0C 802477CC 3C028027 */ lui $v0, 0x8027 -/* 13AB10 802477D0 24420288 */ addiu $v0, $v0, 0x288 +/* 13AB0C 802477CC 3C028027 */ lui $v0, %hi(gBadgeMenuPages) +/* 13AB10 802477D0 24420288 */ addiu $v0, $v0, %lo(gBadgeMenuPages) /* 13AB14 802477D4 000B1840 */ sll $v1, $t3, 1 /* 13AB18 802477D8 006B1821 */ addu $v1, $v1, $t3 /* 13AB1C 802477DC 00031880 */ sll $v1, $v1, 2 @@ -967,9 +967,9 @@ glabel pause_badges_draw_contents /* 13B684 80248344 00021840 */ sll $v1, $v0, 1 /* 13B688 80248348 00621821 */ addu $v1, $v1, $v0 /* 13B68C 8024834C 00031880 */ sll $v1, $v1, 2 -/* 13B690 80248350 3C028027 */ lui $v0, 0x8027 +/* 13B690 80248350 3C028027 */ lui $v0, %hi(gBadgeMenuPages) /* 13B694 80248354 00431021 */ addu $v0, $v0, $v1 -/* 13B698 80248358 90420288 */ lbu $v0, 0x288($v0) +/* 13B698 80248358 90420288 */ lbu $v0, %lo(gBadgeMenuPages)($v0) /* 13B69C 8024835C 1040000C */ beqz $v0, .L80248390 /* 13B6A0 80248360 00000000 */ nop /* 13B6A4 80248364 3C108027 */ lui $s0, 0x8027 @@ -1481,8 +1481,8 @@ glabel pause_badges_draw_contents /* 13BE30 80248AF0 3C118027 */ lui $s1, 0x8027 /* 13BE34 80248AF4 26310280 */ addiu $s1, $s1, 0x280 /* 13BE38 80248AF8 8E240000 */ lw $a0, ($s1) -/* 13BE3C 80248AFC 3C128027 */ lui $s2, 0x8027 -/* 13BE40 80248B00 26520288 */ addiu $s2, $s2, 0x288 +/* 13BE3C 80248AFC 3C128027 */ lui $s2, %hi(gBadgeMenuPages) +/* 13BE40 80248B00 26520288 */ addiu $s2, $s2, %lo(gBadgeMenuPages) /* 13BE44 80248B04 00041040 */ sll $v0, $a0, 1 /* 13BE48 80248B08 00441021 */ addu $v0, $v0, $a0 /* 13BE4C 80248B0C 00021080 */ sll $v0, $v0, 2 diff --git a/asm/nonmatchings/code_135EE0/pause_badges_get_pos_y.s b/asm/nonmatchings/code_135EE0/pause_badges_get_pos_y.s index a87b92a026..64c9d805a5 100644 --- a/asm/nonmatchings/code_135EE0/pause_badges_get_pos_y.s +++ b/asm/nonmatchings/code_135EE0/pause_badges_get_pos_y.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel pause_badges_get_pos_y -/* 13A4A8 80247168 3C028027 */ lui $v0, 0x8027 -/* 13A4AC 8024716C 24420288 */ addiu $v0, $v0, 0x288 +/* 13A4A8 80247168 3C028027 */ lui $v0, %hi(gBadgeMenuPages) +/* 13A4AC 8024716C 24420288 */ addiu $v0, $v0, %lo(gBadgeMenuPages) /* 13A4B0 80247170 00041840 */ sll $v1, $a0, 1 /* 13A4B4 80247174 00641821 */ addu $v1, $v1, $a0 /* 13A4B8 80247178 00031880 */ sll $v1, $v1, 2 diff --git a/asm/nonmatchings/code_135EE0/pause_badges_get_row.s b/asm/nonmatchings/code_135EE0/pause_badges_get_row.s index b5310adf95..cc5019da62 100644 --- a/asm/nonmatchings/code_135EE0/pause_badges_get_row.s +++ b/asm/nonmatchings/code_135EE0/pause_badges_get_row.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel pause_badges_get_row -/* 13A560 80247220 3C038027 */ lui $v1, 0x8027 -/* 13A564 80247224 24630288 */ addiu $v1, $v1, 0x288 +/* 13A560 80247220 3C038027 */ lui $v1, %hi(gBadgeMenuPages) +/* 13A564 80247224 24630288 */ addiu $v1, $v1, %lo(gBadgeMenuPages) /* 13A568 80247228 00041040 */ sll $v0, $a0, 1 /* 13A56C 8024722C 00441021 */ addu $v0, $v0, $a0 /* 13A570 80247230 00021080 */ sll $v0, $v0, 2 diff --git a/asm/nonmatchings/code_135EE0/pause_badges_handle_input.s b/asm/nonmatchings/code_135EE0/pause_badges_handle_input.s index c26ba78cc6..79fa4d49bc 100644 --- a/asm/nonmatchings/code_135EE0/pause_badges_handle_input.s +++ b/asm/nonmatchings/code_135EE0/pause_badges_handle_input.s @@ -201,8 +201,8 @@ glabel pause_badges_handle_input /* 13C6B0 80249370 3C068027 */ lui $a2, 0x8027 /* 13C6B4 80249374 24C60280 */ addiu $a2, $a2, 0x280 /* 13C6B8 80249378 8CC40000 */ lw $a0, ($a2) -/* 13C6BC 8024937C 3C078027 */ lui $a3, 0x8027 -/* 13C6C0 80249380 24E70288 */ addiu $a3, $a3, 0x288 +/* 13C6BC 8024937C 3C078027 */ lui $a3, %hi(gBadgeMenuPages) +/* 13C6C0 80249380 24E70288 */ addiu $a3, $a3, %lo(gBadgeMenuPages) /* 13C6C4 80249384 00041040 */ sll $v0, $a0, 1 /* 13C6C8 80249388 00441021 */ addu $v0, $v0, $a0 /* 13C6CC 8024938C 00021080 */ sll $v0, $v0, 2 @@ -229,8 +229,8 @@ glabel pause_badges_handle_input /* 13C71C 802493DC 3C068027 */ lui $a2, 0x8027 /* 13C720 802493E0 24C60280 */ addiu $a2, $a2, 0x280 /* 13C724 802493E4 8CC70000 */ lw $a3, ($a2) -/* 13C728 802493E8 3C048027 */ lui $a0, 0x8027 -/* 13C72C 802493EC 24840288 */ addiu $a0, $a0, 0x288 +/* 13C728 802493E8 3C048027 */ lui $a0, %hi(gBadgeMenuPages) +/* 13C72C 802493EC 24840288 */ addiu $a0, $a0, %lo(gBadgeMenuPages) /* 13C730 802493F0 24E30001 */ addiu $v1, $a3, 1 /* 13C734 802493F4 00031040 */ sll $v0, $v1, 1 /* 13C738 802493F8 00431021 */ addu $v0, $v0, $v1 diff --git a/asm/nonmatchings/code_135EE0/pause_badges_load_badges.s b/asm/nonmatchings/code_135EE0/pause_badges_load_badges.s index 999381cb60..b4b5c071d1 100644 --- a/asm/nonmatchings/code_135EE0/pause_badges_load_badges.s +++ b/asm/nonmatchings/code_135EE0/pause_badges_load_badges.s @@ -76,8 +76,8 @@ glabel pause_badges_load_badges /* 13C1C8 80248E88 1440FFFC */ bnez $v0, .L80248E7C /* 13C1CC 80248E8C 24630002 */ addiu $v1, $v1, 2 .L80248E90: -/* 13C1D0 80248E90 3C058027 */ lui $a1, 0x8027 -/* 13C1D4 80248E94 24A50288 */ addiu $a1, $a1, 0x288 +/* 13C1D0 80248E90 3C058027 */ lui $a1, %hi(gBadgeMenuPages) +/* 13C1D4 80248E94 24A50288 */ addiu $a1, $a1, %lo(gBadgeMenuPages) /* 13C1D8 80248E98 0000202D */ daddu $a0, $zero, $zero /* 13C1DC 80248E9C 3C078027 */ lui $a3, 0x8027 /* 13C1E0 80248EA0 24E70384 */ addiu $a3, $a3, 0x384 diff --git a/asm/nonmatchings/code_135EE0/pause_badges_update.s b/asm/nonmatchings/code_135EE0/pause_badges_update.s index 9b32fddcaf..77faa596ef 100644 --- a/asm/nonmatchings/code_135EE0/pause_badges_update.s +++ b/asm/nonmatchings/code_135EE0/pause_badges_update.s @@ -5,8 +5,8 @@ glabel pause_badges_update /* 13C95C 8024961C 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 13C960 80249620 3C038027 */ lui $v1, 0x8027 /* 13C964 80249624 8C630280 */ lw $v1, 0x280($v1) -/* 13C968 80249628 3C048027 */ lui $a0, 0x8027 -/* 13C96C 8024962C 24840288 */ addiu $a0, $a0, 0x288 +/* 13C968 80249628 3C048027 */ lui $a0, %hi(gBadgeMenuPages) +/* 13C96C 8024962C 24840288 */ addiu $a0, $a0, %lo(gBadgeMenuPages) /* 13C970 80249630 AFBF0014 */ sw $ra, 0x14($sp) /* 13C974 80249634 AFB00010 */ sw $s0, 0x10($sp) /* 13C978 80249638 00031040 */ sll $v0, $v1, 1 diff --git a/asm/nonmatchings/code_13CAF0/pause_items_draw_contents.s b/asm/nonmatchings/code_13CAF0/pause_items_draw_contents.s index 4c62abbdaf..b06757b1a4 100644 --- a/asm/nonmatchings/code_13CAF0/pause_items_draw_contents.s +++ b/asm/nonmatchings/code_13CAF0/pause_items_draw_contents.s @@ -74,8 +74,8 @@ glabel pause_items_draw_contents /* 13CDBC 80249A7C AFAA005C */ sw $t2, 0x5c($sp) /* 13CDC0 80249A80 0C03D4B8 */ jal draw_box /* 13CDC4 80249A84 AFAB0058 */ sw $t3, 0x58($sp) -/* 13CDC8 80249A88 3C108027 */ lui $s0, 0x8027 -/* 13CDCC 80249A8C 261004D0 */ addiu $s0, $s0, 0x4d0 +/* 13CDC8 80249A88 3C108027 */ lui $s0, %hi(gPauseItemPages) +/* 13CDCC 80249A8C 261004D0 */ addiu $s0, $s0, %lo(gPauseItemPages) /* 13CDD0 80249A90 8FAB00B0 */ lw $t3, 0xb0($sp) /* 13CDD4 80249A94 8FAA00AC */ lw $t2, 0xac($sp) /* 13CDD8 80249A98 25660007 */ addiu $a2, $t3, 7 @@ -169,8 +169,8 @@ glabel pause_items_draw_contents /* 13CF28 80249BE8 ACA20004 */ sw $v0, 4($a1) .L80249BEC: /* 13CF2C 80249BEC 0000F02D */ daddu $fp, $zero, $zero -/* 13CF30 80249BF0 3C0B8027 */ lui $t3, 0x8027 -/* 13CF34 80249BF4 256B04D0 */ addiu $t3, $t3, 0x4d0 +/* 13CF30 80249BF0 3C0B8027 */ lui $t3, %hi(gPauseItemPages) +/* 13CF34 80249BF4 256B04D0 */ addiu $t3, $t3, %lo(gPauseItemPages) /* 13CF38 80249BF8 AFAB007C */ sw $t3, 0x7c($sp) .L80249BFC: /* 13CF3C 80249BFC 8FAA007C */ lw $t2, 0x7c($sp) @@ -541,9 +541,9 @@ glabel pause_items_draw_contents /* 13D4A0 8024A160 00021840 */ sll $v1, $v0, 1 /* 13D4A4 8024A164 00621821 */ addu $v1, $v1, $v0 /* 13D4A8 8024A168 00031880 */ sll $v1, $v1, 2 -/* 13D4AC 8024A16C 3C028027 */ lui $v0, 0x8027 +/* 13D4AC 8024A16C 3C028027 */ lui $v0, %hi(gPauseItemPages) /* 13D4B0 8024A170 00431021 */ addu $v0, $v0, $v1 -/* 13D4B4 8024A174 904204D0 */ lbu $v0, 0x4d0($v0) +/* 13D4B4 8024A174 904204D0 */ lbu $v0, %lo(gPauseItemPages)($v0) /* 13D4B8 8024A178 1040000C */ beqz $v0, .L8024A1AC /* 13D4BC 8024A17C 00000000 */ nop /* 13D4C0 8024A180 3C108027 */ lui $s0, 0x8027 @@ -698,8 +698,8 @@ glabel pause_items_draw_contents /* 13D6E4 8024A3A4 3C118027 */ lui $s1, 0x8027 /* 13D6E8 8024A3A8 263104C8 */ addiu $s1, $s1, 0x4c8 /* 13D6EC 8024A3AC 8E240000 */ lw $a0, ($s1) -/* 13D6F0 8024A3B0 3C128027 */ lui $s2, 0x8027 -/* 13D6F4 8024A3B4 265204D0 */ addiu $s2, $s2, 0x4d0 +/* 13D6F0 8024A3B0 3C128027 */ lui $s2, %hi(gPauseItemPages) +/* 13D6F4 8024A3B4 265204D0 */ addiu $s2, $s2, %lo(gPauseItemPages) /* 13D6F8 8024A3B8 00041040 */ sll $v0, $a0, 1 /* 13D6FC 8024A3BC 00441021 */ addu $v0, $v0, $a0 /* 13D700 8024A3C0 00021080 */ sll $v0, $v0, 2 diff --git a/asm/nonmatchings/code_13CAF0/pause_items_get_pos_y.s b/asm/nonmatchings/code_13CAF0/pause_items_get_pos_y.s index ecf4885fbb..1489add115 100644 --- a/asm/nonmatchings/code_13CAF0/pause_items_get_pos_y.s +++ b/asm/nonmatchings/code_13CAF0/pause_items_get_pos_y.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel pause_items_get_pos_y -/* 13CB68 80249828 3C028027 */ lui $v0, 0x8027 -/* 13CB6C 8024982C 244204D0 */ addiu $v0, $v0, 0x4d0 +/* 13CB68 80249828 3C028027 */ lui $v0, %hi(gPauseItemPages) +/* 13CB6C 8024982C 244204D0 */ addiu $v0, $v0, %lo(gPauseItemPages) /* 13CB70 80249830 00041840 */ sll $v1, $a0, 1 /* 13CB74 80249834 00641821 */ addu $v1, $v1, $a0 /* 13CB78 80249838 00031880 */ sll $v1, $v1, 2 diff --git a/asm/nonmatchings/code_13CAF0/pause_items_get_row.s b/asm/nonmatchings/code_13CAF0/pause_items_get_row.s index 7eb6613add..07afba9d65 100644 --- a/asm/nonmatchings/code_13CAF0/pause_items_get_row.s +++ b/asm/nonmatchings/code_13CAF0/pause_items_get_row.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel pause_items_get_row -/* 13CC20 802498E0 3C038027 */ lui $v1, 0x8027 -/* 13CC24 802498E4 246304D0 */ addiu $v1, $v1, 0x4d0 +/* 13CC20 802498E0 3C038027 */ lui $v1, %hi(gPauseItemPages) +/* 13CC24 802498E4 246304D0 */ addiu $v1, $v1, %lo(gPauseItemPages) /* 13CC28 802498E8 00041040 */ sll $v0, $a0, 1 /* 13CC2C 802498EC 00441021 */ addu $v0, $v0, $a0 /* 13CC30 802498F0 00021080 */ sll $v0, $v0, 2 diff --git a/asm/nonmatchings/code_13CAF0/pause_items_handle_input.s b/asm/nonmatchings/code_13CAF0/pause_items_handle_input.s index 99608f669f..48dfc5c8ac 100644 --- a/asm/nonmatchings/code_13CAF0/pause_items_handle_input.s +++ b/asm/nonmatchings/code_13CAF0/pause_items_handle_input.s @@ -141,8 +141,8 @@ glabel pause_items_handle_input /* 13DD10 8024A9D0 3C068027 */ lui $a2, 0x8027 /* 13DD14 8024A9D4 24C604C8 */ addiu $a2, $a2, 0x4c8 /* 13DD18 8024A9D8 8CC40000 */ lw $a0, ($a2) -/* 13DD1C 8024A9DC 3C078027 */ lui $a3, 0x8027 -/* 13DD20 8024A9E0 24E704D0 */ addiu $a3, $a3, 0x4d0 +/* 13DD1C 8024A9DC 3C078027 */ lui $a3, %hi(gPauseItemPages) +/* 13DD20 8024A9E0 24E704D0 */ addiu $a3, $a3, %lo(gPauseItemPages) /* 13DD24 8024A9E4 00041040 */ sll $v0, $a0, 1 /* 13DD28 8024A9E8 00441021 */ addu $v0, $v0, $a0 /* 13DD2C 8024A9EC 00021080 */ sll $v0, $v0, 2 @@ -169,8 +169,8 @@ glabel pause_items_handle_input /* 13DD7C 8024AA3C 3C068027 */ lui $a2, 0x8027 /* 13DD80 8024AA40 24C604C8 */ addiu $a2, $a2, 0x4c8 /* 13DD84 8024AA44 8CC70000 */ lw $a3, ($a2) -/* 13DD88 8024AA48 3C048027 */ lui $a0, 0x8027 -/* 13DD8C 8024AA4C 248404D0 */ addiu $a0, $a0, 0x4d0 +/* 13DD88 8024AA48 3C048027 */ lui $a0, %hi(gPauseItemPages) +/* 13DD8C 8024AA4C 248404D0 */ addiu $a0, $a0, %lo(gPauseItemPages) /* 13DD90 8024AA50 24E30001 */ addiu $v1, $a3, 1 /* 13DD94 8024AA54 00031040 */ sll $v0, $v1, 1 /* 13DD98 8024AA58 00431021 */ addu $v0, $v0, $v1 diff --git a/asm/nonmatchings/code_13CAF0/pause_items_load_items.s b/asm/nonmatchings/code_13CAF0/pause_items_load_items.s index e89c3d6663..d25ce4eb6c 100644 --- a/asm/nonmatchings/code_13CAF0/pause_items_load_items.s +++ b/asm/nonmatchings/code_13CAF0/pause_items_load_items.s @@ -79,8 +79,8 @@ glabel pause_items_load_items /* 13D920 8024A5E0 1440FFFC */ bnez $v0, .L8024A5D4 /* 13D924 8024A5E4 24630002 */ addiu $v1, $v1, 2 .L8024A5E8: -/* 13D928 8024A5E8 3C058027 */ lui $a1, 0x8027 -/* 13D92C 8024A5EC 24A504D0 */ addiu $a1, $a1, 0x4d0 +/* 13D928 8024A5E8 3C058027 */ lui $a1, %hi(gPauseItemPages) +/* 13D92C 8024A5EC 24A504D0 */ addiu $a1, $a1, %lo(gPauseItemPages) /* 13D930 8024A5F0 0000202D */ daddu $a0, $zero, $zero /* 13D934 8024A5F4 3C078027 */ lui $a3, 0x8027 /* 13D938 8024A5F8 24E705CC */ addiu $a3, $a3, 0x5cc diff --git a/asm/nonmatchings/code_13CAF0/pause_items_update.s b/asm/nonmatchings/code_13CAF0/pause_items_update.s index 0784b03337..5e71100e51 100644 --- a/asm/nonmatchings/code_13CAF0/pause_items_update.s +++ b/asm/nonmatchings/code_13CAF0/pause_items_update.s @@ -5,8 +5,8 @@ glabel pause_items_update /* 13DF94 8024AC54 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 13DF98 8024AC58 3C038027 */ lui $v1, 0x8027 /* 13DF9C 8024AC5C 8C6304C8 */ lw $v1, 0x4c8($v1) -/* 13DFA0 8024AC60 3C048027 */ lui $a0, 0x8027 -/* 13DFA4 8024AC64 248404D0 */ addiu $a0, $a0, 0x4d0 +/* 13DFA0 8024AC60 3C048027 */ lui $a0, %hi(gPauseItemPages) +/* 13DFA4 8024AC64 248404D0 */ addiu $a0, $a0, %lo(gPauseItemPages) /* 13DFA8 8024AC68 AFBF0014 */ sw $ra, 0x14($sp) /* 13DFAC 8024AC6C AFB00010 */ sw $s0, 0x10($sp) /* 13DFB0 8024AC70 00031040 */ sll $v0, $v1, 1