resolve compiler errors

asm/smokescreen.s

@@ -5,8 +5,8 @@
 
 	.text
 
-	thumb_func_start sub_804A76C
+	thumb_func_start SmokescreenImpact
-sub_804A76C: @ 804A76C
+SmokescreenImpact: @ 804A76C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -156,7 +156,7 @@ _0804A8B0: .4byte sub_804A8C0
 _0804A8B4: .4byte gSprites
 _0804A8B8: .4byte gUnknown_82509F4
 _0804A8BC: .4byte 0xfff00000
-	thumb_func_end sub_804A76C
+	thumb_func_end SmokescreenImpact
 
 	thumb_func_start sub_804A8C0
 sub_804A8C0: @ 804A8C0

asm/water.s

@@ -3493,8 +3493,8 @@ _080AC6D0:
 	bx r0
 	thumb_func_end sub_80AC698
 
-	thumb_func_start sub_80AC6D8
+	thumb_func_start AnimWaterPulseRing
-sub_80AC6D8: @ 80AC6D8
+AnimWaterPulseRing: @ 80AC6D8
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r1, 0x1
@@ -3526,7 +3526,7 @@ sub_80AC6D8: @ 80AC6D8
 _080AC714: .4byte gBattleAnimTarget
 _080AC718: .4byte gBattleAnimArgs
 _080AC71C: .4byte sub_80AC720
-	thumb_func_end sub_80AC6D8
+	thumb_func_end AnimWaterPulseRing
 
 	thumb_func_start sub_80AC720
 sub_80AC720: @ 80AC720

data/battle_anim_scripts.s

@@ -970,7 +970,7 @@ gUnknown_81C7D89:: @ 81C7D89
 	delay 2
 	createvisualtask AnimTask_IsContest, 2, 
 	jumpargeq 7, 1, gUnknown_81C7DC0
-	createvisualtask sub_80DEAB4, 2, 
+	createvisualtask AnimTask_IsTargetPlayerSide, 2, 
 	jumpargeq 7, 0, gUnknown_81C7DB2
 	jumpargeq 7, 1, gUnknown_81C7DB9
 
@@ -1444,12 +1444,12 @@ Move_FURY_CUTTER:: @ 81C88EA
 	monbg 1
 	setalpha 12, 8
 	playsewithpan SE_W013, 63
-	createvisualtask sub_80AAB7C, 2, 
+	createvisualtask AnimTask_IsFuryCutterHitRight, 2, 
 	jumpargeq 7, 0, gUnknown_81C8947
 	goto gUnknown_81C8959
 
 gUnknown_81C890A:: @ 81C890A
-	createvisualtask update_fury_cutter_counter_copy, 2, 
+	createvisualtask AnimTask_GetFuryCutterHitCount, 2, 
 	jumpargeq 7, 1, gUnknown_81C892E
 	jumpargeq 7, 2, gUnknown_81C896B
 	jumpargeq 7, 3, gUnknown_81C8985
@@ -1689,7 +1689,7 @@ Move_DEFENSE_CURL:: @ 81C8F1C
 	loadspritegfx 10234
 	loopsewithpan SE_W161, 192, 18, 3
 	createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, 0, 0
-	createvisualtask sub_80DF524, 5, 
+	createvisualtask AnimTask_DefenseCurlDeformMon, 5, 
 	waitforvisualfinish
 	createsprite gEclipsingOrbSpriteTemplate, ANIM_ATTACKER, 2, 0, 6, 0, 1
 	waitforvisualfinish
@@ -2041,7 +2041,7 @@ Move_ATTRACT:: @ 81C985A
 	createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, -384, -31
 	waitforvisualfinish
 	waitplaysewithpan SE_W213B, 0, 15
-	createvisualtask sub_80A9CE8, 5, 
+	createvisualtask AnimTask_HeartsBackground, 5, 
 	createsprite gRedHeartRisingSpriteTemplate, ANIM_ATTACKER, 40, 16, 256, 0
 	createsprite gRedHeartRisingSpriteTemplate, ANIM_ATTACKER, 40, 224, 240, 15
 	createsprite gRedHeartRisingSpriteTemplate, ANIM_ATTACKER, 40, 126, 272, 30
@@ -2370,7 +2370,7 @@ Move_CONVERSION:: @ 81C9FA9
 	playsewithpan SE_W112, 192
 	createvisualtask sub_80B9F6C, 2, 10018, 1, 1, 14335, 12, 0, 0
 	delay 6
-	createvisualtask sub_80A5CD4, 5, 
+	createvisualtask AnimTask_ConversionAlphaBlend, 5, 
 	waitforvisualfinish
 	delay 1
 	clearmonbg 2
