BIG changes to postgame island

- Properly adds Brunswick Grotto, as well as Celeste Hill Outside and Celeste Hill Cave
- Citrine City received a minor redesign, putting the path to Brunswick Trail more to the west
- Added complete event for Galarian Zapdos as well as an encounterable, but unfinished Galarian Moltres, so all 3 birds can currently be caught
This commit is contained in:
Martha Schilling 2023-06-17 20:36:01 +01:00
parent 5279e8a06e
commit f9d6534bcf
34 changed files with 208 additions and 299 deletions

View file

@ -646,8 +646,9 @@
const EVENT_BEAT_MOLTRES
const_skip 7
const EVENT_BEAT_CACTUS
const_skip 7
const EVENT_BEAT_ZAPDOSG
const_skip 6
const_skip 7
const EVENT_BEAT_DRAGONITE
; Celadon University, Salesman
@ -796,7 +797,11 @@
const_next $880
const EVENT_GOT_HM03
const EVENT_GOT_MELTAN
const EVENT_BIRDS_FOUND ; hehe
; Celeste Hill events
const_next $8A0
const_skip
const EVENT_BEAT_GALARIAN_MOLTRES
; Cerulean Cave events
const_next $8C0

View file

@ -50,6 +50,7 @@ DEF SHOW EQU $15
const HS_ROUTE_24_ITEM ; 26 X
const HS_ROUTE_25_ITEM ; 27 X
const HS_CACTUS ; 28 X
const HS_BRUNSWICK_ZAPDOS_G_1 ; 29 X
const HS_DAISY_SITTING ; 2A
const HS_DAISY_WALKING ; 2B
const HS_TOWN_MAP ; 2C
@ -67,12 +68,9 @@ DEF SHOW EQU $15
const HS_CERULEAN_CAVE_1F_ITEM_1 ; 38 X
const HS_CERULEAN_CAVE_1F_ITEM_2 ; 39 X
const HS_CERULEAN_CAVE_1F_ITEM_3 ; 3A X
const HS_CELESTE_ZAPDOS_G ; 3B
const HS_CELESTE_ARTICUNO_G ; 3C
const HS_MOLTRES_G ; 3D X
const HS_POKEMON_TOWER_2F_RIVAL ; 3E
const HS_BRUNSWICK_ZAPDOS_G_1 ; 29 X
const HS_BRUNSWICK_ZAPDOS_G_2 ;was const HS_POKEMON_TOWER_3F_ITEM ; 3F X
const HS_BRUNSWICK_ZAPDOS_G_2 ;was const HS_POKEMON_TOWER_3F_ITEM ; 3F X
const HS_POKEMON_TOWER_4F_ITEM_1 ; 40 X
const HS_POKEMON_TOWER_4F_ITEM_2 ; 41 X
const HS_POKEMON_TOWER_4F_ITEM_3 ; 42 X
@ -187,7 +185,6 @@ DEF SHOW EQU $15
const HS_SILPH_CO_7F_RIVAL ; AF
const HS_SILPH_CO_7F_ITEM_1 ; B0 X
const HS_SILPH_CO_7F_ITEM_2 ; B1 X
const HS_SILPH_CO_7F_8 ; B2 XXX sprite doesn't exist
const HS_SILPH_CO_8F_1 ; B3
const HS_SILPH_CO_8F_2 ; B4
const HS_SILPH_CO_8F_3 ; B5

View file

@ -97,7 +97,7 @@ DEF FIRST_INDOOR_MAP EQU const_value
map_const DAYCARE, 4, 4 ; $4A
map_const ROUTE_6_GATE, 4, 3 ; $4B
map_const UNDERGROUND_PATH_ROUTE_6, 4, 4 ; $4C
map_const CELESTE_HILL, 12, 12 ; $4D - Was copy of above & unused
map_const CELESTE_HILL, 11, 11 ; $4D - Was copy of above & unused
map_const ROUTE_7_GATE, 3, 4 ; $4E
map_const UNDERGROUND_PATH_ROUTE_7, 4, 4 ; $4F
map_const CITRINE_ROCKET_HOUSE, 5, 5 ; $50 - was UNDERGROUND_PATH_ROUTE_7_COPY
@ -166,8 +166,8 @@ DEF FIRST_INDOOR_MAP EQU const_value
map_const LAVENDER_POKECENTER, 7, 4 ; $8F
map_const POKEMON_TOWER_1F, 10, 9 ; $90
map_const POKEMON_TOWER_2F, 10, 9 ; $91
map_const BRUNSWICK_GROTTO, 15, 12 ; $FF ; ooo
;map_const POKEMON_TOWER_3F, 10, 9 ; $92 - Currently unused
map_const BRUNSWICK_GROTTO, 15, 12 ; $92
; map_const POKEMON_TOWER_3F, 10, 9 ; $92 - Currently unused
map_const POKEMON_TOWER_4F, 10, 9 ; $93 - Currently unused
map_const POKEMON_TOWER_5F, 10, 9 ; $94 - Currently unused
map_const POKEMON_TOWER_6F, 10, 9 ; $95
@ -273,8 +273,8 @@ DEF FIRST_INDOOR_MAP EQU const_value
map_const BATTLE_TENT, 5, 10 ; $FA
map_const MT_MOON_SQUARE, 13, 7 ; $FB
map_const MT_MOON_SQUARE_HOUSE, 4, 4 ; $FC
map_const CELESTE_HILL_CAVE, 19, 20 ; $FD
map_const CELESTE_HILL_OUTSIDE, 18, 20 ; $FE
map_const CELESTE_HILL_CAVE, 20, 18 ; $FD
map_const CELESTE_HILL_OUTSIDE, 20, 18 ; $FE
DEF NUM_MAPS EQU const_value
; Indoor maps, such as houses, use this as the Map ID in their exit warps