From ab6051a5d5fb14514e0b9172d2a9ea7869344372 Mon Sep 17 00:00:00 2001 From: Martha Schilling Date: Thu, 10 Oct 2024 21:26:50 +0100 Subject: [PATCH] "33 colors are indeed more than 4" Fixed the build issues caused by Zach's newly pushed sprites having too many colours. Also, adds my version of the GSC-style Soldier sprite. Also also, gave Dokuroar a slight weight increase to give it a better catch rate for the Heavy Ball. Also also also, touched up the Dokuroar cutscene a bit (it now shakes the floor with each step, it moves slower, and its walking animation now animates correctly.) --- data/pokemon/dex_entries/dokuroar.asm | 2 +- gfx/pokemon/balumba/back.png | Bin 721 -> 325 bytes gfx/pokemon/balumba/front.png | Bin 4864 -> 885 bytes gfx/pokemon/togekiss/back.png | Bin 734 -> 332 bytes gfx/pokemon/togekiss/front.png | Bin 6375 -> 1684 bytes gfx/trainers/soldier.png | Bin 632 -> 590 bytes maps/LavenderCryptDokuroarsRoom.asm | 21 ++++++++++++++------- 7 files changed, 15 insertions(+), 8 deletions(-) diff --git a/data/pokemon/dex_entries/dokuroar.asm b/data/pokemon/dex_entries/dokuroar.asm index d44a037..7843239 100644 --- a/data/pokemon/dex_entries/dokuroar.asm +++ b/data/pokemon/dex_entries/dokuroar.asm @@ -1,5 +1,5 @@ db "SKELETAL@" ; species name - dw 807, 4660 ; height, weight - placeholder + dw 902, 4960 ; height, weight - placeholder db "Believed to be a" next "spirit inhabiting" diff --git a/gfx/pokemon/balumba/back.png b/gfx/pokemon/balumba/back.png index 5d9013af267546bb270c75f6e5cc6a41950ca64c..4aa08e85adb53f23718ec29c3fff6ebeb17891f5 100644 GIT binary patch delta 309 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 O0000yS zzrS9VnWjw+%qXetDBUZ-U_D(V&aOZXtxBhy{uMyTkH=JK073MTKvsw?=C_$$kuF$) zUg-AyXDU=sJAd^l^_vaE)FW%i0JI2Fo${7GKs`oU7&ZV_kQb%0%}ecbw3rxrjrx5$ zi%C}@Jluu&j41bfyPsaQFTtD4KQERp18Z*-9#AW)hBpBvBc(TAvjKv5;g&s2z?zXY z6T=309eUP8c_dO>tp&CcljP-gZy`+N#0yM-HPR}wgnw4RuSEAlOaSmRE#aNvn$fso z83zL+(3LbBiTPWj@if+w$G?NvfNu@|6LvA6AU4>wz=S1gNY_;~18kXVZJQcR1|%Hz z79RzqQu|c{IiXv`j|jJ{ z_01Z{34h%(`&*1#d>obkyZc_nOM_OzYFf_3`jx@L#}=Om{(cMon}zt?^PdE*%%Y ze^#l@fUxaaKc9VUmC1?GGWMzgJCmhA)Tur<`${#`mt3M-#RKceQ~gphjEJ#))>dKE ztZmPAaSLq~4}JzIkBYZg@lbsRwjj~g%pQ~Tj}V>#A-M-J&dS^C00000NkvXXu0mjf D+|W)1 diff --git a/gfx/pokemon/togekiss/front.png b/gfx/pokemon/togekiss/front.png index 2b0e545bb64f76a2de5dbd6e039911a8aba1d022..39dfc71a4208fe0f1d6e25dd62a137c7d144f025 100644 GIT binary patch delta 1679 zcmV;A25|Z3F_aCE8Gi!+001N9)9nBN01Qw}R7L;)|CF`=&Pp)=000u>BV+&o217|i zK~#9!?VO8}T9Ib-vb&;z`iY$c($YNw{hw|Q6y9b|P%zxM^uCs|H}FS`EU z2i*r@PC|&y0fP&FR1^#t^Vq14^pOQZq>SFtRHn7aLgAxqmw&u1c3mjUL-*54*M(gj z!t`EWRngoqU7B^Fuusj8t_U}DkAY4v%BkvNvt9m9wcQjSlZt~A0N?9&(@_w zLYT|#6xZd|K!1dgyA)<_iw;^BxzWGIA$7#OY5(Qt51D=3d|7ifX;r>UoV|xOC?e8? z&jm#{3E#m#K7!awD$$)D#*Bdrvm&JDCZk-0(bGpb8q2zJx?pUFT=yy=j9?x{7m^Ux z;gHedFzVbqDVriwIfPJ!)bCPpm86vVPw1 zqTP~Er}MP{jE$Aarnn;YUs3Kv(~paL^L({ovUpO2uYneO%T5?qZIzAcF+a+1H_K%< z-m9N?Lnq3t07$ljUpGed*I^_`)uElnpTicKpAvArGMge zx#M!j<$sRL9ly*SeH+R9+#xPs@44wUmvqZRK%B;aIzWI$4KtzA$fN}!hgpOef z2Y;&(cd-5np~D>_#^pkrJC@M+5oU_GLs`!A>}2g^o{~yPL{^MD&yg7-x6n+(2dOJJ zzv${2IaCVZx)KHU@Ud8%iVx!8dYA^r(X*PiP;_ZN>`d5L@Hs6)^w2zcam5q_x3xNw z4@}5H_HE_Yn+_^;$UzP1l(cf zJ0k9|^Bq2SIQb5rJDhxn&mB&_!{-h!-{EqHm+x@7!^w99+~MRq0`Bnh9UebywP4%N_qR?g$>p2!C$HKZhOpBX+bc8XvJEVH-OHcWh$^=Z<3CTiBs+ z2lS_9qrvO`Hu1g`=@+I`kL>k(SJ!k&3EJ} zxXB0k4#>!8n>(askA{8jz`E`yckJ=X;-Sn+2&lz7a^ewj2XviKD%{a(cScc+6k6Qz zDyi+^Fj`c&V@l4=kH+!HT#bACMqfX)T$new1M8!4o7{mu2k)mJa0j20BkmY+|K*O$ z9hW;Ucl>tl(1am(7+npx!+$vf^0>nj{vYZ)RNYR4#*xeOCAvz+7yYkYGaL8~hd>N{G4$Mqe3 z-f>#rF*)tS`VOAmKC16v#CA~MF>+%#tM6zDGbY@s@2L5!R~~`sDs0KzN3W~AMzdT5$c=oxZLsY;g0*9RS*o`y7G`a zZe95wD%PDHLkV1iUKUd#Xh literal 6375 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 aBz$?MxLkjp5tGzEo356jCQidP{C@xt%2`SP diff --git a/gfx/trainers/soldier.png b/gfx/trainers/soldier.png index 26bf56e78006a112da5694e372c5834e62172159..13475f49909112bc490f0c48beb33456bb7637da 100644 GIT binary patch delta 557 zcmV+|0@D5X1kMDIEPvjdT2h1n0002q<1h~Z00I3;L_t(|+SQiZmct+jMUnIW|6HzK zqS5$R+eub4*@AFDiT-T>dAa1MKrVDmq7=X`*Peoy1-%BD1Z1^&$%!@Gn-oS|Rd??e z>G3pcy{pi145{3T+!`oekbL&2P3>HQvS8&jU^phE=j6{hMSoBJvV1Xf2a*-*4K{91 zqVR*Gk06aJ94u}~Py=U<-&4vCVzt7sxMZF4nzUEe)@BqH)c?8Wb7+o=e3qz%#@48M zmp38VkvOwI7COmClh8`kH>Es$N&1^3VqS37DjtG!g9(z^Qj02le`X|)F@g&{xUiUm z?Wy}aC5G)L9XX+L#jexgfw@qn?-<^oWEX8|JTYrdk! z)JxlZc~LGR4!KBh_@*}%B3>o$+Cg$$ITtXZ(`;Lbx>*gT@?mq}+@({!SuwtrU4^Df*px0o+@l`-Smz}0xyEpdAD8SbYSX=g8PjYr;|i$E;+#`U!xIbN#L8s vt}C}5@+Rc~f@iv0huYR8Y<49VgWq?oHZwn7fyO zMaBl@F0MW^5ne7`wN%Jt5%}bH48s`b8fkp-S4+u(j(tMaGJl!LfD8wYsa$c|-?q(3 ze|ZHx%H-ai^?aZi4Dd{Z?5(4bJ2?rRpG_sd)IhWR0Um3_8kebmA9vPbDiv ztu(FB{2evm^|M4%$$uENvpybyH;lv#W>_1#NAbMC-%#W+1W%4$x%10Z=C@4-%Ec9ju zIoR_`cU0fo30DMDtg>L-plO&e_67?nVJaShQ