buffer vars

MegaMech · Sep 23, 2024 · a87c898 · a87c898
1 parent 43b7e41
commit a87c898
Show file tree

Hide file tree

Showing 16 changed files with 242 additions and 242 deletions.
diff --git a/asm/non_matchings/code_80091750/add_8018D9E0_entry.s b/asm/non_matchings/code_80091750/add_8018D9E0_entry.s
@@ -89,11 +89,11 @@ glabel add_ui_element
 /* 09F254 8009E654 AFBF001C */  sw    $ra, 0x1c($sp)
 /* 09F258 8009E658 AFA7008C */  sw    $a3, 0x8c($sp)
 /* 09F25C 8009E65C 00077600 */  sll   $t6, $a3, 0x18
-/* 09F260 8009E660 3C1F8019 */  lui   $ra, %hi(D_8018D9E0) # $ra, 0x8019
+/* 09F260 8009E660 3C1F8019 */  lui   $ra, %hi(gMenuItems) # $ra, 0x8019
 /* 09F264 8009E664 000E3E03 */  sra   $a3, $t6, 0x18
 /* 09F268 8009E668 AFA40080 */  sw    $a0, 0x80($sp)
 /* 09F26C 8009E66C 00001025 */  move  $v0, $zero
-/* 09F270 8009E670 27FFD9E0 */  addiu $ra, %lo(D_8018D9E0) # addiu $ra, $ra, -0x2620
+/* 09F270 8009E670 27FFD9E0 */  addiu $ra, %lo(gMenuItems) # addiu $ra, $ra, -0x2620
 .L8009E674:
 /* 09F274 8009E674 8FF80000 */  lw    $t8, ($ra)
 /* 09F278 8009E678 24420001 */  addiu $v0, $v0, 1
@@ -246,16 +246,16 @@ glabel L8009E888
 /* 09F4A0 8009E8A0 0C026E55 */  jal   func_8009B954
 /* 09F4A4 8009E8A4 248414C8 */   addiu $a0, %lo(D_020014C8) # addiu $a0, $a0, 0x14c8
 /* 09F4A8 8009E8A8 8FBF007C */  lw    $ra, 0x7c($sp)
-/* 09F4AC 8009E8AC 3C088019 */  lui   $t0, %hi(D_8018E75C) # $t0, 0x8019
-/* 09F4B0 8009E8B0 2508E75C */  addiu $t0, %lo(D_8018E75C) # addiu $t0, $t0, -0x18a4
+/* 09F4AC 8009E8AC 3C088019 */  lui   $t0, %hi(sGfxPtr) # $t0, 0x8019
+/* 09F4B0 8009E8B0 2508E75C */  addiu $t0, %lo(sGfxPtr) # addiu $t0, $t0, -0x18a4
 /* 09F4B4 8009E8B4 3C050200 */  lui   $a1, %hi(D_020014C8) # $a1, 0x200
 /* 09F4B8 8009E8B8 8FE6000C */  lw    $a2, 0xc($ra)
 /* 09F4BC 8009E8BC 8FE70010 */  lw    $a3, 0x10($ra)
 /* 09F4C0 8009E8C0 24A514C8 */  addiu $a1, %lo(D_020014C8) # addiu $a1, $a1, 0x14c8
 /* 09F4C4 8009E8C4 0C026E9D */  jal   func_8009BA74
 /* 09F4C8 8009E8C8 8D040000 */   lw    $a0, ($t0)
-/* 09F4CC 8009E8CC 3C088019 */  lui   $t0, %hi(D_8018E75C) # $t0, 0x8019
-/* 09F4D0 8009E8D0 2508E75C */  addiu $t0, %lo(D_8018E75C) # addiu $t0, $t0, -0x18a4
+/* 09F4CC 8009E8CC 3C088019 */  lui   $t0, %hi(sGfxPtr) # $t0, 0x8019
+/* 09F4D0 8009E8D0 2508E75C */  addiu $t0, %lo(sGfxPtr) # addiu $t0, $t0, -0x18a4
 /* 09F4D4 8009E8D4 0C026E66 */  jal   func_8009B998
 /* 09F4D8 8009E8D8 AD020000 */   sw    $v0, ($t0)
 /* 09F4DC 8009E8DC 1000033D */  b     .L8009F5D4
