diff --git a/README.md b/README.md index 224c6b8d..4761c387 100644 --- a/README.md +++ b/README.md @@ -56,8 +56,8 @@ New areas - Contains a house with a Move Tutor that can teach Tradeback moves without the need for GSC! - Contains a Team Rocket house where they will sell you TMs and Evolution Items. Jessie and James are there too! - Will contain a Battle Tower with infinite, randomised trainer parties! - - Crimson Cave, located in Citrine City, houses several strong trainers and Pokémon. - - Chartreuse Trail, south of Citrine City, is a route that leads to Celeste Hill. + - Garnet Cavern, located in Citrine City, houses several strong trainers and Pokémon. + - Brunswick Trail, south of Citrine City, is a route that leads to Celeste Hill. - Celeste Hill activates an event where the Galarian Legendary Birds can be fought. - Underwater Tunnel connects Route 25 and Route 10. - Cinnabar Volcano is a new area that houses Moltres, allowing it to be obtained before Victory Road. diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 86b6e25a..3cd58a62 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -193,7 +193,7 @@ DEF FIRST_INDOOR_MAP EQU const_value map_const CINNABAR_LAB_FOSSIL_ROOM, 4, 4 ; $AB map_const CINNABAR_POKECENTER, 7, 4 ; $AC map_const CINNABAR_MART, 4, 4 ; $AD - map_const BRUNSWICK_TRAIL, 31, 12 ; $AE - was unused Cinnabar Mart copy + map_const BRUNSWICK_TRAIL, 32, 14 ; $AE - was unused Cinnabar Mart copy map_const INDIGO_PLATEAU_LOBBY, 8, 6 ; $AF map_const COPYCATS_HOUSE_1F, 4, 4 ; $B0 map_const COPYCATS_HOUSE_2F, 4, 4 ; $B1 diff --git a/data/maps/headers/BrunswickTrail.asm b/data/maps/headers/BrunswickTrail.asm index 69eb75af..4b984744 100644 --- a/data/maps/headers/BrunswickTrail.asm +++ b/data/maps/headers/BrunswickTrail.asm @@ -1,2 +1,3 @@ - map_header BrunswickTrail, BRUNSWICK_TRAIL, CITRINE, 0 + map_header BrunswickTrail, BRUNSWICK_TRAIL, CITRINE, NORTH + connection north, CitrineCity, CITRINE_CITY, 18 end_map_header diff --git a/data/maps/headers/CitrineCity.asm b/data/maps/headers/CitrineCity.asm index 64e83b53..bdb81472 100644 --- a/data/maps/headers/CitrineCity.asm +++ b/data/maps/headers/CitrineCity.asm @@ -1,2 +1,3 @@ - map_header CitrineCity, CITRINE_CITY, CITRINE, 0 + map_header CitrineCity, CITRINE_CITY, CITRINE, SOUTH + connection south, BrunswickTrail, BRUNSWICK_TRAIL, -18 end_map_header diff --git a/data/maps/names.asm b/data/maps/names.asm index 14488857..8f122ffa 100644 --- a/data/maps/names.asm +++ b/data/maps/names.asm @@ -56,4 +56,5 @@ CeruleanCaveName: db "CERULEAN CAVE@" PowerPlantName: db "POWER PLANT@" FarawayIslandName: db "FARAWAY ISLAND@" UnderwaterTunnelName: db "UNDERWATER TUNNEL@" +BrunswickTrailName: db "BRUNSWICK TRAIL@" CelesteHillName: db "CELESTE HILL@" diff --git a/data/maps/objects/BrunswickTrail.asm b/data/maps/objects/BrunswickTrail.asm index ecf1f334..29a1f46d 100644 --- a/data/maps/objects/BrunswickTrail.asm +++ b/data/maps/objects/BrunswickTrail.asm @@ -1,8 +1,8 @@ BrunswickTrail_Object: - db $0 ; border block + db $43 ; border block def_warp_events - warp_event 24, 7, 0, REDS_HOUSE_2F + warp_event 24, 11, CELESTE_HILL, 1 def_bg_events diff --git a/data/maps/objects/Route1.asm b/data/maps/objects/Route1.asm index db51fc98..e480c20b 100644 --- a/data/maps/objects/Route1.asm +++ b/data/maps/objects/Route1.asm @@ -2,7 +2,6 @@ Route1_Object: db $b ; border block def_warp_events - warp_event 5, 3, CELESTE_HILL, 1 def_bg_events bg_event 9, 27, 3 ; Route1Text3 diff --git a/data/maps/town_map_entries.asm b/data/maps/town_map_entries.asm index 65d33d21..bce05810 100644 --- a/data/maps/town_map_entries.asm +++ b/data/maps/town_map_entries.asm @@ -98,6 +98,7 @@ InternalMapEntries: internal_map FUCHSIA_GOOD_ROD_HOUSE, 8, 13, FuchsiaCityName internal_map POKEMON_MANSION_1F, 2, 15, PokemonMansionName internal_map CINNABAR_MART, 2, 15, CinnabarIslandName + internal_map BRUNSWICK_TRAIL, 7, 10, BrunswickTrailName internal_map INDIGO_PLATEAU_LOBBY, 0, 2, IndigoPlateauName internal_map MR_PSYCHICS_HOUSE, 10, 5, SaffronCityName internal_map ROUTE_15_GATE_2F, 9, 13, Route15Name diff --git a/data/maps/town_map_order.asm b/data/maps/town_map_order.asm index 743f0dbe..1148d5df 100644 --- a/data/maps/town_map_order.asm +++ b/data/maps/town_map_order.asm @@ -50,6 +50,7 @@ TownMapOrder: db VICTORY_ROAD_3F db INDIGO_PLATEAU db CITRINE_CITY + db BRUNSWICK_TRAIL db CELESTE_HILL db FARAWAY_ISLAND_OUTSIDE TownMapOrderEnd: diff --git a/maps.asm b/maps.asm index 68d6ee71..37abb0fa 100644 --- a/maps.asm +++ b/maps.asm @@ -1318,11 +1318,12 @@ CitrineCity_Blocks: INCBIN "maps/CitrineCity.blk" INCLUDE "data/maps/headers/CelesteHill.asm" INCLUDE "scripts/CelesteHill.asm" INCLUDE "data/maps/objects/CelesteHill.asm" +CelesteHill_Blocks: INCBIN "maps/CelesteHill.blk" + INCLUDE "data/maps/headers/BrunswickTrail.asm" INCLUDE "scripts/BrunswickTrail.asm" INCLUDE "data/maps/objects/BrunswickTrail.asm" -BrunswickTrail_Blocks: -CelesteHill_Blocks: INCBIN "maps/CelesteHill.blk" +BrunswickTrail_Blocks: INCBIN "maps/BrunswickTrail.blk" INCLUDE "data/maps/headers/CitrineRocketHouse.asm" INCLUDE "scripts/CitrineRocketHouse.asm" diff --git a/maps/BrunswickTrail.blk b/maps/BrunswickTrail.blk index 2f1dd05d..fb1677e3 100644 Binary files a/maps/BrunswickTrail.blk and b/maps/BrunswickTrail.blk differ diff --git a/maps/CitrineCity.blk b/maps/CitrineCity.blk index 7b55d02b..9eada3e2 100644 --- a/maps/CitrineCity.blk +++ b/maps/CitrineCity.blk @@ -28,4 +28,4 @@ D#####"T.CCCC>>>>>>>gTG>>>>>>>>> \ No newline at end of file diff --git a/maps/Route1.blk b/maps/Route1.blk index 8e6f45e4..56a9e4a3 100644 --- a/maps/Route1.blk +++ b/maps/Route1.blk @@ -1,6 +1,8 @@ MRRO1PRRN -M +M + + 1 tN