diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/gba/defines.h | 1 | ||||
| -rw-r--r-- | include/global.h | 3 | ||||
| -rw-r--r-- | include/graphics.h | 12 | ||||
| -rw-r--r-- | include/text.h | 2 |
4 files changed, 17 insertions, 1 deletions
diff --git a/include/gba/defines.h b/include/gba/defines.h index 7fd429d9e..8508c288f 100644 --- a/include/gba/defines.h +++ b/include/gba/defines.h @@ -35,6 +35,7 @@ // 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 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/include/graphics.h b/include/graphics.h index 76a45f6f6..f99da32e5 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -3337,4 +3337,16 @@ extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_17; extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_20; extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_21; +// data/graphics.s +extern const u8 gBattleWindowLargeGfx[]; +extern const u8 gBattleWindowSmallGfx[]; +extern const u8 gBattleWindowSmall2Gfx[]; +extern const u8 gBattleWindowSmall3Gfx[]; +extern const u8 gBattleWindowLarge2Gfx[]; +extern const u8 gBlankGfxCompressed[]; +extern const u8 gBattleGfx_BallStatusBar[]; +extern const u16 gUnknown_08D1212C[]; +extern const u16 gUnknown_08D1214C[]; +extern const u8 Tiles_D129AC[]; + #endif // GUARD_GRAPHICS_H diff --git a/include/text.h b/include/text.h index f0d039d45..a7a62fcf7 100644 --- a/include/text.h +++ b/include/text.h @@ -91,7 +91,7 @@ struct WindowTemplate u8 tilemapTop; u8 width; u8 height; - u8 *tileData; + u8 *tileData; // to TileData4bpp *? u16 *tilemap; u32 maybeUnused; }; |