Rocket Hideout

constants/engine_flags.asm

@@ -270,4 +270,7 @@
 	const ENGINE_PLAYER_CAUGHT_MEWTWO
 	const ENGINE_PLAYER_CAUGHT_CELEBI
 	const ENGINE_PLAYER_CAUGHT_SUDOWOODO
+	const ENGINE_PLAYER_CAUGHT_GALARIAN_ARTICUNO
+	const ENGINE_PLAYER_CAUGHT_GALARIAN_ZAPDOS
+	const ENGINE_PLAYER_CAUGHT_GALARIAN_MOLTRES
 DEF NUM_ENGINE_FLAGS EQU const_value

constants/event_flags.asm

@@ -2175,9 +2175,9 @@
 	const EVENT_BOULDER_IN_CINNABAR_VOLCANO_1F_4
 	const EVENT_BOULDER_IN_CINNABAR_VOLCANO_B1F
 	const EVENT_LUCKY_ISLAND_CIVILIANS
-	const EVENT_CELADON_UNIVERSITY_BLANCHE
-	const EVENT_CELADON_UNIVERSITY_CANDELA
-	const EVENT_CELADON_UNIVERSITY_SPARK
+	const_skip
+	const_skip
+	const_skip
 	const EVENT_MURKY_SWAMP_CHERYL
 	const EVENT_DIM_CAVE_RILEY
 	const EVENT_CINNABAR_VOLCANO_BUCK
@@ -2212,9 +2212,9 @@
 	const EVENT_SHAMOUTI_ISLAND_PIKABLU_GUY
 	const EVENT_SHAMOUTI_POKE_CENTER_IVY
 	const EVENT_NOISY_FOREST_PIKABLU
-	const EVENT_SHAMOUTI_COAST_BLANCHE
-	const EVENT_SHAMOUTI_COAST_CANDELA
-	const EVENT_SHAMOUTI_COAST_SPARK
+	const_skip
+	const_skip
+	const_skip
 
 ; New to Crystal
 	const EVENT_KURTS_HOUSE_GRANDDAUGHTER_1
@@ -2406,6 +2406,38 @@
 	const EVENT_UNION_CAVE_B2F_LINKING_CORD
 	const EVENT_GOT_LOADED_DICE_FROM_GOLDENROD
 	const EVENT_LISTENED_TO_BATON_PASS_INTRO
+	const EVENT_BEAT_BLACK_BELT_VALOR_GRUNT_1
+	const EVENT_BEAT_SCIENTIST_SANDERS
+	const EVENT_BEAT_PICNICKER_ZANE
+	const EVENT_BEAT_BATTLE_GIRL_SASHA
+	const EVENT_BEAT_LASS_INSTINCT_GRUNT_1
+	const EVENT_PICKED_UP_MOON_STONE_FROM_ROCKET_HIDEOUT_B1F
+	const EVENT_PICKED_UP_ZINC_FROM_ROCKET_HIDEOUT_B1F
+	const EVENT_ROCKET_HIDEOUT_B1F_HIDDEN_MAX_REVIVE
+	const EVENT_BEAT_HEX_MANIAC_CORYN
+	const EVENT_PICKED_UP_ULTRA_BALL_FROM_ROCKET_HIDEOUT_B2F
+	const EVENT_PICKED_UP_SUPER_REPEL_FROM_ROCKET_HIDEOUT_B2F
+	const EVENT_PICKED_UP_NUGGET_FROM_ROCKET_HIDEOUT_B2F
+	const EVENT_PICKED_UP_RARE_CANDY_FROM_ROCKET_HIDEOUT_B2F
+	const EVENT_BEAT_COSPLAYER_INSTINCT_GRUNT_2
+	const EVENT_BEAT_COOL_DUDE_MYSTIC_GRUNT_1
+	const EVENT_PICKED_UP_CARBOS_FROM_ROCKET_HIDEOUT_B3F
+	const EVENT_PICKED_UP_ELIXIR_FROM_ROCKET_HIDEOUT_B3F
+	const EVENT_ROCKET_HIDEOUT_B3F_HIDDEN_FULL_HEAL
+	const EVENT_BEAT_YOUNGSTER_VALOR_GRUNT_2
+	const EVENT_PICKED_UP_LIFT_KEY_FROM_ROCKET_HIDEOUT_B4F
+	const EVENT_BEAT_TEACHER_SERENA
+	const EVENT_BEAT_SUPER_NERD_INSTINCT_GRUNT_3
+	const EVENT_ROCKET_HIDEOUT_B4F_HIDDEN_MAX_POTION
+	const EVENT_PICKED_UP_X_SP_ATK_FROM_ROCKET_HIDEOUT_B4F
+	const EVENT_PICKED_UP_PP_UP_FROM_ROCKET_HIDEOUT_B4F
+	const EVENT_PICKED_UP_DUBIOUS_DISC_FROM_ROCKET_HIDEOUT_B4F
+	const EVENT_CHERRYGROVE_BAY_FOUGHT_GALARIAN_ARTICUNO
+	const EVENT_CHERRYGROVE_BAY_FOUGHT_GALARIAN_ZAPDOS
+	const EVENT_CHERRYGROVE_BAY_FOUGHT_GALARIAN_MOLTRES
+	const EVENT_PUSHED_GAME_CORNER_SWITCH
+	const EVENT_RICH_BOY_VALOR_GRUNT_3
+	const EVENT_BEAT_RICH_BOY_VALOR_GRUNT_3
 
 	const_next $8ff
 DEF NUM_EVENTS EQU const_value ; 2303

