Merge pull request #1484 from GriffinRichards/remove-addrcomments

Remove address comments

1 files changed, 148 insertions, 148 deletions

diff --git a/data/tilesets/graphics.inc b/data/tilesets/graphics.inc
index c7e6d15b0..c85bd249e 100644
--- a/data/tilesets/graphics.inc
+++ b/data/tilesets/graphics.inc
@@ -1,9 +1,9 @@
 	.align 2
-gTilesetTiles_Petalburg:: @ 8339E08
+gTilesetTiles_Petalburg::
 	.incbin "data/tilesets/secondary/petalburg/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_Petalburg:: @ 833A704
+gTilesetPalettes_Petalburg::
 	.incbin "data/tilesets/secondary/petalburg/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/petalburg/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/petalburg/palettes/02.gbapal"
@@ -22,11 +22,11 @@ gTilesetPalettes_Petalburg:: @ 833A704
 	.incbin "data/tilesets/secondary/petalburg/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_Rustboro:: @ 833A904
+gTilesetTiles_Rustboro::
 	.incbin "data/tilesets/secondary/rustboro/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_Rustboro:: @ 833BEC0
+gTilesetPalettes_Rustboro::
 	.incbin "data/tilesets/secondary/rustboro/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/rustboro/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/rustboro/palettes/02.gbapal"
@@ -45,11 +45,11 @@ gTilesetPalettes_Rustboro:: @ 833BEC0
 	.incbin "data/tilesets/secondary/rustboro/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_Dewford:: @ 833C0C0
+gTilesetTiles_Dewford::
 	.incbin "data/tilesets/secondary/dewford/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_Dewford:: @ 833D540
+gTilesetPalettes_Dewford::
 	.incbin "data/tilesets/secondary/dewford/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/dewford/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/dewford/palettes/02.gbapal"
@@ -68,11 +68,11 @@ gTilesetPalettes_Dewford:: @ 833D540
 	.incbin "data/tilesets/secondary/dewford/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_Slateport:: @ 833D740
+gTilesetTiles_Slateport::
 	.incbin "data/tilesets/secondary/slateport/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_Slateport:: @ 833F708
+gTilesetPalettes_Slateport::
 	.incbin "data/tilesets/secondary/slateport/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/slateport/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/slateport/palettes/02.gbapal"
@@ -91,11 +91,11 @@ gTilesetPalettes_Slateport:: @ 833F708
 	.incbin "data/tilesets/secondary/slateport/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_Mauville:: @ 833F908
+gTilesetTiles_Mauville::
 	.incbin "data/tilesets/secondary/mauville/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_Mauville:: @ 834172C
+gTilesetPalettes_Mauville::
 	.incbin "data/tilesets/secondary/mauville/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/mauville/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/mauville/palettes/02.gbapal"
@@ -114,11 +114,11 @@ gTilesetPalettes_Mauville:: @ 834172C
 	.incbin "data/tilesets/secondary/mauville/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_Lavaridge:: @ 834192C
+gTilesetTiles_Lavaridge::
 	.incbin "data/tilesets/secondary/lavaridge/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_Lavaridge:: @ 8342E28
+gTilesetPalettes_Lavaridge::
 	.incbin "data/tilesets/secondary/lavaridge/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/lavaridge/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/lavaridge/palettes/02.gbapal"
@@ -137,11 +137,11 @@ gTilesetPalettes_Lavaridge:: @ 8342E28
 	.incbin "data/tilesets/secondary/lavaridge/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_Fallarbor:: @ 8343028
+gTilesetTiles_Fallarbor::
 	.incbin "data/tilesets/secondary/fallarbor/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_Fallarbor:: @ 83447A0
+gTilesetPalettes_Fallarbor::
 	.incbin "data/tilesets/secondary/fallarbor/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/fallarbor/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/fallarbor/palettes/02.gbapal"
@@ -160,11 +160,11 @@ gTilesetPalettes_Fallarbor:: @ 83447A0
 	.incbin "data/tilesets/secondary/fallarbor/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_Fortree:: @ 83449A0
+gTilesetTiles_Fortree::
 	.incbin "data/tilesets/secondary/fortree/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_Fortree:: @ 8346020
+gTilesetPalettes_Fortree::
 	.incbin "data/tilesets/secondary/fortree/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/fortree/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/fortree/palettes/02.gbapal"
@@ -183,11 +183,11 @@ gTilesetPalettes_Fortree:: @ 8346020
 	.incbin "data/tilesets/secondary/fortree/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_Lilycove:: @ 8346220
+gTilesetTiles_Lilycove::
 	.incbin "data/tilesets/secondary/lilycove/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_Lilycove:: @ 83475C0
+gTilesetPalettes_Lilycove::
 	.incbin "data/tilesets/secondary/lilycove/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/lilycove/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/lilycove/palettes/02.gbapal"
@@ -206,11 +206,11 @@ gTilesetPalettes_Lilycove:: @ 83475C0
 	.incbin "data/tilesets/secondary/lilycove/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_Mossdeep:: @ 83477C0
+gTilesetTiles_Mossdeep::
 	.incbin "data/tilesets/secondary/mossdeep/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_Mossdeep:: @ 8348E10
+gTilesetPalettes_Mossdeep::
 	.incbin "data/tilesets/secondary/mossdeep/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/mossdeep/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/mossdeep/palettes/02.gbapal"
