Brunswick Glade

This adds the intermittent area before Brunswick Grotto, where you'll encounter Galarian Zapdos periodically.

It seems the hide/show constants are desynchronised again, as the copies in the glade won't disappear.

constants/hide_show_constants.asm

@@ -263,4 +263,7 @@ DEF SHOW EQU $15
 	const HS_ROCK_TUNNEL_B1F_WING          ; F9
 	const HS_MT_MOON_CRATER_GUARD          ; FA
 	const HS_DAYCARE_BULBASAUR			   ; FB should be FD
+	const HS_GLADE_GZAP_1
+	const HS_GLADE_GZAP_2
+	const HS_GLADE_GZAP_3 ; we're at 250
 DEF NUM_HS_OBJECTS EQU const_value

constants/map_constants.asm

@@ -275,6 +275,7 @@ DEF FIRST_INDOOR_MAP EQU const_value
 	map_const MT_MOON_SQUARE_HOUSE,           4,  4 ; $FC
 	map_const CELESTE_HILL_CAVE,	         20, 18 ; $FD
 	map_const CELESTE_HILL_OUTSIDE,	         20, 18 ; $FE
+	map_const BRUNSWICK_GLADE,				 19, 20 ; $FE should be this, i cut silph 8f before this but never updated the $s.
 DEF NUM_MAPS EQU const_value
 
 ; Indoor maps, such as houses, use this as the Map ID in their exit warps

data/maps/headers/BrunswickGlade.asm

@@ -0,0 +1,2 @@
+	map_header BrunswickGlade, BRUNSWICK_GLADE, CELESTE, 0
+	end_map_header

data/maps/hide_show_data.asm

@@ -259,6 +259,7 @@ MapHSPointers:
 	dw NoHS ; Mt Moon Square House
 	dw NoHS ; Celeste Hill Cave 
 	dw NoHS ; Celeste Hill Outside
+	dw BrunswickGladeHS
 	assert_table_length NUM_MAPS
 	dw -1 ; end
 
@@ -357,7 +358,7 @@ CelesteHillHS:
 PokemonTower2FHS:
 	db POKEMON_TOWER_2F, $01, SHOW            ; HS_POKEMON_TOWER_2F_RIVAL
 BrunswickGrottoHS:
-	db BRUNSWICK_GROTTO, $01, SHOW            ; HS_BRUNSWICK_ZAPDOS_G_2
+	db BRUNSWICK_GROTTO, $01, HIDE            ; HS_BRUNSWICK_ZAPDOS_G_2
 ;PokemonTower3FHS:
 ;	db POKEMON_TOWER_3F, $04, SHOW            ; HS_POKEMON_TOWER_3F_ITEM
 ;PokemonTower4FHS:
@@ -614,4 +615,8 @@ MtMoonSquareHS:
 	db MT_MOON_SQUARE, $04, SHOW              ; HS_MT_MOON_CRATER_GUARD
 DaycareHS:
 	db DAYCARE, $03, SHOW 					  ; HS_DAYCARE_BULBASAUR
+BrunswickGladeHS:
+	db BRUNSWICK_GLADE, $01, HIDE            ; HS_GLADE_GZAP_1
+	db BRUNSWICK_GLADE, $02, HIDE            ; HS_GLADE_GZAP_2
+	db BRUNSWICK_GLADE, $03, HIDE            ; HS_GLADE_GZAP_3
 	assert_table_length NUM_HS_OBJECTS + 1

data/maps/map_header_banks.asm

@@ -257,4 +257,5 @@ MapHeaderBanks::
 	db BANK(MtMoonSquareHouse_h)
 	db BANK(CelesteHillCave_h)
 	db BANK(CelesteHillOutside_h)
+	db BANK(BrunswickGlade_h)
 	assert_table_length NUM_MAPS

data/maps/map_header_pointers.asm

@@ -257,4 +257,5 @@ MapHeaderPointers::
 	dw MtMoonSquareHouse_h
 	dw CelesteHillCave_h
 	dw CelesteHillOutside_h
