diff options
| author | drifloony <drifloony@users.noreply.github.com> | 2017-07-21 15:34:05 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-21 15:34:05 -0700 |
| commit | 8ed167339c52b32e5149077e9e2c91f981268af9 (patch) | |
| tree | 765873e0da27644ad94fcf0eee9a8f76f95e96c6 /include/graphics.h | |
| parent | 95d3a7848ca07ad7035d1a717b489c4ea303a3ba (diff) | |
| parent | 68e47a6fa0b56451223c22dc9a759534c988db5b (diff) | |
Merge branch 'master' into mon_markings
Diffstat (limited to 'include/graphics.h')
| -rw-r--r-- | include/graphics.h | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/include/graphics.h b/include/graphics.h index fb9781147..5632cb831 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -2435,6 +2435,10 @@ extern const u8 gMonFrontPic_UnownQuestionMark[]; extern const u8 gMonBackPic_UnownQuestionMark[]; extern const u8 gMonIcon_UnownQuestionMark[]; +extern const u8 gMonIcon_QuestionMark[]; +extern const u8 gMonIcon_Egg[]; +extern const u16 gMonIconPalettes[][16]; + // data/graphics.s extern const u8 gBagMaleTiles[]; extern const u8 gBagFemaleTiles[]; @@ -2549,4 +2553,15 @@ extern const u8 gBerryPalette_Enigma[]; extern const u8 gUnknown_08E96EC8[]; +extern const u8 gMenuTrainerCard_Gfx[]; +extern const u16 gMenuTrainerCard0Star_Pal[]; +extern const u16 gMenuTrainerCard1Star_Pal[]; +extern const u16 gMenuTrainerCard2Star_Pal[]; +extern const u16 gMenuTrainerCard3Star_Pal[]; +extern const u16 gMenuTrainerCard4Star_Pal[]; +extern const u8 gUnknown_08E8CAC0[]; +extern const u8 gUnknown_08E8CFC0[]; +extern const u8 gUnknown_08E8D4C0[]; +extern const u8 gUnknown_08E8D9C0[]; + #endif // GUARD_GRAPHICS_H |