@@ -229,11 +229,11 @@ gTilesetPalettes_Mossdeep:: @ 8348E10
 	.incbin "data/tilesets/secondary/mossdeep/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_EverGrande:: @ 8349010
+gTilesetTiles_EverGrande::
 	.incbin "data/tilesets/secondary/ever_grande/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_EverGrande:: @ 8349C28
+gTilesetPalettes_EverGrande::
 	.incbin "data/tilesets/secondary/ever_grande/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/ever_grande/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/ever_grande/palettes/02.gbapal"
@@ -252,11 +252,11 @@ gTilesetPalettes_EverGrande:: @ 8349C28
 	.incbin "data/tilesets/secondary/ever_grande/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_Pacifidlog:: @ 8349E28
+gTilesetTiles_Pacifidlog::
 	.incbin "data/tilesets/secondary/pacifidlog/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_Pacifidlog:: @ 834B5B4
+gTilesetPalettes_Pacifidlog::
 	.incbin "data/tilesets/secondary/pacifidlog/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/pacifidlog/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/pacifidlog/palettes/02.gbapal"
@@ -275,11 +275,11 @@ gTilesetPalettes_Pacifidlog:: @ 834B5B4
 	.incbin "data/tilesets/secondary/pacifidlog/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_Sootopolis:: @ 834B7B4
+gTilesetTiles_Sootopolis::
 	.incbin "data/tilesets/secondary/sootopolis/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_Sootopolis:: @ 834C6B4
+gTilesetPalettes_Sootopolis::
 	.incbin "data/tilesets/secondary/sootopolis/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/sootopolis/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/sootopolis/palettes/02.gbapal"
@@ -298,11 +298,11 @@ gTilesetPalettes_Sootopolis:: @ 834C6B4
 	.incbin "data/tilesets/secondary/sootopolis/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_BattleFrontierOutsideWest:: @ 834C8B4
+gTilesetTiles_BattleFrontierOutsideWest::
 	.incbin "data/tilesets/secondary/battle_frontier_outside_west/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_BattleFrontierOutsideWest:: @ 834E3E4
+gTilesetPalettes_BattleFrontierOutsideWest::
 	.incbin "data/tilesets/secondary/battle_frontier_outside_west/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/battle_frontier_outside_west/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/battle_frontier_outside_west/palettes/02.gbapal"
@@ -321,11 +321,11 @@ gTilesetPalettes_BattleFrontierOutsideWest:: @ 834E3E4
 	.incbin "data/tilesets/secondary/battle_frontier_outside_west/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_BattleFrontierOutsideEast:: @ 834E5E4
+gTilesetTiles_BattleFrontierOutsideEast::
 	.incbin "data/tilesets/secondary/battle_frontier_outside_east/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_BattleFrontierOutsideEast:: @ 834F984
+gTilesetPalettes_BattleFrontierOutsideEast::
 	.incbin "data/tilesets/secondary/battle_frontier_outside_east/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/battle_frontier_outside_east/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/battle_frontier_outside_east/palettes/02.gbapal"
@@ -344,11 +344,11 @@ gTilesetPalettes_BattleFrontierOutsideEast:: @ 834F984
 	.incbin "data/tilesets/secondary/battle_frontier_outside_east/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_InsideBuilding:: @ 834FB84
+gTilesetTiles_InsideBuilding::
 	.incbin "data/tilesets/primary/building/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_InsideBuilding:: @ 83508BC
+gTilesetPalettes_InsideBuilding::
 	.incbin "data/tilesets/primary/building/palettes/00.gbapal"
 	.incbin "data/tilesets/primary/building/palettes/01.gbapal"
 	.incbin "data/tilesets/primary/building/palettes/02.gbapal"
@@ -367,11 +367,11 @@ gTilesetPalettes_InsideBuilding:: @ 83508BC
 	.incbin "data/tilesets/primary/building/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_Shop:: @ 8350ABC
+gTilesetTiles_Shop::
 	.incbin "data/tilesets/secondary/shop/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_Shop:: @ 83520DC
+gTilesetPalettes_Shop::
 	.incbin "data/tilesets/secondary/shop/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/shop/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/shop/palettes/02.gbapal"
@@ -390,11 +390,11 @@ gTilesetPalettes_Shop:: @ 83520DC
 	.incbin "data/tilesets/secondary/shop/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_PokemonCenter:: @ 83522DC
+gTilesetTiles_PokemonCenter::
 	.incbin "data/tilesets/secondary/pokemon_center/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_PokemonCenter:: @ 8353574
+gTilesetPalettes_PokemonCenter::
 	.incbin "data/tilesets/secondary/pokemon_center/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/pokemon_center/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/pokemon_center/palettes/02.gbapal"
@@ -413,11 +413,11 @@ gTilesetPalettes_PokemonCenter:: @ 8353574
 	.incbin "data/tilesets/secondary/pokemon_center/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_Cave:: @ 8353774
+gTilesetTiles_Cave::
 	.incbin "data/tilesets/secondary/cave/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_Cave:: @ 8355260
+gTilesetPalettes_Cave::
 	.incbin "data/tilesets/secondary/cave/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/cave/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/cave/palettes/02.gbapal"
@@ -436,11 +436,11 @@ gTilesetPalettes_Cave:: @ 8355260
 	.incbin "data/tilesets/secondary/cave/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_PokemonSchool:: @ 8355460
