diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2018-03-31 14:37:24 -0400 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-03-31 14:37:24 -0400 |
commit | 0015d6fe2c6a53c5f757599122ae9fd1a156a69f (patch) | |
tree | 81b7269c767da1ad4a5a9ac01e58ead5e92f0983 /include/graphics.h | |
parent | 46bc01f0dd1a3435b3c6ce71e1be0d19b7aaa5bd (diff) | |
parent | 59f81c5f2a25ec77baf4a30c3da9ccb7675d1562 (diff) |
Merge branch 'master' into contest_link_80C2020
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 243d40fb9..bdb2b160e 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; |