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.
This commit is contained in:
Llinos Evans 2023-07-14 13:49:36 +01:00
parent 3ef4cea23d
commit 1c1b3063bf
15 changed files with 154 additions and 4 deletions

View file

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

View file

@ -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

View file

@ -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

View file

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

View file

@ -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

View file

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

View file

@ -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

View file

@ -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

View file

@ -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