From 22fa5782ad6f56214de6cf1fd37ea510d5be175d Mon Sep 17 00:00:00 2001 From: MementoMartha Date: Thu, 22 Sep 2022 10:15:32 +0100 Subject: [PATCH] Some map/sprite edits --- data/maps/headers/CeruleanCity.asm | 2 +- data/maps/headers/Route9.asm | 2 +- data/maps/objects/DiglettsCave.asm | 2 +- data/pokemon/dex_entries.asm | 18 ++++++++++++++++-- data/pokemon/new_dex_text.asm | 24 ++++++++++++------------ gfx/battle/ghost.png | Bin 497 -> 712 bytes gfx/pokemon/front/fossilaerodactyl.png | Bin 539 -> 760 bytes gfx/pokemon/front/fossilkabutops.png | Bin 546 -> 765 bytes gfx/pokemon/front/zubat.png | Bin 349 -> 753 bytes maps/DiglettsCave.blk | 2 +- 10 files changed, 32 insertions(+), 18 deletions(-) diff --git a/data/maps/headers/CeruleanCity.asm b/data/maps/headers/CeruleanCity.asm index cf6c45a3..5ab67481 100644 --- a/data/maps/headers/CeruleanCity.asm +++ b/data/maps/headers/CeruleanCity.asm @@ -2,5 +2,5 @@ connection north, Route24, ROUTE_24, 5 connection south, Route5, ROUTE_5, 5 connection west, Route4, ROUTE_4, 4 - connection east, Route9, ROUTE_9, 4 + connection east, Route9, ROUTE_9, 0 end_map_header diff --git a/data/maps/headers/Route9.asm b/data/maps/headers/Route9.asm index 4e97ee41..312aa695 100644 --- a/data/maps/headers/Route9.asm +++ b/data/maps/headers/Route9.asm @@ -1,4 +1,4 @@ map_header Route9, ROUTE_9, OVERWORLD, WEST | EAST - connection west, CeruleanCity, CERULEAN_CITY, -4 + connection west, CeruleanCity, CERULEAN_CITY, -0 connection east, Route10, ROUTE_10, 0 end_map_header diff --git a/data/maps/objects/DiglettsCave.asm b/data/maps/objects/DiglettsCave.asm index 3e599928..ce91a4f3 100644 --- a/data/maps/objects/DiglettsCave.asm +++ b/data/maps/objects/DiglettsCave.asm @@ -6,7 +6,7 @@ DiglettsCave_Object: warp_event 37, 31, DIGLETTS_CAVE_ROUTE_11, 3 def_bg_events - bg_event 13, 25, 2 ; DiglettsCaveText1 + bg_event 17, 25, 2 ; DiglettsCaveText1 def_object_events object_event 29, 12, SPRITE_MONSTER, STAY, DOWN, 1, CROCKY, 28 | OW_POKEMON diff --git a/data/pokemon/dex_entries.asm b/data/pokemon/dex_entries.asm index d1e98ab4..461f02d8 100644 --- a/data/pokemon/dex_entries.asm +++ b/data/pokemon/dex_entries.asm @@ -190,8 +190,8 @@ PokedexEntryPointers: dw BellsproutDexEntry dw WeepinbellDexEntry dw VictreebelDexEntry - dw MissingNoDexEntry ; Monja - dw MissingNoDexEntry ; Pudi + dw MonjaDexEntry + dw PudiDexEntry dw ScizorDexEntry dw RhyperiorDexEntry dw EspeonDexEntry @@ -1615,3 +1615,17 @@ KleavorDexEntry: dw 1960 text_far _KleavorDexEntry text_end + +PudiDexEntry: + db "PUPPY@" + db 1,0 + dw 270 + text_far _PudiDexEntry + text_end + +MonjaDexEntry: + db "VINE@" + db 1,4 + dw 330 + text_far _MonjaDexEntry + text_end diff --git a/data/pokemon/new_dex_text.asm b/data/pokemon/new_dex_text.asm index 929f73d7..9ccffa46 100644 --- a/data/pokemon/new_dex_text.asm +++ b/data/pokemon/new_dex_text.asm @@ -379,13 +379,13 @@ _AnimonDexEntry:: dex _MonjaDexEntry:: - text "This is a newly" - next "discovered" - next "#MON. It is" + text "As it runs about," + next "the vines on its" + next "head may obscure" - page "currently under" - next "investigation. No" - next "info is available" + page "its singular eye," + next "causing it to" + next "trip and fall" dex _ParaDexEntry:: @@ -409,13 +409,13 @@ _HinaazuDexEntry:: dex _PudiDexEntry:: - text "This is a newly" - next "discovered" - next "#MON. It is" + text "A very popular" + next "family pet, this" + next "affectionate" - page "currently under" - next "investigation. No" - next "info is available" + page "#MON shoots" + next "out tiny embers" + next "whenever it barks" dex _BetobebiiDexEntry:: diff --git a/gfx/battle/ghost.png b/gfx/battle/ghost.png index bfe7ef12790b1199ed7007e8bb92394edbbd9320..09bff354c30c798c30ccbf9118ad6158dea051a7 100644 GIT binary patch delta 689 zcmey!e1dg?ayGKVbYB!v& z%&J)^`dRGGA<=vFwSSu1)?zNH*<_20vh`$(Kr?>UyO zxXRpO^694ZABVJA&OLPxpXF39`@{OzL(vBe#WtHAw&a_LVPg6)(85y;(KtY*va^ZJ0^+lPU81 z?|Qs`eCW(1gL#gZm-reRC@=cY*R1th=|lQ4VC<@vxJHzuB$lLFB^RXvDF!10BST#S zATkayFt9Q*vNAQ*HZZm_FxZ%N(Gx{OZhlH;TBR0l9S6)azXEkIc)I$ztaD0e0suhf B9=!kn delta 472 zcmV;}0Vn>*1@QxrBYy$7Nklj?gPO;Lh3u&A_DF zj!IjY9HCdpA}weFU5x{lAzs&p=n6T+Y{mmp7TrutrT$VzV55&GJ^lZa;KI=1k1*A; z)+ey$PsQg-DdUy)sTid<)`Vrc0^)Voc}2Aafcds2#hNl9cz?;e25#scUeSCiB!SiC z`wZ{){D$DMUp0Fy4r8g{j-pr`SaXO<2dy_5{J8kyFm&PsFMc^#%{@e5bK27i#K0SX z?{MrtXL0TR0#|iVSmX8u6$JM%0~Rj(0R9Mf7XfGgVk8p&L~Q_LZ2sDfazLc zw;C@A;+TDNFctsk>nY;3@AURAw4H7#(V<<15XPi9bG#0ae)qSah4-d=FtBDQgG0Ra zx!K#FeqH>jp+p-QHnHENNGZjPh*7*&%H3v07VIi0TTvnW!b|E@cP-}|lE##^(tRbW zRRHUp_qe_oO$H49wbZTnnx8BGD2CQ*Da*G%!b39jb-VKc?s-_(H~#@NzY>C`67ci@ O0000Af diff --git a/gfx/pokemon/front/fossilaerodactyl.png b/gfx/pokemon/front/fossilaerodactyl.png index eb7fc3a32ff048272318d86053ac03a4134349df..9a0e60572122fc2e3623e3fe8bda1a386cc77b46 100644 GIT binary patch delta 737 zcmbQu@`H7Pay1?)ey`u=jhnrC`H|5SOoGNj&QH4Es>xF2W z6W45y2(*fwIoPbQLtOK$uLpmlZq%EF(?q;Ks!WX1kmlA732;=*^~h|#acS~)uiN$s z=8}tACFiaDowoU0X5HtH&-NY{u#jzPvOl4rDAu9u={9Fo>2d|m1dFRz&g!uiu5*cI zwEnGs;(NV7Ytg%;jsyGFwBNK^mbmS{;|wR>O~1@{EAA|Rd*yl}5C408L9XdHrSC3( zv9VZXvhK7dm93{@K24K!Njr7--=*dY&Ku)CA6jvAg?~a?$pOm~>y(b(3j6i;az1BD zamJAu%LIk)5GA^Z%57cFtS0X;D(+_oMa43v=f@+8wv-M`YxM zRH>RIwfoukC%62%v_UM|M*n2-;ljgm6I;$6?2(AsqVjlR=#A~Al@+HvOPHojSnHfD zuAp09FOfa>*$$(SSK0D!%bM-i9sR1ey~@MHr8f9)ChLW~lY__X^VwbsPLf)=9 zU1zIOd9LQX2sV2fCHeke(r2v=lBbtf+?&C&;?)e}`ET?YPP41>XfE5agzZk+lQ(7C z9m;=hU)}ca$=lSg`~R;=`2L^CPa|&q>xmM}fT=;X#5JNMC9x#cD!C{XNHIhi85kMr z8UT@Th=GBXk)f4=fwqA$kaTGE?nKd%o1c=IR>^=zopr0D;;% AQ2+n{ delta 514 zcmV+d0{#8?1)BtrBYy$nNkl<=&`2sIV_2O6A%Q3j`wAE2}c1utVJh?QBNGm}lSdvIZ4 zKj!Uw^X3hL+=I+3a?~_OnGa@p`st@|)NxAbIGScs)RIsCvwvX-2D3cG(w|Wo>c)%% zOOjhvBDczpXEZfXEdZSf_716{^WfW#{dCjFFO%d>a>LRy459qt5?>f4UBd(z`SUjR z1Zd^@<@8Oj)~Uc)IFA3y@1^Py`4m~6l}?w!^+v6`=K7_{t!Q|4rxqSlmuko(wz{oRdw;upXTo0ZWqUs;-@jJ2sq_ijyW0)C)s+IB9L|+jn8hWE(sZ^2rwO96WTya_zjd5p>YL8;VdjTTi$8y3nJBlIqKfiXmh_s2d9Ys*wQZ zCx!|`UFfE%=|3>!3_jD57lUp-7l6cqEW-ORhEb~(n|olQ)`6QLi%`@7Ng^+RnaN8n z7@%K|`8R-%_T+5~x?PV`y1TJmdf`qy<@h85U7X)5Y;KyQ^D7EaIgc~c>{&a*q=>HL zOfav?*Vqnt!oKP9H<2{u@F(cP0iFiCe28Y5N%cSe0~23pCl1%RC;$Ke07*qoM6N<$ Eg6n3p_uy`u>Ghv`SsHnuKNh)a;^unM#mhPCz7LOIiu>sgQH?gvb4pnw^LY>VEGbfOQf7;P@IYEi`>wjKPTz|5@|99Y zUZv#mzIydiz;mXK&XjK|3&b`(+4WQ6X#eDQZWCU+7f@g z#w2b2BIZ-SPd8vuDS3fxbz5E*^7L{+MKzo4@-`@Rxl#*Sy00PTg`!#btA9v98 zNeza%`|iDvRyF_3;%mz9U-5gzEa~Q8d3D(dTfPOi$9im;96i%y;wCFYtMr9hi=_XC zvdDG5Th7pCy88FThON`~arj<1)>CyBYy$uNkl$;G)>Ll*8`|XbT*HOIwj~7Y2v(xqn4BzQu>wKDYP7>%9zz zC(hf@{2m<);U*DWNlrFo25(yhK1R;oaQJI>4A>-zbf5nd=s@rFRY?FgP?2j=D6pTR zT&$*Toz-@$prgF6nqH#}3ZXDbW$`9Qn~aAhdH!UV5?^jIl%h}T44&gy2YYJbVTNJD z@m=Yanmy(XD1UkHLmrLiTC>h4kcQ$r)u^5;a_GmE&Sb4{sMzj;9JxGq@9r#7<@P0z z?BZ&vLQ)!K~hcZ_N1>NPp&vxdB3XayGa zIX)Pxuu06C>vGfq_4fUrT9e^R9qXNm$g_;hu(K4<&3}nVVT5CM$$t?WnMw?{82n|{ zA#2MX)fj?hJAIQlj00000 MNkvXXt^-0~g7bX&3;+NC diff --git a/gfx/pokemon/front/zubat.png b/gfx/pokemon/front/zubat.png index 86ac47101f4e9cec621e5dd42eaec754756ee607..a71289b509e775c1d7856559a1bf701d766bb606 100644 GIT binary patch literal 753 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZA?Bp57i?)wF#SkfJR9T^xl_H+M9WCijSl0AZa z85pY67#JE_7#KiG8eT9klma!rN?>5Hn!&&zUNC1@pbb!hDaqU2g@M_)rKkhQ<1Fxq zEM{QfI|9OtQ?>b|fr9KMp1!W^&p3tH&DdZ5+sg?QV$3h{3t>FJsC*WXqgvt`QIe8a zl4_M)lnSI6j0}v7bPX(Z4J|?p%&kmKtPISw4GgRd4DwVXf1+r}%}>cptHiBAzT%-P zP(xH|glC$sFM}44&B4IRD8#@FWHACE1EUlJ$jd+$gBPPToE^ld0aXJGC?;WqdZ0QG z@Bm_v9xyE*^xXu=E%bD84AD5h^pc?mQ=$m_hww?Pta>-2E(%?{Ak^XVe3GCN=Qq3hT+s--v$w6O&5d_EQ@@gQ(}rtNTHY@2{(Ns$+y46j@BaU{?^Uz7 z2b!<2`uMTkYh$awYtqM^t@^=9Nqbv=dw0InwB+wwq~bj5)65@vDI2B)IM|hoF3lDG z7aII1YH>r-t;dhJN{SaoRNdPWcXXD^x|6$Bg#;(bmQ1gFoa3Z<_Lwl&U0vh!#nbF3 z*#x{uoEQ0BWb?!)nXRXikN7l(=w!|akt^8Q>-p{2Be%9w#d>dNly3Z#5_9n}k7!$^ z`M&>0q`ye0e3IfmIhkR7ps#iSKerjvoW-}|5?Ay)pP60bvNiea<7WaYd?(FTl(!tt zSQ4rJ`%P=h#-21Oq35NFE$lZOW0`D~tT;jvghOfscHVv+nz-}AZ8z2z$J6(1{$ZfA zwK+OrW3&E)mdK II;Vst0Jo9{Y>GG2~+-2bK v%Yffbhf?+3Ze|v@HhNT(e!lO+KS0$#d$ldWZtJc=00000NkvXXu0mjf)M20B diff --git a/maps/DiglettsCave.blk b/maps/DiglettsCave.blk index 23df97a0..60c3ad58 100644 --- a/maps/DiglettsCave.blk +++ b/maps/DiglettsCave.blk @@ -1 +1 @@ -,++,8+>,+vvvvvvv+vvnnv)vL8+ztrs*TUUUUU2ss8+~[kkk[o>~[[[[o \ No newline at end of file +,+,8+>,+,+vvvvv+vv+vvnn+v)vL8+zt+r++s*f+s s8+~kkkk[[o>~kk[o \ No newline at end of file