@@ -2400,7 +2400,7 @@ Move_CONVERSION_2:: @ 81CA0BE
 	createsprite gConversion2SpriteTemplate, ANIM_ATTACKER, 2, -8, 24, 125
 	createsprite gConversion2SpriteTemplate, ANIM_ATTACKER, 2, 8, 24, 130
 	createsprite gConversion2SpriteTemplate, ANIM_ATTACKER, 2, 24, 24, 135
-	createvisualtask sub_80A5DE0, 5, 
+	createvisualtask AnimTask_Conversion2AlphaBlend, 5, 
 	delay 60
 	playsewithpan SE_W129, 63
 	delay 10
@@ -2574,8 +2574,8 @@ gUnknown_81CA50A:: @ 81CA50A
 Move_THRASH:: @ 81CA521
 	loadspritegfx 10135
 	loadspritegfx 10143
-	createvisualtask sub_80A8638, 2, 
+	createvisualtask AnimTask_ThrashMoveMonHorizontal, 2, 
-	createvisualtask sub_80A86A4, 2, 
+	createvisualtask AnimTask_ThrashMoveMonVertical, 2, 
 	createsprite gUnknown_83E6728, ANIM_TARGET, 3, 1, 10, 0
 	createvisualtask AnimTask_ShakeMonInPlace, 2, 1, 4, 0, 7, 1
 	playsewithpan SE_W004, 63
@@ -2621,7 +2621,7 @@ Move_SING:: @ 81CA5A0
 	delay 4
 	waitforvisualfinish
 	clearmonbg 3
-	createvisualtask sub_80A66A0, 2, 
+	createvisualtask AnimTask_MusicNotesClearRainbowBlend, 2, 
 	waitforvisualfinish
 	end
 
@@ -2824,7 +2824,7 @@ Move_TELEPORT:: @ 81CAA92
 Move_DOUBLE_TEAM:: @ 81CAAAB
 	monbg 2
 	setalpha 12, 8
-	createvisualtask sub_80A63B4, 2, 
+	createvisualtask AnimTask_DoubleTeam, 2, 
 	playsewithpan SE_W104, 192
 	delay 32
 	playsewithpan SE_W104, 192
@@ -2850,7 +2850,7 @@ Move_DOUBLE_TEAM:: @ 81CAAAB
 
 Move_MINIMIZE:: @ 81CAAF2
 	setalpha 10, 8
-	createvisualtask sub_80A8074, 2, 
+	createvisualtask AnimTask_Minimize, 2, 
 	loopsewithpan SE_W107, 192, 34, 3
 	waitforvisualfinish
 	blendoff
@@ -2892,7 +2892,7 @@ gUnknown_81CAB49:: @ 81CAB49
 
 gUnknown_81CAB86:: @ 81CAB86
 	loadspritegfx 10135
-	createvisualtask sub_80A5694, 2, 0
+	createvisualtask AnimTask_SkullBashPosition, 2, 0
 	playsewithpan SE_W036, 192
 	waitforvisualfinish
 	playse SE_BAN
@@ -2902,7 +2902,7 @@ gUnknown_81CAB86:: @ 81CAB86
 	createsprite gUnknown_83E7C98, ANIM_TARGET, 4, 0, 0, 1, 0
 	loopsewithpan SE_W025B, 63, 8, 3
 	waitforvisualfinish
-	createvisualtask sub_80A5694, 2, 1
+	createvisualtask AnimTask_SkullBashPosition, 2, 1
 	goto gUnknown_81CAB38
 
 Move_AMNESIA:: @ 81CABF5
@@ -3043,7 +3043,7 @@ Move_FLASH:: @ 81CAEB3
 	end
 
 Move_SPLASH:: @ 81CAEC0
-	createvisualtask sub_80A8338, 2, 0, 3
+	createvisualtask AnimTask_Splash, 2, 0, 3
 	delay 8
 	loopsewithpan SE_W039, 192, 38, 3
 	waitforvisualfinish
@@ -3122,7 +3122,7 @@ Move_SKETCH:: @ 81CB01B
 	createsprite gPencilSpriteTemplate, ANIM_TARGET, 2, 
 	waitforvisualfinish
 	clearmonbg 1
-	createvisualtask sub_80A8338, 2, 0, 2
+	createvisualtask AnimTask_Splash, 2, 0, 2
 	loopsewithpan SE_W039, 192, 38, 2
 	end
 
@@ -4078,7 +4078,7 @@ Move_TEETER_DANCE:: @ 81CC371
 
 Move_MUD_SPORT:: @ 81CC3DC
 	loadspritegfx 10074
