diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 13f78fc..e1be798 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -637,7 +637,7 @@ ENDM map_const DEBUG_ROOM, 20, 20 ; 5 map_const ROUTE_49, 15, 9 ; 6 map_const QUIET_CAVE, 25, 18 ; 7 - map_const ROUTE_49_2, 10, 19 ; 8 + map_const ROUTE_49_2, 10, 18 ; 8 map_const SILENT_HILLS_POKECENTER_1F, 10, 4 ; 9 map_const SILVERS_HOUSE, 5, 5 ; 10 map_const CALS_HOUSE_1F, 5, 4 ; 11 diff --git a/data/tilesets/nihon01_attributes.bin b/data/tilesets/nihon01_attributes.bin index 54fde47..133f6a6 100644 Binary files a/data/tilesets/nihon01_attributes.bin and b/data/tilesets/nihon01_attributes.bin differ diff --git a/data/tilesets/nihon01_collision.asm b/data/tilesets/nihon01_collision.asm index a6046d3..30168b8 100644 --- a/data/tilesets/nihon01_collision.asm +++ b/data/tilesets/nihon01_collision.asm @@ -140,4 +140,5 @@ tilecoll WALL, WALL, WALL, DOOR ; 8b tilecoll WALL, WALL, WALL, WALL ; 8c tilecoll WARP_CARPET_UP, WARP_CARPET_UP, FLOOR, FLOOR ; 8d - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 8e + tilecoll WALL, WALL, WALL, WALL ; 8e + tilecoll WALL, WALL, WALL, WALL ; 8f diff --git a/data/tilesets/nihon01_metatiles.bin b/data/tilesets/nihon01_metatiles.bin index d0c81f6..db4951e 100644 Binary files a/data/tilesets/nihon01_metatiles.bin and b/data/tilesets/nihon01_metatiles.bin differ diff --git a/gfx/tilesets/lushcave.png b/gfx/tilesets/lushcave.png index 4071404..482195e 100644 Binary files a/gfx/tilesets/lushcave.png and b/gfx/tilesets/lushcave.png differ diff --git a/gfx/tilesets/nihon01.png b/gfx/tilesets/nihon01.png index ac10edd..81e34b2 100644 Binary files a/gfx/tilesets/nihon01.png and b/gfx/tilesets/nihon01.png differ diff --git a/maps/Route49_2.ablk b/maps/Route49_2.ablk index e9d703f..64314ac 100644 --- a/maps/Route49_2.ablk +++ b/maps/Route49_2.ablk @@ -1 +1 @@ -wxywxyrqs$$$$$$e$$$ennU`$bTnnn55Y`$bX55555Y`$bX555b]$$$^$b$Ek))b$lk)bm$k)*l*bul**l*bk **j'bj'''''b$]]]]]]]] \ No newline at end of file +wxywxyq$$$$$$e$$$ennU`$bTnnn55Y`$bX55555Y`$bX555b]$$$^$b$Ek))b$lk)bmuk)*l*bk **j'bj'''''b$]]]]]]]] \ No newline at end of file diff --git a/maps/Route49_2.asm b/maps/Route49_2.asm index 18516dd..23b7029 100644 --- a/maps/Route49_2.asm +++ b/maps/Route49_2.asm @@ -56,8 +56,8 @@ Route49_2_MapEvents: db 0, 0 ; filler def_warp_events - warp_event 8, 27, QUIET_CAVE, 3 - warp_event 9, 27, QUIET_CAVE, 4 + warp_event 8, 25, QUIET_CAVE, 3 + warp_event 9, 25, QUIET_CAVE, 4 warp_event 9, 5, ROUTE_49_OLD_CITY_GATE_1F, 2 warp_event 8, 5, ROUTE_49_OLD_CITY_GATE_1F, 1