summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorjiangzhengwenjz <jiangzhengwenjzw@qq.com>2019-11-08 10:30:17 +0800
committerjiangzhengwenjz <jiangzhengwenjzw@qq.com>2019-11-09 12:26:53 +0800
commit94c1924ed8849ccd2bbc7c3f3f4d28400edf72d5 (patch)
tree3708cbadf4c47b8ee06232ab145b20debde976a2 /include
parent7e4a3697cd6587e78b07eb8899cc142cca6bb583 (diff)
ice
Diffstat (limited to 'include')
-rw-r--r--include/battle_anim.h11
-rw-r--r--include/graphics.h6
2 files changed, 16 insertions, 1 deletions
diff --git a/include/battle_anim.h b/include/battle_anim.h
index 849b92f57..17f18ccc2 100644
--- a/include/battle_anim.h
+++ b/include/battle_anim.h
@@ -84,6 +84,11 @@ extern struct OamData gOamData_83AC9E0;
extern struct OamData gOamData_83ACA20;
extern struct OamData gOamData_83ACA80;
extern struct OamData gOamData_83ACAA0;
+extern struct OamData gOamData_83ACBE8;
+extern struct OamData gOamData_83ACAE8;
+extern struct OamData gOamData_83ACB88;
+extern struct OamData gOamData_83ACB48;
+extern struct OamData gOamData_83ACB28;
void ClearBattleAnimationVars(void);
void DoMoveAnim(u16 move);
@@ -357,6 +362,12 @@ void sub_80B2868(u8 taskId);
// fighting.c
void sub_80B1530(u8 taskId);
+// ice.c
+void AnimTask_Haze1(u8 taskId);
+void AnimTask_LoadMistTiles(u8 taskId);
+void AnimTask_Hail1(u8 taskId);
+void AnimTask_GetRolloutCounter(u8 taskId);
+
// water.s
extern const union AnimCmd *const gUnknown_83E5958[];
extern const union AnimCmd *const gUnknown_83E5A78[];
diff --git a/include/graphics.h b/include/graphics.h
index bc87e4d53..340b737aa 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -2915,7 +2915,6 @@ extern const u8 gBerryFixWindow_Tilemap[];
extern const u8 gBerryFixWindow_Pal[];
// item_pc
-
extern const u8 gItemPcTiles[];
extern const u32 gItemPcBgPals[];
extern const u8 gItemPcTilemap[];
@@ -3736,6 +3735,11 @@ extern const u32 gSubstituteDollGfx[];
extern const u32 gSubstituteDollTilemap[];
extern const u32 gSubstituteDollPal[];
+// ice
+extern const u8 gWeatherFog1Tiles[];
+extern const u32 gBattleAnimFogTilemap[];
+extern const u16 gUnknown_83C2CE0[];
+
// credits
extern const u32 gCreditsPokeballBgGfxTiles[];
extern const u32 gCreditsPokeballBgGfxMap[];