Merge remote-tracking branch 'upstream/master' into Aliens

5 files changed, 84 insertions, 82 deletions

diff --git a/tools/disasm/functions.txt b/tools/disasm/functions.txt
index 403d163e3..558efc8fb 100644
--- a/tools/disasm/functions.txt
+++ b/tools/disasm/functions.txt
@@ -2410,7 +2410,7 @@
     0x8012ED78:("Inventory_DeleteEquipment",),
     0x8012EDE8:("Inventory_ChangeUpgrade",),
     0x8012EE34:("Inventory_IsMapVisible",),
-    0x8012EF0C:("Inventory_SetMapVisibility",),
+    0x8012EF0C:("Inventory_SetWorldMapCloudVisibility",),
     0x8012F0EC:("Inventory_SaveDekuPlaygroundHighScore",),
     0x8012F1BC:("Inventory_IncrementSkullTokenCount",),
     0x8012F22C:("Inventory_GetSkullTokenCount",),
@@ -2452,7 +2452,7 @@
     0x80130540:("Scene_HeaderCmdMiniMap",),
     0x80130578:("Scene_HeaderCmd1D",),
     0x80130588:("Scene_HeaderCmdMiniMapCompassInfo",),
-    0x801305B0:("Scene_HeaderCmdSetAreaVisitedFlag",),
+    0x801305B0:("Scene_HeaderCmdSetRegionVisitedFlag",),
     0x80130674:("Scene_HeaderCmdAnimatedMaterials",),
     0x801306A4:("Scene_SetExitFade",),
     0x801306E8:("Scene_ProcessHeader",),
@@ -2880,7 +2880,7 @@
     0x80158C04:("Message_LoadLocalizedRupeesNES",),
     0x80158D98:("Message_LoadRupeesNES",),
     0x80158FB0:("Message_LoadTimeNES",),
-    0x8015926C:("Message_LoadAreaTextNES",),
+    0x8015926C:("Message_LoadOwlWarpTextNES",),
     0x80159438:("func_80159438",),
     0x8015966C:("func_8015966C",),
     0x8015B198:("func_8015B198",),
@@ -4209,11 +4209,11 @@
     0x8081B6EC:("KaleidoScope_DrawItemSelect",),
     0x8081BCA8:("KaleidoScope_UpdateItemCursor",),
     0x8081C684:("KaleidoScope_UpdateItemEquip",),
-    0x8081D240:("func_8081D240",),
-    0x8081D6DC:("func_8081D6DC",),
-    0x8081E118:("func_8081E118",),
-    0x8081E7D8:("func_8081E7D8",),
-    0x8081FB1C:("func_8081FB1C",),
+    0x8081D240:("KaleidoScope_DrawDungeonStrayFairyCount",),
+    0x8081D6DC:("KaleidoScope_DrawDungeonMap",),
+    0x8081E118:("KaleidoScope_UpdateDungeonCursor",),
+    0x8081E7D8:("KaleidoScope_DrawWorldMap",),
+    0x8081FB1C:("KaleidoScope_UpdateWorldMapCursor",),
     0x8081FF80:("KaleidoScope_DrawMaskSelect",),
     0x808204AC:("KaleidoScope_UpdateMaskCursor",),
     0x80820FA4:("KaleidoScope_UpdateMaskEquip",),
@@ -4234,7 +4234,7 @@
     0x80824B90:("func_80824B90",),
     0x808256E4:("func_808256E4",),
     0x8082585C:("func_8082585C",),
-    0x808259D4:("func_808259D4",),
+    0x808259D4:("KaleidoScope_SetView",),
     0x80825A50:("func_80825A50",),
     0x80825E28:("func_80825E28",),
     0x808274DC:("func_808274DC",),
@@ -6903,14 +6903,14 @@
     0x809199FC:("func_809199FC",),
     0x80919D68:("EffDust_Draw",),
     0x80919F30:("func_80919F30",),
-    0x80919FC8:("func_80919FC8",),
-    0x8091A044:("func_8091A044",),
-    0x8091A0B8:("func_8091A0B8",),
+    0x80919FC8:("BgUmajump_StopCutscene",),
+    0x8091A044:("BgUmajump_PlayCutscene",),
+    0x8091A0B8:("BgUmajump_CheckDistance",),
     0x8091A124:("BgUmajump_Init",),
     0x8091A2D8:("BgUmajump_Destroy",),
     0x8091A30C:("BgUmajump_Update",),
     0x8091A5A0:("func_8091A5A0",),
