diff options
| -rw-r--r-- | data/maps/MossdeepCity/connections.inc | 3 | ||||
| -rw-r--r-- | data/maps/SootopolisCity/connections.inc | 6 | ||||
| -rw-r--r-- | data/maps/_assets.inc | 1409 | ||||
| -rw-r--r-- | data/rom4.s | 1 |
4 files changed, 1239 insertions, 180 deletions
diff --git a/data/maps/MossdeepCity/connections.inc b/data/maps/MossdeepCity/connections.inc index 92b3b4293..04a3f0c4b 100644 --- a/data/maps/MossdeepCity/connections.inc +++ b/data/maps/MossdeepCity/connections.inc @@ -6,6 +6,3 @@ MossdeepCity_MapConnectionsList: @ 84867C4 MossdeepCity_MapConnections: @ 84867E8 .4byte 0x3 .4byte MossdeepCity_MapConnectionsList - - .incbin "baserom.gba", 0x4867f0, 0x8 - diff --git a/data/maps/SootopolisCity/connections.inc b/data/maps/SootopolisCity/connections.inc new file mode 100644 index 000000000..230f56b2e --- /dev/null +++ b/data/maps/SootopolisCity/connections.inc @@ -0,0 +1,6 @@ +SootopolisCity_MapConnectionsList:: @ 84867F0 + @ empty + +SootopolisCity_MapConnections:: @ 84867F0 + .4byte 0 + .4byte SootopolisCity_MapConnectionsList diff --git a/data/maps/_assets.inc b/data/maps/_assets.inc index df005dacf..2077a74cc 100644 --- a/data/maps/_assets.inc +++ b/data/maps/_assets.inc @@ -1,9 +1,12 @@ + .align 2 PetalburgCity_MapBorder: @ 83DFE14 .incbin "data/maps/PetalburgCity/border.bin" + .align 2 PetalburgCity_MapBlockdata: @ 83DFE1C .incbin "data/maps/PetalburgCity/map.bin" + .align 2 PetalburgCity_MapAttributes: @ 83E0524 .4byte 0x1e .4byte 0x1e @@ -12,12 +15,15 @@ PetalburgCity_MapAttributes: @ 83E0524 .4byte gTileset_General .4byte gTileset_Petalburg + .align 2 SlateportCity_MapBorder: @ 83E053C .incbin "data/maps/SlateportCity/border.bin" + .align 2 SlateportCity_MapBlockdata: @ 83E0544 .incbin "data/maps/SlateportCity/map.bin" + .align 2 SlateportCity_MapAttributes: @ 83E1804 .4byte 0x28 .4byte 0x3c @@ -26,12 +32,15 @@ SlateportCity_MapAttributes: @ 83E1804 .4byte gTileset_General .4byte gTileset_Slateport + .align 2 MauvilleCity_MapBorder: @ 83E181C .incbin "data/maps/MauvilleCity/border.bin" + .align 2 MauvilleCity_MapBlockdata: @ 83E1824 .incbin "data/maps/MauvilleCity/map.bin" + .align 2 MauvilleCity_MapAttributes: @ 83E1E64 .4byte 0x28 .4byte 0x14 @@ -40,12 +49,15 @@ MauvilleCity_MapAttributes: @ 83E1E64 .4byte gTileset_General .4byte gTileset_Mauville + .align 2 RustboroCity_MapBorder: @ 83E1E7C .incbin "data/maps/RustboroCity/border.bin" + .align 2 RustboroCity_MapBlockdata: @ 83E1E84 .incbin "data/maps/RustboroCity/map.bin" + .align 2 RustboroCity_MapAttributes: @ 83E3144 .4byte 0x28 .4byte 0x3c @@ -54,12 +66,15 @@ RustboroCity_MapAttributes: @ 83E3144 .4byte gTileset_General .4byte gTileset_Rustboro + .align 2 FortreeCity_MapBorder: @ 83E315C .incbin "data/maps/FortreeCity/border.bin" + .align 2 FortreeCity_MapBlockdata: @ 83E3164 .incbin "data/maps/FortreeCity/map.bin" + .align 2 FortreeCity_MapAttributes: @ 83E37A4 .4byte 0x28 .4byte 0x14 @@ -68,12 +83,15 @@ FortreeCity_MapAttributes: @ 83E37A4 .4byte gTileset_General .4byte gTileset_Fortree + .align 2 LilycoveCity_MapBorder: @ 83E37BC .incbin "data/maps/LilycoveCity/border.bin" + .align 2 LilycoveCity_MapBlockdata: @ 83E37C4 .incbin "data/maps/LilycoveCity/map.bin" + .align 2 LilycoveCity_MapAttributes: @ 83E50C4 .4byte 0x50 .4byte 0x28 @@ -82,12 +100,15 @@ LilycoveCity_MapAttributes: @ 83E50C4 .4byte gTileset_General .4byte gTileset_Lilycove + .align 2 MossdeepCity_MapBorder: @ 83E50DC .incbin "data/maps/MossdeepCity/border.bin" + .align 2 MossdeepCity_MapBlockdata: @ 83E50E4 .incbin "data/maps/MossdeepCity/map.bin" + .align 2 MossdeepCity_MapAttributes: @ 83E69E4 .4byte 0x50 .4byte 0x28 @@ -96,12 +117,15 @@ MossdeepCity_MapAttributes: @ 83E69E4 .4byte gTileset_General .4byte gTileset_Mossdeep + .align 2 SootopolisCity_MapBorder: @ 83E69FC .incbin "data/maps/SootopolisCity/border.bin" + .align 2 SootopolisCity_MapBlockdata: @ 83E6A04 .incbin "data/maps/SootopolisCity/map.bin" + .align 2 SootopolisCity_MapAttributes: @ 83E8624 .4byte 0x3c .4byte 0x3c @@ -110,12 +134,15 @@ SootopolisCity_MapAttributes: @ 83E8624 .4byte gTileset_General .4byte gTileset_Sootopolis + .align 2 EverGrandeCity_MapBorder: @ 83E863C .incbin "data/maps/EverGrandeCity/border.bin" + .align 2 EverGrandeCity_MapBlockdata: @ 83E8644 .incbin "data/maps/EverGrandeCity/map.bin" + .align 2 EverGrandeCity_MapAttributes: @ 83E9F44 .4byte 0x28 .4byte 0x50 @@ -124,12 +151,15 @@ EverGrandeCity_MapAttributes: @ 83E9F44 .4byte gTileset_General .4byte gTileset_EverGrande + .align 2 LittlerootTown_MapBorder: @ 83E9F5C .incbin "data/maps/LittlerootTown/border.bin" + .align 2 LittlerootTown_MapBlockdata: @ 83E9F64 .incbin "data/maps/LittlerootTown/map.bin" + .align 2 LittlerootTown_MapAttributes: @ 83EA284 .4byte 0x14 .4byte 0x14 @@ -138,12 +168,15 @@ LittlerootTown_MapAttributes: @ 83EA284 .4byte gTileset_General .4byte gTileset_Petalburg + .align 2 OldaleTown_MapBorder: @ 83EA29C .incbin "data/maps/OldaleTown/border.bin" + .align 2 OldaleTown_MapBlockdata: @ 83EA2A4 .incbin "data/maps/OldaleTown/map.bin" + .align 2 OldaleTown_MapAttributes: @ 83EA5C4 .4byte 0x14 .4byte 0x14 @@ -152,12 +185,15 @@ OldaleTown_MapAttributes: @ 83EA5C4 .4byte gTileset_General .4byte gTileset_Petalburg + .align 2 DewfordTown_MapBorder: @ 83EA5DC .incbin "data/maps/DewfordTown/border.bin" + .align 2 DewfordTown_MapBlockdata: @ 83EA5E4 .incbin "data/maps/DewfordTown/map.bin" + .align 2 DewfordTown_MapAttributes: @ 83EA904 .4byte 0x14 .4byte 0x14 @@ -166,12 +202,15 @@ DewfordTown_MapAttributes: @ 83EA904 .4byte gTileset_General .4byte gTileset_Dewford + .align 2 LavaridgeTown_MapBorder: @ 83EA91C .incbin "data/maps/LavaridgeTown/border.bin" + .align 2 LavaridgeTown_MapBlockdata: @ 83EA924 .incbin "data/maps/LavaridgeTown/map.bin" + .align 2 LavaridgeTown_MapAttributes: @ 83EAC44 .4byte 0x14 .4byte 0x14 @@ -180,12 +219,15 @@ LavaridgeTown_MapAttributes: @ 83EAC44 .4byte gTileset_General .4byte gTileset_Lavaridge + .align 2 FallarborTown_MapBorder: @ 83EAC5C .incbin "data/maps/FallarborTown/border.bin" + .align 2 FallarborTown_MapBlockdata: @ 83EAC64 .incbin "data/maps/FallarborTown/map.bin" + .align 2 FallarborTown_MapAttributes: @ 83EAF84 .4byte 0x14 .4byte 0x14 @@ -194,12 +236,15 @@ FallarborTown_MapAttributes: @ 83EAF84 .4byte gTileset_General .4byte gTileset_Fallarbor + .align 2 VerdanturfTown_MapBorder: @ 83EAF9C .incbin "data/maps/VerdanturfTown/border.bin" + .align 2 VerdanturfTown_MapBlockdata: @ 83EAFA4 .incbin "data/maps/VerdanturfTown/map.bin" + .align 2 VerdanturfTown_MapAttributes: @ 83EB2C4 .4byte 0x14 .4byte 0x14 @@ -208,12 +253,15 @@ VerdanturfTown_MapAttributes: @ 83EB2C4 .4byte gTileset_General .4byte gTileset_Mauville + .align 2 PacifidlogTown_MapBorder: @ 83EB2DC .incbin "data/maps/PacifidlogTown/border.bin" + .align 2 PacifidlogTown_MapBlockdata: @ 83EB2E4 .incbin "data/maps/PacifidlogTown/map.bin" + .align 2 PacifidlogTown_MapAttributes: @ 83EB924 .4byte 0x14 .4byte 0x28 @@ -222,12 +270,15 @@ PacifidlogTown_MapAttributes: @ 83EB924 .4byte gTileset_General .4byte gTileset_Pacifidlog + .align 2 Route101_MapBorder: @ 83EB93C .incbin "data/maps/Route101/border.bin" + .align 2 Route101_MapBlockdata: @ 83EB944 .incbin "data/maps/Route101/map.bin" + .align 2 Route101_MapAttributes: @ 83EBC64 .4byte 0x14 .4byte 0x14 @@ -236,12 +287,15 @@ Route101_MapAttributes: @ 83EBC64 .4byte gTileset_General .4byte gTileset_Petalburg + .align 2 Route102_MapBorder: @ 83EBC7C .incbin "data/maps/Route102/border.bin" + .align 2 Route102_MapBlockdata: @ 83EBC84 .incbin "data/maps/Route102/map.bin" + .align 2 Route102_MapAttributes: @ 83EC454 .4byte 0x32 .4byte 0x14 @@ -250,12 +304,15 @@ Route102_MapAttributes: @ 83EC454 .4byte gTileset_General .4byte gTileset_Petalburg + .align 2 Route103_MapBorder: @ 83EC46C .incbin "data/maps/Route103/border.bin" + .align 2 Route103_MapBlockdata: @ 83EC474 .incbin "data/maps/Route103/map.bin" + .align 2 Route103_MapAttributes: @ 83ED234 .4byte 0x50 .4byte 0x16 @@ -264,12 +321,15 @@ Route103_MapAttributes: @ 83ED234 .4byte gTileset_General .4byte gTileset_Petalburg + .align 2 Route104_MapBorder: @ 83ED24C .incbin "data/maps/Route104/border.bin" + .align 2 Route104_MapBlockdata: @ 83ED254 .incbin "data/maps/Route104/map.bin" + .align 2 Route104_MapAttributes: @ 83EEB54 .4byte 0x28 .4byte 0x50 @@ -278,12 +338,15 @@ Route104_MapAttributes: @ 83EEB54 .4byte gTileset_General .4byte gTileset_Rustboro + .align 2 Route105_MapBorder: @ 83EEB6C .incbin "data/maps/Route105/border.bin" + .align 2 Route105_MapBlockdata: @ 83EEB74 .incbin "data/maps/Route105/map.bin" + .align 2 Route105_MapAttributes: @ 83F0474 .4byte 0x28 .4byte 0x50 @@ -292,12 +355,15 @@ Route105_MapAttributes: @ 83F0474 .4byte gTileset_General .4byte gTileset_Dewford + .align 2 Route106_MapBorder: @ 83F048C .incbin "data/maps/Route106/border.bin" + .align 2 Route106_MapBlockdata: @ 83F0494 .incbin "data/maps/Route106/map.bin" + .align 2 Route106_MapAttributes: @ 83F1114 .4byte 0x50 .4byte 0x14 @@ -306,12 +372,15 @@ Route106_MapAttributes: @ 83F1114 .4byte gTileset_General .4byte gTileset_Dewford + .align 2 Route107_MapBorder: @ 83F112C .incbin "data/maps/Route107/border.bin" + .align 2 Route107_MapBlockdata: @ 83F1134 .incbin "data/maps/Route107/map.bin" + .align 2 Route107_MapAttributes: @ 83F1A94 .4byte 0x3c .4byte 0x14 @@ -320,12 +389,15 @@ Route107_MapAttributes: @ 83F1A94 .4byte gTileset_General .4byte gTileset_Dewford + .align 2 Route108_MapBorder: @ 83F1AAC .incbin "data/maps/Route108/border.bin" + .align 2 Route108_MapBlockdata: @ 83F1AB4 .incbin "data/maps/Route108/map.bin" + .align 2 Route108_MapAttributes: @ 83F2414 .4byte 0x3c .4byte 0x14 @@ -334,12 +406,15 @@ Route108_MapAttributes: @ 83F2414 .4byte gTileset_General .4byte gTileset_Slateport + .align 2 Route109_MapBorder: @ 83F242C .incbin "data/maps/Route109/border.bin" + .align 2 Route109_MapBlockdata: @ 83F2434 .incbin "data/maps/Route109/map.bin" + .align 2 Route109_MapAttributes: @ 83F37E4 .4byte 0x28 .4byte 0x3f @@ -348,12 +423,15 @@ Route109_MapAttributes: @ 83F37E4 .4byte gTileset_General .4byte gTileset_Slateport + .align 2 Route110_MapBorder: @ 83F37FC .incbin "data/maps/Route110/border.bin" + .align 2 Route110_MapBlockdata: @ 83F3804 .incbin "data/maps/Route110/map.bin" + .align 2 Route110_MapAttributes: @ 83F5744 .4byte 0x28 .4byte 0x64 @@ -362,12 +440,15 @@ Route110_MapAttributes: @ 83F5744 .4byte gTileset_General .4byte gTileset_Mauville + .align 2 Route111_MapBorder: @ 83F575C .incbin "data/maps/Route111/border.bin" + .align 2 Route111_MapBlockdata: @ 83F5764 .incbin "data/maps/Route111/map.bin" + .align 2 Route111_MapAttributes: @ 83F8324 .4byte 0x28 .4byte 0x8c @@ -376,12 +457,15 @@ Route111_MapAttributes: @ 83F8324 .4byte gTileset_General .4byte gTileset_Mauville + .align 2 Route112_MapBorder: @ 83F833C .incbin "data/maps/Route112/border.bin" + .align 2 Route112_MapBlockdata: @ 83F8344 .incbin "data/maps/Route112/map.bin" + .align 2 Route112_MapAttributes: @ 83F9604 .4byte 0x28 .4byte 0x3c @@ -390,12 +474,15 @@ Route112_MapAttributes: @ 83F9604 .4byte gTileset_General .4byte gTileset_Lavaridge + .align 2 Route113_MapBorder: @ 83F961C .incbin "data/maps/Route113/border.bin" + .align 2 Route113_MapBlockdata: @ 83F9624 .incbin "data/maps/Route113/map.bin" + .align 2 Route113_MapAttributes: @ 83FA5C4 .4byte 0x64 .4byte 0x14 @@ -404,12 +491,15 @@ Route113_MapAttributes: @ 83FA5C4 .4byte gTileset_General .4byte gTileset_Fallarbor + .align 2 Route114_MapBorder: @ 83FA5DC .incbin "data/maps/Route114/border.bin" + .align 2 Route114_MapBlockdata: @ 83FA5E4 .incbin "data/maps/Route114/map.bin" + .align 2 Route114_MapAttributes: @ 83FBEE4 .4byte 0x28 .4byte 0x50 @@ -418,12 +508,15 @@ Route114_MapAttributes: @ 83FBEE4 .4byte gTileset_General .4byte gTileset_Fallarbor + .align 2 Route115_MapBorder: @ 83FBEFC .incbin "data/maps/Route115/border.bin" + .align 2 Route115_MapBlockdata: @ 83FBF04 .incbin "data/maps/Route115/map.bin" + .align 2 Route115_MapAttributes: @ 83FD804 .4byte 0x28 .4byte 0x50 @@ -432,12 +525,15 @@ Route115_MapAttributes: @ 83FD804 .4byte gTileset_General .4byte gTileset_Fallarbor + .align 2 Route116_MapBorder: @ 83FD81C .incbin "data/maps/Route116/border.bin" + .align 2 Route116_MapBlockdata: @ 83FD824 .incbin "data/maps/Route116/map.bin" + .align 2 Route116_MapAttributes: @ 83FE7C4 .4byte 0x64 .4byte 0x14 @@ -446,12 +542,15 @@ Route116_MapAttributes: @ 83FE7C4 .4byte gTileset_General .4byte gTileset_Rustboro + .align 2 Route117_MapBorder: @ 83FE7DC .incbin "data/maps/Route117/border.bin" + .align 2 Route117_MapBlockdata: @ 83FE7E4 .incbin "data/maps/Route117/map.bin" + .align 2 Route117_MapAttributes: @ 83FF144 .4byte 0x3c .4byte 0x14 @@ -460,12 +559,15 @@ Route117_MapAttributes: @ 83FF144 .4byte gTileset_General .4byte gTileset_Mauville + .align 2 Route118_MapBorder: @ 83FF15C .incbin "data/maps/Route118/border.bin" + .align 2 Route118_MapBlockdata: @ 83FF164 .incbin "data/maps/Route118/map.bin" + .align 2 Route118_MapAttributes: @ 83FFDE4 .4byte 0x50 .4byte 0x14 @@ -474,12 +576,15 @@ Route118_MapAttributes: @ 83FFDE4 .4byte gTileset_General .4byte gTileset_Mauville + .align 2 Route119_MapBorder: @ 83FFDFC .incbin "data/maps/Route119/border.bin" + .align 2 Route119_MapBlockdata: @ 83FFE04 .incbin "data/maps/Route119/map.bin" + .align 2 Route119_MapAttributes: @ 84029C4 .4byte 0x28 .4byte 0x8c @@ -488,12 +593,15 @@ Route119_MapAttributes: @ 84029C4 .4byte gTileset_General .4byte gTileset_Fortree + .align 2 Route120_MapBorder: @ 84029DC .incbin "data/maps/Route120/border.bin" + .align 2 Route120_MapBlockdata: @ 84029E4 .incbin "data/maps/Route120/map.bin" + .align 2 Route120_MapAttributes: @ 8404924 .4byte 0x28 .4byte 0x64 @@ -502,12 +610,15 @@ Route120_MapAttributes: @ 8404924 .4byte gTileset_General .4byte gTileset_Fortree + .align 2 Route121_MapBorder: @ 840493C .incbin "data/maps/Route121/border.bin" + .align 2 Route121_MapBlockdata: @ 8404944 .incbin "data/maps/Route121/map.bin" + .align 2 Route121_MapAttributes: @ 84055C4 .4byte 0x50 .4byte 0x14 @@ -516,12 +627,15 @@ Route121_MapAttributes: @ 84055C4 .4byte gTileset_General .4byte gTileset_Lilycove + .align 2 Route122_MapBorder: @ 84055DC .incbin "data/maps/Route122/border.bin" + .align 2 Route122_MapBlockdata: @ 84055E4 .incbin "data/maps/Route122/map.bin" + .align 2 Route122_MapAttributes: @ 8406264 .4byte 0x28 .4byte 0x28 @@ -530,12 +644,15 @@ Route122_MapAttributes: @ 8406264 .4byte gTileset_General .4byte gTileset_Lilycove + .align 2 Route123_MapBorder: @ 840627C .incbin "data/maps/Route123/border.bin" + .align 2 Route123_MapBlockdata: @ 8406284 .incbin "data/maps/Route123/map.bin" + .align 2 Route123_MapAttributes: @ 8407864 .4byte 0x8c .4byte 0x14 @@ -544,12 +661,15 @@ Route123_MapAttributes: @ 8407864 .4byte gTileset_General .4byte gTileset_Lilycove + .align 2 Route124_MapBorder: @ 840787C .incbin "data/maps/Route124/border.bin" + .align 2 Route124_MapBlockdata: @ 8407884 .incbin "data/maps/Route124/map.bin" + .align 2 Route124_MapAttributes: @ 840AA84 .4byte 0x50 .4byte 0x50 @@ -558,12 +678,15 @@ Route124_MapAttributes: @ 840AA84 .4byte gTileset_General .4byte gTileset_Mossdeep + .align 2 Route125_MapBorder: @ 840AA9C .incbin "data/maps/Route125/border.bin" + .align 2 Route125_MapBlockdata: @ 840AAA4 .incbin "data/maps/Route125/map.bin" + .align 2 Route125_MapAttributes: @ 840C3A4 .4byte 0x50 .4byte 0x28 @@ -572,12 +695,15 @@ Route125_MapAttributes: @ 840C3A4 .4byte gTileset_General .4byte gTileset_Mossdeep + .align 2 Route126_MapBorder: @ 840C3BC .incbin "data/maps/Route126/border.bin" + .align 2 Route126_MapBlockdata: @ 840C3C4 .incbin "data/maps/Route126/map.bin" + .align 2 Route126_MapAttributes: @ 840F5C4 .4byte 0x50 .4byte 0x50 @@ -586,12 +712,15 @@ Route126_MapAttributes: @ 840F5C4 .4byte gTileset_General .4byte gTileset_Mossdeep + .align 2 Route127_MapBorder: @ 840F5DC .incbin "data/maps/Route127/border.bin" + .align 2 Route127_MapBlockdata: @ 840F5E4 .incbin "data/maps/Route127/map.bin" + .align 2 Route127_MapAttributes: @ 84127E4 .4byte 0x50 .4byte 0x50 @@ -600,12 +729,15 @@ Route127_MapAttributes: @ 84127E4 .4byte gTileset_General .4byte gTileset_Mossdeep + .align 2 Route128_MapBorder: @ 84127FC .incbin "data/maps/Route128/border.bin" + .align 2 Route128_MapBlockdata: @ 8412804 .incbin "data/maps/Route128/map.bin" + .align 2 Route128_MapAttributes: @ 8414D84 .4byte 0x78 .4byte 0x28 @@ -614,12 +746,15 @@ Route128_MapAttributes: @ 8414D84 .4byte gTileset_General .4byte gTileset_Mossdeep + .align 2 Route129_MapBorder: @ 8414D9C .incbin "data/maps/Route129/border.bin" + .align 2 Route129_MapBlockdata: @ 8414DA4 .incbin "data/maps/Route129/map.bin" + .align 2 Route129_MapAttributes: @ 84166A4 .4byte 0x50 .4byte 0x28 @@ -628,14 +763,18 @@ Route129_MapAttributes: @ 84166A4 .4byte gTileset_General .4byte gTileset_Mossdeep + .align 2 .incbin "baserom.gba", 0x4166bc, 0x1920 + .align 2 Route131_MapBorder: @ 8417FDC .incbin "data/maps/Route131/border.bin" + .align 2 Route131_MapBlockdata: @ 8417FE4 .incbin "data/maps/Route131/map.bin" + .align 2 Route131_MapAttributes: @ 84192A4 .4byte 0x3c .4byte 0x28 @@ -644,12 +783,15 @@ Route131_MapAttributes: @ 84192A4 .4byte gTileset_General .4byte gTileset_Pacifidlog + .align 2 Route132_MapBorder: @ 84192BC .incbin "data/maps/Route132/border.bin" + .align 2 Route132_MapBlockdata: @ 84192C4 .incbin "data/maps/Route132/map.bin" + .align 2 Route132_MapAttributes: @ 841ABC4 .4byte 0x50 .4byte 0x28 @@ -658,12 +800,15 @@ Route132_MapAttributes: @ 841ABC4 .4byte gTileset_General .4byte gTileset_Pacifidlog + .align 2 Route133_MapBorder: @ 841ABDC .incbin "data/maps/Route133/border.bin" + .align 2 Route133_MapBlockdata: @ 841ABE4 .incbin "data/maps/Route133/map.bin" + .align 2 Route133_MapAttributes: @ 841C4E4 .4byte 0x50 .4byte 0x28 @@ -672,12 +817,15 @@ Route133_MapAttributes: @ 841C4E4 .4byte gTileset_General .4byte gTileset_Pacifidlog + .align 2 Route134_MapBorder: @ 841C4FC .incbin "data/maps/Route134/border.bin" + .align 2 Route134_MapBlockdata: @ 841C504 .incbin "data/maps/Route134/map.bin" + .align 2 Route134_MapAttributes: @ 841DE04 .4byte 0x50 .4byte 0x28 @@ -686,12 +834,15 @@ Route134_MapAttributes: @ 841DE04 .4byte gTileset_General .4byte gTileset_Pacifidlog + .align 2 Underwater2_MapBorder: @ 841DE1C .incbin "data/maps/Underwater2/border.bin" + .align 2 Underwater2_MapBlockdata: @ 841DE24 .incbin "data/maps/Underwater2/map.bin" + .align 2 Underwater2_MapAttributes: @ 8421024 .4byte 0x50 .4byte 0x50 @@ -700,12 +851,15 @@ Underwater2_MapAttributes: @ 8421024 .4byte gTileset_General .4byte gTileset_Underwater + .align 2 Underwater3_MapBorder: @ 842103C .incbin "data/maps/Underwater3/border.bin" + .align 2 Underwater3_MapBlockdata: @ 8421044 .incbin "data/maps/Underwater3/map.bin" + .align 2 Underwater3_MapAttributes: @ 8424244 .4byte 0x50 .4byte 0x50 @@ -714,12 +868,15 @@ Underwater3_MapAttributes: @ 8424244 .4byte gTileset_General .4byte gTileset_Underwater + .align 2 Underwater4_MapBorder: @ 842425C .incbin "data/maps/Underwater4/border.bin" + .align 2 Underwater4_MapBlockdata: @ 8424264 .incbin "data/maps/Underwater4/map.bin" + .align 2 Underwater4_MapAttributes: @ 84267E4 .4byte 0x78 .4byte 0x28 @@ -728,14 +885,15 @@ Underwater4_MapAttributes: @ 84267E4 .4byte gTileset_General .4byte gTileset_Underwater + .align 2 LittlerootTown_BrendansHouse_1F_MapBorder: @ 84267FC .incbin "data/maps/LittlerootTown_BrendansHouse_1F/border.bin" + .align 2 LittlerootTown_BrendansHouse_1F_MapBlockdata: @ 8426804 .incbin "data/maps/LittlerootTown_BrendansHouse_1F/map.bin" - .incbin "baserom.gba", 0x4268ca, 0x2 - + .align 2 LittlerootTown_BrendansHouse_1F_MapAttributes: @ 84268CC .4byte 0xb .4byte 0x9 @@ -744,12 +902,15 @@ LittlerootTown_BrendansHouse_1F_MapAttributes: @ 84268CC .4byte gTileset_InsideBuilding .4byte gTileset_BrendansMaysHouse + .align 2 LittlerootTown_BrendansHouse_2F_MapBorder: @ 84268E4 .incbin "data/maps/LittlerootTown_BrendansHouse_2F/border.bin" + .align 2 LittlerootTown_BrendansHouse_2F_MapBlockdata: @ 84268EC .incbin "data/maps/LittlerootTown_BrendansHouse_2F/map.bin" + .align 2 LittlerootTown_BrendansHouse_2F_MapAttributes: @ 842697C .4byte 0x9 .4byte 0x8 @@ -758,14 +919,15 @@ LittlerootTown_BrendansHouse_2F_MapAttributes: @ 842697C .4byte gTileset_InsideBuilding .4byte gTileset_BrendansMaysHouse + .align 2 LittlerootTown_MaysHouse_1F_MapBorder: @ 8426994 .incbin "data/maps/LittlerootTown_MaysHouse_1F/border.bin" + .align 2 LittlerootTown_MaysHouse_1F_MapBlockdata: @ 842699C .incbin "data/maps/LittlerootTown_MaysHouse_1F/map.bin" - .incbin "baserom.gba", 0x426a62, 0x2 - + .align 2 LittlerootTown_MaysHouse_1F_MapAttributes: @ 8426A64 .4byte 0xb .4byte 0x9 @@ -774,12 +936,15 @@ LittlerootTown_MaysHouse_1F_MapAttributes: @ 8426A64 .4byte gTileset_InsideBuilding .4byte gTileset_BrendansMaysHouse + .align 2 LittlerootTown_MaysHouse_2F_MapBorder: @ 8426A7C .incbin "data/maps/LittlerootTown_MaysHouse_2F/border.bin" + .align 2 LittlerootTown_MaysHouse_2F_MapBlockdata: @ 8426A84 .incbin "data/maps/LittlerootTown_MaysHouse_2F/map.bin" + .align 2 LittlerootTown_MaysHouse_2F_MapAttributes: @ 8426B14 .4byte 0x9 .4byte 0x8 @@ -788,14 +953,15 @@ LittlerootTown_MaysHouse_2F_MapAttributes: @ 8426B14 .4byte gTileset_InsideBuilding .4byte gTileset_BrendansMaysHouse + .align 2 LittlerootTown_ProfessorBirchsLab_MapBorder: @ 8426B2C .incbin "data/maps/LittlerootTown_ProfessorBirchsLab/border.bin" + .align 2 LittlerootTown_ProfessorBirchsLab_MapBlockdata: @ 8426B34 .incbin "data/maps/LittlerootTown_ProfessorBirchsLab/map.bin" - .incbin "baserom.gba", 0x426c86, 0x2 - + .align 2 LittlerootTown_ProfessorBirchsLab_MapAttributes: @ 8426C88 .4byte 0xd .4byte 0xd @@ -804,12 +970,15 @@ LittlerootTown_ProfessorBirchsLab_MapAttributes: @ 8426C88 .4byte gTileset_InsideBuilding .4byte gTileset_Lab + .align 2 OldaleTown_House1_MapBorder: @ 8426CA0 .incbin "data/maps/OldaleTown_House1/border.bin" + .align 2 OldaleTown_House1_MapBlockdata: @ 8426CA8 .incbin "data/maps/OldaleTown_House1/map.bin" + .align 2 FallarborTown_House1_MapAttributes: @ 8426D5C LilycoveCity_House1_MapAttributes: @ 8426D5C LilycoveCity_House4_MapAttributes: @ 8426D5C @@ -826,12 +995,15 @@ VerdanturfTown_House_MapAttributes: @ 8426D5C .4byte gTileset_InsideBuilding .4byte gTileset_GenericBuilding + .align 2 OldaleTown_House2_MapBorder: @ 8426D74 .incbin "data/maps/OldaleTown_House2/border.bin" + .align 2 OldaleTown_House2_MapBlockdata: @ 8426D7C .incbin "data/maps/OldaleTown_House2/map.bin" + .align 2 FallarborTown_House2_MapAttributes: @ 8426E2C LilycoveCity_House3_MapAttributes: @ 8426E2C LilycoveCity_MoveDeletersHouse_MapAttributes: @ 8426E2C @@ -851,12 +1023,15 @@ VerdanturfTown_FriendshipRatersHouse_MapAttributes: @ 8426E2C .4byte gTileset_InsideBuilding .4byte gTileset_GenericBuilding + .align 2 OldaleTown_PokemonCenter_1F_MapBorder: @ 8426E44 .incbin "data/maps/OldaleTown_PokemonCenter_1F/border.bin" + .align 2 OldaleTown_PokemonCenter_1F_MapBlockdata: @ 8426E4C .incbin "data/maps/OldaleTown_PokemonCenter_1F/map.bin" + .align 2 BattleFrontier_PokemonCenter_1F_MapAttributes: @ 8426F48 DewfordTown_PokemonCenter_1F_MapAttributes: @ 8426F48 EverGrandeCity_PokemonCenter_1F_MapAttributes: @ 8426F48 @@ -879,12 +1054,15 @@ VerdanturfTown_PokemonCenter_1F_MapAttributes: @ 8426F48 .4byte gTileset_InsideBuilding .4byte gTileset_PokemonCenter + .align 2 OldaleTown_PokemonCenter_2F_MapBorder: @ 8426F60 .incbin "data/maps/OldaleTown_PokemonCenter_2F/border.bin" + .align 2 OldaleTown_PokemonCenter_2F_MapBlockdata: @ 8426F68 .incbin "data/maps/OldaleTown_PokemonCenter_2F/map.bin" + .align 2 BattleFrontier_PokemonCenter_2F_MapAttributes: @ 8427080 DewfordTown_PokemonCenter_2F_MapAttributes: @ 8427080 EverGrandeCity_PokemonCenter_2F_MapAttributes: @ 8427080 @@ -909,12 +1087,15 @@ VerdanturfTown_PokemonCenter_2F_MapAttributes: @ 8427080 .4byte gTileset_InsideBuilding .4byte gTileset_PokemonCenter + .align 2 OldaleTown_Mart_MapBorder: @ 8427098 .incbin "data/maps/OldaleTown_Mart/border.bin" + .align 2 OldaleTown_Mart_MapBlockdata: @ 84270A0 .incbin "data/maps/OldaleTown_Mart/map.bin" + .align 2 BattleFrontier_Mart_MapAttributes: @ 8427150 FallarborTown_Mart_MapAttributes: @ 8427150 FortreeCity_Mart_MapAttributes: @ 8427150 @@ -935,12 +1116,15 @@ VerdanturfTown_Mart_MapAttributes: @ 8427150 .4byte gTileset_InsideBuilding .4byte gTileset_Shop + .align 2 DewfordTown_House1_MapBorder: @ 8427168 .incbin "data/maps/DewfordTown_House1/border.bin" + .align 2 DewfordTown_House1_MapBlockdata: @ 8427170 .incbin "data/maps/DewfordTown_House1/map.bin" + .align 2 DewfordTown_House1_MapAttributes: @ 8427210 LavaridgeTown_House_MapAttributes: @ 8427210 Route111_OldLadysRestStop_MapAttributes: @ 8427210 @@ -951,12 +1135,15 @@ Route111_OldLadysRestStop_MapAttributes: @ 8427210 .4byte gTileset_InsideBuilding .4byte gTileset_GenericBuilding + .align 2 DewfordTown_Gym_MapBorder: @ 8427228 .incbin "data/maps/DewfordTown_Gym/border.bin" + .align 2 DewfordTown_Gym_MapBlockdata: @ 8427230 .incbin "data/maps/DewfordTown_Gym/map.bin" + .align 2 DewfordTown_Gym_MapAttributes: @ 8427620 .4byte 0x12 .4byte 0x1c @@ -965,14 +1152,15 @@ DewfordTown_Gym_MapAttributes: @ 8427620 .4byte gTileset_InsideBuilding .4byte gTileset_DewfordGym + .align 2 DewfordTown_Hall_MapBorder: @ 8427638 .incbin "data/maps/DewfordTown_Hall/border.bin" + .align 2 DewfordTown_Hall_MapBlockdata: @ 8427640 .incbin "data/maps/DewfordTown_Hall/map.bin" - .incbin "baserom.gba", 0x427772, 0x2 - + .align 2 DewfordTown_Hall_MapAttributes: @ 8427774 .4byte 0x11 .4byte 0x9 @@ -981,12 +1169,15 @@ DewfordTown_Hall_MapAttributes: @ 8427774 .4byte gTileset_InsideBuilding .4byte gTileset_GenericBuilding + .align 2 DewfordTown_House2_MapBorder: @ 842778C .incbin "data/maps/DewfordTown_House2/border.bin" + .align 2 DewfordTown_House2_MapBlockdata: @ 8427794 .incbin "data/maps/DewfordTown_House2/map.bin" + .align 2 DewfordTown_House2_MapAttributes: @ 8427848 Route113_GlassWorkshop_MapAttributes: @ 8427848 .4byte 0xa @@ -996,12 +1187,15 @@ Route113_GlassWorkshop_MapAttributes: @ 8427848 .4byte gTileset_InsideBuilding .4byte gTileset_GenericBuilding + .align 2 LavaridgeTown_HerbShop_MapBorder: @ 8427860 .incbin "data/maps/LavaridgeTown_HerbShop/border.bin" + .align 2 LavaridgeTown_HerbShop_MapBlockdata: @ 8427868 .incbin "data/maps/LavaridgeTown_HerbShop/map.bin" + .align 2 LavaridgeTown_HerbShop_MapAttributes: @ 8427918 .4byte 0xb .4byte 0x8 @@ -1010,14 +1204,15 @@ LavaridgeTown_HerbShop_MapAttributes: @ 8427918 .4byte gTileset_InsideBuilding .4byte gTileset_Shop + .align 2 LavaridgeTown_Gym_1F_MapBorder: @ 8427930 .incbin "data/maps/LavaridgeTown_Gym_1F/border.bin" + .align 2 LavaridgeTown_Gym_1F_MapBlockdata: @ 8427938 .incbin "data/maps/LavaridgeTown_Gym_1F/map.bin" - .incbin "baserom.gba", 0x427bbe, 0x2 - + .align 2 LavaridgeTown_Gym_1F_MapAttributes: @ 8427BC0 .4byte 0x11 .4byte 0x13 @@ -1026,14 +1221,15 @@ LavaridgeTown_Gym_1F_MapAttributes: @ 8427BC0 .4byte gTileset_InsideBuilding .4byte gTileset_LavaridgeGym + .align 2 LavaridgeTown_Gym_B1F_MapBorder: @ 8427BD8 .incbin "data/maps/LavaridgeTown_Gym_B1F/border.bin" + .align 2 LavaridgeTown_Gym_B1F_MapBlockdata: @ 8427BE0 .incbin "data/maps/LavaridgeTown_Gym_B1F/map.bin" - .incbin "baserom.gba", 0x427e66, 0x2 - + .align 2 LavaridgeTown_Gym_B1F_MapAttributes: @ 8427E68 .4byte 0x11 .4byte 0x13 @@ -1042,12 +1238,15 @@ LavaridgeTown_Gym_B1F_MapAttributes: @ 8427E68 .4byte gTileset_InsideBuilding .4byte gTileset_LavaridgeGym + .align 2 LavaridgeTown_PokemonCenter_1F_MapBorder: @ 8427E80 .incbin "data/maps/LavaridgeTown_PokemonCenter_1F/border.bin" + .align 2 LavaridgeTown_PokemonCenter_1F_MapBlockdata: @ 8427E88 .incbin "data/maps/LavaridgeTown_PokemonCenter_1F/map.bin" + .align 2 LavaridgeTown_PokemonCenter_1F_MapAttributes: @ 8427F84 .4byte 0xe .4byte 0x9 @@ -1056,14 +1255,18 @@ LavaridgeTown_PokemonCenter_1F_MapAttributes: @ 8427F84 .4byte gTileset_InsideBuilding .4byte gTileset_PokemonCenter + .align 2 .incbin "baserom.gba", 0x427f9c, 0x408 + .align 2 LilycoveCity_House2_MapBorder: @ 84283A4 .incbin "data/maps/LilycoveCity_House2/border.bin" + .align 2 LilycoveCity_House2_MapBlockdata: @ 84283AC .incbin "data/maps/LilycoveCity_House2/map.bin" + .align 2 LilycoveCity_House2_MapAttributes: @ 842842C .4byte 0x8 .4byte 0x8 @@ -1072,14 +1275,18 @@ LilycoveCity_House2_MapAttributes: @ 842842C .4byte gTileset_InsideBuilding .4byte gTileset_GenericBuilding + .align 2 .incbin "baserom.gba", 0x428444, 0x24 + .align 2 VerdanturfTown_WandasHouse_MapBorder: @ 8428468 .incbin "data/maps/VerdanturfTown_WandasHouse/border.bin" + .align 2 VerdanturfTown_WandasHouse_MapBlockdata: @ 8428470 .incbin "data/maps/VerdanturfTown_WandasHouse/map.bin" + .align 2 VerdanturfTown_WandasHouse_MapAttributes: @ 8428580 .4byte 0x11 .4byte 0x8 @@ -1088,12 +1295,15 @@ VerdanturfTown_WandasHouse_MapAttributes: @ 8428580 .4byte gTileset_InsideBuilding .4byte gTileset_GenericBuilding + .align 2 PacifidlogTown_House1_MapBorder: @ 8428598 .incbin "data/maps/PacifidlogTown_House1/border.bin" + .align 2 PacifidlogTown_House1_MapBlockdata: @ 84285A0 .incbin "data/maps/PacifidlogTown_House1/map.bin" + .align 2 PacifidlogTown_House1_MapAttributes: @ 8428654 PacifidlogTown_House3_MapAttributes: @ 8428654 PacifidlogTown_House5_MapAttributes: @ 8428654 @@ -1104,12 +1314,15 @@ PacifidlogTown_House5_MapAttributes: @ 8428654 .4byte gTileset_InsideBuilding .4byte gTileset_GenericBuilding + .align 2 PacifidlogTown_House2_MapBorder: @ 842866C .incbin "data/maps/PacifidlogTown_House2/border.bin" + .align 2 PacifidlogTown_House2_MapBlockdata: @ 8428674 .incbin "data/maps/PacifidlogTown_House2/map.bin" + .align 2 PacifidlogTown_House2_MapAttributes: @ 8428728 PacifidlogTown_House4_MapAttributes: @ 8428728 .4byte 0xa @@ -1119,12 +1332,15 @@ PacifidlogTown_House4_MapAttributes: @ 8428728 .4byte gTileset_InsideBuilding .4byte gTileset_GenericBuilding + .align 2 PetalburgCity_Gym_MapBorder: @ 8428740 .incbin "data/maps/PetalburgCity_Gym/border.bin" + .align 2 PetalburgCity_Gym_MapBlockdata: @ 8428748 .incbin "data/maps/PetalburgCity_Gym/map.bin" + .align 2 PetalburgCity_Gym_MapAttributes: @ 8428F28 .4byte 0x9 .4byte 0x70 @@ -1133,12 +1349,15 @@ PetalburgCity_Gym_MapAttributes: @ 8428F28 .4byte gTileset_InsideBuilding .4byte gTileset_PetalburgGym + .align 2 PetalburgCity_House2_MapBorder: @ 8428F40 .incbin "data/maps/PetalburgCity_House2/border.bin" + .align 2 PetalburgCity_House2_MapBlockdata: @ 8428F48 .incbin "data/maps/PetalburgCity_House2/map.bin" + .align 2 MossdeepCity_House4_MapAttributes: @ 8428FE8 PetalburgCity_House2_MapAttributes: @ 8428FE8 SlateportCity_House1_MapAttributes: @ 8428FE8 @@ -1149,14 +1368,15 @@ SlateportCity_House1_MapAttributes: @ 8428FE8 .4byte gTileset_InsideBuilding .4byte gTileset_GenericBuilding + .align 2 SlateportCity_SternsShipyard_1F_MapBorder: @ 8429000 .incbin "data/maps/SlateportCity_SternsShipyard_1F/border.bin" + .align 2 SlateportCity_SternsShipyard_1F_MapBlockdata: @ 8429008 .incbin "data/maps/SlateportCity_SternsShipyard_1F/map.bin" - .incbin "baserom.gba", 0x42927e, 0x2 - + .align 2 SlateportCity_SternsShipyard_1F_MapAttributes: @ 8429280 .4byte 0x15 .4byte 0xf @@ -1165,14 +1385,15 @@ SlateportCity_SternsShipyard_1F_MapAttributes: @ 8429280 .4byte gTileset_General .4byte gTileset_Facility + .align 2 SlateportCity_SternsShipyard_2F_MapBorder: @ 8429298 .incbin "data/maps/SlateportCity_SternsShipyard_2F/border.bin" + .align 2 SlateportCity_SternsShipyard_2F_MapBlockdata: @ 84292A0 .incbin "data/maps/SlateportCity_SternsShipyard_2F/map.bin" - .incbin "baserom.gba", 0x42949e, 0x2 - + .align 2 SlateportCity_SternsShipyard_2F_MapAttributes: @ 84294A0 .4byte 0x11 .4byte 0xf @@ -1181,14 +1402,18 @@ SlateportCity_SternsShipyard_2F_MapAttributes: @ 84294A0 .4byte gTileset_General .4byte gTileset_Facility + .align 2 .incbin "baserom.gba", 0x4294b8, 0x48 + .align 2 SlateportCity_PokemonFanClub_MapBorder: @ 8429500 .incbin "data/maps/SlateportCity_PokemonFanClub/border.bin" + .align 2 SlateportCity_PokemonFanClub_MapBlockdata: @ 8429508 .incbin "data/maps/SlateportCity_PokemonFanClub/map.bin" + .align 2 SlateportCity_PokemonFanClub_MapAttributes: @ 842963C .4byte 0xe .4byte 0xb @@ -1197,12 +1422,15 @@ SlateportCity_PokemonFanClub_MapAttributes: @ 842963C .4byte gTileset_InsideBuilding .4byte gTileset_PokemonFanClub + .align 2 SlateportCity_OceanicMuseum_1F_MapBorder: @ 8429654 .incbin "data/maps/SlateportCity_OceanicMuseum_1F/border.bin" + .align 2 SlateportCity_OceanicMuseum_1F_MapBlockdata: @ 842965C .incbin "data/maps/SlateportCity_OceanicMuseum_1F/map.bin" + .align 2 SlateportCity_OceanicMuseum_1F_MapAttributes: @ 84297C4 .4byte 0x14 .4byte 0x9 @@ -1211,12 +1439,15 @@ SlateportCity_OceanicMuseum_1F_MapAttributes: @ 84297C4 .4byte gTileset_InsideBuilding .4byte gTileset_OceanicMuseum + .align 2 SlateportCity_OceanicMuseum_2F_MapBorder: @ 84297DC .incbin "data/maps/SlateportCity_OceanicMuseum_2F/border.bin" + .align 2 SlateportCity_OceanicMuseum_2F_MapBlockdata: @ 84297E4 .incbin "data/maps/SlateportCity_OceanicMuseum_2F/map.bin" + .align 2 SlateportCity_OceanicMuseum_2F_MapAttributes: @ 842994C .4byte 0x14 .4byte 0x9 @@ -1225,12 +1456,15 @@ SlateportCity_OceanicMuseum_2F_MapAttributes: @ 842994C .4byte gTileset_InsideBuilding .4byte gTileset_OceanicMuseum + .align 2 SlateportCity_Harbor_MapBorder: @ 8429964 .incbin "data/maps/SlateportCity_Harbor/border.bin" + .align 2 SlateportCity_Harbor_MapBlockdata: @ 842996C .incbin "data/maps/SlateportCity_Harbor/map.bin" + .align 2 LilycoveCity_Harbor_MapAttributes: @ 8429C3C SlateportCity_Harbor_MapAttributes: @ 8429C3C .4byte 0x18 @@ -1240,12 +1474,15 @@ SlateportCity_Harbor_MapAttributes: @ 8429C3C .4byte gTileset_General .4byte gTileset_Facility + .align 2 MauvilleCity_Gym_MapBorder: @ 8429C54 .incbin "data/maps/MauvilleCity_Gym/border.bin" + .align 2 MauvilleCity_Gym_MapBlockdata: @ 8429C5C .incbin "data/maps/MauvilleCity_Gym/map.bin" + .align 2 MauvilleCity_Gym_MapAttributes: @ 8429E00 .4byte 0xa .4byte 0x15 @@ -1254,12 +1491,15 @@ MauvilleCity_Gym_MapAttributes: @ 8429E00 .4byte gTileset_InsideBuilding .4byte gTileset_MauvilleGym + .align 2 MauvilleCity_BikeShop_MapBorder: @ 8429E18 .incbin "data/maps/MauvilleCity_BikeShop/border.bin" + .align 2 MauvilleCity_BikeShop_MapBlockdata: @ 8429E20 .incbin "data/maps/MauvilleCity_BikeShop/map.bin" + .align 2 MauvilleCity_BikeShop_MapAttributes: @ 8429EF8 .4byte 0xc .4byte 0x9 @@ -1268,12 +1508,15 @@ MauvilleCity_BikeShop_MapAttributes: @ 8429EF8 .4byte gTileset_General .4byte gTileset_BikeShop + .align 2 MauvilleCity_GameCorner_MapBorder: @ 8429F10 .incbin "data/maps/MauvilleCity_GameCorner/border.bin" + .align 2 MauvilleCity_GameCorner_MapBlockdata: @ 8429F18 .incbin "data/maps/MauvilleCity_GameCorner/map.bin" + .align 2 MauvilleCity_GameCorner_MapAttributes: @ 842A0FC .4byte 0x16 .4byte 0xb @@ -1282,14 +1525,15 @@ MauvilleCity_GameCorner_MapAttributes: @ 842A0FC .4byte gTileset_InsideBuilding .4byte gTileset_MauvilleGameCorner + .align 2 RustboroCity_DevonCorp_1F_MapBorder: @ 842A114 .incbin "data/maps/RustboroCity_DevonCorp_1F/border.bin" + .align 2 RustboroCity_DevonCorp_1F_MapBlockdata: @ 842A11C .incbin "data/maps/RustboroCity_DevonCorp_1F/map.bin" - .incbin "baserom.gba", 0x42a272, 0x2 - + .align 2 RustboroCity_DevonCorp_1F_MapAttributes: @ 842A274 .4byte 0x13 .4byte 0x9 @@ -1298,14 +1542,15 @@ RustboroCity_DevonCorp_1F_MapAttributes: @ 842A274 .4byte gTileset_InsideBuilding .4byte gTileset_Facility + .align 2 RustboroCity_DevonCorp_2F_MapBorder: @ 842A28C .incbin "data/maps/RustboroCity_DevonCorp_2F/border.bin" + .align 2 RustboroCity_DevonCorp_2F_MapBlockdata: @ 842A294 .incbin "data/maps/RustboroCity_DevonCorp_2F/map.bin" - .incbin "baserom.gba", 0x42a3ea, 0x2 - + .align 2 RustboroCity_DevonCorp_2F_MapAttributes: @ 842A3EC .4byte 0x13 .4byte 0x9 @@ -1314,12 +1559,15 @@ RustboroCity_DevonCorp_2F_MapAttributes: @ 842A3EC .4byte gTileset_General .4byte gTileset_Facility + .align 2 RustboroCity_Gym_MapBorder: @ 842A404 .incbin "data/maps/RustboroCity_Gym/border.bin" + .align 2 RustboroCity_Gym_MapBlockdata: @ 842A40C .incbin "data/maps/RustboroCity_Gym/map.bin" + .align 2 RustboroCity_Gym_MapAttributes: @ 842A5C4 .4byte 0xb .4byte 0x14 @@ -1328,12 +1576,15 @@ RustboroCity_Gym_MapAttributes: @ 842A5C4 .4byte gTileset_InsideBuilding .4byte gTileset_RustboroGym + .align 2 RustboroCity_PokemonSchool_MapBorder: @ 842A5DC .incbin "data/maps/RustboroCity_PokemonSchool/border.bin" + .align 2 RustboroCity_PokemonSchool_MapBlockdata: @ 842A5E4 .incbin "data/maps/RustboroCity_PokemonSchool/map.bin" + .align 2 RustboroCity_PokemonSchool_MapAttributes: @ 842A6EC .4byte 0xc .4byte 0xb @@ -1342,12 +1593,15 @@ RustboroCity_PokemonSchool_MapAttributes: @ 842A6EC .4byte gTileset_InsideBuilding .4byte gTileset_PokemonSchool + .align 2 RustboroCity_House2_MapBorder: @ 842A704 .incbin "data/maps/RustboroCity_House2/border.bin" + .align 2 RustboroCity_House2_MapBlockdata: @ 842A70C .incbin "data/maps/RustboroCity_House2/map.bin" + .align 2 RustboroCity_House2_MapAttributes: @ 842A7E4 RustboroCity_House3_MapAttributes: @ 842A7E4 .4byte 0xc @@ -1357,12 +1611,15 @@ RustboroCity_House3_MapAttributes: @ 842A7E4 .4byte gTileset_InsideBuilding .4byte gTileset_GenericBuilding + .align 2 RustboroCity_House1_MapBorder: @ 842A7FC .incbin "data/maps/RustboroCity_House1/border.bin" + .align 2 RustboroCity_House1_MapBlockdata: @ 842A804 .incbin "data/maps/RustboroCity_House1/map.bin" + .align 2 RustboroCity_House1_MapAttributes: @ 842A8D4 .4byte 0xd .4byte 0x8 @@ -1371,14 +1628,15 @@ RustboroCity_House1_MapAttributes: @ 842A8D4 .4byte gTileset_InsideBuilding .4byte gTileset_GenericBuilding + .align 2 RustboroCity_CuttersHouse_MapBorder: @ 842A8EC .incbin "data/maps/RustboroCity_CuttersHouse/border.bin" + .align 2 RustboroCity_CuttersHouse_MapBlockdata: @ 842A8F4 .incbin "data/maps/RustboroCity_CuttersHouse/map.bin" - .incbin "baserom.gba", 0x42a9ba, 0x2 - + .align 2 RustboroCity_CuttersHouse_MapAttributes: @ 842A9BC .4byte 0xb .4byte 0x9 @@ -1387,12 +1645,15 @@ RustboroCity_CuttersHouse_MapAttributes: @ 842A9BC .4byte gTileset_InsideBuilding .4byte gTileset_GenericBuilding + .align 2 FortreeCity_House1_MapBorder: @ 842A9D4 .incbin "data/maps/FortreeCity_House1/border.bin" + .align 2 FortreeCity_House1_MapBlockdata: @ 842A9DC .incbin "data/maps/FortreeCity_House1/map.bin" + .align 2 FortreeCity_House1_MapAttributes: @ 842AA3C FortreeCity_House3_MapAttributes: @ 842AA3C FortreeCity_House5_MapAttributes: @ 842AA3C @@ -1403,12 +1664,15 @@ FortreeCity_House5_MapAttributes: @ 842AA3C .4byte gTileset_InsideBuilding .4byte gTileset_GenericBuilding + .align 2 FortreeCity_Gym_MapBorder: @ 842AA54 .incbin "data/maps/FortreeCity_Gym/border.bin" + .align 2 FortreeCity_Gym_MapBlockdata: @ 842AA5C .incbin "data/maps/FortreeCity_Gym/map.bin" + .align 2 FortreeCity_Gym_MapAttributes: @ 842AE44 .4byte 0x14 .4byte 0x19 @@ -1417,12 +1681,15 @@ FortreeCity_Gym_MapAttributes: @ 842AE44 .4byte gTileset_InsideBuilding .4byte gTileset_FortreeGym + .align 2 FortreeCity_House2_MapBorder: @ 842AE5C .incbin "data/maps/FortreeCity_House2/border.bin" + .align 2 FortreeCity_House2_MapBlockdata: @ 842AE64 .incbin "data/maps/FortreeCity_House2/map.bin" + .align 2 FortreeCity_House2_MapAttributes: @ 842AEC4 FortreeCity_House4_MapAttributes: @ 842AEC4 .4byte 0x8 @@ -1432,12 +1699,15 @@ FortreeCity_House4_MapAttributes: @ 842AEC4 .4byte gTileset_InsideBuilding .4byte gTileset_GenericBuilding + .align 2 Route104_MrBrineysHouse_MapBorder: @ 842AEDC .incbin "data/maps/Route104_MrBrineysHouse/border.bin" + .align 2 Route104_MrBrineysHouse_MapBlockdata: @ 842AEE4 .incbin "data/maps/Route104_MrBrineysHouse/map.bin" + .align 2 Route104_MrBrineysHouse_MapAttributes: @ 842AFBC .4byte 0xc .4byte 0x9 @@ -1446,12 +1716,15 @@ Route104_MrBrineysHouse_MapAttributes: @ 842AFBC .4byte gTileset_InsideBuilding .4byte gTileset_GenericBuilding + .align 2 LilycoveCity_LilycoveMuseum_1F_MapBorder: @ 842AFD4 .incbin "data/maps/LilycoveCity_LilycoveMuseum_1F/border.bin" + .align 2 LilycoveCity_LilycoveMuseum_1F_MapBlockdata: @ 842AFDC .incbin "data/maps/LilycoveCity_LilycoveMuseum_1F/map.bin" + .align 2 LilycoveCity_LilycoveMuseum_1F_MapAttributes: @ 842B228 .4byte 0x15 .4byte 0xe @@ -1460,12 +1733,15 @@ LilycoveCity_LilycoveMuseum_1F_MapAttributes: @ 842B228 .4byte gTileset_InsideBuilding .4byte gTileset_LilycoveMuseum + .align 2 LilycoveCity_LilycoveMuseum_2F_MapBorder: @ 842B240 .incbin "data/maps/LilycoveCity_LilycoveMuseum_2F/border.bin" + .align 2 LilycoveCity_LilycoveMuseum_2F_MapBlockdata: @ 842B248 .incbin "data/maps/LilycoveCity_LilycoveMuseum_2F/map.bin" + .align 2 LilycoveCity_LilycoveMuseum_2F_MapAttributes: @ 842B484 .4byte 0x16 .4byte 0xd @@ -1474,12 +1750,15 @@ LilycoveCity_LilycoveMuseum_2F_MapAttributes: @ 842B484 .4byte gTileset_InsideBuilding .4byte gTileset_LilycoveMuseum + .align 2 LilycoveCity_ContestLobby_MapBorder: @ 842B49C .incbin "data/maps/LilycoveCity_ContestLobby/border.bin" + .align 2 LilycoveCity_ContestLobby_MapBlockdata: @ 842B4A4 .incbin "data/maps/LilycoveCity_ContestLobby/map.bin" + .align 2 LilycoveCity_ContestLobby_MapAttributes: @ 842B78C .4byte 0x1f .4byte 0xc @@ -1488,14 +1767,15 @@ LilycoveCity_ContestLobby_MapAttributes: @ 842B78C .4byte gTileset_InsideBuilding .4byte gTileset_Contest + .align 2 LilycoveCity_ContestHall_MapBorder: @ 842B7A4 .incbin "data/maps/LilycoveCity_ContestHall/border.bin" + .align 2 LilycoveCity_ContestHall_MapBlockdata: @ 842B7AC .incbin "data/maps/LilycoveCity_ContestHall/map.bin" - .incbin "baserom.gba", 0x42c4d2, 0x2 - + .align 2 LilycoveCity_ContestHall_MapAttributes: @ 842C4D4 .4byte 0x33 .4byte 0x21 @@ -1504,12 +1784,15 @@ LilycoveCity_ContestHall_MapAttributes: @ 842C4D4 .4byte gTileset_InsideBuilding .4byte gTileset_Contest + .align 2 LilycoveCity_PokemonTrainerFanClub_MapBorder: @ 842C4EC .incbin "data/maps/LilycoveCity_PokemonTrainerFanClub/border.bin" + .align 2 LilycoveCity_PokemonTrainerFanClub_MapBlockdata: @ 842C4F4 .incbin "data/maps/LilycoveCity_PokemonTrainerFanClub/map.bin" + .align 2 LilycoveCity_PokemonTrainerFanClub_MapAttributes: @ 842C644 .4byte 0xc .4byte 0xe @@ -1518,12 +1801,15 @@ LilycoveCity_PokemonTrainerFanClub_MapAttributes: @ 842C644 .4byte gTileset_InsideBuilding .4byte gTileset_GenericBuilding + .align 2 MossdeepCity_Gym_MapBorder: @ 842C65C .incbin "data/maps/MossdeepCity_Gym/border.bin" + .align 2 MossdeepCity_Gym_MapBlockdata: @ 842C664 .incbin "data/maps/MossdeepCity_Gym/map.bin" + .align 2 MossdeepCity_Gym_MapAttributes: @ 842CDB4 .4byte 0x1a .4byte 0x24 @@ -1532,12 +1818,15 @@ MossdeepCity_Gym_MapAttributes: @ 842CDB4 .4byte gTileset_InsideBuilding .4byte gTileset_MossdeepGym + .align 2 SootopolisCity_Gym_1F_MapBorder: @ 842CDCC .incbin "data/maps/SootopolisCity_Gym_1F/border.bin" + .align 2 SootopolisCity_Gym_1F_MapBlockdata: @ 842CDD4 .incbin "data/maps/SootopolisCity_Gym_1F/map.bin" + .align 2 SootopolisCity_Gym_1F_MapAttributes: @ 842D148 .4byte 0x11 .4byte 0x1a @@ -1546,12 +1835,15 @@ SootopolisCity_Gym_1F_MapAttributes: @ 842D148 .4byte gTileset_InsideBuilding .4byte gTileset_SootopolisGym + .align 2 SootopolisCity_Gym_B1F_MapBorder: @ 842D160 .incbin "data/maps/SootopolisCity_Gym_B1F/border.bin" + .align 2 SootopolisCity_Gym_B1F_MapBlockdata: @ 842D168 .incbin "data/maps/SootopolisCity_Gym_B1F/map.bin" + .align 2 SootopolisCity_Gym_B1F_MapAttributes: @ 842D4DC .4byte 0x11 .4byte 0x1a @@ -1560,12 +1852,15 @@ SootopolisCity_Gym_B1F_MapAttributes: @ 842D4DC .4byte gTileset_InsideBuilding .4byte gTileset_SootopolisGym + .align 2 EverGrandeCity_SidneysRoom_MapBorder: @ 842D4F4 .incbin "data/maps/EverGrandeCity_SidneysRoom/border.bin" + .align 2 EverGrandeCity_SidneysRoom_MapBlockdata: @ 842D4FC .incbin "data/maps/EverGrandeCity_SidneysRoom/map.bin" + .align 2 EverGrandeCity_SidneysRoom_MapAttributes: @ 842D668 .4byte 0xd .4byte 0xe @@ -1574,12 +1869,15 @@ EverGrandeCity_SidneysRoom_MapAttributes: @ 842D668 .4byte gTileset_InsideBuilding .4byte gTileset_EliteFour + .align 2 EverGrandeCity_PhoebesRoom_MapBorder: @ 842D680 .incbin "data/maps/EverGrandeCity_PhoebesRoom/border.bin" + .align 2 EverGrandeCity_PhoebesRoom_MapBlockdata: @ 842D688 .incbin "data/maps/EverGrandeCity_PhoebesRoom/map.bin" + .align 2 EverGrandeCity_PhoebesRoom_MapAttributes: @ 842D7F4 .4byte 0xd .4byte 0xe @@ -1588,12 +1886,15 @@ EverGrandeCity_PhoebesRoom_MapAttributes: @ 842D7F4 .4byte gTileset_InsideBuilding .4byte gTileset_EliteFour + .align 2 EverGrandeCity_GlaciasRoom_MapBorder: @ 842D80C .incbin "data/maps/EverGrandeCity_GlaciasRoom/border.bin" + .align 2 EverGrandeCity_GlaciasRoom_MapBlockdata: @ 842D814 .incbin "data/maps/EverGrandeCity_GlaciasRoom/map.bin" + .align 2 EverGrandeCity_GlaciasRoom_MapAttributes: @ 842D980 .4byte 0xd .4byte 0xe @@ -1602,12 +1903,15 @@ EverGrandeCity_GlaciasRoom_MapAttributes: @ 842D980 .4byte gTileset_InsideBuilding .4byte gTileset_EliteFour + .align 2 EverGrandeCity_DrakesRoom_MapBorder: @ 842D998 .incbin "data/maps/EverGrandeCity_DrakesRoom/border.bin" + .align 2 EverGrandeCity_DrakesRoom_MapBlockdata: @ 842D9A0 .incbin "data/maps/EverGrandeCity_DrakesRoom/map.bin" + .align 2 EverGrandeCity_DrakesRoom_MapAttributes: @ 842DB0C .4byte 0xd .4byte 0xe @@ -1616,14 +1920,15 @@ EverGrandeCity_DrakesRoom_MapAttributes: @ 842DB0C .4byte gTileset_InsideBuilding .4byte gTileset_EliteFour + .align 2 EverGrandeCity_ChampionsRoom_MapBorder: @ 842DB24 .incbin "data/maps/EverGrandeCity_ChampionsRoom/border.bin" + .align 2 EverGrandeCity_ChampionsRoom_MapBlockdata: @ 842DB2C .incbin "data/maps/EverGrandeCity_ChampionsRoom/map.bin" - .incbin "baserom.gba", 0x42dc7e, 0x2 - + .align 2 EverGrandeCity_ChampionsRoom_MapAttributes: @ 842DC80 .4byte 0xd .4byte 0xd @@ -1632,14 +1937,15 @@ EverGrandeCity_ChampionsRoom_MapAttributes: @ 842DC80 .4byte gTileset_InsideBuilding .4byte gTileset_EliteFour + .align 2 EverGrandeCity_Hall1_MapBorder: @ 842DC98 .incbin "data/maps/EverGrandeCity_Hall1/border.bin" + .align 2 EverGrandeCity_Hall1_MapBlockdata: @ 842DCA0 .incbin "data/maps/EverGrandeCity_Hall1/map.bin" - .incbin "baserom.gba", 0x42ddbe, 0x2 - + .align 2 EverGrandeCity_Hall1_MapAttributes: @ 842DDC0 EverGrandeCity_Hall2_MapAttributes: @ 842DDC0 EverGrandeCity_Hall3_MapAttributes: @ 842DDC0 @@ -1651,14 +1957,15 @@ EverGrandeCity_Hall5_MapAttributes: @ 842DDC0 .4byte gTileset_InsideBuilding .4byte gTileset_EliteFour + .align 2 Route104_PrettyPetalFlowerShop_MapBorder: @ 842DDD8 .incbin "data/maps/Route104_PrettyPetalFlowerShop/border.bin" + .align 2 Route104_PrettyPetalFlowerShop_MapBlockdata: @ 842DDE0 .incbin "data/maps/Route104_PrettyPetalFlowerShop/map.bin" - .incbin "baserom.gba", 0x42deee, 0x2 - + .align 2 Route104_PrettyPetalFlowerShop_MapAttributes: @ 842DEF0 Route104_PrototypePrettyPetalFlowerShop_MapAttributes: @ 842DEF0 .4byte 0xf @@ -1668,12 +1975,15 @@ Route104_PrototypePrettyPetalFlowerShop_MapAttributes: @ 842DEF0 .4byte gTileset_InsideBuilding .4byte gTileset_PrettyPetalFlowerShop + .align 2 Route112_CableCarStation_MapBorder: @ 842DF08 .incbin "data/maps/Route112_CableCarStation/border.bin" + .align 2 Route112_CableCarStation_MapBlockdata: @ 842DF10 .incbin "data/maps/Route112_CableCarStation/map.bin" + .align 2 MtChimney_CableCarStation_MapAttributes: @ 842E048 Route112_CableCarStation_MapAttributes: @ 842E048 .4byte 0xd @@ -1683,12 +1993,15 @@ Route112_CableCarStation_MapAttributes: @ 842E048 .4byte gTileset_General .4byte gTileset_Facility + .align 2 Route114_FossilManiacsHouse_MapBorder: @ 842E060 .incbin "data/maps/Route114_FossilManiacsHouse/border.bin" + .align 2 Route114_FossilManiacsHouse_MapBlockdata: @ 842E068 .incbin "data/maps/Route114_FossilManiacsHouse/map.bin" + .align 2 Route114_FossilManiacsHouse_MapAttributes: @ 842E108 .4byte 0xa .4byte 0x8 @@ -1697,12 +2010,15 @@ Route114_FossilManiacsHouse_MapAttributes: @ 842E108 .4byte gTileset_InsideBuilding .4byte gTileset_GenericBuilding + .align 2 Route114_FossilManiacsTunnel_MapBorder: @ 842E120 .incbin "data/maps/Route114_FossilManiacsTunnel/border.bin" + .align 2 Route114_FossilManiacsTunnel_MapBlockdata: @ 842E128 .incbin "data/maps/Route114_FossilManiacsTunnel/map.bin" + .align 2 Route114_FossilManiacsTunnel_MapAttributes: @ 842E3CC .4byte 0xd .4byte 0x1a @@ -1711,12 +2027,15 @@ Route114_FossilManiacsTunnel_MapAttributes: @ 842E3CC .4byte gTileset_General .4byte gTileset_Fallarbor + .align 2 Route114_LanettesHouse_MapBorder: @ 842E3E4 .incbin "data/maps/Route114_LanettesHouse/border.bin" + .align 2 Route114_LanettesHouse_MapBlockdata: @ 842E3EC .incbin "data/maps/Route114_LanettesHouse/map.bin" + .align 2 Route114_LanettesHouse_MapAttributes: @ 842E49C .4byte 0xb .4byte 0x8 @@ -1725,12 +2044,15 @@ Route114_LanettesHouse_MapAttributes: @ 842E49C .4byte gTileset_InsideBuilding .4byte gTileset_Lab + .align 2 Route116_TunnelersRestHouse_MapBorder: @ 842E4B4 .incbin "data/maps/Route116_TunnelersRestHouse/border.bin" + .align 2 Route116_TunnelersRestHouse_MapBlockdata: @ 842E4BC .incbin "data/maps/Route116_TunnelersRestHouse/map.bin" + .align 2 Route116_TunnelersRestHouse_MapAttributes: @ 842E570 .4byte 0xa .4byte 0x9 @@ -1739,12 +2061,15 @@ Route116_TunnelersRestHouse_MapAttributes: @ 842E570 .4byte gTileset_InsideBuilding .4byte gTileset_GenericBuilding + .align 2 Route117_PokemonDayCare_MapBorder: @ 842E588 .incbin "data/maps/Route117_PokemonDayCare/border.bin" + .align 2 Route117_PokemonDayCare_MapBlockdata: @ 842E590 .incbin "data/maps/Route117_PokemonDayCare/map.bin" + .align 2 Route117_PokemonDayCare_MapAttributes: @ 842E668 .4byte 0xc .4byte 0x9 @@ -1753,12 +2078,15 @@ Route117_PokemonDayCare_MapAttributes: @ 842E668 .4byte gTileset_InsideBuilding .4byte gTileset_PokemonDayCare + .align 2 Route121_SafariZoneEntrance_MapBorder: @ 842E680 .incbin "data/maps/Route121_SafariZoneEntrance/border.bin" + .align 2 Route121_SafariZoneEntrance_MapBlockdata: @ 842E688 .incbin "data/maps/Route121_SafariZoneEntrance/map.bin" + .align 2 Route121_SafariZoneEntrance_MapAttributes: @ 842E880 .4byte 0x12 .4byte 0xe @@ -1767,12 +2095,15 @@ Route121_SafariZoneEntrance_MapAttributes: @ 842E880 .4byte gTileset_InsideBuilding .4byte gTileset_Shop + .align 2 MeteorFalls_1F_1R_MapBorder: @ 842E898 .incbin "data/maps/MeteorFalls_1F_1R/border.bin" + .align 2 MeteorFalls_1F_1R_MapBlockdata: @ 842E8A0 .incbin "data/maps/MeteorFalls_1F_1R/map.bin" + .align 2 MeteorFalls_1F_1R_MapAttributes: @ 842F278 .4byte 0x1e .4byte 0x2a @@ -1781,12 +2112,15 @@ MeteorFalls_1F_1R_MapAttributes: @ 842F278 .4byte gTileset_General .4byte gTileset_MeteorFalls + .align 2 MeteorFalls_1F_2R_MapBorder: @ 842F290 .incbin "data/maps/MeteorFalls_1F_2R/border.bin" + .align 2 MeteorFalls_1F_2R_MapBlockdata: @ 842F298 .incbin "data/maps/MeteorFalls_1F_2R/map.bin" + .align 2 MeteorFalls_1F_2R_MapAttributes: @ 842FA18 .4byte 0x1e .4byte 0x20 @@ -1795,12 +2129,15 @@ MeteorFalls_1F_2R_MapAttributes: @ 842FA18 .4byte gTileset_General .4byte gTileset_MeteorFalls + .align 2 MeteorFalls_B1F_1R_MapBorder: @ 842FA30 .incbin "data/maps/MeteorFalls_B1F_1R/border.bin" + .align 2 MeteorFalls_B1F_1R_MapBlockdata: @ 842FA38 .incbin "data/maps/MeteorFalls_B1F_1R/map.bin" + .align 2 MeteorFalls_B1F_1R_MapAttributes: @ 84302D4 .4byte 0x1d .4byte 0x26 @@ -1809,12 +2146,15 @@ MeteorFalls_B1F_1R_MapAttributes: @ 84302D4 .4byte gTileset_General .4byte gTileset_MeteorFalls + .align 2 MeteorFalls_B1F_2R_MapBorder: @ 84302EC .incbin "data/maps/MeteorFalls_B1F_2R/border.bin" + .align 2 MeteorFalls_B1F_2R_MapBlockdata: @ 84302F4 .incbin "data/maps/MeteorFalls_B1F_2R/map.bin" + .align 2 MeteorFalls_B1F_2R_MapAttributes: @ 8430480 .4byte 0xb .4byte 0x12 @@ -1823,12 +2163,15 @@ MeteorFalls_B1F_2R_MapAttributes: @ 8430480 .4byte gTileset_General .4byte gTileset_MeteorFalls + .align 2 RusturfTunnel_MapBorder: @ 8430498 .incbin "data/maps/RusturfTunnel/border.bin" + .align 2 RusturfTunnel_MapBlockdata: @ 84304A0 .incbin "data/maps/RusturfTunnel/map.bin" + .align 2 RusturfTunnel_MapAttributes: @ 8430B60 .4byte 0x24 .4byte 0x18 @@ -1837,12 +2180,15 @@ RusturfTunnel_MapAttributes: @ 8430B60 .4byte gTileset_General .4byte gTileset_RusturfTunnel + .align 2 Underwater_SootopolisCity_MapBorder: @ 8430B78 .incbin "data/maps/Underwater_SootopolisCity/border.bin" + .align 2 Underwater_SootopolisCity_MapBlockdata: @ 8430B80 .incbin "data/maps/Underwater_SootopolisCity/map.bin" + .align 2 Underwater_SootopolisCity_MapAttributes: @ 8430D10 .4byte 0x14 .4byte 0xa @@ -1851,14 +2197,15 @@ Underwater_SootopolisCity_MapAttributes: @ 8430D10 .4byte gTileset_General .4byte gTileset_Underwater + .align 2 DesertRuins_MapBorder: @ 8430D28 .incbin "data/maps/DesertRuins/border.bin" + .align 2 DesertRuins_MapBlockdata: @ 8430D30 .incbin "data/maps/DesertRuins/map.bin" - .incbin "baserom.gba", 0x431192, 0x2 - + .align 2 DesertRuins_MapAttributes: @ 8431194 .4byte 0x11 .4byte 0x21 @@ -1867,12 +2214,15 @@ DesertRuins_MapAttributes: @ 8431194 .4byte gTileset_General .4byte gTileset_Cave + .align 2 GraniteCave_1F_MapBorder: @ 84311AC .incbin "data/maps/GraniteCave_1F/border.bin" + .align 2 GraniteCave_1F_MapBlockdata: @ 84311B4 .incbin "data/maps/GraniteCave_1F/map.bin" + .align 2 GraniteCave_1F_MapAttributes: @ 84316A0 .4byte 0x2a .4byte 0xf @@ -1881,12 +2231,15 @@ GraniteCave_1F_MapAttributes: @ 84316A0 .4byte gTileset_General .4byte gTileset_Cave + .align 2 GraniteCave_B1F_MapBorder: @ 84316B8 .incbin "data/maps/GraniteCave_B1F/border.bin" + .align 2 GraniteCave_B1F_MapBlockdata: @ 84316C0 .incbin "data/maps/GraniteCave_B1F/map.bin" + .align 2 GraniteCave_B1F_MapAttributes: @ 8431D40 .4byte 0x20 .4byte 0x1a @@ -1895,12 +2248,15 @@ GraniteCave_B1F_MapAttributes: @ 8431D40 .4byte gTileset_General .4byte gTileset_Cave + .align 2 GraniteCave_B2F_MapBorder: @ 8431D58 .incbin "data/maps/GraniteCave_B2F/border.bin" + .align 2 GraniteCave_B2F_MapBlockdata: @ 8431D60 .incbin "data/maps/GraniteCave_B2F/map.bin" + .align 2 GraniteCave_B2F_MapAttributes: @ 84323E0 .4byte 0x20 .4byte 0x1a @@ -1909,12 +2265,15 @@ GraniteCave_B2F_MapAttributes: @ 84323E0 .4byte gTileset_General .4byte gTileset_Cave + .align 2 PetalburgWoods_MapBorder: @ 84323F8 .incbin "data/maps/PetalburgWoods/border.bin" + .align 2 PetalburgWoods_MapBlockdata: @ 8432400 .incbin "data/maps/PetalburgWoods/map.bin" + .align 2 PetalburgWoods_MapAttributes: @ 8433480 .4byte 0x30 .4byte 0x2c @@ -1923,12 +2282,15 @@ PetalburgWoods_MapAttributes: @ 8433480 .4byte gTileset_General .4byte gTileset_Rustboro + .align 2 MtChimney_MapBorder: @ 8433498 .incbin "data/maps/MtChimney/border.bin" + .align 2 MtChimney_MapBlockdata: @ 84334A0 .incbin "data/maps/MtChimney/map.bin" + .align 2 MtChimney_MapAttributes: @ 8434350 .4byte 0x28 .4byte 0x2f @@ -1937,12 +2299,15 @@ MtChimney_MapAttributes: @ 8434350 .4byte gTileset_General .4byte gTileset_Lavaridge + .align 2 MtPyre_1F_MapBorder: @ 8434368 .incbin "data/maps/MtPyre_1F/border.bin" + .align 2 MtPyre_1F_MapBlockdata: @ 8434370 .incbin "data/maps/MtPyre_1F/map.bin" + .align 2 MtPyre_1F_MapAttributes: @ 84346B4 .4byte 0x16 .4byte 0x13 @@ -1951,14 +2316,15 @@ MtPyre_1F_MapAttributes: @ 84346B4 .4byte gTileset_General .4byte gTileset_Facility + .align 2 MtPyre_2F_MapBorder: @ 84346CC .incbin "data/maps/MtPyre_2F/border.bin" + .align 2 MtPyre_2F_MapBlockdata: @ 84346D4 .incbin "data/maps/MtPyre_2F/map.bin" - .incbin "baserom.gba", 0x434826, 0x2 - + .align 2 MtPyre_2F_MapAttributes: @ 8434828 .4byte 0xd .4byte 0xd @@ -1967,14 +2333,15 @@ MtPyre_2F_MapAttributes: @ 8434828 .4byte gTileset_General .4byte gTileset_Facility + .align 2 MtPyre_3F_MapBorder: @ 8434840 .incbin "data/maps/MtPyre_3F/border.bin" + .align 2 MtPyre_3F_MapBlockdata: @ 8434848 .incbin "data/maps/MtPyre_3F/map.bin" - .incbin "baserom.gba", 0x43499a, 0x2 - + .align 2 MtPyre_3F_MapAttributes: @ 843499C .4byte 0xd .4byte 0xd @@ -1983,14 +2350,15 @@ MtPyre_3F_MapAttributes: @ 843499C .4byte gTileset_General .4byte gTileset_Facility + .align 2 MtPyre_4F_MapBorder: @ 84349B4 .incbin "data/maps/MtPyre_4F/border.bin" + .align 2 MtPyre_4F_MapBlockdata: @ 84349BC .incbin "data/maps/MtPyre_4F/map.bin" - .incbin "baserom.gba", 0x434b0e, 0x2 - + .align 2 MtPyre_4F_MapAttributes: @ 8434B10 .4byte 0xd .4byte 0xd @@ -1999,14 +2367,15 @@ MtPyre_4F_MapAttributes: @ 8434B10 .4byte gTileset_General .4byte gTileset_Facility + .align 2 MtPyre_5F_MapBorder: @ 8434B28 .incbin "data/maps/MtPyre_5F/border.bin" + .align 2 MtPyre_5F_MapBlockdata: @ 8434B30 .incbin "data/maps/MtPyre_5F/map.bin" - .incbin "baserom.gba", 0x434c82, 0x2 - + .align 2 MtPyre_5F_MapAttributes: @ 8434C84 .4byte 0xd .4byte 0xd @@ -2015,14 +2384,15 @@ MtPyre_5F_MapAttributes: @ 8434C84 .4byte gTileset_General .4byte gTileset_Facility + .align 2 MtPyre_6F_MapBorder: @ 8434C9C .incbin "data/maps/MtPyre_6F/border.bin" + .align 2 MtPyre_6F_MapBlockdata: @ 8434CA4 .incbin "data/maps/MtPyre_6F/map.bin" - .incbin "baserom.gba", 0x434df6, 0x2 - + .align 2 MtPyre_6F_MapAttributes: @ 8434DF8 .4byte 0xd .4byte 0xd @@ -2031,12 +2401,15 @@ MtPyre_6F_MapAttributes: @ 8434DF8 .4byte gTileset_General .4byte gTileset_Facility + .align 2 AquaHideout_1F_MapBorder: @ 8434E10 .incbin "data/maps/AquaHideout_1F/border.bin" + .align 2 AquaHideout_1F_MapBlockdata: @ 8434E18 .incbin "data/maps/AquaHideout_1F/map.bin" + .align 2 AquaHideout_1F_MapAttributes: @ 84354A8 .4byte 0x1c .4byte 0x1e @@ -2045,12 +2418,15 @@ AquaHideout_1F_MapAttributes: @ 84354A8 .4byte gTileset_General .4byte gTileset_Facility + .align 2 AquaHideout_B1F_MapBorder: @ 84354C0 .incbin "data/maps/AquaHideout_B1F/border.bin" + .align 2 AquaHideout_B1F_MapBlockdata: @ 84354C8 .incbin "data/maps/AquaHideout_B1F/map.bin" + .align 2 AquaHideout_B1F_MapAttributes: @ 8435E58 .4byte 0x33 .4byte 0x18 @@ -2059,12 +2435,15 @@ AquaHideout_B1F_MapAttributes: @ 8435E58 .4byte gTileset_General .4byte gTileset_Facility + .align 2 AquaHideout_B2F_MapBorder: @ 8435E70 .incbin "data/maps/AquaHideout_B2F/border.bin" + .align 2 AquaHideout_B2F_MapBlockdata: @ 8435E78 .incbin "data/maps/AquaHideout_B2F/map.bin" + .align 2 AquaHideout_B2F_MapAttributes: @ 84364D8 .4byte 0x22 .4byte 0x18 @@ -2073,12 +2452,15 @@ AquaHideout_B2F_MapAttributes: @ 84364D8 .4byte gTileset_General .4byte gTileset_Facility + .align 2 Underwater_SeafloorCavern_MapBorder: @ 84364F0 .incbin "data/maps/Underwater_SeafloorCavern/border.bin" + .align 2 Underwater_SeafloorCavern_MapBlockdata: @ 84364F8 .incbin "data/maps/Underwater_SeafloorCavern/map.bin" + .align 2 Underwater_SeafloorCavern_MapAttributes: @ 84365F4 .4byte 0xe .4byte 0x9 @@ -2087,12 +2469,15 @@ Underwater_SeafloorCavern_MapAttributes: @ 84365F4 .4byte gTileset_General .4byte gTileset_Underwater + .align 2 SeafloorCavern_Entrance_MapBorder: @ 843660C .incbin "data/maps/SeafloorCavern_Entrance/border.bin" + .align 2 SeafloorCavern_Entrance_MapBlockdata: @ 8436614 .incbin "data/maps/SeafloorCavern_Entrance/map.bin" + .align 2 SeafloorCavern_Entrance_MapAttributes: @ 8436934 .4byte 0x14 .4byte 0x14 @@ -2101,12 +2486,15 @@ SeafloorCavern_Entrance_MapAttributes: @ 8436934 .4byte gTileset_General .4byte gTileset_Cave + .align 2 SeafloorCavern_Room1_MapBorder: @ 843694C .incbin "data/maps/SeafloorCavern_Room1/border.bin" + .align 2 SeafloorCavern_Room1_MapBlockdata: @ 8436954 .incbin "data/maps/SeafloorCavern_Room1/map.bin" + .align 2 SeafloorCavern_Room1_MapAttributes: @ 8436C9C .4byte 0x14 .4byte 0x15 @@ -2115,12 +2503,15 @@ SeafloorCavern_Room1_MapAttributes: @ 8436C9C .4byte gTileset_General .4byte gTileset_Cave + .align 2 SeafloorCavern_Room2_MapBorder: @ 8436CB4 .incbin "data/maps/SeafloorCavern_Room2/border.bin" + .align 2 SeafloorCavern_Room2_MapBlockdata: @ 8436CBC .incbin "data/maps/SeafloorCavern_Room2/map.bin" + .align 2 SeafloorCavern_Room2_MapAttributes: @ 8436E6C .4byte 0x12 .4byte 0xc @@ -2129,12 +2520,15 @@ SeafloorCavern_Room2_MapAttributes: @ 8436E6C .4byte gTileset_General .4byte gTileset_Cave + .align 2 SeafloorCavern_Room3_MapBorder: @ 8436E84 .incbin "data/maps/SeafloorCavern_Room3/border.bin" + .align 2 SeafloorCavern_Room3_MapBlockdata: @ 8436E8C .incbin "data/maps/SeafloorCavern_Room3/map.bin" + .align 2 SeafloorCavern_Room3_MapAttributes: @ 84370AC .4byte 0x10 .4byte 0x11 @@ -2143,12 +2537,15 @@ SeafloorCavern_Room3_MapAttributes: @ 84370AC .4byte gTileset_General .4byte gTileset_Cave + .align 2 SeafloorCavern_Room4_MapBorder: @ 84370C4 .incbin "data/maps/SeafloorCavern_Room4/border.bin" + .align 2 SeafloorCavern_Room4_MapBlockdata: @ 84370CC .incbin "data/maps/SeafloorCavern_Room4/map.bin" + .align 2 SeafloorCavern_Room4_MapAttributes: @ 8437378 .4byte 0x12 .4byte 0x13 @@ -2157,12 +2554,15 @@ SeafloorCavern_Room4_MapAttributes: @ 8437378 .4byte gTileset_General .4byte gTileset_Cave + .align 2 SeafloorCavern_Room5_MapBorder: @ 8437390 .incbin "data/maps/SeafloorCavern_Room5/border.bin" + .align 2 SeafloorCavern_Room5_MapBlockdata: @ 8437398 .incbin "data/maps/SeafloorCavern_Room5/map.bin" + .align 2 SeafloorCavern_Room5_MapAttributes: @ 84376B8 .4byte 0x14 .4byte 0x14 @@ -2171,12 +2571,15 @@ SeafloorCavern_Room5_MapAttributes: @ 84376B8 .4byte gTileset_General .4byte gTileset_Cave + .align 2 SeafloorCavern_Room6_MapBorder: @ 84376D0 .incbin "data/maps/SeafloorCavern_Room6/border.bin" + .align 2 SeafloorCavern_Room6_MapBlockdata: @ 84376D8 .incbin "data/maps/SeafloorCavern_Room6/map.bin" + .align 2 SeafloorCavern_Room6_MapAttributes: @ 8437B28 .4byte 0x18 .4byte 0x17 @@ -2185,14 +2588,15 @@ SeafloorCavern_Room6_MapAttributes: @ 8437B28 .4byte gTileset_General .4byte gTileset_Pacifidlog + .align 2 SeafloorCavern_Room7_MapBorder: @ 8437B40 .incbin "data/maps/SeafloorCavern_Room7/border.bin" + .align 2 SeafloorCavern_Room7_MapBlockdata: @ 8437B48 .incbin "data/maps/SeafloorCavern_Room7/map.bin" - .incbin "baserom.gba", 0x437fc6, 0x2 - + .align 2 SeafloorCavern_Room7_MapAttributes: @ 8437FC8 .4byte 0x17 .4byte 0x19 @@ -2201,12 +2605,15 @@ SeafloorCavern_Room7_MapAttributes: @ 8437FC8 .4byte gTileset_General .4byte gTileset_Pacifidlog + .align 2 SeafloorCavern_Room8_MapBorder: @ 8437FE0 .incbin "data/maps/SeafloorCavern_Room8/border.bin" + .align 2 SeafloorCavern_Room8_MapBlockdata: @ 8437FE8 .incbin "data/maps/SeafloorCavern_Room8/map.bin" + .align 2 SeafloorCavern_Room8_MapAttributes: @ 843811C .4byte 0xb .4byte 0xe @@ -2215,12 +2622,15 @@ SeafloorCavern_Room8_MapAttributes: @ 843811C .4byte gTileset_General .4byte gTileset_Cave + .align 2 SeafloorCavern_Room9_MapBorder: @ 8438134 .incbin "data/maps/SeafloorCavern_Room9/border.bin" + .align 2 SeafloorCavern_Room9_MapBlockdata: @ 843813C .incbin "data/maps/SeafloorCavern_Room9/map.bin" + .align 2 SeafloorCavern_Room9_MapAttributes: @ 8438AF0 .4byte 0x1b .4byte 0x2e @@ -2229,12 +2639,15 @@ SeafloorCavern_Room9_MapAttributes: @ 8438AF0 .4byte gTileset_General .4byte gTileset_Cave + .align 2 CaveOfOrigin_Entrance_MapBorder: @ 8438B08 .incbin "data/maps/CaveOfOrigin_Entrance/border.bin" + .align 2 CaveOfOrigin_Entrance_MapBlockdata: @ 8438B10 .incbin "data/maps/CaveOfOrigin_Entrance/map.bin" + .align 2 CaveOfOrigin_Entrance_MapAttributes: @ 8438EEC .4byte 0x13 .4byte 0x1a @@ -2243,14 +2656,15 @@ CaveOfOrigin_Entrance_MapAttributes: @ 8438EEC .4byte gTileset_General .4byte gTileset_Cave + .align 2 CaveOfOrigin_1F_MapBorder: @ 8438F04 .incbin "data/maps/CaveOfOrigin_1F/border.bin" + .align 2 CaveOfOrigin_1F_MapBlockdata: @ 8438F0C .incbin "data/maps/CaveOfOrigin_1F/map.bin" - .incbin "baserom.gba", 0x43932e, 0x2 - + .align 2 CaveOfOrigin_1F_MapAttributes: @ 8439330 .4byte 0x17 .4byte 0x17 @@ -2259,14 +2673,15 @@ CaveOfOrigin_1F_MapAttributes: @ 8439330 .4byte gTileset_General .4byte gTileset_Cave + .align 2 CaveOfOrigin_UnusedRubySapphireMap1_MapBorder: @ 8439348 .incbin "data/maps/CaveOfOrigin_UnusedRubySapphireMap1/border.bin" + .align 2 CaveOfOrigin_UnusedRubySapphireMap1_MapBlockdata: @ 8439350 .incbin "data/maps/CaveOfOrigin_UnusedRubySapphireMap1/map.bin" - .incbin "baserom.gba", 0x439772, 0x2 - + .align 2 CaveOfOrigin_UnusedRubySapphireMap1_MapAttributes: @ 8439774 .4byte 0x17 .4byte 0x17 @@ -2275,14 +2690,15 @@ CaveOfOrigin_UnusedRubySapphireMap1_MapAttributes: @ 8439774 .4byte gTileset_General .4byte gTileset_Cave + .align 2 CaveOfOrigin_UnusedRubySapphireMap2_MapBorder: @ 843978C .incbin "data/maps/CaveOfOrigin_UnusedRubySapphireMap2/border.bin" + .align 2 CaveOfOrigin_UnusedRubySapphireMap2_MapBlockdata: @ 8439794 .incbin "data/maps/CaveOfOrigin_UnusedRubySapphireMap2/map.bin" - .incbin "baserom.gba", 0x439b06, 0x2 - + .align 2 CaveOfOrigin_UnusedRubySapphireMap2_MapAttributes: @ 8439B08 .4byte 0x15 .4byte 0x15 @@ -2291,14 +2707,15 @@ CaveOfOrigin_UnusedRubySapphireMap2_MapAttributes: @ 8439B08 .4byte gTileset_General .4byte gTileset_Cave + .align 2 CaveOfOrigin_UnusedRubySapphireMap3_MapBorder: @ 8439B20 .incbin "data/maps/CaveOfOrigin_UnusedRubySapphireMap3/border.bin" + .align 2 CaveOfOrigin_UnusedRubySapphireMap3_MapBlockdata: @ 8439B28 .incbin "data/maps/CaveOfOrigin_UnusedRubySapphireMap3/map.bin" - .incbin "baserom.gba", 0x439e46, 0x2 - + .align 2 CaveOfOrigin_UnusedRubySapphireMap3_MapAttributes: @ 8439E48 .4byte 0x13 .4byte 0x15 @@ -2307,14 +2724,15 @@ CaveOfOrigin_UnusedRubySapphireMap3_MapAttributes: @ 8439E48 .4byte gTileset_General .4byte gTileset_Cave + .align 2 CaveOfOrigin_B1F_MapBorder: @ 8439E60 .incbin "data/maps/CaveOfOrigin_B1F/border.bin" + .align 2 CaveOfOrigin_B1F_MapBlockdata: @ 8439E68 .incbin "data/maps/CaveOfOrigin_B1F/map.bin" - .incbin "baserom.gba", 0x43a13a, 0x2 - + .align 2 CaveOfOrigin_B1F_MapAttributes: @ 843A13C .4byte 0x13 .4byte 0x13 @@ -2323,12 +2741,15 @@ CaveOfOrigin_B1F_MapAttributes: @ 843A13C .4byte gTileset_General .4byte gTileset_Cave + .align 2 VictoryRoad_1F_MapBorder: @ 843A154 .incbin "data/maps/VictoryRoad_1F/border.bin" + .align 2 VictoryRoad_1F_MapBlockdata: @ 843A15C .incbin "data/maps/VictoryRoad_1F/map.bin" + .align 2 VictoryRoad_1F_MapAttributes: @ 843B188 .4byte 0x2e .4byte 0x2d @@ -2337,14 +2758,15 @@ VictoryRoad_1F_MapAttributes: @ 843B188 .4byte gTileset_General .4byte gTileset_Cave + .align 2 ShoalCave_LowTideEntranceRoom_MapBorder: @ 843B1A0 .incbin "data/maps/ShoalCave_LowTideEntranceRoom/border.bin" + .align 2 ShoalCave_LowTideEntranceRoom_MapBlockdata: @ 843B1A8 .incbin "data/maps/ShoalCave_LowTideEntranceRoom/map.bin" - .incbin "baserom.gba", 0x43bb3a, 0x2 - + .align 2 ShoalCave_LowTideEntranceRoom_MapAttributes: @ 843BB3C .4byte 0x23 .4byte 0x23 @@ -2353,12 +2775,15 @@ ShoalCave_LowTideEntranceRoom_MapAttributes: @ 843BB3C .4byte gTileset_General .4byte gTileset_Cave + .align 2 ShoalCave_LowTideInnerRoom_MapBorder: @ 843BB54 .incbin "data/maps/ShoalCave_LowTideInnerRoom/border.bin" + .align 2 ShoalCave_LowTideInnerRoom_MapBlockdata: @ 843BB5C .incbin "data/maps/ShoalCave_LowTideInnerRoom/map.bin" + .align 2 ShoalCave_LowTideInnerRoom_MapAttributes: @ 843C904 .4byte 0x2e .4byte 0x26 @@ -2367,14 +2792,15 @@ ShoalCave_LowTideInnerRoom_MapAttributes: @ 843C904 .4byte gTileset_General .4byte gTileset_Cave + .align 2 ShoalCave_LowTideStairsRoom_MapBorder: @ 843C91C .incbin "data/maps/ShoalCave_LowTideStairsRoom/border.bin" + .align 2 ShoalCave_LowTideStairsRoom_MapBlockdata: @ 843C924 .incbin "data/maps/ShoalCave_LowTideStairsRoom/map.bin" - .incbin "baserom.gba", 0x43cb9a, 0x2 - + .align 2 ShoalCave_LowTideStairsRoom_MapAttributes: @ 843CB9C .4byte 0x15 .4byte 0xf @@ -2383,12 +2809,15 @@ ShoalCave_LowTideStairsRoom_MapAttributes: @ 843CB9C .4byte gTileset_General .4byte gTileset_Cave + .align 2 ShoalCave_LowTideLowerRoom_MapBorder: @ 843CBB4 .incbin "data/maps/ShoalCave_LowTideLowerRoom/border.bin" + .align 2 ShoalCave_LowTideLowerRoom_MapBlockdata: @ 843CBBC .incbin "data/maps/ShoalCave_LowTideLowerRoom/map.bin" + .align 2 ShoalCave_LowTideLowerRoom_MapAttributes: @ 843CF20 .4byte 0x1f .4byte 0xe @@ -2397,14 +2826,15 @@ ShoalCave_LowTideLowerRoom_MapAttributes: @ 843CF20 .4byte gTileset_General .4byte gTileset_Cave + .align 2 ShoalCave_HighTideEntranceRoom_MapBorder: @ 843CF38 .incbin "data/maps/ShoalCave_HighTideEntranceRoom/border.bin" + .align 2 ShoalCave_HighTideEntranceRoom_MapBlockdata: @ 843CF40 .incbin "data/maps/ShoalCave_HighTideEntranceRoom/map.bin" - .incbin "baserom.gba", 0x43d8d2, 0x2 - + .align 2 ShoalCave_HighTideEntranceRoom_MapAttributes: @ 843D8D4 .4byte 0x23 .4byte 0x23 @@ -2413,12 +2843,15 @@ ShoalCave_HighTideEntranceRoom_MapAttributes: @ 843D8D4 .4byte gTileset_General .4byte gTileset_Cave + .align 2 ShoalCave_HighTideInnerRoom_MapBorder: @ 843D8EC .incbin "data/maps/ShoalCave_HighTideInnerRoom/border.bin" + .align 2 ShoalCave_HighTideInnerRoom_MapBlockdata: @ 843D8F4 .incbin "data/maps/ShoalCave_HighTideInnerRoom/map.bin" + .align 2 ShoalCave_HighTideInnerRoom_MapAttributes: @ 843E69C .4byte 0x2e .4byte 0x26 @@ -2427,16 +2860,18 @@ ShoalCave_HighTideInnerRoom_MapAttributes: @ 843E69C .4byte gTileset_General .4byte gTileset_Cave + .align 2 .incbin "baserom.gba", 0x43e6b4, 0x1f8 + .align 2 NewMauville_Entrance_MapBorder: @ 843E8AC .incbin "data/maps/NewMauville_Entrance/border.bin" + .align 2 NewMauville_Entrance_MapBlockdata: @ 843E8B4 .incbin "data/maps/NewMauville_Entrance/map.bin" - .incbin "baserom.gba", 0x43e956, 0x2 - + .align 2 NewMauville_Entrance_MapAttributes: @ 843E958 .4byte 0x9 .4byte 0x9 @@ -2445,14 +2880,15 @@ NewMauville_Entrance_MapAttributes: @ 843E958 .4byte gTileset_General .4byte gTileset_Facility + .align 2 NewMauville_Inside_MapBorder: @ 843E970 .incbin "data/maps/NewMauville_Inside/border.bin" + .align 2 NewMauville_Inside_MapBlockdata: @ 843E978 .incbin "data/maps/NewMauville_Inside/map.bin" - .incbin "baserom.gba", 0x43f69a, 0x2 - + .align 2 NewMauville_Inside_MapAttributes: @ 843F69C .4byte 0x29 .4byte 0x29 @@ -2461,14 +2897,15 @@ NewMauville_Inside_MapAttributes: @ 843F69C .4byte gTileset_General .4byte gTileset_BikeShop + .align 2 AbandonedShip_Deck_MapBorder: @ 843F6B4 .incbin "data/maps/AbandonedShip_Deck/border.bin" + .align 2 AbandonedShip_Deck_MapBlockdata: @ 843F6BC .incbin "data/maps/AbandonedShip_Deck/map.bin" - .incbin "baserom.gba", 0x43fa82, 0x2 - + .align 2 AbandonedShip_Deck_MapAttributes: @ 843FA84 .4byte 0x17 .4byte 0x15 @@ -2477,12 +2914,15 @@ AbandonedShip_Deck_MapAttributes: @ 843FA84 .4byte gTileset_General .4byte gTileset_Facility + .align 2 AbandonedShip_Corridors_1F_MapBorder: @ 843FA9C .incbin "data/maps/AbandonedShip_Corridors_1F/border.bin" + .align 2 AbandonedShip_Corridors_1F_MapBlockdata: @ 843FAA4 .incbin "data/maps/AbandonedShip_Corridors_1F/map.bin" + .align 2 AbandonedShip_Corridors_1F_MapAttributes: @ 843FC54 .4byte 0x12 .4byte 0xc @@ -2491,12 +2931,15 @@ AbandonedShip_Corridors_1F_MapAttributes: @ 843FC54 .4byte gTileset_General .4byte gTileset_InsideShip + .align 2 AbandonedShip_Rooms_1F_MapBorder: @ 843FC6C .incbin "data/maps/AbandonedShip_Rooms_1F/border.bin" + .align 2 AbandonedShip_Rooms_1F_MapBlockdata: @ 843FC74 .incbin "data/maps/AbandonedShip_Rooms_1F/map.bin" + .align 2 AbandonedShip_Rooms_1F_MapAttributes: @ 843FED8 .4byte 0x12 .4byte 0x11 @@ -2505,12 +2948,15 @@ AbandonedShip_Rooms_1F_MapAttributes: @ 843FED8 .4byte gTileset_General .4byte gTileset_InsideShip + .align 2 AbandonedShip_Corridors_B1F_MapBorder: @ 843FEF0 .incbin "data/maps/AbandonedShip_Corridors_B1F/border.bin" + .align 2 AbandonedShip_Corridors_B1F_MapBlockdata: @ 843FEF8 .incbin "data/maps/AbandonedShip_Corridors_B1F/map.bin" + .align 2 AbandonedShip_Corridors_B1F_MapAttributes: @ 843FFFC .4byte 0xd .4byte 0xa @@ -2519,12 +2965,15 @@ AbandonedShip_Corridors_B1F_MapAttributes: @ 843FFFC .4byte gTileset_General .4byte gTileset_InsideShip + .align 2 AbandonedShip_Rooms_B1F_MapBorder: @ 8440014 .incbin "data/maps/AbandonedShip_Rooms_B1F/border.bin" + .align 2 AbandonedShip_Rooms_B1F_MapBlockdata: @ 844001C .incbin "data/maps/AbandonedShip_Rooms_B1F/map.bin" + .align 2 AbandonedShip_Rooms_B1F_MapAttributes: @ 84401CC .4byte 0x1b .4byte 0x8 @@ -2533,12 +2982,15 @@ AbandonedShip_Rooms_B1F_MapAttributes: @ 84401CC .4byte gTileset_General .4byte gTileset_InsideShip + .align 2 AbandonedShip_Rooms2_B1F_MapBorder: @ 84401E4 .incbin "data/maps/AbandonedShip_Rooms2_B1F/border.bin" + .align 2 AbandonedShip_Rooms2_B1F_MapBlockdata: @ 84401EC .incbin "data/maps/AbandonedShip_Rooms2_B1F/map.bin" + .align 2 AbandonedShip_Rooms2_B1F_MapAttributes: @ 844030C .4byte 0x12 .4byte 0x8 @@ -2547,12 +2999,15 @@ AbandonedShip_Rooms2_B1F_MapAttributes: @ 844030C .4byte gTileset_General .4byte gTileset_InsideShip + .align 2 AbandonedShip_Underwater1_MapBorder: @ 8440324 .incbin "data/maps/AbandonedShip_Underwater1/border.bin" + .align 2 AbandonedShip_Underwater1_MapBlockdata: @ 844032C .incbin "data/maps/AbandonedShip_Underwater1/map.bin" + .align 2 AbandonedShip_Underwater1_MapAttributes: @ 84403AC .4byte 0x8 .4byte 0x8 @@ -2561,12 +3016,15 @@ AbandonedShip_Underwater1_MapAttributes: @ 84403AC .4byte gTileset_General .4byte gTileset_InsideShip + .align 2 AbandonedShip_Room_B1F_MapBorder: @ 84403C4 .incbin "data/maps/AbandonedShip_Room_B1F/border.bin" + .align 2 AbandonedShip_Room_B1F_MapBlockdata: @ 84403CC .incbin "data/maps/AbandonedShip_Room_B1F/map.bin" + .align 2 AbandonedShip_Room_B1F_MapAttributes: @ 844045C .4byte 0x9 .4byte 0x8 @@ -2575,14 +3033,15 @@ AbandonedShip_Room_B1F_MapAttributes: @ 844045C .4byte gTileset_General .4byte gTileset_InsideShip + .align 2 AbandonedShip_Rooms2_1F_MapBorder: @ 8440474 .incbin "data/maps/AbandonedShip_Rooms2_1F/border.bin" + .align 2 AbandonedShip_Rooms2_1F_MapBlockdata: @ 844047C .incbin "data/maps/AbandonedShip_Rooms2_1F/map.bin" - .incbin "baserom.gba", 0x4405ae, 0x2 - + .align 2 AbandonedShip_Rooms2_1F_MapAttributes: @ 84405B0 .4byte 0x9 .4byte 0x11 @@ -2591,14 +3050,15 @@ AbandonedShip_Rooms2_1F_MapAttributes: @ 84405B0 .4byte gTileset_General .4byte gTileset_InsideShip + .align 2 AbandonedShip_CaptainsOffice_MapBorder: @ 84405C8 .incbin "data/maps/AbandonedShip_CaptainsOffice/border.bin" + .align 2 AbandonedShip_CaptainsOffice_MapBlockdata: @ 84405D0 .incbin "data/maps/AbandonedShip_CaptainsOffice/map.bin" - .incbin "baserom.gba", 0x44064e, 0x2 - + .align 2 AbandonedShip_CaptainsOffice_MapAttributes: @ 8440650 .4byte 0x9 .4byte 0x7 @@ -2607,14 +3067,15 @@ AbandonedShip_CaptainsOffice_MapAttributes: @ 8440650 .4byte gTileset_General .4byte gTileset_Facility + .align 2 AbandonedShip_Underwater2_MapBorder: @ 8440668 .incbin "data/maps/AbandonedShip_Underwater2/border.bin" + .align 2 AbandonedShip_Underwater2_MapBlockdata: @ 8440670 .incbin "data/maps/AbandonedShip_Underwater2/map.bin" - .incbin "baserom.gba", 0x440796, 0x2 - + .align 2 AbandonedShip_Underwater2_MapAttributes: @ 8440798 .4byte 0x15 .4byte 0x7 @@ -2623,14 +3084,15 @@ AbandonedShip_Underwater2_MapAttributes: @ 8440798 .4byte gTileset_General .4byte gTileset_InsideShip + .align 2 SecretBase_RedCave1_MapBorder: @ 84407B0 .incbin "data/maps/SecretBase_RedCave1/border.bin" + .align 2 SecretBase_RedCave1_MapBlockdata: @ 84407B8 .incbin "data/maps/SecretBase_RedCave1/map.bin" - .incbin "baserom.gba", 0x44087e, 0x2 - + .align 2 SecretBase_RedCave1_MapAttributes: @ 8440880 .4byte 0xb .4byte 0x9 @@ -2639,14 +3101,15 @@ SecretBase_RedCave1_MapAttributes: @ 8440880 .4byte gTileset_SecretBase .4byte gTileset_SecretBaseRedCave + .align 2 SecretBase_BrownCave1_MapBorder: @ 8440898 .incbin "data/maps/SecretBase_BrownCave1/border.bin" + .align 2 SecretBase_BrownCave1_MapBlockdata: @ 84408A0 .incbin "data/maps/SecretBase_BrownCave1/map.bin" - .incbin "baserom.gba", 0x440966, 0x2 - + .align 2 SecretBase_BrownCave1_MapAttributes: @ 8440968 .4byte 0xb .4byte 0x9 @@ -2655,14 +3118,15 @@ SecretBase_BrownCave1_MapAttributes: @ 8440968 .4byte gTileset_SecretBase .4byte gTileset_SecretBaseBrownCave + .align 2 SecretBase_BlueCave1_MapBorder: @ 8440980 .incbin "data/maps/SecretBase_BlueCave1/border.bin" + .align 2 SecretBase_BlueCave1_MapBlockdata: @ 8440988 .incbin "data/maps/SecretBase_BlueCave1/map.bin" - .incbin "baserom.gba", 0x440a4e, 0x2 - + .align 2 SecretBase_BlueCave1_MapAttributes: @ 8440A50 .4byte 0xb .4byte 0x9 @@ -2671,14 +3135,15 @@ SecretBase_BlueCave1_MapAttributes: @ 8440A50 .4byte gTileset_SecretBase .4byte gTileset_SecretBaseBlueCave + .align 2 SecretBase_YellowCave1_MapBorder: @ 8440A68 .incbin "data/maps/SecretBase_YellowCave1/border.bin" + .align 2 SecretBase_YellowCave1_MapBlockdata: @ 8440A70 .incbin "data/maps/SecretBase_YellowCave1/map.bin" - .incbin "baserom.gba", 0x440b36, 0x2 - + .align 2 SecretBase_YellowCave1_MapAttributes: @ 8440B38 .4byte 0xb .4byte 0x9 @@ -2687,14 +3152,15 @@ SecretBase_YellowCave1_MapAttributes: @ 8440B38 .4byte gTileset_SecretBase .4byte gTileset_SecretBaseYellowCave + .align 2 SecretBase_Tree1_MapBorder: @ 8440B50 .incbin "data/maps/SecretBase_Tree1/border.bin" + .align 2 SecretBase_Tree1_MapBlockdata: @ 8440B58 .incbin "data/maps/SecretBase_Tree1/map.bin" - .incbin "baserom.gba", 0x440c1e, 0x2 - + .align 2 SecretBase_Tree1_MapAttributes: @ 8440C20 .4byte 0xb .4byte 0x9 @@ -2703,14 +3169,15 @@ SecretBase_Tree1_MapAttributes: @ 8440C20 .4byte gTileset_SecretBase .4byte gTileset_SecretBaseTree + .align 2 SecretBase_Shrub1_MapBorder: @ 8440C38 .incbin "data/maps/SecretBase_Shrub1/border.bin" + .align 2 SecretBase_Shrub1_MapBlockdata: @ 8440C40 .incbin "data/maps/SecretBase_Shrub1/map.bin" - .incbin "baserom.gba", 0x440d06, 0x2 - + .align 2 SecretBase_Shrub1_MapAttributes: @ 8440D08 .4byte 0xb .4byte 0x9 @@ -2719,12 +3186,15 @@ SecretBase_Shrub1_MapAttributes: @ 8440D08 .4byte gTileset_SecretBase .4byte gTileset_SecretBaseShrub + .align 2 SecretBase_RedCave2_MapBorder: @ 8440D20 .incbin "data/maps/SecretBase_RedCave2/border.bin" + .align 2 SecretBase_RedCave2_MapBlockdata: @ 8440D28 .incbin "data/maps/SecretBase_RedCave2/map.bin" + .align 2 SecretBase_RedCave2_MapAttributes: @ 8440E08 .4byte 0x7 .4byte 0x10 @@ -2733,12 +3203,15 @@ SecretBase_RedCave2_MapAttributes: @ 8440E08 .4byte gTileset_SecretBase .4byte gTileset_SecretBaseRedCave + .align 2 SecretBase_BrownCave2_MapBorder: @ 8440E20 .incbin "data/maps/SecretBase_BrownCave2/border.bin" + .align 2 SecretBase_BrownCave2_MapBlockdata: @ 8440E28 .incbin "data/maps/SecretBase_BrownCave2/map.bin" + .align 2 SecretBase_BrownCave2_MapAttributes: @ 8440F24 .4byte 0xe .4byte 0x9 @@ -2747,14 +3220,15 @@ SecretBase_BrownCave2_MapAttributes: @ 8440F24 .4byte gTileset_SecretBase .4byte gTileset_SecretBaseBrownCave + .align 2 SecretBase_BlueCave2_MapBorder: @ 8440F3C .incbin "data/maps/SecretBase_BlueCave2/border.bin" + .align 2 SecretBase_BlueCave2_MapBlockdata: @ 8440F44 .incbin "data/maps/SecretBase_BlueCave2/map.bin" - .incbin "baserom.gba", 0x441016, 0x2 - + .align 2 SecretBase_BlueCave2_MapAttributes: @ 8441018 .4byte 0xf .4byte 0x7 @@ -2763,12 +3237,15 @@ SecretBase_BlueCave2_MapAttributes: @ 8441018 .4byte gTileset_SecretBase .4byte gTileset_SecretBaseBlueCave + .align 2 SecretBase_YellowCave2_MapBorder: @ 8441030 .incbin "data/maps/SecretBase_YellowCave2/border.bin" + .align 2 SecretBase_YellowCave2_MapBlockdata: @ 8441038 .incbin "data/maps/SecretBase_YellowCave2/map.bin" + .align 2 SecretBase_YellowCave2_MapAttributes: @ 8441134 .4byte 0xe .4byte 0x9 @@ -2777,12 +3254,15 @@ SecretBase_YellowCave2_MapAttributes: @ 8441134 .4byte gTileset_SecretBase .4byte gTileset_SecretBaseYellowCave + .align 2 SecretBase_Tree2_MapBorder: @ 844114C .incbin "data/maps/SecretBase_Tree2/border.bin" + .align 2 SecretBase_Tree2_MapBlockdata: @ 8441154 .incbin "data/maps/SecretBase_Tree2/map.bin" + .align 2 SecretBase_Tree2_MapAttributes: @ 8441234 .4byte 0x7 .4byte 0x10 @@ -2791,14 +3271,15 @@ SecretBase_Tree2_MapAttributes: @ 8441234 .4byte gTileset_SecretBase .4byte gTileset_SecretBaseTree + .align 2 SecretBase_Shrub2_MapBorder: @ 844124C .incbin "data/maps/SecretBase_Shrub2/border.bin" + .align 2 SecretBase_Shrub2_MapBlockdata: @ 8441254 .incbin "data/maps/SecretBase_Shrub2/map.bin" - .incbin "baserom.gba", 0x441326, 0x2 - + .align 2 SecretBase_Shrub2_MapAttributes: @ 8441328 .4byte 0xf .4byte 0x7 @@ -2807,12 +3288,15 @@ SecretBase_Shrub2_MapAttributes: @ 8441328 .4byte gTileset_SecretBase .4byte gTileset_SecretBaseShrub + .align 2 SecretBase_RedCave3_MapBorder: @ 8441340 .incbin "data/maps/SecretBase_RedCave3/border.bin" + .align 2 SecretBase_RedCave3_MapBlockdata: @ 8441348 .incbin "data/maps/SecretBase_RedCave3/map.bin" + .align 2 SecretBase_RedCave3_MapAttributes: @ 8441438 .4byte 0xf .4byte 0x8 @@ -2821,14 +3305,15 @@ SecretBase_RedCave3_MapAttributes: @ 8441438 .4byte gTileset_SecretBase .4byte gTileset_SecretBaseRedCave + .align 2 SecretBase_BrownCave3_MapBorder: @ 8441450 .incbin "data/maps/SecretBase_BrownCave3/border.bin" + .align 2 SecretBase_BrownCave3_MapBlockdata: @ 8441458 .incbin "data/maps/SecretBase_BrownCave3/map.bin" - .incbin "baserom.gba", 0x4415a2, 0x2 - + .align 2 SecretBase_BrownCave3_MapAttributes: @ 84415A4 .4byte 0xf .4byte 0xb @@ -2837,12 +3322,15 @@ SecretBase_BrownCave3_MapAttributes: @ 84415A4 .4byte gTileset_SecretBase .4byte gTileset_SecretBaseBrownCave + .align 2 SecretBase_BlueCave3_MapBorder: @ 84415BC .incbin "data/maps/SecretBase_BlueCave3/border.bin" + .align 2 SecretBase_BlueCave3_MapBlockdata: @ 84415C4 .incbin "data/maps/SecretBase_BlueCave3/map.bin" + .align 2 SecretBase_BlueCave3_MapAttributes: @ 8441718 .4byte 0xa .4byte 0x11 @@ -2851,12 +3339,15 @@ SecretBase_BlueCave3_MapAttributes: @ 8441718 .4byte gTileset_SecretBase .4byte gTileset_SecretBaseBlueCave + .align 2 SecretBase_YellowCave3_MapBorder: @ 8441730 .incbin "data/maps/SecretBase_YellowCave3/border.bin" + .align 2 SecretBase_YellowCave3_MapBlockdata: @ 8441738 .incbin "data/maps/SecretBase_YellowCave3/map.bin" + .align 2 SecretBase_YellowCave3_MapAttributes: @ 8441840 .4byte 0xc .4byte 0xb @@ -2865,12 +3356,15 @@ SecretBase_YellowCave3_MapAttributes: @ 8441840 .4byte gTileset_SecretBase .4byte gTileset_SecretBaseYellowCave + .align 2 SecretBase_Tree3_MapBorder: @ 8441858 .incbin "data/maps/SecretBase_Tree3/border.bin" + .align 2 SecretBase_Tree3_MapBlockdata: @ 8441860 .incbin "data/maps/SecretBase_Tree3/map.bin" + .align 2 SecretBase_Tree3_MapAttributes: @ 8441970 .4byte 0x11 .4byte 0x8 @@ -2879,14 +3373,15 @@ SecretBase_Tree3_MapAttributes: @ 8441970 .4byte gTileset_SecretBase .4byte gTileset_SecretBaseTree + .align 2 SecretBase_Shrub3_MapBorder: @ 8441988 .incbin "data/maps/SecretBase_Shrub3/border.bin" + .align 2 SecretBase_Shrub3_MapBlockdata: @ 8441990 .incbin "data/maps/SecretBase_Shrub3/map.bin" - .incbin "baserom.gba", 0x441aae, 0x2 - + .align 2 SecretBase_Shrub3_MapAttributes: @ 8441AB0 .4byte 0xd .4byte 0xb @@ -2895,14 +3390,15 @@ SecretBase_Shrub3_MapAttributes: @ 8441AB0 .4byte gTileset_SecretBase .4byte gTileset_SecretBaseShrub + .align 2 SecretBase_RedCave4_MapBorder: @ 8441AC8 .incbin "data/maps/SecretBase_RedCave4/border.bin" + .align 2 SecretBase_RedCave4_MapBlockdata: @ 8441AD0 .incbin "data/maps/SecretBase_RedCave4/map.bin" - .incbin "baserom.gba", 0x441bde, 0x2 - + .align 2 SecretBase_RedCave4_MapAttributes: @ 8441BE0 .4byte 0x9 .4byte 0xf @@ -2911,12 +3407,15 @@ SecretBase_RedCave4_MapAttributes: @ 8441BE0 .4byte gTileset_SecretBase .4byte gTileset_SecretBaseRedCave + .align 2 SecretBase_BrownCave4_MapBorder: @ 8441BF8 .incbin "data/maps/SecretBase_BrownCave4/border.bin" + .align 2 SecretBase_BrownCave4_MapBlockdata: @ 8441C00 .incbin "data/maps/SecretBase_BrownCave4/map.bin" + .align 2 SecretBase_BrownCave4_MapAttributes: @ 8441D50 .4byte 0xe .4byte 0xc @@ -2925,14 +3424,15 @@ SecretBase_BrownCave4_MapAttributes: @ 8441D50 .4byte gTileset_SecretBase .4byte gTileset_SecretBaseBrownCave + .align 2 SecretBase_BlueCave4_MapBorder: @ 8441D68 .incbin "data/maps/SecretBase_BlueCave4/border.bin" + .align 2 SecretBase_BlueCave4_MapBlockdata: @ 8441D70 .incbin "data/maps/SecretBase_BlueCave4/map.bin" - .incbin "baserom.gba", 0x441ea2, 0x2 - + .align 2 SecretBase_BlueCave4_MapAttributes: @ 8441EA4 .4byte 0x9 .4byte 0x11 @@ -2941,12 +3441,15 @@ SecretBase_BlueCave4_MapAttributes: @ 8441EA4 .4byte gTileset_SecretBase .4byte gTileset_SecretBaseBlueCave + .align 2 SecretBase_YellowCave4_MapBorder: @ 8441EBC .incbin "data/maps/SecretBase_YellowCave4/border.bin" + .align 2 SecretBase_YellowCave4_MapBlockdata: @ 8441EC4 .incbin "data/maps/SecretBase_YellowCave4/map.bin" + .align 2 SecretBase_YellowCave4_MapAttributes: @ 8442030 .4byte 0xd .4byte 0xe @@ -2955,12 +3458,15 @@ SecretBase_YellowCave4_MapAttributes: @ 8442030 .4byte gTileset_SecretBase .4byte gTileset_SecretBaseYellowCave + .align 2 SecretBase_Tree4_MapBorder: @ 8442048 .incbin "data/maps/SecretBase_Tree4/border.bin" + .align 2 SecretBase_Tree4_MapBlockdata: @ 8442050 .incbin "data/maps/SecretBase_Tree4/map.bin" + .align 2 SecretBase_Tree4_MapAttributes: @ 84421D8 .4byte 0xe .4byte 0xe @@ -2969,12 +3475,15 @@ SecretBase_Tree4_MapAttributes: @ 84421D8 .4byte gTileset_SecretBase .4byte gTileset_SecretBaseTree + .align 2 SecretBase_Shrub4_MapBorder: @ 84421F0 .incbin "data/maps/SecretBase_Shrub4/border.bin" + .align 2 SecretBase_Shrub4_MapBlockdata: @ 84421F8 .incbin "data/maps/SecretBase_Shrub4/map.bin" + .align 2 SecretBase_Shrub4_MapAttributes: @ 844232C .4byte 0xe .4byte 0xb @@ -2983,12 +3492,15 @@ SecretBase_Shrub4_MapAttributes: @ 844232C .4byte gTileset_SecretBase .4byte gTileset_SecretBaseShrub + .align 2 SingleBattleColosseum_MapBorder: @ 8442344 .incbin "data/maps/SingleBattleColosseum/border.bin" + .align 2 SingleBattleColosseum_MapBlockdata: @ 844234C .incbin "data/maps/SingleBattleColosseum/map.bin" + .align 2 SingleBattleColosseum_MapAttributes: @ 8442448 .4byte 0xe .4byte 0x9 @@ -2997,12 +3509,15 @@ SingleBattleColosseum_MapAttributes: @ 8442448 .4byte gTileset_InsideBuilding .4byte gTileset_CableClub + .align 2 TradeCenter_MapBorder: @ 8442460 .incbin "data/maps/TradeCenter/border.bin" + .align 2 TradeCenter_MapBlockdata: @ 8442468 .incbin "data/maps/TradeCenter/map.bin" + .align 2 TradeCenter_MapAttributes: @ 8442540 .4byte 0xc .4byte 0x9 @@ -3011,12 +3526,15 @@ TradeCenter_MapAttributes: @ 8442540 .4byte gTileset_InsideBuilding .4byte gTileset_CableClub + .align 2 RecordCorner_MapBorder: @ 8442558 .incbin "data/maps/RecordCorner/border.bin" + .align 2 RecordCorner_MapBlockdata: @ 8442560 .incbin "data/maps/RecordCorner/map.bin" + .align 2 RecordCorner_MapAttributes: @ 84426F0 .4byte 0x14 .4byte 0xa @@ -3025,12 +3543,15 @@ RecordCorner_MapAttributes: @ 84426F0 .4byte gTileset_InsideBuilding .4byte gTileset_CableClub + .align 2 DoubleBattleColosseum_MapBorder: @ 8442708 .incbin "data/maps/DoubleBattleColosseum/border.bin" + .align 2 DoubleBattleColosseum_MapBlockdata: @ 8442710 .incbin "data/maps/DoubleBattleColosseum/map.bin" + .align 2 DoubleBattleColosseum_MapAttributes: @ 844280C .4byte 0xe .4byte 0x9 @@ -3039,14 +3560,15 @@ DoubleBattleColosseum_MapAttributes: @ 844280C .4byte gTileset_InsideBuilding .4byte gTileset_CableClub + .align 2 LinkContestRoom1_MapBorder: @ 8442824 .incbin "data/maps/LinkContestRoom1/border.bin" + .align 2 LinkContestRoom1_MapBlockdata: @ 844282C .incbin "data/maps/LinkContestRoom1/map.bin" - .incbin "baserom.gba", 0x442976, 0x2 - + .align 2 LinkContestRoom1_MapAttributes: @ 8442978 .4byte 0xf .4byte 0xb @@ -3055,14 +3577,15 @@ LinkContestRoom1_MapAttributes: @ 8442978 .4byte gTileset_General .4byte gTileset_Contest + .align 2 UnknownMap_25_29_MapBorder: @ 8442990 .incbin "data/maps/UnknownMap_25_29/border.bin" + .align 2 UnknownMap_25_29_MapBlockdata: @ 8442998 .incbin "data/maps/UnknownMap_25_29/map.bin" - .incbin "baserom.gba", 0x44299a, 0x2 - + .align 2 UnknownMap_25_29_MapAttributes: @ 844299C .4byte 0x1 .4byte 0x1 @@ -3071,14 +3594,15 @@ UnknownMap_25_29_MapAttributes: @ 844299C .4byte gTileset_InsideBuilding .4byte gTileset_Contest + .align 2 UnknownMap_25_30_MapBorder: @ 84429B4 .incbin "data/maps/UnknownMap_25_30/border.bin" + .align 2 UnknownMap_25_30_MapBlockdata: @ 84429BC .incbin "data/maps/UnknownMap_25_30/map.bin" - .incbin "baserom.gba", 0x4429be, 0x2 - + .align 2 UnknownMap_25_30_MapAttributes: @ 84429C0 .4byte 0x1 .4byte 0x1 @@ -3087,14 +3611,15 @@ UnknownMap_25_30_MapAttributes: @ 84429C0 .4byte gTileset_InsideBuilding .4byte gTileset_Contest + .align 2 UnknownMap_25_31_MapBorder: @ 84429D8 .incbin "data/maps/UnknownMap_25_31/border.bin" + .align 2 UnknownMap_25_31_MapBlockdata: @ 84429E0 .incbin "data/maps/UnknownMap_25_31/map.bin" - .incbin "baserom.gba", 0x4429e2, 0x2 - + .align 2 UnknownMap_25_31_MapAttributes: @ 84429E4 .4byte 0x1 .4byte 0x1 @@ -3103,14 +3628,15 @@ UnknownMap_25_31_MapAttributes: @ 84429E4 .4byte gTileset_InsideBuilding .4byte gTileset_Contest + .align 2 UnknownMap_25_32_MapBorder: @ 84429FC .incbin "data/maps/UnknownMap_25_32/border.bin" + .align 2 UnknownMap_25_32_MapBlockdata: @ 8442A04 .incbin "data/maps/UnknownMap_25_32/map.bin" - .incbin "baserom.gba", 0x442a06, 0x2 - + .align 2 UnknownMap_25_32_MapAttributes: @ 8442A08 .4byte 0x1 .4byte 0x1 @@ -3119,14 +3645,15 @@ UnknownMap_25_32_MapAttributes: @ 8442A08 .4byte gTileset_InsideBuilding .4byte gTileset_Contest + .align 2 UnknownMap_25_33_MapBorder: @ 8442A20 .incbin "data/maps/UnknownMap_25_33/border.bin" + .align 2 UnknownMap_25_33_MapBlockdata: @ 8442A28 .incbin "data/maps/UnknownMap_25_33/map.bin" - .incbin "baserom.gba", 0x442a2a, 0x2 - + .align 2 UnknownMap_25_33_MapAttributes: @ 8442A2C .4byte 0x1 .4byte 0x1 @@ -3135,14 +3662,15 @@ UnknownMap_25_33_MapAttributes: @ 8442A2C .4byte gTileset_InsideBuilding .4byte gTileset_Contest + .align 2 UnknownMap_25_34_MapBorder: @ 8442A44 .incbin "data/maps/UnknownMap_25_34/border.bin" + .align 2 UnknownMap_25_34_MapBlockdata: @ 8442A4C .incbin "data/maps/UnknownMap_25_34/map.bin" - .incbin "baserom.gba", 0x442a4e, 0x2 - + .align 2 UnknownMap_25_34_MapAttributes: @ 8442A50 .4byte 0x1 .4byte 0x1 @@ -3151,14 +3679,15 @@ UnknownMap_25_34_MapAttributes: @ 8442A50 .4byte gTileset_InsideBuilding .4byte gTileset_Contest + .align 2 LinkContestRoom2_MapBorder: @ 8442A68 .incbin "data/maps/LinkContestRoom2/border.bin" + .align 2 LinkContestRoom2_MapBlockdata: @ 8442A70 .incbin "data/maps/LinkContestRoom2/map.bin" - .incbin "baserom.gba", 0x442bba, 0x2 - + .align 2 LinkContestRoom2_MapAttributes: @ 8442BBC .4byte 0xf .4byte 0xb @@ -3167,14 +3696,15 @@ LinkContestRoom2_MapAttributes: @ 8442BBC .4byte gTileset_General .4byte gTileset_Contest + .align 2 LinkContestRoom3_MapBorder: @ 8442BD4 .incbin "data/maps/LinkContestRoom3/border.bin" + .align 2 LinkContestRoom3_MapBlockdata: @ 8442BDC .incbin "data/maps/LinkContestRoom3/map.bin" - .incbin "baserom.gba", 0x442d26, 0x2 - + .align 2 LinkContestRoom3_MapAttributes: @ 8442D28 .4byte 0xf .4byte 0xb @@ -3183,14 +3713,15 @@ LinkContestRoom3_MapAttributes: @ 8442D28 .4byte gTileset_General .4byte gTileset_Contest + .align 2 LinkContestRoom4_MapBorder: @ 8442D40 .incbin "data/maps/LinkContestRoom4/border.bin" + .align 2 LinkContestRoom4_MapBlockdata: @ 8442D48 .incbin "data/maps/LinkContestRoom4/map.bin" - .incbin "baserom.gba", 0x442e92, 0x2 - + .align 2 LinkContestRoom4_MapAttributes: @ 8442E94 .4byte 0xf .4byte 0xb @@ -3199,14 +3730,15 @@ LinkContestRoom4_MapAttributes: @ 8442E94 .4byte gTileset_General .4byte gTileset_Contest + .align 2 LinkContestRoom5_MapBorder: @ 8442EAC .incbin "data/maps/LinkContestRoom5/border.bin" + .align 2 LinkContestRoom5_MapBlockdata: @ 8442EB4 .incbin "data/maps/LinkContestRoom5/map.bin" - .incbin "baserom.gba", 0x442ffe, 0x2 - + .align 2 LinkContestRoom5_MapAttributes: @ 8443000 .4byte 0xf .4byte 0xb @@ -3215,14 +3747,15 @@ LinkContestRoom5_MapAttributes: @ 8443000 .4byte gTileset_General .4byte gTileset_Contest + .align 2 LinkContestRoom6_MapBorder: @ 8443018 .incbin "data/maps/LinkContestRoom6/border.bin" + .align 2 LinkContestRoom6_MapBlockdata: @ 8443020 .incbin "data/maps/LinkContestRoom6/map.bin" - .incbin "baserom.gba", 0x44316a, 0x2 - + .align 2 LinkContestRoom6_MapAttributes: @ 844316C .4byte 0xf .4byte 0xb @@ -3231,14 +3764,15 @@ LinkContestRoom6_MapAttributes: @ 844316C .4byte gTileset_General .4byte gTileset_Contest + .align 2 InsideOfTruck_MapBorder: @ 8443184 .incbin "data/maps/InsideOfTruck/border.bin" + .align 2 InsideOfTruck_MapBlockdata: @ 844318C .incbin "data/maps/InsideOfTruck/map.bin" - .incbin "baserom.gba", 0x4431be, 0x2 - + .align 2 InsideOfTruck_MapAttributes: @ 84431C0 .4byte 0x5 .4byte 0x5 @@ -3247,12 +3781,15 @@ InsideOfTruck_MapAttributes: @ 84431C0 .4byte gTileset_General .4byte gTileset_InsideOfTruck + .align 2 SafariZone_Northwest_MapBorder: @ 84431D8 .incbin "data/maps/SafariZone_Northwest/border.bin" + .align 2 SafariZone_Northwest_MapBlockdata: @ 84431E0 .incbin "data/maps/SafariZone_Northwest/map.bin" + .align 2 SafariZone_Northwest_MapAttributes: @ 8443E60 .4byte 0x28 .4byte 0x28 @@ -3261,12 +3798,15 @@ SafariZone_Northwest_MapAttributes: @ 8443E60 .4byte gTileset_General .4byte gTileset_Lilycove + .align 2 SafariZone_North_MapBorder: @ 8443E78 .incbin "data/maps/SafariZone_North/border.bin" + .align 2 SafariZone_North_MapBlockdata: @ 8443E80 .incbin "data/maps/SafariZone_North/map.bin" + .align 2 SafariZone_North_MapAttributes: @ 8444B00 .4byte 0x28 .4byte 0x28 @@ -3275,12 +3815,15 @@ SafariZone_North_MapAttributes: @ 8444B00 .4byte gTileset_General .4byte gTileset_Lilycove + .align 2 SafariZone_Southwest_MapBorder: @ 8444B18 .incbin "data/maps/SafariZone_Southwest/border.bin" + .align 2 SafariZone_Southwest_MapBlockdata: @ 8444B20 .incbin "data/maps/SafariZone_Southwest/map.bin" + .align 2 SafariZone_Southwest_MapAttributes: @ 84457A0 .4byte 0x28 .4byte 0x28 @@ -3289,12 +3832,15 @@ SafariZone_Southwest_MapAttributes: @ 84457A0 .4byte gTileset_General .4byte gTileset_Lilycove + .align 2 SafariZone_South_MapBorder: @ 84457B8 .incbin "data/maps/SafariZone_South/border.bin" + .align 2 SafariZone_South_MapBlockdata: @ 84457C0 .incbin "data/maps/SafariZone_South/map.bin" + .align 2 SafariZone_South_MapAttributes: @ 8446440 .4byte 0x28 .4byte 0x28 @@ -3303,14 +3849,18 @@ SafariZone_South_MapAttributes: @ 8446440 .4byte gTileset_General .4byte gTileset_Lilycove + .align 2 .incbin "baserom.gba", 0x446458, 0xbe8 + .align 2 Route109_SeashoreHouse_MapBorder: @ 8447040 .incbin "data/maps/Route109_SeashoreHouse/border.bin" + .align 2 Route109_SeashoreHouse_MapBlockdata: @ 8447048 .incbin "data/maps/Route109_SeashoreHouse/map.bin" + .align 2 Route109_SeashoreHouse_MapAttributes: @ 8447174 .4byte 0xf .4byte 0xa @@ -3319,12 +3869,15 @@ Route109_SeashoreHouse_MapAttributes: @ 8447174 .4byte gTileset_InsideBuilding .4byte gTileset_SeashoreHouse + .align 2 Route110_TrickHouseEntrance_MapBorder: @ 844718C .incbin "data/maps/Route110_TrickHouseEntrance/border.bin" + .align 2 Route110_TrickHouseEntrance_MapBlockdata: @ 8447194 .incbin "data/maps/Route110_TrickHouseEntrance/map.bin" + .align 2 Route110_TrickHouseEntrance_MapAttributes: @ 8447254 .4byte 0xc .4byte 0x8 @@ -3333,12 +3886,15 @@ Route110_TrickHouseEntrance_MapAttributes: @ 8447254 .4byte gTileset_InsideBuilding .4byte gTileset_GenericBuilding + .align 2 Route110_TrickHouseEnd_MapBorder: @ 844726C .incbin "data/maps/Route110_TrickHouseEnd/border.bin" + .align 2 Route110_TrickHouseEnd_MapBlockdata: @ 8447274 .incbin "data/maps/Route110_TrickHouseEnd/map.bin" + .align 2 Route110_TrickHouseEnd_MapAttributes: @ 8447334 .4byte 0xc .4byte 0x8 @@ -3347,12 +3903,15 @@ Route110_TrickHouseEnd_MapAttributes: @ 8447334 .4byte gTileset_InsideBuilding .4byte gTileset_GenericBuilding + .align 2 Route110_TrickHouseCorridor_MapBorder: @ 844734C .incbin "data/maps/Route110_TrickHouseCorridor/border.bin" + .align 2 Route110_TrickHouseCorridor_MapBlockdata: @ 8447354 .incbin "data/maps/Route110_TrickHouseCorridor/map.bin" + .align 2 Route110_TrickHouseCorridor_MapAttributes: @ 8447624 .4byte 0xf .4byte 0x18 @@ -3361,12 +3920,15 @@ Route110_TrickHouseCorridor_MapAttributes: @ 8447624 .4byte gTileset_InsideBuilding .4byte gTileset_GenericBuilding + .align 2 Route110_TrickHousePuzzle1_MapBorder: @ 844763C .incbin "data/maps/Route110_TrickHousePuzzle1/border.bin" + .align 2 Route110_TrickHousePuzzle1_MapBlockdata: @ 8447644 .incbin "data/maps/Route110_TrickHousePuzzle1/map.bin" + .align 2 Route110_TrickHousePuzzle1_MapAttributes: @ 84478D8 .4byte 0xf .4byte 0x16 @@ -3375,12 +3937,15 @@ Route110_TrickHousePuzzle1_MapAttributes: @ 84478D8 .4byte gTileset_InsideBuilding .4byte gTileset_TrickHousePuzzle + .align 2 Route110_TrickHousePuzzle2_MapBorder: @ 84478F0 .incbin "data/maps/Route110_TrickHousePuzzle2/border.bin" + .align 2 Route110_TrickHousePuzzle2_MapBlockdata: @ 84478F8 .incbin "data/maps/Route110_TrickHousePuzzle2/map.bin" + .align 2 Route110_TrickHousePuzzle2_MapAttributes: @ 8447B8C .4byte 0xf .4byte 0x16 @@ -3389,12 +3954,15 @@ Route110_TrickHousePuzzle2_MapAttributes: @ 8447B8C .4byte gTileset_InsideBuilding .4byte gTileset_TrickHousePuzzle + .align 2 Route110_TrickHousePuzzle3_MapBorder: @ 8447BA4 .incbin "data/maps/Route110_TrickHousePuzzle3/border.bin" + .align 2 Route110_TrickHousePuzzle3_MapBlockdata: @ 8447BAC .incbin "data/maps/Route110_TrickHousePuzzle3/map.bin" + .align 2 Route110_TrickHousePuzzle3_MapAttributes: @ 8447E40 .4byte 0xf .4byte 0x16 @@ -3403,12 +3971,15 @@ Route110_TrickHousePuzzle3_MapAttributes: @ 8447E40 .4byte gTileset_InsideBuilding .4byte gTileset_TrickHousePuzzle + .align 2 Route110_TrickHousePuzzle4_MapBorder: @ 8447E58 .incbin "data/maps/Route110_TrickHousePuzzle4/border.bin" + .align 2 Route110_TrickHousePuzzle4_MapBlockdata: @ 8447E60 .incbin "data/maps/Route110_TrickHousePuzzle4/map.bin" + .align 2 Route110_TrickHousePuzzle4_MapAttributes: @ 84480F4 .4byte 0xf .4byte 0x16 @@ -3417,12 +3988,15 @@ Route110_TrickHousePuzzle4_MapAttributes: @ 84480F4 .4byte gTileset_InsideBuilding .4byte gTileset_TrickHousePuzzle + .align 2 Route110_TrickHousePuzzle5_MapBorder: @ 844810C .incbin "data/maps/Route110_TrickHousePuzzle5/border.bin" + .align 2 Route110_TrickHousePuzzle5_MapBlockdata: @ 8448114 .incbin "data/maps/Route110_TrickHousePuzzle5/map.bin" + .align 2 Route110_TrickHousePuzzle5_MapAttributes: @ 84483A8 .4byte 0xf .4byte 0x16 @@ -3431,12 +4005,15 @@ Route110_TrickHousePuzzle5_MapAttributes: @ 84483A8 .4byte gTileset_InsideBuilding .4byte gTileset_TrickHousePuzzle + .align 2 Route110_TrickHousePuzzle6_MapBorder: @ 84483C0 .incbin "data/maps/Route110_TrickHousePuzzle6/border.bin" + .align 2 Route110_TrickHousePuzzle6_MapBlockdata: @ 84483C8 .incbin "data/maps/Route110_TrickHousePuzzle6/map.bin" + .align 2 Route110_TrickHousePuzzle6_MapAttributes: @ 844865C .4byte 0xf .4byte 0x16 @@ -3445,12 +4022,15 @@ Route110_TrickHousePuzzle6_MapAttributes: @ 844865C .4byte gTileset_InsideBuilding .4byte gTileset_TrickHousePuzzle + .align 2 Route110_TrickHousePuzzle7_MapBorder: @ 8448674 .incbin "data/maps/Route110_TrickHousePuzzle7/border.bin" + .align 2 Route110_TrickHousePuzzle7_MapBlockdata: @ 844867C .incbin "data/maps/Route110_TrickHousePuzzle7/map.bin" + .align 2 Route110_TrickHousePuzzle7_MapAttributes: @ 8448910 .4byte 0xf .4byte 0x16 @@ -3459,12 +4039,15 @@ Route110_TrickHousePuzzle7_MapAttributes: @ 8448910 .4byte gTileset_InsideBuilding .4byte gTileset_TrickHousePuzzle + .align 2 Route110_TrickHousePuzzle8_MapBorder: @ 8448928 .incbin "data/maps/Route110_TrickHousePuzzle8/border.bin" + .align 2 Route110_TrickHousePuzzle8_MapBlockdata: @ 8448930 .incbin "data/maps/Route110_TrickHousePuzzle8/map.bin" + .align 2 Route110_TrickHousePuzzle8_MapAttributes: @ 8448BC4 .4byte 0xf .4byte 0x16 @@ -3473,12 +4056,15 @@ Route110_TrickHousePuzzle8_MapAttributes: @ 8448BC4 .4byte gTileset_InsideBuilding .4byte gTileset_TrickHousePuzzle + .align 2 FortreeCity_DecorationShop_MapBorder: @ 8448BDC .incbin "data/maps/FortreeCity_DecorationShop/border.bin" + .align 2 FortreeCity_DecorationShop_MapBlockdata: @ 8448BE4 .incbin "data/maps/FortreeCity_DecorationShop/map.bin" + .align 2 FortreeCity_DecorationShop_MapAttributes: @ 8448C44 .4byte 0x8 .4byte 0x6 @@ -3487,12 +4073,15 @@ FortreeCity_DecorationShop_MapAttributes: @ 8448C44 .4byte gTileset_InsideBuilding .4byte gTileset_GenericBuilding + .align 2 Route110_SeasideCyclingRoadEntrance1_MapBorder: @ 8448C5C .incbin "data/maps/Route110_SeasideCyclingRoadEntrance1/border.bin" + .align 2 Route110_SeasideCyclingRoadEntrance1_MapBlockdata: @ 8448C64 .incbin "data/maps/Route110_SeasideCyclingRoadEntrance1/map.bin" + .align 2 Route110_SeasideCyclingRoadEntrance1_MapAttributes: @ 8448D18 Route110_SeasideCyclingRoadEntrance2_MapAttributes: @ 8448D18 .4byte 0xf @@ -3502,12 +4091,15 @@ Route110_SeasideCyclingRoadEntrance2_MapAttributes: @ 8448D18 .4byte gTileset_InsideBuilding .4byte gTileset_Shop + .align 2 LilycoveCity_DepartmentStore_1F_MapBorder: @ 8448D30 .incbin "data/maps/LilycoveCity_DepartmentStore_1F/border.bin" + .align 2 LilycoveCity_DepartmentStore_1F_MapBlockdata: @ 8448D38 .incbin "data/maps/LilycoveCity_DepartmentStore_1F/map.bin" + .align 2 LilycoveCity_DepartmentStore_1F_MapAttributes: @ 8448E58 .4byte 0x12 .4byte 0x8 @@ -3516,12 +4108,15 @@ LilycoveCity_DepartmentStore_1F_MapAttributes: @ 8448E58 .4byte gTileset_InsideBuilding .4byte gTileset_Shop + .align 2 LilycoveCity_DepartmentStore_2F_MapBorder: @ 8448E70 .incbin "data/maps/LilycoveCity_DepartmentStore_2F/border.bin" + .align 2 LilycoveCity_DepartmentStore_2F_MapBlockdata: @ 8448E78 .incbin "data/maps/LilycoveCity_DepartmentStore_2F/map.bin" + .align 2 LilycoveCity_DepartmentStore_2F_MapAttributes: @ 8448F98 .4byte 0x12 .4byte 0x8 @@ -3530,12 +4125,15 @@ LilycoveCity_DepartmentStore_2F_MapAttributes: @ 8448F98 .4byte gTileset_InsideBuilding .4byte gTileset_Shop + .align 2 LilycoveCity_DepartmentStore_3F_MapBorder: @ 8448FB0 .incbin "data/maps/LilycoveCity_DepartmentStore_3F/border.bin" + .align 2 LilycoveCity_DepartmentStore_3F_MapBlockdata: @ 8448FB8 .incbin "data/maps/LilycoveCity_DepartmentStore_3F/map.bin" + .align 2 LilycoveCity_DepartmentStore_3F_MapAttributes: @ 84490D8 .4byte 0x12 .4byte 0x8 @@ -3544,12 +4142,15 @@ LilycoveCity_DepartmentStore_3F_MapAttributes: @ 84490D8 .4byte gTileset_InsideBuilding .4byte gTileset_Shop + .align 2 LilycoveCity_DepartmentStore_4F_MapBorder: @ 84490F0 .incbin "data/maps/LilycoveCity_DepartmentStore_4F/border.bin" + .align 2 LilycoveCity_DepartmentStore_4F_MapBlockdata: @ 84490F8 .incbin "data/maps/LilycoveCity_DepartmentStore_4F/map.bin" + .align 2 LilycoveCity_DepartmentStore_4F_MapAttributes: @ 8449218 .4byte 0x12 .4byte 0x8 @@ -3558,12 +4159,15 @@ LilycoveCity_DepartmentStore_4F_MapAttributes: @ 8449218 .4byte gTileset_InsideBuilding .4byte gTileset_Shop + .align 2 LilycoveCity_DepartmentStore_5F_MapBorder: @ 8449230 .incbin "data/maps/LilycoveCity_DepartmentStore_5F/border.bin" + .align 2 LilycoveCity_DepartmentStore_5F_MapBlockdata: @ 8449238 .incbin "data/maps/LilycoveCity_DepartmentStore_5F/map.bin" + .align 2 LilycoveCity_DepartmentStore_5F_MapAttributes: @ 8449358 .4byte 0x12 .4byte 0x8 @@ -3572,12 +4176,15 @@ LilycoveCity_DepartmentStore_5F_MapAttributes: @ 8449358 .4byte gTileset_InsideBuilding .4byte gTileset_Shop + .align 2 LilycoveCity_DepartmentStoreRooftop_MapBorder: @ 8449370 .incbin "data/maps/LilycoveCity_DepartmentStoreRooftop/border.bin" + .align 2 LilycoveCity_DepartmentStoreRooftop_MapBlockdata: @ 8449378 .incbin "data/maps/LilycoveCity_DepartmentStoreRooftop/map.bin" + .align 2 LilycoveCity_DepartmentStoreRooftop_MapAttributes: @ 8449528 .4byte 0x12 .4byte 0xc @@ -3586,12 +4193,15 @@ LilycoveCity_DepartmentStoreRooftop_MapAttributes: @ 8449528 .4byte gTileset_InsideBuilding .4byte gTileset_Shop + .align 2 Route130_MapBorder: @ 8449540 .incbin "data/maps/Route130/border.bin" + .align 2 Route130_MapBlockdata: @ 8449548 .incbin "data/maps/Route130/map.bin" + .align 2 Route130_MapAttributes: @ 844AE48 .4byte 0x50 .4byte 0x28 @@ -3600,12 +4210,15 @@ Route130_MapAttributes: @ 844AE48 .4byte gTileset_General .4byte gTileset_Cave + .align 2 BattleFrontier_BattleTowerLobby_MapBorder: @ 844AE60 .incbin "data/maps/BattleFrontier_BattleTowerLobby/border.bin" + .align 2 BattleFrontier_BattleTowerLobby_MapBlockdata: @ 844AE68 .incbin "data/maps/BattleFrontier_BattleTowerLobby/map.bin" + .align 2 BattleFrontier_BattleTowerLobby_MapAttributes: @ 844B05C .4byte 0x19 .4byte 0xa @@ -3614,12 +4227,15 @@ BattleFrontier_BattleTowerLobby_MapAttributes: @ 844B05C .4byte gTileset_InsideBuilding .4byte gTileset_BattleFrontier + .align 2 BattleFrontier_OutsideWest_MapBorder: @ 844B074 .incbin "data/maps/BattleFrontier_OutsideWest/border.bin" + .align 2 BattleFrontier_OutsideWest_MapBlockdata: @ 844B07C .incbin "data/maps/BattleFrontier_OutsideWest/map.bin" + .align 2 BattleFrontier_OutsideWest_MapAttributes: @ 844CFFC .4byte 0x38 .4byte 0x48 @@ -3628,14 +4244,15 @@ BattleFrontier_OutsideWest_MapAttributes: @ 844CFFC .4byte gTileset_General .4byte gTileset_BattleFrontierOutsideWest + .align 2 BattleFrontier_BattleTowerElevator_MapBorder: @ 844D014 .incbin "data/maps/BattleFrontier_BattleTowerElevator/border.bin" + .align 2 BattleFrontier_BattleTowerElevator_MapBlockdata: @ 844D01C .incbin "data/maps/BattleFrontier_BattleTowerElevator/map.bin" - .incbin "baserom.gba", 0x44d062, 0x2 - + .align 2 BattleFrontier_BattleTowerElevator_MapAttributes: @ 844D064 TrainerHill_Elevator_MapAttributes: @ 844D064 .4byte 0x5 @@ -3645,14 +4262,15 @@ TrainerHill_Elevator_MapAttributes: @ 844D064 .4byte gTileset_InsideBuilding .4byte gTileset_BattleFrontier + .align 2 BattleFrontier_BattleTowerCorridor_MapBorder: @ 844D07C .incbin "data/maps/BattleFrontier_BattleTowerCorridor/border.bin" + .align 2 BattleFrontier_BattleTowerCorridor_MapBlockdata: @ 844D084 .incbin "data/maps/BattleFrontier_BattleTowerCorridor/map.bin" - .incbin "baserom.gba", 0x44d12e, 0x2 - + .align 2 BattleFrontier_BattleTowerCorridor_MapAttributes: @ 844D130 .4byte 0x11 .4byte 0x5 @@ -3661,12 +4279,15 @@ BattleFrontier_BattleTowerCorridor_MapAttributes: @ 844D130 .4byte gTileset_InsideBuilding .4byte gTileset_BattleFrontier + .align 2 BattleFrontier_BattleTowerBattleRoom_MapBorder: @ 844D148 .incbin "data/maps/BattleFrontier_BattleTowerBattleRoom/border.bin" + .align 2 BattleFrontier_BattleTowerBattleRoom_MapBlockdata: @ 844D150 .incbin "data/maps/BattleFrontier_BattleTowerBattleRoom/map.bin" + .align 2 BattleFrontier_BattleTowerBattleRoom2_MapAttributes: @ 844D204 BattleFrontier_BattleTowerBattleRoom_MapAttributes: @ 844D204 .4byte 0xa @@ -3676,14 +4297,15 @@ BattleFrontier_BattleTowerBattleRoom_MapAttributes: @ 844D204 .4byte gTileset_InsideBuilding .4byte gTileset_BattleFrontier + .align 2 RustboroCity_DevonCorp_3F_MapBorder: @ 844D21C .incbin "data/maps/RustboroCity_DevonCorp_3F/border.bin" + .align 2 RustboroCity_DevonCorp_3F_MapBlockdata: @ 844D224 .incbin "data/maps/RustboroCity_DevonCorp_3F/map.bin" - .incbin "baserom.gba", 0x44d37a, 0x2 - + .align 2 RustboroCity_DevonCorp_3F_MapAttributes: @ 844D37C .4byte 0x13 .4byte 0x9 @@ -3692,12 +4314,15 @@ RustboroCity_DevonCorp_3F_MapAttributes: @ 844D37C .4byte gTileset_InsideBuilding .4byte gTileset_Facility + .align 2 EverGrandeCity_PokemonLeague_1F_MapBorder: @ 844D394 .incbin "data/maps/EverGrandeCity_PokemonLeague_1F/border.bin" + .align 2 EverGrandeCity_PokemonLeague_1F_MapBlockdata: @ 844D39C .incbin "data/maps/EverGrandeCity_PokemonLeague_1F/map.bin" + .align 2 EverGrandeCity_PokemonLeague_1F_MapAttributes: @ 844D564 .4byte 0x13 .4byte 0xc @@ -3706,12 +4331,15 @@ EverGrandeCity_PokemonLeague_1F_MapAttributes: @ 844D564 .4byte gTileset_InsideBuilding .4byte gTileset_PokemonCenter + .align 2 Route119_WeatherInstitute_1F_MapBorder: @ 844D57C .incbin "data/maps/Route119_WeatherInstitute_1F/border.bin" + .align 2 Route119_WeatherInstitute_1F_MapBlockdata: @ 844D584 .incbin "data/maps/Route119_WeatherInstitute_1F/map.bin" + .align 2 Route119_WeatherInstitute_1F_MapAttributes: @ 844D78C .4byte 0x14 .4byte 0xd @@ -3720,12 +4348,15 @@ Route119_WeatherInstitute_1F_MapAttributes: @ 844D78C .4byte gTileset_InsideBuilding .4byte gTileset_Lab + .align 2 Route119_WeatherInstitute_2F_MapBorder: @ 844D7A4 .incbin "data/maps/Route119_WeatherInstitute_2F/border.bin" + .align 2 Route119_WeatherInstitute_2F_MapBlockdata: @ 844D7AC .incbin "data/maps/Route119_WeatherInstitute_2F/map.bin" + .align 2 Route119_WeatherInstitute_2F_MapAttributes: @ 844D964 .4byte 0x14 .4byte 0xb @@ -3734,12 +4365,15 @@ Route119_WeatherInstitute_2F_MapAttributes: @ 844D964 .4byte gTileset_InsideBuilding .4byte gTileset_Lab + .align 2 LilycoveCity_DepartmentStoreElevator_MapBorder: @ 844D97C .incbin "data/maps/LilycoveCity_DepartmentStoreElevator/border.bin" + .align 2 LilycoveCity_DepartmentStoreElevator_MapBlockdata: @ 844D984 .incbin "data/maps/LilycoveCity_DepartmentStoreElevator/map.bin" + .align 2 LilycoveCity_DepartmentStoreElevator_MapAttributes: @ 844D9C0 .4byte 0x5 .4byte 0x6 @@ -3748,12 +4382,15 @@ LilycoveCity_DepartmentStoreElevator_MapAttributes: @ 844D9C0 .4byte gTileset_InsideBuilding .4byte gTileset_BattleFrontier + .align 2 Underwater1_MapBorder: @ 844D9D8 .incbin "data/maps/Underwater1/border.bin" + .align 2 Underwater1_MapBlockdata: @ 844D9E0 .incbin "data/maps/Underwater1/map.bin" + .align 2 Underwater1_MapAttributes: @ 8450BE0 .4byte 0x50 .4byte 0x50 @@ -3762,12 +4399,15 @@ Underwater1_MapAttributes: @ 8450BE0 .4byte gTileset_General .4byte gTileset_Underwater + .align 2 MossdeepCity_SpaceCenter_1F_MapBorder: @ 8450BF8 .incbin "data/maps/MossdeepCity_SpaceCenter_1F/border.bin" + .align 2 MossdeepCity_SpaceCenter_1F_MapBlockdata: @ 8450C00 .incbin "data/maps/MossdeepCity_SpaceCenter_1F/map.bin" + .align 2 MossdeepCity_SpaceCenter_1F_MapAttributes: @ 8450D40 .4byte 0x10 .4byte 0xa @@ -3776,12 +4416,15 @@ MossdeepCity_SpaceCenter_1F_MapAttributes: @ 8450D40 .4byte gTileset_General .4byte gTileset_Facility + .align 2 MossdeepCity_SpaceCenter_2F_MapBorder: @ 8450D58 .incbin "data/maps/MossdeepCity_SpaceCenter_2F/border.bin" + .align 2 MossdeepCity_SpaceCenter_2F_MapBlockdata: @ 8450D60 .incbin "data/maps/MossdeepCity_SpaceCenter_2F/map.bin" + .align 2 MossdeepCity_SpaceCenter_2F_MapAttributes: @ 8450EA0 .4byte 0x10 .4byte 0xa @@ -3790,12 +4433,15 @@ MossdeepCity_SpaceCenter_2F_MapAttributes: @ 8450EA0 .4byte gTileset_General .4byte gTileset_Facility + .align 2 SSTidalCorridor_MapBorder: @ 8450EB8 .incbin "data/maps/SSTidalCorridor/border.bin" + .align 2 SSTidalCorridor_MapBlockdata: @ 8450EC0 .incbin "data/maps/SSTidalCorridor/map.bin" + .align 2 SSTidalCorridor_MapAttributes: @ 8451094 .4byte 0x12 .4byte 0xd @@ -3804,14 +4450,15 @@ SSTidalCorridor_MapAttributes: @ 8451094 .4byte gTileset_General .4byte gTileset_InsideShip + .align 2 SSTidalLowerDeck_MapBorder: @ 84510AC .incbin "data/maps/SSTidalLowerDeck/border.bin" + .align 2 SSTidalLowerDeck_MapBlockdata: @ 84510B4 .incbin "data/maps/SSTidalLowerDeck/map.bin" - .incbin "baserom.gba", 0x45126e, 0x2 - + .align 2 SSTidalLowerDeck_MapAttributes: @ 8451270 .4byte 0x11 .4byte 0xd @@ -3820,12 +4467,15 @@ SSTidalLowerDeck_MapAttributes: @ 8451270 .4byte gTileset_General .4byte gTileset_InsideShip + .align 2 SSTidalRooms_MapBorder: @ 8451288 .incbin "data/maps/SSTidalRooms/border.bin" + .align 2 SSTidalRooms_MapBlockdata: @ 8451290 .incbin "data/maps/SSTidalRooms/map.bin" + .align 2 SSTidalRooms_MapAttributes: @ 84517A0 .4byte 0x24 .4byte 0x12 @@ -3834,14 +4484,15 @@ SSTidalRooms_MapAttributes: @ 84517A0 .4byte gTileset_General .4byte gTileset_InsideShip + .align 2 IslandCave_MapBorder: @ 84517B8 .incbin "data/maps/IslandCave/border.bin" + .align 2 IslandCave_MapBlockdata: @ 84517C0 .incbin "data/maps/IslandCave/map.bin" - .incbin "baserom.gba", 0x451c22, 0x2 - + .align 2 IslandCave_MapAttributes: @ 8451C24 .4byte 0x11 .4byte 0x21 @@ -3850,14 +4501,15 @@ IslandCave_MapAttributes: @ 8451C24 .4byte gTileset_General .4byte gTileset_Cave + .align 2 AncientTomb_MapBorder: @ 8451C3C .incbin "data/maps/AncientTomb/border.bin" + .align 2 AncientTomb_MapBlockdata: @ 8451C44 .incbin "data/maps/AncientTomb/map.bin" - .incbin "baserom.gba", 0x4520a6, 0x2 - + .align 2 AncientTomb_MapAttributes: @ 84520A8 .4byte 0x11 .4byte 0x21 @@ -3866,12 +4518,15 @@ AncientTomb_MapAttributes: @ 84520A8 .4byte gTileset_General .4byte gTileset_Cave + .align 2 Underwater_Route134_MapBorder: @ 84520C0 .incbin "data/maps/Underwater_Route134/border.bin" + .align 2 Underwater_Route134_MapBlockdata: @ 84520C8 .incbin "data/maps/Underwater_Route134/map.bin" + .align 2 Underwater_Route134_MapAttributes: @ 8452230 .4byte 0x12 .4byte 0xa @@ -3880,12 +4535,15 @@ Underwater_Route134_MapAttributes: @ 8452230 .4byte gTileset_General .4byte gTileset_Underwater + .align 2 Underwater_SealedChamber_MapBorder: @ 8452248 .incbin "data/maps/Underwater_SealedChamber/border.bin" + .align 2 Underwater_SealedChamber_MapBlockdata: @ 8452250 .incbin "data/maps/Underwater_SealedChamber/map.bin" + .align 2 Underwater_SealedChamber_MapAttributes: @ 8452A90 .4byte 0x16 .4byte 0x30 @@ -3894,14 +4552,15 @@ Underwater_SealedChamber_MapAttributes: @ 8452A90 .4byte gTileset_General .4byte gTileset_Underwater + .align 2 SealedChamber_OuterRoom_MapBorder: @ 8452AA8 .incbin "data/maps/SealedChamber_OuterRoom/border.bin" + .align 2 SealedChamber_OuterRoom_MapBlockdata: @ 8452AB0 .incbin "data/maps/SealedChamber_OuterRoom/map.bin" - .incbin "baserom.gba", 0x452e76, 0x2 - + .align 2 SealedChamber_OuterRoom_MapAttributes: @ 8452E78 .4byte 0x15 .4byte 0x17 @@ -3910,12 +4569,15 @@ SealedChamber_OuterRoom_MapAttributes: @ 8452E78 .4byte gTileset_General .4byte gTileset_Cave + .align 2 VictoryRoad_B1F_MapBorder: @ 8452E90 .incbin "data/maps/VictoryRoad_B1F/border.bin" + .align 2 VictoryRoad_B1F_MapBlockdata: @ 8452E98 .incbin "data/maps/VictoryRoad_B1F/map.bin" + .align 2 VictoryRoad_B1F_MapAttributes: @ 84539BC .4byte 0x2e .4byte 0x1f @@ -3924,12 +4586,15 @@ VictoryRoad_B1F_MapAttributes: @ 84539BC .4byte gTileset_General .4byte gTileset_Cave + .align 2 VictoryRoad_B2F_MapBorder: @ 84539D4 .incbin "data/maps/VictoryRoad_B2F/border.bin" + .align 2 VictoryRoad_B2F_MapBlockdata: @ 84539DC .incbin "data/maps/VictoryRoad_B2F/map.bin" + .align 2 VictoryRoad_B2F_MapAttributes: @ 8454500 .4byte 0x2e .4byte 0x1f @@ -3938,14 +4603,15 @@ VictoryRoad_B2F_MapAttributes: @ 8454500 .4byte gTileset_General .4byte gTileset_Cave + .align 2 Route104_Prototype_MapBorder: @ 8454518 .incbin "data/maps/Route104_Prototype/border.bin" + .align 2 Route104_Prototype_MapBlockdata: @ 8454520 .incbin "data/maps/Route104_Prototype/map.bin" - .incbin "baserom.gba", 0x454522, 0x2 - + .align 2 Route104_Prototype_MapAttributes: @ 8454524 .4byte 0x1 .4byte 0x1 @@ -3954,12 +4620,15 @@ Route104_Prototype_MapAttributes: @ 8454524 .4byte gTileset_General .4byte gTileset_Rustboro + .align 2 GraniteCave_StevensRoom_MapBorder: @ 845453C .incbin "data/maps/GraniteCave_StevensRoom/border.bin" + .align 2 GraniteCave_StevensRoom_MapBlockdata: @ 8454544 .incbin "data/maps/GraniteCave_StevensRoom/map.bin" + .align 2 GraniteCave_StevensRoom_MapAttributes: @ 84546E8 .4byte 0xf .4byte 0xe @@ -3968,14 +4637,15 @@ GraniteCave_StevensRoom_MapAttributes: @ 84546E8 .4byte gTileset_General .4byte gTileset_Cave + .align 2 AbandonedShip_HiddenFloorCorridors_MapBorder: @ 8454700 .incbin "data/maps/AbandonedShip_HiddenFloorCorridors/border.bin" + .align 2 AbandonedShip_HiddenFloorCorridors_MapBlockdata: @ 8454708 .incbin "data/maps/AbandonedShip_HiddenFloorCorridors/map.bin" - .incbin "baserom.gba", 0x454826, 0x2 - + .align 2 AbandonedShip_HiddenFloorCorridors_MapAttributes: @ 8454828 .4byte 0xd .4byte 0xb @@ -3984,12 +4654,15 @@ AbandonedShip_HiddenFloorCorridors_MapAttributes: @ 8454828 .4byte gTileset_General .4byte gTileset_InsideShip + .align 2 SouthernIsland_Exterior_MapBorder: @ 8454840 .incbin "data/maps/SouthernIsland_Exterior/border.bin" + .align 2 SouthernIsland_Exterior_MapBlockdata: @ 8454848 .incbin "data/maps/SouthernIsland_Exterior/map.bin" + .align 2 SouthernIsland_Exterior_MapAttributes: @ 8455004 .4byte 0x21 .4byte 0x1e @@ -3998,12 +4671,15 @@ SouthernIsland_Exterior_MapAttributes: @ 8455004 .4byte gTileset_General .4byte gTileset_Rustboro + .align 2 SouthernIsland_Interior_MapBorder: @ 845501C .incbin "data/maps/SouthernIsland_Interior/border.bin" + .align 2 SouthernIsland_Interior_MapBlockdata: @ 8455024 .incbin "data/maps/SouthernIsland_Interior/map.bin" + .align 2 SouthernIsland_Interior_MapAttributes: @ 8455534 .4byte 0x1b .4byte 0x18 @@ -4012,12 +4688,15 @@ SouthernIsland_Interior_MapAttributes: @ 8455534 .4byte gTileset_General .4byte gTileset_Rustboro + .align 2 JaggedPass_MapBorder: @ 845554C .incbin "data/maps/JaggedPass/border.bin" + .align 2 JaggedPass_MapBlockdata: @ 8455554 .incbin "data/maps/JaggedPass/map.bin" + .align 2 JaggedPass_MapAttributes: @ 845601C .4byte 0x1e .4byte 0x2e @@ -4026,12 +4705,15 @@ JaggedPass_MapAttributes: @ 845601C .4byte gTileset_General .4byte gTileset_Lavaridge + .align 2 FieryPath_MapBorder: @ 8456034 .incbin "data/maps/FieryPath/border.bin" + .align 2 FieryPath_MapBlockdata: @ 845603C .incbin "data/maps/FieryPath/map.bin" + .align 2 FieryPath_MapAttributes: @ 8456AA0 .4byte 0x23 .4byte 0x26 @@ -4040,12 +4722,15 @@ FieryPath_MapAttributes: @ 8456AA0 .4byte gTileset_General .4byte gTileset_Lavaridge + .align 2 RustboroCity_Flat2_1F_MapBorder: @ 8456AB8 .incbin "data/maps/RustboroCity_Flat2_1F/border.bin" + .align 2 RustboroCity_Flat2_1F_MapBlockdata: @ 8456AC0 .incbin "data/maps/RustboroCity_Flat2_1F/map.bin" + .align 2 RustboroCity_Flat2_1F_MapAttributes: @ 8456BBC .4byte 0xe .4byte 0x9 @@ -4054,12 +4739,15 @@ RustboroCity_Flat2_1F_MapAttributes: @ 8456BBC .4byte gTileset_InsideBuilding .4byte gTileset_GenericBuilding + .align 2 RustboroCity_Flat2_2F_MapBorder: @ 8456BD4 .incbin "data/maps/RustboroCity_Flat2_2F/border.bin" + .align 2 RustboroCity_Flat2_2F_MapBlockdata: @ 8456BDC .incbin "data/maps/RustboroCity_Flat2_2F/map.bin" + .align 2 RustboroCity_Flat2_2F_MapAttributes: @ 8456CD8 .4byte 0xe .4byte 0x9 @@ -4068,12 +4756,15 @@ RustboroCity_Flat2_2F_MapAttributes: @ 8456CD8 .4byte gTileset_InsideBuilding .4byte gTileset_GenericBuilding + .align 2 RustboroCity_Flat2_3F_MapBorder: @ 8456CF0 .incbin "data/maps/RustboroCity_Flat2_3F/border.bin" + .align 2 RustboroCity_Flat2_3F_MapBlockdata: @ 8456CF8 .incbin "data/maps/RustboroCity_Flat2_3F/map.bin" + .align 2 RustboroCity_Flat2_3F_MapAttributes: @ 8456DF4 .4byte 0xe .4byte 0x9 @@ -4082,12 +4773,15 @@ RustboroCity_Flat2_3F_MapAttributes: @ 8456DF4 .4byte gTileset_InsideBuilding .4byte gTileset_GenericBuilding + .align 2 SootopolisCity_LotadAndSeedotHouse_MapBorder: @ 8456E0C .incbin "data/maps/SootopolisCity_LotadAndSeedotHouse/border.bin" + .align 2 SootopolisCity_LotadAndSeedotHouse_MapBlockdata: @ 8456E14 .incbin "data/maps/SootopolisCity_LotadAndSeedotHouse/map.bin" + .align 2 SootopolisCity_LotadAndSeedotHouse_MapAttributes: @ 8456E84 .4byte 0x8 .4byte 0x7 @@ -4096,14 +4790,15 @@ SootopolisCity_LotadAndSeedotHouse_MapAttributes: @ 8456E84 .4byte gTileset_InsideBuilding .4byte gTileset_GenericBuilding + .align 2 EverGrandeCity_HallOfFame_MapBorder: @ 8456E9C .incbin "data/maps/EverGrandeCity_HallOfFame/border.bin" + .align 2 EverGrandeCity_HallOfFame_MapBlockdata: @ 8456EA4 .incbin "data/maps/EverGrandeCity_HallOfFame/map.bin" - .incbin "baserom.gba", 0x4570a2, 0x2 - + .align 2 EverGrandeCity_HallOfFame_MapAttributes: @ 84570A4 .4byte 0xf .4byte 0x11 @@ -4112,12 +4807,15 @@ EverGrandeCity_HallOfFame_MapAttributes: @ 84570A4 .4byte gTileset_InsideBuilding .4byte gTileset_CableClub + .align 2 LilycoveCity_CoveLilyMotel_1F_MapBorder: @ 84570BC .incbin "data/maps/LilycoveCity_CoveLilyMotel_1F/border.bin" + .align 2 LilycoveCity_CoveLilyMotel_1F_MapBlockdata: @ 84570C4 .incbin "data/maps/LilycoveCity_CoveLilyMotel_1F/map.bin" + .align 2 LilycoveCity_CoveLilyMotel_1F_MapAttributes: @ 845719C .4byte 0xc .4byte 0x9 @@ -4126,12 +4824,15 @@ LilycoveCity_CoveLilyMotel_1F_MapAttributes: @ 845719C .4byte gTileset_InsideBuilding .4byte gTileset_GenericBuilding + .align 2 LilycoveCity_CoveLilyMotel_2F_MapBorder: @ 84571B4 .incbin "data/maps/LilycoveCity_CoveLilyMotel_2F/border.bin" + .align 2 LilycoveCity_CoveLilyMotel_2F_MapBlockdata: @ 84571BC .incbin "data/maps/LilycoveCity_CoveLilyMotel_2F/map.bin" + .align 2 LilycoveCity_CoveLilyMotel_2F_MapAttributes: @ 8457294 .4byte 0xc .4byte 0x9 @@ -4140,12 +4841,15 @@ LilycoveCity_CoveLilyMotel_2F_MapAttributes: @ 8457294 .4byte gTileset_InsideBuilding .4byte gTileset_GenericBuilding + .align 2 Route124_DivingTreasureHuntersHouse_MapBorder: @ 84572AC .incbin "data/maps/Route124_DivingTreasureHuntersHouse/border.bin" + .align 2 Route124_DivingTreasureHuntersHouse_MapBlockdata: @ 84572B4 .incbin "data/maps/Route124_DivingTreasureHuntersHouse/map.bin" + .align 2 Route124_DivingTreasureHuntersHouse_MapAttributes: @ 8457368 .4byte 0xa .4byte 0x9 @@ -4154,12 +4858,15 @@ Route124_DivingTreasureHuntersHouse_MapAttributes: @ 8457368 .4byte gTileset_InsideBuilding .4byte gTileset_GenericBuilding + .align 2 MtPyre_Exterior_MapBorder: @ 8457380 .incbin "data/maps/MtPyre_Exterior/border.bin" + .align 2 MtPyre_Exterior_MapBlockdata: @ 8457388 .incbin "data/maps/MtPyre_Exterior/map.bin" + .align 2 MtPyre_Exterior_MapAttributes: @ 84582AC .4byte 0x26 .4byte 0x33 @@ -4168,12 +4875,15 @@ MtPyre_Exterior_MapAttributes: @ 84582AC .4byte gTileset_General .4byte gTileset_Facility + .align 2 MtPyre_Summit_MapBorder: @ 84582C4 .incbin "data/maps/MtPyre_Summit/border.bin" + .align 2 MtPyre_Summit_MapBlockdata: @ 84582CC .incbin "data/maps/MtPyre_Summit/map.bin" + .align 2 MtPyre_Summit_MapAttributes: @ 8459140 .4byte 0x32 .4byte 0x25 @@ -4182,14 +4892,15 @@ MtPyre_Summit_MapAttributes: @ 8459140 .4byte gTileset_General .4byte gTileset_Facility + .align 2 SealedChamber_InnerRoom_MapBorder: @ 8459158 .incbin "data/maps/SealedChamber_InnerRoom/border.bin" + .align 2 SealedChamber_InnerRoom_MapBlockdata: @ 8459160 .incbin "data/maps/SealedChamber_InnerRoom/map.bin" - .incbin "baserom.gba", 0x459526, 0x2 - + .align 2 SealedChamber_InnerRoom_MapAttributes: @ 8459528 .4byte 0x15 .4byte 0x17 @@ -4198,12 +4909,15 @@ SealedChamber_InnerRoom_MapAttributes: @ 8459528 .4byte gTileset_General .4byte gTileset_Cave + .align 2 MossdeepCity_GameCorner_1F_MapBorder: @ 8459540 .incbin "data/maps/MossdeepCity_GameCorner_1F/border.bin" + .align 2 MossdeepCity_GameCorner_1F_MapBlockdata: @ 8459548 .incbin "data/maps/MossdeepCity_GameCorner_1F/map.bin" + .align 2 MossdeepCity_GameCorner_1F_MapAttributes: @ 8459638 .4byte 0xc .4byte 0xa @@ -4212,12 +4926,15 @@ MossdeepCity_GameCorner_1F_MapAttributes: @ 8459638 .4byte gTileset_InsideBuilding .4byte gTileset_MossdeepGameCorner + .align 2 MossdeepCity_GameCorner_B1F_MapBorder: @ 8459650 .incbin "data/maps/MossdeepCity_GameCorner_B1F/border.bin" + .align 2 MossdeepCity_GameCorner_B1F_MapBlockdata: @ 8459658 .incbin "data/maps/MossdeepCity_GameCorner_B1F/map.bin" + .align 2 MossdeepCity_GameCorner_B1F_MapAttributes: @ 8459730 .4byte 0xc .4byte 0x9 @@ -4226,12 +4943,15 @@ MossdeepCity_GameCorner_B1F_MapAttributes: @ 8459730 .4byte gTileset_InsideBuilding .4byte gTileset_GenericBuilding + .align 2 SootopolisCity_House1_MapBorder: @ 8459748 .incbin "data/maps/SootopolisCity_House1/border.bin" + .align 2 SootopolisCity_House1_MapBlockdata: @ 8459750 .incbin "data/maps/SootopolisCity_House1/map.bin" + .align 2 SootopolisCity_House1_MapAttributes: @ 84597C0 SootopolisCity_House4_MapAttributes: @ 84597C0 SootopolisCity_House7_MapAttributes: @ 84597C0 @@ -4242,12 +4962,15 @@ SootopolisCity_House7_MapAttributes: @ 84597C0 .4byte gTileset_InsideBuilding .4byte gTileset_GenericBuilding + .align 2 SootopolisCity_House2_MapBorder: @ 84597D8 .incbin "data/maps/SootopolisCity_House2/border.bin" + .align 2 SootopolisCity_House2_MapBlockdata: @ 84597E0 .incbin "data/maps/SootopolisCity_House2/map.bin" + .align 2 SootopolisCity_House2_MapAttributes: @ 8459850 SootopolisCity_House5_MapAttributes: @ 8459850 .4byte 0x8 @@ -4257,12 +4980,15 @@ SootopolisCity_House5_MapAttributes: @ 8459850 .4byte gTileset_InsideBuilding .4byte gTileset_GenericBuilding + .align 2 SootopolisCity_House3_MapBorder: @ 8459868 .incbin "data/maps/SootopolisCity_House3/border.bin" + .align 2 SootopolisCity_House3_MapBlockdata: @ 8459870 .incbin "data/maps/SootopolisCity_House3/map.bin" + .align 2 SootopolisCity_House3_MapAttributes: @ 84598E0 SootopolisCity_House6_MapAttributes: @ 84598E0 .4byte 0x8 @@ -4272,12 +4998,15 @@ SootopolisCity_House6_MapAttributes: @ 84598E0 .4byte gTileset_InsideBuilding .4byte gTileset_GenericBuilding + .align 2 AbandonedShip_HiddenFloorRooms_MapBorder: @ 84598F8 .incbin "data/maps/AbandonedShip_HiddenFloorRooms/border.bin" + .align 2 AbandonedShip_HiddenFloorRooms_MapBlockdata: @ 8459900 .incbin "data/maps/AbandonedShip_HiddenFloorRooms/map.bin" + .align 2 AbandonedShip_HiddenFloorRooms_MapAttributes: @ 8459E28 .4byte 0x2c .4byte 0xf @@ -4286,12 +5015,15 @@ AbandonedShip_HiddenFloorRooms_MapAttributes: @ 8459E28 .4byte gTileset_General .4byte gTileset_InsideShip + .align 2 ScorchedSlab_MapBorder: @ 8459E40 .incbin "data/maps/ScorchedSlab/border.bin" + .align 2 ScorchedSlab_MapBlockdata: @ 8459E48 .incbin "data/maps/ScorchedSlab/map.bin" + .align 2 ScorchedSlab_MapAttributes: @ 845A0A0 .4byte 0xf .4byte 0x14 @@ -4300,14 +5032,18 @@ ScorchedSlab_MapAttributes: @ 845A0A0 .4byte gTileset_General .4byte gTileset_Cave + .align 2 .incbin "baserom.gba", 0x45a0b8, 0x2f4 + .align 2 RustboroCity_Flat1_1F_MapBorder: @ 845A3AC .incbin "data/maps/RustboroCity_Flat1_1F/border.bin" + .align 2 RustboroCity_Flat1_1F_MapBlockdata: @ 845A3B4 .incbin "data/maps/RustboroCity_Flat1_1F/map.bin" + .align 2 RustboroCity_Flat1_1F_MapAttributes: @ 845A494 .4byte 0xe .4byte 0x8 @@ -4316,12 +5052,15 @@ RustboroCity_Flat1_1F_MapAttributes: @ 845A494 .4byte gTileset_InsideBuilding .4byte gTileset_GenericBuilding + .align 2 RustboroCity_Flat1_2F_MapBorder: @ 845A4AC .incbin "data/maps/RustboroCity_Flat1_2F/border.bin" + .align 2 RustboroCity_Flat1_2F_MapBlockdata: @ 845A4B4 .incbin "data/maps/RustboroCity_Flat1_2F/map.bin" + .align 2 RustboroCity_Flat1_2F_MapAttributes: @ 845A594 .4byte 0xe .4byte 0x8 @@ -4330,12 +5069,15 @@ RustboroCity_Flat1_2F_MapAttributes: @ 845A594 .4byte gTileset_InsideBuilding .4byte gTileset_GenericBuilding + .align 2 EverGrandeCity_Hall4_MapBorder: @ 845A5AC .incbin "data/maps/EverGrandeCity_Hall4/border.bin" + .align 2 EverGrandeCity_Hall4_MapBlockdata: @ 845A5B4 .incbin "data/maps/EverGrandeCity_Hall4/map.bin" + .align 2 EverGrandeCity_Hall4_MapAttributes: @ 845A8A0 .4byte 0xb .4byte 0x22 @@ -4344,12 +5086,15 @@ EverGrandeCity_Hall4_MapAttributes: @ 845A8A0 .4byte gTileset_InsideBuilding .4byte gTileset_EliteFour + .align 2 AquaHideout_UnusedRubyMap1_MapBorder: @ 845A8B8 .incbin "data/maps/AquaHideout_UnusedRubyMap1/border.bin" + .align 2 AquaHideout_UnusedRubyMap1_MapBlockdata: @ 845A8C0 .incbin "data/maps/AquaHideout_UnusedRubyMap1/map.bin" + .align 2 AquaHideout_UnusedRubyMap1_MapAttributes: @ 845AF50 .4byte 0x1c .4byte 0x1e @@ -4358,12 +5103,15 @@ AquaHideout_UnusedRubyMap1_MapAttributes: @ 845AF50 .4byte gTileset_General .4byte gTileset_Facility + .align 2 AquaHideout_UnusedRubyMap2_MapBorder: @ 845AF68 .incbin "data/maps/AquaHideout_UnusedRubyMap2/border.bin" + .align 2 AquaHideout_UnusedRubyMap2_MapBlockdata: @ 845AF70 .incbin "data/maps/AquaHideout_UnusedRubyMap2/map.bin" + .align 2 AquaHideout_UnusedRubyMap2_MapAttributes: @ 845BB10 .4byte 0x3e .4byte 0x18 @@ -4372,12 +5120,15 @@ AquaHideout_UnusedRubyMap2_MapAttributes: @ 845BB10 .4byte gTileset_General .4byte gTileset_Facility + .align 2 AquaHideout_UnusedRubyMap3_MapBorder: @ 845BB28 .incbin "data/maps/AquaHideout_UnusedRubyMap3/border.bin" + .align 2 AquaHideout_UnusedRubyMap3_MapBlockdata: @ 845BB30 .incbin "data/maps/AquaHideout_UnusedRubyMap3/map.bin" + .align 2 AquaHideout_UnusedRubyMap3_MapAttributes: @ 845C190 .4byte 0x22 .4byte 0x18 @@ -4386,14 +5137,18 @@ AquaHideout_UnusedRubyMap3_MapAttributes: @ 845C190 .4byte gTileset_General .4byte gTileset_Facility + .align 2 .incbin "baserom.gba", 0x45c1a8, 0x12e0 + .align 2 SkyPillar_Entrance_MapBorder: @ 845D488 .incbin "data/maps/SkyPillar_Entrance/border.bin" + .align 2 SkyPillar_Entrance_MapBlockdata: @ 845D490 .incbin "data/maps/SkyPillar_Entrance/map.bin" + .align 2 SkyPillar_Entrance_MapAttributes: @ 845D718 .4byte 0x12 .4byte 0x12 @@ -4402,12 +5157,15 @@ SkyPillar_Entrance_MapAttributes: @ 845D718 .4byte gTileset_General .4byte gTileset_Cave + .align 2 SkyPillar_Outside_MapBorder: @ 845D730 .incbin "data/maps/SkyPillar_Outside/border.bin" + .align 2 SkyPillar_Outside_MapBlockdata: @ 845D738 .incbin "data/maps/SkyPillar_Outside/map.bin" + .align 2 SkyPillar_Outside_MapAttributes: @ 845DC40 .4byte 0x1c .4byte 0x17 @@ -4416,12 +5174,15 @@ SkyPillar_Outside_MapAttributes: @ 845DC40 .4byte gTileset_General .4byte gTileset_Pacifidlog + .align 2 SkyPillar_1F_MapBorder: @ 845DC58 .incbin "data/maps/SkyPillar_1F/border.bin" + .align 2 SkyPillar_1F_MapBlockdata: @ 845DC60 .incbin "data/maps/SkyPillar_1F/map.bin" + .align 2 SkyPillar_1F_MapAttributes: @ 845DDE8 .4byte 0xe .4byte 0xe @@ -4430,12 +5191,15 @@ SkyPillar_1F_MapAttributes: @ 845DDE8 .4byte gTileset_General .4byte gTileset_Pacifidlog + .align 2 SkyPillar_2F_MapBorder: @ 845DE00 .incbin "data/maps/SkyPillar_2F/border.bin" + .align 2 SkyPillar_2F_MapBlockdata: @ 845DE08 .incbin "data/maps/SkyPillar_2F/map.bin" + .align 2 SkyPillar_2F_MapAttributes: @ 845DF90 .4byte 0xe .4byte 0xe @@ -4444,12 +5208,15 @@ SkyPillar_2F_MapAttributes: @ 845DF90 .4byte gTileset_General .4byte gTileset_Pacifidlog + .align 2 SkyPillar_3F_MapBorder: @ 845DFA8 .incbin "data/maps/SkyPillar_3F/border.bin" + .align 2 SkyPillar_3F_MapBlockdata: @ 845DFB0 .incbin "data/maps/SkyPillar_3F/map.bin" + .align 2 SkyPillar_3F_MapAttributes: @ 845E138 .4byte 0xe .4byte 0xe @@ -4458,12 +5225,15 @@ SkyPillar_3F_MapAttributes: @ 845E138 .4byte gTileset_General .4byte gTileset_Pacifidlog + .align 2 SkyPillar_4F_MapBorder: @ 845E150 .incbin "data/maps/SkyPillar_4F/border.bin" + .align 2 SkyPillar_4F_MapBlockdata: @ 845E158 .incbin "data/maps/SkyPillar_4F/map.bin" + .align 2 SkyPillar_4F_MapAttributes: @ 845E2E0 .4byte 0xe .4byte 0xe @@ -4472,14 +5242,18 @@ SkyPillar_4F_MapAttributes: @ 845E2E0 .4byte gTileset_General .4byte gTileset_Pacifidlog + .align 2 .incbin "baserom.gba", 0x45e2f8, 0x9d4 + .align 2 MossdeepCity_StevensHouse_MapBorder: @ 845ECCC .incbin "data/maps/MossdeepCity_StevensHouse/border.bin" + .align 2 MossdeepCity_StevensHouse_MapBlockdata: @ 845ECD4 .incbin "data/maps/MossdeepCity_StevensHouse/map.bin" + .align 2 MossdeepCity_StevensHouse_MapAttributes: @ 845ED84 .4byte 0xb .4byte 0x8 @@ -4488,12 +5262,15 @@ MossdeepCity_StevensHouse_MapAttributes: @ 845ED84 .4byte gTileset_InsideBuilding .4byte gTileset_GenericBuilding + .align 2 ShoalCave_LowTideIceRoom_MapBorder: @ 845ED9C .incbin "data/maps/ShoalCave_LowTideIceRoom/border.bin" + .align 2 ShoalCave_LowTideIceRoom_MapBlockdata: @ 845EDA4 .incbin "data/maps/ShoalCave_LowTideIceRoom/map.bin" + .align 2 ShoalCave_LowTideIceRoom_MapAttributes: @ 845F254 .4byte 0x14 .4byte 0x1e @@ -4502,12 +5279,15 @@ ShoalCave_LowTideIceRoom_MapAttributes: @ 845F254 .4byte gTileset_General .4byte gTileset_Cave + .align 2 SafariZone_RestHouse_MapBorder: @ 845F26C .incbin "data/maps/SafariZone_RestHouse/border.bin" + .align 2 SafariZone_RestHouse_MapBlockdata: @ 845F274 .incbin "data/maps/SafariZone_RestHouse/map.bin" + .align 2 SafariZone_RestHouse_MapAttributes: @ 845F328 .4byte 0xa .4byte 0x9 @@ -4516,12 +5296,15 @@ SafariZone_RestHouse_MapAttributes: @ 845F328 .4byte gTileset_InsideBuilding .4byte gTileset_GenericBuilding + .align 2 SkyPillar_5F_MapBorder: @ 845F340 .incbin "data/maps/SkyPillar_5F/border.bin" + .align 2 SkyPillar_5F_MapBlockdata: @ 845F348 .incbin "data/maps/SkyPillar_5F/map.bin" + .align 2 SkyPillar_5F_MapAttributes: @ 845F4D0 .4byte 0xe .4byte 0xe @@ -4530,12 +5313,15 @@ SkyPillar_5F_MapAttributes: @ 845F4D0 .4byte gTileset_General .4byte gTileset_Pacifidlog + .align 2 SkyPillar_Top_MapBorder: @ 845F4E8 .incbin "data/maps/SkyPillar_Top/border.bin" + .align 2 SkyPillar_Top_MapBlockdata: @ 845F4F0 .incbin "data/maps/SkyPillar_Top/map.bin" + .align 2 SkyPillar_Top_MapAttributes: @ 845FA00 .4byte 0x1b .4byte 0x18 @@ -4544,14 +5330,15 @@ SkyPillar_Top_MapAttributes: @ 845FA00 .4byte gTileset_General .4byte gTileset_Pacifidlog + .align 2 BattleFrontier_BattleDomeLobby_MapBorder: @ 845FA18 .incbin "data/maps/BattleFrontier_BattleDomeLobby/border.bin" + .align 2 BattleFrontier_BattleDomeLobby_MapBlockdata: @ 845FA20 .incbin "data/maps/BattleFrontier_BattleDomeLobby/map.bin" - .incbin "baserom.gba", 0x45fd2e, 0x2 - + .align 2 BattleFrontier_BattleDomeLobby_MapAttributes: @ 845FD30 .4byte 0x17 .4byte 0x11 @@ -4560,12 +5347,15 @@ BattleFrontier_BattleDomeLobby_MapAttributes: @ 845FD30 .4byte gTileset_InsideBuilding .4byte gTileset_BattleDome + .align 2 BattleFrontier_BattleDomeCorridor_MapBorder: @ 845FD48 .incbin "data/maps/BattleFrontier_BattleDomeCorridor/border.bin" + .align 2 BattleFrontier_BattleDomeCorridor_MapBlockdata: @ 845FD50 .incbin "data/maps/BattleFrontier_BattleDomeCorridor/map.bin" + .align 2 BattleFrontier_BattleDomeCorridor_MapAttributes: @ 845FFF0 .4byte 0x30 .4byte 0x7 @@ -4574,12 +5364,15 @@ BattleFrontier_BattleDomeCorridor_MapAttributes: @ 845FFF0 .4byte gTileset_InsideBuilding .4byte gTileset_BattleDome + .align 2 BattleFrontier_BattleDomePreBattleRoom_MapBorder: @ 8460008 .incbin "data/maps/BattleFrontier_BattleDomePreBattleRoom/border.bin" + .align 2 BattleFrontier_BattleDomePreBattleRoom_MapBlockdata: @ 8460010 .incbin "data/maps/BattleFrontier_BattleDomePreBattleRoom/map.bin" + .align 2 BattleFrontier_BattleDomePreBattleRoom_MapAttributes: @ 84600A0 .4byte 0x9 .4byte 0x8 @@ -4588,12 +5381,15 @@ BattleFrontier_BattleDomePreBattleRoom_MapAttributes: @ 84600A0 .4byte gTileset_InsideBuilding .4byte gTileset_BattleDome + .align 2 BattleFrontier_BattleDomeBattleRoom_MapBorder: @ 84600B8 .incbin "data/maps/BattleFrontier_BattleDomeBattleRoom/border.bin" + .align 2 BattleFrontier_BattleDomeBattleRoom_MapBlockdata: @ 84600C0 .incbin "data/maps/BattleFrontier_BattleDomeBattleRoom/map.bin" + .align 2 BattleFrontier_BattleDomeBattleRoom_MapAttributes: @ 8460250 .4byte 0x14 .4byte 0xa @@ -4602,12 +5398,15 @@ BattleFrontier_BattleDomeBattleRoom_MapAttributes: @ 8460250 .4byte gTileset_InsideBuilding .4byte gTileset_BattleDome + .align 2 MagmaHideout_1F_MapBorder: @ 8460268 .incbin "data/maps/MagmaHideout_1F/border.bin" + .align 2 MagmaHideout_1F_MapBlockdata: @ 8460270 .incbin "data/maps/MagmaHideout_1F/map.bin" + .align 2 MagmaHideout_1F_MapAttributes: @ 8460D6C .4byte 0x25 .4byte 0x26 @@ -4616,14 +5415,15 @@ MagmaHideout_1F_MapAttributes: @ 8460D6C .4byte gTileset_General .4byte gTileset_Lavaridge + .align 2 MagmaHideout_2F_1R_MapBorder: @ 8460D84 .incbin "data/maps/MagmaHideout_2F_1R/border.bin" + .align 2 MagmaHideout_2F_1R_MapBlockdata: @ 8460D8C .incbin "data/maps/MagmaHideout_2F_1R/map.bin" - .incbin "baserom.gba", 0x46179a, 0x2 - + .align 2 MagmaHideout_2F_1R_MapAttributes: @ 846179C .4byte 0x21 .4byte 0x27 @@ -4632,12 +5432,15 @@ MagmaHideout_2F_1R_MapAttributes: @ 846179C .4byte gTileset_General .4byte gTileset_Lavaridge + .align 2 MagmaHideout_2F_2R_MapBorder: @ 84617B4 .incbin "data/maps/MagmaHideout_2F_2R/border.bin" + .align 2 MagmaHideout_2F_2R_MapBlockdata: @ 84617BC .incbin "data/maps/MagmaHideout_2F_2R/map.bin" + .align 2 MagmaHideout_2F_2R_MapAttributes: @ 8462274 .4byte 0x31 .4byte 0x1c @@ -4646,12 +5449,15 @@ MagmaHideout_2F_2R_MapAttributes: @ 8462274 .4byte gTileset_General .4byte gTileset_Lavaridge + .align 2 MagmaHideout_3F_1R_MapBorder: @ 846228C .incbin "data/maps/MagmaHideout_3F_1R/border.bin" + .align 2 MagmaHideout_3F_1R_MapBlockdata: @ 8462294 .incbin "data/maps/MagmaHideout_3F_1R/map.bin" + .align 2 MagmaHideout_3F_1R_MapAttributes: @ 84627D4 .4byte 0x1c .4byte 0x18 @@ -4660,12 +5466,15 @@ MagmaHideout_3F_1R_MapAttributes: @ 84627D4 .4byte gTileset_General .4byte gTileset_Lavaridge + .align 2 MagmaHideout_3F_2R_MapBorder: @ 84627EC .incbin "data/maps/MagmaHideout_3F_2R/border.bin" + .align 2 MagmaHideout_3F_2R_MapBlockdata: @ 84627F4 .incbin "data/maps/MagmaHideout_3F_2R/map.bin" + .align 2 MagmaHideout_3F_2R_MapAttributes: @ 8462B24 .4byte 0x18 .4byte 0x11 @@ -4674,12 +5483,15 @@ MagmaHideout_3F_2R_MapAttributes: @ 8462B24 .4byte gTileset_General .4byte gTileset_Lavaridge + .align 2 MagmaHideout_4F_MapBorder: @ 8462B3C .incbin "data/maps/MagmaHideout_4F/border.bin" + .align 2 MagmaHideout_4F_MapBlockdata: @ 8462B44 .incbin "data/maps/MagmaHideout_4F/map.bin" + .align 2 MagmaHideout_4F_MapAttributes: @ 846382C .4byte 0x3b .4byte 0x1c @@ -4688,12 +5500,15 @@ MagmaHideout_4F_MapAttributes: @ 846382C .4byte gTileset_General .4byte gTileset_Lavaridge + .align 2 BattleFrontier_BattlePalaceLobby_MapBorder: @ 8463844 .incbin "data/maps/BattleFrontier_BattlePalaceLobby/border.bin" + .align 2 BattleFrontier_BattlePalaceLobby_MapBlockdata: @ 846384C .incbin "data/maps/BattleFrontier_BattlePalaceLobby/map.bin" + .align 2 BattleFrontier_BattlePalaceLobby_MapAttributes: @ 8463AA4 .4byte 0x19 .4byte 0xc @@ -4702,12 +5517,15 @@ BattleFrontier_BattlePalaceLobby_MapAttributes: @ 8463AA4 .4byte gTileset_InsideBuilding .4byte gTileset_BattlePalace + .align 2 BattleFrontier_BattlePalaceCorridor_MapBorder: @ 8463ABC .incbin "data/maps/BattleFrontier_BattlePalaceCorridor/border.bin" + .align 2 BattleFrontier_BattlePalaceCorridor_MapBlockdata: @ 8463AC4 .incbin "data/maps/BattleFrontier_BattlePalaceCorridor/map.bin" + .align 2 BattleFrontier_BattlePalaceCorridor_MapAttributes: @ 8463CA0 .4byte 0x11 .4byte 0xe @@ -4716,12 +5534,15 @@ BattleFrontier_BattlePalaceCorridor_MapAttributes: @ 8463CA0 .4byte gTileset_General .4byte gTileset_BattlePalace + .align 2 BattleFrontier_BattlePalaceBattleRoom_MapBorder: @ 8463CB8 .incbin "data/maps/BattleFrontier_BattlePalaceBattleRoom/border.bin" + .align 2 BattleFrontier_BattlePalaceBattleRoom_MapBlockdata: @ 8463CC0 .incbin "data/maps/BattleFrontier_BattlePalaceBattleRoom/map.bin" + .align 2 BattleFrontier_BattlePalaceBattleRoom_MapAttributes: @ 8463DEC .4byte 0xf .4byte 0xa @@ -4730,12 +5551,15 @@ BattleFrontier_BattlePalaceBattleRoom_MapAttributes: @ 8463DEC .4byte gTileset_General .4byte gTileset_BattlePalace + .align 2 BattleFrontier_OutsideEast_MapBorder: @ 8463E04 .incbin "data/maps/BattleFrontier_OutsideEast/border.bin" + .align 2 BattleFrontier_OutsideEast_MapBlockdata: @ 8463E0C .incbin "data/maps/BattleFrontier_OutsideEast/map.bin" + .align 2 BattleFrontier_OutsideEast_MapAttributes: @ 846668C .4byte 0x48 .4byte 0x48 @@ -4744,12 +5568,15 @@ BattleFrontier_OutsideEast_MapAttributes: @ 846668C .4byte gTileset_General .4byte gTileset_BattleFrontierOutsideEast + .align 2 BattleFrontier_BattleFactoryLobby_MapBorder: @ 84666A4 .incbin "data/maps/BattleFrontier_BattleFactoryLobby/border.bin" + .align 2 BattleFrontier_BattleFactoryLobby_MapBlockdata: @ 84666AC .incbin "data/maps/BattleFrontier_BattleFactoryLobby/map.bin" + .align 2 BattleFrontier_BattleFactoryLobby_MapAttributes: @ 8466874 .4byte 0x13 .4byte 0xc @@ -4758,12 +5585,15 @@ BattleFrontier_BattleFactoryLobby_MapAttributes: @ 8466874 .4byte gTileset_InsideBuilding .4byte gTileset_BattleFactory + .align 2 BattleFrontier_BattleFactoryPreBattleRoom_MapBorder: @ 846688C .incbin "data/maps/BattleFrontier_BattleFactoryPreBattleRoom/border.bin" + .align 2 BattleFrontier_BattleFactoryPreBattleRoom_MapBlockdata: @ 8466894 .incbin "data/maps/BattleFrontier_BattleFactoryPreBattleRoom/map.bin" + .align 2 BattleFrontier_BattleFactoryPreBattleRoom_MapAttributes: @ 8466A70 .4byte 0x11 .4byte 0xe @@ -4772,12 +5602,15 @@ BattleFrontier_BattleFactoryPreBattleRoom_MapAttributes: @ 8466A70 .4byte gTileset_InsideBuilding .4byte gTileset_BattleFactory + .align 2 BattleFrontier_BattleFactoryBattleRoom_MapBorder: @ 8466A88 .incbin "data/maps/BattleFrontier_BattleFactoryBattleRoom/border.bin" + .align 2 BattleFrontier_BattleFactoryBattleRoom_MapBlockdata: @ 8466A90 .incbin "data/maps/BattleFrontier_BattleFactoryBattleRoom/map.bin" + .align 2 BattleFrontier_BattleFactoryBattleRoom_MapAttributes: @ 8466BC8 .4byte 0xd .4byte 0xc @@ -4786,14 +5619,15 @@ BattleFrontier_BattleFactoryBattleRoom_MapAttributes: @ 8466BC8 .4byte gTileset_InsideBuilding .4byte gTileset_BattleFactory + .align 2 BattleFrontier_BattlePikeLobby_MapBorder: @ 8466BE0 .incbin "data/maps/BattleFrontier_BattlePikeLobby/border.bin" + .align 2 BattleFrontier_BattlePikeLobby_MapBlockdata: @ 8466BE8 .incbin "data/maps/BattleFrontier_BattlePikeLobby/map.bin" - .incbin "baserom.gba", 0x466d06, 0x2 - + .align 2 BattleFrontier_BattlePikeLobby_MapAttributes: @ 8466D08 .4byte 0xb .4byte 0xd @@ -4802,12 +5636,15 @@ BattleFrontier_BattlePikeLobby_MapAttributes: @ 8466D08 .4byte gTileset_InsideBuilding .4byte gTileset_BattlePike + .align 2 BattleFrontier_BattlePikeCorridor_MapBorder: @ 8466D20 .incbin "data/maps/BattleFrontier_BattlePikeCorridor/border.bin" + .align 2 BattleFrontier_BattlePikeCorridor_MapBlockdata: @ 8466D28 .incbin "data/maps/BattleFrontier_BattlePikeCorridor/map.bin" + .align 2 BattleFrontier_BattlePikeCorridor_MapAttributes: @ 8466E08 .4byte 0xe .4byte 0x8 @@ -4816,14 +5653,15 @@ BattleFrontier_BattlePikeCorridor_MapAttributes: @ 8466E08 .4byte gTileset_InsideBuilding .4byte gTileset_BattlePike + .align 2 BattleFrontier_BattlePikeThreePathRoom_MapBorder: @ 8466E20 .incbin "data/maps/BattleFrontier_BattlePikeThreePathRoom/border.bin" + .align 2 BattleFrontier_BattlePikeThreePathRoom_MapBlockdata: @ 8466E28 .incbin "data/maps/BattleFrontier_BattlePikeThreePathRoom/map.bin" - .incbin "baserom.gba", 0x466f46, 0x2 - + .align 2 BattleFrontier_BattlePikeThreePathRoom_MapAttributes: @ 8466F48 .4byte 0xd .4byte 0xb @@ -4832,12 +5670,15 @@ BattleFrontier_BattlePikeThreePathRoom_MapAttributes: @ 8466F48 .4byte gTileset_InsideBuilding .4byte gTileset_BattlePike + .align 2 BattleFrontier_BattlePikeRandomRoom1_MapBorder: @ 8466F60 .incbin "data/maps/BattleFrontier_BattlePikeRandomRoom1/border.bin" + .align 2 BattleFrontier_BattlePikeRandomRoom1_MapBlockdata: @ 8466F68 .incbin "data/maps/BattleFrontier_BattlePikeRandomRoom1/map.bin" + .align 2 BattleFrontier_BattlePikeRandomRoom1_MapAttributes: @ 8466FF8 .4byte 0x9 .4byte 0x8 @@ -4846,12 +5687,15 @@ BattleFrontier_BattlePikeRandomRoom1_MapAttributes: @ 8466FF8 .4byte gTileset_InsideBuilding .4byte gTileset_BattlePike + .align 2 BattleFrontier_BattlePikeRandomRoom2_MapBorder: @ 8467010 .incbin "data/maps/BattleFrontier_BattlePikeRandomRoom2/border.bin" + .align 2 BattleFrontier_BattlePikeRandomRoom2_MapBlockdata: @ 8467018 .incbin "data/maps/BattleFrontier_BattlePikeRandomRoom2/map.bin" + .align 2 BattleFrontier_BattlePikeRandomRoom2_MapAttributes: @ 8467068 .4byte 0x5 .4byte 0x8 @@ -4860,12 +5704,15 @@ BattleFrontier_BattlePikeRandomRoom2_MapAttributes: @ 8467068 .4byte gTileset_InsideBuilding .4byte gTileset_BattlePike + .align 2 BattleFrontier_BattleArenaLobby_MapBorder: @ 8467080 .incbin "data/maps/BattleFrontier_BattleArenaLobby/border.bin" + .align 2 BattleFrontier_BattleArenaLobby_MapBlockdata: @ 8467088 .incbin "data/maps/BattleFrontier_BattleArenaLobby/map.bin" + .align 2 BattleFrontier_BattleArenaLobby_MapAttributes: @ 8467228 .4byte 0x10 .4byte 0xd @@ -4874,12 +5721,15 @@ BattleFrontier_BattleArenaLobby_MapAttributes: @ 8467228 .4byte gTileset_InsideBuilding .4byte gTileset_BattleArena + .align 2 BattleFrontier_BattleArenaCorridor_MapBorder: @ 8467240 .incbin "data/maps/BattleFrontier_BattleArenaCorridor/border.bin" + .align 2 BattleFrontier_BattleArenaCorridor_MapBlockdata: @ 8467248 .incbin "data/maps/BattleFrontier_BattleArenaCorridor/map.bin" + .align 2 BattleFrontier_BattleArenaCorridor_MapAttributes: @ 8467440 .4byte 0x12 .4byte 0xe @@ -4888,12 +5738,15 @@ BattleFrontier_BattleArenaCorridor_MapAttributes: @ 8467440 .4byte gTileset_InsideBuilding .4byte gTileset_BattleArena + .align 2 BattleFrontier_BattleArenaBattleRoom_MapBorder: @ 8467458 .incbin "data/maps/BattleFrontier_BattleArenaBattleRoom/border.bin" + .align 2 BattleFrontier_BattleArenaBattleRoom_MapBlockdata: @ 8467460 .incbin "data/maps/BattleFrontier_BattleArenaBattleRoom/map.bin" + .align 2 BattleFrontier_BattleArenaBattleRoom_MapAttributes: @ 84675C0 .4byte 0x10 .4byte 0xb @@ -4902,14 +5755,18 @@ BattleFrontier_BattleArenaBattleRoom_MapAttributes: @ 84675C0 .4byte gTileset_InsideBuilding .4byte gTileset_BattleArena + .align 2 .incbin "baserom.gba", 0x4675d8, 0x1c40 + .align 2 BattleFrontier_BattlePikeRandomRoom3_MapBorder: @ 8469218 .incbin "data/maps/BattleFrontier_BattlePikeRandomRoom3/border.bin" + .align 2 BattleFrontier_BattlePikeRandomRoom3_MapBlockdata: @ 8469220 .incbin "data/maps/BattleFrontier_BattlePikeRandomRoom3/map.bin" + .align 2 BattleFrontier_BattlePikeRandomRoom3_MapAttributes: @ 8469388 .4byte 0x9 .4byte 0x14 @@ -4918,14 +5775,18 @@ BattleFrontier_BattlePikeRandomRoom3_MapAttributes: @ 8469388 .4byte gTileset_InsideBuilding .4byte gTileset_BattlePike + .align 2 .incbin "baserom.gba", 0x4693a0, 0x24 + .align 2 BattleFrontier_BattlePyramidLobby_MapBorder: @ 84693C4 .incbin "data/maps/BattleFrontier_BattlePyramidLobby/border.bin" + .align 2 BattleFrontier_BattlePyramidLobby_MapBlockdata: @ 84693CC .incbin "data/maps/BattleFrontier_BattlePyramidLobby/map.bin" + .align 2 BattleFrontier_BattlePyramidLobby_MapAttributes: @ 84695E8 .4byte 0xf .4byte 0x12 @@ -4934,12 +5795,15 @@ BattleFrontier_BattlePyramidLobby_MapAttributes: @ 84695E8 .4byte gTileset_InsideBuilding .4byte gTileset_BattlePyramid + .align 2 BattleFrontier_BattlePyramidEmptySquare_MapBorder: @ 8469600 .incbin "data/maps/BattleFrontier_BattlePyramidEmptySquare/border.bin" + .align 2 BattleFrontier_BattlePyramidEmptySquare_MapBlockdata: @ 8469608 .incbin "data/maps/BattleFrontier_BattlePyramidEmptySquare/map.bin" + .align 2 BattleFrontier_BattlePyramidEmptySquare_MapAttributes: @ 8469688 .4byte 0x8 .4byte 0x8 @@ -4948,12 +5812,15 @@ BattleFrontier_BattlePyramidEmptySquare_MapAttributes: @ 8469688 .4byte gTileset_InsideBuilding .4byte gTileset_BattlePyramid + .align 2 BattlePyramidSquare01_MapBorder: @ 84696A0 .incbin "data/maps/BattlePyramidSquare01/border.bin" + .align 2 BattlePyramidSquare01_MapBlockdata: @ 84696A8 .incbin "data/maps/BattlePyramidSquare01/map.bin" + .align 2 BattlePyramidSquare01_MapAttributes: @ 8469728 .4byte 0x8 .4byte 0x8 @@ -4962,12 +5829,15 @@ BattlePyramidSquare01_MapAttributes: @ 8469728 .4byte gTileset_InsideBuilding .4byte gTileset_BattlePyramid + .align 2 BattlePyramidSquare02_MapBorder: @ 8469740 .incbin "data/maps/BattlePyramidSquare02/border.bin" + .align 2 BattlePyramidSquare02_MapBlockdata: @ 8469748 .incbin "data/maps/BattlePyramidSquare02/map.bin" + .align 2 BattlePyramidSquare02_MapAttributes: @ 84697C8 .4byte 0x8 .4byte 0x8 @@ -4976,12 +5846,15 @@ BattlePyramidSquare02_MapAttributes: @ 84697C8 .4byte gTileset_InsideBuilding .4byte gTileset_BattlePyramid + .align 2 BattlePyramidSquare03_MapBorder: @ 84697E0 .incbin "data/maps/BattlePyramidSquare03/border.bin" + .align 2 BattlePyramidSquare03_MapBlockdata: @ 84697E8 .incbin "data/maps/BattlePyramidSquare03/map.bin" + .align 2 BattlePyramidSquare03_MapAttributes: @ 8469868 .4byte 0x8 .4byte 0x8 @@ -4990,12 +5863,15 @@ BattlePyramidSquare03_MapAttributes: @ 8469868 .4byte gTileset_InsideBuilding .4byte gTileset_BattlePyramid + .align 2 BattlePyramidSquare04_MapBorder: @ 8469880 .incbin "data/maps/BattlePyramidSquare04/border.bin" + .align 2 BattlePyramidSquare04_MapBlockdata: @ 8469888 .incbin "data/maps/BattlePyramidSquare04/map.bin" + .align 2 BattlePyramidSquare04_MapAttributes: @ 8469908 .4byte 0x8 .4byte 0x8 @@ -5004,12 +5880,15 @@ BattlePyramidSquare04_MapAttributes: @ 8469908 .4byte gTileset_InsideBuilding .4byte gTileset_BattlePyramid + .align 2 BattlePyramidSquare05_MapBorder: @ 8469920 .incbin "data/maps/BattlePyramidSquare05/border.bin" + .align 2 BattlePyramidSquare05_MapBlockdata: @ 8469928 .incbin "data/maps/BattlePyramidSquare05/map.bin" + .align 2 BattlePyramidSquare05_MapAttributes: @ 84699A8 .4byte 0x8 .4byte 0x8 @@ -5018,12 +5897,15 @@ BattlePyramidSquare05_MapAttributes: @ 84699A8 .4byte gTileset_InsideBuilding .4byte gTileset_BattlePyramid + .align 2 BattlePyramidSquare06_MapBorder: @ 84699C0 .incbin "data/maps/BattlePyramidSquare06/border.bin" + .align 2 BattlePyramidSquare06_MapBlockdata: @ 84699C8 .incbin "data/maps/BattlePyramidSquare06/map.bin" + .align 2 BattlePyramidSquare06_MapAttributes: @ 8469A48 .4byte 0x8 .4byte 0x8 @@ -5032,12 +5914,15 @@ BattlePyramidSquare06_MapAttributes: @ 8469A48 .4byte gTileset_InsideBuilding .4byte gTileset_BattlePyramid + .align 2 BattlePyramidSquare07_MapBorder: @ 8469A60 .incbin "data/maps/BattlePyramidSquare07/border.bin" + .align 2 BattlePyramidSquare07_MapBlockdata: @ 8469A68 .incbin "data/maps/BattlePyramidSquare07/map.bin" + .align 2 BattlePyramidSquare07_MapAttributes: @ 8469AE8 .4byte 0x8 .4byte 0x8 @@ -5046,12 +5931,15 @@ BattlePyramidSquare07_MapAttributes: @ 8469AE8 .4byte gTileset_InsideBuilding .4byte gTileset_BattlePyramid + .align 2 BattlePyramidSquare08_MapBorder: @ 8469B00 .incbin "data/maps/BattlePyramidSquare08/border.bin" + .align 2 BattlePyramidSquare08_MapBlockdata: @ 8469B08 .incbin "data/maps/BattlePyramidSquare08/map.bin" + .align 2 BattlePyramidSquare08_MapAttributes: @ 8469B88 .4byte 0x8 .4byte 0x8 @@ -5060,12 +5948,15 @@ BattlePyramidSquare08_MapAttributes: @ 8469B88 .4byte gTileset_InsideBuilding .4byte gTileset_BattlePyramid + .align 2 BattlePyramidSquare09_MapBorder: @ 8469BA0 .incbin "data/maps/BattlePyramidSquare09/border.bin" + .align 2 BattlePyramidSquare09_MapBlockdata: @ 8469BA8 .incbin "data/maps/BattlePyramidSquare09/map.bin" + .align 2 BattlePyramidSquare09_MapAttributes: @ 8469C28 .4byte 0x8 .4byte 0x8 @@ -5074,12 +5965,15 @@ BattlePyramidSquare09_MapAttributes: @ 8469C28 .4byte gTileset_InsideBuilding .4byte gTileset_BattlePyramid + .align 2 BattlePyramidSquare10_MapBorder: @ 8469C40 .incbin "data/maps/BattlePyramidSquare10/border.bin" + .align 2 BattlePyramidSquare10_MapBlockdata: @ 8469C48 .incbin "data/maps/BattlePyramidSquare10/map.bin" + .align 2 BattlePyramidSquare10_MapAttributes: @ 8469CC8 .4byte 0x8 .4byte 0x8 @@ -5088,12 +5982,15 @@ BattlePyramidSquare10_MapAttributes: @ 8469CC8 .4byte gTileset_InsideBuilding .4byte gTileset_BattlePyramid + .align 2 BattlePyramidSquare11_MapBorder: @ 8469CE0 .incbin "data/maps/BattlePyramidSquare11/border.bin" + .align 2 BattlePyramidSquare11_MapBlockdata: @ 8469CE8 .incbin "data/maps/BattlePyramidSquare11/map.bin" + .align 2 BattlePyramidSquare11_MapAttributes: @ 8469D68 .4byte 0x8 .4byte 0x8 @@ -5102,12 +5999,15 @@ BattlePyramidSquare11_MapAttributes: @ 8469D68 .4byte gTileset_InsideBuilding .4byte gTileset_BattlePyramid + .align 2 BattlePyramidSquare12_MapBorder: @ 8469D80 .incbin "data/maps/BattlePyramidSquare12/border.bin" + .align 2 BattlePyramidSquare12_MapBlockdata: @ 8469D88 .incbin "data/maps/BattlePyramidSquare12/map.bin" + .align 2 BattlePyramidSquare12_MapAttributes: @ 8469E08 .4byte 0x8 .4byte 0x8 @@ -5116,12 +6016,15 @@ BattlePyramidSquare12_MapAttributes: @ 8469E08 .4byte gTileset_InsideBuilding .4byte gTileset_BattlePyramid + .align 2 BattlePyramidSquare13_MapBorder: @ 8469E20 .incbin "data/maps/BattlePyramidSquare13/border.bin" + .align 2 BattlePyramidSquare13_MapBlockdata: @ 8469E28 .incbin "data/maps/BattlePyramidSquare13/map.bin" + .align 2 BattlePyramidSquare13_MapAttributes: @ 8469EA8 .4byte 0x8 .4byte 0x8 @@ -5130,12 +6033,15 @@ BattlePyramidSquare13_MapAttributes: @ 8469EA8 .4byte gTileset_InsideBuilding .4byte gTileset_BattlePyramid + .align 2 BattlePyramidSquare14_MapBorder: @ 8469EC0 .incbin "data/maps/BattlePyramidSquare14/border.bin" + .align 2 BattlePyramidSquare14_MapBlockdata: @ 8469EC8 .incbin "data/maps/BattlePyramidSquare14/map.bin" + .align 2 BattlePyramidSquare14_MapAttributes: @ 8469F48 .4byte 0x8 .4byte 0x8 @@ -5144,12 +6050,15 @@ BattlePyramidSquare14_MapAttributes: @ 8469F48 .4byte gTileset_InsideBuilding .4byte gTileset_BattlePyramid + .align 2 BattlePyramidSquare15_MapBorder: @ 8469F60 .incbin "data/maps/BattlePyramidSquare15/border.bin" + .align 2 BattlePyramidSquare15_MapBlockdata: @ 8469F68 .incbin "data/maps/BattlePyramidSquare15/map.bin" + .align 2 BattlePyramidSquare15_MapAttributes: @ 8469FE8 .4byte 0x8 .4byte 0x8 @@ -5158,12 +6067,15 @@ BattlePyramidSquare15_MapAttributes: @ 8469FE8 .4byte gTileset_InsideBuilding .4byte gTileset_BattlePyramid + .align 2 BattlePyramidSquare16_MapBorder: @ 846A000 .incbin "data/maps/BattlePyramidSquare16/border.bin" + .align 2 BattlePyramidSquare16_MapBlockdata: @ 846A008 .incbin "data/maps/BattlePyramidSquare16/map.bin" + .align 2 BattlePyramidSquare16_MapAttributes: @ 846A088 .4byte 0x8 .4byte 0x8 @@ -5172,12 +6084,15 @@ BattlePyramidSquare16_MapAttributes: @ 846A088 .4byte gTileset_InsideBuilding .4byte gTileset_BattlePyramid + .align 2 BattleFrontier_BattlePyramidTop_MapBorder: @ 846A0A0 .incbin "data/maps/BattleFrontier_BattlePyramidTop/border.bin" + .align 2 BattleFrontier_BattlePyramidTop_MapBlockdata: @ 846A0A8 .incbin "data/maps/BattleFrontier_BattlePyramidTop/map.bin" + .align 2 BattleFrontier_BattlePyramidTop_MapAttributes: @ 846A6C4 .4byte 0x22 .4byte 0x17 @@ -5186,12 +6101,15 @@ BattleFrontier_BattlePyramidTop_MapAttributes: @ 846A6C4 .4byte gTileset_InsideBuilding .4byte gTileset_BattlePyramid + .align 2 MagmaHideout_3F_3R_MapBorder: @ 846A6DC .incbin "data/maps/MagmaHideout_3F_3R/border.bin" + .align 2 MagmaHideout_3F_3R_MapBlockdata: @ 846A6E4 .incbin "data/maps/MagmaHideout_3F_3R/map.bin" + .align 2 MagmaHideout_3F_3R_MapAttributes: @ 846AD14 .4byte 0x21 .4byte 0x18 @@ -5200,12 +6118,15 @@ MagmaHideout_3F_3R_MapAttributes: @ 846AD14 .4byte gTileset_General .4byte gTileset_Lavaridge + .align 2 MagmaHideout_2F_3R_MapBorder: @ 846AD2C .incbin "data/maps/MagmaHideout_2F_3R/border.bin" + .align 2 MagmaHideout_2F_3R_MapBlockdata: @ 846AD34 .incbin "data/maps/MagmaHideout_2F_3R/map.bin" + .align 2 MagmaHideout_2F_3R_MapAttributes: @ 846B61C .4byte 0x3c .4byte 0x13 @@ -5214,14 +6135,15 @@ MagmaHideout_2F_3R_MapAttributes: @ 846B61C .4byte gTileset_General .4byte gTileset_Lavaridge + .align 2 MirageTower_1F_MapBorder: @ 846B634 .incbin "data/maps/MirageTower_1F/border.bin" + .align 2 MirageTower_1F_MapBlockdata: @ 846B63C .incbin "data/maps/MirageTower_1F/map.bin" - .incbin "baserom.gba", 0x46b906, 0x2 - + .align 2 MirageTower_1F_MapAttributes: @ 846B908 .4byte 0x15 .4byte 0x11 @@ -5230,14 +6152,15 @@ MirageTower_1F_MapAttributes: @ 846B908 .4byte gTileset_General .4byte gTileset_MirageTower + .align 2 MirageTower_2F_MapBorder: @ 846B920 .incbin "data/maps/MirageTower_2F/border.bin" + .align 2 MirageTower_2F_MapBlockdata: @ 846B928 .incbin "data/maps/MirageTower_2F/map.bin" - .incbin "baserom.gba", 0x46bbf2, 0x2 - + .align 2 MirageTower_2F_MapAttributes: @ 846BBF4 .4byte 0x15 .4byte 0x11 @@ -5246,14 +6169,15 @@ MirageTower_2F_MapAttributes: @ 846BBF4 .4byte gTileset_General .4byte gTileset_MirageTower + .align 2 MirageTower_3F_MapBorder: @ 846BC0C .incbin "data/maps/MirageTower_3F/border.bin" + .align 2 MirageTower_3F_MapBlockdata: @ 846BC14 .incbin "data/maps/MirageTower_3F/map.bin" - .incbin "baserom.gba", 0x46bede, 0x2 - + .align 2 MirageTower_3F_MapAttributes: @ 846BEE0 .4byte 0x15 .4byte 0x11 @@ -5262,12 +6186,15 @@ MirageTower_3F_MapAttributes: @ 846BEE0 .4byte gTileset_General .4byte gTileset_MirageTower + .align 2 FallarborTown_BattleTentLobby_MapBorder: @ 846BEF8 .incbin "data/maps/FallarborTown_BattleTentLobby/border.bin" + .align 2 FallarborTown_BattleTentLobby_MapBlockdata: @ 846BF00 .incbin "data/maps/FallarborTown_BattleTentLobby/map.bin" + .align 2 FallarborTown_BattleTentLobby_MapAttributes: @ 846C004 SlateportCity_BattleTentLobby_MapAttributes: @ 846C004 VerdanturfTown_BattleTentLobby_MapAttributes: @ 846C004 @@ -5278,12 +6205,15 @@ VerdanturfTown_BattleTentLobby_MapAttributes: @ 846C004 .4byte gTileset_InsideBuilding .4byte gTileset_BattleTent + .align 2 FallarborTown_BattleTentCorridor_MapBorder: @ 846C01C .incbin "data/maps/FallarborTown_BattleTentCorridor/border.bin" + .align 2 FallarborTown_BattleTentCorridor_MapBlockdata: @ 846C024 .incbin "data/maps/FallarborTown_BattleTentCorridor/map.bin" + .align 2 FallarborTown_BattleTentCorridor_MapAttributes: @ 846C074 SlateportCity_BattleTentCorridor_MapAttributes: @ 846C074 VerdanturfTown_BattleTentCorridor_MapAttributes: @ 846C074 @@ -5294,12 +6224,15 @@ VerdanturfTown_BattleTentCorridor_MapAttributes: @ 846C074 .4byte gTileset_InsideBuilding .4byte gTileset_BattleTent + .align 2 FallarborTown_BattleTentBattleRoom_MapBorder: @ 846C08C .incbin "data/maps/FallarborTown_BattleTentBattleRoom/border.bin" + .align 2 FallarborTown_BattleTentBattleRoom_MapBlockdata: @ 846C094 .incbin "data/maps/FallarborTown_BattleTentBattleRoom/map.bin" + .align 2 FallarborTown_BattleTentBattleRoom_MapAttributes: @ 846C148 SlateportCity_BattleTentBattleRoom_MapAttributes: @ 846C148 .4byte 0xa @@ -5309,14 +6242,15 @@ SlateportCity_BattleTentBattleRoom_MapAttributes: @ 846C148 .4byte gTileset_InsideBuilding .4byte gTileset_BattleTent + .align 2 VerdanturfTown_BattleTentBattleRoom_MapBorder: @ 846C160 .incbin "data/maps/VerdanturfTown_BattleTentBattleRoom/border.bin" + .align 2 VerdanturfTown_BattleTentBattleRoom_MapBlockdata: @ 846C168 .incbin "data/maps/VerdanturfTown_BattleTentBattleRoom/map.bin" - .incbin "baserom.gba", 0x46c252, 0x2 - + .align 2 VerdanturfTown_BattleTentBattleRoom_MapAttributes: @ 846C254 .4byte 0xd .4byte 0x9 @@ -5325,12 +6259,15 @@ VerdanturfTown_BattleTentBattleRoom_MapAttributes: @ 846C254 .4byte gTileset_General .4byte gTileset_BattleTent + .align 2 MirageTower_4F_MapBorder: @ 846C26C .incbin "data/maps/MirageTower_4F/border.bin" + .align 2 MirageTower_4F_MapBlockdata: @ 846C274 .incbin "data/maps/MirageTower_4F/map.bin" + .align 2 MirageTower_4F_MapAttributes: @ 846C378 .4byte 0xd .4byte 0xa @@ -5339,14 +6276,15 @@ MirageTower_4F_MapAttributes: @ 846C378 .4byte gTileset_General .4byte gTileset_MirageTower + .align 2 DesertUnderpass_MapBorder: @ 846C390 .incbin "data/maps/DesertUnderpass/border.bin" + .align 2 DesertUnderpass_MapBlockdata: @ 846C398 .incbin "data/maps/DesertUnderpass/map.bin" - .incbin "baserom.gba", 0x46dc92, 0x2 - + .align 2 DesertUnderpass_MapAttributes: @ 846DC94 .4byte 0x8b .4byte 0x17 @@ -5355,14 +6293,15 @@ DesertUnderpass_MapAttributes: @ 846DC94 .4byte gTileset_General .4byte gTileset_Cave + .align 2 BattleFrontier_BattleTowerMultiBattleRoom_MapBorder: @ 846DCAC .incbin "data/maps/BattleFrontier_BattleTowerMultiBattleRoom/border.bin" + .align 2 BattleFrontier_BattleTowerMultiBattleRoom_MapBlockdata: @ 846DCB4 .incbin "data/maps/BattleFrontier_BattleTowerMultiBattleRoom/map.bin" - .incbin "baserom.gba", 0x46df2a, 0x2 - + .align 2 BattleFrontier_BattleTowerMultiBattleRoom_MapAttributes: @ 846DF2C .4byte 0x15 .4byte 0xf @@ -5371,14 +6310,15 @@ BattleFrontier_BattleTowerMultiBattleRoom_MapAttributes: @ 846DF2C .4byte gTileset_InsideBuilding .4byte gTileset_BattleFrontier + .align 2 BattleFrontier_BattleTowerCorridor2_MapBorder: @ 846DF44 .incbin "data/maps/BattleFrontier_BattleTowerCorridor2/border.bin" + .align 2 BattleFrontier_BattleTowerCorridor2_MapBlockdata: @ 846DF4C .incbin "data/maps/BattleFrontier_BattleTowerCorridor2/map.bin" - .incbin "baserom.gba", 0x46dff6, 0x2 - + .align 2 BattleFrontier_BattleTowerCorridor2_MapAttributes: @ 846DFF8 .4byte 0x11 .4byte 0x5 @@ -5387,14 +6327,18 @@ BattleFrontier_BattleTowerCorridor2_MapAttributes: @ 846DFF8 .4byte gTileset_InsideBuilding .4byte gTileset_BattleFrontier + .align 2 .incbin "baserom.gba", 0x46e010, 0x2be0 + .align 2 UnionRoom_MapBorder: @ 8470BF0 .incbin "data/maps/UnionRoom/border.bin" + .align 2 UnionRoom_MapBlockdata: @ 8470BF8 .incbin "data/maps/UnionRoom/map.bin" + .align 2 UnionRoom_MapAttributes: @ 8470D60 .4byte 0xf .4byte 0xc @@ -5403,12 +6347,15 @@ UnionRoom_MapAttributes: @ 8470D60 .4byte gTileset_InsideBuilding .4byte gTileset_UnionRoom + .align 2 SafariZone_Northeast_MapBorder: @ 8470D78 .incbin "data/maps/SafariZone_Northeast/border.bin" + .align 2 SafariZone_Northeast_MapBlockdata: @ 8470D80 .incbin "data/maps/SafariZone_Northeast/map.bin" + .align 2 SafariZone_Northeast_MapAttributes: @ 8471A00 .4byte 0x28 .4byte 0x28 @@ -5417,12 +6364,15 @@ SafariZone_Northeast_MapAttributes: @ 8471A00 .4byte gTileset_General .4byte gTileset_Lilycove + .align 2 SafariZone_Southeast_MapBorder: @ 8471A18 .incbin "data/maps/SafariZone_Southeast/border.bin" + .align 2 SafariZone_Southeast_MapBlockdata: @ 8471A20 .incbin "data/maps/SafariZone_Southeast/map.bin" + .align 2 SafariZone_Southeast_MapAttributes: @ 84726A0 .4byte 0x28 .4byte 0x28 @@ -5431,14 +6381,15 @@ SafariZone_Southeast_MapAttributes: @ 84726A0 .4byte gTileset_General .4byte gTileset_Lilycove + .align 2 BattleFrontier_RankingHall_MapBorder: @ 84726B8 .incbin "data/maps/BattleFrontier_RankingHall/border.bin" + .align 2 BattleFrontier_RankingHall_MapBlockdata: @ 84726C0 .incbin "data/maps/BattleFrontier_RankingHall/map.bin" - .incbin "baserom.gba", 0x472cf6, 0x2 - + .align 2 BattleFrontier_RankingHall_MapAttributes: @ 8472CF8 .4byte 0x35 .4byte 0xf @@ -5447,12 +6398,15 @@ BattleFrontier_RankingHall_MapAttributes: @ 8472CF8 .4byte gTileset_InsideBuilding .4byte gTileset_BattleFrontierRankingHall + .align 2 BattleFrontier_Lounge2_MapBorder: @ 8472D10 .incbin "data/maps/BattleFrontier_Lounge2/border.bin" + .align 2 BattleFrontier_Lounge2_MapBlockdata: @ 8472D18 .incbin "data/maps/BattleFrontier_Lounge2/map.bin" + .align 2 BattleFrontier_Lounge2_MapAttributes: @ 8472DE8 BattleFrontier_Lounge5_MapAttributes: @ 8472DE8 .4byte 0xd @@ -5462,14 +6416,15 @@ BattleFrontier_Lounge5_MapAttributes: @ 8472DE8 .4byte gTileset_InsideBuilding .4byte gTileset_BattleFrontier + .align 2 BattleFrontier_BattlePointExchangeServiceCorner_MapBorder: @ 8472E00 .incbin "data/maps/BattleFrontier_BattlePointExchangeServiceCorner/border.bin" + .align 2 BattleFrontier_BattlePointExchangeServiceCorner_MapBlockdata: @ 8472E08 .incbin "data/maps/BattleFrontier_BattlePointExchangeServiceCorner/map.bin" - .incbin "baserom.gba", 0x472f52, 0x2 - + .align 2 BattleFrontier_BattlePointExchangeServiceCorner_MapAttributes: @ 8472F54 .4byte 0xf .4byte 0xb @@ -5478,12 +6433,15 @@ BattleFrontier_BattlePointExchangeServiceCorner_MapAttributes: @ 8472F54 .4byte gTileset_InsideBuilding .4byte gTileset_BattleFrontier + .align 2 BattleFrontier_ReceptionGate_MapBorder: @ 8472F6C .incbin "data/maps/BattleFrontier_ReceptionGate/border.bin" + .align 2 BattleFrontier_ReceptionGate_MapBlockdata: @ 8472F74 .incbin "data/maps/BattleFrontier_ReceptionGate/map.bin" + .align 2 BattleFrontier_ReceptionGate_MapAttributes: @ 8473070 .4byte 0x9 .4byte 0xe @@ -5492,12 +6450,15 @@ BattleFrontier_ReceptionGate_MapAttributes: @ 8473070 .4byte gTileset_General .4byte gTileset_BattleFrontier + .align 2 ArtisanCave_B1F_MapBorder: @ 8473088 .incbin "data/maps/ArtisanCave_B1F/border.bin" + .align 2 ArtisanCave_B1F_MapBlockdata: @ 8473090 .incbin "data/maps/ArtisanCave_B1F/map.bin" + .align 2 ArtisanCave_B1F_MapAttributes: @ 84743F8 .4byte 0x2e .4byte 0x36 @@ -5506,12 +6467,15 @@ ArtisanCave_B1F_MapAttributes: @ 84743F8 .4byte gTileset_General .4byte gTileset_Cave + .align 2 ArtisanCave_1F_MapBorder: @ 8474410 .incbin "data/maps/ArtisanCave_1F/border.bin" + .align 2 ArtisanCave_1F_MapBlockdata: @ 8474418 .incbin "data/maps/ArtisanCave_1F/map.bin" + .align 2 ArtisanCave_1F_MapAttributes: @ 84747B4 .4byte 0x15 .4byte 0x16 @@ -5520,12 +6484,15 @@ ArtisanCave_1F_MapAttributes: @ 84747B4 .4byte gTileset_General .4byte gTileset_Cave + .align 2 FarawayIsland_Entrance_MapBorder: @ 84747CC .incbin "data/maps/FarawayIsland_Entrance/border.bin" + .align 2 FarawayIsland_Entrance_MapBlockdata: @ 84747D4 .incbin "data/maps/FarawayIsland_Entrance/map.bin" + .align 2 FarawayIsland_Entrance_MapAttributes: @ 847540C .4byte 0x22 .4byte 0x2e @@ -5534,12 +6501,15 @@ FarawayIsland_Entrance_MapAttributes: @ 847540C .4byte gTileset_General .4byte gTileset_Rustboro + .align 2 FarawayIsland_Interior_MapBorder: @ 8475424 .incbin "data/maps/FarawayIsland_Interior/border.bin" + .align 2 FarawayIsland_Interior_MapBlockdata: @ 847542C .incbin "data/maps/FarawayIsland_Interior/map.bin" + .align 2 FarawayIsland_Interior_MapAttributes: @ 8475A10 .4byte 0x1d .4byte 0x1a @@ -5548,12 +6518,15 @@ FarawayIsland_Interior_MapAttributes: @ 8475A10 .4byte gTileset_General .4byte gTileset_Fortree + .align 2 BirthIsland_Exterior_MapBorder: @ 8475A28 .incbin "data/maps/BirthIsland_Exterior/border.bin" + .align 2 BirthIsland_Exterior_MapBlockdata: @ 8475A30 .incbin "data/maps/BirthIsland_Exterior/map.bin" + .align 2 BirthIsland_Exterior_MapAttributes: @ 8476138 .4byte 0x1e .4byte 0x1e @@ -5562,14 +6535,15 @@ BirthIsland_Exterior_MapAttributes: @ 8476138 .4byte gTileset_General .4byte gTileset_Dewford + .align 2 BirthIsland_Harbor_MapBorder: @ 8476150 .incbin "data/maps/BirthIsland_Harbor/border.bin" + .align 2 BirthIsland_Harbor_MapBlockdata: @ 8476158 .incbin "data/maps/BirthIsland_Harbor/map.bin" - .incbin "baserom.gba", 0x476312, 0x2 - + .align 2 BirthIsland_Harbor_MapAttributes: @ 8476314 NavelRock_Harbor_MapAttributes: @ 8476314 .4byte 0x11 @@ -5579,12 +6553,15 @@ NavelRock_Harbor_MapAttributes: @ 8476314 .4byte gTileset_General .4byte gTileset_IslandHarbor + .align 2 Underwater_MarineCave_MapBorder: @ 847632C .incbin "data/maps/Underwater_MarineCave/border.bin" + .align 2 Underwater_MarineCave_MapBlockdata: @ 8476334 .incbin "data/maps/Underwater_MarineCave/map.bin" + .align 2 Underwater_MarineCave_MapAttributes: @ 84764C4 .4byte 0x14 .4byte 0xa @@ -5593,12 +6570,15 @@ Underwater_MarineCave_MapAttributes: @ 84764C4 .4byte gTileset_General .4byte gTileset_Underwater + .align 2 MarineCave_Entrance_MapBorder: @ 84764DC .incbin "data/maps/MarineCave_Entrance/border.bin" + .align 2 MarineCave_Entrance_MapBlockdata: @ 84764E4 .incbin "data/maps/MarineCave_Entrance/map.bin" + .align 2 MarineCave_Entrance_MapAttributes: @ 8476804 .4byte 0x14 .4byte 0x14 @@ -5607,12 +6587,15 @@ MarineCave_Entrance_MapAttributes: @ 8476804 .4byte gTileset_General .4byte gTileset_Cave + .align 2 TerraCave_Entrance_MapBorder: @ 847681C .incbin "data/maps/TerraCave_Entrance/border.bin" + .align 2 TerraCave_Entrance_MapBlockdata: @ 8476824 .incbin "data/maps/TerraCave_Entrance/map.bin" + .align 2 TerraCave_Entrance_MapAttributes: @ 8476B44 .4byte 0x14 .4byte 0x14 @@ -5621,12 +6604,15 @@ TerraCave_Entrance_MapAttributes: @ 8476B44 .4byte gTileset_General .4byte gTileset_Cave + .align 2 TerraCave_End_MapBorder: @ 8476B5C .incbin "data/maps/TerraCave_End/border.bin" + .align 2 TerraCave_End_MapBlockdata: @ 8476B64 .incbin "data/maps/TerraCave_End/map.bin" + .align 2 TerraCave_End_MapAttributes: @ 84771B8 .4byte 0x1b .4byte 0x1e @@ -5635,12 +6621,15 @@ TerraCave_End_MapAttributes: @ 84771B8 .4byte gTileset_General .4byte gTileset_Cave + .align 2 Underwater6_MapBorder: @ 84771D0 .incbin "data/maps/Underwater6/border.bin" + .align 2 Underwater6_MapBlockdata: @ 84771D8 .incbin "data/maps/Underwater6/map.bin" + .align 2 Underwater6_MapAttributes: @ 8478AD8 .4byte 0x28 .4byte 0x50 @@ -5649,12 +6638,15 @@ Underwater6_MapAttributes: @ 8478AD8 .4byte gTileset_General .4byte gTileset_Underwater + .align 2 Underwater7_MapBorder: @ 8478AF0 .incbin "data/maps/Underwater7/border.bin" + .align 2 Underwater7_MapBlockdata: @ 8478AF8 .incbin "data/maps/Underwater7/map.bin" + .align 2 Underwater7_MapAttributes: @ 847A3F8 .4byte 0x50 .4byte 0x28 @@ -5663,12 +6655,15 @@ Underwater7_MapAttributes: @ 847A3F8 .4byte gTileset_General .4byte gTileset_Underwater + .align 2 Underwater5_MapBorder: @ 847A410 .incbin "data/maps/Underwater5/border.bin" + .align 2 Underwater5_MapBlockdata: @ 847A418 .incbin "data/maps/Underwater5/map.bin" + .align 2 Underwater5_MapAttributes: @ 847BD18 .4byte 0x50 .4byte 0x28 @@ -5677,12 +6672,15 @@ Underwater5_MapAttributes: @ 847BD18 .4byte gTileset_General .4byte gTileset_Underwater + .align 2 MarineCave_End_MapBorder: @ 847BD30 .incbin "data/maps/MarineCave_End/border.bin" + .align 2 MarineCave_End_MapBlockdata: @ 847BD38 .incbin "data/maps/MarineCave_End/map.bin" + .align 2 MarineCave_End_MapAttributes: @ 847C38C .4byte 0x1b .4byte 0x1e @@ -5691,14 +6689,15 @@ MarineCave_End_MapAttributes: @ 847C38C .4byte gTileset_General .4byte gTileset_Cave + .align 2 TrainerHill_Entrance_MapBorder: @ 847C3A4 .incbin "data/maps/TrainerHill_Entrance/border.bin" + .align 2 TrainerHill_Entrance_MapBlockdata: @ 847C3AC .incbin "data/maps/TrainerHill_Entrance/map.bin" - .incbin "baserom.gba", 0x47c632, 0x2 - + .align 2 TrainerHill_Entrance_MapAttributes: @ 847C634 .4byte 0x13 .4byte 0x11 @@ -5707,12 +6706,15 @@ TrainerHill_Entrance_MapAttributes: @ 847C634 .4byte gTileset_InsideBuilding .4byte gTileset_TrainerHill + .align 2 TrainerHill_1F_MapBorder: @ 847C64C .incbin "data/maps/TrainerHill_1F/border.bin" + .align 2 TrainerHill_1F_MapBlockdata: @ 847C654 .incbin "data/maps/TrainerHill_1F/map.bin" + .align 2 TrainerHill_1F_MapAttributes: @ 847C8F4 .4byte 0x10 .4byte 0x15 @@ -5721,12 +6723,15 @@ TrainerHill_1F_MapAttributes: @ 847C8F4 .4byte gTileset_InsideBuilding .4byte gTileset_TrainerHill + .align 2 TrainerHill_2F_MapBorder: @ 847C90C .incbin "data/maps/TrainerHill_2F/border.bin" + .align 2 TrainerHill_2F_MapBlockdata: @ 847C914 .incbin "data/maps/TrainerHill_2F/map.bin" + .align 2 TrainerHill_2F_MapAttributes: @ 847CBB4 .4byte 0x10 .4byte 0x15 @@ -5735,12 +6740,15 @@ TrainerHill_2F_MapAttributes: @ 847CBB4 .4byte gTileset_InsideBuilding .4byte gTileset_TrainerHill + .align 2 TrainerHill_3F_MapBorder: @ 847CBCC .incbin "data/maps/TrainerHill_3F/border.bin" + .align 2 TrainerHill_3F_MapBlockdata: @ 847CBD4 .incbin "data/maps/TrainerHill_3F/map.bin" + .align 2 TrainerHill_3F_MapAttributes: @ 847CE74 .4byte 0x10 .4byte 0x15 @@ -5749,12 +6757,15 @@ TrainerHill_3F_MapAttributes: @ 847CE74 .4byte gTileset_InsideBuilding .4byte gTileset_TrainerHill + .align 2 TrainerHill_4F_MapBorder: @ 847CE8C .incbin "data/maps/TrainerHill_4F/border.bin" + .align 2 TrainerHill_4F_MapBlockdata: @ 847CE94 .incbin "data/maps/TrainerHill_4F/map.bin" + .align 2 TrainerHill_4F_MapAttributes: @ 847D134 .4byte 0x10 .4byte 0x15 @@ -5763,12 +6774,15 @@ TrainerHill_4F_MapAttributes: @ 847D134 .4byte gTileset_InsideBuilding .4byte gTileset_TrainerHill + .align 2 TrainerHill_Roof_MapBorder: @ 847D14C .incbin "data/maps/TrainerHill_Roof/border.bin" + .align 2 TrainerHill_Roof_MapBlockdata: @ 847D154 .incbin "data/maps/TrainerHill_Roof/map.bin" + .align 2 TrainerHill_Roof_MapAttributes: @ 847D474 .4byte 0x19 .4byte 0x10 @@ -5777,12 +6791,15 @@ TrainerHill_Roof_MapAttributes: @ 847D474 .4byte gTileset_InsideBuilding .4byte gTileset_TrainerHill + .align 2 AlteringCave_MapBorder: @ 847D48C .incbin "data/maps/AlteringCave/border.bin" + .align 2 AlteringCave_MapBlockdata: @ 847D494 .incbin "data/maps/AlteringCave/map.bin" + .align 2 AlteringCave_MapAttributes: @ 847DA94 .4byte 0x20 .4byte 0x18 @@ -5791,12 +6808,15 @@ AlteringCave_MapAttributes: @ 847DA94 .4byte gTileset_General .4byte gTileset_Cave + .align 2 NavelRock_Exterior_MapBorder: @ 847DAAC .incbin "data/maps/NavelRock_Exterior/border.bin" + .align 2 NavelRock_Exterior_MapBlockdata: @ 847DAB4 .incbin "data/maps/NavelRock_Exterior/map.bin" + .align 2 NavelRock_Exterior_MapAttributes: @ 847DEA4 .4byte 0x15 .4byte 0x18 @@ -5805,12 +6825,15 @@ NavelRock_Exterior_MapAttributes: @ 847DEA4 .4byte gTileset_General .4byte gTileset_Dewford + .align 2 NavelRock_Entrance_MapBorder: @ 847DEBC .incbin "data/maps/NavelRock_Entrance/border.bin" + .align 2 NavelRock_Entrance_MapBlockdata: @ 847DEC4 .incbin "data/maps/NavelRock_Entrance/map.bin" + .align 2 NavelRock_Entrance_MapAttributes: @ 847E404 .4byte 0x15 .4byte 0x20 @@ -5819,12 +6842,15 @@ NavelRock_Entrance_MapAttributes: @ 847E404 .4byte gTileset_General .4byte gTileset_NavelRock + .align 2 NavelRock_Top_MapBorder: @ 847E41C .incbin "data/maps/NavelRock_Top/border.bin" + .align 2 NavelRock_Top_MapBlockdata: @ 847E424 .incbin "data/maps/NavelRock_Top/map.bin" + .align 2 NavelRock_Top_MapAttributes: @ 847E99C .4byte 0x19 .4byte 0x1c @@ -5833,12 +6859,15 @@ NavelRock_Top_MapAttributes: @ 847E99C .4byte gTileset_General .4byte gTileset_NavelRock + .align 2 NavelRock_Bottom_MapBorder: @ 847E9B4 .incbin "data/maps/NavelRock_Bottom/border.bin" + .align 2 NavelRock_Bottom_MapBlockdata: @ 847E9BC .incbin "data/maps/NavelRock_Bottom/map.bin" + .align 2 NavelRock_Bottom_MapAttributes: @ 847ED84 .4byte 0x16 .4byte 0x16 @@ -5847,12 +6876,15 @@ NavelRock_Bottom_MapAttributes: @ 847ED84 .4byte gTileset_General .4byte gTileset_NavelRock + .align 2 NavelRock_Up1_MapBorder: @ 847ED9C .incbin "data/maps/NavelRock_Up1/border.bin" + .align 2 NavelRock_Up1_MapBlockdata: @ 847EDA4 .incbin "data/maps/NavelRock_Up1/map.bin" + .align 2 NavelRock_Down01_MapAttributes: @ 847EE34 NavelRock_Down03_MapAttributes: @ 847EE34 NavelRock_Down05_MapAttributes: @ 847EE34 @@ -5868,12 +6900,15 @@ NavelRock_Up3_MapAttributes: @ 847EE34 .4byte gTileset_General .4byte gTileset_NavelRock + .align 2 NavelRock_Up2_MapBorder: @ 847EE4C .incbin "data/maps/NavelRock_Up2/border.bin" + .align 2 NavelRock_Up2_MapBlockdata: @ 847EE54 .incbin "data/maps/NavelRock_Up2/map.bin" + .align 2 NavelRock_Down02_MapAttributes: @ 847EEE4 NavelRock_Down04_MapAttributes: @ 847EEE4 NavelRock_Down06_MapAttributes: @ 847EEE4 @@ -5888,14 +6923,15 @@ NavelRock_Up4_MapAttributes: @ 847EEE4 .4byte gTileset_General .4byte gTileset_NavelRock + .align 2 NavelRock_B1F_MapBorder: @ 847EEFC .incbin "data/maps/NavelRock_B1F/border.bin" + .align 2 NavelRock_B1F_MapBlockdata: @ 847EF04 .incbin "data/maps/NavelRock_B1F/map.bin" - .incbin "baserom.gba", 0x47f0fe, 0x2 - + .align 2 NavelRock_B1F_MapAttributes: @ 847F100 .4byte 0x17 .4byte 0xb @@ -5904,12 +6940,15 @@ NavelRock_B1F_MapAttributes: @ 847F100 .4byte gTileset_General .4byte gTileset_NavelRock + .align 2 NavelRock_Fork_MapBorder: @ 847F118 .incbin "data/maps/NavelRock_Fork/border.bin" + .align 2 NavelRock_Fork_MapBlockdata: @ 847F120 .incbin "data/maps/NavelRock_Fork/map.bin" + .align 2 NavelRock_Fork_MapAttributes: @ 8480344 .4byte 0x1b .4byte 0x56 @@ -5918,12 +6957,15 @@ NavelRock_Fork_MapAttributes: @ 8480344 .4byte gTileset_General .4byte gTileset_NavelRock + .align 2 BattleFrontier_Lounge1_MapBorder: @ 848035C .incbin "data/maps/BattleFrontier_Lounge1/border.bin" + .align 2 BattleFrontier_Lounge1_MapBlockdata: @ 8480364 .incbin "data/maps/BattleFrontier_Lounge1/map.bin" + .align 2 BattleFrontier_Lounge1_MapAttributes: @ 8480418 BattleFrontier_Lounge3_MapAttributes: @ 8480418 BattleFrontier_Lounge4_MapAttributes: @ 8480418 @@ -5938,12 +6980,15 @@ BattleFrontier_Lounge9_MapAttributes: @ 8480418 .4byte gTileset_InsideBuilding .4byte gTileset_BattleFrontier + .align 2 BattleFrontier_ScottsHouse_MapBorder: @ 8480430 .incbin "data/maps/BattleFrontier_ScottsHouse/border.bin" + .align 2 BattleFrontier_ScottsHouse_MapBlockdata: @ 8480438 .incbin "data/maps/BattleFrontier_ScottsHouse/map.bin" + .align 2 BattleFrontier_ScottsHouse_MapAttributes: @ 8480498 .4byte 0x6 .4byte 0x8 @@ -5952,12 +6997,15 @@ BattleFrontier_ScottsHouse_MapAttributes: @ 8480498 .4byte gTileset_InsideBuilding .4byte gTileset_BattleFrontier + .align 2 MeteorFalls_StevensCave_MapBorder: @ 84804B0 .incbin "data/maps/MeteorFalls_StevensCave/border.bin" + .align 2 MeteorFalls_StevensCave_MapBlockdata: @ 84804B8 .incbin "data/maps/MeteorFalls_StevensCave/map.bin" + .align 2 MeteorFalls_StevensCave_MapAttributes: @ 8480C38 .4byte 0x1e .4byte 0x20 @@ -5966,14 +7014,18 @@ MeteorFalls_StevensCave_MapAttributes: @ 8480C38 .4byte gTileset_General .4byte gTileset_MeteorFalls + .align 2 .incbin "baserom.gba", 0x480c50, 0xeec + .align 2 SootopolisCity_MysteryEventsHouse_1F_MapBorder: @ 8481B3C .incbin "data/maps/SootopolisCity_MysteryEventsHouse_1F/border.bin" + .align 2 SootopolisCity_MysteryEventsHouse_1F_MapBlockdata: @ 8481B44 .incbin "data/maps/SootopolisCity_MysteryEventsHouse_1F/map.bin" + .align 2 SootopolisCity_MysteryEventsHouse_1F_MapAttributes: @ 8481BF4 .4byte 0xb .4byte 0x8 @@ -5982,12 +7034,15 @@ SootopolisCity_MysteryEventsHouse_1F_MapAttributes: @ 8481BF4 .4byte gTileset_InsideBuilding .4byte gTileset_MysteryEventsHouse + .align 2 SootopolisCity_MysteryEventsHouse_B1F_MapBorder: @ 8481C0C .incbin "data/maps/SootopolisCity_MysteryEventsHouse_B1F/border.bin" + .align 2 SootopolisCity_MysteryEventsHouse_B1F_MapBlockdata: @ 8481C14 .incbin "data/maps/SootopolisCity_MysteryEventsHouse_B1F/map.bin" + .align 2 SootopolisCity_MysteryEventsHouse_B1F_MapAttributes: @ 8481CEC .4byte 0xc .4byte 0x9 @@ -5996,5 +7051,5 @@ SootopolisCity_MysteryEventsHouse_B1F_MapAttributes: @ 8481CEC .4byte gTileset_InsideBuilding .4byte gTileset_MysteryEventsHouse + .align 2 .incbin "baserom.gba", 0x481d04, 0xd0 - diff --git a/data/rom4.s b/data/rom4.s index 5adba1353..b047e82d2 100644 --- a/data/rom4.s +++ b/data/rom4.s @@ -611,6 +611,7 @@ gMapGroups: @ 8486578 .include "data/maps/FortreeCity/connections.inc" .include "data/maps/LilycoveCity/connections.inc" .include "data/maps/MossdeepCity/connections.inc" + .include "data/maps/SootopolisCity/connections.inc" .include "data/maps/EverGrandeCity/connections.inc" .include "data/maps/Route101/connections.inc" .include "data/maps/Route102/connections.inc" |