From 93e1e4c2f5b3983ea5ed5891971262974a6e337f Mon Sep 17 00:00:00 2001 From: MementoMartha Date: Tue, 6 Sep 2022 07:17:36 +0100 Subject: [PATCH] A few small tweaks Misty, Brock, Red and Blue use their Yellow sprites, and Sea Cottage has been changed to Bill's Lighthouse from the anime. --- data/maps/names.asm | 2 +- data/pokemon/palettes.asm | 2 +- gfx/player/red.png | Bin 410 -> 414 bytes gfx/trainer_card/badges.png | Bin 924 -> 919 bytes gfx/trainers/brock.png | Bin 394 -> 371 bytes gfx/trainers/misty.png | Bin 381 -> 406 bytes gfx/trainers/rival1.png | Bin 423 -> 378 bytes gfx/trainers/rival2.png | Bin 497 -> 445 bytes gfx/trainers/rival3.png | Bin 482 -> 418 bytes maps/Route25.blk | 24 +++++++++++++++++------- text/CeruleanCity.asm | 21 +++++++++------------ text/Route25.asm | 7 +++---- 12 files changed, 31 insertions(+), 25 deletions(-) diff --git a/data/maps/names.asm b/data/maps/names.asm index 805c57c9..2599f0c4 100644 --- a/data/maps/names.asm +++ b/data/maps/names.asm @@ -37,7 +37,7 @@ Route25Name: db "ROUTE 25@" ViridianForestName: db "VIRIDIAN FOREST@" MountMoonName: db "MT.MOON@" RockTunnelName: db "ROCK TUNNEL@" -SeaCottageName: db "SEA COTTAGE@" +SeaCottageName: db "BILL's LIGHTHOUSE@" SSAnneName: db "S.S.ANNE@" PokemonLeagueName: db "#MON LEAGUE@" UndergroundPathName: db "UNDERGROUND PATH@" diff --git a/data/pokemon/palettes.asm b/data/pokemon/palettes.asm index 3bfedc76..6363967a 100644 --- a/data/pokemon/palettes.asm +++ b/data/pokemon/palettes.asm @@ -145,7 +145,7 @@ MonsterPalettes: db PAL_PINKMON ; CHANSEY db PAL_BLUEMON ; MONJA db PAL_BLUEMON ; TANGELA - db PAL_BLUEMON ; TANGROWTH + db PAL_CYANMON ; TANGROWTH db PAL_GREENMON ; DECILLA db PAL_GREENMON ; GYAOON db PAL_GREYMON ; OMEGA diff --git a/gfx/player/red.png b/gfx/player/red.png index 9098fc76ec5e15877ac331f6781b6aca52859bfd..dff68167f483174fea672a27b86c87fb79586003 100644 GIT binary patch delta 387 zcmV-}0et?N1D*qrB!6W|L_t(|+HKOkOT$1E0Pxci#Hp0_hPo6SI!eXS$^|42Qb;A9 zYXs4Mz*#Fu7niy?6bFk6N|z4BO;9N=8I1U`h|s~s!69uLMM(Q>hvdD0N0uM=-rc?T z!XUEPzkJM4_V_yG61)kdzYE_dgahy@$j$)z7f2Uw`e&3!JAWG_*DJjmgeLq_0@PwO zx30`0yY;c{FM+{qt@)n8H(SSz94W!7H^@=YIlra_`cwO)KzQ2IZDfD?wCR$2YX{91 z(khQvQplOI%8XLTd9Er(_(<=8GsS2JbUQMI{FMRSvq@%`5tq+`$rm0C}SJUJ|3_GbvnKQ5(N>M7f3vxwHl3iYqb7q8j z913I$TePw1Le(VPG_yJxcU7b*rN~Cfqr9glr{I>7fgLBoS0X`jorFjwk+vo#p2@+?^+#C!1tMM4#e!mM4gLa$7MnsrNIQr)xr#34Qte=3tU~i%z~h#W_wMCh-jN`( z$bTHfF@3c}5&L5I5K&i8Ye0`X#dDxz6i%)pES7*icQ%gES%0B@a8x-Td}Gq!g`ni% z^?;Rujs3zGg=C_eLqvJ`c8^NQ#`PVdx3hp73?{0WgKPr#yUxvRbdCCyxdoK9rpn;E z_F0dtJcp!qPx0(A{lIQ2!{M0TO?gCj%+Dj5j=Le{9wnOVhsnz`M3Y`vd2VUM+mLNW z)Xh3vGP|hBDtNSzRC=*VU?L~dv%pqPur$ySB9lbZ=lUv&K5((dftI0X9wTHLuv?kN zf3jnw@`z9QZUr&LItG4bEE3h36^%L!(W37fVw1Xf-1DrB&U!Is#ei;~wFYRQ7gW|! dvhutC)(_+3jVjP?7#{!t002ovPDHLkV1kDqzE%JL diff --git a/gfx/trainer_card/badges.png b/gfx/trainer_card/badges.png index 8b0fc516234852fba0ed5bd7ae1f580d10de860f..46e7add32db0228bda0a2fbf7efac10be7615801 100644 GIT binary patch delta 896 zcmV-`1AqLS2bTwsB!6B>L_t(|+Fg`QXcJo)hTo*E)dnvbAI0Q&Ud~ucnXLw2{H}RLy!A+qN4p$}bq$-H?o8e#?#~EDVL~ z@i-J-j*)QaIDbCR@F4QjeHy-RRn{^kQ7IJitb|d$ggV+>q>Li+F>;mPUxL>sE1Hx) zR+3WKuaIgg4B+UNKp$=tx)&fg!MpG%-`R_{H=P|wya{QrC%bKExk-lT2R{SePcWpk zR}wFq4@>MmgRos2PMFp{&6yhNbARRr)vAZ1T5h;ogPVym&|FHQ zZ4q2nd`m$`Nhvmg=e~G5BIWbC>7;Q$f#PqJ1IKC`;NyH47Qbo13JejrB(y3lEdZ8Z zPz&oU5>?7mlq*qVFiagD)iE_(rQ_3z(^oLu_N)p^mT!DH3-6HzZq82eCVR^~0Z+<; z7smm=pML{^or4kV?EKF{mbY6N?>YMzR!`+?IDMPG!mVBQ4PtM`Bgz~wQ079y@nuT~xHNL0?T=1EZ`6jmx! z;zR=uVsWyu9ll6Xb+xPeLl{4KOGDeKE{4|eu73pja~~uY&b*fJeQ70?_*IFMsW_W^ zKRlB&17tGYLS8z1$Yk8?_!HiMH$}9hNuZ*6?)?x0lA$ml6LiS(9bwSM6sMAZ8@l}v z*#+lDVr^wy2R{ za(VJ%a^;y`W-LXnJh-WUNp$iEEeo9g?S6oM0#MaSrR*?4kWz!?X!OmYE(#h)nWIoF zhhpp33xB!6Q`L_t(|+Fg`iXj@er$G=IJ)kg6OZFE$nVkk-w_E14sD<^I7 zWe7K#WMCCGo!Tug4(p@P#v+0*Rz^VjvW=#Ha;j9>gD*mFZM&`6?44x~t`_&yjpoJM z+$vg6bNrs$M7tfrC+FUC&i8!J@BDrjJ3upT0!_eUNdWI$0)IkMCebHl9!no=wIcf2 z+C{8~N2c-XY~>y%lrAH#^))Q)bo66S>tWP{nulIo)X;3uo<+DmA$ByB{zJguowVUr zO6dntl^jr$SpnUd;fm#SL%>L>mQz>YMNUNE#7=w)#Ih+M5=$e5S29FCgGld48;%S- z(uC{JclY3GqJMjXIJ$wma=r`I;tv+~5~I}n@gY(7rwpp1ffc)fPHwIWnL4Ujx~iUR zAb6)E{l=eY9M#~YL7~4khxcBN&fu$Bu?6vUIf2FM_%wz##?NDTBVobaEV{5Nn*!;r zumJ9@3lywhG;XC%YrOVxaA>2fTsmlC{FDa^%Jp4%$A7r?Mx|t-r&8)Ny&ia`=N~It z@R!p9oXZ2c4&jUXDHX4hAua(oL%A^|4;?P@rg6%E?O7ZG-f!ihm+RfEoN$UgF z0x7m(gARjcobAQics$=XhEOtZUX8I_4A#zFw0|)4;e^28+QcwsD_a^5@7~r3{WVCH z+?N{X3ORAGJ_3`wb2K?QKriD{G?^=%e-ObyFhvbaQXrDLuRi9qKy8jSSe5z?G4Enq z&RF;@ap^M3EuX}3E!7r>_j;R++Tl@V@f5dIHtSNKeTzs;6XoxSpOgAveV82beIamT z^?p@ad$f-zNqQ+s>giDL{r~u1+dnk_Q2m^HtYiZ)8VlLD>7@-ASg-jqWA)tcgwstZWnvH42y_`N b22%e5>0V4+K#X9^00000NkvXXu0mjf5{JO^ diff --git a/gfx/trainers/brock.png b/gfx/trainers/brock.png index fc8f23785399e635cfdafd00bbc6710efd52c797..8b33e8b9952f5eeac1807ba2ff531502d49ab4a8 100644 GIT binary patch delta 344 zcmV-e0jK_o1M>oqB!4pD>Ol?kfqKpI(BSGz~$;EM(8~msu>b~+`oqt;^IlO-!B#K zXQd8-FGKOp@Ovy4qL#-puYsPPJhn3hI%x2d}FrKZyff3 zJw0f{LF;^f3R}hbY7?kA41izqb^zq33yjb6Ysje4g1lT+!h!gjgf#I#^gBs&tL!1x zur{knu8pRg+;JXShLYPrEyo9A;89nm5Py>@L!hIm3fxv=V>U%IRzP0~UqYeF9u&$8 zo)39BaaLTUZ&Ck6uf%=N_JMV;?#-tC4`0hnkb7>@fgh>wCYQ3rE67`QlQWZ7=Wb$| q(R9a}bhb=`T54$;{3$moCVvCXF@Ib`=WUDt0000#q->C8#Y)^F)tu)O}c714cv!@Q;gIAUO`EPrjMpW&_!^ZLG%PNva9e z_$@VCvKm5M7#w2uZzw^Lpa_H^8AZ9iA&;WvR(lTaEfBv1E(!hvG<-7xcCz&VQ>bJx z1uuQK1?*KaRcN5AsJls8z`Uwr7w-4{Dow+qgU$b0&EF*nDSq)D=|JF^Q z>1n`Pg6@#kIL;PKPbtNm-Zs7UjhLMmE*65APlJ!*9LDSq0u;I7>>p4OmlW0fhej0+s`iB!68=L_t(|+I`Y7O9L?!0N}_8iWGuqLBvIng11<7RZ_HrmO?A_ zeu0~#f1rwrV?pd*dn&zib9CuRIn<+gLpP_cZm}l{lKLDpdC6j?e7rpJlJ^K0i{O?b zxdr?PIdRUSaYf#8Htaf+jLyw|}-P#F7+O`MguYGSazC zo#FIMnj!hg<+09N*Nu^4-@Q6CpaBV^*fPR|)=*BU-rr83bGVkZH1?o7rIEqm2671BB&D+ylxlsTB delta 354 zcmV-o0iFJq1N{P!B!5InL_t(|+Fj5wOT$1E2k~8}9h=-v91#L`3UB zaP{XPkw#16zA2eLw6t2x(aBtv7GmblHkU7qF*&_@vCX*ZUw@Kp!(1PeIm)V`#MM$I zv1WKNHIkb(bro>I)J2@NH?|bOz4_f}fZx4eWz#)b^&9NyQ!;3<13=!U-6xq1TkT9z zQfT?Q0A%&53i#H!83GPm8UlWlsVg56eB!v=10-Z>h`90!m?NI0OVUb8NQP9Sj%@xa z?rSN@5t*^U7+W4WuOUwAhy>DqP9X9WW(hKIs0GMxTkx;ATZHtwJCK9SHf8~37kh|# zM3Khqza#qpc#RlfvL@nV67dex>)@MD5&2*9H%}j(cFFfj? z)V4m$kk$33Ak-kdn9OZ~Ctc(iK*U(=10=|02oZ1Cg*4ekGJoF-_K`Xj;UVEwxU#Xp zu7*2%>o$_jpWZ(ks%m~exx}uj+sB?pe%)oo3vZ||IJc1X?76mLayVPXDs*GbChB$&02k|a^%UxMt;Y<9j=EN< zVxwss%~6>``?Xt%$KX$0b*VIzCrxVcMlO~)Xp^`QDae7=KXww7 rr_d)XP_Ybj{lRu4`h!vU!`vShc#+8`u-(}J0000aWZ zhJxVM&A-7P*iGo*jTS|tC5ODLqXt0Ar^i101Ua}cT$cK=-_r7@{Jadr$ z(95#yrAW9|Mh5qio+3Axtfe>ts*jOV0Hz`3kR8GBA%G<~0e{d_9LiKlksG>dq`0G! zOB1WQEjFD2@~rAO94AyuZ_OVfAnC)iCE)f#+L-GsWbi2F^x4T20UmuRak~jlzrrVkK0h=&mV- zA^HM_Bt|qUaHxr4i0C$wG0R!=HsbdEC~zL^C22_WJ{$})^J@&l^AEOcSDQC|ihck9 N002ovPDHLkV1nm+%P9Z= delta 471 zcmV;|0Vw{x1MvfpB!9R`L_t(|+EvoeD+FN}2k==_4#X()Dy1YT?S({2^sa=9tax8V z%0W5oNx9Ne9JL1rImxe@#=*f=S*@kEw)OiU@-OV{sFmLJn3;Fxea+NNeR_MJd7tm| zDiC@U_frnDm<*APhX{I@+1CHOM>DOG3{i3{`9SHcA;@$@6Mtq>tY#3MH?iDHN5@X% zf)+(>bVl%n=msLmfZ1u?*rxG-Xlm8@M>~!72okx3(F<`wKt9YzD+koM>y)?-8ItOsrS)=mG zY5@vh)|?kOqZkIv4LkG6nFi>K^=t3JsQ@%s_pShEk!b7R|He(o5RpVQGJGu4pi_*h zf|fH8v?usVF`y;E?5^|f3pP2C-<}9IA2>rc#876P98gNj*k{p=h0SR`^Qya`mwn#u zxV&EVY3E&jjQG51aEli7;Hs>7O%D6*cV)aj7X6{5`SrwDgabS>_yf&iac`OKlnwv@ N002ovPDHLkV1m-S?-u|7 diff --git a/gfx/trainers/rival3.png b/gfx/trainers/rival3.png index 5e6fc5ffd44aad16997a2db26fb8571500dc92be..08e228135a1ec0178011b7ba287a9d35fb0ec98a 100644 GIT binary patch delta 392 zcmV;30eAl51EK?vB!6j1L_t(|+Ktk&O2beT2H+cNQ9(_G-l4k|+=Q-$lhAe$gd{ZQ z4HSHgf_o#VgD)V`r7z%+(khxk@J*5^;&9=Zra8IEW`@AWpWJ)@lL)F^;y;8MRREf* zq0R%%^lr}$C@xcU+YY^${B9H5V^f|o7l^I{Jt!WQh@R7bDu0-Th_GZHqwgVn%nAzG zwh>~c^4%eV+Tnd~hP$ooFnp@Xi8Y1PXNu?`fP~XHjiv;zoKpHY|E0w(^LsX5DmiAV zE9e_ol3phUqO+kgDb7kTzj}0*RdQj&NKqGYWER7To~eU4H=|4@~DpzfvGwZ zJk+GF=Z`9s=zq(6S00^@6)NdfNugaMCHFP{T;}zd?+-PG^;8Hs&{RTLP^BSE%~)(z z`6>3rw&uzr(a^LT6jmq(w6b+0*QBIXDF_r>B@+Rpnou$ul=4f)`R~JDf!@|P!(oc{ mx^kK3<-(HTdX+d|>JPGxRb7;m>}&u4002ovPDHLkU;%>U*uCNa delta 456 zcmV;(0XP1l1L6aaB!8(%L_t(|+EvrdOT#b}0PxIxcylt0C<;61LD<26K&ZnH@E~=r zuS~r7F;EoUZPyM&@MgiY2r4Ri*dO3wh)jkPs-Pe$C^8g8kk0y1=oagirfm)hKOVf~ zy(Ea#hUTfSs5X~83zEcG!4TZ!>}UpNZ*5lnFj=-~#6To*#(%FNfaN(x6@wu1jMrEQ z;Vnv)oVJXQ_^f?H(nV~z+sa(Ya7MIK{-M!|m#g%>A5mMcLPW+&J z$QI1(S&8x_GC=euF--X>hl#vSldic%Us-#Oc-Tnt5pfZV!4Sr8zG z{IEi)0SudLw|@%65HQ(dF+YZpUjU9$>uCEY&pK%`iQ}y80>a7sgvH;ONj1S5JLAC# zb)GeLY5|LbJ&emEB-@4?`qjbGsict=TLe1=ClIFW*^CNi*K-IZi7w z7JqXoA~7mj?$Pm(6g8_jSx&k5+3Vt~i+r*7-ofTz