-    0x8091A7B0:("func_8091A7B0",),
+    0x8091A7B0:("BgUmajump_Draw",),
     0x8091A8A0:("func_8091A8A0",),
     0x8091A8C4:("EnInsect_XZDistanceSquared",),
     0x8091A8F4:("EnInsect_InBottleRange",),
@@ -11629,12 +11629,12 @@
     0x80AAEABC:("DmChar07_DoNothing",),
     0x80AAEACC:("DmChar07_Update",),
     0x80AAEAF0:("DmChar07_Draw",),
-    0x80AAF050:("func_80AAF050",),
-    0x80AAF15C:("func_80AAF15C",),
+    0x80AAF050:("DmChar08_UpdateEyes",),
+    0x80AAF15C:("DmChar08_ChangeAnimation",),
     0x80AAF1F8:("DmChar08_Init",),
     0x80AAF5D8:("DmChar08_Destroy",),
-    0x80AAF610:("func_80AAF610",),
-    0x80AAF79C:("func_80AAF79C",),
+    0x80AAF610:("DmChar08_WaitForSong",),
+    0x80AAF79C:("DmChar08_SetupAppearCs",),
     0x80AAF884:("func_80AAF884",),
     0x80AAF8F4:("func_80AAF8F4",),
     0x80AAFA18:("func_80AAFA18",),
@@ -11642,19 +11642,19 @@
     0x80AAFAE4:("func_80AAFAE4",),
     0x80AAFB04:("func_80AAFB04",),
     0x80AAFB94:("func_80AAFB94",),
-    0x80AAFBA4:("func_80AAFBA4",),
+    0x80AAFBA4:("DmChar08_SpawnBubbles",),
     0x80AAFCCC:("func_80AAFCCC",),
-    0x80AAFE78:("func_80AAFE78",),
+    0x80AAFE78:("DmChar08_DoNothing",),
     0x80AAFE88:("func_80AAFE88",),
     0x80AB01E8:("func_80AB01E8",),
     0x80AB023C:("func_80AB023C",),
     0x80AB032C:("func_80AB032C",),
     0x80AB096C:("func_80AB096C",),
-    0x80AB0A10:("func_80AB0A10",),
+    0x80AB0A10:("DmChar08_UpdateCollision",),
     0x80AB0CC8:("DmChar08_Update",),
-    0x80AB0E3C:("func_80AB0E3C",),
-    0x80AB0E7C:("func_80AB0E7C",),
-    0x80AB0F90:("func_80AB0F90",),
+    0x80AB0E3C:("DmChar08_OverrideLimbDraw",),
+    0x80AB0E7C:("DmChar08_PostLimbDraw",),
+    0x80AB0F90:("DmChar08_TransformLimbDraw",),
     0x80AB1124:("DmChar08_Draw",),
     0x80AB1E10:("DmChar09_ChangeAnim",),
     0x80AB1EAC:("DmChar09_Init",),
@@ -15595,22 +15595,22 @@
     0x80BC7BBC:("OceffWipe5_Draw",),
     0x80BC9270:("EnStoneheishi_Init",),
     0x80BC9330:("EnStoneheishi_Destroy",),
-    0x80BC935C:("func_80BC935C",),
-    0x80BC941C:("func_80BC941C",),
+    0x80BC935C:("EnStoneheishi_ChangeAnim",),
+    0x80BC941C:("EnStoneheishi_TrackPlayer",),
     0x80BC94B0:("func_80BC94B0",),
     0x80BC9560:("func_80BC9560",),
     0x80BC9660:("func_80BC9660",),
     0x80BC9680:("func_80BC9680",),
-    0x80BC98EC:("func_80BC98EC",),
-    0x80BC9908:("func_80BC9908",),
-    0x80BC9A10:("func_80BC9A10",),
-    0x80BC9A2C:("func_80BC9A2C",),
-    0x80BC9C88:("func_80BC9C88",),
+    0x80BC98EC:("EnStoneheishi_SetupCheckGivenItem",),
+    0x80BC9908:("EnStoneheishi_CheckGivenItem",),
+    0x80BC9A10:("EnStoneheishi_SetupDrinkBottleProcess",),
+    0x80BC9A2C:("EnStoneheishi_DrinkBottleProcess",),
+    0x80BC9C88:("EnStoneheishi_GiveItemReward",),
     0x80BC9D28:("func_80BC9D28",),
     0x80BC9E50:("func_80BC9E50",),
     0x80BC9EE4:("EnStoneheishi_Update",),