-	createvisualtask sub_80A8338, 2, 0, 6
+	createvisualtask AnimTask_Splash, 2, 0, 6
 	delay 24
 	createsprite gUnknown_83E7A94, ANIM_TARGET, 2, 0, -4, -16
 	createsprite gUnknown_83E7A94, ANIM_TARGET, 2, 0, 4, -12
@@ -4328,7 +4328,7 @@ Move_GRASS_WHISTLE:: @ 81CC9E9
 	createsprite gWavyMusicNotesSpriteTemplate, ANIM_TARGET, 2, 5, 1, 0
 	delay 4
 	waitforvisualfinish
-	createvisualtask sub_80A66A0, 2, 
+	createvisualtask AnimTask_MusicNotesClearRainbowBlend, 2, 
 	createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 4, 4, 0, 13298
 	waitforvisualfinish
 	end
@@ -4675,7 +4675,7 @@ Move_BELLY_DRUM:: @ 81CD0C0
 	createsprite gSlowFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 3, 0
 	playsewithpan SE_W187, 192
 	waitforvisualfinish
-	createvisualtask sub_80A66A0, 2, 
+	createvisualtask AnimTask_MusicNotesClearRainbowBlend, 2, 
 	waitforvisualfinish
 	end
 
@@ -8112,7 +8112,7 @@ Move_HYPER_FANG:: @ 81D2165
 	delay 2
 	createvisualtask AnimTask_IsContest, 2, 
 	jumpargeq 7, 1, gUnknown_81D21C5
-	createvisualtask sub_80DEAB4, 2, 
+	createvisualtask AnimTask_IsTargetPlayerSide, 2, 
 	jumpargeq 7, 0, gUnknown_81D21B7
 	goto gUnknown_81D21BE
 
@@ -9019,7 +9019,7 @@ gUnknown_81D363A:: @ 81D363A
 	delay 1
 	createvisualtask AnimTask_IsContest, 2, 
 	jumpargeq 7, 1, gUnknown_81D36F3
-	createvisualtask sub_80DEAB4, 2, 
+	createvisualtask AnimTask_IsTargetPlayerSide, 2, 
 	jumpargeq 7, 0, gUnknown_81D36E5
 	jumpargeq 7, 1, gUnknown_81D36EC
 
@@ -10405,7 +10405,7 @@ gUnknown_81D59FF:: @ 81D59FF
 gUnknown_81D5A07:: @ 81D5A07
 	createvisualtask AnimTask_IsContest, 2, 
 	jumpargeq 7, 1, gUnknown_81D5A2C
-	createvisualtask sub_80DEAB4, 2, 
+	createvisualtask AnimTask_IsTargetPlayerSide, 2, 
 	jumpargeq 7, 0, gUnknown_81D5A3A
 	goto gUnknown_81D5A33
 

data/graphics.s

@@ -2008,15 +2008,15 @@ gBattleAnimSpritePal_RedHeart:: @ 8D23494
 	.incbin "graphics/battle_anims/sprites/216.gbapal.lz"
 
 	.align 2
-gFile_graphics_battle_anims_backgrounds_attract_sheet:: @ 8D234B4
+gBattleAnimBg_AttractGfx:: @ 8D234B4
 	.incbin "graphics/battle_anims/backgrounds/attract.4bpp.lz"
 
 	.align 2
-gFile_graphics_battle_anims_backgrounds_attract_palette:: @ 8D23F24
+gBattleAnimBg_AttractPal:: @ 8D23F24
 	.incbin "graphics/battle_anims/backgrounds/attract.gbapal.lz"
 
 	.align 2
-gFile_graphics_battle_anims_backgrounds_attract_tilemap:: @ 8D23F4C
+gBattleAnimBg_AttractTilemap:: @ 8D23F4C
 	.incbin "graphics/battle_anims/backgrounds/attract.bin.lz"
 
 	.align 2
@@ -2056,11 +2056,11 @@ gBattleAnimSpritePal_MovementWaves:: @ 8D24B80
 	.incbin "graphics/battle_anims/sprites/215.gbapal.lz"
 
 	.align 2
-gFile_graphics_battle_anims_backgrounds_scary_face_palette:: @ 8D24BA4
+gBattleAnim_ScaryFacePal:: @ 8D24BA4
 	.incbin "graphics/battle_anims/backgrounds/scary_face.gbapal.lz"
 
 	.align 2
-gFile_graphics_battle_anims_backgrounds_scary_face_sheet:: @ 8D24BCC
+gBattleAnim_ScaryFaceGfx:: @ 8D24BCC
 	.incbin "graphics/battle_anims/backgrounds/scary_face.4bpp.lz"
 
 	.align 2
