From af1a04b44002932e2764acca0fe1bf0ea1e38662 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Thu, 12 Nov 2020 00:32:25 -0500 Subject: [PATCH] pause item syms --- .../code_138CC0/pause_badges_cleanup.s | 4 +- .../code_138CC0/pause_badges_draw_contents.s | 48 +++++----- .../code_138CC0/pause_badges_handle_input.s | 36 ++++---- .../code_138CC0/pause_badges_init.s | 16 ++-- .../code_138CC0/pause_badges_load_badges.s | 4 +- .../code_13CAF0/pause_items_draw_contents.s | 72 +++++++-------- .../code_13CAF0/pause_items_get_pos_y.s | 4 +- .../code_13CAF0/pause_items_get_row.s | 4 +- .../code_13CAF0/pause_items_handle_input.s | 92 +++++++++---------- .../code_13CAF0/pause_items_init.s | 8 +- .../code_13CAF0/pause_items_is_visible.s | 4 +- .../code_13CAF0/pause_items_load_items.s | 60 ++++++------ .../code_13CAF0/pause_items_scroll_offset_y.s | 4 +- .../code_13CAF0/pause_items_update.s | 40 ++++---- .../code_13E120/pause_partners_cleanup.s | 8 +- include/variables.h | 16 +++- undefined_syms.txt | 14 ++- 17 files changed, 230 insertions(+), 204 deletions(-) diff --git a/asm/nonmatchings/code_138CC0/pause_badges_cleanup.s b/asm/nonmatchings/code_138CC0/pause_badges_cleanup.s index 822fa55d64..2bae2f6b40 100644 --- a/asm/nonmatchings/code_138CC0/pause_badges_cleanup.s +++ b/asm/nonmatchings/code_138CC0/pause_badges_cleanup.s @@ -6,8 +6,8 @@ glabel pause_badges_cleanup /* 13CA9C 8024975C AFB10014 */ sw $s1, 0x14($sp) /* 13CAA0 80249760 0000882D */ daddu $s1, $zero, $zero /* 13CAA4 80249764 AFB00010 */ sw $s0, 0x10($sp) -/* 13CAA8 80249768 3C108027 */ lui $s0, 0x8027 -/* 13CAAC 8024976C 261003A8 */ addiu $s0, $s0, 0x3a8 +/* 13CAA8 80249768 3C108027 */ lui $s0, %hi(D_802703A8) +/* 13CAAC 8024976C 261003A8 */ addiu $s0, $s0, %lo(D_802703A8) /* 13CAB0 80249770 AFBF0018 */ sw $ra, 0x18($sp) .L80249774: /* 13CAB4 80249774 8E040000 */ lw $a0, ($s0) diff --git a/asm/nonmatchings/code_138CC0/pause_badges_draw_contents.s b/asm/nonmatchings/code_138CC0/pause_badges_draw_contents.s index 3dd1a70d41..ddfc870904 100644 --- a/asm/nonmatchings/code_138CC0/pause_badges_draw_contents.s +++ b/asm/nonmatchings/code_138CC0/pause_badges_draw_contents.s @@ -80,8 +80,8 @@ glabel pause_badges_draw_contents /* 13A96C 8024762C AFAA0060 */ sw $t2, 0x60($sp) /* 13A970 80247630 0C03D4B8 */ jal draw_box /* 13A974 80247634 AFAB005C */ sw $t3, 0x5c($sp) -/* 13A978 80247638 3C108027 */ lui $s0, 0x8027 -/* 13A97C 8024763C 261003A8 */ addiu $s0, $s0, 0x3a8 +/* 13A978 80247638 3C108027 */ lui $s0, %hi(D_802703A8) +/* 13A97C 8024763C 261003A8 */ addiu $s0, $s0, %lo(D_802703A8) /* 13A980 80247640 8FAA00C4 */ lw $t2, 0xc4($sp) /* 13A984 80247644 8E040050 */ lw $a0, 0x50($s0) /* 13A988 80247648 8FAB00C8 */ lw $t3, 0xc8($sp) @@ -253,8 +253,8 @@ glabel pause_badges_draw_contents /* 13ABFC 802478BC 24020002 */ addiu $v0, $zero, 2 /* 13AC00 802478C0 14620029 */ bne $v1, $v0, .L80247968 /* 13AC04 802478C4 24020001 */ addiu $v0, $zero, 1 -/* 13AC08 802478C8 3C038027 */ lui $v1, 0x8027 -/* 13AC0C 802478CC 8C630398 */ lw $v1, 0x398($v1) +/* 13AC08 802478C8 3C038027 */ lui $v1, %hi(gBadgeMenuLevel) +/* 13AC0C 802478CC 8C630398 */ lw $v1, %lo(gBadgeMenuLevel)($v1) /* 13AC10 802478D0 14620025 */ bne $v1, $v0, .L80247968 /* 13AC14 802478D4 00000000 */ nop /* 13AC18 802478D8 8FA40050 */ lw $a0, 0x50($sp) @@ -486,8 +486,8 @@ glabel pause_badges_draw_contents /* 13AF70 80247C30 3C052000 */ lui $a1, 0x2000 /* 13AF74 80247C34 8FAA0058 */ lw $t2, 0x58($sp) /* 13AF78 80247C38 000A1080 */ sll $v0, $t2, 2 -/* 13AF7C 80247C3C 3C0B8027 */ lui $t3, 0x8027 -/* 13AF80 80247C40 256B03A8 */ addiu $t3, $t3, 0x3a8 +/* 13AF7C 80247C3C 3C0B8027 */ lui $t3, %hi(D_802703A8) +/* 13AF80 80247C40 256B03A8 */ addiu $t3, $t3, %lo(D_802703A8) /* 13AF84 80247C44 004B1021 */ addu $v0, $v0, $t3 /* 13AF88 80247C48 8C510000 */ lw $s1, ($v0) /* 13AF8C 80247C4C 0C05128B */ jal clear_icon_flags @@ -941,8 +941,8 @@ glabel pause_badges_draw_contents /* 13B620 802482E0 24020002 */ addiu $v0, $zero, 2 /* 13B624 802482E4 1462002A */ bne $v1, $v0, .L80248390 /* 13B628 802482E8 24020001 */ addiu $v0, $zero, 1 -/* 13B62C 802482EC 3C038027 */ lui $v1, 0x8027 -/* 13B630 802482F0 8C630398 */ lw $v1, 0x398($v1) +/* 13B62C 802482EC 3C038027 */ lui $v1, %hi(gBadgeMenuLevel) +/* 13B630 802482F0 8C630398 */ lw $v1, %lo(gBadgeMenuLevel)($v1) /* 13B634 802482F4 14620026 */ bne $v1, $v0, .L80248390 /* 13B638 802482F8 00000000 */ nop /* 13B63C 802482FC 3C118027 */ lui $s1, %hi(gBadgeMenuCurrentPage) @@ -950,8 +950,8 @@ glabel pause_badges_draw_contents /* 13B644 80248304 8E220000 */ lw $v0, ($s1) /* 13B648 80248308 1840000E */ blez $v0, .L80248344 /* 13B64C 8024830C 24420001 */ addiu $v0, $v0, 1 -/* 13B650 80248310 3C108027 */ lui $s0, 0x8027 -/* 13B654 80248314 261003A8 */ addiu $s0, $s0, 0x3a8 +/* 13B650 80248310 3C108027 */ lui $s0, %hi(D_802703A8) +/* 13B654 80248314 261003A8 */ addiu $s0, $s0, %lo(D_802703A8) /* 13B658 80248318 8FAB00C4 */ lw $t3, 0xc4($sp) /* 13B65C 8024831C 8E040044 */ lw $a0, 0x44($s0) /* 13B660 80248320 8FAA00C8 */ lw $t2, 0xc8($sp) @@ -972,8 +972,8 @@ glabel pause_badges_draw_contents /* 13B698 80248358 90420288 */ lbu $v0, %lo(gBadgeMenuPages)($v0) /* 13B69C 8024835C 1040000C */ beqz $v0, .L80248390 /* 13B6A0 80248360 00000000 */ nop -/* 13B6A4 80248364 3C108027 */ lui $s0, 0x8027 -/* 13B6A8 80248368 261003A8 */ addiu $s0, $s0, 0x3a8 +/* 13B6A4 80248364 3C108027 */ lui $s0, %hi(D_802703A8) +/* 13B6A8 80248368 261003A8 */ addiu $s0, $s0, %lo(D_802703A8) /* 13B6AC 8024836C 8FAB00C4 */ lw $t3, 0xc4($sp) /* 13B6B0 80248370 8E040048 */ lw $a0, 0x48($s0) /* 13B6B4 80248374 8FAA00C8 */ lw $t2, 0xc8($sp) @@ -984,8 +984,8 @@ glabel pause_badges_draw_contents /* 13B6C8 80248388 0C0511F8 */ jal draw_icon_2 /* 13B6CC 8024838C 00000000 */ nop .L80248390: -/* 13B6D0 80248390 3C108027 */ lui $s0, 0x8027 -/* 13B6D4 80248394 261003A8 */ addiu $s0, $s0, 0x3a8 +/* 13B6D0 80248390 3C108027 */ lui $s0, %hi(D_802703A8) +/* 13B6D4 80248394 261003A8 */ addiu $s0, $s0, %lo(D_802703A8) /* 13B6D8 80248398 8FAB00C4 */ lw $t3, 0xc4($sp) /* 13B6DC 8024839C 8E040040 */ lw $a0, 0x40($s0) /* 13B6E0 802483A0 8FAA00C8 */ lw $t2, 0xc8($sp) @@ -1322,8 +1322,8 @@ glabel pause_badges_draw_contents /* 13BBE8 802488A8 3C02E700 */ lui $v0, 0xe700 /* 13BBEC 802488AC AC820000 */ sw $v0, ($a0) /* 13BBF0 802488B0 AC800004 */ sw $zero, 4($a0) -/* 13BBF4 802488B4 3C038027 */ lui $v1, 0x8027 -/* 13BBF8 802488B8 8C63039C */ lw $v1, 0x39c($v1) +/* 13BBF4 802488B4 3C038027 */ lui $v1, %hi(gBadgeMenuCurrentTab) +/* 13BBF8 802488B8 8C63039C */ lw $v1, %lo(gBadgeMenuCurrentTab)($v1) /* 13BBFC 802488BC 8FA600C4 */ lw $a2, 0xc4($sp) /* 13BC00 802488C0 50600001 */ beql $v1, $zero, .L802488C8 /* 13BC04 802488C4 24C60009 */ addiu $a2, $a2, 9 @@ -1364,8 +1364,8 @@ glabel pause_badges_draw_contents /* 13BC84 80248944 AFA0004C */ sw $zero, 0x4c($sp) /* 13BC88 80248948 0C093BA0 */ jal pause_get_menu_string /* 13BC8C 8024894C 24040047 */ addiu $a0, $zero, 0x47 -/* 13BC90 80248950 3C118027 */ lui $s1, 0x8027 -/* 13BC94 80248954 2631039C */ addiu $s1, $s1, 0x39c +/* 13BC90 80248950 3C118027 */ lui $s1, %hi(gBadgeMenuCurrentTab) +/* 13BC94 80248954 2631039C */ addiu $s1, $s1, %lo(gBadgeMenuCurrentTab) /* 13BC98 80248958 8FAB00C4 */ lw $t3, 0xc4($sp) /* 13BC9C 8024895C 8E230000 */ lw $v1, ($s1) /* 13BCA0 80248960 14600002 */ bnez $v1, .L8024896C @@ -1423,8 +1423,8 @@ glabel pause_badges_draw_contents /* 13BD5C 80248A1C AFA0004C */ sw $zero, 0x4c($sp) /* 13BD60 80248A20 0C093BA0 */ jal pause_get_menu_string /* 13BD64 80248A24 24040048 */ addiu $a0, $zero, 0x48 -/* 13BD68 80248A28 3C118027 */ lui $s1, 0x8027 -/* 13BD6C 80248A2C 2631039C */ addiu $s1, $s1, 0x39c +/* 13BD68 80248A28 3C118027 */ lui $s1, %hi(gBadgeMenuCurrentTab) +/* 13BD6C 80248A2C 2631039C */ addiu $s1, $s1, %lo(gBadgeMenuCurrentTab) /* 13BD70 80248A30 24100001 */ addiu $s0, $zero, 1 /* 13BD74 80248A34 8FAA00C4 */ lw $t2, 0xc4($sp) /* 13BD78 80248A38 8E230000 */ lw $v1, ($s1) @@ -1465,8 +1465,8 @@ glabel pause_badges_draw_contents /* 13BDF4 80248AB4 24020002 */ addiu $v0, $zero, 2 /* 13BDF8 80248AB8 14620050 */ bne $v1, $v0, .L80248BFC /* 13BDFC 80248ABC 00000000 */ nop -/* 13BE00 80248AC0 3C028027 */ lui $v0, 0x8027 -/* 13BE04 80248AC4 8C420398 */ lw $v0, 0x398($v0) +/* 13BE00 80248AC0 3C028027 */ lui $v0, %hi(gBadgeMenuLevel) +/* 13BE04 80248AC4 8C420398 */ lw $v0, %lo(gBadgeMenuLevel)($v0) /* 13BE08 80248AC8 14400009 */ bnez $v0, .L80248AF0 /* 13BE0C 80248ACC 24040020 */ addiu $a0, $zero, 0x20 /* 13BE10 80248AD0 8E260000 */ lw $a2, ($s1) @@ -1550,8 +1550,8 @@ glabel pause_badges_draw_contents /* 13BF34 80248BF4 0C090B41 */ jal func_80242D04 /* 13BF38 80248BF8 00000000 */ nop .L80248BFC: -/* 13BF3C 80248BFC 3C108027 */ lui $s0, 0x8027 -/* 13BF40 80248C00 261003A0 */ addiu $s0, $s0, 0x3a0 +/* 13BF3C 80248BFC 3C108027 */ lui $s0, %hi(gBadgeMenuBShowNotEnoughBP) +/* 13BF40 80248C00 261003A0 */ addiu $s0, $s0, %lo(gBadgeMenuBShowNotEnoughBP) /* 13BF44 80248C04 8E020000 */ lw $v0, ($s0) /* 13BF48 80248C08 10400054 */ beqz $v0, .L80248D5C /* 13BF4C 80248C0C 00000000 */ nop diff --git a/asm/nonmatchings/code_138CC0/pause_badges_handle_input.s b/asm/nonmatchings/code_138CC0/pause_badges_handle_input.s index 79b3ac964b..41f546e5e5 100644 --- a/asm/nonmatchings/code_138CC0/pause_badges_handle_input.s +++ b/asm/nonmatchings/code_138CC0/pause_badges_handle_input.s @@ -35,16 +35,16 @@ glabel pause_badges_handle_input /* 13C458 80249118 30628000 */ andi $v0, $v1, 0x8000 /* 13C45C 8024911C 1040003F */ beqz $v0, .L8024921C /* 13C460 80249120 00000000 */ nop -/* 13C464 80249124 3C128027 */ lui $s2, 0x8027 -/* 13C468 80249128 265203A0 */ addiu $s2, $s2, 0x3a0 +/* 13C464 80249124 3C128027 */ lui $s2, %hi(gBadgeMenuBShowNotEnoughBP) +/* 13C468 80249128 265203A0 */ addiu $s2, $s2, %lo(gBadgeMenuBShowNotEnoughBP) /* 13C46C 8024912C 8E420000 */ lw $v0, ($s2) /* 13C470 80249130 10400003 */ beqz $v0, .L80249140 /* 13C474 80249134 00000000 */ nop /* 13C478 80249138 08092581 */ j .L80249604 /* 13C47C 8024913C AE400000 */ sw $zero, ($s2) .L80249140: -/* 13C480 80249140 3C048027 */ lui $a0, 0x8027 -/* 13C484 80249144 24840398 */ addiu $a0, $a0, 0x398 +/* 13C480 80249140 3C048027 */ lui $a0, %hi(gBadgeMenuLevel) +/* 13C484 80249144 24840398 */ addiu $a0, $a0, %lo(gBadgeMenuLevel) /* 13C488 80249148 8C820000 */ lw $v0, ($a0) /* 13C48C 8024914C 14400010 */ bnez $v0, .L80249190 /* 13C490 80249150 00091040 */ sll $v0, $t1, 1 @@ -112,19 +112,19 @@ glabel pause_badges_handle_input /* 13C56C 8024922C 10400003 */ beqz $v0, .L8024923C /* 13C570 80249230 00000000 */ nop .L80249234: -/* 13C574 80249234 3C018027 */ lui $at, 0x8027 -/* 13C578 80249238 AC2003A0 */ sw $zero, 0x3a0($at) +/* 13C574 80249234 3C018027 */ lui $at, %hi(gBadgeMenuBShowNotEnoughBP) +/* 13C578 80249238 AC2003A0 */ sw $zero, %lo(gBadgeMenuBShowNotEnoughBP)($at) .L8024923C: /* 13C57C 8024923C 3C028027 */ lui $v0, %hi(gBadgeMenuNumItems) /* 13C580 80249240 84420384 */ lh $v0, %lo(gBadgeMenuNumItems)($v0) /* 13C584 80249244 104000B1 */ beqz $v0, .L8024950C /* 13C588 80249248 00000000 */ nop -/* 13C58C 8024924C 3C028027 */ lui $v0, 0x8027 -/* 13C590 80249250 8C420398 */ lw $v0, 0x398($v0) +/* 13C58C 8024924C 3C028027 */ lui $v0, %hi(gBadgeMenuLevel) +/* 13C590 80249250 8C420398 */ lw $v0, %lo(gBadgeMenuLevel)($v0) /* 13C594 80249254 14400015 */ bnez $v0, .L802492AC /* 13C598 80249258 3C020001 */ lui $v0, 1 -/* 13C59C 8024925C 3C108027 */ lui $s0, 0x8027 -/* 13C5A0 80249260 2610039C */ addiu $s0, $s0, 0x39c +/* 13C59C 8024925C 3C108027 */ lui $s0, %hi(gBadgeMenuCurrentTab) +/* 13C5A0 80249260 2610039C */ addiu $s0, $s0, %lo(gBadgeMenuCurrentTab) /* 13C5A4 80249264 3C028027 */ lui $v0, %hi(gPauseMenuHeldButtons) /* 13C5A8 80249268 8C4200C0 */ lw $v0, %lo(gPauseMenuHeldButtons)($v0) /* 13C5AC 8024926C 3C030003 */ lui $v1, 3 @@ -309,8 +309,8 @@ glabel pause_badges_handle_input /* 13C844 80249504 3C018027 */ lui $at, %hi(gBadgeMenuSelectedItemID) /* 13C848 80249508 AC220380 */ sw $v0, %lo(gBadgeMenuSelectedItemID)($at) .L8024950C: -/* 13C84C 8024950C 3C038027 */ lui $v1, 0x8027 -/* 13C850 80249510 8C630398 */ lw $v1, 0x398($v1) +/* 13C84C 8024950C 3C038027 */ lui $v1, %hi(gBadgeMenuLevel) +/* 13C850 80249510 8C630398 */ lw $v1, %lo(gBadgeMenuLevel)($v1) /* 13C854 80249514 24020001 */ addiu $v0, $zero, 1 /* 13C858 80249518 14620014 */ bne $v1, $v0, .L8024956C /* 13C85C 8024951C 00000000 */ nop @@ -335,8 +335,8 @@ glabel pause_badges_handle_input /* 13C8A4 80249564 08092564 */ j .L80249590 /* 13C8A8 80249568 00000000 */ nop .L8024956C: -/* 13C8AC 8024956C 3C028027 */ lui $v0, 0x8027 -/* 13C8B0 80249570 8C42039C */ lw $v0, 0x39c($v0) +/* 13C8AC 8024956C 3C028027 */ lui $v0, %hi(gBadgeMenuCurrentTab) +/* 13C8B0 80249570 8C42039C */ lw $v0, %lo(gBadgeMenuCurrentTab)($v0) /* 13C8B4 80249574 14400002 */ bnez $v0, .L80249580 /* 13C8B8 80249578 2404004D */ addiu $a0, $zero, 0x4d /* 13C8BC 8024957C 2404004C */ addiu $a0, $zero, 0x4c @@ -354,8 +354,8 @@ glabel pause_badges_handle_input /* 13C8E0 802495A0 30424000 */ andi $v0, $v0, 0x4000 /* 13C8E4 802495A4 10400017 */ beqz $v0, .L80249604 /* 13C8E8 802495A8 00000000 */ nop -/* 13C8EC 802495AC 3C108027 */ lui $s0, 0x8027 -/* 13C8F0 802495B0 26100398 */ addiu $s0, $s0, 0x398 +/* 13C8EC 802495AC 3C108027 */ lui $s0, %hi(gBadgeMenuLevel) +/* 13C8F0 802495B0 26100398 */ addiu $s0, $s0, %lo(gBadgeMenuLevel) /* 13C8F4 802495B4 8E020000 */ lw $v0, ($s0) /* 13C8F8 802495B8 14400007 */ bnez $v0, .L802495D8 /* 13C8FC 802495BC 00000000 */ nop @@ -370,8 +370,8 @@ glabel pause_badges_handle_input /* 13C91C 802495DC 240400CA */ addiu $a0, $zero, 0xca /* 13C920 802495E0 0C039E1B */ jal enforce_hpfp_limits /* 13C924 802495E4 AE000000 */ sw $zero, ($s0) -/* 13C928 802495E8 3C038027 */ lui $v1, 0x8027 -/* 13C92C 802495EC 8C63039C */ lw $v1, 0x39c($v1) +/* 13C928 802495E8 3C038027 */ lui $v1, %hi(gBadgeMenuCurrentTab) +/* 13C92C 802495EC 8C63039C */ lw $v1, %lo(gBadgeMenuCurrentTab)($v1) /* 13C930 802495F0 24020001 */ addiu $v0, $zero, 1 /* 13C934 802495F4 14620003 */ bne $v1, $v0, .L80249604 /* 13C938 802495F8 00000000 */ nop diff --git a/asm/nonmatchings/code_138CC0/pause_badges_init.s b/asm/nonmatchings/code_138CC0/pause_badges_init.s index 6fab790ae7..c66a25fc25 100644 --- a/asm/nonmatchings/code_138CC0/pause_badges_init.s +++ b/asm/nonmatchings/code_138CC0/pause_badges_init.s @@ -10,12 +10,12 @@ glabel pause_badges_init /* 13C314 80248FD4 AFB10014 */ sw $s1, 0x14($sp) /* 13C318 80248FD8 0C091C15 */ jal pause_badges_count_all /* 13C31C 80248FDC AFB00010 */ sw $s0, 0x10($sp) -/* 13C320 80248FE0 3C018027 */ lui $at, 0x8027 -/* 13C324 80248FE4 AC200398 */ sw $zero, 0x398($at) -/* 13C328 80248FE8 3C018027 */ lui $at, 0x8027 -/* 13C32C 80248FEC AC20039C */ sw $zero, 0x39c($at) -/* 13C330 80248FF0 3C018027 */ lui $at, 0x8027 -/* 13C334 80248FF4 AC2003A0 */ sw $zero, 0x3a0($at) +/* 13C320 80248FE0 3C018027 */ lui $at, %hi(gBadgeMenuLevel) +/* 13C324 80248FE4 AC200398 */ sw $zero, %lo(gBadgeMenuLevel)($at) +/* 13C328 80248FE8 3C018027 */ lui $at, %hi(gBadgeMenuCurrentTab) +/* 13C32C 80248FEC AC20039C */ sw $zero, %lo(gBadgeMenuCurrentTab)($at) +/* 13C330 80248FF0 3C018027 */ lui $at, %hi(gBadgeMenuBShowNotEnoughBP) +/* 13C334 80248FF4 AC2003A0 */ sw $zero, %lo(gBadgeMenuBShowNotEnoughBP)($at) /* 13C338 80248FF8 0C092363 */ jal pause_badges_load_badges /* 13C33C 80248FFC 0000202D */ daddu $a0, $zero, $zero /* 13C340 80249000 3C038027 */ lui $v1, %hi(gBadgeMenuItemIDs) @@ -26,8 +26,8 @@ glabel pause_badges_init /* 13C354 80249014 08092423 */ j .L8024908C /* 13C358 80249018 A2600000 */ sb $zero, ($s3) .L8024901C: -/* 13C35C 8024901C 3C128027 */ lui $s2, 0x8027 -/* 13C360 80249020 265203A8 */ addiu $s2, $s2, 0x3a8 +/* 13C35C 8024901C 3C128027 */ lui $s2, %hi(D_802703A8) +/* 13C360 80249020 265203A8 */ addiu $s2, $s2, %lo(D_802703A8) /* 13C364 80249024 3C118025 */ lui $s1, 0x8025 /* 13C368 80249028 2631F4D0 */ addiu $s1, $s1, -0xb30 .L8024902C: diff --git a/asm/nonmatchings/code_138CC0/pause_badges_load_badges.s b/asm/nonmatchings/code_138CC0/pause_badges_load_badges.s index 9100708353..fd6e75227c 100644 --- a/asm/nonmatchings/code_138CC0/pause_badges_load_badges.s +++ b/asm/nonmatchings/code_138CC0/pause_badges_load_badges.s @@ -91,8 +91,8 @@ glabel pause_badges_load_badges /* 13C200 80248EC0 AC200380 */ sw $zero, %lo(gBadgeMenuSelectedItemID)($at) /* 13C204 80248EC4 3C018027 */ lui $at, 0x8027 /* 13C208 80248EC8 AC20037C */ sw $zero, 0x37c($at) -/* 13C20C 80248ECC 3C018027 */ lui $at, 0x8027 -/* 13C210 80248ED0 AC200394 */ sw $zero, 0x394($at) +/* 13C20C 80248ECC 3C018027 */ lui $at, %hi(D_80270394) +/* 13C210 80248ED0 AC200394 */ sw $zero, %lo(D_80270394)($at) /* 13C214 80248ED4 3C018027 */ lui $at, %hi(gBadgeMenuCurrentPage) /* 13C218 80248ED8 AC200280 */ sw $zero, %lo(gBadgeMenuCurrentPage)($at) .L80248EDC: diff --git a/asm/nonmatchings/code_13CAF0/pause_items_draw_contents.s b/asm/nonmatchings/code_13CAF0/pause_items_draw_contents.s index a5be0a7576..a499e1f3e6 100644 --- a/asm/nonmatchings/code_13CAF0/pause_items_draw_contents.s +++ b/asm/nonmatchings/code_13CAF0/pause_items_draw_contents.s @@ -3,8 +3,8 @@ glabel pause_items_draw_contents /* 13CCB0 80249970 27BDFF58 */ addiu $sp, $sp, -0xa8 -/* 13CCB4 80249974 3C038027 */ lui $v1, 0x8027 -/* 13CCB8 80249978 8C6304C8 */ lw $v1, 0x4c8($v1) +/* 13CCB4 80249974 3C038027 */ lui $v1, %hi(gItemMenuCurrentPage) +/* 13CCB8 80249978 8C6304C8 */ lw $v1, %lo(gItemMenuCurrentPage)($v1) /* 13CCBC 8024997C 240A0001 */ addiu $t2, $zero, 1 /* 13CCC0 80249980 AFA500AC */ sw $a1, 0xac($sp) /* 13CCC4 80249984 AFAA0060 */ sw $t2, 0x60($sp) @@ -48,8 +48,8 @@ glabel pause_items_draw_contents /* 13CD5C 80249A1C AFA0003C */ sw $zero, 0x3c($sp) /* 13CD60 80249A20 AFAA0018 */ sw $t2, 0x18($sp) /* 13CD64 80249A24 AFA00040 */ sw $zero, 0x40($sp) -/* 13CD68 80249A28 3C038027 */ lui $v1, 0x8027 -/* 13CD6C 80249A2C 8C6305C0 */ lw $v1, 0x5c0($v1) +/* 13CD68 80249A28 3C038027 */ lui $v1, %hi(gItemMenuSelectedIndex) +/* 13CD6C 80249A2C 8C6305C0 */ lw $v1, %lo(gItemMenuSelectedIndex)($v1) /* 13CD70 80249A30 15000002 */ bnez $t0, .L80249A3C /* 13CD74 80249A34 0068001A */ div $zero, $v1, $t0 /* 13CD78 80249A38 0007000D */ break 7 @@ -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, %hi(gPauseItemPages) -/* 13CDCC 80249A8C 261004D0 */ addiu $s0, $s0, %lo(gPauseItemPages) +/* 13CDC8 80249A88 3C108027 */ lui $s0, %hi(gItemMenuPages) +/* 13CDCC 80249A8C 261004D0 */ addiu $s0, $s0, %lo(gItemMenuPages) /* 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, %hi(gPauseItemPages) -/* 13CF34 80249BF4 256B04D0 */ addiu $t3, $t3, %lo(gPauseItemPages) +/* 13CF30 80249BF0 3C0B8027 */ lui $t3, %hi(gItemMenuPages) +/* 13CF34 80249BF4 256B04D0 */ addiu $t3, $t3, %lo(gItemMenuPages) /* 13CF38 80249BF8 AFAB007C */ sw $t3, 0x7c($sp) .L80249BFC: /* 13CF3C 80249BFC 8FAA007C */ lw $t2, 0x7c($sp) @@ -192,8 +192,8 @@ glabel pause_items_draw_contents /* 13CF7C 80249C3C AFAB0078 */ sw $t3, 0x78($sp) .L80249C40: /* 13CF80 80249C40 8FAA007C */ lw $t2, 0x7c($sp) -/* 13CF84 80249C44 3C0B8027 */ lui $t3, 0x8027 -/* 13CF88 80249C48 256B0400 */ addiu $t3, $t3, 0x400 +/* 13CF84 80249C44 3C0B8027 */ lui $t3, %hi(gItemMenuItemIDs) +/* 13CF88 80249C48 256B0400 */ addiu $t3, $t3, %lo(gItemMenuItemIDs) /* 13CF8C 80249C4C 8D420004 */ lw $v0, 4($t2) /* 13CF90 80249C50 24037FFF */ addiu $v1, $zero, 0x7fff /* 13CF94 80249C54 00521021 */ addu $v0, $v0, $s2 @@ -219,8 +219,8 @@ glabel pause_items_draw_contents /* 13CFE4 80249CA4 24020003 */ addiu $v0, $zero, 3 /* 13CFE8 80249CA8 14620012 */ bne $v1, $v0, .L80249CF4 /* 13CFEC 80249CAC 0000A02D */ daddu $s4, $zero, $zero -/* 13CFF0 80249CB0 3C028027 */ lui $v0, 0x8027 -/* 13CFF4 80249CB4 8C4205E0 */ lw $v0, 0x5e0($v0) +/* 13CFF0 80249CB0 3C028027 */ lui $v0, %hi(gItemMenuLevel) +/* 13CFF4 80249CB4 8C4205E0 */ lw $v0, %lo(gItemMenuLevel)($v0) /* 13CFF8 80249CB8 240A0001 */ addiu $t2, $zero, 1 /* 13CFFC 80249CBC 144A000D */ bne $v0, $t2, .L80249CF4 /* 13D000 80249CC0 03C0202D */ daddu $a0, $fp, $zero @@ -515,12 +515,12 @@ glabel pause_items_draw_contents /* 13D43C 8024A0FC 24020003 */ addiu $v0, $zero, 3 /* 13D440 8024A100 1462002A */ bne $v1, $v0, .L8024A1AC /* 13D444 8024A104 24020001 */ addiu $v0, $zero, 1 -/* 13D448 8024A108 3C038027 */ lui $v1, 0x8027 -/* 13D44C 8024A10C 8C6305E0 */ lw $v1, 0x5e0($v1) +/* 13D448 8024A108 3C038027 */ lui $v1, %hi(gItemMenuLevel) +/* 13D44C 8024A10C 8C6305E0 */ lw $v1, %lo(gItemMenuLevel)($v1) /* 13D450 8024A110 14620026 */ bne $v1, $v0, .L8024A1AC /* 13D454 8024A114 00000000 */ nop -/* 13D458 8024A118 3C118027 */ lui $s1, 0x8027 -/* 13D45C 8024A11C 263104C8 */ addiu $s1, $s1, 0x4c8 +/* 13D458 8024A118 3C118027 */ lui $s1, %hi(gItemMenuCurrentPage) +/* 13D45C 8024A11C 263104C8 */ addiu $s1, $s1, %lo(gItemMenuCurrentPage) /* 13D460 8024A120 8E220000 */ lw $v0, ($s1) /* 13D464 8024A124 1840000E */ blez $v0, .L8024A160 /* 13D468 8024A128 24420001 */ addiu $v0, $v0, 1 @@ -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, %hi(gPauseItemPages) +/* 13D4AC 8024A16C 3C028027 */ lui $v0, %hi(gItemMenuPages) /* 13D4B0 8024A170 00431021 */ addu $v0, $v0, $v1 -/* 13D4B4 8024A174 904204D0 */ lbu $v0, %lo(gPauseItemPages)($v0) +/* 13D4B4 8024A174 904204D0 */ lbu $v0, %lo(gItemMenuPages)($v0) /* 13D4B8 8024A178 1040000C */ beqz $v0, .L8024A1AC /* 13D4BC 8024A17C 00000000 */ nop /* 13D4C0 8024A180 3C108027 */ lui $s0, 0x8027 @@ -558,8 +558,8 @@ glabel pause_items_draw_contents /* 13D4E4 8024A1A4 0C0511F8 */ jal draw_icon_2 /* 13D4E8 8024A1A8 00000000 */ nop .L8024A1AC: -/* 13D4EC 8024A1AC 3C038027 */ lui $v1, 0x8027 -/* 13D4F0 8024A1B0 8C6305E4 */ lw $v1, 0x5e4($v1) +/* 13D4EC 8024A1AC 3C038027 */ lui $v1, %hi(gItemMenuCurrentTab) +/* 13D4F0 8024A1B0 8C6305E4 */ lw $v1, %lo(gItemMenuCurrentTab)($v1) /* 13D4F4 8024A1B4 8FA600AC */ lw $a2, 0xac($sp) /* 13D4F8 8024A1B8 50600001 */ beql $v1, $zero, .L8024A1C0 /* 13D4FC 8024A1BC 24C60009 */ addiu $a2, $a2, 9 @@ -600,8 +600,8 @@ glabel pause_items_draw_contents /* 13D57C 8024A23C AFA0004C */ sw $zero, 0x4c($sp) /* 13D580 8024A240 0C093BA0 */ jal pause_get_menu_string /* 13D584 8024A244 2404004F */ addiu $a0, $zero, 0x4f -/* 13D588 8024A248 3C118027 */ lui $s1, 0x8027 -/* 13D58C 8024A24C 263105E4 */ addiu $s1, $s1, 0x5e4 +/* 13D588 8024A248 3C118027 */ lui $s1, %hi(gItemMenuCurrentTab) +/* 13D58C 8024A24C 263105E4 */ addiu $s1, $s1, %lo(gItemMenuCurrentTab) /* 13D590 8024A250 8FAA00AC */ lw $t2, 0xac($sp) /* 13D594 8024A254 8E230000 */ lw $v1, ($s1) /* 13D598 8024A258 14600002 */ bnez $v1, .L8024A264 @@ -659,8 +659,8 @@ glabel pause_items_draw_contents /* 13D654 8024A314 AFA0004C */ sw $zero, 0x4c($sp) /* 13D658 8024A318 0C093BA0 */ jal pause_get_menu_string /* 13D65C 8024A31C 24040050 */ addiu $a0, $zero, 0x50 -/* 13D660 8024A320 3C108027 */ lui $s0, 0x8027 -/* 13D664 8024A324 261005E4 */ addiu $s0, $s0, 0x5e4 +/* 13D660 8024A320 3C108027 */ lui $s0, %hi(gItemMenuCurrentTab) +/* 13D664 8024A324 261005E4 */ addiu $s0, $s0, %lo(gItemMenuCurrentTab) /* 13D668 8024A328 24080001 */ addiu $t0, $zero, 1 /* 13D66C 8024A32C 8FAB00AC */ lw $t3, 0xac($sp) /* 13D670 8024A330 8E030000 */ lw $v1, ($s0) @@ -683,8 +683,8 @@ glabel pause_items_draw_contents /* 13D6AC 8024A36C 24020003 */ addiu $v0, $zero, 3 /* 13D6B0 8024A370 1462004E */ bne $v1, $v0, .L8024A4AC /* 13D6B4 8024A374 00000000 */ nop -/* 13D6B8 8024A378 3C028027 */ lui $v0, 0x8027 -/* 13D6BC 8024A37C 8C4205E0 */ lw $v0, 0x5e0($v0) +/* 13D6B8 8024A378 3C028027 */ lui $v0, %hi(gItemMenuLevel) +/* 13D6BC 8024A37C 8C4205E0 */ lw $v0, %lo(gItemMenuLevel)($v0) /* 13D6C0 8024A380 14400008 */ bnez $v0, .L8024A3A4 /* 13D6C4 8024A384 24040021 */ addiu $a0, $zero, 0x21 /* 13D6C8 8024A388 8E060000 */ lw $a2, ($s0) @@ -695,11 +695,11 @@ glabel pause_items_draw_contents /* 13D6DC 8024A39C 08092929 */ j .L8024A4A4 /* 13D6E0 8024A3A0 24C6001A */ addiu $a2, $a2, 0x1a .L8024A3A4: -/* 13D6E4 8024A3A4 3C118027 */ lui $s1, 0x8027 -/* 13D6E8 8024A3A8 263104C8 */ addiu $s1, $s1, 0x4c8 +/* 13D6E4 8024A3A4 3C118027 */ lui $s1, %hi(gItemMenuCurrentPage) +/* 13D6E8 8024A3A8 263104C8 */ addiu $s1, $s1, %lo(gItemMenuCurrentPage) /* 13D6EC 8024A3AC 8E240000 */ lw $a0, ($s1) -/* 13D6F0 8024A3B0 3C128027 */ lui $s2, %hi(gPauseItemPages) -/* 13D6F4 8024A3B4 265204D0 */ addiu $s2, $s2, %lo(gPauseItemPages) +/* 13D6F0 8024A3B0 3C128027 */ lui $s2, %hi(gItemMenuPages) +/* 13D6F4 8024A3B4 265204D0 */ addiu $s2, $s2, %lo(gItemMenuPages) /* 13D6F8 8024A3B8 00041040 */ sll $v0, $a0, 1 /* 13D6FC 8024A3BC 00441021 */ addu $v0, $v0, $a0 /* 13D700 8024A3C0 00021080 */ sll $v0, $v0, 2 @@ -707,8 +707,8 @@ glabel pause_items_draw_contents /* 13D708 8024A3C8 90430001 */ lbu $v1, 1($v0) /* 13D70C 8024A3CC 90420002 */ lbu $v0, 2($v0) /* 13D710 8024A3D0 00620018 */ mult $v1, $v0 -/* 13D714 8024A3D4 3C108027 */ lui $s0, 0x8027 -/* 13D718 8024A3D8 261005C0 */ addiu $s0, $s0, 0x5c0 +/* 13D714 8024A3D4 3C108027 */ lui $s0, %hi(gItemMenuSelectedIndex) +/* 13D718 8024A3D8 261005C0 */ addiu $s0, $s0, %lo(gItemMenuSelectedIndex) /* 13D71C 8024A3DC 8E050000 */ lw $a1, ($s0) /* 13D720 8024A3E0 00005012 */ mflo $t2 /* 13D724 8024A3E4 0C0925F4 */ jal pause_items_get_pos_x @@ -741,10 +741,10 @@ glabel pause_items_draw_contents /* 13D78C 8024A44C 50400001 */ beql $v0, $zero, .L8024A454 /* 13D790 8024A450 24060070 */ addiu $a2, $zero, 0x70 .L8024A454: -/* 13D794 8024A454 3C038027 */ lui $v1, 0x8027 -/* 13D798 8024A458 8C6305D4 */ lw $v1, 0x5d4($v1) -/* 13D79C 8024A45C 3C028027 */ lui $v0, 0x8027 -/* 13D7A0 8024A460 8C4205D8 */ lw $v0, 0x5d8($v0) +/* 13D794 8024A454 3C038027 */ lui $v1, %hi(gItemMenuCurrentScrollPos) +/* 13D798 8024A458 8C6305D4 */ lw $v1, %lo(gItemMenuCurrentScrollPos)($v1) +/* 13D79C 8024A45C 3C028027 */ lui $v0, %hi(gItemMenuTargetScrollPos) +/* 13D7A0 8024A460 8C4205D8 */ lw $v0, %lo(gItemMenuTargetScrollPos)($v0) /* 13D7A4 8024A464 1062000A */ beq $v1, $v0, .L8024A490 /* 13D7A8 8024A468 24040021 */ addiu $a0, $zero, 0x21 /* 13D7AC 8024A46C 26050055 */ addiu $a1, $s0, 0x55 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 1489add115..6b1c236cd6 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, %hi(gPauseItemPages) -/* 13CB6C 8024982C 244204D0 */ addiu $v0, $v0, %lo(gPauseItemPages) +/* 13CB68 80249828 3C028027 */ lui $v0, %hi(gItemMenuPages) +/* 13CB6C 8024982C 244204D0 */ addiu $v0, $v0, %lo(gItemMenuPages) /* 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 07afba9d65..6e2446ee0b 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, %hi(gPauseItemPages) -/* 13CC24 802498E4 246304D0 */ addiu $v1, $v1, %lo(gPauseItemPages) +/* 13CC20 802498E0 3C038027 */ lui $v1, %hi(gItemMenuPages) +/* 13CC24 802498E4 246304D0 */ addiu $v1, $v1, %lo(gItemMenuPages) /* 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 07b6c0feca..85ab2d3824 100644 --- a/asm/nonmatchings/code_13CAF0/pause_items_handle_input.s +++ b/asm/nonmatchings/code_13CAF0/pause_items_handle_input.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel pause_items_handle_input -/* 13DB18 8024A7D8 3C038027 */ lui $v1, 0x8027 -/* 13DB1C 8024A7DC 8C6304C8 */ lw $v1, 0x4c8($v1) +/* 13DB18 8024A7D8 3C038027 */ lui $v1, %hi(gItemMenuCurrentPage) +/* 13DB1C 8024A7DC 8C6304C8 */ lw $v1, %lo(gItemMenuCurrentPage)($v1) /* 13DB20 8024A7E0 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 13DB24 8024A7E4 AFBF0014 */ sw $ra, 0x14($sp) /* 13DB28 8024A7E8 AFB00010 */ sw $s0, 0x10($sp) @@ -15,8 +15,8 @@ glabel pause_items_handle_input /* 13DB40 8024A800 906304D2 */ lbu $v1, 0x4d2($v1) /* 13DB44 8024A804 3C028027 */ lui $v0, %hi(gPauseMenuPressedButtons) /* 13DB48 8024A808 8C4200C4 */ lw $v0, %lo(gPauseMenuPressedButtons)($v0) -/* 13DB4C 8024A80C 3C098027 */ lui $t1, 0x8027 -/* 13DB50 8024A810 8D2905C0 */ lw $t1, 0x5c0($t1) +/* 13DB4C 8024A80C 3C098027 */ lui $t1, %hi(gItemMenuSelectedIndex) +/* 13DB50 8024A810 8D2905C0 */ lw $t1, %lo(gItemMenuSelectedIndex)($t1) /* 13DB54 8024A814 30428000 */ andi $v0, $v0, 0x8000 /* 13DB58 8024A818 14600002 */ bnez $v1, .L8024A824 /* 13DB5C 8024A81C 0123001A */ div $zero, $t1, $v1 @@ -33,14 +33,14 @@ glabel pause_items_handle_input /* 13DB80 8024A840 00004010 */ mfhi $t0 /* 13DB84 8024A844 10400015 */ beqz $v0, .L8024A89C /* 13DB88 8024A848 00000000 */ nop -/* 13DB8C 8024A84C 3C048027 */ lui $a0, 0x8027 -/* 13DB90 8024A850 248405E0 */ addiu $a0, $a0, 0x5e0 +/* 13DB8C 8024A84C 3C048027 */ lui $a0, %hi(gItemMenuLevel) +/* 13DB90 8024A850 248405E0 */ addiu $a0, $a0, %lo(gItemMenuLevel) /* 13DB94 8024A854 8C820000 */ lw $v0, ($a0) /* 13DB98 8024A858 14400010 */ bnez $v0, .L8024A89C /* 13DB9C 8024A85C 00091040 */ sll $v0, $t1, 1 -/* 13DBA0 8024A860 3C038027 */ lui $v1, 0x8027 +/* 13DBA0 8024A860 3C038027 */ lui $v1, %hi(gItemMenuItemIDs) /* 13DBA4 8024A864 00621821 */ addu $v1, $v1, $v0 -/* 13DBA8 8024A868 84630400 */ lh $v1, 0x400($v1) +/* 13DBA8 8024A868 84630400 */ lh $v1, %lo(gItemMenuItemIDs)($v1) /* 13DBAC 8024A86C 24027FFE */ addiu $v0, $zero, 0x7ffe /* 13DBB0 8024A870 14620005 */ bne $v1, $v0, .L8024A888 /* 13DBB4 8024A874 24020001 */ addiu $v0, $zero, 1 @@ -55,16 +55,16 @@ glabel pause_items_handle_input /* 13DBD4 8024A894 08092B11 */ j .L8024AC44 /* 13DBD8 8024A898 00000000 */ nop .L8024A89C: -/* 13DBDC 8024A89C 3C028027 */ lui $v0, 0x8027 -/* 13DBE0 8024A8A0 844205CC */ lh $v0, 0x5cc($v0) +/* 13DBDC 8024A89C 3C028027 */ lui $v0, %hi(gItemMenuNumItems) +/* 13DBE0 8024A8A0 844205CC */ lh $v0, %lo(gItemMenuNumItems)($v0) /* 13DBE4 8024A8A4 104000B1 */ beqz $v0, .L8024AB6C /* 13DBE8 8024A8A8 00000000 */ nop -/* 13DBEC 8024A8AC 3C028027 */ lui $v0, 0x8027 -/* 13DBF0 8024A8B0 8C4205E0 */ lw $v0, 0x5e0($v0) +/* 13DBEC 8024A8AC 3C028027 */ lui $v0, %hi(gItemMenuLevel) +/* 13DBF0 8024A8B0 8C4205E0 */ lw $v0, %lo(gItemMenuLevel)($v0) /* 13DBF4 8024A8B4 14400015 */ bnez $v0, .L8024A90C /* 13DBF8 8024A8B8 3C020001 */ lui $v0, 1 -/* 13DBFC 8024A8BC 3C108027 */ lui $s0, 0x8027 -/* 13DC00 8024A8C0 261005E4 */ addiu $s0, $s0, 0x5e4 +/* 13DBFC 8024A8BC 3C108027 */ lui $s0, %hi(gItemMenuCurrentTab) +/* 13DC00 8024A8C0 261005E4 */ addiu $s0, $s0, %lo(gItemMenuCurrentTab) /* 13DC04 8024A8C4 3C028027 */ lui $v0, %hi(gPauseMenuHeldButtons) /* 13DC08 8024A8C8 8C4200C0 */ lw $v0, %lo(gPauseMenuHeldButtons)($v0) /* 13DC0C 8024A8CC 3C030003 */ lui $v1, 3 @@ -97,8 +97,8 @@ glabel pause_items_handle_input /* 13DC70 8024A930 04A20001 */ bltzl $a1, .L8024A938 /* 13DC74 8024A934 0000282D */ daddu $a1, $zero, $zero .L8024A938: -/* 13DC78 8024A938 3C048027 */ lui $a0, 0x8027 -/* 13DC7C 8024A93C 248404C8 */ addiu $a0, $a0, 0x4c8 +/* 13DC78 8024A938 3C048027 */ lui $a0, %hi(gItemMenuCurrentPage) +/* 13DC7C 8024A93C 248404C8 */ addiu $a0, $a0, %lo(gItemMenuCurrentPage) /* 13DC80 8024A940 8C830000 */ lw $v1, ($a0) /* 13DC84 8024A944 00031040 */ sll $v0, $v1, 1 /* 13DC88 8024A948 00431021 */ addu $v0, $v0, $v1 @@ -112,8 +112,8 @@ glabel pause_items_handle_input /* 13DCA8 8024A968 08092A6A */ j .L8024A9A8 /* 13DCAC 8024A96C AC820000 */ sw $v0, ($a0) .L8024A970: -/* 13DCB0 8024A970 3C038027 */ lui $v1, 0x8027 -/* 13DCB4 8024A974 246304C8 */ addiu $v1, $v1, 0x4c8 +/* 13DCB0 8024A970 3C038027 */ lui $v1, %hi(gItemMenuCurrentPage) +/* 13DCB4 8024A974 246304C8 */ addiu $v1, $v1, %lo(gItemMenuCurrentPage) /* 13DCB8 8024A978 8C620000 */ lw $v0, ($v1) /* 13DCBC 8024A97C 2442FFFF */ addiu $v0, $v0, -1 /* 13DCC0 8024A980 04410002 */ bgez $v0, .L8024A98C @@ -138,11 +138,11 @@ glabel pause_items_handle_input /* 13DD04 8024A9C4 00621024 */ and $v0, $v1, $v0 /* 13DD08 8024A9C8 1040001C */ beqz $v0, .L8024AA3C /* 13DD0C 8024A9CC 00000000 */ nop -/* 13DD10 8024A9D0 3C068027 */ lui $a2, 0x8027 -/* 13DD14 8024A9D4 24C604C8 */ addiu $a2, $a2, 0x4c8 +/* 13DD10 8024A9D0 3C068027 */ lui $a2, %hi(gItemMenuCurrentPage) +/* 13DD14 8024A9D4 24C604C8 */ addiu $a2, $a2, %lo(gItemMenuCurrentPage) /* 13DD18 8024A9D8 8CC40000 */ lw $a0, ($a2) -/* 13DD1C 8024A9DC 3C078027 */ lui $a3, %hi(gPauseItemPages) -/* 13DD20 8024A9E0 24E704D0 */ addiu $a3, $a3, %lo(gPauseItemPages) +/* 13DD1C 8024A9DC 3C078027 */ lui $a3, %hi(gItemMenuPages) +/* 13DD20 8024A9E0 24E704D0 */ addiu $a3, $a3, %lo(gItemMenuPages) /* 13DD24 8024A9E4 00041040 */ sll $v0, $a0, 1 /* 13DD28 8024A9E8 00441021 */ addu $v0, $v0, $a0 /* 13DD2C 8024A9EC 00021080 */ sll $v0, $v0, 2 @@ -166,11 +166,11 @@ glabel pause_items_handle_input /* 13DD74 8024AA34 08092AA0 */ j .L8024AA80 /* 13DD78 8024AA38 24A5FFFF */ addiu $a1, $a1, -1 .L8024AA3C: -/* 13DD7C 8024AA3C 3C068027 */ lui $a2, 0x8027 -/* 13DD80 8024AA40 24C604C8 */ addiu $a2, $a2, 0x4c8 +/* 13DD7C 8024AA3C 3C068027 */ lui $a2, %hi(gItemMenuCurrentPage) +/* 13DD80 8024AA40 24C604C8 */ addiu $a2, $a2, %lo(gItemMenuCurrentPage) /* 13DD84 8024AA44 8CC70000 */ lw $a3, ($a2) -/* 13DD88 8024AA48 3C048027 */ lui $a0, %hi(gPauseItemPages) -/* 13DD8C 8024AA4C 248404D0 */ addiu $a0, $a0, %lo(gPauseItemPages) +/* 13DD88 8024AA48 3C048027 */ lui $a0, %hi(gItemMenuPages) +/* 13DD8C 8024AA4C 248404D0 */ addiu $a0, $a0, %lo(gItemMenuPages) /* 13DD90 8024AA50 24E30001 */ addiu $v1, $a3, 1 /* 13DD94 8024AA54 00031040 */ sll $v0, $v1, 1 /* 13DD98 8024AA58 00431021 */ addu $v0, $v0, $v1 @@ -185,8 +185,8 @@ glabel pause_items_handle_input .L8024AA7C: /* 13DDBC 8024AA7C 90650001 */ lbu $a1, 1($v1) .L8024AA80: -/* 13DDC0 8024AA80 3C038027 */ lui $v1, 0x8027 -/* 13DDC4 8024AA84 8C6304C8 */ lw $v1, 0x4c8($v1) +/* 13DDC0 8024AA80 3C038027 */ lui $v1, %hi(gItemMenuCurrentPage) +/* 13DDC4 8024AA84 8C6304C8 */ lw $v1, %lo(gItemMenuCurrentPage)($v1) /* 13DDC8 8024AA88 00031040 */ sll $v0, $v1, 1 /* 13DDCC 8024AA8C 00431021 */ addu $v0, $v0, $v1 /* 13DDD0 8024AA90 00021080 */ sll $v0, $v0, 2 @@ -196,9 +196,9 @@ glabel pause_items_handle_input /* 13DDE0 8024AAA0 00A40018 */ mult $a1, $a0 /* 13DDE4 8024AAA4 00005012 */ mflo $t2 /* 13DDE8 8024AAA8 000A1040 */ sll $v0, $t2, 1 -/* 13DDEC 8024AAAC 3C038027 */ lui $v1, 0x8027 +/* 13DDEC 8024AAAC 3C038027 */ lui $v1, %hi(gItemMenuItemIDs) /* 13DDF0 8024AAB0 00621821 */ addu $v1, $v1, $v0 -/* 13DDF4 8024AAB4 84630400 */ lh $v1, 0x400($v1) +/* 13DDF4 8024AAB4 84630400 */ lh $v1, %lo(gItemMenuItemIDs)($v1) /* 13DDF8 8024AAB8 24027FFE */ addiu $v0, $zero, 0x7ffe /* 13DDFC 8024AABC 10620012 */ beq $v1, $v0, .L8024AB08 /* 13DE00 8024AAC0 3C020004 */ lui $v0, 4 @@ -223,8 +223,8 @@ glabel pause_items_handle_input .L8024AB08: /* 13DE48 8024AB08 0000402D */ daddu $t0, $zero, $zero .L8024AB0C: -/* 13DE4C 8024AB0C 3C038027 */ lui $v1, 0x8027 -/* 13DE50 8024AB10 8C6304C8 */ lw $v1, 0x4c8($v1) +/* 13DE4C 8024AB0C 3C038027 */ lui $v1, %hi(gItemMenuCurrentPage) +/* 13DE50 8024AB10 8C6304C8 */ lw $v1, %lo(gItemMenuCurrentPage)($v1) /* 13DE54 8024AB14 00031040 */ sll $v0, $v1, 1 /* 13DE58 8024AB18 00431021 */ addu $v0, $v0, $v1 /* 13DE5C 8024AB1C 00021080 */ sll $v0, $v0, 2 @@ -232,8 +232,8 @@ glabel pause_items_handle_input /* 13DE64 8024AB24 00220821 */ addu $at, $at, $v0 /* 13DE68 8024AB28 902204D2 */ lbu $v0, 0x4d2($at) /* 13DE6C 8024AB2C 00A20018 */ mult $a1, $v0 -/* 13DE70 8024AB30 3C108027 */ lui $s0, 0x8027 -/* 13DE74 8024AB34 261005C0 */ addiu $s0, $s0, 0x5c0 +/* 13DE70 8024AB30 3C108027 */ lui $s0, %hi(gItemMenuSelectedIndex) +/* 13DE74 8024AB34 261005C0 */ addiu $s0, $s0, %lo(gItemMenuSelectedIndex) /* 13DE78 8024AB38 00005012 */ mflo $t2 /* 13DE7C 8024AB3C 010A1021 */ addu $v0, $t0, $t2 /* 13DE80 8024AB40 10490003 */ beq $v0, $t1, .L8024AB50 @@ -243,19 +243,19 @@ glabel pause_items_handle_input .L8024AB50: /* 13DE90 8024AB50 8E020000 */ lw $v0, ($s0) /* 13DE94 8024AB54 00021040 */ sll $v0, $v0, 1 -/* 13DE98 8024AB58 3C018027 */ lui $at, 0x8027 +/* 13DE98 8024AB58 3C018027 */ lui $at, %hi(gItemMenuItemIDs) /* 13DE9C 8024AB5C 00220821 */ addu $at, $at, $v0 -/* 13DEA0 8024AB60 84220400 */ lh $v0, 0x400($at) -/* 13DEA4 8024AB64 3C018027 */ lui $at, 0x8027 -/* 13DEA8 8024AB68 AC2205C8 */ sw $v0, 0x5c8($at) +/* 13DEA0 8024AB60 84220400 */ lh $v0, %lo(gItemMenuItemIDs)($at) +/* 13DEA4 8024AB64 3C018027 */ lui $at, %hi(gItemMenuSelectedItemID) +/* 13DEA8 8024AB68 AC2205C8 */ sw $v0, %lo(gItemMenuSelectedItemID)($at) .L8024AB6C: -/* 13DEAC 8024AB6C 3C028027 */ lui $v0, 0x8027 -/* 13DEB0 8024AB70 8C4205E0 */ lw $v0, 0x5e0($v0) +/* 13DEAC 8024AB6C 3C028027 */ lui $v0, %hi(gItemMenuLevel) +/* 13DEB0 8024AB70 8C4205E0 */ lw $v0, %lo(gItemMenuLevel)($v0) /* 13DEB4 8024AB74 24030001 */ addiu $v1, $zero, 1 /* 13DEB8 8024AB78 14430014 */ bne $v0, $v1, .L8024ABCC /* 13DEBC 8024AB7C 00000000 */ nop -/* 13DEC0 8024AB80 3C038027 */ lui $v1, 0x8027 -/* 13DEC4 8024AB84 8C6305C8 */ lw $v1, 0x5c8($v1) +/* 13DEC0 8024AB80 3C038027 */ lui $v1, %hi(gItemMenuSelectedItemID) +/* 13DEC4 8024AB84 8C6305C8 */ lw $v1, %lo(gItemMenuSelectedItemID)($v1) /* 13DEC8 8024AB88 24628002 */ addiu $v0, $v1, -0x7ffe /* 13DECC 8024AB8C 2C420002 */ sltiu $v0, $v0, 2 /* 13DED0 8024AB90 1440000A */ bnez $v0, .L8024ABBC @@ -275,8 +275,8 @@ glabel pause_items_handle_input /* 13DF04 8024ABC4 08092AFC */ j .L8024ABF0 /* 13DF08 8024ABC8 00000000 */ nop .L8024ABCC: -/* 13DF0C 8024ABCC 3C028027 */ lui $v0, 0x8027 -/* 13DF10 8024ABD0 8C4205E4 */ lw $v0, 0x5e4($v0) +/* 13DF0C 8024ABCC 3C028027 */ lui $v0, %hi(gItemMenuCurrentTab) +/* 13DF10 8024ABD0 8C4205E4 */ lw $v0, %lo(gItemMenuCurrentTab)($v0) /* 13DF14 8024ABD4 14430002 */ bne $v0, $v1, .L8024ABE0 /* 13DF18 8024ABD8 24040052 */ addiu $a0, $zero, 0x52 /* 13DF1C 8024ABDC 24040051 */ addiu $a0, $zero, 0x51 @@ -294,8 +294,8 @@ glabel pause_items_handle_input /* 13DF40 8024AC00 30424000 */ andi $v0, $v0, 0x4000 /* 13DF44 8024AC04 1040000F */ beqz $v0, .L8024AC44 /* 13DF48 8024AC08 00000000 */ nop -/* 13DF4C 8024AC0C 3C108027 */ lui $s0, 0x8027 -/* 13DF50 8024AC10 261005E0 */ addiu $s0, $s0, 0x5e0 +/* 13DF4C 8024AC0C 3C108027 */ lui $s0, %hi(gItemMenuLevel) +/* 13DF50 8024AC10 261005E0 */ addiu $s0, $s0, %lo(gItemMenuLevel) /* 13DF54 8024AC14 8E020000 */ lw $v0, ($s0) /* 13DF58 8024AC18 14400007 */ bnez $v0, .L8024AC38 /* 13DF5C 8024AC1C 00000000 */ nop diff --git a/asm/nonmatchings/code_13CAF0/pause_items_init.s b/asm/nonmatchings/code_13CAF0/pause_items_init.s index 0540fa72bf..823b9e2d8f 100644 --- a/asm/nonmatchings/code_13CAF0/pause_items_init.s +++ b/asm/nonmatchings/code_13CAF0/pause_items_init.s @@ -9,10 +9,10 @@ glabel pause_items_init /* 13DA64 8024A724 AFB20018 */ sw $s2, 0x18($sp) /* 13DA68 8024A728 AFB10014 */ sw $s1, 0x14($sp) /* 13DA6C 8024A72C AFB00010 */ sw $s0, 0x10($sp) -/* 13DA70 8024A730 3C018027 */ lui $at, 0x8027 -/* 13DA74 8024A734 AC2005E0 */ sw $zero, 0x5e0($at) -/* 13DA78 8024A738 3C018027 */ lui $at, 0x8027 -/* 13DA7C 8024A73C AC2005E4 */ sw $zero, 0x5e4($at) +/* 13DA70 8024A730 3C018027 */ lui $at, %hi(gItemMenuLevel) +/* 13DA74 8024A734 AC2005E0 */ sw $zero, %lo(gItemMenuLevel)($at) +/* 13DA78 8024A738 3C018027 */ lui $at, %hi(gItemMenuCurrentTab) +/* 13DA7C 8024A73C AC2005E4 */ sw $zero, %lo(gItemMenuCurrentTab)($at) /* 13DA80 8024A740 0C092937 */ jal pause_items_load_items /* 13DA84 8024A744 0000202D */ daddu $a0, $zero, $zero /* 13DA88 8024A748 0000802D */ daddu $s0, $zero, $zero diff --git a/asm/nonmatchings/code_13CAF0/pause_items_is_visible.s b/asm/nonmatchings/code_13CAF0/pause_items_is_visible.s index 50824a1281..3ccac10346 100644 --- a/asm/nonmatchings/code_13CAF0/pause_items_is_visible.s +++ b/asm/nonmatchings/code_13CAF0/pause_items_is_visible.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel pause_items_is_visible -/* 13CC70 80249930 3C038027 */ lui $v1, 0x8027 -/* 13CC74 80249934 8C6305D4 */ lw $v1, 0x5d4($v1) +/* 13CC70 80249930 3C038027 */ lui $v1, %hi(gItemMenuCurrentScrollPos) +/* 13CC74 80249934 8C6305D4 */ lw $v1, %lo(gItemMenuCurrentScrollPos)($v1) /* 13CC78 80249938 2462FFE0 */ addiu $v0, $v1, -0x20 /* 13CC7C 8024993C 0082102A */ slt $v0, $a0, $v0 /* 13CC80 80249940 14400003 */ bnez $v0, .L80249950 diff --git a/asm/nonmatchings/code_13CAF0/pause_items_load_items.s b/asm/nonmatchings/code_13CAF0/pause_items_load_items.s index d25ce4eb6c..30151dab09 100644 --- a/asm/nonmatchings/code_13CAF0/pause_items_load_items.s +++ b/asm/nonmatchings/code_13CAF0/pause_items_load_items.s @@ -8,14 +8,14 @@ glabel pause_items_load_items /* 13D828 8024A4E8 2463F290 */ addiu $v1, $v1, %lo(gPlayerData) /* 13D82C 8024A4EC 24020001 */ addiu $v0, $zero, 1 /* 13D830 8024A4F0 AFBF0014 */ sw $ra, 0x14($sp) -/* 13D834 8024A4F4 3C018027 */ lui $at, 0x8027 -/* 13D838 8024A4F8 AC2005D0 */ sw $zero, 0x5d0($at) +/* 13D834 8024A4F4 3C018027 */ lui $at, %hi(D_802705D0) +/* 13D838 8024A4F8 AC2005D0 */ sw $zero, %lo(D_802705D0)($at) /* 13D83C 8024A4FC 14820011 */ bne $a0, $v0, .L8024A544 /* 13D840 8024A500 0000802D */ daddu $s0, $zero, $zero /* 13D844 8024A504 0200202D */ daddu $a0, $s0, $zero /* 13D848 8024A508 0060302D */ daddu $a2, $v1, $zero -/* 13D84C 8024A50C 3C058027 */ lui $a1, 0x8027 -/* 13D850 8024A510 24A50400 */ addiu $a1, $a1, 0x400 +/* 13D84C 8024A50C 3C058027 */ lui $a1, %hi(gItemMenuItemIDs) +/* 13D850 8024A510 24A50400 */ addiu $a1, $a1, %lo(gItemMenuItemIDs) .L8024A514: /* 13D854 8024A514 84C201B4 */ lh $v0, 0x1b4($a2) /* 13D858 8024A518 94C301B4 */ lhu $v1, 0x1b4($a2) @@ -33,8 +33,8 @@ glabel pause_items_load_items .L8024A544: /* 13D884 8024A544 0000202D */ daddu $a0, $zero, $zero /* 13D888 8024A548 0060302D */ daddu $a2, $v1, $zero -/* 13D88C 8024A54C 3C058027 */ lui $a1, 0x8027 -/* 13D890 8024A550 24A50400 */ addiu $a1, $a1, 0x400 +/* 13D88C 8024A54C 3C058027 */ lui $a1, %hi(gItemMenuItemIDs) +/* 13D890 8024A550 24A50400 */ addiu $a1, $a1, %lo(gItemMenuItemIDs) .L8024A554: /* 13D894 8024A554 84C20074 */ lh $v0, 0x74($a2) /* 13D898 8024A558 94C30074 */ lhu $v1, 0x74($a2) @@ -50,26 +50,26 @@ glabel pause_items_load_items .L8024A57C: /* 13D8BC 8024A57C 16000005 */ bnez $s0, .L8024A594 /* 13D8C0 8024A580 24027FFE */ addiu $v0, $zero, 0x7ffe -/* 13D8C4 8024A584 3C018027 */ lui $at, 0x8027 -/* 13D8C8 8024A588 A4220400 */ sh $v0, 0x400($at) +/* 13D8C4 8024A584 3C018027 */ lui $at, %hi(gItemMenuItemIDs) +/* 13D8C8 8024A588 A4220400 */ sh $v0, %lo(gItemMenuItemIDs)($at) /* 13D8CC 8024A58C 0809296B */ j .L8024A5AC /* 13D8D0 8024A590 24100001 */ addiu $s0, $zero, 1 .L8024A594: -/* 13D8D4 8024A594 3C048027 */ lui $a0, 0x8027 -/* 13D8D8 8024A598 24840400 */ addiu $a0, $a0, 0x400 +/* 13D8D4 8024A594 3C048027 */ lui $a0, %hi(gItemMenuItemIDs) +/* 13D8D8 8024A598 24840400 */ addiu $a0, $a0, %lo(gItemMenuItemIDs) /* 13D8DC 8024A59C 3C068025 */ lui $a2, %hi(pause_items_comparator) /* 13D8E0 8024A5A0 24C697B0 */ addiu $a2, $a2, %lo(pause_items_comparator) /* 13D8E4 8024A5A4 0C091293 */ jal pause_sort_item_list /* 13D8E8 8024A5A8 0200282D */ daddu $a1, $s0, $zero .L8024A5AC: -/* 13D8EC 8024A5AC 3C018027 */ lui $at, 0x8027 -/* 13D8F0 8024A5B0 A43005CC */ sh $s0, 0x5cc($at) +/* 13D8EC 8024A5AC 3C018027 */ lui $at, %hi(gItemMenuNumItems) +/* 13D8F0 8024A5B0 A43005CC */ sh $s0, %lo(gItemMenuNumItems)($at) /* 13D8F4 8024A5B4 0200202D */ daddu $a0, $s0, $zero /* 13D8F8 8024A5B8 28820064 */ slti $v0, $a0, 0x64 /* 13D8FC 8024A5BC 1040000A */ beqz $v0, .L8024A5E8 /* 13D900 8024A5C0 24057FFF */ addiu $a1, $zero, 0x7fff -/* 13D904 8024A5C4 3C038027 */ lui $v1, 0x8027 -/* 13D908 8024A5C8 24630400 */ addiu $v1, $v1, 0x400 +/* 13D904 8024A5C4 3C038027 */ lui $v1, %hi(gItemMenuItemIDs) +/* 13D908 8024A5C8 24630400 */ addiu $v1, $v1, %lo(gItemMenuItemIDs) /* 13D90C 8024A5CC 00041040 */ sll $v0, $a0, 1 /* 13D910 8024A5D0 00431821 */ addu $v1, $v0, $v1 .L8024A5D4: @@ -79,25 +79,25 @@ glabel pause_items_load_items /* 13D920 8024A5E0 1440FFFC */ bnez $v0, .L8024A5D4 /* 13D924 8024A5E4 24630002 */ addiu $v1, $v1, 2 .L8024A5E8: -/* 13D928 8024A5E8 3C058027 */ lui $a1, %hi(gPauseItemPages) -/* 13D92C 8024A5EC 24A504D0 */ addiu $a1, $a1, %lo(gPauseItemPages) +/* 13D928 8024A5E8 3C058027 */ lui $a1, %hi(gItemMenuPages) +/* 13D92C 8024A5EC 24A504D0 */ addiu $a1, $a1, %lo(gItemMenuPages) /* 13D930 8024A5F0 0000202D */ daddu $a0, $zero, $zero -/* 13D934 8024A5F4 3C078027 */ lui $a3, 0x8027 -/* 13D938 8024A5F8 24E705CC */ addiu $a3, $a3, 0x5cc +/* 13D934 8024A5F4 3C078027 */ lui $a3, %hi(gItemMenuNumItems) +/* 13D938 8024A5F8 24E705CC */ addiu $a3, $a3, %lo(gItemMenuNumItems) /* 13D93C 8024A5FC 24060001 */ addiu $a2, $zero, 1 /* 13D940 8024A600 24090008 */ addiu $t1, $zero, 8 /* 13D944 8024A604 24080008 */ addiu $t0, $zero, 8 /* 13D948 8024A608 00A81821 */ addu $v1, $a1, $t0 -/* 13D94C 8024A60C 3C018027 */ lui $at, 0x8027 -/* 13D950 8024A610 AC2005C0 */ sw $zero, 0x5c0($at) -/* 13D954 8024A614 3C018027 */ lui $at, 0x8027 -/* 13D958 8024A618 AC2005C8 */ sw $zero, 0x5c8($at) +/* 13D94C 8024A60C 3C018027 */ lui $at, %hi(gItemMenuSelectedIndex) +/* 13D950 8024A610 AC2005C0 */ sw $zero, %lo(gItemMenuSelectedIndex)($at) +/* 13D954 8024A614 3C018027 */ lui $at, %hi(gItemMenuSelectedItemID) +/* 13D958 8024A618 AC2005C8 */ sw $zero, %lo(gItemMenuSelectedItemID)($at) /* 13D95C 8024A61C 3C018027 */ lui $at, 0x8027 /* 13D960 8024A620 AC2005C4 */ sw $zero, 0x5c4($at) -/* 13D964 8024A624 3C018027 */ lui $at, 0x8027 -/* 13D968 8024A628 AC2005DC */ sw $zero, 0x5dc($at) -/* 13D96C 8024A62C 3C018027 */ lui $at, 0x8027 -/* 13D970 8024A630 AC2004C8 */ sw $zero, 0x4c8($at) +/* 13D964 8024A624 3C018027 */ lui $at, %hi(D_802705DC) +/* 13D968 8024A628 AC2005DC */ sw $zero, %lo(D_802705DC)($at) +/* 13D96C 8024A62C 3C018027 */ lui $at, %hi(gItemMenuCurrentPage) +/* 13D970 8024A630 AC2004C8 */ sw $zero, %lo(gItemMenuCurrentPage)($at) .L8024A634: /* 13D974 8024A634 84E20000 */ lh $v0, ($a3) /* 13D978 8024A638 04420001 */ bltzl $v0, .L8024A640 @@ -155,9 +155,9 @@ glabel pause_items_load_items /* 13DA30 8024A6F0 0080282D */ daddu $a1, $a0, $zero /* 13DA34 8024A6F4 8FBF0014 */ lw $ra, 0x14($sp) /* 13DA38 8024A6F8 8FB00010 */ lw $s0, 0x10($sp) -/* 13DA3C 8024A6FC 3C018027 */ lui $at, 0x8027 -/* 13DA40 8024A700 AC2205D4 */ sw $v0, 0x5d4($at) -/* 13DA44 8024A704 3C018027 */ lui $at, 0x8027 -/* 13DA48 8024A708 AC2205D8 */ sw $v0, 0x5d8($at) +/* 13DA3C 8024A6FC 3C018027 */ lui $at, %hi(gItemMenuCurrentScrollPos) +/* 13DA40 8024A700 AC2205D4 */ sw $v0, %lo(gItemMenuCurrentScrollPos)($at) +/* 13DA44 8024A704 3C018027 */ lui $at, %hi(gItemMenuTargetScrollPos) +/* 13DA48 8024A708 AC2205D8 */ sw $v0, %lo(gItemMenuTargetScrollPos)($at) /* 13DA4C 8024A70C 03E00008 */ jr $ra /* 13DA50 8024A710 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_13CAF0/pause_items_scroll_offset_y.s b/asm/nonmatchings/code_13CAF0/pause_items_scroll_offset_y.s index b2441ded02..0aabdf6cb4 100644 --- a/asm/nonmatchings/code_13CAF0/pause_items_scroll_offset_y.s +++ b/asm/nonmatchings/code_13CAF0/pause_items_scroll_offset_y.s @@ -2,7 +2,7 @@ .set noreorder # don't insert nops after branches glabel pause_items_scroll_offset_y -/* 13CC98 80249958 3C028027 */ lui $v0, 0x8027 -/* 13CC9C 8024995C 8C4205D4 */ lw $v0, 0x5d4($v0) +/* 13CC98 80249958 3C028027 */ lui $v0, %hi(gItemMenuCurrentScrollPos) +/* 13CC9C 8024995C 8C4205D4 */ lw $v0, %lo(gItemMenuCurrentScrollPos)($v0) /* 13CCA0 80249960 03E00008 */ jr $ra /* 13CCA4 80249964 00821023 */ subu $v0, $a0, $v0 diff --git a/asm/nonmatchings/code_13CAF0/pause_items_update.s b/asm/nonmatchings/code_13CAF0/pause_items_update.s index 5e71100e51..0150768b79 100644 --- a/asm/nonmatchings/code_13CAF0/pause_items_update.s +++ b/asm/nonmatchings/code_13CAF0/pause_items_update.s @@ -3,10 +3,10 @@ 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, %hi(gPauseItemPages) -/* 13DFA4 8024AC64 248404D0 */ addiu $a0, $a0, %lo(gPauseItemPages) +/* 13DF98 8024AC58 3C038027 */ lui $v1, %hi(gItemMenuCurrentPage) +/* 13DF9C 8024AC5C 8C6304C8 */ lw $v1, %lo(gItemMenuCurrentPage)($v1) +/* 13DFA0 8024AC60 3C048027 */ lui $a0, %hi(gItemMenuPages) +/* 13DFA4 8024AC64 248404D0 */ addiu $a0, $a0, %lo(gItemMenuPages) /* 13DFA8 8024AC68 AFBF0014 */ sw $ra, 0x14($sp) /* 13DFAC 8024AC6C AFB00010 */ sw $s0, 0x10($sp) /* 13DFB0 8024AC70 00031040 */ sll $v0, $v1, 1 @@ -14,8 +14,8 @@ glabel pause_items_update /* 13DFB8 8024AC78 00021080 */ sll $v0, $v0, 2 /* 13DFBC 8024AC7C 00443021 */ addu $a2, $v0, $a0 /* 13DFC0 8024AC80 90C30002 */ lbu $v1, 2($a2) -/* 13DFC4 8024AC84 3C028027 */ lui $v0, 0x8027 -/* 13DFC8 8024AC88 8C4205C0 */ lw $v0, 0x5c0($v0) +/* 13DFC4 8024AC84 3C028027 */ lui $v0, %hi(gItemMenuSelectedIndex) +/* 13DFC8 8024AC88 8C4205C0 */ lw $v0, %lo(gItemMenuSelectedIndex)($v0) /* 13DFCC 8024AC8C 14600002 */ bnez $v1, .L8024AC98 /* 13DFD0 8024AC90 0043001A */ div $zero, $v0, $v1 /* 13DFD4 8024AC94 0007000D */ break 7 @@ -38,8 +38,8 @@ glabel pause_items_update /* 13E010 8024ACD0 10400005 */ beqz $v0, .L8024ACE8 /* 13E014 8024ACD4 00000000 */ nop .L8024ACD8: -/* 13E018 8024ACD8 3C018027 */ lui $at, 0x8027 -/* 13E01C 8024ACDC AC2005DC */ sw $zero, 0x5dc($at) +/* 13E018 8024ACD8 3C018027 */ lui $at, %hi(D_802705DC) +/* 13E01C 8024ACDC AC2005DC */ sw $zero, %lo(D_802705DC)($at) /* 13E020 8024ACE0 08092B4D */ j .L8024AD34 /* 13E024 8024ACE4 00000000 */ nop .L8024ACE8: @@ -48,13 +48,13 @@ glabel pause_items_update /* 13E030 8024ACF0 0082102A */ slt $v0, $a0, $v0 /* 13E034 8024ACF4 14400005 */ bnez $v0, .L8024AD0C /* 13E038 8024ACF8 2462FFF8 */ addiu $v0, $v1, -8 -/* 13E03C 8024ACFC 3C018027 */ lui $at, 0x8027 -/* 13E040 8024AD00 AC2205DC */ sw $v0, 0x5dc($at) +/* 13E03C 8024ACFC 3C018027 */ lui $at, %hi(D_802705DC) +/* 13E040 8024AD00 AC2205DC */ sw $v0, %lo(D_802705DC)($at) /* 13E044 8024AD04 08092B4D */ j .L8024AD34 /* 13E048 8024AD08 00000000 */ nop .L8024AD0C: -/* 13E04C 8024AD0C 3C058027 */ lui $a1, 0x8027 -/* 13E050 8024AD10 24A505DC */ addiu $a1, $a1, 0x5dc +/* 13E04C 8024AD0C 3C058027 */ lui $a1, %hi(D_802705DC) +/* 13E050 8024AD10 24A505DC */ addiu $a1, $a1, %lo(D_802705DC) /* 13E054 8024AD14 8CA20000 */ lw $v0, ($a1) /* 13E058 8024AD18 00821823 */ subu $v1, $a0, $v0 /* 13E05C 8024AD1C 28620007 */ slti $v0, $v1, 7 @@ -66,19 +66,19 @@ glabel pause_items_update /* 13E070 8024AD30 ACA20000 */ sw $v0, ($a1) .L8024AD34: /* 13E074 8024AD34 90C20002 */ lbu $v0, 2($a2) -/* 13E078 8024AD38 3C058027 */ lui $a1, 0x8027 -/* 13E07C 8024AD3C 8CA505DC */ lw $a1, 0x5dc($a1) +/* 13E078 8024AD38 3C058027 */ lui $a1, %hi(D_802705DC) +/* 13E07C 8024AD3C 8CA505DC */ lw $a1, %lo(D_802705DC)($a1) /* 13E080 8024AD40 00A20018 */ mult $a1, $v0 -/* 13E084 8024AD44 3C048027 */ lui $a0, 0x8027 -/* 13E088 8024AD48 8C8404C8 */ lw $a0, 0x4c8($a0) +/* 13E084 8024AD44 3C048027 */ lui $a0, %hi(gItemMenuCurrentPage) +/* 13E088 8024AD48 8C8404C8 */ lw $a0, %lo(gItemMenuCurrentPage)($a0) /* 13E08C 8024AD4C 00002812 */ mflo $a1 /* 13E090 8024AD50 0C09260A */ jal pause_items_get_pos_y /* 13E094 8024AD54 00000000 */ nop -/* 13E098 8024AD58 3C108027 */ lui $s0, 0x8027 -/* 13E09C 8024AD5C 261005D4 */ addiu $s0, $s0, 0x5d4 +/* 13E098 8024AD58 3C108027 */ lui $s0, %hi(gItemMenuCurrentScrollPos) +/* 13E09C 8024AD5C 261005D4 */ addiu $s0, $s0, %lo(gItemMenuCurrentScrollPos) /* 13E0A0 8024AD60 8E040000 */ lw $a0, ($s0) -/* 13E0A4 8024AD64 3C018027 */ lui $at, 0x8027 -/* 13E0A8 8024AD68 AC2205D8 */ sw $v0, 0x5d8($at) +/* 13E0A4 8024AD64 3C018027 */ lui $at, %hi(gItemMenuTargetScrollPos) +/* 13E0A8 8024AD68 AC2205D8 */ sw $v0, %lo(gItemMenuTargetScrollPos)($at) /* 13E0AC 8024AD6C 0C090D1B */ jal pause_interp_vertical_scroll /* 13E0B0 8024AD70 00442023 */ subu $a0, $v0, $a0 /* 13E0B4 8024AD74 8E030000 */ lw $v1, ($s0) diff --git a/asm/nonmatchings/code_13E120/pause_partners_cleanup.s b/asm/nonmatchings/code_13E120/pause_partners_cleanup.s index 6461cd8429..eec12563dd 100644 --- a/asm/nonmatchings/code_13E120/pause_partners_cleanup.s +++ b/asm/nonmatchings/code_13E120/pause_partners_cleanup.s @@ -16,7 +16,7 @@ glabel pause_partners_cleanup /* 13FCEC 8024C9AC 26100001 */ addiu $s0, $s0, 1 /* 13FCF0 8024C9B0 2A020008 */ slti $v0, $s0, 8 /* 13FCF4 8024C9B4 1440FFFA */ bnez $v0, .L8024C9A0 -/* 13FCF8 8024C9B8 00000000 */ nop +/* 13FCF8 8024C9B8 00000000 */ nop /* 13FCFC 8024C9BC 0000802D */ daddu $s0, $zero, $zero /* 13FD00 8024C9C0 3C118027 */ lui $s1, 0x8027 /* 13FD04 8024C9C4 26310660 */ addiu $s1, $s1, 0x660 @@ -27,11 +27,11 @@ glabel pause_partners_cleanup /* 13FD14 8024C9D4 26100001 */ addiu $s0, $s0, 1 /* 13FD18 8024C9D8 2A020008 */ slti $v0, $s0, 8 /* 13FD1C 8024C9DC 1440FFFA */ bnez $v0, .L8024C9C8 -/* 13FD20 8024C9E0 00000000 */ nop +/* 13FD20 8024C9E0 00000000 */ nop /* 13FD24 8024C9E4 8FBF0018 */ lw $ra, 0x18($sp) /* 13FD28 8024C9E8 8FB10014 */ lw $s1, 0x14($sp) /* 13FD2C 8024C9EC 8FB00010 */ lw $s0, 0x10($sp) /* 13FD30 8024C9F0 03E00008 */ jr $ra /* 13FD34 8024C9F4 27BD0020 */ addiu $sp, $sp, 0x20 -/* 13FD38 8024C9F8 00000000 */ nop -/* 13FD3C 8024C9FC 00000000 */ nop +/* 13FD38 8024C9F8 00000000 */ nop +/* 13FD3C 8024C9FC 00000000 */ nop diff --git a/include/variables.h b/include/variables.h index e18ae7a35d..d956c962ae 100644 --- a/include/variables.h +++ b/include/variables.h @@ -127,7 +127,6 @@ extern Bytecode* gPauseMenuCurrentDescIconScript; extern s8 gPauseMenuCurrentTab; extern s32 gPauseMenuCommonIconIDs[8]; extern s32 gPauseMenuTabIconIDs[6]; -extern PauseItemPage gItemMenuPages[20]; extern s32 gPauseMenuStrings[348]; extern s32 gPauseMenuIconScripts[8]; extern MenuTab* gPauseMenuTabs[7]; @@ -157,6 +156,21 @@ extern s32 gBadgeMenuBShowNotEnoughBP; extern s32 D_802703A4; extern s32 D_802703A8; +// Items +extern s16 gItemMenuItemIDs[100]; +extern s32 gItemMenuCurrentPage; +extern PauseItemPage gItemMenuPages[20]; +extern s32 gItemMenuSelectedIndex; +extern s32 gItemMenuSelectedItemID; +extern s16 gItemMenuNumItems; +extern s32 D_802705D0; +extern s32 gItemMenuCurrentScrollPos; +extern s32 gItemMenuTargetScrollPos; +extern s32 D_802705DC; +extern s32 gItemMenuLevel; +extern s32 gItemMenuCurrentTab; +extern s32 gItemMenuScrollUpIcon; + // Stats extern s32 gStatsMenuIconIDs[12]; diff --git a/undefined_syms.txt b/undefined_syms.txt index d0b1dfad47..a3bd1d9db3 100644 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -183,7 +183,19 @@ gBadgeMenuBShowNotEnoughBP = 0x802703A0; D_802703A4 = 0x802703A4; D_802703A8 = 0x802703A8; -gPauseItemPages = 0x802704D0; +gItemMenuItemIDs = 0x80270400; +gItemMenuCurrentPage = 0x802704C8; +gItemMenuPages = 0x802704D0; +gItemMenuSelectedIndex = 0x802705C0; +gItemMenuSelectedItemID = 0x802705C8; +gItemMenuNumItems = 0x802705CC; +D_802705D0 = 0x802705D0; +gItemMenuCurrentScrollPos = 0x802705D4; +gItemMenuTargetScrollPos = 0x802705D8; +D_802705DC = 0x802705DC; +gItemMenuLevel = 0x802705E0; +gItemMenuCurrentTab = 0x802705E4; +gItemMenuScrollUpIcon = 0x80270628; D_802C3000 = 0x802C3000; D_802DBD40 = 0x802DBD40;