-    0x80BCA0AC:("func_80BCA0AC",),
-    0x80BCA104:("func_80BCA104",),
+    0x80BCA0AC:("EnStoneheishi_OverrideLimbDraw",),
+    0x80BCA104:("EnStoneheishi_PostLimbDraw",),
     0x80BCA2AC:("EnStoneheishi_Draw",),
     0x80BCA5A0:("OceffWipe6_Init",),
     0x80BCA5F8:("OceffWipe6_Destroy",),
@@ -15765,16 +15765,16 @@
     0x80BD40D0:("func_80BD40D0",),
     0x80BD4108:("ObjHgdoor_Init",),
     0x80BD41B4:("ObjHgdoor_Destroy",),
-    0x80BD41E8:("ObjHgdoor_SetupCheckShouldOpen",),
-    0x80BD41FC:("ObjHgdoor_CheckShouldOpen",),
-    0x80BD42AC:("func_80BD42AC",),
-    0x80BD42C0:("func_80BD42C0",),
-    0x80BD433C:("func_80BD433C",),
-    0x80BD4358:("func_80BD4358",),
-    0x80BD4460:("func_80BD4460",),
-    0x80BD4478:("func_80BD4478",),
-    0x80BD44D0:("func_80BD44D0",),
-    0x80BD4500:("func_80BD4500",),
+    0x80BD41E8:("ObjHgdoor_SetupIdle",),
+    0x80BD41FC:("ObjHgdoor_Idle",),
+    0x80BD42AC:("ObjHgdoor_SetupCutscene",),
+    0x80BD42C0:("ObjHgdoor_PlayCutscene",),
+    0x80BD433C:("ObjHgdoor_SetupCsAction",),
+    0x80BD4358:("ObjHgdoor_HandleCsAction",),
+    0x80BD4460:("ObjHgdoor_SetupStopCs",),
+    0x80BD4478:("ObjHgdoor_StopCs",),
+    0x80BD44D0:("ObjHgdoor_Rotate",),
+    0x80BD4500:("ObjHgdoor_Open",),
     0x80BD4540:("ObjHgdoor_Update",),
     0x80BD4570:("ObjHgdoor_Draw",),
     0x80BD4720:("func_80BD4720",),
diff --git a/tools/disasm/variables.txt b/tools/disasm/variables.txt
index 5c8147eef..f8023eb2c 100644
--- a/tools/disasm/variables.txt
+++ b/tools/disasm/variables.txt
@@ -4703,28 +4703,28 @@
     0x8082B484:("sCButtonPosX","UNK_TYPE1","",0x1),
     0x8082B48C:("sCButtonPosY","UNK_TYPE1","",0x1),
     0x8082B494:("sEquipMagicArrowBowSlotHoldTimer","UNK_TYPE2","",0x2),
-    0x8082B4A0:("D_8082B4A0","UNK_TYPE4","",0x4),
-    0x8082B4AC:("D_8082B4AC","UNK_TYPE1","",0x1),
-    0x8082B4BC:("D_8082B4BC","UNK_TYPE1","",0x1),
+    0x8082B4A0:("sDungeonItemTextures","UNK_TYPE4","",0x4),
+    0x8082B4AC:("sDungeonTitleTextures","UNK_TYPE1","",0x1),
+    0x8082B4BC:("sDungeonMapFloorIconPosY","UNK_TYPE1","",0x1),
     0x8082B4C4:("D_8082B4C4","UNK_TYPE1","",0x1),
