From 51fbc80ac5a9c9003bff03399f156e9366638a5d Mon Sep 17 00:00:00 2001
From: Alex <93446519+AlexOn1ine@users.noreply.github.com>
Date: Sat, 30 Nov 2024 23:32:46 +0100
Subject: [PATCH 1/5] Fixes Misty Terrain displaying wrong message (#5742)

---
 src/battle_util.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/battle_util.c b/src/battle_util.c
index 7e0970bcab..f95b8f9901 100644
--- a/src/battle_util.c
+++ b/src/battle_util.c
@@ -2784,7 +2784,7 @@ u8 DoBattlerEndTurnEffects(void)
                  && !IsLeafGuardProtected(battler))
                 {
                     CancelMultiTurnMoves(battler);
-                    gEffectBattler = battler;
+                    gEffectBattler = gBattlerTarget = battler;
                     if (IsBattlerTerrainAffected(battler, STATUS_FIELD_ELECTRIC_TERRAIN))
                     {
                         gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_TERRAINPREVENTS_ELECTRIC;

From 3343a16a7c00bb7eef9f7f261033ddd185d4c9cc Mon Sep 17 00:00:00 2001
From: Alex <93446519+AlexOn1ine@users.noreply.github.com>
Date: Sat, 30 Nov 2024 23:49:50 +0100
Subject: [PATCH 2/5] Fixes Dynamax dynamic move type (#5739)

---
 src/battle_dynamax.c | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/battle_dynamax.c b/src/battle_dynamax.c
index 073e2c55bc..e0b782d12c 100644
--- a/src/battle_dynamax.c
+++ b/src/battle_dynamax.c
@@ -280,7 +280,10 @@ static u16 GetTypeBasedMaxMove(u32 battler, u32 type)
 // Returns the appropriate Max Move or G-Max Move for a battler to use.
 u16 GetMaxMove(u32 battler, u32 baseMove)
 {
-    u32 move = baseMove;
+    u32 moveType;
+    SetTypeBeforeUsingMove(baseMove, battler);
+    GET_MOVE_TYPE(baseMove, moveType);
+
     if (baseMove == MOVE_NONE) // for move display
     {
         return MOVE_NONE;
@@ -291,18 +294,12 @@ u16 GetMaxMove(u32 battler, u32 baseMove)
     }
     else if (gMovesInfo[baseMove].category == DAMAGE_CATEGORY_STATUS)
     {
-        move = MOVE_MAX_GUARD;
-    }
-    else if (gBattleStruct->dynamicMoveType)
-    {
-        move = GetTypeBasedMaxMove(battler, gBattleStruct->dynamicMoveType & DYNAMIC_TYPE_MASK);
+        return MOVE_MAX_GUARD;
     }
     else
     {
-        move = GetTypeBasedMaxMove(battler, gMovesInfo[baseMove].type);
+        return GetTypeBasedMaxMove(battler, moveType);
     }
-
-    return move;
 }
 
 // First value is for Fighting, Poison and Multi-Attack. The second is for everything else.

From b3b0973fbb88b5ab368925d764ba3cbee289ae54 Mon Sep 17 00:00:00 2001
From: Alex <93446519+AlexOn1ine@users.noreply.github.com>
Date: Sun, 1 Dec 2024 00:06:17 +0100
Subject: [PATCH 3/5] Fixes Population Bomb / Triple Kick missing message
 (#5747)

---
 asm/macros/battle_script.inc |  4 +---
 include/config/battle.h      |  2 +-
 src/battle_script_commands.c | 40 +++++++++++-------------------------
 3 files changed, 14 insertions(+), 32 deletions(-)

diff --git a/asm/macros/battle_script.inc b/asm/macros/battle_script.inc
index 6dbcabe43e..27488c25d8 100644
--- a/asm/macros/battle_script.inc
+++ b/asm/macros/battle_script.inc
@@ -798,9 +798,7 @@
 	2:
 	.endm
 
-	.macro setmultihitcounter value:req
-	.byte 0x8d
-	.byte \value
+	.macro unused_0x8d
 	.endm
 
 	.macro initmultihitstring
diff --git a/include/config/battle.h b/include/config/battle.h
index fbc41be6ba..1b19d0d2c9 100644
--- a/include/config/battle.h
+++ b/include/config/battle.h
@@ -6,7 +6,7 @@
 #define B_CRIT_MULTIPLIER           GEN_LATEST // In Gen6+, critical hits multiply damage by 1.5 instead of 2.
 #define B_PARALYSIS_SPEED           GEN_LATEST // In Gen7+, Speed is decreased by 50% instead of 75%.
 #define B_CONFUSION_SELF_DMG_CHANCE GEN_LATEST // In Gen7+, confusion has a 33.3% of self-damage, instead of 50%.
-#define B_MULTI_HIT_CHANCE          GEN_LATEST // In Gen5+, multi-hit moves have different %. See Cmd_setmultihitcounter for values.
+#define B_MULTI_HIT_CHANCE          GEN_LATEST // In Gen5+, multi-hit moves have different %. See SetRandomMultiHitCounter for values.
 #define B_WHITEOUT_MONEY            GEN_LATEST // In Gen4+, the amount of money lost by losing a battle is determined by the amount of badges earned. Previously, it would cut the current money by half. (While this change was also in FRLG, for the sake of simplicity, setting this to GEN_3 will result in RSE behavior.)
 #define B_LIGHT_BALL_ATTACK_BOOST   GEN_LATEST // In Gen4+, Light Ball doubles the power of physical moves in addition to special moves.
 #define B_SANDSTORM_SPDEF_BOOST     GEN_LATEST // In Gen4+, Sandstorm weather multiplies the Sp. Defense of Rock-type Pokémon by x1.5.
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index f8619880d0..0375cfeed0 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -481,7 +481,7 @@ static void Cmd_statbuffchange(void);
 static void Cmd_normalisebuffs(void);
 static void Cmd_setbide(void);
 static void Cmd_twoturnmoveschargestringandanimation(void);
-static void Cmd_setmultihitcounter(void);
+static void Cmd_unused_0x8d(void);
 static void Cmd_initmultihitstring(void);
 static void Cmd_forcerandomswitch(void);
 static void Cmd_tryconversiontypechange(void);
@@ -740,7 +740,7 @@ void (* const gBattleScriptingCommandsTable[])(void) =
     Cmd_normalisebuffs,                          //0x8A
     Cmd_setbide,                                 //0x8B
     Cmd_twoturnmoveschargestringandanimation,    //0x8C
-    Cmd_setmultihitcounter,                      //0x8D
+    Cmd_unused_0x8d,                             //0x8D
     Cmd_initmultihitstring,                      //0x8E
     Cmd_forcerandomswitch,                       //0x8F
     Cmd_tryconversiontypechange,                 //0x90
@@ -2538,6 +2538,15 @@ static void Cmd_resultmessage(void)
 
     if (gMoveResultFlags & MOVE_RESULT_MISSED && (!(gMoveResultFlags & MOVE_RESULT_DOESNT_AFFECT_FOE) || gBattleCommunication[MISS_TYPE] > B_MSG_AVOIDED_ATK))
     {
+        if (gMultiHitCounter && gMultiHitCounter < gMovesInfo[gCurrentMove].strikeCount)
+        {
+            gMultiHitCounter = 0;
+            gMoveResultFlags &= ~MOVE_RESULT_MISSED;
+            BattleScriptPushCursor();
+            gBattlescriptCurrInstr = BattleScript_MultiHitPrintStrings;
+            return;
+        }
+
         if (gBattleCommunication[MISS_TYPE] > B_MSG_AVOIDED_ATK) // Wonder Guard or Levitate - show the ability pop-up
             CreateAbilityPopUp(gBattlerTarget, gBattleMons[gBattlerTarget].ability, (gBattleTypeFlags & BATTLE_TYPE_DOUBLE) != 0);
         stringId = gMissStringIds[gBattleCommunication[MISS_TYPE]];
@@ -12019,33 +12028,8 @@ static void Cmd_twoturnmoveschargestringandanimation(void)
         gBattlescriptCurrInstr = cmd->nextInstr;
 }
 
-static void Cmd_setmultihitcounter(void)
+static void Cmd_unused_0x8d(void)
 {
-    CMD_ARGS(u8 value);
-
-    if (cmd->value)
-    {
-        gMultiHitCounter = cmd->value;
-    }
-    else
-    {
-        if (GetBattlerAbility(gBattlerAttacker) == ABILITY_SKILL_LINK)
-        {
-            gMultiHitCounter = 5;
-        }
-        else
-        {
-            // WARNING: These seem to be unused, see SetRandomMultiHitCounter.
-            if (B_MULTI_HIT_CHANCE >= GEN_5)
-                // 35%: 2 hits, 35%: 3 hits, 15% 4 hits, 15% 5 hits.
-                gMultiHitCounter = RandomWeighted(RNG_HITS, 0, 0, 7, 7, 3, 3);
-            else
-                // 37.5%: 2 hits, 37.5%: 3 hits, 12.5% 4 hits, 12.5% 5 hits.
-                gMultiHitCounter = RandomWeighted(RNG_HITS, 0, 0, 3, 3, 1, 1);
-        }
-    }
-
-    gBattlescriptCurrInstr = cmd->nextInstr;
 }
 
 static void Cmd_initmultihitstring(void)

From acdd447160f6e069a57b291ab551e0a65a181ee9 Mon Sep 17 00:00:00 2001
From: Alex <93446519+AlexOn1ine@users.noreply.github.com>
Date: Sun, 1 Dec 2024 01:19:08 +0100
Subject: [PATCH 4/5] Changes Max Phantasm move anim script call (#5737)

---
 data/battle_anim_scripts.s | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s
index 55abebbbf0..48ccc089dc 100644
--- a/data/battle_anim_scripts.s
+++ b/data/battle_anim_scripts.s
@@ -34257,7 +34257,7 @@ Move_G_MAX_TERROR::
 Move_MAX_PHANTASM::
 	createvisualtask AnimTask_DynamaxGrowth, 0x5, 0x1, 0x1
 	waitforvisualfinish
-	goto Move_PHANTOM_FORCE
+	goto Move_SHADOW_BALL
 	end
 
 Move_G_MAX_GRAVITAS::

From 987264caea512645d06d999531e56e7e4b4c1ac2 Mon Sep 17 00:00:00 2001
From: SarnPoke <77281351+SarnPoke@users.noreply.github.com>
Date: Sun, 1 Dec 2024 01:35:44 +0100
Subject: [PATCH 5/5] Deoxys Sprite/Animation Fixes (#5603)

---
 graphics/pokemon/deoxys/anim_front.png        | Bin 1484 -> 1494 bytes
 graphics/pokemon/deoxys/attack/anim_front.png | Bin 1705 -> 1787 bytes
 graphics/pokemon/deoxys/attack/normal.pal     |   4 ++--
 .../pokemon/deoxys/defense/anim_front.png     | Bin 1280 -> 1670 bytes
 graphics/pokemon/deoxys/defense/normal.pal    |   6 +++---
 graphics/pokemon/deoxys/defense/shiny.pal     |   2 +-
 graphics/pokemon/deoxys/normal.pal            |   6 +++---
 graphics/pokemon/deoxys/shiny.pal             |   2 +-
 graphics/pokemon/deoxys/speed/anim_front.png  | Bin 1599 -> 1681 bytes
 graphics/pokemon/deoxys/speed/normal.pal      |   4 ++--
 src/data/pokemon_graphics/front_pic_anims.h   |   3 +--
 11 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/graphics/pokemon/deoxys/anim_front.png b/graphics/pokemon/deoxys/anim_front.png
index d2f3e993818961667895514e9aca7a3d3685cef7..fc782931d1587be45130f8000e6b5e331e1eeace 100644
GIT binary patch
delta 1463
zcmV;o1xWhL3)TyeB!35VNliru=n5MS9v0DHT=W0{02g#cSaefwW^{L9a%BKVOhiyl
zM<8}(av(D<G;xKb;Q#;t2y}2xM@LLVGXMYp07`%<9{>OV1ZP1_K>z@;j|==^1poj5
zFi=cXMfjkw%t1l;u#o?AN?<rRXvpA199cL}U{H{-m|(CN7?DX3f8hqpn*aa+0b)x>
zME|7+^2GoE1o}xtK~#90wU*C|<2Dq>Jzy~CCSvH~|H8b?(gq4K($Et2&=N#4OV2$l
z6lT~OyXmE27@`__oV^unk~FEHyO&<}U+A@$rGLU4y7xUy`y@N@kJw3Js1AcY?~||I
zd$OdjWi<vLHvdx}e`nA?PV@l!$Kp2NI3{7Ak5Phm15Ai9Flc5PT@??UT_S*a3~F&l
zE{X~0#ibAcQq+M^ZF33x$>vf_6f_i^=ayO&3hKwZuU0Oov<7@(5iNn4@n`G1?=!0E
zDTY5-76M%Na3tT!IZYctssS6k%*BVF<b1^205(Vo9a==bfAi*a#hZXyF#MYhEqjw}
z=M?-(tFQ>mA`4v@p`6htb4sz$a#0Jw)6dEUpJLpPCAho=z*4Bf-_ux1oTf-2F+g4#
z^SxI~1U{N=CFE=72ou@^zrOtw0h*HS;+ncz;JH--4)cHcSpzsBSx>|@O3X~e-kK$k
zmoWH7$5Smme-VplS4!Z?MHGo7(;3pd*Gj5T<jc%C9jaR~jb@yhk<TaP)&OVR*K;bR
zEL*v1MQL8L29gcN8K~X*vyr;L&x+M_rZQ29u57>jHuMp=FWy5TWs+ES8OP^9Jv@9U
zIxK`t($r#JxvtC~y!rd#gSX0oiJ6(D6~M(MQXYU2e^q&jbpW@7&wy4`tANcs+5>mr
zsiKGFGY>qB_523ll>&X5AwcT@*#n=00RlIu0ecDiCHR3C&;aA3N*woFj)!{kz+34#
zssfmsd3C<j*(*hQ=YDf*neo{T3Sff>6FzN;TiBkwKNsUxz{U)`GzV&pEK@B~v(KRm
z@P<2}e=SD~TjZKt#(tXsW{(6nK<f+zf!n_a^*&Y!J&8@*+hm5qLTuV>be+(E+YMOQ
z>Yyvf-N;S><TP+B2Ll|bqDbPgfa+}ZK8eTI`B=cp9u1K61Yn=A5NEyP20=TB1B0-?
z+_eCR1CN0xVoA8#Ak-wBh)i!MyEo3n9ZK-Zf5jP!NbURq9%L8OJ2CbV*#m1SuC}t6
zBR~gnt1SdTx&z2oCY!i;4J0~<>1_G&?RXDZPAtR84xs8g5&gj`3QiO`GMpB7f*m~j
zP0W7B6MKJ2gm_iS^>ntY0{wxM?x?&(*7z<Hnd~Z82+XVNNz@jJt^BqEG(H(DL&h>I
zf7TG+=qRnmod^{ca*3A>9x!}_pZ&ZBgj1abY5*buxSp1%3J8qpG;!z#;(;t_uOi_{
zljUx_)JHmneuYpvubGN-;2LrdQa5u1+u|raB8)x#I)i>4C`X3Z-lwnrf<f1(PZ0Rz
z?F$$TI{}Ic3bM2tpzvaO<cQE0CxF+zfBQ0HQ8JxEbQQG$u2KQjDQFjTbr9!7se46l
zIOpLsk(*}R_ATvER(e&!M5zM_M){l9ua&JofN2~@YH|P!9{zcMKja7q{gvD{B$(TO
zk1of9QLF(ulW7ysCMH{=8B_w-H*FZ`!o;}7nT3-$IjGW@7|P5oz815z8P_fcfA6gP
znkUWqHPF|6c74}ujOP3}VgoQg=vYl>4gs1)=F*PS*ck(Ee~zVe05MjGCL;?vT#R!A
z=0YQ^!$L6db7=<c9)dw}BX$CX06JFzEkJ1uP6AeYmUh`5c0TqG0a5}soCKhyj0&Jz
z(hBTlgWd_C)eF^}Mb-*bR8In=E#;db)!*2s04r#jqxKd57c=z#`;5Xy{0k#q&!myu
Ruvh>9002ovPDHLkV1musmb(A|

delta 1466
zcmV;r1x5PS3(O0UB!4haOjJeqps=`TX!x*@_;5&II5=p?;8-{?I8b0vkg%9wuoxH^
z`1tt1z|e3wh*(ficzAFfL~c<4000SaNLh0L01m_e01m_fl`9S#000F-Nkl<ZScQd`
zy^GvN6u@N=2&T$JL(Zs+57H}7hs{<yk@CS73Fa8IzAlg|)qk2GRvc-Ti&<Ha@*p1=
zG|?`%o?yF9{($@qw(C@Gu1V$ME^oBjTa8xQo90e>KfU*6-kbN{T9&!!2iD$257}P1
zeGmNMKH#%M@b{^>^Z7&Y=@-2^s4K*=&mia_Y`8xb!vDyHpa(dL9|>_vDR@05BJYtn
z`I}PO2Uw%0=YKzb&*-S=1FY4#k~HcSBk(%w*RL1(IoqROujjK-G~6SPSn9!^v$j78
zvH*Cmibx&;4FlSzB7#2-0T&(h$)SYN0^{wgE;#{Evp}g3!wHKHAOtVX2QQwL{(%C2
zm#|@Qk*UG+ze<{B%7vYsgis_oVK1I>dhjGxJ1Kz*9Dh+*a-=95CSp>yRS+ngF#?zj
z%yL9b+A6|<m7E~A&Xx`pC9{&;R+dt#u+)W^5Ez&)6joA%RK0wO5CqBGD*dA6f>`*J
zy?UhxUX3KSLKE<Z&KQBw<>jl=r}Q93cbch%J~}71&%Eo)%ThZ!p4bLZ>P;ZPuC7O*
z0WrZXH-Gj~dI%8k;OqYe{teJ@LL!h`q32@Aea<M$=IDe8q;nGb5&=djAEuo^;Nwx3
z%$@O~6IlA-aawZ!A?pTKn2w$*`GZV9wE#Ly^J55n8p-g%co(o~k>+Orc)ld8HSi{Y
zbh^ZhXCsSjG)NO*DY^jq)eT_WAMT|ktW%&iVSmQLk_S250F?$anwDJwmC<^eycsKW
zLIdk6j0c54_PFUIu8Z8QtDo)8Jj=-*w@Oi(Z>pcI|3RQ=0dv^`3>WZ)2@pJp7Vucs
zm8Ak?6L2PYmon+m^~Tn~K{mMol6abmoFlOIi?@LbA;fq=M_ZuK(bYDl>qA<Ku_AQA
zw|{_+E+)1k)@q1S`mHnoN6e?G*xJFQ+W@ixtW;aR0d(x5CV*#^2r=C%Kq0B)haPH$
zmNVVTtKb_zE0*gFj<yf@g-NJ3E%$Vu3LyJhQ&opm(I>t``#-JZAMOqa&b0A>6T(i%
zSvF1#M+`6%9=~5^+n_Mv0%hMdfkd3HHh<Z1haL%mjSZUZd6~r|t1~c!<cT<@-$JvL
zlU1gsc@2o<T*Q*PMjghK7pJw0e0eVZ)Lml>IMYcw7kT}{Ui}*XBROltCK2;A7xT>*
z<mrj-O3h7VxK`Pseuo3X%*+L%5SV8rt9Q0~{Zp&)I;R>~fgd3fMe3JUs#wWb8-Gc&
zGmW?(^Dk#+q%r?do@)q;(5Lspug<v9{+&!!Ue@ae7rTFGsK7Rtohp^qfbJ)5&~if?
zbyT&mrQi$^46L3dDd-tu(3`P@!r;x@axm-%+`;d^m9ppuXz=DO?-_H}PEfV*v<p)s
zmzw~ka;Oh**(e_k8@N?k7COqSY=0NPQBb{mr_Q1%N>#4nwj8^6q29kI3gCW>@ypvl
zh#tPbx?1?FY>qLWF55N`7+qamhcKvsdDgZOQbxbI{uldeI*)aX+cpqzgX<6js+2fQ
zb5iU$>EYE4t81~0cf=Lo>i(>O9rbz<mr4W}({*n5d%VX8pao8OmlPFXVt;!)#1W(?
znoDh8mF#X$3DgQgEc*P&?*{aIfVT?ggVycbtj2uM36M?u=YIE31PxR-+=eH!E}-1Z
z2e#V{NZ1Ua;oVLzCEb*^9xvrhX|kcy%WaRb>Ct|`;+==x1dK}B0ob<zT16MI?E!Yz
z@4aTTy%p%RVE}d~Fl;>W-7~y2=f{rLY!6MKJMEe_ZUy%KGQDL!sFu79Aj9g<|I8)+
U@k3AW7XSbN07*qoM6N<$f{6jhNdN!<

diff --git a/graphics/pokemon/deoxys/attack/anim_front.png b/graphics/pokemon/deoxys/attack/anim_front.png
index 0b43a9fe11e147604f6fb112102d703d15d38de5..566e80eafd01372ad38973a81193358cd53aade8 100644
GIT binary patch
delta 186
zcmZ3<`<r)yN<Djtr>`sf3odCsWfl*^R3-)n2JsTth?3y^w370~qErTVAC~|>cZIUl
zA_ZeTlfu>|4}nTJN(%hkfilKGHiK7#raX{hNq6*hWMJ6X&;2Kn705RT@CkAKv0y`j
zg~k73uQQI05)u*_CmsY$*f1kugGE3>fknrU9}_(Vq&K|Eiw3G^O!9Vj`M;F?(@_Qn
hHhE7M$B>FS8*60Q1pY}WvjgQBJYD@<);T3K0RUEdIz|8h

delta 84
zcmey(yOMW;il9M&Pl)S}1sf79EPfPt?8wNN*sr3TH|d2h0|NtRfk$L90|Va?5N4dJ
l%_q&kz$WkM;usRqy78PWn}EP`+YF#O22WQ%mvv4FO#sU48dLxP

diff --git a/graphics/pokemon/deoxys/attack/normal.pal b/graphics/pokemon/deoxys/attack/normal.pal
index 246d4784a2..52ddbb8fc6 100644
--- a/graphics/pokemon/deoxys/attack/normal.pal
+++ b/graphics/pokemon/deoxys/attack/normal.pal
@@ -3,8 +3,8 @@ JASC-PAL
 16
 248 160 176
 96 56 56
-248 112 72
-184 104 104
+255 115 74
+204 65 65
 24 24 24
 104 200 224
 80 144 176
diff --git a/graphics/pokemon/deoxys/defense/anim_front.png b/graphics/pokemon/deoxys/defense/anim_front.png
index 2ee6e0c527eddef7c6f11f0f0e651cb6cbbf429d..ce3cdad39cf4eaeca8018faa22cef35fdac81e0e 100644
GIT binary patch
delta 1640
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

delta 1260
zcmV<I1QYv)4S))eB!4haOjJeqps-*#IKXIV_;5&IKrryIkZ8!@P>`@VP+*u~uoxH^
z`1tt1z|e3whyVZp0000DLkd>_000SaNLh0L01m_e01m_fl`9S#000DbNkl<ZScUDD
z&5q+l5XWs!kx$sYz$oJ4@*bkTxl6E7Zu<-?9smxum)q<i9e<3FW;~J;WjJ$yi#J|P
zM*RQ_VjpA$PeZl8#vdKu;6xvyDD_MAzpB6fmNgizYt0TH#ml+4{naakxg6{pL;;^(
z20jlo;9s8M>qrBaQ`m9z9Rj$QfW;TDqv!~J5MBWGSFfY*{{#=woMN&2@`vc>r61t>
zaAQ=EEafli<bMb2Jl>grPhxNXQPK=~qOME;%fqt<*6|%0Tk+XCgrD9#4>o5+EKI;F
z^Z=e?HB10w=qt~=2-xBlH|i~|#->EUO~4U1fBj9sDm4OZl?I#Nex=n~$<hqSk}~Mk
z+@}ar5tPC9)d>KWkFuNsw%Df@l?lL$MO+FqU~7Ov`+syQf&hw83LVK)oB*WpRuv>+
zX)TL|K?DIza2H;}5;rChx=P@o3!Dlqa(663YeYC9LP?F_`9!4#1P^JMN?qw<qS9W)
zsbIpx4efi6FTQ0Xm8=3#JX_KXJ|~qEK&IlPXV4N1fR{_jIHfPa)6LwE7StBGOc^JA
zr5{k4)_=Ip3JBojKP%}Dp>~h!q$;J}XdW-U78r=2A_!ol&tcRo4d56^5kn7(7Pw{x
zK=_KjR)Aj5o(Nm4;xfc)S^`L)Zp09f1XMq10IFR#0CGw4E5K_2w_gSmq?*;g*hoi|
zfOHIqSpf3%{tkM8rS}i-1G^7N^8>>xy%^Mp4u7zbfanSM@eKj}M%2Kr1=b&u8t6pm
zKFNL70N#4L;~Ee{;N&%cy_P%O%3dSb5I~t}ARPmK2dtn0T9ph4IQq>yU<aWYfL1lD
zfT#zQ8c-7ehk!o%4Nyh$KEPEC)K_%9?z-1)8BXC4;6PVK1@v2KIkB?(Krsd^+O5`U
z4u7yJpqK|7Wz7Tau&cmAm2~5ohpU>5Gq3o+IR3XN|A9rZz4&;Zu_!h}b;m!twMF5D
zA<nl6y5e1JQ6>bPriUoHrAxMUAY($Gl}JWR9H6Y4Ikp&{fQMLK;~~oEVdZp?gW-<$
z1SODc9noD^!nr!?{S>wkTvCFZrpY*c)qlhg061S$f>>@7c)L12$`b^=IkZM9loH4)
z1)bG&1PGs@P9P~oRiOgbSII(p>~bBKGAZ@0blic1cnnY+qAD)a3|-51#i|cH+)=zv
zARiJym#)sF-v=jY<2$vD4jI59A1t}EZU3)GW|SNbQFJrt^;tIm*Pq*nMmz+ZeSf7-
z)f^F%P32Hbojlc~lIe{#9!gafMO9hUG;TSqMNvvUPQx_%7R5B2zC|$ttwllLMxe7O
zM$1bHu(K#;pnS3@W)TEHV^NHNgRC<cCey5e&OaE-aKd07Xg!VwLL=a}Kwt(Q|7agt
zW(MxxXWhFRW(FXSo`4s>n}9g$9%a4z_s1!)*g*&E<E)qfj^94r1jq|O^Y8{QcBWo;
z9)=uCb^++h@QkYk?L#pGw5{}vTk7-#T-cOD2VzW7w17c^HTDlP!@hL(y3zQDdi(<>
Wqydg=Q!o7h0000<MNUMnLSTZQJ2$%k

diff --git a/graphics/pokemon/deoxys/defense/normal.pal b/graphics/pokemon/deoxys/defense/normal.pal
index 8b37f5111e..4beda86136 100644
--- a/graphics/pokemon/deoxys/defense/normal.pal
+++ b/graphics/pokemon/deoxys/defense/normal.pal
@@ -3,9 +3,9 @@ JASC-PAL
 16
 248 160 176
 96 56 56
-192 104 104
-248 112 72
-96 64 48
+204 65 65
+255 115 74
+68 28 89
 240 176 144
 104 200 224
 80 144 176
diff --git a/graphics/pokemon/deoxys/defense/shiny.pal b/graphics/pokemon/deoxys/defense/shiny.pal
index c1f34410a4..3f285246c6 100644
--- a/graphics/pokemon/deoxys/defense/shiny.pal
+++ b/graphics/pokemon/deoxys/defense/shiny.pal
@@ -5,7 +5,7 @@ JASC-PAL
 112 96 16
 168 168 56
 248 232 64
-96 64 48
+49 29 82
 248 248 216
 112 208 168
 72 160 112
diff --git a/graphics/pokemon/deoxys/normal.pal b/graphics/pokemon/deoxys/normal.pal
index 59124c56a9..e11c277719 100644
--- a/graphics/pokemon/deoxys/normal.pal
+++ b/graphics/pokemon/deoxys/normal.pal
@@ -2,12 +2,12 @@ JASC-PAL
 0100
 16
 248 160 176
-184 104 104
+204 65 65
 248 176 144
-248 112 72
+255 115 74
 96 56 56
 104 200 224
-88 56 48
+68 28 89
 56 80 96
 80 144 176
 152 96 176
diff --git a/graphics/pokemon/deoxys/shiny.pal b/graphics/pokemon/deoxys/shiny.pal
index 5bbc6b683a..621aac6d42 100644
--- a/graphics/pokemon/deoxys/shiny.pal
+++ b/graphics/pokemon/deoxys/shiny.pal
@@ -7,7 +7,7 @@ JASC-PAL
 248 232 64
 112 96 16
 112 208 168
-112 96 16
+51 27 101
 56 96 88
 72 160 112
 96 120 192
diff --git a/graphics/pokemon/deoxys/speed/anim_front.png b/graphics/pokemon/deoxys/speed/anim_front.png
index 947052f81d3a35acab3d090403df550dc6f83e91..1f2063bddf7c8a1db431d0fdd69202f7448b063a 100644
GIT binary patch
delta 159
zcmdnbGm&?KN;rFor>`sf3odCsB~~@vl&cI34B{oO5hcO-X(i=}MX3z#J}v=%?h0k8
zMGD4xCWWm_9s-qcloa^617(bXYzD6eO?e>2lJ4m1$iT3%pZiZD>qJFy&i}<;5)u+;
z933Y*N=QrWyr>9N#F*sm?(%;r`=_G}46Iu{T^vIy=4`Cl%qqZOck>0vFi%%Mmvv4F
FO#lqnF2Mi*

delta 116
zcmbQpyPs!*N`ygxPl)S}1sf~^5&|Y{$T;yJ!NTH4fro^I#DR>A0|ze5NZ9b>$BzPw
zj);JOii!dTFnDcYcooRtEbxddW?<ku0>X?_wfUqO7+AM@x;TbJv~E1NnN{Fb@P>~d
N4W6!kF6*2UngDyWDt`a~

diff --git a/graphics/pokemon/deoxys/speed/normal.pal b/graphics/pokemon/deoxys/speed/normal.pal
index dad052e1da..ea1073a0ee 100644
--- a/graphics/pokemon/deoxys/speed/normal.pal
+++ b/graphics/pokemon/deoxys/speed/normal.pal
@@ -6,9 +6,9 @@ JASC-PAL
 80 144 176
 104 200 224
 96 56 56
-248 112 72
+255 115 74
 24 24 24
-192 104 104
+204 65 65
 192 192 208
 152 96 176
 248 248 248
diff --git a/src/data/pokemon_graphics/front_pic_anims.h b/src/data/pokemon_graphics/front_pic_anims.h
index d802521afe..5b49ed6d20 100644
--- a/src/data/pokemon_graphics/front_pic_anims.h
+++ b/src/data/pokemon_graphics/front_pic_anims.h
@@ -5205,8 +5205,7 @@ static const union AnimCmd sAnim_DeoxysNormal_1[] =
 {
     ANIMCMD_FRAME(0, 16),
     ANIMCMD_FRAME(1, 16),
-    ANIMCMD_FRAME(0, 26),
-    ANIMCMD_FRAME(1, 16),
+    ANIMCMD_FRAME(1, 26),
     ANIMCMD_FRAME(0, 16),
     ANIMCMD_END,
 };