diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-04-05 18:41:42 -0700 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2018-04-05 18:41:42 -0700 |
| commit | 66367c82ef07c10957d45ce7f0f776a178454e18 (patch) | |
| tree | 0dd4fcd5cce3ef14dae4fc9ae91e54c6e070eef6 /include/graphics.h | |
| parent | 171dd32df8a56e1f10956be8b944cb216edb8f9d (diff) | |
| parent | 781d0ca44c8eab2b7751fe8f337d6acde7fe8582 (diff) | |
Merge remote-tracking branch 'upstream/master' into btl_attrs
Diffstat (limited to 'include/graphics.h')
| -rw-r--r-- | include/graphics.h | 28 |
1 files changed, 23 insertions, 5 deletions
diff --git a/include/graphics.h b/include/graphics.h index 1d279bf84..bc15cf449 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -2634,9 +2634,9 @@ extern const u16 gUnknown_08EA02C8[]; extern const u16 gUnknown_08EA0348[]; extern const u16 gUnknown_08EA15C8[]; extern const u16 gTradeMonBoxTilemap[]; -extern const u8 gUnknown_08D00000[]; -extern const u16 gUnknown_08D00524[]; -extern const u8 gUnknown_08D004E0[]; +extern const u8 gBattleTextboxTiles[]; +extern const u16 gBattleTextboxTilemap[]; +extern const u8 gBattleTextboxPalette[]; extern const u8 gNamingScreenBackButtonTiles[]; extern const u8 gNamingScreenOKButtonTiles[]; @@ -2739,7 +2739,15 @@ extern const u16 gCableCar_Pal[]; extern const u16 gCableCarBG_Pal[]; extern const u8 gCableCarBG_Gfx[]; -// data/graphics.s +extern const u8 gPSSMenuHeader_Gfx[]; +extern const u8 gPSSMenuHeader_Tilemap[]; +extern const u16 gPSSMenu1_Pal[]; +extern const u16 gPSSMenu2_Pal[]; +extern const u8 gPSSMenuMisc_Gfx[]; +extern const u8 gPSSMenuMisc_Tilemap[]; +extern const u16 gPSSMenu3_Pal[]; +extern const u16 gPSSMenu4_Pal[]; + extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_000; extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_001; extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_002; @@ -3337,7 +3345,6 @@ extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_17; extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_20; extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_21; -// data/graphics.s extern const struct CompressedSpriteSheet gBattleTerrainTiles_TallGrass[]; extern const u8 gBattleTerrainTilemap_TallGrass[]; extern const struct CompressedSpriteSheet gBattleTerrainAnimTiles_TallGrass[]; @@ -3394,4 +3401,15 @@ extern const struct CompressedSpritePalette gBattleTerrainPalette_Building[]; extern const struct CompressedSpritePalette gBattleTerrainPalette_Plain[]; +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 |