Merge branch 'master' into the-diffening

11 files changed, 144 insertions, 183 deletions

diff --git a/data/maps/attributes.asm b/data/maps/attributes.asm
index f6e961406..fa42c461e 100644
--- a/data/maps/attributes.asm
+++ b/data/maps/attributes.asm
@@ -63,7 +63,6 @@ elif "\1" == "east"
 endc
 ENDM
 
-
 	map_attributes NewBarkTown, NEW_BARK_TOWN, $05, WEST | EAST
 	connection west, Route29, ROUTE_29, 0, 0, 9
 	connection east, Route27, ROUTE_27, 0, 0, 9
diff --git a/data/maps/flypoints.asm b/data/maps/flypoints.asm
index c24cd8d89..007b59073 100644
--- a/data/maps/flypoints.asm
+++ b/data/maps/flypoints.asm
@@ -3,7 +3,7 @@ flypoint: MACRO
 	db \2, SPAWN_\1
 ENDM
 
-Flypoints: ; 91c5e
+Flypoints:
 ; landmark, spawn point
 	const_def
 ; Johto
@@ -35,4 +35,3 @@ KANTO_FLYPOINT EQU const_value
 	flypoint CINNABAR,     CINNABAR_ISLAND
 	flypoint INDIGO,       INDIGO_PLATEAU
 	db -1
-; 91c8f
diff --git a/data/maps/landmarks.asm b/data/maps/landmarks.asm
index 2ef8a2dea..d34b85987 100644
--- a/data/maps/landmarks.asm
+++ b/data/maps/landmarks.asm
@@ -1,108 +1,107 @@
 landmark: MACRO
 ; x, y, name
-	db \1, \2
+	db \1 + 8, \2 + 16
 	dw \3
 ENDM
 
-Landmarks: ; 0x1ca8c3
+Landmarks:
 ; entries correspond to constants/landmark_constants.asm
