diff options
| author | IIMarckus <iimarckus@gmail.com> | 2018-10-03 01:20:23 -0600 |
|---|---|---|
| committer | IIMarckus <iimarckus@gmail.com> | 2018-10-03 01:20:23 -0600 |
| commit | f9eb9172a672755544e54a0562ec77b34734dfd1 (patch) | |
| tree | 8efd9def960a38efc876e6a5254b46ff4a121aa0 /constants | |
| parent | 24ab26d00dc7a89952df87b8cfc7b0f779d73403 (diff) | |
Add map objects from bank 60.
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/engine_flags.asm | 2 | ||||
| -rw-r--r-- | constants/event_flags.asm | 20 | ||||
| -rw-r--r-- | constants/map_constants.asm | 6 |
3 files changed, 14 insertions, 14 deletions
diff --git a/constants/engine_flags.asm b/constants/engine_flags.asm index 082ffd64..f4da580e 100644 --- a/constants/engine_flags.asm +++ b/constants/engine_flags.asm @@ -60,7 +60,7 @@ engine_flag_def ENGINE_UNLOCKED_UNOWNS_UNUSED_6, wUnlockedUnowns, 6 ; $30 engine_flag_def ENGINE_UNLOCKED_UNOWNS_UNUSED_7, wUnlockedUnowns, 7 - engine_flag_def ENGINE_FLYPOINT_KRISS_HOUSE, wVisitedSpawns, 0 ; your house + engine_flag_def ENGINE_FLYPOINT_PLAYERS_HOUSE, wVisitedSpawns, 0 ; your house engine_flag_def ENGINE_FLYPOINT_VIRIDIAN_POKECENTER, wVisitedSpawns, 1 ; viridian pokecenter engine_flag_def ENGINE_FLYPOINT_PALLET, wVisitedSpawns, 2 ; pallet engine_flag_def ENGINE_FLYPOINT_VIRIDIAN, wVisitedSpawns, 3 ; viridian 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 diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 1d74fd4c..bb2b5930 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -433,9 +433,9 @@ ENDM map_const ROUTE_29, 9, 30 ; 3 map_const NEW_BARK_TOWN, 9, 10 ; 4 map_const ELMS_LAB, 6, 5 ; 5 - map_const KRISS_HOUSE_1F, 4, 5 ; 6 - map_const KRISS_HOUSE_2F, 3, 4 ; 7 - map_const KRISS_NEIGHBORS_HOUSE, 4, 4 ; 8 + map_const PLAYERS_HOUSE_1F, 4, 5 ; 6 + map_const PLAYERS_HOUSE_2F, 3, 4 ; 7 + map_const PLAYERS_NEIGHBORS_HOUSE, 4, 4 ; 8 map_const ELMS_HOUSE, 4, 4 ; 9 map_const ROUTE_26_HEAL_SPEECH_HOUSE, 4, 4 ; 10 map_const ROUTE_26_DAY_OF_WEEK_SIBLINGS_HOUSE, 4, 4 ; 11 |