-    0x8082B4C8:("D_8082B4C8","UNK_TYPE2","",0x2),
-    0x8082B4CC:("D_8082B4CC","UNK_TYPE2","",0x2),
-    0x8082B4D0:("D_8082B4D0","UNK_TYPE2","",0x2),
-    0x8082B4D4:("D_8082B4D4","UNK_TYPE2","",0x2),
-    0x8082B4D8:("D_8082B4D8","UNK_TYPE2","",0x2),
-    0x8082B4DC:("D_8082B4DC","f32","",0x4),
-    0x8082B4E0:("D_8082B4E0","UNK_TYPE1","",0x1),
-    0x8082B520:("D_8082B520","UNK_TYPE1","",0x1),
-    0x8082B52C:("D_8082B52C","UNK_TYPE1","",0x1),
-    0x8082B538:("D_8082B538","UNK_TYPE1","",0x1),
-    0x8082B548:("D_8082B548","s16","[30]",0x3C),
-    0x8082B584:("D_8082B584","UNK_TYPE2","",0x2),
-    0x8082B590:("D_8082B590","UNK_TYPE2","",0x2),
-    0x8082B59C:("D_8082B59C","UNK_TYPE1","",0x1),
-    0x8082B5B4:("D_8082B5B4","UNK_TYPE1","",0x1),
-    0x8082B5CC:("D_8082B5CC","UNK_TYPE1","",0x1),
-    0x8082B5E0:("D_8082B5E0","UNK_TYPE1","",0x1),
-    0x8082B5F4:("D_8082B5F4","UNK_TYPE2","",0x2),
+    0x8082B4C8:("sStrayFairyIconTimer","UNK_TYPE2","",0x2),
+    0x8082B4CC:("sStrayFairyIconIndex","UNK_TYPE2","",0x2),
+    0x8082B4D0:("sStrayFairyIconAlphaScaleTimer","UNK_TYPE2","",0x2),
+    0x8082B4D4:("sStrayFairyIconAlphaScaleState","UNK_TYPE2","",0x2),
+    0x8082B4D8:("sStrayFairyIconAlpha","UNK_TYPE2","",0x2),
+    0x8082B4DC:("sStrayFairyIconScale","f32","",0x4),
+    0x8082B4E0:("sStrayFairyIconTextures","UNK_TYPE1","",0x1),
+    0x8082B520:("sStrayFairyIconPrimColors","UNK_TYPE1","",0x1),
+    0x8082B52C:("sStrayFairyIconEnvColors","UNK_TYPE1","",0x1),
+    0x8082B538:("sStrayFairyIconRectS","UNK_TYPE1","",0x1),
+    0x8082B548:("sCloudTextures","s16","[30]",0x3C),
+    0x8082B584:("sWorldMapDotPrimColors","UNK_TYPE2","",0x2),
+    0x8082B590:("sWorldMapDotEnvColors","UNK_TYPE2","",0x2),
+    0x8082B59C:("sWorldMapCursorsRectLeft","UNK_TYPE1","",0x1),
+    0x8082B5B4:("sWorldMapCursorsRectTop","UNK_TYPE1","",0x1),
+    0x8082B5CC:("sGreatFairySpawnRegions","UNK_TYPE1","",0x1),
+    0x8082B5E0:("sOwlWarpPauseItems","UNK_TYPE1","",0x1),
+    0x8082B5F4:("sStickAdjTimer","UNK_TYPE2","",0x2),
     0x8082B600:("sMaskEquipState","UNK_TYPE2","",0x2),
     0x8082B604:("sMaskEquipMagicArrowSlotHoldTimer","UNK_TYPE2","",0x2),
     0x8082B608:("sMaskEquipAnimTimer","UNK_TYPE2","",0x2),
@@ -12659,21 +12659,21 @@
     0x80AAE960:("Dm_Char06_InitVars","UNK_TYPE1","",0x1),
     0x80AAEFF0:("Dm_Char07_InitVars","UNK_TYPE1","",0x1),
     0x80AB1370:("Dm_Char08_InitVars","UNK_TYPE1","",0x1),
