summaryrefslogtreecommitdiff
path: root/include/graphics.h
diff options
context:
space:
mode:
authorluckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com>2020-06-13 13:40:57 -0400
committerluckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com>2020-06-13 13:40:57 -0400
commite2eb17dcbd8f9021b7e9fc805c8c03fac6b3b255 (patch)
tree5705aaca2ef0713f55ca22a4a814161e26aa4582 /include/graphics.h
parent1ce33843b645e3139bd414c2d048c628967f4e07 (diff)
parentf75c048434d5dc7538e628206c29a0730404db81 (diff)
Merge branch 'master' of https://github.com/pret/pokefirered
Diffstat (limited to 'include/graphics.h')
-rw-r--r--include/graphics.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/include/graphics.h b/include/graphics.h
index 40a41b87e..35ef29391 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -4241,6 +4241,7 @@ extern const u32 gBattleAnimBgImage_Cosmic[];
extern const u32 gBattleAnimBgImage_InAir[];
extern const u32 gBattleAnimBgImage_Aurora[];
extern const u32 gBattleAnimBgImage_Fissure[];
+extern const u32 gBattleAnimBgImage_Surf[];
extern const u32 gBattleAnimBgPalette_Dark[];
extern const u32 gBattleAnimBgPalette_Ghost[];
extern const u32 gBattleAnimBgPalette_Psychic[];
@@ -4252,11 +4253,13 @@ extern const u32 gBattleAnimBgPalette_Guillotine[];
extern const u32 gBattleAnimBgPalette_Ice[];
extern const u32 gBattleAnimBgPalette_Cosmic[];
extern const u32 gBattleAnimBgPalette_InAir[];
+extern const u32 gBattleAnimBgPalette_MuddyWater[];
extern const u32 gBattleAnimBgPalette_Sky[];
extern const u32 gBattleAnimBgPalette_Aurora[];
extern const u32 gBattleAnimBgPalette_Fissure[];
extern const u32 gBattleAnimBgPalette_Bug[];
extern const u32 gBattleAnimBgPalette_Solarbeam[];
+extern const u32 gBattleAnimBgPalette_Surf[];
extern const u32 gBattleAnimBgTilemap_Dark[];
extern const u32 gBattleAnimBgTilemap_Ghost[];
extern const u32 gBattleAnimBgTilemap_Psychic[];
@@ -4276,6 +4279,9 @@ extern const u32 gBattleAnimBgTilemap_Cosmic[];
extern const u32 gBattleAnimBgTilemap_InAir[];
extern const u32 gBattleAnimBgTilemap_Aurora[];
extern const u32 gBattleAnimBgTilemap_Fissure[];
+extern const u32 gBattleAnimBgTilemap_SurfOpponent[];
+extern const u32 gBattleAnimBgTilemap_SurfPlayer[];
+extern const u32 gBattleAnimBgTilemap_SurfContest[];
// dark
extern const u32 gMetalShineGfx[];