Merge pull request #216 from leoetlino/stack/03a-ai-base-renames

AI: rename misordered base classes

data/aidef_action_params.yml

@@ -48,7 +48,7 @@ AdvanceTime:
 - {type: dynamic_param, param_type: int*, param_name: DirectTime, param_offset: 0x28}
 - {type: dynamic_param, param_type: int*, param_name: PassTime, param_offset: 0x30}
 - {type: dynamic_param, param_type: bool*, param_name: ActReset, param_offset: 0x38}
-AirOctaFloatBase:
+AirOctaMoveBase:
 - {type: static_param, param_type: const float*, param_name: Amplitude, param_offset: 0x20}
 - {type: static_param, param_type: const float*, param_name: GoalDistance, param_offset: 0x28}
 - {type: static_param, param_type: const bool*, param_name: GoalInSuccessEnd, param_offset: 0x30}
@@ -62,7 +62,7 @@ AirOctaMgr:
 - {type: static_param, param_type: const float*, param_name: PlayerLostTime, param_offset: 0x38}
 - {type: map_unit_param, param_type: const float*, param_name: MoveDis, param_offset: 0x40}
 - {type: map_unit_param, param_type: const bool*, param_name: ReactHorn, param_offset: 0x48}
-RotateTurnToTarget:
+ASPlayRotateTurnToTarget:
 - {type: static_param, param_type: const float*, param_name: AngSpd, param_offset: 0x20}
 - {type: static_param, param_type: const bool*, param_name: IsJumpType, param_offset: 0x28}
 - {type: static_param, param_type: 'sead::SafeString', param_name: ASName, param_offset: 0x38}
@@ -643,7 +643,7 @@ Balloon:
 - {type: static_param, param_type: const float*, param_name: Length, param_offset: 0xf0}
 - {type: static_param, param_type: 'sead::SafeString', param_name: RopeActorName, param_offset: 0xf8}
 - {type: map_unit_param, param_type: 'const sead::Vector3f*', param_name: RopeHungActOffset, param_offset: 0x108}
-BasicSignalEnemy: []
+BasicSignalEnemyNotice: []
 BasicSignalBossAwakeSleep:
 - {type: call, fn: _ZN5uking6action16BasicSignalEnemy11loadParams_Ev, addr: 0x71000ba788}
 BasicSignalChangeDamping:
@@ -652,7 +652,7 @@ BasicSignalChangeDamping:
 BasicSignalEnemyForceNotice:
 - {type: call, fn: _ZN5uking6action16BasicSignalEnemy11loadParams_Ev, addr: 0x71000ba788}
 - {type: static_param, param_type: const int*, param_name: Interval, param_offset: 0x20}
-BattleCloseAction:
+AvoidingCloseMoveBase:
 - {type: static_param, param_type: const int*, param_name: WeaponIdx, param_offset: 0x20}
 - {type: static_param, param_type: const float*, param_name: Speed, param_offset: 0x28}
 - {type: static_param, param_type: const float*, param_name: RotSpd, param_offset: 0x30}
@@ -695,10 +695,10 @@ BattleCloseMeanderRun:
 - {type: static_param, param_type: const float*, param_name: JumpUpSpeedReduceRatio, param_offset: 0xb8}
 BattleCloseMeanderGuardRun: []
 BattleCloseMove: []
-BattleCloseActionWithAcc:
+AvoidingCloseMoveActionWithAcc:
 - {type: call, fn: _ZN5uking6action17BattleCloseAction11loadParams_Ev, addr: 0x71000afda4}
 - {type: static_param, param_type: const float*, param_name: AccRatio, param_offset: 0x98}
-BattleCloseSlippedWalkBase:
+BattleCloseSlippedMoveBase:
 - {type: call, fn: _ZN5uking6action24BattleCloseActionWithAcc11loadParams_Ev, addr: 0x71000ae924}
 BattleCloseSlippedWalk:
 - {type: call, fn: _ZN5uking6action26BattleCloseSlippedWalkBase11loadParams_Ev, addr: 0x71000bed30}
@@ -1026,7 +1026,7 @@ CameraFinder: []
 CameraHorse: []
 CameraHorseLockOnEmpty: []
 CameraKeep: []
-CameraLockOnBase: []
+CameraTrackBase: []
 CameraLockOn: []
 CameraLockOnAimingAt: []
 CameraMagneCatch: []
@@ -1097,7 +1097,7 @@ Catch:
 - {type: dynamic_param, param_type: 'ksys::act::BaseProcLink*', param_name: TargetWeapon, param_offset: 0x30}
 - {type: static_param, param_type: const float*, param_name: RotSpd, param_offset: 0x28}
 - {type: static_param, param_type: 'sead::SafeString', param_name: ASName, param_offset: 0x38}
-FollowChallenge:
+AppearFollowChallenge:
 - {type: map_unit_param, param_type: const float*, param_name: GimmickTimeLimit, param_offset: 0x20}
 - {type: map_unit_param, param_type: const bool*, param_name: IsBillboard, param_offset: 0x28}
 ChallengeChainRing:
@@ -1146,7 +1146,7 @@ CheckExistenceOfParticipant:
 - {type: dynamic_param, param_type: 'sead::SafeString', param_name: ActorName, param_offset: 0x20}
 - {type: dynamic_param, param_type: 'sead::SafeString', param_name: InstanceName, param_offset: 0x30}
 CheckHorseCustomizeEdit: []
-ChemicalAttack:
+EmitAttackBase:
 - {type: static_param, param_type: const int*, param_name: AttackIntensity, param_offset: 0x20}
 - {type: static_param, param_type: const int*, param_name: AttackMinPower, param_offset: 0x28}
 - {type: map_unit_param, param_type: const int*, param_name: AttackPower, param_offset: 0x30}
@@ -1154,7 +1154,7 @@ ChemicalAttack:
 - {type: map_unit_param, param_type: const float*, param_name: ScaleTime, param_offset: 0x40}
 - {type: map_unit_param, param_type: const float*, param_name: Range, param_offset: 0x48}
 - {type: map_unit_param, param_type: 'sead::SafeString', param_name: RigidBodyName, param_offset: 0x50}
-ChemicalAttackBall:
+ChemicalAttack:
 - {type: call, fn: _ZN5uking6action14ChemicalAttack11loadParams_Ev, addr: 0x71001053c4}
 - {type: static_param, param_type: const bool*, param_name: IsUseMyRange, param_offset: 0x80}
 - {type: static_param, param_type: const int*, param_name: AttackType, param_offset: 0x88}
@@ -2285,7 +2285,7 @@ FlyMove:
 - {type: call, fn: _ZN5uking6action11FlyMoveBase11loadParams_Ev, addr: 0x71001349e8}
 - {type: static_param, param_type: 'sead::SafeString', param_name: ASName, param_offset: 0xc0}
 FlyingBalloonObserverTag: []
-FlyingCharacterReaction:
+FlyingCharacterFreeFallBase:
 - {type: static_param, param_type: const float*, param_name: PosReduceRatio, param_offset: 0x20}
 - {type: static_param, param_type: const float*, param_name: RotReduceRatio, param_offset: 0x28}
 - {type: static_param, param_type: const bool*, param_name: IsControlRotation, param_offset: 0x30}
@@ -2482,7 +2482,7 @@ ForkEmitChmField:
 ForkASTrgEmitChmFieldPos:
 - {type: call, fn: _ZN5uking6action16ForkEmitChmField11loadParams_Ev, addr: 0x7100167f88}
 - {type: static_param, param_type: 'const sead::Vector3f*', param_name: OffsetPos, param_offset: 0xa8}
-ForkASTrgEmitShockWave:
+ForkEmitShockWave:
 - {type: static_param, param_type: const int*, param_name: Power, param_offset: 0x20}
 - {type: static_param, param_type: const int*, param_name: AttackIntensity, param_offset: 0x28}
 - {type: static_param, param_type: const int*, param_name: EmitIntervalTime, param_offset: 0x30}
@@ -2644,7 +2644,7 @@ ForkAnimReset:
 ForkBattleNodeForAttackGround:
 - {type: static_param, param_type: const bool*, param_name: IsOffsetFromBaseBone, param_offset: 0x20}
 - {type: static_param, param_type: 'const sead::Vector3f*', param_name: AttackPosOffset, param_offset: 0x28}
-SimpleMessageDialogCtrl:
+ForkBasicMessageDialogCtrl:
 - {type: aitree_variable, param_type: void*, param_name: SimpleDialogUnit, param_offset: 0x20}
 ForkBeastGanonMessageDialogCtrl:
 - {type: call, fn: _ZN5uking6action23SimpleMessageDialogCtrl11loadParams_Ev, addr: 0x710014752c}
@@ -3769,7 +3769,7 @@ GolemRepairParts:
 - {type: call, fn: sub_71005E1BE8, addr: 0x71005e1be8}
 - {type: call, fn: sub_71005E1BE8, addr: 0x71005e1be8}
 - {type: aitree_variable, param_type: void*, param_name: GolemChemicalController, param_offset: 0xe0}
-GolemThrowPartsToTargetBase:
+GolemThrowPartsBase:
 - {type: call, fn: _ZN5uking6action22ActionWithPosAngReduce11loadParams_Ev, addr: 0x710027e3ec}
 - {type: static_param, param_type: 'sead::SafeString', param_name: ASName, param_offset: 0x30}
 - {type: static_param, param_type: 'sead::SafeString', param_name: TgtBodyName, param_offset: 0x40}
@@ -4121,7 +4121,7 @@ HorseRideAttack:
 - {type: static_param, param_type: const float*, param_name: JustAvoidAngle, param_offset: 0x68}
 HorseRideCancelCommand:
 - {type: call, fn: _ZN5uking6action16HorseRideCommand11loadParams_Ev, addr: 0x71001ae9e8}
-HorseRideMoveCommand:
+HorseRideSetGearCommand:
 - {type: call, fn: _ZN5uking6action16HorseRideCommand11loadParams_Ev, addr: 0x71001ae9e8}
 - {type: static_param, param_type: const int*, param_name: Gear, param_offset: 0x58}
 HorseRideChargeCommand:
@@ -5147,7 +5147,7 @@ NpcTebaFly:
 ObjBoardWoodTriangle01: []
 ObservationPointAction:
 - {type: map_unit_param, param_type: 'sead::SafeString', param_name: PointName, param_offset: 0x20}
-OctarockBalloonBase:
+BalloonRopeBase:
 - {type: call, fn: _ZN5uking6action11BalloonBase11loadParams_Ev, addr: 0x71000b82bc}
 - {type: static_param, param_type: const float*, param_name: ConnectReleaseTimer, param_offset: 0xf0}
 - {type: static_param, param_type: const float*, param_name: ClampWindForceScale, param_offset: 0xf8}
@@ -5156,7 +5156,7 @@ OctarockBalloonBase:
 - {type: dynamic_param, param_type: 'sead::Vector3f*', param_name: ConnectRigidOffset, param_offset: 0x118}
 - {type: dynamic_param, param_type: 'ksys::act::BaseProcHandle**', param_name: RopeActorHandle, param_offset: 0x120}
 OctarockBalloon:
-- {type: call, fn: _ZN5uking6action19OctarockBalloonBase11loadParams_Ev, addr: 0x71000b8ff0}
+- {type: call, fn: _ZN5uking6action15BalloonRopeBase11loadParams_Ev, addr: 0x71000b8ff0}
 - {type: static_param, param_type: const float*, param_name: TargetScale, param_offset: 0x138}
 - {type: static_param, param_type: const float*, param_name: StartSignTimer, param_offset: 0x140}
 - {type: static_param, param_type: 'sead::SafeString', param_name: StartASName, param_offset: 0x148}
@@ -5665,7 +5665,7 @@ PlayerJump:
 - {type: static_param, param_type: const float*, param_name: EnergyUseDiam1, param_offset: 0x58}
 - {type: static_param, param_type: const float*, param_name: EnergyUseDiam2, param_offset: 0x60}
 - {type: static_param, param_type: const float*, param_name: EnergyUseDiam3, param_offset: 0x68}
-PlayerGlide:
+PlayerParashawlGlideBase:
 - {type: static_param, param_type: const float*, param_name: GlideSpeedMax, param_offset: 0x20}
 - {type: static_param, param_type: const float*, param_name: Lv2GlideSpeedMax, param_offset: 0x28}
 - {type: static_param, param_type: const float*, param_name: GlideBodyFrontX, param_offset: 0x30}
@@ -6090,7 +6090,7 @@ PriestBossClonesSpawn:
 - {type: call, fn: _ZN5uking6action28PriestBossClonesSpawnForDemo11loadParams_Ev, addr: 0x7100066bb4}
 - {type: static_param, param_type: 'sead::SafeString', param_name: ASNameForAITree, param_offset: 0x88}
 - {type: dynamic_param, param_type: int*, param_name: DelayFrame, param_offset: 0x98}
-PriestBossWarpOrVanish:
+PriestBossCloneFastWarp:
 - {type: aitree_variable, param_type: void*, param_name: PriestBossMetaAIUnit, param_offset: 0x20}
 PriestBossFastWarpMove:
 - {type: call, fn: _ZN5uking6action22PriestBossWarpOrVanish11loadParams_Ev, addr: 0x7100221408}
@@ -6409,7 +6409,7 @@ SandwormNavMove:
 - {type: static_param, param_type: const float*, param_name: VibrateCheckFrame, param_offset: 0xd8}
 - {type: static_param, param_type: const float*, param_name: VibrateMemoryStep, param_offset: 0xe0}
 - {type: aitree_variable, param_type: void*, param_name: RefPosVibrateChecker, param_offset: 0xe8}
-AtkTackleMove:
+TackleAttack:
 - {type: call, fn: _ZN5uking6action10TackleMove11loadParams_Ev, addr: 0x7100291bf0}
 - {type: static_param, param_type: 'sead::SafeString', param_name: AtkSensorName, param_offset: 0x88}
 SandwormTackleMove:
@@ -6515,7 +6515,7 @@ SetFrameASPlay:
 - {type: static_param, param_type: const bool*, param_name: IsIgnoreSame, param_offset: 0x30}
 - {type: static_param, param_type: 'sead::SafeString', param_name: ASName, param_offset: 0x38}
 - {type: map_unit_param, param_type: const float*, param_name: ASFrame, param_offset: 0x48}
-SetGetFlagBase: []
+SetFlag: []
 SetGetFlag:
 - {type: call, fn: _ZN5uking6action14SetGetFlagBase11loadParams_Ev, addr: 0x7100247c00}
 SetGetFlagByActorName:
@@ -6675,7 +6675,7 @@ SiteBossAvoid:
 - {type: dynamic_param, param_type: 'sead::Vector3f*', param_name: TargetPos, param_offset: 0x48}
 - {type: dynamic_param, param_type: 'sead::Vector3f*', param_name: AvoidVec, param_offset: 0x50}
 - {type: dynamic_param, param_type: 'sead::Vector3f*', param_name: PlayerPos, param_offset: 0x58}
-SiteBossBlowOff:
+LastBossBlowOff:
 - {type: call, fn: _ZN5uking6action8BlownOff11loadParams_Ev, addr: 0x71000c86c4}
 SiteBossBowBlowOff:
 - {type: call, fn: _ZN5uking6action15SiteBossBlowOff11loadParams_Ev, addr: 0x71001cf1b4}
@@ -6722,7 +6722,7 @@ SiteBossGetUpLinear:
 - {type: static_param, param_type: const bool*, param_name: IsRestoreRigidBody, param_offset: 0x160}
 - {type: static_param, param_type: 'const sead::Vector3f*', param_name: ForceRecoverOffset, param_offset: 0x168}
 - {type: static_param, param_type: 'const sead::Vector3f*', param_name: ForceRecoverDist, param_offset: 0x170}
-SiteBossLswordAtk:
+SiteBossLswordAttack:
 - {type: static_param, param_type: const int*, param_name: AtMinDamage, param_offset: 0x20}
 - {type: static_param, param_type: const int*, param_name: AttackPower, param_offset: 0x28}
 - {type: static_param, param_type: const int*, param_name: AddAttackPower, param_offset: 0x30}
@@ -7478,7 +7478,7 @@ TreasureBoxOpenWait:
 - {type: aitree_variable, param_type: bool*, param_name: IsOpenTreasureBox, param_offset: 0x58}
 TriggerAllPartsSleep: []
 Tumble: []
-ChargeAndShoot:
+ArrowChargeAndShoot:
 - {type: call, fn: _ZN5uking6action10ShootArrow11loadParams_Ev, addr: 0x710024e61c}
 TurnAndChargeAndShoot:
 - {type: call, fn: _ZN5uking6action14ChargeAndShoot11loadParams_Ev, addr: 0x71000a1954}
@@ -7566,7 +7566,7 @@ WaitForStaminaUpDemoEnd: []
 WaitHeartDemo: []
 WaitMagneGear: []
 WaitMessageDialogEnd: []
-WaitOnObjBase:
+StopOnObj:
 - {type: static_param, param_type: const float*, param_name: PosReduceRatio, param_offset: 0x20}
 - {type: static_param, param_type: const float*, param_name: RotReduceRatio, param_offset: 0x28}
 WaitOnObj:
@@ -7719,7 +7719,7 @@ WaterUpDownDrivenPreAttack:
 - {type: call, fn: _ZN5uking6action24WaterUpDownAnmDrivenMove11loadParams_Ev, addr: 0x71002b7e34}
 - {type: static_param, param_type: const float*, param_name: TurnSpeed, param_offset: 0x68}
 - {type: dynamic_param, param_type: 'sead::Vector3f*', param_name: TargetPos, param_offset: 0x70}
-WaterUpDownMoveBase:
+WaterDepthMoveBase:
 - {type: static_param, param_type: const float*, param_name: InWaterDepth, param_offset: 0x20}
 - {type: static_param, param_type: const float*, param_name: PosReduceRatio, param_offset: 0x28}
 - {type: static_param, param_type: const float*, param_name: RotReduceRatio, param_offset: 0x30}

data/aidef_action_vtables.yml

@@ -1760,7 +1760,7 @@
 0x71025129f0: Action
 0x7102513278: Ai
 
-0x7102362f08: AirOctaFloatBase
+0x7102362f08: AirOctaMoveBase
 0x71024e8fa0: AnimalMoveGuidedBase
 0x7102372a28: MoveToTargetCurveBase
 0x71023c4f00: TargetCircle
@@ -1768,7 +1768,7 @@
 0x710239b910: HorseRide
 0x710239c4e8: HorseRideCommandBase
 0x710239bdf8: HorseRideCommand
-0x710239c858: HorseRideMoveCommand
+0x710239c858: HorseRideSetGearCommand
 0x71024e9910: HorseSwim
 0x71023a2a18: LevelFlyMoveBase
 0x7102372548: KokkoCreateDropBase
@@ -1781,9 +1781,9 @@
 0x71023a61c8: MultiVacuumRotScaleTimeByDistWithTgtBase
 0x71023a8160: NPCAnchorWait
 0x71023c4a78: TackleMove
-0x71023c4930: AtkTackleMove
+0x71023c4930: TackleAttack
 0x71023af460: OpenMessageDialogBase
-0x71023b1640: PriestBossWarpOrVanish
+0x71023b1640: PriestBossCloneFastWarp
 0x71023747e8: RailMoveBase
 0x71023b2c78: RegistedActorActionBase
 0x71023b2908: RegistedActorDeadCheckBase
@@ -1791,8 +1791,8 @@
 0x71023b39a0: RemainsWaterBulletAction
 0x71023b6ad0: SendMessage
 0x71023b7188: SendMessageToTargetActor
-0x71023b8298: SetGetFlagBase
-0x71023bc748: SiteBossLswordAtk
+0x71023b8298: SetFlag
+0x71023bc748: SiteBossLswordAttack
 0x71023a2330: SiteBossSwordWhirlSlashChargeBase
 0x71023bf3a0: SlippedCircleWalkBase
 0x71023bf5d8: SlippedWalkBase
@@ -1801,28 +1801,28 @@
 0x71023c2510: SwarmDamagedBase
 0x71023c2f88: SwimEnemyAnmBackBlownOffBase
 0x71023c4ba8: TakeoffFromCeilLook
-0x71023c1780: WaitOnObjBase
+0x71023c1780: StopOnObj
 0x71023746b0: WarpPlayerBase
 0x71024e3570: AreaActorObserve
 0x71024e3038: AreaTagAction
 0x7102367500: ActorAreaInOutSendMessage
-0x71023cb148: WaterUpDownMoveBase
+0x71023cb148: WaterDepthMoveBase
 0x71023cc750: WillBallAction
 0x71024e3ac8: AreaFireObserveBase
-0x71023683d0: RotateTurnToTarget
+0x71023683d0: ASPlayRotateTurnToTarget
 0x710239fa98: JumpTo
 0x71023c3408: SwimMoveBase
 0x71023c3af0: SwimTurnBase
 0x71023c3748: SwimRotateBase
 0x71023cb8e8: WaterFloatImmobile
-0x710236aa60: OctarockBalloonBase
+0x710236aa60: BalloonRopeBase
 0x710236a930: BalloonBase
-0x710236af68: BasicSignalEnemy
+0x710236af68: BasicSignalEnemyNotice
 0x7102395570: GiantBattleCloseAction
 0x710236bf18: BattleCloseMoveAction
-0x710236c068: BattleCloseSlippedWalkBase
-0x7102369528: BattleCloseAction
-0x71023693d8: BattleCloseActionWithAcc
+0x710236c068: BattleCloseSlippedMoveBase
+0x7102369528: AvoidingCloseMoveBase
+0x71023693d8: AvoidingCloseMoveActionWithAcc
 0x7102369270: BattleCloseMoveActionBase
 0x710236b9f0: BattleCloseLevelFlyMoveBase
 0x710239d570: HoverBase
@@ -1830,7 +1830,7 @@
 0x710236c708: BattleLevelFlyMoveBase
 0x71023836f0: FlyMoveBase
 0x71024e0588: BindAction
-0x71023a1568: SiteBossBlowOff
+0x71023a1568: LastBossBlowOff
 0x71023b2020: Ragdoll
 0x7102453130: CameraEventAnimFlowBase
 0x7102452a30: CameraEventAnimBase
@@ -1841,11 +1841,11 @@
 0x71024552c0: CameraEventPolarCoordPlayer
 0x7102455ea0: CameraEventTalkManualCtrlBase
 0x7102451f58: CameraAction
-0x7102457878: CameraLockOnBase
-0x710235bd70: FollowChallenge
+0x7102457878: CameraTrackBase
+0x710235bd70: AppearFollowChallenge
 0x7102370548: ChangeSceneBase
-0x7102370bc8: ChemicalAttackBall
-0x7102378f58: ChemicalAttack
+0x7102370bc8: ChemicalAttack
+0x7102378f58: EmitAttackBase
 0x710238fac0: ForkTimerBase
 0x7102389ee0: ForkDynActorNoTargetSelfBase
 0x710238ae10: ForkGanonBeastWeakPoint
@@ -1884,7 +1884,7 @@
 0x7102395ba0: GiantEnemyWalkWithVibration
 0x7102395f40: GiantNavMeshWalkWithVibration
 0x71023a70a0: NavMeshAction
-0x7102396b80: GolemThrowPartsToTargetBase
+0x7102396b80: GolemThrowPartsBase
 0x71023c79e0: TurnBase
 0x710236cab8: NeckSpinBeam
 0x71023a7980: NeckSpin
@@ -1892,7 +1892,7 @@
 0x71023c75d0: LookAtObjectBase
 0x710239dc38: OctarockReloadWigBase
 0x710245ef40: PlayerGuidedMove
-0x7102463620: PlayerGlide
+0x7102463620: PlayerParashawlGlideBase
 0x710236dae8: PlayerStoleOpenEx
 0x710236d9b8: PlayerStoleOpenBase
 0x71023b6e30: SendPlayerNoticeMessageBase
@@ -1901,22 +1901,22 @@
 0x71023bf280: SlippedBackWalkBase
 0x71023a00b8: SmallDamageBackwardBase
 0x71023c61b0: ThrowWeapon
-0x7102367920: ChargeAndShoot
+0x7102367920: ArrowChargeAndShoot
 
 0x7102379730: EnemyFortressChatTurnBase
 0x7102379fa0: EnemyRigidBodyDieBase
 0x710237cc38: EventFade
 0x710237d818: EventHoverNullASPlayBase
 0x7102380ab8: EventVariableFade
-0x7102382f38: FlyingCharacterReaction
+0x7102382f38: FlyingCharacterFreeFallBase
 0x7102382df0: FlyingCharacterFreeFall
 0x7102382420: FlyingCharacterDamageBase
 0x7102386888: ForkASPlayBase
 0x7102386bc8: ForkASTrgDelete
 0x710238fd00: ForkEmitChmField
 0x7102389a70: ForkEmitExpandField
