diff options
Diffstat (limited to 'data/maps/_assets.s')
| -rw-r--r-- | data/maps/_assets.s | 1836 |
1 files changed, 979 insertions, 857 deletions
diff --git a/data/maps/_assets.s b/data/maps/_assets.s index 2f2655b1c..1297bbd69 100644 --- a/data/maps/_assets.s +++ b/data/maps/_assets.s @@ -4,13 +4,14 @@ PetalburgCity_MapBorder:: @ 8287264 PetalburgCity_MapBlockdata:: @ 828726C .incbin "data/maps/PetalburgCity/map.bin" + .align 2 PetalburgCity_MapAttributes:: @ 8287974 .4byte 0x1e .4byte 0x1e .4byte PetalburgCity_MapBorder .4byte PetalburgCity_MapBlockdata - .4byte PetalburgCity_Tileset - .4byte PetalburgCity_Tileset2 + .4byte gTileset_General + .4byte gTileset_Petalburg SlateportCity_MapBorder:: @ 828798C .incbin "data/maps/SlateportCity/border.bin" @@ -18,13 +19,14 @@ SlateportCity_MapBorder:: @ 828798C SlateportCity_MapBlockdata:: @ 8287994 .incbin "data/maps/SlateportCity/map.bin" + .align 2 SlateportCity_MapAttributes:: @ 8288C54 .4byte 0x28 .4byte 0x3c .4byte SlateportCity_MapBorder .4byte SlateportCity_MapBlockdata - .4byte SlateportCity_Tileset - .4byte SlateportCity_Tileset2 + .4byte gTileset_General + .4byte gTileset_Slateport MauvilleCity_MapBorder:: @ 8288C6C .incbin "data/maps/MauvilleCity/border.bin" @@ -32,13 +34,14 @@ MauvilleCity_MapBorder:: @ 8288C6C MauvilleCity_MapBlockdata:: @ 8288C74 .incbin "data/maps/MauvilleCity/map.bin" + .align 2 MauvilleCity_MapAttributes:: @ 82892B4 .4byte 0x28 .4byte 0x14 .4byte MauvilleCity_MapBorder .4byte MauvilleCity_MapBlockdata - .4byte MauvilleCity_Tileset - .4byte MauvilleCity_Tileset2 + .4byte gTileset_General + .4byte gTileset_Mauville RustboroCity_MapBorder:: @ 82892CC .incbin "data/maps/RustboroCity/border.bin" @@ -46,13 +49,14 @@ RustboroCity_MapBorder:: @ 82892CC RustboroCity_MapBlockdata:: @ 82892D4 .incbin "data/maps/RustboroCity/map.bin" + .align 2 RustboroCity_MapAttributes:: @ 828A594 .4byte 0x28 .4byte 0x3c .4byte RustboroCity_MapBorder .4byte RustboroCity_MapBlockdata - .4byte RustboroCity_Tileset - .4byte RustboroCity_Tileset2 + .4byte gTileset_General + .4byte gTileset_Rustboro FortreeCity_MapBorder:: @ 828A5AC .incbin "data/maps/FortreeCity/border.bin" @@ -60,13 +64,14 @@ FortreeCity_MapBorder:: @ 828A5AC FortreeCity_MapBlockdata:: @ 828A5B4 .incbin "data/maps/FortreeCity/map.bin" + .align 2 FortreeCity_MapAttributes:: @ 828ABF4 .4byte 0x28 .4byte 0x14 .4byte FortreeCity_MapBorder .4byte FortreeCity_MapBlockdata - .4byte FortreeCity_Tileset - .4byte FortreeCity_Tileset2 + .4byte gTileset_General + .4byte gTileset_Fortree LilycoveCity_MapBorder:: @ 828AC0C .incbin "data/maps/LilycoveCity/border.bin" @@ -74,13 +79,14 @@ LilycoveCity_MapBorder:: @ 828AC0C LilycoveCity_MapBlockdata:: @ 828AC14 .incbin "data/maps/LilycoveCity/map.bin" + .align 2 LilycoveCity_MapAttributes:: @ 828C514 .4byte 0x50 .4byte 0x28 .4byte LilycoveCity_MapBorder .4byte LilycoveCity_MapBlockdata - .4byte LilycoveCity_Tileset - .4byte LilycoveCity_Tileset2 + .4byte gTileset_General + .4byte gTileset_Lilycove MossdeepCity_MapBorder:: @ 828C52C .incbin "data/maps/MossdeepCity/border.bin" @@ -88,13 +94,14 @@ MossdeepCity_MapBorder:: @ 828C52C MossdeepCity_MapBlockdata:: @ 828C534 .incbin "data/maps/MossdeepCity/map.bin" + .align 2 MossdeepCity_MapAttributes:: @ 828DE34 .4byte 0x50 .4byte 0x28 .4byte MossdeepCity_MapBorder .4byte MossdeepCity_MapBlockdata - .4byte MossdeepCity_Tileset - .4byte MossdeepCity_Tileset2 + .4byte gTileset_General + .4byte gTileset_Mossdeep SootopolisCity_MapBorder:: @ 828DE4C .incbin "data/maps/SootopolisCity/border.bin" @@ -102,13 +109,14 @@ SootopolisCity_MapBorder:: @ 828DE4C SootopolisCity_MapBlockdata:: @ 828DE54 .incbin "data/maps/SootopolisCity/map.bin" + .align 2 SootopolisCity_MapAttributes:: @ 828FA74 .4byte 0x3c .4byte 0x3c .4byte SootopolisCity_MapBorder .4byte SootopolisCity_MapBlockdata - .4byte SootopolisCity_Tileset - .4byte SootopolisCity_Tileset2 + .4byte gTileset_General + .4byte gTileset_Sootopolis EverGrandeCity_MapBorder:: @ 828FA8C .incbin "data/maps/EverGrandeCity/border.bin" @@ -116,13 +124,14 @@ EverGrandeCity_MapBorder:: @ 828FA8C EverGrandeCity_MapBlockdata:: @ 828FA94 .incbin "data/maps/EverGrandeCity/map.bin" + .align 2 EverGrandeCity_MapAttributes:: @ 8291394 .4byte 0x28 .4byte 0x50 .4byte EverGrandeCity_MapBorder .4byte EverGrandeCity_MapBlockdata - .4byte EverGrandeCity_Tileset - .4byte EverGrandeCity_Tileset2 + .4byte gTileset_General + .4byte gTileset_EverGrande LittlerootTown_MapBorder:: @ 82913AC .incbin "data/maps/LittlerootTown/border.bin" @@ -130,13 +139,14 @@ LittlerootTown_MapBorder:: @ 82913AC LittlerootTown_MapBlockdata:: @ 82913B4 .incbin "data/maps/LittlerootTown/map.bin" + .align 2 LittlerootTown_MapAttributes:: @ 82916D4 .4byte 0x14 .4byte 0x14 .4byte LittlerootTown_MapBorder .4byte LittlerootTown_MapBlockdata - .4byte LittlerootTown_Tileset - .4byte LittlerootTown_Tileset2 + .4byte gTileset_General + .4byte gTileset_Petalburg OldaleTown_MapBorder:: @ 82916EC .incbin "data/maps/OldaleTown/border.bin" @@ -144,13 +154,14 @@ OldaleTown_MapBorder:: @ 82916EC OldaleTown_MapBlockdata:: @ 82916F4 .incbin "data/maps/OldaleTown/map.bin" + .align 2 OldaleTown_MapAttributes:: @ 8291A14 .4byte 0x14 .4byte 0x14 .4byte OldaleTown_MapBorder .4byte OldaleTown_MapBlockdata - .4byte OldaleTown_Tileset - .4byte OldaleTown_Tileset2 + .4byte gTileset_General + .4byte gTileset_Petalburg DewfordTown_MapBorder:: @ 8291A2C .incbin "data/maps/DewfordTown/border.bin" @@ -158,13 +169,14 @@ DewfordTown_MapBorder:: @ 8291A2C DewfordTown_MapBlockdata:: @ 8291A34 .incbin "data/maps/DewfordTown/map.bin" + .align 2 DewfordTown_MapAttributes:: @ 8291D54 .4byte 0x14 .4byte 0x14 .4byte DewfordTown_MapBorder .4byte DewfordTown_MapBlockdata - .4byte DewfordTown_Tileset - .4byte DewfordTown_Tileset2 + .4byte gTileset_General + .4byte gTileset_Dewford LavaridgeTown_MapBorder:: @ 8291D6C .incbin "data/maps/LavaridgeTown/border.bin" @@ -172,13 +184,14 @@ LavaridgeTown_MapBorder:: @ 8291D6C LavaridgeTown_MapBlockdata:: @ 8291D74 .incbin "data/maps/LavaridgeTown/map.bin" + .align 2 LavaridgeTown_MapAttributes:: @ 8292094 .4byte 0x14 .4byte 0x14 .4byte LavaridgeTown_MapBorder .4byte LavaridgeTown_MapBlockdata - .4byte LavaridgeTown_Tileset - .4byte LavaridgeTown_Tileset2 + .4byte gTileset_General + .4byte gTileset_Lavaridge FallarborTown_MapBorder:: @ 82920AC .incbin "data/maps/FallarborTown/border.bin" @@ -186,13 +199,14 @@ FallarborTown_MapBorder:: @ 82920AC FallarborTown_MapBlockdata:: @ 82920B4 .incbin "data/maps/FallarborTown/map.bin" + .align 2 FallarborTown_MapAttributes:: @ 82923D4 .4byte 0x14 .4byte 0x14 .4byte FallarborTown_MapBorder .4byte FallarborTown_MapBlockdata - .4byte FallarborTown_Tileset - .4byte FallarborTown_Tileset2 + .4byte gTileset_General + .4byte gTileset_Fallarbor VerdanturfTown_MapBorder:: @ 82923EC .incbin "data/maps/VerdanturfTown/border.bin" @@ -200,13 +214,14 @@ VerdanturfTown_MapBorder:: @ 82923EC VerdanturfTown_MapBlockdata:: @ 82923F4 .incbin "data/maps/VerdanturfTown/map.bin" + .align 2 VerdanturfTown_MapAttributes:: @ 8292714 .4byte 0x14 .4byte 0x14 .4byte VerdanturfTown_MapBorder .4byte VerdanturfTown_MapBlockdata - .4byte VerdanturfTown_Tileset - .4byte VerdanturfTown_Tileset2 + .4byte gTileset_General + .4byte gTileset_Mauville PacifidlogTown_MapBorder:: @ 829272C .incbin "data/maps/PacifidlogTown/border.bin" @@ -214,13 +229,14 @@ PacifidlogTown_MapBorder:: @ 829272C PacifidlogTown_MapBlockdata:: @ 8292734 .incbin "data/maps/PacifidlogTown/map.bin" + .align 2 PacifidlogTown_MapAttributes:: @ 8292D74 .4byte 0x14 .4byte 0x28 .4byte PacifidlogTown_MapBorder .4byte PacifidlogTown_MapBlockdata - .4byte PacifidlogTown_Tileset - .4byte PacifidlogTown_Tileset2 + .4byte gTileset_General + .4byte gTileset_Pacifidlog Route101_MapBorder:: @ 8292D8C .incbin "data/maps/Route101/border.bin" @@ -228,13 +244,14 @@ Route101_MapBorder:: @ 8292D8C Route101_MapBlockdata:: @ 8292D94 .incbin "data/maps/Route101/map.bin" + .align 2 Route101_MapAttributes:: @ 82930B4 .4byte 0x14 .4byte 0x14 .4byte Route101_MapBorder .4byte Route101_MapBlockdata - .4byte Route101_Tileset - .4byte Route101_Tileset2 + .4byte gTileset_General + .4byte gTileset_Petalburg Route102_MapBorder:: @ 82930CC .incbin "data/maps/Route102/border.bin" @@ -242,13 +259,14 @@ Route102_MapBorder:: @ 82930CC Route102_MapBlockdata:: @ 82930D4 .incbin "data/maps/Route102/map.bin" + .align 2 Route102_MapAttributes:: @ 82938A4 .4byte 0x32 .4byte 0x14 .4byte Route102_MapBorder .4byte Route102_MapBlockdata - .4byte Route102_Tileset - .4byte Route102_Tileset2 + .4byte gTileset_General + .4byte gTileset_Petalburg Route103_MapBorder:: @ 82938BC .incbin "data/maps/Route103/border.bin" @@ -256,13 +274,14 @@ Route103_MapBorder:: @ 82938BC Route103_MapBlockdata:: @ 82938C4 .incbin "data/maps/Route103/map.bin" + .align 2 Route103_MapAttributes:: @ 8294544 .4byte 0x50 .4byte 0x14 .4byte Route103_MapBorder .4byte Route103_MapBlockdata - .4byte Route103_Tileset - .4byte Route103_Tileset2 + .4byte gTileset_General + .4byte gTileset_Petalburg Route104_MapBorder:: @ 829455C .incbin "data/maps/Route104/border.bin" @@ -270,13 +289,14 @@ Route104_MapBorder:: @ 829455C Route104_MapBlockdata:: @ 8294564 .incbin "data/maps/Route104/map.bin" + .align 2 Route104_MapAttributes:: @ 8295E64 .4byte 0x28 .4byte 0x50 .4byte Route104_MapBorder .4byte Route104_MapBlockdata - .4byte Route104_Tileset - .4byte Route104_Tileset2 + .4byte gTileset_General + .4byte gTileset_Rustboro Route105_MapBorder:: @ 8295E7C .incbin "data/maps/Route105/border.bin" @@ -284,13 +304,14 @@ Route105_MapBorder:: @ 8295E7C Route105_MapBlockdata:: @ 8295E84 .incbin "data/maps/Route105/map.bin" + .align 2 Route105_MapAttributes:: @ 8297784 .4byte 0x28 .4byte 0x50 .4byte Route105_MapBorder .4byte Route105_MapBlockdata - .4byte Route105_Tileset - .4byte Route105_Tileset2 + .4byte gTileset_General + .4byte gTileset_Dewford Route106_MapBorder:: @ 829779C .incbin "data/maps/Route106/border.bin" @@ -298,13 +319,14 @@ Route106_MapBorder:: @ 829779C Route106_MapBlockdata:: @ 82977A4 .incbin "data/maps/Route106/map.bin" + .align 2 Route106_MapAttributes:: @ 8298424 .4byte 0x50 .4byte 0x14 .4byte Route106_MapBorder .4byte Route106_MapBlockdata - .4byte Route106_Tileset - .4byte Route106_Tileset2 + .4byte gTileset_General + .4byte gTileset_Dewford Route107_MapBorder:: @ 829843C .incbin "data/maps/Route107/border.bin" @@ -312,13 +334,14 @@ Route107_MapBorder:: @ 829843C Route107_MapBlockdata:: @ 8298444 .incbin "data/maps/Route107/map.bin" + .align 2 Route107_MapAttributes:: @ 8298DA4 .4byte 0x3c .4byte 0x14 .4byte Route107_MapBorder .4byte Route107_MapBlockdata - .4byte Route107_Tileset - .4byte Route107_Tileset2 + .4byte gTileset_General + .4byte gTileset_Dewford Route108_MapBorder:: @ 8298DBC .incbin "data/maps/Route108/border.bin" @@ -326,13 +349,14 @@ Route108_MapBorder:: @ 8298DBC Route108_MapBlockdata:: @ 8298DC4 .incbin "data/maps/Route108/map.bin" + .align 2 Route108_MapAttributes:: @ 8299724 .4byte 0x3c .4byte 0x14 .4byte Route108_MapBorder .4byte Route108_MapBlockdata - .4byte Route108_Tileset - .4byte Route108_Tileset2 + .4byte gTileset_General + .4byte gTileset_Slateport Route109_MapBorder:: @ 829973C .incbin "data/maps/Route109/border.bin" @@ -340,13 +364,14 @@ Route109_MapBorder:: @ 829973C Route109_MapBlockdata:: @ 8299744 .incbin "data/maps/Route109/map.bin" + .align 2 Route109_MapAttributes:: @ 829AA04 .4byte 0x28 .4byte 0x3c .4byte Route109_MapBorder .4byte Route109_MapBlockdata - .4byte Route109_Tileset - .4byte Route109_Tileset2 + .4byte gTileset_General + .4byte gTileset_Slateport Route110_MapBorder:: @ 829AA1C .incbin "data/maps/Route110/border.bin" @@ -354,13 +379,14 @@ Route110_MapBorder:: @ 829AA1C Route110_MapBlockdata:: @ 829AA24 .incbin "data/maps/Route110/map.bin" + .align 2 Route110_MapAttributes:: @ 829C964 .4byte 0x28 .4byte 0x64 .4byte Route110_MapBorder .4byte Route110_MapBlockdata - .4byte Route110_Tileset - .4byte Route110_Tileset2 + .4byte gTileset_General + .4byte gTileset_Mauville Route111_MapBorder:: @ 829C97C .incbin "data/maps/Route111/border.bin" @@ -368,13 +394,14 @@ Route111_MapBorder:: @ 829C97C Route111_MapBlockdata:: @ 829C984 .incbin "data/maps/Route111/map.bin" + .align 2 Route111_MapAttributes:: @ 829F544 .4byte 0x28 .4byte 0x8c .4byte Route111_MapBorder .4byte Route111_MapBlockdata - .4byte Route111_Tileset - .4byte Route111_Tileset2 + .4byte gTileset_General + .4byte gTileset_Mauville Route112_MapBorder:: @ 829F55C .incbin "data/maps/Route112/border.bin" @@ -382,13 +409,14 @@ Route112_MapBorder:: @ 829F55C Route112_MapBlockdata:: @ 829F564 .incbin "data/maps/Route112/map.bin" + .align 2 Route112_MapAttributes:: @ 82A0824 .4byte 0x28 .4byte 0x3c .4byte Route112_MapBorder .4byte Route112_MapBlockdata - .4byte Route112_Tileset - .4byte Route112_Tileset2 + .4byte gTileset_General + .4byte gTileset_Lavaridge Route113_MapBorder:: @ 82A083C .incbin "data/maps/Route113/border.bin" @@ -396,13 +424,14 @@ Route113_MapBorder:: @ 82A083C Route113_MapBlockdata:: @ 82A0844 .incbin "data/maps/Route113/map.bin" + .align 2 Route113_MapAttributes:: @ 82A17E4 .4byte 0x64 .4byte 0x14 .4byte Route113_MapBorder .4byte Route113_MapBlockdata - .4byte Route113_Tileset - .4byte Route113_Tileset2 + .4byte gTileset_General + .4byte gTileset_Fallarbor Route114_MapBorder:: @ 82A17FC .incbin "data/maps/Route114/border.bin" @@ -410,13 +439,14 @@ Route114_MapBorder:: @ 82A17FC Route114_MapBlockdata:: @ 82A1804 .incbin "data/maps/Route114/map.bin" + .align 2 Route114_MapAttributes:: @ 82A3104 .4byte 0x28 .4byte 0x50 .4byte Route114_MapBorder .4byte Route114_MapBlockdata - .4byte Route114_Tileset - .4byte Route114_Tileset2 + .4byte gTileset_General + .4byte gTileset_Fallarbor Route115_MapBorder:: @ 82A311C .incbin "data/maps/Route115/border.bin" @@ -424,13 +454,14 @@ Route115_MapBorder:: @ 82A311C Route115_MapBlockdata:: @ 82A3124 .incbin "data/maps/Route115/map.bin" + .align 2 Route115_MapAttributes:: @ 82A4A24 .4byte 0x28 .4byte 0x50 .4byte Route115_MapBorder .4byte Route115_MapBlockdata - .4byte Route115_Tileset - .4byte Route115_Tileset2 + .4byte gTileset_General + .4byte gTileset_Fallarbor Route116_MapBorder:: @ 82A4A3C .incbin "data/maps/Route116/border.bin" @@ -438,13 +469,14 @@ Route116_MapBorder:: @ 82A4A3C Route116_MapBlockdata:: @ 82A4A44 .incbin "data/maps/Route116/map.bin" + .align 2 Route116_MapAttributes:: @ 82A59E4 .4byte 0x64 .4byte 0x14 .4byte Route116_MapBorder .4byte Route116_MapBlockdata - .4byte Route116_Tileset - .4byte Route116_Tileset2 + .4byte gTileset_General + .4byte gTileset_Rustboro Route117_MapBorder:: @ 82A59FC .incbin "data/maps/Route117/border.bin" @@ -452,13 +484,14 @@ Route117_MapBorder:: @ 82A59FC Route117_MapBlockdata:: @ 82A5A04 .incbin "data/maps/Route117/map.bin" + .align 2 Route117_MapAttributes:: @ 82A6364 .4byte 0x3c .4byte 0x14 .4byte Route117_MapBorder .4byte Route117_MapBlockdata - .4byte Route117_Tileset - .4byte Route117_Tileset2 + .4byte gTileset_General + .4byte gTileset_Mauville Route118_MapBorder:: @ 82A637C .incbin "data/maps/Route118/border.bin" @@ -466,13 +499,14 @@ Route118_MapBorder:: @ 82A637C Route118_MapBlockdata:: @ 82A6384 .incbin "data/maps/Route118/map.bin" + .align 2 Route118_MapAttributes:: @ 82A7004 .4byte 0x50 .4byte 0x14 .4byte Route118_MapBorder .4byte Route118_MapBlockdata - .4byte Route118_Tileset - .4byte Route118_Tileset2 + .4byte gTileset_General + .4byte gTileset_Mauville Route119_MapBorder:: @ 82A701C .incbin "data/maps/Route119/border.bin" @@ -480,13 +514,14 @@ Route119_MapBorder:: @ 82A701C Route119_MapBlockdata:: @ 82A7024 .incbin "data/maps/Route119/map.bin" + .align 2 Route119_MapAttributes:: @ 82A9BE4 .4byte 0x28 .4byte 0x8c .4byte Route119_MapBorder .4byte Route119_MapBlockdata - .4byte Route119_Tileset - .4byte Route119_Tileset2 + .4byte gTileset_General + .4byte gTileset_Fortree Route120_MapBorder:: @ 82A9BFC .incbin "data/maps/Route120/border.bin" @@ -494,13 +529,14 @@ Route120_MapBorder:: @ 82A9BFC Route120_MapBlockdata:: @ 82A9C04 .incbin "data/maps/Route120/map.bin" + .align 2 Route120_MapAttributes:: @ 82ABB44 .4byte 0x28 .4byte 0x64 .4byte Route120_MapBorder .4byte Route120_MapBlockdata - .4byte Route120_Tileset - .4byte Route120_Tileset2 + .4byte gTileset_General + .4byte gTileset_Fortree Route121_MapBorder:: @ 82ABB5C .incbin "data/maps/Route121/border.bin" @@ -508,13 +544,14 @@ Route121_MapBorder:: @ 82ABB5C Route121_MapBlockdata:: @ 82ABB64 .incbin "data/maps/Route121/map.bin" + .align 2 Route121_MapAttributes:: @ 82AC7E4 .4byte 0x50 .4byte 0x14 .4byte Route121_MapBorder .4byte Route121_MapBlockdata - .4byte Route121_Tileset - .4byte Route121_Tileset2 + .4byte gTileset_General + .4byte gTileset_Lilycove Route122_MapBorder:: @ 82AC7FC .incbin "data/maps/Route122/border.bin" @@ -522,13 +559,14 @@ Route122_MapBorder:: @ 82AC7FC Route122_MapBlockdata:: @ 82AC804 .incbin "data/maps/Route122/map.bin" + .align 2 Route122_MapAttributes:: @ 82AD484 .4byte 0x28 .4byte 0x28 .4byte Route122_MapBorder .4byte Route122_MapBlockdata - .4byte Route122_Tileset - .4byte Route122_Tileset2 + .4byte gTileset_General + .4byte gTileset_Lilycove Route123_MapBorder:: @ 82AD49C .incbin "data/maps/Route123/border.bin" @@ -536,13 +574,14 @@ Route123_MapBorder:: @ 82AD49C Route123_MapBlockdata:: @ 82AD4A4 .incbin "data/maps/Route123/map.bin" + .align 2 Route123_MapAttributes:: @ 82AEA84 .4byte 0x8c .4byte 0x14 .4byte Route123_MapBorder .4byte Route123_MapBlockdata - .4byte Route123_Tileset - .4byte Route123_Tileset2 + .4byte gTileset_General + .4byte gTileset_Lilycove Route124_MapBorder:: @ 82AEA9C .incbin "data/maps/Route124/border.bin" @@ -550,13 +589,14 @@ Route124_MapBorder:: @ 82AEA9C Route124_MapBlockdata:: @ 82AEAA4 .incbin "data/maps/Route124/map.bin" + .align 2 Route124_MapAttributes:: @ 82B1CA4 .4byte 0x50 .4byte 0x50 .4byte Route124_MapBorder .4byte Route124_MapBlockdata - .4byte Route124_Tileset - .4byte Route124_Tileset2 + .4byte gTileset_General + .4byte gTileset_Mossdeep Route125_MapBorder:: @ 82B1CBC .incbin "data/maps/Route125/border.bin" @@ -564,13 +604,14 @@ Route125_MapBorder:: @ 82B1CBC Route125_MapBlockdata:: @ 82B1CC4 .incbin "data/maps/Route125/map.bin" + .align 2 Route125_MapAttributes:: @ 82B35C4 .4byte 0x50 .4byte 0x28 .4byte Route125_MapBorder .4byte Route125_MapBlockdata - .4byte Route125_Tileset - .4byte Route125_Tileset2 + .4byte gTileset_General + .4byte gTileset_Mossdeep Route126_MapBorder:: @ 82B35DC .incbin "data/maps/Route126/border.bin" @@ -578,13 +619,14 @@ Route126_MapBorder:: @ 82B35DC Route126_MapBlockdata:: @ 82B35E4 .incbin "data/maps/Route126/map.bin" + .align 2 Route126_MapAttributes:: @ 82B67E4 .4byte 0x50 .4byte 0x50 .4byte Route126_MapBorder .4byte Route126_MapBlockdata - .4byte Route126_Tileset - .4byte Route126_Tileset2 + .4byte gTileset_General + .4byte gTileset_Mossdeep Route127_MapBorder:: @ 82B67FC .incbin "data/maps/Route127/border.bin" @@ -592,13 +634,14 @@ Route127_MapBorder:: @ 82B67FC Route127_MapBlockdata:: @ 82B6804 .incbin "data/maps/Route127/map.bin" + .align 2 Route127_MapAttributes:: @ 82B9A04 .4byte 0x50 .4byte 0x50 .4byte Route127_MapBorder .4byte Route127_MapBlockdata - .4byte Route127_Tileset - .4byte Route127_Tileset2 + .4byte gTileset_General + .4byte gTileset_Mossdeep Route128_MapBorder:: @ 82B9A1C .incbin "data/maps/Route128/border.bin" @@ -606,13 +649,14 @@ Route128_MapBorder:: @ 82B9A1C Route128_MapBlockdata:: @ 82B9A24 .incbin "data/maps/Route128/map.bin" + .align 2 Route128_MapAttributes:: @ 82BBFA4 .4byte 0x78 .4byte 0x28 .4byte Route128_MapBorder .4byte Route128_MapBlockdata - .4byte Route128_Tileset - .4byte Route128_Tileset2 + .4byte gTileset_General + .4byte gTileset_Mossdeep Route129_MapBorder:: @ 82BBFBC .incbin "data/maps/Route129/border.bin" @@ -620,15 +664,29 @@ Route129_MapBorder:: @ 82BBFBC Route129_MapBlockdata:: @ 82BBFC4 .incbin "data/maps/Route129/map.bin" + .align 2 Route129_MapAttributes:: @ 82BD8C4 .4byte 0x50 .4byte 0x28 .4byte Route129_MapBorder .4byte Route129_MapBlockdata - .4byte Route129_Tileset - .4byte Route129_Tileset2 + .4byte gTileset_General + .4byte gTileset_Mossdeep - .incbin "baserom.gba", 0x2bd8dc, 0x1920 +UnreferencedMap_MapBorder: @ 82BD8DC + .incbin "baserom.gba", 0x2bd8dc, 8 + +UnreferencedMap_MapBlockdata: @ 82BD8E4 + .incbin "baserom.gba", 0x2bd8e4, 0x1900 + + .align 2 +UnreferencedMap_MapAttributes:: @ 82BF1E4 + .4byte 0x50 + .4byte 0x28 + .4byte UnreferencedMap_MapBorder + .4byte UnreferencedMap_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave Route131_MapBorder:: @ 82BF1FC .incbin "data/maps/Route131/border.bin" @@ -636,13 +694,14 @@ Route131_MapBorder:: @ 82BF1FC Route131_MapBlockdata:: @ 82BF204 .incbin "data/maps/Route131/map.bin" + .align 2 Route131_MapAttributes:: @ 82C04C4 .4byte 0x3c .4byte 0x28 .4byte Route131_MapBorder .4byte Route131_MapBlockdata - .4byte Route131_Tileset - .4byte Route131_Tileset2 + .4byte gTileset_General + .4byte gTileset_Pacifidlog Route132_MapBorder:: @ 82C04DC .incbin "data/maps/Route132/border.bin" @@ -650,13 +709,14 @@ Route132_MapBorder:: @ 82C04DC Route132_MapBlockdata:: @ 82C04E4 .incbin "data/maps/Route132/map.bin" + .align 2 Route132_MapAttributes:: @ 82C1DE4 .4byte 0x50 .4byte 0x28 .4byte Route132_MapBorder .4byte Route132_MapBlockdata - .4byte Route132_Tileset - .4byte Route132_Tileset2 + .4byte gTileset_General + .4byte gTileset_Pacifidlog Route133_MapBorder:: @ 82C1DFC .incbin "data/maps/Route133/border.bin" @@ -664,13 +724,14 @@ Route133_MapBorder:: @ 82C1DFC Route133_MapBlockdata:: @ 82C1E04 .incbin "data/maps/Route133/map.bin" + .align 2 Route133_MapAttributes:: @ 82C3704 .4byte 0x50 .4byte 0x28 .4byte Route133_MapBorder .4byte Route133_MapBlockdata - .4byte Route133_Tileset - .4byte Route133_Tileset2 + .4byte gTileset_General + .4byte gTileset_Pacifidlog Route134_MapBorder:: @ 82C371C .incbin "data/maps/Route134/border.bin" @@ -678,13 +739,14 @@ Route134_MapBorder:: @ 82C371C Route134_MapBlockdata:: @ 82C3724 .incbin "data/maps/Route134/map.bin" + .align 2 Route134_MapAttributes:: @ 82C5024 .4byte 0x50 .4byte 0x28 .4byte Route134_MapBorder .4byte Route134_MapBlockdata - .4byte Route134_Tileset - .4byte Route134_Tileset2 + .4byte gTileset_General + .4byte gTileset_Pacifidlog Underwater2_MapBorder:: @ 82C503C .incbin "data/maps/Underwater2/border.bin" @@ -692,13 +754,14 @@ Underwater2_MapBorder:: @ 82C503C Underwater2_MapBlockdata:: @ 82C5044 .incbin "data/maps/Underwater2/map.bin" + .align 2 Underwater2_MapAttributes:: @ 82C8244 .4byte 0x50 .4byte 0x50 .4byte Underwater2_MapBorder .4byte Underwater2_MapBlockdata - .4byte Underwater2_Tileset - .4byte Underwater2_Tileset2 + .4byte gTileset_General + .4byte gTileset_Underwater Underwater3_MapBorder:: @ 82C825C .incbin "data/maps/Underwater3/border.bin" @@ -706,13 +769,14 @@ Underwater3_MapBorder:: @ 82C825C Underwater3_MapBlockdata:: @ 82C8264 .incbin "data/maps/Underwater3/map.bin" + .align 2 Underwater3_MapAttributes:: @ 82CB464 .4byte 0x50 .4byte 0x50 .4byte Underwater3_MapBorder .4byte Underwater3_MapBlockdata - .4byte Underwater3_Tileset - .4byte Underwater3_Tileset2 + .4byte gTileset_General + .4byte gTileset_Underwater Underwater4_MapBorder:: @ 82CB47C .incbin "data/maps/Underwater4/border.bin" @@ -720,13 +784,14 @@ Underwater4_MapBorder:: @ 82CB47C Underwater4_MapBlockdata:: @ 82CB484 .incbin "data/maps/Underwater4/map.bin" + .align 2 Underwater4_MapAttributes:: @ 82CDA04 .4byte 0x78 .4byte 0x28 .4byte Underwater4_MapBorder .4byte Underwater4_MapBlockdata - .4byte Underwater4_Tileset - .4byte Underwater4_Tileset2 + .4byte gTileset_General + .4byte gTileset_Underwater LittlerootTown_BrendansHouse_1F_MapBorder:: @ 82CDA1C .incbin "data/maps/LittlerootTown_BrendansHouse_1F/border.bin" @@ -734,15 +799,14 @@ LittlerootTown_BrendansHouse_1F_MapBorder:: @ 82CDA1C LittlerootTown_BrendansHouse_1F_MapBlockdata:: @ 82CDA24 .incbin "data/maps/LittlerootTown_BrendansHouse_1F/map.bin" - .incbin "baserom.gba", 0x2cdaea, 0x2 - + .align 2 LittlerootTown_BrendansHouse_1F_MapAttributes:: @ 82CDAEC .4byte 0xb .4byte 0x9 .4byte LittlerootTown_BrendansHouse_1F_MapBorder .4byte LittlerootTown_BrendansHouse_1F_MapBlockdata - .4byte LittlerootTown_BrendansHouse_1F_Tileset - .4byte LittlerootTown_BrendansHouse_1F_Tileset2 + .4byte gTileset_Building + .4byte gTileset_BrendansMaysHouse LittlerootTown_BrendansHouse_2F_MapBorder:: @ 82CDB04 .incbin "data/maps/LittlerootTown_BrendansHouse_2F/border.bin" @@ -750,13 +814,14 @@ LittlerootTown_BrendansHouse_2F_MapBorder:: @ 82CDB04 LittlerootTown_BrendansHouse_2F_MapBlockdata:: @ 82CDB0C .incbin "data/maps/LittlerootTown_BrendansHouse_2F/map.bin" + .align 2 LittlerootTown_BrendansHouse_2F_MapAttributes:: @ 82CDB9C .4byte 0x9 .4byte 0x8 .4byte LittlerootTown_BrendansHouse_2F_MapBorder .4byte LittlerootTown_BrendansHouse_2F_MapBlockdata - .4byte LittlerootTown_BrendansHouse_2F_Tileset - .4byte LittlerootTown_BrendansHouse_2F_Tileset2 + .4byte gTileset_Building + .4byte gTileset_BrendansMaysHouse LittlerootTown_MaysHouse_1F_MapBorder:: @ 82CDBB4 .incbin "data/maps/LittlerootTown_MaysHouse_1F/border.bin" @@ -764,15 +829,14 @@ LittlerootTown_MaysHouse_1F_MapBorder:: @ 82CDBB4 LittlerootTown_MaysHouse_1F_MapBlockdata:: @ 82CDBBC .incbin "data/maps/LittlerootTown_MaysHouse_1F/map.bin" - .incbin "baserom.gba", 0x2cdc82, 0x2 - + .align 2 LittlerootTown_MaysHouse_1F_MapAttributes:: @ 82CDC84 .4byte 0xb .4byte 0x9 .4byte LittlerootTown_MaysHouse_1F_MapBorder .4byte LittlerootTown_MaysHouse_1F_MapBlockdata - .4byte LittlerootTown_MaysHouse_1F_Tileset - .4byte LittlerootTown_MaysHouse_1F_Tileset2 + .4byte gTileset_Building + .4byte gTileset_BrendansMaysHouse LittlerootTown_MaysHouse_2F_MapBorder:: @ 82CDC9C .incbin "data/maps/LittlerootTown_MaysHouse_2F/border.bin" @@ -780,13 +844,14 @@ LittlerootTown_MaysHouse_2F_MapBorder:: @ 82CDC9C LittlerootTown_MaysHouse_2F_MapBlockdata:: @ 82CDCA4 .incbin "data/maps/LittlerootTown_MaysHouse_2F/map.bin" + .align 2 LittlerootTown_MaysHouse_2F_MapAttributes:: @ 82CDD34 .4byte 0x9 .4byte 0x8 .4byte LittlerootTown_MaysHouse_2F_MapBorder .4byte LittlerootTown_MaysHouse_2F_MapBlockdata - .4byte LittlerootTown_MaysHouse_2F_Tileset - .4byte LittlerootTown_MaysHouse_2F_Tileset2 + .4byte gTileset_Building + .4byte gTileset_BrendansMaysHouse LittlerootTown_ProfessorBirchsLab_MapBorder:: @ 82CDD4C .incbin "data/maps/LittlerootTown_ProfessorBirchsLab/border.bin" @@ -794,142 +859,89 @@ LittlerootTown_ProfessorBirchsLab_MapBorder:: @ 82CDD4C LittlerootTown_ProfessorBirchsLab_MapBlockdata:: @ 82CDD54 .incbin "data/maps/LittlerootTown_ProfessorBirchsLab/map.bin" - .incbin "baserom.gba", 0x2cdea6, 0x2 - + .align 2 LittlerootTown_ProfessorBirchsLab_MapAttributes:: @ 82CDEA8 .4byte 0xd .4byte 0xd .4byte LittlerootTown_ProfessorBirchsLab_MapBorder .4byte LittlerootTown_ProfessorBirchsLab_MapBlockdata - .4byte LittlerootTown_ProfessorBirchsLab_Tileset - .4byte LittlerootTown_ProfessorBirchsLab_Tileset2 - -OldaleTown_House1_MapBorder:: @ 82CDEC0 - .incbin "data/maps/OldaleTown_House1/border.bin" - -OldaleTown_House1_MapBlockdata:: @ 82CDEC8 - .incbin "data/maps/OldaleTown_House1/map.bin" - -FallarborTown_House1_MapAttributes:: @ 82CDF7C -LilycoveCity_House1_MapAttributes:: @ 82CDF7C -LilycoveCity_House4_MapAttributes:: @ 82CDF7C -MauvilleCity_House2_MapAttributes:: @ 82CDF7C -MossdeepCity_House2_MapAttributes:: @ 82CDF7C -OldaleTown_House1_MapAttributes:: @ 82CDF7C -PetalburgCity_House1_MapAttributes:: @ 82CDF7C -Route119_House_MapAttributes:: @ 82CDF7C -VerdanturfTown_House_MapAttributes:: @ 82CDF7C + .4byte gTileset_Building + .4byte gTileset_Lab + +House1_MapBorder:: @ 82CDEC0 + .incbin "data/maps/House1/border.bin" + +House1_MapBlockdata:: @ 82CDEC8 + .incbin "data/maps/House1/map.bin" + + .align 2 +House1_MapAttributes:: @ 82CDF7C .4byte 0xa .4byte 0x9 - .4byte OldaleTown_House1_MapBorder - .4byte OldaleTown_House1_MapBlockdata - .4byte OldaleTown_House1_Tileset - .4byte OldaleTown_House1_Tileset2 - -OldaleTown_House2_MapBorder:: @ 82CDF94 - .incbin "data/maps/OldaleTown_House2/border.bin" - -OldaleTown_House2_MapBlockdata:: @ 82CDF9C - .incbin "data/maps/OldaleTown_House2/map.bin" - -FallarborTown_House2_MapAttributes:: @ 82CE04C -LilycoveCity_House3_MapAttributes:: @ 82CE04C -LilycoveCity_MoveDeletersHouse_MapAttributes:: @ 82CE04C -MauvilleCity_House1_MapAttributes:: @ 82CE04C -MossdeepCity_House1_MapAttributes:: @ 82CE04C -MossdeepCity_House3_MapAttributes:: @ 82CE04C -OldaleTown_House2_MapAttributes:: @ 82CE04C -PetalburgCity_WallysHouse_MapAttributes:: @ 82CE04C -Route111_WinstrateFamilysHouse_MapAttributes:: @ 82CE04C -Route123_BerryMastersHouse_MapAttributes:: @ 82CE04C -SlateportCity_House2_MapAttributes:: @ 82CE04C -VerdanturfTown_FriendshipRatersHouse_MapAttributes:: @ 82CE04C + .4byte House1_MapBorder + .4byte House1_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding + +House2_MapBorder:: @ 82CDF94 + .incbin "data/maps/House2/border.bin" + +House2_MapBlockdata:: @ 82CDF9C + .incbin "data/maps/House2/map.bin" + + .align 2 +House2_MapAttributes:: @ 82CE04C .4byte 0xb .4byte 0x8 - .4byte OldaleTown_House2_MapBorder - .4byte OldaleTown_House2_MapBlockdata - .4byte OldaleTown_House2_Tileset - .4byte OldaleTown_House2_Tileset2 + .4byte House2_MapBorder + .4byte House2_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding -OldaleTown_PokemonCenter_1F_MapBorder:: @ 82CE064 +PokemonCenter_1F_MapBorder:: @ 82CE064 .incbin "data/maps/OldaleTown_PokemonCenter_1F/border.bin" -OldaleTown_PokemonCenter_1F_MapBlockdata:: @ 82CE06C +PokemonCenter_1F_MapBlockdata:: @ 82CE06C .incbin "data/maps/OldaleTown_PokemonCenter_1F/map.bin" -DewfordTown_PokemonCenter_1F_MapAttributes:: @ 82CE168 -EverGrandeCity_PokemonCenter_1F_MapAttributes:: @ 82CE168 -FallarborTown_PokemonCenter_1F_MapAttributes:: @ 82CE168 -FortreeCity_PokemonCenter_1F_MapAttributes:: @ 82CE168 -LilycoveCity_PokemonCenter_1F_MapAttributes:: @ 82CE168 -MauvilleCity_PokemonCenter_1F_MapAttributes:: @ 82CE168 -MossdeepCity_PokemonCenter_1F_MapAttributes:: @ 82CE168 -OldaleTown_PokemonCenter_1F_MapAttributes:: @ 82CE168 -PacifidlogTown_PokemonCenter_1F_MapAttributes:: @ 82CE168 -PetalburgCity_PokemonCenter_1F_MapAttributes:: @ 82CE168 -RustboroCity_PokemonCenter_1F_MapAttributes:: @ 82CE168 -SlateportCity_PokemonCenter_1F_MapAttributes:: @ 82CE168 -SootopolisCity_PokemonCenter_1F_MapAttributes:: @ 82CE168 -VerdanturfTown_PokemonCenter_1F_MapAttributes:: @ 82CE168 + .align 2 +PokemonCenter_1F_MapAttributes:: @ 82CE168 .4byte 0xe .4byte 0x9 - .4byte OldaleTown_PokemonCenter_1F_MapBorder - .4byte OldaleTown_PokemonCenter_1F_MapBlockdata - .4byte OldaleTown_PokemonCenter_1F_Tileset - .4byte OldaleTown_PokemonCenter_1F_Tileset2 + .4byte PokemonCenter_1F_MapBorder + .4byte PokemonCenter_1F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_PokemonCenter -OldaleTown_PokemonCenter_2F_MapBorder:: @ 82CE180 +PokemonCenter_2F_MapBorder:: @ 82CE180 .incbin "data/maps/OldaleTown_PokemonCenter_2F/border.bin" -OldaleTown_PokemonCenter_2F_MapBlockdata:: @ 82CE188 +PokemonCenter_2F_MapBlockdata:: @ 82CE188 .incbin "data/maps/OldaleTown_PokemonCenter_2F/map.bin" -DewfordTown_PokemonCenter_2F_MapAttributes:: @ 82CE284 -EverGrandeCity_PokemonCenter_2F_MapAttributes:: @ 82CE284 -FallarborTown_PokemonCenter_2F_MapAttributes:: @ 82CE284 -FortreeCity_PokemonCenter_2F_MapAttributes:: @ 82CE284 -LavaridgeTown_PokemonCenter_2F_MapAttributes:: @ 82CE284 -LilycoveCity_PokemonCenter_2F_MapAttributes:: @ 82CE284 -MauvilleCity_PokemonCenter_2F_MapAttributes:: @ 82CE284 -MossdeepCity_PokemonCenter_2F_MapAttributes:: @ 82CE284 -OldaleTown_PokemonCenter_2F_MapAttributes:: @ 82CE284 -PacifidlogTown_PokemonCenter_2F_MapAttributes:: @ 82CE284 -PetalburgCity_PokemonCenter_2F_MapAttributes:: @ 82CE284 -RustboroCity_PokemonCenter_2F_MapAttributes:: @ 82CE284 -SlateportCity_PokemonCenter_2F_MapAttributes:: @ 82CE284 -SootopolisCity_PokemonCenter_2F_MapAttributes:: @ 82CE284 -VerdanturfTown_PokemonCenter_2F_MapAttributes:: @ 82CE284 + .align 2 +PokemonCenter_2F_MapAttributes:: @ 82CE284 .4byte 0xe .4byte 0x9 - .4byte OldaleTown_PokemonCenter_2F_MapBorder - .4byte OldaleTown_PokemonCenter_2F_MapBlockdata - .4byte OldaleTown_PokemonCenter_2F_Tileset - .4byte OldaleTown_PokemonCenter_2F_Tileset2 + .4byte PokemonCenter_2F_MapBorder + .4byte PokemonCenter_2F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_PokemonCenter -OldaleTown_Mart_MapBorder:: @ 82CE29C +PokeMart_MapBorder:: @ 82CE29C .incbin "data/maps/OldaleTown_Mart/border.bin" -OldaleTown_Mart_MapBlockdata:: @ 82CE2A4 +PokeMart_MapBlockdata:: @ 82CE2A4 .incbin "data/maps/OldaleTown_Mart/map.bin" -FallarborTown_Mart_MapAttributes:: @ 82CE354 -FortreeCity_Mart_MapAttributes:: @ 82CE354 -LavaridgeTown_Mart_MapAttributes:: @ 82CE354 -LilycoveCity_UnusedMart_MapAttributes:: @ 82CE354 -MauvilleCity_Mart_MapAttributes:: @ 82CE354 -MossdeepCity_Mart_MapAttributes:: @ 82CE354 -OldaleTown_Mart_MapAttributes:: @ 82CE354 -PetalburgCity_Mart_MapAttributes:: @ 82CE354 -RustboroCity_Mart_MapAttributes:: @ 82CE354 -SlateportCity_Mart_MapAttributes:: @ 82CE354 -SootopolisCity_Mart_MapAttributes:: @ 82CE354 -VerdanturfTown_Mart_MapAttributes:: @ 82CE354 + .align 2 +PokeMart_MapAttributes:: @ 82CE354 .4byte 0xb .4byte 0x8 - .4byte OldaleTown_Mart_MapBorder - .4byte OldaleTown_Mart_MapBlockdata - .4byte OldaleTown_Mart_Tileset - .4byte OldaleTown_Mart_Tileset2 + .4byte PokeMart_MapBorder + .4byte PokeMart_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_Shop DewfordTown_House1_MapBorder:: @ 82CE36C .incbin "data/maps/DewfordTown_House1/border.bin" @@ -937,6 +949,7 @@ DewfordTown_House1_MapBorder:: @ 82CE36C DewfordTown_House1_MapBlockdata:: @ 82CE374 .incbin "data/maps/DewfordTown_House1/map.bin" + .align 2 DewfordTown_House1_MapAttributes:: @ 82CE414 LavaridgeTown_House_MapAttributes:: @ 82CE414 Route111_OldLadysRestStop_MapAttributes:: @ 82CE414 @@ -944,8 +957,8 @@ Route111_OldLadysRestStop_MapAttributes:: @ 82CE414 .4byte 0x8 .4byte DewfordTown_House1_MapBorder .4byte DewfordTown_House1_MapBlockdata - .4byte DewfordTown_House1_Tileset - .4byte DewfordTown_House1_Tileset2 + .4byte gTileset_Building + .4byte gTileset_GenericBuilding DewfordTown_Gym_MapBorder:: @ 82CE42C .incbin "data/maps/DewfordTown_Gym/border.bin" @@ -953,13 +966,14 @@ DewfordTown_Gym_MapBorder:: @ 82CE42C DewfordTown_Gym_MapBlockdata:: @ 82CE434 .incbin "data/maps/DewfordTown_Gym/map.bin" + .align 2 DewfordTown_Gym_MapAttributes:: @ 82CE824 .4byte 0x12 .4byte 0x1c .4byte DewfordTown_Gym_MapBorder .4byte DewfordTown_Gym_MapBlockdata - .4byte DewfordTown_Gym_Tileset - .4byte DewfordTown_Gym_Tileset2 + .4byte gTileset_Building + .4byte gTileset_DewfordGym DewfordTown_Hall_MapBorder:: @ 82CE83C .incbin "data/maps/DewfordTown_Hall/border.bin" @@ -967,15 +981,14 @@ DewfordTown_Hall_MapBorder:: @ 82CE83C DewfordTown_Hall_MapBlockdata:: @ 82CE844 .incbin "data/maps/DewfordTown_Hall/map.bin" - .incbin "baserom.gba", 0x2ce976, 0x2 - + .align 2 DewfordTown_Hall_MapAttributes:: @ 82CE978 .4byte 0x11 .4byte 0x9 .4byte DewfordTown_Hall_MapBorder .4byte DewfordTown_Hall_MapBlockdata - .4byte DewfordTown_Hall_Tileset - .4byte DewfordTown_Hall_Tileset2 + .4byte gTileset_Building + .4byte gTileset_GenericBuilding DewfordTown_House2_MapBorder:: @ 82CE990 .incbin "data/maps/DewfordTown_House2/border.bin" @@ -983,14 +996,15 @@ DewfordTown_House2_MapBorder:: @ 82CE990 DewfordTown_House2_MapBlockdata:: @ 82CE998 .incbin "data/maps/DewfordTown_House2/map.bin" + .align 2 DewfordTown_House2_MapAttributes:: @ 82CEA4C Route113_GlassWorkshop_MapAttributes:: @ 82CEA4C .4byte 0xa .4byte 0x9 .4byte DewfordTown_House2_MapBorder .4byte DewfordTown_House2_MapBlockdata - .4byte DewfordTown_House2_Tileset - .4byte DewfordTown_House2_Tileset2 + .4byte gTileset_Building + .4byte gTileset_GenericBuilding LavaridgeTown_HerbShop_MapBorder:: @ 82CEA64 .incbin "data/maps/LavaridgeTown_HerbShop/border.bin" @@ -998,13 +1012,14 @@ LavaridgeTown_HerbShop_MapBorder:: @ 82CEA64 LavaridgeTown_HerbShop_MapBlockdata:: @ 82CEA6C .incbin "data/maps/LavaridgeTown_HerbShop/map.bin" + .align 2 LavaridgeTown_HerbShop_MapAttributes:: @ 82CEB1C .4byte 0xb .4byte 0x8 .4byte LavaridgeTown_HerbShop_MapBorder .4byte LavaridgeTown_HerbShop_MapBlockdata - .4byte LavaridgeTown_HerbShop_Tileset - .4byte LavaridgeTown_HerbShop_Tileset2 + .4byte gTileset_Building + .4byte gTileset_Shop LavaridgeTown_Gym_1F_MapBorder:: @ 82CEB34 .incbin "data/maps/LavaridgeTown_Gym_1F/border.bin" @@ -1012,13 +1027,14 @@ LavaridgeTown_Gym_1F_MapBorder:: @ 82CEB34 LavaridgeTown_Gym_1F_MapBlockdata:: @ 82CEB3C .incbin "data/maps/LavaridgeTown_Gym_1F/map.bin" + .align 2 LavaridgeTown_Gym_1F_MapAttributes:: @ 82CED4C .4byte 0xb .4byte 0x18 .4byte LavaridgeTown_Gym_1F_MapBorder .4byte LavaridgeTown_Gym_1F_MapBlockdata - .4byte LavaridgeTown_Gym_1F_Tileset - .4byte LavaridgeTown_Gym_1F_Tileset2 + .4byte gTileset_Building + .4byte gTileset_LavaridgeGym LavaridgeTown_Gym_B1F_MapBorder:: @ 82CED64 .incbin "data/maps/LavaridgeTown_Gym_B1F/border.bin" @@ -1026,13 +1042,14 @@ LavaridgeTown_Gym_B1F_MapBorder:: @ 82CED64 LavaridgeTown_Gym_B1F_MapBlockdata:: @ 82CED6C .incbin "data/maps/LavaridgeTown_Gym_B1F/map.bin" + .align 2 LavaridgeTown_Gym_B1F_MapAttributes:: @ 82CEF7C .4byte 0xb .4byte 0x18 .4byte LavaridgeTown_Gym_B1F_MapBorder .4byte LavaridgeTown_Gym_B1F_MapBlockdata - .4byte LavaridgeTown_Gym_B1F_Tileset - .4byte LavaridgeTown_Gym_B1F_Tileset2 + .4byte gTileset_Building + .4byte gTileset_LavaridgeGym LavaridgeTown_PokemonCenter_1F_MapBorder:: @ 82CEF94 .incbin "data/maps/LavaridgeTown_PokemonCenter_1F/border.bin" @@ -1040,13 +1057,14 @@ LavaridgeTown_PokemonCenter_1F_MapBorder:: @ 82CEF94 LavaridgeTown_PokemonCenter_1F_MapBlockdata:: @ 82CEF9C .incbin "data/maps/LavaridgeTown_PokemonCenter_1F/map.bin" + .align 2 LavaridgeTown_PokemonCenter_1F_MapAttributes:: @ 82CF098 .4byte 0xe .4byte 0x9 .4byte LavaridgeTown_PokemonCenter_1F_MapBorder .4byte LavaridgeTown_PokemonCenter_1F_MapBlockdata - .4byte LavaridgeTown_PokemonCenter_1F_Tileset - .4byte LavaridgeTown_PokemonCenter_1F_Tileset2 + .4byte gTileset_Building + .4byte gTileset_PokemonCenter FallarborTown_ContestLobby_MapBorder:: @ 82CF0B0 .incbin "data/maps/FallarborTown_ContestLobby/border.bin" @@ -1054,8 +1072,7 @@ FallarborTown_ContestLobby_MapBorder:: @ 82CF0B0 FallarborTown_ContestLobby_MapBlockdata:: @ 82CF0B8 .incbin "data/maps/FallarborTown_ContestLobby/map.bin" - .incbin "baserom.gba", 0x2cf18a, 0x2 - + .align 2 FallarborTown_ContestLobby_MapAttributes:: @ 82CF18C SlateportCity_ContestLobby_MapAttributes:: @ 82CF18C VerdanturfTown_ContestLobby_MapAttributes:: @ 82CF18C @@ -1063,8 +1080,8 @@ VerdanturfTown_ContestLobby_MapAttributes:: @ 82CF18C .4byte 0x7 .4byte FallarborTown_ContestLobby_MapBorder .4byte FallarborTown_ContestLobby_MapBlockdata - .4byte FallarborTown_ContestLobby_Tileset - .4byte FallarborTown_ContestLobby_Tileset2 + .4byte gTileset_Building + .4byte gTileset_Contest FallarborTown_ContestHall_MapBorder:: @ 82CF1A4 .incbin "data/maps/FallarborTown_ContestHall/border.bin" @@ -1072,6 +1089,7 @@ FallarborTown_ContestHall_MapBorder:: @ 82CF1A4 FallarborTown_ContestHall_MapBlockdata:: @ 82CF1AC .incbin "data/maps/FallarborTown_ContestHall/map.bin" + .align 2 FallarborTown_ContestHall_MapAttributes:: @ 82CF4A0 SlateportCity_ContestHall_MapAttributes:: @ 82CF4A0 VerdanturfTown_ContestHall_MapAttributes:: @ 82CF4A0 @@ -1079,8 +1097,8 @@ VerdanturfTown_ContestHall_MapAttributes:: @ 82CF4A0 .4byte 0x12 .4byte FallarborTown_ContestHall_MapBorder .4byte FallarborTown_ContestHall_MapBlockdata - .4byte FallarborTown_ContestHall_Tileset - .4byte FallarborTown_ContestHall_Tileset2 + .4byte gTileset_Building + .4byte gTileset_Contest LilycoveCity_House2_MapBorder:: @ 82CF4B8 .incbin "data/maps/LilycoveCity_House2/border.bin" @@ -1088,13 +1106,14 @@ LilycoveCity_House2_MapBorder:: @ 82CF4B8 LilycoveCity_House2_MapBlockdata:: @ 82CF4C0 .incbin "data/maps/LilycoveCity_House2/map.bin" + .align 2 LilycoveCity_House2_MapAttributes:: @ 82CF540 .4byte 0x8 .4byte 0x8 .4byte LilycoveCity_House2_MapBorder .4byte LilycoveCity_House2_MapBlockdata - .4byte LilycoveCity_House2_Tileset - .4byte LilycoveCity_House2_Tileset2 + .4byte gTileset_Building + .4byte gTileset_GenericBuilding .incbin "baserom.gba", 0x2cf558, 0x24 @@ -1104,13 +1123,14 @@ VerdanturfTown_WandasHouse_MapBorder:: @ 82CF57C VerdanturfTown_WandasHouse_MapBlockdata:: @ 82CF584 .incbin "data/maps/VerdanturfTown_WandasHouse/map.bin" + .align 2 VerdanturfTown_WandasHouse_MapAttributes:: @ 82CF694 .4byte 0x11 .4byte 0x8 .4byte VerdanturfTown_WandasHouse_MapBorder .4byte VerdanturfTown_WandasHouse_MapBlockdata - .4byte VerdanturfTown_WandasHouse_Tileset - .4byte VerdanturfTown_WandasHouse_Tileset2 + .4byte gTileset_Building + .4byte gTileset_GenericBuilding PacifidlogTown_House1_MapBorder:: @ 82CF6AC .incbin "data/maps/PacifidlogTown_House1/border.bin" @@ -1118,6 +1138,7 @@ PacifidlogTown_House1_MapBorder:: @ 82CF6AC PacifidlogTown_House1_MapBlockdata:: @ 82CF6B4 .incbin "data/maps/PacifidlogTown_House1/map.bin" + .align 2 PacifidlogTown_House1_MapAttributes:: @ 82CF768 PacifidlogTown_House3_MapAttributes:: @ 82CF768 PacifidlogTown_House5_MapAttributes:: @ 82CF768 @@ -1125,8 +1146,8 @@ PacifidlogTown_House5_MapAttributes:: @ 82CF768 .4byte 0x9 .4byte PacifidlogTown_House1_MapBorder .4byte PacifidlogTown_House1_MapBlockdata - .4byte PacifidlogTown_House1_Tileset - .4byte PacifidlogTown_House1_Tileset2 + .4byte gTileset_Building + .4byte gTileset_GenericBuilding PacifidlogTown_House2_MapBorder:: @ 82CF780 .incbin "data/maps/PacifidlogTown_House2/border.bin" @@ -1134,14 +1155,15 @@ PacifidlogTown_House2_MapBorder:: @ 82CF780 PacifidlogTown_House2_MapBlockdata:: @ 82CF788 .incbin "data/maps/PacifidlogTown_House2/map.bin" + .align 2 PacifidlogTown_House2_MapAttributes:: @ 82CF83C PacifidlogTown_House4_MapAttributes:: @ 82CF83C .4byte 0xa .4byte 0x9 .4byte PacifidlogTown_House2_MapBorder .4byte PacifidlogTown_House2_MapBlockdata - .4byte PacifidlogTown_House2_Tileset - .4byte PacifidlogTown_House2_Tileset2 + .4byte gTileset_Building + .4byte gTileset_GenericBuilding PetalburgCity_Gym_MapBorder:: @ 82CF854 .incbin "data/maps/PetalburgCity_Gym/border.bin" @@ -1149,13 +1171,14 @@ PetalburgCity_Gym_MapBorder:: @ 82CF854 PetalburgCity_Gym_MapBlockdata:: @ 82CF85C .incbin "data/maps/PetalburgCity_Gym/map.bin" + .align 2 PetalburgCity_Gym_MapAttributes:: @ 82D003C .4byte 0x9 .4byte 0x70 .4byte PetalburgCity_Gym_MapBorder .4byte PetalburgCity_Gym_MapBlockdata - .4byte PetalburgCity_Gym_Tileset - .4byte PetalburgCity_Gym_Tileset2 + .4byte gTileset_Building + .4byte gTileset_PetalburgGym PetalburgCity_House2_MapBorder:: @ 82D0054 .incbin "data/maps/PetalburgCity_House2/border.bin" @@ -1163,6 +1186,7 @@ PetalburgCity_House2_MapBorder:: @ 82D0054 PetalburgCity_House2_MapBlockdata:: @ 82D005C .incbin "data/maps/PetalburgCity_House2/map.bin" + .align 2 MossdeepCity_House4_MapAttributes:: @ 82D00FC PetalburgCity_House2_MapAttributes:: @ 82D00FC SlateportCity_House1_MapAttributes:: @ 82D00FC @@ -1170,8 +1194,8 @@ SlateportCity_House1_MapAttributes:: @ 82D00FC .4byte 0x8 .4byte PetalburgCity_House2_MapBorder .4byte PetalburgCity_House2_MapBlockdata - .4byte PetalburgCity_House2_Tileset - .4byte PetalburgCity_House2_Tileset2 + .4byte gTileset_Building + .4byte gTileset_GenericBuilding SlateportCity_SternsShipyard_1F_MapBorder:: @ 82D0114 .incbin "data/maps/SlateportCity_SternsShipyard_1F/border.bin" @@ -1179,15 +1203,14 @@ SlateportCity_SternsShipyard_1F_MapBorder:: @ 82D0114 SlateportCity_SternsShipyard_1F_MapBlockdata:: @ 82D011C .incbin "data/maps/SlateportCity_SternsShipyard_1F/map.bin" - .incbin "baserom.gba", 0x2d0392, 0x2 - + .align 2 SlateportCity_SternsShipyard_1F_MapAttributes:: @ 82D0394 .4byte 0x15 .4byte 0xf .4byte SlateportCity_SternsShipyard_1F_MapBorder .4byte SlateportCity_SternsShipyard_1F_MapBlockdata - .4byte SlateportCity_SternsShipyard_1F_Tileset - .4byte SlateportCity_SternsShipyard_1F_Tileset2 + .4byte gTileset_General + .4byte gTileset_Facility SlateportCity_SternsShipyard_2F_MapBorder:: @ 82D03AC .incbin "data/maps/SlateportCity_SternsShipyard_2F/border.bin" @@ -1195,15 +1218,14 @@ SlateportCity_SternsShipyard_2F_MapBorder:: @ 82D03AC SlateportCity_SternsShipyard_2F_MapBlockdata:: @ 82D03B4 .incbin "data/maps/SlateportCity_SternsShipyard_2F/map.bin" - .incbin "baserom.gba", 0x2d05b2, 0x2 - + .align 2 SlateportCity_SternsShipyard_2F_MapAttributes:: @ 82D05B4 .4byte 0x11 .4byte 0xf .4byte SlateportCity_SternsShipyard_2F_MapBorder .4byte SlateportCity_SternsShipyard_2F_MapBlockdata - .4byte SlateportCity_SternsShipyard_2F_Tileset - .4byte SlateportCity_SternsShipyard_2F_Tileset2 + .4byte gTileset_General + .4byte gTileset_Facility .incbin "baserom.gba", 0x2d05cc, 0x48 @@ -1213,13 +1235,14 @@ SlateportCity_PokemonFanClub_MapBorder:: @ 82D0614 SlateportCity_PokemonFanClub_MapBlockdata:: @ 82D061C .incbin "data/maps/SlateportCity_PokemonFanClub/map.bin" + .align 2 SlateportCity_PokemonFanClub_MapAttributes:: @ 82D0750 .4byte 0xe .4byte 0xb .4byte SlateportCity_PokemonFanClub_MapBorder .4byte SlateportCity_PokemonFanClub_MapBlockdata - .4byte SlateportCity_PokemonFanClub_Tileset - .4byte SlateportCity_PokemonFanClub_Tileset2 + .4byte gTileset_Building + .4byte gTileset_PokemonFanClub SlateportCity_OceanicMuseum_1F_MapBorder:: @ 82D0768 .incbin "data/maps/SlateportCity_OceanicMuseum_1F/border.bin" @@ -1227,13 +1250,14 @@ SlateportCity_OceanicMuseum_1F_MapBorder:: @ 82D0768 SlateportCity_OceanicMuseum_1F_MapBlockdata:: @ 82D0770 .incbin "data/maps/SlateportCity_OceanicMuseum_1F/map.bin" + .align 2 SlateportCity_OceanicMuseum_1F_MapAttributes:: @ 82D08D8 .4byte 0x14 .4byte 0x9 .4byte SlateportCity_OceanicMuseum_1F_MapBorder .4byte SlateportCity_OceanicMuseum_1F_MapBlockdata - .4byte SlateportCity_OceanicMuseum_1F_Tileset - .4byte SlateportCity_OceanicMuseum_1F_Tileset2 + .4byte gTileset_Building + .4byte gTileset_OceanicMuseum SlateportCity_OceanicMuseum_2F_MapBorder:: @ 82D08F0 .incbin "data/maps/SlateportCity_OceanicMuseum_2F/border.bin" @@ -1241,13 +1265,14 @@ SlateportCity_OceanicMuseum_2F_MapBorder:: @ 82D08F0 SlateportCity_OceanicMuseum_2F_MapBlockdata:: @ 82D08F8 .incbin "data/maps/SlateportCity_OceanicMuseum_2F/map.bin" + .align 2 SlateportCity_OceanicMuseum_2F_MapAttributes:: @ 82D0A60 .4byte 0x14 .4byte 0x9 .4byte SlateportCity_OceanicMuseum_2F_MapBorder .4byte SlateportCity_OceanicMuseum_2F_MapBlockdata - .4byte SlateportCity_OceanicMuseum_2F_Tileset - .4byte SlateportCity_OceanicMuseum_2F_Tileset2 + .4byte gTileset_Building + .4byte gTileset_OceanicMuseum SlateportCity_Harbor_MapBorder:: @ 82D0A78 .incbin "data/maps/SlateportCity_Harbor/border.bin" @@ -1255,14 +1280,15 @@ SlateportCity_Harbor_MapBorder:: @ 82D0A78 SlateportCity_Harbor_MapBlockdata:: @ 82D0A80 .incbin "data/maps/SlateportCity_Harbor/map.bin" + .align 2 LilycoveCity_Harbor_MapAttributes:: @ 82D0D50 SlateportCity_Harbor_MapAttributes:: @ 82D0D50 .4byte 0x18 .4byte 0xf .4byte SlateportCity_Harbor_MapBorder .4byte SlateportCity_Harbor_MapBlockdata - .4byte SlateportCity_Harbor_Tileset - .4byte SlateportCity_Harbor_Tileset2 + .4byte gTileset_General + .4byte gTileset_Facility MauvilleCity_Gym_MapBorder:: @ 82D0D68 .incbin "data/maps/MauvilleCity_Gym/border.bin" @@ -1270,13 +1296,14 @@ MauvilleCity_Gym_MapBorder:: @ 82D0D68 MauvilleCity_Gym_MapBlockdata:: @ 82D0D70 .incbin "data/maps/MauvilleCity_Gym/map.bin" + .align 2 MauvilleCity_Gym_MapAttributes:: @ 82D0F14 .4byte 0xa .4byte 0x15 .4byte MauvilleCity_Gym_MapBorder .4byte MauvilleCity_Gym_MapBlockdata - .4byte MauvilleCity_Gym_Tileset - .4byte MauvilleCity_Gym_Tileset2 + .4byte gTileset_Building + .4byte gTileset_MauvilleGym MauvilleCity_BikeShop_MapBorder:: @ 82D0F2C .incbin "data/maps/MauvilleCity_BikeShop/border.bin" @@ -1284,13 +1311,14 @@ MauvilleCity_BikeShop_MapBorder:: @ 82D0F2C MauvilleCity_BikeShop_MapBlockdata:: @ 82D0F34 .incbin "data/maps/MauvilleCity_BikeShop/map.bin" + .align 2 MauvilleCity_BikeShop_MapAttributes:: @ 82D100C .4byte 0xc .4byte 0x9 .4byte MauvilleCity_BikeShop_MapBorder .4byte MauvilleCity_BikeShop_MapBlockdata - .4byte MauvilleCity_BikeShop_Tileset - .4byte MauvilleCity_BikeShop_Tileset2 + .4byte gTileset_General + .4byte gTileset_BikeShop MauvilleCity_GameCorner_MapBorder:: @ 82D1024 .incbin "data/maps/MauvilleCity_GameCorner/border.bin" @@ -1298,13 +1326,14 @@ MauvilleCity_GameCorner_MapBorder:: @ 82D1024 MauvilleCity_GameCorner_MapBlockdata:: @ 82D102C .incbin "data/maps/MauvilleCity_GameCorner/map.bin" + .align 2 MauvilleCity_GameCorner_MapAttributes:: @ 82D1210 .4byte 0x16 .4byte 0xb .4byte MauvilleCity_GameCorner_MapBorder .4byte MauvilleCity_GameCorner_MapBlockdata - .4byte MauvilleCity_GameCorner_Tileset - .4byte MauvilleCity_GameCorner_Tileset2 + .4byte gTileset_Building + .4byte gTileset_MauvilleGameCorner RustboroCity_DevonCorp_1F_MapBorder:: @ 82D1228 .incbin "data/maps/RustboroCity_DevonCorp_1F/border.bin" @@ -1312,15 +1341,14 @@ RustboroCity_DevonCorp_1F_MapBorder:: @ 82D1228 RustboroCity_DevonCorp_1F_MapBlockdata:: @ 82D1230 .incbin "data/maps/RustboroCity_DevonCorp_1F/map.bin" - .incbin "baserom.gba", 0x2d1386, 0x2 - + .align 2 RustboroCity_DevonCorp_1F_MapAttributes:: @ 82D1388 .4byte 0x13 .4byte 0x9 .4byte RustboroCity_DevonCorp_1F_MapBorder .4byte RustboroCity_DevonCorp_1F_MapBlockdata - .4byte RustboroCity_DevonCorp_1F_Tileset - .4byte RustboroCity_DevonCorp_1F_Tileset2 + .4byte gTileset_General + .4byte gTileset_Facility RustboroCity_DevonCorp_2F_MapBorder:: @ 82D13A0 .incbin "data/maps/RustboroCity_DevonCorp_2F/border.bin" @@ -1328,15 +1356,14 @@ RustboroCity_DevonCorp_2F_MapBorder:: @ 82D13A0 RustboroCity_DevonCorp_2F_MapBlockdata:: @ 82D13A8 .incbin "data/maps/RustboroCity_DevonCorp_2F/map.bin" - .incbin "baserom.gba", 0x2d14fe, 0x2 - + .align 2 RustboroCity_DevonCorp_2F_MapAttributes:: @ 82D1500 .4byte 0x13 .4byte 0x9 .4byte RustboroCity_DevonCorp_2F_MapBorder .4byte RustboroCity_DevonCorp_2F_MapBlockdata - .4byte RustboroCity_DevonCorp_2F_Tileset - .4byte RustboroCity_DevonCorp_2F_Tileset2 + .4byte gTileset_General + .4byte gTileset_Facility RustboroCity_Gym_MapBorder:: @ 82D1518 .incbin "data/maps/RustboroCity_Gym/border.bin" @@ -1344,15 +1371,14 @@ RustboroCity_Gym_MapBorder:: @ 82D1518 RustboroCity_Gym_MapBlockdata:: @ 82D1520 .incbin "data/maps/RustboroCity_Gym/map.bin" - .incbin "baserom.gba", 0x2d16c2, 0x2 - + .align 2 RustboroCity_Gym_MapAttributes:: @ 82D16C4 .4byte 0xb .4byte 0x13 .4byte RustboroCity_Gym_MapBorder .4byte RustboroCity_Gym_MapBlockdata - .4byte RustboroCity_Gym_Tileset - .4byte RustboroCity_Gym_Tileset2 + .4byte gTileset_Building + .4byte gTileset_RustboroGym RustboroCity_PokemonSchool_MapBorder:: @ 82D16DC .incbin "data/maps/RustboroCity_PokemonSchool/border.bin" @@ -1360,13 +1386,14 @@ RustboroCity_PokemonSchool_MapBorder:: @ 82D16DC RustboroCity_PokemonSchool_MapBlockdata:: @ 82D16E4 .incbin "data/maps/RustboroCity_PokemonSchool/map.bin" + .align 2 RustboroCity_PokemonSchool_MapAttributes:: @ 82D17EC .4byte 0xc .4byte 0xb .4byte RustboroCity_PokemonSchool_MapBorder .4byte RustboroCity_PokemonSchool_MapBlockdata - .4byte RustboroCity_PokemonSchool_Tileset - .4byte RustboroCity_PokemonSchool_Tileset2 + .4byte gTileset_Building + .4byte gTileset_PokemonSchool RustboroCity_House2_MapBorder:: @ 82D1804 .incbin "data/maps/RustboroCity_House2/border.bin" @@ -1374,14 +1401,15 @@ RustboroCity_House2_MapBorder:: @ 82D1804 RustboroCity_House2_MapBlockdata:: @ 82D180C .incbin "data/maps/RustboroCity_House2/map.bin" + .align 2 RustboroCity_House2_MapAttributes:: @ 82D18E4 RustboroCity_House3_MapAttributes:: @ 82D18E4 .4byte 0xc .4byte 0x9 .4byte RustboroCity_House2_MapBorder .4byte RustboroCity_House2_MapBlockdata - .4byte RustboroCity_House2_Tileset - .4byte RustboroCity_House2_Tileset2 + .4byte gTileset_Building + .4byte gTileset_GenericBuilding RustboroCity_House1_MapBorder:: @ 82D18FC .incbin "data/maps/RustboroCity_House1/border.bin" @@ -1389,13 +1417,14 @@ RustboroCity_House1_MapBorder:: @ 82D18FC RustboroCity_House1_MapBlockdata:: @ 82D1904 .incbin "data/maps/RustboroCity_House1/map.bin" + .align 2 RustboroCity_House1_MapAttributes:: @ 82D19D4 .4byte 0xd .4byte 0x8 .4byte RustboroCity_House1_MapBorder .4byte RustboroCity_House1_MapBlockdata - .4byte RustboroCity_House1_Tileset - .4byte RustboroCity_House1_Tileset2 + .4byte gTileset_Building + .4byte gTileset_GenericBuilding RustboroCity_CuttersHouse_MapBorder:: @ 82D19EC .incbin "data/maps/RustboroCity_CuttersHouse/border.bin" @@ -1403,15 +1432,14 @@ RustboroCity_CuttersHouse_MapBorder:: @ 82D19EC RustboroCity_CuttersHouse_MapBlockdata:: @ 82D19F4 .incbin "data/maps/RustboroCity_CuttersHouse/map.bin" - .incbin "baserom.gba", 0x2d1aba, 0x2 - + .align 2 RustboroCity_CuttersHouse_MapAttributes:: @ 82D1ABC .4byte 0xb .4byte 0x9 .4byte RustboroCity_CuttersHouse_MapBorder .4byte RustboroCity_CuttersHouse_MapBlockdata - .4byte RustboroCity_CuttersHouse_Tileset - .4byte RustboroCity_CuttersHouse_Tileset2 + .4byte gTileset_Building + .4byte gTileset_GenericBuilding FortreeCity_House1_MapBorder:: @ 82D1AD4 .incbin "data/maps/FortreeCity_House1/border.bin" @@ -1419,6 +1447,7 @@ FortreeCity_House1_MapBorder:: @ 82D1AD4 FortreeCity_House1_MapBlockdata:: @ 82D1ADC .incbin "data/maps/FortreeCity_House1/map.bin" + .align 2 FortreeCity_House1_MapAttributes:: @ 82D1B3C FortreeCity_House3_MapAttributes:: @ 82D1B3C FortreeCity_House5_MapAttributes:: @ 82D1B3C @@ -1426,8 +1455,8 @@ FortreeCity_House5_MapAttributes:: @ 82D1B3C .4byte 0x6 .4byte FortreeCity_House1_MapBorder .4byte FortreeCity_House1_MapBlockdata - .4byte FortreeCity_House1_Tileset - .4byte FortreeCity_House1_Tileset2 + .4byte gTileset_Building + .4byte gTileset_GenericBuilding FortreeCity_Gym_MapBorder:: @ 82D1B54 .incbin "data/maps/FortreeCity_Gym/border.bin" @@ -1435,13 +1464,14 @@ FortreeCity_Gym_MapBorder:: @ 82D1B54 FortreeCity_Gym_MapBlockdata:: @ 82D1B5C .incbin "data/maps/FortreeCity_Gym/map.bin" + .align 2 FortreeCity_Gym_MapAttributes:: @ 82D1F44 .4byte 0x14 .4byte 0x19 .4byte FortreeCity_Gym_MapBorder .4byte FortreeCity_Gym_MapBlockdata - .4byte FortreeCity_Gym_Tileset - .4byte FortreeCity_Gym_Tileset2 + .4byte gTileset_Building + .4byte gTileset_FortreeGym FortreeCity_House2_MapBorder:: @ 82D1F5C .incbin "data/maps/FortreeCity_House2/border.bin" @@ -1449,14 +1479,15 @@ FortreeCity_House2_MapBorder:: @ 82D1F5C FortreeCity_House2_MapBlockdata:: @ 82D1F64 .incbin "data/maps/FortreeCity_House2/map.bin" + .align 2 FortreeCity_House2_MapAttributes:: @ 82D1FC4 FortreeCity_House4_MapAttributes:: @ 82D1FC4 .4byte 0x8 .4byte 0x6 .4byte FortreeCity_House2_MapBorder .4byte FortreeCity_House2_MapBlockdata - .4byte FortreeCity_House2_Tileset - .4byte FortreeCity_House2_Tileset2 + .4byte gTileset_Building + .4byte gTileset_GenericBuilding Route104_MrBrineysHouse_MapBorder:: @ 82D1FDC .incbin "data/maps/Route104_MrBrineysHouse/border.bin" @@ -1464,13 +1495,14 @@ Route104_MrBrineysHouse_MapBorder:: @ 82D1FDC Route104_MrBrineysHouse_MapBlockdata:: @ 82D1FE4 .incbin "data/maps/Route104_MrBrineysHouse/map.bin" + .align 2 Route104_MrBrineysHouse_MapAttributes:: @ 82D20BC .4byte 0xc .4byte 0x9 .4byte Route104_MrBrineysHouse_MapBorder .4byte Route104_MrBrineysHouse_MapBlockdata - .4byte Route104_MrBrineysHouse_Tileset - .4byte Route104_MrBrineysHouse_Tileset2 + .4byte gTileset_Building + .4byte gTileset_GenericBuilding LilycoveCity_LilycoveMuseum_1F_MapBorder:: @ 82D20D4 .incbin "data/maps/LilycoveCity_LilycoveMuseum_1F/border.bin" @@ -1478,13 +1510,14 @@ LilycoveCity_LilycoveMuseum_1F_MapBorder:: @ 82D20D4 LilycoveCity_LilycoveMuseum_1F_MapBlockdata:: @ 82D20DC .incbin "data/maps/LilycoveCity_LilycoveMuseum_1F/map.bin" + .align 2 LilycoveCity_LilycoveMuseum_1F_MapAttributes:: @ 82D2328 .4byte 0x15 .4byte 0xe .4byte LilycoveCity_LilycoveMuseum_1F_MapBorder .4byte LilycoveCity_LilycoveMuseum_1F_MapBlockdata - .4byte LilycoveCity_LilycoveMuseum_1F_Tileset - .4byte LilycoveCity_LilycoveMuseum_1F_Tileset2 + .4byte gTileset_Building + .4byte gTileset_LilycoveMuseum LilycoveCity_LilycoveMuseum_2F_MapBorder:: @ 82D2340 .incbin "data/maps/LilycoveCity_LilycoveMuseum_2F/border.bin" @@ -1492,13 +1525,14 @@ LilycoveCity_LilycoveMuseum_2F_MapBorder:: @ 82D2340 LilycoveCity_LilycoveMuseum_2F_MapBlockdata:: @ 82D2348 .incbin "data/maps/LilycoveCity_LilycoveMuseum_2F/map.bin" + .align 2 LilycoveCity_LilycoveMuseum_2F_MapAttributes:: @ 82D2584 .4byte 0x16 .4byte 0xd .4byte LilycoveCity_LilycoveMuseum_2F_MapBorder .4byte LilycoveCity_LilycoveMuseum_2F_MapBlockdata - .4byte LilycoveCity_LilycoveMuseum_2F_Tileset - .4byte LilycoveCity_LilycoveMuseum_2F_Tileset2 + .4byte gTileset_Building + .4byte gTileset_LilycoveMuseum LilycoveCity_ContestLobby_MapBorder:: @ 82D259C .incbin "data/maps/LilycoveCity_ContestLobby/border.bin" @@ -1506,13 +1540,14 @@ LilycoveCity_ContestLobby_MapBorder:: @ 82D259C LilycoveCity_ContestLobby_MapBlockdata:: @ 82D25A4 .incbin "data/maps/LilycoveCity_ContestLobby/map.bin" + .align 2 LilycoveCity_ContestLobby_MapAttributes:: @ 82D27CC .4byte 0x17 .4byte 0xc .4byte LilycoveCity_ContestLobby_MapBorder .4byte LilycoveCity_ContestLobby_MapBlockdata - .4byte LilycoveCity_ContestLobby_Tileset - .4byte LilycoveCity_ContestLobby_Tileset2 + .4byte gTileset_Building + .4byte gTileset_Contest LilycoveCity_ContestHall_MapBorder:: @ 82D27E4 .incbin "data/maps/LilycoveCity_ContestHall/border.bin" @@ -1520,15 +1555,14 @@ LilycoveCity_ContestHall_MapBorder:: @ 82D27E4 LilycoveCity_ContestHall_MapBlockdata:: @ 82D27EC .incbin "data/maps/LilycoveCity_ContestHall/map.bin" - .incbin "baserom.gba", 0x2d3512, 0x2 - + .align 2 LilycoveCity_ContestHall_MapAttributes:: @ 82D3514 .4byte 0x33 .4byte 0x21 .4byte LilycoveCity_ContestHall_MapBorder .4byte LilycoveCity_ContestHall_MapBlockdata - .4byte LilycoveCity_ContestHall_Tileset - .4byte LilycoveCity_ContestHall_Tileset2 + .4byte gTileset_Building + .4byte gTileset_Contest LilycoveCity_PokemonTrainerFanClub_MapBorder:: @ 82D352C .incbin "data/maps/LilycoveCity_PokemonTrainerFanClub/border.bin" @@ -1536,13 +1570,14 @@ LilycoveCity_PokemonTrainerFanClub_MapBorder:: @ 82D352C LilycoveCity_PokemonTrainerFanClub_MapBlockdata:: @ 82D3534 .incbin "data/maps/LilycoveCity_PokemonTrainerFanClub/map.bin" + .align 2 LilycoveCity_PokemonTrainerFanClub_MapAttributes:: @ 82D3684 .4byte 0xc .4byte 0xe .4byte LilycoveCity_PokemonTrainerFanClub_MapBorder .4byte LilycoveCity_PokemonTrainerFanClub_MapBlockdata - .4byte LilycoveCity_PokemonTrainerFanClub_Tileset - .4byte LilycoveCity_PokemonTrainerFanClub_Tileset2 + .4byte gTileset_Building + .4byte gTileset_GenericBuilding LilycoveCity_EmptyMap_MapBorder:: @ 82D369C .incbin "data/maps/LilycoveCity_EmptyMap/border.bin" @@ -1550,15 +1585,14 @@ LilycoveCity_EmptyMap_MapBorder:: @ 82D369C LilycoveCity_EmptyMap_MapBlockdata:: @ 82D36A4 .incbin "data/maps/LilycoveCity_EmptyMap/map.bin" - .incbin "baserom.gba", 0x2d36a6, 0x2 - + .align 2 LilycoveCity_EmptyMap_MapAttributes:: @ 82D36A8 .4byte 0x1 .4byte 0x1 .4byte LilycoveCity_EmptyMap_MapBorder .4byte LilycoveCity_EmptyMap_MapBlockdata - .4byte LilycoveCity_EmptyMap_Tileset - .4byte LilycoveCity_EmptyMap_Tileset2 + .4byte gTileset_General + .4byte gTileset_Facility MossdeepCity_Gym_MapBorder:: @ 82D36C0 .incbin "data/maps/MossdeepCity_Gym/border.bin" @@ -1566,13 +1600,14 @@ MossdeepCity_Gym_MapBorder:: @ 82D36C0 MossdeepCity_Gym_MapBlockdata:: @ 82D36C8 .incbin "data/maps/MossdeepCity_Gym/map.bin" + .align 2 MossdeepCity_Gym_MapAttributes:: @ 82D3B78 .4byte 0x14 .4byte 0x1e .4byte MossdeepCity_Gym_MapBorder .4byte MossdeepCity_Gym_MapBlockdata - .4byte MossdeepCity_Gym_Tileset - .4byte MossdeepCity_Gym_Tileset2 + .4byte gTileset_Building + .4byte gTileset_MossdeepGym SootopolisCity_Gym_1F_MapBorder:: @ 82D3B90 .incbin "data/maps/SootopolisCity_Gym_1F/border.bin" @@ -1580,13 +1615,14 @@ SootopolisCity_Gym_1F_MapBorder:: @ 82D3B90 SootopolisCity_Gym_1F_MapBlockdata:: @ 82D3B98 .incbin "data/maps/SootopolisCity_Gym_1F/map.bin" + .align 2 SootopolisCity_Gym_1F_MapAttributes:: @ 82D3F0C .4byte 0x11 .4byte 0x1a .4byte SootopolisCity_Gym_1F_MapBorder .4byte SootopolisCity_Gym_1F_MapBlockdata - .4byte SootopolisCity_Gym_1F_Tileset - .4byte SootopolisCity_Gym_1F_Tileset2 + .4byte gTileset_Building + .4byte gTileset_SootopolisGym SootopolisCity_Gym_B1F_MapBorder:: @ 82D3F24 .incbin "data/maps/SootopolisCity_Gym_B1F/border.bin" @@ -1594,13 +1630,14 @@ SootopolisCity_Gym_B1F_MapBorder:: @ 82D3F24 SootopolisCity_Gym_B1F_MapBlockdata:: @ 82D3F2C .incbin "data/maps/SootopolisCity_Gym_B1F/map.bin" + .align 2 SootopolisCity_Gym_B1F_MapAttributes:: @ 82D42A0 .4byte 0x11 .4byte 0x1a .4byte SootopolisCity_Gym_B1F_MapBorder .4byte SootopolisCity_Gym_B1F_MapBlockdata - .4byte SootopolisCity_Gym_B1F_Tileset - .4byte SootopolisCity_Gym_B1F_Tileset2 + .4byte gTileset_Building + .4byte gTileset_SootopolisGym EverGrandeCity_SidneysRoom_MapBorder:: @ 82D42B8 .incbin "data/maps/EverGrandeCity_SidneysRoom/border.bin" @@ -1608,13 +1645,14 @@ EverGrandeCity_SidneysRoom_MapBorder:: @ 82D42B8 EverGrandeCity_SidneysRoom_MapBlockdata:: @ 82D42C0 .incbin "data/maps/EverGrandeCity_SidneysRoom/map.bin" + .align 2 EverGrandeCity_SidneysRoom_MapAttributes:: @ 82D442C .4byte 0xd .4byte 0xe .4byte EverGrandeCity_SidneysRoom_MapBorder .4byte EverGrandeCity_SidneysRoom_MapBlockdata - .4byte EverGrandeCity_SidneysRoom_Tileset - .4byte EverGrandeCity_SidneysRoom_Tileset2 + .4byte gTileset_Building + .4byte gTileset_EliteFour EverGrandeCity_PhoebesRoom_MapBorder:: @ 82D4444 .incbin "data/maps/EverGrandeCity_PhoebesRoom/border.bin" @@ -1622,13 +1660,14 @@ EverGrandeCity_PhoebesRoom_MapBorder:: @ 82D4444 EverGrandeCity_PhoebesRoom_MapBlockdata:: @ 82D444C .incbin "data/maps/EverGrandeCity_PhoebesRoom/map.bin" + .align 2 EverGrandeCity_PhoebesRoom_MapAttributes:: @ 82D45B8 .4byte 0xd .4byte 0xe .4byte EverGrandeCity_PhoebesRoom_MapBorder .4byte EverGrandeCity_PhoebesRoom_MapBlockdata - .4byte EverGrandeCity_PhoebesRoom_Tileset - .4byte EverGrandeCity_PhoebesRoom_Tileset2 + .4byte gTileset_Building + .4byte gTileset_EliteFour EverGrandeCity_GlaciasRoom_MapBorder:: @ 82D45D0 .incbin "data/maps/EverGrandeCity_GlaciasRoom/border.bin" @@ -1636,13 +1675,14 @@ EverGrandeCity_GlaciasRoom_MapBorder:: @ 82D45D0 EverGrandeCity_GlaciasRoom_MapBlockdata:: @ 82D45D8 .incbin "data/maps/EverGrandeCity_GlaciasRoom/map.bin" + .align 2 EverGrandeCity_GlaciasRoom_MapAttributes:: @ 82D4744 .4byte 0xd .4byte 0xe .4byte EverGrandeCity_GlaciasRoom_MapBorder .4byte EverGrandeCity_GlaciasRoom_MapBlockdata - .4byte EverGrandeCity_GlaciasRoom_Tileset - .4byte EverGrandeCity_GlaciasRoom_Tileset2 + .4byte gTileset_Building + .4byte gTileset_EliteFour EverGrandeCity_DrakesRoom_MapBorder:: @ 82D475C .incbin "data/maps/EverGrandeCity_DrakesRoom/border.bin" @@ -1650,13 +1690,14 @@ EverGrandeCity_DrakesRoom_MapBorder:: @ 82D475C EverGrandeCity_DrakesRoom_MapBlockdata:: @ 82D4764 .incbin "data/maps/EverGrandeCity_DrakesRoom/map.bin" + .align 2 EverGrandeCity_DrakesRoom_MapAttributes:: @ 82D48D0 .4byte 0xd .4byte 0xe .4byte EverGrandeCity_DrakesRoom_MapBorder .4byte EverGrandeCity_DrakesRoom_MapBlockdata - .4byte EverGrandeCity_DrakesRoom_Tileset - .4byte EverGrandeCity_DrakesRoom_Tileset2 + .4byte gTileset_Building + .4byte gTileset_EliteFour EverGrandeCity_ChampionsRoom_MapBorder:: @ 82D48E8 .incbin "data/maps/EverGrandeCity_ChampionsRoom/border.bin" @@ -1664,15 +1705,14 @@ EverGrandeCity_ChampionsRoom_MapBorder:: @ 82D48E8 EverGrandeCity_ChampionsRoom_MapBlockdata:: @ 82D48F0 .incbin "data/maps/EverGrandeCity_ChampionsRoom/map.bin" - .incbin "baserom.gba", 0x2d4a42, 0x2 - + .align 2 EverGrandeCity_ChampionsRoom_MapAttributes:: @ 82D4A44 .4byte 0xd .4byte 0xd .4byte EverGrandeCity_ChampionsRoom_MapBorder .4byte EverGrandeCity_ChampionsRoom_MapBlockdata - .4byte EverGrandeCity_ChampionsRoom_Tileset - .4byte EverGrandeCity_ChampionsRoom_Tileset2 + .4byte gTileset_Building + .4byte gTileset_EliteFour EverGrandeCity_Corridor1_MapBorder:: @ 82D4A5C .incbin "data/maps/EverGrandeCity_Corridor1/border.bin" @@ -1680,8 +1720,7 @@ EverGrandeCity_Corridor1_MapBorder:: @ 82D4A5C EverGrandeCity_Corridor1_MapBlockdata:: @ 82D4A64 .incbin "data/maps/EverGrandeCity_Corridor1/map.bin" - .incbin "baserom.gba", 0x2d4b82, 0x2 - + .align 2 EverGrandeCity_Corridor1_MapAttributes:: @ 82D4B84 EverGrandeCity_Corridor2_MapAttributes:: @ 82D4B84 EverGrandeCity_Corridor3_MapAttributes:: @ 82D4B84 @@ -1690,8 +1729,8 @@ EverGrandeCity_Corridor5_MapAttributes:: @ 82D4B84 .4byte 0xd .4byte EverGrandeCity_Corridor1_MapBorder .4byte EverGrandeCity_Corridor1_MapBlockdata - .4byte EverGrandeCity_Corridor1_Tileset - .4byte EverGrandeCity_Corridor1_Tileset2 + .4byte gTileset_Building + .4byte gTileset_EliteFour Route104_PrettyPetalFlowerShop_MapBorder:: @ 82D4B9C .incbin "data/maps/Route104_PrettyPetalFlowerShop/border.bin" @@ -1699,16 +1738,15 @@ Route104_PrettyPetalFlowerShop_MapBorder:: @ 82D4B9C Route104_PrettyPetalFlowerShop_MapBlockdata:: @ 82D4BA4 .incbin "data/maps/Route104_PrettyPetalFlowerShop/map.bin" - .incbin "baserom.gba", 0x2d4cb2, 0x2 - + .align 2 Route104_PrettyPetalFlowerShop_MapAttributes:: @ 82D4CB4 Route104_PrototypePrettyPetalFlowerShop_MapAttributes:: @ 82D4CB4 .4byte 0xf .4byte 0x9 .4byte Route104_PrettyPetalFlowerShop_MapBorder .4byte Route104_PrettyPetalFlowerShop_MapBlockdata - .4byte Route104_PrettyPetalFlowerShop_Tileset - .4byte Route104_PrettyPetalFlowerShop_Tileset2 + .4byte gTileset_Building + .4byte gTileset_PrettyPetalFlowerShop Route112_CableCarStation_MapBorder:: @ 82D4CCC .incbin "data/maps/Route112_CableCarStation/border.bin" @@ -1716,14 +1754,15 @@ Route112_CableCarStation_MapBorder:: @ 82D4CCC Route112_CableCarStation_MapBlockdata:: @ 82D4CD4 .incbin "data/maps/Route112_CableCarStation/map.bin" + .align 2 MtChimney_CableCarStation_MapAttributes:: @ 82D4E0C Route112_CableCarStation_MapAttributes:: @ 82D4E0C .4byte 0xd .4byte 0xc .4byte Route112_CableCarStation_MapBorder .4byte Route112_CableCarStation_MapBlockdata - .4byte Route112_CableCarStation_Tileset - .4byte Route112_CableCarStation_Tileset2 + .4byte gTileset_General + .4byte gTileset_Facility Route114_FossilManiacsHouse_MapBorder:: @ 82D4E24 .incbin "data/maps/Route114_FossilManiacsHouse/border.bin" @@ -1731,13 +1770,14 @@ Route114_FossilManiacsHouse_MapBorder:: @ 82D4E24 Route114_FossilManiacsHouse_MapBlockdata:: @ 82D4E2C .incbin "data/maps/Route114_FossilManiacsHouse/map.bin" + .align 2 Route114_FossilManiacsHouse_MapAttributes:: @ 82D4ECC .4byte 0xa .4byte 0x8 .4byte Route114_FossilManiacsHouse_MapBorder .4byte Route114_FossilManiacsHouse_MapBlockdata - .4byte Route114_FossilManiacsHouse_Tileset - .4byte Route114_FossilManiacsHouse_Tileset2 + .4byte gTileset_Building + .4byte gTileset_GenericBuilding Route114_FossilManiacsTunnel_MapBorder:: @ 82D4EE4 .incbin "data/maps/Route114_FossilManiacsTunnel/border.bin" @@ -1745,13 +1785,14 @@ Route114_FossilManiacsTunnel_MapBorder:: @ 82D4EE4 Route114_FossilManiacsTunnel_MapBlockdata:: @ 82D4EEC .incbin "data/maps/Route114_FossilManiacsTunnel/map.bin" + .align 2 Route114_FossilManiacsTunnel_MapAttributes:: @ 82D5190 .4byte 0xd .4byte 0x1a .4byte Route114_FossilManiacsTunnel_MapBorder .4byte Route114_FossilManiacsTunnel_MapBlockdata - .4byte Route114_FossilManiacsTunnel_Tileset - .4byte Route114_FossilManiacsTunnel_Tileset2 + .4byte gTileset_General + .4byte gTileset_Fallarbor Route114_LanettesHouse_MapBorder:: @ 82D51A8 .incbin "data/maps/Route114_LanettesHouse/border.bin" @@ -1759,13 +1800,14 @@ Route114_LanettesHouse_MapBorder:: @ 82D51A8 Route114_LanettesHouse_MapBlockdata:: @ 82D51B0 .incbin "data/maps/Route114_LanettesHouse/map.bin" + .align 2 Route114_LanettesHouse_MapAttributes:: @ 82D5260 .4byte 0xb .4byte 0x8 .4byte Route114_LanettesHouse_MapBorder .4byte Route114_LanettesHouse_MapBlockdata - .4byte Route114_LanettesHouse_Tileset - .4byte Route114_LanettesHouse_Tileset2 + .4byte gTileset_Building + .4byte gTileset_Lab Route116_TunnelersRestHouse_MapBorder:: @ 82D5278 .incbin "data/maps/Route116_TunnelersRestHouse/border.bin" @@ -1773,13 +1815,14 @@ Route116_TunnelersRestHouse_MapBorder:: @ 82D5278 Route116_TunnelersRestHouse_MapBlockdata:: @ 82D5280 .incbin "data/maps/Route116_TunnelersRestHouse/map.bin" + .align 2 Route116_TunnelersRestHouse_MapAttributes:: @ 82D5334 .4byte 0xa .4byte 0x9 .4byte Route116_TunnelersRestHouse_MapBorder .4byte Route116_TunnelersRestHouse_MapBlockdata - .4byte Route116_TunnelersRestHouse_Tileset - .4byte Route116_TunnelersRestHouse_Tileset2 + .4byte gTileset_Building + .4byte gTileset_GenericBuilding Route117_PokemonDayCare_MapBorder:: @ 82D534C .incbin "data/maps/Route117_PokemonDayCare/border.bin" @@ -1787,13 +1830,14 @@ Route117_PokemonDayCare_MapBorder:: @ 82D534C Route117_PokemonDayCare_MapBlockdata:: @ 82D5354 .incbin "data/maps/Route117_PokemonDayCare/map.bin" + .align 2 Route117_PokemonDayCare_MapAttributes:: @ 82D542C .4byte 0xc .4byte 0x9 .4byte Route117_PokemonDayCare_MapBorder .4byte Route117_PokemonDayCare_MapBlockdata - .4byte Route117_PokemonDayCare_Tileset - .4byte Route117_PokemonDayCare_Tileset2 + .4byte gTileset_Building + .4byte gTileset_PokemonDayCare Route121_SafariZoneEntrance_MapBorder:: @ 82D5444 .incbin "data/maps/Route121_SafariZoneEntrance/border.bin" @@ -1801,13 +1845,14 @@ Route121_SafariZoneEntrance_MapBorder:: @ 82D5444 Route121_SafariZoneEntrance_MapBlockdata:: @ 82D544C .incbin "data/maps/Route121_SafariZoneEntrance/map.bin" + .align 2 Route121_SafariZoneEntrance_MapAttributes:: @ 82D5644 .4byte 0x12 .4byte 0xe .4byte Route121_SafariZoneEntrance_MapBorder .4byte Route121_SafariZoneEntrance_MapBlockdata - .4byte Route121_SafariZoneEntrance_Tileset - .4byte Route121_SafariZoneEntrance_Tileset2 + .4byte gTileset_Building + .4byte gTileset_Shop MeteorFalls_1F_1R_MapBorder:: @ 82D565C .incbin "data/maps/MeteorFalls_1F_1R/border.bin" @@ -1815,13 +1860,14 @@ MeteorFalls_1F_1R_MapBorder:: @ 82D565C MeteorFalls_1F_1R_MapBlockdata:: @ 82D5664 .incbin "data/maps/MeteorFalls_1F_1R/map.bin" + .align 2 MeteorFalls_1F_1R_MapAttributes:: @ 82D603C .4byte 0x1e .4byte 0x2a .4byte MeteorFalls_1F_1R_MapBorder .4byte MeteorFalls_1F_1R_MapBlockdata - .4byte MeteorFalls_1F_1R_Tileset - .4byte MeteorFalls_1F_1R_Tileset2 + .4byte gTileset_General + .4byte gTileset_MeteorFalls MeteorFalls_1F_2R_MapBorder:: @ 82D6054 .incbin "data/maps/MeteorFalls_1F_2R/border.bin" @@ -1829,13 +1875,14 @@ MeteorFalls_1F_2R_MapBorder:: @ 82D6054 MeteorFalls_1F_2R_MapBlockdata:: @ 82D605C .incbin "data/maps/MeteorFalls_1F_2R/map.bin" + .align 2 MeteorFalls_1F_2R_MapAttributes:: @ 82D67DC .4byte 0x1e .4byte 0x20 .4byte MeteorFalls_1F_2R_MapBorder .4byte MeteorFalls_1F_2R_MapBlockdata - .4byte MeteorFalls_1F_2R_Tileset - .4byte MeteorFalls_1F_2R_Tileset2 + .4byte gTileset_General + .4byte gTileset_MeteorFalls MeteorFalls_B1F_1R_MapBorder:: @ 82D67F4 .incbin "data/maps/MeteorFalls_B1F_1R/border.bin" @@ -1843,13 +1890,14 @@ MeteorFalls_B1F_1R_MapBorder:: @ 82D67F4 MeteorFalls_B1F_1R_MapBlockdata:: @ 82D67FC .incbin "data/maps/MeteorFalls_B1F_1R/map.bin" + .align 2 MeteorFalls_B1F_1R_MapAttributes:: @ 82D7098 .4byte 0x1d .4byte 0x26 .4byte MeteorFalls_B1F_1R_MapBorder .4byte MeteorFalls_B1F_1R_MapBlockdata - .4byte MeteorFalls_B1F_1R_Tileset - .4byte MeteorFalls_B1F_1R_Tileset2 + .4byte gTileset_General + .4byte gTileset_MeteorFalls MeteorFalls_B1F_2R_MapBorder:: @ 82D70B0 .incbin "data/maps/MeteorFalls_B1F_2R/border.bin" @@ -1857,13 +1905,14 @@ MeteorFalls_B1F_2R_MapBorder:: @ 82D70B0 MeteorFalls_B1F_2R_MapBlockdata:: @ 82D70B8 .incbin "data/maps/MeteorFalls_B1F_2R/map.bin" + .align 2 MeteorFalls_B1F_2R_MapAttributes:: @ 82D7244 .4byte 0xb .4byte 0x12 .4byte MeteorFalls_B1F_2R_MapBorder .4byte MeteorFalls_B1F_2R_MapBlockdata - .4byte MeteorFalls_B1F_2R_Tileset - .4byte MeteorFalls_B1F_2R_Tileset2 + .4byte gTileset_General + .4byte gTileset_MeteorFalls RusturfTunnel_MapBorder:: @ 82D725C .incbin "data/maps/RusturfTunnel/border.bin" @@ -1871,13 +1920,14 @@ RusturfTunnel_MapBorder:: @ 82D725C RusturfTunnel_MapBlockdata:: @ 82D7264 .incbin "data/maps/RusturfTunnel/map.bin" + .align 2 RusturfTunnel_MapAttributes:: @ 82D7924 .4byte 0x24 .4byte 0x18 .4byte RusturfTunnel_MapBorder .4byte RusturfTunnel_MapBlockdata - .4byte RusturfTunnel_Tileset - .4byte RusturfTunnel_Tileset2 + .4byte gTileset_General + .4byte gTileset_RusturfTunnel Underwater_SootopolisCity_MapBorder:: @ 82D793C .incbin "data/maps/Underwater_SootopolisCity/border.bin" @@ -1885,13 +1935,14 @@ Underwater_SootopolisCity_MapBorder:: @ 82D793C Underwater_SootopolisCity_MapBlockdata:: @ 82D7944 .incbin "data/maps/Underwater_SootopolisCity/map.bin" + .align 2 Underwater_SootopolisCity_MapAttributes:: @ 82D7AD4 .4byte 0x14 .4byte 0xa .4byte Underwater_SootopolisCity_MapBorder .4byte Underwater_SootopolisCity_MapBlockdata - .4byte Underwater_SootopolisCity_Tileset - .4byte Underwater_SootopolisCity_Tileset2 + .4byte gTileset_General + .4byte gTileset_Underwater DesertRuins_MapBorder:: @ 82D7AEC .incbin "data/maps/DesertRuins/border.bin" @@ -1899,15 +1950,14 @@ DesertRuins_MapBorder:: @ 82D7AEC DesertRuins_MapBlockdata:: @ 82D7AF4 .incbin "data/maps/DesertRuins/map.bin" - .incbin "baserom.gba", 0x2d7f56, 0x2 - + .align 2 DesertRuins_MapAttributes:: @ 82D7F58 .4byte 0x11 .4byte 0x21 .4byte DesertRuins_MapBorder .4byte DesertRuins_MapBlockdata - .4byte DesertRuins_Tileset - .4byte DesertRuins_Tileset2 + .4byte gTileset_General + .4byte gTileset_Cave GraniteCave_1F_MapBorder:: @ 82D7F70 .incbin "data/maps/GraniteCave_1F/border.bin" @@ -1915,13 +1965,14 @@ GraniteCave_1F_MapBorder:: @ 82D7F70 GraniteCave_1F_MapBlockdata:: @ 82D7F78 .incbin "data/maps/GraniteCave_1F/map.bin" + .align 2 GraniteCave_1F_MapAttributes:: @ 82D8464 .4byte 0x2a .4byte 0xf .4byte GraniteCave_1F_MapBorder .4byte GraniteCave_1F_MapBlockdata - .4byte GraniteCave_1F_Tileset - .4byte GraniteCave_1F_Tileset2 + .4byte gTileset_General + .4byte gTileset_Cave GraniteCave_B1F_MapBorder:: @ 82D847C .incbin "data/maps/GraniteCave_B1F/border.bin" @@ -1929,13 +1980,14 @@ GraniteCave_B1F_MapBorder:: @ 82D847C GraniteCave_B1F_MapBlockdata:: @ 82D8484 .incbin "data/maps/GraniteCave_B1F/map.bin" + .align 2 GraniteCave_B1F_MapAttributes:: @ 82D8B04 .4byte 0x20 .4byte 0x1a .4byte GraniteCave_B1F_MapBorder .4byte GraniteCave_B1F_MapBlockdata - .4byte GraniteCave_B1F_Tileset - .4byte GraniteCave_B1F_Tileset2 + .4byte gTileset_General + .4byte gTileset_Cave GraniteCave_B2F_MapBorder:: @ 82D8B1C .incbin "data/maps/GraniteCave_B2F/border.bin" @@ -1943,13 +1995,14 @@ GraniteCave_B2F_MapBorder:: @ 82D8B1C GraniteCave_B2F_MapBlockdata:: @ 82D8B24 .incbin "data/maps/GraniteCave_B2F/map.bin" + .align 2 GraniteCave_B2F_MapAttributes:: @ 82D91A4 .4byte 0x20 .4byte 0x1a .4byte GraniteCave_B2F_MapBorder .4byte GraniteCave_B2F_MapBlockdata - .4byte GraniteCave_B2F_Tileset - .4byte GraniteCave_B2F_Tileset2 + .4byte gTileset_General + .4byte gTileset_Cave PetalburgWoods_MapBorder:: @ 82D91BC .incbin "data/maps/PetalburgWoods/border.bin" @@ -1957,13 +2010,14 @@ PetalburgWoods_MapBorder:: @ 82D91BC PetalburgWoods_MapBlockdata:: @ 82D91C4 .incbin "data/maps/PetalburgWoods/map.bin" + .align 2 PetalburgWoods_MapAttributes:: @ 82DA244 .4byte 0x30 .4byte 0x2c .4byte PetalburgWoods_MapBorder .4byte PetalburgWoods_MapBlockdata - .4byte PetalburgWoods_Tileset - .4byte PetalburgWoods_Tileset2 + .4byte gTileset_General + .4byte gTileset_Rustboro MtChimney_MapBorder:: @ 82DA25C .incbin "data/maps/MtChimney/border.bin" @@ -1971,13 +2025,14 @@ MtChimney_MapBorder:: @ 82DA25C MtChimney_MapBlockdata:: @ 82DA264 .incbin "data/maps/MtChimney/map.bin" + .align 2 MtChimney_MapAttributes:: @ 82DB114 .4byte 0x28 .4byte 0x2f .4byte MtChimney_MapBorder .4byte MtChimney_MapBlockdata - .4byte MtChimney_Tileset - .4byte MtChimney_Tileset2 + .4byte gTileset_General + .4byte gTileset_Lavaridge MtPyre_1F_MapBorder:: @ 82DB12C .incbin "data/maps/MtPyre_1F/border.bin" @@ -1985,13 +2040,14 @@ MtPyre_1F_MapBorder:: @ 82DB12C MtPyre_1F_MapBlockdata:: @ 82DB134 .incbin "data/maps/MtPyre_1F/map.bin" + .align 2 MtPyre_1F_MapAttributes:: @ 82DB478 .4byte 0x16 .4byte 0x13 .4byte MtPyre_1F_MapBorder .4byte MtPyre_1F_MapBlockdata - .4byte MtPyre_1F_Tileset - .4byte MtPyre_1F_Tileset2 + .4byte gTileset_General + .4byte gTileset_Facility MtPyre_2F_MapBorder:: @ 82DB490 .incbin "data/maps/MtPyre_2F/border.bin" @@ -1999,15 +2055,14 @@ MtPyre_2F_MapBorder:: @ 82DB490 MtPyre_2F_MapBlockdata:: @ 82DB498 .incbin "data/maps/MtPyre_2F/map.bin" - .incbin "baserom.gba", 0x2db5ea, 0x2 - + .align 2 MtPyre_2F_MapAttributes:: @ 82DB5EC .4byte 0xd .4byte 0xd .4byte MtPyre_2F_MapBorder .4byte MtPyre_2F_MapBlockdata - .4byte MtPyre_2F_Tileset - .4byte MtPyre_2F_Tileset2 + .4byte gTileset_General + .4byte gTileset_Facility MtPyre_3F_MapBorder:: @ 82DB604 .incbin "data/maps/MtPyre_3F/border.bin" @@ -2015,15 +2070,14 @@ MtPyre_3F_MapBorder:: @ 82DB604 MtPyre_3F_MapBlockdata:: @ 82DB60C .incbin "data/maps/MtPyre_3F/map.bin" - .incbin "baserom.gba", 0x2db75e, 0x2 - + .align 2 MtPyre_3F_MapAttributes:: @ 82DB760 .4byte 0xd .4byte 0xd .4byte MtPyre_3F_MapBorder .4byte MtPyre_3F_MapBlockdata - .4byte MtPyre_3F_Tileset - .4byte MtPyre_3F_Tileset2 + .4byte gTileset_General + .4byte gTileset_Facility MtPyre_4F_MapBorder:: @ 82DB778 .incbin "data/maps/MtPyre_4F/border.bin" @@ -2031,15 +2085,14 @@ MtPyre_4F_MapBorder:: @ 82DB778 MtPyre_4F_MapBlockdata:: @ 82DB780 .incbin "data/maps/MtPyre_4F/map.bin" - .incbin "baserom.gba", 0x2db8d2, 0x2 - + .align 2 MtPyre_4F_MapAttributes:: @ 82DB8D4 .4byte 0xd .4byte 0xd .4byte MtPyre_4F_MapBorder .4byte MtPyre_4F_MapBlockdata - .4byte MtPyre_4F_Tileset - .4byte MtPyre_4F_Tileset2 + .4byte gTileset_General + .4byte gTileset_Facility MtPyre_5F_MapBorder:: @ 82DB8EC .incbin "data/maps/MtPyre_5F/border.bin" @@ -2047,15 +2100,14 @@ MtPyre_5F_MapBorder:: @ 82DB8EC MtPyre_5F_MapBlockdata:: @ 82DB8F4 .incbin "data/maps/MtPyre_5F/map.bin" - .incbin "baserom.gba", 0x2dba46, 0x2 - + .align 2 MtPyre_5F_MapAttributes:: @ 82DBA48 .4byte 0xd .4byte 0xd .4byte MtPyre_5F_MapBorder .4byte MtPyre_5F_MapBlockdata - .4byte MtPyre_5F_Tileset - .4byte MtPyre_5F_Tileset2 + .4byte gTileset_General + .4byte gTileset_Facility MtPyre_6F_MapBorder:: @ 82DBA60 .incbin "data/maps/MtPyre_6F/border.bin" @@ -2063,15 +2115,14 @@ MtPyre_6F_MapBorder:: @ 82DBA60 MtPyre_6F_MapBlockdata:: @ 82DBA68 .incbin "data/maps/MtPyre_6F/map.bin" - .incbin "baserom.gba", 0x2dbbba, 0x2 - + .align 2 MtPyre_6F_MapAttributes:: @ 82DBBBC .4byte 0xd .4byte 0xd .4byte MtPyre_6F_MapBorder .4byte MtPyre_6F_MapBlockdata - .4byte MtPyre_6F_Tileset - .4byte MtPyre_6F_Tileset2 + .4byte gTileset_General + .4byte gTileset_Facility AquaHideout_1F_MapBorder:: @ 82DBBD4 .incbin "data/maps/AquaHideout_1F/border.bin" @@ -2079,13 +2130,14 @@ AquaHideout_1F_MapBorder:: @ 82DBBD4 AquaHideout_1F_MapBlockdata:: @ 82DBBDC .incbin "data/maps/AquaHideout_1F/map.bin" + .align 2 AquaHideout_1F_MapAttributes:: @ 82DC26C .4byte 0x1c .4byte 0x1e .4byte AquaHideout_1F_MapBorder .4byte AquaHideout_1F_MapBlockdata - .4byte AquaHideout_1F_Tileset - .4byte AquaHideout_1F_Tileset2 + .4byte gTileset_General + .4byte gTileset_Facility AquaHideout_B1F_MapBorder:: @ 82DC284 .incbin "data/maps/AquaHideout_B1F/border.bin" @@ -2093,13 +2145,14 @@ AquaHideout_B1F_MapBorder:: @ 82DC284 AquaHideout_B1F_MapBlockdata:: @ 82DC28C .incbin "data/maps/AquaHideout_B1F/map.bin" + .align 2 AquaHideout_B1F_MapAttributes:: @ 82DCC1C .4byte 0x33 .4byte 0x18 .4byte AquaHideout_B1F_MapBorder .4byte AquaHideout_B1F_MapBlockdata - .4byte AquaHideout_B1F_Tileset - .4byte AquaHideout_B1F_Tileset2 + .4byte gTileset_General + .4byte gTileset_Facility AquaHideout_B2F_MapBorder:: @ 82DCC34 .incbin "data/maps/AquaHideout_B2F/border.bin" @@ -2107,13 +2160,14 @@ AquaHideout_B2F_MapBorder:: @ 82DCC34 AquaHideout_B2F_MapBlockdata:: @ 82DCC3C .incbin "data/maps/AquaHideout_B2F/map.bin" + .align 2 AquaHideout_B2F_MapAttributes:: @ 82DD29C .4byte 0x22 .4byte 0x18 .4byte AquaHideout_B2F_MapBorder .4byte AquaHideout_B2F_MapBlockdata - .4byte AquaHideout_B2F_Tileset - .4byte AquaHideout_B2F_Tileset2 + .4byte gTileset_General + .4byte gTileset_Facility Underwater_SeafloorCavern_MapBorder:: @ 82DD2B4 .incbin "data/maps/Underwater_SeafloorCavern/border.bin" @@ -2121,13 +2175,14 @@ Underwater_SeafloorCavern_MapBorder:: @ 82DD2B4 Underwater_SeafloorCavern_MapBlockdata:: @ 82DD2BC .incbin "data/maps/Underwater_SeafloorCavern/map.bin" + .align 2 Underwater_SeafloorCavern_MapAttributes:: @ 82DD3B8 .4byte 0xe .4byte 0x9 .4byte Underwater_SeafloorCavern_MapBorder .4byte Underwater_SeafloorCavern_MapBlockdata - .4byte Underwater_SeafloorCavern_Tileset - .4byte Underwater_SeafloorCavern_Tileset2 + .4byte gTileset_General + .4byte gTileset_Underwater SeafloorCavern_Entrance_MapBorder:: @ 82DD3D0 .incbin "data/maps/SeafloorCavern_Entrance/border.bin" @@ -2135,13 +2190,14 @@ SeafloorCavern_Entrance_MapBorder:: @ 82DD3D0 SeafloorCavern_Entrance_MapBlockdata:: @ 82DD3D8 .incbin "data/maps/SeafloorCavern_Entrance/map.bin" + .align 2 SeafloorCavern_Entrance_MapAttributes:: @ 82DD6F8 .4byte 0x14 .4byte 0x14 .4byte SeafloorCavern_Entrance_MapBorder .4byte SeafloorCavern_Entrance_MapBlockdata - .4byte SeafloorCavern_Entrance_Tileset - .4byte SeafloorCavern_Entrance_Tileset2 + .4byte gTileset_General + .4byte gTileset_Cave SeafloorCavern_Room1_MapBorder:: @ 82DD710 .incbin "data/maps/SeafloorCavern_Room1/border.bin" @@ -2149,13 +2205,14 @@ SeafloorCavern_Room1_MapBorder:: @ 82DD710 SeafloorCavern_Room1_MapBlockdata:: @ 82DD718 .incbin "data/maps/SeafloorCavern_Room1/map.bin" + .align 2 SeafloorCavern_Room1_MapAttributes:: @ 82DDA60 .4byte 0x14 .4byte 0x15 .4byte SeafloorCavern_Room1_MapBorder .4byte SeafloorCavern_Room1_MapBlockdata - .4byte SeafloorCavern_Room1_Tileset - .4byte SeafloorCavern_Room1_Tileset2 + .4byte gTileset_General + .4byte gTileset_Cave SeafloorCavern_Room2_MapBorder:: @ 82DDA78 .incbin "data/maps/SeafloorCavern_Room2/border.bin" @@ -2163,13 +2220,14 @@ SeafloorCavern_Room2_MapBorder:: @ 82DDA78 SeafloorCavern_Room2_MapBlockdata:: @ 82DDA80 .incbin "data/maps/SeafloorCavern_Room2/map.bin" + .align 2 SeafloorCavern_Room2_MapAttributes:: @ 82DDD74 .4byte 0x12 .4byte 0x15 .4byte SeafloorCavern_Room2_MapBorder .4byte SeafloorCavern_Room2_MapBlockdata - .4byte SeafloorCavern_Room2_Tileset - .4byte SeafloorCavern_Room2_Tileset2 + .4byte gTileset_General + .4byte gTileset_Cave SeafloorCavern_Room3_MapBorder:: @ 82DDD8C .incbin "data/maps/SeafloorCavern_Room3/border.bin" @@ -2177,13 +2235,14 @@ SeafloorCavern_Room3_MapBorder:: @ 82DDD8C SeafloorCavern_Room3_MapBlockdata:: @ 82DDD94 .incbin "data/maps/SeafloorCavern_Room3/map.bin" + .align 2 SeafloorCavern_Room3_MapAttributes:: @ 82DDFB4 .4byte 0x10 .4byte 0x11 .4byte SeafloorCavern_Room3_MapBorder .4byte SeafloorCavern_Room3_MapBlockdata - .4byte SeafloorCavern_Room3_Tileset - .4byte SeafloorCavern_Room3_Tileset2 + .4byte gTileset_General + .4byte gTileset_Cave SeafloorCavern_Room4_MapBorder:: @ 82DDFCC .incbin "data/maps/SeafloorCavern_Room4/border.bin" @@ -2191,13 +2250,14 @@ SeafloorCavern_Room4_MapBorder:: @ 82DDFCC SeafloorCavern_Room4_MapBlockdata:: @ 82DDFD4 .incbin "data/maps/SeafloorCavern_Room4/map.bin" + .align 2 SeafloorCavern_Room4_MapAttributes:: @ 82DE280 .4byte 0x12 .4byte 0x13 .4byte SeafloorCavern_Room4_MapBorder .4byte SeafloorCavern_Room4_MapBlockdata - .4byte SeafloorCavern_Room4_Tileset - .4byte SeafloorCavern_Room4_Tileset2 + .4byte gTileset_General + .4byte gTileset_Cave SeafloorCavern_Room5_MapBorder:: @ 82DE298 .incbin "data/maps/SeafloorCavern_Room5/border.bin" @@ -2205,13 +2265,14 @@ SeafloorCavern_Room5_MapBorder:: @ 82DE298 SeafloorCavern_Room5_MapBlockdata:: @ 82DE2A0 .incbin "data/maps/SeafloorCavern_Room5/map.bin" + .align 2 SeafloorCavern_Room5_MapAttributes:: @ 82DE5C0 .4byte 0x14 .4byte 0x14 .4byte SeafloorCavern_Room5_MapBorder .4byte SeafloorCavern_Room5_MapBlockdata - .4byte SeafloorCavern_Room5_Tileset - .4byte SeafloorCavern_Room5_Tileset2 + .4byte gTileset_General + .4byte gTileset_Cave SeafloorCavern_Room6_MapBorder:: @ 82DE5D8 .incbin "data/maps/SeafloorCavern_Room6/border.bin" @@ -2219,13 +2280,14 @@ SeafloorCavern_Room6_MapBorder:: @ 82DE5D8 SeafloorCavern_Room6_MapBlockdata:: @ 82DE5E0 .incbin "data/maps/SeafloorCavern_Room6/map.bin" + .align 2 SeafloorCavern_Room6_MapAttributes:: @ 82DEA30 .4byte 0x18 .4byte 0x17 .4byte SeafloorCavern_Room6_MapBorder .4byte SeafloorCavern_Room6_MapBlockdata - .4byte SeafloorCavern_Room6_Tileset - .4byte SeafloorCavern_Room6_Tileset2 + .4byte gTileset_General + .4byte gTileset_Pacifidlog SeafloorCavern_Room7_MapBorder:: @ 82DEA48 .incbin "data/maps/SeafloorCavern_Room7/border.bin" @@ -2233,15 +2295,14 @@ SeafloorCavern_Room7_MapBorder:: @ 82DEA48 SeafloorCavern_Room7_MapBlockdata:: @ 82DEA50 .incbin "data/maps/SeafloorCavern_Room7/map.bin" - .incbin "baserom.gba", 0x2deece, 0x2 - + .align 2 SeafloorCavern_Room7_MapAttributes:: @ 82DEED0 .4byte 0x17 .4byte 0x19 .4byte SeafloorCavern_Room7_MapBorder .4byte SeafloorCavern_Room7_MapBlockdata - .4byte SeafloorCavern_Room7_Tileset - .4byte SeafloorCavern_Room7_Tileset2 + .4byte gTileset_General + .4byte gTileset_Pacifidlog SeafloorCavern_Room8_MapBorder:: @ 82DEEE8 .incbin "data/maps/SeafloorCavern_Room8/border.bin" @@ -2249,13 +2310,14 @@ SeafloorCavern_Room8_MapBorder:: @ 82DEEE8 SeafloorCavern_Room8_MapBlockdata:: @ 82DEEF0 .incbin "data/maps/SeafloorCavern_Room8/map.bin" + .align 2 SeafloorCavern_Room8_MapAttributes:: @ 82DF024 .4byte 0xb .4byte 0xe .4byte SeafloorCavern_Room8_MapBorder .4byte SeafloorCavern_Room8_MapBlockdata - .4byte SeafloorCavern_Room8_Tileset - .4byte SeafloorCavern_Room8_Tileset2 + .4byte gTileset_General + .4byte gTileset_Cave SeafloorCavern_Room9_MapBorder:: @ 82DF03C .incbin "data/maps/SeafloorCavern_Room9/border.bin" @@ -2263,13 +2325,14 @@ SeafloorCavern_Room9_MapBorder:: @ 82DF03C SeafloorCavern_Room9_MapBlockdata:: @ 82DF044 .incbin "data/maps/SeafloorCavern_Room9/map.bin" + .align 2 SeafloorCavern_Room9_MapAttributes:: @ 82DF9F8 .4byte 0x1b .4byte 0x2e .4byte SeafloorCavern_Room9_MapBorder .4byte SeafloorCavern_Room9_MapBlockdata - .4byte SeafloorCavern_Room9_Tileset - .4byte SeafloorCavern_Room9_Tileset2 + .4byte gTileset_General + .4byte gTileset_Cave CaveOfOrigin_Entrance_MapBorder:: @ 82DFA10 .incbin "data/maps/CaveOfOrigin_Entrance/border.bin" @@ -2277,13 +2340,14 @@ CaveOfOrigin_Entrance_MapBorder:: @ 82DFA10 CaveOfOrigin_Entrance_MapBlockdata:: @ 82DFA18 .incbin "data/maps/CaveOfOrigin_Entrance/map.bin" + .align 2 CaveOfOrigin_Entrance_MapAttributes:: @ 82DFDF4 .4byte 0x13 .4byte 0x1a .4byte CaveOfOrigin_Entrance_MapBorder .4byte CaveOfOrigin_Entrance_MapBlockdata - .4byte CaveOfOrigin_Entrance_Tileset - .4byte CaveOfOrigin_Entrance_Tileset2 + .4byte gTileset_General + .4byte gTileset_Cave CaveOfOrigin_1F_MapBorder:: @ 82DFE0C .incbin "data/maps/CaveOfOrigin_1F/border.bin" @@ -2291,15 +2355,14 @@ CaveOfOrigin_1F_MapBorder:: @ 82DFE0C CaveOfOrigin_1F_MapBlockdata:: @ 82DFE14 .incbin "data/maps/CaveOfOrigin_1F/map.bin" - .incbin "baserom.gba", 0x2e0236, 0x2 - + .align 2 CaveOfOrigin_1F_MapAttributes:: @ 82E0238 .4byte 0x17 .4byte 0x17 .4byte CaveOfOrigin_1F_MapBorder .4byte CaveOfOrigin_1F_MapBlockdata - .4byte CaveOfOrigin_1F_Tileset - .4byte CaveOfOrigin_1F_Tileset2 + .4byte gTileset_General + .4byte gTileset_Cave CaveOfOrigin_B1F_MapBorder:: @ 82E0250 .incbin "data/maps/CaveOfOrigin_B1F/border.bin" @@ -2307,15 +2370,14 @@ CaveOfOrigin_B1F_MapBorder:: @ 82E0250 CaveOfOrigin_B1F_MapBlockdata:: @ 82E0258 .incbin "data/maps/CaveOfOrigin_B1F/map.bin" - .incbin "baserom.gba", 0x2e067a, 0x2 - + .align 2 CaveOfOrigin_B1F_MapAttributes:: @ 82E067C .4byte 0x17 .4byte 0x17 .4byte CaveOfOrigin_B1F_MapBorder .4byte CaveOfOrigin_B1F_MapBlockdata - .4byte CaveOfOrigin_B1F_Tileset - .4byte CaveOfOrigin_B1F_Tileset2 + .4byte gTileset_General + .4byte gTileset_Cave CaveOfOrigin_B2F_MapBorder:: @ 82E0694 .incbin "data/maps/CaveOfOrigin_B2F/border.bin" @@ -2323,15 +2385,14 @@ CaveOfOrigin_B2F_MapBorder:: @ 82E0694 CaveOfOrigin_B2F_MapBlockdata:: @ 82E069C .incbin "data/maps/CaveOfOrigin_B2F/map.bin" - .incbin "baserom.gba", 0x2e0a0e, 0x2 - + .align 2 CaveOfOrigin_B2F_MapAttributes:: @ 82E0A10 .4byte 0x15 .4byte 0x15 .4byte CaveOfOrigin_B2F_MapBorder .4byte CaveOfOrigin_B2F_MapBlockdata - .4byte CaveOfOrigin_B2F_Tileset - .4byte CaveOfOrigin_B2F_Tileset2 + .4byte gTileset_General + .4byte gTileset_Cave CaveOfOrigin_B3F_MapBorder:: @ 82E0A28 .incbin "data/maps/CaveOfOrigin_B3F/border.bin" @@ -2339,15 +2400,14 @@ CaveOfOrigin_B3F_MapBorder:: @ 82E0A28 CaveOfOrigin_B3F_MapBlockdata:: @ 82E0A30 .incbin "data/maps/CaveOfOrigin_B3F/map.bin" - .incbin "baserom.gba", 0x2e0d4e, 0x2 - + .align 2 CaveOfOrigin_B3F_MapAttributes:: @ 82E0D50 .4byte 0x13 .4byte 0x15 .4byte CaveOfOrigin_B3F_MapBorder .4byte CaveOfOrigin_B3F_MapBlockdata - .4byte CaveOfOrigin_B3F_Tileset - .4byte CaveOfOrigin_B3F_Tileset2 + .4byte gTileset_General + .4byte gTileset_Cave CaveOfOrigin_B4F_MapBorder:: @ 82E0D68 .incbin "data/maps/CaveOfOrigin_B4F/border.bin" @@ -2355,15 +2415,14 @@ CaveOfOrigin_B4F_MapBorder:: @ 82E0D68 CaveOfOrigin_B4F_MapBlockdata:: @ 82E0D70 .incbin "data/maps/CaveOfOrigin_B4F/map.bin" - .incbin "baserom.gba", 0x2e1042, 0x2 - + .align 2 CaveOfOrigin_B4F_MapAttributes:: @ 82E1044 .4byte 0x13 .4byte 0x13 .4byte CaveOfOrigin_B4F_MapBorder .4byte CaveOfOrigin_B4F_MapBlockdata - .4byte CaveOfOrigin_B4F_Tileset - .4byte CaveOfOrigin_B4F_Tileset2 + .4byte gTileset_General + .4byte gTileset_Cave VictoryRoad_1F_MapBorder:: @ 82E105C .incbin "data/maps/VictoryRoad_1F/border.bin" @@ -2371,13 +2430,14 @@ VictoryRoad_1F_MapBorder:: @ 82E105C VictoryRoad_1F_MapBlockdata:: @ 82E1064 .incbin "data/maps/VictoryRoad_1F/map.bin" + .align 2 VictoryRoad_1F_MapAttributes:: @ 82E2090 .4byte 0x2e .4byte 0x2d .4byte VictoryRoad_1F_MapBorder .4byte VictoryRoad_1F_MapBlockdata - .4byte VictoryRoad_1F_Tileset - .4byte VictoryRoad_1F_Tileset2 + .4byte gTileset_General + .4byte gTileset_Cave ShoalCave_LowTideEntranceRoom_MapBorder:: @ 82E20A8 .incbin "data/maps/ShoalCave_LowTideEntranceRoom/border.bin" @@ -2385,15 +2445,14 @@ ShoalCave_LowTideEntranceRoom_MapBorder:: @ 82E20A8 ShoalCave_LowTideEntranceRoom_MapBlockdata:: @ 82E20B0 .incbin "data/maps/ShoalCave_LowTideEntranceRoom/map.bin" - .incbin "baserom.gba", 0x2e2a42, 0x2 - + .align 2 ShoalCave_LowTideEntranceRoom_MapAttributes:: @ 82E2A44 .4byte 0x23 .4byte 0x23 .4byte ShoalCave_LowTideEntranceRoom_MapBorder .4byte ShoalCave_LowTideEntranceRoom_MapBlockdata - .4byte ShoalCave_LowTideEntranceRoom_Tileset - .4byte ShoalCave_LowTideEntranceRoom_Tileset2 + .4byte gTileset_General + .4byte gTileset_Cave ShoalCave_LowTideInnerRoom_MapBorder:: @ 82E2A5C .incbin "data/maps/ShoalCave_LowTideInnerRoom/border.bin" @@ -2401,13 +2460,14 @@ ShoalCave_LowTideInnerRoom_MapBorder:: @ 82E2A5C ShoalCave_LowTideInnerRoom_MapBlockdata:: @ 82E2A64 .incbin "data/maps/ShoalCave_LowTideInnerRoom/map.bin" + .align 2 ShoalCave_LowTideInnerRoom_MapAttributes:: @ 82E380C .4byte 0x2e .4byte 0x26 .4byte ShoalCave_LowTideInnerRoom_MapBorder .4byte ShoalCave_LowTideInnerRoom_MapBlockdata - .4byte ShoalCave_LowTideInnerRoom_Tileset - .4byte ShoalCave_LowTideInnerRoom_Tileset2 + .4byte gTileset_General + .4byte gTileset_Cave ShoalCave_LowTideStairsRoom_MapBorder:: @ 82E3824 .incbin "data/maps/ShoalCave_LowTideStairsRoom/border.bin" @@ -2415,15 +2475,14 @@ ShoalCave_LowTideStairsRoom_MapBorder:: @ 82E3824 ShoalCave_LowTideStairsRoom_MapBlockdata:: @ 82E382C .incbin "data/maps/ShoalCave_LowTideStairsRoom/map.bin" - .incbin "baserom.gba", 0x2e3aa2, 0x2 - + .align 2 ShoalCave_LowTideStairsRoom_MapAttributes:: @ 82E3AA4 .4byte 0x15 .4byte 0xf .4byte ShoalCave_LowTideStairsRoom_MapBorder .4byte ShoalCave_LowTideStairsRoom_MapBlockdata - .4byte ShoalCave_LowTideStairsRoom_Tileset - .4byte ShoalCave_LowTideStairsRoom_Tileset2 + .4byte gTileset_General + .4byte gTileset_Cave ShoalCave_LowTideLowerRoom_MapBorder:: @ 82E3ABC .incbin "data/maps/ShoalCave_LowTideLowerRoom/border.bin" @@ -2431,13 +2490,14 @@ ShoalCave_LowTideLowerRoom_MapBorder:: @ 82E3ABC ShoalCave_LowTideLowerRoom_MapBlockdata:: @ 82E3AC4 .incbin "data/maps/ShoalCave_LowTideLowerRoom/map.bin" + .align 2 ShoalCave_LowTideLowerRoom_MapAttributes:: @ 82E3E28 .4byte 0x1f .4byte 0xe .4byte ShoalCave_LowTideLowerRoom_MapBorder .4byte ShoalCave_LowTideLowerRoom_MapBlockdata - .4byte ShoalCave_LowTideLowerRoom_Tileset - .4byte ShoalCave_LowTideLowerRoom_Tileset2 + .4byte gTileset_General + .4byte gTileset_Cave ShoalCave_HighTideEntranceRoom_MapBorder:: @ 82E3E40 .incbin "data/maps/ShoalCave_HighTideEntranceRoom/border.bin" @@ -2445,15 +2505,14 @@ ShoalCave_HighTideEntranceRoom_MapBorder:: @ 82E3E40 ShoalCave_HighTideEntranceRoom_MapBlockdata:: @ 82E3E48 .incbin "data/maps/ShoalCave_HighTideEntranceRoom/map.bin" - .incbin "baserom.gba", 0x2e47da, 0x2 - + .align 2 ShoalCave_HighTideEntranceRoom_MapAttributes:: @ 82E47DC .4byte 0x23 .4byte 0x23 .4byte ShoalCave_HighTideEntranceRoom_MapBorder .4byte ShoalCave_HighTideEntranceRoom_MapBlockdata - .4byte ShoalCave_HighTideEntranceRoom_Tileset - .4byte ShoalCave_HighTideEntranceRoom_Tileset2 + .4byte gTileset_General + .4byte gTileset_Cave ShoalCave_HighTideInnerRoom_MapBorder:: @ 82E47F4 .incbin "data/maps/ShoalCave_HighTideInnerRoom/border.bin" @@ -2461,13 +2520,14 @@ ShoalCave_HighTideInnerRoom_MapBorder:: @ 82E47F4 ShoalCave_HighTideInnerRoom_MapBlockdata:: @ 82E47FC .incbin "data/maps/ShoalCave_HighTideInnerRoom/map.bin" + .align 2 ShoalCave_HighTideInnerRoom_MapAttributes:: @ 82E55A4 .4byte 0x2e .4byte 0x26 .4byte ShoalCave_HighTideInnerRoom_MapBorder .4byte ShoalCave_HighTideInnerRoom_MapBlockdata - .4byte ShoalCave_HighTideInnerRoom_Tileset - .4byte ShoalCave_HighTideInnerRoom_Tileset2 + .4byte gTileset_General + .4byte gTileset_Cave .incbin "baserom.gba", 0x2e55bc, 0x1f8 @@ -2477,15 +2537,14 @@ NewMauville_Entrance_MapBorder:: @ 82E57B4 NewMauville_Entrance_MapBlockdata:: @ 82E57BC .incbin "data/maps/NewMauville_Entrance/map.bin" - .incbin "baserom.gba", 0x2e585e, 0x2 - + .align 2 NewMauville_Entrance_MapAttributes:: @ 82E5860 .4byte 0x9 .4byte 0x9 .4byte NewMauville_Entrance_MapBorder .4byte NewMauville_Entrance_MapBlockdata - .4byte NewMauville_Entrance_Tileset - .4byte NewMauville_Entrance_Tileset2 + .4byte gTileset_General + .4byte gTileset_Facility NewMauville_Inside_MapBorder:: @ 82E5878 .incbin "data/maps/NewMauville_Inside/border.bin" @@ -2493,15 +2552,14 @@ NewMauville_Inside_MapBorder:: @ 82E5878 NewMauville_Inside_MapBlockdata:: @ 82E5880 .incbin "data/maps/NewMauville_Inside/map.bin" - .incbin "baserom.gba", 0x2e65a2, 0x2 - + .align 2 NewMauville_Inside_MapAttributes:: @ 82E65A4 .4byte 0x29 .4byte 0x29 .4byte NewMauville_Inside_MapBorder .4byte NewMauville_Inside_MapBlockdata - .4byte NewMauville_Inside_Tileset - .4byte NewMauville_Inside_Tileset2 + .4byte gTileset_General + .4byte gTileset_BikeShop AbandonedShip_Deck_MapBorder:: @ 82E65BC .incbin "data/maps/AbandonedShip_Deck/border.bin" @@ -2509,15 +2567,14 @@ AbandonedShip_Deck_MapBorder:: @ 82E65BC AbandonedShip_Deck_MapBlockdata:: @ 82E65C4 .incbin "data/maps/AbandonedShip_Deck/map.bin" - .incbin "baserom.gba", 0x2e698a, 0x2 - + .align 2 AbandonedShip_Deck_MapAttributes:: @ 82E698C .4byte 0x17 .4byte 0x15 .4byte AbandonedShip_Deck_MapBorder .4byte AbandonedShip_Deck_MapBlockdata - .4byte AbandonedShip_Deck_Tileset - .4byte AbandonedShip_Deck_Tileset2 + .4byte gTileset_General + .4byte gTileset_Facility AbandonedShip_Corridors_1F_MapBorder:: @ 82E69A4 .incbin "data/maps/AbandonedShip_Corridors_1F/border.bin" @@ -2525,13 +2582,14 @@ AbandonedShip_Corridors_1F_MapBorder:: @ 82E69A4 AbandonedShip_Corridors_1F_MapBlockdata:: @ 82E69AC .incbin "data/maps/AbandonedShip_Corridors_1F/map.bin" + .align 2 AbandonedShip_Corridors_1F_MapAttributes:: @ 82E6B5C .4byte 0x12 .4byte 0xc .4byte AbandonedShip_Corridors_1F_MapBorder .4byte AbandonedShip_Corridors_1F_MapBlockdata - .4byte AbandonedShip_Corridors_1F_Tileset - .4byte AbandonedShip_Corridors_1F_Tileset2 + .4byte gTileset_General + .4byte gTileset_Ship AbandonedShip_Rooms_1F_MapBorder:: @ 82E6B74 .incbin "data/maps/AbandonedShip_Rooms_1F/border.bin" @@ -2539,13 +2597,14 @@ AbandonedShip_Rooms_1F_MapBorder:: @ 82E6B74 AbandonedShip_Rooms_1F_MapBlockdata:: @ 82E6B7C .incbin "data/maps/AbandonedShip_Rooms_1F/map.bin" + .align 2 AbandonedShip_Rooms_1F_MapAttributes:: @ 82E6DE0 .4byte 0x12 .4byte 0x11 .4byte AbandonedShip_Rooms_1F_MapBorder .4byte AbandonedShip_Rooms_1F_MapBlockdata - .4byte AbandonedShip_Rooms_1F_Tileset - .4byte AbandonedShip_Rooms_1F_Tileset2 + .4byte gTileset_General + .4byte gTileset_Ship AbandonedShip_Corridors_B1F_MapBorder:: @ 82E6DF8 .incbin "data/maps/AbandonedShip_Corridors_B1F/border.bin" @@ -2553,13 +2612,14 @@ AbandonedShip_Corridors_B1F_MapBorder:: @ 82E6DF8 AbandonedShip_Corridors_B1F_MapBlockdata:: @ 82E6E00 .incbin "data/maps/AbandonedShip_Corridors_B1F/map.bin" + .align 2 AbandonedShip_Corridors_B1F_MapAttributes:: @ 82E6F04 .4byte 0xd .4byte 0xa .4byte AbandonedShip_Corridors_B1F_MapBorder .4byte AbandonedShip_Corridors_B1F_MapBlockdata - .4byte AbandonedShip_Corridors_B1F_Tileset - .4byte AbandonedShip_Corridors_B1F_Tileset2 + .4byte gTileset_General + .4byte gTileset_Ship AbandonedShip_Rooms_B1F_MapBorder:: @ 82E6F1C .incbin "data/maps/AbandonedShip_Rooms_B1F/border.bin" @@ -2567,13 +2627,14 @@ AbandonedShip_Rooms_B1F_MapBorder:: @ 82E6F1C AbandonedShip_Rooms_B1F_MapBlockdata:: @ 82E6F24 .incbin "data/maps/AbandonedShip_Rooms_B1F/map.bin" + .align 2 AbandonedShip_Rooms_B1F_MapAttributes:: @ 82E70D4 .4byte 0x1b .4byte 0x8 .4byte AbandonedShip_Rooms_B1F_MapBorder .4byte AbandonedShip_Rooms_B1F_MapBlockdata - .4byte AbandonedShip_Rooms_B1F_Tileset - .4byte AbandonedShip_Rooms_B1F_Tileset2 + .4byte gTileset_General + .4byte gTileset_Ship AbandonedShip_Rooms2_B1F_MapBorder:: @ 82E70EC .incbin "data/maps/AbandonedShip_Rooms2_B1F/border.bin" @@ -2581,13 +2642,14 @@ AbandonedShip_Rooms2_B1F_MapBorder:: @ 82E70EC AbandonedShip_Rooms2_B1F_MapBlockdata:: @ 82E70F4 .incbin "data/maps/AbandonedShip_Rooms2_B1F/map.bin" + .align 2 AbandonedShip_Rooms2_B1F_MapAttributes:: @ 82E7214 .4byte 0x12 .4byte 0x8 .4byte AbandonedShip_Rooms2_B1F_MapBorder .4byte AbandonedShip_Rooms2_B1F_MapBlockdata - .4byte AbandonedShip_Rooms2_B1F_Tileset - .4byte AbandonedShip_Rooms2_B1F_Tileset2 + .4byte gTileset_General + .4byte gTileset_Ship AbandonedShip_Underwater1_MapBorder:: @ 82E722C .incbin "data/maps/AbandonedShip_Underwater1/border.bin" @@ -2595,13 +2657,14 @@ AbandonedShip_Underwater1_MapBorder:: @ 82E722C AbandonedShip_Underwater1_MapBlockdata:: @ 82E7234 .incbin "data/maps/AbandonedShip_Underwater1/map.bin" + .align 2 AbandonedShip_Underwater1_MapAttributes:: @ 82E72B4 .4byte 0x8 .4byte 0x8 .4byte AbandonedShip_Underwater1_MapBorder .4byte AbandonedShip_Underwater1_MapBlockdata - .4byte AbandonedShip_Underwater1_Tileset - .4byte AbandonedShip_Underwater1_Tileset2 + .4byte gTileset_General + .4byte gTileset_Ship AbandonedShip_Room_B1F_MapBorder:: @ 82E72CC .incbin "data/maps/AbandonedShip_Room_B1F/border.bin" @@ -2609,13 +2672,14 @@ AbandonedShip_Room_B1F_MapBorder:: @ 82E72CC AbandonedShip_Room_B1F_MapBlockdata:: @ 82E72D4 .incbin "data/maps/AbandonedShip_Room_B1F/map.bin" + .align 2 AbandonedShip_Room_B1F_MapAttributes:: @ 82E7364 .4byte 0x9 .4byte 0x8 .4byte AbandonedShip_Room_B1F_MapBorder .4byte AbandonedShip_Room_B1F_MapBlockdata - .4byte AbandonedShip_Room_B1F_Tileset - .4byte AbandonedShip_Room_B1F_Tileset2 + .4byte gTileset_General + .4byte gTileset_Ship AbandonedShip_Rooms2_1F_MapBorder:: @ 82E737C .incbin "data/maps/AbandonedShip_Rooms2_1F/border.bin" @@ -2623,15 +2687,14 @@ AbandonedShip_Rooms2_1F_MapBorder:: @ 82E737C AbandonedShip_Rooms2_1F_MapBlockdata:: @ 82E7384 .incbin "data/maps/AbandonedShip_Rooms2_1F/map.bin" - .incbin "baserom.gba", 0x2e74b6, 0x2 - + .align 2 AbandonedShip_Rooms2_1F_MapAttributes:: @ 82E74B8 .4byte 0x9 .4byte 0x11 .4byte AbandonedShip_Rooms2_1F_MapBorder .4byte AbandonedShip_Rooms2_1F_MapBlockdata - .4byte AbandonedShip_Rooms2_1F_Tileset - .4byte AbandonedShip_Rooms2_1F_Tileset2 + .4byte gTileset_General + .4byte gTileset_Ship AbandonedShip_CaptainsOffice_MapBorder:: @ 82E74D0 .incbin "data/maps/AbandonedShip_CaptainsOffice/border.bin" @@ -2639,15 +2702,14 @@ AbandonedShip_CaptainsOffice_MapBorder:: @ 82E74D0 AbandonedShip_CaptainsOffice_MapBlockdata:: @ 82E74D8 .incbin "data/maps/AbandonedShip_CaptainsOffice/map.bin" - .incbin "baserom.gba", 0x2e7556, 0x2 - + .align 2 AbandonedShip_CaptainsOffice_MapAttributes:: @ 82E7558 .4byte 0x9 .4byte 0x7 .4byte AbandonedShip_CaptainsOffice_MapBorder .4byte AbandonedShip_CaptainsOffice_MapBlockdata - .4byte AbandonedShip_CaptainsOffice_Tileset - .4byte AbandonedShip_CaptainsOffice_Tileset2 + .4byte gTileset_General + .4byte gTileset_Facility AbandonedShip_Underwater2_MapBorder:: @ 82E7570 .incbin "data/maps/AbandonedShip_Underwater2/border.bin" @@ -2655,15 +2717,14 @@ AbandonedShip_Underwater2_MapBorder:: @ 82E7570 AbandonedShip_Underwater2_MapBlockdata:: @ 82E7578 .incbin "data/maps/AbandonedShip_Underwater2/map.bin" - .incbin "baserom.gba", 0x2e769e, 0x2 - + .align 2 AbandonedShip_Underwater2_MapAttributes:: @ 82E76A0 .4byte 0x15 .4byte 0x7 .4byte AbandonedShip_Underwater2_MapBorder .4byte AbandonedShip_Underwater2_MapBlockdata - .4byte AbandonedShip_Underwater2_Tileset - .4byte AbandonedShip_Underwater2_Tileset2 + .4byte gTileset_General + .4byte gTileset_Ship SecretBase_RedCave1_MapBorder:: @ 82E76B8 .incbin "data/maps/SecretBase_RedCave1/border.bin" @@ -2671,15 +2732,14 @@ SecretBase_RedCave1_MapBorder:: @ 82E76B8 SecretBase_RedCave1_MapBlockdata:: @ 82E76C0 .incbin "data/maps/SecretBase_RedCave1/map.bin" - .incbin "baserom.gba", 0x2e7786, 0x2 - + .align 2 SecretBase_RedCave1_MapAttributes:: @ 82E7788 .4byte 0xb .4byte 0x9 .4byte SecretBase_RedCave1_MapBorder .4byte SecretBase_RedCave1_MapBlockdata - .4byte SecretBase_RedCave1_Tileset - .4byte SecretBase_RedCave1_Tileset2 + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseRedCave SecretBase_BrownCave1_MapBorder:: @ 82E77A0 .incbin "data/maps/SecretBase_BrownCave1/border.bin" @@ -2687,15 +2747,14 @@ SecretBase_BrownCave1_MapBorder:: @ 82E77A0 SecretBase_BrownCave1_MapBlockdata:: @ 82E77A8 .incbin "data/maps/SecretBase_BrownCave1/map.bin" - .incbin "baserom.gba", 0x2e786e, 0x2 - + .align 2 SecretBase_BrownCave1_MapAttributes:: @ 82E7870 .4byte 0xb .4byte 0x9 .4byte SecretBase_BrownCave1_MapBorder .4byte SecretBase_BrownCave1_MapBlockdata - .4byte SecretBase_BrownCave1_Tileset - .4byte SecretBase_BrownCave1_Tileset2 + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseBrownCave SecretBase_BlueCave1_MapBorder:: @ 82E7888 .incbin "data/maps/SecretBase_BlueCave1/border.bin" @@ -2703,15 +2762,14 @@ SecretBase_BlueCave1_MapBorder:: @ 82E7888 SecretBase_BlueCave1_MapBlockdata:: @ 82E7890 .incbin "data/maps/SecretBase_BlueCave1/map.bin" - .incbin "baserom.gba", 0x2e7956, 0x2 - + .align 2 SecretBase_BlueCave1_MapAttributes:: @ 82E7958 .4byte 0xb .4byte 0x9 .4byte SecretBase_BlueCave1_MapBorder .4byte SecretBase_BlueCave1_MapBlockdata - .4byte SecretBase_BlueCave1_Tileset - .4byte SecretBase_BlueCave1_Tileset2 + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseBlueCave SecretBase_YellowCave1_MapBorder:: @ 82E7970 .incbin "data/maps/SecretBase_YellowCave1/border.bin" @@ -2719,15 +2777,14 @@ SecretBase_YellowCave1_MapBorder:: @ 82E7970 SecretBase_YellowCave1_MapBlockdata:: @ 82E7978 .incbin "data/maps/SecretBase_YellowCave1/map.bin" - .incbin "baserom.gba", 0x2e7a3e, 0x2 - + .align 2 SecretBase_YellowCave1_MapAttributes:: @ 82E7A40 .4byte 0xb .4byte 0x9 .4byte SecretBase_YellowCave1_MapBorder .4byte SecretBase_YellowCave1_MapBlockdata - .4byte SecretBase_YellowCave1_Tileset - .4byte SecretBase_YellowCave1_Tileset2 + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseYellowCave SecretBase_Tree1_MapBorder:: @ 82E7A58 .incbin "data/maps/SecretBase_Tree1/border.bin" @@ -2735,15 +2792,14 @@ SecretBase_Tree1_MapBorder:: @ 82E7A58 SecretBase_Tree1_MapBlockdata:: @ 82E7A60 .incbin "data/maps/SecretBase_Tree1/map.bin" - .incbin "baserom.gba", 0x2e7b26, 0x2 - + .align 2 SecretBase_Tree1_MapAttributes:: @ 82E7B28 .4byte 0xb .4byte 0x9 .4byte SecretBase_Tree1_MapBorder .4byte SecretBase_Tree1_MapBlockdata - .4byte SecretBase_Tree1_Tileset - .4byte SecretBase_Tree1_Tileset2 + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseTree SecretBase_Shrub1_MapBorder:: @ 82E7B40 .incbin "data/maps/SecretBase_Shrub1/border.bin" @@ -2751,15 +2807,14 @@ SecretBase_Shrub1_MapBorder:: @ 82E7B40 SecretBase_Shrub1_MapBlockdata:: @ 82E7B48 .incbin "data/maps/SecretBase_Shrub1/map.bin" - .incbin "baserom.gba", 0x2e7c0e, 0x2 - + .align 2 SecretBase_Shrub1_MapAttributes:: @ 82E7C10 .4byte 0xb .4byte 0x9 .4byte SecretBase_Shrub1_MapBorder .4byte SecretBase_Shrub1_MapBlockdata - .4byte SecretBase_Shrub1_Tileset - .4byte SecretBase_Shrub1_Tileset2 + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseShrub SecretBase_RedCave2_MapBorder:: @ 82E7C28 .incbin "data/maps/SecretBase_RedCave2/border.bin" @@ -2767,13 +2822,14 @@ SecretBase_RedCave2_MapBorder:: @ 82E7C28 SecretBase_RedCave2_MapBlockdata:: @ 82E7C30 .incbin "data/maps/SecretBase_RedCave2/map.bin" + .align 2 SecretBase_RedCave2_MapAttributes:: @ 82E7D10 .4byte 0x7 .4byte 0x10 .4byte SecretBase_RedCave2_MapBorder .4byte SecretBase_RedCave2_MapBlockdata - .4byte SecretBase_RedCave2_Tileset - .4byte SecretBase_RedCave2_Tileset2 + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseRedCave SecretBase_BrownCave2_MapBorder:: @ 82E7D28 .incbin "data/maps/SecretBase_BrownCave2/border.bin" @@ -2781,13 +2837,14 @@ SecretBase_BrownCave2_MapBorder:: @ 82E7D28 SecretBase_BrownCave2_MapBlockdata:: @ 82E7D30 .incbin "data/maps/SecretBase_BrownCave2/map.bin" + .align 2 SecretBase_BrownCave2_MapAttributes:: @ 82E7E2C .4byte 0xe .4byte 0x9 .4byte SecretBase_BrownCave2_MapBorder .4byte SecretBase_BrownCave2_MapBlockdata - .4byte SecretBase_BrownCave2_Tileset - .4byte SecretBase_BrownCave2_Tileset2 + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseBrownCave SecretBase_BlueCave2_MapBorder:: @ 82E7E44 .incbin "data/maps/SecretBase_BlueCave2/border.bin" @@ -2795,15 +2852,14 @@ SecretBase_BlueCave2_MapBorder:: @ 82E7E44 SecretBase_BlueCave2_MapBlockdata:: @ 82E7E4C .incbin "data/maps/SecretBase_BlueCave2/map.bin" - .incbin "baserom.gba", 0x2e7f1e, 0x2 - + .align 2 SecretBase_BlueCave2_MapAttributes:: @ 82E7F20 .4byte 0xf .4byte 0x7 .4byte SecretBase_BlueCave2_MapBorder .4byte SecretBase_BlueCave2_MapBlockdata - .4byte SecretBase_BlueCave2_Tileset - .4byte SecretBase_BlueCave2_Tileset2 + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseBlueCave SecretBase_YellowCave2_MapBorder:: @ 82E7F38 .incbin "data/maps/SecretBase_YellowCave2/border.bin" @@ -2811,13 +2867,14 @@ SecretBase_YellowCave2_MapBorder:: @ 82E7F38 SecretBase_YellowCave2_MapBlockdata:: @ 82E7F40 .incbin "data/maps/SecretBase_YellowCave2/map.bin" + .align 2 SecretBase_YellowCave2_MapAttributes:: @ 82E803C .4byte 0xe .4byte 0x9 .4byte SecretBase_YellowCave2_MapBorder .4byte SecretBase_YellowCave2_MapBlockdata - .4byte SecretBase_YellowCave2_Tileset - .4byte SecretBase_YellowCave2_Tileset2 + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseYellowCave SecretBase_Tree2_MapBorder:: @ 82E8054 .incbin "data/maps/SecretBase_Tree2/border.bin" @@ -2825,13 +2882,14 @@ SecretBase_Tree2_MapBorder:: @ 82E8054 SecretBase_Tree2_MapBlockdata:: @ 82E805C .incbin "data/maps/SecretBase_Tree2/map.bin" + .align 2 SecretBase_Tree2_MapAttributes:: @ 82E813C .4byte 0x7 .4byte 0x10 .4byte SecretBase_Tree2_MapBorder .4byte SecretBase_Tree2_MapBlockdata - .4byte SecretBase_Tree2_Tileset - .4byte SecretBase_Tree2_Tileset2 + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseTree SecretBase_Shrub2_MapBorder:: @ 82E8154 .incbin "data/maps/SecretBase_Shrub2/border.bin" @@ -2839,15 +2897,14 @@ SecretBase_Shrub2_MapBorder:: @ 82E8154 SecretBase_Shrub2_MapBlockdata:: @ 82E815C .incbin "data/maps/SecretBase_Shrub2/map.bin" - .incbin "baserom.gba", 0x2e822e, 0x2 - + .align 2 SecretBase_Shrub2_MapAttributes:: @ 82E8230 .4byte 0xf .4byte 0x7 .4byte SecretBase_Shrub2_MapBorder .4byte SecretBase_Shrub2_MapBlockdata - .4byte SecretBase_Shrub2_Tileset - .4byte SecretBase_Shrub2_Tileset2 + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseShrub SecretBase_RedCave3_MapBorder:: @ 82E8248 .incbin "data/maps/SecretBase_RedCave3/border.bin" @@ -2855,13 +2912,14 @@ SecretBase_RedCave3_MapBorder:: @ 82E8248 SecretBase_RedCave3_MapBlockdata:: @ 82E8250 .incbin "data/maps/SecretBase_RedCave3/map.bin" + .align 2 SecretBase_RedCave3_MapAttributes:: @ 82E8340 .4byte 0xf .4byte 0x8 .4byte SecretBase_RedCave3_MapBorder .4byte SecretBase_RedCave3_MapBlockdata - .4byte SecretBase_RedCave3_Tileset - .4byte SecretBase_RedCave3_Tileset2 + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseRedCave SecretBase_BrownCave3_MapBorder:: @ 82E8358 .incbin "data/maps/SecretBase_BrownCave3/border.bin" @@ -2869,15 +2927,14 @@ SecretBase_BrownCave3_MapBorder:: @ 82E8358 SecretBase_BrownCave3_MapBlockdata:: @ 82E8360 .incbin "data/maps/SecretBase_BrownCave3/map.bin" - .incbin "baserom.gba", 0x2e84aa, 0x2 - + .align 2 SecretBase_BrownCave3_MapAttributes:: @ 82E84AC .4byte 0xf .4byte 0xb .4byte SecretBase_BrownCave3_MapBorder .4byte SecretBase_BrownCave3_MapBlockdata - .4byte SecretBase_BrownCave3_Tileset - .4byte SecretBase_BrownCave3_Tileset2 + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseBrownCave SecretBase_BlueCave3_MapBorder:: @ 82E84C4 .incbin "data/maps/SecretBase_BlueCave3/border.bin" @@ -2885,13 +2942,14 @@ SecretBase_BlueCave3_MapBorder:: @ 82E84C4 SecretBase_BlueCave3_MapBlockdata:: @ 82E84CC .incbin "data/maps/SecretBase_BlueCave3/map.bin" + .align 2 SecretBase_BlueCave3_MapAttributes:: @ 82E8620 .4byte 0xa .4byte 0x11 .4byte SecretBase_BlueCave3_MapBorder .4byte SecretBase_BlueCave3_MapBlockdata - .4byte SecretBase_BlueCave3_Tileset - .4byte SecretBase_BlueCave3_Tileset2 + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseBlueCave SecretBase_YellowCave3_MapBorder:: @ 82E8638 .incbin "data/maps/SecretBase_YellowCave3/border.bin" @@ -2899,13 +2957,14 @@ SecretBase_YellowCave3_MapBorder:: @ 82E8638 SecretBase_YellowCave3_MapBlockdata:: @ 82E8640 .incbin "data/maps/SecretBase_YellowCave3/map.bin" + .align 2 SecretBase_YellowCave3_MapAttributes:: @ 82E8748 .4byte 0xc .4byte 0xb .4byte SecretBase_YellowCave3_MapBorder .4byte SecretBase_YellowCave3_MapBlockdata - .4byte SecretBase_YellowCave3_Tileset - .4byte SecretBase_YellowCave3_Tileset2 + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseYellowCave SecretBase_Tree3_MapBorder:: @ 82E8760 .incbin "data/maps/SecretBase_Tree3/border.bin" @@ -2913,13 +2972,14 @@ SecretBase_Tree3_MapBorder:: @ 82E8760 SecretBase_Tree3_MapBlockdata:: @ 82E8768 .incbin "data/maps/SecretBase_Tree3/map.bin" + .align 2 SecretBase_Tree3_MapAttributes:: @ 82E8878 .4byte 0x11 .4byte 0x8 .4byte SecretBase_Tree3_MapBorder .4byte SecretBase_Tree3_MapBlockdata - .4byte SecretBase_Tree3_Tileset - .4byte SecretBase_Tree3_Tileset2 + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseTree SecretBase_Shrub3_MapBorder:: @ 82E8890 .incbin "data/maps/SecretBase_Shrub3/border.bin" @@ -2927,15 +2987,14 @@ SecretBase_Shrub3_MapBorder:: @ 82E8890 SecretBase_Shrub3_MapBlockdata:: @ 82E8898 .incbin "data/maps/SecretBase_Shrub3/map.bin" - .incbin "baserom.gba", 0x2e89b6, 0x2 - + .align 2 SecretBase_Shrub3_MapAttributes:: @ 82E89B8 .4byte 0xd .4byte 0xb .4byte SecretBase_Shrub3_MapBorder .4byte SecretBase_Shrub3_MapBlockdata - .4byte SecretBase_Shrub3_Tileset - .4byte SecretBase_Shrub3_Tileset2 + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseShrub SecretBase_RedCave4_MapBorder:: @ 82E89D0 .incbin "data/maps/SecretBase_RedCave4/border.bin" @@ -2943,15 +3002,14 @@ SecretBase_RedCave4_MapBorder:: @ 82E89D0 SecretBase_RedCave4_MapBlockdata:: @ 82E89D8 .incbin "data/maps/SecretBase_RedCave4/map.bin" - .incbin "baserom.gba", 0x2e8ae6, 0x2 - + .align 2 SecretBase_RedCave4_MapAttributes:: @ 82E8AE8 .4byte 0x9 .4byte 0xf .4byte SecretBase_RedCave4_MapBorder .4byte SecretBase_RedCave4_MapBlockdata - .4byte SecretBase_RedCave4_Tileset - .4byte SecretBase_RedCave4_Tileset2 + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseRedCave SecretBase_BrownCave4_MapBorder:: @ 82E8B00 .incbin "data/maps/SecretBase_BrownCave4/border.bin" @@ -2959,13 +3017,14 @@ SecretBase_BrownCave4_MapBorder:: @ 82E8B00 SecretBase_BrownCave4_MapBlockdata:: @ 82E8B08 .incbin "data/maps/SecretBase_BrownCave4/map.bin" + .align 2 SecretBase_BrownCave4_MapAttributes:: @ 82E8C58 .4byte 0xe .4byte 0xc .4byte SecretBase_BrownCave4_MapBorder .4byte SecretBase_BrownCave4_MapBlockdata - .4byte SecretBase_BrownCave4_Tileset - .4byte SecretBase_BrownCave4_Tileset2 + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseBrownCave SecretBase_BlueCave4_MapBorder:: @ 82E8C70 .incbin "data/maps/SecretBase_BlueCave4/border.bin" @@ -2973,15 +3032,14 @@ SecretBase_BlueCave4_MapBorder:: @ 82E8C70 SecretBase_BlueCave4_MapBlockdata:: @ 82E8C78 .incbin "data/maps/SecretBase_BlueCave4/map.bin" - .incbin "baserom.gba", 0x2e8daa, 0x2 - + .align 2 SecretBase_BlueCave4_MapAttributes:: @ 82E8DAC .4byte 0x9 .4byte 0x11 .4byte SecretBase_BlueCave4_MapBorder .4byte SecretBase_BlueCave4_MapBlockdata - .4byte SecretBase_BlueCave4_Tileset - .4byte SecretBase_BlueCave4_Tileset2 + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseBlueCave SecretBase_YellowCave4_MapBorder:: @ 82E8DC4 .incbin "data/maps/SecretBase_YellowCave4/border.bin" @@ -2989,13 +3047,14 @@ SecretBase_YellowCave4_MapBorder:: @ 82E8DC4 SecretBase_YellowCave4_MapBlockdata:: @ 82E8DCC .incbin "data/maps/SecretBase_YellowCave4/map.bin" + .align 2 SecretBase_YellowCave4_MapAttributes:: @ 82E8F38 .4byte 0xd .4byte 0xe .4byte SecretBase_YellowCave4_MapBorder .4byte SecretBase_YellowCave4_MapBlockdata - .4byte SecretBase_YellowCave4_Tileset - .4byte SecretBase_YellowCave4_Tileset2 + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseYellowCave SecretBase_Tree4_MapBorder:: @ 82E8F50 .incbin "data/maps/SecretBase_Tree4/border.bin" @@ -3003,13 +3062,14 @@ SecretBase_Tree4_MapBorder:: @ 82E8F50 SecretBase_Tree4_MapBlockdata:: @ 82E8F58 .incbin "data/maps/SecretBase_Tree4/map.bin" + .align 2 SecretBase_Tree4_MapAttributes:: @ 82E90E0 .4byte 0xe .4byte 0xe .4byte SecretBase_Tree4_MapBorder .4byte SecretBase_Tree4_MapBlockdata - .4byte SecretBase_Tree4_Tileset - .4byte SecretBase_Tree4_Tileset2 + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseTree SecretBase_Shrub4_MapBorder:: @ 82E90F8 .incbin "data/maps/SecretBase_Shrub4/border.bin" @@ -3017,13 +3077,14 @@ SecretBase_Shrub4_MapBorder:: @ 82E90F8 SecretBase_Shrub4_MapBlockdata:: @ 82E9100 .incbin "data/maps/SecretBase_Shrub4/map.bin" + .align 2 SecretBase_Shrub4_MapAttributes:: @ 82E9234 .4byte 0xe .4byte 0xb .4byte SecretBase_Shrub4_MapBorder .4byte SecretBase_Shrub4_MapBlockdata - .4byte SecretBase_Shrub4_Tileset - .4byte SecretBase_Shrub4_Tileset2 + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseShrub SingleBattleColosseum_MapBorder:: @ 82E924C .incbin "data/maps/SingleBattleColosseum/border.bin" @@ -3031,13 +3092,14 @@ SingleBattleColosseum_MapBorder:: @ 82E924C SingleBattleColosseum_MapBlockdata:: @ 82E9254 .incbin "data/maps/SingleBattleColosseum/map.bin" + .align 2 SingleBattleColosseum_MapAttributes:: @ 82E9350 .4byte 0xe .4byte 0x9 .4byte SingleBattleColosseum_MapBorder .4byte SingleBattleColosseum_MapBlockdata - .4byte SingleBattleColosseum_Tileset - .4byte SingleBattleColosseum_Tileset2 + .4byte gTileset_Building + .4byte gTileset_CableClub TradeCenter_MapBorder:: @ 82E9368 .incbin "data/maps/TradeCenter/border.bin" @@ -3045,13 +3107,14 @@ TradeCenter_MapBorder:: @ 82E9368 TradeCenter_MapBlockdata:: @ 82E9370 .incbin "data/maps/TradeCenter/map.bin" + .align 2 TradeCenter_MapAttributes:: @ 82E9448 .4byte 0xc .4byte 0x9 .4byte TradeCenter_MapBorder .4byte TradeCenter_MapBlockdata - .4byte TradeCenter_Tileset - .4byte TradeCenter_Tileset2 + .4byte gTileset_Building + .4byte gTileset_CableClub RecordCorner_MapBorder:: @ 82E9460 .incbin "data/maps/RecordCorner/border.bin" @@ -3059,13 +3122,14 @@ RecordCorner_MapBorder:: @ 82E9460 RecordCorner_MapBlockdata:: @ 82E9468 .incbin "data/maps/RecordCorner/map.bin" + .align 2 RecordCorner_MapAttributes:: @ 82E95F8 .4byte 0x14 .4byte 0xa .4byte RecordCorner_MapBorder .4byte RecordCorner_MapBlockdata - .4byte RecordCorner_Tileset - .4byte RecordCorner_Tileset2 + .4byte gTileset_Building + .4byte gTileset_CableClub DoubleBattleColosseum_MapBorder:: @ 82E9610 .incbin "data/maps/DoubleBattleColosseum/border.bin" @@ -3073,13 +3137,14 @@ DoubleBattleColosseum_MapBorder:: @ 82E9610 DoubleBattleColosseum_MapBlockdata:: @ 82E9618 .incbin "data/maps/DoubleBattleColosseum/map.bin" + .align 2 DoubleBattleColosseum_MapAttributes:: @ 82E9714 .4byte 0xe .4byte 0x9 .4byte DoubleBattleColosseum_MapBorder .4byte DoubleBattleColosseum_MapBlockdata - .4byte DoubleBattleColosseum_Tileset - .4byte DoubleBattleColosseum_Tileset2 + .4byte gTileset_Building + .4byte gTileset_CableClub LinkContestRoom1_MapBorder:: @ 82E972C .incbin "data/maps/LinkContestRoom1/border.bin" @@ -3087,15 +3152,14 @@ LinkContestRoom1_MapBorder:: @ 82E972C LinkContestRoom1_MapBlockdata:: @ 82E9734 .incbin "data/maps/LinkContestRoom1/map.bin" - .incbin "baserom.gba", 0x2e987e, 0x2 - + .align 2 LinkContestRoom1_MapAttributes:: @ 82E9880 .4byte 0xf .4byte 0xb .4byte LinkContestRoom1_MapBorder .4byte LinkContestRoom1_MapBlockdata - .4byte LinkContestRoom1_Tileset - .4byte LinkContestRoom1_Tileset2 + .4byte gTileset_General + .4byte gTileset_Contest UnknownMap_25_29_MapBorder:: @ 82E9898 .incbin "data/maps/UnknownMap_25_29/border.bin" @@ -3103,15 +3167,14 @@ UnknownMap_25_29_MapBorder:: @ 82E9898 UnknownMap_25_29_MapBlockdata:: @ 82E98A0 .incbin "data/maps/UnknownMap_25_29/map.bin" - .incbin "baserom.gba", 0x2e98a2, 0x2 - + .align 2 UnknownMap_25_29_MapAttributes:: @ 82E98A4 .4byte 0x1 .4byte 0x1 .4byte UnknownMap_25_29_MapBorder .4byte UnknownMap_25_29_MapBlockdata - .4byte UnknownMap_25_29_Tileset - .4byte UnknownMap_25_29_Tileset2 + .4byte gTileset_Building + .4byte gTileset_Contest UnknownMap_25_30_MapBorder:: @ 82E98BC .incbin "data/maps/UnknownMap_25_30/border.bin" @@ -3119,15 +3182,14 @@ UnknownMap_25_30_MapBorder:: @ 82E98BC UnknownMap_25_30_MapBlockdata:: @ 82E98C4 .incbin "data/maps/UnknownMap_25_30/map.bin" - .incbin "baserom.gba", 0x2e98c6, 0x2 - + .align 2 UnknownMap_25_30_MapAttributes:: @ 82E98C8 .4byte 0x1 .4byte 0x1 .4byte UnknownMap_25_30_MapBorder .4byte UnknownMap_25_30_MapBlockdata - .4byte UnknownMap_25_30_Tileset - .4byte UnknownMap_25_30_Tileset2 + .4byte gTileset_Building + .4byte gTileset_Contest UnknownMap_25_31_MapBorder:: @ 82E98E0 .incbin "data/maps/UnknownMap_25_31/border.bin" @@ -3135,15 +3197,14 @@ UnknownMap_25_31_MapBorder:: @ 82E98E0 UnknownMap_25_31_MapBlockdata:: @ 82E98E8 .incbin "data/maps/UnknownMap_25_31/map.bin" - .incbin "baserom.gba", 0x2e98ea, 0x2 - + .align 2 UnknownMap_25_31_MapAttributes:: @ 82E98EC .4byte 0x1 .4byte 0x1 .4byte UnknownMap_25_31_MapBorder .4byte UnknownMap_25_31_MapBlockdata - .4byte UnknownMap_25_31_Tileset - .4byte UnknownMap_25_31_Tileset2 + .4byte gTileset_Building + .4byte gTileset_Contest UnknownMap_25_32_MapBorder:: @ 82E9904 .incbin "data/maps/UnknownMap_25_32/border.bin" @@ -3151,15 +3212,14 @@ UnknownMap_25_32_MapBorder:: @ 82E9904 UnknownMap_25_32_MapBlockdata:: @ 82E990C .incbin "data/maps/UnknownMap_25_32/map.bin" - .incbin "baserom.gba", 0x2e990e, 0x2 - + .align 2 UnknownMap_25_32_MapAttributes:: @ 82E9910 .4byte 0x1 .4byte 0x1 .4byte UnknownMap_25_32_MapBorder .4byte UnknownMap_25_32_MapBlockdata - .4byte UnknownMap_25_32_Tileset - .4byte UnknownMap_25_32_Tileset2 + .4byte gTileset_Building + .4byte gTileset_Contest UnknownMap_25_33_MapBorder:: @ 82E9928 .incbin "data/maps/UnknownMap_25_33/border.bin" @@ -3167,15 +3227,14 @@ UnknownMap_25_33_MapBorder:: @ 82E9928 UnknownMap_25_33_MapBlockdata:: @ 82E9930 .incbin "data/maps/UnknownMap_25_33/map.bin" - .incbin "baserom.gba", 0x2e9932, 0x2 - + .align 2 UnknownMap_25_33_MapAttributes:: @ 82E9934 .4byte 0x1 .4byte 0x1 .4byte UnknownMap_25_33_MapBorder .4byte UnknownMap_25_33_MapBlockdata - .4byte UnknownMap_25_33_Tileset - .4byte UnknownMap_25_33_Tileset2 + .4byte gTileset_Building + .4byte gTileset_Contest UnknownMap_25_34_MapBorder:: @ 82E994C .incbin "data/maps/UnknownMap_25_34/border.bin" @@ -3183,15 +3242,14 @@ UnknownMap_25_34_MapBorder:: @ 82E994C UnknownMap_25_34_MapBlockdata:: @ 82E9954 .incbin "data/maps/UnknownMap_25_34/map.bin" - .incbin "baserom.gba", 0x2e9956, 0x2 - + .align 2 UnknownMap_25_34_MapAttributes:: @ 82E9958 .4byte 0x1 .4byte 0x1 .4byte UnknownMap_25_34_MapBorder .4byte UnknownMap_25_34_MapBlockdata - .4byte UnknownMap_25_34_Tileset - .4byte UnknownMap_25_34_Tileset2 + .4byte gTileset_Building + .4byte gTileset_Contest LinkContestRoom2_MapBorder:: @ 82E9970 .incbin "data/maps/LinkContestRoom2/border.bin" @@ -3199,15 +3257,14 @@ LinkContestRoom2_MapBorder:: @ 82E9970 LinkContestRoom2_MapBlockdata:: @ 82E9978 .incbin "data/maps/LinkContestRoom2/map.bin" - .incbin "baserom.gba", 0x2e9ac2, 0x2 - + .align 2 LinkContestRoom2_MapAttributes:: @ 82E9AC4 .4byte 0xf .4byte 0xb .4byte LinkContestRoom2_MapBorder .4byte LinkContestRoom2_MapBlockdata - .4byte LinkContestRoom2_Tileset - .4byte LinkContestRoom2_Tileset2 + .4byte gTileset_General + .4byte gTileset_Contest LinkContestRoom3_MapBorder:: @ 82E9ADC .incbin "data/maps/LinkContestRoom3/border.bin" @@ -3215,15 +3272,14 @@ LinkContestRoom3_MapBorder:: @ 82E9ADC LinkContestRoom3_MapBlockdata:: @ 82E9AE4 .incbin "data/maps/LinkContestRoom3/map.bin" - .incbin "baserom.gba", 0x2e9c2e, 0x2 - + .align 2 LinkContestRoom3_MapAttributes:: @ 82E9C30 .4byte 0xf .4byte 0xb .4byte LinkContestRoom3_MapBorder .4byte LinkContestRoom3_MapBlockdata - .4byte LinkContestRoom3_Tileset - .4byte LinkContestRoom3_Tileset2 + .4byte gTileset_General + .4byte gTileset_Contest LinkContestRoom4_MapBorder:: @ 82E9C48 .incbin "data/maps/LinkContestRoom4/border.bin" @@ -3231,15 +3287,14 @@ LinkContestRoom4_MapBorder:: @ 82E9C48 LinkContestRoom4_MapBlockdata:: @ 82E9C50 .incbin "data/maps/LinkContestRoom4/map.bin" - .incbin "baserom.gba", 0x2e9d9a, 0x2 - + .align 2 LinkContestRoom4_MapAttributes:: @ 82E9D9C .4byte 0xf .4byte 0xb .4byte LinkContestRoom4_MapBorder .4byte LinkContestRoom4_MapBlockdata - .4byte LinkContestRoom4_Tileset - .4byte LinkContestRoom4_Tileset2 + .4byte gTileset_General + .4byte gTileset_Contest LinkContestRoom5_MapBorder:: @ 82E9DB4 .incbin "data/maps/LinkContestRoom5/border.bin" @@ -3247,15 +3302,14 @@ LinkContestRoom5_MapBorder:: @ 82E9DB4 LinkContestRoom5_MapBlockdata:: @ 82E9DBC .incbin "data/maps/LinkContestRoom5/map.bin" - .incbin "baserom.gba", 0x2e9f06, 0x2 - + .align 2 LinkContestRoom5_MapAttributes:: @ 82E9F08 .4byte 0xf .4byte 0xb .4byte LinkContestRoom5_MapBorder .4byte LinkContestRoom5_MapBlockdata - .4byte LinkContestRoom5_Tileset - .4byte LinkContestRoom5_Tileset2 + .4byte gTileset_General + .4byte gTileset_Contest LinkContestRoom6_MapBorder:: @ 82E9F20 .incbin "data/maps/LinkContestRoom6/border.bin" @@ -3263,15 +3317,14 @@ LinkContestRoom6_MapBorder:: @ 82E9F20 LinkContestRoom6_MapBlockdata:: @ 82E9F28 .incbin "data/maps/LinkContestRoom6/map.bin" - .incbin "baserom.gba", 0x2ea072, 0x2 - + .align 2 LinkContestRoom6_MapAttributes:: @ 82EA074 .4byte 0xf .4byte 0xb .4byte LinkContestRoom6_MapBorder .4byte LinkContestRoom6_MapBlockdata - .4byte LinkContestRoom6_Tileset - .4byte LinkContestRoom6_Tileset2 + .4byte gTileset_General + .4byte gTileset_Contest InsideOfTruck_MapBorder:: @ 82EA08C .incbin "data/maps/InsideOfTruck/border.bin" @@ -3279,15 +3332,14 @@ InsideOfTruck_MapBorder:: @ 82EA08C InsideOfTruck_MapBlockdata:: @ 82EA094 .incbin "data/maps/InsideOfTruck/map.bin" - .incbin "baserom.gba", 0x2ea0c6, 0x2 - + .align 2 InsideOfTruck_MapAttributes:: @ 82EA0C8 .4byte 0x5 .4byte 0x5 .4byte InsideOfTruck_MapBorder .4byte InsideOfTruck_MapBlockdata - .4byte InsideOfTruck_Tileset - .4byte InsideOfTruck_Tileset2 + .4byte gTileset_General + .4byte gTileset_InsideOfTruck SafariZone_Northwest_MapBorder:: @ 82EA0E0 .incbin "data/maps/SafariZone_Northwest/border.bin" @@ -3295,13 +3347,14 @@ SafariZone_Northwest_MapBorder:: @ 82EA0E0 SafariZone_Northwest_MapBlockdata:: @ 82EA0E8 .incbin "data/maps/SafariZone_Northwest/map.bin" + .align 2 SafariZone_Northwest_MapAttributes:: @ 82EAD68 .4byte 0x28 .4byte 0x28 .4byte SafariZone_Northwest_MapBorder .4byte SafariZone_Northwest_MapBlockdata - .4byte SafariZone_Northwest_Tileset - .4byte SafariZone_Northwest_Tileset2 + .4byte gTileset_General + .4byte gTileset_Lilycove SafariZone_Northeast_MapBorder:: @ 82EAD80 .incbin "data/maps/SafariZone_Northeast/border.bin" @@ -3309,13 +3362,14 @@ SafariZone_Northeast_MapBorder:: @ 82EAD80 SafariZone_Northeast_MapBlockdata:: @ 82EAD88 .incbin "data/maps/SafariZone_Northeast/map.bin" + .align 2 SafariZone_Northeast_MapAttributes:: @ 82EBA08 .4byte 0x28 .4byte 0x28 .4byte SafariZone_Northeast_MapBorder .4byte SafariZone_Northeast_MapBlockdata - .4byte SafariZone_Northeast_Tileset - .4byte SafariZone_Northeast_Tileset2 + .4byte gTileset_General + .4byte gTileset_Lilycove SafariZone_Southwest_MapBorder:: @ 82EBA20 .incbin "data/maps/SafariZone_Southwest/border.bin" @@ -3323,13 +3377,14 @@ SafariZone_Southwest_MapBorder:: @ 82EBA20 SafariZone_Southwest_MapBlockdata:: @ 82EBA28 .incbin "data/maps/SafariZone_Southwest/map.bin" + .align 2 SafariZone_Southwest_MapAttributes:: @ 82EC6A8 .4byte 0x28 .4byte 0x28 .4byte SafariZone_Southwest_MapBorder .4byte SafariZone_Southwest_MapBlockdata - .4byte SafariZone_Southwest_Tileset - .4byte SafariZone_Southwest_Tileset2 + .4byte gTileset_General + .4byte gTileset_Lilycove SafariZone_Southeast_MapBorder:: @ 82EC6C0 .incbin "data/maps/SafariZone_Southeast/border.bin" @@ -3337,13 +3392,14 @@ SafariZone_Southeast_MapBorder:: @ 82EC6C0 SafariZone_Southeast_MapBlockdata:: @ 82EC6C8 .incbin "data/maps/SafariZone_Southeast/map.bin" + .align 2 SafariZone_Southeast_MapAttributes:: @ 82ED348 .4byte 0x28 .4byte 0x28 .4byte SafariZone_Southeast_MapBorder .4byte SafariZone_Southeast_MapBlockdata - .4byte SafariZone_Southeast_Tileset - .4byte SafariZone_Southeast_Tileset2 + .4byte gTileset_General + .4byte gTileset_Lilycove .incbin "baserom.gba", 0x2ed360, 0xbe8 @@ -3353,13 +3409,14 @@ Route109_SeashoreHouse_MapBorder:: @ 82EDF48 Route109_SeashoreHouse_MapBlockdata:: @ 82EDF50 .incbin "data/maps/Route109_SeashoreHouse/map.bin" + .align 2 Route109_SeashoreHouse_MapAttributes:: @ 82EE07C .4byte 0xf .4byte 0xa .4byte Route109_SeashoreHouse_MapBorder .4byte Route109_SeashoreHouse_MapBlockdata - .4byte Route109_SeashoreHouse_Tileset - .4byte Route109_SeashoreHouse_Tileset2 + .4byte gTileset_Building + .4byte gTileset_SeashoreHouse Route110_TrickHouseEntrance_MapBorder:: @ 82EE094 .incbin "data/maps/Route110_TrickHouseEntrance/border.bin" @@ -3367,13 +3424,14 @@ Route110_TrickHouseEntrance_MapBorder:: @ 82EE094 Route110_TrickHouseEntrance_MapBlockdata:: @ 82EE09C .incbin "data/maps/Route110_TrickHouseEntrance/map.bin" + .align 2 Route110_TrickHouseEntrance_MapAttributes:: @ 82EE15C .4byte 0xc .4byte 0x8 .4byte Route110_TrickHouseEntrance_MapBorder .4byte Route110_TrickHouseEntrance_MapBlockdata - .4byte Route110_TrickHouseEntrance_Tileset - .4byte Route110_TrickHouseEntrance_Tileset2 + .4byte gTileset_Building + .4byte gTileset_GenericBuilding Route110_TrickHouseEnd_MapBorder:: @ 82EE174 .incbin "data/maps/Route110_TrickHouseEnd/border.bin" @@ -3381,13 +3439,14 @@ Route110_TrickHouseEnd_MapBorder:: @ 82EE174 Route110_TrickHouseEnd_MapBlockdata:: @ 82EE17C .incbin "data/maps/Route110_TrickHouseEnd/map.bin" + .align 2 Route110_TrickHouseEnd_MapAttributes:: @ 82EE23C .4byte 0xc .4byte 0x8 .4byte Route110_TrickHouseEnd_MapBorder .4byte Route110_TrickHouseEnd_MapBlockdata - .4byte Route110_TrickHouseEnd_Tileset - .4byte Route110_TrickHouseEnd_Tileset2 + .4byte gTileset_Building + .4byte gTileset_GenericBuilding Route110_TrickHouseCorridor_MapBorder:: @ 82EE254 .incbin "data/maps/Route110_TrickHouseCorridor/border.bin" @@ -3395,13 +3454,14 @@ Route110_TrickHouseCorridor_MapBorder:: @ 82EE254 Route110_TrickHouseCorridor_MapBlockdata:: @ 82EE25C .incbin "data/maps/Route110_TrickHouseCorridor/map.bin" + .align 2 Route110_TrickHouseCorridor_MapAttributes:: @ 82EE52C .4byte 0xf .4byte 0x18 .4byte Route110_TrickHouseCorridor_MapBorder .4byte Route110_TrickHouseCorridor_MapBlockdata - .4byte Route110_TrickHouseCorridor_Tileset - .4byte Route110_TrickHouseCorridor_Tileset2 + .4byte gTileset_Building + .4byte gTileset_GenericBuilding Route110_TrickHousePuzzle1_MapBorder:: @ 82EE544 .incbin "data/maps/Route110_TrickHousePuzzle1/border.bin" @@ -3409,13 +3469,14 @@ Route110_TrickHousePuzzle1_MapBorder:: @ 82EE544 Route110_TrickHousePuzzle1_MapBlockdata:: @ 82EE54C .incbin "data/maps/Route110_TrickHousePuzzle1/map.bin" + .align 2 Route110_TrickHousePuzzle1_MapAttributes:: @ 82EE7E0 .4byte 0xf .4byte 0x16 .4byte Route110_TrickHousePuzzle1_MapBorder .4byte Route110_TrickHousePuzzle1_MapBlockdata - .4byte Route110_TrickHousePuzzle1_Tileset - .4byte Route110_TrickHousePuzzle1_Tileset2 + .4byte gTileset_Building + .4byte gTileset_TrickHousePuzzle Route110_TrickHousePuzzle2_MapBorder:: @ 82EE7F8 .incbin "data/maps/Route110_TrickHousePuzzle2/border.bin" @@ -3423,13 +3484,14 @@ Route110_TrickHousePuzzle2_MapBorder:: @ 82EE7F8 Route110_TrickHousePuzzle2_MapBlockdata:: @ 82EE800 .incbin "data/maps/Route110_TrickHousePuzzle2/map.bin" + .align 2 Route110_TrickHousePuzzle2_MapAttributes:: @ 82EEA94 .4byte 0xf .4byte 0x16 .4byte Route110_TrickHousePuzzle2_MapBorder .4byte Route110_TrickHousePuzzle2_MapBlockdata - .4byte Route110_TrickHousePuzzle2_Tileset - .4byte Route110_TrickHousePuzzle2_Tileset2 + .4byte gTileset_Building + .4byte gTileset_TrickHousePuzzle Route110_TrickHousePuzzle3_MapBorder:: @ 82EEAAC .incbin "data/maps/Route110_TrickHousePuzzle3/border.bin" @@ -3437,13 +3499,14 @@ Route110_TrickHousePuzzle3_MapBorder:: @ 82EEAAC Route110_TrickHousePuzzle3_MapBlockdata:: @ 82EEAB4 .incbin "data/maps/Route110_TrickHousePuzzle3/map.bin" + .align 2 Route110_TrickHousePuzzle3_MapAttributes:: @ 82EED48 .4byte 0xf .4byte 0x16 .4byte Route110_TrickHousePuzzle3_MapBorder .4byte Route110_TrickHousePuzzle3_MapBlockdata - .4byte Route110_TrickHousePuzzle3_Tileset - .4byte Route110_TrickHousePuzzle3_Tileset2 + .4byte gTileset_Building + .4byte gTileset_TrickHousePuzzle Route110_TrickHousePuzzle4_MapBorder:: @ 82EED60 .incbin "data/maps/Route110_TrickHousePuzzle4/border.bin" @@ -3451,13 +3514,14 @@ Route110_TrickHousePuzzle4_MapBorder:: @ 82EED60 Route110_TrickHousePuzzle4_MapBlockdata:: @ 82EED68 .incbin "data/maps/Route110_TrickHousePuzzle4/map.bin" + .align 2 Route110_TrickHousePuzzle4_MapAttributes:: @ 82EEFFC .4byte 0xf .4byte 0x16 .4byte Route110_TrickHousePuzzle4_MapBorder .4byte Route110_TrickHousePuzzle4_MapBlockdata - .4byte Route110_TrickHousePuzzle4_Tileset - .4byte Route110_TrickHousePuzzle4_Tileset2 + .4byte gTileset_Building + .4byte gTileset_TrickHousePuzzle Route110_TrickHousePuzzle5_MapBorder:: @ 82EF014 .incbin "data/maps/Route110_TrickHousePuzzle5/border.bin" @@ -3465,13 +3529,14 @@ Route110_TrickHousePuzzle5_MapBorder:: @ 82EF014 Route110_TrickHousePuzzle5_MapBlockdata:: @ 82EF01C .incbin "data/maps/Route110_TrickHousePuzzle5/map.bin" + .align 2 Route110_TrickHousePuzzle5_MapAttributes:: @ 82EF2B0 .4byte 0xf .4byte 0x16 .4byte Route110_TrickHousePuzzle5_MapBorder .4byte Route110_TrickHousePuzzle5_MapBlockdata - .4byte Route110_TrickHousePuzzle5_Tileset - .4byte Route110_TrickHousePuzzle5_Tileset2 + .4byte gTileset_Building + .4byte gTileset_TrickHousePuzzle Route110_TrickHousePuzzle6_MapBorder:: @ 82EF2C8 .incbin "data/maps/Route110_TrickHousePuzzle6/border.bin" @@ -3479,13 +3544,14 @@ Route110_TrickHousePuzzle6_MapBorder:: @ 82EF2C8 Route110_TrickHousePuzzle6_MapBlockdata:: @ 82EF2D0 .incbin "data/maps/Route110_TrickHousePuzzle6/map.bin" + .align 2 Route110_TrickHousePuzzle6_MapAttributes:: @ 82EF564 .4byte 0xf .4byte 0x16 .4byte Route110_TrickHousePuzzle6_MapBorder .4byte Route110_TrickHousePuzzle6_MapBlockdata - .4byte Route110_TrickHousePuzzle6_Tileset - .4byte Route110_TrickHousePuzzle6_Tileset2 + .4byte gTileset_Building + .4byte gTileset_TrickHousePuzzle Route110_TrickHousePuzzle7_MapBorder:: @ 82EF57C .incbin "data/maps/Route110_TrickHousePuzzle7/border.bin" @@ -3493,13 +3559,14 @@ Route110_TrickHousePuzzle7_MapBorder:: @ 82EF57C Route110_TrickHousePuzzle7_MapBlockdata:: @ 82EF584 .incbin "data/maps/Route110_TrickHousePuzzle7/map.bin" + .align 2 Route110_TrickHousePuzzle7_MapAttributes:: @ 82EF818 .4byte 0xf .4byte 0x16 .4byte Route110_TrickHousePuzzle7_MapBorder .4byte Route110_TrickHousePuzzle7_MapBlockdata - .4byte Route110_TrickHousePuzzle7_Tileset - .4byte Route110_TrickHousePuzzle7_Tileset2 + .4byte gTileset_Building + .4byte gTileset_TrickHousePuzzle Route110_TrickHousePuzzle8_MapBorder:: @ 82EF830 .incbin "data/maps/Route110_TrickHousePuzzle8/border.bin" @@ -3507,13 +3574,14 @@ Route110_TrickHousePuzzle8_MapBorder:: @ 82EF830 Route110_TrickHousePuzzle8_MapBlockdata:: @ 82EF838 .incbin "data/maps/Route110_TrickHousePuzzle8/map.bin" + .align 2 Route110_TrickHousePuzzle8_MapAttributes:: @ 82EFACC .4byte 0xf .4byte 0x16 .4byte Route110_TrickHousePuzzle8_MapBorder .4byte Route110_TrickHousePuzzle8_MapBlockdata - .4byte Route110_TrickHousePuzzle8_Tileset - .4byte Route110_TrickHousePuzzle8_Tileset2 + .4byte gTileset_Building + .4byte gTileset_TrickHousePuzzle FortreeCity_DecorationShop_MapBorder:: @ 82EFAE4 .incbin "data/maps/FortreeCity_DecorationShop/border.bin" @@ -3521,13 +3589,14 @@ FortreeCity_DecorationShop_MapBorder:: @ 82EFAE4 FortreeCity_DecorationShop_MapBlockdata:: @ 82EFAEC .incbin "data/maps/FortreeCity_DecorationShop/map.bin" + .align 2 FortreeCity_DecorationShop_MapAttributes:: @ 82EFB4C .4byte 0x8 .4byte 0x6 .4byte FortreeCity_DecorationShop_MapBorder .4byte FortreeCity_DecorationShop_MapBlockdata - .4byte FortreeCity_DecorationShop_Tileset - .4byte FortreeCity_DecorationShop_Tileset2 + .4byte gTileset_Building + .4byte gTileset_GenericBuilding Route110_SeasideCyclingRoadSouthEntrance_MapBorder:: @ 82EFB64 .incbin "data/maps/Route110_SeasideCyclingRoadSouthEntrance/border.bin" @@ -3535,14 +3604,15 @@ Route110_SeasideCyclingRoadSouthEntrance_MapBorder:: @ 82EFB64 Route110_SeasideCyclingRoadSouthEntrance_MapBlockdata:: @ 82EFB6C .incbin "data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.bin" + .align 2 Route110_SeasideCyclingRoadNorthEntrance_MapAttributes:: @ 82EFC20 Route110_SeasideCyclingRoadSouthEntrance_MapAttributes:: @ 82EFC20 .4byte 0xf .4byte 0x6 .4byte Route110_SeasideCyclingRoadSouthEntrance_MapBorder .4byte Route110_SeasideCyclingRoadSouthEntrance_MapBlockdata - .4byte Route110_SeasideCyclingRoadSouthEntrance_Tileset - .4byte Route110_SeasideCyclingRoadSouthEntrance_Tileset2 + .4byte gTileset_Building + .4byte gTileset_Shop LilycoveCity_DepartmentStore_1F_MapBorder:: @ 82EFC38 .incbin "data/maps/LilycoveCity_DepartmentStore_1F/border.bin" @@ -3550,13 +3620,14 @@ LilycoveCity_DepartmentStore_1F_MapBorder:: @ 82EFC38 LilycoveCity_DepartmentStore_1F_MapBlockdata:: @ 82EFC40 .incbin "data/maps/LilycoveCity_DepartmentStore_1F/map.bin" + .align 2 LilycoveCity_DepartmentStore_1F_MapAttributes:: @ 82EFD60 .4byte 0x12 .4byte 0x8 .4byte LilycoveCity_DepartmentStore_1F_MapBorder .4byte LilycoveCity_DepartmentStore_1F_MapBlockdata - .4byte LilycoveCity_DepartmentStore_1F_Tileset - .4byte LilycoveCity_DepartmentStore_1F_Tileset2 + .4byte gTileset_Building + .4byte gTileset_Shop LilycoveCity_DepartmentStore_2F_MapBorder:: @ 82EFD78 .incbin "data/maps/LilycoveCity_DepartmentStore_2F/border.bin" @@ -3564,13 +3635,14 @@ LilycoveCity_DepartmentStore_2F_MapBorder:: @ 82EFD78 LilycoveCity_DepartmentStore_2F_MapBlockdata:: @ 82EFD80 .incbin "data/maps/LilycoveCity_DepartmentStore_2F/map.bin" + .align 2 LilycoveCity_DepartmentStore_2F_MapAttributes:: @ 82EFEA0 .4byte 0x12 .4byte 0x8 .4byte LilycoveCity_DepartmentStore_2F_MapBorder .4byte LilycoveCity_DepartmentStore_2F_MapBlockdata - .4byte LilycoveCity_DepartmentStore_2F_Tileset - .4byte LilycoveCity_DepartmentStore_2F_Tileset2 + .4byte gTileset_Building + .4byte gTileset_Shop LilycoveCity_DepartmentStore_3F_MapBorder:: @ 82EFEB8 .incbin "data/maps/LilycoveCity_DepartmentStore_3F/border.bin" @@ -3578,13 +3650,14 @@ LilycoveCity_DepartmentStore_3F_MapBorder:: @ 82EFEB8 LilycoveCity_DepartmentStore_3F_MapBlockdata:: @ 82EFEC0 .incbin "data/maps/LilycoveCity_DepartmentStore_3F/map.bin" + .align 2 LilycoveCity_DepartmentStore_3F_MapAttributes:: @ 82EFFE0 .4byte 0x12 .4byte 0x8 .4byte LilycoveCity_DepartmentStore_3F_MapBorder .4byte LilycoveCity_DepartmentStore_3F_MapBlockdata - .4byte LilycoveCity_DepartmentStore_3F_Tileset - .4byte LilycoveCity_DepartmentStore_3F_Tileset2 + .4byte gTileset_Building + .4byte gTileset_Shop LilycoveCity_DepartmentStore_4F_MapBorder:: @ 82EFFF8 .incbin "data/maps/LilycoveCity_DepartmentStore_4F/border.bin" @@ -3592,13 +3665,14 @@ LilycoveCity_DepartmentStore_4F_MapBorder:: @ 82EFFF8 LilycoveCity_DepartmentStore_4F_MapBlockdata:: @ 82F0000 .incbin "data/maps/LilycoveCity_DepartmentStore_4F/map.bin" + .align 2 LilycoveCity_DepartmentStore_4F_MapAttributes:: @ 82F0120 .4byte 0x12 .4byte 0x8 .4byte LilycoveCity_DepartmentStore_4F_MapBorder .4byte LilycoveCity_DepartmentStore_4F_MapBlockdata - .4byte LilycoveCity_DepartmentStore_4F_Tileset - .4byte LilycoveCity_DepartmentStore_4F_Tileset2 + .4byte gTileset_Building + .4byte gTileset_Shop LilycoveCity_DepartmentStore_5F_MapBorder:: @ 82F0138 .incbin "data/maps/LilycoveCity_DepartmentStore_5F/border.bin" @@ -3606,13 +3680,14 @@ LilycoveCity_DepartmentStore_5F_MapBorder:: @ 82F0138 LilycoveCity_DepartmentStore_5F_MapBlockdata:: @ 82F0140 .incbin "data/maps/LilycoveCity_DepartmentStore_5F/map.bin" + .align 2 LilycoveCity_DepartmentStore_5F_MapAttributes:: @ 82F0260 .4byte 0x12 .4byte 0x8 .4byte LilycoveCity_DepartmentStore_5F_MapBorder .4byte LilycoveCity_DepartmentStore_5F_MapBlockdata - .4byte LilycoveCity_DepartmentStore_5F_Tileset - .4byte LilycoveCity_DepartmentStore_5F_Tileset2 + .4byte gTileset_Building + .4byte gTileset_Shop LilycoveCity_DepartmentStoreRooftop_MapBorder:: @ 82F0278 .incbin "data/maps/LilycoveCity_DepartmentStoreRooftop/border.bin" @@ -3620,13 +3695,14 @@ LilycoveCity_DepartmentStoreRooftop_MapBorder:: @ 82F0278 LilycoveCity_DepartmentStoreRooftop_MapBlockdata:: @ 82F0280 .incbin "data/maps/LilycoveCity_DepartmentStoreRooftop/map.bin" + .align 2 LilycoveCity_DepartmentStoreRooftop_MapAttributes:: @ 82F0430 .4byte 0x12 .4byte 0xc .4byte LilycoveCity_DepartmentStoreRooftop_MapBorder .4byte LilycoveCity_DepartmentStoreRooftop_MapBlockdata - .4byte LilycoveCity_DepartmentStoreRooftop_Tileset - .4byte LilycoveCity_DepartmentStoreRooftop_Tileset2 + .4byte gTileset_Building + .4byte gTileset_Shop Route130_MapBorder:: @ 82F0448 .incbin "data/maps/Route130/border.bin" @@ -3634,13 +3710,14 @@ Route130_MapBorder:: @ 82F0448 Route130_MapBlockdata:: @ 82F0450 .incbin "data/maps/Route130/map.bin" + .align 2 Route130_MapAttributes:: @ 82F1D50 .4byte 0x50 .4byte 0x28 .4byte Route130_MapBorder .4byte Route130_MapBlockdata - .4byte Route130_Tileset - .4byte Route130_Tileset2 + .4byte gTileset_General + .4byte gTileset_Cave BattleTower_Lobby_MapBorder:: @ 82F1D68 .incbin "data/maps/BattleTower_Lobby/border.bin" @@ -3648,13 +3725,14 @@ BattleTower_Lobby_MapBorder:: @ 82F1D68 BattleTower_Lobby_MapBlockdata:: @ 82F1D70 .incbin "data/maps/BattleTower_Lobby/map.bin" + .align 2 BattleTower_Lobby_MapAttributes:: @ 82F1E6C .4byte 0xe .4byte 0x9 .4byte BattleTower_Lobby_MapBorder .4byte BattleTower_Lobby_MapBlockdata - .4byte BattleTower_Lobby_Tileset - .4byte BattleTower_Lobby_Tileset2 + .4byte gTileset_Building + .4byte gTileset_BattleTower BattleTower_Outside_MapBorder:: @ 82F1E84 .incbin "data/maps/BattleTower_Outside/border.bin" @@ -3662,13 +3740,14 @@ BattleTower_Outside_MapBorder:: @ 82F1E84 BattleTower_Outside_MapBlockdata:: @ 82F1E8C .incbin "data/maps/BattleTower_Outside/map.bin" + .align 2 BattleTower_Outside_MapAttributes:: @ 82F2558 .4byte 0x1d .4byte 0x1e .4byte BattleTower_Outside_MapBorder .4byte BattleTower_Outside_MapBlockdata - .4byte BattleTower_Outside_Tileset - .4byte BattleTower_Outside_Tileset2 + .4byte gTileset_General + .4byte gTileset_Dewford BattleTower_Elevator_MapBorder:: @ 82F2570 .incbin "data/maps/BattleTower_Elevator/border.bin" @@ -3676,13 +3755,14 @@ BattleTower_Elevator_MapBorder:: @ 82F2570 BattleTower_Elevator_MapBlockdata:: @ 82F2578 .incbin "data/maps/BattleTower_Elevator/map.bin" + .align 2 BattleTower_Elevator_MapAttributes:: @ 82F25B0 .4byte 0x4 .4byte 0x7 .4byte BattleTower_Elevator_MapBorder .4byte BattleTower_Elevator_MapBlockdata - .4byte BattleTower_Elevator_Tileset - .4byte BattleTower_Elevator_Tileset2 + .4byte gTileset_Building + .4byte gTileset_BattleTower BattleTower_Corridor_MapBorder:: @ 82F25C8 .incbin "data/maps/BattleTower_Corridor/border.bin" @@ -3690,15 +3770,14 @@ BattleTower_Corridor_MapBorder:: @ 82F25C8 BattleTower_Corridor_MapBlockdata:: @ 82F25D0 .incbin "data/maps/BattleTower_Corridor/map.bin" - .incbin "baserom.gba", 0x2f267a, 0x2 - + .align 2 BattleTower_Corridor_MapAttributes:: @ 82F267C .4byte 0x11 .4byte 0x5 .4byte BattleTower_Corridor_MapBorder .4byte BattleTower_Corridor_MapBlockdata - .4byte BattleTower_Corridor_Tileset - .4byte BattleTower_Corridor_Tileset2 + .4byte gTileset_Building + .4byte gTileset_BattleTower BattleTower_BattleRoom_MapBorder:: @ 82F2694 .incbin "data/maps/BattleTower_BattleRoom/border.bin" @@ -3706,13 +3785,14 @@ BattleTower_BattleRoom_MapBorder:: @ 82F2694 BattleTower_BattleRoom_MapBlockdata:: @ 82F269C .incbin "data/maps/BattleTower_BattleRoom/map.bin" + .align 2 BattleTower_BattleRoom_MapAttributes:: @ 82F2750 .4byte 0xa .4byte 0x9 .4byte BattleTower_BattleRoom_MapBorder .4byte BattleTower_BattleRoom_MapBlockdata - .4byte BattleTower_BattleRoom_Tileset - .4byte BattleTower_BattleRoom_Tileset2 + .4byte gTileset_Building + .4byte gTileset_BattleTower RustboroCity_DevonCorp_3F_MapBorder:: @ 82F2768 .incbin "data/maps/RustboroCity_DevonCorp_3F/border.bin" @@ -3720,15 +3800,14 @@ RustboroCity_DevonCorp_3F_MapBorder:: @ 82F2768 RustboroCity_DevonCorp_3F_MapBlockdata:: @ 82F2770 .incbin "data/maps/RustboroCity_DevonCorp_3F/map.bin" - .incbin "baserom.gba", 0x2f28c6, 0x2 - + .align 2 RustboroCity_DevonCorp_3F_MapAttributes:: @ 82F28C8 .4byte 0x13 .4byte 0x9 .4byte RustboroCity_DevonCorp_3F_MapBorder .4byte RustboroCity_DevonCorp_3F_MapBlockdata - .4byte RustboroCity_DevonCorp_3F_Tileset - .4byte RustboroCity_DevonCorp_3F_Tileset2 + .4byte gTileset_General + .4byte gTileset_Facility EverGrandeCity_PokemonLeague_MapBorder:: @ 82F28E0 .incbin "data/maps/EverGrandeCity_PokemonLeague/border.bin" @@ -3736,13 +3815,14 @@ EverGrandeCity_PokemonLeague_MapBorder:: @ 82F28E0 EverGrandeCity_PokemonLeague_MapBlockdata:: @ 82F28E8 .incbin "data/maps/EverGrandeCity_PokemonLeague/map.bin" + .align 2 EverGrandeCity_PokemonLeague_MapAttributes:: @ 82F2AB0 .4byte 0x13 .4byte 0xc .4byte EverGrandeCity_PokemonLeague_MapBorder .4byte EverGrandeCity_PokemonLeague_MapBlockdata - .4byte EverGrandeCity_PokemonLeague_Tileset - .4byte EverGrandeCity_PokemonLeague_Tileset2 + .4byte gTileset_Building + .4byte gTileset_PokemonCenter Route119_WeatherInstitute_1F_MapBorder:: @ 82F2AC8 .incbin "data/maps/Route119_WeatherInstitute_1F/border.bin" @@ -3750,13 +3830,14 @@ Route119_WeatherInstitute_1F_MapBorder:: @ 82F2AC8 Route119_WeatherInstitute_1F_MapBlockdata:: @ 82F2AD0 .incbin "data/maps/Route119_WeatherInstitute_1F/map.bin" + .align 2 Route119_WeatherInstitute_1F_MapAttributes:: @ 82F2CD8 .4byte 0x14 .4byte 0xd .4byte Route119_WeatherInstitute_1F_MapBorder .4byte Route119_WeatherInstitute_1F_MapBlockdata - .4byte Route119_WeatherInstitute_1F_Tileset - .4byte Route119_WeatherInstitute_1F_Tileset2 + .4byte gTileset_Building + .4byte gTileset_Lab Route119_WeatherInstitute_2F_MapBorder:: @ 82F2CF0 .incbin "data/maps/Route119_WeatherInstitute_2F/border.bin" @@ -3764,13 +3845,14 @@ Route119_WeatherInstitute_2F_MapBorder:: @ 82F2CF0 Route119_WeatherInstitute_2F_MapBlockdata:: @ 82F2CF8 .incbin "data/maps/Route119_WeatherInstitute_2F/map.bin" + .align 2 Route119_WeatherInstitute_2F_MapAttributes:: @ 82F2EB0 .4byte 0x14 .4byte 0xb .4byte Route119_WeatherInstitute_2F_MapBorder .4byte Route119_WeatherInstitute_2F_MapBlockdata - .4byte Route119_WeatherInstitute_2F_Tileset - .4byte Route119_WeatherInstitute_2F_Tileset2 + .4byte gTileset_Building + .4byte gTileset_Lab LilycoveCity_DepartmentStoreElevator_MapBorder:: @ 82F2EC8 .incbin "data/maps/LilycoveCity_DepartmentStoreElevator/border.bin" @@ -3778,13 +3860,14 @@ LilycoveCity_DepartmentStoreElevator_MapBorder:: @ 82F2EC8 LilycoveCity_DepartmentStoreElevator_MapBlockdata:: @ 82F2ED0 .incbin "data/maps/LilycoveCity_DepartmentStoreElevator/map.bin" + .align 2 LilycoveCity_DepartmentStoreElevator_MapAttributes:: @ 82F2F00 .4byte 0x4 .4byte 0x6 .4byte LilycoveCity_DepartmentStoreElevator_MapBorder .4byte LilycoveCity_DepartmentStoreElevator_MapBlockdata - .4byte LilycoveCity_DepartmentStoreElevator_Tileset - .4byte LilycoveCity_DepartmentStoreElevator_Tileset2 + .4byte gTileset_Building + .4byte gTileset_BattleTower Underwater1_MapBorder:: @ 82F2F18 .incbin "data/maps/Underwater1/border.bin" @@ -3792,13 +3875,14 @@ Underwater1_MapBorder:: @ 82F2F18 Underwater1_MapBlockdata:: @ 82F2F20 .incbin "data/maps/Underwater1/map.bin" + .align 2 Underwater1_MapAttributes:: @ 82F6120 .4byte 0x50 .4byte 0x50 .4byte Underwater1_MapBorder .4byte Underwater1_MapBlockdata - .4byte Underwater1_Tileset - .4byte Underwater1_Tileset2 + .4byte gTileset_General + .4byte gTileset_Underwater MossdeepCity_SpaceCenter_1F_MapBorder:: @ 82F6138 .incbin "data/maps/MossdeepCity_SpaceCenter_1F/border.bin" @@ -3806,13 +3890,14 @@ MossdeepCity_SpaceCenter_1F_MapBorder:: @ 82F6138 MossdeepCity_SpaceCenter_1F_MapBlockdata:: @ 82F6140 .incbin "data/maps/MossdeepCity_SpaceCenter_1F/map.bin" + .align 2 MossdeepCity_SpaceCenter_1F_MapAttributes:: @ 82F6280 .4byte 0x10 .4byte 0xa .4byte MossdeepCity_SpaceCenter_1F_MapBorder .4byte MossdeepCity_SpaceCenter_1F_MapBlockdata - .4byte MossdeepCity_SpaceCenter_1F_Tileset - .4byte MossdeepCity_SpaceCenter_1F_Tileset2 + .4byte gTileset_General + .4byte gTileset_Facility MossdeepCity_SpaceCenter_2F_MapBorder:: @ 82F6298 .incbin "data/maps/MossdeepCity_SpaceCenter_2F/border.bin" @@ -3820,13 +3905,14 @@ MossdeepCity_SpaceCenter_2F_MapBorder:: @ 82F6298 MossdeepCity_SpaceCenter_2F_MapBlockdata:: @ 82F62A0 .incbin "data/maps/MossdeepCity_SpaceCenter_2F/map.bin" + .align 2 MossdeepCity_SpaceCenter_2F_MapAttributes:: @ 82F63E0 .4byte 0x10 .4byte 0xa .4byte MossdeepCity_SpaceCenter_2F_MapBorder .4byte MossdeepCity_SpaceCenter_2F_MapBlockdata - .4byte MossdeepCity_SpaceCenter_2F_Tileset - .4byte MossdeepCity_SpaceCenter_2F_Tileset2 + .4byte gTileset_General + .4byte gTileset_Facility SSTidalCorridor_MapBorder:: @ 82F63F8 .incbin "data/maps/SSTidalCorridor/border.bin" @@ -3834,13 +3920,14 @@ SSTidalCorridor_MapBorder:: @ 82F63F8 SSTidalCorridor_MapBlockdata:: @ 82F6400 .incbin "data/maps/SSTidalCorridor/map.bin" + .align 2 SSTidalCorridor_MapAttributes:: @ 82F65D4 .4byte 0x12 .4byte 0xd .4byte SSTidalCorridor_MapBorder .4byte SSTidalCorridor_MapBlockdata - .4byte SSTidalCorridor_Tileset - .4byte SSTidalCorridor_Tileset2 + .4byte gTileset_General + .4byte gTileset_Ship SSTidalLowerDeck_MapBorder:: @ 82F65EC .incbin "data/maps/SSTidalLowerDeck/border.bin" @@ -3848,15 +3935,14 @@ SSTidalLowerDeck_MapBorder:: @ 82F65EC SSTidalLowerDeck_MapBlockdata:: @ 82F65F4 .incbin "data/maps/SSTidalLowerDeck/map.bin" - .incbin "baserom.gba", 0x2f67ae, 0x2 - + .align 2 SSTidalLowerDeck_MapAttributes:: @ 82F67B0 .4byte 0x11 .4byte 0xd .4byte SSTidalLowerDeck_MapBorder .4byte SSTidalLowerDeck_MapBlockdata - .4byte SSTidalLowerDeck_Tileset - .4byte SSTidalLowerDeck_Tileset2 + .4byte gTileset_General + .4byte gTileset_Ship SSTidalRooms_MapBorder:: @ 82F67C8 .incbin "data/maps/SSTidalRooms/border.bin" @@ -3864,13 +3950,14 @@ SSTidalRooms_MapBorder:: @ 82F67C8 SSTidalRooms_MapBlockdata:: @ 82F67D0 .incbin "data/maps/SSTidalRooms/map.bin" + .align 2 SSTidalRooms_MapAttributes:: @ 82F6CE0 .4byte 0x24 .4byte 0x12 .4byte SSTidalRooms_MapBorder .4byte SSTidalRooms_MapBlockdata - .4byte SSTidalRooms_Tileset - .4byte SSTidalRooms_Tileset2 + .4byte gTileset_General + .4byte gTileset_Ship IslandCave_MapBorder:: @ 82F6CF8 .incbin "data/maps/IslandCave/border.bin" @@ -3878,15 +3965,14 @@ IslandCave_MapBorder:: @ 82F6CF8 IslandCave_MapBlockdata:: @ 82F6D00 .incbin "data/maps/IslandCave/map.bin" - .incbin "baserom.gba", 0x2f7162, 0x2 - + .align 2 IslandCave_MapAttributes:: @ 82F7164 .4byte 0x11 .4byte 0x21 .4byte IslandCave_MapBorder .4byte IslandCave_MapBlockdata - .4byte IslandCave_Tileset - .4byte IslandCave_Tileset2 + .4byte gTileset_General + .4byte gTileset_Cave AncientTomb_MapBorder:: @ 82F717C .incbin "data/maps/AncientTomb/border.bin" @@ -3894,15 +3980,14 @@ AncientTomb_MapBorder:: @ 82F717C AncientTomb_MapBlockdata:: @ 82F7184 .incbin "data/maps/AncientTomb/map.bin" - .incbin "baserom.gba", 0x2f75e6, 0x2 - + .align 2 AncientTomb_MapAttributes:: @ 82F75E8 .4byte 0x11 .4byte 0x21 .4byte AncientTomb_MapBorder .4byte AncientTomb_MapBlockdata - .4byte AncientTomb_Tileset - .4byte AncientTomb_Tileset2 + .4byte gTileset_General + .4byte gTileset_Cave Underwater_Route134_MapBorder:: @ 82F7600 .incbin "data/maps/Underwater_Route134/border.bin" @@ -3910,13 +3995,14 @@ Underwater_Route134_MapBorder:: @ 82F7600 Underwater_Route134_MapBlockdata:: @ 82F7608 .incbin "data/maps/Underwater_Route134/map.bin" + .align 2 Underwater_Route134_MapAttributes:: @ 82F7770 .4byte 0x12 .4byte 0xa .4byte Underwater_Route134_MapBorder .4byte Underwater_Route134_MapBlockdata - .4byte Underwater_Route134_Tileset - .4byte Underwater_Route134_Tileset2 + .4byte gTileset_General + .4byte gTileset_Underwater Underwater_SealedChamber_MapBorder:: @ 82F7788 .incbin "data/maps/Underwater_SealedChamber/border.bin" @@ -3924,13 +4010,14 @@ Underwater_SealedChamber_MapBorder:: @ 82F7788 Underwater_SealedChamber_MapBlockdata:: @ 82F7790 .incbin "data/maps/Underwater_SealedChamber/map.bin" + .align 2 Underwater_SealedChamber_MapAttributes:: @ 82F7FD0 .4byte 0x16 .4byte 0x30 .4byte Underwater_SealedChamber_MapBorder .4byte Underwater_SealedChamber_MapBlockdata - .4byte Underwater_SealedChamber_Tileset - .4byte Underwater_SealedChamber_Tileset2 + .4byte gTileset_General + .4byte gTileset_Underwater SealedChamber_OuterRoom_MapBorder:: @ 82F7FE8 .incbin "data/maps/SealedChamber_OuterRoom/border.bin" @@ -3938,15 +4025,14 @@ SealedChamber_OuterRoom_MapBorder:: @ 82F7FE8 SealedChamber_OuterRoom_MapBlockdata:: @ 82F7FF0 .incbin "data/maps/SealedChamber_OuterRoom/map.bin" - .incbin "baserom.gba", 0x2f83b6, 0x2 - + .align 2 SealedChamber_OuterRoom_MapAttributes:: @ 82F83B8 .4byte 0x15 .4byte 0x17 .4byte SealedChamber_OuterRoom_MapBorder .4byte SealedChamber_OuterRoom_MapBlockdata - .4byte SealedChamber_OuterRoom_Tileset - .4byte SealedChamber_OuterRoom_Tileset2 + .4byte gTileset_General + .4byte gTileset_Cave VictoryRoad_B1F_MapBorder:: @ 82F83D0 .incbin "data/maps/VictoryRoad_B1F/border.bin" @@ -3954,13 +4040,14 @@ VictoryRoad_B1F_MapBorder:: @ 82F83D0 VictoryRoad_B1F_MapBlockdata:: @ 82F83D8 .incbin "data/maps/VictoryRoad_B1F/map.bin" + .align 2 VictoryRoad_B1F_MapAttributes:: @ 82F8EFC .4byte 0x2e .4byte 0x1f .4byte VictoryRoad_B1F_MapBorder .4byte VictoryRoad_B1F_MapBlockdata - .4byte VictoryRoad_B1F_Tileset - .4byte VictoryRoad_B1F_Tileset2 + .4byte gTileset_General + .4byte gTileset_Cave VictoryRoad_B2F_MapBorder:: @ 82F8F14 .incbin "data/maps/VictoryRoad_B2F/border.bin" @@ -3968,13 +4055,14 @@ VictoryRoad_B2F_MapBorder:: @ 82F8F14 VictoryRoad_B2F_MapBlockdata:: @ 82F8F1C .incbin "data/maps/VictoryRoad_B2F/map.bin" + .align 2 VictoryRoad_B2F_MapAttributes:: @ 82F9A40 .4byte 0x2e .4byte 0x1f .4byte VictoryRoad_B2F_MapBorder .4byte VictoryRoad_B2F_MapBlockdata - .4byte VictoryRoad_B2F_Tileset - .4byte VictoryRoad_B2F_Tileset2 + .4byte gTileset_General + .4byte gTileset_Cave Route104_Prototype_MapBorder:: @ 82F9A58 .incbin "data/maps/Route104_Prototype/border.bin" @@ -3982,15 +4070,14 @@ Route104_Prototype_MapBorder:: @ 82F9A58 Route104_Prototype_MapBlockdata:: @ 82F9A60 .incbin "data/maps/Route104_Prototype/map.bin" - .incbin "baserom.gba", 0x2f9a62, 0x2 - + .align 2 Route104_Prototype_MapAttributes:: @ 82F9A64 .4byte 0x1 .4byte 0x1 .4byte Route104_Prototype_MapBorder .4byte Route104_Prototype_MapBlockdata - .4byte Route104_Prototype_Tileset - .4byte Route104_Prototype_Tileset2 + .4byte gTileset_General + .4byte gTileset_Rustboro GraniteCave_StevensRoom_MapBorder:: @ 82F9A7C .incbin "data/maps/GraniteCave_StevensRoom/border.bin" @@ -3998,13 +4085,14 @@ GraniteCave_StevensRoom_MapBorder:: @ 82F9A7C GraniteCave_StevensRoom_MapBlockdata:: @ 82F9A84 .incbin "data/maps/GraniteCave_StevensRoom/map.bin" + .align 2 GraniteCave_StevensRoom_MapAttributes:: @ 82F9C28 .4byte 0xf .4byte 0xe .4byte GraniteCave_StevensRoom_MapBorder .4byte GraniteCave_StevensRoom_MapBlockdata - .4byte GraniteCave_StevensRoom_Tileset - .4byte GraniteCave_StevensRoom_Tileset2 + .4byte gTileset_General + .4byte gTileset_Cave AbandonedShip_HiddenFloorCorridors_MapBorder:: @ 82F9C40 .incbin "data/maps/AbandonedShip_HiddenFloorCorridors/border.bin" @@ -4012,15 +4100,14 @@ AbandonedShip_HiddenFloorCorridors_MapBorder:: @ 82F9C40 AbandonedShip_HiddenFloorCorridors_MapBlockdata:: @ 82F9C48 .incbin "data/maps/AbandonedShip_HiddenFloorCorridors/map.bin" - .incbin "baserom.gba", 0x2f9d66, 0x2 - + .align 2 AbandonedShip_HiddenFloorCorridors_MapAttributes:: @ 82F9D68 .4byte 0xd .4byte 0xb .4byte AbandonedShip_HiddenFloorCorridors_MapBorder .4byte AbandonedShip_HiddenFloorCorridors_MapBlockdata - .4byte AbandonedShip_HiddenFloorCorridors_Tileset - .4byte AbandonedShip_HiddenFloorCorridors_Tileset2 + .4byte gTileset_General + .4byte gTileset_Ship SouthernIsland_Exterior_MapBorder:: @ 82F9D80 .incbin "data/maps/SouthernIsland_Exterior/border.bin" @@ -4028,13 +4115,14 @@ SouthernIsland_Exterior_MapBorder:: @ 82F9D80 SouthernIsland_Exterior_MapBlockdata:: @ 82F9D88 .incbin "data/maps/SouthernIsland_Exterior/map.bin" + .align 2 SouthernIsland_Exterior_MapAttributes:: @ 82FA544 .4byte 0x21 .4byte 0x1e .4byte SouthernIsland_Exterior_MapBorder .4byte SouthernIsland_Exterior_MapBlockdata - .4byte SouthernIsland_Exterior_Tileset - .4byte SouthernIsland_Exterior_Tileset2 + .4byte gTileset_General + .4byte gTileset_Rustboro SouthernIsland_Interior_MapBorder:: @ 82FA55C .incbin "data/maps/SouthernIsland_Interior/border.bin" @@ -4042,13 +4130,14 @@ SouthernIsland_Interior_MapBorder:: @ 82FA55C SouthernIsland_Interior_MapBlockdata:: @ 82FA564 .incbin "data/maps/SouthernIsland_Interior/map.bin" + .align 2 SouthernIsland_Interior_MapAttributes:: @ 82FAA74 .4byte 0x1b .4byte 0x18 .4byte SouthernIsland_Interior_MapBorder .4byte SouthernIsland_Interior_MapBlockdata - .4byte SouthernIsland_Interior_Tileset - .4byte SouthernIsland_Interior_Tileset2 + .4byte gTileset_General + .4byte gTileset_Rustboro JaggedPass_MapBorder:: @ 82FAA8C .incbin "data/maps/JaggedPass/border.bin" @@ -4056,13 +4145,14 @@ JaggedPass_MapBorder:: @ 82FAA8C JaggedPass_MapBlockdata:: @ 82FAA94 .incbin "data/maps/JaggedPass/map.bin" + .align 2 JaggedPass_MapAttributes:: @ 82FB55C .4byte 0x1e .4byte 0x2e .4byte JaggedPass_MapBorder .4byte JaggedPass_MapBlockdata - .4byte JaggedPass_Tileset - .4byte JaggedPass_Tileset2 + .4byte gTileset_General + .4byte gTileset_Lavaridge FieryPath_MapBorder:: @ 82FB574 .incbin "data/maps/FieryPath/border.bin" @@ -4070,13 +4160,14 @@ FieryPath_MapBorder:: @ 82FB574 FieryPath_MapBlockdata:: @ 82FB57C .incbin "data/maps/FieryPath/map.bin" + .align 2 FieryPath_MapAttributes:: @ 82FBFE0 .4byte 0x23 .4byte 0x26 .4byte FieryPath_MapBorder .4byte FieryPath_MapBlockdata - .4byte FieryPath_Tileset - .4byte FieryPath_Tileset2 + .4byte gTileset_General + .4byte gTileset_Lavaridge RustboroCity_Flat2_1F_MapBorder:: @ 82FBFF8 .incbin "data/maps/RustboroCity_Flat2_1F/border.bin" @@ -4084,13 +4175,14 @@ RustboroCity_Flat2_1F_MapBorder:: @ 82FBFF8 RustboroCity_Flat2_1F_MapBlockdata:: @ 82FC000 .incbin "data/maps/RustboroCity_Flat2_1F/map.bin" + .align 2 RustboroCity_Flat2_1F_MapAttributes:: @ 82FC0FC .4byte 0xe .4byte 0x9 .4byte RustboroCity_Flat2_1F_MapBorder .4byte RustboroCity_Flat2_1F_MapBlockdata - .4byte RustboroCity_Flat2_1F_Tileset - .4byte RustboroCity_Flat2_1F_Tileset2 + .4byte gTileset_Building + .4byte gTileset_GenericBuilding RustboroCity_Flat2_2F_MapBorder:: @ 82FC114 .incbin "data/maps/RustboroCity_Flat2_2F/border.bin" @@ -4098,13 +4190,14 @@ RustboroCity_Flat2_2F_MapBorder:: @ 82FC114 RustboroCity_Flat2_2F_MapBlockdata:: @ 82FC11C .incbin "data/maps/RustboroCity_Flat2_2F/map.bin" + .align 2 RustboroCity_Flat2_2F_MapAttributes:: @ 82FC218 .4byte 0xe .4byte 0x9 .4byte RustboroCity_Flat2_2F_MapBorder .4byte RustboroCity_Flat2_2F_MapBlockdata - .4byte RustboroCity_Flat2_2F_Tileset - .4byte RustboroCity_Flat2_2F_Tileset2 + .4byte gTileset_Building + .4byte gTileset_GenericBuilding RustboroCity_Flat2_3F_MapBorder:: @ 82FC230 .incbin "data/maps/RustboroCity_Flat2_3F/border.bin" @@ -4112,13 +4205,14 @@ RustboroCity_Flat2_3F_MapBorder:: @ 82FC230 RustboroCity_Flat2_3F_MapBlockdata:: @ 82FC238 .incbin "data/maps/RustboroCity_Flat2_3F/map.bin" + .align 2 RustboroCity_Flat2_3F_MapAttributes:: @ 82FC334 .4byte 0xe .4byte 0x9 .4byte RustboroCity_Flat2_3F_MapBorder .4byte RustboroCity_Flat2_3F_MapBlockdata - .4byte RustboroCity_Flat2_3F_Tileset - .4byte RustboroCity_Flat2_3F_Tileset2 + .4byte gTileset_Building + .4byte gTileset_GenericBuilding SootopolisCity_House8_MapBorder:: @ 82FC34C .incbin "data/maps/SootopolisCity_House8/border.bin" @@ -4126,13 +4220,14 @@ SootopolisCity_House8_MapBorder:: @ 82FC34C SootopolisCity_House8_MapBlockdata:: @ 82FC354 .incbin "data/maps/SootopolisCity_House8/map.bin" + .align 2 SootopolisCity_House8_MapAttributes:: @ 82FC3C4 .4byte 0x8 .4byte 0x7 .4byte SootopolisCity_House8_MapBorder .4byte SootopolisCity_House8_MapBlockdata - .4byte SootopolisCity_House8_Tileset - .4byte SootopolisCity_House8_Tileset2 + .4byte gTileset_Building + .4byte gTileset_GenericBuilding EverGrandeCity_HallOfFame_MapBorder:: @ 82FC3DC .incbin "data/maps/EverGrandeCity_HallOfFame/border.bin" @@ -4140,15 +4235,14 @@ EverGrandeCity_HallOfFame_MapBorder:: @ 82FC3DC EverGrandeCity_HallOfFame_MapBlockdata:: @ 82FC3E4 .incbin "data/maps/EverGrandeCity_HallOfFame/map.bin" - .incbin "baserom.gba", 0x2fc5e2, 0x2 - + .align 2 EverGrandeCity_HallOfFame_MapAttributes:: @ 82FC5E4 .4byte 0xf .4byte 0x11 .4byte EverGrandeCity_HallOfFame_MapBorder .4byte EverGrandeCity_HallOfFame_MapBlockdata - .4byte EverGrandeCity_HallOfFame_Tileset - .4byte EverGrandeCity_HallOfFame_Tileset2 + .4byte gTileset_Building + .4byte gTileset_CableClub LilycoveCity_CoveLilyMotel_1F_MapBorder:: @ 82FC5FC .incbin "data/maps/LilycoveCity_CoveLilyMotel_1F/border.bin" @@ -4156,13 +4250,14 @@ LilycoveCity_CoveLilyMotel_1F_MapBorder:: @ 82FC5FC LilycoveCity_CoveLilyMotel_1F_MapBlockdata:: @ 82FC604 .incbin "data/maps/LilycoveCity_CoveLilyMotel_1F/map.bin" + .align 2 LilycoveCity_CoveLilyMotel_1F_MapAttributes:: @ 82FC6DC .4byte 0xc .4byte 0x9 .4byte LilycoveCity_CoveLilyMotel_1F_MapBorder .4byte LilycoveCity_CoveLilyMotel_1F_MapBlockdata - .4byte LilycoveCity_CoveLilyMotel_1F_Tileset - .4byte LilycoveCity_CoveLilyMotel_1F_Tileset2 + .4byte gTileset_Building + .4byte gTileset_GenericBuilding LilycoveCity_CoveLilyMotel_2F_MapBorder:: @ 82FC6F4 .incbin "data/maps/LilycoveCity_CoveLilyMotel_2F/border.bin" @@ -4170,13 +4265,14 @@ LilycoveCity_CoveLilyMotel_2F_MapBorder:: @ 82FC6F4 LilycoveCity_CoveLilyMotel_2F_MapBlockdata:: @ 82FC6FC .incbin "data/maps/LilycoveCity_CoveLilyMotel_2F/map.bin" + .align 2 LilycoveCity_CoveLilyMotel_2F_MapAttributes:: @ 82FC7D4 .4byte 0xc .4byte 0x9 .4byte LilycoveCity_CoveLilyMotel_2F_MapBorder .4byte LilycoveCity_CoveLilyMotel_2F_MapBlockdata - .4byte LilycoveCity_CoveLilyMotel_2F_Tileset - .4byte LilycoveCity_CoveLilyMotel_2F_Tileset2 + .4byte gTileset_Building + .4byte gTileset_GenericBuilding Route124_DivingTreasureHuntersHouse_MapBorder:: @ 82FC7EC .incbin "data/maps/Route124_DivingTreasureHuntersHouse/border.bin" @@ -4184,13 +4280,14 @@ Route124_DivingTreasureHuntersHouse_MapBorder:: @ 82FC7EC Route124_DivingTreasureHuntersHouse_MapBlockdata:: @ 82FC7F4 .incbin "data/maps/Route124_DivingTreasureHuntersHouse/map.bin" + .align 2 Route124_DivingTreasureHuntersHouse_MapAttributes:: @ 82FC8A8 .4byte 0xa .4byte 0x9 .4byte Route124_DivingTreasureHuntersHouse_MapBorder .4byte Route124_DivingTreasureHuntersHouse_MapBlockdata - .4byte Route124_DivingTreasureHuntersHouse_Tileset - .4byte Route124_DivingTreasureHuntersHouse_Tileset2 + .4byte gTileset_Building + .4byte gTileset_GenericBuilding MtPyre_Exterior_MapBorder:: @ 82FC8C0 .incbin "data/maps/MtPyre_Exterior/border.bin" @@ -4198,13 +4295,14 @@ MtPyre_Exterior_MapBorder:: @ 82FC8C0 MtPyre_Exterior_MapBlockdata:: @ 82FC8C8 .incbin "data/maps/MtPyre_Exterior/map.bin" + .align 2 MtPyre_Exterior_MapAttributes:: @ 82FD7EC .4byte 0x26 .4byte 0x33 .4byte MtPyre_Exterior_MapBorder .4byte MtPyre_Exterior_MapBlockdata - .4byte MtPyre_Exterior_Tileset - .4byte MtPyre_Exterior_Tileset2 + .4byte gTileset_General + .4byte gTileset_Facility MtPyre_Summit_MapBorder:: @ 82FD804 .incbin "data/maps/MtPyre_Summit/border.bin" @@ -4212,13 +4310,14 @@ MtPyre_Summit_MapBorder:: @ 82FD804 MtPyre_Summit_MapBlockdata:: @ 82FD80C .incbin "data/maps/MtPyre_Summit/map.bin" + .align 2 MtPyre_Summit_MapAttributes:: @ 82FE680 .4byte 0x32 .4byte 0x25 .4byte MtPyre_Summit_MapBorder .4byte MtPyre_Summit_MapBlockdata - .4byte MtPyre_Summit_Tileset - .4byte MtPyre_Summit_Tileset2 + .4byte gTileset_General + .4byte gTileset_Facility SealedChamber_InnerRoom_MapBorder:: @ 82FE698 .incbin "data/maps/SealedChamber_InnerRoom/border.bin" @@ -4226,15 +4325,14 @@ SealedChamber_InnerRoom_MapBorder:: @ 82FE698 SealedChamber_InnerRoom_MapBlockdata:: @ 82FE6A0 .incbin "data/maps/SealedChamber_InnerRoom/map.bin" - .incbin "baserom.gba", 0x2fea66, 0x2 - + .align 2 SealedChamber_InnerRoom_MapAttributes:: @ 82FEA68 .4byte 0x15 .4byte 0x17 .4byte SealedChamber_InnerRoom_MapBorder .4byte SealedChamber_InnerRoom_MapBlockdata - .4byte SealedChamber_InnerRoom_Tileset - .4byte SealedChamber_InnerRoom_Tileset2 + .4byte gTileset_General + .4byte gTileset_Cave MossdeepCity_GameCorner_1F_MapBorder:: @ 82FEA80 .incbin "data/maps/MossdeepCity_GameCorner_1F/border.bin" @@ -4242,13 +4340,14 @@ MossdeepCity_GameCorner_1F_MapBorder:: @ 82FEA80 MossdeepCity_GameCorner_1F_MapBlockdata:: @ 82FEA88 .incbin "data/maps/MossdeepCity_GameCorner_1F/map.bin" + .align 2 MossdeepCity_GameCorner_1F_MapAttributes:: @ 82FEB38 .4byte 0xb .4byte 0x8 .4byte MossdeepCity_GameCorner_1F_MapBorder .4byte MossdeepCity_GameCorner_1F_MapBlockdata - .4byte MossdeepCity_GameCorner_1F_Tileset - .4byte MossdeepCity_GameCorner_1F_Tileset2 + .4byte gTileset_Building + .4byte gTileset_GenericBuilding MossdeepCity_GameCorner_B1F_MapBorder:: @ 82FEB50 .incbin "data/maps/MossdeepCity_GameCorner_B1F/border.bin" @@ -4256,13 +4355,14 @@ MossdeepCity_GameCorner_B1F_MapBorder:: @ 82FEB50 MossdeepCity_GameCorner_B1F_MapBlockdata:: @ 82FEB58 .incbin "data/maps/MossdeepCity_GameCorner_B1F/map.bin" + .align 2 MossdeepCity_GameCorner_B1F_MapAttributes:: @ 82FEC30 .4byte 0xc .4byte 0x9 .4byte MossdeepCity_GameCorner_B1F_MapBorder .4byte MossdeepCity_GameCorner_B1F_MapBlockdata - .4byte MossdeepCity_GameCorner_B1F_Tileset - .4byte MossdeepCity_GameCorner_B1F_Tileset2 + .4byte gTileset_Building + .4byte gTileset_GenericBuilding SootopolisCity_House1_MapBorder:: @ 82FEC48 .incbin "data/maps/SootopolisCity_House1/border.bin" @@ -4270,6 +4370,7 @@ SootopolisCity_House1_MapBorder:: @ 82FEC48 SootopolisCity_House1_MapBlockdata:: @ 82FEC50 .incbin "data/maps/SootopolisCity_House1/map.bin" + .align 2 SootopolisCity_House1_MapAttributes:: @ 82FECC0 SootopolisCity_House4_MapAttributes:: @ 82FECC0 SootopolisCity_House7_MapAttributes:: @ 82FECC0 @@ -4277,8 +4378,8 @@ SootopolisCity_House7_MapAttributes:: @ 82FECC0 .4byte 0x7 .4byte SootopolisCity_House1_MapBorder .4byte SootopolisCity_House1_MapBlockdata - .4byte SootopolisCity_House1_Tileset - .4byte SootopolisCity_House1_Tileset2 + .4byte gTileset_Building + .4byte gTileset_GenericBuilding SootopolisCity_House2_MapBorder:: @ 82FECD8 .incbin "data/maps/SootopolisCity_House2/border.bin" @@ -4286,14 +4387,15 @@ SootopolisCity_House2_MapBorder:: @ 82FECD8 SootopolisCity_House2_MapBlockdata:: @ 82FECE0 .incbin "data/maps/SootopolisCity_House2/map.bin" + .align 2 SootopolisCity_House2_MapAttributes:: @ 82FED50 SootopolisCity_House5_MapAttributes:: @ 82FED50 .4byte 0x8 .4byte 0x7 .4byte SootopolisCity_House2_MapBorder .4byte SootopolisCity_House2_MapBlockdata - .4byte SootopolisCity_House2_Tileset - .4byte SootopolisCity_House2_Tileset2 + .4byte gTileset_Building + .4byte gTileset_GenericBuilding SootopolisCity_House3_MapBorder:: @ 82FED68 .incbin "data/maps/SootopolisCity_House3/border.bin" @@ -4301,14 +4403,15 @@ SootopolisCity_House3_MapBorder:: @ 82FED68 SootopolisCity_House3_MapBlockdata:: @ 82FED70 .incbin "data/maps/SootopolisCity_House3/map.bin" + .align 2 SootopolisCity_House3_MapAttributes:: @ 82FEDE0 SootopolisCity_House6_MapAttributes:: @ 82FEDE0 .4byte 0x8 .4byte 0x7 .4byte SootopolisCity_House3_MapBorder .4byte SootopolisCity_House3_MapBlockdata - .4byte SootopolisCity_House3_Tileset - .4byte SootopolisCity_House3_Tileset2 + .4byte gTileset_Building + .4byte gTileset_GenericBuilding AbandonedShip_HiddenFloorRooms_MapBorder:: @ 82FEDF8 .incbin "data/maps/AbandonedShip_HiddenFloorRooms/border.bin" @@ -4316,13 +4419,14 @@ AbandonedShip_HiddenFloorRooms_MapBorder:: @ 82FEDF8 AbandonedShip_HiddenFloorRooms_MapBlockdata:: @ 82FEE00 .incbin "data/maps/AbandonedShip_HiddenFloorRooms/map.bin" + .align 2 AbandonedShip_HiddenFloorRooms_MapAttributes:: @ 82FF328 .4byte 0x2c .4byte 0xf .4byte AbandonedShip_HiddenFloorRooms_MapBorder .4byte AbandonedShip_HiddenFloorRooms_MapBlockdata - .4byte AbandonedShip_HiddenFloorRooms_Tileset - .4byte AbandonedShip_HiddenFloorRooms_Tileset2 + .4byte gTileset_General + .4byte gTileset_Ship ScorchedSlab_MapBorder:: @ 82FF340 .incbin "data/maps/ScorchedSlab/border.bin" @@ -4330,13 +4434,14 @@ ScorchedSlab_MapBorder:: @ 82FF340 ScorchedSlab_MapBlockdata:: @ 82FF348 .incbin "data/maps/ScorchedSlab/map.bin" + .align 2 ScorchedSlab_MapAttributes:: @ 82FF5A0 .4byte 0xf .4byte 0x14 .4byte ScorchedSlab_MapBorder .4byte ScorchedSlab_MapBlockdata - .4byte ScorchedSlab_Tileset - .4byte ScorchedSlab_Tileset2 + .4byte gTileset_General + .4byte gTileset_Cave .incbin "baserom.gba", 0x2ff5b8, 0x2f4 @@ -4346,13 +4451,14 @@ RustboroCity_Flat1_1F_MapBorder:: @ 82FF8AC RustboroCity_Flat1_1F_MapBlockdata:: @ 82FF8B4 .incbin "data/maps/RustboroCity_Flat1_1F/map.bin" + .align 2 RustboroCity_Flat1_1F_MapAttributes:: @ 82FF994 .4byte 0xe .4byte 0x8 .4byte RustboroCity_Flat1_1F_MapBorder .4byte RustboroCity_Flat1_1F_MapBlockdata - .4byte RustboroCity_Flat1_1F_Tileset - .4byte RustboroCity_Flat1_1F_Tileset2 + .4byte gTileset_Building + .4byte gTileset_GenericBuilding RustboroCity_Flat1_2F_MapBorder:: @ 82FF9AC .incbin "data/maps/RustboroCity_Flat1_2F/border.bin" @@ -4360,13 +4466,14 @@ RustboroCity_Flat1_2F_MapBorder:: @ 82FF9AC RustboroCity_Flat1_2F_MapBlockdata:: @ 82FF9B4 .incbin "data/maps/RustboroCity_Flat1_2F/map.bin" + .align 2 RustboroCity_Flat1_2F_MapAttributes:: @ 82FFA94 .4byte 0xe .4byte 0x8 .4byte RustboroCity_Flat1_2F_MapBorder .4byte RustboroCity_Flat1_2F_MapBlockdata - .4byte RustboroCity_Flat1_2F_Tileset - .4byte RustboroCity_Flat1_2F_Tileset2 + .4byte gTileset_Building + .4byte gTileset_GenericBuilding EverGrandeCity_Corridor4_MapBorder:: @ 82FFAAC .incbin "data/maps/EverGrandeCity_Corridor4/border.bin" @@ -4374,13 +4481,14 @@ EverGrandeCity_Corridor4_MapBorder:: @ 82FFAAC EverGrandeCity_Corridor4_MapBlockdata:: @ 82FFAB4 .incbin "data/maps/EverGrandeCity_Corridor4/map.bin" + .align 2 EverGrandeCity_Corridor4_MapAttributes:: @ 82FFDA0 .4byte 0xb .4byte 0x22 .4byte EverGrandeCity_Corridor4_MapBorder .4byte EverGrandeCity_Corridor4_MapBlockdata - .4byte EverGrandeCity_Corridor4_Tileset - .4byte EverGrandeCity_Corridor4_Tileset2 + .4byte gTileset_Building + .4byte gTileset_EliteFour MagmaHideout_1F_MapBorder:: @ 82FFDB8 .incbin "data/maps/MagmaHideout_1F/border.bin" @@ -4388,13 +4496,14 @@ MagmaHideout_1F_MapBorder:: @ 82FFDB8 MagmaHideout_1F_MapBlockdata:: @ 82FFDC0 .incbin "data/maps/MagmaHideout_1F/map.bin" + .align 2 MagmaHideout_1F_MapAttributes:: @ 8300450 .4byte 0x1c .4byte 0x1e .4byte MagmaHideout_1F_MapBorder .4byte MagmaHideout_1F_MapBlockdata - .4byte MagmaHideout_1F_Tileset - .4byte MagmaHideout_1F_Tileset2 + .4byte gTileset_General + .4byte gTileset_Facility MagmaHideout_B1F_MapBorder:: @ 8300468 .incbin "data/maps/MagmaHideout_B1F/border.bin" @@ -4402,13 +4511,14 @@ MagmaHideout_B1F_MapBorder:: @ 8300468 MagmaHideout_B1F_MapBlockdata:: @ 8300470 .incbin "data/maps/MagmaHideout_B1F/map.bin" + .align 2 MagmaHideout_B1F_MapAttributes:: @ 8301010 .4byte 0x3e .4byte 0x18 .4byte MagmaHideout_B1F_MapBorder .4byte MagmaHideout_B1F_MapBlockdata - .4byte MagmaHideout_B1F_Tileset - .4byte MagmaHideout_B1F_Tileset2 + .4byte gTileset_General + .4byte gTileset_Facility MagmaHideout_B2F_MapBorder:: @ 8301028 .incbin "data/maps/MagmaHideout_B2F/border.bin" @@ -4416,13 +4526,14 @@ MagmaHideout_B2F_MapBorder:: @ 8301028 MagmaHideout_B2F_MapBlockdata:: @ 8301030 .incbin "data/maps/MagmaHideout_B2F/map.bin" + .align 2 MagmaHideout_B2F_MapAttributes:: @ 8301690 .4byte 0x22 .4byte 0x18 .4byte MagmaHideout_B2F_MapBorder .4byte MagmaHideout_B2F_MapBlockdata - .4byte MagmaHideout_B2F_Tileset - .4byte MagmaHideout_B2F_Tileset2 + .4byte gTileset_General + .4byte gTileset_Facility .incbin "baserom.gba", 0x3016a8, 0x12e0 @@ -4432,13 +4543,14 @@ SkyPillar_Entrance_MapBorder:: @ 8302988 SkyPillar_Entrance_MapBlockdata:: @ 8302990 .incbin "data/maps/SkyPillar_Entrance/map.bin" + .align 2 SkyPillar_Entrance_MapAttributes:: @ 8302C18 .4byte 0x12 .4byte 0x12 .4byte SkyPillar_Entrance_MapBorder .4byte SkyPillar_Entrance_MapBlockdata - .4byte SkyPillar_Entrance_Tileset - .4byte SkyPillar_Entrance_Tileset2 + .4byte gTileset_General + .4byte gTileset_Cave SkyPillar_Outside_MapBorder:: @ 8302C30 .incbin "data/maps/SkyPillar_Outside/border.bin" @@ -4446,13 +4558,14 @@ SkyPillar_Outside_MapBorder:: @ 8302C30 SkyPillar_Outside_MapBlockdata:: @ 8302C38 .incbin "data/maps/SkyPillar_Outside/map.bin" + .align 2 SkyPillar_Outside_MapAttributes:: @ 8303140 .4byte 0x1c .4byte 0x17 .4byte SkyPillar_Outside_MapBorder .4byte SkyPillar_Outside_MapBlockdata - .4byte SkyPillar_Outside_Tileset - .4byte SkyPillar_Outside_Tileset2 + .4byte gTileset_General + .4byte gTileset_Pacifidlog SkyPillar_1F_MapBorder:: @ 8303158 .incbin "data/maps/SkyPillar_1F/border.bin" @@ -4460,13 +4573,14 @@ SkyPillar_1F_MapBorder:: @ 8303158 SkyPillar_1F_MapBlockdata:: @ 8303160 .incbin "data/maps/SkyPillar_1F/map.bin" + .align 2 SkyPillar_1F_MapAttributes:: @ 83032E8 .4byte 0xe .4byte 0xe .4byte SkyPillar_1F_MapBorder .4byte SkyPillar_1F_MapBlockdata - .4byte SkyPillar_1F_Tileset - .4byte SkyPillar_1F_Tileset2 + .4byte gTileset_General + .4byte gTileset_Pacifidlog SkyPillar_2F_MapBorder:: @ 8303300 .incbin "data/maps/SkyPillar_2F/border.bin" @@ -4474,13 +4588,14 @@ SkyPillar_2F_MapBorder:: @ 8303300 SkyPillar_2F_MapBlockdata:: @ 8303308 .incbin "data/maps/SkyPillar_2F/map.bin" + .align 2 SkyPillar_2F_MapAttributes:: @ 8303490 .4byte 0xe .4byte 0xe .4byte SkyPillar_2F_MapBorder .4byte SkyPillar_2F_MapBlockdata - .4byte SkyPillar_2F_Tileset - .4byte SkyPillar_2F_Tileset2 + .4byte gTileset_General + .4byte gTileset_Pacifidlog SkyPillar_3F_MapBorder:: @ 83034A8 .incbin "data/maps/SkyPillar_3F/border.bin" @@ -4488,13 +4603,14 @@ SkyPillar_3F_MapBorder:: @ 83034A8 SkyPillar_3F_MapBlockdata:: @ 83034B0 .incbin "data/maps/SkyPillar_3F/map.bin" + .align 2 SkyPillar_3F_MapAttributes:: @ 8303638 .4byte 0xe .4byte 0xe .4byte SkyPillar_3F_MapBorder .4byte SkyPillar_3F_MapBlockdata - .4byte SkyPillar_3F_Tileset - .4byte SkyPillar_3F_Tileset2 + .4byte gTileset_General + .4byte gTileset_Pacifidlog SkyPillar_4F_MapBorder:: @ 8303650 .incbin "data/maps/SkyPillar_4F/border.bin" @@ -4502,13 +4618,14 @@ SkyPillar_4F_MapBorder:: @ 8303650 SkyPillar_4F_MapBlockdata:: @ 8303658 .incbin "data/maps/SkyPillar_4F/map.bin" + .align 2 SkyPillar_4F_MapAttributes:: @ 83037E0 .4byte 0xe .4byte 0xe .4byte SkyPillar_4F_MapBorder .4byte SkyPillar_4F_MapBlockdata - .4byte SkyPillar_4F_Tileset - .4byte SkyPillar_4F_Tileset2 + .4byte gTileset_General + .4byte gTileset_Pacifidlog .incbin "baserom.gba", 0x3037f8, 0x9d4 @@ -4518,13 +4635,14 @@ MossdeepCity_StevensHouse_MapBorder:: @ 83041CC MossdeepCity_StevensHouse_MapBlockdata:: @ 83041D4 .incbin "data/maps/MossdeepCity_StevensHouse/map.bin" + .align 2 MossdeepCity_StevensHouse_MapAttributes:: @ 8304284 .4byte 0xb .4byte 0x8 .4byte MossdeepCity_StevensHouse_MapBorder .4byte MossdeepCity_StevensHouse_MapBlockdata - .4byte MossdeepCity_StevensHouse_Tileset - .4byte MossdeepCity_StevensHouse_Tileset2 + .4byte gTileset_Building + .4byte gTileset_GenericBuilding ShoalCave_LowTideIceRoom_MapBorder:: @ 830429C .incbin "data/maps/ShoalCave_LowTideIceRoom/border.bin" @@ -4532,13 +4650,14 @@ ShoalCave_LowTideIceRoom_MapBorder:: @ 830429C ShoalCave_LowTideIceRoom_MapBlockdata:: @ 83042A4 .incbin "data/maps/ShoalCave_LowTideIceRoom/map.bin" + .align 2 ShoalCave_LowTideIceRoom_MapAttributes:: @ 8304754 .4byte 0x14 .4byte 0x1e .4byte ShoalCave_LowTideIceRoom_MapBorder .4byte ShoalCave_LowTideIceRoom_MapBlockdata - .4byte ShoalCave_LowTideIceRoom_Tileset - .4byte ShoalCave_LowTideIceRoom_Tileset2 + .4byte gTileset_General + .4byte gTileset_Cave SafariZone_RestHouse_MapBorder:: @ 830476C .incbin "data/maps/SafariZone_RestHouse/border.bin" @@ -4546,13 +4665,14 @@ SafariZone_RestHouse_MapBorder:: @ 830476C SafariZone_RestHouse_MapBlockdata:: @ 8304774 .incbin "data/maps/SafariZone_RestHouse/map.bin" + .align 2 SafariZone_RestHouse_MapAttributes:: @ 8304828 .4byte 0xa .4byte 0x9 .4byte SafariZone_RestHouse_MapBorder .4byte SafariZone_RestHouse_MapBlockdata - .4byte SafariZone_RestHouse_Tileset - .4byte SafariZone_RestHouse_Tileset2 + .4byte gTileset_Building + .4byte gTileset_GenericBuilding SkyPillar_5F_MapBorder:: @ 8304840 .incbin "data/maps/SkyPillar_5F/border.bin" @@ -4560,13 +4680,14 @@ SkyPillar_5F_MapBorder:: @ 8304840 SkyPillar_5F_MapBlockdata:: @ 8304848 .incbin "data/maps/SkyPillar_5F/map.bin" + .align 2 SkyPillar_5F_MapAttributes:: @ 83049D0 .4byte 0xe .4byte 0xe .4byte SkyPillar_5F_MapBorder .4byte SkyPillar_5F_MapBlockdata - .4byte SkyPillar_5F_Tileset - .4byte SkyPillar_5F_Tileset2 + .4byte gTileset_General + .4byte gTileset_Pacifidlog SkyPillar_Top_MapBorder:: @ 83049E8 .incbin "data/maps/SkyPillar_Top/border.bin" @@ -4574,11 +4695,12 @@ SkyPillar_Top_MapBorder:: @ 83049E8 SkyPillar_Top_MapBlockdata:: @ 83049F0 .incbin "data/maps/SkyPillar_Top/map.bin" + .align 2 SkyPillar_Top_MapAttributes:: @ 8304F00 .4byte 0x1b .4byte 0x18 .4byte SkyPillar_Top_MapBorder .4byte SkyPillar_Top_MapBlockdata - .4byte SkyPillar_Top_Tileset - .4byte SkyPillar_Top_Tileset2 + .4byte gTileset_General + .4byte gTileset_Pacifidlog |