@@ -270,16 +270,16 @@ glabel L8009E8E4
 /* 09F4FC 8009E8FC 0C026E55 */  jal   func_8009B954
 /* 09F500 8009E900 24841540 */   addiu $a0, %lo(D_02001540) # addiu $a0, $a0, 0x1540
 /* 09F504 8009E904 8FBF007C */  lw    $ra, 0x7c($sp)
-/* 09F508 8009E908 3C088019 */  lui   $t0, %hi(D_8018E75C) # $t0, 0x8019
-/* 09F50C 8009E90C 2508E75C */  addiu $t0, %lo(D_8018E75C) # addiu $t0, $t0, -0x18a4
+/* 09F508 8009E908 3C088019 */  lui   $t0, %hi(sGfxPtr) # $t0, 0x8019
+/* 09F50C 8009E90C 2508E75C */  addiu $t0, %lo(sGfxPtr) # addiu $t0, $t0, -0x18a4
 /* 09F510 8009E910 3C050200 */  lui   $a1, %hi(D_02001540) # $a1, 0x200
 /* 09F514 8009E914 8FE6000C */  lw    $a2, 0xc($ra)
 /* 09F518 8009E918 8FE70010 */  lw    $a3, 0x10($ra)
 /* 09F51C 8009E91C 24A51540 */  addiu $a1, %lo(D_02001540) # addiu $a1, $a1, 0x1540
 /* 09F520 8009E920 0C026E9D */  jal   func_8009BA74
 /* 09F524 8009E924 8D040000 */   lw    $a0, ($t0)
-/* 09F528 8009E928 3C088019 */  lui   $t0, %hi(D_8018E75C) # $t0, 0x8019
-/* 09F52C 8009E92C 2508E75C */  addiu $t0, %lo(D_8018E75C) # addiu $t0, $t0, -0x18a4
+/* 09F528 8009E928 3C088019 */  lui   $t0, %hi(sGfxPtr) # $t0, 0x8019
+/* 09F52C 8009E92C 2508E75C */  addiu $t0, %lo(sGfxPtr) # addiu $t0, $t0, -0x18a4
 /* 09F530 8009E930 0C026E66 */  jal   func_8009B998
 /* 09F534 8009E934 AD020000 */   sw    $v0, ($t0)
 /* 09F538 8009E938 10000326 */  b     .L8009F5D4
@@ -322,16 +322,16 @@ glabel L8009E9AC
 /* 09F5C0 8009E9C0 0C026E55 */  jal   func_8009B954
 /* 09F5C4 8009E9C4 248415A4 */   addiu $a0, %lo(D_020015A4) # addiu $a0, $a0, 0x15a4
 /* 09F5C8 8009E9C8 8FBF007C */  lw    $ra, 0x7c($sp)
-/* 09F5CC 8009E9CC 3C088019 */  lui   $t0, %hi(D_8018E75C) # $t0, 0x8019
-/* 09F5D0 8009E9D0 2508E75C */  addiu $t0, %lo(D_8018E75C) # addiu $t0, $t0, -0x18a4
+/* 09F5CC 8009E9CC 3C088019 */  lui   $t0, %hi(sGfxPtr) # $t0, 0x8019
+/* 09F5D0 8009E9D0 2508E75C */  addiu $t0, %lo(sGfxPtr) # addiu $t0, $t0, -0x18a4
 /* 09F5D4 8009E9D4 3C050200 */  lui   $a1, %hi(D_020015A4) # $a1, 0x200
 /* 09F5D8 8009E9D8 8FE6000C */  lw    $a2, 0xc($ra)
 /* 09F5DC 8009E9DC 8FE70010 */  lw    $a3, 0x10($ra)
 /* 09F5E0 8009E9E0 24A515A4 */  addiu $a1, %lo(D_020015A4) # addiu $a1, $a1, 0x15a4
 /* 09F5E4 8009E9E4 0C026E9D */  jal   func_8009BA74
 /* 09F5E8 8009E9E8 8D040000 */   lw    $a0, ($t0)
