From 124a5170b7553d4fb2be26f20d9afbe349fbf420 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Thu, 12 Nov 2020 00:18:35 -0500 Subject: [PATCH 01/10] more pause decomp --- .../code_138CC0/pause_badges_comparator.s | 39 -------- .../code_138CC0/pause_badges_draw_contents.s | 8 +- .../code_138CC0/pause_badges_handle_input.s | 20 ++--- .../code_138CC0/pause_badges_load_badges.s | 20 ++--- .../code_138CC0/pause_badges_update.s | 90 ------------------- include/common_structs.h | 2 +- include/functions.h | 4 + include/variables.h | 12 ++- src/code_135EE0.c | 4 +- src/code_138CC0.c | 54 ++++++++++- undefined_syms.txt | 11 +++ 11 files changed, 104 insertions(+), 160 deletions(-) delete mode 100644 asm/nonmatchings/code_138CC0/pause_badges_comparator.s delete mode 100644 asm/nonmatchings/code_138CC0/pause_badges_update.s diff --git a/asm/nonmatchings/code_138CC0/pause_badges_comparator.s b/asm/nonmatchings/code_138CC0/pause_badges_comparator.s deleted file mode 100644 index 71523184a5..0000000000 --- a/asm/nonmatchings/code_138CC0/pause_badges_comparator.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel pause_badges_comparator -/* 13A320 80246FE0 84820000 */ lh $v0, ($a0) -/* 13A324 80246FE4 14400003 */ bnez $v0, .L80246FF4 -/* 13A328 80246FE8 00021140 */ sll $v0, $v0, 5 -/* 13A32C 80246FEC 08091C00 */ j .L80247000 -/* 13A330 80246FF0 24037FFF */ addiu $v1, $zero, 0x7fff -.L80246FF4: -/* 13A334 80246FF4 3C038008 */ lui $v1, %hi(gItemTable+0x6) -/* 13A338 80246FF8 00621821 */ addu $v1, $v1, $v0 -/* 13A33C 80246FFC 946378E6 */ lhu $v1, %lo(gItemTable+0x6)($v1) -.L80247000: -/* 13A340 80247000 84A20000 */ lh $v0, ($a1) -/* 13A344 80247004 14400003 */ bnez $v0, .L80247014 -/* 13A348 80247008 00021140 */ sll $v0, $v0, 5 -/* 13A34C 8024700C 08091C08 */ j .L80247020 -/* 13A350 80247010 24047FFF */ addiu $a0, $zero, 0x7fff -.L80247014: -/* 13A354 80247014 3C048008 */ lui $a0, %hi(gItemTable+0x6) -/* 13A358 80247018 00822021 */ addu $a0, $a0, $v0 -/* 13A35C 8024701C 948478E6 */ lhu $a0, %lo(gItemTable+0x6)($a0) -.L80247020: -/* 13A360 80247020 00031400 */ sll $v0, $v1, 0x10 -/* 13A364 80247024 00021C03 */ sra $v1, $v0, 0x10 -/* 13A368 80247028 00041400 */ sll $v0, $a0, 0x10 -/* 13A36C 8024702C 00022403 */ sra $a0, $v0, 0x10 -/* 13A370 80247030 10640005 */ beq $v1, $a0, .L80247048 -/* 13A374 80247034 0064182A */ slt $v1, $v1, $a0 -/* 13A378 80247038 14600004 */ bnez $v1, .L8024704C -/* 13A37C 8024703C 2402FFFF */ addiu $v0, $zero, -1 -/* 13A380 80247040 03E00008 */ jr $ra -/* 13A384 80247044 24020001 */ addiu $v0, $zero, 1 -.L80247048: -/* 13A388 80247048 0000102D */ daddu $v0, $zero, $zero -.L8024704C: -/* 13A38C 8024704C 03E00008 */ jr $ra -/* 13A390 80247050 00000000 */ nop diff --git a/asm/nonmatchings/code_138CC0/pause_badges_draw_contents.s b/asm/nonmatchings/code_138CC0/pause_badges_draw_contents.s index 278f61d7a3..3dd1a70d41 100644 --- a/asm/nonmatchings/code_138CC0/pause_badges_draw_contents.s +++ b/asm/nonmatchings/code_138CC0/pause_badges_draw_contents.s @@ -42,8 +42,8 @@ glabel pause_badges_draw_contents /* 13A8DC 8024759C AFA30044 */ sw $v1, 0x44($sp) /* 13A8E0 802475A0 240300F0 */ addiu $v1, $zero, 0xf0 /* 13A8E4 802475A4 AFA30048 */ sw $v1, 0x48($sp) -/* 13A8E8 802475A8 3C038027 */ lui $v1, 0x8027 -/* 13A8EC 802475AC 8C630378 */ lw $v1, 0x378($v1) +/* 13A8E8 802475A8 3C038027 */ lui $v1, %hi(gBadgeMenuSelectedIndex) +/* 13A8EC 802475AC 8C630378 */ lw $v1, %lo(gBadgeMenuSelectedIndex)($v1) /* 13A8F0 802475B0 AFAB0018 */ sw $t3, 0x18($sp) /* 13A8F4 802475B4 15200002 */ bnez $t1, .L802475C0 /* 13A8F8 802475B8 0069001A */ div $zero, $v1, $t1 @@ -1490,8 +1490,8 @@ glabel pause_badges_draw_contents /* 13BE54 80248B14 90430001 */ lbu $v1, 1($v0) /* 13BE58 80248B18 90420002 */ lbu $v0, 2($v0) /* 13BE5C 80248B1C 00620018 */ mult $v1, $v0 -/* 13BE60 80248B20 3C108027 */ lui $s0, 0x8027 -/* 13BE64 80248B24 26100378 */ addiu $s0, $s0, 0x378 +/* 13BE60 80248B20 3C108027 */ lui $s0, %hi(gBadgeMenuSelectedIndex) +/* 13BE64 80248B24 26100378 */ addiu $s0, $s0, %lo(gBadgeMenuSelectedIndex) /* 13BE68 80248B28 8E050000 */ lw $a1, ($s0) /* 13BE6C 80248B2C 00005012 */ mflo $t2 /* 13BE70 80248B30 0C091C43 */ jal pause_badges_get_pos_x diff --git a/asm/nonmatchings/code_138CC0/pause_badges_handle_input.s b/asm/nonmatchings/code_138CC0/pause_badges_handle_input.s index 725d458a3d..79b3ac964b 100644 --- a/asm/nonmatchings/code_138CC0/pause_badges_handle_input.s +++ b/asm/nonmatchings/code_138CC0/pause_badges_handle_input.s @@ -4,8 +4,8 @@ glabel pause_badges_handle_input /* 13C3E8 802490A8 3C038027 */ lui $v1, %hi(gBadgeMenuCurrentPage) /* 13C3EC 802490AC 8C630280 */ lw $v1, %lo(gBadgeMenuCurrentPage)($v1) -/* 13C3F0 802490B0 3C098027 */ lui $t1, 0x8027 -/* 13C3F4 802490B4 8D290378 */ lw $t1, 0x378($t1) +/* 13C3F0 802490B0 3C098027 */ lui $t1, %hi(gBadgeMenuSelectedIndex) +/* 13C3F4 802490B4 8D290378 */ lw $t1, %lo(gBadgeMenuSelectedIndex)($t1) /* 13C3F8 802490B8 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 13C3FC 802490BC AFBF001C */ sw $ra, 0x1c($sp) /* 13C400 802490C0 AFB20018 */ sw $s2, 0x18($sp) @@ -115,8 +115,8 @@ glabel pause_badges_handle_input /* 13C574 80249234 3C018027 */ lui $at, 0x8027 /* 13C578 80249238 AC2003A0 */ sw $zero, 0x3a0($at) .L8024923C: -/* 13C57C 8024923C 3C028027 */ lui $v0, 0x8027 -/* 13C580 80249240 84420384 */ lh $v0, 0x384($v0) +/* 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 @@ -292,8 +292,8 @@ glabel pause_badges_handle_input /* 13C804 802494C4 00220821 */ addu $at, $at, $v0 /* 13C808 802494C8 9022028A */ lbu $v0, 0x28a($at) /* 13C80C 802494CC 00A20018 */ mult $a1, $v0 -/* 13C810 802494D0 3C108027 */ lui $s0, 0x8027 -/* 13C814 802494D4 26100378 */ addiu $s0, $s0, 0x378 +/* 13C810 802494D0 3C108027 */ lui $s0, %hi(gBadgeMenuSelectedIndex) +/* 13C814 802494D4 26100378 */ addiu $s0, $s0, %lo(gBadgeMenuSelectedIndex) /* 13C818 802494D8 00005012 */ mflo $t2 /* 13C81C 802494DC 010A1021 */ addu $v0, $t0, $t2 /* 13C820 802494E0 10490003 */ beq $v0, $t1, .L802494F0 @@ -306,16 +306,16 @@ glabel pause_badges_handle_input /* 13C838 802494F8 3C018027 */ lui $at, %hi(gBadgeMenuItemIDs) /* 13C83C 802494FC 00220821 */ addu $at, $at, $v0 /* 13C840 80249500 84220180 */ lh $v0, %lo(gBadgeMenuItemIDs)($at) -/* 13C844 80249504 3C018027 */ lui $at, 0x8027 -/* 13C848 80249508 AC220380 */ sw $v0, 0x380($at) +/* 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) /* 13C854 80249514 24020001 */ addiu $v0, $zero, 1 /* 13C858 80249518 14620014 */ bne $v1, $v0, .L8024956C /* 13C85C 8024951C 00000000 */ nop -/* 13C860 80249520 3C038027 */ lui $v1, 0x8027 -/* 13C864 80249524 8C630380 */ lw $v1, 0x380($v1) +/* 13C860 80249520 3C038027 */ lui $v1, %hi(gBadgeMenuSelectedItemID) +/* 13C864 80249524 8C630380 */ lw $v1, %lo(gBadgeMenuSelectedItemID)($v1) /* 13C868 80249528 24628002 */ addiu $v0, $v1, -0x7ffe /* 13C86C 8024952C 2C420002 */ sltiu $v0, $v0, 2 /* 13C870 80249530 1440000A */ bnez $v0, .L8024955C diff --git a/asm/nonmatchings/code_138CC0/pause_badges_load_badges.s b/asm/nonmatchings/code_138CC0/pause_badges_load_badges.s index c01fb56fa6..9100708353 100644 --- a/asm/nonmatchings/code_138CC0/pause_badges_load_badges.s +++ b/asm/nonmatchings/code_138CC0/pause_badges_load_badges.s @@ -8,8 +8,8 @@ glabel pause_badges_load_badges /* 13C0D8 80248D98 3C118011 */ lui $s1, %hi(gPlayerData) /* 13C0DC 80248D9C 2631F290 */ addiu $s1, $s1, %lo(gPlayerData) /* 13C0E0 80248DA0 AFBF0018 */ sw $ra, 0x18($sp) -/* 13C0E4 80248DA4 3C018027 */ lui $at, 0x8027 -/* 13C0E8 80248DA8 AC200388 */ sw $zero, 0x388($at) +/* 13C0E4 80248DA4 3C018027 */ lui $at, %hi(D_80270388) +/* 13C0E8 80248DA8 AC200388 */ sw $zero, %lo(D_80270388)($at) /* 13C0EC 80248DAC 14800014 */ bnez $a0, .L80248E00 /* 13C0F0 80248DB0 0000802D */ daddu $s0, $zero, $zero /* 13C0F4 80248DB4 0200202D */ daddu $a0, $s0, $zero @@ -59,8 +59,8 @@ glabel pause_badges_load_badges /* 13C18C 80248E4C A4220180 */ sh $v0, %lo(gBadgeMenuItemIDs)($at) /* 13C190 80248E50 24100001 */ addiu $s0, $zero, 1 .L80248E54: -/* 13C194 80248E54 3C018027 */ lui $at, 0x8027 -/* 13C198 80248E58 A4300384 */ sh $s0, 0x384($at) +/* 13C194 80248E54 3C018027 */ lui $at, %hi(gBadgeMenuNumItems) +/* 13C198 80248E58 A4300384 */ sh $s0, %lo(gBadgeMenuNumItems)($at) /* 13C19C 80248E5C 0200202D */ daddu $a0, $s0, $zero /* 13C1A0 80248E60 28820080 */ slti $v0, $a0, 0x80 /* 13C1A4 80248E64 1040000A */ beqz $v0, .L80248E90 @@ -79,16 +79,16 @@ glabel pause_badges_load_badges /* 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 +/* 13C1DC 80248E9C 3C078027 */ lui $a3, %hi(gBadgeMenuNumItems) +/* 13C1E0 80248EA0 24E70384 */ addiu $a3, $a3, %lo(gBadgeMenuNumItems) /* 13C1E4 80248EA4 24060001 */ addiu $a2, $zero, 1 /* 13C1E8 80248EA8 24090008 */ addiu $t1, $zero, 8 /* 13C1EC 80248EAC 24080008 */ addiu $t0, $zero, 8 /* 13C1F0 80248EB0 00A81821 */ addu $v1, $a1, $t0 -/* 13C1F4 80248EB4 3C018027 */ lui $at, 0x8027 -/* 13C1F8 80248EB8 AC200378 */ sw $zero, 0x378($at) -/* 13C1FC 80248EBC 3C018027 */ lui $at, 0x8027 -/* 13C200 80248EC0 AC200380 */ sw $zero, 0x380($at) +/* 13C1F4 80248EB4 3C018027 */ lui $at, %hi(gBadgeMenuSelectedIndex) +/* 13C1F8 80248EB8 AC200378 */ sw $zero, %lo(gBadgeMenuSelectedIndex)($at) +/* 13C1FC 80248EBC 3C018027 */ lui $at, %hi(gBadgeMenuSelectedItemID) +/* 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 diff --git a/asm/nonmatchings/code_138CC0/pause_badges_update.s b/asm/nonmatchings/code_138CC0/pause_badges_update.s deleted file mode 100644 index 13f8001375..0000000000 --- a/asm/nonmatchings/code_138CC0/pause_badges_update.s +++ /dev/null @@ -1,90 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel pause_badges_update -/* 13C95C 8024961C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 13C960 80249620 3C038027 */ lui $v1, %hi(gBadgeMenuCurrentPage) -/* 13C964 80249624 8C630280 */ lw $v1, %lo(gBadgeMenuCurrentPage)($v1) -/* 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 -/* 13C97C 8024963C 00431021 */ addu $v0, $v0, $v1 -/* 13C980 80249640 00021080 */ sll $v0, $v0, 2 -/* 13C984 80249644 00443021 */ addu $a2, $v0, $a0 -/* 13C988 80249648 90C30002 */ lbu $v1, 2($a2) -/* 13C98C 8024964C 3C028027 */ lui $v0, 0x8027 -/* 13C990 80249650 8C420378 */ lw $v0, 0x378($v0) -/* 13C994 80249654 14600002 */ bnez $v1, .L80249660 -/* 13C998 80249658 0043001A */ div $zero, $v0, $v1 -/* 13C99C 8024965C 0007000D */ break 7 -.L80249660: -/* 13C9A0 80249660 2401FFFF */ addiu $at, $zero, -1 -/* 13C9A4 80249664 14610004 */ bne $v1, $at, .L80249678 -/* 13C9A8 80249668 3C018000 */ lui $at, 0x8000 -/* 13C9AC 8024966C 14410002 */ bne $v0, $at, .L80249678 -/* 13C9B0 80249670 00000000 */ nop -/* 13C9B4 80249674 0006000D */ break 6 -.L80249678: -/* 13C9B8 80249678 00001012 */ mflo $v0 -/* 13C9BC 8024967C 90C30001 */ lbu $v1, 1($a2) -/* 13C9C0 80249680 00432023 */ subu $a0, $v0, $v1 -/* 13C9C4 80249684 28820002 */ slti $v0, $a0, 2 -/* 13C9C8 80249688 14400005 */ bnez $v0, .L802496A0 -/* 13C9CC 8024968C 00000000 */ nop -/* 13C9D0 80249690 90C20003 */ lbu $v0, 3($a2) -/* 13C9D4 80249694 2C420009 */ sltiu $v0, $v0, 9 -/* 13C9D8 80249698 10400005 */ beqz $v0, .L802496B0 -/* 13C9DC 8024969C 00000000 */ nop -.L802496A0: -/* 13C9E0 802496A0 3C018027 */ lui $at, 0x8027 -/* 13C9E4 802496A4 AC200394 */ sw $zero, 0x394($at) -/* 13C9E8 802496A8 080925BF */ j .L802496FC -/* 13C9EC 802496AC 00000000 */ nop -.L802496B0: -/* 13C9F0 802496B0 90C30003 */ lbu $v1, 3($a2) -/* 13C9F4 802496B4 2462FFFE */ addiu $v0, $v1, -2 -/* 13C9F8 802496B8 0082102A */ slt $v0, $a0, $v0 -/* 13C9FC 802496BC 14400005 */ bnez $v0, .L802496D4 -/* 13CA00 802496C0 2462FFF8 */ addiu $v0, $v1, -8 -/* 13CA04 802496C4 3C018027 */ lui $at, 0x8027 -/* 13CA08 802496C8 AC220394 */ sw $v0, 0x394($at) -/* 13CA0C 802496CC 080925BF */ j .L802496FC -/* 13CA10 802496D0 00000000 */ nop -.L802496D4: -/* 13CA14 802496D4 3C058027 */ lui $a1, 0x8027 -/* 13CA18 802496D8 24A50394 */ addiu $a1, $a1, 0x394 -/* 13CA1C 802496DC 8CA20000 */ lw $v0, ($a1) -/* 13CA20 802496E0 00821823 */ subu $v1, $a0, $v0 -/* 13CA24 802496E4 28620007 */ slti $v0, $v1, 7 -/* 13CA28 802496E8 10400003 */ beqz $v0, .L802496F8 -/* 13CA2C 802496EC 2482FFFA */ addiu $v0, $a0, -6 -/* 13CA30 802496F0 1C600002 */ bgtz $v1, .L802496FC -/* 13CA34 802496F4 2482FFFF */ addiu $v0, $a0, -1 -.L802496F8: -/* 13CA38 802496F8 ACA20000 */ sw $v0, ($a1) -.L802496FC: -/* 13CA3C 802496FC 90C20002 */ lbu $v0, 2($a2) -/* 13CA40 80249700 3C058027 */ lui $a1, 0x8027 -/* 13CA44 80249704 8CA50394 */ lw $a1, 0x394($a1) -/* 13CA48 80249708 00A20018 */ mult $a1, $v0 -/* 13CA4C 8024970C 3C048027 */ lui $a0, %hi(gBadgeMenuCurrentPage) -/* 13CA50 80249710 8C840280 */ lw $a0, %lo(gBadgeMenuCurrentPage)($a0) -/* 13CA54 80249714 00002812 */ mflo $a1 -/* 13CA58 80249718 0C091C5A */ jal pause_badges_get_pos_y -/* 13CA5C 8024971C 00000000 */ nop -/* 13CA60 80249720 3C108027 */ lui $s0, %hi(gBadgeMenuCurrentScrollPos) -/* 13CA64 80249724 2610038C */ addiu $s0, $s0, %lo(gBadgeMenuCurrentScrollPos) -/* 13CA68 80249728 8E040000 */ lw $a0, ($s0) -/* 13CA6C 8024972C 3C018027 */ lui $at, %hi(gBadgeMenuTargetScrollPos) -/* 13CA70 80249730 AC220390 */ sw $v0, %lo(gBadgeMenuTargetScrollPos)($at) -/* 13CA74 80249734 0C090D1B */ jal pause_interp_vertical_scroll -/* 13CA78 80249738 00442023 */ subu $a0, $v0, $a0 -/* 13CA7C 8024973C 8E030000 */ lw $v1, ($s0) -/* 13CA80 80249740 00621821 */ addu $v1, $v1, $v0 -/* 13CA84 80249744 AE030000 */ sw $v1, ($s0) -/* 13CA88 80249748 8FBF0014 */ lw $ra, 0x14($sp) -/* 13CA8C 8024974C 8FB00010 */ lw $s0, 0x10($sp) -/* 13CA90 80249750 03E00008 */ jr $ra -/* 13CA94 80249754 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/include/common_structs.h b/include/common_structs.h index 55c0498715..1a9f77a631 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -1537,7 +1537,7 @@ typedef struct { /* 0x00 */ s8 enabled; /* 0x01 */ u8 listStart; /* 0x02 */ u8 numCols; - /* 0x03 */ s8 numRows; + /* 0x03 */ u8 numRows; /* 0x04 */ s32 startIndex; /* 0x08 */ s32 count; } PauseItemPage; // size = 0xC diff --git a/include/functions.h b/include/functions.h index ecbedf85a7..8681adcc8f 100644 --- a/include/functions.h +++ b/include/functions.h @@ -79,6 +79,10 @@ s32 func_800EB168(s32); PlayerData* get_player_data(void); +// Pause +s32 pause_interp_vertical_scroll(s32 deltaBefore); +void pause_draw_rect(s32 ulx, s32 uly, s32 lrx, s32 lry, s32 tileDescriptor, s32 uls, s32 ult, s32 dsdx, s32 dtdy); + // Partner void func_800EBA3C(Npc* partner); void func_800EBB40(Npc* partner); diff --git a/include/variables.h b/include/variables.h index 161014267a..e18ae7a35d 100644 --- a/include/variables.h +++ b/include/variables.h @@ -141,11 +141,21 @@ extern u8 gPauseMenuTextScrollInterpEasingLUT[16]; extern u8 gPauseMenuPageScrollInterpEasingLUT[16]; // Badges -extern PauseItemPage gBadgeMenuPages[20]; extern s32 gBadgeMenuCurrentScrollPos; extern s32 gBadgeMenuTargetScrollPos; extern ItemId gBadgeMenuItemIDs[128]; extern s32 gBadgeMenuCurrentPage; +extern PauseItemPage gBadgeMenuPages[20]; +extern s32 gBadgeMenuSelectedIndex; +extern s32 gBadgeMenuSelectedItemID; +extern s16 gBadgeMenuNumItems; +extern s32 D_80270388; +extern s32 D_80270394; +extern s32 gBadgeMenuLevel; +extern s32 gBadgeMenuCurrentTab; +extern s32 gBadgeMenuBShowNotEnoughBP; +extern s32 D_802703A4; +extern s32 D_802703A8; // Stats extern s32 gStatsMenuIconIDs[12]; diff --git a/src/code_135EE0.c b/src/code_135EE0.c index 90f19f5fc9..b04277de28 100644 --- a/src/code_135EE0.c +++ b/src/code_135EE0.c @@ -114,7 +114,7 @@ s32 pause_interp_vertical_scroll(s32 deltaBefore) { return val * s; } #else -INCLUDE_ASM(s32, "code_135EE0", pause_interp_vertical_scroll); +INCLUDE_ASM(s32, "code_135EE0", pause_interp_vertical_scroll, s32 deltaBefore); #endif void pause_update_cursor(s32 arg0, s32 offsetX, s32 offsetY) { @@ -149,7 +149,7 @@ INCLUDE_ASM(s32, "code_135EE0", pause_cleanup); INCLUDE_ASM(s32, "code_135EE0", pause_get_total_equipped_bp_cost); -INCLUDE_ASM(s32, "code_135EE0", pause_draw_rect); +INCLUDE_ASM(void, "code_135EE0", pause_draw_rect, s32 ulx, s32 uly, s32 lrx, s32 lry, s32 tileDescriptor, s32 uls, s32 ult, s32 dsdx, s32 dtdy); INCLUDE_ASM(s32, "code_135EE0", pause_sort_item_list); diff --git a/src/code_138CC0.c b/src/code_138CC0.c index 4818d3286c..a41cb78856 100644 --- a/src/code_138CC0.c +++ b/src/code_138CC0.c @@ -15,13 +15,36 @@ void pause_stats_cleanup(void) { } } -INCLUDE_ASM(s32, "code_138CC0", pause_badges_comparator); +s32 pause_badges_comparator(s16* a, s16* b) { + s16 aVal; + s16 bVal; + + if (*a == 0) { + aVal = ~0x8000; + } else { + aVal = gItemTable[*a].badgeSortPriority; + } + + if (*b == 0) { + bVal = ~0x8000; + } else { + bVal = gItemTable[*b].badgeSortPriority; + } + + if (aVal == bVal) { + return 0; + } else if (aVal < bVal) { + return -1; + } else { + return 1; + } +} s32 pause_badges_count_all(void) { PlayerData* playerData = PLAYER_DATA; s32 i; - pause_sort_item_list(playerData->badges, ARRAY_COUNT(playerData->badges), &pause_badges_comparator); + pause_sort_item_list(playerData->badges, ARRAY_COUNT(playerData->badges), pause_badges_comparator); for (i = 0; i < ARRAY_COUNT(playerData->badges); i++) { if (playerData->badges[i] == 0) { @@ -94,6 +117,31 @@ INCLUDE_ASM(s32, "code_138CC0", pause_badges_init); INCLUDE_ASM(s32, "code_138CC0", pause_badges_handle_input); -INCLUDE_ASM(s32, "code_138CC0", pause_badges_update); +void pause_badges_update(void) { + PauseItemPage* menuPages = gBadgeMenuPages; + PauseItemPage* currentMenuPage = &menuPages[gBadgeMenuCurrentPage]; + s32 temp = (gBadgeMenuSelectedIndex / currentMenuPage->numCols) - currentMenuPage->listStart; + s32* currentScrollPos; + + if ((temp < 2) || currentMenuPage->numRows < 9) { + D_80270394 = 0; + } else if (temp >= currentMenuPage->numRows - 2) { + D_80270394 = currentMenuPage->numRows - 8; + } else { + s32* unkSym = &D_80270394; + + if (temp - *unkSym >= 7) { + *unkSym = temp - 6; + } else { + if (temp - *unkSym <= 0) { + *unkSym = temp - 1; + } + } + } + + currentScrollPos = &gBadgeMenuCurrentScrollPos; + gBadgeMenuTargetScrollPos = pause_badges_get_pos_y(gBadgeMenuCurrentPage, D_80270394 * currentMenuPage->numCols); + *currentScrollPos += pause_interp_vertical_scroll(gBadgeMenuTargetScrollPos - *currentScrollPos); +} INCLUDE_ASM(s32, "code_138CC0", pause_badges_cleanup); diff --git a/undefined_syms.txt b/undefined_syms.txt index 347c7102d8..d0b1dfad47 100644 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -170,8 +170,19 @@ gStatsMenuIconIDs = 0x80270150; gBadgeMenuItemIDs = 0x80270180; gBadgeMenuCurrentPage = 0x80270280; gBadgeMenuPages = 0x80270288; +gBadgeMenuSelectedIndex = 0x80270378; +gBadgeMenuSelectedItemID = 0x80270380; +gBadgeMenuNumItems = 0x80270384; +D_80270388 = 0x80270388; gBadgeMenuCurrentScrollPos = 0x8027038C; gBadgeMenuTargetScrollPos = 0x80270390; +D_80270394 = 0x80270394; +gBadgeMenuLevel = 0x80270398; +gBadgeMenuCurrentTab = 0x8027039C; +gBadgeMenuBShowNotEnoughBP = 0x802703A0; +D_802703A4 = 0x802703A4; +D_802703A8 = 0x802703A8; + gPauseItemPages = 0x802704D0; D_802C3000 = 0x802C3000; From 89132f5cc1a99a50d610a6b928343f0db5b7c61c Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Thu, 12 Nov 2020 00:22:50 -0500 Subject: [PATCH 02/10] partner c file --- .../pause_partners_cleanup.s | 8 +++---- .../pause_partners_draw_contents.s | 0 .../pause_partners_draw_movelist.s | 0 .../pause_partners_draw_movelist_flower.s | 0 .../pause_partners_draw_movelist_title.s | 0 .../pause_partners_draw_title.s | 0 .../pause_partners_handle_input.s | 0 .../pause_partners_init.s | 0 .../pause_partners_load_portrait.s | 0 .../pause_partners_update.s | 0 src/code_13CAF0.c | 20 ------------------ src/code_13E120.c | 21 +++++++++++++++++++ tools/splat.yaml | 1 + 13 files changed, 26 insertions(+), 24 deletions(-) rename asm/nonmatchings/{code_13CAF0 => code_13E120}/pause_partners_cleanup.s (90%) rename asm/nonmatchings/{code_13CAF0 => code_13E120}/pause_partners_draw_contents.s (100%) rename asm/nonmatchings/{code_13CAF0 => code_13E120}/pause_partners_draw_movelist.s (100%) rename asm/nonmatchings/{code_13CAF0 => code_13E120}/pause_partners_draw_movelist_flower.s (100%) rename asm/nonmatchings/{code_13CAF0 => code_13E120}/pause_partners_draw_movelist_title.s (100%) rename asm/nonmatchings/{code_13CAF0 => code_13E120}/pause_partners_draw_title.s (100%) rename asm/nonmatchings/{code_13CAF0 => code_13E120}/pause_partners_handle_input.s (100%) rename asm/nonmatchings/{code_13CAF0 => code_13E120}/pause_partners_init.s (100%) rename asm/nonmatchings/{code_13CAF0 => code_13E120}/pause_partners_load_portrait.s (100%) rename asm/nonmatchings/{code_13CAF0 => code_13E120}/pause_partners_update.s (100%) create mode 100644 src/code_13E120.c diff --git a/asm/nonmatchings/code_13CAF0/pause_partners_cleanup.s b/asm/nonmatchings/code_13E120/pause_partners_cleanup.s similarity index 90% rename from asm/nonmatchings/code_13CAF0/pause_partners_cleanup.s rename to asm/nonmatchings/code_13E120/pause_partners_cleanup.s index eec12563dd..6461cd8429 100644 --- a/asm/nonmatchings/code_13CAF0/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/asm/nonmatchings/code_13CAF0/pause_partners_draw_contents.s b/asm/nonmatchings/code_13E120/pause_partners_draw_contents.s similarity index 100% rename from asm/nonmatchings/code_13CAF0/pause_partners_draw_contents.s rename to asm/nonmatchings/code_13E120/pause_partners_draw_contents.s diff --git a/asm/nonmatchings/code_13CAF0/pause_partners_draw_movelist.s b/asm/nonmatchings/code_13E120/pause_partners_draw_movelist.s similarity index 100% rename from asm/nonmatchings/code_13CAF0/pause_partners_draw_movelist.s rename to asm/nonmatchings/code_13E120/pause_partners_draw_movelist.s diff --git a/asm/nonmatchings/code_13CAF0/pause_partners_draw_movelist_flower.s b/asm/nonmatchings/code_13E120/pause_partners_draw_movelist_flower.s similarity index 100% rename from asm/nonmatchings/code_13CAF0/pause_partners_draw_movelist_flower.s rename to asm/nonmatchings/code_13E120/pause_partners_draw_movelist_flower.s diff --git a/asm/nonmatchings/code_13CAF0/pause_partners_draw_movelist_title.s b/asm/nonmatchings/code_13E120/pause_partners_draw_movelist_title.s similarity index 100% rename from asm/nonmatchings/code_13CAF0/pause_partners_draw_movelist_title.s rename to asm/nonmatchings/code_13E120/pause_partners_draw_movelist_title.s diff --git a/asm/nonmatchings/code_13CAF0/pause_partners_draw_title.s b/asm/nonmatchings/code_13E120/pause_partners_draw_title.s similarity index 100% rename from asm/nonmatchings/code_13CAF0/pause_partners_draw_title.s rename to asm/nonmatchings/code_13E120/pause_partners_draw_title.s diff --git a/asm/nonmatchings/code_13CAF0/pause_partners_handle_input.s b/asm/nonmatchings/code_13E120/pause_partners_handle_input.s similarity index 100% rename from asm/nonmatchings/code_13CAF0/pause_partners_handle_input.s rename to asm/nonmatchings/code_13E120/pause_partners_handle_input.s diff --git a/asm/nonmatchings/code_13CAF0/pause_partners_init.s b/asm/nonmatchings/code_13E120/pause_partners_init.s similarity index 100% rename from asm/nonmatchings/code_13CAF0/pause_partners_init.s rename to asm/nonmatchings/code_13E120/pause_partners_init.s diff --git a/asm/nonmatchings/code_13CAF0/pause_partners_load_portrait.s b/asm/nonmatchings/code_13E120/pause_partners_load_portrait.s similarity index 100% rename from asm/nonmatchings/code_13CAF0/pause_partners_load_portrait.s rename to asm/nonmatchings/code_13E120/pause_partners_load_portrait.s diff --git a/asm/nonmatchings/code_13CAF0/pause_partners_update.s b/asm/nonmatchings/code_13E120/pause_partners_update.s similarity index 100% rename from asm/nonmatchings/code_13CAF0/pause_partners_update.s rename to asm/nonmatchings/code_13E120/pause_partners_update.s diff --git a/src/code_13CAF0.c b/src/code_13CAF0.c index d3cb67d706..fc0856706e 100644 --- a/src/code_13CAF0.c +++ b/src/code_13CAF0.c @@ -29,23 +29,3 @@ INCLUDE_ASM(s32, "code_13CAF0", pause_items_handle_input); INCLUDE_ASM(s32, "code_13CAF0", pause_items_update); INCLUDE_ASM(s32, "code_13CAF0", pause_items_cleanup); - -INCLUDE_ASM(s32, "code_13CAF0", pause_partners_load_portrait); - -INCLUDE_ASM(s32, "code_13CAF0", pause_partners_draw_contents); - -INCLUDE_ASM(s32, "code_13CAF0", pause_partners_draw_title); - -INCLUDE_ASM(s32, "code_13CAF0", pause_partners_draw_movelist); - -INCLUDE_ASM(s32, "code_13CAF0", pause_partners_draw_movelist_title); - -INCLUDE_ASM(s32, "code_13CAF0", pause_partners_draw_movelist_flower); - -INCLUDE_ASM(s32, "code_13CAF0", pause_partners_init); - -INCLUDE_ASM(s32, "code_13CAF0", pause_partners_handle_input); - -INCLUDE_ASM(s32, "code_13CAF0", pause_partners_update); - -INCLUDE_ASM(s32, "code_13CAF0", pause_partners_cleanup); diff --git a/src/code_13E120.c b/src/code_13E120.c new file mode 100644 index 0000000000..032bc7145f --- /dev/null +++ b/src/code_13E120.c @@ -0,0 +1,21 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_13E120", pause_partners_load_portrait); + +INCLUDE_ASM(s32, "code_13E120", pause_partners_draw_contents); + +INCLUDE_ASM(s32, "code_13E120", pause_partners_draw_title); + +INCLUDE_ASM(s32, "code_13E120", pause_partners_draw_movelist); + +INCLUDE_ASM(s32, "code_13E120", pause_partners_draw_movelist_title); + +INCLUDE_ASM(s32, "code_13E120", pause_partners_draw_movelist_flower); + +INCLUDE_ASM(s32, "code_13E120", pause_partners_init); + +INCLUDE_ASM(s32, "code_13E120", pause_partners_handle_input); + +INCLUDE_ASM(s32, "code_13E120", pause_partners_update); + +INCLUDE_ASM(s32, "code_13E120", pause_partners_cleanup); diff --git a/tools/splat.yaml b/tools/splat.yaml index 403d2610d8..eb9530570c 100644 --- a/tools/splat.yaml +++ b/tools/splat.yaml @@ -304,6 +304,7 @@ segments: - [0x135EE0, c] - [0x138CC0, c] - [0x13CAF0, c] + - [0x13E120, c] - [0x13FD40, c] - [0x140C70, c] - [0x1421C0, c] From af1a04b44002932e2764acca0fe1bf0ea1e38662 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Thu, 12 Nov 2020 00:32:25 -0500 Subject: [PATCH 03/10] 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; From 0f72d512b385666b69357878f9435b782483d5b8 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Thu, 12 Nov 2020 00:44:10 -0500 Subject: [PATCH 04/10] item decomp --- .../code_13CAF0/pause_items_comparator.s | 13 ------- .../code_13CAF0/pause_items_get_column.s | 24 ------------- .../code_13CAF0/pause_items_get_pos_x.s | 28 --------------- .../code_13CAF0/pause_items_get_pos_y.s | 34 ------------------ .../code_13CAF0/pause_items_get_row.s | 26 -------------- .../code_13CAF0/pause_items_is_visible.s | 15 -------- .../code_13CAF0/pause_items_scroll_offset_y.s | 8 ----- include/macros.h | 1 + src/code_135EE0.c | 3 +- src/code_13CAF0.c | 35 +++++++++++++++---- 10 files changed, 31 insertions(+), 156 deletions(-) delete mode 100644 asm/nonmatchings/code_13CAF0/pause_items_comparator.s delete mode 100644 asm/nonmatchings/code_13CAF0/pause_items_get_column.s delete mode 100644 asm/nonmatchings/code_13CAF0/pause_items_get_pos_x.s delete mode 100644 asm/nonmatchings/code_13CAF0/pause_items_get_pos_y.s delete mode 100644 asm/nonmatchings/code_13CAF0/pause_items_get_row.s delete mode 100644 asm/nonmatchings/code_13CAF0/pause_items_is_visible.s delete mode 100644 asm/nonmatchings/code_13CAF0/pause_items_scroll_offset_y.s diff --git a/asm/nonmatchings/code_13CAF0/pause_items_comparator.s b/asm/nonmatchings/code_13CAF0/pause_items_comparator.s deleted file mode 100644 index f962d919a0..0000000000 --- a/asm/nonmatchings/code_13CAF0/pause_items_comparator.s +++ /dev/null @@ -1,13 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel pause_items_comparator -/* 13CAF0 802497B0 84840000 */ lh $a0, ($a0) -/* 13CAF4 802497B4 84A30000 */ lh $v1, ($a1) -/* 13CAF8 802497B8 0064182A */ slt $v1, $v1, $a0 -/* 13CAFC 802497BC 14600002 */ bnez $v1, .L802497C8 -/* 13CB00 802497C0 24020001 */ addiu $v0, $zero, 1 -/* 13CB04 802497C4 2402FFFF */ addiu $v0, $zero, -1 -.L802497C8: -/* 13CB08 802497C8 03E00008 */ jr $ra -/* 13CB0C 802497CC 00000000 */ nop diff --git a/asm/nonmatchings/code_13CAF0/pause_items_get_column.s b/asm/nonmatchings/code_13CAF0/pause_items_get_column.s deleted file mode 100644 index 34afe73c97..0000000000 --- a/asm/nonmatchings/code_13CAF0/pause_items_get_column.s +++ /dev/null @@ -1,24 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel pause_items_get_column -/* 13CBD8 80249898 00041040 */ sll $v0, $a0, 1 -/* 13CBDC 8024989C 00441021 */ addu $v0, $v0, $a0 -/* 13CBE0 802498A0 00021080 */ sll $v0, $v0, 2 -/* 13CBE4 802498A4 3C018027 */ lui $at, 0x8027 -/* 13CBE8 802498A8 00220821 */ addu $at, $at, $v0 -/* 13CBEC 802498AC 902204D2 */ lbu $v0, 0x4d2($at) -/* 13CBF0 802498B0 14400002 */ bnez $v0, .L802498BC -/* 13CBF4 802498B4 00A2001A */ div $zero, $a1, $v0 -/* 13CBF8 802498B8 0007000D */ break 7 -.L802498BC: -/* 13CBFC 802498BC 2401FFFF */ addiu $at, $zero, -1 -/* 13CC00 802498C0 14410004 */ bne $v0, $at, .L802498D4 -/* 13CC04 802498C4 3C018000 */ lui $at, 0x8000 -/* 13CC08 802498C8 14A10002 */ bne $a1, $at, .L802498D4 -/* 13CC0C 802498CC 00000000 */ nop -/* 13CC10 802498D0 0006000D */ break 6 -.L802498D4: -/* 13CC14 802498D4 00001010 */ mfhi $v0 -/* 13CC18 802498D8 03E00008 */ jr $ra -/* 13CC1C 802498DC 00000000 */ nop diff --git a/asm/nonmatchings/code_13CAF0/pause_items_get_pos_x.s b/asm/nonmatchings/code_13CAF0/pause_items_get_pos_x.s deleted file mode 100644 index ee0e2a64b0..0000000000 --- a/asm/nonmatchings/code_13CAF0/pause_items_get_pos_x.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel pause_items_get_pos_x -/* 13CB10 802497D0 00041040 */ sll $v0, $a0, 1 -/* 13CB14 802497D4 00441021 */ addu $v0, $v0, $a0 -/* 13CB18 802497D8 00021080 */ sll $v0, $v0, 2 -/* 13CB1C 802497DC 3C018027 */ lui $at, 0x8027 -/* 13CB20 802497E0 00220821 */ addu $at, $at, $v0 -/* 13CB24 802497E4 902204D2 */ lbu $v0, 0x4d2($at) -/* 13CB28 802497E8 14400002 */ bnez $v0, .L802497F4 -/* 13CB2C 802497EC 00A2001A */ div $zero, $a1, $v0 -/* 13CB30 802497F0 0007000D */ break 7 -.L802497F4: -/* 13CB34 802497F4 2401FFFF */ addiu $at, $zero, -1 -/* 13CB38 802497F8 14410004 */ bne $v0, $at, .L8024980C -/* 13CB3C 802497FC 3C018000 */ lui $at, 0x8000 -/* 13CB40 80249800 14A10002 */ bne $a1, $at, .L8024980C -/* 13CB44 80249804 00000000 */ nop -/* 13CB48 80249808 0006000D */ break 6 -.L8024980C: -/* 13CB4C 8024980C 00001810 */ mfhi $v1 -/* 13CB50 80249810 00031040 */ sll $v0, $v1, 1 -/* 13CB54 80249814 00431021 */ addu $v0, $v0, $v1 -/* 13CB58 80249818 00021100 */ sll $v0, $v0, 4 -/* 13CB5C 8024981C 00431021 */ addu $v0, $v0, $v1 -/* 13CB60 80249820 03E00008 */ jr $ra -/* 13CB64 80249824 00021040 */ sll $v0, $v0, 1 diff --git a/asm/nonmatchings/code_13CAF0/pause_items_get_pos_y.s b/asm/nonmatchings/code_13CAF0/pause_items_get_pos_y.s deleted file mode 100644 index 6b1c236cd6..0000000000 --- a/asm/nonmatchings/code_13CAF0/pause_items_get_pos_y.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel pause_items_get_pos_y -/* 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 -/* 13CB7C 8024983C 00621821 */ addu $v1, $v1, $v0 -/* 13CB80 80249840 90620002 */ lbu $v0, 2($v1) -/* 13CB84 80249844 14400002 */ bnez $v0, .L80249850 -/* 13CB88 80249848 00A2001A */ div $zero, $a1, $v0 -/* 13CB8C 8024984C 0007000D */ break 7 -.L80249850: -/* 13CB90 80249850 2401FFFF */ addiu $at, $zero, -1 -/* 13CB94 80249854 14410004 */ bne $v0, $at, .L80249868 -/* 13CB98 80249858 3C018000 */ lui $at, 0x8000 -/* 13CB9C 8024985C 14A10002 */ bne $a1, $at, .L80249868 -/* 13CBA0 80249860 00000000 */ nop -/* 13CBA4 80249864 0006000D */ break 6 -.L80249868: -/* 13CBA8 80249868 00002812 */ mflo $a1 -/* 13CBAC 8024986C 24840001 */ addiu $a0, $a0, 1 -/* 13CBB0 80249870 90630001 */ lbu $v1, 1($v1) -/* 13CBB4 80249874 00041040 */ sll $v0, $a0, 1 -/* 13CBB8 80249878 00441021 */ addu $v0, $v0, $a0 -/* 13CBBC 8024987C 00021080 */ sll $v0, $v0, 2 -/* 13CBC0 80249880 00441023 */ subu $v0, $v0, $a0 -/* 13CBC4 80249884 00031900 */ sll $v1, $v1, 4 -/* 13CBC8 80249888 00431021 */ addu $v0, $v0, $v1 -/* 13CBCC 8024988C 00052900 */ sll $a1, $a1, 4 -/* 13CBD0 80249890 03E00008 */ jr $ra -/* 13CBD4 80249894 00451021 */ addu $v0, $v0, $a1 diff --git a/asm/nonmatchings/code_13CAF0/pause_items_get_row.s b/asm/nonmatchings/code_13CAF0/pause_items_get_row.s deleted file mode 100644 index 6e2446ee0b..0000000000 --- a/asm/nonmatchings/code_13CAF0/pause_items_get_row.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel pause_items_get_row -/* 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 -/* 13CC34 802498F4 00431021 */ addu $v0, $v0, $v1 -/* 13CC38 802498F8 90430002 */ lbu $v1, 2($v0) -/* 13CC3C 802498FC 14600002 */ bnez $v1, .L80249908 -/* 13CC40 80249900 00A3001A */ div $zero, $a1, $v1 -/* 13CC44 80249904 0007000D */ break 7 -.L80249908: -/* 13CC48 80249908 2401FFFF */ addiu $at, $zero, -1 -/* 13CC4C 8024990C 14610004 */ bne $v1, $at, .L80249920 -/* 13CC50 80249910 3C018000 */ lui $at, 0x8000 -/* 13CC54 80249914 14A10002 */ bne $a1, $at, .L80249920 -/* 13CC58 80249918 00000000 */ nop -/* 13CC5C 8024991C 0006000D */ break 6 -.L80249920: -/* 13CC60 80249920 00002812 */ mflo $a1 -/* 13CC64 80249924 90420001 */ lbu $v0, 1($v0) -/* 13CC68 80249928 03E00008 */ jr $ra -/* 13CC6C 8024992C 00451021 */ addu $v0, $v0, $a1 diff --git a/asm/nonmatchings/code_13CAF0/pause_items_is_visible.s b/asm/nonmatchings/code_13CAF0/pause_items_is_visible.s deleted file mode 100644 index 3ccac10346..0000000000 --- a/asm/nonmatchings/code_13CAF0/pause_items_is_visible.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel pause_items_is_visible -/* 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 -/* 13CC84 80249944 24620080 */ addiu $v0, $v1, 0x80 -/* 13CC88 80249948 03E00008 */ jr $ra -/* 13CC8C 8024994C 0082102A */ slt $v0, $a0, $v0 -.L80249950: -/* 13CC90 80249950 03E00008 */ jr $ra -/* 13CC94 80249954 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/code_13CAF0/pause_items_scroll_offset_y.s b/asm/nonmatchings/code_13CAF0/pause_items_scroll_offset_y.s deleted file mode 100644 index 0aabdf6cb4..0000000000 --- a/asm/nonmatchings/code_13CAF0/pause_items_scroll_offset_y.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel pause_items_scroll_offset_y -/* 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/include/macros.h b/include/macros.h index 5dc8a24c15..b9e260db5d 100644 --- a/include/macros.h +++ b/include/macros.h @@ -24,6 +24,7 @@ #define CURRENT_CAM (&gCameras[gCurrentCameraID]) #define BADGE_MENU_PAGE(index) (&gBadgeMenuPages[index]) +#define ITEM_MENU_PAGE(index) (&gItemMenuPages[index]) #define MAX_MAPVARS 16 #define MAX_MAPFLAGS 3 diff --git a/src/code_135EE0.c b/src/code_135EE0.c index b04277de28..a76329be3f 100644 --- a/src/code_135EE0.c +++ b/src/code_135EE0.c @@ -149,7 +149,8 @@ INCLUDE_ASM(s32, "code_135EE0", pause_cleanup); INCLUDE_ASM(s32, "code_135EE0", pause_get_total_equipped_bp_cost); -INCLUDE_ASM(void, "code_135EE0", pause_draw_rect, s32 ulx, s32 uly, s32 lrx, s32 lry, s32 tileDescriptor, s32 uls, s32 ult, s32 dsdx, s32 dtdy); +INCLUDE_ASM(void, "code_135EE0", pause_draw_rect, s32 ulx, s32 uly, s32 lrx, s32 lry, s32 tileDescriptor, s32 uls, + s32 ult, s32 dsdx, s32 dtdy); INCLUDE_ASM(s32, "code_135EE0", pause_sort_item_list); diff --git a/src/code_13CAF0.c b/src/code_13CAF0.c index fc0856706e..0aa8c32695 100644 --- a/src/code_13CAF0.c +++ b/src/code_13CAF0.c @@ -1,18 +1,39 @@ #include "common.h" -INCLUDE_ASM(s32, "code_13CAF0", pause_items_comparator); +s32 pause_items_comparator(s16* a, s16* b) { + if (*a > *b) { + return 1; + } else { + return -1; + } +} -INCLUDE_ASM(s32, "code_13CAF0", pause_items_get_pos_x); +s32 pause_items_get_pos_x(s32 page, s32 itemIndex) { + return (itemIndex % ITEM_MENU_PAGE(page)->numCols) * 98; +} -INCLUDE_ASM(s32, "code_13CAF0", pause_items_get_pos_y); +s32 pause_items_get_pos_y(s32 page, s32 itemIndex) { + return ((page + 1) * 11) + (ITEM_MENU_PAGE(page)->listStart * 16) + ((itemIndex / ITEM_MENU_PAGE(page)->numCols) * 16); +} -INCLUDE_ASM(s32, "code_13CAF0", pause_items_get_column); +s32 pause_items_get_column(s32 page, s32 itemIdx) { + return itemIdx % ITEM_MENU_PAGE(page)->numCols; +} -INCLUDE_ASM(s32, "code_13CAF0", pause_items_get_row); +s32 pause_items_get_row(s32 page, s32 itemIdx) { + return ITEM_MENU_PAGE(page)->listStart + (itemIdx / ITEM_MENU_PAGE(page)->numCols); +} -INCLUDE_ASM(s32, "code_13CAF0", pause_items_is_visible); +s32 pause_items_is_visible(s32 y) { + if (y < gItemMenuCurrentScrollPos - 32) { + return FALSE; + } + return y < gItemMenuCurrentScrollPos + 128; +} -INCLUDE_ASM(s32, "code_13CAF0", pause_items_scroll_offset_y); +s32 pause_items_scroll_offset_y(s32 beforeY) { + return beforeY - gItemMenuCurrentScrollPos; +} s32 pause_items_scroll_offset_x(s32 beforeX) { return beforeX; From eeea8798c7345bda6e3d162e216144e88ea821a7 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Thu, 12 Nov 2020 00:51:12 -0500 Subject: [PATCH 05/10] baby --- src/code_1421C0.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/code_1421C0.c b/src/code_1421C0.c index 7b7b7870f2..7e26d9697e 100644 --- a/src/code_1421C0.c +++ b/src/code_1421C0.c @@ -1,5 +1,12 @@ #include "common.h" +// Needs .data section +#ifdef NON_MATCHING +s32 pause_get_menu_string(s32 index) { + return gPauseMenuStrings[index]; +} +#else INCLUDE_ASM(s32, "code_1421C0", pause_get_menu_string); +#endif INCLUDE_ASM(s32, "code_1421C0", pause_draw_menu_label); From 38f3e12f66e1fc2e6d3051007ed4c9d941fcd7a4 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Thu, 12 Nov 2020 13:38:17 -0500 Subject: [PATCH 06/10] UI Panels --- asm/nonmatchings/code_135EE0/func_80242BAC.s | 4 +- asm/nonmatchings/code_135EE0/func_80242D04.s | 4 +- asm/nonmatchings/code_135EE0/func_80242F90.s | 4 +- asm/nonmatchings/code_135EE0/func_80242FBC.s | 4 +- asm/nonmatchings/code_135EE0/func_80242FF4.s | 4 +- asm/nonmatchings/code_135EE0/func_80243090.s | 4 +- asm/nonmatchings/code_135EE0/func_802430E4.s | 4 +- asm/nonmatchings/code_135EE0/func_8024313C.s | 4 +- asm/nonmatchings/code_135EE0/func_80243188.s | 4 +- asm/nonmatchings/code_135EE0/func_80243238.s | 4 +- asm/nonmatchings/code_135EE0/func_802432E8.s | 4 +- asm/nonmatchings/code_135EE0/func_80243388.s | 4 +- asm/nonmatchings/code_135EE0/pause_init.s | 4 +- .../code_135EE0/pause_tabs_update.s | 8 ++-- asm/nonmatchings/code_163400/func_80242E00.s | 4 +- asm/nonmatchings/code_163400/func_8024330C.s | 4 +- asm/nonmatchings/code_163400/func_80243380.s | 4 +- asm/nonmatchings/code_163400/func_802433F4.s | 4 +- asm/nonmatchings/code_163400/func_80243468.s | 4 +- asm/nonmatchings/code_163400/func_80243550.s | 4 +- asm/nonmatchings/code_163400/func_802435C4.s | 4 +- asm/nonmatchings/code_163400/func_80243628.s | 4 +- asm/nonmatchings/code_163400/func_8024368C.s | 4 +- asm/nonmatchings/code_163400/func_802436F0.s | 4 +- asm/nonmatchings/code_163400/func_80243754.s | 4 +- asm/nonmatchings/code_163400/func_802437B8.s | 4 +- asm/nonmatchings/code_163400/func_8024381C.s | 4 +- asm/nonmatchings/code_163400/func_80243898.s | 4 +- asm/nonmatchings/code_163400/func_80243908.s | 4 +- asm/nonmatchings/code_163400/func_80243B10.s | 4 +- asm/nonmatchings/code_163400/func_80243CCC.s | 4 +- asm/nonmatchings/code_163400/func_80243EEC.s | 4 +- asm/nonmatchings/code_165490/func_80245808.s | 16 ++++---- asm/nonmatchings/code_165490/func_80245A40.s | 40 +++++++++---------- asm/nonmatchings/code_167570/func_802471EC.s | 32 +++++++-------- asm/nonmatchings/code_168590/func_80248170.s | 4 +- asm/nonmatchings/code_168590/func_80248A80.s | 8 ++-- asm/nonmatchings/code_168590/func_80248BF4.s | 16 ++++---- .../update_item_entity_temp.s | 12 +++--- .../code_ddaf0_len_c50/func_80147414.s | 4 +- .../code_ddaf0_len_c50/func_80147474.s | 4 +- .../code_ddaf0_len_c50/func_80147574.s | 4 +- .../code_ddaf0_len_c50/func_80147650.s | 4 +- .../code_ddaf0_len_c50/func_80147698.s | 8 ++-- .../code_ddaf0_len_c50/func_80147AC4.s | 4 +- .../code_ddaf0_len_c50/func_80147D70.s | 8 ++-- .../code_ddaf0_len_c50/func_80147E48.s | 4 +- .../code_ddaf0_len_c50/func_80147E7C.s | 4 +- .../code_ddaf0_len_c50/func_80147EC4.s | 4 +- .../code_ddaf0_len_c50/func_80147F30.s | 4 +- .../set_ui_panel_properties.s | 4 +- include/common_structs.h | 17 ++++++++ include/variables.h | 2 + src/code_ddaf0_len_c50.c | 18 ++------- undefined_syms.txt | 2 +- 55 files changed, 182 insertions(+), 173 deletions(-) diff --git a/asm/nonmatchings/code_135EE0/func_80242BAC.s b/asm/nonmatchings/code_135EE0/func_80242BAC.s index eb69024480..61edbd5140 100644 --- a/asm/nonmatchings/code_135EE0/func_80242BAC.s +++ b/asm/nonmatchings/code_135EE0/func_80242BAC.s @@ -8,8 +8,8 @@ glabel func_80242BAC /* 135EF8 80242BB8 AFB3001C */ sw $s3, 0x1c($sp) /* 135EFC 80242BBC 00C0982D */ daddu $s3, $a2, $zero /* 135F00 80242BC0 AFB40020 */ sw $s4, 0x20($sp) -/* 135F04 80242BC4 3C148016 */ lui $s4, %hi(D_80159D50) -/* 135F08 80242BC8 26949D50 */ addiu $s4, $s4, %lo(D_80159D50) +/* 135F04 80242BC4 3C148016 */ lui $s4, %hi(gUIPanels) +/* 135F08 80242BC8 26949D50 */ addiu $s4, $s4, %lo(gUIPanels) /* 135F0C 80242BCC 00042140 */ sll $a0, $a0, 5 /* 135F10 80242BD0 AFB20018 */ sw $s2, 0x18($sp) /* 135F14 80242BD4 3C128025 */ lui $s2, 0x8025 diff --git a/asm/nonmatchings/code_135EE0/func_80242D04.s b/asm/nonmatchings/code_135EE0/func_80242D04.s index 3179810463..7489c1d6a7 100644 --- a/asm/nonmatchings/code_135EE0/func_80242D04.s +++ b/asm/nonmatchings/code_135EE0/func_80242D04.s @@ -8,8 +8,8 @@ glabel func_80242D04 /* 136050 80242D10 AFB3001C */ sw $s3, 0x1c($sp) /* 136054 80242D14 00C0982D */ daddu $s3, $a2, $zero /* 136058 80242D18 AFB40020 */ sw $s4, 0x20($sp) -/* 13605C 80242D1C 3C148016 */ lui $s4, %hi(D_80159D50) -/* 136060 80242D20 26949D50 */ addiu $s4, $s4, %lo(D_80159D50) +/* 13605C 80242D1C 3C148016 */ lui $s4, %hi(gUIPanels) +/* 136060 80242D20 26949D50 */ addiu $s4, $s4, %lo(gUIPanels) /* 136064 80242D24 00042140 */ sll $a0, $a0, 5 /* 136068 80242D28 AFB10014 */ sw $s1, 0x14($sp) /* 13606C 80242D2C 3C118025 */ lui $s1, 0x8025 diff --git a/asm/nonmatchings/code_135EE0/func_80242F90.s b/asm/nonmatchings/code_135EE0/func_80242F90.s index 42eec96db7..40066109d3 100644 --- a/asm/nonmatchings/code_135EE0/func_80242F90.s +++ b/asm/nonmatchings/code_135EE0/func_80242F90.s @@ -6,8 +6,8 @@ glabel func_80242F90 /* 1362D4 80242F94 8FA30028 */ lw $v1, 0x28($sp) /* 1362D8 80242F98 00042140 */ sll $a0, $a0, 5 /* 1362DC 80242F9C AC620000 */ sw $v0, ($v1) -/* 1362E0 80242FA0 3C028016 */ lui $v0, %hi(D_80159D50) -/* 1362E4 80242FA4 24429D50 */ addiu $v0, $v0, %lo(D_80159D50) +/* 1362E0 80242FA0 3C028016 */ lui $v0, %hi(gUIPanels) +/* 1362E4 80242FA4 24429D50 */ addiu $v0, $v0, %lo(gUIPanels) /* 1362E8 80242FA8 00822021 */ addu $a0, $a0, $v0 /* 1362EC 80242FAC 90820000 */ lbu $v0, ($a0) /* 1362F0 80242FB0 304200F3 */ andi $v0, $v0, 0xf3 diff --git a/asm/nonmatchings/code_135EE0/func_80242FBC.s b/asm/nonmatchings/code_135EE0/func_80242FBC.s index 8e09144dd8..06add2e823 100644 --- a/asm/nonmatchings/code_135EE0/func_80242FBC.s +++ b/asm/nonmatchings/code_135EE0/func_80242FBC.s @@ -9,8 +9,8 @@ glabel func_80242FBC /* 13630C 80242FCC AC620000 */ sw $v0, ($v1) /* 136310 80242FD0 24020050 */ addiu $v0, $zero, 0x50 /* 136314 80242FD4 ACA20000 */ sw $v0, ($a1) -/* 136318 80242FD8 3C028016 */ lui $v0, %hi(D_80159D50) -/* 13631C 80242FDC 24429D50 */ addiu $v0, $v0, %lo(D_80159D50) +/* 136318 80242FD8 3C028016 */ lui $v0, %hi(gUIPanels) +/* 13631C 80242FDC 24429D50 */ addiu $v0, $v0, %lo(gUIPanels) /* 136320 80242FE0 00822021 */ addu $a0, $a0, $v0 /* 136324 80242FE4 90820000 */ lbu $v0, ($a0) /* 136328 80242FE8 304200F3 */ andi $v0, $v0, 0xf3 diff --git a/asm/nonmatchings/code_135EE0/func_80242FF4.s b/asm/nonmatchings/code_135EE0/func_80242FF4.s index c67e046e6a..a6aaf8a6ee 100644 --- a/asm/nonmatchings/code_135EE0/func_80242FF4.s +++ b/asm/nonmatchings/code_135EE0/func_80242FF4.s @@ -3,8 +3,8 @@ glabel func_80242FF4 /* 136334 80242FF4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 136338 80242FF8 3C038016 */ lui $v1, %hi(D_80159D50) -/* 13633C 80242FFC 24639D50 */ addiu $v1, $v1, %lo(D_80159D50) +/* 136338 80242FF8 3C038016 */ lui $v1, %hi(gUIPanels) +/* 13633C 80242FFC 24639D50 */ addiu $v1, $v1, %lo(gUIPanels) /* 136340 80243000 00041140 */ sll $v0, $a0, 5 /* 136344 80243004 AFB00010 */ sw $s0, 0x10($sp) /* 136348 80243008 00438021 */ addu $s0, $v0, $v1 diff --git a/asm/nonmatchings/code_135EE0/func_80243090.s b/asm/nonmatchings/code_135EE0/func_80243090.s index ca51a0a82b..e5905e1062 100644 --- a/asm/nonmatchings/code_135EE0/func_80243090.s +++ b/asm/nonmatchings/code_135EE0/func_80243090.s @@ -3,8 +3,8 @@ glabel func_80243090 /* 1363D0 80243090 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 1363D4 80243094 3C028016 */ lui $v0, %hi(D_80159D50) -/* 1363D8 80243098 24429D50 */ addiu $v0, $v0, %lo(D_80159D50) +/* 1363D4 80243094 3C028016 */ lui $v0, %hi(gUIPanels) +/* 1363D8 80243098 24429D50 */ addiu $v0, $v0, %lo(gUIPanels) /* 1363DC 8024309C 00041940 */ sll $v1, $a0, 5 /* 1363E0 802430A0 AFB00010 */ sw $s0, 0x10($sp) /* 1363E4 802430A4 00628021 */ addu $s0, $v1, $v0 diff --git a/asm/nonmatchings/code_135EE0/func_802430E4.s b/asm/nonmatchings/code_135EE0/func_802430E4.s index ff476afe6a..61b43612bd 100644 --- a/asm/nonmatchings/code_135EE0/func_802430E4.s +++ b/asm/nonmatchings/code_135EE0/func_802430E4.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_802430E4 -/* 136424 802430E4 3C028016 */ lui $v0, %hi(D_80159D50) -/* 136428 802430E8 24429D50 */ addiu $v0, $v0, %lo(D_80159D50) +/* 136424 802430E4 3C028016 */ lui $v0, %hi(gUIPanels) +/* 136428 802430E8 24429D50 */ addiu $v0, $v0, %lo(gUIPanels) /* 13642C 802430EC 00042140 */ sll $a0, $a0, 5 /* 136430 802430F0 00822021 */ addu $a0, $a0, $v0 /* 136434 802430F4 9083001C */ lbu $v1, 0x1c($a0) diff --git a/asm/nonmatchings/code_135EE0/func_8024313C.s b/asm/nonmatchings/code_135EE0/func_8024313C.s index 121d8f1a63..467d496f51 100644 --- a/asm/nonmatchings/code_135EE0/func_8024313C.s +++ b/asm/nonmatchings/code_135EE0/func_8024313C.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_8024313C -/* 13647C 8024313C 3C028016 */ lui $v0, %hi(D_80159D50) -/* 136480 80243140 24429D50 */ addiu $v0, $v0, %lo(D_80159D50) +/* 13647C 8024313C 3C028016 */ lui $v0, %hi(gUIPanels) +/* 136480 80243140 24429D50 */ addiu $v0, $v0, %lo(gUIPanels) /* 136484 80243144 00042140 */ sll $a0, $a0, 5 /* 136488 80243148 00822021 */ addu $a0, $a0, $v0 /* 13648C 8024314C 9083001C */ lbu $v1, 0x1c($a0) diff --git a/asm/nonmatchings/code_135EE0/func_80243188.s b/asm/nonmatchings/code_135EE0/func_80243188.s index 9846e0494a..095a3e8902 100644 --- a/asm/nonmatchings/code_135EE0/func_80243188.s +++ b/asm/nonmatchings/code_135EE0/func_80243188.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80243188 -/* 1364C8 80243188 3C028016 */ lui $v0, %hi(D_80159D50) -/* 1364CC 8024318C 24429D50 */ addiu $v0, $v0, %lo(D_80159D50) +/* 1364C8 80243188 3C028016 */ lui $v0, %hi(gUIPanels) +/* 1364CC 8024318C 24429D50 */ addiu $v0, $v0, %lo(gUIPanels) /* 1364D0 80243190 00042140 */ sll $a0, $a0, 5 /* 1364D4 80243194 00822021 */ addu $a0, $a0, $v0 /* 1364D8 80243198 9083001C */ lbu $v1, 0x1c($a0) diff --git a/asm/nonmatchings/code_135EE0/func_80243238.s b/asm/nonmatchings/code_135EE0/func_80243238.s index c4eb8d00c1..d389813eef 100644 --- a/asm/nonmatchings/code_135EE0/func_80243238.s +++ b/asm/nonmatchings/code_135EE0/func_80243238.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80243238 -/* 136578 80243238 3C028016 */ lui $v0, %hi(D_80159D50) -/* 13657C 8024323C 24429D50 */ addiu $v0, $v0, %lo(D_80159D50) +/* 136578 80243238 3C028016 */ lui $v0, %hi(gUIPanels) +/* 13657C 8024323C 24429D50 */ addiu $v0, $v0, %lo(gUIPanels) /* 136580 80243240 00042140 */ sll $a0, $a0, 5 /* 136584 80243244 00822021 */ addu $a0, $a0, $v0 /* 136588 80243248 9083001C */ lbu $v1, 0x1c($a0) diff --git a/asm/nonmatchings/code_135EE0/func_802432E8.s b/asm/nonmatchings/code_135EE0/func_802432E8.s index 650da83a89..fd8c742a70 100644 --- a/asm/nonmatchings/code_135EE0/func_802432E8.s +++ b/asm/nonmatchings/code_135EE0/func_802432E8.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_802432E8 -/* 136628 802432E8 3C028016 */ lui $v0, %hi(D_80159D50) -/* 13662C 802432EC 24429D50 */ addiu $v0, $v0, %lo(D_80159D50) +/* 136628 802432E8 3C028016 */ lui $v0, %hi(gUIPanels) +/* 13662C 802432EC 24429D50 */ addiu $v0, $v0, %lo(gUIPanels) /* 136630 802432F0 00042140 */ sll $a0, $a0, 5 /* 136634 802432F4 00822021 */ addu $a0, $a0, $v0 /* 136638 802432F8 9083001C */ lbu $v1, 0x1c($a0) diff --git a/asm/nonmatchings/code_135EE0/func_80243388.s b/asm/nonmatchings/code_135EE0/func_80243388.s index a32a8c4050..816719f043 100644 --- a/asm/nonmatchings/code_135EE0/func_80243388.s +++ b/asm/nonmatchings/code_135EE0/func_80243388.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80243388 -/* 1366C8 80243388 3C028016 */ lui $v0, %hi(D_80159D50) -/* 1366CC 8024338C 24429D50 */ addiu $v0, $v0, %lo(D_80159D50) +/* 1366C8 80243388 3C028016 */ lui $v0, %hi(gUIPanels) +/* 1366CC 8024338C 24429D50 */ addiu $v0, $v0, %lo(gUIPanels) /* 1366D0 80243390 00042140 */ sll $a0, $a0, 5 /* 1366D4 80243394 00822021 */ addu $a0, $a0, $v0 /* 1366D8 80243398 9083001C */ lbu $v1, 0x1c($a0) diff --git a/asm/nonmatchings/code_135EE0/pause_init.s b/asm/nonmatchings/code_135EE0/pause_init.s index c02f453902..09652ba870 100644 --- a/asm/nonmatchings/code_135EE0/pause_init.s +++ b/asm/nonmatchings/code_135EE0/pause_init.s @@ -81,8 +81,8 @@ glabel pause_init /* 1374C0 80244180 26100004 */ addiu $s0, $s0, 4 /* 1374C4 80244184 241400E1 */ addiu $s4, $zero, 0xe1 /* 1374C8 80244188 24110006 */ addiu $s1, $zero, 6 -/* 1374CC 8024418C 3C158016 */ lui $s5, %hi(D_80159D50) -/* 1374D0 80244190 26B59D50 */ addiu $s5, $s5, %lo(D_80159D50) +/* 1374CC 8024418C 3C158016 */ lui $s5, %hi(gUIPanels) +/* 1374D0 80244190 26B59D50 */ addiu $s5, $s5, %lo(gUIPanels) /* 1374D4 80244194 241303C0 */ addiu $s3, $zero, 0x3c0 /* 1374D8 80244198 2412001E */ addiu $s2, $zero, 0x1e /* 1374DC 8024419C 3C108025 */ lui $s0, 0x8025 diff --git a/asm/nonmatchings/code_135EE0/pause_tabs_update.s b/asm/nonmatchings/code_135EE0/pause_tabs_update.s index 96339aac45..d5066ef001 100644 --- a/asm/nonmatchings/code_135EE0/pause_tabs_update.s +++ b/asm/nonmatchings/code_135EE0/pause_tabs_update.s @@ -114,8 +114,8 @@ glabel pause_tabs_update /* 138A90 80245750 24E7EF80 */ addiu $a3, $a3, %lo(gPauseMenuTabs) /* 138A94 80245754 3C068025 */ lui $a2, 0x8025 /* 138A98 80245758 24C6F1D0 */ addiu $a2, $a2, -0xe30 -/* 138A9C 8024575C 3C058016 */ lui $a1, %hi(D_80159D50) -/* 138AA0 80245760 24A59D50 */ addiu $a1, $a1, %lo(D_80159D50) +/* 138A9C 8024575C 3C058016 */ lui $a1, %hi(gUIPanels) +/* 138AA0 80245760 24A59D50 */ addiu $a1, $a1, %lo(gUIPanels) /* 138AA4 80245764 3C038025 */ lui $v1, 0x8025 /* 138AA8 80245768 2463F1E0 */ addiu $v1, $v1, -0xe20 /* 138AAC 8024576C 02061021 */ addu $v0, $s0, $a2 @@ -164,8 +164,8 @@ glabel pause_tabs_update /* 138B48 80245808 90420000 */ lbu $v0, ($v0) /* 138B4C 8024580C 50400017 */ beql $v0, $zero, .L8024586C /* 138B50 80245810 26100001 */ addiu $s0, $s0, 1 -/* 138B54 80245814 3C088016 */ lui $t0, %hi(D_80159D50) -/* 138B58 80245818 25089D50 */ addiu $t0, $t0, %lo(D_80159D50) +/* 138B54 80245814 3C088016 */ lui $t0, %hi(gUIPanels) +/* 138B58 80245818 25089D50 */ addiu $t0, $t0, %lo(gUIPanels) /* 138B5C 8024581C 92220000 */ lbu $v0, ($s1) /* 138B60 80245820 82630001 */ lb $v1, 1($s3) /* 138B64 80245824 00021140 */ sll $v0, $v0, 5 diff --git a/asm/nonmatchings/code_163400/func_80242E00.s b/asm/nonmatchings/code_163400/func_80242E00.s index aab21f5ff2..3604d1778f 100644 --- a/asm/nonmatchings/code_163400/func_80242E00.s +++ b/asm/nonmatchings/code_163400/func_80242E00.s @@ -8,8 +8,8 @@ glabel func_80242E00 /* 16366C 80242E0C AFB3001C */ sw $s3, 0x1c($sp) /* 163670 80242E10 00C0982D */ daddu $s3, $a2, $zero /* 163674 80242E14 AFB40020 */ sw $s4, 0x20($sp) -/* 163678 80242E18 3C148016 */ lui $s4, %hi(D_80159D50) -/* 16367C 80242E1C 26949D50 */ addiu $s4, $s4, %lo(D_80159D50) +/* 163678 80242E18 3C148016 */ lui $s4, %hi(gUIPanels) +/* 16367C 80242E1C 26949D50 */ addiu $s4, $s4, %lo(gUIPanels) /* 163680 80242E20 00042140 */ sll $a0, $a0, 5 /* 163684 80242E24 AFB10014 */ sw $s1, 0x14($sp) /* 163688 80242E28 3C118025 */ lui $s1, 0x8025 diff --git a/asm/nonmatchings/code_163400/func_8024330C.s b/asm/nonmatchings/code_163400/func_8024330C.s index 4c05384b3a..53d57d16c0 100644 --- a/asm/nonmatchings/code_163400/func_8024330C.s +++ b/asm/nonmatchings/code_163400/func_8024330C.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_8024330C -/* 163B6C 8024330C 3C028016 */ lui $v0, %hi(D_80159D50) -/* 163B70 80243310 24429D50 */ addiu $v0, $v0, %lo(D_80159D50) +/* 163B6C 8024330C 3C028016 */ lui $v0, %hi(gUIPanels) +/* 163B70 80243310 24429D50 */ addiu $v0, $v0, %lo(gUIPanels) /* 163B74 80243314 00042140 */ sll $a0, $a0, 5 /* 163B78 80243318 00822021 */ addu $a0, $a0, $v0 /* 163B7C 8024331C 9083001C */ lbu $v1, 0x1c($a0) diff --git a/asm/nonmatchings/code_163400/func_80243380.s b/asm/nonmatchings/code_163400/func_80243380.s index 7d5ecd0e96..bf469ba317 100644 --- a/asm/nonmatchings/code_163400/func_80243380.s +++ b/asm/nonmatchings/code_163400/func_80243380.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80243380 -/* 163BE0 80243380 3C028016 */ lui $v0, %hi(D_80159D50) -/* 163BE4 80243384 24429D50 */ addiu $v0, $v0, %lo(D_80159D50) +/* 163BE0 80243380 3C028016 */ lui $v0, %hi(gUIPanels) +/* 163BE4 80243384 24429D50 */ addiu $v0, $v0, %lo(gUIPanels) /* 163BE8 80243388 00042140 */ sll $a0, $a0, 5 /* 163BEC 8024338C 00822021 */ addu $a0, $a0, $v0 /* 163BF0 80243390 9083001C */ lbu $v1, 0x1c($a0) diff --git a/asm/nonmatchings/code_163400/func_802433F4.s b/asm/nonmatchings/code_163400/func_802433F4.s index dc5c8d949d..714e9c282f 100644 --- a/asm/nonmatchings/code_163400/func_802433F4.s +++ b/asm/nonmatchings/code_163400/func_802433F4.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_802433F4 -/* 163C54 802433F4 3C028016 */ lui $v0, %hi(D_80159D50) -/* 163C58 802433F8 24429D50 */ addiu $v0, $v0, %lo(D_80159D50) +/* 163C54 802433F4 3C028016 */ lui $v0, %hi(gUIPanels) +/* 163C58 802433F8 24429D50 */ addiu $v0, $v0, %lo(gUIPanels) /* 163C5C 802433FC 00042140 */ sll $a0, $a0, 5 /* 163C60 80243400 00822021 */ addu $a0, $a0, $v0 /* 163C64 80243404 9083001C */ lbu $v1, 0x1c($a0) diff --git a/asm/nonmatchings/code_163400/func_80243468.s b/asm/nonmatchings/code_163400/func_80243468.s index 2508991a8e..98e410c936 100644 --- a/asm/nonmatchings/code_163400/func_80243468.s +++ b/asm/nonmatchings/code_163400/func_80243468.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80243468 -/* 163CC8 80243468 3C028016 */ lui $v0, %hi(D_80159D50) -/* 163CCC 8024346C 24429D50 */ addiu $v0, $v0, %lo(D_80159D50) +/* 163CC8 80243468 3C028016 */ lui $v0, %hi(gUIPanels) +/* 163CCC 8024346C 24429D50 */ addiu $v0, $v0, %lo(gUIPanels) /* 163CD0 80243470 00042140 */ sll $a0, $a0, 5 /* 163CD4 80243474 00822021 */ addu $a0, $a0, $v0 /* 163CD8 80243478 9083001C */ lbu $v1, 0x1c($a0) diff --git a/asm/nonmatchings/code_163400/func_80243550.s b/asm/nonmatchings/code_163400/func_80243550.s index 28b54e6ffb..de875a54be 100644 --- a/asm/nonmatchings/code_163400/func_80243550.s +++ b/asm/nonmatchings/code_163400/func_80243550.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80243550 -/* 163DB0 80243550 3C028016 */ lui $v0, %hi(D_80159D50) -/* 163DB4 80243554 24429D50 */ addiu $v0, $v0, %lo(D_80159D50) +/* 163DB0 80243550 3C028016 */ lui $v0, %hi(gUIPanels) +/* 163DB4 80243554 24429D50 */ addiu $v0, $v0, %lo(gUIPanels) /* 163DB8 80243558 00042140 */ sll $a0, $a0, 5 /* 163DBC 8024355C 00822021 */ addu $a0, $a0, $v0 /* 163DC0 80243560 9083001C */ lbu $v1, 0x1c($a0) diff --git a/asm/nonmatchings/code_163400/func_802435C4.s b/asm/nonmatchings/code_163400/func_802435C4.s index 15d49436b8..0fbb738132 100644 --- a/asm/nonmatchings/code_163400/func_802435C4.s +++ b/asm/nonmatchings/code_163400/func_802435C4.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_802435C4 -/* 163E24 802435C4 3C028016 */ lui $v0, %hi(D_80159D50) -/* 163E28 802435C8 24429D50 */ addiu $v0, $v0, %lo(D_80159D50) +/* 163E24 802435C4 3C028016 */ lui $v0, %hi(gUIPanels) +/* 163E28 802435C8 24429D50 */ addiu $v0, $v0, %lo(gUIPanels) /* 163E2C 802435CC 00042140 */ sll $a0, $a0, 5 /* 163E30 802435D0 00822021 */ addu $a0, $a0, $v0 /* 163E34 802435D4 9083001C */ lbu $v1, 0x1c($a0) diff --git a/asm/nonmatchings/code_163400/func_80243628.s b/asm/nonmatchings/code_163400/func_80243628.s index 95b467d432..f3e90d29bf 100644 --- a/asm/nonmatchings/code_163400/func_80243628.s +++ b/asm/nonmatchings/code_163400/func_80243628.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80243628 -/* 163E88 80243628 3C028016 */ lui $v0, %hi(D_80159D50) -/* 163E8C 8024362C 24429D50 */ addiu $v0, $v0, %lo(D_80159D50) +/* 163E88 80243628 3C028016 */ lui $v0, %hi(gUIPanels) +/* 163E8C 8024362C 24429D50 */ addiu $v0, $v0, %lo(gUIPanels) /* 163E90 80243630 00042140 */ sll $a0, $a0, 5 /* 163E94 80243634 00822021 */ addu $a0, $a0, $v0 /* 163E98 80243638 9083001C */ lbu $v1, 0x1c($a0) diff --git a/asm/nonmatchings/code_163400/func_8024368C.s b/asm/nonmatchings/code_163400/func_8024368C.s index e44b7fd750..9b8a387bc8 100644 --- a/asm/nonmatchings/code_163400/func_8024368C.s +++ b/asm/nonmatchings/code_163400/func_8024368C.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_8024368C -/* 163EEC 8024368C 3C028016 */ lui $v0, %hi(D_80159D50) -/* 163EF0 80243690 24429D50 */ addiu $v0, $v0, %lo(D_80159D50) +/* 163EEC 8024368C 3C028016 */ lui $v0, %hi(gUIPanels) +/* 163EF0 80243690 24429D50 */ addiu $v0, $v0, %lo(gUIPanels) /* 163EF4 80243694 00042140 */ sll $a0, $a0, 5 /* 163EF8 80243698 00822021 */ addu $a0, $a0, $v0 /* 163EFC 8024369C 9083001C */ lbu $v1, 0x1c($a0) diff --git a/asm/nonmatchings/code_163400/func_802436F0.s b/asm/nonmatchings/code_163400/func_802436F0.s index e58f52492f..6944eaf6a4 100644 --- a/asm/nonmatchings/code_163400/func_802436F0.s +++ b/asm/nonmatchings/code_163400/func_802436F0.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_802436F0 -/* 163F50 802436F0 3C028016 */ lui $v0, %hi(D_80159D50) -/* 163F54 802436F4 24429D50 */ addiu $v0, $v0, %lo(D_80159D50) +/* 163F50 802436F0 3C028016 */ lui $v0, %hi(gUIPanels) +/* 163F54 802436F4 24429D50 */ addiu $v0, $v0, %lo(gUIPanels) /* 163F58 802436F8 00042140 */ sll $a0, $a0, 5 /* 163F5C 802436FC 00822021 */ addu $a0, $a0, $v0 /* 163F60 80243700 9083001C */ lbu $v1, 0x1c($a0) diff --git a/asm/nonmatchings/code_163400/func_80243754.s b/asm/nonmatchings/code_163400/func_80243754.s index 72d51212fe..a1c6bcfd60 100644 --- a/asm/nonmatchings/code_163400/func_80243754.s +++ b/asm/nonmatchings/code_163400/func_80243754.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80243754 -/* 163FB4 80243754 3C028016 */ lui $v0, %hi(D_80159D50) -/* 163FB8 80243758 24429D50 */ addiu $v0, $v0, %lo(D_80159D50) +/* 163FB4 80243754 3C028016 */ lui $v0, %hi(gUIPanels) +/* 163FB8 80243758 24429D50 */ addiu $v0, $v0, %lo(gUIPanels) /* 163FBC 8024375C 00042140 */ sll $a0, $a0, 5 /* 163FC0 80243760 00822021 */ addu $a0, $a0, $v0 /* 163FC4 80243764 9083001C */ lbu $v1, 0x1c($a0) diff --git a/asm/nonmatchings/code_163400/func_802437B8.s b/asm/nonmatchings/code_163400/func_802437B8.s index 9fd3074c64..f85d6e75ef 100644 --- a/asm/nonmatchings/code_163400/func_802437B8.s +++ b/asm/nonmatchings/code_163400/func_802437B8.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_802437B8 -/* 164018 802437B8 3C028016 */ lui $v0, %hi(D_80159D50) -/* 16401C 802437BC 24429D50 */ addiu $v0, $v0, %lo(D_80159D50) +/* 164018 802437B8 3C028016 */ lui $v0, %hi(gUIPanels) +/* 16401C 802437BC 24429D50 */ addiu $v0, $v0, %lo(gUIPanels) /* 164020 802437C0 00042140 */ sll $a0, $a0, 5 /* 164024 802437C4 00822021 */ addu $a0, $a0, $v0 /* 164028 802437C8 9083001C */ lbu $v1, 0x1c($a0) diff --git a/asm/nonmatchings/code_163400/func_8024381C.s b/asm/nonmatchings/code_163400/func_8024381C.s index 1844c7d6b8..02f2090708 100644 --- a/asm/nonmatchings/code_163400/func_8024381C.s +++ b/asm/nonmatchings/code_163400/func_8024381C.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_8024381C -/* 16407C 8024381C 3C028016 */ lui $v0, %hi(D_80159D50) -/* 164080 80243820 24429D50 */ addiu $v0, $v0, %lo(D_80159D50) +/* 16407C 8024381C 3C028016 */ lui $v0, %hi(gUIPanels) +/* 164080 80243820 24429D50 */ addiu $v0, $v0, %lo(gUIPanels) /* 164084 80243824 00042140 */ sll $a0, $a0, 5 /* 164088 80243828 00822021 */ addu $a0, $a0, $v0 /* 16408C 8024382C 9083001C */ lbu $v1, 0x1c($a0) diff --git a/asm/nonmatchings/code_163400/func_80243898.s b/asm/nonmatchings/code_163400/func_80243898.s index 55c53df53c..74b6015c0d 100644 --- a/asm/nonmatchings/code_163400/func_80243898.s +++ b/asm/nonmatchings/code_163400/func_80243898.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80243898 -/* 1640F8 80243898 3C028016 */ lui $v0, %hi(D_80159D50) -/* 1640FC 8024389C 24429D50 */ addiu $v0, $v0, %lo(D_80159D50) +/* 1640F8 80243898 3C028016 */ lui $v0, %hi(gUIPanels) +/* 1640FC 8024389C 24429D50 */ addiu $v0, $v0, %lo(gUIPanels) /* 164100 802438A0 00042140 */ sll $a0, $a0, 5 /* 164104 802438A4 00822021 */ addu $a0, $a0, $v0 /* 164108 802438A8 9083001C */ lbu $v1, 0x1c($a0) diff --git a/asm/nonmatchings/code_163400/func_80243908.s b/asm/nonmatchings/code_163400/func_80243908.s index 4bc9f5f13b..cbeecc37d8 100644 --- a/asm/nonmatchings/code_163400/func_80243908.s +++ b/asm/nonmatchings/code_163400/func_80243908.s @@ -3,8 +3,8 @@ glabel func_80243908 /* 164168 80243908 00C0482D */ daddu $t1, $a2, $zero -/* 16416C 8024390C 3C028016 */ lui $v0, %hi(D_80159D50) -/* 164170 80243910 24429D50 */ addiu $v0, $v0, %lo(D_80159D50) +/* 16416C 8024390C 3C028016 */ lui $v0, %hi(gUIPanels) +/* 164170 80243910 24429D50 */ addiu $v0, $v0, %lo(gUIPanels) /* 164174 80243914 00042140 */ sll $a0, $a0, 5 /* 164178 80243918 00824021 */ addu $t0, $a0, $v0 /* 16417C 8024391C 81050003 */ lb $a1, 3($t0) diff --git a/asm/nonmatchings/code_163400/func_80243B10.s b/asm/nonmatchings/code_163400/func_80243B10.s index 09099d8c85..9f5e8534eb 100644 --- a/asm/nonmatchings/code_163400/func_80243B10.s +++ b/asm/nonmatchings/code_163400/func_80243B10.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80243B10 -/* 164370 80243B10 3C028016 */ lui $v0, %hi(D_80159D50) -/* 164374 80243B14 24429D50 */ addiu $v0, $v0, %lo(D_80159D50) +/* 164370 80243B10 3C028016 */ lui $v0, %hi(gUIPanels) +/* 164374 80243B14 24429D50 */ addiu $v0, $v0, %lo(gUIPanels) /* 164378 80243B18 00042140 */ sll $a0, $a0, 5 /* 16437C 80243B1C 00822021 */ addu $a0, $a0, $v0 /* 164380 80243B20 9082001C */ lbu $v0, 0x1c($a0) diff --git a/asm/nonmatchings/code_163400/func_80243CCC.s b/asm/nonmatchings/code_163400/func_80243CCC.s index 6809e077ca..d0d0b0caec 100644 --- a/asm/nonmatchings/code_163400/func_80243CCC.s +++ b/asm/nonmatchings/code_163400/func_80243CCC.s @@ -17,8 +17,8 @@ glabel func_80243CCC /* 16455C 80243CFC 35084340 */ ori $t0, $t0, 0x4340 /* 164560 80243D00 3C05800A */ lui $a1, 0x800a /* 164564 80243D04 24A5A66C */ addiu $a1, $a1, -0x5994 -/* 164568 80243D08 3C038016 */ lui $v1, %hi(D_80159D50) -/* 16456C 80243D0C 24639D50 */ addiu $v1, $v1, %lo(D_80159D50) +/* 164568 80243D08 3C038016 */ lui $v1, %hi(gUIPanels) +/* 16456C 80243D0C 24639D50 */ addiu $v1, $v1, %lo(gUIPanels) /* 164570 80243D10 00042140 */ sll $a0, $a0, 5 /* 164574 80243D14 AFB40038 */ sw $s4, 0x38($sp) /* 164578 80243D18 0083A021 */ addu $s4, $a0, $v1 diff --git a/asm/nonmatchings/code_163400/func_80243EEC.s b/asm/nonmatchings/code_163400/func_80243EEC.s index cf5efef35d..03a232a82e 100644 --- a/asm/nonmatchings/code_163400/func_80243EEC.s +++ b/asm/nonmatchings/code_163400/func_80243EEC.s @@ -3,8 +3,8 @@ glabel func_80243EEC /* 16474C 80243EEC 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 164750 80243EF0 3C028016 */ lui $v0, %hi(D_80159D50) -/* 164754 80243EF4 24429D50 */ addiu $v0, $v0, %lo(D_80159D50) +/* 164750 80243EF0 3C028016 */ lui $v0, %hi(gUIPanels) +/* 164754 80243EF4 24429D50 */ addiu $v0, $v0, %lo(gUIPanels) /* 164758 80243EF8 00042140 */ sll $a0, $a0, 5 /* 16475C 80243EFC 00822021 */ addu $a0, $a0, $v0 /* 164760 80243F00 AFBF0030 */ sw $ra, 0x30($sp) diff --git a/asm/nonmatchings/code_165490/func_80245808.s b/asm/nonmatchings/code_165490/func_80245808.s index b2e29c2125..f1b30971d4 100644 --- a/asm/nonmatchings/code_165490/func_80245808.s +++ b/asm/nonmatchings/code_165490/func_80245808.s @@ -61,22 +61,22 @@ glabel func_80245808 /* 166140 802458E0 24020002 */ addiu $v0, $zero, 2 /* 166144 802458E4 14620006 */ bne $v1, $v0, .L80245900 /* 166148 802458E8 24020001 */ addiu $v0, $zero, 1 -/* 16614C 802458EC 3C038016 */ lui $v1, %hi(D_80159D50) -/* 166150 802458F0 24639D50 */ addiu $v1, $v1, %lo(D_80159D50) +/* 16614C 802458EC 3C038016 */ lui $v1, %hi(gUIPanels) +/* 166150 802458F0 24639D50 */ addiu $v1, $v1, %lo(gUIPanels) /* 166154 802458F4 A46205AE */ sh $v0, 0x5ae($v1) /* 166158 802458F8 08091644 */ j .L80245910 /* 16615C 802458FC 240200D3 */ addiu $v0, $zero, 0xd3 .L80245900: -/* 166160 80245900 3C038016 */ lui $v1, %hi(D_80159D50) -/* 166164 80245904 24639D50 */ addiu $v1, $v1, %lo(D_80159D50) +/* 166160 80245900 3C038016 */ lui $v1, %hi(gUIPanels) +/* 166164 80245904 24639D50 */ addiu $v1, $v1, %lo(gUIPanels) /* 166168 80245908 A46205AE */ sh $v0, 0x5ae($v1) /* 16616C 8024590C 240200A2 */ addiu $v0, $zero, 0xa2 .L80245910: /* 166170 80245910 A46205B0 */ sh $v0, 0x5b0($v1) /* 166174 80245914 24020019 */ addiu $v0, $zero, 0x19 /* 166178 80245918 A46205B2 */ sh $v0, 0x5b2($v1) -/* 16617C 8024591C 3C048016 */ lui $a0, %hi(D_80159D50) -/* 166180 80245920 24849D50 */ addiu $a0, $a0, %lo(D_80159D50) +/* 16617C 8024591C 3C048016 */ lui $a0, %hi(gUIPanels) +/* 166180 80245920 24849D50 */ addiu $a0, $a0, %lo(gUIPanels) /* 166184 80245924 948205B0 */ lhu $v0, 0x5b0($a0) /* 166188 80245928 00021400 */ sll $v0, $v0, 0x10 /* 16618C 8024592C 00021C03 */ sra $v1, $v0, 0x10 @@ -100,8 +100,8 @@ glabel func_80245808 .L80245974: /* 1661D4 80245974 240200A0 */ addiu $v0, $zero, 0xa0 /* 1661D8 80245978 00451023 */ subu $v0, $v0, $a1 -/* 1661DC 8024597C 3C048016 */ lui $a0, %hi(D_80159D50) -/* 1661E0 80245980 24849D50 */ addiu $a0, $a0, %lo(D_80159D50) +/* 1661DC 8024597C 3C048016 */ lui $a0, %hi(gUIPanels) +/* 1661E0 80245980 24849D50 */ addiu $a0, $a0, %lo(gUIPanels) .L80245984: /* 1661E4 80245984 A4C20000 */ sh $v0, ($a2) /* 1661E8 80245988 948206D0 */ lhu $v0, 0x6d0($a0) diff --git a/asm/nonmatchings/code_165490/func_80245A40.s b/asm/nonmatchings/code_165490/func_80245A40.s index 99f6f96480..6937b4ad45 100644 --- a/asm/nonmatchings/code_165490/func_80245A40.s +++ b/asm/nonmatchings/code_165490/func_80245A40.s @@ -457,8 +457,8 @@ glabel func_80245A40 /* 166958 802460F8 24040032 */ addiu $a0, $zero, 0x32 /* 16695C 802460FC 0C051F9F */ jal func_80147E7C /* 166960 80246100 24050001 */ addiu $a1, $zero, 1 -/* 166964 80246104 3C048016 */ lui $a0, %hi(D_80159D50) -/* 166968 80246108 24849D50 */ addiu $a0, $a0, %lo(D_80159D50) +/* 166964 80246104 3C048016 */ lui $a0, %hi(gUIPanels) +/* 166968 80246108 24849D50 */ addiu $a0, $a0, %lo(gUIPanels) /* 16696C 8024610C 2402008F */ addiu $v0, $zero, 0x8f /* 166970 80246110 A482064E */ sh $v0, 0x64e($a0) /* 166974 80246114 24020045 */ addiu $v0, $zero, 0x45 @@ -481,8 +481,8 @@ glabel func_80245A40 /* 1669B8 80246158 2463FFDE */ addiu $v1, $v1, -0x22 .L8024615C: /* 1669BC 8024615C 2403007E */ addiu $v1, $zero, 0x7e -/* 1669C0 80246160 3C048016 */ lui $a0, %hi(D_80159D50) -/* 1669C4 80246164 24849D50 */ addiu $a0, $a0, %lo(D_80159D50) +/* 1669C0 80246160 3C048016 */ lui $a0, %hi(gUIPanels) +/* 1669C4 80246164 24849D50 */ addiu $a0, $a0, %lo(gUIPanels) .L80246168: /* 1669C8 80246168 2402FFE3 */ addiu $v0, $zero, -0x1d /* 1669CC 8024616C A4A30000 */ sh $v1, ($a1) @@ -560,8 +560,8 @@ glabel func_80245A40 /* 166AE0 80246280 24A53CCC */ addiu $a1, $a1, 0x3ccc /* 166AE4 80246284 0C051F9F */ jal func_80147E7C /* 166AE8 80246288 24040032 */ addiu $a0, $zero, 0x32 -/* 166AEC 8024628C 3C048016 */ lui $a0, %hi(D_80159D50) -/* 166AF0 80246290 24849D50 */ addiu $a0, $a0, %lo(D_80159D50) +/* 166AEC 8024628C 3C048016 */ lui $a0, %hi(gUIPanels) +/* 166AF0 80246290 24849D50 */ addiu $a0, $a0, %lo(gUIPanels) /* 166AF4 80246294 24020079 */ addiu $v0, $zero, 0x79 /* 166AF8 80246298 A482064E */ sh $v0, 0x64e($a0) /* 166AFC 8024629C 24020045 */ addiu $v0, $zero, 0x45 @@ -584,8 +584,8 @@ glabel func_80245A40 /* 166B40 802462E0 2463FFDE */ addiu $v1, $v1, -0x22 .L802462E4: /* 166B44 802462E4 2403007E */ addiu $v1, $zero, 0x7e -/* 166B48 802462E8 3C048016 */ lui $a0, %hi(D_80159D50) -/* 166B4C 802462EC 24849D50 */ addiu $a0, $a0, %lo(D_80159D50) +/* 166B48 802462E8 3C048016 */ lui $a0, %hi(gUIPanels) +/* 166B4C 802462EC 24849D50 */ addiu $a0, $a0, %lo(gUIPanels) .L802462F0: /* 166B50 802462F0 2402FFE3 */ addiu $v0, $zero, -0x1d /* 166B54 802462F4 A4A30000 */ sh $v1, ($a1) @@ -706,8 +706,8 @@ glabel func_80245A40 /* 166D08 802464A8 3C018025 */ lui $at, 0x8025 /* 166D0C 802464AC A022C098 */ sb $v0, -0x3f68($at) /* 166D10 802464B0 24020002 */ addiu $v0, $zero, 2 -/* 166D14 802464B4 3C048016 */ lui $a0, %hi(D_80159D50) -/* 166D18 802464B8 24849D50 */ addiu $a0, $a0, %lo(D_80159D50) +/* 166D14 802464B4 3C048016 */ lui $a0, %hi(gUIPanels) +/* 166D18 802464B8 24849D50 */ addiu $a0, $a0, %lo(gUIPanels) /* 166D1C 802464BC 3C038025 */ lui $v1, 0x8025 /* 166D20 802464C0 8C639B8C */ lw $v1, -0x6474($v1) /* 166D24 802464C4 A0620004 */ sb $v0, 4($v1) @@ -731,8 +731,8 @@ glabel func_80245A40 /* 166D6C 8024650C 2463FFB3 */ addiu $v1, $v1, -0x4d .L80246510: /* 166D70 80246510 24030053 */ addiu $v1, $zero, 0x53 -/* 166D74 80246514 3C048016 */ lui $a0, %hi(D_80159D50) -/* 166D78 80246518 24849D50 */ addiu $a0, $a0, %lo(D_80159D50) +/* 166D74 80246514 3C048016 */ lui $a0, %hi(gUIPanels) +/* 166D78 80246518 24849D50 */ addiu $a0, $a0, %lo(gUIPanels) .L8024651C: /* 166D7C 8024651C A4A30000 */ sh $v1, ($a1) /* 166D80 80246520 948205F2 */ lhu $v0, 0x5f2($a0) @@ -812,8 +812,8 @@ glabel func_80245A40 /* 166E9C 8024663C 24A53CCC */ addiu $a1, $a1, 0x3ccc /* 166EA0 80246640 0C051F9F */ jal func_80147E7C /* 166EA4 80246644 24040032 */ addiu $a0, $zero, 0x32 -/* 166EA8 80246648 3C048016 */ lui $a0, %hi(D_80159D50) -/* 166EAC 8024664C 24849D50 */ addiu $a0, $a0, %lo(D_80159D50) +/* 166EA8 80246648 3C048016 */ lui $a0, %hi(gUIPanels) +/* 166EAC 8024664C 24849D50 */ addiu $a0, $a0, %lo(gUIPanels) /* 166EB0 80246650 24020079 */ addiu $v0, $zero, 0x79 /* 166EB4 80246654 A482064E */ sh $v0, 0x64e($a0) /* 166EB8 80246658 24020045 */ addiu $v0, $zero, 0x45 @@ -836,8 +836,8 @@ glabel func_80245A40 /* 166EFC 8024669C 2463FFDE */ addiu $v1, $v1, -0x22 .L802466A0: /* 166F00 802466A0 2403007E */ addiu $v1, $zero, 0x7e -/* 166F04 802466A4 3C048016 */ lui $a0, %hi(D_80159D50) -/* 166F08 802466A8 24849D50 */ addiu $a0, $a0, %lo(D_80159D50) +/* 166F04 802466A4 3C048016 */ lui $a0, %hi(gUIPanels) +/* 166F08 802466A8 24849D50 */ addiu $a0, $a0, %lo(gUIPanels) .L802466AC: /* 166F0C 802466AC 2402FFD5 */ addiu $v0, $zero, -0x2b /* 166F10 802466B0 A4A30000 */ sh $v1, ($a1) @@ -927,8 +927,8 @@ glabel func_80245A40 /* 167050 802467F0 24A53CCC */ addiu $a1, $a1, 0x3ccc /* 167054 802467F4 0C051F9F */ jal func_80147E7C /* 167058 802467F8 24040032 */ addiu $a0, $zero, 0x32 -/* 16705C 802467FC 3C048016 */ lui $a0, %hi(D_80159D50) -/* 167060 80246800 24849D50 */ addiu $a0, $a0, %lo(D_80159D50) +/* 16705C 802467FC 3C048016 */ lui $a0, %hi(gUIPanels) +/* 167060 80246800 24849D50 */ addiu $a0, $a0, %lo(gUIPanels) /* 167064 80246804 2402007F */ addiu $v0, $zero, 0x7f /* 167068 80246808 A482064E */ sh $v0, 0x64e($a0) /* 16706C 8024680C 24020045 */ addiu $v0, $zero, 0x45 @@ -951,8 +951,8 @@ glabel func_80245A40 /* 1670B0 80246850 2463FFDE */ addiu $v1, $v1, -0x22 .L80246854: /* 1670B4 80246854 2403007E */ addiu $v1, $zero, 0x7e -/* 1670B8 80246858 3C048016 */ lui $a0, %hi(D_80159D50) -/* 1670BC 8024685C 24849D50 */ addiu $a0, $a0, %lo(D_80159D50) +/* 1670B8 80246858 3C048016 */ lui $a0, %hi(gUIPanels) +/* 1670BC 8024685C 24849D50 */ addiu $a0, $a0, %lo(gUIPanels) .L80246860: /* 1670C0 80246860 2402FFCE */ addiu $v0, $zero, -0x32 /* 1670C4 80246864 A4A30000 */ sh $v1, ($a1) diff --git a/asm/nonmatchings/code_167570/func_802471EC.s b/asm/nonmatchings/code_167570/func_802471EC.s index c9e96cc667..0f50e2fd20 100644 --- a/asm/nonmatchings/code_167570/func_802471EC.s +++ b/asm/nonmatchings/code_167570/func_802471EC.s @@ -107,8 +107,8 @@ glabel func_802471EC /* 167BD0 80247370 24020002 */ addiu $v0, $zero, 2 /* 167BD4 80247374 3C038025 */ lui $v1, 0x8025 /* 167BD8 80247378 8C639B8C */ lw $v1, -0x6474($v1) -/* 167BDC 8024737C 3C048016 */ lui $a0, %hi(D_80159D50) -/* 167BE0 80247380 24849D50 */ addiu $a0, $a0, %lo(D_80159D50) +/* 167BDC 8024737C 3C048016 */ lui $a0, %hi(gUIPanels) +/* 167BE0 80247380 24849D50 */ addiu $a0, $a0, %lo(gUIPanels) /* 167BE4 80247384 3C018025 */ lui $at, 0x8025 /* 167BE8 80247388 A022C098 */ sb $v0, -0x3f68($at) /* 167BEC 8024738C 240200B6 */ addiu $v0, $zero, 0xb6 @@ -132,8 +132,8 @@ glabel func_802471EC /* 167C34 802473D4 2463FFA5 */ addiu $v1, $v1, -0x5b .L802473D8: /* 167C38 802473D8 24030045 */ addiu $v1, $zero, 0x45 -/* 167C3C 802473DC 3C048016 */ lui $a0, %hi(D_80159D50) -/* 167C40 802473E0 24849D50 */ addiu $a0, $a0, %lo(D_80159D50) +/* 167C3C 802473DC 3C048016 */ lui $a0, %hi(gUIPanels) +/* 167C40 802473E0 24849D50 */ addiu $a0, $a0, %lo(gUIPanels) .L802473E4: /* 167C44 802473E4 A4A30000 */ sh $v1, ($a1) /* 167C48 802473E8 948205F2 */ lhu $v0, 0x5f2($a0) @@ -206,8 +206,8 @@ glabel func_802471EC /* 167D48 802474E8 3C018025 */ lui $at, 0x8025 /* 167D4C 802474EC A022C098 */ sb $v0, -0x3f68($at) /* 167D50 802474F0 24020002 */ addiu $v0, $zero, 2 -/* 167D54 802474F4 3C048016 */ lui $a0, %hi(D_80159D50) -/* 167D58 802474F8 24849D50 */ addiu $a0, $a0, %lo(D_80159D50) +/* 167D54 802474F4 3C048016 */ lui $a0, %hi(gUIPanels) +/* 167D58 802474F8 24849D50 */ addiu $a0, $a0, %lo(gUIPanels) /* 167D5C 802474FC 3C038025 */ lui $v1, 0x8025 /* 167D60 80247500 8C639B8C */ lw $v1, -0x6474($v1) /* 167D64 80247504 A0620004 */ sb $v0, 4($v1) @@ -231,8 +231,8 @@ glabel func_802471EC /* 167DAC 8024754C 2463FFB3 */ addiu $v1, $v1, -0x4d .L80247550: /* 167DB0 80247550 24030053 */ addiu $v1, $zero, 0x53 -/* 167DB4 80247554 3C048016 */ lui $a0, %hi(D_80159D50) -/* 167DB8 80247558 24849D50 */ addiu $a0, $a0, %lo(D_80159D50) +/* 167DB4 80247554 3C048016 */ lui $a0, %hi(gUIPanels) +/* 167DB8 80247558 24849D50 */ addiu $a0, $a0, %lo(gUIPanels) .L8024755C: /* 167DBC 8024755C A4A30000 */ sh $v1, ($a1) /* 167DC0 80247560 948205F2 */ lhu $v0, 0x5f2($a0) @@ -306,8 +306,8 @@ glabel func_802471EC /* 167EC8 80247668 3C018025 */ lui $at, 0x8025 /* 167ECC 8024766C A022C098 */ sb $v0, -0x3f68($at) /* 167ED0 80247670 24020001 */ addiu $v0, $zero, 1 -/* 167ED4 80247674 3C048016 */ lui $a0, %hi(D_80159D50) -/* 167ED8 80247678 24849D50 */ addiu $a0, $a0, %lo(D_80159D50) +/* 167ED4 80247674 3C048016 */ lui $a0, %hi(gUIPanels) +/* 167ED8 80247678 24849D50 */ addiu $a0, $a0, %lo(gUIPanels) /* 167EDC 8024767C 3C038025 */ lui $v1, 0x8025 /* 167EE0 80247680 8C639B8C */ lw $v1, -0x6474($v1) /* 167EE4 80247684 A0620004 */ sb $v0, 4($v1) @@ -331,8 +331,8 @@ glabel func_802471EC /* 167F2C 802476CC 2463FFB4 */ addiu $v1, $v1, -0x4c .L802476D0: /* 167F30 802476D0 24030054 */ addiu $v1, $zero, 0x54 -/* 167F34 802476D4 3C048016 */ lui $a0, %hi(D_80159D50) -/* 167F38 802476D8 24849D50 */ addiu $a0, $a0, %lo(D_80159D50) +/* 167F34 802476D4 3C048016 */ lui $a0, %hi(gUIPanels) +/* 167F38 802476D8 24849D50 */ addiu $a0, $a0, %lo(gUIPanels) .L802476DC: /* 167F3C 802476DC A4A30000 */ sh $v1, ($a1) /* 167F40 802476E0 948205F2 */ lhu $v0, 0x5f2($a0) @@ -501,8 +501,8 @@ glabel func_802471EC /* 1681BC 8024795C 3C018025 */ lui $at, 0x8025 /* 1681C0 80247960 A022C098 */ sb $v0, -0x3f68($at) /* 1681C4 80247964 24020003 */ addiu $v0, $zero, 3 -/* 1681C8 80247968 3C048016 */ lui $a0, %hi(D_80159D50) -/* 1681CC 8024796C 24849D50 */ addiu $a0, $a0, %lo(D_80159D50) +/* 1681C8 80247968 3C048016 */ lui $a0, %hi(gUIPanels) +/* 1681CC 8024796C 24849D50 */ addiu $a0, $a0, %lo(gUIPanels) /* 1681D0 80247970 3C038025 */ lui $v1, 0x8025 /* 1681D4 80247974 8C639B8C */ lw $v1, -0x6474($v1) /* 1681D8 80247978 A0620004 */ sb $v0, 4($v1) @@ -526,8 +526,8 @@ glabel func_802471EC /* 168220 802479C0 2463FFA4 */ addiu $v1, $v1, -0x5c .L802479C4: /* 168224 802479C4 24030044 */ addiu $v1, $zero, 0x44 -/* 168228 802479C8 3C048016 */ lui $a0, %hi(D_80159D50) -/* 16822C 802479CC 24849D50 */ addiu $a0, $a0, %lo(D_80159D50) +/* 168228 802479C8 3C048016 */ lui $a0, %hi(gUIPanels) +/* 16822C 802479CC 24849D50 */ addiu $a0, $a0, %lo(gUIPanels) .L802479D0: /* 168230 802479D0 A4A30000 */ sh $v1, ($a1) /* 168234 802479D4 948205F2 */ lhu $v0, 0x5f2($a0) diff --git a/asm/nonmatchings/code_168590/func_80248170.s b/asm/nonmatchings/code_168590/func_80248170.s index 99782af619..a72e415693 100644 --- a/asm/nonmatchings/code_168590/func_80248170.s +++ b/asm/nonmatchings/code_168590/func_80248170.s @@ -3,8 +3,8 @@ glabel func_80248170 /* 1689D0 80248170 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 1689D4 80248174 3C038016 */ lui $v1, %hi(D_80159D50) -/* 1689D8 80248178 24639D50 */ addiu $v1, $v1, %lo(D_80159D50) +/* 1689D4 80248174 3C038016 */ lui $v1, %hi(gUIPanels) +/* 1689D8 80248178 24639D50 */ addiu $v1, $v1, %lo(gUIPanels) /* 1689DC 8024817C 00041140 */ sll $v0, $a0, 5 /* 1689E0 80248180 00432821 */ addu $a1, $v0, $v1 /* 1689E4 80248184 AFBF0010 */ sw $ra, 0x10($sp) diff --git a/asm/nonmatchings/code_168590/func_80248A80.s b/asm/nonmatchings/code_168590/func_80248A80.s index 4060e530fa..aa14422270 100644 --- a/asm/nonmatchings/code_168590/func_80248A80.s +++ b/asm/nonmatchings/code_168590/func_80248A80.s @@ -38,8 +38,8 @@ glabel func_80248A80 /* 16935C 80248AFC 2484A190 */ addiu $a0, $a0, -0x5e70 /* 169360 80248B00 0C051FCC */ jal func_80147F30 /* 169364 80248B04 24050002 */ addiu $a1, $zero, 2 -/* 169368 80248B08 3C048016 */ lui $a0, %hi(D_80159D50) -/* 16936C 80248B0C 24849D50 */ addiu $a0, $a0, %lo(D_80159D50) +/* 169368 80248B08 3C048016 */ lui $a0, %hi(gUIPanels) +/* 16936C 80248B0C 24849D50 */ addiu $a0, $a0, %lo(gUIPanels) /* 169370 80248B10 94820610 */ lhu $v0, 0x610($a0) /* 169374 80248B14 00021400 */ sll $v0, $v0, 0x10 /* 169378 80248B18 00021C03 */ sra $v1, $v0, 0x10 @@ -63,8 +63,8 @@ glabel func_80248A80 .L80248B60: /* 1693C0 80248B60 240200A0 */ addiu $v0, $zero, 0xa0 /* 1693C4 80248B64 00451023 */ subu $v0, $v0, $a1 -/* 1693C8 80248B68 3C048016 */ lui $a0, %hi(D_80159D50) -/* 1693CC 80248B6C 24849D50 */ addiu $a0, $a0, %lo(D_80159D50) +/* 1693C8 80248B68 3C048016 */ lui $a0, %hi(gUIPanels) +/* 1693CC 80248B6C 24849D50 */ addiu $a0, $a0, %lo(gUIPanels) .L80248B70: /* 1693D0 80248B70 A4C20000 */ sh $v0, ($a2) /* 1693D4 80248B74 94820630 */ lhu $v0, 0x630($a0) diff --git a/asm/nonmatchings/code_168590/func_80248BF4.s b/asm/nonmatchings/code_168590/func_80248BF4.s index 7c3d00f25f..360447de77 100644 --- a/asm/nonmatchings/code_168590/func_80248BF4.s +++ b/asm/nonmatchings/code_168590/func_80248BF4.s @@ -227,8 +227,8 @@ glabel func_80248BF4 /* 16978C 80248F2C 24A53CCC */ addiu $a1, $a1, 0x3ccc /* 169790 80248F30 0C051F9F */ jal func_80147E7C /* 169794 80248F34 24040032 */ addiu $a0, $zero, 0x32 -/* 169798 80248F38 3C048016 */ lui $a0, %hi(D_80159D50) -/* 16979C 80248F3C 24849D50 */ addiu $a0, $a0, %lo(D_80159D50) +/* 169798 80248F38 3C048016 */ lui $a0, %hi(gUIPanels) +/* 16979C 80248F3C 24849D50 */ addiu $a0, $a0, %lo(gUIPanels) /* 1697A0 80248F40 24020079 */ addiu $v0, $zero, 0x79 /* 1697A4 80248F44 A482064E */ sh $v0, 0x64e($a0) /* 1697A8 80248F48 24020045 */ addiu $v0, $zero, 0x45 @@ -251,8 +251,8 @@ glabel func_80248BF4 /* 1697EC 80248F8C 2463FFDE */ addiu $v1, $v1, -0x22 .L80248F90: /* 1697F0 80248F90 2403007E */ addiu $v1, $zero, 0x7e -/* 1697F4 80248F94 3C048016 */ lui $a0, %hi(D_80159D50) -/* 1697F8 80248F98 24849D50 */ addiu $a0, $a0, %lo(D_80159D50) +/* 1697F4 80248F94 3C048016 */ lui $a0, %hi(gUIPanels) +/* 1697F8 80248F98 24849D50 */ addiu $a0, $a0, %lo(gUIPanels) .L80248F9C: /* 1697FC 80248F9C 2402FFBA */ addiu $v0, $zero, -0x46 /* 169800 80248FA0 A4A30000 */ sh $v1, ($a1) @@ -429,8 +429,8 @@ glabel func_80248BF4 /* 169A7C 8024921C 24A53CCC */ addiu $a1, $a1, 0x3ccc /* 169A80 80249220 0C051F9F */ jal func_80147E7C /* 169A84 80249224 24040032 */ addiu $a0, $zero, 0x32 -/* 169A88 80249228 3C048016 */ lui $a0, %hi(D_80159D50) -/* 169A8C 8024922C 24849D50 */ addiu $a0, $a0, %lo(D_80159D50) +/* 169A88 80249228 3C048016 */ lui $a0, %hi(gUIPanels) +/* 169A8C 8024922C 24849D50 */ addiu $a0, $a0, %lo(gUIPanels) /* 169A90 80249230 24020079 */ addiu $v0, $zero, 0x79 /* 169A94 80249234 A482064E */ sh $v0, 0x64e($a0) /* 169A98 80249238 24020045 */ addiu $v0, $zero, 0x45 @@ -453,8 +453,8 @@ glabel func_80248BF4 /* 169ADC 8024927C 2463FFDE */ addiu $v1, $v1, -0x22 .L80249280: /* 169AE0 80249280 2403007E */ addiu $v1, $zero, 0x7e -/* 169AE4 80249284 3C048016 */ lui $a0, %hi(D_80159D50) -/* 169AE8 80249288 24849D50 */ addiu $a0, $a0, %lo(D_80159D50) +/* 169AE4 80249284 3C048016 */ lui $a0, %hi(gUIPanels) +/* 169AE8 80249288 24849D50 */ addiu $a0, $a0, %lo(gUIPanels) .L8024928C: /* 169AEC 8024928C 2402FFBA */ addiu $v0, $zero, -0x46 /* 169AF0 80249290 A4A30000 */ sh $v1, ($a1) diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/update_item_entity_temp.s b/asm/nonmatchings/code_b72b0_len_15ed0/update_item_entity_temp.s index e84cc08a92..31303a1760 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/update_item_entity_temp.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/update_item_entity_temp.s @@ -517,8 +517,8 @@ glabel update_item_entity_temp /* CC53C 80135E3C 24020003 */ addiu $v0, $zero, 3 /* CC540 80135E40 0804D8DF */ j .L8013637C /* CC544 80135E44 A222001A */ sb $v0, 0x1a($s1) -/* CC548 80135E48 3C038016 */ lui $v1, %hi(D_80159D50) -/* CC54C 80135E4C 24639D50 */ addiu $v1, $v1, %lo(D_80159D50) +/* CC548 80135E48 3C038016 */ lui $v1, %hi(gUIPanels) +/* CC54C 80135E4C 24639D50 */ addiu $v1, $v1, %lo(gUIPanels) /* CC550 80135E50 90620180 */ lbu $v0, 0x180($v1) /* CC554 80135E54 30420008 */ andi $v0, $v0, 8 /* CC558 80135E58 14400148 */ bnez $v0, .L8013637C @@ -702,8 +702,8 @@ glabel update_item_entity_temp /* CC800 80136100 AC2068E4 */ sw $zero, 0x68e4($at) /* CC804 80136104 0804D8DF */ j .L8013637C /* CC808 80136108 A222001A */ sb $v0, 0x1a($s1) -/* CC80C 8013610C 3C038016 */ lui $v1, %hi(D_80159D50) -/* CC810 80136110 24639D50 */ addiu $v1, $v1, %lo(D_80159D50) +/* CC80C 8013610C 3C038016 */ lui $v1, %hi(gUIPanels) +/* CC810 80136110 24639D50 */ addiu $v1, $v1, %lo(gUIPanels) /* CC814 80136114 90620180 */ lbu $v0, 0x180($v1) /* CC818 80136118 30420008 */ andi $v0, $v0, 8 /* CC81C 8013611C 14400097 */ bnez $v0, .L8013637C @@ -818,8 +818,8 @@ glabel update_item_entity_temp /* CC9C4 801362C4 2402000E */ addiu $v0, $zero, 0xe /* CC9C8 801362C8 0804D8DF */ j .L8013637C /* CC9CC 801362CC A222001A */ sb $v0, 0x1a($s1) -/* CC9D0 801362D0 3C038016 */ lui $v1, %hi(D_80159D50) -/* CC9D4 801362D4 24639D50 */ addiu $v1, $v1, %lo(D_80159D50) +/* CC9D0 801362D0 3C038016 */ lui $v1, %hi(gUIPanels) +/* CC9D4 801362D4 24639D50 */ addiu $v1, $v1, %lo(gUIPanels) /* CC9D8 801362D8 90620180 */ lbu $v0, 0x180($v1) /* CC9DC 801362DC 30420008 */ andi $v0, $v0, 8 /* CC9E0 801362E0 14400026 */ bnez $v0, .L8013637C diff --git a/asm/nonmatchings/code_ddaf0_len_c50/func_80147414.s b/asm/nonmatchings/code_ddaf0_len_c50/func_80147414.s index 6a271950bb..d24031f9f8 100644 --- a/asm/nonmatchings/code_ddaf0_len_c50/func_80147414.s +++ b/asm/nonmatchings/code_ddaf0_len_c50/func_80147414.s @@ -3,8 +3,8 @@ glabel func_80147414 /* DDB14 80147414 0000302D */ daddu $a2, $zero, $zero -/* DDB18 80147418 3C058016 */ lui $a1, %hi(D_80159D50) -/* DDB1C 8014741C 24A59D50 */ addiu $a1, $a1, %lo(D_80159D50) +/* DDB18 80147418 3C058016 */ lui $a1, %hi(gUIPanels) +/* DDB1C 8014741C 24A59D50 */ addiu $a1, $a1, %lo(gUIPanels) /* DDB20 80147420 24A4001C */ addiu $a0, $a1, 0x1c .L80147424: /* DDB24 80147424 90A30000 */ lbu $v1, ($a1) diff --git a/asm/nonmatchings/code_ddaf0_len_c50/func_80147474.s b/asm/nonmatchings/code_ddaf0_len_c50/func_80147474.s index 2df65039c5..8efc7c32b0 100644 --- a/asm/nonmatchings/code_ddaf0_len_c50/func_80147474.s +++ b/asm/nonmatchings/code_ddaf0_len_c50/func_80147474.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80147474 -/* DDB74 80147474 3C028016 */ lui $v0, %hi(D_80159D50) -/* DDB78 80147478 24429D50 */ addiu $v0, $v0, %lo(D_80159D50) +/* DDB74 80147474 3C028016 */ lui $v0, %hi(gUIPanels) +/* DDB78 80147478 24429D50 */ addiu $v0, $v0, %lo(gUIPanels) /* DDB7C 8014747C 00042140 */ sll $a0, $a0, 5 /* DDB80 80147480 00822021 */ addu $a0, $a0, $v0 /* DDB84 80147484 8FA70014 */ lw $a3, 0x14($sp) diff --git a/asm/nonmatchings/code_ddaf0_len_c50/func_80147574.s b/asm/nonmatchings/code_ddaf0_len_c50/func_80147574.s index e01bf5dd49..abb8e561a9 100644 --- a/asm/nonmatchings/code_ddaf0_len_c50/func_80147574.s +++ b/asm/nonmatchings/code_ddaf0_len_c50/func_80147574.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80147574 -/* DDC74 80147574 3C028016 */ lui $v0, %hi(D_80159D50) -/* DDC78 80147578 24429D50 */ addiu $v0, $v0, %lo(D_80159D50) +/* DDC74 80147574 3C028016 */ lui $v0, %hi(gUIPanels) +/* DDC78 80147578 24429D50 */ addiu $v0, $v0, %lo(gUIPanels) /* DDC7C 8014757C 00042140 */ sll $a0, $a0, 5 /* DDC80 80147580 00822021 */ addu $a0, $a0, $v0 /* DDC84 80147584 9086001C */ lbu $a2, 0x1c($a0) diff --git a/asm/nonmatchings/code_ddaf0_len_c50/func_80147650.s b/asm/nonmatchings/code_ddaf0_len_c50/func_80147650.s index 29c0a6d606..c0717df5e9 100644 --- a/asm/nonmatchings/code_ddaf0_len_c50/func_80147650.s +++ b/asm/nonmatchings/code_ddaf0_len_c50/func_80147650.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80147650 -/* DDD50 80147650 3C028016 */ lui $v0, %hi(D_80159D50) -/* DDD54 80147654 24429D50 */ addiu $v0, $v0, %lo(D_80159D50) +/* DDD50 80147650 3C028016 */ lui $v0, %hi(gUIPanels) +/* DDD54 80147654 24429D50 */ addiu $v0, $v0, %lo(gUIPanels) /* DDD58 80147658 00042140 */ sll $a0, $a0, 5 /* DDD5C 8014765C 00822021 */ addu $a0, $a0, $v0 /* DDD60 80147660 9083001C */ lbu $v1, 0x1c($a0) diff --git a/asm/nonmatchings/code_ddaf0_len_c50/func_80147698.s b/asm/nonmatchings/code_ddaf0_len_c50/func_80147698.s index 4bf44cd849..3b2dd5ad5d 100644 --- a/asm/nonmatchings/code_ddaf0_len_c50/func_80147698.s +++ b/asm/nonmatchings/code_ddaf0_len_c50/func_80147698.s @@ -13,8 +13,8 @@ glabel func_80147698 /* DDDB8 801476B8 00171140 */ sll $v0, $s7, 5 /* DDDBC 801476BC F7B400E8 */ sdc1 $f20, 0xe8($sp) /* DDDC0 801476C0 4480A000 */ mtc1 $zero, $f20 -/* DDDC4 801476C4 3C0B8016 */ lui $t3, %hi(D_80159D50) -/* DDDC8 801476C8 256B9D50 */ addiu $t3, $t3, %lo(D_80159D50) +/* DDDC4 801476C4 3C0B8016 */ lui $t3, %hi(gUIPanels) +/* DDDC8 801476C8 256B9D50 */ addiu $t3, $t3, %lo(gUIPanels) /* DDDCC 801476CC AFBE00E0 */ sw $fp, 0xe0($sp) /* DDDD0 801476D0 004BF021 */ addu $fp, $v0, $t3 /* DDDD4 801476D4 AFBF00E4 */ sw $ra, 0xe4($sp) @@ -30,8 +30,8 @@ glabel func_80147698 /* DDDF8 801476F8 064200E2 */ bltzl $s2, .L80147A84 /* DDDFC 801476FC 26D60001 */ addiu $s6, $s6, 1 /* DDE00 80147700 00121140 */ sll $v0, $s2, 5 -/* DDE04 80147704 3C0B8016 */ lui $t3, %hi(D_80159D50) -/* DDE08 80147708 256B9D50 */ addiu $t3, $t3, %lo(D_80159D50) +/* DDE04 80147704 3C0B8016 */ lui $t3, %hi(gUIPanels) +/* DDE08 80147708 256B9D50 */ addiu $t3, $t3, %lo(gUIPanels) /* DDE0C 8014770C 004B8821 */ addu $s1, $v0, $t3 /* DDE10 80147710 92220000 */ lbu $v0, ($s1) /* DDE14 80147714 504000DB */ beql $v0, $zero, .L80147A84 diff --git a/asm/nonmatchings/code_ddaf0_len_c50/func_80147AC4.s b/asm/nonmatchings/code_ddaf0_len_c50/func_80147AC4.s index 9a34a58ba7..a804f87fa2 100644 --- a/asm/nonmatchings/code_ddaf0_len_c50/func_80147AC4.s +++ b/asm/nonmatchings/code_ddaf0_len_c50/func_80147AC4.s @@ -16,8 +16,8 @@ glabel func_80147AC4 /* DE1EC 80147AEC 0461FFFD */ bgez $v1, .L80147AE4 /* DE1F0 80147AF0 24420004 */ addiu $v0, $v0, 4 /* DE1F4 80147AF4 0000182D */ daddu $v1, $zero, $zero -/* DE1F8 80147AF8 3C048016 */ lui $a0, %hi(D_80159D50) -/* DE1FC 80147AFC 24849D50 */ addiu $a0, $a0, %lo(D_80159D50) +/* DE1F8 80147AF8 3C048016 */ lui $a0, %hi(gUIPanels) +/* DE1FC 80147AFC 24849D50 */ addiu $a0, $a0, %lo(gUIPanels) /* DE200 80147B00 27A50020 */ addiu $a1, $sp, 0x20 .L80147B04: /* DE204 80147B04 90820000 */ lbu $v0, ($a0) diff --git a/asm/nonmatchings/code_ddaf0_len_c50/func_80147D70.s b/asm/nonmatchings/code_ddaf0_len_c50/func_80147D70.s index d7c65b0525..67d6c7f3e0 100644 --- a/asm/nonmatchings/code_ddaf0_len_c50/func_80147D70.s +++ b/asm/nonmatchings/code_ddaf0_len_c50/func_80147D70.s @@ -21,8 +21,8 @@ glabel func_80147D70 /* DE4A8 80147DA8 03A31821 */ addu $v1, $sp, $v1 /* DE4AC 80147DAC AC640000 */ sw $a0, ($v1) /* DE4B0 80147DB0 0000302D */ daddu $a2, $zero, $zero -/* DE4B4 80147DB4 3C058016 */ lui $a1, %hi(D_80159D50) -/* DE4B8 80147DB8 24A59D50 */ addiu $a1, $a1, %lo(D_80159D50) +/* DE4B4 80147DB4 3C058016 */ lui $a1, %hi(gUIPanels) +/* DE4B8 80147DB8 24A59D50 */ addiu $a1, $a1, %lo(gUIPanels) /* DE4BC 80147DBC 0040382D */ daddu $a3, $v0, $zero .L80147DC0: /* DE4C0 80147DC0 90A20000 */ lbu $v0, ($a1) @@ -47,8 +47,8 @@ glabel func_80147D70 /* DE504 80147E04 0060302D */ daddu $a2, $v1, $zero /* DE508 80147E08 03A0382D */ daddu $a3, $sp, $zero /* DE50C 80147E0C 2405FFFF */ addiu $a1, $zero, -1 -/* DE510 80147E10 3C048016 */ lui $a0, %hi(D_80159D50) -/* DE514 80147E14 24849D50 */ addiu $a0, $a0, %lo(D_80159D50) +/* DE510 80147E10 3C048016 */ lui $a0, %hi(gUIPanels) +/* DE514 80147E14 24849D50 */ addiu $a0, $a0, %lo(gUIPanels) .L80147E18: /* DE518 80147E18 8CE20000 */ lw $v0, ($a3) /* DE51C 80147E1C 10450005 */ beq $v0, $a1, .L80147E34 diff --git a/asm/nonmatchings/code_ddaf0_len_c50/func_80147E48.s b/asm/nonmatchings/code_ddaf0_len_c50/func_80147E48.s index 86afab7a37..9e4e6b4a87 100644 --- a/asm/nonmatchings/code_ddaf0_len_c50/func_80147E48.s +++ b/asm/nonmatchings/code_ddaf0_len_c50/func_80147E48.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80147E48 -/* DE548 80147E48 3C028016 */ lui $v0, %hi(D_80159D50) -/* DE54C 80147E4C 24429D50 */ addiu $v0, $v0, %lo(D_80159D50) +/* DE548 80147E48 3C028016 */ lui $v0, %hi(gUIPanels) +/* DE54C 80147E4C 24429D50 */ addiu $v0, $v0, %lo(gUIPanels) /* DE550 80147E50 00042140 */ sll $a0, $a0, 5 /* DE554 80147E54 00822021 */ addu $a0, $a0, $v0 /* DE558 80147E58 90830000 */ lbu $v1, ($a0) diff --git a/asm/nonmatchings/code_ddaf0_len_c50/func_80147E7C.s b/asm/nonmatchings/code_ddaf0_len_c50/func_80147E7C.s index b361c825ae..642f9a9643 100644 --- a/asm/nonmatchings/code_ddaf0_len_c50/func_80147E7C.s +++ b/asm/nonmatchings/code_ddaf0_len_c50/func_80147E7C.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80147E7C -/* DE57C 80147E7C 3C028016 */ lui $v0, %hi(D_80159D50) -/* DE580 80147E80 24429D50 */ addiu $v0, $v0, %lo(D_80159D50) +/* DE57C 80147E7C 3C028016 */ lui $v0, %hi(gUIPanels) +/* DE580 80147E80 24429D50 */ addiu $v0, $v0, %lo(gUIPanels) /* DE584 80147E84 00042140 */ sll $a0, $a0, 5 /* DE588 80147E88 00822021 */ addu $a0, $a0, $v0 /* DE58C 80147E8C 90830000 */ lbu $v1, ($a0) diff --git a/asm/nonmatchings/code_ddaf0_len_c50/func_80147EC4.s b/asm/nonmatchings/code_ddaf0_len_c50/func_80147EC4.s index b30974f028..ec4a6bcc68 100644 --- a/asm/nonmatchings/code_ddaf0_len_c50/func_80147EC4.s +++ b/asm/nonmatchings/code_ddaf0_len_c50/func_80147EC4.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80147EC4 -/* DE5C4 80147EC4 3C068016 */ lui $a2, %hi(D_80159D50) -/* DE5C8 80147EC8 24C69D50 */ addiu $a2, $a2, %lo(D_80159D50) +/* DE5C4 80147EC4 3C068016 */ lui $a2, %hi(gUIPanels) +/* DE5C8 80147EC8 24C69D50 */ addiu $a2, $a2, %lo(gUIPanels) /* DE5CC 80147ECC 0000282D */ daddu $a1, $zero, $zero /* DE5D0 80147ED0 3C028015 */ lui $v0, 0x8015 /* DE5D4 80147ED4 2442F2C0 */ addiu $v0, $v0, -0xd40 diff --git a/asm/nonmatchings/code_ddaf0_len_c50/func_80147F30.s b/asm/nonmatchings/code_ddaf0_len_c50/func_80147F30.s index f69f7d32c2..4349a0c6fd 100644 --- a/asm/nonmatchings/code_ddaf0_len_c50/func_80147F30.s +++ b/asm/nonmatchings/code_ddaf0_len_c50/func_80147F30.s @@ -18,8 +18,8 @@ glabel func_80147F30 /* DE664 80147F64 2416FFFF */ addiu $s6, $zero, -1 /* DE668 80147F68 3C158015 */ lui $s5, 0x8015 /* DE66C 80147F6C 26B5F150 */ addiu $s5, $s5, -0xeb0 -/* DE670 80147F70 3C148016 */ lui $s4, %hi(D_80159D50) -/* DE674 80147F74 26949D50 */ addiu $s4, $s4, %lo(D_80159D50) +/* DE670 80147F70 3C148016 */ lui $s4, %hi(gUIPanels) +/* DE674 80147F74 26949D50 */ addiu $s4, $s4, %lo(gUIPanels) /* DE678 80147F78 2490001C */ addiu $s0, $a0, 0x1c .L80147F7C: /* DE67C 80147F7C 8602FFEC */ lh $v0, -0x14($s0) diff --git a/asm/nonmatchings/code_ddaf0_len_c50/set_ui_panel_properties.s b/asm/nonmatchings/code_ddaf0_len_c50/set_ui_panel_properties.s index a321c82c89..23d07dbf69 100644 --- a/asm/nonmatchings/code_ddaf0_len_c50/set_ui_panel_properties.s +++ b/asm/nonmatchings/code_ddaf0_len_c50/set_ui_panel_properties.s @@ -4,8 +4,8 @@ glabel set_ui_panel_properties /* DE3C8 80147CC8 27BDFFE0 */ addiu $sp, $sp, -0x20 /* DE3CC 80147CCC 0080582D */ daddu $t3, $a0, $zero -/* DE3D0 80147CD0 3C0A8016 */ lui $t2, %hi(D_80159D50) -/* DE3D4 80147CD4 254A9D50 */ addiu $t2, $t2, %lo(D_80159D50) +/* DE3D0 80147CD0 3C0A8016 */ lui $t2, %hi(gUIPanels) +/* DE3D4 80147CD4 254A9D50 */ addiu $t2, $t2, %lo(gUIPanels) /* DE3D8 80147CD8 8FA90030 */ lw $t1, 0x30($sp) /* DE3DC 80147CDC 000B1140 */ sll $v0, $t3, 5 /* DE3E0 80147CE0 AFB00010 */ sw $s0, 0x10($sp) diff --git a/include/common_structs.h b/include/common_structs.h index 1a9f77a631..35167741b6 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -1551,4 +1551,21 @@ typedef struct { /* 0x18 */ void* fpCleanup; } MenuTab; // size = 0x1C +typedef struct { + /* 0x00 */ s8 flags; + /* 0x01 */ char unk_01; + /* 0x02 */ char unk_02; // related to heirarchy somehow - sibling? group? + /* 0x03 */ s8 parent; // ? + /* 0x04 */ s32 unk_04; + /* 0x08 */ UNK_PTR unk_08; + /* 0x0C */ s16 posX; + /* 0x0E */ s16 posY; + /* 0x10 */ s16 width; + /* 0x12 */ s16 height; + /* 0x14 */ UNK_PTR fpDrawContents; + /* 0x18 */ s32 unk_18; // MenuTab pointer for pause menu tabs + /* 0x1C */ s8 unk_1C; + /* 0x1D */ char unk_1D[3]; +} UIPanel; // size = 0x20 + #endif diff --git a/include/variables.h b/include/variables.h index d956c962ae..f8de9a1e1b 100644 --- a/include/variables.h +++ b/include/variables.h @@ -119,6 +119,8 @@ extern u8 D_800A095F; extern s32 D_800A0960; extern s32 D_800A0964; +extern UIPanel gUIPanels[64]; + // Pause extern s32 gPauseMenuHeldButtons; extern s32 gPauseMenuPressedButtons; diff --git a/src/code_ddaf0_len_c50.c b/src/code_ddaf0_len_c50.c index dee04850a4..8d7629b561 100644 --- a/src/code_ddaf0_len_c50.c +++ b/src/code_ddaf0_len_c50.c @@ -1,22 +1,12 @@ #include "common.h" -typedef struct { - /* 0x00 */ u8 unk_00; - /* 0x04 */ s32 unk_04; - /* 0x08 */ s32 unk_08; - /* 0x0C */ char unk_01[0x10]; - /* 0x1C */ u8 unk_1C; -} struct_80159D50; // size = 0x20 - -extern struct_80159D50 D_80159D50[0x40]; - +// this is definitely wrong but I had issues trying to use an array accessor void func_801473F0(void) { - struct_80159D50* phi_v1 = &D_80159D50; + UIPanel* panelIt = gUIPanels; s32 i; - for (i = 0; i < 0x40; i++) { - phi_v1->unk_00 = 0; - phi_v1++; + for (i = 0; i < ARRAY_COUNT(gUIPanels); i++, panelIt++) { + panelIt->flags = 0; } } diff --git a/undefined_syms.txt b/undefined_syms.txt index a3bd1d9db3..49a9259557 100644 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -17,7 +17,7 @@ gPlayerNpcPtr = 0x802D9D20; D_80147574 = 0x80147574; D_8010EBB0 = 0x8010EBB0; D_8010F250 = 0x8010F250; -D_80159D50 = 0x80159D50; +gUIPanels = 0x80159D50; gWorldMapVars = 0x802DBCA8; gBattleMapVars = 0x802DBCE8; From d2bd96e127e895e302025ba1a964ccb0e90226d3 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Thu, 12 Nov 2020 19:27:57 -0500 Subject: [PATCH 07/10] couple more --- .../code_ddaf0_len_c50/func_80147E48.s | 18 -------------- .../code_ddaf0_len_c50/func_80147E7C.s | 24 ------------------- include/common_structs.h | 2 +- src/code_ddaf0_len_c50.c | 23 ++++++++++++++++-- 4 files changed, 22 insertions(+), 45 deletions(-) delete mode 100644 asm/nonmatchings/code_ddaf0_len_c50/func_80147E48.s delete mode 100644 asm/nonmatchings/code_ddaf0_len_c50/func_80147E7C.s diff --git a/asm/nonmatchings/code_ddaf0_len_c50/func_80147E48.s b/asm/nonmatchings/code_ddaf0_len_c50/func_80147E48.s deleted file mode 100644 index 9e4e6b4a87..0000000000 --- a/asm/nonmatchings/code_ddaf0_len_c50/func_80147E48.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80147E48 -/* DE548 80147E48 3C028016 */ lui $v0, %hi(gUIPanels) -/* DE54C 80147E4C 24429D50 */ addiu $v0, $v0, %lo(gUIPanels) -/* DE550 80147E50 00042140 */ sll $a0, $a0, 5 -/* DE554 80147E54 00822021 */ addu $a0, $a0, $v0 -/* DE558 80147E58 90830000 */ lbu $v1, ($a0) -/* DE55C 80147E5C 30620001 */ andi $v0, $v1, 1 -/* DE560 80147E60 10400004 */ beqz $v0, .L80147E74 -/* DE564 80147E64 3462000A */ ori $v0, $v1, 0xa -/* DE568 80147E68 A0820000 */ sb $v0, ($a0) -/* DE56C 80147E6C AC860008 */ sw $a2, 8($a0) -/* DE570 80147E70 A0850002 */ sb $a1, 2($a0) -.L80147E74: -/* DE574 80147E74 03E00008 */ jr $ra -/* DE578 80147E78 00000000 */ nop diff --git a/asm/nonmatchings/code_ddaf0_len_c50/func_80147E7C.s b/asm/nonmatchings/code_ddaf0_len_c50/func_80147E7C.s deleted file mode 100644 index 642f9a9643..0000000000 --- a/asm/nonmatchings/code_ddaf0_len_c50/func_80147E7C.s +++ /dev/null @@ -1,24 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80147E7C -/* DE57C 80147E7C 3C028016 */ lui $v0, %hi(gUIPanels) -/* DE580 80147E80 24429D50 */ addiu $v0, $v0, %lo(gUIPanels) -/* DE584 80147E84 00042140 */ sll $a0, $a0, 5 -/* DE588 80147E88 00822021 */ addu $a0, $a0, $v0 -/* DE58C 80147E8C 90830000 */ lbu $v1, ($a0) -/* DE590 80147E90 30620001 */ andi $v0, $v1, 1 -/* DE594 80147E94 10400009 */ beqz $v0, .L80147EBC -/* DE598 80147E98 00000000 */ nop -/* DE59C 80147E9C 8C820004 */ lw $v0, 4($a0) -/* DE5A0 80147EA0 14A20004 */ bne $a1, $v0, .L80147EB4 -/* DE5A4 80147EA4 3462000A */ ori $v0, $v1, 0xa -/* DE5A8 80147EA8 306200FD */ andi $v0, $v1, 0xfd -/* DE5AC 80147EAC 03E00008 */ jr $ra -/* DE5B0 80147EB0 A0820000 */ sb $v0, ($a0) -.L80147EB4: -/* DE5B4 80147EB4 A0820000 */ sb $v0, ($a0) -/* DE5B8 80147EB8 AC850008 */ sw $a1, 8($a0) -.L80147EBC: -/* DE5BC 80147EBC 03E00008 */ jr $ra -/* DE5C0 80147EC0 00000000 */ nop diff --git a/include/common_structs.h b/include/common_structs.h index 35167741b6..09e67e3585 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -1554,7 +1554,7 @@ typedef struct { typedef struct { /* 0x00 */ s8 flags; /* 0x01 */ char unk_01; - /* 0x02 */ char unk_02; // related to heirarchy somehow - sibling? group? + /* 0x02 */ s8 unk_02; // related to heirarchy somehow - sibling? group? /* 0x03 */ s8 parent; // ? /* 0x04 */ s32 unk_04; /* 0x08 */ UNK_PTR unk_08; diff --git a/src/code_ddaf0_len_c50.c b/src/code_ddaf0_len_c50.c index 8d7629b561..36f7a8ee95 100644 --- a/src/code_ddaf0_len_c50.c +++ b/src/code_ddaf0_len_c50.c @@ -26,9 +26,28 @@ INCLUDE_ASM(s32, "code_ddaf0_len_c50", set_ui_panel_properties); INCLUDE_ASM(s32, "code_ddaf0_len_c50", func_80147D70); -INCLUDE_ASM(s32, "code_ddaf0_len_c50", func_80147E48); +void func_80147E48(s32 panelIndex, s8 arg1, s32 arg2) { + UIPanel* panels = gUIPanels; -INCLUDE_ASM(s32, "code_ddaf0_len_c50", func_80147E7C); + if (panels[panelIndex].flags & 1) { + panels[panelIndex].flags |= 0xA; + panels[panelIndex].unk_08 = arg2; + panels[panelIndex].unk_02 = arg1; + } +} + +void func_80147E7C(s32 panelIndex, s32 arg1) { + UIPanel* panels = gUIPanels; + + if (panels[panelIndex].flags & 1) { + if (arg1 == panels[panelIndex].unk_04) { + panels[panelIndex].flags &= ~0x2; + } else { + panels[panelIndex].flags |= 0xA; + panels[panelIndex].unk_08 = arg1; + } + } +} INCLUDE_ASM(s32, "code_ddaf0_len_c50", func_80147EC4); From f6f56a8a5f4f87850a42922e59567c7129847377 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Fri, 13 Nov 2020 01:17:53 -0500 Subject: [PATCH 08/10] libultra organization --- .../code_de740_len_23f0/func_80149600.s | 10 ---------- .../os/{code_48a20_len_1c0 => ldiv}/ldiv.s | 8 ++++---- .../os/{code_48a20_len_1c0 => ldiv}/lldiv.s | 0 .../osEPiReadIo.s | 4 ++-- .../os/code_46760_len_90 => os}/__osDisableInt.s | 12 +++++++++--- .../os/code_46760_len_90 => os}/__osRestoreInt.s | 14 ++++++++++---- src/code_dd930_len_1c0.c | 2 +- src/code_de740_len_23f0.c | 5 ++++- src/os/code_3c1c0_len_60.c | 3 --- src/os/code_46760_len_90.c | 5 ----- src/os/code_48a20_len_1c0.c | 5 ----- src/os/ldiv.c | 5 +++++ src/os/osEPiReadIo.c | 3 +++ tools/splat.yaml | 7 ++++--- 14 files changed, 42 insertions(+), 41 deletions(-) delete mode 100644 asm/nonmatchings/code_de740_len_23f0/func_80149600.s rename asm/nonmatchings/os/{code_48a20_len_1c0 => ldiv}/ldiv.s (90%) rename asm/nonmatchings/os/{code_48a20_len_1c0 => ldiv}/lldiv.s (100%) rename asm/nonmatchings/os/{code_3c1c0_len_60 => osEPiReadIo}/osEPiReadIo.s (94%) rename asm/{nonmatchings/os/code_46760_len_90 => os}/__osDisableInt.s (86%) rename asm/{nonmatchings/os/code_46760_len_90 => os}/__osRestoreInt.s (53%) delete mode 100644 src/os/code_3c1c0_len_60.c delete mode 100644 src/os/code_46760_len_90.c delete mode 100644 src/os/code_48a20_len_1c0.c create mode 100644 src/os/ldiv.c create mode 100644 src/os/osEPiReadIo.c diff --git a/asm/nonmatchings/code_de740_len_23f0/func_80149600.s b/asm/nonmatchings/code_de740_len_23f0/func_80149600.s deleted file mode 100644 index da3fcd7152..0000000000 --- a/asm/nonmatchings/code_de740_len_23f0/func_80149600.s +++ /dev/null @@ -1,10 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80149600 -/* DFD00 80149600 3C018015 */ lui $at, %hi(gCurrentDoorSoundsSet) -/* DFD04 80149604 A4201340 */ sh $zero, %lo(gCurrentDoorSoundsSet)($at) -/* DFD08 80149608 3C018015 */ lui $at, %hi(D_80151308) -/* DFD0C 8014960C A4201308 */ sh $zero, %lo(D_80151308)($at) -/* DFD10 80149610 03E00008 */ jr $ra -/* DFD14 80149614 00000000 */ nop diff --git a/asm/nonmatchings/os/code_48a20_len_1c0/ldiv.s b/asm/nonmatchings/os/ldiv/ldiv.s similarity index 90% rename from asm/nonmatchings/os/code_48a20_len_1c0/ldiv.s rename to asm/nonmatchings/os/ldiv/ldiv.s index 8c09d0216d..7576b45bec 100644 --- a/asm/nonmatchings/os/code_48a20_len_1c0/ldiv.s +++ b/asm/nonmatchings/os/ldiv/ldiv.s @@ -4,19 +4,19 @@ glabel ldiv /* 48A20 8006D620 00A6001A */ div $zero, $a1, $a2 /* 48A24 8006D624 14C00002 */ bnez $a2, .L8006D630 -/* 48A28 8006D628 00000000 */ nop +/* 48A28 8006D628 00000000 */ nop /* 48A2C 8006D62C 0007000D */ break 7 .L8006D630: /* 48A30 8006D630 2401FFFF */ addiu $at, $zero, -1 /* 48A34 8006D634 14C10004 */ bne $a2, $at, .L8006D648 /* 48A38 8006D638 3C018000 */ lui $at, 0x8000 /* 48A3C 8006D63C 14A10002 */ bne $a1, $at, .L8006D648 -/* 48A40 8006D640 00000000 */ nop +/* 48A40 8006D640 00000000 */ nop /* 48A44 8006D644 0006000D */ break 6 .L8006D648: /* 48A48 8006D648 00001812 */ mflo $v1 -/* 48A4C 8006D64C 00000000 */ nop -/* 48A50 8006D650 00000000 */ nop +/* 48A4C 8006D64C 00000000 */ nop +/* 48A50 8006D650 00000000 */ nop /* 48A54 8006D654 00C30018 */ mult $a2, $v1 /* 48A58 8006D658 00001012 */ mflo $v0 /* 48A5C 8006D65C 27BDFFF8 */ addiu $sp, $sp, -8 diff --git a/asm/nonmatchings/os/code_48a20_len_1c0/lldiv.s b/asm/nonmatchings/os/ldiv/lldiv.s similarity index 100% rename from asm/nonmatchings/os/code_48a20_len_1c0/lldiv.s rename to asm/nonmatchings/os/ldiv/lldiv.s diff --git a/asm/nonmatchings/os/code_3c1c0_len_60/osEPiReadIo.s b/asm/nonmatchings/os/osEPiReadIo/osEPiReadIo.s similarity index 94% rename from asm/nonmatchings/os/code_3c1c0_len_60/osEPiReadIo.s rename to asm/nonmatchings/os/osEPiReadIo/osEPiReadIo.s index 88213f22dd..dc2b3a0fcb 100644 --- a/asm/nonmatchings/os/code_3c1c0_len_60/osEPiReadIo.s +++ b/asm/nonmatchings/os/osEPiReadIo/osEPiReadIo.s @@ -24,5 +24,5 @@ glabel osEPiReadIo /* 3C20C 80060E0C 8FB00010 */ lw $s0, 0x10($sp) /* 3C210 80060E10 03E00008 */ jr $ra /* 3C214 80060E14 27BD0020 */ addiu $sp, $sp, 0x20 -/* 3C218 80060E18 00000000 */ nop -/* 3C21C 80060E1C 00000000 */ nop +/* 3C218 80060E18 00000000 */ nop +/* 3C21C 80060E1C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_46760_len_90/__osDisableInt.s b/asm/os/__osDisableInt.s similarity index 86% rename from asm/nonmatchings/os/code_46760_len_90/__osDisableInt.s rename to asm/os/__osDisableInt.s index 43951d5c8a..d6b2f19665 100644 --- a/asm/nonmatchings/os/code_46760_len_90/__osDisableInt.s +++ b/asm/os/__osDisableInt.s @@ -1,5 +1,11 @@ +.include "macro.inc" + +# assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.set gp=64 # allow use of 64-bit general purpose registers + +.section .text, "ax" glabel __osDisableInt /* 46760 8006B360 3C0A8009 */ lui $t2, 0x8009 @@ -26,8 +32,8 @@ glabel __osDisableInt /* 467B4 8006B3B4 2401FFFE */ addiu $at, $zero, -2 /* 467B8 8006B3B8 01214824 */ and $t1, $t1, $at /* 467BC 8006B3BC 40896000 */ mtc0 $t1, $12 -/* 467C0 8006B3C0 00000000 */ nop -/* 467C4 8006B3C4 00000000 */ nop +/* 467C0 8006B3C0 00000000 */ nop +/* 467C4 8006B3C4 00000000 */ nop .L8006B3C8: /* 467C8 8006B3C8 03E00008 */ jr $ra -/* 467CC 8006B3CC 00000000 */ nop +/* 467CC 8006B3CC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_46760_len_90/__osRestoreInt.s b/asm/os/__osRestoreInt.s similarity index 53% rename from asm/nonmatchings/os/code_46760_len_90/__osRestoreInt.s rename to asm/os/__osRestoreInt.s index 622b7b1c22..45a119ca70 100644 --- a/asm/nonmatchings/os/code_46760_len_90/__osRestoreInt.s +++ b/asm/os/__osRestoreInt.s @@ -1,12 +1,18 @@ +.include "macro.inc" + +# assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.set gp=64 # allow use of 64-bit general purpose registers + +.section .text, "ax" glabel __osRestoreInt /* 467D0 8006B3D0 40086000 */ mfc0 $t0, $12 /* 467D4 8006B3D4 01044025 */ or $t0, $t0, $a0 /* 467D8 8006B3D8 40886000 */ mtc0 $t0, $12 -/* 467DC 8006B3DC 00000000 */ nop -/* 467E0 8006B3E0 00000000 */ nop +/* 467DC 8006B3DC 00000000 */ nop +/* 467E0 8006B3E0 00000000 */ nop /* 467E4 8006B3E4 03E00008 */ jr $ra -/* 467E8 8006B3E8 00000000 */ nop -/* 467EC 8006B3EC 00000000 */ nop +/* 467E8 8006B3E8 00000000 */ nop +/* 467EC 8006B3EC 00000000 */ nop diff --git a/src/code_dd930_len_1c0.c b/src/code_dd930_len_1c0.c index ffbda92f3d..721f0c13f9 100644 --- a/src/code_dd930_len_1c0.c +++ b/src/code_dd930_len_1c0.c @@ -25,7 +25,7 @@ void func_80147264(void) { case 1: // fading out if (temp->fadeFlags & 1) { s32 phi_v0; - if (temp->fadeOutTime < 0xFA) { + if (temp->fadeOutTime < 250) { phi_v0 = func_800554A4(0, temp->fadeOutTime); } else { phi_v0 = func_800554E8(0, temp->fadeOutTime); diff --git a/src/code_de740_len_23f0.c b/src/code_de740_len_23f0.c index be4225e7e3..8dea620771 100644 --- a/src/code_de740_len_23f0.c +++ b/src/code_de740_len_23f0.c @@ -14,7 +14,10 @@ INCLUDE_ASM(s32, "code_de740_len_23f0", func_801491E4); INCLUDE_ASM(s32, "code_de740_len_23f0", func_80149250); -INCLUDE_ASM(s32, "code_de740_len_23f0", func_80149600); +void func_80149600(void) { + gCurrentDoorSoundsSet = 0; + D_80151308 = 0; +} INCLUDE_ASM(s32, "code_de740_len_23f0", func_80149618); diff --git a/src/os/code_3c1c0_len_60.c b/src/os/code_3c1c0_len_60.c deleted file mode 100644 index 4dc123e0ef..0000000000 --- a/src/os/code_3c1c0_len_60.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "os/code_3c1c0_len_60", osEPiReadIo, OSPiHandle* handle, u32 size, u32* out); diff --git a/src/os/code_46760_len_90.c b/src/os/code_46760_len_90.c deleted file mode 100644 index df0f9bc2b9..0000000000 --- a/src/os/code_46760_len_90.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "os/code_46760_len_90", __osDisableInt); - -INCLUDE_ASM(s32, "os/code_46760_len_90", __osRestoreInt); diff --git a/src/os/code_48a20_len_1c0.c b/src/os/code_48a20_len_1c0.c deleted file mode 100644 index 9add8eb7a5..0000000000 --- a/src/os/code_48a20_len_1c0.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "os/code_48a20_len_1c0", ldiv); - -INCLUDE_ASM(s32, "os/code_48a20_len_1c0", lldiv); diff --git a/src/os/ldiv.c b/src/os/ldiv.c new file mode 100644 index 0000000000..792805b29f --- /dev/null +++ b/src/os/ldiv.c @@ -0,0 +1,5 @@ +#include "common.h" + +INCLUDE_ASM(s32, "os/ldiv", ldiv); + +INCLUDE_ASM(s32, "os/ldiv", lldiv); diff --git a/src/os/osEPiReadIo.c b/src/os/osEPiReadIo.c new file mode 100644 index 0000000000..e7c8e44a87 --- /dev/null +++ b/src/os/osEPiReadIo.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "os/osEPiReadIo", osEPiReadIo, OSPiHandle* handle, u32 size, u32* out); diff --git a/tools/splat.yaml b/tools/splat.yaml index eb9530570c..b88064e6e3 100644 --- a/tools/splat.yaml +++ b/tools/splat.yaml @@ -91,7 +91,7 @@ segments: - [0x3BD40, hasm, os/osSetIntMask] - [0x3bde0, c, "os/code_3bde0_len_3e0"] - [0x3C160, c, os/osEPiWriteIo] - - [0x3c1c0, c, "os/code_3c1c0_len_60"] + - [0x3c1c0, c, os/osEPiReadIo] - [0x3c220, c, "os/code_3c220_len_a0"] - [0x3c2c0, c, "os/code_3c2c0_len_50"] - [0x3c310, c, "os/code_3c310_len_180"] @@ -171,7 +171,8 @@ segments: - [0x45a30, c, "os/code_45a30_len_20"] - [0x45a50, c, "os/code_45a50_len_3a0"] - [0x45df0, hasm, "os/code_45df0_len_970"] - - [0x46760, c, "os/code_46760_len_90"] + - [0x46760, hasm, os/__osDisableInt] + - [0x467D0, hasm, os/__osRestoreInt] - [0x467f0, c, "os/code_467f0_len_90"] - [0x46880, c, "os/code_46880_len_260"] - [0x46ae0, c, "os/code_46ae0_len_170"] @@ -190,7 +191,7 @@ segments: - [0x47fa0, c, "os/code_47fa0_len_20"] - [0x47fc0, c, "os/code_47fc0_len_60"] - [0x48020, c, "os/code_48020_len_a00"] - - [0x48a20, c, "os/code_48a20_len_1c0"] + - [0x48a20, c, "os/ldiv"] - [0x48be0, c, "os/code_48be0_len_20"] - [0x48c00, c, "os/code_48c00_len_5c0"] - [0x491c0, c, "os/code_491c0_len_f80"] From f616532137658af5c310d6de0fe5524c4ec6142e Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Fri, 13 Nov 2020 01:36:13 -0500 Subject: [PATCH 09/10] osSiDeviceBusy --- .../os/code_48be0_len_20/osSiDeviceBusy.s | 12 ------------ src/os/code_48be0_len_20.c | 3 --- src/os/osSiDeviceBusy.c | 13 +++++++++++++ tools/splat.yaml | 2 +- 4 files changed, 14 insertions(+), 16 deletions(-) delete mode 100644 asm/nonmatchings/os/code_48be0_len_20/osSiDeviceBusy.s delete mode 100644 src/os/code_48be0_len_20.c create mode 100644 src/os/osSiDeviceBusy.c diff --git a/asm/nonmatchings/os/code_48be0_len_20/osSiDeviceBusy.s b/asm/nonmatchings/os/code_48be0_len_20/osSiDeviceBusy.s deleted file mode 100644 index 2d1d0a659b..0000000000 --- a/asm/nonmatchings/os/code_48be0_len_20/osSiDeviceBusy.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel osSiDeviceBusy -/* 48BE0 8006D7E0 3C02A480 */ lui $v0, 0xa480 -/* 48BE4 8006D7E4 34420018 */ ori $v0, $v0, 0x18 -/* 48BE8 8006D7E8 8C420000 */ lw $v0, ($v0) -/* 48BEC 8006D7EC 30420003 */ andi $v0, $v0, 3 -/* 48BF0 8006D7F0 03E00008 */ jr $ra -/* 48BF4 8006D7F4 0002102B */ sltu $v0, $zero, $v0 -/* 48BF8 8006D7F8 00000000 */ nop -/* 48BFC 8006D7FC 00000000 */ nop diff --git a/src/os/code_48be0_len_20.c b/src/os/code_48be0_len_20.c deleted file mode 100644 index b6ce1230a9..0000000000 --- a/src/os/code_48be0_len_20.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "os/code_48be0_len_20", osSiDeviceBusy); diff --git a/src/os/osSiDeviceBusy.c b/src/os/osSiDeviceBusy.c new file mode 100644 index 0000000000..ae5c419122 --- /dev/null +++ b/src/os/osSiDeviceBusy.c @@ -0,0 +1,13 @@ +#include "common.h" + +s32 osSiDeviceBusy() { + // in oot, status is HW_REG(SI_STATUS_REG, u32); + // however, this macro doesn't exist in our libultra version apparently + u32 status = *(volatile u32*)(SI_STATUS_REG | 0xA0000000); + + if (status & (SI_STATUS_DMA_BUSY | SI_STATUS_RD_BUSY)) { + return TRUE; + } else { + return FALSE; + } +} diff --git a/tools/splat.yaml b/tools/splat.yaml index b88064e6e3..bfe744f12d 100644 --- a/tools/splat.yaml +++ b/tools/splat.yaml @@ -192,7 +192,7 @@ segments: - [0x47fc0, c, "os/code_47fc0_len_60"] - [0x48020, c, "os/code_48020_len_a00"] - [0x48a20, c, "os/ldiv"] - - [0x48be0, c, "os/code_48be0_len_20"] + - [0x48be0, c, "os/osSiDeviceBusy"] - [0x48c00, c, "os/code_48c00_len_5c0"] - [0x491c0, c, "os/code_491c0_len_f80"] - [0x49C70, c, "os/code_49C70"] From 529c75a4b0122fc522e46dee1af836546f0fabe4 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Sat, 14 Nov 2020 09:27:51 -0500 Subject: [PATCH 10/10] PR comment --- src/code_138CC0.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/code_138CC0.c b/src/code_138CC0.c index a41cb78856..e2c6235fd7 100644 --- a/src/code_138CC0.c +++ b/src/code_138CC0.c @@ -132,10 +132,8 @@ void pause_badges_update(void) { if (temp - *unkSym >= 7) { *unkSym = temp - 6; - } else { - if (temp - *unkSym <= 0) { - *unkSym = temp - 1; - } + } else if (temp - *unkSym <= 0) { + *unkSym = temp - 1; } }