+gTilesetTiles_PokemonSchool::
 	.incbin "data/tilesets/secondary/pokemon_school/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_PokemonSchool:: @ 8355BA8
+gTilesetPalettes_PokemonSchool::
 	.incbin "data/tilesets/secondary/pokemon_school/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/pokemon_school/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/pokemon_school/palettes/02.gbapal"
@@ -459,11 +459,11 @@ gTilesetPalettes_PokemonSchool:: @ 8355BA8
 	.incbin "data/tilesets/secondary/pokemon_school/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_PokemonFanClub:: @ 8355DA8
+gTilesetTiles_PokemonFanClub::
 	.incbin "data/tilesets/secondary/pokemon_fan_club/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_PokemonFanClub:: @ 83566D4
+gTilesetPalettes_PokemonFanClub::
 	.incbin "data/tilesets/secondary/pokemon_fan_club/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/pokemon_fan_club/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/pokemon_fan_club/palettes/02.gbapal"
@@ -482,11 +482,11 @@ gTilesetPalettes_PokemonFanClub:: @ 83566D4
 	.incbin "data/tilesets/secondary/pokemon_fan_club/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_Unused1:: @ 83568D4
+gTilesetTiles_Unused1::
 	.incbin "data/tilesets/secondary/unused_1/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_Unused1:: @ 8356920
+gTilesetPalettes_Unused1::
 	.incbin "data/tilesets/secondary/unused_1/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/unused_1/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/unused_1/palettes/02.gbapal"
@@ -505,11 +505,11 @@ gTilesetPalettes_Unused1:: @ 8356920
 	.incbin "data/tilesets/secondary/unused_1/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_MeteorFalls:: @ 8356B20
+gTilesetTiles_MeteorFalls::
 	.incbin "data/tilesets/secondary/meteor_falls/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_MeteorFalls:: @ 8358840
+gTilesetPalettes_MeteorFalls::
 	.incbin "data/tilesets/secondary/meteor_falls/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/meteor_falls/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/meteor_falls/palettes/02.gbapal"
@@ -528,11 +528,11 @@ gTilesetPalettes_MeteorFalls:: @ 8358840
 	.incbin "data/tilesets/secondary/meteor_falls/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_OceanicMuseum:: @ 8358A40
+gTilesetTiles_OceanicMuseum::
 	.incbin "data/tilesets/secondary/oceanic_museum/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_OceanicMuseum:: @ 83599CC
+gTilesetPalettes_OceanicMuseum::
 	.incbin "data/tilesets/secondary/oceanic_museum/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/oceanic_museum/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/oceanic_museum/palettes/02.gbapal"
@@ -551,14 +551,14 @@ gTilesetPalettes_OceanicMuseum:: @ 83599CC
 	.incbin "data/tilesets/secondary/oceanic_museum/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_CableClub:: @ 8359BCC
+gTilesetTiles_CableClub::
 	.incbin "data/tilesets/secondary/cable_club/tiles.4bpp"
 
 	.align 2
 	.incbin "data/tilesets/secondary/cable_club/unknown_tiles.4bpp"
 
 	.align 2
-gTilesetPalettes_CableClub:: @ 835EACC
+gTilesetPalettes_CableClub::
 	.incbin "data/tilesets/secondary/cable_club/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/cable_club/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/cable_club/palettes/02.gbapal"
@@ -577,11 +577,11 @@ gTilesetPalettes_CableClub:: @ 835EACC
 	.incbin "data/tilesets/secondary/cable_club/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_SeashoreHouse:: @ 835ECCC
+gTilesetTiles_SeashoreHouse::
 	.incbin "data/tilesets/secondary/seashore_house/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_SeashoreHouse:: @ 835F5A8
+gTilesetPalettes_SeashoreHouse::
 	.incbin "data/tilesets/secondary/seashore_house/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/seashore_house/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/seashore_house/palettes/02.gbapal"
@@ -600,11 +600,11 @@ gTilesetPalettes_SeashoreHouse:: @ 835F5A8
 	.incbin "data/tilesets/secondary/seashore_house/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_PrettyPetalFlowerShop:: @ 835F7A8
+gTilesetTiles_PrettyPetalFlowerShop::
 	.incbin "data/tilesets/secondary/pretty_petal_flower_shop/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_PrettyPetalFlowerShop:: @ 83603A0
+gTilesetPalettes_PrettyPetalFlowerShop::
 	.incbin "data/tilesets/secondary/pretty_petal_flower_shop/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/pretty_petal_flower_shop/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/pretty_petal_flower_shop/palettes/02.gbapal"
@@ -623,11 +623,11 @@ gTilesetPalettes_PrettyPetalFlowerShop:: @ 83603A0
 	.incbin "data/tilesets/secondary/pretty_petal_flower_shop/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_PokemonDayCare:: @ 83605A0
+gTilesetTiles_PokemonDayCare::
 	.incbin "data/tilesets/secondary/pokemon_day_care/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_PokemonDayCare:: @ 8360FDC
+gTilesetPalettes_PokemonDayCare::
 	.incbin "data/tilesets/secondary/pokemon_day_care/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/pokemon_day_care/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/pokemon_day_care/palettes/02.gbapal"
@@ -646,11 +646,11 @@ gTilesetPalettes_PokemonDayCare:: @ 8360FDC
 	.incbin "data/tilesets/secondary/pokemon_day_care/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_Facility:: @ 83611DC
+gTilesetTiles_Facility::
 	.incbin "data/tilesets/secondary/facility/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_Facility:: @ 8362E90
