diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2019-12-04 01:57:27 -0500 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2019-12-04 01:57:27 -0500 |
| commit | cb5fe2f84f6f79748f8b67c236956371784619db (patch) | |
| tree | 24df75a4c8b2051aa2fb6c51fcd1c79bf1d3cbb0 /include/graphics.h | |
| parent | 1b7dc422d96ef13888139f190a5f7c2d591fb0ca (diff) | |
| parent | bc0fe11d163da1131daf63bdeb2abcba788f6036 (diff) | |
resolve conflict
Diffstat (limited to 'include/graphics.h')
| -rw-r--r-- | include/graphics.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/graphics.h b/include/graphics.h index 93efbd135..9b74ba2d0 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4249,6 +4249,12 @@ extern const u16 gUnknown_8E97DDC[]; extern const u32 gUnknown_8E97DFC[]; extern const u32 gUnknown_8E97EC4[]; +// shop menu +extern const u32 gBuyMenuFrame_Gfx[]; +extern const u32 gBuyMenuFrame_Tilemap[]; +extern const u32 gBuyMenuFrame_TmHmTilemap[]; +extern const u32 gBuyMenuFrame_Pal[]; + // battle_message extern const u16 gUnknown_8D2FBB4[]; |