summaryrefslogtreecommitdiff
path: root/constants/map_constants.asm
diff options
context:
space:
mode:
Diffstat (limited to 'constants/map_constants.asm')
-rw-r--r--constants/map_constants.asm13
1 files changed, 7 insertions, 6 deletions
diff --git a/constants/map_constants.asm b/constants/map_constants.asm
index e7580dfb9..d2319dcec 100644
--- a/constants/map_constants.asm
+++ b/constants/map_constants.asm
@@ -18,6 +18,7 @@ ENDM
; - MapGroupPointers (see maps/map_headers.asm)
; - MapGroupRoofs (see data/maps/roofs.asm)
; - OutdoorSprites (see data/maps/outdoor_sprites.asm)
+; - RoofPals (see gfx/tilesets/roofs.pal)
; `mapgroup` indexes are for the sub-tables of MapGroupPointers (see maps/map_headers.asm)
const_def
@@ -351,7 +352,7 @@ ENDM
mapgroup LAVENDER_POKECENTER_1F, 4, 5 ; 5
mapgroup LAVENDER_POKECENTER_2F_BETA, 4, 8 ; 6
mapgroup MR_FUJIS_HOUSE, 4, 5 ; 7
- mapgroup LAVENDER_TOWN_SPEECH_HOUSE, 4, 4 ; 8
+ mapgroup LAVENDER_SPEECH_HOUSE, 4, 4 ; 8
mapgroup LAVENDER_NAME_RATER, 4, 4 ; 9
mapgroup LAVENDER_MART, 4, 6 ; 10
mapgroup SOUL_HOUSE, 4, 5 ; 11
@@ -402,7 +403,7 @@ ENDM
mapgroup ROUTE_16_FUCHSIA_SPEECH_HOUSE, 4, 4 ; 23
mapgroup ROUTE_16_GATE, 4, 5 ; 24
mapgroup ROUTE_7_SAFFRON_GATE, 4, 5 ; 25
- mapgroup ROUTE_17_18_GATE, 4, 5 ; 26
+ mapgroup ROUTE_17_ROUTE_18_GATE, 4, 5 ; 26
newgroup ; 22
@@ -413,7 +414,7 @@ ENDM
mapgroup CIANWOOD_GYM, 9, 5 ; 5
mapgroup CIANWOOD_POKECENTER_1F, 4, 5 ; 6
mapgroup CIANWOOD_PHARMACY, 4, 4 ; 7
- mapgroup CIANWOOD_CITY_PHOTO_STUDIO, 4, 4 ; 8
+ mapgroup CIANWOOD_PHOTO_STUDIO, 4, 4 ; 8
mapgroup CIANWOOD_LUGIA_SPEECH_HOUSE, 4, 4 ; 9
mapgroup POKE_SEERS_HOUSE, 4, 4 ; 10
mapgroup BATTLE_TOWER_1F, 5, 8 ; 11
@@ -453,7 +454,7 @@ ENDM
mapgroup ROUTE_26_HEAL_SPEECH_HOUSE, 4, 4 ; 10
mapgroup ROUTE_26_DAY_OF_WEEK_SIBLINGS_HOUSE, 4, 4 ; 11
mapgroup ROUTE_27_SANDSTORM_HOUSE, 4, 4 ; 12
- mapgroup ROUTE_29_46_GATE, 4, 5 ; 13
+ mapgroup ROUTE_29_ROUTE_46_GATE, 4, 5 ; 13
newgroup ; 25
@@ -465,12 +466,12 @@ ENDM
mapgroup SAFFRON_POKECENTER_1F, 4, 5 ; 6
mapgroup SAFFRON_POKECENTER_2F_BETA, 4, 8 ; 7
mapgroup MR_PSYCHICS_HOUSE, 4, 4 ; 8
- mapgroup SAFFRON_TRAIN_STATION, 9, 10 ; 9
+ mapgroup SAFFRON_MAGNET_TRAIN_STATION, 9, 10 ; 9
mapgroup SILPH_CO_1F, 4, 8 ; 10
mapgroup COPYCATS_HOUSE_1F, 4, 4 ; 11
mapgroup COPYCATS_HOUSE_2F, 3, 5 ; 12
mapgroup ROUTE_5_UNDERGROUND_PATH_ENTRANCE, 4, 4 ; 13
- mapgroup ROUTE_5_SAFFRON_CITY_GATE, 4, 5 ; 14
+ mapgroup ROUTE_5_SAFFRON_GATE, 4, 5 ; 14
mapgroup ROUTE_5_CLEANSE_TAG_SPEECH_HOUSE, 4, 4 ; 15
newgroup ; 26