done testing

4 files changed, 47 insertions, 62 deletions

diff --git a/data/battle_interface.s b/data/battle_interface.s
index 3c79b9f4b..d83c8e222 100644
--- a/data/battle_interface.s
+++ b/data/battle_interface.s
@@ -277,42 +277,3 @@ gUnknown_0820A89C:: @ 820A89C
 
 gUnknown_0820A8B0:: @ 820A8B0
 	.string "{HIGHLIGHT RED}$"
-
-	.align 2
-gUnknown_0820A8B4:: @ 820A8B4
-	.4byte OBJ_VRAM0 + 0x40
-	.4byte OBJ_VRAM0 + 0x60
-	.4byte OBJ_VRAM0 + 0x80
-	.4byte OBJ_VRAM0 + 0xA0
-	.4byte OBJ_VRAM0 + 0xC0
-	.4byte OBJ_VRAM0 + 0xE0
-	.4byte OBJ_VRAM0 + 0x800
-	.4byte OBJ_VRAM0 + 0x820
-	.4byte OBJ_VRAM0 + 0x840
-	.4byte OBJ_VRAM0 + 0x860
-
-	.align 2
-gUnknown_0820A8DC:: @ 820A8DC
-	.4byte OBJ_VRAM0 + 0x20
-	.4byte OBJ_VRAM0 + 0x40
-	.4byte OBJ_VRAM0 + 0x60
-	.4byte OBJ_VRAM0 + 0x80
-	.4byte OBJ_VRAM0 + 0xA0
-	.4byte OBJ_VRAM0 + 0xC0
-	.4byte OBJ_VRAM0 + 0xE0
-	.4byte OBJ_VRAM0 + 0x400
-	.4byte OBJ_VRAM0 + 0x420
-	.4byte OBJ_VRAM0 + 0x440
-
-	.align 2
-gUnknown_0820A904:: @ 820A904
-	.4byte OBJ_VRAM0 + 0x40
-	.4byte OBJ_VRAM0 + 0x60
-	.4byte OBJ_VRAM0 + 0x80
-	.4byte OBJ_VRAM0 + 0xA0
-	.4byte OBJ_VRAM0 + 0xC0
-	.4byte OBJ_VRAM0 + 0xE0
-	.4byte OBJ_VRAM0 + 0x400
-	.4byte OBJ_VRAM0 + 0x420
-	.4byte OBJ_VRAM0 + 0x440
-	.4byte OBJ_VRAM0 + 0x460
diff --git a/include/gba/defines.h b/include/gba/defines.h
index f415fc504..8508c288f 100644
--- a/include/gba/defines.h
+++ b/include/gba/defines.h
@@ -35,7 +35,7 @@
 
 // text-mode BG
 #define OBJ_VRAM0      (void *)(VRAM + 0x10000)
-#define OBJ_VRAM0_TEST (TileData4bpp *)(VRAM + 0x10000)
+#define OBJ_VRAM0_TEMP ((TileData4bpp *)(VRAM + 0x10000))
 #define OBJ_VRAM0_SIZE 0x8000
 
 // bitmap-mode BG
diff --git a/include/global.h b/include/global.h
index d0af4a4d1..48b6b1127 100644
--- a/include/global.h
+++ b/include/global.h
@@ -845,4 +845,7 @@ extern struct HallOfFame gHallOfFame;
 extern struct SaveBlock2 gSaveBlock2;
 extern u8 ewram[];
 
+// used for OBJ_VRAM0 pointers
+typedef u8 TileData4bpp[32];
+
 #endif // GUARD_GLOBAL_H
diff --git a/src/battle/battle_interface.c b/src/battle/battle_interface.c
index 7d32ff0b1..6f6dc9de6 100644
--- a/src/battle/battle_interface.c
+++ b/src/battle/battle_interface.c
@@ -29,12 +29,47 @@ struct UnknownStruct7
     u8 filler0[0x180];
 };
 