-	landmark   0,   0, SpecialMapName
-	landmark 148, 116, NewBarkTownName
-	landmark 136, 116, Route29Name
-	landmark 108, 116, CherrygroveCityName
-	landmark 108,  96, Route30Name
-	landmark 104,  76, Route31Name
-	landmark  92,  76, VioletCityName
-	landmark  93,  74, SproutTowerName
-	landmark  92, 108, Route32Name
-	landmark  84,  92, RuinsOfAlphName
-	landmark  92, 140, UnionCaveName
-	landmark  90, 140, Route33Name
-	landmark  76, 140, AzaleaTownName
-	landmark  78, 138, SlowpokeWellName
-	landmark  60, 136, IlexForestName
-	landmark  60, 128, Route34Name
-	landmark  60, 108, GoldenrodCityName
-	landmark  58, 108, RadioTowerName
-	landmark  60,  92, Route35Name
-	landmark  60,  76, NationalParkName
-	landmark  72,  76, Route36Name
-	landmark  76,  68, Route37Name
-	landmark  76,  60, EcruteakCityName
-	landmark  78,  58, TinTowerName
-	landmark  74,  58, BurnedTowerName
-	landmark  60,  60, Route38Name
-	landmark  44,  64, Route39Name
-	landmark  44,  76, OlivineCityName
-	landmark  46,  78, LighthouseName
-	landmark  36,  72, BattleTowerName
-	landmark  36,  80, Route40Name
-	landmark  36, 108, WhirlIslandsName
-	landmark  36, 116, Route41Name
-	landmark  28, 116, CianwoodCityName
-	landmark 100,  60, Route42Name
-	landmark  92,  60, MtMortarName
-	landmark 116,  60, MahoganyTownName
-	landmark 116,  52, Route43Name
-	landmark 116,  44, LakeOfRageName
-	landmark 128,  60, Route44Name
-	landmark 138,  54, IcePathName
-	landmark 140,  60, BlackthornCityName
-	landmark 140,  52, DragonsDenName
-	landmark 140,  80, Route45Name
-	landmark 120,  88, DarkCaveName
-	landmark 132, 104, Route46Name
-	landmark 156,  84, SilverCaveName
-	landmark  60, 124, PalletTownName
-	landmark  60, 108, Route1Name
-	landmark  60,  92, ViridianCityName
-	landmark  60,  80, Route2Name
-	landmark  60,  68, PewterCityName
-	landmark  72,  68, Route3Name
-	landmark  84,  68, MtMoonName
-	landmark  96,  68, Route4Name
-	landmark 108,  68, CeruleanCityName
-	landmark 108,  60, Route24Name
-	landmark 116,  52, Route25Name
-	landmark 108,  76, Route5Name
-	landmark 116,  92, UndergroundName
-	landmark 108,  92, Route6Name
-	landmark 108, 100, VermilionCityName
-	landmark  96,  76, DiglettsCaveName
-	landmark  96,  84, Route7Name
-	landmark 124,  84, Route8Name
-	landmark 124,  68, Route9Name
-	landmark 140,  68, RockTunnelName
-	landmark 140,  72, Route10Name
-	landmark 140,  76, PowerPlantName
-	landmark 140,  84, LavenderTownName
-	landmark 148,  84, LavRadioTowerName
-	landmark  84,  84, CeladonCityName
-	landmark 108,  84, SaffronCityName
-	landmark 124, 100, Route11Name
-	landmark 140,  96, Route12Name
-	landmark 132, 116, Route13Name
-	landmark 124, 128, Route14Name
-	landmark 112, 132, Route15Name
-	landmark  76,  84, Route16Name
-	landmark  76, 108, Route17Name
-	landmark  88, 132, Route18Name
-	landmark 100, 132, FuchsiaCityName
-	landmark 100, 144, Route19Name
-	landmark  84, 148, Route20Name
-	landmark  76, 148, SeafoamIslandsName
-	landmark  60, 148, CinnabarIslandName
-	landmark  60, 136, Route21Name
-	landmark  44,  84, Route22Name
-	landmark  36,  68, VictoryRoadName
-	landmark  36,  60, Route23Name
-	landmark  36,  52, IndigoPlateauName
-	landmark  36, 108, Route26Name
-	landmark  28, 116, Route27Name
-	landmark  20, 116, TohjoFallsName
-	landmark  28,  84, Route28Name
-	landmark 148, 132, FastShipName
-; 0x1caa43
+	dbbw       0,   0, SpecialMapName
+	landmark 140, 100, NewBarkTownName
+	landmark 128, 100, Route29Name
+	landmark 100, 100, CherrygroveCityName
+	landmark 100,  80, Route30Name
+	landmark  96,  60, Route31Name
+	landmark  84,  60, VioletCityName
+	landmark  85,  58, SproutTowerName
+	landmark  84,  92, Route32Name
+	landmark  76,  76, RuinsOfAlphName
+	landmark  84, 124, UnionCaveName
+	landmark  82, 124, Route33Name
+	landmark  68, 124, AzaleaTownName
+	landmark  70, 122, SlowpokeWellName
+	landmark  52, 120, IlexForestName
+	landmark  52, 112, Route34Name
+	landmark  52,  92, GoldenrodCityName
+	landmark  50,  92, RadioTowerName
+	landmark  52,  76, Route35Name
+	landmark  52,  60, NationalParkName
+	landmark  64,  60, Route36Name
+	landmark  68,  52, Route37Name
+	landmark  68,  44, EcruteakCityName
+	landmark  70,  42, TinTowerName
+	landmark  66,  42, BurnedTowerName
+	landmark  52,  44, Route38Name
+	landmark  36,  48, Route39Name
+	landmark  36,  60, OlivineCityName
+	landmark  38,  62, LighthouseName
+	landmark  28,  56, BattleTowerName
+	landmark  28,  64, Route40Name
+	landmark  28,  92, WhirlIslandsName
+	landmark  28, 100, Route41Name
+	landmark  20, 100, CianwoodCityName
+	landmark  92,  44, Route42Name
+	landmark  84,  44, MtMortarName
+	landmark 108,  44, MahoganyTownName
+	landmark 108,  36, Route43Name
+	landmark 108,  28, LakeOfRageName
+	landmark 120,  44, Route44Name
+	landmark 130,  38, IcePathName
+	landmark 132,  44, BlackthornCityName
+	landmark 132,  36, DragonsDenName
+	landmark 132,  64, Route45Name
+	landmark 112,  72, DarkCaveName
+	landmark 124,  88, Route46Name
+	landmark 148,  68, SilverCaveName
+	landmark  52, 108, PalletTownName
+	landmark  52,  92, Route1Name
+	landmark  52,  76, ViridianCityName
+	landmark  52,  64, Route2Name
+	landmark  52,  52, PewterCityName
+	landmark  64,  52, Route3Name
+	landmark  76,  52, MtMoonName
+	landmark  88,  52, Route4Name
+	landmark 100,  52, CeruleanCityName
+	landmark 100,  44, Route24Name
+	landmark 108,  36, Route25Name
+	landmark 100,  60, Route5Name
+	landmark 108,  76, UndergroundName
+	landmark 100,  76, Route6Name
+	landmark 100,  84, VermilionCityName
+	landmark  88,  60, DiglettsCaveName
+	landmark  88,  68, Route7Name
+	landmark 116,  68, Route8Name
+	landmark 116,  52, Route9Name
+	landmark 132,  52, RockTunnelName
+	landmark 132,  56, Route10Name
+	landmark 132,  60, PowerPlantName
+	landmark 132,  68, LavenderTownName
+	landmark 140,  68, LavRadioTowerName
+	landmark  76,  68, CeladonCityName
+	landmark 100,  68, SaffronCityName
+	landmark 116,  84, Route11Name
+	landmark 132,  80, Route12Name
+	landmark 124, 100, Route13Name
+	landmark 116, 112, Route14Name
+	landmark 104, 116, Route15Name
+	landmark  68,  68, Route16Name
+	landmark  68,  92, Route17Name
+	landmark  80, 116, Route18Name
+	landmark  92, 116, FuchsiaCityName
+	landmark  92, 128, Route19Name
+	landmark  76, 132, Route20Name
+	landmark  68, 132, SeafoamIslandsName
+	landmark  52, 132, CinnabarIslandName
+	landmark  52, 120, Route21Name
+	landmark  36,  68, Route22Name
+	landmark  28,  52, VictoryRoadName
+	landmark  28,  44, Route23Name
+	landmark  28,  36, IndigoPlateauName
+	landmark  28,  92, Route26Name
+	landmark  20, 100, Route27Name
+	landmark  12, 100, TohjoFallsName
+	landmark  20,  68, Route28Name
+	landmark 140, 116, FastShipName
 
 NewBarkTownName:     db "NEW BARK¯TOWN@"
 CherrygroveCityName: db "CHERRYGROVE¯CITY@"