@@ -2304,15 +2304,15 @@ gBattleAnimBgTilemap_HighspeedPlayer:: @ 8D2A510
 	.incbin "graphics/battle_anims/backgrounds/10.bin.lz"
 
 	.align 2
-gFile_graphics_battle_anims_masks_morning_sun_sheet:: @ 8D2A808
+gBattleAnim_MorningSunGfx:: @ 8D2A808
 	.incbin "graphics/battle_anims/masks/morning_sun.4bpp.lz"
 
 	.align 2
-gFile_graphics_battle_anims_masks_morning_sun_palette:: @ 8D2A8A8
+gBattleAnim_MorningSunPal:: @ 8D2A8A8
 	.incbin "graphics/battle_anims/masks/morning_sun.gbapal.lz"
 
 	.align 2
-gFile_graphics_battle_anims_masks_morning_sun_tilemap:: @ 8D2A8C0
+gBattleAnim_MorningSunTilemap:: @ 8D2A8C0
 	.incbin "graphics/battle_anims/masks/morning_sun.bin.lz"
 
 	.align 2
@@ -2460,7 +2460,7 @@ gBattleStatMask8_Pal:: @ 8D2DE1C
 	.incbin "graphics/battle_anims/masks/stat8.gbapal.lz"
 
 	.align 2
-gFile_graphics_battle_anims_masks_cure_bubbles_sheet:: @ 8D2DE3C
+gCureBubblesGfx:: @ 8D2DE3C
 	.incbin "graphics/battle_anims/masks/cure_bubbles.4bpp.lz"
 
 	.align 2
@@ -2468,7 +2468,7 @@ gCureBubblesPal:: @ 8D2DF78
 	.incbin "graphics/battle_anims/masks/cure_bubbles.gbapal.lz"
 
 	.align 2
-gFile_graphics_battle_anims_masks_cure_bubbles_tilemap:: @ 8D2DF98
+gCureBubblesTilemap:: @ 8D2DF98
 	.incbin "graphics/battle_anims/masks/cure_bubbles.bin.lz"
 
 	.align 2
@@ -2500,11 +2500,11 @@ gBattleAnimSpriteGfx_NoiseLine:: @ 8D2EA04
 	.incbin "graphics/battle_anims/sprites/053.4bpp.lz"
 
 	.align 2
-gFile_graphics_battle_anims_masks_unknown_D2EC24_sheet:: @ 8D2EC24
+gUnknown_D2EC24_Gfx:: @ 8D2EC24
 	.incbin "graphics/battle_anims/masks/unknown_D2EC24.4bpp.lz"
 
 	.align 2
-gFile_graphics_battle_anims_masks_unknown_D2EC24_tilemap:: @ 8D2EC70
+gUnknown_D2EC24_Tilemap:: @ 8D2EC70
 	.incbin "graphics/battle_anims/masks/unknown_D2EC24.bin.lz"
 
 	.align 2
@@ -13772,15 +13772,15 @@ gBattleAnimSpriteGfx_WeatherBall:: @ 8E7F388
 	.incbin "graphics/battle_anims/sprites/283.4bpp.lz"
 
 	.align 2
-gFile_graphics_battle_anims_backgrounds_scary_face_player_tilemap:: @ 8E7F4AC
+gBattleAnimBgTilemap_ScaryFacePlayer:: @ 8E7F4AC
 	.incbin "graphics/battle_anims/backgrounds/scary_face_player.bin.lz"
 
 	.align 2
-gFile_graphics_battle_anims_backgrounds_scary_face_opponent_tilemap:: @ 8E7F690
+gBattleAnimBgTilemap_ScaryFaceOpponent:: @ 8E7F690
 	.incbin "graphics/battle_anims/backgrounds/scary_face_opponent.bin.lz"
 
 	.align 2
-gFile_graphics_battle_anims_backgrounds_scary_face_contest_tilemap:: @ 8E7F874
+gBattleAnimBgTilemap_ScaryFaceContest:: @ 8E7F874
 	.incbin "graphics/battle_anims/backgrounds/scary_face_contest.bin.lz"
 
 	.align 2

include/battle_anim.h

@@ -454,6 +454,7 @@ void sub_80AD800(u8 taskId);
 // water.s
 extern const union AnimCmd *const gUnknown_83E5958[];
 extern const union AnimCmd *const gUnknown_83E5A78[];
+void AnimWaterPulseRing(struct Sprite *sprite);
 
 // smokescreen.c
 u8 SmokescreenImpact(s16 x, s16 y, u8 a3);

include/graphics.h

