Decompile battle_anim_effects_2.c

data/battle_anim_scripts.s

@@ -2987,7 +2987,7 @@ Move_FLASH:
 	end
 
 Move_SPLASH:
-	createvisualtask sub_8104938, 2, 0, 3
+	createvisualtask AnimTask_Splash, 2, 0, 3
 	delay 8
 	loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 38, 3
 	waitforvisualfinish
@@ -3066,7 +3066,7 @@ Move_SKETCH:
 	createsprite gUnknown_085936D4, ANIM_TARGET, 2
 	waitforvisualfinish
 	clearmonbg ANIM_TARGET
-	createvisualtask sub_8104938, 2, 0, 2
+	createvisualtask AnimTask_Splash, 2, 0, 2
 	loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 38, 2
 	end
 
@@ -4008,7 +4008,7 @@ Move_TEETER_DANCE:
 
 Move_MUD_SPORT:
 	loadspritegfx ANIM_TAG_MUD_SAND
-	createvisualtask sub_8104938, 2, 0, 6
+	createvisualtask AnimTask_Splash, 2, 0, 6
 	delay 24
 	createsprite gUnknown_085971E4, ANIM_TARGET, 2, 0, -4, -16
 	createsprite gUnknown_085971E4, ANIM_TARGET, 2, 0, 4, -12

include/battle_anim.h

@@ -138,6 +138,12 @@ void sub_80A70C0(struct Sprite *sprite);
 void TranslateMonBGUntil(struct Sprite *sprite);
 void TranslateSpriteOverDuration(struct Sprite *sprite);
 void sub_80A77C8(struct Sprite *sprite);
+void sub_80A7000(struct Sprite *sprite);
+void sub_80A62EC(struct Sprite *sprite);
+void sub_80A750C(u16 a1, bool8 a2);
+void sub_80A7CFC(struct Task *task, u8 a2, const void *a3);
+bool8 sub_80A7D34(struct Task *task);
+void sub_80A78AC(struct Sprite *sprite);
 
 enum
 {

include/graphics.h

@@ -4372,6 +4372,9 @@ extern const u32 gBattleAnimSpriteSheet_280[];
 extern const u32 gBattleAnimSpriteSheet_281[];
 extern const u32 gBattleAnimSpriteSheet_282[];
 extern const u32 gBattleAnimSpriteSheet_283[];
+extern const u32 gBattleAnimBackgroundTilemap_ScaryFacePlayer[];
+extern const u32 gBattleAnimBackgroundTilemap_ScaryFaceOpponent[];
+extern const u32 gBattleAnimBackgroundTilemap_ScaryFaceContest[];
 extern const u32 gBattleAnimSpriteSheet_284[];
 extern const u32 gBattleAnimSpriteSheet_285[];
 
@@ -4584,10 +4587,15 @@ extern const u32 gBattleAnimSpritePalette_209[];
 extern const u32 gBattleAnimSpritePalette_210[];
 extern const u32 gBattleAnimSpritePalette_211[];
 extern const u32 gBattleAnimSpritePalette_215[];
+extern const u32 gUnknown_08C249D0[];
+extern const u32 gUnknown_08C249F8[];
 extern const u32 gBattleAnimSpritePalette_216[];
 extern const u32 gBattleAnimSpritePalette_217[];
 extern const u32 gBattleAnimSpritePalette_218[];
 extern const u32 gBattleAnimSpritePalette_219[];
+extern const u32 gUnknown_08C232E0;
+extern const u32 gUnknown_08C23D50;
+extern const u32 gUnknown_08C23D78;
 extern const u32 gBattleAnimSpritePalette_220[];
 extern const u32 gBattleAnimSpritePalette_221[];
 extern const u32 gBattleAnimSpritePalette_222[];

include/math_util.h

@@ -0,0 +1,14 @@
+#ifndef GUARD_MATH_UTIL_H
+#define GUARD_MATH_UTIL_H
+
+s16 sub_8151534(s16 x, s16 y);
+s16 sub_8151550(u8 s, s16 x, s16 y);
+s32 sub_8151574(s32 x, s32 y);
+s16 sub_81515B0(s16 x, s16 y);
+s16 sub_81515D4(u8 s, s16 x, s16 y);
+s32 sub_81515FC(s32 x, s32 y);
+s16 sub_8151624(s16 y);
+s16 sub_815163C(u8 s, s16 y);
+s32 sub_815165C(s32 y);
+
+#endif // GUARD_MATH_UTIL_H

ld_script.txt

@@ -158,7 +158,7 @@ SECTIONS {
         asm/contest_link_80FC4F4.o(.text);
         src/item_use.o(.text);
         src/battle_anim_effects_1.o(.text);
-        asm/battle_anim_effects_2.o(.text);
+        src/battle_anim_effects_2.o(.text);
         asm/water.o(.text);
         src/fire.o(.text);
         src/electric.o(.text);
@@ -484,7 +484,7 @@ SECTIONS {
         src/rotating_gate.o(.rodata);
         src/item_use.o(.rodata);
         src/battle_anim_effects_1.o(.rodata);
-        src/effects_2.o(.rodata);
+        src/battle_anim_effects_2.o(.rodata);
         src/water.o(.rodata);
         src/fire.o(.rodata);
         src/electric.o(.rodata);

src/battle_anim_effects_1.c

@@ -1,9 +1,15 @@
 #include "global.h"
+#include "alloc.h"
 #include "battle_anim.h"
 #include "battle_interface.h"
+#include "decompress.h"
 #include "gpu_regs.h"
+#include "graphics.h"
+#include "main.h"
+#include "math_util.h"
 #include "palette.h"
 #include "random.h"
+#include "scanline_effect.h"
 #include "sound.h"
 #include "trig.h"
 #include "util.h"
@@ -2795,7 +2801,6 @@ void sub_80FF698(struct Sprite* sprite)
     switch (sprite->data[0])
     {
     case 0:
-    {
         if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER)
             gBattleAnimArgs[0] *= -1;
 
@@ -2804,9 +2809,7 @@ void sub_80FF698(struct Sprite* sprite)
         sprite->invisible = 1;
         sprite->data[0]++;
         break;
-    }
     case 1:
-    {
         sprite->invisible = 0;
         if (sprite->affineAnimEnded)
         {
@@ -2819,7 +2822,6 @@ void sub_80FF698(struct Sprite* sprite)
             break;
         }
     }
-    }
 }
 
 void sub_80FF768(struct Sprite* sprite)