summaryrefslogtreecommitdiff
path: root/constants/event_flags.asm
diff options
context:
space:
mode:
Diffstat (limited to 'constants/event_flags.asm')
-rw-r--r--constants/event_flags.asm48
1 files changed, 24 insertions, 24 deletions
diff --git a/constants/event_flags.asm b/constants/event_flags.asm
index d1aa43610..4c7e9a582 100644
--- a/constants/event_flags.asm
+++ b/constants/event_flags.asm
@@ -130,7 +130,7 @@
const EVENT_GOT_TM12_SWEET_SCENT
const EVENT_RELEASED_THE_BEASTS
const EVENT_GOT_MASTER_BALL_FROM_ELM
-; Johto signpost items
+; Johto hidden items
const EVENT_TIN_TOWER_4F_HIDDEN_MAX_POTION
const EVENT_TIN_TOWER_5F_HIDDEN_FULL_RESTORE
const EVENT_TIN_TOWER_5F_HIDDEN_CARBOS
@@ -145,11 +145,11 @@
const EVENT_ILEX_FOREST_HIDDEN_ETHER
const EVENT_ILEX_FOREST_HIDDEN_SUPER_POTION
const EVENT_ILEX_FOREST_HIDDEN_FULL_HEAL
- const EVENT_WAREHOUSE_ENTRANCE_HIDDEN_PARLYZ_HEAL
- const EVENT_WAREHOUSE_ENTRANCE_HIDDEN_SUPER_POTION
- const EVENT_WAREHOUSE_ENTRANCE_HIDDEN_ANTIDOTE
- const EVENT_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES_HIDDEN_MAX_POTION
- const EVENT_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES_HIDDEN_REVIVE
+ const EVENT_GOLDENROD_UNDERGROUND_HIDDEN_PARLYZ_HEAL
+ const EVENT_GOLDENROD_UNDERGROUND_HIDDEN_SUPER_POTION
+ const EVENT_GOLDENROD_UNDERGROUND_HIDDEN_ANTIDOTE
+ const EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_HIDDEN_MAX_POTION
+ const EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_HIDDEN_REVIVE
const EVENT_MOUNT_MORTAR_1F_OUTSIDE_HIDDEN_HYPER_POTION
const EVENT_MOUNT_MORTAR_1F_INSIDE_HIDDEN_MAX_REPEL
const EVENT_MOUNT_MORTAR_2F_INSIDE_HIDDEN_FULL_RESTORE
@@ -236,10 +236,10 @@
const EVENT_TALKED_TO_OAK_IN_KANTO
const EVENT_GOT_HP_UP_FROM_VERMILION_GUY
const EVENT_GOT_TM29_PSYCHIC
-; Kanto signpost items
+; Kanto hidden items
const EVENT_DIGLETTS_CAVE_HIDDEN_MAX_REVIVE
- const EVENT_UNDERGROUND_HIDDEN_FULL_RESTORE
- const EVENT_UNDERGROUND_HIDDEN_X_SPECIAL
+ const EVENT_UNDERGROUND_PATH_HIDDEN_FULL_RESTORE
+ const EVENT_UNDERGROUND_PATH_HIDDEN_X_SPECIAL
const EVENT_ROCK_TUNNEL_1F_HIDDEN_X_ACCURACY
const EVENT_ROCK_TUNNEL_1F_HIDDEN_X_DEFEND
const EVENT_ROCK_TUNNEL_B1F_HIDDEN_MAX_POTION
@@ -787,10 +787,10 @@
const EVENT_LEARNED_SLOWPOKETAIL
const EVENT_LEARNED_RATICATE_TAIL
const EVENT_OPENED_DOOR_TO_GIOVANNIS_OFFICE
- const EVENT_WAREHOUSE_LAYOUT_1
- const EVENT_WAREHOUSE_LAYOUT_2
- const EVENT_WAREHOUSE_LAYOUT_3
- const EVENT_WAREHOUSE_BLOCKED_OFF
+ const EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_1
+ const EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_2
+ const EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_3
+ const EVENT_GOLDENROD_UNDERGROUND_WAREHOUSE_BLOCKED_OFF
const EVENT_LEFT_MONS_WITH_CONTEST_OFFICER
const EVENT_WILLS_ROOM_ENTRANCE_CLOSED
const EVENT_WILLS_ROOM_EXIT_OPEN
@@ -1691,7 +1691,7 @@
const EVENT_TIN_TOWER_8F_MAX_ELIXER
const EVENT_TIN_TOWER_8F_FULL_RESTORE
const EVENT_TEAM_ROCKET_BASE_B3F_ULTRA_BALL
- const EVENT_UNDERGROUND_WAREHOUSE_ULTRA_BALL
+ const EVENT_GOLDENROD_UNDERGROUND_WAREHOUSE_ULTRA_BALL
const EVENT_BURNED_TOWER_1F_HP_UP
const EVENT_BURNED_TOWER_B1F_TM_ENDURE
const EVENT_NATIONAL_PARK_PARLYZ_HEAL
@@ -1720,15 +1720,15 @@
const EVENT_TEAM_ROCKET_BASE_B3F_FULL_HEAL
const EVENT_TEAM_ROCKET_BASE_B3F_ICE_HEAL
const EVENT_ILEX_FOREST_REVIVE
- const EVENT_WAREHOUSE_ENTRANCE_COIN_CASE
- const EVENT_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES_SMOKE_BALL
- const EVENT_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES_FULL_HEAL
+ const EVENT_GOLDENROD_UNDERGROUND_COIN_CASE
+ const EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_SMOKE_BALL
+ const EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_FULL_HEAL
const EVENT_GOLDENROD_DEPT_STORE_B1F_ETHER
const EVENT_GOLDENROD_DEPT_STORE_B1F_AMULET_COIN
const EVENT_GOLDENROD_DEPT_STORE_B1F_BURN_HEAL
const EVENT_GOLDENROD_DEPT_STORE_B1F_ULTRA_BALL
- const EVENT_UNDERGROUND_WAREHOUSE_MAX_ETHER
- const EVENT_UNDERGROUND_WAREHOUSE_TM_SLEEP_TALK
+ const EVENT_GOLDENROD_UNDERGROUND_WAREHOUSE_MAX_ETHER
+ const EVENT_GOLDENROD_UNDERGROUND_WAREHOUSE_TM_SLEEP_TALK
const EVENT_MOUNT_MORTAR_1F_OUTSIDE_ETHER
const EVENT_MOUNT_MORTAR_1F_OUTSIDE_REVIVE
const EVENT_MOUNT_MORTAR_1F_INSIDE_ESCAPE_ROPE
@@ -1800,7 +1800,7 @@
const EVENT_RIVAL_CHERRYGROVE_CITY
const EVENT_RIVAL_AZALEA_TOWN
const EVENT_RIVAL_TEAM_ROCKET_BASE
- const EVENT_RIVAL_UNDERGROUND_PATH
+ const EVENT_RIVAL_GOLDENROD_UNDERGROUND
const EVENT_RIVAL_VICTORY_ROAD
const EVENT_RIVAL_OLIVINE_CITY
const EVENT_RIVAL_SPROUT_TOWER
@@ -1945,10 +1945,10 @@
const EVENT_OPENED_MT_SILVER
const EVENT_FOUGHT_SNORLAX ; 750
const EVENT_LAKE_OF_RAGE_RED_GYARADOS
- const EVENT_WAREHOUSE_ENTRANCE_GRANNY
- const EVENT_WAREHOUSE_ENTRANCE_GRAMPS
- const EVENT_WAREHOUSE_ENTRANCE_OLDER_HAIRCUT_BROTHER
- const EVENT_WAREHOUSE_ENTRANCE_YOUNGER_HAIRCUT_BROTHER
+ const EVENT_GOLDENROD_UNDERGROUND_GRANNY
+ const EVENT_GOLDENROD_UNDERGROUND_GRAMPS
+ const EVENT_GOLDENROD_UNDERGROUND_OLDER_HAIRCUT_BROTHER
+ const EVENT_GOLDENROD_UNDERGROUND_YOUNGER_HAIRCUT_BROTHER
const EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_EAST
const EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_GYM
const EVENT_ROUTE_32_FRIEDA_OF_FRIDAY