-/* 09F5EC 8009E9EC 3C088019 */  lui   $t0, %hi(D_8018E75C) # $t0, 0x8019
-/* 09F5F0 8009E9F0 2508E75C */  addiu $t0, %lo(D_8018E75C) # addiu $t0, $t0, -0x18a4
+/* 09F5EC 8009E9EC 3C088019 */  lui   $t0, %hi(sGfxPtr) # $t0, 0x8019
+/* 09F5F0 8009E9F0 2508E75C */  addiu $t0, %lo(sGfxPtr) # addiu $t0, $t0, -0x18a4
 /* 09F5F4 8009E9F4 AD020000 */  sw    $v0, ($t0)
 /* 09F5F8 8009E9F8 244F0008 */  addiu $t7, $v0, 8
 /* 09F5FC 8009E9FC AD0F0000 */  sw    $t7, ($t0)
@@ -343,8 +343,8 @@ glabel L8009E9AC
 /* 09F614 8009EA14 AFA2006C */   sw    $v0, 0x6c($sp)
 /* 09F618 8009EA18 8FB9006C */  lw    $t9, 0x6c($sp)
 /* 09F61C 8009EA1C 8FBF007C */  lw    $ra, 0x7c($sp)
-/* 09F620 8009EA20 3C088019 */  lui   $t0, %hi(D_8018E75C) # $t0, 0x8019
-/* 09F624 8009EA24 2508E75C */  addiu $t0, %lo(D_8018E75C) # addiu $t0, $t0, -0x18a4
+/* 09F620 8009EA20 3C088019 */  lui   $t0, %hi(sGfxPtr) # $t0, 0x8019
+/* 09F624 8009EA24 2508E75C */  addiu $t0, %lo(sGfxPtr) # addiu $t0, $t0, -0x18a4
 /* 09F628 8009EA28 AF220004 */  sw    $v0, 4($t9)
 /* 09F62C 8009EA2C 8D030000 */  lw    $v1, ($t0)
 /* 09F630 8009EA30 3C180708 */  lui   $t8, (0x07080200 >> 16) # lui $t8, 0x708
@@ -425,16 +425,16 @@ glabel L8009E9AC
 /* 09F75C 8009EB5C 0C026E55 */  jal   func_8009B954
 /* 09F760 8009EB60 248415CC */   addiu $a0, %lo(D_020015CC) # addiu $a0, $a0, 0x15cc
 /* 09F764 8009EB64 8FBF007C */  lw    $ra, 0x7c($sp)
-/* 09F768 8009EB68 3C088019 */  lui   $t0, %hi(D_8018E75C) # $t0, 0x8019
-/* 09F76C 8009EB6C 2508E75C */  addiu $t0, %lo(D_8018E75C) # addiu $t0, $t0, -0x18a4
+/* 09F768 8009EB68 3C088019 */  lui   $t0, %hi(sGfxPtr) # $t0, 0x8019
+/* 09F76C 8009EB6C 2508E75C */  addiu $t0, %lo(sGfxPtr) # addiu $t0, $t0, -0x18a4
 /* 09F770 8009EB70 3C050200 */  lui   $a1, %hi(D_020015CC) # $a1, 0x200
 /* 09F774 8009EB74 8FE6000C */  lw    $a2, 0xc($ra)
 /* 09F778 8009EB78 8FE70010 */  lw    $a3, 0x10($ra)
 /* 09F77C 8009EB7C 24A515CC */  addiu $a1, %lo(D_020015CC) # addiu $a1, $a1, 0x15cc
 /* 09F780 8009EB80 0C026E9D */  jal   func_8009BA74
 /* 09F784 8009EB84 8D040000 */   lw    $a0, ($t0)
