Port emerald water functions into firered

src/battle_anim_mons.c

@@ -2225,7 +2225,7 @@ static void sub_80772F4(struct Sprite *sprite)
         DestroyAnimSprite(sprite);
 }
 
-void sub_8077350(struct Sprite *sprite)
+void AnimWeatherBallDown(struct Sprite *sprite)
 {
     s32 x;
 

src/battle_anim_status_effects.c

@@ -87,7 +87,7 @@ const struct SpriteTemplate gSpriteTemplate_83BF44C =
     .anims = sSpriteAnimTable_83BF430,
     .images = NULL,
     .affineAnims = gDummySpriteAffineAnimTable,
-    .callback = sub_8077350,
+    .callback = AnimWeatherBallDown,
 };
 
 static const union AnimCmd sUnknown_83BF464[] =

src/fire.c

@@ -337,7 +337,7 @@ const struct SpriteTemplate gUnknown_83E5E14 =
     .anims = gUnknown_83E5D48,
     .images = NULL,
     .affineAnims = gDummySpriteAffineAnimTable,
-    .callback = sub_8077350,
+    .callback = AnimWeatherBallDown,
 };
 
 static const struct SpriteTemplate gUnknown_83E5E2C =

src/graphics.c

@@ -1019,7 +1019,7 @@ const u32 gBattleAnimBgTilemap_InAir[] = INCBIN_U32("graphics/battle_anims/backg
 const u32 gBattleAnimSpriteGfx_Protect[] = INCBIN_U32("graphics/battle_anims/sprites/protect.4bpp.lz");
 const u32 gBattleAnimSpritePal_Protect[] = INCBIN_U32("graphics/battle_anims/sprites/protect.gbapal.lz");
 
-const u32 gFile_graphics_battle_anims_backgrounds_water_muddy_palette[] = INCBIN_U32("graphics/battle_anims/backgrounds/water_muddy.gbapal.lz");
+const u32 gBattleAnimBgPalette_MuddyWater[] = INCBIN_U32("graphics/battle_anims/backgrounds/water_muddy.gbapal.lz");
 
 const u32 gFile_graphics_battle_interface_enemy_mon_shadow_sheet[] = INCBIN_U32("graphics/battle_interface/enemy_mon_shadow.4bpp.lz");
 
@@ -1085,11 +1085,13 @@ const u32 gBattleAnimSpritePal_Bird[] = INCBIN_U32("graphics/battle_anims/sprite
 const u32 gBattleAnimSpriteGfx_CrossImpact[] = INCBIN_U32("graphics/battle_anims/sprites/cross_impact.4bpp.lz");
 const u32 gBattleAnimSpritePal_CrossImpact[] = INCBIN_U32("graphics/battle_anims/sprites/cross_impact.gbapal.lz");
 
-const u32 gFile_graphics_battle_anims_backgrounds_water_sheet[] = INCBIN_U32("graphics/battle_anims/backgrounds/water.4bpp.lz");
-const u32 gFile_graphics_battle_anims_backgrounds_water_palette[] = INCBIN_U32("graphics/battle_anims/backgrounds/water.gbapal.lz");
-const u32 gFile_graphics_unknown_unknown_E81D14_tilemap[] = INCBIN_U32("graphics/unknown/unknown_E81D14.bin.lz");
-const u32 gFile_graphics_unknown_unknown_E81FE4_tilemap[] = INCBIN_U32("graphics/unknown/unknown_E81FE4.bin.lz");
-const u32 gFile_graphics_unknown_unknown_E822B8_tilemap[] = INCBIN_U32("graphics/unknown/unknown_E822B8.bin.lz");
+const u32 gBattleAnimBgImage_Surf[] = INCBIN_U32("graphics/battle_anims/backgrounds/water.4bpp.lz");
+const u32 gBattleAnimBgPalette_Surf[] = INCBIN_U32("graphics/battle_anims/backgrounds/water.gbapal.lz");
+
+// TODO Rename and move graphics
+const u32 gBattleAnimBgTilemap_SurfOpponent[] = INCBIN_U32("graphics/battle_anims/backgrounds/water_opponent.bin.lz");
+const u32 gBattleAnimBgTilemap_SurfPlayer[] = INCBIN_U32("graphics/battle_anims/backgrounds/water_player.bin.lz");
+const u32 gBattleAnimBgTilemap_SurfContest[] = INCBIN_U32("graphics/battle_anims/backgrounds/water_contest.bin.lz");
 
 const u32 gBattleAnimSpritePal_Slash2[] = INCBIN_U32("graphics/battle_anims/sprites/slash_2.gbapal.lz");
 

src/ground.c

@@ -538,7 +538,7 @@ static void AnimDigDirtMound(struct Sprite *sprite)
     sprite->callback = WaitAnimForDuration;
 }
 
-void sub_80B94B4(u8 taskId)
+void AnimTask_HorizontalShake(u8 taskId)
 {
     u16 i;
     struct Task *task = &gTasks[taskId];

src/ice.c

@@ -130,7 +130,7 @@ static const union AnimCmd *const gUnknown_83E632C[] =
     gUnknown_83E6308,
 };
 
-const union AnimCmd *const gUnknown_83E6330[] =
+const union AnimCmd *const gAnims_SmallBubblePair[] =
 {
     gUnknown_83E6310,
 };
@@ -432,7 +432,7 @@ const struct SpriteTemplate gUnknown_83E65BC =
     .anims = gDummySpriteAnimTable,
     .images = NULL,
     .affineAnims = gUnknown_83E65A0,
-    .callback = sub_8077350,
+    .callback = AnimWeatherBallDown,
 };
 
 static const union AnimCmd gUnknown_83E65D4[] =