-    0x80AB1390:("D_80AB1390","UNK_TYPE1","",0x1),
-    0x80AB1398:("D_80AB1398","UNK_TYPE1","",0x1),
-    0x80AB13A0:("D_80AB13A0","UNK_TYPE1","",0x1),
-    0x80AB14D0:("D_80AB14D0","UNK_TYPE1","",0x1),
-    0x80AB1600:("D_80AB1600","UNK_TYPE2","",0x2),
-    0x80AB1648:("D_80AB1648","UNK_TYPE2","",0x2),
-    0x80AB1690:("D_80AB1690","UNK_TYPE1","",0x1),
+    0x80AB1390:("D_80AB1390","CamData","",0x8),
+    0x80AB1398:("D_80AB1398","SurfaceType","",0x8),
+    0x80AB13A0:("D_80AB13A0","CollisionPoly","19",0xCC),
+    0x80AB14D0:("sTurtleGreatBayTempleColPolygons2","CollisionPoly[]","19",0xCC),
+    0x80AB1600:("D_80AB1600","Vec3s[]","12",0x48),
+    0x80AB1648:("D_80AB1648","Vec3s[]","12",0x48),
+    0x80AB1690:("sTurtleGreatBayTempleCol","CollisionHeader","",0x2C),
     0x80AB16A8:("D_80AB16A8","UNK_PTR","",0x4),
-    0x80AB16BC:("D_80AB16BC","UNK_TYPE1","",0x1),
-    0x80AB1764:("D_80AB1764","UNK_TYPE1","",0x1),
-    0x80AB1770:("D_80AB1770","UNK_TYPE2","",0x2),
-    0x80AB1774:("D_80AB1774","UNK_TYPE1","",0x1),
-    0x80AB1778:("D_80AB1778","UNK_TYPE1","",0x1),
-    0x80AB177C:("D_80AB177C","UNK_TYPE4","",0x4),
-    0x80AB1788:("D_80AB1788","UNK_TYPE1","",0x1),
+    0x80AB16BC:("sLargeTurtleAnimationInfo","AnimationInfo[]","0x7",0xE0),
+    0x80AB1764:("sInitChain","InitChainEntry","",0x1),
+    0x80AB1770:("D_80AB1770","s16","",0x2),
+    0x80AB1774:("sLargeTurtleBubblePrimColor","Color_RGBA8","",0x4),
+    0x80AB1778:("sLargeTurtleBubbleEnvColor","Color_RGBA8","",0x4),
+    0x80AB177C:("sLargeTurtleBubbelAccel","Vec3f","",0xC),
+    0x80AB1788:("sLargeTurtleEyeTextures","TexturePtr","9",0x1),
     0x80AB17B0:("jtbl_80AB17B0","UNK_PTR","",0x4),
     0x80AB17C8:("D_80AB17C8","f32","",0x4),
     0x80AB17CC:("D_80AB17CC","f32","",0x4),
@@ -14305,7 +14305,7 @@
     0x80B3FE50:("D_80B3FE50","f32","",0x4),
     0x80B3FE54:("D_80B3FE54","f32","",0x4),
     0x80B3FE58:("D_80B3FE58","UNK_TYPE1","",0x1),
-    0x80B3FE70:("D_80B3FE70","UNK_TYPE1","",0x1),
+    0x80B3FE70:("sEyeTextures","TexturePtr[]","0x9",0x4),
     0x80B3FE90:("D_80B3FE90","f32","",0x4),
     0x80B3FE94:("D_80B3FE94","f32","",0x4),
     0x80B40760:("Bg_Goron_Oyu_InitVars","UNK_TYPE1","",0x1),
