diff --git a/asm/macros/map.inc b/asm/macros/map.inc index 873b63a2..755413c0 100755 --- a/asm/macros/map.inc +++ b/asm/macros/map.inc @@ -9,16 +9,36 @@ .2byte \tileset_id .endm - .macro tileset_tiles src_offset, dest, size, compressed, terminator=0 + .macro map_data src_offset, dest, size, compressed, terminator=0 .4byte (!(\terminator) << 0x1F) | (\src_offset) .4byte \dest .4byte (\compressed << 0x1F) | (\size) .endm + .macro tileset_tiles src_offset, dest, size, compressed, terminator=0 + map_data \src_offset, \dest, \size, \compressed, \terminator + .endm + .macro tileset_palette_set id, terminator=0 .4byte (!(\terminator) << 0x1F) | (\id) .4byte 0x0 .4byte 0x0 .endm + .macro metatiles_bottom src_offset, size, compressed, terminator=0 + map_data \src_offset, 0x0202CEB4, \size, \compressed, \terminator + .endm + + .macro metatiles_top src_offset, size, compressed, terminator=0 + map_data \src_offset, 0x02012654, \size, \compressed, \terminator + .endm + + .macro metatile_types_bottom src_offset, size, compressed, terminator=0 + map_data \src_offset, 0x0202AEB4, \size, \compressed, \terminator + .endm + + .macro metatile_types_top src_offset, size, compressed, terminator=0 + map_data \src_offset, 0x02010654, \size, \compressed, \terminator + .endm + .endif @ GUARD_ASM_MACROS_MAP_INC diff --git a/data/data_081026AC.s b/data/data_081032DC.s similarity index 91% rename from data/data_081026AC.s rename to data/data_081032DC.s index 88787890..ee81b361 100755 --- a/data/data_081026AC.s +++ b/data/data_081032DC.s @@ -4,216 +4,6 @@ .section .rodata .align 2 -gUnk_081026AC:: @ 081026AC - .incbin "baserom.gba", 0x1026AC, 0x0000030 - -gUnk_081026DC:: @ 081026DC - .incbin "baserom.gba", 0x1026DC, 0x0000028 - -gUnk_08102704:: @ 08102704 - .incbin "baserom.gba", 0x102704, 0x0000008 - -gUnk_0810270C:: @ 0810270C - .incbin "baserom.gba", 0x10270C, 0x0000004 - -gUnk_08102710:: @ 08102710 - .incbin "baserom.gba", 0x102710, 0x0000023 - -gUnk_08102733:: @ 08102733 - .incbin "baserom.gba", 0x102733, 0x0000009 - -gUnk_0810273C:: @ 0810273C - .incbin "baserom.gba", 0x10273C, 0x000001B - -gUnk_08102757:: @ 08102757 - .incbin "baserom.gba", 0x102757, 0x0000015 - -gUnk_0810276C:: @ 0810276C - .incbin "baserom.gba", 0x10276C, 0x0000030 - -gUnk_0810279C:: @ 0810279C - .incbin "baserom.gba", 0x10279C, 0x0000030 - -gUnk_081027CC:: @ 081027CC - .incbin "baserom.gba", 0x1027CC, 0x0000030 - -gUnk_081027FC:: @ 081027FC - .incbin "baserom.gba", 0x1027FC, 0x0000030 - -gUnk_0810282C:: @ 0810282C - .incbin "baserom.gba", 0x10282C, 0x000000C - -gUnk_08102838:: @ 08102838 - .incbin "baserom.gba", 0x102838, 0x0000012 - -gUnk_0810284A:: @ 0810284A - .incbin "baserom.gba", 0x10284A, 0x0000012 - -gUnk_0810285C:: @ 0810285C - .incbin "baserom.gba", 0x10285C, 0x0000018 - -gUnk_08102874:: @ 08102874 - .incbin "baserom.gba", 0x102874, 0x0000030 - -gUnk_081028A4:: @ 081028A4 - .incbin "baserom.gba", 0x1028A4, 0x0000030 - -gUnk_081028D4:: @ 081028D4 - .incbin "baserom.gba", 0x1028D4, 0x0000030 - -gUnk_08102904:: @ 08102904 - .incbin "baserom.gba", 0x102904, 0x0000012 - -gUnk_08102916:: @ 08102916 - .incbin "baserom.gba", 0x102916, 0x000001E - -gUnk_08102934:: @ 08102934 - .incbin "baserom.gba", 0x102934, 0x0000018 - -gUnk_0810294C:: @ 0810294C - .incbin "baserom.gba", 0x10294C, 0x0000018 - -gUnk_08102964:: @ 08102964 - .incbin "baserom.gba", 0x102964, 0x0000030 - -gUnk_08102994:: @ 08102994 - .incbin "baserom.gba", 0x102994, 0x0000030 - -gUnk_081029C4:: @ 081029C4 - .incbin "baserom.gba", 0x1029C4, 0x0000030 - -gUnk_081029F4:: @ 081029F4 - .incbin "baserom.gba", 0x1029F4, 0x000001C - -gUnk_08102A10:: @ 08102A10 - .incbin "baserom.gba", 0x102A10, 0x0000014 - -gUnk_08102A24:: @ 08102A24 - .incbin "baserom.gba", 0x102A24, 0x0000030 - -gUnk_08102A54:: @ 08102A54 - .incbin "baserom.gba", 0x102A54, 0x0000030 - -gUnk_08102A84:: @ 08102A84 - .incbin "baserom.gba", 0x102A84, 0x0000030 - -gUnk_08102AB4:: @ 08102AB4 - .incbin "baserom.gba", 0x102AB4, 0x0000030 - -gUnk_08102AE4:: @ 08102AE4 - .incbin "baserom.gba", 0x102AE4, 0x000002C - -gUnk_08102B10:: @ 08102B10 - .incbin "baserom.gba", 0x102B10, 0x0000004 - -gUnk_08102B14:: @ 08102B14 - .incbin "baserom.gba", 0x102B14, 0x0000030 - -gUnk_08102B44:: @ 08102B44 - .incbin "baserom.gba", 0x102B44, 0x0000030 - -gUnk_08102B74:: @ 08102B74 - .incbin "baserom.gba", 0x102B74, 0x0000030 - -gUnk_08102BA4:: @ 08102BA4 - .incbin "baserom.gba", 0x102BA4, 0x0000030 - -gUnk_08102BD4:: @ 08102BD4 - .incbin "baserom.gba", 0x102BD4, 0x0000030 - -gUnk_08102C04:: @ 08102C04 - .incbin "baserom.gba", 0x102C04, 0x0000030 - -gUnk_08102C34:: @ 08102C34 - .incbin "baserom.gba", 0x102C34, 0x000000D - -gUnk_08102C41:: @ 08102C41 - .incbin "baserom.gba", 0x102C41, 0x0000023 - -gUnk_08102C64:: @ 08102C64 - .incbin "baserom.gba", 0x102C64, 0x0000030 - -gUnk_08102C94:: @ 08102C94 - .incbin "baserom.gba", 0x102C94, 0x0000030 - -gUnk_08102CC4:: @ 08102CC4 - .incbin "baserom.gba", 0x102CC4, 0x0000030 - -gUnk_08102CF4:: @ 08102CF4 - .incbin "baserom.gba", 0x102CF4, 0x0000030 - -gUnk_08102D24:: @ 08102D24 - .incbin "baserom.gba", 0x102D24, 0x0000030 - -gUnk_08102D54:: @ 08102D54 - .incbin "baserom.gba", 0x102D54, 0x0000030 - -gUnk_08102D84:: @ 08102D84 - .incbin "baserom.gba", 0x102D84, 0x0000030 - -gUnk_08102DB4:: @ 08102DB4 - .incbin "baserom.gba", 0x102DB4, 0x0000030 - -gUnk_08102DE4:: @ 08102DE4 - .incbin "baserom.gba", 0x102DE4, 0x0000030 - -gUnk_08102E14:: @ 08102E14 - .incbin "baserom.gba", 0x102E14, 0x0000030 - -gUnk_08102E44:: @ 08102E44 - .incbin "baserom.gba", 0x102E44, 0x0000030 - -gUnk_08102E74:: @ 08102E74 - .incbin "baserom.gba", 0x102E74, 0x0000030 - -gUnk_08102EA4:: @ 08102EA4 - .incbin "baserom.gba", 0x102EA4, 0x0000030 - -gUnk_08102ED4:: @ 08102ED4 - .incbin "baserom.gba", 0x102ED4, 0x0000018 - -gUnk_08102EEC:: @ 08102EEC - .incbin "baserom.gba", 0x102EEC, 0x0000025 - -gUnk_08102F11:: @ 08102F11 - .incbin "baserom.gba", 0x102F11, 0x000000B - -gUnk_08102F1C:: @ 08102F1C - .incbin "baserom.gba", 0x102F1C, 0x0000030 - -gUnk_08102F4C:: @ 08102F4C - .incbin "baserom.gba", 0x102F4C, 0x0000030 - -gUnk_08102F7C:: @ 08102F7C - .incbin "baserom.gba", 0x102F7C, 0x0000030 - -gUnk_08102FAC:: @ 08102FAC - .incbin "baserom.gba", 0x102FAC, 0x0000030 - -gUnk_08102FDC:: @ 08102FDC - .incbin "baserom.gba", 0x102FDC, 0x0000030 - -gUnk_0810300C:: @ 0810300C - .incbin "baserom.gba", 0x10300C, 0x0000030 - -gUnk_0810303C:: @ 0810303C - .incbin "baserom.gba", 0x10303C, 0x0000030 - -gUnk_0810306C:: @ 0810306C - .incbin "baserom.gba", 0x10306C, 0x0000030 - -gAreaMetatiles:: @ 0810309C - .incbin "baserom.gba", 0x10309C, 0x0000068 - -gUnk_08103104:: @ 08103104 - .incbin "baserom.gba", 0x103104, 0x000000C - -gUnk_08103110:: @ 08103110 - .incbin "baserom.gba", 0x103110, 0x00000E5 - -gUnk_081031F5:: @ 081031F5 - .incbin "baserom.gba", 0x1031F5, 0x00000E7 - gUnk_081032DC:: @ 081032DC .incbin "baserom.gba", 0x1032DC, 0x0000018 diff --git a/data/metatile_headers.s b/data/metatile_headers.s new file mode 100755 index 00000000..eb154c7e --- /dev/null +++ b/data/metatile_headers.s @@ -0,0 +1,473 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + .align 2 + +gAreaMetatiles_MinishWoods:: @ 081026AC + metatiles_bottom 0x7704, 0x4000, 1 + metatiles_top 0x9280, 0x3FF0, 1 + metatile_types_bottom 0xA00C, 0x1000, 1 + metatile_types_top 0xA43C, 0xFFC, 1, 1 + +gAreaMetatiles_LakeHylia:: @ 081026DC + metatiles_bottom 0x12A34, 0x4000, 1 + metatiles_top 0x1420C, 0x3FF0, 1 + metatile_types_bottom 0x1500C, 0x1000, 1 + metatile_types_top 0x15484, 0xFFC, 1, 1 + +gAreaMetatiles_CastorWilds:: @ 0810270C + metatiles_bottom 0x1D5E0, 0x4000, 1 + metatiles_top 0x1F310, 0x3FF0, 1 + metatile_types_bottom 0x20144, 0x1000, 1 + metatile_types_top 0x2062C, 0xFFC, 1, 1 + +gAreaMetatiles_HyruleTown:: @ 0810273C + metatiles_bottom 0x29774, 0x4000, 1 + metatiles_top 0x2B788, 0x3FF0, 1 + metatile_types_bottom 0x2D47C, 0x1000, 1 + metatile_types_top 0x2D984, 0xFFC, 1, 1 + +gAreaMetatiles_MtCrenel:: @ 0810276C + metatiles_bottom 0x43FF0, 0x4000, 1 + metatiles_top 0x45D0C, 0x3FF0, 1 + metatile_types_bottom 0x46BA4, 0x1000, 1 + metatile_types_top 0x4712C, 0xFFC, 1, 1 + +gAreaMetatiles_HyruleField:: @ 0810279C + metatiles_bottom 0x5D3B8, 0x4000, 1 + metatiles_top 0x5F584, 0x3FF0, 1 + metatile_types_bottom 0x6064C, 0x1000, 1 + metatile_types_top 0x60C64, 0xFFC, 1, 1 + +gAreaMetatiles_CastleGarden:: @ 081027CC + metatiles_bottom 0x6B79C, 0x3000, 1 + metatiles_top 0x6CD14, 0x3FF0, 1 + metatile_types_bottom 0x6D7A8, 0xC00, 1 + metatile_types_top 0x6DAE4, 0xFFC, 1, 1 + +gAreaMetatiles_CloudTops:: @ 081027FC + metatiles_bottom 0x72898, 0x3FB0, 1 + metatiles_top 0x73B54, 0x3FF0, 1 + metatile_types_bottom 0x74534, 0xFEC, 1 + metatile_types_top 0x74824, 0xFFC, 1, 1 + +gAreaMetatiles_RoyalValley:: @ 0810282C + metatiles_bottom 0x7CAB8, 0x4000, 1 + metatiles_top 0x7DBEC, 0x3FF0, 1 + metatile_types_bottom 0x7E6F8, 0x1000, 1 + metatile_types_top 0x7EA4C, 0xFFC, 1, 1 + +gAreaMetatiles_Beanstalks:: @ 0810285C + metatiles_bottom 0x8B610, 0x5A8, 1 + metatile_types_bottom 0x8B930, 0x16A, 1, 1 + +gAreaMetatiles_CrenelCaves:: @ 08102874 + metatiles_bottom 0x93F04, 0x3F80, 1 + metatiles_top 0x95ED0, 0x3F40, 1 + metatile_types_bottom 0x9775C, 0xFE0, 1 + metatile_types_top 0x97D58, 0xFD0, 1, 1 + +gAreaMetatiles_GreatFairies:: @ 081028A4 + metatiles_bottom 0x9E2D0, 0x17A8, 1 + metatiles_top 0x9EF9C, 0x1070, 1 + metatile_types_bottom 0x9F4D0, 0x5EA, 1 + metatile_types_top 0x9F650, 0x41C, 1, 1 + +gAreaMetatiles_MinishVillage:: @ 081028D4 + metatiles_bottom 0xD9690, 0x35A8, 1 + metatiles_top 0xDB294, 0x3228, 1 + metatile_types_bottom 0xDC79C, 0xD6A, 1 + metatile_types_top 0xDCA88, 0xC8A, 1, 1 + +gAreaMetatiles_MelarisMine:: @ 08102904 + metatiles_bottom 0xE8D1C, 0x27C0, 1 + metatiles_top 0xEA3A0, 0x308, 1 + metatile_types_bottom 0xEA464, 0x9F0, 1 + metatile_types_top 0xEA684, 0xC2, 1, 1 + +gAreaMetatiles_MnishPaths1:: @ 08102934 + metatiles_bottom 0xEE698, 0x1420, 1 + metatile_types_bottom 0xEF330, 0x508, 1, 1 + +gAreaMetatiles_CrenelMinishPaths:: @ 0810294C + metatiles_bottom 0xF5734, 0x1EB8, 1 + metatile_types_bottom 0xF698C, 0x7AE, 1, 1 + +gAreaMetatiles_MinishHouseInteriors:: @ 08102964 + metatiles_bottom 0x93F04, 0x3F80, 1 + metatiles_top 0x95ED0, 0x3F40, 1 + metatile_types_bottom 0x9775C, 0xFE0, 1 + metatile_types_top 0x97D58, 0xFD0, 1, 1 + +gAreaMetatiles_HouseInteriors1:: @ 08102994 + metatiles_bottom 0xFCE7C, 0x3188, 1 + metatiles_top 0xF7AD8, 0x3FF0, 1 + metatile_types_bottom 0xFE120, 0xC62, 1 + metatile_types_top 0xF8A5C, 0xFFC, 1, 1 + +gAreaMetatiles_HouseInteriors2:: @ 081029C4 + metatiles_bottom 0x102AB8, 0x33A0, 1 + metatiles_top 0xF7AD8, 0x3FF0, 1 + metatile_types_bottom 0x103D54, 0xCE8, 1 + metatile_types_top 0xF8A5C, 0xFFC, 1, 1 + +gAreaMetatiles_HouseInteriors4:: @ 081029F4 + metatiles_bottom 0x10823C, 0x33A0, 1 + metatiles_top 0xF7AD8, 0x3FF0, 1 + metatile_types_bottom 0x109530, 0xCE8, 1 + metatile_types_top 0xF8A5C, 0xFFC, 1, 1 + +gAreaMetatiles_HouseInteriors3:: @ 08102A24 + metatiles_bottom 0x10DAA8, 0x2F20, 1 + metatiles_top 0xF7AD8, 0x3FF0, 1 + metatile_types_bottom 0x10E9F0, 0xBC8, 1 + metatile_types_top 0xF8A5C, 0xFFC, 1, 1 + +gAreaMetatiles_TreeInteriors:: @ 08102A54 + metatiles_bottom 0x112BF0, 0x3000, 1 + metatiles_top 0xF7AD8, 0x3FF0, 1 + metatile_types_bottom 0x113A88, 0xC00, 1 + metatile_types_top 0xF8A5C, 0xFFC, 1, 1 + +gAreaMetatiles_Dojos:: @ 08102A84 + metatiles_bottom 0x11D198, 0x33A0, 1 + metatiles_top 0xF7AD8, 0x3FF0, 1 + metatile_types_bottom 0x11E030, 0xCE8, 1 + metatile_types_top 0xF8A5C, 0xFFC, 1, 1 + +gAreaMetatiles_MinishCracks:: @ 08102AB4 + metatiles_bottom 0x118044, 0x3180, 1 + metatiles_top 0xF7AD8, 0x3FF0, 1 + metatile_types_bottom 0x118F94, 0xC60, 1 + metatile_types_top 0xF8A5C, 0xFFC, 1, 1 + +gAreaMetatiles_ArmosInteriors:: @ 08102AE4 + metatiles_bottom 0xA4840, 0xC50, 1 + metatiles_top 0xA4FB4, 0xC50, 1 + metatile_types_bottom 0xA5728, 0x314, 1 + metatile_types_top 0xA5840, 0x314, 1, 1 + +gAreaMetatiles_MinishRafters:: @ 08102B14 + metatiles_bottom 0x120478, 0x1A30, 1 + metatiles_top 0xF7AD8, 0x3FF0, 1 + metatile_types_bottom 0x1210C8, 0x68C, 1 + metatile_types_top 0xF8A5C, 0xFFC, 1, 1 + +gAreaMetatiles_GoronCave:: @ 08102B44 + metatiles_bottom 0xAC444, 0x3F80, 1 + metatiles_top 0xADE48, 0x3400, 1 + metatile_types_bottom 0xAF650, 0xFE0, 1 + metatile_types_top 0xAFB8C, 0xD00, 1, 1 + +gAreaMetatiles_WindTribeTower:: @ 08102B74 + metatiles_bottom 0x125100, 0x2EB0, 1 + metatiles_top 0xF7AD8, 0x3FF0, 1 + metatile_types_bottom 0x126040, 0xBAC, 1 + metatile_types_top 0xF8A5C, 0xFFC, 1, 1 + +gAreaMetatiles_WindTribeTowerRoof:: @ 08102BA4 + metatiles_bottom 0x12AAB0, 0xBC0, 1 + metatiles_top 0x12B13C, 0xBC0, 1 + metatile_types_bottom 0x12B784, 0x2F0, 1 + metatile_types_top 0x12B840, 0x2F0, 1, 1 + +gAreaMetatiles_MinishCaves:: @ 08102BD4 + metatiles_bottom 0xB9118, 0x3F80, 1 + metatiles_top 0xBAF54, 0x3F80, 1 + metatile_types_bottom 0xBC0CC, 0xFE0, 1 + metatile_types_top 0xBC570, 0xFE0, 1, 1 + +gAreaMetatiles_CastleGardenMinishHoles:: @ 08102C04 + metatiles_bottom 0xBFB4C, 0x13A8, 1 + metatiles_top 0xC0570, 0x1680, 1 + metatile_types_bottom 0xC1030, 0x4EA, 1 + metatile_types_top 0xC11B8, 0x5A0, 1, 1 + +gAreaMetatiles_EzloCutscene:: @ 08102C34 + metatiles_bottom 0x12EEBC, 0x1A20, 1 + metatiles_top 0xF7AD8, 0x3FF0, 1 + metatile_types_bottom 0x12F564, 0x688, 1 + metatile_types_top 0xF8A5C, 0xFFC, 1, 1 + +gAreaMetatiles_HyruleTownUnderground:: @ 08102C64 + metatiles_bottom 0x1A51B8, 0x3E80, 1 + metatiles_top 0x1A7454, 0x3610, 1 + metatile_types_bottom 0x1A8B10, 0xFA0, 1 + metatile_types_top 0x1A9000, 0xD84, 1, 1 + +gAreaMetatiles_DeepwoodShrine:: @ 08102C94 + metatiles_bottom 0x1B20C4, 0x3B28, 1 + metatiles_top 0x1B4644, 0x3620, 1 + metatile_types_bottom 0x1B6044, 0xECA, 1 + metatile_types_top 0x1B64F8, 0xD88, 1, 1 + +gAreaMetatiles_DeepwoodShrineBoss:: @ 08102CC4 + metatiles_bottom 0x1B9E08, 0x3620, 1 + metatiles_top 0x1BAF34, 0x11F8, 1 + metatile_types_bottom 0x1BB24C, 0xD88, 1 + metatile_types_top 0x1BB4BC, 0x47E, 1, 1 + +gAreaMetatiles_DeepwoodShrineEntry:: @ 08102CF4 + metatiles_bottom 0x1BE520, 0xD08, 1 + metatiles_top 0x1BEB0C, 0x9F8, 1 + metatile_types_bottom 0x1BEF10, 0x342, 1 + metatile_types_top 0x1BEFC0, 0x27E, 1, 1 + +gAreaMetatiles_CaveOfFlames:: @ 08102D24 + metatiles_bottom 0x1CA0C8, 0x3B08, 1 + metatiles_top 0x1CBCF4, 0x3F28, 1 + metatile_types_bottom 0x1CD6F4, 0xEC2, 1 + metatile_types_top 0x1CDB88, 0xFCA, 1, 1 + +gAreaMetatiles_CaveOfFlamesBoss:: @ 08102D54 + metatiles_bottom 0x1D378C, 0x3B08, 1 + metatiles_top 0x1D4B14, 0x3610, 1 + metatile_types_bottom 0x1D5C70, 0xEC2, 1 + metatile_types_top 0x1D5EFC, 0xD84, 1, 1 + +gAreaMetatiles_FortressOfWinds:: @ 08102D84 + metatiles_bottom 0x1E163C, 0x3868, 1 + metatiles_top 0x1E3670, 0x3850, 1 + metatile_types_bottom 0x1E4E8C, 0xE1A, 1 + metatile_types_top 0x1E52DC, 0xE14, 1, 1 + +gAreaMetatiles_FortressOfWindsTop:: @ 08102DB4 + metatiles_bottom 0x1F06E4, 0x1440, 1 + metatiles_top 0x1F11AC, 0x1368, 1 + metatile_types_bottom 0x1F1740, 0x510, 1 + metatile_types_top 0x1F18D4, 0x4DA, 1, 1 + +gAreaMetatiles_InnerMazaal:: @ 08102DE4 + metatiles_bottom 0x1E9E38, 0x3C00, 1 + metatiles_top 0x1EABE0, 0x3E70, 1 + metatile_types_bottom 0x1EBAAC, 0xF00, 1 + metatile_types_top 0x1EBD60, 0xF9C, 1, 1 + +gAreaMetatiles_TempleOfDroplets:: @ 08102E14 + metatiles_bottom 0x1FC4F4, 0x3D68, 1 + metatiles_top 0x1FE6E0, 0x4000, 1 + metatile_types_bottom 0x200A9C, 0xF5A, 1 + metatile_types_top 0x200F70, 0x1000, 1, 1 + +gAreaMetatiles_61:: @ 08102E44 + metatiles_bottom 0x204BD4, 0x600, 1 + metatiles_top 0x20509C, 0x398, 1 + metatile_types_bottom 0x2051BC, 0x180, 1 + metatile_types_top 0x205254, 0xE6, 1, 1 + +gAreaMetatiles_RoyalCrypt:: @ 08102E74 + metatiles_bottom 0x212144, 0x3610, 1 + metatiles_top 0x213D34, 0x3610, 1 + metatile_types_bottom 0x215134, 0xD84, 1 + metatile_types_top 0x2155E0, 0xD84, 1, 1 + +gAreaMetatiles_PalaceOfWinds:: @ 08102EA4 + metatiles_bottom 0x21D230, 0x3620, 1 + metatiles_top 0x21EEA4, 0x3620, 1 + metatile_types_bottom 0x220788, 0xD88, 1 + metatile_types_top 0x220C54, 0xD88, 1, 1 + +gAreaMetatiles_PalaceOfWindsBoss:: @ 08102ED4 + metatiles_top 0x22360C, 0x108, 1 + metatile_types_top 0x223654, 0x42, 1, 1 + +gAreaMetatiles_Sanctuary:: @ 08102EEC + metatiles_bottom 0x2333A4, 0x3620, 1 + metatiles_top 0x2352AC, 0x3620, 1 + metatile_types_bottom 0x2363B0, 0xD88, 1 + metatile_types_top 0x236714, 0xD88, 1, 1 + +gAreaMetatiles_HyruleCastle:: @ 08102F1C + metatiles_bottom 0x23D1B0, 0x37C0, 1 + metatiles_top 0x23EF24, 0x3610, 1 + metatile_types_bottom 0x2403CC, 0xDF0, 1 + metatile_types_top 0x2407F8, 0xD84, 1, 1 + +gAreaMetatiles_SanctuaryEntrance:: @ 08102F4C + metatiles_bottom 0x2460E4, 0x1478, 1 + metatiles_top 0x246C38, 0xFF0, 1 + metatile_types_bottom 0x246FB8, 0x51E, 1 + metatile_types_top 0x247128, 0x3FC, 1, 1 + +gAreaMetatiles_DarkHyruleCastle:: @ 08102F7C + metatiles_bottom 0x24D8CC, 0x3FD8, 1 + metatiles_top 0x25060C, 0x37C0, 1 + metatile_types_bottom 0x252480, 0xFF6, 1 + metatile_types_top 0x252A08, 0xDF0, 1, 1 + +gAreaMetatiles_DarkHyruleCastleOutside:: @ 08102FAC + metatiles_bottom 0x273E74, 0x3340, 1 + metatiles_top 0x275398, 0x1EF0, 1 + metatile_types_bottom 0x275FD4, 0xCD0, 1 + metatile_types_top 0x2762B0, 0x7BC, 1, 1 + +gAreaMetatiles_DarkHyruleCastleBridge:: @ 08102FDC + metatiles_bottom 0x256614, 0x3610, 1 + metatiles_top 0x2573F4, 0x3610, 1 + metatile_types_bottom 0x257D04, 0xD84, 1 + metatile_types_top 0x257F78, 0xD84, 1, 1 + +gAreaMetatiles_VaatisArms:: @ 0810300C + metatiles_bottom 0x263CFC, 0x17C8, 1 + metatiles_top 0x2649C4, 0xBC0, 1 + metatile_types_bottom 0x264D48, 0x5F2, 1 + metatile_types_top 0x264E4C, 0x2F0, 1, 1 + +gAreaMetatiles_Vaati3:: @ 0810303C + metatiles_bottom 0x25C6BC, 0xE80, 1 + metatiles_top 0x25CD74, 0x9B8, 1 + metatile_types_bottom 0x25CF50, 0x3A0, 1 + metatile_types_top 0x25D024, 0x26E, 1, 1 + +gAreaMetatiles_Vaati2:: @ 0810306C + metatiles_bottom 0x2607F0, 0x850, 1 + metatiles_top 0x260C1C, 0x298, 1 + metatile_types_bottom 0x260CBC, 0x214, 1 + metatile_types_top 0x260D38, 0xA6, 1, 1 + +gAreaMetatiles:: @ 0810309C + .4byte gAreaMetatiles_MinishWoods @ 0x0 + .4byte gAreaMetatiles_MinishVillage @ 0x1 + .4byte gAreaMetatiles_HyruleTown @ 0x2 + .4byte gAreaMetatiles_HyruleField @ 0x3 + .4byte gAreaMetatiles_CastorWilds @ 0x4 + .4byte gAreaMetatiles_CastorWilds @ 0x5 + .4byte gAreaMetatiles_MtCrenel @ 0x6 + .4byte gAreaMetatiles_CastleGarden @ 0x7 + .4byte gAreaMetatiles_CloudTops @ 0x8 + .4byte gAreaMetatiles_RoyalValley @ 0x9 + .4byte gAreaMetatiles_MtCrenel @ 0xA + .4byte gAreaMetatiles_LakeHylia @ 0xB + .4byte gAreaMetatiles_MinishWoods @ 0xC + .4byte gAreaMetatiles_Beanstalks @ 0xD + .4byte gAreaMetatiles_MinishWoods @ 0xE + .4byte gAreaMetatiles_HyruleTown @ 0xF + .4byte gAreaMetatiles_MelarisMine @ 0x10 + .4byte gAreaMetatiles_MnishPaths1 @ 0x11 + .4byte gAreaMetatiles_CrenelMinishPaths @ 0x12 + .4byte gAreaMetatiles_HyruleField @ 0x13 + .4byte gAreaMetatiles_MtCrenel @ 0x14 + .4byte gAreaMetatiles_HyruleTown @ 0x15 + .4byte gAreaMetatiles_MtCrenel @ 0x16 + .4byte gAreaMetatiles_CastorWilds @ 0x17 + .4byte gAreaMetatiles_CastorWilds @ 0x18 + .4byte gAreaMetatiles_LakeHylia @ 0x19 + .4byte gAreaMetatiles_MtCrenel @ 0x1A + .4byte gAreaMetatiles_Unused @ 0x1B + .4byte gAreaMetatiles_Unused @ 0x1C + .4byte gAreaMetatiles_HyruleField @ 0x1D + .4byte gAreaMetatiles_MinishWoods @ 0x1E + .4byte gAreaMetatiles_HyruleField @ 0x1F + .4byte gAreaMetatiles_MinishHouseInteriors @ 0x20 + .4byte gAreaMetatiles_HouseInteriors1 @ 0x21 + .4byte gAreaMetatiles_HouseInteriors2 @ 0x22 + .4byte gAreaMetatiles_HouseInteriors3 @ 0x23 + .4byte gAreaMetatiles_TreeInteriors @ 0x24 + .4byte gAreaMetatiles_Dojos @ 0x25 + .4byte gAreaMetatiles_CrenelCaves @ 0x26 + .4byte gAreaMetatiles_MinishCracks @ 0x27 + .4byte gAreaMetatiles_HouseInteriors4 @ 0x28 + .4byte gAreaMetatiles_GreatFairies @ 0x29 + .4byte gAreaMetatiles_CrenelCaves @ 0x2A + .4byte gAreaMetatiles_FortressOfWinds @ 0x2B + .4byte gAreaMetatiles_ArmosInteriors @ 0x2C + .4byte gAreaMetatiles_MinishHouseInteriors @ 0x2D + .4byte gAreaMetatiles_MinishRafters @ 0x2E + .4byte gAreaMetatiles_GoronCave @ 0x2F + .4byte gAreaMetatiles_WindTribeTower @ 0x30 + .4byte gAreaMetatiles_WindTribeTowerRoof @ 0x31 + .4byte gAreaMetatiles_CrenelCaves @ 0x32 + .4byte gAreaMetatiles_CrenelCaves @ 0x33 + .4byte gAreaMetatiles_CrenelCaves @ 0x34 + .4byte gAreaMetatiles_MinishCaves @ 0x35 + .4byte gAreaMetatiles_CastleGardenMinishHoles @ 0x36 + .4byte gAreaMetatiles_CastleGardenMinishHoles @ 0x37 + .4byte gAreaMetatiles_EzloCutscene @ 0x38 + .4byte gAreaMetatiles_Unused @ 0x39 + .4byte gAreaMetatiles_Unused @ 0x3A + .4byte gAreaMetatiles_Unused @ 0x3B + .4byte gAreaMetatiles_Unused @ 0x3C + .4byte gAreaMetatiles_Unused @ 0x3D + .4byte gAreaMetatiles_Unused @ 0x3E + .4byte gAreaMetatiles_Unused @ 0x3F + .4byte gAreaMetatiles_HyruleTownUnderground @ 0x40 + .4byte gAreaMetatiles_HyruleTownUnderground @ 0x41 + .4byte gAreaMetatiles_HyruleTownUnderground @ 0x42 + .4byte gAreaMetatiles_HyruleTownUnderground @ 0x43 + .4byte gAreaMetatiles_HyruleTownUnderground @ 0x44 + .4byte gAreaMetatiles_CrenelCaves @ 0x45 + .4byte gAreaMetatiles_CrenelCaves @ 0x46 + .4byte gAreaMetatiles_CrenelCaves @ 0x47 + .4byte gAreaMetatiles_DeepwoodShrine @ 0x48 + .4byte gAreaMetatiles_DeepwoodShrineBoss @ 0x49 + .4byte gAreaMetatiles_DeepwoodShrineEntry @ 0x4A + .4byte gAreaMetatiles_Unused @ 0x4B + .4byte gAreaMetatiles_Unused @ 0x4C + .4byte gAreaMetatiles_DeepwoodShrine @ 0x4D + .4byte gAreaMetatiles_DeepwoodShrine @ 0x4E + .4byte gAreaMetatiles_DeepwoodShrineBoss @ 0x4F + .4byte gAreaMetatiles_CaveOfFlames @ 0x50 + .4byte gAreaMetatiles_CaveOfFlamesBoss @ 0x51 + .4byte gAreaMetatiles_Unused @ 0x52 + .4byte gAreaMetatiles_Unused @ 0x53 + .4byte gAreaMetatiles_Unused @ 0x54 + .4byte gAreaMetatiles_Unused @ 0x55 + .4byte gAreaMetatiles_CaveOfFlames @ 0x56 + .4byte gAreaMetatiles_CaveOfFlames @ 0x57 + .4byte gAreaMetatiles_FortressOfWinds @ 0x58 + .4byte gAreaMetatiles_FortressOfWindsTop @ 0x59 + .4byte gAreaMetatiles_InnerMazaal @ 0x5A + .4byte gAreaMetatiles_Unused @ 0x5B + .4byte gAreaMetatiles_Unused @ 0x5C + .4byte gAreaMetatiles_Unused @ 0x5D + .4byte gAreaMetatiles_Unused @ 0x5E + .4byte gAreaMetatiles_FortressOfWinds @ 0x5F + .4byte gAreaMetatiles_TempleOfDroplets @ 0x60 + .4byte gAreaMetatiles_61 @ 0x61 + .4byte gAreaMetatiles_TempleOfDroplets @ 0x62 + .4byte gAreaMetatiles_Unused @ 0x63 + .4byte gAreaMetatiles_Unused @ 0x64 + .4byte gAreaMetatiles_Unused @ 0x65 + .4byte gAreaMetatiles_Unused @ 0x66 + .4byte gAreaMetatiles_TempleOfDroplets @ 0x67 + .4byte gAreaMetatiles_RoyalCrypt @ 0x68 + .4byte gAreaMetatiles_Unused @ 0x69 + .4byte gAreaMetatiles_Unused @ 0x6A + .4byte gAreaMetatiles_Unused @ 0x6B + .4byte gAreaMetatiles_Unused @ 0x6C + .4byte gAreaMetatiles_Unused @ 0x6D + .4byte gAreaMetatiles_Unused @ 0x6E + .4byte gAreaMetatiles_RoyalCrypt @ 0x6F + .4byte gAreaMetatiles_PalaceOfWinds @ 0x70 + .4byte gAreaMetatiles_PalaceOfWindsBoss @ 0x71 + .4byte gAreaMetatiles_Unused @ 0x72 + .4byte gAreaMetatiles_Unused @ 0x73 + .4byte gAreaMetatiles_Unused @ 0x74 + .4byte gAreaMetatiles_Unused @ 0x75 + .4byte gAreaMetatiles_Unused @ 0x76 + .4byte gAreaMetatiles_PalaceOfWinds @ 0x77 + .4byte gAreaMetatiles_Sanctuary @ 0x78 + .4byte gAreaMetatiles_Unused @ 0x79 + .4byte gAreaMetatiles_Unused @ 0x7A + .4byte gAreaMetatiles_Unused @ 0x7B + .4byte gAreaMetatiles_Unused @ 0x7C + .4byte gAreaMetatiles_Unused @ 0x7D + .4byte gAreaMetatiles_Unused @ 0x7E + .4byte gAreaMetatiles_Sanctuary @ 0x7F + .4byte gAreaMetatiles_HyruleCastle @ 0x80 + .4byte gAreaMetatiles_SanctuaryEntrance @ 0x81 + .4byte gAreaMetatiles_Unused @ 0x82 + .4byte gAreaMetatiles_Unused @ 0x83 + .4byte gAreaMetatiles_Unused @ 0x84 + .4byte gAreaMetatiles_Unused @ 0x85 + .4byte gAreaMetatiles_Unused @ 0x86 + .4byte gAreaMetatiles_HyruleCastle @ 0x87 + .4byte gAreaMetatiles_DarkHyruleCastle @ 0x88 + .4byte gAreaMetatiles_DarkHyruleCastleOutside @ 0x89 + .4byte gAreaMetatiles_VaatisArms @ 0x8A + .4byte gAreaMetatiles_Vaati3 @ 0x8B + .4byte gAreaMetatiles_Vaati2 @ 0x8C + .4byte gAreaMetatiles_DarkHyruleCastleBridge @ 0x8D + .4byte gAreaMetatiles_Unused @ 0x8E + .4byte gAreaMetatiles_DarkHyruleCastle @ 0x8F diff --git a/data/tileset_headers.s b/data/tileset_headers.s index 8c2d9100..b28028c6 100755 --- a/data/tileset_headers.s +++ b/data/tileset_headers.s @@ -5,6 +5,7 @@ .align 2 gAreaTileset_Unused_0:: @ 08100CE4 +gAreaMetatiles_Unused:: tileset_palette_set 0, 1 gAreaTilesets_Unused:: @ 08100CF0 @@ -795,7 +796,7 @@ gAreaTileset_CastorDarknut_0:: @ 08101FA8 tileset_tiles 0x1DF4B4, 0x6008000, 0x4000, 1 tileset_palette_set 37, 1 -gAreaTilesets_CastorDarknut:: @ 08101FD8 +gAreaTilesets_FortressOfWinds:: @ 08101FD8 .4byte gAreaTileset_CastorDarknut_0 gAreaTileset_FortressOfWindsTop_0:: @ 08101FDC @@ -999,147 +1000,147 @@ gAreaTilesets_RoyalValleyGraves:: @ 08102468 .4byte gAreaTileset_RoyalValleyGraves_0 gAreaTilesets:: @ 0810246C - .4byte gAreaTilesets_MinishWoods - .4byte gAreaTilesets_MinishVillage - .4byte gAreaTilesets_HyruleTown - .4byte gAreaTilesets_HyruleField - .4byte gAreaTilesets_CastorWilds - .4byte gAreaTilesets_Ruins - .4byte gAreaTilesets_MtCrenel - .4byte gAreaTilesets_CastleGarden - .4byte gAreaTilesets_CloudTops - .4byte gAreaTilesets_RoyalValley - .4byte gAreaTilesets_VeilFalls - .4byte gAreaTilesets_LakeHylia - .4byte gAreaTilesets_LakeWoodsCave - .4byte gAreaTilesets_Beanstalks - .4byte gAreaTilesets_MinishWoods - .4byte gAreaTilesets_HyruleDigCaves - .4byte gAreaTilesets_MelarisMine - .4byte gAreaTilesets_MinishPaths1 - .4byte gAreaTilesets_CrenelMinishPaths - .4byte gAreaTilesets_DigCaves1 - .4byte gAreaTilesets_CrenelDigCave - .4byte gAreaTilesets_FestivalTown - .4byte gAreaTilesets_VeilFallsDigCave - .4byte gAreaTilesets_CastorWildsDigCave - .4byte gAreaTilesets_OuterFortressOfWinds - .4byte gAreaTilesets_HyliaDigCaves - .4byte gAreaTilesets_VeilFallsTop - .4byte gAreaTilesets_Unused - .4byte gAreaTilesets_Unused - .4byte gAreaTilesets_Unused - .4byte gAreaTilesets_Unused - .4byte gAreaTilesets_Unused - .4byte gAreaTilesets_MinishHouseInteriors - .4byte gAreaTilesets_HouseInteriors1 - .4byte gAreaTilesets_HouseInteriors2 - .4byte gAreaTilesets_HouseInteriors3 - .4byte gAreaTilesets_TreeInteriors - .4byte gAreaTilesets_Dojos - .4byte gAreaTilesets_CrenelCaves - .4byte gAreaTilesets_MinishCracks - .4byte gAreaTilesets_HouseInteriors4 - .4byte gAreaTilesets_GreatFairies - .4byte gAreaTilesets_CastorCaves - .4byte gAreaTilesets_CastorDarknut - .4byte gAreaTilesets_ArmosInteriors - .4byte gAreaTilesets_TownMinishHoles - .4byte gAreaTilesets_MinishRafters - .4byte gAreaTilesets_GoronCave - .4byte gAreaTilesets_WindTribeTower - .4byte gAreaTilesets_WindTribeTowerRoof - .4byte gAreaTilesets_Caves - .4byte gAreaTilesets_VeilFallsCaves - .4byte gAreaTilesets_RoyalValleyGraves - .4byte gAreaTilesets_MinishCaves - .4byte gAreaTilesets_CastleGardenMinishHoles - .4byte gAreaTilesets_37 - .4byte gAreaTilesets_EzloCutscene - .4byte gAreaTilesets_Unused - .4byte gAreaTilesets_Unused - .4byte gAreaTilesets_Unused - .4byte gAreaTilesets_Unused - .4byte gAreaTilesets_Unused - .4byte gAreaTilesets_Unused - .4byte gAreaTilesets_Unused - .4byte gAreaTilesets_40 - .4byte gAreaTilesets_HyruleTownUnderground - .4byte gAreaTilesets_40 - .4byte gAreaTilesets_40 - .4byte gAreaTilesets_SimonsSimulation - .4byte gAreaTilesets_45 - .4byte gAreaTilesets_45 - .4byte gAreaTilesets_45 - .4byte gAreaTilesets_DeepwoodShrine - .4byte gAreaTilesets_DeepwoodShrineBoss - .4byte gAreaTilesets_DeepwoodShrineEntry - .4byte gAreaTilesets_Unused - .4byte gAreaTilesets_Unused - .4byte gAreaTilesets_DeepwoodShrine - .4byte gAreaTilesets_DeepwoodShrine - .4byte gAreaTilesets_DeepwoodShrineBoss - .4byte gAreaTilesets_CaveOfFlames - .4byte gAreaTilesets_CaveOfFlamesBoss - .4byte gAreaTilesets_Unused - .4byte gAreaTilesets_Unused - .4byte gAreaTilesets_Unused - .4byte gAreaTilesets_Unused - .4byte gAreaTilesets_CaveOfFlames - .4byte gAreaTilesets_CaveOfFlames - .4byte gAreaTilesets_CastorDarknut - .4byte gAreaTilesets_FortressOfWindsTop - .4byte gAreaTilesets_InnerMazaal - .4byte gAreaTilesets_Unused - .4byte gAreaTilesets_Unused - .4byte gAreaTilesets_Unused - .4byte gAreaTilesets_Unused - .4byte gAreaTilesets_CastorDarknut - .4byte gAreaTilesets_TempleOfDroplets - .4byte gAreaTilesets_61 - .4byte gAreaTilesets_HyruleTownMinishCaves - .4byte gAreaTilesets_Unused - .4byte gAreaTilesets_Unused - .4byte gAreaTilesets_Unused - .4byte gAreaTilesets_Unused - .4byte gAreaTilesets_TempleOfDroplets - .4byte gAreaTilesets_RoyalCrypt - .4byte gAreaTilesets_Unused - .4byte gAreaTilesets_Unused - .4byte gAreaTilesets_Unused - .4byte gAreaTilesets_Unused - .4byte gAreaTilesets_Unused - .4byte gAreaTilesets_Unused - .4byte gAreaTilesets_RoyalCrypt - .4byte gAreaTilesets_PalaceOfWinds - .4byte gAreaTilesets_PalaceOfWindsBoss - .4byte gAreaTilesets_Unused - .4byte gAreaTilesets_Unused - .4byte gAreaTilesets_Unused - .4byte gAreaTilesets_Unused - .4byte gAreaTilesets_Unused - .4byte gAreaTilesets_PalaceOfWinds - .4byte gAreaTilesets_Sanctuary - .4byte gAreaTilesets_Unused - .4byte gAreaTilesets_Unused - .4byte gAreaTilesets_Unused - .4byte gAreaTilesets_Unused - .4byte gAreaTilesets_Unused - .4byte gAreaTilesets_Unused - .4byte gAreaTilesets_Sanctuary - .4byte gAreaTilesets_HyruleCastle - .4byte gAreaTilesets_SanctuaryEntrance - .4byte gAreaTilesets_Unused - .4byte gAreaTilesets_Unused - .4byte gAreaTilesets_Unused - .4byte gAreaTilesets_Unused - .4byte gAreaTilesets_Unused - .4byte gAreaTilesets_HyruleCastle - .4byte gAreaTilesets_DarkHyruleCastle - .4byte gAreaTilesets_DarkHyruleCastleOutside - .4byte gAreaTilesets_VaatisArms - .4byte gAreaTilesets_Vaati3 - .4byte gAreaTilesets_Vaati2 - .4byte gAreaTilesets_DarkHyruleCastleBridge - .4byte gAreaTilesets_Unused - .4byte gAreaTilesets_DarkHyruleCastle + .4byte gAreaTilesets_MinishWoods @ 0x0 + .4byte gAreaTilesets_MinishVillage @ 0x1 + .4byte gAreaTilesets_HyruleTown @ 0x2 + .4byte gAreaTilesets_HyruleField @ 0x3 + .4byte gAreaTilesets_CastorWilds @ 0x4 + .4byte gAreaTilesets_Ruins @ 0x5 + .4byte gAreaTilesets_MtCrenel @ 0x6 + .4byte gAreaTilesets_CastleGarden @ 0x7 + .4byte gAreaTilesets_CloudTops @ 0x8 + .4byte gAreaTilesets_RoyalValley @ 0x9 + .4byte gAreaTilesets_VeilFalls @ 0xA + .4byte gAreaTilesets_LakeHylia @ 0xB + .4byte gAreaTilesets_LakeWoodsCave @ 0xC + .4byte gAreaTilesets_Beanstalks @ 0xD + .4byte gAreaTilesets_MinishWoods @ 0xE + .4byte gAreaTilesets_HyruleDigCaves @ 0xF + .4byte gAreaTilesets_MelarisMine @ 0x10 + .4byte gAreaTilesets_MinishPaths1 @ 0x11 + .4byte gAreaTilesets_CrenelMinishPaths @ 0x12 + .4byte gAreaTilesets_DigCaves1 @ 0x13 + .4byte gAreaTilesets_CrenelDigCave @ 0x14 + .4byte gAreaTilesets_FestivalTown @ 0x15 + .4byte gAreaTilesets_VeilFallsDigCave @ 0x16 + .4byte gAreaTilesets_CastorWildsDigCave @ 0x17 + .4byte gAreaTilesets_OuterFortressOfWinds @ 0x18 + .4byte gAreaTilesets_HyliaDigCaves @ 0x19 + .4byte gAreaTilesets_VeilFallsTop @ 0x1A + .4byte gAreaTilesets_Unused @ 0x1B + .4byte gAreaTilesets_Unused @ 0x1C + .4byte gAreaTilesets_Unused @ 0x1D + .4byte gAreaTilesets_Unused @ 0x1E + .4byte gAreaTilesets_Unused @ 0x1F + .4byte gAreaTilesets_MinishHouseInteriors @ 0x20 + .4byte gAreaTilesets_HouseInteriors1 @ 0x21 + .4byte gAreaTilesets_HouseInteriors2 @ 0x22 + .4byte gAreaTilesets_HouseInteriors3 @ 0x23 + .4byte gAreaTilesets_TreeInteriors @ 0x24 + .4byte gAreaTilesets_Dojos @ 0x25 + .4byte gAreaTilesets_CrenelCaves @ 0x26 + .4byte gAreaTilesets_MinishCracks @ 0x27 + .4byte gAreaTilesets_HouseInteriors4 @ 0x28 + .4byte gAreaTilesets_GreatFairies @ 0x29 + .4byte gAreaTilesets_CastorCaves @ 0x2A + .4byte gAreaTilesets_FortressOfWinds @ 0x2B + .4byte gAreaTilesets_ArmosInteriors @ 0x2C + .4byte gAreaTilesets_TownMinishHoles @ 0x2D + .4byte gAreaTilesets_MinishRafters @ 0x2E + .4byte gAreaTilesets_GoronCave @ 0x2F + .4byte gAreaTilesets_WindTribeTower @ 0x30 + .4byte gAreaTilesets_WindTribeTowerRoof @ 0x31 + .4byte gAreaTilesets_Caves @ 0x32 + .4byte gAreaTilesets_VeilFallsCaves @ 0x33 + .4byte gAreaTilesets_RoyalValleyGraves @ 0x34 + .4byte gAreaTilesets_MinishCaves @ 0x35 + .4byte gAreaTilesets_CastleGardenMinishHoles @ 0x36 + .4byte gAreaTilesets_37 @ 0x37 + .4byte gAreaTilesets_EzloCutscene @ 0x38 + .4byte gAreaTilesets_Unused @ 0x39 + .4byte gAreaTilesets_Unused @ 0x3A + .4byte gAreaTilesets_Unused @ 0x3B + .4byte gAreaTilesets_Unused @ 0x3C + .4byte gAreaTilesets_Unused @ 0x3D + .4byte gAreaTilesets_Unused @ 0x3E + .4byte gAreaTilesets_Unused @ 0x3F + .4byte gAreaTilesets_40 @ 0x40 + .4byte gAreaTilesets_HyruleTownUnderground @ 0x41 + .4byte gAreaTilesets_40 @ 0x42 + .4byte gAreaTilesets_40 @ 0x43 + .4byte gAreaTilesets_SimonsSimulation @ 0x44 + .4byte gAreaTilesets_45 @ 0x45 + .4byte gAreaTilesets_45 @ 0x46 + .4byte gAreaTilesets_45 @ 0x47 + .4byte gAreaTilesets_DeepwoodShrine @ 0x48 + .4byte gAreaTilesets_DeepwoodShrineBoss @ 0x49 + .4byte gAreaTilesets_DeepwoodShrineEntry @ 0x4A + .4byte gAreaTilesets_Unused @ 0x4B + .4byte gAreaTilesets_Unused @ 0x4C + .4byte gAreaTilesets_DeepwoodShrine @ 0x4D + .4byte gAreaTilesets_DeepwoodShrine @ 0x4E + .4byte gAreaTilesets_DeepwoodShrineBoss @ 0x4F + .4byte gAreaTilesets_CaveOfFlames @ 0x50 + .4byte gAreaTilesets_CaveOfFlamesBoss @ 0x51 + .4byte gAreaTilesets_Unused @ 0x52 + .4byte gAreaTilesets_Unused @ 0x53 + .4byte gAreaTilesets_Unused @ 0x54 + .4byte gAreaTilesets_Unused @ 0x55 + .4byte gAreaTilesets_CaveOfFlames @ 0x56 + .4byte gAreaTilesets_CaveOfFlames @ 0x57 + .4byte gAreaTilesets_FortressOfWinds @ 0x58 + .4byte gAreaTilesets_FortressOfWindsTop @ 0x59 + .4byte gAreaTilesets_InnerMazaal @ 0x5A + .4byte gAreaTilesets_Unused @ 0x5B + .4byte gAreaTilesets_Unused @ 0x5C + .4byte gAreaTilesets_Unused @ 0x5D + .4byte gAreaTilesets_Unused @ 0x5E + .4byte gAreaTilesets_FortressOfWinds @ 0x5F + .4byte gAreaTilesets_TempleOfDroplets @ 0x60 + .4byte gAreaTilesets_61 @ 0x61 + .4byte gAreaTilesets_HyruleTownMinishCaves @ 0x62 + .4byte gAreaTilesets_Unused @ 0x63 + .4byte gAreaTilesets_Unused @ 0x64 + .4byte gAreaTilesets_Unused @ 0x65 + .4byte gAreaTilesets_Unused @ 0x66 + .4byte gAreaTilesets_TempleOfDroplets @ 0x67 + .4byte gAreaTilesets_RoyalCrypt @ 0x68 + .4byte gAreaTilesets_Unused @ 0x69 + .4byte gAreaTilesets_Unused @ 0x6A + .4byte gAreaTilesets_Unused @ 0x6B + .4byte gAreaTilesets_Unused @ 0x6C + .4byte gAreaTilesets_Unused @ 0x6D + .4byte gAreaTilesets_Unused @ 0x6E + .4byte gAreaTilesets_RoyalCrypt @ 0x6F + .4byte gAreaTilesets_PalaceOfWinds @ 0x70 + .4byte gAreaTilesets_PalaceOfWindsBoss @ 0x71 + .4byte gAreaTilesets_Unused @ 0x72 + .4byte gAreaTilesets_Unused @ 0x73 + .4byte gAreaTilesets_Unused @ 0x74 + .4byte gAreaTilesets_Unused @ 0x75 + .4byte gAreaTilesets_Unused @ 0x76 + .4byte gAreaTilesets_PalaceOfWinds @ 0x77 + .4byte gAreaTilesets_Sanctuary @ 0x78 + .4byte gAreaTilesets_Unused @ 0x79 + .4byte gAreaTilesets_Unused @ 0x7A + .4byte gAreaTilesets_Unused @ 0x7B + .4byte gAreaTilesets_Unused @ 0x7C + .4byte gAreaTilesets_Unused @ 0x7D + .4byte gAreaTilesets_Unused @ 0x7E + .4byte gAreaTilesets_Sanctuary @ 0x7F + .4byte gAreaTilesets_HyruleCastle @ 0x80 + .4byte gAreaTilesets_SanctuaryEntrance @ 0x81 + .4byte gAreaTilesets_Unused @ 0x82 + .4byte gAreaTilesets_Unused @ 0x83 + .4byte gAreaTilesets_Unused @ 0x84 + .4byte gAreaTilesets_Unused @ 0x85 + .4byte gAreaTilesets_Unused @ 0x86 + .4byte gAreaTilesets_HyruleCastle @ 0x87 + .4byte gAreaTilesets_DarkHyruleCastle @ 0x88 + .4byte gAreaTilesets_DarkHyruleCastleOutside @ 0x89 + .4byte gAreaTilesets_VaatisArms @ 0x8A + .4byte gAreaTilesets_Vaati3 @ 0x8B + .4byte gAreaTilesets_Vaati2 @ 0x8C + .4byte gAreaTilesets_DarkHyruleCastleBridge @ 0x8D + .4byte gAreaTilesets_Unused @ 0x8E + .4byte gAreaTilesets_DarkHyruleCastle @ 0x8F diff --git a/linker.ld b/linker.ld index af09560d..1441a473 100644 --- a/linker.ld +++ b/linker.ld @@ -915,7 +915,8 @@ SECTIONS { src/mainLoop.o(.rodata); data/data_08100CD4.o(.rodata); data/tileset_headers.o(.rodata); - data/data_081026AC.o(.rodata); + data/metatile_headers.o(.rodata); + data/data_081032DC.o(.rodata); src/manager/managerB.o(.rodata); data/data_0810821C.o(.rodata); src/item.o(.rodata);