diff options
| author | yenatch <yenatch@gmail.com> | 2018-02-03 13:35:38 -0500 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2018-02-03 13:35:38 -0500 |
| commit | 204d3e45f0c0843ada1243897d36e873059efde1 (patch) | |
| tree | b4c3fae28387695175f007357848286afbb0a494 /include/graphics.h | |
| parent | 3ed97d94be70bee91b581517311c01cf20c917de (diff) | |
| parent | f1584e69c307427516d2c180ab92e28bc3786326 (diff) | |
Merge remote-tracking branch 'origin/master' into battle-1
Diffstat (limited to 'include/graphics.h')
| -rw-r--r-- | include/graphics.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/include/graphics.h b/include/graphics.h index 76a45f6f6..889dc3916 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -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; |