From 37b6f031c8786bfe04ccffc64f20c463ccd75903 Mon Sep 17 00:00:00 2001
From: Cafe <46283144+Cafeei@users.noreply.github.com>
Date: Sun, 26 Jan 2025 20:27:05 +0400
Subject: [PATCH] Duraludon battle animation (#6086)

---
 graphics/pokemon/duraludon/anim_front.png      | Bin 0 -> 1595 bytes
 graphics/pokemon/duraludon/front.png           | Bin 891 -> 0 bytes
 graphics/pokemon/duraludon/shiny.pal           |   2 +-
 src/data/graphics/pokemon.h                    |   2 +-
 src/data/pokemon/species_info/gen_8_families.h |   2 +-
 src/data/pokemon_graphics/front_pic_anims.h    |   9 ++++++++-
 6 files changed, 11 insertions(+), 4 deletions(-)
 create mode 100644 graphics/pokemon/duraludon/anim_front.png
 delete mode 100644 graphics/pokemon/duraludon/front.png

diff --git a/graphics/pokemon/duraludon/anim_front.png b/graphics/pokemon/duraludon/anim_front.png
new file mode 100644
index 0000000000000000000000000000000000000000..32624a4988e089d0b135371c5a7085d5c5a13494
GIT binary patch
literal 1595
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

literal 0
HcmV?d00001

diff --git a/graphics/pokemon/duraludon/front.png b/graphics/pokemon/duraludon/front.png
deleted file mode 100644
index fd22d471ee530a6cc3ac9d62a2a6720402842cde..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 891
zcmV->1BCpEP)<h;3K|Lk000e1NJLTq002M$002M;0{{R3owtGP00001b5ch_0Itp)
z=>Px#Fi=cXMV!*4Vuh?RU5jcoIS>#Kdx4bh;(LRAVvB*Kw6@I%BvSwX|7u}#y=iI~
zIAY%7_E%R?fB*mj`AI}UR9J<jmw|GlFbqTs5j`7J>;M1ub|srQA)&?5Ovxm$4|y#K
z`t@}dx7+RX{BQ9iKR5jlkUs%10oy(xFafhq07$?_Q&3U8DUV|*sEMVFW41AZnkC%a
zHkvR1fHWfWpfU{D0+6o~dOckn1#GlYvt9;-K5xl{0K`=QQ+NG00NBnELT3K|h5@$u
z`oFal837;#s9;~2p|=qicw4yd`VoM;pt;DBY!JX!%93ocL4rsU&wm+C0eS*R7y~c}
z7$kfS*cyN)T(2e6Vg>j%q{}II4<hP5UQa={&7M=Z2r%nSP}KDw2<qXV9RLLE$)dka
z=cdY<mg?bsA8lF4IYDS!H3(>f?O_S(2R)had&)t```0j0E#y2Wb(xQ`7FK?XlsbTK
zg0z(2q<_930MQ-?XynZ5wY?6YM_Bf~U^?kY0OAg?5P%R%@UNR{Apmm36Jeca*W<EG
z3nH>V8|j}?&TCjuDIEywgma;xUYb5hY~xxepUd0<lJxpA&w_{+P)VV;umu3z0s0<*
zlf3~5UJ%bQg?H4`_%LBDB$Rn-0Pg3(#(CGn{VltTI{<_-72G0m)Y_}YSR+4C2kiS0
zdfcB7?v?m}dQp)pw@BuA9;2>00PPVt0E$SKH?56x;<J#TX(hpnqK=d-OhbH;CymYb
zDm+l8X)U$3bDfG<`xN@K!Qk&@D)T&fZC8LTkfVg90p1eSUu!Y|BzS260QC}0B$m$!
z8czTxpe`6-;D@C)VT|Xu0AGO5Vwqb^)8u>b1b9to3FK4>@RB=UO4+By89?_tuv4Vg
zjm!5@ahk#%kW)p3TJEpDXMj$hYrlH5a}nEnz^WbpspAiTbR?i(^$y4nfbLnph5E&F
ziru_>+-!JEAXNZoZh8jX=gA)OxPr8%>LUJ*Z}4H5bn5N`_ZMqS4oK`*O|OelS{yeB
zIaWYsZ@mG$2@tr(2A~Vq{*h82i>1A`qT}UK0$iF82%m?C75<s=6&^kQ{2#cTOV_px
R>@WZT002ovPDHLkV1mD@k-q={

diff --git a/graphics/pokemon/duraludon/shiny.pal b/graphics/pokemon/duraludon/shiny.pal
index 19e7323e31..9ac865c3f3 100644
--- a/graphics/pokemon/duraludon/shiny.pal
+++ b/graphics/pokemon/duraludon/shiny.pal
@@ -8,7 +8,7 @@ JASC-PAL
 16 16 16
 81 96 101
 226 157 109
-253 248 236
+242 211 111
 118 138 154
 149 163 164
 8 36 82
diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h
index 4c6fa671e2..70e32a9c40 100644
--- a/src/data/graphics/pokemon.h
+++ b/src/data/graphics/pokemon.h
@@ -24186,7 +24186,7 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
 #endif //P_FAMILY_ARCTOVISH
 
 #if P_FAMILY_DURALUDON
-    const u32 gMonFrontPic_Duraludon[] = INCBIN_U32("graphics/pokemon/duraludon/front.4bpp.lz");
+    const u32 gMonFrontPic_Duraludon[] = INCBIN_U32("graphics/pokemon/duraludon/anim_front.4bpp.lz");
     const u32 gMonPalette_Duraludon[] = INCBIN_U32("graphics/pokemon/duraludon/normal.gbapal.lz");
     const u32 gMonBackPic_Duraludon[] = INCBIN_U32("graphics/pokemon/duraludon/back.4bpp.lz");
     const u32 gMonShinyPalette_Duraludon[] = INCBIN_U32("graphics/pokemon/duraludon/shiny.gbapal.lz");
diff --git a/src/data/pokemon/species_info/gen_8_families.h b/src/data/pokemon/species_info/gen_8_families.h
index 4281b019ea..d372fb3b3c 100644
--- a/src/data/pokemon/species_info/gen_8_families.h
+++ b/src/data/pokemon/species_info/gen_8_families.h
@@ -5988,7 +5988,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
         .frontPicSize = MON_COORDS_SIZE(56, 64),
         .frontPicYOffset = 0,
         .frontAnimFrames = sAnims_Duraludon,
-        //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,
+        .frontAnimId = ANIM_SHAKE_FLASH_YELLOW_FAST,
         .backPic = gMonBackPic_Duraludon,
         .backPicSize = MON_COORDS_SIZE(64, 64),
         .backPicYOffset = 0,
diff --git a/src/data/pokemon_graphics/front_pic_anims.h b/src/data/pokemon_graphics/front_pic_anims.h
index 74b90bb340..3fceeb2ff9 100644
--- a/src/data/pokemon_graphics/front_pic_anims.h
+++ b/src/data/pokemon_graphics/front_pic_anims.h
@@ -9737,7 +9737,14 @@ PLACEHOLDER_ANIM_SINGLE_FRAME(Arctovish);
 #endif //P_FAMILY_ARCTOVISH
 
 #if P_FAMILY_DURALUDON
-PLACEHOLDER_ANIM_SINGLE_FRAME(Duraludon);
+static const union AnimCmd sAnim_Duraludon_1[] =
+{
+
+    ANIMCMD_FRAME(0, 20),
+    ANIMCMD_FRAME(1, 60),
+    ANIMCMD_FRAME(0, 2),
+    ANIMCMD_END,
+};
 
 #if P_GIGANTAMAX_FORMS
 PLACEHOLDER_ANIM_SINGLE_FRAME(DuraludonGmax);