-/* 09F788 8009EB88 3C088019 */  lui   $t0, %hi(D_8018E75C) # $t0, 0x8019
-/* 09F78C 8009EB8C 2508E75C */  addiu $t0, %lo(D_8018E75C) # addiu $t0, $t0, -0x18a4
+/* 09F788 8009EB88 3C088019 */  lui   $t0, %hi(sGfxPtr) # $t0, 0x8019
+/* 09F78C 8009EB8C 2508E75C */  addiu $t0, %lo(sGfxPtr) # addiu $t0, $t0, -0x18a4
 /* 09F790 8009EB90 0C026E66 */  jal   func_8009B998
 /* 09F794 8009EB94 AD020000 */   sw    $v0, ($t0)
 /* 09F798 8009EB98 3C040200 */  lui   $a0, %hi(D_02001630) # $a0, 0x200
@@ -444,16 +444,16 @@ glabel L8009E9AC
 /* 09F7A8 8009EBA8 0C026E55 */  jal   func_8009B954
 /* 09F7AC 8009EBAC 24841630 */   addiu $a0, %lo(D_02001630) # addiu $a0, $a0, 0x1630
 /* 09F7B0 8009EBB0 8FBF007C */  lw    $ra, 0x7c($sp)
-/* 09F7B4 8009EBB4 3C088019 */  lui   $t0, %hi(D_8018E75C) # $t0, 0x8019
-/* 09F7B8 8009EBB8 2508E75C */  addiu $t0, %lo(D_8018E75C) # addiu $t0, $t0, -0x18a4
+/* 09F7B4 8009EBB4 3C088019 */  lui   $t0, %hi(sGfxPtr) # $t0, 0x8019
+/* 09F7B8 8009EBB8 2508E75C */  addiu $t0, %lo(sGfxPtr) # addiu $t0, $t0, -0x18a4
 /* 09F7BC 8009EBBC 3C050200 */  lui   $a1, %hi(D_02001630) # $a1, 0x200
 /* 09F7C0 8009EBC0 8FE6000C */  lw    $a2, 0xc($ra)
 /* 09F7C4 8009EBC4 8FE70010 */  lw    $a3, 0x10($ra)
 /* 09F7C8 8009EBC8 24A51630 */  addiu $a1, %lo(D_02001630) # addiu $a1, $a1, 0x1630
 /* 09F7CC 8009EBCC 0C026E9D */  jal   func_8009BA74
 /* 09F7D0 8009EBD0 8D040000 */   lw    $a0, ($t0)
-/* 09F7D4 8009EBD4 3C088019 */  lui   $t0, %hi(D_8018E75C) # $t0, 0x8019
-/* 09F7D8 8009EBD8 2508E75C */  addiu $t0, %lo(D_8018E75C) # addiu $t0, $t0, -0x18a4
+/* 09F7D4 8009EBD4 3C088019 */  lui   $t0, %hi(sGfxPtr) # $t0, 0x8019
+/* 09F7D8 8009EBD8 2508E75C */  addiu $t0, %lo(sGfxPtr) # addiu $t0, $t0, -0x18a4
 /* 09F7DC 8009EBDC 0C026E66 */  jal   func_8009B998
 /* 09F7E0 8009EBE0 AD020000 */   sw    $v0, ($t0)
 /* 09F7E4 8009EBE4 3C040200 */  lui   $a0, %hi(D_02001658) # $a0, 0x200
@@ -463,16 +463,16 @@ glabel L8009E9AC
 /* 09F7F4 8009EBF4 0C026E55 */  jal   func_8009B954
 /* 09F7F8 8009EBF8 24841658 */   addiu $a0, %lo(D_02001658) # addiu $a0, $a0, 0x1658
 /* 09F7FC 8009EBFC 8FBF007C */  lw    $ra, 0x7c($sp)
