diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-04-05 18:28:16 -0700 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2018-04-05 18:28:16 -0700 |
| commit | d975a85c84616155e226b2d5120aee9adcae16b5 (patch) | |
| tree | 0668eb03388e9404e134e24b3dcd753f7bc47050 /include/graphics.h | |
| parent | 37396ce835e702248b9e8fa1bbaec07b8b64ab4f (diff) | |
| parent | 62388f3bfd5b1abd9fa369628b805e683e64c302 (diff) | |
Merge remote-tracking branch 'upstream/master' into various_data
Diffstat (limited to 'include/graphics.h')
| -rw-r--r-- | include/graphics.h | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/include/graphics.h b/include/graphics.h index f99da32e5..e0d202202 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; |