summaryrefslogtreecommitdiff
path: root/constants/event_flags.asm
diff options
context:
space:
mode:
authorIIMarckus <iimarckus@gmail.com>2018-10-03 01:20:23 -0600
committerIIMarckus <iimarckus@gmail.com>2018-10-03 01:20:23 -0600
commitf9eb9172a672755544e54a0562ec77b34734dfd1 (patch)
tree8efd9def960a38efc876e6a5254b46ff4a121aa0 /constants/event_flags.asm
parent24ab26d00dc7a89952df87b8cfc7b0f779d73403 (diff)
Add map objects from bank 60.
Diffstat (limited to 'constants/event_flags.asm')
-rw-r--r--constants/event_flags.asm20
1 files changed, 10 insertions, 10 deletions
diff --git a/constants/event_flags.asm b/constants/event_flags.asm
index fbde1623..341298a4 100644
--- a/constants/event_flags.asm
+++ b/constants/event_flags.asm
@@ -728,7 +728,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
@@ -818,8 +818,8 @@
const EVENT_GOT_WATER_STONE_FROM_BILLS_GRANDPA
const EVENT_GOT_FIRE_STONE_FROM_BILLS_GRANDPA
const EVENT_GOT_THUNDERSTONE_FROM_BILLS_GRANDPA
-; More Crystal-specific events
const EVENT_LISTENED_TO_INITIAL_RADIO
+; More Crystal-specific events
const EVENT_WALL_OPENED_IN_HO_OH_CHAMBER
const EVENT_WALL_OPENED_IN_KABUTO_CHAMBER
const EVENT_WALL_OPENED_IN_OMANYTE_CHAMBER
@@ -1803,8 +1803,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
@@ -1925,10 +1925,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
@@ -2008,8 +2008,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