constants/item_constants.asm

@@ -667,14 +667,15 @@ DEF NUM_CANDIES EQU const_value
 	const ORANGETICKET ; 1d
 	const MYSTICTICKET ; 1e
 	const OLD_SEA_MAP  ; 1f
-	const HARSH_LURE   ; 20
-	const POTENT_LURE  ; 21
-	const MALIGN_LURE  ; 22
+	const LIFT_KEY     ; 20
+	const HARSH_LURE   ; 21
+	const POTENT_LURE  ; 22
+	const MALIGN_LURE  ; 23
 DEF CHARMS_START EQU const_value
 	; Only charms below this point!
-	const SHINY_CHARM  ; 23
-	const OVAL_CHARM   ; 24
-	const CATCH_CHARM  ; 25
+	const SHINY_CHARM  ; 24
+	const OVAL_CHARM   ; 25
+	const CATCH_CHARM  ; 26
 DEF NUM_KEY_ITEMS EQU const_value - 1
 
 ; Alphabetical order (see data/items/name_order.asm)
@@ -694,6 +695,7 @@ DEF NUM_KEY_ITEMS EQU const_value - 1
 	const NAM_GS_BALL
 	const NAM_HARSH_LURE
 	const NAM_ITEMFINDER
+	const NAM_LIFT_KEY
 	const NAM_LOST_ITEM
 	const NAM_MACHINE_PART
 	const NAM_MALIGN_LURE

constants/menu_constants.asm

@@ -109,3 +109,9 @@ DEF NUM_PARTYMENUACTIONS EQU const_value
 	const NAME_TRENDY
 	const NAME_BOX
 DEF NUM_NAME_TYPES EQU const_value
+
+; Lure Menu Options (see engine/menus/lure_menu.asm)
+	const_def 1
+	const HARSH_LURE_MENU_OPT  ; 1
+	const POTENT_LURE_MENU_OPT ; 2
+	const MALIGN_LURE_MENU_OPT ; 3

constants/ram_constants.asm

@@ -491,10 +491,13 @@ DEF CELEBIEVENT_FOREST_IS_RESTLESS_F EQU 2
 
 ; wPlayerCaught2::
 	const_def
