Rename globals

9 files changed, 208 insertions, 208 deletions

diff --git a/arm9/data/bss_2.s b/arm9/data/bss_2.s
index 3832b009..1a39bbf1 100644
--- a/arm9/data/bss_2.s
+++ b/arm9/data/bss_2.s
@@ -932,12 +932,12 @@ UNK_021D2DF0: ; 0x021D2DF0
 UNK_021D2DFC: ; 0x021D2DFC
 	.space 0x5c0
 
-	.global UNK_021D33BC
-UNK_021D33BC: ; 0x021D33BC
+	.global GXi_VRamLockId
+GXi_VRamLockId: ; 0x021D33BC
 	.space 0x4
 
-	.global UNK_021D33C0
-UNK_021D33C0: ; 0x021D33C0
+	.global sDispMode
+sDispMode: ; 0x021D33C0
 	.space 0x4
 
 	.global gGXState
@@ -992,64 +992,64 @@ UNK_021D33DA: ; 0x021D33DA
 UNK_021D33DC: ; 0x021D33DC
 	.space 0x4
 
-	.global UNK_021D33E0
-UNK_021D33E0: ; 0x021D33E0
+	.global sSubBGExtPltt
+sSubBGExtPltt: ; 0x021D33E0
 	.space 0x4
 
-	.global UNK_021D33E4
-UNK_021D33E4: ; 0x021D33E4
+	.global sOBJExtPlttLCDCBlk
+sOBJExtPlttLCDCBlk: ; 0x021D33E4
 	.space 0x4
 
-	.global UNK_021D33E8
-UNK_021D33E8: ; 0x021D33E8
+	.global sOBJExtPltt
+sOBJExtPltt: ; 0x021D33E8
 	.space 0x4
 
-	.global UNK_021D33EC
-UNK_021D33EC: ; 0x021D33EC
+	.global sBGExtPlttLCDCOffset
+sBGExtPlttLCDCOffset: ; 0x021D33EC
 	.space 0x4
 
-	.global UNK_021D33F0
-UNK_021D33F0: ; 0x021D33F0
+	.global sBGExtPlttLCDCBlk
+sBGExtPlttLCDCBlk: ; 0x021D33F0
 	.space 0x4
 
-	.global UNK_021D33F4
-UNK_021D33F4: ; 0x021D33F4
+	.global sBGExtPltt
+sBGExtPltt: ; 0x021D33F4
 	.space 0x4
 
-	.global UNK_021D33F8
-UNK_021D33F8: ; 0x021D33F8
+	.global sSubOBJExtPltt
+sSubOBJExtPltt: ; 0x021D33F8
 	.space 0x4
 
-	.global UNK_021D33FC
-UNK_021D33FC: ; 0x021D33FC
+	.global sClrImg
+sClrImg: ; 0x021D33FC
 	.space 0x4
 
-	.global UNK_021D3400
-UNK_021D3400: ; 0x021D3400
+	.global sTexLCDCBlk1
+sTexLCDCBlk1: ; 0x021D3400
 	.space 0x4
 
-	.global UNK_021D3404
-UNK_021D3404: ; 0x021D3404
+	.global sTexPlttLCDCBlk
+sTexPlttLCDCBlk: ; 0x021D3404
 	.space 0x4
 
-	.global UNK_021D3408
-UNK_021D3408: ; 0x021D3408
+	.global sTexPltt
+sTexPltt: ; 0x021D3408
 	.space 0x4
 
-	.global UNK_021D340C
-UNK_021D340C: ; 0x021D340C
+	.global sClrImgLCDCBlk
+sClrImgLCDCBlk: ; 0x021D340C
 	.space 0x4
 
-	.global UNK_021D3410
-UNK_021D3410: ; 0x021D3410
+	.global sTex
+sTex: ; 0x021D3410
 	.space 0x4
 
-	.global UNK_021D3414
-UNK_021D3414: ; 0x021D3414
+	.global sTexLCDCBlk2
+sTexLCDCBlk2: ; 0x021D3414
 	.space 0x4
 
-	.global UNK_021D3418
-UNK_021D3418: ; 0x021D3418
+	.global sSzTexBlk1
+sSzTexBlk1: ; 0x021D3418
 	.space 0x4
 
 	.global OSi_IrqCallbackInfo
diff --git a/arm9/data/rom2_2.s b/arm9/data/rom2_2.s
index 396d68dc..67a4d325 100644
--- a/arm9/data/rom2_2.s
+++ b/arm9/data/rom2_2.s
@@ -5075,20 +5075,20 @@ UNK_02103001: ; 0x02103001
 FX_AtanTable_: ; 0x02103A38
 	.incbin "baserom.nds", 0x107a38, 0x104
 
-	.global UNK_02103B3C
-UNK_02103B3C: ; 0x02103B3C
+	.global sTexPlttStartAddrTable
+sTexPlttStartAddrTable: ; 0x02103B3C
 	.incbin "baserom.nds", 0x107b3c, 0x10
 
