diff options
| author | Marco Willems (M17.1) <progreon@gmail.com> | 2018-01-19 17:18:14 +0100 |
|---|---|---|
| committer | Marco Willems (M17.1) <progreon@gmail.com> | 2018-01-19 17:18:14 +0100 |
| commit | 37396ce835e702248b9e8fa1bbaec07b8b64ab4f (patch) | |
| tree | 1cc49301ff407e6491d8bc384ca9c87992d51951 /include | |
| parent | d4cd912eb85411a4be1ea97441f929a16f455f34 (diff) | |
switching over to a different branch for testing with tile stuff
Diffstat (limited to 'include')
| -rw-r--r-- | include/gba/defines.h | 1 | ||||
| -rw-r--r-- | include/global.h | 3 | ||||
| -rw-r--r-- | include/text.h | 2 |
3 files changed, 1 insertions, 5 deletions
diff --git a/include/gba/defines.h b/include/gba/defines.h index 8508c288f..7fd429d9e 100644 --- a/include/gba/defines.h +++ b/include/gba/defines.h @@ -35,7 +35,6 @@ // text-mode BG #define OBJ_VRAM0 (void *)(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 48b6b1127..d0af4a4d1 100644 --- a/include/global.h +++ b/include/global.h @@ -845,7 +845,4 @@ 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/include/text.h b/include/text.h index a7a62fcf7..f0d039d45 100644 --- a/include/text.h +++ b/include/text.h @@ -91,7 +91,7 @@ struct WindowTemplate u8 tilemapTop; u8 width; u8 height; - u8 *tileData; // to TileData4bpp *? + u8 *tileData; u16 *tilemap; u32 maybeUnused; }; |