src/normal.c

@@ -186,7 +186,7 @@ const struct SpriteTemplate gUnknown_83E7C20 =
     .callback = sub_80BA5F8,
 };
 
-const struct SpriteTemplate gUnknown_83E7C38 =
+const struct SpriteTemplate gWaterHitSplatSpriteTemplate =
 {
     .tileTag = ANIM_TAG_WATER_IMPACT,
     .paletteTag = ANIM_TAG_WATER_IMPACT,

src/poison.c

@@ -134,7 +134,7 @@ static const union AffineAnimCmd gUnknown_83E6A68[] =
     AFFINEANIMCMD_JUMP(0),
 };
 
-const union AffineAnimCmd *const gUnknown_83E6A80[] =
+const union AffineAnimCmd *const gAffineAnims_Droplet[] =
 {
     gUnknown_83E6A68,
 };
@@ -146,7 +146,7 @@ const struct SpriteTemplate gUnknown_83E6A84 =
     .oam = &gOamData_AffineDouble_ObjNormal_16x16,
     .anims = gUnknown_83E69E0,
     .images = NULL,
-    .affineAnims = gUnknown_83E6A80,
+    .affineAnims = gAffineAnims_Droplet,
     .callback = sub_80B17C4,
 };
 
@@ -178,7 +178,7 @@ const struct SpriteTemplate gWaterBubbleSpriteTemplate =
     .tileTag = ANIM_TAG_SMALL_BUBBLES,
     .paletteTag = ANIM_TAG_SMALL_BUBBLES,
     .oam = &gOamData_AffineNormal_ObjBlend_16x16,
-    .anims = gUnknown_83E5A78,
+    .anims = gAnims_WaterBubble,
     .images = NULL,
     .affineAnims = gUnknown_83E6AB4,
     .callback = AnimBubbleEffect,

src/rock.c

@@ -100,7 +100,7 @@ const struct SpriteTemplate gUnknown_83E7420 =
     .tileTag = ANIM_TAG_WATER_ORB,
     .paletteTag = ANIM_TAG_WATER_ORB,
     .oam = &gOamData_AffineNormal_ObjBlend_16x16,
-    .anims = gUnknown_83E5958,
+    .anims = gAnims_WaterMudOrb,
     .images = NULL,
     .affineAnims = gUnknown_83E741C,
     .callback = sub_80B477C,
@@ -310,7 +310,7 @@ const struct SpriteTemplate gUnknown_83E7590 =
     .anims = gUnknown_83E74B0,
     .images = NULL,
     .affineAnims = gUnknown_83E7540,
-    .callback = sub_8077350,
+    .callback = AnimWeatherBallDown,
 };
 
 static void sub_80B4634(struct Sprite *sprite)