z_map decompiled (#1032)

* First batch of functions

* more ok

* z_map_data OK

* More OKs, MinimapList ZAPD breaking change

* func_80103A58 improvements, more OK

* func_80106D5C and func_801091F0 decomped

* func_801031D0 decomped and some fixes

* house cleaning, more OKs more decomp

* Even more OKs

* func_80105C40 almost OK, more OKs

* func_80108AF8 OK and more

* All functions attempted

* func_8010534C OK

* Start documentation, rename DoorCtx

* More OKs, split map_data.data, more doc

* incremental clean-up, more function names

* more function names

* func_801068FC OK

* old uncommitted changes

* minor tweaks

* implement easy fixes

* more fixes

* z_map_disp OK, implement more suggestions

* delete utility program

* migrate data

* TransiActor ->TransitionActor

* Major documentation pass

* first pass of changes

* warning fix attempt, revert ZFile.cpp

* Fix FAKE match

* Easy fixes

* implement gDPLoadTextureBlock_Runtime

* z_demo bss patch

* Extract white square texture

* Implement more suggestions

* rework MapIndex/DungeonIndex

* revert dungeonSceneIndex -> mapIndex in some spots, implement suggestions

* more suggestions

* minor nits

* fix #include

1 files changed, 96 insertions, 96 deletions

diff --git a/tools/sizes/code_functions.csv b/tools/sizes/code_functions.csv
index 1515fb69d..398f98bde 100644
--- a/tools/sizes/code_functions.csv
+++ b/tools/sizes/code_functions.csv
@@ -1415,113 +1415,113 @@ asm/non_matchings/code/z_malloc/ZeldaArena_Check.s,ZeldaArena_Check,0x80102D98,0
 asm/non_matchings/code/z_malloc/ZeldaArena_Init.s,ZeldaArena_Init,0x80102DBC,0xC
 asm/non_matchings/code/z_malloc/ZeldaArena_Cleanup.s,ZeldaArena_Cleanup,0x80102DEC,0x9
 asm/non_matchings/code/z_malloc/ZeldaArena_IsInitialized.s,ZeldaArena_IsInitialized,0x80102E10,0xC
-asm/non_matchings/code/z_map_disp/func_80102E40.s,func_80102E40,0x80102E40,0x14
-asm/non_matchings/code/z_map_disp/func_80102E90.s,func_80102E90,0x80102E90,0x5
-asm/non_matchings/code/z_map_disp/func_80102EA4.s,func_80102EA4,0x80102EA4,0x4
+asm/non_matchings/code/z_map_disp/MapDisp_GetMapITexture.s,MapDisp_GetMapITexture,0x80102E40,0x14
+asm/non_matchings/code/z_map_disp/MapDisp_InitRoomStoreyRecord.s,MapDisp_InitRoomStoreyRecord,0x80102E90,0x5
+asm/non_matchings/code/z_map_disp/MapDisp_DestroyRoomStoreyRecord.s,MapDisp_DestroyRoomStoreyRecord,0x80102EA4,0x4
 asm/non_matchings/code/z_map_disp/func_80102EB4.s,func_80102EB4,0x80102EB4,0x7
 asm/non_matchings/code/z_map_disp/func_80102ED0.s,func_80102ED0,0x80102ED0,0x8
-asm/non_matchings/code/z_map_disp/func_80102EF0.s,func_80102EF0,0x80102EF0,0x2B
-asm/non_matchings/code/z_map_disp/func_80102F9C.s,func_80102F9C,0x80102F9C,0x3D
-asm/non_matchings/code/z_map_disp/func_80103090.s,func_80103090,0x80103090,0x9
-asm/non_matchings/code/z_map_disp/func_801030B4.s,func_801030B4,0x801030B4,0x10
-asm/non_matchings/code/z_map_disp/func_801030F4.s,func_801030F4,0x801030F4,0x37
-asm/non_matchings/code/z_map_disp/func_801031D0.s,func_801031D0,0x801031D0,0x207
-asm/non_matchings/code/z_map_disp/func_801039EC.s,func_801039EC,0x801039EC,0x9
-asm/non_matchings/code/z_map_disp/func_80103A10.s,func_80103A10,0x80103A10,0x12
-asm/non_matchings/code/z_map_disp/func_80103A58.s,func_80103A58,0x80103A58,0x251
-asm/non_matchings/code/z_map_disp/func_8010439C.s,func_8010439C,0x8010439C,0x84
-asm/non_matchings/code/z_map_disp/func_801045AC.s,func_801045AC,0x801045AC,0x14F
-asm/non_matchings/code/z_map_disp/func_80104AE8.s,func_80104AE8,0x80104AE8,0x66
-asm/non_matchings/code/z_map_disp/func_80104C80.s,func_80104C80,0x80104C80,0x1D
-asm/non_matchings/code/z_map_disp/func_80104CF4.s,func_80104CF4,0x80104CF4,0x90
-asm/non_matchings/code/z_map_disp/func_80104F34.s,func_80104F34,0x80104F34,0xD8
-asm/non_matchings/code/z_map_disp/func_80105294.s,func_80105294,0x80105294,0x21
-asm/non_matchings/code/z_map_disp/func_80105318.s,func_80105318,0x80105318,0x4
-asm/non_matchings/code/z_map_disp/func_80105328.s,func_80105328,0x80105328,0x9
-asm/non_matchings/code/z_map_disp/func_8010534C.s,func_8010534C,0x8010534C,0x54
-asm/non_matchings/code/z_map_disp/func_8010549C.s,func_8010549C,0x8010549C,0x70
-asm/non_matchings/code/z_map_disp/func_8010565C.s,func_8010565C,0x8010565C,0x6F
-asm/non_matchings/code/z_map_disp/func_80105818.s,func_80105818,0x80105818,0x8A
-asm/non_matchings/code/z_map_disp/func_80105A40.s,func_80105A40,0x80105A40,0x3D
-asm/non_matchings/code/z_map_disp/func_80105B34.s,func_80105B34,0x80105B34,0x43
-asm/non_matchings/code/z_map_disp/func_80105C40.s,func_80105C40,0x80105C40,0xE8
-asm/non_matchings/code/z_map_disp/func_80105FE0.s,func_80105FE0,0x80105FE0,0x10A
-asm/non_matchings/code/z_map_disp/func_80106408.s,func_80106408,0x80106408,0x12
-asm/non_matchings/code/z_map_disp/func_80106450.s,func_80106450,0x80106450,0x1F
-asm/non_matchings/code/z_map_disp/func_801064CC.s,func_801064CC,0x801064CC,0x19
-asm/non_matchings/code/z_map_disp/func_80106530.s,func_80106530,0x80106530,0x13
-asm/non_matchings/code/z_map_disp/func_8010657C.s,func_8010657C,0x8010657C,0x32
-asm/non_matchings/code/z_map_disp/func_80106644.s,func_80106644,0x80106644,0x7E
-asm/non_matchings/code/z_map_disp/func_8010683C.s,func_8010683C,0x8010683C,0x1E
-asm/non_matchings/code/z_map_disp/func_801068B4.s,func_801068B4,0x801068B4,0x9
-asm/non_matchings/code/z_map_disp/func_801068D8.s,func_801068D8,0x801068D8,0x9
-asm/non_matchings/code/z_map_disp/func_801068FC.s,func_801068FC,0x801068FC,0xBC
-asm/non_matchings/code/z_map_disp/func_80106BEC.s,func_80106BEC,0x80106BEC,0x47
-asm/non_matchings/code/z_map_disp/func_80106D08.s,func_80106D08,0x80106D08,0x15
-asm/non_matchings/code/z_map_disp/func_80106D5C.s,func_80106D5C,0x80106D5C,0x387
-asm/non_matchings/code/z_map_disp/func_80107B78.s,func_80107B78,0x80107B78,0x16B
-asm/non_matchings/code/z_map_disp/func_80108124.s,func_80108124,0x80108124,0x10D
-asm/non_matchings/code/z_map_disp/func_80108558.s,func_80108558,0x80108558,0x12E
-asm/non_matchings/code/z_map_disp/func_80108A10.s,func_80108A10,0x80108A10,0x15
-asm/non_matchings/code/z_map_disp/func_80108A64.s,func_80108A64,0x80108A64,0x25
-asm/non_matchings/code/z_map_disp/func_80108AF8.s,func_80108AF8,0x80108AF8,0x16E
-asm/non_matchings/code/z_map_disp/func_801090B0.s,func_801090B0,0x801090B0,0x1D
-asm/non_matchings/code/z_map_disp/func_80109124.s,func_80109124,0x80109124,0x33
-asm/non_matchings/code/z_map_disp/func_801091F0.s,func_801091F0,0x801091F0,0x8E
-asm/non_matchings/code/z_map_disp/func_80109428.s,func_80109428,0x80109428,0x1E
-asm/non_matchings/code/z_map_data/func_801094A0.s,func_801094A0,0x801094A0,0xA
+asm/non_matchings/code/z_map_disp/MapDisp_CurRoomHasMapI.s,MapDisp_CurRoomHasMapI,0x80102EF0,0x2B
+asm/non_matchings/code/z_map_disp/MapDisp_GetStoreyY.s,MapDisp_GetStoreyY,0x80102F9C,0x3D
+asm/non_matchings/code/z_map_disp/MapDisp_GetMapTexDim.s,MapDisp_GetMapTexDim,0x80103090,0x9
+asm/non_matchings/code/z_map_disp/MapDisp_GetMapScale.s,MapDisp_GetMapScale,0x801030B4,0x10
+asm/non_matchings/code/z_map_disp/MapDisp_GetMapOffset.s,MapDisp_GetMapOffset,0x801030F4,0x37
+asm/non_matchings/code/z_map_disp/MapDisp_DrawMinimapRoom.s,MapDisp_DrawMinimapRoom,0x801031D0,0x207
+asm/non_matchings/code/z_map_disp/MapDisp_IsDataRotated.s,MapDisp_IsDataRotated,0x801039EC,0x9
+asm/non_matchings/code/z_map_disp/MapDisp_CanDrawDoors.s,MapDisp_CanDrawDoors,0x80103A10,0x12
+asm/non_matchings/code/z_map_disp/MapDisp_Minimap_DrawActorIcon.s,MapDisp_Minimap_DrawActorIcon,0x80103A58,0x251
+asm/non_matchings/code/z_map_disp/MapDisp_Minimap_DrawActors.s,MapDisp_Minimap_DrawActors,0x8010439C,0x84
+asm/non_matchings/code/z_map_disp/MapDisp_Minimap_DrawDoorActor.s,MapDisp_Minimap_DrawDoorActor,0x801045AC,0x14F
+asm/non_matchings/code/z_map_disp/MapDisp_Minimap_DrawDoorActors.s,MapDisp_Minimap_DrawDoorActors,0x80104AE8,0x66
+asm/non_matchings/code/z_map_disp/MapDisp_AwaitGameplayDangeonKeep.s,MapDisp_AwaitGameplayDangeonKeep,0x80104C80,0x1D
+asm/non_matchings/code/z_map_disp/MapDisp_Init.s,MapDisp_Init,0x80104CF4,0x90
+asm/non_matchings/code/z_map_disp/MapDisp_InitSceneFloorData.s,MapDisp_InitSceneFloorData,0x80104F34,0xD8
+asm/non_matchings/code/z_map_disp/MapDisp_GetBossIconY.s,MapDisp_GetBossIconY,0x80105294,0x21
+asm/non_matchings/code/z_map_disp/MapDisp_GetBossRoomStorey.s,MapDisp_GetBossRoomStorey,0x80105318,0x4
+asm/non_matchings/code/z_map_disp/MapDisp_IsBossDoor.s,MapDisp_IsBossDoor,0x80105328,0x9
+asm/non_matchings/code/z_map_disp/MapDisp_InitBossRoomStorey.s,MapDisp_InitBossRoomStorey,0x8010534C,0x54
+asm/non_matchings/code/z_map_disp/MapDisp_InitMapData.s,MapDisp_InitMapData,0x8010549C,0x70
+asm/non_matchings/code/z_map_disp/MapDisp_InitChestData.s,MapDisp_InitChestData,0x8010565C,0x6F
+asm/non_matchings/code/z_map_disp/MapDisp_InitTransitionActorData.s,MapDisp_InitTransitionActorData,0x80105818,0x8A
+asm/non_matchings/code/z_map_disp/MapDisp_Destroy.s,MapDisp_Destroy,0x80105A40,0x3D
+asm/non_matchings/code/z_map_disp/MapDisp_Update.s,MapDisp_Update,0x80105B34,0x43
+asm/non_matchings/code/z_map_disp/MapDisp_SwapRooms.s,MapDisp_SwapRooms,0x80105C40,0xE8
+asm/non_matchings/code/z_map_disp/MapDisp_Minimap_DrawRedCompassIcon.s,MapDisp_Minimap_DrawRedCompassIcon,0x80105FE0,0x10A
+asm/non_matchings/code/z_map_disp/MapDisp_IsLocationRomaniRanchAltScene.s,MapDisp_IsLocationRomaniRanchAltScene,0x80106408,0x12
+asm/non_matchings/code/z_map_disp/MapDisp_CanDisplayMinimap.s,MapDisp_CanDisplayMinimap,0x80106450,0x1F
+asm/non_matchings/code/z_map_disp/MapDisp_IsLocationMinimapBlocked.s,MapDisp_IsLocationMinimapBlocked,0x801064CC,0x19
+asm/non_matchings/code/z_map_disp/MapDisp_IsMinimapToggleBlocked.s,MapDisp_IsMinimapToggleBlocked,0x80106530,0x13
+asm/non_matchings/code/z_map_disp/MapDisp_AreRoomsSameStorey.s,MapDisp_AreRoomsSameStorey,0x8010657C,0x32
+asm/non_matchings/code/z_map_disp/MapDisp_DrawMinimap.s,MapDisp_DrawMinimap,0x80106644,0x7E
+asm/non_matchings/code/z_map_disp/MapDisp_ResetMapI.s,MapDisp_ResetMapI,0x8010683C,0x1E
+asm/non_matchings/code/z_map_disp/MapDisp_InitMapI.s,MapDisp_InitMapI,0x801068B4,0x9
+asm/non_matchings/code/z_map_disp/MapDisp_DestroyMapI.s,MapDisp_DestroyMapI,0x801068D8,0x9
+asm/non_matchings/code/z_map_disp/MapDisp_AllocDungeonMap.s,MapDisp_AllocDungeonMap,0x801068FC,0xBC
+asm/non_matchings/code/z_map_disp/MapDisp_IsOnStorey.s,MapDisp_IsOnStorey,0x80106BEC,0x47
+asm/non_matchings/code/z_map_disp/MapDisp_ConvertBossSceneToDungeonScene.s,MapDisp_ConvertBossSceneToDungeonScene,0x80106D08,0x15
+asm/non_matchings/code/z_map_disp/MapDisp_DrawRooms.s,MapDisp_DrawRooms,0x80106D5C,0x387
+asm/non_matchings/code/z_map_disp/MapDisp_DrawChests.s,MapDisp_DrawChests,0x80107B78,0x16B
+asm/non_matchings/code/z_map_disp/MapDisp_DrawRoomExits.s,MapDisp_DrawRoomExits,0x80108124,0x10D
+asm/non_matchings/code/z_map_disp/MapDisp_DrawBossIcon.s,MapDisp_DrawBossIcon,0x80108558,0x12E
+asm/non_matchings/code/z_map_disp/MapDisp_GetDungeonMapFloorTexture.s,MapDisp_GetDungeonMapFloorTexture,0x80108A10,0x15
+asm/non_matchings/code/z_map_disp/MapDisp_SkipDrawDungeonMap.s,MapDisp_SkipDrawDungeonMap,0x80108A64,0x25
+asm/non_matchings/code/z_map_disp/MapDisp_DrawDungeonFloorSelect.s,MapDisp_DrawDungeonFloorSelect,0x80108AF8,0x16E
+asm/non_matchings/code/z_map_disp/MapDisp_IsValidStorey.s,MapDisp_IsValidStorey,0x801090B0,0x1D
+asm/non_matchings/code/z_map_disp/MapDisp_GetPlayerStorey.s,MapDisp_GetPlayerStorey,0x80109124,0x33
+asm/non_matchings/code/z_map_disp/MapDisp_DrawDungeonMap.s,MapDisp_DrawDungeonMap,0x801091F0,0x8E
+asm/non_matchings/code/z_map_disp/MapDisp_UpdateDungeonMap.s,MapDisp_UpdateDungeonMap,0x80109428,0x1E
+asm/non_matchings/code/z_map_data/MapData_GetMapColor.s,MapData_GetMapColor,0x801094A0,0xA
 asm/non_matchings/code/z_map_data/func_801094C8.s,func_801094C8,0x801094C8,0xC
-asm/non_matchings/code/z_map_data/func_801094F8.s,func_801094F8,0x801094F8,0xC
-asm/non_matchings/code/z_map_data/func_80109528.s,func_80109528,0x80109528,0x9
-asm/non_matchings/code/z_map_data/func_8010954C.s,func_8010954C,0x8010954C,0x8
+asm/non_matchings/code/z_map_data/MapData_GetMapTexOffsetGameplayDangeonKeep.s,MapData_GetMapTexOffsetGameplayDangeonKeep,0x801094F8,0xC
+asm/non_matchings/code/z_map_data/MapData_GetMapDrawTypeGameplayDangeonKeep.s,MapData_GetMapDrawTypeGameplayDangeonKeep,0x80109528,0x9
+asm/non_matchings/code/z_map_data/MapData_GetMapColorIndexGameplayDangeonKeep.s,MapData_GetMapColorIndexGameplayDangeonKeep,0x8010954C,0x8
 asm/non_matchings/code/z_map_data/func_8010956C.s,func_8010956C,0x8010956C,0x8
-asm/non_matchings/code/z_map_data/func_8010958C.s,func_8010958C,0x8010958C,0x8
+asm/non_matchings/code/z_map_data/MapData_GetMapTexGameplayDangeonKeep.s,MapData_GetMapTexGameplayDangeonKeep,0x8010958C,0x8
 asm/non_matchings/code/z_map_data/func_801095AC.s,func_801095AC,0x801095AC,0xC
-asm/non_matchings/code/z_map_data/func_801095DC.s,func_801095DC,0x801095DC,0xC
-asm/non_matchings/code/z_map_data/func_8010960C.s,func_8010960C,0x8010960C,0x9
-asm/non_matchings/code/z_map_data/func_80109630.s,func_80109630,0x80109630,0x8
-asm/non_matchings/code/z_map_data/func_80109650.s,func_80109650,0x80109650,0x8
-asm/non_matchings/code/z_map_data/func_80109670.s,func_80109670,0x80109670,0x19
-asm/non_matchings/code/z_map_data/func_801096D4.s,func_801096D4,0x801096D4,0x10
-asm/non_matchings/code/z_map_data/func_80109714.s,func_80109714,0x80109714,0x10
+asm/non_matchings/code/z_map_data/MapData_GetMapTexGameplayDangeonKeepOffset.s,MapData_GetMapTexGameplayDangeonKeepOffset,0x801095DC,0xC
+asm/non_matchings/code/z_map_data/MapData_GetMapGrandDrawType.s,MapData_GetMapGrandDrawType,0x8010960C,0x9
+asm/non_matchings/code/z_map_data/MapData_GetMapGrandColorIndex.s,MapData_GetMapGrandColorIndex,0x80109630,0x8
+asm/non_matchings/code/z_map_data/MapData_GetMapGrandScale.s,MapData_GetMapGrandScale,0x80109650,0x8
+asm/non_matchings/code/z_map_data/MapData_MapGrandTexSizeTest.s,MapData_MapGrandTexSizeTest,0x80109670,0x19
+asm/non_matchings/code/z_map_data/MapData_GetSizeOfMapGrandTex.s,MapData_GetSizeOfMapGrandTex,0x801096D4,0x10
+asm/non_matchings/code/z_map_data/MapData_MID_GetType.s,MapData_MID_GetType,0x80109714,0x10
 asm/non_matchings/code/z_map_data/func_80109754.s,func_80109754,0x80109754,0x1D
-asm/non_matchings/code/z_map_data/func_801097C8.s,func_801097C8,0x801097C8,0x1D
+asm/non_matchings/code/z_map_data/MapData_GetMapTexOffset.s,MapData_GetMapTexOffset,0x801097C8,0x1D
 asm/non_matchings/code/z_map_data/func_8010983C.s,func_8010983C,0x8010983C,0x19
-asm/non_matchings/code/z_map_data/func_801098A0.s,func_801098A0,0x801098A0,0x1A
-asm/non_matchings/code/z_map_data/func_80109908.s,func_80109908,0x80109908,0x17
+asm/non_matchings/code/z_map_data/MapData_GetDrawType.s,MapData_GetDrawType,0x801098A0,0x1A
+asm/non_matchings/code/z_map_data/MapData_GetMapColorIndex.s,MapData_GetMapColorIndex,0x80109908,0x17
 asm/non_matchings/code/z_map_data/func_80109964.s,func_80109964,0x80109964,0x6
-asm/non_matchings/code/z_map_data/func_8010997C.s,func_8010997C,0x8010997C,0xC
-asm/non_matchings/code/z_map_data/func_801099AC.s,func_801099AC,0x801099AC,0xC
-asm/non_matchings/code/z_map_data/func_801099DC.s,func_801099DC,0x801099DC,0x9
-asm/non_matchings/code/z_map_data/func_80109A00.s,func_80109A00,0x80109A00,0x8
-asm/non_matchings/code/z_map_data/func_80109A20.s,func_80109A20,0x80109A20,0x8
-asm/non_matchings/code/z_map_data/func_80109A40.s,func_80109A40,0x80109A40,0x16
-asm/non_matchings/code/z_map_data/func_80109A98.s,func_80109A98,0x80109A98,0x10
-asm/non_matchings/code/z_map_data/func_80109AD8.s,func_80109AD8,0x80109AD8,0x18
+asm/non_matchings/code/z_map_data/MapData_GetMapITexDim.s,MapData_GetMapITexDim,0x8010997C,0xC
+asm/non_matchings/code/z_map_data/MapData_GetMapITexOffset.s,MapData_GetMapITexOffset,0x801099AC,0xC
+asm/non_matchings/code/z_map_data/MapData_GetMapIDrawType.s,MapData_GetMapIDrawType,0x801099DC,0x9
+asm/non_matchings/code/z_map_data/MapData_GetMapIColorIndex.s,MapData_GetMapIColorIndex,0x80109A00,0x8
+asm/non_matchings/code/z_map_data/MapData_GetMapIScale.s,MapData_GetMapIScale,0x80109A20,0x8
+asm/non_matchings/code/z_map_data/MapData_MapITexSizeTest.s,MapData_MapITexSizeTest,0x80109A40,0x16
+asm/non_matchings/code/z_map_data/MapDisp_GetSizeOfMapITex.s,MapDisp_GetSizeOfMapITex,0x80109A98,0x10
+asm/non_matchings/code/z_map_data/MapData_GetMapIId.s,MapData_GetMapIId,0x80109AD8,0x18
 asm/non_matchings/code/z_map_data/func_80109B38.s,func_80109B38,0x80109B38,0x1A
-asm/non_matchings/code/z_map_data/func_80109BA0.s,func_80109BA0,0x80109BA0,0x15
-asm/non_matchings/code/z_map_data/func_80109BF4.s,func_80109BF4,0x80109BF4,0x11
+asm/non_matchings/code/z_map_data/MapData_GetMapCompactId.s,MapData_GetMapCompactId,0x80109BA0,0x15
+asm/non_matchings/code/z_map_data/MapData_CPID_GetType.s,MapData_CPID_GetType,0x80109BF4,0x11
 asm/non_matchings/code/z_map_data/func_80109C38.s,func_80109C38,0x80109C38,0x21
 asm/non_matchings/code/z_map_data/func_80109CBC.s,func_80109CBC,0x80109CBC,0x21
-asm/non_matchings/code/z_map_data/func_80109D40.s,func_80109D40,0x80109D40,0x26
-asm/non_matchings/code/z_map_data/func_80109DD8.s,func_80109DD8,0x80109DD8,0x26
-asm/non_matchings/code/z_map_data/func_80109E70.s,func_80109E70,0x80109E70,0x22
-asm/non_matchings/code/z_map_data/func_80109EF8.s,func_80109EF8,0x80109EF8,0x20
-asm/non_matchings/code/z_map_data/func_80109F78.s,func_80109F78,0x80109F78,0x22
-asm/non_matchings/code/z_map_exp/Map_GetDungeonOrBossAreaIndex.s,Map_GetDungeonOrBossAreaIndex,0x8010A000,0x1D
-asm/non_matchings/code/z_map_exp/Map_IsInDungeonOrBossArea.s,Map_IsInDungeonOrBossArea,0x8010A074,0xC
-asm/non_matchings/code/z_map_exp/func_8010A0A4.s,func_8010A0A4,0x8010A0A4,0x13
-asm/non_matchings/code/z_map_exp/Map_GetDungeonAreaIndex.s,Map_GetDungeonAreaIndex,0x8010A0F0,0x1D
-asm/non_matchings/code/z_map_exp/Map_IsInDungeonArea.s,Map_IsInDungeonArea,0x8010A164,0xC
-asm/non_matchings/code/z_map_exp/Map_GetBossAreaIndex.s,Map_GetBossAreaIndex,0x8010A194,0x1D
-asm/non_matchings/code/z_map_exp/Map_IsInBossArea.s,Map_IsInBossArea,0x8010A208,0xC
-asm/non_matchings/code/z_map_exp/func_8010A238.s,func_8010A238,0x8010A238,0x1D
-asm/non_matchings/code/z_map_exp/func_8010A2AC.s,func_8010A2AC,0x8010A2AC,0xC
-asm/non_matchings/code/z_map_exp/Minimap_SavePlayerRoomInitInfo.s,Minimap_SavePlayerRoomInitInfo,0x8010A2DC,0x18
+asm/non_matchings/code/z_map_data/MapData_CPID_GetTexDim.s,MapData_CPID_GetTexDim,0x80109D40,0x26
+asm/non_matchings/code/z_map_data/MapData_CPID_GetTexOffset.s,MapData_CPID_GetTexOffset,0x80109DD8,0x26
+asm/non_matchings/code/z_map_data/MapData_CPID_GetDrawType.s,MapData_CPID_GetDrawType,0x80109E70,0x22
+asm/non_matchings/code/z_map_data/MapData_CPID_GetMapColorIndex.s,MapData_CPID_GetMapColorIndex,0x80109EF8,0x20
+asm/non_matchings/code/z_map_data/MapData_CPID_GetMapScale.s,MapData_CPID_GetMapScale,0x80109F78,0x22
+asm/non_matchings/code/z_map_exp/Map_GetDungeonSceneIndex.s,Map_GetDungeonSceneIndex,0x8010A000,0x1D
+asm/non_matchings/code/z_map_exp/Map_IsInDungeonOrBossScene.s,Map_IsInDungeonOrBossScene,0x8010A074,0xC
+asm/non_matchings/code/z_map_exp/Map_CurRoomHasMapI.s,Map_CurRoomHasMapI,0x8010A0A4,0x13
+asm/non_matchings/code/z_map_exp/Map_GetDungeonSceneIndexForDungeon.s,Map_GetDungeonSceneIndexForDungeon,0x8010A0F0,0x1D
+asm/non_matchings/code/z_map_exp/Map_IsInDungeonScene.s,Map_IsInDungeonScene,0x8010A164,0xC
+asm/non_matchings/code/z_map_exp/Map_GetDungeonSceneIndexForBoss.s,Map_GetDungeonSceneIndexForBoss,0x8010A194,0x1D
+asm/non_matchings/code/z_map_exp/Map_IsInBossScene.s,Map_IsInBossScene,0x8010A208,0xC
+asm/non_matchings/code/z_map_exp/Map_GetMapIndexForOverworld.s,Map_GetMapIndexForOverworld,0x8010A238,0x1D
+asm/non_matchings/code/z_map_exp/Map_IsInOverworldSceneWithMapIndex.s,Map_IsInOverworldSceneWithMapIndex,0x8010A2AC,0xC
+asm/non_matchings/code/z_map_exp/Map_SetAreaEntrypoint.s,Map_SetAreaEntrypoint,0x8010A2DC,0x18
 asm/non_matchings/code/z_map_exp/Map_InitRoomData.s,Map_InitRoomData,0x8010A33C,0x35
 asm/non_matchings/code/z_map_exp/Map_Destroy.s,Map_Destroy,0x8010A410,0x8
 asm/non_matchings/code/z_map_exp/Map_Init.s,Map_Init,0x8010A430,0x47
-asm/non_matchings/code/z_map_exp/Minimap_Draw.s,Minimap_Draw,0x8010A54C,0xD
+asm/non_matchings/code/z_map_exp/Map_DrawMinimap.s,Map_DrawMinimap,0x8010A54C,0xD
 asm/non_matchings/code/z_map_exp/Map_Update.s,Map_Update,0x8010A580,0x78
 asm/non_matchings/code/z_msgevent/MsgEvent_CheckWeekEventReg.s,MsgEvent_CheckWeekEventReg,0x8010A760,0x1B
 asm/non_matchings/code/z_msgevent/MsgEvent_CheckGoron.s,MsgEvent_CheckGoron,0x8010A7CC,0x12
@@ -1948,7 +1948,7 @@ asm/non_matchings/code/z_scene/Scene_CommandMesh.s,Scene_CommandMesh,0x8012FBE8,
 asm/non_matchings/code/z_scene/Scene_CommandObjectList.s,Scene_CommandObjectList,0x8012FC18,0x63
 asm/non_matchings/code/z_scene/Scene_CommandLightList.s,Scene_CommandLightList,0x8012FDA4,0x22
 asm/non_matchings/code/z_scene/Scene_CommandPathList.s,Scene_CommandPathList,0x8012FE2C,0xC
-asm/non_matchings/code/z_scene/Scene_CommandTransiActorList.s,Scene_CommandTransiActorList,0x8012FE5C,0x18
+asm/non_matchings/code/z_scene/Scene_CommandTransitionActorList.s,Scene_CommandTransitionActorList,0x8012FE5C,0x18
 asm/non_matchings/code/z_scene/Door_InitContext.s,Door_InitContext,0x8012FEBC,0x4
 asm/non_matchings/code/z_scene/Scene_CommandEnvLightSettings.s,Scene_CommandEnvLightSettings,0x8012FECC,0x11
 asm/non_matchings/code/z_scene/Scene_LoadAreaTextures.s,Scene_LoadAreaTextures,0x8012FF10,0x1F
@@ -1963,9 +1963,9 @@ asm/non_matchings/code/z_scene/Scene_CommandEchoSetting.s,Scene_CommandEchoSetti
 asm/non_matchings/code/z_scene/Scene_CommandAltHeaderList.s,Scene_CommandAltHeaderList,0x80130454,0x1E
 asm/non_matchings/code/z_scene/Scene_CommandCutsceneScriptList.s,Scene_CommandCutsceneScriptList,0x801304CC,0xD
 asm/non_matchings/code/z_scene/Scene_CommandCutsceneList.s,Scene_CommandCutsceneList,0x80130500,0x10
-asm/non_matchings/code/z_scene/Scene_CommandMiniMap.s,Scene_CommandMiniMap,0x80130540,0xE
+asm/non_matchings/code/z_scene/Scene_CommandMapData.s,Scene_CommandMapData,0x80130540,0xE
 asm/non_matchings/code/z_scene/Scene_Command1D.s,Scene_Command1D,0x80130578,0x4
-asm/non_matchings/code/z_scene/Scene_CommandMiniMapCompassInfo.s,Scene_CommandMiniMapCompassInfo,0x80130588,0xA
+asm/non_matchings/code/z_scene/Scene_CommandMapDataChests.s,Scene_CommandMapDataChests,0x80130588,0xA
 asm/non_matchings/code/z_scene/Scene_CommandSetRegionVisitedFlag.s,Scene_CommandSetRegionVisitedFlag,0x801305B0,0x31
 asm/non_matchings/code/z_scene/Scene_CommandAnimatedMaterials.s,Scene_CommandAnimatedMaterials,0x80130674,0xC
 asm/non_matchings/code/z_scene/Scene_SetExitFade.s,Scene_SetExitFade,0x801306A4,0x11