summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDiegoisawesome <Diegoisawesome@users.noreply.github.com>2018-12-19 19:16:40 -0600
committerGitHub <noreply@github.com>2018-12-19 19:16:40 -0600
commit5b73fe138cf06f176ca2c2184b8ea004acb9545b (patch)
tree1a55c0049b9e33b705f4aa247c9c0e22482ab941 /include
parent864b38317748ff0b2b743dc48a9828bbc720fdc1 (diff)
parent6f0dd694eadfbee15faec38c59d37b0c4364445e (diff)
Merge pull request #457 from golemgalvanize/decompile_water
Decompile water
Diffstat (limited to 'include')
-rw-r--r--include/battle_anim.h3
-rw-r--r--include/graphics.h7
2 files changed, 10 insertions, 0 deletions
diff --git a/include/battle_anim.h b/include/battle_anim.h
index b25822992..5b62e594b 100644
--- a/include/battle_anim.h
+++ b/include/battle_anim.h
@@ -183,6 +183,9 @@ u8 GetSubstituteSpriteDefault_Y(u8 battlerId);
#define STAT_ANIM_MULTIPLE_MINUS2 58
void LaunchStatusAnimation(u8 battlerId, u8 statusAnimId);
+// ground.c
+void sub_81152DC(u8 taskId);
+
// battle_anim_8170478.s
u8 ItemIdToBallId(u16 itemId);
u8 AnimateBallOpenParticles(u8 x, u8 y, u8 priority, u8 subpriority, u8 ballId);
diff --git a/include/graphics.h b/include/graphics.h
index 48e4532ac..4f7a71b49 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -4736,6 +4736,13 @@ extern const u32 gUnknown_08C16FA8[];
extern const u32 gUnknown_08C16E90[];
extern const u32 gUnknown_08C17170[];
+extern const u32 gUnknown_08D95E00[];
+extern const u32 gUnknown_08D960D0[];
+extern const u32 gUnknown_08D963A4[];
+extern const u32 gBattleAnimBackgroundImage_Surf[];
+extern const u32 gBattleAnimBackgroundPalette_Surf[];
+extern const u32 gBattleAnimBackgroundImageMuddyWater_Pal[];
+
// Berry blender
extern const u32 gBerryBlenderArrowTiles[];
extern const u32 gBerryBlenderStartTiles[];