Remove address comments

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"

data/tilesets/headers.inc

@@ -1,5 +1,5 @@
 	.align 2
-gTileset_General:: @ 83DF704
+gTileset_General::
 	.byte TRUE @ is compressed
 	.byte FALSE @ is secondary tileset
 	.2byte 0 @ padding
@@ -10,7 +10,7 @@ gTileset_General:: @ 83DF704
 	.4byte InitTilesetAnim_General
 
 	.align 2
-gTileset_Petalburg:: @ 83DF71C
+gTileset_Petalburg::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -21,7 +21,7 @@ gTileset_Petalburg:: @ 83DF71C
 	.4byte InitTilesetAnim_Petalburg
 
 	.align 2
-gTileset_Rustboro:: @ 83DF734
+gTileset_Rustboro::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -32,7 +32,7 @@ gTileset_Rustboro:: @ 83DF734
 	.4byte InitTilesetAnim_Rustboro
 
 	.align 2
-gTileset_Dewford:: @ 83DF74C
+gTileset_Dewford::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -43,7 +43,7 @@ gTileset_Dewford:: @ 83DF74C
 	.4byte InitTilesetAnim_Dewford
 
 	.align 2
-gTileset_Slateport:: @ 83DF764
+gTileset_Slateport::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -54,7 +54,7 @@ gTileset_Slateport:: @ 83DF764
 	.4byte InitTilesetAnim_Slateport
 
 	.align 2
-gTileset_Mauville:: @ 83DF77C
+gTileset_Mauville::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -65,7 +65,7 @@ gTileset_Mauville:: @ 83DF77C
 	.4byte InitTilesetAnim_Mauville
 
 	.align 2
-gTileset_Lavaridge:: @ 83DF794
+gTileset_Lavaridge::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -76,7 +76,7 @@ gTileset_Lavaridge:: @ 83DF794
 	.4byte InitTilesetAnim_Lavaridge
 
 	.align 2
-gTileset_Fallarbor:: @ 83DF7AC
+gTileset_Fallarbor::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -87,7 +87,7 @@ gTileset_Fallarbor:: @ 83DF7AC
 	.4byte InitTilesetAnim_Fallarbor
 
 	.align 2
-gTileset_Fortree:: @ 83DF7C4
+gTileset_Fortree::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -98,7 +98,7 @@ gTileset_Fortree:: @ 83DF7C4
 	.4byte InitTilesetAnim_Fortree
 
 	.align 2
-gTileset_Lilycove:: @ 83DF7DC
+gTileset_Lilycove::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -109,7 +109,7 @@ gTileset_Lilycove:: @ 83DF7DC
 	.4byte InitTilesetAnim_Lilycove
 
 	.align 2
-gTileset_Mossdeep:: @ 83DF7F4
+gTileset_Mossdeep::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -120,7 +120,7 @@ gTileset_Mossdeep:: @ 83DF7F4
 	.4byte InitTilesetAnim_Mossdeep
 
 	.align 2
-gTileset_EverGrande:: @ 83DF80C
+gTileset_EverGrande::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -131,7 +131,7 @@ gTileset_EverGrande:: @ 83DF80C
 	.4byte InitTilesetAnim_EverGrande
 
 	.align 2
-gTileset_Pacifidlog:: @ 83DF824
+gTileset_Pacifidlog::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -142,7 +142,7 @@ gTileset_Pacifidlog:: @ 83DF824
 	.4byte InitTilesetAnim_Pacifidlog
 
 	.align 2
-gTileset_Sootopolis:: @ 83DF83C
+gTileset_Sootopolis::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -153,7 +153,7 @@ gTileset_Sootopolis:: @ 83DF83C
 	.4byte InitTilesetAnim_Sootopolis
 
 	.align 2
-gTileset_BattleFrontierOutsideWest:: @ 83DF854
+gTileset_BattleFrontierOutsideWest::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -164,7 +164,7 @@ gTileset_BattleFrontierOutsideWest:: @ 83DF854
 	.4byte InitTilesetAnim_BattleFrontierOutsideWest
 
 	.align 2
-gTileset_BattleFrontierOutsideEast:: @ 83DF86C
+gTileset_BattleFrontierOutsideEast::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -175,7 +175,7 @@ gTileset_BattleFrontierOutsideEast:: @ 83DF86C
 	.4byte InitTilesetAnim_BattleFrontierOutsideEast
 
 	.align 2
-gTileset_Building:: @ 83DF884
+gTileset_Building::
 	.byte TRUE @ is compressed
 	.byte FALSE @ is secondary tileset
 	.2byte 0 @ padding
@@ -186,7 +186,7 @@ gTileset_Building:: @ 83DF884
 	.4byte InitTilesetAnim_Building
 
 	.align 2