-/* 09F800 8009EC00 3C088019 */  lui   $t0, %hi(D_8018E75C) # $t0, 0x8019
-/* 09F804 8009EC04 2508E75C */  addiu $t0, %lo(D_8018E75C) # addiu $t0, $t0, -0x18a4
+/* 09F800 8009EC00 3C088019 */  lui   $t0, %hi(sGfxPtr) # $t0, 0x8019
+/* 09F804 8009EC04 2508E75C */  addiu $t0, %lo(sGfxPtr) # addiu $t0, $t0, -0x18a4
 /* 09F808 8009EC08 3C050200 */  lui   $a1, %hi(D_02001658) # $a1, 0x200
 /* 09F80C 8009EC0C 8FE6000C */  lw    $a2, 0xc($ra)
 /* 09F810 8009EC10 8FE70010 */  lw    $a3, 0x10($ra)
 /* 09F814 8009EC14 24A51658 */  addiu $a1, %lo(D_02001658) # addiu $a1, $a1, 0x1658
 /* 09F818 8009EC18 0C026E9D */  jal   func_8009BA74
 /* 09F81C 8009EC1C 8D040000 */   lw    $a0, ($t0)
-/* 09F820 8009EC20 3C088019 */  lui   $t0, %hi(D_8018E75C) # $t0, 0x8019
-/* 09F824 8009EC24 2508E75C */  addiu $t0, %lo(D_8018E75C) # addiu $t0, $t0, -0x18a4
+/* 09F820 8009EC20 3C088019 */  lui   $t0, %hi(sGfxPtr) # $t0, 0x8019
+/* 09F824 8009EC24 2508E75C */  addiu $t0, %lo(sGfxPtr) # addiu $t0, $t0, -0x18a4
 /* 09F828 8009EC28 0C026E66 */  jal   func_8009B998
 /* 09F82C 8009EC2C AD020000 */   sw    $v0, ($t0)
 /* 09F830 8009EC30 10000268 */  b     .L8009F5D4

diff --git a/asm/non_matchings/code_80091750/func_80099184.s b/asm/non_matchings/code_80091750/func_80099184.s
@@ -13,16 +13,16 @@ glabel load_menu_img
 /* 099DB0 800991B0 00408825 */  move  $s1, $v0
 /* 099DB4 800991B4 24160003 */  li    $s6, 3
 /* 099DB8 800991B8 11C0006C */  beqz  $t6, .L8009936C
-/* 099DBC 800991BC 3C158019 */   lui   $s5, %hi(D_8018D9B0) # $s5, 0x8019
-/* 099DC0 800991C0 3C148019 */  lui   $s4, %hi(D_8018D9B4) # $s4, 0x8019
+/* 099DBC 800991BC 3C158019 */   lui   $s5, %hi(gMenuTextureBuffer) # $s5, 0x8019
+/* 099DC0 800991C0 3C148019 */  lui   $s4, %hi(gMenuCompressedBuffer) # $s4, 0x8019
 /* 099DC4 800991C4 3C138019 */  lui   $s3, %hi(gNumD_8018E118Entries) # $s3, 0x8019
 /* 099DC8 800991C8 3C128019 */  lui   $s2, %hi(gMenuTextureBufferIndex) # $s2, 0x8019
-/* 099DCC 800991CC 3C108019 */  lui   $s0, %hi(D_8018E118) # $s0, 0x8019
-/* 099DD0 800991D0 2610E118 */  addiu $s0, %lo(D_8018E118) # addiu $s0, $s0, -0x1ee8
+/* 099DCC 800991CC 3C108019 */  lui   $s0, %hi(sMenuTextureMap) # $s0, 0x8019
+/* 099DD0 800991D0 2610E118 */  addiu $s0, %lo(sMenuTextureMap) # addiu $s0, $s0, -0x1ee8
 /* 099DD4 800991D4 2652E110 */  addiu $s2, %lo(gMenuTextureBufferIndex) # addiu $s2, $s2, -0x1ef0
 /* 099DD8 800991D8 2673E758 */  addiu $s3, %lo(gNumD_8018E118Entries) # addiu $s3, $s3, -0x18a8
