Brunswick Trail

To-Do List for Brunswick Trail:
- Galarian Zapdos event (give hide/show data)
- Tunnel to Celeste Hill (tileset moment)
- Couple by the sea
- Fake Tree (Cactus, may need a spriteset)
- Wild data (needs doing)
- Maybe a few trainers?

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 CINNABAR_MART_COPY,             4,  4 ; $AE	- Unused
+	map_const BRUNSWICK_TRAIL,           	 30,  9 ; $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

data/maps/headers/BrunswickTrail.asm

@@ -0,0 +1,2 @@
+	map_header BrunswickTrail, BRUNSWICK_TRAIL, CELESTE, 0
+	end_map_header

data/maps/map_header_banks.asm

@@ -175,7 +175,7 @@ MapHeaderBanks::
 	db BANK(CinnabarLabFossilRoom_h)
 	db BANK(CinnabarPokecenter_h)
 	db BANK(CinnabarMart_h)
-	db BANK(CinnabarMart_h)
+	db BANK(BrunswickTrail_h) ; was cinnabar mart copy
 	db BANK(IndigoPlateauLobby_h)
 	db BANK(CopycatsHouse1F_h)
 	db BANK(CopycatsHouse2F_h)

data/maps/map_header_pointers.asm

@@ -175,7 +175,7 @@ MapHeaderPointers::
 	dw CinnabarLabFossilRoom_h
 	dw CinnabarPokecenter_h
 	dw CinnabarMart_h
-	dw CinnabarMart_h ; CINNABAR_MART_COPY
+	dw BrunswickTrail_h ; CINNABAR_MART_COPY
 	dw IndigoPlateauLobby_h
 	dw CopycatsHouse1F_h
 	dw CopycatsHouse2F_h

data/maps/objects/BrunswickTrail.asm

@@ -0,0 +1,11 @@
+BrunswickTrail_Object:
+	db $0 ; border block
+
+	def_warp_events
+	warp_event 24,  7, 0, REDS_HOUSE_2F
+
+	def_bg_events
+
+	def_object_events
+
+	def_warps_to BRUNSWICK_TRAIL

data/maps/songs.asm

@@ -174,7 +174,7 @@ MapSongBanks::
 	db MUSIC_CINNABAR, 0 ; CINNABAR_LAB_FOSSIL_ROOM
 	db MUSIC_POKECENTER, 0 ; CINNABAR_POKECENTER
 	db MUSIC_POKECENTER, 0 ; CINNABAR_MART
-	db MUSIC_CINNABAR, 0 ; CINNABAR_MART_COPY
+	db MUSIC_FIELD06, 0 ; BRUNSWICK_TRAIL, was CINNABAR_MART_COPY
 	db MUSIC_INDIGO_PLATEAU, 0 ; INDIGO_PLATEAU_LOBBY
 	db MUSIC_CITIES1, 0 ; COPYCATS_HOUSE_1F
 	db MUSIC_CITIES1, 0 ; COPYCATS_HOUSE_2F

gfx/blocksets/citrine.bst

@@ -1,9 +1,4 @@
-
-
-()KKK
-
-
-O####9#########9#%&
	
+9999999999999999####9#########9#%&
	
 
 ()R*+:;<<<<<<<<<<<<<<HI77XY77,,,,,,,,,,,,77779999999999FG99VW#
 
@@ -23,8 +18,7 @@
 
 
 ()"""
-R*+*+:;:;*+*+:;:;LM,,\],,,,,,,,,,,,NO,,^_,,,,,,,,,,LM,,\],,,,,,,,LM,\],,,,,*+*+:;:;,,,,/U/U??@A@APQPQ@A@APQPQ@A,,PQ,,/U/U??@A/UPQ?####9###@A@APQPQ33332223333TTT3333LSSSZZ\SSSMZZ]!########!##    ########    '''''6776777$$$$774$7774##!########!########''''''''$$$$$$$$7'57$533,,,,,,,,,,,,74<<%&
-"N9999999999999999@A-.PQ=>@A,,PQ,,@A@APQPQ,,-.,,=>-.,,=>,,@A@APQPQ,,-.,,=>@A,,PQ,,@A@APQPQ,,@A,,PQ
+R*+*+:;:;*+*+:;:;LM,,\],,,,,,,,,,,,NO,,^_,,,,,,,,,,LM,,\],,,,,,,,LM,\],,,,,*+*+:;:;,,,,/U/U??@A@APQPQ@A@APQPQ@A,,PQ,,/U/U??@A/UPQ?####9###@A@APQPQ33332223333TTT3333@A@APQPQ@A/UPQ?@A@APQPQ/U@A?PQ!########!##    ########    '''''6776777$$$$774$7774##!########!########''''''''$$$$$$$$7'57$533,,,,,,,,,,,,74<<@A,,PQ,,@A@APQPQ9999999999999999@A-.PQ=>@A,,PQ,,@A@APQPQ,,-.,,=>-.,,=>,,@A@APQPQ,,-.,,=>@A,,PQ,,@A@APQPQ,,@A,,PQ
 
 
 KKKKKK
,,,,,,,,,,,,,,,,	

maps.asm

@@ -1318,6 +1318,10 @@ CitrineCity_Blocks: INCBIN "maps/CitrineCity.blk"
 INCLUDE "data/maps/headers/CelesteHill.asm"
 INCLUDE "scripts/CelesteHill.asm"
 INCLUDE "data/maps/objects/CelesteHill.asm"
+INCLUDE "data/maps/headers/BrunswickTrail.asm"
+INCLUDE "scripts/BrunswickTrail.asm"
+INCLUDE "data/maps/objects/BrunswickTrail.asm"
+BrunswickTrail_Blocks:
 CelesteHill_Blocks: INCBIN "maps/CelesteHill.blk"
 
 INCLUDE "data/maps/headers/CitrineRocketHouse.asm"
@@ -1329,4 +1333,4 @@ INCLUDE "data/maps/headers/CitrineTradebackHouse.asm"
 INCLUDE "scripts/CitrineTradebackHouse.asm"
 INCLUDE "data/maps/objects/CitrineTradebackHouse.asm"
 INCLUDE "scripts/tradeback_move_tutor.asm"
-CitrineTradebackHouse_Blocks: INCBIN "maps/CitrineTradebackHouse.blk"
+CitrineTradebackHouse_Blocks: INCBIN "maps/CitrineTradebackHouse.blk"

scripts/BrunswickTrail.asm

@@ -0,0 +1,6 @@
+BrunswickTrail_Script:
+	jp EnableAutoTextBoxDrawing
+
+BrunswickTrail_TextPointers:
+
+	text_end ; unused

text.asm

@@ -283,6 +283,7 @@ SECTION "Text 12", ROMX
 INCLUDE "text/CitrineRocketHouse.asm"
 INCLUDE "text/CitrineTradebackHouse.asm"
 INCLUDE "text/tradeback_move_tutor.asm"
+INCLUDE "text/BrunswickTrail.asm"
 
 SECTION "Pokédex Text", ROMX