-gTileset_Shop:: @ 83DF89C
+gTileset_Shop::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -197,7 +197,7 @@ gTileset_Shop:: @ 83DF89C
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_PokemonCenter:: @ 83DF8B4
+gTileset_PokemonCenter::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -208,7 +208,7 @@ gTileset_PokemonCenter:: @ 83DF8B4
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_Cave:: @ 83DF8CC
+gTileset_Cave::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -219,7 +219,7 @@ gTileset_Cave:: @ 83DF8CC
 	.4byte InitTilesetAnim_Cave
 
 	.align 2
-gTileset_PokemonSchool:: @ 83DF8E4
+gTileset_PokemonSchool::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -230,7 +230,7 @@ gTileset_PokemonSchool:: @ 83DF8E4
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_PokemonFanClub:: @ 83DF8FC
+gTileset_PokemonFanClub::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -241,7 +241,7 @@ gTileset_PokemonFanClub:: @ 83DF8FC
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_Unused1:: @ 83DF914
+gTileset_Unused1::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -252,7 +252,7 @@ gTileset_Unused1:: @ 83DF914
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_MeteorFalls:: @ 83DF92C
+gTileset_MeteorFalls::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -263,7 +263,7 @@ gTileset_MeteorFalls:: @ 83DF92C
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_OceanicMuseum:: @ 83DF944
+gTileset_OceanicMuseum::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -274,7 +274,7 @@ gTileset_OceanicMuseum:: @ 83DF944
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_CableClub:: @ 83DF95C
+gTileset_CableClub::
 	.byte FALSE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -285,7 +285,7 @@ gTileset_CableClub:: @ 83DF95C
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_SeashoreHouse:: @ 83DF974
+gTileset_SeashoreHouse::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -296,7 +296,7 @@ gTileset_SeashoreHouse:: @ 83DF974
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_PrettyPetalFlowerShop:: @ 83DF98C
+gTileset_PrettyPetalFlowerShop::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -307,7 +307,7 @@ gTileset_PrettyPetalFlowerShop:: @ 83DF98C
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_PokemonDayCare:: @ 83DF9A4
+gTileset_PokemonDayCare::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -318,7 +318,7 @@ gTileset_PokemonDayCare:: @ 83DF9A4
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_Facility:: @ 83DF9BC
+gTileset_Facility::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -329,7 +329,7 @@ gTileset_Facility:: @ 83DF9BC
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_BikeShop:: @ 83DF9D4
+gTileset_BikeShop::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -340,7 +340,7 @@ gTileset_BikeShop:: @ 83DF9D4
 	.4byte InitTilesetAnim_BikeShop
 
 	.align 2
-gTileset_RusturfTunnel:: @ 83DF9EC
+gTileset_RusturfTunnel::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -351,7 +351,7 @@ gTileset_RusturfTunnel:: @ 83DF9EC
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_SecretBaseBrownCave:: @ 83DFA04
+gTileset_SecretBaseBrownCave::
 	.byte FALSE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -362,7 +362,7 @@ gTileset_SecretBaseBrownCave:: @ 83DFA04
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_SecretBaseTree:: @ 83DFA1C
+gTileset_SecretBaseTree::
 	.byte FALSE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -373,7 +373,7 @@ gTileset_SecretBaseTree:: @ 83DFA1C
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_SecretBaseShrub:: @ 83DFA34
+gTileset_SecretBaseShrub::
 	.byte FALSE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -384,7 +384,7 @@ gTileset_SecretBaseShrub:: @ 83DFA34
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_SecretBaseBlueCave:: @ 83DFA4C
+gTileset_SecretBaseBlueCave::
 	.byte FALSE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -395,7 +395,7 @@ gTileset_SecretBaseBlueCave:: @ 83DFA4C
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_SecretBaseYellowCave:: @ 83DFA64
+gTileset_SecretBaseYellowCave::
 	.byte FALSE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -406,7 +406,7 @@ gTileset_SecretBaseYellowCave:: @ 83DFA64
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_SecretBaseRedCave:: @ 83DFA7C
+gTileset_SecretBaseRedCave::
 	.byte FALSE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -417,7 +417,7 @@ gTileset_SecretBaseRedCave:: @ 83DFA7C
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_InsideOfTruck:: @ 83DFA94
+gTileset_InsideOfTruck::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -428,7 +428,7 @@ gTileset_InsideOfTruck:: @ 83DFA94
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_Unused2:: @ 83DFAAC
+gTileset_Unused2::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -439,7 +439,7 @@ gTileset_Unused2:: @ 83DFAAC
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_Contest:: @ 83DFAC4
+gTileset_Contest::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -450,7 +450,7 @@ gTileset_Contest:: @ 83DFAC4
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_LilycoveMuseum:: @ 83DFADC
+gTileset_LilycoveMuseum::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -461,7 +461,7 @@ gTileset_LilycoveMuseum:: @ 83DFADC
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_BrendansMaysHouse:: @ 83DFAF4
+gTileset_BrendansMaysHouse::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -472,7 +472,7 @@ gTileset_BrendansMaysHouse:: @ 83DFAF4
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_Lab:: @ 83DFB0C
+gTileset_Lab::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -483,7 +483,7 @@ gTileset_Lab:: @ 83DFB0C
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_Underwater:: @ 83DFB24
+gTileset_Underwater::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -494,7 +494,7 @@ gTileset_Underwater:: @ 83DFB24
 	.4byte InitTilesetAnim_Underwater
 
 	.align 2