@@ -3962,6 +3962,8 @@ extern const u32 gBattleAnimSpriteGfx_Protect[];
 extern const u32 gBattleAnimSpriteGfx_DirtMound[];
 extern const u32 gBattleAnimSpriteGfx_Shock3[];
 extern const u32 gBattleAnimSpriteGfx_WeatherBall[];
+extern const u32 gBattleAnim_ScaryFaceGfx[];
+extern const u32 gBattleAnim_ScaryFacePal[];
 extern const u32 gBattleAnimBgTilemap_ScaryFacePlayer[];
 extern const u32 gBattleAnimBgTilemap_ScaryFaceOpponent[];
 extern const u32 gBattleAnimBgTilemap_ScaryFaceContest[];
@@ -4215,7 +4217,19 @@ extern const u32 gBattleAnimSpritePal_CrossImpact[];
 extern const u32 gBattleAnimSpritePal_Slash2[];
 extern const u32 gBattleAnimSpritePal_WhipHit[];
 extern const u32 gBattleAnimSpritePal_BlueRing2[];
+
+// battle anim task
+extern const u32 gUnknown_D2EC24_Gfx[];
+extern const u32 gUnknown_D2EC24_Tilemap[];
+extern const u32 gCureBubblesGfx[];
 extern const u32 gCureBubblesPal[];
+extern const u32 gCureBubblesTilemap[];
+extern const u32 gBattleAnimBg_AttractGfx[];
+extern const u32 gBattleAnimBg_AttractTilemap[];
+extern const u32 gBattleAnimBg_AttractPal[];
+extern const u32 gBattleAnim_MorningSunGfx[];
+extern const u32 gBattleAnim_MorningSunTilemap[];
+extern const u32 gBattleAnim_MorningSunPal[];
 
 // battle bg
 extern const u32 gBattleAnimBgImage_Dark[];

include/math_util.h

@@ -2,5 +2,6 @@
 #define GUARD_MATH_UTIL_H
 
 s16 sub_80D8B90(s16 y);
+s16 sub_80D8AA0(s16 x, s16 y);
 
 #endif //GUARD_MATH_UTIL_H

src/battle_anim_effects_1.c

@@ -2375,7 +2375,7 @@ static void AnimAbsorptionOrbStep(struct Sprite* sprite)
 void AnimHyperBeamOrb(struct Sprite* sprite)
 {
     u16 speed;
-    u16 animNum = Random2();
+    u16 animNum = Random();
 
     StartSpriteAnim(sprite, animNum % 8);
     sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2);
@@ -2385,14 +2385,14 @@ void AnimHyperBeamOrb(struct Sprite* sprite)
     else
         sprite->pos1.x += 20;
 
-    speed = Random2();
+    speed = Random();
     sprite->data[0] = (speed & 31) + 64;
     sprite->data[1] = sprite->pos1.x;
     sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2);
     sprite->data[3] = sprite->pos1.y;
     sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y_PIC_OFFSET);
     InitAnimFastLinearTranslationWithSpeed(sprite);
-    sprite->data[5] = Random2() & 0xFF;
+    sprite->data[5] = Random() & 0xFF;
     sprite->data[6] = sprite->subpriority;
     sprite->callback = AnimHyperBeamOrbStep;
     sprite->callback(sprite);

src/battle_anim_effects_2.c

@@ -343,7 +343,7 @@ const struct SpriteTemplate gWaterPulseRingSpriteTemplate =	//gUnknown_83E3CE8
     .anims = gDummySpriteAnimTable,
     .images = NULL,
     .affineAnims = gWaterPulseRingAffineAnimTable,
-    .callback = sub_80AC6D8,
+    .callback = AnimWaterPulseRing,	//water.c
 };
 
 const struct SpriteTemplate gEggThrowSpriteTemplate =	//gUnknown_83E3D00
@@ -1828,9 +1828,9 @@ static void AnimBulletSeed_Step1(struct Sprite *sprite)
     for (i = 0; i < 8; i++)
         ptr[i - 7] = 0;
 
-    rand = Random2();
+    rand = Random();
     sprite->data[6] = 0xFFF4 - (rand & 7);
-    rand = Random2();
+    rand = Random();
     sprite->data[7] = (rand % 0xA0) + 0xA0;
     sprite->callback = AnimBulletSeed_Step2;
     sprite->affineAnimPaused = 0;
@@ -3238,9 +3238,9 @@ void AnimTask_HeartsBackground(u8 taskId)
     SetGpuReg(REG_OFFSET_BG1HOFS, gBattle_BG1_X);
     SetGpuReg(REG_OFFSET_BG1VOFS, gBattle_BG1_Y);
     sub_80752A0(&animBg);
