diff options
Diffstat (limited to 'constants/map_constants.asm')
| -rw-r--r-- | constants/map_constants.asm | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 0b8037633..0f604b42a 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -145,7 +145,7 @@ ENDM newgroup ; 4 - map_const ECRUTEAK_HOUSE, 10, 9 ; 1 + map_const ECRUTEAK_TIN_TOWER_ENTRANCE, 10, 9 ; 1 map_const WISE_TRIOS_ROOM, 4, 4 ; 2 map_const ECRUTEAK_POKECENTER_1F, 5, 4 ; 3 map_const ECRUTEAK_LUGIA_SPEECH_HOUSE, 4, 4 ; 4 @@ -245,7 +245,7 @@ ENDM map_const GOLDENROD_GYM, 10, 9 ; 3 map_const GOLDENROD_BIKE_SHOP, 4, 4 ; 4 map_const GOLDENROD_HAPPINESS_RATER, 4, 4 ; 5 - map_const GOLDENROD_BILLS_HOUSE, 4, 4 ; 6 + map_const BILLS_FAMILYS_HOUSE, 4, 4 ; 6 map_const GOLDENROD_MAGNET_TRAIN_STATION, 10, 9 ; 7 map_const GOLDENROD_FLOWER_SHOP, 4, 4 ; 8 map_const GOLDENROD_PP_SPEECH_HOUSE, 4, 4 ; 9 @@ -260,7 +260,7 @@ ENDM map_const GOLDENROD_DEPT_STORE_ROOF, 8, 4 ; 18 map_const GOLDENROD_GAME_CORNER, 10, 7 ; 19 map_const GOLDENROD_POKECENTER_1F, 5, 4 ; 20 - map_const GOLDENROD_POKECOM_CENTER_2F_MOBILE, 16, 16 ; 21 + map_const POKECOM_CENTER_ADMIN_OFFICE_MOBILE, 16, 16 ; 21 map_const ILEX_FOREST_AZALEA_GATE, 5, 4 ; 22 map_const ROUTE_34_ILEX_FOREST_GATE, 5, 4 ; 23 map_const DAY_CARE, 5, 4 ; 24 @@ -270,13 +270,13 @@ ENDM map_const ROUTE_6, 10, 9 ; 1 map_const ROUTE_11, 20, 9 ; 2 map_const VERMILION_CITY, 20, 18 ; 3 - map_const VERMILION_HOUSE_FISHING_SPEECH_HOUSE, 4, 4 ; 4 + map_const VERMILION_FISHING_SPEECH_HOUSE, 4, 4 ; 4 map_const VERMILION_POKECENTER_1F, 5, 4 ; 5 map_const VERMILION_POKECENTER_2F_BETA, 8, 4 ; 6 map_const POKEMON_FAN_CLUB, 5, 4 ; 7 map_const VERMILION_MAGNET_TRAIN_SPEECH_HOUSE, 4, 4 ; 8 map_const VERMILION_MART, 6, 4 ; 9 - map_const VERMILION_HOUSE_DIGLETTS_CAVE_SPEECH_HOUSE, 4, 4 ; 10 + map_const VERMILION_DIGLETTS_CAVE_SPEECH_HOUSE, 4, 4 ; 10 map_const VERMILION_GYM, 5, 9 ; 11 map_const ROUTE_6_SAFFRON_GATE, 5, 4 ; 12 map_const ROUTE_6_UNDERGROUND_PATH_ENTRANCE, 4, 4 ; 13 @@ -337,7 +337,7 @@ ENDM map_const FUCHSIA_MART, 6, 4 ; 6 map_const SAFARI_ZONE_MAIN_OFFICE, 4, 4 ; 7 map_const FUCHSIA_GYM, 5, 9 ; 8 - map_const FUCHSIA_BILL_SPEECH_HOUSE, 4, 4 ; 9 + map_const BILLS_BROTHERS_HOUSE, 4, 4 ; 9 map_const FUCHSIA_POKECENTER_1F, 5, 4 ; 10 map_const FUCHSIA_POKECENTER_2F_BETA, 8, 4 ; 11 map_const SAFARI_ZONE_WARDENS_HOME, 5, 4 ; 12 @@ -365,7 +365,7 @@ ENDM map_const ROUTE_28, 20, 9 ; 1 map_const SILVER_CAVE_OUTSIDE, 20, 18 ; 2 map_const SILVER_CAVE_POKECENTER_1F, 5, 4 ; 3 - map_const ROUTE_28_FAMOUS_SPEECH_HOUSE, 4, 4 ; 4 + map_const ROUTE_28_STEEL_WING_HOUSE, 4, 4 ; 4 newgroup ; 20 @@ -373,7 +373,7 @@ ENDM map_const TRADE_CENTER, 5, 4 ; 2 map_const COLOSSEUM, 5, 4 ; 3 map_const TIME_CAPSULE, 5, 4 ; 4 - map_const MOBILE_TRADE_ROOM_MOBILE, 5, 4 ; 5 + map_const MOBILE_TRADE_ROOM, 5, 4 ; 5 map_const MOBILE_BATTLE_ROOM, 5, 4 ; 6 newgroup ; 21 @@ -436,7 +436,7 @@ ENDM map_const VIRIDIAN_MART, 6, 4 ; 8 map_const VIRIDIAN_POKECENTER_1F, 5, 4 ; 9 map_const VIRIDIAN_POKECENTER_2F_BETA, 8, 4 ; 10 - map_const ROUTE_2_NUGGET_SPEECH_HOUSE, 4, 4 ; 11 + map_const ROUTE_2_NUGGET_HOUSE, 4, 4 ; 11 map_const ROUTE_2_GATE, 5, 4 ; 12 map_const VICTORY_ROAD_GATE, 10, 9 ; 13 @@ -447,12 +447,12 @@ ENDM map_const ROUTE_29, 30, 9 ; 3 map_const NEW_BARK_TOWN, 10, 9 ; 4 map_const ELMS_LAB, 5, 6 ; 5 - map_const KRISS_HOUSE_1F, 5, 4 ; 6 - map_const KRISS_HOUSE_2F, 4, 3 ; 7 - map_const KRISS_NEIGHBORS_HOUSE, 4, 4 ; 8 + map_const PLAYERS_HOUSE_1F, 5, 4 ; 6 + map_const PLAYERS_HOUSE_2F, 4, 3 ; 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 + map_const ROUTE_26_HEAL_HOUSE, 4, 4 ; 10 + map_const DAY_OF_WEEK_SIBLINGS_HOUSE, 4, 4 ; 11 map_const ROUTE_27_SANDSTORM_HOUSE, 4, 4 ; 12 map_const ROUTE_29_ROUTE_46_GATE, 5, 4 ; 13 @@ -472,7 +472,7 @@ ENDM map_const COPYCATS_HOUSE_2F, 5, 3 ; 12 map_const ROUTE_5_UNDERGROUND_PATH_ENTRANCE, 4, 4 ; 13 map_const ROUTE_5_SAFFRON_GATE, 5, 4 ; 14 - map_const ROUTE_5_CLEANSE_TAG_SPEECH_HOUSE, 4, 4 ; 15 + map_const ROUTE_5_CLEANSE_TAG_HOUSE, 4, 4 ; 15 newgroup ; 26 @@ -484,6 +484,6 @@ ENDM map_const CHERRYGROVE_GYM_SPEECH_HOUSE, 4, 4 ; 6 map_const GUIDE_GENTS_HOUSE, 4, 4 ; 7 map_const CHERRYGROVE_EVOLUTION_SPEECH_HOUSE, 4, 4 ; 8 - map_const ROUTE_30_BERRY_SPEECH_HOUSE, 4, 4 ; 9 + map_const ROUTE_30_BERRY_HOUSE, 4, 4 ; 9 map_const MR_POKEMONS_HOUSE, 4, 4 ; 10 map_const ROUTE_31_VIOLET_GATE, 5, 4 ; 11 |