diff --git a/data/maps/map_data.asm b/data/maps/map_data.asm
index 2e1b7c618..15ff249fe 100644
--- a/data/maps/map_data.asm
+++ b/data/maps/map_data.asm
@@ -6,7 +6,6 @@ SECTION "Maps", ROMX
 INCLUDE "data/maps/maps.asm"
 INCLUDE "data/maps/attributes.asm"
 
-
 INCLUDE "data/maps/blocks.asm"
 
 INCLUDE "data/maps/scripts.asm"
diff --git a/data/maps/maps.asm b/data/maps/maps.asm
index e86cef4c4..1cc528738 100644
--- a/data/maps/maps.asm
+++ b/data/maps/maps.asm
@@ -43,7 +43,6 @@ MapGroupPointers::
 	dw MapGroup_Saffron     ; 25
 	dw MapGroup_Cherrygrove ; 26
 
-
 MapGroup_Olivine:
 	map OlivinePokecenter1F, TILESET_POKECENTER, INDOOR, OLIVINE_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
 	map OlivineGym, TILESET_CHAMPIONS_ROOM, INDOOR, OLIVINE_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
diff --git a/data/maps/outdoor_sprites.asm b/data/maps/outdoor_sprites.asm
index c7e30114a..03f4076f9 100644
--- a/data/maps/outdoor_sprites.asm
+++ b/data/maps/outdoor_sprites.asm
@@ -1,7 +1,7 @@
 ; Valid sprite IDs for each map group.
 ; Maps with environment ROUTE or TOWN can only use these sprites.
 