-/* 099DDC 800991DC 2694D9B4 */  addiu $s4, %lo(D_8018D9B4) # addiu $s4, $s4, -0x264c
-/* 099DE0 800991E0 26B5D9B0 */  addiu $s5, %lo(D_8018D9B0) # addiu $s5, $s5, -0x2650
+/* 099DDC 800991DC 2694D9B4 */  addiu $s4, %lo(gMenuCompressedBuffer) # addiu $s4, $s4, -0x264c
+/* 099DE0 800991E0 26B5D9B0 */  addiu $s5, %lo(gMenuTextureBuffer) # addiu $s5, $s5, -0x2650
 /* 099DE4 800991E4 8E630000 */  lw    $v1, ($s3)
 .L800991E8:
 /* 099DE8 800991E8 00002825 */  move  $a1, $zero

diff --git a/asm/non_matchings/code_80091750/func_80099394.s b/asm/non_matchings/code_80091750/func_80099394.s
@@ -10,14 +10,14 @@ glabel func_80099394
 /* 099FB4 800993B4 0C026449 */  jal   segmented_to_virtual_dupe
 /* 099FB8 800993B8 AFB00018 */   sw    $s0, 0x18($sp)
 /* 099FBC 800993BC 8C4E0004 */  lw    $t6, 4($v0)
-/* 099FC0 800993C0 3C168019 */  lui   $s6, %hi(D_8018D9B0) # $s6, 0x8019
+/* 099FC0 800993C0 3C168019 */  lui   $s6, %hi(gMenuTextureBuffer) # $s6, 0x8019
 /* 099FC4 800993C4 00409025 */  move  $s2, $v0
 /* 099FC8 800993C8 11C0004E */  beqz  $t6, .L80099504
-/* 099FCC 800993CC 26D6D9B0 */   addiu $s6, %lo(D_8018D9B0) # addiu $s6, $s6, -0x2650
+/* 099FCC 800993CC 26D6D9B0 */   addiu $s6, %lo(gMenuTextureBuffer) # addiu $s6, $s6, -0x2650
 /* 099FD0 800993D0 3C148019 */  lui   $s4, %hi(gNumD_8018E118Entries) # $s4, 0x8019
 /* 099FD4 800993D4 3C138019 */  lui   $s3, %hi(gMenuTextureBufferIndex) # $s3, 0x8019
-/* 099FD8 800993D8 3C118019 */  lui   $s1, %hi(D_8018E118) # $s1, 0x8019
-/* 099FDC 800993DC 2631E118 */  addiu $s1, %lo(D_8018E118) # addiu $s1, $s1, -0x1ee8
+/* 099FD8 800993D8 3C118019 */  lui   $s1, %hi(sMenuTextureMap) # $s1, 0x8019
+/* 099FDC 800993DC 2631E118 */  addiu $s1, %lo(sMenuTextureMap) # addiu $s1, $s1, -0x1ee8
 /* 099FE0 800993E0 2673E110 */  addiu $s3, %lo(gMenuTextureBufferIndex) # addiu $s3, $s3, -0x1ef0
 /* 099FE4 800993E4 2694E758 */  addiu $s4, %lo(gNumD_8018E118Entries) # addiu $s4, $s4, -0x18a8
 /* 099FE8 800993E8 24150005 */  li    $s5, 5

diff --git a/asm/non_matchings/code_80091750/func_8009952C.s b/asm/non_matchings/code_80091750/func_8009952C.s
@@ -9,18 +9,18 @@ glabel func_8009952C
 /* 09A148 80099548 0C026449 */  jal   segmented_to_virtual_dupe
 /* 09A14C 8009954C AFB00014 */   sw    $s0, 0x14($sp)
 /* 09A150 80099550 8C4E0004 */  lw    $t6, 4($v0)
-/* 09A154 80099554 3C158019 */  lui   $s5, %hi(D_8018D9B0) # $s5, 0x8019
+/* 09A154 80099554 3C158019 */  lui   $s5, %hi(gMenuTextureBuffer) # $s5, 0x8019
 /* 09A158 80099558 00408825 */  move  $s1, $v0
 /* 09A15C 8009955C 11C00046 */  beqz  $t6, .L80099678
