diff --git a/src/Game/Actor/AI/CMakeLists.txt b/src/Game/Actor/AI/CMakeLists.txt
index 94932cea..20947e0f 100644
--- a/src/Game/Actor/AI/CMakeLists.txt
+++ b/src/Game/Actor/AI/CMakeLists.txt
@@ -3,10 +3,10 @@ target_sources(uking PRIVATE
   aiActorWaterDepthSelect.h
   aiAddBasicLinkOn.cpp
   aiAddBasicLinkOn.h
-  aiAddCarriedBase.cpp
-  aiAddCarriedBase.h
   aiAddCarried.cpp
   aiAddCarried.h
+  aiAddCarriedBase.cpp
+  aiAddCarriedBase.h
   aiAddDemoCall.cpp
   aiAddDemoCall.h
   aiAddNodeNodeCarried.cpp
@@ -43,8 +43,6 @@ target_sources(uking PRIVATE
   aiAmbushableWeaponShoot.h
   aiAnchorRangeSelectTwoAction.cpp
   aiAnchorRangeSelectTwoAction.h
-  aiPlayASSwitch.cpp
-  aiPlayASSwitch.h
   aiAncientNecklaceBall.cpp
   aiAncientNecklaceBall.h
   aiAnimalAttackOtherTarget.cpp
@@ -69,32 +67,32 @@ target_sources(uking PRIVATE
   aiAnimalRangeKeepMoveWithLOS.h
   aiAnimalRndMove.cpp
   aiAnimalRndMove.h
-  aiAnimalRoamCheckWater.cpp
-  aiAnimalRoamCheckWater.h
   aiAnimalRoam.cpp
   aiAnimalRoam.h
+  aiAnimalRoamCheckWater.cpp
+  aiAnimalRoamCheckWater.h
   aiAnimalRushAttack.cpp
   aiAnimalRushAttack.h
   aiAnimalTimelineAI.cpp
   aiAnimalTimelineAI.h
+  aiAppearFromTarget.cpp
+  aiAppearFromTarget.h
   aiAppearFromTargetFrontAfterChase.cpp
   aiAppearFromTargetFrontAfterChase.h
   aiAppearFromTargetFrontGround.cpp
   aiAppearFromTargetFrontGround.h
-  aiAppearFromTarget.cpp
-  aiAppearFromTarget.h
   aiAppearNearTargetOutOfScrnGnd.cpp
   aiAppearNearTargetOutOfScrnGnd.h
   aiArmorSearchKorokRoot.cpp
   aiArmorSearchKorokRoot.h
   aiAroundEnemyCheckSelect.cpp
   aiAroundEnemyCheckSelect.h
+  aiArrow.cpp
+  aiArrow.h
   aiArrowChargeAndShoot.cpp
   aiArrowChargeAndShoot.h
-  aiArrow.cpp
   aiArrowDelete.cpp
   aiArrowDelete.h
-  aiArrow.h
   aiArrowStickAndPick.cpp
   aiArrowStickAndPick.h
   aiAssassinBattle.cpp
@@ -121,50 +119,48 @@ target_sources(uking PRIVATE
   aiAssassinBossIronBallAttack.h
   aiAssassinBossLastAttack.cpp
   aiAssassinBossLastAttack.h
-  aiAssassinBossRootBase.cpp
-  aiAssassinBossRootBase.h
   aiAssassinBossRoot.cpp
   aiAssassinBossRoot.h
+  aiAssassinBossRootBase.cpp
+  aiAssassinBossRootBase.h
   aiAssassinCallSelect.cpp
   aiAssassinCallSelect.h
-  aiAssassinShooterBattle.cpp
-  aiAssassinShooterBattle.h
   aiAssassinFieldShooterBattle.cpp
   aiAssassinFieldShooterBattle.h
-  aiTargetHeightAreaSelect.cpp
-  aiTargetHeightAreaSelect.h
   aiAssassinMiddleAzitoDlcRoot.cpp
   aiAssassinMiddleAzitoDlcRoot.h
   aiAssassinMiddleAzitoNoMemberDemo.cpp
   aiAssassinMiddleAzitoNoMemberDemo.h
-  aiAssassinMiddleAzitoRootAccept.cpp
-  aiAssassinMiddleAzitoRootAccept.h
   aiAssassinMiddleAzitoRoot.cpp
   aiAssassinMiddleAzitoRoot.h
+  aiAssassinMiddleAzitoRootAccept.cpp
+  aiAssassinMiddleAzitoRootAccept.h
   aiAssassinMiddleDlcGrabAdapter.cpp
   aiAssassinMiddleDlcGrabAdapter.h
   aiAssassinMiddleMagicAfter.cpp
   aiAssassinMiddleMagicAfter.h
   aiAssassinMiddleRoot.cpp
   aiAssassinMiddleRoot.h
-  aiGuardHomePosNormal.cpp
-  aiGuardHomePosNormal.h
   aiAssassinRoot.cpp
   aiAssassinRoot.h
+  aiAssassinShooterBattle.cpp
+  aiAssassinShooterBattle.h
   aiAssassinShooterJuniorAzitoRoot.cpp
   aiAssassinShooterJuniorAzitoRoot.h
   aiASWeaponRoot.cpp
   aiASWeaponRoot.h
+  aiAttackGrave.cpp
+  aiAttackGrave.h
   aiAttackGraveChase.cpp
   aiAttackGraveChase.h
   aiAttackGraveChaseWithSensor.cpp
   aiAttackGraveChaseWithSensor.h
-  aiAttackGrave.cpp
-  aiAttackGrave.h
   aiAttackHitCheck.cpp
   aiAttackHitCheck.h
   aiAwarenessScale.cpp
   aiAwarenessScale.h
+  aiAwnSeal.cpp
+  aiAwnSeal.h
   aiBackAttackEnemyBattle.cpp
   aiBackAttackEnemyBattle.h
   aiBackStepAndAttack.cpp
@@ -177,12 +173,10 @@ target_sources(uking PRIVATE
   aiBasicStatusRoot.h
   aiBattleBgmRequestFinishTag.cpp
   aiBattleBgmRequestFinishTag.h
-  aiSimpleBeamExplode.cpp
-  aiSimpleBeamExplode.h
   aiBeamExplode.cpp
+  aiBeamExplode.h
   aiBeamExplodeEitherHit.cpp
   aiBeamExplodeEitherHit.h
-  aiBeamExplode.h
   aiBeamosCarried.cpp
   aiBeamosCarried.h
   aiBeeBattle.cpp
@@ -195,6 +189,10 @@ target_sources(uking PRIVATE
   aiBeeSwarmReaction.h
   aiBeeSwarmRoot.cpp
   aiBeeSwarmRoot.h
+  aiBezierRailMove.cpp
+  aiBezierRailMove.h
+  aiBigCannon.cpp
+  aiBigCannon.h
   aiBirdDead.cpp
   aiBirdDead.h
   aiBirdEscape.cpp
@@ -235,10 +233,12 @@ target_sources(uking PRIVATE
   aiCannonBallRoot.h
   aiCapturedActDeadSelector.cpp
   aiCapturedActDeadSelector.h
-  aiCapturedActorReactionChemical.cpp
-  aiCapturedActorReactionChemical.h
   aiCapturedActorReaction.cpp
   aiCapturedActorReaction.h
+  aiCapturedActorReactionChemical.cpp
+  aiCapturedActorReactionChemical.h
+  aiCapturedActorRoot.cpp
+  aiCapturedActorRoot.h
   aiCarryBox.cpp
   aiCarryBox.h
   aiCastleLynelBattle.cpp
@@ -249,6 +249,8 @@ target_sources(uking PRIVATE
   aiChangeWindTagRoot.h
   aiChaseSound.cpp
   aiChaseSound.h
+  aiCheckLineOfSightSelector.cpp
+  aiCheckLineOfSightSelector.h
   aiChemicalEnemyFindPlayer.cpp
   aiChemicalEnemyFindPlayer.h
   aiChemicalEnemyRoot.cpp
@@ -263,18 +265,18 @@ target_sources(uking PRIVATE
   aiChemicalWeaponRoot.h
   aiChildDeviceReflectArrow.cpp
   aiChildDeviceReflectArrow.h
-  aiChildSelector.cpp
-  aiChildSelector.h
   aiChildFavoriteSelector.cpp
   aiChildFavoriteSelector.h
   aiChildHaveSelect.cpp
   aiChildHaveSelect.h
+  aiChildSelector.cpp
+  aiChildSelector.h
   aiChmCheck.cpp
   aiChmCheck.h
-  aiChmVolRateCheckBlankOk.cpp
-  aiChmVolRateCheckBlankOk.h
   aiChmVolRateCheck.cpp
   aiChmVolRateCheck.h
+  aiChmVolRateCheckBlankOk.cpp
+  aiChmVolRateCheckBlankOk.h
   aiChuchuDieSelect.cpp
   aiChuchuDieSelect.h
   aiChuchuJellyRoot.cpp
@@ -286,9 +288,9 @@ target_sources(uking PRIVATE
   aiChuchuTypeSelect.cpp
   aiChuchuTypeSelect.h
   aiCircleMove.cpp
+  aiCircleMove.h
   aiCircleMoveFlying.cpp
   aiCircleMoveFlying.h
-  aiCircleMove.h
   aiCircleMoveInFluid.cpp
   aiCircleMoveInFluid.h
   aiCircleMoveInWater.cpp
@@ -305,10 +307,12 @@ target_sources(uking PRIVATE
   aiCliffCheckToTargetPosDirSelect.h
   aiCliffDistanceSelectThreeAction.cpp
   aiCliffDistanceSelectThreeAction.h
-  aiCloseSmallAttackBase.cpp
-  aiCloseSmallAttackBase.h
+  aiCliffStopEnemyNormal.cpp
+  aiCliffStopEnemyNormal.h
   aiCloseSmallAttack.cpp
   aiCloseSmallAttack.h
+  aiCloseSmallAttackBase.cpp
+  aiCloseSmallAttackBase.h
   aiClusterRenderCheckTag.cpp
   aiClusterRenderCheckTag.h
   aiColGroundHitSelect.cpp
@@ -319,6 +323,8 @@ target_sources(uking PRIVATE
   aiCommonPickedItem.h
   aiConditionMoveActionSelect.cpp
   aiConditionMoveActionSelect.h
+  aiControlRailRoot.cpp
+  aiControlRailRoot.h
   aiCookPotRoot.cpp
   aiCookPotRoot.h
   aiCountSelect.cpp
@@ -351,24 +357,24 @@ target_sources(uking PRIVATE
   aiDgnObj_DLC_CogWheel2.h
   aiDgnObj_DLC_CogWheel_Physics_Ctr.cpp
   aiDgnObj_DLC_CogWheel_Physics_Ctr.h
-  aiDgnObj_DLC_CWRotDirSwitch.cpp
-  aiDgnObj_DLC_CWRotDirSwitch.h
   aiDgnObj_DLC_CW_WithEntityBody00.cpp
   aiDgnObj_DLC_CW_WithEntityBody00.h
+  aiDgnObj_DLC_CWRotDirSwitch.cpp
+  aiDgnObj_DLC_CWRotDirSwitch.h
   aiDgnObj_DLC_DungeonRotateTag.cpp
   aiDgnObj_DLC_DungeonRotateTag.h
   aiDgnObj_DLC_Faucet.cpp
   aiDgnObj_DLC_Faucet.h
   aiDgnObj_DLC_SliderBlock.cpp
   aiDgnObj_DLC_SliderBlock.h
+  aiDieSelect.cpp
+  aiDieSelect.h
   aiDieSelectBombPlus.cpp
   aiDieSelectBombPlus.h
   aiDieSelectChemicalPlus.cpp
   aiDieSelectChemicalPlus.h
   aiDieSelectChemShockPlus.cpp
   aiDieSelectChemShockPlus.h
-  aiDieSelect.cpp
-  aiDieSelect.h
   aiDisplaySelect.cpp
   aiDisplaySelect.h
   aiDistanceKeepMove.cpp
@@ -401,8 +407,6 @@ target_sources(uking PRIVATE
   aiDragonItemRoot.h
   aiDragonReturn.cpp
   aiDragonReturn.h
-  aiControlRailRoot.cpp
-  aiControlRailRoot.h
   aiDragonRoot.cpp
   aiDragonRoot.h
   aiDragonTurn.cpp
@@ -417,14 +421,16 @@ target_sources(uking PRIVATE
   aiDungeonCannonBallAutoDelete.h
   aiDungeonEntranceRoot.cpp
   aiDungeonEntranceRoot.h
-  aiDungeonMoveTagCont.cpp
-  aiDungeonMoveTagCont.h
   aiDungeonMoveTag.cpp
   aiDungeonMoveTag.h
+  aiDungeonMoveTagCont.cpp
+  aiDungeonMoveTagCont.h
   aiDungeonRemainsFire.cpp
   aiDungeonRemainsFire.h
   aiDungeonResetPosTag.cpp
   aiDungeonResetPosTag.h
+  aiDungeonRotateTag.cpp
+  aiDungeonRotateTag.h
   aiDungeonRotateTag3D.cpp
   aiDungeonRotateTag3D.h
   aiDungeonRotateTag4ElecApp.cpp
@@ -435,10 +441,10 @@ target_sources(uking PRIVATE
   aiDungeonRotateTag4WaterApp.h
   aiDungeonRotateTag4WindApp.cpp
   aiDungeonRotateTag4WindApp.h
+  aiDungeonRotateTagApp.cpp
+  aiDungeonRotateTagApp.h
   aiDungeonRotateTagCont.cpp
   aiDungeonRotateTagCont.h
-  aiDungeonRotateTag.cpp
-  aiDungeonRotateTag.h
   aiDungeonRotateTagInOrder.cpp
   aiDungeonRotateTagInOrder.h
   aiDungeonRotateTagShuttle.cpp
@@ -477,8 +483,6 @@ target_sources(uking PRIVATE
   aiEnemyChemicalPowerSelect.h
   aiEnemyChemicalSelect.cpp
   aiEnemyChemicalSelect.h
-  aiEnemyTargetAction.cpp
-  aiEnemyTargetAction.h
   aiEnemyChemTargetAction.cpp
   aiEnemyChemTargetAction.h
   aiEnemyConfuse.cpp
@@ -512,9 +516,9 @@ target_sources(uking PRIVATE
   aiEnemyFortressWatchKeepingWait.cpp
   aiEnemyFortressWatchKeepingWait.h
   aiEnemyHide.cpp
+  aiEnemyHide.h
   aiEnemyHideGrass.cpp
   aiEnemyHideGrass.h
-  aiEnemyHide.h
   aiEnemyHideShootingBattle.cpp
   aiEnemyHideShootingBattle.h
   aiEnemyHorseRide.cpp
@@ -537,14 +541,14 @@ target_sources(uking PRIVATE
   aiEnemyNoiseTarget.h
   aiEnemyNormal.cpp
   aiEnemyNormal.h
+  aiEnemyNotice.cpp
+  aiEnemyNotice.h
   aiEnemyNoticeActiveEnemy.cpp
   aiEnemyNoticeActiveEnemy.h
-  aiEnemyNotice.cpp
   aiEnemyNoticeFearfulLastAttacker.cpp
   aiEnemyNoticeFearfulLastAttacker.h
   aiEnemyNoticeFearfulTarget.cpp
   aiEnemyNoticeFearfulTarget.h
-  aiEnemyNotice.h
   aiEnemyNoticeLimit.cpp
   aiEnemyNoticeLimit.h
   aiEnemyNoticeSound.cpp
@@ -571,10 +575,10 @@ target_sources(uking PRIVATE
   aiEnemyRangeKeepMove.h
   aiEnemyRangeKeepSwimMove.cpp
   aiEnemyRangeKeepSwimMove.h
-  aiEnemyRecognizeTargetBase.cpp
-  aiEnemyRecognizeTargetBase.h
   aiEnemyRecognizeTarget.cpp
   aiEnemyRecognizeTarget.h
+  aiEnemyRecognizeTargetBase.cpp
+  aiEnemyRecognizeTargetBase.h
   aiEnemyRestraintCheckBattle.cpp
   aiEnemyRestraintCheckBattle.h
   aiEnemyReturnSelect.cpp
@@ -587,6 +591,8 @@ target_sources(uking PRIVATE
   aiEnemyRoamViewItem.h
   aiEnemyRoot.cpp
   aiEnemyRoot.h
+  aiEnemySearch.cpp
+  aiEnemySearch.h
   aiEnemySearchHorse.cpp
   aiEnemySearchHorse.h
   aiEnemySearchShieldItemFindPlayer.cpp
@@ -603,6 +609,8 @@ target_sources(uking PRIVATE
   aiEnemySomeIgniteBattle.h
   aiEnemySyncAttack.cpp
   aiEnemySyncAttack.h
+  aiEnemyTargetAction.cpp
+  aiEnemyTargetAction.h
   aiEnemyTargetGearSelect.cpp
   aiEnemyTargetGearSelect.h
   aiEnemyTargetInAreaSelect.cpp
@@ -615,10 +623,10 @@ target_sources(uking PRIVATE
   aiEnemyTired.h
   aiEnemyTreeWeaponSearchOrBattle.cpp
   aiEnemyTreeWeaponSearchOrBattle.h
-  aiEnemyVacuumBombSelectBase.cpp
-  aiEnemyVacuumBombSelectBase.h
   aiEnemyVacuumBombSelect.cpp
   aiEnemyVacuumBombSelect.h
+  aiEnemyVacuumBombSelectBase.cpp
+  aiEnemyVacuumBombSelectBase.h
   aiEnemyVacuumChangeItemSelect.cpp
   aiEnemyVacuumChangeItemSelect.h
   aiEnemyVacuumWeaponTypeSelect.cpp
@@ -677,12 +685,12 @@ target_sources(uking PRIVATE
   aiFlyingEnemyBackKeepMove.h
   aiFlyingEnemyDiagonallyKeepMove.cpp
   aiFlyingEnemyDiagonallyKeepMove.h
+  aiFlyingEnemyDistanceKeepMove.cpp
+  aiFlyingEnemyDistanceKeepMove.h
   aiFlyingEnemyFindPlayer.cpp
   aiFlyingEnemyFindPlayer.h
   aiFlyingEnemyFrontKeepMove.cpp
   aiFlyingEnemyFrontKeepMove.h
-  aiFlyingEnemyDistanceKeepMove.cpp
-  aiFlyingEnemyDistanceKeepMove.h
   aiFlyingEnemySideKeepMove.cpp
   aiFlyingEnemySideKeepMove.h
   aiFlyInsectRoam.cpp
@@ -765,6 +773,8 @@ target_sources(uking PRIVATE
   aiGanonDemoMoveSeqTwoAction.h
   aiGanonFarAttackRootOnWall.cpp
   aiGanonFarAttackRootOnWall.h
+  aiGanonFlameBall.cpp
+  aiGanonFlameBall.h
   aiGanonGrudgeNormal.cpp
   aiGanonGrudgeNormal.h
   aiGanonNearAttackOnFloorRoot.cpp
@@ -803,6 +813,8 @@ target_sources(uking PRIVATE
   aiGiantArmorRoot.h
   aiGiantEarthReleaseAttack.cpp
   aiGiantEarthReleaseAttack.h
+  aiGiantEnemyFindPlayer.cpp
+  aiGiantEnemyFindPlayer.h
   aiGiantEscapeFromDamageWater.cpp
   aiGiantEscapeFromDamageWater.h
   aiGiantNavMoveTarget.cpp
@@ -839,10 +851,10 @@ target_sources(uking PRIVATE
   aiGolemPartsSelect.h
   aiGolemReaction.cpp
   aiGolemReaction.h
-  aiGolemRootBase.cpp
-  aiGolemRootBase.h
   aiGolemRoot.cpp
   aiGolemRoot.h
+  aiGolemRootBase.cpp
+  aiGolemRootBase.h
   aiGolemRWeakPointRoot.cpp
   aiGolemRWeakPointRoot.h
   aiGolemSleepNormal.cpp
@@ -853,8 +865,6 @@ target_sources(uking PRIVATE
   aiGolemWeakPointRoot.h
   aiGolfBallRoot.cpp
   aiGolfBallRoot.h
-  aiBigCannon.cpp
-  aiBigCannon.h
   aiGoronCannon.cpp
   aiGoronCannon.h
   aiGoronHeroDescendentRoot.cpp
@@ -873,40 +883,42 @@ target_sources(uking PRIVATE
   aiGuardFlagSelect.h
   aiGuardFrequencySelect.cpp
   aiGuardFrequencySelect.h
+  aiGuardHomePosNormal.cpp
+  aiGuardHomePosNormal.h
   aiGuardianAI.cpp
   aiGuardianAI.h
   aiGuardianBattleBeamAttack.cpp
   aiGuardianBattleBeamAttack.h
-  aiGuardianCommonBeamAttack.cpp
-  aiGuardianCommonBeamAttack.h
-  aiGuardianBeamAttack.cpp
-  aiGuardianBeamAttack.h
   aiGuardianBeam.cpp
   aiGuardianBeam.h
+  aiGuardianBeamAttack.cpp
+  aiGuardianBeamAttack.h
   aiGuardianBezierRailMove.cpp
   aiGuardianBezierRailMove.h
   aiGuardianChase.cpp
   aiGuardianChase.h
   aiGuardianCloseBattle.cpp
   aiGuardianCloseBattle.h
+  aiGuardianCommonBeamAttack.cpp
+  aiGuardianCommonBeamAttack.h
   aiGuardianDown.cpp
   aiGuardianDown.h
-  aiGuardianMini2ndBattleAttack.cpp
-  aiGuardianMini2ndBattleAttack.h
   aiGuardianMini2ndBattle.cpp
   aiGuardianMini2ndBattle.h
+  aiGuardianMini2ndBattleAttack.cpp
+  aiGuardianMini2ndBattleAttack.h
   aiGuardianMiniBattle.cpp
   aiGuardianMiniBattle.h
   aiGuardianMiniBattleStateSelect.cpp
   aiGuardianMiniBattleStateSelect.h
+  aiGuardianMiniBeam.cpp
+  aiGuardianMiniBeam.h
   aiGuardianMiniBeamAttack.cpp
   aiGuardianMiniBeamAttack.h
   aiGuardianMiniBeamAttackMove.cpp
   aiGuardianMiniBeamAttackMove.h
   aiGuardianMiniBeamAttackNoWait.cpp
   aiGuardianMiniBeamAttackNoWait.h
-  aiGuardianMiniBeam.cpp
-  aiGuardianMiniBeam.h
   aiGuardianMiniBeamToExplosives.cpp
   aiGuardianMiniBeamToExplosives.h
   aiGuardianMiniBlownOff.cpp
@@ -949,8 +961,8 @@ target_sources(uking PRIVATE
   aiGuardianTargetLost.h
   aiGuardianWait.cpp
   aiGuardianWait.h
-  aiInvincibleNearTargetBase.cpp
-  aiInvincibleNearTargetBase.h
+  aiGuideBeamAttackEnemyBattle.cpp
+  aiGuideBeamAttackEnemyBattle.h
   aiGyroActivateTerminal.cpp
   aiGyroActivateTerminal.h
   aiHangedLamp.cpp
@@ -973,16 +985,14 @@ target_sources(uking PRIVATE
   aiHiddenOctarockSearchTarget.h
   aiHomePosDistanceSelector.cpp
   aiHomePosDistanceSelector.h
-  aiCheckLineOfSightSelector.cpp
-  aiCheckLineOfSightSelector.h
+  aiHorse.cpp
+  aiHorse.h
   aiHorseCheckLineOfSightSelector.cpp
   aiHorseCheckLineOfSightSelector.h
-  aiHorse.cpp
   aiHorseDamageTypeSelect.cpp
   aiHorseDamageTypeSelect.h
   aiHorseFollow.cpp
   aiHorseFollow.h
-  aiHorse.h
   aiHorseLoopTarget.cpp
   aiHorseLoopTarget.h
   aiHorseMoveToPlayer.cpp
@@ -995,14 +1005,16 @@ target_sources(uking PRIVATE
   aiHorseReins.h
   aiHorseRiddenByNPC.cpp
   aiHorseRiddenByNPC.h
+  aiHorseRiddenStatusSelector.cpp
+  aiHorseRiddenStatusSelector.h
   aiHorseRideChargeAttack.cpp
   aiHorseRideChargeAttack.h
   aiHorseRideChaseBattleAttackMove.cpp
   aiHorseRideChaseBattleAttackMove.h
-  aiHorseRideChaseBattleMoveBase.cpp
-  aiHorseRideChaseBattleMoveBase.h
   aiHorseRideChaseBattleMove.cpp
   aiHorseRideChaseBattleMove.h
+  aiHorseRideChaseBattleMoveBase.cpp
+  aiHorseRideChaseBattleMoveBase.h
   aiHorseRideDamagedSelector.cpp
   aiHorseRideDamagedSelector.h
   aiHorseRideEnemyBattle.cpp
@@ -1049,6 +1061,10 @@ target_sources(uking PRIVATE
   aiInTerritorySelector.h
   aiInvincibleHiddenOctarock.cpp
   aiInvincibleHiddenOctarock.h
+  aiInvincibleNearTarget.cpp
+  aiInvincibleNearTarget.h
+  aiInvincibleNearTargetBase.cpp
+  aiInvincibleNearTargetBase.h
   aiInvisibleKorokRailMove.cpp
   aiInvisibleKorokRailMove.h
   aiInWaterKeepSelect.cpp
@@ -1133,8 +1149,8 @@ target_sources(uking PRIVATE
   aiLandingChemicalBall.h
   aiLargeCannonAttackRoot.cpp
   aiLargeCannonAttackRoot.h
-  aiGiantEnemyFindPlayer.cpp
-  aiGiantEnemyFindPlayer.h
+  aiLargeCannonRoot.cpp
+  aiLargeCannonRoot.h
   aiLastAttackerSelect.cpp
   aiLastAttackerSelect.h
   aiLastAttackerSpecialActionSelect.cpp
@@ -1149,6 +1165,8 @@ target_sources(uking PRIVATE
   aiLastBossNormalWarpRoot.h
   aiLastBossRailWarpRoot.cpp
   aiLastBossRailWarpRoot.h
+  aiLastBossRecognizeRoot.cpp
+  aiLastBossRecognizeRoot.h
   aiLastBossRoot.cpp
   aiLastBossRoot.h
   aiLastBossShieldBash.cpp
@@ -1189,10 +1207,10 @@ target_sources(uking PRIVATE
   aiLumberjackFallenTree.h
   aiLumberjackTree.cpp
   aiLumberjackTree.h
-  aiLynelArrowAttackSelectBase.cpp
-  aiLynelArrowAttackSelectBase.h
   aiLynelArrowAttackSelect.cpp
   aiLynelArrowAttackSelect.h
+  aiLynelArrowAttackSelectBase.cpp
+  aiLynelArrowAttackSelectBase.h
   aiLynelArrowAttackSelectOnce.cpp
   aiLynelArrowAttackSelectOnce.h
   aiLynelArrowBattle.cpp
@@ -1245,16 +1263,18 @@ target_sources(uking PRIVATE
   aiLynelThreeBreathAttack.h
   aiLynelWarp.cpp
   aiLynelWarp.h
+  aiMagicBattle.cpp
+  aiMagicBattle.h
   aiMagneGearRoot.cpp
   aiMagneGearRoot.h
   aiMagneGrabbedPartsRangeSelector.cpp
   aiMagneGrabbedPartsRangeSelector.h
   aiMagneGrabSelect.cpp
   aiMagneGrabSelect.h
-  aiMagneShaftRootBase.cpp
-  aiMagneShaftRootBase.h
   aiMagneShaftRoot.cpp
   aiMagneShaftRoot.h
+  aiMagneShaftRootBase.cpp
+  aiMagneShaftRootBase.h
   aiMagneSliderBlockRootThunder.cpp
   aiMagneSliderBlockRootThunder.h
   aiMagneStickRoot.cpp
@@ -1271,18 +1291,16 @@ target_sources(uking PRIVATE
   aiMasterSwordRoot.h
   aiMergedDungeonPartsRoot.cpp
   aiMergedDungeonPartsRoot.h
+  aiMessageReceiveCheck.cpp
+  aiMessageReceiveCheck.h
   aiMessageReceiveCheckBasic.cpp
   aiMessageReceiveCheckBasic.h
-  aiMessageReceiveCheck.cpp
   aiMessageReceiveCheckEveryFrame.cpp
   aiMessageReceiveCheckEveryFrame.h
-  aiMessageReceiveCheck.h
   aiMetalObjectBuried.cpp
   aiMetalObjectBuried.h
   aiMetalObjectFixed.cpp
   aiMetalObjectFixed.h
-  aiCliffStopEnemyNormal.cpp
-  aiCliffStopEnemyNormal.h
   aiMimicCliffStopEnemyNormal.cpp
   aiMimicCliffStopEnemyNormal.h
   aiMimicEnemyFindPlayer.cpp
@@ -1293,8 +1311,6 @@ target_sources(uking PRIVATE
   aiMimicFlagSelect.h
   aiMimicryResetCheck.cpp
   aiMimicryResetCheck.h
-  aiGuideBeamAttackEnemyBattle.cpp
-  aiGuideBeamAttackEnemyBattle.h
   aiMiniGolemLifted.cpp
   aiMiniGolemLifted.h
   aiMiniGolemReaction.cpp
@@ -1313,8 +1329,6 @@ target_sources(uking PRIVATE
   aiMoriblinSpearNearBattle.h
   aiMoriblinUnarmedBattle.cpp
   aiMoriblinUnarmedBattle.h
-  aiHorseRiddenStatusSelector.cpp
-  aiHorseRiddenStatusSelector.h
   aiMotorcycleRoot.cpp
   aiMotorcycleRoot.h
   aiMoveAndFreeFallGondola.cpp
@@ -1331,12 +1345,14 @@ target_sources(uking PRIVATE
   aiMoveToTargetCollisionFeedback.h
   aiNavMeshTurnAwayFromHitPos.cpp
   aiNavMeshTurnAwayFromHitPos.h
+  aiNavMove.cpp
+  aiNavMove.h
   aiNavMoveNearTarget.cpp
   aiNavMoveNearTarget.h
-  aiNavMoveTargetClosestPoint.cpp
-  aiNavMoveTargetClosestPoint.h
   aiNavMoveTarget.cpp
   aiNavMoveTarget.h
+  aiNavMoveTargetClosestPoint.cpp
+  aiNavMoveTargetClosestPoint.h
   aiNavMoveTargetWithJumpWater.cpp
   aiNavMoveTargetWithJumpWater.h
   aiNavViewMove.cpp
@@ -1347,6 +1363,8 @@ target_sources(uking PRIVATE
   aiNearCreateSelect.h
   aiNewMannequinRoot.cpp
   aiNewMannequinRoot.h
+  aiNewRangeSelect.cpp
+  aiNewRangeSelect.h
   aiNormalHumanEquipableShield.cpp
   aiNormalHumanEquipableShield.h
   aiNoticePartsRangeSelector.cpp
@@ -1366,9 +1384,9 @@ target_sources(uking PRIVATE
   aiNPCClerkRoot.cpp
   aiNPCClerkRoot.h
   aiNPCConfront.cpp
+  aiNPCConfront.h
   aiNPCConfrontEnemy.cpp
   aiNPCConfrontEnemy.h
-  aiNPCConfront.h
   aiNpcDemoRoot.cpp
   aiNpcDemoRoot.h
   aiNPCGerudoQueenRoot.cpp
@@ -1399,6 +1417,8 @@ target_sources(uking PRIVATE
   aiNPCRoot.h
   aiNPCRunaway.cpp
   aiNPCRunaway.h
+  aiNPCScheduleMove.cpp
+  aiNPCScheduleMove.h
   aiNPCSearch.cpp
   aiNPCSearch.h
   aiNPCSurprised.cpp
@@ -1413,12 +1433,10 @@ target_sources(uking PRIVATE
   aiNpcTebaTrainingRoot.h
   aiNPCTimeline.cpp
   aiNPCTimeline.h
-  aiNPCScheduleMove.cpp
-  aiNPCScheduleMove.h
   aiNPCTravel.cpp
+  aiNPCTravel.h
   aiNPCTravelerRoot.cpp
   aiNPCTravelerRoot.h
-  aiNPCTravel.h
   aiNPCWander.cpp
   aiNPCWander.h
   aiNushiEscapeSelector.cpp
@@ -1427,30 +1445,28 @@ target_sources(uking PRIVATE
   aiNushiWarp.h
   aiOctarockBattle.cpp
   aiOctarockBattle.h
-  aiOctarockHideEscapeBase.cpp
-  aiOctarockHideEscapeBase.h
   aiOctarockHideEscape.cpp
   aiOctarockHideEscape.h
+  aiOctarockHideEscapeBase.cpp
+  aiOctarockHideEscapeBase.h
   aiOctarockOptionRoot.cpp
   aiOctarockOptionRoot.h
   aiOctarockReaction.cpp
   aiOctarockReaction.h
-  aiVacuumEnemyRoot.cpp
-  aiVacuumEnemyRoot.h
   aiOctarockRoot.cpp
   aiOctarockRoot.h
   aiOctarockServiceHideWait.cpp
   aiOctarockServiceHideWait.h
   aiOctarockWaterWait.cpp
   aiOctarockWaterWait.h
+  aiOffsetTargetPos.cpp
+  aiOffsetTargetPos.h
   aiOnCliffEnemyBattle.cpp
   aiOnCliffEnemyBattle.h
   aiOnCliffSurfaceSelect.cpp
   aiOnCliffSurfaceSelect.h
   aiOnCliffViewWait.cpp
   aiOnCliffViewWait.h
-  aiMagicBattle.cpp
-  aiMagicBattle.h
   aiOneMemoryMagicBattle.cpp
   aiOneMemoryMagicBattle.h
   aiOnEnterEventModeSelect.cpp
@@ -1477,6 +1493,8 @@ target_sources(uking PRIVATE
   aiPillarCrack.h
   aiPipeDrawing.cpp
   aiPipeDrawing.h
+  aiPlayASSwitch.cpp
+  aiPlayASSwitch.h
   aiPlayerSetTarget.cpp
   aiPlayerSetTarget.h
   aiPointWindTagRoot.cpp
@@ -1497,10 +1515,10 @@ target_sources(uking PRIVATE
   aiPrevSomeASSelect.h
   aiPreyChemicalDeadReaction.cpp
   aiPreyChemicalDeadReaction.h
-  aiPreyDeadCauseSelector.cpp
-  aiPreyDeadCauseSelector.h
   aiPreyDead.cpp
   aiPreyDead.h
+  aiPreyDeadCauseSelector.cpp
+  aiPreyDeadCauseSelector.h
   aiPreyDefWanderAI.cpp
   aiPreyDefWanderAI.h
   aiPreyDropItemRoot.cpp
@@ -1515,6 +1533,8 @@ target_sources(uking PRIVATE
   aiPreyRoot.h
   aiPreyStun.cpp
   aiPreyStun.h
+  aiPriestBoss.cpp
+  aiPriestBoss.h
   aiPriestBossActorCloneRoot.cpp
   aiPriestBossActorCloneRoot.h
   aiPriestBossActorEnemyRoot.cpp
@@ -1556,9 +1576,9 @@ target_sources(uking PRIVATE
   aiPriestBossDamageTypeSelect.cpp
   aiPriestBossDamageTypeSelect.h
   aiPriestBossEyeBeam.cpp
+  aiPriestBossEyeBeam.h
   aiPriestBossEyeBeamFourth.cpp
   aiPriestBossEyeBeamFourth.h
-  aiPriestBossEyeBeam.h
   aiPriestBossEyeBeamStandAim.cpp
   aiPriestBossEyeBeamStandAim.h
   aiPriestBossEyeBeamThird.cpp
@@ -1595,12 +1615,10 @@ target_sources(uking PRIVATE
   aiPriestBossLineFormationRush.h
   aiPriestBossMakeClone.cpp
   aiPriestBossMakeClone.h
-  aiPriestBossMetaAIRoot.cpp
-  aiPriestBossMetaAIRoot.h
   aiPriestBossMeta.cpp
   aiPriestBossMeta.h
-  aiPriestBoss.cpp
-  aiPriestBoss.h
+  aiPriestBossMetaAIRoot.cpp
+  aiPriestBossMetaAIRoot.h
   aiPriestBossNormalMoveSelector.cpp
   aiPriestBossNormalMoveSelector.h
   aiPriestBossNormalQuickRecover.cpp
@@ -1608,13 +1626,13 @@ target_sources(uking PRIVATE
   aiPriestBossNormalReaction.cpp
   aiPriestBossNormalReaction.h
   aiPriestBossPhase.cpp
+  aiPriestBossPhase.h
   aiPriestBossPhaseFinish.cpp
   aiPriestBossPhaseFinish.h
   aiPriestBossPhaseFirst.cpp
   aiPriestBossPhaseFirst.h
   aiPriestBossPhaseFourth.cpp
   aiPriestBossPhaseFourth.h
-  aiPriestBossPhase.h
   aiPriestBossPhaseSecond.cpp
   aiPriestBossPhaseSecond.h
   aiPriestBossPhaseSelector.cpp
@@ -1641,30 +1659,28 @@ target_sources(uking PRIVATE
   aiPriestIronBallAttack.h
   aiPullOutTree.cpp
   aiPullOutTree.h
-  aiBezierRailMove.cpp
-  aiBezierRailMove.h
   aiRailMoveObject.cpp
   aiRailMoveObject.h
   aiRailMoveObjectOneWay.cpp
   aiRailMoveObjectOneWay.h
   aiRailMoveRandomIgnoreStop.cpp
   aiRailMoveRandomIgnoreStop.h
-  aiRailMoveRemainsBGCamera.cpp
-  aiRailMoveRemainsBGCamera.h
   aiRailMoveRemains.cpp
   aiRailMoveRemains.h
+  aiRailMoveRemainsBGCamera.cpp
+  aiRailMoveRemainsBGCamera.h
   aiRailMoveRndIgnrStopPlayAS.cpp
   aiRailMoveRndIgnrStopPlayAS.h
   aiRailMoveWithClose.cpp
   aiRailMoveWithClose.h
-  aiRandomSelectThreeActionBase.cpp
-  aiRandomSelectThreeActionBase.h
   aiRandomSelectThreeAction.cpp
   aiRandomSelectThreeAction.h
-  aiRandomSelectTwoActionBase.cpp
-  aiRandomSelectTwoActionBase.h
+  aiRandomSelectThreeActionBase.cpp
+  aiRandomSelectThreeActionBase.h
   aiRandomSelectTwoAction.cpp
   aiRandomSelectTwoAction.h
+  aiRandomSelectTwoActionBase.cpp
+  aiRandomSelectTwoActionBase.h
   aiRangeAttackSelect.cpp
   aiRangeAttackSelect.h
   aiRangeCheckSeqTwoAction.cpp
@@ -1677,8 +1693,6 @@ target_sources(uking PRIVATE
   aiRangeObstacleCheck.h
   aiRangeSelectAction.cpp
   aiRangeSelectAction.h
-  aiNewRangeSelect.cpp
-  aiNewRangeSelect.h
   aiRangeSelectThreeAction.cpp
   aiRangeSelectThreeAction.h
   aiRangeSelectTwoAction.cpp
@@ -1703,8 +1717,6 @@ target_sources(uking PRIVATE
   aiRegistedActorNumTwoSelect.h
   aiRemainElectricCannonBeamAttack.cpp
   aiRemainElectricCannonBeamAttack.h
-  aiLargeCannonRoot.cpp
-  aiLargeCannonRoot.h
   aiRemainElectricCannonRoot.cpp
   aiRemainElectricCannonRoot.h
   aiRemainsElectricBGCamera.cpp
@@ -1785,8 +1797,6 @@ target_sources(uking PRIVATE
   aiSandwormLost.h
   aiSandwormNavSearchWait.cpp
   aiSandwormNavSearchWait.h
-  aiAwnSeal.cpp
-  aiAwnSeal.h
   aiSandwormNormal.cpp
   aiSandwormNormal.h
   aiSandwormNoticeSound.cpp
@@ -1815,10 +1825,10 @@ target_sources(uking PRIVATE
   aiSeqDynamicTimeredTwoAction.h
   aiSeqFirstPointTwo.cpp
   aiSeqFirstPointTwo.h
-  aiSeqGroundHitAssassinBoss.cpp
-  aiSeqGroundHitAssassinBoss.h
   aiSeqGroundHit.cpp
   aiSeqGroundHit.h
+  aiSeqGroundHitAssassinBoss.cpp
+  aiSeqGroundHitAssassinBoss.h
   aiSeqHiddenOctarockSearch.cpp
   aiSeqHiddenOctarockSearch.h
   aiSeqIfElseAction.cpp
@@ -1879,6 +1889,8 @@ target_sources(uking PRIVATE
   aiSignalSendingMagneStickAcceptor.h
   aiSimpleASBridge.cpp
   aiSimpleASBridge.h
+  aiSimpleBeamExplode.cpp
+  aiSimpleBeamExplode.h
   aiSimpleEnemyNormal.cpp
   aiSimpleEnemyNormal.h
   aiSimpleEscapeFromTarget.cpp
@@ -1886,15 +1898,13 @@ target_sources(uking PRIVATE
   aiSimpleKokkoRoot.cpp
   aiSimpleKokkoRoot.h
   aiSimpleLiftable.cpp
+  aiSimpleLiftable.h
   aiSimpleLiftableDLC.cpp
   aiSimpleLiftableDLC.h
-  aiSimpleLiftable.h
   aiSimpleLineBeam.cpp
   aiSimpleLineBeam.h
   aiSimpleShootingEnemyFindPlayer.cpp
   aiSimpleShootingEnemyFindPlayer.h
-  aiCapturedActorRoot.cpp
-  aiCapturedActorRoot.h
   aiSiteBossApproachRoot.cpp
   aiSiteBossApproachRoot.h
   aiSiteBossArrowRainAttack.cpp
@@ -1909,8 +1919,6 @@ target_sources(uking PRIVATE
   aiSiteBossBowChildDeviceRoot.h
   aiSiteBossBowRoot.cpp
   aiSiteBossBowRoot.h
-  aiGanonFlameBall.cpp
-  aiGanonFlameBall.h
   aiSiteBossFlameBall.cpp
   aiSiteBossFlameBall.h
   aiSiteBossGaleArrowRoot.cpp
@@ -1931,8 +1939,6 @@ target_sources(uking PRIVATE
   aiSiteBossPierceBulletAttack.h
   aiSiteBossReaction.cpp
   aiSiteBossReaction.h
-  aiLastBossRecognizeRoot.cpp
-  aiLastBossRecognizeRoot.h
   aiSiteBossRecognizeRoot.cpp
   aiSiteBossRecognizeRoot.h
   aiSiteBossReflectArrowRoot.cpp
@@ -1971,6 +1977,8 @@ target_sources(uking PRIVATE
   aiSiteBossThrowIceRoot.h
   aiSleepBedRoot.cpp
   aiSleepBedRoot.h
+  aiSleepNormal.cpp
+  aiSleepNormal.h
   aiSleepSelect.cpp
   aiSleepSelect.h
   aiSnowBallNormal.cpp
@@ -1981,8 +1989,6 @@ target_sources(uking PRIVATE
   aiSoundTriggerTag.h
   aiSpearWeaponSelect.cpp
   aiSpearWeaponSelect.h
-  aiSleepNormal.cpp
-  aiSleepNormal.h
   aiStalEnemyBlownOff.cpp
   aiStalEnemyBlownOff.h
   aiStalEnemyChasePart.cpp
@@ -2103,6 +2109,8 @@ target_sources(uking PRIVATE
   aiTargetActorDistanceSelect.h
   aiTargetActorGrabAdapter.cpp
   aiTargetActorGrabAdapter.h
+  aiTargetActorPos.cpp
+  aiTargetActorPos.h
   aiTargetAngerSelect.cpp
   aiTargetAngerSelect.h
   aiTargetAttackAttitudeTgt.cpp
@@ -2129,6 +2137,8 @@ target_sources(uking PRIVATE
   aiTargetElevationGapSelect.h
   aiTargetExistSelect.cpp
   aiTargetExistSelect.h
+  aiTargetHeightAreaSelect.cpp
+  aiTargetHeightAreaSelect.h
   aiTargetHomeDir.cpp
   aiTargetHomeDir.h
   aiTargetHomePos.cpp
@@ -2165,24 +2175,20 @@ target_sources(uking PRIVATE
   aiTargetPickedItem.h
   aiTargetPlayerPos.cpp
   aiTargetPlayerPos.h
-  aiTargetActorPos.cpp
-  aiTargetActorPos.h
   aiTargetPosAnchorOffsetSelf.cpp
   aiTargetPosAnchorOffsetSelf.h
   aiTargetPosAnchorOffsetTarget.cpp
   aiTargetPosAnchorOffsetTarget.h
   aiTargetPosDirLRSelect.cpp
   aiTargetPosDirLRSelect.h
-  aiTargetPosDynParamRotFromMyPos.cpp
   aiTargetPosDynParamRotFromCtrPos.cpp
   aiTargetPosDynParamRotFromCtrPos.h
+  aiTargetPosDynParamRotFromMyPos.cpp
   aiTargetPosDynParamRotFromMyPos.h
   aiTargetPosLostCheck.cpp
   aiTargetPosLostCheck.h
-  aiOffsetTargetPos.cpp
   aiTargetPosOffsetFromMyPos.cpp
   aiTargetPosOffsetFromMyPos.h
-  aiOffsetTargetPos.h
   aiTargetPosOnNavFaceSelect.cpp
   aiTargetPosOnNavFaceSelect.h
   aiTargetPosRotFromMyPos.cpp
@@ -2207,8 +2213,6 @@ target_sources(uking PRIVATE
   aiTerminalEnduranceWarpRoot.h
   aiTimeControlTagRoot.cpp
   aiTimeControlTagRoot.h
-  aiInvincibleNearTarget.cpp
-  aiInvincibleNearTarget.h
   aiTimelineAI.cpp
   aiTimelineAI.h
   aiTimeredViewWait.cpp
@@ -2245,10 +2249,6 @@ target_sources(uking PRIVATE
   aiTwnObjDlcFlightTrainingTarget.h
   aiUnarmedEnemyNoiseTarget.cpp
   aiUnarmedEnemyNoiseTarget.h
-  aiNavMove.cpp
-  aiNavMove.h
-  aiEnemySearch.cpp
-  aiEnemySearch.h
   aiUnarmedWeaponEquipableEnemyAct.cpp
   aiUnarmedWeaponEquipableEnemyAct.h
   aiUnderWaterDepthSelect.cpp
@@ -2257,6 +2257,8 @@ target_sources(uking PRIVATE
   aiUrbosasFuryDamageSelector.h
   aiVacuumedBombDamageSelect.cpp
   aiVacuumedBombDamageSelect.h
+  aiVacuumEnemyRoot.cpp
+  aiVacuumEnemyRoot.h
   aiVehicleSelector.cpp
   aiVehicleSelector.h
   aiViewChaseSound.cpp
@@ -2266,9 +2268,9 @@ target_sources(uking PRIVATE
   aiViewMove.cpp
   aiViewMove.h
   aiViewWait.cpp
+  aiViewWait.h
   aiViewWaitEndWhenAimed.cpp
   aiViewWaitEndWhenAimed.h
-  aiViewWait.h
   aiViewWaitRiskAvoid.cpp
   aiViewWaitRiskAvoid.h
   aiViewWaitWithFaceView.cpp
@@ -2283,10 +2285,10 @@ target_sources(uking PRIVATE
   aiWaitForCloseOrWaterSide.h
   aiWaitForTargetClose.cpp
   aiWaitForTargetClose.h
-  aiWaitNearTargetAwarenessRange.cpp
-  aiWaitNearTargetAwarenessRange.h
   aiWaitNearTarget.cpp
   aiWaitNearTarget.h
+  aiWaitNearTargetAwarenessRange.cpp
+  aiWaitNearTargetAwarenessRange.h
   aiWaitPartsSleep.cpp
   aiWaitPartsSleep.h
   aiWarpActivateTerminal.cpp
@@ -2297,12 +2299,12 @@ target_sources(uking PRIVATE
   aiWarpTagRoot.h
   aiWaterFallWithSound.cpp
   aiWaterFallWithSound.h
+  aiWaterSurface.cpp
+  aiWaterSurface.h
   aiWaterSurface4RemainsLava.cpp
   aiWaterSurface4RemainsLava.h
   aiWaterSurfaceBase.cpp
   aiWaterSurfaceBase.h
-  aiWaterSurface.cpp
-  aiWaterSurface.h
   aiWeakPointRoot.cpp
   aiWeakPointRoot.h
   aiWeakStateSelecter.cpp
@@ -2335,8 +2337,6 @@ target_sources(uking PRIVATE
   aiWeatherReactionCheck.h
   aiWetSelect.cpp
   aiWetSelect.h
-  aiDungeonRotateTagApp.cpp
-  aiDungeonRotateTagApp.h
   aiWillBallAttackLevelSelect.cpp
   aiWillBallAttackLevelSelect.h
   aiWillBallFollowAttack.cpp
@@ -2399,10 +2399,10 @@ target_sources(uking PRIVATE
   aiWolfLinkShiekSensorRoot.h
   aiWolfLinkWarp.cpp
   aiWolfLinkWarp.h
-  aiYunBoCannonBallRoot.cpp
-  aiYunBoCannonBallRoot.h
   aiYunBoCannon.cpp
   aiYunBoCannon.h
+  aiYunBoCannonBallRoot.cpp
+  aiYunBoCannonBallRoot.h
   aiZokuchoSunazarashi.cpp
   aiZokuchoSunazarashi.h
   aiZoraHeroRelicBattleNormal.cpp
diff --git a/src/Game/Actor/Action/CMakeLists.txt b/src/Game/Actor/Action/CMakeLists.txt
index e88de418..ef716104 100644
--- a/src/Game/Actor/Action/CMakeLists.txt
+++ b/src/Game/Actor/Action/CMakeLists.txt
@@ -19,12 +19,12 @@ target_sources(uking PRIVATE
   actionAddRigidBody.h
   actionAdvanceTime.cpp
   actionAdvanceTime.h
-  actionAirOctaMoveBase.cpp
-  actionAirOctaMoveBase.h
   actionAirOctaFloat.cpp
   actionAirOctaFloat.h
   actionAirOctaMgr.cpp
   actionAirOctaMgr.h
+  actionAirOctaMoveBase.cpp
+  actionAirOctaMoveBase.h
   actionAirOctaNoticeTurn.cpp
   actionAirOctaNoticeTurn.h
   actionAirOctaReactionKorog.cpp
@@ -61,10 +61,10 @@ target_sources(uking PRIVATE
   actionAnimalFreeze.h
   actionAnimalLegTurnAutoSpeed.cpp
   actionAnimalLegTurnAutoSpeed.h
-  actionAnimalMoveBase.cpp
-  actionAnimalMoveBase.h
   actionAnimalMove.cpp
   actionAnimalMove.h
+  actionAnimalMoveBase.cpp
+  actionAnimalMoveBase.h
   actionAnimalMoveStraightTimed.cpp
   actionAnimalMoveStraightTimed.h
   actionAnimalNavMeshMove.cpp
@@ -87,18 +87,18 @@ target_sources(uking PRIVATE
   actionAnmArmorBindAction.h
   actionAnmBackMove.cpp
   actionAnmBackMove.h
-  actionAnmBlownOffBackward.cpp
-  actionAnmBlownOffBackward.h
   actionAnmBlownOff.cpp
   actionAnmBlownOff.h
+  actionAnmBlownOffBackward.cpp
+  actionAnmBlownOffBackward.h
   actionAnmDamage.cpp
   actionAnmDamage.h
   actionAnmDirectionMove.cpp
   actionAnmDirectionMove.h
-  actionAnmDrivenHoverBase.cpp
-  actionAnmDrivenHoverBase.h
   actionAnmDrivenHover.cpp
   actionAnmDrivenHover.h
+  actionAnmDrivenHoverBase.cpp
+  actionAnmDrivenHoverBase.h
   actionAnmDrivenHoverTurn.cpp
   actionAnmDrivenHoverTurn.h
   actionAnmDrivenMoveAttack.cpp
@@ -114,13 +114,15 @@ target_sources(uking PRIVATE
   actionAnmUpDownMove.cpp
   actionAnmUpDownMove.h
   actionAppear.cpp
+  actionAppear.h
   actionAppearDeathCounter.cpp
   actionAppearDeathCounter.h
+  actionAppearFollowChallenge.cpp
+  actionAppearFollowChallenge.h
   actionAppearFullPouchInfo.cpp
   actionAppearFullPouchInfo.h
   actionAppearGameOver.cpp
   actionAppearGameOver.h
-  actionAppear.h
   actionAppearMagneForce.cpp
   actionAppearMagneForce.h
   actionAppearNumDungeonClearSeal.cpp
@@ -159,22 +161,26 @@ target_sources(uking PRIVATE
   actionArmorBindNodeAction.h
   actionArmorBindWithAS.cpp
   actionArmorBindWithAS.h
+  actionArrowChargeAndShoot.cpp
+  actionArrowChargeAndShoot.h
   actionArrowShootHoming.cpp
   actionArrowShootHoming.h
   actionArrowShootMove.cpp
+  actionArrowShootMove.h
   actionArrowShootMoveForLargeObject.cpp
   actionArrowShootMoveForLargeObject.h
-  actionArrowShootMove.h
   actionArrowShootMoveWithStickOffset.cpp
   actionArrowShootMoveWithStickOffset.h
   actionArrowSkyShootMove.cpp
   actionArrowSkyShootMove.h
   actionAscendingCurrent.cpp
+  actionAscendingCurrent.h
   actionAscendingCurrentFixedSize.cpp
   actionAscendingCurrentFixedSize.h
-  actionAscendingCurrent.h
   actionAscendingCurrentShieldable.cpp
   actionAscendingCurrentShieldable.h
+  actionASPlayRotateTurnToTarget.cpp
+  actionASPlayRotateTurnToTarget.h
   actionASPlaySimpleAnmDriven.cpp
   actionASPlaySimpleAnmDriven.h
   actionAssassinBossIronBallAppear.cpp
@@ -187,8 +193,6 @@ target_sources(uking PRIVATE
   actionAssassinBossIronMagicChargeShot.h
   actionAtAndBodyOnWait.cpp
   actionAtAndBodyOnWait.h
-  actionTackleAttack.cpp
-  actionTackleAttack.h
   actionAtOnWait.cpp
   actionAtOnWait.h
   actionAtOnWaitNoHitRope.cpp
@@ -215,12 +219,12 @@ target_sources(uking PRIVATE
   actionBackseatKorokLight.h
   actionBackseatKorokWait.cpp
   actionBackseatKorokWait.h
+  actionBackStep.cpp
+  actionBackStep.h
   actionBackStepAttack.cpp
   actionBackStepAttack.h
   actionBackStepBase.cpp
   actionBackStepBase.h
-  actionBackStep.cpp
-  actionBackStep.h
   actionBackStepToTarget.cpp
   actionBackStepToTarget.h
   actionBackStepToTargetPos.cpp
@@ -229,23 +233,25 @@ target_sources(uking PRIVATE
   actionBackSwim.h
   actionBackToRailFromLava.cpp
   actionBackToRailFromLava.h
-  actionBackWalkBase.cpp
-  actionBackWalkBase.h
   actionBackWalk.cpp
   actionBackWalk.h
+  actionBackWalkBase.cpp
+  actionBackWalkBase.h
   actionBackWalkWithAS.cpp
   actionBackWalkWithAS.h
-  actionBalloonBase.cpp
-  actionBalloonBase.h
   actionBalloon.cpp
   actionBalloon.h
+  actionBalloonBase.cpp
+  actionBalloonBase.h
+  actionBalloonRopeBase.cpp
+  actionBalloonRopeBase.h
   actionBasicSignalBossAwakeSleep.cpp
   actionBasicSignalBossAwakeSleep.h
   actionBasicSignalChangeDamping.cpp
   actionBasicSignalChangeDamping.h
-  actionBasicSignalEnemyNotice.cpp
   actionBasicSignalEnemyForceNotice.cpp
   actionBasicSignalEnemyForceNotice.h
+  actionBasicSignalEnemyNotice.cpp
   actionBasicSignalEnemyNotice.h
   actionBasicSignalForbidTag.cpp
   actionBasicSignalForbidTag.h
@@ -259,18 +265,18 @@ target_sources(uking PRIVATE
   actionBattleCloseGuardRun.h
   actionBattleCloseGuardWalk.cpp
   actionBattleCloseGuardWalk.h
-  actionBattleCloseLevelFlyMoveBase.cpp
-  actionBattleCloseLevelFlyMoveBase.h
   actionBattleCloseLevelFlyMove.cpp
   actionBattleCloseLevelFlyMove.h
+  actionBattleCloseLevelFlyMoveBase.cpp
+  actionBattleCloseLevelFlyMoveBase.h
   actionBattleCloseMeanderGuardRun.cpp
   actionBattleCloseMeanderGuardRun.h
   actionBattleCloseMeanderRun.cpp
   actionBattleCloseMeanderRun.h
-  actionBattleCloseMoveAction.cpp
-  actionBattleCloseMoveAction.h
   actionBattleCloseMove.cpp
   actionBattleCloseMove.h
+  actionBattleCloseMoveAction.cpp
+  actionBattleCloseMoveAction.h
   actionBattleCloseSlippedMoveBase.cpp
   actionBattleCloseSlippedMoveBase.h
   actionBattleCloseSlippedWalk.cpp
@@ -279,10 +285,10 @@ target_sources(uking PRIVATE
   actionBattleCloseWalk.h
   actionBattleHover.cpp
   actionBattleHover.h
-  actionBattleLevelFlyMoveBase.cpp
-  actionBattleLevelFlyMoveBase.h
   actionBattleLevelFlyMove.cpp
   actionBattleLevelFlyMove.h
+  actionBattleLevelFlyMoveBase.cpp
+  actionBattleLevelFlyMoveBase.h
   actionBattleWalk.cpp
   actionBattleWalk.h
   actionBeamMove.cpp
@@ -308,9 +314,9 @@ target_sources(uking PRIVATE
   actionBikeWarpEffectValueSetter.cpp
   actionBikeWarpEffectValueSetter.h
   actionBindAction.cpp
+  actionBindAction.h
   actionBindActionForManyActor.cpp
   actionBindActionForManyActor.h
-  actionBindAction.h
   actionBindActionUseParentPickInfo.cpp
   actionBindActionUseParentPickInfo.h
   actionBindOff.cpp
@@ -403,16 +409,14 @@ target_sources(uking PRIVATE
   actionChangePosture.h
   actionChangePostureWithAS.cpp
   actionChangePostureWithAS.h
-  actionChangeSceneBase.cpp
-  actionChangeSceneBase.h
   actionChangeScene.cpp
   actionChangeScene.h
+  actionChangeSceneBase.cpp
+  actionChangeSceneBase.h
   actionChangeScheduleAnchor.cpp
   actionChangeScheduleAnchor.h
   actionChangeWeaponEquipState.cpp
   actionChangeWeaponEquipState.h
-  actionArrowChargeAndShoot.cpp
-  actionArrowChargeAndShoot.h
   actionChargeChemicalWeaponPower.cpp
   actionChargeChemicalWeaponPower.h
   actionCheckExistenceOfParticipant.cpp
@@ -421,8 +425,6 @@ target_sources(uking PRIVATE
   actionCheckHorseCustomizeEdit.h
   actionChemicalAttack.cpp
   actionChemicalAttack.h
-  actionEmitAttackBase.cpp
-  actionEmitAttackBase.h
   actionChemicalElectricWaterBall.cpp
   actionChemicalElectricWaterBall.h
   actionChemicalPhysBall.cpp
@@ -487,10 +489,10 @@ target_sources(uking PRIVATE
   actionDamageTurnByWeakPoint.h
   actionDefeatedHugeEnemyCount.cpp
   actionDefeatedHugeEnemyCount.h
-  actionDeleteAllIceBlockForDemo.cpp
-  actionDeleteAllIceBlockForDemo.h
   actionDelete.cpp
   actionDelete.h
+  actionDeleteAllIceBlockForDemo.cpp
+  actionDeleteAllIceBlockForDemo.h
   actionDeleteInGround.cpp
   actionDeleteInGround.h
   actionDeletePorchItemIncludeEquip.cpp
@@ -513,10 +515,10 @@ target_sources(uking PRIVATE
   actionDemoFindPlayer.h
   actionDemoForceSetPlayerSavePosAngle.cpp
   actionDemoForceSetPlayerSavePosAngle.h
-  actionDemoGetItemAnimStop.cpp
-  actionDemoGetItemAnimStop.h
   actionDemoGetItem.cpp
   actionDemoGetItem.h
+  actionDemoGetItemAnimStop.cpp
+  actionDemoGetItemAnimStop.h
   actionDemoGetWeapon.cpp
   actionDemoGetWeapon.h
   actionDemoKokkoAngry.cpp
@@ -561,14 +563,14 @@ target_sources(uking PRIVATE
   actionDgnObjDlcGondolaCreateTag.h
   actionDgnObjDLCSpurGearB01.cpp
   actionDgnObjDLCSpurGearB01.h
-  actionDieAnm.cpp
-  actionDieAnmDropWeapon.cpp
-  actionDieAnmDropWeapon.h
-  actionDieAnm.h
-  actionDieAnmKnockBack.cpp
-  actionDieAnmKnockBack.h
   actionDie.cpp
   actionDie.h
+  actionDieAnm.cpp
+  actionDieAnm.h
+  actionDieAnmDropWeapon.cpp
+  actionDieAnmDropWeapon.h
+  actionDieAnmKnockBack.cpp
+  actionDieAnmKnockBack.h
   actionDieHomeRun.cpp
   actionDieHomeRun.h
   actionDirectToWindDirection.cpp
@@ -637,12 +639,14 @@ target_sources(uking PRIVATE
   actionDunegonRotateWait.h
   actionDungeonEntranceASPlay.cpp
   actionDungeonEntranceASPlay.h
-  actionDungeonMoveAlwaysVibrateCam.cpp
-  actionDungeonMoveAlwaysVibrateCam.h
   actionDungeonMove.cpp
   actionDungeonMove.h
+  actionDungeonMoveAlwaysVibrateCam.cpp
+  actionDungeonMoveAlwaysVibrateCam.h
   actionDungeonMoveReset.cpp
   actionDungeonMoveReset.h
+  actionDungeonRotate.cpp
+  actionDungeonRotate.h
   actionDungeonRotate2Target.cpp
   actionDungeonRotate2Target.h
   actionDungeonRotateAccel.cpp
@@ -653,10 +657,8 @@ target_sources(uking PRIVATE
   actionDungeonRotateBase.h
   actionDungeonRotateCont.cpp
   actionDungeonRotateCont.h
-  actionDungeonRotate.cpp
   actionDungeonRotateGyro.cpp
   actionDungeonRotateGyro.h
-  actionDungeonRotate.h
   actionDungeonRotateInOrder.cpp
   actionDungeonRotateInOrder.h
   actionDungeonRotateShuttle.cpp
@@ -667,12 +669,12 @@ target_sources(uking PRIVATE
   actionDynamicAttackPowerExplode.h
   actionDynamicFireWood.cpp
   actionDynamicFireWood.h
+  actionEat.cpp
+  actionEat.h
   actionEatAndHeal.cpp
   actionEatAndHeal.h
-  actionEat.cpp
   actionEatForSunazarashiSPC.cpp
   actionEatForSunazarashiSPC.h
-  actionEat.h
   actionEatWithAS.cpp
   actionEatWithAS.h
   actionEitherSideExplode.cpp
@@ -687,6 +689,8 @@ target_sources(uking PRIVATE
   actionElectricDie.h
   actionElectricParalysis.cpp
   actionElectricParalysis.h
+  actionEmitAttackBase.cpp
+  actionEmitAttackBase.h
   actionEmitElectricWaterBall.cpp
   actionEmitElectricWaterBall.h
   actionEndChangeableASPlay.cpp
@@ -707,10 +711,10 @@ target_sources(uking PRIVATE
   actionEnemyFortressChatTurn.h
   actionEnemyFortressSimpleAction.cpp
   actionEnemyFortressSimpleAction.h
-  actionEnemyRigidBodyDieBase.cpp
-  actionEnemyRigidBodyDieBase.h
   actionEnemyRigidBodyDie.cpp
   actionEnemyRigidBodyDie.h
+  actionEnemyRigidBodyDieBase.cpp
+  actionEnemyRigidBodyDieBase.h
   actionEnemyRigidBodyFreeFallDie.cpp
   actionEnemyRigidBodyFreeFallDie.h
   actionEnemyRigidBodySpinDie.cpp
@@ -718,13 +722,11 @@ target_sources(uking PRIVATE
   actionEnemyRushAttack.cpp
   actionEnemyRushAttack.h
   actionEquipDisplay.cpp
+  actionEquipDisplay.h
   actionEquipDisplayCreate.cpp
   actionEquipDisplayCreate.h
   actionEquipDisplayGet.cpp
   actionEquipDisplayGet.h
-  actionEquipDisplay.h
-  actionEquipHornUseBase.cpp
-  actionEquipHornUseBase.h
   actionEquipedAction.cpp
   actionEquipedAction.h
   actionEquipedASPlay.cpp
@@ -745,10 +747,12 @@ target_sources(uking PRIVATE
   actionEquipedWeaponChild.h
   actionEquipedWithScale.cpp
   actionEquipedWithScale.h
-  actionEscapeBackTurn.cpp
-  actionEscapeBackTurn.h
+  actionEquipHornUseBase.cpp
+  actionEquipHornUseBase.h
   actionEscape.cpp
   actionEscape.h
+  actionEscapeBackTurn.cpp
+  actionEscapeBackTurn.h
   actionEventAddGameDataIntAction.cpp
   actionEventAddGameDataIntAction.h
   actionEventAddGameDataToRupeeAction.cpp
@@ -941,12 +945,12 @@ target_sources(uking PRIVATE
   actionFadeInOutWithOptions.h
   actionFadeoutDelete.cpp
   actionFadeoutDelete.h
+  actionFall.cpp
+  actionFall.h
   actionFallAttack.cpp
   actionFallAttack.h
   actionFallAttackWithAtAttr.cpp
   actionFallAttackWithAtAttr.h
-  actionFall.cpp
-  actionFall.h
   actionFireBurnBase.cpp
   actionFireBurnBase.h
   actionFireWood.cpp
@@ -976,37 +980,35 @@ target_sources(uking PRIVATE
   actionFlyingBirdDie.cpp
   actionFlyingBirdDie.h
   actionFlyingCharacterBlownOff.cpp
+  actionFlyingCharacterBlownOff.h
   actionFlyingCharacterBlownOffDie.cpp
   actionFlyingCharacterBlownOffDie.h
-  actionFlyingCharacterBlownOff.h
   actionFlyingCharacterDamage.cpp
   actionFlyingCharacterDamage.h
   actionFlyingCharacterDie.cpp
   actionFlyingCharacterDie.h
   actionFlyingCharacterFreeFall.cpp
+  actionFlyingCharacterFreeFall.h
+  actionFlyingCharacterFreeFallBase.cpp
+  actionFlyingCharacterFreeFallBase.h
   actionFlyingCharacterFreeFallDie.cpp
   actionFlyingCharacterFreeFallDie.h
   actionFlyingCharacterFreeFallEx.cpp
   actionFlyingCharacterFreeFallEx.h
-  actionFlyingCharacterFreeFall.h
   actionFlyingCharacterFreeze.cpp
+  actionFlyingCharacterFreeze.h
   actionFlyingCharacterFreezeDie.cpp
   actionFlyingCharacterFreezeDie.h
-  actionFlyingCharacterFreeze.h
-  actionFlyingCharacterFreeFallBase.cpp
-  actionFlyingCharacterFreeFallBase.h
-  actionFlyMoveBase.cpp
-  actionFlyMoveBase.h
   actionFlyMove.cpp
   actionFlyMove.h
+  actionFlyMoveBase.cpp
+  actionFlyMoveBase.h
   actionFollowAttack.cpp
   actionFollowAttack.h
-  actionAppearFollowChallenge.cpp
-  actionAppearFollowChallenge.h
-  actionFollowDungeonRotateASPlay.cpp
-  actionFollowDungeonRotateASPlay.h
   actionFollowDungeonRotate.cpp
   actionFollowDungeonRotate.h
+  actionFollowDungeonRotateASPlay.cpp
+  actionFollowDungeonRotateASPlay.h
   actionFollowIgniteToBonePos.cpp
   actionFollowIgniteToBonePos.h
   actionFollowIgniteToSelfPos.cpp
@@ -1045,6 +1047,8 @@ target_sources(uking PRIVATE
   actionForceSystemFadeOut.h
   actionForestGiantWakeUp.cpp
   actionForestGiantWakeUp.h
+  actionFork.cpp
+  actionFork.h
   actionForkAddCalcScaleMapUnit.cpp
   actionForkAddCalcScaleMapUnit.h
   actionForkAddLinearImpulse.cpp
@@ -1095,26 +1099,24 @@ target_sources(uking PRIVATE
   actionForkASHoldLegTurn.h
   actionForkASHoldLinearMove.cpp
   actionForkASHoldLinearMove.h
-  actionForkASPlayBase.cpp
-  actionForkASPlayBase.h
   actionForkASPlay.cpp
   actionForkASPlay.h
+  actionForkASPlayBase.cpp
+  actionForkASPlayBase.h
   actionForkASTrgAerialTurn.cpp
   actionForkASTrgAerialTurn.h
   actionForkASTrgChargeArrow.cpp
   actionForkASTrgChargeArrow.h
+  actionForkASTrgDelete.cpp
+  actionForkASTrgDelete.h
   actionForkASTrgDeleteChild.cpp
   actionForkASTrgDeleteChild.h
-  actionForkASTrgDelete.cpp
   actionForkASTrgDeleteEquip.cpp
   actionForkASTrgDeleteEquip.h
-  actionForkASTrgDelete.h
   actionForkASTrgEmitChmFieldPos.cpp
   actionForkASTrgEmitChmFieldPos.h
   actionForkASTrgEmitShockWaveAtEnter.cpp
   actionForkASTrgEmitShockWaveAtEnter.h
-  actionForkEmitShockWave.cpp
-  actionForkEmitShockWave.h
   actionForkASTrgEmitShockWavePos.cpp
   actionForkASTrgEmitShockWavePos.h
   actionForkASTrgForceDirAerialTurn.cpp
@@ -1139,6 +1141,8 @@ target_sources(uking PRIVATE
   actionForkASTrgWeaponDrop.h
   actionForkAttackWithWeaponOrWithout.cpp
   actionForkAttackWithWeaponOrWithout.h
+  actionForkBasicMessageDialogCtrl.cpp
+  actionForkBasicMessageDialogCtrl.h
   actionForkBattleNodeForAttackGround.cpp
   actionForkBattleNodeForAttackGround.h
   actionForkBeastGanonMessageDialogCtrl.cpp
@@ -1155,19 +1159,18 @@ target_sources(uking PRIVATE
   actionForkChemicalChuchuAttack.h
   actionForkClothOnOffASPlay.cpp
   actionForkClothOnOffASPlay.h
-  actionFork.cpp
+  actionForkDisableContact.cpp
+  actionForkDisableContact.h
   actionForkDisableContactByPreAS.cpp
   actionForkDisableContactByPreAS.h
-  actionForkDisableContact.cpp
   actionForkDisableContactForAttack.cpp
   actionForkDisableContactForAttack.h
-  actionForkDisableContact.h
   actionForkDisableContactOnAtHitPlayer.cpp
   actionForkDisableContactOnAtHitPlayer.h
-  actionForkDrawWeaponAtEnter.cpp
-  actionForkDrawWeaponAtEnter.h
   actionForkDrawWeapon.cpp
   actionForkDrawWeapon.h
+  actionForkDrawWeaponAtEnter.cpp
+  actionForkDrawWeaponAtEnter.h
   actionForkDropGiantNecklace.cpp
   actionForkDropGiantNecklace.h
   actionForkDropWeapon.cpp
@@ -1190,6 +1193,8 @@ target_sources(uking PRIVATE
   actionForkEmitExpandField.h
   actionForkEmitExpandFieldWithCreate.cpp
   actionForkEmitExpandFieldWithCreate.h
+  actionForkEmitShockWave.cpp
+  actionForkEmitShockWave.h
   actionForkEmitShockWaveByContact.cpp
   actionForkEmitShockWaveByContact.h
   actionForkEndByConditionBase.cpp
@@ -1220,10 +1225,10 @@ target_sources(uking PRIVATE
   actionForkGanonBeastBeamShoot.h
   actionForkGanonBeastHeadBarrier.cpp
   actionForkGanonBeastHeadBarrier.h
-  actionForkGanonBeastWeakPointCheck.cpp
-  actionForkGanonBeastWeakPointCheck.h
   actionForkGanonBeastWeakPoint.cpp
   actionForkGanonBeastWeakPoint.h
+  actionForkGanonBeastWeakPointCheck.cpp
+  actionForkGanonBeastWeakPointCheck.h
   actionForkGanonBeastWeakPointOff.cpp
   actionForkGanonBeastWeakPointOff.h
   actionForkGanonBeastWeakPointOn.cpp
@@ -1236,7 +1241,6 @@ target_sources(uking PRIVATE
   actionForkGrabBase.h
   actionForkGravityScaleChange.cpp
   actionForkGravityScaleChange.h
-  actionFork.h
   actionForkHoldWeapon.cpp
   actionForkHoldWeapon.h
   actionForkHopInAir.cpp
@@ -1261,10 +1265,10 @@ target_sources(uking PRIVATE
   actionForkLodTimer.h
   actionForkLynelBreathShoot.cpp
   actionForkLynelBreathShoot.h
-  actionForkLynelDrawWeaponASPlay.cpp
-  actionForkLynelDrawWeaponASPlay.h
   actionForkLynelDrawWeapon.cpp
   actionForkLynelDrawWeapon.h
+  actionForkLynelDrawWeaponASPlay.cpp
+  actionForkLynelDrawWeaponASPlay.h
   actionForkModelFadeOut.cpp
   actionForkModelFadeOut.h
   actionForkModelVisibleOff.cpp
@@ -1285,16 +1289,16 @@ target_sources(uking PRIVATE
   actionForkNoHitGroundCrawl.h
   actionForkNoSlowTimer.cpp
   actionForkNoSlowTimer.h
+  actionForkNoWeaponAttack.cpp
+  actionForkNoWeaponAttack.h
   actionForkNoWeaponAttackAllTime.cpp
   actionForkNoWeaponAttackAllTime.h
   actionForkNoWeaponAttackAllTimeMinSet.cpp
   actionForkNoWeaponAttackAllTimeMinSet.h
   actionForkNoWeaponAttackBase.cpp
   actionForkNoWeaponAttackBase.h
-  actionForkNoWeaponAttack.cpp
   actionForkNoWeaponAttackDirectParam.cpp
   actionForkNoWeaponAttackDirectParam.h
-  actionForkNoWeaponAttack.h
   actionForkNoWeaponAttackParamWeapon.cpp
   actionForkNoWeaponAttackParamWeapon.h
   actionForkOctarockEnterReloadWig.cpp
@@ -1328,9 +1332,9 @@ target_sources(uking PRIVATE
   actionForkSetCustomWeather.cpp
   actionForkSetCustomWeather.h
   actionForkSetJustAvoid.cpp
+  actionForkSetJustAvoid.h
   actionForkSetJustAvoidFromBone.cpp
   actionForkSetJustAvoidFromBone.h
-  actionForkSetJustAvoid.h
   actionForkSetSwarmMaterialAnimByDist.cpp
   actionForkSetSwarmMaterialAnimByDist.h
   actionForkSimpleGrab.cpp
@@ -1355,12 +1359,12 @@ target_sources(uking PRIVATE
   actionForkSwapPartsItemFromDropTable.h
   actionForkSwarmAttack.cpp
   actionForkSwarmAttack.h
+  actionForkTimer.cpp
+  actionForkTimer.h
   actionForkTimerBase.cpp
   actionForkTimerBase.h
-  actionForkTimer.cpp
   actionForkTimerForceResetCondition.cpp
   actionForkTimerForceResetCondition.h
-  actionForkTimer.h
   actionForkToggleFreeMoving.cpp
   actionForkToggleFreeMoving.h
   actionForkTogglePriestBossFreeMoving.cpp
@@ -1369,30 +1373,30 @@ target_sources(uking PRIVATE
   actionForkToggleWeaponXLinkSleep.h
   actionForkTrgEmitChmFieldBase.cpp
   actionForkTrgEmitChmFieldBase.h
-  actionForkTurnASHold.cpp
-  actionForkTurnASHold.h
   actionForkTurn.cpp
   actionForkTurn.h
+  actionForkTurnASHold.cpp
+  actionForkTurnASHold.h
   actionForkVacuumShootToTarget.cpp
   actionForkVacuumShootToTarget.h
   actionForkWaitCloseGanonShoutMsgClose.cpp
   actionForkWaitCloseGanonShoutMsgClose.h
   actionForkWaitGroundHit.cpp
   actionForkWaitGroundHit.h
-  actionForkWeaponAttackBase.cpp
-  actionForkWeaponAttackBase.h
   actionForkWeaponAttack.cpp
   actionForkWeaponAttack.h
+  actionForkWeaponAttackBase.cpp
+  actionForkWeaponAttackBase.h
   actionForkWeaponAttackWithAtkBody.cpp
   actionForkWeaponAttackWithAtkBody.h
-  actionForkWeaponShockWaveCheckValue.cpp
-  actionForkWeaponShockWaveCheckValue.h
   actionForkWeaponShockWave.cpp
   actionForkWeaponShockWave.h
-  actionFreeMoveByGuideBase.cpp
-  actionFreeMoveByGuideBase.h
+  actionForkWeaponShockWaveCheckValue.cpp
+  actionForkWeaponShockWaveCheckValue.h
   actionFreeMove.cpp
   actionFreeMove.h
+  actionFreeMoveByGuideBase.cpp
+  actionFreeMoveByGuideBase.h
   actionFreeMoveRandom.cpp
   actionFreeMoveRandom.h
   actionFreeMoveToNearGround.cpp
@@ -1406,11 +1410,11 @@ target_sources(uking PRIVATE
   actionFreeMovingAction.cpp
   actionFreeMovingAction.h
   actionFreeze.cpp
+  actionFreeze.h
   actionFreezedInIce.cpp
   actionFreezedInIce.h
   actionFreezedInIceWeapon.cpp
   actionFreezedInIceWeapon.h
-  actionFreeze.h
   actionFromCDungeonToMainField.cpp
   actionFromCDungeonToMainField.h
   actionGameDataAddFloat.cpp
@@ -1489,22 +1493,22 @@ target_sources(uking PRIVATE
   actionGerudoQueenWakeBoardReady.h
   actionGetCapturedActor.cpp
   actionGetCapturedActor.h
+  actionGetItem.cpp
+  actionGetItem.h
   actionGetItemAnotherActor.cpp
   actionGetItemAnotherActor.h
-  actionGetItem.cpp
   actionGetItemGet.cpp
   actionGetItemGet.h
-  actionGetItem.h
   actionGetItemIntoBag.cpp
   actionGetItemIntoBag.h
   actionGetRupee.cpp
   actionGetRupee.h
   actionGetSmallKeyItemGet.cpp
   actionGetSmallKeyItemGet.h
-  actionGetUpBase.cpp
-  actionGetUpBase.h
   actionGetUp.cpp
   actionGetUp.h
+  actionGetUpBase.cpp
+  actionGetUpBase.h
   actionGetUpLinear.cpp
   actionGetUpLinear.h
   actionGetUpMoveAnmDriven.cpp
@@ -1565,12 +1569,12 @@ target_sources(uking PRIVATE
   actionGoronHeroDescendentAppear.h
   actionGoronHeroDescendentJump.cpp
   actionGoronHeroDescendentJump.h
+  actionGrab.cpp
+  actionGrab.h
   actionGrabAndShoot.cpp
   actionGrabAndShoot.h
   actionGrabAttack.cpp
   actionGrabAttack.h
-  actionGrab.cpp
-  actionGrab.h
   actionGrabLeft.cpp
   actionGrabLeft.h
   actionGrabLeftTurn.cpp
@@ -1585,12 +1589,12 @@ target_sources(uking PRIVATE
   actionGrabRightWalk.h
   actionGraveAttack.cpp
   actionGraveAttack.h
+  actionGuard.cpp
+  actionGuard.h
   actionGuardBackWalk.cpp
   actionGuardBackWalk.h
   actionGuardBreak.cpp
   actionGuardBreak.h
-  actionGuard.cpp
-  actionGuard.h
   actionGuardianActionBase.cpp
   actionGuardianActionBase.h
   actionGuardianAimBeam.cpp
@@ -1651,10 +1655,10 @@ target_sources(uking PRIVATE
   actionHideShootArrow.h
   actionHingeMagneFixedRigid.cpp
   actionHingeMagneFixedRigid.h
-  actionHoldArrowBackWalk.cpp
-  actionHoldArrowBackWalk.h
   actionHoldArrow.cpp
   actionHoldArrow.h
+  actionHoldArrowBackWalk.cpp
+  actionHoldArrowBackWalk.h
   actionHoldArrowTurn.cpp
   actionHoldArrowTurn.h
   actionHoldArrowWalk.cpp
@@ -1669,10 +1673,10 @@ target_sources(uking PRIVATE
   actionHorseEatCarriedItem.h
   actionHorseElectricParalysis.cpp
   actionHorseElectricParalysis.h
-  actionHorseFollowBase.cpp
-  actionHorseFollowBase.h
   actionHorseFollow.cpp
   actionHorseFollow.h
+  actionHorseFollowBase.cpp
+  actionHorseFollowBase.h
   actionHorseFreeze.cpp
   actionHorseFreeze.h
   actionHorseMoveToSafePos.cpp
@@ -1703,8 +1707,6 @@ target_sources(uking PRIVATE
   actionHorseRideLookWait.h
   actionHorseRideLoopAttack.cpp
   actionHorseRideLoopAttack.h
-  actionHorseRideSetGearCommand.cpp
-  actionHorseRideSetGearCommand.h
   actionHorseRideMoveToCommand.cpp
   actionHorseRideMoveToCommand.h
   actionHorseRideOneTimeASPlay.cpp
@@ -1715,6 +1717,8 @@ target_sources(uking PRIVATE
   actionHorseRideOneTimeViewASPlay.h
   actionHorseRideSearch.cpp
   actionHorseRideSearch.h
+  actionHorseRideSetGearCommand.cpp
+  actionHorseRideSetGearCommand.h
   actionHorseRideShoot.cpp
   actionHorseRideShoot.h
   actionHorseRideStopCommand.cpp
@@ -1735,10 +1739,10 @@ target_sources(uking PRIVATE
   actionHorseWaitAndLookAtNPC.h
   actionHorseWaitEx.cpp
   actionHorseWaitEx.h
-  actionHoverBase.cpp
-  actionHoverBase.h
   actionHover.cpp
   actionHover.h
+  actionHoverBase.cpp
+  actionHoverBase.h
   actionHoverNoticeTurn.cpp
   actionHoverNoticeTurn.h
   actionHoverPredictVacuumShoot.cpp
@@ -1766,9 +1770,9 @@ target_sources(uking PRIVATE
   actionIgniteThreeActorAttack.cpp
   actionIgniteThreeActorAttack.h
   actionIgniteToTarget.cpp
+  actionIgniteToTarget.h
   actionIgniteToTargetDir.cpp
   actionIgniteToTargetDir.h
-  actionIgniteToTarget.h
   actionIgniteToTargetSimple.cpp
   actionIgniteToTargetSimple.h
   actionImmediateStopOwnedHorse.cpp
@@ -1814,9 +1818,9 @@ target_sources(uking PRIVATE
   actionJumpTo.cpp
   actionJumpTo.h
   actionJumpToTarget.cpp
+  actionJumpToTarget.h
   actionJumpToTargetFromWater.cpp
   actionJumpToTargetFromWater.h
-  actionJumpToTarget.h
   actionKeepPosInWater.cpp
   actionKeepPosInWater.h
   actionKeepStandingPosture.cpp
@@ -1851,14 +1855,16 @@ target_sources(uking PRIVATE
   actionLandOnCeil.h
   actionLandRagdoll.cpp
   actionLandRagdoll.h
-  actionLandTeleportConsiderCameraDir.cpp
-  actionLandTeleportConsiderCameraDir.h
   actionLandTeleport.cpp
   actionLandTeleport.h
+  actionLandTeleportConsiderCameraDir.cpp
+  actionLandTeleportConsiderCameraDir.h
   actionLargeAttack.cpp
   actionLargeAttack.h
   actionLargeDamage.cpp
   actionLargeDamage.h
+  actionLastBossBlowOff.cpp
+  actionLastBossBlowOff.h
   actionLastBossChemicalPillarAttack.cpp
   actionLastBossChemicalPillarAttack.h
   actionLastBossDemoWarp.cpp
@@ -1888,15 +1894,15 @@ target_sources(uking PRIVATE
   actionLastBossThunderSign.cpp
   actionLastBossThunderSign.h
   actionLevelFlyLook.cpp
+  actionLevelFlyLook.h
   actionLevelFlyLookDownToTgtHeight.cpp
   actionLevelFlyLookDownToTgtHeight.h
-  actionLevelFlyLook.h
   actionLevelFlyLookRisingToTgtHeight.cpp
   actionLevelFlyLookRisingToTgtHeight.h
-  actionLevelFlyMoveBase.cpp
-  actionLevelFlyMoveBase.h
   actionLevelFlyMove.cpp
   actionLevelFlyMove.h
+  actionLevelFlyMoveBase.cpp
+  actionLevelFlyMoveBase.h
   actionLevelFlyRise.cpp
   actionLevelFlyRise.h
   actionLevelFlyRiseLookingTarget.cpp
@@ -1905,10 +1911,10 @@ target_sources(uking PRIVATE
   actionLiftTurn.h
   actionLiftWalk.cpp
   actionLiftWalk.h
-  actionLinearFlyAttackBase.cpp
-  actionLinearFlyAttackBase.h
   actionLinearFlyAttack.cpp
   actionLinearFlyAttack.h
+  actionLinearFlyAttackBase.cpp
+  actionLinearFlyAttackBase.h
   actionLoadSaveDataFromGameOver.cpp
   actionLoadSaveDataFromGameOver.h
   actionLookAtObject.cpp
@@ -1944,13 +1950,13 @@ target_sources(uking PRIVATE
   actionMamonoShopStand.cpp
   actionMamonoShopStand.h
   actionMarkPosition.cpp
+  actionMarkPosition.h
   actionMarkPositionFromGameData.cpp
   actionMarkPositionFromGameData.h
-  actionMarkPosition.h
   actionMimic.cpp
+  actionMimic.h
   actionMimicFreeze.cpp
   actionMimicFreeze.h
-  actionMimic.h
   actionMoonMove.cpp
   actionMoonMove.h
   actionMotorcycleAppear.cpp
@@ -1960,21 +1966,21 @@ target_sources(uking PRIVATE
   actionMotorcycleRiddenByPlayer.cpp
   actionMotorcycleRiddenByPlayer.h
   actionMotorcycleWait.cpp
+  actionMotorcycleWait.h
   actionMotorcycleWaitForEvent.cpp
   actionMotorcycleWaitForEvent.h
-  actionMotorcycleWait.h
   actionMotorcycleWaitUntilFellOver.cpp
   actionMotorcycleWaitUntilFellOver.h
   actionMove2HomePos.cpp
   actionMove2HomePos.h
   actionMoveBase.cpp
   actionMoveBase.h
+  actionMoveByAnimeDriven.cpp
+  actionMoveByAnimeDriven.h
   actionMoveByAnimeDrivenCheckNavMesh.cpp
   actionMoveByAnimeDrivenCheckNavMesh.h
-  actionMoveByAnimeDriven.cpp
   actionMoveByAnimeDrivenDynAS.cpp
   actionMoveByAnimeDrivenDynAS.h
-  actionMoveByAnimeDriven.h
   actionMoveByAnimeDrivenToTarget.cpp
   actionMoveByAnimeDrivenToTarget.h
   actionMoveHomePosBase.cpp
@@ -1985,14 +1991,14 @@ target_sources(uking PRIVATE
   actionMoveMainRidigBody.h
   actionMoveToHomeMtx.cpp
   actionMoveToHomeMtx.h
+  actionMoveToTarget.cpp
+  actionMoveToTarget.h
   actionMoveToTargetBase.cpp
   actionMoveToTargetBase.h
-  actionMoveToTarget.cpp
   actionMoveToTargetCurve.cpp
   actionMoveToTargetCurve.h
   actionMoveToTargetDir.cpp
   actionMoveToTargetDir.h
-  actionMoveToTarget.h
   actionMoveWithAS.cpp
   actionMoveWithAS.h
   actionMoveWithDynAS.cpp
@@ -2126,9 +2132,9 @@ target_sources(uking PRIVATE
   actionNPCNameHorse.cpp
   actionNPCNameHorse.h
   actionNPCPurchase.cpp
+  actionNPCPurchase.h
   actionNPCPurchaseEnemyMaterial.cpp
   actionNPCPurchaseEnemyMaterial.h
-  actionNPCPurchase.h
   actionNPCPurchaseMaterial.cpp
   actionNPCPurchaseMaterial.h
   actionNPCReceiveHorse.cpp
@@ -2141,12 +2147,12 @@ target_sources(uking PRIVATE
   actionNPCReleaseHorse.h
   actionNpcRideWaitAction.cpp
   actionNpcRideWaitAction.h
+  actionNPCSale.cpp
+  actionNPCSale.h
   actionNPCSaleAppReception.cpp
   actionNPCSaleAppReception.h
   actionNPCSaleCollectedItem.cpp
   actionNPCSaleCollectedItem.h
-  actionNPCSale.cpp
-  actionNPCSale.h
   actionNPCSalePictureReception.cpp
   actionNPCSalePictureReception.h
   actionNPCSaleReception.cpp
@@ -2166,9 +2172,9 @@ target_sources(uking PRIVATE
   actionNPCTalk.cpp
   actionNPCTalk.h
   actionNPCTargetMove.cpp
+  actionNPCTargetMove.h
   actionNPCTargetMoveDynAs.cpp
   actionNPCTargetMoveDynAs.h
-  actionNPCTargetMove.h
   actionNPCTebaApproachPlayer.cpp
   actionNPCTebaApproachPlayer.h
   actionNpcTebaFly.cpp
@@ -2176,19 +2182,19 @@ target_sources(uking PRIVATE
   actionNPCTravelerRest.cpp
   actionNPCTravelerRest.h
   actionNPCTurnToObject.cpp
+  actionNPCTurnToObject.h
   actionNPCTurnToObjectGreeting.cpp
   actionNPCTurnToObjectGreeting.h
-  actionNPCTurnToObject.h
   actionNPCTurnToPosition.cpp
   actionNPCTurnToPosition.h
   actionNPCWait.cpp
+  actionNPCWait.h
   actionNPCWaitDynAS.cpp
   actionNPCWaitDynAS.h
   actionNPCWaitDynFrame.cpp
   actionNPCWaitDynFrame.h
   actionNPCWaitFrame.cpp
   actionNPCWaitFrame.h
-  actionNPCWait.h
   actionNPCWaitOneTimeAction.cpp
   actionNPCWaitOneTimeAction.h
   actionNullASPlay.cpp
@@ -2197,8 +2203,6 @@ target_sources(uking PRIVATE
   actionObjBoardWoodTriangle01.h
   actionObservationPointAction.cpp
   actionObservationPointAction.h
-  actionBalloonRopeBase.cpp
-  actionBalloonRopeBase.h
   actionOctarockBalloon.cpp
   actionOctarockBalloon.h
   actionOctarockBulletLExplode.cpp
@@ -2211,21 +2215,22 @@ target_sources(uking PRIVATE
   actionOffMiss.h
   actionOkAutoPlacementEnemyDeadlyQuest.cpp
   actionOkAutoPlacementEnemyDeadlyQuest.h
+  actionOn.cpp
+  actionOn.h
   actionOnCliffTurn.cpp
   actionOnCliffTurn.h
   actionOnCliffWait.cpp
   actionOnCliffWait.h
   actionOnCorrect.cpp
   actionOnCorrect.h
-  actionOn.cpp
   actionOneHandActionWithLegTurn.cpp
   actionOneHandActionWithLegTurn.h
   actionOnEnterSwapActorBase.cpp
   actionOnEnterSwapActorBase.h
-  actionOnEnterSwapDropTableActor.cpp
-  actionOnEnterSwapDropTableActor.h
   actionOnEnterSwapDropTable.cpp
   actionOnEnterSwapDropTable.h
+  actionOnEnterSwapDropTableActor.cpp
+  actionOnEnterSwapDropTableActor.h
   actionOnetimeChangeableASPlay.cpp
   actionOnetimeChangeableASPlay.h
   actionOnetimeHoverASPlay.cpp
@@ -2233,14 +2238,13 @@ target_sources(uking PRIVATE
   actionOnetimeMoveASPlay.cpp
   actionOnetimeMoveASPlay.h
   actionOnetimeStopASPlay.cpp
+  actionOnetimeStopASPlay.h
   actionOneTimeStopASPlayerNoEnd.cpp
   actionOneTimeStopASPlayerNoEnd.h
-  actionOnetimeStopASPlay.h
   actionOnetimeStopASSyncPlay.cpp
   actionOnetimeStopASSyncPlay.h
   actionOneTimeWaterFloatStopASPlay.cpp
   actionOneTimeWaterFloatStopASPlay.h
-  actionOn.h
   actionOnLeaveAttackInterval.cpp
   actionOnLeaveAttackInterval.h
   actionOnMUAssignSaveForUsed.cpp
@@ -2260,9 +2264,9 @@ target_sources(uking PRIVATE
   actionOpenEnduranceFloorNumber.cpp
   actionOpenEnduranceFloorNumber.h
   actionOpenGetDemoDialog.cpp
+  actionOpenGetDemoDialog.h
   actionOpenGetDemoDialogDressFairy.cpp
   actionOpenGetDemoDialogDressFairy.h
-  actionOpenGetDemoDialog.h
   actionOpenItemCategory.cpp
   actionOpenItemCategory.h
   actionOpenItemDownloadDemo.cpp
@@ -2271,10 +2275,10 @@ target_sources(uking PRIVATE
   actionOpenItemMenu.h
   actionOpenMap.cpp
   actionOpenMap.h
-  actionOpenMessageDialogBase.cpp
-  actionOpenMessageDialogBase.h
   actionOpenMessageDialog.cpp
   actionOpenMessageDialog.h
+  actionOpenMessageDialogBase.cpp
+  actionOpenMessageDialogBase.h
   actionOpenMessageDialogTrig.cpp
   actionOpenMessageDialogTrig.h
   actionOpenMessageDialogWithSkelAnm.cpp
@@ -2341,10 +2345,12 @@ target_sources(uking PRIVATE
   actionPriestBossBeamMove.h
   actionPriestBossBlownOff.cpp
   actionPriestBossBlownOff.h
+  actionPriestBossCloneFastWarp.cpp
+  actionPriestBossCloneFastWarp.h
   actionPriestBossClonesSpawn.cpp
+  actionPriestBossClonesSpawn.h
   actionPriestBossClonesSpawnForDemo.cpp
   actionPriestBossClonesSpawnForDemo.h
-  actionPriestBossClonesSpawn.h
   actionPriestBossFastWarpMove.cpp
   actionPriestBossFastWarpMove.h
   actionPriestBossMove.cpp
@@ -2355,8 +2361,6 @@ target_sources(uking PRIVATE
   actionPriestBossSideMove.h
   actionPriestBossSlowWarpMove.cpp
   actionPriestBossSlowWarpMove.h
-  actionPriestBossCloneFastWarp.cpp
-  actionPriestBossCloneFastWarp.h
   actionPuddle.cpp
   actionPuddle.h
   actionPulleyChainASControl.cpp
@@ -2368,9 +2372,9 @@ target_sources(uking PRIVATE
   actionPutFromParent.cpp
   actionPutFromParent.h
   actionRagdoll.cpp
+  actionRagdoll.h
   actionRagdollFreeze.cpp
   actionRagdollFreeze.h
-  actionRagdoll.h
   actionRailMove.cpp
   actionRailMove.h
   actionRandomJump.cpp
@@ -2440,9 +2444,9 @@ target_sources(uking PRIVATE
   actionRequestCreateHCIModel.cpp
   actionRequestCreateHCIModel.h
   actionRequestEvent.cpp
+  actionRequestEvent.h
   actionRequestEventFromMapUnit.cpp
   actionRequestEventFromMapUnit.h
-  actionRequestEvent.h
   actionRequestOpenPopUpHelp.cpp
   actionRequestOpenPopUpHelp.h
   actionReserveParashawlStart.cpp
@@ -2472,17 +2476,15 @@ target_sources(uking PRIVATE
   actionRisingAirOneTime.cpp
   actionRisingAirOneTime.h
   actionRodMagicPhysBall.cpp
+  actionRodMagicPhysBall.h
   actionRodMagicPhysBallDivision.cpp
   actionRodMagicPhysBallDivision.h
-  actionRodMagicPhysBall.h
   actionRopeNormal.cpp
   actionRopeNormal.h
   actionRotate.cpp
+  actionRotate.h
   actionRotatedWait.cpp
   actionRotatedWait.h
-  actionRotate.h
-  actionASPlayRotateTurnToTarget.cpp
-  actionASPlayRotateTurnToTarget.h
   actionRun.cpp
   actionRun.h
   actionSandwichDetectionAreaTag.cpp
@@ -2509,12 +2511,12 @@ target_sources(uking PRIVATE
   actionSearch.h
   actionSellPictureBookUIDemo.cpp
   actionSellPictureBookUIDemo.h
+  actionSendMessage.cpp
+  actionSendMessage.h
   actionSendMessage4YunBoCannon.cpp
   actionSendMessage4YunBoCannon.h
   actionSendMessageBroadCast.cpp
   actionSendMessageBroadCast.h
-  actionSendMessage.cpp
-  actionSendMessage.h
   actionSendNoticeMessageBase.cpp
   actionSendNoticeMessageBase.h
   actionSendPlayerNoticeMessage.cpp
@@ -2557,14 +2559,14 @@ target_sources(uking PRIVATE
   actionSetExtraEnergyOfPlayer.h
   actionSetExtraLifeOfPlayer.cpp
   actionSetExtraLifeOfPlayer.h
-  actionSetFrameASPlay.cpp
-  actionSetFrameASPlay.h
   actionSetFlag.cpp
   actionSetFlag.h
-  actionSetGetFlagByActorName.cpp
-  actionSetGetFlagByActorName.h
+  actionSetFrameASPlay.cpp
+  actionSetFrameASPlay.h
   actionSetGetFlag.cpp
   actionSetGetFlag.h
+  actionSetGetFlagByActorName.cpp
+  actionSetGetFlagByActorName.h
   actionSetGravityFactor.cpp
   actionSetGravityFactor.h
   actionSetHorseFamiliarityPassedFlag.cpp
@@ -2595,10 +2597,10 @@ target_sources(uking PRIVATE
   actionSetTargetFrameMtx.h
   actionSetTgIgnoreObstacle.cpp
   actionSetTgIgnoreObstacle.h
-  actionSetTreasureBoxOpenAndClose.cpp
-  actionSetTreasureBoxOpenAndClose.h
   actionSetTreasure.cpp
   actionSetTreasure.h
+  actionSetTreasureBoxOpenAndClose.cpp
+  actionSetTreasureBoxOpenAndClose.h
   actionSetupGetDemoModeNumUi.cpp
   actionSetupGetDemoModeNumUi.h
   actionSetWanderPathIndex.cpp
@@ -2610,9 +2612,9 @@ target_sources(uking PRIVATE
   actionShiekSensorPlusDownloadDemo.cpp
   actionShiekSensorPlusDownloadDemo.h
   actionShock.cpp
+  actionShock.h
   actionShockDynamicWeapon.cpp
   actionShockDynamicWeapon.h
-  actionShock.h
   actionShockWave.cpp
   actionShockWave.h
   actionShootArrow.cpp
@@ -2649,20 +2651,16 @@ target_sources(uking PRIVATE
   actionSimpleGrabBase.h
   actionSimpleGrabWithAS.cpp
   actionSimpleGrabWithAS.h
+  actionSimpleKnockBackShock.cpp
+  actionSimpleKnockBackShock.h
   actionSimpleLineBeam.cpp
   actionSimpleLineBeam.h
-  actionForkBasicMessageDialogCtrl.cpp
-  actionForkBasicMessageDialogCtrl.h
   actionSimpleOpenMessageDialogAction.cpp
   actionSimpleOpenMessageDialogAction.h
   actionSimpleUniqueTalk.cpp
   actionSimpleUniqueTalk.h
   actionSiteBossAvoid.cpp
   actionSiteBossAvoid.h
-  actionLastBossBlowOff.cpp
-  actionLastBossBlowOff.h
-  actionSimpleKnockBackShock.cpp
-  actionSimpleKnockBackShock.h
   actionSiteBossBowBlowOff.cpp
   actionSiteBossBowBlowOff.h
   actionSiteBossBowChildDeviceBreak.cpp
@@ -2683,10 +2681,10 @@ target_sources(uking PRIVATE
   actionSiteBossFlyWaitTurnToTarget.h
   actionSiteBossGetUpLinear.cpp
   actionSiteBossGetUpLinear.h
-  actionSiteBossLswordAttack.cpp
-  actionSiteBossLswordAttack.h
   actionSiteBossLswordAtkWithChemical.cpp
   actionSiteBossLswordAtkWithChemical.h
+  actionSiteBossLswordAttack.cpp
+  actionSiteBossLswordAttack.h
   actionSiteBossLswordFireBall.cpp
   actionSiteBossLswordFireBall.h
   actionSiteBossLswordFirstCreateFBall.cpp
@@ -2703,10 +2701,10 @@ target_sources(uking PRIVATE
   actionSiteBossLswordTornadoEnd.h
   actionSiteBossLswordWhirlSlash.cpp
   actionSiteBossLswordWhirlSlash.h
-  actionSiteBossMoveAndAttack.cpp
-  actionSiteBossMoveAndAttack.h
   actionSiteBossMove.cpp
   actionSiteBossMove.h
+  actionSiteBossMoveAndAttack.cpp
+  actionSiteBossMoveAndAttack.h
   actionSiteBossShieldBashAttack.cpp
   actionSiteBossShieldBashAttack.h
   actionSiteBossShootArrowRain.cpp
@@ -2735,10 +2733,10 @@ target_sources(uking PRIVATE
   actionSiteBossSwordChemicalPlus.h
   actionSiteBossSwordCreateIronPile.cpp
   actionSiteBossSwordCreateIronPile.h
-  actionSiteBossSwordGuardBreak.cpp
-  actionSiteBossSwordGuardBreak.h
   actionSiteBossSwordGuard.cpp
   actionSiteBossSwordGuard.h
+  actionSiteBossSwordGuardBreak.cpp
+  actionSiteBossSwordGuardBreak.h
   actionSiteBossSwordMove.cpp
   actionSiteBossSwordMove.h
   actionSiteBossSwordShieldRepair.cpp
@@ -2747,20 +2745,20 @@ target_sources(uking PRIVATE
   actionSiteBossSwordSlowMove.h
   actionSiteBossSwordThrowElectricBall.cpp
   actionSiteBossSwordThrowElectricBall.h
-  actionSiteBossSwordWhirlSlashCharge.cpp
-  actionSiteBossSwordWhirlSlashCharge.h
   actionSiteBossSwordWhirlSlash.cpp
   actionSiteBossSwordWhirlSlash.h
+  actionSiteBossSwordWhirlSlashCharge.cpp
+  actionSiteBossSwordWhirlSlashCharge.h
   actionSiteBossThrowParts.cpp
   actionSiteBossThrowParts.h
   actionSleep.cpp
   actionSleep.h
   actionSlideMoveViewTarget.cpp
   actionSlideMoveViewTarget.h
-  actionSlippedBackWalkBase.cpp
-  actionSlippedBackWalkBase.h
   actionSlippedBackWalk.cpp
   actionSlippedBackWalk.h
+  actionSlippedBackWalkBase.cpp
+  actionSlippedBackWalkBase.h
   actionSlippedCircleMoveBase.cpp
   actionSlippedCircleMoveBase.h
   actionSlippedCircleWalk.cpp
@@ -2769,24 +2767,24 @@ target_sources(uking PRIVATE
   actionSlippedMoveBase.h
   actionSlippedWalk.cpp
   actionSlippedWalk.h
-  actionSmallDamageBackwardBase.cpp
-  actionSmallDamageBackwardBase.h
+  actionSmallDamage.cpp
+  actionSmallDamage.h
   actionSmallDamageBackward.cpp
   actionSmallDamageBackward.h
+  actionSmallDamageBackwardBase.cpp
+  actionSmallDamageBackwardBase.h
   actionSmallDamageBase.cpp
   actionSmallDamageBase.h
-  actionSmallDamage.cpp
   actionSmallDamageDirectPreTargetBack.cpp
   actionSmallDamageDirectPreTargetBack.h
   actionSmallDamageDirectPreTargetBone.cpp
   actionSmallDamageDirectPreTargetBone.h
-  actionSmallDamage.h
   actionSoundOcclusionTagRemainsWater.cpp
   actionSoundOcclusionTagRemainsWater.h
   actionSoundTrigger.cpp
+  actionSoundTrigger.h
   actionSoundTriggerFadeAction.cpp
   actionSoundTriggerFadeAction.h
-  actionSoundTrigger.h
   actionSpinFlyAttack.cpp
   actionSpinFlyAttack.h
   actionSpreadToEnemy.cpp
@@ -2839,6 +2837,8 @@ target_sources(uking PRIVATE
   actionStopForLimitedTime.h
   actionStopJump.cpp
   actionStopJump.h
+  actionStopOnObj.cpp
+  actionStopOnObj.h
   actionStoppingAttackBase.cpp
   actionStoppingAttackBase.h
   actionStorePlayerPosAndRotate.cpp
@@ -2859,10 +2859,10 @@ target_sources(uking PRIVATE
   actionSwarmAreaDamaged.h
   actionSwarmChemicalDamaged.cpp
   actionSwarmChemicalDamaged.h
-  actionSwarmDamagedBase.cpp
-  actionSwarmDamagedBase.h
   actionSwarmDamaged.cpp
   actionSwarmDamaged.h
+  actionSwarmDamagedBase.cpp
+  actionSwarmDamagedBase.h
   actionSwarmFlyAttack.cpp
   actionSwarmFlyAttack.h
   actionSwarmFlyMove.cpp
@@ -2874,21 +2874,21 @@ target_sources(uking PRIVATE
   actionSweepCollision.cpp
   actionSweepCollision.h
   actionSwimEnemyAnmBackBlownOff.cpp
+  actionSwimEnemyAnmBackBlownOff.h
   actionSwimEnemyAnmBackBlownOffFromPL.cpp
   actionSwimEnemyAnmBackBlownOffFromPL.h
-  actionSwimEnemyAnmBackBlownOff.h
   actionSwimEnemyAnmBackBlownOffToPL.cpp
   actionSwimEnemyAnmBackBlownOffToPL.h
   actionSwimEnemyBlownOffBase.cpp
   actionSwimEnemyBlownOffBase.h
   actionSwimGetUp.cpp
   actionSwimGetUp.h
+  actionSwimMove.cpp
+  actionSwimMove.h
   actionSwimMoveASHoldEvent.cpp
   actionSwimMoveASHoldEvent.h
   actionSwimMoveBase.cpp
   actionSwimMoveBase.h
-  actionSwimMove.cpp
-  actionSwimMove.h
   actionSwimMoveOneTimeAS.cpp
   actionSwimMoveOneTimeAS.h
   actionSwimNoticeTurn.cpp
@@ -2897,10 +2897,10 @@ target_sources(uking PRIVATE
   actionSwimRotateBase.h
   actionSwimSmallDamage.cpp
   actionSwimSmallDamage.h
-  actionSwimTurnBase.cpp
-  actionSwimTurnBase.h
   actionSwimTurn.cpp
   actionSwimTurn.h
+  actionSwimTurnBase.cpp
+  actionSwimTurnBase.h
   actionSwitchElectricOff.cpp
   actionSwitchElectricOff.h
   actionSwitchElectricOn.cpp
@@ -2917,14 +2917,16 @@ target_sources(uking PRIVATE
   actionSystemDelete.h
   actionSystemFadeOutSleep.cpp
   actionSystemFadeOutSleep.h
-  actionSystemHideChase.cpp
-  actionSystemHideChase.h
   actionSystemHide.cpp
   actionSystemHide.h
+  actionSystemHideChase.cpp
+  actionSystemHideChase.h
   actionSystemSleep.cpp
   actionSystemSleep.h
   actionSystemWarp.cpp
   actionSystemWarp.h
+  actionTackleAttack.cpp
+  actionTackleAttack.h
   actionTackleMove.cpp
   actionTackleMove.h
   actionTakeoffFromCeilLook.cpp
@@ -2932,9 +2934,9 @@ target_sources(uking PRIVATE
   actionTakeoffFromCeilLookTarget.cpp
   actionTakeoffFromCeilLookTarget.h
   actionTargetCircle.cpp
+  actionTargetCircle.h
   actionTargetCircleGuardWalk.cpp
   actionTargetCircleGuardWalk.h
-  actionTargetCircle.h
   actionTargetCircleMoveKeepDist.cpp
   actionTargetCircleMoveKeepDist.h
   actionTargetCircleSwim.cpp
@@ -2943,12 +2945,12 @@ target_sources(uking PRIVATE
   actionTargetCircleWalk.h
   actionTeachPlayerInAreaForRefActor.cpp
   actionTeachPlayerInAreaForRefActor.h
+  actionTeleport.cpp
+  actionTeleport.h
   actionTeleportBase.cpp
   actionTeleportBase.h
-  actionTeleport.cpp
   actionTeleportForceApperPosition.cpp
   actionTeleportForceApperPosition.h
-  actionTeleport.h
   actionTeleportTargetFrontInAir.cpp
   actionTeleportTargetFrontInAir.h
   actionTerrainCalcCenter.cpp
@@ -2961,20 +2963,20 @@ target_sources(uking PRIVATE
   actionThrow.h
   actionThrowLeft.cpp
   actionThrowLeft.h
+  actionThrown.cpp
+  actionThrown.h
   actionThrownAndBreak.cpp
   actionThrownAndBreak.h
-  actionThrown.cpp
   actionThrownDown.cpp
   actionThrownDown.h
-  actionThrown.h
   actionThrownSpear.cpp
   actionThrownSpear.h
   actionThrowRight.cpp
   actionThrowRight.h
-  actionThrowWeaponByBodyCenter.cpp
-  actionThrowWeaponByBodyCenter.h
   actionThrowWeapon.cpp
   actionThrowWeapon.h
+  actionThrowWeaponByBodyCenter.cpp
+  actionThrowWeaponByBodyCenter.h
   actionThrowWeaponRight.cpp
   actionThrowWeaponRight.h
   actionTimeredASPlay.cpp
@@ -3001,6 +3003,8 @@ target_sources(uking PRIVATE
   actionTriggerAllPartsSleep.h
   actionTumble.cpp
   actionTumble.h
+  actionTurn.cpp
+  actionTurn.h
   actionTurnAndChargeAndShoot.cpp
   actionTurnAndChargeAndShoot.h
   actionTurnAndLookAtToObjectNow.cpp
@@ -3013,16 +3017,14 @@ target_sources(uking PRIVATE
   actionTurnAndLookToObjNotAnimDriven.h
   actionTurnBase.cpp
   actionTurnBase.h
-  actionTurn.cpp
-  actionTurn.h
   actionTurnGiantAttack.cpp
   actionTurnGiantAttack.h
   actionTurnIgnite.cpp
   actionTurnIgnite.h
-  actionTurnToActorBase.cpp
-  actionTurnToActorBase.h
   actionTurnToActor.cpp
   actionTurnToActor.h
+  actionTurnToActorBase.cpp
+  actionTurnToActorBase.h
   actionTurnToEmptySpace.cpp
   actionTurnToEmptySpace.h
   actionTurnWithAS.cpp
@@ -3043,11 +3045,12 @@ target_sources(uking PRIVATE
   actionVanish.h
   actionViewLevelFlyMove.cpp
   actionViewLevelFlyMove.h
+  actionWait.cpp
+  actionWait.h
   actionWaitBase.cpp
   actionWaitBase.h
   actionWaitCloseItemDownloadDemo.cpp
   actionWaitCloseItemDownloadDemo.h
-  actionWait.cpp
   actionWaitForASTriggerEvent.cpp
   actionWaitForASTriggerEvent.h
   actionWaitForCloseFade.cpp
@@ -3058,15 +3061,12 @@ target_sources(uking PRIVATE
   actionWaitForKeyInput.h
   actionWaitForStaminaUpDemoEnd.cpp
   actionWaitForStaminaUpDemoEnd.h
-  actionWait.h
   actionWaitHeartDemo.cpp
   actionWaitHeartDemo.h
   actionWaitMagneGear.cpp
   actionWaitMagneGear.h
   actionWaitMessageDialogEnd.cpp
   actionWaitMessageDialogEnd.h
-  actionStopOnObj.cpp
-  actionStopOnObj.h
   actionWaitOnObj.cpp
   actionWaitOnObj.h
   actionWaitTimer.cpp
@@ -3094,9 +3094,9 @@ target_sources(uking PRIVATE
   actionWarpPlayerToActor.cpp
   actionWarpPlayerToActor.h
   actionWarpPlayerToAnchor.cpp
+  actionWarpPlayerToAnchor.h
   actionWarpPlayerToAnchorGimmickReset.cpp
   actionWarpPlayerToAnchorGimmickReset.h
-  actionWarpPlayerToAnchor.h
   actionWarpPlayerToDestination.cpp
   actionWarpPlayerToDestination.h
   actionWarpPlayerToReferenceAnchor.cpp
@@ -3117,6 +3117,8 @@ target_sources(uking PRIVATE
   actionWarpToScheduleAnchor.h
   actionWarpToStaticAnchor.cpp
   actionWarpToStaticAnchor.h
+  actionWaterDepthMoveBase.cpp
+  actionWaterDepthMoveBase.h
   actionWaterEmitter.cpp
   actionWaterEmitter.h
   actionWaterExplode.cpp
@@ -3132,9 +3134,9 @@ target_sources(uking PRIVATE
   actionWaterFloatImmobile.cpp
   actionWaterFloatImmobile.h
   actionWaterFloatWait.cpp
+  actionWaterFloatWait.h
   actionWaterFloatWaitEx.cpp
   actionWaterFloatWaitEx.h
-  actionWaterFloatWait.h
   actionWaterSurfaceModelOnly.cpp
   actionWaterSurfaceModelOnly.h
   actionWaterSurfaceMove.cpp
@@ -3143,8 +3145,6 @@ target_sources(uking PRIVATE
   actionWaterUpDownAnmDrivenMove.h
   actionWaterUpDownDrivenPreAttack.cpp
   actionWaterUpDownDrivenPreAttack.h
-  actionWaterDepthMoveBase.cpp
-  actionWaterDepthMoveBase.h
   actionWaterUpDownMove.cpp
   actionWaterUpDownMove.h
   actionWeaponDrawn.cpp
diff --git a/src/Game/Actor/Camera/Action/CMakeLists.txt b/src/Game/Actor/Camera/Action/CMakeLists.txt
index a09c8a2d..730723ac 100644
--- a/src/Game/Actor/Camera/Action/CMakeLists.txt
+++ b/src/Game/Actor/Camera/Action/CMakeLists.txt
@@ -93,8 +93,6 @@ target_sources(uking PRIVATE
   actionCameraLockOn.h
   actionCameraLockOnAimingAt.cpp
   actionCameraLockOnAimingAt.h
-  actionCameraTrackBase.cpp
-  actionCameraTrackBase.h
   actionCameraMagneCatch.cpp
   actionCameraMagneCatch.h
   actionCameraMotorcycle.cpp
@@ -107,6 +105,8 @@ target_sources(uking PRIVATE
   actionCameraShieldSurfing.h
   actionCameraTail.cpp
   actionCameraTail.h
+  actionCameraTrackBase.cpp
+  actionCameraTrackBase.h
   actionCameraWakeboard.cpp
   actionCameraWakeboard.h
   actionCameraWaterfallClimb.cpp
diff --git a/src/Game/Actor/Player/Action/CMakeLists.txt b/src/Game/Actor/Player/Action/CMakeLists.txt
index 21d13add..1b2f8f6f 100644
--- a/src/Game/Actor/Player/Action/CMakeLists.txt
+++ b/src/Game/Actor/Player/Action/CMakeLists.txt
@@ -101,8 +101,6 @@ target_sources(uking PRIVATE
   actionPlayerForkDropWeaponWithSpeed.h
   actionPlayerFrontRoll.cpp
   actionPlayerFrontRoll.h
-  actionPlayerParashawlGlideBase.cpp
-  actionPlayerParashawlGlideBase.h
   actionPlayerGrabPut.cpp
   actionPlayerGrabPut.h
   actionPlayerGrabReady.cpp
@@ -199,6 +197,8 @@ target_sources(uking PRIVATE
   actionPlayerNavMeshMove.h
   actionPlayerParashawlGlide.cpp
   actionPlayerParashawlGlide.h
+  actionPlayerParashawlGlideBase.cpp
+  actionPlayerParashawlGlideBase.h
   actionPlayerPickUp.cpp
   actionPlayerPickUp.h
   actionPlayerPlayASAdapt.cpp
diff --git a/src/Game/Actor/Query/CMakeLists.txt b/src/Game/Actor/Query/CMakeLists.txt
index cffcfa98..5ab1d922 100644
--- a/src/Game/Actor/Query/CMakeLists.txt
+++ b/src/Game/Actor/Query/CMakeLists.txt
@@ -9,12 +9,12 @@ target_sources(uking PRIVATE
   queryCanMarkMapPin.h
   queryCheck100EnemyActiveTiming.cpp
   queryCheck100EnemyActiveTiming.h
+  queryCheckActorAction.cpp
+  queryCheckActorAction.h
   queryCheckActorAction13.cpp
   queryCheckActorAction13.h
   queryCheckActorAction14_2.cpp
   queryCheckActorAction14_2.h
-  queryCheckActorAction.cpp
-  queryCheckActorAction.h
   queryCheckAddPorchItem.cpp
   queryCheckAddPorchItem.h
   queryCheckAppPoint.cpp
@@ -99,10 +99,10 @@ target_sources(uking PRIVATE
   queryCheckItemShopDecide.h
   queryCheckItemShopPorchVacancy.cpp
   queryCheckItemShopPorchVacancy.h
-  queryCheckItemShopSelectBuy.cpp
-  queryCheckItemShopSelectBuy.h
   queryCheckItemShopSelect.cpp
   queryCheckItemShopSelect.h
+  queryCheckItemShopSelectBuy.cpp
+  queryCheckItemShopSelectBuy.h
   queryCheckLastDamageAttacker.cpp
   queryCheckLastDamageAttacker.h
   queryCheckManufactResult.cpp
@@ -235,10 +235,10 @@ target_sources(uking PRIVATE
   queryHasItemDyeSpecifiedColor.h
   queryHasPorchArrow.cpp
   queryHasPorchArrow.h
-  queryHasPorchItemByCategory.cpp
-  queryHasPorchItemByCategory.h
   queryHasPorchItem.cpp
   queryHasPorchItem.h
+  queryHasPorchItemByCategory.cpp
+  queryHasPorchItemByCategory.h
   queryHasPouchItemByPouchCategory.cpp
   queryHasPouchItemByPouchCategory.h
   queryHasSetItem.cpp