-    AnimLoadCompressedBgGfx(animBg.bgId, &gUnknown_08C232E0, animBg.tilesOffset);
+	AnimLoadCompressedBgTilemap(animBg.bgId, gBattleAnimBg_AttractTilemap);
-    sub_80A6D60(&animBg, &gUnknown_08C23D78, 0);
+	AnimLoadCompressedBgGfx(animBg.bgId, gBattleAnimBg_AttractGfx, animBg.tilesOffset);
-    LoadCompressedPalette(&gUnknown_08C23D50, animBg.paletteId * 16, 32);
+    LoadCompressedPalette(gBattleAnimBg_AttractPal, animBg.paletteId * 16, 32);
     gTasks[taskId].func = HeartsBackground_Step;
 }
 
@@ -3316,15 +3316,16 @@ void AnimTask_ScaryFace(u8 taskId)
     SetGpuReg(REG_OFFSET_BG1HOFS, gBattle_BG1_X);
     SetGpuReg(REG_OFFSET_BG1VOFS, gBattle_BG1_Y);
     sub_80752A0(&animBg);
-    if (IsContest())
-        sub_80A6D60(&animBg, &gBattleAnimBgTilemap_ScaryFaceContest, 0);
-    else if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_OPPONENT)
-        sub_80A6D60(&animBg, &gBattleAnimBgTilemap_ScaryFacePlayer, 0);
-    else
-        sub_80A6D60(&animBg, &gBattleAnimBgTilemap_ScaryFaceOpponent, 0);
 	
-    AnimLoadCompressedBgGfx(animBg.bgId, gUnknown_08C249F8, animBg.tilesOffset);
+    if (IsContest())
-    LoadCompressedPalette(gUnknown_08C249D0, animBg.paletteId * 16, 32);
+		LZDecompressVram(gBattleAnimBgTilemap_ScaryFaceContest, animBg.bgTilemap);
+    else if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_OPPONENT)
+        AnimLoadCompressedBgTilemap(animBg.bgId, gBattleAnimBgTilemap_ScaryFacePlayer);
+    else
+        AnimLoadCompressedBgTilemap(animBg.bgId, gBattleAnimBgTilemap_ScaryFaceOpponent);
+
+    AnimLoadCompressedBgGfx(animBg.bgId, gBattleAnim_ScaryFaceGfx, animBg.tilesOffset);
+    LoadCompressedPalette(gBattleAnim_ScaryFacePal, animBg.paletteId * 16, 32);
     gTasks[taskId].func = ScaryFace_Step;
 }
 
@@ -3546,7 +3547,7 @@ void AnimPinkHeart(struct Sprite *sprite)
             sprite->pos1.y += sprite->pos2.y;
             sprite->pos2.x = 0;
             sprite->pos2.y = 0;
-            sprite->data[3] = Random2() % 180;
+            sprite->data[3] = Random() % 180;
         }
     }
 }

src/battle_anim_effects_3.c

@@ -120,10 +120,6 @@ static void AnimRecycleStep(struct Sprite *);
 static void AnimTask_SlackOffSquishStep(u8);
 
 // Data