-0x7102389ca0: ForkASTrgEmitShockWave
-0x7102387f08: SimpleMessageDialogCtrl
+0x7102389ca0: ForkEmitShockWave
+0x7102387f08: ForkBasicMessageDialogCtrl
 0x710239ae40: AnimalFollowBase
 0x710238d608: ForkNoWeaponAttackBase
 0x7102390520: ForkWeaponAttackBase

data/aidef_ai_params.yml

@@ -43,7 +43,7 @@ AddSwarmMove:
 - {type: static_param, param_type: const bool*, param_name: IsEndBySensor, param_offset: 0x58}
 - {type: static_param, param_type: 'sead::SafeString', param_name: AnimName, param_offset: 0x60}
 - {type: dynamic_param, param_type: 'sead::Vector3f*', param_name: TargetPos, param_offset: 0x70}
-AddViewTargetPosBase: []
+AddViewTarget: []
 AddViewTargetPos:
 - {type: call, fn: _ZN5uking2ai20AddViewTargetPosBase11loadParams_Ev, addr: 0x71002f9d24}
 SeqTwoAction:
@@ -137,7 +137,7 @@ AnchorRangeSelectTwoAction:
 - {type: static_param, param_type: const float*, param_name: FarDist, param_offset: 0x70}
 - {type: static_param, param_type: 'sead::SafeString', param_name: AnchorName, param_offset: 0x78}
 SimpleLiftable: []
-AncientNecklaceBallBase:
+PlayASSwitch:
 - {type: static_param, param_type: const bool*, param_name: IsIgnoreSameOnAS, param_offset: 0xc8}
 - {type: static_param, param_type: const bool*, param_name: IsIgnoreSameOffAS, param_offset: 0xd0}
 - {type: static_param, param_type: 'sead::SafeString', param_name: OnAS, param_offset: 0xd8}
@@ -169,7 +169,7 @@ AnimalBattleAggressive:
 AnimalBattleMoveLeave:
 - {type: static_param, param_type: const float*, param_name: CheckForwardDist, param_offset: 0x38}
 - {type: dynamic_param, param_type: 'sead::Vector3f*', param_name: TargetPos, param_offset: 0x40}
-AnimalRoamBase:
+AnimalRndMove:
 - {type: static_param, param_type: const float*, param_name: SearchNextPathRadius, param_offset: 0x38}
 - {type: static_param, param_type: const float*, param_name: RadiusLimit, param_offset: 0x40}
 - {type: static_param, param_type: const float*, param_name: ForwardDirDistCoefficient, param_offset: 0x48}
@@ -271,18 +271,18 @@ TimelineAI:
 AnimalTimelineAI:
 - {type: call, fn: _ZN5uking2ai10TimelineAI11loadParams_Ev, addr: 0x7100e1c440}
 - {type: aitree_variable, param_type: 'sead::SafeString*', param_name: DomesticAnimalRailName, param_offset: 0x40}
-AppearNearTarget:
+AppearFromTarget:
 - {type: static_param, param_type: const float*, param_name: Dist, param_offset: 0x38}
 - {type: static_param, param_type: const float*, param_name: TeraDist, param_offset: 0x40}
 - {type: map_unit_param, param_type: const int*, param_name: NearCreateAppearID, param_offset: 0x48}
 - {type: aitree_variable, param_type: bool*, param_name: IsStopFallCheck, param_offset: 0x50}
 AppearFromTargetFrontAfterChase:
-- {type: call, fn: _ZN5uking2ai16AppearNearTarget11loadParams_Ev, addr: 0x710030e73c}
+- {type: call, fn: _ZN5uking2ai16AppearFromTarget11loadParams_Ev, addr: 0x710030e73c}
 - {type: static_param, param_type: const float*, param_name: AppearDist, param_offset: 0x90}
 AppearFromTargetFrontGround:
-- {type: call, fn: _ZN5uking2ai16AppearNearTarget11loadParams_Ev, addr: 0x710030e73c}
+- {type: call, fn: _ZN5uking2ai16AppearFromTarget11loadParams_Ev, addr: 0x710030e73c}
 AppearNearTargetOutOfScrnGnd:
-- {type: call, fn: _ZN5uking2ai16AppearNearTarget11loadParams_Ev, addr: 0x710030e73c}
+- {type: call, fn: _ZN5uking2ai16AppearFromTarget11loadParams_Ev, addr: 0x710030e73c}
 ArmorSearchKorokRoot:
 - {type: static_param, param_type: const float*, param_name: SearchKorokDis, param_offset: 0x38}
 - {type: static_param, param_type: const float*, param_name: SearchRefreshFrame, param_offset: 0x40}
@@ -403,7 +403,7 @@ AssassinCallSelect:
 - {type: call, fn: _ZN5uking2ai17EnemyCalledAppear11loadParams_Ev, addr: 0x710038306c}
 - {type: static_param, param_type: 'sead::SafeString', param_name: ChangeDemoName, param_offset: 0x38}
 - {type: static_param, param_type: 'sead::SafeString', param_name: ChangeDemoEPName, param_offset: 0x48}
-AssassinFieldShooterBattleBase:
+AssassinShooterBattle:
 - {type: static_param, param_type: const int*, param_name: WeaponIdx, param_offset: 0x38}
 - {type: static_param, param_type: const int*, param_name: TiredTime, param_offset: 0x40}
 - {type: static_param, param_type: const float*, param_name: WarpDistNear, param_offset: 0x48}
@@ -412,7 +412,7 @@ AssassinFieldShooterBattleBase:
 - {type: static_param, param_type: const float*, param_name: TiredGrHeight, param_offset: 0x60}
 - {type: static_param, param_type: const float*, param_name: IntervalIntensity, param_offset: 0x68}
 AssassinFieldShooterBattle:
-- {type: call, fn: _ZN5uking2ai30AssassinFieldShooterBattleBase11loadParams_Ev, addr: 0x710032267c}
+- {type: call, fn: _ZN5uking2ai21AssassinShooterBattle11loadParams_Ev, addr: 0x710032267c}
 EnemyNormal:
 - {type: static_param, param_type: const int*, param_name: WeaponIdx, param_offset: 0x70}
 - {type: static_param, param_type: const int*, param_name: SoundLostTimer, param_offset: 0x78}
@@ -443,7 +443,7 @@ LandHumEnemyNormal:
 - {type: static_param, param_type: const float*, param_name: ExplosivesSearchDist, param_offset: 0x3d8}
 - {type: static_param, param_type: const float*, param_name: ExplosivesSearchSpeed, param_offset: 0x3e0}
 - {type: static_param, param_type: const float*, param_name: ExplosivesSearchAng, param_offset: 0x3e8}
-AssassinNormal:
+GuardHomePosNormal:
 - {type: call, fn: _ZN5uking2ai18LandHumEnemyNormal11loadParams_Ev, addr: 0x7100462d90}
 AssassinMiddleAzitoRoot:
 - {type: call, fn: _ZN5uking2ai14AssassinNormal11loadParams_Ev, addr: 0x710040ce80}
@@ -472,7 +472,7 @@ AssassinMiddleDlcGrabAdapter:
 - {type: dynamic_param, param_type: 'ksys::act::BaseProcLink*', param_name: TargetActor, param_offset: 0x40}
 TargetInAreaSelect:
 - {type: static_param, param_type: const int*, param_name: Option, param_offset: 0x38}
-AssassinMagicTgtSelect:
+TargetHeightAreaSelect:
 - {type: call, fn: _ZN5uking2ai18TargetInAreaSelect11loadParams_Ev, addr: 0x71005bfe60}
 - {type: static_param, param_type: const float*, param_name: Height, param_offset: 0x40}
 AssassinMiddleMagicAfter:
@@ -529,11 +529,11 @@ BarrelBomb:
 - {type: map_unit_param, param_type: const bool*, param_name: IsFixedPlace, param_offset: 0xc8}
 BasicStatusRoot: []
 BattleBgmRequestFinishTag: []
-BeamExplodeBase:
+SimpleBeamExplode:
 - {type: static_param, param_type: const float*, param_name: MaxDistance, param_offset: 0x38}
 - {type: static_param, param_type: const bool*, param_name: IsDelete, param_offset: 0x40}
 BeamExplode:
-- {type: call, fn: _ZN5uking2ai15BeamExplodeBase11loadParams_Ev, addr: 0x710056cae0}
+- {type: call, fn: _ZN5uking2ai17SimpleBeamExplode11loadParams_Ev, addr: 0x710056cae0}
 BeamExplodeEitherHit:
 - {type: call, fn: _ZN5uking2ai11BeamExplode11loadParams_Ev, addr: 0x7100328d08}
 - {type: aitree_variable, param_type: bool*, param_name: IsReflectThrownBullet, param_offset: 0x58}
@@ -818,7 +818,7 @@ ChildDeviceReflectArrow:
 - {type: static_param, param_type: const int*, param_name: ReflectCountMax, param_offset: 0x140}
 - {type: static_param, param_type: const float*, param_name: ReflectAimSpeed, param_offset: 0x148}
 - {type: static_param, param_type: const float*, param_name: ReflectAccel, param_offset: 0x150}
-ChildFavoriteSelectorBase:
+ChildSelector:
 - {type: static_param, param_type: const bool*, param_name: IsNoChildForceEnd, param_offset: 0x38}
 - {type: static_param, param_type: const bool*, param_name: IsCheckEveryFrame, param_offset: 0x40}
 ChildFavoriteSelector:
@@ -1097,7 +1097,7 @@ DoorRoot:
 - {type: aitree_variable, param_type: bool*, param_name: IsOpenToInside, param_offset: 0xa0}
 DoubtItemSubTargetSelect: []
 DragonDropItemTargetRootAI: []
-DragonRootBase: []
+ControlRailRoot: []
 DragonRoot:
 - {type: call, fn: _ZN5uking2ai14DragonRootBase11loadParams_Ev, addr: 0x710035714c}
 - {type: static_param, param_type: const int*, param_name: ChemicalBulletRate, param_offset: 0xc0}
@@ -1236,7 +1236,7 @@ DungeonRotateTag3D:
 DungeonRotateTag4ElecApp:
 - {type: map_unit_param, param_type: const int*, param_name: CtrlDgnRemainsElectricBodyPart, param_offset: 0x38}
 - {type: map_unit_param, param_type: const float*, param_name: InitDgnRotRad, param_offset: 0x40}
-WholeDungeonRotateTag:
+DungeonRotateTagApp:
 - {type: map_unit_param, param_type: const float*, param_name: TiltAngle, param_offset: 0x38}
 DungeonRotateTag4FireApp:
 - {type: call, fn: _ZN5uking2ai21WholeDungeonRotateTag11loadParams_Ev, addr: 0x71003797ac}
@@ -1312,7 +1312,7 @@ EnemyChaseShield:
 - {type: static_param, param_type: const int*, param_name: EquipItemSearchIdx, param_offset: 0x40}
 - {type: static_param, param_type: const float*, param_name: TurnAng, param_offset: 0x48}
 - {type: static_param, param_type: const float*, param_name: ShieldReachDist, param_offset: 0x50}
-UnarmedEnemySearch:
+NavMove:
 - {type: static_param, param_type: const int*, param_name: WeaponIdx, param_offset: 0x38}
 - {type: static_param, param_type: const float*, param_name: ReachTargetArea, param_offset: 0x40}
 - {type: static_param, param_type: const float*, param_name: TurnStartAng, param_offset: 0x48}
@@ -1323,13 +1323,13 @@ EnemyChaseTargetAndAction:
 - {type: static_param, param_type: const float*, param_name: LostSpeed, param_offset: 0x78}
 - {type: static_param, param_type: const float*, param_name: LostAng, param_offset: 0x80}
 - {type: dynamic_param, param_type: 'ksys::act::BaseProcLink*', param_name: TargetActor, param_offset: 0x88}
-EnemyChemTargetActionBase:
+EnemyTargetAction:
 - {type: static_param, param_type: const int*, param_name: WeaponIdx, param_offset: 0x38}
 - {type: static_param, param_type: const float*, param_name: ActionDist, param_offset: 0x40}
 - {type: static_param, param_type: const float*, param_name: ActionDir, param_offset: 0x48}
 - {type: dynamic_param, param_type: 'sead::Vector3f*', param_name: TargetPos, param_offset: 0x50}
 EnemyChemTargetAction:
-- {type: call, fn: _ZN5uking2ai25EnemyChemTargetActionBase11loadParams_Ev, addr: 0x71003c0010}
+- {type: call, fn: _ZN5uking2ai17EnemyTargetAction11loadParams_Ev, addr: 0x71003c0010}
 - {type: dynamic_param, param_type: 'ksys::act::BaseProcLink*', param_name: TargetActor, param_offset: 0x58}
 EnemyChemicalPowerSelect: []
 EnemyChemicalSelect:
@@ -1418,9 +1418,9 @@ EnemyHideGrass:
 - {type: static_param, param_type: const float*, param_name: HearingRatio, param_offset: 0x40}
 EnemyHideShootingBattle:
 - {type: dynamic_param, param_type: 'sead::Vector3f*', param_name: TargetPos, param_offset: 0x38}
-NonPlayerHorseRide: []
+RideHorseNonPlayer: []
 EnemyHorseRide:
-- {type: call, fn: _ZN5uking2ai18NonPlayerHorseRide11loadParams_Ev, addr: 0x7100e605d8}
+- {type: call, fn: _ZN5uking2ai18RideHorseNonPlayer11loadParams_Ev, addr: 0x7100e605d8}
 - {type: static_param, param_type: const int*, param_name: UpperBodyASSlot, param_offset: 0xe0}
 - {type: static_param, param_type: const int*, param_name: LowerBodyASSlot, param_offset: 0xe8}
 EnemyLifeSelect:
@@ -1692,7 +1692,7 @@ EquipConditionSelect:
 - {type: static_param, param_type: const int*, param_name: WeaponIdx, param_offset: 0x38}
 EquipHaveSelector:
 - {type: static_param, param_type: const int*, param_name: WeaponIdx, param_offset: 0x38}
-UnarmedEnemySearchWeapon:
+EnemySearch:
 - {type: call, fn: _ZN5uking2ai18UnarmedEnemySearch11loadParams_Ev, addr: 0x71004b64a0}
 - {type: static_param, param_type: const int*, param_name: EquipItemSearchIdx, param_offset: 0x6b8}
 - {type: static_param, param_type: const int*, param_name: RepathTime, param_offset: 0x6c0}
@@ -1701,7 +1701,7 @@ UnarmedEnemySearchWeapon:
 - {type: static_param, param_type: const bool*, param_name: IsUseSight, param_offset: 0x6d8}
 - {type: static_param, param_type: const float*, param_name: LineReachableWeaponDist, param_offset: 0x6e0}
 EquipShieldEnemySearchWeapon:
-- {type: call, fn: _ZN5uking2ai24UnarmedEnemySearchWeapon11loadParams_Ev, addr: 0x71003b777c}
+- {type: call, fn: _ZN5uking2ai11EnemySearch11loadParams_Ev, addr: 0x71003b777c}
 EquipStand:
 - {type: static_param, param_type: 'sead::SafeString', param_name: DisplayAttKey, param_offset: 0x78}
 - {type: static_param, param_type: 'sead::SafeString', param_name: TakeOutAttKey, param_offset: 0x88}
@@ -1749,7 +1749,7 @@ FishGoToAndNibble:
 - {type: static_param, param_type: const float*, param_name: DepthGiveUp, param_offset: 0x58}
 - {type: dynamic_param, param_type: 'sead::Vector3f*', param_name: TargetPos, param_offset: 0x60}
 - {type: dynamic_param, param_type: 'ksys::act::BaseProcLink*', param_name: TargetActor, param_offset: 0x68}
-SimpleWildlifeRoot:
+CapturedActorRoot:
 - {type: static_param, param_type: const int*, param_name: InvalidTgtTimerVal, param_offset: 0x68}
 - {type: static_param, param_type: const int*, param_name: InvalidEscapeTimerVal, param_offset: 0x70}
 - {type: static_param, param_type: const bool*, param_name: IsDeleteWhenDead, param_offset: 0x78}
@@ -1804,7 +1804,7 @@ FlyMoveToTarget:
 - {type: static_param, param_type: const float*, param_name: OutDist, param_offset: 0x48}
 - {type: static_param, param_type: const float*, param_name: OffsetHeight, param_offset: 0x50}
 - {type: dynamic_param, param_type: 'sead::Vector3f*', param_name: TargetPos, param_offset: 0x58}
-FlyingEnemyKeepMove:
+FlyingEnemyDistanceKeepMove:
 - {type: static_param, param_type: const float*, param_name: LostDistance, param_offset: 0x38}
 - {type: static_param, param_type: const float*, param_name: AngleRange, param_offset: 0x40}
 - {type: static_param, param_type: const float*, param_name: SpaceDistance, param_offset: 0x48}
@@ -1842,10 +1842,10 @@ ForestGiantClosestAttackSelect:
 - {type: static_param, param_type: const int*, param_name: HipDropRate, param_offset: 0x38}
 - {type: static_param, param_type: const int*, param_name: HipDropRateFar, param_offset: 0x40}
 - {type: static_param, param_type: const float*, param_name: FarDist, param_offset: 0x48}
-LargeEnemyFindPlayer:
+GiantEnemyFindPlayer:
 - {type: call, fn: _ZN5uking2ai19EnemyBaseFindPlayer11loadParams_Ev, addr: 0x71003815ac}
 ForestGiantFindPlayer:
-- {type: call, fn: _ZN5uking2ai20LargeEnemyFindPlayer11loadParams_Ev, addr: 0x71003f6a30}
+- {type: call, fn: _ZN5uking2ai20GiantEnemyFindPlayer11loadParams_Ev, addr: 0x71003f6a30}
 ForestGiantNormal:
 - {type: call, fn: _ZN5uking2ai11EnemyNormal11loadParams_Ev, addr: 0x71003a3e2c}
 - {type: static_param, param_type: const float*, param_name: SleepingHearAwnRatio, param_offset: 0x3d0}
@@ -2121,12 +2121,12 @@ GiantNavMoveWithFirstAction:
 - {type: call, fn: _ZN5uking2ai18GiantNavMoveTarget11loadParams_Ev, addr: 0x71003f8fb4}
 GiantRoamSelect:
 - {type: map_unit_param, param_type: const int*, param_name: GiantRoamType, param_offset: 0x38}
-SpecialEnemySleep:
+SleepNormal:
 - {type: static_param, param_type: const float*, param_name: AwakeDelayTime, param_offset: 0x38}
 - {type: static_param, param_type: const bool*, param_name: IsAwakenByHearing, param_offset: 0x40}
 - {type: static_param, param_type: const bool*, param_name: IsWaitAfterAwaken, param_offset: 0x48}
 GiantSleepNormal:
-- {type: call, fn: _ZN5uking2ai17SpecialEnemySleep11loadParams_Ev, addr: 0x710059ad6c}
+- {type: call, fn: _ZN5uking2ai11SleepNormal11loadParams_Ev, addr: 0x710059ad6c}
 - {type: static_param, param_type: const float*, param_name: ForceAwakeDist, param_offset: 0x60}
 - {type: static_param, param_type: 'sead::SafeString', param_name: AwakeRbName, param_offset: 0x68}
 GiantSleepReaction: []
@@ -2145,7 +2145,7 @@ GolemClimbedTimeSelect:
 - {type: static_param, param_type: const int*, param_name: LimitTime, param_offset: 0x38}
 - {type: aitree_variable, param_type: float*, param_name: GolemClimbedTime, param_offset: 0x40}
 GolemFindPlayer:
-- {type: call, fn: _ZN5uking2ai20LargeEnemyFindPlayer11loadParams_Ev, addr: 0x71003f6a30}
+- {type: call, fn: _ZN5uking2ai20GiantEnemyFindPlayer11loadParams_Ev, addr: 0x71003f6a30}
 - {type: static_param, param_type: const float*, param_name: SearchExplosiveDist, param_offset: 0x140}
 GolemFireREnemyBattle:
 - {type: call, fn: _ZN5uking2ai11EnemyBattle11loadParams_Ev, addr: 0x71003827ec}
@@ -2227,7 +2227,7 @@ GolemRoot:
 - {type: map_unit_param, param_type: 'sead::SafeString', param_name: GolemWeakPointActor, param_offset: 0x348}
 - {type: aitree_variable, param_type: float*, param_name: GolemClimbedTime, param_offset: 0x358}
 GolemSleepNormal:
-- {type: call, fn: _ZN5uking2ai17SpecialEnemySleep11loadParams_Ev, addr: 0x710059ad6c}
+- {type: call, fn: _ZN5uking2ai11SleepNormal11loadParams_Ev, addr: 0x710059ad6c}
 - {type: aitree_variable, param_type: void*, param_name: GolemChemicalController, param_offset: 0x60}
 GolemSleepTypeSelect:
 - {type: map_unit_param, param_type: 'sead::SafeString', param_name: GolemSleepType, param_offset: 0x38}
@@ -2236,7 +2236,7 @@ GolfBallRoot:
 - {type: static_param, param_type: const int*, param_name: IntSmashContinueFrame, param_offset: 0x40}
 - {type: static_param, param_type: const float*, param_name: FloatJudgeSmash, param_offset: 0x48}
 - {type: static_param, param_type: const float*, param_name: FloatJudgeStop, param_offset: 0x50}
-GoronCannonBase:
+BigCannon:
 - {type: static_param, param_type: const float*, param_name: RotRadAccel, param_offset: 0x38}
 - {type: static_param, param_type: const float*, param_name: RotBrake, param_offset: 0x40}
 - {type: static_param, param_type: const float*, param_name: ShotCannonBallScale, param_offset: 0x48}
@@ -2283,7 +2283,7 @@ GuardianBattleBeamAttack:
 - {type: call, fn: _ZN5uking2ai10GuardianAI11loadParams_Ev, addr: 0x710040da68}
 GuardianBeam:
 - {type: static_param, param_type: const float*, param_name: MaxDistance, param_offset: 0x38}
-GuardianBeamAttackBase: []
+GuardianCommonBeamAttack: []
 GuardianBeamAttack:
 - {type: call, fn: _ZN5uking2ai22GuardianBeamAttackBase11loadParams_Ev, addr: 0x7100411ddc}
 - {type: static_param, param_type: const float*, param_name: LightRadius, param_offset: 0x80}
@@ -2291,7 +2291,7 @@ GuardianBeamAttack:
 - {type: static_param, param_type: const float*, param_name: LightLengthOffset, param_offset: 0x90}
 - {type: static_param, param_type: const float*, param_name: EarSpeed, param_offset: 0x98}
 - {type: static_param, param_type: const bool*, param_name: AdjustRadius, param_offset: 0xa0}
-RailMove:
+BezierRailMove:
 - {type: static_param, param_type: const bool*, param_name: IsIgnoreNoWaitStopPoint, param_offset: 0x38}
 RailMoveWithClose:
 - {type: call, fn: _ZN5uking2ai8RailMove11loadParams_Ev, addr: 0x710032c528}
@@ -2340,8 +2340,8 @@ GuardianMiniBattleStateSelect:
 - {type: static_param, param_type: const float*, param_name: FinalLifeRatio, param_offset: 0x40}
 - {type: static_param, param_type: const bool*, param_name: IsEnterOnly, param_offset: 0x48}
 GuardianMiniBeam:
-- {type: call, fn: _ZN5uking2ai15BeamExplodeBase11loadParams_Ev, addr: 0x710056cae0}
-MiniBeamAttack:
+- {type: call, fn: _ZN5uking2ai17SimpleBeamExplode11loadParams_Ev, addr: 0x710056cae0}
+GuideBeamAttackEnemyBattle:
 - {type: call, fn: _ZN5uking2ai23BreathAttackEnemyBattle11loadParams_Ev, addr: 0x710033f664}
 - {type: static_param, param_type: const float*, param_name: FluctuationRange, param_offset: 0xb0}
 - {type: static_param, param_type: const float*, param_name: FluctuationSpan, param_offset: 0xb8}
@@ -2538,13 +2538,13 @@ HomePosDistanceSelector:
 Horse:
 - {type: static_param, param_type: const float*, param_name: DistanceFall, param_offset: 0x38}
 - {type: static_param, param_type: const float*, param_name: DistanceFallDie, param_offset: 0x40}
-HorseCheckLineOfSightSelectorBase:
+CheckLineOfSightSelector:
 - {type: static_param, param_type: const int*, param_name: DirectionNum, param_offset: 0x38}
 - {type: static_param, param_type: const float*, param_name: DirectionAngle, param_offset: 0x40}
 - {type: static_param, param_type: const float*, param_name: Distance, param_offset: 0x48}
 - {type: static_param, param_type: const float*, param_name: RadiusScale, param_offset: 0x50}
 HorseCheckLineOfSightSelector:
