From 38f3e12f66e1fc2e6d3051007ed4c9d941fcd7a4 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Thu, 12 Nov 2020 13:38:17 -0500 Subject: [PATCH] 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;