+gTilesetPalettes_Facility::
 	.incbin "data/tilesets/secondary/facility/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/facility/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/facility/palettes/02.gbapal"
@@ -669,11 +669,11 @@ gTilesetPalettes_Facility:: @ 8362E90
 	.incbin "data/tilesets/secondary/facility/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_BikeShop:: @ 8363090
+gTilesetTiles_BikeShop::
 	.incbin "data/tilesets/secondary/bike_shop/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_BikeShop:: @ 83643C0
+gTilesetPalettes_BikeShop::
 	.incbin "data/tilesets/secondary/bike_shop/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/bike_shop/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/bike_shop/palettes/02.gbapal"
@@ -692,11 +692,11 @@ gTilesetPalettes_BikeShop:: @ 83643C0
 	.incbin "data/tilesets/secondary/bike_shop/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_RusturfTunnel:: @ 83645C0
+gTilesetTiles_RusturfTunnel::
 	.incbin "data/tilesets/secondary/rusturf_tunnel/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_RusturfTunnel:: @ 8365008
+gTilesetPalettes_RusturfTunnel::
 	.incbin "data/tilesets/secondary/rusturf_tunnel/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/rusturf_tunnel/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/rusturf_tunnel/palettes/02.gbapal"
@@ -719,7 +719,7 @@ gTilesetPalettes_RusturfTunnel:: @ 8365008
 	.incbin "data/tilesets/secondary/secret_base/brown_cave/unused_tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_SecretBaseBrownCave:: @ 8365788
+gTilesetPalettes_SecretBaseBrownCave::
 	.incbin "data/tilesets/secondary/secret_base/brown_cave/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/secret_base/brown_cave/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/secret_base/brown_cave/palettes/02.gbapal"
@@ -742,7 +742,7 @@ gTilesetPalettes_SecretBaseBrownCave:: @ 8365788
 	.incbin "data/tilesets/secondary/secret_base/tree/unused_tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_SecretBaseTree:: @ 8365EAC
+gTilesetPalettes_SecretBaseTree::
 	.incbin "data/tilesets/secondary/secret_base/tree/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/secret_base/tree/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/secret_base/tree/palettes/02.gbapal"
@@ -765,7 +765,7 @@ gTilesetPalettes_SecretBaseTree:: @ 8365EAC
 	.incbin "data/tilesets/secondary/secret_base/shrub/unused_tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_SecretBaseShrub:: @ 8366614
+gTilesetPalettes_SecretBaseShrub::
 	.incbin "data/tilesets/secondary/secret_base/shrub/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/secret_base/shrub/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/secret_base/shrub/palettes/02.gbapal"
@@ -788,7 +788,7 @@ gTilesetPalettes_SecretBaseShrub:: @ 8366614
 	.incbin "data/tilesets/secondary/secret_base/blue_cave/unused_tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_SecretBaseBlueCave:: @ 8366C30
+gTilesetPalettes_SecretBaseBlueCave::
 	.incbin "data/tilesets/secondary/secret_base/blue_cave/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/secret_base/blue_cave/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/secret_base/blue_cave/palettes/02.gbapal"
@@ -811,7 +811,7 @@ gTilesetPalettes_SecretBaseBlueCave:: @ 8366C30
 	.incbin "data/tilesets/secondary/secret_base/yellow_cave/unused_tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_SecretBaseYellowCave:: @ 8367368
+gTilesetPalettes_SecretBaseYellowCave::
 	.incbin "data/tilesets/secondary/secret_base/yellow_cave/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/secret_base/yellow_cave/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/secret_base/yellow_cave/palettes/02.gbapal"
@@ -834,7 +834,7 @@ gTilesetPalettes_SecretBaseYellowCave:: @ 8367368
 	.incbin "data/tilesets/secondary/secret_base/red_cave/unused_tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_SecretBaseRedCave:: @ 83679A0
+gTilesetPalettes_SecretBaseRedCave::
 	.incbin "data/tilesets/secondary/secret_base/red_cave/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/secret_base/red_cave/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/secret_base/red_cave/palettes/02.gbapal"
@@ -853,35 +853,35 @@ gTilesetPalettes_SecretBaseRedCave:: @ 83679A0
 	.incbin "data/tilesets/secondary/secret_base/red_cave/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_SecretBaseBrownCave:: @ 8367BA0
+gTilesetTiles_SecretBaseBrownCave::
 	.incbin "data/tilesets/secondary/secret_base/brown_cave/tiles.4bpp"
 
 	.align 2
-gTilesetTiles_SecretBaseTree:: @ 8368600
+gTilesetTiles_SecretBaseTree::
 	.incbin "data/tilesets/secondary/secret_base/tree/tiles.4bpp"
 
 	.align 2
-gTilesetTiles_SecretBaseShrub:: @ 8369060
+gTilesetTiles_SecretBaseShrub::
 	.incbin "data/tilesets/secondary/secret_base/shrub/tiles.4bpp"
 
 	.align 2
-gTilesetTiles_SecretBaseBlueCave:: @ 8369AC0
+gTilesetTiles_SecretBaseBlueCave::
 	.incbin "data/tilesets/secondary/secret_base/blue_cave/tiles.4bpp"
 
 	.align 2
-gTilesetTiles_SecretBaseYellowCave:: @ 836A520
+gTilesetTiles_SecretBaseYellowCave::
 	.incbin "data/tilesets/secondary/secret_base/yellow_cave/tiles.4bpp"
 
 	.align 2
