diff --git a/data/tilesets/kanto_attributes.bin b/data/tilesets/kanto_attributes.bin index 13f3ab5..fb2278c 100644 Binary files a/data/tilesets/kanto_attributes.bin and b/data/tilesets/kanto_attributes.bin differ 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 e75a8ff..79cf931 100644 Binary files a/data/tilesets/kanto_metatiles.bin and b/data/tilesets/kanto_metatiles.bin differ diff --git a/data/tilesets/nihon01_attributes.bin b/data/tilesets/nihon01_attributes.bin index 7ef08f0..a849c6d 100644 Binary files a/data/tilesets/nihon01_attributes.bin and b/data/tilesets/nihon01_attributes.bin differ diff --git a/data/tilesets/nihon01_metatiles.bin b/data/tilesets/nihon01_metatiles.bin index dec768a..fd6b09c 100644 Binary files a/data/tilesets/nihon01_metatiles.bin and b/data/tilesets/nihon01_metatiles.bin differ diff --git a/gfx/tilesets/kanto.png b/gfx/tilesets/kanto.png index a303640..14ea696 100644 Binary files a/gfx/tilesets/kanto.png and b/gfx/tilesets/kanto.png differ 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