Merge pull request #465 from golemgalvanize/decompile_ice

Decompile ice

data/battle_anim_scripts.s

@@ -3484,7 +3484,7 @@ Move_HAIL:
 	loadspritegfx ANIM_TAG_ICE_CRYSTALS
 	createvisualtask sub_8116620, 10, 1, 3, 0, 6, RGB_BLACK
 	waitforvisualfinish
-	createvisualtask sub_810C918, 5
+	createvisualtask AnimTask_Hail1, 5
 	loopsewithpan SE_W258, 0, 8, 10
 	waitforvisualfinish
 	createvisualtask sub_8116620, 10, 1, 3, 6, 0, RGB_BLACK
@@ -3956,7 +3956,7 @@ Move_MIST_BALL:
 	createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 1, 1, 1, RGB(23, 16, 31), 16, 0x7FFF, 16
 	delay 0
 	playsewithpan SE_W114, 0
-	createvisualtask sub_810C324, 5
+	createvisualtask AnimTask_LoadMistTiles, 5
 	createvisualtask sub_8116620, 10, 4, 3, 0, 16, RGB_WHITE
 	delay 8
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 4, 0, 70, 0
@@ -6937,7 +6937,7 @@ Mist1:
 Move_HAZE:
 	waitforvisualfinish
 	playsewithpan SE_W114, 0
-	createvisualtask sub_810C0A0, 5
+	createvisualtask AnimTask_Haze1, 5
 	delay 30
 	createvisualtask sub_8116620, 10, 0x780, 2, 0, 16, RGB_BLACK
 	delay 0x5A

include/battle_anim.h

@@ -172,6 +172,10 @@ void oamt_add_pos2_onto_pos1(struct Sprite *sprite);
 u8 GetBattlerSpriteDefault_Y(u8 battlerId);
 u8 GetSubstituteSpriteDefault_Y(u8 battlerId);
 
+// battle_anim_80A64EC.c
+void sub_80A64EC(struct Sprite *sprite);
+void sub_80A718C(struct Sprite *sprite);
+
 // battle_anim_80A9C70.s
 #define STAT_ANIM_PLUS1  15
 #define STAT_ANIM_PLUS2  39

include/field_weather.h

@@ -134,6 +134,10 @@ struct Weather
 // field_weather.c
 extern struct Weather gWeather;
 extern struct Weather *const gWeatherPtr;
+extern const u16 gUnknown_083970E8[];
+
+// field_weather_effect.c
+extern const u8 gWeatherFog1Tiles[];
 
 void StartWeather(void);
 void ChangeWeather(u8 weather);

include/graphics.h

@@ -4748,6 +4748,8 @@ extern const u32 gBattleAnimBackgroundImage_Surf[];
 extern const u32 gBattleAnimBackgroundPalette_Surf[];
 extern const u32 gBattleAnimBackgroundImageMuddyWater_Pal[];
 
+extern const u32 gBattleAnimFogTilemap[];
+
 // Berry blender
 extern const u32 gBerryBlenderArrowTiles[];
 extern const u32 gBerryBlenderStartTiles[];

ld_script.txt

@@ -162,7 +162,7 @@ SECTIONS {
         src/water.o(.text);
         src/fire.o(.text);
         src/electric.o(.text);
-        asm/ice.o(.text);
+        src/ice.o(.text);
         src/fight.o(.text);
         src/poison.o(.text);
         asm/flying.o(.text);