From 0499f2d722d3e9f6ca96acfeeee6781681daee6a Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Tue, 10 Nov 2020 00:08:44 -0500 Subject: [PATCH] more syms --- .../code_135EE0/pause_badges_draw_contents.s | 20 ++++----- .../code_135EE0/pause_badges_get_column.s | 24 ---------- .../code_135EE0/pause_badges_handle_input.s | 44 +++++++++---------- .../code_135EE0/pause_badges_init.s | 4 +- .../code_135EE0/pause_badges_load_badges.s | 20 ++++----- .../code_135EE0/pause_badges_update.s | 8 ++-- .../code_135EE0/pause_stats_cleanup.s | 4 +- .../code_135EE0/pause_stats_draw_contents.s | 8 ++-- .../code_135EE0/pause_stats_init.s | 4 +- include/common_structs.h | 2 +- include/variables.h | 6 +++ src/code_135EE0.c | 4 +- undefined_syms.txt | 3 ++ 13 files changed, 69 insertions(+), 82 deletions(-) delete mode 100644 asm/nonmatchings/code_135EE0/pause_badges_get_column.s diff --git a/asm/nonmatchings/code_135EE0/pause_badges_draw_contents.s b/asm/nonmatchings/code_135EE0/pause_badges_draw_contents.s index 78ef3a0ee8..425aee68a3 100644 --- a/asm/nonmatchings/code_135EE0/pause_badges_draw_contents.s +++ b/asm/nonmatchings/code_135EE0/pause_badges_draw_contents.s @@ -4,8 +4,8 @@ glabel pause_badges_draw_contents /* 13A848 80247508 27BDFF40 */ addiu $sp, $sp, -0xc0 /* 13A84C 8024750C 240A0001 */ addiu $t2, $zero, 1 -/* 13A850 80247510 3C028027 */ lui $v0, 0x8027 -/* 13A854 80247514 8C420280 */ lw $v0, 0x280($v0) +/* 13A850 80247510 3C028027 */ lui $v0, %hi(gBadgeMenuCurrentPage) +/* 13A854 80247514 8C420280 */ lw $v0, %lo(gBadgeMenuCurrentPage)($v0) /* 13A858 80247518 3C038027 */ lui $v1, %hi(gBadgeMenuPages) /* 13A85C 8024751C 24630288 */ addiu $v1, $v1, %lo(gBadgeMenuPages) /* 13A860 80247520 AFBF00BC */ sw $ra, 0xbc($sp) @@ -219,12 +219,12 @@ glabel pause_badges_draw_contents /* 13AB7C 8024783C AFA0008C */ sw $zero, 0x8c($sp) /* 13AB80 80247840 005E1021 */ addu $v0, $v0, $fp /* 13AB84 80247844 00021040 */ sll $v0, $v0, 1 -/* 13AB88 80247848 3C118027 */ lui $s1, 0x8027 +/* 13AB88 80247848 3C118027 */ lui $s1, %hi(gBadgeMenuItemIDs) /* 13AB8C 8024784C 02228821 */ addu $s1, $s1, $v0 -/* 13AB90 80247850 86310180 */ lh $s1, 0x180($s1) -/* 13AB94 80247854 3C138027 */ lui $s3, 0x8027 +/* 13AB90 80247850 86310180 */ lh $s1, %lo(gBadgeMenuItemIDs)($s1) +/* 13AB94 80247854 3C138027 */ lui $s3, %hi(gBadgeMenuItemIDs) /* 13AB98 80247858 02629821 */ addu $s3, $s3, $v0 -/* 13AB9C 8024785C 96730180 */ lhu $s3, 0x180($s3) +/* 13AB9C 8024785C 96730180 */ lhu $s3, %lo(gBadgeMenuItemIDs)($s3) /* 13ABA0 80247860 12230239 */ beq $s1, $v1, .L80248148 /* 13ABA4 80247864 0000A82D */ daddu $s5, $zero, $zero /* 13ABA8 80247868 8FA40050 */ lw $a0, 0x50($sp) @@ -945,8 +945,8 @@ glabel pause_badges_draw_contents /* 13B630 802482F0 8C630398 */ lw $v1, 0x398($v1) /* 13B634 802482F4 14620026 */ bne $v1, $v0, .L80248390 /* 13B638 802482F8 00000000 */ nop -/* 13B63C 802482FC 3C118027 */ lui $s1, 0x8027 -/* 13B640 80248300 26310280 */ addiu $s1, $s1, 0x280 +/* 13B63C 802482FC 3C118027 */ lui $s1, %hi(gBadgeMenuCurrentPage) +/* 13B640 80248300 26310280 */ addiu $s1, $s1, %lo(gBadgeMenuCurrentPage) /* 13B644 80248304 8E220000 */ lw $v0, ($s1) /* 13B648 80248308 1840000E */ blez $v0, .L80248344 /* 13B64C 8024830C 24420001 */ addiu $v0, $v0, 1 @@ -1478,8 +1478,8 @@ glabel pause_badges_draw_contents /* 13BE28 80248AE8 080922FD */ j .L80248BF4 /* 13BE2C 80248AEC 01663021 */ addu $a2, $t3, $a2 .L80248AF0: -/* 13BE30 80248AF0 3C118027 */ lui $s1, 0x8027 -/* 13BE34 80248AF4 26310280 */ addiu $s1, $s1, 0x280 +/* 13BE30 80248AF0 3C118027 */ lui $s1, %hi(gBadgeMenuCurrentPage) +/* 13BE34 80248AF4 26310280 */ addiu $s1, $s1, %lo(gBadgeMenuCurrentPage) /* 13BE38 80248AF8 8E240000 */ lw $a0, ($s1) /* 13BE3C 80248AFC 3C128027 */ lui $s2, %hi(gBadgeMenuPages) /* 13BE40 80248B00 26520288 */ addiu $s2, $s2, %lo(gBadgeMenuPages) diff --git a/asm/nonmatchings/code_135EE0/pause_badges_get_column.s b/asm/nonmatchings/code_135EE0/pause_badges_get_column.s deleted file mode 100644 index 768be0698f..0000000000 --- a/asm/nonmatchings/code_135EE0/pause_badges_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_badges_get_column -/* 13A518 802471D8 00041040 */ sll $v0, $a0, 1 -/* 13A51C 802471DC 00441021 */ addu $v0, $v0, $a0 -/* 13A520 802471E0 00021080 */ sll $v0, $v0, 2 -/* 13A524 802471E4 3C018027 */ lui $at, 0x8027 -/* 13A528 802471E8 00220821 */ addu $at, $at, $v0 -/* 13A52C 802471EC 9022028A */ lbu $v0, 0x28a($at) -/* 13A530 802471F0 14400002 */ bnez $v0, .L802471FC -/* 13A534 802471F4 00A2001A */ div $zero, $a1, $v0 -/* 13A538 802471F8 0007000D */ break 7 -.L802471FC: -/* 13A53C 802471FC 2401FFFF */ addiu $at, $zero, -1 -/* 13A540 80247200 14410004 */ bne $v0, $at, .L80247214 -/* 13A544 80247204 3C018000 */ lui $at, 0x8000 -/* 13A548 80247208 14A10002 */ bne $a1, $at, .L80247214 -/* 13A54C 8024720C 00000000 */ nop -/* 13A550 80247210 0006000D */ break 6 -.L80247214: -/* 13A554 80247214 00001010 */ mfhi $v0 -/* 13A558 80247218 03E00008 */ jr $ra -/* 13A55C 8024721C 00000000 */ nop diff --git a/asm/nonmatchings/code_135EE0/pause_badges_handle_input.s b/asm/nonmatchings/code_135EE0/pause_badges_handle_input.s index 79fa4d49bc..6c86613f8c 100644 --- a/asm/nonmatchings/code_135EE0/pause_badges_handle_input.s +++ b/asm/nonmatchings/code_135EE0/pause_badges_handle_input.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel pause_badges_handle_input -/* 13C3E8 802490A8 3C038027 */ lui $v1, 0x8027 -/* 13C3EC 802490AC 8C630280 */ lw $v1, 0x280($v1) +/* 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) /* 13C3F8 802490B8 27BDFFE0 */ addiu $sp, $sp, -0x20 @@ -48,9 +48,9 @@ glabel pause_badges_handle_input /* 13C488 80249148 8C820000 */ lw $v0, ($a0) /* 13C48C 8024914C 14400010 */ bnez $v0, .L80249190 /* 13C490 80249150 00091040 */ sll $v0, $t1, 1 -/* 13C494 80249154 3C038027 */ lui $v1, 0x8027 +/* 13C494 80249154 3C038027 */ lui $v1, %hi(gBadgeMenuItemIDs) /* 13C498 80249158 00621821 */ addu $v1, $v1, $v0 -/* 13C49C 8024915C 84630180 */ lh $v1, 0x180($v1) +/* 13C49C 8024915C 84630180 */ lh $v1, %lo(gBadgeMenuItemIDs)($v1) /* 13C4A0 80249160 24027FFE */ addiu $v0, $zero, 0x7ffe /* 13C4A4 80249164 14620005 */ bne $v1, $v0, .L8024917C /* 13C4A8 80249168 24020001 */ addiu $v0, $zero, 1 @@ -65,9 +65,9 @@ glabel pause_badges_handle_input /* 13C4C8 80249188 08092581 */ j .L80249604 /* 13C4CC 8024918C 00000000 */ nop .L80249190: -/* 13C4D0 80249190 3C118027 */ lui $s1, 0x8027 +/* 13C4D0 80249190 3C118027 */ lui $s1, %hi(gBadgeMenuItemIDs) /* 13C4D4 80249194 02228821 */ addu $s1, $s1, $v0 -/* 13C4D8 80249198 86310180 */ lh $s1, 0x180($s1) +/* 13C4D8 80249198 86310180 */ lh $s1, %lo(gBadgeMenuItemIDs)($s1) /* 13C4DC 8024919C 0C091CCE */ jal pause_badges_try_equip /* 13C4E0 802491A0 0220202D */ daddu $a0, $s1, $zero /* 13C4E4 802491A4 0040802D */ daddu $s0, $v0, $zero @@ -157,8 +157,8 @@ glabel pause_badges_handle_input /* 13C610 802492D0 04A20001 */ bltzl $a1, .L802492D8 /* 13C614 802492D4 0000282D */ daddu $a1, $zero, $zero .L802492D8: -/* 13C618 802492D8 3C048027 */ lui $a0, 0x8027 -/* 13C61C 802492DC 24840280 */ addiu $a0, $a0, 0x280 +/* 13C618 802492D8 3C048027 */ lui $a0, %hi(gBadgeMenuCurrentPage) +/* 13C61C 802492DC 24840280 */ addiu $a0, $a0, %lo(gBadgeMenuCurrentPage) /* 13C620 802492E0 8C830000 */ lw $v1, ($a0) /* 13C624 802492E4 00031040 */ sll $v0, $v1, 1 /* 13C628 802492E8 00431021 */ addu $v0, $v0, $v1 @@ -172,8 +172,8 @@ glabel pause_badges_handle_input /* 13C648 80249308 080924D2 */ j .L80249348 /* 13C64C 8024930C AC820000 */ sw $v0, ($a0) .L80249310: -/* 13C650 80249310 3C038027 */ lui $v1, 0x8027 -/* 13C654 80249314 24630280 */ addiu $v1, $v1, 0x280 +/* 13C650 80249310 3C038027 */ lui $v1, %hi(gBadgeMenuCurrentPage) +/* 13C654 80249314 24630280 */ addiu $v1, $v1, %lo(gBadgeMenuCurrentPage) /* 13C658 80249318 8C620000 */ lw $v0, ($v1) /* 13C65C 8024931C 2442FFFF */ addiu $v0, $v0, -1 /* 13C660 80249320 04410002 */ bgez $v0, .L8024932C @@ -198,8 +198,8 @@ glabel pause_badges_handle_input /* 13C6A4 80249364 00621024 */ and $v0, $v1, $v0 /* 13C6A8 80249368 1040001C */ beqz $v0, .L802493DC /* 13C6AC 8024936C 00000000 */ nop -/* 13C6B0 80249370 3C068027 */ lui $a2, 0x8027 -/* 13C6B4 80249374 24C60280 */ addiu $a2, $a2, 0x280 +/* 13C6B0 80249370 3C068027 */ lui $a2, %hi(gBadgeMenuCurrentPage) +/* 13C6B4 80249374 24C60280 */ addiu $a2, $a2, %lo(gBadgeMenuCurrentPage) /* 13C6B8 80249378 8CC40000 */ lw $a0, ($a2) /* 13C6BC 8024937C 3C078027 */ lui $a3, %hi(gBadgeMenuPages) /* 13C6C0 80249380 24E70288 */ addiu $a3, $a3, %lo(gBadgeMenuPages) @@ -226,8 +226,8 @@ glabel pause_badges_handle_input /* 13C714 802493D4 08092508 */ j .L80249420 /* 13C718 802493D8 24A5FFFF */ addiu $a1, $a1, -1 .L802493DC: -/* 13C71C 802493DC 3C068027 */ lui $a2, 0x8027 -/* 13C720 802493E0 24C60280 */ addiu $a2, $a2, 0x280 +/* 13C71C 802493DC 3C068027 */ lui $a2, %hi(gBadgeMenuCurrentPage) +/* 13C720 802493E0 24C60280 */ addiu $a2, $a2, %lo(gBadgeMenuCurrentPage) /* 13C724 802493E4 8CC70000 */ lw $a3, ($a2) /* 13C728 802493E8 3C048027 */ lui $a0, %hi(gBadgeMenuPages) /* 13C72C 802493EC 24840288 */ addiu $a0, $a0, %lo(gBadgeMenuPages) @@ -245,8 +245,8 @@ glabel pause_badges_handle_input .L8024941C: /* 13C75C 8024941C 90650001 */ lbu $a1, 1($v1) .L80249420: -/* 13C760 80249420 3C038027 */ lui $v1, 0x8027 -/* 13C764 80249424 8C630280 */ lw $v1, 0x280($v1) +/* 13C760 80249420 3C038027 */ lui $v1, %hi(gBadgeMenuCurrentPage) +/* 13C764 80249424 8C630280 */ lw $v1, %lo(gBadgeMenuCurrentPage)($v1) /* 13C768 80249428 00031040 */ sll $v0, $v1, 1 /* 13C76C 8024942C 00431021 */ addu $v0, $v0, $v1 /* 13C770 80249430 00021080 */ sll $v0, $v0, 2 @@ -256,9 +256,9 @@ glabel pause_badges_handle_input /* 13C780 80249440 00A40018 */ mult $a1, $a0 /* 13C784 80249444 00005012 */ mflo $t2 /* 13C788 80249448 000A1040 */ sll $v0, $t2, 1 -/* 13C78C 8024944C 3C038027 */ lui $v1, 0x8027 +/* 13C78C 8024944C 3C038027 */ lui $v1, %hi(gBadgeMenuItemIDs) /* 13C790 80249450 00621821 */ addu $v1, $v1, $v0 -/* 13C794 80249454 84630180 */ lh $v1, 0x180($v1) +/* 13C794 80249454 84630180 */ lh $v1, %lo(gBadgeMenuItemIDs)($v1) /* 13C798 80249458 24027FFE */ addiu $v0, $zero, 0x7ffe /* 13C79C 8024945C 10620012 */ beq $v1, $v0, .L802494A8 /* 13C7A0 80249460 3C020004 */ lui $v0, 4 @@ -283,8 +283,8 @@ glabel pause_badges_handle_input .L802494A8: /* 13C7E8 802494A8 0000402D */ daddu $t0, $zero, $zero .L802494AC: -/* 13C7EC 802494AC 3C038027 */ lui $v1, 0x8027 -/* 13C7F0 802494B0 8C630280 */ lw $v1, 0x280($v1) +/* 13C7EC 802494AC 3C038027 */ lui $v1, %hi(gBadgeMenuCurrentPage) +/* 13C7F0 802494B0 8C630280 */ lw $v1, %lo(gBadgeMenuCurrentPage)($v1) /* 13C7F4 802494B4 00031040 */ sll $v0, $v1, 1 /* 13C7F8 802494B8 00431021 */ addu $v0, $v0, $v1 /* 13C7FC 802494BC 00021080 */ sll $v0, $v0, 2 @@ -303,9 +303,9 @@ glabel pause_badges_handle_input .L802494F0: /* 13C830 802494F0 8E020000 */ lw $v0, ($s0) /* 13C834 802494F4 00021040 */ sll $v0, $v0, 1 -/* 13C838 802494F8 3C018027 */ lui $at, 0x8027 +/* 13C838 802494F8 3C018027 */ lui $at, %hi(gBadgeMenuItemIDs) /* 13C83C 802494FC 00220821 */ addu $at, $at, $v0 -/* 13C840 80249500 84220180 */ lh $v0, 0x180($at) +/* 13C840 80249500 84220180 */ lh $v0, %lo(gBadgeMenuItemIDs)($at) /* 13C844 80249504 3C018027 */ lui $at, 0x8027 /* 13C848 80249508 AC220380 */ sw $v0, 0x380($at) .L8024950C: diff --git a/asm/nonmatchings/code_135EE0/pause_badges_init.s b/asm/nonmatchings/code_135EE0/pause_badges_init.s index 8c64abe0f8..6fab790ae7 100644 --- a/asm/nonmatchings/code_135EE0/pause_badges_init.s +++ b/asm/nonmatchings/code_135EE0/pause_badges_init.s @@ -18,8 +18,8 @@ glabel pause_badges_init /* 13C334 80248FF4 AC2003A0 */ sw $zero, 0x3a0($at) /* 13C338 80248FF8 0C092363 */ jal pause_badges_load_badges /* 13C33C 80248FFC 0000202D */ daddu $a0, $zero, $zero -/* 13C340 80249000 3C038027 */ lui $v1, 0x8027 -/* 13C344 80249004 84630180 */ lh $v1, 0x180($v1) +/* 13C340 80249000 3C038027 */ lui $v1, %hi(gBadgeMenuItemIDs) +/* 13C344 80249004 84630180 */ lh $v1, %lo(gBadgeMenuItemIDs)($v1) /* 13C348 80249008 24027FFE */ addiu $v0, $zero, 0x7ffe /* 13C34C 8024900C 14620003 */ bne $v1, $v0, .L8024901C /* 13C350 80249010 0000802D */ daddu $s0, $zero, $zero diff --git a/asm/nonmatchings/code_135EE0/pause_badges_load_badges.s b/asm/nonmatchings/code_135EE0/pause_badges_load_badges.s index b4b5c071d1..c01fb56fa6 100644 --- a/asm/nonmatchings/code_135EE0/pause_badges_load_badges.s +++ b/asm/nonmatchings/code_135EE0/pause_badges_load_badges.s @@ -14,8 +14,8 @@ glabel pause_badges_load_badges /* 13C0F0 80248DB0 0000802D */ daddu $s0, $zero, $zero /* 13C0F4 80248DB4 0200202D */ daddu $a0, $s0, $zero /* 13C0F8 80248DB8 0220302D */ daddu $a2, $s1, $zero -/* 13C0FC 80248DBC 3C058027 */ lui $a1, 0x8027 -/* 13C100 80248DC0 24A50180 */ addiu $a1, $a1, 0x180 +/* 13C0FC 80248DBC 3C058027 */ lui $a1, %hi(gBadgeMenuItemIDs) +/* 13C100 80248DC0 24A50180 */ addiu $a1, $a1, %lo(gBadgeMenuItemIDs) .L80248DC4: /* 13C104 80248DC4 84C200B4 */ lh $v0, 0xb4($a2) /* 13C108 80248DC8 94C300B4 */ lhu $v1, 0xb4($a2) @@ -38,8 +38,8 @@ glabel pause_badges_load_badges /* 13C144 80248E04 00000000 */ nop /* 13C148 80248E08 26260208 */ addiu $a2, $s1, 0x208 /* 13C14C 80248E0C 0000202D */ daddu $a0, $zero, $zero -/* 13C150 80248E10 3C058027 */ lui $a1, 0x8027 -/* 13C154 80248E14 24A50180 */ addiu $a1, $a1, 0x180 +/* 13C150 80248E10 3C058027 */ lui $a1, %hi(gBadgeMenuItemIDs) +/* 13C154 80248E14 24A50180 */ addiu $a1, $a1, %lo(gBadgeMenuItemIDs) .L80248E18: /* 13C158 80248E18 84C20000 */ lh $v0, ($a2) /* 13C15C 80248E1C 94C30000 */ lhu $v1, ($a2) @@ -55,8 +55,8 @@ glabel pause_badges_load_badges .L80248E40: /* 13C180 80248E40 16000004 */ bnez $s0, .L80248E54 /* 13C184 80248E44 24027FFE */ addiu $v0, $zero, 0x7ffe -/* 13C188 80248E48 3C018027 */ lui $at, 0x8027 -/* 13C18C 80248E4C A4220180 */ sh $v0, 0x180($at) +/* 13C188 80248E48 3C018027 */ lui $at, %hi(gBadgeMenuItemIDs) +/* 13C18C 80248E4C A4220180 */ sh $v0, %lo(gBadgeMenuItemIDs)($at) /* 13C190 80248E50 24100001 */ addiu $s0, $zero, 1 .L80248E54: /* 13C194 80248E54 3C018027 */ lui $at, 0x8027 @@ -65,8 +65,8 @@ glabel pause_badges_load_badges /* 13C1A0 80248E60 28820080 */ slti $v0, $a0, 0x80 /* 13C1A4 80248E64 1040000A */ beqz $v0, .L80248E90 /* 13C1A8 80248E68 24057FFF */ addiu $a1, $zero, 0x7fff -/* 13C1AC 80248E6C 3C038027 */ lui $v1, 0x8027 -/* 13C1B0 80248E70 24630180 */ addiu $v1, $v1, 0x180 +/* 13C1AC 80248E6C 3C038027 */ lui $v1, %hi(gBadgeMenuItemIDs) +/* 13C1B0 80248E70 24630180 */ addiu $v1, $v1, %lo(gBadgeMenuItemIDs) /* 13C1B4 80248E74 00041040 */ sll $v0, $a0, 1 /* 13C1B8 80248E78 00431821 */ addu $v1, $v0, $v1 .L80248E7C: @@ -93,8 +93,8 @@ glabel pause_badges_load_badges /* 13C208 80248EC8 AC20037C */ sw $zero, 0x37c($at) /* 13C20C 80248ECC 3C018027 */ lui $at, 0x8027 /* 13C210 80248ED0 AC200394 */ sw $zero, 0x394($at) -/* 13C214 80248ED4 3C018027 */ lui $at, 0x8027 -/* 13C218 80248ED8 AC200280 */ sw $zero, 0x280($at) +/* 13C214 80248ED4 3C018027 */ lui $at, %hi(gBadgeMenuCurrentPage) +/* 13C218 80248ED8 AC200280 */ sw $zero, %lo(gBadgeMenuCurrentPage)($at) .L80248EDC: /* 13C21C 80248EDC 84E20000 */ lh $v0, ($a3) /* 13C220 80248EE0 04420001 */ bltzl $v0, .L80248EE8 diff --git a/asm/nonmatchings/code_135EE0/pause_badges_update.s b/asm/nonmatchings/code_135EE0/pause_badges_update.s index 77faa596ef..13f8001375 100644 --- a/asm/nonmatchings/code_135EE0/pause_badges_update.s +++ b/asm/nonmatchings/code_135EE0/pause_badges_update.s @@ -3,8 +3,8 @@ glabel pause_badges_update /* 13C95C 8024961C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 13C960 80249620 3C038027 */ lui $v1, 0x8027 -/* 13C964 80249624 8C630280 */ lw $v1, 0x280($v1) +/* 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) @@ -69,8 +69,8 @@ glabel pause_badges_update /* 13CA40 80249700 3C058027 */ lui $a1, 0x8027 /* 13CA44 80249704 8CA50394 */ lw $a1, 0x394($a1) /* 13CA48 80249708 00A20018 */ mult $a1, $v0 -/* 13CA4C 8024970C 3C048027 */ lui $a0, 0x8027 -/* 13CA50 80249710 8C840280 */ lw $a0, 0x280($a0) +/* 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 diff --git a/asm/nonmatchings/code_135EE0/pause_stats_cleanup.s b/asm/nonmatchings/code_135EE0/pause_stats_cleanup.s index 9f386fe612..8866b2d763 100644 --- a/asm/nonmatchings/code_135EE0/pause_stats_cleanup.s +++ b/asm/nonmatchings/code_135EE0/pause_stats_cleanup.s @@ -6,8 +6,8 @@ glabel pause_stats_cleanup /* 13A2D8 80246F98 AFB10014 */ sw $s1, 0x14($sp) /* 13A2DC 80246F9C 0000882D */ daddu $s1, $zero, $zero /* 13A2E0 80246FA0 AFB00010 */ sw $s0, 0x10($sp) -/* 13A2E4 80246FA4 3C108027 */ lui $s0, 0x8027 -/* 13A2E8 80246FA8 26100150 */ addiu $s0, $s0, 0x150 +/* 13A2E4 80246FA4 3C108027 */ lui $s0, %hi(gStatsMenuIconIDs) +/* 13A2E8 80246FA8 26100150 */ addiu $s0, $s0, %lo(gStatsMenuIconIDs) /* 13A2EC 80246FAC AFBF0018 */ sw $ra, 0x18($sp) .L80246FB0: /* 13A2F0 80246FB0 8E040000 */ lw $a0, ($s0) diff --git a/asm/nonmatchings/code_135EE0/pause_stats_draw_contents.s b/asm/nonmatchings/code_135EE0/pause_stats_draw_contents.s index 27f6124019..c4a93901c7 100644 --- a/asm/nonmatchings/code_135EE0/pause_stats_draw_contents.s +++ b/asm/nonmatchings/code_135EE0/pause_stats_draw_contents.s @@ -9,8 +9,8 @@ glabel pause_stats_draw_contents /* 138CD0 80245990 24A8008F */ addiu $t0, $a1, 0x8f /* 138CD4 80245994 0100282D */ daddu $a1, $t0, $zero /* 138CD8 80245998 AFB1005C */ sw $s1, 0x5c($sp) -/* 138CDC 8024599C 3C118027 */ lui $s1, 0x8027 -/* 138CE0 802459A0 26310150 */ addiu $s1, $s1, 0x150 +/* 138CDC 8024599C 3C118027 */ lui $s1, %hi(gStatsMenuIconIDs) +/* 138CE0 802459A0 26310150 */ addiu $s1, $s1, %lo(gStatsMenuIconIDs) /* 138CE4 802459A4 AFBF007C */ sw $ra, 0x7c($sp) /* 138CE8 802459A8 AFB70074 */ sw $s7, 0x74($sp) /* 138CEC 802459AC AFB60070 */ sw $s6, 0x70($sp) @@ -468,8 +468,8 @@ glabel pause_stats_draw_contents /* 1393F0 802460B0 AFA20048 */ sw $v0, 0x48($sp) /* 1393F4 802460B4 0C03D4B8 */ jal draw_box /* 1393F8 802460B8 AFA0004C */ sw $zero, 0x4c($sp) -/* 1393FC 802460BC 3C168027 */ lui $s6, 0x8027 -/* 139400 802460C0 26D60150 */ addiu $s6, $s6, 0x150 +/* 1393FC 802460BC 3C168027 */ lui $s6, %hi(gStatsMenuIconIDs) +/* 139400 802460C0 26D60150 */ addiu $s6, $s6, %lo(gStatsMenuIconIDs) /* 139404 802460C4 27C60015 */ addiu $a2, $fp, 0x15 /* 139408 802460C8 8FA80084 */ lw $t0, 0x84($sp) /* 13940C 802460CC 8EC40000 */ lw $a0, ($s6) diff --git a/asm/nonmatchings/code_135EE0/pause_stats_init.s b/asm/nonmatchings/code_135EE0/pause_stats_init.s index 28150a4fd6..c8727f798c 100644 --- a/asm/nonmatchings/code_135EE0/pause_stats_init.s +++ b/asm/nonmatchings/code_135EE0/pause_stats_init.s @@ -8,8 +8,8 @@ glabel pause_stats_init /* 139E14 80246AD4 AFB00010 */ sw $s0, 0x10($sp) /* 139E18 80246AD8 0000802D */ daddu $s0, $zero, $zero /* 139E1C 80246ADC AFB20018 */ sw $s2, 0x18($sp) -/* 139E20 80246AE0 3C128027 */ lui $s2, 0x8027 -/* 139E24 80246AE4 26520150 */ addiu $s2, $s2, 0x150 +/* 139E20 80246AE0 3C128027 */ lui $s2, %hi(gStatsMenuIconIDs) +/* 139E24 80246AE4 26520150 */ addiu $s2, $s2, %lo(gStatsMenuIconIDs) /* 139E28 80246AE8 AFB10014 */ sw $s1, 0x14($sp) /* 139E2C 80246AEC 3C118025 */ lui $s1, 0x8025 /* 139E30 80246AF0 2631F330 */ addiu $s1, $s1, -0xcd0 diff --git a/include/common_structs.h b/include/common_structs.h index ca148061b6..11157ccca3 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -1536,7 +1536,7 @@ typedef struct { typedef struct { /* 0x00 */ s8 enabled; /* 0x01 */ s8 listStart; - /* 0x02 */ s8 numCols; + /* 0x02 */ u8 numCols; /* 0x03 */ s8 numRows; /* 0x04 */ s32 startIndex; /* 0x08 */ s32 count; diff --git a/include/variables.h b/include/variables.h index 02959ac219..55782e59b6 100644 --- a/include/variables.h +++ b/include/variables.h @@ -128,6 +128,12 @@ extern s32 gPauseMenuCursorTargetOpacity; extern PauseItemPage gBadgeMenuPages[20]; extern s32 gBadgeMenuCurrentScrollPos; extern s32 gBadgeMenuTargetScrollPos; +extern ItemId gBadgeMenuItemIDs[128]; +extern s32 gBadgeMenuCurrentPage; + +// Stats +extern s32 gStatsMenuIconIDs[12]; + extern s32 gGameState; extern s32 D_8009A650[1]; diff --git a/src/code_135EE0.c b/src/code_135EE0.c index 91b568609f..2d5a70d30a 100644 --- a/src/code_135EE0.c +++ b/src/code_135EE0.c @@ -103,7 +103,9 @@ INCLUDE_ASM(s32, "code_135EE0", pause_badges_get_pos_x); INCLUDE_ASM(s32, "code_135EE0", pause_badges_get_pos_y); -INCLUDE_ASM(s32, "code_135EE0", pause_badges_get_column); +s32 pause_badges_get_column(s32 page, s32 itemIdx) { + return itemIdx % gBadgeMenuPages[page].numCols; +} INCLUDE_ASM(s32, "code_135EE0", pause_badges_get_row); diff --git a/undefined_syms.txt b/undefined_syms.txt index 50bcdba354..89b1d53c75 100644 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -148,6 +148,9 @@ gBackgroundImage = 0x80200000; gPauseMenuCursorTargetOpacity = 0x8024EFB0; +gStatsMenuIconIDs = 0x80270150; +gBadgeMenuItemIDs = 0x80270180; +gBadgeMenuCurrentPage = 0x80270280; gBadgeMenuPages = 0x80270288; gBadgeMenuCurrentScrollPos = 0x8027038C; gBadgeMenuTargetScrollPos = 0x80270390;