-gTileset_PetalburgGym:: @ 83DFB3C
+gTileset_PetalburgGym::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -505,7 +505,7 @@ gTileset_PetalburgGym:: @ 83DFB3C
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_SootopolisGym:: @ 83DFB54
+gTileset_SootopolisGym::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -516,7 +516,7 @@ gTileset_SootopolisGym:: @ 83DFB54
 	.4byte InitTilesetAnim_SootopolisGym
 
 	.align 2
-gTileset_GenericBuilding:: @ 83DFB6C
+gTileset_GenericBuilding::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -527,7 +527,7 @@ gTileset_GenericBuilding:: @ 83DFB6C
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_MauvilleGameCorner:: @ 83DFB84
+gTileset_MauvilleGameCorner::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -538,7 +538,7 @@ gTileset_MauvilleGameCorner:: @ 83DFB84
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_RustboroGym:: @ 83DFB9C
+gTileset_RustboroGym::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -549,7 +549,7 @@ gTileset_RustboroGym:: @ 83DFB9C
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_DewfordGym:: @ 83DFBB4
+gTileset_DewfordGym::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -560,7 +560,7 @@ gTileset_DewfordGym:: @ 83DFBB4
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_MauvilleGym:: @ 83DFBCC
+gTileset_MauvilleGym::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -571,7 +571,7 @@ gTileset_MauvilleGym:: @ 83DFBCC
 	.4byte InitTilesetAnim_MauvilleGym
 
 	.align 2
-gTileset_LavaridgeGym:: @ 83DFBE4
+gTileset_LavaridgeGym::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -582,7 +582,7 @@ gTileset_LavaridgeGym:: @ 83DFBE4
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_TrickHousePuzzle:: @ 83DFBFC
+gTileset_TrickHousePuzzle::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -593,7 +593,7 @@ gTileset_TrickHousePuzzle:: @ 83DFBFC
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_FortreeGym:: @ 83DFC14
+gTileset_FortreeGym::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -604,7 +604,7 @@ gTileset_FortreeGym:: @ 83DFC14
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_MossdeepGym:: @ 83DFC2C
+gTileset_MossdeepGym::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -615,7 +615,7 @@ gTileset_MossdeepGym:: @ 83DFC2C
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_InsideShip:: @ 83DFC44
+gTileset_InsideShip::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -626,7 +626,7 @@ gTileset_InsideShip:: @ 83DFC44
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_SecretBase:: @ 83DFC5C
+gTileset_SecretBase::
 	.byte FALSE @ is compressed
 	.byte FALSE @ is secondary tileset
 	.2byte 0 @ padding
@@ -637,15 +637,15 @@ gTileset_SecretBase:: @ 83DFC5C
 	.4byte NULL @ animation callback
 
 	.align 2
-gTilesetPointer_SecretBase:: @ 83DFC74
+gTilesetPointer_SecretBase::
 	.4byte gTileset_SecretBase
 
 	.align 2
-gTilesetPointer_SecretBaseRedCave:: @ 83DFC78
+gTilesetPointer_SecretBaseRedCave::
 	.4byte gTileset_SecretBaseRedCave
 
 	.align 2
-gTileset_EliteFour:: @ 83DFC7C
+gTileset_EliteFour::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -656,7 +656,7 @@ gTileset_EliteFour:: @ 83DFC7C
 	.4byte InitTilesetAnim_EliteFour
 
 	.align 2
-gTileset_BattleFrontier:: @ 83DFC94
+gTileset_BattleFrontier::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -667,7 +667,7 @@ gTileset_BattleFrontier:: @ 83DFC94
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_BattlePalace:: @ 83DFCAC
+gTileset_BattlePalace::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -678,7 +678,7 @@ gTileset_BattlePalace:: @ 83DFCAC
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_BattleDome:: @ 83DFCC4
+gTileset_BattleDome::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -689,7 +689,7 @@ gTileset_BattleDome:: @ 83DFCC4
 	.4byte InitTilesetAnim_BattleDome
 
 	.align 2