-	const PLAYER_CAUGHT_MEW_F       ; 0
-	const PLAYER_CAUGHT_MEWTWO_F    ; 1
-	const PLAYER_CAUGHT_CELEBI_F    ; 2
-	const PLAYER_CAUGHT_SUDOWOODO_F ; 3
+	const PLAYER_CAUGHT_MEW_F               ; 0
+	const PLAYER_CAUGHT_MEWTWO_F            ; 1
+	const PLAYER_CAUGHT_CELEBI_F            ; 2
+	const PLAYER_CAUGHT_SUDOWOODO_F         ; 3
+	const PLAYER_CAUGHT_GALARIAN_ARTICUNO_F ; 4
+	const PLAYER_CAUGHT_GALARIAN_ZAPDOS_F   ; 5
+	const PLAYER_CAUGHT_GALARIAN_MOLTRES_F  ; 6
 
 DEF CAUGHT_DUO_MASK    EQU (1 << PLAYER_CAUGHT_HO_OH_F) | (1 << PLAYER_CAUGHT_LUGIA_F)
 DEF CAUGHT_BEASTS_MASK EQU (1 << PLAYER_CAUGHT_RAIKOU_F) | (1 << PLAYER_CAUGHT_ENTEI_F) | (1 << PLAYER_CAUGHT_SUICUNE_F)

constants/trainer_constants.asm

@@ -137,6 +137,7 @@ DEF CRYS EQU __trainer_class__
 	const OLIVER
 	const CHAZ
 	const TYLER
+	const VALOR_GRUNT_2
 
 	trainerclass BUG_CATCHER ; 21
 	const WADE1
@@ -213,6 +214,7 @@ DEF CRYS EQU __trainer_class__
 	const GINGER
 	const CHEYENNE
 	const ADRIAN
+	const ZANE
 
 	trainerclass TWINS ; 24
 	const AMYANDMAY1
@@ -406,6 +408,7 @@ DEF CRYS EQU __trainer_class__
 	const CHLOE
 	const BROOKE
 	const KUROKO
+	const INSTINCT_GRUNT_2
 
 	trainerclass SUPER_NERD ; 31
 	const STAN
@@ -428,6 +431,7 @@ DEF CRYS EQU __trainer_class__
 	const FOOTE
 	const DAVE
 	const KOUTA
+	const INSTINCT_GRUNT_3
 
 	trainerclass LASS ; 32
 	const DANA1
@@ -453,6 +457,7 @@ DEF CRYS EQU __trainer_class__
 	const GINA
 	const ALICE
 	const DUPLICA
+	const INSTINCT_GRUNT_1
 
 	trainerclass BEAUTY ; 33
 	const VICTORIA
@@ -579,6 +584,7 @@ DEF CRYS EQU __trainer_class__
 	const ESTHER
 	const MATILDA
 	const BETHANY
+	const CORYN
 
 	trainerclass SAGE ; 3c
 	const CHOW
@@ -663,6 +669,7 @@ DEF CRYS EQU __trainer_class__
 	const WINSTON
 	const GERALD
 	const IRVING
+	const VALOR_GRUNT_3
 
 	trainerclass LADY ; 4b
 	const JESSICA
@@ -793,6 +800,7 @@ DEF CRYS EQU __trainer_class__
 	const JOSEPH
 	const NIGEL
 	const PIOTR
+	const SANDERS
 
 	trainerclass ROCKET_SCIENTIST ; 55
 	const ROSS
@@ -830,6 +838,7 @@ DEF CRYS EQU __trainer_class__
 	const MANFORD
 	const ANDER
 	const TAKEO
+	const VALOR_GRUNT_1
 
 	trainerclass BATTLE_GIRL ; 59
 	const SUBARU
@@ -839,6 +848,7 @@ DEF CRYS EQU __trainer_class__
 	const RONDA
 	const PADMA
 	const EMY
+	const SASHA
 
 	trainerclass DRAGON_TAMER ; 5a
 	const PAUL
@@ -865,6 +875,7 @@ DEF CRYS EQU __trainer_class__
 	const SHIRLEY
 	const KATHRYN
 	const CLARICE
+	const SERENA
 
 	trainerclass GUITARISTM ; 5d
 	const CLYDE
@@ -970,6 +981,7 @@ DEF CRYS EQU __trainer_class__
 	const COOLTRAINERM_COREY
 	const COOLTRAINERM_RAYMOND
 	const FERGUS
+	const MYSTIC_GRUNT_1
 
 	trainerclass COOLTRAINERF ; 6b
 	const BETH1

data/events/engine_flags.asm

@@ -287,5 +287,8 @@ EngineFlags:
 	engine_flag wPlayerCaught2, PLAYER_CAUGHT_MEWTWO_F
 	engine_flag wPlayerCaught2, PLAYER_CAUGHT_CELEBI_F
 	engine_flag wPlayerCaught2, PLAYER_CAUGHT_SUDOWOODO_F
