From 7b036b3b5659a7e6f16cf8e005029d1739f32a52 Mon Sep 17 00:00:00 2001 From: amiosi <44352097+amiosi@users.noreply.github.com> Date: Sun, 7 Dec 2025 07:50:06 -0500 Subject: [PATCH] GBA Asset Fixes (#8382) --- graphics/pokemon/castform/back_gba.png | Bin 0 -> 373 bytes graphics/pokemon/castform/front_gba.png | Bin 0 -> 382 bytes graphics/pokemon/castform/icon_gba.png | Bin 0 -> 263 bytes graphics/pokemon/castform/normal_gba.pal | 19 ++ graphics/pokemon/castform/rainy/back_gba.png | Bin 0 -> 495 bytes graphics/pokemon/castform/rainy/front_gba.png | Bin 0 -> 549 bytes .../pokemon/castform/rainy/normal_gba.pal | 19 ++ graphics/pokemon/castform/rainy/shiny_gba.pal | 19 ++ graphics/pokemon/castform/shiny_gba.pal | 19 ++ graphics/pokemon/castform/snowy/back_gba.png | Bin 0 -> 628 bytes graphics/pokemon/castform/snowy/front_gba.png | Bin 0 -> 688 bytes .../pokemon/castform/snowy/normal_gba.pal | 19 ++ graphics/pokemon/castform/snowy/shiny_gba.pal | 19 ++ graphics/pokemon/castform/sunny/back_gba.png | Bin 0 -> 559 bytes graphics/pokemon/castform/sunny/front_gba.png | Bin 0 -> 656 bytes .../pokemon/castform/sunny/normal_gba.pal | 19 ++ graphics/pokemon/castform/sunny/shiny_gba.pal | 19 ++ graphics/pokemon/deoxys/attack/back_gba.png | Bin 0 -> 664 bytes graphics/pokemon/deoxys/attack/front_gba.png | Bin 0 -> 997 bytes graphics/pokemon/deoxys/attack/normal_gba.pal | 19 ++ graphics/pokemon/deoxys/attack/shiny_gba.pal | 19 ++ graphics/pokemon/deoxys/defense/back_gba.png | Bin 0 -> 631 bytes graphics/pokemon/deoxys/defense/front_gba.png | Bin 0 -> 1069 bytes .../pokemon/deoxys/defense/normal_gba.pal | 19 ++ graphics/pokemon/deoxys/defense/shiny_gba.pal | 19 ++ graphics/pokemon/deoxys/speed/back_gba.png | Bin 0 -> 694 bytes graphics/pokemon/deoxys/speed/front_gba.png | Bin 0 -> 945 bytes graphics/pokemon/deoxys/speed/normal_gba.pal | 19 ++ graphics/pokemon/deoxys/speed/shiny_gba.pal | 19 ++ graphics/pokemon/spinda/anim_front_gba.png | Bin 0 -> 634 bytes graphics/pokemon/spinda/back_gba.png | Bin 0 -> 684 bytes graphics/pokemon/spinda/icon_gba.png | Bin 0 -> 375 bytes graphics/pokemon/spinda/normal_gba.pal | 19 ++ graphics/pokemon/spinda/shiny_gba.pal | 19 ++ src/data/graphics/pokemon.h | 94 ++++++-- .../pokemon/species_info/gen_3_families.h | 214 +++++++++++------- 36 files changed, 505 insertions(+), 107 deletions(-) create mode 100644 graphics/pokemon/castform/back_gba.png create mode 100644 graphics/pokemon/castform/front_gba.png create mode 100644 graphics/pokemon/castform/icon_gba.png create mode 100644 graphics/pokemon/castform/normal_gba.pal create mode 100644 graphics/pokemon/castform/rainy/back_gba.png create mode 100644 graphics/pokemon/castform/rainy/front_gba.png create mode 100644 graphics/pokemon/castform/rainy/normal_gba.pal create mode 100644 graphics/pokemon/castform/rainy/shiny_gba.pal create mode 100644 graphics/pokemon/castform/shiny_gba.pal create mode 100644 graphics/pokemon/castform/snowy/back_gba.png create mode 100644 graphics/pokemon/castform/snowy/front_gba.png create mode 100644 graphics/pokemon/castform/snowy/normal_gba.pal create mode 100644 graphics/pokemon/castform/snowy/shiny_gba.pal create mode 100644 graphics/pokemon/castform/sunny/back_gba.png create mode 100644 graphics/pokemon/castform/sunny/front_gba.png create mode 100644 graphics/pokemon/castform/sunny/normal_gba.pal create mode 100644 graphics/pokemon/castform/sunny/shiny_gba.pal create mode 100644 graphics/pokemon/deoxys/attack/back_gba.png create mode 100644 graphics/pokemon/deoxys/attack/front_gba.png create mode 100644 graphics/pokemon/deoxys/attack/normal_gba.pal create mode 100644 graphics/pokemon/deoxys/attack/shiny_gba.pal create mode 100644 graphics/pokemon/deoxys/defense/back_gba.png create mode 100644 graphics/pokemon/deoxys/defense/front_gba.png create mode 100644 graphics/pokemon/deoxys/defense/normal_gba.pal create mode 100644 graphics/pokemon/deoxys/defense/shiny_gba.pal create mode 100644 graphics/pokemon/deoxys/speed/back_gba.png create mode 100644 graphics/pokemon/deoxys/speed/front_gba.png create mode 100644 graphics/pokemon/deoxys/speed/normal_gba.pal create mode 100644 graphics/pokemon/deoxys/speed/shiny_gba.pal create mode 100644 graphics/pokemon/spinda/anim_front_gba.png create mode 100644 graphics/pokemon/spinda/back_gba.png create mode 100644 graphics/pokemon/spinda/icon_gba.png create mode 100644 graphics/pokemon/spinda/normal_gba.pal create mode 100644 graphics/pokemon/spinda/shiny_gba.pal diff --git a/graphics/pokemon/castform/back_gba.png b/graphics/pokemon/castform/back_gba.png new file mode 100644 index 0000000000000000000000000000000000000000..6348a35e8662a831b8b9856698c74a3519c452b9 GIT binary patch literal 373 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|eg8-ip*P}dvo42zAB^XPB{DK)Ap4~_Taz1;yIEHw1zMZ_6 zugO59H8Fj|gBMA&Ut~OxP#0pi{-xK~vv1a^Tjd`_zi@64sLLwi>g?uD&nnti^PTOM z!VKf|bN7?;9@j28pEhTQ{?`^|pHG@hk6R42pZv2ja^R{E4cvMCSI95X(tOT@hk_2~ zjD2#B{11+@zHlpOWzAaj&Qjno=j@3q7TOyqoMTIHZU|TzH&Ila>BO4w6OT?YT(w-H zqs4aOS|b0^$;`FO7Hgru>s9&Yr zviADaPkXwnxD{KjF0pgiV*R7R+(dvo42zAB^XPB{DK)Ap4~_Ta{hR_IEHw1zMZr& z>rjA5TmCnPY^JhT6NFz}QF`W~ZvOtAGsp3j9I~^nPo8vfW%KMOoLs(bKCKn&7ES*D zk@eHs|HuE&=f1wPk+J*Y;<@iDvYr{5r#Z*yzHL19KmR?)%R5G8_v(!wD=U4Qcca4X z)Mi%Wbsfca&00zq1HvLCRx2!WV>J8ryZb|Vv_($X`yzovrbETLpFZB^R7||HGN4>l zWRiYWMUX=Eo=VZ5Y?(U9P)0iX$Vw}gTe~DWM4fbyla- literal 0 HcmV?d00001 diff --git a/graphics/pokemon/castform/icon_gba.png b/graphics/pokemon/castform/icon_gba.png new file mode 100644 index 0000000000000000000000000000000000000000..56c62ad07623d08995bbad6c547b2ce1774994fe GIT binary patch literal 263 zcmeAS@N?(olHy`uVBq!ia0vp^3P9|@!VDxk7i7!@QU(D&A+AYtnwy)8_wL>M|NsBJ zOB}y_)4ZDG_-%@2clG}yue0xp=ltKYWXaM0S!?DbB}F+pI!3OXkOI`pSQ6wH%;50s zMjDXQ>gnPbV$u6{(nj6}10EJz#)-xb0Y3dKJO}!{@Ioc8hrY1>Vj&lvbsF zMnrOWpAzl(fwN007PI_O!*`i_PAHw8c_lgT=+gl#7&FT2lZ2{}>n;jJtrL00001 zbW%=J06^y0W&i*IZAnByR7i>Kl&x;VFcgIwjYXQYvQ(NhEd`YVV^%Pf7bzJV7#bQF zyD{iAmawTIRzRiUOzI2d6#~YBtUbbf)BM)g$uu(3Ljum1;}hFAv)Nf^{g*CS`aTNW zN#LW%z61b1LRbJ3gmWa!z@h@+%DhI1{`SiZL=ghg7-5AW64Dr9#c_-gr75BY0A38h z;ukpAzl(fwN007PI_O!*`i_PAHw8c_lgT=+gl#7&FT2lZ2{}>n;jJtrL00001 zbW%=J06^y0W&i*Iqe(KkuggHF&Ku^^`O+z`49xb#fXEe_e(6qsf$Y|_w zV_cLL9ZOSU(pEY&Uw%Pfvb_)Q`+Z*sIS5lE%f zRRJ>#=zV}_Sh|D>Xa|%SU=uVHN_!5`0sWr=(2D#mUdas1WsnXV`U%mn;myV nSQ+E}tAE1Vz9UT7KM2ExobG_!~QgdobQcC~-{}>n;PDBos00001 zbW%=J06^y0W&i*I@<~KNR7i>KlreAHFc5{MT|j!(eip}Wvn(60|{SARuvP?m2UuGsP{xZ0}9#+qmFnN4~QxN zIq?uWwvcRic7U+Lnns{*_lSK!A49W7!QRwM#vPy|-BpILM-?z=OW<=!E_OR@0k zCzVtlP{h)G;&}JJ$px|!@p0Ptq?(-EbN(t3uuB^uQZ5q@Kz!uJ0TAZG*&{0vI^h7w zdW`$N7*Gj|OD=WO$lS5Wh&aS@AR?t6kT}}CS|WSyO7l2|HX{WGPNaUVQLmrvHvqtS zoC4~2Z(^bAy5?NlXFeqNq__nDRNCCf_!==$Z7)E~O%N>@h?(U!8F&MTl#M8D|0aR} O0000 literal 0 HcmV?d00001 diff --git a/graphics/pokemon/castform/snowy/front_gba.png b/graphics/pokemon/castform/snowy/front_gba.png new file mode 100644 index 0000000000000000000000000000000000000000..a75bf647e6a68b6cd965915d2f8aae2942a1de62 GIT binary patch literal 688 zcmV;h0#E&kP)ExobG_!~QgdobQcC~-{}>n;PDBos00001 zbW%=J06^y0W&i*JE=fc|R7i>Cl(BBxFc5~R(UZeYB$CBi0(h)|4t<;&P$w^0Jayo9 zvW8R}&ki7<1&TCVHx)C^jH}6q@;NCYR9LL4Ab z!=O(Qk!cUO1d;#~5t*({r?|CWs86CcMuh-EZGihYhmI-=Eu>HHQV6K)x~uL&;O7Mg zVF+a8eJ@;LREKn9^e&ZqYNJMEp182q54;UC90=<~l_a~Jxi)xl9(KV?4^@&b0TK=) zfMqf0rH1oF1`Y2IKye9i5v~y*W<~L$B;aGBN&;5pjN&B`(-gquYW@pIw1H)-+ig+K zx8>~lG-bd>%iXptZ+GRZe3~kg>E#>p-|b$XJpzd3=~-URzb$eC+L&nMD$n!N#livD zHX(sV;yWT-Jf}WjFb>)q)$nJz*M!SG!d(O$UvE4yIRQnV=tF=ub8W8e#sMdmXb8q3 z>d*9Ju$C+)_QrIb2mw%Z3eIA3V@zF(>LDOO(5aH`)s+BR^iBoy8lwR6ZCYyuZ63gR zFfRuHNDnCY?S}x{dw?2*1JH&89m@(TiF?FGY1*B5F*4M60Nm!pU(A?Jn;x4D$~3_C ze&@bhnO;q@a71tIrcbXX5q;lFv|m}@C*xiMlJ56viGM9m4KVThEBpm8{zHcURzCp$ WMOrkDrv79A0000n;1X!^m00001 zbW%=J06^y0W&i*Itw}^dR7i>KlrdAoFbsv0wF@|t!xm?0*l4!S{4sAzhH~C&77AU0 zep#nnSEeF4Jz_f{u(6<}cYfbVde3o_sg%bRyX79fmn;*qx}q)9YFYQCW|m zoHZ?2f7RBg3gF-a6vA-?YTDDk&|d%)W4jr3_Cb-2PC3T5ECYbDz`*c?$n#d|!T;3@EQ+V5K9VVBov}D50v0e-{&=5Wb#BO0o^~Oo;$! zB7l~({=-P^kAMl5;Gp2ipCKl|Is_6C%y2;T-Alhkmnr|MhBaVpfsj@4!{8Pcue#mq x4||F9B&B~3q$&4E5A$*}(Ffug@tt+=_!FQG9M0rMJRSf5002ovPDHLkV1k{u^Ys7# literal 0 HcmV?d00001 diff --git a/graphics/pokemon/castform/sunny/front_gba.png b/graphics/pokemon/castform/sunny/front_gba.png new file mode 100644 index 0000000000000000000000000000000000000000..7e14f9892e79d668cfb1f273db8ebe363c6c69a1 GIT binary patch literal 656 zcmV;B0&o3^P)n;1X!^m00001 zbW%=J06^y0W&i*J4oO5oR7i>Kld+21KoEwdR&Y4(R#zmT=D=`G6jEFpJxL6k%FQ*d zQm7kkVWZBQ#)%VxvcniD(*wdYF?{uXzO+0$_so(dS6?eAAeOE14MZe*iHmpNTvV`5@>0mn48YD00s8g1-%V zL`WQzc#rjq;@u?z#4MjPadsK-!Ovk3^x#EvmMj+ML2x!4T0r>a{oy3p7-m0$!ummm z$J7HzZ12M5%9E<#y;I0%=QJUlW8uz17cqQV(MZXX9vpq_`ezZ z@__(4kSL|T$qC$bO2T(ee#u%?d8_qpO-vtY|HPQv68-YG{@w;`by=2LFK$R;ZEldT z!e11zHfv+G)hnatRExQ_7Y1FuY|atKPy>sFUXs4!JlfZKyQSaT9yZ_{zZTzdR%k9) qnjCXoVujV|HT=z4wpM@A|MUlW<36OcgYioM0000Mc+J literal 0 HcmV?d00001 diff --git a/graphics/pokemon/castform/sunny/normal_gba.pal b/graphics/pokemon/castform/sunny/normal_gba.pal new file mode 100644 index 0000000000..af0cfbb93b --- /dev/null +++ b/graphics/pokemon/castform/sunny/normal_gba.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +197 197 148 +98 49 41 +205 90 74 +238 123 74 +255 156 65 +0 0 0 +255 246 106 +230 213 106 +255 156 98 +213 131 74 +148 90 65 +213 205 230 +0 0 0 +90 90 82 +255 255 255 +24 24 24 diff --git a/graphics/pokemon/castform/sunny/shiny_gba.pal b/graphics/pokemon/castform/sunny/shiny_gba.pal new file mode 100644 index 0000000000..af0cfbb93b --- /dev/null +++ b/graphics/pokemon/castform/sunny/shiny_gba.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +197 197 148 +98 49 41 +205 90 74 +238 123 74 +255 156 65 +0 0 0 +255 246 106 +230 213 106 +255 156 98 +213 131 74 +148 90 65 +213 205 230 +0 0 0 +90 90 82 +255 255 255 +24 24 24 diff --git a/graphics/pokemon/deoxys/attack/back_gba.png b/graphics/pokemon/deoxys/attack/back_gba.png new file mode 100644 index 0000000000000000000000000000000000000000..6f9b3fd9ef05d63327a5e6e6ff4c59f299a47811 GIT binary patch literal 664 zcmV;J0%!e+P)v&q~8U5XO_fKup(5q0sKcdJWA~!BfHJ2`YI4F&_0* zdR!2E6?+r{zKTh}ld$ei8ll}kx$D55=EwKV&VCyN|E@;!0pQ|xfH==@{Qz5S&b&Z~ ztECr+5Ya2409X$J@aZF%0#YB)D!?nzVg@iD0(>5k27DeJV37dm0X-!c%Npf5@LwPu z8y;bv=bJbVf|&-|wYkj}SNR5|L;|q33`ezACxgcJVl@Gb0G^=f5w;p=$sz?v%vD6{ zcANw>u;u0|YSkeD4Ln$O6*fHpV_0l0!HP7XHw_J37Pj}OfhEuZUmx2hx zKt}+tin|Wju~UhL{(=U`gPneykdh3G1F%=&K9*2HlR7E|(5A)-9!rc6((3Y8pb1bLPy6(_A9=4s8k8H+#Ut$WQ>HA zi_`@&Kt4#jSgMqvN{99%WU9Ja@;B(#-Pk}x>gxL1K(K>xyuQDC|J?gLXN2j z$Ik$V&jPJyDhOID1++E|N`Z)%1B7$SCvgrOdvb0(4s(MaJ~j`KKslTUsQoKewm9!>w_I#`fJgBq*7){!vO=IO6iF z$ZtL7mEBY*S?u{G09JAA$HtZ_70rAzzj0&FqvJwgkL&J@y7}V$;#3vsCTa@z;co7J zZd)d01xbh!?Z4l@av=bqMP)!Q4*+mZX@5)`1>=V9!;iTOrFjHRaFYcO1eKQ3K4G&-G6Tu1rtSqX#(8STg!Y}naV1yG`=Z!m$gh*wF^G;Wk2~B@9 zcOzXaJWg`zG`MB9wTRC@HTltdnslj|+4`KT3D?2~*bXe7N?Qlz@N{zXlxQ|fQe~ef6-d&?Ep- zfeX0x`(f9jR6*UyPV5&on73q*0pRiJLOfUlB3t1sYE7Na z%GUsx2#fl9%HcVt#;mt`7>M0r0K7sO04{~d9B?Hv4`%f&xz;*eZjTH*Z0AH|R#}w; zLTk9U?4jy(*b}{t1}F^BYzYjZ-+d=1r|M<0Te4_^IH!_M&+Dv%{$=?8X@@g2 Tmrx{900000NkvXXu0mjf?aIEi literal 0 HcmV?d00001 diff --git a/graphics/pokemon/deoxys/attack/normal_gba.pal b/graphics/pokemon/deoxys/attack/normal_gba.pal new file mode 100644 index 0000000000..e8921dd3d5 --- /dev/null +++ b/graphics/pokemon/deoxys/attack/normal_gba.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 255 +115 74 49 +213 106 106 +255 131 74 +255 172 131 +115 213 172 +82 172 123 +57 98 90 +0 0 0 +156 156 131 +106 8 156 +0 98 230 +115 115 106 +197 197 213 +255 255 255 +24 24 24 diff --git a/graphics/pokemon/deoxys/attack/shiny_gba.pal b/graphics/pokemon/deoxys/attack/shiny_gba.pal new file mode 100644 index 0000000000..666acaa3ae --- /dev/null +++ b/graphics/pokemon/deoxys/attack/shiny_gba.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 255 +106 90 24 +197 189 65 +255 222 74 +255 246 139 +115 213 172 +82 172 123 +57 98 90 +0 0 0 +156 156 131 +106 8 156 +0 98 230 +115 115 106 +197 197 213 +255 255 255 +24 24 24 diff --git a/graphics/pokemon/deoxys/defense/back_gba.png b/graphics/pokemon/deoxys/defense/back_gba.png new file mode 100644 index 0000000000000000000000000000000000000000..c1fcf46738f5e867320d4adab09e25f3a508877a GIT binary patch literal 631 zcmV--0*L*IP)mEI&AU+JXYt$Az!g`-}; zkJGdS7QF(DIl2OS6+Wh^R`9$};b3V%Nzx~4cAL_8Zhc~bQ=&l zfcsk@g1Oz`cjq=RoLoBd;QO%+Oq2xx1O+ZyXE{`>i#_-FYq_t1ht;b!2QNf?&fc0s zdfHg~0mwYdDusizvjo6`Ed!OpMM}b!AP@lqYueX`ltk?f1fXn6I5Lo$vnWC_Xa|UZ8}O9#BdSyh@WHb||3ALe!19PfXuy@*SYYPd0D2$6 z%!B9ZpDRIN&I!$DQZ@h-FgsKYRl*vWdJLR$Fl3prZW`$Zdgo@MxJ|K_`2iuyu^q1T R_L2Yq002ovPDHLkV1nk_0IC20 literal 0 HcmV?d00001 diff --git a/graphics/pokemon/deoxys/defense/front_gba.png b/graphics/pokemon/deoxys/defense/front_gba.png new file mode 100644 index 0000000000000000000000000000000000000000..5e2f38019ec45eb22a79b46d683c10dbcbfb5210 GIT binary patch literal 1069 zcmV+|1k(G7P)}*_I4kcUwqH?#F-rnVsDr_`i)Xik@6Q z$`GFzT*hd^m2LR-doz3?Up&V|m)DH^=UMO8W1_tu{+tt}uLjq%!;p0r!uilJr&MicM z>MuF1_5klr{?QsthU)DeK%kVT`rp5E+AoFjakbXPONmB9f_^*%1XlF60BAY@AH;~T zrc)~8YLWnrpNQ0MAp+* zyLl7?k9x=w$+i|D7AFg@WE^mdMIDF*VpjK6)Jr#!Ly}1CU1YyJ zlaLJt+POE8WF4?hAfZly1Y+RWWCD0%u)3&Sy(eW%9?~*(wd6$Iq{%!mB7l}4=igsh za+Q<>ge4XiREBUOr!gH0IyhVm2Q;KdNo4q(fQB|WhdgGW^g!EiK?DG9WfvL_GbNlr9|tSmINc8`l;qnjfnMoR^UPWHB@T$?t!4nFkw=;6l;gNWSZ00000NkvXXu0mjf`CHBs literal 0 HcmV?d00001 diff --git a/graphics/pokemon/deoxys/defense/normal_gba.pal b/graphics/pokemon/deoxys/defense/normal_gba.pal new file mode 100644 index 0000000000..e8921dd3d5 --- /dev/null +++ b/graphics/pokemon/deoxys/defense/normal_gba.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 255 +115 74 49 +213 106 106 +255 131 74 +255 172 131 +115 213 172 +82 172 123 +57 98 90 +0 0 0 +156 156 131 +106 8 156 +0 98 230 +115 115 106 +197 197 213 +255 255 255 +24 24 24 diff --git a/graphics/pokemon/deoxys/defense/shiny_gba.pal b/graphics/pokemon/deoxys/defense/shiny_gba.pal new file mode 100644 index 0000000000..666acaa3ae --- /dev/null +++ b/graphics/pokemon/deoxys/defense/shiny_gba.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 255 +106 90 24 +197 189 65 +255 222 74 +255 246 139 +115 213 172 +82 172 123 +57 98 90 +0 0 0 +156 156 131 +106 8 156 +0 98 230 +115 115 106 +197 197 213 +255 255 255 +24 24 24 diff --git a/graphics/pokemon/deoxys/speed/back_gba.png b/graphics/pokemon/deoxys/speed/back_gba.png new file mode 100644 index 0000000000000000000000000000000000000000..979936c640b28b2006dc5cc132d9efcc51214091 GIT binary patch literal 694 zcmV;n0!jUeP)^P|a000+sMObuGZ)S9NVRB^vM@&RePDdbiWpW@hE;Mn4q~QPn00?w&PDe*f zL^A*Y002sWDIWj;00d`2O+f$vv5yPv4L7bd}iwMo$YUX=$QpLs9|Ns9O7#MhAe+&Qs00Cl4M@0Xn2lB-L0004W zQchC=$MPbQoEG{_L+wO{n5Q3jK-6ES<@z9z&D`0@);?XU##x07D zTllbN#e_LU2B8%aMJb>w*5dV$Y^f~84Qtk0Ug=*@f`#bR8DrBQ#4D*RL~9kF zI|oTj3KNbHoFR}ZA@VBB=Sp(iA;Djl$Ppyc*gM!YHuHc*V4kEJ<#$kW69kM!p-J=l z;rmm<+uhBah11zUD}`U;UEg#5={bU)W)Bpeg07*qoM6N<$f-_JoW&i*H literal 0 HcmV?d00001 diff --git a/graphics/pokemon/deoxys/speed/front_gba.png b/graphics/pokemon/deoxys/speed/front_gba.png new file mode 100644 index 0000000000000000000000000000000000000000..ab713aeeaf4af1573822ed4e3493d99c89e2cf78 GIT binary patch literal 945 zcmV;i15W&jP)v4L7bd}iwMo$YUX=$QpLs9|Ns9O7#MhAe+&Qs00Cl4M@0Xn2lB-L0004W zQchCXvhw=`}%+3A(W%_}D;jlXcp1ZvCnRkv6G0i#x{VSCN73gb(!3=<1H zL7z1OhJE`QWASEHBLHBdi7~deRy6{^v^HAUwziN)08C6mFbXZCtHESS2ti?2XyOt$ zAY?n-))sMT+9sr9>j6WwN#|z?0G_tVhhNC@v;aK#E+&Xy>m{OZ4zd^%pR^M1yB6m@ z)g`I)Z-iicOurN-Iqs94p3CBaJ2)*ODunDF3;O$75q<@<)^MD!^6IVIsfsEV1ZBC-1W^D=E4GCPDvU>q+KKO(RFk8qPaWBL; zY26T47lCOD#UAxGu${E7fg1||+^|>afQGWWQL@?GdJGI*O2d|oP_o&;^IJQ5n{f%? zJ>N#wO)@^l@?0Y79i{-1?clA*zL})+^^l|D++~2}Gk>Mac|8SkIU?s6fH>+R!BgO} zkpT|}O^7&hkZhKf9vgUT>F4_Vpb7DjdQMkXDC%9iUbeNK8+91P)D=!Ikbvweb$KXv zrIjfiG9g_-35===$n`HIF3Vm88>#vF3z+V^zCv9(P=TCF2@GfW{n;GIxttQFQh@lR z2!MP}z?1y~ATg&1c(yk?XCn^)C=@|SQ6VxU1!AHML(N|?KHK|I3P9$tQUHi6m7~5m z=Cj4$Wo4Z-Gyr77ascpgn#0fnaO`I;btV8Gmb;V^LAeRQPg710K-FJbV7C4MYllHp TX*Y2}00000NkvXXu0mjf8jy}T literal 0 HcmV?d00001 diff --git a/graphics/pokemon/deoxys/speed/normal_gba.pal b/graphics/pokemon/deoxys/speed/normal_gba.pal new file mode 100644 index 0000000000..90fcff114b --- /dev/null +++ b/graphics/pokemon/deoxys/speed/normal_gba.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 255 +115 74 49 +213 106 106 +255 131 74 +255 172 131 +115 213 172 +131 164 156 +57 98 90 +82 74 65 +156 156 131 +139 8 205 +222 106 230 +123 115 82 +197 197 213 +255 255 255 +24 24 24 diff --git a/graphics/pokemon/deoxys/speed/shiny_gba.pal b/graphics/pokemon/deoxys/speed/shiny_gba.pal new file mode 100644 index 0000000000..74b8fc7775 --- /dev/null +++ b/graphics/pokemon/deoxys/speed/shiny_gba.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 255 +106 90 24 +197 189 65 +255 222 57 +255 246 139 +115 213 172 +82 172 123 +57 98 90 +82 74 65 +156 156 131 +106 8 156 +0 98 230 +115 115 106 +197 197 213 +255 255 255 +24 24 24 diff --git a/graphics/pokemon/spinda/anim_front_gba.png b/graphics/pokemon/spinda/anim_front_gba.png new file mode 100644 index 0000000000000000000000000000000000000000..7ddfbef5171b8f9c83119a19358ef7e84467c057 GIT binary patch literal 634 zcmV-=0)_pFP)1 z?RpSFOn*Oooy=_@i~w=8P|+m*VF3z!b9@;9h;0i6LOJvZQ4?l1kN|uD6bFZ}dQb|* zhnJ)PvVnjr;zI}`s3#i;L7d`MpOLU_?F@|gF?xt9rS@bImuMj7K~=3nB>PmXZGdh0 zUQ9E+qFS#ZwIi6;<$QM)MbShLjME6FiFgqiK-alAiC`?Us{xpu4B4qf2LQ>F(|~0_ zSJ!8C8U*GGD|-#sFBchD9hOF!jp>@(2+w-Apz zUG^CCgwf1nz@9Z5Q-9;DH_Jl4S}dx42Qy@mH%IcoPefSqkHYSgGvqehJyHR_-B3xT1} Uo8uqbKmY&$07*qoM6N<$f*$Z1?f?J) literal 0 HcmV?d00001 diff --git a/graphics/pokemon/spinda/back_gba.png b/graphics/pokemon/spinda/back_gba.png new file mode 100644 index 0000000000000000000000000000000000000000..c5f699e2cf61dee02fd6000dabef423af652ff57 GIT binary patch literal 684 zcmV;d0#p5oP)A}swuM&~sFKj!O3Ed;Wi=M0n;x&h)-9h!-@@p|B9f+Yi1SWoi}bJt zOykW4$3Tcb7(-YC)OMrqL@%n;0yD6E#h1Qria-32=jNVe<O`y9YMf)_Y$ z415j~VB(Um3I|uoQBQI`D}$>vQ8cv&l_S2^eajlfr8p$B@1NTPX zQWxV-ccY0n@t*WsZse)fUSg;970=32Un_5x-NTk&ozhBu^Aaz1+7vnXi7CH2N zb924Dz5oCJdz?y~%}SK^O73%<_LTO$q+0goDfafP)zxa|N-1JuT0ucUX*qpc00001 zbW%=J06^y0W&i*H^+`lQR5*>@l0k~ZAP_}8fu6reu+JgYnDv0zSIAZr%{Ca?F)%av z<_6QX5PW>gn0i9|uWGlw;%%f=zkcZth@~%K8NqH}R}Z6GGXO+pUN~JnL}g}zfQlX1 zHvr2vJRbl&N1pLWaw#PM;z)kRON82IKRhs()--|;+0Y6=2Bv_KNJJVF*-*p1kh!@5 zoJf2~sqF^pGE!yEUtTXAl(k!5rfmchOr}z46@l#IuPBV_I+z*mes{oSh3|-*r!Pnx z(Xw%P#Ch)#DDQ$tVPqp$@PV?6yAOhNb7>T0G8(5V4c!8f9w74Bqa5o1x*s?2SKpo0 VveEp(p3MLN002ovPDHLkV1mq)q0RsR literal 0 HcmV?d00001 diff --git a/graphics/pokemon/spinda/normal_gba.pal b/graphics/pokemon/spinda/normal_gba.pal new file mode 100644 index 0000000000..9b0ad5bfc4 --- /dev/null +++ b/graphics/pokemon/spinda/normal_gba.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +49 164 82 +246 230 172 +230 213 164 +197 180 131 +172 148 106 +222 139 74 +222 106 57 +180 90 41 +156 57 24 +115 65 16 +172 65 90 +255 255 0 +255 255 0 +123 98 74 +90 65 49 +16 16 16 diff --git a/graphics/pokemon/spinda/shiny_gba.pal b/graphics/pokemon/spinda/shiny_gba.pal new file mode 100644 index 0000000000..6aa7481296 --- /dev/null +++ b/graphics/pokemon/spinda/shiny_gba.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +49 164 82 +246 230 172 +230 213 164 +197 180 131 +172 148 106 +180 197 90 +148 164 57 +115 131 24 +82 98 0 +49 65 0 +172 65 90 +255 255 0 +255 255 0 +123 98 74 +90 65 49 +16 16 16 diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h index 1b70cf3aa4..5ac450114f 100644 --- a/src/data/graphics/pokemon.h +++ b/src/data/graphics/pokemon.h @@ -12050,11 +12050,22 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //P_FAMILY_SPOINK #if P_FAMILY_SPINDA +#if !P_GBA_STYLE_SPECIES_GFX const u32 gMonFrontPic_Spinda[] = INCBIN_U32("graphics/pokemon/spinda/anim_front.4bpp.smol"); const u16 gMonPalette_Spinda[] = INCBIN_U16("graphics/pokemon/spinda/normal.gbapal"); const u32 gMonBackPic_Spinda[] = INCBIN_U32("graphics/pokemon/spinda/back.4bpp.smol"); const u16 gMonShinyPalette_Spinda[] = INCBIN_U16("graphics/pokemon/spinda/shiny.gbapal"); +#else + const u32 gMonFrontPic_Spinda[] = INCBIN_U32("graphics/pokemon/spinda/anim_front_gba.4bpp.smol"); + const u16 gMonPalette_Spinda[] = INCBIN_U16("graphics/pokemon/spinda/normal_gba.gbapal"); + const u32 gMonBackPic_Spinda[] = INCBIN_U32("graphics/pokemon/spinda/back_gba.4bpp.smol"); + const u16 gMonShinyPalette_Spinda[] = INCBIN_U16("graphics/pokemon/spinda/shiny_gba.gbapal"); +#endif //P_GBA_STYLE_SPECIES_GFX +#if !P_GBA_STYLE_SPECIES_ICONS const u8 gMonIcon_Spinda[] = INCBIN_U8("graphics/pokemon/spinda/icon.4bpp"); +#else + const u8 gMonIcon_Spinda[] = INCBIN_U8("graphics/pokemon/spinda/icon_gba.4bpp"); +#endif //P_GBA_STYLE_SPECIES_ICONS #if P_FOOTPRINTS const u8 gMonFootprint_Spinda[] = INCBIN_U8("graphics/pokemon/spinda/footprint.1bpp"); #endif //P_FOOTPRINTS @@ -12745,31 +12756,58 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ #endif //P_FAMILY_FEEBAS #if P_FAMILY_CASTFORM +#if !P_GBA_STYLE_SPECIES_GFX const u32 gMonFrontPic_CastformNormal[] = INCBIN_U32("graphics/pokemon/castform/anim_front.4bpp.smol"); const u16 gMonPalette_CastformNormal[] = INCBIN_U16("graphics/pokemon/castform/normal.gbapal"); const u32 gMonBackPic_CastformNormal[] = INCBIN_U32("graphics/pokemon/castform/back.4bpp.smol"); const u16 gMonShinyPalette_CastformNormal[] = INCBIN_U16("graphics/pokemon/castform/shiny.gbapal"); - const u8 gMonIcon_CastformNormal[] = INCBIN_U8("graphics/pokemon/castform/icon.4bpp"); -#if P_FOOTPRINTS - const u8 gMonFootprint_Castform[] = INCBIN_U8("graphics/pokemon/castform/footprint.1bpp"); -#endif //P_FOOTPRINTS const u32 gMonFrontPic_CastformSunny[] = INCBIN_U32("graphics/pokemon/castform/sunny/anim_front.4bpp.smol"); const u16 gMonPalette_CastformSunny[] = INCBIN_U16("graphics/pokemon/castform/sunny/normal.gbapal"); const u32 gMonBackPic_CastformSunny[] = INCBIN_U32("graphics/pokemon/castform/sunny/back.4bpp.smol"); const u16 gMonShinyPalette_CastformSunny[] = INCBIN_U16("graphics/pokemon/castform/sunny/shiny.gbapal"); - const u8 gMonIcon_CastformSunny[] = INCBIN_U8("graphics/pokemon/castform/sunny/icon.4bpp"); const u32 gMonFrontPic_CastformRainy[] = INCBIN_U32("graphics/pokemon/castform/rainy/anim_front.4bpp.smol"); const u16 gMonPalette_CastformRainy[] = INCBIN_U16("graphics/pokemon/castform/rainy/normal.gbapal"); const u32 gMonBackPic_CastformRainy[] = INCBIN_U32("graphics/pokemon/castform/rainy/back.4bpp.smol"); const u16 gMonShinyPalette_CastformRainy[] = INCBIN_U16("graphics/pokemon/castform/rainy/shiny.gbapal"); - const u8 gMonIcon_CastformRainy[] = INCBIN_U8("graphics/pokemon/castform/rainy/icon.4bpp"); const u32 gMonFrontPic_CastformSnowy[] = INCBIN_U32("graphics/pokemon/castform/snowy/anim_front.4bpp.smol"); const u16 gMonPalette_CastformSnowy[] = INCBIN_U16("graphics/pokemon/castform/snowy/normal.gbapal"); const u32 gMonBackPic_CastformSnowy[] = INCBIN_U32("graphics/pokemon/castform/snowy/back.4bpp.smol"); const u16 gMonShinyPalette_CastformSnowy[] = INCBIN_U16("graphics/pokemon/castform/snowy/shiny.gbapal"); +#else + const u32 gMonFrontPic_CastformNormal[] = INCBIN_U32("graphics/pokemon/castform/front_gba.4bpp.smol"); + const u16 gMonPalette_CastformNormal[] = INCBIN_U16("graphics/pokemon/castform/normal_gba.gbapal"); + const u32 gMonBackPic_CastformNormal[] = INCBIN_U32("graphics/pokemon/castform/back_gba.4bpp.smol"); + const u16 gMonShinyPalette_CastformNormal[] = INCBIN_U16("graphics/pokemon/castform/shiny_gba.gbapal"); + + const u32 gMonFrontPic_CastformSunny[] = INCBIN_U32("graphics/pokemon/castform/sunny/front_gba.4bpp.smol"); + const u16 gMonPalette_CastformSunny[] = INCBIN_U16("graphics/pokemon/castform/sunny/normal_gba.gbapal"); + const u32 gMonBackPic_CastformSunny[] = INCBIN_U32("graphics/pokemon/castform/sunny/back_gba.4bpp.smol"); + const u16 gMonShinyPalette_CastformSunny[] = INCBIN_U16("graphics/pokemon/castform/sunny/shiny_gba.gbapal"); + + const u32 gMonFrontPic_CastformRainy[] = INCBIN_U32("graphics/pokemon/castform/rainy/front_gba.4bpp.smol"); + const u16 gMonPalette_CastformRainy[] = INCBIN_U16("graphics/pokemon/castform/rainy/normal_gba.gbapal"); + const u32 gMonBackPic_CastformRainy[] = INCBIN_U32("graphics/pokemon/castform/rainy/back_gba.4bpp.smol"); + const u16 gMonShinyPalette_CastformRainy[] = INCBIN_U16("graphics/pokemon/castform/rainy/shiny_gba.gbapal"); + + const u32 gMonFrontPic_CastformSnowy[] = INCBIN_U32("graphics/pokemon/castform/snowy/front_gba.4bpp.smol"); + const u16 gMonPalette_CastformSnowy[] = INCBIN_U16("graphics/pokemon/castform/snowy/normal_gba.gbapal"); + const u32 gMonBackPic_CastformSnowy[] = INCBIN_U32("graphics/pokemon/castform/snowy/back_gba.4bpp.smol"); + const u16 gMonShinyPalette_CastformSnowy[] = INCBIN_U16("graphics/pokemon/castform/snowy/shiny_gba.gbapal"); +#endif //P_GBA_STYLE_SPECIES_GFX +#if !P_GBA_STYLE_SPECIES_ICONS + const u8 gMonIcon_CastformNormal[] = INCBIN_U8("graphics/pokemon/castform/icon.4bpp"); +#else + const u8 gMonIcon_CastformNormal[] = INCBIN_U8("graphics/pokemon/castform/icon_gba.4bpp"); +#endif //P_GBA_STYLE_SPECIES_ICONS +#if P_FOOTPRINTS + const u8 gMonFootprint_Castform[] = INCBIN_U8("graphics/pokemon/castform/footprint.1bpp"); +#endif //P_FOOTPRINTS + + const u8 gMonIcon_CastformSunny[] = INCBIN_U8("graphics/pokemon/castform/sunny/icon.4bpp"); + const u8 gMonIcon_CastformRainy[] = INCBIN_U8("graphics/pokemon/castform/rainy/icon.4bpp"); const u8 gMonIcon_CastformSnowy[] = INCBIN_U8("graphics/pokemon/castform/snowy/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS @@ -13943,11 +13981,41 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u16 gMonPalette_DeoxysNormal[] = INCBIN_U16("graphics/pokemon/deoxys/normal.gbapal"); const u32 gMonBackPic_DeoxysNormal[] = INCBIN_U32("graphics/pokemon/deoxys/back.4bpp.smol"); const u16 gMonShinyPalette_DeoxysNormal[] = INCBIN_U16("graphics/pokemon/deoxys/shiny.gbapal"); + + const u32 gMonFrontPic_DeoxysAttack[] = INCBIN_U32("graphics/pokemon/deoxys/attack/anim_front.4bpp.smol"); + const u16 gMonPalette_DeoxysAttack[] = INCBIN_U16("graphics/pokemon/deoxys/attack/normal.gbapal"); + const u32 gMonBackPic_DeoxysAttack[] = INCBIN_U32("graphics/pokemon/deoxys/attack/back.4bpp.smol"); + const u16 gMonShinyPalette_DeoxysAttack[] = INCBIN_U16("graphics/pokemon/deoxys/attack/shiny.gbapal"); + + const u32 gMonFrontPic_DeoxysDefense[] = INCBIN_U32("graphics/pokemon/deoxys/defense/anim_front.4bpp.smol"); + const u16 gMonPalette_DeoxysDefense[] = INCBIN_U16("graphics/pokemon/deoxys/defense/normal.gbapal"); + const u32 gMonBackPic_DeoxysDefense[] = INCBIN_U32("graphics/pokemon/deoxys/defense/back.4bpp.smol"); + const u16 gMonShinyPalette_DeoxysDefense[] = INCBIN_U16("graphics/pokemon/deoxys/defense/shiny.gbapal"); + + const u32 gMonFrontPic_DeoxysSpeed[] = INCBIN_U32("graphics/pokemon/deoxys/speed/anim_front.4bpp.smol"); + const u16 gMonPalette_DeoxysSpeed[] = INCBIN_U16("graphics/pokemon/deoxys/speed/normal.gbapal"); + const u32 gMonBackPic_DeoxysSpeed[] = INCBIN_U32("graphics/pokemon/deoxys/speed/back.4bpp.smol"); + const u16 gMonShinyPalette_DeoxysSpeed[] = INCBIN_U16("graphics/pokemon/deoxys/speed/shiny.gbapal"); #else const u32 gMonFrontPic_DeoxysNormal[] = INCBIN_U32("graphics/pokemon/deoxys/anim_front_gba.4bpp.smol"); const u16 gMonPalette_DeoxysNormal[] = INCBIN_U16("graphics/pokemon/deoxys/normal_gba.gbapal"); const u32 gMonBackPic_DeoxysNormal[] = INCBIN_U32("graphics/pokemon/deoxys/back_gba.4bpp.smol"); const u16 gMonShinyPalette_DeoxysNormal[] = INCBIN_U16("graphics/pokemon/deoxys/shiny_gba.gbapal"); + + const u32 gMonFrontPic_DeoxysAttack[] = INCBIN_U32("graphics/pokemon/deoxys/attack/front_gba.4bpp.smol"); + const u16 gMonPalette_DeoxysAttack[] = INCBIN_U16("graphics/pokemon/deoxys/attack/normal_gba.gbapal"); + const u32 gMonBackPic_DeoxysAttack[] = INCBIN_U32("graphics/pokemon/deoxys/attack/back_gba.4bpp.smol"); + const u16 gMonShinyPalette_DeoxysAttack[] = INCBIN_U16("graphics/pokemon/deoxys/attack/shiny_gba.gbapal"); + + const u32 gMonFrontPic_DeoxysDefense[] = INCBIN_U32("graphics/pokemon/deoxys/defense/front_gba.4bpp.smol"); + const u16 gMonPalette_DeoxysDefense[] = INCBIN_U16("graphics/pokemon/deoxys/defense/normal_gba.gbapal"); + const u32 gMonBackPic_DeoxysDefense[] = INCBIN_U32("graphics/pokemon/deoxys/defense/back_gba.4bpp.smol"); + const u16 gMonShinyPalette_DeoxysDefense[] = INCBIN_U16("graphics/pokemon/deoxys/defense/shiny_gba.gbapal"); + + const u32 gMonFrontPic_DeoxysSpeed[] = INCBIN_U32("graphics/pokemon/deoxys/speed/front_gba.4bpp.smol"); + const u16 gMonPalette_DeoxysSpeed[] = INCBIN_U16("graphics/pokemon/deoxys/speed/normal_gba.gbapal"); + const u32 gMonBackPic_DeoxysSpeed[] = INCBIN_U32("graphics/pokemon/deoxys/speed/back_gba.4bpp.smol"); + const u16 gMonShinyPalette_DeoxysSpeed[] = INCBIN_U16("graphics/pokemon/deoxys/speed/shiny_gba.gbapal"); #endif //P_GBA_STYLE_SPECIES_GFX #if !P_GBA_STYLE_SPECIES_ICONS const u8 gMonIcon_DeoxysNormal[] = INCBIN_U8("graphics/pokemon/deoxys/icon.4bpp"); @@ -13958,22 +14026,8 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_ const u8 gMonFootprint_Deoxys[] = INCBIN_U8("graphics/pokemon/deoxys/footprint.1bpp"); #endif //P_FOOTPRINTS - const u32 gMonFrontPic_DeoxysAttack[] = INCBIN_U32("graphics/pokemon/deoxys/attack/anim_front.4bpp.smol"); - const u16 gMonPalette_DeoxysAttack[] = INCBIN_U16("graphics/pokemon/deoxys/attack/normal.gbapal"); - const u32 gMonBackPic_DeoxysAttack[] = INCBIN_U32("graphics/pokemon/deoxys/attack/back.4bpp.smol"); - const u16 gMonShinyPalette_DeoxysAttack[] = INCBIN_U16("graphics/pokemon/deoxys/attack/shiny.gbapal"); const u8 gMonIcon_DeoxysAttack[] = INCBIN_U8("graphics/pokemon/deoxys/attack/icon.4bpp"); - - const u32 gMonFrontPic_DeoxysDefense[] = INCBIN_U32("graphics/pokemon/deoxys/defense/anim_front.4bpp.smol"); - const u16 gMonPalette_DeoxysDefense[] = INCBIN_U16("graphics/pokemon/deoxys/defense/normal.gbapal"); - const u32 gMonBackPic_DeoxysDefense[] = INCBIN_U32("graphics/pokemon/deoxys/defense/back.4bpp.smol"); - const u16 gMonShinyPalette_DeoxysDefense[] = INCBIN_U16("graphics/pokemon/deoxys/defense/shiny.gbapal"); const u8 gMonIcon_DeoxysDefense[] = INCBIN_U8("graphics/pokemon/deoxys/defense/icon.4bpp"); - - const u32 gMonFrontPic_DeoxysSpeed[] = INCBIN_U32("graphics/pokemon/deoxys/speed/anim_front.4bpp.smol"); - const u16 gMonPalette_DeoxysSpeed[] = INCBIN_U16("graphics/pokemon/deoxys/speed/normal.gbapal"); - const u32 gMonBackPic_DeoxysSpeed[] = INCBIN_U32("graphics/pokemon/deoxys/speed/back.4bpp.smol"); - const u16 gMonShinyPalette_DeoxysSpeed[] = INCBIN_U16("graphics/pokemon/deoxys/speed/shiny.gbapal"); const u8 gMonIcon_DeoxysSpeed[] = INCBIN_U8("graphics/pokemon/deoxys/speed/icon.4bpp"); #if OW_POKEMON_OBJECT_EVENTS diff --git a/src/data/pokemon/species_info/gen_3_families.h b/src/data/pokemon/species_info/gen_3_families.h index fb29550820..6535497ddf 100644 --- a/src/data/pokemon/species_info/gen_3_families.h +++ b/src/data/pokemon/species_info/gen_3_families.h @@ -7232,13 +7232,17 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Spinda, .frontPicSize = MON_COORDS_SIZE(48, 64), .frontPicYOffset = 8, - .frontAnimFrames = ANIM_FRAMES( - ANIMCMD_FRAME(0, 17), - ANIMCMD_FRAME(1, 23), - ANIMCMD_FRAME(0, 17), - ANIMCMD_FRAME(1, 23), - ANIMCMD_FRAME(0, 13), - ), + #if !P_GBA_STYLE_SPECIES_GFX + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 17), + ANIMCMD_FRAME(1, 23), + ANIMCMD_FRAME(0, 17), + ANIMCMD_FRAME(1, 23), + ANIMCMD_FRAME(0, 13), + ), + #else + .frontAnimFrames = sAnims_SingleFramePlaceHolder, + #endif .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_H_JUMPS : ANIM_CIRCLE_INTO_BG, .backPic = gMonBackPic_Spinda, .backPicSize = MON_COORDS_SIZE(56, 56), @@ -9182,13 +9186,17 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_CastformNormal, .frontPicSize = MON_COORDS_SIZE(24, 32), .frontPicYOffset = 17, - .frontAnimFrames = ANIM_FRAMES( - ANIMCMD_FRAME(0, 12), - ANIMCMD_FRAME(1, 24), - ANIMCMD_FRAME(0, 24), - ANIMCMD_FRAME(1, 24), - ANIMCMD_FRAME(0, 24), - ), + #if !P_GBA_STYLE_SPECIES_GFX + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 12), + ANIMCMD_FRAME(1, 24), + ANIMCMD_FRAME(0, 24), + ANIMCMD_FRAME(1, 24), + ANIMCMD_FRAME(0, 24), + ), + #else + .frontAnimFrames = sAnims_SingleFramePlaceHolder, + #endif .frontAnimId = ANIM_H_SLIDE_WOBBLE, .enemyMonElevation = 16, .backPic = gMonBackPic_CastformNormal, @@ -9257,21 +9265,25 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_CastformSunny, .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 9, - .frontAnimFrames = ANIM_FRAMES( - ANIMCMD_FRAME(0, 12), - ANIMCMD_FRAME(1, 12), - ANIMCMD_FRAME(0, 12), - ANIMCMD_FRAME(1, 12), - ANIMCMD_FRAME(0, 12), - ANIMCMD_FRAME(1, 12), - ANIMCMD_FRAME(0, 12), - ), - .frontAnimId = ANIM_GROW_VIBRATE, + #if !P_GBA_STYLE_SPECIES_GFX + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 12), + ANIMCMD_FRAME(1, 12), + ANIMCMD_FRAME(0, 12), + ANIMCMD_FRAME(1, 12), + ANIMCMD_FRAME(0, 12), + ANIMCMD_FRAME(1, 12), + ANIMCMD_FRAME(0, 12), + ), + #else + .frontAnimFrames = sAnims_SingleFramePlaceHolder, + #endif + .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_H_SLIDE_WOBBLE : ANIM_GROW_VIBRATE, .enemyMonElevation = 5, .backPic = gMonBackPic_CastformSunny, .backPicSize = MON_COORDS_SIZE(56, 64), .backPicYOffset = 0, - .backAnimId = BACK_ANIM_SHAKE_GLOW_RED, + .backAnimId = P_GBA_STYLE_SPECIES_GFX ? BACK_ANIM_CONVEX_DOUBLE_ARC : BACK_ANIM_SHAKE_GLOW_RED, .palette = gMonPalette_CastformSunny, .shinyPalette = gMonShinyPalette_CastformSunny, .iconSprite = gMonIcon_CastformSunny, @@ -9334,19 +9346,23 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_CastformRainy, .frontPicSize = MON_COORDS_SIZE(32, 48), .frontPicYOffset = 9, - .frontAnimFrames = ANIM_FRAMES( - ANIMCMD_FRAME(0, 22), - ANIMCMD_FRAME(1, 22), - ANIMCMD_FRAME(0, 22), - ANIMCMD_FRAME(1, 22), - ANIMCMD_FRAME(0, 11), - ), - .frontAnimId = ANIM_SWING_CONVEX_FAST, + #if !P_GBA_STYLE_SPECIES_GFX + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 22), + ANIMCMD_FRAME(1, 22), + ANIMCMD_FRAME(0, 22), + ANIMCMD_FRAME(1, 22), + ANIMCMD_FRAME(0, 11), + ), + #else + .frontAnimFrames = sAnims_SingleFramePlaceHolder, + #endif + .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_H_SLIDE_WOBBLE : ANIM_SWING_CONVEX_FAST, .enemyMonElevation = 5, .backPic = gMonBackPic_CastformRainy, .backPicSize = MON_COORDS_SIZE(40, 64), .backPicYOffset = 0, - .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, + .backAnimId = P_GBA_STYLE_SPECIES_GFX ? BACK_ANIM_CONVEX_DOUBLE_ARC : BACK_ANIM_SHRINK_GROW_VIBRATE, .palette = gMonPalette_CastformRainy, .shinyPalette = gMonShinyPalette_CastformRainy, .iconSprite = gMonIcon_CastformRainy, @@ -9409,19 +9425,23 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_CastformSnowy, .frontPicSize = MON_COORDS_SIZE(40, 56), .frontPicYOffset = 8, - .frontAnimFrames = ANIM_FRAMES( - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 12), - ANIMCMD_FRAME(0, 12), - ANIMCMD_FRAME(1, 29), - ANIMCMD_FRAME(0, 12), - ), - .frontAnimId = ANIM_V_STRETCH, + #if !P_GBA_STYLE_SPECIES_GFX + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 12), + ANIMCMD_FRAME(0, 12), + ANIMCMD_FRAME(1, 29), + ANIMCMD_FRAME(0, 12), + ), + #else + .frontAnimFrames = sAnims_SingleFramePlaceHolder, + #endif + .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_H_SLIDE_WOBBLE : ANIM_V_STRETCH, .enemyMonElevation = 5, .backPic = gMonBackPic_CastformSnowy, .backPicSize = MON_COORDS_SIZE(56, 64), .backPicYOffset = 0, - .backAnimId = BACK_ANIM_TRIANGLE_DOWN, + .backAnimId = P_GBA_STYLE_SPECIES_GFX ? BACK_ANIM_CONVEX_DOUBLE_ARC : BACK_ANIM_TRIANGLE_DOWN, .palette = gMonPalette_CastformSnowy, .shinyPalette = gMonShinyPalette_CastformSnowy, .iconSprite = gMonIcon_CastformSnowy, @@ -13122,15 +13142,20 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerOffset = 2, .frontPic = gMonFrontPic_DeoxysNormal, .frontPicSize = MON_COORDS_SIZE(64, 64), - .frontPicYOffset = 0, - .frontAnimFrames = ANIM_FRAMES( - ANIMCMD_FRAME(0, 16), - ANIMCMD_FRAME(1, 16), - ANIMCMD_FRAME(0, 26), - ANIMCMD_FRAME(1, 16), - ANIMCMD_FRAME(0, 16), - ), - .frontAnimId = ANIM_GROW_VIBRATE, + .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 1 : 0, + #if !P_GBA_STYLE_SPECIES_GFX + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 16), + ANIMCMD_FRAME(1, 16), + ANIMCMD_FRAME(0, 26), + ANIMCMD_FRAME(1, 16), + ANIMCMD_FRAME(0, 16), + ), + #else + .frontAnimFrames = sAnims_SingleFramePlaceHolder, + #endif + .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_H_PIVOT : ANIM_GROW_VIBRATE, + .enemyMonElevation = P_GBA_STYLE_SPECIES_GFX ? 8 : 0, .backPic = gMonBackPic_DeoxysNormal, .backPicSize = MON_COORDS_SIZE(64, 56), .backPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 2 : 6, @@ -13193,19 +13218,24 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerOffset = 2, .frontPic = gMonFrontPic_DeoxysAttack, .frontPicSize = MON_COORDS_SIZE(64, 64), - .frontPicYOffset = 0, - .frontAnimFrames = ANIM_FRAMES( - ANIMCMD_FRAME(0, 16), - ANIMCMD_FRAME(1, 16), - ANIMCMD_FRAME(0, 26), - ANIMCMD_FRAME(1, 16), - ANIMCMD_FRAME(0, 16), - ), - .frontAnimId = ANIM_GROW_VIBRATE, + .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 1 : 0, + #if !P_GBA_STYLE_SPECIES_GFX + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 16), + ANIMCMD_FRAME(1, 16), + ANIMCMD_FRAME(0, 26), + ANIMCMD_FRAME(1, 16), + ANIMCMD_FRAME(0, 16), + ), + #else + .frontAnimFrames = sAnims_SingleFramePlaceHolder, + #endif + .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_H_PIVOT : ANIM_GROW_VIBRATE, + .enemyMonElevation = P_GBA_STYLE_SPECIES_GFX ? 8 : 0, .backPic = gMonBackPic_DeoxysAttack, - .backPicSize = MON_COORDS_SIZE(64, 64), - .backPicYOffset = 1, - .backAnimId = BACK_ANIM_TRIANGLE_DOWN, + .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 56) : MON_COORDS_SIZE(64, 64), + .backPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 7 : 1, + .backAnimId = P_GBA_STYLE_SPECIES_GFX ? BACK_ANIM_SHRINK_GROW_VIBRATE : BACK_ANIM_TRIANGLE_DOWN, .palette = gMonPalette_DeoxysAttack, .shinyPalette = gMonShinyPalette_DeoxysAttack, .iconSprite = gMonIcon_DeoxysAttack, @@ -13262,20 +13292,25 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .trainerScale = 290, .trainerOffset = 2, .frontPic = gMonFrontPic_DeoxysDefense, - .frontPicSize = MON_COORDS_SIZE(56, 64), - .frontPicYOffset = 0, - .frontAnimFrames = ANIM_FRAMES( - ANIMCMD_FRAME(0, 16), - ANIMCMD_FRAME(1, 16), - ANIMCMD_FRAME(0, 26), - ANIMCMD_FRAME(1, 16), - ANIMCMD_FRAME(0, 16), - ), - .frontAnimId = ANIM_GROW_VIBRATE, + .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 64) : MON_COORDS_SIZE(56, 64), + .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 1 : 0, + #if !P_GBA_STYLE_SPECIES_GFX + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 16), + ANIMCMD_FRAME(1, 16), + ANIMCMD_FRAME(0, 26), + ANIMCMD_FRAME(1, 16), + ANIMCMD_FRAME(0, 16), + ), + #else + .frontAnimFrames = sAnims_SingleFramePlaceHolder, + #endif + .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_H_PIVOT : ANIM_GROW_VIBRATE, + .enemyMonElevation = P_GBA_STYLE_SPECIES_GFX ? 8 : 0, .backPic = gMonBackPic_DeoxysDefense, .backPicSize = MON_COORDS_SIZE(64, 56), - .backPicYOffset = 8, - .backAnimId = BACK_ANIM_TRIANGLE_DOWN, + .backPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 7 : 8, + .backAnimId = P_GBA_STYLE_SPECIES_GFX ? BACK_ANIM_SHRINK_GROW_VIBRATE : BACK_ANIM_TRIANGLE_DOWN, .palette = gMonPalette_DeoxysDefense, .shinyPalette = gMonShinyPalette_DeoxysDefense, .iconSprite = gMonIcon_DeoxysDefense, @@ -13335,18 +13370,23 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_DeoxysSpeed, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, - .frontAnimFrames = ANIM_FRAMES( - ANIMCMD_FRAME(0, 16), - ANIMCMD_FRAME(1, 16), - ANIMCMD_FRAME(0, 26), - ANIMCMD_FRAME(1, 16), - ANIMCMD_FRAME(0, 16), - ), - .frontAnimId = ANIM_GROW_VIBRATE, + #if !P_GBA_STYLE_SPECIES_GFX + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 16), + ANIMCMD_FRAME(1, 16), + ANIMCMD_FRAME(0, 26), + ANIMCMD_FRAME(1, 16), + ANIMCMD_FRAME(0, 16), + ), + #else + .frontAnimFrames = sAnims_SingleFramePlaceHolder, + #endif + .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_H_PIVOT : ANIM_GROW_VIBRATE, + .enemyMonElevation = P_GBA_STYLE_SPECIES_GFX ? 8 : 0, .backPic = gMonBackPic_DeoxysSpeed, - .backPicSize = MON_COORDS_SIZE(64, 64), - .backPicYOffset = 0, - .backAnimId = BACK_ANIM_TRIANGLE_DOWN, + .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 48) : MON_COORDS_SIZE(64, 64), + .backPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 9 : 0, + .backAnimId = P_GBA_STYLE_SPECIES_GFX ? BACK_ANIM_SHRINK_GROW_VIBRATE : BACK_ANIM_TRIANGLE_DOWN, .palette = gMonPalette_DeoxysSpeed, .shinyPalette = gMonShinyPalette_DeoxysSpeed, .iconSprite = gMonIcon_DeoxysSpeed,