-OutdoorSprites: ; 144b8
+OutdoorSprites:
 ; entries correspond to map groups
 	dw OlivineGroupSprites
 	dw MahoganyGroupSprites
@@ -29,10 +29,8 @@ OutdoorSprites: ; 144b8
 	dw NewBarkGroupSprites
 	dw SaffronGroupSprites
 	dw CherrygroveGroupSprites
-; 144ec
 
-
-PalletGroupSprites: ; 144ec
+PalletGroupSprites:
 	db SPRITE_SUICUNE
 	db SPRITE_SILVER_TROPHY
 	db SPRITE_FAMICOM
@@ -56,9 +54,8 @@ PalletGroupSprites: ; 144ec
 	db SPRITE_SWIMMER_GUY
 	db SPRITE_POKE_BALL
 	db SPRITE_FRUIT_TREE
-; 14503
 
-ViridianGroupSprites: ; 14503
+ViridianGroupSprites:
 	db SPRITE_SUICUNE
 	db SPRITE_SILVER_TROPHY
 	db SPRITE_FAMICOM
@@ -82,9 +79,8 @@ ViridianGroupSprites: ; 14503
 	db SPRITE_SWIMMER_GUY
 	db SPRITE_POKE_BALL
 	db SPRITE_FRUIT_TREE
-; 1451a
 
-PewterGroupSprites: ; 1451a
+PewterGroupSprites:
 	db SPRITE_SUICUNE
 	db SPRITE_SILVER_TROPHY
 	db SPRITE_FAMICOM
@@ -108,9 +104,8 @@ PewterGroupSprites: ; 1451a
 	db SPRITE_SWIMMER_GUY
 	db SPRITE_POKE_BALL
 	db SPRITE_FRUIT_TREE
-; 14531
 
-CinnabarGroupSprites: ; 14531
+CinnabarGroupSprites:
 	db SPRITE_SUICUNE
 	db SPRITE_SILVER_TROPHY
 	db SPRITE_FAMICOM
@@ -134,9 +129,8 @@ CinnabarGroupSprites: ; 14531
 	db SPRITE_SWIMMER_GUY
 	db SPRITE_POKE_BALL
 	db SPRITE_FRUIT_TREE
-; 14548
 
-CeruleanGroupSprites: ; 14548
+CeruleanGroupSprites:
 	db SPRITE_SUICUNE
 	db SPRITE_SILVER_TROPHY
 	db SPRITE_FAMICOM
@@ -160,9 +154,8 @@ CeruleanGroupSprites: ; 14548
 	db SPRITE_MISTY
 	db SPRITE_POKE_BALL
 	db SPRITE_SLOWPOKE
-; 1455f
 
-SaffronGroupSprites: ; 1455f
+SaffronGroupSprites:
 	db SPRITE_SUICUNE
 	db SPRITE_SILVER_TROPHY
 	db SPRITE_FAMICOM
@@ -186,9 +179,8 @@ SaffronGroupSprites: ; 1455f
 	db SPRITE_MISTY
 	db SPRITE_POKE_BALL
 	db SPRITE_SLOWPOKE
-; 14576
 
-CeladonGroupSprites: ; 14576
+CeladonGroupSprites:
 	db SPRITE_SUICUNE
 	db SPRITE_SILVER_TROPHY
 	db SPRITE_FAMICOM
@@ -212,9 +204,8 @@ CeladonGroupSprites: ; 14576
 	db SPRITE_BLUE
 	db SPRITE_POKE_BALL
 	db SPRITE_FRUIT_TREE
-; 1458d
 