-// struct TileData4bpp
-// {
-//     u8 data[32];
-// };
+TileData4bpp *const gUnknown_0820A8B4[10] =
+{
+    &OBJ_VRAM0_TEMP[ 2],
+    &OBJ_VRAM0_TEMP[ 3],
+    &OBJ_VRAM0_TEMP[ 4],
+    &OBJ_VRAM0_TEMP[ 5],
+    &OBJ_VRAM0_TEMP[ 6],
+    &OBJ_VRAM0_TEMP[ 7],
+    &OBJ_VRAM0_TEMP[64],
+    &OBJ_VRAM0_TEMP[65],
+    &OBJ_VRAM0_TEMP[66],
+    &OBJ_VRAM0_TEMP[67],
+};
+
+TileData4bpp *const gUnknown_0820A8DC[10] =
+{
+    &OBJ_VRAM0_TEMP[ 1],
+    &OBJ_VRAM0_TEMP[ 2],
+    &OBJ_VRAM0_TEMP[ 3],
+    &OBJ_VRAM0_TEMP[ 4],
+    &OBJ_VRAM0_TEMP[ 5],
+    &OBJ_VRAM0_TEMP[ 6],
+    &OBJ_VRAM0_TEMP[ 7],
+    &OBJ_VRAM0_TEMP[32],
+    &OBJ_VRAM0_TEMP[33],
+    &OBJ_VRAM0_TEMP[34],
+};
 
-typedef u8 TileData4bpp[32];
+TileData4bpp *const gUnknown_0820A904[10] =
+{
+    &OBJ_VRAM0_TEMP[ 2],
+    &OBJ_VRAM0_TEMP[ 3],
+    &OBJ_VRAM0_TEMP[ 4],
+    &OBJ_VRAM0_TEMP[ 5],
+    &OBJ_VRAM0_TEMP[ 6],
+    &OBJ_VRAM0_TEMP[ 7],
+    &OBJ_VRAM0_TEMP[32],
+    &OBJ_VRAM0_TEMP[33],
+    &OBJ_VRAM0_TEMP[34],
+    &OBJ_VRAM0_TEMP[35],
+};
 
 extern u8 gDisplayedStringBattle[];
 extern u8 gNoOfAllBanks;
@@ -66,9 +101,9 @@ extern void *const gUnknown_0820A854[];
 extern void *const gUnknown_0820A85C[];
 extern TileData4bpp *const gUnknown_0820A87C[];
 extern TileData4bpp *const gUnknown_0820A894[];
-extern TileData4bpp *const gUnknown_0820A8B4[];
-extern TileData4bpp *const gUnknown_0820A8DC[];
-extern TileData4bpp *const gUnknown_0820A904[];
+// extern TileData4bpp *const gUnknown_0820A8B4[];
+// extern TileData4bpp *const gUnknown_0820A8DC[];
+// extern TileData4bpp *const gUnknown_0820A904[];
 extern const u8 gUnknown_0820A81C[];
 extern const u8 gUnknown_0820A864[];
 extern const u8 gUnknown_0820A89C[];
@@ -101,20 +136,6 @@ static void sub_8045D58(u8, u8);
 static u8 sub_804602C(int, int, int, int *, u8 *, u8);
 static void sub_8046128(struct BattleInterfaceStruct1 *a, int *b, u16 *c);
 
-// TileData4bpp *const gUnknown_0820A904[10] =
-// {
-//     &OBJ_VRAM0_TEST[2], // 0x40
-//     &OBJ_VRAM0_TEST[3], // 0x60
-//     &OBJ_VRAM0_TEST[4], // 0x80
-//     &OBJ_VRAM0_TEST[5], // 0xA0
-//     &OBJ_VRAM0_TEST[6], // 0xC0
-//     &OBJ_VRAM0_TEST[7], // 0xE0
-//     &OBJ_VRAM0_TEST[32], // 0x400
-//     &OBJ_VRAM0_TEST[33], // 0x420
-//     &OBJ_VRAM0_TEST[34], // 0x440
-//     &OBJ_VRAM0_TEST[35], // 0x460
-// };
-
 static int do_nothing(s16 unused1, s16 unused2, int unused3)
 {
     return 9;