-gTileset_BattleFactory:: @ 83DFCDC
+gTileset_BattleFactory::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -700,7 +700,7 @@ gTileset_BattleFactory:: @ 83DFCDC
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_BattlePike:: @ 83DFCF4
+gTileset_BattlePike::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -711,7 +711,7 @@ gTileset_BattlePike:: @ 83DFCF4
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_BattleArena:: @ 83DFD0C
+gTileset_BattleArena::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -722,7 +722,7 @@ gTileset_BattleArena:: @ 83DFD0C
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_BattlePyramid:: @ 83DFD24
+gTileset_BattlePyramid::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -733,7 +733,7 @@ gTileset_BattlePyramid:: @ 83DFD24
 	.4byte InitTilesetAnim_BattlePyramid
 
 	.align 2
-gTileset_MirageTower:: @ 83DFD3C
+gTileset_MirageTower::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -744,7 +744,7 @@ gTileset_MirageTower:: @ 83DFD3C
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_MossdeepGameCorner:: @ 83DFD54
+gTileset_MossdeepGameCorner::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -755,7 +755,7 @@ gTileset_MossdeepGameCorner:: @ 83DFD54
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_IslandHarbor:: @ 83DFD6C
+gTileset_IslandHarbor::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -766,7 +766,7 @@ gTileset_IslandHarbor:: @ 83DFD6C
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_TrainerHill:: @ 83DFD84
+gTileset_TrainerHill::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -777,7 +777,7 @@ gTileset_TrainerHill:: @ 83DFD84
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_NavelRock:: @ 83DFD9C
+gTileset_NavelRock::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -788,7 +788,7 @@ gTileset_NavelRock:: @ 83DFD9C
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_BattleFrontierRankingHall:: @ 83DFDB4
+gTileset_BattleFrontierRankingHall::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -799,7 +799,7 @@ gTileset_BattleFrontierRankingHall:: @ 83DFDB4
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_BattleTent:: @ 83DFDCC
+gTileset_BattleTent::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -810,7 +810,7 @@ gTileset_BattleTent:: @ 83DFDCC
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_MysteryEventsHouse:: @ 83DFDE4
+gTileset_MysteryEventsHouse::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -821,7 +821,7 @@ gTileset_MysteryEventsHouse:: @ 83DFDE4
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_UnionRoom:: @ 83DFDFC
+gTileset_UnionRoom::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding

data/tilesets/metatiles.inc

@@ -1,559 +1,559 @@
 	.align 1
-gMetatiles_General:: @ 83960F0
+gMetatiles_General::
 	.incbin "data/tilesets/primary/general/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_General:: @ 83980F0
+gMetatileAttributes_General::
 	.incbin "data/tilesets/primary/general/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_Petalburg:: @ 83984F0
+gMetatiles_Petalburg::
 	.incbin "data/tilesets/secondary/petalburg/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_Petalburg:: @ 8398DF0
+gMetatileAttributes_Petalburg::
 	.incbin "data/tilesets/secondary/petalburg/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_Rustboro:: @ 8398F10
+gMetatiles_Rustboro::
 	.incbin "data/tilesets/secondary/rustboro/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_Rustboro:: @ 839A4F0
+gMetatileAttributes_Rustboro::
 	.incbin "data/tilesets/secondary/rustboro/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_Dewford:: @ 839A7AC
+gMetatiles_Dewford::
 	.incbin "data/tilesets/secondary/dewford/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_Dewford:: @ 839BF5C
+gMetatileAttributes_Dewford::
 	.incbin "data/tilesets/secondary/dewford/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_Slateport:: @ 839C252
+gMetatiles_Slateport::
 	.incbin "data/tilesets/secondary/slateport/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_Slateport:: @ 839DBB2
+gMetatileAttributes_Slateport::
 	.incbin "data/tilesets/secondary/slateport/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_Mauville:: @ 839DEDE
+gMetatiles_Mauville::
 	.incbin "data/tilesets/secondary/mauville/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_Mauville:: @ 839FEBE
+gMetatileAttributes_Mauville::
 	.incbin "data/tilesets/secondary/mauville/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_Lavaridge:: @ 83A02BA
+gMetatiles_Lavaridge::
 	.incbin "data/tilesets/secondary/lavaridge/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_Lavaridge:: @ 83A1E4A
+gMetatileAttributes_Lavaridge::
 	.incbin "data/tilesets/secondary/lavaridge/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_Fallarbor:: @ 83A21BC
+gMetatiles_Fallarbor::
 	.incbin "data/tilesets/secondary/fallarbor/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_Fallarbor:: @ 83A38AC
+gMetatileAttributes_Fallarbor::
 	.incbin "data/tilesets/secondary/fallarbor/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_Fortree:: @ 83A3B8A
+gMetatiles_Fortree::
 	.incbin "data/tilesets/secondary/fortree/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_Fortree:: @ 83A4D0A
+gMetatileAttributes_Fortree::
 	.incbin "data/tilesets/secondary/fortree/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_Lilycove:: @ 83A4F3A