-LavenderGroupSprites: ; 1458d
+LavenderGroupSprites:
 	db SPRITE_SUICUNE
 	db SPRITE_SILVER_TROPHY
 	db SPRITE_FAMICOM
@@ -238,9 +229,8 @@ LavenderGroupSprites: ; 1458d
 	db SPRITE_BIKER
 	db SPRITE_POKE_BALL
 	db SPRITE_FRUIT_TREE
-; 145a4
 
-VermilionGroupSprites: ; 145a4
+VermilionGroupSprites:
 	db SPRITE_SUICUNE
 	db SPRITE_SILVER_TROPHY
 	db SPRITE_FAMICOM
@@ -264,9 +254,8 @@ VermilionGroupSprites: ; 145a4
 	db SPRITE_BIKER
 	db SPRITE_POKE_BALL
 	db SPRITE_FRUIT_TREE
-; 145bb
 
-FuchsiaGroupSprites: ; 145bb
+FuchsiaGroupSprites:
 	db SPRITE_SUICUNE
 	db SPRITE_SILVER_TROPHY
 	db SPRITE_FAMICOM
@@ -290,9 +279,8 @@ FuchsiaGroupSprites: ; 145bb
 	db SPRITE_BIKER
 	db SPRITE_POKE_BALL
 	db SPRITE_FRUIT_TREE
-; 145d2
 
-IndigoGroupSprites: ; 145d2
+IndigoGroupSprites:
 	db SPRITE_SUICUNE
 	db SPRITE_SILVER_TROPHY
 	db SPRITE_FAMICOM
@@ -316,9 +304,8 @@ IndigoGroupSprites: ; 145d2
 	db SPRITE_BIKER
 	db SPRITE_POKE_BALL
 	db SPRITE_BOULDER
-; 145e9
 
-NewBarkGroupSprites: ; 145e9
+NewBarkGroupSprites:
 	db SPRITE_SUICUNE
 	db SPRITE_SILVER_TROPHY
 	db SPRITE_FAMICOM
@@ -342,9 +329,8 @@ NewBarkGroupSprites: ; 145e9
 	db SPRITE_COOLTRAINER_F
 	db SPRITE_POKE_BALL
 	db SPRITE_FRUIT_TREE
-; 14600
 
-CherrygroveGroupSprites: ; 14600
+CherrygroveGroupSprites:
 	db SPRITE_SUICUNE
 	db SPRITE_SILVER_TROPHY
 	db SPRITE_FAMICOM
@@ -368,9 +354,8 @@ CherrygroveGroupSprites: ; 14600
 	db SPRITE_COOLTRAINER_F
 	db SPRITE_POKE_BALL
 	db SPRITE_FRUIT_TREE
-; 14617
 
-SilverGroupSprites: ; 14617
+SilverGroupSprites:
 	db SPRITE_SUICUNE
 	db SPRITE_SILVER_TROPHY
 	db SPRITE_FAMICOM
@@ -394,9 +379,8 @@ SilverGroupSprites: ; 14617
 	db SPRITE_COOLTRAINER_F
 	db SPRITE_POKE_BALL
 	db SPRITE_FRUIT_TREE
-; 1462e
 
-VioletGroupSprites: ; 1462e
+VioletGroupSprites:
 	db SPRITE_SUICUNE
 	db SPRITE_SILVER_TROPHY
 	db SPRITE_FAMICOM
@@ -420,9 +404,8 @@ VioletGroupSprites: ; 1462e
 	db SPRITE_WEIRD_TREE
 	db SPRITE_POKE_BALL
 	db SPRITE_FRUIT_TREE
-; 14645
 
-EcruteakGroupSprites: ; 14645
+EcruteakGroupSprites:
 	db SPRITE_SUICUNE
 	db SPRITE_SILVER_TROPHY
 	db SPRITE_FAMICOM
@@ -446,9 +429,8 @@ EcruteakGroupSprites: ; 14645
 	db SPRITE_WEIRD_TREE
 	db SPRITE_POKE_BALL
 	db SPRITE_FRUIT_TREE
