Warps, ArticunoG, refactored Garnet 2F

I messed up Garnet Cavern's 2F name for some reason

Also added all the warps which are, ironically, exactly the same as the international Cerulean Cave. Added the event for Galarian Articuno but gee I hope the constant skip doesn't cause any issues
This commit is contained in:
Llinos Evans 2023-04-30 19:12:59 +01:00
parent 4da1a1235d
commit 084e03efa1
25 changed files with 95 additions and 47 deletions

View file

@ -692,6 +692,8 @@
const EVENT_ROCKET_HIDEOUT_4_DOOR_UNLOCKED
const EVENT_ROCKET_DROPPED_LIFT_KEY
const EVENT_BEAT_ROCKET_HIDEOUT_GIOVANNI
const_skip 1
const EVENT_BEAT_ARTICUNO_G
; Silph Co. events
const_next $6F0

View file

@ -155,6 +155,7 @@ DEF SHOW EQU $15
const HS_ROCKET_HIDEOUT_B4F_ITEM_3 ; 8F X
const HS_ROCKET_HIDEOUT_B4F_ITEM_4 ; 90
const HS_ROCKET_HIDEOUT_B4F_ITEM_5 ; 91
const HS_GARNET_CAVERN_MOLTRES_G ; FC here right?
const HS_SILPH_CO_2F_1 ; 92 XXX never (de)activated?
const HS_SILPH_CO_2F_2 ; 93
const HS_SILPH_CO_3F_1 ; 94
@ -261,5 +262,4 @@ DEF SHOW EQU $15
const HS_MT_MOON_CRATER_ITEM_9 ; F9
const HS_MT_MOON_CRATER_ITEM_10 ; FA
const HS_MT_MOON_CRATER_ITEM_11 ; FB
;const HS_GARNET_CAVERN_MOLTRES_G ; FC
DEF NUM_HS_OBJECTS EQU const_value

View file

@ -257,7 +257,7 @@ DEF FIRST_INDOOR_MAP EQU const_value
map_const SILPH_CO_10F, 8, 9 ; $EB
map_const SILPH_CO_11F, 9, 9 ; $EC
map_const SILPH_CO_ELEVATOR, 2, 2 ; $ED
map_const GARNET_CAVERN_B2F, 15, 9 ; $EE - was UNUSED_MAP_ED
map_const GARNET_CAVERN_2F, 15, 9 ; $EE - was UNUSED_MAP_ED
map_const UNDERWATER_TUNNEL, 15, 9 ; $EF - Was UNUSED_MAP_EE
map_const TRADE_CENTER, 5, 4 ; $F0
map_const COLOSSEUM, 5, 4 ; $F1