-gTilesetTiles_SecretBaseRedCave:: @ 836AF80
+gTilesetTiles_SecretBaseRedCave::
 	.incbin "data/tilesets/secondary/secret_base/red_cave/tiles.4bpp"
 
 	.align 2
-gTilesetTiles_InsideOfTruck:: @ 836B9E0
+gTilesetTiles_InsideOfTruck::
 	.incbin "data/tilesets/secondary/inside_of_truck/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_InsideOfTruck:: @ 836BC3C
+gTilesetPalettes_InsideOfTruck::
 	.incbin "data/tilesets/secondary/inside_of_truck/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/inside_of_truck/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/inside_of_truck/palettes/02.gbapal"
@@ -900,11 +900,11 @@ gTilesetPalettes_InsideOfTruck:: @ 836BC3C
 	.incbin "data/tilesets/secondary/inside_of_truck/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_Contest:: @ 836BE3C
+gTilesetTiles_Contest::
 	.incbin "data/tilesets/secondary/contest/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_Contest:: @ 836C990
+gTilesetPalettes_Contest::
 	.incbin "data/tilesets/secondary/contest/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/contest/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/contest/palettes/02.gbapal"
@@ -923,11 +923,11 @@ gTilesetPalettes_Contest:: @ 836C990
 	.incbin "data/tilesets/secondary/contest/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_LilycoveMuseum:: @ 836CB90
+gTilesetTiles_LilycoveMuseum::
 	.incbin "data/tilesets/secondary/lilycove_museum/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_LilycoveMuseum:: @ 836DEAC
+gTilesetPalettes_LilycoveMuseum::
 	.incbin "data/tilesets/secondary/lilycove_museum/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/lilycove_museum/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/lilycove_museum/palettes/02.gbapal"
@@ -946,11 +946,11 @@ gTilesetPalettes_LilycoveMuseum:: @ 836DEAC
 	.incbin "data/tilesets/secondary/lilycove_museum/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_BrendansMaysHouse:: @ 836E0AC
+gTilesetTiles_BrendansMaysHouse::
 	.incbin "data/tilesets/secondary/brendans_mays_house/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_BrendansMaysHouse:: @ 836F178
+gTilesetPalettes_BrendansMaysHouse::
 	.incbin "data/tilesets/secondary/brendans_mays_house/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/brendans_mays_house/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/brendans_mays_house/palettes/02.gbapal"
@@ -969,11 +969,11 @@ gTilesetPalettes_BrendansMaysHouse:: @ 836F178
 	.incbin "data/tilesets/secondary/brendans_mays_house/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_Lab:: @ 836F378
+gTilesetTiles_Lab::
 	.incbin "data/tilesets/secondary/lab/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_Lab:: @ 83703DC
+gTilesetPalettes_Lab::
 	.incbin "data/tilesets/secondary/lab/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/lab/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/lab/palettes/02.gbapal"
@@ -992,11 +992,11 @@ gTilesetPalettes_Lab:: @ 83703DC
 	.incbin "data/tilesets/secondary/lab/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_Underwater:: @ 83705DC
+gTilesetTiles_Underwater::
 	.incbin "data/tilesets/secondary/underwater/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_Underwater:: @ 8371798
+gTilesetPalettes_Underwater::
 	.incbin "data/tilesets/secondary/underwater/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/underwater/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/underwater/palettes/02.gbapal"
@@ -1015,11 +1015,11 @@ gTilesetPalettes_Underwater:: @ 8371798
 	.incbin "data/tilesets/secondary/underwater/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_GenericBuilding:: @ 8371998
+gTilesetTiles_GenericBuilding::
 	.incbin "data/tilesets/secondary/generic_building/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_GenericBuilding:: @ 83733C4
+gTilesetPalettes_GenericBuilding::
 	.incbin "data/tilesets/secondary/generic_building/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/generic_building/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/generic_building/palettes/02.gbapal"
@@ -1038,11 +1038,11 @@ gTilesetPalettes_GenericBuilding:: @ 83733C4
 	.incbin "data/tilesets/secondary/generic_building/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_MauvilleGameCorner:: @ 83735C4
+gTilesetTiles_MauvilleGameCorner::
 	.incbin "data/tilesets/secondary/mauville_game_corner/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_MauvilleGameCorner:: @ 8374288
+gTilesetPalettes_MauvilleGameCorner::
 	.incbin "data/tilesets/secondary/mauville_game_corner/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/mauville_game_corner/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/mauville_game_corner/palettes/02.gbapal"
@@ -1061,11 +1061,11 @@ gTilesetPalettes_MauvilleGameCorner:: @ 8374288
 	.incbin "data/tilesets/secondary/mauville_game_corner/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_Unused2:: @ 8374488
+gTilesetTiles_Unused2::
 	.incbin "data/tilesets/secondary/unused_2/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_Unused2:: @ 83749B0
+gTilesetPalettes_Unused2::
 	.incbin "data/tilesets/secondary/unused_2/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/unused_2/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/unused_2/palettes/02.gbapal"
@@ -1084,11 +1084,11 @@ gTilesetPalettes_Unused2:: @ 83749B0
 	.incbin "data/tilesets/secondary/unused_2/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_RustboroGym:: @ 8374BB0