+gMetatiles_Lilycove::
 	.incbin "data/tilesets/secondary/lilycove/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_Lilycove:: @ 83A652A
+gMetatileAttributes_Lilycove::
 	.incbin "data/tilesets/secondary/lilycove/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_Mossdeep:: @ 83A67E8
+gMetatiles_Mossdeep::
 	.incbin "data/tilesets/secondary/mossdeep/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_Mossdeep:: @ 83A8448
+gMetatileAttributes_Mossdeep::
 	.incbin "data/tilesets/secondary/mossdeep/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_EverGrande:: @ 83A87D4
+gMetatiles_EverGrande::
 	.incbin "data/tilesets/secondary/ever_grande/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_EverGrande:: @ 83A9254
+gMetatileAttributes_EverGrande::
 	.incbin "data/tilesets/secondary/ever_grande/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_Pacifidlog:: @ 83A93A4
+gMetatiles_Pacifidlog::
 	.incbin "data/tilesets/secondary/pacifidlog/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_Pacifidlog:: @ 83AA054
+gMetatileAttributes_Pacifidlog::
 	.incbin "data/tilesets/secondary/pacifidlog/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_Sootopolis:: @ 83AA1EA
+gMetatiles_Sootopolis::
 	.incbin "data/tilesets/secondary/sootopolis/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_Sootopolis:: @ 83AB1CA
+gMetatileAttributes_Sootopolis::
 	.incbin "data/tilesets/secondary/sootopolis/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_BattleFrontierOutsideWest:: @ 83AB3C6
+gMetatiles_BattleFrontierOutsideWest::
 	.incbin "data/tilesets/secondary/battle_frontier_outside_west/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_BattleFrontierOutsideWest:: @ 83AD3A6
+gMetatileAttributes_BattleFrontierOutsideWest::
 	.incbin "data/tilesets/secondary/battle_frontier_outside_west/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_BattleFrontierOutsideEast:: @ 83AD7A2
+gMetatiles_BattleFrontierOutsideEast::
 	.incbin "data/tilesets/secondary/battle_frontier_outside_east/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_BattleFrontierOutsideEast:: @ 83AF782
+gMetatileAttributes_BattleFrontierOutsideEast::
 	.incbin "data/tilesets/secondary/battle_frontier_outside_east/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_InsideBuilding:: @ 83AFB7E
+gMetatiles_InsideBuilding::
 	.incbin "data/tilesets/primary/building/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_InsideBuilding:: @ 83AFBFE
+gMetatileAttributes_InsideBuilding::
 	.incbin "data/tilesets/primary/building/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_Shop:: @ 83AFC0E
+gMetatiles_Shop::
 	.incbin "data/tilesets/secondary/shop/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_Shop:: @ 83B0E1E
+gMetatileAttributes_Shop::
 	.incbin "data/tilesets/secondary/shop/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_PokemonCenter:: @ 83B1060
+gMetatiles_PokemonCenter::
 	.incbin "data/tilesets/secondary/pokemon_center/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_PokemonCenter:: @ 83B1EE0
+gMetatileAttributes_PokemonCenter::
 	.incbin "data/tilesets/secondary/pokemon_center/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_Cave:: @ 83B20B0
+gMetatiles_Cave::
 	.incbin "data/tilesets/secondary/cave/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_Cave:: @ 83B3A90
+gMetatileAttributes_Cave::
 	.incbin "data/tilesets/secondary/cave/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_PokemonSchool:: @ 83B3DCC
+gMetatiles_PokemonSchool::
 	.incbin "data/tilesets/secondary/pokemon_school/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_PokemonSchool:: @ 83B416C
+gMetatileAttributes_PokemonSchool::
 	.incbin "data/tilesets/secondary/pokemon_school/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_PokemonFanClub:: @ 83B41E0
+gMetatiles_PokemonFanClub::
 	.incbin "data/tilesets/secondary/pokemon_fan_club/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_PokemonFanClub:: @ 83B4860
+gMetatileAttributes_PokemonFanClub::
 	.incbin "data/tilesets/secondary/pokemon_fan_club/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_Unused1:: @ 83B4930
+gMetatiles_Unused1::
 	.incbin "data/tilesets/secondary/unused_1/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_Unused1:: @ 83B4950
+gMetatileAttributes_Unused1::
 	.incbin "data/tilesets/secondary/unused_1/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_MeteorFalls:: @ 83B4954
+gMetatiles_MeteorFalls::
 	.incbin "data/tilesets/secondary/meteor_falls/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_MeteorFalls:: @ 83B5344
+gMetatileAttributes_MeteorFalls::
 	.incbin "data/tilesets/secondary/meteor_falls/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_OceanicMuseum:: @ 83B5482
+gMetatiles_OceanicMuseum::
 	.incbin "data/tilesets/secondary/oceanic_museum/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_OceanicMuseum:: @ 83B5C22
