diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-04-10 13:39:55 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-04-10 13:39:55 -0400 |
| commit | 552febffe8a1dcb328ed32c246ceafabe380c7cc (patch) | |
| tree | 80018b3c8ba42072fbdaee252db2afae562c90b0 /constants/map_constants.asm | |
| parent | a8fe0c13d42f5d5da7b864f9d6dd0eb1fdfe71a1 (diff) | |
| parent | 0a2b14309ab295a01c8597269c70acdee81f87ad (diff) | |
Merge branch 'master' of https://github.com/pret/pokecrystal
Diffstat (limited to 'constants/map_constants.asm')
| -rw-r--r-- | constants/map_constants.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 341b3709c..4e1dd718f 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -10,7 +10,7 @@ MAP_NONE EQU 0 mapgroup OLIVINE_POKECENTER_1F, 4, 5 ; 1 mapgroup OLIVINE_GYM, 8, 5 ; 2 - mapgroup OLIVINE_VOLTORB_HOUSE, 4, 4 ; 3 + mapgroup OLIVINE_TIMS_HOUSE, 4, 4 ; 3 mapgroup OLIVINE_HOUSE_BETA, 4, 4 ; 4 mapgroup OLIVINE_PUNISHMENT_SPEECH_HOUSE, 4, 4 ; 5 mapgroup OLIVINE_GOOD_ROD_HOUSE, 4, 4 ; 6 @@ -144,7 +144,7 @@ MAP_NONE EQU 0 mapgroup BLACKTHORN_GYM_1F, 9, 5 ; 1 mapgroup BLACKTHORN_GYM_2F, 9, 5 ; 2 mapgroup BLACKTHORN_DRAGON_SPEECH_HOUSE, 4, 4 ; 3 - mapgroup BLACKTHORN_DODRIO_TRADE_HOUSE, 4, 4 ; 4 + mapgroup BLACKTHORN_EMYS_HOUSE, 4, 4 ; 4 mapgroup BLACKTHORN_MART, 4, 6 ; 5 mapgroup BLACKTHORN_POKECENTER_1F, 4, 5 ; 6 mapgroup MOVE_DELETERS_HOUSE, 4, 4 ; 7 @@ -233,7 +233,7 @@ MAP_NONE EQU 0 mapgroup GOLDENROD_MAGNET_TRAIN_STATION, 9, 10 ; 7 mapgroup GOLDENROD_FLOWER_SHOP, 4, 4 ; 8 mapgroup GOLDENROD_PP_SPEECH_HOUSE, 4, 4 ; 9 - mapgroup GOLDENROD_NAME_RATERS_HOUSE, 4, 4 ; 10 + mapgroup GOLDENROD_NAME_RATER, 4, 4 ; 10 mapgroup GOLDENROD_DEPT_STORE_1F, 4, 8 ; 11 mapgroup GOLDENROD_DEPT_STORE_2F, 4, 8 ; 12 mapgroup GOLDENROD_DEPT_STORE_3F, 4, 8 ; 13 |