From c28018843601b99907ab79ef3fd9e689b078e384 Mon Sep 17 00:00:00 2001 From: octorock <79596758+octorock@users.noreply.github.com> Date: Wed, 21 Dec 2022 23:40:27 +0100 Subject: [PATCH] Fix paths --- asm/macros/scripts.inc | 10 +- asm/object/evilSpirit.s | 6 +- asm/src/code_080043E8.s | 4 +- assets/map.json | 684 +++++++++--------- data/map/map_data.s | 670 ++++++++--------- .../script_CutsceneOrchestrator.inc | 2 +- .../script_PlayerAtDarknutFight.inc | 2 +- ...ceneOrchestratorGreatWhirlwindRevealed.inc | 2 +- .../cloudTops/script_Npc4EFirstCloud.inc | 2 +- .../cloudTops/script_Npc4EKinstoneFused.inc | 2 +- .../cloudTops/script_PlayerAtSiroc.inc | 2 +- .../cloudTops/script_WindTribespeople3.inc | 2 +- ...indTribespeopleGreatWhirlwindRevealed1.inc | 2 +- ...indTribespeopleGreatWhirlwindRevealed2.inc | 4 +- data/scripts/cutscene/ezlo/script_EzloCap.inc | 2 +- .../ezlo/script_PlayerDefeatedOctoroks.inc | 2 +- .../intro/script_IntroCameraTarget.inc | 2 +- .../intro/script_PlayerMoveToSmith.inc | 6 +- .../cutscene/intro/script_SmithIntro.inc | 2 +- .../cutscene/intro/script_SmithIntro2.inc | 6 +- .../cutscene/intro/script_ZeldaIntro.inc | 2 +- .../intro/script_ZeldaLeaveLinksHouse.inc | 6 +- .../intro/script_ZeldaMoveToLinksHouse.inc | 20 +- .../intro/script_ZeldaTalkToSmith.inc | 4 +- .../introAssembly/script_PlayerEnters.inc | 4 +- .../introAssembly/script_SmithAtAssembly.inc | 2 +- .../introBusinessScrub/script_08015B14.inc | 2 +- .../script_PlayerIntroBusinessScrub1.inc | 2 +- .../script_PlayerIntroBusinessScrub2.inc | 2 +- .../script_PlayerIntroBusinessScrub3.inc | 2 +- .../script_ZeldaIntroBusinessScrub.inc | 6 +- .../introCeremony/script_08011890.inc | 2 +- .../introCeremony/script_GuardBottomRight.inc | 4 +- .../script_GuardCarryingChest.inc | 4 +- .../introCeremony/script_GuardTopLeft.inc | 6 +- .../introCeremony/script_GuardTopRight.inc | 6 +- .../script_KingDaltusIntroCeremony.inc | 2 +- .../script_PlayerIntroCastle.inc | 2 +- .../script_PlayerProtectingZelda.inc | 2 +- .../introCeremony/script_VaatiDarkMagic.inc | 4 +- .../script_VaatiIntroCeremony.inc | 6 +- .../introCeremony/script_ZeldaIntroCastle.inc | 8 +- .../introTown/script_Npc4EIntroCastle.inc | 2 +- .../introTown/script_PlayerIntro2.inc | 2 +- .../introTown/script_PlayerIntro3.inc | 2 +- .../introTown/script_PlayerIntro4.inc | 2 +- .../introTown/script_PlayerIntro5.inc | 2 +- .../introTown/script_ZeldaIntroTown.inc | 12 +- .../script_HurdyGurdyManFirstKinstone.inc | 6 +- .../kinstones/script_KidKinstone1.inc | 8 +- .../kinstones/script_KidKinstone2.inc | 6 +- .../kinstones/script_KidKinstone3.inc | 6 +- .../script_PlayerAtFirstKinstone.inc | 2 +- .../minishVillage/script_ForestMinish5.inc | 6 +- .../minishVillage/script_ForestMinish6.inc | 6 +- .../minishVillage/script_ForestMinish7.inc | 6 +- .../minishVillage/script_ForestMinish8.inc | 6 +- .../minishVillage/script_ForestMinish9.inc | 6 +- .../script_PlayerAtVillageIntro.inc | 4 +- .../script_CutsceneMiscObjectDarkMagic.inc | 4 +- .../script_CutsceneMiscObjectMinishCap.inc | 2 +- .../script_EzloCapExplainingOriginStory.inc | 2 +- .../originStory/script_MinishEzlo.inc | 4 +- .../script_PlayerAtVaatisAppearance.inc | 2 +- .../script_PlayerDefeatedMoblins.inc | 2 +- .../script_PlayerTryToFollowVaati.inc | 2 +- ...cript_CutsceneMiscObjectMinishCapOutro.inc | 2 +- .../cutscene/outro/script_EzloCapOutro.inc | 2 +- .../outro/script_MinishEzloGoodbye.inc | 6 +- .../cutscene/outro/script_PlayerAtEzlo.inc | 2 +- .../cutscene/reveal/script_08013494.inc | 2 +- .../reveal/script_PlayerAtPicture.inc | 2 +- .../takeover/script_PlayerAtTakeover.inc | 2 +- data/scripts/dhc/script_GuardStone2.inc | 4 +- .../dhc/script_PlayerCastleCollapsing.inc | 2 +- .../scripts/dhc/script_PlayerCastleEscape.inc | 2 +- .../scripts/dhc/script_PlayerRescuedZelda.inc | 2 +- data/scripts/dhc/script_PlayerV2Defeated.inc | 2 +- .../dhc/script_ZeldaAfterDefeatingV2.inc | 4 +- data/scripts/dhc/script_ZeldaCastleEscape.inc | 2 +- data/scripts/fow/script_PlayerAtMazaal.inc | 2 +- .../fow/script_PlayerDefeatedMazaal.inc | 2 +- ...ript_CutsceneMiscObjectKingsGravestone.inc | 2 +- .../script_KeyStealingTakkuriFirstCrow.inc | 2 +- .../script_PlayerAtGraveyardHouseDoor.inc | 2 +- .../graveyard/script_PlayerAtKingGustav.inc | 2 +- data/scripts/hyruleTown/script_CafeGuy.inc | 4 +- data/scripts/hyruleTown/script_Carlov.inc | 2 +- data/scripts/hyruleTown/script_GormanCats.inc | 2 +- .../hyruleTown/script_GormanSecondHouse.inc | 2 +- data/scripts/hyruleTown/script_GuardWest.inc | 2 +- data/scripts/hyruleTown/script_Kid3.inc | 20 +- data/scripts/hyruleTown/script_KidInn.inc | 10 +- .../hyruleTown/script_PlayerAtCarlov.inc | 2 +- .../scripts/hyruleTown/script_PlayerAtRem.inc | 2 +- .../hyruleTown/script_PlayerStepOnTrap.inc | 2 +- ...ipt_PlayerWhenLeavingCarlovAlreadyPaid.inc | 2 +- data/scripts/hyruleTown/script_Postman.inc | 2 +- .../script_SturgeonAllBooksCollected.inc | 12 +- .../scripts/hyruleTown/script_TownMinish3.inc | 4 +- .../scripts/hyruleTown/script_TownMinish6.inc | 4 +- .../script_BigGoronKinstone4.inc | 10 +- .../script_BigGoronKinstone5.inc | 2 +- .../script_GormanFirstAppearance.inc | 4 +- .../kinstoneFusion/script_Goron1Kinstone2.inc | 2 +- .../kinstoneFusion/script_Goron2Kinstone2.inc | 4 +- .../kinstoneFusion/script_Goron2Kinstone4.inc | 2 +- .../kinstoneFusion/script_Goron2Kinstone6.inc | 2 +- .../kinstoneFusion/script_Goron3Kinstone3.inc | 2 +- .../kinstoneFusion/script_Goron4Kinstone4.inc | 8 +- .../kinstoneFusion/script_Goron5Kinstone5.inc | 6 +- .../script_Goron6Kindstone6.inc | 8 +- .../script_GoronMerchantArriving.inc | 4 +- .../script_KinstoneSparkKinstoneSpark.inc | 2 +- ...t_KinstoneSparkKinstoneSparkFromBottom.inc | 4 +- ...script_KinstoneSparkKinstoneSparkGoron.inc | 4 +- ...instoneSparkKinstoneSparkGoronMerchang.inc | 4 +- .../scripts/lakeHylia/script_ShopwellsDog.inc | 2 +- .../lonLonRanch/script_MalonLostKey.inc | 4 +- .../lonLonRanch/script_PlayerGiveKey.inc | 2 +- .../lonLonRanch/script_TalonGotKey.inc | 8 +- .../lonLonRanch/script_TalonLostKey.inc | 4 +- data/scripts/minishWoods/script_Gentari.inc | 2 +- .../minishWoods/script_PlayerAtBombMinish.inc | 2 +- .../minishWoods/script_PlayerAtFestari.inc | 2 +- .../minishWoods/script_PlayerAtGentari.inc | 2 +- .../mtCrenel/script_MountainMinish4.inc | 2 +- .../mtCrenel/script_MountainMinish5.inc | 24 +- .../mtCrenel/script_PlayerAtMelari.inc | 2 +- .../script_PlayerPlaceBrokenSword.inc | 4 +- .../script_CutsceneOrchestratorFixBridge.inc | 4 +- data/scripts/npc/script_08012C48.inc | 2 +- data/scripts/npc/script_ForestMinish17.inc | 12 +- .../npc/script_PlayerAtBladeBrothers.inc | 2 +- ...CutsceneMiscObjectEarthElementFloating.inc | 2 +- ..._CutsceneMiscObjectFireElementFloating.inc | 2 +- ...CutsceneMiscObjectWaterElementFloating.inc | 2 +- ..._CutsceneMiscObjectWindElementFloating.inc | 2 +- .../sanctuary/script_PlayerAtPedestal.inc | 2 +- .../script_PlayerAtSanctuaryEntrance.inc | 2 +- .../sanctuary/script_PlayerGetElement.inc | 2 +- .../script_PlayerTextBoardAppears.inc | 2 +- data/scripts/unused/script_08016482.inc | 10 +- .../veilFalls/script_BigGoronHiding.inc | 4 +- .../script_CutsceneMiscObjectMirrorShield.inc | 2 +- .../script_CutsceneMiscObjectVeilFallsTop.inc | 2 +- .../windRuins/script_PlayerAtTextboard.inc | 2 +- include/asm.h | 2 +- include/functions.h | 2 +- include/room.h | 4 +- include/script.h | 2 +- linker.ld | 2 +- src/code_08049CD4.c | 34 +- src/enemy/doorMimic.c | 2 +- src/enemy/enemy64.c | 6 +- src/enemy/gyorgMale.c | 24 +- src/enemy/octorokBoss.c | 14 +- src/enemy/treeItem.c | 4 +- src/enemyUtils.c | 4 +- src/npc/bigGoron.c | 4 +- src/npc/ezlo.c | 2 +- src/npc/gorman.c | 4 +- src/npc/kid.c | 2 +- src/npc/npc5.c | 2 +- src/npc/postman.c | 2 +- src/object/cutsceneMiscObject.c | 2 +- src/object/fileScreenObjects.c | 2 +- src/object/fourElements.c | 2 +- src/object/keyStealingTakkuri.c | 4 +- src/object/kinstoneSpark.c | 2 +- src/object/objectA2.c | 2 +- src/object/octorokBossObject.c | 4 +- src/object/specialFx.c | 2 +- src/playerUtils.c | 1 + src/room.c | 16 +- src/script.c | 55 +- src/vram.c | 26 +- .../src/asset_processor/assets/dungeonmap.cpp | 2 +- tools/src/asset_processor/main.cpp | 2 +- 179 files changed, 1080 insertions(+), 1076 deletions(-) diff --git a/asm/macros/scripts.inc b/asm/macros/scripts.inc index eabc99cb..d1c48d25 100644 --- a/asm/macros/scripts.inc +++ b/asm/macros/scripts.inc @@ -635,27 +635,27 @@ .2byte \c .endm -.macro _0807EDD4 a:req, b:req +.macro MoveTo a:req, b:req .2byte 0x0c73 .2byte \a .2byte \b .endm -.macro _0807EE04 a:req, b:req +.macro LookAt a:req, b:req .2byte 0x0c74 .2byte \a .2byte \b .endm -.macro _0807EE30 +.macro MoveTowardsTarget .2byte 0x0475 .endm -.macro _0807EEB4 +.macro MoveToPlayer .2byte 0x0476 .endm -.macro _0807EEF4 a:req, b:req +.macro MoveToOffset a:req, b:req .2byte 0x0c77 .2byte \a .2byte \b diff --git a/asm/object/evilSpirit.s b/asm/object/evilSpirit.s index 6998684b..8b0dfec6 100644 --- a/asm/object/evilSpirit.s +++ b/asm/object/evilSpirit.s @@ -163,7 +163,7 @@ sub_08086370: @ 0x08086370 ldr r1, [r2, #0x30] ldr r2, [r6, #0x30] subs r1, r1, r2 - bl sub_080045DA + bl CalculateDirectionFromOffsets movs r1, #0x80 eors r0, r1 strb r0, [r6, #0x15] @@ -179,7 +179,7 @@ _080863B6: ldr r1, [r2, #0x30] ldr r2, [r6, #0x30] subs r1, r1, r2 - bl sub_080045DA + bl CalculateDirectionFromOffsets adds r1, r0, #0 movs r0, #0x80 eors r1, r0 @@ -432,7 +432,7 @@ sub_08086594: @ 0x08086594 ldr r1, [r1] ldr r2, [r7, #0x30] subs r1, r1, r2 - bl sub_080045DA + bl CalculateDirectionFromOffsets strb r0, [r7, #0x15] adds r0, r7, #0 adds r0, #0x41 diff --git a/asm/src/code_080043E8.s b/asm/src/code_080043E8.s index 0216f977..5fce0906 100644 --- a/asm/src/code_080043E8.s +++ b/asm/src/code_080043E8.s @@ -286,8 +286,8 @@ CalculateDirectionTo: @ 0x080045D4 ldr r3, _08004694 @ =ram_CalcCollisionDirection bx r3 - non_word_aligned_thumb_func_start sub_080045DA -sub_080045DA: @ 0x080045DA + non_word_aligned_thumb_func_start CalculateDirectionFromOffsets +CalculateDirectionFromOffsets: @ 0x080045DA push {r0, r1, r4, r5, r6, lr} movs r6, #0x40 cmp r0, #0 diff --git a/assets/map.json b/assets/map.json index 57167bfa..e03f4f70 100644 --- a/assets/map.json +++ b/assets/map.json @@ -36,25 +36,25 @@ "type": "tileset" }, { - "path": "maps/areas/000_MinishWoods/metatilesets/gAreaMetaTileset_MinishWoods_bottom.bin.lz", + "path": "maps/areas/000_MinishWoods/metatileset/gAreaMetaTileset_MinishWoods_bottom.bin.lz", "start": 3326440, "size": 7036, "type": "metatileset" }, { - "path": "maps/areas/000_MinishWoods/metatilesets/gAreaMetaTileset_MinishWoods_top.bin.lz", + "path": "maps/areas/000_MinishWoods/metatileset/gAreaMetaTileset_MinishWoods_top.bin.lz", "start": 3333476, "size": 3468, "type": "metatileset" }, { - "path": "maps/areas/000_MinishWoods/metatilesets/gAreaMetaTilesetTypes_MinishWoods_bottom.bin.lz", + "path": "maps/areas/000_MinishWoods/metatileset/gAreaMetaTilesetTypes_MinishWoods_bottom.bin.lz", "start": 3336944, "size": 1072, "type": "metatileset_types" }, { - "path": "maps/areas/000_MinishWoods/metatilesets/gAreaMetaTilesetTypes_MinishWoods_top.bin.lz", + "path": "maps/areas/000_MinishWoods/metatileset/gAreaMetaTilesetTypes_MinishWoods_top.bin.lz", "start": 3338016, "size": 708, "type": "metatileset_types" @@ -97,25 +97,25 @@ "type": "tileset" }, { - "path": "maps/areas/011_LakeHylia/metatilesets/gAreaMetaTileset_LakeHylia_bottom.bin.lz", + "path": "maps/areas/011_LakeHylia/metatileset/gAreaMetaTileset_LakeHylia_bottom.bin.lz", "start": 3372312, "size": 6104, "type": "metatileset" }, { - "path": "maps/areas/011_LakeHylia/metatilesets/gAreaMetaTileset_LakeHylia_top.bin.lz", + "path": "maps/areas/011_LakeHylia/metatileset/gAreaMetaTileset_LakeHylia_top.bin.lz", "start": 3378416, "size": 3584, "type": "metatileset" }, { - "path": "maps/areas/011_LakeHylia/metatilesets/gAreaMetaTilesetTypes_LakeHylia_bottom.bin.lz", + "path": "maps/areas/011_LakeHylia/metatileset/gAreaMetaTilesetTypes_LakeHylia_bottom.bin.lz", "start": 3382000, "size": 1144, "type": "metatileset_types" }, { - "path": "maps/areas/011_LakeHylia/metatilesets/gAreaMetaTilesetTypes_LakeHylia_top.bin.lz", + "path": "maps/areas/011_LakeHylia/metatileset/gAreaMetaTilesetTypes_LakeHylia_top.bin.lz", "start": 3383144, "size": 728, "type": "metatileset_types" @@ -170,25 +170,25 @@ "type": "tileset" }, { - "path": "maps/areas/004_CastorWilds/metatilesets/gAreaMetaTileset_CastorWilds_bottom.bin.lz", + "path": "maps/areas/004_CastorWilds/metatileset/gAreaMetaTileset_CastorWilds_bottom.bin.lz", "start": 3416260, "size": 7472, "type": "metatileset" }, { - "path": "maps/areas/004_CastorWilds/metatilesets/gAreaMetaTileset_CastorWilds_top.bin.lz", + "path": "maps/areas/004_CastorWilds/metatileset/gAreaMetaTileset_CastorWilds_top.bin.lz", "start": 3423732, "size": 3636, "type": "metatileset" }, { - "path": "maps/areas/004_CastorWilds/metatilesets/gAreaMetaTilesetTypes_CastorWilds_bottom.bin.lz", + "path": "maps/areas/004_CastorWilds/metatileset/gAreaMetaTilesetTypes_CastorWilds_bottom.bin.lz", "start": 3427368, "size": 1256, "type": "metatileset_types" }, { - "path": "maps/areas/004_CastorWilds/metatilesets/gAreaMetaTilesetTypes_CastorWilds_top.bin.lz", + "path": "maps/areas/004_CastorWilds/metatileset/gAreaMetaTilesetTypes_CastorWilds_top.bin.lz", "start": 3428624, "size": 744, "type": "metatileset_types" @@ -312,25 +312,25 @@ "TODO": "three tilesets" }, { - "path": "maps/areas/002_HyruleTown/metatilesets/gAreaMetaTileset_HyruleTown_bottom.bin.lz", + "path": "maps/areas/002_HyruleTown/metatileset/gAreaMetaTileset_HyruleTown_bottom.bin.lz", "start": 3465816, "size": 8212, "type": "metatileset" }, { - "path": "maps/areas/002_HyruleTown/metatilesets/gAreaMetaTileset_HyruleTown_top.bin.lz", + "path": "maps/areas/002_HyruleTown/metatileset/gAreaMetaTileset_HyruleTown_top.bin.lz", "start": 3474028, "size": 7412, "type": "metatileset" }, { - "path": "maps/areas/002_HyruleTown/metatilesets/gAreaMetaTilesetTypes_HyruleTown_bottom.bin.lz", + "path": "maps/areas/002_HyruleTown/metatileset/gAreaMetaTilesetTypes_HyruleTown_bottom.bin.lz", "start": 3481440, "size": 1288, "type": "metatileset_types" }, { - "path": "maps/areas/002_HyruleTown/metatilesets/gAreaMetaTilesetTypes_HyruleTown_top.bin.lz", + "path": "maps/areas/002_HyruleTown/metatileset/gAreaMetaTilesetTypes_HyruleTown_top.bin.lz", "start": 3482728, "size": 808, "type": "metatileset_types" @@ -421,25 +421,25 @@ "type": "tileset" }, { - "path": "maps/areas/006_MtCrenel/metatilesets/gAreaMetaTileset_MtCrenel_bottom.bin.lz", + "path": "maps/areas/006_MtCrenel/metatileset/gAreaMetaTileset_MtCrenel_bottom.bin.lz", "start": 3574484, "size": 7452, "type": "metatileset" }, { - "path": "maps/areas/006_MtCrenel/metatilesets/gAreaMetaTileset_MtCrenel_top.bin.lz", + "path": "maps/areas/006_MtCrenel/metatileset/gAreaMetaTileset_MtCrenel_top.bin.lz", "start": 3581936, "size": 3736, "type": "metatileset" }, { - "path": "maps/areas/006_MtCrenel/metatilesets/gAreaMetaTilesetTypes_MtCrenel_bottom.bin.lz", + "path": "maps/areas/006_MtCrenel/metatileset/gAreaMetaTilesetTypes_MtCrenel_bottom.bin.lz", "start": 3585672, "size": 1416, "type": "metatileset_types" }, { - "path": "maps/areas/006_MtCrenel/metatilesets/gAreaMetaTilesetTypes_MtCrenel_top.bin.lz", + "path": "maps/areas/006_MtCrenel/metatileset/gAreaMetaTilesetTypes_MtCrenel_top.bin.lz", "start": 3587088, "size": 740, "type": "metatileset_types" @@ -566,25 +566,25 @@ "type": "tileset" }, { - "path": "maps/areas/003_HyruleField/metatilesets/gAreaMetaTileset_HyruleField_bottom.bin.lz", + "path": "maps/areas/003_HyruleField/metatileset/gAreaMetaTileset_HyruleField_bottom.bin.lz", "start": 3677852, "size": 8652, "type": "metatileset" }, { - "path": "maps/areas/003_HyruleField/metatilesets/gAreaMetaTileset_HyruleField_top.bin.lz", + "path": "maps/areas/003_HyruleField/metatileset/gAreaMetaTileset_HyruleField_top.bin.lz", "start": 3686504, "size": 4296, "type": "metatileset" }, { - "path": "maps/areas/003_HyruleField/metatilesets/gAreaMetaTilesetTypes_HyruleField_bottom.bin.lz", + "path": "maps/areas/003_HyruleField/metatileset/gAreaMetaTilesetTypes_HyruleField_bottom.bin.lz", "start": 3690800, "size": 1560, "type": "metatileset_types" }, { - "path": "maps/areas/003_HyruleField/metatilesets/gAreaMetaTilesetTypes_HyruleField_top.bin.lz", + "path": "maps/areas/003_HyruleField/metatileset/gAreaMetaTilesetTypes_HyruleField_top.bin.lz", "start": 3692360, "size": 772, "type": "metatileset_types" @@ -593,7 +593,7 @@ "path": "maps/areas/003_HyruleField/tilesets/0/gAreaTileset_HyruleField_0_3.4bpp.lz", "start": 3693132, "size": 356, - "type": "tileset_mapping3" + "type": "tileset" }, { "path": "maps/areas/003_HyruleField/rooms/00_WesternWoodsSouth/gAreaRoomMap_HyruleField_WesternWoodsSouth_bottom.bin.lz", @@ -755,25 +755,25 @@ "type": "tileset" }, { - "path": "maps/areas/007_CastleGarden/metatilesets/gAreaMetaTileset_CastleGarden_bottom.bin.lz", + "path": "maps/areas/007_CastleGarden/metatileset/gAreaMetaTileset_CastleGarden_bottom.bin.lz", "start": 3736192, "size": 5496, "type": "metatileset" }, { - "path": "maps/areas/007_CastleGarden/metatilesets/gAreaMetaTileset_CastleGarden_top.bin.lz", + "path": "maps/areas/007_CastleGarden/metatileset/gAreaMetaTileset_CastleGarden_top.bin.lz", "start": 3741688, "size": 2708, "type": "metatileset" }, { - "path": "maps/areas/007_CastleGarden/metatilesets/gAreaMetaTilesetTypes_CastleGarden_bottom.bin.lz", + "path": "maps/areas/007_CastleGarden/metatileset/gAreaMetaTilesetTypes_CastleGarden_bottom.bin.lz", "start": 3744396, "size": 828, "type": "metatileset_types" }, { - "path": "maps/areas/007_CastleGarden/metatilesets/gAreaMetaTilesetTypes_CastleGarden_top.bin.lz", + "path": "maps/areas/007_CastleGarden/metatileset/gAreaMetaTilesetTypes_CastleGarden_top.bin.lz", "start": 3745224, "size": 556, "type": "metatileset_types" @@ -809,25 +809,25 @@ "type": "tileset" }, { - "path": "maps/areas/008_CloudTops/metatilesets/gAreaMetaTileset_CloudTops_bottom.bin.lz", + "path": "maps/areas/008_CloudTops/metatileset/gAreaMetaTileset_CloudTops_bottom.bin.lz", "start": 3765116, "size": 4796, "type": "metatileset" }, { - "path": "maps/areas/008_CloudTops/metatilesets/gAreaMetaTileset_CloudTops_top.bin.lz", + "path": "maps/areas/008_CloudTops/metatileset/gAreaMetaTileset_CloudTops_top.bin.lz", "start": 3769912, "size": 2528, "type": "metatileset" }, { - "path": "maps/areas/008_CloudTops/metatilesets/gAreaMetaTilesetTypes_CloudTops_bottom.bin.lz", + "path": "maps/areas/008_CloudTops/metatileset/gAreaMetaTilesetTypes_CloudTops_bottom.bin.lz", "start": 3772440, "size": 752, "type": "metatileset_types" }, { - "path": "maps/areas/008_CloudTops/metatilesets/gAreaMetaTilesetTypes_CloudTops_top.bin.lz", + "path": "maps/areas/008_CloudTops/metatileset/gAreaMetaTilesetTypes_CloudTops_top.bin.lz", "start": 3773192, "size": 684, "type": "metatileset_types" @@ -872,7 +872,7 @@ "path": "maps/areas/008_CloudTops/tilesets/0/gAreaTileset_CloudTops_0_3.4bpp.lz", "start": 3783800, "size": 532, - "type": "tileset_mapping3" + "type": "tileset" }, { "path": "maps/areas/009_RoyalValley/tilesets/0/gAreaTileset_RoyalValley_0_0.4bpp.lz", @@ -893,25 +893,25 @@ "type": "tileset" }, { - "path": "maps/areas/009_RoyalValley/metatilesets/gAreaMetaTileset_RoyalValley_bottom.bin.lz", + "path": "maps/areas/009_RoyalValley/metatileset/gAreaMetaTileset_RoyalValley_bottom.bin.lz", "start": 3806620, "size": 4404, "type": "metatileset" }, { - "path": "maps/areas/009_RoyalValley/metatilesets/gAreaMetaTileset_RoyalValley_top.bin.lz", + "path": "maps/areas/009_RoyalValley/metatileset/gAreaMetaTileset_RoyalValley_top.bin.lz", "start": 3811024, "size": 2828, "type": "metatileset" }, { - "path": "maps/areas/009_RoyalValley/metatilesets/gAreaMetaTilesetTypes_RoyalValley_bottom.bin.lz", + "path": "maps/areas/009_RoyalValley/metatileset/gAreaMetaTilesetTypes_RoyalValley_bottom.bin.lz", "start": 3813852, "size": 852, "type": "metatileset_types" }, { - "path": "maps/areas/009_RoyalValley/metatilesets/gAreaMetaTilesetTypes_RoyalValley_top.bin.lz", + "path": "maps/areas/009_RoyalValley/metatileset/gAreaMetaTilesetTypes_RoyalValley_top.bin.lz", "start": 3814704, "size": 556, "type": "metatileset_types" @@ -1021,13 +1021,13 @@ "type": "tileset" }, { - "path": "maps/areas/013_Beanstalks/metatilesets/gAreaMetaTileset_Beanstalks_bottom.bin.lz", + "path": "maps/areas/013_Beanstalks/metatileset/gAreaMetaTileset_Beanstalks_bottom.bin.lz", "start": 3866868, "size": 800, "type": "metatileset" }, { - "path": "maps/areas/013_Beanstalks/metatilesets/gAreaMetaTilesetTypes_Beanstalks_bottom.bin.lz", + "path": "maps/areas/013_Beanstalks/metatileset/gAreaMetaTilesetTypes_Beanstalks_bottom.bin.lz", "start": 3867668, "size": 116, "type": "metatileset_types" @@ -1036,10 +1036,10 @@ "path": "maps/areas/013_Beanstalks/tilesets/0/gAreaTileset_Beanstalks_0_3.4bpp.lz", "start": 3867784, "size": 440, - "type": "tileset_mapping3" + "type": "tileset" }, { - "path": "maps/areas/013_Beanstalks/rooms/00_CrenelClimb/gRoomMapping_Beanstalks_CrenelClimb_top.bin.lz", + "path": "maps/areas/013_Beanstalks/rooms/16_CrenelClimb/gRoomMapping_Beanstalks_CrenelClimb_top.bin.lz", "start": 3868224, "size": 1472, "type": "map_mapping1" @@ -1112,25 +1112,25 @@ "type": "tileset" }, { - "path": "maps/areas/032_MinishHouseInteriors/metatilesets/gAreaMetaTileset_MinishHouseInteriors_bottom.bin.lz", + "path": "maps/areas/032_MinishHouseInteriors/metatileset/gAreaMetaTileset_MinishHouseInteriors_bottom.bin.lz", "start": 3901928, "size": 8140, "type": "metatileset" }, { - "path": "maps/areas/032_MinishHouseInteriors/metatilesets/gAreaMetaTileset_MinishHouseInteriors_top.bin.lz", + "path": "maps/areas/032_MinishHouseInteriors/metatileset/gAreaMetaTileset_MinishHouseInteriors_top.bin.lz", "start": 3910068, "size": 6284, "type": "metatileset" }, { - "path": "maps/areas/032_MinishHouseInteriors/metatilesets/gAreaMetaTilesetTypes_MinishHouseInteriors_bottom.bin.lz", + "path": "maps/areas/032_MinishHouseInteriors/metatileset/gAreaMetaTilesetTypes_MinishHouseInteriors_bottom.bin.lz", "start": 3916352, "size": 1532, "type": "metatileset_types" }, { - "path": "maps/areas/032_MinishHouseInteriors/metatilesets/gAreaMetaTilesetTypes_MinishHouseInteriors_top.bin.lz", + "path": "maps/areas/032_MinishHouseInteriors/metatileset/gAreaMetaTilesetTypes_MinishHouseInteriors_top.bin.lz", "start": 3917884, "size": 1312, "type": "metatileset_types" @@ -1358,25 +1358,25 @@ "type": "tileset" }, { - "path": "maps/areas/041_GreatFairies/metatilesets/gAreaMetaTileset_GreatFairies_bottom.bin.lz", + "path": "maps/areas/041_GreatFairies/metatileset/gAreaMetaTileset_GreatFairies_bottom.bin.lz", "start": 3943860, "size": 3276, "type": "metatileset" }, { - "path": "maps/areas/041_GreatFairies/metatilesets/gAreaMetaTileset_GreatFairies_top.bin.lz", + "path": "maps/areas/041_GreatFairies/metatileset/gAreaMetaTileset_GreatFairies_top.bin.lz", "start": 3947136, "size": 1332, "type": "metatileset" }, { - "path": "maps/areas/041_GreatFairies/metatilesets/gAreaMetaTilesetTypes_GreatFairies_bottom.bin.lz", + "path": "maps/areas/041_GreatFairies/metatileset/gAreaMetaTilesetTypes_GreatFairies_bottom.bin.lz", "start": 3948468, "size": 384, "type": "metatileset_types" }, { - "path": "maps/areas/041_GreatFairies/metatilesets/gAreaMetaTilesetTypes_GreatFairies_top.bin.lz", + "path": "maps/areas/041_GreatFairies/metatileset/gAreaMetaTilesetTypes_GreatFairies_top.bin.lz", "start": 3948852, "size": 244, "type": "metatileset_types" @@ -1520,25 +1520,25 @@ "type": "tileset" }, { - "path": "maps/areas/044_ArmosInteriors/metatilesets/gAreaMetaTileset_ArmosInteriors_bottom.bin.lz", + "path": "maps/areas/044_ArmosInteriors/metatileset/gAreaMetaTileset_ArmosInteriors_bottom.bin.lz", "start": 3969828, "size": 1908, "type": "metatileset" }, { - "path": "maps/areas/044_ArmosInteriors/metatilesets/gAreaMetaTileset_ArmosInteriors_top.bin.lz", + "path": "maps/areas/044_ArmosInteriors/metatileset/gAreaMetaTileset_ArmosInteriors_top.bin.lz", "start": 3971736, "size": 1908, "type": "metatileset" }, { - "path": "maps/areas/044_ArmosInteriors/metatilesets/gAreaMetaTilesetTypes_ArmosInteriors_bottom.bin.lz", + "path": "maps/areas/044_ArmosInteriors/metatileset/gAreaMetaTilesetTypes_ArmosInteriors_bottom.bin.lz", "start": 3973644, "size": 280, "type": "metatileset_types" }, { - "path": "maps/areas/044_ArmosInteriors/metatilesets/gAreaMetaTilesetTypes_ArmosInteriors_top.bin.lz", + "path": "maps/areas/044_ArmosInteriors/metatileset/gAreaMetaTilesetTypes_ArmosInteriors_top.bin.lz", "start": 3973924, "size": 284, "type": "metatileset_types" @@ -1694,25 +1694,25 @@ "type": "tileset" }, { - "path": "maps/areas/047_GoronCave/metatilesets/gAreaMetaTileset_GoronCave_bottom.bin.lz", + "path": "maps/areas/047_GoronCave/metatileset/gAreaMetaTileset_GoronCave_bottom.bin.lz", "start": 4001576, "size": 6660, "type": "metatileset" }, { - "path": "maps/areas/047_GoronCave/metatilesets/gAreaMetaTileset_GoronCave_top.bin.lz", + "path": "maps/areas/047_GoronCave/metatileset/gAreaMetaTileset_GoronCave_top.bin.lz", "start": 4008236, "size": 6152, "type": "metatileset" }, { - "path": "maps/areas/047_GoronCave/metatilesets/gAreaMetaTilesetTypes_GoronCave_bottom.bin.lz", + "path": "maps/areas/047_GoronCave/metatileset/gAreaMetaTilesetTypes_GoronCave_bottom.bin.lz", "start": 4014388, "size": 1340, "type": "metatileset_types" }, { - "path": "maps/areas/047_GoronCave/metatilesets/gAreaMetaTilesetTypes_GoronCave_top.bin.lz", + "path": "maps/areas/047_GoronCave/metatileset/gAreaMetaTilesetTypes_GoronCave_top.bin.lz", "start": 4015728, "size": 1224, "type": "metatileset_types" @@ -1898,13 +1898,13 @@ "type": "metatilemap" }, { - "path": "maps/areas/050_Caves/rooms/12_LonLonRanchSecret/gAreaRoomMap_Caves_LonLonRanchSecret_bottom.bin.lz", + "path": "maps/areas/050_Caves/rooms/13_LonLonRanchSecret/gAreaRoomMap_Caves_LonLonRanchSecret_bottom.bin.lz", "start": 4023072, "size": 260, "type": "metatilemap" }, { - "path": "maps/areas/050_Caves/rooms/12_LonLonRanchSecret/gAreaRoomMap_Caves_LonLonRanchSecret_top.bin.lz", + "path": "maps/areas/050_Caves/rooms/13_LonLonRanchSecret/gAreaRoomMap_Caves_LonLonRanchSecret_top.bin.lz", "start": 4023332, "size": 144, "type": "metatilemap" @@ -1922,13 +1922,13 @@ "type": "metatilemap" }, { - "path": "maps/areas/050_Caves/rooms/12_LonLonRanchWallet/gAreaRoomMap_Caves_LonLonRanchWallet_bottom.bin.lz", + "path": "maps/areas/050_Caves/rooms/15_LonLonRanchWallet/gAreaRoomMap_Caves_LonLonRanchWallet_bottom.bin.lz", "start": 4023904, "size": 268, "type": "metatilemap" }, { - "path": "maps/areas/050_Caves/rooms/12_LonLonRanchWallet/gAreaRoomMap_Caves_LonLonRanchWallet_top.bin.lz", + "path": "maps/areas/050_Caves/rooms/15_LonLonRanchWallet/gAreaRoomMap_Caves_LonLonRanchWallet_top.bin.lz", "start": 4024172, "size": 52, "type": "metatilemap" @@ -2192,25 +2192,25 @@ "type": "tileset" }, { - "path": "maps/areas/053_MinishCaves/metatilesets/gAreaMetaTileset_MinishCaves_bottom.bin.lz", + "path": "maps/areas/053_MinishCaves/metatileset/gAreaMetaTileset_MinishCaves_bottom.bin.lz", "start": 4054012, "size": 7740, "type": "metatileset" }, { - "path": "maps/areas/053_MinishCaves/metatilesets/gAreaMetaTileset_MinishCaves_top.bin.lz", + "path": "maps/areas/053_MinishCaves/metatileset/gAreaMetaTileset_MinishCaves_top.bin.lz", "start": 4061752, "size": 4472, "type": "metatileset" }, { - "path": "maps/areas/053_MinishCaves/metatilesets/gAreaMetaTilesetTypes_MinishCaves_bottom.bin.lz", + "path": "maps/areas/053_MinishCaves/metatileset/gAreaMetaTilesetTypes_MinishCaves_bottom.bin.lz", "start": 4066224, "size": 1188, "type": "metatileset_types" }, { - "path": "maps/areas/053_MinishCaves/metatilesets/gAreaMetaTilesetTypes_MinishCaves_top.bin.lz", + "path": "maps/areas/053_MinishCaves/metatileset/gAreaMetaTilesetTypes_MinishCaves_top.bin.lz", "start": 4067412, "size": 900, "type": "metatileset_types" @@ -2234,25 +2234,25 @@ "type": "tileset" }, { - "path": "maps/areas/054_CastleGardenMinishHoles/metatilesets/gAreaMetaTileset_CastleGardenMinishHoles_bottom.bin.lz", + "path": "maps/areas/054_CastleGardenMinishHoles/metatileset/gAreaMetaTileset_CastleGardenMinishHoles_bottom.bin.lz", "start": 4081200, "size": 2596, "type": "metatileset" }, { - "path": "maps/areas/054_CastleGardenMinishHoles/metatilesets/gAreaMetaTileset_CastleGardenMinishHoles_top.bin.lz", + "path": "maps/areas/054_CastleGardenMinishHoles/metatileset/gAreaMetaTileset_CastleGardenMinishHoles_top.bin.lz", "start": 4083796, "size": 2752, "type": "metatileset" }, { - "path": "maps/areas/054_CastleGardenMinishHoles/metatilesets/gAreaMetaTilesetTypes_CastleGardenMinishHoles_bottom.bin.lz", + "path": "maps/areas/054_CastleGardenMinishHoles/metatileset/gAreaMetaTilesetTypes_CastleGardenMinishHoles_bottom.bin.lz", "start": 4086548, "size": 392, "type": "metatileset_types" }, { - "path": "maps/areas/054_CastleGardenMinishHoles/metatilesets/gAreaMetaTilesetTypes_CastleGardenMinishHoles_top.bin.lz", + "path": "maps/areas/054_CastleGardenMinishHoles/metatileset/gAreaMetaTilesetTypes_CastleGardenMinishHoles_top.bin.lz", "start": 4086940, "size": 284, "type": "metatileset_types" @@ -2782,25 +2782,25 @@ "type": "tileset" }, { - "path": "maps/areas/001_MinishVillage/metatilesets/gAreaMetaTileset_MinishVillage_bottom.bin.lz", + "path": "maps/areas/001_MinishVillage/metatileset/gAreaMetaTileset_MinishVillage_bottom.bin.lz", "start": 4186484, "size": 7172, "type": "metatileset" }, { - "path": "maps/areas/001_MinishVillage/metatilesets/gAreaMetaTileset_MinishVillage_top.bin.lz", + "path": "maps/areas/001_MinishVillage/metatileset/gAreaMetaTileset_MinishVillage_top.bin.lz", "start": 4193656, "size": 5384, "type": "metatileset" }, { - "path": "maps/areas/001_MinishVillage/metatilesets/gAreaMetaTilesetTypes_MinishVillage_bottom.bin.lz", + "path": "maps/areas/001_MinishVillage/metatileset/gAreaMetaTilesetTypes_MinishVillage_bottom.bin.lz", "start": 4199040, "size": 748, "type": "metatileset_types" }, { - "path": "maps/areas/001_MinishVillage/metatilesets/gAreaMetaTilesetTypes_MinishVillage_top.bin.lz", + "path": "maps/areas/001_MinishVillage/metatileset/gAreaMetaTilesetTypes_MinishVillage_top.bin.lz", "start": 4199788, "size": 428, "type": "metatileset_types" @@ -2866,25 +2866,25 @@ "type": "tileset" }, { - "path": "maps/areas/016_MelarisMine/metatilesets/gAreaMetaTileset_MelarisMine_bottom.bin.lz", + "path": "maps/areas/016_MelarisMine/metatileset/gAreaMetaTileset_MelarisMine_bottom.bin.lz", "start": 4249600, "size": 5764, "type": "metatileset" }, { - "path": "maps/areas/016_MelarisMine/metatilesets/gAreaMetaTileset_MelarisMine_top.bin.lz", + "path": "maps/areas/016_MelarisMine/metatileset/gAreaMetaTileset_MelarisMine_top.bin.lz", "start": 4255364, "size": 196, "type": "metatileset" }, { - "path": "maps/areas/016_MelarisMine/metatilesets/gAreaMetaTilesetTypes_MelarisMine_bottom.bin.lz", + "path": "maps/areas/016_MelarisMine/metatileset/gAreaMetaTilesetTypes_MelarisMine_bottom.bin.lz", "start": 4255560, "size": 544, "type": "metatileset_types" }, { - "path": "maps/areas/016_MelarisMine/metatilesets/gAreaMetaTilesetTypes_MelarisMine_top.bin.lz", + "path": "maps/areas/016_MelarisMine/metatileset/gAreaMetaTilesetTypes_MelarisMine_top.bin.lz", "start": 4256104, "size": 48, "type": "metatileset_types" @@ -2914,13 +2914,13 @@ "type": "tileset" }, { - "path": "maps/areas/017_MinishPaths/metatilesets/gAreaMetaTileset_MinishPaths_bottom.bin.lz", + "path": "maps/areas/017_MinishPaths/metatileset/gAreaMetaTileset_MinishPaths_bottom.bin.lz", "start": 4272508, "size": 3224, "type": "metatileset" }, { - "path": "maps/areas/017_MinishPaths/metatilesets/gAreaMetaTilesetTypes_MinishPaths_bottom.bin.lz", + "path": "maps/areas/017_MinishPaths/metatileset/gAreaMetaTilesetTypes_MinishPaths_bottom.bin.lz", "start": 4275732, "size": 296, "type": "metatileset_types" @@ -2980,13 +2980,13 @@ "type": "tileset" }, { - "path": "maps/areas/018_CrenelMinishPaths/metatilesets/gAreaMetaTileset_CrenelMinishPaths_bottom.bin.lz", + "path": "maps/areas/018_CrenelMinishPaths/metatileset/gAreaMetaTileset_CrenelMinishPaths_bottom.bin.lz", "start": 4301336, "size": 4696, "type": "metatileset" }, { - "path": "maps/areas/018_CrenelMinishPaths/metatilesets/gAreaMetaTilesetTypes_CrenelMinishPaths_bottom.bin.lz", + "path": "maps/areas/018_CrenelMinishPaths/metatileset/gAreaMetaTilesetTypes_CrenelMinishPaths_bottom.bin.lz", "start": 4306032, "size": 420, "type": "metatileset_types" @@ -3022,13 +3022,13 @@ "type": "tileset" }, { - "path": "maps/areas/033_HouseInteriors1/metatilesets/gAreaMetaTileset_HouseInteriors1_top.bin.lz", + "path": "maps/areas/033_HouseInteriors1/metatileset/gAreaMetaTileset_HouseInteriors1_top.bin.lz", "start": 4310460, "size": 3972, "type": "metatileset" }, { - "path": "maps/areas/033_HouseInteriors1/metatilesets/gAreaMetaTilesetTypes_HouseInteriors1_top.bin.lz", + "path": "maps/areas/033_HouseInteriors1/metatileset/gAreaMetaTilesetTypes_HouseInteriors1_top.bin.lz", "start": 4314432, "size": 700, "type": "metatileset_types" @@ -3046,13 +3046,13 @@ "type": "tileset" }, { - "path": "maps/areas/033_HouseInteriors1/metatilesets/gAreaMetaTileset_HouseInteriors1_bottom.bin.lz", + "path": "maps/areas/033_HouseInteriors1/metatileset/gAreaMetaTileset_HouseInteriors1_bottom.bin.lz", "start": 4331872, "size": 4772, "type": "metatileset" }, { - "path": "maps/areas/033_HouseInteriors1/metatilesets/gAreaMetaTilesetTypes_HouseInteriors1_bottom.bin.lz", + "path": "maps/areas/033_HouseInteriors1/metatileset/gAreaMetaTilesetTypes_HouseInteriors1_bottom.bin.lz", "start": 4336644, "size": 620, "type": "metatileset_types" @@ -3070,13 +3070,13 @@ "type": "tileset" }, { - "path": "maps/areas/034_HouseInteriors2/metatilesets/gAreaMetaTileset_HouseInteriors2_bottom.bin.lz", + "path": "maps/areas/034_HouseInteriors2/metatileset/gAreaMetaTileset_HouseInteriors2_bottom.bin.lz", "start": 4355484, "size": 4764, "type": "metatileset" }, { - "path": "maps/areas/034_HouseInteriors2/metatilesets/gAreaMetaTilesetTypes_HouseInteriors2_bottom.bin.lz", + "path": "maps/areas/034_HouseInteriors2/metatileset/gAreaMetaTilesetTypes_HouseInteriors2_bottom.bin.lz", "start": 4360248, "size": 752, "type": "metatileset_types" @@ -3094,13 +3094,13 @@ "type": "tileset" }, { - "path": "maps/areas/040_HouseInteriors4/metatilesets/gAreaMetaTileset_HouseInteriors4_bottom.bin.lz", + "path": "maps/areas/040_HouseInteriors4/metatileset/gAreaMetaTileset_HouseInteriors4_bottom.bin.lz", "start": 4377888, "size": 4852, "type": "metatileset" }, { - "path": "maps/areas/040_HouseInteriors4/metatilesets/gAreaMetaTilesetTypes_HouseInteriors4_bottom.bin.lz", + "path": "maps/areas/040_HouseInteriors4/metatileset/gAreaMetaTilesetTypes_HouseInteriors4_bottom.bin.lz", "start": 4382740, "size": 796, "type": "metatileset_types" @@ -3118,13 +3118,13 @@ "type": "tileset" }, { - "path": "maps/areas/035_HouseInteriors3/metatilesets/gAreaMetaTileset_HouseInteriors3_bottom.bin.lz", + "path": "maps/areas/035_HouseInteriors3/metatileset/gAreaMetaTileset_HouseInteriors3_bottom.bin.lz", "start": 4400524, "size": 3912, "type": "metatileset" }, { - "path": "maps/areas/035_HouseInteriors3/metatilesets/gAreaMetaTilesetTypes_HouseInteriors3_bottom.bin.lz", + "path": "maps/areas/035_HouseInteriors3/metatileset/gAreaMetaTilesetTypes_HouseInteriors3_bottom.bin.lz", "start": 4404436, "size": 608, "type": "metatileset_types" @@ -3142,13 +3142,13 @@ "type": "tileset" }, { - "path": "maps/areas/036_TreeInteriors/metatilesets/gAreaMetaTileset_TreeInteriors_bottom.bin.lz", + "path": "maps/areas/036_TreeInteriors/metatileset/gAreaMetaTileset_TreeInteriors_bottom.bin.lz", "start": 4421332, "size": 3736, "type": "metatileset" }, { - "path": "maps/areas/036_TreeInteriors/metatilesets/gAreaMetaTilesetTypes_TreeInteriors_bottom.bin.lz", + "path": "maps/areas/036_TreeInteriors/metatileset/gAreaMetaTilesetTypes_TreeInteriors_bottom.bin.lz", "start": 4425068, "size": 528, "type": "metatileset_types" @@ -3166,13 +3166,13 @@ "type": "tileset" }, { - "path": "maps/areas/039_MinishCracks/metatilesets/gAreaMetaTileset_MinishCracks_bottom.bin.lz", + "path": "maps/areas/039_MinishCracks/metatileset/gAreaMetaTileset_MinishCracks_bottom.bin.lz", "start": 4442920, "size": 3920, "type": "metatileset" }, { - "path": "maps/areas/039_MinishCracks/metatilesets/gAreaMetaTilesetTypes_MinishCracks_bottom.bin.lz", + "path": "maps/areas/039_MinishCracks/metatileset/gAreaMetaTilesetTypes_MinishCracks_bottom.bin.lz", "start": 4446840, "size": 520, "type": "metatileset_types" @@ -3190,13 +3190,13 @@ "type": "tileset" }, { - "path": "maps/areas/037_Dojos/metatilesets/gAreaMetaTileset_Dojos_bottom.bin.lz", + "path": "maps/areas/037_Dojos/metatileset/gAreaMetaTileset_Dojos_bottom.bin.lz", "start": 4463740, "size": 3736, "type": "metatileset" }, { - "path": "maps/areas/037_Dojos/metatilesets/gAreaMetaTilesetTypes_Dojos_bottom.bin.lz", + "path": "maps/areas/037_Dojos/metatileset/gAreaMetaTilesetTypes_Dojos_bottom.bin.lz", "start": 4467476, "size": 692, "type": "metatileset_types" @@ -3214,13 +3214,13 @@ "type": "tileset" }, { - "path": "maps/areas/046_MinishRafters/metatilesets/gAreaMetaTileset_MinishRafters_bottom.bin.lz", + "path": "maps/areas/046_MinishRafters/metatileset/gAreaMetaTileset_MinishRafters_bottom.bin.lz", "start": 4476764, "size": 3152, "type": "metatileset" }, { - "path": "maps/areas/046_MinishRafters/metatilesets/gAreaMetaTilesetTypes_MinishRafters_bottom.bin.lz", + "path": "maps/areas/046_MinishRafters/metatileset/gAreaMetaTilesetTypes_MinishRafters_bottom.bin.lz", "start": 4479916, "size": 396, "type": "metatileset_types" @@ -3238,13 +3238,13 @@ "type": "tileset" }, { - "path": "maps/areas/048_WindTribeTower/metatilesets/gAreaMetaTileset_WindTribeTower_bottom.bin.lz", + "path": "maps/areas/048_WindTribeTower/metatileset/gAreaMetaTileset_WindTribeTower_bottom.bin.lz", "start": 4496356, "size": 3904, "type": "metatileset" }, { - "path": "maps/areas/048_WindTribeTower/metatilesets/gAreaMetaTilesetTypes_WindTribeTower_bottom.bin.lz", + "path": "maps/areas/048_WindTribeTower/metatileset/gAreaMetaTilesetTypes_WindTribeTower_bottom.bin.lz", "start": 4500260, "size": 484, "type": "metatileset_types" @@ -3268,25 +3268,25 @@ "type": "tileset" }, { - "path": "maps/areas/049_WindTribeTowerRoof/metatilesets/gAreaMetaTileset_WindTribeTowerRoof_bottom.bin.lz", + "path": "maps/areas/049_WindTribeTowerRoof/metatileset/gAreaMetaTileset_WindTribeTowerRoof_bottom.bin.lz", "start": 4519316, "size": 1676, "type": "metatileset" }, { - "path": "maps/areas/049_WindTribeTowerRoof/metatilesets/gAreaMetaTileset_WindTribeTowerRoof_top.bin.lz", + "path": "maps/areas/049_WindTribeTowerRoof/metatileset/gAreaMetaTileset_WindTribeTowerRoof_top.bin.lz", "start": 4520992, "size": 1608, "type": "metatileset" }, { - "path": "maps/areas/049_WindTribeTowerRoof/metatilesets/gAreaMetaTilesetTypes_WindTribeTowerRoof_bottom.bin.lz", + "path": "maps/areas/049_WindTribeTowerRoof/metatileset/gAreaMetaTilesetTypes_WindTribeTowerRoof_bottom.bin.lz", "start": 4522600, "size": 188, "type": "metatileset_types" }, { - "path": "maps/areas/049_WindTribeTowerRoof/metatilesets/gAreaMetaTilesetTypes_WindTribeTowerRoof_top.bin.lz", + "path": "maps/areas/049_WindTribeTowerRoof/metatileset/gAreaMetaTilesetTypes_WindTribeTowerRoof_top.bin.lz", "start": 4522788, "size": 224, "type": "metatileset_types" @@ -3311,13 +3311,13 @@ "type": "tileset" }, { - "path": "maps/areas/056_EzloCutscene/metatilesets/gAreaMetaTileset_EzloCutscene_bottom.bin.lz", + "path": "maps/areas/056_EzloCutscene/metatileset/gAreaMetaTileset_EzloCutscene_bottom.bin.lz", "start": 4536736, "size": 1704, "type": "metatileset" }, { - "path": "maps/areas/056_EzloCutscene/metatilesets/gAreaMetaTilesetTypes_EzloCutscene_bottom.bin.lz", + "path": "maps/areas/056_EzloCutscene/metatileset/gAreaMetaTilesetTypes_EzloCutscene_bottom.bin.lz", "start": 4538440, "size": 240, "type": "metatileset_types" @@ -3486,73 +3486,73 @@ "type": "metatilemap" }, { - "path": "maps/areas/034_HouseInteriors2/rooms/34_16_LinksHouseEntrance/gAreaRoomMap_HouseInteriors2_LinksHouseEntrance_bottom.bin.lz", + "path": "maps/areas/034_HouseInteriors2/rooms/16_LinksHouseEntrance/gAreaRoomMap_HouseInteriors2_LinksHouseEntrance_bottom.bin.lz", "start": 4544408, "size": 292, "type": "metatilemap" }, { - "path": "maps/areas/034_HouseInteriors2/rooms/34_16_LinksHouseEntrance/gAreaRoomMap_HouseInteriors2_LinksHouseEntrance_top.bin.lz", + "path": "maps/areas/034_HouseInteriors2/rooms/16_LinksHouseEntrance/gAreaRoomMap_HouseInteriors2_LinksHouseEntrance_top.bin.lz", "start": 4544700, "size": 80, "type": "metatilemap" }, { - "path": "maps/areas/034_HouseInteriors2/rooms/35_17_LinksHouseSmith/gAreaRoomMap_HouseInteriors2_LinksHouseSmith_bottom.bin.lz", + "path": "maps/areas/034_HouseInteriors2/rooms/17_LinksHouseSmith/gAreaRoomMap_HouseInteriors2_LinksHouseSmith_bottom.bin.lz", "start": 4544780, "size": 288, "type": "metatilemap" }, { - "path": "maps/areas/034_HouseInteriors2/rooms/35_17_LinksHouseSmith/gAreaRoomMap_HouseInteriors2_LinksHouseSmith_top.bin.lz", + "path": "maps/areas/034_HouseInteriors2/rooms/17_LinksHouseSmith/gAreaRoomMap_HouseInteriors2_LinksHouseSmith_top.bin.lz", "start": 4545068, "size": 68, "type": "metatilemap" }, { - "path": "maps/areas/034_HouseInteriors2/rooms/37_19_13_Dampe/gAreaRoomMap_HouseInteriors2_Dampe_bottom.bin.lz", + "path": "maps/areas/034_HouseInteriors2/rooms/18_Dampe/gAreaRoomMap_HouseInteriors2_Dampe_bottom.bin.lz", "start": 4545136, "size": 276, "type": "metatilemap" }, { - "path": "maps/areas/034_HouseInteriors2/rooms/37_19_13_Dampe/gAreaRoomMap_HouseInteriors2_Dampe_top.bin.lz", + "path": "maps/areas/034_HouseInteriors2/rooms/18_Dampe/gAreaRoomMap_HouseInteriors2_Dampe_top.bin.lz", "start": 4545412, "size": 92, "type": "metatilemap" }, { - "path": "maps/areas/034_HouseInteriors2/rooms/37_19_13/gAreaRoomMap_HouseInteriors2_13_bottom.bin.lz", + "path": "maps/areas/034_HouseInteriors2/rooms/19_13/gAreaRoomMap_HouseInteriors2_13_bottom.bin.lz", "start": 4545504, "size": 212, "type": "metatilemap" }, { - "path": "maps/areas/034_HouseInteriors2/rooms/37_19_13/gAreaRoomMap_HouseInteriors2_13_top.bin.lz", + "path": "maps/areas/034_HouseInteriors2/rooms/19_13/gAreaRoomMap_HouseInteriors2_13_top.bin.lz", "start": 4545716, "size": 100, "type": "metatilemap" }, { - "path": "maps/areas/034_HouseInteriors2/rooms/32_20_StockwellLakeHouse/gAreaRoomMap_HouseInteriors2_StockwellLakeHouse_bottom.bin.lz", + "path": "maps/areas/034_HouseInteriors2/rooms/20_StockwellLakeHouse/gAreaRoomMap_HouseInteriors2_StockwellLakeHouse_bottom.bin.lz", "start": 4545816, "size": 268, "type": "metatilemap" }, { - "path": "maps/areas/034_HouseInteriors2/rooms/32_20_StockwellLakeHouse/gAreaRoomMap_HouseInteriors2_StockwellLakeHouse_top.bin.lz", + "path": "maps/areas/034_HouseInteriors2/rooms/20_StockwellLakeHouse/gAreaRoomMap_HouseInteriors2_StockwellLakeHouse_top.bin.lz", "start": 4546084, "size": 76, "type": "metatilemap" }, { - "path": "maps/areas/034_HouseInteriors2/rooms/33_21_LinksHouseBedroom/gAreaRoomMap_HouseInteriors2_LinksHouseBedroom_bottom.bin.lz", + "path": "maps/areas/034_HouseInteriors2/rooms/21_LinksHouseBedroom/gAreaRoomMap_HouseInteriors2_LinksHouseBedroom_bottom.bin.lz", "start": 4546160, "size": 272, "type": "metatilemap" }, { - "path": "maps/areas/034_HouseInteriors2/rooms/33_21_LinksHouseBedroom/gAreaRoomMap_HouseInteriors2_LinksHouseBedroom_top.bin.lz", + "path": "maps/areas/034_HouseInteriors2/rooms/21_LinksHouseBedroom/gAreaRoomMap_HouseInteriors2_LinksHouseBedroom_top.bin.lz", "start": 4546432, "size": 88, "type": "metatilemap" @@ -3858,37 +3858,37 @@ "type": "metatilemap" }, { - "path": "maps/areas/033_HouseInteriors1/rooms/16_10_InnMinishHeartPiece/gAreaRoomMap_HouseInteriors1_InnMinishHeartPiece_bottom.bin.lz", + "path": "maps/areas/033_HouseInteriors1/rooms/10_InnMinishHeartPiece/gAreaRoomMap_HouseInteriors1_InnMinishHeartPiece_bottom.bin.lz", "start": 4556208, "size": 272, "type": "metatilemap" }, { - "path": "maps/areas/033_HouseInteriors1/rooms/16_10_InnMinishHeartPiece/gAreaRoomMap_HouseInteriors1_InnMinishHeartPiece_top.bin.lz", + "path": "maps/areas/033_HouseInteriors1/rooms/10_InnMinishHeartPiece/gAreaRoomMap_HouseInteriors1_InnMinishHeartPiece_top.bin.lz", "start": 4556480, "size": 44, "type": "metatilemap" }, { - "path": "maps/areas/033_HouseInteriors1/rooms/17_11_SchoolWest/gAreaRoomMap_HouseInteriors1_SchoolWest_bottom.bin.lz", + "path": "maps/areas/033_HouseInteriors1/rooms/11_SchoolWest/gAreaRoomMap_HouseInteriors1_SchoolWest_bottom.bin.lz", "start": 4556524, "size": 392, "type": "metatilemap" }, { - "path": "maps/areas/033_HouseInteriors1/rooms/17_11_SchoolWest/gAreaRoomMap_HouseInteriors1_SchoolWest_top.bin.lz", + "path": "maps/areas/033_HouseInteriors1/rooms/11_SchoolWest/gAreaRoomMap_HouseInteriors1_SchoolWest_top.bin.lz", "start": 4556916, "size": 64, "type": "metatilemap" }, { - "path": "maps/areas/033_HouseInteriors1/rooms/18_12_SchoolEast/gAreaRoomMap_HouseInteriors1_SchoolEast_bottom.bin.lz", + "path": "maps/areas/033_HouseInteriors1/rooms/12_SchoolEast/gAreaRoomMap_HouseInteriors1_SchoolEast_bottom.bin.lz", "start": 4556980, "size": 376, "type": "metatilemap" }, { - "path": "maps/areas/033_HouseInteriors1/rooms/18_12_SchoolEast/gAreaRoomMap_HouseInteriors1_SchoolEast_top.bin.lz", + "path": "maps/areas/033_HouseInteriors1/rooms/12_SchoolEast/gAreaRoomMap_HouseInteriors1_SchoolEast_top.bin.lz", "start": 4557356, "size": 64, "type": "metatilemap" @@ -4122,61 +4122,61 @@ "type": "metatilemap" }, { - "path": "maps/areas/036_TreeInteriors/rooms/01_14/gAreaRoomMap_TreeInteriors_14_bottom.bin", + "path": "maps/areas/036_TreeInteriors/rooms/20_14/gAreaRoomMap_TreeInteriors_14_bottom.bin", "start": 4563556, "size": 300, "type": "metatilemap" }, { - "path": "maps/areas/036_TreeInteriors/rooms/01_14/gAreaRoomMap_TreeInteriors_14_top.bin.lz", + "path": "maps/areas/036_TreeInteriors/rooms/20_14/gAreaRoomMap_TreeInteriors_14_top.bin.lz", "start": 4563856, "size": 44, "type": "metatilemap" }, { - "path": "maps/areas/036_TreeInteriors/rooms/11_BoomerangNorthwest/gAreaRoomMap_TreeInteriors_BoomerangNorthwest_bottom.bin", + "path": "maps/areas/036_TreeInteriors/rooms/21_BoomerangNorthwest/gAreaRoomMap_TreeInteriors_BoomerangNorthwest_bottom.bin", "start": 4563900, "size": 300, "type": "metatilemap" }, { - "path": "maps/areas/036_TreeInteriors/rooms/11_BoomerangNorthwest/gAreaRoomMap_TreeInteriors_BoomerangNorthwest_top.bin.lz", + "path": "maps/areas/036_TreeInteriors/rooms/21_BoomerangNorthwest/gAreaRoomMap_TreeInteriors_BoomerangNorthwest_top.bin.lz", "start": 4564200, "size": 44, "type": "metatilemap" }, { - "path": "maps/areas/036_TreeInteriors/rooms/11_BoomerangNortheast/gAreaRoomMap_TreeInteriors_BoomerangNortheast_bottom.bin", + "path": "maps/areas/036_TreeInteriors/rooms/22_BoomerangNortheast/gAreaRoomMap_TreeInteriors_BoomerangNortheast_bottom.bin", "start": 4564244, "size": 300, "type": "metatilemap" }, { - "path": "maps/areas/036_TreeInteriors/rooms/11_BoomerangNortheast/gAreaRoomMap_TreeInteriors_BoomerangNortheast_top.bin.lz", + "path": "maps/areas/036_TreeInteriors/rooms/22_BoomerangNortheast/gAreaRoomMap_TreeInteriors_BoomerangNortheast_top.bin.lz", "start": 4564544, "size": 44, "type": "metatilemap" }, { - "path": "maps/areas/036_TreeInteriors/rooms/11_BoomerangSouthwest/gAreaRoomMap_TreeInteriors_BoomerangSouthwest_bottom.bin", + "path": "maps/areas/036_TreeInteriors/rooms/23_BoomerangSouthwest/gAreaRoomMap_TreeInteriors_BoomerangSouthwest_bottom.bin", "start": 4564588, "size": 300, "type": "metatilemap" }, { - "path": "maps/areas/036_TreeInteriors/rooms/11_BoomerangSouthwest/gAreaRoomMap_TreeInteriors_BoomerangSouthwest_top.bin.lz", + "path": "maps/areas/036_TreeInteriors/rooms/23_BoomerangSouthwest/gAreaRoomMap_TreeInteriors_BoomerangSouthwest_top.bin.lz", "start": 4564888, "size": 44, "type": "metatilemap" }, { - "path": "maps/areas/036_TreeInteriors/rooms/11_BoomerangSoutheast/gAreaRoomMap_TreeInteriors_BoomerangSoutheast_bottom.bin", + "path": "maps/areas/036_TreeInteriors/rooms/24_BoomerangSoutheast/gAreaRoomMap_TreeInteriors_BoomerangSoutheast_bottom.bin", "start": 4564932, "size": 300, "type": "metatilemap" }, { - "path": "maps/areas/036_TreeInteriors/rooms/11_BoomerangSoutheast/gAreaRoomMap_TreeInteriors_BoomerangSoutheast_top.bin.lz", + "path": "maps/areas/036_TreeInteriors/rooms/24_BoomerangSoutheast/gAreaRoomMap_TreeInteriors_BoomerangSoutheast_top.bin.lz", "start": 4565232, "size": 44, "type": "metatilemap" @@ -4218,13 +4218,13 @@ "type": "metatilemap" }, { - "path": "maps/areas/036_TreeInteriors/rooms/01_1c/gAreaRoomMap_TreeInteriors_1c_bottom.bin", + "path": "maps/areas/036_TreeInteriors/rooms/28_1c/gAreaRoomMap_TreeInteriors_1c_bottom.bin", "start": 4566316, "size": 300, "type": "metatilemap" }, { - "path": "maps/areas/036_TreeInteriors/rooms/01_1c/gAreaRoomMap_TreeInteriors_1c_top.bin.lz", + "path": "maps/areas/036_TreeInteriors/rooms/28_1c/gAreaRoomMap_TreeInteriors_1c_top.bin.lz", "start": 4566616, "size": 88, "type": "metatilemap" @@ -4242,13 +4242,13 @@ "type": "metatilemap" }, { - "path": "maps/areas/036_TreeInteriors/rooms/01_1e/gAreaRoomMap_TreeInteriors_1e_bottom.bin", + "path": "maps/areas/036_TreeInteriors/rooms/30_1e/gAreaRoomMap_TreeInteriors_1e_bottom.bin", "start": 4567052, "size": 300, "type": "metatilemap" }, { - "path": "maps/areas/036_TreeInteriors/rooms/01_1e/gAreaRoomMap_TreeInteriors_1e_top.bin.lz", + "path": "maps/areas/036_TreeInteriors/rooms/30_1e/gAreaRoomMap_TreeInteriors_1e_top.bin.lz", "start": 4567352, "size": 64, "type": "metatilemap" @@ -4386,49 +4386,49 @@ "type": "metatilemap" }, { - "path": "maps/areas/039_MinishCracks/rooms/16_10_CastorWildsWest/gAreaRoomMap_MinishCracks_CastorWildsWest_bottom.bin", + "path": "maps/areas/039_MinishCracks/rooms/10_CastorWildsWest/gAreaRoomMap_MinishCracks_CastorWildsWest_bottom.bin", "start": 4571408, "size": 300, "type": "metatilemap" }, { - "path": "maps/areas/039_MinishCracks/rooms/16_10_CastorWildsWest/gAreaRoomMap_MinishCracks_CastorWildsWest_top.bin.lz", + "path": "maps/areas/039_MinishCracks/rooms/10_CastorWildsWest/gAreaRoomMap_MinishCracks_CastorWildsWest_top.bin.lz", "start": 4571708, "size": 48, "type": "metatilemap" }, { - "path": "maps/areas/039_MinishCracks/rooms/17_11_CastorWildsMiddle/gAreaRoomMap_MinishCracks_CastorWildsMiddle_bottom.bin", + "path": "maps/areas/039_MinishCracks/rooms/11_CastorWildsMiddle/gAreaRoomMap_MinishCracks_CastorWildsMiddle_bottom.bin", "start": 4571756, "size": 300, "type": "metatilemap" }, { - "path": "maps/areas/039_MinishCracks/rooms/17_11_CastorWildsMiddle/gAreaRoomMap_MinishCracks_CastorWildsMiddle_top.bin.lz", + "path": "maps/areas/039_MinishCracks/rooms/11_CastorWildsMiddle/gAreaRoomMap_MinishCracks_CastorWildsMiddle_top.bin.lz", "start": 4572056, "size": 48, "type": "metatilemap" }, { - "path": "maps/areas/039_MinishCracks/rooms/18_12_RuinsTektite/gAreaRoomMap_MinishCracks_RuinsTektite_bottom.bin", + "path": "maps/areas/039_MinishCracks/rooms/12_RuinsTektite/gAreaRoomMap_MinishCracks_RuinsTektite_bottom.bin", "start": 4572104, "size": 300, "type": "metatilemap" }, { - "path": "maps/areas/039_MinishCracks/rooms/18_12_RuinsTektite/gAreaRoomMap_MinishCracks_RuinsTektite_top.bin.lz", + "path": "maps/areas/039_MinishCracks/rooms/12_RuinsTektite/gAreaRoomMap_MinishCracks_RuinsTektite_top.bin.lz", "start": 4572404, "size": 48, "type": "metatilemap" }, { - "path": "maps/areas/039_MinishCracks/rooms/19_13_CastorWildsNextToBow/gAreaRoomMap_MinishCracks_CastorWildsNextToBow_bottom.bin", + "path": "maps/areas/039_MinishCracks/rooms/13_CastorWildsNextToBow/gAreaRoomMap_MinishCracks_CastorWildsNextToBow_bottom.bin", "start": 4572452, "size": 300, "type": "metatilemap" }, { - "path": "maps/areas/039_MinishCracks/rooms/19_13_CastorWildsNextToBow/gAreaRoomMap_MinishCracks_CastorWildsNextToBow_top.bin.lz", + "path": "maps/areas/039_MinishCracks/rooms/13_CastorWildsNextToBow/gAreaRoomMap_MinishCracks_CastorWildsNextToBow_top.bin.lz", "start": 4572752, "size": 48, "type": "metatilemap" @@ -4596,7 +4596,7 @@ "type": "map_mapping2" }, { - "path": "tilesets/gAreaTileset_MinishHouseInteriors_0_0.8bpp.lz", + "path": "maps/areas/032_MinishHouseInteriors/tilesets/0/gAreaTileset_MinishHouseInteriors_0_0.8bpp.lz", "start": 4582652, "size": 17752, "type": "tileset" @@ -4614,7 +4614,7 @@ "type": "map_mapping2" }, { - "path": "tilesets/gAreaTileset_MinishHouseInteriors_1_0.8bpp.lz", + "path": "maps/areas/032_MinishHouseInteriors/tilesets/1/gAreaTileset_MinishHouseInteriors_1_0.8bpp.lz", "start": 4604164, "size": 11540, "type": "tileset" @@ -4632,7 +4632,7 @@ "type": "map_mapping2" }, { - "path": "tilesets/gAreaTileset_MinishHouseInteriors_2_0.8bpp.lz", + "path": "maps/areas/032_MinishHouseInteriors/tilesets/2/gAreaTileset_MinishHouseInteriors_2_0.8bpp.lz", "start": 4616860, "size": 9324, "type": "tileset" @@ -4650,7 +4650,7 @@ "type": "map_mapping2" }, { - "path": "tilesets/gAreaTileset_MinishHouseInteriors_3_0.8bpp.lz", + "path": "maps/areas/032_MinishHouseInteriors/tilesets/3/gAreaTileset_MinishHouseInteriors_3_0.8bpp.lz", "start": 4627280, "size": 9204, "type": "tileset" @@ -4668,7 +4668,7 @@ "type": "map_mapping2" }, { - "path": "tilesets/gAreaTileset_MinishHouseInteriors_4_0.8bpp.lz", + "path": "maps/areas/032_MinishHouseInteriors/tilesets/4/gAreaTileset_MinishHouseInteriors_4_0.8bpp.lz", "start": 4637568, "size": 8936, "type": "tileset" @@ -4686,7 +4686,7 @@ "type": "map_mapping2" }, { - "path": "tilesets/gAreaTileset_MinishHouseInteriors_5_0.8bpp.lz", + "path": "maps/areas/032_MinishHouseInteriors/tilesets/5/gAreaTileset_MinishHouseInteriors_5_0.8bpp.lz", "start": 4647596, "size": 10216, "type": "tileset" @@ -4704,7 +4704,7 @@ "type": "map_mapping2" }, { - "path": "tilesets/gAreaTileset_MinishHouseInteriors_6_0.8bpp.lz", + "path": "maps/areas/032_MinishHouseInteriors/tilesets/6/gAreaTileset_MinishHouseInteriors_6_0.8bpp.lz", "start": 4659316, "size": 20016, "type": "tileset" @@ -4722,7 +4722,7 @@ "type": "map_mapping2" }, { - "path": "tilesets/gAreaTileset_MinishHouseInteriors_7_0.8bpp.lz", + "path": "maps/areas/032_MinishHouseInteriors/tilesets/7/gAreaTileset_MinishHouseInteriors_7_0.8bpp.lz", "start": 4681224, "size": 13592, "type": "tileset" @@ -4740,7 +4740,7 @@ "type": "map_mapping2" }, { - "path": "tilesets/gAreaTileset_MinishHouseInteriors_8_0.8bpp.lz", + "path": "maps/areas/032_MinishHouseInteriors/tilesets/8/gAreaTileset_MinishHouseInteriors_8_0.8bpp.lz", "start": 4697552, "size": 16292, "type": "tileset" @@ -4758,7 +4758,7 @@ "type": "map_mapping2" }, { - "path": "tilesets/gAreaTileset_MinishHouseInteriors_9_0.8bpp.lz", + "path": "maps/areas/032_MinishHouseInteriors/tilesets/9/gAreaTileset_MinishHouseInteriors_9_0.8bpp.lz", "start": 4715288, "size": 11536, "type": "tileset" @@ -4776,7 +4776,7 @@ "type": "map_mapping2" }, { - "path": "tilesets/gAreaTileset_MinishHouseInteriors_10_0.8bpp.lz", + "path": "maps/areas/032_MinishHouseInteriors/tilesets/10/gAreaTileset_MinishHouseInteriors_10_0.8bpp.lz", "start": 4728260, "size": 11704, "type": "tileset" @@ -4794,7 +4794,7 @@ "type": "map_mapping2" }, { - "path": "tilesets/gAreaTileset_MinishHouseInteriors_11_0.8bpp.lz", + "path": "maps/areas/032_MinishHouseInteriors/tilesets/11/gAreaTileset_MinishHouseInteriors_11_0.8bpp.lz", "start": 4741872, "size": 9868, "type": "tileset" @@ -4819,7 +4819,7 @@ "type": "map_mapping2" }, { - "path": "tilesets/gAreaTileset_MinishHouseInteriors_12_0.8bpp.lz", + "path": "maps/areas/032_MinishHouseInteriors/tilesets/12/gAreaTileset_MinishHouseInteriors_12_0.8bpp.lz", "start": 4776476, "size": 12224, "type": "tileset" @@ -4837,7 +4837,7 @@ "type": "map_mapping2" }, { - "path": "tilesets/gAreaTileset_MinishHouseInteriors_13_0.8bpp.lz", + "path": "maps/areas/032_MinishHouseInteriors/tilesets/13/gAreaTileset_MinishHouseInteriors_13_0.8bpp.lz", "start": 4789884, "size": 11968, "type": "tileset" @@ -4855,7 +4855,7 @@ "type": "map_mapping2" }, { - "path": "tilesets/gAreaTileset_MinishHouseInteriors_14_0.8bpp.lz", + "path": "maps/areas/032_MinishHouseInteriors/tilesets/14/gAreaTileset_MinishHouseInteriors_14_0.8bpp.lz", "start": 4803020, "size": 12144, "type": "tileset" @@ -4873,7 +4873,7 @@ "type": "map_mapping2" }, { - "path": "tilesets/gAreaTileset_MinishHouseInteriors_15_0.8bpp.lz", + "path": "maps/areas/032_MinishHouseInteriors/tilesets/15/gAreaTileset_MinishHouseInteriors_15_0.8bpp.lz", "start": 4816332, "size": 7860, "type": "tileset" @@ -4891,7 +4891,7 @@ "type": "map_mapping2" }, { - "path": "tilesets/gAreaTileset_MinishHouseInteriors_16_0.8bpp.lz", + "path": "maps/areas/032_MinishHouseInteriors/tilesets/16/gAreaTileset_MinishHouseInteriors_16_0.8bpp.lz", "start": 4825372, "size": 12332, "type": "tileset" @@ -4909,7 +4909,7 @@ "type": "map_mapping2" }, { - "path": "tilesets/gAreaTileset_MinishHouseInteriors_17_0.8bpp.lz", + "path": "maps/areas/032_MinishHouseInteriors/tilesets/17/gAreaTileset_MinishHouseInteriors_17_0.8bpp.lz", "start": 4838892, "size": 10416, "type": "tileset" @@ -4927,7 +4927,7 @@ "type": "map_mapping2" }, { - "path": "tilesets/gAreaTileset_MinishHouseInteriors_18_0.8bpp.lz", + "path": "maps/areas/032_MinishHouseInteriors/tilesets/18/gAreaTileset_MinishHouseInteriors_18_0.8bpp.lz", "start": 4850488, "size": 12716, "type": "tileset" @@ -4945,7 +4945,7 @@ "type": "map_mapping2" }, { - "path": "tilesets/gAreaTileset_MinishHouseInteriors_19_0.8bpp.lz", + "path": "maps/areas/032_MinishHouseInteriors/tilesets/19/gAreaTileset_MinishHouseInteriors_19_0.8bpp.lz", "start": 4864384, "size": 12256, "type": "tileset" @@ -4963,7 +4963,7 @@ "type": "map_mapping2" }, { - "path": "tilesets/gAreaTileset_TownMinishHoles_0_0.8bpp.lz", + "path": "maps/areas/045_TownMinishHoles/tilesets/0/gAreaTileset_TownMinishHoles_0_0.8bpp.lz", "start": 4877984, "size": 8600, "type": "tileset" @@ -4981,7 +4981,7 @@ "type": "map_mapping2" }, { - "path": "tilesets/gAreaTileset_TownMinishHoles_1_0.8bpp.lz", + "path": "maps/areas/045_TownMinishHoles/tilesets/1/gAreaTileset_TownMinishHoles_1_0.8bpp.lz", "start": 4888052, "size": 10688, "type": "tileset" @@ -4999,7 +4999,7 @@ "type": "map_mapping2" }, { - "path": "tilesets/gAreaTileset_TownMinishHoles_2_0.8bpp.lz", + "path": "maps/areas/045_TownMinishHoles/tilesets/2/gAreaTileset_TownMinishHoles_2_0.8bpp.lz", "start": 4900128, "size": 9696, "type": "tileset" @@ -5017,7 +5017,7 @@ "type": "map_mapping2" }, { - "path": "tilesets/gAreaTileset_TownMinishHoles_3_0.8bpp.lz", + "path": "maps/areas/045_TownMinishHoles/tilesets/3/gAreaTileset_TownMinishHoles_3_0.8bpp.lz", "start": 4911288, "size": 10724, "type": "tileset" @@ -5035,7 +5035,7 @@ "type": "map_mapping2" }, { - "path": "tilesets/gAreaTileset_TownMinishHoles_4_0.8bpp.lz", + "path": "maps/areas/045_TownMinishHoles/tilesets/4/gAreaTileset_TownMinishHoles_4_0.8bpp.lz", "start": 4923412, "size": 9308, "type": "tileset" @@ -5053,7 +5053,7 @@ "type": "map_mapping2" }, { - "path": "tilesets/gAreaTileset_TownMinishHoles_5_0.8bpp.lz", + "path": "maps/areas/045_TownMinishHoles/tilesets/5/gAreaTileset_TownMinishHoles_5_0.8bpp.lz", "start": 4934204, "size": 12392, "type": "tileset" @@ -5071,7 +5071,7 @@ "type": "map_mapping2" }, { - "path": "tilesets/gAreaTileset_TownMinishHoles_6_0.8bpp.lz", + "path": "maps/areas/045_TownMinishHoles/tilesets/6/gAreaTileset_TownMinishHoles_6_0.8bpp.lz", "start": 4949944, "size": 12976, "type": "tileset" @@ -5089,7 +5089,7 @@ "type": "map_mapping2" }, { - "path": "tilesets/gAreaTileset_TownMinishHoles_7_0.8bpp.lz", + "path": "maps/areas/045_TownMinishHoles/tilesets/7/gAreaTileset_TownMinishHoles_7_0.8bpp.lz", "start": 4964716, "size": 17700, "type": "tileset" @@ -5107,7 +5107,7 @@ "type": "map_mapping2" }, { - "path": "tilesets/gAreaTileset_TownMinishHoles_8_0.8bpp.lz", + "path": "maps/areas/045_TownMinishHoles/tilesets/8/gAreaTileset_TownMinishHoles_8_0.8bpp.lz", "start": 4985452, "size": 13624, "type": "tileset" @@ -5137,25 +5137,25 @@ "type": "tileset" }, { - "path": "maps/areas/064_40/metatilesets/gAreaMetaTileset_40_bottom.bin.lz", + "path": "maps/areas/064_40/metatileset/gAreaMetaTileset_40_bottom.bin.lz", "start": 5020828, "size": 8860, "type": "metatileset" }, { - "path": "maps/areas/064_40/metatilesets/gAreaMetaTileset_40_top.bin.lz", + "path": "maps/areas/064_40/metatileset/gAreaMetaTileset_40_top.bin.lz", "start": 5029688, "size": 5820, "type": "metatileset" }, { - "path": "maps/areas/064_40/metatilesets/gAreaMetaTilesetTypes_40_bottom.bin.lz", + "path": "maps/areas/064_40/metatileset/gAreaMetaTilesetTypes_40_bottom.bin.lz", "start": 5035508, "size": 1264, "type": "metatileset_types" }, { - "path": "maps/areas/064_40/metatilesets/gAreaMetaTilesetTypes_40_top.bin.lz", + "path": "maps/areas/064_40/metatileset/gAreaMetaTilesetTypes_40_top.bin.lz", "start": 5036772, "size": 1004, "type": "metatileset_types" @@ -5371,25 +5371,25 @@ "type": "tileset" }, { - "path": "maps/areas/072_DeepwoodShrine/metatilesets/gAreaMetaTileset_DeepwoodShrine_bottom.bin.lz", + "path": "maps/areas/072_DeepwoodShrine/metatileset/gAreaMetaTileset_DeepwoodShrine_bottom.bin.lz", "start": 5073832, "size": 9600, "type": "metatileset" }, { - "path": "maps/areas/072_DeepwoodShrine/metatilesets/gAreaMetaTileset_DeepwoodShrine_top.bin.lz", + "path": "maps/areas/072_DeepwoodShrine/metatileset/gAreaMetaTileset_DeepwoodShrine_top.bin.lz", "start": 5083432, "size": 6656, "type": "metatileset" }, { - "path": "maps/areas/072_DeepwoodShrine/metatilesets/gAreaMetaTilesetTypes_DeepwoodShrine_bottom.bin.lz", + "path": "maps/areas/072_DeepwoodShrine/metatileset/gAreaMetaTilesetTypes_DeepwoodShrine_bottom.bin.lz", "start": 5090088, "size": 1204, "type": "metatileset_types" }, { - "path": "maps/areas/072_DeepwoodShrine/metatilesets/gAreaMetaTilesetTypes_DeepwoodShrine_top.bin.lz", + "path": "maps/areas/072_DeepwoodShrine/metatileset/gAreaMetaTilesetTypes_DeepwoodShrine_top.bin.lz", "start": 5091292, "size": 948, "type": "metatileset_types" @@ -5413,25 +5413,25 @@ "type": "tileset" }, { - "path": "maps/areas/073_DeepwoodShrineBoss/metatilesets/gAreaMetaTileset_DeepwoodShrineBoss_bottom.bin.lz", + "path": "maps/areas/073_DeepwoodShrineBoss/metatileset/gAreaMetaTileset_DeepwoodShrineBoss_bottom.bin.lz", "start": 5105900, "size": 4396, "type": "metatileset" }, { - "path": "maps/areas/073_DeepwoodShrineBoss/metatilesets/gAreaMetaTileset_DeepwoodShrineBoss_top.bin.lz", + "path": "maps/areas/073_DeepwoodShrineBoss/metatileset/gAreaMetaTileset_DeepwoodShrineBoss_top.bin.lz", "start": 5110296, "size": 792, "type": "metatileset" }, { - "path": "maps/areas/073_DeepwoodShrineBoss/metatilesets/gAreaMetaTilesetTypes_DeepwoodShrineBoss_bottom.bin.lz", + "path": "maps/areas/073_DeepwoodShrineBoss/metatileset/gAreaMetaTilesetTypes_DeepwoodShrineBoss_bottom.bin.lz", "start": 5111088, "size": 624, "type": "metatileset_types" }, { - "path": "maps/areas/073_DeepwoodShrineBoss/metatilesets/gAreaMetaTilesetTypes_DeepwoodShrineBoss_top.bin.lz", + "path": "maps/areas/073_DeepwoodShrineBoss/metatileset/gAreaMetaTilesetTypes_DeepwoodShrineBoss_top.bin.lz", "start": 5111712, "size": 220, "type": "metatileset_types" @@ -5455,25 +5455,25 @@ "type": "tileset" }, { - "path": "maps/areas/074_DeepwoodShrineEntry/metatilesets/gAreaMetaTileset_DeepwoodShrineEntry_bottom.bin.lz", + "path": "maps/areas/074_DeepwoodShrineEntry/metatileset/gAreaMetaTileset_DeepwoodShrineEntry_bottom.bin.lz", "start": 5124100, "size": 1516, "type": "metatileset" }, { - "path": "maps/areas/074_DeepwoodShrineEntry/metatilesets/gAreaMetaTileset_DeepwoodShrineEntry_top.bin.lz", + "path": "maps/areas/074_DeepwoodShrineEntry/metatileset/gAreaMetaTileset_DeepwoodShrineEntry_top.bin.lz", "start": 5125616, "size": 1028, "type": "metatileset" }, { - "path": "maps/areas/074_DeepwoodShrineEntry/metatilesets/gAreaMetaTilesetTypes_DeepwoodShrineEntry_bottom.bin.lz", + "path": "maps/areas/074_DeepwoodShrineEntry/metatileset/gAreaMetaTilesetTypes_DeepwoodShrineEntry_bottom.bin.lz", "start": 5126644, "size": 176, "type": "metatileset_types" }, { - "path": "maps/areas/074_DeepwoodShrineEntry/metatilesets/gAreaMetaTilesetTypes_DeepwoodShrineEntry_top.bin.lz", + "path": "maps/areas/074_DeepwoodShrineEntry/metatileset/gAreaMetaTilesetTypes_DeepwoodShrineEntry_top.bin.lz", "start": 5126820, "size": 120, "type": "metatileset_types" @@ -5801,13 +5801,13 @@ "name": "gDungeonMaps_DeepwoodShrine_BossKey" }, { - "path": "maps/areas/072_DeepwoodShrine/rooms/12_Compass/gAreaRoomMap_DeepwoodShrine_Compass_bottom.bin.lz", + "path": "maps/areas/072_DeepwoodShrine/rooms/18_Compass/gAreaRoomMap_DeepwoodShrine_Compass_bottom.bin.lz", "start": 5137908, "size": 504, "type": "metatilemap" }, { - "path": "maps/areas/072_DeepwoodShrine/rooms/12_Compass/gAreaRoomMap_DeepwoodShrine_Compass_top.bin.lz", + "path": "maps/areas/072_DeepwoodShrine/rooms/18_Compass/gAreaRoomMap_DeepwoodShrine_Compass_top.bin.lz", "start": 5138412, "size": 120, "type": "metatilemap" @@ -5844,7 +5844,7 @@ "width": 5, "height": 12 }, - "name": "gDungeonMaps_072_DeepwoodShrine_19_13_unused" + "name": "gDungeonMaps_072_DeepwoodShrine_13_unused" }, { "path": "maps/areas/072_DeepwoodShrine/rooms/20_LilyPadWest/gAreaRoomMap_DeepwoodShrine_LilyPadWest_bottom.bin.lz", @@ -5992,25 +5992,25 @@ "type": "tileset" }, { - "path": "maps/areas/080_CaveOfFlames/metatilesets/gAreaMetaTileset_CaveOfFlames_bottom.bin.lz", + "path": "maps/areas/080_CaveOfFlames/metatileset/gAreaMetaTileset_CaveOfFlames_bottom.bin.lz", "start": 5172140, "size": 7212, "type": "metatileset" }, { - "path": "maps/areas/080_CaveOfFlames/metatilesets/gAreaMetaTileset_CaveOfFlames_top.bin.lz", + "path": "maps/areas/080_CaveOfFlames/metatileset/gAreaMetaTileset_CaveOfFlames_top.bin.lz", "start": 5179352, "size": 6656, "type": "metatileset" }, { - "path": "maps/areas/080_CaveOfFlames/metatilesets/gAreaMetaTilesetTypes_CaveOfFlames_bottom.bin.lz", + "path": "maps/areas/080_CaveOfFlames/metatileset/gAreaMetaTilesetTypes_CaveOfFlames_bottom.bin.lz", "start": 5186008, "size": 1172, "type": "metatileset_types" }, { - "path": "maps/areas/080_CaveOfFlames/metatilesets/gAreaMetaTilesetTypes_CaveOfFlames_top.bin.lz", + "path": "maps/areas/080_CaveOfFlames/metatileset/gAreaMetaTilesetTypes_CaveOfFlames_top.bin.lz", "start": 5187180, "size": 1180, "type": "metatileset_types" @@ -6034,25 +6034,25 @@ "type": "tileset" }, { - "path": "maps/areas/081_CaveOfFlamesBoss/metatilesets/gAreaMetaTileset_CaveOfFlamesBoss_bottom.bin.lz", + "path": "maps/areas/081_CaveOfFlamesBoss/metatileset/gAreaMetaTileset_CaveOfFlamesBoss_bottom.bin.lz", "start": 5210736, "size": 5000, "type": "metatileset" }, { - "path": "maps/areas/081_CaveOfFlamesBoss/metatilesets/gAreaMetaTileset_CaveOfFlamesBoss_top.bin.lz", + "path": "maps/areas/081_CaveOfFlamesBoss/metatileset/gAreaMetaTileset_CaveOfFlamesBoss_top.bin.lz", "start": 5215736, "size": 4444, "type": "metatileset" }, { - "path": "maps/areas/081_CaveOfFlamesBoss/metatilesets/gAreaMetaTilesetTypes_CaveOfFlamesBoss_bottom.bin.lz", + "path": "maps/areas/081_CaveOfFlamesBoss/metatileset/gAreaMetaTilesetTypes_CaveOfFlamesBoss_bottom.bin.lz", "start": 5220180, "size": 652, "type": "metatileset_types" }, { - "path": "maps/areas/081_CaveOfFlamesBoss/metatilesets/gAreaMetaTilesetTypes_CaveOfFlamesBoss_top.bin.lz", + "path": "maps/areas/081_CaveOfFlamesBoss/metatileset/gAreaMetaTilesetTypes_CaveOfFlamesBoss_top.bin.lz", "start": 5220832, "size": 620, "type": "metatileset_types" @@ -6061,7 +6061,7 @@ "path": "maps/areas/080_CaveOfFlames/tilesets/0/gAreaTileset_CaveOfFlames_0_3.4bpp.lz", "start": 5221452, "size": 752, - "type": "tileset_mapping3" + "type": "tileset" }, { "path": "maps/areas/080_CaveOfFlames/rooms/00_AfterCane/gAreaRoomMap_CaveOfFlames_AfterCane_bottom.bin.lz", @@ -6340,13 +6340,13 @@ "name": "gDungeonMaps_CaveOfFlames_TompasDoom" }, { - "path": "maps/areas/080_CaveOfFlames/rooms/11_BeforeGleerok/gAreaRoomMap_CaveOfFlames_BeforeGleerok_bottom.bin.lz", + "path": "maps/areas/080_CaveOfFlames/rooms/18_BeforeGleerok/gAreaRoomMap_CaveOfFlames_BeforeGleerok_bottom.bin.lz", "start": 5234416, "size": 352, "type": "metatilemap" }, { - "path": "maps/areas/080_CaveOfFlames/rooms/11_BeforeGleerok/gAreaRoomMap_CaveOfFlames_BeforeGleerok_top.bin.lz", + "path": "maps/areas/080_CaveOfFlames/rooms/18_BeforeGleerok/gAreaRoomMap_CaveOfFlames_BeforeGleerok_top.bin.lz", "start": 5234768, "size": 192, "type": "metatilemap" @@ -6363,13 +6363,13 @@ "name": "gDungeonMaps_CaveOfFlames_BeforeGleerok" }, { - "path": "maps/areas/080_CaveOfFlames/rooms/11_BosskeyPath1/gAreaRoomMap_CaveOfFlames_BosskeyPath1_bottom.bin.lz", + "path": "maps/areas/080_CaveOfFlames/rooms/19_BosskeyPath1/gAreaRoomMap_CaveOfFlames_BosskeyPath1_bottom.bin.lz", "start": 5235052, "size": 344, "type": "metatilemap" }, { - "path": "maps/areas/080_CaveOfFlames/rooms/11_BosskeyPath1/gAreaRoomMap_CaveOfFlames_BosskeyPath1_top.bin.lz", + "path": "maps/areas/080_CaveOfFlames/rooms/19_BosskeyPath1/gAreaRoomMap_CaveOfFlames_BosskeyPath1_top.bin.lz", "start": 5235396, "size": 240, "type": "metatilemap" @@ -6386,19 +6386,19 @@ "name": "gDungeonMaps_CaveOfFlames_BosskeyPath1" }, { - "path": "maps/areas/080_CaveOfFlames/rooms/11_BosskeyPath2/gAreaRoomMap_CaveOfFlames_BosskeyPath2_bottom.bin.lz", + "path": "maps/areas/080_CaveOfFlames/rooms/20_BosskeyPath2/gAreaRoomMap_CaveOfFlames_BosskeyPath2_bottom.bin.lz", "start": 5235728, "size": 252, "type": "metatilemap" }, { - "path": "maps/areas/080_CaveOfFlames/rooms/11_BosskeyPath2/gAreaRoomMap_CaveOfFlames_BosskeyPath2_top.bin.lz", + "path": "maps/areas/080_CaveOfFlames/rooms/20_BosskeyPath2/gAreaRoomMap_CaveOfFlames_BosskeyPath2_top.bin.lz", "start": 5235980, "size": 292, "type": "metatilemap" }, { - "path": "maps/areas/080_CaveOfFlames/rooms/32_20_BosskeyPath2/dungeon_map.bin", + "path": "maps/areas/080_CaveOfFlames/rooms/20_BosskeyPath2/dungeon_map.bin", "start": 5236272, "size": 92, "type": "dungeon_map", @@ -6409,13 +6409,13 @@ "name": "gDungeonMaps_CaveOfFlames_BosskeyPath2" }, { - "path": "maps/areas/080_CaveOfFlames/rooms/12_Compass/gAreaRoomMap_CaveOfFlames_Compass_bottom.bin.lz", + "path": "maps/areas/080_CaveOfFlames/rooms/21_Compass/gAreaRoomMap_CaveOfFlames_Compass_bottom.bin.lz", "start": 5236364, "size": 56, "type": "metatilemap" }, { - "path": "maps/areas/080_CaveOfFlames/rooms/12_Compass/gAreaRoomMap_CaveOfFlames_Compass_top.bin.lz", + "path": "maps/areas/080_CaveOfFlames/rooms/21_Compass/gAreaRoomMap_CaveOfFlames_Compass_top.bin.lz", "start": 5236420, "size": 308, "type": "metatilemap" @@ -6432,13 +6432,13 @@ "name": "gDungeonMaps_CaveOfFlames_Compass" }, { - "path": "maps/areas/080_CaveOfFlames/rooms/11_BobOmbWall/gAreaRoomMap_CaveOfFlames_BobOmbWall_bottom.bin.lz", + "path": "maps/areas/080_CaveOfFlames/rooms/22_BobOmbWall/gAreaRoomMap_CaveOfFlames_BobOmbWall_bottom.bin.lz", "start": 5236780, "size": 56, "type": "metatilemap" }, { - "path": "maps/areas/080_CaveOfFlames/rooms/11_BobOmbWall/gAreaRoomMap_CaveOfFlames_BobOmbWall_top.bin.lz", + "path": "maps/areas/080_CaveOfFlames/rooms/22_BobOmbWall/gAreaRoomMap_CaveOfFlames_BobOmbWall_top.bin.lz", "start": 5236836, "size": 276, "type": "metatilemap" @@ -6455,13 +6455,13 @@ "name": "gDungeonMaps_CaveOfFlames_BobOmbWall" }, { - "path": "maps/areas/080_CaveOfFlames/rooms/11_BossDoor/gAreaRoomMap_CaveOfFlames_BossDoor_bottom.bin.lz", + "path": "maps/areas/080_CaveOfFlames/rooms/23_BossDoor/gAreaRoomMap_CaveOfFlames_BossDoor_bottom.bin.lz", "start": 5237164, "size": 1260, "type": "metatilemap" }, { - "path": "maps/areas/080_CaveOfFlames/rooms/11_BossDoor/gAreaRoomMap_CaveOfFlames_BossDoor_top.bin.lz", + "path": "maps/areas/080_CaveOfFlames/rooms/23_BossDoor/gAreaRoomMap_CaveOfFlames_BossDoor_top.bin.lz", "start": 5238424, "size": 488, "type": "metatilemap" @@ -6519,25 +6519,25 @@ "type": "tileset" }, { - "path": "maps/areas/043_CastorDarknut/metatilesets/gAreaMetaTileset_CastorDarknut_bottom.bin.lz", + "path": "maps/areas/043_CastorDarknut/metatileset/gAreaMetaTileset_CastorDarknut_bottom.bin.lz", "start": 5267744, "size": 8244, "type": "metatileset" }, { - "path": "maps/areas/043_CastorDarknut/metatilesets/gAreaMetaTileset_CastorDarknut_top.bin.lz", + "path": "maps/areas/043_CastorDarknut/metatileset/gAreaMetaTileset_CastorDarknut_top.bin.lz", "start": 5275988, "size": 6172, "type": "metatileset" }, { - "path": "maps/areas/043_CastorDarknut/metatilesets/gAreaMetaTilesetTypes_CastorDarknut_bottom.bin.lz", + "path": "maps/areas/043_CastorDarknut/metatileset/gAreaMetaTilesetTypes_CastorDarknut_bottom.bin.lz", "start": 5282160, "size": 1104, "type": "metatileset_types" }, { - "path": "maps/areas/043_CastorDarknut/metatilesets/gAreaMetaTilesetTypes_CastorDarknut_top.bin.lz", + "path": "maps/areas/043_CastorDarknut/metatileset/gAreaMetaTilesetTypes_CastorDarknut_top.bin.lz", "start": 5283264, "size": 1132, "type": "metatileset_types" @@ -6561,25 +6561,25 @@ "type": "tileset" }, { - "path": "maps/areas/090_InnerMazaal/metatilesets/gAreaMetaTileset_InnerMazaal_bottom.bin.lz", + "path": "maps/areas/090_InnerMazaal/metatileset/gAreaMetaTileset_InnerMazaal_bottom.bin.lz", "start": 5302556, "size": 3496, "type": "metatileset" }, { - "path": "maps/areas/090_InnerMazaal/metatilesets/gAreaMetaTileset_InnerMazaal_top.bin.lz", + "path": "maps/areas/090_InnerMazaal/metatileset/gAreaMetaTileset_InnerMazaal_top.bin.lz", "start": 5306052, "size": 3788, "type": "metatileset" }, { - "path": "maps/areas/090_InnerMazaal/metatilesets/gAreaMetaTilesetTypes_InnerMazaal_bottom.bin.lz", + "path": "maps/areas/090_InnerMazaal/metatileset/gAreaMetaTilesetTypes_InnerMazaal_bottom.bin.lz", "start": 5309840, "size": 692, "type": "metatileset_types" }, { - "path": "maps/areas/090_InnerMazaal/metatilesets/gAreaMetaTilesetTypes_InnerMazaal_top.bin.lz", + "path": "maps/areas/090_InnerMazaal/metatileset/gAreaMetaTilesetTypes_InnerMazaal_top.bin.lz", "start": 5310532, "size": 796, "type": "metatileset_types" @@ -6603,25 +6603,25 @@ "type": "tileset" }, { - "path": "maps/areas/089_FortressOfWindsTop/metatilesets/gAreaMetaTileset_FortressOfWindsTop_bottom.bin.lz", + "path": "maps/areas/089_FortressOfWindsTop/metatileset/gAreaMetaTileset_FortressOfWindsTop_bottom.bin.lz", "start": 5329352, "size": 2760, "type": "metatileset" }, { - "path": "maps/areas/089_FortressOfWindsTop/metatilesets/gAreaMetaTileset_FortressOfWindsTop_top.bin.lz", + "path": "maps/areas/089_FortressOfWindsTop/metatileset/gAreaMetaTileset_FortressOfWindsTop_top.bin.lz", "start": 5332112, "size": 1428, "type": "metatileset" }, { - "path": "maps/areas/089_FortressOfWindsTop/metatilesets/gAreaMetaTilesetTypes_FortressOfWindsTop_bottom.bin.lz", + "path": "maps/areas/089_FortressOfWindsTop/metatileset/gAreaMetaTilesetTypes_FortressOfWindsTop_bottom.bin.lz", "start": 5333540, "size": 404, "type": "metatileset_types" }, { - "path": "maps/areas/089_FortressOfWindsTop/metatilesets/gAreaMetaTilesetTypes_FortressOfWindsTop_top.bin.lz", + "path": "maps/areas/089_FortressOfWindsTop/metatileset/gAreaMetaTilesetTypes_FortressOfWindsTop_top.bin.lz", "start": 5333944, "size": 276, "type": "metatileset_types" @@ -6764,13 +6764,13 @@ "name": "gDungeonMaps_FortressOfWinds_6" }, { - "path": "maps/areas/088_FortressOfWinds/rooms/13_DarknutRoom/gAreaRoomMap_FortressOfWinds_DarknutRoom_bottom.bin.lz", + "path": "maps/areas/088_FortressOfWinds/rooms/16_DarknutRoom/gAreaRoomMap_FortressOfWinds_DarknutRoom_bottom.bin.lz", "start": 5338360, "size": 60, "type": "metatilemap" }, { - "path": "maps/areas/088_FortressOfWinds/rooms/13_DarknutRoom/gAreaRoomMap_FortressOfWinds_DarknutRoom_top.bin.lz", + "path": "maps/areas/088_FortressOfWinds/rooms/16_DarknutRoom/gAreaRoomMap_FortressOfWinds_DarknutRoom_top.bin.lz", "start": 5338420, "size": 384, "type": "metatilemap" @@ -6787,13 +6787,13 @@ "name": "gDungeonMaps_FortressOfWinds_DarknutRoom" }, { - "path": "maps/areas/088_FortressOfWinds/rooms/10_ArrowEyeBridge/gAreaRoomMap_FortressOfWinds_ArrowEyeBridge_bottom.bin.lz", + "path": "maps/areas/088_FortressOfWinds/rooms/17_ArrowEyeBridge/gAreaRoomMap_FortressOfWinds_ArrowEyeBridge_bottom.bin.lz", "start": 5338872, "size": 136, "type": "metatilemap" }, { - "path": "maps/areas/088_FortressOfWinds/rooms/10_ArrowEyeBridge/gAreaRoomMap_FortressOfWinds_ArrowEyeBridge_top.bin.lz", + "path": "maps/areas/088_FortressOfWinds/rooms/17_ArrowEyeBridge/gAreaRoomMap_FortressOfWinds_ArrowEyeBridge_top.bin.lz", "start": 5339008, "size": 300, "type": "metatilemap" @@ -6948,13 +6948,13 @@ "name": "gDungeonMaps_FortressOfWinds_Stalfos" }, { - "path": "maps/areas/088_FortressOfWinds/rooms/14_EntranceMoleMitts/gAreaRoomMap_FortressOfWinds_EntranceMoleMitts_bottom.bin.lz", + "path": "maps/areas/088_FortressOfWinds/rooms/24_EntranceMoleMitts/gAreaRoomMap_FortressOfWinds_EntranceMoleMitts_bottom.bin.lz", "start": 5343004, "size": 216, "type": "metatilemap" }, { - "path": "maps/areas/088_FortressOfWinds/rooms/14_EntranceMoleMitts/gAreaRoomMap_FortressOfWinds_EntranceMoleMitts_top.bin.lz", + "path": "maps/areas/088_FortressOfWinds/rooms/24_EntranceMoleMitts/gAreaRoomMap_FortressOfWinds_EntranceMoleMitts_top.bin.lz", "start": 5343220, "size": 156, "type": "metatilemap" @@ -6971,19 +6971,19 @@ "name": "gDungeonMaps_FortressOfWinds_EntranceMoleMitts" }, { - "path": "maps/areas/088_FortressOfWinds/rooms/37_25_Main2f/gAreaRoomMap_FortressOfWinds_Main2f_bottom.bin.lz", + "path": "maps/areas/088_FortressOfWinds/rooms/25_Main2f/gAreaRoomMap_FortressOfWinds_Main2f_bottom.bin.lz", "start": 5343444, "size": 612, "type": "metatilemap" }, { - "path": "maps/areas/088_FortressOfWinds/rooms/37_25_Main2f/gAreaRoomMap_FortressOfWinds_Main2f_top.bin.lz", + "path": "maps/areas/088_FortressOfWinds/rooms/25_Main2f/gAreaRoomMap_FortressOfWinds_Main2f_top.bin.lz", "start": 5344056, "size": 236, "type": "metatilemap" }, { - "path": "maps/areas/088_FortressOfWinds/rooms/37_25_Main2f/dungeon_map.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/25_Main2f/dungeon_map.bin", "start": 5344292, "size": 132, "type": "dungeon_map", @@ -6994,19 +6994,19 @@ "name": "gDungeonMaps_FortressOfWinds_Main2f" }, { - "path": "maps/areas/088_FortressOfWinds/rooms/38_26_MinishHole/gAreaRoomMap_FortressOfWinds_MinishHole_bottom.bin.lz", + "path": "maps/areas/088_FortressOfWinds/rooms/26_MinishHole/gAreaRoomMap_FortressOfWinds_MinishHole_bottom.bin.lz", "start": 5344424, "size": 224, "type": "metatilemap" }, { - "path": "maps/areas/088_FortressOfWinds/rooms/38_26_MinishHole/gAreaRoomMap_FortressOfWinds_MinishHole_top.bin.lz", + "path": "maps/areas/088_FortressOfWinds/rooms/26_MinishHole/gAreaRoomMap_FortressOfWinds_MinishHole_top.bin.lz", "start": 5344648, "size": 176, "type": "metatilemap" }, { - "path": "maps/areas/088_FortressOfWinds/rooms/38_26_MinishHole/dungeon_map.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/26_MinishHole/dungeon_map.bin", "start": 5344824, "size": 68, "type": "dungeon_map", @@ -7017,19 +7017,19 @@ "name": "gDungeonMaps_FortressOfWinds_MinishHole" }, { - "path": "maps/areas/088_FortressOfWinds/rooms/11_BossKey/gAreaRoomMap_FortressOfWinds_BossKey_bottom.bin.lz", + "path": "maps/areas/088_FortressOfWinds/rooms/27_BossKey/gAreaRoomMap_FortressOfWinds_BossKey_bottom.bin.lz", "start": 5344892, "size": 164, "type": "metatilemap" }, { - "path": "maps/areas/088_FortressOfWinds/rooms/11_BossKey/gAreaRoomMap_FortressOfWinds_BossKey_top.bin.lz", + "path": "maps/areas/088_FortressOfWinds/rooms/27_BossKey/gAreaRoomMap_FortressOfWinds_BossKey_top.bin.lz", "start": 5345056, "size": 268, "type": "metatilemap" }, { - "path": "maps/areas/088_FortressOfWinds/rooms/39_27_BossKey/dungeon_map.bin", + "path": "maps/areas/088_FortressOfWinds/rooms/27_BossKey/dungeon_map.bin", "start": 5345324, "size": 68, "type": "dungeon_map", @@ -7063,13 +7063,13 @@ "name": "gDungeonMaps_FortressOfWinds_WestStairs2f" }, { - "path": "maps/areas/088_FortressOfWinds/rooms/14_EastStairs2f/gAreaRoomMap_FortressOfWinds_EastStairs2f_bottom.bin.lz", + "path": "maps/areas/088_FortressOfWinds/rooms/29_EastStairs2f/gAreaRoomMap_FortressOfWinds_EastStairs2f_bottom.bin.lz", "start": 5345856, "size": 324, "type": "metatilemap" }, { - "path": "maps/areas/088_FortressOfWinds/rooms/14_EastStairs2f/gAreaRoomMap_FortressOfWinds_EastStairs2f_top.bin.lz", + "path": "maps/areas/088_FortressOfWinds/rooms/29_EastStairs2f/gAreaRoomMap_FortressOfWinds_EastStairs2f_top.bin.lz", "start": 5346180, "size": 104, "type": "metatilemap" @@ -7109,13 +7109,13 @@ "name": "gDungeonMaps_FortressOfWinds_WestStairs1f" }, { - "path": "maps/areas/088_FortressOfWinds/rooms/12_CenterStairs1f/gAreaRoomMap_FortressOfWinds_CenterStairs1f_bottom.bin.lz", + "path": "maps/areas/088_FortressOfWinds/rooms/33_CenterStairs1f/gAreaRoomMap_FortressOfWinds_CenterStairs1f_bottom.bin.lz", "start": 5346760, "size": 260, "type": "metatilemap" }, { - "path": "maps/areas/088_FortressOfWinds/rooms/12_CenterStairs1f/gAreaRoomMap_FortressOfWinds_CenterStairs1f_top.bin.lz", + "path": "maps/areas/088_FortressOfWinds/rooms/33_CenterStairs1f/gAreaRoomMap_FortressOfWinds_CenterStairs1f_top.bin.lz", "start": 5347020, "size": 112, "type": "metatilemap" @@ -7132,13 +7132,13 @@ "name": "gDungeonMaps_FortressOfWinds_CenterStairs1f" }, { - "path": "maps/areas/088_FortressOfWinds/rooms/14_EastStairs1f/gAreaRoomMap_FortressOfWinds_EastStairs1f_bottom.bin.lz", + "path": "maps/areas/088_FortressOfWinds/rooms/34_EastStairs1f/gAreaRoomMap_FortressOfWinds_EastStairs1f_bottom.bin.lz", "start": 5347184, "size": 260, "type": "metatilemap" }, { - "path": "maps/areas/088_FortressOfWinds/rooms/14_EastStairs1f/gAreaRoomMap_FortressOfWinds_EastStairs1f_top.bin.lz", + "path": "maps/areas/088_FortressOfWinds/rooms/34_EastStairs1f/gAreaRoomMap_FortressOfWinds_EastStairs1f_top.bin.lz", "start": 5347444, "size": 120, "type": "metatilemap" @@ -7255,25 +7255,25 @@ "type": "tileset" }, { - "path": "maps/areas/096_TempleOfDroplets/metatilesets/gAreaMetaTileset_TempleOfDroplets_bottom.bin.lz", + "path": "maps/areas/096_TempleOfDroplets/metatileset/gAreaMetaTileset_TempleOfDroplets_bottom.bin.lz", "start": 5378008, "size": 8684, "type": "metatileset" }, { - "path": "maps/areas/096_TempleOfDroplets/metatilesets/gAreaMetaTileset_TempleOfDroplets_top.bin.lz", + "path": "maps/areas/096_TempleOfDroplets/metatileset/gAreaMetaTileset_TempleOfDroplets_top.bin.lz", "start": 5386692, "size": 9148, "type": "metatileset" }, { - "path": "maps/areas/096_TempleOfDroplets/metatilesets/gAreaMetaTilesetTypes_TempleOfDroplets_bottom.bin.lz", + "path": "maps/areas/096_TempleOfDroplets/metatileset/gAreaMetaTilesetTypes_TempleOfDroplets_bottom.bin.lz", "start": 5395840, "size": 1236, "type": "metatileset_types" }, { - "path": "maps/areas/096_TempleOfDroplets/metatilesets/gAreaMetaTilesetTypes_TempleOfDroplets_top.bin.lz", + "path": "maps/areas/096_TempleOfDroplets/metatileset/gAreaMetaTilesetTypes_TempleOfDroplets_top.bin.lz", "start": 5397076, "size": 1228, "type": "metatileset_types" @@ -7297,25 +7297,25 @@ "type": "tileset" }, { - "path": "maps/areas/097_Null61/metatilesets/gAreaMetaTileset_Null61_bottom.bin.lz", + "path": "maps/areas/097_Null61/metatileset/gAreaMetaTileset_Null61_bottom.bin.lz", "start": 5412536, "size": 1224, "type": "metatileset" }, { - "path": "maps/areas/097_Null61/metatilesets/gAreaMetaTileset_Null61_top.bin.lz", + "path": "maps/areas/097_Null61/metatileset/gAreaMetaTileset_Null61_top.bin.lz", "start": 5413760, "size": 288, "type": "metatileset" }, { - "path": "maps/areas/097_Null61/metatilesets/gAreaMetaTilesetTypes_Null61_bottom.bin.lz", + "path": "maps/areas/097_Null61/metatileset/gAreaMetaTilesetTypes_Null61_bottom.bin.lz", "start": 5414048, "size": 152, "type": "metatileset_types" }, { - "path": "maps/areas/097_Null61/metatilesets/gAreaMetaTilesetTypes_Null61_top.bin.lz", + "path": "maps/areas/097_Null61/metatileset/gAreaMetaTilesetTypes_Null61_top.bin.lz", "start": 5414200, "size": 104, "type": "metatileset_types" @@ -7597,19 +7597,19 @@ "name": "gDungeonMaps_TempleOfDroplets_HoleToBlueChuKey" }, { - "path": "maps/areas/096_TempleOfDroplets/rooms/18_12_WestWaterfallSoutheast/gAreaRoomMap_TempleOfDroplets_WestWaterfallSoutheast_bottom.bin.lz", + "path": "maps/areas/096_TempleOfDroplets/rooms/12_WestWaterfallSoutheast/gAreaRoomMap_TempleOfDroplets_WestWaterfallSoutheast_bottom.bin.lz", "start": 5423604, "size": 56, "type": "metatilemap" }, { - "path": "maps/areas/096_TempleOfDroplets/rooms/18_12_WestWaterfallSoutheast/gAreaRoomMap_TempleOfDroplets_WestWaterfallSoutheast_top.bin.lz", + "path": "maps/areas/096_TempleOfDroplets/rooms/12_WestWaterfallSoutheast/gAreaRoomMap_TempleOfDroplets_WestWaterfallSoutheast_top.bin.lz", "start": 5423660, "size": 256, "type": "metatilemap" }, { - "path": "maps/areas/096_TempleOfDroplets/rooms/18_12_WestWaterfallSoutheast/dungeon_map.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/12_WestWaterfallSoutheast/dungeon_map.bin", "start": 5423916, "size": 52, "type": "dungeon_map", @@ -7620,19 +7620,19 @@ "name": "gDungeonMaps_TempleOfDroplets_WestWaterfallSoutheast" }, { - "path": "maps/areas/096_TempleOfDroplets/rooms/19_13_WestWaterfallSouthwest/gAreaRoomMap_TempleOfDroplets_WestWaterfallSouthwest_bottom.bin.lz", + "path": "maps/areas/096_TempleOfDroplets/rooms/13_WestWaterfallSouthwest/gAreaRoomMap_TempleOfDroplets_WestWaterfallSouthwest_bottom.bin.lz", "start": 5423968, "size": 372, "type": "metatilemap" }, { - "path": "maps/areas/096_TempleOfDroplets/rooms/19_13_WestWaterfallSouthwest/gAreaRoomMap_TempleOfDroplets_WestWaterfallSouthwest_top.bin.lz", + "path": "maps/areas/096_TempleOfDroplets/rooms/13_WestWaterfallSouthwest/gAreaRoomMap_TempleOfDroplets_WestWaterfallSouthwest_top.bin.lz", "start": 5424340, "size": 360, "type": "metatilemap" }, { - "path": "maps/areas/096_TempleOfDroplets/rooms/19_13_WestWaterfallSouthwest/dungeon_map.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/13_WestWaterfallSouthwest/dungeon_map.bin", "start": 5424700, "size": 132, "type": "dungeon_map", @@ -7712,13 +7712,13 @@ "name": "gDungeonMaps_TempleOfDroplets_BlueChu" }, { - "path": "maps/areas/096_TempleOfDroplets/rooms/16_BlueChuKey/gAreaRoomMap_TempleOfDroplets_BlueChuKey_bottom.bin.lz", + "path": "maps/areas/096_TempleOfDroplets/rooms/17_BlueChuKey/gAreaRoomMap_TempleOfDroplets_BlueChuKey_bottom.bin.lz", "start": 5426288, "size": 200, "type": "metatilemap" }, { - "path": "maps/areas/096_TempleOfDroplets/rooms/16_BlueChuKey/gAreaRoomMap_TempleOfDroplets_BlueChuKey_top.bin.lz", + "path": "maps/areas/096_TempleOfDroplets/rooms/17_BlueChuKey/gAreaRoomMap_TempleOfDroplets_BlueChuKey_top.bin.lz", "start": 5426488, "size": 136, "type": "metatilemap" @@ -7850,19 +7850,19 @@ "name": "gDungeonMaps_TempleOfDroplets_BlockCloneIceBridge" }, { - "path": "maps/areas/096_TempleOfDroplets/rooms/55_37_StairsToScissorsMiniboss/gAreaRoomMap_TempleOfDroplets_StairsToScissorsMiniboss_bottom.bin.lz", + "path": "maps/areas/096_TempleOfDroplets/rooms/37_StairsToScissorsMiniboss/gAreaRoomMap_TempleOfDroplets_StairsToScissorsMiniboss_bottom.bin.lz", "start": 5429980, "size": 280, "type": "metatilemap" }, { - "path": "maps/areas/096_TempleOfDroplets/rooms/55_37_StairsToScissorsMiniboss/gAreaRoomMap_TempleOfDroplets_StairsToScissorsMiniboss_top.bin.lz", + "path": "maps/areas/096_TempleOfDroplets/rooms/37_StairsToScissorsMiniboss/gAreaRoomMap_TempleOfDroplets_StairsToScissorsMiniboss_top.bin.lz", "start": 5430260, "size": 200, "type": "metatilemap" }, { - "path": "maps/areas/096_TempleOfDroplets/rooms/55_37_StairsToScissorsMiniboss/dungeon_map.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/37_StairsToScissorsMiniboss/dungeon_map.bin", "start": 5430460, "size": 68, "type": "dungeon_map", @@ -7873,19 +7873,19 @@ "name": "gDungeonMaps_TempleOfDroplets_StairsToScissorsMiniboss" }, { - "path": "maps/areas/096_TempleOfDroplets/rooms/56_38_SpikeBarFlipperRoom/gAreaRoomMap_TempleOfDroplets_SpikeBarFlipperRoom_bottom.bin.lz", + "path": "maps/areas/096_TempleOfDroplets/rooms/38_SpikeBarFlipperRoom/gAreaRoomMap_TempleOfDroplets_SpikeBarFlipperRoom_bottom.bin.lz", "start": 5430528, "size": 152, "type": "metatilemap" }, { - "path": "maps/areas/096_TempleOfDroplets/rooms/56_38_SpikeBarFlipperRoom/gAreaRoomMap_TempleOfDroplets_SpikeBarFlipperRoom_top.bin.lz", + "path": "maps/areas/096_TempleOfDroplets/rooms/38_SpikeBarFlipperRoom/gAreaRoomMap_TempleOfDroplets_SpikeBarFlipperRoom_top.bin.lz", "start": 5430680, "size": 712, "type": "metatilemap" }, { - "path": "maps/areas/096_TempleOfDroplets/rooms/56_38_SpikeBarFlipperRoom/dungeon_map.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/38_SpikeBarFlipperRoom/dungeon_map.bin", "start": 5431392, "size": 160, "type": "dungeon_map", @@ -7896,19 +7896,19 @@ "name": "gDungeonMaps_TempleOfDroplets_SpikeBarFlipperRoom" }, { - "path": "maps/areas/096_TempleOfDroplets/rooms/57_39_9Lanterns/gAreaRoomMap_TempleOfDroplets_9Lanterns_bottom.bin.lz", + "path": "maps/areas/096_TempleOfDroplets/rooms/39_9Lanterns/gAreaRoomMap_TempleOfDroplets_9Lanterns_bottom.bin.lz", "start": 5431552, "size": 60, "type": "metatilemap" }, { - "path": "maps/areas/096_TempleOfDroplets/rooms/57_39_9Lanterns/gAreaRoomMap_TempleOfDroplets_9Lanterns_top.bin.lz", + "path": "maps/areas/096_TempleOfDroplets/rooms/39_9Lanterns/gAreaRoomMap_TempleOfDroplets_9Lanterns_top.bin.lz", "start": 5431612, "size": 308, "type": "metatilemap" }, { - "path": "maps/areas/096_TempleOfDroplets/rooms/57_39_9Lanterns/dungeon_map.bin", + "path": "maps/areas/096_TempleOfDroplets/rooms/39_9Lanterns/dungeon_map.bin", "start": 5431920, "size": 56, "type": "dungeon_map", @@ -8077,13 +8077,13 @@ "name": "gDungeonMaps_TempleOfDroplets_AfterTwinMadderpillars" }, { - "path": "maps/areas/096_TempleOfDroplets/rooms/16_BlueChuKeyLever/gAreaRoomMap_TempleOfDroplets_BlueChuKeyLever_bottom.bin.lz", + "path": "maps/areas/096_TempleOfDroplets/rooms/46_BlueChuKeyLever/gAreaRoomMap_TempleOfDroplets_BlueChuKeyLever_bottom.bin.lz", "start": 5436516, "size": 244, "type": "metatilemap" }, { - "path": "maps/areas/096_TempleOfDroplets/rooms/16_BlueChuKeyLever/gAreaRoomMap_TempleOfDroplets_BlueChuKeyLever_top.bin.lz", + "path": "maps/areas/096_TempleOfDroplets/rooms/46_BlueChuKeyLever/gAreaRoomMap_TempleOfDroplets_BlueChuKeyLever_top.bin.lz", "start": 5436760, "size": 156, "type": "metatilemap" @@ -8376,13 +8376,13 @@ "type": "metatilemap" }, { - "path": "maps/areas/098_HyruleTownMinishCaves/rooms/07_Unused10/gAreaRoomMap_HyruleTownMinishCaves_Unused10_bottom.bin.lz", + "path": "maps/areas/098_HyruleTownMinishCaves/rooms/16_Unused10/gAreaRoomMap_HyruleTownMinishCaves_Unused10_bottom.bin.lz", "start": 5443984, "size": 308, "type": "metatilemap" }, { - "path": "maps/areas/098_HyruleTownMinishCaves/rooms/07_Unused10/gAreaRoomMap_HyruleTownMinishCaves_Unused10_top.bin.lz", + "path": "maps/areas/098_HyruleTownMinishCaves/rooms/16_Unused10/gAreaRoomMap_HyruleTownMinishCaves_Unused10_top.bin.lz", "start": 5444292, "size": 104, "type": "metatilemap" @@ -8436,13 +8436,13 @@ "type": "metatilemap" }, { - "path": "maps/areas/098_HyruleTownMinishCaves/rooms/01_10/gAreaRoomMap_HyruleTownMinishCaves_10_bottom.bin.lz", + "path": "maps/areas/098_HyruleTownMinishCaves/rooms/21_10/gAreaRoomMap_HyruleTownMinishCaves_10_bottom.bin.lz", "start": 5445884, "size": 220, "type": "metatilemap" }, { - "path": "maps/areas/098_HyruleTownMinishCaves/rooms/01_10/gAreaRoomMap_HyruleTownMinishCaves_10_top.bin.lz", + "path": "maps/areas/098_HyruleTownMinishCaves/rooms/21_10/gAreaRoomMap_HyruleTownMinishCaves_10_top.bin.lz", "start": 5446104, "size": 208, "type": "metatilemap" @@ -8466,25 +8466,25 @@ "type": "tileset" }, { - "path": "maps/areas/104_RoyalCrypt/metatilesets/gAreaMetaTileset_RoyalCrypt_bottom.bin.lz", + "path": "maps/areas/104_RoyalCrypt/metatileset/gAreaMetaTileset_RoyalCrypt_bottom.bin.lz", "start": 5467176, "size": 7152, "type": "metatileset" }, { - "path": "maps/areas/104_RoyalCrypt/metatilesets/gAreaMetaTileset_RoyalCrypt_top.bin.lz", + "path": "maps/areas/104_RoyalCrypt/metatileset/gAreaMetaTileset_RoyalCrypt_top.bin.lz", "start": 5474328, "size": 5120, "type": "metatileset" }, { - "path": "maps/areas/104_RoyalCrypt/metatilesets/gAreaMetaTilesetTypes_RoyalCrypt_bottom.bin.lz", + "path": "maps/areas/104_RoyalCrypt/metatileset/gAreaMetaTilesetTypes_RoyalCrypt_bottom.bin.lz", "start": 5479448, "size": 1196, "type": "metatileset_types" }, { - "path": "maps/areas/104_RoyalCrypt/metatilesets/gAreaMetaTilesetTypes_RoyalCrypt_top.bin.lz", + "path": "maps/areas/104_RoyalCrypt/metatileset/gAreaMetaTilesetTypes_RoyalCrypt_top.bin.lz", "start": 5480644, "size": 964, "type": "metatileset_types" @@ -8616,25 +8616,25 @@ "type": "tileset" }, { - "path": "maps/areas/112_PalaceOfWinds/metatilesets/gAreaMetaTileset_PalaceOfWinds_bottom.bin.lz", + "path": "maps/areas/112_PalaceOfWinds/metatileset/gAreaMetaTileset_PalaceOfWinds_bottom.bin.lz", "start": 5512468, "size": 7284, "type": "metatileset" }, { - "path": "maps/areas/112_PalaceOfWinds/metatilesets/gAreaMetaTileset_PalaceOfWinds_top.bin.lz", + "path": "maps/areas/112_PalaceOfWinds/metatileset/gAreaMetaTileset_PalaceOfWinds_top.bin.lz", "start": 5519752, "size": 6372, "type": "metatileset" }, { - "path": "maps/areas/112_PalaceOfWinds/metatilesets/gAreaMetaTilesetTypes_PalaceOfWinds_bottom.bin.lz", + "path": "maps/areas/112_PalaceOfWinds/metatileset/gAreaMetaTilesetTypes_PalaceOfWinds_bottom.bin.lz", "start": 5526124, "size": 1228, "type": "metatileset_types" }, { - "path": "maps/areas/112_PalaceOfWinds/metatilesets/gAreaMetaTilesetTypes_PalaceOfWinds_top.bin.lz", + "path": "maps/areas/112_PalaceOfWinds/metatileset/gAreaMetaTilesetTypes_PalaceOfWinds_top.bin.lz", "start": 5527352, "size": 1188, "type": "metatileset_types" @@ -8643,7 +8643,7 @@ "path": "maps/areas/112_PalaceOfWinds/tilesets/0/gAreaTileset_PalaceOfWinds_0_3.4bpp.lz", "start": 5528540, "size": 548, - "type": "tileset_mapping3" + "type": "tileset" }, { "path": "maps/areas/113_PalaceOfWindsBoss/tilesets/0/gAreaTileset_PalaceOfWindsBoss_0_0.4bpp.lz", @@ -8680,13 +8680,13 @@ } }, { - "path": "maps/areas/113_PalaceOfWindsBoss/metatilesets/gAreaMetaTileset_PalaceOfWindsBoss_top.bin.lz", + "path": "maps/areas/113_PalaceOfWindsBoss/metatileset/gAreaMetaTileset_PalaceOfWindsBoss_top.bin.lz", "start": 5538032, "size": 72, "type": "metatileset" }, { - "path": "maps/areas/113_PalaceOfWindsBoss/metatilesets/gAreaMetaTilesetTypes_PalaceOfWindsBoss_top.bin.lz", + "path": "maps/areas/113_PalaceOfWindsBoss/metatileset/gAreaMetaTilesetTypes_PalaceOfWindsBoss_top.bin.lz", "start": 5538104, "size": 28, "type": "metatileset_types" @@ -8702,7 +8702,7 @@ "path": "maps/areas/113_PalaceOfWindsBoss/tilesets/0/gAreaTileset_PalaceOfWindsBoss_0_2.4bpp.lz", "start": 5541760, "size": 548, - "type": "tileset_mapping3" + "type": "tileset" }, { "path": "maps/areas/112_PalaceOfWinds/rooms/00_GyorgTornado/gAreaRoomMap_PalaceOfWinds_GyorgTornado_bottom.bin.lz", @@ -9464,19 +9464,19 @@ "name": "gDungeonMaps_PalaceOfWinds_KeyArrowButton" }, { - "path": "maps/areas/112_PalaceOfWinds/rooms/51_33_GratesTo3f/gAreaRoomMap_PalaceOfWinds_GratesTo3f_bottom.bin.lz", + "path": "maps/areas/112_PalaceOfWinds/rooms/33_GratesTo3f/gAreaRoomMap_PalaceOfWinds_GratesTo3f_bottom.bin.lz", "start": 5564480, "size": 916, "type": "metatilemap" }, { - "path": "maps/areas/112_PalaceOfWinds/rooms/51_33_GratesTo3f/gAreaRoomMap_PalaceOfWinds_GratesTo3f_top.bin.lz", + "path": "maps/areas/112_PalaceOfWinds/rooms/33_GratesTo3f/gAreaRoomMap_PalaceOfWinds_GratesTo3f_top.bin.lz", "start": 5565396, "size": 508, "type": "metatilemap" }, { - "path": "maps/areas/112_PalaceOfWinds/rooms/51_33_GratesTo3f/dungeon_map.bin", + "path": "maps/areas/112_PalaceOfWinds/rooms/33_GratesTo3f/dungeon_map.bin", "start": 5565904, "size": 360, "type": "dungeon_map", @@ -9924,25 +9924,25 @@ "type": "tileset" }, { - "path": "maps/areas/120_Sanctuary/metatilesets/gAreaMetaTileset_Sanctuary_bottom.bin.lz", + "path": "maps/areas/120_Sanctuary/metatileset/gAreaMetaTileset_Sanctuary_bottom.bin.lz", "start": 5602952, "size": 7944, "type": "metatileset" }, { - "path": "maps/areas/120_Sanctuary/metatilesets/gAreaMetaTileset_Sanctuary_top.bin.lz", + "path": "maps/areas/120_Sanctuary/metatileset/gAreaMetaTileset_Sanctuary_top.bin.lz", "start": 5610896, "size": 4356, "type": "metatileset" }, { - "path": "maps/areas/120_Sanctuary/metatilesets/gAreaMetaTilesetTypes_Sanctuary_bottom.bin.lz", + "path": "maps/areas/120_Sanctuary/metatileset/gAreaMetaTilesetTypes_Sanctuary_bottom.bin.lz", "start": 5615252, "size": 868, "type": "metatileset_types" }, { - "path": "maps/areas/120_Sanctuary/metatilesets/gAreaMetaTilesetTypes_Sanctuary_top.bin.lz", + "path": "maps/areas/120_Sanctuary/metatileset/gAreaMetaTilesetTypes_Sanctuary_top.bin.lz", "start": 5616120, "size": 756, "type": "metatileset_types" @@ -10002,25 +10002,25 @@ "type": "tileset" }, { - "path": "maps/areas/128_HyruleCastle/metatilesets/gAreaMetaTileset_HyruleCastle_bottom.bin.lz", + "path": "maps/areas/128_HyruleCastle/metatileset/gAreaMetaTileset_HyruleCastle_bottom.bin.lz", "start": 5643412, "size": 7540, "type": "metatileset" }, { - "path": "maps/areas/128_HyruleCastle/metatilesets/gAreaMetaTileset_HyruleCastle_top.bin.lz", + "path": "maps/areas/128_HyruleCastle/metatileset/gAreaMetaTileset_HyruleCastle_top.bin.lz", "start": 5650952, "size": 5288, "type": "metatileset" }, { - "path": "maps/areas/128_HyruleCastle/metatilesets/gAreaMetaTilesetTypes_HyruleCastle_bottom.bin.lz", + "path": "maps/areas/128_HyruleCastle/metatileset/gAreaMetaTilesetTypes_HyruleCastle_bottom.bin.lz", "start": 5656240, "size": 1068, "type": "metatileset_types" }, { - "path": "maps/areas/128_HyruleCastle/metatilesets/gAreaMetaTilesetTypes_HyruleCastle_top.bin.lz", + "path": "maps/areas/128_HyruleCastle/metatileset/gAreaMetaTilesetTypes_HyruleCastle_top.bin.lz", "start": 5657308, "size": 844, "type": "metatileset_types" @@ -10135,25 +10135,25 @@ "type": "tileset" }, { - "path": "maps/areas/129_SanctuaryEntrance/metatilesets/gAreaMetaTileset_SanctuaryEntrance_bottom.bin.lz", + "path": "maps/areas/129_SanctuaryEntrance/metatileset/gAreaMetaTileset_SanctuaryEntrance_bottom.bin.lz", "start": 5680072, "size": 2900, "type": "metatileset" }, { - "path": "maps/areas/129_SanctuaryEntrance/metatilesets/gAreaMetaTileset_SanctuaryEntrance_top.bin.lz", + "path": "maps/areas/129_SanctuaryEntrance/metatileset/gAreaMetaTileset_SanctuaryEntrance_top.bin.lz", "start": 5682972, "size": 896, "type": "metatileset" }, { - "path": "maps/areas/129_SanctuaryEntrance/metatilesets/gAreaMetaTilesetTypes_SanctuaryEntrance_bottom.bin.lz", + "path": "maps/areas/129_SanctuaryEntrance/metatileset/gAreaMetaTilesetTypes_SanctuaryEntrance_bottom.bin.lz", "start": 5683868, "size": 368, "type": "metatileset_types" }, { - "path": "maps/areas/129_SanctuaryEntrance/metatilesets/gAreaMetaTilesetTypes_SanctuaryEntrance_top.bin.lz", + "path": "maps/areas/129_SanctuaryEntrance/metatileset/gAreaMetaTilesetTypes_SanctuaryEntrance_top.bin.lz", "start": 5684236, "size": 240, "type": "metatileset_types" @@ -10189,25 +10189,25 @@ "type": "tileset" }, { - "path": "maps/areas/136_DarkHyruleCastle/metatilesets/gAreaMetaTileset_DarkHyruleCastle_bottom.bin.lz", + "path": "maps/areas/136_DarkHyruleCastle/metatileset/gAreaMetaTileset_DarkHyruleCastle_bottom.bin.lz", "start": 5710768, "size": 11584, "type": "metatileset" }, { - "path": "maps/areas/136_DarkHyruleCastle/metatilesets/gAreaMetaTileset_DarkHyruleCastle_top.bin.lz", + "path": "maps/areas/136_DarkHyruleCastle/metatileset/gAreaMetaTileset_DarkHyruleCastle_top.bin.lz", "start": 5722352, "size": 7796, "type": "metatileset" }, { - "path": "maps/areas/136_DarkHyruleCastle/metatilesets/gAreaMetaTilesetTypes_DarkHyruleCastle_bottom.bin.lz", + "path": "maps/areas/136_DarkHyruleCastle/metatileset/gAreaMetaTilesetTypes_DarkHyruleCastle_bottom.bin.lz", "start": 5730148, "size": 1416, "type": "metatileset_types" }, { - "path": "maps/areas/136_DarkHyruleCastle/metatilesets/gAreaMetaTilesetTypes_DarkHyruleCastle_top.bin.lz", + "path": "maps/areas/136_DarkHyruleCastle/metatileset/gAreaMetaTilesetTypes_DarkHyruleCastle_top.bin.lz", "start": 5731564, "size": 1264, "type": "metatileset_types" @@ -10231,25 +10231,25 @@ "type": "tileset" }, { - "path": "maps/areas/141_DarkHyruleCastleBridge/metatilesets/gAreaMetaTileset_DarkHyruleCastleBridge_bottom.bin.lz", + "path": "maps/areas/141_DarkHyruleCastleBridge/metatileset/gAreaMetaTileset_DarkHyruleCastleBridge_bottom.bin.lz", "start": 5746936, "size": 3552, "type": "metatileset" }, { - "path": "maps/areas/141_DarkHyruleCastleBridge/metatilesets/gAreaMetaTileset_DarkHyruleCastleBridge_top.bin.lz", + "path": "maps/areas/141_DarkHyruleCastleBridge/metatileset/gAreaMetaTileset_DarkHyruleCastleBridge_top.bin.lz", "start": 5750488, "size": 2320, "type": "metatileset" }, { - "path": "maps/areas/141_DarkHyruleCastleBridge/metatilesets/gAreaMetaTilesetTypes_DarkHyruleCastleBridge_bottom.bin.lz", + "path": "maps/areas/141_DarkHyruleCastleBridge/metatileset/gAreaMetaTilesetTypes_DarkHyruleCastleBridge_bottom.bin.lz", "start": 5752808, "size": 628, "type": "metatileset_types" }, { - "path": "maps/areas/141_DarkHyruleCastleBridge/metatilesets/gAreaMetaTilesetTypes_DarkHyruleCastleBridge_top.bin.lz", + "path": "maps/areas/141_DarkHyruleCastleBridge/metatileset/gAreaMetaTilesetTypes_DarkHyruleCastleBridge_top.bin.lz", "start": 5753436, "size": 536, "type": "metatileset_types" @@ -10273,25 +10273,25 @@ "type": "tileset" }, { - "path": "maps/areas/139_Vaati3/metatilesets/gAreaMetaTileset_Vaati3_bottom.bin.lz", + "path": "maps/areas/139_Vaati3/metatileset/gAreaMetaTileset_Vaati3_bottom.bin.lz", "start": 5771680, "size": 1720, "type": "metatileset" }, { - "path": "maps/areas/139_Vaati3/metatilesets/gAreaMetaTileset_Vaati3_top.bin.lz", + "path": "maps/areas/139_Vaati3/metatileset/gAreaMetaTileset_Vaati3_top.bin.lz", "start": 5773400, "size": 476, "type": "metatileset" }, { - "path": "maps/areas/139_Vaati3/metatilesets/gAreaMetaTilesetTypes_Vaati3_bottom.bin.lz", + "path": "maps/areas/139_Vaati3/metatileset/gAreaMetaTilesetTypes_Vaati3_bottom.bin.lz", "start": 5773876, "size": 212, "type": "metatileset_types" }, { - "path": "maps/areas/139_Vaati3/metatilesets/gAreaMetaTilesetTypes_Vaati3_top.bin.lz", + "path": "maps/areas/139_Vaati3/metatileset/gAreaMetaTilesetTypes_Vaati3_top.bin.lz", "start": 5774088, "size": 144, "type": "metatileset_types" @@ -10315,25 +10315,25 @@ "type": "tileset" }, { - "path": "maps/areas/140_Vaati2/metatilesets/gAreaMetaTileset_Vaati2_bottom.bin.lz", + "path": "maps/areas/140_Vaati2/metatileset/gAreaMetaTileset_Vaati2_bottom.bin.lz", "start": 5788372, "size": 1068, "type": "metatileset" }, { - "path": "maps/areas/140_Vaati2/metatilesets/gAreaMetaTileset_Vaati2_top.bin.lz", + "path": "maps/areas/140_Vaati2/metatileset/gAreaMetaTileset_Vaati2_top.bin.lz", "start": 5789440, "size": 160, "type": "metatileset" }, { - "path": "maps/areas/140_Vaati2/metatilesets/gAreaMetaTilesetTypes_Vaati2_bottom.bin.lz", + "path": "maps/areas/140_Vaati2/metatileset/gAreaMetaTilesetTypes_Vaati2_bottom.bin.lz", "start": 5789600, "size": 124, "type": "metatileset_types" }, { - "path": "maps/areas/140_Vaati2/metatilesets/gAreaMetaTilesetTypes_Vaati2_top.bin.lz", + "path": "maps/areas/140_Vaati2/metatileset/gAreaMetaTilesetTypes_Vaati2_top.bin.lz", "start": 5789724, "size": 80, "type": "metatileset_types" @@ -10357,25 +10357,25 @@ "type": "tileset" }, { - "path": "maps/areas/138_VaatisArms/metatilesets/gAreaMetaTileset_VaatisArms_bottom.bin.lz", + "path": "maps/areas/138_VaatisArms/metatileset/gAreaMetaTileset_VaatisArms_bottom.bin.lz", "start": 5801952, "size": 3272, "type": "metatileset" }, { - "path": "maps/areas/138_VaatisArms/metatilesets/gAreaMetaTileset_VaatisArms_top.bin.lz", + "path": "maps/areas/138_VaatisArms/metatileset/gAreaMetaTileset_VaatisArms_top.bin.lz", "start": 5805224, "size": 900, "type": "metatileset" }, { - "path": "maps/areas/138_VaatisArms/metatilesets/gAreaMetaTilesetTypes_VaatisArms_bottom.bin.lz", + "path": "maps/areas/138_VaatisArms/metatileset/gAreaMetaTilesetTypes_VaatisArms_bottom.bin.lz", "start": 5806124, "size": 260, "type": "metatileset_types" }, { - "path": "maps/areas/138_VaatisArms/metatilesets/gAreaMetaTilesetTypes_VaatisArms_top.bin.lz", + "path": "maps/areas/138_VaatisArms/metatileset/gAreaMetaTilesetTypes_VaatisArms_top.bin.lz", "start": 5806384, "size": 168, "type": "metatileset_types" @@ -11232,13 +11232,13 @@ "name": "gDungeonMaps_DarkHyruleCastle_1fLoopTop" }, { - "path": "maps/areas/136_DarkHyruleCastle/rooms/36_1fLoopTopRight/gAreaRoomMap_DarkHyruleCastle_1fLoopTopRight_bottom.bin.lz", + "path": "maps/areas/136_DarkHyruleCastle/rooms/37_1fLoopTopRight/gAreaRoomMap_DarkHyruleCastle_1fLoopTopRight_bottom.bin.lz", "start": 5828060, "size": 60, "type": "metatilemap" }, { - "path": "maps/areas/136_DarkHyruleCastle/rooms/36_1fLoopTopRight/gAreaRoomMap_DarkHyruleCastle_1fLoopTopRight_top.bin.lz", + "path": "maps/areas/136_DarkHyruleCastle/rooms/37_1fLoopTopRight/gAreaRoomMap_DarkHyruleCastle_1fLoopTopRight_top.bin.lz", "start": 5828120, "size": 296, "type": "metatilemap" @@ -11347,13 +11347,13 @@ "name": "gDungeonMaps_DarkHyruleCastle_1fLoopBottom" }, { - "path": "maps/areas/136_DarkHyruleCastle/rooms/41_1fLoopBottomRight/gAreaRoomMap_DarkHyruleCastle_1fLoopBottomRight_bottom.bin.lz", + "path": "maps/areas/136_DarkHyruleCastle/rooms/42_1fLoopBottomRight/gAreaRoomMap_DarkHyruleCastle_1fLoopBottomRight_bottom.bin.lz", "start": 5830492, "size": 204, "type": "metatilemap" }, { - "path": "maps/areas/136_DarkHyruleCastle/rooms/41_1fLoopBottomRight/gAreaRoomMap_DarkHyruleCastle_1fLoopBottomRight_top.bin.lz", + "path": "maps/areas/136_DarkHyruleCastle/rooms/42_1fLoopBottomRight/gAreaRoomMap_DarkHyruleCastle_1fLoopBottomRight_top.bin.lz", "start": 5830696, "size": 144, "type": "metatilemap" @@ -11554,13 +11554,13 @@ "name": "gDungeonMaps_DarkHyruleCastle_B1Keatons" }, { - "path": "maps/areas/136_DarkHyruleCastle/rooms/48_B1ToPrisonFirebar/gAreaRoomMap_DarkHyruleCastle_B1ToPrisonFirebar_bottom.bin.lz", + "path": "maps/areas/136_DarkHyruleCastle/rooms/51_B1ToPrisonFirebar/gAreaRoomMap_DarkHyruleCastle_B1ToPrisonFirebar_bottom.bin.lz", "start": 5834264, "size": 88, "type": "metatilemap" }, { - "path": "maps/areas/136_DarkHyruleCastle/rooms/48_B1ToPrisonFirebar/gAreaRoomMap_DarkHyruleCastle_B1ToPrisonFirebar_top.bin.lz", + "path": "maps/areas/136_DarkHyruleCastle/rooms/51_B1ToPrisonFirebar/gAreaRoomMap_DarkHyruleCastle_B1ToPrisonFirebar_top.bin.lz", "start": 5834352, "size": 408, "type": "metatilemap" @@ -11859,7 +11859,7 @@ "path": "maps/areas/140_Vaati2/tilesets/0/gAreaTileset_Vaati2_0_3.4bpp.lz", "start": 5843884, "size": 756, - "type": "tileset_mapping3" + "type": "tileset" }, { "path": "maps/areas/137_DarkHyruleCastleOutside/tilesets/0/gAreaTileset_DarkHyruleCastleOutside_0_0.4bpp.lz", @@ -11880,25 +11880,25 @@ "type": "tileset" }, { - "path": "maps/areas/137_DarkHyruleCastleOutside/metatilesets/gAreaMetaTileset_DarkHyruleCastleOutside_bottom.bin.lz", + "path": "maps/areas/137_DarkHyruleCastleOutside/metatileset/gAreaMetaTileset_DarkHyruleCastleOutside_bottom.bin.lz", "start": 5867864, "size": 5412, "type": "metatileset" }, { - "path": "maps/areas/137_DarkHyruleCastleOutside/metatilesets/gAreaMetaTileset_DarkHyruleCastleOutside_top.bin.lz", + "path": "maps/areas/137_DarkHyruleCastleOutside/metatileset/gAreaMetaTileset_DarkHyruleCastleOutside_top.bin.lz", "start": 5873276, "size": 3132, "type": "metatileset" }, { - "path": "maps/areas/137_DarkHyruleCastleOutside/metatilesets/gAreaMetaTilesetTypes_DarkHyruleCastleOutside_bottom.bin.lz", + "path": "maps/areas/137_DarkHyruleCastleOutside/metatileset/gAreaMetaTilesetTypes_DarkHyruleCastleOutside_bottom.bin.lz", "start": 5876408, "size": 732, "type": "metatileset_types" }, { - "path": "maps/areas/137_DarkHyruleCastleOutside/metatilesets/gAreaMetaTilesetTypes_DarkHyruleCastleOutside_top.bin.lz", + "path": "maps/areas/137_DarkHyruleCastleOutside/metatileset/gAreaMetaTilesetTypes_DarkHyruleCastleOutside_top.bin.lz", "start": 5877140, "size": 460, "type": "metatileset_types" @@ -11988,13 +11988,13 @@ "type": "metatilemap" }, { - "path": "maps/areas/137_DarkHyruleCastleOutside/rooms/06_Southeast/gAreaRoomMap_DarkHyruleCastleOutside_Southeast_bottom.bin.lz", + "path": "maps/areas/137_DarkHyruleCastleOutside/rooms/07_Southeast/gAreaRoomMap_DarkHyruleCastleOutside_Southeast_bottom.bin.lz", "start": 5882284, "size": 384, "type": "metatilemap" }, { - "path": "maps/areas/137_DarkHyruleCastleOutside/rooms/06_Southeast/gAreaRoomMap_DarkHyruleCastleOutside_Southeast_top.bin.lz", + "path": "maps/areas/137_DarkHyruleCastleOutside/rooms/07_Southeast/gAreaRoomMap_DarkHyruleCastleOutside_Southeast_top.bin.lz", "start": 5882668, "size": 480, "type": "metatilemap" diff --git a/data/map/map_data.s b/data/map/map_data.s index 932fe303..83e1d78f 100644 --- a/data/map/map_data.s +++ b/data/map/map_data.s @@ -16,13 +16,13 @@ gAreaTileset_MinishWoods_0_1:: gAreaTileset_MinishWoods_0_2:: .incbin "maps/areas/000_MinishWoods/tilesets/0/gAreaTileset_MinishWoods_0_2.4bpp.lz" gAreaMetaTileset_MinishWoods_bottom:: - .incbin "maps/areas/000_MinishWoods/metatilesets/gAreaMetaTileset_MinishWoods_bottom.bin.lz" + .incbin "maps/areas/000_MinishWoods/metatileset/gAreaMetaTileset_MinishWoods_bottom.bin.lz" gAreaMetaTileset_MinishWoods_top:: - .incbin "maps/areas/000_MinishWoods/metatilesets/gAreaMetaTileset_MinishWoods_top.bin.lz" + .incbin "maps/areas/000_MinishWoods/metatileset/gAreaMetaTileset_MinishWoods_top.bin.lz" gAreaMetaTilesetTypes_MinishWoods_bottom:: - .incbin "maps/areas/000_MinishWoods/metatilesets/gAreaMetaTilesetTypes_MinishWoods_bottom.bin.lz" + .incbin "maps/areas/000_MinishWoods/metatileset/gAreaMetaTilesetTypes_MinishWoods_bottom.bin.lz" gAreaMetaTilesetTypes_MinishWoods_top:: - .incbin "maps/areas/000_MinishWoods/metatilesets/gAreaMetaTilesetTypes_MinishWoods_top.bin.lz" + .incbin "maps/areas/000_MinishWoods/metatileset/gAreaMetaTilesetTypes_MinishWoods_top.bin.lz" gAreaRoomMap_MinishWoods_Main_bottom:: .incbin "maps/areas/000_MinishWoods/rooms/00_Main/gAreaRoomMap_MinishWoods_Main_bottom.bin.lz" gAreaRoomMap_MinishWoods_Main_top:: @@ -36,13 +36,13 @@ gAreaTileset_LakeHylia_0_1:: gAreaTileset_LakeHylia_0_2:: .incbin "maps/areas/011_LakeHylia/tilesets/0/gAreaTileset_LakeHylia_0_2.4bpp.lz" gAreaMetaTileset_LakeHylia_bottom:: - .incbin "maps/areas/011_LakeHylia/metatilesets/gAreaMetaTileset_LakeHylia_bottom.bin.lz" + .incbin "maps/areas/011_LakeHylia/metatileset/gAreaMetaTileset_LakeHylia_bottom.bin.lz" gAreaMetaTileset_LakeHylia_top:: - .incbin "maps/areas/011_LakeHylia/metatilesets/gAreaMetaTileset_LakeHylia_top.bin.lz" + .incbin "maps/areas/011_LakeHylia/metatileset/gAreaMetaTileset_LakeHylia_top.bin.lz" gAreaMetaTilesetTypes_LakeHylia_bottom:: - .incbin "maps/areas/011_LakeHylia/metatilesets/gAreaMetaTilesetTypes_LakeHylia_bottom.bin.lz" + .incbin "maps/areas/011_LakeHylia/metatileset/gAreaMetaTilesetTypes_LakeHylia_bottom.bin.lz" gAreaMetaTilesetTypes_LakeHylia_top:: - .incbin "maps/areas/011_LakeHylia/metatilesets/gAreaMetaTilesetTypes_LakeHylia_top.bin.lz" + .incbin "maps/areas/011_LakeHylia/metatileset/gAreaMetaTilesetTypes_LakeHylia_top.bin.lz" gAreaRoomMap_LakeHylia_Main_bottom:: .incbin "maps/areas/011_LakeHylia/rooms/00_Main/gAreaRoomMap_LakeHylia_Main_bottom.bin.lz" gAreaRoomMap_LakeHylia_Main_top:: @@ -60,13 +60,13 @@ gAreaTileset_CastorWilds_0_1:: gAreaTileset_CastorWilds_0_2:: .incbin "maps/areas/004_CastorWilds/tilesets/0/gAreaTileset_CastorWilds_0_2.4bpp.lz" gAreaMetaTileset_CastorWilds_bottom:: - .incbin "maps/areas/004_CastorWilds/metatilesets/gAreaMetaTileset_CastorWilds_bottom.bin.lz" + .incbin "maps/areas/004_CastorWilds/metatileset/gAreaMetaTileset_CastorWilds_bottom.bin.lz" gAreaMetaTileset_CastorWilds_top:: - .incbin "maps/areas/004_CastorWilds/metatilesets/gAreaMetaTileset_CastorWilds_top.bin.lz" + .incbin "maps/areas/004_CastorWilds/metatileset/gAreaMetaTileset_CastorWilds_top.bin.lz" gAreaMetaTilesetTypes_CastorWilds_bottom:: - .incbin "maps/areas/004_CastorWilds/metatilesets/gAreaMetaTilesetTypes_CastorWilds_bottom.bin.lz" + .incbin "maps/areas/004_CastorWilds/metatileset/gAreaMetaTilesetTypes_CastorWilds_bottom.bin.lz" gAreaMetaTilesetTypes_CastorWilds_top:: - .incbin "maps/areas/004_CastorWilds/metatilesets/gAreaMetaTilesetTypes_CastorWilds_top.bin.lz" + .incbin "maps/areas/004_CastorWilds/metatileset/gAreaMetaTilesetTypes_CastorWilds_top.bin.lz" gAreaRoomMap_CastorWilds_Main_bottom:: .incbin "maps/areas/004_CastorWilds/rooms/00_Main/gAreaRoomMap_CastorWilds_Main_bottom.bin.lz" gAreaRoomMap_CastorWilds_Main_top:: @@ -100,13 +100,13 @@ gAreaRoomMap_Ruins_BelowFortressEntrance_top:: unknown_3:: .incbin "assets/unknown_3.bin" gAreaMetaTileset_HyruleTown_bottom:: - .incbin "maps/areas/002_HyruleTown/metatilesets/gAreaMetaTileset_HyruleTown_bottom.bin.lz" + .incbin "maps/areas/002_HyruleTown/metatileset/gAreaMetaTileset_HyruleTown_bottom.bin.lz" gAreaMetaTileset_HyruleTown_top:: - .incbin "maps/areas/002_HyruleTown/metatilesets/gAreaMetaTileset_HyruleTown_top.bin.lz" + .incbin "maps/areas/002_HyruleTown/metatileset/gAreaMetaTileset_HyruleTown_top.bin.lz" gAreaMetaTilesetTypes_HyruleTown_bottom:: - .incbin "maps/areas/002_HyruleTown/metatilesets/gAreaMetaTilesetTypes_HyruleTown_bottom.bin.lz" + .incbin "maps/areas/002_HyruleTown/metatileset/gAreaMetaTilesetTypes_HyruleTown_bottom.bin.lz" gAreaMetaTilesetTypes_HyruleTown_top:: - .incbin "maps/areas/002_HyruleTown/metatilesets/gAreaMetaTilesetTypes_HyruleTown_top.bin.lz" + .incbin "maps/areas/002_HyruleTown/metatileset/gAreaMetaTilesetTypes_HyruleTown_top.bin.lz" gAreaTileset_HyruleTown_0_0:: .incbin "maps/areas/002_HyruleTown/tilesets/0/gAreaTileset_HyruleTown_0_0.4bpp.lz" gAreaTileset_HyruleTown_0_1:: @@ -136,13 +136,13 @@ gAreaTileset_MtCrenel_0_1:: gAreaTileset_MtCrenel_0_2:: .incbin "maps/areas/006_MtCrenel/tilesets/0/gAreaTileset_MtCrenel_0_2.4bpp.lz" gAreaMetaTileset_MtCrenel_bottom:: - .incbin "maps/areas/006_MtCrenel/metatilesets/gAreaMetaTileset_MtCrenel_bottom.bin.lz" + .incbin "maps/areas/006_MtCrenel/metatileset/gAreaMetaTileset_MtCrenel_bottom.bin.lz" gAreaMetaTileset_MtCrenel_top:: - .incbin "maps/areas/006_MtCrenel/metatilesets/gAreaMetaTileset_MtCrenel_top.bin.lz" + .incbin "maps/areas/006_MtCrenel/metatileset/gAreaMetaTileset_MtCrenel_top.bin.lz" gAreaMetaTilesetTypes_MtCrenel_bottom:: - .incbin "maps/areas/006_MtCrenel/metatilesets/gAreaMetaTilesetTypes_MtCrenel_bottom.bin.lz" + .incbin "maps/areas/006_MtCrenel/metatileset/gAreaMetaTilesetTypes_MtCrenel_bottom.bin.lz" gAreaMetaTilesetTypes_MtCrenel_top:: - .incbin "maps/areas/006_MtCrenel/metatilesets/gAreaMetaTilesetTypes_MtCrenel_top.bin.lz" + .incbin "maps/areas/006_MtCrenel/metatileset/gAreaMetaTilesetTypes_MtCrenel_top.bin.lz" gAreaRoomMap_MtCrenel_Top_bottom:: .incbin "maps/areas/006_MtCrenel/rooms/00_Top/gAreaRoomMap_MtCrenel_Top_bottom.bin.lz" gAreaRoomMap_MtCrenel_Top_top:: @@ -184,13 +184,13 @@ gAreaTileset_HyruleField_1_1:: gAreaTileset_HyruleField_1_2:: .incbin "maps/areas/003_HyruleField/tilesets/1/gAreaTileset_HyruleField_1_2.4bpp.lz" gAreaMetaTileset_HyruleField_bottom:: - .incbin "maps/areas/003_HyruleField/metatilesets/gAreaMetaTileset_HyruleField_bottom.bin.lz" + .incbin "maps/areas/003_HyruleField/metatileset/gAreaMetaTileset_HyruleField_bottom.bin.lz" gAreaMetaTileset_HyruleField_top:: - .incbin "maps/areas/003_HyruleField/metatilesets/gAreaMetaTileset_HyruleField_top.bin.lz" + .incbin "maps/areas/003_HyruleField/metatileset/gAreaMetaTileset_HyruleField_top.bin.lz" gAreaMetaTilesetTypes_HyruleField_bottom:: - .incbin "maps/areas/003_HyruleField/metatilesets/gAreaMetaTilesetTypes_HyruleField_bottom.bin.lz" + .incbin "maps/areas/003_HyruleField/metatileset/gAreaMetaTilesetTypes_HyruleField_bottom.bin.lz" gAreaMetaTilesetTypes_HyruleField_top:: - .incbin "maps/areas/003_HyruleField/metatilesets/gAreaMetaTilesetTypes_HyruleField_top.bin.lz" + .incbin "maps/areas/003_HyruleField/metatileset/gAreaMetaTilesetTypes_HyruleField_top.bin.lz" gAreaTileset_HyruleField_0_3:: .incbin "maps/areas/003_HyruleField/tilesets/0/gAreaTileset_HyruleField_0_3.4bpp.lz" gAreaRoomMap_HyruleField_WesternWoodsSouth_bottom:: @@ -246,13 +246,13 @@ gAreaTileset_CastleGarden_0_1:: gAreaTileset_CastleGarden_0_2:: .incbin "maps/areas/007_CastleGarden/tilesets/0/gAreaTileset_CastleGarden_0_2.4bpp.lz" gAreaMetaTileset_CastleGarden_bottom:: - .incbin "maps/areas/007_CastleGarden/metatilesets/gAreaMetaTileset_CastleGarden_bottom.bin.lz" + .incbin "maps/areas/007_CastleGarden/metatileset/gAreaMetaTileset_CastleGarden_bottom.bin.lz" gAreaMetaTileset_CastleGarden_top:: - .incbin "maps/areas/007_CastleGarden/metatilesets/gAreaMetaTileset_CastleGarden_top.bin.lz" + .incbin "maps/areas/007_CastleGarden/metatileset/gAreaMetaTileset_CastleGarden_top.bin.lz" gAreaMetaTilesetTypes_CastleGarden_bottom:: - .incbin "maps/areas/007_CastleGarden/metatilesets/gAreaMetaTilesetTypes_CastleGarden_bottom.bin.lz" + .incbin "maps/areas/007_CastleGarden/metatileset/gAreaMetaTilesetTypes_CastleGarden_bottom.bin.lz" gAreaMetaTilesetTypes_CastleGarden_top:: - .incbin "maps/areas/007_CastleGarden/metatilesets/gAreaMetaTilesetTypes_CastleGarden_top.bin.lz" + .incbin "maps/areas/007_CastleGarden/metatileset/gAreaMetaTilesetTypes_CastleGarden_top.bin.lz" gAreaRoomMap_CastleGarden_Main_bottom:: .incbin "maps/areas/007_CastleGarden/rooms/00_Main/gAreaRoomMap_CastleGarden_Main_bottom.bin.lz" gAreaRoomMap_CastleGarden_Main_top:: @@ -264,13 +264,13 @@ gAreaTileset_CloudTops_0_1:: gAreaTileset_CloudTops_0_2:: .incbin "maps/areas/008_CloudTops/tilesets/0/gAreaTileset_CloudTops_0_2.4bpp.lz" gAreaMetaTileset_CloudTops_bottom:: - .incbin "maps/areas/008_CloudTops/metatilesets/gAreaMetaTileset_CloudTops_bottom.bin.lz" + .incbin "maps/areas/008_CloudTops/metatileset/gAreaMetaTileset_CloudTops_bottom.bin.lz" gAreaMetaTileset_CloudTops_top:: - .incbin "maps/areas/008_CloudTops/metatilesets/gAreaMetaTileset_CloudTops_top.bin.lz" + .incbin "maps/areas/008_CloudTops/metatileset/gAreaMetaTileset_CloudTops_top.bin.lz" gAreaMetaTilesetTypes_CloudTops_bottom:: - .incbin "maps/areas/008_CloudTops/metatilesets/gAreaMetaTilesetTypes_CloudTops_bottom.bin.lz" + .incbin "maps/areas/008_CloudTops/metatileset/gAreaMetaTilesetTypes_CloudTops_bottom.bin.lz" gAreaMetaTilesetTypes_CloudTops_top:: - .incbin "maps/areas/008_CloudTops/metatilesets/gAreaMetaTilesetTypes_CloudTops_top.bin.lz" + .incbin "maps/areas/008_CloudTops/metatileset/gAreaMetaTilesetTypes_CloudTops_top.bin.lz" gAreaRoomMap_CloudTops_CloudTops_bottom:: .incbin "maps/areas/008_CloudTops/rooms/00_CloudTops/gAreaRoomMap_CloudTops_CloudTops_bottom.bin.lz" gAreaRoomMap_CloudTops_CloudTops_top:: @@ -292,13 +292,13 @@ gAreaTileset_RoyalValley_0_1:: gAreaTileset_RoyalValley_0_2:: .incbin "maps/areas/009_RoyalValley/tilesets/0/gAreaTileset_RoyalValley_0_2.4bpp.lz" gAreaMetaTileset_RoyalValley_bottom:: - .incbin "maps/areas/009_RoyalValley/metatilesets/gAreaMetaTileset_RoyalValley_bottom.bin.lz" + .incbin "maps/areas/009_RoyalValley/metatileset/gAreaMetaTileset_RoyalValley_bottom.bin.lz" gAreaMetaTileset_RoyalValley_top:: - .incbin "maps/areas/009_RoyalValley/metatilesets/gAreaMetaTileset_RoyalValley_top.bin.lz" + .incbin "maps/areas/009_RoyalValley/metatileset/gAreaMetaTileset_RoyalValley_top.bin.lz" gAreaMetaTilesetTypes_RoyalValley_bottom:: - .incbin "maps/areas/009_RoyalValley/metatilesets/gAreaMetaTilesetTypes_RoyalValley_bottom.bin.lz" + .incbin "maps/areas/009_RoyalValley/metatileset/gAreaMetaTilesetTypes_RoyalValley_bottom.bin.lz" gAreaMetaTilesetTypes_RoyalValley_top:: - .incbin "maps/areas/009_RoyalValley/metatilesets/gAreaMetaTilesetTypes_RoyalValley_top.bin.lz" + .incbin "maps/areas/009_RoyalValley/metatileset/gAreaMetaTilesetTypes_RoyalValley_top.bin.lz" gAreaRoomMap_RoyalValley_Main_bottom:: .incbin "maps/areas/009_RoyalValley/rooms/00_Main/gAreaRoomMap_RoyalValley_Main_bottom.bin.lz" gAreaRoomMap_RoyalValley_Main_top:: @@ -334,13 +334,13 @@ gAreaTileset_Beanstalks_0_1:: gAreaTileset_Beanstalks_0_2:: .incbin "maps/areas/013_Beanstalks/tilesets/0/gAreaTileset_Beanstalks_0_2.4bpp.lz" gAreaMetaTileset_Beanstalks_bottom:: - .incbin "maps/areas/013_Beanstalks/metatilesets/gAreaMetaTileset_Beanstalks_bottom.bin.lz" + .incbin "maps/areas/013_Beanstalks/metatileset/gAreaMetaTileset_Beanstalks_bottom.bin.lz" gAreaMetaTilesetTypes_Beanstalks_bottom:: - .incbin "maps/areas/013_Beanstalks/metatilesets/gAreaMetaTilesetTypes_Beanstalks_bottom.bin.lz" + .incbin "maps/areas/013_Beanstalks/metatileset/gAreaMetaTilesetTypes_Beanstalks_bottom.bin.lz" gAreaTileset_Beanstalks_0_3:: .incbin "maps/areas/013_Beanstalks/tilesets/0/gAreaTileset_Beanstalks_0_3.4bpp.lz" gRoomMapping_Beanstalks_CrenelClimb_top:: - .incbin "maps/areas/013_Beanstalks/rooms/00_CrenelClimb/gRoomMapping_Beanstalks_CrenelClimb_top.bin.lz" + .incbin "maps/areas/013_Beanstalks/rooms/16_CrenelClimb/gRoomMapping_Beanstalks_CrenelClimb_top.bin.lz" gAreaRoomMap_Beanstalks_Crenel_bottom:: .incbin "maps/areas/013_Beanstalks/rooms/00_Crenel/gAreaRoomMap_Beanstalks_Crenel_bottom.bin" gAreaRoomMap_Beanstalks_LakeHylia_bottom:: @@ -364,13 +364,13 @@ gAreaTileset_CrenelCaves_0_1:: gAreaTileset_CrenelCaves_0_2:: .incbin "maps/areas/038_CrenelCaves/tilesets/0/gAreaTileset_CrenelCaves_0_2.4bpp.lz" gAreaMetaTileset_MinishHouseInteriors_bottom:: - .incbin "maps/areas/032_MinishHouseInteriors/metatilesets/gAreaMetaTileset_MinishHouseInteriors_bottom.bin.lz" + .incbin "maps/areas/032_MinishHouseInteriors/metatileset/gAreaMetaTileset_MinishHouseInteriors_bottom.bin.lz" gAreaMetaTileset_MinishHouseInteriors_top:: - .incbin "maps/areas/032_MinishHouseInteriors/metatilesets/gAreaMetaTileset_MinishHouseInteriors_top.bin.lz" + .incbin "maps/areas/032_MinishHouseInteriors/metatileset/gAreaMetaTileset_MinishHouseInteriors_top.bin.lz" gAreaMetaTilesetTypes_MinishHouseInteriors_bottom:: - .incbin "maps/areas/032_MinishHouseInteriors/metatilesets/gAreaMetaTilesetTypes_MinishHouseInteriors_bottom.bin.lz" + .incbin "maps/areas/032_MinishHouseInteriors/metatileset/gAreaMetaTilesetTypes_MinishHouseInteriors_bottom.bin.lz" gAreaMetaTilesetTypes_MinishHouseInteriors_top:: - .incbin "maps/areas/032_MinishHouseInteriors/metatilesets/gAreaMetaTilesetTypes_MinishHouseInteriors_top.bin.lz" + .incbin "maps/areas/032_MinishHouseInteriors/metatileset/gAreaMetaTilesetTypes_MinishHouseInteriors_top.bin.lz" gAreaRoomMap_CrenelCaves_BlockPushing_bottom:: .incbin "maps/areas/038_CrenelCaves/rooms/00_BlockPushing/gAreaRoomMap_CrenelCaves_BlockPushing_bottom.bin.lz" gAreaRoomMap_CrenelCaves_BlockPushing_top:: @@ -446,13 +446,13 @@ gAreaTileset_GreatFairies_0_1:: gAreaTileset_GreatFairies_0_2:: .incbin "maps/areas/041_GreatFairies/tilesets/0/gAreaTileset_GreatFairies_0_2.4bpp.lz" gAreaMetaTileset_GreatFairies_bottom:: - .incbin "maps/areas/041_GreatFairies/metatilesets/gAreaMetaTileset_GreatFairies_bottom.bin.lz" + .incbin "maps/areas/041_GreatFairies/metatileset/gAreaMetaTileset_GreatFairies_bottom.bin.lz" gAreaMetaTileset_GreatFairies_top:: - .incbin "maps/areas/041_GreatFairies/metatilesets/gAreaMetaTileset_GreatFairies_top.bin.lz" + .incbin "maps/areas/041_GreatFairies/metatileset/gAreaMetaTileset_GreatFairies_top.bin.lz" gAreaMetaTilesetTypes_GreatFairies_bottom:: - .incbin "maps/areas/041_GreatFairies/metatilesets/gAreaMetaTilesetTypes_GreatFairies_bottom.bin.lz" + .incbin "maps/areas/041_GreatFairies/metatileset/gAreaMetaTilesetTypes_GreatFairies_bottom.bin.lz" gAreaMetaTilesetTypes_GreatFairies_top:: - .incbin "maps/areas/041_GreatFairies/metatilesets/gAreaMetaTilesetTypes_GreatFairies_top.bin.lz" + .incbin "maps/areas/041_GreatFairies/metatileset/gAreaMetaTilesetTypes_GreatFairies_top.bin.lz" gAreaRoomMap_GreatFairies_Graveyard_bottom:: .incbin "maps/areas/041_GreatFairies/rooms/00_Graveyard/gAreaRoomMap_GreatFairies_Graveyard_bottom.bin.lz" gAreaRoomMap_GreatFairies_Graveyard_top:: @@ -500,13 +500,13 @@ gAreaTileset_ArmosInteriors_0_1:: gAreaTileset_ArmosInteriors_0_2:: .incbin "maps/areas/044_ArmosInteriors/tilesets/0/gAreaTileset_ArmosInteriors_0_2.4bpp.lz" gAreaMetaTileset_ArmosInteriors_bottom:: - .incbin "maps/areas/044_ArmosInteriors/metatilesets/gAreaMetaTileset_ArmosInteriors_bottom.bin.lz" + .incbin "maps/areas/044_ArmosInteriors/metatileset/gAreaMetaTileset_ArmosInteriors_bottom.bin.lz" gAreaMetaTileset_ArmosInteriors_top:: - .incbin "maps/areas/044_ArmosInteriors/metatilesets/gAreaMetaTileset_ArmosInteriors_top.bin.lz" + .incbin "maps/areas/044_ArmosInteriors/metatileset/gAreaMetaTileset_ArmosInteriors_top.bin.lz" gAreaMetaTilesetTypes_ArmosInteriors_bottom:: - .incbin "maps/areas/044_ArmosInteriors/metatilesets/gAreaMetaTilesetTypes_ArmosInteriors_bottom.bin.lz" + .incbin "maps/areas/044_ArmosInteriors/metatileset/gAreaMetaTilesetTypes_ArmosInteriors_bottom.bin.lz" gAreaMetaTilesetTypes_ArmosInteriors_top:: - .incbin "maps/areas/044_ArmosInteriors/metatilesets/gAreaMetaTilesetTypes_ArmosInteriors_top.bin.lz" + .incbin "maps/areas/044_ArmosInteriors/metatileset/gAreaMetaTilesetTypes_ArmosInteriors_top.bin.lz" gAreaRoomMap_ArmosInteriors_RuinsEntranceNorth_bottom:: .incbin "maps/areas/044_ArmosInteriors/rooms/00_RuinsEntranceNorth/gAreaRoomMap_ArmosInteriors_RuinsEntranceNorth_bottom.bin" gAreaRoomMap_ArmosInteriors_RuinsEntranceNorth_top:: @@ -558,13 +558,13 @@ gAreaTileset_GoronCave_0_1:: gAreaTileset_GoronCave_0_2:: .incbin "maps/areas/047_GoronCave/tilesets/0/gAreaTileset_GoronCave_0_2.4bpp.lz" gAreaMetaTileset_GoronCave_bottom:: - .incbin "maps/areas/047_GoronCave/metatilesets/gAreaMetaTileset_GoronCave_bottom.bin.lz" + .incbin "maps/areas/047_GoronCave/metatileset/gAreaMetaTileset_GoronCave_bottom.bin.lz" gAreaMetaTileset_GoronCave_top:: - .incbin "maps/areas/047_GoronCave/metatilesets/gAreaMetaTileset_GoronCave_top.bin.lz" + .incbin "maps/areas/047_GoronCave/metatileset/gAreaMetaTileset_GoronCave_top.bin.lz" gAreaMetaTilesetTypes_GoronCave_bottom:: - .incbin "maps/areas/047_GoronCave/metatilesets/gAreaMetaTilesetTypes_GoronCave_bottom.bin.lz" + .incbin "maps/areas/047_GoronCave/metatileset/gAreaMetaTilesetTypes_GoronCave_bottom.bin.lz" gAreaMetaTilesetTypes_GoronCave_top:: - .incbin "maps/areas/047_GoronCave/metatilesets/gAreaMetaTilesetTypes_GoronCave_top.bin.lz" + .incbin "maps/areas/047_GoronCave/metatileset/gAreaMetaTilesetTypes_GoronCave_top.bin.lz" gAreaRoomMap_GoronCave_Stairs_bottom:: .incbin "maps/areas/047_GoronCave/rooms/00_Stairs/gAreaRoomMap_GoronCave_Stairs_bottom.bin.lz" gAreaRoomMap_GoronCave_Stairs_top:: @@ -626,17 +626,17 @@ gAreaRoomMap_Caves_LonLonRanch_bottom:: gAreaRoomMap_Caves_LonLonRanch_top:: .incbin "maps/areas/050_Caves/rooms/12_LonLonRanch/gAreaRoomMap_Caves_LonLonRanch_top.bin.lz" gAreaRoomMap_Caves_LonLonRanchSecret_bottom:: - .incbin "maps/areas/050_Caves/rooms/12_LonLonRanchSecret/gAreaRoomMap_Caves_LonLonRanchSecret_bottom.bin.lz" + .incbin "maps/areas/050_Caves/rooms/13_LonLonRanchSecret/gAreaRoomMap_Caves_LonLonRanchSecret_bottom.bin.lz" gAreaRoomMap_Caves_LonLonRanchSecret_top:: - .incbin "maps/areas/050_Caves/rooms/12_LonLonRanchSecret/gAreaRoomMap_Caves_LonLonRanchSecret_top.bin.lz" + .incbin "maps/areas/050_Caves/rooms/13_LonLonRanchSecret/gAreaRoomMap_Caves_LonLonRanchSecret_top.bin.lz" gAreaRoomMap_Caves_TrilbyHighlands_bottom:: .incbin "maps/areas/050_Caves/rooms/14_TrilbyHighlands/gAreaRoomMap_Caves_TrilbyHighlands_bottom.bin.lz" gAreaRoomMap_Caves_TrilbyHighlands_top:: .incbin "maps/areas/050_Caves/rooms/14_TrilbyHighlands/gAreaRoomMap_Caves_TrilbyHighlands_top.bin.lz" gAreaRoomMap_Caves_LonLonRanchWallet_bottom:: - .incbin "maps/areas/050_Caves/rooms/12_LonLonRanchWallet/gAreaRoomMap_Caves_LonLonRanchWallet_bottom.bin.lz" + .incbin "maps/areas/050_Caves/rooms/15_LonLonRanchWallet/gAreaRoomMap_Caves_LonLonRanchWallet_bottom.bin.lz" gAreaRoomMap_Caves_LonLonRanchWallet_top:: - .incbin "maps/areas/050_Caves/rooms/12_LonLonRanchWallet/gAreaRoomMap_Caves_LonLonRanchWallet_top.bin.lz" + .incbin "maps/areas/050_Caves/rooms/15_LonLonRanchWallet/gAreaRoomMap_Caves_LonLonRanchWallet_top.bin.lz" gAreaRoomMap_Caves_SouthHyruleFieldRupee_bottom:: .incbin "maps/areas/050_Caves/rooms/16_SouthHyruleFieldRupee/gAreaRoomMap_Caves_SouthHyruleFieldRupee_bottom.bin.lz" gAreaRoomMap_Caves_SouthHyruleFieldRupee_top:: @@ -724,13 +724,13 @@ gAreaTileset_MinishCaves_0_1:: gAreaTileset_MinishCaves_0_2:: .incbin "maps/areas/053_MinishCaves/tilesets/0/gAreaTileset_MinishCaves_0_2.4bpp.lz" gAreaMetaTileset_MinishCaves_bottom:: - .incbin "maps/areas/053_MinishCaves/metatilesets/gAreaMetaTileset_MinishCaves_bottom.bin.lz" + .incbin "maps/areas/053_MinishCaves/metatileset/gAreaMetaTileset_MinishCaves_bottom.bin.lz" gAreaMetaTileset_MinishCaves_top:: - .incbin "maps/areas/053_MinishCaves/metatilesets/gAreaMetaTileset_MinishCaves_top.bin.lz" + .incbin "maps/areas/053_MinishCaves/metatileset/gAreaMetaTileset_MinishCaves_top.bin.lz" gAreaMetaTilesetTypes_MinishCaves_bottom:: - .incbin "maps/areas/053_MinishCaves/metatilesets/gAreaMetaTilesetTypes_MinishCaves_bottom.bin.lz" + .incbin "maps/areas/053_MinishCaves/metatileset/gAreaMetaTilesetTypes_MinishCaves_bottom.bin.lz" gAreaMetaTilesetTypes_MinishCaves_top:: - .incbin "maps/areas/053_MinishCaves/metatilesets/gAreaMetaTilesetTypes_MinishCaves_top.bin.lz" + .incbin "maps/areas/053_MinishCaves/metatileset/gAreaMetaTilesetTypes_MinishCaves_top.bin.lz" gAreaTileset_CastleGardenMinishHoles_0_0:: .incbin "maps/areas/054_CastleGardenMinishHoles/tilesets/0/gAreaTileset_CastleGardenMinishHoles_0_0.4bpp.lz" gAreaTileset_CastleGardenMinishHoles_0_1:: @@ -738,13 +738,13 @@ gAreaTileset_CastleGardenMinishHoles_0_1:: gAreaTileset_CastleGardenMinishHoles_0_2:: .incbin "maps/areas/054_CastleGardenMinishHoles/tilesets/0/gAreaTileset_CastleGardenMinishHoles_0_2.4bpp.lz" gAreaMetaTileset_CastleGardenMinishHoles_bottom:: - .incbin "maps/areas/054_CastleGardenMinishHoles/metatilesets/gAreaMetaTileset_CastleGardenMinishHoles_bottom.bin.lz" + .incbin "maps/areas/054_CastleGardenMinishHoles/metatileset/gAreaMetaTileset_CastleGardenMinishHoles_bottom.bin.lz" gAreaMetaTileset_CastleGardenMinishHoles_top:: - .incbin "maps/areas/054_CastleGardenMinishHoles/metatilesets/gAreaMetaTileset_CastleGardenMinishHoles_top.bin.lz" + .incbin "maps/areas/054_CastleGardenMinishHoles/metatileset/gAreaMetaTileset_CastleGardenMinishHoles_top.bin.lz" gAreaMetaTilesetTypes_CastleGardenMinishHoles_bottom:: - .incbin "maps/areas/054_CastleGardenMinishHoles/metatilesets/gAreaMetaTilesetTypes_CastleGardenMinishHoles_bottom.bin.lz" + .incbin "maps/areas/054_CastleGardenMinishHoles/metatileset/gAreaMetaTilesetTypes_CastleGardenMinishHoles_bottom.bin.lz" gAreaMetaTilesetTypes_CastleGardenMinishHoles_top:: - .incbin "maps/areas/054_CastleGardenMinishHoles/metatilesets/gAreaMetaTilesetTypes_CastleGardenMinishHoles_top.bin.lz" + .incbin "maps/areas/054_CastleGardenMinishHoles/metatileset/gAreaMetaTilesetTypes_CastleGardenMinishHoles_top.bin.lz" gAreaRoomMap_MinishCaves_BeanPesto_bottom:: .incbin "maps/areas/053_MinishCaves/rooms/00_BeanPesto/gAreaRoomMap_MinishCaves_BeanPesto_bottom.bin.lz" gAreaRoomMap_MinishCaves_BeanPesto_top:: @@ -916,13 +916,13 @@ gAreaTileset_MinishVillage_0_1:: gAreaTileset_MinishVillage_0_2:: .incbin "maps/areas/001_MinishVillage/tilesets/0/gAreaTileset_MinishVillage_0_2.4bpp.lz" gAreaMetaTileset_MinishVillage_bottom:: - .incbin "maps/areas/001_MinishVillage/metatilesets/gAreaMetaTileset_MinishVillage_bottom.bin.lz" + .incbin "maps/areas/001_MinishVillage/metatileset/gAreaMetaTileset_MinishVillage_bottom.bin.lz" gAreaMetaTileset_MinishVillage_top:: - .incbin "maps/areas/001_MinishVillage/metatilesets/gAreaMetaTileset_MinishVillage_top.bin.lz" + .incbin "maps/areas/001_MinishVillage/metatileset/gAreaMetaTileset_MinishVillage_top.bin.lz" gAreaMetaTilesetTypes_MinishVillage_bottom:: - .incbin "maps/areas/001_MinishVillage/metatilesets/gAreaMetaTilesetTypes_MinishVillage_bottom.bin.lz" + .incbin "maps/areas/001_MinishVillage/metatileset/gAreaMetaTilesetTypes_MinishVillage_bottom.bin.lz" gAreaMetaTilesetTypes_MinishVillage_top:: - .incbin "maps/areas/001_MinishVillage/metatilesets/gAreaMetaTilesetTypes_MinishVillage_top.bin.lz" + .incbin "maps/areas/001_MinishVillage/metatileset/gAreaMetaTilesetTypes_MinishVillage_top.bin.lz" gAreaTileset_MinishVillage_1_0:: .incbin "maps/areas/001_MinishVillage/tilesets/1/gAreaTileset_MinishVillage_1_0.4bpp.lz" gAreaTileset_MinishVillage_1_1:: @@ -944,13 +944,13 @@ gAreaTileset_MelarisMine_0_1:: gAreaTileset_MelarisMine_0_2:: .incbin "maps/areas/016_MelarisMine/tilesets/0/gAreaTileset_MelarisMine_0_2.4bpp.lz" gAreaMetaTileset_MelarisMine_bottom:: - .incbin "maps/areas/016_MelarisMine/metatilesets/gAreaMetaTileset_MelarisMine_bottom.bin.lz" + .incbin "maps/areas/016_MelarisMine/metatileset/gAreaMetaTileset_MelarisMine_bottom.bin.lz" gAreaMetaTileset_MelarisMine_top:: - .incbin "maps/areas/016_MelarisMine/metatilesets/gAreaMetaTileset_MelarisMine_top.bin.lz" + .incbin "maps/areas/016_MelarisMine/metatileset/gAreaMetaTileset_MelarisMine_top.bin.lz" gAreaMetaTilesetTypes_MelarisMine_bottom:: - .incbin "maps/areas/016_MelarisMine/metatilesets/gAreaMetaTilesetTypes_MelarisMine_bottom.bin.lz" + .incbin "maps/areas/016_MelarisMine/metatileset/gAreaMetaTilesetTypes_MelarisMine_bottom.bin.lz" gAreaMetaTilesetTypes_MelarisMine_top:: - .incbin "maps/areas/016_MelarisMine/metatilesets/gAreaMetaTilesetTypes_MelarisMine_top.bin.lz" + .incbin "maps/areas/016_MelarisMine/metatileset/gAreaMetaTilesetTypes_MelarisMine_top.bin.lz" gAreaRoomMap_MelarisMine_Main_bottom:: .incbin "maps/areas/016_MelarisMine/rooms/00_Main/gAreaRoomMap_MelarisMine_Main_bottom.bin.lz" gAreaRoomMap_MelarisMine_Main_top:: @@ -960,9 +960,9 @@ gAreaTileset_MinishPaths_0_0:: gAreaTileset_MinishPaths_0_1:: .incbin "maps/areas/017_MinishPaths/tilesets/0/gAreaTileset_MinishPaths_0_1.4bpp.lz" gAreaMetaTileset_MinishPaths_bottom:: - .incbin "maps/areas/017_MinishPaths/metatilesets/gAreaMetaTileset_MinishPaths_bottom.bin.lz" + .incbin "maps/areas/017_MinishPaths/metatileset/gAreaMetaTileset_MinishPaths_bottom.bin.lz" gAreaMetaTilesetTypes_MinishPaths_bottom:: - .incbin "maps/areas/017_MinishPaths/metatilesets/gAreaMetaTilesetTypes_MinishPaths_bottom.bin.lz" + .incbin "maps/areas/017_MinishPaths/metatileset/gAreaMetaTilesetTypes_MinishPaths_bottom.bin.lz" gAreaRoomMap_MinishPaths_MinishVillage_bottom:: .incbin "maps/areas/017_MinishPaths/rooms/00_MinishVillage/gAreaRoomMap_MinishPaths_MinishVillage_bottom.bin.lz" gAreaRoomMap_MinishPaths_Bow_bottom:: @@ -982,9 +982,9 @@ gAreaTileset_CrenelMinishPaths_1_0:: gAreaTileset_CrenelMinishPaths_1_1:: .incbin "maps/areas/018_CrenelMinishPaths/tilesets/1/gAreaTileset_CrenelMinishPaths_1_1.4bpp.lz" gAreaMetaTileset_CrenelMinishPaths_bottom:: - .incbin "maps/areas/018_CrenelMinishPaths/metatilesets/gAreaMetaTileset_CrenelMinishPaths_bottom.bin.lz" + .incbin "maps/areas/018_CrenelMinishPaths/metatileset/gAreaMetaTileset_CrenelMinishPaths_bottom.bin.lz" gAreaMetaTilesetTypes_CrenelMinishPaths_bottom:: - .incbin "maps/areas/018_CrenelMinishPaths/metatilesets/gAreaMetaTilesetTypes_CrenelMinishPaths_bottom.bin.lz" + .incbin "maps/areas/018_CrenelMinishPaths/metatileset/gAreaMetaTilesetTypes_CrenelMinishPaths_bottom.bin.lz" gAreaRoomMap_CrenelMinishPaths_Bean_bottom:: .incbin "maps/areas/018_CrenelMinishPaths/rooms/00_Bean/gAreaRoomMap_CrenelMinishPaths_Bean_bottom.bin.lz" gAreaRoomMap_CrenelMinishPaths_SpringWater_bottom:: @@ -996,81 +996,81 @@ gAreaRoomMap_CrenelMinishPaths_Melari_bottom:: gAreaTileset_HouseInteriors1_0_2:: .incbin "maps/areas/033_HouseInteriors1/tilesets/0/gAreaTileset_HouseInteriors1_0_2.4bpp.lz" gAreaMetaTileset_HouseInteriors1_top:: - .incbin "maps/areas/033_HouseInteriors1/metatilesets/gAreaMetaTileset_HouseInteriors1_top.bin.lz" + .incbin "maps/areas/033_HouseInteriors1/metatileset/gAreaMetaTileset_HouseInteriors1_top.bin.lz" gAreaMetaTilesetTypes_HouseInteriors1_top:: - .incbin "maps/areas/033_HouseInteriors1/metatilesets/gAreaMetaTilesetTypes_HouseInteriors1_top.bin.lz" + .incbin "maps/areas/033_HouseInteriors1/metatileset/gAreaMetaTilesetTypes_HouseInteriors1_top.bin.lz" gAreaTileset_HouseInteriors1_0_0:: .incbin "maps/areas/033_HouseInteriors1/tilesets/0/gAreaTileset_HouseInteriors1_0_0.4bpp.lz" gAreaTileset_HouseInteriors1_0_1:: .incbin "maps/areas/033_HouseInteriors1/tilesets/0/gAreaTileset_HouseInteriors1_0_1.4bpp.lz" gAreaMetaTileset_HouseInteriors1_bottom:: - .incbin "maps/areas/033_HouseInteriors1/metatilesets/gAreaMetaTileset_HouseInteriors1_bottom.bin.lz" + .incbin "maps/areas/033_HouseInteriors1/metatileset/gAreaMetaTileset_HouseInteriors1_bottom.bin.lz" gAreaMetaTilesetTypes_HouseInteriors1_bottom:: - .incbin "maps/areas/033_HouseInteriors1/metatilesets/gAreaMetaTilesetTypes_HouseInteriors1_bottom.bin.lz" + .incbin "maps/areas/033_HouseInteriors1/metatileset/gAreaMetaTilesetTypes_HouseInteriors1_bottom.bin.lz" gAreaTileset_HouseInteriors2_0_0:: .incbin "maps/areas/034_HouseInteriors2/tilesets/0/gAreaTileset_HouseInteriors2_0_0.4bpp.lz" gAreaTileset_HouseInteriors2_0_1:: .incbin "maps/areas/034_HouseInteriors2/tilesets/0/gAreaTileset_HouseInteriors2_0_1.4bpp.lz" gAreaMetaTileset_HouseInteriors2_bottom:: - .incbin "maps/areas/034_HouseInteriors2/metatilesets/gAreaMetaTileset_HouseInteriors2_bottom.bin.lz" + .incbin "maps/areas/034_HouseInteriors2/metatileset/gAreaMetaTileset_HouseInteriors2_bottom.bin.lz" gAreaMetaTilesetTypes_HouseInteriors2_bottom:: - .incbin "maps/areas/034_HouseInteriors2/metatilesets/gAreaMetaTilesetTypes_HouseInteriors2_bottom.bin.lz" + .incbin "maps/areas/034_HouseInteriors2/metatileset/gAreaMetaTilesetTypes_HouseInteriors2_bottom.bin.lz" gAreaTileset_HouseInteriors4_0_0:: .incbin "maps/areas/040_HouseInteriors4/tilesets/0/gAreaTileset_HouseInteriors4_0_0.4bpp.lz" gAreaTileset_HouseInteriors4_0_1:: .incbin "maps/areas/040_HouseInteriors4/tilesets/0/gAreaTileset_HouseInteriors4_0_1.4bpp.lz" gAreaMetaTileset_HouseInteriors4_bottom:: - .incbin "maps/areas/040_HouseInteriors4/metatilesets/gAreaMetaTileset_HouseInteriors4_bottom.bin.lz" + .incbin "maps/areas/040_HouseInteriors4/metatileset/gAreaMetaTileset_HouseInteriors4_bottom.bin.lz" gAreaMetaTilesetTypes_HouseInteriors4_bottom:: - .incbin "maps/areas/040_HouseInteriors4/metatilesets/gAreaMetaTilesetTypes_HouseInteriors4_bottom.bin.lz" + .incbin "maps/areas/040_HouseInteriors4/metatileset/gAreaMetaTilesetTypes_HouseInteriors4_bottom.bin.lz" gAreaTileset_HouseInteriors3_0_0:: .incbin "maps/areas/035_HouseInteriors3/tilesets/0/gAreaTileset_HouseInteriors3_0_0.4bpp.lz" gAreaTileset_HouseInteriors3_0_1:: .incbin "maps/areas/035_HouseInteriors3/tilesets/0/gAreaTileset_HouseInteriors3_0_1.4bpp.lz" gAreaMetaTileset_HouseInteriors3_bottom:: - .incbin "maps/areas/035_HouseInteriors3/metatilesets/gAreaMetaTileset_HouseInteriors3_bottom.bin.lz" + .incbin "maps/areas/035_HouseInteriors3/metatileset/gAreaMetaTileset_HouseInteriors3_bottom.bin.lz" gAreaMetaTilesetTypes_HouseInteriors3_bottom:: - .incbin "maps/areas/035_HouseInteriors3/metatilesets/gAreaMetaTilesetTypes_HouseInteriors3_bottom.bin.lz" + .incbin "maps/areas/035_HouseInteriors3/metatileset/gAreaMetaTilesetTypes_HouseInteriors3_bottom.bin.lz" gAreaTileset_TreeInteriors_0_0:: .incbin "maps/areas/036_TreeInteriors/tilesets/0/gAreaTileset_TreeInteriors_0_0.4bpp.lz" gAreaTileset_TreeInteriors_0_1:: .incbin "maps/areas/036_TreeInteriors/tilesets/0/gAreaTileset_TreeInteriors_0_1.4bpp.lz" gAreaMetaTileset_TreeInteriors_bottom:: - .incbin "maps/areas/036_TreeInteriors/metatilesets/gAreaMetaTileset_TreeInteriors_bottom.bin.lz" + .incbin "maps/areas/036_TreeInteriors/metatileset/gAreaMetaTileset_TreeInteriors_bottom.bin.lz" gAreaMetaTilesetTypes_TreeInteriors_bottom:: - .incbin "maps/areas/036_TreeInteriors/metatilesets/gAreaMetaTilesetTypes_TreeInteriors_bottom.bin.lz" + .incbin "maps/areas/036_TreeInteriors/metatileset/gAreaMetaTilesetTypes_TreeInteriors_bottom.bin.lz" gAreaTileset_MinishCracks_0_0:: .incbin "maps/areas/039_MinishCracks/tilesets/0/gAreaTileset_MinishCracks_0_0.4bpp.lz" gAreaTileset_MinishCracks_0_1:: .incbin "maps/areas/039_MinishCracks/tilesets/0/gAreaTileset_MinishCracks_0_1.4bpp.lz" gAreaMetaTileset_MinishCracks_bottom:: - .incbin "maps/areas/039_MinishCracks/metatilesets/gAreaMetaTileset_MinishCracks_bottom.bin.lz" + .incbin "maps/areas/039_MinishCracks/metatileset/gAreaMetaTileset_MinishCracks_bottom.bin.lz" gAreaMetaTilesetTypes_MinishCracks_bottom:: - .incbin "maps/areas/039_MinishCracks/metatilesets/gAreaMetaTilesetTypes_MinishCracks_bottom.bin.lz" + .incbin "maps/areas/039_MinishCracks/metatileset/gAreaMetaTilesetTypes_MinishCracks_bottom.bin.lz" gAreaTileset_Dojos_0_0:: .incbin "maps/areas/037_Dojos/tilesets/0/gAreaTileset_Dojos_0_0.4bpp.lz" gAreaTileset_Dojos_0_1:: .incbin "maps/areas/037_Dojos/tilesets/0/gAreaTileset_Dojos_0_1.4bpp.lz" gAreaMetaTileset_Dojos_bottom:: - .incbin "maps/areas/037_Dojos/metatilesets/gAreaMetaTileset_Dojos_bottom.bin.lz" + .incbin "maps/areas/037_Dojos/metatileset/gAreaMetaTileset_Dojos_bottom.bin.lz" gAreaMetaTilesetTypes_Dojos_bottom:: - .incbin "maps/areas/037_Dojos/metatilesets/gAreaMetaTilesetTypes_Dojos_bottom.bin.lz" + .incbin "maps/areas/037_Dojos/metatileset/gAreaMetaTilesetTypes_Dojos_bottom.bin.lz" gAreaTileset_MinishRafters_0_0:: .incbin "maps/areas/046_MinishRafters/tilesets/0/gAreaTileset_MinishRafters_0_0.4bpp.lz" gAreaTileset_MinishRafters_0_1:: .incbin "maps/areas/046_MinishRafters/tilesets/0/gAreaTileset_MinishRafters_0_1.4bpp.lz" gAreaMetaTileset_MinishRafters_bottom:: - .incbin "maps/areas/046_MinishRafters/metatilesets/gAreaMetaTileset_MinishRafters_bottom.bin.lz" + .incbin "maps/areas/046_MinishRafters/metatileset/gAreaMetaTileset_MinishRafters_bottom.bin.lz" gAreaMetaTilesetTypes_MinishRafters_bottom:: - .incbin "maps/areas/046_MinishRafters/metatilesets/gAreaMetaTilesetTypes_MinishRafters_bottom.bin.lz" + .incbin "maps/areas/046_MinishRafters/metatileset/gAreaMetaTilesetTypes_MinishRafters_bottom.bin.lz" gAreaTileset_WindTribeTower_0_0:: .incbin "maps/areas/048_WindTribeTower/tilesets/0/gAreaTileset_WindTribeTower_0_0.4bpp.lz" gAreaTileset_WindTribeTower_0_1:: .incbin "maps/areas/048_WindTribeTower/tilesets/0/gAreaTileset_WindTribeTower_0_1.4bpp.lz" gAreaMetaTileset_WindTribeTower_bottom:: - .incbin "maps/areas/048_WindTribeTower/metatilesets/gAreaMetaTileset_WindTribeTower_bottom.bin.lz" + .incbin "maps/areas/048_WindTribeTower/metatileset/gAreaMetaTileset_WindTribeTower_bottom.bin.lz" gAreaMetaTilesetTypes_WindTribeTower_bottom:: - .incbin "maps/areas/048_WindTribeTower/metatilesets/gAreaMetaTilesetTypes_WindTribeTower_bottom.bin.lz" + .incbin "maps/areas/048_WindTribeTower/metatileset/gAreaMetaTilesetTypes_WindTribeTower_bottom.bin.lz" gAreaTileset_WindTribeTowerRoof_0_0:: .incbin "maps/areas/049_WindTribeTowerRoof/tilesets/0/gAreaTileset_WindTribeTowerRoof_0_0.4bpp.lz" gAreaTileset_WindTribeTowerRoof_0_1:: @@ -1078,13 +1078,13 @@ gAreaTileset_WindTribeTowerRoof_0_1:: gAreaTileset_WindTribeTowerRoof_0_2:: .incbin "maps/areas/049_WindTribeTowerRoof/tilesets/0/gAreaTileset_WindTribeTowerRoof_0_2.4bpp.lz" gAreaMetaTileset_WindTribeTowerRoof_bottom:: - .incbin "maps/areas/049_WindTribeTowerRoof/metatilesets/gAreaMetaTileset_WindTribeTowerRoof_bottom.bin.lz" + .incbin "maps/areas/049_WindTribeTowerRoof/metatileset/gAreaMetaTileset_WindTribeTowerRoof_bottom.bin.lz" gAreaMetaTileset_WindTribeTowerRoof_top:: - .incbin "maps/areas/049_WindTribeTowerRoof/metatilesets/gAreaMetaTileset_WindTribeTowerRoof_top.bin.lz" + .incbin "maps/areas/049_WindTribeTowerRoof/metatileset/gAreaMetaTileset_WindTribeTowerRoof_top.bin.lz" gAreaMetaTilesetTypes_WindTribeTowerRoof_bottom:: - .incbin "maps/areas/049_WindTribeTowerRoof/metatilesets/gAreaMetaTilesetTypes_WindTribeTowerRoof_bottom.bin.lz" + .incbin "maps/areas/049_WindTribeTowerRoof/metatileset/gAreaMetaTilesetTypes_WindTribeTowerRoof_bottom.bin.lz" gAreaMetaTilesetTypes_WindTribeTowerRoof_top:: - .incbin "maps/areas/049_WindTribeTowerRoof/metatilesets/gAreaMetaTilesetTypes_WindTribeTowerRoof_top.bin.lz" + .incbin "maps/areas/049_WindTribeTowerRoof/metatileset/gAreaMetaTilesetTypes_WindTribeTowerRoof_top.bin.lz" unknown_26:: .incbin "assets/unknown_26.bin" gAreaTileset_EzloCutscene_0_0:: @@ -1092,9 +1092,9 @@ gAreaTileset_EzloCutscene_0_0:: gAreaTileset_EzloCutscene_0_1:: .incbin "maps/areas/056_EzloCutscene/tilesets/0/gAreaTileset_EzloCutscene_0_1.4bpp.lz" gAreaMetaTileset_EzloCutscene_bottom:: - .incbin "maps/areas/056_EzloCutscene/metatilesets/gAreaMetaTileset_EzloCutscene_bottom.bin.lz" + .incbin "maps/areas/056_EzloCutscene/metatileset/gAreaMetaTileset_EzloCutscene_bottom.bin.lz" gAreaMetaTilesetTypes_EzloCutscene_bottom:: - .incbin "maps/areas/056_EzloCutscene/metatilesets/gAreaMetaTilesetTypes_EzloCutscene_bottom.bin.lz" + .incbin "maps/areas/056_EzloCutscene/metatileset/gAreaMetaTilesetTypes_EzloCutscene_bottom.bin.lz" unknown_27:: .incbin "assets/unknown_27.bin" gAreaRoomMap_HouseInteriors2_Stranger_bottom:: @@ -1150,29 +1150,29 @@ gAreaRoomMap_HouseInteriors2_Cucco_bottom:: gAreaRoomMap_HouseInteriors2_Cucco_top:: .incbin "maps/areas/034_HouseInteriors2/rooms/12_Cucco/gAreaRoomMap_HouseInteriors2_Cucco_top.bin.lz" gAreaRoomMap_HouseInteriors2_LinksHouseEntrance_bottom:: - .incbin "maps/areas/034_HouseInteriors2/rooms/34_16_LinksHouseEntrance/gAreaRoomMap_HouseInteriors2_LinksHouseEntrance_bottom.bin.lz" + .incbin "maps/areas/034_HouseInteriors2/rooms/16_LinksHouseEntrance/gAreaRoomMap_HouseInteriors2_LinksHouseEntrance_bottom.bin.lz" gAreaRoomMap_HouseInteriors2_LinksHouseEntrance_top:: - .incbin "maps/areas/034_HouseInteriors2/rooms/34_16_LinksHouseEntrance/gAreaRoomMap_HouseInteriors2_LinksHouseEntrance_top.bin.lz" + .incbin "maps/areas/034_HouseInteriors2/rooms/16_LinksHouseEntrance/gAreaRoomMap_HouseInteriors2_LinksHouseEntrance_top.bin.lz" gAreaRoomMap_HouseInteriors2_LinksHouseSmith_bottom:: - .incbin "maps/areas/034_HouseInteriors2/rooms/35_17_LinksHouseSmith/gAreaRoomMap_HouseInteriors2_LinksHouseSmith_bottom.bin.lz" + .incbin "maps/areas/034_HouseInteriors2/rooms/17_LinksHouseSmith/gAreaRoomMap_HouseInteriors2_LinksHouseSmith_bottom.bin.lz" gAreaRoomMap_HouseInteriors2_LinksHouseSmith_top:: - .incbin "maps/areas/034_HouseInteriors2/rooms/35_17_LinksHouseSmith/gAreaRoomMap_HouseInteriors2_LinksHouseSmith_top.bin.lz" + .incbin "maps/areas/034_HouseInteriors2/rooms/17_LinksHouseSmith/gAreaRoomMap_HouseInteriors2_LinksHouseSmith_top.bin.lz" gAreaRoomMap_HouseInteriors2_Dampe_bottom:: - .incbin "maps/areas/034_HouseInteriors2/rooms/37_19_13_Dampe/gAreaRoomMap_HouseInteriors2_Dampe_bottom.bin.lz" + .incbin "maps/areas/034_HouseInteriors2/rooms/18_Dampe/gAreaRoomMap_HouseInteriors2_Dampe_bottom.bin.lz" gAreaRoomMap_HouseInteriors2_Dampe_top:: - .incbin "maps/areas/034_HouseInteriors2/rooms/37_19_13_Dampe/gAreaRoomMap_HouseInteriors2_Dampe_top.bin.lz" + .incbin "maps/areas/034_HouseInteriors2/rooms/18_Dampe/gAreaRoomMap_HouseInteriors2_Dampe_top.bin.lz" gAreaRoomMap_HouseInteriors2_13_bottom:: - .incbin "maps/areas/034_HouseInteriors2/rooms/37_19_13/gAreaRoomMap_HouseInteriors2_13_bottom.bin.lz" + .incbin "maps/areas/034_HouseInteriors2/rooms/19_13/gAreaRoomMap_HouseInteriors2_13_bottom.bin.lz" gAreaRoomMap_HouseInteriors2_13_top:: - .incbin "maps/areas/034_HouseInteriors2/rooms/37_19_13/gAreaRoomMap_HouseInteriors2_13_top.bin.lz" + .incbin "maps/areas/034_HouseInteriors2/rooms/19_13/gAreaRoomMap_HouseInteriors2_13_top.bin.lz" gAreaRoomMap_HouseInteriors2_StockwellLakeHouse_bottom:: - .incbin "maps/areas/034_HouseInteriors2/rooms/32_20_StockwellLakeHouse/gAreaRoomMap_HouseInteriors2_StockwellLakeHouse_bottom.bin.lz" + .incbin "maps/areas/034_HouseInteriors2/rooms/20_StockwellLakeHouse/gAreaRoomMap_HouseInteriors2_StockwellLakeHouse_bottom.bin.lz" gAreaRoomMap_HouseInteriors2_StockwellLakeHouse_top:: - .incbin "maps/areas/034_HouseInteriors2/rooms/32_20_StockwellLakeHouse/gAreaRoomMap_HouseInteriors2_StockwellLakeHouse_top.bin.lz" + .incbin "maps/areas/034_HouseInteriors2/rooms/20_StockwellLakeHouse/gAreaRoomMap_HouseInteriors2_StockwellLakeHouse_top.bin.lz" gAreaRoomMap_HouseInteriors2_LinksHouseBedroom_bottom:: - .incbin "maps/areas/034_HouseInteriors2/rooms/33_21_LinksHouseBedroom/gAreaRoomMap_HouseInteriors2_LinksHouseBedroom_bottom.bin.lz" + .incbin "maps/areas/034_HouseInteriors2/rooms/21_LinksHouseBedroom/gAreaRoomMap_HouseInteriors2_LinksHouseBedroom_bottom.bin.lz" gAreaRoomMap_HouseInteriors2_LinksHouseBedroom_top:: - .incbin "maps/areas/034_HouseInteriors2/rooms/33_21_LinksHouseBedroom/gAreaRoomMap_HouseInteriors2_LinksHouseBedroom_top.bin.lz" + .incbin "maps/areas/034_HouseInteriors2/rooms/21_LinksHouseBedroom/gAreaRoomMap_HouseInteriors2_LinksHouseBedroom_top.bin.lz" gAreaRoomMap_HouseInteriors4_Carpenter_bottom:: .incbin "maps/areas/040_HouseInteriors4/rooms/00_Carpenter/gAreaRoomMap_HouseInteriors4_Carpenter_bottom.bin.lz" gAreaRoomMap_HouseInteriors4_Carpenter_top:: @@ -1274,17 +1274,17 @@ gAreaRoomMap_HouseInteriors1_InnEast2f_bottom:: gAreaRoomMap_HouseInteriors1_InnEast2f_top:: .incbin "maps/areas/033_HouseInteriors1/rooms/09_InnEast2f/gAreaRoomMap_HouseInteriors1_InnEast2f_top.bin.lz" gAreaRoomMap_HouseInteriors1_InnMinishHeartPiece_bottom:: - .incbin "maps/areas/033_HouseInteriors1/rooms/16_10_InnMinishHeartPiece/gAreaRoomMap_HouseInteriors1_InnMinishHeartPiece_bottom.bin.lz" + .incbin "maps/areas/033_HouseInteriors1/rooms/10_InnMinishHeartPiece/gAreaRoomMap_HouseInteriors1_InnMinishHeartPiece_bottom.bin.lz" gAreaRoomMap_HouseInteriors1_InnMinishHeartPiece_top:: - .incbin "maps/areas/033_HouseInteriors1/rooms/16_10_InnMinishHeartPiece/gAreaRoomMap_HouseInteriors1_InnMinishHeartPiece_top.bin.lz" + .incbin "maps/areas/033_HouseInteriors1/rooms/10_InnMinishHeartPiece/gAreaRoomMap_HouseInteriors1_InnMinishHeartPiece_top.bin.lz" gAreaRoomMap_HouseInteriors1_SchoolWest_bottom:: - .incbin "maps/areas/033_HouseInteriors1/rooms/17_11_SchoolWest/gAreaRoomMap_HouseInteriors1_SchoolWest_bottom.bin.lz" + .incbin "maps/areas/033_HouseInteriors1/rooms/11_SchoolWest/gAreaRoomMap_HouseInteriors1_SchoolWest_bottom.bin.lz" gAreaRoomMap_HouseInteriors1_SchoolWest_top:: - .incbin "maps/areas/033_HouseInteriors1/rooms/17_11_SchoolWest/gAreaRoomMap_HouseInteriors1_SchoolWest_top.bin.lz" + .incbin "maps/areas/033_HouseInteriors1/rooms/11_SchoolWest/gAreaRoomMap_HouseInteriors1_SchoolWest_top.bin.lz" gAreaRoomMap_HouseInteriors1_SchoolEast_bottom:: - .incbin "maps/areas/033_HouseInteriors1/rooms/18_12_SchoolEast/gAreaRoomMap_HouseInteriors1_SchoolEast_bottom.bin.lz" + .incbin "maps/areas/033_HouseInteriors1/rooms/12_SchoolEast/gAreaRoomMap_HouseInteriors1_SchoolEast_bottom.bin.lz" gAreaRoomMap_HouseInteriors1_SchoolEast_top:: - .incbin "maps/areas/033_HouseInteriors1/rooms/18_12_SchoolEast/gAreaRoomMap_HouseInteriors1_SchoolEast_top.bin.lz" + .incbin "maps/areas/033_HouseInteriors1/rooms/12_SchoolEast/gAreaRoomMap_HouseInteriors1_SchoolEast_top.bin.lz" gAreaRoomMap_Dojos_Grayblade_bottom:: .incbin "maps/areas/037_Dojos/rooms/00_Grayblade/gAreaRoomMap_Dojos_Grayblade_bottom.bin.lz" gAreaRoomMap_Dojos_Grayblade_top:: @@ -1362,25 +1362,25 @@ gAreaRoomMap_TreeInteriors_Waveblade_bottom:: gAreaRoomMap_TreeInteriors_Waveblade_top:: .incbin "maps/areas/036_TreeInteriors/rooms/19_Waveblade/gAreaRoomMap_TreeInteriors_Waveblade_top.bin.lz" gAreaRoomMap_TreeInteriors_14_bottom:: - .incbin "maps/areas/036_TreeInteriors/rooms/01_14/gAreaRoomMap_TreeInteriors_14_bottom.bin" + .incbin "maps/areas/036_TreeInteriors/rooms/20_14/gAreaRoomMap_TreeInteriors_14_bottom.bin" gAreaRoomMap_TreeInteriors_14_top:: - .incbin "maps/areas/036_TreeInteriors/rooms/01_14/gAreaRoomMap_TreeInteriors_14_top.bin.lz" + .incbin "maps/areas/036_TreeInteriors/rooms/20_14/gAreaRoomMap_TreeInteriors_14_top.bin.lz" gAreaRoomMap_TreeInteriors_BoomerangNorthwest_bottom:: - .incbin "maps/areas/036_TreeInteriors/rooms/11_BoomerangNorthwest/gAreaRoomMap_TreeInteriors_BoomerangNorthwest_bottom.bin" + .incbin "maps/areas/036_TreeInteriors/rooms/21_BoomerangNorthwest/gAreaRoomMap_TreeInteriors_BoomerangNorthwest_bottom.bin" gAreaRoomMap_TreeInteriors_BoomerangNorthwest_top:: - .incbin "maps/areas/036_TreeInteriors/rooms/11_BoomerangNorthwest/gAreaRoomMap_TreeInteriors_BoomerangNorthwest_top.bin.lz" + .incbin "maps/areas/036_TreeInteriors/rooms/21_BoomerangNorthwest/gAreaRoomMap_TreeInteriors_BoomerangNorthwest_top.bin.lz" gAreaRoomMap_TreeInteriors_BoomerangNortheast_bottom:: - .incbin "maps/areas/036_TreeInteriors/rooms/11_BoomerangNortheast/gAreaRoomMap_TreeInteriors_BoomerangNortheast_bottom.bin" + .incbin "maps/areas/036_TreeInteriors/rooms/22_BoomerangNortheast/gAreaRoomMap_TreeInteriors_BoomerangNortheast_bottom.bin" gAreaRoomMap_TreeInteriors_BoomerangNortheast_top:: - .incbin "maps/areas/036_TreeInteriors/rooms/11_BoomerangNortheast/gAreaRoomMap_TreeInteriors_BoomerangNortheast_top.bin.lz" + .incbin "maps/areas/036_TreeInteriors/rooms/22_BoomerangNortheast/gAreaRoomMap_TreeInteriors_BoomerangNortheast_top.bin.lz" gAreaRoomMap_TreeInteriors_BoomerangSouthwest_bottom:: - .incbin "maps/areas/036_TreeInteriors/rooms/11_BoomerangSouthwest/gAreaRoomMap_TreeInteriors_BoomerangSouthwest_bottom.bin" + .incbin "maps/areas/036_TreeInteriors/rooms/23_BoomerangSouthwest/gAreaRoomMap_TreeInteriors_BoomerangSouthwest_bottom.bin" gAreaRoomMap_TreeInteriors_BoomerangSouthwest_top:: - .incbin "maps/areas/036_TreeInteriors/rooms/11_BoomerangSouthwest/gAreaRoomMap_TreeInteriors_BoomerangSouthwest_top.bin.lz" + .incbin "maps/areas/036_TreeInteriors/rooms/23_BoomerangSouthwest/gAreaRoomMap_TreeInteriors_BoomerangSouthwest_top.bin.lz" gAreaRoomMap_TreeInteriors_BoomerangSoutheast_bottom:: - .incbin "maps/areas/036_TreeInteriors/rooms/11_BoomerangSoutheast/gAreaRoomMap_TreeInteriors_BoomerangSoutheast_bottom.bin" + .incbin "maps/areas/036_TreeInteriors/rooms/24_BoomerangSoutheast/gAreaRoomMap_TreeInteriors_BoomerangSoutheast_bottom.bin" gAreaRoomMap_TreeInteriors_BoomerangSoutheast_top:: - .incbin "maps/areas/036_TreeInteriors/rooms/11_BoomerangSoutheast/gAreaRoomMap_TreeInteriors_BoomerangSoutheast_top.bin.lz" + .incbin "maps/areas/036_TreeInteriors/rooms/24_BoomerangSoutheast/gAreaRoomMap_TreeInteriors_BoomerangSoutheast_top.bin.lz" gAreaRoomMap_TreeInteriors_WesternWoodsHeartPiece_bottom:: .incbin "maps/areas/036_TreeInteriors/rooms/25_WesternWoodsHeartPiece/gAreaRoomMap_TreeInteriors_WesternWoodsHeartPiece_bottom.bin" gAreaRoomMap_TreeInteriors_WesternWoodsHeartPiece_top:: @@ -1394,17 +1394,17 @@ gAreaRoomMap_TreeInteriors_MinishWoodsGreatFairy_bottom:: gAreaRoomMap_TreeInteriors_MinishWoodsGreatFairy_top:: .incbin "maps/areas/036_TreeInteriors/rooms/27_MinishWoodsGreatFairy/gAreaRoomMap_TreeInteriors_MinishWoodsGreatFairy_top.bin.lz" gAreaRoomMap_TreeInteriors_1c_bottom:: - .incbin "maps/areas/036_TreeInteriors/rooms/01_1c/gAreaRoomMap_TreeInteriors_1c_bottom.bin" + .incbin "maps/areas/036_TreeInteriors/rooms/28_1c/gAreaRoomMap_TreeInteriors_1c_bottom.bin" gAreaRoomMap_TreeInteriors_1c_top:: - .incbin "maps/areas/036_TreeInteriors/rooms/01_1c/gAreaRoomMap_TreeInteriors_1c_top.bin.lz" + .incbin "maps/areas/036_TreeInteriors/rooms/28_1c/gAreaRoomMap_TreeInteriors_1c_top.bin.lz" gAreaRoomMap_TreeInteriors_MinishWoodsBusinessScrub_bottom:: .incbin "maps/areas/036_TreeInteriors/rooms/29_MinishWoodsBusinessScrub/gAreaRoomMap_TreeInteriors_MinishWoodsBusinessScrub_bottom.bin" gAreaRoomMap_TreeInteriors_MinishWoodsBusinessScrub_top:: .incbin "maps/areas/036_TreeInteriors/rooms/29_MinishWoodsBusinessScrub/gAreaRoomMap_TreeInteriors_MinishWoodsBusinessScrub_top.bin.lz" gAreaRoomMap_TreeInteriors_1e_bottom:: - .incbin "maps/areas/036_TreeInteriors/rooms/01_1e/gAreaRoomMap_TreeInteriors_1e_bottom.bin" + .incbin "maps/areas/036_TreeInteriors/rooms/30_1e/gAreaRoomMap_TreeInteriors_1e_bottom.bin" gAreaRoomMap_TreeInteriors_1e_top:: - .incbin "maps/areas/036_TreeInteriors/rooms/01_1e/gAreaRoomMap_TreeInteriors_1e_top.bin.lz" + .incbin "maps/areas/036_TreeInteriors/rooms/30_1e/gAreaRoomMap_TreeInteriors_1e_top.bin.lz" gAreaRoomMap_TreeInteriors_UnusedHeartContainer_bottom:: .incbin "maps/areas/036_TreeInteriors/rooms/31_UnusedHeartContainer/gAreaRoomMap_TreeInteriors_UnusedHeartContainer_bottom.bin" gAreaRoomMap_TreeInteriors_UnusedHeartContainer_top:: @@ -1450,21 +1450,21 @@ gAreaRoomMap_MinishCracks_CastorWildsNorth_bottom:: gAreaRoomMap_MinishCracks_CastorWildsNorth_top:: .incbin "maps/areas/039_MinishCracks/rooms/09_CastorWildsNorth/gAreaRoomMap_MinishCracks_CastorWildsNorth_top.bin.lz" gAreaRoomMap_MinishCracks_CastorWildsWest_bottom:: - .incbin "maps/areas/039_MinishCracks/rooms/16_10_CastorWildsWest/gAreaRoomMap_MinishCracks_CastorWildsWest_bottom.bin" + .incbin "maps/areas/039_MinishCracks/rooms/10_CastorWildsWest/gAreaRoomMap_MinishCracks_CastorWildsWest_bottom.bin" gAreaRoomMap_MinishCracks_CastorWildsWest_top:: - .incbin "maps/areas/039_MinishCracks/rooms/16_10_CastorWildsWest/gAreaRoomMap_MinishCracks_CastorWildsWest_top.bin.lz" + .incbin "maps/areas/039_MinishCracks/rooms/10_CastorWildsWest/gAreaRoomMap_MinishCracks_CastorWildsWest_top.bin.lz" gAreaRoomMap_MinishCracks_CastorWildsMiddle_bottom:: - .incbin "maps/areas/039_MinishCracks/rooms/17_11_CastorWildsMiddle/gAreaRoomMap_MinishCracks_CastorWildsMiddle_bottom.bin" + .incbin "maps/areas/039_MinishCracks/rooms/11_CastorWildsMiddle/gAreaRoomMap_MinishCracks_CastorWildsMiddle_bottom.bin" gAreaRoomMap_MinishCracks_CastorWildsMiddle_top:: - .incbin "maps/areas/039_MinishCracks/rooms/17_11_CastorWildsMiddle/gAreaRoomMap_MinishCracks_CastorWildsMiddle_top.bin.lz" + .incbin "maps/areas/039_MinishCracks/rooms/11_CastorWildsMiddle/gAreaRoomMap_MinishCracks_CastorWildsMiddle_top.bin.lz" gAreaRoomMap_MinishCracks_RuinsTektite_bottom:: - .incbin "maps/areas/039_MinishCracks/rooms/18_12_RuinsTektite/gAreaRoomMap_MinishCracks_RuinsTektite_bottom.bin" + .incbin "maps/areas/039_MinishCracks/rooms/12_RuinsTektite/gAreaRoomMap_MinishCracks_RuinsTektite_bottom.bin" gAreaRoomMap_MinishCracks_RuinsTektite_top:: - .incbin "maps/areas/039_MinishCracks/rooms/18_12_RuinsTektite/gAreaRoomMap_MinishCracks_RuinsTektite_top.bin.lz" + .incbin "maps/areas/039_MinishCracks/rooms/12_RuinsTektite/gAreaRoomMap_MinishCracks_RuinsTektite_top.bin.lz" gAreaRoomMap_MinishCracks_CastorWildsNextToBow_bottom:: - .incbin "maps/areas/039_MinishCracks/rooms/19_13_CastorWildsNextToBow/gAreaRoomMap_MinishCracks_CastorWildsNextToBow_bottom.bin" + .incbin "maps/areas/039_MinishCracks/rooms/13_CastorWildsNextToBow/gAreaRoomMap_MinishCracks_CastorWildsNextToBow_bottom.bin" gAreaRoomMap_MinishCracks_CastorWildsNextToBow_top:: - .incbin "maps/areas/039_MinishCracks/rooms/19_13_CastorWildsNextToBow/gAreaRoomMap_MinishCracks_CastorWildsNextToBow_top.bin.lz" + .incbin "maps/areas/039_MinishCracks/rooms/13_CastorWildsNextToBow/gAreaRoomMap_MinishCracks_CastorWildsNextToBow_top.bin.lz" gAreaRoomMap_MinishCracks_E_bottom:: .incbin "maps/areas/039_MinishCracks/rooms/14_E/gAreaRoomMap_MinishCracks_E_bottom.bin.lz" gAreaRoomMap_MinishCracks_E_top:: @@ -1520,73 +1520,73 @@ gRoomCollisionMap_MinishHouseInteriors_GentariMain:: gRoomMapping_MinishHouseInteriors_GentariExit_bottom:: .incbin "maps/areas/032_MinishHouseInteriors/rooms/01_GentariExit/gRoomMapping_MinishHouseInteriors_GentariExit_bottom.bin.lz" gAreaTileset_MinishHouseInteriors_0_0:: - .incbin "tilesets/gAreaTileset_MinishHouseInteriors_0_0.8bpp.lz" + .incbin "maps/areas/032_MinishHouseInteriors/tilesets/0/gAreaTileset_MinishHouseInteriors_0_0.8bpp.lz" gRoomCollisionMap_MinishHouseInteriors_GentariExit:: .incbin "maps/areas/032_MinishHouseInteriors/rooms/01_GentariExit/gRoomCollisionMap_MinishHouseInteriors_GentariExit.bin.lz" gRoomMapping_MinishHouseInteriors_Festari_bottom:: .incbin "maps/areas/032_MinishHouseInteriors/rooms/02_Festari/gRoomMapping_MinishHouseInteriors_Festari_bottom.bin.lz" gAreaTileset_MinishHouseInteriors_1_0:: - .incbin "tilesets/gAreaTileset_MinishHouseInteriors_1_0.8bpp.lz" + .incbin "maps/areas/032_MinishHouseInteriors/tilesets/1/gAreaTileset_MinishHouseInteriors_1_0.8bpp.lz" gRoomCollisionMap_MinishHouseInteriors_Festari:: .incbin "maps/areas/032_MinishHouseInteriors/rooms/02_Festari/gRoomCollisionMap_MinishHouseInteriors_Festari.bin.lz" gRoomMapping_MinishHouseInteriors_Red_bottom:: .incbin "maps/areas/032_MinishHouseInteriors/rooms/03_Red/gRoomMapping_MinishHouseInteriors_Red_bottom.bin.lz" gAreaTileset_MinishHouseInteriors_2_0:: - .incbin "tilesets/gAreaTileset_MinishHouseInteriors_2_0.8bpp.lz" + .incbin "maps/areas/032_MinishHouseInteriors/tilesets/2/gAreaTileset_MinishHouseInteriors_2_0.8bpp.lz" gRoomCollisionMap_MinishHouseInteriors_Red:: .incbin "maps/areas/032_MinishHouseInteriors/rooms/03_Red/gRoomCollisionMap_MinishHouseInteriors_Red.bin.lz" gRoomMapping_MinishHouseInteriors_Green_bottom:: .incbin "maps/areas/032_MinishHouseInteriors/rooms/04_Green/gRoomMapping_MinishHouseInteriors_Green_bottom.bin.lz" gAreaTileset_MinishHouseInteriors_3_0:: - .incbin "tilesets/gAreaTileset_MinishHouseInteriors_3_0.8bpp.lz" + .incbin "maps/areas/032_MinishHouseInteriors/tilesets/3/gAreaTileset_MinishHouseInteriors_3_0.8bpp.lz" gRoomCollisionMap_MinishHouseInteriors_Green:: .incbin "maps/areas/032_MinishHouseInteriors/rooms/04_Green/gRoomCollisionMap_MinishHouseInteriors_Green.bin.lz" gRoomMapping_MinishHouseInteriors_Blue_bottom:: .incbin "maps/areas/032_MinishHouseInteriors/rooms/05_Blue/gRoomMapping_MinishHouseInteriors_Blue_bottom.bin.lz" gAreaTileset_MinishHouseInteriors_4_0:: - .incbin "tilesets/gAreaTileset_MinishHouseInteriors_4_0.8bpp.lz" + .incbin "maps/areas/032_MinishHouseInteriors/tilesets/4/gAreaTileset_MinishHouseInteriors_4_0.8bpp.lz" gRoomCollisionMap_MinishHouseInteriors_Blue:: .incbin "maps/areas/032_MinishHouseInteriors/rooms/05_Blue/gRoomCollisionMap_MinishHouseInteriors_Blue.bin.lz" gRoomMapping_MinishHouseInteriors_SideArea_bottom:: .incbin "maps/areas/032_MinishHouseInteriors/rooms/06_SideArea/gRoomMapping_MinishHouseInteriors_SideArea_bottom.bin.lz" gAreaTileset_MinishHouseInteriors_5_0:: - .incbin "tilesets/gAreaTileset_MinishHouseInteriors_5_0.8bpp.lz" + .incbin "maps/areas/032_MinishHouseInteriors/tilesets/5/gAreaTileset_MinishHouseInteriors_5_0.8bpp.lz" gRoomCollisionMap_MinishHouseInteriors_SideArea:: .incbin "maps/areas/032_MinishHouseInteriors/rooms/06_SideArea/gRoomCollisionMap_MinishHouseInteriors_SideArea.bin.lz" gRoomMapping_MinishHouseInteriors_ShoeMinish_bottom:: .incbin "maps/areas/032_MinishHouseInteriors/rooms/07_ShoeMinish/gRoomMapping_MinishHouseInteriors_ShoeMinish_bottom.bin.lz" gAreaTileset_MinishHouseInteriors_6_0:: - .incbin "tilesets/gAreaTileset_MinishHouseInteriors_6_0.8bpp.lz" + .incbin "maps/areas/032_MinishHouseInteriors/tilesets/6/gAreaTileset_MinishHouseInteriors_6_0.8bpp.lz" gRoomCollisionMap_MinishHouseInteriors_ShoeMinish:: .incbin "maps/areas/032_MinishHouseInteriors/rooms/07_ShoeMinish/gRoomCollisionMap_MinishHouseInteriors_ShoeMinish.bin.lz" gRoomMapping_MinishHouseInteriors_PotMinish_bottom:: .incbin "maps/areas/032_MinishHouseInteriors/rooms/08_PotMinish/gRoomMapping_MinishHouseInteriors_PotMinish_bottom.bin.lz" gAreaTileset_MinishHouseInteriors_7_0:: - .incbin "tilesets/gAreaTileset_MinishHouseInteriors_7_0.8bpp.lz" + .incbin "maps/areas/032_MinishHouseInteriors/tilesets/7/gAreaTileset_MinishHouseInteriors_7_0.8bpp.lz" gRoomCollisionMap_MinishHouseInteriors_PotMinish:: .incbin "maps/areas/032_MinishHouseInteriors/rooms/08_PotMinish/gRoomCollisionMap_MinishHouseInteriors_PotMinish.bin.lz" gRoomMapping_MinishHouseInteriors_BarrelMinish_bottom:: .incbin "maps/areas/032_MinishHouseInteriors/rooms/09_BarrelMinish/gRoomMapping_MinishHouseInteriors_BarrelMinish_bottom.bin.lz" gAreaTileset_MinishHouseInteriors_8_0:: - .incbin "tilesets/gAreaTileset_MinishHouseInteriors_8_0.8bpp.lz" + .incbin "maps/areas/032_MinishHouseInteriors/tilesets/8/gAreaTileset_MinishHouseInteriors_8_0.8bpp.lz" gRoomCollisionMap_MinishHouseInteriors_BarrelMinish:: .incbin "maps/areas/032_MinishHouseInteriors/rooms/09_BarrelMinish/gRoomCollisionMap_MinishHouseInteriors_BarrelMinish.bin.lz" gRoomMapping_MinishHouseInteriors_MelariMinesSouthwest_bottom:: .incbin "maps/areas/032_MinishHouseInteriors/rooms/16_MelariMinesSouthwest/gRoomMapping_MinishHouseInteriors_MelariMinesSouthwest_bottom.bin.lz" gAreaTileset_MinishHouseInteriors_9_0:: - .incbin "tilesets/gAreaTileset_MinishHouseInteriors_9_0.8bpp.lz" + .incbin "maps/areas/032_MinishHouseInteriors/tilesets/9/gAreaTileset_MinishHouseInteriors_9_0.8bpp.lz" gRoomCollisionMap_MinishHouseInteriors_MelariMinesSouthwest:: .incbin "maps/areas/032_MinishHouseInteriors/rooms/16_MelariMinesSouthwest/gRoomCollisionMap_MinishHouseInteriors_MelariMinesSouthwest.bin.lz" gRoomMapping_MinishHouseInteriors_MelariMinesSoutheast_bottom:: .incbin "maps/areas/032_MinishHouseInteriors/rooms/17_MelariMinesSoutheast/gRoomMapping_MinishHouseInteriors_MelariMinesSoutheast_bottom.bin.lz" gAreaTileset_MinishHouseInteriors_10_0:: - .incbin "tilesets/gAreaTileset_MinishHouseInteriors_10_0.8bpp.lz" + .incbin "maps/areas/032_MinishHouseInteriors/tilesets/10/gAreaTileset_MinishHouseInteriors_10_0.8bpp.lz" gRoomCollisionMap_MinishHouseInteriors_MelariMinesSoutheast:: .incbin "maps/areas/032_MinishHouseInteriors/rooms/17_MelariMinesSoutheast/gRoomCollisionMap_MinishHouseInteriors_MelariMinesSoutheast.bin.lz" gRoomMapping_MinishHouseInteriors_MelariMinesEast_bottom:: .incbin "maps/areas/032_MinishHouseInteriors/rooms/18_MelariMinesEast/gRoomMapping_MinishHouseInteriors_MelariMinesEast_bottom.bin.lz" gAreaTileset_MinishHouseInteriors_11_0:: - .incbin "tilesets/gAreaTileset_MinishHouseInteriors_11_0.8bpp.lz" + .incbin "maps/areas/032_MinishHouseInteriors/tilesets/11/gAreaTileset_MinishHouseInteriors_11_0.8bpp.lz" gRoomCollisionMap_MinishHouseInteriors_MelariMinesEast:: .incbin "maps/areas/032_MinishHouseInteriors/rooms/18_MelariMinesEast/gRoomCollisionMap_MinishHouseInteriors_MelariMinesEast.bin.lz" unknown_28:: @@ -1594,103 +1594,103 @@ unknown_28:: gRoomMapping_MinishHouseInteriors_HyruleFieldSouthwest_bottom:: .incbin "maps/areas/032_MinishHouseInteriors/rooms/32_HyruleFieldSouthwest/gRoomMapping_MinishHouseInteriors_HyruleFieldSouthwest_bottom.bin.lz" gAreaTileset_MinishHouseInteriors_12_0:: - .incbin "tilesets/gAreaTileset_MinishHouseInteriors_12_0.8bpp.lz" + .incbin "maps/areas/032_MinishHouseInteriors/tilesets/12/gAreaTileset_MinishHouseInteriors_12_0.8bpp.lz" gRoomCollisionMap_MinishHouseInteriors_HyruleFieldSouthwest:: .incbin "maps/areas/032_MinishHouseInteriors/rooms/32_HyruleFieldSouthwest/gRoomCollisionMap_MinishHouseInteriors_HyruleFieldSouthwest.bin.lz" gRoomMapping_MinishHouseInteriors_SouthHyruleField_bottom:: .incbin "maps/areas/032_MinishHouseInteriors/rooms/33_SouthHyruleField/gRoomMapping_MinishHouseInteriors_SouthHyruleField_bottom.bin.lz" gAreaTileset_MinishHouseInteriors_13_0:: - .incbin "tilesets/gAreaTileset_MinishHouseInteriors_13_0.8bpp.lz" + .incbin "maps/areas/032_MinishHouseInteriors/tilesets/13/gAreaTileset_MinishHouseInteriors_13_0.8bpp.lz" gRoomCollisionMap_MinishHouseInteriors_SouthHyruleField:: .incbin "maps/areas/032_MinishHouseInteriors/rooms/33_SouthHyruleField/gRoomCollisionMap_MinishHouseInteriors_SouthHyruleField.bin.lz" gRoomMapping_MinishHouseInteriors_NextToKnuckle_bottom:: .incbin "maps/areas/032_MinishHouseInteriors/rooms/34_NextToKnuckle/gRoomMapping_MinishHouseInteriors_NextToKnuckle_bottom.bin.lz" gAreaTileset_MinishHouseInteriors_14_0:: - .incbin "tilesets/gAreaTileset_MinishHouseInteriors_14_0.8bpp.lz" + .incbin "maps/areas/032_MinishHouseInteriors/tilesets/14/gAreaTileset_MinishHouseInteriors_14_0.8bpp.lz" gRoomCollisionMap_MinishHouseInteriors_NextToKnuckle:: .incbin "maps/areas/032_MinishHouseInteriors/rooms/34_NextToKnuckle/gRoomCollisionMap_MinishHouseInteriors_NextToKnuckle.bin.lz" gRoomMapping_MinishHouseInteriors_Librari_bottom:: .incbin "maps/areas/032_MinishHouseInteriors/rooms/35_Librari/gRoomMapping_MinishHouseInteriors_Librari_bottom.bin.lz" gAreaTileset_MinishHouseInteriors_15_0:: - .incbin "tilesets/gAreaTileset_MinishHouseInteriors_15_0.8bpp.lz" + .incbin "maps/areas/032_MinishHouseInteriors/tilesets/15/gAreaTileset_MinishHouseInteriors_15_0.8bpp.lz" gRoomCollisionMap_MinishHouseInteriors_Librari:: .incbin "maps/areas/032_MinishHouseInteriors/rooms/35_Librari/gRoomCollisionMap_MinishHouseInteriors_Librari.bin.lz" gRoomMapping_MinishHouseInteriors_HyruleFieldExit_bottom:: .incbin "maps/areas/032_MinishHouseInteriors/rooms/36_HyruleFieldExit/gRoomMapping_MinishHouseInteriors_HyruleFieldExit_bottom.bin.lz" gAreaTileset_MinishHouseInteriors_16_0:: - .incbin "tilesets/gAreaTileset_MinishHouseInteriors_16_0.8bpp.lz" + .incbin "maps/areas/032_MinishHouseInteriors/tilesets/16/gAreaTileset_MinishHouseInteriors_16_0.8bpp.lz" gRoomCollisionMap_MinishHouseInteriors_HyruleFieldExit:: .incbin "maps/areas/032_MinishHouseInteriors/rooms/36_HyruleFieldExit/gRoomCollisionMap_MinishHouseInteriors_HyruleFieldExit.bin.lz" gRoomMapping_MinishHouseInteriors_HyruleTown_bottom:: .incbin "maps/areas/032_MinishHouseInteriors/rooms/37_HyruleTown/gRoomMapping_MinishHouseInteriors_HyruleTown_bottom.bin.lz" gAreaTileset_MinishHouseInteriors_17_0:: - .incbin "tilesets/gAreaTileset_MinishHouseInteriors_17_0.8bpp.lz" + .incbin "maps/areas/032_MinishHouseInteriors/tilesets/17/gAreaTileset_MinishHouseInteriors_17_0.8bpp.lz" gRoomCollisionMap_MinishHouseInteriors_HyruleTown:: .incbin "maps/areas/032_MinishHouseInteriors/rooms/37_HyruleTown/gRoomCollisionMap_MinishHouseInteriors_HyruleTown.bin.lz" gRoomMapping_MinishHouseInteriors_MinishWoodsBomb_bottom:: .incbin "maps/areas/032_MinishHouseInteriors/rooms/38_MinishWoodsBomb/gRoomMapping_MinishHouseInteriors_MinishWoodsBomb_bottom.bin.lz" gAreaTileset_MinishHouseInteriors_18_0:: - .incbin "tilesets/gAreaTileset_MinishHouseInteriors_18_0.8bpp.lz" + .incbin "maps/areas/032_MinishHouseInteriors/tilesets/18/gAreaTileset_MinishHouseInteriors_18_0.8bpp.lz" gRoomCollisionMap_MinishHouseInteriors_MinishWoodsBomb:: .incbin "maps/areas/032_MinishHouseInteriors/rooms/38_MinishWoodsBomb/gRoomCollisionMap_MinishHouseInteriors_MinishWoodsBomb.bin.lz" gRoomMapping_MinishHouseInteriors_LakeHyliaOcarina_bottom:: .incbin "maps/areas/032_MinishHouseInteriors/rooms/39_LakeHyliaOcarina/gRoomMapping_MinishHouseInteriors_LakeHyliaOcarina_bottom.bin.lz" gAreaTileset_MinishHouseInteriors_19_0:: - .incbin "tilesets/gAreaTileset_MinishHouseInteriors_19_0.8bpp.lz" + .incbin "maps/areas/032_MinishHouseInteriors/tilesets/19/gAreaTileset_MinishHouseInteriors_19_0.8bpp.lz" gRoomCollisionMap_MinishHouseInteriors_LakeHyliaOcarina:: .incbin "maps/areas/032_MinishHouseInteriors/rooms/39_LakeHyliaOcarina/gRoomCollisionMap_MinishHouseInteriors_LakeHyliaOcarina.bin.lz" gRoomMapping_TownMinishHoles_MayorsHouse_bottom:: .incbin "maps/areas/045_TownMinishHoles/rooms/00_MayorsHouse/gRoomMapping_TownMinishHoles_MayorsHouse_bottom.bin.lz" gAreaTileset_TownMinishHoles_0_0:: - .incbin "tilesets/gAreaTileset_TownMinishHoles_0_0.8bpp.lz" + .incbin "maps/areas/045_TownMinishHoles/tilesets/0/gAreaTileset_TownMinishHoles_0_0.8bpp.lz" gRoomCollisionMap_TownMinishHoles_MayorsHouse:: .incbin "maps/areas/045_TownMinishHoles/rooms/00_MayorsHouse/gRoomCollisionMap_TownMinishHoles_MayorsHouse.bin.lz" gRoomMapping_TownMinishHoles_WestOracle_bottom:: .incbin "maps/areas/045_TownMinishHoles/rooms/01_WestOracle/gRoomMapping_TownMinishHoles_WestOracle_bottom.bin.lz" gAreaTileset_TownMinishHoles_1_0:: - .incbin "tilesets/gAreaTileset_TownMinishHoles_1_0.8bpp.lz" + .incbin "maps/areas/045_TownMinishHoles/tilesets/1/gAreaTileset_TownMinishHoles_1_0.8bpp.lz" gRoomCollisionMap_TownMinishHoles_WestOracle:: .incbin "maps/areas/045_TownMinishHoles/rooms/01_WestOracle/gRoomCollisionMap_TownMinishHoles_WestOracle.bin.lz" gRoomMapping_TownMinishHoles_DrLeft_bottom:: .incbin "maps/areas/045_TownMinishHoles/rooms/02_DrLeft/gRoomMapping_TownMinishHoles_DrLeft_bottom.bin.lz" gAreaTileset_TownMinishHoles_2_0:: - .incbin "tilesets/gAreaTileset_TownMinishHoles_2_0.8bpp.lz" + .incbin "maps/areas/045_TownMinishHoles/tilesets/2/gAreaTileset_TownMinishHoles_2_0.8bpp.lz" gRoomCollisionMap_TownMinishHoles_DrLeft:: .incbin "maps/areas/045_TownMinishHoles/rooms/02_DrLeft/gRoomCollisionMap_TownMinishHoles_DrLeft.bin.lz" gRoomMapping_TownMinishHoles_Carpenter_bottom:: .incbin "maps/areas/045_TownMinishHoles/rooms/03_Carpenter/gRoomMapping_TownMinishHoles_Carpenter_bottom.bin.lz" gAreaTileset_TownMinishHoles_3_0:: - .incbin "tilesets/gAreaTileset_TownMinishHoles_3_0.8bpp.lz" + .incbin "maps/areas/045_TownMinishHoles/tilesets/3/gAreaTileset_TownMinishHoles_3_0.8bpp.lz" gRoomCollisionMap_TownMinishHoles_Carpenter:: .incbin "maps/areas/045_TownMinishHoles/rooms/03_Carpenter/gRoomCollisionMap_TownMinishHoles_Carpenter.bin.lz" gRoomMapping_TownMinishHoles_Cafe_bottom:: .incbin "maps/areas/045_TownMinishHoles/rooms/04_Cafe/gRoomMapping_TownMinishHoles_Cafe_bottom.bin.lz" gAreaTileset_TownMinishHoles_4_0:: - .incbin "tilesets/gAreaTileset_TownMinishHoles_4_0.8bpp.lz" + .incbin "maps/areas/045_TownMinishHoles/tilesets/4/gAreaTileset_TownMinishHoles_4_0.8bpp.lz" gRoomCollisionMap_TownMinishHoles_Cafe:: .incbin "maps/areas/045_TownMinishHoles/rooms/04_Cafe/gRoomCollisionMap_TownMinishHoles_Cafe.bin.lz" gRoomMapping_TownMinishHoles_5_bottom:: .incbin "maps/areas/045_TownMinishHoles/rooms/05_5/gRoomMapping_TownMinishHoles_5_bottom.bin.lz" gAreaTileset_TownMinishHoles_5_0:: - .incbin "tilesets/gAreaTileset_TownMinishHoles_5_0.8bpp.lz" + .incbin "maps/areas/045_TownMinishHoles/tilesets/5/gAreaTileset_TownMinishHoles_5_0.8bpp.lz" gRoomCollisionMap_TownMinishHoles_5:: .incbin "maps/areas/045_TownMinishHoles/rooms/05_5/gRoomCollisionMap_TownMinishHoles_5.bin.lz" gRoomMapping_TownMinishHoles_LibraryBookshelf_bottom:: .incbin "maps/areas/045_TownMinishHoles/rooms/16_LibraryBookshelf/gRoomMapping_TownMinishHoles_LibraryBookshelf_bottom.bin.lz" gAreaTileset_TownMinishHoles_6_0:: - .incbin "tilesets/gAreaTileset_TownMinishHoles_6_0.8bpp.lz" + .incbin "maps/areas/045_TownMinishHoles/tilesets/6/gAreaTileset_TownMinishHoles_6_0.8bpp.lz" gRoomCollisionMap_TownMinishHoles_LibraryBookshelf:: .incbin "maps/areas/045_TownMinishHoles/rooms/16_LibraryBookshelf/gRoomCollisionMap_TownMinishHoles_LibraryBookshelf.bin.lz" gRoomMapping_TownMinishHoles_LibraryBooksHouse_bottom:: .incbin "maps/areas/045_TownMinishHoles/rooms/17_LibraryBooksHouse/gRoomMapping_TownMinishHoles_LibraryBooksHouse_bottom.bin.lz" gAreaTileset_TownMinishHoles_7_0:: - .incbin "tilesets/gAreaTileset_TownMinishHoles_7_0.8bpp.lz" + .incbin "maps/areas/045_TownMinishHoles/tilesets/7/gAreaTileset_TownMinishHoles_7_0.8bpp.lz" gRoomCollisionMap_TownMinishHoles_LibraryBooksHouse:: .incbin "maps/areas/045_TownMinishHoles/rooms/17_LibraryBooksHouse/gRoomCollisionMap_TownMinishHoles_LibraryBooksHouse.bin.lz" gRoomMapping_TownMinishHoles_RemShoeShop_bottom:: .incbin "maps/areas/045_TownMinishHoles/rooms/18_RemShoeShop/gRoomMapping_TownMinishHoles_RemShoeShop_bottom.bin.lz" gAreaTileset_TownMinishHoles_8_0:: - .incbin "tilesets/gAreaTileset_TownMinishHoles_8_0.8bpp.lz" + .incbin "maps/areas/045_TownMinishHoles/tilesets/8/gAreaTileset_TownMinishHoles_8_0.8bpp.lz" gRoomCollisionMap_TownMinishHoles_RemShoeShop:: .incbin "maps/areas/045_TownMinishHoles/rooms/18_RemShoeShop/gRoomCollisionMap_TownMinishHoles_RemShoeShop.bin.lz" gAreaTileset_40_0_0:: @@ -1700,13 +1700,13 @@ gAreaTileset_40_0_1:: gAreaTileset_40_0_2:: .incbin "maps/areas/064_40/tilesets/0/gAreaTileset_40_0_2.4bpp.lz" gAreaMetaTileset_40_bottom:: - .incbin "maps/areas/064_40/metatilesets/gAreaMetaTileset_40_bottom.bin.lz" + .incbin "maps/areas/064_40/metatileset/gAreaMetaTileset_40_bottom.bin.lz" gAreaMetaTileset_40_top:: - .incbin "maps/areas/064_40/metatilesets/gAreaMetaTileset_40_top.bin.lz" + .incbin "maps/areas/064_40/metatileset/gAreaMetaTileset_40_top.bin.lz" gAreaMetaTilesetTypes_40_bottom:: - .incbin "maps/areas/064_40/metatilesets/gAreaMetaTilesetTypes_40_bottom.bin.lz" + .incbin "maps/areas/064_40/metatileset/gAreaMetaTilesetTypes_40_bottom.bin.lz" gAreaMetaTilesetTypes_40_top:: - .incbin "maps/areas/064_40/metatilesets/gAreaMetaTilesetTypes_40_top.bin.lz" + .incbin "maps/areas/064_40/metatileset/gAreaMetaTilesetTypes_40_top.bin.lz" gAreaRoomMap_40_0_bottom:: .incbin "maps/areas/064_40/rooms/00_0/gAreaRoomMap_40_0_bottom.bin.lz" gAreaRoomMap_40_0_top:: @@ -1778,13 +1778,13 @@ gAreaTileset_DeepwoodShrine_0_1:: gAreaTileset_DeepwoodShrine_0_2:: .incbin "maps/areas/072_DeepwoodShrine/tilesets/0/gAreaTileset_DeepwoodShrine_0_2.4bpp.lz" gAreaMetaTileset_DeepwoodShrine_bottom:: - .incbin "maps/areas/072_DeepwoodShrine/metatilesets/gAreaMetaTileset_DeepwoodShrine_bottom.bin.lz" + .incbin "maps/areas/072_DeepwoodShrine/metatileset/gAreaMetaTileset_DeepwoodShrine_bottom.bin.lz" gAreaMetaTileset_DeepwoodShrine_top:: - .incbin "maps/areas/072_DeepwoodShrine/metatilesets/gAreaMetaTileset_DeepwoodShrine_top.bin.lz" + .incbin "maps/areas/072_DeepwoodShrine/metatileset/gAreaMetaTileset_DeepwoodShrine_top.bin.lz" gAreaMetaTilesetTypes_DeepwoodShrine_bottom:: - .incbin "maps/areas/072_DeepwoodShrine/metatilesets/gAreaMetaTilesetTypes_DeepwoodShrine_bottom.bin.lz" + .incbin "maps/areas/072_DeepwoodShrine/metatileset/gAreaMetaTilesetTypes_DeepwoodShrine_bottom.bin.lz" gAreaMetaTilesetTypes_DeepwoodShrine_top:: - .incbin "maps/areas/072_DeepwoodShrine/metatilesets/gAreaMetaTilesetTypes_DeepwoodShrine_top.bin.lz" + .incbin "maps/areas/072_DeepwoodShrine/metatileset/gAreaMetaTilesetTypes_DeepwoodShrine_top.bin.lz" gAreaTileset_DeepwoodShrineBoss_0_0:: .incbin "maps/areas/073_DeepwoodShrineBoss/tilesets/0/gAreaTileset_DeepwoodShrineBoss_0_0.4bpp.lz" gAreaTileset_DeepwoodShrineBoss_0_1:: @@ -1792,13 +1792,13 @@ gAreaTileset_DeepwoodShrineBoss_0_1:: gAreaTileset_DeepwoodShrineBoss_0_2:: .incbin "maps/areas/073_DeepwoodShrineBoss/tilesets/0/gAreaTileset_DeepwoodShrineBoss_0_2.4bpp.lz" gAreaMetaTileset_DeepwoodShrineBoss_bottom:: - .incbin "maps/areas/073_DeepwoodShrineBoss/metatilesets/gAreaMetaTileset_DeepwoodShrineBoss_bottom.bin.lz" + .incbin "maps/areas/073_DeepwoodShrineBoss/metatileset/gAreaMetaTileset_DeepwoodShrineBoss_bottom.bin.lz" gAreaMetaTileset_DeepwoodShrineBoss_top:: - .incbin "maps/areas/073_DeepwoodShrineBoss/metatilesets/gAreaMetaTileset_DeepwoodShrineBoss_top.bin.lz" + .incbin "maps/areas/073_DeepwoodShrineBoss/metatileset/gAreaMetaTileset_DeepwoodShrineBoss_top.bin.lz" gAreaMetaTilesetTypes_DeepwoodShrineBoss_bottom:: - .incbin "maps/areas/073_DeepwoodShrineBoss/metatilesets/gAreaMetaTilesetTypes_DeepwoodShrineBoss_bottom.bin.lz" + .incbin "maps/areas/073_DeepwoodShrineBoss/metatileset/gAreaMetaTilesetTypes_DeepwoodShrineBoss_bottom.bin.lz" gAreaMetaTilesetTypes_DeepwoodShrineBoss_top:: - .incbin "maps/areas/073_DeepwoodShrineBoss/metatilesets/gAreaMetaTilesetTypes_DeepwoodShrineBoss_top.bin.lz" + .incbin "maps/areas/073_DeepwoodShrineBoss/metatileset/gAreaMetaTilesetTypes_DeepwoodShrineBoss_top.bin.lz" gAreaTileset_DeepwoodShrineEntry_0_0:: .incbin "maps/areas/074_DeepwoodShrineEntry/tilesets/0/gAreaTileset_DeepwoodShrineEntry_0_0.4bpp.lz" gAreaTileset_DeepwoodShrineEntry_0_1:: @@ -1806,13 +1806,13 @@ gAreaTileset_DeepwoodShrineEntry_0_1:: gAreaTileset_DeepwoodShrineEntry_0_2:: .incbin "maps/areas/074_DeepwoodShrineEntry/tilesets/0/gAreaTileset_DeepwoodShrineEntry_0_2.4bpp.lz" gAreaMetaTileset_DeepwoodShrineEntry_bottom:: - .incbin "maps/areas/074_DeepwoodShrineEntry/metatilesets/gAreaMetaTileset_DeepwoodShrineEntry_bottom.bin.lz" + .incbin "maps/areas/074_DeepwoodShrineEntry/metatileset/gAreaMetaTileset_DeepwoodShrineEntry_bottom.bin.lz" gAreaMetaTileset_DeepwoodShrineEntry_top:: - .incbin "maps/areas/074_DeepwoodShrineEntry/metatilesets/gAreaMetaTileset_DeepwoodShrineEntry_top.bin.lz" + .incbin "maps/areas/074_DeepwoodShrineEntry/metatileset/gAreaMetaTileset_DeepwoodShrineEntry_top.bin.lz" gAreaMetaTilesetTypes_DeepwoodShrineEntry_bottom:: - .incbin "maps/areas/074_DeepwoodShrineEntry/metatilesets/gAreaMetaTilesetTypes_DeepwoodShrineEntry_bottom.bin.lz" + .incbin "maps/areas/074_DeepwoodShrineEntry/metatileset/gAreaMetaTilesetTypes_DeepwoodShrineEntry_bottom.bin.lz" gAreaMetaTilesetTypes_DeepwoodShrineEntry_top:: - .incbin "maps/areas/074_DeepwoodShrineEntry/metatilesets/gAreaMetaTilesetTypes_DeepwoodShrineEntry_top.bin.lz" + .incbin "maps/areas/074_DeepwoodShrineEntry/metatileset/gAreaMetaTilesetTypes_DeepwoodShrineEntry_top.bin.lz" gAreaRoomMap_DeepwoodShrine_Madderpillar_bottom:: .incbin "maps/areas/072_DeepwoodShrine/rooms/00_Madderpillar/gAreaRoomMap_DeepwoodShrine_Madderpillar_bottom.bin.lz" gAreaRoomMap_DeepwoodShrine_Madderpillar_top:: @@ -1898,16 +1898,16 @@ gAreaRoomMap_DeepwoodShrine_BossKey_top:: gDungeonMaps_DeepwoodShrine_BossKey:: .incbin "maps/areas/072_DeepwoodShrine/rooms/17_BossKey/dungeon_map.bin" gAreaRoomMap_DeepwoodShrine_Compass_bottom:: - .incbin "maps/areas/072_DeepwoodShrine/rooms/12_Compass/gAreaRoomMap_DeepwoodShrine_Compass_bottom.bin.lz" + .incbin "maps/areas/072_DeepwoodShrine/rooms/18_Compass/gAreaRoomMap_DeepwoodShrine_Compass_bottom.bin.lz" gAreaRoomMap_DeepwoodShrine_Compass_top:: - .incbin "maps/areas/072_DeepwoodShrine/rooms/12_Compass/gAreaRoomMap_DeepwoodShrine_Compass_top.bin.lz" + .incbin "maps/areas/072_DeepwoodShrine/rooms/18_Compass/gAreaRoomMap_DeepwoodShrine_Compass_top.bin.lz" gDungeonMaps_DeepwoodShrine_Compass:: .incbin "maps/areas/072_DeepwoodShrine/rooms/18_Compass/dungeon_map.bin" gAreaRoomMap_DeepwoodShrine_13_bottom:: .incbin "maps/areas/072_DeepwoodShrine/rooms/19_13/gAreaRoomMap_DeepwoodShrine_13_bottom.bin.lz" gAreaRoomMap_DeepwoodShrine_13_top:: .incbin "maps/areas/072_DeepwoodShrine/rooms/19_13/gAreaRoomMap_DeepwoodShrine_13_top.bin.lz" -gDungeonMaps_072_DeepwoodShrine_19_13_unused:: +gDungeonMaps_072_DeepwoodShrine_13_unused:: .incbin "maps/areas/072_DeepwoodShrine/rooms/19_13/dungeon_map.bin" gAreaRoomMap_DeepwoodShrine_LilyPadWest_bottom:: .incbin "maps/areas/072_DeepwoodShrine/rooms/20_LilyPadWest/gAreaRoomMap_DeepwoodShrine_LilyPadWest_bottom.bin.lz" @@ -1950,13 +1950,13 @@ gAreaTileset_CaveOfFlames_0_1:: gAreaTileset_CaveOfFlames_0_2:: .incbin "maps/areas/080_CaveOfFlames/tilesets/0/gAreaTileset_CaveOfFlames_0_2.4bpp.lz" gAreaMetaTileset_CaveOfFlames_bottom:: - .incbin "maps/areas/080_CaveOfFlames/metatilesets/gAreaMetaTileset_CaveOfFlames_bottom.bin.lz" + .incbin "maps/areas/080_CaveOfFlames/metatileset/gAreaMetaTileset_CaveOfFlames_bottom.bin.lz" gAreaMetaTileset_CaveOfFlames_top:: - .incbin "maps/areas/080_CaveOfFlames/metatilesets/gAreaMetaTileset_CaveOfFlames_top.bin.lz" + .incbin "maps/areas/080_CaveOfFlames/metatileset/gAreaMetaTileset_CaveOfFlames_top.bin.lz" gAreaMetaTilesetTypes_CaveOfFlames_bottom:: - .incbin "maps/areas/080_CaveOfFlames/metatilesets/gAreaMetaTilesetTypes_CaveOfFlames_bottom.bin.lz" + .incbin "maps/areas/080_CaveOfFlames/metatileset/gAreaMetaTilesetTypes_CaveOfFlames_bottom.bin.lz" gAreaMetaTilesetTypes_CaveOfFlames_top:: - .incbin "maps/areas/080_CaveOfFlames/metatilesets/gAreaMetaTilesetTypes_CaveOfFlames_top.bin.lz" + .incbin "maps/areas/080_CaveOfFlames/metatileset/gAreaMetaTilesetTypes_CaveOfFlames_top.bin.lz" gAreaTileset_CaveOfFlamesBoss_0_0:: .incbin "maps/areas/081_CaveOfFlamesBoss/tilesets/0/gAreaTileset_CaveOfFlamesBoss_0_0.4bpp.lz" gAreaTileset_CaveOfFlamesBoss_0_1:: @@ -1964,13 +1964,13 @@ gAreaTileset_CaveOfFlamesBoss_0_1:: gAreaTileset_CaveOfFlamesBoss_0_2:: .incbin "maps/areas/081_CaveOfFlamesBoss/tilesets/0/gAreaTileset_CaveOfFlamesBoss_0_2.4bpp.lz" gAreaMetaTileset_CaveOfFlamesBoss_bottom:: - .incbin "maps/areas/081_CaveOfFlamesBoss/metatilesets/gAreaMetaTileset_CaveOfFlamesBoss_bottom.bin.lz" + .incbin "maps/areas/081_CaveOfFlamesBoss/metatileset/gAreaMetaTileset_CaveOfFlamesBoss_bottom.bin.lz" gAreaMetaTileset_CaveOfFlamesBoss_top:: - .incbin "maps/areas/081_CaveOfFlamesBoss/metatilesets/gAreaMetaTileset_CaveOfFlamesBoss_top.bin.lz" + .incbin "maps/areas/081_CaveOfFlamesBoss/metatileset/gAreaMetaTileset_CaveOfFlamesBoss_top.bin.lz" gAreaMetaTilesetTypes_CaveOfFlamesBoss_bottom:: - .incbin "maps/areas/081_CaveOfFlamesBoss/metatilesets/gAreaMetaTilesetTypes_CaveOfFlamesBoss_bottom.bin.lz" + .incbin "maps/areas/081_CaveOfFlamesBoss/metatileset/gAreaMetaTilesetTypes_CaveOfFlamesBoss_bottom.bin.lz" gAreaMetaTilesetTypes_CaveOfFlamesBoss_top:: - .incbin "maps/areas/081_CaveOfFlamesBoss/metatilesets/gAreaMetaTilesetTypes_CaveOfFlamesBoss_top.bin.lz" + .incbin "maps/areas/081_CaveOfFlamesBoss/metatileset/gAreaMetaTilesetTypes_CaveOfFlamesBoss_top.bin.lz" gAreaTileset_CaveOfFlames_0_3:: .incbin "maps/areas/080_CaveOfFlames/tilesets/0/gAreaTileset_CaveOfFlames_0_3.4bpp.lz" gAreaRoomMap_CaveOfFlames_AfterCane_bottom:: @@ -2046,39 +2046,39 @@ gAreaRoomMap_CaveOfFlames_TompasDoom_top:: gDungeonMaps_CaveOfFlames_TompasDoom:: .incbin "maps/areas/080_CaveOfFlames/rooms/17_TompasDoom/dungeon_map.bin" gAreaRoomMap_CaveOfFlames_BeforeGleerok_bottom:: - .incbin "maps/areas/080_CaveOfFlames/rooms/11_BeforeGleerok/gAreaRoomMap_CaveOfFlames_BeforeGleerok_bottom.bin.lz" + .incbin "maps/areas/080_CaveOfFlames/rooms/18_BeforeGleerok/gAreaRoomMap_CaveOfFlames_BeforeGleerok_bottom.bin.lz" gAreaRoomMap_CaveOfFlames_BeforeGleerok_top:: - .incbin "maps/areas/080_CaveOfFlames/rooms/11_BeforeGleerok/gAreaRoomMap_CaveOfFlames_BeforeGleerok_top.bin.lz" + .incbin "maps/areas/080_CaveOfFlames/rooms/18_BeforeGleerok/gAreaRoomMap_CaveOfFlames_BeforeGleerok_top.bin.lz" gDungeonMaps_CaveOfFlames_BeforeGleerok:: .incbin "maps/areas/080_CaveOfFlames/rooms/18_BeforeGleerok/dungeon_map.bin" gAreaRoomMap_CaveOfFlames_BosskeyPath1_bottom:: - .incbin "maps/areas/080_CaveOfFlames/rooms/11_BosskeyPath1/gAreaRoomMap_CaveOfFlames_BosskeyPath1_bottom.bin.lz" + .incbin "maps/areas/080_CaveOfFlames/rooms/19_BosskeyPath1/gAreaRoomMap_CaveOfFlames_BosskeyPath1_bottom.bin.lz" gAreaRoomMap_CaveOfFlames_BosskeyPath1_top:: - .incbin "maps/areas/080_CaveOfFlames/rooms/11_BosskeyPath1/gAreaRoomMap_CaveOfFlames_BosskeyPath1_top.bin.lz" + .incbin "maps/areas/080_CaveOfFlames/rooms/19_BosskeyPath1/gAreaRoomMap_CaveOfFlames_BosskeyPath1_top.bin.lz" gDungeonMaps_CaveOfFlames_BosskeyPath1:: .incbin "maps/areas/080_CaveOfFlames/rooms/19_BosskeyPath1/dungeon_map.bin" gAreaRoomMap_CaveOfFlames_BosskeyPath2_bottom:: - .incbin "maps/areas/080_CaveOfFlames/rooms/11_BosskeyPath2/gAreaRoomMap_CaveOfFlames_BosskeyPath2_bottom.bin.lz" + .incbin "maps/areas/080_CaveOfFlames/rooms/20_BosskeyPath2/gAreaRoomMap_CaveOfFlames_BosskeyPath2_bottom.bin.lz" gAreaRoomMap_CaveOfFlames_BosskeyPath2_top:: - .incbin "maps/areas/080_CaveOfFlames/rooms/11_BosskeyPath2/gAreaRoomMap_CaveOfFlames_BosskeyPath2_top.bin.lz" + .incbin "maps/areas/080_CaveOfFlames/rooms/20_BosskeyPath2/gAreaRoomMap_CaveOfFlames_BosskeyPath2_top.bin.lz" gDungeonMaps_CaveOfFlames_BosskeyPath2:: - .incbin "maps/areas/080_CaveOfFlames/rooms/32_20_BosskeyPath2/dungeon_map.bin" + .incbin "maps/areas/080_CaveOfFlames/rooms/20_BosskeyPath2/dungeon_map.bin" gAreaRoomMap_CaveOfFlames_Compass_bottom:: - .incbin "maps/areas/080_CaveOfFlames/rooms/12_Compass/gAreaRoomMap_CaveOfFlames_Compass_bottom.bin.lz" + .incbin "maps/areas/080_CaveOfFlames/rooms/21_Compass/gAreaRoomMap_CaveOfFlames_Compass_bottom.bin.lz" gAreaRoomMap_CaveOfFlames_Compass_top:: - .incbin "maps/areas/080_CaveOfFlames/rooms/12_Compass/gAreaRoomMap_CaveOfFlames_Compass_top.bin.lz" + .incbin "maps/areas/080_CaveOfFlames/rooms/21_Compass/gAreaRoomMap_CaveOfFlames_Compass_top.bin.lz" gDungeonMaps_CaveOfFlames_Compass:: .incbin "maps/areas/080_CaveOfFlames/rooms/21_Compass/dungeon_map.bin" gAreaRoomMap_CaveOfFlames_BobOmbWall_bottom:: - .incbin "maps/areas/080_CaveOfFlames/rooms/11_BobOmbWall/gAreaRoomMap_CaveOfFlames_BobOmbWall_bottom.bin.lz" + .incbin "maps/areas/080_CaveOfFlames/rooms/22_BobOmbWall/gAreaRoomMap_CaveOfFlames_BobOmbWall_bottom.bin.lz" gAreaRoomMap_CaveOfFlames_BobOmbWall_top:: - .incbin "maps/areas/080_CaveOfFlames/rooms/11_BobOmbWall/gAreaRoomMap_CaveOfFlames_BobOmbWall_top.bin.lz" + .incbin "maps/areas/080_CaveOfFlames/rooms/22_BobOmbWall/gAreaRoomMap_CaveOfFlames_BobOmbWall_top.bin.lz" gDungeonMaps_CaveOfFlames_BobOmbWall:: .incbin "maps/areas/080_CaveOfFlames/rooms/22_BobOmbWall/dungeon_map.bin" gAreaRoomMap_CaveOfFlames_BossDoor_bottom:: - .incbin "maps/areas/080_CaveOfFlames/rooms/11_BossDoor/gAreaRoomMap_CaveOfFlames_BossDoor_bottom.bin.lz" + .incbin "maps/areas/080_CaveOfFlames/rooms/23_BossDoor/gAreaRoomMap_CaveOfFlames_BossDoor_bottom.bin.lz" gAreaRoomMap_CaveOfFlames_BossDoor_top:: - .incbin "maps/areas/080_CaveOfFlames/rooms/11_BossDoor/gAreaRoomMap_CaveOfFlames_BossDoor_top.bin.lz" + .incbin "maps/areas/080_CaveOfFlames/rooms/23_BossDoor/gAreaRoomMap_CaveOfFlames_BossDoor_top.bin.lz" gDungeonMaps_CaveOfFlames_BossDoor:: .incbin "maps/areas/080_CaveOfFlames/rooms/23_BossDoor/dungeon_map.bin" gAreaRoomMap_CaveOfFlamesBoss_0_bottom:: @@ -2094,13 +2094,13 @@ gAreaTileset_CastorDarknut_0_1:: gAreaTileset_CastorDarknut_0_2:: .incbin "maps/areas/043_CastorDarknut/tilesets/0/gAreaTileset_CastorDarknut_0_2.4bpp.lz" gAreaMetaTileset_CastorDarknut_bottom:: - .incbin "maps/areas/043_CastorDarknut/metatilesets/gAreaMetaTileset_CastorDarknut_bottom.bin.lz" + .incbin "maps/areas/043_CastorDarknut/metatileset/gAreaMetaTileset_CastorDarknut_bottom.bin.lz" gAreaMetaTileset_CastorDarknut_top:: - .incbin "maps/areas/043_CastorDarknut/metatilesets/gAreaMetaTileset_CastorDarknut_top.bin.lz" + .incbin "maps/areas/043_CastorDarknut/metatileset/gAreaMetaTileset_CastorDarknut_top.bin.lz" gAreaMetaTilesetTypes_CastorDarknut_bottom:: - .incbin "maps/areas/043_CastorDarknut/metatilesets/gAreaMetaTilesetTypes_CastorDarknut_bottom.bin.lz" + .incbin "maps/areas/043_CastorDarknut/metatileset/gAreaMetaTilesetTypes_CastorDarknut_bottom.bin.lz" gAreaMetaTilesetTypes_CastorDarknut_top:: - .incbin "maps/areas/043_CastorDarknut/metatilesets/gAreaMetaTilesetTypes_CastorDarknut_top.bin.lz" + .incbin "maps/areas/043_CastorDarknut/metatileset/gAreaMetaTilesetTypes_CastorDarknut_top.bin.lz" gAreaTileset_InnerMazaal_0_0:: .incbin "maps/areas/090_InnerMazaal/tilesets/0/gAreaTileset_InnerMazaal_0_0.4bpp.lz" gAreaTileset_InnerMazaal_0_1:: @@ -2108,13 +2108,13 @@ gAreaTileset_InnerMazaal_0_1:: gAreaTileset_InnerMazaal_0_2:: .incbin "maps/areas/090_InnerMazaal/tilesets/0/gAreaTileset_InnerMazaal_0_2.4bpp.lz" gAreaMetaTileset_InnerMazaal_bottom:: - .incbin "maps/areas/090_InnerMazaal/metatilesets/gAreaMetaTileset_InnerMazaal_bottom.bin.lz" + .incbin "maps/areas/090_InnerMazaal/metatileset/gAreaMetaTileset_InnerMazaal_bottom.bin.lz" gAreaMetaTileset_InnerMazaal_top:: - .incbin "maps/areas/090_InnerMazaal/metatilesets/gAreaMetaTileset_InnerMazaal_top.bin.lz" + .incbin "maps/areas/090_InnerMazaal/metatileset/gAreaMetaTileset_InnerMazaal_top.bin.lz" gAreaMetaTilesetTypes_InnerMazaal_bottom:: - .incbin "maps/areas/090_InnerMazaal/metatilesets/gAreaMetaTilesetTypes_InnerMazaal_bottom.bin.lz" + .incbin "maps/areas/090_InnerMazaal/metatileset/gAreaMetaTilesetTypes_InnerMazaal_bottom.bin.lz" gAreaMetaTilesetTypes_InnerMazaal_top:: - .incbin "maps/areas/090_InnerMazaal/metatilesets/gAreaMetaTilesetTypes_InnerMazaal_top.bin.lz" + .incbin "maps/areas/090_InnerMazaal/metatileset/gAreaMetaTilesetTypes_InnerMazaal_top.bin.lz" gAreaTileset_FortressOfWindsTop_0_0:: .incbin "maps/areas/089_FortressOfWindsTop/tilesets/0/gAreaTileset_FortressOfWindsTop_0_0.4bpp.lz" gAreaTileset_FortressOfWindsTop_0_1:: @@ -2122,13 +2122,13 @@ gAreaTileset_FortressOfWindsTop_0_1:: gAreaTileset_FortressOfWindsTop_0_2:: .incbin "maps/areas/089_FortressOfWindsTop/tilesets/0/gAreaTileset_FortressOfWindsTop_0_2.4bpp.lz" gAreaMetaTileset_FortressOfWindsTop_bottom:: - .incbin "maps/areas/089_FortressOfWindsTop/metatilesets/gAreaMetaTileset_FortressOfWindsTop_bottom.bin.lz" + .incbin "maps/areas/089_FortressOfWindsTop/metatileset/gAreaMetaTileset_FortressOfWindsTop_bottom.bin.lz" gAreaMetaTileset_FortressOfWindsTop_top:: - .incbin "maps/areas/089_FortressOfWindsTop/metatilesets/gAreaMetaTileset_FortressOfWindsTop_top.bin.lz" + .incbin "maps/areas/089_FortressOfWindsTop/metatileset/gAreaMetaTileset_FortressOfWindsTop_top.bin.lz" gAreaMetaTilesetTypes_FortressOfWindsTop_bottom:: - .incbin "maps/areas/089_FortressOfWindsTop/metatilesets/gAreaMetaTilesetTypes_FortressOfWindsTop_bottom.bin.lz" + .incbin "maps/areas/089_FortressOfWindsTop/metatileset/gAreaMetaTilesetTypes_FortressOfWindsTop_bottom.bin.lz" gAreaMetaTilesetTypes_FortressOfWindsTop_top:: - .incbin "maps/areas/089_FortressOfWindsTop/metatilesets/gAreaMetaTilesetTypes_FortressOfWindsTop_top.bin.lz" + .incbin "maps/areas/089_FortressOfWindsTop/metatileset/gAreaMetaTilesetTypes_FortressOfWindsTop_top.bin.lz" gAreaRoomMap_FortressOfWinds_DoubleEyegore_bottom:: .incbin "maps/areas/088_FortressOfWinds/rooms/00_DoubleEyegore/gAreaRoomMap_FortressOfWinds_DoubleEyegore_bottom.bin.lz" gAreaRoomMap_FortressOfWinds_DoubleEyegore_top:: @@ -2164,15 +2164,15 @@ gAreaRoomMap_FortressOfWinds_WestKeyLever_top:: gDungeonMaps_FortressOfWinds_6:: .incbin "maps/areas/088_FortressOfWinds/rooms/06_6/dungeon_map.bin" gAreaRoomMap_FortressOfWinds_DarknutRoom_bottom:: - .incbin "maps/areas/088_FortressOfWinds/rooms/13_DarknutRoom/gAreaRoomMap_FortressOfWinds_DarknutRoom_bottom.bin.lz" + .incbin "maps/areas/088_FortressOfWinds/rooms/16_DarknutRoom/gAreaRoomMap_FortressOfWinds_DarknutRoom_bottom.bin.lz" gAreaRoomMap_FortressOfWinds_DarknutRoom_top:: - .incbin "maps/areas/088_FortressOfWinds/rooms/13_DarknutRoom/gAreaRoomMap_FortressOfWinds_DarknutRoom_top.bin.lz" + .incbin "maps/areas/088_FortressOfWinds/rooms/16_DarknutRoom/gAreaRoomMap_FortressOfWinds_DarknutRoom_top.bin.lz" gDungeonMaps_FortressOfWinds_DarknutRoom:: .incbin "maps/areas/088_FortressOfWinds/rooms/16_DarknutRoom/dungeon_map.bin" gAreaRoomMap_FortressOfWinds_ArrowEyeBridge_bottom:: - .incbin "maps/areas/088_FortressOfWinds/rooms/10_ArrowEyeBridge/gAreaRoomMap_FortressOfWinds_ArrowEyeBridge_bottom.bin.lz" + .incbin "maps/areas/088_FortressOfWinds/rooms/17_ArrowEyeBridge/gAreaRoomMap_FortressOfWinds_ArrowEyeBridge_bottom.bin.lz" gAreaRoomMap_FortressOfWinds_ArrowEyeBridge_top:: - .incbin "maps/areas/088_FortressOfWinds/rooms/10_ArrowEyeBridge/gAreaRoomMap_FortressOfWinds_ArrowEyeBridge_top.bin.lz" + .incbin "maps/areas/088_FortressOfWinds/rooms/17_ArrowEyeBridge/gAreaRoomMap_FortressOfWinds_ArrowEyeBridge_top.bin.lz" gDungeonMaps_FortressOfWinds_ArrowEyeBridge:: .incbin "maps/areas/088_FortressOfWinds/rooms/17_ArrowEyeBridge/dungeon_map.bin" gAreaRoomMap_FortressOfWinds_NorthSplitPathPit_bottom:: @@ -2212,29 +2212,29 @@ gAreaRoomMap_FortressOfWinds_Stalfos_top:: gDungeonMaps_FortressOfWinds_Stalfos:: .incbin "maps/areas/088_FortressOfWinds/rooms/23_Stalfos/dungeon_map.bin" gAreaRoomMap_FortressOfWinds_EntranceMoleMitts_bottom:: - .incbin "maps/areas/088_FortressOfWinds/rooms/14_EntranceMoleMitts/gAreaRoomMap_FortressOfWinds_EntranceMoleMitts_bottom.bin.lz" + .incbin "maps/areas/088_FortressOfWinds/rooms/24_EntranceMoleMitts/gAreaRoomMap_FortressOfWinds_EntranceMoleMitts_bottom.bin.lz" gAreaRoomMap_FortressOfWinds_EntranceMoleMitts_top:: - .incbin "maps/areas/088_FortressOfWinds/rooms/14_EntranceMoleMitts/gAreaRoomMap_FortressOfWinds_EntranceMoleMitts_top.bin.lz" + .incbin "maps/areas/088_FortressOfWinds/rooms/24_EntranceMoleMitts/gAreaRoomMap_FortressOfWinds_EntranceMoleMitts_top.bin.lz" gDungeonMaps_FortressOfWinds_EntranceMoleMitts:: .incbin "maps/areas/088_FortressOfWinds/rooms/24_EntranceMoleMitts/dungeon_map.bin" gAreaRoomMap_FortressOfWinds_Main2f_bottom:: - .incbin "maps/areas/088_FortressOfWinds/rooms/37_25_Main2f/gAreaRoomMap_FortressOfWinds_Main2f_bottom.bin.lz" + .incbin "maps/areas/088_FortressOfWinds/rooms/25_Main2f/gAreaRoomMap_FortressOfWinds_Main2f_bottom.bin.lz" gAreaRoomMap_FortressOfWinds_Main2f_top:: - .incbin "maps/areas/088_FortressOfWinds/rooms/37_25_Main2f/gAreaRoomMap_FortressOfWinds_Main2f_top.bin.lz" + .incbin "maps/areas/088_FortressOfWinds/rooms/25_Main2f/gAreaRoomMap_FortressOfWinds_Main2f_top.bin.lz" gDungeonMaps_FortressOfWinds_Main2f:: - .incbin "maps/areas/088_FortressOfWinds/rooms/37_25_Main2f/dungeon_map.bin" + .incbin "maps/areas/088_FortressOfWinds/rooms/25_Main2f/dungeon_map.bin" gAreaRoomMap_FortressOfWinds_MinishHole_bottom:: - .incbin "maps/areas/088_FortressOfWinds/rooms/38_26_MinishHole/gAreaRoomMap_FortressOfWinds_MinishHole_bottom.bin.lz" + .incbin "maps/areas/088_FortressOfWinds/rooms/26_MinishHole/gAreaRoomMap_FortressOfWinds_MinishHole_bottom.bin.lz" gAreaRoomMap_FortressOfWinds_MinishHole_top:: - .incbin "maps/areas/088_FortressOfWinds/rooms/38_26_MinishHole/gAreaRoomMap_FortressOfWinds_MinishHole_top.bin.lz" + .incbin "maps/areas/088_FortressOfWinds/rooms/26_MinishHole/gAreaRoomMap_FortressOfWinds_MinishHole_top.bin.lz" gDungeonMaps_FortressOfWinds_MinishHole:: - .incbin "maps/areas/088_FortressOfWinds/rooms/38_26_MinishHole/dungeon_map.bin" + .incbin "maps/areas/088_FortressOfWinds/rooms/26_MinishHole/dungeon_map.bin" gAreaRoomMap_FortressOfWinds_BossKey_bottom:: - .incbin "maps/areas/088_FortressOfWinds/rooms/11_BossKey/gAreaRoomMap_FortressOfWinds_BossKey_bottom.bin.lz" + .incbin "maps/areas/088_FortressOfWinds/rooms/27_BossKey/gAreaRoomMap_FortressOfWinds_BossKey_bottom.bin.lz" gAreaRoomMap_FortressOfWinds_BossKey_top:: - .incbin "maps/areas/088_FortressOfWinds/rooms/11_BossKey/gAreaRoomMap_FortressOfWinds_BossKey_top.bin.lz" + .incbin "maps/areas/088_FortressOfWinds/rooms/27_BossKey/gAreaRoomMap_FortressOfWinds_BossKey_top.bin.lz" gDungeonMaps_FortressOfWinds_BossKey:: - .incbin "maps/areas/088_FortressOfWinds/rooms/39_27_BossKey/dungeon_map.bin" + .incbin "maps/areas/088_FortressOfWinds/rooms/27_BossKey/dungeon_map.bin" gAreaRoomMap_FortressOfWinds_WestStairs2f_bottom:: .incbin "maps/areas/088_FortressOfWinds/rooms/28_WestStairs2f/gAreaRoomMap_FortressOfWinds_WestStairs2f_bottom.bin.lz" gAreaRoomMap_FortressOfWinds_WestStairs2f_top:: @@ -2242,9 +2242,9 @@ gAreaRoomMap_FortressOfWinds_WestStairs2f_top:: gDungeonMaps_FortressOfWinds_WestStairs2f:: .incbin "maps/areas/088_FortressOfWinds/rooms/28_WestStairs2f/dungeon_map.bin" gAreaRoomMap_FortressOfWinds_EastStairs2f_bottom:: - .incbin "maps/areas/088_FortressOfWinds/rooms/14_EastStairs2f/gAreaRoomMap_FortressOfWinds_EastStairs2f_bottom.bin.lz" + .incbin "maps/areas/088_FortressOfWinds/rooms/29_EastStairs2f/gAreaRoomMap_FortressOfWinds_EastStairs2f_bottom.bin.lz" gAreaRoomMap_FortressOfWinds_EastStairs2f_top:: - .incbin "maps/areas/088_FortressOfWinds/rooms/14_EastStairs2f/gAreaRoomMap_FortressOfWinds_EastStairs2f_top.bin.lz" + .incbin "maps/areas/088_FortressOfWinds/rooms/29_EastStairs2f/gAreaRoomMap_FortressOfWinds_EastStairs2f_top.bin.lz" gDungeonMaps_FortressOfWinds_EastStairs2f:: .incbin "maps/areas/088_FortressOfWinds/rooms/29_EastStairs2f/dungeon_map.bin" gAreaRoomMap_FortressOfWinds_WestStairs1f_bottom:: @@ -2254,15 +2254,15 @@ gAreaRoomMap_FortressOfWinds_WestStairs1f_top:: gDungeonMaps_FortressOfWinds_WestStairs1f:: .incbin "maps/areas/088_FortressOfWinds/rooms/32_WestStairs1f/dungeon_map.bin" gAreaRoomMap_FortressOfWinds_CenterStairs1f_bottom:: - .incbin "maps/areas/088_FortressOfWinds/rooms/12_CenterStairs1f/gAreaRoomMap_FortressOfWinds_CenterStairs1f_bottom.bin.lz" + .incbin "maps/areas/088_FortressOfWinds/rooms/33_CenterStairs1f/gAreaRoomMap_FortressOfWinds_CenterStairs1f_bottom.bin.lz" gAreaRoomMap_FortressOfWinds_CenterStairs1f_top:: - .incbin "maps/areas/088_FortressOfWinds/rooms/12_CenterStairs1f/gAreaRoomMap_FortressOfWinds_CenterStairs1f_top.bin.lz" + .incbin "maps/areas/088_FortressOfWinds/rooms/33_CenterStairs1f/gAreaRoomMap_FortressOfWinds_CenterStairs1f_top.bin.lz" gDungeonMaps_FortressOfWinds_CenterStairs1f:: .incbin "maps/areas/088_FortressOfWinds/rooms/33_CenterStairs1f/dungeon_map.bin" gAreaRoomMap_FortressOfWinds_EastStairs1f_bottom:: - .incbin "maps/areas/088_FortressOfWinds/rooms/14_EastStairs1f/gAreaRoomMap_FortressOfWinds_EastStairs1f_bottom.bin.lz" + .incbin "maps/areas/088_FortressOfWinds/rooms/34_EastStairs1f/gAreaRoomMap_FortressOfWinds_EastStairs1f_bottom.bin.lz" gAreaRoomMap_FortressOfWinds_EastStairs1f_top:: - .incbin "maps/areas/088_FortressOfWinds/rooms/14_EastStairs1f/gAreaRoomMap_FortressOfWinds_EastStairs1f_top.bin.lz" + .incbin "maps/areas/088_FortressOfWinds/rooms/34_EastStairs1f/gAreaRoomMap_FortressOfWinds_EastStairs1f_top.bin.lz" gDungeonMaps_FortressOfWinds_EastStairs1f:: .incbin "maps/areas/088_FortressOfWinds/rooms/34_EastStairs1f/dungeon_map.bin" gAreaRoomMap_FortressOfWinds_Wizzrobe_bottom:: @@ -2296,13 +2296,13 @@ gAreaTileset_TempleOfDroplets_0_1:: gAreaTileset_TempleOfDroplets_0_2:: .incbin "maps/areas/096_TempleOfDroplets/tilesets/0/gAreaTileset_TempleOfDroplets_0_2.4bpp.lz" gAreaMetaTileset_TempleOfDroplets_bottom:: - .incbin "maps/areas/096_TempleOfDroplets/metatilesets/gAreaMetaTileset_TempleOfDroplets_bottom.bin.lz" + .incbin "maps/areas/096_TempleOfDroplets/metatileset/gAreaMetaTileset_TempleOfDroplets_bottom.bin.lz" gAreaMetaTileset_TempleOfDroplets_top:: - .incbin "maps/areas/096_TempleOfDroplets/metatilesets/gAreaMetaTileset_TempleOfDroplets_top.bin.lz" + .incbin "maps/areas/096_TempleOfDroplets/metatileset/gAreaMetaTileset_TempleOfDroplets_top.bin.lz" gAreaMetaTilesetTypes_TempleOfDroplets_bottom:: - .incbin "maps/areas/096_TempleOfDroplets/metatilesets/gAreaMetaTilesetTypes_TempleOfDroplets_bottom.bin.lz" + .incbin "maps/areas/096_TempleOfDroplets/metatileset/gAreaMetaTilesetTypes_TempleOfDroplets_bottom.bin.lz" gAreaMetaTilesetTypes_TempleOfDroplets_top:: - .incbin "maps/areas/096_TempleOfDroplets/metatilesets/gAreaMetaTilesetTypes_TempleOfDroplets_top.bin.lz" + .incbin "maps/areas/096_TempleOfDroplets/metatileset/gAreaMetaTilesetTypes_TempleOfDroplets_top.bin.lz" gAreaTileset_Null61_0_0:: .incbin "maps/areas/097_Null61/tilesets/0/gAreaTileset_Null61_0_0.4bpp.lz" gAreaTileset_Null61_0_1:: @@ -2310,13 +2310,13 @@ gAreaTileset_Null61_0_1:: gAreaTileset_Null61_0_2:: .incbin "maps/areas/097_Null61/tilesets/0/gAreaTileset_Null61_0_2.4bpp.lz" gAreaMetaTileset_Null61_bottom:: - .incbin "maps/areas/097_Null61/metatilesets/gAreaMetaTileset_Null61_bottom.bin.lz" + .incbin "maps/areas/097_Null61/metatileset/gAreaMetaTileset_Null61_bottom.bin.lz" gAreaMetaTileset_Null61_top:: - .incbin "maps/areas/097_Null61/metatilesets/gAreaMetaTileset_Null61_top.bin.lz" + .incbin "maps/areas/097_Null61/metatileset/gAreaMetaTileset_Null61_top.bin.lz" gAreaMetaTilesetTypes_Null61_bottom:: - .incbin "maps/areas/097_Null61/metatilesets/gAreaMetaTilesetTypes_Null61_bottom.bin.lz" + .incbin "maps/areas/097_Null61/metatileset/gAreaMetaTilesetTypes_Null61_bottom.bin.lz" gAreaMetaTilesetTypes_Null61_top:: - .incbin "maps/areas/097_Null61/metatilesets/gAreaMetaTilesetTypes_Null61_top.bin.lz" + .incbin "maps/areas/097_Null61/metatileset/gAreaMetaTilesetTypes_Null61_top.bin.lz" gAreaRoomMap_TempleOfDroplets_WestHole_bottom:: .incbin "maps/areas/096_TempleOfDroplets/rooms/00_WestHole/gAreaRoomMap_TempleOfDroplets_WestHole_bottom.bin.lz" gAreaRoomMap_TempleOfDroplets_WestHole_top:: @@ -2390,17 +2390,17 @@ gAreaRoomMap_TempleOfDroplets_HoleToBlueChuKey_top:: gDungeonMaps_TempleOfDroplets_HoleToBlueChuKey:: .incbin "maps/areas/096_TempleOfDroplets/rooms/11_HoleToBlueChuKey/dungeon_map.bin" gAreaRoomMap_TempleOfDroplets_WestWaterfallSoutheast_bottom:: - .incbin "maps/areas/096_TempleOfDroplets/rooms/18_12_WestWaterfallSoutheast/gAreaRoomMap_TempleOfDroplets_WestWaterfallSoutheast_bottom.bin.lz" + .incbin "maps/areas/096_TempleOfDroplets/rooms/12_WestWaterfallSoutheast/gAreaRoomMap_TempleOfDroplets_WestWaterfallSoutheast_bottom.bin.lz" gAreaRoomMap_TempleOfDroplets_WestWaterfallSoutheast_top:: - .incbin "maps/areas/096_TempleOfDroplets/rooms/18_12_WestWaterfallSoutheast/gAreaRoomMap_TempleOfDroplets_WestWaterfallSoutheast_top.bin.lz" + .incbin "maps/areas/096_TempleOfDroplets/rooms/12_WestWaterfallSoutheast/gAreaRoomMap_TempleOfDroplets_WestWaterfallSoutheast_top.bin.lz" gDungeonMaps_TempleOfDroplets_WestWaterfallSoutheast:: - .incbin "maps/areas/096_TempleOfDroplets/rooms/18_12_WestWaterfallSoutheast/dungeon_map.bin" + .incbin "maps/areas/096_TempleOfDroplets/rooms/12_WestWaterfallSoutheast/dungeon_map.bin" gAreaRoomMap_TempleOfDroplets_WestWaterfallSouthwest_bottom:: - .incbin "maps/areas/096_TempleOfDroplets/rooms/19_13_WestWaterfallSouthwest/gAreaRoomMap_TempleOfDroplets_WestWaterfallSouthwest_bottom.bin.lz" + .incbin "maps/areas/096_TempleOfDroplets/rooms/13_WestWaterfallSouthwest/gAreaRoomMap_TempleOfDroplets_WestWaterfallSouthwest_bottom.bin.lz" gAreaRoomMap_TempleOfDroplets_WestWaterfallSouthwest_top:: - .incbin "maps/areas/096_TempleOfDroplets/rooms/19_13_WestWaterfallSouthwest/gAreaRoomMap_TempleOfDroplets_WestWaterfallSouthwest_top.bin.lz" + .incbin "maps/areas/096_TempleOfDroplets/rooms/13_WestWaterfallSouthwest/gAreaRoomMap_TempleOfDroplets_WestWaterfallSouthwest_top.bin.lz" gDungeonMaps_TempleOfDroplets_WestWaterfallSouthwest:: - .incbin "maps/areas/096_TempleOfDroplets/rooms/19_13_WestWaterfallSouthwest/dungeon_map.bin" + .incbin "maps/areas/096_TempleOfDroplets/rooms/13_WestWaterfallSouthwest/dungeon_map.bin" gAreaRoomMap_TempleOfDroplets_BigOcto_bottom:: .incbin "maps/areas/096_TempleOfDroplets/rooms/14_BigOcto/gAreaRoomMap_TempleOfDroplets_BigOcto_bottom.bin.lz" gAreaRoomMap_TempleOfDroplets_BigOcto_top:: @@ -2420,9 +2420,9 @@ gAreaRoomMap_TempleOfDroplets_BlueChu_top:: gDungeonMaps_TempleOfDroplets_BlueChu:: .incbin "maps/areas/096_TempleOfDroplets/rooms/16_BlueChu/dungeon_map.bin" gAreaRoomMap_TempleOfDroplets_BlueChuKey_bottom:: - .incbin "maps/areas/096_TempleOfDroplets/rooms/16_BlueChuKey/gAreaRoomMap_TempleOfDroplets_BlueChuKey_bottom.bin.lz" + .incbin "maps/areas/096_TempleOfDroplets/rooms/17_BlueChuKey/gAreaRoomMap_TempleOfDroplets_BlueChuKey_bottom.bin.lz" gAreaRoomMap_TempleOfDroplets_BlueChuKey_top:: - .incbin "maps/areas/096_TempleOfDroplets/rooms/16_BlueChuKey/gAreaRoomMap_TempleOfDroplets_BlueChuKey_top.bin.lz" + .incbin "maps/areas/096_TempleOfDroplets/rooms/17_BlueChuKey/gAreaRoomMap_TempleOfDroplets_BlueChuKey_top.bin.lz" gDungeonMaps_TempleOfDroplets_BlueChuKey:: .incbin "maps/areas/096_TempleOfDroplets/rooms/17_BlueChuKey/dungeon_map.bin" gAreaRoomMap_TempleOfDroplets_BossKey_bottom:: @@ -2456,23 +2456,23 @@ gAreaRoomMap_TempleOfDroplets_BlockCloneIceBridge_top:: gDungeonMaps_TempleOfDroplets_BlockCloneIceBridge:: .incbin "maps/areas/096_TempleOfDroplets/rooms/36_BlockCloneIceBridge/dungeon_map.bin" gAreaRoomMap_TempleOfDroplets_StairsToScissorsMiniboss_bottom:: - .incbin "maps/areas/096_TempleOfDroplets/rooms/55_37_StairsToScissorsMiniboss/gAreaRoomMap_TempleOfDroplets_StairsToScissorsMiniboss_bottom.bin.lz" + .incbin "maps/areas/096_TempleOfDroplets/rooms/37_StairsToScissorsMiniboss/gAreaRoomMap_TempleOfDroplets_StairsToScissorsMiniboss_bottom.bin.lz" gAreaRoomMap_TempleOfDroplets_StairsToScissorsMiniboss_top:: - .incbin "maps/areas/096_TempleOfDroplets/rooms/55_37_StairsToScissorsMiniboss/gAreaRoomMap_TempleOfDroplets_StairsToScissorsMiniboss_top.bin.lz" + .incbin "maps/areas/096_TempleOfDroplets/rooms/37_StairsToScissorsMiniboss/gAreaRoomMap_TempleOfDroplets_StairsToScissorsMiniboss_top.bin.lz" gDungeonMaps_TempleOfDroplets_StairsToScissorsMiniboss:: - .incbin "maps/areas/096_TempleOfDroplets/rooms/55_37_StairsToScissorsMiniboss/dungeon_map.bin" + .incbin "maps/areas/096_TempleOfDroplets/rooms/37_StairsToScissorsMiniboss/dungeon_map.bin" gAreaRoomMap_TempleOfDroplets_SpikeBarFlipperRoom_bottom:: - .incbin "maps/areas/096_TempleOfDroplets/rooms/56_38_SpikeBarFlipperRoom/gAreaRoomMap_TempleOfDroplets_SpikeBarFlipperRoom_bottom.bin.lz" + .incbin "maps/areas/096_TempleOfDroplets/rooms/38_SpikeBarFlipperRoom/gAreaRoomMap_TempleOfDroplets_SpikeBarFlipperRoom_bottom.bin.lz" gAreaRoomMap_TempleOfDroplets_SpikeBarFlipperRoom_top:: - .incbin "maps/areas/096_TempleOfDroplets/rooms/56_38_SpikeBarFlipperRoom/gAreaRoomMap_TempleOfDroplets_SpikeBarFlipperRoom_top.bin.lz" + .incbin "maps/areas/096_TempleOfDroplets/rooms/38_SpikeBarFlipperRoom/gAreaRoomMap_TempleOfDroplets_SpikeBarFlipperRoom_top.bin.lz" gDungeonMaps_TempleOfDroplets_SpikeBarFlipperRoom:: - .incbin "maps/areas/096_TempleOfDroplets/rooms/56_38_SpikeBarFlipperRoom/dungeon_map.bin" + .incbin "maps/areas/096_TempleOfDroplets/rooms/38_SpikeBarFlipperRoom/dungeon_map.bin" gAreaRoomMap_TempleOfDroplets_9Lanterns_bottom:: - .incbin "maps/areas/096_TempleOfDroplets/rooms/57_39_9Lanterns/gAreaRoomMap_TempleOfDroplets_9Lanterns_bottom.bin.lz" + .incbin "maps/areas/096_TempleOfDroplets/rooms/39_9Lanterns/gAreaRoomMap_TempleOfDroplets_9Lanterns_bottom.bin.lz" gAreaRoomMap_TempleOfDroplets_9Lanterns_top:: - .incbin "maps/areas/096_TempleOfDroplets/rooms/57_39_9Lanterns/gAreaRoomMap_TempleOfDroplets_9Lanterns_top.bin.lz" + .incbin "maps/areas/096_TempleOfDroplets/rooms/39_9Lanterns/gAreaRoomMap_TempleOfDroplets_9Lanterns_top.bin.lz" gDungeonMaps_TempleOfDroplets_9Lanterns:: - .incbin "maps/areas/096_TempleOfDroplets/rooms/57_39_9Lanterns/dungeon_map.bin" + .incbin "maps/areas/096_TempleOfDroplets/rooms/39_9Lanterns/dungeon_map.bin" gAreaRoomMap_TempleOfDroplets_LilypadIceBlocks_bottom:: .incbin "maps/areas/096_TempleOfDroplets/rooms/40_LilypadIceBlocks/gAreaRoomMap_TempleOfDroplets_LilypadIceBlocks_bottom.bin.lz" gAreaRoomMap_TempleOfDroplets_LilypadIceBlocks_top:: @@ -2510,9 +2510,9 @@ gAreaRoomMap_TempleOfDroplets_AfterTwinMadderpillars_top:: gDungeonMaps_TempleOfDroplets_AfterTwinMadderpillars:: .incbin "maps/areas/096_TempleOfDroplets/rooms/45_AfterTwinMadderpillars/dungeon_map.bin" gAreaRoomMap_TempleOfDroplets_BlueChuKeyLever_bottom:: - .incbin "maps/areas/096_TempleOfDroplets/rooms/16_BlueChuKeyLever/gAreaRoomMap_TempleOfDroplets_BlueChuKeyLever_bottom.bin.lz" + .incbin "maps/areas/096_TempleOfDroplets/rooms/46_BlueChuKeyLever/gAreaRoomMap_TempleOfDroplets_BlueChuKeyLever_bottom.bin.lz" gAreaRoomMap_TempleOfDroplets_BlueChuKeyLever_top:: - .incbin "maps/areas/096_TempleOfDroplets/rooms/16_BlueChuKeyLever/gAreaRoomMap_TempleOfDroplets_BlueChuKeyLever_top.bin.lz" + .incbin "maps/areas/096_TempleOfDroplets/rooms/46_BlueChuKeyLever/gAreaRoomMap_TempleOfDroplets_BlueChuKeyLever_top.bin.lz" gDungeonMaps_TempleOfDroplets_BlueChuKeyLever:: .incbin "maps/areas/096_TempleOfDroplets/rooms/46_BlueChuKeyLever/dungeon_map.bin" gAreaRoomMap_TempleOfDroplets_MulldozerKey_bottom:: @@ -2588,9 +2588,9 @@ gAreaRoomMap_HyruleTownMinishCaves_4_bottom:: gAreaRoomMap_HyruleTownMinishCaves_4_top:: .incbin "maps/areas/098_HyruleTownMinishCaves/rooms/04_4/gAreaRoomMap_HyruleTownMinishCaves_4_top.bin.lz" gAreaRoomMap_HyruleTownMinishCaves_Unused10_bottom:: - .incbin "maps/areas/098_HyruleTownMinishCaves/rooms/07_Unused10/gAreaRoomMap_HyruleTownMinishCaves_Unused10_bottom.bin.lz" + .incbin "maps/areas/098_HyruleTownMinishCaves/rooms/16_Unused10/gAreaRoomMap_HyruleTownMinishCaves_Unused10_bottom.bin.lz" gAreaRoomMap_HyruleTownMinishCaves_Unused10_top:: - .incbin "maps/areas/098_HyruleTownMinishCaves/rooms/07_Unused10/gAreaRoomMap_HyruleTownMinishCaves_Unused10_top.bin.lz" + .incbin "maps/areas/098_HyruleTownMinishCaves/rooms/16_Unused10/gAreaRoomMap_HyruleTownMinishCaves_Unused10_top.bin.lz" gAreaRoomMap_HyruleTownMinishCaves_6_bottom:: .incbin "maps/areas/098_HyruleTownMinishCaves/rooms/17_6/gAreaRoomMap_HyruleTownMinishCaves_6_bottom.bin.lz" gAreaRoomMap_HyruleTownMinishCaves_6_top:: @@ -2608,9 +2608,9 @@ gAreaRoomMap_HyruleTownMinishCaves_9_bottom:: gAreaRoomMap_HyruleTownMinishCaves_9_top:: .incbin "maps/areas/098_HyruleTownMinishCaves/rooms/20_9/gAreaRoomMap_HyruleTownMinishCaves_9_top.bin.lz" gAreaRoomMap_HyruleTownMinishCaves_10_bottom:: - .incbin "maps/areas/098_HyruleTownMinishCaves/rooms/01_10/gAreaRoomMap_HyruleTownMinishCaves_10_bottom.bin.lz" + .incbin "maps/areas/098_HyruleTownMinishCaves/rooms/21_10/gAreaRoomMap_HyruleTownMinishCaves_10_bottom.bin.lz" gAreaRoomMap_HyruleTownMinishCaves_10_top:: - .incbin "maps/areas/098_HyruleTownMinishCaves/rooms/01_10/gAreaRoomMap_HyruleTownMinishCaves_10_top.bin.lz" + .incbin "maps/areas/098_HyruleTownMinishCaves/rooms/21_10/gAreaRoomMap_HyruleTownMinishCaves_10_top.bin.lz" gAreaTileset_RoyalCrypt_0_0:: .incbin "maps/areas/104_RoyalCrypt/tilesets/0/gAreaTileset_RoyalCrypt_0_0.4bpp.lz" gAreaTileset_RoyalCrypt_0_1:: @@ -2618,13 +2618,13 @@ gAreaTileset_RoyalCrypt_0_1:: gAreaTileset_RoyalCrypt_0_2:: .incbin "maps/areas/104_RoyalCrypt/tilesets/0/gAreaTileset_RoyalCrypt_0_2.4bpp.lz" gAreaMetaTileset_RoyalCrypt_bottom:: - .incbin "maps/areas/104_RoyalCrypt/metatilesets/gAreaMetaTileset_RoyalCrypt_bottom.bin.lz" + .incbin "maps/areas/104_RoyalCrypt/metatileset/gAreaMetaTileset_RoyalCrypt_bottom.bin.lz" gAreaMetaTileset_RoyalCrypt_top:: - .incbin "maps/areas/104_RoyalCrypt/metatilesets/gAreaMetaTileset_RoyalCrypt_top.bin.lz" + .incbin "maps/areas/104_RoyalCrypt/metatileset/gAreaMetaTileset_RoyalCrypt_top.bin.lz" gAreaMetaTilesetTypes_RoyalCrypt_bottom:: - .incbin "maps/areas/104_RoyalCrypt/metatilesets/gAreaMetaTilesetTypes_RoyalCrypt_bottom.bin.lz" + .incbin "maps/areas/104_RoyalCrypt/metatileset/gAreaMetaTilesetTypes_RoyalCrypt_bottom.bin.lz" gAreaMetaTilesetTypes_RoyalCrypt_top:: - .incbin "maps/areas/104_RoyalCrypt/metatilesets/gAreaMetaTilesetTypes_RoyalCrypt_top.bin.lz" + .incbin "maps/areas/104_RoyalCrypt/metatileset/gAreaMetaTilesetTypes_RoyalCrypt_top.bin.lz" gAreaRoomMap_RoyalCrypt_0_bottom:: .incbin "maps/areas/104_RoyalCrypt/rooms/00_0/gAreaRoomMap_RoyalCrypt_0_bottom.bin.lz" gAreaRoomMap_RoyalCrypt_0_top:: @@ -2668,13 +2668,13 @@ gAreaTileset_PalaceOfWinds_0_1:: gAreaTileset_PalaceOfWinds_0_2:: .incbin "maps/areas/112_PalaceOfWinds/tilesets/0/gAreaTileset_PalaceOfWinds_0_2.4bpp.lz" gAreaMetaTileset_PalaceOfWinds_bottom:: - .incbin "maps/areas/112_PalaceOfWinds/metatilesets/gAreaMetaTileset_PalaceOfWinds_bottom.bin.lz" + .incbin "maps/areas/112_PalaceOfWinds/metatileset/gAreaMetaTileset_PalaceOfWinds_bottom.bin.lz" gAreaMetaTileset_PalaceOfWinds_top:: - .incbin "maps/areas/112_PalaceOfWinds/metatilesets/gAreaMetaTileset_PalaceOfWinds_top.bin.lz" + .incbin "maps/areas/112_PalaceOfWinds/metatileset/gAreaMetaTileset_PalaceOfWinds_top.bin.lz" gAreaMetaTilesetTypes_PalaceOfWinds_bottom:: - .incbin "maps/areas/112_PalaceOfWinds/metatilesets/gAreaMetaTilesetTypes_PalaceOfWinds_bottom.bin.lz" + .incbin "maps/areas/112_PalaceOfWinds/metatileset/gAreaMetaTilesetTypes_PalaceOfWinds_bottom.bin.lz" gAreaMetaTilesetTypes_PalaceOfWinds_top:: - .incbin "maps/areas/112_PalaceOfWinds/metatilesets/gAreaMetaTilesetTypes_PalaceOfWinds_top.bin.lz" + .incbin "maps/areas/112_PalaceOfWinds/metatileset/gAreaMetaTilesetTypes_PalaceOfWinds_top.bin.lz" gAreaTileset_PalaceOfWinds_0_3:: .incbin "maps/areas/112_PalaceOfWinds/tilesets/0/gAreaTileset_PalaceOfWinds_0_3.4bpp.lz" gAreaTileset_PalaceOfWindsBoss_0_0:: @@ -2682,9 +2682,9 @@ gAreaTileset_PalaceOfWindsBoss_0_0:: gAreaTileset_PalaceOfWindsBoss_0_1:: .incbin "maps/areas/113_PalaceOfWindsBoss/tilesets/0/gAreaTileset_PalaceOfWindsBoss_0_1.4bpp.lz" gAreaMetaTileset_PalaceOfWindsBoss_top:: - .incbin "maps/areas/113_PalaceOfWindsBoss/metatilesets/gAreaMetaTileset_PalaceOfWindsBoss_top.bin.lz" + .incbin "maps/areas/113_PalaceOfWindsBoss/metatileset/gAreaMetaTileset_PalaceOfWindsBoss_top.bin.lz" gAreaMetaTilesetTypes_PalaceOfWindsBoss_top:: - .incbin "maps/areas/113_PalaceOfWindsBoss/metatilesets/gAreaMetaTilesetTypes_PalaceOfWindsBoss_top.bin.lz" + .incbin "maps/areas/113_PalaceOfWindsBoss/metatileset/gAreaMetaTilesetTypes_PalaceOfWindsBoss_top.bin.lz" unknown_134:: .incbin "assets/unknown_134.bin" gAreaTileset_PalaceOfWindsBoss_0_2:: @@ -2888,11 +2888,11 @@ gAreaRoomMap_PalaceOfWinds_KeyArrowButton_top:: gDungeonMaps_PalaceOfWinds_KeyArrowButton:: .incbin "maps/areas/112_PalaceOfWinds/rooms/32_KeyArrowButton/dungeon_map.bin" gAreaRoomMap_PalaceOfWinds_GratesTo3f_bottom:: - .incbin "maps/areas/112_PalaceOfWinds/rooms/51_33_GratesTo3f/gAreaRoomMap_PalaceOfWinds_GratesTo3f_bottom.bin.lz" + .incbin "maps/areas/112_PalaceOfWinds/rooms/33_GratesTo3f/gAreaRoomMap_PalaceOfWinds_GratesTo3f_bottom.bin.lz" gAreaRoomMap_PalaceOfWinds_GratesTo3f_top:: - .incbin "maps/areas/112_PalaceOfWinds/rooms/51_33_GratesTo3f/gAreaRoomMap_PalaceOfWinds_GratesTo3f_top.bin.lz" + .incbin "maps/areas/112_PalaceOfWinds/rooms/33_GratesTo3f/gAreaRoomMap_PalaceOfWinds_GratesTo3f_top.bin.lz" gDungeonMaps_PalaceOfWinds_GratesTo3f:: - .incbin "maps/areas/112_PalaceOfWinds/rooms/51_33_GratesTo3f/dungeon_map.bin" + .incbin "maps/areas/112_PalaceOfWinds/rooms/33_GratesTo3f/dungeon_map.bin" gAreaRoomMap_PalaceOfWinds_SpinyFight_bottom:: .incbin "maps/areas/112_PalaceOfWinds/rooms/34_SpinyFight/gAreaRoomMap_PalaceOfWinds_SpinyFight_bottom.bin.lz" gAreaRoomMap_PalaceOfWinds_SpinyFight_top:: @@ -3006,13 +3006,13 @@ gAreaTileset_Sanctuary_0_1:: gAreaTileset_Sanctuary_0_2:: .incbin "maps/areas/120_Sanctuary/tilesets/0/gAreaTileset_Sanctuary_0_2.4bpp.lz" gAreaMetaTileset_Sanctuary_bottom:: - .incbin "maps/areas/120_Sanctuary/metatilesets/gAreaMetaTileset_Sanctuary_bottom.bin.lz" + .incbin "maps/areas/120_Sanctuary/metatileset/gAreaMetaTileset_Sanctuary_bottom.bin.lz" gAreaMetaTileset_Sanctuary_top:: - .incbin "maps/areas/120_Sanctuary/metatilesets/gAreaMetaTileset_Sanctuary_top.bin.lz" + .incbin "maps/areas/120_Sanctuary/metatileset/gAreaMetaTileset_Sanctuary_top.bin.lz" gAreaMetaTilesetTypes_Sanctuary_bottom:: - .incbin "maps/areas/120_Sanctuary/metatilesets/gAreaMetaTilesetTypes_Sanctuary_bottom.bin.lz" + .incbin "maps/areas/120_Sanctuary/metatileset/gAreaMetaTilesetTypes_Sanctuary_bottom.bin.lz" gAreaMetaTilesetTypes_Sanctuary_top:: - .incbin "maps/areas/120_Sanctuary/metatilesets/gAreaMetaTilesetTypes_Sanctuary_top.bin.lz" + .incbin "maps/areas/120_Sanctuary/metatileset/gAreaMetaTilesetTypes_Sanctuary_top.bin.lz" gAreaRoomMap_Sanctuary_Hall_bottom:: .incbin "maps/areas/120_Sanctuary/rooms/00_Hall/gAreaRoomMap_Sanctuary_Hall_bottom.bin.lz" gAreaRoomMap_Sanctuary_Hall_top:: @@ -3032,13 +3032,13 @@ gAreaTileset_HyruleCastle_0_1:: gAreaTileset_HyruleCastle_0_2:: .incbin "maps/areas/128_HyruleCastle/tilesets/0/gAreaTileset_HyruleCastle_0_2.4bpp.lz" gAreaMetaTileset_HyruleCastle_bottom:: - .incbin "maps/areas/128_HyruleCastle/metatilesets/gAreaMetaTileset_HyruleCastle_bottom.bin.lz" + .incbin "maps/areas/128_HyruleCastle/metatileset/gAreaMetaTileset_HyruleCastle_bottom.bin.lz" gAreaMetaTileset_HyruleCastle_top:: - .incbin "maps/areas/128_HyruleCastle/metatilesets/gAreaMetaTileset_HyruleCastle_top.bin.lz" + .incbin "maps/areas/128_HyruleCastle/metatileset/gAreaMetaTileset_HyruleCastle_top.bin.lz" gAreaMetaTilesetTypes_HyruleCastle_bottom:: - .incbin "maps/areas/128_HyruleCastle/metatilesets/gAreaMetaTilesetTypes_HyruleCastle_bottom.bin.lz" + .incbin "maps/areas/128_HyruleCastle/metatileset/gAreaMetaTilesetTypes_HyruleCastle_bottom.bin.lz" gAreaMetaTilesetTypes_HyruleCastle_top:: - .incbin "maps/areas/128_HyruleCastle/metatilesets/gAreaMetaTilesetTypes_HyruleCastle_top.bin.lz" + .incbin "maps/areas/128_HyruleCastle/metatileset/gAreaMetaTilesetTypes_HyruleCastle_top.bin.lz" gAreaRoomMap_HyruleCastle_0_bottom:: .incbin "maps/areas/128_HyruleCastle/rooms/00_0/gAreaRoomMap_HyruleCastle_0_bottom.bin.lz" gAreaRoomMap_HyruleCastle_0_top:: @@ -3076,13 +3076,13 @@ gAreaTileset_SanctuaryEntrance_0_1:: gAreaTileset_SanctuaryEntrance_0_2:: .incbin "maps/areas/129_SanctuaryEntrance/tilesets/0/gAreaTileset_SanctuaryEntrance_0_2.4bpp.lz" gAreaMetaTileset_SanctuaryEntrance_bottom:: - .incbin "maps/areas/129_SanctuaryEntrance/metatilesets/gAreaMetaTileset_SanctuaryEntrance_bottom.bin.lz" + .incbin "maps/areas/129_SanctuaryEntrance/metatileset/gAreaMetaTileset_SanctuaryEntrance_bottom.bin.lz" gAreaMetaTileset_SanctuaryEntrance_top:: - .incbin "maps/areas/129_SanctuaryEntrance/metatilesets/gAreaMetaTileset_SanctuaryEntrance_top.bin.lz" + .incbin "maps/areas/129_SanctuaryEntrance/metatileset/gAreaMetaTileset_SanctuaryEntrance_top.bin.lz" gAreaMetaTilesetTypes_SanctuaryEntrance_bottom:: - .incbin "maps/areas/129_SanctuaryEntrance/metatilesets/gAreaMetaTilesetTypes_SanctuaryEntrance_bottom.bin.lz" + .incbin "maps/areas/129_SanctuaryEntrance/metatileset/gAreaMetaTilesetTypes_SanctuaryEntrance_bottom.bin.lz" gAreaMetaTilesetTypes_SanctuaryEntrance_top:: - .incbin "maps/areas/129_SanctuaryEntrance/metatilesets/gAreaMetaTilesetTypes_SanctuaryEntrance_top.bin.lz" + .incbin "maps/areas/129_SanctuaryEntrance/metatileset/gAreaMetaTilesetTypes_SanctuaryEntrance_top.bin.lz" gAreaRoomMap_SanctuaryEntrance_Main_bottom:: .incbin "maps/areas/129_SanctuaryEntrance/rooms/00_Main/gAreaRoomMap_SanctuaryEntrance_Main_bottom.bin.lz" gAreaRoomMap_SanctuaryEntrance_Main_top:: @@ -3094,13 +3094,13 @@ gAreaTileset_DarkHyruleCastle_0_1:: gAreaTileset_DarkHyruleCastle_0_2:: .incbin "maps/areas/136_DarkHyruleCastle/tilesets/0/gAreaTileset_DarkHyruleCastle_0_2.4bpp.lz" gAreaMetaTileset_DarkHyruleCastle_bottom:: - .incbin "maps/areas/136_DarkHyruleCastle/metatilesets/gAreaMetaTileset_DarkHyruleCastle_bottom.bin.lz" + .incbin "maps/areas/136_DarkHyruleCastle/metatileset/gAreaMetaTileset_DarkHyruleCastle_bottom.bin.lz" gAreaMetaTileset_DarkHyruleCastle_top:: - .incbin "maps/areas/136_DarkHyruleCastle/metatilesets/gAreaMetaTileset_DarkHyruleCastle_top.bin.lz" + .incbin "maps/areas/136_DarkHyruleCastle/metatileset/gAreaMetaTileset_DarkHyruleCastle_top.bin.lz" gAreaMetaTilesetTypes_DarkHyruleCastle_bottom:: - .incbin "maps/areas/136_DarkHyruleCastle/metatilesets/gAreaMetaTilesetTypes_DarkHyruleCastle_bottom.bin.lz" + .incbin "maps/areas/136_DarkHyruleCastle/metatileset/gAreaMetaTilesetTypes_DarkHyruleCastle_bottom.bin.lz" gAreaMetaTilesetTypes_DarkHyruleCastle_top:: - .incbin "maps/areas/136_DarkHyruleCastle/metatilesets/gAreaMetaTilesetTypes_DarkHyruleCastle_top.bin.lz" + .incbin "maps/areas/136_DarkHyruleCastle/metatileset/gAreaMetaTilesetTypes_DarkHyruleCastle_top.bin.lz" gAreaTileset_DarkHyruleCastleBridge_0_0:: .incbin "maps/areas/141_DarkHyruleCastleBridge/tilesets/0/gAreaTileset_DarkHyruleCastleBridge_0_0.4bpp.lz" gAreaTileset_DarkHyruleCastleBridge_0_1:: @@ -3108,13 +3108,13 @@ gAreaTileset_DarkHyruleCastleBridge_0_1:: gAreaTileset_DarkHyruleCastleBridge_0_2:: .incbin "maps/areas/141_DarkHyruleCastleBridge/tilesets/0/gAreaTileset_DarkHyruleCastleBridge_0_2.4bpp.lz" gAreaMetaTileset_DarkHyruleCastleBridge_bottom:: - .incbin "maps/areas/141_DarkHyruleCastleBridge/metatilesets/gAreaMetaTileset_DarkHyruleCastleBridge_bottom.bin.lz" + .incbin "maps/areas/141_DarkHyruleCastleBridge/metatileset/gAreaMetaTileset_DarkHyruleCastleBridge_bottom.bin.lz" gAreaMetaTileset_DarkHyruleCastleBridge_top:: - .incbin "maps/areas/141_DarkHyruleCastleBridge/metatilesets/gAreaMetaTileset_DarkHyruleCastleBridge_top.bin.lz" + .incbin "maps/areas/141_DarkHyruleCastleBridge/metatileset/gAreaMetaTileset_DarkHyruleCastleBridge_top.bin.lz" gAreaMetaTilesetTypes_DarkHyruleCastleBridge_bottom:: - .incbin "maps/areas/141_DarkHyruleCastleBridge/metatilesets/gAreaMetaTilesetTypes_DarkHyruleCastleBridge_bottom.bin.lz" + .incbin "maps/areas/141_DarkHyruleCastleBridge/metatileset/gAreaMetaTilesetTypes_DarkHyruleCastleBridge_bottom.bin.lz" gAreaMetaTilesetTypes_DarkHyruleCastleBridge_top:: - .incbin "maps/areas/141_DarkHyruleCastleBridge/metatilesets/gAreaMetaTilesetTypes_DarkHyruleCastleBridge_top.bin.lz" + .incbin "maps/areas/141_DarkHyruleCastleBridge/metatileset/gAreaMetaTilesetTypes_DarkHyruleCastleBridge_top.bin.lz" gAreaTileset_Vaati3_0_0:: .incbin "maps/areas/139_Vaati3/tilesets/0/gAreaTileset_Vaati3_0_0.4bpp.lz" gAreaTileset_Vaati3_0_1:: @@ -3122,13 +3122,13 @@ gAreaTileset_Vaati3_0_1:: gAreaTileset_Vaati3_0_2:: .incbin "maps/areas/139_Vaati3/tilesets/0/gAreaTileset_Vaati3_0_2.4bpp.lz" gAreaMetaTileset_Vaati3_bottom:: - .incbin "maps/areas/139_Vaati3/metatilesets/gAreaMetaTileset_Vaati3_bottom.bin.lz" + .incbin "maps/areas/139_Vaati3/metatileset/gAreaMetaTileset_Vaati3_bottom.bin.lz" gAreaMetaTileset_Vaati3_top:: - .incbin "maps/areas/139_Vaati3/metatilesets/gAreaMetaTileset_Vaati3_top.bin.lz" + .incbin "maps/areas/139_Vaati3/metatileset/gAreaMetaTileset_Vaati3_top.bin.lz" gAreaMetaTilesetTypes_Vaati3_bottom:: - .incbin "maps/areas/139_Vaati3/metatilesets/gAreaMetaTilesetTypes_Vaati3_bottom.bin.lz" + .incbin "maps/areas/139_Vaati3/metatileset/gAreaMetaTilesetTypes_Vaati3_bottom.bin.lz" gAreaMetaTilesetTypes_Vaati3_top:: - .incbin "maps/areas/139_Vaati3/metatilesets/gAreaMetaTilesetTypes_Vaati3_top.bin.lz" + .incbin "maps/areas/139_Vaati3/metatileset/gAreaMetaTilesetTypes_Vaati3_top.bin.lz" gAreaTileset_Vaati2_0_0:: .incbin "maps/areas/140_Vaati2/tilesets/0/gAreaTileset_Vaati2_0_0.4bpp.lz" gAreaTileset_Vaati2_0_1:: @@ -3136,13 +3136,13 @@ gAreaTileset_Vaati2_0_1:: gAreaTileset_Vaati2_0_2:: .incbin "maps/areas/140_Vaati2/tilesets/0/gAreaTileset_Vaati2_0_2.4bpp.lz" gAreaMetaTileset_Vaati2_bottom:: - .incbin "maps/areas/140_Vaati2/metatilesets/gAreaMetaTileset_Vaati2_bottom.bin.lz" + .incbin "maps/areas/140_Vaati2/metatileset/gAreaMetaTileset_Vaati2_bottom.bin.lz" gAreaMetaTileset_Vaati2_top:: - .incbin "maps/areas/140_Vaati2/metatilesets/gAreaMetaTileset_Vaati2_top.bin.lz" + .incbin "maps/areas/140_Vaati2/metatileset/gAreaMetaTileset_Vaati2_top.bin.lz" gAreaMetaTilesetTypes_Vaati2_bottom:: - .incbin "maps/areas/140_Vaati2/metatilesets/gAreaMetaTilesetTypes_Vaati2_bottom.bin.lz" + .incbin "maps/areas/140_Vaati2/metatileset/gAreaMetaTilesetTypes_Vaati2_bottom.bin.lz" gAreaMetaTilesetTypes_Vaati2_top:: - .incbin "maps/areas/140_Vaati2/metatilesets/gAreaMetaTilesetTypes_Vaati2_top.bin.lz" + .incbin "maps/areas/140_Vaati2/metatileset/gAreaMetaTilesetTypes_Vaati2_top.bin.lz" gAreaTileset_VaatisArms_0_0:: .incbin "maps/areas/138_VaatisArms/tilesets/0/gAreaTileset_VaatisArms_0_0.4bpp.lz" gAreaTileset_VaatisArms_0_1:: @@ -3150,13 +3150,13 @@ gAreaTileset_VaatisArms_0_1:: gAreaTileset_VaatisArms_0_2:: .incbin "maps/areas/138_VaatisArms/tilesets/0/gAreaTileset_VaatisArms_0_2.4bpp.lz" gAreaMetaTileset_VaatisArms_bottom:: - .incbin "maps/areas/138_VaatisArms/metatilesets/gAreaMetaTileset_VaatisArms_bottom.bin.lz" + .incbin "maps/areas/138_VaatisArms/metatileset/gAreaMetaTileset_VaatisArms_bottom.bin.lz" gAreaMetaTileset_VaatisArms_top:: - .incbin "maps/areas/138_VaatisArms/metatilesets/gAreaMetaTileset_VaatisArms_top.bin.lz" + .incbin "maps/areas/138_VaatisArms/metatileset/gAreaMetaTileset_VaatisArms_top.bin.lz" gAreaMetaTilesetTypes_VaatisArms_bottom:: - .incbin "maps/areas/138_VaatisArms/metatilesets/gAreaMetaTilesetTypes_VaatisArms_bottom.bin.lz" + .incbin "maps/areas/138_VaatisArms/metatileset/gAreaMetaTilesetTypes_VaatisArms_bottom.bin.lz" gAreaMetaTilesetTypes_VaatisArms_top:: - .incbin "maps/areas/138_VaatisArms/metatilesets/gAreaMetaTilesetTypes_VaatisArms_top.bin.lz" + .incbin "maps/areas/138_VaatisArms/metatileset/gAreaMetaTilesetTypes_VaatisArms_top.bin.lz" gAreaRoomMap_DarkHyruleCastle_1fEntrance_bottom:: .incbin "maps/areas/136_DarkHyruleCastle/rooms/00_1fEntrance/gAreaRoomMap_DarkHyruleCastle_1fEntrance_bottom.bin.lz" gAreaRoomMap_DarkHyruleCastle_1fEntrance_top:: @@ -3381,9 +3381,9 @@ gAreaRoomMap_DarkHyruleCastle_1fLoopTop_top:: gDungeonMaps_DarkHyruleCastle_1fLoopTop:: .incbin "maps/areas/136_DarkHyruleCastle/rooms/36_1fLoopTop/dungeon_map.bin" gAreaRoomMap_DarkHyruleCastle_1fLoopTopRight_bottom:: - .incbin "maps/areas/136_DarkHyruleCastle/rooms/36_1fLoopTopRight/gAreaRoomMap_DarkHyruleCastle_1fLoopTopRight_bottom.bin.lz" + .incbin "maps/areas/136_DarkHyruleCastle/rooms/37_1fLoopTopRight/gAreaRoomMap_DarkHyruleCastle_1fLoopTopRight_bottom.bin.lz" gAreaRoomMap_DarkHyruleCastle_1fLoopTopRight_top:: - .incbin "maps/areas/136_DarkHyruleCastle/rooms/36_1fLoopTopRight/gAreaRoomMap_DarkHyruleCastle_1fLoopTopRight_top.bin.lz" + .incbin "maps/areas/136_DarkHyruleCastle/rooms/37_1fLoopTopRight/gAreaRoomMap_DarkHyruleCastle_1fLoopTopRight_top.bin.lz" gDungeonMaps_DarkHyruleCastle_1fLoopTopRight:: .incbin "maps/areas/136_DarkHyruleCastle/rooms/37_1fLoopTopRight/dungeon_map.bin" gAreaRoomMap_DarkHyruleCastle_1fLoopLeft_bottom:: @@ -3411,9 +3411,9 @@ gAreaRoomMap_DarkHyruleCastle_1fLoopBottom_top:: gDungeonMaps_DarkHyruleCastle_1fLoopBottom:: .incbin "maps/areas/136_DarkHyruleCastle/rooms/41_1fLoopBottom/dungeon_map.bin" gAreaRoomMap_DarkHyruleCastle_1fLoopBottomRight_bottom:: - .incbin "maps/areas/136_DarkHyruleCastle/rooms/41_1fLoopBottomRight/gAreaRoomMap_DarkHyruleCastle_1fLoopBottomRight_bottom.bin.lz" + .incbin "maps/areas/136_DarkHyruleCastle/rooms/42_1fLoopBottomRight/gAreaRoomMap_DarkHyruleCastle_1fLoopBottomRight_bottom.bin.lz" gAreaRoomMap_DarkHyruleCastle_1fLoopBottomRight_top:: - .incbin "maps/areas/136_DarkHyruleCastle/rooms/41_1fLoopBottomRight/gAreaRoomMap_DarkHyruleCastle_1fLoopBottomRight_top.bin.lz" + .incbin "maps/areas/136_DarkHyruleCastle/rooms/42_1fLoopBottomRight/gAreaRoomMap_DarkHyruleCastle_1fLoopBottomRight_top.bin.lz" gDungeonMaps_DarkHyruleCastle_1fLoopBottomRight:: .incbin "maps/areas/136_DarkHyruleCastle/rooms/42_1fLoopBottomRight/dungeon_map.bin" gAreaRoomMap_DarkHyruleCastle_1fBottomLeftTower_bottom:: @@ -3465,9 +3465,9 @@ gAreaRoomMap_DarkHyruleCastle_B1Keatons_top:: gDungeonMaps_DarkHyruleCastle_B1Keatons:: .incbin "maps/areas/136_DarkHyruleCastle/rooms/50_B1Keatons/dungeon_map.bin" gAreaRoomMap_DarkHyruleCastle_B1ToPrisonFirebar_bottom:: - .incbin "maps/areas/136_DarkHyruleCastle/rooms/48_B1ToPrisonFirebar/gAreaRoomMap_DarkHyruleCastle_B1ToPrisonFirebar_bottom.bin.lz" + .incbin "maps/areas/136_DarkHyruleCastle/rooms/51_B1ToPrisonFirebar/gAreaRoomMap_DarkHyruleCastle_B1ToPrisonFirebar_bottom.bin.lz" gAreaRoomMap_DarkHyruleCastle_B1ToPrisonFirebar_top:: - .incbin "maps/areas/136_DarkHyruleCastle/rooms/48_B1ToPrisonFirebar/gAreaRoomMap_DarkHyruleCastle_B1ToPrisonFirebar_top.bin.lz" + .incbin "maps/areas/136_DarkHyruleCastle/rooms/51_B1ToPrisonFirebar/gAreaRoomMap_DarkHyruleCastle_B1ToPrisonFirebar_top.bin.lz" gDungeonMaps_DarkHyruleCastle_B1ToPrisonFirebar:: .incbin "maps/areas/136_DarkHyruleCastle/rooms/51_B1ToPrisonFirebar/dungeon_map.bin" gAreaRoomMap_DarkHyruleCastle_B1Cannons_bottom:: @@ -3557,13 +3557,13 @@ gAreaTileset_DarkHyruleCastleOutside_0_1:: gAreaTileset_DarkHyruleCastleOutside_0_2:: .incbin "maps/areas/137_DarkHyruleCastleOutside/tilesets/0/gAreaTileset_DarkHyruleCastleOutside_0_2.4bpp.lz" gAreaMetaTileset_DarkHyruleCastleOutside_bottom:: - .incbin "maps/areas/137_DarkHyruleCastleOutside/metatilesets/gAreaMetaTileset_DarkHyruleCastleOutside_bottom.bin.lz" + .incbin "maps/areas/137_DarkHyruleCastleOutside/metatileset/gAreaMetaTileset_DarkHyruleCastleOutside_bottom.bin.lz" gAreaMetaTileset_DarkHyruleCastleOutside_top:: - .incbin "maps/areas/137_DarkHyruleCastleOutside/metatilesets/gAreaMetaTileset_DarkHyruleCastleOutside_top.bin.lz" + .incbin "maps/areas/137_DarkHyruleCastleOutside/metatileset/gAreaMetaTileset_DarkHyruleCastleOutside_top.bin.lz" gAreaMetaTilesetTypes_DarkHyruleCastleOutside_bottom:: - .incbin "maps/areas/137_DarkHyruleCastleOutside/metatilesets/gAreaMetaTilesetTypes_DarkHyruleCastleOutside_bottom.bin.lz" + .incbin "maps/areas/137_DarkHyruleCastleOutside/metatileset/gAreaMetaTilesetTypes_DarkHyruleCastleOutside_bottom.bin.lz" gAreaMetaTilesetTypes_DarkHyruleCastleOutside_top:: - .incbin "maps/areas/137_DarkHyruleCastleOutside/metatilesets/gAreaMetaTilesetTypes_DarkHyruleCastleOutside_top.bin.lz" + .incbin "maps/areas/137_DarkHyruleCastleOutside/metatileset/gAreaMetaTilesetTypes_DarkHyruleCastleOutside_top.bin.lz" gAreaRoomMap_DarkHyruleCastleOutside_ZeldaStatuePlatform_bottom:: .incbin "maps/areas/137_DarkHyruleCastleOutside/rooms/00_ZeldaStatuePlatform/gAreaRoomMap_DarkHyruleCastleOutside_ZeldaStatuePlatform_bottom.bin.lz" gAreaRoomMap_DarkHyruleCastleOutside_ZeldaStatuePlatform_top:: @@ -3593,9 +3593,9 @@ gAreaRoomMap_DarkHyruleCastleOutside_South_bottom:: gAreaRoomMap_DarkHyruleCastleOutside_South_top:: .incbin "maps/areas/137_DarkHyruleCastleOutside/rooms/06_South/gAreaRoomMap_DarkHyruleCastleOutside_South_top.bin.lz" gAreaRoomMap_DarkHyruleCastleOutside_Southeast_bottom:: - .incbin "maps/areas/137_DarkHyruleCastleOutside/rooms/06_Southeast/gAreaRoomMap_DarkHyruleCastleOutside_Southeast_bottom.bin.lz" + .incbin "maps/areas/137_DarkHyruleCastleOutside/rooms/07_Southeast/gAreaRoomMap_DarkHyruleCastleOutside_Southeast_bottom.bin.lz" gAreaRoomMap_DarkHyruleCastleOutside_Southeast_top:: - .incbin "maps/areas/137_DarkHyruleCastleOutside/rooms/06_Southeast/gAreaRoomMap_DarkHyruleCastleOutside_Southeast_top.bin.lz" + .incbin "maps/areas/137_DarkHyruleCastleOutside/rooms/07_Southeast/gAreaRoomMap_DarkHyruleCastleOutside_Southeast_top.bin.lz" gAreaRoomMap_DarkHyruleCastleOutside_8_bottom:: .incbin "maps/areas/137_DarkHyruleCastleOutside/rooms/08_8/gAreaRoomMap_DarkHyruleCastleOutside_8_bottom.bin.lz" gAreaRoomMap_DarkHyruleCastleOutside_8_top:: diff --git a/data/scripts/castorWilds/script_CutsceneOrchestrator.inc b/data/scripts/castorWilds/script_CutsceneOrchestrator.inc index d64f1ee5..c90e2862 100644 --- a/data/scripts/castorWilds/script_CutsceneOrchestrator.inc +++ b/data/scripts/castorWilds/script_CutsceneOrchestrator.inc @@ -11,7 +11,7 @@ script_0800B216: Call DisablePauseMenuAndPutAwayItems MoveEntityToPlayer CameraTargetEntity - _0807EDD4 0x0068, 0x0380 + MoveTo 0x0068, 0x0380 SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000001 Call EnablePauseMenu diff --git a/data/scripts/castorWilds/script_PlayerAtDarknutFight.inc b/data/scripts/castorWilds/script_PlayerAtDarknutFight.inc index c09e6ed0..e73e1517 100644 --- a/data/scripts/castorWilds/script_PlayerAtDarknutFight.inc +++ b/data/scripts/castorWilds/script_PlayerAtDarknutFight.inc @@ -5,7 +5,7 @@ SCRIPT_START script_PlayerAtDarknutFight EndBlock WaitForSyncFlagAndClear 0x00000002 SetEntitySpeed 0x00e0 - _0807EDD4 0x0088, 0x0090 + MoveTo 0x0088, 0x0090 ClearLocalFlag 0x0039 DoPostScriptAction 0x0000 DoPostScriptAction 0x0004 diff --git a/data/scripts/cloudTops/script_CutsceneOrchestratorGreatWhirlwindRevealed.inc b/data/scripts/cloudTops/script_CutsceneOrchestratorGreatWhirlwindRevealed.inc index 135e95c0..30c270a4 100644 --- a/data/scripts/cloudTops/script_CutsceneOrchestratorGreatWhirlwindRevealed.inc +++ b/data/scripts/cloudTops/script_CutsceneOrchestratorGreatWhirlwindRevealed.inc @@ -13,7 +13,7 @@ SCRIPT_START script_CutsceneOrchestratorGreatWhirlwindRevealed WaitForSyncFlagAndClear 0x00000004 SetSyncFlag 0x0000000a WaitForSyncFlagAndClear 0x00000004 - _0807EEB4 + MoveToPlayer SetScrollSpeed 4 CameraTargetPlayer Call sub_0807FBCC diff --git a/data/scripts/cloudTops/script_Npc4EFirstCloud.inc b/data/scripts/cloudTops/script_Npc4EFirstCloud.inc index 126ad33e..26b0a439 100644 --- a/data/scripts/cloudTops/script_Npc4EFirstCloud.inc +++ b/data/scripts/cloudTops/script_Npc4EFirstCloud.inc @@ -26,7 +26,7 @@ script_0800D650: SetEntitySpeed 0x0700 SetScrollSpeed 7 CameraTargetEntity - _0807EDD4 0x01e8, 0x01b8 + MoveTo 0x01e8, 0x01b8 Wait 0x003c Call sub_0806DAE8 Wait 0x0078 diff --git a/data/scripts/cloudTops/script_Npc4EKinstoneFused.inc b/data/scripts/cloudTops/script_Npc4EKinstoneFused.inc index f4372344..e9766d70 100644 --- a/data/scripts/cloudTops/script_Npc4EKinstoneFused.inc +++ b/data/scripts/cloudTops/script_Npc4EKinstoneFused.inc @@ -1,6 +1,6 @@ @ Cloud Tops NPC4E after Kinstone has been fused SCRIPT_START script_Npc4EKinstoneFused - _0807EEB4 + MoveToPlayer SetScrollSpeed 4 CameraTargetPlayer Call sub_0807FBCC diff --git a/data/scripts/cloudTops/script_PlayerAtSiroc.inc b/data/scripts/cloudTops/script_PlayerAtSiroc.inc index ebdfb81b..a6c2bd7b 100644 --- a/data/scripts/cloudTops/script_PlayerAtSiroc.inc +++ b/data/scripts/cloudTops/script_PlayerAtSiroc.inc @@ -3,7 +3,7 @@ SCRIPT_START script_PlayerAtSiroc BeginBlock SetEntitySpeed 0x0100 EndBlock - _0807EDD4 0x0078, 0x0040 + MoveTo 0x0078, 0x0040 SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 diff --git a/data/scripts/cloudTops/script_WindTribespeople3.inc b/data/scripts/cloudTops/script_WindTribespeople3.inc index 84c60935..b10db604 100644 --- a/data/scripts/cloudTops/script_WindTribespeople3.inc +++ b/data/scripts/cloudTops/script_WindTribespeople3.inc @@ -19,7 +19,7 @@ script_080149DE: SetLocalFlag 0x00b1 DoPostScriptAction 0x000b DoPostScriptAction 0x0001 - _0807EDD4 0x0068, 0x00f8 + MoveTo 0x0068, 0x00f8 PlaySound SFX_SECRET FacePlayer DoPostScriptAction 0x0000 diff --git a/data/scripts/cloudTops/script_WindTribespeopleGreatWhirlwindRevealed1.inc b/data/scripts/cloudTops/script_WindTribespeopleGreatWhirlwindRevealed1.inc index c5d77432..56c3be62 100644 --- a/data/scripts/cloudTops/script_WindTribespeopleGreatWhirlwindRevealed1.inc +++ b/data/scripts/cloudTops/script_WindTribespeopleGreatWhirlwindRevealed1.inc @@ -12,7 +12,7 @@ SCRIPT_START script_WindTribespeopleGreatWhirlwindRevealed1 Wait 0x003c PlaySound SFX_123 CallWithArg sub_0807F464, 0x000001e0 - _0807EDD4 0x01e0, 0x01d8 + MoveTo 0x01e0, 0x01d8 SetAnimationState 0x0002 DoPostScriptAction 0x0000 SetSyncFlag 0x00000010 diff --git a/data/scripts/cloudTops/script_WindTribespeopleGreatWhirlwindRevealed2.inc b/data/scripts/cloudTops/script_WindTribespeopleGreatWhirlwindRevealed2.inc index 76862484..ef4f7130 100644 --- a/data/scripts/cloudTops/script_WindTribespeopleGreatWhirlwindRevealed2.inc +++ b/data/scripts/cloudTops/script_WindTribespeopleGreatWhirlwindRevealed2.inc @@ -7,12 +7,12 @@ SCRIPT_START script_WindTribespeopleGreatWhirlwindRevealed2 SetEntitySpeed 0x0100 EndBlock WaitForSyncFlagAndClear 0x00000002 - _0807EDD4 0x01f0, 0x01d8 + MoveTo 0x01f0, 0x01d8 SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000002 script_0800D80C: SetEntitySpeed 0x0100 - _0807EEF4 0x0000, -32 + MoveToOffset 0x0000, -32 DoPostScriptAction 0x000e Call sub_0806CA5C SetEntityVelocity 0x00040000 diff --git a/data/scripts/cutscene/ezlo/script_EzloCap.inc b/data/scripts/cutscene/ezlo/script_EzloCap.inc index 0c5328b2..9bd3aed2 100644 --- a/data/scripts/cutscene/ezlo/script_EzloCap.inc +++ b/data/scripts/cutscene/ezlo/script_EzloCap.inc @@ -225,7 +225,7 @@ script_08012A3E: SetEntitySpeed 0x0080 Call sub_0806D8A0 script_08012A74: - _0807EE30 + MoveTowardsTarget JumpIfNot script_08012A74 SetAnimation 0x001f WaitUntilTextboxCloses diff --git a/data/scripts/cutscene/ezlo/script_PlayerDefeatedOctoroks.inc b/data/scripts/cutscene/ezlo/script_PlayerDefeatedOctoroks.inc index eaa33a4c..9e784a5c 100644 --- a/data/scripts/cutscene/ezlo/script_PlayerDefeatedOctoroks.inc +++ b/data/scripts/cutscene/ezlo/script_PlayerDefeatedOctoroks.inc @@ -4,7 +4,7 @@ SCRIPT_START script_PlayerDefeatedOctoroks SetEntitySpeed 0x0100 EndBlock DoPostScriptAction 0x0001 - _0807EDD4 0x0388, 0x0180 + MoveTo 0x0388, 0x0180 SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 diff --git a/data/scripts/cutscene/intro/script_IntroCameraTarget.inc b/data/scripts/cutscene/intro/script_IntroCameraTarget.inc index 3c3d8b38..13c25f82 100644 --- a/data/scripts/cutscene/intro/script_IntroCameraTarget.inc +++ b/data/scripts/cutscene/intro/script_IntroCameraTarget.inc @@ -13,5 +13,5 @@ SCRIPT_START script_IntroCameraTarget SetSyncFlag 0x00000004 Call sub_08053648 @ Move camera target down - _0807EDD4 0x0240, 0x0228 + MoveTo 0x0240, 0x0228 SCRIPT_END diff --git a/data/scripts/cutscene/intro/script_PlayerMoveToSmith.inc b/data/scripts/cutscene/intro/script_PlayerMoveToSmith.inc index 8bec701d..0f441d0d 100644 --- a/data/scripts/cutscene/intro/script_PlayerMoveToSmith.inc +++ b/data/scripts/cutscene/intro/script_PlayerMoveToSmith.inc @@ -7,8 +7,8 @@ SCRIPT_START script_PlayerMoveToSmith SetSyncFlag 0x00000004 DoPostScriptAction 0x0004 Wait 0x003c - _0807EDD4 0x0040, 0x0060 - _0807EDD4 0x0060, 0x0068 + MoveTo 0x0040, 0x0060 + MoveTo 0x0060, 0x0068 SetSyncFlag 0x00000004 DoPostScriptAction 0x0000 _0807E8E4_0 @@ -18,7 +18,7 @@ SCRIPT_START script_PlayerMoveToSmith Wait 0x001e SetSyncFlag 0x00000008 WaitForSyncFlagAndClear 0x00000002 - _0807EDD4 0x0070, 0x005c + MoveTo 0x0070, 0x005c _0807E8E4_1 DoPostScriptAction 0x0000 Wait 0x000f diff --git a/data/scripts/cutscene/intro/script_SmithIntro.inc b/data/scripts/cutscene/intro/script_SmithIntro.inc index fe1ac39c..bdc21562 100644 --- a/data/scripts/cutscene/intro/script_SmithIntro.inc +++ b/data/scripts/cutscene/intro/script_SmithIntro.inc @@ -24,7 +24,7 @@ SCRIPT_START script_SmithIntro WaitForSyncFlagAndClear 0x00000008 SetAction 0x0001 SetAnimationState 0x0004 - _0807EDD4 0x00b8, 0x005c + MoveTo 0x00b8, 0x005c SetAnimationState 0x0006 DoPostScriptAction 0x0001 MessageFromTarget TEXT_PROLOGUE, 0x04 diff --git a/data/scripts/cutscene/intro/script_SmithIntro2.inc b/data/scripts/cutscene/intro/script_SmithIntro2.inc index ca938451..b5362248 100644 --- a/data/scripts/cutscene/intro/script_SmithIntro2.inc +++ b/data/scripts/cutscene/intro/script_SmithIntro2.inc @@ -14,7 +14,7 @@ SCRIPT_START script_SmithIntro2 StartPlayerScript script_PlayerMoveToSmith Call DisablePauseMenuAndPutAwayItems WaitForSyncFlagAndClear 0x00000008 - _0807EDD4 0x0080, 0x005c + MoveTo 0x0080, 0x005c SetAnimationState 0x0006 DoPostScriptAction 0x0000 Wait 0x000f @@ -32,10 +32,10 @@ SCRIPT_START script_SmithIntro2 DoPostScriptAction 0x0000 SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000008 - _0807EDD4 0x007c, 0x005c + MoveTo 0x007c, 0x005c Wait 0x000f DoPostScriptAction 0x000d - _0807EDD4 0x0084, 0x005c + MoveTo 0x0084, 0x005c SetAnimationState 0x0006 DoPostScriptAction 0x000c DoPostScriptAction 0x0000 diff --git a/data/scripts/cutscene/intro/script_ZeldaIntro.inc b/data/scripts/cutscene/intro/script_ZeldaIntro.inc index 9d82ffad..990afc63 100644 --- a/data/scripts/cutscene/intro/script_ZeldaIntro.inc +++ b/data/scripts/cutscene/intro/script_ZeldaIntro.inc @@ -8,7 +8,7 @@ SCRIPT_START script_ZeldaIntro EndBlock WaitForSyncFlagAndClear 0x00000004 DoPostScriptAction 0x0007 - _0807EDD4 0x0068, 0x0060 + MoveTo 0x0068, 0x0060 Wait 0x000f MessageFromTarget TEXT_PROLOGUE, 0x01 WaitUntilTextboxCloses diff --git a/data/scripts/cutscene/intro/script_ZeldaLeaveLinksHouse.inc b/data/scripts/cutscene/intro/script_ZeldaLeaveLinksHouse.inc index 0b496f45..738d55a5 100644 --- a/data/scripts/cutscene/intro/script_ZeldaLeaveLinksHouse.inc +++ b/data/scripts/cutscene/intro/script_ZeldaLeaveLinksHouse.inc @@ -4,12 +4,12 @@ SCRIPT_START script_ZeldaLeaveLinksHouse SetEntitySpeed 0x0100 SetAnimationState 0x0006 EndBlock - _0807EDD4 0x0078, 0x0060 - _0807EDD4 0x0078, 0x007c + MoveTo 0x0078, 0x0060 + MoveTo 0x0078, 0x007c Wait 0x001e Call sub_0805368C Wait 0x0008 - _0807EDD4 0x0078, 0x0098 + MoveTo 0x0078, 0x0098 DoPostScriptAction 0x0008 SetFadeTime 0x0010 SetFade5 diff --git a/data/scripts/cutscene/intro/script_ZeldaMoveToLinksHouse.inc b/data/scripts/cutscene/intro/script_ZeldaMoveToLinksHouse.inc index d86a142b..f6dc08b1 100644 --- a/data/scripts/cutscene/intro/script_ZeldaMoveToLinksHouse.inc +++ b/data/scripts/cutscene/intro/script_ZeldaMoveToLinksHouse.inc @@ -7,23 +7,23 @@ SCRIPT_START script_ZeldaMoveToLinksHouse EndBlock WaitForSyncFlagAndClear 0x00000004 DoPostScriptAction 0x0007 - _0807EDD4 0x01e8, 0x0200 - _0807EDD4 0x01f8, 0x0218 - _0807EDD4 0x0220, 0x0228 - _0807EDD4 0x0240, 0x0228 + MoveTo 0x01e8, 0x0200 + MoveTo 0x01f8, 0x0218 + MoveTo 0x0220, 0x0228 + MoveTo 0x0240, 0x0228 @ Now the camera follows Zelda CameraTargetEntity - _0807EDD4 0x0290, 0x0228 - _0807EDD4 0x0290, 0x01f8 + MoveTo 0x0290, 0x0228 + MoveTo 0x0290, 0x01f8 SetEntitySpeed 0x0080 - _0807EDD4 0x0290, 0x01c8 + MoveTo 0x0290, 0x01c8 SetEntitySpeed 0x00c0 - _0807EDD4 0x0290, 0x0198 + MoveTo 0x0290, 0x0198 Wait 0x001e @ Door is opening SetSyncFlag 0x00000010 @ Send signal to door - _0807EDD4 0x0290, 0x0190 + MoveTo 0x0290, 0x0190 DoPostScriptAction 0x0008 - _0807EDD4 0x0290, 0x0188 + MoveTo 0x0290, 0x0188 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/cutscene/intro/script_ZeldaTalkToSmith.inc b/data/scripts/cutscene/intro/script_ZeldaTalkToSmith.inc index 16bebcaf..67a5eefc 100644 --- a/data/scripts/cutscene/intro/script_ZeldaTalkToSmith.inc +++ b/data/scripts/cutscene/intro/script_ZeldaTalkToSmith.inc @@ -27,8 +27,8 @@ SCRIPT_START script_ZeldaTalkToSmith WaitUntilTextboxCloses DoPostScriptAction 0x0000 @ Leave room - _0807EDD4 0x0028, 0x0060 - _0807EDD4 0x0000, 0x0060 + MoveTo 0x0028, 0x0060 + MoveTo 0x0000, 0x0060 Call sub_080536A8 Wait 0x001e BeginBlock diff --git a/data/scripts/cutscene/introAssembly/script_PlayerEnters.inc b/data/scripts/cutscene/introAssembly/script_PlayerEnters.inc index daa91183..9f2a8bfe 100644 --- a/data/scripts/cutscene/introAssembly/script_PlayerEnters.inc +++ b/data/scripts/cutscene/introAssembly/script_PlayerEnters.inc @@ -4,13 +4,13 @@ SCRIPT_START script_PlayerEnters SetEntitySpeed 0x0100 EndBlock DoPostScriptAction 0x0001 - _0807EDD4 0x00b8, 0x0090 + MoveTo 0x00b8, 0x0090 SetAnimationState 0x0006 DoPostScriptAction 0x0000 SetSyncFlag 0x00000020 WaitForSyncFlagAndClear 0x00000040 DoPostScriptAction 0x0001 - _0807EDD4 0x0088, 0x0078 + MoveTo 0x0088, 0x0078 SetAnimationState 0x0000 DoPostScriptAction 0x0000 Wait 0x000f diff --git a/data/scripts/cutscene/introAssembly/script_SmithAtAssembly.inc b/data/scripts/cutscene/introAssembly/script_SmithAtAssembly.inc index e971d99d..68a3e12c 100644 --- a/data/scripts/cutscene/introAssembly/script_SmithAtAssembly.inc +++ b/data/scripts/cutscene/introAssembly/script_SmithAtAssembly.inc @@ -40,7 +40,7 @@ SCRIPT_START script_SmithAtAssembly WaitForSyncFlagAndClear 0x00000001 SetEntitySpeed 0x0080 DoPostScriptAction 0x0001 - _0807EDD4 0x0098, 0x0078 + MoveTo 0x0098, 0x0078 FacePlayer DoPostScriptAction 0x0000 DoPostScriptAction 0x0001 diff --git a/data/scripts/cutscene/introBusinessScrub/script_08015B14.inc b/data/scripts/cutscene/introBusinessScrub/script_08015B14.inc index 28987c7e..6e0017f9 100644 --- a/data/scripts/cutscene/introBusinessScrub/script_08015B14.inc +++ b/data/scripts/cutscene/introBusinessScrub/script_08015B14.inc @@ -4,7 +4,7 @@ SCRIPT_START script_08015B14 SetAnimation 0x0018 SetEntitySpeed 0x0300 EndBlock - _0807EDD4 0x0248, 0x0218 + MoveTo 0x0248, 0x0218 SetSyncFlag 0x00000020 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub1.inc b/data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub1.inc index f5475ac2..3021ba57 100644 --- a/data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub1.inc +++ b/data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub1.inc @@ -1,7 +1,7 @@ @ Player at intro outside castle 1? SCRIPT_START script_PlayerIntroBusinessScrub1 SetEntitySpeed 0x0100 - _0807EDD4 0x0218, 0x0238 + MoveTo 0x0218, 0x0238 SetAnimationState 0x0002 DoPostScriptAction 0x0000 SetSyncFlag 0x00000010 diff --git a/data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub2.inc b/data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub2.inc index 3f6979a5..aeae6cf6 100644 --- a/data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub2.inc +++ b/data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub2.inc @@ -1,7 +1,7 @@ @ Player at intro outside castle SCRIPT_START script_PlayerIntroBusinessScrub2 SetEntitySpeed 0x0100 - _0807EDD4 0x0238, 0x0228 + MoveTo 0x0238, 0x0228 SetAnimationState 0x0002 DoPostScriptAction 0x0000 SetSyncFlag 0x00000010 diff --git a/data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub3.inc b/data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub3.inc index b9ea15ff..28a713d3 100644 --- a/data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub3.inc +++ b/data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub3.inc @@ -1,7 +1,7 @@ @ Intro Outside Castle Player SCRIPT_START script_PlayerIntroBusinessScrub3 SetEntitySpeed 0x0100 - _0807EDD4 0x0248, 0x0208 + MoveTo 0x0248, 0x0208 SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000010 diff --git a/data/scripts/cutscene/introBusinessScrub/script_ZeldaIntroBusinessScrub.inc b/data/scripts/cutscene/introBusinessScrub/script_ZeldaIntroBusinessScrub.inc index 0e44b4ea..a83b2580 100644 --- a/data/scripts/cutscene/introBusinessScrub/script_ZeldaIntroBusinessScrub.inc +++ b/data/scripts/cutscene/introBusinessScrub/script_ZeldaIntroBusinessScrub.inc @@ -13,12 +13,12 @@ SCRIPT_START script_ZeldaIntroBusinessScrub EndBlock DoPostScriptAction 0x0007 FacePlayer - _0807EDD4 0x01f8, 0x02f8 + MoveTo 0x01f8, 0x02f8 SetAnimationState 0x0004 DoPostScriptAction 0x0000 MessageFromTargetPos TEXT_PROLOGUE, 0x11, 0x0002 WaitUntilTextboxCloses - _0807EDD4 0x01f8, 0x0268 + MoveTo 0x01f8, 0x0268 SetEntityPositionRelative 0x0248, 0x0218 SetAnimationState 0x0006 DoPostScriptAction 0x0000 @@ -43,7 +43,7 @@ SCRIPT_START script_ZeldaIntroBusinessScrub SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000001 SetEntitySpeed 0x0100 - _0807EDD4 0x0238, 0x0238 + MoveTo 0x0238, 0x0238 SetAnimationState 0x0000 DoPostScriptAction 0x0000 DoPostScriptAction 0x000a diff --git a/data/scripts/cutscene/introCeremony/script_08011890.inc b/data/scripts/cutscene/introCeremony/script_08011890.inc index b6f22f79..5b03f447 100644 --- a/data/scripts/cutscene/introCeremony/script_08011890.inc +++ b/data/scripts/cutscene/introCeremony/script_08011890.inc @@ -8,7 +8,7 @@ SCRIPT_START script_08011890 EndBlock Wait 0x00f0 Call sub_08094B6C - _0807EDD4 0x01f8, 0x0088 + MoveTo 0x01f8, 0x0088 Call sub_08094B80 PlaySound SFX_1CC SetSyncFlag 0x10000000 diff --git a/data/scripts/cutscene/introCeremony/script_GuardBottomRight.inc b/data/scripts/cutscene/introCeremony/script_GuardBottomRight.inc index 826ad37f..ac1fba62 100644 --- a/data/scripts/cutscene/introCeremony/script_GuardBottomRight.inc +++ b/data/scripts/cutscene/introCeremony/script_GuardBottomRight.inc @@ -17,8 +17,8 @@ SCRIPT_START script_GuardBottomRight Wait 0x003c SetAnimation 0x0014 SetEntitySpeed 0x0100 - _0807EDD4 0x0200, 0x0098 - _0807EDD4 0x0200, 0x00c8 + MoveTo 0x0200, 0x0098 + MoveTo 0x0200, 0x00c8 SetAnimation 0x0013 SetSyncFlag 0x00004000 WaitForSyncFlagAndClear 0x00002000 diff --git a/data/scripts/cutscene/introCeremony/script_GuardCarryingChest.inc b/data/scripts/cutscene/introCeremony/script_GuardCarryingChest.inc index a2cdf5ff..1d859822 100644 --- a/data/scripts/cutscene/introCeremony/script_GuardCarryingChest.inc +++ b/data/scripts/cutscene/introCeremony/script_GuardCarryingChest.inc @@ -37,8 +37,8 @@ script_08011312: Wait 0x003c SetAnimation 0x0014 SetEntitySpeed 0x0100 - _0807EDD4 0x01f0, 0x0098 - _0807EDD4 0x01f0, 0x00c8 + MoveTo 0x01f0, 0x0098 + MoveTo 0x01f0, 0x00c8 SetAnimation 0x0013 SetSyncFlag 0x00001000 WaitForSyncFlagAndClear 0x00000800 diff --git a/data/scripts/cutscene/introCeremony/script_GuardTopLeft.inc b/data/scripts/cutscene/introCeremony/script_GuardTopLeft.inc index b92edbd5..1b10d516 100644 --- a/data/scripts/cutscene/introCeremony/script_GuardTopLeft.inc +++ b/data/scripts/cutscene/introCeremony/script_GuardTopLeft.inc @@ -20,16 +20,16 @@ SCRIPT_START script_GuardTopLeft WaitForSyncFlagAndClear 0x00008000 SetAnimation 0x0014 SetEntitySpeed 0x0100 - _0807EDD4 0x01e8, 0x0098 + MoveTo 0x01e8, 0x0098 SetEntitySpeed 0x0040 - _0807EEF4 0x0000, 0x0010 + MoveToOffset 0x0000, 0x0010 SetAnimation 0x0013 SetSyncFlag 0x00010000 WaitForSyncFlagAndClear 0x00008000 DoPostScriptAction 0x000d SetAnimation 0x0014 SetEntitySpeed 0x0020 - _0807EEF4 0x0000, 0xfff0 + MoveToOffset 0x0000, 0xfff0 SetAnimation 0x0013 DoPostScriptAction 0x0010 SetSyncFlag 0x00010000 diff --git a/data/scripts/cutscene/introCeremony/script_GuardTopRight.inc b/data/scripts/cutscene/introCeremony/script_GuardTopRight.inc index 5a29854c..b6fb34c5 100644 --- a/data/scripts/cutscene/introCeremony/script_GuardTopRight.inc +++ b/data/scripts/cutscene/introCeremony/script_GuardTopRight.inc @@ -20,16 +20,16 @@ SCRIPT_START script_GuardTopRight WaitForSyncFlagAndClear 0x00020000 SetAnimation 0x0014 SetEntitySpeed 0x0100 - _0807EDD4 0x0208, 0x0098 + MoveTo 0x0208, 0x0098 SetEntitySpeed 0x0040 - _0807EEF4 0x0000, 0x0010 + MoveToOffset 0x0000, 0x0010 SetAnimation 0x0013 SetSyncFlag 0x00040000 WaitForSyncFlagAndClear 0x00020000 DoPostScriptAction 0x000d SetAnimation 0x0014 SetEntitySpeed 0x0020 - _0807EEF4 0x0000, 0xfff0 + MoveToOffset 0x0000, 0xfff0 SetAnimation 0x0013 DoPostScriptAction 0x0010 SetSyncFlag 0x00040000 diff --git a/data/scripts/cutscene/introCeremony/script_KingDaltusIntroCeremony.inc b/data/scripts/cutscene/introCeremony/script_KingDaltusIntroCeremony.inc index afefc1f7..aed20525 100644 --- a/data/scripts/cutscene/introCeremony/script_KingDaltusIntroCeremony.inc +++ b/data/scripts/cutscene/introCeremony/script_KingDaltusIntroCeremony.inc @@ -10,7 +10,7 @@ SCRIPT_START script_KingDaltusIntroCeremony DoPostScriptAction 0x0007 DoPostScriptAction 0x0001 SetEntitySpeed 0x0040 - _0807EDD4 0x01f8, 0x0048 + MoveTo 0x01f8, 0x0048 DoPostScriptAction 0x0000 SetSyncFlag 0x00000080 WaitForSyncFlagAndClear 0x00000040 diff --git a/data/scripts/cutscene/introCeremony/script_PlayerIntroCastle.inc b/data/scripts/cutscene/introCeremony/script_PlayerIntroCastle.inc index 124fe933..9ffed96c 100644 --- a/data/scripts/cutscene/introCeremony/script_PlayerIntroCastle.inc +++ b/data/scripts/cutscene/introCeremony/script_PlayerIntroCastle.inc @@ -3,7 +3,7 @@ SCRIPT_START script_PlayerIntroCastle BeginBlock SetEntitySpeed 0x0080 EndBlock - _0807EDD4 0x01e8, 0x0050 + MoveTo 0x01e8, 0x0050 SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000400 diff --git a/data/scripts/cutscene/introCeremony/script_PlayerProtectingZelda.inc b/data/scripts/cutscene/introCeremony/script_PlayerProtectingZelda.inc index 13efecf9..0860ba5f 100644 --- a/data/scripts/cutscene/introCeremony/script_PlayerProtectingZelda.inc +++ b/data/scripts/cutscene/introCeremony/script_PlayerProtectingZelda.inc @@ -5,7 +5,7 @@ SCRIPT_START script_PlayerProtectingZelda EndBlock SetEntitySpeed 0x0200 DoPostScriptAction 0x0001 - _0807EDD4 0x01d8, 0x0068 + MoveTo 0x01d8, 0x0068 SetAnimationState 0x0004 DoPostScriptAction 0x0000 SetSyncFlag 0x00000400 diff --git a/data/scripts/cutscene/introCeremony/script_VaatiDarkMagic.inc b/data/scripts/cutscene/introCeremony/script_VaatiDarkMagic.inc index 24b9f903..47a5a071 100644 --- a/data/scripts/cutscene/introCeremony/script_VaatiDarkMagic.inc +++ b/data/scripts/cutscene/introCeremony/script_VaatiDarkMagic.inc @@ -8,9 +8,9 @@ SCRIPT_START script_VaatiDarkMagic EndBlock WaitForSyncFlagAndClear 0x08000000 Call sub_08094B6C - _0807EDD4 0x01d8, 0x0078 + MoveTo 0x01d8, 0x0078 StartPlayerScript script_PlayerFainting - _0807EDD4 0x01d8, 0x0058 + MoveTo 0x01d8, 0x0058 Call sub_08094B80 PlaySound SFX_VO_ZELDA7 PlaySound SFX_1C6 diff --git a/data/scripts/cutscene/introCeremony/script_VaatiIntroCeremony.inc b/data/scripts/cutscene/introCeremony/script_VaatiIntroCeremony.inc index d34dd18e..9e3c5845 100644 --- a/data/scripts/cutscene/introCeremony/script_VaatiIntroCeremony.inc +++ b/data/scripts/cutscene/introCeremony/script_VaatiIntroCeremony.inc @@ -7,7 +7,7 @@ SCRIPT_START script_VaatiIntroCeremony Call DeleteHitbox WaitForSyncFlagAndClear 0x00000100 DoPostScriptAction 0x0001 - _0807EDD4 0x01f8, 0x00d0 + MoveTo 0x01f8, 0x00d0 DoPostScriptAction 0x0000 SetSyncFlag 0x00000200 WaitForSyncFlagAndClear 0x00000100 @@ -44,7 +44,7 @@ SCRIPT_START script_VaatiIntroCeremony WaitForSyncFlagAndClear 0x00000100 SetEntitySpeed 0x0080 DoPostScriptAction 0x0001 - _0807EDD4 0x01d8, 0x00a8 + MoveTo 0x01d8, 0x00a8 SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000200 @@ -64,7 +64,7 @@ SCRIPT_START script_VaatiIntroCeremony WaitForSyncFlagAndClear 0x00000100 SetEntitySpeed 0x0100 DoPostScriptAction 0x0001 - _0807EDD4 0x01f8, 0x0098 + MoveTo 0x01f8, 0x0098 SetAnimationState 0x0000 DoPostScriptAction 0x0000 DoPostScriptAction 0x0004 diff --git a/data/scripts/cutscene/introCeremony/script_ZeldaIntroCastle.inc b/data/scripts/cutscene/introCeremony/script_ZeldaIntroCastle.inc index 9ccd1167..71d1229a 100644 --- a/data/scripts/cutscene/introCeremony/script_ZeldaIntroCastle.inc +++ b/data/scripts/cutscene/introCeremony/script_ZeldaIntroCastle.inc @@ -17,20 +17,20 @@ script_080111F6: script_08011206: DoPostScriptAction 0x0007 DoPostScriptAction 0x0001 - _0807EDD4 0x01f8, 0x0050 + MoveTo 0x01f8, 0x0050 FacePlayer DoPostScriptAction 0x0000 SetSyncFlag 0x00000020 WaitForSyncFlagAndClear 0x00000010 DoPostScriptAction 0x0001 - _0807EDD4 0x01f8, 0x0020 + MoveTo 0x01f8, 0x0020 DoPostScriptAction 0x0008 SetSyncFlag 0x00000020 WaitForSyncFlagAndClear 0x00000010 DoPostScriptAction 0x0007 DoPostScriptAction 0x0001 SetEntitySpeed 0x0040 - _0807EDD4 0x01e8, 0x0040 + MoveTo 0x01e8, 0x0040 DoPostScriptAction 0x0000 SetSyncFlag 0x00000020 WaitForSyncFlagAndClear 0x00000010 @@ -38,7 +38,7 @@ script_08011206: SetSyncFlag 0x00000020 WaitForSyncFlagAndClear 0x00000010 DoPostScriptAction 0x0001 - _0807EDD4 0x01d8, 0x0058 + MoveTo 0x01d8, 0x0058 DoPostScriptAction 0x0000 SetSyncFlag 0x00000020 WaitForSyncFlagAndClear 0x00000010 diff --git a/data/scripts/cutscene/introTown/script_Npc4EIntroCastle.inc b/data/scripts/cutscene/introTown/script_Npc4EIntroCastle.inc index 0884bbc7..936f7c59 100644 --- a/data/scripts/cutscene/introTown/script_Npc4EIntroCastle.inc +++ b/data/scripts/cutscene/introTown/script_Npc4EIntroCastle.inc @@ -74,7 +74,7 @@ SCRIPT_START script_Npc4EIntroCastle SetSyncFlag 0x00000100 SetEntityPositionRelative 0x01f8, 0x0220 SetEntitySpeed 0x0100 - _0807EDD4 0x01f8, 0x0098 + MoveTo 0x01f8, 0x0098 Wait 0x003c WaitForSyncFlagAndClear 0x00000200 SetSyncFlag 0x00280000 diff --git a/data/scripts/cutscene/introTown/script_PlayerIntro2.inc b/data/scripts/cutscene/introTown/script_PlayerIntro2.inc index 02058ebd..d13433e5 100644 --- a/data/scripts/cutscene/introTown/script_PlayerIntro2.inc +++ b/data/scripts/cutscene/introTown/script_PlayerIntro2.inc @@ -3,7 +3,7 @@ SCRIPT_START script_PlayerIntro2 BeginBlock SetEntitySpeed 0x0100 EndBlock - _0807EDD4 0x00a0, 0x0278 + MoveTo 0x00a0, 0x0278 SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 diff --git a/data/scripts/cutscene/introTown/script_PlayerIntro3.inc b/data/scripts/cutscene/introTown/script_PlayerIntro3.inc index 2ee42514..5bb61b0a 100644 --- a/data/scripts/cutscene/introTown/script_PlayerIntro3.inc +++ b/data/scripts/cutscene/introTown/script_PlayerIntro3.inc @@ -3,7 +3,7 @@ SCRIPT_START script_PlayerIntro3 BeginBlock SetEntitySpeed 0x0100 EndBlock - _0807EDD4 0x0078, 0x01c0 + MoveTo 0x0078, 0x01c0 SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 diff --git a/data/scripts/cutscene/introTown/script_PlayerIntro4.inc b/data/scripts/cutscene/introTown/script_PlayerIntro4.inc index ad1b34dd..83a20961 100644 --- a/data/scripts/cutscene/introTown/script_PlayerIntro4.inc +++ b/data/scripts/cutscene/introTown/script_PlayerIntro4.inc @@ -3,7 +3,7 @@ SCRIPT_START script_PlayerIntro4 BeginBlock SetEntitySpeed 0x0100 EndBlock - _0807EDD4 0x0108, 0x01c8 + MoveTo 0x0108, 0x01c8 SetAnimationState 0x0002 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 diff --git a/data/scripts/cutscene/introTown/script_PlayerIntro5.inc b/data/scripts/cutscene/introTown/script_PlayerIntro5.inc index f1393d94..3f0be7a3 100644 --- a/data/scripts/cutscene/introTown/script_PlayerIntro5.inc +++ b/data/scripts/cutscene/introTown/script_PlayerIntro5.inc @@ -10,7 +10,7 @@ script_0800FAFC: script_0800FB06: CallWithArg sub_0807F464, 0x000000e8 script_0800FB10: - _0807EDD4 0x00e8, 0x0270 + MoveTo 0x00e8, 0x0270 SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 diff --git a/data/scripts/cutscene/introTown/script_ZeldaIntroTown.inc b/data/scripts/cutscene/introTown/script_ZeldaIntroTown.inc index a9d511f9..d4a8caf7 100644 --- a/data/scripts/cutscene/introTown/script_ZeldaIntroTown.inc +++ b/data/scripts/cutscene/introTown/script_ZeldaIntroTown.inc @@ -18,7 +18,7 @@ script_0800FB6C: SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000002 SetEntitySpeed 0x0200 - _0807EDD4 0x00b8, 0x0318 + MoveTo 0x00b8, 0x0318 SetEntityPositionRelative 0x00a0, 0x0260 SetAnimationState 0x0000 DoPostScriptAction 0x0001 @@ -36,9 +36,9 @@ script_0800FBAE: SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000002 SetEntitySpeed 0x0200 - _0807EDD4 0x00a0, 0x0268 - _0807EDD4 0x0070, 0x0268 - _0807EDD4 0x0070, 0x0208 + MoveTo 0x00a0, 0x0268 + MoveTo 0x0070, 0x0268 + MoveTo 0x0070, 0x0208 SetEntityPositionRelative 0x0078, 0x01a8 SetAnimationState 0x0000 DoPostScriptAction 0x0001 @@ -55,7 +55,7 @@ script_0800FC06: SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000002 SetEntitySpeed 0x0200 - _0807EDD4 0x00f8, 0x01a8 + MoveTo 0x00f8, 0x01a8 SetEntityPositionRelative 0x0118, 0x01c8 SetAnimationState 0x0002 DoPostScriptAction 0x0001 @@ -72,7 +72,7 @@ script_0800FC52: SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000002 SetEntitySpeed 0x0200 - _0807EDD4 0x0118, 0x0260 + MoveTo 0x0118, 0x0260 SetEntityPositionRelative 0x00f8, 0x0270 SetAnimationState 0x0000 DoPostScriptAction 0x0001 diff --git a/data/scripts/cutscene/kinstones/script_HurdyGurdyManFirstKinstone.inc b/data/scripts/cutscene/kinstones/script_HurdyGurdyManFirstKinstone.inc index fa1a008d..96bf8f6d 100644 --- a/data/scripts/cutscene/kinstones/script_HurdyGurdyManFirstKinstone.inc +++ b/data/scripts/cutscene/kinstones/script_HurdyGurdyManFirstKinstone.inc @@ -9,9 +9,9 @@ SCRIPT_START script_HurdyGurdyManFirstKinstone SetAnimationState 0x0002 WaitForSyncFlagAndClear 0x00000002 DoPostScriptAction 0x0007 - _0807EDD4 0x01b8, 0x0328 + MoveTo 0x01b8, 0x0328 SetSyncFlag 0x00000040 - _0807EDD4 0x01f8, 0x0328 + MoveTo 0x01f8, 0x0328 SetAnimationState 0x0004 SetAnimation 0x0008 _0807E8E4_0 @@ -108,7 +108,7 @@ script_0800F314: WaitForSyncFlagAndClear 0x00000002 SetEntitySpeed 0x0100 SetAnimationState 0x0002 - _0807EEF4 0x00c0, 0x0000 + MoveToOffset 0x00c0, 0x0000 SetSyncFlag 0x00000040 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/kinstones/script_KidKinstone1.inc b/data/scripts/cutscene/kinstones/script_KidKinstone1.inc index 747f8a64..53d49396 100644 --- a/data/scripts/cutscene/kinstones/script_KidKinstone1.inc +++ b/data/scripts/cutscene/kinstones/script_KidKinstone1.inc @@ -11,9 +11,9 @@ SCRIPT_START script_KidKinstone1 Call SetPriorityMessage WaitForSyncFlagAndClear 0x00000004 DoPostScriptAction 0x0007 - _0807EDD4 0x01f8, 0x0318 - _0807EDD4 0x0208, 0x0318 - _0807EDD4 0x0208, 0x0338 + MoveTo 0x01f8, 0x0318 + MoveTo 0x0208, 0x0318 + MoveTo 0x0208, 0x0338 SetAnimationState 0x0006 DoPostScriptAction 0x0000 DoPostScriptAction 0x000a @@ -37,7 +37,7 @@ script_0800F402: Wait 0x0010 SetEntitySpeed 0x0100 WalkNorth 0x0010 - _0807EDD4 0x0288, 0x0328 + MoveTo 0x0288, 0x0328 SetSyncFlag 0x00000080 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/kinstones/script_KidKinstone2.inc b/data/scripts/cutscene/kinstones/script_KidKinstone2.inc index e181fe47..820b1f79 100644 --- a/data/scripts/cutscene/kinstones/script_KidKinstone2.inc +++ b/data/scripts/cutscene/kinstones/script_KidKinstone2.inc @@ -11,8 +11,8 @@ SCRIPT_START script_KidKinstone2 Call SetPriorityMessage WaitForSyncFlagAndClear 0x00000008 DoPostScriptAction 0x0007 - _0807EDD4 0x01d8, 0x0328 - _0807EDD4 0x01f8, 0x0348 + MoveTo 0x01d8, 0x0328 + MoveTo 0x01f8, 0x0348 SetAnimationState 0x0000 DoPostScriptAction 0x0000 DoPostScriptAction 0x000a @@ -37,7 +37,7 @@ script_0800F490: SetEntitySpeed 0x0100 WalkEast 0x0010 WalkNorth 0x0020 - _0807EDD4 0x0288, 0x0328 + MoveTo 0x0288, 0x0328 SetSyncFlag 0x00000100 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/kinstones/script_KidKinstone3.inc b/data/scripts/cutscene/kinstones/script_KidKinstone3.inc index 18cb648c..7fec2ebb 100644 --- a/data/scripts/cutscene/kinstones/script_KidKinstone3.inc +++ b/data/scripts/cutscene/kinstones/script_KidKinstone3.inc @@ -11,8 +11,8 @@ SCRIPT_START script_KidKinstone3 Call SetPriorityMessage WaitForSyncFlagAndClear 0x00000010 DoPostScriptAction 0x0007 - _0807EDD4 0x01c8, 0x0328 - _0807EDD4 0x01e8, 0x0338 + MoveTo 0x01c8, 0x0328 + MoveTo 0x01e8, 0x0338 SetAnimationState 0x0002 DoPostScriptAction 0x0000 DoPostScriptAction 0x000a @@ -36,7 +36,7 @@ script_0800F524: Wait 0x0028 SetEntitySpeed 0x0100 WalkNorth 0x0010 - _0807EDD4 0x0288, 0x0328 + MoveTo 0x0288, 0x0328 SetSyncFlag 0x00000200 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/kinstones/script_PlayerAtFirstKinstone.inc b/data/scripts/cutscene/kinstones/script_PlayerAtFirstKinstone.inc index 937cf7a9..36f40dcf 100644 --- a/data/scripts/cutscene/kinstones/script_PlayerAtFirstKinstone.inc +++ b/data/scripts/cutscene/kinstones/script_PlayerAtFirstKinstone.inc @@ -8,7 +8,7 @@ SCRIPT_START script_PlayerAtFirstKinstone DoPostScriptAction 0x0004 Wait 0x003c DoPostScriptAction 0x0001 - _0807EDD4 0x01f8, 0x0338 + MoveTo 0x01f8, 0x0338 SetAnimationState 0x0006 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 diff --git a/data/scripts/cutscene/minishVillage/script_ForestMinish5.inc b/data/scripts/cutscene/minishVillage/script_ForestMinish5.inc index f0e29084..028538fa 100644 --- a/data/scripts/cutscene/minishVillage/script_ForestMinish5.inc +++ b/data/scripts/cutscene/minishVillage/script_ForestMinish5.inc @@ -9,7 +9,7 @@ SCRIPT_START script_ForestMinish5 EndBlock WaitForSyncFlagAndClear 0x00000200 DoPostScriptAction 0x0007 - _0807EDD4 0x0208, 0x0308 + MoveTo 0x0208, 0x0308 SetAnimationState 0x0004 DoPostScriptAction 0x0000 SetSyncFlag 0x00000400 @@ -22,13 +22,13 @@ SCRIPT_START script_ForestMinish5 WaitForSyncFlagAndClear 0x00000200 SetEntitySpeed 0x0200 DoPostScriptAction 0x000f - _0807EDD4 0x0208, 0x0328 + MoveTo 0x0208, 0x0328 DoPostScriptAction 0x0000 SetSyncFlag 0x00000400 WaitForSyncFlagAndClear 0x00000200 SetEntitySpeed 0x0300 DoPostScriptAction 0x000f - _0807EDD4 0x0208, 0x02b0 + MoveTo 0x0208, 0x02b0 SetSyncFlag 0x00000400 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/minishVillage/script_ForestMinish6.inc b/data/scripts/cutscene/minishVillage/script_ForestMinish6.inc index ea9e43fd..d58f9983 100644 --- a/data/scripts/cutscene/minishVillage/script_ForestMinish6.inc +++ b/data/scripts/cutscene/minishVillage/script_ForestMinish6.inc @@ -11,20 +11,20 @@ SCRIPT_START script_ForestMinish6 DoPostScriptAction 0x0007 SetAnimationState 0x0002 DoPostScriptAction 0x0001 - _0807EDD4 0x01a8, 0x0330 + MoveTo 0x01a8, 0x0330 SetAnimationState 0x0002 DoPostScriptAction 0x0000 SetSyncFlag 0x00001000 WaitForSyncFlagAndClear 0x00000800 SetEntitySpeed 0x0200 DoPostScriptAction 0x000f - _0807EDD4 0x01f8, 0x0348 + MoveTo 0x01f8, 0x0348 DoPostScriptAction 0x0000 SetSyncFlag 0x00001000 WaitForSyncFlagAndClear 0x00000800 SetEntitySpeed 0x0300 DoPostScriptAction 0x000f - _0807EDD4 0x0178, 0x0328 + MoveTo 0x0178, 0x0328 SetSyncFlag 0x00001000 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/minishVillage/script_ForestMinish7.inc b/data/scripts/cutscene/minishVillage/script_ForestMinish7.inc index db6366f1..a38ea170 100644 --- a/data/scripts/cutscene/minishVillage/script_ForestMinish7.inc +++ b/data/scripts/cutscene/minishVillage/script_ForestMinish7.inc @@ -9,14 +9,14 @@ SCRIPT_START script_ForestMinish7 EndBlock WaitForSyncFlagAndClear 0x00002000 DoPostScriptAction 0x0007 - _0807EDD4 0x0258, 0x0330 + MoveTo 0x0258, 0x0330 SetAnimationState 0x0006 DoPostScriptAction 0x0000 SetSyncFlag 0x00004000 WaitForSyncFlagAndClear 0x00002000 SetEntitySpeed 0x0200 DoPostScriptAction 0x000f - _0807EDD4 0x0218, 0x0340 + MoveTo 0x0218, 0x0340 DoPostScriptAction 0x0000 SetSyncFlag 0x00004000 WaitForSyncFlagAndClear 0x00002000 @@ -28,7 +28,7 @@ SCRIPT_START script_ForestMinish7 WaitForSyncFlagAndClear 0x00002000 SetEntitySpeed 0x0300 DoPostScriptAction 0x000f - _0807EDD4 0x0288, 0x02d8 + MoveTo 0x0288, 0x02d8 SetSyncFlag 0x00004000 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/minishVillage/script_ForestMinish8.inc b/data/scripts/cutscene/minishVillage/script_ForestMinish8.inc index 302f4367..b0058910 100644 --- a/data/scripts/cutscene/minishVillage/script_ForestMinish8.inc +++ b/data/scripts/cutscene/minishVillage/script_ForestMinish8.inc @@ -9,14 +9,14 @@ SCRIPT_START script_ForestMinish8 EndBlock WaitForSyncFlagAndClear 0x00008000 DoPostScriptAction 0x0007 - _0807EDD4 0x01b8, 0x0320 + MoveTo 0x01b8, 0x0320 SetAnimationState 0x0002 DoPostScriptAction 0x0000 SetSyncFlag 0x00010000 WaitForSyncFlagAndClear 0x00008000 SetEntitySpeed 0x0200 DoPostScriptAction 0x000f - _0807EDD4 0x01f8, 0x0330 + MoveTo 0x01f8, 0x0330 DoPostScriptAction 0x0000 SetSyncFlag 0x00010000 WaitForSyncFlagAndClear 0x00008000 @@ -28,7 +28,7 @@ SCRIPT_START script_ForestMinish8 WaitForSyncFlagAndClear 0x00008000 SetEntitySpeed 0x0300 DoPostScriptAction 0x000f - _0807EDD4 0x0188, 0x02d8 + MoveTo 0x0188, 0x02d8 SetSyncFlag 0x00010000 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/minishVillage/script_ForestMinish9.inc b/data/scripts/cutscene/minishVillage/script_ForestMinish9.inc index 38805f14..e07a448d 100644 --- a/data/scripts/cutscene/minishVillage/script_ForestMinish9.inc +++ b/data/scripts/cutscene/minishVillage/script_ForestMinish9.inc @@ -9,20 +9,20 @@ SCRIPT_START script_ForestMinish9 EndBlock WaitForSyncFlagAndClear 0x00020000 DoPostScriptAction 0x0007 - _0807EDD4 0x0268, 0x0338 + MoveTo 0x0268, 0x0338 SetAnimationState 0x0006 DoPostScriptAction 0x0000 SetSyncFlag 0x00040000 WaitForSyncFlagAndClear 0x00020000 SetEntitySpeed 0x0200 DoPostScriptAction 0x000f - _0807EDD4 0x0218, 0x0350 + MoveTo 0x0218, 0x0350 DoPostScriptAction 0x0000 SetSyncFlag 0x00040000 WaitForSyncFlagAndClear 0x00020000 SetEntitySpeed 0x0300 DoPostScriptAction 0x000f - _0807EDD4 0x02a8, 0x0328 + MoveTo 0x02a8, 0x0328 SetSyncFlag 0x00040000 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/minishVillage/script_PlayerAtVillageIntro.inc b/data/scripts/cutscene/minishVillage/script_PlayerAtVillageIntro.inc index 2e9cc5ce..8598a952 100644 --- a/data/scripts/cutscene/minishVillage/script_PlayerAtVillageIntro.inc +++ b/data/scripts/cutscene/minishVillage/script_PlayerAtVillageIntro.inc @@ -4,9 +4,9 @@ SCRIPT_START script_PlayerAtVillageIntro SetEntitySpeed 0x0100 EndBlock DoPostScriptAction 0x0001 - _0807EDD4 0x0208, 0x0358 + MoveTo 0x0208, 0x0358 SetEntitySpeed 0x0080 - _0807EDD4 0x0208, 0x0340 + MoveTo 0x0208, 0x0340 DoPostScriptAction 0x0000 SetSyncFlag 0x00000002 Call SetPlayerActionNormal diff --git a/data/scripts/cutscene/originStory/script_CutsceneMiscObjectDarkMagic.inc b/data/scripts/cutscene/originStory/script_CutsceneMiscObjectDarkMagic.inc index 4055742b..ecb017bb 100644 --- a/data/scripts/cutscene/originStory/script_CutsceneMiscObjectDarkMagic.inc +++ b/data/scripts/cutscene/originStory/script_CutsceneMiscObjectDarkMagic.inc @@ -8,13 +8,13 @@ SCRIPT_START script_CutsceneMiscObjectDarkMagic Wait 0x0078 PlaySound SFX_1C5 Call sub_08094B6C - _0807EDD4 0x0078, 0x00b8 + MoveTo 0x0078, 0x00b8 PlaySound SFX_1C6 Call sub_08094B80 SetSyncFlag 0x00020000 SetEntitySpeed 0x0080 WaitForSyncFlagAndClear 0x00040000 - _0807EDD4 0x0078, 0x00c8 + MoveTo 0x0078, 0x00c8 SetSyncFlag 0x00080000 WaitForSyncFlagAndClear 0x00040000 DoPostScriptAction 0x0006 diff --git a/data/scripts/cutscene/originStory/script_CutsceneMiscObjectMinishCap.inc b/data/scripts/cutscene/originStory/script_CutsceneMiscObjectMinishCap.inc index b835a4ce..9bd8a859 100644 --- a/data/scripts/cutscene/originStory/script_CutsceneMiscObjectMinishCap.inc +++ b/data/scripts/cutscene/originStory/script_CutsceneMiscObjectMinishCap.inc @@ -8,7 +8,7 @@ SCRIPT_START script_CutsceneMiscObjectMinishCap WaitForSyncFlagAndClear 0x00000080 CallWithArg CreateRepeatedSoundManager, 0x00000003 Call sub_08094B0C - _0807EDD4 0x0078, 0x0068 + MoveTo 0x0078, 0x0068 SetSyncFlag 0x00000100 WaitForSyncFlagAndClear 0x00000080 _0807EF3C -128, 0x0000 diff --git a/data/scripts/cutscene/originStory/script_EzloCapExplainingOriginStory.inc b/data/scripts/cutscene/originStory/script_EzloCapExplainingOriginStory.inc index cbdf8c8b..591e30c7 100644 --- a/data/scripts/cutscene/originStory/script_EzloCapExplainingOriginStory.inc +++ b/data/scripts/cutscene/originStory/script_EzloCapExplainingOriginStory.inc @@ -13,7 +13,7 @@ SCRIPT_START script_EzloCapExplainingOriginStory SetAnimation 0x0018 Call sub_0806D8A0 script_080153C2: - _0807EE30 + MoveTowardsTarget JumpIfNot script_080153C2 SetAnimation 0x001f StartPlayerScript script_PlayerReceivedExposition diff --git a/data/scripts/cutscene/originStory/script_MinishEzlo.inc b/data/scripts/cutscene/originStory/script_MinishEzlo.inc index 7b5e52c9..631bacb8 100644 --- a/data/scripts/cutscene/originStory/script_MinishEzlo.inc +++ b/data/scripts/cutscene/originStory/script_MinishEzlo.inc @@ -9,7 +9,7 @@ SCRIPT_START script_MinishEzlo CallWithArg sub_0806AF60, 0x00000000 WaitForSyncFlagAndClear 0x00008000 CallWithArg sub_0806AF60, 0x00000004 - _0807EDD4 0x0078, 0x00b8 + MoveTo 0x0078, 0x00b8 SetAnimationState 0x0000 CallWithArg sub_0806AF60, 0x00000000 SetSyncFlag 0x00010000 @@ -17,7 +17,7 @@ SCRIPT_START script_MinishEzlo DoPostScriptAction 0x000d SetAnimationState 0x0000 CallWithArg sub_0806AF60, 0x00000004 - _0807EDD4 0x0078, 0x00c8 + MoveTo 0x0078, 0x00c8 SetSyncFlag 0x00010000 WaitForSyncFlagAndClear 0x00008000 SetAnimationState 0x0000 diff --git a/data/scripts/cutscene/originStory/script_PlayerAtVaatisAppearance.inc b/data/scripts/cutscene/originStory/script_PlayerAtVaatisAppearance.inc index 6269f54b..5bdd4252 100644 --- a/data/scripts/cutscene/originStory/script_PlayerAtVaatisAppearance.inc +++ b/data/scripts/cutscene/originStory/script_PlayerAtVaatisAppearance.inc @@ -4,7 +4,7 @@ SCRIPT_START script_PlayerAtVaatisAppearance SetEntitySpeed 0x0080 EndBlock DoPostScriptAction 0x0001 - _0807EDD4 0x01f8, 0x00b8 + MoveTo 0x01f8, 0x00b8 SetAnimationState 0x0004 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 diff --git a/data/scripts/cutscene/originStory/script_PlayerDefeatedMoblins.inc b/data/scripts/cutscene/originStory/script_PlayerDefeatedMoblins.inc index 88e9a2fd..18c67273 100644 --- a/data/scripts/cutscene/originStory/script_PlayerDefeatedMoblins.inc +++ b/data/scripts/cutscene/originStory/script_PlayerDefeatedMoblins.inc @@ -4,7 +4,7 @@ SCRIPT_START script_PlayerDefeatedMoblins SetEntitySpeed 0x0100 EndBlock DoPostScriptAction 0x0001 - _0807EDD4 0x01f8, 0x0148 + MoveTo 0x01f8, 0x0148 SetAnimationState 0x0004 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 diff --git a/data/scripts/cutscene/originStory/script_PlayerTryToFollowVaati.inc b/data/scripts/cutscene/originStory/script_PlayerTryToFollowVaati.inc index 42f14dc0..06615df8 100644 --- a/data/scripts/cutscene/originStory/script_PlayerTryToFollowVaati.inc +++ b/data/scripts/cutscene/originStory/script_PlayerTryToFollowVaati.inc @@ -4,7 +4,7 @@ SCRIPT_START script_PlayerTryToFollowVaati SetEntitySpeed 0x0200 EndBlock DoPostScriptAction 0x0001 - _0807EDD4 0x01f8, 0x0148 + MoveTo 0x01f8, 0x0148 SetAnimationState 0x0004 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 diff --git a/data/scripts/cutscene/outro/script_CutsceneMiscObjectMinishCapOutro.inc b/data/scripts/cutscene/outro/script_CutsceneMiscObjectMinishCapOutro.inc index 6888f3eb..11974a0b 100644 --- a/data/scripts/cutscene/outro/script_CutsceneMiscObjectMinishCapOutro.inc +++ b/data/scripts/cutscene/outro/script_CutsceneMiscObjectMinishCapOutro.inc @@ -13,7 +13,7 @@ SCRIPT_START script_CutsceneMiscObjectMinishCapOutro CallWithArg sub_080960C4, script_CutsceneMiscObjectEzloDismounting SetAnimation 0x0002 Call sub_08094B0C - _0807EDD4 0x0068, 0x0088 + MoveTo 0x0068, 0x0088 Call sub_08094B80 SetSyncFlag 0x00000100 WaitForSyncFlagAndClear 0x00000008 diff --git a/data/scripts/cutscene/outro/script_EzloCapOutro.inc b/data/scripts/cutscene/outro/script_EzloCapOutro.inc index 5d0daa98..b4c39e81 100644 --- a/data/scripts/cutscene/outro/script_EzloCapOutro.inc +++ b/data/scripts/cutscene/outro/script_EzloCapOutro.inc @@ -17,7 +17,7 @@ SCRIPT_START script_EzloCapOutro ClearSyncFlag 0x00000800 CallWithArg sub_080960C4, script_CutsceneMiscObjectEzloDismounting Wait 0x003c - _0807EDD4 0x0088, 0x0068 + MoveTo 0x0088, 0x0068 Wait 0x0078 SetSyncFlag 0x00000800 PlaySound SFX_143 diff --git a/data/scripts/cutscene/outro/script_MinishEzloGoodbye.inc b/data/scripts/cutscene/outro/script_MinishEzloGoodbye.inc index abe8787a..91afc910 100644 --- a/data/scripts/cutscene/outro/script_MinishEzloGoodbye.inc +++ b/data/scripts/cutscene/outro/script_MinishEzloGoodbye.inc @@ -47,12 +47,12 @@ SCRIPT_START script_MinishEzloGoodbye SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000002 SetEntitySpeed 0x0080 - _0807EEF4 0x0000, 0xfff0 + MoveToOffset 0x0000, 0xfff0 Wait 0x003c - _0807EEF4 0x0000, 0xfff0 + MoveToOffset 0x0000, 0xfff0 SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000002 - _0807EDD4 0x0088, 0x0040 + MoveTo 0x0088, 0x0040 SetSyncFlag 0x00000004 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/outro/script_PlayerAtEzlo.inc b/data/scripts/cutscene/outro/script_PlayerAtEzlo.inc index 1959b1e5..b3d28b53 100644 --- a/data/scripts/cutscene/outro/script_PlayerAtEzlo.inc +++ b/data/scripts/cutscene/outro/script_PlayerAtEzlo.inc @@ -3,7 +3,7 @@ SCRIPT_START script_PlayerAtEzlo BeginBlock SetEntitySpeed 0x0100 EndBlock - _0807EDD4 0x0088, 0x0080 + MoveTo 0x0088, 0x0080 SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 diff --git a/data/scripts/cutscene/reveal/script_08013494.inc b/data/scripts/cutscene/reveal/script_08013494.inc index 9eb632de..d3141e52 100644 --- a/data/scripts/cutscene/reveal/script_08013494.inc +++ b/data/scripts/cutscene/reveal/script_08013494.inc @@ -8,7 +8,7 @@ SCRIPT_START script_08013494 EndBlock Wait 0x005a Call sub_08094B6C - _0807EDD4 0x0098, 0x0080 + MoveTo 0x0098, 0x0080 BeginBlock Call sub_08094B80 PlaySound SFX_1CC diff --git a/data/scripts/cutscene/reveal/script_PlayerAtPicture.inc b/data/scripts/cutscene/reveal/script_PlayerAtPicture.inc index 106508d6..d63a6fec 100644 --- a/data/scripts/cutscene/reveal/script_PlayerAtPicture.inc +++ b/data/scripts/cutscene/reveal/script_PlayerAtPicture.inc @@ -4,7 +4,7 @@ SCRIPT_START script_PlayerAtPicture SetEntitySpeed 0x0080 EndBlock DoPostScriptAction 0x0001 - _0807EDD4 0x0098, 0x0058 + MoveTo 0x0098, 0x0058 SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000002 diff --git a/data/scripts/cutscene/takeover/script_PlayerAtTakeover.inc b/data/scripts/cutscene/takeover/script_PlayerAtTakeover.inc index aea96906..2249aaad 100644 --- a/data/scripts/cutscene/takeover/script_PlayerAtTakeover.inc +++ b/data/scripts/cutscene/takeover/script_PlayerAtTakeover.inc @@ -4,7 +4,7 @@ SCRIPT_START script_PlayerAtTakeover SetEntitySpeed 0x0080 EndBlock DoPostScriptAction 0x0001 - _0807EDD4 0x0168, 0x0058 + MoveTo 0x0168, 0x0058 SetAnimationState 0x0004 DoPostScriptAction 0x0000 CallWithArg SetPlayerAnimation2, 0x000003c5 diff --git a/data/scripts/dhc/script_GuardStone2.inc b/data/scripts/dhc/script_GuardStone2.inc index 77848677..b67d32d2 100644 --- a/data/scripts/dhc/script_GuardStone2.inc +++ b/data/scripts/dhc/script_GuardStone2.inc @@ -61,10 +61,10 @@ script_0800E2AE: EndBlock SetAnimationState 0x0000 CallWithArg sub_0807F3D8, 0x00000004 - _0807EDD4 0x0088, 0x0168 + MoveTo 0x0088, 0x0168 SetAnimationState 0x0006 CallWithArg sub_0807F3D8, 0x00000004 - _0807EDD4 0x0070, 0x0168 + MoveTo 0x0070, 0x0168 FacePlayer CallWithArg sub_0807F3D8, 0x00000000 _0807E9D4 diff --git a/data/scripts/dhc/script_PlayerCastleCollapsing.inc b/data/scripts/dhc/script_PlayerCastleCollapsing.inc index 5ee0ccfe..e2a4b720 100644 --- a/data/scripts/dhc/script_PlayerCastleCollapsing.inc +++ b/data/scripts/dhc/script_PlayerCastleCollapsing.inc @@ -5,7 +5,7 @@ SCRIPT_START script_PlayerCastleCollapsing EndBlock SetAnimationState 0x0004 DoPostScriptAction 0x0000 - _0807EEF4 0x0000, 0x0080 + MoveToOffset 0x0000, 0x0080 SetSyncFlag 0x00000004 Call SetPlayerActionNormal SCRIPT_END diff --git a/data/scripts/dhc/script_PlayerCastleEscape.inc b/data/scripts/dhc/script_PlayerCastleEscape.inc index 45468213..12dffdf3 100644 --- a/data/scripts/dhc/script_PlayerCastleEscape.inc +++ b/data/scripts/dhc/script_PlayerCastleEscape.inc @@ -3,7 +3,7 @@ SCRIPT_START script_PlayerCastleEscape BeginBlock SetEntitySpeed 0x0100 EndBlock - _0807EDD4 0x0198, 0x01c8 + MoveTo 0x0198, 0x01c8 SetAnimationState 0x0004 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 diff --git a/data/scripts/dhc/script_PlayerRescuedZelda.inc b/data/scripts/dhc/script_PlayerRescuedZelda.inc index b792296a..b5dce732 100644 --- a/data/scripts/dhc/script_PlayerRescuedZelda.inc +++ b/data/scripts/dhc/script_PlayerRescuedZelda.inc @@ -4,7 +4,7 @@ SCRIPT_START script_PlayerRescuedZelda SetEntitySpeed 0x0100 EndBlock CallWithArg sub_0807F4F8, 0x000000a0 - _0807EDD4 0x0078, 0x00a0 + MoveTo 0x0078, 0x00a0 SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000004 diff --git a/data/scripts/dhc/script_PlayerV2Defeated.inc b/data/scripts/dhc/script_PlayerV2Defeated.inc index f16621e5..aae5682c 100644 --- a/data/scripts/dhc/script_PlayerV2Defeated.inc +++ b/data/scripts/dhc/script_PlayerV2Defeated.inc @@ -5,7 +5,7 @@ SCRIPT_START script_PlayerV2Defeated EndBlock WaitForSyncFlagAndClear 0x00000001 DoPostScriptAction 0x0001 - _0807EDD4 0x00a8, 0x002c + MoveTo 0x00a8, 0x002c SetSyncFlag 0x00000002 Call SetPlayerActionNormal SCRIPT_END diff --git a/data/scripts/dhc/script_ZeldaAfterDefeatingV2.inc b/data/scripts/dhc/script_ZeldaAfterDefeatingV2.inc index bad68ee4..e7e5d0f8 100644 --- a/data/scripts/dhc/script_ZeldaAfterDefeatingV2.inc +++ b/data/scripts/dhc/script_ZeldaAfterDefeatingV2.inc @@ -39,7 +39,7 @@ script_0800DCD0: SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000001 SetEntitySpeed 0x0100 - _0807EEF4 0x0000, 0x0008 + MoveToOffset 0x0000, 0x0008 SetAnimationState 0x0004 DoPostScriptAction 0x0000 Wait 0x001e @@ -64,6 +64,6 @@ script_0800DCD0: SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000001 SetEntitySpeed 0x0100 - _0807EEF4 0x0000, 0x0080 + MoveToOffset 0x0000, 0x0080 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/dhc/script_ZeldaCastleEscape.inc b/data/scripts/dhc/script_ZeldaCastleEscape.inc index f8150ad9..3647fd75 100644 --- a/data/scripts/dhc/script_ZeldaCastleEscape.inc +++ b/data/scripts/dhc/script_ZeldaCastleEscape.inc @@ -12,7 +12,7 @@ SCRIPT_START script_ZeldaCastleEscape SetEntityPositionRelative 0x0198, 0x0148 DoPostScriptAction 0x0007 EndBlock - _0807EDD4 0x0198, 0x01a8 + MoveTo 0x0198, 0x01a8 SetAnimationState 0x0004 DoPostScriptAction 0x0000 SetSyncFlag 0x00000002 diff --git a/data/scripts/fow/script_PlayerAtMazaal.inc b/data/scripts/fow/script_PlayerAtMazaal.inc index d71de158..91c4da4b 100644 --- a/data/scripts/fow/script_PlayerAtMazaal.inc +++ b/data/scripts/fow/script_PlayerAtMazaal.inc @@ -4,7 +4,7 @@ SCRIPT_START script_PlayerAtMazaal SetAnimationState 0x0000 SetEntitySpeed 0x0140 EndBlock - _0807EDD4 0x00b8, 0x0094 + MoveTo 0x00b8, 0x0094 Wait 0x0008 DoPostScriptAction 0x0000 Wait 0x0008 diff --git a/data/scripts/fow/script_PlayerDefeatedMazaal.inc b/data/scripts/fow/script_PlayerDefeatedMazaal.inc index 89fb8ba8..221c85d6 100644 --- a/data/scripts/fow/script_PlayerDefeatedMazaal.inc +++ b/data/scripts/fow/script_PlayerDefeatedMazaal.inc @@ -15,6 +15,6 @@ SCRIPT_START script_PlayerDefeatedMazaal SetAnimationState 0x0004 Wait 0x0008 SetSyncFlag 0x00000002 - _0807EDD4 0x0088, 0x0158 + MoveTo 0x0088, 0x0158 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/graveyard/script_CutsceneMiscObjectKingsGravestone.inc b/data/scripts/graveyard/script_CutsceneMiscObjectKingsGravestone.inc index 21c7d682..39ed9170 100644 --- a/data/scripts/graveyard/script_CutsceneMiscObjectKingsGravestone.inc +++ b/data/scripts/graveyard/script_CutsceneMiscObjectKingsGravestone.inc @@ -9,7 +9,7 @@ SCRIPT_START script_CutsceneMiscObjectKingsGravestone Wait 0x003c SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000004 - _0807EDD4 0x0118, 0x0060 + MoveTo 0x0118, 0x0060 SetSyncFlag 0x00000002 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/graveyard/script_KeyStealingTakkuriFirstCrow.inc b/data/scripts/graveyard/script_KeyStealingTakkuriFirstCrow.inc index 267d3ca2..5c8ba697 100644 --- a/data/scripts/graveyard/script_KeyStealingTakkuriFirstCrow.inc +++ b/data/scripts/graveyard/script_KeyStealingTakkuriFirstCrow.inc @@ -12,7 +12,7 @@ SCRIPT_START script_CameraTarget7FirstCrow script_08009816: EndBlock BeginBlock - _0807EE30 + MoveTowardsTarget JumpIfNot script_08009816 EndBlock SetSyncFlag 0x00000004 diff --git a/data/scripts/graveyard/script_PlayerAtGraveyardHouseDoor.inc b/data/scripts/graveyard/script_PlayerAtGraveyardHouseDoor.inc index 99931985..6a1f2ee4 100644 --- a/data/scripts/graveyard/script_PlayerAtGraveyardHouseDoor.inc +++ b/data/scripts/graveyard/script_PlayerAtGraveyardHouseDoor.inc @@ -2,7 +2,7 @@ SCRIPT_START script_PlayerAtGraveyardHouseDoor SetEntitySpeed 0x0080 DoPostScriptAction 0x0001 - _0807EDD4 0x01a0, 0x01b0 + MoveTo 0x01a0, 0x01b0 SetAnimationState 0x0000 DoPostScriptAction 0x0000 Wait 0x000a diff --git a/data/scripts/graveyard/script_PlayerAtKingGustav.inc b/data/scripts/graveyard/script_PlayerAtKingGustav.inc index 96b9a99e..6385c175 100644 --- a/data/scripts/graveyard/script_PlayerAtKingGustav.inc +++ b/data/scripts/graveyard/script_PlayerAtKingGustav.inc @@ -4,7 +4,7 @@ SCRIPT_START script_PlayerAtKingGustav SetEntitySpeed 0x0080 EndBlock DoPostScriptAction 0x0001 - _0807EDD4 0x0118, 0x0060 + MoveTo 0x0118, 0x0060 SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 diff --git a/data/scripts/hyruleTown/script_CafeGuy.inc b/data/scripts/hyruleTown/script_CafeGuy.inc index 751e6e01..4346d346 100644 --- a/data/scripts/hyruleTown/script_CafeGuy.inc +++ b/data/scripts/hyruleTown/script_CafeGuy.inc @@ -11,7 +11,7 @@ SCRIPT_START script_CafeGuy script_0800ECAC: SetAnimationState 0x0006 SetAnimation 0x0007 - _0807EDD4 0x0028, 0x0050 + MoveTo 0x0028, 0x0050 Wait 0x001e SetAnimationState 0x0004 SetAnimation 0x0002 @@ -21,7 +21,7 @@ script_0800ECAC: Wait 0x001e SetAnimationState 0x0002 SetAnimation 0x0005 - _0807EDD4 0x0048, 0x0050 + MoveTo 0x0048, 0x0050 Wait 0x001e SetAnimationState 0x0004 SetAnimation 0x0002 diff --git a/data/scripts/hyruleTown/script_Carlov.inc b/data/scripts/hyruleTown/script_Carlov.inc index 418511d1..d30f346f 100644 --- a/data/scripts/hyruleTown/script_Carlov.inc +++ b/data/scripts/hyruleTown/script_Carlov.inc @@ -50,7 +50,7 @@ script_080144C8: Wait 0x0018 SetRoomFlag 0x0000 SetLocalFlag 0x0092 - _0807EEF4 0x0000, -96 + MoveToOffset 0x0000, -96 Call DisablePauseMenu Jump script_080144FC script_080144F0: diff --git a/data/scripts/hyruleTown/script_GormanCats.inc b/data/scripts/hyruleTown/script_GormanCats.inc index cad4d713..8451e8bb 100644 --- a/data/scripts/hyruleTown/script_GormanCats.inc +++ b/data/scripts/hyruleTown/script_GormanCats.inc @@ -16,7 +16,7 @@ script_0800FE66: BeginBlock Call sub_08069ACC JumpIf script_0800FE7E - _0807EE30 + MoveTowardsTarget JumpIfNot script_0800FE66 Jump script_0800FE5A script_0800FE7E: diff --git a/data/scripts/hyruleTown/script_GormanSecondHouse.inc b/data/scripts/hyruleTown/script_GormanSecondHouse.inc index f223d84c..cd0a269e 100644 --- a/data/scripts/hyruleTown/script_GormanSecondHouse.inc +++ b/data/scripts/hyruleTown/script_GormanSecondHouse.inc @@ -16,7 +16,7 @@ script_0800FDEE: BeginBlock Call sub_08069ACC JumpIf script_0800FE06 - _0807EE30 + MoveTowardsTarget JumpIfNot script_0800FDEE Jump script_0800FDE2 script_0800FE06: diff --git a/data/scripts/hyruleTown/script_GuardWest.inc b/data/scripts/hyruleTown/script_GuardWest.inc index 26ad9095..fbf3ca77 100644 --- a/data/scripts/hyruleTown/script_GuardWest.inc +++ b/data/scripts/hyruleTown/script_GuardWest.inc @@ -60,7 +60,7 @@ script_08010014: SetAnimationState 0x0004 CallWithArg sub_0807F3D8, 0x0000000c SetEntitySpeed 0x0100 - _0807EDD4 0x0018, 0x0108 + MoveTo 0x0018, 0x0108 SetAnimationState 0x0002 CallWithArg sub_0807F3D8, 0x00000008 SetLocalFlag MACHI_02_HEISHI diff --git a/data/scripts/hyruleTown/script_Kid3.inc b/data/scripts/hyruleTown/script_Kid3.inc index 99f6a116..9592452b 100644 --- a/data/scripts/hyruleTown/script_Kid3.inc +++ b/data/scripts/hyruleTown/script_Kid3.inc @@ -10,37 +10,37 @@ script_08010314: CallWithArg GetRandomInt, 0x00000009 JumpTable script_08010340, script_0801034A, script_08010354, script_0801035E, script_08010368, script_08010372, script_0801037C, script_08010386, script_08010390 script_08010340: - _0807EE04 0x0358, 0x0078 + LookAt 0x0358, 0x0078 Jump script_08010396 script_0801034A: - _0807EE04 0x0390, 0x0078 + LookAt 0x0390, 0x0078 Jump script_08010396 script_08010354: - _0807EE04 0x03c8, 0x0078 + LookAt 0x03c8, 0x0078 Jump script_08010396 script_0801035E: - _0807EE04 0x0358, 0x0098 + LookAt 0x0358, 0x0098 Jump script_08010396 script_08010368: - _0807EE04 0x0390, 0x0098 + LookAt 0x0390, 0x0098 Jump script_08010396 script_08010372: - _0807EE04 0x03c8, 0x0098 + LookAt 0x03c8, 0x0098 Jump script_08010396 script_0801037C: - _0807EE04 0x0358, 0x00b8 + LookAt 0x0358, 0x00b8 Jump script_08010396 script_08010386: - _0807EE04 0x0390, 0x00b8 + LookAt 0x0390, 0x00b8 Jump script_08010396 script_08010390: - _0807EE04 0x03c8, 0x00b8 + LookAt 0x03c8, 0x00b8 script_08010396: EndBlock BeginBlock Call sub_080626C0 JumpIf script_08010314 - _0807EE30 + MoveTowardsTarget JumpIfNot script_08010396 Jump script_08010314 .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_KidInn.inc b/data/scripts/hyruleTown/script_KidInn.inc index 43a709a2..e33b7daa 100644 --- a/data/scripts/hyruleTown/script_KidInn.inc +++ b/data/scripts/hyruleTown/script_KidInn.inc @@ -11,22 +11,22 @@ script_0800D5AC: CallWithArg GetRandomInt, 0x00000004 JumpTable script_0800D5CE, script_0800D5D8, script_0800D5E2, script_0800D5EC script_0800D5CE: - _0807EE04 0x0038, 0x0098 + LookAt 0x0038, 0x0098 Jump script_0800D5F2 script_0800D5D8: - _0807EE04 0x0058, 0x0098 + LookAt 0x0058, 0x0098 Jump script_0800D5F2 script_0800D5E2: - _0807EE04 0x0038, 0x00c8 + LookAt 0x0038, 0x00c8 Jump script_0800D5F2 script_0800D5EC: - _0807EE04 0x0058, 0x00c8 + LookAt 0x0058, 0x00c8 script_0800D5F2: EndBlock BeginBlock Call sub_080626C0 JumpIf script_0800D5AC - _0807EE30 + MoveTowardsTarget JumpIfNot script_0800D5F2 Jump script_0800D5AC .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_PlayerAtCarlov.inc b/data/scripts/hyruleTown/script_PlayerAtCarlov.inc index 1b37c9d3..d93ecabd 100644 --- a/data/scripts/hyruleTown/script_PlayerAtCarlov.inc +++ b/data/scripts/hyruleTown/script_PlayerAtCarlov.inc @@ -3,7 +3,7 @@ SCRIPT_START script_PlayerAtCarlov EndBlock WaitForSyncFlagAndClear 0x00000002 SetEntitySpeed 0x00e0 - _0807EDD4 0x0078, 0x0068 + MoveTo 0x0078, 0x0068 DoPostScriptAction 0x0000 Wait 0x0010 SetSyncFlag 0x00000001 diff --git a/data/scripts/hyruleTown/script_PlayerAtRem.inc b/data/scripts/hyruleTown/script_PlayerAtRem.inc index 3dab6b77..c241c0ec 100644 --- a/data/scripts/hyruleTown/script_PlayerAtRem.inc +++ b/data/scripts/hyruleTown/script_PlayerAtRem.inc @@ -4,7 +4,7 @@ SCRIPT_START script_PlayerAtRem SetAnimationState 0x0006 SetEntitySpeed 0x0140 EndBlock - _0807EDD4 0x00a8, 0x0060 + MoveTo 0x00a8, 0x0060 Wait 0x0008 DoPostScriptAction 0x0000 Wait 0x0008 diff --git a/data/scripts/hyruleTown/script_PlayerStepOnTrap.inc b/data/scripts/hyruleTown/script_PlayerStepOnTrap.inc index bc6ae225..49a6425f 100644 --- a/data/scripts/hyruleTown/script_PlayerStepOnTrap.inc +++ b/data/scripts/hyruleTown/script_PlayerStepOnTrap.inc @@ -5,7 +5,7 @@ SCRIPT_START script_PlayerStepOnTrap SetEntitySpeed 0x0100 EndBlock DoPostScriptAction 0x0001 - _0807EDD4 0x0078, 0x0080 + MoveTo 0x0078, 0x0080 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 Call SetPlayerActionNormal diff --git a/data/scripts/hyruleTown/script_PlayerWhenLeavingCarlovAlreadyPaid.inc b/data/scripts/hyruleTown/script_PlayerWhenLeavingCarlovAlreadyPaid.inc index 9e17ee23..59813b25 100644 --- a/data/scripts/hyruleTown/script_PlayerWhenLeavingCarlovAlreadyPaid.inc +++ b/data/scripts/hyruleTown/script_PlayerWhenLeavingCarlovAlreadyPaid.inc @@ -3,7 +3,7 @@ SCRIPT_START script_PlayerWhenLeavingCarlovAlreadyPaid EndBlock WaitForSyncFlagAndClear 0x00000001 SetEntitySpeed 0x00e0 - _0807EDD4 0x0078, 0x0078 + MoveTo 0x0078, 0x0078 DoPostScriptAction 0x0000 Wait 0x0010 SetSyncFlag 0x00000002 diff --git a/data/scripts/hyruleTown/script_Postman.inc b/data/scripts/hyruleTown/script_Postman.inc index 1aff3231..3c531a62 100644 --- a/data/scripts/hyruleTown/script_Postman.inc +++ b/data/scripts/hyruleTown/script_Postman.inc @@ -25,7 +25,7 @@ script_08010B22: CallWithArg sub_080608E4, 0x00000000 JumpIf script_08010B44 script_08010B3A: - _0807EE30 + MoveTowardsTarget JumpIfNot script_08010B22 Jump script_08010B10 script_08010B44: diff --git a/data/scripts/hyruleTown/script_SturgeonAllBooksCollected.inc b/data/scripts/hyruleTown/script_SturgeonAllBooksCollected.inc index d3b1b690..bebab8d5 100644 --- a/data/scripts/hyruleTown/script_SturgeonAllBooksCollected.inc +++ b/data/scripts/hyruleTown/script_SturgeonAllBooksCollected.inc @@ -13,26 +13,26 @@ SCRIPT_START script_SturgeonAllBooksCollected WaitUntilTextboxCloses DoPostScriptAction 0x0007 Call sub_08064D08 - _0807EDD4 0x0068, 0x0078 + MoveTo 0x0068, 0x0078 Call sub_08064D10 Wait 0x000f SetAnimationState 0x0002 Wait 0x000f Call sub_08064D08 - _0807EDD4 0x0098, 0x0078 + MoveTo 0x0098, 0x0078 Call sub_08064D10 Wait 0x000f SetAnimationState 0x0004 PlaySound SFX_PLY_LIFT Wait 0x000f SetAnimationState 0x0002 - _0807EDD4 0x00ac, 0x0078 + MoveTo 0x00ac, 0x0078 Wait 0x000f SetAnimationState 0x0004 PlaySound SFX_PLY_LIFT Wait 0x000f SetAnimationState 0x0002 - _0807EDD4 0x00c0, 0x0078 + MoveTo 0x00c0, 0x0078 Wait 0x000f SetAnimationState 0x0004 PlaySound SFX_PLY_LIFT @@ -40,13 +40,13 @@ SCRIPT_START script_SturgeonAllBooksCollected SetAnimationState 0x0006 Wait 0x001e Call sub_08064D08 - _0807EDD4 0x0068, 0x0078 + MoveTo 0x0068, 0x0078 Call sub_08064D10 Wait 0x000f SetAnimationState 0x0000 Wait 0x000f Call sub_08064D08 - _0807EDD4 0x0068, 0x0018 + MoveTo 0x0068, 0x0018 Call sub_08064D10 PlaySound SFX_STAIRS SetSyncFlag 0x00000001 diff --git a/data/scripts/hyruleTown/script_TownMinish3.inc b/data/scripts/hyruleTown/script_TownMinish3.inc index 3edddfec..51d7093e 100644 --- a/data/scripts/hyruleTown/script_TownMinish3.inc +++ b/data/scripts/hyruleTown/script_TownMinish3.inc @@ -35,12 +35,12 @@ script_0800E7BA: SetAnimationState 0x0002 CallWithArg sub_0806AF60, 0x00000004 Call sub_0806AF70 - _0807EE04 0x0188, 0x0058 + LookAt 0x0188, 0x0058 script_0800E7D8: EndBlock BeginBlock Call sub_0806AF78 - _0807EE30 + MoveTowardsTarget JumpIfNot script_0800E7D8 EntityHasHeight JumpIf script_0800E7D8 diff --git a/data/scripts/hyruleTown/script_TownMinish6.inc b/data/scripts/hyruleTown/script_TownMinish6.inc index c02ceb81..a897e7e5 100644 --- a/data/scripts/hyruleTown/script_TownMinish6.inc +++ b/data/scripts/hyruleTown/script_TownMinish6.inc @@ -21,7 +21,7 @@ script_0800EFFE: Wait 0x0004 SetAnimationState 0x0002 CallWithArg sub_0806AF60, 0x00000004 - _0807EDD4 0x0088, 0x0040 + MoveTo 0x0088, 0x0040 DoPostScriptAction 0x000a SetAnimationState 0x0002 CallWithArg sub_0806AF60, 0x00000008 @@ -34,7 +34,7 @@ script_0800EFFE: Wait 0x0004 SetAnimationState 0x0006 CallWithArg sub_0806AF60, 0x00000004 - _0807EDD4 0x0068, 0x0040 + MoveTo 0x0068, 0x0040 DoPostScriptAction 0x000a CheckLocalFlag 0x007b JumpIf script_0800F082 diff --git a/data/scripts/kinstoneFusion/script_BigGoronKinstone4.inc b/data/scripts/kinstoneFusion/script_BigGoronKinstone4.inc index 592035a3..c9385e0c 100644 --- a/data/scripts/kinstoneFusion/script_BigGoronKinstone4.inc +++ b/data/scripts/kinstoneFusion/script_BigGoronKinstone4.inc @@ -1,10 +1,10 @@ @ BigGoron Kinstone cutscene 4 SCRIPT_START script_BigGoronKinstone4 - _0807EEF4 0xfff8, 0x0000 - _0807EEF4 0x0010, 0x0000 - _0807EEF4 0xfff0, 0x0000 - _0807EEF4 0x0010, 0x0000 - _0807EEF4 0xfff8, 0x0000 + MoveToOffset 0xfff8, 0x0000 + MoveToOffset 0x0010, 0x0000 + MoveToOffset 0xfff0, 0x0000 + MoveToOffset 0x0010, 0x0000 + MoveToOffset 0xfff8, 0x0000 _0807F0C8 0x0000, 0x0000 Wait 0x001e MessageNoOverlap TEXT_GORONS, 0x00 diff --git a/data/scripts/kinstoneFusion/script_BigGoronKinstone5.inc b/data/scripts/kinstoneFusion/script_BigGoronKinstone5.inc index 4bd86b55..117294d4 100644 --- a/data/scripts/kinstoneFusion/script_BigGoronKinstone5.inc +++ b/data/scripts/kinstoneFusion/script_BigGoronKinstone5.inc @@ -1,7 +1,7 @@ @ BigGoron Kinstone Cutscene 5 SCRIPT_START script_BigGoronKinstone5 SetEntitySpeed 0x0080 - _0807EEF4 0x0000, -208 + MoveToOffset 0x0000, -208 _0807F0C8 0x0000, 0x0000 Wait 0x00b4 Call sub_08054968 diff --git a/data/scripts/kinstoneFusion/script_GormanFirstAppearance.inc b/data/scripts/kinstoneFusion/script_GormanFirstAppearance.inc index 70417b22..b47146bd 100644 --- a/data/scripts/kinstoneFusion/script_GormanFirstAppearance.inc +++ b/data/scripts/kinstoneFusion/script_GormanFirstAppearance.inc @@ -9,13 +9,13 @@ SCRIPT_START script_GormanFirstAppearance script_0800BA8E: CheckRoomFlag 0x00ff JumpIfNot script_0800BA8E - _0807EDD4 0x02f8, 0x0350 + MoveTo 0x02f8, 0x0350 Wait 0x001e DoPostScriptAction 0x0004 Wait 0x003c SetAnimationState 0x0006 Wait 0x001e - _0807EDD4 0x02f0, 0x0350 + MoveTo 0x02f0, 0x0350 Wait 0x001e MessageNoOverlap TEXT_KINSTONE, 0x00 WaitUntilTextboxCloses diff --git a/data/scripts/kinstoneFusion/script_Goron1Kinstone2.inc b/data/scripts/kinstoneFusion/script_Goron1Kinstone2.inc index 87ce4e77..b6b03859 100644 --- a/data/scripts/kinstoneFusion/script_Goron1Kinstone2.inc +++ b/data/scripts/kinstoneFusion/script_Goron1Kinstone2.inc @@ -34,5 +34,5 @@ script_0800BD1C: SetAnimationState 0x0002 WaitForSyncFlagAndClear 0x00000004 SetEntitySpeed 0x0080 - _0807EEF4 0x0000, -32 + MoveToOffset 0x0000, -32 SCRIPT_END diff --git a/data/scripts/kinstoneFusion/script_Goron2Kinstone2.inc b/data/scripts/kinstoneFusion/script_Goron2Kinstone2.inc index 226eb90c..282e9164 100644 --- a/data/scripts/kinstoneFusion/script_Goron2Kinstone2.inc +++ b/data/scripts/kinstoneFusion/script_Goron2Kinstone2.inc @@ -16,7 +16,7 @@ SCRIPT_START script_Goron2Kinstone2 SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000002 SetEntitySpeed 0x0100 - _0807EDD4 0x0088, 0x0228 + MoveTo 0x0088, 0x0228 Wait 0x000f SetSyncFlag 0x00000004 DoPostScriptAction 0x000f @@ -31,6 +31,6 @@ SCRIPT_START script_Goron2Kinstone2 SetAnimationState 0x0006 SetSyncFlag 0x00000004 SetEntitySpeed 0x0080 - _0807EEF4 0x0000, -32 + MoveToOffset 0x0000, -32 Call sub_08054968 SCRIPT_END diff --git a/data/scripts/kinstoneFusion/script_Goron2Kinstone4.inc b/data/scripts/kinstoneFusion/script_Goron2Kinstone4.inc index b65e77f2..11b910ec 100644 --- a/data/scripts/kinstoneFusion/script_Goron2Kinstone4.inc +++ b/data/scripts/kinstoneFusion/script_Goron2Kinstone4.inc @@ -36,5 +36,5 @@ script_0800BFA8: Wait 0x003c Call sub_08054F64 SetEntitySpeed 0x0080 - _0807EEF4 0x0000, -32 + MoveToOffset 0x0000, -32 SCRIPT_END diff --git a/data/scripts/kinstoneFusion/script_Goron2Kinstone6.inc b/data/scripts/kinstoneFusion/script_Goron2Kinstone6.inc index 62165e7f..fc5550a9 100644 --- a/data/scripts/kinstoneFusion/script_Goron2Kinstone6.inc +++ b/data/scripts/kinstoneFusion/script_Goron2Kinstone6.inc @@ -36,5 +36,5 @@ script_0800C248: Wait 0x003c Call sub_08054F64 SetEntitySpeed 0x0080 - _0807EEF4 0x0000, -32 + MoveToOffset 0x0000, -32 SCRIPT_END diff --git a/data/scripts/kinstoneFusion/script_Goron3Kinstone3.inc b/data/scripts/kinstoneFusion/script_Goron3Kinstone3.inc index 14f1657f..45505c7d 100644 --- a/data/scripts/kinstoneFusion/script_Goron3Kinstone3.inc +++ b/data/scripts/kinstoneFusion/script_Goron3Kinstone3.inc @@ -16,7 +16,7 @@ SCRIPT_START script_Goron3Kinstone3 SetSyncFlag 0x0000000c WaitForSyncFlagAndClear 0x00000002 SetEntitySpeed 0x0100 - _0807EDD4 0x0088, 0x0178 + MoveTo 0x0088, 0x0178 Wait 0x000f SetSyncFlag 0x0000000c DoPostScriptAction 0x000f diff --git a/data/scripts/kinstoneFusion/script_Goron4Kinstone4.inc b/data/scripts/kinstoneFusion/script_Goron4Kinstone4.inc index 3a632fca..da2cc67c 100644 --- a/data/scripts/kinstoneFusion/script_Goron4Kinstone4.inc +++ b/data/scripts/kinstoneFusion/script_Goron4Kinstone4.inc @@ -16,9 +16,9 @@ SCRIPT_START script_Goron4Kinstone4 SetSyncFlag 0x0000001c WaitForSyncFlagAndClear 0x00000002 SetEntitySpeed 0x0100 - _0807EDD4 0x0088, 0x0188 - _0807EDD4 0x00a8, 0x0188 - _0807EDD4 0x00a8, 0x0178 + MoveTo 0x0088, 0x0188 + MoveTo 0x00a8, 0x0188 + MoveTo 0x00a8, 0x0178 Wait 0x000f SetSyncFlag 0x0000001c DoPostScriptAction 0x000f @@ -32,6 +32,6 @@ SCRIPT_START script_Goron4Kinstone4 Wait 0x003c SetSyncFlag 0x0000001c SetEntitySpeed 0x0080 - _0807EEF4 0x0000, -32 + MoveToOffset 0x0000, -32 Call sub_08054968 SCRIPT_END diff --git a/data/scripts/kinstoneFusion/script_Goron5Kinstone5.inc b/data/scripts/kinstoneFusion/script_Goron5Kinstone5.inc index 78e04c52..2f051b60 100644 --- a/data/scripts/kinstoneFusion/script_Goron5Kinstone5.inc +++ b/data/scripts/kinstoneFusion/script_Goron5Kinstone5.inc @@ -16,9 +16,9 @@ SCRIPT_START script_Goron5Kinstone5 SetSyncFlag 0x0000003c WaitForSyncFlagAndClear 0x00000002 SetEntitySpeed 0x0100 - _0807EDD4 0x0098, 0x00e8 - _0807EDD4 0x00a8, 0x00e8 - _0807EDD4 0x00a8, 0x00d8 + MoveTo 0x0098, 0x00e8 + MoveTo 0x00a8, 0x00e8 + MoveTo 0x00a8, 0x00d8 Wait 0x000f SetSyncFlag 0x0000003c DoPostScriptAction 0x000f diff --git a/data/scripts/kinstoneFusion/script_Goron6Kindstone6.inc b/data/scripts/kinstoneFusion/script_Goron6Kindstone6.inc index 4eaed958..900cc470 100644 --- a/data/scripts/kinstoneFusion/script_Goron6Kindstone6.inc +++ b/data/scripts/kinstoneFusion/script_Goron6Kindstone6.inc @@ -16,9 +16,9 @@ SCRIPT_START script_Goron6Kindstone6 SetSyncFlag 0x0000007c WaitForSyncFlagAndClear 0x00000002 SetEntitySpeed 0x0100 - _0807EDD4 0x0098, 0x00e8 - _0807EDD4 0x00c8, 0x00e8 - _0807EDD4 0x00c8, 0x00d8 + MoveTo 0x0098, 0x00e8 + MoveTo 0x00c8, 0x00e8 + MoveTo 0x00c8, 0x00d8 Wait 0x000f SetSyncFlag 0x0000007c DoPostScriptAction 0x000f @@ -32,6 +32,6 @@ SCRIPT_START script_Goron6Kindstone6 Wait 0x003c SetSyncFlag 0x0000007c SetEntitySpeed 0x0080 - _0807EEF4 0x0000, -32 + MoveToOffset 0x0000, -32 Call sub_08054968 SCRIPT_END diff --git a/data/scripts/kinstoneFusion/script_GoronMerchantArriving.inc b/data/scripts/kinstoneFusion/script_GoronMerchantArriving.inc index b5385222..bc8b2b0f 100644 --- a/data/scripts/kinstoneFusion/script_GoronMerchantArriving.inc +++ b/data/scripts/kinstoneFusion/script_GoronMerchantArriving.inc @@ -9,11 +9,11 @@ SCRIPT_START script_GoronMerchantArriving script_0800BB7A: CheckRoomFlag 0x00ff JumpIfNot script_0800BB7A - _0807EDD4 0x03a0, 0x00f8 + MoveTo 0x03a0, 0x00f8 Wait 0x001e MessageNoOverlap TEXT_KINSTONE, 0x06 WaitUntilTextboxCloses Wait 0x000f - _0807EDD4 0x0380, 0x00f8 + MoveTo 0x0380, 0x00f8 Call sub_08054968 SCRIPT_END diff --git a/data/scripts/kinstoneFusion/script_KinstoneSparkKinstoneSpark.inc b/data/scripts/kinstoneFusion/script_KinstoneSparkKinstoneSpark.inc index 944bc020..070a8685 100644 --- a/data/scripts/kinstoneFusion/script_KinstoneSparkKinstoneSpark.inc +++ b/data/scripts/kinstoneFusion/script_KinstoneSparkKinstoneSpark.inc @@ -9,7 +9,7 @@ SCRIPT_START script_KinstoneSparkKinstoneSpark DoPostScriptAction 0x0007 PlaySound SFX_136 script_0800C47A: - _0807EE30 + MoveTowardsTarget JumpIfNot script_0800C47A Wait 0x003c SetRoomFlag 0x00ff diff --git a/data/scripts/kinstoneFusion/script_KinstoneSparkKinstoneSparkFromBottom.inc b/data/scripts/kinstoneFusion/script_KinstoneSparkKinstoneSparkFromBottom.inc index cd7f7c5e..2bf2003a 100644 --- a/data/scripts/kinstoneFusion/script_KinstoneSparkKinstoneSparkFromBottom.inc +++ b/data/scripts/kinstoneFusion/script_KinstoneSparkKinstoneSparkFromBottom.inc @@ -7,9 +7,9 @@ SCRIPT_START script_KinstoneSparkKinstoneSparkFromBottom Wait 0x000a DoPostScriptAction 0x0007 PlaySound SFX_136 - _0807EEF4 0x0000, -112 + MoveToOffset 0x0000, -112 Wait 0x001e - _0807EEF4 0x0000, -80 + MoveToOffset 0x0000, -80 Wait 0x003c SetRoomFlag 0x00ff SetAnimation 0x0005 diff --git a/data/scripts/kinstoneFusion/script_KinstoneSparkKinstoneSparkGoron.inc b/data/scripts/kinstoneFusion/script_KinstoneSparkKinstoneSparkGoron.inc index 21d715b9..0cab3d53 100644 --- a/data/scripts/kinstoneFusion/script_KinstoneSparkKinstoneSparkGoron.inc +++ b/data/scripts/kinstoneFusion/script_KinstoneSparkKinstoneSparkGoron.inc @@ -10,9 +10,9 @@ SCRIPT_START script_KinstoneSparkKinstoneSparkGoron Wait 0x000a DoPostScriptAction 0x0007 PlaySound SFX_136 - _0807EEF4 0x0000, 0x0060 + MoveToOffset 0x0000, 0x0060 Wait 0x003c - _0807EEF4 0x0000, 0x0060 + MoveToOffset 0x0000, 0x0060 Wait 0x001e SetRoomFlag 0x00ff SetAnimation 0x0005 diff --git a/data/scripts/kinstoneFusion/script_KinstoneSparkKinstoneSparkGoronMerchang.inc b/data/scripts/kinstoneFusion/script_KinstoneSparkKinstoneSparkGoronMerchang.inc index 3a9aada3..442079e0 100644 --- a/data/scripts/kinstoneFusion/script_KinstoneSparkKinstoneSparkGoronMerchang.inc +++ b/data/scripts/kinstoneFusion/script_KinstoneSparkKinstoneSparkGoronMerchang.inc @@ -8,9 +8,9 @@ SCRIPT_START script_KinstoneSparkKinstoneSparkGoronMerchang Wait 0x000a DoPostScriptAction 0x0007 PlaySound SFX_136 - _0807EEF4 0x00c0, 0x0000 + MoveToOffset 0x00c0, 0x0000 Wait 0x001e - _0807EEF4 0x0070, 0x0000 + MoveToOffset 0x0070, 0x0000 Wait 0x003c SetRoomFlag 0x00ff SetAnimation 0x0005 diff --git a/data/scripts/lakeHylia/script_ShopwellsDog.inc b/data/scripts/lakeHylia/script_ShopwellsDog.inc index eaa7c31e..9a165e75 100644 --- a/data/scripts/lakeHylia/script_ShopwellsDog.inc +++ b/data/scripts/lakeHylia/script_ShopwellsDog.inc @@ -6,7 +6,7 @@ SCRIPT_START script_ShopwellsDog EndBlock Wait 0x001e PlaySound SFX_VO_DOG - _0807EDD4 0x008a, 0x005a + MoveTo 0x008a, 0x005a Wait 0x000a Call sub_08069EE8 SCRIPT_END diff --git a/data/scripts/lonLonRanch/script_MalonLostKey.inc b/data/scripts/lonLonRanch/script_MalonLostKey.inc index 951b43ae..6646d6c0 100644 --- a/data/scripts/lonLonRanch/script_MalonLostKey.inc +++ b/data/scripts/lonLonRanch/script_MalonLostKey.inc @@ -26,12 +26,12 @@ script_0800B4D4: script_0800B4F0: EndBlock ClearSyncFlag 0x00000008 - _0807EDD4 0x0134, 0x0288 + MoveTo 0x0134, 0x0288 SetAnimationState 0x0004 WaitForSyncFlagAndClear 0x00000008 MessageFromTarget TEXT_LON_LON, 0x16 WaitUntilTextboxCloses - _0807EDD4 0x0158, 0x0288 + MoveTo 0x0158, 0x0288 DoPostScriptAction 0x0000 SetAnimationState 0x0000 Wait 0x000a diff --git a/data/scripts/lonLonRanch/script_PlayerGiveKey.inc b/data/scripts/lonLonRanch/script_PlayerGiveKey.inc index 5ca5f8f0..ba2c47e0 100644 --- a/data/scripts/lonLonRanch/script_PlayerGiveKey.inc +++ b/data/scripts/lonLonRanch/script_PlayerGiveKey.inc @@ -3,7 +3,7 @@ SCRIPT_START script_PlayerGiveKey BeginBlock SetEntitySpeed 0x0100 EndBlock - _0807EDD4 0x0128, 0x0298 + MoveTo 0x0128, 0x0298 Wait 0x000a SetAnimationState 0x0002 DoPostScriptAction 0x0000 diff --git a/data/scripts/lonLonRanch/script_TalonGotKey.inc b/data/scripts/lonLonRanch/script_TalonGotKey.inc index 7cb713e4..2d95cd9b 100644 --- a/data/scripts/lonLonRanch/script_TalonGotKey.inc +++ b/data/scripts/lonLonRanch/script_TalonGotKey.inc @@ -11,7 +11,7 @@ SCRIPT_START script_TalonGotKey DoPostScriptAction 0x0004 SetSyncFlag 0x00000008 StartPlayerScript script_PlayerGiveKey - _0807EDD4 0x0140, 0x0298 + MoveTo 0x0140, 0x0298 FacePlayer WaitForSyncFlagAndClear 0x00000004 FacePlayer @@ -23,12 +23,12 @@ SCRIPT_START script_TalonGotKey MessageFromTarget TEXT_LON_LON, 0x0c WaitUntilTextboxCloses Wait 0x0014 - _0807EDD4 0x0158, 0x0290 + MoveTo 0x0158, 0x0290 Wait 0x000a - _0807EDD4 0x0158, 0x0288 + MoveTo 0x0158, 0x0288 Wait 0x0014 SetSyncFlag 0x00000010 - _0807EDD4 0x0158, 0x0280 + MoveTo 0x0158, 0x0280 Wait 0x000a DoPostScriptAction 0x0008 SetSyncFlag 0x00000010 diff --git a/data/scripts/lonLonRanch/script_TalonLostKey.inc b/data/scripts/lonLonRanch/script_TalonLostKey.inc index 0a5463c6..9500c940 100644 --- a/data/scripts/lonLonRanch/script_TalonLostKey.inc +++ b/data/scripts/lonLonRanch/script_TalonLostKey.inc @@ -9,14 +9,14 @@ SCRIPT_START script_TalonLostKey SetIntVariable 0x0000200a EndBlock script_0800B3C4: - _0807EDD4 0x0158, 0x0290 + MoveTo 0x0158, 0x0290 Call sub_08065780 Call sub_08065780 Call sub_08065780 Call sub_08065780 Call sub_08065780 Call sub_08065780 - _0807EDD4 0x0128, 0x0290 + MoveTo 0x0128, 0x0290 Call sub_08065780 Call sub_08065780 Call sub_08065780 diff --git a/data/scripts/minishWoods/script_Gentari.inc b/data/scripts/minishWoods/script_Gentari.inc index 0a534bc4..50205186 100644 --- a/data/scripts/minishWoods/script_Gentari.inc +++ b/data/scripts/minishWoods/script_Gentari.inc @@ -57,7 +57,7 @@ script_0800C824: MessageFromTarget TEXT_FINDING_EZLO, 0x35 WaitUntilTextboxCloses SetEntitySpeed 0x0040 - _0807EDD4 0x0038, 0x0044 + MoveTo 0x0038, 0x0044 DoPostScriptAction 0x0000 Wait 0x000f SetLocalFlag 0x0083 diff --git a/data/scripts/minishWoods/script_PlayerAtBombMinish.inc b/data/scripts/minishWoods/script_PlayerAtBombMinish.inc index 89e06331..5c7e43fe 100644 --- a/data/scripts/minishWoods/script_PlayerAtBombMinish.inc +++ b/data/scripts/minishWoods/script_PlayerAtBombMinish.inc @@ -4,7 +4,7 @@ SCRIPT_START script_PlayerAtBombMinish SetEntitySpeed 0x0100 EndBlock WalkSouth 0x0010 - _0807EDD4 0x0078, 0x0060 + MoveTo 0x0078, 0x0060 SetAnimationState 0x0000 Wait 0x000f DoPostScriptAction 0x0000 diff --git a/data/scripts/minishWoods/script_PlayerAtFestari.inc b/data/scripts/minishWoods/script_PlayerAtFestari.inc index ac2f94c3..45220e22 100644 --- a/data/scripts/minishWoods/script_PlayerAtFestari.inc +++ b/data/scripts/minishWoods/script_PlayerAtFestari.inc @@ -3,7 +3,7 @@ SCRIPT_START script_PlayerAtFestari BeginBlock SetEntitySpeed 0x0100 EndBlock - _0807EDD4 0x00e8, 0x0068 + MoveTo 0x00e8, 0x0068 SetAnimationState 0x0000 Wait 0x000f DoPostScriptAction 0x0000 diff --git a/data/scripts/minishWoods/script_PlayerAtGentari.inc b/data/scripts/minishWoods/script_PlayerAtGentari.inc index 0804180c..16d1aca2 100644 --- a/data/scripts/minishWoods/script_PlayerAtGentari.inc +++ b/data/scripts/minishWoods/script_PlayerAtGentari.inc @@ -4,7 +4,7 @@ SCRIPT_START script_PlayerAtGentari SetEntitySpeed 0x0100 EndBlock WalkSouth 0x0010 - _0807EDD4 0x0078, 0x0058 + MoveTo 0x0078, 0x0058 SetAnimationState 0x0000 Wait 0x000f DoPostScriptAction 0x0000 diff --git a/data/scripts/mtCrenel/script_MountainMinish4.inc b/data/scripts/mtCrenel/script_MountainMinish4.inc index f1689e97..d42891a8 100644 --- a/data/scripts/mtCrenel/script_MountainMinish4.inc +++ b/data/scripts/mtCrenel/script_MountainMinish4.inc @@ -30,7 +30,7 @@ script_0800D372: script_0800D3B2: SetAnimationState 0x0002 SetAnimation 0x0005 - _0807EDD4 0x00a0, 0x0130 + MoveTo 0x00a0, 0x0130 SetAnimationState 0x0006 SetAnimation 0x0003 SetIntVariable 0x00000004 diff --git a/data/scripts/mtCrenel/script_MountainMinish5.inc b/data/scripts/mtCrenel/script_MountainMinish5.inc index edbf2f01..c1a52532 100644 --- a/data/scripts/mtCrenel/script_MountainMinish5.inc +++ b/data/scripts/mtCrenel/script_MountainMinish5.inc @@ -21,7 +21,7 @@ script_0800D426: SetAnimationState 0x0006 SetIntVariable 0x00000004 Call sub_0806AF60 - _0807EDD4 0x00a8, 0x01e8 + MoveTo 0x00a8, 0x01e8 SetAnimationState 0x0006 SetIntVariable 0x00000000 Call sub_0806AF60 @@ -37,7 +37,7 @@ script_0800D426: SetAnimationState 0x0002 SetIntVariable 0x00000004 Call sub_0806AF60 - _0807EDD4 0x0228, 0x01e8 + MoveTo 0x0228, 0x01e8 Jump script_0800D426 .2byte 0x0000 BeginBlock @@ -52,31 +52,31 @@ script_0800D4E4: CallWithArg GetRandomInt, 0x00000009 JumpTable script_0800D510, script_0800D51A, script_0800D524, script_0800D52E, script_0800D538, script_0800D542, script_0800D54C, script_0800D556, script_0800D560 script_0800D510: - _0807EE04 0x0038, 0x0068 + LookAt 0x0038, 0x0068 Jump script_0800D566 script_0800D51A: - _0807EE04 0x0078, 0x0068 + LookAt 0x0078, 0x0068 Jump script_0800D566 script_0800D524: - _0807EE04 0x00b8, 0x0068 + LookAt 0x00b8, 0x0068 Jump script_0800D566 script_0800D52E: - _0807EE04 0x0038, 0x0090 + LookAt 0x0038, 0x0090 Jump script_0800D566 script_0800D538: - _0807EE04 0x0078, 0x0090 + LookAt 0x0078, 0x0090 Jump script_0800D566 script_0800D542: - _0807EE04 0x00b8, 0x0090 + LookAt 0x00b8, 0x0090 Jump script_0800D566 script_0800D54C: - _0807EE04 0x0038, 0x00b8 + LookAt 0x0038, 0x00b8 Jump script_0800D566 script_0800D556: - _0807EE04 0x0078, 0x00b8 + LookAt 0x0078, 0x00b8 Jump script_0800D566 script_0800D560: - _0807EE04 0x00b8, 0x00b8 + LookAt 0x00b8, 0x00b8 script_0800D566: EndBlock BeginBlock @@ -84,7 +84,7 @@ script_0800D566: JumpIf script_0800D4E4 CheckEntityInteractType JumpIf script_0800D584 - _0807EE30 + MoveTowardsTarget JumpIfNot script_0800D566 Jump script_0800D4E4 script_0800D584: diff --git a/data/scripts/mtCrenel/script_PlayerAtMelari.inc b/data/scripts/mtCrenel/script_PlayerAtMelari.inc index b4560caa..3241a3ee 100644 --- a/data/scripts/mtCrenel/script_PlayerAtMelari.inc +++ b/data/scripts/mtCrenel/script_PlayerAtMelari.inc @@ -3,7 +3,7 @@ SCRIPT_START script_PlayerAtMelari BeginBlock SetEntitySpeed 0x0100 EndBlock - _0807EDD4 0x0170, 0x0140 + MoveTo 0x0170, 0x0140 SetAnimationState 0x0002 DoPostScriptAction 0x0000 SetSyncFlag 0x00000008 diff --git a/data/scripts/mtCrenel/script_PlayerPlaceBrokenSword.inc b/data/scripts/mtCrenel/script_PlayerPlaceBrokenSword.inc index fad1fc4f..aaca4421 100644 --- a/data/scripts/mtCrenel/script_PlayerPlaceBrokenSword.inc +++ b/data/scripts/mtCrenel/script_PlayerPlaceBrokenSword.inc @@ -3,8 +3,8 @@ SCRIPT_START script_PlayerPlaceBrokenSword BeginBlock SetEntitySpeed 0x0100 EndBlock - _0807EDD4 0x0170, 0x0120 - _0807EDD4 0x01a8, 0x0120 + MoveTo 0x0170, 0x0120 + MoveTo 0x01a8, 0x0120 SetAnimationState 0x0004 DoPostScriptAction 0x0000 SetSyncFlag 0x00000008 diff --git a/data/scripts/northHyruleField/script_CutsceneOrchestratorFixBridge.inc b/data/scripts/northHyruleField/script_CutsceneOrchestratorFixBridge.inc index 4d285787..3fc1ff44 100644 --- a/data/scripts/northHyruleField/script_CutsceneOrchestratorFixBridge.inc +++ b/data/scripts/northHyruleField/script_CutsceneOrchestratorFixBridge.inc @@ -11,11 +11,11 @@ SCRIPT_START script_CutsceneOrchestratorFixBridge _0807E8E4_2 Call CreatePlayerExclamationMark Wait 0x001e - _0807EDD4 0x00b8, 0x0258 + MoveTo 0x00b8, 0x0258 Wait 0x001e SetRoomFlag 0x0065 Wait 0x0078 - _0807EEB4 + MoveToPlayer CameraTargetPlayer EnablePlayerControl DoPostScriptAction 0x0006 diff --git a/data/scripts/npc/script_08012C48.inc b/data/scripts/npc/script_08012C48.inc index 18ba3fce..9b299444 100644 --- a/data/scripts/npc/script_08012C48.inc +++ b/data/scripts/npc/script_08012C48.inc @@ -4,7 +4,7 @@ SCRIPT_START script_08012C48 DoPostScriptAction 0x0007 SetEntitySpeed 0x0280 EndBlock - _0807EDD4 0x0388, 0x0168 + MoveTo 0x0388, 0x0168 SetSyncFlag 0x00000100 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/npc/script_ForestMinish17.inc b/data/scripts/npc/script_ForestMinish17.inc index 376c28db..fb76c3a1 100644 --- a/data/scripts/npc/script_ForestMinish17.inc +++ b/data/scripts/npc/script_ForestMinish17.inc @@ -2,16 +2,16 @@ SCRIPT_START script_ForestMinish17 SetEntitySpeed 0x0100 script_080166BC: - _0807EDD4 0x0055, 0x0039 + MoveTo 0x0055, 0x0039 Wait 0x0008 - _0807EDD4 0x0075, 0x0076 + MoveTo 0x0075, 0x0076 Wait 0x0008 - _0807EDD4 0x0105, 0x006c + MoveTo 0x0105, 0x006c Wait 0x0008 - _0807EDD4 0x018e, 0x007a + MoveTo 0x018e, 0x007a Wait 0x0008 - _0807EDD4 0x0173, 0x0023 + MoveTo 0x0173, 0x0023 Wait 0x0008 - _0807EDD4 0x00d8, 0x003f + MoveTo 0x00d8, 0x003f Wait 0x0008 Jump script_080166BC diff --git a/data/scripts/npc/script_PlayerAtBladeBrothers.inc b/data/scripts/npc/script_PlayerAtBladeBrothers.inc index 319170e6..d67a60e8 100644 --- a/data/scripts/npc/script_PlayerAtBladeBrothers.inc +++ b/data/scripts/npc/script_PlayerAtBladeBrothers.inc @@ -1,7 +1,7 @@ @ Player at Blade Brothers SCRIPT_START script_PlayerAtBladeBrothers SetEntitySpeed 0x0100 - _0807EDD4 0x0078, 0x0050 + MoveTo 0x0078, 0x0050 SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 diff --git a/data/scripts/sanctuary/script_CutsceneMiscObjectEarthElementFloating.inc b/data/scripts/sanctuary/script_CutsceneMiscObjectEarthElementFloating.inc index 29d74646..0a40c1bb 100644 --- a/data/scripts/sanctuary/script_CutsceneMiscObjectEarthElementFloating.inc +++ b/data/scripts/sanctuary/script_CutsceneMiscObjectEarthElementFloating.inc @@ -5,7 +5,7 @@ SCRIPT_START script_CutsceneMiscObjectEarthElementFloating SetAnimation 0x0000 EndBlock SetEntitySpeed 0x0080 - _0807EDD4 0x00b0, 0x00f8 + MoveTo 0x00b0, 0x00f8 SetAnimation 0x0001 SetSyncFlag 0x08000000 SCRIPT_END diff --git a/data/scripts/sanctuary/script_CutsceneMiscObjectFireElementFloating.inc b/data/scripts/sanctuary/script_CutsceneMiscObjectFireElementFloating.inc index b45d6891..1e476e77 100644 --- a/data/scripts/sanctuary/script_CutsceneMiscObjectFireElementFloating.inc +++ b/data/scripts/sanctuary/script_CutsceneMiscObjectFireElementFloating.inc @@ -5,7 +5,7 @@ SCRIPT_START script_CutsceneMiscObjectFireElementFloating SetAnimation 0x0002 EndBlock SetEntitySpeed 0x0080 - _0807EDD4 0x0120, 0x00f8 + MoveTo 0x0120, 0x00f8 SetAnimation 0x0003 SetSyncFlag 0x10000000 SCRIPT_END diff --git a/data/scripts/sanctuary/script_CutsceneMiscObjectWaterElementFloating.inc b/data/scripts/sanctuary/script_CutsceneMiscObjectWaterElementFloating.inc index 6d52dba8..57afa54a 100644 --- a/data/scripts/sanctuary/script_CutsceneMiscObjectWaterElementFloating.inc +++ b/data/scripts/sanctuary/script_CutsceneMiscObjectWaterElementFloating.inc @@ -5,7 +5,7 @@ SCRIPT_START script_CutsceneMiscObjectWaterElementFloating SetAnimation 0x0004 EndBlock SetEntitySpeed 0x0080 - _0807EDD4 0x0120, 0x0168 + MoveTo 0x0120, 0x0168 SetAnimation 0x0005 SetSyncFlag 0x20000000 SCRIPT_END diff --git a/data/scripts/sanctuary/script_CutsceneMiscObjectWindElementFloating.inc b/data/scripts/sanctuary/script_CutsceneMiscObjectWindElementFloating.inc index c764dc05..16dc2fdd 100644 --- a/data/scripts/sanctuary/script_CutsceneMiscObjectWindElementFloating.inc +++ b/data/scripts/sanctuary/script_CutsceneMiscObjectWindElementFloating.inc @@ -5,7 +5,7 @@ SCRIPT_START script_CutsceneMiscObjectWindElementFloating SetAnimation 0x0006 EndBlock SetEntitySpeed 0x0080 - _0807EDD4 0x00b0, 0x0168 + MoveTo 0x00b0, 0x0168 SetAnimation 0x0007 SetSyncFlag 0x40000000 SCRIPT_END diff --git a/data/scripts/sanctuary/script_PlayerAtPedestal.inc b/data/scripts/sanctuary/script_PlayerAtPedestal.inc index 6f85106d..866d3499 100644 --- a/data/scripts/sanctuary/script_PlayerAtPedestal.inc +++ b/data/scripts/sanctuary/script_PlayerAtPedestal.inc @@ -10,7 +10,7 @@ script_080136F0: script_080136FA: CallWithArg sub_0807F4F8, 0x00000124 script_08013704: - _0807EDD4 0x00e8, 0x0124 + MoveTo 0x00e8, 0x0124 SetAnimationState 0x0004 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 diff --git a/data/scripts/sanctuary/script_PlayerAtSanctuaryEntrance.inc b/data/scripts/sanctuary/script_PlayerAtSanctuaryEntrance.inc index 69391d04..7a437e50 100644 --- a/data/scripts/sanctuary/script_PlayerAtSanctuaryEntrance.inc +++ b/data/scripts/sanctuary/script_PlayerAtSanctuaryEntrance.inc @@ -3,7 +3,7 @@ SCRIPT_START script_PlayerAtSanctuaryEntrance BeginBlock SetEntitySpeed 0x0100 EndBlock - _0807EDD4 0x0088, 0x0068 + MoveTo 0x0088, 0x0068 SetAnimationState 0x0000 DoPostScriptAction 0x0000 Wait 0x001e diff --git a/data/scripts/sanctuary/script_PlayerGetElement.inc b/data/scripts/sanctuary/script_PlayerGetElement.inc index c73af53c..bfe5d187 100644 --- a/data/scripts/sanctuary/script_PlayerGetElement.inc +++ b/data/scripts/sanctuary/script_PlayerGetElement.inc @@ -9,7 +9,7 @@ SCRIPT_START script_PlayerGetElement PlayBgm BGM_ELEMENT_THEME Call sub_080A0464 script_0800A0D2: - _0807EE30 + MoveTowardsTarget JumpIfNot script_0800A0D2 _0807E8E4_0 Wait 0x0008 diff --git a/data/scripts/sanctuary/script_PlayerTextBoardAppears.inc b/data/scripts/sanctuary/script_PlayerTextBoardAppears.inc index 516cef54..e587d4b1 100644 --- a/data/scripts/sanctuary/script_PlayerTextBoardAppears.inc +++ b/data/scripts/sanctuary/script_PlayerTextBoardAppears.inc @@ -3,7 +3,7 @@ SCRIPT_START script_PlayerTextBoardAppears BeginBlock SetEntitySpeed 0x0100 EndBlock - _0807EDD4 0x00e8, 0x00a8 + MoveTo 0x00e8, 0x00a8 SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000002 diff --git a/data/scripts/unused/script_08016482.inc b/data/scripts/unused/script_08016482.inc index be00febe..dd58b799 100644 --- a/data/scripts/unused/script_08016482.inc +++ b/data/scripts/unused/script_08016482.inc @@ -54,11 +54,11 @@ SCRIPT_START script_08016482 WalkSouth 0x0040 WalkWest 0x0050 _0807ED24 0x0000, 0x0000, 0x0000 - _0807EDD4 0x0000, 0x0000 - _0807EE04 0x0000, 0x0000 - _0807EE30 - _0807EEB4 - _0807EEF4 0xfff0, 0x0014 + MoveTo 0x0000, 0x0000 + LookAt 0x0000, 0x0000 + MoveTowardsTarget + MoveToPlayer + MoveToOffset 0xfff0, 0x0014 DoPostScriptAction 0x0000 DoPostScriptAction2 0x0001 PlaySound SFX_METAL_CLINK diff --git a/data/scripts/veilFalls/script_BigGoronHiding.inc b/data/scripts/veilFalls/script_BigGoronHiding.inc index 237d4470..b2e5063d 100644 --- a/data/scripts/veilFalls/script_BigGoronHiding.inc +++ b/data/scripts/veilFalls/script_BigGoronHiding.inc @@ -5,7 +5,7 @@ SCRIPT_START script_BigGoronHiding SetEntitySpeed 0x0010 EndBlock script_0800932E: - _0807EEF4 -8, 0x0000 - _0807EEF4 0x0008, 0x0000 + MoveToOffset -8, 0x0000 + MoveToOffset 0x0008, 0x0000 Jump script_0800932E SCRIPT_END diff --git a/data/scripts/veilFalls/script_CutsceneMiscObjectMirrorShield.inc b/data/scripts/veilFalls/script_CutsceneMiscObjectMirrorShield.inc index bc49bebb..28aa819c 100644 --- a/data/scripts/veilFalls/script_CutsceneMiscObjectMirrorShield.inc +++ b/data/scripts/veilFalls/script_CutsceneMiscObjectMirrorShield.inc @@ -8,7 +8,7 @@ SCRIPT_START script_CutsceneMiscObjectMirrorShield SetEntityVelocity 0x00018000 Call sub_0806D858 script_080094EA: - _0807EE30 + MoveTowardsTarget JumpIfNot script_080094EA Wait 0x001e DoPostScriptAction 0x0006 diff --git a/data/scripts/veilFalls/script_CutsceneMiscObjectVeilFallsTop.inc b/data/scripts/veilFalls/script_CutsceneMiscObjectVeilFallsTop.inc index 051cfe84..6809a172 100644 --- a/data/scripts/veilFalls/script_CutsceneMiscObjectVeilFallsTop.inc +++ b/data/scripts/veilFalls/script_CutsceneMiscObjectVeilFallsTop.inc @@ -7,7 +7,7 @@ SCRIPT_START script_CutsceneMiscObjectVeilFallsTop Wait 0x003c SetEntityVelocity 0x00018000 script_080094BC: - _0807EE30 + MoveTowardsTarget JumpIfNot script_080094BC Wait 0x003c DoPostScriptAction 0x0006 diff --git a/data/scripts/windRuins/script_PlayerAtTextboard.inc b/data/scripts/windRuins/script_PlayerAtTextboard.inc index c85f6145..739d42e9 100644 --- a/data/scripts/windRuins/script_PlayerAtTextboard.inc +++ b/data/scripts/windRuins/script_PlayerAtTextboard.inc @@ -4,7 +4,7 @@ SCRIPT_START script_PlayerAtTextboard SetEntitySpeed 0x0080 EndBlock DoPostScriptAction 0x0001 - _0807EDD4 0x00a0, 0x0078 + MoveTo 0x00a0, 0x0078 SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 diff --git a/include/asm.h b/include/asm.h index c05fa5ad..1fb0ed21 100644 --- a/include/asm.h +++ b/include/asm.h @@ -29,7 +29,7 @@ extern void ResetCollisionLayer(struct Entity_*); extern void sub_08004596(struct Entity_*, u32); extern u32 sub_080045B4(struct Entity_*, u32, u32); extern u32 CalculateDirectionTo(u32, u32, u32, u32); -extern u32 sub_080045DA(s32, s32); +extern u32 CalculateDirectionFromOffsets(s32, s32); extern u32 sub_080086B4(u32, u32, const u8*); extern u32 ResolveCollisionLayer(struct Entity_*); extern void sub_0800417E(struct Entity_*, u32); diff --git a/include/functions.h b/include/functions.h index 0e7b79f8..28b03c4a 100644 --- a/include/functions.h +++ b/include/functions.h @@ -81,7 +81,7 @@ extern void UpdateUIElements(void); extern void sub_0801E104(void); extern void sub_08030118(u32); extern void sub_0803C0AC(Entity*); -extern void sub_08049CF4(Entity*); +extern void SetRoomTrackerFlag(Entity*); extern u32 sub_0804A024(Entity*, u32, u32); extern u32 sub_080542AC(u32); extern void DisableRandomDrops(); diff --git a/include/room.h b/include/room.h index 0a1916d9..8158146a 100644 --- a/include/room.h +++ b/include/room.h @@ -91,10 +91,10 @@ typedef struct { u8 area; u8 room; u16 unk_02; - u32 unk_04; + u32 flags; /**< Flags that can be set on the tracked rooms. Used e.g. by the door mimic. (TODO probably to start in the discovered state?)*/ } RoomMemory; -extern RoomMemory* gUnk_020354B0; +extern RoomMemory* gRoomMemoryPtr; extern RoomMemory gRoomMemory[]; // Packets used to store which entities to load in a room diff --git a/include/script.h b/include/script.h index c6e41f17..b708d945 100644 --- a/include/script.h +++ b/include/script.h @@ -54,7 +54,7 @@ void StartPlayerScript(Script* script); void sub_0807DD50(Entity* entity); void sub_0807DD64(Entity* entity); void sub_0807DD80(Entity* entity, Script* script); -void sub_0807DEDC(Entity*, ScriptExecutionContext*, u32, u32); +void LookAt(Entity*, ScriptExecutionContext*, u32, u32); ScriptExecutionContext* StartCutscene(Entity* entity, Script* script); void ExecuteScriptForEntity(Entity* entity, void (*postScriptCallback)(Entity*, ScriptExecutionContext*)); diff --git a/linker.ld b/linker.ld index 6ec25e55..5dbca29a 100644 --- a/linker.ld +++ b/linker.ld @@ -101,7 +101,7 @@ SECTIONS { . = 0x000350F0; gUnk_020350F0 = .; . = 0x0003510E; gUnk_0203510E = .; . = 0x00035160; gUnk_02035160 = .; - . = 0x000354B0; gUnk_020354B0 = .; + . = 0x000354B0; gRoomMemoryPtr = .; . = 0x000354B4; gManagerCount = .; . = 0x000354C0; gUnk_020354C0 = .; . = 0x00035540; gzHeap = .; diff --git a/src/code_08049CD4.c b/src/code_08049CD4.c index c98323d1..8dd56f85 100644 --- a/src/code_08049CD4.c +++ b/src/code_08049CD4.c @@ -4,43 +4,43 @@ extern void MemFill32(u32, void*, u32); -void sub_08049DCC(RoomMemory*); -RoomMemory* sub_08049D88(void); +void UpdateCurrentRoom(RoomMemory*); +RoomMemory* AddCurrentRoom(void); void ClearRoomMemory(void) { MemFill32(0xFFFFFFFF, gRoomMemory, 0x40); - gUnk_020354B0 = gRoomMemory; + gRoomMemoryPtr = gRoomMemory; } -void sub_08049CF4(GenericEntity* ent) { +void SetRoomTrackerFlag(GenericEntity* ent) { u8 field_0x6c = ent->field_0x6c.HALF.LO; if (field_0x6c & 0x80) { - gUnk_020354B0->unk_04 |= 1 << (field_0x6c & 0x1f); + gRoomMemoryPtr->flags |= 1 << (field_0x6c & 0x1f); } } -u32 sub_08049D1C(u32 arg0) { - u32 bitmask = gUnk_020354B0->unk_04 >> arg0; +bool32 IsRoomTrackerFlagSet(u32 arg0) { + u32 bitmask = gRoomMemoryPtr->flags >> arg0; u32 output = 1; output &= ~bitmask; return output; } void UpdateRoomTracker(void) { - gUnk_020354B0 = gRoomMemory; + gRoomMemoryPtr = gRoomMemory; do { - if (gUnk_020354B0->area == gRoomControls.area && gUnk_020354B0->room == gRoomControls.room) { - sub_08049DCC(gUnk_020354B0); + if (gRoomMemoryPtr->area == gRoomControls.area && gRoomMemoryPtr->room == gRoomControls.room) { + UpdateCurrentRoom(gRoomMemoryPtr); return; } - gUnk_020354B0++; + gRoomMemoryPtr++; - } while (gUnk_020354B0 < gRoomMemory + 8); - gUnk_020354B0 = sub_08049D88(); + } while (gRoomMemoryPtr < gRoomMemory + 8); + gRoomMemoryPtr = AddCurrentRoom(); } -RoomMemory* sub_08049D88(void) { +RoomMemory* AddCurrentRoom(void) { RoomMemory* rm = gRoomMemory; RoomMemory* r1 = rm + 1; @@ -55,14 +55,14 @@ RoomMemory* sub_08049D88(void) { rm->room = gRoomControls.room; rm->unk_02 = 0xFFFF; - rm->unk_04 = 0; + rm->flags = 0; - sub_08049DCC(rm); + UpdateCurrentRoom(rm); return rm; } -void sub_08049DCC(RoomMemory* rm) { +void UpdateCurrentRoom(RoomMemory* rm) { RoomMemory* r1 = gRoomMemory; do { diff --git a/src/enemy/doorMimic.c b/src/enemy/doorMimic.c index b7745c4a..9e4af1be 100644 --- a/src/enemy/doorMimic.c +++ b/src/enemy/doorMimic.c @@ -42,7 +42,7 @@ void DoorMimic_OnCollision(Entity* this) { void DoorMimic_OnDeath(Entity* this) { SetTile((u16)this->field_0x7c.HALF.LO, (u16)this->field_0x7c.HALF.HI, this->collisionLayer); CreateFx(this, FX_POT_SHATTER, 0); - sub_08049CF4(this); + SetRoomTrackerFlag(this); DeleteThisEntity(); } diff --git a/src/enemy/enemy64.c b/src/enemy/enemy64.c index 5cfd1a60..f6ac525b 100644 --- a/src/enemy/enemy64.c +++ b/src/enemy/enemy64.c @@ -192,7 +192,7 @@ void Enemy64_Action2_SubAction0(Enemy64Entity* this) { } void Enemy64_Action2_SubAction1(Enemy64Entity* this) { - u32 tmp = sub_080045DA(this->unk_80 - super->x.HALF.HI, this->unk_82 - super->y.HALF.HI); + u32 tmp = CalculateDirectionFromOffsets(this->unk_80 - super->x.HALF.HI, this->unk_82 - super->y.HALF.HI); if (4 < (((super->direction - tmp) + 2) & 0xff)) { if (((tmp - super->direction) & 0x80) != 0) { super->direction--; @@ -293,7 +293,7 @@ void Enemy64_Action3(Enemy64Entity* this) { } void Enemy64_Action3_SubAction0(Enemy64Entity* this) { - u32 tmp = sub_080045DA(gRoomControls.origin_x + 0xa8 - super->x.HALF.HI, + u32 tmp = CalculateDirectionFromOffsets(gRoomControls.origin_x + 0xa8 - super->x.HALF.HI, gRoomControls.origin_y + 0x80 - super->y.HALF.HI); if (tmp != super->direction) { if (((tmp - super->direction) & 0x80) != 0) { @@ -493,7 +493,7 @@ void sub_080499F0(Enemy64Entity* this) { ((this->unk_7c & 1) == 0)) { if (EntityWithinDistance(&gPlayerEntity, super->x.HALF.HI, super->y.HALF.HI, 0x24) && ((this->unk_7c & 2) == 0)) { - tmp = sub_080045DA((s32)gPlayerEntity.x.HALF.HI - super->x.HALF.HI, + tmp = CalculateDirectionFromOffsets((s32)gPlayerEntity.x.HALF.HI - super->x.HALF.HI, (s32)gPlayerEntity.y.HALF.HI - super->y.HALF.HI); gPlayerEntity.x.WORD = super->x.WORD + gSineTable[tmp] * 0x2400; gPlayerEntity.y.WORD = super->y.WORD + gSineTable[tmp + 0x40] * -0x2400; diff --git a/src/enemy/gyorgMale.c b/src/enemy/gyorgMale.c index 20f09035..d253f34d 100644 --- a/src/enemy/gyorgMale.c +++ b/src/enemy/gyorgMale.c @@ -263,7 +263,7 @@ void sub_08046AE8(GyorgMaleEntity* this) { } void sub_08046B18(GyorgMaleEntity* this) { - u32 tmp = sub_080045DA(this->unk_80 - super->x.HALF.HI, this->unk_82 - super->y.HALF.HI); + u32 tmp = CalculateDirectionFromOffsets(this->unk_80 - super->x.HALF.HI, this->unk_82 - super->y.HALF.HI); if (tmp != super->direction) { if (((tmp - super->direction) & 0xFF) > 0x80) { this->unk_76 -= 0x100; @@ -286,13 +286,13 @@ void sub_08046B8C(GyorgMaleEntity* this) { this->unk_82 = gRoomControls.origin_y + 0x210; sub_08047D88(this); } else { - super->direction = sub_080045DA(this->unk_80 - super->x.HALF.HI, this->unk_82 - super->y.HALF.HI); + super->direction = CalculateDirectionFromOffsets(this->unk_80 - super->x.HALF.HI, this->unk_82 - super->y.HALF.HI); sub_08047DF0(this, ((0x100 - super->direction) & 0xFF) << 8); } } void sub_08046C04(GyorgMaleEntity* this) { - u32 tmp = sub_080045DA(this->unk_80 - super->x.HALF.HI, this->unk_82 - super->y.HALF.HI); + u32 tmp = CalculateDirectionFromOffsets(this->unk_80 - super->x.HALF.HI, this->unk_82 - super->y.HALF.HI); if (tmp != super->direction) { if (((tmp - super->direction) & 0xFF) > 0x80) { this->unk_76 -= 0x100; @@ -314,7 +314,7 @@ void sub_08046C88(GyorgMaleEntity* this) { sub_08048178(this, sub_08048158(this->unk_70)); sub_08047D88(this); } else { - super->direction = sub_080045DA(this->unk_80 - super->x.HALF.HI, this->unk_82 - super->y.HALF.HI); + super->direction = CalculateDirectionFromOffsets(this->unk_80 - super->x.HALF.HI, this->unk_82 - super->y.HALF.HI); sub_08047DF0(this, ((0x100 - super->direction) & 0xFF) << 8); } } @@ -351,7 +351,7 @@ void sub_08046D44(GyorgMaleEntity* this) { } void sub_08046D98(GyorgMaleEntity* this) { - u32 tmp = sub_080045DA(this->unk_80 - super->x.HALF.HI, this->unk_82 - super->y.HALF.HI); + u32 tmp = CalculateDirectionFromOffsets(this->unk_80 - super->x.HALF.HI, this->unk_82 - super->y.HALF.HI); if (tmp != super->direction) { if (((tmp - super->direction) & 0xFF) > 0x80) { this->unk_76 -= 0x100; @@ -372,7 +372,7 @@ void sub_08046E0C(GyorgMaleEntity* this) { this->unk_76 = super->direction << 8; sub_08047D88(this); } else { - super->direction = sub_080045DA(this->unk_80 - super->x.HALF.HI, this->unk_82 - super->y.HALF.HI); + super->direction = CalculateDirectionFromOffsets(this->unk_80 - super->x.HALF.HI, this->unk_82 - super->y.HALF.HI); sub_08047DF0(this, ((0x100 - super->direction) & 0xFF) << 8); } } @@ -459,7 +459,7 @@ void sub_08046FE8(GyorgMaleEntity* this) { } void sub_0804702C(GyorgMaleEntity* this) { - u32 tmp = sub_080045DA(this->unk_80 - super->x.HALF.HI, this->unk_82 - super->y.HALF.HI); + u32 tmp = CalculateDirectionFromOffsets(this->unk_80 - super->x.HALF.HI, this->unk_82 - super->y.HALF.HI); if (((super->direction - tmp + 2) & 0xFF) > 4) { if ((tmp - super->direction) & 0x80) { super->direction--; @@ -610,7 +610,7 @@ void sub_080473B8(GyorgMaleEntity* this) { } void sub_080473F0(GyorgMaleEntity* this) { - u32 tmp = sub_080045DA(this->unk_80 - super->x.HALF.HI, this->unk_82 - super->y.HALF.HI); + u32 tmp = CalculateDirectionFromOffsets(this->unk_80 - super->x.HALF.HI, this->unk_82 - super->y.HALF.HI); if (((super->direction - tmp + 2) & 0xFF) > 4) { s32 tmp2 = tmp - super->direction; if (tmp2 & 0x80) { @@ -794,7 +794,7 @@ void sub_080477F0(GyorgMaleEntity* this) { if (super->speed < 0x300) { super->speed += 8; } - super->direction = sub_080045DA(this->unk_80 - super->x.HALF.HI, this->unk_82 - super->y.HALF.HI); + super->direction = CalculateDirectionFromOffsets(this->unk_80 - super->x.HALF.HI, this->unk_82 - super->y.HALF.HI); sub_08047E48(this); if (!EntityWithinDistance(super, gPlayerEntity.x.HALF.HI, gPlayerEntity.y.HALF.HI, 0x80)) { super->action = 2; @@ -899,7 +899,7 @@ void sub_08047978(GyorgMaleEntity* this) { void sub_08047B08(GyorgMaleEntity* this) { sub_08047D88(this); - super->direction = sub_080045DA(this->unk_80 - super->x.HALF.HI, this->unk_82 - super->y.HALF.HI); + super->direction = CalculateDirectionFromOffsets(this->unk_80 - super->x.HALF.HI, this->unk_82 - super->y.HALF.HI); super->speed = 0x200; sub_08047E58(this); if (!EntityWithinDistance(super, this->unk_80, this->unk_82, 4)) @@ -1069,7 +1069,7 @@ void sub_08047EA4(GyorgMaleEntity* this, u32 unk1) { return; if (this->unk_7c & 1) { tmp2 = sub_08047F68(this) << 8; - dir = sub_080045DA(gPlayerEntity.x.HALF.HI - super->x.HALF.HI, gPlayerEntity.y.HALF.HI - super->y.HALF.HI); + dir = CalculateDirectionFromOffsets(gPlayerEntity.x.HALF.HI - super->x.HALF.HI, gPlayerEntity.y.HALF.HI - super->y.HALF.HI); tmp = dir - (tmp / 256); tmp &= 0xFF; gPlayerEntity.x.WORD += (gSineTable[tmp] - gSineTable[dir]) * tmp2; @@ -1151,7 +1151,7 @@ void sub_08048004(GyorgMaleEntity* this) { if (b != 3) { if (EntityWithinDistance(&gPlayerEntity, super->x.HALF.HI, super->y.HALF.HI, 0x24)) { if (!(this->unk_7c & 2)) { - u32 tmp = sub_080045DA(gPlayerEntity.x.HALF.HI - super->x.HALF.HI, + u32 tmp = CalculateDirectionFromOffsets(gPlayerEntity.x.HALF.HI - super->x.HALF.HI, gPlayerEntity.y.HALF.HI - super->y.HALF.HI); gPlayerEntity.x.WORD = super->x.WORD + (gSineTable[tmp] * 9216); gPlayerEntity.y.WORD = super->y.WORD - (gSineTable[tmp + 0x40] * 9216); diff --git a/src/enemy/octorokBoss.c b/src/enemy/octorokBoss.c index d8931e9c..3c346653 100644 --- a/src/enemy/octorokBoss.c +++ b/src/enemy/octorokBoss.c @@ -168,11 +168,11 @@ void OctorokBoss_Hit_SubAction1(OctorokBossEntity* this) { if (diffX > 8 || diffY > 8) { this->heap->field_0x2 = 1; #if defined(JP) || defined(DEMO_JP) || defined(EU) - super->direction = ((s32)sub_080045DA((((gRoomControls.origin_x + 0x108) << 0x10) - super->x.WORD), + super->direction = ((s32)CalculateDirectionFromOffsets((((gRoomControls.origin_x + 0x108) << 0x10) - super->x.WORD), (((gRoomControls.origin_y + 0x88) << 0x10) - super->y.WORD))) >> 3; #else - super->direction = ((s32)sub_080045DA(gRoomControls.origin_x + 0x108 - super->x.HALF.HI, + super->direction = ((s32)CalculateDirectionFromOffsets(gRoomControls.origin_x + 0x108 - super->x.HALF.HI, gRoomControls.origin_y + 0x88 - super->y.HALF.HI)) >> 3; #endif @@ -690,7 +690,7 @@ void OctorokBoss_Action1_AimTowardsPlayer(OctorokBossEntity* this) { s32 tmp1; s32 tmp2; - tmp1 = (u8)(sub_080045DA(gPlayerEntity.x.WORD - super->x.WORD, gPlayerEntity.y.WORD - super->y.WORD) - + tmp1 = (u8)(CalculateDirectionFromOffsets(gPlayerEntity.x.WORD - super->x.WORD, gPlayerEntity.y.WORD - super->y.WORD) - (((u8)(-this->angle.HALF.HI) ^ 0x80))); if (IS_FROZEN(this) == FALSE) { tmp2 = 8; @@ -898,7 +898,7 @@ void OctorokBoss_ExecuteAttackVacuum(OctorokBossEntity* this) { s32 tmp; if (this->unk_80 == 0) { - super->direction = sub_080045DA(gPlayerEntity.x.WORD - super->x.WORD, gPlayerEntity.y.WORD - super->y.WORD); + super->direction = CalculateDirectionFromOffsets(gPlayerEntity.x.WORD - super->x.WORD, gPlayerEntity.y.WORD - super->y.WORD); tmp = ((u8) - (this->angle.HALF.HI + 0x80)) - super->direction; if (tmp < 0) { tmp = -tmp; @@ -912,7 +912,7 @@ void OctorokBoss_ExecuteAttackVacuum(OctorokBossEntity* this) { this->unk_80 = 1; this->timer = 2; this->heap->targetAngle = - sub_080045DA((gRoomControls.origin_x + 0x108) * 0x10000 - super->x.WORD, + CalculateDirectionFromOffsets((gRoomControls.origin_x + 0x108) * 0x10000 - super->x.WORD, (gRoomControls.origin_y + 0x88) * 0x10000 - super->y.WORD); this->heap->targetAngle = (u8) - (this->heap->targetAngle + 0x80); SoundReq(SFX_ED); @@ -956,7 +956,7 @@ void OctorokBoss_ExecuteAttackVacuum(OctorokBossEntity* this) { } else { this->timer--; if ((gPlayerState.flags == PL_FROZEN) && (this->timer == 0x3c)) { - tmp = sub_080045DA(gPlayerEntity.x.WORD - super->x.WORD, gPlayerEntity.y.WORD - super->y.WORD); + tmp = CalculateDirectionFromOffsets(gPlayerEntity.x.WORD - super->x.WORD, gPlayerEntity.y.WORD - super->y.WORD); if ((u8)((tmp - ((u8) - this->angle.HALF.HI ^ 0x80))) > 0x80) { this->heap->targetAngle = this->angle.HALF.HI + 0x30; } else { @@ -1178,7 +1178,7 @@ void sub_08036AF0(OctorokBossEntity* this, s32 radius, s32 angleSpeed) { continue; } else { heap->tailObjects[index - 1]->angle.HALF.HI = - sub_080045DA(heap->tailObjects[index - 1]->base.x.WORD - heap->tailObjects[index]->base.x.WORD, + CalculateDirectionFromOffsets(heap->tailObjects[index - 1]->base.x.WORD - heap->tailObjects[index]->base.x.WORD, heap->tailObjects[index - 1]->base.y.WORD - heap->tailObjects[index]->base.y.WORD); tmp = FixedMul(gSineTable[heap->tailObjects[index - 1]->angle.HALF.HI], radius << 4); tmp = FixedDiv(tmp, 0x100); diff --git a/src/enemy/treeItem.c b/src/enemy/treeItem.c index 3226609d..4eaa9a03 100644 --- a/src/enemy/treeItem.c +++ b/src/enemy/treeItem.c @@ -12,7 +12,7 @@ static bool32 ShouldSpawnTreeItem(Entity*); -extern void sub_08049CF4(Entity*); +extern void SetRoomTrackerFlag(Entity*); const u8 gTreeItemDropTables[][16] = { { 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }, @@ -71,7 +71,7 @@ void TreeItem(Entity* this) { break; } - sub_08049CF4(this); + SetRoomTrackerFlag(this); DeleteThisEntity(); } diff --git a/src/enemyUtils.c b/src/enemyUtils.c index d484865a..5e8e3f4a 100644 --- a/src/enemyUtils.c +++ b/src/enemyUtils.c @@ -9,7 +9,7 @@ #include "projectile.h" #include "save.h" -extern void sub_08049CF4(Entity*); +extern void SetRoomTrackerFlag(Entity*); extern EnemyDefinition gEnemyDefinitions[]; @@ -191,7 +191,7 @@ void CreateDeathFx(GenericEntity* parent, u32 parentId, u32 fixedItem) { } else { int tmp = parent->base.gustJarState & 2; if (tmp == 0) { - sub_08049CF4(&(parent->base)); + SetRoomTrackerFlag(&(parent->base)); gSave.unk50++; parent->base.gustJarState |= 2; parent->base.timer = 255; diff --git a/src/npc/bigGoron.c b/src/npc/bigGoron.c index 1497f185..8948059d 100644 --- a/src/npc/bigGoron.c +++ b/src/npc/bigGoron.c @@ -536,7 +536,7 @@ void sub_0806D7C4(Entity* this, ScriptExecutionContext* context) { this->y.HALF.HI = gPlayerEntity.y.HALF.HI - 0x18; entity = FindEntity(NPC, BIG_GORON, 7, 2, 0); if (entity != NULL) { - sub_0807DEDC(this, context, entity->x.HALF.HI, entity->y.HALF.HI); + LookAt(this, context, entity->x.HALF.HI, entity->y.HALF.HI); } } @@ -547,7 +547,7 @@ void sub_0806D804(Entity* this, ScriptExecutionContext* context) { this->y.HALF.HI = entity->y.HALF.HI - 0x10; this->spritePriority.b1 = 0; } - sub_0807DEDC(this, context, gPlayerEntity.x.HALF.HI, gPlayerEntity.y.HALF.HI - 0x10); + LookAt(this, context, gPlayerEntity.x.HALF.HI, gPlayerEntity.y.HALF.HI - 0x10); } void sub_0806D858(Entity* this) { diff --git a/src/npc/ezlo.c b/src/npc/ezlo.c index 307ec550..5463c9a8 100644 --- a/src/npc/ezlo.c +++ b/src/npc/ezlo.c @@ -32,7 +32,7 @@ void sub_0806D8A0(Entity* this, ScriptExecutionContext* context) { context->y.HALF.HI = yOffset; xOffset -= this->x.HALF.HI; - this->direction = sub_080045DA(xOffset, yOffset - this->y.HALF.HI); + this->direction = CalculateDirectionFromOffsets(xOffset, yOffset - this->y.HALF.HI); this->animationState = (this->animationState & 0x80) | gUnk_08114134[this->direction >> 4]; } diff --git a/src/npc/gorman.c b/src/npc/gorman.c index bec184f5..cc2d9aa5 100644 --- a/src/npc/gorman.c +++ b/src/npc/gorman.c @@ -142,7 +142,7 @@ void sub_0806991C(Entity* this, ScriptExecutionContext* context) { context->unk_19 = 8; context->postScriptActions |= 2; context->condition = 0; - tmp = sub_080045DA(context->x.HALF.HI - this->x.HALF.HI, context->y.HALF.HI - this->y.HALF.HI); + tmp = CalculateDirectionFromOffsets(context->x.HALF.HI - this->x.HALF.HI, context->y.HALF.HI - this->y.HALF.HI); this->direction = tmp; this->animationState = (this->animationState & 0x80) | gUnk_08111C74[(tmp << 0x18) >> 0x1c]; gActiveScriptInfo.flags |= 1; @@ -158,7 +158,7 @@ void sub_080699AC(Entity* this, ScriptExecutionContext* context) { context->unk_19 = 8; context->postScriptActions |= 2; context->condition = 0; - tmp = sub_080045DA(context->x.HALF.HI - this->x.HALF.HI, context->y.HALF.HI - this->y.HALF.HI); + tmp = CalculateDirectionFromOffsets(context->x.HALF.HI - this->x.HALF.HI, context->y.HALF.HI - this->y.HALF.HI); this->direction = tmp; this->animationState = (this->animationState & 0x80) | gUnk_08111C8C[(tmp << 0x18) >> 0x1c]; gActiveScriptInfo.flags |= 1; diff --git a/src/npc/kid.c b/src/npc/kid.c index 59e1e87f..7001590f 100644 --- a/src/npc/kid.c +++ b/src/npc/kid.c @@ -404,7 +404,7 @@ void sub_080626E0(Entity* this, ScriptExecutionContext* context) { } if (--context->unk_19 == 0) { context->unk_19 = 10; - uVar4 = sub_080045DA(context->x.HALF.HI - this->x.HALF.HI, context->y.HALF.HI - this->y.HALF.HI); + uVar4 = CalculateDirectionFromOffsets(context->x.HALF.HI - this->x.HALF.HI, context->y.HALF.HI - this->y.HALF.HI); this->direction = (u8)uVar4; uVar4 = Random(); this->direction = (this->direction + uVar4 % 0xb) - 5; diff --git a/src/npc/npc5.c b/src/npc/npc5.c index 2a78cc26..f43e40c3 100644 --- a/src/npc/npc5.c +++ b/src/npc/npc5.c @@ -366,7 +366,7 @@ bool32 sub_08060FD0(Entity* this, u32 a, u32 b) { x = this->x.HALF.HI; y = this->y.HALF.HI; - iVar3 = sub_080045DA(a - x, b - y); + iVar3 = CalculateDirectionFromOffsets(a - x, b - y); x <<= 8; y <<= 8; sVar1 = gSineTable[iVar3] * 6; diff --git a/src/npc/postman.c b/src/npc/postman.c index 2bdeedd2..ec444469 100644 --- a/src/npc/postman.c +++ b/src/npc/postman.c @@ -312,7 +312,7 @@ void sub_08060700(Entity* entity, ScriptExecutionContext* context) { const Coords* coords = &gUnk_0810A66C[var0[(s8)entity->field_0x68.HALF.HI]]; u32 x = coords->HALF.x + gRoomControls.origin_x; u32 y = coords->HALF.y + gRoomControls.origin_y; - sub_0807DEDC(entity, context, x, y); + LookAt(entity, context, x, y); gActiveScriptInfo.flags |= 1; } diff --git a/src/object/cutsceneMiscObject.c b/src/object/cutsceneMiscObject.c index 75911fe8..e5643dab 100644 --- a/src/object/cutsceneMiscObject.c +++ b/src/object/cutsceneMiscObject.c @@ -714,7 +714,7 @@ void sub_0809567C(CutsceneMiscObjectEntity* this) { super->action = 3; super->subAction = 1; super->speed = 0x400; - super->direction = sub_080045DA(super->x.WORD - ((s16)this->px << 16), super->y.WORD - ((s16)this->py << 16)); + super->direction = CalculateDirectionFromOffsets(super->x.WORD - ((s16)this->px << 16), super->y.WORD - ((s16)this->py << 16)); } void sub_080956B4(CutsceneMiscObjectEntity* this) { diff --git a/src/object/fileScreenObjects.c b/src/object/fileScreenObjects.c index 23233f96..984582d5 100644 --- a/src/object/fileScreenObjects.c +++ b/src/object/fileScreenObjects.c @@ -545,7 +545,7 @@ static u32 sub_0808EF6C(Entity* this) { var7 = this->field_0x6c.HWORD; } this->speed = var7; - this->direction = sub_080045DA(var0, var2) >> 3; + this->direction = CalculateDirectionFromOffsets(var0, var2) >> 3; LinearMoveUpdate(this); return 1; } diff --git a/src/object/fourElements.c b/src/object/fourElements.c index ef79e2f0..62694322 100644 --- a/src/object/fourElements.c +++ b/src/object/fourElements.c @@ -166,6 +166,6 @@ void sub_080A0444(FourElementsEntity* this) { void sub_080A0464(FourElementsEntity* this, ScriptExecutionContext* context) { Entity* element = FindEntityByID(6, FOUR_ELEMENTS, 6); if (element != NULL) { - sub_0807DEDC(super, context, element->x.HALF.HI, element->y.HALF.HI + 0x18); + LookAt(super, context, element->x.HALF.HI, element->y.HALF.HI + 0x18); } } diff --git a/src/object/keyStealingTakkuri.c b/src/object/keyStealingTakkuri.c index 1b166cab..6e338810 100644 --- a/src/object/keyStealingTakkuri.c +++ b/src/object/keyStealingTakkuri.c @@ -420,7 +420,7 @@ void sub_0809E0D4(KeyStealingTakkuriEntity* this, ScriptExecutionContext* contex entity = &gPlayerEntity; } context->unk_18++; - sub_0807DEDC(super, context, entity->x.HALF.HI, entity->y.HALF.HI); + LookAt(super, context, entity->x.HALF.HI, entity->y.HALF.HI); SoundReq(SFX_123); gActiveScriptInfo.commandSize = 0; } else { @@ -436,7 +436,7 @@ void sub_0809E0D4(KeyStealingTakkuriEntity* this, ScriptExecutionContext* contex varY2 = varY; if (--context->unk_19 == 0) { context->unk_19 = 8; - super->direction = sub_080045DA(varX2 - super->x.HALF.HI, varY2 - super->y.HALF.HI); + super->direction = CalculateDirectionFromOffsets(varX2 - super->x.HALF.HI, varY2 - super->y.HALF.HI); } varX3 = super->x.HALF.HI - varX2; varY3 = super->y.HALF.HI - varY2; diff --git a/src/object/kinstoneSpark.c b/src/object/kinstoneSpark.c index 89126c82..dc8b5693 100644 --- a/src/object/kinstoneSpark.c +++ b/src/object/kinstoneSpark.c @@ -82,7 +82,7 @@ void sub_080A0AF0(Entity* this) { } void sub_080A0B28(Entity* this, ScriptExecutionContext* context) { - sub_0807DEDC(this, context, this->x.HALF.HI, this->y.HALF.HI); + LookAt(this, context, this->x.HALF.HI, this->y.HALF.HI); this->y.HALF.HI -= 0xb0; this->spriteSettings.draw = 0; } diff --git a/src/object/objectA2.c b/src/object/objectA2.c index 5618ebd2..de67db99 100644 --- a/src/object/objectA2.c +++ b/src/object/objectA2.c @@ -117,5 +117,5 @@ void sub_0809F448(Entity* this) { break; } this->speed = (tmp > 0 ? tmp : -tmp) / (tmp2->unk_1 << 8); - this->direction = sub_080045DA(tmp, 0) >> 3; + this->direction = CalculateDirectionFromOffsets(tmp, 0) >> 3; } diff --git a/src/object/octorokBossObject.c b/src/object/octorokBossObject.c index 05fd362d..ad26e410 100644 --- a/src/object/octorokBossObject.c +++ b/src/object/octorokBossObject.c @@ -171,7 +171,7 @@ void OctorokBossObject_Action1(Entity* this) { return; } case 1: - this->direction = sub_080045DA(GET_HELPER(this)->tailObjects[this->timer]->x.WORD - this->x.WORD, + this->direction = CalculateDirectionFromOffsets(GET_HELPER(this)->tailObjects[this->timer]->x.WORD - this->x.WORD, GET_HELPER(this)->tailObjects[this->timer]->y.WORD - this->y.WORD); LinearMoveAngle(this, this->speed, this->direction); if (EntityInRectRadius(this, GET_HELPER(this)->tailObjects[this->timer], 2, 2) == 0) { @@ -197,7 +197,7 @@ void OctorokBossObject_Action1(Entity* this) { case 2: if (this->parent->type2 == 3) { Entity* object = GET_HELPER(this->parent)->mouthObject; - this->direction = sub_080045DA(object->x.WORD - this->x.WORD, object->y.WORD - this->y.WORD); + this->direction = CalculateDirectionFromOffsets(object->x.WORD - this->x.WORD, object->y.WORD - this->y.WORD); LinearMoveAngle(this, 0x280, this->direction); if (sub_0806FC80(this, this->parent, 0x48) == 0) { return; diff --git a/src/object/specialFx.c b/src/object/specialFx.c index 46436ea8..a9d1f0ea 100644 --- a/src/object/specialFx.c +++ b/src/object/specialFx.c @@ -201,7 +201,7 @@ void sub_080845DC(SpecialFxObject* this) { void sub_080845F8(SpecialFxObject* this) { if (((8 - (super->x.HALF.HI & 0xF)) | (8 - (super->y.HALF.HI & 0xF))) != 0) { - super->direction = sub_080045DA((8 - (super->x.HALF.HI & 0xF)), (8 - (super->y.HALF.HI & 0xF))) >> 3; + super->direction = CalculateDirectionFromOffsets((8 - (super->x.HALF.HI & 0xF)), (8 - (super->y.HALF.HI & 0xF))) >> 3; LinearMoveUpdate(super); } sub_08084630(this); diff --git a/src/playerUtils.c b/src/playerUtils.c index 4433573d..e73e6dff 100644 --- a/src/playerUtils.c +++ b/src/playerUtils.c @@ -2572,6 +2572,7 @@ void sub_0807AAF8(Entity* this, u32 tilePos) { } } +// TODO some sort of flame spreading? void sub_0807AB44(Entity* this, s32 xOffset, s32 yOffset) { Entity* object; const u16* ptr = diff --git a/src/room.c b/src/room.c index 12ac101a..ae3042da 100644 --- a/src/room.c +++ b/src/room.c @@ -10,7 +10,7 @@ static void sub_0804B058(EntityData* dat); extern void sub_0801AC98(void); -extern u32 sub_08049D1C(u32); +extern bool32 IsRoomTrackerFlagSet(u32); extern void** gCurrentRoomProperties; extern void*** gAreaTable[]; @@ -194,10 +194,10 @@ static void sub_0804B058(EntityData* dat) { uVar2 = 0; do { if ((uVar2 < 0x20) && ((dat->kind & 0xF) == 3)) { - if (sub_08049D1C(uVar2) != 0) { + if (IsRoomTrackerFlagSet(uVar2) ) { ent = LoadRoomEntity(dat); if ((ent != NULL) && (ent->kind == ENEMY)) { - ent->field_0x6c.HALF.LO = uVar2 | 0x80; + ent->field_0x6c.HALF.LO = uVar2 | 0x80; // TODO Set the room tracker flag that can be set by the enemy so it does not appear next time the room is visited? } } } else { @@ -209,8 +209,8 @@ static void sub_0804B058(EntityData* dat) { } } -void sub_0804B0B0(u32 arg0, u32 arg1) { - LoadRoomEntityList(GetRoomProperty(arg0, arg1, 1)); +void sub_0804B0B0(u32 area, u32 room) { + LoadRoomEntityList(GetRoomProperty(area, room, 1)); } void SetCurrentRoomPropertyList(u32 area, u32 room) { @@ -220,11 +220,11 @@ void SetCurrentRoomPropertyList(u32 area, u32 room) { } } -void sub_0804B0E8(u32 arg0, u32 arg1) { +void sub_0804B0E8(u32 area, u32 room) { void (*func)(void); // init function at index 4 of room data - func = (void (*)())GetRoomProperty(arg0, arg1, 4); + func = (void (*)())GetRoomProperty(area, room, 4); if (func != NULL) { func(); } @@ -246,7 +246,7 @@ void* GetCurrentRoomProperty(u32 idx) { if (gCurrentRoomProperties == NULL) return NULL; - if (idx >= 0x80) { + if (idx >= 0x80) { // TODO different kind of room properties? return gRoomVars.field_0x8c[idx & 7]; } else if (idx <= 7) { return gRoomVars.field_0x6c[idx]; diff --git a/src/script.c b/src/script.c index 27bea866..78e355b1 100644 --- a/src/script.c +++ b/src/script.c @@ -127,11 +127,11 @@ void ScriptCommand_WalkEast(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_WalkSouth(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_WalkWest(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_0807ED24(Entity* entity, ScriptExecutionContext* context); -void ScriptCommand_0807EDD4(Entity* entity, ScriptExecutionContext* context); -void ScriptCommand_0807EE04(Entity* entity, ScriptExecutionContext* context); -void ScriptCommand_0807EE30(Entity* entity, ScriptExecutionContext* context); -void ScriptCommand_0807EEB4(Entity* entity, ScriptExecutionContext* context); -void ScriptCommand_0807EEF4(Entity* entity, ScriptExecutionContext* context); +void ScriptCommand_MoveTo(Entity* entity, ScriptExecutionContext* context); +void ScriptCommand_LookAt(Entity* entity, ScriptExecutionContext* context); +void ScriptCommand_MoveTowardsTarget(Entity* entity, ScriptExecutionContext* context); +void ScriptCommand_MoveToPlayer(Entity* entity, ScriptExecutionContext* context); +void ScriptCommand_MoveToOffset(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_0807EF3C(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_DoPostScriptAction(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_DoPostScriptAction2(Entity* entity, ScriptExecutionContext* context); @@ -422,7 +422,7 @@ void sub_0807DE80(Entity* entity) { sub_080042BA(entity, local1); } -void sub_0807DEDC(Entity* entity, ScriptExecutionContext* context, u32 x, u32 y) { +void LookAt(Entity* entity, ScriptExecutionContext* context, u32 x, u32 y) { static const u8 sDirectionTable[] = { 0, 0, 2, 2, 2, 2, 4, 4, 4, 4, 6, 6, 6, 6, 0, 0 }; int direction; s32 xOffset, yOffset; @@ -434,7 +434,7 @@ void sub_0807DEDC(Entity* entity, ScriptExecutionContext* context, u32 x, u32 y) context->y.HALF.HI = y; xOffset = context->x.HALF.HI - entity->x.HALF.HI; yOffset = context->y.HALF.HI - entity->y.HALF.HI; - direction = sub_080045DA(xOffset, yOffset); + direction = CalculateDirectionFromOffsets(xOffset, yOffset); entity->direction = direction; entity->animationState = (entity->animationState & 0x80) | sDirectionTable[(u8)direction >> 4]; } @@ -575,11 +575,11 @@ void ExecuteScript(Entity* entity, ScriptExecutionContext* context) { ScriptCommand_WalkSouth, ScriptCommand_WalkWest, ScriptCommand_0807ED24, - ScriptCommand_0807EDD4, - ScriptCommand_0807EE04, - ScriptCommand_0807EE30, - ScriptCommand_0807EEB4, - ScriptCommand_0807EEF4, + ScriptCommand_MoveTo, + ScriptCommand_LookAt, + ScriptCommand_MoveTowardsTarget, + ScriptCommand_MoveToPlayer, + ScriptCommand_MoveToOffset, ScriptCommand_0807EF3C, ScriptCommand_DoPostScriptAction, ScriptCommand_DoPostScriptAction2, @@ -1368,29 +1368,30 @@ void ScriptCommand_0807ED24(Entity* entity, ScriptExecutionContext* context) { gActiveScriptInfo.commandSize = 0; } -void ScriptCommand_0807EDD4(Entity* entity, ScriptExecutionContext* context) { +void ScriptCommand_MoveTo(Entity* entity, ScriptExecutionContext* context) { if (!context->unk_18) { context->unk_18 = 1; - ScriptCommand_0807EE04(entity, context); + ScriptCommand_LookAt(entity, context); } - ScriptCommand_0807EE30(entity, context); + ScriptCommand_MoveTowardsTarget(entity, context); + // Repeat this command until we are at the target. if (!context->condition) { gActiveScriptInfo.commandSize = 0; } } -void ScriptCommand_0807EE04(Entity* entity, ScriptExecutionContext* context) { - sub_0807DEDC(entity, context, context->scriptInstructionPointer[1] + gRoomControls.origin_x, +void ScriptCommand_LookAt(Entity* entity, ScriptExecutionContext* context) { + LookAt(entity, context, context->scriptInstructionPointer[1] + gRoomControls.origin_x, context->scriptInstructionPointer[2] + gRoomControls.origin_y); gActiveScriptInfo.flags |= 1; } -void ScriptCommand_0807EE30(Entity* entity, ScriptExecutionContext* context) { +void ScriptCommand_MoveTowardsTarget(Entity* entity, ScriptExecutionContext* context) { s32 tmp, tmp2; if (!--context->unk_19) { context->unk_19 = 8; entity->direction = - sub_080045DA(context->x.HALF.HI - entity->x.HALF.HI, context->y.HALF.HI - entity->y.HALF.HI); + CalculateDirectionFromOffsets(context->x.HALF.HI - entity->x.HALF.HI, context->y.HALF.HI - entity->y.HALF.HI); } tmp = entity->x.HALF.HI - context->x.HALF.HI; tmp2 = entity->y.HALF.HI - context->y.HALF.HI; @@ -1406,24 +1407,26 @@ void ScriptCommand_0807EE30(Entity* entity, ScriptExecutionContext* context) { } } -void ScriptCommand_0807EEB4(Entity* entity, ScriptExecutionContext* context) { +void ScriptCommand_MoveToPlayer(Entity* entity, ScriptExecutionContext* context) { if (!context->unk_18) { context->unk_18 = 1; - sub_0807DEDC(entity, context, gPlayerEntity.x.HALF.HI, gPlayerEntity.y.HALF.HI); + LookAt(entity, context, gPlayerEntity.x.HALF.HI, gPlayerEntity.y.HALF.HI); } - ScriptCommand_0807EE30(entity, context); + ScriptCommand_MoveTowardsTarget(entity, context); + // Repeat this command until we are at the target. if (!context->condition) { gActiveScriptInfo.commandSize = 0; } } -void ScriptCommand_0807EEF4(Entity* entity, ScriptExecutionContext* context) { +void ScriptCommand_MoveToOffset(Entity* entity, ScriptExecutionContext* context) { if (!context->unk_18) { context->unk_18 = 1; - sub_0807DEDC(entity, context, entity->x.HALF.HI + ((s16)context->scriptInstructionPointer[1]), + LookAt(entity, context, entity->x.HALF.HI + ((s16)context->scriptInstructionPointer[1]), entity->y.HALF.HI + ((s16)context->scriptInstructionPointer[2])); } - ScriptCommand_0807EE30(entity, context); + ScriptCommand_MoveTowardsTarget(entity, context); + // Repeat this command until we are at the target. if (!context->condition) { gActiveScriptInfo.commandSize = 0; } @@ -1573,7 +1576,7 @@ void sub_0807F190(Entity* entity, ScriptExecutionContext* context) { } void sub_0807F1A0(Entity* entity, ScriptExecutionContext* context) { - sub_0807DEDC(entity, context, gPlayerEntity.x.HALF.HI, gPlayerEntity.y.HALF.HI); + LookAt(entity, context, gPlayerEntity.x.HALF.HI, gPlayerEntity.y.HALF.HI); gActiveScriptInfo.flags |= 1; } diff --git a/src/vram.c b/src/vram.c index 1e8b04da..8c43f244 100644 --- a/src/vram.c +++ b/src/vram.c @@ -295,28 +295,28 @@ void SetGFXSlotStatus(GfxSlot* slot, u32 status) { } /** - * Finds slotCount continous free slots and returns the index of the first slot or 0 if not enough free slots could be + * Finds slotCount continuos free slots and returns the index of the first slot or 0 if not enough free slots could be * found. */ u32 FindFreeGFXSlots(u32 slotCount) { u32 index; - u32 continuousFreeSlots = 0; + u32 continuosFreeSlots = 0; - // First search for enough continous free slots. + // First search for enough continuos free slots. for (index = 4; index < MAX_GFX_SLOTS; index++) { if (gGFXSlots.slots[index].status == GFX_SLOT_FREE) { - continuousFreeSlots++; - if (slotCount <= continuousFreeSlots) { - return (index - continuousFreeSlots) + 1; + continuosFreeSlots++; + if (slotCount <= continuosFreeSlots) { + return (index - continuosFreeSlots) + 1; } } else { - continuousFreeSlots = 0; + continuosFreeSlots = 0; } } - // Now also search for enough continous free or unused slots. - continuousFreeSlots = 0; + // Now also search for enough continuos free or unused slots. + continuosFreeSlots = 0; index = 4; for (index = 4; index < MAX_GFX_SLOTS; index++) { #ifdef EU @@ -324,12 +324,12 @@ u32 FindFreeGFXSlots(u32 slotCount) { #else if (gGFXSlots.slots[index].status == GFX_SLOT_FREE || gGFXSlots.slots[index].status == GFX_SLOT_UNLOADED) { #endif - continuousFreeSlots++; - if (slotCount <= continuousFreeSlots) { - return (index - continuousFreeSlots) + 1; + continuosFreeSlots++; + if (slotCount <= continuosFreeSlots) { + return (index - continuosFreeSlots) + 1; } } else { - continuousFreeSlots = 0; + continuosFreeSlots = 0; } } return 0; diff --git a/tools/src/asset_processor/assets/dungeonmap.cpp b/tools/src/asset_processor/assets/dungeonmap.cpp index c01db47e..96b42210 100644 --- a/tools/src/asset_processor/assets/dungeonmap.cpp +++ b/tools/src/asset_processor/assets/dungeonmap.cpp @@ -59,7 +59,7 @@ void DungeonMapAsset::buildToBinary() { file.close(); auto output_file = util::open_file(buildPath, "w"); - char byte = 0; + int byte = 0; size_t pixels = 0; for (size_t i = 0; i < static_cast(fileSize); i++) { switch (data[i]) { diff --git a/tools/src/asset_processor/main.cpp b/tools/src/asset_processor/main.cpp index 0bc45518..eddce2b0 100644 --- a/tools/src/asset_processor/main.cpp +++ b/tools/src/asset_processor/main.cpp @@ -282,7 +282,7 @@ std::unique_ptr getAssetHandlerByType(const std::filesystem::path& pa assetHandler = std::make_unique(path, start, size, asset); } else if (type == "metatilemap" || type == "metatileset_types" || type == "metatileset" || - type == "map_mapping1" || type == "map_mapping2" || type == "tileset_mapping3" || + type == "map_mapping1" || type == "map_mapping2" || type == "map_collision") { assetHandler = std::make_unique(path, start, size, asset); } else if (type == "dungeon_map") {