From a3f3763f4d681dddf3d0281a16ba2c6b5e71b18b Mon Sep 17 00:00:00 2001 From: MementoMartha Date: Wed, 8 Feb 2023 17:13:44 +0000 Subject: [PATCH] New sprites, a few bug fixes/tweaks All of the Ubers have sprites now (goodbye Lion Pory2!), fixed a small bug I made on Route 19 when resizing Cinnabar, and some minor text updates/fixes. --- constants/map_constants.asm | 2 +- data/maps/headers/Route19.asm | 2 +- data/maps/headers/Route20.asm | 2 +- data/pokemon/menu_icons.asm | 4 ++-- gfx/pokemon/back/blisseyb.png | Bin 551 -> 553 bytes gfx/pokemon/back/lickilickyb.png | Bin 574 -> 555 bytes gfx/pokemon/back/porygon2b.png | Bin 603 -> 509 bytes gfx/pokemon/back/porygonzb.png | Bin 544 -> 527 bytes gfx/pokemon/front/blissey.png | Bin 532 -> 881 bytes gfx/pokemon/front/lickilicky.png | Bin 890 -> 844 bytes gfx/pokemon/front/porygon2.png | Bin 488 -> 802 bytes gfx/pokemon/front/porygonz.png | Bin 706 -> 847 bytes maps/Route19.blk | 2 +- text/CeladonUniversityOutside.asm | 9 ++++----- text/CeladonUniversityPokecenter.asm | 14 ++++++++------ 15 files changed, 18 insertions(+), 17 deletions(-) diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 749e0e23..0455600f 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -48,7 +48,7 @@ DEF FIRST_ROUTE_MAP EQU const_value mapconst ROUTE_16, 9, 20 ; $1B mapconst ROUTE_17, 72, 10 ; $1C mapconst ROUTE_18, 9, 25 ; $1D - mapconst ROUTE_19, 33, 10 ; $1E + mapconst ROUTE_19, 27, 10 ; $1E mapconst ROUTE_20, 15, 50 ; $1F mapconst ROUTE_21, 45, 10 ; $20 mapconst ROUTE_22, 9, 20 ; $21 diff --git a/data/maps/headers/Route19.asm b/data/maps/headers/Route19.asm index 9ea5f159..913517c6 100644 --- a/data/maps/headers/Route19.asm +++ b/data/maps/headers/Route19.asm @@ -1,4 +1,4 @@ map_header Route19, ROUTE_19, OVERWORLD, NORTH | WEST connection north, FuchsiaCity, FUCHSIA_CITY, -5 - connection west, Route20, ROUTE_20, 18 + connection west, Route20, ROUTE_20, 12 end_map_header diff --git a/data/maps/headers/Route20.asm b/data/maps/headers/Route20.asm index cc9ffbc7..9fabd201 100644 --- a/data/maps/headers/Route20.asm +++ b/data/maps/headers/Route20.asm @@ -1,4 +1,4 @@ map_header Route20, ROUTE_20, OVERWORLD, WEST | EAST connection west, CinnabarIsland, CINNABAR_ISLAND, 0 - connection east, Route19, ROUTE_19, -18 + connection east, Route19, ROUTE_19, -12 end_map_header diff --git a/data/pokemon/menu_icons.asm b/data/pokemon/menu_icons.asm index 10195040..1de5b57f 100644 --- a/data/pokemon/menu_icons.asm +++ b/data/pokemon/menu_icons.asm @@ -217,11 +217,11 @@ MonPartyData: nybble ICON_MON ; Gyaoon nybble ICON_MON ; Omega nybble ICON_MON ; Snorlax + nybble ICON_FAIRY ; Scream Tail + nybble ICON_BALL ; Sandy Shocks nybble ICON_SNAKE ; Dratini nybble ICON_SNAKE ; Dragonair nybble ICON_SNAKE ; Dragonite - nybble ICON_FAIRY ; Scream Tail - nybble ICON_BALL ; Sandy Shocks nybble ICON_BIRD ; Articuno nybble ICON_BIRD ; Articuno-G nybble ICON_BIRD ; Zapdos diff --git a/gfx/pokemon/back/blisseyb.png b/gfx/pokemon/back/blisseyb.png index 7068eb3947f5ec700f4b82a848f6a1fe8ea538c3..6f63aa52c0f94f2290e5b5e8dadc9e97f2799336 100644 GIT binary patch delta 273 zcmZ3^vXW&&C)aZ(Heq(&?dz&aCr(z8GS)RP(lsy(F|@QYFt;)^);2J(GB6N7>gPQ1 zqBy#&5k&UD`@i0knHV$cS9-cQhDcma{=v`6b3?LTazW4O|8EZV=zr7x``=jN&;R$E zvob%_xB30v-yhb-Bq=N_vBSyP`JZu1#@eVC3S21`YwNcj+9!D8!mt0?KmUt59Q*Zu z_qYGisyr!ss<+m4icQ#9eSKBvW~-n7jn`Cf%?iC1vOsiogM+rnsS7+m`P1yzl<>B6 z=x`^r8l?I0eq}el6fMLc)9u0<~^Ij7eIt01cA|zS<@G&vW-L!W9KYh_7@Ala8(0}zXd4(<85pc7Rz8}FIEF}EPX58q%5%i9VuoUmeWRklG4=HU)dr7Oq_41V5#&l| zIngW`?z~jY*~KYr?FM#3J-4+{HF8HR9&XLQnl9jc`rrS}whqVU$N&HTf9k9M=Rb(2 z?2GyQ4@chL4b8?`kkOSLeLjiFcfTJLPO@2U(y;OXk;vd$@? F2>`J^x@r~*? z5#it!y<6M9A554jlcbVz`r_-*;#a5Z>u&|SXg>-xse9gZ{{N%P%KeIs3+A)f ztd6j%l%BNWXrJM|-h>UNKU}Zg-t^(ct8SIMD>)bh&hL0rkWqB-SlnGN=5EI~Zm$HB zXDw+93EMe0&m;2i(kln&HQGw3PN=vN!`0dTTO?w#k*a!hdDaa3AB?=_n|LQq4PC(i N1fH&bF6*2UngBh6aEJf^ delta 294 zcmZ3@vX5m#C)YDhR$dM1m(NWyCr(z8GSW4$)HN^-F*LR^F|aZ+)iyA&GB9AfZW%f8 zqBsuO@~+0GlbIMZ>-TxOIEF}EETRd&4rj7r zlJbpjuF=^YmuO^Bm}8ujr77;F@?ycWwj2*%(R-U34kgX<3SVO|Q#K^UZ%W0C@2u)Q z8_uz$ZxXOGVR&PrCuKD?-3c?4X0gr;~AxI&U^Lg d;QQ0{ADO=HKN9A`svO4v1fH&bF6*2UngHHDc5(m! diff --git a/gfx/pokemon/back/porygon2b.png b/gfx/pokemon/back/porygon2b.png index ebff7455dd83aecccb381148f7d87f69d324838a..7f30c75e62cba6ffb2d9a13bd22178a655e4d92d 100644 GIT binary patch delta 229 zcmcc3@|Sr+C)aZ(HeojHnjPm(PMoYFWvpvpq-$UnVrXe)U}j}vtZiUmWni%3xwhoQ zi{dzB5AK@0bTSiTW__)vi(`ny<>VjytUN~yWqv63=&u%Ykl6lj?Iw2PP5;-=;!n%? zAH7xP$dBExuCF?(aBP0)>M&O)Np0(d9$|x(!hZseO=93kj!ar%dqHMxsIhvJWYXzN zG0qNZ^1XAkPVuC*v>7zK{UsswNB-0Y_v9KUg9TZ6ha}XUojbl7F*FOmzgng)EWU;T O2s~Z=T-G@yGywo7$yTcX delta 323 zcmey%e4AxLC)YDhSspn{#V;TCPn@hGWu$9hscU2zVrXP#Y+z+-u5DmoWnds@1PLnJQOp5MsF=qSMUfVa1!_;5WmQd|x6iLED*VWj_+$ac zamF|;y{^9s4jRIKx4%}W3iSO|yRv)A#cj(QmMcj!{FrZ`?ByM|F#G(uH$HRse2o)R zcDm{KVy@;K^%Bv88w753&D(OZNzwo5lZ7uYuRS#7#m|q8g?|sSSMA;OK8vyY3j+{% My85}Sb4q9e09xmV5&!@I diff --git a/gfx/pokemon/back/porygonzb.png b/gfx/pokemon/back/porygonzb.png index 1b082621487a70b57b94decefb7902e41ea7dd4a..722e1f011c3a3e3a16622e9fb9dbfd05c4afc60f 100644 GIT binary patch delta 247 zcmZ3$($6xXlj}JXn=qT`-kX<`CQeq7GS)RP(lsy(F|@QYFtai;&^9ozGB9vYuwb5e zQ5=V?nQg=V$xMuy_5GeMjv*44lYj8D@>EE+C-!VMI3_9axY)KQkw3L2tKH~N*p+6< z`uMe3Y{vWE$8Tjiv*Y{!t6J3pkFWd-J$;~ORp{zxUz#PNR)>B4;Vfy#r_gp|)lA`- zw~alEGcy;i`={Xc)(lj|85qcErPWQJcaCr(z8GSW3P&^0g&F|@QYu(UEZ)iyA&GBCLO`|Z|= z7sYYNE?O4KIhlzuvwnf6i(`ny<>Vjrzw9Lp{%mhFEJ@(8t=4#K(^DvQ?uC2$oF+p) zT?Xx>AIdv^aLo9anRv{uPT=vCOQEa9{-?4Tg{_VH-}Lu*J=@yQ)n*ZY;+fKNwr%2S zGx!nmcOg$;HOJ#Q909wptP0IO$H^?2p1-He|zNw17?PA+fQVzb&8z800f?{elF{r5}E+r-e{cw diff --git a/gfx/pokemon/front/blissey.png b/gfx/pokemon/front/blissey.png index cc60b014dc63df04a434f1efd2bf1e7eae43e8de..7c3d7fbeee23d28ca288ab1d9793cc6659d865c1 100644 GIT binary patch literal 881 zcmeAS@N?(olHy`uVBq!ia0vp^79h+7Bp8mz)+7TdmUKs7M+SzC{oH>NS%G|oWRD45bDP46hOx7_4S6Fo+k-*%fF5lweBoc6VW5Hf|~E0P;8s zJR*x382FBWFymBhK53vJdx@v7EBkXMHeq(n?zQul0EHOyi~K?u&o3&U1>~rfxJHzu zB$lLFB^RXvDF!10BV%0yBV7Zt5JO8V19K}A18oBXD+7bPvr)THH00)|WTsW()*wIO z5gSlLRBD80ny)W|7Ld)sz{)7Zzzk$D0wDvV6a&c1Ko)}+qcofy#HayP0}Lo8VT5|1 zIuP&xVvrs%Eg$sV1jzm9>EaloaenG$!~Dw*BJ3ZOZ}zk--_YFR(!WqhxhbyWO6$_n zl=2hq36Hrah_P^R9~D*N_IA2+=;`?hjl6ATD_d*?(pp4Rrk!$rqBe2GqHg)}ZNXcm zZB9Kb!v2Fa%{?567nm_2ks)d<51eVKd zx~iK>K z7Z+BQ3*UHLwN>Cqh>p&aM2{Gk=PPs!H669BkUe4iKdsjnJ7!si zpB0>SmX$a7UU^~mipu_FTfFwX^{TmKvt<2A#=T!&?NwiRa!p>G+OMaP`?j3TnX;HM z@JxaA8TIs4^DUQbDpuPSp8Q7V_?snOUn0X+u}%$_J3ig!hWDgTe~DWM4fNT))X delta 507 zcmV29yMlBYy$gNklo?&C=z)DFF+-hC=kyTC03IgUIAMbO_3r2rDf~Tq5M%Zg~lSq*#0=zNg8Eh!;Afs zuYJxv-xZj;#D8V55Q~Kg+oc^UO=#8T9dp7P^(;*omuqW8#($WRSEVW5o8n`d;x*RF z1p}RV$G+fQBGcL!v*_?!*|3LL|(9M`! z=qKuZE7G&0*b|mCug;7k>*+$w(d{vpod@`~x;e&~3kxUr~81lqsP^IyRNWMcId*ogoD002ovPDHLkV1m9%{W$;t diff --git a/gfx/pokemon/front/lickilicky.png b/gfx/pokemon/front/lickilicky.png index be3d5d5c0b1554683d85137556adad3abc532bc1..40f419b094dc0b25d547cc7b863d6b7a6fe3dd22 100644 GIT binary patch delta 566 zcmV-60?GaQ2FwPKi3;Ze1``GrB+!D`k&`4EGc7POEig7zF*!OgHaapfD=;uRFfid4 zGq;h^7aB7yFfuJLHdHY=IxsdmGB7JJFgh?WHa&p9lL7&0f6PflK~yNuebY^A6G0dU z@G-C|xm3j!nv+lzlcVRt)RrDRW!KJ#_yLO9&mdG0MB*V*BiNkcrkl?E1;2m?bFf8v z_125`oN9y!Wzun8((IgkU|)U=^E^Ax%o6QlZOK20yU)%CA^)B|3pv5Z|4{W;LjD}T z3OJ)@f|i`>e=#~GPrdpiS<>mcaQ8MpWau%d|C}hAp zcLm=n`F$u7wwSAL^z!KO#-eWC%RlXj3r>64?(1z=n9MHeNjrPH47VmS1*x^rY|MG` z6z#fPg;@euM=_@`qdAHv)N@x>AzGZh^n8A00vU6L9Y<=e;RBwc zX{hjCSFzV6QOi>j47a%n&vm?8{=gZJsclYOk)0!MxaN9wPwVqT&QsHC%Ok44#wD+> ze;JuPWShL{c#{z`$RqAPQpc$+lBCQn!8E`OCOqBnEZB%A5l^V6G#Qs-x21+t*)%V= ziaAf+u{g$@zpiP=j_1hz2S2Kv#Q`?)XF@|NqC@)l2NU2xp3;4orT_o{07*qoM6N<$ Ef(IM}lK=n! delta 613 zcmV-r0-F8I2Kok&i3;Wk1q~-4-*mx(k&`4EGA%GUEig4yF*7P(Ix{&sGcYSKFgh?WJT{P(lL7&0fBH#8K~yNuP0}%I8!;3B z;FmZ73RW@2%POuO!WE?eq#lM{V{KrPWbMJ7&z)Oe@#2tQWk0 zO#7V5_E%pAfIg|B{nbx=i#=Xa4>7sU6H9gTyNrqn0{c`@ zC*dTd(}{$fOT!__7+EFfoydk$^Rz6?$%G1x%NXIgZ zTd)_au_I+S3wVy`7?Jw80MiOKn=Mo76hANE4pFolEy~QgIr|Oq>d>o@WIpS2_NS%G|oWRD45bDP46hOx7_4S6Fo+k-*%fF5lweBoc6VW5Hf|~E0P;8s zJR*x382FBWFymBhK53vJdx@v7EBkXMHeq(n?zQul0EHOyi~K?u&o3&U1>~rfxJHzu zB$lLFB^RXvDF!10BV%0yBV7Zt5JO8V19K}A18oBXD+7bPvr)THH00)|WTsW()*wIO z5gSlLRBD80ny)W|7Ld)sz{)7Zzzk$D0wDvV6a&c1Ko)}+qcofy#HayP0}Lo8VT5|1 zIuP&xVvrs%Eg$sV1jt?F>EaloaX$32q4!}25%v!YN?u;lls~w1viyPxTwRYYW&P$V z3yD_gmS3n)R=6^V>zZq3uJ61D>=ztmqb^)s`Io85S#hDrl-19xr)T@*?UL6o|6V`+ z$b^lFXQn65vD{i|CR!A-@86HToR$smK9=7Mnh|wm@$d7I&V_T7r(G6*6AD_UBr{6O79Qe zxgs;AB3*y`gE(hD-t(8ftiGEmB+OkE?)T~6@s+x(%pQGaIjm*+@lOlyS;aylPEX$l zmzB*-Gd1mMT9@=yW}Gv06MXIyoc^tHp0E4MN1dxJ)xKSP`EtUXMa?@F{bcJXE%8r1 zz&K??Uifv>muYW*#qIuZK1f!<=>|jT%`>`>{7$SC7HDcdmJy`6OMR4}P)ezw6bEpZhy{k5u0uN@n9waJm=Q*eV1P(&b?2p#+C2+jArhiXha%`LERZILa_>XX zi>lm^3>}eJ=n^T-bh#)>b#n7~wo`%!TR%&F{>#q{X($KHV0!B9{)erIui?jQsQ0m0 zqY;aAg;ecFHP~i&_v{+24h*=pL3@21K1B*eImVRQ9wP~43d!{c| z$Q_1L4XTe99~h=DxZ>EXVD^P6*Wi1|`vEIDm{aYeSoErFF;*4E@%UO$f#G;|_3~u7 zeH|!dgYM-GwwGH;Fh`bk#0|C%HsfH1Y#t8BKil)yQV^zLapoPDgkPxdd6@c>Pa(gg zY^hIipn1>H$loEBUH8H4P^W%-zJyj1P$q`IKLfy7Y2kMWNAv~;u}1(4FMb2?F$r(~ z=rd7mGue>AtuEb{B4w==@{kum_bg8I!&k5XXu=Nz%%2myuip#?uK>KA1~>3ep?iJ` z25Mh=orZjBI;W((zbEfdk9J!1QPnp1(Wv(La4syiM?C$9EaIv@;ubk|&6O)qAnb*A ee@AzVHt;WRgqAfl5A+}a0000_ diff --git a/gfx/pokemon/front/porygonz.png b/gfx/pokemon/front/porygonz.png index 7054db8180d04ef397765ead0ae3991c51dd396b..297008a222ab8231e0e842709e802a0043d35717 100644 GIT binary patch delta 569 zcmV-90>=Hq1Jk>u%mq@iUa0&7mbUA8ybB(`KJ@(22WRO!&xc#! zH+th!kDB0^f9_SuUzQ5TOp{CVch52X41SgQ69Z0(wASPIJoJ2vy>n*vd>~?vz@FoM zbOf=sVTrDH2exU3q+$kH3yrNP}cRF<~eOpYCLCcqL66E6Q>bl_};2f19s*mSf?1j!SRUyP5tT!|W`25YuX;XsI* zj^j)x*88hCrD`RvXKhK>x~GJy*ep1~U9UD|LHQ5_ZhH9#G&dYoCE4$l00000NkvXX Hu0mjfpm+j6 delta 427 zcmX@lc8GOCC)YDBMqzFV0oy|ViIY{NjC2hRbPWtc3@xn;4XuofwG9lc3=G!Ya95pp zQ5=Wt{nr08Co?f-);oE+IEHAP@4d9&>#&0a!-ouWEK*c$q!t^&Rm!$F`o8XwNY6pIZK`PR{biMqZOd}=jz%rzk5QXiu3izy-sjw% z?F=0Cd=S+LIIaZgR}{ifniK65s%oVb4fPv%3+iyy`+Jg8>? N0#8>zmvv4FO#q|pxYPgu diff --git a/maps/Route19.blk b/maps/Route19.blk index 981b46ef..0bd469e7 100644 --- a/maps/Route19.blk +++ b/maps/Route19.blk @@ -1 +1 @@ -(,)(,)(,)$W%$W%CCC11111CCk1111kkCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCkkkkkkkkk \ No newline at end of file +(,)(,)(,)$W%$W%CCC11111CCk1111kkCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCkkkkkkkkk \ No newline at end of file diff --git a/text/CeladonUniversityOutside.asm b/text/CeladonUniversityOutside.asm index d71851b9..4be97a2b 100644 --- a/text/CeladonUniversityOutside.asm +++ b/text/CeladonUniversityOutside.asm @@ -24,12 +24,11 @@ _CeladonUniversityOutsideAfterBattleText1:: _CeladonUniversityOutsideYesNo2:: text "I've been working" line "on a digital" + cont "#MON." - para "on a digital" - line "#MON. Want to" - - para "help me test it" - line "for my thesis?" + para "Want to help me" + line "test it for my" + cont "thesis?" done diff --git a/text/CeladonUniversityPokecenter.asm b/text/CeladonUniversityPokecenter.asm index d931fc6a..4dd4c7ed 100644 --- a/text/CeladonUniversityPokecenter.asm +++ b/text/CeladonUniversityPokecenter.asm @@ -1,11 +1,13 @@ _CeladonUniversityPokecenterText4:: - text "I think PORYGON" - line "should be" - cont "improved." - - para "We need more" + text "Thanks to recent" line "funding from" - cont "SILPH CO.!" + cont "SILPH CO., we" + cont "can upgrade" + cont "PORYGON now!" + + para "I wonder if" + line "we'll ever see" + cont "PORYGON3?" done