diff --git a/data/tilesets/pokecenter_attributes.bin b/data/tilesets/pokecenter_attributes.bin index 898d923..ec6883a 100644 Binary files a/data/tilesets/pokecenter_attributes.bin and b/data/tilesets/pokecenter_attributes.bin differ diff --git a/data/tilesets/pokecenter_collision.asm b/data/tilesets/pokecenter_collision.asm index cac29f3..eb03562 100644 --- a/data/tilesets/pokecenter_collision.asm +++ b/data/tilesets/pokecenter_collision.asm @@ -105,3 +105,5 @@ tilecoll WALL, FLOOR, FLOOR, FLOOR ; 68 tilecoll WALL, FLOOR, FLOOR, FLOOR ; 69 tilecoll WALL, WALL, FLOOR, WALL ; 6a + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 6b + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 6c diff --git a/data/tilesets/pokecenter_metatiles.bin b/data/tilesets/pokecenter_metatiles.bin index 7f7f0ad..a4bd099 100644 --- a/data/tilesets/pokecenter_metatiles.bin +++ b/data/tilesets/pokecenter_metatiles.bin @@ -1,4 +1,4 @@ ================,-./<==?LMNO - %4444$$$$ 44$$$$4 5$$FG !01@A &'"#()23% 676767FG44$$567$$6767FGBCRSQQPPDETU44$$67"#FG236767FG6767FG================6\6-.:>>>67VW77>;67 ================================================4444$$$$JKJKZ[Z[JKJKZ[Z[6744FG$$JKJKZ[Z[6767,-67<=67LM4444$$ !JK01Z[@A./=?JKNOZ[JKJKZ[Z[JKJKZ[Z[JKJKZ[Z[QQQQPPPP44JK$$Z[JKJKZ[Z[====JKJKZ[Z[QQPP567$$6789FGHIXY "#23\]\]^_^_^_^_*+*+HIHIXYXYHIXYHIXY444$$$ ! 0167@A6767FG&'()FG"#&'23()"#23 "# 23"#23 44$$4467$$6789FG FG4467$$6767FG567$$67*+67:;FG6767FG67JK67Z[FG67"#FG23*+*+:;:;*% 0167@A67*+67:;FG*+ ! J+J+:;:;BCJ+RS:;HIHIXYXYJKJKZ[Z[HIJKXYZ[JKJKZ[Z[*+*:;%4 5$$FG*+*+:;:; 44$$$$JKJKZ[Z[ - JKZ[JKJKZ[Z[JKQQZ[PPJKJKZ[Z[QQJKPPZ[JKJKZ[Z[DEJKTUZ[JK67Z[67JK67Z[FG*+:;  !JK01Z[@ADETU676767FG  !01@A%4 5$$FG4444$$$$ 44$$$$ - QQPPQQPPHIHIXYXYHIXY"#23 ! 0167@A6767FG567$$6767FG% 6767FG6767FG67"#FG23BCRSJ+J+:[:[J+HI:[XYJKJKZ[Z[HIJKXYZ[&'J+():;HIJ+:;:; J+:;HIJ+:;:;567$$67JK89Z[FG \ No newline at end of file + %4444$$$$ 44$$$$4 5$$FG !01@A &'"#()23% 676767FG44$$567$$6767FGBCRSQQPPDETU44$$67"#FG236767FG6767FG================6\6-.:>>>67VW77>;67 ================================================4444$$$$*+*+Z[Z[*+*+Z[Z[6744FG$$JKJKZ[Z[6767,-67<=67LM4444$$ !JK01Z[@A./=?JKNOZ[JKJKZ[Z[JKJKZ[Z[JKJKZ[Z[QQQQPPPP44JK$$Z[JKJKZ[Z[====*+*+Z[Z[QQPP567$$6789FGHIXY "#23\]\]^_^_^_^_*+*+HIHIXYXYHIXYHIXY444$$$ ! 0167@A6767FG&'()FG"#&'23()"#23 "# 23"#23 44$$4467$$6789FG FG4467$$6767FG567$$67*+67Z[FG6767FG67*+67Z[FG67"#FG23*+*+Z[Z[*% 0167@A67*+67Z[FG*+ ! JKJKZ[Z[BCJKRSZ[HIHIXYXYJKJKZ[Z[HIJKXYZ[JKJKZ[Z[*+*Z[%4 5$$FG*+*+Z[Z[ 44$$$$*+*+Z[Z[ + *+Z[JKJKZ[Z[JKQQZ[PPJKJKZ[Z[QQJKPPZ[JKJKZ[Z[DEJKTUZ[JK67Z[67JK67Z[FG*+Z[  !*+01Z[@ADETU676767FG  !01@A%4 5$$FG4444$$$$ 44$$$$ + QQPPQQPPHIHIXYXYHIXY"#23 ! 0167@A6767FG567$$6767FG% 6767FG6767FG67"#FG23BCRSJKJKZ[Z[JKHIZ[XYJKJKZ[Z[HIJKXYZ[&'JK()Z[HIJKZ[Z[ JKZ[HIJKZ[Z[567$$67*+89Z[FGJK*+Z[Z[JKJKZ[Z[ \ No newline at end of file diff --git a/gfx/tilesets/pokecenter.png b/gfx/tilesets/pokecenter.png index 79465d4..6568053 100644 Binary files a/gfx/tilesets/pokecenter.png and b/gfx/tilesets/pokecenter.png differ diff --git a/maps/KantoPokecenter1F.ablk b/maps/KantoPokecenter1F.ablk index f90579b..6b01e21 100644 --- a/maps/KantoPokecenter1F.ablk +++ b/maps/KantoPokecenter1F.ablk @@ -1 +1 @@ -HENGF#####fgKIJfg \ No newline at end of file +HENGF#l###fgKIJfg \ No newline at end of file diff --git a/maps/KantoPokecenter2F.ablk b/maps/KantoPokecenter2F.ablk index a6fe3be..f41e0f6 100644 --- a/maps/KantoPokecenter2F.ablk +++ b/maps/KantoPokecenter2F.ablk @@ -1 +1 @@ -A&?&?@ijh<>=########B##CDCD# \ No newline at end of file +A&?&?@ijh<>=#l#l#l#lB##CDCD# \ No newline at end of file diff --git a/maps/NihonPokecenter1F.ablk b/maps/NihonPokecenter1F.ablk index 0c70b31..2b618ee 100644 --- a/maps/NihonPokecenter1F.ablk +++ b/maps/NihonPokecenter1F.ablk @@ -1 +1 @@ -YOUOOSTSWWXWVQQRQRQQQ\]QQQQQPZ[\]QQQQQ \ No newline at end of file +YOUOOSTSWWXWVQQRkRQQQ\]QQkQkPZ[\]QQQQQ \ No newline at end of file diff --git a/maps/NihonPokecenter2F.ablk b/maps/NihonPokecenter2F.ablk index 407e12e..719507c 100644 --- a/maps/NihonPokecenter2F.ablk +++ b/maps/NihonPokecenter2F.ablk @@ -1 +1 @@ -O_^b^bW`:a3adcQQQQQQQQeQQ\]\]Q \ No newline at end of file +O_^b^bW`:a3adcQkQkQkQkeQQ\]\]Q \ No newline at end of file