-/* 09A160 80099560 26B5D9B0 */   addiu $s5, %lo(D_8018D9B0) # addiu $s5, $s5, -0x2650
-/* 09A164 80099564 3C148019 */  lui   $s4, %hi(D_8018D9B4) # $s4, 0x8019
+/* 09A160 80099560 26B5D9B0 */   addiu $s5, %lo(gMenuTextureBuffer) # addiu $s5, $s5, -0x2650
+/* 09A164 80099564 3C148019 */  lui   $s4, %hi(gMenuCompressedBuffer) # $s4, 0x8019
 /* 09A168 80099568 3C138019 */  lui   $s3, %hi(gNumD_8018E118Entries) # $s3, 0x8019
 /* 09A16C 8009956C 3C128019 */  lui   $s2, %hi(gMenuTextureBufferIndex) # $s2, 0x8019
-/* 09A170 80099570 3C108019 */  lui   $s0, %hi(D_8018E118) # $s0, 0x8019
-/* 09A174 80099574 2610E118 */  addiu $s0, %lo(D_8018E118) # addiu $s0, $s0, -0x1ee8
+/* 09A170 80099570 3C108019 */  lui   $s0, %hi(sMenuTextureMap) # $s0, 0x8019
+/* 09A174 80099574 2610E118 */  addiu $s0, %lo(sMenuTextureMap) # addiu $s0, $s0, -0x1ee8
 /* 09A178 80099578 2652E110 */  addiu $s2, %lo(gMenuTextureBufferIndex) # addiu $s2, $s2, -0x1ef0
 /* 09A17C 8009957C 2673E758 */  addiu $s3, %lo(gNumD_8018E118Entries) # addiu $s3, $s3, -0x18a8
-/* 09A180 80099580 2694D9B4 */  addiu $s4, %lo(D_8018D9B4) # addiu $s4, $s4, -0x264c
+/* 09A180 80099580 2694D9B4 */  addiu $s4, %lo(gMenuCompressedBuffer) # addiu $s4, $s4, -0x264c
 /* 09A184 80099584 8E630000 */  lw    $v1, ($s3)
 .L80099588:
 /* 09A188 80099588 00002825 */  move  $a1, $zero

diff --git a/asm/non_matchings/code_80091750/func_800996BC.s b/asm/non_matchings/code_80091750/func_800996BC.s
@@ -17,14 +17,14 @@ glabel load_menu_img2
 /* 09A2F8 800996F8 241E0002 */  li    $fp, 2
 /* 09A2FC 800996FC 11C0008A */  beqz  $t6, .L80099928
 /* 09A300 80099700 2417FFFF */   li    $s7, -1
-/* 09A304 80099704 3C158019 */  lui   $s5, %hi(D_8018D9B4) # $s5, 0x8019
+/* 09A304 80099704 3C158019 */  lui   $s5, %hi(gMenuCompressedBuffer) # $s5, 0x8019
 /* 09A308 80099708 3C148019 */  lui   $s4, %hi(gNumD_8018E118Entries) # $s4, 0x8019
 /* 09A30C 8009970C 3C138019 */  lui   $s3, %hi(gMenuTextureBufferIndex) # $s3, 0x8019
-/* 09A310 80099710 3C118019 */  lui   $s1, %hi(D_8018E118) # $s1, 0x8019
-/* 09A314 80099714 2631E118 */  addiu $s1, %lo(D_8018E118) # addiu $s1, $s1, -0x1ee8
+/* 09A310 80099710 3C118019 */  lui   $s1, %hi(sMenuTextureMap) # $s1, 0x8019
+/* 09A314 80099714 2631E118 */  addiu $s1, %lo(sMenuTextureMap) # addiu $s1, $s1, -0x1ee8
 /* 09A318 80099718 2673E110 */  addiu $s3, %lo(gMenuTextureBufferIndex) # addiu $s3, $s3, -0x1ef0
 /* 09A31C 8009971C 2694E758 */  addiu $s4, %lo(gNumD_8018E118Entries) # addiu $s4, $s4, -0x18a8