-	.global UNK_02103B4C
-UNK_02103B4C: ; 0x02103B4C
+	.global sTexStartAddrTable
+sTexStartAddrTable: ; 0x02103B4C
 	.incbin "baserom.nds", 0x107b4c, 0x2
 
-	.global UNK_02103B4E
-UNK_02103B4E: ; 0x02103B4E
+	.global sTexStartAddrTable
+sTexStartAddrTable: ; 0x02103B4E
 	.incbin "baserom.nds", 0x107b4e, 0x2
 
-	.global UNK_02103B50
-UNK_02103B50: ; 0x02103B50
+	.global sTexStartAddrTable
+sTexStartAddrTable: ; 0x02103B50
 	.incbin "baserom.nds", 0x107b50, 0x5c
 
 	.global UNK_02103BAC
diff --git a/arm9/data/rom2_3.s b/arm9/data/rom2_3.s
index a86431af..5e5d18de 100644
--- a/arm9/data/rom2_3.s
+++ b/arm9/data/rom2_3.s
@@ -1357,12 +1357,12 @@ UNK_021067D0: ; 0x021067D0
 UNK_021067F0: ; 0x021067F0
 	.incbin "baserom.nds", 0x10a7f0, 0x20
 
-	.global UNK_02106810
-UNK_02106810: ; 0x02106810
+	.global sIsDispOn
+sIsDispOn: ; 0x02106810
 	.incbin "baserom.nds", 0x10a810, 0x4
 
-	.global UNK_02106814
-UNK_02106814: ; 0x02106814
+	.global GXi_DmaId
+GXi_DmaId: ; 0x02106814
 	.incbin "baserom.nds", 0x10a814, 0x4
 
 	.global OSi_IrqCallbackInfoIndex
diff --git a/arm9/lib/src/GX.c b/arm9/lib/src/GX.c
index 883dfe69..8841d69a 100644
--- a/arm9/lib/src/GX.c
+++ b/arm9/lib/src/GX.c
@@ -2,10 +2,10 @@
 #include "main.h"
 #include "gx.h"
 