+gMetatileAttributes_OceanicMuseum::
 	.incbin "data/tilesets/secondary/oceanic_museum/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_CableClub:: @ 83B5D16
+gMetatiles_CableClub::
 	.incbin "data/tilesets/secondary/cable_club/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_CableClub:: @ 83B6D16
+gMetatileAttributes_CableClub::
 	.incbin "data/tilesets/secondary/cable_club/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_SeashoreHouse:: @ 83B6F16
+gMetatiles_SeashoreHouse::
 	.incbin "data/tilesets/secondary/seashore_house/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_SeashoreHouse:: @ 83B7296
+gMetatileAttributes_SeashoreHouse::
 	.incbin "data/tilesets/secondary/seashore_house/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_PrettyPetalFlowerShop:: @ 83B7306
+gMetatiles_PrettyPetalFlowerShop::
 	.incbin "data/tilesets/secondary/pretty_petal_flower_shop/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_PrettyPetalFlowerShop:: @ 83B7786
+gMetatileAttributes_PrettyPetalFlowerShop::
 	.incbin "data/tilesets/secondary/pretty_petal_flower_shop/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_PokemonDayCare:: @ 83B7816
+gMetatiles_PokemonDayCare::
 	.incbin "data/tilesets/secondary/pokemon_day_care/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_PokemonDayCare:: @ 83B7C56
+gMetatileAttributes_PokemonDayCare::
 	.incbin "data/tilesets/secondary/pokemon_day_care/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_Facility:: @ 83B7CDE
+gMetatiles_Facility::
 	.incbin "data/tilesets/secondary/facility/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_Facility:: @ 83B9CCE
+gMetatileAttributes_Facility::
 	.incbin "data/tilesets/secondary/facility/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_BikeShop:: @ 83BA0CC
+gMetatiles_BikeShop::
 	.incbin "data/tilesets/secondary/bike_shop/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_BikeShop:: @ 83BB04C
+gMetatileAttributes_BikeShop::
 	.incbin "data/tilesets/secondary/bike_shop/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_RusturfTunnel:: @ 83BB23C
+gMetatiles_RusturfTunnel::
 	.incbin "data/tilesets/secondary/rusturf_tunnel/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_RusturfTunnel:: @ 83BB76C
+gMetatileAttributes_RusturfTunnel::
 	.incbin "data/tilesets/secondary/rusturf_tunnel/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_SecretBaseSecondary:: @ 83BB812
+gMetatiles_SecretBaseSecondary::
 	.incbin "data/tilesets/secondary/secret_base/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_SecretBaseSecondary:: @ 83BCC52
+gMetatileAttributes_SecretBaseSecondary::
 	.incbin "data/tilesets/secondary/secret_base/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_InsideOfTruck:: @ 83BCEDA
+gMetatiles_InsideOfTruck::
 	.incbin "data/tilesets/secondary/inside_of_truck/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_InsideOfTruck:: @ 83BD13A
+gMetatileAttributes_InsideOfTruck::
 	.incbin "data/tilesets/secondary/inside_of_truck/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_Contest:: @ 83BD186
+gMetatiles_Contest::
 	.incbin "data/tilesets/secondary/contest/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_Contest:: @ 83BE016
+gMetatileAttributes_Contest::
 	.incbin "data/tilesets/secondary/contest/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_LilycoveMuseum:: @ 83BE1E8
+gMetatiles_LilycoveMuseum::
 	.incbin "data/tilesets/secondary/lilycove_museum/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_LilycoveMuseum:: @ 83BEAD8
+gMetatileAttributes_LilycoveMuseum::
 	.incbin "data/tilesets/secondary/lilycove_museum/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_BrendansMaysHouse:: @ 83BEBF6
+gMetatiles_BrendansMaysHouse::
 	.incbin "data/tilesets/secondary/brendans_mays_house/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_BrendansMaysHouse:: @ 83BF836
+gMetatileAttributes_BrendansMaysHouse::
 	.incbin "data/tilesets/secondary/brendans_mays_house/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_Lab:: @ 83BF9BE
+gMetatiles_Lab::
 	.incbin "data/tilesets/secondary/lab/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_Lab:: @ 83C039E
+gMetatileAttributes_Lab::
 	.incbin "data/tilesets/secondary/lab/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_Underwater:: @ 83C04DA
+gMetatiles_Underwater::
 	.incbin "data/tilesets/secondary/underwater/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_Underwater:: @ 83C139A
+gMetatileAttributes_Underwater::
 	.incbin "data/tilesets/secondary/underwater/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_GenericBuilding:: @ 83C1572
+gMetatiles_GenericBuilding::
 	.incbin "data/tilesets/secondary/generic_building/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_GenericBuilding:: @ 83C3572
