summaryrefslogtreecommitdiff
path: root/constants/event_flags.asm
diff options
context:
space:
mode:
authorIIMarckus <iimarckus@gmail.com>2018-09-20 22:44:07 -0600
committerIIMarckus <iimarckus@gmail.com>2018-09-20 22:44:07 -0600
commitfa8af11b880a0d666a9270eb2dc487907dba26f4 (patch)
tree6aaff26b4dd95531d1ff7588d6f678ce4b79315e /constants/event_flags.asm
parentf7c1a2cd8ffb4c00ba0261ed57fe6ea5349af8a4 (diff)
Add map objects from bank 46.
Diffstat (limited to 'constants/event_flags.asm')
-rw-r--r--constants/event_flags.asm40
1 files changed, 20 insertions, 20 deletions
diff --git a/constants/event_flags.asm b/constants/event_flags.asm
index 12d5fce1..41010f6b 100644
--- a/constants/event_flags.asm
+++ b/constants/event_flags.asm
@@ -3,13 +3,13 @@
; These first eight flags are reset upon reloading the map.
const EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 ; 000
- const EVENT_RECEIVED_BALLS_FROM_KURT
- const EVENT_DRAGON_SHRINE_QUESTION_2
- const EVENT_DRAGON_SHRINE_QUESTION_3
- const EVENT_DRAGON_SHRINE_QUESTION_4
- const EVENT_DRAGON_SHRINE_QUESTION_5
- const EVENT_JUST_RECEIVED_DRATINI
- const EVENT_IN_YOUR_ROOM
+ const EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
+ const EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3
+ const EVENT_TEMPORARY_UNTIL_MAP_RELOAD_4
+ const EVENT_TEMPORARY_UNTIL_MAP_RELOAD_5
+ const EVENT_TEMPORARY_UNTIL_MAP_RELOAD_6
+ const EVENT_TEMPORARY_UNTIL_MAP_RELOAD_7
+ const EVENT_TEMPORARY_UNTIL_MAP_RELOAD_8
; Johto story events
const EVENT_GOT_TM31_MUD_SLAP
const EVENT_GOT_TM49_FURY_CUTTER
@@ -143,11 +143,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_SWITCH_ROOM_ENTRANCES_HIDDEN_MAX_POTION
- const EVENT_UNDERGROUND_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
@@ -1717,9 +1717,9 @@
const EVENT_TEAM_ROCKET_BASE_B3F_PROTEIN
const EVENT_TEAM_ROCKET_BASE_B3F_ICE_HEAL
const EVENT_ILEX_FOREST_REVIVE
- const EVENT_WAREHOUSE_ENTRANCE_COIN_CASE
- const EVENT_UNDERGROUND_SWITCH_ROOM_ENTRANCES_SMOKE_BALL
- const EVENT_UNDERGROUND_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
@@ -1797,7 +1797,7 @@
const EVENT_RIVAL_CHERRYGROVE_CITY
const EVENT_RIVAL_AZALEA_TOWN
const EVENT_RIVAL_TEAM_ROCKET_BASE
- const EVENT_RIVAL_UNDERGROUND
+ const EVENT_RIVAL_GOLDENROD_UNDERGROUND
const EVENT_RIVAL_VICTORY_ROAD
const EVENT_RIVAL_OLIVINE_CITY
const EVENT_RIVAL_SPROUT_TOWER
@@ -1942,10 +1942,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