diff options
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/engine_flags.asm | 2 | ||||
| -rw-r--r-- | constants/event_flags.asm | 18 | ||||
| -rw-r--r-- | constants/map_constants.asm | 6 |
3 files changed, 13 insertions, 13 deletions
diff --git a/constants/engine_flags.asm b/constants/engine_flags.asm index d3ccdbf06..af8bebe95 100644 --- a/constants/engine_flags.asm +++ b/constants/engine_flags.asm @@ -63,7 +63,7 @@ const ENGINE_UNLOCKED_UNOWNS_UNUSED_6 const ENGINE_UNLOCKED_UNOWNS_UNUSED_7 ; wVisitedSpawns - const ENGINE_FLYPOINT_KRISS_HOUSE + const ENGINE_FLYPOINT_PLAYERS_HOUSE const ENGINE_FLYPOINT_VIRIDIAN_POKECENTER const ENGINE_FLYPOINT_PALLET const ENGINE_FLYPOINT_VIRIDIAN diff --git a/constants/event_flags.asm b/constants/event_flags.asm index 4c7e9a582..ffe74f1f3 100644 --- a/constants/event_flags.asm +++ b/constants/event_flags.asm @@ -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 diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 30756d456..b2f1f5f11 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -447,9 +447,9 @@ ENDM mapconst ROUTE_29, 9, 30 ; 3 mapconst NEW_BARK_TOWN, 9, 10 ; 4 mapconst ELMS_LAB, 6, 5 ; 5 - mapconst KRISS_HOUSE_1F, 4, 5 ; 6 - mapconst KRISS_HOUSE_2F, 3, 4 ; 7 - mapconst KRISS_NEIGHBORS_HOUSE, 4, 4 ; 8 + mapconst PLAYERS_HOUSE_1F, 4, 5 ; 6 + mapconst PLAYERS_HOUSE_2F, 3, 4 ; 7 + mapconst PLAYERS_NEIGHBORS_HOUSE, 4, 4 ; 8 mapconst ELMS_HOUSE, 4, 4 ; 9 mapconst ROUTE_26_HEAL_SPEECH_HOUSE, 4, 4 ; 10 mapconst ROUTE_26_DAY_OF_WEEK_SIBLINGS_HOUSE, 4, 4 ; 11 |