-/* 09A320 80099720 26B5D9B4 */  addiu $s5, %lo(D_8018D9B4) # addiu $s5, $s5, -0x264c
+/* 09A320 80099720 26B5D9B4 */  addiu $s5, %lo(gMenuCompressedBuffer) # addiu $s5, $s5, -0x264c
 /* 09A324 80099724 24160001 */  li    $s6, 1
 /* 09A328 80099728 8E830000 */  lw    $v1, ($s4)
 .L8009972C:
@@ -100,9 +100,9 @@ glabel load_menu_img2
 /* 09A418 80099818 8EA60000 */   lw    $a2, ($s5)
 .L8009981C:
 /* 09A41C 8009981C 1257000A */  beq   $s2, $s7, .L80099848
-/* 09A420 80099820 3C0D8019 */   lui   $t5, %hi(D_8018D9B0) # $t5, 0x8019
+/* 09A420 80099820 3C0D8019 */   lui   $t5, %hi(gMenuTextureBuffer) # $t5, 0x8019
 /* 09A424 80099824 12400011 */  beqz  $s2, .L8009986C
-/* 09A428 80099828 3C058019 */   lui   $a1, %hi(D_8018D9B8) # 0x8019
+/* 09A428 80099828 3C058019 */   lui   $a1, %hi(sTKMK00_LowResBuffer) # 0x8019
 /* 09A42C 8009982C 52560007 */  beql  $s2, $s6, .L8009984C
 /* 09A430 80099830 8E6B0000 */   lw    $t3, ($s3)
 /* 09A434 80099834 525E000E */  beql  $s2, $fp, .L80099870
@@ -113,7 +113,7 @@ glabel load_menu_img2
 .L80099848:
 /* 09A448 80099848 8E6B0000 */  lw    $t3, ($s3)
 .L8009984C:
-/* 09A44C 8009984C 8DADD9B0 */  lw    $t5, %lo(D_8018D9B0)($t5)
+/* 09A44C 8009984C 8DADD9B0 */  lw    $t5, %lo(gMenuTextureBuffer)($t5)
 /* 09A450 80099850 8EA40000 */  lw    $a0, ($s5)
 /* 09A454 80099854 000B6040 */  sll   $t4, $t3, 1
 /* 09A458 80099858 0C010034 */  jal   mio0decode
@@ -125,17 +125,17 @@ glabel load_menu_img2
 /* 09A46C 8009986C 860E0000 */  lh    $t6, ($s0)
 .L80099870:
 /* 09A470 80099870 24020001 */  li    $v0, 1
-/* 09A474 80099874 3C198019 */  lui   $t9, %hi(D_8018D9B0) # $t9, 0x8019
+/* 09A474 80099874 3C198019 */  lui   $t9, %hi(gMenuTextureBuffer) # $t9, 0x8019
 /* 09A478 80099878 16CE0003 */  bne   $s6, $t6, .L80099888
 /* 09A47C 8009987C 00000000 */   nop   
 /* 09A480 80099880 10000001 */  b     .L80099888
 /* 09A484 80099884 240200BE */   li    $v0, 190
 .L80099888:
 /* 09A488 80099888 8E6F0000 */  lw    $t7, ($s3)
-/* 09A48C 8009988C 8F39D9B0 */  lw    $t9, %lo(D_8018D9B0)($t9)
+/* 09A48C 8009988C 8F39D9B0 */  lw    $t9, %lo(gMenuTextureBuffer)($t9)
 /* 09A490 80099890 8EA40000 */  lw    $a0, ($s5)
 /* 09A494 80099894 000FC040 */  sll   $t8, $t7, 1
-/* 09A498 80099898 8CA5D9B8 */  lw    $a1, %lo(D_8018D9B8)($a1) # -0x2648($a1)
+/* 09A498 80099898 8CA5D9B8 */  lw    $a1, %lo(sTKMK00_LowResBuffer)($a1) # -0x2648($a1)
 /* 09A49C 8009989C 00403825 */  move  $a3, $v0
 /* 09A4A0 800998A0 0C010174 */  jal   tkmk00decode
 /* 09A4A4 800998A4 03193021 */   addu  $a2, $t8, $t9