From c0e408bfab77c7e6014521af25fd9c749dc3c9ca Mon Sep 17 00:00:00 2001
From: ghoulslash <pokevoyager0@gmail.com>
Date: Sun, 5 Dec 2021 14:44:22 -0500
Subject: [PATCH] fix aqua ring heal anim

---
 data/battle_anim_scripts.s      | 6 +++---
 data/battle_scripts_1.s         | 2 +-
 include/constants/battle_anim.h | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s
index 350ba2cc0..ce6026d51 100644
--- a/data/battle_anim_scripts.s
+++ b/data/battle_anim_scripts.s
@@ -827,6 +827,7 @@ gBattleAnims_General::
 	.4byte General_GulpMissile              @ B_ANIM_GULP_MISSILE
 	.4byte General_StrongWinds              @ B_ANIM_STRONG_WINDS
 	.4byte General_PrimalReversion          @ B_ANIM_PRIMAL_REVERSION
+	.4byte General_AquaRingHeal				@ B_ANIM_AQUA_RING_HEAL
 
 	.align 2
 gBattleAnims_Special::
@@ -1707,10 +1708,12 @@ Move_HEART_SWAP:
 	end
 
 Move_AQUA_RING:
+General_AquaRingHeal:
 	loadspritegfx ANIM_TAG_BLUE_STAR
 	loadspritegfx ANIM_TAG_SMALL_BUBBLES
 	loadspritegfx ANIM_TAG_ICE_CRYSTALS
 	loadspritegfx ANIM_TAG_GUARD_RING
+	createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_GUARD_RING, 0, 14, 14, RGB_BLUE
 	monbg ANIM_ATK_PARTNER
 	setalpha 12, 8
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 23, 1
@@ -1751,9 +1754,6 @@ Move_AQUA_RING:
 	waitforvisualfinish
 	clearmonbg ANIM_ATK_PARTNER
 	blendoff
-	delay 1
-	call HealingEffect
-	waitforvisualfinish
 	end
 
 Move_MAGNET_RISE:
diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s
index e9d019e43..45762eae2 100644
--- a/data/battle_scripts_1.s
+++ b/data/battle_scripts_1.s
@@ -6959,7 +6959,7 @@ BattleScript_TurnHeal:
 	end2
 
 BattleScript_AquaRingHeal::
-	playanimation BS_ATTACKER, B_ANIM_INGRAIN_HEAL, NULL
+	playanimation BS_ATTACKER, B_ANIM_AQUA_RING_HEAL, NULL
 	printstring STRINGID_AQUARINGHEAL
 	goto BattleScript_TurnHeal
 
diff --git a/include/constants/battle_anim.h b/include/constants/battle_anim.h
index 7df75794e..b91295b5c 100644
--- a/include/constants/battle_anim.h
+++ b/include/constants/battle_anim.h
@@ -532,6 +532,7 @@
 #define B_ANIM_GULP_MISSILE             29
 #define B_ANIM_STRONG_WINDS             30
 #define B_ANIM_PRIMAL_REVERSION         31
+#define B_ANIM_AQUA_RING_HEAL           32
 
 // special animations table (gBattleAnims_Special)
 #define B_ANIM_LVL_UP                   0