-- {type: call, fn: _ZN5uking2ai33HorseCheckLineOfSightSelectorBase11loadParams_Ev, addr: 0x7100346d88}
+- {type: call, fn: _ZN5uking2ai24CheckLineOfSightSelector11loadParams_Ev, addr: 0x7100346d88}
 HorseDamageTypeSelect: []
 HorseEscapeRouteRailAI:
 - {type: static_param, param_type: const int*, param_name: Count, param_offset: 0x38}
@@ -3164,7 +3164,7 @@ LynelThreeBreathAttack:
 LynelWarp: []
 MagneGearRoot: []
 MagneGrabSelect: []
-RangeSelect:
+NewRangeSelect:
 - {type: static_param, param_type: const int*, param_name: WeaponIdx, param_offset: 0x38}
 - {type: static_param, param_type: const float*, param_name: FarDist, param_offset: 0x40}
 - {type: static_param, param_type: const bool*, param_name: IsSelectEveryFrame, param_offset: 0x48}
@@ -3244,7 +3244,7 @@ MetalObjectBuried:
 - {type: map_unit_param, param_type: const bool*, param_name: EnableRevival, param_offset: 0x68}
 MetalObjectFixed:
 - {type: map_unit_param, param_type: const bool*, param_name: IsFixedPlace, param_offset: 0x38}
-MimicCliffStopEnemyNormalBase:
+CliffStopEnemyNormal:
 - {type: static_param, param_type: const int*, param_name: NoticeSoundTime, param_offset: 0x38}
 - {type: static_param, param_type: const float*, param_name: OffsetHand, param_offset: 0x40}
 - {type: static_param, param_type: const float*, param_name: OffsetTail, param_offset: 0x48}
@@ -3253,7 +3253,7 @@ MimicCliffStopEnemyNormalBase:
 - {type: aitree_variable, param_type: bool*, param_name: IsStartResetMimicry, param_offset: 0x60}
 - {type: aitree_variable, param_type: bool*, param_name: IsCliffFreeze, param_offset: 0x68}
 MimicCliffStopEnemyNormal:
-- {type: call, fn: _ZN5uking2ai29MimicCliffStopEnemyNormalBase11loadParams_Ev, addr: 0x7100352f8c}
+- {type: call, fn: _ZN5uking2ai20CliffStopEnemyNormal11loadParams_Ev, addr: 0x7100352f8c}
 - {type: static_param, param_type: const float*, param_name: JumpDistXZ, param_offset: 0x1e0}
 MimicEnemyFindPlayer:
 - {type: call, fn: _ZN5uking2ai19EnemyBaseFindPlayer11loadParams_Ev, addr: 0x71003815ac}
@@ -3282,7 +3282,7 @@ MiniGolemRoot:
 - {type: static_param, param_type: const int*, param_name: LiftDeadTime, param_offset: 0x318}
 - {type: aitree_variable, param_type: bool*, param_name: IsAllowReactionLift, param_offset: 0x310}
 MiniGolemSleep:
-- {type: call, fn: _ZN5uking2ai17SpecialEnemySleep11loadParams_Ev, addr: 0x710059ad6c}
+- {type: call, fn: _ZN5uking2ai11SleepNormal11loadParams_Ev, addr: 0x710059ad6c}
 - {type: aitree_variable, param_type: void*, param_name: GolemChemicalController, param_offset: 0x60}
 MoonAI: []
 MoonNameTag:
@@ -3313,7 +3313,7 @@ MoriblinUnarmedBattle:
 - {type: static_param, param_type: const float*, param_name: AttackStartRotate, param_offset: 0x60}
 - {type: static_param, param_type: const int*, param_name: PursuingAttackInterval, param_offset: 0x70}
 - {type: static_param, param_type: const float*, param_name: PursuingAttackStartAng, param_offset: 0x78}
-MotorcycleRootBase: []
+HorseRiddenStatusSelector: []
 MotorcycleRoot:
 - {type: call, fn: _ZN5uking2ai18MotorcycleRootBase11loadParams_Ev, addr: 0x710043ec84}
 - {type: static_param, param_type: const float*, param_name: InWaterRateForDisappear, param_offset: 0x38}
@@ -3517,7 +3517,7 @@ NPCTerrorAI:
 - {type: dynamic_param, param_type: 'ksys::act::BaseProcLink*', param_name: TerrorEmitter, param_offset: 0x78}
 NPCTimeline:
 - {type: call, fn: _ZN5uking2ai10TimelineAI11loadParams_Ev, addr: 0x7100e1c440}
-NPCTravelBase: []
+NPCScheduleMove: []
 NPCTravel:
 - {type: call, fn: _ZN5uking2ai13NPCTravelBase11loadParams_Ev, addr: 0x71004df788}
 - {type: static_param, param_type: const float*, param_name: WaitHorseReturnDist, param_offset: 0x78}
@@ -3596,7 +3596,7 @@ OctarockBattle:
 - {type: static_param, param_type: const bool*, param_name: IsLostAttack, param_offset: 0xf0}
 - {type: static_param, param_type: 'sead::SafeString', param_name: ShootActorKey, param_offset: 0xf8}
 - {type: static_param, param_type: 'sead::SafeString', param_name: VacuumPartsKey, param_offset: 0x108}
-OctarockEscape:
+OctarockHideEscapeBase:
 - {type: dynamic_param, param_type: 'sead::Vector3f*', param_name: TargetPos, param_offset: 0x38}
 OctarockHideEscape:
 - {type: call, fn: _ZN5uking2ai14OctarockEscape11loadParams_Ev, addr: 0x71004ec950}
@@ -3608,7 +3608,7 @@ OctarockReaction:
 - {type: call, fn: _ZN5uking2ai20EnemyDefaultReaction11loadParams_Ev, addr: 0x7100388294}
 - {type: static_param, param_type: const bool*, param_name: IsWigBreackByGust, param_offset: 0x68}
 - {type: aitree_variable, param_type: void*, param_name: OctarockFormChangeUnit, param_offset: 0x70}
-OctarockRootBase:
+VacuumEnemyRoot:
 - {type: call, fn: _ZN5uking2ai9EnemyRoot11loadParams_Ev, addr: 0x71003b6090}
 OctarockRoot:
 - {type: call, fn: _ZN5uking2ai16OctarockRootBase11loadParams_Ev, addr: 0x71005e3400}
@@ -3672,7 +3672,7 @@ OnCliffViewWait:
 OnEnterEventModeSelect: []
 OnNavFaceSelect: []
 OnRagdollSelect: []
-OneMemoryMagicBattleBase:
+MagicBattle:
 - {type: call, fn: _ZN5uking2ai11EnemyBattle11loadParams_Ev, addr: 0x71003827ec}
 - {type: static_param, param_type: const int*, param_name: EnlargeTime, param_offset: 0x90}
 - {type: static_param, param_type: const float*, param_name: AttackRatio, param_offset: 0xa8}
@@ -3681,7 +3681,7 @@ OneMemoryMagicBattleBase:
 - {type: static_param, param_type: const int*, param_name: MagicPer, param_offset: 0x98}
 - {type: static_param, param_type: const int*, param_name: AttackPowDirect, param_offset: 0xa0}
 OneMemoryMagicBattle:
-- {type: call, fn: _ZN5uking2ai24OneMemoryMagicBattleBase11loadParams_Ev, addr: 0x710049d940}
+- {type: call, fn: _ZN5uking2ai11MagicBattle11loadParams_Ev, addr: 0x710049d940}
 - {type: static_param, param_type: 'sead::SafeString', param_name: MemoryPartsName, param_offset: 0xe0}
 OptionalWeaponAI: []
 OutOfScreen:
@@ -3850,7 +3850,7 @@ PreyLookAtTarget:
 PreyReaction: []
 PreyStun:
 - {type: static_param, param_type: const int*, param_name: StunTime, param_offset: 0x38}
-PriestBossMode:
+PriestBoss:
 - {type: aitree_variable, param_type: void*, param_name: PriestBossMetaAIUnit, param_offset: 0x38}
 PriestBossActorRoot:
 - {type: call, fn: _ZN5uking2ai14PriestBossMode11loadParams_Ev, addr: 0x7100505e7c}
@@ -4277,18 +4277,18 @@ ReflectableEscape:
 - {type: dynamic_param, param_type: 'sead::Vector3f*', param_name: TargetPos, param_offset: 0x50}
 ReflectableIgnitedThrown:
 - {type: call, fn: _ZN5uking2ai17ReflectableThrown11loadParams_Ev, addr: 0x710053dda4}
-RegistedActorNumTwoSelectBase:
+RegistedActor:
 - {type: aitree_variable, param_type: void*, param_name: RegistedActorUnit, param_offset: 0x38}
 RegistedActorNumTwoSelect:
 - {type: call, fn: _ZN5uking2ai29RegistedActorNumTwoSelectBase11loadParams_Ev, addr: 0x710053e124}
 - {type: static_param, param_type: const int*, param_name: Num, param_offset: 0x40}
 RemainElectricCannonBeamAttack: []
-RemainElectricCannonRootBase:
+LargeCannonRoot:
 - {type: static_param, param_type: const float*, param_name: SearchMaxDist, param_offset: 0x38}
 - {type: static_param, param_type: const float*, param_name: SearchMinDist, param_offset: 0x40}
 - {type: static_param, param_type: const float*, param_name: SearchDistMargin, param_offset: 0x48}
 RemainElectricCannonRoot:
-- {type: call, fn: _ZN5uking2ai28RemainElectricCannonRootBase11loadParams_Ev, addr: 0x71004743b4}
+- {type: call, fn: _ZN5uking2ai15LargeCannonRoot11loadParams_Ev, addr: 0x71004743b4}
 - {type: static_param, param_type: const float*, param_name: SearchMaxDistLoiter, param_offset: 0x60}
 RemainsElectricBGCamera:
 - {type: call, fn: _ZN5uking2ai23RailMoveRemainsBGCamera11loadParams_Ev, addr: 0x7100536b3c}
@@ -4444,7 +4444,7 @@ SandwormLost:
 - {type: static_param, param_type: const float*, param_name: DiveSandOffset, param_offset: 0x60}
 SandwormNavSearchWait:
 - {type: dynamic_param, param_type: 'sead::Vector3f*', param_name: TargetPos, param_offset: 0x38}
-SandwormNormalBase:
+AwnSeal:
 - {type: call, fn: _ZN5uking2ai11EnemyNormal11loadParams_Ev, addr: 0x71003a3e2c}
 - {type: static_param, param_type: const bool*, param_name: SealedSight, param_offset: 0x3d0}
 - {type: static_param, param_type: const bool*, param_name: SealedHearing, param_offset: 0x3d8}
@@ -4546,7 +4546,7 @@ SeqTrgPartsNotice:
 - {type: call, fn: _ZN5uking2ai12SeqTwoAction11loadParams_Ev, addr: 0x710056706c}
 - {type: static_param, param_type: 'sead::SafeString', param_name: PartsName, param_offset: 0x58}
 - {type: static_param, param_type: const bool*, param_name: IsFinishByNoNoticeActionEnd, param_offset: 0x50}
-SeqTwoLineReachableTargetActionBase:
+SeqTwoLineReachableTarget:
 - {type: static_param, param_type: const int*, param_name: ReachableCheckType1, param_offset: 0x38}
 - {type: static_param, param_type: const int*, param_name: ReachableCheckType2, param_offset: 0x40}
 SeqTwoLineReachableTargetAction:
@@ -4652,7 +4652,7 @@ SiteBossArrowRainAttack:
 - {type: call, fn: _ZN5uking2ai24SiteBossReflectArrowRoot11loadParams_Ev, addr: 0x71005829f0}
 SiteBossAttackRoot:
 - {type: static_param, param_type: const int*, param_name: EquipWeapon, param_offset: 0x38}
-SiteBossChemicalProjectile:
+GanonFlameBall:
 - {type: static_param, param_type: const float*, param_name: ExplosionTime, param_offset: 0x38}
 - {type: static_param, param_type: const float*, param_name: ChaseAngleLimit, param_offset: 0x40}
 - {type: static_param, param_type: const float*, param_name: ReflectSpeedRate, param_offset: 0x48}
@@ -4782,14 +4782,14 @@ SiteBossPierceBulletAttack: []
 SiteBossReaction:
 - {type: call, fn: _ZN5uking2ai20EnemyDefaultReaction11loadParams_Ev, addr: 0x7100388294}
 - {type: static_param, param_type: const bool*, param_name: IsChangeEffectiveDamage, param_offset: 0x68}
-SiteBossRecognizeRootBase:
+LastBossRecognizeRoot:
 - {type: static_param, param_type: const int*, param_name: AttackNum, param_offset: 0x38}
 - {type: static_param, param_type: const int*, param_name: AttackRandNum, param_offset: 0x40}
 - {type: static_param, param_type: const float*, param_name: WarpStartDist, param_offset: 0x48}
 - {type: static_param, param_type: const float*, param_name: ForceWarpRetryDist, param_offset: 0x50}
 - {type: dynamic_param, param_type: bool*, param_name: IsAttackPatternFixed, param_offset: 0x58}
 SiteBossRecognizeRoot:
-- {type: call, fn: _ZN5uking2ai25SiteBossRecognizeRootBase11loadParams_Ev, addr: 0x7100478ff8}
+- {type: call, fn: _ZN5uking2ai21LastBossRecognizeRoot11loadParams_Ev, addr: 0x7100478ff8}
 - {type: static_param, param_type: const int*, param_name: IgnoreWaprDistMax, param_offset: 0x68}
 - {type: static_param, param_type: const bool*, param_name: IsCheckChildDevice, param_offset: 0x70}
 - {type: static_param, param_type: const bool*, param_name: IgnoreWarpDistRetFromDamage, param_offset: 0x78}
@@ -4970,7 +4970,7 @@ StalEnemyRoot:
 - {type: aitree_variable, param_type: bool*, param_name: IsStopFallCheck, param_offset: 0xc0}
 - {type: aitree_variable, param_type: void*, param_name: StalEnemyUnit, param_offset: 0xc8}
 StalEnemySleep:
-- {type: call, fn: _ZN5uking2ai17SpecialEnemySleep11loadParams_Ev, addr: 0x710059ad6c}
+- {type: call, fn: _ZN5uking2ai11SleepNormal11loadParams_Ev, addr: 0x710059ad6c}
 - {type: static_param, param_type: const bool*, param_name: UseAwarenessWakeUp, param_offset: 0x60}
 - {type: static_param, param_type: const bool*, param_name: UseNoticeActiveWakeUp, param_offset: 0x68}
 StalGiantEnemyReaction:
@@ -5072,13 +5072,13 @@ StoneBall_BRoot:
 - {type: static_param, param_type: const float*, param_name: DoubleBombImpulseAmplifyPower, param_offset: 0x48}
 StoneOctarockBattle:
 - {type: call, fn: _ZN5uking2ai19ShootingEnemyBattle11loadParams_Ev, addr: 0x7100569bd8}
-GuardNearTarget:
+InvincibleNearTargetBase:
 - {type: static_param, param_type: const int*, param_name: WeaponIdx, param_offset: 0x38}
 - {type: static_param, param_type: const float*, param_name: BaseDist, param_offset: 0x40}
 - {type: static_param, param_type: const float*, param_name: GuardStartDist, param_offset: 0x48}
 - {type: static_param, param_type: const float*, param_name: GuardEndDist, param_offset: 0x50}
 - {type: dynamic_param, param_type: 'sead::Vector3f*', param_name: TargetPos, param_offset: 0x58}
-TimedGuardNearTarget:
+InvincibleNearTarget:
 - {type: call, fn: _ZN5uking2ai15GuardNearTarget11loadParams_Ev, addr: 0x710044d110}
 - {type: static_param, param_type: const int*, param_name: GuardEndTime, param_offset: 0x88}
 - {type: static_param, param_type: const float*, param_name: GuardStartAngle, param_offset: 0x90}
@@ -5194,7 +5194,7 @@ SwitchWheel:
 SwitchWindHit:
 - {type: call, fn: _ZN5uking2ai8SwitchAI11loadParams_Ev, addr: 0x71005b5e1c}
 - {type: static_param, param_type: const float*, param_name: WaitTime, param_offset: 0x38}
-TargetPosAI:
+TargetActorPos:
 - {type: static_param, param_type: const bool*, param_name: OnEnterOnly, param_offset: 0x38}
 TargetAbsolutePos:
 - {type: call, fn: _ZN5uking2ai11TargetPosAI11loadParams_Ev, addr: 0x71005bad1c}
@@ -5207,7 +5207,7 @@ TargetDistanceSelect:
 TargetActorDistanceSelect:
 - {type: call, fn: _ZN5uking2ai20TargetDistanceSelect11loadParams_Ev, addr: 0x71005be408}
 TargetAngerSelect: []
-TargetAttackAttitudeTgtSelectBase: []
+TargetAttackAttitudeTgt: []
 TargetAttackAttitudeTgtSelect:
 - {type: call, fn: _ZN5uking2ai33TargetAttackAttitudeTgtSelectBase11loadParams_Ev, addr: 0x71005bb700}
 - {type: dynamic_param, param_type: 'sead::Vector3f*', param_name: TargetPos, param_offset: 0x48}
@@ -5282,7 +5282,7 @@ TargetPosAnchorOffsetTarget:
 TargetPosDirLRSelect:
 - {type: static_param, param_type: const bool*, param_name: IsCheckEveryFrame, param_offset: 0x38}
 - {type: dynamic_param, param_type: 'sead::Vector3f*', param_name: TargetPos, param_offset: 0x40}
-TargetPosDynParamRot:
+TargetPosDynParamRotFromMyPos:
 - {type: call, fn: _ZN5uking2ai11TargetPosAI11loadParams_Ev, addr: 0x71005bad1c}
 - {type: static_param, param_type: const float*, param_name: MinDist, param_offset: 0x40}
 - {type: dynamic_param, param_type: 'sead::Vector3f*', param_name: Angle, param_offset: 0x48}
@@ -5296,7 +5296,7 @@ TargetPosLostCheck:
 - {type: static_param, param_type: const float*, param_name: LostVMax, param_offset: 0x48}
 - {type: static_param, param_type: const float*, param_name: LostRange, param_offset: 0x50}
 - {type: dynamic_param, param_type: 'sead::Vector3f*', param_name: TargetPos, param_offset: 0x58}
-TargetPosOffset:
+OffsetTargetPos:
 - {type: call, fn: _ZN5uking2ai11TargetPosAI11loadParams_Ev, addr: 0x71005bad1c}
 - {type: static_param, param_type: const int*, param_name: Dir, param_offset: 0x40}
 - {type: static_param, param_type: const float*, param_name: Offset, param_offset: 0x48}
@@ -5444,7 +5444,7 @@ UnarmedEnemyNoiseTarget:
 - {type: static_param, param_type: const float*, param_name: SearchWeaponTargetDist, param_offset: 0xb8}
 - {type: dynamic_param, param_type: 'sead::Vector3f*', param_name: TargetPos, param_offset: 0xc0}
 UnarmedWeaponEquipableEnemyAct:
-- {type: call, fn: _ZN5uking2ai24UnarmedEnemySearchWeapon11loadParams_Ev, addr: 0x71003b777c}
+- {type: call, fn: _ZN5uking2ai11EnemySearch11loadParams_Ev, addr: 0x71003b777c}
 UnderWaterDepthSelect:
 - {type: static_param, param_type: const float*, param_name: DeepDepth, param_offset: 0x38}
 - {type: static_param, param_type: const bool*, param_name: OnEnterOnly, param_offset: 0x40}

data/aidef_ai_vtables.yml

@@ -1177,88 +1177,88 @@
 0x7102513278: Ai
 
 0x71023d3390: AddCarriedBase
-0x7102406420: OneMemoryMagicBattleBase
-0x710240a5f8: RangeSelect
+0x7102406420: MagicBattle
+0x710240a5f8: NewRangeSelect
 0x7102406b28: MagneShaftRootBase
-0x71023df790: MimicCliffStopEnemyNormalBase
-0x71023fb8a8: MotorcycleRootBase
-0x710240c608: NPCTravelBase
-0x710240d7b8: OctarockEscape
+0x71023df790: CliffStopEnemyNormal
+0x71023fb8a8: HorseRiddenStatusSelector
+0x710240c608: NPCScheduleMove
+0x710240d7b8: OctarockHideEscapeBase
 0x7102411aa8: PriestBossActorRoot
-0x7102410d20: PriestBossMode
+0x7102410d20: PriestBoss
 0x7102413228: PriestBossFormation
-0x71023d58c0: AnimalRoamBase
+0x71023d58c0: AnimalRndMove
 0x7102412ae0: PriestBossEyeBeam
 0x7102414fa8: PriestBossPhase
 0x7102414948: PriestBossMeta
 0x71024171d0: RandomSelectThreeActionBase
 0x7102417458: RandomSelectTwoActionBase
 0x7102418608: ReflectableThrown
-0x7102418738: RegistedActorNumTwoSelectBase
-0x7102401b28: RemainElectricCannonRootBase
+0x7102418738: RegistedActor
+0x7102401b28: LargeCannonRoot
 0x71024195d0: RemainsRoot
-0x710241e630: SeqTwoLineReachableTargetActionBase
-0x71023f1ee8: SiteBossChemicalProjectile
+0x710241e630: SeqTwoLineReachableTarget
+0x71023f1ee8: GanonFlameBall
 0x7102421d88: SiteBossRoot
-0x7102402508: SiteBossRecognizeRootBase
+0x7102402508: LastBossRecognizeRoot
 0x71024e2758: TimelineAI
-0x71023fdea0: TimedGuardNearTarget
-0x71023fe008: GuardNearTarget
+0x71023fdea0: InvincibleNearTarget
+0x71023fe008: InvincibleNearTargetBase
 0x7102427220: SwitchAI
-0x71024286d8: TargetPosAI
-0x710242b290: TargetPosDynParamRot
-0x710240dfe8: TargetPosOffset
-0x7102428928: TargetAttackAttitudeTgtSelectBase
+0x71024286d8: TargetActorPos
+0x710242b290: TargetPosDynParamRotFromMyPos
+0x710240dfe8: OffsetTargetPos
+0x7102428928: TargetAttackAttitudeTgt
 0x710242c8f0: Towing
-0x71023d5f40: AppearNearTarget
+0x71023d5f40: AppearFromTarget
 0x710242fab0: WaterSurfaceBase
 0x7102430d68: WillBallFollowAttack
-0x71023d3aa0: AddViewTargetPosBase
-0x71023d8fb8: AssassinFieldShooterBattleBase
-0x71023f6888: AssassinNormal
+0x71023d3aa0: AddViewTarget
+0x71023d8fb8: AssassinShooterBattle
+0x71023f6888: GuardHomePosNormal
 0x71023e8d58: EnemyNormal
-0x71023d99c0: SandwormNormalBase
-0x7102429738: AssassinMagicTgtSelect
+0x71023d99c0: AwnSeal
+0x7102429738: TargetHeightAreaSelect
 0x7102429c18: TargetInAreaSelect
-0x710241f608: BeamExplodeBase
-0x71023f39d0: LargeEnemyFindPlayer
-0x71023f9d88: MiniBeamAttack
+0x710241f608: SimpleBeamExplode
+0x71023f39d0: GiantEnemyFindPlayer
+0x71023f9d88: GuideBeamAttackEnemyBattle
 0x7102458950: CameraEventTalk
 0x7102458428: CameraEvent
 0x7102458020: CameraAI
 0x71023f3770: GiantArmorRoot
-0x71023ddff8: ChildFavoriteSelectorBase
+0x71023ddff8: ChildSelector
 0x71023dec48: CircleMoveInFluid
 0x71023deb00: CircleMove
 0x71023df8b0: CloseSmallAttackBase
 0x71023e0578: CreateActor
 0x71024dc0b0: ForkAI
 0x71023e38c0: DragonRoot
-0x71023e0180: DragonRootBase
-0x71023e4e00: WholeDungeonRotateTag
-0x71023eaf28: UnarmedEnemySearchWeapon
-0x7102409ae0: UnarmedEnemySearch
-0x71023ebb00: EnemyChemTargetActionBase
+0x71023e0180: ControlRailRoot
+0x71023e4e00: DungeonRotateTagApp
+0x71023eaf28: EnemySearch
+0x7102409ae0: NavMove
+0x71023ebb00: EnemyTargetAction
 0x71023d7cc0: AssassinBossRootBase
 0x71023f54e8: GolemRootBase
-0x710242de98: OctarockRootBase
+0x710242de98: VacuumEnemyRoot
 0x71023ea688: EnemyRecognizeTargetBase
-0x71024eaa00: NonPlayerHorseRide
+0x71024eaa00: RideHorseNonPlayer
 0x71023e9788: EnemyNoticeSoundSensitive
 0x71023ec5f8: EnemyVacuumBombSelectBase
 0x71023e0a40: CreationNestOnTree
 0x71023ed328: EscapeFromTargetFront