+	dw BrunswickGlade_h
 	assert_table_length NUM_MAPS

data/maps/objects/BrunswickGlade.asm

@@ -0,0 +1,18 @@
+BrunswickGlade_Object:
+	db $3 ; border block
+
+	def_warp_events
+	warp_event 19, 39, BRUNSWICK_TRAIL, 2
+	warp_event 18, 39, BRUNSWICK_TRAIL, 2
+	warp_event  9,  0, BRUNSWICK_GROTTO, 2
+	warp_event  8,  0, BRUNSWICK_GROTTO, 1
+
+	def_bg_events
+	bg_event 14, 24, 4
+
+	def_object_events
+	object_event 32, 25, SPRITE_BIRD, STAY, DOWN, 1
+	object_event 15,  8, SPRITE_BIRD, STAY, RIGHT, 2
+	object_event 19, 18, SPRITE_BIRD, STAY, RIGHT, 3
+
+	def_warps_to BRUNSWICK_GLADE

data/maps/objects/BrunswickGrotto.asm

@@ -2,8 +2,8 @@ BrunswickGrotto_Object:
 	db $3 ; border block
 
 	def_warp_events
-	warp_event 24, 23, BRUNSWICK_TRAIL, 2
+	warp_event 24, 23, BRUNSWICK_GLADE, 3
-	warp_event 25, 23, BRUNSWICK_TRAIL, 2
+	warp_event 25, 23, BRUNSWICK_GLADE, 4
 
 	def_bg_events
 	bg_event 22, 10, 2 ; signage

data/maps/objects/BrunswickTrail.asm

@@ -3,7 +3,7 @@ BrunswickTrail_Object:
 
 	def_warp_events
 	warp_event 12,  9, GARNET_CAVERN_1F, 1
-	warp_event 40,  5, BRUNSWICK_GROTTO, 1
+	warp_event 40,  5, BRUNSWICK_GLADE, 1
 
 	def_bg_events
 

data/maps/songs.asm

@@ -256,4 +256,5 @@ MapSongBanks::
 	db MUSIC_VICTORY4, 0 ; MT_MOON_SQUARE_HOUSE
 	db MUSIC_DIGDA01, 0 ; CELESTE_HILL_CAVE
 	db MUSIC_DIGDA01, 0 ; CELESTE_HILL_OUTSIDE
+	db MUSIC_DUNGEON2, 0 ; BRUNSWICK_GLADE
 	assert_table_length NUM_MAPS

data/wild/grass_water.asm

@@ -256,6 +256,7 @@ WildDataPointers:
 	dw NothingWildMons
 	dw CelesteHillCaveWildMons
 	dw CelesteHillWildMons ; using Celeste Hill's summit for Celeste Hill Outside
+	dw BrunswickGrottoWildMons ; the glade will use the grotto's wildmons
 	assert_table_length NUM_MAPS
 	dw -1 ; end
 

maps.asm

@@ -1396,3 +1396,8 @@ INCLUDE "data/maps/headers/BrunswickGrotto.asm"
 INCLUDE "scripts/BrunswickGrotto.asm"
 INCLUDE "data/maps/objects/BrunswickGrotto.asm"
 BrunswickGrotto_Blocks: INCBIN "maps/BrunswickGrotto.blk"
+
+INCLUDE "data/maps/headers/BrunswickGlade.asm"
+INCLUDE "scripts/BrunswickGlade.asm"
+INCLUDE "data/maps/objects/BrunswickGlade.asm"
+BrunswickGlade_Blocks: INCBIN "maps/BrunswickGlade.blk"

maps/BrunswickGlade.blk