diff --git a/tools/namefixer.py b/tools/namefixer.py
index a5d13493b..4f596ecef 100755
--- a/tools/namefixer.py
+++ b/tools/namefixer.py
@@ -597,7 +597,7 @@ wordReplace = {
     "func_80158C04": "Message_LoadLocalizedRupeesNES",
     "func_80158D98": "Message_LoadRupeesNES",
     "func_80158FB0": "Message_LoadTimeNES",
-    "func_8015926C": "Message_LoadAreaTextNES",
+    "func_8015926C": "Message_LoadOwlWarpTextNES",
     "func_8015E750": "Message_FindCreditsMessage",
     "func_80133038": "Schedule_RunScript",
 
diff --git a/tools/permuter_settings.toml b/tools/permuter_settings.toml
index bf61be341..380acbfc2 100644
--- a/tools/permuter_settings.toml
+++ b/tools/permuter_settings.toml
@@ -1,3 +1,5 @@
+compiler_type = "ido"
+
 [preserve_macros]
 "g[DS]P.*" = "void"
 "gs[DS]P.*" = "void"
diff --git a/tools/sizes/code_functions.csv b/tools/sizes/code_functions.csv
index acec92239..d18b02616 100644
--- a/tools/sizes/code_functions.csv
+++ b/tools/sizes/code_functions.csv
@@ -1924,7 +1924,7 @@ asm/non_matchings/code/code_8012EC80/Inventory_ChangeEquipment.s,Inventory_Chang
 asm/non_matchings/code/code_8012EC80/Inventory_DeleteEquipment.s,Inventory_DeleteEquipment,0x8012ED78,0x1C
 asm/non_matchings/code/code_8012EC80/Inventory_ChangeUpgrade.s,Inventory_ChangeUpgrade,0x8012EDE8,0x13
 asm/non_matchings/code/code_8012EC80/Inventory_IsMapVisible.s,Inventory_IsMapVisible,0x8012EE34,0x36
-asm/non_matchings/code/code_8012EC80/Inventory_SetMapVisibility.s,Inventory_SetMapVisibility,0x8012EF0C,0x78
+asm/non_matchings/code/code_8012EC80/Inventory_SetWorldMapCloudVisibility.s,Inventory_SetWorldMapCloudVisibility,0x8012EF0C,0x78
 asm/non_matchings/code/code_8012EC80/Inventory_SaveDekuPlaygroundHighScore.s,Inventory_SaveDekuPlaygroundHighScore,0x8012F0EC,0x34
 asm/non_matchings/code/code_8012EC80/Inventory_IncrementSkullTokenCount.s,Inventory_IncrementSkullTokenCount,0x8012F1BC,0x1C
 asm/non_matchings/code/code_8012EC80/Inventory_GetSkullTokenCount.s,Inventory_GetSkullTokenCount,0x8012F22C,0x13
@@ -1966,7 +1966,7 @@ asm/non_matchings/code/z_scene/Scene_HeaderCmdActorCutsceneList.s,Scene_HeaderCm
 asm/non_matchings/code/z_scene/Scene_HeaderCmdMiniMap.s,Scene_HeaderCmdMiniMap,0x80130540,0xE
 asm/non_matchings/code/z_scene/Scene_HeaderCmd1D.s,Scene_HeaderCmd1D,0x80130578,0x4
 asm/non_matchings/code/z_scene/Scene_HeaderCmdMiniMapCompassInfo.s,Scene_HeaderCmdMiniMapCompassInfo,0x80130588,0xA
-asm/non_matchings/code/z_scene/Scene_HeaderCmdSetAreaVisitedFlag.s,Scene_HeaderCmdSetAreaVisitedFlag,0x801305B0,0x31
+asm/non_matchings/code/z_scene/Scene_HeaderCmdSetRegionVisitedFlag.s,Scene_HeaderCmdSetRegionVisitedFlag,0x801305B0,0x31
 asm/non_matchings/code/z_scene/Scene_HeaderCmdAnimatedMaterials.s,Scene_HeaderCmdAnimatedMaterials,0x80130674,0xC
 asm/non_matchings/code/z_scene/Scene_SetExitFade.s,Scene_SetExitFade,0x801306A4,0x11
 asm/non_matchings/code/z_scene/Scene_ProcessHeader.s,Scene_ProcessHeader,0x801306E8,0x20
@@ -2394,7 +2394,7 @@ asm/non_matchings/code/z_message_nes/Message_LoadPluralRupeesNES.s,Message_LoadP
 asm/non_matchings/code/z_message_nes/Message_LoadLocalizedRupeesNES.s,Message_LoadLocalizedRupeesNES,0x80158C04,0x65
 asm/non_matchings/code/z_message_nes/Message_LoadRupeesNES.s,Message_LoadRupeesNES,0x80158D98,0x86
 asm/non_matchings/code/z_message_nes/Message_LoadTimeNES.s,Message_LoadTimeNES,0x80158FB0,0xAF
-asm/non_matchings/code/z_message_nes/Message_LoadAreaTextNES.s,Message_LoadAreaTextNES,0x8015926C,0x73
+asm/non_matchings/code/z_message_nes/Message_LoadOwlWarpTextNES.s,Message_LoadOwlWarpTextNES,0x8015926C,0x73
 asm/non_matchings/code/z_message_nes/func_80159438.s,func_80159438,0x80159438,0x8D
 asm/non_matchings/code/z_message_nes/func_8015966C.s,func_8015966C,0x8015966C,0x6CB
 asm/non_matchings/code/z_message_nes/func_8015B198.s,func_8015B198,0x8015B198,0xD6E