From a669c4c10901ae2adf22bd907c07eb2aa2815c3a Mon Sep 17 00:00:00 2001
From: kittenchilly <mario.pikmin.zelda@gmail.com>
Date: Fri, 13 Dec 2024 08:26:12 -0600
Subject: [PATCH] New Enamorus-Incarnate sprite (#5797)

---
 graphics/pokemon/enamorus/anim_front.png      | Bin 0 -> 1755 bytes
 graphics/pokemon/enamorus/back.png            | Bin 734 -> 773 bytes
 graphics/pokemon/enamorus/front.png           | Bin 785 -> 0 bytes
 graphics/pokemon/enamorus/normal.pal          |  28 ++++++++--------
 graphics/pokemon/enamorus/shiny.pal           |  30 +++++++++---------
 src/data/graphics/pokemon.h                   |   2 +-
 .../pokemon/species_info/gen_8_families.h     |   4 +--
 src/data/pokemon_graphics/front_pic_anims.h   |   2 +-
 8 files changed, 33 insertions(+), 33 deletions(-)
 create mode 100644 graphics/pokemon/enamorus/anim_front.png
 delete mode 100755 graphics/pokemon/enamorus/front.png

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

literal 0
HcmV?d00001

diff --git a/graphics/pokemon/enamorus/back.png b/graphics/pokemon/enamorus/back.png
index 2e7af720cfc05968495d84e24b5616d3bdbab889..17668de57602a8011264a1523feaa8cf43416b81 100755
GIT binary patch
delta 730
zcmV<00ww+41%(EXH-FQm|NsBOxUF+*Xb=z(`;OqoQ@MXSga5@K_E7}QBO@p%DCUEt
zy;5pxGfIpdF}qP2Y5)KNgGod|R9J<bmWy_SAPk0;q;Qmi@Bg;T1r#rZxb$q@3jfDX
z60p-`3#Vb6{UDz;Y>4Y(yIc_F)pkTHHxS%)>P0^yxa-v2&wsIzF5wxV+o@wP*4Oo%
zeBj_b+Oyz}35*bcgUfKwf@>F`f8eB_z*zvhK~O+D4t4;@^hbc}0H6Y(09^BL1@x)_
zH3y`nABSoI9O|$e7&t7Tn_18Aq$v8afx3neoXD6kV>{Rf99ckA8P-3_*g&tVJWm2=
z(02$%ecAPWqJLS>yXGbau0E6oKmbZA*z}5^GKv*?Lu57egjHS<D2E#Kirh=_0s%|_
z*5Z5l#97mrH6j1j7sM-VrfBp#VcU%Il+sBrxg`B!0gyaA0cO~iWeXvU^eKf;xa!5i
zx-Q}K835Ql&w2n5fzU?4=LTR4Hhs?MAM^xZXMO;{#D5h;{{&$D$iRg8CxG;RXrKTx
z-T}c|^c9eAfZ!=!0PqSxoBk&OjRv{^ll}*x7_eO`_zU3C_%)O7uQLHWir(-YvDpJR
zLwU*a7{GKb)g90+ir^i+MDOK<S^#_;`9R2nIY5!W)KioPbMPgsdfGusQQ}0PQ)mW|
zc3oHcoqsb|BrrlQLNFD90NW}Nlim%~fLRUE^VLF#Oo(JblfjS}mnCM)2G}!Mps0Ed
z-jkI;U7&=RbE_wU34m;uH^C_^2-UCg`!x_yN`R<(VZ@Tu7!3fdtLbslh>{cj)B@N`
zm=A^$XjkLwpfo|$66A8OxeG{-^vtkWV7EsJ1yiDtzm_zjHbH8mmNAV9v<wrZ28Ub|
ztAu_UP;Zi^hI<!iW(OAb`}io~QA0f&-_)_t$eK1NHI&}wXa61W2ZSalp_n`1^#A|>
M07*qoM6N<$f*H?OF#rGn

delta 691
zcmV;k0!;md2HpjbH-FNkbv#i@N=l6(A;3>E^js6OX0@nSZU4nQ>4)dfgPydsy$}!(
z{QUd?0000009>-HTmS$9TuDShR9J<bmx*rWAPhwlKS4ye`TyUoH?p=bc0E!%sJaJl
zvCK3*3?Lf6>G|hZqrPn$3uzNWS`XE2gzo>z-``bCTjvnulz#<?0{pXMKW2=jI05YV
z9{_>=4d@dGk4Xr5z1=xOZx=vbzkpSkXM-UNz``a@U^YEb3ZeQ%oFK3mu%625mxZMy
z{X}~=em)rh71nY&q!*P?KP3X#0}z1JlOdZDY6*p504`!tHQWvPs$$guseZ<ytxVkk
zOsEn4ghB?eyML)4gcJbv3HVGAgol9I(62_QA%GX5R^0V%%>n4DuPp{R2=s7Z-C_V9
z<g^nULro)y5lShV$#WN=wZ;KN0knUQqmBj$>Ae*k0XpfU0M8?NE@V2HewuoQK*f`x
z5VfFO2rz=jBCagUx`qjy1wjk~xhr9U)dA8GXMF}R>VN3zG{Tw&c>eM^@QbadPeq6q
z0=GKul?XbaBk@wlQyu~Y*6U2XbV8<*SmuGCn+KsnsQ0ss)e4MCW^&*oiHBlUL$(SB
zpw*KZE)0NP-FT8-2&KKx)!{(n<)*nAhk>O80WfEGf>Iz~+52dBfChU3m`h<mdw9?w
z$1va*0)HO@5gbJj0&e<14vhdK;0_2cIh-$vqT!-%v1wp{Nf8x!y(dAwYFq)KKHgoB
zRrv~#-avRmkY)WGf}HGMm>`Sc006o&R`DYPkVRjU=R1NvA|uZyOXFsm1HfCeP#N)x
zQ5W`Wk9E!V_AbxTuLO)I$HTV6z9oY<ia!7c;w<Y!N}fA!gfDuMz3Mdx{F#K2yw^0G
Z2tS+`J7a3Mp#lH^002ovPDHLkV1lB(F2n!;

diff --git a/graphics/pokemon/enamorus/front.png b/graphics/pokemon/enamorus/front.png
deleted file mode 100755
index 67493a1e6b1deef6ed020f2cbb38e7acd05cb54b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 785
zcmV+s1Md8ZP)<h;3K|Lk000e1NJLTq002M$002M;0{{R3owtGP00001b5ch_0Itp)
z=>Px#Fi=cXMVZp1b}~9jN=lO<9>*>z^DZvCK3=X$SO3L4^Hh)Ebey!by$}!({QUd?
z000000Ngc#c>n+ck4Z#9R9J=0m)m;dFbISLwqz@y_kZ1;L5g$ewiSD|BtA4>=NAHm
z<=gFlHHCfNW#rajdfizPp;W7apyOu1a(Y~G?%_Uu@FYOT)%x{IhTs9P2f+RTz@R~m
zui1!1ZVpa>&-iJiBBci)2o&+8W|jj4L1zgm_32V_iZK5ka?h6{$7K||g)g_8z%u%6
zv%YOiLxfM{4$Ba>vKbGH1cv;6KN5tkl$}T8Qkr@Y7IT5wZqV{*b^(x*Re)D%m!XD+
zzLW%@Zrj#)1VDA_R{<bk{w-qAxQ?Jz5?1xv1?tA5Hq=8EhpmTzfZF(J_2e8X(kI9I
z1h9DI3_v|kPJ#M813(KoJIC+msdM~&Pw2JZ#NqtuXKe;RjGqA@53Tjuk;N)<xMTc;
z9t1y}HQZ~JLqv=2nRRd*MT3P5J=b9=#WQ*bpeP%FvIg%50SSEoLdh!ux?F<Oq?G$p
zk4BR0M#9!1QT?3B5#D4F9*bYXj^{+y34T!Y@L$K>k;$Xz6A*f+bA{yk>HycW=K!+%
zi&b=}-BX#A9ZhWyt1vKd%INX`;`>Fw%J3Ayxdxs9Kg7|dQ$a*S6r2!B0-!D_eYAs0
z3VJh8xaML=f>h^YrG#FxauNn0^e6&J?pB8bWdh*AW1FyO%B;-@GzY`E(OBIladXt&
zyAA;En~(kSnh)IAMMLdcntD7~#@}muttlRa{$`5+>))6y0rYd&H~m5sH8#lK5Ol!<
zCfw|=2wR$if7R0`oBAZco`8p~%t0Rnn_JyW@3D3Nt(@FG?bU&W7qG8@H`u7KpAZ9}
z*O;IBSQkI~;6A1s=WzRlh3B;Y{{H0iWygm<9t29qi$|`#4UDII;=26-s*En^!SKK)
P00000NkvXXu0mjf$JTVe

diff --git a/graphics/pokemon/enamorus/normal.pal b/graphics/pokemon/enamorus/normal.pal
index 43c4eb7a07..b8986ffd46 100755
--- a/graphics/pokemon/enamorus/normal.pal
+++ b/graphics/pokemon/enamorus/normal.pal
@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-153 210 164
-118 50 58
-74 74 74
-147 33 30
-199 46 41
-243 46 46
-187 62 94
-174 74 87
-255 197 60
-243 84 143
-224 116 156
+153 211 165
+255 255 255
 180 180 189
+105 106 115
 16 16 16
-252 252 252
-0 0 0
-0 0 0
+237 129 170
+185 81 133
+126 44 70
+255 203 81
+201 50 96
+157 36 61
+40 40 40
+177 109 135
+123 79 110
+82 50 75
+111 26 47
diff --git a/graphics/pokemon/enamorus/shiny.pal b/graphics/pokemon/enamorus/shiny.pal
index edbd1c73cb..41b6650a75 100644
--- a/graphics/pokemon/enamorus/shiny.pal
+++ b/graphics/pokemon/enamorus/shiny.pal
@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-153 210 164
-117 60 81
-74 74 74
-141 33 33
-192 79 50
-244 92 19
-179 102 181
-168 87 109
-255 197 60
-233 135 231
-207 131 158
-180 180 189
+153 211 165
+255 255 255
+194 184 173
+115 107 104
 16 16 16
-252 252 252
-0 0 0
-0 0 0
+251 142 224
+198 83 185
+127 58 131
+255 197 32
+246 81 4
+205 35 35
+40 40 40
+230 131 164
+189 82 106
+107 51 74
+140 29 49
diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h
index 39b11560d4..8801942e53 100644
--- a/src/data/graphics/pokemon.h
+++ b/src/data/graphics/pokemon.h
@@ -18880,7 +18880,7 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
 #endif //P_FAMILY_LANDORUS
 
 #if P_FAMILY_ENAMORUS
-    const u32 gMonFrontPic_EnamorusIncarnate[] = INCBIN_U32("graphics/pokemon/enamorus/front.4bpp.lz");
+    const u32 gMonFrontPic_EnamorusIncarnate[] = INCBIN_U32("graphics/pokemon/enamorus/anim_front.4bpp.lz");
     const u32 gMonPalette_EnamorusIncarnate[] = INCBIN_U32("graphics/pokemon/enamorus/normal.gbapal.lz");
     const u32 gMonBackPic_EnamorusIncarnate[] = INCBIN_U32("graphics/pokemon/enamorus/back.4bpp.lz");
     const u32 gMonShinyPalette_EnamorusIncarnate[] = INCBIN_U32("graphics/pokemon/enamorus/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 fd86f22ddc..ee08542523 100644
--- a/src/data/pokemon/species_info/gen_8_families.h
+++ b/src/data/pokemon/species_info/gen_8_families.h
@@ -7660,7 +7660,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
         .trainerOffset = 1,
         .frontPic = gMonFrontPic_EnamorusIncarnate,
         .frontPicSize = MON_COORDS_SIZE(64, 64),
-        .frontPicYOffset = 1,
+        .frontPicYOffset = 0,
         .frontAnimFrames = sAnims_EnamorusIncarnate,
         //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,
         .enemyMonElevation = 7,
@@ -7672,7 +7672,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
         .shinyPalette = gMonShinyPalette_EnamorusIncarnate,
         .iconSprite = gMonIcon_EnamorusIncarnate,
         .iconPalIndex = 1,
-        SHADOW(0, 17, SHADOW_SIZE_M)
+        SHADOW(-3, 19, SHADOW_SIZE_M)
         FOOTPRINT(Enamorus)
         OVERWORLD(
             sPicTable_EnamorusIncarnate,
diff --git a/src/data/pokemon_graphics/front_pic_anims.h b/src/data/pokemon_graphics/front_pic_anims.h
index deceeb0420..56ec319a57 100644
--- a/src/data/pokemon_graphics/front_pic_anims.h
+++ b/src/data/pokemon_graphics/front_pic_anims.h
@@ -9794,7 +9794,7 @@ PLACEHOLDER_ANIM_SINGLE_FRAME(Calyrex);
 #endif //P_FAMILY_CALYREX
 
 #if P_FAMILY_ENAMORUS
-PLACEHOLDER_ANIM_SINGLE_FRAME(EnamorusIncarnate);
+PLACEHOLDER_ANIM_TWO_FRAMES(EnamorusIncarnate);
 PLACEHOLDER_ANIM_SINGLE_FRAME(EnamorusTherian);
 #endif //P_FAMILY_ENAMORUS