-extern const u32 gUnknown_8D2A8C0[];
-extern const u32 gUnknown_8D2A808[];
-extern const u32 gUnknown_8D2A8A8[];
-
 const union AnimCmd gScratchAnimCmds[] =	//83FEDE4
 {
     ANIMCMD_FRAME(0, 4),
@@ -2151,13 +2147,13 @@ void AnimMiniTwinklingStar(struct Sprite *sprite)
     u8 rand;
     s8 y;
 
-    rand = Random2() & 3;
+    rand = Random() & 3;
     if (rand == 0)
         sprite->oam.tileNum += 4;
     else
         sprite->oam.tileNum += 5;
 
-    y = Random2() & 7;
+    y = Random() & 7;
     if (y > 3)
         y = -y;
 
@@ -2362,9 +2358,9 @@ void AnimTask_MorningSunLightBeam(u8 taskId)
             SetAnimBgAttribute(1, BG_ANIM_CHAR_BASE_BLOCK, 1);
 
 		sub_80752A0(&animBg);
-		AnimLoadCompressedBgTilemap(animBg.bgId, gUnknown_8D2A8C0);
+		AnimLoadCompressedBgTilemap(animBg.bgId, gBattleAnim_MorningSunTilemap);
-		AnimLoadCompressedBgGfx(animBg.bgId, gUnknown_8D2A808, animBg.tilesOffset);
+		AnimLoadCompressedBgGfx(animBg.bgId, gBattleAnim_MorningSunGfx, animBg.tilesOffset);
-		LoadCompressedPalette(gUnknown_8D2A8A8, animBg.paletteId * 16, 32);
+		LoadCompressedPalette(gBattleAnim_MorningSunPal, animBg.paletteId * 16, 32);
 		if (IsContest())
 		{
 			sub_80730C0(animBg.paletteId, animBg.bgTilemap, 0, 0);
@@ -2443,7 +2439,7 @@ void AnimGreenStar(struct Sprite *sprite)
     u8 spriteId1;
     u8 spriteId2;
 
-    xOffset = Random2();
+    xOffset = Random();
     xOffset &= 0x3F;
     if (xOffset > 31)
         xOffset = 32 - xOffset;
@@ -2541,9 +2537,9 @@ void AnimTask_DoomDesireLightBeam(u8 taskId)
             SetAnimBgAttribute(1, BG_ANIM_CHAR_BASE_BLOCK, 1);
 		
 		sub_80752A0(&animBg);
-		AnimLoadCompressedBgTilemap(animBg.bgId, gUnknown_8D2A8C0);
+		AnimLoadCompressedBgTilemap(animBg.bgId, gBattleAnim_MorningSunTilemap);
-		AnimLoadCompressedBgGfx(animBg.bgId, gUnknown_8D2A808, animBg.tilesOffset);
+		AnimLoadCompressedBgGfx(animBg.bgId, gBattleAnim_MorningSunGfx, animBg.tilesOffset);
-		LoadCompressedPalette(gUnknown_8D2A8A8, animBg.paletteId * 16, 32);
+		LoadCompressedPalette(gBattleAnim_MorningSunPal, animBg.paletteId * 16, 32);
 				
         if (IsContest())
         {
@@ -3011,10 +3007,10 @@ void AnimFlatterConfetti(struct Sprite *sprite)
     int rand1;
     int rand2;
 
-    tileOffset = Random2() % 12;
+    tileOffset = Random() % 12;
     sprite->oam.tileNum += tileOffset;
-    rand1 = Random2() & 0x1FF;
+    rand1 = Random() & 0x1FF;
-    rand2 = Random2() & 0xFF;
+    rand2 = Random() & 0xFF;
 
     if (rand1 & 1)
         sprite->data[0] = 0x5E0 + rand1;
@@ -3249,7 +3245,7 @@ static void AnimTask_RolePlaySilhouetteStep2(u8 taskId)
     TrySetSpriteRotScale(&gSprites[spriteId], TRUE, gTasks[taskId].data[10], gTasks[taskId].data[11], 0);
     if (++gTasks[taskId].data[12] == 9)
     {
-        sub_80A749C(&gSprites[spriteId]);
+        sub_8075AD8(&gSprites[spriteId]);
         DestroySpriteAndFreeResources_(&gSprites[spriteId]);
         gTasks[taskId].func = DestroyAnimVisualTaskAndDisableBlend;
     }
@@ -3771,7 +3767,7 @@ static void CreateSweatDroplets(u8 taskId, bool8 arg1)
 
     for (i = 0; i < 4; i++)
     {
-        u8 spriteId = CreateSprite(&gFacadeSweatDrop, xCoords[i], yCoords[i & 1], task->data[6] - 5);
+        u8 spriteId = CreateSprite(&gFacadeSweatDropSpriteTemplate, xCoords[i], yCoords[i & 1], task->data[6] - 5);
         if (spriteId != MAX_SPRITES)
         {
             gSprites[spriteId].data[0] = 0;

src/battle_anim_mons.c

@@ -884,7 +884,7 @@ void AnimLoadCompressedBgTilemap(u32 bgId, const u32 *src)
     CopyBgTilemapBufferToVram(bgId);
 }
 
-u8 sub_8075454(void)
+u8 GetBattleBgPaletteNum(void)
 {
     return 2;
 }

src/battle_anim_special.c

@@ -20,6 +20,7 @@
 #include "constants/items.h"
 #include "constants/moves.h"
 #include "constants/songs.h"
+#include "constants/pokemon.h"
 
 // Defines
 #define TAG_PARTICLES_POKEBALL    55020
@@ -39,9 +40,13 @@
 #define LOHALF(n) ((n) & 0xFFFF)
 
 // IWRAM
-EWRAM_DATA int gUnknown_3005424 = 0;
+//EWRAM_DATA int gUnknown_3005424 = 0;
-EWRAM_DATA u16 gUnknown_3005428 = 0;
+//EWRAM_DATA u16 gUnknown_3005428 = 0;
-EWRAM_DATA u16 gUnknown_300542C = 0;
+//EWRAM_DATA u16 gUnknown_300542C = 0;
+
+extern u32 gUnknown_3005424;
+extern u32 gUnknown_3005428;
+extern u32 gUnknown_300542C;
 
 // Function Declarations
 static void sub_80EEDF4(u8);
@@ -99,9 +104,8 @@ static void PremierBallOpenParticleAnimation(u8);
 static void sub_80F1B3C(struct Sprite *);
 
 // Data
-extern const u32 gUnknown_8D2EC24[];
+extern const struct SpriteTemplate gBallSpriteTemplates[POKEBALL_COUNT];	//for now
-extern const u32 gUnknown_8D2EC70[];
+extern const u32 gBattleAnimSpriteGfx_Particles[];
-extern const struct SpriteTemplate gBallSpriteTemplates[];	//for now
 
 struct BallCaptureSuccessStarData
 {
@@ -455,8 +459,8 @@ void sub_80EEC0C(u8 taskId)
     gSprites[spriteId4].callback = SpriteCallbackDummy;
 
     sub_80752A0(&unknownStruct);
-    AnimLoadCompressedBgTilemap(unknownStruct.bgId, gUnknown_8D2EC70);
+    AnimLoadCompressedBgTilemap(unknownStruct.bgId, gUnknown_D2EC24_Tilemap);
-    AnimLoadCompressedBgGfx(unknownStruct.bgId, gUnknown_8D2EC24, unknownStruct.tilesOffset);
+    AnimLoadCompressedBgGfx(unknownStruct.bgId, gUnknown_D2EC24_Gfx, unknownStruct.tilesOffset);
     LoadCompressedPalette(gCureBubblesPal, unknownStruct.paletteId << 4, 32);
 
     gBattle_BG1_X = -gSprites[spriteId3].pos1.x + 32;
@@ -2293,9 +2297,14 @@ void sub_80F1C8C(u8 taskId)
     DestroyAnimVisualTask(taskId);
 }
 
-void sub_80F1C8C(u8 taskId)
+void sub_80F1CE4(u8 taskId)
 {
-	// to do 
+	if (gBattleCommunication[MULTISTRING_CHOOSER] > 2)
+		gBattleAnimArgs[7] = 0;
+	else
+		gBattleAnimArgs[7] = gBattleCommunication[MULTISTRING_CHOOSER];
+	
+	DestroyAnimVisualTask(taskId);
 }
 
 // 080F1D14

src/ghost.c

@@ -1319,13 +1319,13 @@ static void sub_80B6BE4(u8 taskId)
         SetGpuReg(REG_OFFSET_BG2HOFS, gBattle_BG2_X);
         SetGpuReg(REG_OFFSET_BG2VOFS, gBattle_BG2_Y);
         sub_80752C8(&animBgData, 2);
-        AnimLoadCompressedBgGfx(animBgData.bgId, gFile_graphics_battle_anims_backgrounds_scary_face_sheet, animBgData.tilesOffset);
+        AnimLoadCompressedBgGfx(animBgData.bgId, gBattleAnim_ScaryFaceGfx, animBgData.tilesOffset);
-        LoadCompressedPalette(gFile_graphics_battle_anims_backgrounds_scary_face_palette, 16 * animBgData.paletteId, 0x20);
+        LoadCompressedPalette(gBattleAnim_ScaryFacePal, 16 * animBgData.paletteId, 0x20);
         break;
     case 3:
         sub_80752C8(&animBgData, 2);
         gMonSpritesGfxPtr->field_17C = AllocZeroed(0x2000);
-        LZDecompressWram(gFile_graphics_battle_anims_backgrounds_scary_face_player_tilemap, gMonSpritesGfxPtr->field_17C);
+        LZDecompressWram(gBattleAnimBgTilemap_ScaryFacePlayer, gMonSpritesGfxPtr->field_17C);
         sub_80730C0(animBgData.paletteId, gMonSpritesGfxPtr->field_17C, 256, 0);
         CopyToBgTilemapBufferRect_ChangePalette(animBgData.bgId, gMonSpritesGfxPtr->field_17C, 0, 0, 0x20, 0x20, 0x11);
         CopyBgTilemapBufferToVram(2);

sym_common.txt

@@ -99,7 +99,15 @@ gUnknown_3005354: @ 3005354
 	.align 2
 	.include "save.o"
 	.align 2
-	.include "battle_anim_special.o"
+
+gUnknown_3005424: @ 3005424
+	.space 0x4
+
+gUnknown_3005428: @ 3005428
+	.space 0x4
+
+gUnknown_300542C: @ 300542C
+	.space 0x4
 
 gUnknown_3005430: @ 3005430
 	.space 0x10