From 59bdc864cd910d440e438eca3fa323156631771b Mon Sep 17 00:00:00 2001 From: Zeta_Null Date: Tue, 24 Oct 2023 13:30:31 -0400 Subject: [PATCH] Kanto tileset and block upgrades - Bollards from Yellow - Roof tiles from Yellow and Blue - Trees and Signs from Green, Blue, and Yellow - Improved roof shading - Japanese PC Pokecenter Icon in Kanto tileset - Oaks RBY lab design - Some small amount of usage of new sign tiles in some Kanto maps - Pewter City Museum roof finally doesn't have a crack in it - also a fix for some messed up collision in silent hills lol --- data/tilesets/kanto_attributes.bin | Bin 2064 -> 2304 bytes data/tilesets/kanto_collision.asm | 15 +++++++++++++++ data/tilesets/kanto_metatiles.bin | Bin 2064 -> 2304 bytes data/tilesets/nihon01_attributes.bin | Bin 2048 -> 2048 bytes data/tilesets/nihon01_metatiles.bin | Bin 2048 -> 2048 bytes gfx/tilesets/kanto.png | Bin 1301 -> 4625 bytes maps/CeladonCity.ablk | 2 +- maps/PalletTown.ablk | 2 +- maps/PewterCity.ablk | 2 +- maps/SaffronCity.ablk | 2 +- maps/VermilionCity.ablk | 8 ++++---- 11 files changed, 23 insertions(+), 8 deletions(-) diff --git a/data/tilesets/kanto_attributes.bin b/data/tilesets/kanto_attributes.bin index 13f3ab54bd9da4346951d0a90959ced2b99f91f6..fb2278c23efc4572f959d9033527b2588332f4f5 100644 GIT binary patch delta 427 zcmY*VJ5EDE4D^1yc}nCJLIhDDu?3=}fs%qFP|>C57C=dtl`p^jF^{KsnTS5FLgsr~J&f4v_FGfPToh*A9v7d#Qsq#>T_ zb<}F^Uxyg0LHeT?lT-$WUs_+M9L za~=Xxfs9NHNP|a1hykCg#W&O2+3VcneTN6~~?YT^TdiSHjyc3@)VXJ%$*g<)1! z*2zy8jVE8=(3ot`G=&c&0SBy;A2P{v!^~o1W0}Y(I$41^Ljoqm00l7q*psoS)K*QFr(|SOsgH2=s>IAwB$cFHlK!A~n P5s1J{h<%g8*mnT{Wu_cW diff --git a/data/tilesets/kanto_collision.asm b/data/tilesets/kanto_collision.asm index 3fd098d..6870df5 100644 --- a/data/tilesets/kanto_collision.asm +++ b/data/tilesets/kanto_collision.asm @@ -127,3 +127,18 @@ tilecoll WALL, WALL, WALL, WALL ; 7e tilecoll WALL, WALL, WALL, WALL ; 7f tilecoll WALL, WALL, DOOR, WALL ; 80 + tilecoll WALL, WALL, WALL, WALL ; 81 + tilecoll WALL, WALL, WALL, WALL ; 82 + tilecoll WALL, WALL, WALL, WALL ; 83 + tilecoll WALL, WALL, WALL, WALL ; 84 + tilecoll WALL, WALL, WALL, WALL ; 85 + tilecoll WALL, WALL, WALL, WALL ; 86 + tilecoll WALL, WALL, WALL, WALL ; 87 + tilecoll FLOOR, FLOOR, WALL, WALL ; 88 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 89 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 8a + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 8b + tilecoll WALL, WALL, WALL, WALL ; 8c + tilecoll WALL, WALL, WALL, WALL ; 8d + tilecoll WALL, WALL, WALL, WALL ; 8e + tilecoll FLOOR, FLOOR, WALL, WALL ; 8f diff --git a/data/tilesets/kanto_metatiles.bin b/data/tilesets/kanto_metatiles.bin index e75a8ff196b8f1adc49bf64613e4fef9f881dd9a..79cf93111c5eb0f373897d5c3adb8cea02eac473 100644 GIT binary patch delta 499 zcmb7=F;c=n6ow%o1Xc;SCTLV=Fq&!VV8(Wm`=x2C&DhdY;@tJB`>M5#W|r-4QM8RG0Cd;ubr%58_kEv$=}g)I zAz&cws(K$anig2rIL`C=?V>DDI*uuwFEGVaK8%&e^U8n2pwxD1|D^11Sq&r4ZRZz9 Ct4{|2 delta 257 zcmZn=njkPiL57u$on2H+TwGO+n@3hkT85pSgHv2wLXwM1Lvx}{r>2FFkSGWPl>`HU z5EO_5L2xh!r;w0^BnXR(Pki@?*BAsuL`1-N@?AzN)~L9+xTwi8OxyWDVsKzQ`5}`$ z7sBqzT+DS6Fs?EXSOPK3DU%m4D~PD787aj8E#+5&xYNi;Lv!;L<{BnmxP?H|jVH&l b?PdWvZn6x!sU(u)Rn?S~5RRRk#l8#x5aTLK diff --git a/data/tilesets/nihon01_attributes.bin b/data/tilesets/nihon01_attributes.bin index 7ef08f0c71d21385fba0b78018fc09fc85b97867..a849c6dc461ba7a528d56cf635e5510a51b64575 100644 GIT binary patch delta 94 zcmZn=Xb{+-!Dzz9#tH$9jEt--ER3um8i?88fQ1F50LBHeHpeioWt!Z`qCVMxMUbC~ OiHQLTZw_GDzzhI(KnT+S delta 83 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 FV1gfCWo`ff diff --git a/maps/CeladonCity.ablk b/maps/CeladonCity.ablk index 46655bb..e9afa25 100644 --- a/maps/CeladonCity.ablk +++ b/maps/CeladonCity.ablk @@ -2,7 +2,7 @@ ooooo oooo -hi !U T!UUUUUUUmhihiUhi ! ! !Um7:s7~y7:~7~7~|rUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUU0wwwwwUwwwUUUUUN T! !U ! !UUUUUg7:~|~U7~7~UUUUUCPVwVwUVwwwUUUUUUUUUUUUUUUUUmUUUUUUUUUUUUUUUUUm !  !UU ! ! ! !m7~7~UU7~|~7~7~mUUUUy !UUUUUUUUU +hi !U T!UUUUUUUmhihiUhi ! ! !Um7:s7~Š7:~7~7~|rUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUU0wwwwwUwwwUUUUUN T! !U ! !UUUUUg7:~|~U7~7~UUUUUCPˆwˆwUˆwwwUUUUUUUUUUUUUUUUUmUUUUUUUUUUUUUUUUUm !  !UU ! ! ! !m7~7~UU7~|~7~7~mUUUUŠ !UUUUUUUUU /7~UUUUUUUUU m diff --git a/maps/PalletTown.ablk b/maps/PalletTown.ablk index 7203e50..879c8fe 100644 --- a/maps/PalletTown.ablk +++ b/maps/PalletTown.ablk @@ -1,4 +1,4 @@ -RORO PRRRPN8989MN<=<=MNMNwV T!MNtt7:~MNwVw1MN +RORO PRRRPN8989MN<=<=MNMNwVT‚MNtt…:†MNwVw1MN 1tt 1MP edaaaaaO \ No newline at end of file diff --git a/maps/PewterCity.ablk b/maps/PewterCity.ablk index 25f6972..f6ec5f9 100644 --- a/maps/PewterCity.ablk +++ b/maps/PewterCity.ablk @@ -1,6 +1,6 @@ -RRRRRRRRRRRR?;tt  T!tt +RRRRRRRRRRRR?;tt„ƒƒ‡ T!tt ,)ttuqqv7}~t diff --git a/maps/SaffronCity.ablk b/maps/SaffronCity.ablk index aa4c0b9..1853783 100644 --- a/maps/SaffronCity.ablk +++ b/maps/SaffronCity.ablk @@ -1,5 +1,5 @@ - TT! ! T!   !ww7}:~7~7:~7~RRROVwwwV1wwV1wMNI################HMN' ! ! !1111 ! ! !'MN'7~|~7~ TT!|s7~7~'MN&######hi######"MN'UUUUUUhiUUUUUU'MN'U ! !UhiU ! !U'MN'UhihiUhiUhihiU'MN'U7~7~V7:}~w7~7~U'OP&################"'UUUUUUUUUUUUUUUU'cb' ! ! ! ! !U ! !U'MN'7~|r7~7~7~V|~7~U'MND################EMP ! ! !cb ! ! ! !QQ + TT! ! T!   !ww7}:~7~7:~7~RRROˆww‰wˆ1wwˆ1wMNI################HMN' ! ! !1111 ! ! !'MN'7~|~7~ TT!|s7~7~'MN&######hi######"MN'UUUUUUhiUUUUUU'MN'U ! !UhiU ! !U'MN'UhihiUhiUhihiU'MN'U7~7~ˆ7:}~w7~7~U'OP&################"'UUUUUUUUUUUUUUUU'cb' ! ! ! ! !U ! !U'MN'7~|r7~7~7~ˆ|~7~U'MND################EMP ! ! !cb ! ! ! !QQ 7~7~7~ T!7~7~7~7~ diff --git a/maps/VermilionCity.ablk b/maps/VermilionCity.ablk index 5984b94..15c0a9d 100644 --- a/maps/VermilionCity.ablk +++ b/maps/VermilionCity.ablk @@ -1,5 +1,5 @@  -RRRRRO1PRR ! ! !1 !wVww1|~|r7~17~1111>?;d1111111111IH1$%-11111DE1111CC !C !11 !www -d|~1|~11|s1111l -d1111111111111 -od1 11111dV5111ed1edd11111e-.d1edd11111eCCCCCd1ed-.d111111e-jCCCCCCCd1.CCCCCCCCCCCCCCCCCkkkkkkFJkkkkCCCCCCCCCd0eCCCCCCCCCCCCC-.CCCCCC \ No newline at end of file +RRRRRO1PRR ! ! !1 !www1|~|r7~17~1111>?;d1111111111IH1$%-11111DE1‹111CC !C !11 !www +d‹|~1|~11|s1111l +d11111111111‹11 +od1 11111d5111ed1edd11111e-.d1edd11111eCCCCCd1ed-.d111111e-jCCCCCCCd1.CCCCCCCCCCCCCCCCCkkkkkkFJkkkkCCCCCCCCCd0eCCCCCCCCCCCCC-.CCCCCC \ No newline at end of file