-extern u16 UNK_021D33BC;
-extern u16 UNK_021D33C0;
-extern u32 UNK_02106814;
-extern u16 UNK_02106810;
+extern u16 GXi_VRamLockId;
+extern u16 sDispMode;
+extern u32 GXi_DmaId;
+extern u16 sIsDispOn;
 
 ARM_FUNC void GX_Init(){
     reg_GX_POWCNT |= 0x8000;
@@ -13,22 +13,22 @@ ARM_FUNC void GX_Init(){
     reg_GX_POWCNT = reg_GX_POWCNT | 0x1;
     GX_InitGXState();
     u32 temp;
-    while (UNK_021D33BC == 0)
+    while (GXi_VRamLockId == 0)
     {
         temp = OS_GetLockID();
         if (temp == -3)
         {
             OS_Terminate();
         }
-        UNK_021D33BC = temp;
+        GXi_VRamLockId = temp;
     }
     reg_GX_DISPSTAT = 0x0;
     reg_GX_DISPCNT = 0x0;
-    if (UNK_02106814 != -1)
+    if (GXi_DmaId != -1)
     {
-        MI_DmaFill32(UNK_02106814, (void *)&reg_G2_BG0CNT, 0x0, 0x60);
+        MI_DmaFill32(GXi_DmaId, (void *)&reg_G2_BG0CNT, 0x0, 0x60);
         reg_GX_MASTER_BRIGHT = 0x0;
-        MI_DmaFill32(UNK_02106814, (void *)&reg_GXS_DB_DISPCNT, 0x0, 0x70);
+        MI_DmaFill32(GXi_DmaId, (void *)&reg_GXS_DB_DISPCNT, 0x0, 0x70);
     }
     else
     {
@@ -74,16 +74,16 @@ ARM_FUNC u32 GX_VBlankIntr(u32 enable){
 
 ARM_FUNC void GX_DispOff(){
     u32 temp = reg_GX_DISPCNT;
-    UNK_02106810 = 0x0;
-    UNK_021D33C0 = (temp & 0x30000) >> 0x10;
+    sIsDispOn = 0x0;
+    sDispMode = (temp & 0x30000) >> 0x10;
     reg_GX_DISPCNT = temp & ~0x30000;
 }
 
 ARM_FUNC void GX_DispOn(){
-    UNK_02106810 = 0x1;
-    if (UNK_021D33C0)
+    sIsDispOn = 0x1;
+    if (sDispMode)
     {
-        reg_GX_DISPCNT = reg_GX_DISPCNT & ~0x30000 | (UNK_021D33C0 << 0x10);
+        reg_GX_DISPCNT = reg_GX_DISPCNT & ~0x30000 | (sDispMode << 0x10);
     }
     else
     {
@@ -93,12 +93,12 @@ ARM_FUNC void GX_DispOn(){
 
 ARM_FUNC void GX_SetGraphicsMode(u32 mode1, u32 mode2, u32 mode3){
     u32 temp2 = reg_GX_DISPCNT;
-    UNK_021D33C0 = mode1;
-    if (!UNK_02106810)
+    sDispMode = mode1;
+    if (!sIsDispOn)
         mode1 = 0;
     reg_GX_DISPCNT = (mode2 | ((temp2 & 0xFFF0FFF0) | (mode1 << 0x10))) | (mode3 << 0x3);
-    if (!UNK_021D33C0)
-        UNK_02106810 = 0x0;
+    if (!sDispMode)
+        sIsDispOn = 0x0;
 }
 
 ARM_FUNC void GXS_SetGraphicsMode(u32 mode){
diff --git a/arm9/lib/src/GX_g3x.c b/arm9/lib/src/GX_g3x.c
index 5a03c4ca..6f968e7e 100644
--- a/arm9/lib/src/GX_g3x.c
+++ b/arm9/lib/src/GX_g3x.c
@@ -2,7 +2,7 @@
 #include "main.h"
 #include "gx.h"
 
-extern u32 UNK_02106814;
+extern u32 GXi_DmaId;
 
 ARM_FUNC asm void GXi_NopClearFifo128_(void *reg){
     mov r1, #0x0
@@ -178,10 +178,10 @@ ARM_FUNC void G3X_SetClearColor(u32 col, u32 alpha, u32 depth, u32 polygon_id, u
 }
 
 ARM_FUNC void G3X_InitTable(){
-    if (UNK_02106814 != -1)
+    if (GXi_DmaId != -1)
     {
-        MI_DmaFill32Async(UNK_02106814, (void *)&reg_G3X_EDGE_COLOR_0, 0x0, 0x10, 0x0, 0x0);
-        MI_DmaFill32(UNK_02106814, (void *)&reg_G3X_FOG_TABLE_0, 0x0, 0x60);
+        MI_DmaFill32Async(GXi_DmaId, (void *)&reg_G3X_EDGE_COLOR_0, 0x0, 0x10, 0x0, 0x0);
+        MI_DmaFill32(GXi_DmaId, (void *)&reg_G3X_FOG_TABLE_0, 0x0, 0x60);
     }
     else
     {
diff --git a/arm9/lib/src/GX_load2d.c b/arm9/lib/src/GX_load2d.c
index 55faa915..17ab3694 100644
--- a/arm9/lib/src/GX_load2d.c
+++ b/arm9/lib/src/GX_load2d.c
@@ -2,15 +2,15 @@
 #include "main.h"
 #include "gx.h"
 
-extern u32 UNK_02106814;
+extern u32 GXi_DmaId;
 
-extern s32 UNK_021D33F8;
-extern s32 UNK_021D33F4;
-extern u32 UNK_021D33F0;
-extern u32 UNK_021D33EC;
-extern s32 UNK_021D33E8;
-extern u32 UNK_021D33E4;
-extern s32 UNK_021D33E0;
+extern s32 sSubOBJExtPltt;
+extern s32 sBGExtPltt;
+extern u32 sBGExtPlttLCDCBlk;
+extern u32 sBGExtPlttLCDCOffset;
+extern s32 sOBJExtPltt;
+extern u32 sOBJExtPlttLCDCBlk;
+extern s32 sSubBGExtPltt;
 
 
 static inline void *_GX_OBJ_PTR(){
@@ -21,203 +21,203 @@ static inline void *_GXS_OBJ_PTR(){
 }
 
 ARM_FUNC void GX_LoadBGPltt(void *src, u32 offset, u32 size){
-    GXi_DmaCopy16(UNK_02106814, src, (void *)(0x5000000 + offset), size);
+    GXi_DmaCopy16(GXi_DmaId, src, (void *)(0x5000000 + offset), size);
 }
 
 ARM_FUNC void GXS_LoadBGPltt(void *src, u32 offset, u32 size){
-    GXi_DmaCopy16(UNK_02106814, src, (void *)(0x5000400 + offset), size);
+    GXi_DmaCopy16(GXi_DmaId, src, (void *)(0x5000400 + offset), size);
 }
 
 ARM_FUNC void GX_LoadOBJPltt(void *src, u32 offset, u32 size){
-    GXi_DmaCopy16(UNK_02106814, src, (void *)(0x5000200 + offset), size);
+    GXi_DmaCopy16(GXi_DmaId, src, (void *)(0x5000200 + offset), size);
 }
 
 ARM_FUNC void GXS_LoadOBJPltt(void *src, u32 offset, u32 size){
-    GXi_DmaCopy16(UNK_02106814, src, (void *)(0x5000600 + offset), size);
+    GXi_DmaCopy16(GXi_DmaId, src, (void *)(0x5000600 + offset), size);
 }
 
 ARM_FUNC void GX_LoadOAM(void *src, u32 offset, u32 size){
-    GXi_DmaCopy32(UNK_02106814, src, (void *)(0x7000000 + offset), size);
+    GXi_DmaCopy32(GXi_DmaId, src, (void *)(0x7000000 + offset), size);
 }
 
 ARM_FUNC void GXS_LoadOAM(void *src, u32 offset, u32 size){
-    GXi_DmaCopy32(UNK_02106814, src, (void *)(0x7000400 + offset), size);
+    GXi_DmaCopy32(GXi_DmaId, src, (void *)(0x7000400 + offset), size);
 }
 
 ARM_FUNC void GX_LoadOBJ(void *src, u32 offset, u32 size){
     u32 base = (u32)_GX_OBJ_PTR();
-    GXi_DmaCopy32(UNK_02106814, src, (void *)(base + offset), size);
+    GXi_DmaCopy32(GXi_DmaId, src, (void *)(base + offset), size);
 }
 
 ARM_FUNC void GXS_LoadOBJ(void *src, u32 offset, u32 size){
     u32 base = (u32)_GXS_OBJ_PTR();
-    GXi_DmaCopy32(UNK_02106814, src, (void *)(base + offset), size);
+    GXi_DmaCopy32(GXi_DmaId, src, (void *)(base + offset), size);
 }
 
 ARM_FUNC void GX_LoadBG0Scr(void *src, u32 offset, u32 size){
     u32 base = (u32)G2_GetBG0ScrPtr();
-    GXi_DmaCopy16(UNK_02106814, src, (void *)(base + offset), size);
+    GXi_DmaCopy16(GXi_DmaId, src, (void *)(base + offset), size);
 }
 
 ARM_FUNC void GXS_LoadBG0Scr(void *src, u32 offset, u32 size){
     u32 base = (u32)G2S_GetBG0ScrPtr();
-    GXi_DmaCopy16(UNK_02106814, src, (void *)(base + offset), size);
+    GXi_DmaCopy16(GXi_DmaId, src, (void *)(base + offset), size);
 }
 
 ARM_FUNC void GX_LoadBG1Scr(void *src, u32 offset, u32 size){
     u32 base = (u32)G2_GetBG1ScrPtr();
-    GXi_DmaCopy16(UNK_02106814, src, (void *)(base + offset), size);
+    GXi_DmaCopy16(GXi_DmaId, src, (void *)(base + offset), size);
 }
 
 ARM_FUNC void GXS_LoadBG1Scr(void *src, u32 offset, u32 size){
     u32 base = (u32)G2S_GetBG1ScrPtr();
-    GXi_DmaCopy16(UNK_02106814, src, (void *)(base + offset), size);
+    GXi_DmaCopy16(GXi_DmaId, src, (void *)(base + offset), size);
 }
 
 ARM_FUNC void GX_LoadBG2Scr(void *src, u32 offset, u32 size){
     u32 base = (u32)G2_GetBG2ScrPtr();
-    GXi_DmaCopy16(UNK_02106814, src, (void *)(base + offset), size);
+    GXi_DmaCopy16(GXi_DmaId, src, (void *)(base + offset), size);
 }
 
 ARM_FUNC void GXS_LoadBG2Scr(void *src, u32 offset, u32 size){
     u32 base = (u32)G2S_GetBG2ScrPtr();
-    GXi_DmaCopy16(UNK_02106814, src, (void *)(base + offset), size);
+    GXi_DmaCopy16(GXi_DmaId, src, (void *)(base + offset), size);
 }
 
 ARM_FUNC void GX_LoadBG3Scr(void *src, u32 offset, u32 size){
     u32 base = (u32)G2_GetBG3ScrPtr();
-    GXi_DmaCopy16(UNK_02106814, src, (void *)(base + offset), size);
+    GXi_DmaCopy16(GXi_DmaId, src, (void *)(base + offset), size);
 }
 
 ARM_FUNC void GXS_LoadBG3Scr(void *src, u32 offset, u32 size){
     u32 base = (u32)G2S_GetBG3ScrPtr();
-    GXi_DmaCopy16(UNK_02106814, src, (void *)(base + offset), size);
+    GXi_DmaCopy16(GXi_DmaId, src, (void *)(base + offset), size);
 }
 
 ARM_FUNC void GX_LoadBG0Char(void *src, u32 offset, u32 size){
     u32 base = (u32)G2_GetBG0CharPtr();
-    GXi_DmaCopy32(UNK_02106814, src, (void *)(base + offset), size);
+    GXi_DmaCopy32(GXi_DmaId, src, (void *)(base + offset), size);
 }
 
 ARM_FUNC void GXS_LoadBG0Char(void *src, u32 offset, u32 size){
     u32 base = (u32)G2S_GetBG0CharPtr();
-    GXi_DmaCopy32(UNK_02106814, src, (void *)(base + offset), size);
+    GXi_DmaCopy32(GXi_DmaId, src, (void *)(base + offset), size);
 }
 
 ARM_FUNC void GX_LoadBG1Char(void *src, u32 offset, u32 size){
     u32 base = (u32)G2_GetBG1CharPtr();
-    GXi_DmaCopy32(UNK_02106814, src, (void *)(base + offset), size);
+    GXi_DmaCopy32(GXi_DmaId, src, (void *)(base + offset), size);
 }
 
 ARM_FUNC void GXS_LoadBG1Char(void *src, u32 offset, u32 size){
     u32 base = (u32)G2S_GetBG1CharPtr();
-    GXi_DmaCopy32(UNK_02106814, src, (void *)(base + offset), size);
+    GXi_DmaCopy32(GXi_DmaId, src, (void *)(base + offset), size);
 }
 
 ARM_FUNC void GX_LoadBG2Char(void *src, u32 offset, u32 size){
     u32 base = (u32)G2_GetBG2CharPtr();
-    GXi_DmaCopy32(UNK_02106814, src, (void *)(base + offset), size);
+    GXi_DmaCopy32(GXi_DmaId, src, (void *)(base + offset), size);
 }
 
 ARM_FUNC void GXS_LoadBG2Char(void *src, u32 offset, u32 size){
     u32 base = (u32)G2S_GetBG2CharPtr();
-    GXi_DmaCopy32(UNK_02106814, src, (void *)(base + offset), size);
+    GXi_DmaCopy32(GXi_DmaId, src, (void *)(base + offset), size);
 }
 
 ARM_FUNC void GX_LoadBG3Char(void *src, u32 offset, u32 size){
     u32 base = (u32)G2_GetBG3CharPtr();
-    GXi_DmaCopy32(UNK_02106814, src, (void *)(base + offset), size);
+    GXi_DmaCopy32(GXi_DmaId, src, (void *)(base + offset), size);
 }
 
 ARM_FUNC void GXS_LoadBG3Char(void *src, u32 offset, u32 size){
     u32 base = (u32)G2S_GetBG3CharPtr();
-    GXi_DmaCopy32(UNK_02106814, src, (void *)(base + offset), size);
+    GXi_DmaCopy32(GXi_DmaId, src, (void *)(base + offset), size);
 }
 
 ARM_FUNC void GX_BeginLoadBGExtPltt(){
-    UNK_021D33F4 = GX_ResetBankForBGExtPltt();
-    switch (UNK_021D33F4)
+    sBGExtPltt = GX_ResetBankForBGExtPltt();
+    switch (sBGExtPltt)
     {
     case 0: //needed to match
         break;
     case 0x10:
-        UNK_021D33F0 = 0x06880000;
-        UNK_021D33EC = 0x0;
+        sBGExtPlttLCDCBlk = 0x06880000;
+        sBGExtPlttLCDCOffset = 0x0;
         break;
     case 0x40:
-        UNK_021D33F0 = 0x06894000;
-        UNK_021D33EC = 0x4000;
+        sBGExtPlttLCDCBlk = 0x06894000;
+        sBGExtPlttLCDCOffset = 0x4000;
         break;
     case 0x20:
     case 0x60:
-        UNK_021D33F0 = 0x06890000;
-        UNK_021D33EC = 0x0;
+        sBGExtPlttLCDCBlk = 0x06890000;
+        sBGExtPlttLCDCOffset = 0x0;
         break;
     }
 }
 
 ARM_FUNC void GX_LoadBGExtPltt(void *src, u32 offset, u32 size){
-    GXi_DmaCopy32Async(UNK_02106814, src, (void *)(UNK_021D33F0 + offset - UNK_021D33EC), size, NULL, NULL);
+    GXi_DmaCopy32Async(GXi_DmaId, src, (void *)(sBGExtPlttLCDCBlk + offset - sBGExtPlttLCDCOffset), size, NULL, NULL);
 }
 
 ARM_FUNC void GX_EndLoadBGExtPltt(){
-    GXi_WaitDma(UNK_02106814);
-    GX_SetBankForBGExtPltt(UNK_021D33F4);
-    UNK_021D33F4 = 0x0;
-    UNK_021D33F0 = 0x0;
-    UNK_021D33EC = 0x0;
+    GXi_WaitDma(GXi_DmaId);
+    GX_SetBankForBGExtPltt(sBGExtPltt);
+    sBGExtPltt = 0x0;
+    sBGExtPlttLCDCBlk = 0x0;
+    sBGExtPlttLCDCOffset = 0x0;
 }
 
 ARM_FUNC void GX_BeginLoadOBJExtPltt(){
-    UNK_021D33E8 = GX_ResetBankForOBJExtPltt();
-    switch (UNK_021D33E8)
+    sOBJExtPltt = GX_ResetBankForOBJExtPltt();
+    switch (sOBJExtPltt)
     {
     case 0: //needed to match
         break;
     case 0x40:
-        UNK_021D33E4 = 0x06894000;
+        sOBJExtPlttLCDCBlk = 0x06894000;
         break;
     case 0x20:
-        UNK_021D33E4 = 0x06890000;
+        sOBJExtPlttLCDCBlk = 0x06890000;
         break;
     }
 }
 
 ARM_FUNC void GX_LoadOBJExtPltt(void *src, u32 offset, u32 size){
-    GXi_DmaCopy32Async(UNK_02106814, src, (void *)(UNK_021D33E4 + offset), size, NULL, NULL);
+    GXi_DmaCopy32Async(GXi_DmaId, src, (void *)(sOBJExtPlttLCDCBlk + offset), size, NULL, NULL);
 }
 
 ARM_FUNC void GX_EndLoadOBJExtPltt(){
-    GXi_WaitDma(UNK_02106814);
-    GX_SetBankForOBJExtPltt(UNK_021D33E8);
-    UNK_021D33E8 = 0x0;
-    UNK_021D33E4 = 0x0;
+    GXi_WaitDma(GXi_DmaId);
+    GX_SetBankForOBJExtPltt(sOBJExtPltt);
+    sOBJExtPltt = 0x0;
+    sOBJExtPlttLCDCBlk = 0x0;
 }
 
 ARM_FUNC void GXS_BeginLoadBGExtPltt(){
-    UNK_021D33E0 = FUN_020C6034();
+    sSubBGExtPltt = FUN_020C6034();
 }
 
 ARM_FUNC void GXS_LoadBGExtPltt(void *src, u32 offset, u32 size){
-    GXi_DmaCopy32Async(UNK_02106814, src, (void *)(0x06898000 + offset), size, NULL, NULL);
+    GXi_DmaCopy32Async(GXi_DmaId, src, (void *)(0x06898000 + offset), size, NULL, NULL);
 }
 
 ARM_FUNC void GXS_EndLoadBGExtPltt(){
-    GXi_WaitDma(UNK_02106814);
-    GX_SetBankForSubBGExtPltt(UNK_021D33E0);
-    UNK_021D33E0 = 0x0;
+    GXi_WaitDma(GXi_DmaId);
+    GX_SetBankForSubBGExtPltt(sSubBGExtPltt);
+    sSubBGExtPltt = 0x0;
 }
 
 ARM_FUNC void GXS_BeginLoadOBJExtPltt(){
-    UNK_021D33F8 = GX_ResetBankForSubOBJ();
+    sSubOBJExtPltt = GX_ResetBankForSubOBJ();
 }
 
 ARM_FUNC void GXS_LoadOBJExtPltt(void *src, u32 offset, u32 size){
-    GXi_DmaCopy32Async(UNK_02106814, src, (void *)(0x068A0000 + offset), size, NULL, NULL);
+    GXi_DmaCopy32Async(GXi_DmaId, src, (void *)(0x068A0000 + offset), size, NULL, NULL);
 }
 
 ARM_FUNC void GXS_EndLoadOBJExtPltt(){
-    GXi_WaitDma(UNK_02106814);
-    GX_SetBankForSubOBJExtPltt(UNK_021D33F8);
-    UNK_021D33F8 = 0x0;
+    GXi_WaitDma(GXi_DmaId);
+    GX_SetBankForSubOBJExtPltt(sSubOBJExtPltt);
+    sSubOBJExtPltt = 0x0;
 }
diff --git a/arm9/lib/src/GX_load3d.c b/arm9/lib/src/GX_load3d.c
index 31ddffc3..db947ec9 100644
--- a/arm9/lib/src/GX_load3d.c
+++ b/arm9/lib/src/GX_load3d.c
@@ -2,120 +2,120 @@
 #include "main.h"
 #include "gx.h"
 
-extern u32 UNK_02106814;
+extern u32 GXi_DmaId;
 
-extern u32 UNK_021D3410;
-extern u32 UNK_021D3400;
-extern u32 UNK_021D3414;
-extern u32 UNK_021D3418;
+extern u32 sTex;
+extern u32 sTexLCDCBlk1;
+extern u32 sTexLCDCBlk2;
+extern u32 sSzTexBlk1;
 
 //probably structs of length 0x6
-extern u16 UNK_02103B4C[];
-extern u16 UNK_02103B4E[];
-extern u16 UNK_02103B50[];
+extern u16 sTexStartAddrTable[];
+extern u16 sTexStartAddrTable[];
+extern u16 sTexStartAddrTable[];
 
-extern u32 UNK_021D3408;
-extern u32 UNK_021D3404;
-extern u16 UNK_02103B3C[];
+extern u32 sTexPltt;
+extern u32 sTexPlttLCDCBlk;
+extern u16 sTexPlttStartAddrTable[];
 
-extern s32 UNK_021D33FC;
-extern u32 UNK_021D340C;
+extern s32 sClrImg;
+extern u32 sClrImgLCDCBlk;
 
 ARM_FUNC void GX_BeginLoadTex(){
     u32 temp = GX_ResetBankForTex();
-    UNK_021D3410 = temp;
-    UNK_021D3400 = UNK_02103B4C[temp * 3] << 0xC;
-    UNK_021D3414 = UNK_02103B4E[temp * 3] << 0xC;
-    UNK_021D3418 = UNK_02103B50[temp * 3] << 0xC;
+    sTex = temp;
+    sTexLCDCBlk1 = sTexStartAddrTable[temp * 3] << 0xC;
+    sTexLCDCBlk2 = sTexStartAddrTable[temp * 3] << 0xC;
+    sSzTexBlk1 = sTexStartAddrTable[temp * 3] << 0xC;
 }
 
 ARM_FUNC void GX_LoadTex(void *src, u32 offset, u32 size){
     void *temp;
-    if (!UNK_021D3414)
+    if (!sTexLCDCBlk2)
     {
-        temp = (void *)(UNK_021D3400 + offset);
+        temp = (void *)(sTexLCDCBlk1 + offset);
     }
     else
     {
-        if ((offset + size) < UNK_021D3418)
+        if ((offset + size) < sSzTexBlk1)
         {
-            temp = (void *)(UNK_021D3400 + offset);
+            temp = (void *)(sTexLCDCBlk1 + offset);
         }
-        else if (offset >= UNK_021D3418)
+        else if (offset >= sSzTexBlk1)
         {
-            temp = (void *)(UNK_021D3414 + offset - UNK_021D3418);
+            temp = (void *)(sTexLCDCBlk2 + offset - sSzTexBlk1);
         }
         else
         {
-            void *temp2 = (void *)UNK_021D3414;
-            u32 temp1 = UNK_021D3418 - offset;
-            temp = (void *)(UNK_021D3400 + offset);
-            GXi_DmaCopy32(UNK_02106814, src, temp, temp1);
-            GXi_DmaCopy32Async(UNK_02106814, (void *)((u8 *)src + temp1), temp2, (size - temp1), NULL, NULL);
+            void *temp2 = (void *)sTexLCDCBlk2;
+            u32 temp1 = sSzTexBlk1 - offset;
+            temp = (void *)(sTexLCDCBlk1 + offset);
+            GXi_DmaCopy32(GXi_DmaId, src, temp, temp1);
+            GXi_DmaCopy32Async(GXi_DmaId, (void *)((u8 *)src + temp1), temp2, (size - temp1), NULL, NULL);
             return;
         }
     }
-    GXi_DmaCopy32Async(UNK_02106814, src, temp, size, NULL, NULL);
+    GXi_DmaCopy32Async(GXi_DmaId, src, temp, size, NULL, NULL);
 }
 
 ARM_FUNC void GX_EndLoadTex(){
-    GXi_WaitDma(UNK_02106814);
-    GX_SetBankForTex(UNK_021D3410);
-    UNK_021D3418 = 0x0;
-    UNK_021D3414 = 0x0;
-    UNK_021D3400 = 0x0;
-    UNK_021D3410 = 0x0;
+    GXi_WaitDma(GXi_DmaId);
+    GX_SetBankForTex(sTex);
+    sSzTexBlk1 = 0x0;
+    sTexLCDCBlk2 = 0x0;
+    sTexLCDCBlk1 = 0x0;
+    sTex = 0x0;
 }
 
 ARM_FUNC void GX_BeginLoadTexPltt(){
     s32 temp = GX_ResetBankForTexPltt();
-    UNK_021D3408 = temp;
-    UNK_021D3404 = UNK_02103B3C[temp >> 4] << 0xC;
+    sTexPltt = temp;
+    sTexPlttLCDCBlk = sTexPlttStartAddrTable[temp >> 4] << 0xC;
 }
 
 ARM_FUNC void GX_LoadTexPltt(void *src, u32 offset, u32 size){
-    GXi_DmaCopy32Async(UNK_02106814, src, (void *)(UNK_021D3404 + offset), size, NULL, NULL);
+    GXi_DmaCopy32Async(GXi_DmaId, src, (void *)(sTexPlttLCDCBlk + offset), size, NULL, NULL);
 }
 
 ARM_FUNC void GX_EndLoadTexPltt(){
-    GXi_WaitDma(UNK_02106814);
-    GX_SetBankForTexPltt(UNK_021D3408);
-    UNK_021D3408 = 0x0;
-    UNK_021D3404 = 0x0;
+    GXi_WaitDma(GXi_DmaId);
+    GX_SetBankForTexPltt(sTexPltt);
+    sTexPltt = 0x0;
+    sTexPlttLCDCBlk = 0x0;
 }
 
 ARM_FUNC void GX_BeginLoadClearImage(){
     s32 temp = GX_ResetBankForClearImage();
-    UNK_021D33FC = temp;
+    sClrImg = temp;
     switch (temp)
     {
     case 2:
     case 3:
-        UNK_021D340C = 0x6800000;
+        sClrImgLCDCBlk = 0x6800000;
         return;
     case 8:
     case 12:
-        UNK_021D340C = 0x6840000;
+        sClrImgLCDCBlk = 0x6840000;
         return;
     case 1:
-        UNK_021D340C = 0x67E0000;
+        sClrImgLCDCBlk = 0x67E0000;
         return;
     case 4:
-        UNK_021D340C = 0x6820000;
+        sClrImgLCDCBlk = 0x6820000;
     }
 }
 
 ARM_FUNC void GX_LoadClearImageColor(void *src, u32 size){
-    GXi_DmaCopy32Async(UNK_02106814, src, (void *)(UNK_021D340C), size, NULL, NULL);
+    GXi_DmaCopy32Async(GXi_DmaId, src, (void *)(sClrImgLCDCBlk), size, NULL, NULL);
 }
 
 ARM_FUNC void GX_LoadClearImageDepth(void *src, u32 size){
-    GXi_DmaCopy32Async(UNK_02106814, src, (void *)(UNK_021D340C + 0x20000), size, NULL, NULL);
+    GXi_DmaCopy32Async(GXi_DmaId, src, (void *)(sClrImgLCDCBlk + 0x20000), size, NULL, NULL);
 }
 
 ARM_FUNC void GX_EndLoadClearImage(){
-    GXi_WaitDma(UNK_02106814);
-    GX_SetBankForClearImage(UNK_021D33FC);
-    UNK_021D33FC = 0x0;
-    UNK_021D340C = 0x0;
+    GXi_WaitDma(GXi_DmaId);
+    GX_SetBankForClearImage(sClrImg);
+    sClrImg = 0x0;
+    sClrImgLCDCBlk = 0x0;
 }
diff --git a/arm9/lib/src/GX_vramcnt.c b/arm9/lib/src/GX_vramcnt.c
index da55d806..2b785198 100644
--- a/arm9/lib/src/GX_vramcnt.c
+++ b/arm9/lib/src/GX_vramcnt.c
@@ -2,7 +2,7 @@
 #include "main.h"
 #include "gx.h"
 
-extern u16 UNK_021D33BC;
+extern u16 GXi_VRamLockId;
 extern struct GX_State gGXState;
 
 ARM_FUNC void GX_VRAMCNT_SetLCDC_(u32 mask){
@@ -474,7 +474,7 @@ ARM_FUNC u32 FUN_020C5F28(u16 *ptr){
         reg_GX_VRAMCNT_H = 0x0;
     if (temp & (0x1 << 8))
         reg_GX_VRAMCNT_I = 0x0;
-    OSi_UnlockVram((u16)temp, UNK_021D33BC);
+    OSi_UnlockVram((u16)temp, GXi_VRamLockId);
     return temp;
 }
 
diff --git a/arm9/undefined_syms.txt b/arm9/undefined_syms.txt
index 25771881..adc05ca0 100644
--- a/arm9/undefined_syms.txt
+++ b/arm9/undefined_syms.txt
@@ -8,7 +8,7 @@ SDK_IRQ_STACKSIZE = 0x00000400;
 FX_AtanTable_ = 0x02103A38;
 // OS
 gUnk02106810 = 0x02106810;
-UNK_02106814 = 0x02106814;
+GXi_DmaId = 0x02106814;
 OSi_IrqCallbackInfoIndex = 0x02106818;
 OSi_ConsoleTypeCache = 0x02106828;
 // DGT
@@ -25,27 +25,27 @@ gUnk021D33BC = 0x021D33BC;
 gUnk021D33C0 = 0x021D33C0;
 gGXState = 0x021D33C4;
 
-UNK_021D33E0 = 0x021D33E0;
-UNK_021D33E4 = 0x021D33E4;
-UNK_021D33E8 = 0x021D33E8;
-UNK_021D33EC = 0x021D33EC;
-UNK_021D33F0 = 0x021D33F0;
-UNK_021D33F4 = 0x021D33F4;
-UNK_021D33F8 = 0x021D33F8;
-UNK_021D33FC = 0x021D33FC;
-UNK_021D3400 = 0x021D3400;
-UNK_021D3404 = 0x021D3404;
-UNK_021D3408 = 0x021D3408;
-UNK_021D340C = 0x021D340C;
-UNK_021D3410 = 0x021D3410;
-UNK_021D3414 = 0x021D3414;
-UNK_021D3418 = 0x021D3418;
+sSubBGExtPltt = 0x021D33E0;
+sOBJExtPlttLCDCBlk = 0x021D33E4;
+sOBJExtPltt = 0x021D33E8;
+sBGExtPlttLCDCOffset = 0x021D33EC;
+sBGExtPlttLCDCBlk = 0x021D33F0;
+sBGExtPltt = 0x021D33F4;
+sSubOBJExtPltt = 0x021D33F8;
+sClrImg = 0x021D33FC;
+sTexLCDCBlk1 = 0x021D3400;
+sTexPlttLCDCBlk = 0x021D3404;
+sTexPltt = 0x021D3408;
+sClrImgLCDCBlk = 0x021D340C;
+sTex = 0x021D3410;
+sTexLCDCBlk2 = 0x021D3414;
+sSzTexBlk1 = 0x021D3418;
 
-UNK_02103B3C = 0x02103B3C;
+sTexPlttStartAddrTable = 0x02103B3C;
 
-UNK_02103B4C = 0x02103B4C;
-UNK_02103B4E = 0x02103B4E;
-UNK_02103B50 = 0x02103B50;
+sTexStartAddrTable = 0x02103B4C;
+sTexStartAddrTable = 0x02103B4E;
+sTexStartAddrTable = 0x02103B50;
 
 // Overlay
 FUN_021D76AC = 0x021D76AC;