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.asm36
1 files changed, 18 insertions, 18 deletions
diff --git a/constants/event_flags.asm b/constants/event_flags.asm
index 9ee7ff40a..879f12852 100644
--- a/constants/event_flags.asm
+++ b/constants/event_flags.asm
@@ -1,14 +1,14 @@
; wEventFlags bit flags
const_def
; The first eight flags are reset upon reloading the map
- const EVENT_GAVE_KURT_APRICORNS ; 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_1 ; 000
+ 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 Gym Leader TM gifts
const EVENT_GOT_TM31_MUD_SLAP
const EVENT_GOT_TM49_FURY_CUTTER
@@ -730,7 +730,7 @@
const EVENT_DECO_GEODUDE_DOLL
const EVENT_DECO_MACHOP_DOLL
const EVENT_DECO_TENTACOOL_DOLL
- const EVENT_KRISS_ROOM_POSTER
+ const EVENT_PLAYERS_ROOM_POSTER
const EVENT_DECO_GOLD_TROPHY
const EVENT_DECO_SILVER_TROPHY
const EVENT_DECO_BIG_SNORLAX_DOLL
@@ -1806,8 +1806,8 @@
const EVENT_RIVAL_SPROUT_TOWER
const EVENT_RIVAL_BURNED_TOWER
const EVENT_RIVAL_DRAGONS_DEN
- const EVENT_KRISS_HOUSE_MOM_1
- const EVENT_KRISS_HOUSE_MOM_2
+ const EVENT_PLAYERS_HOUSE_MOM_1
+ const EVENT_PLAYERS_HOUSE_MOM_2
const EVENT_MR_POKEMONS_HOUSE_OAK
const EVENT_VIOLET_CITY_EARL
const EVENT_EARLS_ACADEMY_EARL
@@ -1928,10 +1928,10 @@
const EVENT_KURTS_HOUSE_KURT_1
const EVENT_KURTS_HOUSE_KURT_2
const EVENT_SLOWPOKE_WELL_KURT ; 740
- const EVENT_KRISS_HOUSE_2F_CONSOLE
- const EVENT_KRISS_HOUSE_2F_DOLL_1
- const EVENT_KRISS_HOUSE_2F_DOLL_2
- const EVENT_KRISS_HOUSE_2F_BIG_DOLL
+ const EVENT_PLAYERS_HOUSE_2F_CONSOLE
+ const EVENT_PLAYERS_HOUSE_2F_DOLL_1
+ const EVENT_PLAYERS_HOUSE_2F_DOLL_2
+ const EVENT_PLAYERS_HOUSE_2F_BIG_DOLL
const EVENT_ROUTE_35_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY
const EVENT_ROUTE_35_NATIONAL_PARK_GATE_OFFICER_NOT_CONTEST_DAY
const EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY
@@ -2012,8 +2012,8 @@
const EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_YOUNGSTERS
const EVENT_DRAGON_SHRINE_CLAIR ; 790
const EVENT_BATTLE_TOWER_BATTLE_ROOM_YOUNGSTER
- const EVENT_KRISS_HOUSE_1F_NEIGHBOR
- const EVENT_KRISS_NEIGHBORS_HOUSE_NEIGHBOR
+ const EVENT_PLAYERS_HOUSE_1F_NEIGHBOR
+ const EVENT_PLAYERS_NEIGHBORS_HOUSE_NEIGHBOR
const EVENT_PICKED_UP_GOLD_BERRY_FROM_HO_OH_ITEM_ROOM
const EVENT_PICKED_UP_MYSTERYBERRY_FROM_HO_OH_ITEM_ROOM
const EVENT_PICKED_UP_REVIVAL_HERB_FROM_HO_OH_ITEM_ROOM
@@ -2043,7 +2043,7 @@
const EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY
const EVENT_SAW_SUICUNE_ON_ROUTE_42
const EVENT_SAW_SUICUNE_ON_ROUTE_36 ; 7b0
- const EVENT_ECRUTEAK_HOUSE_WANDERING_SAGE
+ const EVENT_ECRUTEAK_TIN_TOWER_ENTRANCE_WANDERING_SAGE
const EVENT_TIN_TOWER_1F_SUICUNE
const EVENT_TIN_TOWER_1F_ENTEI
const EVENT_TIN_TOWER_1F_RAIKOU