+	engine_flag wPlayerCaught2, PLAYER_CAUGHT_GALARIAN_ARTICUNO_F
+	engine_flag wPlayerCaught2, PLAYER_CAUGHT_GALARIAN_ZAPDOS_F
+	engine_flag wPlayerCaught2, PLAYER_CAUGHT_GALARIAN_MOLTRES_F
 
 	assert_table_length NUM_ENGINE_FLAGS

data/events/initialize_events.asm

@@ -143,9 +143,6 @@ InitialEvents:
 	dw EVENT_SOUL_HOUSE_MR_FUJI
 	dw EVENT_ROUTE_8_KANTO_POKEMON_FEDERATION
 	dw EVENT_SHAMOUTI_ISLAND_PIKABLU_GUY
-	dw EVENT_SHAMOUTI_COAST_CANDELA
-	dw EVENT_SHAMOUTI_COAST_BLANCHE
-	dw EVENT_SHAMOUTI_COAST_SPARK
 	dw EVENT_LAWRENCE_ROUTE_10
 	dw EVENT_LAWRENCES_ZAPDOS_ROUTE_10
 	dw EVENT_LAWRENCE_FINAL_BIRD

data/items/attributes.asm

@@ -593,6 +593,8 @@ KeyItemAttributes:
 	key_item_attribute 0, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; MALIGN LURE
 	key_item_attribute 0, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; LIFT KEY
+	key_item_attribute 0, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; SHINY CHARM
 	key_item_attribute 0, ITEMMENU_CURRENT, ITEMMENU_NOUSE
 ; OVAL CHARM

data/items/descriptions.asm

@@ -292,6 +292,7 @@ KeyItemDescriptions:
 	dw HarshLureDesc
 	dw PotentLureDesc
 	dw MalignLureDesc
+	dw LiftKeyDesc
 	dw ShinyCharmDesc
 	dw OvalCharmDesc
 	dw CatchCharmDesc
@@ -1656,6 +1657,11 @@ MalignLureDesc:
 	next "malevolent odor."
 	done
 
+LiftKeyDesc:
+	text "Operates the lift"
+	next "in a building."
+	done
+
 ShinyCharmDesc:
 	text "A charm for find-"
 	next "ing shiny #mon."

data/items/icon_pointers.asm

@@ -294,6 +294,7 @@ KeyItemIconPointers:
 	dba HarshLureIcon
 	dba PotentLureIcon
 	dba MalignLureIcon
+	dba LiftKeyIcon
 	dba ShinyCharmIcon
 	dba OvalCharmIcon
 	dba CatchCharmIcon

data/items/key_names.asm

@@ -35,6 +35,7 @@ KeyItemNames::
 	li "Harsh Lure"
 	li "Potent Lure"
 	li "Malign Lure"
+	li "Lift Key"
 	li "Shiny Charm"
 	li "Oval Charm"
 	li "Catch Charm"

data/items/name_order.asm

@@ -346,6 +346,7 @@ KeyItemNameOrder:
 	db NAM_HARSH_LURE
 	db NAM_POTENT_LURE
 	db NAM_MALIGN_LURE
+	db NAM_LIFT_KEY
 	db NAM_SHINY_CHARM
 	db NAM_OVAL_CHARM
 	db NAM_CATCH_CHARM

data/maps/scenes.asm

@@ -110,4 +110,5 @@ MapScenes::
 	scene_var WILLS_ROOM,                             wWillsRoomSceneID
 	scene_var WISE_TRIOS_ROOM,                        wWiseTriosRoomSceneID
 	scene_var YELLOW_FOREST,                          wYellowForestSceneID
+	scene_var ROCKET_HIDEOUT_B4F,                     wRocketHideoutB4FSceneID
 	db -1

data/tilesets/underground_collision.asm

@@ -103,3 +103,4 @@
 	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 66
 	tilecoll WALL, ELEVATOR_BUTTON, FLOOR, FLOOR ; 67
 	tilecoll DOOR, WALL, FLOOR, FLOOR ; 68
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 69