+gMetatileAttributes_GenericBuilding::
 	.incbin "data/tilesets/secondary/generic_building/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_MauvilleGameCorner:: @ 83C3972
+gMetatiles_MauvilleGameCorner::
 	.incbin "data/tilesets/secondary/mauville_game_corner/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_MauvilleGameCorner:: @ 83C3F72
+gMetatileAttributes_MauvilleGameCorner::
 	.incbin "data/tilesets/secondary/mauville_game_corner/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_Unused2:: @ 83C4032
+gMetatiles_Unused2::
 	.incbin "data/tilesets/secondary/unused_2/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_Unused2:: @ 83C43D2
+gMetatileAttributes_Unused2::
 	.incbin "data/tilesets/secondary/unused_2/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_RustboroGym:: @ 83C4446
+gMetatiles_RustboroGym::
 	.incbin "data/tilesets/secondary/rustboro_gym/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_RustboroGym:: @ 83C47C6
+gMetatileAttributes_RustboroGym::
 	.incbin "data/tilesets/secondary/rustboro_gym/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_DewfordGym:: @ 83C4836
+gMetatiles_DewfordGym::
 	.incbin "data/tilesets/secondary/dewford_gym/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_DewfordGym:: @ 83C4C86
+gMetatileAttributes_DewfordGym::
 	.incbin "data/tilesets/secondary/dewford_gym/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_MauvilleGym:: @ 83C4D10
+gMetatiles_MauvilleGym::
 	.incbin "data/tilesets/secondary/mauville_gym/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_MauvilleGym:: @ 83C5460
+gMetatileAttributes_MauvilleGym::
 	.incbin "data/tilesets/secondary/mauville_gym/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_LavaridgeGym:: @ 83C554A
+gMetatiles_LavaridgeGym::
 	.incbin "data/tilesets/secondary/lavaridge_gym/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_LavaridgeGym:: @ 83C591A
+gMetatileAttributes_LavaridgeGym::
 	.incbin "data/tilesets/secondary/lavaridge_gym/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_PetalburgGym:: @ 83C5994
+gMetatiles_PetalburgGym::
 	.incbin "data/tilesets/secondary/petalburg_gym/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_PetalburgGym:: @ 83C6794
+gMetatileAttributes_PetalburgGym::
 	.incbin "data/tilesets/secondary/petalburg_gym/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_FortreeGym:: @ 83C6954
+gMetatiles_FortreeGym::
 	.incbin "data/tilesets/secondary/fortree_gym/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_FortreeGym:: @ 83C6E54
+gMetatileAttributes_FortreeGym::
 	.incbin "data/tilesets/secondary/fortree_gym/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_MossdeepGym:: @ 83C6EF4
+gMetatiles_MossdeepGym::
 	.incbin "data/tilesets/secondary/mossdeep_gym/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_MossdeepGym:: @ 83C7644
+gMetatileAttributes_MossdeepGym::
 	.incbin "data/tilesets/secondary/mossdeep_gym/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_SootopolisGym:: @ 83C772E
+gMetatiles_SootopolisGym::
 	.incbin "data/tilesets/secondary/sootopolis_gym/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_SootopolisGym:: @ 83C7ECE
+gMetatileAttributes_SootopolisGym::
 	.incbin "data/tilesets/secondary/sootopolis_gym/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_TrickHousePuzzle:: @ 83C7FC2
+gMetatiles_TrickHousePuzzle::
 	.incbin "data/tilesets/secondary/trick_house_puzzle/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_TrickHousePuzzle:: @ 83C8B92
+gMetatileAttributes_TrickHousePuzzle::
 	.incbin "data/tilesets/secondary/trick_house_puzzle/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_InsideShip:: @ 83C8D0C
+gMetatiles_InsideShip::
 	.incbin "data/tilesets/secondary/inside_ship/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_InsideShip:: @ 83C9CCC
+gMetatileAttributes_InsideShip::
 	.incbin "data/tilesets/secondary/inside_ship/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_SecretBasePrimary:: @ 83C9EC4
+gMetatiles_SecretBasePrimary::
 	.incbin "data/tilesets/primary/secret_base/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_SecretBasePrimary:: @ 83C9EE4
+gMetatileAttributes_SecretBasePrimary::
 	.incbin "data/tilesets/primary/secret_base/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_EliteFour:: @ 83C9EE8
+gMetatiles_EliteFour::
 	.incbin "data/tilesets/secondary/elite_four/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_EliteFour:: @ 83CB3A8
+gMetatileAttributes_EliteFour::
 	.incbin "data/tilesets/secondary/elite_four/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_BattleFrontier:: @ 83CB640
+gMetatiles_BattleFrontier::
 	.incbin "data/tilesets/secondary/battle_frontier/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_BattleFrontier:: @ 83CD610