+gTilesetTiles_RustboroGym::
 	.incbin "data/tilesets/secondary/rustboro_gym/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_RustboroGym:: @ 8374F34
+gTilesetPalettes_RustboroGym::
 	.incbin "data/tilesets/secondary/rustboro_gym/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/rustboro_gym/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/rustboro_gym/palettes/02.gbapal"
@@ -1107,11 +1107,11 @@ gTilesetPalettes_RustboroGym:: @ 8374F34
 	.incbin "data/tilesets/secondary/rustboro_gym/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_DewfordGym:: @ 8375134
+gTilesetTiles_DewfordGym::
 	.incbin "data/tilesets/secondary/dewford_gym/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_DewfordGym:: @ 8375400
+gTilesetPalettes_DewfordGym::
 	.incbin "data/tilesets/secondary/dewford_gym/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/dewford_gym/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/dewford_gym/palettes/02.gbapal"
@@ -1130,11 +1130,11 @@ gTilesetPalettes_DewfordGym:: @ 8375400
 	.incbin "data/tilesets/secondary/dewford_gym/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_MauvilleGym:: @ 8375600
+gTilesetTiles_MauvilleGym::
 	.incbin "data/tilesets/secondary/mauville_gym/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_MauvilleGym:: @ 8375D84
+gTilesetPalettes_MauvilleGym::
 	.incbin "data/tilesets/secondary/mauville_gym/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/mauville_gym/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/mauville_gym/palettes/02.gbapal"
@@ -1153,11 +1153,11 @@ gTilesetPalettes_MauvilleGym:: @ 8375D84
 	.incbin "data/tilesets/secondary/mauville_gym/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_LavaridgeGym:: @ 8375F84
+gTilesetTiles_LavaridgeGym::
 	.incbin "data/tilesets/secondary/lavaridge_gym/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_LavaridgeGym:: @ 83762AC
+gTilesetPalettes_LavaridgeGym::
 	.incbin "data/tilesets/secondary/lavaridge_gym/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/lavaridge_gym/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/lavaridge_gym/palettes/02.gbapal"
@@ -1176,11 +1176,11 @@ gTilesetPalettes_LavaridgeGym:: @ 83762AC
 	.incbin "data/tilesets/secondary/lavaridge_gym/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_PetalburgGym:: @ 83764AC
+gTilesetTiles_PetalburgGym::
 	.incbin "data/tilesets/secondary/petalburg_gym/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_PetalburgGym:: @ 8376B50
+gTilesetPalettes_PetalburgGym::
 	.incbin "data/tilesets/secondary/petalburg_gym/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/petalburg_gym/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/petalburg_gym/palettes/02.gbapal"
@@ -1199,11 +1199,11 @@ gTilesetPalettes_PetalburgGym:: @ 8376B50
 	.incbin "data/tilesets/secondary/petalburg_gym/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_FortreeGym:: @ 8376D50
+gTilesetTiles_FortreeGym::
 	.incbin "data/tilesets/secondary/fortree_gym/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_FortreeGym:: @ 83770C4
+gTilesetPalettes_FortreeGym::
 	.incbin "data/tilesets/secondary/fortree_gym/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/fortree_gym/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/fortree_gym/palettes/02.gbapal"
@@ -1222,11 +1222,11 @@ gTilesetPalettes_FortreeGym:: @ 83770C4
 	.incbin "data/tilesets/secondary/fortree_gym/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_MossdeepGym:: @ 83772C4
+gTilesetTiles_MossdeepGym::
 	.incbin "data/tilesets/secondary/mossdeep_gym/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_MossdeepGym:: @ 8377730
+gTilesetPalettes_MossdeepGym::
 	.incbin "data/tilesets/secondary/mossdeep_gym/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/mossdeep_gym/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/mossdeep_gym/palettes/02.gbapal"
@@ -1245,11 +1245,11 @@ gTilesetPalettes_MossdeepGym:: @ 8377730
 	.incbin "data/tilesets/secondary/mossdeep_gym/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_SootopolisGym:: @ 8377930
+gTilesetTiles_SootopolisGym::
 	.incbin "data/tilesets/secondary/sootopolis_gym/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_SootopolisGym:: @ 8378AC4
+gTilesetPalettes_SootopolisGym::
 	.incbin "data/tilesets/secondary/sootopolis_gym/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/sootopolis_gym/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/sootopolis_gym/palettes/02.gbapal"
@@ -1268,11 +1268,11 @@ gTilesetPalettes_SootopolisGym:: @ 8378AC4
 	.incbin "data/tilesets/secondary/sootopolis_gym/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_TrickHousePuzzle:: @ 8378CC4
+gTilesetTiles_TrickHousePuzzle::
 	.incbin "data/tilesets/secondary/trick_house_puzzle/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_TrickHousePuzzle:: @ 8379A78
+gTilesetPalettes_TrickHousePuzzle::
 	.incbin "data/tilesets/secondary/trick_house_puzzle/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/trick_house_puzzle/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/trick_house_puzzle/palettes/02.gbapal"
@@ -1291,11 +1291,11 @@ gTilesetPalettes_TrickHousePuzzle:: @ 8379A78
 	.incbin "data/tilesets/secondary/trick_house_puzzle/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_InsideShip:: @ 8379C78
+gTilesetTiles_InsideShip::
 	.incbin "data/tilesets/secondary/inside_ship/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_InsideShip:: @ 837A848