-; 1465c
 
-AzaleaGroupSprites: ; 1465c
+AzaleaGroupSprites:
 	db SPRITE_SUICUNE
 	db SPRITE_SILVER_TROPHY
 	db SPRITE_FAMICOM
@@ -472,9 +454,8 @@ AzaleaGroupSprites: ; 1465c
 	db SPRITE_SILVER
 	db SPRITE_FRUIT_TREE
 	db SPRITE_SLOWPOKE
-; 14673
 
-GoldenrodGroupSprites: ; 14673
+GoldenrodGroupSprites:
 	db SPRITE_SUICUNE
 	db SPRITE_SILVER_TROPHY
 	db SPRITE_POKE_BALL
@@ -498,9 +479,8 @@ GoldenrodGroupSprites: ; 14673
 	db SPRITE_DAY_CARE_MON_2
 	db SPRITE_FRUIT_TREE
 	db SPRITE_SLOWPOKE
-; 1468a
 
-CianwoodGroupSprites: ; 1468a
+CianwoodGroupSprites:
 	db SPRITE_SUICUNE
 	db SPRITE_SILVER_TROPHY
 	db SPRITE_FAMICOM
@@ -524,9 +504,8 @@ CianwoodGroupSprites: ; 1468a
 	db SPRITE_TAUROS
 	db SPRITE_FRUIT_TREE
 	db SPRITE_ROCK
-; 146a1
 
-OlivineGroupSprites: ; 146a1
+OlivineGroupSprites:
 	db SPRITE_SUICUNE
 	db SPRITE_SILVER_TROPHY
 	db SPRITE_FAMICOM
@@ -550,9 +529,8 @@ OlivineGroupSprites: ; 146a1
 	db SPRITE_TAUROS
 	db SPRITE_FRUIT_TREE
 	db SPRITE_ROCK
-; 146b8
 
-LakeOfRageGroupSprites: ; 146b8
+LakeOfRageGroupSprites:
 	db SPRITE_SUICUNE
 	db SPRITE_SILVER_TROPHY
 	db SPRITE_FAMICOM
@@ -576,9 +554,8 @@ LakeOfRageGroupSprites: ; 146b8
 	db SPRITE_GYARADOS
 	db SPRITE_FRUIT_TREE
 	db SPRITE_POKE_BALL
-; 146cf
 
-MahoganyGroupSprites: ; 146cf
+MahoganyGroupSprites:
 	db SPRITE_SUICUNE
 	db SPRITE_SILVER_TROPHY
 	db SPRITE_FAMICOM
@@ -602,9 +579,8 @@ MahoganyGroupSprites: ; 146cf
 	db SPRITE_FISHER
 	db SPRITE_FRUIT_TREE
 	db SPRITE_POKE_BALL
-; 146e6
 
-BlackthornGroupSprites: ; 146e6
+BlackthornGroupSprites:
 	db SPRITE_SUICUNE
 	db SPRITE_SILVER_TROPHY
 	db SPRITE_FAMICOM
@@ -628,9 +604,8 @@ BlackthornGroupSprites: ; 146e6
 	db SPRITE_FISHER
 	db SPRITE_FRUIT_TREE
 	db SPRITE_POKE_BALL
-; 146fd
 
-DungeonsGroupSprites: ; 146fd
+DungeonsGroupSprites:
 	db SPRITE_SUICUNE
 	db SPRITE_SILVER_TROPHY
 	db SPRITE_FAMICOM
@@ -654,9 +629,8 @@ DungeonsGroupSprites: ; 146fd
 	db SPRITE_SCIENTIST
 	db SPRITE_POKE_BALL
 	db SPRITE_BOULDER
-; 14714
 
-FastShipGroupSprites: ; 14714
+FastShipGroupSprites:
 	db SPRITE_SUICUNE
 	db SPRITE_SILVER_TROPHY
 	db SPRITE_FAMICOM
@@ -680,9 +654,8 @@ FastShipGroupSprites: ; 14714
 	db SPRITE_FAIRY
 	db SPRITE_POKE_BALL
 	db SPRITE_ROCK
