diff options
| author | YamaArashi <shadow962@live.com> | 2016-09-03 14:31:43 -0700 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2016-09-03 14:31:43 -0700 |
| commit | f5879e72d9e4d11c30b071dc1e86cc2085a07685 (patch) | |
| tree | ec47b81f0d902a6d9c68341c67a4d6ec47cb14b8 /data/tilesets | |
| parent | 5af8ba570c5c5ebfde59bef6c3f262c04ca17746 (diff) | |
clean up aligns
Diffstat (limited to 'data/tilesets')
| -rw-r--r-- | data/tilesets/metatiles.s | 420 | ||||
| -rw-r--r-- | data/tilesets/tileset_graphics.s | 468 | ||||
| -rw-r--r-- | data/tilesets/tilesets.s | 231 |
3 files changed, 373 insertions, 746 deletions
diff --git a/data/tilesets/metatiles.s b/data/tilesets/metatiles.s index 329cc3555..daa7aee76 100644 --- a/data/tilesets/metatiles.s +++ b/data/tilesets/metatiles.s @@ -1,699 +1,559 @@ - .align 1, 0 - + .align 1 gMetatiles_General:: @ 83960F0 .incbin "base_emerald.gba", 0x3960f0, 0x2000 - .align 1, 0 - + .align 1 gMetatileAttributes_General:: @ 83980F0 .incbin "base_emerald.gba", 0x3980f0, 0x400 - .align 1, 0 - + .align 1 gMetatiles_Petalburg:: @ 83984F0 .incbin "base_emerald.gba", 0x3984f0, 0x900 - .align 1, 0 - + .align 1 gMetatileAttributes_Petalburg:: @ 8398DF0 .incbin "base_emerald.gba", 0x398df0, 0x120 - .align 1, 0 - + .align 1 gMetatiles_Rustboro:: @ 8398F10 .incbin "base_emerald.gba", 0x398f10, 0x15e0 - .align 1, 0 - + .align 1 gMetatileAttributes_Rustboro:: @ 839A4F0 .incbin "base_emerald.gba", 0x39a4f0, 0x2bc - .align 1, 0 - + .align 1 gMetatiles_Dewford:: @ 839A7AC .incbin "base_emerald.gba", 0x39a7ac, 0x17b0 - .align 1, 0 - + .align 1 gMetatileAttributes_Dewford:: @ 839BF5C .incbin "base_emerald.gba", 0x39bf5c, 0x2f6 - .align 1, 0 - + .align 1 gMetatiles_Slateport:: @ 839C252 .incbin "base_emerald.gba", 0x39c252, 0x1960 - .align 1, 0 - + .align 1 gMetatileAttributes_Slateport:: @ 839DBB2 .incbin "base_emerald.gba", 0x39dbb2, 0x32c - .align 1, 0 - + .align 1 gMetatiles_Mauville:: @ 839DEDE .incbin "base_emerald.gba", 0x39dede, 0x1fe0 - .align 1, 0 - + .align 1 gMetatileAttributes_Mauville:: @ 839FEBE .incbin "base_emerald.gba", 0x39febe, 0x3fc - .align 1, 0 - + .align 1 gMetatiles_Lavaridge:: @ 83A02BA .incbin "base_emerald.gba", 0x3a02ba, 0x1b90 - .align 1, 0 - + .align 1 gMetatileAttributes_Lavaridge:: @ 83A1E4A .incbin "base_emerald.gba", 0x3a1e4a, 0x372 - .align 1, 0 - + .align 1 gMetatiles_Fallarbor:: @ 83A21BC .incbin "base_emerald.gba", 0x3a21bc, 0x16f0 - .align 1, 0 - + .align 1 gMetatileAttributes_Fallarbor:: @ 83A38AC .incbin "base_emerald.gba", 0x3a38ac, 0x2de - .align 1, 0 - + .align 1 gMetatiles_Fortree:: @ 83A3B8A .incbin "base_emerald.gba", 0x3a3b8a, 0x1180 - .align 1, 0 - + .align 1 gMetatileAttributes_Fortree:: @ 83A4D0A .incbin "base_emerald.gba", 0x3a4d0a, 0x230 - .align 1, 0 - + .align 1 gMetatiles_Lilycove:: @ 83A4F3A .incbin "base_emerald.gba", 0x3a4f3a, 0x15f0 - .align 1, 0 - + .align 1 gMetatileAttributes_Lilycove:: @ 83A652A .incbin "base_emerald.gba", 0x3a652a, 0x2be - .align 1, 0 - + .align 1 gMetatiles_Mossdeep:: @ 83A67E8 .incbin "base_emerald.gba", 0x3a67e8, 0x1c60 - .align 1, 0 - + .align 1 gMetatileAttributes_Mossdeep:: @ 83A8448 .incbin "base_emerald.gba", 0x3a8448, 0x38c - .align 1, 0 - + .align 1 gMetatiles_EverGrande:: @ 83A87D4 .incbin "base_emerald.gba", 0x3a87d4, 0xa80 - .align 1, 0 - + .align 1 gMetatileAttributes_EverGrande:: @ 83A9254 .incbin "base_emerald.gba", 0x3a9254, 0x150 - .align 1, 0 - + .align 1 gMetatiles_Pacifidlog:: @ 83A93A4 .incbin "base_emerald.gba", 0x3a93a4, 0xcb0 - .align 1, 0 - + .align 1 gMetatileAttributes_Pacifidlog:: @ 83AA054 .incbin "base_emerald.gba", 0x3aa054, 0x196 - .align 1, 0 - + .align 1 gMetatiles_Sootopolis:: @ 83AA1EA .incbin "base_emerald.gba", 0x3aa1ea, 0xfe0 - .align 1, 0 - + .align 1 gMetatileAttributes_Sootopolis:: @ 83AB1CA .incbin "base_emerald.gba", 0x3ab1ca, 0x1fc - .align 1, 0 - + .align 1 gMetatiles_BattleFrontierOutsideWest:: @ 83AB3C6 .incbin "base_emerald.gba", 0x3ab3c6, 0x1fe0 - .align 1, 0 - + .align 1 gMetatileAttributes_BattleFrontierOutsideWest:: @ 83AD3A6 .incbin "base_emerald.gba", 0x3ad3a6, 0x3fc - .align 1, 0 - + .align 1 gMetatiles_BattleFrontierOutsideEast:: @ 83AD7A2 .incbin "base_emerald.gba", 0x3ad7a2, 0x1fe0 - .align 1, 0 - + .align 1 gMetatileAttributes_BattleFrontierOutsideEast:: @ 83AF782 .incbin "base_emerald.gba", 0x3af782, 0x3fc - .align 1, 0 - + .align 1 gMetatiles_InsideBuilding:: @ 83AFB7E .incbin "base_emerald.gba", 0x3afb7e, 0x80 - .align 1, 0 - + .align 1 gMetatileAttributes_InsideBuilding:: @ 83AFBFE .incbin "base_emerald.gba", 0x3afbfe, 0x10 - .align 1, 0 - + .align 1 gMetatiles_Shop:: @ 83AFC0E .incbin "base_emerald.gba", 0x3afc0e, 0x1210 - .align 1, 0 - + .align 1 gMetatileAttributes_Shop:: @ 83B0E1E .incbin "base_emerald.gba", 0x3b0e1e, 0x242 - .align 1, 0 - + .align 1 gMetatiles_PokemonCenter:: @ 83B1060 .incbin "base_emerald.gba", 0x3b1060, 0xe80 - .align 1, 0 - + .align 1 gMetatileAttributes_PokemonCenter:: @ 83B1EE0 .incbin "base_emerald.gba", 0x3b1ee0, 0x1d0 - .align 1, 0 - + .align 1 gMetatiles_Cave:: @ 83B20B0 .incbin "base_emerald.gba", 0x3b20b0, 0x19e0 - .align 1, 0 - + .align 1 gMetatileAttributes_Cave:: @ 83B3A90 .incbin "base_emerald.gba", 0x3b3a90, 0x33c - .align 1, 0 - + .align 1 gMetatiles_PokemonSchool:: @ 83B3DCC .incbin "base_emerald.gba", 0x3b3dcc, 0x3a0 - .align 1, 0 - + .align 1 gMetatileAttributes_PokemonSchool:: @ 83B416C .incbin "base_emerald.gba", 0x3b416c, 0x74 - .align 1, 0 - + .align 1 gMetatiles_PokemonFanClub:: @ 83B41E0 .incbin "base_emerald.gba", 0x3b41e0, 0x680 - .align 1, 0 - + .align 1 gMetatileAttributes_PokemonFanClub:: @ 83B4860 .incbin "base_emerald.gba", 0x3b4860, 0xd0 - .align 1, 0 - + .align 1 gMetatiles_Unused1:: @ 83B4930 .incbin "base_emerald.gba", 0x3b4930, 0x20 - .align 1, 0 - + .align 1 gMetatileAttributes_Unused1:: @ 83B4950 .incbin "base_emerald.gba", 0x3b4950, 0x4 - .align 1, 0 - + .align 1 gMetatiles_MeteorFalls:: @ 83B4954 .incbin "base_emerald.gba", 0x3b4954, 0x9f0 - .align 1, 0 - + .align 1 gMetatileAttributes_MeteorFalls:: @ 83B5344 .incbin "base_emerald.gba", 0x3b5344, 0x13e - .align 1, 0 - + .align 1 gMetatiles_OceanicMuseum:: @ 83B5482 .incbin "base_emerald.gba", 0x3b5482, 0x7a0 - .align 1, 0 - + .align 1 gMetatileAttributes_OceanicMuseum:: @ 83B5C22 .incbin "base_emerald.gba", 0x3b5c22, 0xf4 - .align 1, 0 - + .align 1 gMetatiles_CableClub:: @ 83B5D16 .incbin "base_emerald.gba", 0x3b5d16, 0x1000 - .align 1, 0 - + .align 1 gMetatileAttributes_CableClub:: @ 83B6D16 .incbin "base_emerald.gba", 0x3b6d16, 0x200 - .align 1, 0 - + .align 1 gMetatiles_SeashoreHouse:: @ 83B6F16 .incbin "base_emerald.gba", 0x3b6f16, 0x380 - .align 1, 0 - + .align 1 gMetatileAttributes_SeashoreHouse:: @ 83B7296 .incbin "base_emerald.gba", 0x3b7296, 0x70 - .align 1, 0 - + .align 1 gMetatiles_PrettyPetalFlowerShop:: @ 83B7306 .incbin "base_emerald.gba", 0x3b7306, 0x480 - .align 1, 0 - + .align 1 gMetatileAttributes_PrettyPetalFlowerShop:: @ 83B7786 .incbin "base_emerald.gba", 0x3b7786, 0x90 - .align 1, 0 - + .align 1 gMetatiles_PokemonDayCare:: @ 83B7816 .incbin "base_emerald.gba", 0x3b7816, 0x440 - .align 1, 0 - + .align 1 gMetatileAttributes_PokemonDayCare:: @ 83B7C56 .incbin "base_emerald.gba", 0x3b7c56, 0x88 - .align 1, 0 - + .align 1 gMetatiles_Facility:: @ 83B7CDE .incbin "base_emerald.gba", 0x3b7cde, 0x1ff0 - .align 1, 0 - + .align 1 gMetatileAttributes_Facility:: @ 83B9CCE .incbin "base_emerald.gba", 0x3b9cce, 0x3fe - .align 1, 0 - + .align 1 gMetatiles_BikeShop:: @ 83BA0CC .incbin "base_emerald.gba", 0x3ba0cc, 0xf80 - .align 1, 0 - + .align 1 gMetatileAttributes_BikeShop:: @ 83BB04C .incbin "base_emerald.gba", 0x3bb04c, 0x1f0 - .align 1, 0 - + .align 1 gMetatiles_RusturfTunnel:: @ 83BB23C .incbin "base_emerald.gba", 0x3bb23c, 0x530 - .align 1, 0 - + .align 1 gMetatileAttributes_RusturfTunnel:: @ 83BB76C .incbin "base_emerald.gba", 0x3bb76c, 0xa6 - .align 1, 0 - + .align 1 gMetatiles_SecretBaseSecondary:: @ 83BB812 .incbin "base_emerald.gba", 0x3bb812, 0x1440 - .align 1, 0 - + .align 1 gMetatileAttributes_SecretBaseSecondary:: @ 83BCC52 .incbin "base_emerald.gba", 0x3bcc52, 0x288 - .align 1, 0 - + .align 1 gMetatiles_InsideOfTruck:: @ 83BCEDA .incbin "base_emerald.gba", 0x3bceda, 0x260 - .align 1, 0 - + .align 1 gMetatileAttributes_InsideOfTruck:: @ 83BD13A .incbin "base_emerald.gba", 0x3bd13a, 0x4c - .align 1, 0 - + .align 1 gMetatiles_Contest:: @ 83BD186 .incbin "base_emerald.gba", 0x3bd186, 0xe90 - .align 1, 0 - + .align 1 gMetatileAttributes_Contest:: @ 83BE016 .incbin "base_emerald.gba", 0x3be016, 0x1d2 - .align 1, 0 - + .align 1 gMetatiles_LilycoveMuseum:: @ 83BE1E8 .incbin "base_emerald.gba", 0x3be1e8, 0x8f0 - .align 1, 0 - + .align 1 gMetatileAttributes_LilycoveMuseum:: @ 83BEAD8 .incbin "base_emerald.gba", 0x3bead8, 0x11e - .align 1, 0 - + .align 1 gMetatiles_BrendansMaysHouse:: @ 83BEBF6 .incbin "base_emerald.gba", 0x3bebf6, 0xc40 - .align 1, 0 - + .align 1 gMetatileAttributes_BrendansMaysHouse:: @ 83BF836 .incbin "base_emerald.gba", 0x3bf836, 0x188 - .align 1, 0 - + .align 1 gMetatiles_Lab:: @ 83BF9BE .incbin "base_emerald.gba", 0x3bf9be, 0x9e0 - .align 1, 0 - + .align 1 gMetatileAttributes_Lab:: @ 83C039E .incbin "base_emerald.gba", 0x3c039e, 0x13c - .align 1, 0 - + .align 1 gMetatiles_Underwater:: @ 83C04DA .incbin "base_emerald.gba", 0x3c04da, 0xec0 - .align 1, 0 - + .align 1 gMetatileAttributes_Underwater:: @ 83C139A .incbin "base_emerald.gba", 0x3c139a, 0x1d8 - .align 1, 0 - + .align 1 gMetatiles_GenericBuilding:: @ 83C1572 .incbin "base_emerald.gba", 0x3c1572, 0x2000 - .align 1, 0 - + .align 1 gMetatileAttributes_GenericBuilding:: @ 83C3572 .incbin "base_emerald.gba", 0x3c3572, 0x400 - .align 1, 0 - + .align 1 gMetatiles_MauvilleGameCorner:: @ 83C3972 .incbin "base_emerald.gba", 0x3c3972, 0x600 - .align 1, 0 - + .align 1 gMetatileAttributes_MauvilleGameCorner:: @ 83C3F72 .incbin "base_emerald.gba", 0x3c3f72, 0xc0 - .align 1, 0 - + .align 1 gMetatiles_Unused2:: @ 83C4032 .incbin "base_emerald.gba", 0x3c4032, 0x3a0 - .align 1, 0 - + .align 1 gMetatileAttributes_Unused2:: @ 83C43D2 .incbin "base_emerald.gba", 0x3c43d2, 0x74 - .align 1, 0 - + .align 1 gMetatiles_RustboroGym:: @ 83C4446 .incbin "base_emerald.gba", 0x3c4446, 0x380 - .align 1, 0 - + .align 1 gMetatileAttributes_RustboroGym:: @ 83C47C6 .incbin "base_emerald.gba", 0x3c47c6, 0x70 - .align 1, 0 - + .align 1 gMetatiles_DewfordGym:: @ 83C4836 .incbin "base_emerald.gba", 0x3c4836, 0x450 - .align 1, 0 - + .align 1 gMetatileAttributes_DewfordGym:: @ 83C4C86 .incbin "base_emerald.gba", 0x3c4c86, 0x8a - .align 1, 0 - + .align 1 gMetatiles_MauvilleGym:: @ 83C4D10 .incbin "base_emerald.gba", 0x3c4d10, 0x750 - .align 1, 0 - + .align 1 gMetatileAttributes_MauvilleGym:: @ 83C5460 .incbin "base_emerald.gba", 0x3c5460, 0xea - .align 1, 0 - + .align 1 gMetatiles_LavaridgeGym:: @ 83C554A .incbin "base_emerald.gba", 0x3c554a, 0x3d0 - .align 1, 0 - + .align 1 gMetatileAttributes_LavaridgeGym:: @ 83C591A .incbin "base_emerald.gba", 0x3c591a, 0x7a - .align 1, 0 - + .align 1 gMetatiles_PetalburgGym:: @ 83C5994 .incbin "base_emerald.gba", 0x3c5994, 0xe00 - .align 1, 0 - + .align 1 gMetatileAttributes_PetalburgGym:: @ 83C6794 .incbin "base_emerald.gba", 0x3c6794, 0x1c0 - .align 1, 0 - + .align 1 gMetatiles_FortreeGym:: @ 83C6954 .incbin "base_emerald.gba", 0x3c6954, 0x500 - .align 1, 0 - + .align 1 gMetatileAttributes_FortreeGym:: @ 83C6E54 .incbin "base_emerald.gba", 0x3c6e54, 0xa0 - .align 1, 0 - + .align 1 gMetatiles_MossdeepGym:: @ 83C6EF4 .incbin "base_emerald.gba", 0x3c6ef4, 0x750 - .align 1, 0 - + .align 1 gMetatileAttributes_MossdeepGym:: @ 83C7644 .incbin "base_emerald.gba", 0x3c7644, 0xea - .align 1, 0 - + .align 1 gMetatiles_SootopolisGym:: @ 83C772E .incbin "base_emerald.gba", 0x3c772e, 0x7a0 - .align 1, 0 - + .align 1 gMetatileAttributes_SootopolisGym:: @ 83C7ECE .incbin "base_emerald.gba", 0x3c7ece, 0xf4 - .align 1, 0 - + .align 1 gMetatiles_TrickHousePuzzle:: @ 83C7FC2 .incbin "base_emerald.gba", 0x3c7fc2, 0xbd0 - .align 1, 0 - + .align 1 gMetatileAttributes_TrickHousePuzzle:: @ 83C8B92 .incbin "base_emerald.gba", 0x3c8b92, 0x17a - .align 1, 0 - + .align 1 gMetatiles_InsideShip:: @ 83C8D0C .incbin "base_emerald.gba", 0x3c8d0c, 0xfc0 - .align 1, 0 - + .align 1 gMetatileAttributes_InsideShip:: @ 83C9CCC .incbin "base_emerald.gba", 0x3c9ccc, 0x1f8 - .align 1, 0 - + .align 1 gMetatiles_SecretBasePrimary:: @ 83C9EC4 .incbin "base_emerald.gba", 0x3c9ec4, 0x20 - .align 1, 0 - + .align 1 gMetatileAttributes_SecretBasePrimary:: @ 83C9EE4 .incbin "base_emerald.gba", 0x3c9ee4, 0x4 - .align 1, 0 - + .align 1 gMetatiles_EliteFour:: @ 83C9EE8 .incbin "base_emerald.gba", 0x3c9ee8, 0x14c0 - .align 1, 0 - + .align 1 gMetatileAttributes_EliteFour:: @ 83CB3A8 .incbin "base_emerald.gba", 0x3cb3a8, 0x298 - .align 1, 0 - + .align 1 gMetatiles_BattleFrontier:: @ 83CB640 .incbin "base_emerald.gba", 0x3cb640, 0x1fd0 - .align 1, 0 - + .align 1 gMetatileAttributes_BattleFrontier:: @ 83CD610 .incbin "base_emerald.gba", 0x3cd610, 0x3fa - .align 1, 0 - + .align 1 gMetatiles_BattlePalace:: @ 83CDA0A .incbin "base_emerald.gba", 0x3cda0a, 0xae0 - .align 1, 0 - + .align 1 gMetatileAttributes_BattlePalace:: @ 83CE4EA .incbin "base_emerald.gba", 0x3ce4ea, 0x15c - .align 1, 0 - + .align 1 gMetatiles_BattleDome:: @ 83CE646 .incbin "base_emerald.gba", 0x3ce646, 0x1ab0 - .align 1, 0 - + .align 1 gMetatileAttributes_BattleDome:: @ 83D00F6 .incbin "base_emerald.gba", 0x3d00f6, 0x356 - .align 1, 0 - + .align 1 gMetatiles_BattleFactory:: @ 83D044C .incbin "base_emerald.gba", 0x3d044c, 0x1620 - .align 1, 0 - + .align 1 gMetatileAttributes_BattleFactory:: @ 83D1A6C .incbin "base_emerald.gba", 0x3d1a6c, 0x2c4 - .align 1, 0 - + .align 1 gMetatiles_BattlePike:: @ 83D1D30 .incbin "base_emerald.gba", 0x3d1d30, 0x15b0 - .align 1, 0 - + .align 1 gMetatileAttributes_BattlePike:: @ 83D32E0 .incbin "base_emerald.gba", 0x3d32e0, 0x2b6 - .align 1, 0 - + .align 1 gMetatiles_BattleArena:: @ 83D3596 .incbin "base_emerald.gba", 0x3d3596, 0xb10 - .align 1, 0 - + .align 1 gMetatileAttributes_BattleArena:: @ 83D40A6 .incbin "base_emerald.gba", 0x3d40a6, 0x162 - .align 1, 0 - + .align 1 gMetatiles_BattlePyramid:: @ 83D4208 .incbin "base_emerald.gba", 0x3d4208, 0xdd0 - .align 1, 0 - + .align 1 gMetatileAttributes_BattlePyramid:: @ 83D4FD8 .incbin "base_emerald.gba", 0x3d4fd8, 0x1ba - .align 1, 0 - + .align 1 gMetatiles_MirageTower:: @ 83D5192 .incbin "base_emerald.gba", 0x3d5192, 0x19e0 - .align 1, 0 - + .align 1 gMetatileAttributes_MirageTower:: @ 83D6B72 .incbin "base_emerald.gba", 0x3d6b72, 0x33c - .align 1, 0 - + .align 1 gMetatiles_MossdeepGameCorner:: @ 83D6EAE .incbin "base_emerald.gba", 0x3d6eae, 0x350 - .align 1, 0 - + .align 1 gMetatileAttributes_MossdeepGameCorner:: @ 83D71FE .incbin "base_emerald.gba", 0x3d71fe, 0x6a - .align 1, 0 - + .align 1 gMetatiles_IslandHarbor:: @ 83D7268 .incbin "base_emerald.gba", 0x3d7268, 0x1d60 - .align 1, 0 - + .align 1 gMetatileAttributes_IslandHarbor:: @ 83D8FC8 .incbin "base_emerald.gba", 0x3d8fc8, 0x3ac - .align 1, 0 - + .align 1 gMetatiles_TrainerHill:: @ 83D9374 .incbin "base_emerald.gba", 0x3d9374, 0x1e60 - .align 1, 0 - + .align 1 gMetatileAttributes_TrainerHill:: @ 83DB1D4 .incbin "base_emerald.gba", 0x3db1d4, 0x3cc - .align 1, 0 - + .align 1 gMetatiles_NavelRock:: @ 83DB5A0 .incbin "base_emerald.gba", 0x3db5a0, 0x1c30 - .align 1, 0 - + .align 1 gMetatileAttributes_NavelRock:: @ 83DD1D0 .incbin "base_emerald.gba", 0x3dd1d0, 0x386 - .align 1, 0 - + .align 1 gMetatiles_BattleFrontierRankingHall:: @ 83DD556 .incbin "base_emerald.gba", 0x3dd556, 0x5e0 - .align 1, 0 - + .align 1 gMetatileAttributes_BattleFrontierRankingHall:: @ 83DDB36 .incbin "base_emerald.gba", 0x3ddb36, 0xbc - .align 1, 0 - + .align 1 gMetatiles_BattleTent:: @ 83DDBF2 .incbin "base_emerald.gba", 0x3ddbf2, 0x10d0 - .align 1, 0 - + .align 1 gMetatileAttributes_BattleTent:: @ 83DECC2 .incbin "base_emerald.gba", 0x3decc2, 0x21a - .align 1, 0 - + .align 1 gMetatiles_MysteryEventsHouse:: @ 83DEEDC .incbin "base_emerald.gba", 0x3deedc, 0x430 - .align 1, 0 - + .align 1 gMetatileAttributes_MysteryEventsHouse:: @ 83DF30C .incbin "base_emerald.gba", 0x3df30c, 0x86 - .align 1, 0 - + .align 1 gMetatiles_UnionRoom:: @ 83DF392 .incbin "base_emerald.gba", 0x3df392, 0x310 - .align 1, 0 - + .align 1 gMetatileAttributes_UnionRoom:: @ 83DF6A2 .incbin "base_emerald.gba", 0x3df6a2, 0x62 diff --git a/data/tilesets/tileset_graphics.s b/data/tilesets/tileset_graphics.s index bc9410477..2d1ddb1f9 100644 --- a/data/tilesets/tileset_graphics.s +++ b/data/tilesets/tileset_graphics.s @@ -1,10 +1,8 @@ - .align 2, 0 - + .align 2 gTilesetTiles_Petalburg:: @ 8339E08 .incbin "data/tilesets/secondary/petalburg/tiles.4bpp.lz" - .align 2, 0 - + .align 2 gTilesetPalettes_Petalburg:: @ 833A704 .incbin "data/tilesets/secondary/petalburg/palettes/00.gbapal" .incbin "data/tilesets/secondary/petalburg/palettes/01.gbapal" @@ -23,13 +21,11 @@ gTilesetPalettes_Petalburg:: @ 833A704 .incbin "data/tilesets/secondary/petalburg/palettes/14.gbapal" .incbin "data/tilesets/secondary/petalburg/palettes/15.gbapal" - .align 2, 0 - + .align 2 gTilesetTiles_Rustboro:: @ 833A904 .incbin "data/tilesets/secondary/rustboro/tiles.4bpp.lz" - .align 2, 0 - + .align 2 gTilesetPalettes_Rustboro:: @ 833BEC0 .incbin "data/tilesets/secondary/rustboro/palettes/00.gbapal" .incbin "data/tilesets/secondary/rustboro/palettes/01.gbapal" @@ -48,13 +44,11 @@ gTilesetPalettes_Rustboro:: @ 833BEC0 .incbin "data/tilesets/secondary/rustboro/palettes/14.gbapal" .incbin "data/tilesets/secondary/rustboro/palettes/15.gbapal" - .align 2, 0 - + .align 2 gTilesetTiles_Dewford:: @ 833C0C0 .incbin "data/tilesets/secondary/dewford/tiles.4bpp.lz" - .align 2, 0 - + .align 2 gTilesetPalettes_Dewford:: @ 833D540 .incbin "data/tilesets/secondary/dewford/palettes/00.gbapal" .incbin "data/tilesets/secondary/dewford/palettes/01.gbapal" @@ -73,13 +67,11 @@ gTilesetPalettes_Dewford:: @ 833D540 .incbin "data/tilesets/secondary/dewford/palettes/14.gbapal" .incbin "data/tilesets/secondary/dewford/palettes/15.gbapal" - .align 2, 0 - + .align 2 gTilesetTiles_Slateport:: @ 833D740 .incbin "data/tilesets/secondary/slateport/tiles.4bpp.lz" - .align 2, 0 - + .align 2 gTilesetPalettes_Slateport:: @ 833F708 .incbin "data/tilesets/secondary/slateport/palettes/00.gbapal" .incbin "data/tilesets/secondary/slateport/palettes/01.gbapal" @@ -98,13 +90,11 @@ gTilesetPalettes_Slateport:: @ 833F708 .incbin "data/tilesets/secondary/slateport/palettes/14.gbapal" .incbin "data/tilesets/secondary/slateport/palettes/15.gbapal" - .align 2, 0 - + .align 2 gTilesetTiles_Mauville:: @ 833F908 .incbin "data/tilesets/secondary/mauville/tiles.4bpp.lz" - .align 2, 0 - + .align 2 gTilesetPalettes_Mauville:: @ 834172C .incbin "data/tilesets/secondary/mauville/palettes/00.gbapal" .incbin "data/tilesets/secondary/mauville/palettes/01.gbapal" @@ -123,13 +113,11 @@ gTilesetPalettes_Mauville:: @ 834172C .incbin "data/tilesets/secondary/mauville/palettes/14.gbapal" .incbin "data/tilesets/secondary/mauville/palettes/15.gbapal" - .align 2, 0 - + .align 2 gTilesetTiles_Lavaridge:: @ 834192C .incbin "data/tilesets/secondary/lavaridge/tiles.4bpp.lz" - .align 2, 0 - + .align 2 gTilesetPalettes_Lavaridge:: @ 8342E28 .incbin "data/tilesets/secondary/lavaridge/palettes/00.gbapal" .incbin "data/tilesets/secondary/lavaridge/palettes/01.gbapal" @@ -148,13 +136,11 @@ gTilesetPalettes_Lavaridge:: @ 8342E28 .incbin "data/tilesets/secondary/lavaridge/palettes/14.gbapal" .incbin "data/tilesets/secondary/lavaridge/palettes/15.gbapal" - .align 2, 0 - + .align 2 gTilesetTiles_Fallarbor:: @ 8343028 .incbin "data/tilesets/secondary/fallarbor/tiles.4bpp.lz" - .align 2, 0 - + .align 2 gTilesetPalettes_Fallarbor:: @ 83447A0 .incbin "data/tilesets/secondary/fallarbor/palettes/00.gbapal" .incbin "data/tilesets/secondary/fallarbor/palettes/01.gbapal" @@ -173,13 +159,11 @@ gTilesetPalettes_Fallarbor:: @ 83447A0 .incbin "data/tilesets/secondary/fallarbor/palettes/14.gbapal" .incbin "data/tilesets/secondary/fallarbor/palettes/15.gbapal" - .align 2, 0 - + .align 2 gTilesetTiles_Fortree:: @ 83449A0 .incbin "data/tilesets/secondary/fortree/tiles.4bpp.lz" - .align 2, 0 - + .align 2 gTilesetPalettes_Fortree:: @ 8346020 .incbin "data/tilesets/secondary/fortree/palettes/00.gbapal" .incbin "data/tilesets/secondary/fortree/palettes/01.gbapal" @@ -198,13 +182,11 @@ gTilesetPalettes_Fortree:: @ 8346020 .incbin "data/tilesets/secondary/fortree/palettes/14.gbapal" .incbin "data/tilesets/secondary/fortree/palettes/15.gbapal" - .align 2, 0 - + .align 2 gTilesetTiles_Lilycove:: @ 8346220 .incbin "data/tilesets/secondary/lilycove/tiles.4bpp.lz" - .align 2, 0 - + .align 2 gTilesetPalettes_Lilycove:: @ 83475C0 .incbin "data/tilesets/secondary/lilycove/palettes/00.gbapal" .incbin "data/tilesets/secondary/lilycove/palettes/01.gbapal" @@ -223,13 +205,11 @@ gTilesetPalettes_Lilycove:: @ 83475C0 .incbin "data/tilesets/secondary/lilycove/palettes/14.gbapal" .incbin "data/tilesets/secondary/lilycove/palettes/15.gbapal" - .align 2, 0 - + .align 2 gTilesetTiles_Mossdeep:: @ 83477C0 .incbin "data/tilesets/secondary/mossdeep/tiles.4bpp.lz" - .align 2, 0 - + .align 2 gTilesetPalettes_Mossdeep:: @ 8348E10 .incbin "data/tilesets/secondary/mossdeep/palettes/00.gbapal" .incbin "data/tilesets/secondary/mossdeep/palettes/01.gbapal" @@ -248,13 +228,11 @@ gTilesetPalettes_Mossdeep:: @ 8348E10 .incbin "data/tilesets/secondary/mossdeep/palettes/14.gbapal" .incbin "data/tilesets/secondary/mossdeep/palettes/15.gbapal" - .align 2, 0 - + .align 2 gTilesetTiles_EverGrande:: @ 8349010 .incbin "data/tilesets/secondary/ever_grande/tiles.4bpp.lz" - .align 2, 0 - + .align 2 gTilesetPalettes_EverGrande:: @ 8349C28 .incbin "data/tilesets/secondary/ever_grande/palettes/00.gbapal" .incbin "data/tilesets/secondary/ever_grande/palettes/01.gbapal" @@ -273,13 +251,11 @@ gTilesetPalettes_EverGrande:: @ 8349C28 .incbin "data/tilesets/secondary/ever_grande/palettes/14.gbapal" .incbin "data/tilesets/secondary/ever_grande/palettes/15.gbapal" - .align 2, 0 - + .align 2 gTilesetTiles_Pacifidlog:: @ 8349E28 .incbin "data/tilesets/secondary/pacifidlog/tiles.4bpp.lz" - .align 2, 0 - + .align 2 gTilesetPalettes_Pacifidlog:: @ 834B5B4 .incbin "data/tilesets/secondary/pacifidlog/palettes/00.gbapal" .incbin "data/tilesets/secondary/pacifidlog/palettes/01.gbapal" @@ -298,13 +274,11 @@ gTilesetPalettes_Pacifidlog:: @ 834B5B4 .incbin "data/tilesets/secondary/pacifidlog/palettes/14.gbapal" .incbin "data/tilesets/secondary/pacifidlog/palettes/15.gbapal" - .align 2, 0 - + .align 2 gTilesetTiles_Sootopolis:: @ 834B7B4 .incbin "data/tilesets/secondary/sootopolis/tiles.4bpp.lz" - .align 2, 0 - + .align 2 gTilesetPalettes_Sootopolis:: @ 834C6B4 .incbin "data/tilesets/secondary/sootopolis/palettes/00.gbapal" .incbin "data/tilesets/secondary/sootopolis/palettes/01.gbapal" @@ -323,13 +297,11 @@ gTilesetPalettes_Sootopolis:: @ 834C6B4 .incbin "data/tilesets/secondary/sootopolis/palettes/14.gbapal" .incbin "data/tilesets/secondary/sootopolis/palettes/15.gbapal" - .align 2, 0 - + .align 2 gTilesetTiles_BattleFrontierOutsideWest:: @ 834C8B4 .incbin "data/tilesets/secondary/battle_frontier_outside_west/tiles.4bpp.lz" - .align 2, 0 - + .align 2 gTilesetPalettes_BattleFrontierOutsideWest:: @ 834E3E4 .incbin "data/tilesets/secondary/battle_frontier_outside_west/palettes/00.gbapal" .incbin "data/tilesets/secondary/battle_frontier_outside_west/palettes/01.gbapal" @@ -348,13 +320,11 @@ gTilesetPalettes_BattleFrontierOutsideWest:: @ 834E3E4 .incbin "data/tilesets/secondary/battle_frontier_outside_west/palettes/14.gbapal" .incbin "data/tilesets/secondary/battle_frontier_outside_west/palettes/15.gbapal" - .align 2, 0 - + .align 2 gTilesetTiles_BattleFrontierOutsideEast:: @ 834E5E4 .incbin "data/tilesets/secondary/battle_frontier_outside_east/tiles.4bpp.lz" - .align 2, 0 - + .align 2 gTilesetPalettes_BattleFrontierOutsideEast:: @ 834F984 .incbin "data/tilesets/secondary/battle_frontier_outside_east/palettes/00.gbapal" .incbin "data/tilesets/secondary/battle_frontier_outside_east/palettes/01.gbapal" @@ -373,13 +343,11 @@ gTilesetPalettes_BattleFrontierOutsideEast:: @ 834F984 .incbin "data/tilesets/secondary/battle_frontier_outside_east/palettes/14.gbapal" .incbin "data/tilesets/secondary/battle_frontier_outside_east/palettes/15.gbapal" - .align 2, 0 - + .align 2 gTilesetTiles_InsideBuilding:: @ 834FB84 .incbin "data/tilesets/primary/inside_building/tiles.4bpp.lz" - .align 2, 0 - + .align 2 gTilesetPalettes_InsideBuilding:: @ 83508BC .incbin "data/tilesets/primary/inside_building/palettes/00.gbapal" .incbin "data/tilesets/primary/inside_building/palettes/01.gbapal" @@ -398,13 +366,11 @@ gTilesetPalettes_InsideBuilding:: @ 83508BC .incbin "data/tilesets/primary/inside_building/palettes/14.gbapal" .incbin "data/tilesets/primary/inside_building/palettes/15.gbapal" - .align 2, 0 - + .align 2 gTilesetTiles_Shop:: @ 8350ABC .incbin "data/tilesets/secondary/shop/tiles.4bpp.lz" - .align 2, 0 - + .align 2 gTilesetPalettes_Shop:: @ 83520DC .incbin "data/tilesets/secondary/shop/palettes/00.gbapal" .incbin "data/tilesets/secondary/shop/palettes/01.gbapal" @@ -423,13 +389,11 @@ gTilesetPalettes_Shop:: @ 83520DC .incbin "data/tilesets/secondary/shop/palettes/14.gbapal" .incbin "data/tilesets/secondary/shop/palettes/15.gbapal" - .align 2, 0 - + .align 2 gTilesetTiles_PokemonCenter:: @ 83522DC .incbin "data/tilesets/secondary/pokemon_center/tiles.4bpp.lz" - .align 2, 0 - + .align 2 gTilesetPalettes_PokemonCenter:: @ 8353574 .incbin "data/tilesets/secondary/pokemon_center/palettes/00.gbapal" .incbin "data/tilesets/secondary/pokemon_center/palettes/01.gbapal" @@ -448,13 +412,11 @@ gTilesetPalettes_PokemonCenter:: @ 8353574 .incbin "data/tilesets/secondary/pokemon_center/palettes/14.gbapal" .incbin "data/tilesets/secondary/pokemon_center/palettes/15.gbapal" - .align 2, 0 - + .align 2 gTilesetTiles_Cave:: @ 8353774 .incbin "data/tilesets/secondary/cave/tiles.4bpp.lz" - .align 2, 0 - + .align 2 gTilesetPalettes_Cave:: @ 8355260 .incbin "data/tilesets/secondary/cave/palettes/00.gbapal" .incbin "data/tilesets/secondary/cave/palettes/01.gbapal" @@ -473,13 +435,11 @@ gTilesetPalettes_Cave:: @ 8355260 .incbin "data/tilesets/secondary/cave/palettes/14.gbapal" .incbin "data/tilesets/secondary/cave/palettes/15.gbapal" - .align 2, 0 - + .align 2 gTilesetTiles_PokemonSchool:: @ 8355460 .incbin "data/tilesets/secondary/pokemon_school/tiles.4bpp.lz" - .align 2, 0 - + .align 2 gTilesetPalettes_PokemonSchool:: @ 8355BA8 .incbin "data/tilesets/secondary/pokemon_school/palettes/00.gbapal" .incbin "data/tilesets/secondary/pokemon_school/palettes/01.gbapal" @@ -498,13 +458,11 @@ gTilesetPalettes_PokemonSchool:: @ 8355BA8 .incbin "data/tilesets/secondary/pokemon_school/palettes/14.gbapal" .incbin "data/tilesets/secondary/pokemon_school/palettes/15.gbapal" - .align 2, 0 - + .align 2 gTilesetTiles_PokemonFanClub:: @ 8355DA8 .incbin "data/tilesets/secondary/pokemon_fan_club/tiles.4bpp.lz" - .align 2, 0 - + .align 2 gTilesetPalettes_PokemonFanClub:: @ 83566D4 .incbin "data/tilesets/secondary/pokemon_fan_club/palettes/00.gbapal" .incbin "data/tilesets/secondary/pokemon_fan_club/palettes/01.gbapal" @@ -523,13 +481,11 @@ gTilesetPalettes_PokemonFanClub:: @ 83566D4 .incbin "data/tilesets/secondary/pokemon_fan_club/palettes/14.gbapal" .incbin "data/tilesets/secondary/pokemon_fan_club/palettes/15.gbapal" - .align 2, 0 - + .align 2 gTilesetTiles_Unused1:: @ 83568D4 .incbin "data/tilesets/secondary/unused_1/tiles.4bpp.lz" - .align 2, 0 - + .align 2 gTilesetPalettes_Unused1:: @ 8356920 .incbin "data/tilesets/secondary/unused_1/palettes/00.gbapal" .incbin "data/tilesets/secondary/unused_1/palettes/01.gbapal" @@ -548,13 +504,11 @@ gTilesetPalettes_Unused1:: @ 8356920 .incbin "data/tilesets/secondary/unused_1/palettes/14.gbapal" .incbin "data/tilesets/secondary/unused_1/palettes/15.gbapal" - .align 2, 0 - + .align 2 gTilesetTiles_MeteorFalls:: @ 8356B20 .incbin "data/tilesets/secondary/meteor_falls/tiles.4bpp.lz" - .align 2, 0 - + .align 2 gTilesetPalettes_MeteorFalls:: @ 8358840 .incbin "data/tilesets/secondary/meteor_falls/palettes/00.gbapal" .incbin "data/tilesets/secondary/meteor_falls/palettes/01.gbapal" @@ -573,13 +527,11 @@ gTilesetPalettes_MeteorFalls:: @ 8358840 .incbin "data/tilesets/secondary/meteor_falls/palettes/14.gbapal" .incbin "data/tilesets/secondary/meteor_falls/palettes/15.gbapal" - .align 2, 0 - + .align 2 gTilesetTiles_OceanicMuseum:: @ 8358A40 .incbin "data/tilesets/secondary/oceanic_museum/tiles.4bpp.lz" - .align 2, 0 - + .align 2 gTilesetPalettes_OceanicMuseum:: @ 83599CC .incbin "data/tilesets/secondary/oceanic_museum/palettes/00.gbapal" .incbin "data/tilesets/secondary/oceanic_museum/palettes/01.gbapal" @@ -598,17 +550,14 @@ gTilesetPalettes_OceanicMuseum:: @ 83599CC .incbin "data/tilesets/secondary/oceanic_museum/palettes/14.gbapal" .incbin "data/tilesets/secondary/oceanic_museum/palettes/15.gbapal" - .align 2, 0 - + .align 2 gTilesetTiles_CableClub:: @ 8359BCC .incbin "data/tilesets/secondary/cable_club/tiles.4bpp" - .align 2, 0 - + .align 2 .incbin "data/tilesets/secondary/cable_club/unknown_tiles.4bpp" - .align 2, 0 - + .align 2 gTilesetPalettes_CableClub:: @ 835EACC .incbin "data/tilesets/secondary/cable_club/palettes/00.gbapal" .incbin "data/tilesets/secondary/cable_club/palettes/01.gbapal" @@ -627,13 +576,11 @@ gTilesetPalettes_CableClub:: @ 835EACC .incbin "data/tilesets/secondary/cable_club/palettes/14.gbapal" .incbin "data/tilesets/secondary/cable_club/palettes/15.gbapal" - .align 2, 0 - + .align 2 gTilesetTiles_SeashoreHouse:: @ 835ECCC .incbin "data/tilesets/secondary/seashore_house/tiles.4bpp.lz" - .align 2, 0 - + .align 2 gTilesetPalettes_SeashoreHouse:: @ 835F5A8 .incbin "data/tilesets/secondary/seashore_house/palettes/00.gbapal" .incbin "data/tilesets/secondary/seashore_house/palettes/01.gbapal" @@ -652,13 +599,11 @@ gTilesetPalettes_SeashoreHouse:: @ 835F5A8 .incbin "data/tilesets/secondary/seashore_house/palettes/14.gbapal" .incbin "data/tilesets/secondary/seashore_house/palettes/15.gbapal" - .align 2, 0 - + .align 2 gTilesetTiles_PrettyPetalFlowerShop:: @ 835F7A8 .incbin "data/tilesets/secondary/pretty_petal_flower_shop/tiles.4bpp.lz" - .align 2, 0 - + .align 2 gTilesetPalettes_PrettyPetalFlowerShop:: @ 83603A0 .incbin "data/tilesets/secondary/pretty_petal_flower_shop/palettes/00.gbapal" .incbin "data/tilesets/secondary/pretty_petal_flower_shop/palettes/01.gbapal" @@ -677,13 +622,11 @@ gTilesetPalettes_PrettyPetalFlowerShop:: @ 83603A0 .incbin "data/tilesets/secondary/pretty_petal_flower_shop/palettes/14.gbapal" .incbin "data/tilesets/secondary/pretty_petal_flower_shop/palettes/15.gbapal" - .align 2, 0 - + .align 2 gTilesetTiles_PokemonDayCare:: @ 83605A0 .incbin "data/tilesets/secondary/pokemon_day_care/tiles.4bpp.lz" - .align 2, 0 - + .align 2 gTilesetPalettes_PokemonDayCare:: @ 8360FDC .incbin "data/tilesets/secondary/pokemon_day_care/palettes/00.gbapal" .incbin "data/tilesets/secondary/pokemon_day_care/palettes/01.gbapal" @@ -702,13 +645,11 @@ gTilesetPalettes_PokemonDayCare:: @ 8360FDC .incbin "data/tilesets/secondary/pokemon_day_care/palettes/14.gbapal" .incbin "data/tilesets/secondary/pokemon_day_care/palettes/15.gbapal" - .align 2, 0 - + .align 2 gTilesetTiles_Facility:: @ 83611DC .incbin "data/tilesets/secondary/facility/tiles.4bpp.lz" - .align 2, 0 - + .align 2 gTilesetPalettes_Facility:: @ 8362E90 .incbin "data/tilesets/secondary/facility/palettes/00.gbapal" .incbin "data/tilesets/secondary/facility/palettes/01.gbapal" @@ -727,13 +668,11 @@ gTilesetPalettes_Facility:: @ 8362E90 .incbin "data/tilesets/secondary/facility/palettes/14.gbapal" .incbin "data/tilesets/secondary/facility/palettes/15.gbapal" - .align 2, 0 - + .align 2 gTilesetTiles_BikeShop:: @ 8363090 .incbin "data/tilesets/secondary/bike_shop/tiles.4bpp.lz" - .align 2, 0 - + .align 2 gTilesetPalettes_BikeShop:: @ 83643C0 .incbin "data/tilesets/secondary/bike_shop/palettes/00.gbapal" .incbin "data/tilesets/secondary/bike_shop/palettes/01.gbapal" @@ -752,13 +691,11 @@ gTilesetPalettes_BikeShop:: @ 83643C0 .incbin "data/tilesets/secondary/bike_shop/palettes/14.gbapal" .incbin "data/tilesets/secondary/bike_shop/palettes/15.gbapal" - .align 2, 0 - + .align 2 gTilesetTiles_RusturfTunnel:: @ 83645C0 .incbin "data/tilesets/secondary/rusturf_tunnel/tiles.4bpp.lz" - .align 2, 0 - + .align 2 gTilesetPalettes_RusturfTunnel:: @ 8365008 .incbin "data/tilesets/secondary/rusturf_tunnel/palettes/00.gbapal" .incbin "data/tilesets/secondary/rusturf_tunnel/palettes/01.gbapal" @@ -777,13 +714,11 @@ gTilesetPalettes_RusturfTunnel:: @ 8365008 .incbin "data/tilesets/secondary/rusturf_tunnel/palettes/14.gbapal" .incbin "data/tilesets/secondary/rusturf_tunnel/palettes/15.gbapal" - .align 2, 0 - + .align 2 @ unused compressed copy of tiles .incbin "data/tilesets/secondary/secret_base/brown_cave/unused_tiles.4bpp.lz" - .align 2, 0 - + .align 2 gTilesetPalettes_SecretBaseBrownCave:: @ 8365788 .incbin "data/tilesets/secondary/secret_base/brown_cave/palettes/00.gbapal" .incbin "data/tilesets/secondary/secret_base/brown_cave/palettes/01.gbapal" @@ -802,13 +737,11 @@ gTilesetPalettes_SecretBaseBrownCave:: @ 8365788 .incbin "data/tilesets/secondary/secret_base/brown_cave/palettes/14.gbapal" .incbin "data/tilesets/secondary/secret_base/brown_cave/palettes/15.gbapal" - .align 2, 0 - + .align 2 @ unused compressed copy of tiles .incbin "data/tilesets/secondary/secret_base/tree/unused_tiles.4bpp.lz" - .align 2, 0 - + .align 2 gTilesetPalettes_SecretBaseTree:: @ 8365EAC .incbin "data/tilesets/secondary/secret_base/tree/palettes/00.gbapal" .incbin "data/tilesets/secondary/secret_base/tree/palettes/01.gbapal" @@ -827,13 +760,11 @@ gTilesetPalettes_SecretBaseTree:: @ 8365EAC .incbin "data/tilesets/secondary/secret_base/tree/palettes/14.gbapal" .incbin "data/tilesets/secondary/secret_base/tree/palettes/15.gbapal" - .align 2, 0 - + .align 2 @ unused compressed copy of tiles .incbin "data/tilesets/secondary/secret_base/shrub/unused_tiles.4bpp.lz" - .align 2, 0 - + .align 2 gTilesetPalettes_SecretBaseShrub:: @ 8366614 .incbin "data/tilesets/secondary/secret_base/shrub/palettes/00.gbapal" .incbin "data/tilesets/secondary/secret_base/shrub/palettes/01.gbapal" @@ -852,13 +783,11 @@ gTilesetPalettes_SecretBaseShrub:: @ 8366614 .incbin "data/tilesets/secondary/secret_base/shrub/palettes/14.gbapal" .incbin "data/tilesets/secondary/secret_base/shrub/palettes/15.gbapal" - .align 2, 0 - + .align 2 @ unused compressed copy of tiles .incbin "data/tilesets/secondary/secret_base/blue_cave/unused_tiles.4bpp.lz" - .align 2, 0 - + .align 2 gTilesetPalettes_SecretBaseBlueCave:: @ 8366C30 .incbin "data/tilesets/secondary/secret_base/blue_cave/palettes/00.gbapal" .incbin "data/tilesets/secondary/secret_base/blue_cave/palettes/01.gbapal" @@ -877,13 +806,11 @@ gTilesetPalettes_SecretBaseBlueCave:: @ 8366C30 .incbin "data/tilesets/secondary/secret_base/blue_cave/palettes/14.gbapal" .incbin "data/tilesets/secondary/secret_base/blue_cave/palettes/15.gbapal" - .align 2, 0 - + .align 2 @ unused compressed copy of tiles .incbin "data/tilesets/secondary/secret_base/yellow_cave/unused_tiles.4bpp.lz" - .align 2, 0 - + .align 2 gTilesetPalettes_SecretBaseYellowCave:: @ 8367368 .incbin "data/tilesets/secondary/secret_base/yellow_cave/palettes/00.gbapal" .incbin "data/tilesets/secondary/secret_base/yellow_cave/palettes/01.gbapal" @@ -902,13 +829,11 @@ gTilesetPalettes_SecretBaseYellowCave:: @ 8367368 .incbin "data/tilesets/secondary/secret_base/yellow_cave/palettes/14.gbapal" .incbin "data/tilesets/secondary/secret_base/yellow_cave/palettes/15.gbapal" - .align 2, 0 - + .align 2 @ unused compressed copy of tiles .incbin "data/tilesets/secondary/secret_base/red_cave/unused_tiles.4bpp.lz" - .align 2, 0 - + .align 2 gTilesetPalettes_SecretBaseRedCave:: @ 83679A0 .incbin "data/tilesets/secondary/secret_base/red_cave/palettes/00.gbapal" .incbin "data/tilesets/secondary/secret_base/red_cave/palettes/01.gbapal" @@ -927,43 +852,35 @@ gTilesetPalettes_SecretBaseRedCave:: @ 83679A0 .incbin "data/tilesets/secondary/secret_base/red_cave/palettes/14.gbapal" .incbin "data/tilesets/secondary/secret_base/red_cave/palettes/15.gbapal" - .align 2, 0 - + .align 2 gTilesetTiles_SecretBaseBrownCave:: @ 8367BA0 .incbin "data/tilesets/secondary/secret_base/brown_cave/tiles.4bpp" - .align 2, 0 - + .align 2 gTilesetTiles_SecretBaseTree:: @ 8368600 .incbin "data/tilesets/secondary/secret_base/tree/tiles.4bpp" - .align 2, 0 - + .align 2 gTilesetTiles_SecretBaseShrub:: @ 8369060 .incbin "data/tilesets/secondary/secret_base/shrub/tiles.4bpp" - .align 2, 0 - + .align 2 gTilesetTiles_SecretBaseBlueCave:: @ 8369AC0 .incbin "data/tilesets/secondary/secret_base/blue_cave/tiles.4bpp" - .align 2, 0 - + .align 2 gTilesetTiles_SecretBaseYellowCave:: @ 836A520 .incbin "data/tilesets/secondary/secret_base/yellow_cave/tiles.4bpp" - .align 2, 0 - + .align 2 gTilesetTiles_SecretBaseRedCave:: @ 836AF80 .incbin "data/tilesets/secondary/secret_base/red_cave/tiles.4bpp" - .align 2, 0 - + .align 2 gTilesetTiles_InsideOfTruck:: @ 836B9E0 .incbin "data/tilesets/secondary/inside_of_truck/tiles.4bpp.lz" - .align 2, 0 - + .align 2 gTilesetPalettes_InsideOfTruck:: @ 836BC3C .incbin "data/tilesets/secondary/inside_of_truck/palettes/00.gbapal" .incbin "data/tilesets/secondary/inside_of_truck/palettes/01.gbapal" @@ -982,13 +899,11 @@ gTilesetPalettes_InsideOfTruck:: @ 836BC3C .incbin "data/tilesets/secondary/inside_of_truck/palettes/14.gbapal" .incbin "data/tilesets/secondary/inside_of_truck/palettes/15.gbapal" - .align 2, 0 - + .align 2 gTilesetTiles_Contest:: @ 836BE3C .incbin "data/tilesets/secondary/contest/tiles.4bpp.lz" - .align 2, 0 - + .align 2 gTilesetPalettes_Contest:: @ 836C990 .incbin "data/tilesets/secondary/contest/palettes/00.gbapal" .incbin "data/tilesets/secondary/contest/palettes/01.gbapal" @@ -1007,13 +922,11 @@ gTilesetPalettes_Contest:: @ 836C990 .incbin "data/tilesets/secondary/contest/palettes/14.gbapal" .incbin "data/tilesets/secondary/contest/palettes/15.gbapal" - .align 2, 0 - + .align 2 gTilesetTiles_LilycoveMuseum:: @ 836CB90 .incbin "data/tilesets/secondary/lilycove_museum/tiles.4bpp.lz" - .align 2, 0 - + .align 2 gTilesetPalettes_LilycoveMuseum:: @ 836DEAC .incbin "data/tilesets/secondary/lilycove_museum/palettes/00.gbapal" .incbin "data/tilesets/secondary/lilycove_museum/palettes/01.gbapal" @@ -1032,13 +945,11 @@ gTilesetPalettes_LilycoveMuseum:: @ 836DEAC .incbin "data/tilesets/secondary/lilycove_museum/palettes/14.gbapal" .incbin "data/tilesets/secondary/lilycove_museum/palettes/15.gbapal" - .align 2, 0 - + .align 2 gTilesetTiles_BrendansMaysHouse:: @ 836E0AC .incbin "data/tilesets/secondary/brendans_mays_house/tiles.4bpp.lz" - .align 2, 0 - + .align 2 gTilesetPalettes_BrendansMaysHouse:: @ 836F178 .incbin "data/tilesets/secondary/brendans_mays_house/palettes/00.gbapal" .incbin "data/tilesets/secondary/brendans_mays_house/palettes/01.gbapal" @@ -1057,13 +968,11 @@ gTilesetPalettes_BrendansMaysHouse:: @ 836F178 .incbin "data/tilesets/secondary/brendans_mays_house/palettes/14.gbapal" .incbin "data/tilesets/secondary/brendans_mays_house/palettes/15.gbapal" - .align 2, 0 - + .align 2 gTilesetTiles_Lab:: @ 836F378 .incbin "data/tilesets/secondary/lab/tiles.4bpp.lz" - .align 2, 0 - + .align 2 gTilesetPalettes_Lab:: @ 83703DC .incbin "data/tilesets/secondary/lab/palettes/00.gbapal" .incbin "data/tilesets/secondary/lab/palettes/01.gbapal" @@ -1082,13 +991,11 @@ gTilesetPalettes_Lab:: @ 83703DC .incbin "data/tilesets/secondary/lab/palettes/14.gbapal" .incbin "data/tilesets/secondary/lab/palettes/15.gbapal" - .align 2, 0 - + .align 2 gTilesetTiles_Underwater:: @ 83705DC .incbin "data/tilesets/secondary/underwater/tiles.4bpp.lz" - .align 2, 0 - + .align 2 gTilesetPalettes_Underwater:: @ 8371798 .incbin "data/tilesets/secondary/underwater/palettes/00.gbapal" .incbin "data/tilesets/secondary/underwater/palettes/01.gbapal" @@ -1107,13 +1014,11 @@ gTilesetPalettes_Underwater:: @ 8371798 .incbin "data/tilesets/secondary/underwater/palettes/14.gbapal" .incbin "data/tilesets/secondary/underwater/palettes/15.gbapal" - .align 2, 0 - + .align 2 gTilesetTiles_GenericBuilding:: @ 8371998 .incbin "data/tilesets/secondary/generic_building/tiles.4bpp.lz" - .align 2, 0 - + .align 2 gTilesetPalettes_GenericBuilding:: @ 83733C4 .incbin "data/tilesets/secondary/generic_building/palettes/00.gbapal" .incbin "data/tilesets/secondary/generic_building/palettes/01.gbapal" @@ -1132,13 +1037,11 @@ gTilesetPalettes_GenericBuilding:: @ 83733C4 .incbin "data/tilesets/secondary/generic_building/palettes/14.gbapal" .incbin "data/tilesets/secondary/generic_building/palettes/15.gbapal" - .align 2, 0 - + .align 2 gTilesetTiles_MauvilleGameCorner:: @ 83735C4 .incbin "data/tilesets/secondary/mauville_game_corner/tiles.4bpp.lz" - .align 2, 0 - + .align 2 gTilesetPalettes_MauvilleGameCorner:: @ 8374288 .incbin "data/tilesets/secondary/mauville_game_corner/palettes/00.gbapal" .incbin "data/tilesets/secondary/mauville_game_corner/palettes/01.gbapal" @@ -1157,13 +1060,11 @@ gTilesetPalettes_MauvilleGameCorner:: @ 8374288 .incbin "data/tilesets/secondary/mauville_game_corner/palettes/14.gbapal" .incbin "data/tilesets/secondary/mauville_game_corner/palettes/15.gbapal" - .align 2, 0 - + .align 2 gTilesetTiles_Unused2:: @ 8374488 .incbin "data/tilesets/secondary/unused_2/tiles.4bpp.lz" - .align 2, 0 - + .align 2 gTilesetPalettes_Unused2:: @ 83749B0 .incbin "data/tilesets/secondary/unused_2/palettes/00.gbapal" .incbin "data/tilesets/secondary/unused_2/palettes/01.gbapal" @@ -1182,13 +1083,11 @@ gTilesetPalettes_Unused2:: @ 83749B0 .incbin "data/tilesets/secondary/unused_2/palettes/14.gbapal" .incbin "data/tilesets/secondary/unused_2/palettes/15.gbapal" - .align 2, 0 - + .align 2 gTilesetTiles_RustboroGym:: @ 8374BB0 .incbin "data/tilesets/secondary/rustboro_gym/tiles.4bpp.lz" - .align 2, 0 - + .align 2 gTilesetPalettes_RustboroGym:: @ 8374F34 .incbin "data/tilesets/secondary/rustboro_gym/palettes/00.gbapal" .incbin "data/tilesets/secondary/rustboro_gym/palettes/01.gbapal" @@ -1207,13 +1106,11 @@ gTilesetPalettes_RustboroGym:: @ 8374F34 .incbin "data/tilesets/secondary/rustboro_gym/palettes/14.gbapal" .incbin "data/tilesets/secondary/rustboro_gym/palettes/15.gbapal" - .align 2, 0 - + .align 2 gTilesetTiles_DewfordGym:: @ 8375134 .incbin "data/tilesets/secondary/dewford_gym/tiles.4bpp.lz" - .align 2, 0 - + .align 2 gTilesetPalettes_DewfordGym:: @ 8375400 .incbin "data/tilesets/secondary/dewford_gym/palettes/00.gbapal" .incbin "data/tilesets/secondary/dewford_gym/palettes/01.gbapal" @@ -1232,13 +1129,11 @@ gTilesetPalettes_DewfordGym:: @ 8375400 .incbin "data/tilesets/secondary/dewford_gym/palettes/14.gbapal" .incbin "data/tilesets/secondary/dewford_gym/palettes/15.gbapal" - .align 2, 0 - + .align 2 gTilesetTiles_MauvilleGym:: @ 8375600 .incbin "data/tilesets/secondary/mauville_gym/tiles.4bpp.lz" - .align 2, 0 - + .align 2 gTilesetPalettes_MauvilleGym:: @ 8375D84 .incbin "data/tilesets/secondary/mauville_gym/palettes/00.gbapal" .incbin "data/tilesets/secondary/mauville_gym/palettes/01.gbapal" @@ -1257,13 +1152,11 @@ gTilesetPalettes_MauvilleGym:: @ 8375D84 .incbin "data/tilesets/secondary/mauville_gym/palettes/14.gbapal" .incbin "data/tilesets/secondary/mauville_gym/palettes/15.gbapal" - .align 2, 0 - + .align 2 gTilesetTiles_LavaridgeGym:: @ 8375F84 .incbin "data/tilesets/secondary/lavaridge_gym/tiles.4bpp.lz" - .align 2, 0 - + .align 2 gTilesetPalettes_LavaridgeGym:: @ 83762AC .incbin "data/tilesets/secondary/lavaridge_gym/palettes/00.gbapal" .incbin "data/tilesets/secondary/lavaridge_gym/palettes/01.gbapal" @@ -1282,13 +1175,11 @@ gTilesetPalettes_LavaridgeGym:: @ 83762AC .incbin "data/tilesets/secondary/lavaridge_gym/palettes/14.gbapal" .incbin "data/tilesets/secondary/lavaridge_gym/palettes/15.gbapal" - .align 2, 0 - + .align 2 gTilesetTiles_PetalburgGym:: @ 83764AC .incbin "data/tilesets/secondary/petalburg_gym/tiles.4bpp.lz" - .align 2, 0 - + .align 2 gTilesetPalettes_PetalburgGym:: @ 8376B50 .incbin "data/tilesets/secondary/petalburg_gym/palettes/00.gbapal" .incbin "data/tilesets/secondary/petalburg_gym/palettes/01.gbapal" @@ -1307,13 +1198,11 @@ gTilesetPalettes_PetalburgGym:: @ 8376B50 .incbin "data/tilesets/secondary/petalburg_gym/palettes/14.gbapal" .incbin "data/tilesets/secondary/petalburg_gym/palettes/15.gbapal" - .align 2, 0 - + .align 2 gTilesetTiles_FortreeGym:: @ 8376D50 .incbin "data/tilesets/secondary/fortree_gym/tiles.4bpp.lz" - .align 2, 0 - + .align 2 gTilesetPalettes_FortreeGym:: @ 83770C4 .incbin "data/tilesets/secondary/fortree_gym/palettes/00.gbapal" .incbin "data/tilesets/secondary/fortree_gym/palettes/01.gbapal" @@ -1332,13 +1221,11 @@ gTilesetPalettes_FortreeGym:: @ 83770C4 .incbin "data/tilesets/secondary/fortree_gym/palettes/14.gbapal" .incbin "data/tilesets/secondary/fortree_gym/palettes/15.gbapal" - .align 2, 0 - + .align 2 gTilesetTiles_MossdeepGym:: @ 83772C4 .incbin "data/tilesets/secondary/mossdeep_gym/tiles.4bpp.lz" - .align 2, 0 - + .align 2 gTilesetPalettes_MossdeepGym:: @ 8377730 .incbin "data/tilesets/secondary/mossdeep_gym/palettes/00.gbapal" .incbin "data/tilesets/secondary/mossdeep_gym/palettes/01.gbapal" @@ -1357,13 +1244,11 @@ gTilesetPalettes_MossdeepGym:: @ 8377730 .incbin "data/tilesets/secondary/mossdeep_gym/palettes/14.gbapal" .incbin "data/tilesets/secondary/mossdeep_gym/palettes/15.gbapal" - .align 2, 0 - + .align 2 gTilesetTiles_SootopolisGym:: @ 8377930 .incbin "data/tilesets/secondary/sootopolis_gym/tiles.4bpp.lz" - .align 2, 0 - + .align 2 gTilesetPalettes_SootopolisGym:: @ 8378AC4 .incbin "data/tilesets/secondary/sootopolis_gym/palettes/00.gbapal" .incbin "data/tilesets/secondary/sootopolis_gym/palettes/01.gbapal" @@ -1382,13 +1267,11 @@ gTilesetPalettes_SootopolisGym:: @ 8378AC4 .incbin "data/tilesets/secondary/sootopolis_gym/palettes/14.gbapal" .incbin "data/tilesets/secondary/sootopolis_gym/palettes/15.gbapal" - .align 2, 0 - + .align 2 gTilesetTiles_TrickHousePuzzle:: @ 8378CC4 .incbin "data/tilesets/secondary/trick_house_puzzle/tiles.4bpp.lz" - .align 2, 0 - + .align 2 gTilesetPalettes_TrickHousePuzzle:: @ 8379A78 .incbin "data/tilesets/secondary/trick_house_puzzle/palettes/00.gbapal" .incbin "data/tilesets/secondary/trick_house_puzzle/palettes/01.gbapal" @@ -1407,13 +1290,11 @@ gTilesetPalettes_TrickHousePuzzle:: @ 8379A78 .incbin "data/tilesets/secondary/trick_house_puzzle/palettes/14.gbapal" .incbin "data/tilesets/secondary/trick_house_puzzle/palettes/15.gbapal" - .align 2, 0 - + .align 2 gTilesetTiles_InsideShip:: @ 8379C78 .incbin "data/tilesets/secondary/inside_ship/tiles.4bpp.lz" - .align 2, 0 - + .align 2 gTilesetPalettes_InsideShip:: @ 837A848 .incbin "data/tilesets/secondary/inside_ship/palettes/00.gbapal" .incbin "data/tilesets/secondary/inside_ship/palettes/01.gbapal" @@ -1432,17 +1313,14 @@ gTilesetPalettes_InsideShip:: @ 837A848 .incbin "data/tilesets/secondary/inside_ship/palettes/14.gbapal" .incbin "data/tilesets/secondary/inside_ship/palettes/15.gbapal" - .align 2, 0 - + .align 2 gTilesetTiles_SecretBase:: @ 837AA48 .incbin "data/tilesets/primary/secret_base/tiles.4bpp" - .align 2, 0 - + .align 2 .incbin "data/tilesets/primary/secret_base/unknown_tiles.4bpp" - .align 2, 0 - + .align 2 gTilesetPalettes_SecretBase:: @ 8382A48 .incbin "data/tilesets/primary/secret_base/palettes/00.gbapal" .incbin "data/tilesets/primary/secret_base/palettes/01.gbapal" @@ -1461,13 +1339,11 @@ gTilesetPalettes_SecretBase:: @ 8382A48 .incbin "data/tilesets/primary/secret_base/palettes/14.gbapal" .incbin "data/tilesets/primary/secret_base/palettes/15.gbapal" - .align 2, 0 - + .align 2 gTilesetTiles_EliteFour:: @ 8382C48 .incbin "data/tilesets/secondary/elite_four/tiles.4bpp.lz" - .align 2, 0 - + .align 2 gTilesetPalettes_EliteFour:: @ 8383CC4 .incbin "data/tilesets/secondary/elite_four/palettes/00.gbapal" .incbin "data/tilesets/secondary/elite_four/palettes/01.gbapal" @@ -1486,13 +1362,11 @@ gTilesetPalettes_EliteFour:: @ 8383CC4 .incbin "data/tilesets/secondary/elite_four/palettes/14.gbapal" .incbin "data/tilesets/secondary/elite_four/palettes/15.gbapal" - .align 2, 0 - + .align 2 gTilesetTiles_BattleFrontier:: @ 8383EC4 .incbin "data/tilesets/secondary/battle_frontier/tiles.4bpp.lz" - .align 2, 0 - + .align 2 gTilesetPalettes_BattleFrontier:: @ 8384BC8 .incbin "data/tilesets/secondary/battle_frontier/palettes/00.gbapal" .incbin "data/tilesets/secondary/battle_frontier/palettes/01.gbapal" @@ -1511,13 +1385,11 @@ gTilesetPalettes_BattleFrontier:: @ 8384BC8 .incbin "data/tilesets/secondary/battle_frontier/palettes/14.gbapal" .incbin "data/tilesets/secondary/battle_frontier/palettes/15.gbapal" - .align 2, 0 - + .align 2 gTilesetTiles_BattlePalace:: @ 8384DC8 .incbin "data/tilesets/secondary/battle_palace/tiles.4bpp.lz" - .align 2, 0 - + .align 2 gTilesetPalettes_BattlePalace:: @ 8385540 .incbin "data/tilesets/secondary/battle_palace/palettes/00.gbapal" .incbin "data/tilesets/secondary/battle_palace/palettes/01.gbapal" @@ -1536,13 +1408,11 @@ gTilesetPalettes_BattlePalace:: @ 8385540 .incbin "data/tilesets/secondary/battle_palace/palettes/14.gbapal" .incbin "data/tilesets/secondary/battle_palace/palettes/15.gbapal" - .align 2, 0 - + .align 2 gTilesetTiles_BattleDome:: @ 8385740 .incbin "data/tilesets/secondary/battle_dome/tiles.4bpp.lz" - .align 2, 0 - + .align 2 gTilesetPalettes_BattleDome:: @ 8386990 .incbin "data/tilesets/secondary/battle_dome/palettes/00.gbapal" .incbin "data/tilesets/secondary/battle_dome/palettes/01.gbapal" @@ -1561,13 +1431,11 @@ gTilesetPalettes_BattleDome:: @ 8386990 .incbin "data/tilesets/secondary/battle_dome/palettes/14.gbapal" .incbin "data/tilesets/secondary/battle_dome/palettes/15.gbapal" - .align 2, 0 - + .align 2 gTilesetTiles_BattleFactory:: @ 8386B90 .incbin "data/tilesets/secondary/battle_factory/tiles.4bpp.lz" - .align 2, 0 - + .align 2 gTilesetPalettes_BattleFactory:: @ 8387D7C .incbin "data/tilesets/secondary/battle_factory/palettes/00.gbapal" .incbin "data/tilesets/secondary/battle_factory/palettes/01.gbapal" @@ -1586,13 +1454,11 @@ gTilesetPalettes_BattleFactory:: @ 8387D7C .incbin "data/tilesets/secondary/battle_factory/palettes/14.gbapal" .incbin "data/tilesets/secondary/battle_factory/palettes/15.gbapal" - .align 2, 0 - + .align 2 gTilesetTiles_BattlePike:: @ 8387F7C .incbin "data/tilesets/secondary/battle_pike/tiles.4bpp.lz" - .align 2, 0 - + .align 2 gTilesetPalettes_BattlePike:: @ 8389250 .incbin "data/tilesets/secondary/battle_pike/palettes/00.gbapal" .incbin "data/tilesets/secondary/battle_pike/palettes/01.gbapal" @@ -1611,13 +1477,11 @@ gTilesetPalettes_BattlePike:: @ 8389250 .incbin "data/tilesets/secondary/battle_pike/palettes/14.gbapal" .incbin "data/tilesets/secondary/battle_pike/palettes/15.gbapal" - .align 2, 0 - + .align 2 gTilesetTiles_BattleArena:: @ 8389450 .incbin "data/tilesets/secondary/battle_arena/tiles.4bpp.lz" - .align 2, 0 - + .align 2 gTilesetPalettes_BattleArena:: @ 8389F8C .incbin "data/tilesets/secondary/battle_arena/palettes/00.gbapal" .incbin "data/tilesets/secondary/battle_arena/palettes/01.gbapal" @@ -1636,13 +1500,11 @@ gTilesetPalettes_BattleArena:: @ 8389F8C .incbin "data/tilesets/secondary/battle_arena/palettes/14.gbapal" .incbin "data/tilesets/secondary/battle_arena/palettes/15.gbapal" - .align 2, 0 - + .align 2 gTilesetTiles_BattlePyramid:: @ 838A18C .incbin "data/tilesets/secondary/battle_pyramid/tiles.4bpp.lz" - .align 2, 0 - + .align 2 gTilesetPalettes_BattlePyramid:: @ 838B39C .incbin "data/tilesets/secondary/battle_pyramid/palettes/00.gbapal" .incbin "data/tilesets/secondary/battle_pyramid/palettes/01.gbapal" @@ -1661,13 +1523,11 @@ gTilesetPalettes_BattlePyramid:: @ 838B39C .incbin "data/tilesets/secondary/battle_pyramid/palettes/14.gbapal" .incbin "data/tilesets/secondary/battle_pyramid/palettes/15.gbapal" - .align 2, 0 - + .align 2 gTilesetTiles_MirageTower:: @ 838B59C .incbin "data/tilesets/secondary/mirage_tower/tiles.4bpp.lz" - .align 2, 0 - + .align 2 gTilesetPalettes_MirageTower:: @ 838CFE4 .incbin "data/tilesets/secondary/mirage_tower/palettes/00.gbapal" .incbin "data/tilesets/secondary/mirage_tower/palettes/01.gbapal" @@ -1686,13 +1546,11 @@ gTilesetPalettes_MirageTower:: @ 838CFE4 .incbin "data/tilesets/secondary/mirage_tower/palettes/14.gbapal" .incbin "data/tilesets/secondary/mirage_tower/palettes/15.gbapal" - .align 2, 0 - + .align 2 gTilesetTiles_MossdeepGameCorner:: @ 838D1E4 .incbin "data/tilesets/secondary/mossdeep_game_corner/tiles.4bpp.lz" - .align 2, 0 - + .align 2 gTilesetPalettes_MossdeepGameCorner:: @ 838D604 .incbin "data/tilesets/secondary/mossdeep_game_corner/palettes/00.gbapal" .incbin "data/tilesets/secondary/mossdeep_game_corner/palettes/01.gbapal" @@ -1711,13 +1569,11 @@ gTilesetPalettes_MossdeepGameCorner:: @ 838D604 .incbin "data/tilesets/secondary/mossdeep_game_corner/palettes/14.gbapal" .incbin "data/tilesets/secondary/mossdeep_game_corner/palettes/15.gbapal" - .align 2, 0 - + .align 2 gTilesetTiles_IslandHarbor:: @ 838D804 .incbin "data/tilesets/secondary/island_harbor/tiles.4bpp.lz" - .align 2, 0 - + .align 2 gTilesetPalettes_IslandHarbor:: @ 838F1D4 .incbin "data/tilesets/secondary/island_harbor/palettes/00.gbapal" .incbin "data/tilesets/secondary/island_harbor/palettes/01.gbapal" @@ -1736,13 +1592,11 @@ gTilesetPalettes_IslandHarbor:: @ 838F1D4 .incbin "data/tilesets/secondary/island_harbor/palettes/14.gbapal" .incbin "data/tilesets/secondary/island_harbor/palettes/15.gbapal" - .align 2, 0 - + .align 2 gTilesetTiles_TrainerHill:: @ 838F3D4 .incbin "data/tilesets/secondary/trainer_hill/tiles.4bpp.lz" - .align 2, 0 - + .align 2 gTilesetPalettes_TrainerHill:: @ 83904C4 .incbin "data/tilesets/secondary/trainer_hill/palettes/00.gbapal" .incbin "data/tilesets/secondary/trainer_hill/palettes/01.gbapal" @@ -1761,13 +1615,11 @@ gTilesetPalettes_TrainerHill:: @ 83904C4 .incbin "data/tilesets/secondary/trainer_hill/palettes/14.gbapal" .incbin "data/tilesets/secondary/trainer_hill/palettes/15.gbapal" - .align 2, 0 - + .align 2 gTilesetTiles_NavelRock:: @ 83906C4 .incbin "data/tilesets/secondary/navel_rock/tiles.4bpp.lz" - .align 2, 0 - + .align 2 gTilesetPalettes_NavelRock:: @ 8392258 .incbin "data/tilesets/secondary/navel_rock/palettes/00.gbapal" .incbin "data/tilesets/secondary/navel_rock/palettes/01.gbapal" @@ -1786,13 +1638,11 @@ gTilesetPalettes_NavelRock:: @ 8392258 .incbin "data/tilesets/secondary/navel_rock/palettes/14.gbapal" .incbin "data/tilesets/secondary/navel_rock/palettes/15.gbapal" - .align 2, 0 - + .align 2 gTilesetTiles_BattleFrontierRankingHall:: @ 8392458 .incbin "data/tilesets/secondary/battle_frontier_ranking_hall/tiles.4bpp.lz" - .align 2, 0 - + .align 2 gTilesetPalettes_BattleFrontierRankingHall:: @ 8392CAC .incbin "data/tilesets/secondary/battle_frontier_ranking_hall/palettes/00.gbapal" .incbin "data/tilesets/secondary/battle_frontier_ranking_hall/palettes/01.gbapal" @@ -1811,13 +1661,11 @@ gTilesetPalettes_BattleFrontierRankingHall:: @ 8392CAC .incbin "data/tilesets/secondary/battle_frontier_ranking_hall/palettes/14.gbapal" .incbin "data/tilesets/secondary/battle_frontier_ranking_hall/palettes/15.gbapal" - .align 2, 0 - + .align 2 gTilesetTiles_BattleTent:: @ 8392EAC .incbin "data/tilesets/secondary/battle_tent/tiles.4bpp.lz" - .align 2, 0 - + .align 2 gTilesetPalettes_BattleTent:: @ 8393910 .incbin "data/tilesets/secondary/battle_tent/palettes/00.gbapal" .incbin "data/tilesets/secondary/battle_tent/palettes/01.gbapal" @@ -1836,13 +1684,11 @@ gTilesetPalettes_BattleTent:: @ 8393910 .incbin "data/tilesets/secondary/battle_tent/palettes/14.gbapal" .incbin "data/tilesets/secondary/battle_tent/palettes/15.gbapal" - .align 2, 0 - + .align 2 gTilesetTiles_MysteryEventsHouse:: @ 8393B10 .incbin "data/tilesets/secondary/mystery_events_house/tiles.4bpp.lz" - .align 2, 0 - + .align 2 gTilesetPalettes_MysteryEventsHouse:: @ 8395478 .incbin "data/tilesets/secondary/mystery_events_house/palettes/00.gbapal" .incbin "data/tilesets/secondary/mystery_events_house/palettes/01.gbapal" @@ -1861,8 +1707,7 @@ gTilesetPalettes_MysteryEventsHouse:: @ 8395478 .incbin "data/tilesets/secondary/mystery_events_house/palettes/14.gbapal" .incbin "data/tilesets/secondary/mystery_events_house/palettes/15.gbapal" - .align 2, 0 - + .align 2 gTilesetPalettes_UnionRoom:: @ 8395678 .incbin "data/tilesets/secondary/union_room/palettes/00.gbapal" .incbin "data/tilesets/secondary/union_room/palettes/01.gbapal" @@ -1881,7 +1726,6 @@ gTilesetPalettes_UnionRoom:: @ 8395678 .incbin "data/tilesets/secondary/union_room/palettes/14.gbapal" .incbin "data/tilesets/secondary/union_room/palettes/15.gbapal" - .align 2, 0 - + .align 2 gTilesetTiles_UnionRoom:: @ 8395878 .incbin "data/tilesets/secondary/union_room/tiles.4bpp.lz" diff --git a/data/tilesets/tilesets.s b/data/tilesets/tilesets.s index 94eca6338..a342dc973 100644 --- a/data/tilesets/tilesets.s +++ b/data/tilesets/tilesets.s @@ -1,5 +1,4 @@ - .align 2, 0 - + .align 2 gTileset_General:: @ 83DF704 .byte TRUE @ is compressed .byte FALSE @ is secondary tileset @@ -10,8 +9,7 @@ gTileset_General:: @ 83DF704 .4byte gMetatileAttributes_General .4byte TilesetCb_General - .align 2, 0 - + .align 2 gTileset_Petalburg:: @ 83DF71C .byte TRUE @ is compressed .byte TRUE @ is secondary tileset @@ -22,8 +20,7 @@ gTileset_Petalburg:: @ 83DF71C .4byte gMetatileAttributes_Petalburg .4byte TilesetCb_Petalburg - .align 2, 0 - + .align 2 gTileset_Rustboro:: @ 83DF734 .byte TRUE @ is compressed .byte TRUE @ is secondary tileset @@ -34,8 +31,7 @@ gTileset_Rustboro:: @ 83DF734 .4byte gMetatileAttributes_Rustboro .4byte TilesetCb_Rustboro - .align 2, 0 - + .align 2 gTileset_Dewford:: @ 83DF74C .byte TRUE @ is compressed .byte TRUE @ is secondary tileset @@ -46,8 +42,7 @@ gTileset_Dewford:: @ 83DF74C .4byte gMetatileAttributes_Dewford .4byte TilesetCb_Dewford - .align 2, 0 - + .align 2 gTileset_Slateport:: @ 83DF764 .byte TRUE @ is compressed .byte TRUE @ is secondary tileset @@ -58,8 +53,7 @@ gTileset_Slateport:: @ 83DF764 .4byte gMetatileAttributes_Slateport .4byte TilesetCb_Slateport - .align 2, 0 - + .align 2 gTileset_Mauville:: @ 83DF77C .byte TRUE @ is compressed .byte TRUE @ is secondary tileset @@ -70,8 +64,7 @@ gTileset_Mauville:: @ 83DF77C .4byte gMetatileAttributes_Mauville .4byte TilesetCb_Mauville - .align 2, 0 - + .align 2 gTileset_Lavaridge:: @ 83DF794 .byte TRUE @ is compressed .byte TRUE @ is secondary tileset @@ -82,8 +75,7 @@ gTileset_Lavaridge:: @ 83DF794 .4byte gMetatileAttributes_Lavaridge .4byte TilesetCb_Lavaridge - .align 2, 0 - + .align 2 gTileset_Fallarbor:: @ 83DF7AC .byte TRUE @ is compressed .byte TRUE @ is secondary tileset @@ -94,8 +86,7 @@ gTileset_Fallarbor:: @ 83DF7AC .4byte gMetatileAttributes_Fallarbor .4byte TilesetCb_Fallarbor - .align 2, 0 - + .align 2 gTileset_Fortree:: @ 83DF7C4 .byte TRUE @ is compressed .byte TRUE @ is secondary tileset @@ -106,8 +97,7 @@ gTileset_Fortree:: @ 83DF7C4 .4byte gMetatileAttributes_Fortree .4byte TilesetCb_Fortree - .align 2, 0 - + .align 2 gTileset_Lilycove:: @ 83DF7DC .byte TRUE @ is compressed .byte TRUE @ is secondary tileset @@ -118,8 +108,7 @@ gTileset_Lilycove:: @ 83DF7DC .4byte gMetatileAttributes_Lilycove .4byte TilesetCb_Lilycove - .align 2, 0 - + .align 2 gTileset_Mossdeep:: @ 83DF7F4 .byte TRUE @ is compressed .byte TRUE @ is secondary tileset @@ -130,8 +119,7 @@ gTileset_Mossdeep:: @ 83DF7F4 .4byte gMetatileAttributes_Mossdeep .4byte TilesetCb_Mossdeep - .align 2, 0 - + .align 2 gTileset_EverGrande:: @ 83DF80C .byte TRUE @ is compressed .byte TRUE @ is secondary tileset @@ -142,8 +130,7 @@ gTileset_EverGrande:: @ 83DF80C .4byte gMetatileAttributes_EverGrande .4byte TilesetCb_EverGrande - .align 2, 0 - + .align 2 gTileset_Pacifidlog:: @ 83DF824 .byte TRUE @ is compressed .byte TRUE @ is secondary tileset @@ -154,8 +141,7 @@ gTileset_Pacifidlog:: @ 83DF824 .4byte gMetatileAttributes_Pacifidlog .4byte TilesetCb_Pacifidlog - .align 2, 0 - + .align 2 gTileset_Sootopolis:: @ 83DF83C .byte TRUE @ is compressed .byte TRUE @ is secondary tileset @@ -166,8 +152,7 @@ gTileset_Sootopolis:: @ 83DF83C .4byte gMetatileAttributes_Sootopolis .4byte TilesetCb_Sootopolis - .align 2, 0 - + .align 2 gTileset_BattleFrontierOutsideWest:: @ 83DF854 .byte TRUE @ is compressed .byte TRUE @ is secondary tileset @@ -178,8 +163,7 @@ gTileset_BattleFrontierOutsideWest:: @ 83DF854 .4byte gMetatileAttributes_BattleFrontierOutsideWest .4byte TilesetCb_BattleFrontierOutsideWest - .align 2, 0 - + .align 2 gTileset_BattleFrontierOutsideEast:: @ 83DF86C .byte TRUE @ is compressed .byte TRUE @ is secondary tileset @@ -190,8 +174,7 @@ gTileset_BattleFrontierOutsideEast:: @ 83DF86C .4byte gMetatileAttributes_BattleFrontierOutsideEast .4byte TilesetCb_BattleFrontierOutsideEast - .align 2, 0 - + .align 2 gTileset_InsideBuilding:: @ 83DF884 .byte TRUE @ is compressed .byte FALSE @ is secondary tileset @@ -202,8 +185,7 @@ gTileset_InsideBuilding:: @ 83DF884 .4byte gMetatileAttributes_InsideBuilding .4byte TilesetCb_InsideBuilding - .align 2, 0 - + .align 2 gTileset_Shop:: @ 83DF89C .byte TRUE @ is compressed .byte TRUE @ is secondary tileset @@ -214,8 +196,7 @@ gTileset_Shop:: @ 83DF89C .4byte gMetatileAttributes_Shop .4byte NULL @ animation callback - .align 2, 0 - + .align 2 gTileset_PokemonCenter:: @ 83DF8B4 .byte TRUE @ is compressed .byte TRUE @ is secondary tileset @@ -226,8 +207,7 @@ gTileset_PokemonCenter:: @ 83DF8B4 .4byte gMetatileAttributes_PokemonCenter .4byte NULL @ animation callback - .align 2, 0 - + .align 2 gTileset_Cave:: @ 83DF8CC .byte TRUE @ is compressed .byte TRUE @ is secondary tileset @@ -238,8 +218,7 @@ gTileset_Cave:: @ 83DF8CC .4byte gMetatileAttributes_Cave .4byte TilesetCb_Cave - .align 2, 0 - + .align 2 gTileset_PokemonSchool:: @ 83DF8E4 .byte TRUE @ is compressed .byte TRUE @ is secondary tileset @@ -250,8 +229,7 @@ gTileset_PokemonSchool:: @ 83DF8E4 .4byte gMetatileAttributes_PokemonSchool .4byte NULL @ animation callback - .align 2, 0 - + .align 2 gTileset_PokemonFanClub:: @ 83DF8FC .byte TRUE @ is compressed .byte TRUE @ is secondary tileset @@ -262,8 +240,7 @@ gTileset_PokemonFanClub:: @ 83DF8FC .4byte gMetatileAttributes_PokemonFanClub .4byte NULL @ animation callback - .align 2, 0 - + .align 2 gTileset_Unused1:: @ 83DF914 .byte TRUE @ is compressed .byte TRUE @ is secondary tileset @@ -274,8 +251,7 @@ gTileset_Unused1:: @ 83DF914 .4byte gMetatileAttributes_Unused1 .4byte NULL @ animation callback - .align 2, 0 - + .align 2 gTileset_MeteorFalls:: @ 83DF92C .byte TRUE @ is compressed .byte TRUE @ is secondary tileset @@ -286,8 +262,7 @@ gTileset_MeteorFalls:: @ 83DF92C .4byte gMetatileAttributes_MeteorFalls .4byte NULL @ animation callback - .align 2, 0 - + .align 2 gTileset_OceanicMuseum:: @ 83DF944 .byte TRUE @ is compressed .byte TRUE @ is secondary tileset @@ -298,8 +273,7 @@ gTileset_OceanicMuseum:: @ 83DF944 .4byte gMetatileAttributes_OceanicMuseum .4byte NULL @ animation callback - .align 2, 0 - + .align 2 gTileset_CableClub:: @ 83DF95C .byte FALSE @ is compressed .byte TRUE @ is secondary tileset @@ -310,8 +284,7 @@ gTileset_CableClub:: @ 83DF95C .4byte gMetatileAttributes_CableClub .4byte NULL @ animation callback - .align 2, 0 - + .align 2 gTileset_SeashoreHouse:: @ 83DF974 .byte TRUE @ is compressed .byte TRUE @ is secondary tileset @@ -322,8 +295,7 @@ gTileset_SeashoreHouse:: @ 83DF974 .4byte gMetatileAttributes_SeashoreHouse .4byte NULL @ animation callback - .align 2, 0 - + .align 2 gTileset_PrettyPetalFlowerShop:: @ 83DF98C .byte TRUE @ is compressed .byte TRUE @ is secondary tileset @@ -334,8 +306,7 @@ gTileset_PrettyPetalFlowerShop:: @ 83DF98C .4byte gMetatileAttributes_PrettyPetalFlowerShop .4byte NULL @ animation callback - .align 2, 0 - + .align 2 gTileset_PokemonDayCare:: @ 83DF9A4 .byte TRUE @ is compressed .byte TRUE @ is secondary tileset @@ -346,8 +317,7 @@ gTileset_PokemonDayCare:: @ 83DF9A4 .4byte gMetatileAttributes_PokemonDayCare .4byte NULL @ animation callback - .align 2, 0 - + .align 2 gTileset_Facility:: @ 83DF9BC .byte TRUE @ is compressed .byte TRUE @ is secondary tileset @@ -358,8 +328,7 @@ gTileset_Facility:: @ 83DF9BC .4byte gMetatileAttributes_Facility .4byte NULL @ animation callback - .align 2, 0 - + .align 2 gTileset_BikeShop:: @ 83DF9D4 .byte TRUE @ is compressed .byte TRUE @ is secondary tileset @@ -370,8 +339,7 @@ gTileset_BikeShop:: @ 83DF9D4 .4byte gMetatileAttributes_BikeShop .4byte TilesetCb_BikeShop - .align 2, 0 - + .align 2 gTileset_RusturfTunnel:: @ 83DF9EC .byte TRUE @ is compressed .byte TRUE @ is secondary tileset @@ -382,8 +350,7 @@ gTileset_RusturfTunnel:: @ 83DF9EC .4byte gMetatileAttributes_RusturfTunnel .4byte NULL @ animation callback - .align 2, 0 - + .align 2 gTileset_SecretBaseBrownCave:: @ 83DFA04 .byte FALSE @ is compressed .byte TRUE @ is secondary tileset @@ -394,8 +361,7 @@ gTileset_SecretBaseBrownCave:: @ 83DFA04 .4byte gMetatileAttributes_SecretBaseSecondary .4byte NULL @ animation callback - .align 2, 0 - + .align 2 gTileset_SecretBaseTree:: @ 83DFA1C .byte FALSE @ is compressed .byte TRUE @ is secondary tileset @@ -406,8 +372,7 @@ gTileset_SecretBaseTree:: @ 83DFA1C .4byte gMetatileAttributes_SecretBaseSecondary .4byte NULL @ animation callback - .align 2, 0 - + .align 2 gTileset_SecretBaseShrub:: @ 83DFA34 .byte FALSE @ is compressed .byte TRUE @ is secondary tileset @@ -418,8 +383,7 @@ gTileset_SecretBaseShrub:: @ 83DFA34 .4byte gMetatileAttributes_SecretBaseSecondary .4byte NULL @ animation callback - .align 2, 0 - + .align 2 gTileset_SecretBaseBlueCave:: @ 83DFA4C .byte FALSE @ is compressed .byte TRUE @ is secondary tileset @@ -430,8 +394,7 @@ gTileset_SecretBaseBlueCave:: @ 83DFA4C .4byte gMetatileAttributes_SecretBaseSecondary .4byte NULL @ animation callback - .align 2, 0 - + .align 2 gTileset_SecretBaseYellowCave:: @ 83DFA64 .byte FALSE @ is compressed .byte TRUE @ is secondary tileset @@ -442,8 +405,7 @@ gTileset_SecretBaseYellowCave:: @ 83DFA64 .4byte gMetatileAttributes_SecretBaseSecondary .4byte NULL @ animation callback - .align 2, 0 - + .align 2 gTileset_SecretBaseRedCave:: @ 83DFA7C .byte FALSE @ is compressed .byte TRUE @ is secondary tileset @@ -454,8 +416,7 @@ gTileset_SecretBaseRedCave:: @ 83DFA7C .4byte gMetatileAttributes_SecretBaseSecondary .4byte NULL @ animation callback - .align 2, 0 - + .align 2 gTileset_InsideOfTruck:: @ 83DFA94 .byte TRUE @ is compressed .byte TRUE @ is secondary tileset @@ -466,8 +427,7 @@ gTileset_InsideOfTruck:: @ 83DFA94 .4byte gMetatileAttributes_InsideOfTruck .4byte NULL @ animation callback - .align 2, 0 - + .align 2 gTileset_Unused2:: @ 83DFAAC .byte TRUE @ is compressed .byte TRUE @ is secondary tileset @@ -478,8 +438,7 @@ gTileset_Unused2:: @ 83DFAAC .4byte gMetatileAttributes_Unused2 .4byte NULL @ animation callback - .align 2, 0 - + .align 2 gTileset_Contest:: @ 83DFAC4 .byte TRUE @ is compressed .byte TRUE @ is secondary tileset @@ -490,8 +449,7 @@ gTileset_Contest:: @ 83DFAC4 .4byte gMetatileAttributes_Contest .4byte NULL @ animation callback - .align 2, 0 - + .align 2 gTileset_LilycoveMuseum:: @ 83DFADC .byte TRUE @ is compressed .byte TRUE @ is secondary tileset @@ -502,8 +460,7 @@ gTileset_LilycoveMuseum:: @ 83DFADC .4byte gMetatileAttributes_LilycoveMuseum .4byte NULL @ animation callback - .align 2, 0 - + .align 2 gTileset_BrendansMaysHouse:: @ 83DFAF4 .byte TRUE @ is compressed .byte TRUE @ is secondary tileset @@ -514,8 +471,7 @@ gTileset_BrendansMaysHouse:: @ 83DFAF4 .4byte gMetatileAttributes_BrendansMaysHouse .4byte NULL @ animation callback - .align 2, 0 - + .align 2 gTileset_Lab:: @ 83DFB0C .byte TRUE @ is compressed .byte TRUE @ is secondary tileset @@ -526,8 +482,7 @@ gTileset_Lab:: @ 83DFB0C .4byte gMetatileAttributes_Lab .4byte NULL @ animation callback - .align 2, 0 - + .align 2 gTileset_Underwater:: @ 83DFB24 .byte TRUE @ is compressed .byte TRUE @ is secondary tileset @@ -538,8 +493,7 @@ gTileset_Underwater:: @ 83DFB24 .4byte gMetatileAttributes_Underwater .4byte TilesetCb_Underwater - .align 2, 0 - + .align 2 gTileset_PetalburgGym:: @ 83DFB3C .byte TRUE @ is compressed .byte TRUE @ is secondary tileset @@ -550,8 +504,7 @@ gTileset_PetalburgGym:: @ 83DFB3C .4byte gMetatileAttributes_PetalburgGym .4byte NULL @ animation callback - .align 2, 0 - + .align 2 gTileset_SootopolisGym:: @ 83DFB54 .byte TRUE @ is compressed .byte TRUE @ is secondary tileset @@ -562,8 +515,7 @@ gTileset_SootopolisGym:: @ 83DFB54 .4byte gMetatileAttributes_SootopolisGym .4byte TilesetCb_SootopolisGym - .align 2, 0 - + .align 2 gTileset_GenericBuilding:: @ 83DFB6C .byte TRUE @ is compressed .byte TRUE @ is secondary tileset @@ -574,8 +526,7 @@ gTileset_GenericBuilding:: @ 83DFB6C .4byte gMetatileAttributes_GenericBuilding .4byte NULL @ animation callback - .align 2, 0 - + .align 2 gTileset_MauvilleGameCorner:: @ 83DFB84 .byte TRUE @ is compressed .byte TRUE @ is secondary tileset @@ -586,8 +537,7 @@ gTileset_MauvilleGameCorner:: @ 83DFB84 .4byte gMetatileAttributes_MauvilleGameCorner .4byte NULL @ animation callback - .align 2, 0 - + .align 2 gTileset_RustboroGym:: @ 83DFB9C .byte TRUE @ is compressed .byte TRUE @ is secondary tileset @@ -598,8 +548,7 @@ gTileset_RustboroGym:: @ 83DFB9C .4byte gMetatileAttributes_RustboroGym .4byte NULL @ animation callback - .align 2, 0 - + .align 2 gTileset_DewfordGym:: @ 83DFBB4 .byte TRUE @ is compressed .byte TRUE @ is secondary tileset @@ -610,8 +559,7 @@ gTileset_DewfordGym:: @ 83DFBB4 .4byte gMetatileAttributes_DewfordGym .4byte NULL @ animation callback - .align 2, 0 - + .align 2 gTileset_MauvilleGym:: @ 83DFBCC .byte TRUE @ is compressed .byte TRUE @ is secondary tileset @@ -622,8 +570,7 @@ gTileset_MauvilleGym:: @ 83DFBCC .4byte gMetatileAttributes_MauvilleGym .4byte TilesetCb_MauvilleGym - .align 2, 0 - + .align 2 gTileset_LavaridgeGym:: @ 83DFBE4 .byte TRUE @ is compressed .byte TRUE @ is secondary tileset @@ -634,8 +581,7 @@ gTileset_LavaridgeGym:: @ 83DFBE4 .4byte gMetatileAttributes_LavaridgeGym .4byte NULL @ animation callback - .align 2, 0 - + .align 2 gTileset_TrickHousePuzzle:: @ 83DFBFC .byte TRUE @ is compressed .byte TRUE @ is secondary tileset @@ -646,8 +592,7 @@ gTileset_TrickHousePuzzle:: @ 83DFBFC .4byte gMetatileAttributes_TrickHousePuzzle .4byte NULL @ animation callback - .align 2, 0 - + .align 2 gTileset_FortreeGym:: @ 83DFC14 .byte TRUE @ is compressed .byte TRUE @ is secondary tileset @@ -658,8 +603,7 @@ gTileset_FortreeGym:: @ 83DFC14 .4byte gMetatileAttributes_FortreeGym .4byte NULL @ animation callback - .align 2, 0 - + .align 2 gTileset_MossdeepGym:: @ 83DFC2C .byte TRUE @ is compressed .byte TRUE @ is secondary tileset @@ -670,8 +614,7 @@ gTileset_MossdeepGym:: @ 83DFC2C .4byte gMetatileAttributes_MossdeepGym .4byte NULL @ animation callback - .align 2, 0 - + .align 2 gTileset_InsideShip:: @ 83DFC44 .byte TRUE @ is compressed .byte TRUE @ is secondary tileset @@ -682,8 +625,7 @@ gTileset_InsideShip:: @ 83DFC44 .4byte gMetatileAttributes_InsideShip .4byte NULL @ animation callback - .align 2, 0 - + .align 2 gTileset_SecretBase:: @ 83DFC5C .byte FALSE @ is compressed .byte FALSE @ is secondary tileset @@ -694,18 +636,15 @@ gTileset_SecretBase:: @ 83DFC5C .4byte gMetatileAttributes_SecretBasePrimary .4byte NULL @ animation callback - .align 2, 0 - + .align 2 gTilesetPointer_SecretBase:: @ 83DFC74 .4byte gTileset_SecretBase - .align 2, 0 - + .align 2 gTilesetPointer_SecretBaseRedCave:: @ 83DFC78 .4byte gTileset_SecretBaseRedCave - .align 2, 0 - + .align 2 gTileset_EliteFour:: @ 83DFC7C .byte TRUE @ is compressed .byte TRUE @ is secondary tileset @@ -716,8 +655,7 @@ gTileset_EliteFour:: @ 83DFC7C .4byte gMetatileAttributes_EliteFour .4byte TilesetCb_EliteFour - .align 2, 0 - + .align 2 gTileset_BattleFrontier:: @ 83DFC94 .byte TRUE @ is compressed .byte TRUE @ is secondary tileset @@ -728,8 +666,7 @@ gTileset_BattleFrontier:: @ 83DFC94 .4byte gMetatileAttributes_BattleFrontier .4byte NULL @ animation callback - .align 2, 0 - + .align 2 gTileset_BattlePalace:: @ 83DFCAC .byte TRUE @ is compressed .byte TRUE @ is secondary tileset @@ -740,8 +677,7 @@ gTileset_BattlePalace:: @ 83DFCAC .4byte gMetatileAttributes_BattlePalace .4byte NULL @ animation callback - .align 2, 0 - + .align 2 gTileset_BattleDome:: @ 83DFCC4 .byte TRUE @ is compressed .byte TRUE @ is secondary tileset @@ -752,8 +688,7 @@ gTileset_BattleDome:: @ 83DFCC4 .4byte gMetatileAttributes_BattleDome .4byte TilesetCb_BattleDome - .align 2, 0 - + .align 2 gTileset_BattleFactory:: @ 83DFCDC .byte TRUE @ is compressed .byte TRUE @ is secondary tileset @@ -764,8 +699,7 @@ gTileset_BattleFactory:: @ 83DFCDC .4byte gMetatileAttributes_BattleFactory .4byte NULL @ animation callback - .align 2, 0 - + .align 2 gTileset_BattlePike:: @ 83DFCF4 .byte TRUE @ is compressed .byte TRUE @ is secondary tileset @@ -776,8 +710,7 @@ gTileset_BattlePike:: @ 83DFCF4 .4byte gMetatileAttributes_BattlePike .4byte NULL @ animation callback - .align 2, 0 - + .align 2 gTileset_BattleArena:: @ 83DFD0C .byte TRUE @ is compressed .byte TRUE @ is secondary tileset @@ -788,8 +721,7 @@ gTileset_BattleArena:: @ 83DFD0C .4byte gMetatileAttributes_BattleArena .4byte NULL @ animation callback - .align 2, 0 - + .align 2 gTileset_BattlePyramid:: @ 83DFD24 .byte TRUE @ is compressed .byte TRUE @ is secondary tileset @@ -800,8 +732,7 @@ gTileset_BattlePyramid:: @ 83DFD24 .4byte gMetatileAttributes_BattlePyramid .4byte TilesetCb_BattlePyramid - .align 2, 0 - + .align 2 gTileset_MirageTower:: @ 83DFD3C .byte TRUE @ is compressed .byte TRUE @ is secondary tileset @@ -812,8 +743,7 @@ gTileset_MirageTower:: @ 83DFD3C .4byte gMetatileAttributes_MirageTower .4byte NULL @ animation callback - .align 2, 0 - + .align 2 gTileset_MossdeepGameCorner:: @ 83DFD54 .byte TRUE @ is compressed .byte TRUE @ is secondary tileset @@ -824,8 +754,7 @@ gTileset_MossdeepGameCorner:: @ 83DFD54 .4byte gMetatileAttributes_MossdeepGameCorner .4byte NULL @ animation callback - .align 2, 0 - + .align 2 gTileset_IslandHarbor:: @ 83DFD6C .byte TRUE @ is compressed .byte TRUE @ is secondary tileset @@ -836,8 +765,7 @@ gTileset_IslandHarbor:: @ 83DFD6C .4byte gMetatileAttributes_IslandHarbor .4byte NULL @ animation callback - .align 2, 0 - + .align 2 gTileset_TrainerHill:: @ 83DFD84 .byte TRUE @ is compressed .byte TRUE @ is secondary tileset @@ -848,8 +776,7 @@ gTileset_TrainerHill:: @ 83DFD84 .4byte gMetatileAttributes_TrainerHill .4byte NULL @ animation callback - .align 2, 0 - + .align 2 gTileset_NavelRock:: @ 83DFD9C .byte TRUE @ is compressed .byte TRUE @ is secondary tileset @@ -860,8 +787,7 @@ gTileset_NavelRock:: @ 83DFD9C .4byte gMetatileAttributes_NavelRock .4byte NULL @ animation callback - .align 2, 0 - + .align 2 gTileset_BattleFrontierRankingHall:: @ 83DFDB4 .byte TRUE @ is compressed .byte TRUE @ is secondary tileset @@ -872,8 +798,7 @@ gTileset_BattleFrontierRankingHall:: @ 83DFDB4 .4byte gMetatileAttributes_BattleFrontierRankingHall .4byte NULL @ animation callback - .align 2, 0 - + .align 2 gTileset_BattleTent:: @ 83DFDCC .byte TRUE @ is compressed .byte TRUE @ is secondary tileset @@ -884,8 +809,7 @@ gTileset_BattleTent:: @ 83DFDCC .4byte gMetatileAttributes_BattleTent .4byte NULL @ animation callback - .align 2, 0 - + .align 2 gTileset_MysteryEventsHouse:: @ 83DFDE4 .byte TRUE @ is compressed .byte TRUE @ is secondary tileset @@ -896,8 +820,7 @@ gTileset_MysteryEventsHouse:: @ 83DFDE4 .4byte gMetatileAttributes_MysteryEventsHouse .4byte NULL @ animation callback - .align 2, 0 - + .align 2 gTileset_UnionRoom:: @ 83DFDFC .byte TRUE @ is compressed .byte TRUE @ is secondary tileset |