summaryrefslogtreecommitdiff
path: root/include/graphics.h
diff options
context:
space:
mode:
authorgarak <garakmon@gmail.com>2018-11-27 11:35:19 -0500
committergarak <garakmon@gmail.com>2018-11-27 11:35:19 -0500
commit73cce797533c5985406b7b5696834b0976039c4f (patch)
treebcf7766a7a7ae0ad42bbfacd9566c219fe1d0fd3 /include/graphics.h
parent091b5194e7bfc6049931202d9712541083fd61cd (diff)
parentc909aa92dee0a8d202d9195d80d0cc96b0d1ebc8 (diff)
Merge remote-tracking branch 'upstream/master' into frontier-data
Diffstat (limited to 'include/graphics.h')
-rw-r--r--include/graphics.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/include/graphics.h b/include/graphics.h
index a3af44ad7..0620ea551 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -1237,7 +1237,7 @@ extern const u32 gMonBackPic_Pichu[];
extern const u32 gMonShinyPalette_Pichu[];
extern const u32 gMonStillFrontPic_Pichu[];
extern const u8 gMonIcon_Pichu[];
-extern const u32 gMonFootprint_Pichu[];
+extern const u8 gMonFootprint_Pichu[];
extern const u32 gMonFrontPic_Cleffa[];
extern const u32 gMonPalette_Cleffa[];
extern const u32 gMonBackPic_Cleffa[];
@@ -2860,6 +2860,7 @@ extern const u32 gMonPalette_CircledQuestionMark[];
extern const u32 gMonShinyPalette_CircledQuestionMark[];
extern const u32 gMonStillFrontPic_CircledQuestionMark[];
extern const u8 gMonIcon_QuestionMark[];
+extern const u8 gMonFootprint_QuestionMark[];
extern const u32 gMonFrontPic_DoubleQuestionMark[];
extern const u32 gMonBackPic_DoubleQuestionMark[];
extern const u32 gMonPalette_DoubleQuestionMark[];
@@ -4732,4 +4733,7 @@ extern const u32 gUnknown_08D927EC[];
extern const u32 gSlotMachineReelTime_Gfx[];
+extern const u32 gUnknown_08D8D410[];
+extern const u32 gUnknown_08D8D58C[];
+
#endif //GUARD_GRAPHICS_H