summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMarco Willems (M17.1) <progreon@gmail.com>2018-01-15 02:25:01 +0100
committerMarco Willems (M17.1) <progreon@gmail.com>2018-01-15 02:25:01 +0100
commitd2e0d49392945e419c67b65c49942252e83dfabe (patch)
tree5f7dcebdf142b637764b3cf0587fa47c52cd0ec0 /include
parent6d2302637dbc7dfd597c7f95de780b1a21079f15 (diff)
done testing
Diffstat (limited to 'include')
-rw-r--r--include/gba/defines.h2
-rw-r--r--include/global.h3
2 files changed, 4 insertions, 1 deletions
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