diff --git a/constants/map_constants.asm b/constants/map_constants.asm index a630d33..be59794 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -651,6 +651,7 @@ ENDM newgroup WHITE_CITY ; 38 map_const WHITE_CITY, 30, 27 ; 1 + map_const ROUTE_66_WHITE_CITY_GATE, 5, 4 ; 2 endgroup DEF NUM_MAP_GROUPS EQU const_value ; 38 diff --git a/data/maps/attributes.asm b/data/maps/attributes.asm index 7fafd3d..aedc158 100644 --- a/data/maps/attributes.asm +++ b/data/maps/attributes.asm @@ -836,6 +836,7 @@ ENDM map_attributes BlueForest, BLUE_FOREST, $00, 0 ; this is on its own for now. add connections later. map_attributes WhiteCity, WHITE_CITY, $01, 0 ; this is on its own for now. add connections later. + map_attributes Route66WhiteCityGate, ROUTE_66_WHITE_CITY_GATE, $00, 0 map_attributes SinjohRuinsExterior, SINJOH_RUINS_EXTERIOR, $00, 0 map_attributes SinjohRuinsInterior, SINJOH_RUINS_EXTERIOR, $00, 0 diff --git a/data/maps/blocks.asm b/data/maps/blocks.asm index a5aed96..6cc2686 100644 --- a/data/maps/blocks.asm +++ b/data/maps/blocks.asm @@ -1224,9 +1224,6 @@ Route49OldCityGate1F_Blocks: Route49OldCityGate2F_Blocks: INCBIN "maps/NihonGate2F.ablk" ; 4, 3 -;InsertGateNameHere_Blocks: -; INCBIN "maps/NihonGateWestEast.ablk" - OldCity_Blocks: INCBIN "maps/OldCity.ablk" @@ -1240,3 +1237,6 @@ SECTION "Map Blocks 4", ROMX WhiteCity_Blocks: INCBIN "maps/WhiteCity.ablk" + +Route66WhiteCityGate_Blocks: + INCBIN "maps/NihonGateEastWest.ablk" diff --git a/data/maps/maps.asm b/data/maps/maps.asm index 801567b..0d843b8 100644 --- a/data/maps/maps.asm +++ b/data/maps/maps.asm @@ -713,5 +713,6 @@ MapGroup_BlueForest: MapGroup_WhiteCity: table_width MAP_LENGTH, MapGroup_WhiteCity map WhiteCity, TILESET_NIHON_WHITECITY, TOWN, LANDMARK_WHITE_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map Route66WhiteCityGate, TILESET_NIHON_GATE, GATE, LANDMARK_ROUTE_66, MUSIC_ROUTE_30, FALSE, PALETTE_DAY, FISHGROUP_NONE assert_table_length NUM_WHITE_CITY_MAPS \ No newline at end of file diff --git a/data/maps/scripts.asm b/data/maps/scripts.asm index b5c4860..1f20e82 100644 --- a/data/maps/scripts.asm +++ b/data/maps/scripts.asm @@ -586,6 +586,7 @@ INCLUDE "maps/OldCityEarlsHouse.asm" INCLUDE "maps/OldCityFamilyHouse.asm" INCLUDE "maps/SepiaSchool.asm" INCLUDE "maps/WhiteCity.asm" +INCLUDE "maps/Route66WhiteCityGate.asm" SECTION "Map Scripts 30", ROMX ; spillover diff --git a/data/tilesets/nihongate_attributes.bin b/data/tilesets/nihongate_attributes.bin index 33ade08..fe0dffb 100644 Binary files a/data/tilesets/nihongate_attributes.bin and b/data/tilesets/nihongate_attributes.bin differ diff --git a/data/tilesets/nihongate_collision.asm b/data/tilesets/nihongate_collision.asm index e952cb5..83a6aea 100644 --- a/data/tilesets/nihongate_collision.asm +++ b/data/tilesets/nihongate_collision.asm @@ -12,3 +12,6 @@ tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 0b tilecoll COUNTER, FLOOR, COUNTER, COUNTER ; 0c tilecoll FLOOR, COUNTER, COUNTER, COUNTER ; 0d + tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 0e + tilecoll WALL, WALL, COUNTER, FLOOR ; 0f + tilecoll WALL, WALL, FLOOR, COUNTER ; 10 diff --git a/data/tilesets/nihongate_metatiles.bin b/data/tilesets/nihongate_metatiles.bin index 761aebe..8529f45 100644 Binary files a/data/tilesets/nihongate_metatiles.bin and b/data/tilesets/nihongate_metatiles.bin differ diff --git a/maps/NihonGateEastWest.ablk b/maps/NihonGateEastWest.ablk new file mode 100644 index 0000000..02be7e3 --- /dev/null +++ b/maps/NihonGateEastWest.ablk @@ -0,0 +1,2 @@ +  + diff --git a/maps/Route66.asm b/maps/Route66.asm index 0881fbc..641257e 100644 --- a/maps/Route66.asm +++ b/maps/Route66.asm @@ -123,7 +123,7 @@ Route66_MapEvents: db 0, 0 ; filler def_warp_events - warp_event 57, 9, WHITE_CITY, 1 ; Placeholder until route gate is set up + warp_event 57, 9, ROUTE_66_WHITE_CITY_GATE, 1 def_coord_events diff --git a/maps/Route66WhiteCityGate.asm b/maps/Route66WhiteCityGate.asm new file mode 100644 index 0000000..0d7b8aa --- /dev/null +++ b/maps/Route66WhiteCityGate.asm @@ -0,0 +1,21 @@ + object_const_def + +Route66WhiteCityGate_MapScripts: + def_scene_scripts + + def_callbacks + +Route66WhiteCityGate_MapEvents: + db 0, 0 ; filler + + def_warp_events + warp_event 0, 7, ROUTE_66, 1 + warp_event 1, 7, ROUTE_66, 1 + warp_event 8, 7, WHITE_CITY, 1 + warp_event 9, 7, WHITE_CITY, 1 + + def_coord_events + + def_bg_events + + def_object_events \ No newline at end of file diff --git a/maps/WhiteCity.asm b/maps/WhiteCity.asm index 90d1687..db00c55 100644 --- a/maps/WhiteCity.asm +++ b/maps/WhiteCity.asm @@ -9,7 +9,7 @@ WhiteCity_MapEvents: db 0, 0 ; filler def_warp_events - warp_event 6, 27, ROUTE_66, 1 + warp_event 6, 27, ROUTE_66_WHITE_CITY_GATE, 3 def_coord_events