+gTilesetPalettes_InsideShip::
 	.incbin "data/tilesets/secondary/inside_ship/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/inside_ship/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/inside_ship/palettes/02.gbapal"
@@ -1314,14 +1314,14 @@ gTilesetPalettes_InsideShip:: @ 837A848
 	.incbin "data/tilesets/secondary/inside_ship/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_SecretBase:: @ 837AA48
+gTilesetTiles_SecretBase::
 	.incbin "data/tilesets/primary/secret_base/tiles.4bpp"
 
 	.align 2
 	.incbin "data/tilesets/primary/secret_base/unknown_tiles.4bpp"
 
 	.align 2
-gTilesetPalettes_SecretBase:: @ 8382A48
+gTilesetPalettes_SecretBase::
 	.incbin "data/tilesets/primary/secret_base/palettes/00.gbapal"
 	.incbin "data/tilesets/primary/secret_base/palettes/01.gbapal"
 	.incbin "data/tilesets/primary/secret_base/palettes/02.gbapal"
@@ -1340,11 +1340,11 @@ gTilesetPalettes_SecretBase:: @ 8382A48
 	.incbin "data/tilesets/primary/secret_base/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_EliteFour:: @ 8382C48
+gTilesetTiles_EliteFour::
 	.incbin "data/tilesets/secondary/elite_four/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_EliteFour:: @ 8383CC4
+gTilesetPalettes_EliteFour::
 	.incbin "data/tilesets/secondary/elite_four/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/elite_four/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/elite_four/palettes/02.gbapal"
@@ -1363,11 +1363,11 @@ gTilesetPalettes_EliteFour:: @ 8383CC4
 	.incbin "data/tilesets/secondary/elite_four/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_BattleFrontier:: @ 8383EC4
+gTilesetTiles_BattleFrontier::
 	.incbin "data/tilesets/secondary/battle_frontier/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_BattleFrontier:: @ 8384BC8
+gTilesetPalettes_BattleFrontier::
 	.incbin "data/tilesets/secondary/battle_frontier/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/battle_frontier/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/battle_frontier/palettes/02.gbapal"
@@ -1386,11 +1386,11 @@ gTilesetPalettes_BattleFrontier:: @ 8384BC8
 	.incbin "data/tilesets/secondary/battle_frontier/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_BattlePalace:: @ 8384DC8
+gTilesetTiles_BattlePalace::
 	.incbin "data/tilesets/secondary/battle_palace/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_BattlePalace:: @ 8385540
+gTilesetPalettes_BattlePalace::
 	.incbin "data/tilesets/secondary/battle_palace/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/battle_palace/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/battle_palace/palettes/02.gbapal"
@@ -1409,11 +1409,11 @@ gTilesetPalettes_BattlePalace:: @ 8385540
 	.incbin "data/tilesets/secondary/battle_palace/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_BattleDome:: @ 8385740
+gTilesetTiles_BattleDome::
 	.incbin "data/tilesets/secondary/battle_dome/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_BattleDome:: @ 8386990
+gTilesetPalettes_BattleDome::
 	.incbin "data/tilesets/secondary/battle_dome/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/battle_dome/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/battle_dome/palettes/02.gbapal"
@@ -1432,11 +1432,11 @@ gTilesetPalettes_BattleDome:: @ 8386990
 	.incbin "data/tilesets/secondary/battle_dome/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_BattleFactory:: @ 8386B90
+gTilesetTiles_BattleFactory::
 	.incbin "data/tilesets/secondary/battle_factory/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_BattleFactory:: @ 8387D7C
+gTilesetPalettes_BattleFactory::
 	.incbin "data/tilesets/secondary/battle_factory/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/battle_factory/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/battle_factory/palettes/02.gbapal"
@@ -1455,11 +1455,11 @@ gTilesetPalettes_BattleFactory:: @ 8387D7C
 	.incbin "data/tilesets/secondary/battle_factory/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_BattlePike:: @ 8387F7C
+gTilesetTiles_BattlePike::
 	.incbin "data/tilesets/secondary/battle_pike/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_BattlePike:: @ 8389250
+gTilesetPalettes_BattlePike::
 	.incbin "data/tilesets/secondary/battle_pike/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/battle_pike/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/battle_pike/palettes/02.gbapal"
@@ -1478,11 +1478,11 @@ gTilesetPalettes_BattlePike:: @ 8389250
 	.incbin "data/tilesets/secondary/battle_pike/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_BattleArena:: @ 8389450
+gTilesetTiles_BattleArena::
 	.incbin "data/tilesets/secondary/battle_arena/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_BattleArena:: @ 8389F8C
+gTilesetPalettes_BattleArena::
 	.incbin "data/tilesets/secondary/battle_arena/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/battle_arena/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/battle_arena/palettes/02.gbapal"
@@ -1501,11 +1501,11 @@ gTilesetPalettes_BattleArena:: @ 8389F8C
 	.incbin "data/tilesets/secondary/battle_arena/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_BattlePyramid:: @ 838A18C
+gTilesetTiles_BattlePyramid::
 	.incbin "data/tilesets/secondary/battle_pyramid/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_BattlePyramid:: @ 838B39C
+gTilesetPalettes_BattlePyramid::
 	.incbin "data/tilesets/secondary/battle_pyramid/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/battle_pyramid/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/battle_pyramid/palettes/02.gbapal"