+gMetatileAttributes_BattleFrontier::
 	.incbin "data/tilesets/secondary/battle_frontier/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_BattlePalace:: @ 83CDA0A
+gMetatiles_BattlePalace::
 	.incbin "data/tilesets/secondary/battle_palace/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_BattlePalace:: @ 83CE4EA
+gMetatileAttributes_BattlePalace::
 	.incbin "data/tilesets/secondary/battle_palace/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_BattleDome:: @ 83CE646
+gMetatiles_BattleDome::
 	.incbin "data/tilesets/secondary/battle_dome/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_BattleDome:: @ 83D00F6
+gMetatileAttributes_BattleDome::
 	.incbin "data/tilesets/secondary/battle_dome/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_BattleFactory:: @ 83D044C
+gMetatiles_BattleFactory::
 	.incbin "data/tilesets/secondary/battle_factory/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_BattleFactory:: @ 83D1A6C
+gMetatileAttributes_BattleFactory::
 	.incbin "data/tilesets/secondary/battle_factory/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_BattlePike:: @ 83D1D30
+gMetatiles_BattlePike::
 	.incbin "data/tilesets/secondary/battle_pike/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_BattlePike:: @ 83D32E0
+gMetatileAttributes_BattlePike::
 	.incbin "data/tilesets/secondary/battle_pike/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_BattleArena:: @ 83D3596
+gMetatiles_BattleArena::
 	.incbin "data/tilesets/secondary/battle_arena/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_BattleArena:: @ 83D40A6
+gMetatileAttributes_BattleArena::
 	.incbin "data/tilesets/secondary/battle_arena/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_BattlePyramid:: @ 83D4208
+gMetatiles_BattlePyramid::
 	.incbin "data/tilesets/secondary/battle_pyramid/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_BattlePyramid:: @ 83D4FD8
+gMetatileAttributes_BattlePyramid::
 	.incbin "data/tilesets/secondary/battle_pyramid/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_MirageTower:: @ 83D5192
+gMetatiles_MirageTower::
 	.incbin "data/tilesets/secondary/mirage_tower/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_MirageTower:: @ 83D6B72
+gMetatileAttributes_MirageTower::
 	.incbin "data/tilesets/secondary/mirage_tower/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_MossdeepGameCorner:: @ 83D6EAE
+gMetatiles_MossdeepGameCorner::
 	.incbin "data/tilesets/secondary/mossdeep_game_corner/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_MossdeepGameCorner:: @ 83D71FE
+gMetatileAttributes_MossdeepGameCorner::
 	.incbin "data/tilesets/secondary/mossdeep_game_corner/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_IslandHarbor:: @ 83D7268
+gMetatiles_IslandHarbor::
 	.incbin "data/tilesets/secondary/island_harbor/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_IslandHarbor:: @ 83D8FC8
+gMetatileAttributes_IslandHarbor::
 	.incbin "data/tilesets/secondary/island_harbor/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_TrainerHill:: @ 83D9374
+gMetatiles_TrainerHill::
 	.incbin "data/tilesets/secondary/trainer_hill/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_TrainerHill:: @ 83DB1D4
+gMetatileAttributes_TrainerHill::
 	.incbin "data/tilesets/secondary/trainer_hill/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_NavelRock:: @ 83DB5A0
+gMetatiles_NavelRock::
 	.incbin "data/tilesets/secondary/navel_rock/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_NavelRock:: @ 83DD1D0
+gMetatileAttributes_NavelRock::
 	.incbin "data/tilesets/secondary/navel_rock/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_BattleFrontierRankingHall:: @ 83DD556
+gMetatiles_BattleFrontierRankingHall::
 	.incbin "data/tilesets/secondary/battle_frontier_ranking_hall/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_BattleFrontierRankingHall:: @ 83DDB36
+gMetatileAttributes_BattleFrontierRankingHall::
 	.incbin "data/tilesets/secondary/battle_frontier_ranking_hall/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_BattleTent:: @ 83DDBF2
+gMetatiles_BattleTent::
 	.incbin "data/tilesets/secondary/battle_tent/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_BattleTent:: @ 83DECC2
+gMetatileAttributes_BattleTent::
 	.incbin "data/tilesets/secondary/battle_tent/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_MysteryEventsHouse:: @ 83DEEDC
+gMetatiles_MysteryEventsHouse::
 	.incbin "data/tilesets/secondary/mystery_events_house/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_MysteryEventsHouse:: @ 83DF30C
+gMetatileAttributes_MysteryEventsHouse::
 	.incbin "data/tilesets/secondary/mystery_events_house/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_UnionRoom:: @ 83DF392
+gMetatiles_UnionRoom::
 	.incbin "data/tilesets/secondary/union_room/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_UnionRoom:: @ 83DF6A2
+gMetatileAttributes_UnionRoom::
 	.incbin "data/tilesets/secondary/union_room/metatile_attributes.bin"