-; 1472b
 
-CableClubGroupSprites: ; 1472b
+CableClubGroupSprites:
 	db SPRITE_OAK
 	db SPRITE_FISHER
 	db SPRITE_TEACHER
@@ -694,4 +667,3 @@ CableClubGroupSprites: ; 1472b
 	db SPRITE_FISHING_GURU
 	db SPRITE_POKE_BALL
 	db SPRITE_POKEDEX
-; 14736
diff --git a/data/maps/roofs.asm b/data/maps/roofs.asm
index 8765cfa6a..0a27e97ca 100644
--- a/data/maps/roofs.asm
+++ b/data/maps/roofs.asm
@@ -6,7 +6,7 @@
 	const ROOF_OLIVINE   ; 3
 	const ROOF_GOLDENROD ; 4
 
-MapGroupRoofs: ; 1c021i
+MapGroupRoofs:
 ; entries correspond to map groups
 ; values are indexes for Roofs (see below)
 	db -1             ;  0
@@ -36,13 +36,11 @@ MapGroupRoofs: ; 1c021i
 	db ROOF_NEW_BARK  ; 24 (New Bark)
 	db -1             ; 25
 	db ROOF_NEW_BARK  ; 26 (Cherrygrove)
-; 1c03c
 
-Roofs: ; 1c03c
+Roofs:
 ; entries correspond to ROOF_* constants
 INCBIN "gfx/tilesets/roofs/0.2bpp"
 INCBIN "gfx/tilesets/roofs/1.2bpp"
 INCBIN "gfx/tilesets/roofs/2.2bpp"
 INCBIN "gfx/tilesets/roofs/3.2bpp"
 INCBIN "gfx/tilesets/roofs/4.2bpp"
-; 1c30c
diff --git a/data/maps/scenes.asm b/data/maps/scenes.asm
index 9e11f3590..9c820f9a6 100644
--- a/data/maps/scenes.asm
+++ b/data/maps/scenes.asm
@@ -4,7 +4,7 @@ scene_var: MACRO
 	dw \2
 ENDM
 
-MapScenes:: ; 4d01e
+MapScenes::
 	scene_var POKECENTER_2F,                               wPokecenter2FSceneID
 	scene_var TRADE_CENTER,                                wTradeCenterSceneID
 	scene_var COLOSSEUM,                                   wColosseumSceneID
@@ -85,4 +85,3 @@ MapScenes:: ; 4d01e
 	scene_var MOBILE_TRADE_ROOM,                           wMobileTradeRoomSceneID
 	scene_var MOBILE_BATTLE_ROOM,                          wMobileBattleRoomSceneID
 	db -1
-; 4d15b
diff --git a/data/maps/setup_scripts.asm b/data/maps/setup_scripts.asm
index 00b059865..218c81e06 100644
--- a/data/maps/setup_scripts.asm
+++ b/data/maps/setup_scripts.asm
@@ -1,4 +1,4 @@
-MapSetupScripts: ; 15377
+MapSetupScripts:
 ; entries correspond to MAPSETUP_* constants (see constants/map_setup_constants.asm)
 	dw MapSetupScript_Warp
 	dw MapSetupScript_Continue
@@ -12,14 +12,13 @@ MapSetupScripts: ; 15377
 	dw MapSetupScript_Submenu
 	dw MapSetupScript_BadWarp
 	dw MapSetupScript_Fly
-; 1538f
 
-MapSetupScript_Teleport: ; 1538f
+MapSetupScript_Teleport:
 	db map_prolong_sprites
-MapSetupScript_Fly: ; 15390
+MapSetupScript_Fly:
 	db map_fade_out_palettes
 	db map_keep_roam
-MapSetupScript_Warp: ; 15392
+MapSetupScript_Warp:
 	db map_lcd_off
 	db map_sound_off
 	db map_load_spawn
@@ -44,7 +43,7 @@ MapSetupScript_Warp: ; 15392
 	db map_wildmons
 	db map_end
 
