summaryrefslogtreecommitdiff
path: root/data/graphics/tilesets
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2016-09-03 01:17:20 -0700
committerYamaArashi <shadow962@live.com>2016-09-03 01:17:20 -0700
commita11fe6f83b2983f11b778173b19eddea99b59702 (patch)
tree5521ce34e02152c89cdd89a82fc99836ea258016 /data/graphics/tilesets
parentb12e80fc04666cb305504744fbe37a9a24af02cb (diff)
global labels
Diffstat (limited to 'data/graphics/tilesets')
-rw-r--r--data/graphics/tilesets/metatiles.s280
-rw-r--r--data/graphics/tilesets/tileset_graphics.s296
-rw-r--r--data/graphics/tilesets/tilesets.s154
3 files changed, 365 insertions, 365 deletions
diff --git a/data/graphics/tilesets/metatiles.s b/data/graphics/tilesets/metatiles.s
index 031f7ed0e..329cc3555 100644
--- a/data/graphics/tilesets/metatiles.s
+++ b/data/graphics/tilesets/metatiles.s
@@ -1,699 +1,699 @@
.align 1, 0
-gMetatiles_General: @ 83960F0
+gMetatiles_General:: @ 83960F0
.incbin "base_emerald.gba", 0x3960f0, 0x2000
.align 1, 0
-gMetatileAttributes_General: @ 83980F0
+gMetatileAttributes_General:: @ 83980F0
.incbin "base_emerald.gba", 0x3980f0, 0x400
.align 1, 0
-gMetatiles_Petalburg: @ 83984F0
+gMetatiles_Petalburg:: @ 83984F0
.incbin "base_emerald.gba", 0x3984f0, 0x900
.align 1, 0
-gMetatileAttributes_Petalburg: @ 8398DF0
+gMetatileAttributes_Petalburg:: @ 8398DF0
.incbin "base_emerald.gba", 0x398df0, 0x120
.align 1, 0
-gMetatiles_Rustboro: @ 8398F10
+gMetatiles_Rustboro:: @ 8398F10
.incbin "base_emerald.gba", 0x398f10, 0x15e0
.align 1, 0
-gMetatileAttributes_Rustboro: @ 839A4F0
+gMetatileAttributes_Rustboro:: @ 839A4F0
.incbin "base_emerald.gba", 0x39a4f0, 0x2bc
.align 1, 0
-gMetatiles_Dewford: @ 839A7AC
+gMetatiles_Dewford:: @ 839A7AC
.incbin "base_emerald.gba", 0x39a7ac, 0x17b0
.align 1, 0
-gMetatileAttributes_Dewford: @ 839BF5C
+gMetatileAttributes_Dewford:: @ 839BF5C
.incbin "base_emerald.gba", 0x39bf5c, 0x2f6
.align 1, 0
-gMetatiles_Slateport: @ 839C252
+gMetatiles_Slateport:: @ 839C252
.incbin "base_emerald.gba", 0x39c252, 0x1960
.align 1, 0
-gMetatileAttributes_Slateport: @ 839DBB2
+gMetatileAttributes_Slateport:: @ 839DBB2
.incbin "base_emerald.gba", 0x39dbb2, 0x32c
.align 1, 0
-gMetatiles_Mauville: @ 839DEDE
+gMetatiles_Mauville:: @ 839DEDE
.incbin "base_emerald.gba", 0x39dede, 0x1fe0
.align 1, 0
-gMetatileAttributes_Mauville: @ 839FEBE
+gMetatileAttributes_Mauville:: @ 839FEBE
.incbin "base_emerald.gba", 0x39febe, 0x3fc
.align 1, 0
-gMetatiles_Lavaridge: @ 83A02BA
+gMetatiles_Lavaridge:: @ 83A02BA
.incbin "base_emerald.gba", 0x3a02ba, 0x1b90
.align 1, 0
-gMetatileAttributes_Lavaridge: @ 83A1E4A
+gMetatileAttributes_Lavaridge:: @ 83A1E4A
.incbin "base_emerald.gba", 0x3a1e4a, 0x372
.align 1, 0
-gMetatiles_Fallarbor: @ 83A21BC
+gMetatiles_Fallarbor:: @ 83A21BC
.incbin "base_emerald.gba", 0x3a21bc, 0x16f0
.align 1, 0
-gMetatileAttributes_Fallarbor: @ 83A38AC
+gMetatileAttributes_Fallarbor:: @ 83A38AC
.incbin "base_emerald.gba", 0x3a38ac, 0x2de
.align 1, 0
-gMetatiles_Fortree: @ 83A3B8A
+gMetatiles_Fortree:: @ 83A3B8A
.incbin "base_emerald.gba", 0x3a3b8a, 0x1180
.align 1, 0
-gMetatileAttributes_Fortree: @ 83A4D0A
+gMetatileAttributes_Fortree:: @ 83A4D0A
.incbin "base_emerald.gba", 0x3a4d0a, 0x230
.align 1, 0
-gMetatiles_Lilycove: @ 83A4F3A
+gMetatiles_Lilycove:: @ 83A4F3A
.incbin "base_emerald.gba", 0x3a4f3a, 0x15f0
.align 1, 0
-gMetatileAttributes_Lilycove: @ 83A652A
+gMetatileAttributes_Lilycove:: @ 83A652A
.incbin "base_emerald.gba", 0x3a652a, 0x2be
.align 1, 0
-gMetatiles_Mossdeep: @ 83A67E8
+gMetatiles_Mossdeep:: @ 83A67E8
.incbin "base_emerald.gba", 0x3a67e8, 0x1c60
.align 1, 0
-gMetatileAttributes_Mossdeep: @ 83A8448
+gMetatileAttributes_Mossdeep:: @ 83A8448
.incbin "base_emerald.gba", 0x3a8448, 0x38c
.align 1, 0
-gMetatiles_EverGrande: @ 83A87D4
+gMetatiles_EverGrande:: @ 83A87D4
.incbin "base_emerald.gba", 0x3a87d4, 0xa80
.align 1, 0
-gMetatileAttributes_EverGrande: @ 83A9254
+gMetatileAttributes_EverGrande:: @ 83A9254
.incbin "base_emerald.gba", 0x3a9254, 0x150
.align 1, 0
-gMetatiles_Pacifidlog: @ 83A93A4
+gMetatiles_Pacifidlog:: @ 83A93A4
.incbin "base_emerald.gba", 0x3a93a4, 0xcb0
.align 1, 0
-gMetatileAttributes_Pacifidlog: @ 83AA054
+gMetatileAttributes_Pacifidlog:: @ 83AA054
.incbin "base_emerald.gba", 0x3aa054, 0x196
.align 1, 0
-gMetatiles_Sootopolis: @ 83AA1EA
+gMetatiles_Sootopolis:: @ 83AA1EA
.incbin "base_emerald.gba", 0x3aa1ea, 0xfe0
.align 1, 0
-gMetatileAttributes_Sootopolis: @ 83AB1CA
+gMetatileAttributes_Sootopolis:: @ 83AB1CA
.incbin "base_emerald.gba", 0x3ab1ca, 0x1fc
.align 1, 0
-gMetatiles_BattleFrontierOutsideWest: @ 83AB3C6
+gMetatiles_BattleFrontierOutsideWest:: @ 83AB3C6
.incbin "base_emerald.gba", 0x3ab3c6, 0x1fe0
.align 1, 0
-gMetatileAttributes_BattleFrontierOutsideWest: @ 83AD3A6
+gMetatileAttributes_BattleFrontierOutsideWest:: @ 83AD3A6
.incbin "base_emerald.gba", 0x3ad3a6, 0x3fc
.align 1, 0
-gMetatiles_BattleFrontierOutsideEast: @ 83AD7A2
+gMetatiles_BattleFrontierOutsideEast:: @ 83AD7A2
.incbin "base_emerald.gba", 0x3ad7a2, 0x1fe0
.align 1, 0
-gMetatileAttributes_BattleFrontierOutsideEast: @ 83AF782
+gMetatileAttributes_BattleFrontierOutsideEast:: @ 83AF782
.incbin "base_emerald.gba", 0x3af782, 0x3fc
.align 1, 0
-gMetatiles_InsideBuilding: @ 83AFB7E
+gMetatiles_InsideBuilding:: @ 83AFB7E
.incbin "base_emerald.gba", 0x3afb7e, 0x80
.align 1, 0
-gMetatileAttributes_InsideBuilding: @ 83AFBFE
+gMetatileAttributes_InsideBuilding:: @ 83AFBFE
.incbin "base_emerald.gba", 0x3afbfe, 0x10
.align 1, 0
-gMetatiles_Shop: @ 83AFC0E
+gMetatiles_Shop:: @ 83AFC0E
.incbin "base_emerald.gba", 0x3afc0e, 0x1210
.align 1, 0
-gMetatileAttributes_Shop: @ 83B0E1E
+gMetatileAttributes_Shop:: @ 83B0E1E
.incbin "base_emerald.gba", 0x3b0e1e, 0x242
.align 1, 0
-gMetatiles_PokemonCenter: @ 83B1060
+gMetatiles_PokemonCenter:: @ 83B1060
.incbin "base_emerald.gba", 0x3b1060, 0xe80
.align 1, 0
-gMetatileAttributes_PokemonCenter: @ 83B1EE0
+gMetatileAttributes_PokemonCenter:: @ 83B1EE0
.incbin "base_emerald.gba", 0x3b1ee0, 0x1d0
.align 1, 0
-gMetatiles_Cave: @ 83B20B0
+gMetatiles_Cave:: @ 83B20B0
.incbin "base_emerald.gba", 0x3b20b0, 0x19e0
.align 1, 0
-gMetatileAttributes_Cave: @ 83B3A90
+gMetatileAttributes_Cave:: @ 83B3A90
.incbin "base_emerald.gba", 0x3b3a90, 0x33c
.align 1, 0
-gMetatiles_PokemonSchool: @ 83B3DCC
+gMetatiles_PokemonSchool:: @ 83B3DCC
.incbin "base_emerald.gba", 0x3b3dcc, 0x3a0
.align 1, 0
-gMetatileAttributes_PokemonSchool: @ 83B416C
+gMetatileAttributes_PokemonSchool:: @ 83B416C
.incbin "base_emerald.gba", 0x3b416c, 0x74
.align 1, 0
-gMetatiles_PokemonFanClub: @ 83B41E0
+gMetatiles_PokemonFanClub:: @ 83B41E0
.incbin "base_emerald.gba", 0x3b41e0, 0x680
.align 1, 0
-gMetatileAttributes_PokemonFanClub: @ 83B4860
+gMetatileAttributes_PokemonFanClub:: @ 83B4860
.incbin "base_emerald.gba", 0x3b4860, 0xd0
.align 1, 0
-gMetatiles_Unused1: @ 83B4930
+gMetatiles_Unused1:: @ 83B4930
.incbin "base_emerald.gba", 0x3b4930, 0x20
.align 1, 0
-gMetatileAttributes_Unused1: @ 83B4950
+gMetatileAttributes_Unused1:: @ 83B4950
.incbin "base_emerald.gba", 0x3b4950, 0x4
.align 1, 0
-gMetatiles_MeteorFalls: @ 83B4954
+gMetatiles_MeteorFalls:: @ 83B4954
.incbin "base_emerald.gba", 0x3b4954, 0x9f0
.align 1, 0
-gMetatileAttributes_MeteorFalls: @ 83B5344
+gMetatileAttributes_MeteorFalls:: @ 83B5344
.incbin "base_emerald.gba", 0x3b5344, 0x13e
.align 1, 0
-gMetatiles_OceanicMuseum: @ 83B5482
+gMetatiles_OceanicMuseum:: @ 83B5482
.incbin "base_emerald.gba", 0x3b5482, 0x7a0
.align 1, 0
-gMetatileAttributes_OceanicMuseum: @ 83B5C22
+gMetatileAttributes_OceanicMuseum:: @ 83B5C22
.incbin "base_emerald.gba", 0x3b5c22, 0xf4
.align 1, 0
-gMetatiles_CableClub: @ 83B5D16
+gMetatiles_CableClub:: @ 83B5D16
.incbin "base_emerald.gba", 0x3b5d16, 0x1000
.align 1, 0
-gMetatileAttributes_CableClub: @ 83B6D16
+gMetatileAttributes_CableClub:: @ 83B6D16
.incbin "base_emerald.gba", 0x3b6d16, 0x200
.align 1, 0
-gMetatiles_SeashoreHouse: @ 83B6F16
+gMetatiles_SeashoreHouse:: @ 83B6F16
.incbin "base_emerald.gba", 0x3b6f16, 0x380
.align 1, 0
-gMetatileAttributes_SeashoreHouse: @ 83B7296
+gMetatileAttributes_SeashoreHouse:: @ 83B7296
.incbin "base_emerald.gba", 0x3b7296, 0x70
.align 1, 0
-gMetatiles_PrettyPetalFlowerShop: @ 83B7306
+gMetatiles_PrettyPetalFlowerShop:: @ 83B7306
.incbin "base_emerald.gba", 0x3b7306, 0x480
.align 1, 0
-gMetatileAttributes_PrettyPetalFlowerShop: @ 83B7786
+gMetatileAttributes_PrettyPetalFlowerShop:: @ 83B7786
.incbin "base_emerald.gba", 0x3b7786, 0x90
.align 1, 0
-gMetatiles_PokemonDayCare: @ 83B7816
+gMetatiles_PokemonDayCare:: @ 83B7816
.incbin "base_emerald.gba", 0x3b7816, 0x440
.align 1, 0
-gMetatileAttributes_PokemonDayCare: @ 83B7C56
+gMetatileAttributes_PokemonDayCare:: @ 83B7C56
.incbin "base_emerald.gba", 0x3b7c56, 0x88
.align 1, 0
-gMetatiles_Facility: @ 83B7CDE
+gMetatiles_Facility:: @ 83B7CDE
.incbin "base_emerald.gba", 0x3b7cde, 0x1ff0
.align 1, 0
-gMetatileAttributes_Facility: @ 83B9CCE
+gMetatileAttributes_Facility:: @ 83B9CCE
.incbin "base_emerald.gba", 0x3b9cce, 0x3fe
.align 1, 0
-gMetatiles_BikeShop: @ 83BA0CC
+gMetatiles_BikeShop:: @ 83BA0CC
.incbin "base_emerald.gba", 0x3ba0cc, 0xf80
.align 1, 0
-gMetatileAttributes_BikeShop: @ 83BB04C
+gMetatileAttributes_BikeShop:: @ 83BB04C
.incbin "base_emerald.gba", 0x3bb04c, 0x1f0
.align 1, 0
-gMetatiles_RusturfTunnel: @ 83BB23C
+gMetatiles_RusturfTunnel:: @ 83BB23C
.incbin "base_emerald.gba", 0x3bb23c, 0x530
.align 1, 0
-gMetatileAttributes_RusturfTunnel: @ 83BB76C
+gMetatileAttributes_RusturfTunnel:: @ 83BB76C
.incbin "base_emerald.gba", 0x3bb76c, 0xa6
.align 1, 0
-gMetatiles_SecretBaseSecondary: @ 83BB812
+gMetatiles_SecretBaseSecondary:: @ 83BB812
.incbin "base_emerald.gba", 0x3bb812, 0x1440
.align 1, 0
-gMetatileAttributes_SecretBaseSecondary: @ 83BCC52
+gMetatileAttributes_SecretBaseSecondary:: @ 83BCC52
.incbin "base_emerald.gba", 0x3bcc52, 0x288
.align 1, 0
-gMetatiles_InsideOfTruck: @ 83BCEDA
+gMetatiles_InsideOfTruck:: @ 83BCEDA
.incbin "base_emerald.gba", 0x3bceda, 0x260
.align 1, 0
-gMetatileAttributes_InsideOfTruck: @ 83BD13A
+gMetatileAttributes_InsideOfTruck:: @ 83BD13A
.incbin "base_emerald.gba", 0x3bd13a, 0x4c
.align 1, 0
-gMetatiles_Contest: @ 83BD186
+gMetatiles_Contest:: @ 83BD186
.incbin "base_emerald.gba", 0x3bd186, 0xe90
.align 1, 0
-gMetatileAttributes_Contest: @ 83BE016
+gMetatileAttributes_Contest:: @ 83BE016
.incbin "base_emerald.gba", 0x3be016, 0x1d2
.align 1, 0
-gMetatiles_LilycoveMuseum: @ 83BE1E8
+gMetatiles_LilycoveMuseum:: @ 83BE1E8
.incbin "base_emerald.gba", 0x3be1e8, 0x8f0
.align 1, 0
-gMetatileAttributes_LilycoveMuseum: @ 83BEAD8
+gMetatileAttributes_LilycoveMuseum:: @ 83BEAD8
.incbin "base_emerald.gba", 0x3bead8, 0x11e
.align 1, 0
-gMetatiles_BrendansMaysHouse: @ 83BEBF6
+gMetatiles_BrendansMaysHouse:: @ 83BEBF6
.incbin "base_emerald.gba", 0x3bebf6, 0xc40
.align 1, 0
-gMetatileAttributes_BrendansMaysHouse: @ 83BF836
+gMetatileAttributes_BrendansMaysHouse:: @ 83BF836
.incbin "base_emerald.gba", 0x3bf836, 0x188
.align 1, 0
-gMetatiles_Lab: @ 83BF9BE
+gMetatiles_Lab:: @ 83BF9BE
.incbin "base_emerald.gba", 0x3bf9be, 0x9e0
.align 1, 0
-gMetatileAttributes_Lab: @ 83C039E
+gMetatileAttributes_Lab:: @ 83C039E
.incbin "base_emerald.gba", 0x3c039e, 0x13c
.align 1, 0
-gMetatiles_Underwater: @ 83C04DA
+gMetatiles_Underwater:: @ 83C04DA
.incbin "base_emerald.gba", 0x3c04da, 0xec0
.align 1, 0
-gMetatileAttributes_Underwater: @ 83C139A
+gMetatileAttributes_Underwater:: @ 83C139A
.incbin "base_emerald.gba", 0x3c139a, 0x1d8
.align 1, 0
-gMetatiles_GenericBuilding: @ 83C1572
+gMetatiles_GenericBuilding:: @ 83C1572
.incbin "base_emerald.gba", 0x3c1572, 0x2000
.align 1, 0
-gMetatileAttributes_GenericBuilding: @ 83C3572
+gMetatileAttributes_GenericBuilding:: @ 83C3572
.incbin "base_emerald.gba", 0x3c3572, 0x400
.align 1, 0
-gMetatiles_MauvilleGameCorner: @ 83C3972
+gMetatiles_MauvilleGameCorner:: @ 83C3972
.incbin "base_emerald.gba", 0x3c3972, 0x600
.align 1, 0
-gMetatileAttributes_MauvilleGameCorner: @ 83C3F72
+gMetatileAttributes_MauvilleGameCorner:: @ 83C3F72
.incbin "base_emerald.gba", 0x3c3f72, 0xc0
.align 1, 0
-gMetatiles_Unused2: @ 83C4032
+gMetatiles_Unused2:: @ 83C4032
.incbin "base_emerald.gba", 0x3c4032, 0x3a0
.align 1, 0
-gMetatileAttributes_Unused2: @ 83C43D2
+gMetatileAttributes_Unused2:: @ 83C43D2
.incbin "base_emerald.gba", 0x3c43d2, 0x74
.align 1, 0
-gMetatiles_RustboroGym: @ 83C4446
+gMetatiles_RustboroGym:: @ 83C4446
.incbin "base_emerald.gba", 0x3c4446, 0x380
.align 1, 0
-gMetatileAttributes_RustboroGym: @ 83C47C6
+gMetatileAttributes_RustboroGym:: @ 83C47C6
.incbin "base_emerald.gba", 0x3c47c6, 0x70
.align 1, 0
-gMetatiles_DewfordGym: @ 83C4836
+gMetatiles_DewfordGym:: @ 83C4836
.incbin "base_emerald.gba", 0x3c4836, 0x450
.align 1, 0
-gMetatileAttributes_DewfordGym: @ 83C4C86
+gMetatileAttributes_DewfordGym:: @ 83C4C86
.incbin "base_emerald.gba", 0x3c4c86, 0x8a
.align 1, 0
-gMetatiles_MauvilleGym: @ 83C4D10
+gMetatiles_MauvilleGym:: @ 83C4D10
.incbin "base_emerald.gba", 0x3c4d10, 0x750
.align 1, 0
-gMetatileAttributes_MauvilleGym: @ 83C5460
+gMetatileAttributes_MauvilleGym:: @ 83C5460
.incbin "base_emerald.gba", 0x3c5460, 0xea
.align 1, 0
-gMetatiles_LavaridgeGym: @ 83C554A
+gMetatiles_LavaridgeGym:: @ 83C554A
.incbin "base_emerald.gba", 0x3c554a, 0x3d0
.align 1, 0
-gMetatileAttributes_LavaridgeGym: @ 83C591A
+gMetatileAttributes_LavaridgeGym:: @ 83C591A
.incbin "base_emerald.gba", 0x3c591a, 0x7a
.align 1, 0
-gMetatiles_PetalburgGym: @ 83C5994
+gMetatiles_PetalburgGym:: @ 83C5994
.incbin "base_emerald.gba", 0x3c5994, 0xe00
.align 1, 0
-gMetatileAttributes_PetalburgGym: @ 83C6794
+gMetatileAttributes_PetalburgGym:: @ 83C6794
.incbin "base_emerald.gba", 0x3c6794, 0x1c0
.align 1, 0
-gMetatiles_FortreeGym: @ 83C6954
+gMetatiles_FortreeGym:: @ 83C6954
.incbin "base_emerald.gba", 0x3c6954, 0x500
.align 1, 0
-gMetatileAttributes_FortreeGym: @ 83C6E54
+gMetatileAttributes_FortreeGym:: @ 83C6E54
.incbin "base_emerald.gba", 0x3c6e54, 0xa0
.align 1, 0
-gMetatiles_MossdeepGym: @ 83C6EF4
+gMetatiles_MossdeepGym:: @ 83C6EF4
.incbin "base_emerald.gba", 0x3c6ef4, 0x750
.align 1, 0
-gMetatileAttributes_MossdeepGym: @ 83C7644
+gMetatileAttributes_MossdeepGym:: @ 83C7644
.incbin "base_emerald.gba", 0x3c7644, 0xea
.align 1, 0
-gMetatiles_SootopolisGym: @ 83C772E
+gMetatiles_SootopolisGym:: @ 83C772E
.incbin "base_emerald.gba", 0x3c772e, 0x7a0
.align 1, 0
-gMetatileAttributes_SootopolisGym: @ 83C7ECE
+gMetatileAttributes_SootopolisGym:: @ 83C7ECE
.incbin "base_emerald.gba", 0x3c7ece, 0xf4
.align 1, 0
-gMetatiles_TrickHousePuzzle: @ 83C7FC2
+gMetatiles_TrickHousePuzzle:: @ 83C7FC2
.incbin "base_emerald.gba", 0x3c7fc2, 0xbd0
.align 1, 0
-gMetatileAttributes_TrickHousePuzzle: @ 83C8B92
+gMetatileAttributes_TrickHousePuzzle:: @ 83C8B92
.incbin "base_emerald.gba", 0x3c8b92, 0x17a
.align 1, 0
-gMetatiles_InsideShip: @ 83C8D0C
+gMetatiles_InsideShip:: @ 83C8D0C
.incbin "base_emerald.gba", 0x3c8d0c, 0xfc0
.align 1, 0
-gMetatileAttributes_InsideShip: @ 83C9CCC
+gMetatileAttributes_InsideShip:: @ 83C9CCC
.incbin "base_emerald.gba", 0x3c9ccc, 0x1f8
.align 1, 0
-gMetatiles_SecretBasePrimary: @ 83C9EC4
+gMetatiles_SecretBasePrimary:: @ 83C9EC4
.incbin "base_emerald.gba", 0x3c9ec4, 0x20
.align 1, 0
-gMetatileAttributes_SecretBasePrimary: @ 83C9EE4
+gMetatileAttributes_SecretBasePrimary:: @ 83C9EE4
.incbin "base_emerald.gba", 0x3c9ee4, 0x4
.align 1, 0
-gMetatiles_EliteFour: @ 83C9EE8
+gMetatiles_EliteFour:: @ 83C9EE8
.incbin "base_emerald.gba", 0x3c9ee8, 0x14c0
.align 1, 0
-gMetatileAttributes_EliteFour: @ 83CB3A8
+gMetatileAttributes_EliteFour:: @ 83CB3A8
.incbin "base_emerald.gba", 0x3cb3a8, 0x298
.align 1, 0
-gMetatiles_BattleFrontier: @ 83CB640
+gMetatiles_BattleFrontier:: @ 83CB640
.incbin "base_emerald.gba", 0x3cb640, 0x1fd0
.align 1, 0
-gMetatileAttributes_BattleFrontier: @ 83CD610
+gMetatileAttributes_BattleFrontier:: @ 83CD610
.incbin "base_emerald.gba", 0x3cd610, 0x3fa
.align 1, 0
-gMetatiles_BattlePalace: @ 83CDA0A
+gMetatiles_BattlePalace:: @ 83CDA0A
.incbin "base_emerald.gba", 0x3cda0a, 0xae0
.align 1, 0
-gMetatileAttributes_BattlePalace: @ 83CE4EA
+gMetatileAttributes_BattlePalace:: @ 83CE4EA
.incbin "base_emerald.gba", 0x3ce4ea, 0x15c
.align 1, 0
-gMetatiles_BattleDome: @ 83CE646
+gMetatiles_BattleDome:: @ 83CE646
.incbin "base_emerald.gba", 0x3ce646, 0x1ab0
.align 1, 0
-gMetatileAttributes_BattleDome: @ 83D00F6
+gMetatileAttributes_BattleDome:: @ 83D00F6
.incbin "base_emerald.gba", 0x3d00f6, 0x356
.align 1, 0
-gMetatiles_BattleFactory: @ 83D044C
+gMetatiles_BattleFactory:: @ 83D044C
.incbin "base_emerald.gba", 0x3d044c, 0x1620
.align 1, 0
-gMetatileAttributes_BattleFactory: @ 83D1A6C
+gMetatileAttributes_BattleFactory:: @ 83D1A6C
.incbin "base_emerald.gba", 0x3d1a6c, 0x2c4
.align 1, 0
-gMetatiles_BattlePike: @ 83D1D30
+gMetatiles_BattlePike:: @ 83D1D30
.incbin "base_emerald.gba", 0x3d1d30, 0x15b0
.align 1, 0
-gMetatileAttributes_BattlePike: @ 83D32E0
+gMetatileAttributes_BattlePike:: @ 83D32E0
.incbin "base_emerald.gba", 0x3d32e0, 0x2b6
.align 1, 0
-gMetatiles_BattleArena: @ 83D3596
+gMetatiles_BattleArena:: @ 83D3596
.incbin "base_emerald.gba", 0x3d3596, 0xb10
.align 1, 0
-gMetatileAttributes_BattleArena: @ 83D40A6
+gMetatileAttributes_BattleArena:: @ 83D40A6
.incbin "base_emerald.gba", 0x3d40a6, 0x162
.align 1, 0
-gMetatiles_BattlePyramid: @ 83D4208
+gMetatiles_BattlePyramid:: @ 83D4208
.incbin "base_emerald.gba", 0x3d4208, 0xdd0
.align 1, 0
-gMetatileAttributes_BattlePyramid: @ 83D4FD8
+gMetatileAttributes_BattlePyramid:: @ 83D4FD8
.incbin "base_emerald.gba", 0x3d4fd8, 0x1ba
.align 1, 0
-gMetatiles_MirageTower: @ 83D5192
+gMetatiles_MirageTower:: @ 83D5192
.incbin "base_emerald.gba", 0x3d5192, 0x19e0
.align 1, 0
-gMetatileAttributes_MirageTower: @ 83D6B72
+gMetatileAttributes_MirageTower:: @ 83D6B72
.incbin "base_emerald.gba", 0x3d6b72, 0x33c
.align 1, 0
-gMetatiles_MossdeepGameCorner: @ 83D6EAE
+gMetatiles_MossdeepGameCorner:: @ 83D6EAE
.incbin "base_emerald.gba", 0x3d6eae, 0x350
.align 1, 0
-gMetatileAttributes_MossdeepGameCorner: @ 83D71FE
+gMetatileAttributes_MossdeepGameCorner:: @ 83D71FE
.incbin "base_emerald.gba", 0x3d71fe, 0x6a
.align 1, 0
-gMetatiles_IslandHarbor: @ 83D7268
+gMetatiles_IslandHarbor:: @ 83D7268
.incbin "base_emerald.gba", 0x3d7268, 0x1d60
.align 1, 0
-gMetatileAttributes_IslandHarbor: @ 83D8FC8
+gMetatileAttributes_IslandHarbor:: @ 83D8FC8
.incbin "base_emerald.gba", 0x3d8fc8, 0x3ac
.align 1, 0
-gMetatiles_TrainerHill: @ 83D9374
+gMetatiles_TrainerHill:: @ 83D9374
.incbin "base_emerald.gba", 0x3d9374, 0x1e60
.align 1, 0
-gMetatileAttributes_TrainerHill: @ 83DB1D4
+gMetatileAttributes_TrainerHill:: @ 83DB1D4
.incbin "base_emerald.gba", 0x3db1d4, 0x3cc
.align 1, 0
-gMetatiles_NavelRock: @ 83DB5A0
+gMetatiles_NavelRock:: @ 83DB5A0
.incbin "base_emerald.gba", 0x3db5a0, 0x1c30
.align 1, 0
-gMetatileAttributes_NavelRock: @ 83DD1D0
+gMetatileAttributes_NavelRock:: @ 83DD1D0
.incbin "base_emerald.gba", 0x3dd1d0, 0x386
.align 1, 0
-gMetatiles_BattleFrontierRankingHall: @ 83DD556
+gMetatiles_BattleFrontierRankingHall:: @ 83DD556
.incbin "base_emerald.gba", 0x3dd556, 0x5e0
.align 1, 0
-gMetatileAttributes_BattleFrontierRankingHall: @ 83DDB36
+gMetatileAttributes_BattleFrontierRankingHall:: @ 83DDB36
.incbin "base_emerald.gba", 0x3ddb36, 0xbc
.align 1, 0
-gMetatiles_BattleTent: @ 83DDBF2
+gMetatiles_BattleTent:: @ 83DDBF2
.incbin "base_emerald.gba", 0x3ddbf2, 0x10d0
.align 1, 0
-gMetatileAttributes_BattleTent: @ 83DECC2
+gMetatileAttributes_BattleTent:: @ 83DECC2
.incbin "base_emerald.gba", 0x3decc2, 0x21a
.align 1, 0
-gMetatiles_MysteryEventsHouse: @ 83DEEDC
+gMetatiles_MysteryEventsHouse:: @ 83DEEDC
.incbin "base_emerald.gba", 0x3deedc, 0x430
.align 1, 0
-gMetatileAttributes_MysteryEventsHouse: @ 83DF30C
+gMetatileAttributes_MysteryEventsHouse:: @ 83DF30C
.incbin "base_emerald.gba", 0x3df30c, 0x86
.align 1, 0
-gMetatiles_UnionRoom: @ 83DF392
+gMetatiles_UnionRoom:: @ 83DF392
.incbin "base_emerald.gba", 0x3df392, 0x310
.align 1, 0
-gMetatileAttributes_UnionRoom: @ 83DF6A2
+gMetatileAttributes_UnionRoom:: @ 83DF6A2
.incbin "base_emerald.gba", 0x3df6a2, 0x62
diff --git a/data/graphics/tilesets/tileset_graphics.s b/data/graphics/tilesets/tileset_graphics.s
index 94ce528de..2d6f8f4e6 100644
--- a/data/graphics/tilesets/tileset_graphics.s
+++ b/data/graphics/tilesets/tileset_graphics.s
@@ -1,11 +1,11 @@
.align 2, 0
-gTilesetTiles_Petalburg: @ 8339E08
+gTilesetTiles_Petalburg:: @ 8339E08
.incbin "data/graphics/tilesets/secondary/petalburg/tiles.4bpp.lz"
.align 2, 0
-gTilesetPalettes_Petalburg: @ 833A704
+gTilesetPalettes_Petalburg:: @ 833A704
.incbin "data/graphics/tilesets/secondary/petalburg/palettes/00.gbapal"
.incbin "data/graphics/tilesets/secondary/petalburg/palettes/01.gbapal"
.incbin "data/graphics/tilesets/secondary/petalburg/palettes/02.gbapal"
@@ -25,12 +25,12 @@ gTilesetPalettes_Petalburg: @ 833A704
.align 2, 0
-gTilesetTiles_Rustboro: @ 833A904
+gTilesetTiles_Rustboro:: @ 833A904
.incbin "data/graphics/tilesets/secondary/rustboro/tiles.4bpp.lz"
.align 2, 0
-gTilesetPalettes_Rustboro: @ 833BEC0
+gTilesetPalettes_Rustboro:: @ 833BEC0
.incbin "data/graphics/tilesets/secondary/rustboro/palettes/00.gbapal"
.incbin "data/graphics/tilesets/secondary/rustboro/palettes/01.gbapal"
.incbin "data/graphics/tilesets/secondary/rustboro/palettes/02.gbapal"
@@ -50,12 +50,12 @@ gTilesetPalettes_Rustboro: @ 833BEC0
.align 2, 0
-gTilesetTiles_Dewford: @ 833C0C0
+gTilesetTiles_Dewford:: @ 833C0C0
.incbin "data/graphics/tilesets/secondary/dewford/tiles.4bpp.lz"
.align 2, 0
-gTilesetPalettes_Dewford: @ 833D540
+gTilesetPalettes_Dewford:: @ 833D540
.incbin "data/graphics/tilesets/secondary/dewford/palettes/00.gbapal"
.incbin "data/graphics/tilesets/secondary/dewford/palettes/01.gbapal"
.incbin "data/graphics/tilesets/secondary/dewford/palettes/02.gbapal"
@@ -75,12 +75,12 @@ gTilesetPalettes_Dewford: @ 833D540
.align 2, 0
-gTilesetTiles_Slateport: @ 833D740
+gTilesetTiles_Slateport:: @ 833D740
.incbin "data/graphics/tilesets/secondary/slateport/tiles.4bpp.lz"
.align 2, 0
-gTilesetPalettes_Slateport: @ 833F708
+gTilesetPalettes_Slateport:: @ 833F708
.incbin "data/graphics/tilesets/secondary/slateport/palettes/00.gbapal"
.incbin "data/graphics/tilesets/secondary/slateport/palettes/01.gbapal"
.incbin "data/graphics/tilesets/secondary/slateport/palettes/02.gbapal"
@@ -100,12 +100,12 @@ gTilesetPalettes_Slateport: @ 833F708
.align 2, 0
-gTilesetTiles_Mauville: @ 833F908
+gTilesetTiles_Mauville:: @ 833F908
.incbin "data/graphics/tilesets/secondary/mauville/tiles.4bpp.lz"
.align 2, 0
-gTilesetPalettes_Mauville: @ 834172C
+gTilesetPalettes_Mauville:: @ 834172C
.incbin "data/graphics/tilesets/secondary/mauville/palettes/00.gbapal"
.incbin "data/graphics/tilesets/secondary/mauville/palettes/01.gbapal"
.incbin "data/graphics/tilesets/secondary/mauville/palettes/02.gbapal"
@@ -125,12 +125,12 @@ gTilesetPalettes_Mauville: @ 834172C
.align 2, 0
-gTilesetTiles_Lavaridge: @ 834192C
+gTilesetTiles_Lavaridge:: @ 834192C
.incbin "data/graphics/tilesets/secondary/lavaridge/tiles.4bpp.lz"
.align 2, 0
-gTilesetPalettes_Lavaridge: @ 8342E28
+gTilesetPalettes_Lavaridge:: @ 8342E28
.incbin "data/graphics/tilesets/secondary/lavaridge/palettes/00.gbapal"
.incbin "data/graphics/tilesets/secondary/lavaridge/palettes/01.gbapal"
.incbin "data/graphics/tilesets/secondary/lavaridge/palettes/02.gbapal"
@@ -150,12 +150,12 @@ gTilesetPalettes_Lavaridge: @ 8342E28
.align 2, 0
-gTilesetTiles_Fallarbor: @ 8343028
+gTilesetTiles_Fallarbor:: @ 8343028
.incbin "data/graphics/tilesets/secondary/fallarbor/tiles.4bpp.lz"
.align 2, 0
-gTilesetPalettes_Fallarbor: @ 83447A0
+gTilesetPalettes_Fallarbor:: @ 83447A0
.incbin "data/graphics/tilesets/secondary/fallarbor/palettes/00.gbapal"
.incbin "data/graphics/tilesets/secondary/fallarbor/palettes/01.gbapal"
.incbin "data/graphics/tilesets/secondary/fallarbor/palettes/02.gbapal"
@@ -175,12 +175,12 @@ gTilesetPalettes_Fallarbor: @ 83447A0
.align 2, 0
-gTilesetTiles_Fortree: @ 83449A0
+gTilesetTiles_Fortree:: @ 83449A0
.incbin "data/graphics/tilesets/secondary/fortree/tiles.4bpp.lz"
.align 2, 0
-gTilesetPalettes_Fortree: @ 8346020
+gTilesetPalettes_Fortree:: @ 8346020
.incbin "data/graphics/tilesets/secondary/fortree/palettes/00.gbapal"
.incbin "data/graphics/tilesets/secondary/fortree/palettes/01.gbapal"
.incbin "data/graphics/tilesets/secondary/fortree/palettes/02.gbapal"
@@ -200,12 +200,12 @@ gTilesetPalettes_Fortree: @ 8346020
.align 2, 0
-gTilesetTiles_Lilycove: @ 8346220
+gTilesetTiles_Lilycove:: @ 8346220
.incbin "data/graphics/tilesets/secondary/lilycove/tiles.4bpp.lz"
.align 2, 0
-gTilesetPalettes_Lilycove: @ 83475C0
+gTilesetPalettes_Lilycove:: @ 83475C0
.incbin "data/graphics/tilesets/secondary/lilycove/palettes/00.gbapal"
.incbin "data/graphics/tilesets/secondary/lilycove/palettes/01.gbapal"
.incbin "data/graphics/tilesets/secondary/lilycove/palettes/02.gbapal"
@@ -225,12 +225,12 @@ gTilesetPalettes_Lilycove: @ 83475C0
.align 2, 0
-gTilesetTiles_Mossdeep: @ 83477C0
+gTilesetTiles_Mossdeep:: @ 83477C0
.incbin "data/graphics/tilesets/secondary/mossdeep/tiles.4bpp.lz"
.align 2, 0
-gTilesetPalettes_Mossdeep: @ 8348E10
+gTilesetPalettes_Mossdeep:: @ 8348E10
.incbin "data/graphics/tilesets/secondary/mossdeep/palettes/00.gbapal"
.incbin "data/graphics/tilesets/secondary/mossdeep/palettes/01.gbapal"
.incbin "data/graphics/tilesets/secondary/mossdeep/palettes/02.gbapal"
@@ -250,12 +250,12 @@ gTilesetPalettes_Mossdeep: @ 8348E10
.align 2, 0
-gTilesetTiles_EverGrande: @ 8349010
+gTilesetTiles_EverGrande:: @ 8349010
.incbin "data/graphics/tilesets/secondary/ever_grande/tiles.4bpp.lz"
.align 2, 0
-gTilesetPalettes_EverGrande: @ 8349C28
+gTilesetPalettes_EverGrande:: @ 8349C28
.incbin "data/graphics/tilesets/secondary/ever_grande/palettes/00.gbapal"
.incbin "data/graphics/tilesets/secondary/ever_grande/palettes/01.gbapal"
.incbin "data/graphics/tilesets/secondary/ever_grande/palettes/02.gbapal"
@@ -275,12 +275,12 @@ gTilesetPalettes_EverGrande: @ 8349C28
.align 2, 0
-gTilesetTiles_Pacifidlog: @ 8349E28
+gTilesetTiles_Pacifidlog:: @ 8349E28
.incbin "data/graphics/tilesets/secondary/pacifidlog/tiles.4bpp.lz"
.align 2, 0
-gTilesetPalettes_Pacifidlog: @ 834B5B4
+gTilesetPalettes_Pacifidlog:: @ 834B5B4
.incbin "data/graphics/tilesets/secondary/pacifidlog/palettes/00.gbapal"
.incbin "data/graphics/tilesets/secondary/pacifidlog/palettes/01.gbapal"
.incbin "data/graphics/tilesets/secondary/pacifidlog/palettes/02.gbapal"
@@ -300,12 +300,12 @@ gTilesetPalettes_Pacifidlog: @ 834B5B4
.align 2, 0
-gTilesetTiles_Sootopolis: @ 834B7B4
+gTilesetTiles_Sootopolis:: @ 834B7B4
.incbin "data/graphics/tilesets/secondary/sootopolis/tiles.4bpp.lz"
.align 2, 0
-gTilesetPalettes_Sootopolis: @ 834C6B4
+gTilesetPalettes_Sootopolis:: @ 834C6B4
.incbin "data/graphics/tilesets/secondary/sootopolis/palettes/00.gbapal"
.incbin "data/graphics/tilesets/secondary/sootopolis/palettes/01.gbapal"
.incbin "data/graphics/tilesets/secondary/sootopolis/palettes/02.gbapal"
@@ -325,12 +325,12 @@ gTilesetPalettes_Sootopolis: @ 834C6B4
.align 2, 0
-gTilesetTiles_BattleFrontierOutsideWest: @ 834C8B4
+gTilesetTiles_BattleFrontierOutsideWest:: @ 834C8B4
.incbin "data/graphics/tilesets/secondary/battle_frontier_outside_west/tiles.4bpp.lz"
.align 2, 0
-gTilesetPalettes_BattleFrontierOutsideWest: @ 834E3E4
+gTilesetPalettes_BattleFrontierOutsideWest:: @ 834E3E4
.incbin "data/graphics/tilesets/secondary/battle_frontier_outside_west/palettes/00.gbapal"
.incbin "data/graphics/tilesets/secondary/battle_frontier_outside_west/palettes/01.gbapal"
.incbin "data/graphics/tilesets/secondary/battle_frontier_outside_west/palettes/02.gbapal"
@@ -350,12 +350,12 @@ gTilesetPalettes_BattleFrontierOutsideWest: @ 834E3E4
.align 2, 0
-gTilesetTiles_BattleFrontierOutsideEast: @ 834E5E4
+gTilesetTiles_BattleFrontierOutsideEast:: @ 834E5E4
.incbin "data/graphics/tilesets/secondary/battle_frontier_outside_east/tiles.4bpp.lz"
.align 2, 0
-gTilesetPalettes_BattleFrontierOutsideEast: @ 834F984
+gTilesetPalettes_BattleFrontierOutsideEast:: @ 834F984
.incbin "data/graphics/tilesets/secondary/battle_frontier_outside_east/palettes/00.gbapal"
.incbin "data/graphics/tilesets/secondary/battle_frontier_outside_east/palettes/01.gbapal"
.incbin "data/graphics/tilesets/secondary/battle_frontier_outside_east/palettes/02.gbapal"
@@ -375,12 +375,12 @@ gTilesetPalettes_BattleFrontierOutsideEast: @ 834F984
.align 2, 0
-gTilesetTiles_InsideBuilding: @ 834FB84
+gTilesetTiles_InsideBuilding:: @ 834FB84
.incbin "data/graphics/tilesets/primary/inside_building/tiles.4bpp.lz"
.align 2, 0
-gTilesetPalettes_InsideBuilding: @ 83508BC
+gTilesetPalettes_InsideBuilding:: @ 83508BC
.incbin "data/graphics/tilesets/primary/inside_building/palettes/00.gbapal"
.incbin "data/graphics/tilesets/primary/inside_building/palettes/01.gbapal"
.incbin "data/graphics/tilesets/primary/inside_building/palettes/02.gbapal"
@@ -400,12 +400,12 @@ gTilesetPalettes_InsideBuilding: @ 83508BC
.align 2, 0
-gTilesetTiles_Shop: @ 8350ABC
+gTilesetTiles_Shop:: @ 8350ABC
.incbin "data/graphics/tilesets/secondary/shop/tiles.4bpp.lz"
.align 2, 0
-gTilesetPalettes_Shop: @ 83520DC
+gTilesetPalettes_Shop:: @ 83520DC
.incbin "data/graphics/tilesets/secondary/shop/palettes/00.gbapal"
.incbin "data/graphics/tilesets/secondary/shop/palettes/01.gbapal"
.incbin "data/graphics/tilesets/secondary/shop/palettes/02.gbapal"
@@ -425,12 +425,12 @@ gTilesetPalettes_Shop: @ 83520DC
.align 2, 0
-gTilesetTiles_PokemonCenter: @ 83522DC
+gTilesetTiles_PokemonCenter:: @ 83522DC
.incbin "data/graphics/tilesets/secondary/pokemon_center/tiles.4bpp.lz"
.align 2, 0
-gTilesetPalettes_PokemonCenter: @ 8353574
+gTilesetPalettes_PokemonCenter:: @ 8353574
.incbin "data/graphics/tilesets/secondary/pokemon_center/palettes/00.gbapal"
.incbin "data/graphics/tilesets/secondary/pokemon_center/palettes/01.gbapal"
.incbin "data/graphics/tilesets/secondary/pokemon_center/palettes/02.gbapal"
@@ -450,12 +450,12 @@ gTilesetPalettes_PokemonCenter: @ 8353574
.align 2, 0
-gTilesetTiles_Cave: @ 8353774
+gTilesetTiles_Cave:: @ 8353774
.incbin "data/graphics/tilesets/secondary/cave/tiles.4bpp.lz"
.align 2, 0
-gTilesetPalettes_Cave: @ 8355260
+gTilesetPalettes_Cave:: @ 8355260
.incbin "data/graphics/tilesets/secondary/cave/palettes/00.gbapal"
.incbin "data/graphics/tilesets/secondary/cave/palettes/01.gbapal"
.incbin "data/graphics/tilesets/secondary/cave/palettes/02.gbapal"
@@ -475,12 +475,12 @@ gTilesetPalettes_Cave: @ 8355260
.align 2, 0
-gTilesetTiles_PokemonSchool: @ 8355460
+gTilesetTiles_PokemonSchool:: @ 8355460
.incbin "data/graphics/tilesets/secondary/pokemon_school/tiles.4bpp.lz"
.align 2, 0
-gTilesetPalettes_PokemonSchool: @ 8355BA8
+gTilesetPalettes_PokemonSchool:: @ 8355BA8
.incbin "data/graphics/tilesets/secondary/pokemon_school/palettes/00.gbapal"
.incbin "data/graphics/tilesets/secondary/pokemon_school/palettes/01.gbapal"
.incbin "data/graphics/tilesets/secondary/pokemon_school/palettes/02.gbapal"
@@ -500,12 +500,12 @@ gTilesetPalettes_PokemonSchool: @ 8355BA8
.align 2, 0
-gTilesetTiles_PokemonFanClub: @ 8355DA8
+gTilesetTiles_PokemonFanClub:: @ 8355DA8
.incbin "data/graphics/tilesets/secondary/pokemon_fan_club/tiles.4bpp.lz"
.align 2, 0
-gTilesetPalettes_PokemonFanClub: @ 83566D4
+gTilesetPalettes_PokemonFanClub:: @ 83566D4
.incbin "data/graphics/tilesets/secondary/pokemon_fan_club/palettes/00.gbapal"
.incbin "data/graphics/tilesets/secondary/pokemon_fan_club/palettes/01.gbapal"
.incbin "data/graphics/tilesets/secondary/pokemon_fan_club/palettes/02.gbapal"
@@ -525,12 +525,12 @@ gTilesetPalettes_PokemonFanClub: @ 83566D4
.align 2, 0
-gTilesetTiles_Unused1: @ 83568D4
+gTilesetTiles_Unused1:: @ 83568D4
.incbin "data/graphics/tilesets/secondary/unused_1/tiles.4bpp.lz"
.align 2, 0
-gTilesetPalettes_Unused1: @ 8356920
+gTilesetPalettes_Unused1:: @ 8356920
.incbin "data/graphics/tilesets/secondary/unused_1/palettes/00.gbapal"
.incbin "data/graphics/tilesets/secondary/unused_1/palettes/01.gbapal"
.incbin "data/graphics/tilesets/secondary/unused_1/palettes/02.gbapal"
@@ -550,12 +550,12 @@ gTilesetPalettes_Unused1: @ 8356920
.align 2, 0
-gTilesetTiles_MeteorFalls: @ 8356B20
+gTilesetTiles_MeteorFalls:: @ 8356B20
.incbin "data/graphics/tilesets/secondary/meteor_falls/tiles.4bpp.lz"
.align 2, 0
-gTilesetPalettes_MeteorFalls: @ 8358840
+gTilesetPalettes_MeteorFalls:: @ 8358840
.incbin "data/graphics/tilesets/secondary/meteor_falls/palettes/00.gbapal"
.incbin "data/graphics/tilesets/secondary/meteor_falls/palettes/01.gbapal"
.incbin "data/graphics/tilesets/secondary/meteor_falls/palettes/02.gbapal"
@@ -575,12 +575,12 @@ gTilesetPalettes_MeteorFalls: @ 8358840
.align 2, 0
-gTilesetTiles_OceanicMuseum: @ 8358A40
+gTilesetTiles_OceanicMuseum:: @ 8358A40
.incbin "data/graphics/tilesets/secondary/oceanic_museum/tiles.4bpp.lz"
.align 2, 0
-gTilesetPalettes_OceanicMuseum: @ 83599CC
+gTilesetPalettes_OceanicMuseum:: @ 83599CC
.incbin "data/graphics/tilesets/secondary/oceanic_museum/palettes/00.gbapal"
.incbin "data/graphics/tilesets/secondary/oceanic_museum/palettes/01.gbapal"
.incbin "data/graphics/tilesets/secondary/oceanic_museum/palettes/02.gbapal"
@@ -600,7 +600,7 @@ gTilesetPalettes_OceanicMuseum: @ 83599CC
.align 2, 0
-gTilesetTiles_CableClub: @ 8359BCC
+gTilesetTiles_CableClub:: @ 8359BCC
.incbin "data/graphics/tilesets/secondary/cable_club/tiles.4bpp"
.align 2, 0
@@ -609,7 +609,7 @@ gTilesetTiles_CableClub: @ 8359BCC
.align 2, 0
-gTilesetPalettes_CableClub: @ 835EACC
+gTilesetPalettes_CableClub:: @ 835EACC
.incbin "data/graphics/tilesets/secondary/cable_club/palettes/00.gbapal"
.incbin "data/graphics/tilesets/secondary/cable_club/palettes/01.gbapal"
.incbin "data/graphics/tilesets/secondary/cable_club/palettes/02.gbapal"
@@ -629,12 +629,12 @@ gTilesetPalettes_CableClub: @ 835EACC
.align 2, 0
-gTilesetTiles_SeashoreHouse: @ 835ECCC
+gTilesetTiles_SeashoreHouse:: @ 835ECCC
.incbin "data/graphics/tilesets/secondary/seashore_house/tiles.4bpp.lz"
.align 2, 0
-gTilesetPalettes_SeashoreHouse: @ 835F5A8
+gTilesetPalettes_SeashoreHouse:: @ 835F5A8
.incbin "data/graphics/tilesets/secondary/seashore_house/palettes/00.gbapal"
.incbin "data/graphics/tilesets/secondary/seashore_house/palettes/01.gbapal"
.incbin "data/graphics/tilesets/secondary/seashore_house/palettes/02.gbapal"
@@ -654,12 +654,12 @@ gTilesetPalettes_SeashoreHouse: @ 835F5A8
.align 2, 0
-gTilesetTiles_PrettyPetalFlowerShop: @ 835F7A8
+gTilesetTiles_PrettyPetalFlowerShop:: @ 835F7A8
.incbin "data/graphics/tilesets/secondary/pretty_petal_flower_shop/tiles.4bpp.lz"
.align 2, 0
-gTilesetPalettes_PrettyPetalFlowerShop: @ 83603A0
+gTilesetPalettes_PrettyPetalFlowerShop:: @ 83603A0
.incbin "data/graphics/tilesets/secondary/pretty_petal_flower_shop/palettes/00.gbapal"
.incbin "data/graphics/tilesets/secondary/pretty_petal_flower_shop/palettes/01.gbapal"
.incbin "data/graphics/tilesets/secondary/pretty_petal_flower_shop/palettes/02.gbapal"
@@ -679,12 +679,12 @@ gTilesetPalettes_PrettyPetalFlowerShop: @ 83603A0
.align 2, 0
-gTilesetTiles_PokemonDayCare: @ 83605A0
+gTilesetTiles_PokemonDayCare:: @ 83605A0
.incbin "data/graphics/tilesets/secondary/pokemon_day_care/tiles.4bpp.lz"
.align 2, 0
-gTilesetPalettes_PokemonDayCare: @ 8360FDC
+gTilesetPalettes_PokemonDayCare:: @ 8360FDC
.incbin "data/graphics/tilesets/secondary/pokemon_day_care/palettes/00.gbapal"
.incbin "data/graphics/tilesets/secondary/pokemon_day_care/palettes/01.gbapal"
.incbin "data/graphics/tilesets/secondary/pokemon_day_care/palettes/02.gbapal"
@@ -704,12 +704,12 @@ gTilesetPalettes_PokemonDayCare: @ 8360FDC
.align 2, 0
-gTilesetTiles_Facility: @ 83611DC
+gTilesetTiles_Facility:: @ 83611DC
.incbin "data/graphics/tilesets/secondary/facility/tiles.4bpp.lz"
.align 2, 0
-gTilesetPalettes_Facility: @ 8362E90
+gTilesetPalettes_Facility:: @ 8362E90
.incbin "data/graphics/tilesets/secondary/facility/palettes/00.gbapal"
.incbin "data/graphics/tilesets/secondary/facility/palettes/01.gbapal"
.incbin "data/graphics/tilesets/secondary/facility/palettes/02.gbapal"
@@ -729,12 +729,12 @@ gTilesetPalettes_Facility: @ 8362E90
.align 2, 0
-gTilesetTiles_BikeShop: @ 8363090
+gTilesetTiles_BikeShop:: @ 8363090
.incbin "data/graphics/tilesets/secondary/bike_shop/tiles.4bpp.lz"
.align 2, 0
-gTilesetPalettes_BikeShop: @ 83643C0
+gTilesetPalettes_BikeShop:: @ 83643C0
.incbin "data/graphics/tilesets/secondary/bike_shop/palettes/00.gbapal"
.incbin "data/graphics/tilesets/secondary/bike_shop/palettes/01.gbapal"
.incbin "data/graphics/tilesets/secondary/bike_shop/palettes/02.gbapal"
@@ -754,12 +754,12 @@ gTilesetPalettes_BikeShop: @ 83643C0
.align 2, 0
-gTilesetTiles_RusturfTunnel: @ 83645C0
+gTilesetTiles_RusturfTunnel:: @ 83645C0
.incbin "data/graphics/tilesets/secondary/rusturf_tunnel/tiles.4bpp.lz"
.align 2, 0
-gTilesetPalettes_RusturfTunnel: @ 8365008
+gTilesetPalettes_RusturfTunnel:: @ 8365008
.incbin "data/graphics/tilesets/secondary/rusturf_tunnel/palettes/00.gbapal"
.incbin "data/graphics/tilesets/secondary/rusturf_tunnel/palettes/01.gbapal"
.incbin "data/graphics/tilesets/secondary/rusturf_tunnel/palettes/02.gbapal"
@@ -784,7 +784,7 @@ gTilesetPalettes_RusturfTunnel: @ 8365008
.align 2, 0
-gTilesetPalettes_SecretBaseBrownCave: @ 8365788
+gTilesetPalettes_SecretBaseBrownCave:: @ 8365788
.incbin "data/graphics/tilesets/secondary/secret_base/brown_cave/palettes/00.gbapal"
.incbin "data/graphics/tilesets/secondary/secret_base/brown_cave/palettes/01.gbapal"
.incbin "data/graphics/tilesets/secondary/secret_base/brown_cave/palettes/02.gbapal"
@@ -809,7 +809,7 @@ gTilesetPalettes_SecretBaseBrownCave: @ 8365788
.align 2, 0
-gTilesetPalettes_SecretBaseTree: @ 8365EAC
+gTilesetPalettes_SecretBaseTree:: @ 8365EAC
.incbin "data/graphics/tilesets/secondary/secret_base/tree/palettes/00.gbapal"
.incbin "data/graphics/tilesets/secondary/secret_base/tree/palettes/01.gbapal"
.incbin "data/graphics/tilesets/secondary/secret_base/tree/palettes/02.gbapal"
@@ -834,7 +834,7 @@ gTilesetPalettes_SecretBaseTree: @ 8365EAC
.align 2, 0
-gTilesetPalettes_SecretBaseShrub: @ 8366614
+gTilesetPalettes_SecretBaseShrub:: @ 8366614
.incbin "data/graphics/tilesets/secondary/secret_base/shrub/palettes/00.gbapal"
.incbin "data/graphics/tilesets/secondary/secret_base/shrub/palettes/01.gbapal"
.incbin "data/graphics/tilesets/secondary/secret_base/shrub/palettes/02.gbapal"
@@ -859,7 +859,7 @@ gTilesetPalettes_SecretBaseShrub: @ 8366614
.align 2, 0
-gTilesetPalettes_SecretBaseBlueCave: @ 8366C30
+gTilesetPalettes_SecretBaseBlueCave:: @ 8366C30
.incbin "data/graphics/tilesets/secondary/secret_base/blue_cave/palettes/00.gbapal"
.incbin "data/graphics/tilesets/secondary/secret_base/blue_cave/palettes/01.gbapal"
.incbin "data/graphics/tilesets/secondary/secret_base/blue_cave/palettes/02.gbapal"
@@ -884,7 +884,7 @@ gTilesetPalettes_SecretBaseBlueCave: @ 8366C30
.align 2, 0
-gTilesetPalettes_SecretBaseYellowCave: @ 8367368
+gTilesetPalettes_SecretBaseYellowCave:: @ 8367368
.incbin "data/graphics/tilesets/secondary/secret_base/yellow_cave/palettes/00.gbapal"
.incbin "data/graphics/tilesets/secondary/secret_base/yellow_cave/palettes/01.gbapal"
.incbin "data/graphics/tilesets/secondary/secret_base/yellow_cave/palettes/02.gbapal"
@@ -909,7 +909,7 @@ gTilesetPalettes_SecretBaseYellowCave: @ 8367368
.align 2, 0
-gTilesetPalettes_SecretBaseRedCave: @ 83679A0
+gTilesetPalettes_SecretBaseRedCave:: @ 83679A0
.incbin "data/graphics/tilesets/secondary/secret_base/red_cave/palettes/00.gbapal"
.incbin "data/graphics/tilesets/secondary/secret_base/red_cave/palettes/01.gbapal"
.incbin "data/graphics/tilesets/secondary/secret_base/red_cave/palettes/02.gbapal"
@@ -929,42 +929,42 @@ gTilesetPalettes_SecretBaseRedCave: @ 83679A0
.align 2, 0
-gTilesetTiles_SecretBaseBrownCave: @ 8367BA0
+gTilesetTiles_SecretBaseBrownCave:: @ 8367BA0
.incbin "data/graphics/tilesets/secondary/secret_base/brown_cave/tiles.4bpp"
.align 2, 0
-gTilesetTiles_SecretBaseTree: @ 8368600
+gTilesetTiles_SecretBaseTree:: @ 8368600
.incbin "data/graphics/tilesets/secondary/secret_base/tree/tiles.4bpp"
.align 2, 0
-gTilesetTiles_SecretBaseShrub: @ 8369060
+gTilesetTiles_SecretBaseShrub:: @ 8369060
.incbin "data/graphics/tilesets/secondary/secret_base/shrub/tiles.4bpp"
.align 2, 0
-gTilesetTiles_SecretBaseBlueCave: @ 8369AC0
+gTilesetTiles_SecretBaseBlueCave:: @ 8369AC0
.incbin "data/graphics/tilesets/secondary/secret_base/blue_cave/tiles.4bpp"
.align 2, 0
-gTilesetTiles_SecretBaseYellowCave: @ 836A520
+gTilesetTiles_SecretBaseYellowCave:: @ 836A520
.incbin "data/graphics/tilesets/secondary/secret_base/yellow_cave/tiles.4bpp"
.align 2, 0
-gTilesetTiles_SecretBaseRedCave: @ 836AF80
+gTilesetTiles_SecretBaseRedCave:: @ 836AF80
.incbin "data/graphics/tilesets/secondary/secret_base/red_cave/tiles.4bpp"
.align 2, 0
-gTilesetTiles_InsideOfTruck: @ 836B9E0
+gTilesetTiles_InsideOfTruck:: @ 836B9E0
.incbin "data/graphics/tilesets/secondary/inside_of_truck/tiles.4bpp.lz"
.align 2, 0
-gTilesetPalettes_InsideOfTruck: @ 836BC3C
+gTilesetPalettes_InsideOfTruck:: @ 836BC3C
.incbin "data/graphics/tilesets/secondary/inside_of_truck/palettes/00.gbapal"
.incbin "data/graphics/tilesets/secondary/inside_of_truck/palettes/01.gbapal"
.incbin "data/graphics/tilesets/secondary/inside_of_truck/palettes/02.gbapal"
@@ -984,12 +984,12 @@ gTilesetPalettes_InsideOfTruck: @ 836BC3C
.align 2, 0
-gTilesetTiles_Contest: @ 836BE3C
+gTilesetTiles_Contest:: @ 836BE3C
.incbin "data/graphics/tilesets/secondary/contest/tiles.4bpp.lz"
.align 2, 0
-gTilesetPalettes_Contest: @ 836C990
+gTilesetPalettes_Contest:: @ 836C990
.incbin "data/graphics/tilesets/secondary/contest/palettes/00.gbapal"
.incbin "data/graphics/tilesets/secondary/contest/palettes/01.gbapal"
.incbin "data/graphics/tilesets/secondary/contest/palettes/02.gbapal"
@@ -1009,12 +1009,12 @@ gTilesetPalettes_Contest: @ 836C990
.align 2, 0
-gTilesetTiles_LilycoveMuseum: @ 836CB90
+gTilesetTiles_LilycoveMuseum:: @ 836CB90
.incbin "data/graphics/tilesets/secondary/lilycove_museum/tiles.4bpp.lz"
.align 2, 0
-gTilesetPalettes_LilycoveMuseum: @ 836DEAC
+gTilesetPalettes_LilycoveMuseum:: @ 836DEAC
.incbin "data/graphics/tilesets/secondary/lilycove_museum/palettes/00.gbapal"
.incbin "data/graphics/tilesets/secondary/lilycove_museum/palettes/01.gbapal"
.incbin "data/graphics/tilesets/secondary/lilycove_museum/palettes/02.gbapal"
@@ -1034,12 +1034,12 @@ gTilesetPalettes_LilycoveMuseum: @ 836DEAC
.align 2, 0
-gTilesetTiles_BrendansMaysHouse: @ 836E0AC
+gTilesetTiles_BrendansMaysHouse:: @ 836E0AC
.incbin "data/graphics/tilesets/secondary/brendans_mays_house/tiles.4bpp.lz"
.align 2, 0
-gTilesetPalettes_BrendansMaysHouse: @ 836F178
+gTilesetPalettes_BrendansMaysHouse:: @ 836F178
.incbin "data/graphics/tilesets/secondary/brendans_mays_house/palettes/00.gbapal"
.incbin "data/graphics/tilesets/secondary/brendans_mays_house/palettes/01.gbapal"
.incbin "data/graphics/tilesets/secondary/brendans_mays_house/palettes/02.gbapal"
@@ -1059,12 +1059,12 @@ gTilesetPalettes_BrendansMaysHouse: @ 836F178
.align 2, 0
-gTilesetTiles_Lab: @ 836F378
+gTilesetTiles_Lab:: @ 836F378
.incbin "data/graphics/tilesets/secondary/lab/tiles.4bpp.lz"
.align 2, 0
-gTilesetPalettes_Lab: @ 83703DC
+gTilesetPalettes_Lab:: @ 83703DC
.incbin "data/graphics/tilesets/secondary/lab/palettes/00.gbapal"
.incbin "data/graphics/tilesets/secondary/lab/palettes/01.gbapal"
.incbin "data/graphics/tilesets/secondary/lab/palettes/02.gbapal"
@@ -1084,12 +1084,12 @@ gTilesetPalettes_Lab: @ 83703DC
.align 2, 0
-gTilesetTiles_Underwater: @ 83705DC
+gTilesetTiles_Underwater:: @ 83705DC
.incbin "data/graphics/tilesets/secondary/underwater/tiles.4bpp.lz"
.align 2, 0
-gTilesetPalettes_Underwater: @ 8371798
+gTilesetPalettes_Underwater:: @ 8371798
.incbin "data/graphics/tilesets/secondary/underwater/palettes/00.gbapal"
.incbin "data/graphics/tilesets/secondary/underwater/palettes/01.gbapal"
.incbin "data/graphics/tilesets/secondary/underwater/palettes/02.gbapal"
@@ -1109,12 +1109,12 @@ gTilesetPalettes_Underwater: @ 8371798
.align 2, 0
-gTilesetTiles_GenericBuilding: @ 8371998
+gTilesetTiles_GenericBuilding:: @ 8371998
.incbin "data/graphics/tilesets/secondary/generic_building/tiles.4bpp.lz"
.align 2, 0
-gTilesetPalettes_GenericBuilding: @ 83733C4
+gTilesetPalettes_GenericBuilding:: @ 83733C4
.incbin "data/graphics/tilesets/secondary/generic_building/palettes/00.gbapal"
.incbin "data/graphics/tilesets/secondary/generic_building/palettes/01.gbapal"
.incbin "data/graphics/tilesets/secondary/generic_building/palettes/02.gbapal"
@@ -1134,12 +1134,12 @@ gTilesetPalettes_GenericBuilding: @ 83733C4
.align 2, 0
-gTilesetTiles_MauvilleGameCorner: @ 83735C4
+gTilesetTiles_MauvilleGameCorner:: @ 83735C4
.incbin "data/graphics/tilesets/secondary/mauville_game_corner/tiles.4bpp.lz"
.align 2, 0
-gTilesetPalettes_MauvilleGameCorner: @ 8374288
+gTilesetPalettes_MauvilleGameCorner:: @ 8374288
.incbin "data/graphics/tilesets/secondary/mauville_game_corner/palettes/00.gbapal"
.incbin "data/graphics/tilesets/secondary/mauville_game_corner/palettes/01.gbapal"
.incbin "data/graphics/tilesets/secondary/mauville_game_corner/palettes/02.gbapal"
@@ -1159,12 +1159,12 @@ gTilesetPalettes_MauvilleGameCorner: @ 8374288
.align 2, 0
-gTilesetTiles_Unused2: @ 8374488
+gTilesetTiles_Unused2:: @ 8374488
.incbin "data/graphics/tilesets/secondary/unused_2/tiles.4bpp.lz"
.align 2, 0
-gTilesetPalettes_Unused2: @ 83749B0
+gTilesetPalettes_Unused2:: @ 83749B0
.incbin "data/graphics/tilesets/secondary/unused_2/palettes/00.gbapal"
.incbin "data/graphics/tilesets/secondary/unused_2/palettes/01.gbapal"
.incbin "data/graphics/tilesets/secondary/unused_2/palettes/02.gbapal"
@@ -1184,12 +1184,12 @@ gTilesetPalettes_Unused2: @ 83749B0
.align 2, 0
-gTilesetTiles_RustboroGym: @ 8374BB0
+gTilesetTiles_RustboroGym:: @ 8374BB0
.incbin "data/graphics/tilesets/secondary/rustboro_gym/tiles.4bpp.lz"
.align 2, 0
-gTilesetPalettes_RustboroGym: @ 8374F34
+gTilesetPalettes_RustboroGym:: @ 8374F34
.incbin "data/graphics/tilesets/secondary/rustboro_gym/palettes/00.gbapal"
.incbin "data/graphics/tilesets/secondary/rustboro_gym/palettes/01.gbapal"
.incbin "data/graphics/tilesets/secondary/rustboro_gym/palettes/02.gbapal"
@@ -1209,12 +1209,12 @@ gTilesetPalettes_RustboroGym: @ 8374F34
.align 2, 0
-gTilesetTiles_DewfordGym: @ 8375134
+gTilesetTiles_DewfordGym:: @ 8375134
.incbin "data/graphics/tilesets/secondary/dewford_gym/tiles.4bpp.lz"
.align 2, 0
-gTilesetPalettes_DewfordGym: @ 8375400
+gTilesetPalettes_DewfordGym:: @ 8375400
.incbin "data/graphics/tilesets/secondary/dewford_gym/palettes/00.gbapal"
.incbin "data/graphics/tilesets/secondary/dewford_gym/palettes/01.gbapal"
.incbin "data/graphics/tilesets/secondary/dewford_gym/palettes/02.gbapal"
@@ -1234,12 +1234,12 @@ gTilesetPalettes_DewfordGym: @ 8375400
.align 2, 0
-gTilesetTiles_MauvilleGym: @ 8375600
+gTilesetTiles_MauvilleGym:: @ 8375600
.incbin "data/graphics/tilesets/secondary/mauville_gym/tiles.4bpp.lz"
.align 2, 0
-gTilesetPalettes_MauvilleGym: @ 8375D84
+gTilesetPalettes_MauvilleGym:: @ 8375D84
.incbin "data/graphics/tilesets/secondary/mauville_gym/palettes/00.gbapal"
.incbin "data/graphics/tilesets/secondary/mauville_gym/palettes/01.gbapal"
.incbin "data/graphics/tilesets/secondary/mauville_gym/palettes/02.gbapal"
@@ -1259,12 +1259,12 @@ gTilesetPalettes_MauvilleGym: @ 8375D84
.align 2, 0
-gTilesetTiles_LavaridgeGym: @ 8375F84
+gTilesetTiles_LavaridgeGym:: @ 8375F84
.incbin "data/graphics/tilesets/secondary/lavaridge_gym/tiles.4bpp.lz"
.align 2, 0
-gTilesetPalettes_LavaridgeGym: @ 83762AC
+gTilesetPalettes_LavaridgeGym:: @ 83762AC
.incbin "data/graphics/tilesets/secondary/lavaridge_gym/palettes/00.gbapal"
.incbin "data/graphics/tilesets/secondary/lavaridge_gym/palettes/01.gbapal"
.incbin "data/graphics/tilesets/secondary/lavaridge_gym/palettes/02.gbapal"
@@ -1284,12 +1284,12 @@ gTilesetPalettes_LavaridgeGym: @ 83762AC
.align 2, 0
-gTilesetTiles_PetalburgGym: @ 83764AC
+gTilesetTiles_PetalburgGym:: @ 83764AC
.incbin "data/graphics/tilesets/secondary/petalburg_gym/tiles.4bpp.lz"
.align 2, 0
-gTilesetPalettes_PetalburgGym: @ 8376B50
+gTilesetPalettes_PetalburgGym:: @ 8376B50
.incbin "data/graphics/tilesets/secondary/petalburg_gym/palettes/00.gbapal"
.incbin "data/graphics/tilesets/secondary/petalburg_gym/palettes/01.gbapal"
.incbin "data/graphics/tilesets/secondary/petalburg_gym/palettes/02.gbapal"
@@ -1309,12 +1309,12 @@ gTilesetPalettes_PetalburgGym: @ 8376B50
.align 2, 0
-gTilesetTiles_FortreeGym: @ 8376D50
+gTilesetTiles_FortreeGym:: @ 8376D50
.incbin "data/graphics/tilesets/secondary/fortree_gym/tiles.4bpp.lz"
.align 2, 0
-gTilesetPalettes_FortreeGym: @ 83770C4
+gTilesetPalettes_FortreeGym:: @ 83770C4
.incbin "data/graphics/tilesets/secondary/fortree_gym/palettes/00.gbapal"
.incbin "data/graphics/tilesets/secondary/fortree_gym/palettes/01.gbapal"
.incbin "data/graphics/tilesets/secondary/fortree_gym/palettes/02.gbapal"
@@ -1334,12 +1334,12 @@ gTilesetPalettes_FortreeGym: @ 83770C4
.align 2, 0
-gTilesetTiles_MossdeepGym: @ 83772C4
+gTilesetTiles_MossdeepGym:: @ 83772C4
.incbin "data/graphics/tilesets/secondary/mossdeep_gym/tiles.4bpp.lz"
.align 2, 0
-gTilesetPalettes_MossdeepGym: @ 8377730
+gTilesetPalettes_MossdeepGym:: @ 8377730
.incbin "data/graphics/tilesets/secondary/mossdeep_gym/palettes/00.gbapal"
.incbin "data/graphics/tilesets/secondary/mossdeep_gym/palettes/01.gbapal"
.incbin "data/graphics/tilesets/secondary/mossdeep_gym/palettes/02.gbapal"
@@ -1359,12 +1359,12 @@ gTilesetPalettes_MossdeepGym: @ 8377730
.align 2, 0
-gTilesetTiles_SootopolisGym: @ 8377930
+gTilesetTiles_SootopolisGym:: @ 8377930
.incbin "data/graphics/tilesets/secondary/sootopolis_gym/tiles.4bpp.lz"
.align 2, 0
-gTilesetPalettes_SootopolisGym: @ 8378AC4
+gTilesetPalettes_SootopolisGym:: @ 8378AC4
.incbin "data/graphics/tilesets/secondary/sootopolis_gym/palettes/00.gbapal"
.incbin "data/graphics/tilesets/secondary/sootopolis_gym/palettes/01.gbapal"
.incbin "data/graphics/tilesets/secondary/sootopolis_gym/palettes/02.gbapal"
@@ -1384,12 +1384,12 @@ gTilesetPalettes_SootopolisGym: @ 8378AC4
.align 2, 0
-gTilesetTiles_TrickHousePuzzle: @ 8378CC4
+gTilesetTiles_TrickHousePuzzle:: @ 8378CC4
.incbin "data/graphics/tilesets/secondary/trick_house_puzzle/tiles.4bpp.lz"
.align 2, 0
-gTilesetPalettes_TrickHousePuzzle: @ 8379A78
+gTilesetPalettes_TrickHousePuzzle:: @ 8379A78
.incbin "data/graphics/tilesets/secondary/trick_house_puzzle/palettes/00.gbapal"
.incbin "data/graphics/tilesets/secondary/trick_house_puzzle/palettes/01.gbapal"
.incbin "data/graphics/tilesets/secondary/trick_house_puzzle/palettes/02.gbapal"
@@ -1409,12 +1409,12 @@ gTilesetPalettes_TrickHousePuzzle: @ 8379A78
.align 2, 0
-gTilesetTiles_InsideShip: @ 8379C78
+gTilesetTiles_InsideShip:: @ 8379C78
.incbin "data/graphics/tilesets/secondary/inside_ship/tiles.4bpp.lz"
.align 2, 0
-gTilesetPalettes_InsideShip: @ 837A848
+gTilesetPalettes_InsideShip:: @ 837A848
.incbin "data/graphics/tilesets/secondary/inside_ship/palettes/00.gbapal"
.incbin "data/graphics/tilesets/secondary/inside_ship/palettes/01.gbapal"
.incbin "data/graphics/tilesets/secondary/inside_ship/palettes/02.gbapal"
@@ -1434,7 +1434,7 @@ gTilesetPalettes_InsideShip: @ 837A848
.align 2, 0
-gTilesetTiles_SecretBase: @ 837AA48
+gTilesetTiles_SecretBase:: @ 837AA48
.incbin "data/graphics/tilesets/primary/secret_base/tiles.4bpp"
.align 2, 0
@@ -1443,7 +1443,7 @@ gTilesetTiles_SecretBase: @ 837AA48
.align 2, 0
-gTilesetPalettes_SecretBase: @ 8382A48
+gTilesetPalettes_SecretBase:: @ 8382A48
.incbin "data/graphics/tilesets/primary/secret_base/palettes/00.gbapal"
.incbin "data/graphics/tilesets/primary/secret_base/palettes/01.gbapal"
.incbin "data/graphics/tilesets/primary/secret_base/palettes/02.gbapal"
@@ -1463,12 +1463,12 @@ gTilesetPalettes_SecretBase: @ 8382A48
.align 2, 0
-gTilesetTiles_EliteFour: @ 8382C48
+gTilesetTiles_EliteFour:: @ 8382C48
.incbin "data/graphics/tilesets/secondary/elite_four/tiles.4bpp.lz"
.align 2, 0
-gTilesetPalettes_EliteFour: @ 8383CC4
+gTilesetPalettes_EliteFour:: @ 8383CC4
.incbin "data/graphics/tilesets/secondary/elite_four/palettes/00.gbapal"
.incbin "data/graphics/tilesets/secondary/elite_four/palettes/01.gbapal"
.incbin "data/graphics/tilesets/secondary/elite_four/palettes/02.gbapal"
@@ -1488,12 +1488,12 @@ gTilesetPalettes_EliteFour: @ 8383CC4
.align 2, 0
-gTilesetTiles_BattleFrontier: @ 8383EC4
+gTilesetTiles_BattleFrontier:: @ 8383EC4
.incbin "data/graphics/tilesets/secondary/battle_frontier/tiles.4bpp.lz"
.align 2, 0
-gTilesetPalettes_BattleFrontier: @ 8384BC8
+gTilesetPalettes_BattleFrontier:: @ 8384BC8
.incbin "data/graphics/tilesets/secondary/battle_frontier/palettes/00.gbapal"
.incbin "data/graphics/tilesets/secondary/battle_frontier/palettes/01.gbapal"
.incbin "data/graphics/tilesets/secondary/battle_frontier/palettes/02.gbapal"
@@ -1513,12 +1513,12 @@ gTilesetPalettes_BattleFrontier: @ 8384BC8
.align 2, 0
-gTilesetTiles_BattlePalace: @ 8384DC8
+gTilesetTiles_BattlePalace:: @ 8384DC8
.incbin "data/graphics/tilesets/secondary/battle_palace/tiles.4bpp.lz"
.align 2, 0
-gTilesetPalettes_BattlePalace: @ 8385540
+gTilesetPalettes_BattlePalace:: @ 8385540
.incbin "data/graphics/tilesets/secondary/battle_palace/palettes/00.gbapal"
.incbin "data/graphics/tilesets/secondary/battle_palace/palettes/01.gbapal"
.incbin "data/graphics/tilesets/secondary/battle_palace/palettes/02.gbapal"
@@ -1538,12 +1538,12 @@ gTilesetPalettes_BattlePalace: @ 8385540
.align 2, 0
-gTilesetTiles_BattleDome: @ 8385740
+gTilesetTiles_BattleDome:: @ 8385740
.incbin "data/graphics/tilesets/secondary/battle_dome/tiles.4bpp.lz"
.align 2, 0
-gTilesetPalettes_BattleDome: @ 8386990
+gTilesetPalettes_BattleDome:: @ 8386990
.incbin "data/graphics/tilesets/secondary/battle_dome/palettes/00.gbapal"
.incbin "data/graphics/tilesets/secondary/battle_dome/palettes/01.gbapal"
.incbin "data/graphics/tilesets/secondary/battle_dome/palettes/02.gbapal"
@@ -1563,12 +1563,12 @@ gTilesetPalettes_BattleDome: @ 8386990
.align 2, 0
-gTilesetTiles_BattleFactory: @ 8386B90
+gTilesetTiles_BattleFactory:: @ 8386B90
.incbin "data/graphics/tilesets/secondary/battle_factory/tiles.4bpp.lz"
.align 2, 0
-gTilesetPalettes_BattleFactory: @ 8387D7C
+gTilesetPalettes_BattleFactory:: @ 8387D7C
.incbin "data/graphics/tilesets/secondary/battle_factory/palettes/00.gbapal"
.incbin "data/graphics/tilesets/secondary/battle_factory/palettes/01.gbapal"
.incbin "data/graphics/tilesets/secondary/battle_factory/palettes/02.gbapal"
@@ -1588,12 +1588,12 @@ gTilesetPalettes_BattleFactory: @ 8387D7C
.align 2, 0
-gTilesetTiles_BattlePike: @ 8387F7C
+gTilesetTiles_BattlePike:: @ 8387F7C
.incbin "data/graphics/tilesets/secondary/battle_pike/tiles.4bpp.lz"
.align 2, 0
-gTilesetPalettes_BattlePike: @ 8389250
+gTilesetPalettes_BattlePike:: @ 8389250
.incbin "data/graphics/tilesets/secondary/battle_pike/palettes/00.gbapal"
.incbin "data/graphics/tilesets/secondary/battle_pike/palettes/01.gbapal"
.incbin "data/graphics/tilesets/secondary/battle_pike/palettes/02.gbapal"
@@ -1613,12 +1613,12 @@ gTilesetPalettes_BattlePike: @ 8389250
.align 2, 0
-gTilesetTiles_BattleArena: @ 8389450
+gTilesetTiles_BattleArena:: @ 8389450
.incbin "data/graphics/tilesets/secondary/battle_arena/tiles.4bpp.lz"
.align 2, 0
-gTilesetPalettes_BattleArena: @ 8389F8C
+gTilesetPalettes_BattleArena:: @ 8389F8C
.incbin "data/graphics/tilesets/secondary/battle_arena/palettes/00.gbapal"
.incbin "data/graphics/tilesets/secondary/battle_arena/palettes/01.gbapal"
.incbin "data/graphics/tilesets/secondary/battle_arena/palettes/02.gbapal"
@@ -1638,12 +1638,12 @@ gTilesetPalettes_BattleArena: @ 8389F8C
.align 2, 0
-gTilesetTiles_BattlePyramid: @ 838A18C
+gTilesetTiles_BattlePyramid:: @ 838A18C
.incbin "data/graphics/tilesets/secondary/battle_pyramid/tiles.4bpp.lz"
.align 2, 0
-gTilesetPalettes_BattlePyramid: @ 838B39C
+gTilesetPalettes_BattlePyramid:: @ 838B39C
.incbin "data/graphics/tilesets/secondary/battle_pyramid/palettes/00.gbapal"
.incbin "data/graphics/tilesets/secondary/battle_pyramid/palettes/01.gbapal"
.incbin "data/graphics/tilesets/secondary/battle_pyramid/palettes/02.gbapal"
@@ -1663,12 +1663,12 @@ gTilesetPalettes_BattlePyramid: @ 838B39C
.align 2, 0
-gTilesetTiles_MirageTower: @ 838B59C
+gTilesetTiles_MirageTower:: @ 838B59C
.incbin "data/graphics/tilesets/secondary/mirage_tower/tiles.4bpp.lz"
.align 2, 0
-gTilesetPalettes_MirageTower: @ 838CFE4
+gTilesetPalettes_MirageTower:: @ 838CFE4
.incbin "data/graphics/tilesets/secondary/mirage_tower/palettes/00.gbapal"
.incbin "data/graphics/tilesets/secondary/mirage_tower/palettes/01.gbapal"
.incbin "data/graphics/tilesets/secondary/mirage_tower/palettes/02.gbapal"
@@ -1688,12 +1688,12 @@ gTilesetPalettes_MirageTower: @ 838CFE4
.align 2, 0
-gTilesetTiles_MossdeepGameCorner: @ 838D1E4
+gTilesetTiles_MossdeepGameCorner:: @ 838D1E4
.incbin "data/graphics/tilesets/secondary/mossdeep_game_corner/tiles.4bpp.lz"
.align 2, 0
-gTilesetPalettes_MossdeepGameCorner: @ 838D604
+gTilesetPalettes_MossdeepGameCorner:: @ 838D604
.incbin "data/graphics/tilesets/secondary/mossdeep_game_corner/palettes/00.gbapal"
.incbin "data/graphics/tilesets/secondary/mossdeep_game_corner/palettes/01.gbapal"
.incbin "data/graphics/tilesets/secondary/mossdeep_game_corner/palettes/02.gbapal"
@@ -1713,12 +1713,12 @@ gTilesetPalettes_MossdeepGameCorner: @ 838D604
.align 2, 0
-gTilesetTiles_IslandHarbor: @ 838D804
+gTilesetTiles_IslandHarbor:: @ 838D804
.incbin "data/graphics/tilesets/secondary/island_harbor/tiles.4bpp.lz"
.align 2, 0
-gTilesetPalettes_IslandHarbor: @ 838F1D4
+gTilesetPalettes_IslandHarbor:: @ 838F1D4
.incbin "data/graphics/tilesets/secondary/island_harbor/palettes/00.gbapal"
.incbin "data/graphics/tilesets/secondary/island_harbor/palettes/01.gbapal"
.incbin "data/graphics/tilesets/secondary/island_harbor/palettes/02.gbapal"
@@ -1738,12 +1738,12 @@ gTilesetPalettes_IslandHarbor: @ 838F1D4
.align 2, 0
-gTilesetTiles_TrainerHill: @ 838F3D4
+gTilesetTiles_TrainerHill:: @ 838F3D4
.incbin "data/graphics/tilesets/secondary/trainer_hill/tiles.4bpp.lz"
.align 2, 0
-gTilesetPalettes_TrainerHill: @ 83904C4
+gTilesetPalettes_TrainerHill:: @ 83904C4
.incbin "data/graphics/tilesets/secondary/trainer_hill/palettes/00.gbapal"
.incbin "data/graphics/tilesets/secondary/trainer_hill/palettes/01.gbapal"
.incbin "data/graphics/tilesets/secondary/trainer_hill/palettes/02.gbapal"
@@ -1763,12 +1763,12 @@ gTilesetPalettes_TrainerHill: @ 83904C4
.align 2, 0
-gTilesetTiles_NavelRock: @ 83906C4
+gTilesetTiles_NavelRock:: @ 83906C4
.incbin "data/graphics/tilesets/secondary/navel_rock/tiles.4bpp.lz"
.align 2, 0
-gTilesetPalettes_NavelRock: @ 8392258
+gTilesetPalettes_NavelRock:: @ 8392258
.incbin "data/graphics/tilesets/secondary/navel_rock/palettes/00.gbapal"
.incbin "data/graphics/tilesets/secondary/navel_rock/palettes/01.gbapal"
.incbin "data/graphics/tilesets/secondary/navel_rock/palettes/02.gbapal"
@@ -1788,12 +1788,12 @@ gTilesetPalettes_NavelRock: @ 8392258
.align 2, 0
-gTilesetTiles_BattleFrontierRankingHall: @ 8392458
+gTilesetTiles_BattleFrontierRankingHall:: @ 8392458
.incbin "data/graphics/tilesets/secondary/battle_frontier_ranking_hall/tiles.4bpp.lz"
.align 2, 0
-gTilesetPalettes_BattleFrontierRankingHall: @ 8392CAC
+gTilesetPalettes_BattleFrontierRankingHall:: @ 8392CAC
.incbin "data/graphics/tilesets/secondary/battle_frontier_ranking_hall/palettes/00.gbapal"
.incbin "data/graphics/tilesets/secondary/battle_frontier_ranking_hall/palettes/01.gbapal"
.incbin "data/graphics/tilesets/secondary/battle_frontier_ranking_hall/palettes/02.gbapal"
@@ -1813,12 +1813,12 @@ gTilesetPalettes_BattleFrontierRankingHall: @ 8392CAC
.align 2, 0
-gTilesetTiles_BattleTent: @ 8392EAC
+gTilesetTiles_BattleTent:: @ 8392EAC
.incbin "data/graphics/tilesets/secondary/battle_tent/tiles.4bpp.lz"
.align 2, 0
-gTilesetPalettes_BattleTent: @ 8393910
+gTilesetPalettes_BattleTent:: @ 8393910
.incbin "data/graphics/tilesets/secondary/battle_tent/palettes/00.gbapal"
.incbin "data/graphics/tilesets/secondary/battle_tent/palettes/01.gbapal"
.incbin "data/graphics/tilesets/secondary/battle_tent/palettes/02.gbapal"
@@ -1838,12 +1838,12 @@ gTilesetPalettes_BattleTent: @ 8393910
.align 2, 0
-gTilesetTiles_MysteryEventsHouse: @ 8393B10
+gTilesetTiles_MysteryEventsHouse:: @ 8393B10
.incbin "data/graphics/tilesets/secondary/mystery_events_house/tiles.4bpp.lz"
.align 2, 0
-gTilesetPalettes_MysteryEventsHouse: @ 8395478
+gTilesetPalettes_MysteryEventsHouse:: @ 8395478
.incbin "data/graphics/tilesets/secondary/mystery_events_house/palettes/00.gbapal"
.incbin "data/graphics/tilesets/secondary/mystery_events_house/palettes/01.gbapal"
.incbin "data/graphics/tilesets/secondary/mystery_events_house/palettes/02.gbapal"
@@ -1863,7 +1863,7 @@ gTilesetPalettes_MysteryEventsHouse: @ 8395478
.align 2, 0
-gTilesetPalettes_UnionRoom: @ 8395678
+gTilesetPalettes_UnionRoom:: @ 8395678
.incbin "data/graphics/tilesets/secondary/union_room/palettes/00.gbapal"
.incbin "data/graphics/tilesets/secondary/union_room/palettes/01.gbapal"
.incbin "data/graphics/tilesets/secondary/union_room/palettes/02.gbapal"
@@ -1883,5 +1883,5 @@ gTilesetPalettes_UnionRoom: @ 8395678
.align 2, 0
-gTilesetTiles_UnionRoom: @ 8395878
+gTilesetTiles_UnionRoom:: @ 8395878
.incbin "data/graphics/tilesets/secondary/union_room/tiles.4bpp.lz"
diff --git a/data/graphics/tilesets/tilesets.s b/data/graphics/tilesets/tilesets.s
index 62bb8a938..94eca6338 100644
--- a/data/graphics/tilesets/tilesets.s
+++ b/data/graphics/tilesets/tilesets.s
@@ -1,6 +1,6 @@
.align 2, 0
-gTileset_General: @ 83DF704
+gTileset_General:: @ 83DF704
.byte TRUE @ is compressed
.byte FALSE @ is secondary tileset
.2byte 0 @ padding
@@ -12,7 +12,7 @@ gTileset_General: @ 83DF704
.align 2, 0
-gTileset_Petalburg: @ 83DF71C
+gTileset_Petalburg:: @ 83DF71C
.byte TRUE @ is compressed
.byte TRUE @ is secondary tileset
.2byte 0 @ padding
@@ -24,7 +24,7 @@ gTileset_Petalburg: @ 83DF71C
.align 2, 0
-gTileset_Rustboro: @ 83DF734
+gTileset_Rustboro:: @ 83DF734
.byte TRUE @ is compressed
.byte TRUE @ is secondary tileset
.2byte 0 @ padding
@@ -36,7 +36,7 @@ gTileset_Rustboro: @ 83DF734
.align 2, 0
-gTileset_Dewford: @ 83DF74C
+gTileset_Dewford:: @ 83DF74C
.byte TRUE @ is compressed
.byte TRUE @ is secondary tileset
.2byte 0 @ padding
@@ -48,7 +48,7 @@ gTileset_Dewford: @ 83DF74C
.align 2, 0
-gTileset_Slateport: @ 83DF764
+gTileset_Slateport:: @ 83DF764
.byte TRUE @ is compressed
.byte TRUE @ is secondary tileset
.2byte 0 @ padding
@@ -60,7 +60,7 @@ gTileset_Slateport: @ 83DF764
.align 2, 0
-gTileset_Mauville: @ 83DF77C
+gTileset_Mauville:: @ 83DF77C
.byte TRUE @ is compressed
.byte TRUE @ is secondary tileset
.2byte 0 @ padding
@@ -72,7 +72,7 @@ gTileset_Mauville: @ 83DF77C
.align 2, 0
-gTileset_Lavaridge: @ 83DF794
+gTileset_Lavaridge:: @ 83DF794
.byte TRUE @ is compressed
.byte TRUE @ is secondary tileset
.2byte 0 @ padding
@@ -84,7 +84,7 @@ gTileset_Lavaridge: @ 83DF794
.align 2, 0
-gTileset_Fallarbor: @ 83DF7AC
+gTileset_Fallarbor:: @ 83DF7AC
.byte TRUE @ is compressed
.byte TRUE @ is secondary tileset
.2byte 0 @ padding
@@ -96,7 +96,7 @@ gTileset_Fallarbor: @ 83DF7AC
.align 2, 0
-gTileset_Fortree: @ 83DF7C4
+gTileset_Fortree:: @ 83DF7C4
.byte TRUE @ is compressed
.byte TRUE @ is secondary tileset
.2byte 0 @ padding
@@ -108,7 +108,7 @@ gTileset_Fortree: @ 83DF7C4
.align 2, 0
-gTileset_Lilycove: @ 83DF7DC
+gTileset_Lilycove:: @ 83DF7DC
.byte TRUE @ is compressed
.byte TRUE @ is secondary tileset
.2byte 0 @ padding
@@ -120,7 +120,7 @@ gTileset_Lilycove: @ 83DF7DC
.align 2, 0
-gTileset_Mossdeep: @ 83DF7F4
+gTileset_Mossdeep:: @ 83DF7F4
.byte TRUE @ is compressed
.byte TRUE @ is secondary tileset
.2byte 0 @ padding
@@ -132,7 +132,7 @@ gTileset_Mossdeep: @ 83DF7F4
.align 2, 0
-gTileset_EverGrande: @ 83DF80C
+gTileset_EverGrande:: @ 83DF80C
.byte TRUE @ is compressed
.byte TRUE @ is secondary tileset
.2byte 0 @ padding
@@ -144,7 +144,7 @@ gTileset_EverGrande: @ 83DF80C
.align 2, 0
-gTileset_Pacifidlog: @ 83DF824
+gTileset_Pacifidlog:: @ 83DF824
.byte TRUE @ is compressed
.byte TRUE @ is secondary tileset
.2byte 0 @ padding
@@ -156,7 +156,7 @@ gTileset_Pacifidlog: @ 83DF824
.align 2, 0
-gTileset_Sootopolis: @ 83DF83C
+gTileset_Sootopolis:: @ 83DF83C
.byte TRUE @ is compressed
.byte TRUE @ is secondary tileset
.2byte 0 @ padding
@@ -168,7 +168,7 @@ gTileset_Sootopolis: @ 83DF83C
.align 2, 0
-gTileset_BattleFrontierOutsideWest: @ 83DF854
+gTileset_BattleFrontierOutsideWest:: @ 83DF854
.byte TRUE @ is compressed
.byte TRUE @ is secondary tileset
.2byte 0 @ padding
@@ -180,7 +180,7 @@ gTileset_BattleFrontierOutsideWest: @ 83DF854
.align 2, 0
-gTileset_BattleFrontierOutsideEast: @ 83DF86C
+gTileset_BattleFrontierOutsideEast:: @ 83DF86C
.byte TRUE @ is compressed
.byte TRUE @ is secondary tileset
.2byte 0 @ padding
@@ -192,7 +192,7 @@ gTileset_BattleFrontierOutsideEast: @ 83DF86C
.align 2, 0
-gTileset_InsideBuilding: @ 83DF884
+gTileset_InsideBuilding:: @ 83DF884
.byte TRUE @ is compressed
.byte FALSE @ is secondary tileset
.2byte 0 @ padding
@@ -204,7 +204,7 @@ gTileset_InsideBuilding: @ 83DF884
.align 2, 0
-gTileset_Shop: @ 83DF89C
+gTileset_Shop:: @ 83DF89C
.byte TRUE @ is compressed
.byte TRUE @ is secondary tileset
.2byte 0 @ padding
@@ -216,7 +216,7 @@ gTileset_Shop: @ 83DF89C
.align 2, 0
-gTileset_PokemonCenter: @ 83DF8B4
+gTileset_PokemonCenter:: @ 83DF8B4
.byte TRUE @ is compressed
.byte TRUE @ is secondary tileset
.2byte 0 @ padding
@@ -228,7 +228,7 @@ gTileset_PokemonCenter: @ 83DF8B4
.align 2, 0
-gTileset_Cave: @ 83DF8CC
+gTileset_Cave:: @ 83DF8CC
.byte TRUE @ is compressed
.byte TRUE @ is secondary tileset
.2byte 0 @ padding
@@ -240,7 +240,7 @@ gTileset_Cave: @ 83DF8CC
.align 2, 0
-gTileset_PokemonSchool: @ 83DF8E4
+gTileset_PokemonSchool:: @ 83DF8E4
.byte TRUE @ is compressed
.byte TRUE @ is secondary tileset
.2byte 0 @ padding
@@ -252,7 +252,7 @@ gTileset_PokemonSchool: @ 83DF8E4
.align 2, 0
-gTileset_PokemonFanClub: @ 83DF8FC
+gTileset_PokemonFanClub:: @ 83DF8FC
.byte TRUE @ is compressed
.byte TRUE @ is secondary tileset
.2byte 0 @ padding
@@ -264,7 +264,7 @@ gTileset_PokemonFanClub: @ 83DF8FC
.align 2, 0
-gTileset_Unused1: @ 83DF914
+gTileset_Unused1:: @ 83DF914
.byte TRUE @ is compressed
.byte TRUE @ is secondary tileset
.2byte 0 @ padding
@@ -276,7 +276,7 @@ gTileset_Unused1: @ 83DF914
.align 2, 0
-gTileset_MeteorFalls: @ 83DF92C
+gTileset_MeteorFalls:: @ 83DF92C
.byte TRUE @ is compressed
.byte TRUE @ is secondary tileset
.2byte 0 @ padding
@@ -288,7 +288,7 @@ gTileset_MeteorFalls: @ 83DF92C
.align 2, 0
-gTileset_OceanicMuseum: @ 83DF944
+gTileset_OceanicMuseum:: @ 83DF944
.byte TRUE @ is compressed
.byte TRUE @ is secondary tileset
.2byte 0 @ padding
@@ -300,7 +300,7 @@ gTileset_OceanicMuseum: @ 83DF944
.align 2, 0
-gTileset_CableClub: @ 83DF95C
+gTileset_CableClub:: @ 83DF95C
.byte FALSE @ is compressed
.byte TRUE @ is secondary tileset
.2byte 0 @ padding
@@ -312,7 +312,7 @@ gTileset_CableClub: @ 83DF95C
.align 2, 0
-gTileset_SeashoreHouse: @ 83DF974
+gTileset_SeashoreHouse:: @ 83DF974
.byte TRUE @ is compressed
.byte TRUE @ is secondary tileset
.2byte 0 @ padding
@@ -324,7 +324,7 @@ gTileset_SeashoreHouse: @ 83DF974
.align 2, 0
-gTileset_PrettyPetalFlowerShop: @ 83DF98C
+gTileset_PrettyPetalFlowerShop:: @ 83DF98C
.byte TRUE @ is compressed
.byte TRUE @ is secondary tileset
.2byte 0 @ padding
@@ -336,7 +336,7 @@ gTileset_PrettyPetalFlowerShop: @ 83DF98C
.align 2, 0
-gTileset_PokemonDayCare: @ 83DF9A4
+gTileset_PokemonDayCare:: @ 83DF9A4
.byte TRUE @ is compressed
.byte TRUE @ is secondary tileset
.2byte 0 @ padding
@@ -348,7 +348,7 @@ gTileset_PokemonDayCare: @ 83DF9A4
.align 2, 0
-gTileset_Facility: @ 83DF9BC
+gTileset_Facility:: @ 83DF9BC
.byte TRUE @ is compressed
.byte TRUE @ is secondary tileset
.2byte 0 @ padding
@@ -360,7 +360,7 @@ gTileset_Facility: @ 83DF9BC
.align 2, 0
-gTileset_BikeShop: @ 83DF9D4
+gTileset_BikeShop:: @ 83DF9D4
.byte TRUE @ is compressed
.byte TRUE @ is secondary tileset
.2byte 0 @ padding
@@ -372,7 +372,7 @@ gTileset_BikeShop: @ 83DF9D4
.align 2, 0
-gTileset_RusturfTunnel: @ 83DF9EC
+gTileset_RusturfTunnel:: @ 83DF9EC
.byte TRUE @ is compressed
.byte TRUE @ is secondary tileset
.2byte 0 @ padding
@@ -384,7 +384,7 @@ gTileset_RusturfTunnel: @ 83DF9EC
.align 2, 0
-gTileset_SecretBaseBrownCave: @ 83DFA04
+gTileset_SecretBaseBrownCave:: @ 83DFA04
.byte FALSE @ is compressed
.byte TRUE @ is secondary tileset
.2byte 0 @ padding
@@ -396,7 +396,7 @@ gTileset_SecretBaseBrownCave: @ 83DFA04
.align 2, 0
-gTileset_SecretBaseTree: @ 83DFA1C
+gTileset_SecretBaseTree:: @ 83DFA1C
.byte FALSE @ is compressed
.byte TRUE @ is secondary tileset
.2byte 0 @ padding
@@ -408,7 +408,7 @@ gTileset_SecretBaseTree: @ 83DFA1C
.align 2, 0
-gTileset_SecretBaseShrub: @ 83DFA34
+gTileset_SecretBaseShrub:: @ 83DFA34
.byte FALSE @ is compressed
.byte TRUE @ is secondary tileset
.2byte 0 @ padding
@@ -420,7 +420,7 @@ gTileset_SecretBaseShrub: @ 83DFA34
.align 2, 0
-gTileset_SecretBaseBlueCave: @ 83DFA4C
+gTileset_SecretBaseBlueCave:: @ 83DFA4C
.byte FALSE @ is compressed
.byte TRUE @ is secondary tileset
.2byte 0 @ padding
@@ -432,7 +432,7 @@ gTileset_SecretBaseBlueCave: @ 83DFA4C
.align 2, 0
-gTileset_SecretBaseYellowCave: @ 83DFA64
+gTileset_SecretBaseYellowCave:: @ 83DFA64
.byte FALSE @ is compressed
.byte TRUE @ is secondary tileset
.2byte 0 @ padding
@@ -444,7 +444,7 @@ gTileset_SecretBaseYellowCave: @ 83DFA64
.align 2, 0
-gTileset_SecretBaseRedCave: @ 83DFA7C
+gTileset_SecretBaseRedCave:: @ 83DFA7C
.byte FALSE @ is compressed
.byte TRUE @ is secondary tileset
.2byte 0 @ padding
@@ -456,7 +456,7 @@ gTileset_SecretBaseRedCave: @ 83DFA7C
.align 2, 0
-gTileset_InsideOfTruck: @ 83DFA94
+gTileset_InsideOfTruck:: @ 83DFA94
.byte TRUE @ is compressed
.byte TRUE @ is secondary tileset
.2byte 0 @ padding
@@ -468,7 +468,7 @@ gTileset_InsideOfTruck: @ 83DFA94
.align 2, 0
-gTileset_Unused2: @ 83DFAAC
+gTileset_Unused2:: @ 83DFAAC
.byte TRUE @ is compressed
.byte TRUE @ is secondary tileset
.2byte 0 @ padding
@@ -480,7 +480,7 @@ gTileset_Unused2: @ 83DFAAC
.align 2, 0
-gTileset_Contest: @ 83DFAC4
+gTileset_Contest:: @ 83DFAC4
.byte TRUE @ is compressed
.byte TRUE @ is secondary tileset
.2byte 0 @ padding
@@ -492,7 +492,7 @@ gTileset_Contest: @ 83DFAC4
.align 2, 0
-gTileset_LilycoveMuseum: @ 83DFADC
+gTileset_LilycoveMuseum:: @ 83DFADC
.byte TRUE @ is compressed
.byte TRUE @ is secondary tileset
.2byte 0 @ padding
@@ -504,7 +504,7 @@ gTileset_LilycoveMuseum: @ 83DFADC
.align 2, 0
-gTileset_BrendansMaysHouse: @ 83DFAF4
+gTileset_BrendansMaysHouse:: @ 83DFAF4
.byte TRUE @ is compressed
.byte TRUE @ is secondary tileset
.2byte 0 @ padding
@@ -516,7 +516,7 @@ gTileset_BrendansMaysHouse: @ 83DFAF4
.align 2, 0
-gTileset_Lab: @ 83DFB0C
+gTileset_Lab:: @ 83DFB0C
.byte TRUE @ is compressed
.byte TRUE @ is secondary tileset
.2byte 0 @ padding
@@ -528,7 +528,7 @@ gTileset_Lab: @ 83DFB0C
.align 2, 0
-gTileset_Underwater: @ 83DFB24
+gTileset_Underwater:: @ 83DFB24
.byte TRUE @ is compressed
.byte TRUE @ is secondary tileset
.2byte 0 @ padding
@@ -540,7 +540,7 @@ gTileset_Underwater: @ 83DFB24
.align 2, 0
-gTileset_PetalburgGym: @ 83DFB3C
+gTileset_PetalburgGym:: @ 83DFB3C
.byte TRUE @ is compressed
.byte TRUE @ is secondary tileset
.2byte 0 @ padding
@@ -552,7 +552,7 @@ gTileset_PetalburgGym: @ 83DFB3C
.align 2, 0
-gTileset_SootopolisGym: @ 83DFB54
+gTileset_SootopolisGym:: @ 83DFB54
.byte TRUE @ is compressed
.byte TRUE @ is secondary tileset
.2byte 0 @ padding
@@ -564,7 +564,7 @@ gTileset_SootopolisGym: @ 83DFB54
.align 2, 0
-gTileset_GenericBuilding: @ 83DFB6C
+gTileset_GenericBuilding:: @ 83DFB6C
.byte TRUE @ is compressed
.byte TRUE @ is secondary tileset
.2byte 0 @ padding
@@ -576,7 +576,7 @@ gTileset_GenericBuilding: @ 83DFB6C
.align 2, 0
-gTileset_MauvilleGameCorner: @ 83DFB84
+gTileset_MauvilleGameCorner:: @ 83DFB84
.byte TRUE @ is compressed
.byte TRUE @ is secondary tileset
.2byte 0 @ padding
@@ -588,7 +588,7 @@ gTileset_MauvilleGameCorner: @ 83DFB84
.align 2, 0
-gTileset_RustboroGym: @ 83DFB9C
+gTileset_RustboroGym:: @ 83DFB9C
.byte TRUE @ is compressed
.byte TRUE @ is secondary tileset
.2byte 0 @ padding
@@ -600,7 +600,7 @@ gTileset_RustboroGym: @ 83DFB9C
.align 2, 0
-gTileset_DewfordGym: @ 83DFBB4
+gTileset_DewfordGym:: @ 83DFBB4
.byte TRUE @ is compressed
.byte TRUE @ is secondary tileset
.2byte 0 @ padding
@@ -612,7 +612,7 @@ gTileset_DewfordGym: @ 83DFBB4
.align 2, 0
-gTileset_MauvilleGym: @ 83DFBCC
+gTileset_MauvilleGym:: @ 83DFBCC
.byte TRUE @ is compressed
.byte TRUE @ is secondary tileset
.2byte 0 @ padding
@@ -624,7 +624,7 @@ gTileset_MauvilleGym: @ 83DFBCC
.align 2, 0
-gTileset_LavaridgeGym: @ 83DFBE4
+gTileset_LavaridgeGym:: @ 83DFBE4
.byte TRUE @ is compressed
.byte TRUE @ is secondary tileset
.2byte 0 @ padding
@@ -636,7 +636,7 @@ gTileset_LavaridgeGym: @ 83DFBE4
.align 2, 0
-gTileset_TrickHousePuzzle: @ 83DFBFC
+gTileset_TrickHousePuzzle:: @ 83DFBFC
.byte TRUE @ is compressed
.byte TRUE @ is secondary tileset
.2byte 0 @ padding
@@ -648,7 +648,7 @@ gTileset_TrickHousePuzzle: @ 83DFBFC
.align 2, 0
-gTileset_FortreeGym: @ 83DFC14
+gTileset_FortreeGym:: @ 83DFC14
.byte TRUE @ is compressed
.byte TRUE @ is secondary tileset
.2byte 0 @ padding
@@ -660,7 +660,7 @@ gTileset_FortreeGym: @ 83DFC14
.align 2, 0
-gTileset_MossdeepGym: @ 83DFC2C
+gTileset_MossdeepGym:: @ 83DFC2C
.byte TRUE @ is compressed
.byte TRUE @ is secondary tileset
.2byte 0 @ padding
@@ -672,7 +672,7 @@ gTileset_MossdeepGym: @ 83DFC2C
.align 2, 0
-gTileset_InsideShip: @ 83DFC44
+gTileset_InsideShip:: @ 83DFC44
.byte TRUE @ is compressed
.byte TRUE @ is secondary tileset
.2byte 0 @ padding
@@ -684,7 +684,7 @@ gTileset_InsideShip: @ 83DFC44
.align 2, 0
-gTileset_SecretBase: @ 83DFC5C
+gTileset_SecretBase:: @ 83DFC5C
.byte FALSE @ is compressed
.byte FALSE @ is secondary tileset
.2byte 0 @ padding
@@ -696,17 +696,17 @@ gTileset_SecretBase: @ 83DFC5C
.align 2, 0
-gTilesetPointer_SecretBase: @ 83DFC74
+gTilesetPointer_SecretBase:: @ 83DFC74
.4byte gTileset_SecretBase
.align 2, 0
-gTilesetPointer_SecretBaseRedCave: @ 83DFC78
+gTilesetPointer_SecretBaseRedCave:: @ 83DFC78
.4byte gTileset_SecretBaseRedCave
.align 2, 0
-gTileset_EliteFour: @ 83DFC7C
+gTileset_EliteFour:: @ 83DFC7C
.byte TRUE @ is compressed
.byte TRUE @ is secondary tileset
.2byte 0 @ padding
@@ -718,7 +718,7 @@ gTileset_EliteFour: @ 83DFC7C
.align 2, 0
-gTileset_BattleFrontier: @ 83DFC94
+gTileset_BattleFrontier:: @ 83DFC94
.byte TRUE @ is compressed
.byte TRUE @ is secondary tileset
.2byte 0 @ padding
@@ -730,7 +730,7 @@ gTileset_BattleFrontier: @ 83DFC94
.align 2, 0
-gTileset_BattlePalace: @ 83DFCAC
+gTileset_BattlePalace:: @ 83DFCAC
.byte TRUE @ is compressed
.byte TRUE @ is secondary tileset
.2byte 0 @ padding
@@ -742,7 +742,7 @@ gTileset_BattlePalace: @ 83DFCAC
.align 2, 0
-gTileset_BattleDome: @ 83DFCC4
+gTileset_BattleDome:: @ 83DFCC4
.byte TRUE @ is compressed
.byte TRUE @ is secondary tileset
.2byte 0 @ padding
@@ -754,7 +754,7 @@ gTileset_BattleDome: @ 83DFCC4
.align 2, 0
-gTileset_BattleFactory: @ 83DFCDC
+gTileset_BattleFactory:: @ 83DFCDC
.byte TRUE @ is compressed
.byte TRUE @ is secondary tileset
.2byte 0 @ padding
@@ -766,7 +766,7 @@ gTileset_BattleFactory: @ 83DFCDC
.align 2, 0
-gTileset_BattlePike: @ 83DFCF4
+gTileset_BattlePike:: @ 83DFCF4
.byte TRUE @ is compressed
.byte TRUE @ is secondary tileset
.2byte 0 @ padding
@@ -778,7 +778,7 @@ gTileset_BattlePike: @ 83DFCF4
.align 2, 0
-gTileset_BattleArena: @ 83DFD0C
+gTileset_BattleArena:: @ 83DFD0C
.byte TRUE @ is compressed
.byte TRUE @ is secondary tileset
.2byte 0 @ padding
@@ -790,7 +790,7 @@ gTileset_BattleArena: @ 83DFD0C
.align 2, 0
-gTileset_BattlePyramid: @ 83DFD24
+gTileset_BattlePyramid:: @ 83DFD24
.byte TRUE @ is compressed
.byte TRUE @ is secondary tileset
.2byte 0 @ padding
@@ -802,7 +802,7 @@ gTileset_BattlePyramid: @ 83DFD24
.align 2, 0
-gTileset_MirageTower: @ 83DFD3C
+gTileset_MirageTower:: @ 83DFD3C
.byte TRUE @ is compressed
.byte TRUE @ is secondary tileset
.2byte 0 @ padding
@@ -814,7 +814,7 @@ gTileset_MirageTower: @ 83DFD3C
.align 2, 0
-gTileset_MossdeepGameCorner: @ 83DFD54
+gTileset_MossdeepGameCorner:: @ 83DFD54
.byte TRUE @ is compressed
.byte TRUE @ is secondary tileset
.2byte 0 @ padding
@@ -826,7 +826,7 @@ gTileset_MossdeepGameCorner: @ 83DFD54
.align 2, 0
-gTileset_IslandHarbor: @ 83DFD6C
+gTileset_IslandHarbor:: @ 83DFD6C
.byte TRUE @ is compressed
.byte TRUE @ is secondary tileset
.2byte 0 @ padding
@@ -838,7 +838,7 @@ gTileset_IslandHarbor: @ 83DFD6C
.align 2, 0
-gTileset_TrainerHill: @ 83DFD84
+gTileset_TrainerHill:: @ 83DFD84
.byte TRUE @ is compressed
.byte TRUE @ is secondary tileset
.2byte 0 @ padding
@@ -850,7 +850,7 @@ gTileset_TrainerHill: @ 83DFD84
.align 2, 0
-gTileset_NavelRock: @ 83DFD9C
+gTileset_NavelRock:: @ 83DFD9C
.byte TRUE @ is compressed
.byte TRUE @ is secondary tileset
.2byte 0 @ padding
@@ -862,7 +862,7 @@ gTileset_NavelRock: @ 83DFD9C
.align 2, 0
-gTileset_BattleFrontierRankingHall: @ 83DFDB4
+gTileset_BattleFrontierRankingHall:: @ 83DFDB4
.byte TRUE @ is compressed
.byte TRUE @ is secondary tileset
.2byte 0 @ padding
@@ -874,7 +874,7 @@ gTileset_BattleFrontierRankingHall: @ 83DFDB4
.align 2, 0
-gTileset_BattleTent: @ 83DFDCC
+gTileset_BattleTent:: @ 83DFDCC
.byte TRUE @ is compressed
.byte TRUE @ is secondary tileset
.2byte 0 @ padding
@@ -886,7 +886,7 @@ gTileset_BattleTent: @ 83DFDCC
.align 2, 0
-gTileset_MysteryEventsHouse: @ 83DFDE4
+gTileset_MysteryEventsHouse:: @ 83DFDE4
.byte TRUE @ is compressed
.byte TRUE @ is secondary tileset
.2byte 0 @ padding
@@ -898,7 +898,7 @@ gTileset_MysteryEventsHouse: @ 83DFDE4
.align 2, 0
-gTileset_UnionRoom: @ 83DFDFC
+gTileset_UnionRoom:: @ 83DFDFC
.byte TRUE @ is compressed
.byte TRUE @ is secondary tileset
.2byte 0 @ padding