@@ -0,0 +1,3 @@
+X(( ,(nHI((((/
+


78g. ((((,(

77)gg)	((
+:7	(((((I


(	g,
,_(
gg
_)U




g

_.

/



Z


U
,_
}}}}I_
UgU(

_;_(U.


_8_(Ug7
 .L8_(U

_6/g,(gY

scripts/BrunswickGlade.asm

@@ -0,0 +1,104 @@
+BrunswickGlade_Script:
+	jp EnableAutoTextBoxDrawing
+
+BrunswickGlade_TextPointers:
+	dw GZapRun1
+	dw GZapRun2
+	dw GZapRun3
+	dw BrunswickGladeSign1
+
+GZapRun1:
+	text_far _BirdBattleText
+	text_asm
+	ld a, ZAPDOS_G
+	call PlayCry
+	call WaitForSoundToFinish
+	ld a, $ff
+	ld [wJoyIgnore], a
+	call GBFadeOutToBlack
+	ld a, SFX_RUN
+	call PlaySound
+	ld a, HS_GLADE_GZAP_1
+	ld [wMissableObjectIndex], a
+	predef HideObject
+	ld a, HS_GLADE_GZAP_2
+	ld [wMissableObjectIndex], a
+	predef ShowObject
+	call UpdateSprites
+	call Delay3
+	call GBFadeInFromBlack
+	ld a, 0
+	ld [wJoyIgnore], a
+	ld hl, GZapGladeRunText
+	call PrintText
+	jp TextScriptEnd
+
+GZapRun2:
+	text_far _BirdBattleText
+	text_asm
+	ld a, ZAPDOS_G
+	call PlayCry
+	call WaitForSoundToFinish
+	ld a, $ff
+	ld [wJoyIgnore], a
+	call GBFadeOutToBlack
+	ld a, SFX_RUN
+	call PlaySound
+	ld a, HS_GLADE_GZAP_2
+	ld [wMissableObjectIndex], a
+	predef HideObject
+	ld a, HS_GLADE_GZAP_3
+	ld [wMissableObjectIndex], a
+	predef ShowObject
+	call UpdateSprites
+	call Delay3
+	call GBFadeInFromBlack
+	ld a, 0
+	ld [wJoyIgnore], a
+	ld hl, GZapGladeRunText
+	call PrintText
+	jp TextScriptEnd
+
+GZapRun3:
+	text_far _BirdBattleText
+	text_asm
+	ld a, ZAPDOS_G
+	call PlayCry
+	call WaitForSoundToFinish
+	ld a, $ff
+	ld [wJoyIgnore], a
+	call GBFadeOutToBlack
+	ld a, SFX_RUN
+	call PlaySound
+	ld a, HS_GLADE_GZAP_3
+	ld [wMissableObjectIndex], a
+	predef HideObject
+	ld a, HS_BRUNSWICK_ZAPDOS_G_2
+	ld [wMissableObjectIndex], a
+	predef ShowObject
+	call UpdateSprites
+	call Delay3
+	call GBFadeInFromBlack
+	ld a, 0
+	ld [wJoyIgnore], a
+	ld hl, GZapGladeRunText
+	call PrintText
+	jp TextScriptEnd
+
+GZapGladeRunText:
+	text "It ran away"
+	line "again..."
+	done
+	text_end
+
+BrunswickGladeSign1:
+	text "BRUNSWICK GLADE"
+	line "The lush..."
+	
+	para "The sign has been"
+	line "kicked in. It's"
+	cont "impossible to"
+	cont "read..."
+	done
+	text_end
+	

scripts/BrunswickTrail.asm

@@ -87,9 +87,14 @@ GZapFound:
 	ld a, $ff
 	ld [wJoyIgnore], a
 	call GBFadeOutToBlack
+	ld a, SFX_RUN
+	call PlaySound
 	ld a, HS_BRUNSWICK_ZAPDOS_G_1
 	ld [wMissableObjectIndex], a
 	predef HideObject
+	ld a, HS_GLADE_GZAP_1
+	ld [wMissableObjectIndex], a
+	predef ShowObject
 	call UpdateSprites
 	call Delay3
 	call GBFadeInFromBlack