diff options
| author | garak <garakmon@gmail.com> | 2018-11-27 13:31:07 -0500 |
|---|---|---|
| committer | garak <garakmon@gmail.com> | 2018-11-27 13:31:07 -0500 |
| commit | 50f00b0827a4952a12f90009bd992f23c80a56af (patch) | |
| tree | 6a5f78b04b42c162ed95cfc66c91a8b24f4051b2 /include/graphics.h | |
| parent | f02cb667bbddf4f4a1152c86cbf9616468e7f0d2 (diff) | |
| parent | c909aa92dee0a8d202d9195d80d0cc96b0d1ebc8 (diff) | |
Merge remote-tracking branch 'upstream/master' into fldeff
Diffstat (limited to 'include/graphics.h')
| -rw-r--r-- | include/graphics.h | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/include/graphics.h b/include/graphics.h index a2c86a67d..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[]; @@ -4697,6 +4698,20 @@ extern const u32 gBattleAnimBackgroundTilemap_17[]; extern const u32 gBattleAnimBackgroundTilemap_20[]; extern const u32 gBattleAnimBackgroundTilemap_21[]; +extern const u32 gUnknown_08C20668[]; +extern const u32 gUnknown_08C20684[]; +extern const u32 gBattleStatMask_Gfx[]; +extern const u32 gBattleStatMask1_Tilemap[]; +extern const u32 gBattleStatMask2_Tilemap[]; +extern const u32 gBattleStatMask1_Pal[]; +extern const u32 gBattleStatMask2_Pal[]; +extern const u32 gBattleStatMask3_Pal[]; +extern const u32 gBattleStatMask4_Pal[]; +extern const u32 gBattleStatMask5_Pal[]; +extern const u32 gBattleStatMask6_Pal[]; +extern const u32 gBattleStatMask7_Pal[]; +extern const u32 gBattleStatMask8_Pal[]; + extern const u32 gUnknown_08D9A88C[]; extern const u32 gContestMiscGfx[]; extern const u32 gContestAudienceGfx[]; @@ -4718,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 |