@@ -1524,11 +1524,11 @@ gTilesetPalettes_BattlePyramid:: @ 838B39C
 	.incbin "data/tilesets/secondary/battle_pyramid/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_MirageTower:: @ 838B59C
+gTilesetTiles_MirageTower::
 	.incbin "data/tilesets/secondary/mirage_tower/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_MirageTower:: @ 838CFE4
+gTilesetPalettes_MirageTower::
 	.incbin "data/tilesets/secondary/mirage_tower/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/mirage_tower/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/mirage_tower/palettes/02.gbapal"
@@ -1547,11 +1547,11 @@ gTilesetPalettes_MirageTower:: @ 838CFE4
 	.incbin "data/tilesets/secondary/mirage_tower/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_MossdeepGameCorner:: @ 838D1E4
+gTilesetTiles_MossdeepGameCorner::
 	.incbin "data/tilesets/secondary/mossdeep_game_corner/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_MossdeepGameCorner:: @ 838D604
+gTilesetPalettes_MossdeepGameCorner::
 	.incbin "data/tilesets/secondary/mossdeep_game_corner/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/mossdeep_game_corner/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/mossdeep_game_corner/palettes/02.gbapal"
@@ -1570,11 +1570,11 @@ gTilesetPalettes_MossdeepGameCorner:: @ 838D604
 	.incbin "data/tilesets/secondary/mossdeep_game_corner/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_IslandHarbor:: @ 838D804
+gTilesetTiles_IslandHarbor::
 	.incbin "data/tilesets/secondary/island_harbor/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_IslandHarbor:: @ 838F1D4
+gTilesetPalettes_IslandHarbor::
 	.incbin "data/tilesets/secondary/island_harbor/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/island_harbor/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/island_harbor/palettes/02.gbapal"
@@ -1593,11 +1593,11 @@ gTilesetPalettes_IslandHarbor:: @ 838F1D4
 	.incbin "data/tilesets/secondary/island_harbor/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_TrainerHill:: @ 838F3D4
+gTilesetTiles_TrainerHill::
 	.incbin "data/tilesets/secondary/trainer_hill/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_TrainerHill:: @ 83904C4
+gTilesetPalettes_TrainerHill::
 	.incbin "data/tilesets/secondary/trainer_hill/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/trainer_hill/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/trainer_hill/palettes/02.gbapal"
@@ -1616,11 +1616,11 @@ gTilesetPalettes_TrainerHill:: @ 83904C4
 	.incbin "data/tilesets/secondary/trainer_hill/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_NavelRock:: @ 83906C4
+gTilesetTiles_NavelRock::
 	.incbin "data/tilesets/secondary/navel_rock/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_NavelRock:: @ 8392258
+gTilesetPalettes_NavelRock::
 	.incbin "data/tilesets/secondary/navel_rock/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/navel_rock/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/navel_rock/palettes/02.gbapal"
@@ -1639,11 +1639,11 @@ gTilesetPalettes_NavelRock:: @ 8392258
 	.incbin "data/tilesets/secondary/navel_rock/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_BattleFrontierRankingHall:: @ 8392458
+gTilesetTiles_BattleFrontierRankingHall::
 	.incbin "data/tilesets/secondary/battle_frontier_ranking_hall/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_BattleFrontierRankingHall:: @ 8392CAC
+gTilesetPalettes_BattleFrontierRankingHall::
 	.incbin "data/tilesets/secondary/battle_frontier_ranking_hall/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/battle_frontier_ranking_hall/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/battle_frontier_ranking_hall/palettes/02.gbapal"
@@ -1662,11 +1662,11 @@ gTilesetPalettes_BattleFrontierRankingHall:: @ 8392CAC
 	.incbin "data/tilesets/secondary/battle_frontier_ranking_hall/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_BattleTent:: @ 8392EAC
+gTilesetTiles_BattleTent::
 	.incbin "data/tilesets/secondary/battle_tent/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_BattleTent:: @ 8393910
+gTilesetPalettes_BattleTent::
 	.incbin "data/tilesets/secondary/battle_tent/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/battle_tent/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/battle_tent/palettes/02.gbapal"
@@ -1685,11 +1685,11 @@ gTilesetPalettes_BattleTent:: @ 8393910
 	.incbin "data/tilesets/secondary/battle_tent/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_MysteryEventsHouse:: @ 8393B10
+gTilesetTiles_MysteryEventsHouse::
 	.incbin "data/tilesets/secondary/mystery_events_house/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_MysteryEventsHouse:: @ 8395478
+gTilesetPalettes_MysteryEventsHouse::
 	.incbin "data/tilesets/secondary/mystery_events_house/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/mystery_events_house/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/mystery_events_house/palettes/02.gbapal"
@@ -1708,7 +1708,7 @@ gTilesetPalettes_MysteryEventsHouse:: @ 8395478
 	.incbin "data/tilesets/secondary/mystery_events_house/palettes/15.gbapal"
 
 	.align 2
-gTilesetPalettes_UnionRoom:: @ 8395678
+gTilesetPalettes_UnionRoom::
 	.incbin "data/tilesets/secondary/union_room/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/union_room/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/union_room/palettes/02.gbapal"
@@ -1727,5 +1727,5 @@ gTilesetPalettes_UnionRoom:: @ 8395678
 	.incbin "data/tilesets/secondary/union_room/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_UnionRoom:: @ 8395878
+gTilesetTiles_UnionRoom::
 	.incbin "data/tilesets/secondary/union_room/tiles.4bpp.lz"