-MapSetupScript_BadWarp: ; 153a9
+MapSetupScript_BadWarp:
 	db map_load_spawn
 	db map_load_attributes
 	db map_change_callback
@@ -68,7 +67,7 @@ MapSetupScript_BadWarp: ; 153a9
 	db map_wildmons
 	db map_end
 
-MapSetupScript_Connection: ; 153bf
+MapSetupScript_Connection:
 	db map_animations_off
 	db map_load_connection
 	db map_load_attributes
@@ -87,11 +86,11 @@ MapSetupScript_Connection: ; 153bf
 	db map_animations_on
 	db map_end
 
-MapSetupScript_Fall: ; 153d0
+MapSetupScript_Fall:
 	db map_prolong_sprites
-MapSetupScript_Door: ; 153d1
+MapSetupScript_Door:
 	db map_fade_out_palettes
-MapSetupScript_Train: ; 153d2
+MapSetupScript_Train:
 	db map_load_warp
 	db map_load_attributes
 	db map_warp_face
@@ -114,7 +113,7 @@ MapSetupScript_Train: ; 153d2
 	db map_update_roam
 	db map_end
 
-MapSetupScript_ReloadMap: ; 153e7
+MapSetupScript_ReloadMap:
 	db map_fade
 	db map_clear_bg_palettes
 	db map_lcd_off
@@ -132,7 +131,7 @@ MapSetupScript_ReloadMap: ; 153e7
 	db map_wildmons
 	db map_end
 
-MapSetupScript_LinkReturn: ; 153f7
+MapSetupScript_LinkReturn:
 	db map_fade
 	db map_lcd_off
 	db map_sound_off
@@ -151,7 +150,7 @@ MapSetupScript_LinkReturn: ; 153f7
 	db map_text_scroll_off
 	db map_end
 
-MapSetupScript_Continue: ; 15408
+MapSetupScript_Continue:
 	db map_lcd_off
 	db map_sound_off
 	db map_load_attributes_2
@@ -171,7 +170,7 @@ MapSetupScript_Continue: ; 15408
 	db map_wildmons
 	db map_end
 
-MapSetupScript_Submenu: ; 1541a
+MapSetupScript_Submenu:
 	db map_load_blocks
 	db map_connection_blocks
 	db map_end
diff --git a/data/maps/sgb_roof_pal_inds.asm b/data/maps/sgb_roof_pal_inds.asm
index c56ddaf7d..4b117fe67 100644
--- a/data/maps/sgb_roof_pal_inds.asm
+++ b/data/maps/sgb_roof_pal_inds.asm
@@ -1,6 +1,6 @@
 ; Crystal does not support SGB, so this is unused.
 
-MapGroupRoofSGBPalInds: ; 8a45
+MapGroupRoofSGBPalInds:
 ; entries correspond to map groups
 	db PREDEFPAL_00
 	db PREDEFPAL_OLIVINE
@@ -29,4 +29,3 @@ MapGroupRoofSGBPalInds: ; 8a45
 	db PREDEFPAL_NEW_BARK
 	db PREDEFPAL_SAFFRON
 	db PREDEFPAL_CHERRYGROVE
-; 8a60
diff --git a/data/maps/spawn_points.asm b/data/maps/spawn_points.asm
index b00a2ac1e..9ac3e8d07 100644
--- a/data/maps/spawn_points.asm
+++ b/data/maps/spawn_points.asm
@@ -4,7 +4,7 @@ spawn: MACRO
 	db \2, \3
 ENDM
 
-SpawnPoints: ; 0x152ab
+SpawnPoints:
 ; entries correspond to SPAWN_* constants
 
 	spawn PLAYERS_HOUSE_2F,            3,  3
@@ -38,4 +38,3 @@ SpawnPoints: ; 0x152ab
 	spawn SILVER_CAVE_OUTSIDE,        23, 20
 	spawn FAST_SHIP_CABINS_SW_SSW_NW,  6,  2
 	spawn N_A,                        -1, -1
-; 1531f