diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 565bdd8..8de1fc3 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -670,6 +670,7 @@ ENDM newgroup SAVOY_CITY ; 37 map_const SAVOY_CITY, 20, 18 ; 1 + map_const ROUTE_50_SAVOY_CITY_GATE, 5, 4 ; 2 endgroup newgroup BLUE_FOREST ; 38 diff --git a/data/maps/attributes.asm b/data/maps/attributes.asm index c050525..24b5d8d 100644 --- a/data/maps/attributes.asm +++ b/data/maps/attributes.asm @@ -892,6 +892,7 @@ ENDM connection east, KantoSafariZoneCenter, KANTO_SAFARI_ZONE_CENTER, 2 map_attributes SavoyCity, SAVOY_CITY, $15, 0 + map_attributes Route50SavoyCityGate, ROUTE_50_SAVOY_CITY_GATE, $00, 0 map_attributes BlueForest, BLUE_FOREST, $00, 0 ; this is on its own for now. add connections later. diff --git a/data/maps/blocks.asm b/data/maps/blocks.asm index d642faa..a97be60 100644 --- a/data/maps/blocks.asm +++ b/data/maps/blocks.asm @@ -1245,6 +1245,7 @@ WhiteCity_Blocks: INCBIN "maps/WhiteCity.ablk" Route66WhiteCityGate_Blocks: +Route50SavoyCityGate_Blocks: INCBIN "maps/NihonGateEastWest.ablk" OldCityGym_Blocks: diff --git a/data/maps/maps.asm b/data/maps/maps.asm index 79de4eb..2988ed5 100644 --- a/data/maps/maps.asm +++ b/data/maps/maps.asm @@ -731,12 +731,13 @@ MapGroup_OldCity: MapGroup_SavoyCity: table_width MAP_LENGTH, MapGroup_SavoyCity - map SavoyCity, TILESET_NIHON_WEST, TOWN, LANDMARK_SAVOY_CITY, MUSIC_VERMILION_CITY, TRUE, PALETTE_AUTO, FISHGROUP_SHORE + map SavoyCity, TILESET_NIHON_WEST, TOWN, LANDMARK_SAVOY_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map Route50SavoyCityGate, TILESET_NIHON_GATE, GATE, LANDMARK_ROUTE_50, MUSIC_PEACEFULTHEME, FALSE, PALETTE_DAY, FISHGROUP_NONE assert_table_length NUM_SAVOY_CITY_MAPS MapGroup_BlueForest: table_width MAP_LENGTH, MapGroup_BlueForest - map BlueForest, TILESET_NIHON_SNOWY, TOWN, LANDMARK_BLUE_FOREST, MUSIC_SINJOH_RUINS, TRUE, PALETTE_AUTO, FISHGROUP_SHORE + map BlueForest, TILESET_NIHON_SNOWY, TOWN, LANDMARK_BLUE_FOREST, MUSIC_SINJOH_RUINS, FALSE, PALETTE_AUTO, FISHGROUP_SHORE assert_table_length NUM_BLUE_FOREST_MAPS MapGroup_WhiteCity: diff --git a/data/maps/scripts.asm b/data/maps/scripts.asm index 6533828..775132c 100644 --- a/data/maps/scripts.asm +++ b/data/maps/scripts.asm @@ -633,4 +633,5 @@ INCLUDE "maps/KantoSafariZoneArea1North.asm" INCLUDE "maps/KantoSafariZoneArea2East.asm" INCLUDE "maps/KantoSafariZoneArea2West.asm" INCLUDE "maps/KantoSafariZoneArea3.asm" -INCLUDE "maps/SavoyCity.asm" \ No newline at end of file +INCLUDE "maps/SavoyCity.asm" +INCLUDE "maps/Route50SavoyCityGate.asm" \ No newline at end of file diff --git a/data/tilesets/nihon_west_collision.asm b/data/tilesets/nihon_west_collision.asm index 8969f60..f0d4424 100644 --- a/data/tilesets/nihon_west_collision.asm +++ b/data/tilesets/nihon_west_collision.asm @@ -21,7 +21,7 @@ tilecoll WATER, WATER, WATER, WATER ; 14 tilecoll WATER, WATER, WATER, WATER ; 15 tilecoll WATER, WATER, WATER, WATER ; 16 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 17 + tilecoll WALL, WALL, WALL, WALL ; 17 tilecoll WALL, WALL, WALL, WALL ; 18 tilecoll WALL, WALL, DOOR, DOOR ; 19 tilecoll WALL, WALL, WALL, WALL ; 1a @@ -66,7 +66,7 @@ tilecoll WALL, WALL, WALL, WALL ; 41 tilecoll WALL, WALL, WALL, WALL ; 42 tilecoll WALL, WALL, FLOOR, FLOOR ; 43 - tilecoll WALL, WALL, WALL, WALL ; 44 + tilecoll WALL, WALL, WALL, DOOR ; 44 tilecoll WALL, WALL, DOOR, WALL ; 45 tilecoll WALL, WALL, WALL, WALL ; 46 tilecoll WATER, WALL, WATER, WALL ; 47 diff --git a/maps/Route50.asm b/maps/Route50.asm index 24d3c00..7608e0b 100644 --- a/maps/Route50.asm +++ b/maps/Route50.asm @@ -117,7 +117,7 @@ Route50_MapEvents: db 0, 0 ; filler def_warp_events - warp_event 6, 5, SAVOY_CITY, 1 ; West Gate + warp_event 6, 5, ROUTE_50_SAVOY_CITY_GATE, 3 ; West Gate warp_event 15, 4, JACKYS_HOUSE, 1 ; Game House def_coord_events diff --git a/maps/Route50SavoyCityGate.asm b/maps/Route50SavoyCityGate.asm new file mode 100644 index 0000000..af6d266 --- /dev/null +++ b/maps/Route50SavoyCityGate.asm @@ -0,0 +1,21 @@ + object_const_def + +Route50SavoyCityGate_MapScripts: + def_scene_scripts + + def_callbacks + +Route50SavoyCityGate_MapEvents: + db 0, 0 ; filler + + def_warp_events + warp_event 0, 7, SAVOY_CITY, 1 + warp_event 1, 7, SAVOY_CITY, 1 + warp_event 8, 7, ROUTE_50, 1 + warp_event 9, 7, ROUTE_50, 1 + + def_coord_events + + def_bg_events + + def_object_events diff --git a/maps/SavoyCity.asm b/maps/SavoyCity.asm index b242b11..8961956 100644 --- a/maps/SavoyCity.asm +++ b/maps/SavoyCity.asm @@ -9,9 +9,9 @@ SavoyCity_MapEvents: db 0, 0 ; filler def_warp_events - warp_event 33, 15, ROUTE_50, 1 ;east gate - warp_event 22, 5, DEBUG_ROOM, 1 ;north gate, left - warp_event 23, 5, DEBUG_ROOM, 1 ;north gate, right + warp_event 33, 15, ROUTE_50_SAVOY_CITY_GATE, 1 ;east gate + warp_event 22, 5, DEBUG_ROOM, 1 ;north gate, left + warp_event 23, 5, DEBUG_ROOM, 1 ;north gate, right def_coord_events