-0x71023dcaa8: SimpleWildlifeRoot
-0x71023ee798: FlyingEnemyKeepMove
+0x71023dcaa8: CapturedActorRoot
+0x71023ee798: FlyingEnemyDistanceKeepMove
 0x71023eebc0: FlyingEnemySideKeepMove
 0x7102417b78: RangeSelectAction
-0x71024232c8: SpecialEnemySleep
-0x71023daf50: GoronCannonBase
+0x71024232c8: SleepNormal
+0x71023daf50: BigCannon
 0x71023f6af8: GuardianAI
-0x71023f73c0: GuardianBeamAttackBase
-0x71023dadf8: RailMove
-0x71023dd248: HorseCheckLineOfSightSelectorBase
-0x710240f2c8: AncientNecklaceBallBase
+0x71023f73c0: GuardianCommonBeamAttack
+0x71023dadf8: BezierRailMove
+0x71023dd248: CheckLineOfSightSelector
+0x710240f2c8: PlayASSwitch
 0x7102518ba0: HorseLoopTarget
 0x71024e84a8: HorseRiddenByNPCBase
 0x71023fbda0: HorseRideChaseBattleMoveBase

src/Game/Actor/AI/CMakeLists.txt

@@ -17,8 +17,8 @@ target_sources(uking PRIVATE
   aiAddPlayerLargeAttackJustGuard.h
   aiAddSwarmMove.cpp
   aiAddSwarmMove.h
-  aiAddViewTargetPosBase.cpp
-  aiAddViewTargetPosBase.h
+  aiAddViewTarget.cpp
+  aiAddViewTarget.h
   aiAddViewTargetPos.cpp
   aiAddViewTargetPos.h
   aiAirOctaBoardBurn.cpp
@@ -43,8 +43,8 @@ target_sources(uking PRIVATE
   aiAmbushableWeaponShoot.h
   aiAnchorRangeSelectTwoAction.cpp
   aiAnchorRangeSelectTwoAction.h
-  aiAncientNecklaceBallBase.cpp
-  aiAncientNecklaceBallBase.h
+  aiPlayASSwitch.cpp
+  aiPlayASSwitch.h
   aiAncientNecklaceBall.cpp
   aiAncientNecklaceBall.h
   aiAnimalAttackOtherTarget.cpp
@@ -67,8 +67,8 @@ target_sources(uking PRIVATE
   aiAnimalRangeKeepMove.h
   aiAnimalRangeKeepMoveWithLOS.cpp
   aiAnimalRangeKeepMoveWithLOS.h
-  aiAnimalRoamBase.cpp
-  aiAnimalRoamBase.h
+  aiAnimalRndMove.cpp
+  aiAnimalRndMove.h
   aiAnimalRoamCheckWater.cpp
   aiAnimalRoamCheckWater.h
   aiAnimalRoam.cpp
@@ -81,8 +81,8 @@ target_sources(uking PRIVATE
   aiAppearFromTargetFrontAfterChase.h
   aiAppearFromTargetFrontGround.cpp
   aiAppearFromTargetFrontGround.h
-  aiAppearNearTarget.cpp
-  aiAppearNearTarget.h
+  aiAppearFromTarget.cpp
+  aiAppearFromTarget.h
   aiAppearNearTargetOutOfScrnGnd.cpp
   aiAppearNearTargetOutOfScrnGnd.h
   aiArmorSearchKorokRoot.cpp
@@ -127,12 +127,12 @@ target_sources(uking PRIVATE
   aiAssassinBossRoot.h
   aiAssassinCallSelect.cpp
   aiAssassinCallSelect.h
-  aiAssassinFieldShooterBattleBase.cpp
-  aiAssassinFieldShooterBattleBase.h
+  aiAssassinShooterBattle.cpp
+  aiAssassinShooterBattle.h
   aiAssassinFieldShooterBattle.cpp
   aiAssassinFieldShooterBattle.h
-  aiAssassinMagicTgtSelect.cpp
-  aiAssassinMagicTgtSelect.h
+  aiTargetHeightAreaSelect.cpp
+  aiTargetHeightAreaSelect.h
   aiAssassinMiddleAzitoDlcRoot.cpp
   aiAssassinMiddleAzitoDlcRoot.h
   aiAssassinMiddleAzitoNoMemberDemo.cpp
@@ -147,8 +147,8 @@ target_sources(uking PRIVATE
   aiAssassinMiddleMagicAfter.h
   aiAssassinMiddleRoot.cpp
   aiAssassinMiddleRoot.h
-  aiAssassinNormal.cpp
-  aiAssassinNormal.h
+  aiGuardHomePosNormal.cpp
+  aiGuardHomePosNormal.h
   aiAssassinRoot.cpp
   aiAssassinRoot.h
   aiAssassinShooterJuniorAzitoRoot.cpp
@@ -177,8 +177,8 @@ target_sources(uking PRIVATE
   aiBasicStatusRoot.h
   aiBattleBgmRequestFinishTag.cpp
   aiBattleBgmRequestFinishTag.h
-  aiBeamExplodeBase.cpp
-  aiBeamExplodeBase.h
+  aiSimpleBeamExplode.cpp
+  aiSimpleBeamExplode.h
   aiBeamExplode.cpp
   aiBeamExplodeEitherHit.cpp
   aiBeamExplodeEitherHit.h
@@ -263,8 +263,8 @@ target_sources(uking PRIVATE
   aiChemicalWeaponRoot.h
   aiChildDeviceReflectArrow.cpp
   aiChildDeviceReflectArrow.h
-  aiChildFavoriteSelectorBase.cpp
-  aiChildFavoriteSelectorBase.h
+  aiChildSelector.cpp
+  aiChildSelector.h
   aiChildFavoriteSelector.cpp
   aiChildFavoriteSelector.h
   aiChildHaveSelect.cpp
@@ -403,8 +403,8 @@ target_sources(uking PRIVATE
   aiDragonItemRoot.h
   aiDragonReturn.cpp
   aiDragonReturn.h
-  aiDragonRootBase.cpp
-  aiDragonRootBase.h
+  aiControlRailRoot.cpp
+  aiControlRailRoot.h
   aiDragonRoot.cpp
   aiDragonRoot.h
   aiDragonTurn.cpp
@@ -479,8 +479,8 @@ target_sources(uking PRIVATE
   aiEnemyChemicalPowerSelect.h
   aiEnemyChemicalSelect.cpp
   aiEnemyChemicalSelect.h
-  aiEnemyChemTargetActionBase.cpp
-  aiEnemyChemTargetActionBase.h
+  aiEnemyTargetAction.cpp
+  aiEnemyTargetAction.h
   aiEnemyChemTargetAction.cpp
   aiEnemyChemTargetAction.h
   aiEnemyConfuse.cpp
@@ -685,8 +685,8 @@ target_sources(uking PRIVATE
   aiFlyingEnemyFindPlayer.h
   aiFlyingEnemyFrontKeepMove.cpp
   aiFlyingEnemyFrontKeepMove.h
-  aiFlyingEnemyKeepMove.cpp
-  aiFlyingEnemyKeepMove.h
+  aiFlyingEnemyDistanceKeepMove.cpp
+  aiFlyingEnemyDistanceKeepMove.h
   aiFlyingEnemySideKeepMove.cpp
   aiFlyingEnemySideKeepMove.h
   aiFlyInsectRoam.cpp
@@ -869,8 +869,8 @@ target_sources(uking PRIVATE
   aiGolemWeakPointRoot.h
   aiGolfBallRoot.cpp
   aiGolfBallRoot.h
-  aiGoronCannonBase.cpp
-  aiGoronCannonBase.h
+  aiBigCannon.cpp
+  aiBigCannon.h
   aiGoronCannon.cpp
   aiGoronCannon.h
   aiGoronHeroDescendentRoot.cpp
@@ -893,8 +893,8 @@ target_sources(uking PRIVATE
   aiGuardianAI.h
   aiGuardianBattleBeamAttack.cpp
   aiGuardianBattleBeamAttack.h
-  aiGuardianBeamAttackBase.cpp
-  aiGuardianBeamAttackBase.h
+  aiGuardianCommonBeamAttack.cpp
+  aiGuardianCommonBeamAttack.h
   aiGuardianBeamAttack.cpp
   aiGuardianBeamAttack.h
   aiGuardianBeam.cpp
@@ -965,8 +965,8 @@ target_sources(uking PRIVATE
   aiGuardianTargetLost.h
   aiGuardianWait.cpp
   aiGuardianWait.h
-  aiGuardNearTarget.cpp
-  aiGuardNearTarget.h
+  aiInvincibleNearTargetBase.cpp
+  aiInvincibleNearTargetBase.h
   aiGyroActivateTerminal.cpp
   aiGyroActivateTerminal.h
   aiHangedLamp.cpp
@@ -989,8 +989,8 @@ target_sources(uking PRIVATE
   aiHiddenOctarockSearchTarget.h
   aiHomePosDistanceSelector.cpp
   aiHomePosDistanceSelector.h
-  aiHorseCheckLineOfSightSelectorBase.cpp
-  aiHorseCheckLineOfSightSelectorBase.h
+  aiCheckLineOfSightSelector.cpp
+  aiCheckLineOfSightSelector.h
   aiHorseCheckLineOfSightSelector.cpp
   aiHorseCheckLineOfSightSelector.h
   aiHorse.cpp
@@ -1149,8 +1149,8 @@ target_sources(uking PRIVATE
   aiLandingChemicalBall.h
   aiLargeCannonAttackRoot.cpp
   aiLargeCannonAttackRoot.h
-  aiLargeEnemyFindPlayer.cpp
-  aiLargeEnemyFindPlayer.h
+  aiGiantEnemyFindPlayer.cpp
+  aiGiantEnemyFindPlayer.h
   aiLastAttackerSelect.cpp
   aiLastAttackerSelect.h
   aiLastAttackerSpecialActionSelect.cpp
@@ -1297,8 +1297,8 @@ target_sources(uking PRIVATE
   aiMetalObjectBuried.h
   aiMetalObjectFixed.cpp
   aiMetalObjectFixed.h
-  aiMimicCliffStopEnemyNormalBase.cpp
-  aiMimicCliffStopEnemyNormalBase.h
+  aiCliffStopEnemyNormal.cpp
+  aiCliffStopEnemyNormal.h
   aiMimicCliffStopEnemyNormal.cpp
   aiMimicCliffStopEnemyNormal.h
   aiMimicEnemyFindPlayer.cpp
@@ -1309,8 +1309,8 @@ target_sources(uking PRIVATE
   aiMimicFlagSelect.h
   aiMimicryResetCheck.cpp
   aiMimicryResetCheck.h
-  aiMiniBeamAttack.cpp
-  aiMiniBeamAttack.h
+  aiGuideBeamAttackEnemyBattle.cpp
+  aiGuideBeamAttackEnemyBattle.h
   aiMiniGolemLifted.cpp
   aiMiniGolemLifted.h
   aiMiniGolemReaction.cpp
@@ -1329,8 +1329,8 @@ target_sources(uking PRIVATE
   aiMoriblinSpearNearBattle.h
   aiMoriblinUnarmedBattle.cpp
   aiMoriblinUnarmedBattle.h
-  aiMotorcycleRootBase.cpp
-  aiMotorcycleRootBase.h
+  aiHorseRiddenStatusSelector.cpp
+  aiHorseRiddenStatusSelector.h
   aiMotorcycleRoot.cpp
   aiMotorcycleRoot.h
   aiMoveAndFreeFallGondola.cpp
@@ -1429,8 +1429,8 @@ target_sources(uking PRIVATE
   aiNpcTebaTrainingRoot.h
   aiNPCTimeline.cpp
   aiNPCTimeline.h
-  aiNPCTravelBase.cpp
-  aiNPCTravelBase.h
+  aiNPCScheduleMove.cpp
+  aiNPCScheduleMove.h
   aiNPCTravel.cpp
   aiNPCTravelerRoot.cpp
   aiNPCTravelerRoot.h
@@ -1443,16 +1443,16 @@ target_sources(uking PRIVATE
   aiNushiWarp.h
   aiOctarockBattle.cpp
   aiOctarockBattle.h
-  aiOctarockEscape.cpp
-  aiOctarockEscape.h
+  aiOctarockHideEscapeBase.cpp
+  aiOctarockHideEscapeBase.h
   aiOctarockHideEscape.cpp
   aiOctarockHideEscape.h
   aiOctarockOptionRoot.cpp
   aiOctarockOptionRoot.h
   aiOctarockReaction.cpp
   aiOctarockReaction.h
-  aiOctarockRootBase.cpp
-  aiOctarockRootBase.h
+  aiVacuumEnemyRoot.cpp
+  aiVacuumEnemyRoot.h
   aiOctarockRoot.cpp
   aiOctarockRoot.h
   aiOctarockServiceHideWait.cpp
@@ -1465,8 +1465,8 @@ target_sources(uking PRIVATE
   aiOnCliffSurfaceSelect.h
   aiOnCliffViewWait.cpp
   aiOnCliffViewWait.h
-  aiOneMemoryMagicBattleBase.cpp
-  aiOneMemoryMagicBattleBase.h
+  aiMagicBattle.cpp
+  aiMagicBattle.h
   aiOneMemoryMagicBattle.cpp
   aiOneMemoryMagicBattle.h
   aiOnEnterEventModeSelect.cpp
@@ -1615,8 +1615,8 @@ target_sources(uking PRIVATE
   aiPriestBossMetaAIRoot.h
   aiPriestBossMeta.cpp
   aiPriestBossMeta.h
-  aiPriestBossMode.cpp
-  aiPriestBossMode.h
+  aiPriestBoss.cpp
+  aiPriestBoss.h
   aiPriestBossNormalMoveSelector.cpp
   aiPriestBossNormalMoveSelector.h
   aiPriestBossNormalQuickRecover.cpp
@@ -1657,8 +1657,8 @@ target_sources(uking PRIVATE
   aiPriestIronBallAttack.h
   aiPullOutTree.cpp
   aiPullOutTree.h
-  aiRailMove.cpp
-  aiRailMove.h
+  aiBezierRailMove.cpp
+  aiBezierRailMove.h
   aiRailMoveObject.cpp
   aiRailMoveObject.h
   aiRailMoveObjectOneWay.cpp
@@ -1693,8 +1693,8 @@ target_sources(uking PRIVATE
   aiRangeObstacleCheck.h
   aiRangeSelectAction.cpp
   aiRangeSelectAction.h
-  aiRangeSelect.cpp
-  aiRangeSelect.h
+  aiNewRangeSelect.cpp
+  aiNewRangeSelect.h
   aiRangeSelectThreeAction.cpp
   aiRangeSelectThreeAction.h
   aiRangeSelectTwoAction.cpp
@@ -1713,14 +1713,14 @@ target_sources(uking PRIVATE
   aiReflectableIgnitedThrown.h
   aiReflectableThrown.cpp
   aiReflectableThrown.h
-  aiRegistedActorNumTwoSelectBase.cpp
-  aiRegistedActorNumTwoSelectBase.h
+  aiRegistedActor.cpp
+  aiRegistedActor.h
   aiRegistedActorNumTwoSelect.cpp
   aiRegistedActorNumTwoSelect.h
   aiRemainElectricCannonBeamAttack.cpp
   aiRemainElectricCannonBeamAttack.h
-  aiRemainElectricCannonRootBase.cpp
-  aiRemainElectricCannonRootBase.h
+  aiLargeCannonRoot.cpp
+  aiLargeCannonRoot.h
   aiRemainElectricCannonRoot.cpp
   aiRemainElectricCannonRoot.h
   aiRemainsElectricBGCamera.cpp
@@ -1801,8 +1801,8 @@ target_sources(uking PRIVATE
   aiSandwormLost.h
   aiSandwormNavSearchWait.cpp
   aiSandwormNavSearchWait.h
-  aiSandwormNormalBase.cpp
-  aiSandwormNormalBase.h
+  aiAwnSeal.cpp
+  aiAwnSeal.h
   aiSandwormNormal.cpp
   aiSandwormNormal.h
   aiSandwormNoticeSound.cpp
@@ -1867,8 +1867,8 @@ target_sources(uking PRIVATE
   aiSeqTrgPartsNotice.h
   aiSeqTwoAction.cpp
   aiSeqTwoAction.h
-  aiSeqTwoLineReachableTargetActionBase.cpp
-  aiSeqTwoLineReachableTargetActionBase.h
+  aiSeqTwoLineReachableTarget.cpp
+  aiSeqTwoLineReachableTarget.h
   aiSeqTwoLineReachableTargetAction.cpp
   aiSeqTwoLineReachableTargetAction.h
   aiSeqTwoWeakPointOnFirstDo.cpp
@@ -1911,8 +1911,8 @@ target_sources(uking PRIVATE
   aiSimpleLineBeam.h
   aiSimpleShootingEnemyFindPlayer.cpp
   aiSimpleShootingEnemyFindPlayer.h
-  aiSimpleWildlifeRoot.cpp
-  aiSimpleWildlifeRoot.h
+  aiCapturedActorRoot.cpp
+  aiCapturedActorRoot.h
   aiSiteBossApproachRoot.cpp
   aiSiteBossApproachRoot.h
   aiSiteBossArrowRainAttack.cpp
@@ -1927,8 +1927,8 @@ target_sources(uking PRIVATE
   aiSiteBossBowChildDeviceRoot.h
   aiSiteBossBowRoot.cpp
   aiSiteBossBowRoot.h
-  aiSiteBossChemicalProjectile.cpp
-  aiSiteBossChemicalProjectile.h
+  aiGanonFlameBall.cpp
+  aiGanonFlameBall.h
   aiSiteBossFlameBall.cpp
   aiSiteBossFlameBall.h
   aiSiteBossGaleArrowRoot.cpp
@@ -1949,8 +1949,8 @@ target_sources(uking PRIVATE
   aiSiteBossPierceBulletAttack.h
   aiSiteBossReaction.cpp
   aiSiteBossReaction.h
-  aiSiteBossRecognizeRootBase.cpp
-  aiSiteBossRecognizeRootBase.h
+  aiLastBossRecognizeRoot.cpp
+  aiLastBossRecognizeRoot.h
   aiSiteBossRecognizeRoot.cpp
   aiSiteBossRecognizeRoot.h
   aiSiteBossReflectArrowRoot.cpp
@@ -1999,8 +1999,8 @@ target_sources(uking PRIVATE
   aiSoundTriggerTag.h
   aiSpearWeaponSelect.cpp
   aiSpearWeaponSelect.h
-  aiSpecialEnemySleep.cpp
-  aiSpecialEnemySleep.h
+  aiSleepNormal.cpp
+  aiSleepNormal.h
   aiSpotBgmTrigger.cpp
   aiSpotBgmTrigger.h
   aiStalEnemyBlownOff.cpp
@@ -2125,8 +2125,8 @@ target_sources(uking PRIVATE
   aiTargetActorGrabAdapter.h
   aiTargetAngerSelect.cpp
   aiTargetAngerSelect.h
-  aiTargetAttackAttitudeTgtSelectBase.cpp
-  aiTargetAttackAttitudeTgtSelectBase.h
+  aiTargetAttackAttitudeTgt.cpp
+  aiTargetAttackAttitudeTgt.h
   aiTargetAttackAttitudeTgtSelect.cpp
   aiTargetAttackAttitudeTgtSelect.h
   aiTargetBaitTypeSelect.cpp
@@ -2185,24 +2185,24 @@ target_sources(uking PRIVATE
   aiTargetPickedItem.h
   aiTargetPlayerPos.cpp
   aiTargetPlayerPos.h
-  aiTargetPosAI.cpp
-  aiTargetPosAI.h
+  aiTargetActorPos.cpp
+  aiTargetActorPos.h
   aiTargetPosAnchorOffsetSelf.cpp
   aiTargetPosAnchorOffsetSelf.h
   aiTargetPosAnchorOffsetTarget.cpp
   aiTargetPosAnchorOffsetTarget.h
   aiTargetPosDirLRSelect.cpp
   aiTargetPosDirLRSelect.h
-  aiTargetPosDynParamRot.cpp
+  aiTargetPosDynParamRotFromMyPos.cpp
   aiTargetPosDynParamRotFromCtrPos.cpp
   aiTargetPosDynParamRotFromCtrPos.h
-  aiTargetPosDynParamRot.h
+  aiTargetPosDynParamRotFromMyPos.h
   aiTargetPosLostCheck.cpp
   aiTargetPosLostCheck.h
-  aiTargetPosOffset.cpp
+  aiOffsetTargetPos.cpp
   aiTargetPosOffsetFromMyPos.cpp
   aiTargetPosOffsetFromMyPos.h
-  aiTargetPosOffset.h
+  aiOffsetTargetPos.h
   aiTargetPosOnNavFaceSelect.cpp
   aiTargetPosOnNavFaceSelect.h
   aiTargetPosRotFromMyPos.cpp
@@ -2227,8 +2227,8 @@ target_sources(uking PRIVATE
   aiTerminalEnduranceWarpRoot.h
   aiTimeControlTagRoot.cpp
   aiTimeControlTagRoot.h
-  aiTimedGuardNearTarget.cpp
-  aiTimedGuardNearTarget.h
+  aiInvincibleNearTarget.cpp
+  aiInvincibleNearTarget.h
   aiTimelineAI.cpp
   aiTimelineAI.h
   aiTimeredViewWait.cpp
@@ -2265,10 +2265,10 @@ target_sources(uking PRIVATE
   aiTwnObjDlcFlightTrainingTarget.h
   aiUnarmedEnemyNoiseTarget.cpp
   aiUnarmedEnemyNoiseTarget.h
-  aiUnarmedEnemySearch.cpp
-  aiUnarmedEnemySearch.h
-  aiUnarmedEnemySearchWeapon.cpp
-  aiUnarmedEnemySearchWeapon.h
+  aiNavMove.cpp
+  aiNavMove.h
+  aiEnemySearch.cpp
+  aiEnemySearch.h
   aiUnarmedWeaponEquipableEnemyAct.cpp
   aiUnarmedWeaponEquipableEnemyAct.h
   aiUnderWaterDepthSelect.cpp
@@ -2355,8 +2355,8 @@ target_sources(uking PRIVATE
   aiWeatherReactionCheck.h
   aiWetSelect.cpp
   aiWetSelect.h
-  aiWholeDungeonRotateTag.cpp
-  aiWholeDungeonRotateTag.h
+  aiDungeonRotateTagApp.cpp
+  aiDungeonRotateTagApp.h
   aiWillBallAttackLevelSelect.cpp
   aiWillBallAttackLevelSelect.h
   aiWillBallFollowAttack.cpp

src/Game/Actor/AI/aiAddViewTarget.cpp

@@ -0,0 +1,23 @@
+#include "Game/Actor/AI/aiAddViewTarget.h"
+
+namespace uking::ai {
+
+AddViewTarget::AddViewTarget(const InitArg& arg) : ksys::act::ai::Ai(arg) {}
+
+AddViewTarget::~AddViewTarget() = default;
+
+bool AddViewTarget::init_(sead::Heap* heap) {
+    return ksys::act::ai::Ai::init_(heap);
+}
+
+void AddViewTarget::enter_(ksys::act::ai::InlineParamPack* params) {
+    ksys::act::ai::Ai::enter_(params);
+}
+
+void AddViewTarget::leave_() {
+    ksys::act::ai::Ai::leave_();
+}
+
+void AddViewTarget::loadParams_() {}
+
+}  // namespace uking::ai

src/Game/Actor/AI/aiAddViewTarget.h

@@ -4,11 +4,11 @@
 
 namespace uking::ai {
 
-class NPCTravelBase : public ksys::act::ai::Ai {
-    SEAD_RTTI_OVERRIDE(NPCTravelBase, ksys::act::ai::Ai)
+class AddViewTarget : public ksys::act::ai::Ai {
+    SEAD_RTTI_OVERRIDE(AddViewTarget, ksys::act::ai::Ai)
 public:
-    explicit NPCTravelBase(const InitArg& arg);
-    ~NPCTravelBase() override;
+    explicit AddViewTarget(const InitArg& arg);
+    ~AddViewTarget() override;
 
     bool init_(sead::Heap* heap) override;
     void enter_(ksys::act::ai::InlineParamPack* params) override;

src/Game/Actor/AI/aiAddViewTargetPos.cpp

@@ -2,24 +2,24 @@
 
 namespace uking::ai {
 
-AddViewTargetPos::AddViewTargetPos(const InitArg& arg) : AddViewTargetPosBase(arg) {}
+AddViewTargetPos::AddViewTargetPos(const InitArg& arg) : AddViewTarget(arg) {}
 
 AddViewTargetPos::~AddViewTargetPos() = default;
 
 bool AddViewTargetPos::init_(sead::Heap* heap) {
-    return AddViewTargetPosBase::init_(heap);
+    return AddViewTarget::init_(heap);
 }
 
 void AddViewTargetPos::enter_(ksys::act::ai::InlineParamPack* params) {
-    AddViewTargetPosBase::enter_(params);
+    AddViewTarget::enter_(params);
 }
 
 void AddViewTargetPos::leave_() {
-    AddViewTargetPosBase::leave_();
+    AddViewTarget::leave_();
 }
 
 void AddViewTargetPos::loadParams_() {
-    AddViewTargetPosBase::loadParams_();
+    AddViewTarget::loadParams_();
 }
 
 }  // namespace uking::ai

src/Game/Actor/AI/aiAddViewTargetPos.h

@@ -1,12 +1,12 @@
 #pragma once
 
-#include "Game/Actor/AI/aiAddViewTargetPosBase.h"
+#include "Game/Actor/AI/aiAddViewTarget.h"
 #include "KingSystem/ActorSystem/actAiAi.h"
 
 namespace uking::ai {
 
-class AddViewTargetPos : public AddViewTargetPosBase {
-    SEAD_RTTI_OVERRIDE(AddViewTargetPos, AddViewTargetPosBase)
+class AddViewTargetPos : public AddViewTarget {
+    SEAD_RTTI_OVERRIDE(AddViewTargetPos, AddViewTarget)
 public:
     explicit AddViewTargetPos(const InitArg& arg);
     ~AddViewTargetPos() override;

src/Game/Actor/AI/aiAddViewTargetPosBase.cpp

@@ -1,23 +0,0 @@
-#include "Game/Actor/AI/aiAddViewTargetPosBase.h"
-
-namespace uking::ai {
-
-AddViewTargetPosBase::AddViewTargetPosBase(const InitArg& arg) : ksys::act::ai::Ai(arg) {}
-
-AddViewTargetPosBase::~AddViewTargetPosBase() = default;
-
-bool AddViewTargetPosBase::init_(sead::Heap* heap) {
-    return ksys::act::ai::Ai::init_(heap);
-}
-
-void AddViewTargetPosBase::enter_(ksys::act::ai::InlineParamPack* params) {
-    ksys::act::ai::Ai::enter_(params);
-}
-
-void AddViewTargetPosBase::leave_() {
-    ksys::act::ai::Ai::leave_();
-}
-
-void AddViewTargetPosBase::loadParams_() {}
-
-}  // namespace uking::ai

src/Game/Actor/AI/aiAncientNecklaceBall.cpp

@@ -2,24 +2,24 @@
 
 namespace uking::ai {
 
-AncientNecklaceBall::AncientNecklaceBall(const InitArg& arg) : AncientNecklaceBallBase(arg) {}
+AncientNecklaceBall::AncientNecklaceBall(const InitArg& arg) : PlayASSwitch(arg) {}
 
 AncientNecklaceBall::~AncientNecklaceBall() = default;
 
 bool AncientNecklaceBall::init_(sead::Heap* heap) {
-    return AncientNecklaceBallBase::init_(heap);
+    return PlayASSwitch::init_(heap);
 }
 
 void AncientNecklaceBall::enter_(ksys::act::ai::InlineParamPack* params) {
-    AncientNecklaceBallBase::enter_(params);
+    PlayASSwitch::enter_(params);
 }
 
 void AncientNecklaceBall::leave_() {
-    AncientNecklaceBallBase::leave_();
+    PlayASSwitch::leave_();
 }
 
 void AncientNecklaceBall::loadParams_() {
-    AncientNecklaceBallBase::loadParams_();
+    PlayASSwitch::loadParams_();
     getStaticParam(&mLandNoiseLevel_s, "LandNoiseLevel");
     getMapUnitParam(&mGrabNodeIndex_m, "GrabNodeIndex");
     getMapUnitParam(&mGiantNecklaceActiveSaveFlag_m, "GiantNecklaceActiveSaveFlag");

src/Game/Actor/AI/aiAncientNecklaceBall.h

@@ -1,12 +1,12 @@
 #pragma once
 
-#include "Game/Actor/AI/aiAncientNecklaceBallBase.h"
+#include "Game/Actor/AI/aiPlayASSwitch.h"
 #include "KingSystem/ActorSystem/actAiAi.h"
 
 namespace uking::ai {
 
-class AncientNecklaceBall : public AncientNecklaceBallBase {
-    SEAD_RTTI_OVERRIDE(AncientNecklaceBall, AncientNecklaceBallBase)
+class AncientNecklaceBall : public PlayASSwitch {
+    SEAD_RTTI_OVERRIDE(AncientNecklaceBall, PlayASSwitch)
 public:
     explicit AncientNecklaceBall(const InitArg& arg);
     ~AncientNecklaceBall() override;

src/Game/Actor/AI/aiAncientNecklaceBallBase.cpp

@@ -1,28 +0,0 @@
-#include "Game/Actor/AI/aiAncientNecklaceBallBase.h"
-
-namespace uking::ai {
-
-AncientNecklaceBallBase::AncientNecklaceBallBase(const InitArg& arg) : SimpleLiftable(arg) {}
-
-AncientNecklaceBallBase::~AncientNecklaceBallBase() = default;
-
-bool AncientNecklaceBallBase::init_(sead::Heap* heap) {
-    return SimpleLiftable::init_(heap);
-}
-
-void AncientNecklaceBallBase::enter_(ksys::act::ai::InlineParamPack* params) {
-    SimpleLiftable::enter_(params);
-}
-
-void AncientNecklaceBallBase::leave_() {
-    SimpleLiftable::leave_();
-}
-
-void AncientNecklaceBallBase::loadParams_() {
-    getStaticParam(&mIsIgnoreSameOnAS_s, "IsIgnoreSameOnAS");
-    getStaticParam(&mIsIgnoreSameOffAS_s, "IsIgnoreSameOffAS");
-    getStaticParam(&mOnAS_s, "OnAS");
-    getStaticParam(&mOffAS_s, "OffAS");
-}
-
-}  // namespace uking::ai

src/Game/Actor/AI/aiAnimalEscapeAI.cpp

@@ -2,24 +2,24 @@
 
 namespace uking::ai {
 
-AnimalEscapeAI::AnimalEscapeAI(const InitArg& arg) : AnimalRoamBase(arg) {}
+AnimalEscapeAI::AnimalEscapeAI(const InitArg& arg) : AnimalRndMove(arg) {}
 
 AnimalEscapeAI::~AnimalEscapeAI() = default;
 
 bool AnimalEscapeAI::init_(sead::Heap* heap) {
-    return AnimalRoamBase::init_(heap);
+    return AnimalRndMove::init_(heap);
 }
 
 void AnimalEscapeAI::enter_(ksys::act::ai::InlineParamPack* params) {
-    AnimalRoamBase::enter_(params);
+    AnimalRndMove::enter_(params);
 }
 
 void AnimalEscapeAI::leave_() {
-    AnimalRoamBase::leave_();
+    AnimalRndMove::leave_();
 }
 
 void AnimalEscapeAI::loadParams_() {
-    AnimalRoamBase::loadParams_();
+    AnimalRndMove::loadParams_();
     getStaticParam(&mNumTimesAllowStuck_s, "NumTimesAllowStuck");
     getStaticParam(&mContinueDistance_s, "ContinueDistance");
     getStaticParam(&mShouldEscapeDistance_s, "ShouldEscapeDistance");

src/Game/Actor/AI/aiAnimalEscapeAI.h

@@ -1,12 +1,12 @@
 #pragma once
 
-#include "Game/Actor/AI/aiAnimalRoamBase.h"
+#include "Game/Actor/AI/aiAnimalRndMove.h"
 #include "KingSystem/ActorSystem/actAiAi.h"
 
 namespace uking::ai {
 
-class AnimalEscapeAI : public AnimalRoamBase {
-    SEAD_RTTI_OVERRIDE(AnimalEscapeAI, AnimalRoamBase)
+class AnimalEscapeAI : public AnimalRndMove {
+    SEAD_RTTI_OVERRIDE(AnimalEscapeAI, AnimalRndMove)
 public:
     explicit AnimalEscapeAI(const InitArg& arg);
     ~AnimalEscapeAI() override;

src/Game/Actor/AI/aiAnimalRndMove.cpp

@@ -1,24 +1,24 @@
-#include "Game/Actor/AI/aiAnimalRoamBase.h"
+#include "Game/Actor/AI/aiAnimalRndMove.h"
 
 namespace uking::ai {
 
-AnimalRoamBase::AnimalRoamBase(const InitArg& arg) : ksys::act::ai::Ai(arg) {}
+AnimalRndMove::AnimalRndMove(const InitArg& arg) : ksys::act::ai::Ai(arg) {}
 
-AnimalRoamBase::~AnimalRoamBase() = default;
+AnimalRndMove::~AnimalRndMove() = default;
 
-bool AnimalRoamBase::init_(sead::Heap* heap) {
+bool AnimalRndMove::init_(sead::Heap* heap) {
     return ksys::act::ai::Ai::init_(heap);
 }
 
-void AnimalRoamBase::enter_(ksys::act::ai::InlineParamPack* params) {
+void AnimalRndMove::enter_(ksys::act::ai::InlineParamPack* params) {
     ksys::act::ai::Ai::enter_(params);
 }
 
-void AnimalRoamBase::leave_() {
+void AnimalRndMove::leave_() {
     ksys::act::ai::Ai::leave_();
 }
 
-void AnimalRoamBase::loadParams_() {
+void AnimalRndMove::loadParams_() {
     getStaticParam(&mSearchNextPathRadius_s, "SearchNextPathRadius");
     getStaticParam(&mRadiusLimit_s, "RadiusLimit");
     getStaticParam(&mForwardDirDistCoefficient_s, "ForwardDirDistCoefficient");

src/Game/Actor/AI/aiAnimalRndMove.h

@@ -4,11 +4,11 @@
 
 namespace uking::ai {
 
-class AnimalRoamBase : public ksys::act::ai::Ai {
-    SEAD_RTTI_OVERRIDE(AnimalRoamBase, ksys::act::ai::Ai)
+class AnimalRndMove : public ksys::act::ai::Ai {
+    SEAD_RTTI_OVERRIDE(AnimalRndMove, ksys::act::ai::Ai)
 public:
-    explicit AnimalRoamBase(const InitArg& arg);
-    ~AnimalRoamBase() override;
+    explicit AnimalRndMove(const InitArg& arg);
+    ~AnimalRndMove() override;
 
     bool init_(sead::Heap* heap) override;
     void enter_(ksys::act::ai::InlineParamPack* params) override;

src/Game/Actor/AI/aiAnimalRoam.cpp

@@ -2,24 +2,24 @@
 
 namespace uking::ai {
 
-AnimalRoam::AnimalRoam(const InitArg& arg) : AnimalRoamBase(arg) {}
+AnimalRoam::AnimalRoam(const InitArg& arg) : AnimalRndMove(arg) {}
 
 AnimalRoam::~AnimalRoam() = default;
 
 bool AnimalRoam::init_(sead::Heap* heap) {
-    return AnimalRoamBase::init_(heap);
+    return AnimalRndMove::init_(heap);
 }
 
 void AnimalRoam::enter_(ksys::act::ai::InlineParamPack* params) {
-    AnimalRoamBase::enter_(params);
+    AnimalRndMove::enter_(params);
 }
 
 void AnimalRoam::leave_() {
-    AnimalRoamBase::leave_();
+    AnimalRndMove::leave_();
 }
 
 void AnimalRoam::loadParams_() {
-    AnimalRoamBase::loadParams_();
+    AnimalRndMove::loadParams_();
     getStaticParam(&mFinishChangeCount_s, "FinishChangeCount");
     getStaticParam(&mLimitRadius_s, "LimitRadius");
     getStaticParam(&mChangeWaitRate_s, "ChangeWaitRate");

src/Game/Actor/AI/aiAnimalRoam.h

@@ -1,12 +1,12 @@
 #pragma once
 
-#include "Game/Actor/AI/aiAnimalRoamBase.h"
+#include "Game/Actor/AI/aiAnimalRndMove.h"
 #include "KingSystem/ActorSystem/actAiAi.h"
 
 namespace uking::ai {
 
-class AnimalRoam : public AnimalRoamBase {
-    SEAD_RTTI_OVERRIDE(AnimalRoam, AnimalRoamBase)
+class AnimalRoam : public AnimalRndMove {
+    SEAD_RTTI_OVERRIDE(AnimalRoam, AnimalRndMove)
 public:
     explicit AnimalRoam(const InitArg& arg);
     ~AnimalRoam() override;

src/Game/Actor/AI/aiAppearFromTarget.cpp

@@ -1,24 +1,24 @@
-#include "Game/Actor/AI/aiAppearNearTarget.h"
+#include "Game/Actor/AI/aiAppearFromTarget.h"
 
 namespace uking::ai {
 
-AppearNearTarget::AppearNearTarget(const InitArg& arg) : ksys::act::ai::Ai(arg) {}
+AppearFromTarget::AppearFromTarget(const InitArg& arg) : ksys::act::ai::Ai(arg) {}
 
-AppearNearTarget::~AppearNearTarget() = default;
+AppearFromTarget::~AppearFromTarget() = default;
 
-bool AppearNearTarget::init_(sead::Heap* heap) {
+bool AppearFromTarget::init_(sead::Heap* heap) {
     return ksys::act::ai::Ai::init_(heap);
 }
 
-void AppearNearTarget::enter_(ksys::act::ai::InlineParamPack* params) {
+void AppearFromTarget::enter_(ksys::act::ai::InlineParamPack* params) {
     ksys::act::ai::Ai::enter_(params);
 }
 
-void AppearNearTarget::leave_() {
+void AppearFromTarget::leave_() {
     ksys::act::ai::Ai::leave_();
 }
 
-void AppearNearTarget::loadParams_() {
+void AppearFromTarget::loadParams_() {
     getStaticParam(&mDist_s, "Dist");
     getStaticParam(&mTeraDist_s, "TeraDist");
     getMapUnitParam(&mNearCreateAppearID_m, "NearCreateAppearID");

src/Game/Actor/AI/aiAppearFromTarget.h

@@ -4,11 +4,11 @@
 
 namespace uking::ai {
 
-class AppearNearTarget : public ksys::act::ai::Ai {
-    SEAD_RTTI_OVERRIDE(AppearNearTarget, ksys::act::ai::Ai)
+class AppearFromTarget : public ksys::act::ai::Ai {
+    SEAD_RTTI_OVERRIDE(AppearFromTarget, ksys::act::ai::Ai)
 public:
-    explicit AppearNearTarget(const InitArg& arg);
-    ~AppearNearTarget() override;
+    explicit AppearFromTarget(const InitArg& arg);
+    ~AppearFromTarget() override;
 
     bool init_(sead::Heap* heap) override;
     void enter_(ksys::act::ai::InlineParamPack* params) override;

src/Game/Actor/AI/aiAppearFromTargetFrontAfterChase.cpp

@@ -3,20 +3,20 @@
 namespace uking::ai {
 
 AppearFromTargetFrontAfterChase::AppearFromTargetFrontAfterChase(const InitArg& arg)
-    : AppearNearTarget(arg) {}
+    : AppearFromTarget(arg) {}
 
 AppearFromTargetFrontAfterChase::~AppearFromTargetFrontAfterChase() = default;
 
 void AppearFromTargetFrontAfterChase::enter_(ksys::act::ai::InlineParamPack* params) {
-    AppearNearTarget::enter_(params);
+    AppearFromTarget::enter_(params);
 }
 
 void AppearFromTargetFrontAfterChase::leave_() {
-    AppearNearTarget::leave_();
+    AppearFromTarget::leave_();
 }
 
 void AppearFromTargetFrontAfterChase::loadParams_() {
-    AppearNearTarget::loadParams_();
+    AppearFromTarget::loadParams_();
     getStaticParam(&mAppearDist_s, "AppearDist");
 }
 

src/Game/Actor/AI/aiAppearFromTargetFrontAfterChase.h

@@ -1,12 +1,12 @@
 #pragma once
 
-#include "Game/Actor/AI/aiAppearNearTarget.h"
+#include "Game/Actor/AI/aiAppearFromTarget.h"
 #include "KingSystem/ActorSystem/actAiAi.h"
 
 namespace uking::ai {
 
-class AppearFromTargetFrontAfterChase : public AppearNearTarget {
-    SEAD_RTTI_OVERRIDE(AppearFromTargetFrontAfterChase, AppearNearTarget)
+class AppearFromTargetFrontAfterChase : public AppearFromTarget {
+    SEAD_RTTI_OVERRIDE(AppearFromTargetFrontAfterChase, AppearFromTarget)
 public:
     explicit AppearFromTargetFrontAfterChase(const InitArg& arg);
     ~AppearFromTargetFrontAfterChase() override;

src/Game/Actor/AI/aiAppearFromTargetFrontGround.cpp

@@ -3,24 +3,24 @@
 namespace uking::ai {
 
 AppearFromTargetFrontGround::AppearFromTargetFrontGround(const InitArg& arg)
-    : AppearNearTarget(arg) {}
+    : AppearFromTarget(arg) {}
 
 AppearFromTargetFrontGround::~AppearFromTargetFrontGround() = default;
 
 bool AppearFromTargetFrontGround::init_(sead::Heap* heap) {
-    return AppearNearTarget::init_(heap);
+    return AppearFromTarget::init_(heap);
 }
 
 void AppearFromTargetFrontGround::enter_(ksys::act::ai::InlineParamPack* params) {
-    AppearNearTarget::enter_(params);
+    AppearFromTarget::enter_(params);
 }
 
 void AppearFromTargetFrontGround::leave_() {
-    AppearNearTarget::leave_();
+    AppearFromTarget::leave_();
 }
 
 void AppearFromTargetFrontGround::loadParams_() {
-    AppearNearTarget::loadParams_();
+    AppearFromTarget::loadParams_();
 }
 
 }  // namespace uking::ai

src/Game/Actor/AI/aiAppearFromTargetFrontGround.h

@@ -1,12 +1,12 @@
 #pragma once
 
-#include "Game/Actor/AI/aiAppearNearTarget.h"
+#include "Game/Actor/AI/aiAppearFromTarget.h"
 #include "KingSystem/ActorSystem/actAiAi.h"
 
 namespace uking::ai {
 
-class AppearFromTargetFrontGround : public AppearNearTarget {
-    SEAD_RTTI_OVERRIDE(AppearFromTargetFrontGround, AppearNearTarget)
+class AppearFromTargetFrontGround : public AppearFromTarget {
+    SEAD_RTTI_OVERRIDE(AppearFromTargetFrontGround, AppearFromTarget)
 public:
     explicit AppearFromTargetFrontGround(const InitArg& arg);
     ~AppearFromTargetFrontGround() override;

src/Game/Actor/AI/aiAppearNearTargetOutOfScrnGnd.cpp

@@ -3,24 +3,24 @@
 namespace uking::ai {
 
 AppearNearTargetOutOfScrnGnd::AppearNearTargetOutOfScrnGnd(const InitArg& arg)
-    : AppearNearTarget(arg) {}
+    : AppearFromTarget(arg) {}
 
 AppearNearTargetOutOfScrnGnd::~AppearNearTargetOutOfScrnGnd() = default;
 
 bool AppearNearTargetOutOfScrnGnd::init_(sead::Heap* heap) {
-    return AppearNearTarget::init_(heap);
+    return AppearFromTarget::init_(heap);
 }
 
 void AppearNearTargetOutOfScrnGnd::enter_(ksys::act::ai::InlineParamPack* params) {
-    AppearNearTarget::enter_(params);
+    AppearFromTarget::enter_(params);
 }
 
 void AppearNearTargetOutOfScrnGnd::leave_() {
-    AppearNearTarget::leave_();
+    AppearFromTarget::leave_();
 }
 
 void AppearNearTargetOutOfScrnGnd::loadParams_() {
-    AppearNearTarget::loadParams_();
+    AppearFromTarget::loadParams_();
 }
 
 }  // namespace uking::ai

src/Game/Actor/AI/aiAppearNearTargetOutOfScrnGnd.h

@@ -1,12 +1,12 @@
 #pragma once
 
-#include "Game/Actor/AI/aiAppearNearTarget.h"
+#include "Game/Actor/AI/aiAppearFromTarget.h"
 #include "KingSystem/ActorSystem/actAiAi.h"
 
 namespace uking::ai {
 
-class AppearNearTargetOutOfScrnGnd : public AppearNearTarget {
-    SEAD_RTTI_OVERRIDE(AppearNearTargetOutOfScrnGnd, AppearNearTarget)
+class AppearNearTargetOutOfScrnGnd : public AppearFromTarget {
+    SEAD_RTTI_OVERRIDE(AppearNearTargetOutOfScrnGnd, AppearFromTarget)
 public:
     explicit AppearNearTargetOutOfScrnGnd(const InitArg& arg);
     ~AppearNearTargetOutOfScrnGnd() override;

src/Game/Actor/AI/aiAssassinFieldShooterBattle.cpp

@@ -3,24 +3,24 @@
 namespace uking::ai {
 
 AssassinFieldShooterBattle::AssassinFieldShooterBattle(const InitArg& arg)
-    : AssassinFieldShooterBattleBase(arg) {}
+    : AssassinShooterBattle(arg) {}
 
 AssassinFieldShooterBattle::~AssassinFieldShooterBattle() = default;
 
 bool AssassinFieldShooterBattle::init_(sead::Heap* heap) {
-    return AssassinFieldShooterBattleBase::init_(heap);
+    return AssassinShooterBattle::init_(heap);
 }
 
 void AssassinFieldShooterBattle::enter_(ksys::act::ai::InlineParamPack* params) {
-    AssassinFieldShooterBattleBase::enter_(params);
+    AssassinShooterBattle::enter_(params);
 }
 
 void AssassinFieldShooterBattle::leave_() {
-    AssassinFieldShooterBattleBase::leave_();
+    AssassinShooterBattle::leave_();
 }
 
 void AssassinFieldShooterBattle::loadParams_() {
-    AssassinFieldShooterBattleBase::loadParams_();
+    AssassinShooterBattle::loadParams_();
 }
 
 }  // namespace uking::ai

src/Game/Actor/AI/aiAssassinFieldShooterBattle.h

@@ -1,12 +1,12 @@
 #pragma once
 
-#include "Game/Actor/AI/aiAssassinFieldShooterBattleBase.h"
+#include "Game/Actor/AI/aiAssassinShooterBattle.h"
 #include "KingSystem/ActorSystem/actAiAi.h"
 
 namespace uking::ai {
 
-class AssassinFieldShooterBattle : public AssassinFieldShooterBattleBase {
-    SEAD_RTTI_OVERRIDE(AssassinFieldShooterBattle, AssassinFieldShooterBattleBase)
+class AssassinFieldShooterBattle : public AssassinShooterBattle {
+    SEAD_RTTI_OVERRIDE(AssassinFieldShooterBattle, AssassinShooterBattle)
 public:
     explicit AssassinFieldShooterBattle(const InitArg& arg);
     ~AssassinFieldShooterBattle() override;

src/Game/Actor/AI/aiAssassinMagicTgtSelect.cpp

@@ -1,26 +0,0 @@
-#include "Game/Actor/AI/aiAssassinMagicTgtSelect.h"
-
-namespace uking::ai {
-
-AssassinMagicTgtSelect::AssassinMagicTgtSelect(const InitArg& arg) : TargetInAreaSelect(arg) {}
-
-AssassinMagicTgtSelect::~AssassinMagicTgtSelect() = default;
-
-bool AssassinMagicTgtSelect::init_(sead::Heap* heap) {
-    return TargetInAreaSelect::init_(heap);
-}
-
-void AssassinMagicTgtSelect::enter_(ksys::act::ai::InlineParamPack* params) {
-    TargetInAreaSelect::enter_(params);
-}
-
-void AssassinMagicTgtSelect::leave_() {
-    TargetInAreaSelect::leave_();
-}
-
-void AssassinMagicTgtSelect::loadParams_() {
-    TargetInAreaSelect::loadParams_();
-    getStaticParam(&mHeight_s, "Height");
-}
-
-}  // namespace uking::ai

src/Game/Actor/AI/aiAssassinMiddleAzitoRoot.cpp

@@ -2,24 +2,24 @@
 
 namespace uking::ai {
 
-AssassinMiddleAzitoRoot::AssassinMiddleAzitoRoot(const InitArg& arg) : AssassinNormal(arg) {}
+AssassinMiddleAzitoRoot::AssassinMiddleAzitoRoot(const InitArg& arg) : GuardHomePosNormal(arg) {}
 
 AssassinMiddleAzitoRoot::~AssassinMiddleAzitoRoot() = default;
 
 bool AssassinMiddleAzitoRoot::init_(sead::Heap* heap) {
-    return AssassinNormal::init_(heap);
+    return GuardHomePosNormal::init_(heap);
 }
 
 void AssassinMiddleAzitoRoot::enter_(ksys::act::ai::InlineParamPack* params) {
-    AssassinNormal::enter_(params);
+    GuardHomePosNormal::enter_(params);
 }
 
 void AssassinMiddleAzitoRoot::leave_() {
-    AssassinNormal::leave_();
+    GuardHomePosNormal::leave_();
 }
 
 void AssassinMiddleAzitoRoot::loadParams_() {
-    AssassinNormal::loadParams_();
+    GuardHomePosNormal::loadParams_();
     getStaticParam(&mEntryPoint_s, "EntryPoint");
     getStaticParam(&mDemoName_s, "DemoName");
     getStaticParam(&mLikeItem_s, "LikeItem");

src/Game/Actor/AI/aiAssassinMiddleAzitoRoot.h

@@ -1,12 +1,12 @@
 #pragma once
 
-#include "Game/Actor/AI/aiAssassinNormal.h"
+#include "Game/Actor/AI/aiGuardHomePosNormal.h"
 #include "KingSystem/ActorSystem/actAiAi.h"
 
 namespace uking::ai {
 
-class AssassinMiddleAzitoRoot : public AssassinNormal {
-    SEAD_RTTI_OVERRIDE(AssassinMiddleAzitoRoot, AssassinNormal)
+class AssassinMiddleAzitoRoot : public GuardHomePosNormal {
+    SEAD_RTTI_OVERRIDE(AssassinMiddleAzitoRoot, GuardHomePosNormal)
 public:
     explicit AssassinMiddleAzitoRoot(const InitArg& arg);
     ~AssassinMiddleAzitoRoot() override;

src/Game/Actor/AI/aiAssassinMiddleMagicAfter.cpp

@@ -3,24 +3,24 @@
 namespace uking::ai {
 
 AssassinMiddleMagicAfter::AssassinMiddleMagicAfter(const InitArg& arg)
-    : AssassinMagicTgtSelect(arg) {}
+    : TargetHeightAreaSelect(arg) {}
 
 AssassinMiddleMagicAfter::~AssassinMiddleMagicAfter() = default;
 
 bool AssassinMiddleMagicAfter::init_(sead::Heap* heap) {
-    return AssassinMagicTgtSelect::init_(heap);
+    return TargetHeightAreaSelect::init_(heap);
 }
 
 void AssassinMiddleMagicAfter::enter_(ksys::act::ai::InlineParamPack* params) {
-    AssassinMagicTgtSelect::enter_(params);
+    TargetHeightAreaSelect::enter_(params);
 }
 
 void AssassinMiddleMagicAfter::leave_() {
-    AssassinMagicTgtSelect::leave_();
+    TargetHeightAreaSelect::leave_();
 }
 
 void AssassinMiddleMagicAfter::loadParams_() {
-    AssassinMagicTgtSelect::loadParams_();
+    TargetHeightAreaSelect::loadParams_();
     getAITreeVariable(&mIsInterseptAttack_a, "IsInterseptAttack");
 }
 

src/Game/Actor/AI/aiAssassinMiddleMagicAfter.h

@@ -1,12 +1,12 @@
 #pragma once
 
-#include "Game/Actor/AI/aiAssassinMagicTgtSelect.h"
+#include "Game/Actor/AI/aiTargetHeightAreaSelect.h"
 #include "KingSystem/ActorSystem/actAiAi.h"
 
 namespace uking::ai {
 
-class AssassinMiddleMagicAfter : public AssassinMagicTgtSelect {
-    SEAD_RTTI_OVERRIDE(AssassinMiddleMagicAfter, AssassinMagicTgtSelect)
+class AssassinMiddleMagicAfter : public TargetHeightAreaSelect {
+    SEAD_RTTI_OVERRIDE(AssassinMiddleMagicAfter, TargetHeightAreaSelect)
 public:
     explicit AssassinMiddleMagicAfter(const InitArg& arg);
     ~AssassinMiddleMagicAfter() override;

src/Game/Actor/AI/aiAssassinNormal.cpp

@@ -1,25 +0,0 @@
-#include "Game/Actor/AI/aiAssassinNormal.h"
-
-namespace uking::ai {
-
-AssassinNormal::AssassinNormal(const InitArg& arg) : LandHumEnemyNormal(arg) {}
-
-AssassinNormal::~AssassinNormal() = default;
-
-bool AssassinNormal::init_(sead::Heap* heap) {
-    return LandHumEnemyNormal::init_(heap);
-}
-
-void AssassinNormal::enter_(ksys::act::ai::InlineParamPack* params) {
-    LandHumEnemyNormal::enter_(params);
-}
-
-void AssassinNormal::leave_() {
-    LandHumEnemyNormal::leave_();
-}
-
-void AssassinNormal::loadParams_() {
-    LandHumEnemyNormal::loadParams_();
-}
-
-}  // namespace uking::ai

src/Game/Actor/AI/aiAssassinShooterBattle.cpp

@@ -1,25 +1,24 @@
-#include "Game/Actor/AI/aiAssassinFieldShooterBattleBase.h"
+#include "Game/Actor/AI/aiAssassinShooterBattle.h"
 
 namespace uking::ai {
 
-AssassinFieldShooterBattleBase::AssassinFieldShooterBattleBase(const InitArg& arg)
-    : ksys::act::ai::Ai(arg) {}
+AssassinShooterBattle::AssassinShooterBattle(const InitArg& arg) : ksys::act::ai::Ai(arg) {}
 
-AssassinFieldShooterBattleBase::~AssassinFieldShooterBattleBase() = default;
+AssassinShooterBattle::~AssassinShooterBattle() = default;
 
-bool AssassinFieldShooterBattleBase::init_(sead::Heap* heap) {
+bool AssassinShooterBattle::init_(sead::Heap* heap) {
     return ksys::act::ai::Ai::init_(heap);
 }
 
-void AssassinFieldShooterBattleBase::enter_(ksys::act::ai::InlineParamPack* params) {
+void AssassinShooterBattle::enter_(ksys::act::ai::InlineParamPack* params) {
     ksys::act::ai::Ai::enter_(params);
 }
 
-void AssassinFieldShooterBattleBase::leave_() {
+void AssassinShooterBattle::leave_() {
     ksys::act::ai::Ai::leave_();
 }
 
-void AssassinFieldShooterBattleBase::loadParams_() {
+void AssassinShooterBattle::loadParams_() {
     getStaticParam(&mWeaponIdx_s, "WeaponIdx");
     getStaticParam(&mTiredTime_s, "TiredTime");
     getStaticParam(&mWarpDistNear_s, "WarpDistNear");

src/Game/Actor/AI/aiAssassinShooterBattle.h

@@ -4,11 +4,11 @@
 
 namespace uking::ai {
 
-class AssassinFieldShooterBattleBase : public ksys::act::ai::Ai {
-    SEAD_RTTI_OVERRIDE(AssassinFieldShooterBattleBase, ksys::act::ai::Ai)
+class AssassinShooterBattle : public ksys::act::ai::Ai {
+    SEAD_RTTI_OVERRIDE(AssassinShooterBattle, ksys::act::ai::Ai)
 public:
-    explicit AssassinFieldShooterBattleBase(const InitArg& arg);
-    ~AssassinFieldShooterBattleBase() override;
+    explicit AssassinShooterBattle(const InitArg& arg);
+    ~AssassinShooterBattle() override;
 
     bool init_(sead::Heap* heap) override;
     void enter_(ksys::act::ai::InlineParamPack* params) override;

src/Game/Actor/AI/aiAwnSeal.cpp

@@ -1,24 +1,24 @@
-#include "Game/Actor/AI/aiSandwormNormalBase.h"
+#include "Game/Actor/AI/aiAwnSeal.h"
 
 namespace uking::ai {
 
-SandwormNormalBase::SandwormNormalBase(const InitArg& arg) : EnemyNormal(arg) {}
+AwnSeal::AwnSeal(const InitArg& arg) : EnemyNormal(arg) {}
 
-SandwormNormalBase::~SandwormNormalBase() = default;
+AwnSeal::~AwnSeal() = default;
 
-bool SandwormNormalBase::init_(sead::Heap* heap) {
+bool AwnSeal::init_(sead::Heap* heap) {
     return EnemyNormal::init_(heap);
 }
 
-void SandwormNormalBase::enter_(ksys::act::ai::InlineParamPack* params) {
+void AwnSeal::enter_(ksys::act::ai::InlineParamPack* params) {
     EnemyNormal::enter_(params);
 }
 
-void SandwormNormalBase::leave_() {
+void AwnSeal::leave_() {
     EnemyNormal::leave_();
 }
 
-void SandwormNormalBase::loadParams_() {
+void AwnSeal::loadParams_() {
     EnemyNormal::loadParams_();
     getStaticParam(&mSealedSight_s, "SealedSight");
     getStaticParam(&mSealedHearing_s, "SealedHearing");

src/Game/Actor/AI/aiAwnSeal.h

@@ -5,11 +5,11 @@
 
 namespace uking::ai {
 
-class SandwormNormalBase : public EnemyNormal {
-    SEAD_RTTI_OVERRIDE(SandwormNormalBase, EnemyNormal)
+class AwnSeal : public EnemyNormal {
+    SEAD_RTTI_OVERRIDE(AwnSeal, EnemyNormal)
 public:
-    explicit SandwormNormalBase(const InitArg& arg);
-    ~SandwormNormalBase() override;
+    explicit AwnSeal(const InitArg& arg);
+    ~AwnSeal() override;
 
     bool init_(sead::Heap* heap) override;
     void enter_(ksys::act::ai::InlineParamPack* params) override;

src/Game/Actor/AI/aiBeamExplode.cpp

@@ -2,24 +2,24 @@
 
 namespace uking::ai {
 
-BeamExplode::BeamExplode(const InitArg& arg) : BeamExplodeBase(arg) {}
+BeamExplode::BeamExplode(const InitArg& arg) : SimpleBeamExplode(arg) {}
 
 BeamExplode::~BeamExplode() = default;
 
 bool BeamExplode::init_(sead::Heap* heap) {
-    return BeamExplodeBase::init_(heap);
+    return SimpleBeamExplode::init_(heap);
 }
 
 void BeamExplode::enter_(ksys::act::ai::InlineParamPack* params) {
-    BeamExplodeBase::enter_(params);
+    SimpleBeamExplode::enter_(params);
 }
 
 void BeamExplode::leave_() {
-    BeamExplodeBase::leave_();
+    SimpleBeamExplode::leave_();
 }
 
 void BeamExplode::loadParams_() {
-    BeamExplodeBase::loadParams_();
+    SimpleBeamExplode::loadParams_();
 }
 
 }  // namespace uking::ai

src/Game/Actor/AI/aiBeamExplode.h

@@ -1,12 +1,12 @@
 #pragma once
 
-#include "Game/Actor/AI/aiBeamExplodeBase.h"
+#include "Game/Actor/AI/aiSimpleBeamExplode.h"
 #include "KingSystem/ActorSystem/actAiAi.h"
 
 namespace uking::ai {
 
-class BeamExplode : public BeamExplodeBase {
-    SEAD_RTTI_OVERRIDE(BeamExplode, BeamExplodeBase)
+class BeamExplode : public SimpleBeamExplode {
+    SEAD_RTTI_OVERRIDE(BeamExplode, SimpleBeamExplode)
 public:
     explicit BeamExplode(const InitArg& arg);
     ~BeamExplode() override;

src/Game/Actor/AI/aiBeamExplodeBase.cpp

@@ -1,26 +0,0 @@
-#include "Game/Actor/AI/aiBeamExplodeBase.h"
-
-namespace uking::ai {
-
-BeamExplodeBase::BeamExplodeBase(const InitArg& arg) : ksys::act::ai::Ai(arg) {}
-
-BeamExplodeBase::~BeamExplodeBase() = default;
-
-bool BeamExplodeBase::init_(sead::Heap* heap) {
-    return ksys::act::ai::Ai::init_(heap);
-}
-
-void BeamExplodeBase::enter_(ksys::act::ai::InlineParamPack* params) {
-    ksys::act::ai::Ai::enter_(params);
-}
-
-void BeamExplodeBase::leave_() {
-    ksys::act::ai::Ai::leave_();
-}
-
-void BeamExplodeBase::loadParams_() {
-    getStaticParam(&mMaxDistance_s, "MaxDistance");
-    getStaticParam(&mIsDelete_s, "IsDelete");
-}
-
-}  // namespace uking::ai

src/Game/Actor/AI/aiBezierRailMove.cpp

@@ -0,0 +1,25 @@
+#include "Game/Actor/AI/aiBezierRailMove.h"
+
+namespace uking::ai {
+
+BezierRailMove::BezierRailMove(const InitArg& arg) : ksys::act::ai::Ai(arg) {}
+
+BezierRailMove::~BezierRailMove() = default;
+
+bool BezierRailMove::init_(sead::Heap* heap) {
+    return ksys::act::ai::Ai::init_(heap);
+}
+
+void BezierRailMove::enter_(ksys::act::ai::InlineParamPack* params) {
+    ksys::act::ai::Ai::enter_(params);
+}
+
+void BezierRailMove::leave_() {
+    ksys::act::ai::Ai::leave_();
+}
+
+void BezierRailMove::loadParams_() {
+    getStaticParam(&mIsIgnoreNoWaitStopPoint_s, "IsIgnoreNoWaitStopPoint");
+}
+
+}  // namespace uking::ai

src/Game/Actor/AI/aiBezierRailMove.h

@@ -4,11 +4,11 @@
 
 namespace uking::ai {
 
-class RailMove : public ksys::act::ai::Ai {
-    SEAD_RTTI_OVERRIDE(RailMove, ksys::act::ai::Ai)
+class BezierRailMove : public ksys::act::ai::Ai {
+    SEAD_RTTI_OVERRIDE(BezierRailMove, ksys::act::ai::Ai)
 public:
-    explicit RailMove(const InitArg& arg);
-    ~RailMove() override;
+    explicit BezierRailMove(const InitArg& arg);
+    ~BezierRailMove() override;
 
     bool init_(sead::Heap* heap) override;
     void enter_(ksys::act::ai::InlineParamPack* params) override;

src/Game/Actor/AI/aiBigCannon.cpp

@@ -1,24 +1,24 @@
-#include "Game/Actor/AI/aiGoronCannonBase.h"
+#include "Game/Actor/AI/aiBigCannon.h"
 
 namespace uking::ai {
 
-GoronCannonBase::GoronCannonBase(const InitArg& arg) : ksys::act::ai::Ai(arg) {}
+BigCannon::BigCannon(const InitArg& arg) : ksys::act::ai::Ai(arg) {}
 
-GoronCannonBase::~GoronCannonBase() = default;
+BigCannon::~BigCannon() = default;
 
-bool GoronCannonBase::init_(sead::Heap* heap) {
+bool BigCannon::init_(sead::Heap* heap) {
     return ksys::act::ai::Ai::init_(heap);
 }
 
-void GoronCannonBase::enter_(ksys::act::ai::InlineParamPack* params) {
+void BigCannon::enter_(ksys::act::ai::InlineParamPack* params) {
     ksys::act::ai::Ai::enter_(params);
 }
 
-void GoronCannonBase::leave_() {
+void BigCannon::leave_() {
     ksys::act::ai::Ai::leave_();
 }
 
-void GoronCannonBase::loadParams_() {
+void BigCannon::loadParams_() {
     getStaticParam(&mRotRadAccel_s, "RotRadAccel");
     getStaticParam(&mRotBrake_s, "RotBrake");
     getStaticParam(&mShotCannonBallScale_s, "ShotCannonBallScale");

src/Game/Actor/AI/aiBigCannon.h

@@ -4,11 +4,11 @@
 
 namespace uking::ai {
 
-class GoronCannonBase : public ksys::act::ai::Ai {
-    SEAD_RTTI_OVERRIDE(GoronCannonBase, ksys::act::ai::Ai)
+class BigCannon : public ksys::act::ai::Ai {
+    SEAD_RTTI_OVERRIDE(BigCannon, ksys::act::ai::Ai)
 public:
-    explicit GoronCannonBase(const InitArg& arg);
-    ~GoronCannonBase() override;
+    explicit BigCannon(const InitArg& arg);
+    ~BigCannon() override;
 
     bool init_(sead::Heap* heap) override;
     void enter_(ksys::act::ai::InlineParamPack* params) override;

src/Game/Actor/AI/aiCapturedActorRoot.cpp

@@ -1,24 +1,24 @@
-#include "Game/Actor/AI/aiSimpleWildlifeRoot.h"
+#include "Game/Actor/AI/aiCapturedActorRoot.h"
 
 namespace uking::ai {
 
-SimpleWildlifeRoot::SimpleWildlifeRoot(const InitArg& arg) : ksys::act::ai::Ai(arg) {}
+CapturedActorRoot::CapturedActorRoot(const InitArg& arg) : ksys::act::ai::Ai(arg) {}
 
-SimpleWildlifeRoot::~SimpleWildlifeRoot() = default;
+CapturedActorRoot::~CapturedActorRoot() = default;
 
-bool SimpleWildlifeRoot::init_(sead::Heap* heap) {
+bool CapturedActorRoot::init_(sead::Heap* heap) {
     return ksys::act::ai::Ai::init_(heap);
 }
 
-void SimpleWildlifeRoot::enter_(ksys::act::ai::InlineParamPack* params) {
+void CapturedActorRoot::enter_(ksys::act::ai::InlineParamPack* params) {
     ksys::act::ai::Ai::enter_(params);
 }
 
-void SimpleWildlifeRoot::leave_() {
+void CapturedActorRoot::leave_() {
     ksys::act::ai::Ai::leave_();
 }
 
-void SimpleWildlifeRoot::loadParams_() {
+void CapturedActorRoot::loadParams_() {
     getStaticParam(&mInvalidTgtTimerVal_s, "InvalidTgtTimerVal");
     getStaticParam(&mInvalidEscapeTimerVal_s, "InvalidEscapeTimerVal");
     getStaticParam(&mIsDeleteWhenDead_s, "IsDeleteWhenDead");

src/Game/Actor/AI/aiCapturedActorRoot.h

@@ -4,11 +4,11 @@
 
 namespace uking::ai {
 
-class SimpleWildlifeRoot : public ksys::act::ai::Ai {
-    SEAD_RTTI_OVERRIDE(SimpleWildlifeRoot, ksys::act::ai::Ai)
+class CapturedActorRoot : public ksys::act::ai::Ai {
+    SEAD_RTTI_OVERRIDE(CapturedActorRoot, ksys::act::ai::Ai)
 public:
-    explicit SimpleWildlifeRoot(const InitArg& arg);
-    ~SimpleWildlifeRoot() override;
+    explicit CapturedActorRoot(const InitArg& arg);
+    ~CapturedActorRoot() override;
 
     bool init_(sead::Heap* heap) override;
     void enter_(ksys::act::ai::InlineParamPack* params) override;

src/Game/Actor/AI/aiCheckLineOfSightSelector.cpp

@@ -0,0 +1,28 @@
+#include "Game/Actor/AI/aiCheckLineOfSightSelector.h"
+
+namespace uking::ai {
+
+CheckLineOfSightSelector::CheckLineOfSightSelector(const InitArg& arg) : ksys::act::ai::Ai(arg) {}
+
+CheckLineOfSightSelector::~CheckLineOfSightSelector() = default;
+
+bool CheckLineOfSightSelector::init_(sead::Heap* heap) {
+    return ksys::act::ai::Ai::init_(heap);
+}
+
+void CheckLineOfSightSelector::enter_(ksys::act::ai::InlineParamPack* params) {
+    ksys::act::ai::Ai::enter_(params);
+}
+
+void CheckLineOfSightSelector::leave_() {
+    ksys::act::ai::Ai::leave_();
+}
+
+void CheckLineOfSightSelector::loadParams_() {
+    getStaticParam(&mDirectionNum_s, "DirectionNum");
+    getStaticParam(&mDirectionAngle_s, "DirectionAngle");
+    getStaticParam(&mDistance_s, "Distance");
+    getStaticParam(&mRadiusScale_s, "RadiusScale");
+}
+
+}  // namespace uking::ai

src/Game/Actor/AI/aiCheckLineOfSightSelector.h

@@ -4,11 +4,11 @@
 
 namespace uking::ai {
 
-class HorseCheckLineOfSightSelectorBase : public ksys::act::ai::Ai {
-    SEAD_RTTI_OVERRIDE(HorseCheckLineOfSightSelectorBase, ksys::act::ai::Ai)
+class CheckLineOfSightSelector : public ksys::act::ai::Ai {
+    SEAD_RTTI_OVERRIDE(CheckLineOfSightSelector, ksys::act::ai::Ai)
 public:
-    explicit HorseCheckLineOfSightSelectorBase(const InitArg& arg);
-    ~HorseCheckLineOfSightSelectorBase() override;
+    explicit CheckLineOfSightSelector(const InitArg& arg);
+    ~CheckLineOfSightSelector() override;
 
     bool init_(sead::Heap* heap) override;
     void enter_(ksys::act::ai::InlineParamPack* params) override;

src/Game/Actor/AI/aiChildFavoriteSelector.cpp

@@ -2,24 +2,24 @@
 
 namespace uking::ai {
 
-ChildFavoriteSelector::ChildFavoriteSelector(const InitArg& arg) : ChildFavoriteSelectorBase(arg) {}
+ChildFavoriteSelector::ChildFavoriteSelector(const InitArg& arg) : ChildSelector(arg) {}
 
 ChildFavoriteSelector::~ChildFavoriteSelector() = default;
 
 bool ChildFavoriteSelector::init_(sead::Heap* heap) {
-    return ChildFavoriteSelectorBase::init_(heap);
+    return ChildSelector::init_(heap);
 }
 
 void ChildFavoriteSelector::enter_(ksys::act::ai::InlineParamPack* params) {
-    ChildFavoriteSelectorBase::enter_(params);
+    ChildSelector::enter_(params);
 }
 
 void ChildFavoriteSelector::leave_() {
-    ChildFavoriteSelectorBase::leave_();
+    ChildSelector::leave_();
 }
 
 void ChildFavoriteSelector::loadParams_() {
-    ChildFavoriteSelectorBase::loadParams_();
+    ChildSelector::loadParams_();
 }
 
 }  // namespace uking::ai

src/Game/Actor/AI/aiChildFavoriteSelector.h

@@ -1,12 +1,12 @@
 #pragma once
 
-#include "Game/Actor/AI/aiChildFavoriteSelectorBase.h"
+#include "Game/Actor/AI/aiChildSelector.h"
 #include "KingSystem/ActorSystem/actAiAi.h"
 
 namespace uking::ai {
 
-class ChildFavoriteSelector : public ChildFavoriteSelectorBase {
-    SEAD_RTTI_OVERRIDE(ChildFavoriteSelector, ChildFavoriteSelectorBase)
+class ChildFavoriteSelector : public ChildSelector {
+    SEAD_RTTI_OVERRIDE(ChildFavoriteSelector, ChildSelector)
 public:
     explicit ChildFavoriteSelector(const InitArg& arg);
     ~ChildFavoriteSelector() override;

src/Game/Actor/AI/aiChildFavoriteSelectorBase.cpp

@@ -1,26 +0,0 @@
-#include "Game/Actor/AI/aiChildFavoriteSelectorBase.h"
-
-namespace uking::ai {
-
-ChildFavoriteSelectorBase::ChildFavoriteSelectorBase(const InitArg& arg) : ksys::act::ai::Ai(arg) {}
-
-ChildFavoriteSelectorBase::~ChildFavoriteSelectorBase() = default;
-
-bool ChildFavoriteSelectorBase::init_(sead::Heap* heap) {
-    return ksys::act::ai::Ai::init_(heap);
-}
-
-void ChildFavoriteSelectorBase::enter_(ksys::act::ai::InlineParamPack* params) {
-    ksys::act::ai::Ai::enter_(params);
-}
-
-void ChildFavoriteSelectorBase::leave_() {
-    ksys::act::ai::Ai::leave_();
-}
-
-void ChildFavoriteSelectorBase::loadParams_() {
-    getStaticParam(&mIsNoChildForceEnd_s, "IsNoChildForceEnd");
-    getStaticParam(&mIsCheckEveryFrame_s, "IsCheckEveryFrame");
-}
-
-}  // namespace uking::ai

src/Game/Actor/AI/aiChildSelector.cpp

@@ -0,0 +1,26 @@
+#include "Game/Actor/AI/aiChildSelector.h"
+
+namespace uking::ai {
+
+ChildSelector::ChildSelector(const InitArg& arg) : ksys::act::ai::Ai(arg) {}
+
+ChildSelector::~ChildSelector() = default;
+
+bool ChildSelector::init_(sead::Heap* heap) {
+    return ksys::act::ai::Ai::init_(heap);
+}
+
+void ChildSelector::enter_(ksys::act::ai::InlineParamPack* params) {
+    ksys::act::ai::Ai::enter_(params);
+}
+
+void ChildSelector::leave_() {
+    ksys::act::ai::Ai::leave_();
+}
+
+void ChildSelector::loadParams_() {
+    getStaticParam(&mIsNoChildForceEnd_s, "IsNoChildForceEnd");
+    getStaticParam(&mIsCheckEveryFrame_s, "IsCheckEveryFrame");
+}
+
+}  // namespace uking::ai

src/Game/Actor/AI/aiChildSelector.h

@@ -4,11 +4,11 @@
 
 namespace uking::ai {
 
-class ChildFavoriteSelectorBase : public ksys::act::ai::Ai {
-    SEAD_RTTI_OVERRIDE(ChildFavoriteSelectorBase, ksys::act::ai::Ai)
+class ChildSelector : public ksys::act::ai::Ai {
+    SEAD_RTTI_OVERRIDE(ChildSelector, ksys::act::ai::Ai)
 public:
-    explicit ChildFavoriteSelectorBase(const InitArg& arg);
-    ~ChildFavoriteSelectorBase() override;
+    explicit ChildSelector(const InitArg& arg);
+    ~ChildSelector() override;
 
     bool init_(sead::Heap* heap) override;
     void enter_(ksys::act::ai::InlineParamPack* params) override;

src/Game/Actor/AI/aiCliffStopEnemyNormal.cpp

@@ -1,25 +1,24 @@
-#include "Game/Actor/AI/aiMimicCliffStopEnemyNormalBase.h"
+#include "Game/Actor/AI/aiCliffStopEnemyNormal.h"
 
 namespace uking::ai {
 
-MimicCliffStopEnemyNormalBase::MimicCliffStopEnemyNormalBase(const InitArg& arg)
-    : ksys::act::ai::Ai(arg) {}
+CliffStopEnemyNormal::CliffStopEnemyNormal(const InitArg& arg) : ksys::act::ai::Ai(arg) {}
 
-MimicCliffStopEnemyNormalBase::~MimicCliffStopEnemyNormalBase() = default;
+CliffStopEnemyNormal::~CliffStopEnemyNormal() = default;
 
-bool MimicCliffStopEnemyNormalBase::init_(sead::Heap* heap) {
+bool CliffStopEnemyNormal::init_(sead::Heap* heap) {
     return ksys::act::ai::Ai::init_(heap);
 }
 
-void MimicCliffStopEnemyNormalBase::enter_(ksys::act::ai::InlineParamPack* params) {
+void CliffStopEnemyNormal::enter_(ksys::act::ai::InlineParamPack* params) {
     ksys::act::ai::Ai::enter_(params);
 }
 
-void MimicCliffStopEnemyNormalBase::leave_() {
+void CliffStopEnemyNormal::leave_() {
     ksys::act::ai::Ai::leave_();
 }
 
-void MimicCliffStopEnemyNormalBase::loadParams_() {
+void CliffStopEnemyNormal::loadParams_() {
     getStaticParam(&mNoticeSoundTime_s, "NoticeSoundTime");
     getStaticParam(&mOffsetHand_s, "OffsetHand");
     getStaticParam(&mOffsetTail_s, "OffsetTail");

src/Game/Actor/AI/aiCliffStopEnemyNormal.h

@@ -4,11 +4,11 @@
 
 namespace uking::ai {
 
-class MimicCliffStopEnemyNormalBase : public ksys::act::ai::Ai {
-    SEAD_RTTI_OVERRIDE(MimicCliffStopEnemyNormalBase, ksys::act::ai::Ai)
+class CliffStopEnemyNormal : public ksys::act::ai::Ai {
+    SEAD_RTTI_OVERRIDE(CliffStopEnemyNormal, ksys::act::ai::Ai)
 public:
-    explicit MimicCliffStopEnemyNormalBase(const InitArg& arg);
-    ~MimicCliffStopEnemyNormalBase() override;
+    explicit CliffStopEnemyNormal(const InitArg& arg);
+    ~CliffStopEnemyNormal() override;
 
     bool init_(sead::Heap* heap) override;
     void enter_(ksys::act::ai::InlineParamPack* params) override;

src/Game/Actor/AI/aiControlRailRoot.cpp

@@ -0,0 +1,23 @@
+#include "Game/Actor/AI/aiControlRailRoot.h"
+
+namespace uking::ai {
+
+ControlRailRoot::ControlRailRoot(const InitArg& arg) : ksys::act::ai::Ai(arg) {}
+
+ControlRailRoot::~ControlRailRoot() = default;
+
+bool ControlRailRoot::init_(sead::Heap* heap) {
+    return ksys::act::ai::Ai::init_(heap);
+}
+
+void ControlRailRoot::enter_(ksys::act::ai::InlineParamPack* params) {
+    ksys::act::ai::Ai::enter_(params);
+}
+
+void ControlRailRoot::leave_() {
+    ksys::act::ai::Ai::leave_();
+}
+
+void ControlRailRoot::loadParams_() {}
+
+}  // namespace uking::ai

src/Game/Actor/AI/aiControlRailRoot.h

@@ -4,11 +4,11 @@
 
 namespace uking::ai {
 
-class DragonRootBase : public ksys::act::ai::Ai {
-    SEAD_RTTI_OVERRIDE(DragonRootBase, ksys::act::ai::Ai)
+class ControlRailRoot : public ksys::act::ai::Ai {
+    SEAD_RTTI_OVERRIDE(ControlRailRoot, ksys::act::ai::Ai)
 public:
-    explicit DragonRootBase(const InitArg& arg);
-    ~DragonRootBase() override;
+    explicit ControlRailRoot(const InitArg& arg);
+    ~ControlRailRoot() override;
 
     bool init_(sead::Heap* heap) override;
     void enter_(ksys::act::ai::InlineParamPack* params) override;

src/Game/Actor/AI/aiDragonRoot.cpp

@@ -2,24 +2,24 @@
 
 namespace uking::ai {
 
-DragonRoot::DragonRoot(const InitArg& arg) : DragonRootBase(arg) {}
+DragonRoot::DragonRoot(const InitArg& arg) : ControlRailRoot(arg) {}
 
 DragonRoot::~DragonRoot() = default;
 
 bool DragonRoot::init_(sead::Heap* heap) {
-    return DragonRootBase::init_(heap);
+    return ControlRailRoot::init_(heap);
 }
 
 void DragonRoot::enter_(ksys::act::ai::InlineParamPack* params) {
-    DragonRootBase::enter_(params);
+    ControlRailRoot::enter_(params);
 }
 
 void DragonRoot::leave_() {
-    DragonRootBase::leave_();
+    ControlRailRoot::leave_();
 }
 
 void DragonRoot::loadParams_() {
-    DragonRootBase::loadParams_();
+    ControlRailRoot::loadParams_();
     getStaticParam(&mChemicalBulletRate_s, "ChemicalBulletRate");
     getStaticParam(&mChemicalBulletNum_s, "ChemicalBulletNum");
     getStaticParam(&mUpdraftInterval_s, "UpdraftInterval");

src/Game/Actor/AI/aiDragonRoot.h

@@ -1,12 +1,12 @@
 #pragma once
 
-#include "Game/Actor/AI/aiDragonRootBase.h"
+#include "Game/Actor/AI/aiControlRailRoot.h"
 #include "KingSystem/ActorSystem/actAiAi.h"
 
 namespace uking::ai {
 
-class DragonRoot : public DragonRootBase {
-    SEAD_RTTI_OVERRIDE(DragonRoot, DragonRootBase)
+class DragonRoot : public ControlRailRoot {
+    SEAD_RTTI_OVERRIDE(DragonRoot, ControlRailRoot)
 public:
     explicit DragonRoot(const InitArg& arg);
     ~DragonRoot() override;

src/Game/Actor/AI/aiDragonRootBase.cpp

@@ -1,23 +0,0 @@
-#include "Game/Actor/AI/aiDragonRootBase.h"
-
-namespace uking::ai {
-
-DragonRootBase::DragonRootBase(const InitArg& arg) : ksys::act::ai::Ai(arg) {}
-
-DragonRootBase::~DragonRootBase() = default;
-
-bool DragonRootBase::init_(sead::Heap* heap) {
-    return ksys::act::ai::Ai::init_(heap);
-}
-
-void DragonRootBase::enter_(ksys::act::ai::InlineParamPack* params) {
-    ksys::act::ai::Ai::enter_(params);
-}
-
-void DragonRootBase::leave_() {
-    ksys::act::ai::Ai::leave_();
-}
-
-void DragonRootBase::loadParams_() {}
-
-}  // namespace uking::ai

src/Game/Actor/AI/aiDungeonRotateTag4FireApp.cpp

@@ -2,25 +2,24 @@
 
 namespace uking::ai {
 
-DungeonRotateTag4FireApp::DungeonRotateTag4FireApp(const InitArg& arg)
-    : WholeDungeonRotateTag(arg) {}
+DungeonRotateTag4FireApp::DungeonRotateTag4FireApp(const InitArg& arg) : DungeonRotateTagApp(arg) {}
 
 DungeonRotateTag4FireApp::~DungeonRotateTag4FireApp() = default;
 
 bool DungeonRotateTag4FireApp::init_(sead::Heap* heap) {
-    return WholeDungeonRotateTag::init_(heap);
+    return DungeonRotateTagApp::init_(heap);
 }
 
 void DungeonRotateTag4FireApp::enter_(ksys::act::ai::InlineParamPack* params) {
-    WholeDungeonRotateTag::enter_(params);
+    DungeonRotateTagApp::enter_(params);
 }
 
 void DungeonRotateTag4FireApp::leave_() {
-    WholeDungeonRotateTag::leave_();
+    DungeonRotateTagApp::leave_();
 }
 
 void DungeonRotateTag4FireApp::loadParams_() {
-    WholeDungeonRotateTag::loadParams_();
+    DungeonRotateTagApp::loadParams_();
 }
 
 }  // namespace uking::ai

src/Game/Actor/AI/aiDungeonRotateTag4FireApp.h

@@ -1,12 +1,12 @@
 #pragma once
 
-#include "Game/Actor/AI/aiWholeDungeonRotateTag.h"
+#include "Game/Actor/AI/aiDungeonRotateTagApp.h"
 #include "KingSystem/ActorSystem/actAiAi.h"
 
 namespace uking::ai {
 
-class DungeonRotateTag4FireApp : public WholeDungeonRotateTag {
-    SEAD_RTTI_OVERRIDE(DungeonRotateTag4FireApp, WholeDungeonRotateTag)
+class DungeonRotateTag4FireApp : public DungeonRotateTagApp {
+    SEAD_RTTI_OVERRIDE(DungeonRotateTag4FireApp, DungeonRotateTagApp)
 public:
     explicit DungeonRotateTag4FireApp(const InitArg& arg);
     ~DungeonRotateTag4FireApp() override;

src/Game/Actor/AI/aiDungeonRotateTag4WindApp.cpp

@@ -2,25 +2,24 @@
 
 namespace uking::ai {
 
-DungeonRotateTag4WindApp::DungeonRotateTag4WindApp(const InitArg& arg)
-    : WholeDungeonRotateTag(arg) {}
+DungeonRotateTag4WindApp::DungeonRotateTag4WindApp(const InitArg& arg) : DungeonRotateTagApp(arg) {}
 
 DungeonRotateTag4WindApp::~DungeonRotateTag4WindApp() = default;
 
 bool DungeonRotateTag4WindApp::init_(sead::Heap* heap) {
-    return WholeDungeonRotateTag::init_(heap);
+    return DungeonRotateTagApp::init_(heap);
 }
 
 void DungeonRotateTag4WindApp::enter_(ksys::act::ai::InlineParamPack* params) {
-    WholeDungeonRotateTag::enter_(params);
+    DungeonRotateTagApp::enter_(params);
 }
 
 void DungeonRotateTag4WindApp::leave_() {
-    WholeDungeonRotateTag::leave_();
+    DungeonRotateTagApp::leave_();
 }
 
 void DungeonRotateTag4WindApp::loadParams_() {
-    WholeDungeonRotateTag::loadParams_();
+    DungeonRotateTagApp::loadParams_();
 }
 
 }  // namespace uking::ai

src/Game/Actor/AI/aiDungeonRotateTag4WindApp.h

@@ -1,12 +1,12 @@
 #pragma once
 
-#include "Game/Actor/AI/aiWholeDungeonRotateTag.h"
+#include "Game/Actor/AI/aiDungeonRotateTagApp.h"
 #include "KingSystem/ActorSystem/actAiAi.h"
 
 namespace uking::ai {
 
-class DungeonRotateTag4WindApp : public WholeDungeonRotateTag {
-    SEAD_RTTI_OVERRIDE(DungeonRotateTag4WindApp, WholeDungeonRotateTag)
+class DungeonRotateTag4WindApp : public DungeonRotateTagApp {
+    SEAD_RTTI_OVERRIDE(DungeonRotateTag4WindApp, DungeonRotateTagApp)
 public:
     explicit DungeonRotateTag4WindApp(const InitArg& arg);
     ~DungeonRotateTag4WindApp() override;

src/Game/Actor/AI/aiDungeonRotateTagApp.cpp

@@ -0,0 +1,25 @@
+#include "Game/Actor/AI/aiDungeonRotateTagApp.h"
+
+namespace uking::ai {
+
+DungeonRotateTagApp::DungeonRotateTagApp(const InitArg& arg) : ksys::act::ai::Ai(arg) {}
+
+DungeonRotateTagApp::~DungeonRotateTagApp() = default;
+
+bool DungeonRotateTagApp::init_(sead::Heap* heap) {
+    return ksys::act::ai::Ai::init_(heap);
+}
+
+void DungeonRotateTagApp::enter_(ksys::act::ai::InlineParamPack* params) {
+    ksys::act::ai::Ai::enter_(params);
+}
+
+void DungeonRotateTagApp::leave_() {
+    ksys::act::ai::Ai::leave_();
+}
+
+void DungeonRotateTagApp::loadParams_() {
+    getMapUnitParam(&mTiltAngle_m, "TiltAngle");
+}
+
+}  // namespace uking::ai

src/Game/Actor/AI/aiDungeonRotateTagApp.h

@@ -4,11 +4,11 @@
 
 namespace uking::ai {
 
-class WholeDungeonRotateTag : public ksys::act::ai::Ai {
-    SEAD_RTTI_OVERRIDE(WholeDungeonRotateTag, ksys::act::ai::Ai)
+class DungeonRotateTagApp : public ksys::act::ai::Ai {
+    SEAD_RTTI_OVERRIDE(DungeonRotateTagApp, ksys::act::ai::Ai)
 public:
-    explicit WholeDungeonRotateTag(const InitArg& arg);
-    ~WholeDungeonRotateTag() override;
+    explicit DungeonRotateTagApp(const InitArg& arg);
+    ~DungeonRotateTagApp() override;
 
     bool init_(sead::Heap* heap) override;
     void enter_(ksys::act::ai::InlineParamPack* params) override;

src/Game/Actor/AI/aiEnemyChaseTargetAndAction.cpp

@@ -2,21 +2,20 @@
 
 namespace uking::ai {
 
-EnemyChaseTargetAndAction::EnemyChaseTargetAndAction(const InitArg& arg)
-    : UnarmedEnemySearch(arg) {}
+EnemyChaseTargetAndAction::EnemyChaseTargetAndAction(const InitArg& arg) : NavMove(arg) {}
 
 EnemyChaseTargetAndAction::~EnemyChaseTargetAndAction() = default;
 
 void EnemyChaseTargetAndAction::enter_(ksys::act::ai::InlineParamPack* params) {
-    UnarmedEnemySearch::enter_(params);
+    NavMove::enter_(params);
 }
 
 void EnemyChaseTargetAndAction::leave_() {
-    UnarmedEnemySearch::leave_();
+    NavMove::leave_();
 }
 
 void EnemyChaseTargetAndAction::loadParams_() {
-    UnarmedEnemySearch::loadParams_();
+    NavMove::loadParams_();
     getStaticParam(&mRepathTime_s, "RepathTime");
     getStaticParam(&mLostDist_s, "LostDist");
     getStaticParam(&mLostSpeed_s, "LostSpeed");

src/Game/Actor/AI/aiEnemyChaseTargetAndAction.h

@@ -1,12 +1,12 @@
 #pragma once
 
-#include "Game/Actor/AI/aiUnarmedEnemySearch.h"
+#include "Game/Actor/AI/aiNavMove.h"
 #include "KingSystem/ActorSystem/actAiAi.h"
 
 namespace uking::ai {
 
-class EnemyChaseTargetAndAction : public UnarmedEnemySearch {
-    SEAD_RTTI_OVERRIDE(EnemyChaseTargetAndAction, UnarmedEnemySearch)
+class EnemyChaseTargetAndAction : public NavMove {
+    SEAD_RTTI_OVERRIDE(EnemyChaseTargetAndAction, NavMove)
 public:
     explicit EnemyChaseTargetAndAction(const InitArg& arg);
     ~EnemyChaseTargetAndAction() override;

src/Game/Actor/AI/aiEnemyChemTargetAction.cpp

@@ -2,24 +2,24 @@
 
 namespace uking::ai {
 
-EnemyChemTargetAction::EnemyChemTargetAction(const InitArg& arg) : EnemyChemTargetActionBase(arg) {}
+EnemyChemTargetAction::EnemyChemTargetAction(const InitArg& arg) : EnemyTargetAction(arg) {}
 
 EnemyChemTargetAction::~EnemyChemTargetAction() = default;
 
 bool EnemyChemTargetAction::init_(sead::Heap* heap) {
-    return EnemyChemTargetActionBase::init_(heap);
+    return EnemyTargetAction::init_(heap);
 }
 
 void EnemyChemTargetAction::enter_(ksys::act::ai::InlineParamPack* params) {
-    EnemyChemTargetActionBase::enter_(params);
+    EnemyTargetAction::enter_(params);
 }
 
 void EnemyChemTargetAction::leave_() {
-    EnemyChemTargetActionBase::leave_();
+    EnemyTargetAction::leave_();
 }
 
 void EnemyChemTargetAction::loadParams_() {
-    EnemyChemTargetActionBase::loadParams_();
+    EnemyTargetAction::loadParams_();
     getDynamicParam(&mTargetActor_d, "TargetActor");
 }
 

src/Game/Actor/AI/aiEnemyChemTargetAction.h

@@ -1,12 +1,12 @@
 #pragma once
 
-#include "Game/Actor/AI/aiEnemyChemTargetActionBase.h"
+#include "Game/Actor/AI/aiEnemyTargetAction.h"
 #include "KingSystem/ActorSystem/actAiAi.h"
 
 namespace uking::ai {
 
-class EnemyChemTargetAction : public EnemyChemTargetActionBase {
-    SEAD_RTTI_OVERRIDE(EnemyChemTargetAction, EnemyChemTargetActionBase)
+class EnemyChemTargetAction : public EnemyTargetAction {
+    SEAD_RTTI_OVERRIDE(EnemyChemTargetAction, EnemyTargetAction)
 public:
     explicit EnemyChemTargetAction(const InitArg& arg);
     ~EnemyChemTargetAction() override;

src/Game/Actor/AI/aiEnemyChemTargetActionBase.cpp

@@ -1,26 +0,0 @@
-#include "Game/Actor/AI/aiEnemyChemTargetActionBase.h"
-
-namespace uking::ai {
-
-EnemyChemTargetActionBase::EnemyChemTargetActionBase(const InitArg& arg) : ksys::act::ai::Ai(arg) {}
-
-bool EnemyChemTargetActionBase::init_(sead::Heap* heap) {
-    return ksys::act::ai::Ai::init_(heap);
-}
-
-void EnemyChemTargetActionBase::enter_(ksys::act::ai::InlineParamPack* params) {
-    ksys::act::ai::Ai::enter_(params);
-}
-
-void EnemyChemTargetActionBase::leave_() {
-    ksys::act::ai::Ai::leave_();
-}
-
-void EnemyChemTargetActionBase::loadParams_() {
-    getStaticParam(&mWeaponIdx_s, "WeaponIdx");
-    getStaticParam(&mActionDist_s, "ActionDist");
-    getStaticParam(&mActionDir_s, "ActionDir");
-    getDynamicParam(&mTargetPos_d, "TargetPos");
-}
-
-}  // namespace uking::ai

src/Game/Actor/AI/aiEnemyHorseRide.cpp

@@ -2,24 +2,24 @@
 
 namespace uking::ai {
 
-EnemyHorseRide::EnemyHorseRide(const InitArg& arg) : NonPlayerHorseRide(arg) {}
+EnemyHorseRide::EnemyHorseRide(const InitArg& arg) : RideHorseNonPlayer(arg) {}
 
 EnemyHorseRide::~EnemyHorseRide() = default;
 
 bool EnemyHorseRide::init_(sead::Heap* heap) {
-    return NonPlayerHorseRide::init_(heap);
+    return RideHorseNonPlayer::init_(heap);
 }
 
 void EnemyHorseRide::enter_(ksys::act::ai::InlineParamPack* params) {
-    NonPlayerHorseRide::enter_(params);
+    RideHorseNonPlayer::enter_(params);
 }
 
 void EnemyHorseRide::leave_() {
-    NonPlayerHorseRide::leave_();
+    RideHorseNonPlayer::leave_();
 }
 
 void EnemyHorseRide::loadParams_() {
-    NonPlayerHorseRide::loadParams_();
+    RideHorseNonPlayer::loadParams_();
     getStaticParam(&mUpperBodyASSlot_s, "UpperBodyASSlot");
     getStaticParam(&mLowerBodyASSlot_s, "LowerBodyASSlot");
 }

src/Game/Actor/AI/aiEnemyHorseRide.h

@@ -1,12 +1,12 @@
 #pragma once
 
-#include "Game/Actor/Horse/AI/aiNonPlayerHorseRide.h"
+#include "Game/Actor/Horse/AI/aiRideHorseNonPlayer.h"
 #include "KingSystem/ActorSystem/actAiAi.h"
 
 namespace uking::ai {
 
-class EnemyHorseRide : public NonPlayerHorseRide {
-    SEAD_RTTI_OVERRIDE(EnemyHorseRide, NonPlayerHorseRide)
+class EnemyHorseRide : public RideHorseNonPlayer {
+    SEAD_RTTI_OVERRIDE(EnemyHorseRide, RideHorseNonPlayer)
 public:
     explicit EnemyHorseRide(const InitArg& arg);
     ~EnemyHorseRide() override;

src/Game/Actor/AI/aiEnemySearch.cpp

@@ -0,0 +1,27 @@
+#include "Game/Actor/AI/aiEnemySearch.h"
+
+namespace uking::ai {
+
+EnemySearch::EnemySearch(const InitArg& arg) : NavMove(arg) {}
+
+EnemySearch::~EnemySearch() = default;
+
+void EnemySearch::enter_(ksys::act::ai::InlineParamPack* params) {
+    NavMove::enter_(params);
+}
+
+void EnemySearch::leave_() {
+    NavMove::leave_();
+}
+
+void EnemySearch::loadParams_() {
+    NavMove::loadParams_();
+    getStaticParam(&mEquipItemSearchIdx_s, "EquipItemSearchIdx");
+    getStaticParam(&mRepathTime_s, "RepathTime");
+    getStaticParam(&mSearchDist_s, "SearchDist");
+    getStaticParam(&mSearchAng_s, "SearchAng");
+    getStaticParam(&mIsUseSight_s, "IsUseSight");
+    getStaticParam(&mLineReachableWeaponDist_s, "LineReachableWeaponDist");
+}
+
+}  // namespace uking::ai

src/Game/Actor/AI/aiEnemySearch.h

@@ -1,15 +1,15 @@
 #pragma once
 
-#include "Game/Actor/AI/aiUnarmedEnemySearch.h"
+#include "Game/Actor/AI/aiNavMove.h"
 #include "KingSystem/ActorSystem/actAiAi.h"
 
 namespace uking::ai {
 
-class UnarmedEnemySearchWeapon : public UnarmedEnemySearch {
-    SEAD_RTTI_OVERRIDE(UnarmedEnemySearchWeapon, UnarmedEnemySearch)
+class EnemySearch : public NavMove {
+    SEAD_RTTI_OVERRIDE(EnemySearch, NavMove)
 public:
-    explicit UnarmedEnemySearchWeapon(const InitArg& arg);
-    ~UnarmedEnemySearchWeapon() override;
+    explicit EnemySearch(const InitArg& arg);
+    ~EnemySearch() override;
 
     void enter_(ksys::act::ai::InlineParamPack* params) override;
     void leave_() override;

src/Game/Actor/AI/aiEnemyTargetAction.cpp

@@ -0,0 +1,26 @@
+#include "Game/Actor/AI/aiEnemyTargetAction.h"
+
+namespace uking::ai {
+
+EnemyTargetAction::EnemyTargetAction(const InitArg& arg) : ksys::act::ai::Ai(arg) {}
+
+bool EnemyTargetAction::init_(sead::Heap* heap) {
+    return ksys::act::ai::Ai::init_(heap);
+}
+
+void EnemyTargetAction::enter_(ksys::act::ai::InlineParamPack* params) {
+    ksys::act::ai::Ai::enter_(params);
+}
+
+void EnemyTargetAction::leave_() {
+    ksys::act::ai::Ai::leave_();
+}
+
+void EnemyTargetAction::loadParams_() {
+    getStaticParam(&mWeaponIdx_s, "WeaponIdx");
+    getStaticParam(&mActionDist_s, "ActionDist");
+    getStaticParam(&mActionDir_s, "ActionDir");
+    getDynamicParam(&mTargetPos_d, "TargetPos");
+}
+
+}  // namespace uking::ai

src/Game/Actor/AI/aiEnemyTargetAction.h

@@ -4,10 +4,10 @@
 
 namespace uking::ai {
 
-class EnemyChemTargetActionBase : public ksys::act::ai::Ai {
-    SEAD_RTTI_OVERRIDE(EnemyChemTargetActionBase, ksys::act::ai::Ai)
+class EnemyTargetAction : public ksys::act::ai::Ai {
+    SEAD_RTTI_OVERRIDE(EnemyTargetAction, ksys::act::ai::Ai)
 public:
-    explicit EnemyChemTargetActionBase(const InitArg& arg);
+    explicit EnemyTargetAction(const InitArg& arg);
 
     bool init_(sead::Heap* heap) override;
     void enter_(ksys::act::ai::InlineParamPack* params) override;

src/Game/Actor/AI/aiEquipShieldEnemySearchWeapon.cpp

@@ -2,21 +2,20 @@
 
 namespace uking::ai {
 
-EquipShieldEnemySearchWeapon::EquipShieldEnemySearchWeapon(const InitArg& arg)
-    : UnarmedEnemySearchWeapon(arg) {}
+EquipShieldEnemySearchWeapon::EquipShieldEnemySearchWeapon(const InitArg& arg) : EnemySearch(arg) {}
 
 EquipShieldEnemySearchWeapon::~EquipShieldEnemySearchWeapon() = default;
 
 void EquipShieldEnemySearchWeapon::enter_(ksys::act::ai::InlineParamPack* params) {
-    UnarmedEnemySearchWeapon::enter_(params);
+    EnemySearch::enter_(params);
 }
 
 void EquipShieldEnemySearchWeapon::leave_() {
-    UnarmedEnemySearchWeapon::leave_();
+    EnemySearch::leave_();
 }
 
 void EquipShieldEnemySearchWeapon::loadParams_() {
-    UnarmedEnemySearchWeapon::loadParams_();
+    EnemySearch::loadParams_();
 }
 
 }  // namespace uking::ai

src/Game/Actor/AI/aiEquipShieldEnemySearchWeapon.h

@@ -1,12 +1,12 @@
 #pragma once
 
-#include "Game/Actor/AI/aiUnarmedEnemySearchWeapon.h"
+#include "Game/Actor/AI/aiEnemySearch.h"
 #include "KingSystem/ActorSystem/actAiAi.h"
 
 namespace uking::ai {
 
-class EquipShieldEnemySearchWeapon : public UnarmedEnemySearchWeapon {
-    SEAD_RTTI_OVERRIDE(EquipShieldEnemySearchWeapon, UnarmedEnemySearchWeapon)
+class EquipShieldEnemySearchWeapon : public EnemySearch {
+    SEAD_RTTI_OVERRIDE(EquipShieldEnemySearchWeapon, EnemySearch)
 public:
     explicit EquipShieldEnemySearchWeapon(const InitArg& arg);
     ~EquipShieldEnemySearchWeapon() override;

src/Game/Actor/AI/aiFishRoot.cpp

@@ -2,24 +2,24 @@
 
 namespace uking::ai {
 
-FishRoot::FishRoot(const InitArg& arg) : SimpleWildlifeRoot(arg) {}
+FishRoot::FishRoot(const InitArg& arg) : CapturedActorRoot(arg) {}
 
 FishRoot::~FishRoot() = default;
 
 bool FishRoot::init_(sead::Heap* heap) {
-    return SimpleWildlifeRoot::init_(heap);
+    return CapturedActorRoot::init_(heap);
 }
 
 void FishRoot::enter_(ksys::act::ai::InlineParamPack* params) {
-    SimpleWildlifeRoot::enter_(params);
+    CapturedActorRoot::enter_(params);
 }
 
 void FishRoot::leave_() {
-    SimpleWildlifeRoot::leave_();
+    CapturedActorRoot::leave_();
 }
 
 void FishRoot::loadParams_() {
-    SimpleWildlifeRoot::loadParams_();
+    CapturedActorRoot::loadParams_();
     getStaticParam(&mInWaterDepth_s, "InWaterDepth");
     getStaticParam(&mOnGroundDepth_s, "OnGroundDepth");
     getStaticParam(&mNextJumpTimeBase_s, "NextJumpTimeBase");

src/Game/Actor/AI/aiFishRoot.h

@@ -1,12 +1,12 @@
 #pragma once
 
-#include "Game/Actor/AI/aiSimpleWildlifeRoot.h"
+#include "Game/Actor/AI/aiCapturedActorRoot.h"
 #include "KingSystem/ActorSystem/actAiAi.h"
 
 namespace uking::ai {
 
-class FishRoot : public SimpleWildlifeRoot {
-    SEAD_RTTI_OVERRIDE(FishRoot, SimpleWildlifeRoot)
+class FishRoot : public CapturedActorRoot {
+    SEAD_RTTI_OVERRIDE(FishRoot, CapturedActorRoot)
 public:
     explicit FishRoot(const InitArg& arg);
     ~FishRoot() override;

src/Game/Actor/AI/aiFlyingEnemyBackKeepMove.cpp

@@ -2,24 +2,25 @@
 
 namespace uking::ai {
 
-FlyingEnemyBackKeepMove::FlyingEnemyBackKeepMove(const InitArg& arg) : FlyingEnemyKeepMove(arg) {}
+FlyingEnemyBackKeepMove::FlyingEnemyBackKeepMove(const InitArg& arg)
+    : FlyingEnemyDistanceKeepMove(arg) {}
 
 FlyingEnemyBackKeepMove::~FlyingEnemyBackKeepMove() = default;
 
 bool FlyingEnemyBackKeepMove::init_(sead::Heap* heap) {
-    return FlyingEnemyKeepMove::init_(heap);
+    return FlyingEnemyDistanceKeepMove::init_(heap);
 }
 
 void FlyingEnemyBackKeepMove::enter_(ksys::act::ai::InlineParamPack* params) {
-    FlyingEnemyKeepMove::enter_(params);
+    FlyingEnemyDistanceKeepMove::enter_(params);
 }
 
 void FlyingEnemyBackKeepMove::leave_() {
-    FlyingEnemyKeepMove::leave_();
+    FlyingEnemyDistanceKeepMove::leave_();
 }
 
 void FlyingEnemyBackKeepMove::loadParams_() {
-    FlyingEnemyKeepMove::loadParams_();
+    FlyingEnemyDistanceKeepMove::loadParams_();
 }
 
 }  // namespace uking::ai

src/Game/Actor/AI/aiFlyingEnemyBackKeepMove.h

@@ -1,12 +1,12 @@
 #pragma once
 
-#include "Game/Actor/AI/aiFlyingEnemyKeepMove.h"
+#include "Game/Actor/AI/aiFlyingEnemyDistanceKeepMove.h"
 #include "KingSystem/ActorSystem/actAiAi.h"
 
 namespace uking::ai {
 
-class FlyingEnemyBackKeepMove : public FlyingEnemyKeepMove {
-    SEAD_RTTI_OVERRIDE(FlyingEnemyBackKeepMove, FlyingEnemyKeepMove)
+class FlyingEnemyBackKeepMove : public FlyingEnemyDistanceKeepMove {
+    SEAD_RTTI_OVERRIDE(FlyingEnemyBackKeepMove, FlyingEnemyDistanceKeepMove)
 public:
     explicit FlyingEnemyBackKeepMove(const InitArg& arg);
     ~FlyingEnemyBackKeepMove() override;

src/Game/Actor/AI/aiFlyingEnemyDistanceKeepMove.cpp

@@ -1,24 +1,25 @@
-#include "Game/Actor/AI/aiFlyingEnemyKeepMove.h"
+#include "Game/Actor/AI/aiFlyingEnemyDistanceKeepMove.h"
 
 namespace uking::ai {
 
-FlyingEnemyKeepMove::FlyingEnemyKeepMove(const InitArg& arg) : ksys::act::ai::Ai(arg) {}
+FlyingEnemyDistanceKeepMove::FlyingEnemyDistanceKeepMove(const InitArg& arg)
+    : ksys::act::ai::Ai(arg) {}
 
-FlyingEnemyKeepMove::~FlyingEnemyKeepMove() = default;
+FlyingEnemyDistanceKeepMove::~FlyingEnemyDistanceKeepMove() = default;
 
-bool FlyingEnemyKeepMove::init_(sead::Heap* heap) {
+bool FlyingEnemyDistanceKeepMove::init_(sead::Heap* heap) {
     return ksys::act::ai::Ai::init_(heap);
 }
 
-void FlyingEnemyKeepMove::enter_(ksys::act::ai::InlineParamPack* params) {
+void FlyingEnemyDistanceKeepMove::enter_(ksys::act::ai::InlineParamPack* params) {
     ksys::act::ai::Ai::enter_(params);
 }
 
-void FlyingEnemyKeepMove::leave_() {
+void FlyingEnemyDistanceKeepMove::leave_() {
     ksys::act::ai::Ai::leave_();
 }
 
-void FlyingEnemyKeepMove::loadParams_() {
+void FlyingEnemyDistanceKeepMove::loadParams_() {
     getStaticParam(&mLostDistance_s, "LostDistance");
     getStaticParam(&mAngleRange_s, "AngleRange");
     getStaticParam(&mSpaceDistance_s, "SpaceDistance");

src/Game/Actor/AI/aiFlyingEnemyDistanceKeepMove.h

@@ -4,11 +4,11 @@
 
 namespace uking::ai {
 
-class FlyingEnemyKeepMove : public ksys::act::ai::Ai {
-    SEAD_RTTI_OVERRIDE(FlyingEnemyKeepMove, ksys::act::ai::Ai)
+class FlyingEnemyDistanceKeepMove : public ksys::act::ai::Ai {
+    SEAD_RTTI_OVERRIDE(FlyingEnemyDistanceKeepMove, ksys::act::ai::Ai)
 public:
-    explicit FlyingEnemyKeepMove(const InitArg& arg);
-    ~FlyingEnemyKeepMove() override;
+    explicit FlyingEnemyDistanceKeepMove(const InitArg& arg);
+    ~FlyingEnemyDistanceKeepMove() override;
 
     bool init_(sead::Heap* heap) override;
     void enter_(ksys::act::ai::InlineParamPack* params) override;

src/Game/Actor/AI/aiFlyingEnemyFrontKeepMove.cpp

@@ -2,24 +2,25 @@
 
 namespace uking::ai {
 
-FlyingEnemyFrontKeepMove::FlyingEnemyFrontKeepMove(const InitArg& arg) : FlyingEnemyKeepMove(arg) {}
+FlyingEnemyFrontKeepMove::FlyingEnemyFrontKeepMove(const InitArg& arg)
+    : FlyingEnemyDistanceKeepMove(arg) {}
 
 FlyingEnemyFrontKeepMove::~FlyingEnemyFrontKeepMove() = default;
 
 bool FlyingEnemyFrontKeepMove::init_(sead::Heap* heap) {
-    return FlyingEnemyKeepMove::init_(heap);
+    return FlyingEnemyDistanceKeepMove::init_(heap);
 }
 
 void FlyingEnemyFrontKeepMove::enter_(ksys::act::ai::InlineParamPack* params) {
-    FlyingEnemyKeepMove::enter_(params);
+    FlyingEnemyDistanceKeepMove::enter_(params);
 }
 
 void FlyingEnemyFrontKeepMove::leave_() {
-    FlyingEnemyKeepMove::leave_();
+    FlyingEnemyDistanceKeepMove::leave_();
 }
 
 void FlyingEnemyFrontKeepMove::loadParams_() {
-    FlyingEnemyKeepMove::loadParams_();
+    FlyingEnemyDistanceKeepMove::loadParams_();
 }
 
 }  // namespace uking::ai

src/Game/Actor/AI/aiFlyingEnemyFrontKeepMove.h

@@ -1,12 +1,12 @@
 #pragma once
 
-#include "Game/Actor/AI/aiFlyingEnemyKeepMove.h"
+#include "Game/Actor/AI/aiFlyingEnemyDistanceKeepMove.h"
 #include "KingSystem/ActorSystem/actAiAi.h"
 
 namespace uking::ai {
 
-class FlyingEnemyFrontKeepMove : public FlyingEnemyKeepMove {
-    SEAD_RTTI_OVERRIDE(FlyingEnemyFrontKeepMove, FlyingEnemyKeepMove)
+class FlyingEnemyFrontKeepMove : public FlyingEnemyDistanceKeepMove {
+    SEAD_RTTI_OVERRIDE(FlyingEnemyFrontKeepMove, FlyingEnemyDistanceKeepMove)
 public:
     explicit FlyingEnemyFrontKeepMove(const InitArg& arg);
     ~FlyingEnemyFrontKeepMove() override;

src/Game/Actor/AI/aiFlyingEnemySideKeepMove.cpp

@@ -2,24 +2,25 @@
 
 namespace uking::ai {
 
-FlyingEnemySideKeepMove::FlyingEnemySideKeepMove(const InitArg& arg) : FlyingEnemyKeepMove(arg) {}
+FlyingEnemySideKeepMove::FlyingEnemySideKeepMove(const InitArg& arg)
+    : FlyingEnemyDistanceKeepMove(arg) {}
 
 FlyingEnemySideKeepMove::~FlyingEnemySideKeepMove() = default;
 
 bool FlyingEnemySideKeepMove::init_(sead::Heap* heap) {
-    return FlyingEnemyKeepMove::init_(heap);
+    return FlyingEnemyDistanceKeepMove::init_(heap);
 }
 
 void FlyingEnemySideKeepMove::enter_(ksys::act::ai::InlineParamPack* params) {
-    FlyingEnemyKeepMove::enter_(params);
+    FlyingEnemyDistanceKeepMove::enter_(params);
 }
 
 void FlyingEnemySideKeepMove::leave_() {
-    FlyingEnemyKeepMove::leave_();
+    FlyingEnemyDistanceKeepMove::leave_();
 }
 
 void FlyingEnemySideKeepMove::loadParams_() {
-    FlyingEnemyKeepMove::loadParams_();
+    FlyingEnemyDistanceKeepMove::loadParams_();
     getStaticParam(&mSideDirType_s, "SideDirType");
 }
 

src/Game/Actor/AI/aiFlyingEnemySideKeepMove.h

@@ -1,12 +1,12 @@
 #pragma once
 
-#include "Game/Actor/AI/aiFlyingEnemyKeepMove.h"
+#include "Game/Actor/AI/aiFlyingEnemyDistanceKeepMove.h"
 #include "KingSystem/ActorSystem/actAiAi.h"
 
 namespace uking::ai {
 
-class FlyingEnemySideKeepMove : public FlyingEnemyKeepMove {
-    SEAD_RTTI_OVERRIDE(FlyingEnemySideKeepMove, FlyingEnemyKeepMove)
+class FlyingEnemySideKeepMove : public FlyingEnemyDistanceKeepMove {
+    SEAD_RTTI_OVERRIDE(FlyingEnemySideKeepMove, FlyingEnemyDistanceKeepMove)
 public:
     explicit FlyingEnemySideKeepMove(const InitArg& arg);
     ~FlyingEnemySideKeepMove() override;

src/Game/Actor/AI/aiForestGiantFindPlayer.cpp

@@ -2,24 +2,24 @@
 
 namespace uking::ai {
 
-ForestGiantFindPlayer::ForestGiantFindPlayer(const InitArg& arg) : LargeEnemyFindPlayer(arg) {}
+ForestGiantFindPlayer::ForestGiantFindPlayer(const InitArg& arg) : GiantEnemyFindPlayer(arg) {}
 
 ForestGiantFindPlayer::~ForestGiantFindPlayer() = default;
 
 bool ForestGiantFindPlayer::init_(sead::Heap* heap) {
-    return LargeEnemyFindPlayer::init_(heap);
+    return GiantEnemyFindPlayer::init_(heap);
 }
 
 void ForestGiantFindPlayer::enter_(ksys::act::ai::InlineParamPack* params) {
-    LargeEnemyFindPlayer::enter_(params);
+    GiantEnemyFindPlayer::enter_(params);
 }
 
 void ForestGiantFindPlayer::leave_() {
-    LargeEnemyFindPlayer::leave_();
+    GiantEnemyFindPlayer::leave_();
 }
 
 void ForestGiantFindPlayer::loadParams_() {
-    LargeEnemyFindPlayer::loadParams_();
+    GiantEnemyFindPlayer::loadParams_();
 }
 
 }  // namespace uking::ai

src/Game/Actor/AI/aiForestGiantFindPlayer.h

@@ -1,12 +1,12 @@
 #pragma once
 
-#include "Game/Actor/AI/aiLargeEnemyFindPlayer.h"
+#include "Game/Actor/AI/aiGiantEnemyFindPlayer.h"
 #include "KingSystem/ActorSystem/actAiAi.h"
 
 namespace uking::ai {
 
-class ForestGiantFindPlayer : public LargeEnemyFindPlayer {
-    SEAD_RTTI_OVERRIDE(ForestGiantFindPlayer, LargeEnemyFindPlayer)
+class ForestGiantFindPlayer : public GiantEnemyFindPlayer {
+    SEAD_RTTI_OVERRIDE(ForestGiantFindPlayer, GiantEnemyFindPlayer)
 public:
     explicit ForestGiantFindPlayer(const InitArg& arg);
     ~ForestGiantFindPlayer() override;

src/Game/Actor/AI/aiGanonFlameBall.cpp

@@ -1,25 +1,24 @@
-#include "Game/Actor/AI/aiSiteBossChemicalProjectile.h"
+#include "Game/Actor/AI/aiGanonFlameBall.h"
 
 namespace uking::ai {
 
-SiteBossChemicalProjectile::SiteBossChemicalProjectile(const InitArg& arg)
-    : ksys::act::ai::Ai(arg) {}
+GanonFlameBall::GanonFlameBall(const InitArg& arg) : ksys::act::ai::Ai(arg) {}
 
-SiteBossChemicalProjectile::~SiteBossChemicalProjectile() = default;
+GanonFlameBall::~GanonFlameBall() = default;
 
-bool SiteBossChemicalProjectile::init_(sead::Heap* heap) {
+bool GanonFlameBall::init_(sead::Heap* heap) {
     return ksys::act::ai::Ai::init_(heap);
 }
 
-void SiteBossChemicalProjectile::enter_(ksys::act::ai::InlineParamPack* params) {
+void GanonFlameBall::enter_(ksys::act::ai::InlineParamPack* params) {
     ksys::act::ai::Ai::enter_(params);
 }
 
-void SiteBossChemicalProjectile::leave_() {
+void GanonFlameBall::leave_() {
     ksys::act::ai::Ai::leave_();
 }
 
-void SiteBossChemicalProjectile::loadParams_() {
+void GanonFlameBall::loadParams_() {
     getStaticParam(&mExplosionTime_s, "ExplosionTime");
     getStaticParam(&mChaseAngleLimit_s, "ChaseAngleLimit");
     getStaticParam(&mReflectSpeedRate_s, "ReflectSpeedRate");

src/Game/Actor/AI/aiGanonFlameBall.h

@@ -4,11 +4,11 @@
 
 namespace uking::ai {
 
-class SiteBossChemicalProjectile : public ksys::act::ai::Ai {
-    SEAD_RTTI_OVERRIDE(SiteBossChemicalProjectile, ksys::act::ai::Ai)
+class GanonFlameBall : public ksys::act::ai::Ai {
+    SEAD_RTTI_OVERRIDE(GanonFlameBall, ksys::act::ai::Ai)
 public:
-    explicit SiteBossChemicalProjectile(const InitArg& arg);
-    ~SiteBossChemicalProjectile() override;
+    explicit GanonFlameBall(const InitArg& arg);
+    ~GanonFlameBall() override;
 
     bool init_(sead::Heap* heap) override;
     void enter_(ksys::act::ai::InlineParamPack* params) override;

src/Game/Actor/AI/aiGiantEnemyFindPlayer.cpp

@@ -0,0 +1,25 @@
+#include "Game/Actor/AI/aiGiantEnemyFindPlayer.h"
+
+namespace uking::ai {
+
+GiantEnemyFindPlayer::GiantEnemyFindPlayer(const InitArg& arg) : EnemyBaseFindPlayer(arg) {}
+
+GiantEnemyFindPlayer::~GiantEnemyFindPlayer() = default;
+
+bool GiantEnemyFindPlayer::init_(sead::Heap* heap) {
+    return EnemyBaseFindPlayer::init_(heap);
+}
+
+void GiantEnemyFindPlayer::enter_(ksys::act::ai::InlineParamPack* params) {
+    EnemyBaseFindPlayer::enter_(params);
+}
+
+void GiantEnemyFindPlayer::leave_() {
+    EnemyBaseFindPlayer::leave_();
+}
+
+void GiantEnemyFindPlayer::loadParams_() {
+    EnemyBaseFindPlayer::loadParams_();
+}
+
+}  // namespace uking::ai

src/Game/Actor/AI/aiGiantEnemyFindPlayer.h

@@ -5,11 +5,11 @@
 
 namespace uking::ai {
 
-class LargeEnemyFindPlayer : public EnemyBaseFindPlayer {
-    SEAD_RTTI_OVERRIDE(LargeEnemyFindPlayer, EnemyBaseFindPlayer)
+class GiantEnemyFindPlayer : public EnemyBaseFindPlayer {
+    SEAD_RTTI_OVERRIDE(GiantEnemyFindPlayer, EnemyBaseFindPlayer)
 public:
-    explicit LargeEnemyFindPlayer(const InitArg& arg);
-    ~LargeEnemyFindPlayer() override;
+    explicit GiantEnemyFindPlayer(const InitArg& arg);
+    ~GiantEnemyFindPlayer() override;
 
     bool init_(sead::Heap* heap) override;
     void enter_(ksys::act::ai::InlineParamPack* params) override;

src/Game/Actor/AI/aiGiantSleepNormal.cpp

@@ -2,24 +2,24 @@
 
 namespace uking::ai {
 
-GiantSleepNormal::GiantSleepNormal(const InitArg& arg) : SpecialEnemySleep(arg) {}
+GiantSleepNormal::GiantSleepNormal(const InitArg& arg) : SleepNormal(arg) {}
 
 GiantSleepNormal::~GiantSleepNormal() = default;
 
 bool GiantSleepNormal::init_(sead::Heap* heap) {
-    return SpecialEnemySleep::init_(heap);
+    return SleepNormal::init_(heap);
 }
 
 void GiantSleepNormal::enter_(ksys::act::ai::InlineParamPack* params) {
-    SpecialEnemySleep::enter_(params);
+    SleepNormal::enter_(params);
 }
 
 void GiantSleepNormal::leave_() {
-    SpecialEnemySleep::leave_();
+    SleepNormal::leave_();
 }
 
 void GiantSleepNormal::loadParams_() {
-    SpecialEnemySleep::loadParams_();
+    SleepNormal::loadParams_();
     getStaticParam(&mForceAwakeDist_s, "ForceAwakeDist");
     getStaticParam(&mAwakeRbName_s, "AwakeRbName");
 }

src/Game/Actor/AI/aiGiantSleepNormal.h

@@ -1,12 +1,12 @@
 #pragma once
 
-#include "Game/Actor/AI/aiSpecialEnemySleep.h"
+#include "Game/Actor/AI/aiSleepNormal.h"
 #include "KingSystem/ActorSystem/actAiAi.h"
 
 namespace uking::ai {
 
-class GiantSleepNormal : public SpecialEnemySleep {
-    SEAD_RTTI_OVERRIDE(GiantSleepNormal, SpecialEnemySleep)
+class GiantSleepNormal : public SleepNormal {
+    SEAD_RTTI_OVERRIDE(GiantSleepNormal, SleepNormal)
 public:
     explicit GiantSleepNormal(const InitArg& arg);
     ~GiantSleepNormal() override;