From fc37345c29c558a75dad4cb2638caf553e844259 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Fri, 21 Jul 2023 10:42:39 +0200
Subject: [PATCH] Fix wrong color in stat move animation

---
 include/battle_anim.h      |  9 +++---
 include/constants/battle.h | 60 +++++++++++++++++++-------------------
 2 files changed, 35 insertions(+), 34 deletions(-)

diff --git a/include/battle_anim.h b/include/battle_anim.h
index a3677bd98..28096d603 100644
--- a/include/battle_anim.h
+++ b/include/battle_anim.h
@@ -2,6 +2,7 @@
 #define GUARD_BATTLE_ANIM_H
 
 #include "battle.h"
+#include "constants/battle.h"
 #include "constants/battle_anim.h"
 #include "task.h"
 
@@ -204,10 +205,10 @@ u8 GetBattlerSpriteDefault_Y(u8 battlerId);
 u8 GetSubstituteSpriteDefault_Y(u8 battlerId);
 
 // battle_anim_status_effects.c
-#define STAT_ANIM_PLUS1  15
-#define STAT_ANIM_PLUS2  39
-#define STAT_ANIM_MINUS1 22
-#define STAT_ANIM_MINUS2 46
+#define STAT_ANIM_PLUS1  MOVE_EFFECT_ATK_PLUS_1
+#define STAT_ANIM_PLUS2  MOVE_EFFECT_ATK_PLUS_2
+#define STAT_ANIM_MINUS1 MOVE_EFFECT_ATK_MINUS_1
+#define STAT_ANIM_MINUS2 MOVE_EFFECT_ATK_MINUS_2
 #define STAT_ANIM_MULTIPLE_PLUS1 55
 #define STAT_ANIM_MULTIPLE_PLUS2 56
 #define STAT_ANIM_MULTIPLE_MINUS1 57
diff --git a/include/constants/battle.h b/include/constants/battle.h
index 814d1bfa5..80810498c 100644
--- a/include/constants/battle.h
+++ b/include/constants/battle.h
@@ -321,21 +321,21 @@
 #define MOVE_EFFECT_PAYDAY              12
 #define MOVE_EFFECT_CHARGING            13
 #define MOVE_EFFECT_WRAP                14
-#define MOVE_EFFECT_BURN_UP             15 // MOVE_EFFECT_BURN_UP replaces unused MOVE_EFFECT_RECOIL_25 so that stat change animations don't break
-#define MOVE_EFFECT_ATK_PLUS_1          16
-#define MOVE_EFFECT_DEF_PLUS_1          17
-#define MOVE_EFFECT_SPD_PLUS_1          18
-#define MOVE_EFFECT_SP_ATK_PLUS_1       19
-#define MOVE_EFFECT_SP_DEF_PLUS_1       20
-#define MOVE_EFFECT_ACC_PLUS_1          21
-#define MOVE_EFFECT_EVS_PLUS_1          22
-#define MOVE_EFFECT_ATK_MINUS_1         23
-#define MOVE_EFFECT_DEF_MINUS_1         24
-#define MOVE_EFFECT_SPD_MINUS_1         25
-#define MOVE_EFFECT_SP_ATK_MINUS_1      26
-#define MOVE_EFFECT_SP_DEF_MINUS_1      27
-#define MOVE_EFFECT_ACC_MINUS_1         28
-#define MOVE_EFFECT_EVS_MINUS_1         29
+#define MOVE_EFFECT_ATK_PLUS_1          15
+#define MOVE_EFFECT_DEF_PLUS_1          16
+#define MOVE_EFFECT_SPD_PLUS_1          17
+#define MOVE_EFFECT_SP_ATK_PLUS_1       18
+#define MOVE_EFFECT_SP_DEF_PLUS_1       19
+#define MOVE_EFFECT_ACC_PLUS_1          20
+#define MOVE_EFFECT_EVS_PLUS_1          21
+#define MOVE_EFFECT_ATK_MINUS_1         22
+#define MOVE_EFFECT_DEF_MINUS_1         23
+#define MOVE_EFFECT_SPD_MINUS_1         24
+#define MOVE_EFFECT_SP_ATK_MINUS_1      25
+#define MOVE_EFFECT_SP_DEF_MINUS_1      26
+#define MOVE_EFFECT_ACC_MINUS_1         27
+#define MOVE_EFFECT_EVS_MINUS_1         28
+#define MOVE_EFFECT_BURN_UP             29
 #define MOVE_EFFECT_RECHARGE            30
 #define MOVE_EFFECT_RAGE                31
 #define MOVE_EFFECT_STEAL_ITEM          32
@@ -345,21 +345,21 @@
 #define MOVE_EFFECT_RAPIDSPIN           36
 #define MOVE_EFFECT_REMOVE_STATUS       37
 #define MOVE_EFFECT_ATK_DEF_DOWN        38
-#define MOVE_EFFECT_SCALE_SHOT          39 // MOVE_EFFECT_SCALE_SHOT replaces unused MOVE_EFFECT_RECOIL_33 so that stat change animations don't break
-#define MOVE_EFFECT_ATK_PLUS_2          40
-#define MOVE_EFFECT_DEF_PLUS_2          41
-#define MOVE_EFFECT_SPD_PLUS_2          42
-#define MOVE_EFFECT_SP_ATK_PLUS_2       43
-#define MOVE_EFFECT_SP_DEF_PLUS_2       44
-#define MOVE_EFFECT_ACC_PLUS_2          45
-#define MOVE_EFFECT_EVS_PLUS_2          46
-#define MOVE_EFFECT_ATK_MINUS_2         47
-#define MOVE_EFFECT_DEF_MINUS_2         48
-#define MOVE_EFFECT_SPD_MINUS_2         49
-#define MOVE_EFFECT_SP_ATK_MINUS_2      50
-#define MOVE_EFFECT_SP_DEF_MINUS_2      51
-#define MOVE_EFFECT_ACC_MINUS_2         52
-#define MOVE_EFFECT_EVS_MINUS_2         53
+#define MOVE_EFFECT_ATK_PLUS_2          39
+#define MOVE_EFFECT_DEF_PLUS_2          40
+#define MOVE_EFFECT_SPD_PLUS_2          41
+#define MOVE_EFFECT_SP_ATK_PLUS_2       42
+#define MOVE_EFFECT_SP_DEF_PLUS_2       43
+#define MOVE_EFFECT_ACC_PLUS_2          44
+#define MOVE_EFFECT_EVS_PLUS_2          45
+#define MOVE_EFFECT_ATK_MINUS_2         46
+#define MOVE_EFFECT_DEF_MINUS_2         47
+#define MOVE_EFFECT_SPD_MINUS_2         48
+#define MOVE_EFFECT_SP_ATK_MINUS_2      49
+#define MOVE_EFFECT_SP_DEF_MINUS_2      50
+#define MOVE_EFFECT_ACC_MINUS_2         51
+#define MOVE_EFFECT_EVS_MINUS_2         52
+#define MOVE_EFFECT_SCALE_SHOT          53
 #define MOVE_EFFECT_THRASH              54
 #define MOVE_EFFECT_KNOCK_OFF           55
 #define MOVE_EFFECT_DEF_SPDEF_DOWN      56