From 18affe8c1ab1bff1e678f8e2351ec59b04f3b5e0 Mon Sep 17 00:00:00 2001
From: ghoulslash <pokevoyager0@gmail.com>
Date: Mon, 18 Jul 2022 09:21:59 -0400
Subject: [PATCH] new z move indicator, credits to blackforest

---
 graphics/battle_interface/z_move_trigger.pal |  19 ---------------
 graphics/battle_interface/z_move_trigger.png | Bin 272 -> 255 bytes
 src/battle_z_move.c                          |  23 ++++++++++---------
 3 files changed, 12 insertions(+), 30 deletions(-)
 delete mode 100644 graphics/battle_interface/z_move_trigger.pal

diff --git a/graphics/battle_interface/z_move_trigger.pal b/graphics/battle_interface/z_move_trigger.pal
deleted file mode 100644
index 2672d1f10..000000000
--- a/graphics/battle_interface/z_move_trigger.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-185 207 163
-77 105 97
-199 159 199
-221 177 207
-57 151 117
-139 221 253
-247 161 133
-255 255 255
-153 87 67
-233 233 125
-129 255 223
-149 147 247
-195 207 201
-123 151 135
-0 0 0
-0 0 0
diff --git a/graphics/battle_interface/z_move_trigger.png b/graphics/battle_interface/z_move_trigger.png
index 9a9c5d937abc948679d39a39bf302822a9f1ff45..1b2b30a1279c0b4b81ffcf52ed18bb219d608b3c 100644
GIT binary patch
delta 216
zcmbQh^q+Bpe*KFV0Y83ZRAeM{RAf|7Z$EH=;m403A3h{7V1QY|^^1UlU7jwEAsQ2(
zPT0-MWGLVwYxyn4#m1faS{K`evW9I8;SXiB79_tBu6Uc>IQ{L5w?BjrIXZF~fBbaH
zJ7C_O%Ssc@tY&x@cbSFZ%t_XgJ*t6DR{867CukX!GN_qW2PAwGkao=3eDbUguj5z0
zP~XLjr&hnpU%Dk>bx2LKUc;IrC8v(@{n>c@tbhC$`5J}_Es2In8{UL~-0JD-=d#Wz
Gp$P!A8(RGU

delta 233
zcmey*IDu(`e*N+J$M0@DZ#liR`|jWG3tRvH|35R_`Q^*n#{c)HPX2!Q{K@L+?F?X0
zmSWWcWN;REL>4nJh^c}wqi2xH2cTe^r;B5V#>C`=28K9CHjx9`D>{zt&*@Mq2)rQ{
z+PYxlf`_}?nK)#N-ZwCKHoTXebzpb7KWih0VnI@1h}pZjISMfi;Q?k(?q2TRSkTzr
z)b##dXT@5f25o^U)!VZ=?^rXYuqr4tEMZ_t*cQ{mVUyj$#UR?y5V1~Sl68ZF(+8%k
eh6SJ9IT#q^j+o_pOfTIGa<HeXpUXO@geCx|UtgyH

diff --git a/src/battle_z_move.c b/src/battle_z_move.c
index 939418434..8276dd3f3 100644
--- a/src/battle_z_move.c
+++ b/src/battle_z_move.c
@@ -253,15 +253,15 @@ bool32 TryChangeZIndicator(u8 battlerId, u8 moveIndex)
         ShowZMoveTriggerSprite();   // Was not a viable z move, now is -> slide back in
 }
 
-#define SINGLES_Z_TRIGGER_POS_X_OPTIMAL (30)
-#define SINGLES_Z_TRIGGER_POS_X_PRIORITY (31)
-#define SINGLES_Z_TRIGGER_POS_X_SLIDE (15)
-#define SINGLES_Z_TRIGGER_POS_Y_DIFF (-11)
+#define SINGLES_Z_TRIGGER_POS_X_OPTIMAL     (29)
+#define SINGLES_Z_TRIGGER_POS_X_PRIORITY    (29)
+#define SINGLES_Z_TRIGGER_POS_X_SLIDE       (15)
+#define SINGLES_Z_TRIGGER_POS_Y_DIFF        (-11)
 
-#define DOUBLES_Z_TRIGGER_POS_X_OPTIMAL (30)
-#define DOUBLES_Z_TRIGGER_POS_X_PRIORITY (31)
-#define DOUBLES_Z_TRIGGER_POS_X_SLIDE (15)
-#define DOUBLES_Z_TRIGGER_POS_Y_DIFF (-4)
+#define DOUBLES_Z_TRIGGER_POS_X_OPTIMAL     SINGLES_Z_TRIGGER_POS_X_OPTIMAL
+#define DOUBLES_Z_TRIGGER_POS_X_PRIORITY    SINGLES_Z_TRIGGER_POS_X_PRIORITY
+#define DOUBLES_Z_TRIGGER_POS_X_SLIDE       SINGLES_Z_TRIGGER_POS_X_SLIDE
+#define DOUBLES_Z_TRIGGER_POS_Y_DIFF        (-4)
 
 #define tBattler    data[0]
 #define tHide       data[1]
@@ -330,13 +330,14 @@ static void SpriteCB_ZMoveTrigger(struct Sprite *sprite)
     else
     {
         if (sprite->x != gSprites[gHealthboxSpriteIds[sprite->tBattler]].x - xOptimal)
+        {
             sprite->x--;
-
-        if (sprite->x >= gSprites[gHealthboxSpriteIds[sprite->tBattler]].x - xPriority)
             sprite->oam.priority = 2;
+        }
         else
+        {
             sprite->oam.priority = 1;
-
+        }
         sprite->y = gSprites[gHealthboxSpriteIds[sprite->tBattler]].y - yDiff;
         sprite->y2 = gSprites[gHealthboxSpriteIds[sprite->tBattler]].y2 - yDiff;
     }