From 8126662cfb6507288a18b58961c50bfddcb099e6 Mon Sep 17 00:00:00 2001
From: Karathan <philipp@karathan.at>
Date: Wed, 3 Jul 2019 14:10:29 +0200
Subject: [PATCH] update wring out with trace, remove AGBPrintf

---
 data/battle_anim_scripts.s  | 17 ++++++++++++++++-
 src/battle_anim_effects_1.c |  7 ++++---
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s
index b60538e0b7..eca8d65f93 100644
--- a/data/battle_anim_scripts.s
+++ b/data/battle_anim_scripts.s
@@ -1237,7 +1237,22 @@ Move_HEAL_BLOCK:
 	
 Move_WRING_OUT:
 	loadspritegfx ANIM_TAG_WRING_OUT
-	createsprite gWringOutHandSpriteTemplate, ANIM_TARGET, 40, 0, 0, 48, 3, 32
+	monbg ANIM_TARGET
+	setalpha 12, 8
+	createsprite gWringOutHandSpriteTemplate, ANIM_TARGET, 40, 0, 0, 48, 3, 32, FALSE
+	delay 3
+	createsprite gWringOutHandSpriteTemplate, ANIM_TARGET, 40, 0, 0, 48, 3, 32, TRUE
+	delay 3
+	createsprite gWringOutHandSpriteTemplate, ANIM_TARGET, 40, 0, 0, 48, 3, 32, TRUE
+	delay 3
+	createsprite gWringOutHandSpriteTemplate, ANIM_TARGET, 40, 0, 0, 48, 3, 32, TRUE
+	delay 3
+	createsprite gWringOutHandSpriteTemplate, ANIM_TARGET, 40, 0, 0, 48, 3, 32, TRUE
+	delay 3
+	createsprite gWringOutHandSpriteTemplate, ANIM_TARGET, 40, 0, 0, 48, 3, 32, TRUE
+	waitforvisualfinish
+	clearmonbg ANIM_TARGET
+	blendoff
 	waitforvisualfinish
 	end
 	
diff --git a/src/battle_anim_effects_1.c b/src/battle_anim_effects_1.c
index 35b311e72a..537230d196 100644
--- a/src/battle_anim_effects_1.c
+++ b/src/battle_anim_effects_1.c
@@ -3053,14 +3053,11 @@ static void AnimMoveWringOutCircle(struct Sprite* sprite)
     {
         if(sprite->data[3] + sprite->data[0] >= 256)
         {
-            AGBPrintf("Hit the crit section: step: %d, angle: %d", sprite->data[0], sprite->data[3]);
             sprite->data[3] = (sprite->data[0] + sprite->data[3]) % 256;
             sprite->data[1]--;
-            AGBPrintf("Crit New angle: %d", sprite->data[3]);
         }
         else
         {
-            AGBPrintf("New angle: %d", sprite->data[3]);
             sprite->data[3] += sprite->data[0];
         }
         
@@ -3079,6 +3076,10 @@ static void AnimMoveWringOutCircle(struct Sprite* sprite)
 static void AnimMoveWringOut(struct Sprite* sprite)
 {
     InitSpritePosToAnimTarget(sprite, TRUE);
+    if(gBattleAnimArgs[5] == TRUE)
+    {
+        sprite->oam.objMode = ST_OAM_OBJ_BLEND;
+    }
     sprite->data[0] = 256 / gBattleAnimArgs[2]; //step size
     sprite->data[1] = gBattleAnimArgs[3]; //Number of circle spins
     sprite->data[2] = gBattleAnimArgs[4]; //radius