diff --git a/data/aidef_action_params.yml b/data/aidef_action_params.yml index bb0a17e2..ee7479b2 100644 --- a/data/aidef_action_params.yml +++ b/data/aidef_action_params.yml @@ -116,9 +116,7 @@ AnchorSummon: - {type: dynamic_param, param_type: 'sead::SafeString*', param_name: SummonActor, param_offset: 0x40} - {type: dynamic_param, param_type: 'sead::SafeString*', param_name: SummonActorEquip1, param_offset: 0x50} - {type: dynamic_param, param_type: 'sead::SafeString*', param_name: SummonActorEquip2, param_offset: 0x60} -ActionWithAS: -- {type: static_param, param_type: const float*, param_name: PosReduceRatio, param_offset: 0x20} -- {type: static_param, param_type: const float*, param_name: AngReduceRatio, param_offset: 0x28} +ActionWithAS: [] Angry: - {type: call, fn: _ZN5uking6action22ActionWithPosAngReduce11loadParams_Ev, addr: 0x710027e3ec} AnimMatrixDriven: @@ -292,16 +290,7 @@ TakeHitImpactForce: - {type: static_param, param_type: const float*, param_name: VelReduce, param_offset: 0x20} - {type: static_param, param_type: const float*, param_name: HighSpeedY, param_offset: 0x28} - {type: static_param, param_type: const float*, param_name: VelReduceY, param_offset: 0x30} -SmallDamageBase: -- {type: static_param, param_type: const float*, param_name: HitImpactForceSmallSwordS, param_offset: 0x38} -- {type: static_param, param_type: const float*, param_name: HitImpactForceSmallSwordL, param_offset: 0x40} -- {type: static_param, param_type: const float*, param_name: HitImpactForceLargeSwordS, param_offset: 0x48} -- {type: static_param, param_type: const float*, param_name: HitImpactForceLargeSwordL, param_offset: 0x50} -- {type: static_param, param_type: const float*, param_name: HitImpactForceSpearS, param_offset: 0x58} -- {type: static_param, param_type: const float*, param_name: HitImpactForceSpearL, param_offset: 0x60} -- {type: static_param, param_type: const float*, param_name: VelReduce, param_offset: 0x20} -- {type: static_param, param_type: const float*, param_name: HighSpeedY, param_offset: 0x28} -- {type: static_param, param_type: const float*, param_name: VelReduceY, param_offset: 0x30} +SmallDamageBase: [] AnmDamage: - {type: call, fn: _ZN5uking6action18TakeHitImpactForce11loadParams_Ev, addr: 0x71001c9808} - {type: static_param, param_type: 'sead::SafeString', param_name: AS, param_offset: 0x90} @@ -373,9 +362,7 @@ AnmUpDownMove: - {type: static_param, param_type: const float*, param_name: RotReduceRatio, param_offset: 0x28} - {type: static_param, param_type: const float*, param_name: AccRatio, param_offset: 0x30} - {type: static_param, param_type: 'sead::SafeString', param_name: ASName, param_offset: 0x38} -Appear: -- {type: static_param, param_type: const float*, param_name: PosReduceRatio, param_offset: 0x20} -- {type: static_param, param_type: const float*, param_name: AngReduceRatio, param_offset: 0x28} +Appear: [] AppearDeathCounter: [] AppearFullPouchInfo: - {type: dynamic_param, param_type: 'sead::SafeString*', param_name: PorchItemName, param_offset: 0x20} @@ -424,14 +411,8 @@ AreaActorObserve: - {type: map_unit_param, param_type: const int*, param_name: Count, param_offset: 0x38} - {type: map_unit_param, param_type: const bool*, param_name: IsSendMessage, param_offset: 0x40} - {type: map_unit_param, param_type: const bool*, param_name: DefaultBasicSignal, param_offset: 0x48} -AreaActorObserveByActorTag: -- {type: map_unit_param, param_type: const int*, param_name: Count, param_offset: 0x38} -- {type: map_unit_param, param_type: const bool*, param_name: IsSendMessage, param_offset: 0x40} -- {type: map_unit_param, param_type: const bool*, param_name: DefaultBasicSignal, param_offset: 0x48} -AreaActorObserveByGroup: -- {type: map_unit_param, param_type: const int*, param_name: Count, param_offset: 0x38} -- {type: map_unit_param, param_type: const bool*, param_name: IsSendMessage, param_offset: 0x40} -- {type: map_unit_param, param_type: const bool*, param_name: DefaultBasicSignal, param_offset: 0x48} +AreaActorObserveByActorTag: [] +AreaActorObserveByGroup: [] AreaBase: - {type: map_unit_param, param_type: const bool*, param_name: EnableCharacterOn, param_offset: 0x20} AreaBottomTag: [] @@ -441,10 +422,7 @@ AreaHorseSpeedLimitAction: [] AreaLocation: - {type: map_unit_param, param_type: const int*, param_name: LocationPriority, param_offset: 0x20} - {type: map_unit_param, param_type: 'sead::SafeString', param_name: MessageID, param_offset: 0x28} -AreaObserveActorAction: -- {type: map_unit_param, param_type: const int*, param_name: Count, param_offset: 0x38} -- {type: map_unit_param, param_type: const bool*, param_name: IsSendMessage, param_offset: 0x40} -- {type: map_unit_param, param_type: const bool*, param_name: DefaultBasicSignal, param_offset: 0x48} +AreaObserveActorAction: [] AreaOutRecreateActorAction: [] AreaRecreateActorAction: [] AreaRoot: @@ -593,9 +571,7 @@ BackStepToTarget: BackStepBase: - {type: call, fn: _ZN5uking6action16BackStepToTarget11loadParams_Ev, addr: 0x71000b3a58} - {type: static_param, param_type: const float*, param_name: JumpDist, param_offset: 0xc0} -BackStep: -- {type: call, fn: _ZN5uking6action16BackStepToTarget11loadParams_Ev, addr: 0x71000b3a58} -- {type: static_param, param_type: const float*, param_name: JumpDist, param_offset: 0xc0} +BackStep: [] BackStepAttack: - {type: call, fn: _ZN5uking6action12BackStepBase11loadParams_Ev, addr: 0x71000b4648} - {type: static_param, param_type: const int*, param_name: WeaponIdx, param_offset: 0x110} @@ -629,8 +605,7 @@ BackSwim: - {type: dynamic_param, param_type: 'sead::Vector3f*', param_name: TargetPos, param_offset: 0x98} - {type: static_param, param_type: const bool*, param_name: IsCheckCliff, param_offset: 0xa0} BackToRailFromLava: [] -BackWalk: -- {type: call, fn: _ZN5uking6action12BackWalkBase11loadParams_Ev, addr: 0x71000b621c} +BackWalk: [] BackseatKorokLight: - {type: static_param, param_type: const float*, param_name: AppearDist, param_offset: 0x20} - {type: static_param, param_type: const float*, param_name: DisappearDist, param_offset: 0x28} @@ -687,19 +662,15 @@ BattleCloseAction: - {type: dynamic_param, param_type: 'sead::Vector3f*', param_name: TargetPos, param_offset: 0x50} BattleCloseMoveActionBase: - {type: call, fn: _ZN5uking6action17BattleCloseAction11loadParams_Ev, addr: 0x71000afda4} -BattleCloseMoveAction: -- {type: call, fn: _ZN5uking6action17BattleCloseAction11loadParams_Ev, addr: 0x71000afda4} +BattleCloseMoveAction: [] BattleCloseExplosivesAvoidRun: - {type: call, fn: _ZN5uking6action25BattleCloseMoveActionBase11loadParams_Ev, addr: 0x71000ae460} - {type: static_param, param_type: const float*, param_name: DamageIgnoreDist, param_offset: 0xa8} BattleCloseDangerAvoidRun: - {type: call, fn: _ZN5uking6action29BattleCloseExplosivesAvoidRun11loadParams_Ev, addr: 0x71000bb484} - {type: static_param, param_type: const float*, param_name: AvoidSubAngle, param_offset: 0xe0} -BattleCloseExplosivesGuardRun: -- {type: call, fn: _ZN5uking6action25BattleCloseMoveActionBase11loadParams_Ev, addr: 0x71000ae460} -- {type: static_param, param_type: const float*, param_name: DamageIgnoreDist, param_offset: 0xa8} -BattleCloseGuardRun: -- {type: call, fn: _ZN5uking6action17BattleCloseAction11loadParams_Ev, addr: 0x71000afda4} +BattleCloseExplosivesGuardRun: [] +BattleCloseGuardRun: [] BattleCloseGuardWalk: - {type: call, fn: _ZN5uking6action25BattleCloseMoveActionBase11loadParams_Ev, addr: 0x71000ae460} BattleCloseLevelFlyMoveBase: @@ -722,13 +693,8 @@ BattleCloseMeanderRun: - {type: static_param, param_type: const float*, param_name: MeanderWidth, param_offset: 0xa8} - {type: static_param, param_type: const float*, param_name: MeanderSpeed, param_offset: 0xb0} - {type: static_param, param_type: const float*, param_name: JumpUpSpeedReduceRatio, param_offset: 0xb8} -BattleCloseMeanderGuardRun: -- {type: call, fn: _ZN5uking6action25BattleCloseMoveActionBase11loadParams_Ev, addr: 0x71000ae460} -- {type: static_param, param_type: const float*, param_name: MeanderWidth, param_offset: 0xa8} -- {type: static_param, param_type: const float*, param_name: MeanderSpeed, param_offset: 0xb0} -- {type: static_param, param_type: const float*, param_name: JumpUpSpeedReduceRatio, param_offset: 0xb8} -BattleCloseMove: -- {type: call, fn: _ZN5uking6action17BattleCloseAction11loadParams_Ev, addr: 0x71000afda4} +BattleCloseMeanderGuardRun: [] +BattleCloseMove: [] BattleCloseActionWithAcc: - {type: call, fn: _ZN5uking6action17BattleCloseAction11loadParams_Ev, addr: 0x71000afda4} - {type: static_param, param_type: const float*, param_name: AccRatio, param_offset: 0x98} @@ -782,22 +748,7 @@ MoveBase: - {type: static_param, param_type: const bool*, param_name: IgnoreDecelerationFrontCliff, param_offset: 0x80} - {type: static_param, param_type: const bool*, param_name: IgnoreMoveDirCoHit, param_offset: 0x88} - {type: dynamic_param, param_type: 'sead::Vector3f*', param_name: TargetPos, param_offset: 0x90} -BattleWalk: -- {type: static_param, param_type: const int*, param_name: WeaponIdx, param_offset: 0x20} -- {type: static_param, param_type: const int*, param_name: WallHitLimitTime, param_offset: 0x28} -- {type: static_param, param_type: const int*, param_name: MoveAngCliffLimitTime, param_offset: 0x30} -- {type: static_param, param_type: const float*, param_name: Speed, param_offset: 0x38} -- {type: static_param, param_type: const float*, param_name: RotSpd, param_offset: 0x40} -- {type: static_param, param_type: const float*, param_name: FinRadius, param_offset: 0x48} -- {type: static_param, param_type: const float*, param_name: FinRotate, param_offset: 0x50} -- {type: static_param, param_type: const float*, param_name: BaseRotRatio, param_offset: 0x58} -- {type: static_param, param_type: const float*, param_name: AccRatio, param_offset: 0x60} -- {type: static_param, param_type: const float*, param_name: JumpUpSpeedReduceRatio, param_offset: 0x68} -- {type: static_param, param_type: const bool*, param_name: FollowGround, param_offset: 0x70} -- {type: static_param, param_type: const bool*, param_name: IgnoreLastCurve, param_offset: 0x78} -- {type: static_param, param_type: const bool*, param_name: IgnoreDecelerationFrontCliff, param_offset: 0x80} -- {type: static_param, param_type: const bool*, param_name: IgnoreMoveDirCoHit, param_offset: 0x88} -- {type: dynamic_param, param_type: 'sead::Vector3f*', param_name: TargetPos, param_offset: 0x90} +BattleWalk: [] BeamMove: - {type: static_param, param_type: const int*, param_name: AtMinDamage, param_offset: 0x20} - {type: static_param, param_type: const int*, param_name: ShieldDamage, param_offset: 0x28} @@ -1014,22 +965,14 @@ CalcVecLengthToGameData: - {type: dynamic_param, param_type: bool*, param_name: CalcY, param_offset: 0x20} - {type: dynamic_param, param_type: 'sead::SafeString*', param_name: GameDataVec3fSrcName, param_offset: 0x28} - {type: dynamic_param, param_type: 'sead::SafeString*', param_name: GameDataFloatToName, param_offset: 0x38} -CallOvserveActorTag: -- {type: map_unit_param, param_type: const int*, param_name: Count, param_offset: 0x38} -- {type: map_unit_param, param_type: const bool*, param_name: IsSendMessage, param_offset: 0x40} -- {type: map_unit_param, param_type: const bool*, param_name: DefaultBasicSignal, param_offset: 0x48} +CallOvserveActorTag: [] CameraAction: - {type: static_param, param_type: const bool*, param_name: BowFlag, param_offset: 0x40} -CameraAbyss: -- {type: static_param, param_type: const bool*, param_name: BowFlag, param_offset: 0x40} -CameraAiming: -- {type: static_param, param_type: const bool*, param_name: BowFlag, param_offset: 0x40} -CameraAiming2: -- {type: static_param, param_type: const bool*, param_name: BowFlag, param_offset: 0x40} -CameraChase: -- {type: static_param, param_type: const bool*, param_name: BowFlag, param_offset: 0x40} -CameraClimbObj: -- {type: static_param, param_type: const bool*, param_name: BowFlag, param_offset: 0x40} +CameraAbyss: [] +CameraAiming: [] +CameraAiming2: [] +CameraChase: [] +CameraClimbObj: [] CameraEdit: - {type: static_param, param_type: const char*, param_name: Normal, param_offset: 0x20} - {type: static_param, param_type: const char*, param_name: LockOn, param_offset: 0x28} @@ -1039,45 +982,28 @@ CameraEdit: - {type: static_param, param_type: const char*, param_name: BowSquat, param_offset: 0x48} - {type: static_param, param_type: const char*, param_name: BowLockOn, param_offset: 0x50} - {type: call, fn: _ZNK4ksys3act2ai10ActionBase7getNameEv, addr: 0x7100d165fc} -CameraEvent: -- {type: static_param, param_type: const bool*, param_name: BowFlag, param_offset: 0x40} -CameraEventAnimBase: -- {type: static_param, param_type: const bool*, param_name: BowFlag, param_offset: 0x40} -CameraEventAnim: -- {type: static_param, param_type: const bool*, param_name: BowFlag, param_offset: 0x40} -CameraEventAnimFlowBase: -- {type: static_param, param_type: const bool*, param_name: BowFlag, param_offset: 0x40} -CameraEventAnimFlow: -- {type: static_param, param_type: const bool*, param_name: BowFlag, param_offset: 0x40} -CameraEventAnimFlowAbs: -- {type: static_param, param_type: const bool*, param_name: BowFlag, param_offset: 0x40} -CameraEventAnimFlowForMapTower: -- {type: static_param, param_type: const bool*, param_name: BowFlag, param_offset: 0x40} +CameraEvent: [] +CameraEventAnimBase: [] +CameraEventAnim: [] +CameraEventAnimFlowBase: [] +CameraEventAnimFlow: [] +CameraEventAnimFlowAbs: [] +CameraEventAnimFlowForMapTower: [] CameraEventConnectTypeSpecify: [] CameraEventFocusDistSetting: - {type: dynamic2_param, param_type: int*, param_name: ClipIndex, param_offset: 0x30} - {type: dynamic2_param, param_type: float*, param_name: FocusDistStart, param_offset: 0x38} - {type: dynamic2_param, param_type: float*, param_name: FocusDistEnd, param_offset: 0x40} -CameraEventGameOver: -- {type: static_param, param_type: const bool*, param_name: BowFlag, param_offset: 0x40} -CameraEventIdling: -- {type: static_param, param_type: const bool*, param_name: BowFlag, param_offset: 0x40} -CameraEventLookBase: -- {type: static_param, param_type: const bool*, param_name: BowFlag, param_offset: 0x40} -CameraEventLook: -- {type: static_param, param_type: const bool*, param_name: BowFlag, param_offset: 0x40} -CameraEventLookDirect: -- {type: static_param, param_type: const bool*, param_name: BowFlag, param_offset: 0x40} -CameraEventMove: -- {type: static_param, param_type: const bool*, param_name: BowFlag, param_offset: 0x40} -CameraEventMovePosBase: -- {type: static_param, param_type: const bool*, param_name: BowFlag, param_offset: 0x40} -CameraEventMovePos: -- {type: static_param, param_type: const bool*, param_name: BowFlag, param_offset: 0x40} -CameraEventMovePosFlow: -- {type: static_param, param_type: const bool*, param_name: BowFlag, param_offset: 0x40} -CameraEventMultiTalk: -- {type: static_param, param_type: const bool*, param_name: BowFlag, param_offset: 0x40} +CameraEventGameOver: [] +CameraEventIdling: [] +CameraEventLookBase: [] +CameraEventLook: [] +CameraEventLookDirect: [] +CameraEventMove: [] +CameraEventMovePosBase: [] +CameraEventMovePos: [] +CameraEventMovePosFlow: [] +CameraEventMultiTalk: [] CameraEventOverwriteFar: - {type: dynamic2_param, param_type: float*, param_name: Far, param_offset: 0x30} CameraEventOverwriteNear: @@ -1085,48 +1011,28 @@ CameraEventOverwriteNear: CameraEventPermitGfxNear: [] CameraEventPlayerHideOff: [] CameraEventPlayerHideOn: [] -CameraEventPolarCoord: -- {type: static_param, param_type: const bool*, param_name: BowFlag, param_offset: 0x40} -CameraEventPolarCoordPlayer: -- {type: static_param, param_type: const bool*, param_name: BowFlag, param_offset: 0x40} -CameraEventPolarCoordPlayerRel: -- {type: static_param, param_type: const bool*, param_name: BowFlag, param_offset: 0x40} +CameraEventPolarCoord: [] +CameraEventPolarCoordPlayer: [] +CameraEventPolarCoordPlayerRel: [] CameraEventReserveConnectTime: - {type: dynamic2_param, param_type: float*, param_name: InterpolateTime, param_offset: 0x30} -CameraEventSavePoint: -- {type: static_param, param_type: const bool*, param_name: BowFlag, param_offset: 0x40} -CameraEventTalk: -- {type: static_param, param_type: const bool*, param_name: BowFlag, param_offset: 0x40} -CameraEventTalkManualCtrlBase: -- {type: static_param, param_type: const bool*, param_name: BowFlag, param_offset: 0x40} -CameraEventTalkManualCtrl: -- {type: static_param, param_type: const bool*, param_name: BowFlag, param_offset: 0x40} -CameraEventTalkManualCtrlRet: -- {type: static_param, param_type: const bool*, param_name: BowFlag, param_offset: 0x40} -CameraEventTurn: -- {type: static_param, param_type: const bool*, param_name: BowFlag, param_offset: 0x40} -CameraFinder: -- {type: static_param, param_type: const bool*, param_name: BowFlag, param_offset: 0x40} -CameraHorse: -- {type: static_param, param_type: const bool*, param_name: BowFlag, param_offset: 0x40} -CameraHorseLockOnEmpty: -- {type: static_param, param_type: const bool*, param_name: BowFlag, param_offset: 0x40} -CameraKeep: -- {type: static_param, param_type: const bool*, param_name: BowFlag, param_offset: 0x40} -CameraLockOnBase: -- {type: static_param, param_type: const bool*, param_name: BowFlag, param_offset: 0x40} -CameraLockOn: -- {type: static_param, param_type: const bool*, param_name: BowFlag, param_offset: 0x40} -CameraLockOnAimingAt: -- {type: static_param, param_type: const bool*, param_name: BowFlag, param_offset: 0x40} -CameraMagneCatch: -- {type: static_param, param_type: const bool*, param_name: BowFlag, param_offset: 0x40} -CameraMotorcycle: -- {type: static_param, param_type: const bool*, param_name: BowFlag, param_offset: 0x40} -CameraMotorcycleLockOnEmpty: -- {type: static_param, param_type: const bool*, param_name: BowFlag, param_offset: 0x40} -CameraRevolve: -- {type: static_param, param_type: const bool*, param_name: BowFlag, param_offset: 0x40} +CameraEventSavePoint: [] +CameraEventTalk: [] +CameraEventTalkManualCtrlBase: [] +CameraEventTalkManualCtrl: [] +CameraEventTalkManualCtrlRet: [] +CameraEventTurn: [] +CameraFinder: [] +CameraHorse: [] +CameraHorseLockOnEmpty: [] +CameraKeep: [] +CameraLockOnBase: [] +CameraLockOn: [] +CameraLockOnAimingAt: [] +CameraMagneCatch: [] +CameraMotorcycle: [] +CameraMotorcycleLockOnEmpty: [] +CameraRevolve: [] CameraRotRumble: - {type: dynamic2_param, param_type: int*, param_name: Pattern, param_offset: 0x20} - {type: dynamic2_param, param_type: int*, param_name: Count, param_offset: 0x28} @@ -1146,10 +1052,8 @@ CameraRumbleStop: CameraRumbleStopWithDamping: - {type: dynamic2_param, param_type: float*, param_name: DampingTime, param_offset: 0x20} - {type: aitree_variable, param_type: int*, param_name: CamVibId, param_offset: 0x28} -CameraShieldSurfing: -- {type: static_param, param_type: const bool*, param_name: BowFlag, param_offset: 0x40} -CameraTail: -- {type: static_param, param_type: const bool*, param_name: BowFlag, param_offset: 0x40} +CameraShieldSurfing: [] +CameraTail: [] CameraVibrate: - {type: map_unit_param, param_type: const int*, param_name: CameraPattern, param_offset: 0x48} - {type: map_unit_param, param_type: const float*, param_name: CameraPower, param_offset: 0x50} @@ -1157,12 +1061,9 @@ CameraVibrate: - {type: static_param, param_type: const bool*, param_name: IsSound, param_offset: 0x20} - {type: static_param, param_type: 'sead::SafeString', param_name: StartSoundName, param_offset: 0x28} - {type: static_param, param_type: 'sead::SafeString', param_name: LoopSoundName, param_offset: 0x38} -CameraWakeboard: -- {type: static_param, param_type: const bool*, param_name: BowFlag, param_offset: 0x40} -CameraWaterRemainsHowling: -- {type: static_param, param_type: const bool*, param_name: BowFlag, param_offset: 0x40} -CameraWaterfallClimb: -- {type: static_param, param_type: const bool*, param_name: BowFlag, param_offset: 0x40} +CameraWakeboard: [] +CameraWaterRemainsHowling: [] +CameraWaterfallClimb: [] ElectricParalysis: - {type: call, fn: _ZN5uking6action22ActionWithPosAngReduce11loadParams_Ev, addr: 0x710027e3ec} - {type: static_param, param_type: 'sead::SafeString', param_name: ASName, param_offset: 0x30} @@ -1190,15 +1091,7 @@ Carried: - {type: static_param, param_type: const bool*, param_name: IsOnBaseLink, param_offset: 0x48} - {type: static_param, param_type: const bool*, param_name: IsChangeable, param_offset: 0x50} - {type: static_param, param_type: 'sead::SafeString', param_name: HoldOnXLinkKey, param_offset: 0x58} -CarriedNoHit: -- {type: static_param, param_type: const int*, param_name: BindType, param_offset: 0x20} -- {type: static_param, param_type: const float*, param_name: FailDistance, param_offset: 0x28} -- {type: static_param, param_type: const bool*, param_name: IsCreateItem, param_offset: 0x30} -- {type: static_param, param_type: const bool*, param_name: IsRecoverCharCtrlAxis, param_offset: 0x38} -- {type: static_param, param_type: const bool*, param_name: IsUseConstraint, param_offset: 0x40} -- {type: static_param, param_type: const bool*, param_name: IsOnBaseLink, param_offset: 0x48} -- {type: static_param, param_type: const bool*, param_name: IsChangeable, param_offset: 0x50} -- {type: static_param, param_type: 'sead::SafeString', param_name: HoldOnXLinkKey, param_offset: 0x58} +CarriedNoHit: [] Catch: - {type: static_param, param_type: const int*, param_name: WeaponIdx, param_offset: 0x20} - {type: dynamic_param, param_type: 'ksys::act::BaseProcLink*', param_name: TargetWeapon, param_offset: 0x30} @@ -1274,9 +1167,7 @@ ChemicalElectricWaterBall: ChemicalPhysBall: - {type: call, fn: _ZN5uking6action18ChemicalAttackBall11loadParams_Ev, addr: 0x71000db23c} - {type: static_param, param_type: const int*, param_name: DeleteTime, param_offset: 0x90} -ChemicalPhysHitBreakBall: -- {type: call, fn: _ZN5uking6action18ChemicalAttackBall11loadParams_Ev, addr: 0x71000db23c} -- {type: static_param, param_type: const int*, param_name: DeleteTime, param_offset: 0x90} +ChemicalPhysHitBreakBall: [] ChemicalStayObject: - {type: static_param, param_type: const int*, param_name: AtAttr, param_offset: 0x20} - {type: static_param, param_type: const float*, param_name: DeleteTime, param_offset: 0x28} @@ -1638,15 +1529,7 @@ StepDoubleAttack: - {type: static_param, param_type: const float*, param_name: JustAvoidBackDist, param_offset: 0x48} - {type: static_param, param_type: const float*, param_name: JustAvoidAngle, param_offset: 0x50} - {type: dynamic_param, param_type: 'sead::Vector3f*', param_name: TargetPos, param_offset: 0x58} -DoubleAttack: -- {type: static_param, param_type: const int*, param_name: WeaponIdx, param_offset: 0x20} -- {type: static_param, param_type: const float*, param_name: CloseDist, param_offset: 0x28} -- {type: static_param, param_type: const float*, param_name: Speed, param_offset: 0x30} -- {type: static_param, param_type: const float*, param_name: RotSpd, param_offset: 0x38} -- {type: static_param, param_type: const float*, param_name: JustAvoidSideDist, param_offset: 0x40} -- {type: static_param, param_type: const float*, param_name: JustAvoidBackDist, param_offset: 0x48} -- {type: static_param, param_type: const float*, param_name: JustAvoidAngle, param_offset: 0x50} -- {type: dynamic_param, param_type: 'sead::Vector3f*', param_name: TargetPos, param_offset: 0x58} +DoubleAttack: [] DownSwingAttack: [] DownloadAlbum: [] DownloadPictureBook: [] @@ -1996,10 +1879,7 @@ EquipedAction: EquipedASPlay: - {type: call, fn: _ZN5uking6action13EquipedAction11loadParams_Ev, addr: 0x7100e14380} - {type: static_param, param_type: 'sead::SafeString', param_name: AS, param_offset: 0x40} -EquipedChemicalWeapon: -- {type: dynamic_param, param_type: 'sead::SafeString*', param_name: NodeName, param_offset: 0x20} -- {type: dynamic_param, param_type: 'sead::Vector3f*', param_name: RotOffset, param_offset: 0x30} -- {type: dynamic_param, param_type: 'sead::Vector3f*', param_name: TransOffset, param_offset: 0x38} +EquipedChemicalWeapon: [] EquipedDeadlyBlowWeapon: - {type: call, fn: _ZN5uking6action13EquipedAction11loadParams_Ev, addr: 0x7100e14380} EquipedDefaultWindWeapon: @@ -2034,26 +1914,8 @@ EquipedRod: EquipedWeaponChild: - {type: call, fn: _ZN5uking6action10BindAction11loadParams_Ev, addr: 0x7100e11b78} - {type: static_param, param_type: const bool*, param_name: IsChangeScale, param_offset: 0xd8} -EquipedWithScale: -- {type: dynamic_param, param_type: 'sead::SafeString*', param_name: NodeName, param_offset: 0x20} -- {type: dynamic_param, param_type: 'sead::Vector3f*', param_name: RotOffset, param_offset: 0x30} -- {type: dynamic_param, param_type: 'sead::Vector3f*', param_name: TransOffset, param_offset: 0x38} -Escape: -- {type: static_param, param_type: const int*, param_name: WeaponIdx, param_offset: 0x20} -- {type: static_param, param_type: const int*, param_name: WallHitLimitTime, param_offset: 0x28} -- {type: static_param, param_type: const int*, param_name: MoveAngCliffLimitTime, param_offset: 0x30} -- {type: static_param, param_type: const float*, param_name: Speed, param_offset: 0x38} -- {type: static_param, param_type: const float*, param_name: RotSpd, param_offset: 0x40} -- {type: static_param, param_type: const float*, param_name: FinRadius, param_offset: 0x48} -- {type: static_param, param_type: const float*, param_name: FinRotate, param_offset: 0x50} -- {type: static_param, param_type: const float*, param_name: BaseRotRatio, param_offset: 0x58} -- {type: static_param, param_type: const float*, param_name: AccRatio, param_offset: 0x60} -- {type: static_param, param_type: const float*, param_name: JumpUpSpeedReduceRatio, param_offset: 0x68} -- {type: static_param, param_type: const bool*, param_name: FollowGround, param_offset: 0x70} -- {type: static_param, param_type: const bool*, param_name: IgnoreLastCurve, param_offset: 0x78} -- {type: static_param, param_type: const bool*, param_name: IgnoreDecelerationFrontCliff, param_offset: 0x80} -- {type: static_param, param_type: const bool*, param_name: IgnoreMoveDirCoHit, param_offset: 0x88} -- {type: dynamic_param, param_type: 'sead::Vector3f*', param_name: TargetPos, param_offset: 0x90} +EquipedWithScale: [] +Escape: [] EscapeBackTurn: [] EventAddGameDataIntAction: - {type: dynamic_param, param_type: bool*, param_name: IsSignInversion, param_offset: 0x20} @@ -2194,8 +2056,7 @@ EventOffWaitRevivalAction: [] EventOnWaitRevivalAction: [] EventOpenGetDemo: - {type: dynamic_param, param_type: bool*, param_name: IsInvalidOpenPouch, param_offset: 0x20} -EventOpenGetWeaponDemo: -- {type: dynamic_param, param_type: bool*, param_name: IsInvalidOpenPouch, param_offset: 0x20} +EventOpenGetWeaponDemo: [] EventOpenMessageTips: - {type: dynamic_param, param_type: int*, param_name: TipsType, param_offset: 0x20} - {type: dynamic_param, param_type: 'sead::SafeString*', param_name: MessageId, param_offset: 0x28} @@ -2423,10 +2284,7 @@ FlowingDust: [] FlyMove: - {type: call, fn: _ZN5uking6action11FlyMoveBase11loadParams_Ev, addr: 0x71001349e8} - {type: static_param, param_type: 'sead::SafeString', param_name: ASName, param_offset: 0xc0} -FlyingBalloonObserverTag: -- {type: map_unit_param, param_type: const int*, param_name: Count, param_offset: 0x38} -- {type: map_unit_param, param_type: const bool*, param_name: IsSendMessage, param_offset: 0x40} -- {type: map_unit_param, param_type: const bool*, param_name: DefaultBasicSignal, param_offset: 0x48} +FlyingBalloonObserverTag: [] FlyingCharacterReaction: - {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} @@ -2926,12 +2784,7 @@ ForkDropWeapon: - {type: static_param, param_type: const float*, param_name: WeaponDropSpeedY, param_offset: 0x30} - {type: static_param, param_type: const float*, param_name: AngleOffsetY, param_offset: 0x38} - {type: static_param, param_type: const bool*, param_name: ChemReset, param_offset: 0x40} -ForkDropWeaponWithSpeed: -- {type: static_param, param_type: const int*, param_name: WeaponIdx, param_offset: 0x20} -- {type: static_param, param_type: const float*, param_name: WeaponDropSpeedXZ, param_offset: 0x28} -- {type: static_param, param_type: const float*, param_name: WeaponDropSpeedY, param_offset: 0x30} -- {type: static_param, param_type: const float*, param_name: AngleOffsetY, param_offset: 0x38} -- {type: static_param, param_type: const bool*, param_name: ChemReset, param_offset: 0x40} +ForkDropWeaponWithSpeed: [] ForkDrownTimer: - {type: static_param, param_type: const int*, param_name: Time, param_offset: 0x20} - {type: static_param, param_type: const float*, param_name: InWaterDepth, param_offset: 0x28} @@ -3324,9 +3177,7 @@ ForkTogglePriestBossFreeMoving: - {type: static_param, param_type: const bool*, param_name: SetFreeMoving, param_offset: 0x20} ForkToggleWeaponXLinkSleep: - {type: static_param, param_type: const int*, param_name: Toggle, param_offset: 0x20} -ForkTurnASHold: -- {type: call, fn: _ZN5uking6action8ForkTurn11loadParams_Ev, addr: 0x710016893c} -- {type: dynamic_param, param_type: 'sead::Vector3f*', param_name: TargetPos, param_offset: 0xc0} +ForkTurnASHold: [] ForkWaitCloseGanonShoutMsgClose: - {type: aitree_variable, param_type: bool*, param_name: InBeastGanonVoiceSequence, param_offset: 0x20} ForkWaitGroundHit: @@ -3957,12 +3808,7 @@ GrabAttack: - {type: call, fn: _ZN5uking6action4Grab11loadParams_Ev, addr: 0x710018efdc} - {type: static_param, param_type: 'sead::SafeString', param_name: ASName, param_offset: 0x50} - {type: static_param, param_type: 'sead::SafeString', param_name: AtRigidBodyName, param_offset: 0x60} -GrabLeft: -- {type: call, fn: _ZN5uking6action22ActionWithPosAngReduce11loadParams_Ev, addr: 0x710027e3ec} -- {type: static_param, param_type: const int*, param_name: GrabIdx, param_offset: 0x30} -- {type: static_param, param_type: const float*, param_name: CheckRadius, param_offset: 0x38} -- {type: static_param, param_type: const float*, param_name: CheckSpeed, param_offset: 0x40} -- {type: static_param, param_type: 'const sead::Vector3f*', param_name: AttOffset, param_offset: 0x48} +GrabLeft: [] TurnBase: - {type: static_param, param_type: const float*, param_name: RotSpd, param_offset: 0x20} - {type: static_param, param_type: const float*, param_name: FinRotate, param_offset: 0x28} @@ -3972,62 +3818,11 @@ TurnBase: - {type: static_param, param_type: const bool*, param_name: IsChangeable, param_offset: 0x50} - {type: dynamic_param, param_type: 'sead::Vector3f*', param_name: TargetPos, param_offset: 0x58} - {type: static_param, param_type: const float*, param_name: RotMinSpeedRatio, param_offset: 0x48} -GrabLeftTurn: -- {type: static_param, param_type: const float*, param_name: RotSpd, param_offset: 0x20} -- {type: static_param, param_type: const float*, param_name: FinRotate, param_offset: 0x28} -- {type: static_param, param_type: const float*, param_name: PosReduceRatio, param_offset: 0x30} -- {type: static_param, param_type: const float*, param_name: BaseRotRatio, param_offset: 0x38} -- {type: static_param, param_type: const bool*, param_name: IsFollowGround, param_offset: 0x40} -- {type: static_param, param_type: const bool*, param_name: IsChangeable, param_offset: 0x50} -- {type: dynamic_param, param_type: 'sead::Vector3f*', param_name: TargetPos, param_offset: 0x58} -- {type: static_param, param_type: const float*, param_name: RotMinSpeedRatio, param_offset: 0x48} -GrabLeftWalk: -- {type: static_param, param_type: const int*, param_name: WeaponIdx, param_offset: 0x20} -- {type: static_param, param_type: const int*, param_name: WallHitLimitTime, param_offset: 0x28} -- {type: static_param, param_type: const int*, param_name: MoveAngCliffLimitTime, param_offset: 0x30} -- {type: static_param, param_type: const float*, param_name: Speed, param_offset: 0x38} -- {type: static_param, param_type: const float*, param_name: RotSpd, param_offset: 0x40} -- {type: static_param, param_type: const float*, param_name: FinRadius, param_offset: 0x48} -- {type: static_param, param_type: const float*, param_name: FinRotate, param_offset: 0x50} -- {type: static_param, param_type: const float*, param_name: BaseRotRatio, param_offset: 0x58} -- {type: static_param, param_type: const float*, param_name: AccRatio, param_offset: 0x60} -- {type: static_param, param_type: const float*, param_name: JumpUpSpeedReduceRatio, param_offset: 0x68} -- {type: static_param, param_type: const bool*, param_name: FollowGround, param_offset: 0x70} -- {type: static_param, param_type: const bool*, param_name: IgnoreLastCurve, param_offset: 0x78} -- {type: static_param, param_type: const bool*, param_name: IgnoreDecelerationFrontCliff, param_offset: 0x80} -- {type: static_param, param_type: const bool*, param_name: IgnoreMoveDirCoHit, param_offset: 0x88} -- {type: dynamic_param, param_type: 'sead::Vector3f*', param_name: TargetPos, param_offset: 0x90} -GrabRight: -- {type: call, fn: _ZN5uking6action22ActionWithPosAngReduce11loadParams_Ev, addr: 0x710027e3ec} -- {type: static_param, param_type: const int*, param_name: GrabIdx, param_offset: 0x30} -- {type: static_param, param_type: const float*, param_name: CheckRadius, param_offset: 0x38} -- {type: static_param, param_type: const float*, param_name: CheckSpeed, param_offset: 0x40} -- {type: static_param, param_type: 'const sead::Vector3f*', param_name: AttOffset, param_offset: 0x48} -GrabRightTurn: -- {type: static_param, param_type: const float*, param_name: RotSpd, param_offset: 0x20} -- {type: static_param, param_type: const float*, param_name: FinRotate, param_offset: 0x28} -- {type: static_param, param_type: const float*, param_name: PosReduceRatio, param_offset: 0x30} -- {type: static_param, param_type: const float*, param_name: BaseRotRatio, param_offset: 0x38} -- {type: static_param, param_type: const bool*, param_name: IsFollowGround, param_offset: 0x40} -- {type: static_param, param_type: const bool*, param_name: IsChangeable, param_offset: 0x50} -- {type: dynamic_param, param_type: 'sead::Vector3f*', param_name: TargetPos, param_offset: 0x58} -- {type: static_param, param_type: const float*, param_name: RotMinSpeedRatio, param_offset: 0x48} -GrabRightWalk: -- {type: static_param, param_type: const int*, param_name: WeaponIdx, param_offset: 0x20} -- {type: static_param, param_type: const int*, param_name: WallHitLimitTime, param_offset: 0x28} -- {type: static_param, param_type: const int*, param_name: MoveAngCliffLimitTime, param_offset: 0x30} -- {type: static_param, param_type: const float*, param_name: Speed, param_offset: 0x38} -- {type: static_param, param_type: const float*, param_name: RotSpd, param_offset: 0x40} -- {type: static_param, param_type: const float*, param_name: FinRadius, param_offset: 0x48} -- {type: static_param, param_type: const float*, param_name: FinRotate, param_offset: 0x50} -- {type: static_param, param_type: const float*, param_name: BaseRotRatio, param_offset: 0x58} -- {type: static_param, param_type: const float*, param_name: AccRatio, param_offset: 0x60} -- {type: static_param, param_type: const float*, param_name: JumpUpSpeedReduceRatio, param_offset: 0x68} -- {type: static_param, param_type: const bool*, param_name: FollowGround, param_offset: 0x70} -- {type: static_param, param_type: const bool*, param_name: IgnoreLastCurve, param_offset: 0x78} -- {type: static_param, param_type: const bool*, param_name: IgnoreDecelerationFrontCliff, param_offset: 0x80} -- {type: static_param, param_type: const bool*, param_name: IgnoreMoveDirCoHit, param_offset: 0x88} -- {type: dynamic_param, param_type: 'sead::Vector3f*', param_name: TargetPos, param_offset: 0x90} +GrabLeftTurn: [] +GrabLeftWalk: [] +GrabRight: [] +GrabRightTurn: [] +GrabRightWalk: [] GraveAttack: - {type: static_param, param_type: const int*, param_name: Time, param_offset: 0x28} - {type: static_param, param_type: const int*, param_name: KeepTime, param_offset: 0x30} @@ -4050,18 +3845,8 @@ GuardBreak: - {type: static_param, param_type: const float*, param_name: WeaponVelY, param_offset: 0x48} GuardJust: - {type: call, fn: _ZN5uking6action17OnetimeStopASPlay11loadParams_Ev, addr: 0x7100212b34} -GuardLoop: -- {type: static_param, param_type: const float*, param_name: PosReduceRatio, param_offset: 0x20} -- {type: static_param, param_type: const float*, param_name: AngReduceRatio, param_offset: 0x28} -GuardTurn: -- {type: static_param, param_type: const float*, param_name: RotSpd, param_offset: 0x20} -- {type: static_param, param_type: const float*, param_name: FinRotate, param_offset: 0x28} -- {type: static_param, param_type: const float*, param_name: PosReduceRatio, param_offset: 0x30} -- {type: static_param, param_type: const float*, param_name: BaseRotRatio, param_offset: 0x38} -- {type: static_param, param_type: const bool*, param_name: IsFollowGround, param_offset: 0x40} -- {type: static_param, param_type: const bool*, param_name: IsChangeable, param_offset: 0x50} -- {type: dynamic_param, param_type: 'sead::Vector3f*', param_name: TargetPos, param_offset: 0x58} -- {type: static_param, param_type: const float*, param_name: RotMinSpeedRatio, param_offset: 0x48} +GuardLoop: [] +GuardTurn: [] GuardWithAS: - {type: call, fn: _ZN5uking6action5Guard11loadParams_Ev, addr: 0x7100191bc4} - {type: static_param, param_type: const int*, param_name: ASSlot, param_offset: 0xa8} @@ -4103,15 +3888,7 @@ GuardianMiniGuardBreak: - {type: static_param, param_type: const int*, param_name: ASSlot, param_offset: 0x60} - {type: static_param, param_type: 'sead::SafeString', param_name: GuardBreakASName, param_offset: 0x68} - {type: static_param, param_type: 'sead::SafeString', param_name: OtherASName, param_offset: 0x78} -NavMeshWalk: -- {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} -- {type: static_param, param_type: const float*, param_name: FinRadius, param_offset: 0x38} -- {type: static_param, param_type: const float*, param_name: FinRotate, param_offset: 0x40} -- {type: static_param, param_type: const float*, param_name: AccRatio, param_offset: 0x48} -- {type: static_param, param_type: const bool*, param_name: IsCheckCliff, param_offset: 0x50} -- {type: dynamic_param, param_type: 'sead::Vector3f*', param_name: TargetPos, param_offset: 0x58} +NavMeshWalk: [] GuardianMiniGuardNavMeshWalk: - {type: call, fn: _ZN5uking6action13NavMeshAction11loadParams_Ev, addr: 0x71001f0574} - {type: static_param, param_type: const int*, param_name: ASSlot, param_offset: 0xa8} @@ -4128,23 +3905,12 @@ GuardianMiniGuardSideWalk: - {type: call, fn: _ZN5uking6action16TargetCircleWalk11loadParams_Ev, addr: 0x7100294140} - {type: static_param, param_type: const int*, param_name: ASSlot, param_offset: 0x80} - {type: static_param, param_type: 'sead::SafeString', param_name: ASName, param_offset: 0x88} -Turn: -- {type: static_param, param_type: const float*, param_name: RotSpd, param_offset: 0x20} -- {type: static_param, param_type: const float*, param_name: FinRotate, param_offset: 0x28} -- {type: static_param, param_type: const float*, param_name: PosReduceRatio, param_offset: 0x30} -- {type: static_param, param_type: const float*, param_name: BaseRotRatio, param_offset: 0x38} -- {type: static_param, param_type: const bool*, param_name: IsFollowGround, param_offset: 0x40} -- {type: static_param, param_type: const bool*, param_name: IsChangeable, param_offset: 0x50} -- {type: dynamic_param, param_type: 'sead::Vector3f*', param_name: TargetPos, param_offset: 0x58} -- {type: static_param, param_type: const float*, param_name: RotMinSpeedRatio, param_offset: 0x48} +Turn: [] GuardianMiniGuardTurn: - {type: call, fn: _ZN5uking6action8TurnBase11loadParams_Ev, addr: 0x71002a0ec0} - {type: static_param, param_type: const int*, param_name: ASSlot, param_offset: 0x90} - {type: static_param, param_type: 'sead::SafeString', param_name: ASName, param_offset: 0x98} -Wait: -- {type: call, fn: _ZN5uking6action22ActionWithPosAngReduce11loadParams_Ev, addr: 0x710027e3ec} -- {type: static_param, param_type: const int*, param_name: Time, param_offset: 0x30} -- {type: static_param, param_type: const int*, param_name: TimeRand, param_offset: 0x38} +Wait: [] GuardianMiniWait: - {type: call, fn: _ZN5uking6action8WaitBase11loadParams_Ev, addr: 0x71002a9960} - {type: static_param, param_type: 'sead::SafeString', param_name: ASName, param_offset: 0x50} @@ -5282,83 +5048,26 @@ NPCWaitDynFrame: - {type: call, fn: _ZN5uking6action12NPCWaitFrame11loadParams_Ev, addr: 0x710020cc4c} - {type: dynamic_param, param_type: int*, param_name: DynWaitFrame, param_offset: 0x58} - {type: dynamic_param, param_type: 'sead::SafeString*', param_name: DynASName, param_offset: 0x60} -NPCWaitOneTimeAction: -- {type: static_param, param_type: const bool*, param_name: IsIgnoreSameKey, param_offset: 0x20} -- {type: static_param, param_type: 'sead::SafeString', param_name: ASName, param_offset: 0x28} +NPCWaitOneTimeAction: [] NavMeshBattleWalk: - {type: call, fn: _ZN5uking6action13NavMeshAction11loadParams_Ev, addr: 0x71001f0574} NavMeshConnectAction: [] -NavMeshEscape: -- {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} -- {type: static_param, param_type: const float*, param_name: FinRadius, param_offset: 0x38} -- {type: static_param, param_type: const float*, param_name: FinRotate, param_offset: 0x40} -- {type: static_param, param_type: const float*, param_name: AccRatio, param_offset: 0x48} -- {type: static_param, param_type: const bool*, param_name: IsCheckCliff, param_offset: 0x50} -- {type: dynamic_param, param_type: 'sead::Vector3f*', param_name: TargetPos, param_offset: 0x58} +NavMeshEscape: [] NavMeshFly: - {type: call, fn: _ZN5uking6action13NavMeshAction11loadParams_Ev, addr: 0x71001f0574} - {type: static_param, param_type: 'sead::SafeString', param_name: ASName, param_offset: 0xa8} -NavMeshGrabLeftWalk: -- {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} -- {type: static_param, param_type: const float*, param_name: FinRadius, param_offset: 0x38} -- {type: static_param, param_type: const float*, param_name: FinRotate, param_offset: 0x40} -- {type: static_param, param_type: const float*, param_name: AccRatio, param_offset: 0x48} -- {type: static_param, param_type: const bool*, param_name: IsCheckCliff, param_offset: 0x50} -- {type: dynamic_param, param_type: 'sead::Vector3f*', param_name: TargetPos, param_offset: 0x58} -NavMeshGrabRightWalk: -- {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} -- {type: static_param, param_type: const float*, param_name: FinRadius, param_offset: 0x38} -- {type: static_param, param_type: const float*, param_name: FinRotate, param_offset: 0x40} -- {type: static_param, param_type: const float*, param_name: AccRatio, param_offset: 0x48} -- {type: static_param, param_type: const bool*, param_name: IsCheckCliff, param_offset: 0x50} -- {type: dynamic_param, param_type: 'sead::Vector3f*', param_name: TargetPos, param_offset: 0x58} -NavMeshGuardRun: -- {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} -- {type: static_param, param_type: const float*, param_name: FinRadius, param_offset: 0x38} -- {type: static_param, param_type: const float*, param_name: FinRotate, param_offset: 0x40} -- {type: static_param, param_type: const float*, param_name: AccRatio, param_offset: 0x48} -- {type: static_param, param_type: const bool*, param_name: IsCheckCliff, param_offset: 0x50} -- {type: dynamic_param, param_type: 'sead::Vector3f*', param_name: TargetPos, param_offset: 0x58} -NavMeshGuardWalk: -- {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} -- {type: static_param, param_type: const float*, param_name: FinRadius, param_offset: 0x38} -- {type: static_param, param_type: const float*, param_name: FinRotate, param_offset: 0x40} -- {type: static_param, param_type: const float*, param_name: AccRatio, param_offset: 0x48} -- {type: static_param, param_type: const bool*, param_name: IsCheckCliff, param_offset: 0x50} -- {type: dynamic_param, param_type: 'sead::Vector3f*', param_name: TargetPos, param_offset: 0x58} -NavMeshJump: -- {type: static_param, param_type: const float*, param_name: MaxSpeed, param_offset: 0x20} -- {type: static_param, param_type: const float*, param_name: JumpHeight, param_offset: 0x28} -- {type: static_param, param_type: const float*, param_name: JumpGravity, param_offset: 0x30} -- {type: static_param, param_type: const float*, param_name: PosReduceRatioOnGround, param_offset: 0x38} -- {type: static_param, param_type: const float*, param_name: RotReduceRatioOnGround, param_offset: 0x40} -- {type: static_param, param_type: const float*, param_name: InWaterDepth, param_offset: 0x48} -- {type: dynamic_param, param_type: 'sead::Vector3f*', param_name: TargetPos, param_offset: 0x50} +NavMeshGrabLeftWalk: [] +NavMeshGrabRightWalk: [] +NavMeshGuardRun: [] +NavMeshGuardWalk: [] +NavMeshJump: [] NavMeshLiftWalk: - {type: call, fn: _ZN5uking6action13NavMeshAction11loadParams_Ev, addr: 0x71001f0574} NavMeshMoveWithAS: - {type: call, fn: _ZN5uking6action13NavMeshAction11loadParams_Ev, addr: 0x71001f0574} - {type: static_param, param_type: const bool*, param_name: IsIgnoreSameAS, param_offset: 0xa8} - {type: static_param, param_type: 'sead::SafeString', param_name: ASName, param_offset: 0xb0} -NavMeshRun: -- {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} -- {type: static_param, param_type: const float*, param_name: FinRadius, param_offset: 0x38} -- {type: static_param, param_type: const float*, param_name: FinRotate, param_offset: 0x40} -- {type: static_param, param_type: const float*, param_name: AccRatio, param_offset: 0x48} -- {type: static_param, param_type: const bool*, param_name: IsCheckCliff, param_offset: 0x50} -- {type: dynamic_param, param_type: 'sead::Vector3f*', param_name: TargetPos, param_offset: 0x58} +NavMeshRun: [] NavMeshSlippedWalk: - {type: call, fn: _ZN5uking6action13NavMeshAction11loadParams_Ev, addr: 0x71001f0574} - {type: static_param, param_type: const float*, param_name: AccRatio, param_offset: 0xa8} @@ -5386,9 +5095,7 @@ NoCountDead: - {type: static_param, param_type: const bool*, param_name: IsFadeout, param_offset: 0x20} NoDeleteCurrentActor: [] NotStopXLinkWithDemoVisibleOff: [] -Notice: -- {type: static_param, param_type: const float*, param_name: PosReduceRatio, param_offset: 0x20} -- {type: static_param, param_type: const float*, param_name: AngReduceRatio, param_offset: 0x28} +Notice: [] NpcRideWaitAction: - {type: call, fn: _ZN5uking6action13NPCWaitAction11loadParams_Ev, addr: 0x7100e91f20} - {type: dynamic_param, param_type: float*, param_name: GearSpeed, param_offset: 0x38} @@ -6232,10 +5939,7 @@ PlayerStoleOpenBase: - {type: static_param, param_type: const char*, param_name: BoneName, param_offset: 0x20} - {type: static_param, param_type: 'const sead::Vector3f*', param_name: PosOffset, param_offset: 0x28} - {type: static_param, param_type: 'const sead::Vector3f*', param_name: RotOffsetXyz, param_offset: 0x30} -PlayerStoleOpenEx: -- {type: static_param, param_type: const char*, param_name: BoneName, param_offset: 0x20} -- {type: static_param, param_type: 'const sead::Vector3f*', param_name: PosOffset, param_offset: 0x28} -- {type: static_param, param_type: 'const sead::Vector3f*', param_name: RotOffsetXyz, param_offset: 0x30} +PlayerStoleOpenEx: [] PlayerStoleOpen: - {type: call, fn: _ZN5uking6action19PlayerStoleOpenBase11loadParams_Ev, addr: 0x71000c633c} - {type: static_param, param_type: const float*, param_name: EnlargeSpd, param_offset: 0xd8} @@ -6466,9 +6170,7 @@ RandomJump: - {type: static_param, param_type: const float*, param_name: DistanceMaxOffset, param_offset: 0x40} - {type: static_param, param_type: const bool*, param_name: IsReturnByHitWall, param_offset: 0x48} - {type: static_param, param_type: 'sead::SafeString', param_name: ASName, param_offset: 0x50} -Rebound: -- {type: static_param, param_type: const float*, param_name: PosReduceRatio, param_offset: 0x20} -- {type: static_param, param_type: const float*, param_name: AngReduceRatio, param_offset: 0x28} +Rebound: [] ReboundHit: - {type: static_param, param_type: const float*, param_name: Speed, param_offset: 0x20} - {type: static_param, param_type: const float*, param_name: GravityRate, param_offset: 0x28} @@ -6649,22 +6351,7 @@ Rotate: RotatedWait: - {type: map_unit_param, param_type: const int*, param_name: RotAxis, param_offset: 0x20} - {type: map_unit_param, param_type: const float*, param_name: TiltAngle, param_offset: 0x28} -Run: -- {type: static_param, param_type: const int*, param_name: WeaponIdx, param_offset: 0x20} -- {type: static_param, param_type: const int*, param_name: WallHitLimitTime, param_offset: 0x28} -- {type: static_param, param_type: const int*, param_name: MoveAngCliffLimitTime, param_offset: 0x30} -- {type: static_param, param_type: const float*, param_name: Speed, param_offset: 0x38} -- {type: static_param, param_type: const float*, param_name: RotSpd, param_offset: 0x40} -- {type: static_param, param_type: const float*, param_name: FinRadius, param_offset: 0x48} -- {type: static_param, param_type: const float*, param_name: FinRotate, param_offset: 0x50} -- {type: static_param, param_type: const float*, param_name: BaseRotRatio, param_offset: 0x58} -- {type: static_param, param_type: const float*, param_name: AccRatio, param_offset: 0x60} -- {type: static_param, param_type: const float*, param_name: JumpUpSpeedReduceRatio, param_offset: 0x68} -- {type: static_param, param_type: const bool*, param_name: FollowGround, param_offset: 0x70} -- {type: static_param, param_type: const bool*, param_name: IgnoreLastCurve, param_offset: 0x78} -- {type: static_param, param_type: const bool*, param_name: IgnoreDecelerationFrontCliff, param_offset: 0x80} -- {type: static_param, param_type: const bool*, param_name: IgnoreMoveDirCoHit, param_offset: 0x88} -- {type: dynamic_param, param_type: 'sead::Vector3f*', param_name: TargetPos, param_offset: 0x90} +Run: [] SSMagneStickAcceptorAccept: [] SSMagneStickAcceptorReject: [] SandwichDetectionAreaTag: [] @@ -7325,16 +7012,7 @@ SlippedWalkBase: SlippedWalk: - {type: call, fn: _ZN5uking6action15SlippedWalkBase11loadParams_Ev, addr: 0x71002713dc} - {type: static_param, param_type: 'sead::SafeString', param_name: ASName, param_offset: 0xa8} -SmallDamage: -- {type: static_param, param_type: const float*, param_name: HitImpactForceSmallSwordS, param_offset: 0x38} -- {type: static_param, param_type: const float*, param_name: HitImpactForceSmallSwordL, param_offset: 0x40} -- {type: static_param, param_type: const float*, param_name: HitImpactForceLargeSwordS, param_offset: 0x48} -- {type: static_param, param_type: const float*, param_name: HitImpactForceLargeSwordL, param_offset: 0x50} -- {type: static_param, param_type: const float*, param_name: HitImpactForceSpearS, param_offset: 0x58} -- {type: static_param, param_type: const float*, param_name: HitImpactForceSpearL, param_offset: 0x60} -- {type: static_param, param_type: const float*, param_name: VelReduce, param_offset: 0x20} -- {type: static_param, param_type: const float*, param_name: HighSpeedY, param_offset: 0x28} -- {type: static_param, param_type: const float*, param_name: VelReduceY, param_offset: 0x30} +SmallDamage: [] SmallDamageBackwardBase: - {type: call, fn: _ZN5uking6action18TakeHitImpactForce11loadParams_Ev, addr: 0x71001c9808} SmallDamageBackward: @@ -7346,11 +7024,7 @@ SmallDamageDirectPreTargetBone: - {type: static_param, param_type: const int*, param_name: PreTargetBone, param_offset: 0x90} - {type: static_param, param_type: 'sead::SafeString', param_name: ASName, param_offset: 0x98} - {type: static_param, param_type: const bool*, param_name: IsSetHitPosSelecter, param_offset: 0xa8} -SmallDamageDirectPreTargetBack: -- {type: call, fn: _ZN5uking6action18TakeHitImpactForce11loadParams_Ev, addr: 0x71001c9808} -- {type: static_param, param_type: const int*, param_name: PreTargetBone, param_offset: 0x90} -- {type: static_param, param_type: 'sead::SafeString', param_name: ASName, param_offset: 0x98} -- {type: static_param, param_type: const bool*, param_name: IsSetHitPosSelecter, param_offset: 0xa8} +SmallDamageDirectPreTargetBack: [] SoundOcclusionTagAction: - {type: static_param, param_type: const float*, param_name: OcclusionLevel, param_offset: 0x48} SoundOcclusionTagRemainsWater: [] @@ -7448,15 +7122,7 @@ StartShiekSensorGaugeDemo: - {type: dynamic_param, param_type: int*, param_name: ReactionNum, param_offset: 0x20} StartStaminaUpDemo: [] StartupTelescope: [] -StepDoubleLargeAttack: -- {type: static_param, param_type: const int*, param_name: WeaponIdx, param_offset: 0x20} -- {type: static_param, param_type: const float*, param_name: CloseDist, param_offset: 0x28} -- {type: static_param, param_type: const float*, param_name: Speed, param_offset: 0x30} -- {type: static_param, param_type: const float*, param_name: RotSpd, param_offset: 0x38} -- {type: static_param, param_type: const float*, param_name: JustAvoidSideDist, param_offset: 0x40} -- {type: static_param, param_type: const float*, param_name: JustAvoidBackDist, param_offset: 0x48} -- {type: static_param, param_type: const float*, param_name: JustAvoidAngle, param_offset: 0x50} -- {type: dynamic_param, param_type: 'sead::Vector3f*', param_name: TargetPos, param_offset: 0x58} +StepDoubleLargeAttack: [] Stick: [] StopASIgnite: - {type: call, fn: _ZN5uking6action17OnetimeStopASPlay11loadParams_Ev, addr: 0x7100212b34} @@ -7748,10 +7414,8 @@ TestAction: - {type: dynamic_param, param_type: 'sead::SafeString*', param_name: Name, param_offset: 0x28} Throw: - {type: call, fn: _ZN5uking6action22ActionWithPosAngReduce11loadParams_Ev, addr: 0x710027e3ec} -ThrowLeft: -- {type: call, fn: _ZN5uking6action22ActionWithPosAngReduce11loadParams_Ev, addr: 0x710027e3ec} -ThrowRight: -- {type: call, fn: _ZN5uking6action22ActionWithPosAngReduce11loadParams_Ev, addr: 0x710027e3ec} +ThrowLeft: [] +ThrowRight: [] ThrowWeapon: - {type: call, fn: _ZN5uking6action22ActionWithPosAngReduce11loadParams_Ev, addr: 0x710027e3ec} - {type: static_param, param_type: const int*, param_name: WeaponIdx, param_offset: 0x30} @@ -7765,16 +7429,7 @@ ThrowWeapon: ThrowWeaponByBodyCenter: - {type: call, fn: _ZN5uking6action11ThrowWeapon11loadParams_Ev, addr: 0x71002991a0} - {type: static_param, param_type: 'sead::SafeString', param_name: ASName, param_offset: 0x80} -ThrowWeaponRight: -- {type: call, fn: _ZN5uking6action22ActionWithPosAngReduce11loadParams_Ev, addr: 0x710027e3ec} -- {type: static_param, param_type: const int*, param_name: WeaponIdx, param_offset: 0x30} -- {type: static_param, param_type: const float*, param_name: SpeedMin, param_offset: 0x38} -- {type: static_param, param_type: const float*, param_name: SpeedMax, param_offset: 0x40} -- {type: static_param, param_type: const float*, param_name: ThrowAng, param_offset: 0x48} -- {type: static_param, param_type: const float*, param_name: ThrowBoomerangAng, param_offset: 0x50} -- {type: static_param, param_type: const float*, param_name: ThrowBoomerangSpeedMax, param_offset: 0x58} -- {type: dynamic_param, param_type: 'sead::Vector3f*', param_name: TargetPos, param_offset: 0x60} -- {type: static_param, param_type: const bool*, param_name: IsForceDead, param_offset: 0x68} +ThrowWeaponRight: [] ThrownAndBreak: - {type: call, fn: _ZN5uking6action6Thrown11loadParams_Ev, addr: 0x7100296d10} ThrownDown: @@ -7924,22 +7579,7 @@ WaitTimer: WaitUntilLifeUpDemo: [] WaitUntilMapOpenDemoEnd: [] WaitWhileCreatingOwnedHorse: [] -Walk: -- {type: static_param, param_type: const int*, param_name: WeaponIdx, param_offset: 0x20} -- {type: static_param, param_type: const int*, param_name: WallHitLimitTime, param_offset: 0x28} -- {type: static_param, param_type: const int*, param_name: MoveAngCliffLimitTime, param_offset: 0x30} -- {type: static_param, param_type: const float*, param_name: Speed, param_offset: 0x38} -- {type: static_param, param_type: const float*, param_name: RotSpd, param_offset: 0x40} -- {type: static_param, param_type: const float*, param_name: FinRadius, param_offset: 0x48} -- {type: static_param, param_type: const float*, param_name: FinRotate, param_offset: 0x50} -- {type: static_param, param_type: const float*, param_name: BaseRotRatio, param_offset: 0x58} -- {type: static_param, param_type: const float*, param_name: AccRatio, param_offset: 0x60} -- {type: static_param, param_type: const float*, param_name: JumpUpSpeedReduceRatio, param_offset: 0x68} -- {type: static_param, param_type: const bool*, param_name: FollowGround, param_offset: 0x70} -- {type: static_param, param_type: const bool*, param_name: IgnoreLastCurve, param_offset: 0x78} -- {type: static_param, param_type: const bool*, param_name: IgnoreDecelerationFrontCliff, param_offset: 0x80} -- {type: static_param, param_type: const bool*, param_name: IgnoreMoveDirCoHit, param_offset: 0x88} -- {type: dynamic_param, param_type: 'sead::Vector3f*', param_name: TargetPos, param_offset: 0x90} +Walk: [] Warn: - {type: call, fn: _ZN5uking6action10StopASPlay11loadParams_Ev, addr: 0x710027e188} WarpEffectValueSetter: diff --git a/data/uking_functions.csv b/data/uking_functions.csv index 47ef9b76..ff2c2eec 100644 --- a/data/uking_functions.csv +++ b/data/uking_functions.csv @@ -2689,7 +2689,7 @@ 0x000000710008c28c,sub_710008C28C,140, 0x000000710008c318,AI_Action_AnchorSummon::ctor,104, 0x000000710008c380,_ZN5uking6action12AnchorSummonD1Ev,244, -0x000000710008c474,_ZN5uking6action12AnchorSummonD0Ev,36,_ZN5uking6action12AnchorSummonD0Ev +0x000000710008c474,_ZN5uking6action12AnchorSummonD0Ev,36, 0x000000710008c498,_ZN5uking6action12AnchorSummon5init_EPN4sead4HeapE,592, 0x000000710008c6e8,_ZN5uking6action12AnchorSummon6enter_EPN4ksys3act2ai15InlineParamPackE,360, 0x000000710008c850,sub_710008C850,1016, @@ -9784,7 +9784,7 @@ 0x000000710016f430,_ZNK5uking6action16FreeMovingAction18getRuntimeTypeInfoEv,92,_ZNK5uking6action16FreeMovingAction18getRuntimeTypeInfoEv 0x000000710016f48c,AI_Action_Freeze::ctor,96, 0x000000710016f4ec,_ZN5uking6action6FreezeD1Ev,232, -0x000000710016f5d4,_ZN5uking6action6FreezeD0Ev,36,_ZN5uking6action6FreezeD0Ev +0x000000710016f5d4,_ZN5uking6action6FreezeD0Ev,36, 0x000000710016f5f8,_ZN5uking6action6Freeze5init_EPN4sead4HeapE,256, 0x000000710016f6f8,_ZN5uking6action6Freeze6enter_EPN4ksys3act2ai15InlineParamPackE,764, 0x000000710016f9f4,_ZN5uking6action6Freeze5calc_Ev,348, diff --git a/src/Game/AI/Action/actionActionEx.cpp b/src/Game/AI/Action/actionActionEx.cpp index 04027d66..c74b049e 100644 --- a/src/Game/AI/Action/actionActionEx.cpp +++ b/src/Game/AI/Action/actionActionEx.cpp @@ -4,24 +4,4 @@ namespace uking::action { ActionEx::ActionEx(const InitArg& arg) : ksys::act::ai::Action(arg) {} -ActionEx::~ActionEx() = default; - -bool ActionEx::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - -void ActionEx::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void ActionEx::leave_() { - ksys::act::ai::Action::leave_(); -} - -void ActionEx::loadParams_() {} - -void ActionEx::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionActionEx.h b/src/Game/AI/Action/actionActionEx.h index ac681011..1fdaac0b 100644 --- a/src/Game/AI/Action/actionActionEx.h +++ b/src/Game/AI/Action/actionActionEx.h @@ -8,15 +8,8 @@ class ActionEx : public ksys::act::ai::Action { SEAD_RTTI_OVERRIDE(ActionEx, ksys::act::ai::Action) public: explicit ActionEx(const InitArg& arg); - ~ActionEx() override; - - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionActionWithAS.cpp b/src/Game/AI/Action/actionActionWithAS.cpp index ebb0f562..108afebd 100644 --- a/src/Game/AI/Action/actionActionWithAS.cpp +++ b/src/Game/AI/Action/actionActionWithAS.cpp @@ -4,25 +4,10 @@ namespace uking::action { ActionWithAS::ActionWithAS(const InitArg& arg) : ActionWithPosAngReduce(arg) {} -ActionWithAS::~ActionWithAS() = default; - -bool ActionWithAS::init_(sead::Heap* heap) { - return ActionWithPosAngReduce::init_(heap); -} - void ActionWithAS::enter_(ksys::act::ai::InlineParamPack* params) { ActionWithPosAngReduce::enter_(params); } -void ActionWithAS::leave_() { - ActionWithPosAngReduce::leave_(); -} - -void ActionWithAS::loadParams_() { - getStaticParam(&mPosReduceRatio_s, "PosReduceRatio"); - getStaticParam(&mAngReduceRatio_s, "AngReduceRatio"); -} - void ActionWithAS::calc_() { ActionWithPosAngReduce::calc_(); } diff --git a/src/Game/AI/Action/actionActionWithAS.h b/src/Game/AI/Action/actionActionWithAS.h index c57d27c9..c1a16ba2 100644 --- a/src/Game/AI/Action/actionActionWithAS.h +++ b/src/Game/AI/Action/actionActionWithAS.h @@ -9,20 +9,11 @@ class ActionWithAS : public ActionWithPosAngReduce { SEAD_RTTI_OVERRIDE(ActionWithAS, ActionWithPosAngReduce) public: explicit ActionWithAS(const InitArg& arg); - ~ActionWithAS() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; protected: void calc_() override; - - // static_param at offset 0x20 - const float* mPosReduceRatio_s{}; - // static_param at offset 0x28 - const float* mAngReduceRatio_s{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionActionWithPosAngReduce.cpp b/src/Game/AI/Action/actionActionWithPosAngReduce.cpp index b7f0bc7e..62384636 100644 --- a/src/Game/AI/Action/actionActionWithPosAngReduce.cpp +++ b/src/Game/AI/Action/actionActionWithPosAngReduce.cpp @@ -4,12 +4,6 @@ namespace uking::action { ActionWithPosAngReduce::ActionWithPosAngReduce(const InitArg& arg) : ActionEx(arg) {} -ActionWithPosAngReduce::~ActionWithPosAngReduce() = default; - -bool ActionWithPosAngReduce::init_(sead::Heap* heap) { - return ActionEx::init_(heap); -} - void ActionWithPosAngReduce::enter_(ksys::act::ai::InlineParamPack* params) { ActionEx::enter_(params); } diff --git a/src/Game/AI/Action/actionActionWithPosAngReduce.h b/src/Game/AI/Action/actionActionWithPosAngReduce.h index 709c99f6..5499af47 100644 --- a/src/Game/AI/Action/actionActionWithPosAngReduce.h +++ b/src/Game/AI/Action/actionActionWithPosAngReduce.h @@ -9,9 +9,7 @@ class ActionWithPosAngReduce : public ActionEx { SEAD_RTTI_OVERRIDE(ActionWithPosAngReduce, ActionEx) public: explicit ActionWithPosAngReduce(const InitArg& arg); - ~ActionWithPosAngReduce() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionActorInfoToGameDataFloat.cpp b/src/Game/AI/Action/actionActorInfoToGameDataFloat.cpp index a4fa457e..3e42ac8e 100644 --- a/src/Game/AI/Action/actionActorInfoToGameDataFloat.cpp +++ b/src/Game/AI/Action/actionActorInfoToGameDataFloat.cpp @@ -11,22 +11,10 @@ bool ActorInfoToGameDataFloat::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void ActorInfoToGameDataFloat::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void ActorInfoToGameDataFloat::leave_() { - ksys::act::ai::Action::leave_(); -} - void ActorInfoToGameDataFloat::loadParams_() { getDynamicParam(&mActorName_d, "ActorName"); getDynamicParam(&mGameDataFloatToName_d, "GameDataFloatToName"); getDynamicParam(&mParameterName_d, "ParameterName"); } -void ActorInfoToGameDataFloat::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionActorInfoToGameDataFloat.h b/src/Game/AI/Action/actionActorInfoToGameDataFloat.h index 604218aa..8f9c8224 100644 --- a/src/Game/AI/Action/actionActorInfoToGameDataFloat.h +++ b/src/Game/AI/Action/actionActorInfoToGameDataFloat.h @@ -11,13 +11,9 @@ public: ~ActorInfoToGameDataFloat() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 sead::SafeString* mActorName_d{}; // dynamic_param at offset 0x30 diff --git a/src/Game/AI/Action/actionActorInfoToGameDataInt.cpp b/src/Game/AI/Action/actionActorInfoToGameDataInt.cpp index 98f49475..7e541ef2 100644 --- a/src/Game/AI/Action/actionActorInfoToGameDataInt.cpp +++ b/src/Game/AI/Action/actionActorInfoToGameDataInt.cpp @@ -10,22 +10,10 @@ bool ActorInfoToGameDataInt::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void ActorInfoToGameDataInt::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void ActorInfoToGameDataInt::leave_() { - ksys::act::ai::Action::leave_(); -} - void ActorInfoToGameDataInt::loadParams_() { getDynamicParam(&mActorName_d, "ActorName"); getDynamicParam(&mGameDataIntToName_d, "GameDataIntToName"); getDynamicParam(&mParameterName_d, "ParameterName"); } -void ActorInfoToGameDataInt::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionActorInfoToGameDataInt.h b/src/Game/AI/Action/actionActorInfoToGameDataInt.h index f0f5bf72..2b5eb69a 100644 --- a/src/Game/AI/Action/actionActorInfoToGameDataInt.h +++ b/src/Game/AI/Action/actionActorInfoToGameDataInt.h @@ -11,13 +11,9 @@ public: ~ActorInfoToGameDataInt() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 sead::SafeString* mActorName_d{}; // dynamic_param at offset 0x30 diff --git a/src/Game/AI/Action/actionActorInfoToGameDataVec3.cpp b/src/Game/AI/Action/actionActorInfoToGameDataVec3.cpp index 66f8be9e..5c7f5720 100644 --- a/src/Game/AI/Action/actionActorInfoToGameDataVec3.cpp +++ b/src/Game/AI/Action/actionActorInfoToGameDataVec3.cpp @@ -10,14 +10,6 @@ bool ActorInfoToGameDataVec3::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void ActorInfoToGameDataVec3::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void ActorInfoToGameDataVec3::leave_() { - ksys::act::ai::Action::leave_(); -} - void ActorInfoToGameDataVec3::loadParams_() { getDynamicParam(&mActorName_d, "ActorName"); getDynamicParam(&mUniqueName_d, "UniqueName"); @@ -25,8 +17,4 @@ void ActorInfoToGameDataVec3::loadParams_() { getDynamicParam(&mParameterName_d, "ParameterName"); } -void ActorInfoToGameDataVec3::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionActorInfoToGameDataVec3.h b/src/Game/AI/Action/actionActorInfoToGameDataVec3.h index e9b4dc8b..258c3900 100644 --- a/src/Game/AI/Action/actionActorInfoToGameDataVec3.h +++ b/src/Game/AI/Action/actionActorInfoToGameDataVec3.h @@ -11,13 +11,9 @@ public: ~ActorInfoToGameDataVec3() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 sead::SafeString* mActorName_d{}; // dynamic_param at offset 0x30 diff --git a/src/Game/AI/Action/actionAirWallAction.cpp b/src/Game/AI/Action/actionAirWallAction.cpp index ed701979..3226c402 100644 --- a/src/Game/AI/Action/actionAirWallAction.cpp +++ b/src/Game/AI/Action/actionAirWallAction.cpp @@ -4,22 +4,6 @@ namespace uking::action { AirWallAction::AirWallAction(const InitArg& arg) : ksys::act::ai::Action(arg) {} -AirWallAction::~AirWallAction() = default; - -bool AirWallAction::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - -void AirWallAction::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void AirWallAction::leave_() { - ksys::act::ai::Action::leave_(); -} - -void AirWallAction::loadParams_() {} - void AirWallAction::calc_() { ksys::act::ai::Action::calc_(); } diff --git a/src/Game/AI/Action/actionAirWallAction.h b/src/Game/AI/Action/actionAirWallAction.h index 22b4df31..e205215a 100644 --- a/src/Game/AI/Action/actionAirWallAction.h +++ b/src/Game/AI/Action/actionAirWallAction.h @@ -8,12 +8,6 @@ class AirWallAction : public ksys::act::ai::Action { SEAD_RTTI_OVERRIDE(AirWallAction, ksys::act::ai::Action) public: explicit AirWallAction(const InitArg& arg); - ~AirWallAction() override; - - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; protected: void calc_() override; diff --git a/src/Game/AI/Action/actionAngry.cpp b/src/Game/AI/Action/actionAngry.cpp index c8d7ac20..956f2bb8 100644 --- a/src/Game/AI/Action/actionAngry.cpp +++ b/src/Game/AI/Action/actionAngry.cpp @@ -4,8 +4,6 @@ namespace uking::action { Angry::Angry(const InitArg& arg) : ActionWithAS(arg) {} -Angry::~Angry() = default; - bool Angry::init_(sead::Heap* heap) { return ActionWithAS::init_(heap); } diff --git a/src/Game/AI/Action/actionAngry.h b/src/Game/AI/Action/actionAngry.h index adfb9816..4632f7d1 100644 --- a/src/Game/AI/Action/actionAngry.h +++ b/src/Game/AI/Action/actionAngry.h @@ -9,7 +9,6 @@ class Angry : public ActionWithAS { SEAD_RTTI_OVERRIDE(Angry, ActionWithAS) public: explicit Angry(const InitArg& arg); - ~Angry() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/AI/Action/actionAnimalMoveGuidedBase.cpp b/src/Game/AI/Action/actionAnimalMoveGuidedBase.cpp index 17f269b9..38d8b254 100644 --- a/src/Game/AI/Action/actionAnimalMoveGuidedBase.cpp +++ b/src/Game/AI/Action/actionAnimalMoveGuidedBase.cpp @@ -4,8 +4,6 @@ namespace uking::action { AnimalMoveGuidedBase::AnimalMoveGuidedBase(const InitArg& arg) : ksys::act::ai::Action(arg) {} -AnimalMoveGuidedBase::~AnimalMoveGuidedBase() = default; - bool AnimalMoveGuidedBase::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } diff --git a/src/Game/AI/Action/actionAnimalMoveGuidedBase.h b/src/Game/AI/Action/actionAnimalMoveGuidedBase.h index b175c0e8..2b20027f 100644 --- a/src/Game/AI/Action/actionAnimalMoveGuidedBase.h +++ b/src/Game/AI/Action/actionAnimalMoveGuidedBase.h @@ -8,7 +8,6 @@ class AnimalMoveGuidedBase : public ksys::act::ai::Action { SEAD_RTTI_OVERRIDE(AnimalMoveGuidedBase, ksys::act::ai::Action) public: explicit AnimalMoveGuidedBase(const InitArg& arg); - ~AnimalMoveGuidedBase() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/AI/Action/actionAnmTimingBackWalk.cpp b/src/Game/AI/Action/actionAnmTimingBackWalk.cpp index 4ab560a7..3430c85b 100644 --- a/src/Game/AI/Action/actionAnmTimingBackWalk.cpp +++ b/src/Game/AI/Action/actionAnmTimingBackWalk.cpp @@ -15,7 +15,7 @@ void AnmTimingBackWalk::enter_(ksys::act::ai::InlineParamPack* params) { } void AnmTimingBackWalk::leave_() { - BackWalkEx::leave_(); // NOLINT(bugprone-parent-virtual-call) + BackWalkWithAS::leave_(); } void AnmTimingBackWalk::loadParams_() { diff --git a/src/Game/AI/Action/actionAppear.cpp b/src/Game/AI/Action/actionAppear.cpp index dee71f97..61fd6549 100644 --- a/src/Game/AI/Action/actionAppear.cpp +++ b/src/Game/AI/Action/actionAppear.cpp @@ -4,27 +4,8 @@ namespace uking::action { Appear::Appear(const InitArg& arg) : ActionWithAS(arg) {} -Appear::~Appear() = default; - -bool Appear::init_(sead::Heap* heap) { - return ActionWithAS::init_(heap); -} - void Appear::enter_(ksys::act::ai::InlineParamPack* params) { ActionWithAS::enter_(params); } -void Appear::leave_() { - ActionWithAS::leave_(); -} - -void Appear::loadParams_() { - getStaticParam(&mPosReduceRatio_s, "PosReduceRatio"); - getStaticParam(&mAngReduceRatio_s, "AngReduceRatio"); -} - -void Appear::calc_() { - ActionWithAS::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionAppear.h b/src/Game/AI/Action/actionAppear.h index 769c3dcd..ba2519f1 100644 --- a/src/Game/AI/Action/actionAppear.h +++ b/src/Game/AI/Action/actionAppear.h @@ -9,20 +9,10 @@ class Appear : public ActionWithAS { SEAD_RTTI_OVERRIDE(Appear, ActionWithAS) public: explicit Appear(const InitArg& arg); - ~Appear() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; protected: - void calc_() override; - - // static_param at offset 0x20 - const float* mPosReduceRatio_s{}; - // static_param at offset 0x28 - const float* mAngReduceRatio_s{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionAppearFullPouchInfo.cpp b/src/Game/AI/Action/actionAppearFullPouchInfo.cpp index cdfc14d3..149b0770 100644 --- a/src/Game/AI/Action/actionAppearFullPouchInfo.cpp +++ b/src/Game/AI/Action/actionAppearFullPouchInfo.cpp @@ -10,20 +10,8 @@ bool AppearFullPouchInfo::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void AppearFullPouchInfo::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void AppearFullPouchInfo::leave_() { - ksys::act::ai::Action::leave_(); -} - void AppearFullPouchInfo::loadParams_() { getDynamicParam(&mPorchItemName_d, "PorchItemName"); } -void AppearFullPouchInfo::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionAppearFullPouchInfo.h b/src/Game/AI/Action/actionAppearFullPouchInfo.h index d143abcc..58f9d08f 100644 --- a/src/Game/AI/Action/actionAppearFullPouchInfo.h +++ b/src/Game/AI/Action/actionAppearFullPouchInfo.h @@ -11,13 +11,9 @@ public: ~AppearFullPouchInfo() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 sead::SafeString* mPorchItemName_d{}; }; diff --git a/src/Game/AI/Action/actionAppearNumDungeonClearSeal.cpp b/src/Game/AI/Action/actionAppearNumDungeonClearSeal.cpp index 7ae445c5..5c44901d 100644 --- a/src/Game/AI/Action/actionAppearNumDungeonClearSeal.cpp +++ b/src/Game/AI/Action/actionAppearNumDungeonClearSeal.cpp @@ -11,18 +11,6 @@ bool AppearNumDungeonClearSeal::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void AppearNumDungeonClearSeal::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void AppearNumDungeonClearSeal::leave_() { - ksys::act::ai::Action::leave_(); -} - void AppearNumDungeonClearSeal::loadParams_() {} -void AppearNumDungeonClearSeal::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionAppearNumDungeonClearSeal.h b/src/Game/AI/Action/actionAppearNumDungeonClearSeal.h index 046f2666..6cec7180 100644 --- a/src/Game/AI/Action/actionAppearNumDungeonClearSeal.h +++ b/src/Game/AI/Action/actionAppearNumDungeonClearSeal.h @@ -11,12 +11,9 @@ public: ~AppearNumDungeonClearSeal() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionAppearNumHeroSeal.cpp b/src/Game/AI/Action/actionAppearNumHeroSeal.cpp index bc1385b5..3eab3220 100644 --- a/src/Game/AI/Action/actionAppearNumHeroSeal.cpp +++ b/src/Game/AI/Action/actionAppearNumHeroSeal.cpp @@ -10,20 +10,8 @@ bool AppearNumHeroSeal::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void AppearNumHeroSeal::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void AppearNumHeroSeal::leave_() { - ksys::act::ai::Action::leave_(); -} - void AppearNumHeroSeal::loadParams_() { getDynamicParam(&mRelicPattern_d, "RelicPattern"); } -void AppearNumHeroSeal::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionAppearNumHeroSeal.h b/src/Game/AI/Action/actionAppearNumHeroSeal.h index 7db94af5..bf9354f7 100644 --- a/src/Game/AI/Action/actionAppearNumHeroSeal.h +++ b/src/Game/AI/Action/actionAppearNumHeroSeal.h @@ -11,13 +11,9 @@ public: ~AppearNumHeroSeal() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 int* mRelicPattern_d{}; }; diff --git a/src/Game/AI/Action/actionAppearNumKorokNuts.cpp b/src/Game/AI/Action/actionAppearNumKorokNuts.cpp index c4760fb4..ed192e49 100644 --- a/src/Game/AI/Action/actionAppearNumKorokNuts.cpp +++ b/src/Game/AI/Action/actionAppearNumKorokNuts.cpp @@ -10,18 +10,6 @@ bool AppearNumKorokNuts::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void AppearNumKorokNuts::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void AppearNumKorokNuts::leave_() { - ksys::act::ai::Action::leave_(); -} - void AppearNumKorokNuts::loadParams_() {} -void AppearNumKorokNuts::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionAppearNumKorokNuts.h b/src/Game/AI/Action/actionAppearNumKorokNuts.h index 9db089ea..a3aae228 100644 --- a/src/Game/AI/Action/actionAppearNumKorokNuts.h +++ b/src/Game/AI/Action/actionAppearNumKorokNuts.h @@ -11,12 +11,9 @@ public: ~AppearNumKorokNuts() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionAppearNumTargets.cpp b/src/Game/AI/Action/actionAppearNumTargets.cpp index e1985e3c..beec7900 100644 --- a/src/Game/AI/Action/actionAppearNumTargets.cpp +++ b/src/Game/AI/Action/actionAppearNumTargets.cpp @@ -10,20 +10,8 @@ bool AppearNumTargets::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void AppearNumTargets::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void AppearNumTargets::leave_() { - ksys::act::ai::Action::leave_(); -} - void AppearNumTargets::loadParams_() { getDynamicParam(&mGameDataIntTargetCounter_d, "GameDataIntTargetCounter"); } -void AppearNumTargets::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionAppearNumTargets.h b/src/Game/AI/Action/actionAppearNumTargets.h index 06ade582..203c1b75 100644 --- a/src/Game/AI/Action/actionAppearNumTargets.h +++ b/src/Game/AI/Action/actionAppearNumTargets.h @@ -11,13 +11,9 @@ public: ~AppearNumTargets() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 sead::SafeString* mGameDataIntTargetCounter_d{}; }; diff --git a/src/Game/AI/Action/actionApplyDamageForPlayer.cpp b/src/Game/AI/Action/actionApplyDamageForPlayer.cpp index ace21300..09f599ce 100644 --- a/src/Game/AI/Action/actionApplyDamageForPlayer.cpp +++ b/src/Game/AI/Action/actionApplyDamageForPlayer.cpp @@ -10,20 +10,8 @@ bool ApplyDamageForPlayer::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void ApplyDamageForPlayer::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void ApplyDamageForPlayer::leave_() { - ksys::act::ai::Action::leave_(); -} - void ApplyDamageForPlayer::loadParams_() { getDynamicParam(&mValue_d, "Value"); } -void ApplyDamageForPlayer::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionApplyDamageForPlayer.h b/src/Game/AI/Action/actionApplyDamageForPlayer.h index 4099c123..fd815c5b 100644 --- a/src/Game/AI/Action/actionApplyDamageForPlayer.h +++ b/src/Game/AI/Action/actionApplyDamageForPlayer.h @@ -11,13 +11,9 @@ public: ~ApplyDamageForPlayer() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 int* mValue_d{}; }; diff --git a/src/Game/AI/Action/actionAreaActorObserve.cpp b/src/Game/AI/Action/actionAreaActorObserve.cpp index 1d1dd001..016e1797 100644 --- a/src/Game/AI/Action/actionAreaActorObserve.cpp +++ b/src/Game/AI/Action/actionAreaActorObserve.cpp @@ -10,22 +10,10 @@ bool AreaActorObserve::init_(sead::Heap* heap) { return AreaTagAction::init_(heap); } -void AreaActorObserve::enter_(ksys::act::ai::InlineParamPack* params) { - AreaTagAction::enter_(params); -} - -void AreaActorObserve::leave_() { - AreaTagAction::leave_(); -} - void AreaActorObserve::loadParams_() { getMapUnitParam(&mCount_m, "Count"); getMapUnitParam(&mIsSendMessage_m, "IsSendMessage"); getMapUnitParam(&mDefaultBasicSignal_m, "DefaultBasicSignal"); } -void AreaActorObserve::calc_() { - AreaTagAction::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionAreaActorObserve.h b/src/Game/AI/Action/actionAreaActorObserve.h index 3260625c..677f29f1 100644 --- a/src/Game/AI/Action/actionAreaActorObserve.h +++ b/src/Game/AI/Action/actionAreaActorObserve.h @@ -12,13 +12,9 @@ public: ~AreaActorObserve() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // map_unit_param at offset 0x38 const int* mCount_m{}; // map_unit_param at offset 0x40 diff --git a/src/Game/AI/Action/actionAreaActorObserveByActorTag.cpp b/src/Game/AI/Action/actionAreaActorObserveByActorTag.cpp index 152e6d89..4bd43f18 100644 --- a/src/Game/AI/Action/actionAreaActorObserveByActorTag.cpp +++ b/src/Game/AI/Action/actionAreaActorObserveByActorTag.cpp @@ -11,22 +11,4 @@ bool AreaActorObserveByActorTag::init_(sead::Heap* heap) { return AreaActorObserve::init_(heap); } -void AreaActorObserveByActorTag::enter_(ksys::act::ai::InlineParamPack* params) { - AreaActorObserve::enter_(params); -} - -void AreaActorObserveByActorTag::leave_() { - AreaActorObserve::leave_(); -} - -void AreaActorObserveByActorTag::loadParams_() { - getMapUnitParam(&mCount_m, "Count"); - getMapUnitParam(&mIsSendMessage_m, "IsSendMessage"); - getMapUnitParam(&mDefaultBasicSignal_m, "DefaultBasicSignal"); -} - -void AreaActorObserveByActorTag::calc_() { - AreaActorObserve::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionAreaActorObserveByActorTag.h b/src/Game/AI/Action/actionAreaActorObserveByActorTag.h index 8a348ff9..6cd25b8b 100644 --- a/src/Game/AI/Action/actionAreaActorObserveByActorTag.h +++ b/src/Game/AI/Action/actionAreaActorObserveByActorTag.h @@ -12,19 +12,8 @@ public: ~AreaActorObserveByActorTag() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; protected: - void calc_() override; - - // map_unit_param at offset 0x38 - const int* mCount_m{}; - // map_unit_param at offset 0x40 - const bool* mIsSendMessage_m{}; - // map_unit_param at offset 0x48 - const bool* mDefaultBasicSignal_m{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionAreaActorObserveByGroup.cpp b/src/Game/AI/Action/actionAreaActorObserveByGroup.cpp index 68ca3ae8..e518c0b9 100644 --- a/src/Game/AI/Action/actionAreaActorObserveByGroup.cpp +++ b/src/Game/AI/Action/actionAreaActorObserveByGroup.cpp @@ -10,22 +10,4 @@ bool AreaActorObserveByGroup::init_(sead::Heap* heap) { return AreaActorObserve::init_(heap); } -void AreaActorObserveByGroup::enter_(ksys::act::ai::InlineParamPack* params) { - AreaActorObserve::enter_(params); -} - -void AreaActorObserveByGroup::leave_() { - AreaActorObserve::leave_(); -} - -void AreaActorObserveByGroup::loadParams_() { - getMapUnitParam(&mCount_m, "Count"); - getMapUnitParam(&mIsSendMessage_m, "IsSendMessage"); - getMapUnitParam(&mDefaultBasicSignal_m, "DefaultBasicSignal"); -} - -void AreaActorObserveByGroup::calc_() { - AreaActorObserve::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionAreaActorObserveByGroup.h b/src/Game/AI/Action/actionAreaActorObserveByGroup.h index 3efc27c3..903e6413 100644 --- a/src/Game/AI/Action/actionAreaActorObserveByGroup.h +++ b/src/Game/AI/Action/actionAreaActorObserveByGroup.h @@ -12,19 +12,8 @@ public: ~AreaActorObserveByGroup() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; protected: - void calc_() override; - - // map_unit_param at offset 0x38 - const int* mCount_m{}; - // map_unit_param at offset 0x40 - const bool* mIsSendMessage_m{}; - // map_unit_param at offset 0x48 - const bool* mDefaultBasicSignal_m{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionAreaBase.cpp b/src/Game/AI/Action/actionAreaBase.cpp index 34cf13b4..64d2c938 100644 --- a/src/Game/AI/Action/actionAreaBase.cpp +++ b/src/Game/AI/Action/actionAreaBase.cpp @@ -4,20 +4,6 @@ namespace uking::action { AreaBase::AreaBase(const InitArg& arg) : ksys::act::ai::Action(arg) {} -AreaBase::~AreaBase() = default; - -bool AreaBase::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - -void AreaBase::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void AreaBase::leave_() { - ksys::act::ai::Action::leave_(); -} - void AreaBase::loadParams_() { getMapUnitParam(&mEnableCharacterOn_m, "EnableCharacterOn"); } diff --git a/src/Game/AI/Action/actionAreaBase.h b/src/Game/AI/Action/actionAreaBase.h index b7b86439..0d8c522e 100644 --- a/src/Game/AI/Action/actionAreaBase.h +++ b/src/Game/AI/Action/actionAreaBase.h @@ -8,11 +8,7 @@ class AreaBase : public ksys::act::ai::Action { SEAD_RTTI_OVERRIDE(AreaBase, ksys::act::ai::Action) public: explicit AreaBase(const InitArg& arg); - ~AreaBase() override; - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: diff --git a/src/Game/AI/Action/actionAreaFireObserve.cpp b/src/Game/AI/Action/actionAreaFireObserve.cpp index 31cdbbfe..6b0d196b 100644 --- a/src/Game/AI/Action/actionAreaFireObserve.cpp +++ b/src/Game/AI/Action/actionAreaFireObserve.cpp @@ -4,24 +4,4 @@ namespace uking::action { AreaFireObserve::AreaFireObserve(const InitArg& arg) : AreaFireObserveBase(arg) {} -AreaFireObserve::~AreaFireObserve() = default; - -bool AreaFireObserve::init_(sead::Heap* heap) { - return AreaFireObserveBase::init_(heap); -} - -void AreaFireObserve::enter_(ksys::act::ai::InlineParamPack* params) { - AreaFireObserveBase::enter_(params); -} - -void AreaFireObserve::leave_() { - AreaFireObserveBase::leave_(); -} - -void AreaFireObserve::loadParams_() {} - -void AreaFireObserve::calc_() { - AreaFireObserveBase::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionAreaFireObserve.h b/src/Game/AI/Action/actionAreaFireObserve.h index 2a8be146..3ef25642 100644 --- a/src/Game/AI/Action/actionAreaFireObserve.h +++ b/src/Game/AI/Action/actionAreaFireObserve.h @@ -9,15 +9,8 @@ class AreaFireObserve : public AreaFireObserveBase { SEAD_RTTI_OVERRIDE(AreaFireObserve, AreaFireObserveBase) public: explicit AreaFireObserve(const InitArg& arg); - ~AreaFireObserve() override; - - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionAreaFireObserveBase.cpp b/src/Game/AI/Action/actionAreaFireObserveBase.cpp index 756245f9..54282c9e 100644 --- a/src/Game/AI/Action/actionAreaFireObserveBase.cpp +++ b/src/Game/AI/Action/actionAreaFireObserveBase.cpp @@ -6,20 +6,10 @@ AreaFireObserveBase::AreaFireObserveBase(const InitArg& arg) : ksys::act::ai::Ac AreaFireObserveBase::~AreaFireObserveBase() = default; -bool AreaFireObserveBase::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - void AreaFireObserveBase::enter_(ksys::act::ai::InlineParamPack* params) { ksys::act::ai::Action::enter_(params); } -void AreaFireObserveBase::leave_() { - ksys::act::ai::Action::leave_(); -} - -void AreaFireObserveBase::loadParams_() {} - void AreaFireObserveBase::calc_() { ksys::act::ai::Action::calc_(); } diff --git a/src/Game/AI/Action/actionAreaFireObserveBase.h b/src/Game/AI/Action/actionAreaFireObserveBase.h index 4a2f0543..ad4828cd 100644 --- a/src/Game/AI/Action/actionAreaFireObserveBase.h +++ b/src/Game/AI/Action/actionAreaFireObserveBase.h @@ -10,10 +10,7 @@ public: explicit AreaFireObserveBase(const InitArg& arg); ~AreaFireObserveBase() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; protected: void calc_() override; diff --git a/src/Game/AI/Action/actionAreaHorseSpeedLimitAction.cpp b/src/Game/AI/Action/actionAreaHorseSpeedLimitAction.cpp index 17b690f4..957ce354 100644 --- a/src/Game/AI/Action/actionAreaHorseSpeedLimitAction.cpp +++ b/src/Game/AI/Action/actionAreaHorseSpeedLimitAction.cpp @@ -10,18 +10,4 @@ bool AreaHorseSpeedLimitAction::init_(sead::Heap* heap) { return AreaTagAction::init_(heap); } -void AreaHorseSpeedLimitAction::enter_(ksys::act::ai::InlineParamPack* params) { - AreaTagAction::enter_(params); -} - -void AreaHorseSpeedLimitAction::leave_() { - AreaTagAction::leave_(); -} - -void AreaHorseSpeedLimitAction::loadParams_() {} - -void AreaHorseSpeedLimitAction::calc_() { - AreaTagAction::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionAreaHorseSpeedLimitAction.h b/src/Game/AI/Action/actionAreaHorseSpeedLimitAction.h index 7ee3238b..24277189 100644 --- a/src/Game/AI/Action/actionAreaHorseSpeedLimitAction.h +++ b/src/Game/AI/Action/actionAreaHorseSpeedLimitAction.h @@ -12,12 +12,8 @@ public: ~AreaHorseSpeedLimitAction() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionAreaObserveActorAction.cpp b/src/Game/AI/Action/actionAreaObserveActorAction.cpp index 70ee86e4..d69c4f5d 100644 --- a/src/Game/AI/Action/actionAreaObserveActorAction.cpp +++ b/src/Game/AI/Action/actionAreaObserveActorAction.cpp @@ -6,26 +6,4 @@ AreaObserveActorAction::AreaObserveActorAction(const InitArg& arg) : AreaActorOb AreaObserveActorAction::~AreaObserveActorAction() = default; -bool AreaObserveActorAction::init_(sead::Heap* heap) { - return AreaActorObserve::init_(heap); -} - -void AreaObserveActorAction::enter_(ksys::act::ai::InlineParamPack* params) { - AreaActorObserve::enter_(params); -} - -void AreaObserveActorAction::leave_() { - AreaActorObserve::leave_(); -} - -void AreaObserveActorAction::loadParams_() { - getMapUnitParam(&mCount_m, "Count"); - getMapUnitParam(&mIsSendMessage_m, "IsSendMessage"); - getMapUnitParam(&mDefaultBasicSignal_m, "DefaultBasicSignal"); -} - -void AreaObserveActorAction::calc_() { - AreaActorObserve::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionAreaObserveActorAction.h b/src/Game/AI/Action/actionAreaObserveActorAction.h index 4c9f06a9..a721e9b2 100644 --- a/src/Game/AI/Action/actionAreaObserveActorAction.h +++ b/src/Game/AI/Action/actionAreaObserveActorAction.h @@ -11,20 +11,7 @@ public: explicit AreaObserveActorAction(const InitArg& arg); ~AreaObserveActorAction() override; - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; - protected: - void calc_() override; - - // map_unit_param at offset 0x38 - const int* mCount_m{}; - // map_unit_param at offset 0x40 - const bool* mIsSendMessage_m{}; - // map_unit_param at offset 0x48 - const bool* mDefaultBasicSignal_m{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionAreaOutRecreateActorAction.cpp b/src/Game/AI/Action/actionAreaOutRecreateActorAction.cpp index df21ce94..bad5a74c 100644 --- a/src/Game/AI/Action/actionAreaOutRecreateActorAction.cpp +++ b/src/Game/AI/Action/actionAreaOutRecreateActorAction.cpp @@ -10,18 +10,4 @@ bool AreaOutRecreateActorAction::init_(sead::Heap* heap) { return AreaTagAction::init_(heap); } -void AreaOutRecreateActorAction::enter_(ksys::act::ai::InlineParamPack* params) { - AreaTagAction::enter_(params); -} - -void AreaOutRecreateActorAction::leave_() { - AreaTagAction::leave_(); -} - -void AreaOutRecreateActorAction::loadParams_() {} - -void AreaOutRecreateActorAction::calc_() { - AreaTagAction::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionAreaOutRecreateActorAction.h b/src/Game/AI/Action/actionAreaOutRecreateActorAction.h index 723a5a6e..9a30bd0d 100644 --- a/src/Game/AI/Action/actionAreaOutRecreateActorAction.h +++ b/src/Game/AI/Action/actionAreaOutRecreateActorAction.h @@ -12,12 +12,8 @@ public: ~AreaOutRecreateActorAction() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionAreaRecreateActorAction.cpp b/src/Game/AI/Action/actionAreaRecreateActorAction.cpp index b4cbde17..62d97b78 100644 --- a/src/Game/AI/Action/actionAreaRecreateActorAction.cpp +++ b/src/Game/AI/Action/actionAreaRecreateActorAction.cpp @@ -10,18 +10,4 @@ bool AreaRecreateActorAction::init_(sead::Heap* heap) { return AreaTagAction::init_(heap); } -void AreaRecreateActorAction::enter_(ksys::act::ai::InlineParamPack* params) { - AreaTagAction::enter_(params); -} - -void AreaRecreateActorAction::leave_() { - AreaTagAction::leave_(); -} - -void AreaRecreateActorAction::loadParams_() {} - -void AreaRecreateActorAction::calc_() { - AreaTagAction::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionAreaRecreateActorAction.h b/src/Game/AI/Action/actionAreaRecreateActorAction.h index 7711aee4..b221eaf1 100644 --- a/src/Game/AI/Action/actionAreaRecreateActorAction.h +++ b/src/Game/AI/Action/actionAreaRecreateActorAction.h @@ -12,12 +12,8 @@ public: ~AreaRecreateActorAction() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionAreaRoot.cpp b/src/Game/AI/Action/actionAreaRoot.cpp index 9a1739b0..e1f72b99 100644 --- a/src/Game/AI/Action/actionAreaRoot.cpp +++ b/src/Game/AI/Action/actionAreaRoot.cpp @@ -10,14 +10,6 @@ bool AreaRoot::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void AreaRoot::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void AreaRoot::leave_() { - ksys::act::ai::Action::leave_(); -} - void AreaRoot::loadParams_() { getStaticParam(&mAutoSaveInterval_s, "AutoSaveInterval"); getMapUnitParam(&mCameraPriority_m, "CameraPriority"); diff --git a/src/Game/AI/Action/actionAreaRoot.h b/src/Game/AI/Action/actionAreaRoot.h index 230a3dcc..ccbc91ce 100644 --- a/src/Game/AI/Action/actionAreaRoot.h +++ b/src/Game/AI/Action/actionAreaRoot.h @@ -11,8 +11,6 @@ public: ~AreaRoot() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: diff --git a/src/Game/AI/Action/actionAreaTagAction.cpp b/src/Game/AI/Action/actionAreaTagAction.cpp index cb4c018e..6075042d 100644 --- a/src/Game/AI/Action/actionAreaTagAction.cpp +++ b/src/Game/AI/Action/actionAreaTagAction.cpp @@ -6,20 +6,10 @@ AreaTagAction::AreaTagAction(const InitArg& arg) : ksys::act::ai::Action(arg) {} AreaTagAction::~AreaTagAction() = default; -bool AreaTagAction::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - void AreaTagAction::enter_(ksys::act::ai::InlineParamPack* params) { ksys::act::ai::Action::enter_(params); } -void AreaTagAction::leave_() { - ksys::act::ai::Action::leave_(); -} - -void AreaTagAction::loadParams_() {} - void AreaTagAction::calc_() { ksys::act::ai::Action::calc_(); } diff --git a/src/Game/AI/Action/actionAreaTagAction.h b/src/Game/AI/Action/actionAreaTagAction.h index 973224eb..0fcaf4a6 100644 --- a/src/Game/AI/Action/actionAreaTagAction.h +++ b/src/Game/AI/Action/actionAreaTagAction.h @@ -10,10 +10,7 @@ public: explicit AreaTagAction(const InitArg& arg); ~AreaTagAction() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; protected: void calc_() override; diff --git a/src/Game/AI/Action/actionArmorBindNodeAction.cpp b/src/Game/AI/Action/actionArmorBindNodeAction.cpp index 8499c187..c4f66d72 100644 --- a/src/Game/AI/Action/actionArmorBindNodeAction.cpp +++ b/src/Game/AI/Action/actionArmorBindNodeAction.cpp @@ -6,10 +6,6 @@ ArmorBindNodeAction::ArmorBindNodeAction(const InitArg& arg) : ksys::act::ai::Ac ArmorBindNodeAction::~ArmorBindNodeAction() = default; -bool ArmorBindNodeAction::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - void ArmorBindNodeAction::enter_(ksys::act::ai::InlineParamPack* params) { ksys::act::ai::Action::enter_(params); } diff --git a/src/Game/AI/Action/actionArmorBindNodeAction.h b/src/Game/AI/Action/actionArmorBindNodeAction.h index f96ef5b7..b73244a4 100644 --- a/src/Game/AI/Action/actionArmorBindNodeAction.h +++ b/src/Game/AI/Action/actionArmorBindNodeAction.h @@ -10,7 +10,6 @@ public: explicit ArmorBindNodeAction(const InitArg& arg); ~ArmorBindNodeAction() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionArmorBindWithAS.cpp b/src/Game/AI/Action/actionArmorBindWithAS.cpp index 5eefe5b0..0d7f50c6 100644 --- a/src/Game/AI/Action/actionArmorBindWithAS.cpp +++ b/src/Game/AI/Action/actionArmorBindWithAS.cpp @@ -6,10 +6,6 @@ ArmorBindWithAS::ArmorBindWithAS(const InitArg& arg) : ArmorBindAction(arg) {} ArmorBindWithAS::~ArmorBindWithAS() = default; -bool ArmorBindWithAS::init_(sead::Heap* heap) { - return ArmorBindAction::init_(heap); -} - void ArmorBindWithAS::enter_(ksys::act::ai::InlineParamPack* params) { ArmorBindAction::enter_(params); } @@ -23,8 +19,4 @@ void ArmorBindWithAS::loadParams_() { getDynamicParam(&mASName_d, "ASName"); } -void ArmorBindWithAS::calc_() { - ArmorBindAction::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionArmorBindWithAS.h b/src/Game/AI/Action/actionArmorBindWithAS.h index 29a602bb..94885ab0 100644 --- a/src/Game/AI/Action/actionArmorBindWithAS.h +++ b/src/Game/AI/Action/actionArmorBindWithAS.h @@ -11,14 +11,11 @@ public: explicit ArmorBindWithAS(const InitArg& arg); ~ArmorBindWithAS() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x30 sead::SafeString* mASName_d{}; }; diff --git a/src/Game/AI/Action/actionArrowShootHoming.cpp b/src/Game/AI/Action/actionArrowShootHoming.cpp index d35c8472..e5127c32 100644 --- a/src/Game/AI/Action/actionArrowShootHoming.cpp +++ b/src/Game/AI/Action/actionArrowShootHoming.cpp @@ -6,18 +6,10 @@ ArrowShootHoming::ArrowShootHoming(const InitArg& arg) : ArrowShootMove(arg) {} ArrowShootHoming::~ArrowShootHoming() = default; -bool ArrowShootHoming::init_(sead::Heap* heap) { - return ArrowShootMove::init_(heap); -} - void ArrowShootHoming::enter_(ksys::act::ai::InlineParamPack* params) { ArrowShootMove::enter_(params); } -void ArrowShootHoming::leave_() { - ArrowShootMove::leave_(); -} - void ArrowShootHoming::loadParams_() { ArrowShootMove::loadParams_(); getStaticParam(&mSubAngMax_s, "SubAngMax"); diff --git a/src/Game/AI/Action/actionArrowShootHoming.h b/src/Game/AI/Action/actionArrowShootHoming.h index 6c5a2083..a2f18d71 100644 --- a/src/Game/AI/Action/actionArrowShootHoming.h +++ b/src/Game/AI/Action/actionArrowShootHoming.h @@ -11,9 +11,7 @@ public: explicit ArrowShootHoming(const InitArg& arg); ~ArrowShootHoming() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: diff --git a/src/Game/AI/Action/actionArrowShootMove.cpp b/src/Game/AI/Action/actionArrowShootMove.cpp index da9742fe..6eb7c0d9 100644 --- a/src/Game/AI/Action/actionArrowShootMove.cpp +++ b/src/Game/AI/Action/actionArrowShootMove.cpp @@ -6,10 +6,6 @@ ArrowShootMove::ArrowShootMove(const InitArg& arg) : ksys::act::ai::Action(arg) ArrowShootMove::~ArrowShootMove() = default; -bool ArrowShootMove::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - void ArrowShootMove::enter_(ksys::act::ai::InlineParamPack* params) { ksys::act::ai::Action::enter_(params); } diff --git a/src/Game/AI/Action/actionArrowShootMove.h b/src/Game/AI/Action/actionArrowShootMove.h index 6682b3f8..a6f3b175 100644 --- a/src/Game/AI/Action/actionArrowShootMove.h +++ b/src/Game/AI/Action/actionArrowShootMove.h @@ -10,7 +10,6 @@ public: explicit ArrowShootMove(const InitArg& arg); ~ArrowShootMove() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionArrowShootMoveForLargeObject.cpp b/src/Game/AI/Action/actionArrowShootMoveForLargeObject.cpp index ec1d81e9..668e5da3 100644 --- a/src/Game/AI/Action/actionArrowShootMoveForLargeObject.cpp +++ b/src/Game/AI/Action/actionArrowShootMoveForLargeObject.cpp @@ -7,18 +7,10 @@ ArrowShootMoveForLargeObject::ArrowShootMoveForLargeObject(const InitArg& arg) ArrowShootMoveForLargeObject::~ArrowShootMoveForLargeObject() = default; -bool ArrowShootMoveForLargeObject::init_(sead::Heap* heap) { - return ArrowShootMove::init_(heap); -} - void ArrowShootMoveForLargeObject::enter_(ksys::act::ai::InlineParamPack* params) { ArrowShootMove::enter_(params); } -void ArrowShootMoveForLargeObject::leave_() { - ArrowShootMove::leave_(); -} - void ArrowShootMoveForLargeObject::loadParams_() { ArrowShootMove::loadParams_(); getStaticParam(&mRayCastDist_s, "RayCastDist"); diff --git a/src/Game/AI/Action/actionArrowShootMoveForLargeObject.h b/src/Game/AI/Action/actionArrowShootMoveForLargeObject.h index f74e57fc..682e0dc8 100644 --- a/src/Game/AI/Action/actionArrowShootMoveForLargeObject.h +++ b/src/Game/AI/Action/actionArrowShootMoveForLargeObject.h @@ -11,9 +11,7 @@ public: explicit ArrowShootMoveForLargeObject(const InitArg& arg); ~ArrowShootMoveForLargeObject() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: diff --git a/src/Game/AI/Action/actionArrowSkyShootMove.cpp b/src/Game/AI/Action/actionArrowSkyShootMove.cpp index 01231a14..90f77d98 100644 --- a/src/Game/AI/Action/actionArrowSkyShootMove.cpp +++ b/src/Game/AI/Action/actionArrowSkyShootMove.cpp @@ -6,10 +6,6 @@ ArrowSkyShootMove::ArrowSkyShootMove(const InitArg& arg) : ArrowShootMove(arg) { ArrowSkyShootMove::~ArrowSkyShootMove() = default; -bool ArrowSkyShootMove::init_(sead::Heap* heap) { - return ArrowShootMove::init_(heap); -} - void ArrowSkyShootMove::enter_(ksys::act::ai::InlineParamPack* params) { ArrowShootMove::enter_(params); } diff --git a/src/Game/AI/Action/actionArrowSkyShootMove.h b/src/Game/AI/Action/actionArrowSkyShootMove.h index 007ff954..43fc0a6a 100644 --- a/src/Game/AI/Action/actionArrowSkyShootMove.h +++ b/src/Game/AI/Action/actionArrowSkyShootMove.h @@ -11,7 +11,6 @@ public: explicit ArrowSkyShootMove(const InitArg& arg); ~ArrowSkyShootMove() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionAtOnWait.cpp b/src/Game/AI/Action/actionAtOnWait.cpp index 48f07fb8..756360e9 100644 --- a/src/Game/AI/Action/actionAtOnWait.cpp +++ b/src/Game/AI/Action/actionAtOnWait.cpp @@ -4,8 +4,6 @@ namespace uking::action { AtOnWait::AtOnWait(const InitArg& arg) : ksys::act::ai::Action(arg) {} -AtOnWait::~AtOnWait() = default; - bool AtOnWait::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } diff --git a/src/Game/AI/Action/actionAtOnWait.h b/src/Game/AI/Action/actionAtOnWait.h index 37df977c..f894cba8 100644 --- a/src/Game/AI/Action/actionAtOnWait.h +++ b/src/Game/AI/Action/actionAtOnWait.h @@ -8,7 +8,6 @@ class AtOnWait : public ksys::act::ai::Action { SEAD_RTTI_OVERRIDE(AtOnWait, ksys::act::ai::Action) public: explicit AtOnWait(const InitArg& arg); - ~AtOnWait() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/AI/Action/actionAttack.cpp b/src/Game/AI/Action/actionAttack.cpp index b33e3341..aad32de4 100644 --- a/src/Game/AI/Action/actionAttack.cpp +++ b/src/Game/AI/Action/actionAttack.cpp @@ -6,10 +6,6 @@ Attack::Attack(const InitArg& arg) : AttackBase(arg) {} Attack::~Attack() = default; -bool Attack::init_(sead::Heap* heap) { - return AttackBase::init_(heap); -} - void Attack::enter_(ksys::act::ai::InlineParamPack* params) { AttackBase::enter_(params); } diff --git a/src/Game/AI/Action/actionAttack.h b/src/Game/AI/Action/actionAttack.h index 86123de4..941d069a 100644 --- a/src/Game/AI/Action/actionAttack.h +++ b/src/Game/AI/Action/actionAttack.h @@ -11,7 +11,6 @@ public: explicit Attack(const InitArg& arg); ~Attack() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionAttackJumpToTarget.cpp b/src/Game/AI/Action/actionAttackJumpToTarget.cpp index fb6fabad..c5297911 100644 --- a/src/Game/AI/Action/actionAttackJumpToTarget.cpp +++ b/src/Game/AI/Action/actionAttackJumpToTarget.cpp @@ -6,10 +6,6 @@ AttackJumpToTarget::AttackJumpToTarget(const InitArg& arg) : JumpToTarget(arg) { AttackJumpToTarget::~AttackJumpToTarget() = default; -bool AttackJumpToTarget::init_(sead::Heap* heap) { - return JumpToTarget::init_(heap); -} - void AttackJumpToTarget::enter_(ksys::act::ai::InlineParamPack* params) { JumpToTarget::enter_(params); } diff --git a/src/Game/AI/Action/actionAttackJumpToTarget.h b/src/Game/AI/Action/actionAttackJumpToTarget.h index d7b40ac6..53132c1b 100644 --- a/src/Game/AI/Action/actionAttackJumpToTarget.h +++ b/src/Game/AI/Action/actionAttackJumpToTarget.h @@ -11,7 +11,6 @@ public: explicit AttackJumpToTarget(const InitArg& arg); ~AttackJumpToTarget() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionAttackPartBind.cpp b/src/Game/AI/Action/actionAttackPartBind.cpp index ec98b87c..7de9beb8 100644 --- a/src/Game/AI/Action/actionAttackPartBind.cpp +++ b/src/Game/AI/Action/actionAttackPartBind.cpp @@ -6,10 +6,6 @@ AttackPartBind::AttackPartBind(const InitArg& arg) : Attack(arg) {} AttackPartBind::~AttackPartBind() = default; -bool AttackPartBind::init_(sead::Heap* heap) { - return Attack::init_(heap); -} - void AttackPartBind::enter_(ksys::act::ai::InlineParamPack* params) { Attack::enter_(params); } diff --git a/src/Game/AI/Action/actionAttackPartBind.h b/src/Game/AI/Action/actionAttackPartBind.h index 803fa1c3..9f06534e 100644 --- a/src/Game/AI/Action/actionAttackPartBind.h +++ b/src/Game/AI/Action/actionAttackPartBind.h @@ -11,7 +11,6 @@ public: explicit AttackPartBind(const InitArg& arg); ~AttackPartBind() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionBackStep.cpp b/src/Game/AI/Action/actionBackStep.cpp index 64518c65..ed7a7362 100644 --- a/src/Game/AI/Action/actionBackStep.cpp +++ b/src/Game/AI/Action/actionBackStep.cpp @@ -4,27 +4,4 @@ namespace uking::action { BackStep::BackStep(const InitArg& arg) : BackStepBase(arg) {} -BackStep::~BackStep() = default; - -bool BackStep::init_(sead::Heap* heap) { - return BackStepBase::init_(heap); -} - -void BackStep::enter_(ksys::act::ai::InlineParamPack* params) { - BackStepBase::enter_(params); -} - -void BackStep::leave_() { - BackStepBase::leave_(); -} - -void BackStep::loadParams_() { - BackStepToTarget::loadParams_(); - getStaticParam(&mJumpDist_s, "JumpDist"); -} - -void BackStep::calc_() { - BackStepBase::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionBackStep.h b/src/Game/AI/Action/actionBackStep.h index 9e8dc898..9f95e65d 100644 --- a/src/Game/AI/Action/actionBackStep.h +++ b/src/Game/AI/Action/actionBackStep.h @@ -9,18 +9,8 @@ class BackStep : public BackStepBase { SEAD_RTTI_OVERRIDE(BackStep, BackStepBase) public: explicit BackStep(const InitArg& arg); - ~BackStep() override; - - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; protected: - void calc_() override; - - // static_param at offset 0xc0 - const float* mJumpDist_s{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionBackStepAttack.cpp b/src/Game/AI/Action/actionBackStepAttack.cpp index 9fc5f722..2ef5c790 100644 --- a/src/Game/AI/Action/actionBackStepAttack.cpp +++ b/src/Game/AI/Action/actionBackStepAttack.cpp @@ -6,10 +6,6 @@ BackStepAttack::BackStepAttack(const InitArg& arg) : BackStepBase(arg) {} BackStepAttack::~BackStepAttack() = default; -bool BackStepAttack::init_(sead::Heap* heap) { - return BackStepBase::init_(heap); -} - void BackStepAttack::enter_(ksys::act::ai::InlineParamPack* params) { BackStepBase::enter_(params); } diff --git a/src/Game/AI/Action/actionBackStepAttack.h b/src/Game/AI/Action/actionBackStepAttack.h index 695d4ccc..f92d1379 100644 --- a/src/Game/AI/Action/actionBackStepAttack.h +++ b/src/Game/AI/Action/actionBackStepAttack.h @@ -11,7 +11,6 @@ public: explicit BackStepAttack(const InitArg& arg); ~BackStepAttack() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionBackStepToTarget.cpp b/src/Game/AI/Action/actionBackStepToTarget.cpp index e37f00f3..6fcd8376 100644 --- a/src/Game/AI/Action/actionBackStepToTarget.cpp +++ b/src/Game/AI/Action/actionBackStepToTarget.cpp @@ -6,10 +6,6 @@ BackStepToTarget::BackStepToTarget(const InitArg& arg) : ActionEx(arg) {} BackStepToTarget::~BackStepToTarget() = default; -bool BackStepToTarget::init_(sead::Heap* heap) { - return ActionEx::init_(heap); -} - void BackStepToTarget::enter_(ksys::act::ai::InlineParamPack* params) { ActionEx::enter_(params); } diff --git a/src/Game/AI/Action/actionBackStepToTarget.h b/src/Game/AI/Action/actionBackStepToTarget.h index 257ea5d4..af76bb29 100644 --- a/src/Game/AI/Action/actionBackStepToTarget.h +++ b/src/Game/AI/Action/actionBackStepToTarget.h @@ -11,7 +11,6 @@ public: explicit BackStepToTarget(const InitArg& arg); ~BackStepToTarget() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionBackWalk.cpp b/src/Game/AI/Action/actionBackWalk.cpp index 2586c1c6..0c02e833 100644 --- a/src/Game/AI/Action/actionBackWalk.cpp +++ b/src/Game/AI/Action/actionBackWalk.cpp @@ -4,26 +4,8 @@ namespace uking::action { BackWalk::BackWalk(const InitArg& arg) : BackWalkEx(arg) {} -BackWalk::~BackWalk() = default; - -bool BackWalk::init_(sead::Heap* heap) { - return BackWalkEx::init_(heap); -} - void BackWalk::enter_(ksys::act::ai::InlineParamPack* params) { BackWalkEx::enter_(params); } -void BackWalk::leave_() { - BackWalkEx::leave_(); -} - -void BackWalk::loadParams_() { - BackWalkBase::loadParams_(); -} - -void BackWalk::calc_() { - BackWalkEx::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionBackWalk.h b/src/Game/AI/Action/actionBackWalk.h index 6068f3fa..e96884a2 100644 --- a/src/Game/AI/Action/actionBackWalk.h +++ b/src/Game/AI/Action/actionBackWalk.h @@ -9,15 +9,10 @@ class BackWalk : public BackWalkEx { SEAD_RTTI_OVERRIDE(BackWalk, BackWalkEx) public: explicit BackWalk(const InitArg& arg); - ~BackWalk() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionBackWalkBase.cpp b/src/Game/AI/Action/actionBackWalkBase.cpp index ecebb000..644d060e 100644 --- a/src/Game/AI/Action/actionBackWalkBase.cpp +++ b/src/Game/AI/Action/actionBackWalkBase.cpp @@ -6,10 +6,6 @@ BackWalkBase::BackWalkBase(const InitArg& arg) : ActionEx(arg) {} BackWalkBase::~BackWalkBase() = default; -bool BackWalkBase::init_(sead::Heap* heap) { - return ActionEx::init_(heap); -} - void BackWalkBase::enter_(ksys::act::ai::InlineParamPack* params) { ActionEx::enter_(params); } diff --git a/src/Game/AI/Action/actionBackWalkBase.h b/src/Game/AI/Action/actionBackWalkBase.h index 5c96bff6..22b5167f 100644 --- a/src/Game/AI/Action/actionBackWalkBase.h +++ b/src/Game/AI/Action/actionBackWalkBase.h @@ -11,7 +11,6 @@ public: explicit BackWalkBase(const InitArg& arg); ~BackWalkBase() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionBackWalkWithAS.cpp b/src/Game/AI/Action/actionBackWalkWithAS.cpp index ea5d1ecf..648248b3 100644 --- a/src/Game/AI/Action/actionBackWalkWithAS.cpp +++ b/src/Game/AI/Action/actionBackWalkWithAS.cpp @@ -6,18 +6,10 @@ BackWalkWithAS::BackWalkWithAS(const InitArg& arg) : BackWalkEx(arg) {} BackWalkWithAS::~BackWalkWithAS() = default; -bool BackWalkWithAS::init_(sead::Heap* heap) { - return BackWalkEx::init_(heap); -} - void BackWalkWithAS::enter_(ksys::act::ai::InlineParamPack* params) { BackWalkEx::enter_(params); } -void BackWalkWithAS::leave_() { - BackWalkEx::leave_(); -} - void BackWalkWithAS::loadParams_() { BackWalkEx::loadParams_(); getStaticParam(&mASName_s, "ASName"); diff --git a/src/Game/AI/Action/actionBackWalkWithAS.h b/src/Game/AI/Action/actionBackWalkWithAS.h index 0ce62d1a..c6c640df 100644 --- a/src/Game/AI/Action/actionBackWalkWithAS.h +++ b/src/Game/AI/Action/actionBackWalkWithAS.h @@ -11,9 +11,7 @@ public: explicit BackWalkWithAS(const InitArg& arg); ~BackWalkWithAS() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: diff --git a/src/Game/AI/Action/actionBattleCloseDangerAvoidRun.cpp b/src/Game/AI/Action/actionBattleCloseDangerAvoidRun.cpp index bdf02a23..5450f81c 100644 --- a/src/Game/AI/Action/actionBattleCloseDangerAvoidRun.cpp +++ b/src/Game/AI/Action/actionBattleCloseDangerAvoidRun.cpp @@ -7,25 +7,9 @@ BattleCloseDangerAvoidRun::BattleCloseDangerAvoidRun(const InitArg& arg) BattleCloseDangerAvoidRun::~BattleCloseDangerAvoidRun() = default; -bool BattleCloseDangerAvoidRun::init_(sead::Heap* heap) { - return BattleCloseExplosivesAvoidRun::init_(heap); -} - -void BattleCloseDangerAvoidRun::enter_(ksys::act::ai::InlineParamPack* params) { - BattleCloseExplosivesAvoidRun::enter_(params); -} - -void BattleCloseDangerAvoidRun::leave_() { - BattleCloseExplosivesAvoidRun::leave_(); -} - void BattleCloseDangerAvoidRun::loadParams_() { BattleCloseExplosivesAvoidRun::loadParams_(); getStaticParam(&mAvoidSubAngle_s, "AvoidSubAngle"); } -void BattleCloseDangerAvoidRun::calc_() { - BattleCloseExplosivesAvoidRun::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionBattleCloseDangerAvoidRun.h b/src/Game/AI/Action/actionBattleCloseDangerAvoidRun.h index 6bfef7a8..ec4f3136 100644 --- a/src/Game/AI/Action/actionBattleCloseDangerAvoidRun.h +++ b/src/Game/AI/Action/actionBattleCloseDangerAvoidRun.h @@ -11,14 +11,9 @@ public: explicit BattleCloseDangerAvoidRun(const InitArg& arg); ~BattleCloseDangerAvoidRun() override; - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // static_param at offset 0xe0 const float* mAvoidSubAngle_s{}; }; diff --git a/src/Game/AI/Action/actionBattleCloseExplosivesAvoidRun.cpp b/src/Game/AI/Action/actionBattleCloseExplosivesAvoidRun.cpp index 4169af0b..0c25afc8 100644 --- a/src/Game/AI/Action/actionBattleCloseExplosivesAvoidRun.cpp +++ b/src/Game/AI/Action/actionBattleCloseExplosivesAvoidRun.cpp @@ -7,10 +7,6 @@ BattleCloseExplosivesAvoidRun::BattleCloseExplosivesAvoidRun(const InitArg& arg) BattleCloseExplosivesAvoidRun::~BattleCloseExplosivesAvoidRun() = default; -bool BattleCloseExplosivesAvoidRun::init_(sead::Heap* heap) { - return BattleCloseMoveAction::init_(heap); -} - void BattleCloseExplosivesAvoidRun::enter_(ksys::act::ai::InlineParamPack* params) { BattleCloseMoveAction::enter_(params); } @@ -24,8 +20,4 @@ void BattleCloseExplosivesAvoidRun::loadParams_() { getStaticParam(&mDamageIgnoreDist_s, "DamageIgnoreDist"); } -void BattleCloseExplosivesAvoidRun::calc_() { - BattleCloseMoveAction::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionBattleCloseExplosivesAvoidRun.h b/src/Game/AI/Action/actionBattleCloseExplosivesAvoidRun.h index 6f98668e..7a2a39b5 100644 --- a/src/Game/AI/Action/actionBattleCloseExplosivesAvoidRun.h +++ b/src/Game/AI/Action/actionBattleCloseExplosivesAvoidRun.h @@ -11,14 +11,11 @@ public: explicit BattleCloseExplosivesAvoidRun(const InitArg& arg); ~BattleCloseExplosivesAvoidRun() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; protected: - void calc_() override; - // static_param at offset 0xa8 const float* mDamageIgnoreDist_s{}; }; diff --git a/src/Game/AI/Action/actionBattleCloseExplosivesGuardRun.cpp b/src/Game/AI/Action/actionBattleCloseExplosivesGuardRun.cpp index 596db218..c8a7696a 100644 --- a/src/Game/AI/Action/actionBattleCloseExplosivesGuardRun.cpp +++ b/src/Game/AI/Action/actionBattleCloseExplosivesGuardRun.cpp @@ -7,25 +7,8 @@ BattleCloseExplosivesGuardRun::BattleCloseExplosivesGuardRun(const InitArg& arg) BattleCloseExplosivesGuardRun::~BattleCloseExplosivesGuardRun() = default; -bool BattleCloseExplosivesGuardRun::init_(sead::Heap* heap) { - return BattleCloseExplosivesAvoidRun::init_(heap); -} - void BattleCloseExplosivesGuardRun::enter_(ksys::act::ai::InlineParamPack* params) { BattleCloseExplosivesAvoidRun::enter_(params); } -void BattleCloseExplosivesGuardRun::leave_() { - BattleCloseExplosivesAvoidRun::leave_(); -} - -void BattleCloseExplosivesGuardRun::loadParams_() { - BattleCloseMoveActionBase::loadParams_(); - getStaticParam(&mDamageIgnoreDist_s, "DamageIgnoreDist"); -} - -void BattleCloseExplosivesGuardRun::calc_() { - BattleCloseExplosivesAvoidRun::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionBattleCloseExplosivesGuardRun.h b/src/Game/AI/Action/actionBattleCloseExplosivesGuardRun.h index 43d6d8f1..2f7a4282 100644 --- a/src/Game/AI/Action/actionBattleCloseExplosivesGuardRun.h +++ b/src/Game/AI/Action/actionBattleCloseExplosivesGuardRun.h @@ -11,16 +11,9 @@ public: explicit BattleCloseExplosivesGuardRun(const InitArg& arg); ~BattleCloseExplosivesGuardRun() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; protected: - void calc_() override; - - // static_param at offset 0xa8 - const float* mDamageIgnoreDist_s{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionBattleCloseGuardRun.cpp b/src/Game/AI/Action/actionBattleCloseGuardRun.cpp index ac7d2518..897d6a40 100644 --- a/src/Game/AI/Action/actionBattleCloseGuardRun.cpp +++ b/src/Game/AI/Action/actionBattleCloseGuardRun.cpp @@ -6,24 +6,8 @@ BattleCloseGuardRun::BattleCloseGuardRun(const InitArg& arg) : BattleCloseMoveAc BattleCloseGuardRun::~BattleCloseGuardRun() = default; -bool BattleCloseGuardRun::init_(sead::Heap* heap) { - return BattleCloseMoveAction::init_(heap); -} - void BattleCloseGuardRun::enter_(ksys::act::ai::InlineParamPack* params) { BattleCloseMoveAction::enter_(params); } -void BattleCloseGuardRun::leave_() { - BattleCloseMoveAction::leave_(); -} - -void BattleCloseGuardRun::loadParams_() { - BattleCloseAction::loadParams_(); -} - -void BattleCloseGuardRun::calc_() { - BattleCloseMoveAction::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionBattleCloseGuardRun.h b/src/Game/AI/Action/actionBattleCloseGuardRun.h index c8c3d1fc..554904b9 100644 --- a/src/Game/AI/Action/actionBattleCloseGuardRun.h +++ b/src/Game/AI/Action/actionBattleCloseGuardRun.h @@ -11,13 +11,9 @@ public: explicit BattleCloseGuardRun(const InitArg& arg); ~BattleCloseGuardRun() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionBattleCloseGuardWalk.cpp b/src/Game/AI/Action/actionBattleCloseGuardWalk.cpp index 856ed8df..480d96f1 100644 --- a/src/Game/AI/Action/actionBattleCloseGuardWalk.cpp +++ b/src/Game/AI/Action/actionBattleCloseGuardWalk.cpp @@ -4,8 +4,6 @@ namespace uking::action { BattleCloseGuardWalk::BattleCloseGuardWalk(const InitArg& arg) : BattleCloseMoveAction(arg) {} -BattleCloseGuardWalk::~BattleCloseGuardWalk() = default; - bool BattleCloseGuardWalk::init_(sead::Heap* heap) { return BattleCloseMoveAction::init_(heap); } diff --git a/src/Game/AI/Action/actionBattleCloseGuardWalk.h b/src/Game/AI/Action/actionBattleCloseGuardWalk.h index 2bff800b..09f42dca 100644 --- a/src/Game/AI/Action/actionBattleCloseGuardWalk.h +++ b/src/Game/AI/Action/actionBattleCloseGuardWalk.h @@ -9,7 +9,6 @@ class BattleCloseGuardWalk : public BattleCloseMoveAction { SEAD_RTTI_OVERRIDE(BattleCloseGuardWalk, BattleCloseMoveAction) public: explicit BattleCloseGuardWalk(const InitArg& arg); - ~BattleCloseGuardWalk() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/AI/Action/actionBattleCloseMeanderGuardRun.cpp b/src/Game/AI/Action/actionBattleCloseMeanderGuardRun.cpp index deb77bc0..f5442a10 100644 --- a/src/Game/AI/Action/actionBattleCloseMeanderGuardRun.cpp +++ b/src/Game/AI/Action/actionBattleCloseMeanderGuardRun.cpp @@ -7,27 +7,4 @@ BattleCloseMeanderGuardRun::BattleCloseMeanderGuardRun(const InitArg& arg) BattleCloseMeanderGuardRun::~BattleCloseMeanderGuardRun() = default; -bool BattleCloseMeanderGuardRun::init_(sead::Heap* heap) { - return BattleCloseMeanderRun::init_(heap); -} - -void BattleCloseMeanderGuardRun::enter_(ksys::act::ai::InlineParamPack* params) { - BattleCloseMeanderRun::enter_(params); -} - -void BattleCloseMeanderGuardRun::leave_() { - BattleCloseMeanderRun::leave_(); -} - -void BattleCloseMeanderGuardRun::loadParams_() { - BattleCloseMoveActionBase::loadParams_(); - getStaticParam(&mMeanderWidth_s, "MeanderWidth"); - getStaticParam(&mMeanderSpeed_s, "MeanderSpeed"); - getStaticParam(&mJumpUpSpeedReduceRatio_s, "JumpUpSpeedReduceRatio"); -} - -void BattleCloseMeanderGuardRun::calc_() { - BattleCloseMeanderRun::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionBattleCloseMeanderGuardRun.h b/src/Game/AI/Action/actionBattleCloseMeanderGuardRun.h index fd9942d3..23167c33 100644 --- a/src/Game/AI/Action/actionBattleCloseMeanderGuardRun.h +++ b/src/Game/AI/Action/actionBattleCloseMeanderGuardRun.h @@ -11,20 +11,7 @@ public: explicit BattleCloseMeanderGuardRun(const InitArg& arg); ~BattleCloseMeanderGuardRun() override; - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; - protected: - void calc_() override; - - // static_param at offset 0xa8 - const float* mMeanderWidth_s{}; - // static_param at offset 0xb0 - const float* mMeanderSpeed_s{}; - // static_param at offset 0xb8 - const float* mJumpUpSpeedReduceRatio_s{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionBattleCloseMeanderRun.cpp b/src/Game/AI/Action/actionBattleCloseMeanderRun.cpp index 90b16f97..f2b69d24 100644 --- a/src/Game/AI/Action/actionBattleCloseMeanderRun.cpp +++ b/src/Game/AI/Action/actionBattleCloseMeanderRun.cpp @@ -6,18 +6,10 @@ BattleCloseMeanderRun::BattleCloseMeanderRun(const InitArg& arg) : BattleCloseMo BattleCloseMeanderRun::~BattleCloseMeanderRun() = default; -bool BattleCloseMeanderRun::init_(sead::Heap* heap) { - return BattleCloseMoveAction::init_(heap); -} - void BattleCloseMeanderRun::enter_(ksys::act::ai::InlineParamPack* params) { BattleCloseMoveAction::enter_(params); } -void BattleCloseMeanderRun::leave_() { - BattleCloseMoveAction::leave_(); -} - void BattleCloseMeanderRun::loadParams_() { BattleCloseMoveActionBase::loadParams_(); getStaticParam(&mMeanderWidth_s, "MeanderWidth"); diff --git a/src/Game/AI/Action/actionBattleCloseMeanderRun.h b/src/Game/AI/Action/actionBattleCloseMeanderRun.h index e2993c82..ce5fef5d 100644 --- a/src/Game/AI/Action/actionBattleCloseMeanderRun.h +++ b/src/Game/AI/Action/actionBattleCloseMeanderRun.h @@ -11,9 +11,7 @@ public: explicit BattleCloseMeanderRun(const InitArg& arg); ~BattleCloseMeanderRun() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: diff --git a/src/Game/AI/Action/actionBattleCloseMove.cpp b/src/Game/AI/Action/actionBattleCloseMove.cpp index f928472d..9169368f 100644 --- a/src/Game/AI/Action/actionBattleCloseMove.cpp +++ b/src/Game/AI/Action/actionBattleCloseMove.cpp @@ -4,26 +4,8 @@ namespace uking::action { BattleCloseMove::BattleCloseMove(const InitArg& arg) : BattleCloseMoveAction(arg) {} -BattleCloseMove::~BattleCloseMove() = default; - -bool BattleCloseMove::init_(sead::Heap* heap) { - return BattleCloseMoveAction::init_(heap); -} - void BattleCloseMove::enter_(ksys::act::ai::InlineParamPack* params) { BattleCloseMoveAction::enter_(params); } -void BattleCloseMove::leave_() { - BattleCloseMoveAction::leave_(); -} - -void BattleCloseMove::loadParams_() { - BattleCloseAction::loadParams_(); -} - -void BattleCloseMove::calc_() { - BattleCloseMoveAction::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionBattleCloseMove.h b/src/Game/AI/Action/actionBattleCloseMove.h index 35a252e5..98c87fd6 100644 --- a/src/Game/AI/Action/actionBattleCloseMove.h +++ b/src/Game/AI/Action/actionBattleCloseMove.h @@ -9,15 +9,10 @@ class BattleCloseMove : public BattleCloseMoveAction { SEAD_RTTI_OVERRIDE(BattleCloseMove, BattleCloseMoveAction) public: explicit BattleCloseMove(const InitArg& arg); - ~BattleCloseMove() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionBattleCloseMoveAction.cpp b/src/Game/AI/Action/actionBattleCloseMoveAction.cpp index c1e7de80..45f49543 100644 --- a/src/Game/AI/Action/actionBattleCloseMoveAction.cpp +++ b/src/Game/AI/Action/actionBattleCloseMoveAction.cpp @@ -4,8 +4,6 @@ namespace uking::action { BattleCloseMoveAction::BattleCloseMoveAction(const InitArg& arg) : BattleCloseMoveActionBase(arg) {} -BattleCloseMoveAction::~BattleCloseMoveAction() = default; - bool BattleCloseMoveAction::init_(sead::Heap* heap) { return BattleCloseMoveActionBase::init_(heap); } @@ -18,10 +16,6 @@ void BattleCloseMoveAction::leave_() { BattleCloseMoveActionBase::leave_(); } -void BattleCloseMoveAction::loadParams_() { - BattleCloseAction::loadParams_(); -} - void BattleCloseMoveAction::calc_() { BattleCloseMoveActionBase::calc_(); } diff --git a/src/Game/AI/Action/actionBattleCloseMoveAction.h b/src/Game/AI/Action/actionBattleCloseMoveAction.h index 12f2f634..1c6a9d89 100644 --- a/src/Game/AI/Action/actionBattleCloseMoveAction.h +++ b/src/Game/AI/Action/actionBattleCloseMoveAction.h @@ -9,12 +9,10 @@ class BattleCloseMoveAction : public BattleCloseMoveActionBase { SEAD_RTTI_OVERRIDE(BattleCloseMoveAction, BattleCloseMoveActionBase) public: explicit BattleCloseMoveAction(const InitArg& arg); - ~BattleCloseMoveAction() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; - void loadParams_() override; protected: void calc_() override; diff --git a/src/Game/AI/Action/actionBattleCloseWalk.cpp b/src/Game/AI/Action/actionBattleCloseWalk.cpp index ce6a83d5..e2ed34a4 100644 --- a/src/Game/AI/Action/actionBattleCloseWalk.cpp +++ b/src/Game/AI/Action/actionBattleCloseWalk.cpp @@ -4,8 +4,6 @@ namespace uking::action { BattleCloseWalk::BattleCloseWalk(const InitArg& arg) : BattleCloseMoveAction(arg) {} -BattleCloseWalk::~BattleCloseWalk() = default; - bool BattleCloseWalk::init_(sead::Heap* heap) { return BattleCloseMoveAction::init_(heap); } diff --git a/src/Game/AI/Action/actionBattleCloseWalk.h b/src/Game/AI/Action/actionBattleCloseWalk.h index 72f66dc6..66b83b99 100644 --- a/src/Game/AI/Action/actionBattleCloseWalk.h +++ b/src/Game/AI/Action/actionBattleCloseWalk.h @@ -9,7 +9,6 @@ class BattleCloseWalk : public BattleCloseMoveAction { SEAD_RTTI_OVERRIDE(BattleCloseWalk, BattleCloseMoveAction) public: explicit BattleCloseWalk(const InitArg& arg); - ~BattleCloseWalk() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/AI/Action/actionBattleLevelFlyMove.cpp b/src/Game/AI/Action/actionBattleLevelFlyMove.cpp index 73f9b5c1..24cbf19c 100644 --- a/src/Game/AI/Action/actionBattleLevelFlyMove.cpp +++ b/src/Game/AI/Action/actionBattleLevelFlyMove.cpp @@ -6,25 +6,13 @@ BattleLevelFlyMove::BattleLevelFlyMove(const InitArg& arg) : BattleLevelFlyMoveB BattleLevelFlyMove::~BattleLevelFlyMove() = default; -bool BattleLevelFlyMove::init_(sead::Heap* heap) { - return BattleLevelFlyMoveBase::init_(heap); -} - void BattleLevelFlyMove::enter_(ksys::act::ai::InlineParamPack* params) { BattleLevelFlyMoveBase::enter_(params); } -void BattleLevelFlyMove::leave_() { - BattleLevelFlyMoveBase::leave_(); -} - void BattleLevelFlyMove::loadParams_() { BattleLevelFlyMoveBase::loadParams_(); getStaticParam(&mASName_s, "ASName"); } -void BattleLevelFlyMove::calc_() { - BattleLevelFlyMoveBase::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionBattleLevelFlyMove.h b/src/Game/AI/Action/actionBattleLevelFlyMove.h index 62c90942..8acc82a6 100644 --- a/src/Game/AI/Action/actionBattleLevelFlyMove.h +++ b/src/Game/AI/Action/actionBattleLevelFlyMove.h @@ -11,14 +11,10 @@ public: explicit BattleLevelFlyMove(const InitArg& arg); ~BattleLevelFlyMove() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // static_param at offset 0xd8 sead::SafeString mASName_s{}; }; diff --git a/src/Game/AI/Action/actionBattleWalk.cpp b/src/Game/AI/Action/actionBattleWalk.cpp index d63f6609..6b6cf010 100644 --- a/src/Game/AI/Action/actionBattleWalk.cpp +++ b/src/Game/AI/Action/actionBattleWalk.cpp @@ -4,40 +4,8 @@ namespace uking::action { BattleWalk::BattleWalk(const InitArg& arg) : MoveBase(arg) {} -BattleWalk::~BattleWalk() = default; - -bool BattleWalk::init_(sead::Heap* heap) { - return MoveBase::init_(heap); -} - void BattleWalk::enter_(ksys::act::ai::InlineParamPack* params) { MoveBase::enter_(params); } -void BattleWalk::leave_() { - MoveBase::leave_(); -} - -void BattleWalk::loadParams_() { - getStaticParam(&mWeaponIdx_s, "WeaponIdx"); - getStaticParam(&mWallHitLimitTime_s, "WallHitLimitTime"); - getStaticParam(&mMoveAngCliffLimitTime_s, "MoveAngCliffLimitTime"); - getStaticParam(&mSpeed_s, "Speed"); - getStaticParam(&mRotSpd_s, "RotSpd"); - getStaticParam(&mFinRadius_s, "FinRadius"); - getStaticParam(&mFinRotate_s, "FinRotate"); - getStaticParam(&mBaseRotRatio_s, "BaseRotRatio"); - getStaticParam(&mAccRatio_s, "AccRatio"); - getStaticParam(&mJumpUpSpeedReduceRatio_s, "JumpUpSpeedReduceRatio"); - getStaticParam(&mFollowGround_s, "FollowGround"); - getStaticParam(&mIgnoreLastCurve_s, "IgnoreLastCurve"); - getStaticParam(&mIgnoreDecelerationFrontCliff_s, "IgnoreDecelerationFrontCliff"); - getStaticParam(&mIgnoreMoveDirCoHit_s, "IgnoreMoveDirCoHit"); - getDynamicParam(&mTargetPos_d, "TargetPos"); -} - -void BattleWalk::calc_() { - MoveBase::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionBattleWalk.h b/src/Game/AI/Action/actionBattleWalk.h index 0f3c9aeb..78dfaeea 100644 --- a/src/Game/AI/Action/actionBattleWalk.h +++ b/src/Game/AI/Action/actionBattleWalk.h @@ -9,46 +9,10 @@ class BattleWalk : public MoveBase { SEAD_RTTI_OVERRIDE(BattleWalk, MoveBase) public: explicit BattleWalk(const InitArg& arg); - ~BattleWalk() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; protected: - void calc_() override; - - // static_param at offset 0x20 - const int* mWeaponIdx_s{}; - // static_param at offset 0x28 - const int* mWallHitLimitTime_s{}; - // static_param at offset 0x30 - const int* mMoveAngCliffLimitTime_s{}; - // static_param at offset 0x38 - const float* mSpeed_s{}; - // static_param at offset 0x40 - const float* mRotSpd_s{}; - // static_param at offset 0x48 - const float* mFinRadius_s{}; - // static_param at offset 0x50 - const float* mFinRotate_s{}; - // static_param at offset 0x58 - const float* mBaseRotRatio_s{}; - // static_param at offset 0x60 - const float* mAccRatio_s{}; - // static_param at offset 0x68 - const float* mJumpUpSpeedReduceRatio_s{}; - // static_param at offset 0x70 - const bool* mFollowGround_s{}; - // static_param at offset 0x78 - const bool* mIgnoreLastCurve_s{}; - // static_param at offset 0x80 - const bool* mIgnoreDecelerationFrontCliff_s{}; - // static_param at offset 0x88 - const bool* mIgnoreMoveDirCoHit_s{}; - // dynamic_param at offset 0x90 - sead::Vector3f* mTargetPos_d{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionBecomeSpeaker.cpp b/src/Game/AI/Action/actionBecomeSpeaker.cpp index 2461c3e2..c89f63df 100644 --- a/src/Game/AI/Action/actionBecomeSpeaker.cpp +++ b/src/Game/AI/Action/actionBecomeSpeaker.cpp @@ -10,18 +10,6 @@ bool BecomeSpeaker::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void BecomeSpeaker::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void BecomeSpeaker::leave_() { - ksys::act::ai::Action::leave_(); -} - void BecomeSpeaker::loadParams_() {} -void BecomeSpeaker::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionBecomeSpeaker.h b/src/Game/AI/Action/actionBecomeSpeaker.h index cc56654d..6fa25533 100644 --- a/src/Game/AI/Action/actionBecomeSpeaker.h +++ b/src/Game/AI/Action/actionBecomeSpeaker.h @@ -11,12 +11,9 @@ public: ~BecomeSpeaker() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionBindAction.cpp b/src/Game/AI/Action/actionBindAction.cpp index 71703978..eec88f85 100644 --- a/src/Game/AI/Action/actionBindAction.cpp +++ b/src/Game/AI/Action/actionBindAction.cpp @@ -6,10 +6,6 @@ BindAction::BindAction(const InitArg& arg) : ksys::act::ai::Action(arg) {} BindAction::~BindAction() = default; -bool BindAction::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - void BindAction::enter_(ksys::act::ai::InlineParamPack* params) { ksys::act::ai::Action::enter_(params); } diff --git a/src/Game/AI/Action/actionBindAction.h b/src/Game/AI/Action/actionBindAction.h index 58d438b1..c008c81b 100644 --- a/src/Game/AI/Action/actionBindAction.h +++ b/src/Game/AI/Action/actionBindAction.h @@ -10,7 +10,6 @@ public: explicit BindAction(const InitArg& arg); ~BindAction() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionBindParentAction.cpp b/src/Game/AI/Action/actionBindParentAction.cpp index b620bc77..5e1c0bee 100644 --- a/src/Game/AI/Action/actionBindParentAction.cpp +++ b/src/Game/AI/Action/actionBindParentAction.cpp @@ -6,18 +6,6 @@ BindParentAction::BindParentAction(const InitArg& arg) : BindAction(arg) {} BindParentAction::~BindParentAction() = default; -bool BindParentAction::init_(sead::Heap* heap) { - return BindAction::init_(heap); -} - -void BindParentAction::enter_(ksys::act::ai::InlineParamPack* params) { - BindAction::enter_(params); -} - -void BindParentAction::leave_() { - BindAction::leave_(); -} - void BindParentAction::loadParams_() { BindAction::loadParams_(); getStaticParam(&mASName_s, "ASName"); diff --git a/src/Game/AI/Action/actionBindParentAction.h b/src/Game/AI/Action/actionBindParentAction.h index 32c6a633..782e3f0f 100644 --- a/src/Game/AI/Action/actionBindParentAction.h +++ b/src/Game/AI/Action/actionBindParentAction.h @@ -11,9 +11,6 @@ public: explicit BindParentAction(const InitArg& arg); ~BindParentAction() override; - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: diff --git a/src/Game/AI/Action/actionBombExplode.cpp b/src/Game/AI/Action/actionBombExplode.cpp index 3480d1d2..60e98542 100644 --- a/src/Game/AI/Action/actionBombExplode.cpp +++ b/src/Game/AI/Action/actionBombExplode.cpp @@ -6,10 +6,6 @@ BombExplode::BombExplode(const InitArg& arg) : ActionEx(arg) {} BombExplode::~BombExplode() = default; -bool BombExplode::init_(sead::Heap* heap) { - return ActionEx::init_(heap); -} - void BombExplode::enter_(ksys::act::ai::InlineParamPack* params) { ActionEx::enter_(params); } diff --git a/src/Game/AI/Action/actionBombExplode.h b/src/Game/AI/Action/actionBombExplode.h index e31b1581..60ee12ac 100644 --- a/src/Game/AI/Action/actionBombExplode.h +++ b/src/Game/AI/Action/actionBombExplode.h @@ -11,7 +11,6 @@ public: explicit BombExplode(const InitArg& arg); ~BombExplode() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionBowArrowHold.cpp b/src/Game/AI/Action/actionBowArrowHold.cpp index bef0fac8..759d6883 100644 --- a/src/Game/AI/Action/actionBowArrowHold.cpp +++ b/src/Game/AI/Action/actionBowArrowHold.cpp @@ -4,24 +4,4 @@ namespace uking::action { BowArrowHold::BowArrowHold(const InitArg& arg) : BindAction(arg) {} -BowArrowHold::~BowArrowHold() = default; - -bool BowArrowHold::init_(sead::Heap* heap) { - return BindAction::init_(heap); -} - -void BowArrowHold::enter_(ksys::act::ai::InlineParamPack* params) { - BindAction::enter_(params); -} - -void BowArrowHold::leave_() { - BindAction::leave_(); -} - -void BowArrowHold::loadParams_() {} - -void BowArrowHold::calc_() { - BindAction::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionBowArrowHold.h b/src/Game/AI/Action/actionBowArrowHold.h index 5bdf891b..70252c66 100644 --- a/src/Game/AI/Action/actionBowArrowHold.h +++ b/src/Game/AI/Action/actionBowArrowHold.h @@ -9,15 +9,8 @@ class BowArrowHold : public BindAction { SEAD_RTTI_OVERRIDE(BowArrowHold, BindAction) public: explicit BowArrowHold(const InitArg& arg); - ~BowArrowHold() override; - - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionBowArrowReload.cpp b/src/Game/AI/Action/actionBowArrowReload.cpp index a122a8b4..a545a85e 100644 --- a/src/Game/AI/Action/actionBowArrowReload.cpp +++ b/src/Game/AI/Action/actionBowArrowReload.cpp @@ -4,22 +4,10 @@ namespace uking::action { BowArrowReload::BowArrowReload(const InitArg& arg) : BindAction(arg) {} -BowArrowReload::~BowArrowReload() = default; - -bool BowArrowReload::init_(sead::Heap* heap) { - return BindAction::init_(heap); -} - void BowArrowReload::enter_(ksys::act::ai::InlineParamPack* params) { BindAction::enter_(params); } -void BowArrowReload::leave_() { - BindAction::leave_(); -} - -void BowArrowReload::loadParams_() {} - void BowArrowReload::calc_() { BindAction::calc_(); } diff --git a/src/Game/AI/Action/actionBowArrowReload.h b/src/Game/AI/Action/actionBowArrowReload.h index 2bc23d15..8b01e146 100644 --- a/src/Game/AI/Action/actionBowArrowReload.h +++ b/src/Game/AI/Action/actionBowArrowReload.h @@ -9,12 +9,8 @@ class BowArrowReload : public BindAction { SEAD_RTTI_OVERRIDE(BowArrowReload, BindAction) public: explicit BowArrowReload(const InitArg& arg); - ~BowArrowReload() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; protected: void calc_() override; diff --git a/src/Game/AI/Action/actionBowArrowShoot.cpp b/src/Game/AI/Action/actionBowArrowShoot.cpp index abb8ddf0..124598ff 100644 --- a/src/Game/AI/Action/actionBowArrowShoot.cpp +++ b/src/Game/AI/Action/actionBowArrowShoot.cpp @@ -4,22 +4,10 @@ namespace uking::action { BowArrowShoot::BowArrowShoot(const InitArg& arg) : BindAction(arg) {} -BowArrowShoot::~BowArrowShoot() = default; - -bool BowArrowShoot::init_(sead::Heap* heap) { - return BindAction::init_(heap); -} - void BowArrowShoot::enter_(ksys::act::ai::InlineParamPack* params) { BindAction::enter_(params); } -void BowArrowShoot::leave_() { - BindAction::leave_(); -} - -void BowArrowShoot::loadParams_() {} - void BowArrowShoot::calc_() { BindAction::calc_(); } diff --git a/src/Game/AI/Action/actionBowArrowShoot.h b/src/Game/AI/Action/actionBowArrowShoot.h index a617398c..4efb41bb 100644 --- a/src/Game/AI/Action/actionBowArrowShoot.h +++ b/src/Game/AI/Action/actionBowArrowShoot.h @@ -9,12 +9,8 @@ class BowArrowShoot : public BindAction { SEAD_RTTI_OVERRIDE(BowArrowShoot, BindAction) public: explicit BowArrowShoot(const InitArg& arg); - ~BowArrowShoot() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; protected: void calc_() override; diff --git a/src/Game/AI/Action/actionCalcVecLengthToGameData.cpp b/src/Game/AI/Action/actionCalcVecLengthToGameData.cpp index e708c6a1..38ad0db4 100644 --- a/src/Game/AI/Action/actionCalcVecLengthToGameData.cpp +++ b/src/Game/AI/Action/actionCalcVecLengthToGameData.cpp @@ -10,22 +10,10 @@ bool CalcVecLengthToGameData::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void CalcVecLengthToGameData::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void CalcVecLengthToGameData::leave_() { - ksys::act::ai::Action::leave_(); -} - void CalcVecLengthToGameData::loadParams_() { getDynamicParam(&mCalcY_d, "CalcY"); getDynamicParam(&mGameDataVec3fSrcName_d, "GameDataVec3fSrcName"); getDynamicParam(&mGameDataFloatToName_d, "GameDataFloatToName"); } -void CalcVecLengthToGameData::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionCalcVecLengthToGameData.h b/src/Game/AI/Action/actionCalcVecLengthToGameData.h index 067dffbb..da2d04a4 100644 --- a/src/Game/AI/Action/actionCalcVecLengthToGameData.h +++ b/src/Game/AI/Action/actionCalcVecLengthToGameData.h @@ -11,13 +11,9 @@ public: ~CalcVecLengthToGameData() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 bool* mCalcY_d{}; // dynamic_param at offset 0x28 diff --git a/src/Game/AI/Action/actionCallOvserveActorTag.cpp b/src/Game/AI/Action/actionCallOvserveActorTag.cpp index a0c058ef..218ea318 100644 --- a/src/Game/AI/Action/actionCallOvserveActorTag.cpp +++ b/src/Game/AI/Action/actionCallOvserveActorTag.cpp @@ -18,12 +18,6 @@ void CallOvserveActorTag::leave_() { AreaObserveActorAction::leave_(); } -void CallOvserveActorTag::loadParams_() { - getMapUnitParam(&mCount_m, "Count"); - getMapUnitParam(&mIsSendMessage_m, "IsSendMessage"); - getMapUnitParam(&mDefaultBasicSignal_m, "DefaultBasicSignal"); -} - void CallOvserveActorTag::calc_() { AreaObserveActorAction::calc_(); } diff --git a/src/Game/AI/Action/actionCallOvserveActorTag.h b/src/Game/AI/Action/actionCallOvserveActorTag.h index e4c5dbea..6d2f4220 100644 --- a/src/Game/AI/Action/actionCallOvserveActorTag.h +++ b/src/Game/AI/Action/actionCallOvserveActorTag.h @@ -14,17 +14,9 @@ public: bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; - void loadParams_() override; protected: void calc_() override; - - // map_unit_param at offset 0x38 - const int* mCount_m{}; - // map_unit_param at offset 0x40 - const bool* mIsSendMessage_m{}; - // map_unit_param at offset 0x48 - const bool* mDefaultBasicSignal_m{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraAbyss.cpp b/src/Game/AI/Action/actionCameraAbyss.cpp index 2dae6d0d..349b22ff 100644 --- a/src/Game/AI/Action/actionCameraAbyss.cpp +++ b/src/Game/AI/Action/actionCameraAbyss.cpp @@ -4,26 +4,4 @@ namespace uking::action { CameraAbyss::CameraAbyss(const InitArg& arg) : CameraAction(arg) {} -CameraAbyss::~CameraAbyss() = default; - -bool CameraAbyss::init_(sead::Heap* heap) { - return CameraAction::init_(heap); -} - -void CameraAbyss::enter_(ksys::act::ai::InlineParamPack* params) { - CameraAction::enter_(params); -} - -void CameraAbyss::leave_() { - CameraAction::leave_(); -} - -void CameraAbyss::loadParams_() { - getStaticParam(&mBowFlag_s, "BowFlag"); -} - -void CameraAbyss::calc_() { - CameraAction::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraAbyss.h b/src/Game/AI/Action/actionCameraAbyss.h index c050fbf1..ac757fa6 100644 --- a/src/Game/AI/Action/actionCameraAbyss.h +++ b/src/Game/AI/Action/actionCameraAbyss.h @@ -9,18 +9,8 @@ class CameraAbyss : public CameraAction { SEAD_RTTI_OVERRIDE(CameraAbyss, CameraAction) public: explicit CameraAbyss(const InitArg& arg); - ~CameraAbyss() override; - - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; protected: - void calc_() override; - - // static_param at offset 0x40 - const bool* mBowFlag_s{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraAiming.cpp b/src/Game/AI/Action/actionCameraAiming.cpp index d0e0e228..d3d716ee 100644 --- a/src/Game/AI/Action/actionCameraAiming.cpp +++ b/src/Game/AI/Action/actionCameraAiming.cpp @@ -6,24 +6,4 @@ CameraAiming::CameraAiming(const InitArg& arg) : CameraAction(arg) {} CameraAiming::~CameraAiming() = default; -bool CameraAiming::init_(sead::Heap* heap) { - return CameraAction::init_(heap); -} - -void CameraAiming::enter_(ksys::act::ai::InlineParamPack* params) { - CameraAction::enter_(params); -} - -void CameraAiming::leave_() { - CameraAction::leave_(); -} - -void CameraAiming::loadParams_() { - getStaticParam(&mBowFlag_s, "BowFlag"); -} - -void CameraAiming::calc_() { - CameraAction::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraAiming.h b/src/Game/AI/Action/actionCameraAiming.h index 6796c6e6..8b94d124 100644 --- a/src/Game/AI/Action/actionCameraAiming.h +++ b/src/Game/AI/Action/actionCameraAiming.h @@ -11,16 +11,7 @@ public: explicit CameraAiming(const InitArg& arg); ~CameraAiming() override; - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; - protected: - void calc_() override; - - // static_param at offset 0x40 - const bool* mBowFlag_s{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraAiming2.cpp b/src/Game/AI/Action/actionCameraAiming2.cpp index 481bc4d5..42d5b2b2 100644 --- a/src/Game/AI/Action/actionCameraAiming2.cpp +++ b/src/Game/AI/Action/actionCameraAiming2.cpp @@ -6,24 +6,4 @@ CameraAiming2::CameraAiming2(const InitArg& arg) : CameraAction(arg) {} CameraAiming2::~CameraAiming2() = default; -bool CameraAiming2::init_(sead::Heap* heap) { - return CameraAction::init_(heap); -} - -void CameraAiming2::enter_(ksys::act::ai::InlineParamPack* params) { - CameraAction::enter_(params); -} - -void CameraAiming2::leave_() { - CameraAction::leave_(); -} - -void CameraAiming2::loadParams_() { - getStaticParam(&mBowFlag_s, "BowFlag"); -} - -void CameraAiming2::calc_() { - CameraAction::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraAiming2.h b/src/Game/AI/Action/actionCameraAiming2.h index 870de951..0d3a958f 100644 --- a/src/Game/AI/Action/actionCameraAiming2.h +++ b/src/Game/AI/Action/actionCameraAiming2.h @@ -11,16 +11,7 @@ public: explicit CameraAiming2(const InitArg& arg); ~CameraAiming2() override; - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; - protected: - void calc_() override; - - // static_param at offset 0x40 - const bool* mBowFlag_s{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraChase.cpp b/src/Game/AI/Action/actionCameraChase.cpp index f1590ef6..3b0d876b 100644 --- a/src/Game/AI/Action/actionCameraChase.cpp +++ b/src/Game/AI/Action/actionCameraChase.cpp @@ -6,24 +6,4 @@ CameraChase::CameraChase(const InitArg& arg) : CameraAction(arg) {} CameraChase::~CameraChase() = default; -bool CameraChase::init_(sead::Heap* heap) { - return CameraAction::init_(heap); -} - -void CameraChase::enter_(ksys::act::ai::InlineParamPack* params) { - CameraAction::enter_(params); -} - -void CameraChase::leave_() { - CameraAction::leave_(); -} - -void CameraChase::loadParams_() { - getStaticParam(&mBowFlag_s, "BowFlag"); -} - -void CameraChase::calc_() { - CameraAction::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraChase.h b/src/Game/AI/Action/actionCameraChase.h index 0cb33f9f..c4f748e5 100644 --- a/src/Game/AI/Action/actionCameraChase.h +++ b/src/Game/AI/Action/actionCameraChase.h @@ -11,16 +11,7 @@ public: explicit CameraChase(const InitArg& arg); ~CameraChase() override; - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; - protected: - void calc_() override; - - // static_param at offset 0x40 - const bool* mBowFlag_s{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraClimbObj.cpp b/src/Game/AI/Action/actionCameraClimbObj.cpp index 4dbae5fd..3560a7cd 100644 --- a/src/Game/AI/Action/actionCameraClimbObj.cpp +++ b/src/Game/AI/Action/actionCameraClimbObj.cpp @@ -6,24 +6,4 @@ CameraClimbObj::CameraClimbObj(const InitArg& arg) : CameraAction(arg) {} CameraClimbObj::~CameraClimbObj() = default; -bool CameraClimbObj::init_(sead::Heap* heap) { - return CameraAction::init_(heap); -} - -void CameraClimbObj::enter_(ksys::act::ai::InlineParamPack* params) { - CameraAction::enter_(params); -} - -void CameraClimbObj::leave_() { - CameraAction::leave_(); -} - -void CameraClimbObj::loadParams_() { - getStaticParam(&mBowFlag_s, "BowFlag"); -} - -void CameraClimbObj::calc_() { - CameraAction::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraClimbObj.h b/src/Game/AI/Action/actionCameraClimbObj.h index cedf941b..df459321 100644 --- a/src/Game/AI/Action/actionCameraClimbObj.h +++ b/src/Game/AI/Action/actionCameraClimbObj.h @@ -11,16 +11,7 @@ public: explicit CameraClimbObj(const InitArg& arg); ~CameraClimbObj() override; - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; - protected: - void calc_() override; - - // static_param at offset 0x40 - const bool* mBowFlag_s{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraEdit.cpp b/src/Game/AI/Action/actionCameraEdit.cpp index bd8596e4..92eb50b6 100644 --- a/src/Game/AI/Action/actionCameraEdit.cpp +++ b/src/Game/AI/Action/actionCameraEdit.cpp @@ -6,18 +6,10 @@ CameraEdit::CameraEdit(const InitArg& arg) : ActionEx(arg) {} CameraEdit::~CameraEdit() = default; -bool CameraEdit::init_(sead::Heap* heap) { - return ActionEx::init_(heap); -} - void CameraEdit::enter_(ksys::act::ai::InlineParamPack* params) { ActionEx::enter_(params); } -void CameraEdit::leave_() { - ActionEx::leave_(); -} - void CameraEdit::loadParams_() { getStaticParam(&mNormal_s, "Normal"); getStaticParam(&mLockOn_s, "LockOn"); @@ -29,8 +21,4 @@ void CameraEdit::loadParams_() { // FIXME: CALL _ZNK4ksys3act2ai10ActionBase7getNameEv @ 0x7100d165fc } -void CameraEdit::calc_() { - ActionEx::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraEdit.h b/src/Game/AI/Action/actionCameraEdit.h index 62264ab7..2abffce0 100644 --- a/src/Game/AI/Action/actionCameraEdit.h +++ b/src/Game/AI/Action/actionCameraEdit.h @@ -11,14 +11,10 @@ public: explicit CameraEdit(const InitArg& arg); ~CameraEdit() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // static_param at offset 0x20 const char* mNormal_s{}; // static_param at offset 0x28 diff --git a/src/Game/AI/Action/actionCameraEvent.cpp b/src/Game/AI/Action/actionCameraEvent.cpp index 64c35431..2371b0f5 100644 --- a/src/Game/AI/Action/actionCameraEvent.cpp +++ b/src/Game/AI/Action/actionCameraEvent.cpp @@ -4,26 +4,4 @@ namespace uking::action { CameraEvent::CameraEvent(const InitArg& arg) : CameraAction(arg) {} -CameraEvent::~CameraEvent() = default; - -bool CameraEvent::init_(sead::Heap* heap) { - return CameraAction::init_(heap); -} - -void CameraEvent::enter_(ksys::act::ai::InlineParamPack* params) { - CameraAction::enter_(params); -} - -void CameraEvent::leave_() { - CameraAction::leave_(); -} - -void CameraEvent::loadParams_() { - getStaticParam(&mBowFlag_s, "BowFlag"); -} - -void CameraEvent::calc_() { - CameraAction::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraEvent.h b/src/Game/AI/Action/actionCameraEvent.h index bdc82bc2..33307214 100644 --- a/src/Game/AI/Action/actionCameraEvent.h +++ b/src/Game/AI/Action/actionCameraEvent.h @@ -9,18 +9,8 @@ class CameraEvent : public CameraAction { SEAD_RTTI_OVERRIDE(CameraEvent, CameraAction) public: explicit CameraEvent(const InitArg& arg); - ~CameraEvent() override; - - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; protected: - void calc_() override; - - // static_param at offset 0x40 - const bool* mBowFlag_s{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraEventAnim.cpp b/src/Game/AI/Action/actionCameraEventAnim.cpp index e98c9cd5..51b8bd4f 100644 --- a/src/Game/AI/Action/actionCameraEventAnim.cpp +++ b/src/Game/AI/Action/actionCameraEventAnim.cpp @@ -6,24 +6,4 @@ CameraEventAnim::CameraEventAnim(const InitArg& arg) : CameraEventAnimBase(arg) CameraEventAnim::~CameraEventAnim() = default; -bool CameraEventAnim::init_(sead::Heap* heap) { - return CameraEventAnimBase::init_(heap); -} - -void CameraEventAnim::enter_(ksys::act::ai::InlineParamPack* params) { - CameraEventAnimBase::enter_(params); -} - -void CameraEventAnim::leave_() { - CameraEventAnimBase::leave_(); -} - -void CameraEventAnim::loadParams_() { - getStaticParam(&mBowFlag_s, "BowFlag"); -} - -void CameraEventAnim::calc_() { - CameraEventAnimBase::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraEventAnim.h b/src/Game/AI/Action/actionCameraEventAnim.h index 67fee3d4..8bb1dbba 100644 --- a/src/Game/AI/Action/actionCameraEventAnim.h +++ b/src/Game/AI/Action/actionCameraEventAnim.h @@ -11,16 +11,7 @@ public: explicit CameraEventAnim(const InitArg& arg); ~CameraEventAnim() override; - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; - protected: - void calc_() override; - - // static_param at offset 0x40 - const bool* mBowFlag_s{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraEventAnimBase.cpp b/src/Game/AI/Action/actionCameraEventAnimBase.cpp index 690f543e..b498f5bb 100644 --- a/src/Game/AI/Action/actionCameraEventAnimBase.cpp +++ b/src/Game/AI/Action/actionCameraEventAnimBase.cpp @@ -6,24 +6,4 @@ CameraEventAnimBase::CameraEventAnimBase(const InitArg& arg) : CameraEvent(arg) CameraEventAnimBase::~CameraEventAnimBase() = default; -bool CameraEventAnimBase::init_(sead::Heap* heap) { - return CameraEvent::init_(heap); -} - -void CameraEventAnimBase::enter_(ksys::act::ai::InlineParamPack* params) { - CameraEvent::enter_(params); -} - -void CameraEventAnimBase::leave_() { - CameraEvent::leave_(); -} - -void CameraEventAnimBase::loadParams_() { - getStaticParam(&mBowFlag_s, "BowFlag"); -} - -void CameraEventAnimBase::calc_() { - CameraEvent::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraEventAnimBase.h b/src/Game/AI/Action/actionCameraEventAnimBase.h index a68f5562..207ce63c 100644 --- a/src/Game/AI/Action/actionCameraEventAnimBase.h +++ b/src/Game/AI/Action/actionCameraEventAnimBase.h @@ -11,16 +11,7 @@ public: explicit CameraEventAnimBase(const InitArg& arg); ~CameraEventAnimBase() override; - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; - protected: - void calc_() override; - - // static_param at offset 0x40 - const bool* mBowFlag_s{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraEventAnimFlow.cpp b/src/Game/AI/Action/actionCameraEventAnimFlow.cpp index d05ca10e..d4f7a3b1 100644 --- a/src/Game/AI/Action/actionCameraEventAnimFlow.cpp +++ b/src/Game/AI/Action/actionCameraEventAnimFlow.cpp @@ -6,24 +6,4 @@ CameraEventAnimFlow::CameraEventAnimFlow(const InitArg& arg) : CameraEventAnimFl CameraEventAnimFlow::~CameraEventAnimFlow() = default; -bool CameraEventAnimFlow::init_(sead::Heap* heap) { - return CameraEventAnimFlowBase::init_(heap); -} - -void CameraEventAnimFlow::enter_(ksys::act::ai::InlineParamPack* params) { - CameraEventAnimFlowBase::enter_(params); -} - -void CameraEventAnimFlow::leave_() { - CameraEventAnimFlowBase::leave_(); -} - -void CameraEventAnimFlow::loadParams_() { - getStaticParam(&mBowFlag_s, "BowFlag"); -} - -void CameraEventAnimFlow::calc_() { - CameraEventAnimFlowBase::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraEventAnimFlow.h b/src/Game/AI/Action/actionCameraEventAnimFlow.h index ab363a5c..ae465587 100644 --- a/src/Game/AI/Action/actionCameraEventAnimFlow.h +++ b/src/Game/AI/Action/actionCameraEventAnimFlow.h @@ -11,16 +11,7 @@ public: explicit CameraEventAnimFlow(const InitArg& arg); ~CameraEventAnimFlow() override; - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; - protected: - void calc_() override; - - // static_param at offset 0x40 - const bool* mBowFlag_s{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraEventAnimFlowAbs.cpp b/src/Game/AI/Action/actionCameraEventAnimFlowAbs.cpp index ad4df342..764869ff 100644 --- a/src/Game/AI/Action/actionCameraEventAnimFlowAbs.cpp +++ b/src/Game/AI/Action/actionCameraEventAnimFlowAbs.cpp @@ -4,26 +4,4 @@ namespace uking::action { CameraEventAnimFlowAbs::CameraEventAnimFlowAbs(const InitArg& arg) : CameraEventAnimFlowBase(arg) {} -CameraEventAnimFlowAbs::~CameraEventAnimFlowAbs() = default; - -bool CameraEventAnimFlowAbs::init_(sead::Heap* heap) { - return CameraEventAnimFlowBase::init_(heap); -} - -void CameraEventAnimFlowAbs::enter_(ksys::act::ai::InlineParamPack* params) { - CameraEventAnimFlowBase::enter_(params); -} - -void CameraEventAnimFlowAbs::leave_() { - CameraEventAnimFlowBase::leave_(); -} - -void CameraEventAnimFlowAbs::loadParams_() { - getStaticParam(&mBowFlag_s, "BowFlag"); -} - -void CameraEventAnimFlowAbs::calc_() { - CameraEventAnimFlowBase::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraEventAnimFlowAbs.h b/src/Game/AI/Action/actionCameraEventAnimFlowAbs.h index 62a2c836..6a122326 100644 --- a/src/Game/AI/Action/actionCameraEventAnimFlowAbs.h +++ b/src/Game/AI/Action/actionCameraEventAnimFlowAbs.h @@ -9,18 +9,8 @@ class CameraEventAnimFlowAbs : public CameraEventAnimFlowBase { SEAD_RTTI_OVERRIDE(CameraEventAnimFlowAbs, CameraEventAnimFlowBase) public: explicit CameraEventAnimFlowAbs(const InitArg& arg); - ~CameraEventAnimFlowAbs() override; - - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; protected: - void calc_() override; - - // static_param at offset 0x40 - const bool* mBowFlag_s{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraEventAnimFlowBase.cpp b/src/Game/AI/Action/actionCameraEventAnimFlowBase.cpp index 5aa319c6..80292a10 100644 --- a/src/Game/AI/Action/actionCameraEventAnimFlowBase.cpp +++ b/src/Game/AI/Action/actionCameraEventAnimFlowBase.cpp @@ -6,24 +6,4 @@ CameraEventAnimFlowBase::CameraEventAnimFlowBase(const InitArg& arg) : CameraEve CameraEventAnimFlowBase::~CameraEventAnimFlowBase() = default; -bool CameraEventAnimFlowBase::init_(sead::Heap* heap) { - return CameraEventAnimBase::init_(heap); -} - -void CameraEventAnimFlowBase::enter_(ksys::act::ai::InlineParamPack* params) { - CameraEventAnimBase::enter_(params); -} - -void CameraEventAnimFlowBase::leave_() { - CameraEventAnimBase::leave_(); -} - -void CameraEventAnimFlowBase::loadParams_() { - getStaticParam(&mBowFlag_s, "BowFlag"); -} - -void CameraEventAnimFlowBase::calc_() { - CameraEventAnimBase::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraEventAnimFlowBase.h b/src/Game/AI/Action/actionCameraEventAnimFlowBase.h index b24e30fc..b9a545ca 100644 --- a/src/Game/AI/Action/actionCameraEventAnimFlowBase.h +++ b/src/Game/AI/Action/actionCameraEventAnimFlowBase.h @@ -11,16 +11,7 @@ public: explicit CameraEventAnimFlowBase(const InitArg& arg); ~CameraEventAnimFlowBase() override; - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; - protected: - void calc_() override; - - // static_param at offset 0x40 - const bool* mBowFlag_s{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraEventAnimFlowForMapTower.cpp b/src/Game/AI/Action/actionCameraEventAnimFlowForMapTower.cpp index 68fcc9ed..46b409fa 100644 --- a/src/Game/AI/Action/actionCameraEventAnimFlowForMapTower.cpp +++ b/src/Game/AI/Action/actionCameraEventAnimFlowForMapTower.cpp @@ -5,26 +5,4 @@ namespace uking::action { CameraEventAnimFlowForMapTower::CameraEventAnimFlowForMapTower(const InitArg& arg) : CameraEventAnimFlow(arg) {} -CameraEventAnimFlowForMapTower::~CameraEventAnimFlowForMapTower() = default; - -bool CameraEventAnimFlowForMapTower::init_(sead::Heap* heap) { - return CameraEventAnimFlow::init_(heap); -} - -void CameraEventAnimFlowForMapTower::enter_(ksys::act::ai::InlineParamPack* params) { - CameraEventAnimFlow::enter_(params); -} - -void CameraEventAnimFlowForMapTower::leave_() { - CameraEventAnimFlow::leave_(); -} - -void CameraEventAnimFlowForMapTower::loadParams_() { - getStaticParam(&mBowFlag_s, "BowFlag"); -} - -void CameraEventAnimFlowForMapTower::calc_() { - CameraEventAnimFlow::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraEventAnimFlowForMapTower.h b/src/Game/AI/Action/actionCameraEventAnimFlowForMapTower.h index 18c2f4b0..a3e6caec 100644 --- a/src/Game/AI/Action/actionCameraEventAnimFlowForMapTower.h +++ b/src/Game/AI/Action/actionCameraEventAnimFlowForMapTower.h @@ -9,18 +9,8 @@ class CameraEventAnimFlowForMapTower : public CameraEventAnimFlow { SEAD_RTTI_OVERRIDE(CameraEventAnimFlowForMapTower, CameraEventAnimFlow) public: explicit CameraEventAnimFlowForMapTower(const InitArg& arg); - ~CameraEventAnimFlowForMapTower() override; - - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; protected: - void calc_() override; - - // static_param at offset 0x40 - const bool* mBowFlag_s{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraEventConnectTypeSpecify.cpp b/src/Game/AI/Action/actionCameraEventConnectTypeSpecify.cpp index 1a7a8898..cac88857 100644 --- a/src/Game/AI/Action/actionCameraEventConnectTypeSpecify.cpp +++ b/src/Game/AI/Action/actionCameraEventConnectTypeSpecify.cpp @@ -5,24 +5,4 @@ namespace uking::action { CameraEventConnectTypeSpecify::CameraEventConnectTypeSpecify(const InitArg& arg) : ksys::act::ai::Action(arg) {} -CameraEventConnectTypeSpecify::~CameraEventConnectTypeSpecify() = default; - -bool CameraEventConnectTypeSpecify::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - -void CameraEventConnectTypeSpecify::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void CameraEventConnectTypeSpecify::leave_() { - ksys::act::ai::Action::leave_(); -} - -void CameraEventConnectTypeSpecify::loadParams_() {} - -void CameraEventConnectTypeSpecify::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraEventConnectTypeSpecify.h b/src/Game/AI/Action/actionCameraEventConnectTypeSpecify.h index f7a2fa8f..c6dc165a 100644 --- a/src/Game/AI/Action/actionCameraEventConnectTypeSpecify.h +++ b/src/Game/AI/Action/actionCameraEventConnectTypeSpecify.h @@ -8,15 +8,8 @@ class CameraEventConnectTypeSpecify : public ksys::act::ai::Action { SEAD_RTTI_OVERRIDE(CameraEventConnectTypeSpecify, ksys::act::ai::Action) public: explicit CameraEventConnectTypeSpecify(const InitArg& arg); - ~CameraEventConnectTypeSpecify() override; - - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraEventFocusDistSetting.cpp b/src/Game/AI/Action/actionCameraEventFocusDistSetting.cpp index 9cefb3a2..ec064acc 100644 --- a/src/Game/AI/Action/actionCameraEventFocusDistSetting.cpp +++ b/src/Game/AI/Action/actionCameraEventFocusDistSetting.cpp @@ -7,18 +7,6 @@ CameraEventFocusDistSetting::CameraEventFocusDistSetting(const InitArg& arg) CameraEventFocusDistSetting::~CameraEventFocusDistSetting() = default; -bool CameraEventFocusDistSetting::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - -void CameraEventFocusDistSetting::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void CameraEventFocusDistSetting::leave_() { - ksys::act::ai::Action::leave_(); -} - void CameraEventFocusDistSetting::loadParams_() { getDynamicParam2(&mClipIndex_d, "ClipIndex"); getDynamicParam2(&mFocusDistStart_d, "FocusDistStart"); diff --git a/src/Game/AI/Action/actionCameraEventFocusDistSetting.h b/src/Game/AI/Action/actionCameraEventFocusDistSetting.h index 55112837..86ea4329 100644 --- a/src/Game/AI/Action/actionCameraEventFocusDistSetting.h +++ b/src/Game/AI/Action/actionCameraEventFocusDistSetting.h @@ -10,9 +10,6 @@ public: explicit CameraEventFocusDistSetting(const InitArg& arg); ~CameraEventFocusDistSetting() override; - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: diff --git a/src/Game/AI/Action/actionCameraEventGameOver.cpp b/src/Game/AI/Action/actionCameraEventGameOver.cpp index 6add48f7..07eb0366 100644 --- a/src/Game/AI/Action/actionCameraEventGameOver.cpp +++ b/src/Game/AI/Action/actionCameraEventGameOver.cpp @@ -6,24 +6,4 @@ CameraEventGameOver::CameraEventGameOver(const InitArg& arg) : CameraEvent(arg) CameraEventGameOver::~CameraEventGameOver() = default; -bool CameraEventGameOver::init_(sead::Heap* heap) { - return CameraEvent::init_(heap); -} - -void CameraEventGameOver::enter_(ksys::act::ai::InlineParamPack* params) { - CameraEvent::enter_(params); -} - -void CameraEventGameOver::leave_() { - CameraEvent::leave_(); -} - -void CameraEventGameOver::loadParams_() { - getStaticParam(&mBowFlag_s, "BowFlag"); -} - -void CameraEventGameOver::calc_() { - CameraEvent::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraEventGameOver.h b/src/Game/AI/Action/actionCameraEventGameOver.h index 24fa4812..4757f418 100644 --- a/src/Game/AI/Action/actionCameraEventGameOver.h +++ b/src/Game/AI/Action/actionCameraEventGameOver.h @@ -11,16 +11,7 @@ public: explicit CameraEventGameOver(const InitArg& arg); ~CameraEventGameOver() override; - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; - protected: - void calc_() override; - - // static_param at offset 0x40 - const bool* mBowFlag_s{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraEventIdling.cpp b/src/Game/AI/Action/actionCameraEventIdling.cpp index 4f37444c..69530034 100644 --- a/src/Game/AI/Action/actionCameraEventIdling.cpp +++ b/src/Game/AI/Action/actionCameraEventIdling.cpp @@ -4,26 +4,4 @@ namespace uking::action { CameraEventIdling::CameraEventIdling(const InitArg& arg) : CameraEvent(arg) {} -CameraEventIdling::~CameraEventIdling() = default; - -bool CameraEventIdling::init_(sead::Heap* heap) { - return CameraEvent::init_(heap); -} - -void CameraEventIdling::enter_(ksys::act::ai::InlineParamPack* params) { - CameraEvent::enter_(params); -} - -void CameraEventIdling::leave_() { - CameraEvent::leave_(); -} - -void CameraEventIdling::loadParams_() { - getStaticParam(&mBowFlag_s, "BowFlag"); -} - -void CameraEventIdling::calc_() { - CameraEvent::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraEventIdling.h b/src/Game/AI/Action/actionCameraEventIdling.h index 603b7e4c..6640f744 100644 --- a/src/Game/AI/Action/actionCameraEventIdling.h +++ b/src/Game/AI/Action/actionCameraEventIdling.h @@ -9,18 +9,8 @@ class CameraEventIdling : public CameraEvent { SEAD_RTTI_OVERRIDE(CameraEventIdling, CameraEvent) public: explicit CameraEventIdling(const InitArg& arg); - ~CameraEventIdling() override; - - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; protected: - void calc_() override; - - // static_param at offset 0x40 - const bool* mBowFlag_s{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraEventLook.cpp b/src/Game/AI/Action/actionCameraEventLook.cpp index 3459ed90..84ab523c 100644 --- a/src/Game/AI/Action/actionCameraEventLook.cpp +++ b/src/Game/AI/Action/actionCameraEventLook.cpp @@ -6,24 +6,4 @@ CameraEventLook::CameraEventLook(const InitArg& arg) : CameraEventLookBase(arg) CameraEventLook::~CameraEventLook() = default; -bool CameraEventLook::init_(sead::Heap* heap) { - return CameraEventLookBase::init_(heap); -} - -void CameraEventLook::enter_(ksys::act::ai::InlineParamPack* params) { - CameraEventLookBase::enter_(params); -} - -void CameraEventLook::leave_() { - CameraEventLookBase::leave_(); -} - -void CameraEventLook::loadParams_() { - getStaticParam(&mBowFlag_s, "BowFlag"); -} - -void CameraEventLook::calc_() { - CameraEventLookBase::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraEventLook.h b/src/Game/AI/Action/actionCameraEventLook.h index 0b7a337f..ef721900 100644 --- a/src/Game/AI/Action/actionCameraEventLook.h +++ b/src/Game/AI/Action/actionCameraEventLook.h @@ -11,16 +11,7 @@ public: explicit CameraEventLook(const InitArg& arg); ~CameraEventLook() override; - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; - protected: - void calc_() override; - - // static_param at offset 0x40 - const bool* mBowFlag_s{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraEventLookBase.cpp b/src/Game/AI/Action/actionCameraEventLookBase.cpp index d35bd1ef..e094bb17 100644 --- a/src/Game/AI/Action/actionCameraEventLookBase.cpp +++ b/src/Game/AI/Action/actionCameraEventLookBase.cpp @@ -6,24 +6,4 @@ CameraEventLookBase::CameraEventLookBase(const InitArg& arg) : CameraEvent(arg) CameraEventLookBase::~CameraEventLookBase() = default; -bool CameraEventLookBase::init_(sead::Heap* heap) { - return CameraEvent::init_(heap); -} - -void CameraEventLookBase::enter_(ksys::act::ai::InlineParamPack* params) { - CameraEvent::enter_(params); -} - -void CameraEventLookBase::leave_() { - CameraEvent::leave_(); -} - -void CameraEventLookBase::loadParams_() { - getStaticParam(&mBowFlag_s, "BowFlag"); -} - -void CameraEventLookBase::calc_() { - CameraEvent::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraEventLookBase.h b/src/Game/AI/Action/actionCameraEventLookBase.h index ce2d6bb3..ad248484 100644 --- a/src/Game/AI/Action/actionCameraEventLookBase.h +++ b/src/Game/AI/Action/actionCameraEventLookBase.h @@ -11,16 +11,7 @@ public: explicit CameraEventLookBase(const InitArg& arg); ~CameraEventLookBase() override; - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; - protected: - void calc_() override; - - // static_param at offset 0x40 - const bool* mBowFlag_s{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraEventLookDirect.cpp b/src/Game/AI/Action/actionCameraEventLookDirect.cpp index f38fd240..6db60e30 100644 --- a/src/Game/AI/Action/actionCameraEventLookDirect.cpp +++ b/src/Game/AI/Action/actionCameraEventLookDirect.cpp @@ -4,26 +4,4 @@ namespace uking::action { CameraEventLookDirect::CameraEventLookDirect(const InitArg& arg) : CameraEventLookBase(arg) {} -CameraEventLookDirect::~CameraEventLookDirect() = default; - -bool CameraEventLookDirect::init_(sead::Heap* heap) { - return CameraEventLookBase::init_(heap); -} - -void CameraEventLookDirect::enter_(ksys::act::ai::InlineParamPack* params) { - CameraEventLookBase::enter_(params); -} - -void CameraEventLookDirect::leave_() { - CameraEventLookBase::leave_(); -} - -void CameraEventLookDirect::loadParams_() { - getStaticParam(&mBowFlag_s, "BowFlag"); -} - -void CameraEventLookDirect::calc_() { - CameraEventLookBase::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraEventLookDirect.h b/src/Game/AI/Action/actionCameraEventLookDirect.h index 211cccb3..26731caa 100644 --- a/src/Game/AI/Action/actionCameraEventLookDirect.h +++ b/src/Game/AI/Action/actionCameraEventLookDirect.h @@ -9,18 +9,8 @@ class CameraEventLookDirect : public CameraEventLookBase { SEAD_RTTI_OVERRIDE(CameraEventLookDirect, CameraEventLookBase) public: explicit CameraEventLookDirect(const InitArg& arg); - ~CameraEventLookDirect() override; - - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; protected: - void calc_() override; - - // static_param at offset 0x40 - const bool* mBowFlag_s{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraEventMove.cpp b/src/Game/AI/Action/actionCameraEventMove.cpp index e9ef7a33..2975e99d 100644 --- a/src/Game/AI/Action/actionCameraEventMove.cpp +++ b/src/Game/AI/Action/actionCameraEventMove.cpp @@ -6,24 +6,4 @@ CameraEventMove::CameraEventMove(const InitArg& arg) : CameraEvent(arg) {} CameraEventMove::~CameraEventMove() = default; -bool CameraEventMove::init_(sead::Heap* heap) { - return CameraEvent::init_(heap); -} - -void CameraEventMove::enter_(ksys::act::ai::InlineParamPack* params) { - CameraEvent::enter_(params); -} - -void CameraEventMove::leave_() { - CameraEvent::leave_(); -} - -void CameraEventMove::loadParams_() { - getStaticParam(&mBowFlag_s, "BowFlag"); -} - -void CameraEventMove::calc_() { - CameraEvent::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraEventMove.h b/src/Game/AI/Action/actionCameraEventMove.h index 1ae819d7..4131f657 100644 --- a/src/Game/AI/Action/actionCameraEventMove.h +++ b/src/Game/AI/Action/actionCameraEventMove.h @@ -11,16 +11,7 @@ public: explicit CameraEventMove(const InitArg& arg); ~CameraEventMove() override; - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; - protected: - void calc_() override; - - // static_param at offset 0x40 - const bool* mBowFlag_s{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraEventMovePos.cpp b/src/Game/AI/Action/actionCameraEventMovePos.cpp index 159c8d3b..bee8c28e 100644 --- a/src/Game/AI/Action/actionCameraEventMovePos.cpp +++ b/src/Game/AI/Action/actionCameraEventMovePos.cpp @@ -4,26 +4,4 @@ namespace uking::action { CameraEventMovePos::CameraEventMovePos(const InitArg& arg) : CameraEventMovePosBase(arg) {} -CameraEventMovePos::~CameraEventMovePos() = default; - -bool CameraEventMovePos::init_(sead::Heap* heap) { - return CameraEventMovePosBase::init_(heap); -} - -void CameraEventMovePos::enter_(ksys::act::ai::InlineParamPack* params) { - CameraEventMovePosBase::enter_(params); -} - -void CameraEventMovePos::leave_() { - CameraEventMovePosBase::leave_(); -} - -void CameraEventMovePos::loadParams_() { - getStaticParam(&mBowFlag_s, "BowFlag"); -} - -void CameraEventMovePos::calc_() { - CameraEventMovePosBase::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraEventMovePos.h b/src/Game/AI/Action/actionCameraEventMovePos.h index 66e1946b..9397487f 100644 --- a/src/Game/AI/Action/actionCameraEventMovePos.h +++ b/src/Game/AI/Action/actionCameraEventMovePos.h @@ -9,18 +9,8 @@ class CameraEventMovePos : public CameraEventMovePosBase { SEAD_RTTI_OVERRIDE(CameraEventMovePos, CameraEventMovePosBase) public: explicit CameraEventMovePos(const InitArg& arg); - ~CameraEventMovePos() override; - - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; protected: - void calc_() override; - - // static_param at offset 0x40 - const bool* mBowFlag_s{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraEventMovePosBase.cpp b/src/Game/AI/Action/actionCameraEventMovePosBase.cpp index 27e63f0b..299029e3 100644 --- a/src/Game/AI/Action/actionCameraEventMovePosBase.cpp +++ b/src/Game/AI/Action/actionCameraEventMovePosBase.cpp @@ -6,24 +6,4 @@ CameraEventMovePosBase::CameraEventMovePosBase(const InitArg& arg) : CameraEvent CameraEventMovePosBase::~CameraEventMovePosBase() = default; -bool CameraEventMovePosBase::init_(sead::Heap* heap) { - return CameraEvent::init_(heap); -} - -void CameraEventMovePosBase::enter_(ksys::act::ai::InlineParamPack* params) { - CameraEvent::enter_(params); -} - -void CameraEventMovePosBase::leave_() { - CameraEvent::leave_(); -} - -void CameraEventMovePosBase::loadParams_() { - getStaticParam(&mBowFlag_s, "BowFlag"); -} - -void CameraEventMovePosBase::calc_() { - CameraEvent::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraEventMovePosBase.h b/src/Game/AI/Action/actionCameraEventMovePosBase.h index 828f25db..926ee34b 100644 --- a/src/Game/AI/Action/actionCameraEventMovePosBase.h +++ b/src/Game/AI/Action/actionCameraEventMovePosBase.h @@ -11,16 +11,7 @@ public: explicit CameraEventMovePosBase(const InitArg& arg); ~CameraEventMovePosBase() override; - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; - protected: - void calc_() override; - - // static_param at offset 0x40 - const bool* mBowFlag_s{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraEventMovePosFlow.cpp b/src/Game/AI/Action/actionCameraEventMovePosFlow.cpp index fdd3cb94..70b157e3 100644 --- a/src/Game/AI/Action/actionCameraEventMovePosFlow.cpp +++ b/src/Game/AI/Action/actionCameraEventMovePosFlow.cpp @@ -4,26 +4,4 @@ namespace uking::action { CameraEventMovePosFlow::CameraEventMovePosFlow(const InitArg& arg) : CameraEventMovePosBase(arg) {} -CameraEventMovePosFlow::~CameraEventMovePosFlow() = default; - -bool CameraEventMovePosFlow::init_(sead::Heap* heap) { - return CameraEventMovePosBase::init_(heap); -} - -void CameraEventMovePosFlow::enter_(ksys::act::ai::InlineParamPack* params) { - CameraEventMovePosBase::enter_(params); -} - -void CameraEventMovePosFlow::leave_() { - CameraEventMovePosBase::leave_(); -} - -void CameraEventMovePosFlow::loadParams_() { - getStaticParam(&mBowFlag_s, "BowFlag"); -} - -void CameraEventMovePosFlow::calc_() { - CameraEventMovePosBase::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraEventMovePosFlow.h b/src/Game/AI/Action/actionCameraEventMovePosFlow.h index 2b020863..c07e0a54 100644 --- a/src/Game/AI/Action/actionCameraEventMovePosFlow.h +++ b/src/Game/AI/Action/actionCameraEventMovePosFlow.h @@ -9,18 +9,8 @@ class CameraEventMovePosFlow : public CameraEventMovePosBase { SEAD_RTTI_OVERRIDE(CameraEventMovePosFlow, CameraEventMovePosBase) public: explicit CameraEventMovePosFlow(const InitArg& arg); - ~CameraEventMovePosFlow() override; - - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; protected: - void calc_() override; - - // static_param at offset 0x40 - const bool* mBowFlag_s{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraEventMultiTalk.cpp b/src/Game/AI/Action/actionCameraEventMultiTalk.cpp index 636aba9d..65d62a84 100644 --- a/src/Game/AI/Action/actionCameraEventMultiTalk.cpp +++ b/src/Game/AI/Action/actionCameraEventMultiTalk.cpp @@ -6,24 +6,4 @@ CameraEventMultiTalk::CameraEventMultiTalk(const InitArg& arg) : CameraEvent(arg CameraEventMultiTalk::~CameraEventMultiTalk() = default; -bool CameraEventMultiTalk::init_(sead::Heap* heap) { - return CameraEvent::init_(heap); -} - -void CameraEventMultiTalk::enter_(ksys::act::ai::InlineParamPack* params) { - CameraEvent::enter_(params); -} - -void CameraEventMultiTalk::leave_() { - CameraEvent::leave_(); -} - -void CameraEventMultiTalk::loadParams_() { - getStaticParam(&mBowFlag_s, "BowFlag"); -} - -void CameraEventMultiTalk::calc_() { - CameraEvent::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraEventMultiTalk.h b/src/Game/AI/Action/actionCameraEventMultiTalk.h index e6bc8b5b..dc91004d 100644 --- a/src/Game/AI/Action/actionCameraEventMultiTalk.h +++ b/src/Game/AI/Action/actionCameraEventMultiTalk.h @@ -11,16 +11,7 @@ public: explicit CameraEventMultiTalk(const InitArg& arg); ~CameraEventMultiTalk() override; - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; - protected: - void calc_() override; - - // static_param at offset 0x40 - const bool* mBowFlag_s{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraEventOverwriteFar.cpp b/src/Game/AI/Action/actionCameraEventOverwriteFar.cpp index 452a38d3..6526526d 100644 --- a/src/Game/AI/Action/actionCameraEventOverwriteFar.cpp +++ b/src/Game/AI/Action/actionCameraEventOverwriteFar.cpp @@ -6,10 +6,6 @@ CameraEventOverwriteFar::CameraEventOverwriteFar(const InitArg& arg) : ksys::act CameraEventOverwriteFar::~CameraEventOverwriteFar() = default; -bool CameraEventOverwriteFar::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - void CameraEventOverwriteFar::enter_(ksys::act::ai::InlineParamPack* params) { ksys::act::ai::Action::enter_(params); } @@ -22,8 +18,4 @@ void CameraEventOverwriteFar::loadParams_() { getDynamicParam2(&mFar_d, "Far"); } -void CameraEventOverwriteFar::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraEventOverwriteFar.h b/src/Game/AI/Action/actionCameraEventOverwriteFar.h index 5fc552f6..047b0ff7 100644 --- a/src/Game/AI/Action/actionCameraEventOverwriteFar.h +++ b/src/Game/AI/Action/actionCameraEventOverwriteFar.h @@ -10,14 +10,11 @@ public: explicit CameraEventOverwriteFar(const InitArg& arg); ~CameraEventOverwriteFar() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; protected: - void calc_() override; - // FIXME: remove this u8 pad_0x20[0x10]; // dynamic2_param at offset 0x30 diff --git a/src/Game/AI/Action/actionCameraEventOverwriteNear.cpp b/src/Game/AI/Action/actionCameraEventOverwriteNear.cpp index 3911a281..a78cd1cb 100644 --- a/src/Game/AI/Action/actionCameraEventOverwriteNear.cpp +++ b/src/Game/AI/Action/actionCameraEventOverwriteNear.cpp @@ -7,10 +7,6 @@ CameraEventOverwriteNear::CameraEventOverwriteNear(const InitArg& arg) CameraEventOverwriteNear::~CameraEventOverwriteNear() = default; -bool CameraEventOverwriteNear::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - void CameraEventOverwriteNear::enter_(ksys::act::ai::InlineParamPack* params) { ksys::act::ai::Action::enter_(params); } @@ -23,8 +19,4 @@ void CameraEventOverwriteNear::loadParams_() { getDynamicParam2(&mNear_d, "Near"); } -void CameraEventOverwriteNear::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraEventOverwriteNear.h b/src/Game/AI/Action/actionCameraEventOverwriteNear.h index 7e217ec1..e07d6831 100644 --- a/src/Game/AI/Action/actionCameraEventOverwriteNear.h +++ b/src/Game/AI/Action/actionCameraEventOverwriteNear.h @@ -10,14 +10,11 @@ public: explicit CameraEventOverwriteNear(const InitArg& arg); ~CameraEventOverwriteNear() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; protected: - void calc_() override; - // FIXME: remove this u8 pad_0x20[0x10]; // dynamic2_param at offset 0x30 diff --git a/src/Game/AI/Action/actionCameraEventPermitGfxNear.cpp b/src/Game/AI/Action/actionCameraEventPermitGfxNear.cpp index 1d2e192f..a754d92b 100644 --- a/src/Game/AI/Action/actionCameraEventPermitGfxNear.cpp +++ b/src/Game/AI/Action/actionCameraEventPermitGfxNear.cpp @@ -5,24 +5,4 @@ namespace uking::action { CameraEventPermitGfxNear::CameraEventPermitGfxNear(const InitArg& arg) : ksys::act::ai::Action(arg) {} -CameraEventPermitGfxNear::~CameraEventPermitGfxNear() = default; - -bool CameraEventPermitGfxNear::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - -void CameraEventPermitGfxNear::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void CameraEventPermitGfxNear::leave_() { - ksys::act::ai::Action::leave_(); -} - -void CameraEventPermitGfxNear::loadParams_() {} - -void CameraEventPermitGfxNear::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraEventPermitGfxNear.h b/src/Game/AI/Action/actionCameraEventPermitGfxNear.h index 4098e1b2..518339c3 100644 --- a/src/Game/AI/Action/actionCameraEventPermitGfxNear.h +++ b/src/Game/AI/Action/actionCameraEventPermitGfxNear.h @@ -8,15 +8,8 @@ class CameraEventPermitGfxNear : public ksys::act::ai::Action { SEAD_RTTI_OVERRIDE(CameraEventPermitGfxNear, ksys::act::ai::Action) public: explicit CameraEventPermitGfxNear(const InitArg& arg); - ~CameraEventPermitGfxNear() override; - - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraEventPlayerHideOff.cpp b/src/Game/AI/Action/actionCameraEventPlayerHideOff.cpp index 1e1f24cf..4ed8a186 100644 --- a/src/Game/AI/Action/actionCameraEventPlayerHideOff.cpp +++ b/src/Game/AI/Action/actionCameraEventPlayerHideOff.cpp @@ -5,24 +5,4 @@ namespace uking::action { CameraEventPlayerHideOff::CameraEventPlayerHideOff(const InitArg& arg) : ksys::act::ai::Action(arg) {} -CameraEventPlayerHideOff::~CameraEventPlayerHideOff() = default; - -bool CameraEventPlayerHideOff::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - -void CameraEventPlayerHideOff::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void CameraEventPlayerHideOff::leave_() { - ksys::act::ai::Action::leave_(); -} - -void CameraEventPlayerHideOff::loadParams_() {} - -void CameraEventPlayerHideOff::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraEventPlayerHideOff.h b/src/Game/AI/Action/actionCameraEventPlayerHideOff.h index e87853ce..10b4a560 100644 --- a/src/Game/AI/Action/actionCameraEventPlayerHideOff.h +++ b/src/Game/AI/Action/actionCameraEventPlayerHideOff.h @@ -8,15 +8,8 @@ class CameraEventPlayerHideOff : public ksys::act::ai::Action { SEAD_RTTI_OVERRIDE(CameraEventPlayerHideOff, ksys::act::ai::Action) public: explicit CameraEventPlayerHideOff(const InitArg& arg); - ~CameraEventPlayerHideOff() override; - - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraEventPlayerHideOn.cpp b/src/Game/AI/Action/actionCameraEventPlayerHideOn.cpp index d2765ac3..0b3e99f2 100644 --- a/src/Game/AI/Action/actionCameraEventPlayerHideOn.cpp +++ b/src/Game/AI/Action/actionCameraEventPlayerHideOn.cpp @@ -4,24 +4,4 @@ namespace uking::action { CameraEventPlayerHideOn::CameraEventPlayerHideOn(const InitArg& arg) : ksys::act::ai::Action(arg) {} -CameraEventPlayerHideOn::~CameraEventPlayerHideOn() = default; - -bool CameraEventPlayerHideOn::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - -void CameraEventPlayerHideOn::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void CameraEventPlayerHideOn::leave_() { - ksys::act::ai::Action::leave_(); -} - -void CameraEventPlayerHideOn::loadParams_() {} - -void CameraEventPlayerHideOn::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraEventPlayerHideOn.h b/src/Game/AI/Action/actionCameraEventPlayerHideOn.h index 9a812f99..224342f8 100644 --- a/src/Game/AI/Action/actionCameraEventPlayerHideOn.h +++ b/src/Game/AI/Action/actionCameraEventPlayerHideOn.h @@ -8,15 +8,8 @@ class CameraEventPlayerHideOn : public ksys::act::ai::Action { SEAD_RTTI_OVERRIDE(CameraEventPlayerHideOn, ksys::act::ai::Action) public: explicit CameraEventPlayerHideOn(const InitArg& arg); - ~CameraEventPlayerHideOn() override; - - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraEventPolarCoord.cpp b/src/Game/AI/Action/actionCameraEventPolarCoord.cpp index bd516758..2b45ae7f 100644 --- a/src/Game/AI/Action/actionCameraEventPolarCoord.cpp +++ b/src/Game/AI/Action/actionCameraEventPolarCoord.cpp @@ -4,26 +4,4 @@ namespace uking::action { CameraEventPolarCoord::CameraEventPolarCoord(const InitArg& arg) : CameraEvent(arg) {} -CameraEventPolarCoord::~CameraEventPolarCoord() = default; - -bool CameraEventPolarCoord::init_(sead::Heap* heap) { - return CameraEvent::init_(heap); -} - -void CameraEventPolarCoord::enter_(ksys::act::ai::InlineParamPack* params) { - CameraEvent::enter_(params); -} - -void CameraEventPolarCoord::leave_() { - CameraEvent::leave_(); -} - -void CameraEventPolarCoord::loadParams_() { - getStaticParam(&mBowFlag_s, "BowFlag"); -} - -void CameraEventPolarCoord::calc_() { - CameraEvent::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraEventPolarCoord.h b/src/Game/AI/Action/actionCameraEventPolarCoord.h index fe99e5a6..d41a123d 100644 --- a/src/Game/AI/Action/actionCameraEventPolarCoord.h +++ b/src/Game/AI/Action/actionCameraEventPolarCoord.h @@ -9,18 +9,8 @@ class CameraEventPolarCoord : public CameraEvent { SEAD_RTTI_OVERRIDE(CameraEventPolarCoord, CameraEvent) public: explicit CameraEventPolarCoord(const InitArg& arg); - ~CameraEventPolarCoord() override; - - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; protected: - void calc_() override; - - // static_param at offset 0x40 - const bool* mBowFlag_s{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraEventPolarCoordPlayer.cpp b/src/Game/AI/Action/actionCameraEventPolarCoordPlayer.cpp index 578ab5c4..d99f0e99 100644 --- a/src/Game/AI/Action/actionCameraEventPolarCoordPlayer.cpp +++ b/src/Game/AI/Action/actionCameraEventPolarCoordPlayer.cpp @@ -7,24 +7,4 @@ CameraEventPolarCoordPlayer::CameraEventPolarCoordPlayer(const InitArg& arg) CameraEventPolarCoordPlayer::~CameraEventPolarCoordPlayer() = default; -bool CameraEventPolarCoordPlayer::init_(sead::Heap* heap) { - return CameraEventPolarCoord::init_(heap); -} - -void CameraEventPolarCoordPlayer::enter_(ksys::act::ai::InlineParamPack* params) { - CameraEventPolarCoord::enter_(params); -} - -void CameraEventPolarCoordPlayer::leave_() { - CameraEventPolarCoord::leave_(); -} - -void CameraEventPolarCoordPlayer::loadParams_() { - getStaticParam(&mBowFlag_s, "BowFlag"); -} - -void CameraEventPolarCoordPlayer::calc_() { - CameraEventPolarCoord::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraEventPolarCoordPlayer.h b/src/Game/AI/Action/actionCameraEventPolarCoordPlayer.h index d61b18d4..64c74a0c 100644 --- a/src/Game/AI/Action/actionCameraEventPolarCoordPlayer.h +++ b/src/Game/AI/Action/actionCameraEventPolarCoordPlayer.h @@ -11,16 +11,7 @@ public: explicit CameraEventPolarCoordPlayer(const InitArg& arg); ~CameraEventPolarCoordPlayer() override; - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; - protected: - void calc_() override; - - // static_param at offset 0x40 - const bool* mBowFlag_s{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraEventPolarCoordPlayerRel.cpp b/src/Game/AI/Action/actionCameraEventPolarCoordPlayerRel.cpp index 3e28fd0c..8f1130da 100644 --- a/src/Game/AI/Action/actionCameraEventPolarCoordPlayerRel.cpp +++ b/src/Game/AI/Action/actionCameraEventPolarCoordPlayerRel.cpp @@ -7,24 +7,4 @@ CameraEventPolarCoordPlayerRel::CameraEventPolarCoordPlayerRel(const InitArg& ar CameraEventPolarCoordPlayerRel::~CameraEventPolarCoordPlayerRel() = default; -bool CameraEventPolarCoordPlayerRel::init_(sead::Heap* heap) { - return CameraEventPolarCoordPlayer::init_(heap); -} - -void CameraEventPolarCoordPlayerRel::enter_(ksys::act::ai::InlineParamPack* params) { - CameraEventPolarCoordPlayer::enter_(params); -} - -void CameraEventPolarCoordPlayerRel::leave_() { - CameraEventPolarCoordPlayer::leave_(); -} - -void CameraEventPolarCoordPlayerRel::loadParams_() { - getStaticParam(&mBowFlag_s, "BowFlag"); -} - -void CameraEventPolarCoordPlayerRel::calc_() { - CameraEventPolarCoordPlayer::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraEventPolarCoordPlayerRel.h b/src/Game/AI/Action/actionCameraEventPolarCoordPlayerRel.h index 3b5547a6..7986a963 100644 --- a/src/Game/AI/Action/actionCameraEventPolarCoordPlayerRel.h +++ b/src/Game/AI/Action/actionCameraEventPolarCoordPlayerRel.h @@ -11,16 +11,7 @@ public: explicit CameraEventPolarCoordPlayerRel(const InitArg& arg); ~CameraEventPolarCoordPlayerRel() override; - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; - protected: - void calc_() override; - - // static_param at offset 0x40 - const bool* mBowFlag_s{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraEventReserveConnectTime.cpp b/src/Game/AI/Action/actionCameraEventReserveConnectTime.cpp index b1e4f31f..403ca399 100644 --- a/src/Game/AI/Action/actionCameraEventReserveConnectTime.cpp +++ b/src/Game/AI/Action/actionCameraEventReserveConnectTime.cpp @@ -7,24 +7,8 @@ CameraEventReserveConnectTime::CameraEventReserveConnectTime(const InitArg& arg) CameraEventReserveConnectTime::~CameraEventReserveConnectTime() = default; -bool CameraEventReserveConnectTime::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - -void CameraEventReserveConnectTime::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void CameraEventReserveConnectTime::leave_() { - ksys::act::ai::Action::leave_(); -} - void CameraEventReserveConnectTime::loadParams_() { getDynamicParam2(&mInterpolateTime_d, "InterpolateTime"); } -void CameraEventReserveConnectTime::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraEventReserveConnectTime.h b/src/Game/AI/Action/actionCameraEventReserveConnectTime.h index 76e9e875..e163f93f 100644 --- a/src/Game/AI/Action/actionCameraEventReserveConnectTime.h +++ b/src/Game/AI/Action/actionCameraEventReserveConnectTime.h @@ -10,14 +10,9 @@ public: explicit CameraEventReserveConnectTime(const InitArg& arg); ~CameraEventReserveConnectTime() override; - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // FIXME: remove this u8 pad_0x20[0x10]; // dynamic2_param at offset 0x30 diff --git a/src/Game/AI/Action/actionCameraEventSavePoint.cpp b/src/Game/AI/Action/actionCameraEventSavePoint.cpp index a42c371e..9c0feeb2 100644 --- a/src/Game/AI/Action/actionCameraEventSavePoint.cpp +++ b/src/Game/AI/Action/actionCameraEventSavePoint.cpp @@ -4,26 +4,4 @@ namespace uking::action { CameraEventSavePoint::CameraEventSavePoint(const InitArg& arg) : CameraAction(arg) {} -CameraEventSavePoint::~CameraEventSavePoint() = default; - -bool CameraEventSavePoint::init_(sead::Heap* heap) { - return CameraAction::init_(heap); -} - -void CameraEventSavePoint::enter_(ksys::act::ai::InlineParamPack* params) { - CameraAction::enter_(params); -} - -void CameraEventSavePoint::leave_() { - CameraAction::leave_(); -} - -void CameraEventSavePoint::loadParams_() { - getStaticParam(&mBowFlag_s, "BowFlag"); -} - -void CameraEventSavePoint::calc_() { - CameraAction::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraEventSavePoint.h b/src/Game/AI/Action/actionCameraEventSavePoint.h index 21957c3f..f7f25fa1 100644 --- a/src/Game/AI/Action/actionCameraEventSavePoint.h +++ b/src/Game/AI/Action/actionCameraEventSavePoint.h @@ -9,18 +9,8 @@ class CameraEventSavePoint : public CameraAction { SEAD_RTTI_OVERRIDE(CameraEventSavePoint, CameraAction) public: explicit CameraEventSavePoint(const InitArg& arg); - ~CameraEventSavePoint() override; - - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; protected: - void calc_() override; - - // static_param at offset 0x40 - const bool* mBowFlag_s{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraEventTalk.cpp b/src/Game/AI/Action/actionCameraEventTalk.cpp index 2b953b43..9a42d7f8 100644 --- a/src/Game/AI/Action/actionCameraEventTalk.cpp +++ b/src/Game/AI/Action/actionCameraEventTalk.cpp @@ -6,24 +6,4 @@ CameraEventTalk::CameraEventTalk(const InitArg& arg) : CameraEvent(arg) {} CameraEventTalk::~CameraEventTalk() = default; -bool CameraEventTalk::init_(sead::Heap* heap) { - return CameraEvent::init_(heap); -} - -void CameraEventTalk::enter_(ksys::act::ai::InlineParamPack* params) { - CameraEvent::enter_(params); -} - -void CameraEventTalk::leave_() { - CameraEvent::leave_(); -} - -void CameraEventTalk::loadParams_() { - getStaticParam(&mBowFlag_s, "BowFlag"); -} - -void CameraEventTalk::calc_() { - CameraEvent::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraEventTalk.h b/src/Game/AI/Action/actionCameraEventTalk.h index 66fac376..b9b94809 100644 --- a/src/Game/AI/Action/actionCameraEventTalk.h +++ b/src/Game/AI/Action/actionCameraEventTalk.h @@ -11,16 +11,7 @@ public: explicit CameraEventTalk(const InitArg& arg); ~CameraEventTalk() override; - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; - protected: - void calc_() override; - - // static_param at offset 0x40 - const bool* mBowFlag_s{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraEventTalkManualCtrl.cpp b/src/Game/AI/Action/actionCameraEventTalkManualCtrl.cpp index d4734396..523b5e36 100644 --- a/src/Game/AI/Action/actionCameraEventTalkManualCtrl.cpp +++ b/src/Game/AI/Action/actionCameraEventTalkManualCtrl.cpp @@ -5,26 +5,4 @@ namespace uking::action { CameraEventTalkManualCtrl::CameraEventTalkManualCtrl(const InitArg& arg) : CameraEventTalkManualCtrlBase(arg) {} -CameraEventTalkManualCtrl::~CameraEventTalkManualCtrl() = default; - -bool CameraEventTalkManualCtrl::init_(sead::Heap* heap) { - return CameraEventTalkManualCtrlBase::init_(heap); -} - -void CameraEventTalkManualCtrl::enter_(ksys::act::ai::InlineParamPack* params) { - CameraEventTalkManualCtrlBase::enter_(params); -} - -void CameraEventTalkManualCtrl::leave_() { - CameraEventTalkManualCtrlBase::leave_(); -} - -void CameraEventTalkManualCtrl::loadParams_() { - getStaticParam(&mBowFlag_s, "BowFlag"); -} - -void CameraEventTalkManualCtrl::calc_() { - CameraEventTalkManualCtrlBase::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraEventTalkManualCtrl.h b/src/Game/AI/Action/actionCameraEventTalkManualCtrl.h index 476bf23f..0d413948 100644 --- a/src/Game/AI/Action/actionCameraEventTalkManualCtrl.h +++ b/src/Game/AI/Action/actionCameraEventTalkManualCtrl.h @@ -9,18 +9,8 @@ class CameraEventTalkManualCtrl : public CameraEventTalkManualCtrlBase { SEAD_RTTI_OVERRIDE(CameraEventTalkManualCtrl, CameraEventTalkManualCtrlBase) public: explicit CameraEventTalkManualCtrl(const InitArg& arg); - ~CameraEventTalkManualCtrl() override; - - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; protected: - void calc_() override; - - // static_param at offset 0x40 - const bool* mBowFlag_s{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraEventTalkManualCtrlBase.cpp b/src/Game/AI/Action/actionCameraEventTalkManualCtrlBase.cpp index d25146e1..5aba40cf 100644 --- a/src/Game/AI/Action/actionCameraEventTalkManualCtrlBase.cpp +++ b/src/Game/AI/Action/actionCameraEventTalkManualCtrlBase.cpp @@ -7,24 +7,4 @@ CameraEventTalkManualCtrlBase::CameraEventTalkManualCtrlBase(const InitArg& arg) CameraEventTalkManualCtrlBase::~CameraEventTalkManualCtrlBase() = default; -bool CameraEventTalkManualCtrlBase::init_(sead::Heap* heap) { - return CameraEvent::init_(heap); -} - -void CameraEventTalkManualCtrlBase::enter_(ksys::act::ai::InlineParamPack* params) { - CameraEvent::enter_(params); -} - -void CameraEventTalkManualCtrlBase::leave_() { - CameraEvent::leave_(); -} - -void CameraEventTalkManualCtrlBase::loadParams_() { - getStaticParam(&mBowFlag_s, "BowFlag"); -} - -void CameraEventTalkManualCtrlBase::calc_() { - CameraEvent::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraEventTalkManualCtrlBase.h b/src/Game/AI/Action/actionCameraEventTalkManualCtrlBase.h index cb047edc..993b123f 100644 --- a/src/Game/AI/Action/actionCameraEventTalkManualCtrlBase.h +++ b/src/Game/AI/Action/actionCameraEventTalkManualCtrlBase.h @@ -11,16 +11,7 @@ public: explicit CameraEventTalkManualCtrlBase(const InitArg& arg); ~CameraEventTalkManualCtrlBase() override; - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; - protected: - void calc_() override; - - // static_param at offset 0x40 - const bool* mBowFlag_s{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraEventTalkManualCtrlRet.cpp b/src/Game/AI/Action/actionCameraEventTalkManualCtrlRet.cpp index 42f23e31..7f0b6607 100644 --- a/src/Game/AI/Action/actionCameraEventTalkManualCtrlRet.cpp +++ b/src/Game/AI/Action/actionCameraEventTalkManualCtrlRet.cpp @@ -5,26 +5,4 @@ namespace uking::action { CameraEventTalkManualCtrlRet::CameraEventTalkManualCtrlRet(const InitArg& arg) : CameraEventTalkManualCtrlBase(arg) {} -CameraEventTalkManualCtrlRet::~CameraEventTalkManualCtrlRet() = default; - -bool CameraEventTalkManualCtrlRet::init_(sead::Heap* heap) { - return CameraEventTalkManualCtrlBase::init_(heap); -} - -void CameraEventTalkManualCtrlRet::enter_(ksys::act::ai::InlineParamPack* params) { - CameraEventTalkManualCtrlBase::enter_(params); -} - -void CameraEventTalkManualCtrlRet::leave_() { - CameraEventTalkManualCtrlBase::leave_(); -} - -void CameraEventTalkManualCtrlRet::loadParams_() { - getStaticParam(&mBowFlag_s, "BowFlag"); -} - -void CameraEventTalkManualCtrlRet::calc_() { - CameraEventTalkManualCtrlBase::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraEventTalkManualCtrlRet.h b/src/Game/AI/Action/actionCameraEventTalkManualCtrlRet.h index 2bdb3d7b..6a9a4b10 100644 --- a/src/Game/AI/Action/actionCameraEventTalkManualCtrlRet.h +++ b/src/Game/AI/Action/actionCameraEventTalkManualCtrlRet.h @@ -9,18 +9,8 @@ class CameraEventTalkManualCtrlRet : public CameraEventTalkManualCtrlBase { SEAD_RTTI_OVERRIDE(CameraEventTalkManualCtrlRet, CameraEventTalkManualCtrlBase) public: explicit CameraEventTalkManualCtrlRet(const InitArg& arg); - ~CameraEventTalkManualCtrlRet() override; - - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; protected: - void calc_() override; - - // static_param at offset 0x40 - const bool* mBowFlag_s{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraEventTurn.cpp b/src/Game/AI/Action/actionCameraEventTurn.cpp index 684f52a4..5898eaee 100644 --- a/src/Game/AI/Action/actionCameraEventTurn.cpp +++ b/src/Game/AI/Action/actionCameraEventTurn.cpp @@ -6,24 +6,4 @@ CameraEventTurn::CameraEventTurn(const InitArg& arg) : CameraEvent(arg) {} CameraEventTurn::~CameraEventTurn() = default; -bool CameraEventTurn::init_(sead::Heap* heap) { - return CameraEvent::init_(heap); -} - -void CameraEventTurn::enter_(ksys::act::ai::InlineParamPack* params) { - CameraEvent::enter_(params); -} - -void CameraEventTurn::leave_() { - CameraEvent::leave_(); -} - -void CameraEventTurn::loadParams_() { - getStaticParam(&mBowFlag_s, "BowFlag"); -} - -void CameraEventTurn::calc_() { - CameraEvent::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraEventTurn.h b/src/Game/AI/Action/actionCameraEventTurn.h index ef1a45f1..31177e75 100644 --- a/src/Game/AI/Action/actionCameraEventTurn.h +++ b/src/Game/AI/Action/actionCameraEventTurn.h @@ -11,16 +11,7 @@ public: explicit CameraEventTurn(const InitArg& arg); ~CameraEventTurn() override; - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; - protected: - void calc_() override; - - // static_param at offset 0x40 - const bool* mBowFlag_s{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraFinder.cpp b/src/Game/AI/Action/actionCameraFinder.cpp index e67a95b6..77bb49ec 100644 --- a/src/Game/AI/Action/actionCameraFinder.cpp +++ b/src/Game/AI/Action/actionCameraFinder.cpp @@ -6,24 +6,4 @@ CameraFinder::CameraFinder(const InitArg& arg) : CameraAction(arg) {} CameraFinder::~CameraFinder() = default; -bool CameraFinder::init_(sead::Heap* heap) { - return CameraAction::init_(heap); -} - -void CameraFinder::enter_(ksys::act::ai::InlineParamPack* params) { - CameraAction::enter_(params); -} - -void CameraFinder::leave_() { - CameraAction::leave_(); -} - -void CameraFinder::loadParams_() { - getStaticParam(&mBowFlag_s, "BowFlag"); -} - -void CameraFinder::calc_() { - CameraAction::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraFinder.h b/src/Game/AI/Action/actionCameraFinder.h index 8c3432e2..cf9a4143 100644 --- a/src/Game/AI/Action/actionCameraFinder.h +++ b/src/Game/AI/Action/actionCameraFinder.h @@ -11,16 +11,7 @@ public: explicit CameraFinder(const InitArg& arg); ~CameraFinder() override; - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; - protected: - void calc_() override; - - // static_param at offset 0x40 - const bool* mBowFlag_s{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraHorse.cpp b/src/Game/AI/Action/actionCameraHorse.cpp index 4fc323a6..227a3206 100644 --- a/src/Game/AI/Action/actionCameraHorse.cpp +++ b/src/Game/AI/Action/actionCameraHorse.cpp @@ -6,24 +6,4 @@ CameraHorse::CameraHorse(const InitArg& arg) : CameraAction(arg) {} CameraHorse::~CameraHorse() = default; -bool CameraHorse::init_(sead::Heap* heap) { - return CameraAction::init_(heap); -} - -void CameraHorse::enter_(ksys::act::ai::InlineParamPack* params) { - CameraAction::enter_(params); -} - -void CameraHorse::leave_() { - CameraAction::leave_(); -} - -void CameraHorse::loadParams_() { - getStaticParam(&mBowFlag_s, "BowFlag"); -} - -void CameraHorse::calc_() { - CameraAction::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraHorse.h b/src/Game/AI/Action/actionCameraHorse.h index 2743bc9f..21df2f6b 100644 --- a/src/Game/AI/Action/actionCameraHorse.h +++ b/src/Game/AI/Action/actionCameraHorse.h @@ -11,16 +11,7 @@ public: explicit CameraHorse(const InitArg& arg); ~CameraHorse() override; - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; - protected: - void calc_() override; - - // static_param at offset 0x40 - const bool* mBowFlag_s{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraHorseLockOnEmpty.cpp b/src/Game/AI/Action/actionCameraHorseLockOnEmpty.cpp index f7198633..83bb7b4f 100644 --- a/src/Game/AI/Action/actionCameraHorseLockOnEmpty.cpp +++ b/src/Game/AI/Action/actionCameraHorseLockOnEmpty.cpp @@ -6,24 +6,4 @@ CameraHorseLockOnEmpty::CameraHorseLockOnEmpty(const InitArg& arg) : CameraActio CameraHorseLockOnEmpty::~CameraHorseLockOnEmpty() = default; -bool CameraHorseLockOnEmpty::init_(sead::Heap* heap) { - return CameraAction::init_(heap); -} - -void CameraHorseLockOnEmpty::enter_(ksys::act::ai::InlineParamPack* params) { - CameraAction::enter_(params); -} - -void CameraHorseLockOnEmpty::leave_() { - CameraAction::leave_(); -} - -void CameraHorseLockOnEmpty::loadParams_() { - getStaticParam(&mBowFlag_s, "BowFlag"); -} - -void CameraHorseLockOnEmpty::calc_() { - CameraAction::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraHorseLockOnEmpty.h b/src/Game/AI/Action/actionCameraHorseLockOnEmpty.h index 9c15477e..4dc61339 100644 --- a/src/Game/AI/Action/actionCameraHorseLockOnEmpty.h +++ b/src/Game/AI/Action/actionCameraHorseLockOnEmpty.h @@ -11,16 +11,7 @@ public: explicit CameraHorseLockOnEmpty(const InitArg& arg); ~CameraHorseLockOnEmpty() override; - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; - protected: - void calc_() override; - - // static_param at offset 0x40 - const bool* mBowFlag_s{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraKeep.cpp b/src/Game/AI/Action/actionCameraKeep.cpp index 056e0a13..01734802 100644 --- a/src/Game/AI/Action/actionCameraKeep.cpp +++ b/src/Game/AI/Action/actionCameraKeep.cpp @@ -4,26 +4,4 @@ namespace uking::action { CameraKeep::CameraKeep(const InitArg& arg) : CameraAction(arg) {} -CameraKeep::~CameraKeep() = default; - -bool CameraKeep::init_(sead::Heap* heap) { - return CameraAction::init_(heap); -} - -void CameraKeep::enter_(ksys::act::ai::InlineParamPack* params) { - CameraAction::enter_(params); -} - -void CameraKeep::leave_() { - CameraAction::leave_(); -} - -void CameraKeep::loadParams_() { - getStaticParam(&mBowFlag_s, "BowFlag"); -} - -void CameraKeep::calc_() { - CameraAction::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraKeep.h b/src/Game/AI/Action/actionCameraKeep.h index ec8f06f6..333366c8 100644 --- a/src/Game/AI/Action/actionCameraKeep.h +++ b/src/Game/AI/Action/actionCameraKeep.h @@ -9,18 +9,8 @@ class CameraKeep : public CameraAction { SEAD_RTTI_OVERRIDE(CameraKeep, CameraAction) public: explicit CameraKeep(const InitArg& arg); - ~CameraKeep() override; - - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; protected: - void calc_() override; - - // static_param at offset 0x40 - const bool* mBowFlag_s{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraLockOn.cpp b/src/Game/AI/Action/actionCameraLockOn.cpp index 6579dd03..93cd20f2 100644 --- a/src/Game/AI/Action/actionCameraLockOn.cpp +++ b/src/Game/AI/Action/actionCameraLockOn.cpp @@ -4,26 +4,4 @@ namespace uking::action { CameraLockOn::CameraLockOn(const InitArg& arg) : CameraLockOnBase(arg) {} -CameraLockOn::~CameraLockOn() = default; - -bool CameraLockOn::init_(sead::Heap* heap) { - return CameraLockOnBase::init_(heap); -} - -void CameraLockOn::enter_(ksys::act::ai::InlineParamPack* params) { - CameraLockOnBase::enter_(params); -} - -void CameraLockOn::leave_() { - CameraLockOnBase::leave_(); -} - -void CameraLockOn::loadParams_() { - getStaticParam(&mBowFlag_s, "BowFlag"); -} - -void CameraLockOn::calc_() { - CameraLockOnBase::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraLockOn.h b/src/Game/AI/Action/actionCameraLockOn.h index ac594085..a941d228 100644 --- a/src/Game/AI/Action/actionCameraLockOn.h +++ b/src/Game/AI/Action/actionCameraLockOn.h @@ -9,18 +9,8 @@ class CameraLockOn : public CameraLockOnBase { SEAD_RTTI_OVERRIDE(CameraLockOn, CameraLockOnBase) public: explicit CameraLockOn(const InitArg& arg); - ~CameraLockOn() override; - - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; protected: - void calc_() override; - - // static_param at offset 0x40 - const bool* mBowFlag_s{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraLockOnAimingAt.cpp b/src/Game/AI/Action/actionCameraLockOnAimingAt.cpp index 53b09e65..c57d1a22 100644 --- a/src/Game/AI/Action/actionCameraLockOnAimingAt.cpp +++ b/src/Game/AI/Action/actionCameraLockOnAimingAt.cpp @@ -6,24 +6,4 @@ CameraLockOnAimingAt::CameraLockOnAimingAt(const InitArg& arg) : CameraAction(ar CameraLockOnAimingAt::~CameraLockOnAimingAt() = default; -bool CameraLockOnAimingAt::init_(sead::Heap* heap) { - return CameraAction::init_(heap); -} - -void CameraLockOnAimingAt::enter_(ksys::act::ai::InlineParamPack* params) { - CameraAction::enter_(params); -} - -void CameraLockOnAimingAt::leave_() { - CameraAction::leave_(); -} - -void CameraLockOnAimingAt::loadParams_() { - getStaticParam(&mBowFlag_s, "BowFlag"); -} - -void CameraLockOnAimingAt::calc_() { - CameraAction::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraLockOnAimingAt.h b/src/Game/AI/Action/actionCameraLockOnAimingAt.h index c2a604d0..ed085ef1 100644 --- a/src/Game/AI/Action/actionCameraLockOnAimingAt.h +++ b/src/Game/AI/Action/actionCameraLockOnAimingAt.h @@ -11,16 +11,7 @@ public: explicit CameraLockOnAimingAt(const InitArg& arg); ~CameraLockOnAimingAt() override; - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; - protected: - void calc_() override; - - // static_param at offset 0x40 - const bool* mBowFlag_s{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraLockOnBase.cpp b/src/Game/AI/Action/actionCameraLockOnBase.cpp index 422c0bef..f8884a93 100644 --- a/src/Game/AI/Action/actionCameraLockOnBase.cpp +++ b/src/Game/AI/Action/actionCameraLockOnBase.cpp @@ -6,24 +6,4 @@ CameraLockOnBase::CameraLockOnBase(const InitArg& arg) : CameraAction(arg) {} CameraLockOnBase::~CameraLockOnBase() = default; -bool CameraLockOnBase::init_(sead::Heap* heap) { - return CameraAction::init_(heap); -} - -void CameraLockOnBase::enter_(ksys::act::ai::InlineParamPack* params) { - CameraAction::enter_(params); -} - -void CameraLockOnBase::leave_() { - CameraAction::leave_(); -} - -void CameraLockOnBase::loadParams_() { - getStaticParam(&mBowFlag_s, "BowFlag"); -} - -void CameraLockOnBase::calc_() { - CameraAction::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraLockOnBase.h b/src/Game/AI/Action/actionCameraLockOnBase.h index beed1e60..ada317cd 100644 --- a/src/Game/AI/Action/actionCameraLockOnBase.h +++ b/src/Game/AI/Action/actionCameraLockOnBase.h @@ -11,16 +11,7 @@ public: explicit CameraLockOnBase(const InitArg& arg); ~CameraLockOnBase() override; - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; - protected: - void calc_() override; - - // static_param at offset 0x40 - const bool* mBowFlag_s{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraMagneCatch.cpp b/src/Game/AI/Action/actionCameraMagneCatch.cpp index 00df072a..5965e332 100644 --- a/src/Game/AI/Action/actionCameraMagneCatch.cpp +++ b/src/Game/AI/Action/actionCameraMagneCatch.cpp @@ -6,24 +6,4 @@ CameraMagneCatch::CameraMagneCatch(const InitArg& arg) : CameraLockOnBase(arg) { CameraMagneCatch::~CameraMagneCatch() = default; -bool CameraMagneCatch::init_(sead::Heap* heap) { - return CameraLockOnBase::init_(heap); -} - -void CameraMagneCatch::enter_(ksys::act::ai::InlineParamPack* params) { - CameraLockOnBase::enter_(params); -} - -void CameraMagneCatch::leave_() { - CameraLockOnBase::leave_(); -} - -void CameraMagneCatch::loadParams_() { - getStaticParam(&mBowFlag_s, "BowFlag"); -} - -void CameraMagneCatch::calc_() { - CameraLockOnBase::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraMagneCatch.h b/src/Game/AI/Action/actionCameraMagneCatch.h index e7a64651..49110601 100644 --- a/src/Game/AI/Action/actionCameraMagneCatch.h +++ b/src/Game/AI/Action/actionCameraMagneCatch.h @@ -11,16 +11,7 @@ public: explicit CameraMagneCatch(const InitArg& arg); ~CameraMagneCatch() override; - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; - protected: - void calc_() override; - - // static_param at offset 0x40 - const bool* mBowFlag_s{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraMotorcycle.cpp b/src/Game/AI/Action/actionCameraMotorcycle.cpp index bfe6942e..7c01f981 100644 --- a/src/Game/AI/Action/actionCameraMotorcycle.cpp +++ b/src/Game/AI/Action/actionCameraMotorcycle.cpp @@ -6,24 +6,4 @@ CameraMotorcycle::CameraMotorcycle(const InitArg& arg) : CameraAction(arg) {} CameraMotorcycle::~CameraMotorcycle() = default; -bool CameraMotorcycle::init_(sead::Heap* heap) { - return CameraAction::init_(heap); -} - -void CameraMotorcycle::enter_(ksys::act::ai::InlineParamPack* params) { - CameraAction::enter_(params); -} - -void CameraMotorcycle::leave_() { - CameraAction::leave_(); -} - -void CameraMotorcycle::loadParams_() { - getStaticParam(&mBowFlag_s, "BowFlag"); -} - -void CameraMotorcycle::calc_() { - CameraAction::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraMotorcycle.h b/src/Game/AI/Action/actionCameraMotorcycle.h index 79b1f4f7..1f537f1e 100644 --- a/src/Game/AI/Action/actionCameraMotorcycle.h +++ b/src/Game/AI/Action/actionCameraMotorcycle.h @@ -11,16 +11,7 @@ public: explicit CameraMotorcycle(const InitArg& arg); ~CameraMotorcycle() override; - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; - protected: - void calc_() override; - - // static_param at offset 0x40 - const bool* mBowFlag_s{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraMotorcycleLockOnEmpty.cpp b/src/Game/AI/Action/actionCameraMotorcycleLockOnEmpty.cpp index ec1fbb03..77622f88 100644 --- a/src/Game/AI/Action/actionCameraMotorcycleLockOnEmpty.cpp +++ b/src/Game/AI/Action/actionCameraMotorcycleLockOnEmpty.cpp @@ -4,26 +4,4 @@ namespace uking::action { CameraMotorcycleLockOnEmpty::CameraMotorcycleLockOnEmpty(const InitArg& arg) : CameraAction(arg) {} -CameraMotorcycleLockOnEmpty::~CameraMotorcycleLockOnEmpty() = default; - -bool CameraMotorcycleLockOnEmpty::init_(sead::Heap* heap) { - return CameraAction::init_(heap); -} - -void CameraMotorcycleLockOnEmpty::enter_(ksys::act::ai::InlineParamPack* params) { - CameraAction::enter_(params); -} - -void CameraMotorcycleLockOnEmpty::leave_() { - CameraAction::leave_(); -} - -void CameraMotorcycleLockOnEmpty::loadParams_() { - getStaticParam(&mBowFlag_s, "BowFlag"); -} - -void CameraMotorcycleLockOnEmpty::calc_() { - CameraAction::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraMotorcycleLockOnEmpty.h b/src/Game/AI/Action/actionCameraMotorcycleLockOnEmpty.h index f583e194..c22a5cf7 100644 --- a/src/Game/AI/Action/actionCameraMotorcycleLockOnEmpty.h +++ b/src/Game/AI/Action/actionCameraMotorcycleLockOnEmpty.h @@ -9,18 +9,8 @@ class CameraMotorcycleLockOnEmpty : public CameraAction { SEAD_RTTI_OVERRIDE(CameraMotorcycleLockOnEmpty, CameraAction) public: explicit CameraMotorcycleLockOnEmpty(const InitArg& arg); - ~CameraMotorcycleLockOnEmpty() override; - - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; protected: - void calc_() override; - - // static_param at offset 0x40 - const bool* mBowFlag_s{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraRevolve.cpp b/src/Game/AI/Action/actionCameraRevolve.cpp index 27fae09e..b7e2bc04 100644 --- a/src/Game/AI/Action/actionCameraRevolve.cpp +++ b/src/Game/AI/Action/actionCameraRevolve.cpp @@ -4,26 +4,4 @@ namespace uking::action { CameraRevolve::CameraRevolve(const InitArg& arg) : CameraAction(arg) {} -CameraRevolve::~CameraRevolve() = default; - -bool CameraRevolve::init_(sead::Heap* heap) { - return CameraAction::init_(heap); -} - -void CameraRevolve::enter_(ksys::act::ai::InlineParamPack* params) { - CameraAction::enter_(params); -} - -void CameraRevolve::leave_() { - CameraAction::leave_(); -} - -void CameraRevolve::loadParams_() { - getStaticParam(&mBowFlag_s, "BowFlag"); -} - -void CameraRevolve::calc_() { - CameraAction::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraRevolve.h b/src/Game/AI/Action/actionCameraRevolve.h index 2e72b840..a73d4a74 100644 --- a/src/Game/AI/Action/actionCameraRevolve.h +++ b/src/Game/AI/Action/actionCameraRevolve.h @@ -9,18 +9,8 @@ class CameraRevolve : public CameraAction { SEAD_RTTI_OVERRIDE(CameraRevolve, CameraAction) public: explicit CameraRevolve(const InitArg& arg); - ~CameraRevolve() override; - - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; protected: - void calc_() override; - - // static_param at offset 0x40 - const bool* mBowFlag_s{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraRotRumble.cpp b/src/Game/AI/Action/actionCameraRotRumble.cpp index ddf62967..95cf7c16 100644 --- a/src/Game/AI/Action/actionCameraRotRumble.cpp +++ b/src/Game/AI/Action/actionCameraRotRumble.cpp @@ -4,28 +4,10 @@ namespace uking::action { CameraRotRumble::CameraRotRumble(const InitArg& arg) : ksys::act::ai::Action(arg) {} -CameraRotRumble::~CameraRotRumble() = default; - -bool CameraRotRumble::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - -void CameraRotRumble::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void CameraRotRumble::leave_() { - ksys::act::ai::Action::leave_(); -} - void CameraRotRumble::loadParams_() { getDynamicParam2(&mPattern_d, "Pattern"); getDynamicParam2(&mCount_d, "Count"); getDynamicParam2(&mPower_d, "Power"); } -void CameraRotRumble::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraRotRumble.h b/src/Game/AI/Action/actionCameraRotRumble.h index 3ee8044a..fcff60d6 100644 --- a/src/Game/AI/Action/actionCameraRotRumble.h +++ b/src/Game/AI/Action/actionCameraRotRumble.h @@ -8,16 +8,10 @@ class CameraRotRumble : public ksys::act::ai::Action { SEAD_RTTI_OVERRIDE(CameraRotRumble, ksys::act::ai::Action) public: explicit CameraRotRumble(const InitArg& arg); - ~CameraRotRumble() override; - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic2_param at offset 0x20 int* mPattern_d{}; // dynamic2_param at offset 0x28 diff --git a/src/Game/AI/Action/actionCameraRumble.cpp b/src/Game/AI/Action/actionCameraRumble.cpp index daad2dff..95f58351 100644 --- a/src/Game/AI/Action/actionCameraRumble.cpp +++ b/src/Game/AI/Action/actionCameraRumble.cpp @@ -4,20 +4,6 @@ namespace uking::action { CameraRumble::CameraRumble(const InitArg& arg) : ksys::act::ai::Action(arg) {} -CameraRumble::~CameraRumble() = default; - -bool CameraRumble::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - -void CameraRumble::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void CameraRumble::leave_() { - ksys::act::ai::Action::leave_(); -} - void CameraRumble::loadParams_() { getDynamicParam2(&mPattern_d, "Pattern"); getDynamicParam2(&mCount_d, "Count"); @@ -25,8 +11,4 @@ void CameraRumble::loadParams_() { getDynamicParam2(&mSideways_d, "Sideways"); } -void CameraRumble::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraRumble.h b/src/Game/AI/Action/actionCameraRumble.h index b619c20d..a50397cc 100644 --- a/src/Game/AI/Action/actionCameraRumble.h +++ b/src/Game/AI/Action/actionCameraRumble.h @@ -8,16 +8,10 @@ class CameraRumble : public ksys::act::ai::Action { SEAD_RTTI_OVERRIDE(CameraRumble, ksys::act::ai::Action) public: explicit CameraRumble(const InitArg& arg); - ~CameraRumble() override; - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic2_param at offset 0x20 int* mPattern_d{}; // dynamic2_param at offset 0x28 diff --git a/src/Game/AI/Action/actionCameraRumbleLoop.cpp b/src/Game/AI/Action/actionCameraRumbleLoop.cpp index 73a5b594..6214e899 100644 --- a/src/Game/AI/Action/actionCameraRumbleLoop.cpp +++ b/src/Game/AI/Action/actionCameraRumbleLoop.cpp @@ -4,20 +4,10 @@ namespace uking::action { CameraRumbleLoop::CameraRumbleLoop(const InitArg& arg) : ksys::act::ai::Action(arg) {} -CameraRumbleLoop::~CameraRumbleLoop() = default; - -bool CameraRumbleLoop::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - void CameraRumbleLoop::enter_(ksys::act::ai::InlineParamPack* params) { ksys::act::ai::Action::enter_(params); } -void CameraRumbleLoop::leave_() { - ksys::act::ai::Action::leave_(); -} - void CameraRumbleLoop::loadParams_() { getDynamicParam2(&mPattern_d, "Pattern"); getDynamicParam2(&mPower_d, "Power"); @@ -25,8 +15,4 @@ void CameraRumbleLoop::loadParams_() { getAITreeVariable(&mCamVibId_a, "CamVibId"); } -void CameraRumbleLoop::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraRumbleLoop.h b/src/Game/AI/Action/actionCameraRumbleLoop.h index e6dd0d64..a12b0033 100644 --- a/src/Game/AI/Action/actionCameraRumbleLoop.h +++ b/src/Game/AI/Action/actionCameraRumbleLoop.h @@ -8,16 +8,11 @@ class CameraRumbleLoop : public ksys::act::ai::Action { SEAD_RTTI_OVERRIDE(CameraRumbleLoop, ksys::act::ai::Action) public: explicit CameraRumbleLoop(const InitArg& arg); - ~CameraRumbleLoop() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic2_param at offset 0x20 int* mPattern_d{}; // dynamic2_param at offset 0x28 diff --git a/src/Game/AI/Action/actionCameraRumbleStop.cpp b/src/Game/AI/Action/actionCameraRumbleStop.cpp index 74e49de6..260e4631 100644 --- a/src/Game/AI/Action/actionCameraRumbleStop.cpp +++ b/src/Game/AI/Action/actionCameraRumbleStop.cpp @@ -4,26 +4,8 @@ namespace uking::action { CameraRumbleStop::CameraRumbleStop(const InitArg& arg) : ksys::act::ai::Action(arg) {} -CameraRumbleStop::~CameraRumbleStop() = default; - -bool CameraRumbleStop::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - -void CameraRumbleStop::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void CameraRumbleStop::leave_() { - ksys::act::ai::Action::leave_(); -} - void CameraRumbleStop::loadParams_() { getAITreeVariable(&mCamVibId_a, "CamVibId"); } -void CameraRumbleStop::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraRumbleStop.h b/src/Game/AI/Action/actionCameraRumbleStop.h index 0474cfbe..0dff3659 100644 --- a/src/Game/AI/Action/actionCameraRumbleStop.h +++ b/src/Game/AI/Action/actionCameraRumbleStop.h @@ -8,16 +8,10 @@ class CameraRumbleStop : public ksys::act::ai::Action { SEAD_RTTI_OVERRIDE(CameraRumbleStop, ksys::act::ai::Action) public: explicit CameraRumbleStop(const InitArg& arg); - ~CameraRumbleStop() override; - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // aitree_variable at offset 0x20 int* mCamVibId_a{}; }; diff --git a/src/Game/AI/Action/actionCameraRumbleStopWithDamping.cpp b/src/Game/AI/Action/actionCameraRumbleStopWithDamping.cpp index 01fbc877..bb2ab469 100644 --- a/src/Game/AI/Action/actionCameraRumbleStopWithDamping.cpp +++ b/src/Game/AI/Action/actionCameraRumbleStopWithDamping.cpp @@ -5,27 +5,9 @@ namespace uking::action { CameraRumbleStopWithDamping::CameraRumbleStopWithDamping(const InitArg& arg) : ksys::act::ai::Action(arg) {} -CameraRumbleStopWithDamping::~CameraRumbleStopWithDamping() = default; - -bool CameraRumbleStopWithDamping::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - -void CameraRumbleStopWithDamping::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void CameraRumbleStopWithDamping::leave_() { - ksys::act::ai::Action::leave_(); -} - void CameraRumbleStopWithDamping::loadParams_() { getDynamicParam2(&mDampingTime_d, "DampingTime"); getAITreeVariable(&mCamVibId_a, "CamVibId"); } -void CameraRumbleStopWithDamping::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraRumbleStopWithDamping.h b/src/Game/AI/Action/actionCameraRumbleStopWithDamping.h index da6292ac..2206efaa 100644 --- a/src/Game/AI/Action/actionCameraRumbleStopWithDamping.h +++ b/src/Game/AI/Action/actionCameraRumbleStopWithDamping.h @@ -8,16 +8,10 @@ class CameraRumbleStopWithDamping : public ksys::act::ai::Action { SEAD_RTTI_OVERRIDE(CameraRumbleStopWithDamping, ksys::act::ai::Action) public: explicit CameraRumbleStopWithDamping(const InitArg& arg); - ~CameraRumbleStopWithDamping() override; - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic2_param at offset 0x20 float* mDampingTime_d{}; // aitree_variable at offset 0x28 diff --git a/src/Game/AI/Action/actionCameraShieldSurfing.cpp b/src/Game/AI/Action/actionCameraShieldSurfing.cpp index ee9dffd7..5bf0a280 100644 --- a/src/Game/AI/Action/actionCameraShieldSurfing.cpp +++ b/src/Game/AI/Action/actionCameraShieldSurfing.cpp @@ -6,24 +6,4 @@ CameraShieldSurfing::CameraShieldSurfing(const InitArg& arg) : CameraAction(arg) CameraShieldSurfing::~CameraShieldSurfing() = default; -bool CameraShieldSurfing::init_(sead::Heap* heap) { - return CameraAction::init_(heap); -} - -void CameraShieldSurfing::enter_(ksys::act::ai::InlineParamPack* params) { - CameraAction::enter_(params); -} - -void CameraShieldSurfing::leave_() { - CameraAction::leave_(); -} - -void CameraShieldSurfing::loadParams_() { - getStaticParam(&mBowFlag_s, "BowFlag"); -} - -void CameraShieldSurfing::calc_() { - CameraAction::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraShieldSurfing.h b/src/Game/AI/Action/actionCameraShieldSurfing.h index 186fc6c4..eb2aa6b5 100644 --- a/src/Game/AI/Action/actionCameraShieldSurfing.h +++ b/src/Game/AI/Action/actionCameraShieldSurfing.h @@ -11,16 +11,7 @@ public: explicit CameraShieldSurfing(const InitArg& arg); ~CameraShieldSurfing() override; - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; - protected: - void calc_() override; - - // static_param at offset 0x40 - const bool* mBowFlag_s{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraTail.cpp b/src/Game/AI/Action/actionCameraTail.cpp index aae46a6a..3f5b8107 100644 --- a/src/Game/AI/Action/actionCameraTail.cpp +++ b/src/Game/AI/Action/actionCameraTail.cpp @@ -6,24 +6,4 @@ CameraTail::CameraTail(const InitArg& arg) : CameraAction(arg) {} CameraTail::~CameraTail() = default; -bool CameraTail::init_(sead::Heap* heap) { - return CameraAction::init_(heap); -} - -void CameraTail::enter_(ksys::act::ai::InlineParamPack* params) { - CameraAction::enter_(params); -} - -void CameraTail::leave_() { - CameraAction::leave_(); -} - -void CameraTail::loadParams_() { - getStaticParam(&mBowFlag_s, "BowFlag"); -} - -void CameraTail::calc_() { - CameraAction::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraTail.h b/src/Game/AI/Action/actionCameraTail.h index 10ae7e02..b3fdac3a 100644 --- a/src/Game/AI/Action/actionCameraTail.h +++ b/src/Game/AI/Action/actionCameraTail.h @@ -11,16 +11,7 @@ public: explicit CameraTail(const InitArg& arg); ~CameraTail() override; - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; - protected: - void calc_() override; - - // static_param at offset 0x40 - const bool* mBowFlag_s{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraWakeboard.cpp b/src/Game/AI/Action/actionCameraWakeboard.cpp index e6b09496..5c215b4b 100644 --- a/src/Game/AI/Action/actionCameraWakeboard.cpp +++ b/src/Game/AI/Action/actionCameraWakeboard.cpp @@ -6,24 +6,4 @@ CameraWakeboard::CameraWakeboard(const InitArg& arg) : CameraAction(arg) {} CameraWakeboard::~CameraWakeboard() = default; -bool CameraWakeboard::init_(sead::Heap* heap) { - return CameraAction::init_(heap); -} - -void CameraWakeboard::enter_(ksys::act::ai::InlineParamPack* params) { - CameraAction::enter_(params); -} - -void CameraWakeboard::leave_() { - CameraAction::leave_(); -} - -void CameraWakeboard::loadParams_() { - getStaticParam(&mBowFlag_s, "BowFlag"); -} - -void CameraWakeboard::calc_() { - CameraAction::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraWakeboard.h b/src/Game/AI/Action/actionCameraWakeboard.h index 17116ea4..fcdb7e8d 100644 --- a/src/Game/AI/Action/actionCameraWakeboard.h +++ b/src/Game/AI/Action/actionCameraWakeboard.h @@ -11,16 +11,7 @@ public: explicit CameraWakeboard(const InitArg& arg); ~CameraWakeboard() override; - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; - protected: - void calc_() override; - - // static_param at offset 0x40 - const bool* mBowFlag_s{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraWaterRemainsHowling.cpp b/src/Game/AI/Action/actionCameraWaterRemainsHowling.cpp index bf0e2468..09197bc9 100644 --- a/src/Game/AI/Action/actionCameraWaterRemainsHowling.cpp +++ b/src/Game/AI/Action/actionCameraWaterRemainsHowling.cpp @@ -6,24 +6,4 @@ CameraWaterRemainsHowling::CameraWaterRemainsHowling(const InitArg& arg) : Camer CameraWaterRemainsHowling::~CameraWaterRemainsHowling() = default; -bool CameraWaterRemainsHowling::init_(sead::Heap* heap) { - return CameraAction::init_(heap); -} - -void CameraWaterRemainsHowling::enter_(ksys::act::ai::InlineParamPack* params) { - CameraAction::enter_(params); -} - -void CameraWaterRemainsHowling::leave_() { - CameraAction::leave_(); -} - -void CameraWaterRemainsHowling::loadParams_() { - getStaticParam(&mBowFlag_s, "BowFlag"); -} - -void CameraWaterRemainsHowling::calc_() { - CameraAction::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraWaterRemainsHowling.h b/src/Game/AI/Action/actionCameraWaterRemainsHowling.h index e03e9c33..76158dff 100644 --- a/src/Game/AI/Action/actionCameraWaterRemainsHowling.h +++ b/src/Game/AI/Action/actionCameraWaterRemainsHowling.h @@ -11,16 +11,7 @@ public: explicit CameraWaterRemainsHowling(const InitArg& arg); ~CameraWaterRemainsHowling() override; - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; - protected: - void calc_() override; - - // static_param at offset 0x40 - const bool* mBowFlag_s{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraWaterfallClimb.cpp b/src/Game/AI/Action/actionCameraWaterfallClimb.cpp index 1f34e02d..6bc18761 100644 --- a/src/Game/AI/Action/actionCameraWaterfallClimb.cpp +++ b/src/Game/AI/Action/actionCameraWaterfallClimb.cpp @@ -6,24 +6,4 @@ CameraWaterfallClimb::CameraWaterfallClimb(const InitArg& arg) : CameraAction(ar CameraWaterfallClimb::~CameraWaterfallClimb() = default; -bool CameraWaterfallClimb::init_(sead::Heap* heap) { - return CameraAction::init_(heap); -} - -void CameraWaterfallClimb::enter_(ksys::act::ai::InlineParamPack* params) { - CameraAction::enter_(params); -} - -void CameraWaterfallClimb::leave_() { - CameraAction::leave_(); -} - -void CameraWaterfallClimb::loadParams_() { - getStaticParam(&mBowFlag_s, "BowFlag"); -} - -void CameraWaterfallClimb::calc_() { - CameraAction::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionCameraWaterfallClimb.h b/src/Game/AI/Action/actionCameraWaterfallClimb.h index 8370a9a4..72c67865 100644 --- a/src/Game/AI/Action/actionCameraWaterfallClimb.h +++ b/src/Game/AI/Action/actionCameraWaterfallClimb.h @@ -11,16 +11,7 @@ public: explicit CameraWaterfallClimb(const InitArg& arg); ~CameraWaterfallClimb() override; - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; - protected: - void calc_() override; - - // static_param at offset 0x40 - const bool* mBowFlag_s{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionCarriedNoHit.cpp b/src/Game/AI/Action/actionCarriedNoHit.cpp index 89cd997e..185e56ef 100644 --- a/src/Game/AI/Action/actionCarriedNoHit.cpp +++ b/src/Game/AI/Action/actionCarriedNoHit.cpp @@ -6,10 +6,6 @@ CarriedNoHit::CarriedNoHit(const InitArg& arg) : Carried(arg) {} CarriedNoHit::~CarriedNoHit() = default; -bool CarriedNoHit::init_(sead::Heap* heap) { - return Carried::init_(heap); -} - void CarriedNoHit::enter_(ksys::act::ai::InlineParamPack* params) { Carried::enter_(params); } @@ -18,19 +14,4 @@ void CarriedNoHit::leave_() { Carried::leave_(); } -void CarriedNoHit::loadParams_() { - getStaticParam(&mBindType_s, "BindType"); - getStaticParam(&mFailDistance_s, "FailDistance"); - getStaticParam(&mIsCreateItem_s, "IsCreateItem"); - getStaticParam(&mIsRecoverCharCtrlAxis_s, "IsRecoverCharCtrlAxis"); - getStaticParam(&mIsUseConstraint_s, "IsUseConstraint"); - getStaticParam(&mIsOnBaseLink_s, "IsOnBaseLink"); - getStaticParam(&mIsChangeable_s, "IsChangeable"); - getStaticParam(&mHoldOnXLinkKey_s, "HoldOnXLinkKey"); -} - -void CarriedNoHit::calc_() { - Carried::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionCarriedNoHit.h b/src/Game/AI/Action/actionCarriedNoHit.h index 4409f945..72e26c7b 100644 --- a/src/Game/AI/Action/actionCarriedNoHit.h +++ b/src/Game/AI/Action/actionCarriedNoHit.h @@ -11,30 +11,10 @@ public: explicit CarriedNoHit(const InitArg& arg); ~CarriedNoHit() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; - void loadParams_() override; protected: - void calc_() override; - - // static_param at offset 0x20 - const int* mBindType_s{}; - // static_param at offset 0x28 - const float* mFailDistance_s{}; - // static_param at offset 0x30 - const bool* mIsCreateItem_s{}; - // static_param at offset 0x38 - const bool* mIsRecoverCharCtrlAxis_s{}; - // static_param at offset 0x40 - const bool* mIsUseConstraint_s{}; - // static_param at offset 0x48 - const bool* mIsOnBaseLink_s{}; - // static_param at offset 0x50 - const bool* mIsChangeable_s{}; - // static_param at offset 0x58 - sead::SafeString mHoldOnXLinkKey_s{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionCatch.cpp b/src/Game/AI/Action/actionCatch.cpp index 2dbb6f74..24be785f 100644 --- a/src/Game/AI/Action/actionCatch.cpp +++ b/src/Game/AI/Action/actionCatch.cpp @@ -6,10 +6,6 @@ Catch::Catch(const InitArg& arg) : ActionEx(arg) {} Catch::~Catch() = default; -bool Catch::init_(sead::Heap* heap) { - return ActionEx::init_(heap); -} - void Catch::enter_(ksys::act::ai::InlineParamPack* params) { ActionEx::enter_(params); } diff --git a/src/Game/AI/Action/actionCatch.h b/src/Game/AI/Action/actionCatch.h index 061ccef1..6b354d6b 100644 --- a/src/Game/AI/Action/actionCatch.h +++ b/src/Game/AI/Action/actionCatch.h @@ -11,7 +11,6 @@ public: explicit Catch(const InitArg& arg); ~Catch() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionChangeChoiceNumMsgFor3DShop.cpp b/src/Game/AI/Action/actionChangeChoiceNumMsgFor3DShop.cpp index 8c9cc39f..365427ba 100644 --- a/src/Game/AI/Action/actionChangeChoiceNumMsgFor3DShop.cpp +++ b/src/Game/AI/Action/actionChangeChoiceNumMsgFor3DShop.cpp @@ -11,18 +11,6 @@ bool ChangeChoiceNumMsgFor3DShop::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void ChangeChoiceNumMsgFor3DShop::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void ChangeChoiceNumMsgFor3DShop::leave_() { - ksys::act::ai::Action::leave_(); -} - void ChangeChoiceNumMsgFor3DShop::loadParams_() {} -void ChangeChoiceNumMsgFor3DShop::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionChangeChoiceNumMsgFor3DShop.h b/src/Game/AI/Action/actionChangeChoiceNumMsgFor3DShop.h index 5b393cb2..19b7852f 100644 --- a/src/Game/AI/Action/actionChangeChoiceNumMsgFor3DShop.h +++ b/src/Game/AI/Action/actionChangeChoiceNumMsgFor3DShop.h @@ -11,12 +11,9 @@ public: ~ChangeChoiceNumMsgFor3DShop() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionChangeEmotion.cpp b/src/Game/AI/Action/actionChangeEmotion.cpp index 283368f8..edb6ecac 100644 --- a/src/Game/AI/Action/actionChangeEmotion.cpp +++ b/src/Game/AI/Action/actionChangeEmotion.cpp @@ -10,21 +10,9 @@ bool ChangeEmotion::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void ChangeEmotion::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void ChangeEmotion::leave_() { - ksys::act::ai::Action::leave_(); -} - void ChangeEmotion::loadParams_() { getDynamicParam(&mIsOnlyFace_d, "IsOnlyFace"); getDynamicParam(&mEmotionType_d, "EmotionType"); } -void ChangeEmotion::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionChangeEmotion.h b/src/Game/AI/Action/actionChangeEmotion.h index 5b88bbe0..6ac82fef 100644 --- a/src/Game/AI/Action/actionChangeEmotion.h +++ b/src/Game/AI/Action/actionChangeEmotion.h @@ -11,13 +11,9 @@ public: ~ChangeEmotion() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 bool* mIsOnlyFace_d{}; // dynamic_param at offset 0x28 diff --git a/src/Game/AI/Action/actionChangeMiniMapScale.cpp b/src/Game/AI/Action/actionChangeMiniMapScale.cpp index 84f34fc4..05f1aa40 100644 --- a/src/Game/AI/Action/actionChangeMiniMapScale.cpp +++ b/src/Game/AI/Action/actionChangeMiniMapScale.cpp @@ -10,20 +10,8 @@ bool ChangeMiniMapScale::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void ChangeMiniMapScale::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void ChangeMiniMapScale::leave_() { - ksys::act::ai::Action::leave_(); -} - void ChangeMiniMapScale::loadParams_() { getDynamicParam(&mScaleLevel_d, "ScaleLevel"); } -void ChangeMiniMapScale::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionChangeMiniMapScale.h b/src/Game/AI/Action/actionChangeMiniMapScale.h index 17922962..f093e4e2 100644 --- a/src/Game/AI/Action/actionChangeMiniMapScale.h +++ b/src/Game/AI/Action/actionChangeMiniMapScale.h @@ -11,13 +11,9 @@ public: ~ChangeMiniMapScale() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 int* mScaleLevel_d{}; }; diff --git a/src/Game/AI/Action/actionChangePosture.cpp b/src/Game/AI/Action/actionChangePosture.cpp index 23741b16..f937190f 100644 --- a/src/Game/AI/Action/actionChangePosture.cpp +++ b/src/Game/AI/Action/actionChangePosture.cpp @@ -10,20 +10,8 @@ bool ChangePosture::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void ChangePosture::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void ChangePosture::leave_() { - ksys::act::ai::Action::leave_(); -} - void ChangePosture::loadParams_() { getDynamicParam(&mPosture_d, "Posture"); } -void ChangePosture::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionChangePosture.h b/src/Game/AI/Action/actionChangePosture.h index 6dc18196..894d2cc9 100644 --- a/src/Game/AI/Action/actionChangePosture.h +++ b/src/Game/AI/Action/actionChangePosture.h @@ -11,13 +11,9 @@ public: ~ChangePosture() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 sead::SafeString* mPosture_d{}; }; diff --git a/src/Game/AI/Action/actionChangeScheduleAnchor.cpp b/src/Game/AI/Action/actionChangeScheduleAnchor.cpp index f2daed6b..87e723f6 100644 --- a/src/Game/AI/Action/actionChangeScheduleAnchor.cpp +++ b/src/Game/AI/Action/actionChangeScheduleAnchor.cpp @@ -10,21 +10,9 @@ bool ChangeScheduleAnchor::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void ChangeScheduleAnchor::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void ChangeScheduleAnchor::leave_() { - ksys::act::ai::Action::leave_(); -} - void ChangeScheduleAnchor::loadParams_() { getDynamicParam(&mScheduleName_d, "ScheduleName"); getDynamicParam(&mAnchorUniqueName_d, "AnchorUniqueName"); } -void ChangeScheduleAnchor::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionChangeScheduleAnchor.h b/src/Game/AI/Action/actionChangeScheduleAnchor.h index 696670f0..1d283b89 100644 --- a/src/Game/AI/Action/actionChangeScheduleAnchor.h +++ b/src/Game/AI/Action/actionChangeScheduleAnchor.h @@ -11,13 +11,9 @@ public: ~ChangeScheduleAnchor() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 sead::SafeString* mScheduleName_d{}; // dynamic_param at offset 0x30 diff --git a/src/Game/AI/Action/actionChangeWeaponEquipState.cpp b/src/Game/AI/Action/actionChangeWeaponEquipState.cpp index 649c9685..e8a07ae0 100644 --- a/src/Game/AI/Action/actionChangeWeaponEquipState.cpp +++ b/src/Game/AI/Action/actionChangeWeaponEquipState.cpp @@ -10,20 +10,8 @@ bool ChangeWeaponEquipState::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void ChangeWeaponEquipState::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void ChangeWeaponEquipState::leave_() { - ksys::act::ai::Action::leave_(); -} - void ChangeWeaponEquipState::loadParams_() { getDynamicParam(&mEquipState_d, "EquipState"); } -void ChangeWeaponEquipState::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionChangeWeaponEquipState.h b/src/Game/AI/Action/actionChangeWeaponEquipState.h index b1cea31a..81ee33f1 100644 --- a/src/Game/AI/Action/actionChangeWeaponEquipState.h +++ b/src/Game/AI/Action/actionChangeWeaponEquipState.h @@ -11,13 +11,9 @@ public: ~ChangeWeaponEquipState() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 sead::SafeString* mEquipState_d{}; }; diff --git a/src/Game/AI/Action/actionCheckHorseCustomizeEdit.cpp b/src/Game/AI/Action/actionCheckHorseCustomizeEdit.cpp index 6ae5eb58..dc0df725 100644 --- a/src/Game/AI/Action/actionCheckHorseCustomizeEdit.cpp +++ b/src/Game/AI/Action/actionCheckHorseCustomizeEdit.cpp @@ -6,22 +6,4 @@ CheckHorseCustomizeEdit::CheckHorseCustomizeEdit(const InitArg& arg) : ksys::act CheckHorseCustomizeEdit::~CheckHorseCustomizeEdit() = default; -bool CheckHorseCustomizeEdit::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - -void CheckHorseCustomizeEdit::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void CheckHorseCustomizeEdit::leave_() { - ksys::act::ai::Action::leave_(); -} - -void CheckHorseCustomizeEdit::loadParams_() {} - -void CheckHorseCustomizeEdit::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionCheckHorseCustomizeEdit.h b/src/Game/AI/Action/actionCheckHorseCustomizeEdit.h index 4216a11b..0e0eae99 100644 --- a/src/Game/AI/Action/actionCheckHorseCustomizeEdit.h +++ b/src/Game/AI/Action/actionCheckHorseCustomizeEdit.h @@ -10,13 +10,7 @@ public: explicit CheckHorseCustomizeEdit(const InitArg& arg); ~CheckHorseCustomizeEdit() override; - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; - protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionChemicalPhysHitBreakBall.cpp b/src/Game/AI/Action/actionChemicalPhysHitBreakBall.cpp index 03cece8a..9be790bb 100644 --- a/src/Game/AI/Action/actionChemicalPhysHitBreakBall.cpp +++ b/src/Game/AI/Action/actionChemicalPhysHitBreakBall.cpp @@ -6,25 +6,4 @@ ChemicalPhysHitBreakBall::ChemicalPhysHitBreakBall(const InitArg& arg) : Chemica ChemicalPhysHitBreakBall::~ChemicalPhysHitBreakBall() = default; -bool ChemicalPhysHitBreakBall::init_(sead::Heap* heap) { - return ChemicalPhysBall::init_(heap); -} - -void ChemicalPhysHitBreakBall::enter_(ksys::act::ai::InlineParamPack* params) { - ChemicalPhysBall::enter_(params); -} - -void ChemicalPhysHitBreakBall::leave_() { - ChemicalPhysBall::leave_(); -} - -void ChemicalPhysHitBreakBall::loadParams_() { - ChemicalAttackBall::loadParams_(); - getStaticParam(&mDeleteTime_s, "DeleteTime"); -} - -void ChemicalPhysHitBreakBall::calc_() { - ChemicalPhysBall::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionChemicalPhysHitBreakBall.h b/src/Game/AI/Action/actionChemicalPhysHitBreakBall.h index 003ba49a..b9bf8f94 100644 --- a/src/Game/AI/Action/actionChemicalPhysHitBreakBall.h +++ b/src/Game/AI/Action/actionChemicalPhysHitBreakBall.h @@ -11,16 +11,7 @@ public: explicit ChemicalPhysHitBreakBall(const InitArg& arg); ~ChemicalPhysHitBreakBall() override; - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; - protected: - void calc_() override; - - // static_param at offset 0x90 - const int* mDeleteTime_s{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionCloseClockTime.cpp b/src/Game/AI/Action/actionCloseClockTime.cpp index 5747039f..ec80b631 100644 --- a/src/Game/AI/Action/actionCloseClockTime.cpp +++ b/src/Game/AI/Action/actionCloseClockTime.cpp @@ -10,18 +10,6 @@ bool CloseClockTime::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void CloseClockTime::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void CloseClockTime::leave_() { - ksys::act::ai::Action::leave_(); -} - void CloseClockTime::loadParams_() {} -void CloseClockTime::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionCloseClockTime.h b/src/Game/AI/Action/actionCloseClockTime.h index 3a3e47e0..f7327c5c 100644 --- a/src/Game/AI/Action/actionCloseClockTime.h +++ b/src/Game/AI/Action/actionCloseClockTime.h @@ -11,12 +11,9 @@ public: ~CloseClockTime() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionCloseItemMenu.cpp b/src/Game/AI/Action/actionCloseItemMenu.cpp index 16df57ab..5053fe8f 100644 --- a/src/Game/AI/Action/actionCloseItemMenu.cpp +++ b/src/Game/AI/Action/actionCloseItemMenu.cpp @@ -10,18 +10,6 @@ bool CloseItemMenu::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void CloseItemMenu::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void CloseItemMenu::leave_() { - ksys::act::ai::Action::leave_(); -} - void CloseItemMenu::loadParams_() {} -void CloseItemMenu::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionCloseItemMenu.h b/src/Game/AI/Action/actionCloseItemMenu.h index ce50e977..25f4c2a6 100644 --- a/src/Game/AI/Action/actionCloseItemMenu.h +++ b/src/Game/AI/Action/actionCloseItemMenu.h @@ -11,12 +11,9 @@ public: ~CloseItemMenu() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionControllerRumble.cpp b/src/Game/AI/Action/actionControllerRumble.cpp index 287aeaa6..4a85b15d 100644 --- a/src/Game/AI/Action/actionControllerRumble.cpp +++ b/src/Game/AI/Action/actionControllerRumble.cpp @@ -4,27 +4,13 @@ namespace uking::action { ControllerRumble::ControllerRumble(const InitArg& arg) : ksys::act::ai::Action(arg) {} -ControllerRumble::~ControllerRumble() = default; - -bool ControllerRumble::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - void ControllerRumble::enter_(ksys::act::ai::InlineParamPack* params) { ksys::act::ai::Action::enter_(params); } -void ControllerRumble::leave_() { - ksys::act::ai::Action::leave_(); -} - void ControllerRumble::loadParams_() { getStaticParam(&mPattern_s, "Pattern"); getDynamicParam2(&mCount_d, "Count"); } -void ControllerRumble::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionControllerRumble.h b/src/Game/AI/Action/actionControllerRumble.h index 57d734c8..a32d2b5e 100644 --- a/src/Game/AI/Action/actionControllerRumble.h +++ b/src/Game/AI/Action/actionControllerRumble.h @@ -8,16 +8,11 @@ class ControllerRumble : public ksys::act::ai::Action { SEAD_RTTI_OVERRIDE(ControllerRumble, ksys::act::ai::Action) public: explicit ControllerRumble(const InitArg& arg); - ~ControllerRumble() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // static_param at offset 0x20 const int* mPattern_s{}; // dynamic2_param at offset 0x28 diff --git a/src/Game/AI/Action/actionCopyMapPinPosition.cpp b/src/Game/AI/Action/actionCopyMapPinPosition.cpp index a324bd53..05851a97 100644 --- a/src/Game/AI/Action/actionCopyMapPinPosition.cpp +++ b/src/Game/AI/Action/actionCopyMapPinPosition.cpp @@ -10,21 +10,9 @@ bool CopyMapPinPosition::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void CopyMapPinPosition::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void CopyMapPinPosition::leave_() { - ksys::act::ai::Action::leave_(); -} - void CopyMapPinPosition::loadParams_() { getDynamicParam(&mPinColorIdx_d, "PinColorIdx"); getDynamicParam(&mGameDataVec3_d, "GameDataVec3"); } -void CopyMapPinPosition::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionCopyMapPinPosition.h b/src/Game/AI/Action/actionCopyMapPinPosition.h index a60c9152..dd9bf9f3 100644 --- a/src/Game/AI/Action/actionCopyMapPinPosition.h +++ b/src/Game/AI/Action/actionCopyMapPinPosition.h @@ -11,13 +11,9 @@ public: ~CopyMapPinPosition() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 int* mPinColorIdx_d{}; // dynamic_param at offset 0x28 diff --git a/src/Game/AI/Action/actionCreateDragonChallengeXLink.cpp b/src/Game/AI/Action/actionCreateDragonChallengeXLink.cpp index b97d4953..e72e11b0 100644 --- a/src/Game/AI/Action/actionCreateDragonChallengeXLink.cpp +++ b/src/Game/AI/Action/actionCreateDragonChallengeXLink.cpp @@ -11,20 +11,8 @@ bool CreateDragonChallengeXLink::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void CreateDragonChallengeXLink::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void CreateDragonChallengeXLink::leave_() { - ksys::act::ai::Action::leave_(); -} - void CreateDragonChallengeXLink::loadParams_() { getDynamicParam(&mXLinkHandleIndex_d, "XLinkHandleIndex"); } -void CreateDragonChallengeXLink::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionCreateDragonChallengeXLink.h b/src/Game/AI/Action/actionCreateDragonChallengeXLink.h index cbffbf18..66766d41 100644 --- a/src/Game/AI/Action/actionCreateDragonChallengeXLink.h +++ b/src/Game/AI/Action/actionCreateDragonChallengeXLink.h @@ -11,13 +11,9 @@ public: ~CreateDragonChallengeXLink() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 int* mXLinkHandleIndex_d{}; }; diff --git a/src/Game/AI/Action/actionCurseRRematchCount.cpp b/src/Game/AI/Action/actionCurseRRematchCount.cpp index 2b66c21d..eb326234 100644 --- a/src/Game/AI/Action/actionCurseRRematchCount.cpp +++ b/src/Game/AI/Action/actionCurseRRematchCount.cpp @@ -10,22 +10,10 @@ bool CurseRRematchCount::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void CurseRRematchCount::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void CurseRRematchCount::leave_() { - ksys::act::ai::Action::leave_(); -} - void CurseRRematchCount::loadParams_() { getDynamicParam(&mRematchCount_d, "RematchCount"); getDynamicParam(&mCurseRType_d, "CurseRType"); getDynamicParam(&mGameDataStringCounterName_d, "GameDataStringCounterName"); } -void CurseRRematchCount::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionCurseRRematchCount.h b/src/Game/AI/Action/actionCurseRRematchCount.h index 66813dd0..5b7a51b8 100644 --- a/src/Game/AI/Action/actionCurseRRematchCount.h +++ b/src/Game/AI/Action/actionCurseRRematchCount.h @@ -11,13 +11,9 @@ public: ~CurseRRematchCount() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 int* mRematchCount_d{}; // dynamic_param at offset 0x28 diff --git a/src/Game/AI/Action/actionCustomDuckingEndAction.cpp b/src/Game/AI/Action/actionCustomDuckingEndAction.cpp index 06798e4a..1324c9ff 100644 --- a/src/Game/AI/Action/actionCustomDuckingEndAction.cpp +++ b/src/Game/AI/Action/actionCustomDuckingEndAction.cpp @@ -10,18 +10,6 @@ bool CustomDuckingEndAction::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void CustomDuckingEndAction::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void CustomDuckingEndAction::leave_() { - ksys::act::ai::Action::leave_(); -} - void CustomDuckingEndAction::loadParams_() {} -void CustomDuckingEndAction::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionCustomDuckingEndAction.h b/src/Game/AI/Action/actionCustomDuckingEndAction.h index f51b35eb..22212645 100644 --- a/src/Game/AI/Action/actionCustomDuckingEndAction.h +++ b/src/Game/AI/Action/actionCustomDuckingEndAction.h @@ -11,12 +11,9 @@ public: ~CustomDuckingEndAction() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionCustomDuckingStartAction.cpp b/src/Game/AI/Action/actionCustomDuckingStartAction.cpp index d6487a53..fbcf6f06 100644 --- a/src/Game/AI/Action/actionCustomDuckingStartAction.cpp +++ b/src/Game/AI/Action/actionCustomDuckingStartAction.cpp @@ -11,14 +11,6 @@ bool CustomDuckingStartAction::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void CustomDuckingStartAction::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void CustomDuckingStartAction::leave_() { - ksys::act::ai::Action::leave_(); -} - void CustomDuckingStartAction::loadParams_() { getDynamicParam(&mVolume_d, "Volume"); getDynamicParam(&mFadeOutSec_d, "FadeOutSec"); @@ -28,8 +20,4 @@ void CustomDuckingStartAction::loadParams_() { getDynamicParam(&mExceptGroups_d, "ExceptGroups"); } -void CustomDuckingStartAction::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionCustomDuckingStartAction.h b/src/Game/AI/Action/actionCustomDuckingStartAction.h index dbe13e33..cf735425 100644 --- a/src/Game/AI/Action/actionCustomDuckingStartAction.h +++ b/src/Game/AI/Action/actionCustomDuckingStartAction.h @@ -11,13 +11,9 @@ public: ~CustomDuckingStartAction() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 float* mVolume_d{}; // dynamic_param at offset 0x28 diff --git a/src/Game/AI/Action/actionDefRandomMoveAction.cpp b/src/Game/AI/Action/actionDefRandomMoveAction.cpp index 51c19160..2d46c31f 100644 --- a/src/Game/AI/Action/actionDefRandomMoveAction.cpp +++ b/src/Game/AI/Action/actionDefRandomMoveAction.cpp @@ -4,12 +4,6 @@ namespace uking::action { DefRandomMoveAction::DefRandomMoveAction(const InitArg& arg) : RandomMoveAction(arg) {} -DefRandomMoveAction::~DefRandomMoveAction() = default; - -bool DefRandomMoveAction::init_(sead::Heap* heap) { - return RandomMoveAction::init_(heap); -} - void DefRandomMoveAction::enter_(ksys::act::ai::InlineParamPack* params) { RandomMoveAction::enter_(params); } diff --git a/src/Game/AI/Action/actionDefRandomMoveAction.h b/src/Game/AI/Action/actionDefRandomMoveAction.h index ab326484..eea7960d 100644 --- a/src/Game/AI/Action/actionDefRandomMoveAction.h +++ b/src/Game/AI/Action/actionDefRandomMoveAction.h @@ -9,9 +9,7 @@ class DefRandomMoveAction : public RandomMoveAction { SEAD_RTTI_OVERRIDE(DefRandomMoveAction, RandomMoveAction) public: explicit DefRandomMoveAction(const InitArg& arg); - ~DefRandomMoveAction() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionDelete.cpp b/src/Game/AI/Action/actionDelete.cpp index 23c256f3..1dcf3d92 100644 --- a/src/Game/AI/Action/actionDelete.cpp +++ b/src/Game/AI/Action/actionDelete.cpp @@ -4,12 +4,6 @@ namespace uking::action { Delete::Delete(const InitArg& arg) : ksys::act::ai::Action(arg) {} -Delete::~Delete() = default; - -bool Delete::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - void Delete::enter_(ksys::act::ai::InlineParamPack* params) { ksys::act::ai::Action::enter_(params); } diff --git a/src/Game/AI/Action/actionDelete.h b/src/Game/AI/Action/actionDelete.h index e1580180..5ab242d7 100644 --- a/src/Game/AI/Action/actionDelete.h +++ b/src/Game/AI/Action/actionDelete.h @@ -8,9 +8,7 @@ class Delete : public ksys::act::ai::Action { SEAD_RTTI_OVERRIDE(Delete, ksys::act::ai::Action) public: explicit Delete(const InitArg& arg); - ~Delete() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionDeleteAllIceBlockForDemo.cpp b/src/Game/AI/Action/actionDeleteAllIceBlockForDemo.cpp index 427d8571..b7af87e4 100644 --- a/src/Game/AI/Action/actionDeleteAllIceBlockForDemo.cpp +++ b/src/Game/AI/Action/actionDeleteAllIceBlockForDemo.cpp @@ -11,18 +11,6 @@ bool DeleteAllIceBlockForDemo::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void DeleteAllIceBlockForDemo::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void DeleteAllIceBlockForDemo::leave_() { - ksys::act::ai::Action::leave_(); -} - void DeleteAllIceBlockForDemo::loadParams_() {} -void DeleteAllIceBlockForDemo::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionDeleteAllIceBlockForDemo.h b/src/Game/AI/Action/actionDeleteAllIceBlockForDemo.h index 53584bac..49ec886a 100644 --- a/src/Game/AI/Action/actionDeleteAllIceBlockForDemo.h +++ b/src/Game/AI/Action/actionDeleteAllIceBlockForDemo.h @@ -11,12 +11,9 @@ public: ~DeleteAllIceBlockForDemo() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionDemoApplyDamageForPlayer.cpp b/src/Game/AI/Action/actionDemoApplyDamageForPlayer.cpp index c4f607a2..f57e88e0 100644 --- a/src/Game/AI/Action/actionDemoApplyDamageForPlayer.cpp +++ b/src/Game/AI/Action/actionDemoApplyDamageForPlayer.cpp @@ -11,20 +11,8 @@ bool DemoApplyDamageForPlayer::init_(sead::Heap* heap) { return ApplyDamageForPlayer::init_(heap); } -void DemoApplyDamageForPlayer::enter_(ksys::act::ai::InlineParamPack* params) { - ApplyDamageForPlayer::enter_(params); -} - -void DemoApplyDamageForPlayer::leave_() { - ApplyDamageForPlayer::leave_(); -} - void DemoApplyDamageForPlayer::loadParams_() { ApplyDamageForPlayer::loadParams_(); } -void DemoApplyDamageForPlayer::calc_() { - ApplyDamageForPlayer::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionDemoApplyDamageForPlayer.h b/src/Game/AI/Action/actionDemoApplyDamageForPlayer.h index d1135602..7e615976 100644 --- a/src/Game/AI/Action/actionDemoApplyDamageForPlayer.h +++ b/src/Game/AI/Action/actionDemoApplyDamageForPlayer.h @@ -12,12 +12,9 @@ public: ~DemoApplyDamageForPlayer() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionDemoChangeEntityNoHit.cpp b/src/Game/AI/Action/actionDemoChangeEntityNoHit.cpp index e1053f91..9b77b7fc 100644 --- a/src/Game/AI/Action/actionDemoChangeEntityNoHit.cpp +++ b/src/Game/AI/Action/actionDemoChangeEntityNoHit.cpp @@ -10,21 +10,9 @@ bool DemoChangeEntityNoHit::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void DemoChangeEntityNoHit::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void DemoChangeEntityNoHit::leave_() { - ksys::act::ai::Action::leave_(); -} - void DemoChangeEntityNoHit::loadParams_() { getStaticParam(&mSetMotionType_s, "SetMotionType"); getStaticParam(&mIsNoHit_s, "IsNoHit"); } -void DemoChangeEntityNoHit::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionDemoChangeEntityNoHit.h b/src/Game/AI/Action/actionDemoChangeEntityNoHit.h index bc0162b3..a6c46d10 100644 --- a/src/Game/AI/Action/actionDemoChangeEntityNoHit.h +++ b/src/Game/AI/Action/actionDemoChangeEntityNoHit.h @@ -11,13 +11,9 @@ public: ~DemoChangeEntityNoHit() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // static_param at offset 0x20 const int* mSetMotionType_s{}; // static_param at offset 0x28 diff --git a/src/Game/AI/Action/actionDemoDelete.cpp b/src/Game/AI/Action/actionDemoDelete.cpp index eb746886..722d4ce9 100644 --- a/src/Game/AI/Action/actionDemoDelete.cpp +++ b/src/Game/AI/Action/actionDemoDelete.cpp @@ -10,18 +10,6 @@ bool DemoDelete::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void DemoDelete::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void DemoDelete::leave_() { - ksys::act::ai::Action::leave_(); -} - void DemoDelete::loadParams_() {} -void DemoDelete::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionDemoDelete.h b/src/Game/AI/Action/actionDemoDelete.h index 8d33fa2f..6eed2f99 100644 --- a/src/Game/AI/Action/actionDemoDelete.h +++ b/src/Game/AI/Action/actionDemoDelete.h @@ -11,12 +11,9 @@ public: ~DemoDelete() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionDemoFindPlayer.cpp b/src/Game/AI/Action/actionDemoFindPlayer.cpp index f619abdd..922273d4 100644 --- a/src/Game/AI/Action/actionDemoFindPlayer.cpp +++ b/src/Game/AI/Action/actionDemoFindPlayer.cpp @@ -6,24 +6,12 @@ DemoFindPlayer::DemoFindPlayer(const InitArg& arg) : TimeredASPlay(arg) {} DemoFindPlayer::~DemoFindPlayer() = default; -bool DemoFindPlayer::init_(sead::Heap* heap) { - return TimeredASPlay::init_(heap); -} - void DemoFindPlayer::enter_(ksys::act::ai::InlineParamPack* params) { TimeredASPlay::enter_(params); } -void DemoFindPlayer::leave_() { - TimeredASPlay::leave_(); -} - void DemoFindPlayer::loadParams_() { TimeredASPlay::loadParams_(); } -void DemoFindPlayer::calc_() { - TimeredASPlay::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionDemoFindPlayer.h b/src/Game/AI/Action/actionDemoFindPlayer.h index 4cf6e14f..a4135916 100644 --- a/src/Game/AI/Action/actionDemoFindPlayer.h +++ b/src/Game/AI/Action/actionDemoFindPlayer.h @@ -11,13 +11,10 @@ public: explicit DemoFindPlayer(const InitArg& arg); ~DemoFindPlayer() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionDemoForceSetPlayerSavePosAngle.cpp b/src/Game/AI/Action/actionDemoForceSetPlayerSavePosAngle.cpp index 2fb5fe95..309ccb40 100644 --- a/src/Game/AI/Action/actionDemoForceSetPlayerSavePosAngle.cpp +++ b/src/Game/AI/Action/actionDemoForceSetPlayerSavePosAngle.cpp @@ -11,21 +11,9 @@ bool DemoForceSetPlayerSavePosAngle::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void DemoForceSetPlayerSavePosAngle::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void DemoForceSetPlayerSavePosAngle::leave_() { - ksys::act::ai::Action::leave_(); -} - void DemoForceSetPlayerSavePosAngle::loadParams_() { getDynamicParam(&mUniqueName_d, "UniqueName"); getDynamicParam(&mAnchorName_d, "AnchorName"); } -void DemoForceSetPlayerSavePosAngle::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionDemoForceSetPlayerSavePosAngle.h b/src/Game/AI/Action/actionDemoForceSetPlayerSavePosAngle.h index 6c6f1e7e..91548674 100644 --- a/src/Game/AI/Action/actionDemoForceSetPlayerSavePosAngle.h +++ b/src/Game/AI/Action/actionDemoForceSetPlayerSavePosAngle.h @@ -11,13 +11,9 @@ public: ~DemoForceSetPlayerSavePosAngle() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 sead::SafeString* mUniqueName_d{}; // dynamic_param at offset 0x30 diff --git a/src/Game/AI/Action/actionDemoGetItem.cpp b/src/Game/AI/Action/actionDemoGetItem.cpp index 9484e96b..c55b068a 100644 --- a/src/Game/AI/Action/actionDemoGetItem.cpp +++ b/src/Game/AI/Action/actionDemoGetItem.cpp @@ -10,18 +10,6 @@ bool DemoGetItem::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void DemoGetItem::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void DemoGetItem::leave_() { - ksys::act::ai::Action::leave_(); -} - void DemoGetItem::loadParams_() {} -void DemoGetItem::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionDemoGetItem.h b/src/Game/AI/Action/actionDemoGetItem.h index 29b12b6f..40965acc 100644 --- a/src/Game/AI/Action/actionDemoGetItem.h +++ b/src/Game/AI/Action/actionDemoGetItem.h @@ -11,12 +11,9 @@ public: ~DemoGetItem() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionDemoGetItemAnimStop.cpp b/src/Game/AI/Action/actionDemoGetItemAnimStop.cpp index 5169beae..2bb42c5d 100644 --- a/src/Game/AI/Action/actionDemoGetItemAnimStop.cpp +++ b/src/Game/AI/Action/actionDemoGetItemAnimStop.cpp @@ -10,21 +10,9 @@ bool DemoGetItemAnimStop::init_(sead::Heap* heap) { return DemoGetItem::init_(heap); } -void DemoGetItemAnimStop::enter_(ksys::act::ai::InlineParamPack* params) { - DemoGetItem::enter_(params); -} - -void DemoGetItemAnimStop::leave_() { - DemoGetItem::leave_(); -} - void DemoGetItemAnimStop::loadParams_() { DemoGetItem::loadParams_(); getStaticParam(&mWaitASKeyName_s, "WaitASKeyName"); } -void DemoGetItemAnimStop::calc_() { - DemoGetItem::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionDemoGetItemAnimStop.h b/src/Game/AI/Action/actionDemoGetItemAnimStop.h index 11a3e374..685a8f16 100644 --- a/src/Game/AI/Action/actionDemoGetItemAnimStop.h +++ b/src/Game/AI/Action/actionDemoGetItemAnimStop.h @@ -12,13 +12,9 @@ public: ~DemoGetItemAnimStop() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // static_param at offset 0x20 sead::SafeString mWaitASKeyName_s{}; }; diff --git a/src/Game/AI/Action/actionDemoGetWeapon.cpp b/src/Game/AI/Action/actionDemoGetWeapon.cpp index 63b6c76c..c6ff2dd1 100644 --- a/src/Game/AI/Action/actionDemoGetWeapon.cpp +++ b/src/Game/AI/Action/actionDemoGetWeapon.cpp @@ -10,20 +10,8 @@ bool DemoGetWeapon::init_(sead::Heap* heap) { return DemoGetItem::init_(heap); } -void DemoGetWeapon::enter_(ksys::act::ai::InlineParamPack* params) { - DemoGetItem::enter_(params); -} - -void DemoGetWeapon::leave_() { - DemoGetItem::leave_(); -} - void DemoGetWeapon::loadParams_() { DemoGetItem::loadParams_(); } -void DemoGetWeapon::calc_() { - DemoGetItem::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionDemoGetWeapon.h b/src/Game/AI/Action/actionDemoGetWeapon.h index d7a122b5..166e54b6 100644 --- a/src/Game/AI/Action/actionDemoGetWeapon.h +++ b/src/Game/AI/Action/actionDemoGetWeapon.h @@ -12,12 +12,9 @@ public: ~DemoGetWeapon() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionDemoResetActor.cpp b/src/Game/AI/Action/actionDemoResetActor.cpp index 3db201ae..87d223df 100644 --- a/src/Game/AI/Action/actionDemoResetActor.cpp +++ b/src/Game/AI/Action/actionDemoResetActor.cpp @@ -10,20 +10,8 @@ bool DemoResetActor::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void DemoResetActor::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void DemoResetActor::leave_() { - ksys::act::ai::Action::leave_(); -} - void DemoResetActor::loadParams_() { getDynamicParam(&mActorName_d, "ActorName"); } -void DemoResetActor::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionDemoResetActor.h b/src/Game/AI/Action/actionDemoResetActor.h index a82f826a..223fd775 100644 --- a/src/Game/AI/Action/actionDemoResetActor.h +++ b/src/Game/AI/Action/actionDemoResetActor.h @@ -11,13 +11,9 @@ public: ~DemoResetActor() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 sead::SafeString* mActorName_d{}; }; diff --git a/src/Game/AI/Action/actionDemoResetBoneCtrl.cpp b/src/Game/AI/Action/actionDemoResetBoneCtrl.cpp index e3b86489..a5ec2414 100644 --- a/src/Game/AI/Action/actionDemoResetBoneCtrl.cpp +++ b/src/Game/AI/Action/actionDemoResetBoneCtrl.cpp @@ -10,20 +10,8 @@ bool DemoResetBoneCtrl::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void DemoResetBoneCtrl::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void DemoResetBoneCtrl::leave_() { - ksys::act::ai::Action::leave_(); -} - void DemoResetBoneCtrl::loadParams_() { getDynamicParam(&mResetTarget_d, "ResetTarget"); } -void DemoResetBoneCtrl::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionDemoResetBoneCtrl.h b/src/Game/AI/Action/actionDemoResetBoneCtrl.h index c4d88cca..1ed80bb5 100644 --- a/src/Game/AI/Action/actionDemoResetBoneCtrl.h +++ b/src/Game/AI/Action/actionDemoResetBoneCtrl.h @@ -11,13 +11,9 @@ public: ~DemoResetBoneCtrl() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 int* mResetTarget_d{}; }; diff --git a/src/Game/AI/Action/actionDemoTriggerToggleVisible.cpp b/src/Game/AI/Action/actionDemoTriggerToggleVisible.cpp index 9641379f..d70c16a7 100644 --- a/src/Game/AI/Action/actionDemoTriggerToggleVisible.cpp +++ b/src/Game/AI/Action/actionDemoTriggerToggleVisible.cpp @@ -11,22 +11,10 @@ bool DemoTriggerToggleVisible::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void DemoTriggerToggleVisible::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void DemoTriggerToggleVisible::leave_() { - ksys::act::ai::Action::leave_(); -} - void DemoTriggerToggleVisible::loadParams_() { getDynamicParam(&mIsVisible_d, "IsVisible"); getDynamicParam(&mIsXLinkHandling_d, "IsXLinkHandling"); getDynamicParam(&mIsClothHandling_d, "IsClothHandling"); } -void DemoTriggerToggleVisible::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionDemoTriggerToggleVisible.h b/src/Game/AI/Action/actionDemoTriggerToggleVisible.h index 3b87b370..1c13bab4 100644 --- a/src/Game/AI/Action/actionDemoTriggerToggleVisible.h +++ b/src/Game/AI/Action/actionDemoTriggerToggleVisible.h @@ -11,13 +11,9 @@ public: ~DemoTriggerToggleVisible() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 bool* mIsVisible_d{}; // dynamic_param at offset 0x28 diff --git a/src/Game/AI/Action/actionDemoVisibleOff.cpp b/src/Game/AI/Action/actionDemoVisibleOff.cpp index 289cac95..5f63831b 100644 --- a/src/Game/AI/Action/actionDemoVisibleOff.cpp +++ b/src/Game/AI/Action/actionDemoVisibleOff.cpp @@ -6,10 +6,6 @@ DemoVisibleOff::DemoVisibleOff(const InitArg& arg) : ksys::act::ai::Action(arg) DemoVisibleOff::~DemoVisibleOff() = default; -bool DemoVisibleOff::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - void DemoVisibleOff::enter_(ksys::act::ai::InlineParamPack* params) { ksys::act::ai::Action::enter_(params); } @@ -18,10 +14,4 @@ void DemoVisibleOff::leave_() { ksys::act::ai::Action::leave_(); } -void DemoVisibleOff::loadParams_() {} - -void DemoVisibleOff::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionDemoVisibleOff.h b/src/Game/AI/Action/actionDemoVisibleOff.h index e5d63546..3265f9a4 100644 --- a/src/Game/AI/Action/actionDemoVisibleOff.h +++ b/src/Game/AI/Action/actionDemoVisibleOff.h @@ -10,13 +10,10 @@ public: explicit DemoVisibleOff(const InitArg& arg); ~DemoVisibleOff() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; - void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionDemoVisibleOn.cpp b/src/Game/AI/Action/actionDemoVisibleOn.cpp index 6e501ec0..aa88a8d2 100644 --- a/src/Game/AI/Action/actionDemoVisibleOn.cpp +++ b/src/Game/AI/Action/actionDemoVisibleOn.cpp @@ -10,18 +10,6 @@ bool DemoVisibleOn::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void DemoVisibleOn::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void DemoVisibleOn::leave_() { - ksys::act::ai::Action::leave_(); -} - void DemoVisibleOn::loadParams_() {} -void DemoVisibleOn::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionDemoVisibleOn.h b/src/Game/AI/Action/actionDemoVisibleOn.h index 279b3805..d404e16b 100644 --- a/src/Game/AI/Action/actionDemoVisibleOn.h +++ b/src/Game/AI/Action/actionDemoVisibleOn.h @@ -11,12 +11,9 @@ public: ~DemoVisibleOn() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionDieAnmDropWeapon.cpp b/src/Game/AI/Action/actionDieAnmDropWeapon.cpp index 5e7e7f34..58bc6778 100644 --- a/src/Game/AI/Action/actionDieAnmDropWeapon.cpp +++ b/src/Game/AI/Action/actionDieAnmDropWeapon.cpp @@ -6,25 +6,13 @@ DieAnmDropWeapon::DieAnmDropWeapon(const InitArg& arg) : DieAnm(arg) {} DieAnmDropWeapon::~DieAnmDropWeapon() = default; -bool DieAnmDropWeapon::init_(sead::Heap* heap) { - return DieAnm::init_(heap); -} - void DieAnmDropWeapon::enter_(ksys::act::ai::InlineParamPack* params) { DieAnm::enter_(params); } -void DieAnmDropWeapon::leave_() { - DieAnm::leave_(); -} - void DieAnmDropWeapon::loadParams_() { DieAnm::loadParams_(); getStaticParam(&mWeaponDropSpeedY_s, "WeaponDropSpeedY"); } -void DieAnmDropWeapon::calc_() { - DieAnm::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionDieAnmDropWeapon.h b/src/Game/AI/Action/actionDieAnmDropWeapon.h index c1308469..56706ba1 100644 --- a/src/Game/AI/Action/actionDieAnmDropWeapon.h +++ b/src/Game/AI/Action/actionDieAnmDropWeapon.h @@ -11,14 +11,10 @@ public: explicit DieAnmDropWeapon(const InitArg& arg); ~DieAnmDropWeapon() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // static_param at offset 0x40 const float* mWeaponDropSpeedY_s{}; }; diff --git a/src/Game/AI/Action/actionDieAnmKnockBack.cpp b/src/Game/AI/Action/actionDieAnmKnockBack.cpp index 57e9c2a7..256951a2 100644 --- a/src/Game/AI/Action/actionDieAnmKnockBack.cpp +++ b/src/Game/AI/Action/actionDieAnmKnockBack.cpp @@ -6,10 +6,6 @@ DieAnmKnockBack::DieAnmKnockBack(const InitArg& arg) : SmallDamageBase(arg) {} DieAnmKnockBack::~DieAnmKnockBack() = default; -bool DieAnmKnockBack::init_(sead::Heap* heap) { - return SmallDamageBase::init_(heap); -} - void DieAnmKnockBack::enter_(ksys::act::ai::InlineParamPack* params) { SmallDamageBase::enter_(params); } diff --git a/src/Game/AI/Action/actionDieAnmKnockBack.h b/src/Game/AI/Action/actionDieAnmKnockBack.h index b5a57be9..5d2179ad 100644 --- a/src/Game/AI/Action/actionDieAnmKnockBack.h +++ b/src/Game/AI/Action/actionDieAnmKnockBack.h @@ -11,7 +11,6 @@ public: explicit DieAnmKnockBack(const InitArg& arg); ~DieAnmKnockBack() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionDisableAutoSavePausing.cpp b/src/Game/AI/Action/actionDisableAutoSavePausing.cpp index bce943d6..fe448afa 100644 --- a/src/Game/AI/Action/actionDisableAutoSavePausing.cpp +++ b/src/Game/AI/Action/actionDisableAutoSavePausing.cpp @@ -10,18 +10,6 @@ bool DisableAutoSavePausing::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void DisableAutoSavePausing::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void DisableAutoSavePausing::leave_() { - ksys::act::ai::Action::leave_(); -} - void DisableAutoSavePausing::loadParams_() {} -void DisableAutoSavePausing::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionDisableAutoSavePausing.h b/src/Game/AI/Action/actionDisableAutoSavePausing.h index 4dec5d6e..b08f95da 100644 --- a/src/Game/AI/Action/actionDisableAutoSavePausing.h +++ b/src/Game/AI/Action/actionDisableAutoSavePausing.h @@ -11,12 +11,9 @@ public: ~DisableAutoSavePausing() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionDisappearNumDungeonClearSeal.cpp b/src/Game/AI/Action/actionDisappearNumDungeonClearSeal.cpp index 27135971..0cc53e6b 100644 --- a/src/Game/AI/Action/actionDisappearNumDungeonClearSeal.cpp +++ b/src/Game/AI/Action/actionDisappearNumDungeonClearSeal.cpp @@ -11,18 +11,6 @@ bool DisappearNumDungeonClearSeal::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void DisappearNumDungeonClearSeal::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void DisappearNumDungeonClearSeal::leave_() { - ksys::act::ai::Action::leave_(); -} - void DisappearNumDungeonClearSeal::loadParams_() {} -void DisappearNumDungeonClearSeal::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionDisappearNumDungeonClearSeal.h b/src/Game/AI/Action/actionDisappearNumDungeonClearSeal.h index baecb804..8f37307d 100644 --- a/src/Game/AI/Action/actionDisappearNumDungeonClearSeal.h +++ b/src/Game/AI/Action/actionDisappearNumDungeonClearSeal.h @@ -11,12 +11,9 @@ public: ~DisappearNumDungeonClearSeal() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionDisappearNumHeroSeal.cpp b/src/Game/AI/Action/actionDisappearNumHeroSeal.cpp index 471f4103..5b99b1ac 100644 --- a/src/Game/AI/Action/actionDisappearNumHeroSeal.cpp +++ b/src/Game/AI/Action/actionDisappearNumHeroSeal.cpp @@ -10,18 +10,6 @@ bool DisappearNumHeroSeal::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void DisappearNumHeroSeal::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void DisappearNumHeroSeal::leave_() { - ksys::act::ai::Action::leave_(); -} - void DisappearNumHeroSeal::loadParams_() {} -void DisappearNumHeroSeal::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionDisappearNumHeroSeal.h b/src/Game/AI/Action/actionDisappearNumHeroSeal.h index eb95f6f2..6a24d4a1 100644 --- a/src/Game/AI/Action/actionDisappearNumHeroSeal.h +++ b/src/Game/AI/Action/actionDisappearNumHeroSeal.h @@ -11,12 +11,9 @@ public: ~DisappearNumHeroSeal() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionDisappearNumKorokNuts.cpp b/src/Game/AI/Action/actionDisappearNumKorokNuts.cpp index 57d8228d..25ce1c83 100644 --- a/src/Game/AI/Action/actionDisappearNumKorokNuts.cpp +++ b/src/Game/AI/Action/actionDisappearNumKorokNuts.cpp @@ -10,18 +10,6 @@ bool DisappearNumKorokNuts::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void DisappearNumKorokNuts::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void DisappearNumKorokNuts::leave_() { - ksys::act::ai::Action::leave_(); -} - void DisappearNumKorokNuts::loadParams_() {} -void DisappearNumKorokNuts::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionDisappearNumKorokNuts.h b/src/Game/AI/Action/actionDisappearNumKorokNuts.h index 2c0db91b..4338b69a 100644 --- a/src/Game/AI/Action/actionDisappearNumKorokNuts.h +++ b/src/Game/AI/Action/actionDisappearNumKorokNuts.h @@ -11,12 +11,9 @@ public: ~DisappearNumKorokNuts() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionDisappearNumTargets.cpp b/src/Game/AI/Action/actionDisappearNumTargets.cpp index da7bfc29..a7970ba7 100644 --- a/src/Game/AI/Action/actionDisappearNumTargets.cpp +++ b/src/Game/AI/Action/actionDisappearNumTargets.cpp @@ -10,18 +10,6 @@ bool DisappearNumTargets::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void DisappearNumTargets::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void DisappearNumTargets::leave_() { - ksys::act::ai::Action::leave_(); -} - void DisappearNumTargets::loadParams_() {} -void DisappearNumTargets::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionDisappearNumTargets.h b/src/Game/AI/Action/actionDisappearNumTargets.h index d955a234..dd5fe79f 100644 --- a/src/Game/AI/Action/actionDisappearNumTargets.h +++ b/src/Game/AI/Action/actionDisappearNumTargets.h @@ -11,12 +11,9 @@ public: ~DisappearNumTargets() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionDoubleAttack.cpp b/src/Game/AI/Action/actionDoubleAttack.cpp index 6c952f97..14bc5e5a 100644 --- a/src/Game/AI/Action/actionDoubleAttack.cpp +++ b/src/Game/AI/Action/actionDoubleAttack.cpp @@ -6,31 +6,8 @@ DoubleAttack::DoubleAttack(const InitArg& arg) : StepDoubleAttack(arg) {} DoubleAttack::~DoubleAttack() = default; -bool DoubleAttack::init_(sead::Heap* heap) { - return StepDoubleAttack::init_(heap); -} - void DoubleAttack::enter_(ksys::act::ai::InlineParamPack* params) { StepDoubleAttack::enter_(params); } -void DoubleAttack::leave_() { - StepDoubleAttack::leave_(); -} - -void DoubleAttack::loadParams_() { - getStaticParam(&mWeaponIdx_s, "WeaponIdx"); - getStaticParam(&mCloseDist_s, "CloseDist"); - getStaticParam(&mSpeed_s, "Speed"); - getStaticParam(&mRotSpd_s, "RotSpd"); - getStaticParam(&mJustAvoidSideDist_s, "JustAvoidSideDist"); - getStaticParam(&mJustAvoidBackDist_s, "JustAvoidBackDist"); - getStaticParam(&mJustAvoidAngle_s, "JustAvoidAngle"); - getDynamicParam(&mTargetPos_d, "TargetPos"); -} - -void DoubleAttack::calc_() { - StepDoubleAttack::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionDoubleAttack.h b/src/Game/AI/Action/actionDoubleAttack.h index 7d37eb1c..98f520ea 100644 --- a/src/Game/AI/Action/actionDoubleAttack.h +++ b/src/Game/AI/Action/actionDoubleAttack.h @@ -11,30 +11,9 @@ public: explicit DoubleAttack(const InitArg& arg); ~DoubleAttack() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; protected: - void calc_() override; - - // static_param at offset 0x20 - const int* mWeaponIdx_s{}; - // static_param at offset 0x28 - const float* mCloseDist_s{}; - // static_param at offset 0x30 - const float* mSpeed_s{}; - // static_param at offset 0x38 - const float* mRotSpd_s{}; - // static_param at offset 0x40 - const float* mJustAvoidSideDist_s{}; - // static_param at offset 0x48 - const float* mJustAvoidBackDist_s{}; - // static_param at offset 0x50 - const float* mJustAvoidAngle_s{}; - // dynamic_param at offset 0x58 - sead::Vector3f* mTargetPos_d{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionDownSwingAttack.cpp b/src/Game/AI/Action/actionDownSwingAttack.cpp index ec859a7c..97ef65aa 100644 --- a/src/Game/AI/Action/actionDownSwingAttack.cpp +++ b/src/Game/AI/Action/actionDownSwingAttack.cpp @@ -6,10 +6,6 @@ DownSwingAttack::DownSwingAttack(const InitArg& arg) : ActionEx(arg) {} DownSwingAttack::~DownSwingAttack() = default; -bool DownSwingAttack::init_(sead::Heap* heap) { - return ActionEx::init_(heap); -} - void DownSwingAttack::enter_(ksys::act::ai::InlineParamPack* params) { ActionEx::enter_(params); } diff --git a/src/Game/AI/Action/actionDownSwingAttack.h b/src/Game/AI/Action/actionDownSwingAttack.h index 134a0e73..3c8d4014 100644 --- a/src/Game/AI/Action/actionDownSwingAttack.h +++ b/src/Game/AI/Action/actionDownSwingAttack.h @@ -11,7 +11,6 @@ public: explicit DownSwingAttack(const InitArg& arg); ~DownSwingAttack() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionDummyAction.cpp b/src/Game/AI/Action/actionDummyAction.cpp index b5380740..4b4b77e7 100644 --- a/src/Game/AI/Action/actionDummyAction.cpp +++ b/src/Game/AI/Action/actionDummyAction.cpp @@ -4,12 +4,6 @@ namespace uking::action { DummyAction::DummyAction(const InitArg& arg) : ksys::act::ai::Action(arg) {} -DummyAction::~DummyAction() = default; - -bool DummyAction::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - void DummyAction::enter_(ksys::act::ai::InlineParamPack* params) { ksys::act::ai::Action::enter_(params); } diff --git a/src/Game/AI/Action/actionDummyAction.h b/src/Game/AI/Action/actionDummyAction.h index c9052317..f96609e4 100644 --- a/src/Game/AI/Action/actionDummyAction.h +++ b/src/Game/AI/Action/actionDummyAction.h @@ -8,9 +8,7 @@ class DummyAction : public ksys::act::ai::Action { SEAD_RTTI_OVERRIDE(DummyAction, ksys::act::ai::Action) public: explicit DummyAction(const InitArg& arg); - ~DummyAction() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionDummyTriggerAction.cpp b/src/Game/AI/Action/actionDummyTriggerAction.cpp index 0f32b3ad..ecae8c5f 100644 --- a/src/Game/AI/Action/actionDummyTriggerAction.cpp +++ b/src/Game/AI/Action/actionDummyTriggerAction.cpp @@ -10,18 +10,6 @@ bool DummyTriggerAction::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void DummyTriggerAction::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void DummyTriggerAction::leave_() { - ksys::act::ai::Action::leave_(); -} - void DummyTriggerAction::loadParams_() {} -void DummyTriggerAction::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionDummyTriggerAction.h b/src/Game/AI/Action/actionDummyTriggerAction.h index 1f9b43bb..689fcdef 100644 --- a/src/Game/AI/Action/actionDummyTriggerAction.h +++ b/src/Game/AI/Action/actionDummyTriggerAction.h @@ -11,12 +11,9 @@ public: ~DummyTriggerAction() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionDungeonRotateInOrder.cpp b/src/Game/AI/Action/actionDungeonRotateInOrder.cpp index 2e4a07b6..6885fc6f 100644 --- a/src/Game/AI/Action/actionDungeonRotateInOrder.cpp +++ b/src/Game/AI/Action/actionDungeonRotateInOrder.cpp @@ -4,8 +4,6 @@ namespace uking::action { DungeonRotateInOrder::DungeonRotateInOrder(const InitArg& arg) : DungeonRotateBase(arg) {} -DungeonRotateInOrder::~DungeonRotateInOrder() = default; - bool DungeonRotateInOrder::init_(sead::Heap* heap) { return DungeonRotateBase::init_(heap); } diff --git a/src/Game/AI/Action/actionDungeonRotateInOrder.h b/src/Game/AI/Action/actionDungeonRotateInOrder.h index 83eff932..12e2c917 100644 --- a/src/Game/AI/Action/actionDungeonRotateInOrder.h +++ b/src/Game/AI/Action/actionDungeonRotateInOrder.h @@ -9,7 +9,6 @@ class DungeonRotateInOrder : public DungeonRotateBase { SEAD_RTTI_OVERRIDE(DungeonRotateInOrder, DungeonRotateBase) public: explicit DungeonRotateInOrder(const InitArg& arg); - ~DungeonRotateInOrder() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/AI/Action/actionEat.cpp b/src/Game/AI/Action/actionEat.cpp index ab00f54c..9ec217a8 100644 --- a/src/Game/AI/Action/actionEat.cpp +++ b/src/Game/AI/Action/actionEat.cpp @@ -6,10 +6,6 @@ Eat::Eat(const InitArg& arg) : ActionWithPosAngReduce(arg) {} Eat::~Eat() = default; -bool Eat::init_(sead::Heap* heap) { - return ActionWithPosAngReduce::init_(heap); -} - void Eat::enter_(ksys::act::ai::InlineParamPack* params) { ActionWithPosAngReduce::enter_(params); } diff --git a/src/Game/AI/Action/actionEat.h b/src/Game/AI/Action/actionEat.h index 391f8b1f..34b442b0 100644 --- a/src/Game/AI/Action/actionEat.h +++ b/src/Game/AI/Action/actionEat.h @@ -11,7 +11,6 @@ public: explicit Eat(const InitArg& arg); ~Eat() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionEatWithAS.cpp b/src/Game/AI/Action/actionEatWithAS.cpp index 04026642..d4cc8b44 100644 --- a/src/Game/AI/Action/actionEatWithAS.cpp +++ b/src/Game/AI/Action/actionEatWithAS.cpp @@ -6,25 +6,9 @@ EatWithAS::EatWithAS(const InitArg& arg) : Eat(arg) {} EatWithAS::~EatWithAS() = default; -bool EatWithAS::init_(sead::Heap* heap) { - return Eat::init_(heap); -} - -void EatWithAS::enter_(ksys::act::ai::InlineParamPack* params) { - Eat::enter_(params); -} - -void EatWithAS::leave_() { - Eat::leave_(); -} - void EatWithAS::loadParams_() { Eat::loadParams_(); getStaticParam(&mASName_s, "ASName"); } -void EatWithAS::calc_() { - Eat::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionEatWithAS.h b/src/Game/AI/Action/actionEatWithAS.h index 869bae43..f545ffb1 100644 --- a/src/Game/AI/Action/actionEatWithAS.h +++ b/src/Game/AI/Action/actionEatWithAS.h @@ -11,14 +11,9 @@ public: explicit EatWithAS(const InitArg& arg); ~EatWithAS() override; - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // static_param at offset 0x38 sead::SafeString mASName_s{}; }; diff --git a/src/Game/AI/Action/actionElectricDie.cpp b/src/Game/AI/Action/actionElectricDie.cpp index 4f8281bb..6f6e3615 100644 --- a/src/Game/AI/Action/actionElectricDie.cpp +++ b/src/Game/AI/Action/actionElectricDie.cpp @@ -6,10 +6,6 @@ ElectricDie::ElectricDie(const InitArg& arg) : ElectricBlownOff(arg) {} ElectricDie::~ElectricDie() = default; -bool ElectricDie::init_(sead::Heap* heap) { - return ElectricBlownOff::init_(heap); -} - void ElectricDie::enter_(ksys::act::ai::InlineParamPack* params) { ElectricBlownOff::enter_(params); } @@ -22,8 +18,4 @@ void ElectricDie::loadParams_() { ElectricBlownOff::loadParams_(); } -void ElectricDie::calc_() { - ElectricBlownOff::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionElectricDie.h b/src/Game/AI/Action/actionElectricDie.h index 2a50d13e..61c8a3ea 100644 --- a/src/Game/AI/Action/actionElectricDie.h +++ b/src/Game/AI/Action/actionElectricDie.h @@ -11,13 +11,11 @@ public: explicit ElectricDie(const InitArg& arg); ~ElectricDie() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionEnemyFortressSimpleAction.cpp b/src/Game/AI/Action/actionEnemyFortressSimpleAction.cpp index 07d63c41..6eac4db9 100644 --- a/src/Game/AI/Action/actionEnemyFortressSimpleAction.cpp +++ b/src/Game/AI/Action/actionEnemyFortressSimpleAction.cpp @@ -7,7 +7,7 @@ EnemyFortressSimpleAction::EnemyFortressSimpleAction(const InitArg& arg) : ForkT EnemyFortressSimpleAction::~EnemyFortressSimpleAction() = default; bool EnemyFortressSimpleAction::init_(sead::Heap* heap) { - return ForkTimerBase::init_(heap); // NOLINT(bugprone-parent-virtual-call) + return ForkTimer::init_(heap); } void EnemyFortressSimpleAction::enter_(ksys::act::ai::InlineParamPack* params) { diff --git a/src/Game/AI/Action/actionEnvSetLensFlare.cpp b/src/Game/AI/Action/actionEnvSetLensFlare.cpp index 3d8b6e07..bfb10b76 100644 --- a/src/Game/AI/Action/actionEnvSetLensFlare.cpp +++ b/src/Game/AI/Action/actionEnvSetLensFlare.cpp @@ -4,8 +4,6 @@ namespace uking::action { EnvSetLensFlare::EnvSetLensFlare(const InitArg& arg) : ksys::act::ai::Action(arg) {} -EnvSetLensFlare::~EnvSetLensFlare() = default; - bool EnvSetLensFlare::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } diff --git a/src/Game/AI/Action/actionEnvSetLensFlare.h b/src/Game/AI/Action/actionEnvSetLensFlare.h index 01955734..72c73705 100644 --- a/src/Game/AI/Action/actionEnvSetLensFlare.h +++ b/src/Game/AI/Action/actionEnvSetLensFlare.h @@ -8,7 +8,6 @@ class EnvSetLensFlare : public ksys::act::ai::Action { SEAD_RTTI_OVERRIDE(EnvSetLensFlare, ksys::act::ai::Action) public: explicit EnvSetLensFlare(const InitArg& arg); - ~EnvSetLensFlare() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/AI/Action/actionEquipedAction.cpp b/src/Game/AI/Action/actionEquipedAction.cpp index c094e2de..7f2e5e72 100644 --- a/src/Game/AI/Action/actionEquipedAction.cpp +++ b/src/Game/AI/Action/actionEquipedAction.cpp @@ -6,10 +6,6 @@ EquipedAction::EquipedAction(const InitArg& arg) : ksys::act::ai::Action(arg) {} EquipedAction::~EquipedAction() = default; -bool EquipedAction::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - void EquipedAction::enter_(ksys::act::ai::InlineParamPack* params) { ksys::act::ai::Action::enter_(params); } diff --git a/src/Game/AI/Action/actionEquipedAction.h b/src/Game/AI/Action/actionEquipedAction.h index b3fc44a6..e0bf21b5 100644 --- a/src/Game/AI/Action/actionEquipedAction.h +++ b/src/Game/AI/Action/actionEquipedAction.h @@ -10,7 +10,6 @@ public: explicit EquipedAction(const InitArg& arg); ~EquipedAction() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionEquipedChemicalWeapon.cpp b/src/Game/AI/Action/actionEquipedChemicalWeapon.cpp index 61c6f4bf..de31956a 100644 --- a/src/Game/AI/Action/actionEquipedChemicalWeapon.cpp +++ b/src/Game/AI/Action/actionEquipedChemicalWeapon.cpp @@ -6,24 +6,10 @@ EquipedChemicalWeapon::EquipedChemicalWeapon(const InitArg& arg) : EquipedAction EquipedChemicalWeapon::~EquipedChemicalWeapon() = default; -bool EquipedChemicalWeapon::init_(sead::Heap* heap) { - return EquipedAction::init_(heap); -} - void EquipedChemicalWeapon::enter_(ksys::act::ai::InlineParamPack* params) { EquipedAction::enter_(params); } -void EquipedChemicalWeapon::leave_() { - EquipedAction::leave_(); -} - -void EquipedChemicalWeapon::loadParams_() { - getDynamicParam(&mNodeName_d, "NodeName"); - getDynamicParam(&mRotOffset_d, "RotOffset"); - getDynamicParam(&mTransOffset_d, "TransOffset"); -} - void EquipedChemicalWeapon::calc_() { EquipedAction::calc_(); } diff --git a/src/Game/AI/Action/actionEquipedChemicalWeapon.h b/src/Game/AI/Action/actionEquipedChemicalWeapon.h index 7b099a3c..0522708b 100644 --- a/src/Game/AI/Action/actionEquipedChemicalWeapon.h +++ b/src/Game/AI/Action/actionEquipedChemicalWeapon.h @@ -11,20 +11,10 @@ public: explicit EquipedChemicalWeapon(const InitArg& arg); ~EquipedChemicalWeapon() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; protected: void calc_() override; - - // dynamic_param at offset 0x20 - sead::SafeString* mNodeName_d{}; - // dynamic_param at offset 0x30 - sead::Vector3f* mRotOffset_d{}; - // dynamic_param at offset 0x38 - sead::Vector3f* mTransOffset_d{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionEquipedDefaultWindWeapon.cpp b/src/Game/AI/Action/actionEquipedDefaultWindWeapon.cpp index 9f7b9bf2..872ab0d2 100644 --- a/src/Game/AI/Action/actionEquipedDefaultWindWeapon.cpp +++ b/src/Game/AI/Action/actionEquipedDefaultWindWeapon.cpp @@ -4,20 +4,10 @@ namespace uking::action { EquipedDefaultWindWeapon::EquipedDefaultWindWeapon(const InitArg& arg) : EquipedAction(arg) {} -EquipedDefaultWindWeapon::~EquipedDefaultWindWeapon() = default; - bool EquipedDefaultWindWeapon::init_(sead::Heap* heap) { return EquipedAction::init_(heap); } -void EquipedDefaultWindWeapon::enter_(ksys::act::ai::InlineParamPack* params) { - EquipedAction::enter_(params); -} - -void EquipedDefaultWindWeapon::leave_() { - EquipedAction::leave_(); -} - void EquipedDefaultWindWeapon::loadParams_() { EquipedAction::loadParams_(); getStaticParam(&mWindRadius_s, "WindRadius"); diff --git a/src/Game/AI/Action/actionEquipedDefaultWindWeapon.h b/src/Game/AI/Action/actionEquipedDefaultWindWeapon.h index eae2efc3..9deab8a5 100644 --- a/src/Game/AI/Action/actionEquipedDefaultWindWeapon.h +++ b/src/Game/AI/Action/actionEquipedDefaultWindWeapon.h @@ -9,11 +9,8 @@ class EquipedDefaultWindWeapon : public EquipedAction { SEAD_RTTI_OVERRIDE(EquipedDefaultWindWeapon, EquipedAction) public: explicit EquipedDefaultWindWeapon(const InitArg& arg); - ~EquipedDefaultWindWeapon() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: diff --git a/src/Game/AI/Action/actionEquipedOptionalWeaponAction.cpp b/src/Game/AI/Action/actionEquipedOptionalWeaponAction.cpp index fb8dbbbe..bfa06faf 100644 --- a/src/Game/AI/Action/actionEquipedOptionalWeaponAction.cpp +++ b/src/Game/AI/Action/actionEquipedOptionalWeaponAction.cpp @@ -4,24 +4,4 @@ namespace uking::action { EquipedOptionalWeaponAction::EquipedOptionalWeaponAction(const InitArg& arg) : BindAction(arg) {} -EquipedOptionalWeaponAction::~EquipedOptionalWeaponAction() = default; - -bool EquipedOptionalWeaponAction::init_(sead::Heap* heap) { - return BindAction::init_(heap); -} - -void EquipedOptionalWeaponAction::enter_(ksys::act::ai::InlineParamPack* params) { - BindAction::enter_(params); -} - -void EquipedOptionalWeaponAction::leave_() { - BindAction::leave_(); -} - -void EquipedOptionalWeaponAction::loadParams_() {} - -void EquipedOptionalWeaponAction::calc_() { - BindAction::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionEquipedOptionalWeaponAction.h b/src/Game/AI/Action/actionEquipedOptionalWeaponAction.h index e5854fc6..bf0d7852 100644 --- a/src/Game/AI/Action/actionEquipedOptionalWeaponAction.h +++ b/src/Game/AI/Action/actionEquipedOptionalWeaponAction.h @@ -9,15 +9,8 @@ class EquipedOptionalWeaponAction : public BindAction { SEAD_RTTI_OVERRIDE(EquipedOptionalWeaponAction, BindAction) public: explicit EquipedOptionalWeaponAction(const InitArg& arg); - ~EquipedOptionalWeaponAction() override; - - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionEquipedQuiver.cpp b/src/Game/AI/Action/actionEquipedQuiver.cpp index f8882377..4fd976bd 100644 --- a/src/Game/AI/Action/actionEquipedQuiver.cpp +++ b/src/Game/AI/Action/actionEquipedQuiver.cpp @@ -6,20 +6,10 @@ EquipedQuiver::EquipedQuiver(const InitArg& arg) : EquipedOptionalWeaponAction(a EquipedQuiver::~EquipedQuiver() = default; -bool EquipedQuiver::init_(sead::Heap* heap) { - return EquipedOptionalWeaponAction::init_(heap); -} - void EquipedQuiver::enter_(ksys::act::ai::InlineParamPack* params) { EquipedOptionalWeaponAction::enter_(params); } -void EquipedQuiver::leave_() { - EquipedOptionalWeaponAction::leave_(); -} - -void EquipedQuiver::loadParams_() {} - void EquipedQuiver::calc_() { EquipedOptionalWeaponAction::calc_(); } diff --git a/src/Game/AI/Action/actionEquipedQuiver.h b/src/Game/AI/Action/actionEquipedQuiver.h index 9f185987..d526dcba 100644 --- a/src/Game/AI/Action/actionEquipedQuiver.h +++ b/src/Game/AI/Action/actionEquipedQuiver.h @@ -11,10 +11,7 @@ public: explicit EquipedQuiver(const InitArg& arg); ~EquipedQuiver() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; protected: void calc_() override; diff --git a/src/Game/AI/Action/actionEquipedRod.cpp b/src/Game/AI/Action/actionEquipedRod.cpp index 1b46b7ed..8eb4c451 100644 --- a/src/Game/AI/Action/actionEquipedRod.cpp +++ b/src/Game/AI/Action/actionEquipedRod.cpp @@ -6,10 +6,6 @@ EquipedRod::EquipedRod(const InitArg& arg) : EquipedAction(arg) {} EquipedRod::~EquipedRod() = default; -bool EquipedRod::init_(sead::Heap* heap) { - return EquipedAction::init_(heap); -} - void EquipedRod::enter_(ksys::act::ai::InlineParamPack* params) { EquipedAction::enter_(params); } diff --git a/src/Game/AI/Action/actionEquipedRod.h b/src/Game/AI/Action/actionEquipedRod.h index 965ba124..09356316 100644 --- a/src/Game/AI/Action/actionEquipedRod.h +++ b/src/Game/AI/Action/actionEquipedRod.h @@ -11,7 +11,6 @@ public: explicit EquipedRod(const InitArg& arg); ~EquipedRod() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionEquipedWeaponChild.cpp b/src/Game/AI/Action/actionEquipedWeaponChild.cpp index e77948e1..9aed2fb4 100644 --- a/src/Game/AI/Action/actionEquipedWeaponChild.cpp +++ b/src/Game/AI/Action/actionEquipedWeaponChild.cpp @@ -4,12 +4,6 @@ namespace uking::action { EquipedWeaponChild::EquipedWeaponChild(const InitArg& arg) : BindAction(arg) {} -EquipedWeaponChild::~EquipedWeaponChild() = default; - -bool EquipedWeaponChild::init_(sead::Heap* heap) { - return BindAction::init_(heap); -} - void EquipedWeaponChild::enter_(ksys::act::ai::InlineParamPack* params) { BindAction::enter_(params); } @@ -23,8 +17,4 @@ void EquipedWeaponChild::loadParams_() { getStaticParam(&mIsChangeScale_s, "IsChangeScale"); } -void EquipedWeaponChild::calc_() { - BindAction::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionEquipedWeaponChild.h b/src/Game/AI/Action/actionEquipedWeaponChild.h index 8507663d..d6096d14 100644 --- a/src/Game/AI/Action/actionEquipedWeaponChild.h +++ b/src/Game/AI/Action/actionEquipedWeaponChild.h @@ -9,16 +9,12 @@ class EquipedWeaponChild : public BindAction { SEAD_RTTI_OVERRIDE(EquipedWeaponChild, BindAction) public: explicit EquipedWeaponChild(const InitArg& arg); - ~EquipedWeaponChild() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; protected: - void calc_() override; - // static_param at offset 0xd8 const bool* mIsChangeScale_s{}; }; diff --git a/src/Game/AI/Action/actionEquipedWithScale.cpp b/src/Game/AI/Action/actionEquipedWithScale.cpp index dced343b..cb57e72e 100644 --- a/src/Game/AI/Action/actionEquipedWithScale.cpp +++ b/src/Game/AI/Action/actionEquipedWithScale.cpp @@ -6,26 +6,8 @@ EquipedWithScale::EquipedWithScale(const InitArg& arg) : EquipedAction(arg) {} EquipedWithScale::~EquipedWithScale() = default; -bool EquipedWithScale::init_(sead::Heap* heap) { - return EquipedAction::init_(heap); -} - void EquipedWithScale::enter_(ksys::act::ai::InlineParamPack* params) { EquipedAction::enter_(params); } -void EquipedWithScale::leave_() { - EquipedAction::leave_(); -} - -void EquipedWithScale::loadParams_() { - getDynamicParam(&mNodeName_d, "NodeName"); - getDynamicParam(&mRotOffset_d, "RotOffset"); - getDynamicParam(&mTransOffset_d, "TransOffset"); -} - -void EquipedWithScale::calc_() { - EquipedAction::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionEquipedWithScale.h b/src/Game/AI/Action/actionEquipedWithScale.h index 50c4e9ec..f862eb9e 100644 --- a/src/Game/AI/Action/actionEquipedWithScale.h +++ b/src/Game/AI/Action/actionEquipedWithScale.h @@ -11,20 +11,9 @@ public: explicit EquipedWithScale(const InitArg& arg); ~EquipedWithScale() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; protected: - void calc_() override; - - // dynamic_param at offset 0x20 - sead::SafeString* mNodeName_d{}; - // dynamic_param at offset 0x30 - sead::Vector3f* mRotOffset_d{}; - // dynamic_param at offset 0x38 - sead::Vector3f* mTransOffset_d{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionEscape.cpp b/src/Game/AI/Action/actionEscape.cpp index ba7017fc..d270a709 100644 --- a/src/Game/AI/Action/actionEscape.cpp +++ b/src/Game/AI/Action/actionEscape.cpp @@ -4,40 +4,8 @@ namespace uking::action { Escape::Escape(const InitArg& arg) : MoveBase(arg) {} -Escape::~Escape() = default; - -bool Escape::init_(sead::Heap* heap) { - return MoveBase::init_(heap); -} - void Escape::enter_(ksys::act::ai::InlineParamPack* params) { MoveBase::enter_(params); } -void Escape::leave_() { - MoveBase::leave_(); -} - -void Escape::loadParams_() { - getStaticParam(&mWeaponIdx_s, "WeaponIdx"); - getStaticParam(&mWallHitLimitTime_s, "WallHitLimitTime"); - getStaticParam(&mMoveAngCliffLimitTime_s, "MoveAngCliffLimitTime"); - getStaticParam(&mSpeed_s, "Speed"); - getStaticParam(&mRotSpd_s, "RotSpd"); - getStaticParam(&mFinRadius_s, "FinRadius"); - getStaticParam(&mFinRotate_s, "FinRotate"); - getStaticParam(&mBaseRotRatio_s, "BaseRotRatio"); - getStaticParam(&mAccRatio_s, "AccRatio"); - getStaticParam(&mJumpUpSpeedReduceRatio_s, "JumpUpSpeedReduceRatio"); - getStaticParam(&mFollowGround_s, "FollowGround"); - getStaticParam(&mIgnoreLastCurve_s, "IgnoreLastCurve"); - getStaticParam(&mIgnoreDecelerationFrontCliff_s, "IgnoreDecelerationFrontCliff"); - getStaticParam(&mIgnoreMoveDirCoHit_s, "IgnoreMoveDirCoHit"); - getDynamicParam(&mTargetPos_d, "TargetPos"); -} - -void Escape::calc_() { - MoveBase::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionEscape.h b/src/Game/AI/Action/actionEscape.h index 53b3fbf9..111ccb8d 100644 --- a/src/Game/AI/Action/actionEscape.h +++ b/src/Game/AI/Action/actionEscape.h @@ -9,46 +9,10 @@ class Escape : public MoveBase { SEAD_RTTI_OVERRIDE(Escape, MoveBase) public: explicit Escape(const InitArg& arg); - ~Escape() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; protected: - void calc_() override; - - // static_param at offset 0x20 - const int* mWeaponIdx_s{}; - // static_param at offset 0x28 - const int* mWallHitLimitTime_s{}; - // static_param at offset 0x30 - const int* mMoveAngCliffLimitTime_s{}; - // static_param at offset 0x38 - const float* mSpeed_s{}; - // static_param at offset 0x40 - const float* mRotSpd_s{}; - // static_param at offset 0x48 - const float* mFinRadius_s{}; - // static_param at offset 0x50 - const float* mFinRotate_s{}; - // static_param at offset 0x58 - const float* mBaseRotRatio_s{}; - // static_param at offset 0x60 - const float* mAccRatio_s{}; - // static_param at offset 0x68 - const float* mJumpUpSpeedReduceRatio_s{}; - // static_param at offset 0x70 - const bool* mFollowGround_s{}; - // static_param at offset 0x78 - const bool* mIgnoreLastCurve_s{}; - // static_param at offset 0x80 - const bool* mIgnoreDecelerationFrontCliff_s{}; - // static_param at offset 0x88 - const bool* mIgnoreMoveDirCoHit_s{}; - // dynamic_param at offset 0x90 - sead::Vector3f* mTargetPos_d{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionEscapeBackTurn.cpp b/src/Game/AI/Action/actionEscapeBackTurn.cpp index 95918ff9..36418d2e 100644 --- a/src/Game/AI/Action/actionEscapeBackTurn.cpp +++ b/src/Game/AI/Action/actionEscapeBackTurn.cpp @@ -6,10 +6,6 @@ EscapeBackTurn::EscapeBackTurn(const InitArg& arg) : ActionEx(arg) {} EscapeBackTurn::~EscapeBackTurn() = default; -bool EscapeBackTurn::init_(sead::Heap* heap) { - return ActionEx::init_(heap); -} - void EscapeBackTurn::enter_(ksys::act::ai::InlineParamPack* params) { ActionEx::enter_(params); } diff --git a/src/Game/AI/Action/actionEscapeBackTurn.h b/src/Game/AI/Action/actionEscapeBackTurn.h index fc52b929..f402678f 100644 --- a/src/Game/AI/Action/actionEscapeBackTurn.h +++ b/src/Game/AI/Action/actionEscapeBackTurn.h @@ -11,7 +11,6 @@ public: explicit EscapeBackTurn(const InitArg& arg); ~EscapeBackTurn() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionEventAppearCheckPointNum.cpp b/src/Game/AI/Action/actionEventAppearCheckPointNum.cpp index 70db634e..368b7df0 100644 --- a/src/Game/AI/Action/actionEventAppearCheckPointNum.cpp +++ b/src/Game/AI/Action/actionEventAppearCheckPointNum.cpp @@ -11,21 +11,9 @@ bool EventAppearCheckPointNum::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void EventAppearCheckPointNum::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void EventAppearCheckPointNum::leave_() { - ksys::act::ai::Action::leave_(); -} - void EventAppearCheckPointNum::loadParams_() { getDynamicParam(&mIconType_d, "IconType"); getDynamicParam(&mGameDataIntTargetCounter_d, "GameDataIntTargetCounter"); } -void EventAppearCheckPointNum::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionEventAppearCheckPointNum.h b/src/Game/AI/Action/actionEventAppearCheckPointNum.h index e4b8d3d9..242065ab 100644 --- a/src/Game/AI/Action/actionEventAppearCheckPointNum.h +++ b/src/Game/AI/Action/actionEventAppearCheckPointNum.h @@ -11,13 +11,9 @@ public: ~EventAppearCheckPointNum() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 int* mIconType_d{}; // dynamic_param at offset 0x28 diff --git a/src/Game/AI/Action/actionEventAppearFlyDistance.cpp b/src/Game/AI/Action/actionEventAppearFlyDistance.cpp index 5b4faa84..5c31d03e 100644 --- a/src/Game/AI/Action/actionEventAppearFlyDistance.cpp +++ b/src/Game/AI/Action/actionEventAppearFlyDistance.cpp @@ -10,20 +10,8 @@ bool EventAppearFlyDistance::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void EventAppearFlyDistance::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void EventAppearFlyDistance::leave_() { - ksys::act::ai::Action::leave_(); -} - void EventAppearFlyDistance::loadParams_() { getDynamicParam(&mGameDataFloatDistance_d, "GameDataFloatDistance"); } -void EventAppearFlyDistance::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionEventAppearFlyDistance.h b/src/Game/AI/Action/actionEventAppearFlyDistance.h index 833ce061..180acc41 100644 --- a/src/Game/AI/Action/actionEventAppearFlyDistance.h +++ b/src/Game/AI/Action/actionEventAppearFlyDistance.h @@ -11,13 +11,9 @@ public: ~EventAppearFlyDistance() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 sead::SafeString* mGameDataFloatDistance_d{}; }; diff --git a/src/Game/AI/Action/actionEventAppearGolfCount.cpp b/src/Game/AI/Action/actionEventAppearGolfCount.cpp index 6ec26bde..86e98d53 100644 --- a/src/Game/AI/Action/actionEventAppearGolfCount.cpp +++ b/src/Game/AI/Action/actionEventAppearGolfCount.cpp @@ -10,20 +10,8 @@ bool EventAppearGolfCount::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void EventAppearGolfCount::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void EventAppearGolfCount::leave_() { - ksys::act::ai::Action::leave_(); -} - void EventAppearGolfCount::loadParams_() { getDynamicParam(&mGameDataIntTargetCounter_d, "GameDataIntTargetCounter"); } -void EventAppearGolfCount::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionEventAppearGolfCount.h b/src/Game/AI/Action/actionEventAppearGolfCount.h index c6812b6a..d1307cee 100644 --- a/src/Game/AI/Action/actionEventAppearGolfCount.h +++ b/src/Game/AI/Action/actionEventAppearGolfCount.h @@ -11,13 +11,9 @@ public: ~EventAppearGolfCount() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 sead::SafeString* mGameDataIntTargetCounter_d{}; }; diff --git a/src/Game/AI/Action/actionEventAppearRaceResult.cpp b/src/Game/AI/Action/actionEventAppearRaceResult.cpp index 2a418bf6..010331cd 100644 --- a/src/Game/AI/Action/actionEventAppearRaceResult.cpp +++ b/src/Game/AI/Action/actionEventAppearRaceResult.cpp @@ -10,20 +10,8 @@ bool EventAppearRaceResult::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void EventAppearRaceResult::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void EventAppearRaceResult::leave_() { - ksys::act::ai::Action::leave_(); -} - void EventAppearRaceResult::loadParams_() { getDynamicParam(&mResultType_d, "ResultType"); } -void EventAppearRaceResult::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionEventAppearRaceResult.h b/src/Game/AI/Action/actionEventAppearRaceResult.h index ef9992c2..68bc4737 100644 --- a/src/Game/AI/Action/actionEventAppearRaceResult.h +++ b/src/Game/AI/Action/actionEventAppearRaceResult.h @@ -11,13 +11,9 @@ public: ~EventAppearRaceResult() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 int* mResultType_d{}; }; diff --git a/src/Game/AI/Action/actionEventAppearRupeeAction.cpp b/src/Game/AI/Action/actionEventAppearRupeeAction.cpp index a6197675..fe3a957a 100644 --- a/src/Game/AI/Action/actionEventAppearRupeeAction.cpp +++ b/src/Game/AI/Action/actionEventAppearRupeeAction.cpp @@ -4,26 +4,8 @@ namespace uking::action { EventAppearRupeeAction::EventAppearRupeeAction(const InitArg& arg) : ksys::act::ai::Action(arg) {} -EventAppearRupeeAction::~EventAppearRupeeAction() = default; - -bool EventAppearRupeeAction::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - -void EventAppearRupeeAction::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void EventAppearRupeeAction::leave_() { - ksys::act::ai::Action::leave_(); -} - void EventAppearRupeeAction::loadParams_() { getDynamicParam(&mIsVisible_d, "IsVisible"); } -void EventAppearRupeeAction::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionEventAppearRupeeAction.h b/src/Game/AI/Action/actionEventAppearRupeeAction.h index 5ab9767b..b93ca084 100644 --- a/src/Game/AI/Action/actionEventAppearRupeeAction.h +++ b/src/Game/AI/Action/actionEventAppearRupeeAction.h @@ -8,16 +8,10 @@ class EventAppearRupeeAction : public ksys::act::ai::Action { SEAD_RTTI_OVERRIDE(EventAppearRupeeAction, ksys::act::ai::Action) public: explicit EventAppearRupeeAction(const InitArg& arg); - ~EventAppearRupeeAction() override; - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 int* mIsVisible_d{}; }; diff --git a/src/Game/AI/Action/actionEventAutoSaveAction.cpp b/src/Game/AI/Action/actionEventAutoSaveAction.cpp index 41456987..f6fec912 100644 --- a/src/Game/AI/Action/actionEventAutoSaveAction.cpp +++ b/src/Game/AI/Action/actionEventAutoSaveAction.cpp @@ -6,22 +6,4 @@ EventAutoSaveAction::EventAutoSaveAction(const InitArg& arg) : ksys::act::ai::Ac EventAutoSaveAction::~EventAutoSaveAction() = default; -bool EventAutoSaveAction::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - -void EventAutoSaveAction::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void EventAutoSaveAction::leave_() { - ksys::act::ai::Action::leave_(); -} - -void EventAutoSaveAction::loadParams_() {} - -void EventAutoSaveAction::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionEventAutoSaveAction.h b/src/Game/AI/Action/actionEventAutoSaveAction.h index 9732a9eb..7cfb2cba 100644 --- a/src/Game/AI/Action/actionEventAutoSaveAction.h +++ b/src/Game/AI/Action/actionEventAutoSaveAction.h @@ -10,13 +10,7 @@ public: explicit EventAutoSaveAction(const InitArg& arg); ~EventAutoSaveAction() override; - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; - protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionEventBgmCtrlAction.cpp b/src/Game/AI/Action/actionEventBgmCtrlAction.cpp index eec0c10c..fdef9bd0 100644 --- a/src/Game/AI/Action/actionEventBgmCtrlAction.cpp +++ b/src/Game/AI/Action/actionEventBgmCtrlAction.cpp @@ -10,20 +10,8 @@ bool EventBgmCtrlAction::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void EventBgmCtrlAction::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void EventBgmCtrlAction::leave_() { - ksys::act::ai::Action::leave_(); -} - void EventBgmCtrlAction::loadParams_() { getDynamicParam(&mCtrlType_d, "CtrlType"); } -void EventBgmCtrlAction::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionEventBgmCtrlAction.h b/src/Game/AI/Action/actionEventBgmCtrlAction.h index 735a24aa..09330d46 100644 --- a/src/Game/AI/Action/actionEventBgmCtrlAction.h +++ b/src/Game/AI/Action/actionEventBgmCtrlAction.h @@ -11,13 +11,9 @@ public: ~EventBgmCtrlAction() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 sead::SafeString* mCtrlType_d{}; }; diff --git a/src/Game/AI/Action/actionEventBgmStartAction.cpp b/src/Game/AI/Action/actionEventBgmStartAction.cpp index 4d40c35e..d5b61267 100644 --- a/src/Game/AI/Action/actionEventBgmStartAction.cpp +++ b/src/Game/AI/Action/actionEventBgmStartAction.cpp @@ -10,20 +10,8 @@ bool EventBgmStartAction::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void EventBgmStartAction::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void EventBgmStartAction::leave_() { - ksys::act::ai::Action::leave_(); -} - void EventBgmStartAction::loadParams_() { getDynamicParam(&mBgmName_d, "BgmName"); } -void EventBgmStartAction::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionEventBgmStartAction.h b/src/Game/AI/Action/actionEventBgmStartAction.h index 61febff3..a6603b94 100644 --- a/src/Game/AI/Action/actionEventBgmStartAction.h +++ b/src/Game/AI/Action/actionEventBgmStartAction.h @@ -11,13 +11,9 @@ public: ~EventBgmStartAction() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 sead::SafeString* mBgmName_d{}; }; diff --git a/src/Game/AI/Action/actionEventBgmStopAction.cpp b/src/Game/AI/Action/actionEventBgmStopAction.cpp index 98cee87c..6433a812 100644 --- a/src/Game/AI/Action/actionEventBgmStopAction.cpp +++ b/src/Game/AI/Action/actionEventBgmStopAction.cpp @@ -10,21 +10,9 @@ bool EventBgmStopAction::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void EventBgmStopAction::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void EventBgmStopAction::leave_() { - ksys::act::ai::Action::leave_(); -} - void EventBgmStopAction::loadParams_() { getDynamicParam(&mFadeSec_d, "FadeSec"); getDynamicParam(&mBgmName_d, "BgmName"); } -void EventBgmStopAction::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionEventBgmStopAction.h b/src/Game/AI/Action/actionEventBgmStopAction.h index f0dd9870..6dd9a508 100644 --- a/src/Game/AI/Action/actionEventBgmStopAction.h +++ b/src/Game/AI/Action/actionEventBgmStopAction.h @@ -11,13 +11,9 @@ public: ~EventBgmStopAction() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 float* mFadeSec_d{}; // dynamic_param at offset 0x28 diff --git a/src/Game/AI/Action/actionEventCancelGet.cpp b/src/Game/AI/Action/actionEventCancelGet.cpp index 48d2d25f..75805252 100644 --- a/src/Game/AI/Action/actionEventCancelGet.cpp +++ b/src/Game/AI/Action/actionEventCancelGet.cpp @@ -10,18 +10,6 @@ bool EventCancelGet::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void EventCancelGet::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void EventCancelGet::leave_() { - ksys::act::ai::Action::leave_(); -} - void EventCancelGet::loadParams_() {} -void EventCancelGet::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionEventCancelGet.h b/src/Game/AI/Action/actionEventCancelGet.h index 9fccdb8d..4eadf3b3 100644 --- a/src/Game/AI/Action/actionEventCancelGet.h +++ b/src/Game/AI/Action/actionEventCancelGet.h @@ -11,12 +11,9 @@ public: ~EventCancelGet() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionEventCancelSleepTargetActor.cpp b/src/Game/AI/Action/actionEventCancelSleepTargetActor.cpp index aff94a9a..c51ee7e8 100644 --- a/src/Game/AI/Action/actionEventCancelSleepTargetActor.cpp +++ b/src/Game/AI/Action/actionEventCancelSleepTargetActor.cpp @@ -11,21 +11,9 @@ bool EventCancelSleepTargetActor::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void EventCancelSleepTargetActor::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void EventCancelSleepTargetActor::leave_() { - ksys::act::ai::Action::leave_(); -} - void EventCancelSleepTargetActor::loadParams_() { getDynamicParam(&mActorName_d, "ActorName"); getDynamicParam(&mInstanceName_d, "InstanceName"); } -void EventCancelSleepTargetActor::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionEventCancelSleepTargetActor.h b/src/Game/AI/Action/actionEventCancelSleepTargetActor.h index f474502c..08ed3e96 100644 --- a/src/Game/AI/Action/actionEventCancelSleepTargetActor.h +++ b/src/Game/AI/Action/actionEventCancelSleepTargetActor.h @@ -11,13 +11,9 @@ public: ~EventCancelSleepTargetActor() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 sead::SafeString* mActorName_d{}; // dynamic_param at offset 0x30 diff --git a/src/Game/AI/Action/actionEventControlRupeeUI.cpp b/src/Game/AI/Action/actionEventControlRupeeUI.cpp index f5f6595f..cd17c898 100644 --- a/src/Game/AI/Action/actionEventControlRupeeUI.cpp +++ b/src/Game/AI/Action/actionEventControlRupeeUI.cpp @@ -10,21 +10,9 @@ bool EventControlRupeeUI::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void EventControlRupeeUI::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void EventControlRupeeUI::leave_() { - ksys::act::ai::Action::leave_(); -} - void EventControlRupeeUI::loadParams_() { getDynamicParam(&mTargetValue_d, "TargetValue"); getDynamicParam(&mIsAppear_d, "IsAppear"); } -void EventControlRupeeUI::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionEventControlRupeeUI.h b/src/Game/AI/Action/actionEventControlRupeeUI.h index 71533204..3e1c9ac1 100644 --- a/src/Game/AI/Action/actionEventControlRupeeUI.h +++ b/src/Game/AI/Action/actionEventControlRupeeUI.h @@ -11,13 +11,9 @@ public: ~EventControlRupeeUI() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 int* mTargetValue_d{}; // dynamic_param at offset 0x28 diff --git a/src/Game/AI/Action/actionEventDisableContactLayerTrigger.cpp b/src/Game/AI/Action/actionEventDisableContactLayerTrigger.cpp index 83d86f92..c5bebc35 100644 --- a/src/Game/AI/Action/actionEventDisableContactLayerTrigger.cpp +++ b/src/Game/AI/Action/actionEventDisableContactLayerTrigger.cpp @@ -11,20 +11,8 @@ bool EventDisableContactLayerTrigger::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void EventDisableContactLayerTrigger::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void EventDisableContactLayerTrigger::leave_() { - ksys::act::ai::Action::leave_(); -} - void EventDisableContactLayerTrigger::loadParams_() { getDynamicParam(&mContactType_d, "ContactType"); } -void EventDisableContactLayerTrigger::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionEventDisableContactLayerTrigger.h b/src/Game/AI/Action/actionEventDisableContactLayerTrigger.h index 428d1560..0dcf5d30 100644 --- a/src/Game/AI/Action/actionEventDisableContactLayerTrigger.h +++ b/src/Game/AI/Action/actionEventDisableContactLayerTrigger.h @@ -11,13 +11,9 @@ public: ~EventDisableContactLayerTrigger() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 int* mContactType_d{}; }; diff --git a/src/Game/AI/Action/actionEventDisableMiniGameTime.cpp b/src/Game/AI/Action/actionEventDisableMiniGameTime.cpp index 4b2274f6..e862512f 100644 --- a/src/Game/AI/Action/actionEventDisableMiniGameTime.cpp +++ b/src/Game/AI/Action/actionEventDisableMiniGameTime.cpp @@ -11,18 +11,6 @@ bool EventDisableMiniGameTime::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void EventDisableMiniGameTime::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void EventDisableMiniGameTime::leave_() { - ksys::act::ai::Action::leave_(); -} - void EventDisableMiniGameTime::loadParams_() {} -void EventDisableMiniGameTime::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionEventDisableMiniGameTime.h b/src/Game/AI/Action/actionEventDisableMiniGameTime.h index 4e068d4b..a9d879c6 100644 --- a/src/Game/AI/Action/actionEventDisableMiniGameTime.h +++ b/src/Game/AI/Action/actionEventDisableMiniGameTime.h @@ -11,12 +11,9 @@ public: ~EventDisableMiniGameTime() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionEventDisappearCheckPointNum.cpp b/src/Game/AI/Action/actionEventDisappearCheckPointNum.cpp index be03160a..f8da1ace 100644 --- a/src/Game/AI/Action/actionEventDisappearCheckPointNum.cpp +++ b/src/Game/AI/Action/actionEventDisappearCheckPointNum.cpp @@ -11,18 +11,6 @@ bool EventDisappearCheckPointNum::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void EventDisappearCheckPointNum::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void EventDisappearCheckPointNum::leave_() { - ksys::act::ai::Action::leave_(); -} - void EventDisappearCheckPointNum::loadParams_() {} -void EventDisappearCheckPointNum::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionEventDisappearCheckPointNum.h b/src/Game/AI/Action/actionEventDisappearCheckPointNum.h index 2bce2734..13cf94a6 100644 --- a/src/Game/AI/Action/actionEventDisappearCheckPointNum.h +++ b/src/Game/AI/Action/actionEventDisappearCheckPointNum.h @@ -11,12 +11,9 @@ public: ~EventDisappearCheckPointNum() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionEventDisappearFlyDistance.cpp b/src/Game/AI/Action/actionEventDisappearFlyDistance.cpp index a03da438..143e80d5 100644 --- a/src/Game/AI/Action/actionEventDisappearFlyDistance.cpp +++ b/src/Game/AI/Action/actionEventDisappearFlyDistance.cpp @@ -11,18 +11,6 @@ bool EventDisappearFlyDistance::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void EventDisappearFlyDistance::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void EventDisappearFlyDistance::leave_() { - ksys::act::ai::Action::leave_(); -} - void EventDisappearFlyDistance::loadParams_() {} -void EventDisappearFlyDistance::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionEventDisappearFlyDistance.h b/src/Game/AI/Action/actionEventDisappearFlyDistance.h index 5d223b9b..2e6f30be 100644 --- a/src/Game/AI/Action/actionEventDisappearFlyDistance.h +++ b/src/Game/AI/Action/actionEventDisappearFlyDistance.h @@ -11,12 +11,9 @@ public: ~EventDisappearFlyDistance() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionEventDisappearGolfCount.cpp b/src/Game/AI/Action/actionEventDisappearGolfCount.cpp index 1db850fd..5234cc44 100644 --- a/src/Game/AI/Action/actionEventDisappearGolfCount.cpp +++ b/src/Game/AI/Action/actionEventDisappearGolfCount.cpp @@ -10,18 +10,6 @@ bool EventDisappearGolfCount::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void EventDisappearGolfCount::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void EventDisappearGolfCount::leave_() { - ksys::act::ai::Action::leave_(); -} - void EventDisappearGolfCount::loadParams_() {} -void EventDisappearGolfCount::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionEventDisappearGolfCount.h b/src/Game/AI/Action/actionEventDisappearGolfCount.h index 1486ccf5..8430714b 100644 --- a/src/Game/AI/Action/actionEventDisappearGolfCount.h +++ b/src/Game/AI/Action/actionEventDisappearGolfCount.h @@ -11,12 +11,9 @@ public: ~EventDisappearGolfCount() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionEventDisappearRaceResult.cpp b/src/Game/AI/Action/actionEventDisappearRaceResult.cpp index f5f3c36b..38aceabc 100644 --- a/src/Game/AI/Action/actionEventDisappearRaceResult.cpp +++ b/src/Game/AI/Action/actionEventDisappearRaceResult.cpp @@ -11,18 +11,6 @@ bool EventDisappearRaceResult::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void EventDisappearRaceResult::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void EventDisappearRaceResult::leave_() { - ksys::act::ai::Action::leave_(); -} - void EventDisappearRaceResult::loadParams_() {} -void EventDisappearRaceResult::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionEventDisappearRaceResult.h b/src/Game/AI/Action/actionEventDisappearRaceResult.h index 3ab0e6ee..8c714bca 100644 --- a/src/Game/AI/Action/actionEventDisappearRaceResult.h +++ b/src/Game/AI/Action/actionEventDisappearRaceResult.h @@ -11,12 +11,9 @@ public: ~EventDisappearRaceResult() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionEventEnableModelDraw.cpp b/src/Game/AI/Action/actionEventEnableModelDraw.cpp index 2da6b039..6d3dd759 100644 --- a/src/Game/AI/Action/actionEventEnableModelDraw.cpp +++ b/src/Game/AI/Action/actionEventEnableModelDraw.cpp @@ -10,18 +10,6 @@ bool EventEnableModelDraw::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void EventEnableModelDraw::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void EventEnableModelDraw::leave_() { - ksys::act::ai::Action::leave_(); -} - void EventEnableModelDraw::loadParams_() {} -void EventEnableModelDraw::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionEventEnableModelDraw.h b/src/Game/AI/Action/actionEventEnableModelDraw.h index 82d94908..a673837f 100644 --- a/src/Game/AI/Action/actionEventEnableModelDraw.h +++ b/src/Game/AI/Action/actionEventEnableModelDraw.h @@ -11,12 +11,9 @@ public: ~EventEnableModelDraw() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionEventEquipLastSetItem.cpp b/src/Game/AI/Action/actionEventEquipLastSetItem.cpp index 11629c8c..6fe809c3 100644 --- a/src/Game/AI/Action/actionEventEquipLastSetItem.cpp +++ b/src/Game/AI/Action/actionEventEquipLastSetItem.cpp @@ -10,18 +10,6 @@ bool EventEquipLastSetItem::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void EventEquipLastSetItem::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void EventEquipLastSetItem::leave_() { - ksys::act::ai::Action::leave_(); -} - void EventEquipLastSetItem::loadParams_() {} -void EventEquipLastSetItem::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionEventEquipLastSetItem.h b/src/Game/AI/Action/actionEventEquipLastSetItem.h index 9c3b427b..d3b29b42 100644 --- a/src/Game/AI/Action/actionEventEquipLastSetItem.h +++ b/src/Game/AI/Action/actionEventEquipLastSetItem.h @@ -11,12 +11,9 @@ public: ~EventEquipLastSetItem() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionEventFireControl.cpp b/src/Game/AI/Action/actionEventFireControl.cpp index 4058d485..7fcae818 100644 --- a/src/Game/AI/Action/actionEventFireControl.cpp +++ b/src/Game/AI/Action/actionEventFireControl.cpp @@ -10,20 +10,8 @@ bool EventFireControl::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void EventFireControl::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void EventFireControl::leave_() { - ksys::act::ai::Action::leave_(); -} - void EventFireControl::loadParams_() { getDynamicParam(&mReleaseFire_d, "ReleaseFire"); } -void EventFireControl::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionEventFireControl.h b/src/Game/AI/Action/actionEventFireControl.h index ceb13300..d0fd8035 100644 --- a/src/Game/AI/Action/actionEventFireControl.h +++ b/src/Game/AI/Action/actionEventFireControl.h @@ -11,13 +11,9 @@ public: ~EventFireControl() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 bool* mReleaseFire_d{}; }; diff --git a/src/Game/AI/Action/actionEventFlagOFFAction.cpp b/src/Game/AI/Action/actionEventFlagOFFAction.cpp index cd3798a7..df679e5d 100644 --- a/src/Game/AI/Action/actionEventFlagOFFAction.cpp +++ b/src/Game/AI/Action/actionEventFlagOFFAction.cpp @@ -10,20 +10,8 @@ bool EventFlagOFFAction::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void EventFlagOFFAction::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void EventFlagOFFAction::leave_() { - ksys::act::ai::Action::leave_(); -} - void EventFlagOFFAction::loadParams_() { getDynamicParam(&mFlagName_d, "FlagName"); } -void EventFlagOFFAction::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionEventFlagOFFAction.h b/src/Game/AI/Action/actionEventFlagOFFAction.h index 32528081..34a04433 100644 --- a/src/Game/AI/Action/actionEventFlagOFFAction.h +++ b/src/Game/AI/Action/actionEventFlagOFFAction.h @@ -11,13 +11,9 @@ public: ~EventFlagOFFAction() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 sead::SafeString* mFlagName_d{}; }; diff --git a/src/Game/AI/Action/actionEventFlagONAction.cpp b/src/Game/AI/Action/actionEventFlagONAction.cpp index 20c45475..e1c943b2 100644 --- a/src/Game/AI/Action/actionEventFlagONAction.cpp +++ b/src/Game/AI/Action/actionEventFlagONAction.cpp @@ -10,20 +10,8 @@ bool EventFlagONAction::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void EventFlagONAction::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void EventFlagONAction::leave_() { - ksys::act::ai::Action::leave_(); -} - void EventFlagONAction::loadParams_() { getDynamicParam(&mFlagName_d, "FlagName"); } -void EventFlagONAction::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionEventFlagONAction.h b/src/Game/AI/Action/actionEventFlagONAction.h index 7f8db46d..62bc20f6 100644 --- a/src/Game/AI/Action/actionEventFlagONAction.h +++ b/src/Game/AI/Action/actionEventFlagONAction.h @@ -11,13 +11,9 @@ public: ~EventFlagONAction() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 sead::SafeString* mFlagName_d{}; }; diff --git a/src/Game/AI/Action/actionEventIncreaseFameAction.cpp b/src/Game/AI/Action/actionEventIncreaseFameAction.cpp index 3ac8b852..176cef94 100644 --- a/src/Game/AI/Action/actionEventIncreaseFameAction.cpp +++ b/src/Game/AI/Action/actionEventIncreaseFameAction.cpp @@ -4,26 +4,8 @@ namespace uking::action { EventIncreaseFameAction::EventIncreaseFameAction(const InitArg& arg) : ksys::act::ai::Action(arg) {} -EventIncreaseFameAction::~EventIncreaseFameAction() = default; - -bool EventIncreaseFameAction::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - -void EventIncreaseFameAction::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void EventIncreaseFameAction::leave_() { - ksys::act::ai::Action::leave_(); -} - void EventIncreaseFameAction::loadParams_() { getDynamicParam(&mValue_d, "Value"); } -void EventIncreaseFameAction::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionEventIncreaseFameAction.h b/src/Game/AI/Action/actionEventIncreaseFameAction.h index 3c3c929d..ea2c766f 100644 --- a/src/Game/AI/Action/actionEventIncreaseFameAction.h +++ b/src/Game/AI/Action/actionEventIncreaseFameAction.h @@ -8,16 +8,10 @@ class EventIncreaseFameAction : public ksys::act::ai::Action { SEAD_RTTI_OVERRIDE(EventIncreaseFameAction, ksys::act::ai::Action) public: explicit EventIncreaseFameAction(const InitArg& arg); - ~EventIncreaseFameAction() override; - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 int* mValue_d{}; }; diff --git a/src/Game/AI/Action/actionEventIncreaseGameDataIntAction.cpp b/src/Game/AI/Action/actionEventIncreaseGameDataIntAction.cpp index 9a06a691..73c87c42 100644 --- a/src/Game/AI/Action/actionEventIncreaseGameDataIntAction.cpp +++ b/src/Game/AI/Action/actionEventIncreaseGameDataIntAction.cpp @@ -11,21 +11,9 @@ bool EventIncreaseGameDataIntAction::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void EventIncreaseGameDataIntAction::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void EventIncreaseGameDataIntAction::leave_() { - ksys::act::ai::Action::leave_(); -} - void EventIncreaseGameDataIntAction::loadParams_() { getDynamicParam(&mValue_d, "Value"); getDynamicParam(&mGameDataIntName_d, "GameDataIntName"); } -void EventIncreaseGameDataIntAction::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionEventIncreaseGameDataIntAction.h b/src/Game/AI/Action/actionEventIncreaseGameDataIntAction.h index a07848b4..0ff97259 100644 --- a/src/Game/AI/Action/actionEventIncreaseGameDataIntAction.h +++ b/src/Game/AI/Action/actionEventIncreaseGameDataIntAction.h @@ -11,13 +11,9 @@ public: ~EventIncreaseGameDataIntAction() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 int* mValue_d{}; // dynamic_param at offset 0x28 diff --git a/src/Game/AI/Action/actionEventIncreasePorchItemAction.cpp b/src/Game/AI/Action/actionEventIncreasePorchItemAction.cpp index a7b0076e..7611561e 100644 --- a/src/Game/AI/Action/actionEventIncreasePorchItemAction.cpp +++ b/src/Game/AI/Action/actionEventIncreasePorchItemAction.cpp @@ -7,25 +7,9 @@ EventIncreasePorchItemAction::EventIncreasePorchItemAction(const InitArg& arg) EventIncreasePorchItemAction::~EventIncreasePorchItemAction() = default; -bool EventIncreasePorchItemAction::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - -void EventIncreasePorchItemAction::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void EventIncreasePorchItemAction::leave_() { - ksys::act::ai::Action::leave_(); -} - void EventIncreasePorchItemAction::loadParams_() { getDynamicParam(&mValue_d, "Value"); getDynamicParam(&mPorchItemName_d, "PorchItemName"); } -void EventIncreasePorchItemAction::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionEventIncreasePorchItemAction.h b/src/Game/AI/Action/actionEventIncreasePorchItemAction.h index 93dd0538..f3d24508 100644 --- a/src/Game/AI/Action/actionEventIncreasePorchItemAction.h +++ b/src/Game/AI/Action/actionEventIncreasePorchItemAction.h @@ -10,14 +10,9 @@ public: explicit EventIncreasePorchItemAction(const InitArg& arg); ~EventIncreasePorchItemAction() override; - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 int* mValue_d{}; // dynamic_param at offset 0x28 diff --git a/src/Game/AI/Action/actionEventIncreaseRupeeAction.cpp b/src/Game/AI/Action/actionEventIncreaseRupeeAction.cpp index 9372f7af..cacc00d8 100644 --- a/src/Game/AI/Action/actionEventIncreaseRupeeAction.cpp +++ b/src/Game/AI/Action/actionEventIncreaseRupeeAction.cpp @@ -5,20 +5,10 @@ namespace uking::action { EventIncreaseRupeeAction::EventIncreaseRupeeAction(const InitArg& arg) : ksys::act::ai::Action(arg) {} -EventIncreaseRupeeAction::~EventIncreaseRupeeAction() = default; - -bool EventIncreaseRupeeAction::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - void EventIncreaseRupeeAction::enter_(ksys::act::ai::InlineParamPack* params) { ksys::act::ai::Action::enter_(params); } -void EventIncreaseRupeeAction::leave_() { - ksys::act::ai::Action::leave_(); -} - void EventIncreaseRupeeAction::loadParams_() { getDynamicParam(&mValue_d, "Value"); } diff --git a/src/Game/AI/Action/actionEventIncreaseRupeeAction.h b/src/Game/AI/Action/actionEventIncreaseRupeeAction.h index d7c9e305..791976ad 100644 --- a/src/Game/AI/Action/actionEventIncreaseRupeeAction.h +++ b/src/Game/AI/Action/actionEventIncreaseRupeeAction.h @@ -8,11 +8,8 @@ class EventIncreaseRupeeAction : public ksys::act::ai::Action { SEAD_RTTI_OVERRIDE(EventIncreaseRupeeAction, ksys::act::ai::Action) public: explicit EventIncreaseRupeeAction(const InitArg& arg); - ~EventIncreaseRupeeAction() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: diff --git a/src/Game/AI/Action/actionEventInitTalkAction.cpp b/src/Game/AI/Action/actionEventInitTalkAction.cpp index 83f635de..78410f11 100644 --- a/src/Game/AI/Action/actionEventInitTalkAction.cpp +++ b/src/Game/AI/Action/actionEventInitTalkAction.cpp @@ -4,8 +4,6 @@ namespace uking::action { EventInitTalkAction::EventInitTalkAction(const InitArg& arg) : ksys::act::ai::Action(arg) {} -EventInitTalkAction::~EventInitTalkAction() = default; - bool EventInitTalkAction::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } diff --git a/src/Game/AI/Action/actionEventInitTalkAction.h b/src/Game/AI/Action/actionEventInitTalkAction.h index 8a2aa2af..649ded77 100644 --- a/src/Game/AI/Action/actionEventInitTalkAction.h +++ b/src/Game/AI/Action/actionEventInitTalkAction.h @@ -8,7 +8,6 @@ class EventInitTalkAction : public ksys::act::ai::Action { SEAD_RTTI_OVERRIDE(EventInitTalkAction, ksys::act::ai::Action) public: explicit EventInitTalkAction(const InitArg& arg); - ~EventInitTalkAction() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/AI/Action/actionEventMiniGameFinish.cpp b/src/Game/AI/Action/actionEventMiniGameFinish.cpp index fee2880b..7adda4bb 100644 --- a/src/Game/AI/Action/actionEventMiniGameFinish.cpp +++ b/src/Game/AI/Action/actionEventMiniGameFinish.cpp @@ -10,20 +10,8 @@ bool EventMiniGameFinish::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void EventMiniGameFinish::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void EventMiniGameFinish::leave_() { - ksys::act::ai::Action::leave_(); -} - void EventMiniGameFinish::loadParams_() { getDynamicParam(&mTextType_d, "TextType"); } -void EventMiniGameFinish::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionEventMiniGameFinish.h b/src/Game/AI/Action/actionEventMiniGameFinish.h index d252d897..68d3d579 100644 --- a/src/Game/AI/Action/actionEventMiniGameFinish.h +++ b/src/Game/AI/Action/actionEventMiniGameFinish.h @@ -11,13 +11,9 @@ public: ~EventMiniGameFinish() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 int* mTextType_d{}; }; diff --git a/src/Game/AI/Action/actionEventMiniGameRetire.cpp b/src/Game/AI/Action/actionEventMiniGameRetire.cpp index 9c1693c9..9ed9b2e4 100644 --- a/src/Game/AI/Action/actionEventMiniGameRetire.cpp +++ b/src/Game/AI/Action/actionEventMiniGameRetire.cpp @@ -10,20 +10,8 @@ bool EventMiniGameRetire::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void EventMiniGameRetire::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void EventMiniGameRetire::leave_() { - ksys::act::ai::Action::leave_(); -} - void EventMiniGameRetire::loadParams_() { getDynamicParam(&mTextType_d, "TextType"); } -void EventMiniGameRetire::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionEventMiniGameRetire.h b/src/Game/AI/Action/actionEventMiniGameRetire.h index 16fec2a0..9c2ecb16 100644 --- a/src/Game/AI/Action/actionEventMiniGameRetire.h +++ b/src/Game/AI/Action/actionEventMiniGameRetire.h @@ -11,13 +11,9 @@ public: ~EventMiniGameRetire() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 int* mTextType_d{}; }; diff --git a/src/Game/AI/Action/actionEventMiniGameTimerWrite.cpp b/src/Game/AI/Action/actionEventMiniGameTimerWrite.cpp index 3ad9a4b4..8c8acc44 100644 --- a/src/Game/AI/Action/actionEventMiniGameTimerWrite.cpp +++ b/src/Game/AI/Action/actionEventMiniGameTimerWrite.cpp @@ -10,22 +10,10 @@ bool EventMiniGameTimerWrite::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void EventMiniGameTimerWrite::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void EventMiniGameTimerWrite::leave_() { - ksys::act::ai::Action::leave_(); -} - void EventMiniGameTimerWrite::loadParams_() { getDynamicParam(&mGameDataIntNameMintues_d, "GameDataIntNameMintues"); getDynamicParam(&mGameDataIntNameSeconds_d, "GameDataIntNameSeconds"); getDynamicParam(&mGameDataIntNameMiliseconds_d, "GameDataIntNameMiliseconds"); } -void EventMiniGameTimerWrite::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionEventMiniGameTimerWrite.h b/src/Game/AI/Action/actionEventMiniGameTimerWrite.h index d965d5ba..0731de03 100644 --- a/src/Game/AI/Action/actionEventMiniGameTimerWrite.h +++ b/src/Game/AI/Action/actionEventMiniGameTimerWrite.h @@ -11,13 +11,9 @@ public: ~EventMiniGameTimerWrite() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 sead::SafeString* mGameDataIntNameMintues_d{}; // dynamic_param at offset 0x30 diff --git a/src/Game/AI/Action/actionEventOffWaitRevivalAction.cpp b/src/Game/AI/Action/actionEventOffWaitRevivalAction.cpp index ad8f5549..4270879f 100644 --- a/src/Game/AI/Action/actionEventOffWaitRevivalAction.cpp +++ b/src/Game/AI/Action/actionEventOffWaitRevivalAction.cpp @@ -15,10 +15,6 @@ void EventOffWaitRevivalAction::enter_(ksys::act::ai::InlineParamPack* params) { ksys::act::ai::Action::enter_(params); } -void EventOffWaitRevivalAction::leave_() { - ksys::act::ai::Action::leave_(); -} - void EventOffWaitRevivalAction::loadParams_() {} void EventOffWaitRevivalAction::calc_() { diff --git a/src/Game/AI/Action/actionEventOffWaitRevivalAction.h b/src/Game/AI/Action/actionEventOffWaitRevivalAction.h index 11cab483..27e6d5f2 100644 --- a/src/Game/AI/Action/actionEventOffWaitRevivalAction.h +++ b/src/Game/AI/Action/actionEventOffWaitRevivalAction.h @@ -12,7 +12,6 @@ public: bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: diff --git a/src/Game/AI/Action/actionEventOnWaitRevivalAction.cpp b/src/Game/AI/Action/actionEventOnWaitRevivalAction.cpp index 798b8d8c..2ee1b69c 100644 --- a/src/Game/AI/Action/actionEventOnWaitRevivalAction.cpp +++ b/src/Game/AI/Action/actionEventOnWaitRevivalAction.cpp @@ -11,18 +11,6 @@ bool EventOnWaitRevivalAction::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void EventOnWaitRevivalAction::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void EventOnWaitRevivalAction::leave_() { - ksys::act::ai::Action::leave_(); -} - void EventOnWaitRevivalAction::loadParams_() {} -void EventOnWaitRevivalAction::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionEventOnWaitRevivalAction.h b/src/Game/AI/Action/actionEventOnWaitRevivalAction.h index e46673b5..87f515b6 100644 --- a/src/Game/AI/Action/actionEventOnWaitRevivalAction.h +++ b/src/Game/AI/Action/actionEventOnWaitRevivalAction.h @@ -11,12 +11,9 @@ public: ~EventOnWaitRevivalAction() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionEventOpenGetDemo.h b/src/Game/AI/Action/actionEventOpenGetDemo.h index c85297fd..887dffdf 100644 --- a/src/Game/AI/Action/actionEventOpenGetDemo.h +++ b/src/Game/AI/Action/actionEventOpenGetDemo.h @@ -20,6 +20,8 @@ protected: // dynamic_param at offset 0x20 bool* mIsInvalidOpenPouch_d{}; + bool _28{}; + bool _29{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionEventOpenGetWeaponDemo.cpp b/src/Game/AI/Action/actionEventOpenGetWeaponDemo.cpp index e09b473e..6e479959 100644 --- a/src/Game/AI/Action/actionEventOpenGetWeaponDemo.cpp +++ b/src/Game/AI/Action/actionEventOpenGetWeaponDemo.cpp @@ -6,22 +6,6 @@ EventOpenGetWeaponDemo::EventOpenGetWeaponDemo(const InitArg& arg) : EventOpenGe EventOpenGetWeaponDemo::~EventOpenGetWeaponDemo() = default; -bool EventOpenGetWeaponDemo::init_(sead::Heap* heap) { - return EventOpenGetDemo::init_(heap); -} - -void EventOpenGetWeaponDemo::enter_(ksys::act::ai::InlineParamPack* params) { - EventOpenGetDemo::enter_(params); -} - -void EventOpenGetWeaponDemo::leave_() { - EventOpenGetDemo::leave_(); -} - -void EventOpenGetWeaponDemo::loadParams_() { - getDynamicParam(&mIsInvalidOpenPouch_d, "IsInvalidOpenPouch"); -} - void EventOpenGetWeaponDemo::calc_() { EventOpenGetDemo::calc_(); } diff --git a/src/Game/AI/Action/actionEventOpenGetWeaponDemo.h b/src/Game/AI/Action/actionEventOpenGetWeaponDemo.h index f2aa3329..e045b321 100644 --- a/src/Game/AI/Action/actionEventOpenGetWeaponDemo.h +++ b/src/Game/AI/Action/actionEventOpenGetWeaponDemo.h @@ -11,16 +11,8 @@ public: explicit EventOpenGetWeaponDemo(const InitArg& arg); ~EventOpenGetWeaponDemo() override; - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; - protected: void calc_() override; - - // dynamic_param at offset 0x20 - bool* mIsInvalidOpenPouch_d{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionEventPrizeSuccess.cpp b/src/Game/AI/Action/actionEventPrizeSuccess.cpp index 5fdec610..c84317aa 100644 --- a/src/Game/AI/Action/actionEventPrizeSuccess.cpp +++ b/src/Game/AI/Action/actionEventPrizeSuccess.cpp @@ -6,24 +6,8 @@ EventPrizeSuccess::EventPrizeSuccess(const InitArg& arg) : ksys::act::ai::Action EventPrizeSuccess::~EventPrizeSuccess() = default; -bool EventPrizeSuccess::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - -void EventPrizeSuccess::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void EventPrizeSuccess::leave_() { - ksys::act::ai::Action::leave_(); -} - void EventPrizeSuccess::loadParams_() { getDynamicParam(&mPrizeNumber_d, "PrizeNumber"); } -void EventPrizeSuccess::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionEventPrizeSuccess.h b/src/Game/AI/Action/actionEventPrizeSuccess.h index ebc116cb..66bdfd7b 100644 --- a/src/Game/AI/Action/actionEventPrizeSuccess.h +++ b/src/Game/AI/Action/actionEventPrizeSuccess.h @@ -10,14 +10,9 @@ public: explicit EventPrizeSuccess(const InitArg& arg); ~EventPrizeSuccess() override; - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 int* mPrizeNumber_d{}; }; diff --git a/src/Game/AI/Action/actionEventRecoverPlayerCondition.cpp b/src/Game/AI/Action/actionEventRecoverPlayerCondition.cpp index 937f7063..7a56e452 100644 --- a/src/Game/AI/Action/actionEventRecoverPlayerCondition.cpp +++ b/src/Game/AI/Action/actionEventRecoverPlayerCondition.cpp @@ -11,18 +11,6 @@ bool EventRecoverPlayerCondition::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void EventRecoverPlayerCondition::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void EventRecoverPlayerCondition::leave_() { - ksys::act::ai::Action::leave_(); -} - void EventRecoverPlayerCondition::loadParams_() {} -void EventRecoverPlayerCondition::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionEventRecoverPlayerCondition.h b/src/Game/AI/Action/actionEventRecoverPlayerCondition.h index bfa9d44c..73d1bb76 100644 --- a/src/Game/AI/Action/actionEventRecoverPlayerCondition.h +++ b/src/Game/AI/Action/actionEventRecoverPlayerCondition.h @@ -11,12 +11,9 @@ public: ~EventRecoverPlayerCondition() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionEventRecoverPlayerEnergy.cpp b/src/Game/AI/Action/actionEventRecoverPlayerEnergy.cpp index 37b73591..7460278f 100644 --- a/src/Game/AI/Action/actionEventRecoverPlayerEnergy.cpp +++ b/src/Game/AI/Action/actionEventRecoverPlayerEnergy.cpp @@ -11,18 +11,6 @@ bool EventRecoverPlayerEnergy::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void EventRecoverPlayerEnergy::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void EventRecoverPlayerEnergy::leave_() { - ksys::act::ai::Action::leave_(); -} - void EventRecoverPlayerEnergy::loadParams_() {} -void EventRecoverPlayerEnergy::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionEventRecoverPlayerEnergy.h b/src/Game/AI/Action/actionEventRecoverPlayerEnergy.h index 4989d49d..6e79203e 100644 --- a/src/Game/AI/Action/actionEventRecoverPlayerEnergy.h +++ b/src/Game/AI/Action/actionEventRecoverPlayerEnergy.h @@ -11,12 +11,9 @@ public: ~EventRecoverPlayerEnergy() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionEventRecoverPlayerLife.cpp b/src/Game/AI/Action/actionEventRecoverPlayerLife.cpp index 99739fde..01f7b970 100644 --- a/src/Game/AI/Action/actionEventRecoverPlayerLife.cpp +++ b/src/Game/AI/Action/actionEventRecoverPlayerLife.cpp @@ -10,18 +10,6 @@ bool EventRecoverPlayerLife::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void EventRecoverPlayerLife::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void EventRecoverPlayerLife::leave_() { - ksys::act::ai::Action::leave_(); -} - void EventRecoverPlayerLife::loadParams_() {} -void EventRecoverPlayerLife::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionEventRecoverPlayerLife.h b/src/Game/AI/Action/actionEventRecoverPlayerLife.h index f695df44..a8260f1b 100644 --- a/src/Game/AI/Action/actionEventRecoverPlayerLife.h +++ b/src/Game/AI/Action/actionEventRecoverPlayerLife.h @@ -11,12 +11,9 @@ public: ~EventRecoverPlayerLife() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionEventRegisterToDeathConter.cpp b/src/Game/AI/Action/actionEventRegisterToDeathConter.cpp index 9169de5f..ab41049f 100644 --- a/src/Game/AI/Action/actionEventRegisterToDeathConter.cpp +++ b/src/Game/AI/Action/actionEventRegisterToDeathConter.cpp @@ -11,22 +11,10 @@ bool EventRegisterToDeathConter::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void EventRegisterToDeathConter::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void EventRegisterToDeathConter::leave_() { - ksys::act::ai::Action::leave_(); -} - void EventRegisterToDeathConter::loadParams_() { getDynamicParam(&mIsInitializeData_d, "IsInitializeData"); getDynamicParam(&mActorName_d, "ActorName"); getDynamicParam(&mGameDataName_d, "GameDataName"); } -void EventRegisterToDeathConter::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionEventRegisterToDeathConter.h b/src/Game/AI/Action/actionEventRegisterToDeathConter.h index dea65433..9dad5857 100644 --- a/src/Game/AI/Action/actionEventRegisterToDeathConter.h +++ b/src/Game/AI/Action/actionEventRegisterToDeathConter.h @@ -11,13 +11,9 @@ public: ~EventRegisterToDeathConter() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 bool* mIsInitializeData_d{}; // dynamic_param at offset 0x28 diff --git a/src/Game/AI/Action/actionEventRegisterToGetCounter.cpp b/src/Game/AI/Action/actionEventRegisterToGetCounter.cpp index 292b6a93..22be853d 100644 --- a/src/Game/AI/Action/actionEventRegisterToGetCounter.cpp +++ b/src/Game/AI/Action/actionEventRegisterToGetCounter.cpp @@ -11,22 +11,10 @@ bool EventRegisterToGetCounter::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void EventRegisterToGetCounter::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void EventRegisterToGetCounter::leave_() { - ksys::act::ai::Action::leave_(); -} - void EventRegisterToGetCounter::loadParams_() { getDynamicParam(&mIsInitializeData_d, "IsInitializeData"); getDynamicParam(&mActorName_d, "ActorName"); getDynamicParam(&mGameDataName_d, "GameDataName"); } -void EventRegisterToGetCounter::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionEventRegisterToGetCounter.h b/src/Game/AI/Action/actionEventRegisterToGetCounter.h index 1193e0ca..8b3a7b64 100644 --- a/src/Game/AI/Action/actionEventRegisterToGetCounter.h +++ b/src/Game/AI/Action/actionEventRegisterToGetCounter.h @@ -11,13 +11,9 @@ public: ~EventRegisterToGetCounter() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 bool* mIsInitializeData_d{}; // dynamic_param at offset 0x28 diff --git a/src/Game/AI/Action/actionEventResetQuestAction.cpp b/src/Game/AI/Action/actionEventResetQuestAction.cpp index f2d08f1a..95383648 100644 --- a/src/Game/AI/Action/actionEventResetQuestAction.cpp +++ b/src/Game/AI/Action/actionEventResetQuestAction.cpp @@ -10,20 +10,8 @@ bool EventResetQuestAction::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void EventResetQuestAction::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void EventResetQuestAction::leave_() { - ksys::act::ai::Action::leave_(); -} - void EventResetQuestAction::loadParams_() { getDynamicParam(&mQuestName_d, "QuestName"); } -void EventResetQuestAction::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionEventResetQuestAction.h b/src/Game/AI/Action/actionEventResetQuestAction.h index baebf4e2..530f7ff5 100644 --- a/src/Game/AI/Action/actionEventResetQuestAction.h +++ b/src/Game/AI/Action/actionEventResetQuestAction.h @@ -11,13 +11,9 @@ public: ~EventResetQuestAction() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 sead::SafeString* mQuestName_d{}; }; diff --git a/src/Game/AI/Action/actionEventRollbackQuestAction.cpp b/src/Game/AI/Action/actionEventRollbackQuestAction.cpp index 21989fcd..e5ae6bdc 100644 --- a/src/Game/AI/Action/actionEventRollbackQuestAction.cpp +++ b/src/Game/AI/Action/actionEventRollbackQuestAction.cpp @@ -11,21 +11,9 @@ bool EventRollbackQuestAction::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void EventRollbackQuestAction::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void EventRollbackQuestAction::leave_() { - ksys::act::ai::Action::leave_(); -} - void EventRollbackQuestAction::loadParams_() { getDynamicParam(&mQuestName_d, "QuestName"); getDynamicParam(&mStepName_d, "StepName"); } -void EventRollbackQuestAction::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionEventRollbackQuestAction.h b/src/Game/AI/Action/actionEventRollbackQuestAction.h index f619c76d..d991400a 100644 --- a/src/Game/AI/Action/actionEventRollbackQuestAction.h +++ b/src/Game/AI/Action/actionEventRollbackQuestAction.h @@ -11,13 +11,9 @@ public: ~EventRollbackQuestAction() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 sead::SafeString* mQuestName_d{}; // dynamic_param at offset 0x30 diff --git a/src/Game/AI/Action/actionEventSendCatchWeaponMsgToPlayer.cpp b/src/Game/AI/Action/actionEventSendCatchWeaponMsgToPlayer.cpp index 5dfbc608..e1095a35 100644 --- a/src/Game/AI/Action/actionEventSendCatchWeaponMsgToPlayer.cpp +++ b/src/Game/AI/Action/actionEventSendCatchWeaponMsgToPlayer.cpp @@ -11,18 +11,6 @@ bool EventSendCatchWeaponMsgToPlayer::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void EventSendCatchWeaponMsgToPlayer::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void EventSendCatchWeaponMsgToPlayer::leave_() { - ksys::act::ai::Action::leave_(); -} - void EventSendCatchWeaponMsgToPlayer::loadParams_() {} -void EventSendCatchWeaponMsgToPlayer::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionEventSendCatchWeaponMsgToPlayer.h b/src/Game/AI/Action/actionEventSendCatchWeaponMsgToPlayer.h index 0cb68212..a4897184 100644 --- a/src/Game/AI/Action/actionEventSendCatchWeaponMsgToPlayer.h +++ b/src/Game/AI/Action/actionEventSendCatchWeaponMsgToPlayer.h @@ -11,12 +11,9 @@ public: ~EventSendCatchWeaponMsgToPlayer() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionEventSetAttentionForbidSale.cpp b/src/Game/AI/Action/actionEventSetAttentionForbidSale.cpp index 95da574f..7e37385f 100644 --- a/src/Game/AI/Action/actionEventSetAttentionForbidSale.cpp +++ b/src/Game/AI/Action/actionEventSetAttentionForbidSale.cpp @@ -11,18 +11,6 @@ bool EventSetAttentionForbidSale::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void EventSetAttentionForbidSale::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void EventSetAttentionForbidSale::leave_() { - ksys::act::ai::Action::leave_(); -} - void EventSetAttentionForbidSale::loadParams_() {} -void EventSetAttentionForbidSale::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionEventSetAttentionForbidSale.h b/src/Game/AI/Action/actionEventSetAttentionForbidSale.h index 7ffabd01..38f6b9de 100644 --- a/src/Game/AI/Action/actionEventSetAttentionForbidSale.h +++ b/src/Game/AI/Action/actionEventSetAttentionForbidSale.h @@ -11,12 +11,9 @@ public: ~EventSetAttentionForbidSale() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionEventSetDynamic.cpp b/src/Game/AI/Action/actionEventSetDynamic.cpp index a79da4c1..434a2500 100644 --- a/src/Game/AI/Action/actionEventSetDynamic.cpp +++ b/src/Game/AI/Action/actionEventSetDynamic.cpp @@ -10,20 +10,8 @@ bool EventSetDynamic::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void EventSetDynamic::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void EventSetDynamic::leave_() { - ksys::act::ai::Action::leave_(); -} - void EventSetDynamic::loadParams_() { getAITreeVariable(&mIsChangeToFixedInDemo_a, "IsChangeToFixedInDemo"); } -void EventSetDynamic::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionEventSetDynamic.h b/src/Game/AI/Action/actionEventSetDynamic.h index 099fba91..bcc280f8 100644 --- a/src/Game/AI/Action/actionEventSetDynamic.h +++ b/src/Game/AI/Action/actionEventSetDynamic.h @@ -11,13 +11,9 @@ public: ~EventSetDynamic() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // aitree_variable at offset 0x20 bool* mIsChangeToFixedInDemo_a{}; }; diff --git a/src/Game/AI/Action/actionEventSetEnableGrass.cpp b/src/Game/AI/Action/actionEventSetEnableGrass.cpp index 05b7a1f3..d98f9422 100644 --- a/src/Game/AI/Action/actionEventSetEnableGrass.cpp +++ b/src/Game/AI/Action/actionEventSetEnableGrass.cpp @@ -10,20 +10,8 @@ bool EventSetEnableGrass::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void EventSetEnableGrass::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void EventSetEnableGrass::leave_() { - ksys::act::ai::Action::leave_(); -} - void EventSetEnableGrass::loadParams_() { getDynamicParam(&mEnable_d, "Enable"); } -void EventSetEnableGrass::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionEventSetEnableGrass.h b/src/Game/AI/Action/actionEventSetEnableGrass.h index cddd8035..32cc2f27 100644 --- a/src/Game/AI/Action/actionEventSetEnableGrass.h +++ b/src/Game/AI/Action/actionEventSetEnableGrass.h @@ -11,13 +11,9 @@ public: ~EventSetEnableGrass() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 bool* mEnable_d{}; }; diff --git a/src/Game/AI/Action/actionEventSetFixed.cpp b/src/Game/AI/Action/actionEventSetFixed.cpp index c3eee5f3..05b8548c 100644 --- a/src/Game/AI/Action/actionEventSetFixed.cpp +++ b/src/Game/AI/Action/actionEventSetFixed.cpp @@ -10,20 +10,8 @@ bool EventSetFixed::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void EventSetFixed::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void EventSetFixed::leave_() { - ksys::act::ai::Action::leave_(); -} - void EventSetFixed::loadParams_() { getAITreeVariable(&mIsChangeToFixedInDemo_a, "IsChangeToFixedInDemo"); } -void EventSetFixed::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionEventSetFixed.h b/src/Game/AI/Action/actionEventSetFixed.h index bed22075..72659691 100644 --- a/src/Game/AI/Action/actionEventSetFixed.h +++ b/src/Game/AI/Action/actionEventSetFixed.h @@ -11,13 +11,9 @@ public: ~EventSetFixed() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // aitree_variable at offset 0x20 bool* mIsChangeToFixedInDemo_a{}; }; diff --git a/src/Game/AI/Action/actionEventSetGameDataFloatAction.cpp b/src/Game/AI/Action/actionEventSetGameDataFloatAction.cpp index 22e17663..6991ddd0 100644 --- a/src/Game/AI/Action/actionEventSetGameDataFloatAction.cpp +++ b/src/Game/AI/Action/actionEventSetGameDataFloatAction.cpp @@ -11,21 +11,9 @@ bool EventSetGameDataFloatAction::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void EventSetGameDataFloatAction::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void EventSetGameDataFloatAction::leave_() { - ksys::act::ai::Action::leave_(); -} - void EventSetGameDataFloatAction::loadParams_() { getDynamicParam(&mValue_d, "Value"); getDynamicParam(&mGameDataFloatName_d, "GameDataFloatName"); } -void EventSetGameDataFloatAction::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionEventSetGameDataFloatAction.h b/src/Game/AI/Action/actionEventSetGameDataFloatAction.h index db4b258f..de623f9e 100644 --- a/src/Game/AI/Action/actionEventSetGameDataFloatAction.h +++ b/src/Game/AI/Action/actionEventSetGameDataFloatAction.h @@ -11,13 +11,9 @@ public: ~EventSetGameDataFloatAction() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 float* mValue_d{}; // dynamic_param at offset 0x28 diff --git a/src/Game/AI/Action/actionEventSetGameDataIntAction.cpp b/src/Game/AI/Action/actionEventSetGameDataIntAction.cpp index b84fbfa0..8dea022a 100644 --- a/src/Game/AI/Action/actionEventSetGameDataIntAction.cpp +++ b/src/Game/AI/Action/actionEventSetGameDataIntAction.cpp @@ -11,21 +11,9 @@ bool EventSetGameDataIntAction::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void EventSetGameDataIntAction::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void EventSetGameDataIntAction::leave_() { - ksys::act::ai::Action::leave_(); -} - void EventSetGameDataIntAction::loadParams_() { getDynamicParam(&mValue_d, "Value"); getDynamicParam(&mGameDataIntName_d, "GameDataIntName"); } -void EventSetGameDataIntAction::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionEventSetGameDataIntAction.h b/src/Game/AI/Action/actionEventSetGameDataIntAction.h index 271bae94..ea00e093 100644 --- a/src/Game/AI/Action/actionEventSetGameDataIntAction.h +++ b/src/Game/AI/Action/actionEventSetGameDataIntAction.h @@ -11,13 +11,9 @@ public: ~EventSetGameDataIntAction() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 int* mValue_d{}; // dynamic_param at offset 0x28 diff --git a/src/Game/AI/Action/actionEventSetGameDataStringAction.cpp b/src/Game/AI/Action/actionEventSetGameDataStringAction.cpp index aa2398ca..0d6fab2f 100644 --- a/src/Game/AI/Action/actionEventSetGameDataStringAction.cpp +++ b/src/Game/AI/Action/actionEventSetGameDataStringAction.cpp @@ -11,21 +11,9 @@ bool EventSetGameDataStringAction::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void EventSetGameDataStringAction::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void EventSetGameDataStringAction::leave_() { - ksys::act::ai::Action::leave_(); -} - void EventSetGameDataStringAction::loadParams_() { getDynamicParam(&mGameDataStringName_d, "GameDataStringName"); getDynamicParam(&mValue_d, "Value"); } -void EventSetGameDataStringAction::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionEventSetGameDataStringAction.h b/src/Game/AI/Action/actionEventSetGameDataStringAction.h index 4eaaa206..66f1136c 100644 --- a/src/Game/AI/Action/actionEventSetGameDataStringAction.h +++ b/src/Game/AI/Action/actionEventSetGameDataStringAction.h @@ -11,13 +11,9 @@ public: ~EventSetGameDataStringAction() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 sead::SafeString* mGameDataStringName_d{}; // dynamic_param at offset 0x30 diff --git a/src/Game/AI/Action/actionEventSetItemDataToPouch.cpp b/src/Game/AI/Action/actionEventSetItemDataToPouch.cpp index 74d145a4..16842339 100644 --- a/src/Game/AI/Action/actionEventSetItemDataToPouch.cpp +++ b/src/Game/AI/Action/actionEventSetItemDataToPouch.cpp @@ -10,22 +10,10 @@ bool EventSetItemDataToPouch::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void EventSetItemDataToPouch::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void EventSetItemDataToPouch::leave_() { - ksys::act::ai::Action::leave_(); -} - void EventSetItemDataToPouch::loadParams_() { getDynamicParam(&mSharpWeaponAddValue_d, "SharpWeaponAddValue"); getDynamicParam(&mSharpWeaponAddType_d, "SharpWeaponAddType"); getDynamicParam(&mTargetActorName_d, "TargetActorName"); } -void EventSetItemDataToPouch::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionEventSetItemDataToPouch.h b/src/Game/AI/Action/actionEventSetItemDataToPouch.h index 9bb226a3..07aab548 100644 --- a/src/Game/AI/Action/actionEventSetItemDataToPouch.h +++ b/src/Game/AI/Action/actionEventSetItemDataToPouch.h @@ -11,13 +11,9 @@ public: ~EventSetItemDataToPouch() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 int* mSharpWeaponAddValue_d{}; // dynamic_param at offset 0x28 diff --git a/src/Game/AI/Action/actionEventSleepTargetActor.cpp b/src/Game/AI/Action/actionEventSleepTargetActor.cpp index 48d4edd4..8101e756 100644 --- a/src/Game/AI/Action/actionEventSleepTargetActor.cpp +++ b/src/Game/AI/Action/actionEventSleepTargetActor.cpp @@ -10,21 +10,9 @@ bool EventSleepTargetActor::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void EventSleepTargetActor::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void EventSleepTargetActor::leave_() { - ksys::act::ai::Action::leave_(); -} - void EventSleepTargetActor::loadParams_() { getDynamicParam(&mActorName_d, "ActorName"); getDynamicParam(&mInstanceName_d, "InstanceName"); } -void EventSleepTargetActor::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionEventSleepTargetActor.h b/src/Game/AI/Action/actionEventSleepTargetActor.h index eac909ca..653a5b34 100644 --- a/src/Game/AI/Action/actionEventSleepTargetActor.h +++ b/src/Game/AI/Action/actionEventSleepTargetActor.h @@ -11,13 +11,9 @@ public: ~EventSleepTargetActor() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 sead::SafeString* mActorName_d{}; // dynamic_param at offset 0x30 diff --git a/src/Game/AI/Action/actionEventSuccessGet.cpp b/src/Game/AI/Action/actionEventSuccessGet.cpp index 846f7d74..9700a512 100644 --- a/src/Game/AI/Action/actionEventSuccessGet.cpp +++ b/src/Game/AI/Action/actionEventSuccessGet.cpp @@ -10,18 +10,6 @@ bool EventSuccessGet::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void EventSuccessGet::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void EventSuccessGet::leave_() { - ksys::act::ai::Action::leave_(); -} - void EventSuccessGet::loadParams_() {} -void EventSuccessGet::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionEventSuccessGet.h b/src/Game/AI/Action/actionEventSuccessGet.h index b945d9b4..4dee2798 100644 --- a/src/Game/AI/Action/actionEventSuccessGet.h +++ b/src/Game/AI/Action/actionEventSuccessGet.h @@ -11,12 +11,9 @@ public: ~EventSuccessGet() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionEventTrigNullASPlay.cpp b/src/Game/AI/Action/actionEventTrigNullASPlay.cpp index ac40f317..2c96305f 100644 --- a/src/Game/AI/Action/actionEventTrigNullASPlay.cpp +++ b/src/Game/AI/Action/actionEventTrigNullASPlay.cpp @@ -10,14 +10,6 @@ bool EventTrigNullASPlay::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void EventTrigNullASPlay::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void EventTrigNullASPlay::leave_() { - ksys::act::ai::Action::leave_(); -} - void EventTrigNullASPlay::loadParams_() { getDynamicParam(&mASSlot_d, "ASSlot"); getDynamicParam(&mSequenceBank_d, "SequenceBank"); @@ -25,8 +17,4 @@ void EventTrigNullASPlay::loadParams_() { getDynamicParam(&mASName_d, "ASName"); } -void EventTrigNullASPlay::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionEventTrigNullASPlay.h b/src/Game/AI/Action/actionEventTrigNullASPlay.h index a7408e43..a414b00d 100644 --- a/src/Game/AI/Action/actionEventTrigNullASPlay.h +++ b/src/Game/AI/Action/actionEventTrigNullASPlay.h @@ -11,13 +11,9 @@ public: ~EventTrigNullASPlay() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 int* mASSlot_d{}; // dynamic_param at offset 0x28 diff --git a/src/Game/AI/Action/actionEventUnregisterFromDeathCounter.cpp b/src/Game/AI/Action/actionEventUnregisterFromDeathCounter.cpp index 58bb4f1d..7faf47fc 100644 --- a/src/Game/AI/Action/actionEventUnregisterFromDeathCounter.cpp +++ b/src/Game/AI/Action/actionEventUnregisterFromDeathCounter.cpp @@ -11,20 +11,8 @@ bool EventUnregisterFromDeathCounter::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void EventUnregisterFromDeathCounter::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void EventUnregisterFromDeathCounter::leave_() { - ksys::act::ai::Action::leave_(); -} - void EventUnregisterFromDeathCounter::loadParams_() { getDynamicParam(&mActorName_d, "ActorName"); } -void EventUnregisterFromDeathCounter::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionEventUnregisterFromDeathCounter.h b/src/Game/AI/Action/actionEventUnregisterFromDeathCounter.h index 1569b225..4c764c30 100644 --- a/src/Game/AI/Action/actionEventUnregisterFromDeathCounter.h +++ b/src/Game/AI/Action/actionEventUnregisterFromDeathCounter.h @@ -11,13 +11,9 @@ public: ~EventUnregisterFromDeathCounter() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 sead::SafeString* mActorName_d{}; }; diff --git a/src/Game/AI/Action/actionEventUnregisterFromGetCounter.cpp b/src/Game/AI/Action/actionEventUnregisterFromGetCounter.cpp index 814150a4..d595563e 100644 --- a/src/Game/AI/Action/actionEventUnregisterFromGetCounter.cpp +++ b/src/Game/AI/Action/actionEventUnregisterFromGetCounter.cpp @@ -11,20 +11,8 @@ bool EventUnregisterFromGetCounter::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void EventUnregisterFromGetCounter::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void EventUnregisterFromGetCounter::leave_() { - ksys::act::ai::Action::leave_(); -} - void EventUnregisterFromGetCounter::loadParams_() { getDynamicParam(&mActorName_d, "ActorName"); } -void EventUnregisterFromGetCounter::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionEventUnregisterFromGetCounter.h b/src/Game/AI/Action/actionEventUnregisterFromGetCounter.h index 38090b6b..8af1dbac 100644 --- a/src/Game/AI/Action/actionEventUnregisterFromGetCounter.h +++ b/src/Game/AI/Action/actionEventUnregisterFromGetCounter.h @@ -11,13 +11,9 @@ public: ~EventUnregisterFromGetCounter() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 sead::SafeString* mActorName_d{}; }; diff --git a/src/Game/AI/Action/actionEventUpdateMiniGameBestScore.cpp b/src/Game/AI/Action/actionEventUpdateMiniGameBestScore.cpp index 776741ba..02a2d5d9 100644 --- a/src/Game/AI/Action/actionEventUpdateMiniGameBestScore.cpp +++ b/src/Game/AI/Action/actionEventUpdateMiniGameBestScore.cpp @@ -11,20 +11,8 @@ bool EventUpdateMiniGameBestScore::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void EventUpdateMiniGameBestScore::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void EventUpdateMiniGameBestScore::leave_() { - ksys::act::ai::Action::leave_(); -} - void EventUpdateMiniGameBestScore::loadParams_() { getDynamicParam(&mType_d, "Type"); } -void EventUpdateMiniGameBestScore::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionEventUpdateMiniGameBestScore.h b/src/Game/AI/Action/actionEventUpdateMiniGameBestScore.h index 9d84845b..ad1c949e 100644 --- a/src/Game/AI/Action/actionEventUpdateMiniGameBestScore.h +++ b/src/Game/AI/Action/actionEventUpdateMiniGameBestScore.h @@ -11,13 +11,9 @@ public: ~EventUpdateMiniGameBestScore() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 int* mType_d{}; }; diff --git a/src/Game/AI/Action/actionFall.cpp b/src/Game/AI/Action/actionFall.cpp index e59af6d0..96135402 100644 --- a/src/Game/AI/Action/actionFall.cpp +++ b/src/Game/AI/Action/actionFall.cpp @@ -6,10 +6,6 @@ Fall::Fall(const InitArg& arg) : ActionEx(arg) {} Fall::~Fall() = default; -bool Fall::init_(sead::Heap* heap) { - return ActionEx::init_(heap); -} - void Fall::enter_(ksys::act::ai::InlineParamPack* params) { ActionEx::enter_(params); } diff --git a/src/Game/AI/Action/actionFall.h b/src/Game/AI/Action/actionFall.h index d2337614..8da39c7e 100644 --- a/src/Game/AI/Action/actionFall.h +++ b/src/Game/AI/Action/actionFall.h @@ -11,7 +11,6 @@ public: explicit Fall(const InitArg& arg); ~Fall() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionFlyingBalloonObserverTag.cpp b/src/Game/AI/Action/actionFlyingBalloonObserverTag.cpp index 2e78a9bc..39a3e5de 100644 --- a/src/Game/AI/Action/actionFlyingBalloonObserverTag.cpp +++ b/src/Game/AI/Action/actionFlyingBalloonObserverTag.cpp @@ -19,12 +19,6 @@ void FlyingBalloonObserverTag::leave_() { AreaObserveActorAction::leave_(); } -void FlyingBalloonObserverTag::loadParams_() { - getMapUnitParam(&mCount_m, "Count"); - getMapUnitParam(&mIsSendMessage_m, "IsSendMessage"); - getMapUnitParam(&mDefaultBasicSignal_m, "DefaultBasicSignal"); -} - void FlyingBalloonObserverTag::calc_() { AreaObserveActorAction::calc_(); } diff --git a/src/Game/AI/Action/actionFlyingBalloonObserverTag.h b/src/Game/AI/Action/actionFlyingBalloonObserverTag.h index 7425ec55..ab57aedd 100644 --- a/src/Game/AI/Action/actionFlyingBalloonObserverTag.h +++ b/src/Game/AI/Action/actionFlyingBalloonObserverTag.h @@ -14,17 +14,9 @@ public: bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; - void loadParams_() override; protected: void calc_() override; - - // map_unit_param at offset 0x38 - const int* mCount_m{}; - // map_unit_param at offset 0x40 - const bool* mIsSendMessage_m{}; - // map_unit_param at offset 0x48 - const bool* mDefaultBasicSignal_m{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionFlyingCharacterDamage.cpp b/src/Game/AI/Action/actionFlyingCharacterDamage.cpp index 027af30b..cd65636d 100644 --- a/src/Game/AI/Action/actionFlyingCharacterDamage.cpp +++ b/src/Game/AI/Action/actionFlyingCharacterDamage.cpp @@ -4,8 +4,6 @@ namespace uking::action { FlyingCharacterDamage::FlyingCharacterDamage(const InitArg& arg) : FlyingCharacterDamageBase(arg) {} -FlyingCharacterDamage::~FlyingCharacterDamage() = default; - bool FlyingCharacterDamage::init_(sead::Heap* heap) { return FlyingCharacterDamageBase::init_(heap); } diff --git a/src/Game/AI/Action/actionFlyingCharacterDamage.h b/src/Game/AI/Action/actionFlyingCharacterDamage.h index 7ac560e7..269b72bd 100644 --- a/src/Game/AI/Action/actionFlyingCharacterDamage.h +++ b/src/Game/AI/Action/actionFlyingCharacterDamage.h @@ -9,7 +9,6 @@ class FlyingCharacterDamage : public FlyingCharacterDamageBase { SEAD_RTTI_OVERRIDE(FlyingCharacterDamage, FlyingCharacterDamageBase) public: explicit FlyingCharacterDamage(const InitArg& arg); - ~FlyingCharacterDamage() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/AI/Action/actionFlyingCharacterDie.cpp b/src/Game/AI/Action/actionFlyingCharacterDie.cpp index a9a9f4ad..0f52623d 100644 --- a/src/Game/AI/Action/actionFlyingCharacterDie.cpp +++ b/src/Game/AI/Action/actionFlyingCharacterDie.cpp @@ -4,8 +4,6 @@ namespace uking::action { FlyingCharacterDie::FlyingCharacterDie(const InitArg& arg) : FlyingCharacterDamageBase(arg) {} -FlyingCharacterDie::~FlyingCharacterDie() = default; - bool FlyingCharacterDie::init_(sead::Heap* heap) { return FlyingCharacterDamageBase::init_(heap); } diff --git a/src/Game/AI/Action/actionFlyingCharacterDie.h b/src/Game/AI/Action/actionFlyingCharacterDie.h index d0326420..4ab1bea0 100644 --- a/src/Game/AI/Action/actionFlyingCharacterDie.h +++ b/src/Game/AI/Action/actionFlyingCharacterDie.h @@ -9,7 +9,6 @@ class FlyingCharacterDie : public FlyingCharacterDamageBase { SEAD_RTTI_OVERRIDE(FlyingCharacterDie, FlyingCharacterDamageBase) public: explicit FlyingCharacterDie(const InitArg& arg); - ~FlyingCharacterDie() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/AI/Action/actionForbidSettingInstEventFlag.cpp b/src/Game/AI/Action/actionForbidSettingInstEventFlag.cpp index 1e2d3277..40544818 100644 --- a/src/Game/AI/Action/actionForbidSettingInstEventFlag.cpp +++ b/src/Game/AI/Action/actionForbidSettingInstEventFlag.cpp @@ -11,18 +11,6 @@ bool ForbidSettingInstEventFlag::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void ForbidSettingInstEventFlag::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void ForbidSettingInstEventFlag::leave_() { - ksys::act::ai::Action::leave_(); -} - void ForbidSettingInstEventFlag::loadParams_() {} -void ForbidSettingInstEventFlag::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionForbidSettingInstEventFlag.h b/src/Game/AI/Action/actionForbidSettingInstEventFlag.h index dba53278..765beb72 100644 --- a/src/Game/AI/Action/actionForbidSettingInstEventFlag.h +++ b/src/Game/AI/Action/actionForbidSettingInstEventFlag.h @@ -11,12 +11,9 @@ public: ~ForbidSettingInstEventFlag() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionForceChangeAction.cpp b/src/Game/AI/Action/actionForceChangeAction.cpp index 3a7d1877..c4e67bcb 100644 --- a/src/Game/AI/Action/actionForceChangeAction.cpp +++ b/src/Game/AI/Action/actionForceChangeAction.cpp @@ -6,10 +6,6 @@ ForceChangeAction::ForceChangeAction(const InitArg& arg) : ksys::act::ai::Action ForceChangeAction::~ForceChangeAction() = default; -bool ForceChangeAction::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - void ForceChangeAction::enter_(ksys::act::ai::InlineParamPack* params) { ksys::act::ai::Action::enter_(params); } diff --git a/src/Game/AI/Action/actionForceChangeAction.h b/src/Game/AI/Action/actionForceChangeAction.h index dbed875d..8f8021eb 100644 --- a/src/Game/AI/Action/actionForceChangeAction.h +++ b/src/Game/AI/Action/actionForceChangeAction.h @@ -10,7 +10,6 @@ public: explicit ForceChangeAction(const InitArg& arg); ~ForceChangeAction() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionForceEndPlayerSlow.cpp b/src/Game/AI/Action/actionForceEndPlayerSlow.cpp index 2fbf0eb2..9a59a471 100644 --- a/src/Game/AI/Action/actionForceEndPlayerSlow.cpp +++ b/src/Game/AI/Action/actionForceEndPlayerSlow.cpp @@ -10,18 +10,6 @@ bool ForceEndPlayerSlow::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void ForceEndPlayerSlow::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void ForceEndPlayerSlow::leave_() { - ksys::act::ai::Action::leave_(); -} - void ForceEndPlayerSlow::loadParams_() {} -void ForceEndPlayerSlow::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionForceEndPlayerSlow.h b/src/Game/AI/Action/actionForceEndPlayerSlow.h index 365252c0..bc3055a3 100644 --- a/src/Game/AI/Action/actionForceEndPlayerSlow.h +++ b/src/Game/AI/Action/actionForceEndPlayerSlow.h @@ -11,12 +11,9 @@ public: ~ForceEndPlayerSlow() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionForceGetUpWaterFloatFreeze.cpp b/src/Game/AI/Action/actionForceGetUpWaterFloatFreeze.cpp index ee6c0900..42770daf 100644 --- a/src/Game/AI/Action/actionForceGetUpWaterFloatFreeze.cpp +++ b/src/Game/AI/Action/actionForceGetUpWaterFloatFreeze.cpp @@ -8,7 +8,7 @@ ForceGetUpWaterFloatFreeze::ForceGetUpWaterFloatFreeze(const InitArg& arg) ForceGetUpWaterFloatFreeze::~ForceGetUpWaterFloatFreeze() = default; bool ForceGetUpWaterFloatFreeze::init_(sead::Heap* heap) { - return WaterFloatImmobile::init_(heap); // NOLINT(bugprone-parent-virtual-call) + return WaterFloatFreeze::init_(heap); } void ForceGetUpWaterFloatFreeze::enter_(ksys::act::ai::InlineParamPack* params) { diff --git a/src/Game/AI/Action/actionForceMarkPosition.cpp b/src/Game/AI/Action/actionForceMarkPosition.cpp index d1702e96..4df16bde 100644 --- a/src/Game/AI/Action/actionForceMarkPosition.cpp +++ b/src/Game/AI/Action/actionForceMarkPosition.cpp @@ -10,20 +10,8 @@ bool ForceMarkPosition::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void ForceMarkPosition::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void ForceMarkPosition::leave_() { - ksys::act::ai::Action::leave_(); -} - void ForceMarkPosition::loadParams_() { getDynamicParam(&mPinColorIdx_d, "PinColorIdx"); } -void ForceMarkPosition::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionForceMarkPosition.h b/src/Game/AI/Action/actionForceMarkPosition.h index ec716580..263c393a 100644 --- a/src/Game/AI/Action/actionForceMarkPosition.h +++ b/src/Game/AI/Action/actionForceMarkPosition.h @@ -11,13 +11,9 @@ public: ~ForceMarkPosition() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 int* mPinColorIdx_d{}; }; diff --git a/src/Game/AI/Action/actionForceMasterSwordFakeMode.cpp b/src/Game/AI/Action/actionForceMasterSwordFakeMode.cpp index 10395ffd..29f986f9 100644 --- a/src/Game/AI/Action/actionForceMasterSwordFakeMode.cpp +++ b/src/Game/AI/Action/actionForceMasterSwordFakeMode.cpp @@ -11,18 +11,6 @@ bool ForceMasterSwordFakeMode::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void ForceMasterSwordFakeMode::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void ForceMasterSwordFakeMode::leave_() { - ksys::act::ai::Action::leave_(); -} - void ForceMasterSwordFakeMode::loadParams_() {} -void ForceMasterSwordFakeMode::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionForceMasterSwordFakeMode.h b/src/Game/AI/Action/actionForceMasterSwordFakeMode.h index d7eafd5b..bab72dc2 100644 --- a/src/Game/AI/Action/actionForceMasterSwordFakeMode.h +++ b/src/Game/AI/Action/actionForceMasterSwordFakeMode.h @@ -11,12 +11,9 @@ public: ~ForceMasterSwordFakeMode() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionForceOffMagneGrabbed.cpp b/src/Game/AI/Action/actionForceOffMagneGrabbed.cpp index c6436391..4b110dad 100644 --- a/src/Game/AI/Action/actionForceOffMagneGrabbed.cpp +++ b/src/Game/AI/Action/actionForceOffMagneGrabbed.cpp @@ -10,18 +10,6 @@ bool ForceOffMagneGrabbed::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void ForceOffMagneGrabbed::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void ForceOffMagneGrabbed::leave_() { - ksys::act::ai::Action::leave_(); -} - void ForceOffMagneGrabbed::loadParams_() {} -void ForceOffMagneGrabbed::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionForceOffMagneGrabbed.h b/src/Game/AI/Action/actionForceOffMagneGrabbed.h index 10e92977..23289c2c 100644 --- a/src/Game/AI/Action/actionForceOffMagneGrabbed.h +++ b/src/Game/AI/Action/actionForceOffMagneGrabbed.h @@ -11,12 +11,9 @@ public: ~ForceOffMagneGrabbed() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionForceOpenMainScreen.cpp b/src/Game/AI/Action/actionForceOpenMainScreen.cpp index 3b5302ec..235a102f 100644 --- a/src/Game/AI/Action/actionForceOpenMainScreen.cpp +++ b/src/Game/AI/Action/actionForceOpenMainScreen.cpp @@ -10,18 +10,6 @@ bool ForceOpenMainScreen::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void ForceOpenMainScreen::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void ForceOpenMainScreen::leave_() { - ksys::act::ai::Action::leave_(); -} - void ForceOpenMainScreen::loadParams_() {} -void ForceOpenMainScreen::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionForceOpenMainScreen.h b/src/Game/AI/Action/actionForceOpenMainScreen.h index 2e816db9..f79b75e5 100644 --- a/src/Game/AI/Action/actionForceOpenMainScreen.h +++ b/src/Game/AI/Action/actionForceOpenMainScreen.h @@ -11,12 +11,9 @@ public: ~ForceOpenMainScreen() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionForceRagdollOffWaterFloatFreeze.cpp b/src/Game/AI/Action/actionForceRagdollOffWaterFloatFreeze.cpp index d5c15bfa..dc5c43db 100644 --- a/src/Game/AI/Action/actionForceRagdollOffWaterFloatFreeze.cpp +++ b/src/Game/AI/Action/actionForceRagdollOffWaterFloatFreeze.cpp @@ -15,17 +15,9 @@ void ForceRagdollOffWaterFloatFreeze::enter_(ksys::act::ai::InlineParamPack* par WaterFloatFreeze::enter_(params); } -void ForceRagdollOffWaterFloatFreeze::leave_() { - WaterFloatFreeze::leave_(); -} - void ForceRagdollOffWaterFloatFreeze::loadParams_() { WaterFloatFreeze::loadParams_(); getAITreeVariable(&mCRBOffsetUnit_a, "CRBOffsetUnit"); } -void ForceRagdollOffWaterFloatFreeze::calc_() { - WaterFloatFreeze::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionForceRagdollOffWaterFloatFreeze.h b/src/Game/AI/Action/actionForceRagdollOffWaterFloatFreeze.h index 5af05e34..905dfd2f 100644 --- a/src/Game/AI/Action/actionForceRagdollOffWaterFloatFreeze.h +++ b/src/Game/AI/Action/actionForceRagdollOffWaterFloatFreeze.h @@ -13,12 +13,9 @@ public: bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // aitree_variable at offset 0x78 void* mCRBOffsetUnit_a{}; }; diff --git a/src/Game/AI/Action/actionForceSetPlayerRestartPosAngle.cpp b/src/Game/AI/Action/actionForceSetPlayerRestartPosAngle.cpp index 5a9323b9..7f07a79f 100644 --- a/src/Game/AI/Action/actionForceSetPlayerRestartPosAngle.cpp +++ b/src/Game/AI/Action/actionForceSetPlayerRestartPosAngle.cpp @@ -11,21 +11,9 @@ bool ForceSetPlayerRestartPosAngle::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void ForceSetPlayerRestartPosAngle::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void ForceSetPlayerRestartPosAngle::leave_() { - ksys::act::ai::Action::leave_(); -} - void ForceSetPlayerRestartPosAngle::loadParams_() { getDynamicParam(&mUniqueName_d, "UniqueName"); getDynamicParam(&mAnchorName_d, "AnchorName"); } -void ForceSetPlayerRestartPosAngle::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionForceSetPlayerRestartPosAngle.h b/src/Game/AI/Action/actionForceSetPlayerRestartPosAngle.h index 338279d4..ae1b3f2b 100644 --- a/src/Game/AI/Action/actionForceSetPlayerRestartPosAngle.h +++ b/src/Game/AI/Action/actionForceSetPlayerRestartPosAngle.h @@ -11,13 +11,9 @@ public: ~ForceSetPlayerRestartPosAngle() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 sead::SafeString* mUniqueName_d{}; // dynamic_param at offset 0x30 diff --git a/src/Game/AI/Action/actionForkASPlay.cpp b/src/Game/AI/Action/actionForkASPlay.cpp index 06a95960..352b70fc 100644 --- a/src/Game/AI/Action/actionForkASPlay.cpp +++ b/src/Game/AI/Action/actionForkASPlay.cpp @@ -6,25 +6,9 @@ ForkASPlay::ForkASPlay(const InitArg& arg) : ForkASPlayBase(arg) {} ForkASPlay::~ForkASPlay() = default; -bool ForkASPlay::init_(sead::Heap* heap) { - return ForkASPlayBase::init_(heap); -} - -void ForkASPlay::enter_(ksys::act::ai::InlineParamPack* params) { - ForkASPlayBase::enter_(params); -} - -void ForkASPlay::leave_() { - ForkASPlayBase::leave_(); -} - void ForkASPlay::loadParams_() { ForkASPlayBase::loadParams_(); getStaticParam(&mASName_s, "ASName"); } -void ForkASPlay::calc_() { - ForkASPlayBase::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionForkASPlay.h b/src/Game/AI/Action/actionForkASPlay.h index 33bb790a..bbf664a3 100644 --- a/src/Game/AI/Action/actionForkASPlay.h +++ b/src/Game/AI/Action/actionForkASPlay.h @@ -11,14 +11,9 @@ public: explicit ForkASPlay(const InitArg& arg); ~ForkASPlay() override; - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // static_param at offset 0x50 sead::SafeString mASName_s{}; }; diff --git a/src/Game/AI/Action/actionForkASTrgDeleteChild.cpp b/src/Game/AI/Action/actionForkASTrgDeleteChild.cpp index b863e481..9d6c83b1 100644 --- a/src/Game/AI/Action/actionForkASTrgDeleteChild.cpp +++ b/src/Game/AI/Action/actionForkASTrgDeleteChild.cpp @@ -6,22 +6,4 @@ ForkASTrgDeleteChild::ForkASTrgDeleteChild(const InitArg& arg) : ForkASTrgDelete ForkASTrgDeleteChild::~ForkASTrgDeleteChild() = default; -bool ForkASTrgDeleteChild::init_(sead::Heap* heap) { - return ForkASTrgDelete::init_(heap); -} - -void ForkASTrgDeleteChild::enter_(ksys::act::ai::InlineParamPack* params) { - ForkASTrgDelete::enter_(params); -} - -void ForkASTrgDeleteChild::leave_() { - ForkASTrgDelete::leave_(); -} - -void ForkASTrgDeleteChild::loadParams_() {} - -void ForkASTrgDeleteChild::calc_() { - ForkASTrgDelete::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionForkASTrgDeleteChild.h b/src/Game/AI/Action/actionForkASTrgDeleteChild.h index 134f90b5..2ebce3e7 100644 --- a/src/Game/AI/Action/actionForkASTrgDeleteChild.h +++ b/src/Game/AI/Action/actionForkASTrgDeleteChild.h @@ -11,13 +11,7 @@ public: explicit ForkASTrgDeleteChild(const InitArg& arg); ~ForkASTrgDeleteChild() override; - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; - protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionForkASTrgDeleteEquip.cpp b/src/Game/AI/Action/actionForkASTrgDeleteEquip.cpp index 20841047..cc99a48f 100644 --- a/src/Game/AI/Action/actionForkASTrgDeleteEquip.cpp +++ b/src/Game/AI/Action/actionForkASTrgDeleteEquip.cpp @@ -6,25 +6,9 @@ ForkASTrgDeleteEquip::ForkASTrgDeleteEquip(const InitArg& arg) : ForkASTrgDelete ForkASTrgDeleteEquip::~ForkASTrgDeleteEquip() = default; -bool ForkASTrgDeleteEquip::init_(sead::Heap* heap) { - return ForkASTrgDelete::init_(heap); -} - -void ForkASTrgDeleteEquip::enter_(ksys::act::ai::InlineParamPack* params) { - ForkASTrgDelete::enter_(params); -} - -void ForkASTrgDeleteEquip::leave_() { - ForkASTrgDelete::leave_(); -} - void ForkASTrgDeleteEquip::loadParams_() { ForkASTrgDelete::loadParams_(); getStaticParam(&mWeaponIdx_s, "WeaponIdx"); } -void ForkASTrgDeleteEquip::calc_() { - ForkASTrgDelete::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionForkASTrgDeleteEquip.h b/src/Game/AI/Action/actionForkASTrgDeleteEquip.h index dd99e94d..fd278b2d 100644 --- a/src/Game/AI/Action/actionForkASTrgDeleteEquip.h +++ b/src/Game/AI/Action/actionForkASTrgDeleteEquip.h @@ -11,14 +11,9 @@ public: explicit ForkASTrgDeleteEquip(const InitArg& arg); ~ForkASTrgDeleteEquip() override; - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // static_param at offset 0x20 const int* mWeaponIdx_s{}; }; diff --git a/src/Game/AI/Action/actionForkAttackWithWeaponOrWithout.cpp b/src/Game/AI/Action/actionForkAttackWithWeaponOrWithout.cpp index 6d41b34f..9734682d 100644 --- a/src/Game/AI/Action/actionForkAttackWithWeaponOrWithout.cpp +++ b/src/Game/AI/Action/actionForkAttackWithWeaponOrWithout.cpp @@ -7,18 +7,10 @@ ForkAttackWithWeaponOrWithout::ForkAttackWithWeaponOrWithout(const InitArg& arg) ForkAttackWithWeaponOrWithout::~ForkAttackWithWeaponOrWithout() = default; -bool ForkAttackWithWeaponOrWithout::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - void ForkAttackWithWeaponOrWithout::enter_(ksys::act::ai::InlineParamPack* params) { ksys::act::ai::Action::enter_(params); } -void ForkAttackWithWeaponOrWithout::leave_() { - ksys::act::ai::Action::leave_(); -} - void ForkAttackWithWeaponOrWithout::loadParams_() { getStaticParam(&mAttackIntensity_s, "AttackIntensity"); getStaticParam(&mIsGuardPierce_s, "IsGuardPierce"); @@ -28,8 +20,4 @@ void ForkAttackWithWeaponOrWithout::loadParams_() { getStaticParam(&mIsHammer_s, "IsHammer"); } -void ForkAttackWithWeaponOrWithout::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionForkAttackWithWeaponOrWithout.h b/src/Game/AI/Action/actionForkAttackWithWeaponOrWithout.h index 78ea34f5..886b6698 100644 --- a/src/Game/AI/Action/actionForkAttackWithWeaponOrWithout.h +++ b/src/Game/AI/Action/actionForkAttackWithWeaponOrWithout.h @@ -10,14 +10,10 @@ public: explicit ForkAttackWithWeaponOrWithout(const InitArg& arg); ~ForkAttackWithWeaponOrWithout() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // static_param at offset 0x20 const int* mAttackIntensity_s{}; // static_param at offset 0x28 diff --git a/src/Game/AI/Action/actionForkDropWeaponWithSpeed.cpp b/src/Game/AI/Action/actionForkDropWeaponWithSpeed.cpp index 2deecda5..fba0d9d9 100644 --- a/src/Game/AI/Action/actionForkDropWeaponWithSpeed.cpp +++ b/src/Game/AI/Action/actionForkDropWeaponWithSpeed.cpp @@ -6,26 +6,6 @@ ForkDropWeaponWithSpeed::ForkDropWeaponWithSpeed(const InitArg& arg) : ForkDropW ForkDropWeaponWithSpeed::~ForkDropWeaponWithSpeed() = default; -bool ForkDropWeaponWithSpeed::init_(sead::Heap* heap) { - return ForkDropWeapon::init_(heap); -} - -void ForkDropWeaponWithSpeed::enter_(ksys::act::ai::InlineParamPack* params) { - ForkDropWeapon::enter_(params); -} - -void ForkDropWeaponWithSpeed::leave_() { - ForkDropWeapon::leave_(); -} - -void ForkDropWeaponWithSpeed::loadParams_() { - getStaticParam(&mWeaponIdx_s, "WeaponIdx"); - getStaticParam(&mWeaponDropSpeedXZ_s, "WeaponDropSpeedXZ"); - getStaticParam(&mWeaponDropSpeedY_s, "WeaponDropSpeedY"); - getStaticParam(&mAngleOffsetY_s, "AngleOffsetY"); - getStaticParam(&mChemReset_s, "ChemReset"); -} - void ForkDropWeaponWithSpeed::calc_() { ForkDropWeapon::calc_(); } diff --git a/src/Game/AI/Action/actionForkDropWeaponWithSpeed.h b/src/Game/AI/Action/actionForkDropWeaponWithSpeed.h index 6f840e0a..3e438da6 100644 --- a/src/Game/AI/Action/actionForkDropWeaponWithSpeed.h +++ b/src/Game/AI/Action/actionForkDropWeaponWithSpeed.h @@ -11,24 +11,8 @@ public: explicit ForkDropWeaponWithSpeed(const InitArg& arg); ~ForkDropWeaponWithSpeed() override; - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; - protected: void calc_() override; - - // static_param at offset 0x20 - const int* mWeaponIdx_s{}; - // static_param at offset 0x28 - const float* mWeaponDropSpeedXZ_s{}; - // static_param at offset 0x30 - const float* mWeaponDropSpeedY_s{}; - // static_param at offset 0x38 - const float* mAngleOffsetY_s{}; - // static_param at offset 0x40 - const bool* mChemReset_s{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionForkNoCountActionReservedTimer.cpp b/src/Game/AI/Action/actionForkNoCountActionReservedTimer.cpp index 06a7fcf7..a6809605 100644 --- a/src/Game/AI/Action/actionForkNoCountActionReservedTimer.cpp +++ b/src/Game/AI/Action/actionForkNoCountActionReservedTimer.cpp @@ -8,7 +8,7 @@ ForkNoCountActionReservedTimer::ForkNoCountActionReservedTimer(const InitArg& ar ForkNoCountActionReservedTimer::~ForkNoCountActionReservedTimer() = default; bool ForkNoCountActionReservedTimer::init_(sead::Heap* heap) { - return ForkTimerBase::init_(heap); // NOLINT(bugprone-parent-virtual-call) + return ForkTimer::init_(heap); } void ForkNoCountActionReservedTimer::enter_(ksys::act::ai::InlineParamPack* params) { @@ -16,7 +16,7 @@ void ForkNoCountActionReservedTimer::enter_(ksys::act::ai::InlineParamPack* para } void ForkNoCountActionReservedTimer::leave_() { - ForkTimerBase::leave_(); // NOLINT(bugprone-parent-virtual-call) + ForkTimer::leave_(); } void ForkNoCountActionReservedTimer::loadParams_() { diff --git a/src/Game/AI/Action/actionForkNoSlowTimer.cpp b/src/Game/AI/Action/actionForkNoSlowTimer.cpp index 49aac0b9..0d8c50e2 100644 --- a/src/Game/AI/Action/actionForkNoSlowTimer.cpp +++ b/src/Game/AI/Action/actionForkNoSlowTimer.cpp @@ -7,7 +7,7 @@ ForkNoSlowTimer::ForkNoSlowTimer(const InitArg& arg) : ForkTimer(arg) {} ForkNoSlowTimer::~ForkNoSlowTimer() = default; bool ForkNoSlowTimer::init_(sead::Heap* heap) { - return ForkTimerBase::init_(heap); // NOLINT(bugprone-parent-virtual-call) + return ForkTimer::init_(heap); } void ForkNoSlowTimer::enter_(ksys::act::ai::InlineParamPack* params) { @@ -15,7 +15,7 @@ void ForkNoSlowTimer::enter_(ksys::act::ai::InlineParamPack* params) { } void ForkNoSlowTimer::leave_() { - ForkTimerBase::leave_(); // NOLINT(bugprone-parent-virtual-call) + ForkTimer::leave_(); } void ForkNoSlowTimer::loadParams_() { diff --git a/src/Game/AI/Action/actionForkTimer.cpp b/src/Game/AI/Action/actionForkTimer.cpp index 875ecbdd..1a3ca4f7 100644 --- a/src/Game/AI/Action/actionForkTimer.cpp +++ b/src/Game/AI/Action/actionForkTimer.cpp @@ -6,26 +6,10 @@ ForkTimer::ForkTimer(const InitArg& arg) : ForkTimerBase(arg) {} ForkTimer::~ForkTimer() = default; -bool ForkTimer::init_(sead::Heap* heap) { - return ForkTimerBase::init_(heap); -} - -void ForkTimer::enter_(ksys::act::ai::InlineParamPack* params) { - ForkTimerBase::enter_(params); -} - -void ForkTimer::leave_() { - ForkTimerBase::leave_(); -} - void ForkTimer::loadParams_() { ForkTimerBase::loadParams_(); getStaticParam(&mWaitFrame_s, "WaitFrame"); getStaticParam(&mWaitFrameRand_s, "WaitFrameRand"); } -void ForkTimer::calc_() { - ForkTimerBase::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionForkTimer.h b/src/Game/AI/Action/actionForkTimer.h index 77b5b24d..ac250936 100644 --- a/src/Game/AI/Action/actionForkTimer.h +++ b/src/Game/AI/Action/actionForkTimer.h @@ -11,14 +11,9 @@ public: explicit ForkTimer(const InitArg& arg); ~ForkTimer() override; - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // static_param at offset 0x38 const int* mWaitFrame_s{}; // static_param at offset 0x40 diff --git a/src/Game/AI/Action/actionForkTimerForceResetCondition.cpp b/src/Game/AI/Action/actionForkTimerForceResetCondition.cpp index e370d177..e08656f0 100644 --- a/src/Game/AI/Action/actionForkTimerForceResetCondition.cpp +++ b/src/Game/AI/Action/actionForkTimerForceResetCondition.cpp @@ -7,7 +7,7 @@ ForkTimerForceResetCondition::ForkTimerForceResetCondition(const InitArg& arg) : ForkTimerForceResetCondition::~ForkTimerForceResetCondition() = default; bool ForkTimerForceResetCondition::init_(sead::Heap* heap) { - return ForkTimerBase::init_(heap); // NOLINT(bugprone-parent-virtual-call) + return ForkTimer::init_(heap); } void ForkTimerForceResetCondition::enter_(ksys::act::ai::InlineParamPack* params) { @@ -15,7 +15,7 @@ void ForkTimerForceResetCondition::enter_(ksys::act::ai::InlineParamPack* params } void ForkTimerForceResetCondition::leave_() { - ForkTimerBase::leave_(); // NOLINT(bugprone-parent-virtual-call) + ForkTimer::leave_(); } void ForkTimerForceResetCondition::loadParams_() { diff --git a/src/Game/AI/Action/actionForkTogglePriestBossFreeMoving.cpp b/src/Game/AI/Action/actionForkTogglePriestBossFreeMoving.cpp index 586136ca..f217cd9b 100644 --- a/src/Game/AI/Action/actionForkTogglePriestBossFreeMoving.cpp +++ b/src/Game/AI/Action/actionForkTogglePriestBossFreeMoving.cpp @@ -7,24 +7,12 @@ ForkTogglePriestBossFreeMoving::ForkTogglePriestBossFreeMoving(const InitArg& ar ForkTogglePriestBossFreeMoving::~ForkTogglePriestBossFreeMoving() = default; -bool ForkTogglePriestBossFreeMoving::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - void ForkTogglePriestBossFreeMoving::enter_(ksys::act::ai::InlineParamPack* params) { ksys::act::ai::Action::enter_(params); } -void ForkTogglePriestBossFreeMoving::leave_() { - ksys::act::ai::Action::leave_(); -} - void ForkTogglePriestBossFreeMoving::loadParams_() { getStaticParam(&mSetFreeMoving_s, "SetFreeMoving"); } -void ForkTogglePriestBossFreeMoving::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionForkTogglePriestBossFreeMoving.h b/src/Game/AI/Action/actionForkTogglePriestBossFreeMoving.h index 0e1cf9b0..6c076a01 100644 --- a/src/Game/AI/Action/actionForkTogglePriestBossFreeMoving.h +++ b/src/Game/AI/Action/actionForkTogglePriestBossFreeMoving.h @@ -10,14 +10,10 @@ public: explicit ForkTogglePriestBossFreeMoving(const InitArg& arg); ~ForkTogglePriestBossFreeMoving() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // static_param at offset 0x20 const bool* mSetFreeMoving_s{}; }; diff --git a/src/Game/AI/Action/actionForkToggleWeaponXLinkSleep.cpp b/src/Game/AI/Action/actionForkToggleWeaponXLinkSleep.cpp index fcefa21f..903c2700 100644 --- a/src/Game/AI/Action/actionForkToggleWeaponXLinkSleep.cpp +++ b/src/Game/AI/Action/actionForkToggleWeaponXLinkSleep.cpp @@ -7,24 +7,12 @@ ForkToggleWeaponXLinkSleep::ForkToggleWeaponXLinkSleep(const InitArg& arg) ForkToggleWeaponXLinkSleep::~ForkToggleWeaponXLinkSleep() = default; -bool ForkToggleWeaponXLinkSleep::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - void ForkToggleWeaponXLinkSleep::enter_(ksys::act::ai::InlineParamPack* params) { ksys::act::ai::Action::enter_(params); } -void ForkToggleWeaponXLinkSleep::leave_() { - ksys::act::ai::Action::leave_(); -} - void ForkToggleWeaponXLinkSleep::loadParams_() { getStaticParam(&mToggle_s, "Toggle"); } -void ForkToggleWeaponXLinkSleep::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionForkToggleWeaponXLinkSleep.h b/src/Game/AI/Action/actionForkToggleWeaponXLinkSleep.h index 5474a92a..17e6142b 100644 --- a/src/Game/AI/Action/actionForkToggleWeaponXLinkSleep.h +++ b/src/Game/AI/Action/actionForkToggleWeaponXLinkSleep.h @@ -10,14 +10,10 @@ public: explicit ForkToggleWeaponXLinkSleep(const InitArg& arg); ~ForkToggleWeaponXLinkSleep() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // static_param at offset 0x20 const int* mToggle_s{}; }; diff --git a/src/Game/AI/Action/actionForkTurnASHold.cpp b/src/Game/AI/Action/actionForkTurnASHold.cpp index 5ba55597..f8b42889 100644 --- a/src/Game/AI/Action/actionForkTurnASHold.cpp +++ b/src/Game/AI/Action/actionForkTurnASHold.cpp @@ -6,23 +6,6 @@ ForkTurnASHold::ForkTurnASHold(const InitArg& arg) : ForkAlwaysTurn(arg) {} ForkTurnASHold::~ForkTurnASHold() = default; -bool ForkTurnASHold::init_(sead::Heap* heap) { - return ForkAlwaysTurn::init_(heap); -} - -void ForkTurnASHold::enter_(ksys::act::ai::InlineParamPack* params) { - ForkAlwaysTurn::enter_(params); -} - -void ForkTurnASHold::leave_() { - ForkAlwaysTurn::leave_(); -} - -void ForkTurnASHold::loadParams_() { - ForkTurn::loadParams_(); - getDynamicParam(&mTargetPos_d, "TargetPos"); -} - void ForkTurnASHold::calc_() { ForkAlwaysTurn::calc_(); } diff --git a/src/Game/AI/Action/actionForkTurnASHold.h b/src/Game/AI/Action/actionForkTurnASHold.h index 35385120..a9450a8f 100644 --- a/src/Game/AI/Action/actionForkTurnASHold.h +++ b/src/Game/AI/Action/actionForkTurnASHold.h @@ -11,16 +11,8 @@ public: explicit ForkTurnASHold(const InitArg& arg); ~ForkTurnASHold() override; - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; - protected: void calc_() override; - - // dynamic_param at offset 0xc0 - sead::Vector3f* mTargetPos_d{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionForkWeaponAttack.cpp b/src/Game/AI/Action/actionForkWeaponAttack.cpp index 1b6b268f..10b559a4 100644 --- a/src/Game/AI/Action/actionForkWeaponAttack.cpp +++ b/src/Game/AI/Action/actionForkWeaponAttack.cpp @@ -6,25 +6,9 @@ ForkWeaponAttack::ForkWeaponAttack(const InitArg& arg) : ForkWeaponAttackBase(ar ForkWeaponAttack::~ForkWeaponAttack() = default; -bool ForkWeaponAttack::init_(sead::Heap* heap) { - return ForkWeaponAttackBase::init_(heap); -} - -void ForkWeaponAttack::enter_(ksys::act::ai::InlineParamPack* params) { - ForkWeaponAttackBase::enter_(params); -} - -void ForkWeaponAttack::leave_() { - ForkWeaponAttackBase::leave_(); -} - void ForkWeaponAttack::loadParams_() { ForkWeaponAttackBase::loadParams_(); getStaticParam(&mWeaponIdx_s, "WeaponIdx"); } -void ForkWeaponAttack::calc_() { - ForkWeaponAttackBase::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionForkWeaponAttack.h b/src/Game/AI/Action/actionForkWeaponAttack.h index fd86c750..8123245b 100644 --- a/src/Game/AI/Action/actionForkWeaponAttack.h +++ b/src/Game/AI/Action/actionForkWeaponAttack.h @@ -11,14 +11,9 @@ public: explicit ForkWeaponAttack(const InitArg& arg); ~ForkWeaponAttack() override; - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // static_param at offset 0x70 const int* mWeaponIdx_s{}; }; diff --git a/src/Game/AI/Action/actionForkWeaponShockWave.cpp b/src/Game/AI/Action/actionForkWeaponShockWave.cpp index 93bf3514..6619308c 100644 --- a/src/Game/AI/Action/actionForkWeaponShockWave.cpp +++ b/src/Game/AI/Action/actionForkWeaponShockWave.cpp @@ -6,18 +6,10 @@ ForkWeaponShockWave::ForkWeaponShockWave(const InitArg& arg) : ksys::act::ai::Ac ForkWeaponShockWave::~ForkWeaponShockWave() = default; -bool ForkWeaponShockWave::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - void ForkWeaponShockWave::enter_(ksys::act::ai::InlineParamPack* params) { ksys::act::ai::Action::enter_(params); } -void ForkWeaponShockWave::leave_() { - ksys::act::ai::Action::leave_(); -} - void ForkWeaponShockWave::loadParams_() { getStaticParam(&mWeaponIdx_s, "WeaponIdx"); getStaticParam(&mSeqBank_s, "SeqBank"); diff --git a/src/Game/AI/Action/actionForkWeaponShockWave.h b/src/Game/AI/Action/actionForkWeaponShockWave.h index 5fe47ba4..7efff9de 100644 --- a/src/Game/AI/Action/actionForkWeaponShockWave.h +++ b/src/Game/AI/Action/actionForkWeaponShockWave.h @@ -10,9 +10,7 @@ public: explicit ForkWeaponShockWave(const InitArg& arg); ~ForkWeaponShockWave() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: diff --git a/src/Game/AI/Action/actionFreezedInIce.cpp b/src/Game/AI/Action/actionFreezedInIce.cpp index 590d4802..5956f35d 100644 --- a/src/Game/AI/Action/actionFreezedInIce.cpp +++ b/src/Game/AI/Action/actionFreezedInIce.cpp @@ -4,8 +4,6 @@ namespace uking::action { FreezedInIce::FreezedInIce(const InitArg& arg) : ksys::act::ai::Action(arg) {} -FreezedInIce::~FreezedInIce() = default; - bool FreezedInIce::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } diff --git a/src/Game/AI/Action/actionFreezedInIce.h b/src/Game/AI/Action/actionFreezedInIce.h index 87fb4de8..7a5ad2d9 100644 --- a/src/Game/AI/Action/actionFreezedInIce.h +++ b/src/Game/AI/Action/actionFreezedInIce.h @@ -8,7 +8,6 @@ class FreezedInIce : public ksys::act::ai::Action { SEAD_RTTI_OVERRIDE(FreezedInIce, ksys::act::ai::Action) public: explicit FreezedInIce(const InitArg& arg); - ~FreezedInIce() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/AI/Action/actionFreezedInIceWeapon.cpp b/src/Game/AI/Action/actionFreezedInIceWeapon.cpp index 3c5ad18c..7f94eeac 100644 --- a/src/Game/AI/Action/actionFreezedInIceWeapon.cpp +++ b/src/Game/AI/Action/actionFreezedInIceWeapon.cpp @@ -6,10 +6,6 @@ FreezedInIceWeapon::FreezedInIceWeapon(const InitArg& arg) : FreezedInIce(arg) { FreezedInIceWeapon::~FreezedInIceWeapon() = default; -bool FreezedInIceWeapon::init_(sead::Heap* heap) { - return FreezedInIce::init_(heap); -} - void FreezedInIceWeapon::enter_(ksys::act::ai::InlineParamPack* params) { FreezedInIce::enter_(params); } @@ -22,8 +18,4 @@ void FreezedInIceWeapon::loadParams_() { FreezedInIce::loadParams_(); } -void FreezedInIceWeapon::calc_() { - FreezedInIce::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionFreezedInIceWeapon.h b/src/Game/AI/Action/actionFreezedInIceWeapon.h index fcb9b0c7..525be1b5 100644 --- a/src/Game/AI/Action/actionFreezedInIceWeapon.h +++ b/src/Game/AI/Action/actionFreezedInIceWeapon.h @@ -11,13 +11,11 @@ public: explicit FreezedInIceWeapon(const InitArg& arg); ~FreezedInIceWeapon() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionGameDataAddFloat.cpp b/src/Game/AI/Action/actionGameDataAddFloat.cpp index 8e6cf912..4e19d683 100644 --- a/src/Game/AI/Action/actionGameDataAddFloat.cpp +++ b/src/Game/AI/Action/actionGameDataAddFloat.cpp @@ -10,22 +10,10 @@ bool GameDataAddFloat::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void GameDataAddFloat::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void GameDataAddFloat::leave_() { - ksys::act::ai::Action::leave_(); -} - void GameDataAddFloat::loadParams_() { getDynamicParam(&mGameDataFloatSrcName_d, "GameDataFloatSrcName"); getDynamicParam(&mGameDataFloatDstName_d, "GameDataFloatDstName"); getDynamicParam(&mGameDataFloatToName_d, "GameDataFloatToName"); } -void GameDataAddFloat::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionGameDataAddFloat.h b/src/Game/AI/Action/actionGameDataAddFloat.h index d9761c23..f709a12e 100644 --- a/src/Game/AI/Action/actionGameDataAddFloat.h +++ b/src/Game/AI/Action/actionGameDataAddFloat.h @@ -11,13 +11,9 @@ public: ~GameDataAddFloat() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 sead::SafeString* mGameDataFloatSrcName_d{}; // dynamic_param at offset 0x30 diff --git a/src/Game/AI/Action/actionGameDataAddInt.cpp b/src/Game/AI/Action/actionGameDataAddInt.cpp index f7f18634..236e9698 100644 --- a/src/Game/AI/Action/actionGameDataAddInt.cpp +++ b/src/Game/AI/Action/actionGameDataAddInt.cpp @@ -10,22 +10,10 @@ bool GameDataAddInt::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void GameDataAddInt::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void GameDataAddInt::leave_() { - ksys::act::ai::Action::leave_(); -} - void GameDataAddInt::loadParams_() { getDynamicParam(&mGameDataIntSrcName_d, "GameDataIntSrcName"); getDynamicParam(&mGameDataIntDstName_d, "GameDataIntDstName"); getDynamicParam(&mGameDataIntToName_d, "GameDataIntToName"); } -void GameDataAddInt::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionGameDataAddInt.h b/src/Game/AI/Action/actionGameDataAddInt.h index bfd270c3..200a7573 100644 --- a/src/Game/AI/Action/actionGameDataAddInt.h +++ b/src/Game/AI/Action/actionGameDataAddInt.h @@ -11,13 +11,9 @@ public: ~GameDataAddInt() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 sead::SafeString* mGameDataIntSrcName_d{}; // dynamic_param at offset 0x30 diff --git a/src/Game/AI/Action/actionGameDataAddVec3.cpp b/src/Game/AI/Action/actionGameDataAddVec3.cpp index 3cca998f..1e67aefd 100644 --- a/src/Game/AI/Action/actionGameDataAddVec3.cpp +++ b/src/Game/AI/Action/actionGameDataAddVec3.cpp @@ -10,22 +10,10 @@ bool GameDataAddVec3::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void GameDataAddVec3::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void GameDataAddVec3::leave_() { - ksys::act::ai::Action::leave_(); -} - void GameDataAddVec3::loadParams_() { getDynamicParam(&mGameDataVec3fSrcName_d, "GameDataVec3fSrcName"); getDynamicParam(&mGameDataVec3fDstName_d, "GameDataVec3fDstName"); getDynamicParam(&mGameDataVec3fToName_d, "GameDataVec3fToName"); } -void GameDataAddVec3::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionGameDataAddVec3.h b/src/Game/AI/Action/actionGameDataAddVec3.h index e607297a..cf00850a 100644 --- a/src/Game/AI/Action/actionGameDataAddVec3.h +++ b/src/Game/AI/Action/actionGameDataAddVec3.h @@ -11,13 +11,9 @@ public: ~GameDataAddVec3() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 sead::SafeString* mGameDataVec3fSrcName_d{}; // dynamic_param at offset 0x30 diff --git a/src/Game/AI/Action/actionGameDataConvertIntToSring.cpp b/src/Game/AI/Action/actionGameDataConvertIntToSring.cpp index 815a1d92..6b7e05d9 100644 --- a/src/Game/AI/Action/actionGameDataConvertIntToSring.cpp +++ b/src/Game/AI/Action/actionGameDataConvertIntToSring.cpp @@ -11,21 +11,9 @@ bool GameDataConvertIntToSring::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void GameDataConvertIntToSring::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void GameDataConvertIntToSring::leave_() { - ksys::act::ai::Action::leave_(); -} - void GameDataConvertIntToSring::loadParams_() { getDynamicParam(&mGameDataIntInput_d, "GameDataIntInput"); getDynamicParam(&mGameDataStringOutput_d, "GameDataStringOutput"); } -void GameDataConvertIntToSring::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionGameDataConvertIntToSring.h b/src/Game/AI/Action/actionGameDataConvertIntToSring.h index 6895e261..91649bdd 100644 --- a/src/Game/AI/Action/actionGameDataConvertIntToSring.h +++ b/src/Game/AI/Action/actionGameDataConvertIntToSring.h @@ -11,13 +11,9 @@ public: ~GameDataConvertIntToSring() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 sead::SafeString* mGameDataIntInput_d{}; // dynamic_param at offset 0x30 diff --git a/src/Game/AI/Action/actionGameDataCopyFloat.cpp b/src/Game/AI/Action/actionGameDataCopyFloat.cpp index 3bba9f76..6ab94015 100644 --- a/src/Game/AI/Action/actionGameDataCopyFloat.cpp +++ b/src/Game/AI/Action/actionGameDataCopyFloat.cpp @@ -10,21 +10,9 @@ bool GameDataCopyFloat::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void GameDataCopyFloat::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void GameDataCopyFloat::leave_() { - ksys::act::ai::Action::leave_(); -} - void GameDataCopyFloat::loadParams_() { getDynamicParam(&mGameDataFloatSrcName_d, "GameDataFloatSrcName"); getDynamicParam(&mGameDataFloatDstName_d, "GameDataFloatDstName"); } -void GameDataCopyFloat::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionGameDataCopyFloat.h b/src/Game/AI/Action/actionGameDataCopyFloat.h index e7eca3b1..973e5dd3 100644 --- a/src/Game/AI/Action/actionGameDataCopyFloat.h +++ b/src/Game/AI/Action/actionGameDataCopyFloat.h @@ -11,13 +11,9 @@ public: ~GameDataCopyFloat() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 sead::SafeString* mGameDataFloatSrcName_d{}; // dynamic_param at offset 0x30 diff --git a/src/Game/AI/Action/actionGameDataCopyInt.cpp b/src/Game/AI/Action/actionGameDataCopyInt.cpp index c1a55740..d11100e6 100644 --- a/src/Game/AI/Action/actionGameDataCopyInt.cpp +++ b/src/Game/AI/Action/actionGameDataCopyInt.cpp @@ -10,21 +10,9 @@ bool GameDataCopyInt::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void GameDataCopyInt::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void GameDataCopyInt::leave_() { - ksys::act::ai::Action::leave_(); -} - void GameDataCopyInt::loadParams_() { getDynamicParam(&mGameDataIntSrcName_d, "GameDataIntSrcName"); getDynamicParam(&mGameDataIntDstName_d, "GameDataIntDstName"); } -void GameDataCopyInt::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionGameDataCopyInt.h b/src/Game/AI/Action/actionGameDataCopyInt.h index 328b66b8..c826c620 100644 --- a/src/Game/AI/Action/actionGameDataCopyInt.h +++ b/src/Game/AI/Action/actionGameDataCopyInt.h @@ -11,13 +11,9 @@ public: ~GameDataCopyInt() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 sead::SafeString* mGameDataIntSrcName_d{}; // dynamic_param at offset 0x30 diff --git a/src/Game/AI/Action/actionGameDataSubFloat.cpp b/src/Game/AI/Action/actionGameDataSubFloat.cpp index cec43b32..f3db3e68 100644 --- a/src/Game/AI/Action/actionGameDataSubFloat.cpp +++ b/src/Game/AI/Action/actionGameDataSubFloat.cpp @@ -10,22 +10,10 @@ bool GameDataSubFloat::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void GameDataSubFloat::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void GameDataSubFloat::leave_() { - ksys::act::ai::Action::leave_(); -} - void GameDataSubFloat::loadParams_() { getDynamicParam(&mGameDataFloatSrcName_d, "GameDataFloatSrcName"); getDynamicParam(&mGameDataFloatDstName_d, "GameDataFloatDstName"); getDynamicParam(&mGameDataFloatToName_d, "GameDataFloatToName"); } -void GameDataSubFloat::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionGameDataSubFloat.h b/src/Game/AI/Action/actionGameDataSubFloat.h index ab77e633..dfe75532 100644 --- a/src/Game/AI/Action/actionGameDataSubFloat.h +++ b/src/Game/AI/Action/actionGameDataSubFloat.h @@ -11,13 +11,9 @@ public: ~GameDataSubFloat() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 sead::SafeString* mGameDataFloatSrcName_d{}; // dynamic_param at offset 0x30 diff --git a/src/Game/AI/Action/actionGameDataSubInt.cpp b/src/Game/AI/Action/actionGameDataSubInt.cpp index 7eb1fcec..3120267f 100644 --- a/src/Game/AI/Action/actionGameDataSubInt.cpp +++ b/src/Game/AI/Action/actionGameDataSubInt.cpp @@ -10,22 +10,10 @@ bool GameDataSubInt::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void GameDataSubInt::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void GameDataSubInt::leave_() { - ksys::act::ai::Action::leave_(); -} - void GameDataSubInt::loadParams_() { getDynamicParam(&mGameDataIntSrcName_d, "GameDataIntSrcName"); getDynamicParam(&mGameDataIntDstName_d, "GameDataIntDstName"); getDynamicParam(&mGameDataIntToName_d, "GameDataIntToName"); } -void GameDataSubInt::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionGameDataSubInt.h b/src/Game/AI/Action/actionGameDataSubInt.h index 33ea55c1..e1c3daed 100644 --- a/src/Game/AI/Action/actionGameDataSubInt.h +++ b/src/Game/AI/Action/actionGameDataSubInt.h @@ -11,13 +11,9 @@ public: ~GameDataSubInt() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 sead::SafeString* mGameDataIntSrcName_d{}; // dynamic_param at offset 0x30 diff --git a/src/Game/AI/Action/actionGameDataSubVec3.cpp b/src/Game/AI/Action/actionGameDataSubVec3.cpp index 9c10e4c1..59f37953 100644 --- a/src/Game/AI/Action/actionGameDataSubVec3.cpp +++ b/src/Game/AI/Action/actionGameDataSubVec3.cpp @@ -10,22 +10,10 @@ bool GameDataSubVec3::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void GameDataSubVec3::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void GameDataSubVec3::leave_() { - ksys::act::ai::Action::leave_(); -} - void GameDataSubVec3::loadParams_() { getDynamicParam(&mGameDataVec3fSrcName_d, "GameDataVec3fSrcName"); getDynamicParam(&mGameDataVec3fDstName_d, "GameDataVec3fDstName"); getDynamicParam(&mGameDataVec3fToName_d, "GameDataVec3fToName"); } -void GameDataSubVec3::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionGameDataSubVec3.h b/src/Game/AI/Action/actionGameDataSubVec3.h index cd3e412c..018d0213 100644 --- a/src/Game/AI/Action/actionGameDataSubVec3.h +++ b/src/Game/AI/Action/actionGameDataSubVec3.h @@ -11,13 +11,9 @@ public: ~GameDataSubVec3() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 sead::SafeString* mGameDataVec3fSrcName_d{}; // dynamic_param at offset 0x30 diff --git a/src/Game/AI/Action/actionGanonBoneControl.cpp b/src/Game/AI/Action/actionGanonBoneControl.cpp index 5dbe9faf..ebec494e 100644 --- a/src/Game/AI/Action/actionGanonBoneControl.cpp +++ b/src/Game/AI/Action/actionGanonBoneControl.cpp @@ -10,20 +10,8 @@ bool GanonBoneControl::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void GanonBoneControl::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void GanonBoneControl::leave_() { - ksys::act::ai::Action::leave_(); -} - void GanonBoneControl::loadParams_() { getDynamicParam(&mIsBattleModeOn_d, "IsBattleModeOn"); } -void GanonBoneControl::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionGanonBoneControl.h b/src/Game/AI/Action/actionGanonBoneControl.h index ad85e3f3..8a4a4504 100644 --- a/src/Game/AI/Action/actionGanonBoneControl.h +++ b/src/Game/AI/Action/actionGanonBoneControl.h @@ -11,13 +11,9 @@ public: ~GanonBoneControl() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 bool* mIsBattleModeOn_d{}; }; diff --git a/src/Game/AI/Action/actionGetItem.cpp b/src/Game/AI/Action/actionGetItem.cpp index 25ab3e36..02f8330c 100644 --- a/src/Game/AI/Action/actionGetItem.cpp +++ b/src/Game/AI/Action/actionGetItem.cpp @@ -4,8 +4,6 @@ namespace uking::action { GetItem::GetItem(const InitArg& arg) : ksys::act::ai::Action(arg) {} -GetItem::~GetItem() = default; - bool GetItem::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } diff --git a/src/Game/AI/Action/actionGetItem.h b/src/Game/AI/Action/actionGetItem.h index b4189cd1..a574d952 100644 --- a/src/Game/AI/Action/actionGetItem.h +++ b/src/Game/AI/Action/actionGetItem.h @@ -8,7 +8,6 @@ class GetItem : public ksys::act::ai::Action { SEAD_RTTI_OVERRIDE(GetItem, ksys::act::ai::Action) public: explicit GetItem(const InitArg& arg); - ~GetItem() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/AI/Action/actionGetItemGet.cpp b/src/Game/AI/Action/actionGetItemGet.cpp index 1fd4007d..41f9a23b 100644 --- a/src/Game/AI/Action/actionGetItemGet.cpp +++ b/src/Game/AI/Action/actionGetItemGet.cpp @@ -4,12 +4,6 @@ namespace uking::action { GetItemGet::GetItemGet(const InitArg& arg) : GetItem(arg) {} -GetItemGet::~GetItemGet() = default; - -bool GetItemGet::init_(sead::Heap* heap) { - return GetItem::init_(heap); -} - void GetItemGet::enter_(ksys::act::ai::InlineParamPack* params) { GetItem::enter_(params); } diff --git a/src/Game/AI/Action/actionGetItemGet.h b/src/Game/AI/Action/actionGetItemGet.h index 3559c23d..03f00160 100644 --- a/src/Game/AI/Action/actionGetItemGet.h +++ b/src/Game/AI/Action/actionGetItemGet.h @@ -9,9 +9,7 @@ class GetItemGet : public GetItem { SEAD_RTTI_OVERRIDE(GetItemGet, GetItem) public: explicit GetItemGet(const InitArg& arg); - ~GetItemGet() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionGetItemIntoBag.cpp b/src/Game/AI/Action/actionGetItemIntoBag.cpp index 6a574398..e29bc7f0 100644 --- a/src/Game/AI/Action/actionGetItemIntoBag.cpp +++ b/src/Game/AI/Action/actionGetItemIntoBag.cpp @@ -4,12 +4,6 @@ namespace uking::action { GetItemIntoBag::GetItemIntoBag(const InitArg& arg) : GetItem(arg) {} -GetItemIntoBag::~GetItemIntoBag() = default; - -bool GetItemIntoBag::init_(sead::Heap* heap) { - return GetItem::init_(heap); -} - void GetItemIntoBag::enter_(ksys::act::ai::InlineParamPack* params) { GetItem::enter_(params); } diff --git a/src/Game/AI/Action/actionGetItemIntoBag.h b/src/Game/AI/Action/actionGetItemIntoBag.h index 7967cc36..94142343 100644 --- a/src/Game/AI/Action/actionGetItemIntoBag.h +++ b/src/Game/AI/Action/actionGetItemIntoBag.h @@ -9,9 +9,7 @@ class GetItemIntoBag : public GetItem { SEAD_RTTI_OVERRIDE(GetItemIntoBag, GetItem) public: explicit GetItemIntoBag(const InitArg& arg); - ~GetItemIntoBag() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionGetOffFromHorseAction.cpp b/src/Game/AI/Action/actionGetOffFromHorseAction.cpp index 36268518..0d61bb84 100644 --- a/src/Game/AI/Action/actionGetOffFromHorseAction.cpp +++ b/src/Game/AI/Action/actionGetOffFromHorseAction.cpp @@ -10,20 +10,8 @@ bool GetOffFromHorseAction::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void GetOffFromHorseAction::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void GetOffFromHorseAction::leave_() { - ksys::act::ai::Action::leave_(); -} - void GetOffFromHorseAction::loadParams_() { getDynamicParam(&mClearDemoMemberIfNotOwned_d, "ClearDemoMemberIfNotOwned"); } -void GetOffFromHorseAction::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionGetOffFromHorseAction.h b/src/Game/AI/Action/actionGetOffFromHorseAction.h index 52bd8703..14a2c014 100644 --- a/src/Game/AI/Action/actionGetOffFromHorseAction.h +++ b/src/Game/AI/Action/actionGetOffFromHorseAction.h @@ -11,13 +11,9 @@ public: ~GetOffFromHorseAction() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 bool* mClearDemoMemberIfNotOwned_d{}; }; diff --git a/src/Game/AI/Action/actionGetRupee.cpp b/src/Game/AI/Action/actionGetRupee.cpp index 30343315..08ad12f9 100644 --- a/src/Game/AI/Action/actionGetRupee.cpp +++ b/src/Game/AI/Action/actionGetRupee.cpp @@ -4,8 +4,6 @@ namespace uking::action { GetRupee::GetRupee(const InitArg& arg) : GetItem(arg) {} -GetRupee::~GetRupee() = default; - bool GetRupee::init_(sead::Heap* heap) { return GetItem::init_(heap); } diff --git a/src/Game/AI/Action/actionGetRupee.h b/src/Game/AI/Action/actionGetRupee.h index 6eccb294..27ec53f6 100644 --- a/src/Game/AI/Action/actionGetRupee.h +++ b/src/Game/AI/Action/actionGetRupee.h @@ -9,7 +9,6 @@ class GetRupee : public GetItem { SEAD_RTTI_OVERRIDE(GetRupee, GetItem) public: explicit GetRupee(const InitArg& arg); - ~GetRupee() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/AI/Action/actionGetSmallKeyItemGet.cpp b/src/Game/AI/Action/actionGetSmallKeyItemGet.cpp index 1b3c7aba..4faaf644 100644 --- a/src/Game/AI/Action/actionGetSmallKeyItemGet.cpp +++ b/src/Game/AI/Action/actionGetSmallKeyItemGet.cpp @@ -4,12 +4,6 @@ namespace uking::action { GetSmallKeyItemGet::GetSmallKeyItemGet(const InitArg& arg) : GetItem(arg) {} -GetSmallKeyItemGet::~GetSmallKeyItemGet() = default; - -bool GetSmallKeyItemGet::init_(sead::Heap* heap) { - return GetItem::init_(heap); -} - void GetSmallKeyItemGet::enter_(ksys::act::ai::InlineParamPack* params) { GetItem::enter_(params); } diff --git a/src/Game/AI/Action/actionGetSmallKeyItemGet.h b/src/Game/AI/Action/actionGetSmallKeyItemGet.h index 69fc6891..92aa08e8 100644 --- a/src/Game/AI/Action/actionGetSmallKeyItemGet.h +++ b/src/Game/AI/Action/actionGetSmallKeyItemGet.h @@ -9,9 +9,7 @@ class GetSmallKeyItemGet : public GetItem { SEAD_RTTI_OVERRIDE(GetSmallKeyItemGet, GetItem) public: explicit GetSmallKeyItemGet(const InitArg& arg); - ~GetSmallKeyItemGet() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionGetWeaponEquip.cpp b/src/Game/AI/Action/actionGetWeaponEquip.cpp index 74f93805..4c8c7f51 100644 --- a/src/Game/AI/Action/actionGetWeaponEquip.cpp +++ b/src/Game/AI/Action/actionGetWeaponEquip.cpp @@ -4,22 +4,10 @@ namespace uking::action { GetWeaponEquip::GetWeaponEquip(const InitArg& arg) : GetItem(arg) {} -GetWeaponEquip::~GetWeaponEquip() = default; - -bool GetWeaponEquip::init_(sead::Heap* heap) { - return GetItem::init_(heap); -} - void GetWeaponEquip::enter_(ksys::act::ai::InlineParamPack* params) { GetItem::enter_(params); } -void GetWeaponEquip::leave_() { - GetItem::leave_(); -} - -void GetWeaponEquip::loadParams_() {} - void GetWeaponEquip::calc_() { GetItem::calc_(); } diff --git a/src/Game/AI/Action/actionGetWeaponEquip.h b/src/Game/AI/Action/actionGetWeaponEquip.h index 304a09d0..901a01f0 100644 --- a/src/Game/AI/Action/actionGetWeaponEquip.h +++ b/src/Game/AI/Action/actionGetWeaponEquip.h @@ -9,12 +9,8 @@ class GetWeaponEquip : public GetItem { SEAD_RTTI_OVERRIDE(GetWeaponEquip, GetItem) public: explicit GetWeaponEquip(const InitArg& arg); - ~GetWeaponEquip() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; protected: void calc_() override; diff --git a/src/Game/AI/Action/actionGiveCookResultForNpc.cpp b/src/Game/AI/Action/actionGiveCookResultForNpc.cpp index 828723cf..b795a3b0 100644 --- a/src/Game/AI/Action/actionGiveCookResultForNpc.cpp +++ b/src/Game/AI/Action/actionGiveCookResultForNpc.cpp @@ -10,22 +10,10 @@ bool GiveCookResultForNpc::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void GiveCookResultForNpc::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void GiveCookResultForNpc::leave_() { - ksys::act::ai::Action::leave_(); -} - void GiveCookResultForNpc::loadParams_() { getDynamicParam(&mCount_d, "Count"); getDynamicParam(&mPorchItemName_d, "PorchItemName"); getDynamicParam(&mCookEffectType_d, "CookEffectType"); } -void GiveCookResultForNpc::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionGiveCookResultForNpc.h b/src/Game/AI/Action/actionGiveCookResultForNpc.h index 080d2950..182e8a30 100644 --- a/src/Game/AI/Action/actionGiveCookResultForNpc.h +++ b/src/Game/AI/Action/actionGiveCookResultForNpc.h @@ -11,13 +11,9 @@ public: ~GiveCookResultForNpc() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 int* mCount_d{}; // dynamic_param at offset 0x28 diff --git a/src/Game/AI/Action/actionGoronHeroDescendentAppear.cpp b/src/Game/AI/Action/actionGoronHeroDescendentAppear.cpp index 5e8b081b..8c87b704 100644 --- a/src/Game/AI/Action/actionGoronHeroDescendentAppear.cpp +++ b/src/Game/AI/Action/actionGoronHeroDescendentAppear.cpp @@ -11,18 +11,6 @@ bool GoronHeroDescendentAppear::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void GoronHeroDescendentAppear::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void GoronHeroDescendentAppear::leave_() { - ksys::act::ai::Action::leave_(); -} - void GoronHeroDescendentAppear::loadParams_() {} -void GoronHeroDescendentAppear::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionGoronHeroDescendentAppear.h b/src/Game/AI/Action/actionGoronHeroDescendentAppear.h index 3c86e377..b68f1608 100644 --- a/src/Game/AI/Action/actionGoronHeroDescendentAppear.h +++ b/src/Game/AI/Action/actionGoronHeroDescendentAppear.h @@ -11,12 +11,9 @@ public: ~GoronHeroDescendentAppear() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionGrab.cpp b/src/Game/AI/Action/actionGrab.cpp index 7624179e..7d6c7120 100644 --- a/src/Game/AI/Action/actionGrab.cpp +++ b/src/Game/AI/Action/actionGrab.cpp @@ -4,8 +4,6 @@ namespace uking::action { Grab::Grab(const InitArg& arg) : ActionWithPosAngReduce(arg) {} -Grab::~Grab() = default; - bool Grab::init_(sead::Heap* heap) { return ActionWithPosAngReduce::init_(heap); } diff --git a/src/Game/AI/Action/actionGrab.h b/src/Game/AI/Action/actionGrab.h index a1cb42c5..0bf5e534 100644 --- a/src/Game/AI/Action/actionGrab.h +++ b/src/Game/AI/Action/actionGrab.h @@ -9,7 +9,6 @@ class Grab : public ActionWithPosAngReduce { SEAD_RTTI_OVERRIDE(Grab, ActionWithPosAngReduce) public: explicit Grab(const InitArg& arg); - ~Grab() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/AI/Action/actionGrabAndShoot.cpp b/src/Game/AI/Action/actionGrabAndShoot.cpp index 6b0624e3..00c12778 100644 --- a/src/Game/AI/Action/actionGrabAndShoot.cpp +++ b/src/Game/AI/Action/actionGrabAndShoot.cpp @@ -6,10 +6,6 @@ GrabAndShoot::GrabAndShoot(const InitArg& arg) : ksys::act::ai::Action(arg) {} GrabAndShoot::~GrabAndShoot() = default; -bool GrabAndShoot::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - void GrabAndShoot::enter_(ksys::act::ai::InlineParamPack* params) { ksys::act::ai::Action::enter_(params); } diff --git a/src/Game/AI/Action/actionGrabAndShoot.h b/src/Game/AI/Action/actionGrabAndShoot.h index bfc2a253..0c2ab1ed 100644 --- a/src/Game/AI/Action/actionGrabAndShoot.h +++ b/src/Game/AI/Action/actionGrabAndShoot.h @@ -10,7 +10,6 @@ public: explicit GrabAndShoot(const InitArg& arg); ~GrabAndShoot() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionGrabAttack.cpp b/src/Game/AI/Action/actionGrabAttack.cpp index 717743dd..94f8ccf9 100644 --- a/src/Game/AI/Action/actionGrabAttack.cpp +++ b/src/Game/AI/Action/actionGrabAttack.cpp @@ -6,10 +6,6 @@ GrabAttack::GrabAttack(const InitArg& arg) : Grab(arg) {} GrabAttack::~GrabAttack() = default; -bool GrabAttack::init_(sead::Heap* heap) { - return Grab::init_(heap); -} - void GrabAttack::enter_(ksys::act::ai::InlineParamPack* params) { Grab::enter_(params); } diff --git a/src/Game/AI/Action/actionGrabAttack.h b/src/Game/AI/Action/actionGrabAttack.h index 211ce92e..d9cbaddf 100644 --- a/src/Game/AI/Action/actionGrabAttack.h +++ b/src/Game/AI/Action/actionGrabAttack.h @@ -11,7 +11,6 @@ public: explicit GrabAttack(const InitArg& arg); ~GrabAttack() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionGrabLeft.cpp b/src/Game/AI/Action/actionGrabLeft.cpp index 81f2cf7c..c7e3b790 100644 --- a/src/Game/AI/Action/actionGrabLeft.cpp +++ b/src/Game/AI/Action/actionGrabLeft.cpp @@ -4,30 +4,4 @@ namespace uking::action { GrabLeft::GrabLeft(const InitArg& arg) : Grab(arg) {} -GrabLeft::~GrabLeft() = default; - -bool GrabLeft::init_(sead::Heap* heap) { - return Grab::init_(heap); -} - -void GrabLeft::enter_(ksys::act::ai::InlineParamPack* params) { - Grab::enter_(params); -} - -void GrabLeft::leave_() { - Grab::leave_(); -} - -void GrabLeft::loadParams_() { - ActionWithPosAngReduce::loadParams_(); - getStaticParam(&mGrabIdx_s, "GrabIdx"); - getStaticParam(&mCheckRadius_s, "CheckRadius"); - getStaticParam(&mCheckSpeed_s, "CheckSpeed"); - getStaticParam(&mAttOffset_s, "AttOffset"); -} - -void GrabLeft::calc_() { - Grab::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionGrabLeft.h b/src/Game/AI/Action/actionGrabLeft.h index 50d322e9..2471a569 100644 --- a/src/Game/AI/Action/actionGrabLeft.h +++ b/src/Game/AI/Action/actionGrabLeft.h @@ -9,24 +9,8 @@ class GrabLeft : public Grab { SEAD_RTTI_OVERRIDE(GrabLeft, Grab) public: explicit GrabLeft(const InitArg& arg); - ~GrabLeft() override; - - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; protected: - void calc_() override; - - // static_param at offset 0x30 - const int* mGrabIdx_s{}; - // static_param at offset 0x38 - const float* mCheckRadius_s{}; - // static_param at offset 0x40 - const float* mCheckSpeed_s{}; - // static_param at offset 0x48 - const sead::Vector3f* mAttOffset_s{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionGrabLeftTurn.cpp b/src/Game/AI/Action/actionGrabLeftTurn.cpp index 79b1881b..77a21270 100644 --- a/src/Game/AI/Action/actionGrabLeftTurn.cpp +++ b/src/Game/AI/Action/actionGrabLeftTurn.cpp @@ -4,33 +4,8 @@ namespace uking::action { GrabLeftTurn::GrabLeftTurn(const InitArg& arg) : TurnBase(arg) {} -GrabLeftTurn::~GrabLeftTurn() = default; - -bool GrabLeftTurn::init_(sead::Heap* heap) { - return TurnBase::init_(heap); -} - void GrabLeftTurn::enter_(ksys::act::ai::InlineParamPack* params) { TurnBase::enter_(params); } -void GrabLeftTurn::leave_() { - TurnBase::leave_(); -} - -void GrabLeftTurn::loadParams_() { - getStaticParam(&mRotSpd_s, "RotSpd"); - getStaticParam(&mFinRotate_s, "FinRotate"); - getStaticParam(&mPosReduceRatio_s, "PosReduceRatio"); - getStaticParam(&mBaseRotRatio_s, "BaseRotRatio"); - getStaticParam(&mIsFollowGround_s, "IsFollowGround"); - getStaticParam(&mIsChangeable_s, "IsChangeable"); - getDynamicParam(&mTargetPos_d, "TargetPos"); - getStaticParam(&mRotMinSpeedRatio_s, "RotMinSpeedRatio"); -} - -void GrabLeftTurn::calc_() { - TurnBase::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionGrabLeftTurn.h b/src/Game/AI/Action/actionGrabLeftTurn.h index abdaf6e6..1eed0c09 100644 --- a/src/Game/AI/Action/actionGrabLeftTurn.h +++ b/src/Game/AI/Action/actionGrabLeftTurn.h @@ -9,32 +9,10 @@ class GrabLeftTurn : public TurnBase { SEAD_RTTI_OVERRIDE(GrabLeftTurn, TurnBase) public: explicit GrabLeftTurn(const InitArg& arg); - ~GrabLeftTurn() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; protected: - void calc_() override; - - // static_param at offset 0x20 - const float* mRotSpd_s{}; - // static_param at offset 0x28 - const float* mFinRotate_s{}; - // static_param at offset 0x30 - const float* mPosReduceRatio_s{}; - // static_param at offset 0x38 - const float* mBaseRotRatio_s{}; - // static_param at offset 0x40 - const bool* mIsFollowGround_s{}; - // static_param at offset 0x48 - const float* mRotMinSpeedRatio_s{}; - // static_param at offset 0x50 - const bool* mIsChangeable_s{}; - // dynamic_param at offset 0x58 - sead::Vector3f* mTargetPos_d{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionGrabLeftWalk.cpp b/src/Game/AI/Action/actionGrabLeftWalk.cpp index a40ea0f0..6435d977 100644 --- a/src/Game/AI/Action/actionGrabLeftWalk.cpp +++ b/src/Game/AI/Action/actionGrabLeftWalk.cpp @@ -4,40 +4,8 @@ namespace uking::action { GrabLeftWalk::GrabLeftWalk(const InitArg& arg) : MoveBase(arg) {} -GrabLeftWalk::~GrabLeftWalk() = default; - -bool GrabLeftWalk::init_(sead::Heap* heap) { - return MoveBase::init_(heap); -} - void GrabLeftWalk::enter_(ksys::act::ai::InlineParamPack* params) { MoveBase::enter_(params); } -void GrabLeftWalk::leave_() { - MoveBase::leave_(); -} - -void GrabLeftWalk::loadParams_() { - getStaticParam(&mWeaponIdx_s, "WeaponIdx"); - getStaticParam(&mWallHitLimitTime_s, "WallHitLimitTime"); - getStaticParam(&mMoveAngCliffLimitTime_s, "MoveAngCliffLimitTime"); - getStaticParam(&mSpeed_s, "Speed"); - getStaticParam(&mRotSpd_s, "RotSpd"); - getStaticParam(&mFinRadius_s, "FinRadius"); - getStaticParam(&mFinRotate_s, "FinRotate"); - getStaticParam(&mBaseRotRatio_s, "BaseRotRatio"); - getStaticParam(&mAccRatio_s, "AccRatio"); - getStaticParam(&mJumpUpSpeedReduceRatio_s, "JumpUpSpeedReduceRatio"); - getStaticParam(&mFollowGround_s, "FollowGround"); - getStaticParam(&mIgnoreLastCurve_s, "IgnoreLastCurve"); - getStaticParam(&mIgnoreDecelerationFrontCliff_s, "IgnoreDecelerationFrontCliff"); - getStaticParam(&mIgnoreMoveDirCoHit_s, "IgnoreMoveDirCoHit"); - getDynamicParam(&mTargetPos_d, "TargetPos"); -} - -void GrabLeftWalk::calc_() { - MoveBase::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionGrabLeftWalk.h b/src/Game/AI/Action/actionGrabLeftWalk.h index dfe62e5c..89af9b72 100644 --- a/src/Game/AI/Action/actionGrabLeftWalk.h +++ b/src/Game/AI/Action/actionGrabLeftWalk.h @@ -9,46 +9,10 @@ class GrabLeftWalk : public MoveBase { SEAD_RTTI_OVERRIDE(GrabLeftWalk, MoveBase) public: explicit GrabLeftWalk(const InitArg& arg); - ~GrabLeftWalk() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; protected: - void calc_() override; - - // static_param at offset 0x20 - const int* mWeaponIdx_s{}; - // static_param at offset 0x28 - const int* mWallHitLimitTime_s{}; - // static_param at offset 0x30 - const int* mMoveAngCliffLimitTime_s{}; - // static_param at offset 0x38 - const float* mSpeed_s{}; - // static_param at offset 0x40 - const float* mRotSpd_s{}; - // static_param at offset 0x48 - const float* mFinRadius_s{}; - // static_param at offset 0x50 - const float* mFinRotate_s{}; - // static_param at offset 0x58 - const float* mBaseRotRatio_s{}; - // static_param at offset 0x60 - const float* mAccRatio_s{}; - // static_param at offset 0x68 - const float* mJumpUpSpeedReduceRatio_s{}; - // static_param at offset 0x70 - const bool* mFollowGround_s{}; - // static_param at offset 0x78 - const bool* mIgnoreLastCurve_s{}; - // static_param at offset 0x80 - const bool* mIgnoreDecelerationFrontCliff_s{}; - // static_param at offset 0x88 - const bool* mIgnoreMoveDirCoHit_s{}; - // dynamic_param at offset 0x90 - sead::Vector3f* mTargetPos_d{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionGrabRight.cpp b/src/Game/AI/Action/actionGrabRight.cpp index 265d7008..af8cf357 100644 --- a/src/Game/AI/Action/actionGrabRight.cpp +++ b/src/Game/AI/Action/actionGrabRight.cpp @@ -4,30 +4,4 @@ namespace uking::action { GrabRight::GrabRight(const InitArg& arg) : Grab(arg) {} -GrabRight::~GrabRight() = default; - -bool GrabRight::init_(sead::Heap* heap) { - return Grab::init_(heap); -} - -void GrabRight::enter_(ksys::act::ai::InlineParamPack* params) { - Grab::enter_(params); -} - -void GrabRight::leave_() { - Grab::leave_(); -} - -void GrabRight::loadParams_() { - ActionWithPosAngReduce::loadParams_(); - getStaticParam(&mGrabIdx_s, "GrabIdx"); - getStaticParam(&mCheckRadius_s, "CheckRadius"); - getStaticParam(&mCheckSpeed_s, "CheckSpeed"); - getStaticParam(&mAttOffset_s, "AttOffset"); -} - -void GrabRight::calc_() { - Grab::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionGrabRight.h b/src/Game/AI/Action/actionGrabRight.h index 8db6f17f..a1e79e88 100644 --- a/src/Game/AI/Action/actionGrabRight.h +++ b/src/Game/AI/Action/actionGrabRight.h @@ -9,24 +9,8 @@ class GrabRight : public Grab { SEAD_RTTI_OVERRIDE(GrabRight, Grab) public: explicit GrabRight(const InitArg& arg); - ~GrabRight() override; - - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; protected: - void calc_() override; - - // static_param at offset 0x30 - const int* mGrabIdx_s{}; - // static_param at offset 0x38 - const float* mCheckRadius_s{}; - // static_param at offset 0x40 - const float* mCheckSpeed_s{}; - // static_param at offset 0x48 - const sead::Vector3f* mAttOffset_s{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionGrabRightTurn.cpp b/src/Game/AI/Action/actionGrabRightTurn.cpp index 95d8aa6f..ca87472d 100644 --- a/src/Game/AI/Action/actionGrabRightTurn.cpp +++ b/src/Game/AI/Action/actionGrabRightTurn.cpp @@ -4,33 +4,8 @@ namespace uking::action { GrabRightTurn::GrabRightTurn(const InitArg& arg) : TurnBase(arg) {} -GrabRightTurn::~GrabRightTurn() = default; - -bool GrabRightTurn::init_(sead::Heap* heap) { - return TurnBase::init_(heap); -} - void GrabRightTurn::enter_(ksys::act::ai::InlineParamPack* params) { TurnBase::enter_(params); } -void GrabRightTurn::leave_() { - TurnBase::leave_(); -} - -void GrabRightTurn::loadParams_() { - getStaticParam(&mRotSpd_s, "RotSpd"); - getStaticParam(&mFinRotate_s, "FinRotate"); - getStaticParam(&mPosReduceRatio_s, "PosReduceRatio"); - getStaticParam(&mBaseRotRatio_s, "BaseRotRatio"); - getStaticParam(&mIsFollowGround_s, "IsFollowGround"); - getStaticParam(&mIsChangeable_s, "IsChangeable"); - getDynamicParam(&mTargetPos_d, "TargetPos"); - getStaticParam(&mRotMinSpeedRatio_s, "RotMinSpeedRatio"); -} - -void GrabRightTurn::calc_() { - TurnBase::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionGrabRightTurn.h b/src/Game/AI/Action/actionGrabRightTurn.h index 70e7ba88..5bc65e8d 100644 --- a/src/Game/AI/Action/actionGrabRightTurn.h +++ b/src/Game/AI/Action/actionGrabRightTurn.h @@ -9,32 +9,10 @@ class GrabRightTurn : public TurnBase { SEAD_RTTI_OVERRIDE(GrabRightTurn, TurnBase) public: explicit GrabRightTurn(const InitArg& arg); - ~GrabRightTurn() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; protected: - void calc_() override; - - // static_param at offset 0x20 - const float* mRotSpd_s{}; - // static_param at offset 0x28 - const float* mFinRotate_s{}; - // static_param at offset 0x30 - const float* mPosReduceRatio_s{}; - // static_param at offset 0x38 - const float* mBaseRotRatio_s{}; - // static_param at offset 0x40 - const bool* mIsFollowGround_s{}; - // static_param at offset 0x48 - const float* mRotMinSpeedRatio_s{}; - // static_param at offset 0x50 - const bool* mIsChangeable_s{}; - // dynamic_param at offset 0x58 - sead::Vector3f* mTargetPos_d{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionGrabRightWalk.cpp b/src/Game/AI/Action/actionGrabRightWalk.cpp index 2ee7a177..eb49e4df 100644 --- a/src/Game/AI/Action/actionGrabRightWalk.cpp +++ b/src/Game/AI/Action/actionGrabRightWalk.cpp @@ -4,40 +4,8 @@ namespace uking::action { GrabRightWalk::GrabRightWalk(const InitArg& arg) : MoveBase(arg) {} -GrabRightWalk::~GrabRightWalk() = default; - -bool GrabRightWalk::init_(sead::Heap* heap) { - return MoveBase::init_(heap); -} - void GrabRightWalk::enter_(ksys::act::ai::InlineParamPack* params) { MoveBase::enter_(params); } -void GrabRightWalk::leave_() { - MoveBase::leave_(); -} - -void GrabRightWalk::loadParams_() { - getStaticParam(&mWeaponIdx_s, "WeaponIdx"); - getStaticParam(&mWallHitLimitTime_s, "WallHitLimitTime"); - getStaticParam(&mMoveAngCliffLimitTime_s, "MoveAngCliffLimitTime"); - getStaticParam(&mSpeed_s, "Speed"); - getStaticParam(&mRotSpd_s, "RotSpd"); - getStaticParam(&mFinRadius_s, "FinRadius"); - getStaticParam(&mFinRotate_s, "FinRotate"); - getStaticParam(&mBaseRotRatio_s, "BaseRotRatio"); - getStaticParam(&mAccRatio_s, "AccRatio"); - getStaticParam(&mJumpUpSpeedReduceRatio_s, "JumpUpSpeedReduceRatio"); - getStaticParam(&mFollowGround_s, "FollowGround"); - getStaticParam(&mIgnoreLastCurve_s, "IgnoreLastCurve"); - getStaticParam(&mIgnoreDecelerationFrontCliff_s, "IgnoreDecelerationFrontCliff"); - getStaticParam(&mIgnoreMoveDirCoHit_s, "IgnoreMoveDirCoHit"); - getDynamicParam(&mTargetPos_d, "TargetPos"); -} - -void GrabRightWalk::calc_() { - MoveBase::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionGrabRightWalk.h b/src/Game/AI/Action/actionGrabRightWalk.h index 0bbd0888..b58f69b6 100644 --- a/src/Game/AI/Action/actionGrabRightWalk.h +++ b/src/Game/AI/Action/actionGrabRightWalk.h @@ -9,46 +9,10 @@ class GrabRightWalk : public MoveBase { SEAD_RTTI_OVERRIDE(GrabRightWalk, MoveBase) public: explicit GrabRightWalk(const InitArg& arg); - ~GrabRightWalk() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; protected: - void calc_() override; - - // static_param at offset 0x20 - const int* mWeaponIdx_s{}; - // static_param at offset 0x28 - const int* mWallHitLimitTime_s{}; - // static_param at offset 0x30 - const int* mMoveAngCliffLimitTime_s{}; - // static_param at offset 0x38 - const float* mSpeed_s{}; - // static_param at offset 0x40 - const float* mRotSpd_s{}; - // static_param at offset 0x48 - const float* mFinRadius_s{}; - // static_param at offset 0x50 - const float* mFinRotate_s{}; - // static_param at offset 0x58 - const float* mBaseRotRatio_s{}; - // static_param at offset 0x60 - const float* mAccRatio_s{}; - // static_param at offset 0x68 - const float* mJumpUpSpeedReduceRatio_s{}; - // static_param at offset 0x70 - const bool* mFollowGround_s{}; - // static_param at offset 0x78 - const bool* mIgnoreLastCurve_s{}; - // static_param at offset 0x80 - const bool* mIgnoreDecelerationFrontCliff_s{}; - // static_param at offset 0x88 - const bool* mIgnoreMoveDirCoHit_s{}; - // dynamic_param at offset 0x90 - sead::Vector3f* mTargetPos_d{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionGroupAllowEmitAction.cpp b/src/Game/AI/Action/actionGroupAllowEmitAction.cpp index 83989e02..9d04f9cb 100644 --- a/src/Game/AI/Action/actionGroupAllowEmitAction.cpp +++ b/src/Game/AI/Action/actionGroupAllowEmitAction.cpp @@ -10,20 +10,8 @@ bool GroupAllowEmitAction::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void GroupAllowEmitAction::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void GroupAllowEmitAction::leave_() { - ksys::act::ai::Action::leave_(); -} - void GroupAllowEmitAction::loadParams_() { getDynamicParam(&mGroupName_d, "GroupName"); } -void GroupAllowEmitAction::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionGroupAllowEmitAction.h b/src/Game/AI/Action/actionGroupAllowEmitAction.h index 214c47ee..80466d48 100644 --- a/src/Game/AI/Action/actionGroupAllowEmitAction.h +++ b/src/Game/AI/Action/actionGroupAllowEmitAction.h @@ -11,13 +11,9 @@ public: ~GroupAllowEmitAction() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 sead::SafeString* mGroupName_d{}; }; diff --git a/src/Game/AI/Action/actionGroupDisallowEmitAction.cpp b/src/Game/AI/Action/actionGroupDisallowEmitAction.cpp index 36108e14..35599dbd 100644 --- a/src/Game/AI/Action/actionGroupDisallowEmitAction.cpp +++ b/src/Game/AI/Action/actionGroupDisallowEmitAction.cpp @@ -10,20 +10,8 @@ bool GroupDisallowEmitAction::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void GroupDisallowEmitAction::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void GroupDisallowEmitAction::leave_() { - ksys::act::ai::Action::leave_(); -} - void GroupDisallowEmitAction::loadParams_() { getDynamicParam(&mGroupName_d, "GroupName"); } -void GroupDisallowEmitAction::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionGroupDisallowEmitAction.h b/src/Game/AI/Action/actionGroupDisallowEmitAction.h index f3cf991f..82388935 100644 --- a/src/Game/AI/Action/actionGroupDisallowEmitAction.h +++ b/src/Game/AI/Action/actionGroupDisallowEmitAction.h @@ -11,13 +11,9 @@ public: ~GroupDisallowEmitAction() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 sead::SafeString* mGroupName_d{}; }; diff --git a/src/Game/AI/Action/actionGuard.cpp b/src/Game/AI/Action/actionGuard.cpp index 4f503713..cac71d15 100644 --- a/src/Game/AI/Action/actionGuard.cpp +++ b/src/Game/AI/Action/actionGuard.cpp @@ -4,20 +4,10 @@ namespace uking::action { Guard::Guard(const InitArg& arg) : TakeHitImpactForce(arg) {} -Guard::~Guard() = default; - -bool Guard::init_(sead::Heap* heap) { - return TakeHitImpactForce::init_(heap); -} - void Guard::enter_(ksys::act::ai::InlineParamPack* params) { TakeHitImpactForce::enter_(params); } -void Guard::leave_() { - TakeHitImpactForce::leave_(); -} - void Guard::loadParams_() { TakeHitImpactForce::loadParams_(); getStaticParam(&mRotSubsAngRate_s, "RotSubsAngRate"); diff --git a/src/Game/AI/Action/actionGuard.h b/src/Game/AI/Action/actionGuard.h index aaf27ef5..ba09a28a 100644 --- a/src/Game/AI/Action/actionGuard.h +++ b/src/Game/AI/Action/actionGuard.h @@ -9,11 +9,8 @@ class Guard : public TakeHitImpactForce { SEAD_RTTI_OVERRIDE(Guard, TakeHitImpactForce) public: explicit Guard(const InitArg& arg); - ~Guard() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: diff --git a/src/Game/AI/Action/actionGuardBackWalk.cpp b/src/Game/AI/Action/actionGuardBackWalk.cpp index 3a548d9c..53081f10 100644 --- a/src/Game/AI/Action/actionGuardBackWalk.cpp +++ b/src/Game/AI/Action/actionGuardBackWalk.cpp @@ -4,8 +4,6 @@ namespace uking::action { GuardBackWalk::GuardBackWalk(const InitArg& arg) : BackWalkEx(arg) {} -GuardBackWalk::~GuardBackWalk() = default; - bool GuardBackWalk::init_(sead::Heap* heap) { return BackWalkEx::init_(heap); } diff --git a/src/Game/AI/Action/actionGuardBackWalk.h b/src/Game/AI/Action/actionGuardBackWalk.h index c69d06b7..1b1cdd0d 100644 --- a/src/Game/AI/Action/actionGuardBackWalk.h +++ b/src/Game/AI/Action/actionGuardBackWalk.h @@ -9,7 +9,6 @@ class GuardBackWalk : public BackWalkEx { SEAD_RTTI_OVERRIDE(GuardBackWalk, BackWalkEx) public: explicit GuardBackWalk(const InitArg& arg); - ~GuardBackWalk() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/AI/Action/actionGuardLoop.cpp b/src/Game/AI/Action/actionGuardLoop.cpp index 286906eb..4af1d816 100644 --- a/src/Game/AI/Action/actionGuardLoop.cpp +++ b/src/Game/AI/Action/actionGuardLoop.cpp @@ -4,27 +4,8 @@ namespace uking::action { GuardLoop::GuardLoop(const InitArg& arg) : ActionWithPosAngReduce(arg) {} -GuardLoop::~GuardLoop() = default; - -bool GuardLoop::init_(sead::Heap* heap) { - return ActionWithPosAngReduce::init_(heap); -} - void GuardLoop::enter_(ksys::act::ai::InlineParamPack* params) { ActionWithPosAngReduce::enter_(params); } -void GuardLoop::leave_() { - ActionWithPosAngReduce::leave_(); -} - -void GuardLoop::loadParams_() { - getStaticParam(&mPosReduceRatio_s, "PosReduceRatio"); - getStaticParam(&mAngReduceRatio_s, "AngReduceRatio"); -} - -void GuardLoop::calc_() { - ActionWithPosAngReduce::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionGuardLoop.h b/src/Game/AI/Action/actionGuardLoop.h index aa8cfaa2..3bba4569 100644 --- a/src/Game/AI/Action/actionGuardLoop.h +++ b/src/Game/AI/Action/actionGuardLoop.h @@ -9,20 +9,10 @@ class GuardLoop : public ActionWithPosAngReduce { SEAD_RTTI_OVERRIDE(GuardLoop, ActionWithPosAngReduce) public: explicit GuardLoop(const InitArg& arg); - ~GuardLoop() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; protected: - void calc_() override; - - // static_param at offset 0x20 - const float* mPosReduceRatio_s{}; - // static_param at offset 0x28 - const float* mAngReduceRatio_s{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionGuardTurn.cpp b/src/Game/AI/Action/actionGuardTurn.cpp index 13a3ed4e..f5bbbc3e 100644 --- a/src/Game/AI/Action/actionGuardTurn.cpp +++ b/src/Game/AI/Action/actionGuardTurn.cpp @@ -4,33 +4,8 @@ namespace uking::action { GuardTurn::GuardTurn(const InitArg& arg) : TurnBase(arg) {} -GuardTurn::~GuardTurn() = default; - -bool GuardTurn::init_(sead::Heap* heap) { - return TurnBase::init_(heap); -} - void GuardTurn::enter_(ksys::act::ai::InlineParamPack* params) { TurnBase::enter_(params); } -void GuardTurn::leave_() { - TurnBase::leave_(); -} - -void GuardTurn::loadParams_() { - getStaticParam(&mRotSpd_s, "RotSpd"); - getStaticParam(&mFinRotate_s, "FinRotate"); - getStaticParam(&mPosReduceRatio_s, "PosReduceRatio"); - getStaticParam(&mBaseRotRatio_s, "BaseRotRatio"); - getStaticParam(&mIsFollowGround_s, "IsFollowGround"); - getStaticParam(&mIsChangeable_s, "IsChangeable"); - getDynamicParam(&mTargetPos_d, "TargetPos"); - getStaticParam(&mRotMinSpeedRatio_s, "RotMinSpeedRatio"); -} - -void GuardTurn::calc_() { - TurnBase::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionGuardTurn.h b/src/Game/AI/Action/actionGuardTurn.h index 4f70b0f3..678b6ebb 100644 --- a/src/Game/AI/Action/actionGuardTurn.h +++ b/src/Game/AI/Action/actionGuardTurn.h @@ -9,32 +9,10 @@ class GuardTurn : public TurnBase { SEAD_RTTI_OVERRIDE(GuardTurn, TurnBase) public: explicit GuardTurn(const InitArg& arg); - ~GuardTurn() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; protected: - void calc_() override; - - // static_param at offset 0x20 - const float* mRotSpd_s{}; - // static_param at offset 0x28 - const float* mFinRotate_s{}; - // static_param at offset 0x30 - const float* mPosReduceRatio_s{}; - // static_param at offset 0x38 - const float* mBaseRotRatio_s{}; - // static_param at offset 0x40 - const bool* mIsFollowGround_s{}; - // static_param at offset 0x48 - const float* mRotMinSpeedRatio_s{}; - // static_param at offset 0x50 - const bool* mIsChangeable_s{}; - // dynamic_param at offset 0x58 - sead::Vector3f* mTargetPos_d{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionGuardWithAS.cpp b/src/Game/AI/Action/actionGuardWithAS.cpp index 1a52cda3..77cacd70 100644 --- a/src/Game/AI/Action/actionGuardWithAS.cpp +++ b/src/Game/AI/Action/actionGuardWithAS.cpp @@ -6,26 +6,10 @@ GuardWithAS::GuardWithAS(const InitArg& arg) : Guard(arg) {} GuardWithAS::~GuardWithAS() = default; -bool GuardWithAS::init_(sead::Heap* heap) { - return Guard::init_(heap); -} - -void GuardWithAS::enter_(ksys::act::ai::InlineParamPack* params) { - Guard::enter_(params); -} - -void GuardWithAS::leave_() { - Guard::leave_(); -} - void GuardWithAS::loadParams_() { Guard::loadParams_(); getStaticParam(&mASSlot_s, "ASSlot"); getStaticParam(&mASName_s, "ASName"); } -void GuardWithAS::calc_() { - Guard::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionGuardWithAS.h b/src/Game/AI/Action/actionGuardWithAS.h index fb742281..299e399e 100644 --- a/src/Game/AI/Action/actionGuardWithAS.h +++ b/src/Game/AI/Action/actionGuardWithAS.h @@ -11,14 +11,9 @@ public: explicit GuardWithAS(const InitArg& arg); ~GuardWithAS() override; - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // static_param at offset 0xa8 const int* mASSlot_s{}; // static_param at offset 0xb0 diff --git a/src/Game/AI/Action/actionGuardianMiniBeamMove.cpp b/src/Game/AI/Action/actionGuardianMiniBeamMove.cpp index 67319850..bc656e6e 100644 --- a/src/Game/AI/Action/actionGuardianMiniBeamMove.cpp +++ b/src/Game/AI/Action/actionGuardianMiniBeamMove.cpp @@ -6,10 +6,6 @@ GuardianMiniBeamMove::GuardianMiniBeamMove(const InitArg& arg) : BeamMove(arg) { GuardianMiniBeamMove::~GuardianMiniBeamMove() = default; -bool GuardianMiniBeamMove::init_(sead::Heap* heap) { - return BeamMove::init_(heap); -} - void GuardianMiniBeamMove::enter_(ksys::act::ai::InlineParamPack* params) { BeamMove::enter_(params); } diff --git a/src/Game/AI/Action/actionGuardianMiniBeamMove.h b/src/Game/AI/Action/actionGuardianMiniBeamMove.h index 719570f1..28859d2f 100644 --- a/src/Game/AI/Action/actionGuardianMiniBeamMove.h +++ b/src/Game/AI/Action/actionGuardianMiniBeamMove.h @@ -11,7 +11,6 @@ public: explicit GuardianMiniBeamMove(const InitArg& arg); ~GuardianMiniBeamMove() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionGuardianMiniFinalBeamMove.cpp b/src/Game/AI/Action/actionGuardianMiniFinalBeamMove.cpp index f6973643..9405615e 100644 --- a/src/Game/AI/Action/actionGuardianMiniFinalBeamMove.cpp +++ b/src/Game/AI/Action/actionGuardianMiniFinalBeamMove.cpp @@ -6,10 +6,6 @@ GuardianMiniFinalBeamMove::GuardianMiniFinalBeamMove(const InitArg& arg) : Guard GuardianMiniFinalBeamMove::~GuardianMiniFinalBeamMove() = default; -bool GuardianMiniFinalBeamMove::init_(sead::Heap* heap) { - return GuardianBeamFire::init_(heap); -} - void GuardianMiniFinalBeamMove::enter_(ksys::act::ai::InlineParamPack* params) { GuardianBeamFire::enter_(params); } diff --git a/src/Game/AI/Action/actionGuardianMiniFinalBeamMove.h b/src/Game/AI/Action/actionGuardianMiniFinalBeamMove.h index b645ea85..726c37c4 100644 --- a/src/Game/AI/Action/actionGuardianMiniFinalBeamMove.h +++ b/src/Game/AI/Action/actionGuardianMiniFinalBeamMove.h @@ -11,7 +11,6 @@ public: explicit GuardianMiniFinalBeamMove(const InitArg& arg); ~GuardianMiniFinalBeamMove() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionGuardianMiniGuardBattleWalk.cpp b/src/Game/AI/Action/actionGuardianMiniGuardBattleWalk.cpp index f6f34a69..d0fc829d 100644 --- a/src/Game/AI/Action/actionGuardianMiniGuardBattleWalk.cpp +++ b/src/Game/AI/Action/actionGuardianMiniGuardBattleWalk.cpp @@ -7,26 +7,14 @@ GuardianMiniGuardBattleWalk::GuardianMiniGuardBattleWalk(const InitArg& arg) GuardianMiniGuardBattleWalk::~GuardianMiniGuardBattleWalk() = default; -bool GuardianMiniGuardBattleWalk::init_(sead::Heap* heap) { - return BattleCloseWalk::init_(heap); -} - void GuardianMiniGuardBattleWalk::enter_(ksys::act::ai::InlineParamPack* params) { BattleCloseWalk::enter_(params); } -void GuardianMiniGuardBattleWalk::leave_() { - BattleCloseWalk::leave_(); -} - void GuardianMiniGuardBattleWalk::loadParams_() { BattleCloseWalk::loadParams_(); getStaticParam(&mASSlot_s, "ASSlot"); getStaticParam(&mASName_s, "ASName"); } -void GuardianMiniGuardBattleWalk::calc_() { - BattleCloseWalk::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionGuardianMiniGuardBattleWalk.h b/src/Game/AI/Action/actionGuardianMiniGuardBattleWalk.h index 3a190545..05f0513c 100644 --- a/src/Game/AI/Action/actionGuardianMiniGuardBattleWalk.h +++ b/src/Game/AI/Action/actionGuardianMiniGuardBattleWalk.h @@ -11,14 +11,10 @@ public: explicit GuardianMiniGuardBattleWalk(const InitArg& arg); ~GuardianMiniGuardBattleWalk() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // static_param at offset 0xa8 const int* mASSlot_s{}; // static_param at offset 0xb0 diff --git a/src/Game/AI/Action/actionGuardianMiniGuardBreak.cpp b/src/Game/AI/Action/actionGuardianMiniGuardBreak.cpp index d866ca98..87099cf9 100644 --- a/src/Game/AI/Action/actionGuardianMiniGuardBreak.cpp +++ b/src/Game/AI/Action/actionGuardianMiniGuardBreak.cpp @@ -6,18 +6,6 @@ GuardianMiniGuardBreak::GuardianMiniGuardBreak(const InitArg& arg) : GuardBreak( GuardianMiniGuardBreak::~GuardianMiniGuardBreak() = default; -bool GuardianMiniGuardBreak::init_(sead::Heap* heap) { - return GuardBreak::init_(heap); -} - -void GuardianMiniGuardBreak::enter_(ksys::act::ai::InlineParamPack* params) { - GuardBreak::enter_(params); -} - -void GuardianMiniGuardBreak::leave_() { - GuardBreak::leave_(); -} - void GuardianMiniGuardBreak::loadParams_() { GuardBreak::loadParams_(); getStaticParam(&mASSlot_s, "ASSlot"); @@ -25,8 +13,4 @@ void GuardianMiniGuardBreak::loadParams_() { getStaticParam(&mOtherASName_s, "OtherASName"); } -void GuardianMiniGuardBreak::calc_() { - GuardBreak::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionGuardianMiniGuardBreak.h b/src/Game/AI/Action/actionGuardianMiniGuardBreak.h index 529862ba..2c553235 100644 --- a/src/Game/AI/Action/actionGuardianMiniGuardBreak.h +++ b/src/Game/AI/Action/actionGuardianMiniGuardBreak.h @@ -11,14 +11,9 @@ public: explicit GuardianMiniGuardBreak(const InitArg& arg); ~GuardianMiniGuardBreak() override; - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // static_param at offset 0x60 const int* mASSlot_s{}; // static_param at offset 0x68 diff --git a/src/Game/AI/Action/actionGuardianMiniGuardNavMeshWalk.cpp b/src/Game/AI/Action/actionGuardianMiniGuardNavMeshWalk.cpp index 3115aabb..c5cd75b9 100644 --- a/src/Game/AI/Action/actionGuardianMiniGuardNavMeshWalk.cpp +++ b/src/Game/AI/Action/actionGuardianMiniGuardNavMeshWalk.cpp @@ -6,26 +6,10 @@ GuardianMiniGuardNavMeshWalk::GuardianMiniGuardNavMeshWalk(const InitArg& arg) : GuardianMiniGuardNavMeshWalk::~GuardianMiniGuardNavMeshWalk() = default; -bool GuardianMiniGuardNavMeshWalk::init_(sead::Heap* heap) { - return NavMeshWalk::init_(heap); -} - -void GuardianMiniGuardNavMeshWalk::enter_(ksys::act::ai::InlineParamPack* params) { - NavMeshWalk::enter_(params); -} - -void GuardianMiniGuardNavMeshWalk::leave_() { - NavMeshWalk::leave_(); -} - void GuardianMiniGuardNavMeshWalk::loadParams_() { NavMeshAction::loadParams_(); getStaticParam(&mASSlot_s, "ASSlot"); getStaticParam(&mASName_s, "ASName"); } -void GuardianMiniGuardNavMeshWalk::calc_() { - NavMeshWalk::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionGuardianMiniGuardNavMeshWalk.h b/src/Game/AI/Action/actionGuardianMiniGuardNavMeshWalk.h index 5783863f..448214cd 100644 --- a/src/Game/AI/Action/actionGuardianMiniGuardNavMeshWalk.h +++ b/src/Game/AI/Action/actionGuardianMiniGuardNavMeshWalk.h @@ -11,14 +11,9 @@ public: explicit GuardianMiniGuardNavMeshWalk(const InitArg& arg); ~GuardianMiniGuardNavMeshWalk() override; - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // static_param at offset 0xa8 const int* mASSlot_s{}; // static_param at offset 0xb0 diff --git a/src/Game/AI/Action/actionGuardianMiniGuardSideWalk.cpp b/src/Game/AI/Action/actionGuardianMiniGuardSideWalk.cpp index e40ed87f..96a69871 100644 --- a/src/Game/AI/Action/actionGuardianMiniGuardSideWalk.cpp +++ b/src/Game/AI/Action/actionGuardianMiniGuardSideWalk.cpp @@ -6,26 +6,14 @@ GuardianMiniGuardSideWalk::GuardianMiniGuardSideWalk(const InitArg& arg) : Targe GuardianMiniGuardSideWalk::~GuardianMiniGuardSideWalk() = default; -bool GuardianMiniGuardSideWalk::init_(sead::Heap* heap) { - return TargetCircleWalk::init_(heap); -} - void GuardianMiniGuardSideWalk::enter_(ksys::act::ai::InlineParamPack* params) { TargetCircleWalk::enter_(params); } -void GuardianMiniGuardSideWalk::leave_() { - TargetCircleWalk::leave_(); -} - void GuardianMiniGuardSideWalk::loadParams_() { TargetCircleWalk::loadParams_(); getStaticParam(&mASSlot_s, "ASSlot"); getStaticParam(&mASName_s, "ASName"); } -void GuardianMiniGuardSideWalk::calc_() { - TargetCircleWalk::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionGuardianMiniGuardSideWalk.h b/src/Game/AI/Action/actionGuardianMiniGuardSideWalk.h index 7401db65..ee3777e3 100644 --- a/src/Game/AI/Action/actionGuardianMiniGuardSideWalk.h +++ b/src/Game/AI/Action/actionGuardianMiniGuardSideWalk.h @@ -11,14 +11,10 @@ public: explicit GuardianMiniGuardSideWalk(const InitArg& arg); ~GuardianMiniGuardSideWalk() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // static_param at offset 0x80 const int* mASSlot_s{}; // static_param at offset 0x88 diff --git a/src/Game/AI/Action/actionGuardianMiniGuardTurn.cpp b/src/Game/AI/Action/actionGuardianMiniGuardTurn.cpp index 54a5afdd..ca039e9d 100644 --- a/src/Game/AI/Action/actionGuardianMiniGuardTurn.cpp +++ b/src/Game/AI/Action/actionGuardianMiniGuardTurn.cpp @@ -6,26 +6,14 @@ GuardianMiniGuardTurn::GuardianMiniGuardTurn(const InitArg& arg) : Turn(arg) {} GuardianMiniGuardTurn::~GuardianMiniGuardTurn() = default; -bool GuardianMiniGuardTurn::init_(sead::Heap* heap) { - return Turn::init_(heap); -} - void GuardianMiniGuardTurn::enter_(ksys::act::ai::InlineParamPack* params) { Turn::enter_(params); } -void GuardianMiniGuardTurn::leave_() { - Turn::leave_(); -} - void GuardianMiniGuardTurn::loadParams_() { TurnBase::loadParams_(); getStaticParam(&mASSlot_s, "ASSlot"); getStaticParam(&mASName_s, "ASName"); } -void GuardianMiniGuardTurn::calc_() { - Turn::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionGuardianMiniGuardTurn.h b/src/Game/AI/Action/actionGuardianMiniGuardTurn.h index 5a09f461..689b4817 100644 --- a/src/Game/AI/Action/actionGuardianMiniGuardTurn.h +++ b/src/Game/AI/Action/actionGuardianMiniGuardTurn.h @@ -11,14 +11,10 @@ public: explicit GuardianMiniGuardTurn(const InitArg& arg); ~GuardianMiniGuardTurn() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // static_param at offset 0x90 const int* mASSlot_s{}; // static_param at offset 0x98 diff --git a/src/Game/AI/Action/actionGuardianMiniGuardWait.cpp b/src/Game/AI/Action/actionGuardianMiniGuardWait.cpp index 5c455d35..b5b94ce0 100644 --- a/src/Game/AI/Action/actionGuardianMiniGuardWait.cpp +++ b/src/Game/AI/Action/actionGuardianMiniGuardWait.cpp @@ -6,25 +6,9 @@ GuardianMiniGuardWait::GuardianMiniGuardWait(const InitArg& arg) : GuardianMiniW GuardianMiniGuardWait::~GuardianMiniGuardWait() = default; -bool GuardianMiniGuardWait::init_(sead::Heap* heap) { - return GuardianMiniWait::init_(heap); -} - -void GuardianMiniGuardWait::enter_(ksys::act::ai::InlineParamPack* params) { - GuardianMiniWait::enter_(params); -} - -void GuardianMiniGuardWait::leave_() { - GuardianMiniWait::leave_(); -} - void GuardianMiniGuardWait::loadParams_() { GuardianMiniWait::loadParams_(); getStaticParam(&mGuardASName_s, "GuardASName"); } -void GuardianMiniGuardWait::calc_() { - GuardianMiniWait::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionGuardianMiniGuardWait.h b/src/Game/AI/Action/actionGuardianMiniGuardWait.h index 658b7926..2daaa184 100644 --- a/src/Game/AI/Action/actionGuardianMiniGuardWait.h +++ b/src/Game/AI/Action/actionGuardianMiniGuardWait.h @@ -11,14 +11,9 @@ public: explicit GuardianMiniGuardWait(const InitArg& arg); ~GuardianMiniGuardWait() override; - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // static_param at offset 0x90 sead::SafeString mGuardASName_s{}; }; diff --git a/src/Game/AI/Action/actionGuardianMiniLineBeam.cpp b/src/Game/AI/Action/actionGuardianMiniLineBeam.cpp index 46036157..b7d1699b 100644 --- a/src/Game/AI/Action/actionGuardianMiniLineBeam.cpp +++ b/src/Game/AI/Action/actionGuardianMiniLineBeam.cpp @@ -6,18 +6,10 @@ GuardianMiniLineBeam::GuardianMiniLineBeam(const InitArg& arg) : SimpleLineBeam( GuardianMiniLineBeam::~GuardianMiniLineBeam() = default; -bool GuardianMiniLineBeam::init_(sead::Heap* heap) { - return SimpleLineBeam::init_(heap); -} - void GuardianMiniLineBeam::enter_(ksys::act::ai::InlineParamPack* params) { SimpleLineBeam::enter_(params); } -void GuardianMiniLineBeam::leave_() { - SimpleLineBeam::leave_(); -} - void GuardianMiniLineBeam::loadParams_() { SimpleLineBeam::loadParams_(); getStaticParam(&mIceBlockBreakTime_s, "IceBlockBreakTime"); diff --git a/src/Game/AI/Action/actionGuardianMiniLineBeam.h b/src/Game/AI/Action/actionGuardianMiniLineBeam.h index 2df4494e..42abcf96 100644 --- a/src/Game/AI/Action/actionGuardianMiniLineBeam.h +++ b/src/Game/AI/Action/actionGuardianMiniLineBeam.h @@ -11,9 +11,7 @@ public: explicit GuardianMiniLineBeam(const InitArg& arg); ~GuardianMiniLineBeam() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: diff --git a/src/Game/AI/Action/actionGuardianMiniNeckSpinBeam.cpp b/src/Game/AI/Action/actionGuardianMiniNeckSpinBeam.cpp index dfddac62..6416f845 100644 --- a/src/Game/AI/Action/actionGuardianMiniNeckSpinBeam.cpp +++ b/src/Game/AI/Action/actionGuardianMiniNeckSpinBeam.cpp @@ -6,18 +6,10 @@ GuardianMiniNeckSpinBeam::GuardianMiniNeckSpinBeam(const InitArg& arg) : NeckSpi GuardianMiniNeckSpinBeam::~GuardianMiniNeckSpinBeam() = default; -bool GuardianMiniNeckSpinBeam::init_(sead::Heap* heap) { - return NeckSpinBeam::init_(heap); -} - void GuardianMiniNeckSpinBeam::enter_(ksys::act::ai::InlineParamPack* params) { NeckSpinBeam::enter_(params); } -void GuardianMiniNeckSpinBeam::leave_() { - NeckSpinBeam::leave_(); -} - void GuardianMiniNeckSpinBeam::loadParams_() { NeckSpinBeam::loadParams_(); getStaticParam(&mSpinNum_s, "SpinNum"); diff --git a/src/Game/AI/Action/actionGuardianMiniNeckSpinBeam.h b/src/Game/AI/Action/actionGuardianMiniNeckSpinBeam.h index a320da06..75c3f04b 100644 --- a/src/Game/AI/Action/actionGuardianMiniNeckSpinBeam.h +++ b/src/Game/AI/Action/actionGuardianMiniNeckSpinBeam.h @@ -11,9 +11,7 @@ public: explicit GuardianMiniNeckSpinBeam(const InitArg& arg); ~GuardianMiniNeckSpinBeam() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: diff --git a/src/Game/AI/Action/actionGuardianMiniWait.cpp b/src/Game/AI/Action/actionGuardianMiniWait.cpp index b7c2f002..1f4ddf0b 100644 --- a/src/Game/AI/Action/actionGuardianMiniWait.cpp +++ b/src/Game/AI/Action/actionGuardianMiniWait.cpp @@ -6,18 +6,10 @@ GuardianMiniWait::GuardianMiniWait(const InitArg& arg) : Wait(arg) {} GuardianMiniWait::~GuardianMiniWait() = default; -bool GuardianMiniWait::init_(sead::Heap* heap) { - return Wait::init_(heap); -} - void GuardianMiniWait::enter_(ksys::act::ai::InlineParamPack* params) { Wait::enter_(params); } -void GuardianMiniWait::leave_() { - Wait::leave_(); -} - void GuardianMiniWait::loadParams_() { WaitBase::loadParams_(); getStaticParam(&mASName_s, "ASName"); diff --git a/src/Game/AI/Action/actionGuardianMiniWait.h b/src/Game/AI/Action/actionGuardianMiniWait.h index 5e4958db..5c61ff33 100644 --- a/src/Game/AI/Action/actionGuardianMiniWait.h +++ b/src/Game/AI/Action/actionGuardianMiniWait.h @@ -11,9 +11,7 @@ public: explicit GuardianMiniWait(const InitArg& arg); ~GuardianMiniWait() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: diff --git a/src/Game/AI/Action/actionHiddenKorokAppear.cpp b/src/Game/AI/Action/actionHiddenKorokAppear.cpp index d317fc94..44ef111c 100644 --- a/src/Game/AI/Action/actionHiddenKorokAppear.cpp +++ b/src/Game/AI/Action/actionHiddenKorokAppear.cpp @@ -10,18 +10,6 @@ bool HiddenKorokAppear::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void HiddenKorokAppear::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void HiddenKorokAppear::leave_() { - ksys::act::ai::Action::leave_(); -} - void HiddenKorokAppear::loadParams_() {} -void HiddenKorokAppear::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionHiddenKorokAppear.h b/src/Game/AI/Action/actionHiddenKorokAppear.h index c3c58f14..e013b1a4 100644 --- a/src/Game/AI/Action/actionHiddenKorokAppear.h +++ b/src/Game/AI/Action/actionHiddenKorokAppear.h @@ -11,12 +11,9 @@ public: ~HiddenKorokAppear() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionHideShootArrow.cpp b/src/Game/AI/Action/actionHideShootArrow.cpp index f62e131a..a9cb8d3e 100644 --- a/src/Game/AI/Action/actionHideShootArrow.cpp +++ b/src/Game/AI/Action/actionHideShootArrow.cpp @@ -6,10 +6,6 @@ HideShootArrow::HideShootArrow(const InitArg& arg) : ShootArrow(arg) {} HideShootArrow::~HideShootArrow() = default; -bool HideShootArrow::init_(sead::Heap* heap) { - return ShootArrow::init_(heap); -} - void HideShootArrow::enter_(ksys::act::ai::InlineParamPack* params) { ShootArrow::enter_(params); } diff --git a/src/Game/AI/Action/actionHideShootArrow.h b/src/Game/AI/Action/actionHideShootArrow.h index 9502af26..40b45b8c 100644 --- a/src/Game/AI/Action/actionHideShootArrow.h +++ b/src/Game/AI/Action/actionHideShootArrow.h @@ -11,7 +11,6 @@ public: explicit HideShootArrow(const InitArg& arg); ~HideShootArrow() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionHoldArrow.cpp b/src/Game/AI/Action/actionHoldArrow.cpp index a17fc672..9e024cb9 100644 --- a/src/Game/AI/Action/actionHoldArrow.cpp +++ b/src/Game/AI/Action/actionHoldArrow.cpp @@ -4,12 +4,6 @@ namespace uking::action { HoldArrow::HoldArrow(const InitArg& arg) : ActionWithPosAngReduce(arg) {} -HoldArrow::~HoldArrow() = default; - -bool HoldArrow::init_(sead::Heap* heap) { - return ActionWithPosAngReduce::init_(heap); -} - void HoldArrow::enter_(ksys::act::ai::InlineParamPack* params) { ActionWithPosAngReduce::enter_(params); } diff --git a/src/Game/AI/Action/actionHoldArrow.h b/src/Game/AI/Action/actionHoldArrow.h index 8f1d5154..55d22eee 100644 --- a/src/Game/AI/Action/actionHoldArrow.h +++ b/src/Game/AI/Action/actionHoldArrow.h @@ -9,9 +9,7 @@ class HoldArrow : public ActionWithPosAngReduce { SEAD_RTTI_OVERRIDE(HoldArrow, ActionWithPosAngReduce) public: explicit HoldArrow(const InitArg& arg); - ~HoldArrow() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionHoldArrowBackWalk.cpp b/src/Game/AI/Action/actionHoldArrowBackWalk.cpp index f866e7d4..4cbeaea9 100644 --- a/src/Game/AI/Action/actionHoldArrowBackWalk.cpp +++ b/src/Game/AI/Action/actionHoldArrowBackWalk.cpp @@ -4,12 +4,6 @@ namespace uking::action { HoldArrowBackWalk::HoldArrowBackWalk(const InitArg& arg) : BackWalkEx(arg) {} -HoldArrowBackWalk::~HoldArrowBackWalk() = default; - -bool HoldArrowBackWalk::init_(sead::Heap* heap) { - return BackWalkEx::init_(heap); -} - void HoldArrowBackWalk::enter_(ksys::act::ai::InlineParamPack* params) { BackWalkEx::enter_(params); } diff --git a/src/Game/AI/Action/actionHoldArrowBackWalk.h b/src/Game/AI/Action/actionHoldArrowBackWalk.h index 290603b3..6d243d19 100644 --- a/src/Game/AI/Action/actionHoldArrowBackWalk.h +++ b/src/Game/AI/Action/actionHoldArrowBackWalk.h @@ -9,9 +9,7 @@ class HoldArrowBackWalk : public BackWalkEx { SEAD_RTTI_OVERRIDE(HoldArrowBackWalk, BackWalkEx) public: explicit HoldArrowBackWalk(const InitArg& arg); - ~HoldArrowBackWalk() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionHoldArrowTurn.cpp b/src/Game/AI/Action/actionHoldArrowTurn.cpp index d3d2666d..a081755f 100644 --- a/src/Game/AI/Action/actionHoldArrowTurn.cpp +++ b/src/Game/AI/Action/actionHoldArrowTurn.cpp @@ -4,12 +4,6 @@ namespace uking::action { HoldArrowTurn::HoldArrowTurn(const InitArg& arg) : TurnBase(arg) {} -HoldArrowTurn::~HoldArrowTurn() = default; - -bool HoldArrowTurn::init_(sead::Heap* heap) { - return TurnBase::init_(heap); -} - void HoldArrowTurn::enter_(ksys::act::ai::InlineParamPack* params) { TurnBase::enter_(params); } diff --git a/src/Game/AI/Action/actionHoldArrowTurn.h b/src/Game/AI/Action/actionHoldArrowTurn.h index e4a50a0b..8b446b24 100644 --- a/src/Game/AI/Action/actionHoldArrowTurn.h +++ b/src/Game/AI/Action/actionHoldArrowTurn.h @@ -9,9 +9,7 @@ class HoldArrowTurn : public TurnBase { SEAD_RTTI_OVERRIDE(HoldArrowTurn, TurnBase) public: explicit HoldArrowTurn(const InitArg& arg); - ~HoldArrowTurn() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionHoldArrowWalk.cpp b/src/Game/AI/Action/actionHoldArrowWalk.cpp index 49f2cdae..fe316d6a 100644 --- a/src/Game/AI/Action/actionHoldArrowWalk.cpp +++ b/src/Game/AI/Action/actionHoldArrowWalk.cpp @@ -6,10 +6,6 @@ HoldArrowWalk::HoldArrowWalk(const InitArg& arg) : MoveBase(arg) {} HoldArrowWalk::~HoldArrowWalk() = default; -bool HoldArrowWalk::init_(sead::Heap* heap) { - return MoveBase::init_(heap); -} - void HoldArrowWalk::enter_(ksys::act::ai::InlineParamPack* params) { MoveBase::enter_(params); } diff --git a/src/Game/AI/Action/actionHoldArrowWalk.h b/src/Game/AI/Action/actionHoldArrowWalk.h index fb98a1b9..4698cefe 100644 --- a/src/Game/AI/Action/actionHoldArrowWalk.h +++ b/src/Game/AI/Action/actionHoldArrowWalk.h @@ -11,7 +11,6 @@ public: explicit HoldArrowWalk(const InitArg& arg); ~HoldArrowWalk() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionHorseMoveToTargetAction.cpp b/src/Game/AI/Action/actionHorseMoveToTargetAction.cpp index be77ca16..67acd0b4 100644 --- a/src/Game/AI/Action/actionHorseMoveToTargetAction.cpp +++ b/src/Game/AI/Action/actionHorseMoveToTargetAction.cpp @@ -4,8 +4,6 @@ namespace uking::action { HorseMoveToTargetAction::HorseMoveToTargetAction(const InitArg& arg) : AnimalMoveGuidedBase(arg) {} -HorseMoveToTargetAction::~HorseMoveToTargetAction() = default; - bool HorseMoveToTargetAction::init_(sead::Heap* heap) { return AnimalMoveGuidedBase::init_(heap); } diff --git a/src/Game/AI/Action/actionHorseMoveToTargetAction.h b/src/Game/AI/Action/actionHorseMoveToTargetAction.h index 20046ab5..52e4b771 100644 --- a/src/Game/AI/Action/actionHorseMoveToTargetAction.h +++ b/src/Game/AI/Action/actionHorseMoveToTargetAction.h @@ -9,7 +9,6 @@ class HorseMoveToTargetAction : public AnimalMoveGuidedBase { SEAD_RTTI_OVERRIDE(HorseMoveToTargetAction, AnimalMoveGuidedBase) public: explicit HorseMoveToTargetAction(const InitArg& arg); - ~HorseMoveToTargetAction() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/AI/Action/actionHorseRandomMoveAction.cpp b/src/Game/AI/Action/actionHorseRandomMoveAction.cpp index 3f9827ec..2c65135e 100644 --- a/src/Game/AI/Action/actionHorseRandomMoveAction.cpp +++ b/src/Game/AI/Action/actionHorseRandomMoveAction.cpp @@ -4,20 +4,10 @@ namespace uking::action { HorseRandomMoveAction::HorseRandomMoveAction(const InitArg& arg) : AnimalMoveGuidedBase(arg) {} -HorseRandomMoveAction::~HorseRandomMoveAction() = default; - -bool HorseRandomMoveAction::init_(sead::Heap* heap) { - return AnimalMoveGuidedBase::init_(heap); -} - void HorseRandomMoveAction::enter_(ksys::act::ai::InlineParamPack* params) { AnimalMoveGuidedBase::enter_(params); } -void HorseRandomMoveAction::leave_() { - AnimalMoveGuidedBase::leave_(); -} - void HorseRandomMoveAction::loadParams_() { AnimalMoveGuidedBase::loadParams_(); getStaticParam(&mRadiusLimit_s, "RadiusLimit"); @@ -28,8 +18,4 @@ void HorseRandomMoveAction::loadParams_() { getStaticParam(&mIsCancelRequestedPathFirst_s, "IsCancelRequestedPathFirst"); } -void HorseRandomMoveAction::calc_() { - AnimalMoveGuidedBase::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionHorseRandomMoveAction.h b/src/Game/AI/Action/actionHorseRandomMoveAction.h index 779bf553..9deae444 100644 --- a/src/Game/AI/Action/actionHorseRandomMoveAction.h +++ b/src/Game/AI/Action/actionHorseRandomMoveAction.h @@ -9,16 +9,11 @@ class HorseRandomMoveAction : public AnimalMoveGuidedBase { SEAD_RTTI_OVERRIDE(HorseRandomMoveAction, AnimalMoveGuidedBase) public: explicit HorseRandomMoveAction(const InitArg& arg); - ~HorseRandomMoveAction() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // static_param at offset 0x78 const float* mRadiusLimit_s{}; // static_param at offset 0x80 diff --git a/src/Game/AI/Action/actionHorseReinsDefaultAction.cpp b/src/Game/AI/Action/actionHorseReinsDefaultAction.cpp index e6a9f9b0..2c83b6b1 100644 --- a/src/Game/AI/Action/actionHorseReinsDefaultAction.cpp +++ b/src/Game/AI/Action/actionHorseReinsDefaultAction.cpp @@ -6,10 +6,6 @@ HorseReinsDefaultAction::HorseReinsDefaultAction(const InitArg& arg) : ksys::act HorseReinsDefaultAction::~HorseReinsDefaultAction() = default; -bool HorseReinsDefaultAction::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - void HorseReinsDefaultAction::enter_(ksys::act::ai::InlineParamPack* params) { ksys::act::ai::Action::enter_(params); } diff --git a/src/Game/AI/Action/actionHorseReinsDefaultAction.h b/src/Game/AI/Action/actionHorseReinsDefaultAction.h index b0d3358e..49c82b21 100644 --- a/src/Game/AI/Action/actionHorseReinsDefaultAction.h +++ b/src/Game/AI/Action/actionHorseReinsDefaultAction.h @@ -10,7 +10,6 @@ public: explicit HorseReinsDefaultAction(const InitArg& arg); ~HorseReinsDefaultAction() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionHoverBase.cpp b/src/Game/AI/Action/actionHoverBase.cpp index 6f4e6362..45e96d33 100644 --- a/src/Game/AI/Action/actionHoverBase.cpp +++ b/src/Game/AI/Action/actionHoverBase.cpp @@ -4,8 +4,6 @@ namespace uking::action { HoverBase::HoverBase(const InitArg& arg) : FreeMovingAction(arg) {} -HoverBase::~HoverBase() = default; - bool HoverBase::init_(sead::Heap* heap) { return FreeMovingAction::init_(heap); } diff --git a/src/Game/AI/Action/actionHoverBase.h b/src/Game/AI/Action/actionHoverBase.h index e094d62a..781cb7aa 100644 --- a/src/Game/AI/Action/actionHoverBase.h +++ b/src/Game/AI/Action/actionHoverBase.h @@ -9,7 +9,6 @@ class HoverBase : public FreeMovingAction { SEAD_RTTI_OVERRIDE(HoverBase, FreeMovingAction) public: explicit HoverBase(const InitArg& arg); - ~HoverBase() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/AI/Action/actionHuntingDead.cpp b/src/Game/AI/Action/actionHuntingDead.cpp index a4aca92e..979a0b64 100644 --- a/src/Game/AI/Action/actionHuntingDead.cpp +++ b/src/Game/AI/Action/actionHuntingDead.cpp @@ -6,10 +6,6 @@ HuntingDead::HuntingDead(const InitArg& arg) : ksys::act::ai::Action(arg) {} HuntingDead::~HuntingDead() = default; -bool HuntingDead::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - void HuntingDead::enter_(ksys::act::ai::InlineParamPack* params) { ksys::act::ai::Action::enter_(params); } diff --git a/src/Game/AI/Action/actionHuntingDead.h b/src/Game/AI/Action/actionHuntingDead.h index d4e8375c..985b033c 100644 --- a/src/Game/AI/Action/actionHuntingDead.h +++ b/src/Game/AI/Action/actionHuntingDead.h @@ -10,7 +10,6 @@ public: explicit HuntingDead(const InitArg& arg); ~HuntingDead() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionIchigekiHeartUiClose.cpp b/src/Game/AI/Action/actionIchigekiHeartUiClose.cpp index 6b63d214..0f5a8557 100644 --- a/src/Game/AI/Action/actionIchigekiHeartUiClose.cpp +++ b/src/Game/AI/Action/actionIchigekiHeartUiClose.cpp @@ -10,18 +10,6 @@ bool IchigekiHeartUiClose::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void IchigekiHeartUiClose::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void IchigekiHeartUiClose::leave_() { - ksys::act::ai::Action::leave_(); -} - void IchigekiHeartUiClose::loadParams_() {} -void IchigekiHeartUiClose::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionIchigekiHeartUiClose.h b/src/Game/AI/Action/actionIchigekiHeartUiClose.h index 70cbbd45..7e644e5d 100644 --- a/src/Game/AI/Action/actionIchigekiHeartUiClose.h +++ b/src/Game/AI/Action/actionIchigekiHeartUiClose.h @@ -11,12 +11,9 @@ public: ~IchigekiHeartUiClose() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionIchigekiHeartUiOpen.cpp b/src/Game/AI/Action/actionIchigekiHeartUiOpen.cpp index 2bfa57ea..b050e565 100644 --- a/src/Game/AI/Action/actionIchigekiHeartUiOpen.cpp +++ b/src/Game/AI/Action/actionIchigekiHeartUiOpen.cpp @@ -10,18 +10,6 @@ bool IchigekiHeartUiOpen::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void IchigekiHeartUiOpen::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void IchigekiHeartUiOpen::leave_() { - ksys::act::ai::Action::leave_(); -} - void IchigekiHeartUiOpen::loadParams_() {} -void IchigekiHeartUiOpen::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionIchigekiHeartUiOpen.h b/src/Game/AI/Action/actionIchigekiHeartUiOpen.h index c466807b..7532ae24 100644 --- a/src/Game/AI/Action/actionIchigekiHeartUiOpen.h +++ b/src/Game/AI/Action/actionIchigekiHeartUiOpen.h @@ -11,12 +11,9 @@ public: ~IchigekiHeartUiOpen() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionIgniteThreeActorAttack.cpp b/src/Game/AI/Action/actionIgniteThreeActorAttack.cpp index e01d04cf..f5ab65d6 100644 --- a/src/Game/AI/Action/actionIgniteThreeActorAttack.cpp +++ b/src/Game/AI/Action/actionIgniteThreeActorAttack.cpp @@ -6,10 +6,6 @@ IgniteThreeActorAttack::IgniteThreeActorAttack(const InitArg& arg) : OnetimeStop IgniteThreeActorAttack::~IgniteThreeActorAttack() = default; -bool IgniteThreeActorAttack::init_(sead::Heap* heap) { - return OnetimeStopASPlay::init_(heap); -} - void IgniteThreeActorAttack::enter_(ksys::act::ai::InlineParamPack* params) { OnetimeStopASPlay::enter_(params); } diff --git a/src/Game/AI/Action/actionIgniteThreeActorAttack.h b/src/Game/AI/Action/actionIgniteThreeActorAttack.h index e24feed8..dc75962f 100644 --- a/src/Game/AI/Action/actionIgniteThreeActorAttack.h +++ b/src/Game/AI/Action/actionIgniteThreeActorAttack.h @@ -11,7 +11,6 @@ public: explicit IgniteThreeActorAttack(const InitArg& arg); ~IgniteThreeActorAttack() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionIgniteToTargetDir.cpp b/src/Game/AI/Action/actionIgniteToTargetDir.cpp index b1e8fbfa..92a2279d 100644 --- a/src/Game/AI/Action/actionIgniteToTargetDir.cpp +++ b/src/Game/AI/Action/actionIgniteToTargetDir.cpp @@ -6,24 +6,8 @@ IgniteToTargetDir::IgniteToTargetDir(const InitArg& arg) : IgniteToTargetSimple( IgniteToTargetDir::~IgniteToTargetDir() = default; -bool IgniteToTargetDir::init_(sead::Heap* heap) { - return IgniteToTargetSimple::init_(heap); -} - -void IgniteToTargetDir::enter_(ksys::act::ai::InlineParamPack* params) { - IgniteToTargetSimple::enter_(params); -} - -void IgniteToTargetDir::leave_() { - IgniteToTargetSimple::leave_(); -} - void IgniteToTargetDir::loadParams_() { IgniteToTargetSimple::loadParams_(); } -void IgniteToTargetDir::calc_() { - IgniteToTargetSimple::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionIgniteToTargetDir.h b/src/Game/AI/Action/actionIgniteToTargetDir.h index 3c5b1948..c3929910 100644 --- a/src/Game/AI/Action/actionIgniteToTargetDir.h +++ b/src/Game/AI/Action/actionIgniteToTargetDir.h @@ -11,13 +11,9 @@ public: explicit IgniteToTargetDir(const InitArg& arg); ~IgniteToTargetDir() override; - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionImmediateStopOwnedHorse.cpp b/src/Game/AI/Action/actionImmediateStopOwnedHorse.cpp index 076df48b..779aee29 100644 --- a/src/Game/AI/Action/actionImmediateStopOwnedHorse.cpp +++ b/src/Game/AI/Action/actionImmediateStopOwnedHorse.cpp @@ -10,20 +10,8 @@ bool ImmediateStopOwnedHorse::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void ImmediateStopOwnedHorse::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void ImmediateStopOwnedHorse::leave_() { - ksys::act::ai::Action::leave_(); -} - void ImmediateStopOwnedHorse::loadParams_() { getDynamicParam(&mResetChargeNum_d, "ResetChargeNum"); } -void ImmediateStopOwnedHorse::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionImmediateStopOwnedHorse.h b/src/Game/AI/Action/actionImmediateStopOwnedHorse.h index 80d6599a..951ca59b 100644 --- a/src/Game/AI/Action/actionImmediateStopOwnedHorse.h +++ b/src/Game/AI/Action/actionImmediateStopOwnedHorse.h @@ -11,13 +11,9 @@ public: ~ImmediateStopOwnedHorse() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 bool* mResetChargeNum_d{}; }; diff --git a/src/Game/AI/Action/actionInitPouchForQuest.cpp b/src/Game/AI/Action/actionInitPouchForQuest.cpp index 66b4676d..bb13210a 100644 --- a/src/Game/AI/Action/actionInitPouchForQuest.cpp +++ b/src/Game/AI/Action/actionInitPouchForQuest.cpp @@ -10,18 +10,6 @@ bool InitPouchForQuest::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void InitPouchForQuest::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void InitPouchForQuest::leave_() { - ksys::act::ai::Action::leave_(); -} - void InitPouchForQuest::loadParams_() {} -void InitPouchForQuest::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionInitPouchForQuest.h b/src/Game/AI/Action/actionInitPouchForQuest.h index 7a722ed9..671a4c5e 100644 --- a/src/Game/AI/Action/actionInitPouchForQuest.h +++ b/src/Game/AI/Action/actionInitPouchForQuest.h @@ -11,12 +11,9 @@ public: ~InitPouchForQuest() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionItemConductorDemoBind.cpp b/src/Game/AI/Action/actionItemConductorDemoBind.cpp index 985d321b..be9381d6 100644 --- a/src/Game/AI/Action/actionItemConductorDemoBind.cpp +++ b/src/Game/AI/Action/actionItemConductorDemoBind.cpp @@ -6,10 +6,6 @@ ItemConductorDemoBind::ItemConductorDemoBind(const InitArg& arg) : ksys::act::ai ItemConductorDemoBind::~ItemConductorDemoBind() = default; -bool ItemConductorDemoBind::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - void ItemConductorDemoBind::enter_(ksys::act::ai::InlineParamPack* params) { ksys::act::ai::Action::enter_(params); } diff --git a/src/Game/AI/Action/actionItemConductorDemoBind.h b/src/Game/AI/Action/actionItemConductorDemoBind.h index 2b8533fa..a5787125 100644 --- a/src/Game/AI/Action/actionItemConductorDemoBind.h +++ b/src/Game/AI/Action/actionItemConductorDemoBind.h @@ -10,7 +10,6 @@ public: explicit ItemConductorDemoBind(const InitArg& arg); ~ItemConductorDemoBind() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionJumpAttack.cpp b/src/Game/AI/Action/actionJumpAttack.cpp index 4dbe0df6..589401e0 100644 --- a/src/Game/AI/Action/actionJumpAttack.cpp +++ b/src/Game/AI/Action/actionJumpAttack.cpp @@ -6,10 +6,6 @@ JumpAttack::JumpAttack(const InitArg& arg) : ksys::act::ai::Action(arg) {} JumpAttack::~JumpAttack() = default; -bool JumpAttack::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - void JumpAttack::enter_(ksys::act::ai::InlineParamPack* params) { ksys::act::ai::Action::enter_(params); } diff --git a/src/Game/AI/Action/actionJumpAttack.h b/src/Game/AI/Action/actionJumpAttack.h index 26036087..90d49f96 100644 --- a/src/Game/AI/Action/actionJumpAttack.h +++ b/src/Game/AI/Action/actionJumpAttack.h @@ -10,7 +10,6 @@ public: explicit JumpAttack(const InitArg& arg); ~JumpAttack() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionKick.cpp b/src/Game/AI/Action/actionKick.cpp index e794a050..01304b0f 100644 --- a/src/Game/AI/Action/actionKick.cpp +++ b/src/Game/AI/Action/actionKick.cpp @@ -14,10 +14,6 @@ void Kick::enter_(ksys::act::ai::InlineParamPack* params) { ActionEx::enter_(params); } -void Kick::leave_() { - ActionEx::leave_(); -} - void Kick::loadParams_() { getStaticParam(&mPower_s, "Power"); getStaticParam(&mUpRate_s, "UpRate"); diff --git a/src/Game/AI/Action/actionKick.h b/src/Game/AI/Action/actionKick.h index d9788779..69e3eeb1 100644 --- a/src/Game/AI/Action/actionKick.h +++ b/src/Game/AI/Action/actionKick.h @@ -13,7 +13,6 @@ public: bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: diff --git a/src/Game/AI/Action/actionKillAllDemoSoundAction.cpp b/src/Game/AI/Action/actionKillAllDemoSoundAction.cpp index 24a6f7a5..16d1908b 100644 --- a/src/Game/AI/Action/actionKillAllDemoSoundAction.cpp +++ b/src/Game/AI/Action/actionKillAllDemoSoundAction.cpp @@ -10,18 +10,6 @@ bool KillAllDemoSoundAction::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void KillAllDemoSoundAction::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void KillAllDemoSoundAction::leave_() { - ksys::act::ai::Action::leave_(); -} - void KillAllDemoSoundAction::loadParams_() {} -void KillAllDemoSoundAction::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionKillAllDemoSoundAction.h b/src/Game/AI/Action/actionKillAllDemoSoundAction.h index 90cb5d36..e853348a 100644 --- a/src/Game/AI/Action/actionKillAllDemoSoundAction.h +++ b/src/Game/AI/Action/actionKillAllDemoSoundAction.h @@ -11,12 +11,9 @@ public: ~KillAllDemoSoundAction() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionKillUIScreenAction.cpp b/src/Game/AI/Action/actionKillUIScreenAction.cpp index a2f4af0c..0f32b28a 100644 --- a/src/Game/AI/Action/actionKillUIScreenAction.cpp +++ b/src/Game/AI/Action/actionKillUIScreenAction.cpp @@ -10,20 +10,8 @@ bool KillUIScreenAction::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void KillUIScreenAction::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void KillUIScreenAction::leave_() { - ksys::act::ai::Action::leave_(); -} - void KillUIScreenAction::loadParams_() { getDynamicParam(&mScreenName_d, "ScreenName"); } -void KillUIScreenAction::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionKillUIScreenAction.h b/src/Game/AI/Action/actionKillUIScreenAction.h index d7720bbe..dcc9a5fc 100644 --- a/src/Game/AI/Action/actionKillUIScreenAction.h +++ b/src/Game/AI/Action/actionKillUIScreenAction.h @@ -11,13 +11,9 @@ public: ~KillUIScreenAction() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 sead::SafeString* mScreenName_d{}; }; diff --git a/src/Game/AI/Action/actionLargeAttack.cpp b/src/Game/AI/Action/actionLargeAttack.cpp index c28a8acc..f5328931 100644 --- a/src/Game/AI/Action/actionLargeAttack.cpp +++ b/src/Game/AI/Action/actionLargeAttack.cpp @@ -6,10 +6,6 @@ LargeAttack::LargeAttack(const InitArg& arg) : ActionEx(arg) {} LargeAttack::~LargeAttack() = default; -bool LargeAttack::init_(sead::Heap* heap) { - return ActionEx::init_(heap); -} - void LargeAttack::enter_(ksys::act::ai::InlineParamPack* params) { ActionEx::enter_(params); } diff --git a/src/Game/AI/Action/actionLargeAttack.h b/src/Game/AI/Action/actionLargeAttack.h index 97f13d7d..587448f4 100644 --- a/src/Game/AI/Action/actionLargeAttack.h +++ b/src/Game/AI/Action/actionLargeAttack.h @@ -11,7 +11,6 @@ public: explicit LargeAttack(const InitArg& arg); ~LargeAttack() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionLargeDamage.cpp b/src/Game/AI/Action/actionLargeDamage.cpp index 1248d3a4..c6d00375 100644 --- a/src/Game/AI/Action/actionLargeDamage.cpp +++ b/src/Game/AI/Action/actionLargeDamage.cpp @@ -6,10 +6,6 @@ LargeDamage::LargeDamage(const InitArg& arg) : ActionEx(arg) {} LargeDamage::~LargeDamage() = default; -bool LargeDamage::init_(sead::Heap* heap) { - return ActionEx::init_(heap); -} - void LargeDamage::enter_(ksys::act::ai::InlineParamPack* params) { ActionEx::enter_(params); } diff --git a/src/Game/AI/Action/actionLargeDamage.h b/src/Game/AI/Action/actionLargeDamage.h index 577fc76e..6dbf977f 100644 --- a/src/Game/AI/Action/actionLargeDamage.h +++ b/src/Game/AI/Action/actionLargeDamage.h @@ -11,7 +11,6 @@ public: explicit LargeDamage(const InitArg& arg); ~LargeDamage() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionLastBossFlyWaitTurnToTarget.cpp b/src/Game/AI/Action/actionLastBossFlyWaitTurnToTarget.cpp index 36d0f4d3..a3a2ce62 100644 --- a/src/Game/AI/Action/actionLastBossFlyWaitTurnToTarget.cpp +++ b/src/Game/AI/Action/actionLastBossFlyWaitTurnToTarget.cpp @@ -7,10 +7,6 @@ LastBossFlyWaitTurnToTarget::LastBossFlyWaitTurnToTarget(const InitArg& arg) LastBossFlyWaitTurnToTarget::~LastBossFlyWaitTurnToTarget() = default; -bool LastBossFlyWaitTurnToTarget::init_(sead::Heap* heap) { - return LastBossFlyWait::init_(heap); -} - void LastBossFlyWaitTurnToTarget::enter_(ksys::act::ai::InlineParamPack* params) { LastBossFlyWait::enter_(params); } @@ -27,8 +23,4 @@ void LastBossFlyWaitTurnToTarget::loadParams_() { getDynamicParam(&mTargetPos_d, "TargetPos"); } -void LastBossFlyWaitTurnToTarget::calc_() { - LastBossFlyWait::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionLastBossFlyWaitTurnToTarget.h b/src/Game/AI/Action/actionLastBossFlyWaitTurnToTarget.h index 5606294f..70ea63c0 100644 --- a/src/Game/AI/Action/actionLastBossFlyWaitTurnToTarget.h +++ b/src/Game/AI/Action/actionLastBossFlyWaitTurnToTarget.h @@ -11,14 +11,11 @@ public: explicit LastBossFlyWaitTurnToTarget(const InitArg& arg); ~LastBossFlyWaitTurnToTarget() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; protected: - void calc_() override; - // static_param at offset 0xa0 const float* mTurnStartDiffAng_s{}; // static_param at offset 0xa8 diff --git a/src/Game/AI/Action/actionLiftTurn.cpp b/src/Game/AI/Action/actionLiftTurn.cpp index 183e7d73..7a63bf85 100644 --- a/src/Game/AI/Action/actionLiftTurn.cpp +++ b/src/Game/AI/Action/actionLiftTurn.cpp @@ -4,8 +4,6 @@ namespace uking::action { LiftTurn::LiftTurn(const InitArg& arg) : TurnBase(arg) {} -LiftTurn::~LiftTurn() = default; - bool LiftTurn::init_(sead::Heap* heap) { return TurnBase::init_(heap); } diff --git a/src/Game/AI/Action/actionLiftTurn.h b/src/Game/AI/Action/actionLiftTurn.h index 137cba8e..a93a9a32 100644 --- a/src/Game/AI/Action/actionLiftTurn.h +++ b/src/Game/AI/Action/actionLiftTurn.h @@ -9,7 +9,6 @@ class LiftTurn : public TurnBase { SEAD_RTTI_OVERRIDE(LiftTurn, TurnBase) public: explicit LiftTurn(const InitArg& arg); - ~LiftTurn() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/AI/Action/actionLiftWalk.cpp b/src/Game/AI/Action/actionLiftWalk.cpp index 51435231..1240db0b 100644 --- a/src/Game/AI/Action/actionLiftWalk.cpp +++ b/src/Game/AI/Action/actionLiftWalk.cpp @@ -4,8 +4,6 @@ namespace uking::action { LiftWalk::LiftWalk(const InitArg& arg) : MoveBase(arg) {} -LiftWalk::~LiftWalk() = default; - bool LiftWalk::init_(sead::Heap* heap) { return MoveBase::init_(heap); } diff --git a/src/Game/AI/Action/actionLiftWalk.h b/src/Game/AI/Action/actionLiftWalk.h index 6965809c..a643912e 100644 --- a/src/Game/AI/Action/actionLiftWalk.h +++ b/src/Game/AI/Action/actionLiftWalk.h @@ -9,7 +9,6 @@ class LiftWalk : public MoveBase { SEAD_RTTI_OVERRIDE(LiftWalk, MoveBase) public: explicit LiftWalk(const InitArg& arg); - ~LiftWalk() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/AI/Action/actionLinearFlyAttack.cpp b/src/Game/AI/Action/actionLinearFlyAttack.cpp index f2b9442c..b4bc4a07 100644 --- a/src/Game/AI/Action/actionLinearFlyAttack.cpp +++ b/src/Game/AI/Action/actionLinearFlyAttack.cpp @@ -4,8 +4,6 @@ namespace uking::action { LinearFlyAttack::LinearFlyAttack(const InitArg& arg) : LinearFlyAttackBase(arg) {} -LinearFlyAttack::~LinearFlyAttack() = default; - bool LinearFlyAttack::init_(sead::Heap* heap) { return LinearFlyAttackBase::init_(heap); } diff --git a/src/Game/AI/Action/actionLinearFlyAttack.h b/src/Game/AI/Action/actionLinearFlyAttack.h index dc5fd726..40a89446 100644 --- a/src/Game/AI/Action/actionLinearFlyAttack.h +++ b/src/Game/AI/Action/actionLinearFlyAttack.h @@ -9,7 +9,6 @@ class LinearFlyAttack : public LinearFlyAttackBase { SEAD_RTTI_OVERRIDE(LinearFlyAttack, LinearFlyAttackBase) public: explicit LinearFlyAttack(const InitArg& arg); - ~LinearFlyAttack() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/AI/Action/actionListenerFixPositionAction.cpp b/src/Game/AI/Action/actionListenerFixPositionAction.cpp index c567ab72..e3fb30b8 100644 --- a/src/Game/AI/Action/actionListenerFixPositionAction.cpp +++ b/src/Game/AI/Action/actionListenerFixPositionAction.cpp @@ -11,20 +11,8 @@ bool ListenerFixPositionAction::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void ListenerFixPositionAction::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void ListenerFixPositionAction::leave_() { - ksys::act::ai::Action::leave_(); -} - void ListenerFixPositionAction::loadParams_() { getDynamicParam(&mFixType_d, "FixType"); } -void ListenerFixPositionAction::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionListenerFixPositionAction.h b/src/Game/AI/Action/actionListenerFixPositionAction.h index 0c5755e1..74aa5ef7 100644 --- a/src/Game/AI/Action/actionListenerFixPositionAction.h +++ b/src/Game/AI/Action/actionListenerFixPositionAction.h @@ -11,13 +11,9 @@ public: ~ListenerFixPositionAction() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 sead::SafeString* mFixType_d{}; }; diff --git a/src/Game/AI/Action/actionListenerSetModeAction.cpp b/src/Game/AI/Action/actionListenerSetModeAction.cpp index 74e3f49f..46afd71e 100644 --- a/src/Game/AI/Action/actionListenerSetModeAction.cpp +++ b/src/Game/AI/Action/actionListenerSetModeAction.cpp @@ -10,20 +10,8 @@ bool ListenerSetModeAction::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void ListenerSetModeAction::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void ListenerSetModeAction::leave_() { - ksys::act::ai::Action::leave_(); -} - void ListenerSetModeAction::loadParams_() { getDynamicParam(&mMode_d, "Mode"); } -void ListenerSetModeAction::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionListenerSetModeAction.h b/src/Game/AI/Action/actionListenerSetModeAction.h index f13d2fb7..88bc8d3c 100644 --- a/src/Game/AI/Action/actionListenerSetModeAction.h +++ b/src/Game/AI/Action/actionListenerSetModeAction.h @@ -11,13 +11,9 @@ public: ~ListenerSetModeAction() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 sead::SafeString* mMode_d{}; }; diff --git a/src/Game/AI/Action/actionLookAtObject.cpp b/src/Game/AI/Action/actionLookAtObject.cpp index ebf45c93..fa25503d 100644 --- a/src/Game/AI/Action/actionLookAtObject.cpp +++ b/src/Game/AI/Action/actionLookAtObject.cpp @@ -10,20 +10,8 @@ bool LookAtObject::init_(sead::Heap* heap) { return LookAtObjectBase::init_(heap); } -void LookAtObject::enter_(ksys::act::ai::InlineParamPack* params) { - LookAtObjectBase::enter_(params); -} - -void LookAtObject::leave_() { - LookAtObjectBase::leave_(); -} - void LookAtObject::loadParams_() { LookAtObjectBase::loadParams_(); } -void LookAtObject::calc_() { - LookAtObjectBase::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionLookAtObject.h b/src/Game/AI/Action/actionLookAtObject.h index 75ab5dc3..6fa6d83e 100644 --- a/src/Game/AI/Action/actionLookAtObject.h +++ b/src/Game/AI/Action/actionLookAtObject.h @@ -12,12 +12,9 @@ public: ~LookAtObject() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionLookAtObjectSeachAwareness.cpp b/src/Game/AI/Action/actionLookAtObjectSeachAwareness.cpp index 221f0c8d..6a97608b 100644 --- a/src/Game/AI/Action/actionLookAtObjectSeachAwareness.cpp +++ b/src/Game/AI/Action/actionLookAtObjectSeachAwareness.cpp @@ -10,21 +10,9 @@ bool LookAtObjectSeachAwareness::init_(sead::Heap* heap) { return LookAtObject::init_(heap); } -void LookAtObjectSeachAwareness::enter_(ksys::act::ai::InlineParamPack* params) { - LookAtObject::enter_(params); -} - -void LookAtObjectSeachAwareness::leave_() { - LookAtObject::leave_(); -} - void LookAtObjectSeachAwareness::loadParams_() { LookAtObject::loadParams_(); getDynamicParam(&mIsRetrySearchBaseProc_d, "IsRetrySearchBaseProc"); } -void LookAtObjectSeachAwareness::calc_() { - LookAtObject::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionLookAtObjectSeachAwareness.h b/src/Game/AI/Action/actionLookAtObjectSeachAwareness.h index 2f922cf1..90809767 100644 --- a/src/Game/AI/Action/actionLookAtObjectSeachAwareness.h +++ b/src/Game/AI/Action/actionLookAtObjectSeachAwareness.h @@ -12,13 +12,9 @@ public: ~LookAtObjectSeachAwareness() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0xc8 bool* mIsRetrySearchBaseProc_d{}; }; diff --git a/src/Game/AI/Action/actionLookAtTheFront.cpp b/src/Game/AI/Action/actionLookAtTheFront.cpp index 12a01108..536dd943 100644 --- a/src/Game/AI/Action/actionLookAtTheFront.cpp +++ b/src/Game/AI/Action/actionLookAtTheFront.cpp @@ -10,20 +10,8 @@ bool LookAtTheFront::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void LookAtTheFront::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void LookAtTheFront::leave_() { - ksys::act::ai::Action::leave_(); -} - void LookAtTheFront::loadParams_() { getDynamicParam(&mIsValid_d, "IsValid"); } -void LookAtTheFront::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionLookAtTheFront.h b/src/Game/AI/Action/actionLookAtTheFront.h index 80dc2118..3dfff963 100644 --- a/src/Game/AI/Action/actionLookAtTheFront.h +++ b/src/Game/AI/Action/actionLookAtTheFront.h @@ -11,13 +11,9 @@ public: ~LookAtTheFront() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 bool* mIsValid_d{}; }; diff --git a/src/Game/AI/Action/actionMarkPosition.cpp b/src/Game/AI/Action/actionMarkPosition.cpp index 9cbd927f..be716589 100644 --- a/src/Game/AI/Action/actionMarkPosition.cpp +++ b/src/Game/AI/Action/actionMarkPosition.cpp @@ -10,22 +10,10 @@ bool MarkPosition::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void MarkPosition::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void MarkPosition::leave_() { - ksys::act::ai::Action::leave_(); -} - void MarkPosition::loadParams_() { getDynamicParam(&mPositionX_d, "PositionX"); getDynamicParam(&mPositionY_d, "PositionY"); getDynamicParam(&mPositionZ_d, "PositionZ"); } -void MarkPosition::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionMarkPosition.h b/src/Game/AI/Action/actionMarkPosition.h index 82eba4cb..24feea9d 100644 --- a/src/Game/AI/Action/actionMarkPosition.h +++ b/src/Game/AI/Action/actionMarkPosition.h @@ -11,13 +11,9 @@ public: ~MarkPosition() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 float* mPositionX_d{}; // dynamic_param at offset 0x28 diff --git a/src/Game/AI/Action/actionMarkPositionFromGameData.cpp b/src/Game/AI/Action/actionMarkPositionFromGameData.cpp index 6a2e484a..cfbe2761 100644 --- a/src/Game/AI/Action/actionMarkPositionFromGameData.cpp +++ b/src/Game/AI/Action/actionMarkPositionFromGameData.cpp @@ -11,21 +11,9 @@ bool MarkPositionFromGameData::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void MarkPositionFromGameData::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void MarkPositionFromGameData::leave_() { - ksys::act::ai::Action::leave_(); -} - void MarkPositionFromGameData::loadParams_() { getDynamicParam(&mPinColorIdx_d, "PinColorIdx"); getDynamicParam(&mGameDataVec3_d, "GameDataVec3"); } -void MarkPositionFromGameData::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionMarkPositionFromGameData.h b/src/Game/AI/Action/actionMarkPositionFromGameData.h index 2ace74ec..eec18d20 100644 --- a/src/Game/AI/Action/actionMarkPositionFromGameData.h +++ b/src/Game/AI/Action/actionMarkPositionFromGameData.h @@ -11,13 +11,9 @@ public: ~MarkPositionFromGameData() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 int* mPinColorIdx_d{}; // dynamic_param at offset 0x28 diff --git a/src/Game/AI/Action/actionMimic.cpp b/src/Game/AI/Action/actionMimic.cpp index c86071be..41680afe 100644 --- a/src/Game/AI/Action/actionMimic.cpp +++ b/src/Game/AI/Action/actionMimic.cpp @@ -6,10 +6,6 @@ Mimic::Mimic(const InitArg& arg) : ActionWithPosAngReduce(arg) {} Mimic::~Mimic() = default; -bool Mimic::init_(sead::Heap* heap) { - return ActionWithPosAngReduce::init_(heap); -} - void Mimic::enter_(ksys::act::ai::InlineParamPack* params) { ActionWithPosAngReduce::enter_(params); } diff --git a/src/Game/AI/Action/actionMimic.h b/src/Game/AI/Action/actionMimic.h index aaed23e6..7e90998d 100644 --- a/src/Game/AI/Action/actionMimic.h +++ b/src/Game/AI/Action/actionMimic.h @@ -11,7 +11,6 @@ public: explicit Mimic(const InitArg& arg); ~Mimic() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionMimicFreeze.cpp b/src/Game/AI/Action/actionMimicFreeze.cpp index 22a866c2..36fc1a70 100644 --- a/src/Game/AI/Action/actionMimicFreeze.cpp +++ b/src/Game/AI/Action/actionMimicFreeze.cpp @@ -6,10 +6,6 @@ MimicFreeze::MimicFreeze(const InitArg& arg) : Freeze(arg) {} MimicFreeze::~MimicFreeze() = default; -bool MimicFreeze::init_(sead::Heap* heap) { - return Freeze::init_(heap); -} - void MimicFreeze::enter_(ksys::act::ai::InlineParamPack* params) { Freeze::enter_(params); } @@ -22,8 +18,4 @@ void MimicFreeze::loadParams_() { Freeze::loadParams_(); } -void MimicFreeze::calc_() { - Freeze::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionMimicFreeze.h b/src/Game/AI/Action/actionMimicFreeze.h index d23fc31f..8225edcb 100644 --- a/src/Game/AI/Action/actionMimicFreeze.h +++ b/src/Game/AI/Action/actionMimicFreeze.h @@ -11,13 +11,11 @@ public: explicit MimicFreeze(const InitArg& arg); ~MimicFreeze() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionMoveBase.cpp b/src/Game/AI/Action/actionMoveBase.cpp index f28048be..20b3869d 100644 --- a/src/Game/AI/Action/actionMoveBase.cpp +++ b/src/Game/AI/Action/actionMoveBase.cpp @@ -6,10 +6,6 @@ MoveBase::MoveBase(const InitArg& arg) : ActionEx(arg) {} MoveBase::~MoveBase() = default; -bool MoveBase::init_(sead::Heap* heap) { - return ActionEx::init_(heap); -} - void MoveBase::enter_(ksys::act::ai::InlineParamPack* params) { ActionEx::enter_(params); } diff --git a/src/Game/AI/Action/actionMoveBase.h b/src/Game/AI/Action/actionMoveBase.h index ae3289bb..4d140aa0 100644 --- a/src/Game/AI/Action/actionMoveBase.h +++ b/src/Game/AI/Action/actionMoveBase.h @@ -11,7 +11,6 @@ public: explicit MoveBase(const InitArg& arg); ~MoveBase() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionMoveWithAS.cpp b/src/Game/AI/Action/actionMoveWithAS.cpp index 009874a9..f68ef5ed 100644 --- a/src/Game/AI/Action/actionMoveWithAS.cpp +++ b/src/Game/AI/Action/actionMoveWithAS.cpp @@ -14,17 +14,9 @@ void MoveWithAS::enter_(ksys::act::ai::InlineParamPack* params) { MoveBase::enter_(params); } -void MoveWithAS::leave_() { - MoveBase::leave_(); -} - void MoveWithAS::loadParams_() { MoveBase::loadParams_(); getStaticParam(&mASName_s, "ASName"); } -void MoveWithAS::calc_() { - MoveBase::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionMoveWithAS.h b/src/Game/AI/Action/actionMoveWithAS.h index 8a57189a..fe11d732 100644 --- a/src/Game/AI/Action/actionMoveWithAS.h +++ b/src/Game/AI/Action/actionMoveWithAS.h @@ -13,12 +13,9 @@ public: bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // static_param at offset 0xe0 sead::SafeString mASName_s{}; }; diff --git a/src/Game/AI/Action/actionMsg2CameraKeepState.cpp b/src/Game/AI/Action/actionMsg2CameraKeepState.cpp index 49fa504b..86179f4d 100644 --- a/src/Game/AI/Action/actionMsg2CameraKeepState.cpp +++ b/src/Game/AI/Action/actionMsg2CameraKeepState.cpp @@ -4,24 +4,4 @@ namespace uking::action { Msg2CameraKeepState::Msg2CameraKeepState(const InitArg& arg) : ksys::act::ai::Action(arg) {} -Msg2CameraKeepState::~Msg2CameraKeepState() = default; - -bool Msg2CameraKeepState::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - -void Msg2CameraKeepState::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void Msg2CameraKeepState::leave_() { - ksys::act::ai::Action::leave_(); -} - -void Msg2CameraKeepState::loadParams_() {} - -void Msg2CameraKeepState::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionMsg2CameraKeepState.h b/src/Game/AI/Action/actionMsg2CameraKeepState.h index 210fa571..ec005b71 100644 --- a/src/Game/AI/Action/actionMsg2CameraKeepState.h +++ b/src/Game/AI/Action/actionMsg2CameraKeepState.h @@ -8,15 +8,8 @@ class Msg2CameraKeepState : public ksys::act::ai::Action { SEAD_RTTI_OVERRIDE(Msg2CameraKeepState, ksys::act::ai::Action) public: explicit Msg2CameraKeepState(const InitArg& arg); - ~Msg2CameraKeepState() override; - - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionMsg2CameraReset.cpp b/src/Game/AI/Action/actionMsg2CameraReset.cpp index 959c9804..5b5a7db5 100644 --- a/src/Game/AI/Action/actionMsg2CameraReset.cpp +++ b/src/Game/AI/Action/actionMsg2CameraReset.cpp @@ -4,24 +4,4 @@ namespace uking::action { Msg2CameraReset::Msg2CameraReset(const InitArg& arg) : ksys::act::ai::Action(arg) {} -Msg2CameraReset::~Msg2CameraReset() = default; - -bool Msg2CameraReset::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - -void Msg2CameraReset::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void Msg2CameraReset::leave_() { - ksys::act::ai::Action::leave_(); -} - -void Msg2CameraReset::loadParams_() {} - -void Msg2CameraReset::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionMsg2CameraReset.h b/src/Game/AI/Action/actionMsg2CameraReset.h index 93d0e33c..126da97a 100644 --- a/src/Game/AI/Action/actionMsg2CameraReset.h +++ b/src/Game/AI/Action/actionMsg2CameraReset.h @@ -8,15 +8,8 @@ class Msg2CameraReset : public ksys::act::ai::Action { SEAD_RTTI_OVERRIDE(Msg2CameraReset, ksys::act::ai::Action) public: explicit Msg2CameraReset(const InitArg& arg); - ~Msg2CameraReset() override; - - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionMsg2CameraResetInterpolate.cpp b/src/Game/AI/Action/actionMsg2CameraResetInterpolate.cpp index 13c19a81..9e483112 100644 --- a/src/Game/AI/Action/actionMsg2CameraResetInterpolate.cpp +++ b/src/Game/AI/Action/actionMsg2CameraResetInterpolate.cpp @@ -5,26 +5,8 @@ namespace uking::action { Msg2CameraResetInterpolate::Msg2CameraResetInterpolate(const InitArg& arg) : ksys::act::ai::Action(arg) {} -Msg2CameraResetInterpolate::~Msg2CameraResetInterpolate() = default; - -bool Msg2CameraResetInterpolate::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - -void Msg2CameraResetInterpolate::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void Msg2CameraResetInterpolate::leave_() { - ksys::act::ai::Action::leave_(); -} - void Msg2CameraResetInterpolate::loadParams_() { getDynamicParam2(&mInterpolateParam_d, "InterpolateParam"); } -void Msg2CameraResetInterpolate::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionMsg2CameraResetInterpolate.h b/src/Game/AI/Action/actionMsg2CameraResetInterpolate.h index 2ba7e9c6..50b45517 100644 --- a/src/Game/AI/Action/actionMsg2CameraResetInterpolate.h +++ b/src/Game/AI/Action/actionMsg2CameraResetInterpolate.h @@ -8,16 +8,10 @@ class Msg2CameraResetInterpolate : public ksys::act::ai::Action { SEAD_RTTI_OVERRIDE(Msg2CameraResetInterpolate, ksys::act::ai::Action) public: explicit Msg2CameraResetInterpolate(const InitArg& arg); - ~Msg2CameraResetInterpolate() override; - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic2_param at offset 0x20 float* mInterpolateParam_d{}; }; diff --git a/src/Game/AI/Action/actionMsg2CameraResetNoConnect.cpp b/src/Game/AI/Action/actionMsg2CameraResetNoConnect.cpp index cc00947b..dd08e61d 100644 --- a/src/Game/AI/Action/actionMsg2CameraResetNoConnect.cpp +++ b/src/Game/AI/Action/actionMsg2CameraResetNoConnect.cpp @@ -5,24 +5,4 @@ namespace uking::action { Msg2CameraResetNoConnect::Msg2CameraResetNoConnect(const InitArg& arg) : ksys::act::ai::Action(arg) {} -Msg2CameraResetNoConnect::~Msg2CameraResetNoConnect() = default; - -bool Msg2CameraResetNoConnect::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - -void Msg2CameraResetNoConnect::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void Msg2CameraResetNoConnect::leave_() { - ksys::act::ai::Action::leave_(); -} - -void Msg2CameraResetNoConnect::loadParams_() {} - -void Msg2CameraResetNoConnect::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionMsg2CameraResetNoConnect.h b/src/Game/AI/Action/actionMsg2CameraResetNoConnect.h index 63d99949..eb0ef6d2 100644 --- a/src/Game/AI/Action/actionMsg2CameraResetNoConnect.h +++ b/src/Game/AI/Action/actionMsg2CameraResetNoConnect.h @@ -8,15 +8,8 @@ class Msg2CameraResetNoConnect : public ksys::act::ai::Action { SEAD_RTTI_OVERRIDE(Msg2CameraResetNoConnect, ksys::act::ai::Action) public: explicit Msg2CameraResetNoConnect(const InitArg& arg); - ~Msg2CameraResetNoConnect() override; - - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionNPCBuyItem.cpp b/src/Game/AI/Action/actionNPCBuyItem.cpp index 919d5bac..bdfe3493 100644 --- a/src/Game/AI/Action/actionNPCBuyItem.cpp +++ b/src/Game/AI/Action/actionNPCBuyItem.cpp @@ -6,22 +6,4 @@ NPCBuyItem::NPCBuyItem(const InitArg& arg) : ksys::act::ai::Action(arg) {} NPCBuyItem::~NPCBuyItem() = default; -bool NPCBuyItem::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - -void NPCBuyItem::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void NPCBuyItem::leave_() { - ksys::act::ai::Action::leave_(); -} - -void NPCBuyItem::loadParams_() {} - -void NPCBuyItem::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionNPCBuyItem.h b/src/Game/AI/Action/actionNPCBuyItem.h index f82c6b45..3b427081 100644 --- a/src/Game/AI/Action/actionNPCBuyItem.h +++ b/src/Game/AI/Action/actionNPCBuyItem.h @@ -10,13 +10,7 @@ public: explicit NPCBuyItem(const InitArg& arg); ~NPCBuyItem() override; - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; - protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionNPCCalculateMaterialValue.cpp b/src/Game/AI/Action/actionNPCCalculateMaterialValue.cpp index a7bc66dd..73995f98 100644 --- a/src/Game/AI/Action/actionNPCCalculateMaterialValue.cpp +++ b/src/Game/AI/Action/actionNPCCalculateMaterialValue.cpp @@ -7,22 +7,4 @@ NPCCalculateMaterialValue::NPCCalculateMaterialValue(const InitArg& arg) NPCCalculateMaterialValue::~NPCCalculateMaterialValue() = default; -bool NPCCalculateMaterialValue::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - -void NPCCalculateMaterialValue::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void NPCCalculateMaterialValue::leave_() { - ksys::act::ai::Action::leave_(); -} - -void NPCCalculateMaterialValue::loadParams_() {} - -void NPCCalculateMaterialValue::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionNPCCalculateMaterialValue.h b/src/Game/AI/Action/actionNPCCalculateMaterialValue.h index 1bfdff7d..a974d47d 100644 --- a/src/Game/AI/Action/actionNPCCalculateMaterialValue.h +++ b/src/Game/AI/Action/actionNPCCalculateMaterialValue.h @@ -10,13 +10,7 @@ public: explicit NPCCalculateMaterialValue(const InitArg& arg); ~NPCCalculateMaterialValue() override; - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; - protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionNPCChangeBoots.cpp b/src/Game/AI/Action/actionNPCChangeBoots.cpp index 777432dd..926adbb6 100644 --- a/src/Game/AI/Action/actionNPCChangeBoots.cpp +++ b/src/Game/AI/Action/actionNPCChangeBoots.cpp @@ -10,20 +10,8 @@ bool NPCChangeBoots::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void NPCChangeBoots::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void NPCChangeBoots::leave_() { - ksys::act::ai::Action::leave_(); -} - void NPCChangeBoots::loadParams_() { getDynamicParam(&mBootsNumber_d, "BootsNumber"); } -void NPCChangeBoots::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionNPCChangeBoots.h b/src/Game/AI/Action/actionNPCChangeBoots.h index 62534f21..bd5c4d38 100644 --- a/src/Game/AI/Action/actionNPCChangeBoots.h +++ b/src/Game/AI/Action/actionNPCChangeBoots.h @@ -11,13 +11,9 @@ public: ~NPCChangeBoots() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 int* mBootsNumber_d{}; }; diff --git a/src/Game/AI/Action/actionNPCCheckHorseAssociated.cpp b/src/Game/AI/Action/actionNPCCheckHorseAssociated.cpp index a060d48f..1f21d338 100644 --- a/src/Game/AI/Action/actionNPCCheckHorseAssociated.cpp +++ b/src/Game/AI/Action/actionNPCCheckHorseAssociated.cpp @@ -6,22 +6,4 @@ NPCCheckHorseAssociated::NPCCheckHorseAssociated(const InitArg& arg) : ksys::act NPCCheckHorseAssociated::~NPCCheckHorseAssociated() = default; -bool NPCCheckHorseAssociated::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - -void NPCCheckHorseAssociated::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void NPCCheckHorseAssociated::leave_() { - ksys::act::ai::Action::leave_(); -} - -void NPCCheckHorseAssociated::loadParams_() {} - -void NPCCheckHorseAssociated::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionNPCCheckHorseAssociated.h b/src/Game/AI/Action/actionNPCCheckHorseAssociated.h index 881ffcf8..e0ba57e9 100644 --- a/src/Game/AI/Action/actionNPCCheckHorseAssociated.h +++ b/src/Game/AI/Action/actionNPCCheckHorseAssociated.h @@ -10,13 +10,7 @@ public: explicit NPCCheckHorseAssociated(const InitArg& arg); ~NPCCheckHorseAssociated() override; - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; - protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionNPCDeliverHorse.cpp b/src/Game/AI/Action/actionNPCDeliverHorse.cpp index fbf6251f..2cdee0a4 100644 --- a/src/Game/AI/Action/actionNPCDeliverHorse.cpp +++ b/src/Game/AI/Action/actionNPCDeliverHorse.cpp @@ -6,22 +6,4 @@ NPCDeliverHorse::NPCDeliverHorse(const InitArg& arg) : ksys::act::ai::Action(arg NPCDeliverHorse::~NPCDeliverHorse() = default; -bool NPCDeliverHorse::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - -void NPCDeliverHorse::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void NPCDeliverHorse::leave_() { - ksys::act::ai::Action::leave_(); -} - -void NPCDeliverHorse::loadParams_() {} - -void NPCDeliverHorse::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionNPCDeliverHorse.h b/src/Game/AI/Action/actionNPCDeliverHorse.h index b94ab487..73471edc 100644 --- a/src/Game/AI/Action/actionNPCDeliverHorse.h +++ b/src/Game/AI/Action/actionNPCDeliverHorse.h @@ -10,13 +10,7 @@ public: explicit NPCDeliverHorse(const InitArg& arg); ~NPCDeliverHorse() override; - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; - protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionNPCDyeGoods.cpp b/src/Game/AI/Action/actionNPCDyeGoods.cpp index 5e09e146..eb0e0bdb 100644 --- a/src/Game/AI/Action/actionNPCDyeGoods.cpp +++ b/src/Game/AI/Action/actionNPCDyeGoods.cpp @@ -6,22 +6,4 @@ NPCDyeGoods::NPCDyeGoods(const InitArg& arg) : ksys::act::ai::Action(arg) {} NPCDyeGoods::~NPCDyeGoods() = default; -bool NPCDyeGoods::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - -void NPCDyeGoods::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void NPCDyeGoods::leave_() { - ksys::act::ai::Action::leave_(); -} - -void NPCDyeGoods::loadParams_() {} - -void NPCDyeGoods::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionNPCDyeGoods.h b/src/Game/AI/Action/actionNPCDyeGoods.h index ef09f29e..28dfd8f7 100644 --- a/src/Game/AI/Action/actionNPCDyeGoods.h +++ b/src/Game/AI/Action/actionNPCDyeGoods.h @@ -10,13 +10,7 @@ public: explicit NPCDyeGoods(const InitArg& arg); ~NPCDyeGoods() override; - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; - protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionNPCDyeShopCloseMaterial.cpp b/src/Game/AI/Action/actionNPCDyeShopCloseMaterial.cpp index 44dd98c7..e545f7bf 100644 --- a/src/Game/AI/Action/actionNPCDyeShopCloseMaterial.cpp +++ b/src/Game/AI/Action/actionNPCDyeShopCloseMaterial.cpp @@ -10,18 +10,6 @@ bool NPCDyeShopCloseMaterial::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void NPCDyeShopCloseMaterial::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void NPCDyeShopCloseMaterial::leave_() { - ksys::act::ai::Action::leave_(); -} - void NPCDyeShopCloseMaterial::loadParams_() {} -void NPCDyeShopCloseMaterial::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionNPCDyeShopCloseMaterial.h b/src/Game/AI/Action/actionNPCDyeShopCloseMaterial.h index cf15a000..74480401 100644 --- a/src/Game/AI/Action/actionNPCDyeShopCloseMaterial.h +++ b/src/Game/AI/Action/actionNPCDyeShopCloseMaterial.h @@ -11,12 +11,9 @@ public: ~NPCDyeShopCloseMaterial() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionNPCDyeShopReception.cpp b/src/Game/AI/Action/actionNPCDyeShopReception.cpp index 0d7a9aca..6cdd5eb1 100644 --- a/src/Game/AI/Action/actionNPCDyeShopReception.cpp +++ b/src/Game/AI/Action/actionNPCDyeShopReception.cpp @@ -14,12 +14,6 @@ void NPCDyeShopReception::enter_(ksys::act::ai::InlineParamPack* params) { ksys::act::ai::Action::enter_(params); } -void NPCDyeShopReception::leave_() { - ksys::act::ai::Action::leave_(); -} - -void NPCDyeShopReception::loadParams_() {} - void NPCDyeShopReception::calc_() { ksys::act::ai::Action::calc_(); } diff --git a/src/Game/AI/Action/actionNPCDyeShopReception.h b/src/Game/AI/Action/actionNPCDyeShopReception.h index d7e611ad..d6f43e2e 100644 --- a/src/Game/AI/Action/actionNPCDyeShopReception.h +++ b/src/Game/AI/Action/actionNPCDyeShopReception.h @@ -12,8 +12,6 @@ public: bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; protected: void calc_() override; diff --git a/src/Game/AI/Action/actionNPCEndHorseReception.cpp b/src/Game/AI/Action/actionNPCEndHorseReception.cpp index 44886bc3..44c0b0d4 100644 --- a/src/Game/AI/Action/actionNPCEndHorseReception.cpp +++ b/src/Game/AI/Action/actionNPCEndHorseReception.cpp @@ -6,22 +6,4 @@ NPCEndHorseReception::NPCEndHorseReception(const InitArg& arg) : ksys::act::ai:: NPCEndHorseReception::~NPCEndHorseReception() = default; -bool NPCEndHorseReception::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - -void NPCEndHorseReception::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void NPCEndHorseReception::leave_() { - ksys::act::ai::Action::leave_(); -} - -void NPCEndHorseReception::loadParams_() {} - -void NPCEndHorseReception::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionNPCEndHorseReception.h b/src/Game/AI/Action/actionNPCEndHorseReception.h index b6bef9b3..544d8c98 100644 --- a/src/Game/AI/Action/actionNPCEndHorseReception.h +++ b/src/Game/AI/Action/actionNPCEndHorseReception.h @@ -10,13 +10,7 @@ public: explicit NPCEndHorseReception(const InitArg& arg); ~NPCEndHorseReception() override; - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; - protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionNPCHorseCustomReception.cpp b/src/Game/AI/Action/actionNPCHorseCustomReception.cpp index a06e0a4b..1d67f965 100644 --- a/src/Game/AI/Action/actionNPCHorseCustomReception.cpp +++ b/src/Game/AI/Action/actionNPCHorseCustomReception.cpp @@ -14,10 +14,6 @@ void NPCHorseCustomReception::enter_(ksys::act::ai::InlineParamPack* params) { ksys::act::ai::Action::enter_(params); } -void NPCHorseCustomReception::leave_() { - ksys::act::ai::Action::leave_(); -} - void NPCHorseCustomReception::loadParams_() { getDynamicParam(&mCustomItemType_d, "CustomItemType"); } diff --git a/src/Game/AI/Action/actionNPCHorseCustomReception.h b/src/Game/AI/Action/actionNPCHorseCustomReception.h index aaf43de3..34562c08 100644 --- a/src/Game/AI/Action/actionNPCHorseCustomReception.h +++ b/src/Game/AI/Action/actionNPCHorseCustomReception.h @@ -12,7 +12,6 @@ public: bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: diff --git a/src/Game/AI/Action/actionNPCHorseReception.cpp b/src/Game/AI/Action/actionNPCHorseReception.cpp index a301e58b..7ca155d1 100644 --- a/src/Game/AI/Action/actionNPCHorseReception.cpp +++ b/src/Game/AI/Action/actionNPCHorseReception.cpp @@ -6,20 +6,10 @@ NPCHorseReception::NPCHorseReception(const InitArg& arg) : ksys::act::ai::Action NPCHorseReception::~NPCHorseReception() = default; -bool NPCHorseReception::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - void NPCHorseReception::enter_(ksys::act::ai::InlineParamPack* params) { ksys::act::ai::Action::enter_(params); } -void NPCHorseReception::leave_() { - ksys::act::ai::Action::leave_(); -} - -void NPCHorseReception::loadParams_() {} - void NPCHorseReception::calc_() { ksys::act::ai::Action::calc_(); } diff --git a/src/Game/AI/Action/actionNPCHorseReception.h b/src/Game/AI/Action/actionNPCHorseReception.h index d0017fd9..ae31a23c 100644 --- a/src/Game/AI/Action/actionNPCHorseReception.h +++ b/src/Game/AI/Action/actionNPCHorseReception.h @@ -10,10 +10,7 @@ public: explicit NPCHorseReception(const InitArg& arg); ~NPCHorseReception() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; protected: void calc_() override; diff --git a/src/Game/AI/Action/actionNPCHorseReceptionRelease.cpp b/src/Game/AI/Action/actionNPCHorseReceptionRelease.cpp index 0889c188..7af32849 100644 --- a/src/Game/AI/Action/actionNPCHorseReceptionRelease.cpp +++ b/src/Game/AI/Action/actionNPCHorseReceptionRelease.cpp @@ -7,20 +7,10 @@ NPCHorseReceptionRelease::NPCHorseReceptionRelease(const InitArg& arg) NPCHorseReceptionRelease::~NPCHorseReceptionRelease() = default; -bool NPCHorseReceptionRelease::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - void NPCHorseReceptionRelease::enter_(ksys::act::ai::InlineParamPack* params) { ksys::act::ai::Action::enter_(params); } -void NPCHorseReceptionRelease::leave_() { - ksys::act::ai::Action::leave_(); -} - -void NPCHorseReceptionRelease::loadParams_() {} - void NPCHorseReceptionRelease::calc_() { ksys::act::ai::Action::calc_(); } diff --git a/src/Game/AI/Action/actionNPCHorseReceptionRelease.h b/src/Game/AI/Action/actionNPCHorseReceptionRelease.h index c858b191..b1883cd5 100644 --- a/src/Game/AI/Action/actionNPCHorseReceptionRelease.h +++ b/src/Game/AI/Action/actionNPCHorseReceptionRelease.h @@ -10,10 +10,7 @@ public: explicit NPCHorseReceptionRelease(const InitArg& arg); ~NPCHorseReceptionRelease() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; protected: void calc_() override; diff --git a/src/Game/AI/Action/actionNPCHorseResurrect.cpp b/src/Game/AI/Action/actionNPCHorseResurrect.cpp index fd9b81b1..c4806d82 100644 --- a/src/Game/AI/Action/actionNPCHorseResurrect.cpp +++ b/src/Game/AI/Action/actionNPCHorseResurrect.cpp @@ -6,22 +6,4 @@ NPCHorseResurrect::NPCHorseResurrect(const InitArg& arg) : ksys::act::ai::Action NPCHorseResurrect::~NPCHorseResurrect() = default; -bool NPCHorseResurrect::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - -void NPCHorseResurrect::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void NPCHorseResurrect::leave_() { - ksys::act::ai::Action::leave_(); -} - -void NPCHorseResurrect::loadParams_() {} - -void NPCHorseResurrect::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionNPCHorseResurrect.h b/src/Game/AI/Action/actionNPCHorseResurrect.h index 859afd3c..b593018d 100644 --- a/src/Game/AI/Action/actionNPCHorseResurrect.h +++ b/src/Game/AI/Action/actionNPCHorseResurrect.h @@ -10,13 +10,7 @@ public: explicit NPCHorseResurrect(const InitArg& arg); ~NPCHorseResurrect() override; - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; - protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionNPCInfoOffHorse.cpp b/src/Game/AI/Action/actionNPCInfoOffHorse.cpp index 2109e9bc..e830e441 100644 --- a/src/Game/AI/Action/actionNPCInfoOffHorse.cpp +++ b/src/Game/AI/Action/actionNPCInfoOffHorse.cpp @@ -10,18 +10,6 @@ bool NPCInfoOffHorse::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void NPCInfoOffHorse::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void NPCInfoOffHorse::leave_() { - ksys::act::ai::Action::leave_(); -} - void NPCInfoOffHorse::loadParams_() {} -void NPCInfoOffHorse::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionNPCInfoOffHorse.h b/src/Game/AI/Action/actionNPCInfoOffHorse.h index 49a48c0e..0960a544 100644 --- a/src/Game/AI/Action/actionNPCInfoOffHorse.h +++ b/src/Game/AI/Action/actionNPCInfoOffHorse.h @@ -11,12 +11,9 @@ public: ~NPCInfoOffHorse() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionNPCInfoOnHorse.cpp b/src/Game/AI/Action/actionNPCInfoOnHorse.cpp index 627f50ec..4b18e795 100644 --- a/src/Game/AI/Action/actionNPCInfoOnHorse.cpp +++ b/src/Game/AI/Action/actionNPCInfoOnHorse.cpp @@ -10,18 +10,6 @@ bool NPCInfoOnHorse::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void NPCInfoOnHorse::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void NPCInfoOnHorse::leave_() { - ksys::act::ai::Action::leave_(); -} - void NPCInfoOnHorse::loadParams_() {} -void NPCInfoOnHorse::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionNPCInfoOnHorse.h b/src/Game/AI/Action/actionNPCInfoOnHorse.h index 68ab910e..e967bf65 100644 --- a/src/Game/AI/Action/actionNPCInfoOnHorse.h +++ b/src/Game/AI/Action/actionNPCInfoOnHorse.h @@ -11,12 +11,9 @@ public: ~NPCInfoOnHorse() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionNPCInfoOnNamedHorse.cpp b/src/Game/AI/Action/actionNPCInfoOnNamedHorse.cpp index 3c53cbb0..8add2d39 100644 --- a/src/Game/AI/Action/actionNPCInfoOnNamedHorse.cpp +++ b/src/Game/AI/Action/actionNPCInfoOnNamedHorse.cpp @@ -10,18 +10,6 @@ bool NPCInfoOnNamedHorse::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void NPCInfoOnNamedHorse::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void NPCInfoOnNamedHorse::leave_() { - ksys::act::ai::Action::leave_(); -} - void NPCInfoOnNamedHorse::loadParams_() {} -void NPCInfoOnNamedHorse::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionNPCInfoOnNamedHorse.h b/src/Game/AI/Action/actionNPCInfoOnNamedHorse.h index 28326643..c3c4e992 100644 --- a/src/Game/AI/Action/actionNPCInfoOnNamedHorse.h +++ b/src/Game/AI/Action/actionNPCInfoOnNamedHorse.h @@ -11,12 +11,9 @@ public: ~NPCInfoOnNamedHorse() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionNPCKnockBackMove.cpp b/src/Game/AI/Action/actionNPCKnockBackMove.cpp index 3322d875..ba2e717e 100644 --- a/src/Game/AI/Action/actionNPCKnockBackMove.cpp +++ b/src/Game/AI/Action/actionNPCKnockBackMove.cpp @@ -6,18 +6,10 @@ NPCKnockBackMove::NPCKnockBackMove(const InitArg& arg) : ksys::act::ai::Action(a NPCKnockBackMove::~NPCKnockBackMove() = default; -bool NPCKnockBackMove::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - void NPCKnockBackMove::enter_(ksys::act::ai::InlineParamPack* params) { ksys::act::ai::Action::enter_(params); } -void NPCKnockBackMove::leave_() { - ksys::act::ai::Action::leave_(); -} - void NPCKnockBackMove::loadParams_() { getStaticParam(&mASKeyName_s, "ASKeyName"); getDynamicParam(&mMoveDir_d, "MoveDir"); diff --git a/src/Game/AI/Action/actionNPCKnockBackMove.h b/src/Game/AI/Action/actionNPCKnockBackMove.h index cac1c4cc..1a621e46 100644 --- a/src/Game/AI/Action/actionNPCKnockBackMove.h +++ b/src/Game/AI/Action/actionNPCKnockBackMove.h @@ -10,9 +10,7 @@ public: explicit NPCKnockBackMove(const InitArg& arg); ~NPCKnockBackMove() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: diff --git a/src/Game/AI/Action/actionNPCLerpAction.cpp b/src/Game/AI/Action/actionNPCLerpAction.cpp index 96a17aa9..cba6c4e1 100644 --- a/src/Game/AI/Action/actionNPCLerpAction.cpp +++ b/src/Game/AI/Action/actionNPCLerpAction.cpp @@ -6,10 +6,6 @@ NPCLerpAction::NPCLerpAction(const InitArg& arg) : ksys::act::ai::Action(arg) {} NPCLerpAction::~NPCLerpAction() = default; -bool NPCLerpAction::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - void NPCLerpAction::enter_(ksys::act::ai::InlineParamPack* params) { ksys::act::ai::Action::enter_(params); } diff --git a/src/Game/AI/Action/actionNPCLerpAction.h b/src/Game/AI/Action/actionNPCLerpAction.h index 48f9a7e6..d71a3bec 100644 --- a/src/Game/AI/Action/actionNPCLerpAction.h +++ b/src/Game/AI/Action/actionNPCLerpAction.h @@ -10,7 +10,6 @@ public: explicit NPCLerpAction(const InitArg& arg); ~NPCLerpAction() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionNPCManufactItem.cpp b/src/Game/AI/Action/actionNPCManufactItem.cpp index da6815c6..f84adb47 100644 --- a/src/Game/AI/Action/actionNPCManufactItem.cpp +++ b/src/Game/AI/Action/actionNPCManufactItem.cpp @@ -6,22 +6,4 @@ NPCManufactItem::NPCManufactItem(const InitArg& arg) : ksys::act::ai::Action(arg NPCManufactItem::~NPCManufactItem() = default; -bool NPCManufactItem::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - -void NPCManufactItem::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void NPCManufactItem::leave_() { - ksys::act::ai::Action::leave_(); -} - -void NPCManufactItem::loadParams_() {} - -void NPCManufactItem::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionNPCManufactItem.h b/src/Game/AI/Action/actionNPCManufactItem.h index bdfdfe3d..ec0f797c 100644 --- a/src/Game/AI/Action/actionNPCManufactItem.h +++ b/src/Game/AI/Action/actionNPCManufactItem.h @@ -10,13 +10,7 @@ public: explicit NPCManufactItem(const InitArg& arg); ~NPCManufactItem() override; - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; - protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionNPCNameHorse.cpp b/src/Game/AI/Action/actionNPCNameHorse.cpp index 3fe878c7..c0050b9c 100644 --- a/src/Game/AI/Action/actionNPCNameHorse.cpp +++ b/src/Game/AI/Action/actionNPCNameHorse.cpp @@ -6,20 +6,10 @@ NPCNameHorse::NPCNameHorse(const InitArg& arg) : ksys::act::ai::Action(arg) {} NPCNameHorse::~NPCNameHorse() = default; -bool NPCNameHorse::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - void NPCNameHorse::enter_(ksys::act::ai::InlineParamPack* params) { ksys::act::ai::Action::enter_(params); } -void NPCNameHorse::leave_() { - ksys::act::ai::Action::leave_(); -} - -void NPCNameHorse::loadParams_() {} - void NPCNameHorse::calc_() { ksys::act::ai::Action::calc_(); } diff --git a/src/Game/AI/Action/actionNPCNameHorse.h b/src/Game/AI/Action/actionNPCNameHorse.h index 6ad8a657..3fa2a622 100644 --- a/src/Game/AI/Action/actionNPCNameHorse.h +++ b/src/Game/AI/Action/actionNPCNameHorse.h @@ -10,10 +10,7 @@ public: explicit NPCNameHorse(const InitArg& arg); ~NPCNameHorse() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; protected: void calc_() override; diff --git a/src/Game/AI/Action/actionNPCPurchase.cpp b/src/Game/AI/Action/actionNPCPurchase.cpp index 8b64a8bf..3496ef8f 100644 --- a/src/Game/AI/Action/actionNPCPurchase.cpp +++ b/src/Game/AI/Action/actionNPCPurchase.cpp @@ -18,8 +18,6 @@ void NPCPurchase::leave_() { ksys::act::ai::Action::leave_(); } -void NPCPurchase::loadParams_() {} - void NPCPurchase::calc_() { ksys::act::ai::Action::calc_(); } diff --git a/src/Game/AI/Action/actionNPCPurchase.h b/src/Game/AI/Action/actionNPCPurchase.h index d0b653dd..02beac74 100644 --- a/src/Game/AI/Action/actionNPCPurchase.h +++ b/src/Game/AI/Action/actionNPCPurchase.h @@ -13,7 +13,6 @@ public: bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; - void loadParams_() override; protected: void calc_() override; diff --git a/src/Game/AI/Action/actionNPCPurchaseEnemyMaterial.cpp b/src/Game/AI/Action/actionNPCPurchaseEnemyMaterial.cpp index 19e3e894..ecb9431f 100644 --- a/src/Game/AI/Action/actionNPCPurchaseEnemyMaterial.cpp +++ b/src/Game/AI/Action/actionNPCPurchaseEnemyMaterial.cpp @@ -15,12 +15,6 @@ void NPCPurchaseEnemyMaterial::enter_(ksys::act::ai::InlineParamPack* params) { ksys::act::ai::Action::enter_(params); } -void NPCPurchaseEnemyMaterial::leave_() { - ksys::act::ai::Action::leave_(); -} - -void NPCPurchaseEnemyMaterial::loadParams_() {} - void NPCPurchaseEnemyMaterial::calc_() { ksys::act::ai::Action::calc_(); } diff --git a/src/Game/AI/Action/actionNPCPurchaseEnemyMaterial.h b/src/Game/AI/Action/actionNPCPurchaseEnemyMaterial.h index 3dd00019..d14745e8 100644 --- a/src/Game/AI/Action/actionNPCPurchaseEnemyMaterial.h +++ b/src/Game/AI/Action/actionNPCPurchaseEnemyMaterial.h @@ -12,8 +12,6 @@ public: bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; protected: void calc_() override; diff --git a/src/Game/AI/Action/actionNPCPurchaseMaterial.cpp b/src/Game/AI/Action/actionNPCPurchaseMaterial.cpp index 5e010aba..170f0e82 100644 --- a/src/Game/AI/Action/actionNPCPurchaseMaterial.cpp +++ b/src/Game/AI/Action/actionNPCPurchaseMaterial.cpp @@ -6,22 +6,4 @@ NPCPurchaseMaterial::NPCPurchaseMaterial(const InitArg& arg) : ksys::act::ai::Ac NPCPurchaseMaterial::~NPCPurchaseMaterial() = default; -bool NPCPurchaseMaterial::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - -void NPCPurchaseMaterial::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void NPCPurchaseMaterial::leave_() { - ksys::act::ai::Action::leave_(); -} - -void NPCPurchaseMaterial::loadParams_() {} - -void NPCPurchaseMaterial::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionNPCPurchaseMaterial.h b/src/Game/AI/Action/actionNPCPurchaseMaterial.h index e53e74df..828651e9 100644 --- a/src/Game/AI/Action/actionNPCPurchaseMaterial.h +++ b/src/Game/AI/Action/actionNPCPurchaseMaterial.h @@ -10,13 +10,7 @@ public: explicit NPCPurchaseMaterial(const InitArg& arg); ~NPCPurchaseMaterial() override; - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; - protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionNPCReceiveHorse.cpp b/src/Game/AI/Action/actionNPCReceiveHorse.cpp index 64461ef5..c34f1e88 100644 --- a/src/Game/AI/Action/actionNPCReceiveHorse.cpp +++ b/src/Game/AI/Action/actionNPCReceiveHorse.cpp @@ -6,22 +6,4 @@ NPCReceiveHorse::NPCReceiveHorse(const InitArg& arg) : ksys::act::ai::Action(arg NPCReceiveHorse::~NPCReceiveHorse() = default; -bool NPCReceiveHorse::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - -void NPCReceiveHorse::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void NPCReceiveHorse::leave_() { - ksys::act::ai::Action::leave_(); -} - -void NPCReceiveHorse::loadParams_() {} - -void NPCReceiveHorse::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionNPCReceiveHorse.h b/src/Game/AI/Action/actionNPCReceiveHorse.h index e7937c3c..1097a32b 100644 --- a/src/Game/AI/Action/actionNPCReceiveHorse.h +++ b/src/Game/AI/Action/actionNPCReceiveHorse.h @@ -10,13 +10,7 @@ public: explicit NPCReceiveHorse(const InitArg& arg); ~NPCReceiveHorse() override; - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; - protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionNPCRegisterAndReceiveHorse.cpp b/src/Game/AI/Action/actionNPCRegisterAndReceiveHorse.cpp index 16c79ff8..11d1925a 100644 --- a/src/Game/AI/Action/actionNPCRegisterAndReceiveHorse.cpp +++ b/src/Game/AI/Action/actionNPCRegisterAndReceiveHorse.cpp @@ -7,22 +7,4 @@ NPCRegisterAndReceiveHorse::NPCRegisterAndReceiveHorse(const InitArg& arg) NPCRegisterAndReceiveHorse::~NPCRegisterAndReceiveHorse() = default; -bool NPCRegisterAndReceiveHorse::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - -void NPCRegisterAndReceiveHorse::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void NPCRegisterAndReceiveHorse::leave_() { - ksys::act::ai::Action::leave_(); -} - -void NPCRegisterAndReceiveHorse::loadParams_() {} - -void NPCRegisterAndReceiveHorse::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionNPCRegisterAndReceiveHorse.h b/src/Game/AI/Action/actionNPCRegisterAndReceiveHorse.h index d72ab941..f1b42130 100644 --- a/src/Game/AI/Action/actionNPCRegisterAndReceiveHorse.h +++ b/src/Game/AI/Action/actionNPCRegisterAndReceiveHorse.h @@ -10,13 +10,7 @@ public: explicit NPCRegisterAndReceiveHorse(const InitArg& arg); ~NPCRegisterAndReceiveHorse() override; - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; - protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionNPCRegisterHorse.cpp b/src/Game/AI/Action/actionNPCRegisterHorse.cpp index cbdbdd49..142e46e4 100644 --- a/src/Game/AI/Action/actionNPCRegisterHorse.cpp +++ b/src/Game/AI/Action/actionNPCRegisterHorse.cpp @@ -6,22 +6,4 @@ NPCRegisterHorse::NPCRegisterHorse(const InitArg& arg) : ksys::act::ai::Action(a NPCRegisterHorse::~NPCRegisterHorse() = default; -bool NPCRegisterHorse::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - -void NPCRegisterHorse::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void NPCRegisterHorse::leave_() { - ksys::act::ai::Action::leave_(); -} - -void NPCRegisterHorse::loadParams_() {} - -void NPCRegisterHorse::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionNPCRegisterHorse.h b/src/Game/AI/Action/actionNPCRegisterHorse.h index e28be82f..5f411ec9 100644 --- a/src/Game/AI/Action/actionNPCRegisterHorse.h +++ b/src/Game/AI/Action/actionNPCRegisterHorse.h @@ -10,13 +10,7 @@ public: explicit NPCRegisterHorse(const InitArg& arg); ~NPCRegisterHorse() override; - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; - protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionNPCReleaseHorse.cpp b/src/Game/AI/Action/actionNPCReleaseHorse.cpp index 1630b5d3..475bcf67 100644 --- a/src/Game/AI/Action/actionNPCReleaseHorse.cpp +++ b/src/Game/AI/Action/actionNPCReleaseHorse.cpp @@ -6,22 +6,4 @@ NPCReleaseHorse::NPCReleaseHorse(const InitArg& arg) : ksys::act::ai::Action(arg NPCReleaseHorse::~NPCReleaseHorse() = default; -bool NPCReleaseHorse::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - -void NPCReleaseHorse::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void NPCReleaseHorse::leave_() { - ksys::act::ai::Action::leave_(); -} - -void NPCReleaseHorse::loadParams_() {} - -void NPCReleaseHorse::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionNPCReleaseHorse.h b/src/Game/AI/Action/actionNPCReleaseHorse.h index babddc15..3dc658b6 100644 --- a/src/Game/AI/Action/actionNPCReleaseHorse.h +++ b/src/Game/AI/Action/actionNPCReleaseHorse.h @@ -10,13 +10,7 @@ public: explicit NPCReleaseHorse(const InitArg& arg); ~NPCReleaseHorse() override; - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; - protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionNPCSale.cpp b/src/Game/AI/Action/actionNPCSale.cpp index 5b4e1b2a..16e48aca 100644 --- a/src/Game/AI/Action/actionNPCSale.cpp +++ b/src/Game/AI/Action/actionNPCSale.cpp @@ -18,8 +18,6 @@ void NPCSale::leave_() { ksys::act::ai::Action::leave_(); } -void NPCSale::loadParams_() {} - void NPCSale::calc_() { ksys::act::ai::Action::calc_(); } diff --git a/src/Game/AI/Action/actionNPCSale.h b/src/Game/AI/Action/actionNPCSale.h index 7a2bbb5c..e341ac61 100644 --- a/src/Game/AI/Action/actionNPCSale.h +++ b/src/Game/AI/Action/actionNPCSale.h @@ -13,7 +13,6 @@ public: bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; - void loadParams_() override; protected: void calc_() override; diff --git a/src/Game/AI/Action/actionNPCSaleAppReception.cpp b/src/Game/AI/Action/actionNPCSaleAppReception.cpp index baba5726..df867273 100644 --- a/src/Game/AI/Action/actionNPCSaleAppReception.cpp +++ b/src/Game/AI/Action/actionNPCSaleAppReception.cpp @@ -14,12 +14,6 @@ void NPCSaleAppReception::enter_(ksys::act::ai::InlineParamPack* params) { ksys::act::ai::Action::enter_(params); } -void NPCSaleAppReception::leave_() { - ksys::act::ai::Action::leave_(); -} - -void NPCSaleAppReception::loadParams_() {} - void NPCSaleAppReception::calc_() { ksys::act::ai::Action::calc_(); } diff --git a/src/Game/AI/Action/actionNPCSaleAppReception.h b/src/Game/AI/Action/actionNPCSaleAppReception.h index 3c3fa4af..3cd388d7 100644 --- a/src/Game/AI/Action/actionNPCSaleAppReception.h +++ b/src/Game/AI/Action/actionNPCSaleAppReception.h @@ -12,8 +12,6 @@ public: bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; protected: void calc_() override; diff --git a/src/Game/AI/Action/actionNPCSaleReception.cpp b/src/Game/AI/Action/actionNPCSaleReception.cpp index c5a2e6ad..971cbbc1 100644 --- a/src/Game/AI/Action/actionNPCSaleReception.cpp +++ b/src/Game/AI/Action/actionNPCSaleReception.cpp @@ -14,10 +14,6 @@ void NPCSaleReception::enter_(ksys::act::ai::InlineParamPack* params) { ksys::act::ai::Action::enter_(params); } -void NPCSaleReception::leave_() { - ksys::act::ai::Action::leave_(); -} - void NPCSaleReception::loadParams_() { getDynamicParam(&mTableName_d, "TableName"); } diff --git a/src/Game/AI/Action/actionNPCSaleReception.h b/src/Game/AI/Action/actionNPCSaleReception.h index 42e78e71..44b4d25b 100644 --- a/src/Game/AI/Action/actionNPCSaleReception.h +++ b/src/Game/AI/Action/actionNPCSaleReception.h @@ -12,7 +12,6 @@ public: bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: diff --git a/src/Game/AI/Action/actionNPCSellApp.cpp b/src/Game/AI/Action/actionNPCSellApp.cpp index 67598189..c2671111 100644 --- a/src/Game/AI/Action/actionNPCSellApp.cpp +++ b/src/Game/AI/Action/actionNPCSellApp.cpp @@ -6,22 +6,4 @@ NPCSellApp::NPCSellApp(const InitArg& arg) : ksys::act::ai::Action(arg) {} NPCSellApp::~NPCSellApp() = default; -bool NPCSellApp::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - -void NPCSellApp::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void NPCSellApp::leave_() { - ksys::act::ai::Action::leave_(); -} - -void NPCSellApp::loadParams_() {} - -void NPCSellApp::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionNPCSellApp.h b/src/Game/AI/Action/actionNPCSellApp.h index c1421fba..12b5e317 100644 --- a/src/Game/AI/Action/actionNPCSellApp.h +++ b/src/Game/AI/Action/actionNPCSellApp.h @@ -10,13 +10,7 @@ public: explicit NPCSellApp(const InitArg& arg); ~NPCSellApp() override; - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; - protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionNPCSellHorse.cpp b/src/Game/AI/Action/actionNPCSellHorse.cpp index 2b3171c5..c41c046d 100644 --- a/src/Game/AI/Action/actionNPCSellHorse.cpp +++ b/src/Game/AI/Action/actionNPCSellHorse.cpp @@ -6,22 +6,4 @@ NPCSellHorse::NPCSellHorse(const InitArg& arg) : ksys::act::ai::Action(arg) {} NPCSellHorse::~NPCSellHorse() = default; -bool NPCSellHorse::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - -void NPCSellHorse::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void NPCSellHorse::leave_() { - ksys::act::ai::Action::leave_(); -} - -void NPCSellHorse::loadParams_() {} - -void NPCSellHorse::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionNPCSellHorse.h b/src/Game/AI/Action/actionNPCSellHorse.h index 4432c77d..288e9a0e 100644 --- a/src/Game/AI/Action/actionNPCSellHorse.h +++ b/src/Game/AI/Action/actionNPCSellHorse.h @@ -10,13 +10,7 @@ public: explicit NPCSellHorse(const InitArg& arg); ~NPCSellHorse() override; - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; - protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionNPCSellItem.cpp b/src/Game/AI/Action/actionNPCSellItem.cpp index 89161c62..74d7f1f4 100644 --- a/src/Game/AI/Action/actionNPCSellItem.cpp +++ b/src/Game/AI/Action/actionNPCSellItem.cpp @@ -6,22 +6,4 @@ NPCSellItem::NPCSellItem(const InitArg& arg) : ksys::act::ai::Action(arg) {} NPCSellItem::~NPCSellItem() = default; -bool NPCSellItem::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - -void NPCSellItem::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void NPCSellItem::leave_() { - ksys::act::ai::Action::leave_(); -} - -void NPCSellItem::loadParams_() {} - -void NPCSellItem::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionNPCSellItem.h b/src/Game/AI/Action/actionNPCSellItem.h index 58a2f68d..06040b09 100644 --- a/src/Game/AI/Action/actionNPCSellItem.h +++ b/src/Game/AI/Action/actionNPCSellItem.h @@ -10,13 +10,7 @@ public: explicit NPCSellItem(const InitArg& arg); ~NPCSellItem() override; - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; - protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionNPCStartTurnToPlayer.cpp b/src/Game/AI/Action/actionNPCStartTurnToPlayer.cpp index 65d35d41..b0d56c14 100644 --- a/src/Game/AI/Action/actionNPCStartTurnToPlayer.cpp +++ b/src/Game/AI/Action/actionNPCStartTurnToPlayer.cpp @@ -10,20 +10,8 @@ bool NPCStartTurnToPlayer::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void NPCStartTurnToPlayer::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void NPCStartTurnToPlayer::leave_() { - ksys::act::ai::Action::leave_(); -} - void NPCStartTurnToPlayer::loadParams_() { getDynamicParam(&mTurnRange_d, "TurnRange"); } -void NPCStartTurnToPlayer::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionNPCStartTurnToPlayer.h b/src/Game/AI/Action/actionNPCStartTurnToPlayer.h index b2072196..5e47541b 100644 --- a/src/Game/AI/Action/actionNPCStartTurnToPlayer.h +++ b/src/Game/AI/Action/actionNPCStartTurnToPlayer.h @@ -11,13 +11,9 @@ public: ~NPCStartTurnToPlayer() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 float* mTurnRange_d{}; }; diff --git a/src/Game/AI/Action/actionNPCTalkASyncAction.cpp b/src/Game/AI/Action/actionNPCTalkASyncAction.cpp index 711901fd..fcb1f4c7 100644 --- a/src/Game/AI/Action/actionNPCTalkASyncAction.cpp +++ b/src/Game/AI/Action/actionNPCTalkASyncAction.cpp @@ -10,22 +10,10 @@ bool NPCTalkASyncAction::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void NPCTalkASyncAction::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void NPCTalkASyncAction::leave_() { - ksys::act::ai::Action::leave_(); -} - void NPCTalkASyncAction::loadParams_() { getDynamicParam(&mDispFrame_d, "DispFrame"); getDynamicParam(&mIsChecked_d, "IsChecked"); getDynamicParam(&mMessageId_d, "MessageId"); } -void NPCTalkASyncAction::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionNPCTalkASyncAction.h b/src/Game/AI/Action/actionNPCTalkASyncAction.h index 3214895c..5f715fe3 100644 --- a/src/Game/AI/Action/actionNPCTalkASyncAction.h +++ b/src/Game/AI/Action/actionNPCTalkASyncAction.h @@ -11,13 +11,9 @@ public: ~NPCTalkASyncAction() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 int* mDispFrame_d{}; // dynamic_param at offset 0x28 diff --git a/src/Game/AI/Action/actionNPCTalkNoMessageStepperAction.cpp b/src/Game/AI/Action/actionNPCTalkNoMessageStepperAction.cpp index 7e6d3f68..dd85caa6 100644 --- a/src/Game/AI/Action/actionNPCTalkNoMessageStepperAction.cpp +++ b/src/Game/AI/Action/actionNPCTalkNoMessageStepperAction.cpp @@ -7,10 +7,6 @@ NPCTalkNoMessageStepperAction::NPCTalkNoMessageStepperAction(const InitArg& arg) NPCTalkNoMessageStepperAction::~NPCTalkNoMessageStepperAction() = default; -bool NPCTalkNoMessageStepperAction::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - void NPCTalkNoMessageStepperAction::enter_(ksys::act::ai::InlineParamPack* params) { ksys::act::ai::Action::enter_(params); } @@ -23,8 +19,4 @@ void NPCTalkNoMessageStepperAction::loadParams_() { getDynamicParam(&mMessageId_d, "MessageId"); } -void NPCTalkNoMessageStepperAction::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionNPCTalkNoMessageStepperAction.h b/src/Game/AI/Action/actionNPCTalkNoMessageStepperAction.h index 18bf5bd4..b80e9995 100644 --- a/src/Game/AI/Action/actionNPCTalkNoMessageStepperAction.h +++ b/src/Game/AI/Action/actionNPCTalkNoMessageStepperAction.h @@ -10,14 +10,11 @@ public: explicit NPCTalkNoMessageStepperAction(const InitArg& arg); ~NPCTalkNoMessageStepperAction() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 sead::SafeString* mMessageId_d{}; }; diff --git a/src/Game/AI/Action/actionNPCTalkToPlayerAction.cpp b/src/Game/AI/Action/actionNPCTalkToPlayerAction.cpp index febb0ff5..8b4f7869 100644 --- a/src/Game/AI/Action/actionNPCTalkToPlayerAction.cpp +++ b/src/Game/AI/Action/actionNPCTalkToPlayerAction.cpp @@ -6,25 +6,9 @@ NPCTalkToPlayerAction::NPCTalkToPlayerAction(const InitArg& arg) : ksys::act::ai NPCTalkToPlayerAction::~NPCTalkToPlayerAction() = default; -bool NPCTalkToPlayerAction::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - -void NPCTalkToPlayerAction::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void NPCTalkToPlayerAction::leave_() { - ksys::act::ai::Action::leave_(); -} - void NPCTalkToPlayerAction::loadParams_() { getDynamicParam(&mMessageId_d, "MessageId"); getDynamicParam(&mASKeyName_d, "ASKeyName"); } -void NPCTalkToPlayerAction::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionNPCTalkToPlayerAction.h b/src/Game/AI/Action/actionNPCTalkToPlayerAction.h index fe060893..3e4b9c32 100644 --- a/src/Game/AI/Action/actionNPCTalkToPlayerAction.h +++ b/src/Game/AI/Action/actionNPCTalkToPlayerAction.h @@ -10,14 +10,9 @@ public: explicit NPCTalkToPlayerAction(const InitArg& arg); ~NPCTalkToPlayerAction() override; - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 sead::SafeString* mMessageId_d{}; // dynamic_param at offset 0x30 diff --git a/src/Game/AI/Action/actionNPCTargetMoveDynAs.cpp b/src/Game/AI/Action/actionNPCTargetMoveDynAs.cpp index 0394a23d..77083d3f 100644 --- a/src/Game/AI/Action/actionNPCTargetMoveDynAs.cpp +++ b/src/Game/AI/Action/actionNPCTargetMoveDynAs.cpp @@ -6,25 +6,9 @@ NPCTargetMoveDynAs::NPCTargetMoveDynAs(const InitArg& arg) : NPCTargetMove(arg) NPCTargetMoveDynAs::~NPCTargetMoveDynAs() = default; -bool NPCTargetMoveDynAs::init_(sead::Heap* heap) { - return NPCTargetMove::init_(heap); -} - -void NPCTargetMoveDynAs::enter_(ksys::act::ai::InlineParamPack* params) { - NPCTargetMove::enter_(params); -} - -void NPCTargetMoveDynAs::leave_() { - NPCTargetMove::leave_(); -} - void NPCTargetMoveDynAs::loadParams_() { NPCTargetMove::loadParams_(); getDynamicParam(&mDynASKeyName_d, "DynASKeyName"); } -void NPCTargetMoveDynAs::calc_() { - NPCTargetMove::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionNPCTargetMoveDynAs.h b/src/Game/AI/Action/actionNPCTargetMoveDynAs.h index 3c8e03b6..d2654a83 100644 --- a/src/Game/AI/Action/actionNPCTargetMoveDynAs.h +++ b/src/Game/AI/Action/actionNPCTargetMoveDynAs.h @@ -11,14 +11,9 @@ public: explicit NPCTargetMoveDynAs(const InitArg& arg); ~NPCTargetMoveDynAs() override; - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x178 sead::SafeString* mDynASKeyName_d{}; }; diff --git a/src/Game/AI/Action/actionNPCTravelerRest.cpp b/src/Game/AI/Action/actionNPCTravelerRest.cpp index 489736e7..7bdf1409 100644 --- a/src/Game/AI/Action/actionNPCTravelerRest.cpp +++ b/src/Game/AI/Action/actionNPCTravelerRest.cpp @@ -6,10 +6,6 @@ NPCTravelerRest::NPCTravelerRest(const InitArg& arg) : ksys::act::ai::Action(arg NPCTravelerRest::~NPCTravelerRest() = default; -bool NPCTravelerRest::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - void NPCTravelerRest::enter_(ksys::act::ai::InlineParamPack* params) { ksys::act::ai::Action::enter_(params); } diff --git a/src/Game/AI/Action/actionNPCTravelerRest.h b/src/Game/AI/Action/actionNPCTravelerRest.h index fa62b24e..859ac65e 100644 --- a/src/Game/AI/Action/actionNPCTravelerRest.h +++ b/src/Game/AI/Action/actionNPCTravelerRest.h @@ -10,7 +10,6 @@ public: explicit NPCTravelerRest(const InitArg& arg); ~NPCTravelerRest() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionNPCTurnAction.cpp b/src/Game/AI/Action/actionNPCTurnAction.cpp index f694bf0a..dd62df16 100644 --- a/src/Game/AI/Action/actionNPCTurnAction.cpp +++ b/src/Game/AI/Action/actionNPCTurnAction.cpp @@ -6,10 +6,6 @@ NPCTurnAction::NPCTurnAction(const InitArg& arg) : ksys::act::ai::Action(arg) {} NPCTurnAction::~NPCTurnAction() = default; -bool NPCTurnAction::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - void NPCTurnAction::enter_(ksys::act::ai::InlineParamPack* params) { ksys::act::ai::Action::enter_(params); } diff --git a/src/Game/AI/Action/actionNPCTurnAction.h b/src/Game/AI/Action/actionNPCTurnAction.h index a779f8cf..3ce1d01f 100644 --- a/src/Game/AI/Action/actionNPCTurnAction.h +++ b/src/Game/AI/Action/actionNPCTurnAction.h @@ -10,7 +10,6 @@ public: explicit NPCTurnAction(const InitArg& arg); ~NPCTurnAction() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionNPCTurnToObject.cpp b/src/Game/AI/Action/actionNPCTurnToObject.cpp index 7f151119..dbb8738d 100644 --- a/src/Game/AI/Action/actionNPCTurnToObject.cpp +++ b/src/Game/AI/Action/actionNPCTurnToObject.cpp @@ -6,10 +6,6 @@ NPCTurnToObject::NPCTurnToObject(const InitArg& arg) : ksys::act::ai::Action(arg NPCTurnToObject::~NPCTurnToObject() = default; -bool NPCTurnToObject::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - void NPCTurnToObject::enter_(ksys::act::ai::InlineParamPack* params) { ksys::act::ai::Action::enter_(params); } diff --git a/src/Game/AI/Action/actionNPCTurnToObject.h b/src/Game/AI/Action/actionNPCTurnToObject.h index 75c600d1..ef346c48 100644 --- a/src/Game/AI/Action/actionNPCTurnToObject.h +++ b/src/Game/AI/Action/actionNPCTurnToObject.h @@ -10,7 +10,6 @@ public: explicit NPCTurnToObject(const InitArg& arg); ~NPCTurnToObject() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionNPCWaitAction.cpp b/src/Game/AI/Action/actionNPCWaitAction.cpp index 4cd9c0de..392c627a 100644 --- a/src/Game/AI/Action/actionNPCWaitAction.cpp +++ b/src/Game/AI/Action/actionNPCWaitAction.cpp @@ -6,10 +6,6 @@ NPCWaitAction::NPCWaitAction(const InitArg& arg) : ksys::act::ai::Action(arg) {} NPCWaitAction::~NPCWaitAction() = default; -bool NPCWaitAction::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - void NPCWaitAction::enter_(ksys::act::ai::InlineParamPack* params) { ksys::act::ai::Action::enter_(params); } diff --git a/src/Game/AI/Action/actionNPCWaitAction.h b/src/Game/AI/Action/actionNPCWaitAction.h index 5ff83741..7c388dc7 100644 --- a/src/Game/AI/Action/actionNPCWaitAction.h +++ b/src/Game/AI/Action/actionNPCWaitAction.h @@ -10,7 +10,6 @@ public: explicit NPCWaitAction(const InitArg& arg); ~NPCWaitAction() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionNPCWaitDynAS.cpp b/src/Game/AI/Action/actionNPCWaitDynAS.cpp index 890b4a17..08f811ef 100644 --- a/src/Game/AI/Action/actionNPCWaitDynAS.cpp +++ b/src/Game/AI/Action/actionNPCWaitDynAS.cpp @@ -6,25 +6,13 @@ NPCWaitDynAS::NPCWaitDynAS(const InitArg& arg) : NPCWait(arg) {} NPCWaitDynAS::~NPCWaitDynAS() = default; -bool NPCWaitDynAS::init_(sead::Heap* heap) { - return NPCWait::init_(heap); -} - void NPCWaitDynAS::enter_(ksys::act::ai::InlineParamPack* params) { NPCWait::enter_(params); } -void NPCWaitDynAS::leave_() { - NPCWait::leave_(); -} - void NPCWaitDynAS::loadParams_() { NPCWait::loadParams_(); getDynamicParam(&mDynASName_d, "DynASName"); } -void NPCWaitDynAS::calc_() { - NPCWait::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionNPCWaitDynAS.h b/src/Game/AI/Action/actionNPCWaitDynAS.h index 159f7fc4..e73ba2a0 100644 --- a/src/Game/AI/Action/actionNPCWaitDynAS.h +++ b/src/Game/AI/Action/actionNPCWaitDynAS.h @@ -11,14 +11,10 @@ public: explicit NPCWaitDynAS(const InitArg& arg); ~NPCWaitDynAS() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x40 sead::SafeString* mDynASName_d{}; }; diff --git a/src/Game/AI/Action/actionNPCWaitOneTimeAction.cpp b/src/Game/AI/Action/actionNPCWaitOneTimeAction.cpp index de2eb958..06789897 100644 --- a/src/Game/AI/Action/actionNPCWaitOneTimeAction.cpp +++ b/src/Game/AI/Action/actionNPCWaitOneTimeAction.cpp @@ -6,23 +6,6 @@ NPCWaitOneTimeAction::NPCWaitOneTimeAction(const InitArg& arg) : NPCWait(arg) {} NPCWaitOneTimeAction::~NPCWaitOneTimeAction() = default; -bool NPCWaitOneTimeAction::init_(sead::Heap* heap) { - return NPCWait::init_(heap); -} - -void NPCWaitOneTimeAction::enter_(ksys::act::ai::InlineParamPack* params) { - NPCWait::enter_(params); -} - -void NPCWaitOneTimeAction::leave_() { - NPCWait::leave_(); -} - -void NPCWaitOneTimeAction::loadParams_() { - getStaticParam(&mIsIgnoreSameKey_s, "IsIgnoreSameKey"); - getStaticParam(&mASName_s, "ASName"); -} - void NPCWaitOneTimeAction::calc_() { NPCWait::calc_(); } diff --git a/src/Game/AI/Action/actionNPCWaitOneTimeAction.h b/src/Game/AI/Action/actionNPCWaitOneTimeAction.h index 9193d01b..72babea3 100644 --- a/src/Game/AI/Action/actionNPCWaitOneTimeAction.h +++ b/src/Game/AI/Action/actionNPCWaitOneTimeAction.h @@ -11,18 +11,8 @@ public: explicit NPCWaitOneTimeAction(const InitArg& arg); ~NPCWaitOneTimeAction() override; - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; - protected: void calc_() override; - - // static_param at offset 0x20 - const bool* mIsIgnoreSameKey_s{}; - // static_param at offset 0x28 - sead::SafeString mASName_s{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionNavMeshAction.cpp b/src/Game/AI/Action/actionNavMeshAction.cpp index c5d65a90..a7d19887 100644 --- a/src/Game/AI/Action/actionNavMeshAction.cpp +++ b/src/Game/AI/Action/actionNavMeshAction.cpp @@ -6,10 +6,6 @@ NavMeshAction::NavMeshAction(const InitArg& arg) : ActionEx(arg) {} NavMeshAction::~NavMeshAction() = default; -bool NavMeshAction::init_(sead::Heap* heap) { - return ActionEx::init_(heap); -} - void NavMeshAction::enter_(ksys::act::ai::InlineParamPack* params) { ActionEx::enter_(params); } diff --git a/src/Game/AI/Action/actionNavMeshAction.h b/src/Game/AI/Action/actionNavMeshAction.h index 1fdac67e..f9350484 100644 --- a/src/Game/AI/Action/actionNavMeshAction.h +++ b/src/Game/AI/Action/actionNavMeshAction.h @@ -11,7 +11,6 @@ public: explicit NavMeshAction(const InitArg& arg); ~NavMeshAction() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionNavMeshBattleWalk.cpp b/src/Game/AI/Action/actionNavMeshBattleWalk.cpp index 2cdf6ee8..c4177da1 100644 --- a/src/Game/AI/Action/actionNavMeshBattleWalk.cpp +++ b/src/Game/AI/Action/actionNavMeshBattleWalk.cpp @@ -4,8 +4,6 @@ namespace uking::action { NavMeshBattleWalk::NavMeshBattleWalk(const InitArg& arg) : NavMeshAction(arg) {} -NavMeshBattleWalk::~NavMeshBattleWalk() = default; - bool NavMeshBattleWalk::init_(sead::Heap* heap) { return NavMeshAction::init_(heap); } diff --git a/src/Game/AI/Action/actionNavMeshBattleWalk.h b/src/Game/AI/Action/actionNavMeshBattleWalk.h index 7a709435..bbda915e 100644 --- a/src/Game/AI/Action/actionNavMeshBattleWalk.h +++ b/src/Game/AI/Action/actionNavMeshBattleWalk.h @@ -9,7 +9,6 @@ class NavMeshBattleWalk : public NavMeshAction { SEAD_RTTI_OVERRIDE(NavMeshBattleWalk, NavMeshAction) public: explicit NavMeshBattleWalk(const InitArg& arg); - ~NavMeshBattleWalk() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/AI/Action/actionNavMeshEscape.cpp b/src/Game/AI/Action/actionNavMeshEscape.cpp index 5cb72d16..c7ae093a 100644 --- a/src/Game/AI/Action/actionNavMeshEscape.cpp +++ b/src/Game/AI/Action/actionNavMeshEscape.cpp @@ -4,33 +4,4 @@ namespace uking::action { NavMeshEscape::NavMeshEscape(const InitArg& arg) : NavMeshAction(arg) {} -NavMeshEscape::~NavMeshEscape() = default; - -bool NavMeshEscape::init_(sead::Heap* heap) { - return NavMeshAction::init_(heap); -} - -void NavMeshEscape::enter_(ksys::act::ai::InlineParamPack* params) { - NavMeshAction::enter_(params); -} - -void NavMeshEscape::leave_() { - NavMeshAction::leave_(); -} - -void NavMeshEscape::loadParams_() { - getStaticParam(&mWeaponIdx_s, "WeaponIdx"); - getStaticParam(&mSpeed_s, "Speed"); - getStaticParam(&mRotSpd_s, "RotSpd"); - getStaticParam(&mFinRadius_s, "FinRadius"); - getStaticParam(&mFinRotate_s, "FinRotate"); - getStaticParam(&mAccRatio_s, "AccRatio"); - getStaticParam(&mIsCheckCliff_s, "IsCheckCliff"); - getDynamicParam(&mTargetPos_d, "TargetPos"); -} - -void NavMeshEscape::calc_() { - NavMeshAction::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionNavMeshEscape.h b/src/Game/AI/Action/actionNavMeshEscape.h index 168c6159..ceca35a7 100644 --- a/src/Game/AI/Action/actionNavMeshEscape.h +++ b/src/Game/AI/Action/actionNavMeshEscape.h @@ -9,32 +9,8 @@ class NavMeshEscape : public NavMeshAction { SEAD_RTTI_OVERRIDE(NavMeshEscape, NavMeshAction) public: explicit NavMeshEscape(const InitArg& arg); - ~NavMeshEscape() override; - - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; protected: - void calc_() override; - - // static_param at offset 0x20 - const int* mWeaponIdx_s{}; - // static_param at offset 0x28 - const float* mSpeed_s{}; - // static_param at offset 0x30 - const float* mRotSpd_s{}; - // static_param at offset 0x38 - const float* mFinRadius_s{}; - // static_param at offset 0x40 - const float* mFinRotate_s{}; - // static_param at offset 0x48 - const float* mAccRatio_s{}; - // static_param at offset 0x50 - const bool* mIsCheckCliff_s{}; - // dynamic_param at offset 0x58 - sead::Vector3f* mTargetPos_d{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionNavMeshGrabLeftWalk.cpp b/src/Game/AI/Action/actionNavMeshGrabLeftWalk.cpp index 9e68c9b4..796556b9 100644 --- a/src/Game/AI/Action/actionNavMeshGrabLeftWalk.cpp +++ b/src/Game/AI/Action/actionNavMeshGrabLeftWalk.cpp @@ -4,33 +4,4 @@ namespace uking::action { NavMeshGrabLeftWalk::NavMeshGrabLeftWalk(const InitArg& arg) : NavMeshAction(arg) {} -NavMeshGrabLeftWalk::~NavMeshGrabLeftWalk() = default; - -bool NavMeshGrabLeftWalk::init_(sead::Heap* heap) { - return NavMeshAction::init_(heap); -} - -void NavMeshGrabLeftWalk::enter_(ksys::act::ai::InlineParamPack* params) { - NavMeshAction::enter_(params); -} - -void NavMeshGrabLeftWalk::leave_() { - NavMeshAction::leave_(); -} - -void NavMeshGrabLeftWalk::loadParams_() { - getStaticParam(&mWeaponIdx_s, "WeaponIdx"); - getStaticParam(&mSpeed_s, "Speed"); - getStaticParam(&mRotSpd_s, "RotSpd"); - getStaticParam(&mFinRadius_s, "FinRadius"); - getStaticParam(&mFinRotate_s, "FinRotate"); - getStaticParam(&mAccRatio_s, "AccRatio"); - getStaticParam(&mIsCheckCliff_s, "IsCheckCliff"); - getDynamicParam(&mTargetPos_d, "TargetPos"); -} - -void NavMeshGrabLeftWalk::calc_() { - NavMeshAction::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionNavMeshGrabLeftWalk.h b/src/Game/AI/Action/actionNavMeshGrabLeftWalk.h index 1f7ed91f..a3915963 100644 --- a/src/Game/AI/Action/actionNavMeshGrabLeftWalk.h +++ b/src/Game/AI/Action/actionNavMeshGrabLeftWalk.h @@ -9,32 +9,8 @@ class NavMeshGrabLeftWalk : public NavMeshAction { SEAD_RTTI_OVERRIDE(NavMeshGrabLeftWalk, NavMeshAction) public: explicit NavMeshGrabLeftWalk(const InitArg& arg); - ~NavMeshGrabLeftWalk() override; - - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; protected: - void calc_() override; - - // static_param at offset 0x20 - const int* mWeaponIdx_s{}; - // static_param at offset 0x28 - const float* mSpeed_s{}; - // static_param at offset 0x30 - const float* mRotSpd_s{}; - // static_param at offset 0x38 - const float* mFinRadius_s{}; - // static_param at offset 0x40 - const float* mFinRotate_s{}; - // static_param at offset 0x48 - const float* mAccRatio_s{}; - // static_param at offset 0x50 - const bool* mIsCheckCliff_s{}; - // dynamic_param at offset 0x58 - sead::Vector3f* mTargetPos_d{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionNavMeshGrabRightWalk.cpp b/src/Game/AI/Action/actionNavMeshGrabRightWalk.cpp index dc7701a1..88c6bbfc 100644 --- a/src/Game/AI/Action/actionNavMeshGrabRightWalk.cpp +++ b/src/Game/AI/Action/actionNavMeshGrabRightWalk.cpp @@ -4,33 +4,4 @@ namespace uking::action { NavMeshGrabRightWalk::NavMeshGrabRightWalk(const InitArg& arg) : NavMeshAction(arg) {} -NavMeshGrabRightWalk::~NavMeshGrabRightWalk() = default; - -bool NavMeshGrabRightWalk::init_(sead::Heap* heap) { - return NavMeshAction::init_(heap); -} - -void NavMeshGrabRightWalk::enter_(ksys::act::ai::InlineParamPack* params) { - NavMeshAction::enter_(params); -} - -void NavMeshGrabRightWalk::leave_() { - NavMeshAction::leave_(); -} - -void NavMeshGrabRightWalk::loadParams_() { - getStaticParam(&mWeaponIdx_s, "WeaponIdx"); - getStaticParam(&mSpeed_s, "Speed"); - getStaticParam(&mRotSpd_s, "RotSpd"); - getStaticParam(&mFinRadius_s, "FinRadius"); - getStaticParam(&mFinRotate_s, "FinRotate"); - getStaticParam(&mAccRatio_s, "AccRatio"); - getStaticParam(&mIsCheckCliff_s, "IsCheckCliff"); - getDynamicParam(&mTargetPos_d, "TargetPos"); -} - -void NavMeshGrabRightWalk::calc_() { - NavMeshAction::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionNavMeshGrabRightWalk.h b/src/Game/AI/Action/actionNavMeshGrabRightWalk.h index b4285010..4497c457 100644 --- a/src/Game/AI/Action/actionNavMeshGrabRightWalk.h +++ b/src/Game/AI/Action/actionNavMeshGrabRightWalk.h @@ -9,32 +9,8 @@ class NavMeshGrabRightWalk : public NavMeshAction { SEAD_RTTI_OVERRIDE(NavMeshGrabRightWalk, NavMeshAction) public: explicit NavMeshGrabRightWalk(const InitArg& arg); - ~NavMeshGrabRightWalk() override; - - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; protected: - void calc_() override; - - // static_param at offset 0x20 - const int* mWeaponIdx_s{}; - // static_param at offset 0x28 - const float* mSpeed_s{}; - // static_param at offset 0x30 - const float* mRotSpd_s{}; - // static_param at offset 0x38 - const float* mFinRadius_s{}; - // static_param at offset 0x40 - const float* mFinRotate_s{}; - // static_param at offset 0x48 - const float* mAccRatio_s{}; - // static_param at offset 0x50 - const bool* mIsCheckCliff_s{}; - // dynamic_param at offset 0x58 - sead::Vector3f* mTargetPos_d{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionNavMeshGuardRun.cpp b/src/Game/AI/Action/actionNavMeshGuardRun.cpp index 1be0f1e7..81a09283 100644 --- a/src/Game/AI/Action/actionNavMeshGuardRun.cpp +++ b/src/Game/AI/Action/actionNavMeshGuardRun.cpp @@ -6,31 +6,4 @@ NavMeshGuardRun::NavMeshGuardRun(const InitArg& arg) : NavMeshAction(arg) {} NavMeshGuardRun::~NavMeshGuardRun() = default; -bool NavMeshGuardRun::init_(sead::Heap* heap) { - return NavMeshAction::init_(heap); -} - -void NavMeshGuardRun::enter_(ksys::act::ai::InlineParamPack* params) { - NavMeshAction::enter_(params); -} - -void NavMeshGuardRun::leave_() { - NavMeshAction::leave_(); -} - -void NavMeshGuardRun::loadParams_() { - getStaticParam(&mWeaponIdx_s, "WeaponIdx"); - getStaticParam(&mSpeed_s, "Speed"); - getStaticParam(&mRotSpd_s, "RotSpd"); - getStaticParam(&mFinRadius_s, "FinRadius"); - getStaticParam(&mFinRotate_s, "FinRotate"); - getStaticParam(&mAccRatio_s, "AccRatio"); - getStaticParam(&mIsCheckCliff_s, "IsCheckCliff"); - getDynamicParam(&mTargetPos_d, "TargetPos"); -} - -void NavMeshGuardRun::calc_() { - NavMeshAction::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionNavMeshGuardRun.h b/src/Game/AI/Action/actionNavMeshGuardRun.h index 37133069..b5af0c48 100644 --- a/src/Game/AI/Action/actionNavMeshGuardRun.h +++ b/src/Game/AI/Action/actionNavMeshGuardRun.h @@ -11,30 +11,7 @@ public: explicit NavMeshGuardRun(const InitArg& arg); ~NavMeshGuardRun() override; - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; - protected: - void calc_() override; - - // static_param at offset 0x20 - const int* mWeaponIdx_s{}; - // static_param at offset 0x28 - const float* mSpeed_s{}; - // static_param at offset 0x30 - const float* mRotSpd_s{}; - // static_param at offset 0x38 - const float* mFinRadius_s{}; - // static_param at offset 0x40 - const float* mFinRotate_s{}; - // static_param at offset 0x48 - const float* mAccRatio_s{}; - // static_param at offset 0x50 - const bool* mIsCheckCliff_s{}; - // dynamic_param at offset 0x58 - sead::Vector3f* mTargetPos_d{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionNavMeshGuardWalk.cpp b/src/Game/AI/Action/actionNavMeshGuardWalk.cpp index 922f239f..c0a3c4b5 100644 --- a/src/Game/AI/Action/actionNavMeshGuardWalk.cpp +++ b/src/Game/AI/Action/actionNavMeshGuardWalk.cpp @@ -6,31 +6,4 @@ NavMeshGuardWalk::NavMeshGuardWalk(const InitArg& arg) : NavMeshAction(arg) {} NavMeshGuardWalk::~NavMeshGuardWalk() = default; -bool NavMeshGuardWalk::init_(sead::Heap* heap) { - return NavMeshAction::init_(heap); -} - -void NavMeshGuardWalk::enter_(ksys::act::ai::InlineParamPack* params) { - NavMeshAction::enter_(params); -} - -void NavMeshGuardWalk::leave_() { - NavMeshAction::leave_(); -} - -void NavMeshGuardWalk::loadParams_() { - getStaticParam(&mWeaponIdx_s, "WeaponIdx"); - getStaticParam(&mSpeed_s, "Speed"); - getStaticParam(&mRotSpd_s, "RotSpd"); - getStaticParam(&mFinRadius_s, "FinRadius"); - getStaticParam(&mFinRotate_s, "FinRotate"); - getStaticParam(&mAccRatio_s, "AccRatio"); - getStaticParam(&mIsCheckCliff_s, "IsCheckCliff"); - getDynamicParam(&mTargetPos_d, "TargetPos"); -} - -void NavMeshGuardWalk::calc_() { - NavMeshAction::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionNavMeshGuardWalk.h b/src/Game/AI/Action/actionNavMeshGuardWalk.h index 90354565..2db64f94 100644 --- a/src/Game/AI/Action/actionNavMeshGuardWalk.h +++ b/src/Game/AI/Action/actionNavMeshGuardWalk.h @@ -11,30 +11,7 @@ public: explicit NavMeshGuardWalk(const InitArg& arg); ~NavMeshGuardWalk() override; - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; - protected: - void calc_() override; - - // static_param at offset 0x20 - const int* mWeaponIdx_s{}; - // static_param at offset 0x28 - const float* mSpeed_s{}; - // static_param at offset 0x30 - const float* mRotSpd_s{}; - // static_param at offset 0x38 - const float* mFinRadius_s{}; - // static_param at offset 0x40 - const float* mFinRotate_s{}; - // static_param at offset 0x48 - const float* mAccRatio_s{}; - // static_param at offset 0x50 - const bool* mIsCheckCliff_s{}; - // dynamic_param at offset 0x58 - sead::Vector3f* mTargetPos_d{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionNavMeshJump.cpp b/src/Game/AI/Action/actionNavMeshJump.cpp index e0ed2aeb..72e2eac6 100644 --- a/src/Game/AI/Action/actionNavMeshJump.cpp +++ b/src/Game/AI/Action/actionNavMeshJump.cpp @@ -4,32 +4,4 @@ namespace uking::action { NavMeshJump::NavMeshJump(const InitArg& arg) : JumpTo(arg) {} -NavMeshJump::~NavMeshJump() = default; - -bool NavMeshJump::init_(sead::Heap* heap) { - return JumpTo::init_(heap); -} - -void NavMeshJump::enter_(ksys::act::ai::InlineParamPack* params) { - JumpTo::enter_(params); -} - -void NavMeshJump::leave_() { - JumpTo::leave_(); -} - -void NavMeshJump::loadParams_() { - getStaticParam(&mMaxSpeed_s, "MaxSpeed"); - getStaticParam(&mJumpHeight_s, "JumpHeight"); - getStaticParam(&mJumpGravity_s, "JumpGravity"); - getStaticParam(&mPosReduceRatioOnGround_s, "PosReduceRatioOnGround"); - getStaticParam(&mRotReduceRatioOnGround_s, "RotReduceRatioOnGround"); - getStaticParam(&mInWaterDepth_s, "InWaterDepth"); - getDynamicParam(&mTargetPos_d, "TargetPos"); -} - -void NavMeshJump::calc_() { - JumpTo::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionNavMeshJump.h b/src/Game/AI/Action/actionNavMeshJump.h index 9e81b66a..b0cde1d5 100644 --- a/src/Game/AI/Action/actionNavMeshJump.h +++ b/src/Game/AI/Action/actionNavMeshJump.h @@ -9,30 +9,8 @@ class NavMeshJump : public JumpTo { SEAD_RTTI_OVERRIDE(NavMeshJump, JumpTo) public: explicit NavMeshJump(const InitArg& arg); - ~NavMeshJump() override; - - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; protected: - void calc_() override; - - // static_param at offset 0x20 - const float* mMaxSpeed_s{}; - // static_param at offset 0x28 - const float* mJumpHeight_s{}; - // static_param at offset 0x30 - const float* mJumpGravity_s{}; - // static_param at offset 0x38 - const float* mPosReduceRatioOnGround_s{}; - // static_param at offset 0x40 - const float* mRotReduceRatioOnGround_s{}; - // static_param at offset 0x48 - const float* mInWaterDepth_s{}; - // dynamic_param at offset 0x50 - sead::Vector3f* mTargetPos_d{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionNavMeshLiftWalk.cpp b/src/Game/AI/Action/actionNavMeshLiftWalk.cpp index 5c574e5f..a3e31937 100644 --- a/src/Game/AI/Action/actionNavMeshLiftWalk.cpp +++ b/src/Game/AI/Action/actionNavMeshLiftWalk.cpp @@ -4,8 +4,6 @@ namespace uking::action { NavMeshLiftWalk::NavMeshLiftWalk(const InitArg& arg) : NavMeshAction(arg) {} -NavMeshLiftWalk::~NavMeshLiftWalk() = default; - bool NavMeshLiftWalk::init_(sead::Heap* heap) { return NavMeshAction::init_(heap); } diff --git a/src/Game/AI/Action/actionNavMeshLiftWalk.h b/src/Game/AI/Action/actionNavMeshLiftWalk.h index 72a051e5..fd5214e0 100644 --- a/src/Game/AI/Action/actionNavMeshLiftWalk.h +++ b/src/Game/AI/Action/actionNavMeshLiftWalk.h @@ -9,7 +9,6 @@ class NavMeshLiftWalk : public NavMeshAction { SEAD_RTTI_OVERRIDE(NavMeshLiftWalk, NavMeshAction) public: explicit NavMeshLiftWalk(const InitArg& arg); - ~NavMeshLiftWalk() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/AI/Action/actionNavMeshMoveWithAS.cpp b/src/Game/AI/Action/actionNavMeshMoveWithAS.cpp index 5b590729..6b091563 100644 --- a/src/Game/AI/Action/actionNavMeshMoveWithAS.cpp +++ b/src/Game/AI/Action/actionNavMeshMoveWithAS.cpp @@ -10,22 +10,10 @@ bool NavMeshMoveWithAS::init_(sead::Heap* heap) { return NavMeshAction::init_(heap); } -void NavMeshMoveWithAS::enter_(ksys::act::ai::InlineParamPack* params) { - NavMeshAction::enter_(params); -} - -void NavMeshMoveWithAS::leave_() { - NavMeshAction::leave_(); -} - void NavMeshMoveWithAS::loadParams_() { NavMeshAction::loadParams_(); getStaticParam(&mIsIgnoreSameAS_s, "IsIgnoreSameAS"); getStaticParam(&mASName_s, "ASName"); } -void NavMeshMoveWithAS::calc_() { - NavMeshAction::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionNavMeshMoveWithAS.h b/src/Game/AI/Action/actionNavMeshMoveWithAS.h index a4e286f1..1d47a50d 100644 --- a/src/Game/AI/Action/actionNavMeshMoveWithAS.h +++ b/src/Game/AI/Action/actionNavMeshMoveWithAS.h @@ -12,13 +12,9 @@ public: ~NavMeshMoveWithAS() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // static_param at offset 0xa8 const bool* mIsIgnoreSameAS_s{}; // static_param at offset 0xb0 diff --git a/src/Game/AI/Action/actionNavMeshRun.cpp b/src/Game/AI/Action/actionNavMeshRun.cpp index 659479da..6e47e5b7 100644 --- a/src/Game/AI/Action/actionNavMeshRun.cpp +++ b/src/Game/AI/Action/actionNavMeshRun.cpp @@ -4,33 +4,4 @@ namespace uking::action { NavMeshRun::NavMeshRun(const InitArg& arg) : NavMeshAction(arg) {} -NavMeshRun::~NavMeshRun() = default; - -bool NavMeshRun::init_(sead::Heap* heap) { - return NavMeshAction::init_(heap); -} - -void NavMeshRun::enter_(ksys::act::ai::InlineParamPack* params) { - NavMeshAction::enter_(params); -} - -void NavMeshRun::leave_() { - NavMeshAction::leave_(); -} - -void NavMeshRun::loadParams_() { - getStaticParam(&mWeaponIdx_s, "WeaponIdx"); - getStaticParam(&mSpeed_s, "Speed"); - getStaticParam(&mRotSpd_s, "RotSpd"); - getStaticParam(&mFinRadius_s, "FinRadius"); - getStaticParam(&mFinRotate_s, "FinRotate"); - getStaticParam(&mAccRatio_s, "AccRatio"); - getStaticParam(&mIsCheckCliff_s, "IsCheckCliff"); - getDynamicParam(&mTargetPos_d, "TargetPos"); -} - -void NavMeshRun::calc_() { - NavMeshAction::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionNavMeshRun.h b/src/Game/AI/Action/actionNavMeshRun.h index cc0dd00b..51d77456 100644 --- a/src/Game/AI/Action/actionNavMeshRun.h +++ b/src/Game/AI/Action/actionNavMeshRun.h @@ -9,32 +9,8 @@ class NavMeshRun : public NavMeshAction { SEAD_RTTI_OVERRIDE(NavMeshRun, NavMeshAction) public: explicit NavMeshRun(const InitArg& arg); - ~NavMeshRun() override; - - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; protected: - void calc_() override; - - // static_param at offset 0x20 - const int* mWeaponIdx_s{}; - // static_param at offset 0x28 - const float* mSpeed_s{}; - // static_param at offset 0x30 - const float* mRotSpd_s{}; - // static_param at offset 0x38 - const float* mFinRadius_s{}; - // static_param at offset 0x40 - const float* mFinRotate_s{}; - // static_param at offset 0x48 - const float* mAccRatio_s{}; - // static_param at offset 0x50 - const bool* mIsCheckCliff_s{}; - // dynamic_param at offset 0x58 - sead::Vector3f* mTargetPos_d{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionNavMeshWalk.cpp b/src/Game/AI/Action/actionNavMeshWalk.cpp index f39e7745..fb98b553 100644 --- a/src/Game/AI/Action/actionNavMeshWalk.cpp +++ b/src/Game/AI/Action/actionNavMeshWalk.cpp @@ -4,33 +4,4 @@ namespace uking::action { NavMeshWalk::NavMeshWalk(const InitArg& arg) : NavMeshAction(arg) {} -NavMeshWalk::~NavMeshWalk() = default; - -bool NavMeshWalk::init_(sead::Heap* heap) { - return NavMeshAction::init_(heap); -} - -void NavMeshWalk::enter_(ksys::act::ai::InlineParamPack* params) { - NavMeshAction::enter_(params); -} - -void NavMeshWalk::leave_() { - NavMeshAction::leave_(); -} - -void NavMeshWalk::loadParams_() { - getStaticParam(&mWeaponIdx_s, "WeaponIdx"); - getStaticParam(&mSpeed_s, "Speed"); - getStaticParam(&mRotSpd_s, "RotSpd"); - getStaticParam(&mFinRadius_s, "FinRadius"); - getStaticParam(&mFinRotate_s, "FinRotate"); - getStaticParam(&mAccRatio_s, "AccRatio"); - getStaticParam(&mIsCheckCliff_s, "IsCheckCliff"); - getDynamicParam(&mTargetPos_d, "TargetPos"); -} - -void NavMeshWalk::calc_() { - NavMeshAction::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionNavMeshWalk.h b/src/Game/AI/Action/actionNavMeshWalk.h index c3545e30..92b73e08 100644 --- a/src/Game/AI/Action/actionNavMeshWalk.h +++ b/src/Game/AI/Action/actionNavMeshWalk.h @@ -9,32 +9,8 @@ class NavMeshWalk : public NavMeshAction { SEAD_RTTI_OVERRIDE(NavMeshWalk, NavMeshAction) public: explicit NavMeshWalk(const InitArg& arg); - ~NavMeshWalk() override; - - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; protected: - void calc_() override; - - // static_param at offset 0x20 - const int* mWeaponIdx_s{}; - // static_param at offset 0x28 - const float* mSpeed_s{}; - // static_param at offset 0x30 - const float* mRotSpd_s{}; - // static_param at offset 0x38 - const float* mFinRadius_s{}; - // static_param at offset 0x40 - const float* mFinRotate_s{}; - // static_param at offset 0x48 - const float* mAccRatio_s{}; - // static_param at offset 0x50 - const bool* mIsCheckCliff_s{}; - // dynamic_param at offset 0x58 - sead::Vector3f* mTargetPos_d{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionNoAutoPlacementEnemyDeadlyQuest.cpp b/src/Game/AI/Action/actionNoAutoPlacementEnemyDeadlyQuest.cpp index c5a7548d..f1168dc0 100644 --- a/src/Game/AI/Action/actionNoAutoPlacementEnemyDeadlyQuest.cpp +++ b/src/Game/AI/Action/actionNoAutoPlacementEnemyDeadlyQuest.cpp @@ -11,18 +11,6 @@ bool NoAutoPlacementEnemyDeadlyQuest::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void NoAutoPlacementEnemyDeadlyQuest::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void NoAutoPlacementEnemyDeadlyQuest::leave_() { - ksys::act::ai::Action::leave_(); -} - void NoAutoPlacementEnemyDeadlyQuest::loadParams_() {} -void NoAutoPlacementEnemyDeadlyQuest::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionNoAutoPlacementEnemyDeadlyQuest.h b/src/Game/AI/Action/actionNoAutoPlacementEnemyDeadlyQuest.h index 31b86e58..99340c25 100644 --- a/src/Game/AI/Action/actionNoAutoPlacementEnemyDeadlyQuest.h +++ b/src/Game/AI/Action/actionNoAutoPlacementEnemyDeadlyQuest.h @@ -11,12 +11,9 @@ public: ~NoAutoPlacementEnemyDeadlyQuest() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionNoDeleteCurrentActor.cpp b/src/Game/AI/Action/actionNoDeleteCurrentActor.cpp index a023a953..a007d7de 100644 --- a/src/Game/AI/Action/actionNoDeleteCurrentActor.cpp +++ b/src/Game/AI/Action/actionNoDeleteCurrentActor.cpp @@ -10,18 +10,6 @@ bool NoDeleteCurrentActor::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void NoDeleteCurrentActor::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void NoDeleteCurrentActor::leave_() { - ksys::act::ai::Action::leave_(); -} - void NoDeleteCurrentActor::loadParams_() {} -void NoDeleteCurrentActor::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionNoDeleteCurrentActor.h b/src/Game/AI/Action/actionNoDeleteCurrentActor.h index 4dce4795..9f0a67ec 100644 --- a/src/Game/AI/Action/actionNoDeleteCurrentActor.h +++ b/src/Game/AI/Action/actionNoDeleteCurrentActor.h @@ -11,12 +11,9 @@ public: ~NoDeleteCurrentActor() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionNotStopXLinkWithDemoVisibleOff.cpp b/src/Game/AI/Action/actionNotStopXLinkWithDemoVisibleOff.cpp index e90e5fd3..888fec6b 100644 --- a/src/Game/AI/Action/actionNotStopXLinkWithDemoVisibleOff.cpp +++ b/src/Game/AI/Action/actionNotStopXLinkWithDemoVisibleOff.cpp @@ -7,10 +7,6 @@ NotStopXLinkWithDemoVisibleOff::NotStopXLinkWithDemoVisibleOff(const InitArg& ar NotStopXLinkWithDemoVisibleOff::~NotStopXLinkWithDemoVisibleOff() = default; -bool NotStopXLinkWithDemoVisibleOff::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - void NotStopXLinkWithDemoVisibleOff::enter_(ksys::act::ai::InlineParamPack* params) { ksys::act::ai::Action::enter_(params); } @@ -19,10 +15,4 @@ void NotStopXLinkWithDemoVisibleOff::leave_() { ksys::act::ai::Action::leave_(); } -void NotStopXLinkWithDemoVisibleOff::loadParams_() {} - -void NotStopXLinkWithDemoVisibleOff::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionNotStopXLinkWithDemoVisibleOff.h b/src/Game/AI/Action/actionNotStopXLinkWithDemoVisibleOff.h index ffc025ce..1d13e59a 100644 --- a/src/Game/AI/Action/actionNotStopXLinkWithDemoVisibleOff.h +++ b/src/Game/AI/Action/actionNotStopXLinkWithDemoVisibleOff.h @@ -10,13 +10,10 @@ public: explicit NotStopXLinkWithDemoVisibleOff(const InitArg& arg); ~NotStopXLinkWithDemoVisibleOff() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; - void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionNotice.cpp b/src/Game/AI/Action/actionNotice.cpp index e4305312..ce863115 100644 --- a/src/Game/AI/Action/actionNotice.cpp +++ b/src/Game/AI/Action/actionNotice.cpp @@ -4,27 +4,8 @@ namespace uking::action { Notice::Notice(const InitArg& arg) : ActionWithAS(arg) {} -Notice::~Notice() = default; - -bool Notice::init_(sead::Heap* heap) { - return ActionWithAS::init_(heap); -} - void Notice::enter_(ksys::act::ai::InlineParamPack* params) { ActionWithAS::enter_(params); } -void Notice::leave_() { - ActionWithAS::leave_(); -} - -void Notice::loadParams_() { - getStaticParam(&mPosReduceRatio_s, "PosReduceRatio"); - getStaticParam(&mAngReduceRatio_s, "AngReduceRatio"); -} - -void Notice::calc_() { - ActionWithAS::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionNotice.h b/src/Game/AI/Action/actionNotice.h index 82dfafff..d80ae690 100644 --- a/src/Game/AI/Action/actionNotice.h +++ b/src/Game/AI/Action/actionNotice.h @@ -9,20 +9,10 @@ class Notice : public ActionWithAS { SEAD_RTTI_OVERRIDE(Notice, ActionWithAS) public: explicit Notice(const InitArg& arg); - ~Notice() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; protected: - void calc_() override; - - // static_param at offset 0x20 - const float* mPosReduceRatio_s{}; - // static_param at offset 0x28 - const float* mAngReduceRatio_s{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionObservationPointAction.cpp b/src/Game/AI/Action/actionObservationPointAction.cpp index 95444d03..450fa4f7 100644 --- a/src/Game/AI/Action/actionObservationPointAction.cpp +++ b/src/Game/AI/Action/actionObservationPointAction.cpp @@ -6,10 +6,6 @@ ObservationPointAction::ObservationPointAction(const InitArg& arg) : ksys::act:: ObservationPointAction::~ObservationPointAction() = default; -bool ObservationPointAction::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - void ObservationPointAction::enter_(ksys::act::ai::InlineParamPack* params) { ksys::act::ai::Action::enter_(params); } diff --git a/src/Game/AI/Action/actionObservationPointAction.h b/src/Game/AI/Action/actionObservationPointAction.h index 33d98143..d61db56a 100644 --- a/src/Game/AI/Action/actionObservationPointAction.h +++ b/src/Game/AI/Action/actionObservationPointAction.h @@ -10,7 +10,6 @@ public: explicit ObservationPointAction(const InitArg& arg); ~ObservationPointAction() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionOkAutoPlacementEnemyDeadlyQuest.cpp b/src/Game/AI/Action/actionOkAutoPlacementEnemyDeadlyQuest.cpp index 7944e706..4e06eb40 100644 --- a/src/Game/AI/Action/actionOkAutoPlacementEnemyDeadlyQuest.cpp +++ b/src/Game/AI/Action/actionOkAutoPlacementEnemyDeadlyQuest.cpp @@ -11,18 +11,6 @@ bool OkAutoPlacementEnemyDeadlyQuest::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void OkAutoPlacementEnemyDeadlyQuest::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void OkAutoPlacementEnemyDeadlyQuest::leave_() { - ksys::act::ai::Action::leave_(); -} - void OkAutoPlacementEnemyDeadlyQuest::loadParams_() {} -void OkAutoPlacementEnemyDeadlyQuest::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionOkAutoPlacementEnemyDeadlyQuest.h b/src/Game/AI/Action/actionOkAutoPlacementEnemyDeadlyQuest.h index 382f63d6..5428b985 100644 --- a/src/Game/AI/Action/actionOkAutoPlacementEnemyDeadlyQuest.h +++ b/src/Game/AI/Action/actionOkAutoPlacementEnemyDeadlyQuest.h @@ -11,12 +11,9 @@ public: ~OkAutoPlacementEnemyDeadlyQuest() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionOnMUAssignSaveForUsed.cpp b/src/Game/AI/Action/actionOnMUAssignSaveForUsed.cpp index 9751bcd1..35bcdfc1 100644 --- a/src/Game/AI/Action/actionOnMUAssignSaveForUsed.cpp +++ b/src/Game/AI/Action/actionOnMUAssignSaveForUsed.cpp @@ -10,18 +10,6 @@ bool OnMUAssignSaveForUsed::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void OnMUAssignSaveForUsed::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void OnMUAssignSaveForUsed::leave_() { - ksys::act::ai::Action::leave_(); -} - void OnMUAssignSaveForUsed::loadParams_() {} -void OnMUAssignSaveForUsed::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionOnMUAssignSaveForUsed.h b/src/Game/AI/Action/actionOnMUAssignSaveForUsed.h index 9aec54e4..175cf7a0 100644 --- a/src/Game/AI/Action/actionOnMUAssignSaveForUsed.h +++ b/src/Game/AI/Action/actionOnMUAssignSaveForUsed.h @@ -11,12 +11,9 @@ public: ~OnMUAssignSaveForUsed() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionOnetimeMoveASPlay.cpp b/src/Game/AI/Action/actionOnetimeMoveASPlay.cpp index 0b6a42f2..da389410 100644 --- a/src/Game/AI/Action/actionOnetimeMoveASPlay.cpp +++ b/src/Game/AI/Action/actionOnetimeMoveASPlay.cpp @@ -6,10 +6,6 @@ OnetimeMoveASPlay::OnetimeMoveASPlay(const InitArg& arg) : OnetimeStopASPlay(arg OnetimeMoveASPlay::~OnetimeMoveASPlay() = default; -bool OnetimeMoveASPlay::init_(sead::Heap* heap) { - return OnetimeStopASPlay::init_(heap); -} - void OnetimeMoveASPlay::enter_(ksys::act::ai::InlineParamPack* params) { OnetimeStopASPlay::enter_(params); } diff --git a/src/Game/AI/Action/actionOnetimeMoveASPlay.h b/src/Game/AI/Action/actionOnetimeMoveASPlay.h index 9c140347..8c3d205e 100644 --- a/src/Game/AI/Action/actionOnetimeMoveASPlay.h +++ b/src/Game/AI/Action/actionOnetimeMoveASPlay.h @@ -11,7 +11,6 @@ public: explicit OnetimeMoveASPlay(const InitArg& arg); ~OnetimeMoveASPlay() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionOnetimeStopASPlay.cpp b/src/Game/AI/Action/actionOnetimeStopASPlay.cpp index 41c8fe2f..9656fd6a 100644 --- a/src/Game/AI/Action/actionOnetimeStopASPlay.cpp +++ b/src/Game/AI/Action/actionOnetimeStopASPlay.cpp @@ -6,10 +6,6 @@ OnetimeStopASPlay::OnetimeStopASPlay(const InitArg& arg) : ActionWithAS(arg) {} OnetimeStopASPlay::~OnetimeStopASPlay() = default; -bool OnetimeStopASPlay::init_(sead::Heap* heap) { - return ActionWithAS::init_(heap); -} - void OnetimeStopASPlay::enter_(ksys::act::ai::InlineParamPack* params) { ActionWithAS::enter_(params); } diff --git a/src/Game/AI/Action/actionOnetimeStopASPlay.h b/src/Game/AI/Action/actionOnetimeStopASPlay.h index 588f5da5..b8657839 100644 --- a/src/Game/AI/Action/actionOnetimeStopASPlay.h +++ b/src/Game/AI/Action/actionOnetimeStopASPlay.h @@ -11,7 +11,6 @@ public: explicit OnetimeStopASPlay(const InitArg& arg); ~OnetimeStopASPlay() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionOnetimeStopASSyncPlay.cpp b/src/Game/AI/Action/actionOnetimeStopASSyncPlay.cpp index 3058e812..6115b56c 100644 --- a/src/Game/AI/Action/actionOnetimeStopASSyncPlay.cpp +++ b/src/Game/AI/Action/actionOnetimeStopASSyncPlay.cpp @@ -6,18 +6,10 @@ OnetimeStopASSyncPlay::OnetimeStopASSyncPlay(const InitArg& arg) : OnetimeStopAS OnetimeStopASSyncPlay::~OnetimeStopASSyncPlay() = default; -bool OnetimeStopASSyncPlay::init_(sead::Heap* heap) { - return OnetimeStopASPlay::init_(heap); -} - void OnetimeStopASSyncPlay::enter_(ksys::act::ai::InlineParamPack* params) { OnetimeStopASPlay::enter_(params); } -void OnetimeStopASSyncPlay::leave_() { - OnetimeStopASPlay::leave_(); -} - void OnetimeStopASSyncPlay::loadParams_() { OnetimeStopASPlay::loadParams_(); getStaticParam(&mSyncASSlot_s, "SyncASSlot"); @@ -25,8 +17,4 @@ void OnetimeStopASSyncPlay::loadParams_() { getStaticParam(&mSyncASName_s, "SyncASName"); } -void OnetimeStopASSyncPlay::calc_() { - OnetimeStopASPlay::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionOnetimeStopASSyncPlay.h b/src/Game/AI/Action/actionOnetimeStopASSyncPlay.h index 23a6c13d..8c33761f 100644 --- a/src/Game/AI/Action/actionOnetimeStopASSyncPlay.h +++ b/src/Game/AI/Action/actionOnetimeStopASSyncPlay.h @@ -11,14 +11,10 @@ public: explicit OnetimeStopASSyncPlay(const InitArg& arg); ~OnetimeStopASSyncPlay() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // static_param at offset 0x48 const int* mSyncASSlot_s{}; // static_param at offset 0x50 diff --git a/src/Game/AI/Action/actionOpenClockTime.cpp b/src/Game/AI/Action/actionOpenClockTime.cpp index db86890f..a822feaf 100644 --- a/src/Game/AI/Action/actionOpenClockTime.cpp +++ b/src/Game/AI/Action/actionOpenClockTime.cpp @@ -10,18 +10,6 @@ bool OpenClockTime::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void OpenClockTime::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void OpenClockTime::leave_() { - ksys::act::ai::Action::leave_(); -} - void OpenClockTime::loadParams_() {} -void OpenClockTime::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionOpenClockTime.h b/src/Game/AI/Action/actionOpenClockTime.h index dddea64b..3a158c2b 100644 --- a/src/Game/AI/Action/actionOpenClockTime.h +++ b/src/Game/AI/Action/actionOpenClockTime.h @@ -11,12 +11,9 @@ public: ~OpenClockTime() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionOpenItemCategory.cpp b/src/Game/AI/Action/actionOpenItemCategory.cpp index 0c7deee6..96b687a9 100644 --- a/src/Game/AI/Action/actionOpenItemCategory.cpp +++ b/src/Game/AI/Action/actionOpenItemCategory.cpp @@ -10,20 +10,8 @@ bool OpenItemCategory::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void OpenItemCategory::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void OpenItemCategory::leave_() { - ksys::act::ai::Action::leave_(); -} - void OpenItemCategory::loadParams_() { getDynamicParam(&mCategory_d, "Category"); } -void OpenItemCategory::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionOpenItemCategory.h b/src/Game/AI/Action/actionOpenItemCategory.h index e3d676ae..0dad95b4 100644 --- a/src/Game/AI/Action/actionOpenItemCategory.h +++ b/src/Game/AI/Action/actionOpenItemCategory.h @@ -11,13 +11,9 @@ public: ~OpenItemCategory() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 int* mCategory_d{}; }; diff --git a/src/Game/AI/Action/actionOpenItemMenu.cpp b/src/Game/AI/Action/actionOpenItemMenu.cpp index d24c6ee9..1062f99b 100644 --- a/src/Game/AI/Action/actionOpenItemMenu.cpp +++ b/src/Game/AI/Action/actionOpenItemMenu.cpp @@ -10,20 +10,8 @@ bool OpenItemMenu::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void OpenItemMenu::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void OpenItemMenu::leave_() { - ksys::act::ai::Action::leave_(); -} - void OpenItemMenu::loadParams_() { getDynamicParam(&mMenuType_d, "MenuType"); } -void OpenItemMenu::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionOpenItemMenu.h b/src/Game/AI/Action/actionOpenItemMenu.h index 9423058b..cfb0603d 100644 --- a/src/Game/AI/Action/actionOpenItemMenu.h +++ b/src/Game/AI/Action/actionOpenItemMenu.h @@ -11,13 +11,9 @@ public: ~OpenItemMenu() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 int* mMenuType_d{}; }; diff --git a/src/Game/AI/Action/actionOpenMap.cpp b/src/Game/AI/Action/actionOpenMap.cpp index 4108a540..82ac5869 100644 --- a/src/Game/AI/Action/actionOpenMap.cpp +++ b/src/Game/AI/Action/actionOpenMap.cpp @@ -10,21 +10,9 @@ bool OpenMap::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void OpenMap::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void OpenMap::leave_() { - ksys::act::ai::Action::leave_(); -} - void OpenMap::loadParams_() { getDynamicParam(&mScaleLevel_d, "ScaleLevel"); getDynamicParam(&mWorldPos_d, "WorldPos"); } -void OpenMap::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionOpenMap.h b/src/Game/AI/Action/actionOpenMap.h index e27bb122..30ac352d 100644 --- a/src/Game/AI/Action/actionOpenMap.h +++ b/src/Game/AI/Action/actionOpenMap.h @@ -11,13 +11,9 @@ public: ~OpenMap() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 int* mScaleLevel_d{}; // dynamic_param at offset 0x28 diff --git a/src/Game/AI/Action/actionOpenMessageDialogTrig.cpp b/src/Game/AI/Action/actionOpenMessageDialogTrig.cpp index 508b0481..ac34fb5b 100644 --- a/src/Game/AI/Action/actionOpenMessageDialogTrig.cpp +++ b/src/Game/AI/Action/actionOpenMessageDialogTrig.cpp @@ -10,14 +10,6 @@ bool OpenMessageDialogTrig::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void OpenMessageDialogTrig::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void OpenMessageDialogTrig::leave_() { - ksys::act::ai::Action::leave_(); -} - void OpenMessageDialogTrig::loadParams_() { getDynamicParam(&mCloseDialogOption_d, "CloseDialogOption"); getDynamicParam(&mIsBecomingSpeaker_d, "IsBecomingSpeaker"); @@ -25,8 +17,4 @@ void OpenMessageDialogTrig::loadParams_() { getDynamicParam(&mMessageId_d, "MessageId"); } -void OpenMessageDialogTrig::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionOpenMessageDialogTrig.h b/src/Game/AI/Action/actionOpenMessageDialogTrig.h index 86873411..2e646709 100644 --- a/src/Game/AI/Action/actionOpenMessageDialogTrig.h +++ b/src/Game/AI/Action/actionOpenMessageDialogTrig.h @@ -11,13 +11,9 @@ public: ~OpenMessageDialogTrig() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 int* mCloseDialogOption_d{}; // dynamic_param at offset 0x28 diff --git a/src/Game/AI/Action/actionOwnedHorseObserveAction.cpp b/src/Game/AI/Action/actionOwnedHorseObserveAction.cpp index c03ffaf5..a777a3c9 100644 --- a/src/Game/AI/Action/actionOwnedHorseObserveAction.cpp +++ b/src/Game/AI/Action/actionOwnedHorseObserveAction.cpp @@ -14,10 +14,6 @@ void OwnedHorseObserveAction::enter_(ksys::act::ai::InlineParamPack* params) { AreaTagAction::enter_(params); } -void OwnedHorseObserveAction::leave_() { - AreaTagAction::leave_(); -} - void OwnedHorseObserveAction::loadParams_() { getMapUnitParam(&mSaveFlag_m, "SaveFlag"); } diff --git a/src/Game/AI/Action/actionOwnedHorseObserveAction.h b/src/Game/AI/Action/actionOwnedHorseObserveAction.h index e5a9a3fc..175fde85 100644 --- a/src/Game/AI/Action/actionOwnedHorseObserveAction.h +++ b/src/Game/AI/Action/actionOwnedHorseObserveAction.h @@ -13,7 +13,6 @@ public: bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: diff --git a/src/Game/AI/Action/actionPlayASForDemoWithSword.cpp b/src/Game/AI/Action/actionPlayASForDemoWithSword.cpp index 3e92103f..899bf69b 100644 --- a/src/Game/AI/Action/actionPlayASForDemoWithSword.cpp +++ b/src/Game/AI/Action/actionPlayASForDemoWithSword.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayASForDemoWithSword::PlayASForDemoWithSword(const InitArg& arg) : PlayASForDemo(arg) {} -PlayASForDemoWithSword::~PlayASForDemoWithSword() = default; - -bool PlayASForDemoWithSword::init_(sead::Heap* heap) { - return PlayASForDemo::init_(heap); -} - void PlayASForDemoWithSword::enter_(ksys::act::ai::InlineParamPack* params) { PlayASForDemo::enter_(params); } diff --git a/src/Game/AI/Action/actionPlayASForDemoWithSword.h b/src/Game/AI/Action/actionPlayASForDemoWithSword.h index 750eaaac..959a09e4 100644 --- a/src/Game/AI/Action/actionPlayASForDemoWithSword.h +++ b/src/Game/AI/Action/actionPlayASForDemoWithSword.h @@ -9,9 +9,7 @@ class PlayASForDemoWithSword : public PlayASForDemo { SEAD_RTTI_OVERRIDE(PlayASForDemoWithSword, PlayASForDemo) public: explicit PlayASForDemoWithSword(const InitArg& arg); - ~PlayASForDemoWithSword() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionPlayASForTimelineWithSword.cpp b/src/Game/AI/Action/actionPlayASForTimelineWithSword.cpp index 0aa9a78b..11521291 100644 --- a/src/Game/AI/Action/actionPlayASForTimelineWithSword.cpp +++ b/src/Game/AI/Action/actionPlayASForTimelineWithSword.cpp @@ -5,12 +5,6 @@ namespace uking::action { PlayASForTimelineWithSword::PlayASForTimelineWithSword(const InitArg& arg) : PlayASForTimeline(arg) {} -PlayASForTimelineWithSword::~PlayASForTimelineWithSword() = default; - -bool PlayASForTimelineWithSword::init_(sead::Heap* heap) { - return PlayASForTimeline::init_(heap); -} - void PlayASForTimelineWithSword::enter_(ksys::act::ai::InlineParamPack* params) { PlayASForTimeline::enter_(params); } diff --git a/src/Game/AI/Action/actionPlayASForTimelineWithSword.h b/src/Game/AI/Action/actionPlayASForTimelineWithSword.h index 29c31443..8ff3e83b 100644 --- a/src/Game/AI/Action/actionPlayASForTimelineWithSword.h +++ b/src/Game/AI/Action/actionPlayASForTimelineWithSword.h @@ -9,9 +9,7 @@ class PlayASForTimelineWithSword : public PlayASForTimeline { SEAD_RTTI_OVERRIDE(PlayASForTimelineWithSword, PlayASForTimeline) public: explicit PlayASForTimelineWithSword(const InitArg& arg); - ~PlayASForTimelineWithSword() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionPlayerAction.cpp b/src/Game/AI/Action/actionPlayerAction.cpp index 4ebecd34..e7d0471b 100644 --- a/src/Game/AI/Action/actionPlayerAction.cpp +++ b/src/Game/AI/Action/actionPlayerAction.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerAction::PlayerAction(const InitArg& arg) : ActionEx(arg) {} -PlayerAction::~PlayerAction() = default; - -bool PlayerAction::init_(sead::Heap* heap) { - return ActionEx::init_(heap); -} - void PlayerAction::enter_(ksys::act::ai::InlineParamPack* params) { ActionEx::enter_(params); } @@ -18,8 +12,6 @@ void PlayerAction::leave_() { ActionEx::leave_(); } -void PlayerAction::loadParams_() {} - void PlayerAction::calc_() { ActionEx::calc_(); } diff --git a/src/Game/AI/Action/actionPlayerAction.h b/src/Game/AI/Action/actionPlayerAction.h index 2cf22135..b2af1006 100644 --- a/src/Game/AI/Action/actionPlayerAction.h +++ b/src/Game/AI/Action/actionPlayerAction.h @@ -9,12 +9,9 @@ class PlayerAction : public ActionEx { SEAD_RTTI_OVERRIDE(PlayerAction, ActionEx) public: explicit PlayerAction(const InitArg& arg); - ~PlayerAction() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; - void loadParams_() override; protected: void calc_() override; diff --git a/src/Game/AI/Action/actionPlayerAtnMove.cpp b/src/Game/AI/Action/actionPlayerAtnMove.cpp index 73029d65..e2d1686c 100644 --- a/src/Game/AI/Action/actionPlayerAtnMove.cpp +++ b/src/Game/AI/Action/actionPlayerAtnMove.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerAtnMove::PlayerAtnMove(const InitArg& arg) : PlayerAction(arg) {} -PlayerAtnMove::~PlayerAtnMove() = default; - -bool PlayerAtnMove::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerAtnMove::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } diff --git a/src/Game/AI/Action/actionPlayerAtnMove.h b/src/Game/AI/Action/actionPlayerAtnMove.h index 55aa846d..a38e3994 100644 --- a/src/Game/AI/Action/actionPlayerAtnMove.h +++ b/src/Game/AI/Action/actionPlayerAtnMove.h @@ -9,9 +9,7 @@ class PlayerAtnMove : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerAtnMove, PlayerAction) public: explicit PlayerAtnMove(const InitArg& arg); - ~PlayerAtnMove() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionPlayerAtnWait.cpp b/src/Game/AI/Action/actionPlayerAtnWait.cpp index 346af4d7..61d9500f 100644 --- a/src/Game/AI/Action/actionPlayerAtnWait.cpp +++ b/src/Game/AI/Action/actionPlayerAtnWait.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerAtnWait::PlayerAtnWait(const InitArg& arg) : PlayerAction(arg) {} -PlayerAtnWait::~PlayerAtnWait() = default; - -bool PlayerAtnWait::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerAtnWait::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } diff --git a/src/Game/AI/Action/actionPlayerAtnWait.h b/src/Game/AI/Action/actionPlayerAtnWait.h index 507b1d83..5b0f5185 100644 --- a/src/Game/AI/Action/actionPlayerAtnWait.h +++ b/src/Game/AI/Action/actionPlayerAtnWait.h @@ -9,9 +9,7 @@ class PlayerAtnWait : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerAtnWait, PlayerAction) public: explicit PlayerAtnWait(const InitArg& arg); - ~PlayerAtnWait() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionPlayerBackJump.cpp b/src/Game/AI/Action/actionPlayerBackJump.cpp index 60535b92..f902ffa8 100644 --- a/src/Game/AI/Action/actionPlayerBackJump.cpp +++ b/src/Game/AI/Action/actionPlayerBackJump.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerBackJump::PlayerBackJump(const InitArg& arg) : PlayerAction(arg) {} -PlayerBackJump::~PlayerBackJump() = default; - -bool PlayerBackJump::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerBackJump::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } diff --git a/src/Game/AI/Action/actionPlayerBackJump.h b/src/Game/AI/Action/actionPlayerBackJump.h index bed850bd..d0ff403e 100644 --- a/src/Game/AI/Action/actionPlayerBackJump.h +++ b/src/Game/AI/Action/actionPlayerBackJump.h @@ -9,9 +9,7 @@ class PlayerBackJump : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerBackJump, PlayerAction) public: explicit PlayerBackJump(const InitArg& arg); - ~PlayerBackJump() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionPlayerBackJumpLand.cpp b/src/Game/AI/Action/actionPlayerBackJumpLand.cpp index 6dd93b01..5c7752f3 100644 --- a/src/Game/AI/Action/actionPlayerBackJumpLand.cpp +++ b/src/Game/AI/Action/actionPlayerBackJumpLand.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerBackJumpLand::PlayerBackJumpLand(const InitArg& arg) : PlayerAction(arg) {} -PlayerBackJumpLand::~PlayerBackJumpLand() = default; - -bool PlayerBackJumpLand::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerBackJumpLand::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } @@ -18,8 +12,6 @@ void PlayerBackJumpLand::leave_() { PlayerAction::leave_(); } -void PlayerBackJumpLand::loadParams_() {} - void PlayerBackJumpLand::calc_() { PlayerAction::calc_(); } diff --git a/src/Game/AI/Action/actionPlayerBackJumpLand.h b/src/Game/AI/Action/actionPlayerBackJumpLand.h index b73a27c6..9a5d0795 100644 --- a/src/Game/AI/Action/actionPlayerBackJumpLand.h +++ b/src/Game/AI/Action/actionPlayerBackJumpLand.h @@ -9,12 +9,9 @@ class PlayerBackJumpLand : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerBackJumpLand, PlayerAction) public: explicit PlayerBackJumpLand(const InitArg& arg); - ~PlayerBackJumpLand() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; - void loadParams_() override; protected: void calc_() override; diff --git a/src/Game/AI/Action/actionPlayerBeamMove.cpp b/src/Game/AI/Action/actionPlayerBeamMove.cpp index 43787bf7..1e70aee6 100644 --- a/src/Game/AI/Action/actionPlayerBeamMove.cpp +++ b/src/Game/AI/Action/actionPlayerBeamMove.cpp @@ -6,10 +6,6 @@ PlayerBeamMove::PlayerBeamMove(const InitArg& arg) : WindCutter(arg) {} PlayerBeamMove::~PlayerBeamMove() = default; -bool PlayerBeamMove::init_(sead::Heap* heap) { - return WindCutter::init_(heap); -} - void PlayerBeamMove::enter_(ksys::act::ai::InlineParamPack* params) { WindCutter::enter_(params); } @@ -22,8 +18,4 @@ void PlayerBeamMove::loadParams_() { WindCutter::loadParams_(); } -void PlayerBeamMove::calc_() { - WindCutter::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionPlayerBeamMove.h b/src/Game/AI/Action/actionPlayerBeamMove.h index 6c65b38b..d918a1c4 100644 --- a/src/Game/AI/Action/actionPlayerBeamMove.h +++ b/src/Game/AI/Action/actionPlayerBeamMove.h @@ -11,13 +11,11 @@ public: explicit PlayerBeamMove(const InitArg& arg); ~PlayerBeamMove() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionPlayerBeetleSubject.cpp b/src/Game/AI/Action/actionPlayerBeetleSubject.cpp index eb44bbbf..364439c2 100644 --- a/src/Game/AI/Action/actionPlayerBeetleSubject.cpp +++ b/src/Game/AI/Action/actionPlayerBeetleSubject.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerBeetleSubject::PlayerBeetleSubject(const InitArg& arg) : PlayerAction(arg) {} -PlayerBeetleSubject::~PlayerBeetleSubject() = default; - -bool PlayerBeetleSubject::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerBeetleSubject::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } diff --git a/src/Game/AI/Action/actionPlayerBeetleSubject.h b/src/Game/AI/Action/actionPlayerBeetleSubject.h index 847c590c..73613865 100644 --- a/src/Game/AI/Action/actionPlayerBeetleSubject.h +++ b/src/Game/AI/Action/actionPlayerBeetleSubject.h @@ -9,9 +9,7 @@ class PlayerBeetleSubject : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerBeetleSubject, PlayerAction) public: explicit PlayerBeetleSubject(const InitArg& arg); - ~PlayerBeetleSubject() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionPlayerBindSheikPad.cpp b/src/Game/AI/Action/actionPlayerBindSheikPad.cpp index 813b3acd..0be34d37 100644 --- a/src/Game/AI/Action/actionPlayerBindSheikPad.cpp +++ b/src/Game/AI/Action/actionPlayerBindSheikPad.cpp @@ -10,18 +10,6 @@ bool PlayerBindSheikPad::init_(sead::Heap* heap) { return PlayerAction::init_(heap); } -void PlayerBindSheikPad::enter_(ksys::act::ai::InlineParamPack* params) { - PlayerAction::enter_(params); -} - -void PlayerBindSheikPad::leave_() { - PlayerAction::leave_(); -} - void PlayerBindSheikPad::loadParams_() {} -void PlayerBindSheikPad::calc_() { - PlayerAction::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionPlayerBindSheikPad.h b/src/Game/AI/Action/actionPlayerBindSheikPad.h index 425bf05c..f6c0f604 100644 --- a/src/Game/AI/Action/actionPlayerBindSheikPad.h +++ b/src/Game/AI/Action/actionPlayerBindSheikPad.h @@ -12,12 +12,9 @@ public: ~PlayerBindSheikPad() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionPlayerBow.cpp b/src/Game/AI/Action/actionPlayerBow.cpp index 8ef01569..095a7dca 100644 --- a/src/Game/AI/Action/actionPlayerBow.cpp +++ b/src/Game/AI/Action/actionPlayerBow.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerBow::PlayerBow(const InitArg& arg) : PlayerAction(arg) {} -PlayerBow::~PlayerBow() = default; - -bool PlayerBow::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerBow::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } @@ -18,8 +12,6 @@ void PlayerBow::leave_() { PlayerAction::leave_(); } -void PlayerBow::loadParams_() {} - void PlayerBow::calc_() { PlayerAction::calc_(); } diff --git a/src/Game/AI/Action/actionPlayerBow.h b/src/Game/AI/Action/actionPlayerBow.h index 877ae418..f567872c 100644 --- a/src/Game/AI/Action/actionPlayerBow.h +++ b/src/Game/AI/Action/actionPlayerBow.h @@ -9,12 +9,9 @@ class PlayerBow : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerBow, PlayerAction) public: explicit PlayerBow(const InitArg& arg); - ~PlayerBow() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; - void loadParams_() override; protected: void calc_() override; diff --git a/src/Game/AI/Action/actionPlayerBowFall.cpp b/src/Game/AI/Action/actionPlayerBowFall.cpp index 4084fcc5..23b6dc8c 100644 --- a/src/Game/AI/Action/actionPlayerBowFall.cpp +++ b/src/Game/AI/Action/actionPlayerBowFall.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerBowFall::PlayerBowFall(const InitArg& arg) : PlayerFall(arg) {} -PlayerBowFall::~PlayerBowFall() = default; - -bool PlayerBowFall::init_(sead::Heap* heap) { - return PlayerFall::init_(heap); -} - void PlayerBowFall::enter_(ksys::act::ai::InlineParamPack* params) { PlayerFall::enter_(params); } diff --git a/src/Game/AI/Action/actionPlayerBowFall.h b/src/Game/AI/Action/actionPlayerBowFall.h index f0ac81cb..f3399702 100644 --- a/src/Game/AI/Action/actionPlayerBowFall.h +++ b/src/Game/AI/Action/actionPlayerBowFall.h @@ -9,9 +9,7 @@ class PlayerBowFall : public PlayerFall { SEAD_RTTI_OVERRIDE(PlayerBowFall, PlayerFall) public: explicit PlayerBowFall(const InitArg& arg); - ~PlayerBowFall() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionPlayerCaught.cpp b/src/Game/AI/Action/actionPlayerCaught.cpp index 4286063d..8c6d6fe8 100644 --- a/src/Game/AI/Action/actionPlayerCaught.cpp +++ b/src/Game/AI/Action/actionPlayerCaught.cpp @@ -6,10 +6,6 @@ PlayerCaught::PlayerCaught(const InitArg& arg) : PlayerAction(arg) {} PlayerCaught::~PlayerCaught() = default; -bool PlayerCaught::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerCaught::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } @@ -18,8 +14,6 @@ void PlayerCaught::leave_() { PlayerAction::leave_(); } -void PlayerCaught::loadParams_() {} - void PlayerCaught::calc_() { PlayerAction::calc_(); } diff --git a/src/Game/AI/Action/actionPlayerCaught.h b/src/Game/AI/Action/actionPlayerCaught.h index 740f53a7..90d78b53 100644 --- a/src/Game/AI/Action/actionPlayerCaught.h +++ b/src/Game/AI/Action/actionPlayerCaught.h @@ -11,10 +11,8 @@ public: explicit PlayerCaught(const InitArg& arg); ~PlayerCaught() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; - void loadParams_() override; protected: void calc_() override; diff --git a/src/Game/AI/Action/actionPlayerClimbRest.cpp b/src/Game/AI/Action/actionPlayerClimbRest.cpp index 2966f751..4873ca4f 100644 --- a/src/Game/AI/Action/actionPlayerClimbRest.cpp +++ b/src/Game/AI/Action/actionPlayerClimbRest.cpp @@ -6,10 +6,6 @@ PlayerClimbRest::PlayerClimbRest(const InitArg& arg) : PlayerAction(arg) {} PlayerClimbRest::~PlayerClimbRest() = default; -bool PlayerClimbRest::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerClimbRest::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } diff --git a/src/Game/AI/Action/actionPlayerClimbRest.h b/src/Game/AI/Action/actionPlayerClimbRest.h index ffded73c..53a1003c 100644 --- a/src/Game/AI/Action/actionPlayerClimbRest.h +++ b/src/Game/AI/Action/actionPlayerClimbRest.h @@ -11,7 +11,6 @@ public: explicit PlayerClimbRest(const InitArg& arg); ~PlayerClimbRest() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionPlayerControl.cpp b/src/Game/AI/Action/actionPlayerControl.cpp index 5c4f5aec..ad98571d 100644 --- a/src/Game/AI/Action/actionPlayerControl.cpp +++ b/src/Game/AI/Action/actionPlayerControl.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerControl::PlayerControl(const InitArg& arg) : PlayerAction(arg) {} -PlayerControl::~PlayerControl() = default; - -bool PlayerControl::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerControl::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } @@ -18,8 +12,6 @@ void PlayerControl::leave_() { PlayerAction::leave_(); } -void PlayerControl::loadParams_() {} - void PlayerControl::calc_() { PlayerAction::calc_(); } diff --git a/src/Game/AI/Action/actionPlayerControl.h b/src/Game/AI/Action/actionPlayerControl.h index 860b5f39..6cede50c 100644 --- a/src/Game/AI/Action/actionPlayerControl.h +++ b/src/Game/AI/Action/actionPlayerControl.h @@ -9,12 +9,9 @@ class PlayerControl : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerControl, PlayerAction) public: explicit PlayerControl(const InitArg& arg); - ~PlayerControl() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; - void loadParams_() override; protected: void calc_() override; diff --git a/src/Game/AI/Action/actionPlayerCutAfterJump.cpp b/src/Game/AI/Action/actionPlayerCutAfterJump.cpp index e6201aea..c05729a7 100644 --- a/src/Game/AI/Action/actionPlayerCutAfterJump.cpp +++ b/src/Game/AI/Action/actionPlayerCutAfterJump.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerCutAfterJump::PlayerCutAfterJump(const InitArg& arg) : PlayerAction(arg) {} -PlayerCutAfterJump::~PlayerCutAfterJump() = default; - -bool PlayerCutAfterJump::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerCutAfterJump::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } diff --git a/src/Game/AI/Action/actionPlayerCutAfterJump.h b/src/Game/AI/Action/actionPlayerCutAfterJump.h index 43d37294..670cf195 100644 --- a/src/Game/AI/Action/actionPlayerCutAfterJump.h +++ b/src/Game/AI/Action/actionPlayerCutAfterJump.h @@ -9,9 +9,7 @@ class PlayerCutAfterJump : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerCutAfterJump, PlayerAction) public: explicit PlayerCutAfterJump(const InitArg& arg); - ~PlayerCutAfterJump() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionPlayerCutAfterJust.cpp b/src/Game/AI/Action/actionPlayerCutAfterJust.cpp index 00a62a84..bd6315f9 100644 --- a/src/Game/AI/Action/actionPlayerCutAfterJust.cpp +++ b/src/Game/AI/Action/actionPlayerCutAfterJust.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerCutAfterJust::PlayerCutAfterJust(const InitArg& arg) : PlayerAction(arg) {} -PlayerCutAfterJust::~PlayerCutAfterJust() = default; - -bool PlayerCutAfterJust::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerCutAfterJust::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } diff --git a/src/Game/AI/Action/actionPlayerCutAfterJust.h b/src/Game/AI/Action/actionPlayerCutAfterJust.h index 4107a731..0b09458e 100644 --- a/src/Game/AI/Action/actionPlayerCutAfterJust.h +++ b/src/Game/AI/Action/actionPlayerCutAfterJust.h @@ -9,9 +9,7 @@ class PlayerCutAfterJust : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerCutAfterJust, PlayerAction) public: explicit PlayerCutAfterJust(const InitArg& arg); - ~PlayerCutAfterJust() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionPlayerCutDash.cpp b/src/Game/AI/Action/actionPlayerCutDash.cpp index 5f0b150a..ded5eb1e 100644 --- a/src/Game/AI/Action/actionPlayerCutDash.cpp +++ b/src/Game/AI/Action/actionPlayerCutDash.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerCutDash::PlayerCutDash(const InitArg& arg) : PlayerAction(arg) {} -PlayerCutDash::~PlayerCutDash() = default; - -bool PlayerCutDash::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerCutDash::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } diff --git a/src/Game/AI/Action/actionPlayerCutDash.h b/src/Game/AI/Action/actionPlayerCutDash.h index 472b016a..c1b8caa5 100644 --- a/src/Game/AI/Action/actionPlayerCutDash.h +++ b/src/Game/AI/Action/actionPlayerCutDash.h @@ -9,9 +9,7 @@ class PlayerCutDash : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerCutDash, PlayerAction) public: explicit PlayerCutDash(const InitArg& arg); - ~PlayerCutDash() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionPlayerCutFall.cpp b/src/Game/AI/Action/actionPlayerCutFall.cpp index 5768a21a..abaac0da 100644 --- a/src/Game/AI/Action/actionPlayerCutFall.cpp +++ b/src/Game/AI/Action/actionPlayerCutFall.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerCutFall::PlayerCutFall(const InitArg& arg) : PlayerAction(arg) {} -PlayerCutFall::~PlayerCutFall() = default; - -bool PlayerCutFall::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerCutFall::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } diff --git a/src/Game/AI/Action/actionPlayerCutFall.h b/src/Game/AI/Action/actionPlayerCutFall.h index 5c8e1fce..065d296b 100644 --- a/src/Game/AI/Action/actionPlayerCutFall.h +++ b/src/Game/AI/Action/actionPlayerCutFall.h @@ -9,9 +9,7 @@ class PlayerCutFall : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerCutFall, PlayerAction) public: explicit PlayerCutFall(const InitArg& arg); - ~PlayerCutFall() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionPlayerCutHorseJump.cpp b/src/Game/AI/Action/actionPlayerCutHorseJump.cpp index ae0f8b3d..37d2741e 100644 --- a/src/Game/AI/Action/actionPlayerCutHorseJump.cpp +++ b/src/Game/AI/Action/actionPlayerCutHorseJump.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerCutHorseJump::PlayerCutHorseJump(const InitArg& arg) : PlayerAction(arg) {} -PlayerCutHorseJump::~PlayerCutHorseJump() = default; - -bool PlayerCutHorseJump::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerCutHorseJump::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } diff --git a/src/Game/AI/Action/actionPlayerCutHorseJump.h b/src/Game/AI/Action/actionPlayerCutHorseJump.h index 51a62388..09422554 100644 --- a/src/Game/AI/Action/actionPlayerCutHorseJump.h +++ b/src/Game/AI/Action/actionPlayerCutHorseJump.h @@ -9,9 +9,7 @@ class PlayerCutHorseJump : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerCutHorseJump, PlayerAction) public: explicit PlayerCutHorseJump(const InitArg& arg); - ~PlayerCutHorseJump() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionPlayerCutHorseJumpLand.cpp b/src/Game/AI/Action/actionPlayerCutHorseJumpLand.cpp index 7d396f9e..fec733db 100644 --- a/src/Game/AI/Action/actionPlayerCutHorseJumpLand.cpp +++ b/src/Game/AI/Action/actionPlayerCutHorseJumpLand.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerCutHorseJumpLand::PlayerCutHorseJumpLand(const InitArg& arg) : PlayerAction(arg) {} -PlayerCutHorseJumpLand::~PlayerCutHorseJumpLand() = default; - -bool PlayerCutHorseJumpLand::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerCutHorseJumpLand::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } @@ -18,8 +12,6 @@ void PlayerCutHorseJumpLand::leave_() { PlayerAction::leave_(); } -void PlayerCutHorseJumpLand::loadParams_() {} - void PlayerCutHorseJumpLand::calc_() { PlayerAction::calc_(); } diff --git a/src/Game/AI/Action/actionPlayerCutHorseJumpLand.h b/src/Game/AI/Action/actionPlayerCutHorseJumpLand.h index f1b1cfae..665cd1e5 100644 --- a/src/Game/AI/Action/actionPlayerCutHorseJumpLand.h +++ b/src/Game/AI/Action/actionPlayerCutHorseJumpLand.h @@ -9,12 +9,9 @@ class PlayerCutHorseJumpLand : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerCutHorseJumpLand, PlayerAction) public: explicit PlayerCutHorseJumpLand(const InitArg& arg); - ~PlayerCutHorseJumpLand() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; - void loadParams_() override; protected: void calc_() override; diff --git a/src/Game/AI/Action/actionPlayerCutJump.cpp b/src/Game/AI/Action/actionPlayerCutJump.cpp index 67b4ab5e..f4f312a4 100644 --- a/src/Game/AI/Action/actionPlayerCutJump.cpp +++ b/src/Game/AI/Action/actionPlayerCutJump.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerCutJump::PlayerCutJump(const InitArg& arg) : PlayerAction(arg) {} -PlayerCutJump::~PlayerCutJump() = default; - -bool PlayerCutJump::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerCutJump::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } diff --git a/src/Game/AI/Action/actionPlayerCutJump.h b/src/Game/AI/Action/actionPlayerCutJump.h index ca90ecae..de45998b 100644 --- a/src/Game/AI/Action/actionPlayerCutJump.h +++ b/src/Game/AI/Action/actionPlayerCutJump.h @@ -9,9 +9,7 @@ class PlayerCutJump : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerCutJump, PlayerAction) public: explicit PlayerCutJump(const InitArg& arg); - ~PlayerCutJump() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionPlayerCutNormal.cpp b/src/Game/AI/Action/actionPlayerCutNormal.cpp index 02180703..eff0b9b2 100644 --- a/src/Game/AI/Action/actionPlayerCutNormal.cpp +++ b/src/Game/AI/Action/actionPlayerCutNormal.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerCutNormal::PlayerCutNormal(const InitArg& arg) : PlayerAction(arg) {} -PlayerCutNormal::~PlayerCutNormal() = default; - -bool PlayerCutNormal::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerCutNormal::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } diff --git a/src/Game/AI/Action/actionPlayerCutNormal.h b/src/Game/AI/Action/actionPlayerCutNormal.h index ca9335e0..709b9a26 100644 --- a/src/Game/AI/Action/actionPlayerCutNormal.h +++ b/src/Game/AI/Action/actionPlayerCutNormal.h @@ -9,9 +9,7 @@ class PlayerCutNormal : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerCutNormal, PlayerAction) public: explicit PlayerCutNormal(const InitArg& arg); - ~PlayerCutNormal() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionPlayerCutReverse.cpp b/src/Game/AI/Action/actionPlayerCutReverse.cpp index d87b02d3..d80e7bb2 100644 --- a/src/Game/AI/Action/actionPlayerCutReverse.cpp +++ b/src/Game/AI/Action/actionPlayerCutReverse.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerCutReverse::PlayerCutReverse(const InitArg& arg) : PlayerAction(arg) {} -PlayerCutReverse::~PlayerCutReverse() = default; - -bool PlayerCutReverse::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerCutReverse::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } @@ -18,8 +12,6 @@ void PlayerCutReverse::leave_() { PlayerAction::leave_(); } -void PlayerCutReverse::loadParams_() {} - void PlayerCutReverse::calc_() { PlayerAction::calc_(); } diff --git a/src/Game/AI/Action/actionPlayerCutReverse.h b/src/Game/AI/Action/actionPlayerCutReverse.h index e106379e..23c69a2c 100644 --- a/src/Game/AI/Action/actionPlayerCutReverse.h +++ b/src/Game/AI/Action/actionPlayerCutReverse.h @@ -9,12 +9,9 @@ class PlayerCutReverse : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerCutReverse, PlayerAction) public: explicit PlayerCutReverse(const InitArg& arg); - ~PlayerCutReverse() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; - void loadParams_() override; protected: void calc_() override; diff --git a/src/Game/AI/Action/actionPlayerCutTurn.cpp b/src/Game/AI/Action/actionPlayerCutTurn.cpp index b75ca2dc..6d45b0ab 100644 --- a/src/Game/AI/Action/actionPlayerCutTurn.cpp +++ b/src/Game/AI/Action/actionPlayerCutTurn.cpp @@ -6,10 +6,6 @@ PlayerCutTurn::PlayerCutTurn(const InitArg& arg) : PlayerAction(arg) {} PlayerCutTurn::~PlayerCutTurn() = default; -bool PlayerCutTurn::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerCutTurn::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } diff --git a/src/Game/AI/Action/actionPlayerCutTurn.h b/src/Game/AI/Action/actionPlayerCutTurn.h index e6506d59..8fa00733 100644 --- a/src/Game/AI/Action/actionPlayerCutTurn.h +++ b/src/Game/AI/Action/actionPlayerCutTurn.h @@ -11,7 +11,6 @@ public: explicit PlayerCutTurn(const InitArg& arg); ~PlayerCutTurn() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionPlayerCutTurnLSword.cpp b/src/Game/AI/Action/actionPlayerCutTurnLSword.cpp index 834986de..fe9f0ae5 100644 --- a/src/Game/AI/Action/actionPlayerCutTurnLSword.cpp +++ b/src/Game/AI/Action/actionPlayerCutTurnLSword.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerCutTurnLSword::PlayerCutTurnLSword(const InitArg& arg) : PlayerAction(arg) {} -PlayerCutTurnLSword::~PlayerCutTurnLSword() = default; - -bool PlayerCutTurnLSword::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerCutTurnLSword::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } diff --git a/src/Game/AI/Action/actionPlayerCutTurnLSword.h b/src/Game/AI/Action/actionPlayerCutTurnLSword.h index 4c26375a..0357f2bb 100644 --- a/src/Game/AI/Action/actionPlayerCutTurnLSword.h +++ b/src/Game/AI/Action/actionPlayerCutTurnLSword.h @@ -9,9 +9,7 @@ class PlayerCutTurnLSword : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerCutTurnLSword, PlayerAction) public: explicit PlayerCutTurnLSword(const InitArg& arg); - ~PlayerCutTurnLSword() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionPlayerDamage.cpp b/src/Game/AI/Action/actionPlayerDamage.cpp index 36e01354..843341b2 100644 --- a/src/Game/AI/Action/actionPlayerDamage.cpp +++ b/src/Game/AI/Action/actionPlayerDamage.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerDamage::PlayerDamage(const InitArg& arg) : PlayerAction(arg) {} -PlayerDamage::~PlayerDamage() = default; - -bool PlayerDamage::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerDamage::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } diff --git a/src/Game/AI/Action/actionPlayerDamage.h b/src/Game/AI/Action/actionPlayerDamage.h index 5fe21669..b0a69c0e 100644 --- a/src/Game/AI/Action/actionPlayerDamage.h +++ b/src/Game/AI/Action/actionPlayerDamage.h @@ -9,9 +9,7 @@ class PlayerDamage : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerDamage, PlayerAction) public: explicit PlayerDamage(const InitArg& arg); - ~PlayerDamage() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionPlayerDead.cpp b/src/Game/AI/Action/actionPlayerDead.cpp index 1e3e3398..166f1b4a 100644 --- a/src/Game/AI/Action/actionPlayerDead.cpp +++ b/src/Game/AI/Action/actionPlayerDead.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerDead::PlayerDead(const InitArg& arg) : PlayerAction(arg) {} -PlayerDead::~PlayerDead() = default; - -bool PlayerDead::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerDead::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } diff --git a/src/Game/AI/Action/actionPlayerDead.h b/src/Game/AI/Action/actionPlayerDead.h index f6a14f16..d5679b64 100644 --- a/src/Game/AI/Action/actionPlayerDead.h +++ b/src/Game/AI/Action/actionPlayerDead.h @@ -9,9 +9,7 @@ class PlayerDead : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerDead, PlayerAction) public: explicit PlayerDead(const InitArg& arg); - ~PlayerDead() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionPlayerDeadWait.cpp b/src/Game/AI/Action/actionPlayerDeadWait.cpp index 97630678..aa8ce8aa 100644 --- a/src/Game/AI/Action/actionPlayerDeadWait.cpp +++ b/src/Game/AI/Action/actionPlayerDeadWait.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerDeadWait::PlayerDeadWait(const InitArg& arg) : PlayerAction(arg) {} -PlayerDeadWait::~PlayerDeadWait() = default; - -bool PlayerDeadWait::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerDeadWait::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } @@ -18,8 +12,6 @@ void PlayerDeadWait::leave_() { PlayerAction::leave_(); } -void PlayerDeadWait::loadParams_() {} - void PlayerDeadWait::calc_() { PlayerAction::calc_(); } diff --git a/src/Game/AI/Action/actionPlayerDeadWait.h b/src/Game/AI/Action/actionPlayerDeadWait.h index 3c14577e..f3c69a68 100644 --- a/src/Game/AI/Action/actionPlayerDeadWait.h +++ b/src/Game/AI/Action/actionPlayerDeadWait.h @@ -9,12 +9,9 @@ class PlayerDeadWait : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerDeadWait, PlayerAction) public: explicit PlayerDeadWait(const InitArg& arg); - ~PlayerDeadWait() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; - void loadParams_() override; protected: void calc_() override; diff --git a/src/Game/AI/Action/actionPlayerDemoAirWait.cpp b/src/Game/AI/Action/actionPlayerDemoAirWait.cpp index a7a59940..22cb3b1e 100644 --- a/src/Game/AI/Action/actionPlayerDemoAirWait.cpp +++ b/src/Game/AI/Action/actionPlayerDemoAirWait.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerDemoAirWait::PlayerDemoAirWait(const InitArg& arg) : PlayerAction(arg) {} -PlayerDemoAirWait::~PlayerDemoAirWait() = default; - -bool PlayerDemoAirWait::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerDemoAirWait::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } @@ -18,8 +12,6 @@ void PlayerDemoAirWait::leave_() { PlayerAction::leave_(); } -void PlayerDemoAirWait::loadParams_() {} - void PlayerDemoAirWait::calc_() { PlayerAction::calc_(); } diff --git a/src/Game/AI/Action/actionPlayerDemoAirWait.h b/src/Game/AI/Action/actionPlayerDemoAirWait.h index 12a150a2..fc45c866 100644 --- a/src/Game/AI/Action/actionPlayerDemoAirWait.h +++ b/src/Game/AI/Action/actionPlayerDemoAirWait.h @@ -9,12 +9,9 @@ class PlayerDemoAirWait : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerDemoAirWait, PlayerAction) public: explicit PlayerDemoAirWait(const InitArg& arg); - ~PlayerDemoAirWait() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; - void loadParams_() override; protected: void calc_() override; diff --git a/src/Game/AI/Action/actionPlayerDemoWait.cpp b/src/Game/AI/Action/actionPlayerDemoWait.cpp index 1cc81546..c7a602ff 100644 --- a/src/Game/AI/Action/actionPlayerDemoWait.cpp +++ b/src/Game/AI/Action/actionPlayerDemoWait.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerDemoWait::PlayerDemoWait(const InitArg& arg) : PlayerAction(arg) {} -PlayerDemoWait::~PlayerDemoWait() = default; - -bool PlayerDemoWait::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerDemoWait::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } @@ -18,8 +12,6 @@ void PlayerDemoWait::leave_() { PlayerAction::leave_(); } -void PlayerDemoWait::loadParams_() {} - void PlayerDemoWait::calc_() { PlayerAction::calc_(); } diff --git a/src/Game/AI/Action/actionPlayerDemoWait.h b/src/Game/AI/Action/actionPlayerDemoWait.h index 1efe2e32..c400c238 100644 --- a/src/Game/AI/Action/actionPlayerDemoWait.h +++ b/src/Game/AI/Action/actionPlayerDemoWait.h @@ -9,12 +9,9 @@ class PlayerDemoWait : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerDemoWait, PlayerAction) public: explicit PlayerDemoWait(const InitArg& arg); - ~PlayerDemoWait() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; - void loadParams_() override; protected: void calc_() override; diff --git a/src/Game/AI/Action/actionPlayerDestinationMove.cpp b/src/Game/AI/Action/actionPlayerDestinationMove.cpp index a9151b53..fbc765e6 100644 --- a/src/Game/AI/Action/actionPlayerDestinationMove.cpp +++ b/src/Game/AI/Action/actionPlayerDestinationMove.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerDestinationMove::PlayerDestinationMove(const InitArg& arg) : PlayerGuidedMove(arg) {} -PlayerDestinationMove::~PlayerDestinationMove() = default; - -bool PlayerDestinationMove::init_(sead::Heap* heap) { - return PlayerGuidedMove::init_(heap); -} - void PlayerDestinationMove::enter_(ksys::act::ai::InlineParamPack* params) { PlayerGuidedMove::enter_(params); } diff --git a/src/Game/AI/Action/actionPlayerDestinationMove.h b/src/Game/AI/Action/actionPlayerDestinationMove.h index 83229b2d..aac39b30 100644 --- a/src/Game/AI/Action/actionPlayerDestinationMove.h +++ b/src/Game/AI/Action/actionPlayerDestinationMove.h @@ -9,9 +9,7 @@ class PlayerDestinationMove : public PlayerGuidedMove { SEAD_RTTI_OVERRIDE(PlayerDestinationMove, PlayerGuidedMove) public: explicit PlayerDestinationMove(const InitArg& arg); - ~PlayerDestinationMove() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionPlayerDestinationTurn.cpp b/src/Game/AI/Action/actionPlayerDestinationTurn.cpp index 77088b71..82a4945f 100644 --- a/src/Game/AI/Action/actionPlayerDestinationTurn.cpp +++ b/src/Game/AI/Action/actionPlayerDestinationTurn.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerDestinationTurn::PlayerDestinationTurn(const InitArg& arg) : PlayerAction(arg) {} -PlayerDestinationTurn::~PlayerDestinationTurn() = default; - -bool PlayerDestinationTurn::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerDestinationTurn::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } diff --git a/src/Game/AI/Action/actionPlayerDestinationTurn.h b/src/Game/AI/Action/actionPlayerDestinationTurn.h index 818bef91..2567124a 100644 --- a/src/Game/AI/Action/actionPlayerDestinationTurn.h +++ b/src/Game/AI/Action/actionPlayerDestinationTurn.h @@ -9,9 +9,7 @@ class PlayerDestinationTurn : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerDestinationTurn, PlayerAction) public: explicit PlayerDestinationTurn(const InitArg& arg); - ~PlayerDestinationTurn() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionPlayerDestinationTurnRefActor.cpp b/src/Game/AI/Action/actionPlayerDestinationTurnRefActor.cpp index d9e33047..9eaebd4f 100644 --- a/src/Game/AI/Action/actionPlayerDestinationTurnRefActor.cpp +++ b/src/Game/AI/Action/actionPlayerDestinationTurnRefActor.cpp @@ -7,10 +7,6 @@ PlayerDestinationTurnRefActor::PlayerDestinationTurnRefActor(const InitArg& arg) PlayerDestinationTurnRefActor::~PlayerDestinationTurnRefActor() = default; -bool PlayerDestinationTurnRefActor::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerDestinationTurnRefActor::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } diff --git a/src/Game/AI/Action/actionPlayerDestinationTurnRefActor.h b/src/Game/AI/Action/actionPlayerDestinationTurnRefActor.h index bca3c1ed..10a3785a 100644 --- a/src/Game/AI/Action/actionPlayerDestinationTurnRefActor.h +++ b/src/Game/AI/Action/actionPlayerDestinationTurnRefActor.h @@ -11,7 +11,6 @@ public: explicit PlayerDestinationTurnRefActor(const InitArg& arg); ~PlayerDestinationTurnRefActor() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionPlayerDisplayWait.cpp b/src/Game/AI/Action/actionPlayerDisplayWait.cpp index 454c4d46..fbdf265e 100644 --- a/src/Game/AI/Action/actionPlayerDisplayWait.cpp +++ b/src/Game/AI/Action/actionPlayerDisplayWait.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerDisplayWait::PlayerDisplayWait(const InitArg& arg) : PlayerAction(arg) {} -PlayerDisplayWait::~PlayerDisplayWait() = default; - -bool PlayerDisplayWait::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerDisplayWait::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } @@ -18,8 +12,6 @@ void PlayerDisplayWait::leave_() { PlayerAction::leave_(); } -void PlayerDisplayWait::loadParams_() {} - void PlayerDisplayWait::calc_() { PlayerAction::calc_(); } diff --git a/src/Game/AI/Action/actionPlayerDisplayWait.h b/src/Game/AI/Action/actionPlayerDisplayWait.h index e54828f6..682b4543 100644 --- a/src/Game/AI/Action/actionPlayerDisplayWait.h +++ b/src/Game/AI/Action/actionPlayerDisplayWait.h @@ -9,12 +9,9 @@ class PlayerDisplayWait : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerDisplayWait, PlayerAction) public: explicit PlayerDisplayWait(const InitArg& arg); - ~PlayerDisplayWait() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; - void loadParams_() override; protected: void calc_() override; diff --git a/src/Game/AI/Action/actionPlayerDiveMove.cpp b/src/Game/AI/Action/actionPlayerDiveMove.cpp index 12a8539a..045b67e2 100644 --- a/src/Game/AI/Action/actionPlayerDiveMove.cpp +++ b/src/Game/AI/Action/actionPlayerDiveMove.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerDiveMove::PlayerDiveMove(const InitArg& arg) : PlayerAction(arg) {} -PlayerDiveMove::~PlayerDiveMove() = default; - -bool PlayerDiveMove::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerDiveMove::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } diff --git a/src/Game/AI/Action/actionPlayerDiveMove.h b/src/Game/AI/Action/actionPlayerDiveMove.h index 6865ca3d..bddaa492 100644 --- a/src/Game/AI/Action/actionPlayerDiveMove.h +++ b/src/Game/AI/Action/actionPlayerDiveMove.h @@ -9,9 +9,7 @@ class PlayerDiveMove : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerDiveMove, PlayerAction) public: explicit PlayerDiveMove(const InitArg& arg); - ~PlayerDiveMove() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionPlayerDoorPullOpen.cpp b/src/Game/AI/Action/actionPlayerDoorPullOpen.cpp index b2f844b2..8af3cc28 100644 --- a/src/Game/AI/Action/actionPlayerDoorPullOpen.cpp +++ b/src/Game/AI/Action/actionPlayerDoorPullOpen.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerDoorPullOpen::PlayerDoorPullOpen(const InitArg& arg) : PlayerAction(arg) {} -PlayerDoorPullOpen::~PlayerDoorPullOpen() = default; - -bool PlayerDoorPullOpen::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerDoorPullOpen::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } @@ -18,8 +12,6 @@ void PlayerDoorPullOpen::leave_() { PlayerAction::leave_(); } -void PlayerDoorPullOpen::loadParams_() {} - void PlayerDoorPullOpen::calc_() { PlayerAction::calc_(); } diff --git a/src/Game/AI/Action/actionPlayerDoorPullOpen.h b/src/Game/AI/Action/actionPlayerDoorPullOpen.h index fef813da..7721529e 100644 --- a/src/Game/AI/Action/actionPlayerDoorPullOpen.h +++ b/src/Game/AI/Action/actionPlayerDoorPullOpen.h @@ -9,12 +9,9 @@ class PlayerDoorPullOpen : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerDoorPullOpen, PlayerAction) public: explicit PlayerDoorPullOpen(const InitArg& arg); - ~PlayerDoorPullOpen() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; - void loadParams_() override; protected: void calc_() override; diff --git a/src/Game/AI/Action/actionPlayerDoorPushOpen.cpp b/src/Game/AI/Action/actionPlayerDoorPushOpen.cpp index 12587700..c1ea3c74 100644 --- a/src/Game/AI/Action/actionPlayerDoorPushOpen.cpp +++ b/src/Game/AI/Action/actionPlayerDoorPushOpen.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerDoorPushOpen::PlayerDoorPushOpen(const InitArg& arg) : PlayerAction(arg) {} -PlayerDoorPushOpen::~PlayerDoorPushOpen() = default; - -bool PlayerDoorPushOpen::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerDoorPushOpen::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } @@ -18,8 +12,6 @@ void PlayerDoorPushOpen::leave_() { PlayerAction::leave_(); } -void PlayerDoorPushOpen::loadParams_() {} - void PlayerDoorPushOpen::calc_() { PlayerAction::calc_(); } diff --git a/src/Game/AI/Action/actionPlayerDoorPushOpen.h b/src/Game/AI/Action/actionPlayerDoorPushOpen.h index df14df50..81b688bd 100644 --- a/src/Game/AI/Action/actionPlayerDoorPushOpen.h +++ b/src/Game/AI/Action/actionPlayerDoorPushOpen.h @@ -9,12 +9,9 @@ class PlayerDoorPushOpen : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerDoorPushOpen, PlayerAction) public: explicit PlayerDoorPushOpen(const InitArg& arg); - ~PlayerDoorPushOpen() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; - void loadParams_() override; protected: void calc_() override; diff --git a/src/Game/AI/Action/actionPlayerDrown.cpp b/src/Game/AI/Action/actionPlayerDrown.cpp index d7759fbc..3df7cb77 100644 --- a/src/Game/AI/Action/actionPlayerDrown.cpp +++ b/src/Game/AI/Action/actionPlayerDrown.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerDrown::PlayerDrown(const InitArg& arg) : PlayerAction(arg) {} -PlayerDrown::~PlayerDrown() = default; - -bool PlayerDrown::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerDrown::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } diff --git a/src/Game/AI/Action/actionPlayerDrown.h b/src/Game/AI/Action/actionPlayerDrown.h index a89bd8d4..050bdae2 100644 --- a/src/Game/AI/Action/actionPlayerDrown.h +++ b/src/Game/AI/Action/actionPlayerDrown.h @@ -9,9 +9,7 @@ class PlayerDrown : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerDrown, PlayerAction) public: explicit PlayerDrown(const InitArg& arg); - ~PlayerDrown() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionPlayerElectric.cpp b/src/Game/AI/Action/actionPlayerElectric.cpp index 44c2d446..934d16ba 100644 --- a/src/Game/AI/Action/actionPlayerElectric.cpp +++ b/src/Game/AI/Action/actionPlayerElectric.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerElectric::PlayerElectric(const InitArg& arg) : PlayerAction(arg) {} -PlayerElectric::~PlayerElectric() = default; - -bool PlayerElectric::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerElectric::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } diff --git a/src/Game/AI/Action/actionPlayerElectric.h b/src/Game/AI/Action/actionPlayerElectric.h index 54a1e710..b0db5927 100644 --- a/src/Game/AI/Action/actionPlayerElectric.h +++ b/src/Game/AI/Action/actionPlayerElectric.h @@ -9,9 +9,7 @@ class PlayerElectric : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerElectric, PlayerAction) public: explicit PlayerElectric(const InitArg& arg); - ~PlayerElectric() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionPlayerEmitEquipmentNoise.cpp b/src/Game/AI/Action/actionPlayerEmitEquipmentNoise.cpp index 4ac7da21..1eaaff8c 100644 --- a/src/Game/AI/Action/actionPlayerEmitEquipmentNoise.cpp +++ b/src/Game/AI/Action/actionPlayerEmitEquipmentNoise.cpp @@ -11,21 +11,9 @@ bool PlayerEmitEquipmentNoise::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void PlayerEmitEquipmentNoise::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void PlayerEmitEquipmentNoise::leave_() { - ksys::act::ai::Action::leave_(); -} - void PlayerEmitEquipmentNoise::loadParams_() { getDynamicParam(&mSteppingFoot_d, "SteppingFoot"); getDynamicParam(&mSpeed_d, "Speed"); } -void PlayerEmitEquipmentNoise::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionPlayerEmitEquipmentNoise.h b/src/Game/AI/Action/actionPlayerEmitEquipmentNoise.h index 7e8c9925..8fea4685 100644 --- a/src/Game/AI/Action/actionPlayerEmitEquipmentNoise.h +++ b/src/Game/AI/Action/actionPlayerEmitEquipmentNoise.h @@ -11,13 +11,9 @@ public: ~PlayerEmitEquipmentNoise() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 sead::SafeString* mSteppingFoot_d{}; // dynamic_param at offset 0x30 diff --git a/src/Game/AI/Action/actionPlayerEquipNearMasterSword.cpp b/src/Game/AI/Action/actionPlayerEquipNearMasterSword.cpp index e45fbd41..2380f1a4 100644 --- a/src/Game/AI/Action/actionPlayerEquipNearMasterSword.cpp +++ b/src/Game/AI/Action/actionPlayerEquipNearMasterSword.cpp @@ -11,18 +11,6 @@ bool PlayerEquipNearMasterSword::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void PlayerEquipNearMasterSword::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void PlayerEquipNearMasterSword::leave_() { - ksys::act::ai::Action::leave_(); -} - void PlayerEquipNearMasterSword::loadParams_() {} -void PlayerEquipNearMasterSword::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionPlayerEquipNearMasterSword.h b/src/Game/AI/Action/actionPlayerEquipNearMasterSword.h index e40b85d9..f79f92f2 100644 --- a/src/Game/AI/Action/actionPlayerEquipNearMasterSword.h +++ b/src/Game/AI/Action/actionPlayerEquipNearMasterSword.h @@ -11,12 +11,9 @@ public: ~PlayerEquipNearMasterSword() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionPlayerEventStartWait.cpp b/src/Game/AI/Action/actionPlayerEventStartWait.cpp index 0d2afe5b..60ebdbd6 100644 --- a/src/Game/AI/Action/actionPlayerEventStartWait.cpp +++ b/src/Game/AI/Action/actionPlayerEventStartWait.cpp @@ -6,10 +6,6 @@ PlayerEventStartWait::PlayerEventStartWait(const InitArg& arg) : PlayerAction(ar PlayerEventStartWait::~PlayerEventStartWait() = default; -bool PlayerEventStartWait::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerEventStartWait::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } @@ -18,8 +14,6 @@ void PlayerEventStartWait::leave_() { PlayerAction::leave_(); } -void PlayerEventStartWait::loadParams_() {} - void PlayerEventStartWait::calc_() { PlayerAction::calc_(); } diff --git a/src/Game/AI/Action/actionPlayerEventStartWait.h b/src/Game/AI/Action/actionPlayerEventStartWait.h index 01c113e8..0db3102a 100644 --- a/src/Game/AI/Action/actionPlayerEventStartWait.h +++ b/src/Game/AI/Action/actionPlayerEventStartWait.h @@ -11,10 +11,8 @@ public: explicit PlayerEventStartWait(const InitArg& arg); ~PlayerEventStartWait() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; - void loadParams_() override; protected: void calc_() override; diff --git a/src/Game/AI/Action/actionPlayerFall.cpp b/src/Game/AI/Action/actionPlayerFall.cpp index 258bbae4..3c448db6 100644 --- a/src/Game/AI/Action/actionPlayerFall.cpp +++ b/src/Game/AI/Action/actionPlayerFall.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerFall::PlayerFall(const InitArg& arg) : PlayerAction(arg) {} -PlayerFall::~PlayerFall() = default; - -bool PlayerFall::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerFall::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } diff --git a/src/Game/AI/Action/actionPlayerFall.h b/src/Game/AI/Action/actionPlayerFall.h index fc2fcd97..18eb2fe6 100644 --- a/src/Game/AI/Action/actionPlayerFall.h +++ b/src/Game/AI/Action/actionPlayerFall.h @@ -9,9 +9,7 @@ class PlayerFall : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerFall, PlayerAction) public: explicit PlayerFall(const InitArg& arg); - ~PlayerFall() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionPlayerForkDropWeaponWithSpeed.cpp b/src/Game/AI/Action/actionPlayerForkDropWeaponWithSpeed.cpp index 0de2fc15..aeda9e9b 100644 --- a/src/Game/AI/Action/actionPlayerForkDropWeaponWithSpeed.cpp +++ b/src/Game/AI/Action/actionPlayerForkDropWeaponWithSpeed.cpp @@ -8,7 +8,7 @@ PlayerForkDropWeaponWithSpeed::PlayerForkDropWeaponWithSpeed(const InitArg& arg) PlayerForkDropWeaponWithSpeed::~PlayerForkDropWeaponWithSpeed() = default; bool PlayerForkDropWeaponWithSpeed::init_(sead::Heap* heap) { - return ForkDropWeapon::init_(heap); // NOLINT(bugprone-parent-virtual-call) + return ForkDropWeaponWithSpeed::init_(heap); } void PlayerForkDropWeaponWithSpeed::enter_(ksys::act::ai::InlineParamPack* params) { @@ -16,11 +16,11 @@ void PlayerForkDropWeaponWithSpeed::enter_(ksys::act::ai::InlineParamPack* param } void PlayerForkDropWeaponWithSpeed::leave_() { - ForkDropWeapon::leave_(); // NOLINT(bugprone-parent-virtual-call) + ForkDropWeaponWithSpeed::leave_(); } void PlayerForkDropWeaponWithSpeed::loadParams_() { - ForkDropWeapon::loadParams_(); // NOLINT(bugprone-parent-virtual-call) + ForkDropWeapon::loadParams_(); } void PlayerForkDropWeaponWithSpeed::calc_() { diff --git a/src/Game/AI/Action/actionPlayerFrontRoll.cpp b/src/Game/AI/Action/actionPlayerFrontRoll.cpp index 7fa7004a..9d099e59 100644 --- a/src/Game/AI/Action/actionPlayerFrontRoll.cpp +++ b/src/Game/AI/Action/actionPlayerFrontRoll.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerFrontRoll::PlayerFrontRoll(const InitArg& arg) : PlayerAction(arg) {} -PlayerFrontRoll::~PlayerFrontRoll() = default; - -bool PlayerFrontRoll::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerFrontRoll::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } diff --git a/src/Game/AI/Action/actionPlayerFrontRoll.h b/src/Game/AI/Action/actionPlayerFrontRoll.h index 382c9b70..4cdabcc4 100644 --- a/src/Game/AI/Action/actionPlayerFrontRoll.h +++ b/src/Game/AI/Action/actionPlayerFrontRoll.h @@ -9,9 +9,7 @@ class PlayerFrontRoll : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerFrontRoll, PlayerAction) public: explicit PlayerFrontRoll(const InitArg& arg); - ~PlayerFrontRoll() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionPlayerGlide.cpp b/src/Game/AI/Action/actionPlayerGlide.cpp index 7d444e36..0218792a 100644 --- a/src/Game/AI/Action/actionPlayerGlide.cpp +++ b/src/Game/AI/Action/actionPlayerGlide.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerGlide::PlayerGlide(const InitArg& arg) : PlayerAction(arg) {} -PlayerGlide::~PlayerGlide() = default; - -bool PlayerGlide::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerGlide::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } diff --git a/src/Game/AI/Action/actionPlayerGlide.h b/src/Game/AI/Action/actionPlayerGlide.h index a597aec1..a5b44149 100644 --- a/src/Game/AI/Action/actionPlayerGlide.h +++ b/src/Game/AI/Action/actionPlayerGlide.h @@ -9,9 +9,7 @@ class PlayerGlide : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerGlide, PlayerAction) public: explicit PlayerGlide(const InitArg& arg); - ~PlayerGlide() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionPlayerGrabPut.cpp b/src/Game/AI/Action/actionPlayerGrabPut.cpp index 33b636a9..09800763 100644 --- a/src/Game/AI/Action/actionPlayerGrabPut.cpp +++ b/src/Game/AI/Action/actionPlayerGrabPut.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerGrabPut::PlayerGrabPut(const InitArg& arg) : PlayerAction(arg) {} -PlayerGrabPut::~PlayerGrabPut() = default; - -bool PlayerGrabPut::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerGrabPut::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } diff --git a/src/Game/AI/Action/actionPlayerGrabPut.h b/src/Game/AI/Action/actionPlayerGrabPut.h index d60e323d..a759d965 100644 --- a/src/Game/AI/Action/actionPlayerGrabPut.h +++ b/src/Game/AI/Action/actionPlayerGrabPut.h @@ -9,9 +9,7 @@ class PlayerGrabPut : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerGrabPut, PlayerAction) public: explicit PlayerGrabPut(const InitArg& arg); - ~PlayerGrabPut() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionPlayerGrabReady.cpp b/src/Game/AI/Action/actionPlayerGrabReady.cpp index 76a90575..a1d138d9 100644 --- a/src/Game/AI/Action/actionPlayerGrabReady.cpp +++ b/src/Game/AI/Action/actionPlayerGrabReady.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerGrabReady::PlayerGrabReady(const InitArg& arg) : PlayerAction(arg) {} -PlayerGrabReady::~PlayerGrabReady() = default; - -bool PlayerGrabReady::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerGrabReady::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } @@ -18,8 +12,6 @@ void PlayerGrabReady::leave_() { PlayerAction::leave_(); } -void PlayerGrabReady::loadParams_() {} - void PlayerGrabReady::calc_() { PlayerAction::calc_(); } diff --git a/src/Game/AI/Action/actionPlayerGrabReady.h b/src/Game/AI/Action/actionPlayerGrabReady.h index 6a6436be..ec4fd502 100644 --- a/src/Game/AI/Action/actionPlayerGrabReady.h +++ b/src/Game/AI/Action/actionPlayerGrabReady.h @@ -9,12 +9,9 @@ class PlayerGrabReady : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerGrabReady, PlayerAction) public: explicit PlayerGrabReady(const InitArg& arg); - ~PlayerGrabReady() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; - void loadParams_() override; protected: void calc_() override; diff --git a/src/Game/AI/Action/actionPlayerGrabStand.cpp b/src/Game/AI/Action/actionPlayerGrabStand.cpp index 592e4941..68ee6dd5 100644 --- a/src/Game/AI/Action/actionPlayerGrabStand.cpp +++ b/src/Game/AI/Action/actionPlayerGrabStand.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerGrabStand::PlayerGrabStand(const InitArg& arg) : PlayerAction(arg) {} -PlayerGrabStand::~PlayerGrabStand() = default; - -bool PlayerGrabStand::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerGrabStand::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } @@ -18,8 +12,6 @@ void PlayerGrabStand::leave_() { PlayerAction::leave_(); } -void PlayerGrabStand::loadParams_() {} - void PlayerGrabStand::calc_() { PlayerAction::calc_(); } diff --git a/src/Game/AI/Action/actionPlayerGrabStand.h b/src/Game/AI/Action/actionPlayerGrabStand.h index 2ada661e..4e70ec31 100644 --- a/src/Game/AI/Action/actionPlayerGrabStand.h +++ b/src/Game/AI/Action/actionPlayerGrabStand.h @@ -9,12 +9,9 @@ class PlayerGrabStand : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerGrabStand, PlayerAction) public: explicit PlayerGrabStand(const InitArg& arg); - ~PlayerGrabStand() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; - void loadParams_() override; protected: void calc_() override; diff --git a/src/Game/AI/Action/actionPlayerGrabThrow.cpp b/src/Game/AI/Action/actionPlayerGrabThrow.cpp index f349a919..25de38a4 100644 --- a/src/Game/AI/Action/actionPlayerGrabThrow.cpp +++ b/src/Game/AI/Action/actionPlayerGrabThrow.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerGrabThrow::PlayerGrabThrow(const InitArg& arg) : PlayerAction(arg) {} -PlayerGrabThrow::~PlayerGrabThrow() = default; - -bool PlayerGrabThrow::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerGrabThrow::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } diff --git a/src/Game/AI/Action/actionPlayerGrabThrow.h b/src/Game/AI/Action/actionPlayerGrabThrow.h index 83d525ab..526a932b 100644 --- a/src/Game/AI/Action/actionPlayerGrabThrow.h +++ b/src/Game/AI/Action/actionPlayerGrabThrow.h @@ -9,9 +9,7 @@ class PlayerGrabThrow : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerGrabThrow, PlayerAction) public: explicit PlayerGrabThrow(const InitArg& arg); - ~PlayerGrabThrow() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionPlayerGrabUp.cpp b/src/Game/AI/Action/actionPlayerGrabUp.cpp index 9852d63a..c2cd917c 100644 --- a/src/Game/AI/Action/actionPlayerGrabUp.cpp +++ b/src/Game/AI/Action/actionPlayerGrabUp.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerGrabUp::PlayerGrabUp(const InitArg& arg) : PlayerAction(arg) {} -PlayerGrabUp::~PlayerGrabUp() = default; - -bool PlayerGrabUp::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerGrabUp::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } @@ -18,8 +12,6 @@ void PlayerGrabUp::leave_() { PlayerAction::leave_(); } -void PlayerGrabUp::loadParams_() {} - void PlayerGrabUp::calc_() { PlayerAction::calc_(); } diff --git a/src/Game/AI/Action/actionPlayerGrabUp.h b/src/Game/AI/Action/actionPlayerGrabUp.h index 6f3f3205..56a8bcab 100644 --- a/src/Game/AI/Action/actionPlayerGrabUp.h +++ b/src/Game/AI/Action/actionPlayerGrabUp.h @@ -9,12 +9,9 @@ class PlayerGrabUp : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerGrabUp, PlayerAction) public: explicit PlayerGrabUp(const InitArg& arg); - ~PlayerGrabUp() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; - void loadParams_() override; protected: void calc_() override; diff --git a/src/Game/AI/Action/actionPlayerGrabUpAnmStop.cpp b/src/Game/AI/Action/actionPlayerGrabUpAnmStop.cpp index 9291263c..75e24051 100644 --- a/src/Game/AI/Action/actionPlayerGrabUpAnmStop.cpp +++ b/src/Game/AI/Action/actionPlayerGrabUpAnmStop.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerGrabUpAnmStop::PlayerGrabUpAnmStop(const InitArg& arg) : PlayerAction(arg) {} -PlayerGrabUpAnmStop::~PlayerGrabUpAnmStop() = default; - -bool PlayerGrabUpAnmStop::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerGrabUpAnmStop::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } @@ -18,8 +12,6 @@ void PlayerGrabUpAnmStop::leave_() { PlayerAction::leave_(); } -void PlayerGrabUpAnmStop::loadParams_() {} - void PlayerGrabUpAnmStop::calc_() { PlayerAction::calc_(); } diff --git a/src/Game/AI/Action/actionPlayerGrabUpAnmStop.h b/src/Game/AI/Action/actionPlayerGrabUpAnmStop.h index 591eff7f..9c649d07 100644 --- a/src/Game/AI/Action/actionPlayerGrabUpAnmStop.h +++ b/src/Game/AI/Action/actionPlayerGrabUpAnmStop.h @@ -9,12 +9,9 @@ class PlayerGrabUpAnmStop : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerGrabUpAnmStop, PlayerAction) public: explicit PlayerGrabUpAnmStop(const InitArg& arg); - ~PlayerGrabUpAnmStop() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; - void loadParams_() override; protected: void calc_() override; diff --git a/src/Game/AI/Action/actionPlayerGrabWait.cpp b/src/Game/AI/Action/actionPlayerGrabWait.cpp index 7e5e82d2..5959b299 100644 --- a/src/Game/AI/Action/actionPlayerGrabWait.cpp +++ b/src/Game/AI/Action/actionPlayerGrabWait.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerGrabWait::PlayerGrabWait(const InitArg& arg) : PlayerAction(arg) {} -PlayerGrabWait::~PlayerGrabWait() = default; - -bool PlayerGrabWait::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerGrabWait::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } @@ -18,8 +12,6 @@ void PlayerGrabWait::leave_() { PlayerAction::leave_(); } -void PlayerGrabWait::loadParams_() {} - void PlayerGrabWait::calc_() { PlayerAction::calc_(); } diff --git a/src/Game/AI/Action/actionPlayerGrabWait.h b/src/Game/AI/Action/actionPlayerGrabWait.h index a19cd3c1..82e7db98 100644 --- a/src/Game/AI/Action/actionPlayerGrabWait.h +++ b/src/Game/AI/Action/actionPlayerGrabWait.h @@ -9,12 +9,9 @@ class PlayerGrabWait : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerGrabWait, PlayerAction) public: explicit PlayerGrabWait(const InitArg& arg); - ~PlayerGrabWait() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; - void loadParams_() override; protected: void calc_() override; diff --git a/src/Game/AI/Action/actionPlayerGuardBreak.cpp b/src/Game/AI/Action/actionPlayerGuardBreak.cpp index 0cee7132..ec94419d 100644 --- a/src/Game/AI/Action/actionPlayerGuardBreak.cpp +++ b/src/Game/AI/Action/actionPlayerGuardBreak.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerGuardBreak::PlayerGuardBreak(const InitArg& arg) : PlayerAction(arg) {} -PlayerGuardBreak::~PlayerGuardBreak() = default; - -bool PlayerGuardBreak::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerGuardBreak::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } diff --git a/src/Game/AI/Action/actionPlayerGuardBreak.h b/src/Game/AI/Action/actionPlayerGuardBreak.h index fe9ae858..d1fcf2e0 100644 --- a/src/Game/AI/Action/actionPlayerGuardBreak.h +++ b/src/Game/AI/Action/actionPlayerGuardBreak.h @@ -9,9 +9,7 @@ class PlayerGuardBreak : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerGuardBreak, PlayerAction) public: explicit PlayerGuardBreak(const InitArg& arg); - ~PlayerGuardBreak() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionPlayerGuardJust.cpp b/src/Game/AI/Action/actionPlayerGuardJust.cpp index a14c482f..7985c6f2 100644 --- a/src/Game/AI/Action/actionPlayerGuardJust.cpp +++ b/src/Game/AI/Action/actionPlayerGuardJust.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerGuardJust::PlayerGuardJust(const InitArg& arg) : PlayerAction(arg) {} -PlayerGuardJust::~PlayerGuardJust() = default; - -bool PlayerGuardJust::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerGuardJust::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } diff --git a/src/Game/AI/Action/actionPlayerGuardJust.h b/src/Game/AI/Action/actionPlayerGuardJust.h index be2f8039..8f8982ec 100644 --- a/src/Game/AI/Action/actionPlayerGuardJust.h +++ b/src/Game/AI/Action/actionPlayerGuardJust.h @@ -9,9 +9,7 @@ class PlayerGuardJust : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerGuardJust, PlayerAction) public: explicit PlayerGuardJust(const InitArg& arg); - ~PlayerGuardJust() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionPlayerGuardJustFall.cpp b/src/Game/AI/Action/actionPlayerGuardJustFall.cpp index 2a6a8d2f..9d59d466 100644 --- a/src/Game/AI/Action/actionPlayerGuardJustFall.cpp +++ b/src/Game/AI/Action/actionPlayerGuardJustFall.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerGuardJustFall::PlayerGuardJustFall(const InitArg& arg) : PlayerAction(arg) {} -PlayerGuardJustFall::~PlayerGuardJustFall() = default; - -bool PlayerGuardJustFall::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerGuardJustFall::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } @@ -18,8 +12,6 @@ void PlayerGuardJustFall::leave_() { PlayerAction::leave_(); } -void PlayerGuardJustFall::loadParams_() {} - void PlayerGuardJustFall::calc_() { PlayerAction::calc_(); } diff --git a/src/Game/AI/Action/actionPlayerGuardJustFall.h b/src/Game/AI/Action/actionPlayerGuardJustFall.h index 2436b69c..ce90e1b4 100644 --- a/src/Game/AI/Action/actionPlayerGuardJustFall.h +++ b/src/Game/AI/Action/actionPlayerGuardJustFall.h @@ -9,12 +9,9 @@ class PlayerGuardJustFall : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerGuardJustFall, PlayerAction) public: explicit PlayerGuardJustFall(const InitArg& arg); - ~PlayerGuardJustFall() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; - void loadParams_() override; protected: void calc_() override; diff --git a/src/Game/AI/Action/actionPlayerGuardSlip.cpp b/src/Game/AI/Action/actionPlayerGuardSlip.cpp index 50f95a62..eb7a3bbb 100644 --- a/src/Game/AI/Action/actionPlayerGuardSlip.cpp +++ b/src/Game/AI/Action/actionPlayerGuardSlip.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerGuardSlip::PlayerGuardSlip(const InitArg& arg) : PlayerAction(arg) {} -PlayerGuardSlip::~PlayerGuardSlip() = default; - -bool PlayerGuardSlip::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerGuardSlip::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } diff --git a/src/Game/AI/Action/actionPlayerGuardSlip.h b/src/Game/AI/Action/actionPlayerGuardSlip.h index 5880dd56..f27f7e49 100644 --- a/src/Game/AI/Action/actionPlayerGuardSlip.h +++ b/src/Game/AI/Action/actionPlayerGuardSlip.h @@ -9,9 +9,7 @@ class PlayerGuardSlip : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerGuardSlip, PlayerAction) public: explicit PlayerGuardSlip(const InitArg& arg); - ~PlayerGuardSlip() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionPlayerGuidedMove.cpp b/src/Game/AI/Action/actionPlayerGuidedMove.cpp index ca012e0a..e55206f9 100644 --- a/src/Game/AI/Action/actionPlayerGuidedMove.cpp +++ b/src/Game/AI/Action/actionPlayerGuidedMove.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerGuidedMove::PlayerGuidedMove(const InitArg& arg) : PlayerAction(arg) {} -PlayerGuidedMove::~PlayerGuidedMove() = default; - -bool PlayerGuidedMove::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerGuidedMove::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } diff --git a/src/Game/AI/Action/actionPlayerGuidedMove.h b/src/Game/AI/Action/actionPlayerGuidedMove.h index 23de5917..0c46d0bb 100644 --- a/src/Game/AI/Action/actionPlayerGuidedMove.h +++ b/src/Game/AI/Action/actionPlayerGuidedMove.h @@ -9,9 +9,7 @@ class PlayerGuidedMove : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerGuidedMove, PlayerAction) public: explicit PlayerGuidedMove(const InitArg& arg); - ~PlayerGuidedMove() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionPlayerHangWallCatch.cpp b/src/Game/AI/Action/actionPlayerHangWallCatch.cpp index 60452cc4..f804dc14 100644 --- a/src/Game/AI/Action/actionPlayerHangWallCatch.cpp +++ b/src/Game/AI/Action/actionPlayerHangWallCatch.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerHangWallCatch::PlayerHangWallCatch(const InitArg& arg) : PlayerAction(arg) {} -PlayerHangWallCatch::~PlayerHangWallCatch() = default; - -bool PlayerHangWallCatch::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerHangWallCatch::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } @@ -18,8 +12,6 @@ void PlayerHangWallCatch::leave_() { PlayerAction::leave_(); } -void PlayerHangWallCatch::loadParams_() {} - void PlayerHangWallCatch::calc_() { PlayerAction::calc_(); } diff --git a/src/Game/AI/Action/actionPlayerHangWallCatch.h b/src/Game/AI/Action/actionPlayerHangWallCatch.h index abf072bf..caced365 100644 --- a/src/Game/AI/Action/actionPlayerHangWallCatch.h +++ b/src/Game/AI/Action/actionPlayerHangWallCatch.h @@ -9,12 +9,9 @@ class PlayerHangWallCatch : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerHangWallCatch, PlayerAction) public: explicit PlayerHangWallCatch(const InitArg& arg); - ~PlayerHangWallCatch() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; - void loadParams_() override; protected: void calc_() override; diff --git a/src/Game/AI/Action/actionPlayerHell.cpp b/src/Game/AI/Action/actionPlayerHell.cpp index 4e95f3f1..8560ba1e 100644 --- a/src/Game/AI/Action/actionPlayerHell.cpp +++ b/src/Game/AI/Action/actionPlayerHell.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerHell::PlayerHell(const InitArg& arg) : PlayerAction(arg) {} -PlayerHell::~PlayerHell() = default; - -bool PlayerHell::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerHell::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } diff --git a/src/Game/AI/Action/actionPlayerHell.h b/src/Game/AI/Action/actionPlayerHell.h index 1f4e2785..43f5d9b0 100644 --- a/src/Game/AI/Action/actionPlayerHell.h +++ b/src/Game/AI/Action/actionPlayerHell.h @@ -9,9 +9,7 @@ class PlayerHell : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerHell, PlayerAction) public: explicit PlayerHell(const InitArg& arg); - ~PlayerHell() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionPlayerHellNoFade.cpp b/src/Game/AI/Action/actionPlayerHellNoFade.cpp index 10e3f4df..160548de 100644 --- a/src/Game/AI/Action/actionPlayerHellNoFade.cpp +++ b/src/Game/AI/Action/actionPlayerHellNoFade.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerHellNoFade::PlayerHellNoFade(const InitArg& arg) : PlayerAction(arg) {} -PlayerHellNoFade::~PlayerHellNoFade() = default; - -bool PlayerHellNoFade::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerHellNoFade::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } diff --git a/src/Game/AI/Action/actionPlayerHellNoFade.h b/src/Game/AI/Action/actionPlayerHellNoFade.h index 59f87715..f43e7950 100644 --- a/src/Game/AI/Action/actionPlayerHellNoFade.h +++ b/src/Game/AI/Action/actionPlayerHellNoFade.h @@ -9,9 +9,7 @@ class PlayerHellNoFade : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerHellNoFade, PlayerAction) public: explicit PlayerHellNoFade(const InitArg& arg); - ~PlayerHellNoFade() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionPlayerHellStartWait.cpp b/src/Game/AI/Action/actionPlayerHellStartWait.cpp index 9b6b9e2d..fe491318 100644 --- a/src/Game/AI/Action/actionPlayerHellStartWait.cpp +++ b/src/Game/AI/Action/actionPlayerHellStartWait.cpp @@ -6,10 +6,6 @@ PlayerHellStartWait::PlayerHellStartWait(const InitArg& arg) : PlayerAction(arg) PlayerHellStartWait::~PlayerHellStartWait() = default; -bool PlayerHellStartWait::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerHellStartWait::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } @@ -18,8 +14,6 @@ void PlayerHellStartWait::leave_() { PlayerAction::leave_(); } -void PlayerHellStartWait::loadParams_() {} - void PlayerHellStartWait::calc_() { PlayerAction::calc_(); } diff --git a/src/Game/AI/Action/actionPlayerHellStartWait.h b/src/Game/AI/Action/actionPlayerHellStartWait.h index 15cff154..6dceb0c2 100644 --- a/src/Game/AI/Action/actionPlayerHellStartWait.h +++ b/src/Game/AI/Action/actionPlayerHellStartWait.h @@ -11,10 +11,8 @@ public: explicit PlayerHellStartWait(const InitArg& arg); ~PlayerHellStartWait() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; - void loadParams_() override; protected: void calc_() override; diff --git a/src/Game/AI/Action/actionPlayerHide.cpp b/src/Game/AI/Action/actionPlayerHide.cpp index 884f1385..202e49df 100644 --- a/src/Game/AI/Action/actionPlayerHide.cpp +++ b/src/Game/AI/Action/actionPlayerHide.cpp @@ -10,20 +10,8 @@ bool PlayerHide::init_(sead::Heap* heap) { return PlayerAction::init_(heap); } -void PlayerHide::enter_(ksys::act::ai::InlineParamPack* params) { - PlayerAction::enter_(params); -} - -void PlayerHide::leave_() { - PlayerAction::leave_(); -} - void PlayerHide::loadParams_() { getStaticParam(&mHidden_s, "Hidden"); } -void PlayerHide::calc_() { - PlayerAction::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionPlayerHide.h b/src/Game/AI/Action/actionPlayerHide.h index 90f6d49a..fa34e7fa 100644 --- a/src/Game/AI/Action/actionPlayerHide.h +++ b/src/Game/AI/Action/actionPlayerHide.h @@ -12,13 +12,9 @@ public: ~PlayerHide() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // static_param at offset 0x20 const bool* mHidden_s{}; }; diff --git a/src/Game/AI/Action/actionPlayerHoldUpDRC.cpp b/src/Game/AI/Action/actionPlayerHoldUpDRC.cpp index f0c6edde..5735f2f6 100644 --- a/src/Game/AI/Action/actionPlayerHoldUpDRC.cpp +++ b/src/Game/AI/Action/actionPlayerHoldUpDRC.cpp @@ -6,10 +6,6 @@ PlayerHoldUpDRC::PlayerHoldUpDRC(const InitArg& arg) : PlayerAction(arg) {} PlayerHoldUpDRC::~PlayerHoldUpDRC() = default; -bool PlayerHoldUpDRC::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerHoldUpDRC::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } diff --git a/src/Game/AI/Action/actionPlayerHoldUpDRC.h b/src/Game/AI/Action/actionPlayerHoldUpDRC.h index b0a5d19b..3b2eb1f7 100644 --- a/src/Game/AI/Action/actionPlayerHoldUpDRC.h +++ b/src/Game/AI/Action/actionPlayerHoldUpDRC.h @@ -11,7 +11,6 @@ public: explicit PlayerHoldUpDRC(const InitArg& arg); ~PlayerHoldUpDRC() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionPlayerHorseGetOff.cpp b/src/Game/AI/Action/actionPlayerHorseGetOff.cpp index 424f426b..1235f06f 100644 --- a/src/Game/AI/Action/actionPlayerHorseGetOff.cpp +++ b/src/Game/AI/Action/actionPlayerHorseGetOff.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerHorseGetOff::PlayerHorseGetOff(const InitArg& arg) : PlayerAction(arg) {} -PlayerHorseGetOff::~PlayerHorseGetOff() = default; - -bool PlayerHorseGetOff::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerHorseGetOff::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } diff --git a/src/Game/AI/Action/actionPlayerHorseGetOff.h b/src/Game/AI/Action/actionPlayerHorseGetOff.h index b0da3113..617d2ef8 100644 --- a/src/Game/AI/Action/actionPlayerHorseGetOff.h +++ b/src/Game/AI/Action/actionPlayerHorseGetOff.h @@ -9,9 +9,7 @@ class PlayerHorseGetOff : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerHorseGetOff, PlayerAction) public: explicit PlayerHorseGetOff(const InitArg& arg); - ~PlayerHorseGetOff() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionPlayerHorseGetOffInDemo.cpp b/src/Game/AI/Action/actionPlayerHorseGetOffInDemo.cpp index b0ecc04e..07eec9b7 100644 --- a/src/Game/AI/Action/actionPlayerHorseGetOffInDemo.cpp +++ b/src/Game/AI/Action/actionPlayerHorseGetOffInDemo.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerHorseGetOffInDemo::PlayerHorseGetOffInDemo(const InitArg& arg) : PlayerAction(arg) {} -PlayerHorseGetOffInDemo::~PlayerHorseGetOffInDemo() = default; - -bool PlayerHorseGetOffInDemo::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerHorseGetOffInDemo::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } @@ -18,8 +12,6 @@ void PlayerHorseGetOffInDemo::leave_() { PlayerAction::leave_(); } -void PlayerHorseGetOffInDemo::loadParams_() {} - void PlayerHorseGetOffInDemo::calc_() { PlayerAction::calc_(); } diff --git a/src/Game/AI/Action/actionPlayerHorseGetOffInDemo.h b/src/Game/AI/Action/actionPlayerHorseGetOffInDemo.h index e9ba619b..aba1c5d4 100644 --- a/src/Game/AI/Action/actionPlayerHorseGetOffInDemo.h +++ b/src/Game/AI/Action/actionPlayerHorseGetOffInDemo.h @@ -9,12 +9,9 @@ class PlayerHorseGetOffInDemo : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerHorseGetOffInDemo, PlayerAction) public: explicit PlayerHorseGetOffInDemo(const InitArg& arg); - ~PlayerHorseGetOffInDemo() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; - void loadParams_() override; protected: void calc_() override; diff --git a/src/Game/AI/Action/actionPlayerHorseJump.cpp b/src/Game/AI/Action/actionPlayerHorseJump.cpp index 8abe2340..3395ec23 100644 --- a/src/Game/AI/Action/actionPlayerHorseJump.cpp +++ b/src/Game/AI/Action/actionPlayerHorseJump.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerHorseJump::PlayerHorseJump(const InitArg& arg) : PlayerAction(arg) {} -PlayerHorseJump::~PlayerHorseJump() = default; - -bool PlayerHorseJump::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerHorseJump::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } diff --git a/src/Game/AI/Action/actionPlayerHorseJump.h b/src/Game/AI/Action/actionPlayerHorseJump.h index 0b944a78..43d619fd 100644 --- a/src/Game/AI/Action/actionPlayerHorseJump.h +++ b/src/Game/AI/Action/actionPlayerHorseJump.h @@ -9,9 +9,7 @@ class PlayerHorseJump : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerHorseJump, PlayerAction) public: explicit PlayerHorseJump(const InitArg& arg); - ~PlayerHorseJump() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionPlayerIce.cpp b/src/Game/AI/Action/actionPlayerIce.cpp index d2fd4cd5..aa012f43 100644 --- a/src/Game/AI/Action/actionPlayerIce.cpp +++ b/src/Game/AI/Action/actionPlayerIce.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerIce::PlayerIce(const InitArg& arg) : PlayerAction(arg) {} -PlayerIce::~PlayerIce() = default; - -bool PlayerIce::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerIce::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } diff --git a/src/Game/AI/Action/actionPlayerIce.h b/src/Game/AI/Action/actionPlayerIce.h index f8a25922..8f7bb8b7 100644 --- a/src/Game/AI/Action/actionPlayerIce.h +++ b/src/Game/AI/Action/actionPlayerIce.h @@ -9,9 +9,7 @@ class PlayerIce : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerIce, PlayerAction) public: explicit PlayerIce(const InitArg& arg); - ~PlayerIce() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionPlayerIceBlockRemove.cpp b/src/Game/AI/Action/actionPlayerIceBlockRemove.cpp index b8e355fb..13b7ae85 100644 --- a/src/Game/AI/Action/actionPlayerIceBlockRemove.cpp +++ b/src/Game/AI/Action/actionPlayerIceBlockRemove.cpp @@ -6,10 +6,6 @@ PlayerIceBlockRemove::PlayerIceBlockRemove(const InitArg& arg) : PlayerAction(ar PlayerIceBlockRemove::~PlayerIceBlockRemove() = default; -bool PlayerIceBlockRemove::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerIceBlockRemove::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } @@ -18,8 +14,6 @@ void PlayerIceBlockRemove::leave_() { PlayerAction::leave_(); } -void PlayerIceBlockRemove::loadParams_() {} - void PlayerIceBlockRemove::calc_() { PlayerAction::calc_(); } diff --git a/src/Game/AI/Action/actionPlayerIceBlockRemove.h b/src/Game/AI/Action/actionPlayerIceBlockRemove.h index 15380ae4..00e845bf 100644 --- a/src/Game/AI/Action/actionPlayerIceBlockRemove.h +++ b/src/Game/AI/Action/actionPlayerIceBlockRemove.h @@ -11,10 +11,8 @@ public: explicit PlayerIceBlockRemove(const InitArg& arg); ~PlayerIceBlockRemove() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; - void loadParams_() override; protected: void calc_() override; diff --git a/src/Game/AI/Action/actionPlayerIceBreak.cpp b/src/Game/AI/Action/actionPlayerIceBreak.cpp index b3a5297a..cd4bb012 100644 --- a/src/Game/AI/Action/actionPlayerIceBreak.cpp +++ b/src/Game/AI/Action/actionPlayerIceBreak.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerIceBreak::PlayerIceBreak(const InitArg& arg) : PlayerAction(arg) {} -PlayerIceBreak::~PlayerIceBreak() = default; - -bool PlayerIceBreak::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerIceBreak::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } @@ -18,8 +12,6 @@ void PlayerIceBreak::leave_() { PlayerAction::leave_(); } -void PlayerIceBreak::loadParams_() {} - void PlayerIceBreak::calc_() { PlayerAction::calc_(); } diff --git a/src/Game/AI/Action/actionPlayerIceBreak.h b/src/Game/AI/Action/actionPlayerIceBreak.h index 09b5480c..1c3f1d1d 100644 --- a/src/Game/AI/Action/actionPlayerIceBreak.h +++ b/src/Game/AI/Action/actionPlayerIceBreak.h @@ -9,12 +9,9 @@ class PlayerIceBreak : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerIceBreak, PlayerAction) public: explicit PlayerIceBreak(const InitArg& arg); - ~PlayerIceBreak() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; - void loadParams_() override; protected: void calc_() override; diff --git a/src/Game/AI/Action/actionPlayerIceGrabReady.cpp b/src/Game/AI/Action/actionPlayerIceGrabReady.cpp index f17cf3f8..c94970ca 100644 --- a/src/Game/AI/Action/actionPlayerIceGrabReady.cpp +++ b/src/Game/AI/Action/actionPlayerIceGrabReady.cpp @@ -6,10 +6,6 @@ PlayerIceGrabReady::PlayerIceGrabReady(const InitArg& arg) : PlayerAction(arg) { PlayerIceGrabReady::~PlayerIceGrabReady() = default; -bool PlayerIceGrabReady::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerIceGrabReady::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } @@ -18,8 +14,6 @@ void PlayerIceGrabReady::leave_() { PlayerAction::leave_(); } -void PlayerIceGrabReady::loadParams_() {} - void PlayerIceGrabReady::calc_() { PlayerAction::calc_(); } diff --git a/src/Game/AI/Action/actionPlayerIceGrabReady.h b/src/Game/AI/Action/actionPlayerIceGrabReady.h index 79b21a59..a16863dd 100644 --- a/src/Game/AI/Action/actionPlayerIceGrabReady.h +++ b/src/Game/AI/Action/actionPlayerIceGrabReady.h @@ -11,10 +11,8 @@ public: explicit PlayerIceGrabReady(const InitArg& arg); ~PlayerIceGrabReady() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; - void loadParams_() override; protected: void calc_() override; diff --git a/src/Game/AI/Action/actionPlayerJump.cpp b/src/Game/AI/Action/actionPlayerJump.cpp index 77e28235..ecadd064 100644 --- a/src/Game/AI/Action/actionPlayerJump.cpp +++ b/src/Game/AI/Action/actionPlayerJump.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerJump::PlayerJump(const InitArg& arg) : PlayerAction(arg) {} -PlayerJump::~PlayerJump() = default; - -bool PlayerJump::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerJump::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } diff --git a/src/Game/AI/Action/actionPlayerJump.h b/src/Game/AI/Action/actionPlayerJump.h index c4fd591c..15255d35 100644 --- a/src/Game/AI/Action/actionPlayerJump.h +++ b/src/Game/AI/Action/actionPlayerJump.h @@ -9,9 +9,7 @@ class PlayerJump : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerJump, PlayerAction) public: explicit PlayerJump(const InitArg& arg); - ~PlayerJump() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionPlayerKokkoGlide.cpp b/src/Game/AI/Action/actionPlayerKokkoGlide.cpp index b13f39bf..f804a564 100644 --- a/src/Game/AI/Action/actionPlayerKokkoGlide.cpp +++ b/src/Game/AI/Action/actionPlayerKokkoGlide.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerKokkoGlide::PlayerKokkoGlide(const InitArg& arg) : PlayerGlide(arg) {} -PlayerKokkoGlide::~PlayerKokkoGlide() = default; - -bool PlayerKokkoGlide::init_(sead::Heap* heap) { - return PlayerGlide::init_(heap); -} - void PlayerKokkoGlide::enter_(ksys::act::ai::InlineParamPack* params) { PlayerGlide::enter_(params); } diff --git a/src/Game/AI/Action/actionPlayerKokkoGlide.h b/src/Game/AI/Action/actionPlayerKokkoGlide.h index 806d0e35..8d4aa71d 100644 --- a/src/Game/AI/Action/actionPlayerKokkoGlide.h +++ b/src/Game/AI/Action/actionPlayerKokkoGlide.h @@ -9,9 +9,7 @@ class PlayerKokkoGlide : public PlayerGlide { SEAD_RTTI_OVERRIDE(PlayerKokkoGlide, PlayerGlide) public: explicit PlayerKokkoGlide(const InitArg& arg); - ~PlayerKokkoGlide() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionPlayerLadderDownEnd.cpp b/src/Game/AI/Action/actionPlayerLadderDownEnd.cpp index 25897868..e12500aa 100644 --- a/src/Game/AI/Action/actionPlayerLadderDownEnd.cpp +++ b/src/Game/AI/Action/actionPlayerLadderDownEnd.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerLadderDownEnd::PlayerLadderDownEnd(const InitArg& arg) : PlayerAction(arg) {} -PlayerLadderDownEnd::~PlayerLadderDownEnd() = default; - -bool PlayerLadderDownEnd::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerLadderDownEnd::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } @@ -18,8 +12,6 @@ void PlayerLadderDownEnd::leave_() { PlayerAction::leave_(); } -void PlayerLadderDownEnd::loadParams_() {} - void PlayerLadderDownEnd::calc_() { PlayerAction::calc_(); } diff --git a/src/Game/AI/Action/actionPlayerLadderDownEnd.h b/src/Game/AI/Action/actionPlayerLadderDownEnd.h index 4c1c7e6d..67d1d02e 100644 --- a/src/Game/AI/Action/actionPlayerLadderDownEnd.h +++ b/src/Game/AI/Action/actionPlayerLadderDownEnd.h @@ -9,12 +9,9 @@ class PlayerLadderDownEnd : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerLadderDownEnd, PlayerAction) public: explicit PlayerLadderDownEnd(const InitArg& arg); - ~PlayerLadderDownEnd() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; - void loadParams_() override; protected: void calc_() override; diff --git a/src/Game/AI/Action/actionPlayerLadderDownStart.cpp b/src/Game/AI/Action/actionPlayerLadderDownStart.cpp index 3634c864..7450c83e 100644 --- a/src/Game/AI/Action/actionPlayerLadderDownStart.cpp +++ b/src/Game/AI/Action/actionPlayerLadderDownStart.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerLadderDownStart::PlayerLadderDownStart(const InitArg& arg) : PlayerAction(arg) {} -PlayerLadderDownStart::~PlayerLadderDownStart() = default; - -bool PlayerLadderDownStart::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerLadderDownStart::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } @@ -18,8 +12,6 @@ void PlayerLadderDownStart::leave_() { PlayerAction::leave_(); } -void PlayerLadderDownStart::loadParams_() {} - void PlayerLadderDownStart::calc_() { PlayerAction::calc_(); } diff --git a/src/Game/AI/Action/actionPlayerLadderDownStart.h b/src/Game/AI/Action/actionPlayerLadderDownStart.h index 07f16187..9014cde6 100644 --- a/src/Game/AI/Action/actionPlayerLadderDownStart.h +++ b/src/Game/AI/Action/actionPlayerLadderDownStart.h @@ -9,12 +9,9 @@ class PlayerLadderDownStart : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerLadderDownStart, PlayerAction) public: explicit PlayerLadderDownStart(const InitArg& arg); - ~PlayerLadderDownStart() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; - void loadParams_() override; protected: void calc_() override; diff --git a/src/Game/AI/Action/actionPlayerLadderJump.cpp b/src/Game/AI/Action/actionPlayerLadderJump.cpp index 5daed909..03ab1337 100644 --- a/src/Game/AI/Action/actionPlayerLadderJump.cpp +++ b/src/Game/AI/Action/actionPlayerLadderJump.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerLadderJump::PlayerLadderJump(const InitArg& arg) : PlayerAction(arg) {} -PlayerLadderJump::~PlayerLadderJump() = default; - -bool PlayerLadderJump::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerLadderJump::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } diff --git a/src/Game/AI/Action/actionPlayerLadderJump.h b/src/Game/AI/Action/actionPlayerLadderJump.h index 52c8b093..dcd1606d 100644 --- a/src/Game/AI/Action/actionPlayerLadderJump.h +++ b/src/Game/AI/Action/actionPlayerLadderJump.h @@ -9,9 +9,7 @@ class PlayerLadderJump : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerLadderJump, PlayerAction) public: explicit PlayerLadderJump(const InitArg& arg); - ~PlayerLadderJump() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionPlayerLadderJumpLand.cpp b/src/Game/AI/Action/actionPlayerLadderJumpLand.cpp index 571bdfde..b0d05fbd 100644 --- a/src/Game/AI/Action/actionPlayerLadderJumpLand.cpp +++ b/src/Game/AI/Action/actionPlayerLadderJumpLand.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerLadderJumpLand::PlayerLadderJumpLand(const InitArg& arg) : PlayerAction(arg) {} -PlayerLadderJumpLand::~PlayerLadderJumpLand() = default; - -bool PlayerLadderJumpLand::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerLadderJumpLand::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } diff --git a/src/Game/AI/Action/actionPlayerLadderJumpLand.h b/src/Game/AI/Action/actionPlayerLadderJumpLand.h index 3936ca0e..d3a22261 100644 --- a/src/Game/AI/Action/actionPlayerLadderJumpLand.h +++ b/src/Game/AI/Action/actionPlayerLadderJumpLand.h @@ -9,9 +9,7 @@ class PlayerLadderJumpLand : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerLadderJumpLand, PlayerAction) public: explicit PlayerLadderJumpLand(const InitArg& arg); - ~PlayerLadderJumpLand() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionPlayerLadderMove.cpp b/src/Game/AI/Action/actionPlayerLadderMove.cpp index 407c5295..88a04b50 100644 --- a/src/Game/AI/Action/actionPlayerLadderMove.cpp +++ b/src/Game/AI/Action/actionPlayerLadderMove.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerLadderMove::PlayerLadderMove(const InitArg& arg) : PlayerAction(arg) {} -PlayerLadderMove::~PlayerLadderMove() = default; - -bool PlayerLadderMove::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerLadderMove::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } diff --git a/src/Game/AI/Action/actionPlayerLadderMove.h b/src/Game/AI/Action/actionPlayerLadderMove.h index 286d2e1b..4d8b1b8b 100644 --- a/src/Game/AI/Action/actionPlayerLadderMove.h +++ b/src/Game/AI/Action/actionPlayerLadderMove.h @@ -9,9 +9,7 @@ class PlayerLadderMove : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerLadderMove, PlayerAction) public: explicit PlayerLadderMove(const InitArg& arg); - ~PlayerLadderMove() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionPlayerLadderToClimb.cpp b/src/Game/AI/Action/actionPlayerLadderToClimb.cpp index 8a07ed5b..6dc0c018 100644 --- a/src/Game/AI/Action/actionPlayerLadderToClimb.cpp +++ b/src/Game/AI/Action/actionPlayerLadderToClimb.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerLadderToClimb::PlayerLadderToClimb(const InitArg& arg) : PlayerAction(arg) {} -PlayerLadderToClimb::~PlayerLadderToClimb() = default; - -bool PlayerLadderToClimb::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerLadderToClimb::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } @@ -18,8 +12,6 @@ void PlayerLadderToClimb::leave_() { PlayerAction::leave_(); } -void PlayerLadderToClimb::loadParams_() {} - void PlayerLadderToClimb::calc_() { PlayerAction::calc_(); } diff --git a/src/Game/AI/Action/actionPlayerLadderToClimb.h b/src/Game/AI/Action/actionPlayerLadderToClimb.h index 0a5fba36..9dcd146d 100644 --- a/src/Game/AI/Action/actionPlayerLadderToClimb.h +++ b/src/Game/AI/Action/actionPlayerLadderToClimb.h @@ -9,12 +9,9 @@ class PlayerLadderToClimb : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerLadderToClimb, PlayerAction) public: explicit PlayerLadderToClimb(const InitArg& arg); - ~PlayerLadderToClimb() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; - void loadParams_() override; protected: void calc_() override; diff --git a/src/Game/AI/Action/actionPlayerLadderUpEnd.cpp b/src/Game/AI/Action/actionPlayerLadderUpEnd.cpp index 4aa08fdf..954a61e3 100644 --- a/src/Game/AI/Action/actionPlayerLadderUpEnd.cpp +++ b/src/Game/AI/Action/actionPlayerLadderUpEnd.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerLadderUpEnd::PlayerLadderUpEnd(const InitArg& arg) : PlayerAction(arg) {} -PlayerLadderUpEnd::~PlayerLadderUpEnd() = default; - -bool PlayerLadderUpEnd::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerLadderUpEnd::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } @@ -18,8 +12,6 @@ void PlayerLadderUpEnd::leave_() { PlayerAction::leave_(); } -void PlayerLadderUpEnd::loadParams_() {} - void PlayerLadderUpEnd::calc_() { PlayerAction::calc_(); } diff --git a/src/Game/AI/Action/actionPlayerLadderUpEnd.h b/src/Game/AI/Action/actionPlayerLadderUpEnd.h index bb81317a..8bd75fda 100644 --- a/src/Game/AI/Action/actionPlayerLadderUpEnd.h +++ b/src/Game/AI/Action/actionPlayerLadderUpEnd.h @@ -9,12 +9,9 @@ class PlayerLadderUpEnd : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerLadderUpEnd, PlayerAction) public: explicit PlayerLadderUpEnd(const InitArg& arg); - ~PlayerLadderUpEnd() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; - void loadParams_() override; protected: void calc_() override; diff --git a/src/Game/AI/Action/actionPlayerLadderUpStart.cpp b/src/Game/AI/Action/actionPlayerLadderUpStart.cpp index 15567860..dcf7ae44 100644 --- a/src/Game/AI/Action/actionPlayerLadderUpStart.cpp +++ b/src/Game/AI/Action/actionPlayerLadderUpStart.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerLadderUpStart::PlayerLadderUpStart(const InitArg& arg) : PlayerAction(arg) {} -PlayerLadderUpStart::~PlayerLadderUpStart() = default; - -bool PlayerLadderUpStart::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerLadderUpStart::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } diff --git a/src/Game/AI/Action/actionPlayerLadderUpStart.h b/src/Game/AI/Action/actionPlayerLadderUpStart.h index c40d6f03..969401e3 100644 --- a/src/Game/AI/Action/actionPlayerLadderUpStart.h +++ b/src/Game/AI/Action/actionPlayerLadderUpStart.h @@ -9,9 +9,7 @@ class PlayerLadderUpStart : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerLadderUpStart, PlayerAction) public: explicit PlayerLadderUpStart(const InitArg& arg); - ~PlayerLadderUpStart() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionPlayerLand.cpp b/src/Game/AI/Action/actionPlayerLand.cpp index 351ae62a..224444f3 100644 --- a/src/Game/AI/Action/actionPlayerLand.cpp +++ b/src/Game/AI/Action/actionPlayerLand.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerLand::PlayerLand(const InitArg& arg) : PlayerAction(arg) {} -PlayerLand::~PlayerLand() = default; - -bool PlayerLand::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerLand::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } @@ -18,8 +12,6 @@ void PlayerLand::leave_() { PlayerAction::leave_(); } -void PlayerLand::loadParams_() {} - void PlayerLand::calc_() { PlayerAction::calc_(); } diff --git a/src/Game/AI/Action/actionPlayerLand.h b/src/Game/AI/Action/actionPlayerLand.h index a02ca3b6..c7c429d8 100644 --- a/src/Game/AI/Action/actionPlayerLand.h +++ b/src/Game/AI/Action/actionPlayerLand.h @@ -9,12 +9,9 @@ class PlayerLand : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerLand, PlayerAction) public: explicit PlayerLand(const InitArg& arg); - ~PlayerLand() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; - void loadParams_() override; protected: void calc_() override; diff --git a/src/Game/AI/Action/actionPlayerLandDamage.cpp b/src/Game/AI/Action/actionPlayerLandDamage.cpp index 80f0070a..725200af 100644 --- a/src/Game/AI/Action/actionPlayerLandDamage.cpp +++ b/src/Game/AI/Action/actionPlayerLandDamage.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerLandDamage::PlayerLandDamage(const InitArg& arg) : PlayerAction(arg) {} -PlayerLandDamage::~PlayerLandDamage() = default; - -bool PlayerLandDamage::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerLandDamage::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } diff --git a/src/Game/AI/Action/actionPlayerLandDamage.h b/src/Game/AI/Action/actionPlayerLandDamage.h index 1674b8db..02c43300 100644 --- a/src/Game/AI/Action/actionPlayerLandDamage.h +++ b/src/Game/AI/Action/actionPlayerLandDamage.h @@ -9,9 +9,7 @@ class PlayerLandDamage : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerLandDamage, PlayerAction) public: explicit PlayerLandDamage(const InitArg& arg); - ~PlayerLandDamage() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionPlayerLargeDamage.cpp b/src/Game/AI/Action/actionPlayerLargeDamage.cpp index 14d9deac..63f2c005 100644 --- a/src/Game/AI/Action/actionPlayerLargeDamage.cpp +++ b/src/Game/AI/Action/actionPlayerLargeDamage.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerLargeDamage::PlayerLargeDamage(const InitArg& arg) : PlayerAction(arg) {} -PlayerLargeDamage::~PlayerLargeDamage() = default; - -bool PlayerLargeDamage::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerLargeDamage::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } diff --git a/src/Game/AI/Action/actionPlayerLargeDamage.h b/src/Game/AI/Action/actionPlayerLargeDamage.h index 97ee8a88..881f25d9 100644 --- a/src/Game/AI/Action/actionPlayerLargeDamage.h +++ b/src/Game/AI/Action/actionPlayerLargeDamage.h @@ -9,9 +9,7 @@ class PlayerLargeDamage : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerLargeDamage, PlayerAction) public: explicit PlayerLargeDamage(const InitArg& arg); - ~PlayerLargeDamage() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionPlayerLargeDamageUp.cpp b/src/Game/AI/Action/actionPlayerLargeDamageUp.cpp index deab5e78..dd49f332 100644 --- a/src/Game/AI/Action/actionPlayerLargeDamageUp.cpp +++ b/src/Game/AI/Action/actionPlayerLargeDamageUp.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerLargeDamageUp::PlayerLargeDamageUp(const InitArg& arg) : PlayerAction(arg) {} -PlayerLargeDamageUp::~PlayerLargeDamageUp() = default; - -bool PlayerLargeDamageUp::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerLargeDamageUp::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } @@ -18,8 +12,6 @@ void PlayerLargeDamageUp::leave_() { PlayerAction::leave_(); } -void PlayerLargeDamageUp::loadParams_() {} - void PlayerLargeDamageUp::calc_() { PlayerAction::calc_(); } diff --git a/src/Game/AI/Action/actionPlayerLargeDamageUp.h b/src/Game/AI/Action/actionPlayerLargeDamageUp.h index 06af7bec..492e0f54 100644 --- a/src/Game/AI/Action/actionPlayerLargeDamageUp.h +++ b/src/Game/AI/Action/actionPlayerLargeDamageUp.h @@ -9,12 +9,9 @@ class PlayerLargeDamageUp : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerLargeDamageUp, PlayerAction) public: explicit PlayerLargeDamageUp(const InitArg& arg); - ~PlayerLargeDamageUp() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; - void loadParams_() override; protected: void calc_() override; diff --git a/src/Game/AI/Action/actionPlayerLaunch.cpp b/src/Game/AI/Action/actionPlayerLaunch.cpp index 088bff8b..e100adf9 100644 --- a/src/Game/AI/Action/actionPlayerLaunch.cpp +++ b/src/Game/AI/Action/actionPlayerLaunch.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerLaunch::PlayerLaunch(const InitArg& arg) : PlayerAction(arg) {} -PlayerLaunch::~PlayerLaunch() = default; - -bool PlayerLaunch::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerLaunch::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } diff --git a/src/Game/AI/Action/actionPlayerLaunch.h b/src/Game/AI/Action/actionPlayerLaunch.h index 2b7efa80..0f22ab1b 100644 --- a/src/Game/AI/Action/actionPlayerLaunch.h +++ b/src/Game/AI/Action/actionPlayerLaunch.h @@ -9,9 +9,7 @@ class PlayerLaunch : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerLaunch, PlayerAction) public: explicit PlayerLaunch(const InitArg& arg); - ~PlayerLaunch() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionPlayerLookAtObject.cpp b/src/Game/AI/Action/actionPlayerLookAtObject.cpp index d4585df3..5d8da5de 100644 --- a/src/Game/AI/Action/actionPlayerLookAtObject.cpp +++ b/src/Game/AI/Action/actionPlayerLookAtObject.cpp @@ -10,20 +10,8 @@ bool PlayerLookAtObject::init_(sead::Heap* heap) { return LookAtObjectBase::init_(heap); } -void PlayerLookAtObject::enter_(ksys::act::ai::InlineParamPack* params) { - LookAtObjectBase::enter_(params); -} - -void PlayerLookAtObject::leave_() { - LookAtObjectBase::leave_(); -} - void PlayerLookAtObject::loadParams_() { LookAtObjectBase::loadParams_(); } -void PlayerLookAtObject::calc_() { - LookAtObjectBase::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionPlayerLookAtObject.h b/src/Game/AI/Action/actionPlayerLookAtObject.h index ad6ceb34..bb860e45 100644 --- a/src/Game/AI/Action/actionPlayerLookAtObject.h +++ b/src/Game/AI/Action/actionPlayerLookAtObject.h @@ -12,12 +12,9 @@ public: ~PlayerLookAtObject() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionPlayerLookAtObjectNow.cpp b/src/Game/AI/Action/actionPlayerLookAtObjectNow.cpp index 804757fd..88aab9e6 100644 --- a/src/Game/AI/Action/actionPlayerLookAtObjectNow.cpp +++ b/src/Game/AI/Action/actionPlayerLookAtObjectNow.cpp @@ -10,20 +10,8 @@ bool PlayerLookAtObjectNow::init_(sead::Heap* heap) { return PlayerLookAtObject::init_(heap); } -void PlayerLookAtObjectNow::enter_(ksys::act::ai::InlineParamPack* params) { - PlayerLookAtObject::enter_(params); -} - -void PlayerLookAtObjectNow::leave_() { - PlayerLookAtObject::leave_(); -} - void PlayerLookAtObjectNow::loadParams_() { PlayerLookAtObject::loadParams_(); } -void PlayerLookAtObjectNow::calc_() { - PlayerLookAtObject::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionPlayerLookAtObjectNow.h b/src/Game/AI/Action/actionPlayerLookAtObjectNow.h index 3ee24f9d..032eceb5 100644 --- a/src/Game/AI/Action/actionPlayerLookAtObjectNow.h +++ b/src/Game/AI/Action/actionPlayerLookAtObjectNow.h @@ -12,12 +12,9 @@ public: ~PlayerLookAtObjectNow() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionPlayerLookAtTheFront.cpp b/src/Game/AI/Action/actionPlayerLookAtTheFront.cpp index b842871d..e085d524 100644 --- a/src/Game/AI/Action/actionPlayerLookAtTheFront.cpp +++ b/src/Game/AI/Action/actionPlayerLookAtTheFront.cpp @@ -10,20 +10,8 @@ bool PlayerLookAtTheFront::init_(sead::Heap* heap) { return PlayerAction::init_(heap); } -void PlayerLookAtTheFront::enter_(ksys::act::ai::InlineParamPack* params) { - PlayerAction::enter_(params); -} - -void PlayerLookAtTheFront::leave_() { - PlayerAction::leave_(); -} - void PlayerLookAtTheFront::loadParams_() { getDynamicParam(&mIsValid_d, "IsValid"); } -void PlayerLookAtTheFront::calc_() { - PlayerAction::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionPlayerLookAtTheFront.h b/src/Game/AI/Action/actionPlayerLookAtTheFront.h index 5905b0d9..6e9fa8c3 100644 --- a/src/Game/AI/Action/actionPlayerLookAtTheFront.h +++ b/src/Game/AI/Action/actionPlayerLookAtTheFront.h @@ -12,13 +12,9 @@ public: ~PlayerLookAtTheFront() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 bool* mIsValid_d{}; }; diff --git a/src/Game/AI/Action/actionPlayerMagnetSubject.cpp b/src/Game/AI/Action/actionPlayerMagnetSubject.cpp index 6740051c..7df541c5 100644 --- a/src/Game/AI/Action/actionPlayerMagnetSubject.cpp +++ b/src/Game/AI/Action/actionPlayerMagnetSubject.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerMagnetSubject::PlayerMagnetSubject(const InitArg& arg) : PlayerAction(arg) {} -PlayerMagnetSubject::~PlayerMagnetSubject() = default; - -bool PlayerMagnetSubject::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerMagnetSubject::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } diff --git a/src/Game/AI/Action/actionPlayerMagnetSubject.h b/src/Game/AI/Action/actionPlayerMagnetSubject.h index 7a53a6ee..a3fd82ff 100644 --- a/src/Game/AI/Action/actionPlayerMagnetSubject.h +++ b/src/Game/AI/Action/actionPlayerMagnetSubject.h @@ -9,9 +9,7 @@ class PlayerMagnetSubject : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerMagnetSubject, PlayerAction) public: explicit PlayerMagnetSubject(const InitArg& arg); - ~PlayerMagnetSubject() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionPlayerMasterSwordEquip.cpp b/src/Game/AI/Action/actionPlayerMasterSwordEquip.cpp index 4d23eb5e..d9fae587 100644 --- a/src/Game/AI/Action/actionPlayerMasterSwordEquip.cpp +++ b/src/Game/AI/Action/actionPlayerMasterSwordEquip.cpp @@ -10,18 +10,4 @@ bool PlayerMasterSwordEquip::init_(sead::Heap* heap) { return PlayerAction::init_(heap); } -void PlayerMasterSwordEquip::enter_(ksys::act::ai::InlineParamPack* params) { - PlayerAction::enter_(params); -} - -void PlayerMasterSwordEquip::leave_() { - PlayerAction::leave_(); -} - -void PlayerMasterSwordEquip::loadParams_() {} - -void PlayerMasterSwordEquip::calc_() { - PlayerAction::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionPlayerMasterSwordEquip.h b/src/Game/AI/Action/actionPlayerMasterSwordEquip.h index daa8881a..86ff451a 100644 --- a/src/Game/AI/Action/actionPlayerMasterSwordEquip.h +++ b/src/Game/AI/Action/actionPlayerMasterSwordEquip.h @@ -12,12 +12,8 @@ public: ~PlayerMasterSwordEquip() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionPlayerMiddleDamage.cpp b/src/Game/AI/Action/actionPlayerMiddleDamage.cpp index 75db0783..1270b6cc 100644 --- a/src/Game/AI/Action/actionPlayerMiddleDamage.cpp +++ b/src/Game/AI/Action/actionPlayerMiddleDamage.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerMiddleDamage::PlayerMiddleDamage(const InitArg& arg) : PlayerAction(arg) {} -PlayerMiddleDamage::~PlayerMiddleDamage() = default; - -bool PlayerMiddleDamage::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerMiddleDamage::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } diff --git a/src/Game/AI/Action/actionPlayerMiddleDamage.h b/src/Game/AI/Action/actionPlayerMiddleDamage.h index c221f03b..39d064ef 100644 --- a/src/Game/AI/Action/actionPlayerMiddleDamage.h +++ b/src/Game/AI/Action/actionPlayerMiddleDamage.h @@ -9,9 +9,7 @@ class PlayerMiddleDamage : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerMiddleDamage, PlayerAction) public: explicit PlayerMiddleDamage(const InitArg& arg); - ~PlayerMiddleDamage() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionPlayerMove.cpp b/src/Game/AI/Action/actionPlayerMove.cpp index 397a7612..5ad96a9a 100644 --- a/src/Game/AI/Action/actionPlayerMove.cpp +++ b/src/Game/AI/Action/actionPlayerMove.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerMove::PlayerMove(const InitArg& arg) : PlayerAction(arg) {} -PlayerMove::~PlayerMove() = default; - -bool PlayerMove::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerMove::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } diff --git a/src/Game/AI/Action/actionPlayerMove.h b/src/Game/AI/Action/actionPlayerMove.h index f4893313..76377e9c 100644 --- a/src/Game/AI/Action/actionPlayerMove.h +++ b/src/Game/AI/Action/actionPlayerMove.h @@ -9,9 +9,7 @@ class PlayerMove : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerMove, PlayerAction) public: explicit PlayerMove(const InitArg& arg); - ~PlayerMove() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionPlayerNavMeshMove.cpp b/src/Game/AI/Action/actionPlayerNavMeshMove.cpp index 92f5b876..e3e0d756 100644 --- a/src/Game/AI/Action/actionPlayerNavMeshMove.cpp +++ b/src/Game/AI/Action/actionPlayerNavMeshMove.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerNavMeshMove::PlayerNavMeshMove(const InitArg& arg) : PlayerGuidedMove(arg) {} -PlayerNavMeshMove::~PlayerNavMeshMove() = default; - -bool PlayerNavMeshMove::init_(sead::Heap* heap) { - return PlayerGuidedMove::init_(heap); -} - void PlayerNavMeshMove::enter_(ksys::act::ai::InlineParamPack* params) { PlayerGuidedMove::enter_(params); } diff --git a/src/Game/AI/Action/actionPlayerNavMeshMove.h b/src/Game/AI/Action/actionPlayerNavMeshMove.h index 46235a63..2702eae2 100644 --- a/src/Game/AI/Action/actionPlayerNavMeshMove.h +++ b/src/Game/AI/Action/actionPlayerNavMeshMove.h @@ -9,9 +9,7 @@ class PlayerNavMeshMove : public PlayerGuidedMove { SEAD_RTTI_OVERRIDE(PlayerNavMeshMove, PlayerGuidedMove) public: explicit PlayerNavMeshMove(const InitArg& arg); - ~PlayerNavMeshMove() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionPlayerParashawlGlide.cpp b/src/Game/AI/Action/actionPlayerParashawlGlide.cpp index 9bdd8f51..17b82e4b 100644 --- a/src/Game/AI/Action/actionPlayerParashawlGlide.cpp +++ b/src/Game/AI/Action/actionPlayerParashawlGlide.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerParashawlGlide::PlayerParashawlGlide(const InitArg& arg) : PlayerGlide(arg) {} -PlayerParashawlGlide::~PlayerParashawlGlide() = default; - -bool PlayerParashawlGlide::init_(sead::Heap* heap) { - return PlayerGlide::init_(heap); -} - void PlayerParashawlGlide::enter_(ksys::act::ai::InlineParamPack* params) { PlayerGlide::enter_(params); } diff --git a/src/Game/AI/Action/actionPlayerParashawlGlide.h b/src/Game/AI/Action/actionPlayerParashawlGlide.h index 3a286d9e..18e5b57e 100644 --- a/src/Game/AI/Action/actionPlayerParashawlGlide.h +++ b/src/Game/AI/Action/actionPlayerParashawlGlide.h @@ -9,9 +9,7 @@ class PlayerParashawlGlide : public PlayerGlide { SEAD_RTTI_OVERRIDE(PlayerParashawlGlide, PlayerGlide) public: explicit PlayerParashawlGlide(const InitArg& arg); - ~PlayerParashawlGlide() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionPlayerPickUp.cpp b/src/Game/AI/Action/actionPlayerPickUp.cpp index fb0478cf..861652d8 100644 --- a/src/Game/AI/Action/actionPlayerPickUp.cpp +++ b/src/Game/AI/Action/actionPlayerPickUp.cpp @@ -18,8 +18,6 @@ void PlayerPickUp::leave_() { PlayerAction::leave_(); } -void PlayerPickUp::loadParams_() {} - void PlayerPickUp::calc_() { PlayerAction::calc_(); } diff --git a/src/Game/AI/Action/actionPlayerPickUp.h b/src/Game/AI/Action/actionPlayerPickUp.h index 2fa455a5..e2b30bb6 100644 --- a/src/Game/AI/Action/actionPlayerPickUp.h +++ b/src/Game/AI/Action/actionPlayerPickUp.h @@ -14,7 +14,6 @@ public: bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; - void loadParams_() override; protected: void calc_() override; diff --git a/src/Game/AI/Action/actionPlayerPlayASAdapt.cpp b/src/Game/AI/Action/actionPlayerPlayASAdapt.cpp index a0db62d1..9b5eb586 100644 --- a/src/Game/AI/Action/actionPlayerPlayASAdapt.cpp +++ b/src/Game/AI/Action/actionPlayerPlayASAdapt.cpp @@ -6,10 +6,6 @@ PlayerPlayASAdapt::PlayerPlayASAdapt(const InitArg& arg) : PlayASForDemo(arg) {} PlayerPlayASAdapt::~PlayerPlayASAdapt() = default; -bool PlayerPlayASAdapt::init_(sead::Heap* heap) { - return PlayASForDemo::init_(heap); -} - void PlayerPlayASAdapt::enter_(ksys::act::ai::InlineParamPack* params) { PlayASForDemo::enter_(params); } diff --git a/src/Game/AI/Action/actionPlayerPlayASAdapt.h b/src/Game/AI/Action/actionPlayerPlayASAdapt.h index b6b23144..270c240c 100644 --- a/src/Game/AI/Action/actionPlayerPlayASAdapt.h +++ b/src/Game/AI/Action/actionPlayerPlayASAdapt.h @@ -11,7 +11,6 @@ public: explicit PlayerPlayASAdapt(const InitArg& arg); ~PlayerPlayASAdapt() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionPlayerPullSword.cpp b/src/Game/AI/Action/actionPlayerPullSword.cpp index 3b407a55..4760b2d3 100644 --- a/src/Game/AI/Action/actionPlayerPullSword.cpp +++ b/src/Game/AI/Action/actionPlayerPullSword.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerPullSword::PlayerPullSword(const InitArg& arg) : PlayerAction(arg) {} -PlayerPullSword::~PlayerPullSword() = default; - -bool PlayerPullSword::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerPullSword::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } diff --git a/src/Game/AI/Action/actionPlayerPullSword.h b/src/Game/AI/Action/actionPlayerPullSword.h index e4cda1ac..fffc9359 100644 --- a/src/Game/AI/Action/actionPlayerPullSword.h +++ b/src/Game/AI/Action/actionPlayerPullSword.h @@ -9,9 +9,7 @@ class PlayerPullSword : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerPullSword, PlayerAction) public: explicit PlayerPullSword(const InitArg& arg); - ~PlayerPullSword() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionPlayerPullSwordFirstFail.cpp b/src/Game/AI/Action/actionPlayerPullSwordFirstFail.cpp index d81daac2..5ed8a4e4 100644 --- a/src/Game/AI/Action/actionPlayerPullSwordFirstFail.cpp +++ b/src/Game/AI/Action/actionPlayerPullSwordFirstFail.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerPullSwordFirstFail::PlayerPullSwordFirstFail(const InitArg& arg) : PlayerAction(arg) {} -PlayerPullSwordFirstFail::~PlayerPullSwordFirstFail() = default; - -bool PlayerPullSwordFirstFail::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerPullSwordFirstFail::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } diff --git a/src/Game/AI/Action/actionPlayerPullSwordFirstFail.h b/src/Game/AI/Action/actionPlayerPullSwordFirstFail.h index b01fee9c..16e76a7c 100644 --- a/src/Game/AI/Action/actionPlayerPullSwordFirstFail.h +++ b/src/Game/AI/Action/actionPlayerPullSwordFirstFail.h @@ -9,9 +9,7 @@ class PlayerPullSwordFirstFail : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerPullSwordFirstFail, PlayerAction) public: explicit PlayerPullSwordFirstFail(const InitArg& arg); - ~PlayerPullSwordFirstFail() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionPlayerRailMove.cpp b/src/Game/AI/Action/actionPlayerRailMove.cpp index 246021e3..a9df9a43 100644 --- a/src/Game/AI/Action/actionPlayerRailMove.cpp +++ b/src/Game/AI/Action/actionPlayerRailMove.cpp @@ -6,10 +6,6 @@ PlayerRailMove::PlayerRailMove(const InitArg& arg) : PlayerGuidedMove(arg) {} PlayerRailMove::~PlayerRailMove() = default; -bool PlayerRailMove::init_(sead::Heap* heap) { - return PlayerGuidedMove::init_(heap); -} - void PlayerRailMove::enter_(ksys::act::ai::InlineParamPack* params) { PlayerGuidedMove::enter_(params); } diff --git a/src/Game/AI/Action/actionPlayerRailMove.h b/src/Game/AI/Action/actionPlayerRailMove.h index 1da1f14d..454bec67 100644 --- a/src/Game/AI/Action/actionPlayerRailMove.h +++ b/src/Game/AI/Action/actionPlayerRailMove.h @@ -11,7 +11,6 @@ public: explicit PlayerRailMove(const InitArg& arg); ~PlayerRailMove() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionPlayerReleaseMasterSowrd.cpp b/src/Game/AI/Action/actionPlayerReleaseMasterSowrd.cpp index e326f8f2..69659f08 100644 --- a/src/Game/AI/Action/actionPlayerReleaseMasterSowrd.cpp +++ b/src/Game/AI/Action/actionPlayerReleaseMasterSowrd.cpp @@ -11,18 +11,6 @@ bool PlayerReleaseMasterSowrd::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void PlayerReleaseMasterSowrd::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void PlayerReleaseMasterSowrd::leave_() { - ksys::act::ai::Action::leave_(); -} - void PlayerReleaseMasterSowrd::loadParams_() {} -void PlayerReleaseMasterSowrd::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionPlayerReleaseMasterSowrd.h b/src/Game/AI/Action/actionPlayerReleaseMasterSowrd.h index 72e8889d..27bbdd81 100644 --- a/src/Game/AI/Action/actionPlayerReleaseMasterSowrd.h +++ b/src/Game/AI/Action/actionPlayerReleaseMasterSowrd.h @@ -11,12 +11,9 @@ public: ~PlayerReleaseMasterSowrd() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionPlayerRemainsBlow.cpp b/src/Game/AI/Action/actionPlayerRemainsBlow.cpp index ecec10e2..3cd09c13 100644 --- a/src/Game/AI/Action/actionPlayerRemainsBlow.cpp +++ b/src/Game/AI/Action/actionPlayerRemainsBlow.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerRemainsBlow::PlayerRemainsBlow(const InitArg& arg) : PlayerAction(arg) {} -PlayerRemainsBlow::~PlayerRemainsBlow() = default; - -bool PlayerRemainsBlow::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerRemainsBlow::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } diff --git a/src/Game/AI/Action/actionPlayerRemainsBlow.h b/src/Game/AI/Action/actionPlayerRemainsBlow.h index 6d987710..968a8036 100644 --- a/src/Game/AI/Action/actionPlayerRemainsBlow.h +++ b/src/Game/AI/Action/actionPlayerRemainsBlow.h @@ -9,9 +9,7 @@ class PlayerRemainsBlow : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerRemainsBlow, PlayerAction) public: explicit PlayerRemainsBlow(const InitArg& arg); - ~PlayerRemainsBlow() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionPlayerRequestRecreateDyeArmor.cpp b/src/Game/AI/Action/actionPlayerRequestRecreateDyeArmor.cpp index 5791b83d..94937ceb 100644 --- a/src/Game/AI/Action/actionPlayerRequestRecreateDyeArmor.cpp +++ b/src/Game/AI/Action/actionPlayerRequestRecreateDyeArmor.cpp @@ -11,18 +11,6 @@ bool PlayerRequestRecreateDyeArmor::init_(sead::Heap* heap) { return PlayerAction::init_(heap); } -void PlayerRequestRecreateDyeArmor::enter_(ksys::act::ai::InlineParamPack* params) { - PlayerAction::enter_(params); -} - -void PlayerRequestRecreateDyeArmor::leave_() { - PlayerAction::leave_(); -} - void PlayerRequestRecreateDyeArmor::loadParams_() {} -void PlayerRequestRecreateDyeArmor::calc_() { - PlayerAction::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionPlayerRequestRecreateDyeArmor.h b/src/Game/AI/Action/actionPlayerRequestRecreateDyeArmor.h index 8be5844c..f7733a30 100644 --- a/src/Game/AI/Action/actionPlayerRequestRecreateDyeArmor.h +++ b/src/Game/AI/Action/actionPlayerRequestRecreateDyeArmor.h @@ -12,12 +12,9 @@ public: ~PlayerRequestRecreateDyeArmor() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionPlayerRideJump.cpp b/src/Game/AI/Action/actionPlayerRideJump.cpp index 45c312f5..180402fd 100644 --- a/src/Game/AI/Action/actionPlayerRideJump.cpp +++ b/src/Game/AI/Action/actionPlayerRideJump.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerRideJump::PlayerRideJump(const InitArg& arg) : PlayerAction(arg) {} -PlayerRideJump::~PlayerRideJump() = default; - -bool PlayerRideJump::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerRideJump::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } diff --git a/src/Game/AI/Action/actionPlayerRideJump.h b/src/Game/AI/Action/actionPlayerRideJump.h index d42ed832..63ef6395 100644 --- a/src/Game/AI/Action/actionPlayerRideJump.h +++ b/src/Game/AI/Action/actionPlayerRideJump.h @@ -9,9 +9,7 @@ class PlayerRideJump : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerRideJump, PlayerAction) public: explicit PlayerRideJump(const InitArg& arg); - ~PlayerRideJump() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionPlayerSelfCamera.cpp b/src/Game/AI/Action/actionPlayerSelfCamera.cpp index 442a7c5c..d441a9ed 100644 --- a/src/Game/AI/Action/actionPlayerSelfCamera.cpp +++ b/src/Game/AI/Action/actionPlayerSelfCamera.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerSelfCamera::PlayerSelfCamera(const InitArg& arg) : PlayerAction(arg) {} -PlayerSelfCamera::~PlayerSelfCamera() = default; - -bool PlayerSelfCamera::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerSelfCamera::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } @@ -18,8 +12,6 @@ void PlayerSelfCamera::leave_() { PlayerAction::leave_(); } -void PlayerSelfCamera::loadParams_() {} - void PlayerSelfCamera::calc_() { PlayerAction::calc_(); } diff --git a/src/Game/AI/Action/actionPlayerSelfCamera.h b/src/Game/AI/Action/actionPlayerSelfCamera.h index 6c409596..e3a5071e 100644 --- a/src/Game/AI/Action/actionPlayerSelfCamera.h +++ b/src/Game/AI/Action/actionPlayerSelfCamera.h @@ -9,12 +9,9 @@ class PlayerSelfCamera : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerSelfCamera, PlayerAction) public: explicit PlayerSelfCamera(const InitArg& arg); - ~PlayerSelfCamera() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; - void loadParams_() override; protected: void calc_() override; diff --git a/src/Game/AI/Action/actionPlayerSetVisibleWeapon.cpp b/src/Game/AI/Action/actionPlayerSetVisibleWeapon.cpp index d96206a5..63618ada 100644 --- a/src/Game/AI/Action/actionPlayerSetVisibleWeapon.cpp +++ b/src/Game/AI/Action/actionPlayerSetVisibleWeapon.cpp @@ -10,20 +10,8 @@ bool PlayerSetVisibleWeapon::init_(sead::Heap* heap) { return PlayerAction::init_(heap); } -void PlayerSetVisibleWeapon::enter_(ksys::act::ai::InlineParamPack* params) { - PlayerAction::enter_(params); -} - -void PlayerSetVisibleWeapon::leave_() { - PlayerAction::leave_(); -} - void PlayerSetVisibleWeapon::loadParams_() { getDynamicParam(&mSetVisible_d, "SetVisible"); } -void PlayerSetVisibleWeapon::calc_() { - PlayerAction::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionPlayerSetVisibleWeapon.h b/src/Game/AI/Action/actionPlayerSetVisibleWeapon.h index 73f8478b..6f71d499 100644 --- a/src/Game/AI/Action/actionPlayerSetVisibleWeapon.h +++ b/src/Game/AI/Action/actionPlayerSetVisibleWeapon.h @@ -12,13 +12,9 @@ public: ~PlayerSetVisibleWeapon() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 bool* mSetVisible_d{}; }; diff --git a/src/Game/AI/Action/actionPlayerSetWakeUpMtx.cpp b/src/Game/AI/Action/actionPlayerSetWakeUpMtx.cpp index ae241e7b..b9a6a8e5 100644 --- a/src/Game/AI/Action/actionPlayerSetWakeUpMtx.cpp +++ b/src/Game/AI/Action/actionPlayerSetWakeUpMtx.cpp @@ -10,18 +10,6 @@ bool PlayerSetWakeUpMtx::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void PlayerSetWakeUpMtx::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void PlayerSetWakeUpMtx::leave_() { - ksys::act::ai::Action::leave_(); -} - void PlayerSetWakeUpMtx::loadParams_() {} -void PlayerSetWakeUpMtx::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionPlayerSetWakeUpMtx.h b/src/Game/AI/Action/actionPlayerSetWakeUpMtx.h index c3dd06dd..df12e6c3 100644 --- a/src/Game/AI/Action/actionPlayerSetWakeUpMtx.h +++ b/src/Game/AI/Action/actionPlayerSetWakeUpMtx.h @@ -11,12 +11,9 @@ public: ~PlayerSetWakeUpMtx() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionPlayerShieldRideMove.cpp b/src/Game/AI/Action/actionPlayerShieldRideMove.cpp index 4791c0a2..6ccc8f3b 100644 --- a/src/Game/AI/Action/actionPlayerShieldRideMove.cpp +++ b/src/Game/AI/Action/actionPlayerShieldRideMove.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerShieldRideMove::PlayerShieldRideMove(const InitArg& arg) : PlayerAction(arg) {} -PlayerShieldRideMove::~PlayerShieldRideMove() = default; - -bool PlayerShieldRideMove::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerShieldRideMove::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } diff --git a/src/Game/AI/Action/actionPlayerShieldRideMove.h b/src/Game/AI/Action/actionPlayerShieldRideMove.h index a7075b0c..84add835 100644 --- a/src/Game/AI/Action/actionPlayerShieldRideMove.h +++ b/src/Game/AI/Action/actionPlayerShieldRideMove.h @@ -9,9 +9,7 @@ class PlayerShieldRideMove : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerShieldRideMove, PlayerAction) public: explicit PlayerShieldRideMove(const InitArg& arg); - ~PlayerShieldRideMove() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionPlayerShock.cpp b/src/Game/AI/Action/actionPlayerShock.cpp index 5c00738d..9dda3bb4 100644 --- a/src/Game/AI/Action/actionPlayerShock.cpp +++ b/src/Game/AI/Action/actionPlayerShock.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerShock::PlayerShock(const InitArg& arg) : PlayerAction(arg) {} -PlayerShock::~PlayerShock() = default; - -bool PlayerShock::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerShock::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } @@ -18,8 +12,6 @@ void PlayerShock::leave_() { PlayerAction::leave_(); } -void PlayerShock::loadParams_() {} - void PlayerShock::calc_() { PlayerAction::calc_(); } diff --git a/src/Game/AI/Action/actionPlayerShock.h b/src/Game/AI/Action/actionPlayerShock.h index 91bf1506..c40b8dac 100644 --- a/src/Game/AI/Action/actionPlayerShock.h +++ b/src/Game/AI/Action/actionPlayerShock.h @@ -9,12 +9,9 @@ class PlayerShock : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerShock, PlayerAction) public: explicit PlayerShock(const InitArg& arg); - ~PlayerShock() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; - void loadParams_() override; protected: void calc_() override; diff --git a/src/Game/AI/Action/actionPlayerSideStep.cpp b/src/Game/AI/Action/actionPlayerSideStep.cpp index 7260cd7e..ca5092e9 100644 --- a/src/Game/AI/Action/actionPlayerSideStep.cpp +++ b/src/Game/AI/Action/actionPlayerSideStep.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerSideStep::PlayerSideStep(const InitArg& arg) : PlayerAction(arg) {} -PlayerSideStep::~PlayerSideStep() = default; - -bool PlayerSideStep::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerSideStep::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } diff --git a/src/Game/AI/Action/actionPlayerSideStep.h b/src/Game/AI/Action/actionPlayerSideStep.h index f94f6a0c..c05ad0c0 100644 --- a/src/Game/AI/Action/actionPlayerSideStep.h +++ b/src/Game/AI/Action/actionPlayerSideStep.h @@ -9,9 +9,7 @@ class PlayerSideStep : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerSideStep, PlayerAction) public: explicit PlayerSideStep(const InitArg& arg); - ~PlayerSideStep() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionPlayerSideStepLand.cpp b/src/Game/AI/Action/actionPlayerSideStepLand.cpp index bb8e5682..f9527fb0 100644 --- a/src/Game/AI/Action/actionPlayerSideStepLand.cpp +++ b/src/Game/AI/Action/actionPlayerSideStepLand.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerSideStepLand::PlayerSideStepLand(const InitArg& arg) : PlayerAction(arg) {} -PlayerSideStepLand::~PlayerSideStepLand() = default; - -bool PlayerSideStepLand::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerSideStepLand::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } @@ -18,8 +12,6 @@ void PlayerSideStepLand::leave_() { PlayerAction::leave_(); } -void PlayerSideStepLand::loadParams_() {} - void PlayerSideStepLand::calc_() { PlayerAction::calc_(); } diff --git a/src/Game/AI/Action/actionPlayerSideStepLand.h b/src/Game/AI/Action/actionPlayerSideStepLand.h index 0a89c238..05244499 100644 --- a/src/Game/AI/Action/actionPlayerSideStepLand.h +++ b/src/Game/AI/Action/actionPlayerSideStepLand.h @@ -9,12 +9,9 @@ class PlayerSideStepLand : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerSideStepLand, PlayerAction) public: explicit PlayerSideStepLand(const InitArg& arg); - ~PlayerSideStepLand() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; - void loadParams_() override; protected: void calc_() override; diff --git a/src/Game/AI/Action/actionPlayerSitEnd.cpp b/src/Game/AI/Action/actionPlayerSitEnd.cpp index f4147fd1..b77f676d 100644 --- a/src/Game/AI/Action/actionPlayerSitEnd.cpp +++ b/src/Game/AI/Action/actionPlayerSitEnd.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerSitEnd::PlayerSitEnd(const InitArg& arg) : PlayerAction(arg) {} -PlayerSitEnd::~PlayerSitEnd() = default; - -bool PlayerSitEnd::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerSitEnd::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } @@ -18,8 +12,6 @@ void PlayerSitEnd::leave_() { PlayerAction::leave_(); } -void PlayerSitEnd::loadParams_() {} - void PlayerSitEnd::calc_() { PlayerAction::calc_(); } diff --git a/src/Game/AI/Action/actionPlayerSitEnd.h b/src/Game/AI/Action/actionPlayerSitEnd.h index 06cad5a6..a75c3e8a 100644 --- a/src/Game/AI/Action/actionPlayerSitEnd.h +++ b/src/Game/AI/Action/actionPlayerSitEnd.h @@ -9,12 +9,9 @@ class PlayerSitEnd : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerSitEnd, PlayerAction) public: explicit PlayerSitEnd(const InitArg& arg); - ~PlayerSitEnd() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; - void loadParams_() override; protected: void calc_() override; diff --git a/src/Game/AI/Action/actionPlayerSitStart.cpp b/src/Game/AI/Action/actionPlayerSitStart.cpp index 33d14a29..8a435d93 100644 --- a/src/Game/AI/Action/actionPlayerSitStart.cpp +++ b/src/Game/AI/Action/actionPlayerSitStart.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerSitStart::PlayerSitStart(const InitArg& arg) : PlayerAction(arg) {} -PlayerSitStart::~PlayerSitStart() = default; - -bool PlayerSitStart::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerSitStart::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } @@ -18,8 +12,6 @@ void PlayerSitStart::leave_() { PlayerAction::leave_(); } -void PlayerSitStart::loadParams_() {} - void PlayerSitStart::calc_() { PlayerAction::calc_(); } diff --git a/src/Game/AI/Action/actionPlayerSitStart.h b/src/Game/AI/Action/actionPlayerSitStart.h index 5a8ed400..da3efc22 100644 --- a/src/Game/AI/Action/actionPlayerSitStart.h +++ b/src/Game/AI/Action/actionPlayerSitStart.h @@ -9,12 +9,9 @@ class PlayerSitStart : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerSitStart, PlayerAction) public: explicit PlayerSitStart(const InitArg& arg); - ~PlayerSitStart() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; - void loadParams_() override; protected: void calc_() override; diff --git a/src/Game/AI/Action/actionPlayerSitWait.cpp b/src/Game/AI/Action/actionPlayerSitWait.cpp index 0292d7c9..03e0e7c8 100644 --- a/src/Game/AI/Action/actionPlayerSitWait.cpp +++ b/src/Game/AI/Action/actionPlayerSitWait.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerSitWait::PlayerSitWait(const InitArg& arg) : PlayerAction(arg) {} -PlayerSitWait::~PlayerSitWait() = default; - -bool PlayerSitWait::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerSitWait::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } diff --git a/src/Game/AI/Action/actionPlayerSitWait.h b/src/Game/AI/Action/actionPlayerSitWait.h index b6a761c0..3dd58686 100644 --- a/src/Game/AI/Action/actionPlayerSitWait.h +++ b/src/Game/AI/Action/actionPlayerSitWait.h @@ -9,9 +9,7 @@ class PlayerSitWait : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerSitWait, PlayerAction) public: explicit PlayerSitWait(const InitArg& arg); - ~PlayerSitWait() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionPlayerSkin.cpp b/src/Game/AI/Action/actionPlayerSkin.cpp index 2aaffd56..f0c94f51 100644 --- a/src/Game/AI/Action/actionPlayerSkin.cpp +++ b/src/Game/AI/Action/actionPlayerSkin.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerSkin::PlayerSkin(const InitArg& arg) : PlayerAction(arg) {} -PlayerSkin::~PlayerSkin() = default; - -bool PlayerSkin::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerSkin::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } diff --git a/src/Game/AI/Action/actionPlayerSkin.h b/src/Game/AI/Action/actionPlayerSkin.h index ee27ff7f..07485989 100644 --- a/src/Game/AI/Action/actionPlayerSkin.h +++ b/src/Game/AI/Action/actionPlayerSkin.h @@ -9,9 +9,7 @@ class PlayerSkin : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerSkin, PlayerAction) public: explicit PlayerSkin(const InitArg& arg); - ~PlayerSkin() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionPlayerSleep.cpp b/src/Game/AI/Action/actionPlayerSleep.cpp index 14211c1f..7d855332 100644 --- a/src/Game/AI/Action/actionPlayerSleep.cpp +++ b/src/Game/AI/Action/actionPlayerSleep.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerSleep::PlayerSleep(const InitArg& arg) : PlayerAction(arg) {} -PlayerSleep::~PlayerSleep() = default; - -bool PlayerSleep::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerSleep::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } @@ -18,8 +12,6 @@ void PlayerSleep::leave_() { PlayerAction::leave_(); } -void PlayerSleep::loadParams_() {} - void PlayerSleep::calc_() { PlayerAction::calc_(); } diff --git a/src/Game/AI/Action/actionPlayerSleep.h b/src/Game/AI/Action/actionPlayerSleep.h index b033c318..949486a4 100644 --- a/src/Game/AI/Action/actionPlayerSleep.h +++ b/src/Game/AI/Action/actionPlayerSleep.h @@ -9,12 +9,9 @@ class PlayerSleep : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerSleep, PlayerAction) public: explicit PlayerSleep(const InitArg& arg); - ~PlayerSleep() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; - void loadParams_() override; protected: void calc_() override; diff --git a/src/Game/AI/Action/actionPlayerSlide.cpp b/src/Game/AI/Action/actionPlayerSlide.cpp index ffe9a41e..1b09dc57 100644 --- a/src/Game/AI/Action/actionPlayerSlide.cpp +++ b/src/Game/AI/Action/actionPlayerSlide.cpp @@ -6,10 +6,6 @@ PlayerSlide::PlayerSlide(const InitArg& arg) : PlayerAction(arg) {} PlayerSlide::~PlayerSlide() = default; -bool PlayerSlide::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerSlide::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } diff --git a/src/Game/AI/Action/actionPlayerSlide.h b/src/Game/AI/Action/actionPlayerSlide.h index 3cff8be0..53d0ed67 100644 --- a/src/Game/AI/Action/actionPlayerSlide.h +++ b/src/Game/AI/Action/actionPlayerSlide.h @@ -11,7 +11,6 @@ public: explicit PlayerSlide(const InitArg& arg); ~PlayerSlide() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionPlayerSlideLand.cpp b/src/Game/AI/Action/actionPlayerSlideLand.cpp index e576f5e6..7a89e597 100644 --- a/src/Game/AI/Action/actionPlayerSlideLand.cpp +++ b/src/Game/AI/Action/actionPlayerSlideLand.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerSlideLand::PlayerSlideLand(const InitArg& arg) : PlayerAction(arg) {} -PlayerSlideLand::~PlayerSlideLand() = default; - -bool PlayerSlideLand::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerSlideLand::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } @@ -18,8 +12,6 @@ void PlayerSlideLand::leave_() { PlayerAction::leave_(); } -void PlayerSlideLand::loadParams_() {} - void PlayerSlideLand::calc_() { PlayerAction::calc_(); } diff --git a/src/Game/AI/Action/actionPlayerSlideLand.h b/src/Game/AI/Action/actionPlayerSlideLand.h index d9c60d22..9907940e 100644 --- a/src/Game/AI/Action/actionPlayerSlideLand.h +++ b/src/Game/AI/Action/actionPlayerSlideLand.h @@ -9,12 +9,9 @@ class PlayerSlideLand : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerSlideLand, PlayerAction) public: explicit PlayerSlideLand(const InitArg& arg); - ~PlayerSlideLand() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; - void loadParams_() override; protected: void calc_() override; diff --git a/src/Game/AI/Action/actionPlayerSpAttack.cpp b/src/Game/AI/Action/actionPlayerSpAttack.cpp index 57cd3883..c4af03f7 100644 --- a/src/Game/AI/Action/actionPlayerSpAttack.cpp +++ b/src/Game/AI/Action/actionPlayerSpAttack.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerSpAttack::PlayerSpAttack(const InitArg& arg) : PlayerAction(arg) {} -PlayerSpAttack::~PlayerSpAttack() = default; - -bool PlayerSpAttack::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerSpAttack::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } diff --git a/src/Game/AI/Action/actionPlayerSpAttack.h b/src/Game/AI/Action/actionPlayerSpAttack.h index d55a043e..35fecba1 100644 --- a/src/Game/AI/Action/actionPlayerSpAttack.h +++ b/src/Game/AI/Action/actionPlayerSpAttack.h @@ -9,9 +9,7 @@ class PlayerSpAttack : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerSpAttack, PlayerAction) public: explicit PlayerSpAttack(const InitArg& arg); - ~PlayerSpAttack() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionPlayerSquatDamage.cpp b/src/Game/AI/Action/actionPlayerSquatDamage.cpp index d146360a..265bdaad 100644 --- a/src/Game/AI/Action/actionPlayerSquatDamage.cpp +++ b/src/Game/AI/Action/actionPlayerSquatDamage.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerSquatDamage::PlayerSquatDamage(const InitArg& arg) : PlayerAction(arg) {} -PlayerSquatDamage::~PlayerSquatDamage() = default; - -bool PlayerSquatDamage::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerSquatDamage::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } @@ -18,8 +12,6 @@ void PlayerSquatDamage::leave_() { PlayerAction::leave_(); } -void PlayerSquatDamage::loadParams_() {} - void PlayerSquatDamage::calc_() { PlayerAction::calc_(); } diff --git a/src/Game/AI/Action/actionPlayerSquatDamage.h b/src/Game/AI/Action/actionPlayerSquatDamage.h index f1d841f7..c10bc959 100644 --- a/src/Game/AI/Action/actionPlayerSquatDamage.h +++ b/src/Game/AI/Action/actionPlayerSquatDamage.h @@ -9,12 +9,9 @@ class PlayerSquatDamage : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerSquatDamage, PlayerAction) public: explicit PlayerSquatDamage(const InitArg& arg); - ~PlayerSquatDamage() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; - void loadParams_() override; protected: void calc_() override; diff --git a/src/Game/AI/Action/actionPlayerSquatMove.cpp b/src/Game/AI/Action/actionPlayerSquatMove.cpp index ccd6c9c0..b5fc7986 100644 --- a/src/Game/AI/Action/actionPlayerSquatMove.cpp +++ b/src/Game/AI/Action/actionPlayerSquatMove.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerSquatMove::PlayerSquatMove(const InitArg& arg) : PlayerAction(arg) {} -PlayerSquatMove::~PlayerSquatMove() = default; - -bool PlayerSquatMove::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerSquatMove::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } @@ -18,8 +12,6 @@ void PlayerSquatMove::leave_() { PlayerAction::leave_(); } -void PlayerSquatMove::loadParams_() {} - void PlayerSquatMove::calc_() { PlayerAction::calc_(); } diff --git a/src/Game/AI/Action/actionPlayerSquatMove.h b/src/Game/AI/Action/actionPlayerSquatMove.h index c7e181d1..aac005a1 100644 --- a/src/Game/AI/Action/actionPlayerSquatMove.h +++ b/src/Game/AI/Action/actionPlayerSquatMove.h @@ -9,12 +9,9 @@ class PlayerSquatMove : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerSquatMove, PlayerAction) public: explicit PlayerSquatMove(const InitArg& arg); - ~PlayerSquatMove() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; - void loadParams_() override; protected: void calc_() override; diff --git a/src/Game/AI/Action/actionPlayerSquatWait.cpp b/src/Game/AI/Action/actionPlayerSquatWait.cpp index a98d390f..0649e039 100644 --- a/src/Game/AI/Action/actionPlayerSquatWait.cpp +++ b/src/Game/AI/Action/actionPlayerSquatWait.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerSquatWait::PlayerSquatWait(const InitArg& arg) : PlayerAction(arg) {} -PlayerSquatWait::~PlayerSquatWait() = default; - -bool PlayerSquatWait::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerSquatWait::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } diff --git a/src/Game/AI/Action/actionPlayerSquatWait.h b/src/Game/AI/Action/actionPlayerSquatWait.h index 4e20595d..00764805 100644 --- a/src/Game/AI/Action/actionPlayerSquatWait.h +++ b/src/Game/AI/Action/actionPlayerSquatWait.h @@ -9,9 +9,7 @@ class PlayerSquatWait : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerSquatWait, PlayerAction) public: explicit PlayerSquatWait(const InitArg& arg); - ~PlayerSquatWait() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionPlayerStainCarryWait.cpp b/src/Game/AI/Action/actionPlayerStainCarryWait.cpp index e26aaf79..639a5260 100644 --- a/src/Game/AI/Action/actionPlayerStainCarryWait.cpp +++ b/src/Game/AI/Action/actionPlayerStainCarryWait.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerStainCarryWait::PlayerStainCarryWait(const InitArg& arg) : PlayerAction(arg) {} -PlayerStainCarryWait::~PlayerStainCarryWait() = default; - -bool PlayerStainCarryWait::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerStainCarryWait::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } @@ -18,8 +12,6 @@ void PlayerStainCarryWait::leave_() { PlayerAction::leave_(); } -void PlayerStainCarryWait::loadParams_() {} - void PlayerStainCarryWait::calc_() { PlayerAction::calc_(); } diff --git a/src/Game/AI/Action/actionPlayerStainCarryWait.h b/src/Game/AI/Action/actionPlayerStainCarryWait.h index 35e411d1..bb9d8d9b 100644 --- a/src/Game/AI/Action/actionPlayerStainCarryWait.h +++ b/src/Game/AI/Action/actionPlayerStainCarryWait.h @@ -9,12 +9,9 @@ class PlayerStainCarryWait : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerStainCarryWait, PlayerAction) public: explicit PlayerStainCarryWait(const InitArg& arg); - ~PlayerStainCarryWait() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; - void loadParams_() override; protected: void calc_() override; diff --git a/src/Game/AI/Action/actionPlayerStainWait.cpp b/src/Game/AI/Action/actionPlayerStainWait.cpp index 5d106ffb..c3e356fa 100644 --- a/src/Game/AI/Action/actionPlayerStainWait.cpp +++ b/src/Game/AI/Action/actionPlayerStainWait.cpp @@ -18,8 +18,6 @@ void PlayerStainWait::leave_() { PlayerAction::leave_(); } -void PlayerStainWait::loadParams_() {} - void PlayerStainWait::calc_() { PlayerAction::calc_(); } diff --git a/src/Game/AI/Action/actionPlayerStainWait.h b/src/Game/AI/Action/actionPlayerStainWait.h index 74f17b95..f4c68ca4 100644 --- a/src/Game/AI/Action/actionPlayerStainWait.h +++ b/src/Game/AI/Action/actionPlayerStainWait.h @@ -14,7 +14,6 @@ public: bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; - void loadParams_() override; protected: void calc_() override; diff --git a/src/Game/AI/Action/actionPlayerStepAttack.cpp b/src/Game/AI/Action/actionPlayerStepAttack.cpp index 6f84abe4..1464a729 100644 --- a/src/Game/AI/Action/actionPlayerStepAttack.cpp +++ b/src/Game/AI/Action/actionPlayerStepAttack.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerStepAttack::PlayerStepAttack(const InitArg& arg) : PlayerAction(arg) {} -PlayerStepAttack::~PlayerStepAttack() = default; - -bool PlayerStepAttack::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerStepAttack::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } diff --git a/src/Game/AI/Action/actionPlayerStepAttack.h b/src/Game/AI/Action/actionPlayerStepAttack.h index 3056f95c..ed46ce85 100644 --- a/src/Game/AI/Action/actionPlayerStepAttack.h +++ b/src/Game/AI/Action/actionPlayerStepAttack.h @@ -9,9 +9,7 @@ class PlayerStepAttack : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerStepAttack, PlayerAction) public: explicit PlayerStepAttack(const InitArg& arg); - ~PlayerStepAttack() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionPlayerStepGuardJust.cpp b/src/Game/AI/Action/actionPlayerStepGuardJust.cpp index ff00cd92..fe385295 100644 --- a/src/Game/AI/Action/actionPlayerStepGuardJust.cpp +++ b/src/Game/AI/Action/actionPlayerStepGuardJust.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerStepGuardJust::PlayerStepGuardJust(const InitArg& arg) : PlayerAction(arg) {} -PlayerStepGuardJust::~PlayerStepGuardJust() = default; - -bool PlayerStepGuardJust::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerStepGuardJust::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } diff --git a/src/Game/AI/Action/actionPlayerStepGuardJust.h b/src/Game/AI/Action/actionPlayerStepGuardJust.h index 41c208f5..6fbd9818 100644 --- a/src/Game/AI/Action/actionPlayerStepGuardJust.h +++ b/src/Game/AI/Action/actionPlayerStepGuardJust.h @@ -9,9 +9,7 @@ class PlayerStepGuardJust : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerStepGuardJust, PlayerAction) public: explicit PlayerStepGuardJust(const InitArg& arg); - ~PlayerStepGuardJust() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionPlayerStepMove.cpp b/src/Game/AI/Action/actionPlayerStepMove.cpp index 0a2dfb25..19a73a8e 100644 --- a/src/Game/AI/Action/actionPlayerStepMove.cpp +++ b/src/Game/AI/Action/actionPlayerStepMove.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerStepMove::PlayerStepMove(const InitArg& arg) : PlayerAction(arg) {} -PlayerStepMove::~PlayerStepMove() = default; - -bool PlayerStepMove::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerStepMove::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } @@ -18,8 +12,6 @@ void PlayerStepMove::leave_() { PlayerAction::leave_(); } -void PlayerStepMove::loadParams_() {} - void PlayerStepMove::calc_() { PlayerAction::calc_(); } diff --git a/src/Game/AI/Action/actionPlayerStepMove.h b/src/Game/AI/Action/actionPlayerStepMove.h index 7757f837..51de789d 100644 --- a/src/Game/AI/Action/actionPlayerStepMove.h +++ b/src/Game/AI/Action/actionPlayerStepMove.h @@ -9,12 +9,9 @@ class PlayerStepMove : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerStepMove, PlayerAction) public: explicit PlayerStepMove(const InitArg& arg); - ~PlayerStepMove() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; - void loadParams_() override; protected: void calc_() override; diff --git a/src/Game/AI/Action/actionPlayerStoleOpen.cpp b/src/Game/AI/Action/actionPlayerStoleOpen.cpp index 6637147d..e543de92 100644 --- a/src/Game/AI/Action/actionPlayerStoleOpen.cpp +++ b/src/Game/AI/Action/actionPlayerStoleOpen.cpp @@ -4,20 +4,10 @@ namespace uking::action { PlayerStoleOpen::PlayerStoleOpen(const InitArg& arg) : PlayerStoleOpenEx(arg) {} -PlayerStoleOpen::~PlayerStoleOpen() = default; - -bool PlayerStoleOpen::init_(sead::Heap* heap) { - return PlayerStoleOpenEx::init_(heap); -} - void PlayerStoleOpen::enter_(ksys::act::ai::InlineParamPack* params) { PlayerStoleOpenEx::enter_(params); } -void PlayerStoleOpen::leave_() { - PlayerStoleOpenEx::leave_(); -} - void PlayerStoleOpen::loadParams_() { PlayerStoleOpenBase::loadParams_(); getStaticParam(&mEnlargeSpd_s, "EnlargeSpd"); diff --git a/src/Game/AI/Action/actionPlayerStoleOpen.h b/src/Game/AI/Action/actionPlayerStoleOpen.h index a8acbe3d..85a6ccce 100644 --- a/src/Game/AI/Action/actionPlayerStoleOpen.h +++ b/src/Game/AI/Action/actionPlayerStoleOpen.h @@ -9,11 +9,8 @@ class PlayerStoleOpen : public PlayerStoleOpenEx { SEAD_RTTI_OVERRIDE(PlayerStoleOpen, PlayerStoleOpenEx) public: explicit PlayerStoleOpen(const InitArg& arg); - ~PlayerStoleOpen() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: diff --git a/src/Game/AI/Action/actionPlayerStoleOpenBase.cpp b/src/Game/AI/Action/actionPlayerStoleOpenBase.cpp index e3b768b3..f6a26eee 100644 --- a/src/Game/AI/Action/actionPlayerStoleOpenBase.cpp +++ b/src/Game/AI/Action/actionPlayerStoleOpenBase.cpp @@ -6,10 +6,6 @@ PlayerStoleOpenBase::PlayerStoleOpenBase(const InitArg& arg) : ActionEx(arg) {} PlayerStoleOpenBase::~PlayerStoleOpenBase() = default; -bool PlayerStoleOpenBase::init_(sead::Heap* heap) { - return ActionEx::init_(heap); -} - void PlayerStoleOpenBase::enter_(ksys::act::ai::InlineParamPack* params) { ActionEx::enter_(params); } diff --git a/src/Game/AI/Action/actionPlayerStoleOpenBase.h b/src/Game/AI/Action/actionPlayerStoleOpenBase.h index 9a25d85d..6ec71f1a 100644 --- a/src/Game/AI/Action/actionPlayerStoleOpenBase.h +++ b/src/Game/AI/Action/actionPlayerStoleOpenBase.h @@ -11,7 +11,6 @@ public: explicit PlayerStoleOpenBase(const InitArg& arg); ~PlayerStoleOpenBase() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionPlayerStoleOpenEx.cpp b/src/Game/AI/Action/actionPlayerStoleOpenEx.cpp index ac4c810f..0be7744e 100644 --- a/src/Game/AI/Action/actionPlayerStoleOpenEx.cpp +++ b/src/Game/AI/Action/actionPlayerStoleOpenEx.cpp @@ -4,28 +4,4 @@ namespace uking::action { PlayerStoleOpenEx::PlayerStoleOpenEx(const InitArg& arg) : PlayerStoleOpenBase(arg) {} -PlayerStoleOpenEx::~PlayerStoleOpenEx() = default; - -bool PlayerStoleOpenEx::init_(sead::Heap* heap) { - return PlayerStoleOpenBase::init_(heap); -} - -void PlayerStoleOpenEx::enter_(ksys::act::ai::InlineParamPack* params) { - PlayerStoleOpenBase::enter_(params); -} - -void PlayerStoleOpenEx::leave_() { - PlayerStoleOpenBase::leave_(); -} - -void PlayerStoleOpenEx::loadParams_() { - getStaticParam(&mBoneName_s, "BoneName"); - getStaticParam(&mPosOffset_s, "PosOffset"); - getStaticParam(&mRotOffsetXyz_s, "RotOffsetXyz"); -} - -void PlayerStoleOpenEx::calc_() { - PlayerStoleOpenBase::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionPlayerStoleOpenEx.h b/src/Game/AI/Action/actionPlayerStoleOpenEx.h index 883a8d8d..910340df 100644 --- a/src/Game/AI/Action/actionPlayerStoleOpenEx.h +++ b/src/Game/AI/Action/actionPlayerStoleOpenEx.h @@ -9,22 +9,8 @@ class PlayerStoleOpenEx : public PlayerStoleOpenBase { SEAD_RTTI_OVERRIDE(PlayerStoleOpenEx, PlayerStoleOpenBase) public: explicit PlayerStoleOpenEx(const InitArg& arg); - ~PlayerStoleOpenEx() override; - - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; protected: - void calc_() override; - - // static_param at offset 0x20 - const char* mBoneName_s{}; - // static_param at offset 0x28 - const sead::Vector3f* mPosOffset_s{}; - // static_param at offset 0x30 - const sead::Vector3f* mRotOffsetXyz_s{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionPlayerStopInAir.cpp b/src/Game/AI/Action/actionPlayerStopInAir.cpp index 05df1c13..945a937c 100644 --- a/src/Game/AI/Action/actionPlayerStopInAir.cpp +++ b/src/Game/AI/Action/actionPlayerStopInAir.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerStopInAir::PlayerStopInAir(const InitArg& arg) : PlayerAction(arg) {} -PlayerStopInAir::~PlayerStopInAir() = default; - -bool PlayerStopInAir::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerStopInAir::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } diff --git a/src/Game/AI/Action/actionPlayerStopInAir.h b/src/Game/AI/Action/actionPlayerStopInAir.h index 8f2ae198..3489d787 100644 --- a/src/Game/AI/Action/actionPlayerStopInAir.h +++ b/src/Game/AI/Action/actionPlayerStopInAir.h @@ -9,9 +9,7 @@ class PlayerStopInAir : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerStopInAir, PlayerAction) public: explicit PlayerStopInAir(const InitArg& arg); - ~PlayerStopInAir() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionPlayerSubjectWait.cpp b/src/Game/AI/Action/actionPlayerSubjectWait.cpp index 4fc5d12a..62c2da35 100644 --- a/src/Game/AI/Action/actionPlayerSubjectWait.cpp +++ b/src/Game/AI/Action/actionPlayerSubjectWait.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerSubjectWait::PlayerSubjectWait(const InitArg& arg) : PlayerAction(arg) {} -PlayerSubjectWait::~PlayerSubjectWait() = default; - -bool PlayerSubjectWait::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerSubjectWait::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } @@ -18,8 +12,6 @@ void PlayerSubjectWait::leave_() { PlayerAction::leave_(); } -void PlayerSubjectWait::loadParams_() {} - void PlayerSubjectWait::calc_() { PlayerAction::calc_(); } diff --git a/src/Game/AI/Action/actionPlayerSubjectWait.h b/src/Game/AI/Action/actionPlayerSubjectWait.h index 280d182d..d74cc450 100644 --- a/src/Game/AI/Action/actionPlayerSubjectWait.h +++ b/src/Game/AI/Action/actionPlayerSubjectWait.h @@ -9,12 +9,9 @@ class PlayerSubjectWait : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerSubjectWait, PlayerAction) public: explicit PlayerSubjectWait(const InitArg& arg); - ~PlayerSubjectWait() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; - void loadParams_() override; protected: void calc_() override; diff --git a/src/Game/AI/Action/actionPlayerSuperBlow.cpp b/src/Game/AI/Action/actionPlayerSuperBlow.cpp index f67dc794..8fa7a6af 100644 --- a/src/Game/AI/Action/actionPlayerSuperBlow.cpp +++ b/src/Game/AI/Action/actionPlayerSuperBlow.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerSuperBlow::PlayerSuperBlow(const InitArg& arg) : PlayerAction(arg) {} -PlayerSuperBlow::~PlayerSuperBlow() = default; - -bool PlayerSuperBlow::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerSuperBlow::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } diff --git a/src/Game/AI/Action/actionPlayerSuperBlow.h b/src/Game/AI/Action/actionPlayerSuperBlow.h index d96f6fc2..455aabd4 100644 --- a/src/Game/AI/Action/actionPlayerSuperBlow.h +++ b/src/Game/AI/Action/actionPlayerSuperBlow.h @@ -9,9 +9,7 @@ class PlayerSuperBlow : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerSuperBlow, PlayerAction) public: explicit PlayerSuperBlow(const InitArg& arg); - ~PlayerSuperBlow() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionPlayerSuperJump.cpp b/src/Game/AI/Action/actionPlayerSuperJump.cpp index c7a6fbde..1bcfb0fb 100644 --- a/src/Game/AI/Action/actionPlayerSuperJump.cpp +++ b/src/Game/AI/Action/actionPlayerSuperJump.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerSuperJump::PlayerSuperJump(const InitArg& arg) : PlayerAction(arg) {} -PlayerSuperJump::~PlayerSuperJump() = default; - -bool PlayerSuperJump::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerSuperJump::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } diff --git a/src/Game/AI/Action/actionPlayerSuperJump.h b/src/Game/AI/Action/actionPlayerSuperJump.h index 356e5565..48a1dd97 100644 --- a/src/Game/AI/Action/actionPlayerSuperJump.h +++ b/src/Game/AI/Action/actionPlayerSuperJump.h @@ -9,9 +9,7 @@ class PlayerSuperJump : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerSuperJump, PlayerAction) public: explicit PlayerSuperJump(const InitArg& arg); - ~PlayerSuperJump() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionPlayerSuperJumpCharge.cpp b/src/Game/AI/Action/actionPlayerSuperJumpCharge.cpp index c5999f74..4d035a0e 100644 --- a/src/Game/AI/Action/actionPlayerSuperJumpCharge.cpp +++ b/src/Game/AI/Action/actionPlayerSuperJumpCharge.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerSuperJumpCharge::PlayerSuperJumpCharge(const InitArg& arg) : PlayerAction(arg) {} -PlayerSuperJumpCharge::~PlayerSuperJumpCharge() = default; - -bool PlayerSuperJumpCharge::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerSuperJumpCharge::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } diff --git a/src/Game/AI/Action/actionPlayerSuperJumpCharge.h b/src/Game/AI/Action/actionPlayerSuperJumpCharge.h index 8ef4b2ea..ddaef6f7 100644 --- a/src/Game/AI/Action/actionPlayerSuperJumpCharge.h +++ b/src/Game/AI/Action/actionPlayerSuperJumpCharge.h @@ -9,9 +9,7 @@ class PlayerSuperJumpCharge : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerSuperJumpCharge, PlayerAction) public: explicit PlayerSuperJumpCharge(const InitArg& arg); - ~PlayerSuperJumpCharge() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionPlayerSwimDamage.cpp b/src/Game/AI/Action/actionPlayerSwimDamage.cpp index c0e60ec0..2098171d 100644 --- a/src/Game/AI/Action/actionPlayerSwimDamage.cpp +++ b/src/Game/AI/Action/actionPlayerSwimDamage.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerSwimDamage::PlayerSwimDamage(const InitArg& arg) : PlayerAction(arg) {} -PlayerSwimDamage::~PlayerSwimDamage() = default; - -bool PlayerSwimDamage::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerSwimDamage::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } @@ -18,8 +12,6 @@ void PlayerSwimDamage::leave_() { PlayerAction::leave_(); } -void PlayerSwimDamage::loadParams_() {} - void PlayerSwimDamage::calc_() { PlayerAction::calc_(); } diff --git a/src/Game/AI/Action/actionPlayerSwimDamage.h b/src/Game/AI/Action/actionPlayerSwimDamage.h index 4aad6b10..04cc997d 100644 --- a/src/Game/AI/Action/actionPlayerSwimDamage.h +++ b/src/Game/AI/Action/actionPlayerSwimDamage.h @@ -9,12 +9,9 @@ class PlayerSwimDamage : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerSwimDamage, PlayerAction) public: explicit PlayerSwimDamage(const InitArg& arg); - ~PlayerSwimDamage() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; - void loadParams_() override; protected: void calc_() override; diff --git a/src/Game/AI/Action/actionPlayerSwimDash.cpp b/src/Game/AI/Action/actionPlayerSwimDash.cpp index b70b2fb8..f0746247 100644 --- a/src/Game/AI/Action/actionPlayerSwimDash.cpp +++ b/src/Game/AI/Action/actionPlayerSwimDash.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerSwimDash::PlayerSwimDash(const InitArg& arg) : PlayerAction(arg) {} -PlayerSwimDash::~PlayerSwimDash() = default; - -bool PlayerSwimDash::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerSwimDash::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } diff --git a/src/Game/AI/Action/actionPlayerSwimDash.h b/src/Game/AI/Action/actionPlayerSwimDash.h index 6d64caa8..9c5195c4 100644 --- a/src/Game/AI/Action/actionPlayerSwimDash.h +++ b/src/Game/AI/Action/actionPlayerSwimDash.h @@ -9,9 +9,7 @@ class PlayerSwimDash : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerSwimDash, PlayerAction) public: explicit PlayerSwimDash(const InitArg& arg); - ~PlayerSwimDash() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionPlayerSwimJump.cpp b/src/Game/AI/Action/actionPlayerSwimJump.cpp index be5dc90a..1c7d3213 100644 --- a/src/Game/AI/Action/actionPlayerSwimJump.cpp +++ b/src/Game/AI/Action/actionPlayerSwimJump.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerSwimJump::PlayerSwimJump(const InitArg& arg) : PlayerAction(arg) {} -PlayerSwimJump::~PlayerSwimJump() = default; - -bool PlayerSwimJump::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerSwimJump::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } diff --git a/src/Game/AI/Action/actionPlayerSwimJump.h b/src/Game/AI/Action/actionPlayerSwimJump.h index 99fe09a4..d8a8f924 100644 --- a/src/Game/AI/Action/actionPlayerSwimJump.h +++ b/src/Game/AI/Action/actionPlayerSwimJump.h @@ -9,9 +9,7 @@ class PlayerSwimJump : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerSwimJump, PlayerAction) public: explicit PlayerSwimJump(const InitArg& arg); - ~PlayerSwimJump() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionPlayerSwimLand.cpp b/src/Game/AI/Action/actionPlayerSwimLand.cpp index aaa5cc95..6fc335ea 100644 --- a/src/Game/AI/Action/actionPlayerSwimLand.cpp +++ b/src/Game/AI/Action/actionPlayerSwimLand.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerSwimLand::PlayerSwimLand(const InitArg& arg) : PlayerAction(arg) {} -PlayerSwimLand::~PlayerSwimLand() = default; - -bool PlayerSwimLand::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerSwimLand::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } @@ -18,8 +12,6 @@ void PlayerSwimLand::leave_() { PlayerAction::leave_(); } -void PlayerSwimLand::loadParams_() {} - void PlayerSwimLand::calc_() { PlayerAction::calc_(); } diff --git a/src/Game/AI/Action/actionPlayerSwimLand.h b/src/Game/AI/Action/actionPlayerSwimLand.h index e3b7e703..0b010148 100644 --- a/src/Game/AI/Action/actionPlayerSwimLand.h +++ b/src/Game/AI/Action/actionPlayerSwimLand.h @@ -9,12 +9,9 @@ class PlayerSwimLand : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerSwimLand, PlayerAction) public: explicit PlayerSwimLand(const InitArg& arg); - ~PlayerSwimLand() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; - void loadParams_() override; protected: void calc_() override; diff --git a/src/Game/AI/Action/actionPlayerSwimMove.cpp b/src/Game/AI/Action/actionPlayerSwimMove.cpp index f33374de..65849dc8 100644 --- a/src/Game/AI/Action/actionPlayerSwimMove.cpp +++ b/src/Game/AI/Action/actionPlayerSwimMove.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerSwimMove::PlayerSwimMove(const InitArg& arg) : PlayerAction(arg) {} -PlayerSwimMove::~PlayerSwimMove() = default; - -bool PlayerSwimMove::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerSwimMove::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } diff --git a/src/Game/AI/Action/actionPlayerSwimMove.h b/src/Game/AI/Action/actionPlayerSwimMove.h index cc92dd3f..59fbbd49 100644 --- a/src/Game/AI/Action/actionPlayerSwimMove.h +++ b/src/Game/AI/Action/actionPlayerSwimMove.h @@ -9,9 +9,7 @@ class PlayerSwimMove : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerSwimMove, PlayerAction) public: explicit PlayerSwimMove(const InitArg& arg); - ~PlayerSwimMove() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionPlayerSwimSpinAttack.cpp b/src/Game/AI/Action/actionPlayerSwimSpinAttack.cpp index 55027542..f5e14f50 100644 --- a/src/Game/AI/Action/actionPlayerSwimSpinAttack.cpp +++ b/src/Game/AI/Action/actionPlayerSwimSpinAttack.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerSwimSpinAttack::PlayerSwimSpinAttack(const InitArg& arg) : PlayerAction(arg) {} -PlayerSwimSpinAttack::~PlayerSwimSpinAttack() = default; - -bool PlayerSwimSpinAttack::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerSwimSpinAttack::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } diff --git a/src/Game/AI/Action/actionPlayerSwimSpinAttack.h b/src/Game/AI/Action/actionPlayerSwimSpinAttack.h index 3f830cbb..e671635b 100644 --- a/src/Game/AI/Action/actionPlayerSwimSpinAttack.h +++ b/src/Game/AI/Action/actionPlayerSwimSpinAttack.h @@ -9,9 +9,7 @@ class PlayerSwimSpinAttack : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerSwimSpinAttack, PlayerAction) public: explicit PlayerSwimSpinAttack(const InitArg& arg); - ~PlayerSwimSpinAttack() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionPlayerSwimWait.cpp b/src/Game/AI/Action/actionPlayerSwimWait.cpp index 11cbb7fa..1e8e2572 100644 --- a/src/Game/AI/Action/actionPlayerSwimWait.cpp +++ b/src/Game/AI/Action/actionPlayerSwimWait.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerSwimWait::PlayerSwimWait(const InitArg& arg) : PlayerAction(arg) {} -PlayerSwimWait::~PlayerSwimWait() = default; - -bool PlayerSwimWait::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerSwimWait::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } diff --git a/src/Game/AI/Action/actionPlayerSwimWait.h b/src/Game/AI/Action/actionPlayerSwimWait.h index 55c5777e..47655cc9 100644 --- a/src/Game/AI/Action/actionPlayerSwimWait.h +++ b/src/Game/AI/Action/actionPlayerSwimWait.h @@ -9,9 +9,7 @@ class PlayerSwimWait : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerSwimWait, PlayerAction) public: explicit PlayerSwimWait(const InitArg& arg); - ~PlayerSwimWait() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionPlayerSwitchHang.cpp b/src/Game/AI/Action/actionPlayerSwitchHang.cpp index a7addad8..89f48958 100644 --- a/src/Game/AI/Action/actionPlayerSwitchHang.cpp +++ b/src/Game/AI/Action/actionPlayerSwitchHang.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerSwitchHang::PlayerSwitchHang(const InitArg& arg) : PlayerAction(arg) {} -PlayerSwitchHang::~PlayerSwitchHang() = default; - -bool PlayerSwitchHang::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerSwitchHang::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } @@ -18,8 +12,6 @@ void PlayerSwitchHang::leave_() { PlayerAction::leave_(); } -void PlayerSwitchHang::loadParams_() {} - void PlayerSwitchHang::calc_() { PlayerAction::calc_(); } diff --git a/src/Game/AI/Action/actionPlayerSwitchHang.h b/src/Game/AI/Action/actionPlayerSwitchHang.h index c2d92a4e..d0ffd7a6 100644 --- a/src/Game/AI/Action/actionPlayerSwitchHang.h +++ b/src/Game/AI/Action/actionPlayerSwitchHang.h @@ -9,12 +9,9 @@ class PlayerSwitchHang : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerSwitchHang, PlayerAction) public: explicit PlayerSwitchHang(const InitArg& arg); - ~PlayerSwitchHang() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; - void loadParams_() override; protected: void calc_() override; diff --git a/src/Game/AI/Action/actionPlayerTreeClimb.cpp b/src/Game/AI/Action/actionPlayerTreeClimb.cpp index b3f8950a..f2c5609a 100644 --- a/src/Game/AI/Action/actionPlayerTreeClimb.cpp +++ b/src/Game/AI/Action/actionPlayerTreeClimb.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerTreeClimb::PlayerTreeClimb(const InitArg& arg) : PlayerAction(arg) {} -PlayerTreeClimb::~PlayerTreeClimb() = default; - -bool PlayerTreeClimb::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerTreeClimb::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } @@ -18,8 +12,6 @@ void PlayerTreeClimb::leave_() { PlayerAction::leave_(); } -void PlayerTreeClimb::loadParams_() {} - void PlayerTreeClimb::calc_() { PlayerAction::calc_(); } diff --git a/src/Game/AI/Action/actionPlayerTreeClimb.h b/src/Game/AI/Action/actionPlayerTreeClimb.h index 107fd444..b4d43bd4 100644 --- a/src/Game/AI/Action/actionPlayerTreeClimb.h +++ b/src/Game/AI/Action/actionPlayerTreeClimb.h @@ -9,12 +9,9 @@ class PlayerTreeClimb : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerTreeClimb, PlayerAction) public: explicit PlayerTreeClimb(const InitArg& arg); - ~PlayerTreeClimb() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; - void loadParams_() override; protected: void calc_() override; diff --git a/src/Game/AI/Action/actionPlayerTwiceJump.cpp b/src/Game/AI/Action/actionPlayerTwiceJump.cpp index 1949b94e..9764d348 100644 --- a/src/Game/AI/Action/actionPlayerTwiceJump.cpp +++ b/src/Game/AI/Action/actionPlayerTwiceJump.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerTwiceJump::PlayerTwiceJump(const InitArg& arg) : PlayerFall(arg) {} -PlayerTwiceJump::~PlayerTwiceJump() = default; - -bool PlayerTwiceJump::init_(sead::Heap* heap) { - return PlayerFall::init_(heap); -} - void PlayerTwiceJump::enter_(ksys::act::ai::InlineParamPack* params) { PlayerFall::enter_(params); } diff --git a/src/Game/AI/Action/actionPlayerTwiceJump.h b/src/Game/AI/Action/actionPlayerTwiceJump.h index 1f1ac323..be82d0e7 100644 --- a/src/Game/AI/Action/actionPlayerTwiceJump.h +++ b/src/Game/AI/Action/actionPlayerTwiceJump.h @@ -9,9 +9,7 @@ class PlayerTwiceJump : public PlayerFall { SEAD_RTTI_OVERRIDE(PlayerTwiceJump, PlayerFall) public: explicit PlayerTwiceJump(const InitArg& arg); - ~PlayerTwiceJump() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionPlayerUnbindSheikPad.cpp b/src/Game/AI/Action/actionPlayerUnbindSheikPad.cpp index 5671f0f1..446d9731 100644 --- a/src/Game/AI/Action/actionPlayerUnbindSheikPad.cpp +++ b/src/Game/AI/Action/actionPlayerUnbindSheikPad.cpp @@ -10,18 +10,6 @@ bool PlayerUnbindSheikPad::init_(sead::Heap* heap) { return PlayerAction::init_(heap); } -void PlayerUnbindSheikPad::enter_(ksys::act::ai::InlineParamPack* params) { - PlayerAction::enter_(params); -} - -void PlayerUnbindSheikPad::leave_() { - PlayerAction::leave_(); -} - void PlayerUnbindSheikPad::loadParams_() {} -void PlayerUnbindSheikPad::calc_() { - PlayerAction::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionPlayerUnbindSheikPad.h b/src/Game/AI/Action/actionPlayerUnbindSheikPad.h index 1e6c0c40..f86371c9 100644 --- a/src/Game/AI/Action/actionPlayerUnbindSheikPad.h +++ b/src/Game/AI/Action/actionPlayerUnbindSheikPad.h @@ -12,12 +12,9 @@ public: ~PlayerUnbindSheikPad() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionPlayerUnequip.cpp b/src/Game/AI/Action/actionPlayerUnequip.cpp index 049978c4..fc0f0850 100644 --- a/src/Game/AI/Action/actionPlayerUnequip.cpp +++ b/src/Game/AI/Action/actionPlayerUnequip.cpp @@ -18,8 +18,6 @@ void PlayerUnequip::leave_() { PlayerAction::leave_(); } -void PlayerUnequip::loadParams_() {} - void PlayerUnequip::calc_() { PlayerAction::calc_(); } diff --git a/src/Game/AI/Action/actionPlayerUnequip.h b/src/Game/AI/Action/actionPlayerUnequip.h index 36ba6722..790e87bc 100644 --- a/src/Game/AI/Action/actionPlayerUnequip.h +++ b/src/Game/AI/Action/actionPlayerUnequip.h @@ -14,7 +14,6 @@ public: bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; - void loadParams_() override; protected: void calc_() override; diff --git a/src/Game/AI/Action/actionPlayerUpdateEquip.cpp b/src/Game/AI/Action/actionPlayerUpdateEquip.cpp index fbccc704..dc34dfb4 100644 --- a/src/Game/AI/Action/actionPlayerUpdateEquip.cpp +++ b/src/Game/AI/Action/actionPlayerUpdateEquip.cpp @@ -18,8 +18,6 @@ void PlayerUpdateEquip::leave_() { PlayerAction::leave_(); } -void PlayerUpdateEquip::loadParams_() {} - void PlayerUpdateEquip::calc_() { PlayerAction::calc_(); } diff --git a/src/Game/AI/Action/actionPlayerUpdateEquip.h b/src/Game/AI/Action/actionPlayerUpdateEquip.h index a6a8f86d..20c86898 100644 --- a/src/Game/AI/Action/actionPlayerUpdateEquip.h +++ b/src/Game/AI/Action/actionPlayerUpdateEquip.h @@ -14,7 +14,6 @@ public: bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; - void loadParams_() override; protected: void calc_() override; diff --git a/src/Game/AI/Action/actionPlayerWait.cpp b/src/Game/AI/Action/actionPlayerWait.cpp index 76253125..d6d60f5c 100644 --- a/src/Game/AI/Action/actionPlayerWait.cpp +++ b/src/Game/AI/Action/actionPlayerWait.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerWait::PlayerWait(const InitArg& arg) : PlayerAction(arg) {} -PlayerWait::~PlayerWait() = default; - -bool PlayerWait::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerWait::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } @@ -18,8 +12,6 @@ void PlayerWait::leave_() { PlayerAction::leave_(); } -void PlayerWait::loadParams_() {} - void PlayerWait::calc_() { PlayerAction::calc_(); } diff --git a/src/Game/AI/Action/actionPlayerWait.h b/src/Game/AI/Action/actionPlayerWait.h index 8018e3df..a36ff073 100644 --- a/src/Game/AI/Action/actionPlayerWait.h +++ b/src/Game/AI/Action/actionPlayerWait.h @@ -9,12 +9,9 @@ class PlayerWait : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerWait, PlayerAction) public: explicit PlayerWait(const InitArg& arg); - ~PlayerWait() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; - void loadParams_() override; protected: void calc_() override; diff --git a/src/Game/AI/Action/actionPlayerWakeBoard.cpp b/src/Game/AI/Action/actionPlayerWakeBoard.cpp index 917889fc..634ddc29 100644 --- a/src/Game/AI/Action/actionPlayerWakeBoard.cpp +++ b/src/Game/AI/Action/actionPlayerWakeBoard.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerWakeBoard::PlayerWakeBoard(const InitArg& arg) : PlayerAction(arg) {} -PlayerWakeBoard::~PlayerWakeBoard() = default; - -bool PlayerWakeBoard::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerWakeBoard::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } diff --git a/src/Game/AI/Action/actionPlayerWakeBoard.h b/src/Game/AI/Action/actionPlayerWakeBoard.h index de48b5ef..adaeb103 100644 --- a/src/Game/AI/Action/actionPlayerWakeBoard.h +++ b/src/Game/AI/Action/actionPlayerWakeBoard.h @@ -9,9 +9,7 @@ class PlayerWakeBoard : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerWakeBoard, PlayerAction) public: explicit PlayerWakeBoard(const InitArg& arg); - ~PlayerWakeBoard() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionPlayerWakeBoardEnd.cpp b/src/Game/AI/Action/actionPlayerWakeBoardEnd.cpp index 571f08f3..90b9392e 100644 --- a/src/Game/AI/Action/actionPlayerWakeBoardEnd.cpp +++ b/src/Game/AI/Action/actionPlayerWakeBoardEnd.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerWakeBoardEnd::PlayerWakeBoardEnd(const InitArg& arg) : PlayerAction(arg) {} -PlayerWakeBoardEnd::~PlayerWakeBoardEnd() = default; - -bool PlayerWakeBoardEnd::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerWakeBoardEnd::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } diff --git a/src/Game/AI/Action/actionPlayerWakeBoardEnd.h b/src/Game/AI/Action/actionPlayerWakeBoardEnd.h index b0934a9b..a625809e 100644 --- a/src/Game/AI/Action/actionPlayerWakeBoardEnd.h +++ b/src/Game/AI/Action/actionPlayerWakeBoardEnd.h @@ -9,9 +9,7 @@ class PlayerWakeBoardEnd : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerWakeBoardEnd, PlayerAction) public: explicit PlayerWakeBoardEnd(const InitArg& arg); - ~PlayerWakeBoardEnd() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionPlayerWakeBoardGoal.cpp b/src/Game/AI/Action/actionPlayerWakeBoardGoal.cpp index ed3ed4de..2f8b1719 100644 --- a/src/Game/AI/Action/actionPlayerWakeBoardGoal.cpp +++ b/src/Game/AI/Action/actionPlayerWakeBoardGoal.cpp @@ -6,10 +6,6 @@ PlayerWakeBoardGoal::PlayerWakeBoardGoal(const InitArg& arg) : PlayerAction(arg) PlayerWakeBoardGoal::~PlayerWakeBoardGoal() = default; -bool PlayerWakeBoardGoal::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerWakeBoardGoal::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } diff --git a/src/Game/AI/Action/actionPlayerWakeBoardGoal.h b/src/Game/AI/Action/actionPlayerWakeBoardGoal.h index 319fb5de..25060e3d 100644 --- a/src/Game/AI/Action/actionPlayerWakeBoardGoal.h +++ b/src/Game/AI/Action/actionPlayerWakeBoardGoal.h @@ -11,7 +11,6 @@ public: explicit PlayerWakeBoardGoal(const InitArg& arg); ~PlayerWakeBoardGoal() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionPlayerWakeBoardReady.cpp b/src/Game/AI/Action/actionPlayerWakeBoardReady.cpp index 4a5a6d4a..f00457cd 100644 --- a/src/Game/AI/Action/actionPlayerWakeBoardReady.cpp +++ b/src/Game/AI/Action/actionPlayerWakeBoardReady.cpp @@ -6,10 +6,6 @@ PlayerWakeBoardReady::PlayerWakeBoardReady(const InitArg& arg) : PlayerAction(ar PlayerWakeBoardReady::~PlayerWakeBoardReady() = default; -bool PlayerWakeBoardReady::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerWakeBoardReady::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } diff --git a/src/Game/AI/Action/actionPlayerWakeBoardReady.h b/src/Game/AI/Action/actionPlayerWakeBoardReady.h index b9d6a8d0..7c3111d3 100644 --- a/src/Game/AI/Action/actionPlayerWakeBoardReady.h +++ b/src/Game/AI/Action/actionPlayerWakeBoardReady.h @@ -11,7 +11,6 @@ public: explicit PlayerWakeBoardReady(const InitArg& arg); ~PlayerWakeBoardReady() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionPlayerWallDashUp.cpp b/src/Game/AI/Action/actionPlayerWallDashUp.cpp index b0b31903..2d49b33d 100644 --- a/src/Game/AI/Action/actionPlayerWallDashUp.cpp +++ b/src/Game/AI/Action/actionPlayerWallDashUp.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerWallDashUp::PlayerWallDashUp(const InitArg& arg) : PlayerAction(arg) {} -PlayerWallDashUp::~PlayerWallDashUp() = default; - -bool PlayerWallDashUp::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerWallDashUp::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } diff --git a/src/Game/AI/Action/actionPlayerWallDashUp.h b/src/Game/AI/Action/actionPlayerWallDashUp.h index d137f4d3..40a75ea7 100644 --- a/src/Game/AI/Action/actionPlayerWallDashUp.h +++ b/src/Game/AI/Action/actionPlayerWallDashUp.h @@ -9,9 +9,7 @@ class PlayerWallDashUp : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerWallDashUp, PlayerAction) public: explicit PlayerWallDashUp(const InitArg& arg); - ~PlayerWallDashUp() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionPlayerWallJump.cpp b/src/Game/AI/Action/actionPlayerWallJump.cpp index 461e9d83..47866114 100644 --- a/src/Game/AI/Action/actionPlayerWallJump.cpp +++ b/src/Game/AI/Action/actionPlayerWallJump.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerWallJump::PlayerWallJump(const InitArg& arg) : PlayerAction(arg) {} -PlayerWallJump::~PlayerWallJump() = default; - -bool PlayerWallJump::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerWallJump::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } diff --git a/src/Game/AI/Action/actionPlayerWallJump.h b/src/Game/AI/Action/actionPlayerWallJump.h index 38efa1e1..98189925 100644 --- a/src/Game/AI/Action/actionPlayerWallJump.h +++ b/src/Game/AI/Action/actionPlayerWallJump.h @@ -9,9 +9,7 @@ class PlayerWallJump : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerWallJump, PlayerAction) public: explicit PlayerWallJump(const InitArg& arg); - ~PlayerWallJump() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionPlayerWallSlip.cpp b/src/Game/AI/Action/actionPlayerWallSlip.cpp index 1a68d9a3..c24a813e 100644 --- a/src/Game/AI/Action/actionPlayerWallSlip.cpp +++ b/src/Game/AI/Action/actionPlayerWallSlip.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerWallSlip::PlayerWallSlip(const InitArg& arg) : PlayerAction(arg) {} -PlayerWallSlip::~PlayerWallSlip() = default; - -bool PlayerWallSlip::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerWallSlip::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } diff --git a/src/Game/AI/Action/actionPlayerWallSlip.h b/src/Game/AI/Action/actionPlayerWallSlip.h index 5510f37c..a807f99b 100644 --- a/src/Game/AI/Action/actionPlayerWallSlip.h +++ b/src/Game/AI/Action/actionPlayerWallSlip.h @@ -9,9 +9,7 @@ class PlayerWallSlip : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerWallSlip, PlayerAction) public: explicit PlayerWallSlip(const InitArg& arg); - ~PlayerWallSlip() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionPlayerWarp.cpp b/src/Game/AI/Action/actionPlayerWarp.cpp index ac98691c..c978d1d8 100644 --- a/src/Game/AI/Action/actionPlayerWarp.cpp +++ b/src/Game/AI/Action/actionPlayerWarp.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerWarp::PlayerWarp(const InitArg& arg) : PlayerAction(arg) {} -PlayerWarp::~PlayerWarp() = default; - -bool PlayerWarp::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerWarp::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } @@ -18,8 +12,6 @@ void PlayerWarp::leave_() { PlayerAction::leave_(); } -void PlayerWarp::loadParams_() {} - void PlayerWarp::calc_() { PlayerAction::calc_(); } diff --git a/src/Game/AI/Action/actionPlayerWarp.h b/src/Game/AI/Action/actionPlayerWarp.h index b3b0335a..b23f11db 100644 --- a/src/Game/AI/Action/actionPlayerWarp.h +++ b/src/Game/AI/Action/actionPlayerWarp.h @@ -9,12 +9,9 @@ class PlayerWarp : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerWarp, PlayerAction) public: explicit PlayerWarp(const InitArg& arg); - ~PlayerWarp() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; - void loadParams_() override; protected: void calc_() override; diff --git a/src/Game/AI/Action/actionPlayerWaterDivingJump.cpp b/src/Game/AI/Action/actionPlayerWaterDivingJump.cpp index 48b7b317..0b796d65 100644 --- a/src/Game/AI/Action/actionPlayerWaterDivingJump.cpp +++ b/src/Game/AI/Action/actionPlayerWaterDivingJump.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerWaterDivingJump::PlayerWaterDivingJump(const InitArg& arg) : PlayerAction(arg) {} -PlayerWaterDivingJump::~PlayerWaterDivingJump() = default; - -bool PlayerWaterDivingJump::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerWaterDivingJump::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } diff --git a/src/Game/AI/Action/actionPlayerWaterDivingJump.h b/src/Game/AI/Action/actionPlayerWaterDivingJump.h index 49acbe84..d3072914 100644 --- a/src/Game/AI/Action/actionPlayerWaterDivingJump.h +++ b/src/Game/AI/Action/actionPlayerWaterDivingJump.h @@ -9,9 +9,7 @@ class PlayerWaterDivingJump : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerWaterDivingJump, PlayerAction) public: explicit PlayerWaterDivingJump(const InitArg& arg); - ~PlayerWaterDivingJump() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionPlayerWaterFall.cpp b/src/Game/AI/Action/actionPlayerWaterFall.cpp index f954f217..e8b76968 100644 --- a/src/Game/AI/Action/actionPlayerWaterFall.cpp +++ b/src/Game/AI/Action/actionPlayerWaterFall.cpp @@ -6,10 +6,6 @@ PlayerWaterFall::PlayerWaterFall(const InitArg& arg) : PlayerAction(arg) {} PlayerWaterFall::~PlayerWaterFall() = default; -bool PlayerWaterFall::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerWaterFall::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } diff --git a/src/Game/AI/Action/actionPlayerWaterFall.h b/src/Game/AI/Action/actionPlayerWaterFall.h index c66dcf53..80832d77 100644 --- a/src/Game/AI/Action/actionPlayerWaterFall.h +++ b/src/Game/AI/Action/actionPlayerWaterFall.h @@ -11,7 +11,6 @@ public: explicit PlayerWaterFall(const InitArg& arg); ~PlayerWaterFall() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionPlayerWaterFallJump.cpp b/src/Game/AI/Action/actionPlayerWaterFallJump.cpp index 60bc0df1..42356081 100644 --- a/src/Game/AI/Action/actionPlayerWaterFallJump.cpp +++ b/src/Game/AI/Action/actionPlayerWaterFallJump.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerWaterFallJump::PlayerWaterFallJump(const InitArg& arg) : PlayerAction(arg) {} -PlayerWaterFallJump::~PlayerWaterFallJump() = default; - -bool PlayerWaterFallJump::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerWaterFallJump::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } diff --git a/src/Game/AI/Action/actionPlayerWaterFallJump.h b/src/Game/AI/Action/actionPlayerWaterFallJump.h index f2e5f0cd..3bc94af7 100644 --- a/src/Game/AI/Action/actionPlayerWaterFallJump.h +++ b/src/Game/AI/Action/actionPlayerWaterFallJump.h @@ -9,9 +9,7 @@ class PlayerWaterFallJump : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerWaterFallJump, PlayerAction) public: explicit PlayerWaterFallJump(const InitArg& arg); - ~PlayerWaterFallJump() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionPlayerWeaponThrow.cpp b/src/Game/AI/Action/actionPlayerWeaponThrow.cpp index 10423b62..4ca07c35 100644 --- a/src/Game/AI/Action/actionPlayerWeaponThrow.cpp +++ b/src/Game/AI/Action/actionPlayerWeaponThrow.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerWeaponThrow::PlayerWeaponThrow(const InitArg& arg) : PlayerAction(arg) {} -PlayerWeaponThrow::~PlayerWeaponThrow() = default; - -bool PlayerWeaponThrow::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerWeaponThrow::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } diff --git a/src/Game/AI/Action/actionPlayerWeaponThrow.h b/src/Game/AI/Action/actionPlayerWeaponThrow.h index c48b920d..94654626 100644 --- a/src/Game/AI/Action/actionPlayerWeaponThrow.h +++ b/src/Game/AI/Action/actionPlayerWeaponThrow.h @@ -9,9 +9,7 @@ class PlayerWeaponThrow : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerWeaponThrow, PlayerAction) public: explicit PlayerWeaponThrow(const InitArg& arg); - ~PlayerWeaponThrow() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionPlayerZoraJump.cpp b/src/Game/AI/Action/actionPlayerZoraJump.cpp index 8e3dd940..2813878d 100644 --- a/src/Game/AI/Action/actionPlayerZoraJump.cpp +++ b/src/Game/AI/Action/actionPlayerZoraJump.cpp @@ -4,12 +4,6 @@ namespace uking::action { PlayerZoraJump::PlayerZoraJump(const InitArg& arg) : PlayerAction(arg) {} -PlayerZoraJump::~PlayerZoraJump() = default; - -bool PlayerZoraJump::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerZoraJump::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } diff --git a/src/Game/AI/Action/actionPlayerZoraJump.h b/src/Game/AI/Action/actionPlayerZoraJump.h index 9069075e..bacecd54 100644 --- a/src/Game/AI/Action/actionPlayerZoraJump.h +++ b/src/Game/AI/Action/actionPlayerZoraJump.h @@ -9,9 +9,7 @@ class PlayerZoraJump : public PlayerAction { SEAD_RTTI_OVERRIDE(PlayerZoraJump, PlayerAction) public: explicit PlayerZoraJump(const InitArg& arg); - ~PlayerZoraJump() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionPlayerZoraRide.cpp b/src/Game/AI/Action/actionPlayerZoraRide.cpp index 5d986162..83b3f253 100644 --- a/src/Game/AI/Action/actionPlayerZoraRide.cpp +++ b/src/Game/AI/Action/actionPlayerZoraRide.cpp @@ -6,10 +6,6 @@ PlayerZoraRide::PlayerZoraRide(const InitArg& arg) : PlayerAction(arg) {} PlayerZoraRide::~PlayerZoraRide() = default; -bool PlayerZoraRide::init_(sead::Heap* heap) { - return PlayerAction::init_(heap); -} - void PlayerZoraRide::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } diff --git a/src/Game/AI/Action/actionPlayerZoraRide.h b/src/Game/AI/Action/actionPlayerZoraRide.h index f99e8d6c..3f8a5d49 100644 --- a/src/Game/AI/Action/actionPlayerZoraRide.h +++ b/src/Game/AI/Action/actionPlayerZoraRide.h @@ -11,7 +11,6 @@ public: explicit PlayerZoraRide(const InitArg& arg); ~PlayerZoraRide() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionPowerupRune.cpp b/src/Game/AI/Action/actionPowerupRune.cpp index ce38a206..541309c4 100644 --- a/src/Game/AI/Action/actionPowerupRune.cpp +++ b/src/Game/AI/Action/actionPowerupRune.cpp @@ -10,20 +10,8 @@ bool PowerupRune::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void PowerupRune::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void PowerupRune::leave_() { - ksys::act::ai::Action::leave_(); -} - void PowerupRune::loadParams_() { getDynamicParam(&mRuneType_d, "RuneType"); } -void PowerupRune::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionPowerupRune.h b/src/Game/AI/Action/actionPowerupRune.h index f950632d..8d1135a8 100644 --- a/src/Game/AI/Action/actionPowerupRune.h +++ b/src/Game/AI/Action/actionPowerupRune.h @@ -11,13 +11,9 @@ public: ~PowerupRune() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 int* mRuneType_d{}; }; diff --git a/src/Game/AI/Action/actionPriestBossBlownOff.cpp b/src/Game/AI/Action/actionPriestBossBlownOff.cpp index c0efda86..11a67404 100644 --- a/src/Game/AI/Action/actionPriestBossBlownOff.cpp +++ b/src/Game/AI/Action/actionPriestBossBlownOff.cpp @@ -6,10 +6,6 @@ PriestBossBlownOff::PriestBossBlownOff(const InitArg& arg) : BlownOff(arg) {} PriestBossBlownOff::~PriestBossBlownOff() = default; -bool PriestBossBlownOff::init_(sead::Heap* heap) { - return BlownOff::init_(heap); -} - void PriestBossBlownOff::enter_(ksys::act::ai::InlineParamPack* params) { BlownOff::enter_(params); } diff --git a/src/Game/AI/Action/actionPriestBossBlownOff.h b/src/Game/AI/Action/actionPriestBossBlownOff.h index ba706111..bbc7356b 100644 --- a/src/Game/AI/Action/actionPriestBossBlownOff.h +++ b/src/Game/AI/Action/actionPriestBossBlownOff.h @@ -11,7 +11,6 @@ public: explicit PriestBossBlownOff(const InitArg& arg); ~PriestBossBlownOff() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionPriestBossMove.cpp b/src/Game/AI/Action/actionPriestBossMove.cpp index ebf19386..7d257dba 100644 --- a/src/Game/AI/Action/actionPriestBossMove.cpp +++ b/src/Game/AI/Action/actionPriestBossMove.cpp @@ -6,10 +6,6 @@ PriestBossMove::PriestBossMove(const InitArg& arg) : ksys::act::ai::Action(arg) PriestBossMove::~PriestBossMove() = default; -bool PriestBossMove::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - void PriestBossMove::enter_(ksys::act::ai::InlineParamPack* params) { ksys::act::ai::Action::enter_(params); } diff --git a/src/Game/AI/Action/actionPriestBossMove.h b/src/Game/AI/Action/actionPriestBossMove.h index 5e967f44..43cb7144 100644 --- a/src/Game/AI/Action/actionPriestBossMove.h +++ b/src/Game/AI/Action/actionPriestBossMove.h @@ -10,7 +10,6 @@ public: explicit PriestBossMove(const InitArg& arg); ~PriestBossMove() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionPutFromParent.cpp b/src/Game/AI/Action/actionPutFromParent.cpp index 787b76cf..7146d5a0 100644 --- a/src/Game/AI/Action/actionPutFromParent.cpp +++ b/src/Game/AI/Action/actionPutFromParent.cpp @@ -6,10 +6,6 @@ PutFromParent::PutFromParent(const InitArg& arg) : ksys::act::ai::Action(arg) {} PutFromParent::~PutFromParent() = default; -bool PutFromParent::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - void PutFromParent::enter_(ksys::act::ai::InlineParamPack* params) { ksys::act::ai::Action::enter_(params); } diff --git a/src/Game/AI/Action/actionPutFromParent.h b/src/Game/AI/Action/actionPutFromParent.h index c0fc017a..3e43466e 100644 --- a/src/Game/AI/Action/actionPutFromParent.h +++ b/src/Game/AI/Action/actionPutFromParent.h @@ -10,7 +10,6 @@ public: explicit PutFromParent(const InitArg& arg); ~PutFromParent() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionRandomMoveAction.cpp b/src/Game/AI/Action/actionRandomMoveAction.cpp index 46949cec..3fa566c7 100644 --- a/src/Game/AI/Action/actionRandomMoveAction.cpp +++ b/src/Game/AI/Action/actionRandomMoveAction.cpp @@ -6,10 +6,6 @@ RandomMoveAction::RandomMoveAction(const InitArg& arg) : ksys::act::ai::Action(a RandomMoveAction::~RandomMoveAction() = default; -bool RandomMoveAction::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - void RandomMoveAction::enter_(ksys::act::ai::InlineParamPack* params) { ksys::act::ai::Action::enter_(params); } diff --git a/src/Game/AI/Action/actionRandomMoveAction.h b/src/Game/AI/Action/actionRandomMoveAction.h index 1742df0f..c1f4d817 100644 --- a/src/Game/AI/Action/actionRandomMoveAction.h +++ b/src/Game/AI/Action/actionRandomMoveAction.h @@ -10,7 +10,6 @@ public: explicit RandomMoveAction(const InitArg& arg); ~RandomMoveAction() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionRebound.cpp b/src/Game/AI/Action/actionRebound.cpp index 9bbd3981..35fff35f 100644 --- a/src/Game/AI/Action/actionRebound.cpp +++ b/src/Game/AI/Action/actionRebound.cpp @@ -4,27 +4,8 @@ namespace uking::action { Rebound::Rebound(const InitArg& arg) : ActionWithAS(arg) {} -Rebound::~Rebound() = default; - -bool Rebound::init_(sead::Heap* heap) { - return ActionWithAS::init_(heap); -} - void Rebound::enter_(ksys::act::ai::InlineParamPack* params) { ActionWithAS::enter_(params); } -void Rebound::leave_() { - ActionWithAS::leave_(); -} - -void Rebound::loadParams_() { - getStaticParam(&mPosReduceRatio_s, "PosReduceRatio"); - getStaticParam(&mAngReduceRatio_s, "AngReduceRatio"); -} - -void Rebound::calc_() { - ActionWithAS::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionRebound.h b/src/Game/AI/Action/actionRebound.h index 7cd81059..b554bd22 100644 --- a/src/Game/AI/Action/actionRebound.h +++ b/src/Game/AI/Action/actionRebound.h @@ -9,20 +9,10 @@ class Rebound : public ActionWithAS { SEAD_RTTI_OVERRIDE(Rebound, ActionWithAS) public: explicit Rebound(const InitArg& arg); - ~Rebound() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; protected: - void calc_() override; - - // static_param at offset 0x20 - const float* mPosReduceRatio_s{}; - // static_param at offset 0x28 - const float* mAngReduceRatio_s{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionReboundHit.cpp b/src/Game/AI/Action/actionReboundHit.cpp index d5dc3eb6..ae9698bf 100644 --- a/src/Game/AI/Action/actionReboundHit.cpp +++ b/src/Game/AI/Action/actionReboundHit.cpp @@ -4,27 +4,13 @@ namespace uking::action { ReboundHit::ReboundHit(const InitArg& arg) : ksys::act::ai::Action(arg) {} -ReboundHit::~ReboundHit() = default; - -bool ReboundHit::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - void ReboundHit::enter_(ksys::act::ai::InlineParamPack* params) { ksys::act::ai::Action::enter_(params); } -void ReboundHit::leave_() { - ksys::act::ai::Action::leave_(); -} - void ReboundHit::loadParams_() { getStaticParam(&mSpeed_s, "Speed"); getStaticParam(&mGravityRate_s, "GravityRate"); } -void ReboundHit::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionReboundHit.h b/src/Game/AI/Action/actionReboundHit.h index 7735bda0..901b10e5 100644 --- a/src/Game/AI/Action/actionReboundHit.h +++ b/src/Game/AI/Action/actionReboundHit.h @@ -8,16 +8,11 @@ class ReboundHit : public ksys::act::ai::Action { SEAD_RTTI_OVERRIDE(ReboundHit, ksys::act::ai::Action) public: explicit ReboundHit(const InitArg& arg); - ~ReboundHit() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // static_param at offset 0x20 const float* mSpeed_s{}; // static_param at offset 0x28 diff --git a/src/Game/AI/Action/actionReceiveTerror.cpp b/src/Game/AI/Action/actionReceiveTerror.cpp index 48a8e3bf..6ad0818a 100644 --- a/src/Game/AI/Action/actionReceiveTerror.cpp +++ b/src/Game/AI/Action/actionReceiveTerror.cpp @@ -10,18 +10,6 @@ bool ReceiveTerror::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void ReceiveTerror::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void ReceiveTerror::leave_() { - ksys::act::ai::Action::leave_(); -} - void ReceiveTerror::loadParams_() {} -void ReceiveTerror::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionReceiveTerror.h b/src/Game/AI/Action/actionReceiveTerror.h index 47038d1d..3855d912 100644 --- a/src/Game/AI/Action/actionReceiveTerror.h +++ b/src/Game/AI/Action/actionReceiveTerror.h @@ -11,12 +11,9 @@ public: ~ReceiveTerror() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionRecoverMasterSword.cpp b/src/Game/AI/Action/actionRecoverMasterSword.cpp index 71d7a32e..bcab943f 100644 --- a/src/Game/AI/Action/actionRecoverMasterSword.cpp +++ b/src/Game/AI/Action/actionRecoverMasterSword.cpp @@ -10,18 +10,6 @@ bool RecoverMasterSword::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void RecoverMasterSword::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void RecoverMasterSword::leave_() { - ksys::act::ai::Action::leave_(); -} - void RecoverMasterSword::loadParams_() {} -void RecoverMasterSword::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionRecoverMasterSword.h b/src/Game/AI/Action/actionRecoverMasterSword.h index 62f9d6b9..57b2bfdd 100644 --- a/src/Game/AI/Action/actionRecoverMasterSword.h +++ b/src/Game/AI/Action/actionRecoverMasterSword.h @@ -11,12 +11,9 @@ public: ~RecoverMasterSword() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionReloadArrow.cpp b/src/Game/AI/Action/actionReloadArrow.cpp index 5521e34a..0d657852 100644 --- a/src/Game/AI/Action/actionReloadArrow.cpp +++ b/src/Game/AI/Action/actionReloadArrow.cpp @@ -6,10 +6,6 @@ ReloadArrow::ReloadArrow(const InitArg& arg) : ActionEx(arg) {} ReloadArrow::~ReloadArrow() = default; -bool ReloadArrow::init_(sead::Heap* heap) { - return ActionEx::init_(heap); -} - void ReloadArrow::enter_(ksys::act::ai::InlineParamPack* params) { ActionEx::enter_(params); } diff --git a/src/Game/AI/Action/actionReloadArrow.h b/src/Game/AI/Action/actionReloadArrow.h index b2ae70d9..147d6ee1 100644 --- a/src/Game/AI/Action/actionReloadArrow.h +++ b/src/Game/AI/Action/actionReloadArrow.h @@ -11,7 +11,6 @@ public: explicit ReloadArrow(const InitArg& arg); ~ReloadArrow() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionReqCreateManufactedEquipItem.cpp b/src/Game/AI/Action/actionReqCreateManufactedEquipItem.cpp index 71f5b488..73517cfb 100644 --- a/src/Game/AI/Action/actionReqCreateManufactedEquipItem.cpp +++ b/src/Game/AI/Action/actionReqCreateManufactedEquipItem.cpp @@ -11,18 +11,6 @@ bool ReqCreateManufactedEquipItem::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void ReqCreateManufactedEquipItem::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void ReqCreateManufactedEquipItem::leave_() { - ksys::act::ai::Action::leave_(); -} - void ReqCreateManufactedEquipItem::loadParams_() {} -void ReqCreateManufactedEquipItem::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionReqCreateManufactedEquipItem.h b/src/Game/AI/Action/actionReqCreateManufactedEquipItem.h index 3e796ef2..01c09c4e 100644 --- a/src/Game/AI/Action/actionReqCreateManufactedEquipItem.h +++ b/src/Game/AI/Action/actionReqCreateManufactedEquipItem.h @@ -11,12 +11,9 @@ public: ~ReqCreateManufactedEquipItem() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionRequestCreateHCIModel.cpp b/src/Game/AI/Action/actionRequestCreateHCIModel.cpp index a40c8537..6f55998c 100644 --- a/src/Game/AI/Action/actionRequestCreateHCIModel.cpp +++ b/src/Game/AI/Action/actionRequestCreateHCIModel.cpp @@ -10,18 +10,6 @@ bool RequestCreateHCIModel::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void RequestCreateHCIModel::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void RequestCreateHCIModel::leave_() { - ksys::act::ai::Action::leave_(); -} - void RequestCreateHCIModel::loadParams_() {} -void RequestCreateHCIModel::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionRequestCreateHCIModel.h b/src/Game/AI/Action/actionRequestCreateHCIModel.h index be691933..7c59ab07 100644 --- a/src/Game/AI/Action/actionRequestCreateHCIModel.h +++ b/src/Game/AI/Action/actionRequestCreateHCIModel.h @@ -11,12 +11,9 @@ public: ~RequestCreateHCIModel() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionRequestOpenPopUpHelp.cpp b/src/Game/AI/Action/actionRequestOpenPopUpHelp.cpp index 4676b76d..bc3df1f6 100644 --- a/src/Game/AI/Action/actionRequestOpenPopUpHelp.cpp +++ b/src/Game/AI/Action/actionRequestOpenPopUpHelp.cpp @@ -10,20 +10,8 @@ bool RequestOpenPopUpHelp::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void RequestOpenPopUpHelp::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void RequestOpenPopUpHelp::leave_() { - ksys::act::ai::Action::leave_(); -} - void RequestOpenPopUpHelp::loadParams_() { getDynamicParam(&mHelpType_d, "HelpType"); } -void RequestOpenPopUpHelp::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionRequestOpenPopUpHelp.h b/src/Game/AI/Action/actionRequestOpenPopUpHelp.h index 58c41c38..de394dcd 100644 --- a/src/Game/AI/Action/actionRequestOpenPopUpHelp.h +++ b/src/Game/AI/Action/actionRequestOpenPopUpHelp.h @@ -11,13 +11,9 @@ public: ~RequestOpenPopUpHelp() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 int* mHelpType_d{}; }; diff --git a/src/Game/AI/Action/actionReserveParashawlStart.cpp b/src/Game/AI/Action/actionReserveParashawlStart.cpp index ef92d08c..e83f9547 100644 --- a/src/Game/AI/Action/actionReserveParashawlStart.cpp +++ b/src/Game/AI/Action/actionReserveParashawlStart.cpp @@ -10,18 +10,6 @@ bool ReserveParashawlStart::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void ReserveParashawlStart::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void ReserveParashawlStart::leave_() { - ksys::act::ai::Action::leave_(); -} - void ReserveParashawlStart::loadParams_() {} -void ReserveParashawlStart::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionReserveParashawlStart.h b/src/Game/AI/Action/actionReserveParashawlStart.h index df84363e..3be422ad 100644 --- a/src/Game/AI/Action/actionReserveParashawlStart.h +++ b/src/Game/AI/Action/actionReserveParashawlStart.h @@ -11,12 +11,9 @@ public: ~ReserveParashawlStart() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionResetChemicalStateNeutral.cpp b/src/Game/AI/Action/actionResetChemicalStateNeutral.cpp index d4098f3a..c1ef9419 100644 --- a/src/Game/AI/Action/actionResetChemicalStateNeutral.cpp +++ b/src/Game/AI/Action/actionResetChemicalStateNeutral.cpp @@ -11,18 +11,6 @@ bool ResetChemicalStateNeutral::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void ResetChemicalStateNeutral::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void ResetChemicalStateNeutral::leave_() { - ksys::act::ai::Action::leave_(); -} - void ResetChemicalStateNeutral::loadParams_() {} -void ResetChemicalStateNeutral::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionResetChemicalStateNeutral.h b/src/Game/AI/Action/actionResetChemicalStateNeutral.h index 2fecb788..4627ba55 100644 --- a/src/Game/AI/Action/actionResetChemicalStateNeutral.h +++ b/src/Game/AI/Action/actionResetChemicalStateNeutral.h @@ -11,12 +11,9 @@ public: ~ResetChemicalStateNeutral() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionResetMasterSwordForceState.cpp b/src/Game/AI/Action/actionResetMasterSwordForceState.cpp index a2bf41b1..c8cc2684 100644 --- a/src/Game/AI/Action/actionResetMasterSwordForceState.cpp +++ b/src/Game/AI/Action/actionResetMasterSwordForceState.cpp @@ -11,18 +11,6 @@ bool ResetMasterSwordForceState::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void ResetMasterSwordForceState::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void ResetMasterSwordForceState::leave_() { - ksys::act::ai::Action::leave_(); -} - void ResetMasterSwordForceState::loadParams_() {} -void ResetMasterSwordForceState::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionResetMasterSwordForceState.h b/src/Game/AI/Action/actionResetMasterSwordForceState.h index 2dd47408..f769901a 100644 --- a/src/Game/AI/Action/actionResetMasterSwordForceState.h +++ b/src/Game/AI/Action/actionResetMasterSwordForceState.h @@ -11,12 +11,9 @@ public: ~ResetMasterSwordForceState() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionResetPlayerPullSwordStartLife.cpp b/src/Game/AI/Action/actionResetPlayerPullSwordStartLife.cpp index 9f74a9cd..59ba16f8 100644 --- a/src/Game/AI/Action/actionResetPlayerPullSwordStartLife.cpp +++ b/src/Game/AI/Action/actionResetPlayerPullSwordStartLife.cpp @@ -11,18 +11,6 @@ bool ResetPlayerPullSwordStartLife::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void ResetPlayerPullSwordStartLife::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void ResetPlayerPullSwordStartLife::leave_() { - ksys::act::ai::Action::leave_(); -} - void ResetPlayerPullSwordStartLife::loadParams_() {} -void ResetPlayerPullSwordStartLife::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionResetPlayerPullSwordStartLife.h b/src/Game/AI/Action/actionResetPlayerPullSwordStartLife.h index 1d82dbd3..55585f69 100644 --- a/src/Game/AI/Action/actionResetPlayerPullSwordStartLife.h +++ b/src/Game/AI/Action/actionResetPlayerPullSwordStartLife.h @@ -11,12 +11,9 @@ public: ~ResetPlayerPullSwordStartLife() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionResetRemainsMapState.cpp b/src/Game/AI/Action/actionResetRemainsMapState.cpp index 743a7fcf..b26f655d 100644 --- a/src/Game/AI/Action/actionResetRemainsMapState.cpp +++ b/src/Game/AI/Action/actionResetRemainsMapState.cpp @@ -10,18 +10,6 @@ bool ResetRemainsMapState::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void ResetRemainsMapState::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void ResetRemainsMapState::leave_() { - ksys::act::ai::Action::leave_(); -} - void ResetRemainsMapState::loadParams_() {} -void ResetRemainsMapState::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionResetRemainsMapState.h b/src/Game/AI/Action/actionResetRemainsMapState.h index 1c188e43..e37fa139 100644 --- a/src/Game/AI/Action/actionResetRemainsMapState.h +++ b/src/Game/AI/Action/actionResetRemainsMapState.h @@ -11,12 +11,9 @@ public: ~ResetRemainsMapState() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionRestorePlayerPosAndRotate.cpp b/src/Game/AI/Action/actionRestorePlayerPosAndRotate.cpp index fdee2e62..799bacc2 100644 --- a/src/Game/AI/Action/actionRestorePlayerPosAndRotate.cpp +++ b/src/Game/AI/Action/actionRestorePlayerPosAndRotate.cpp @@ -11,21 +11,9 @@ bool RestorePlayerPosAndRotate::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void RestorePlayerPosAndRotate::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void RestorePlayerPosAndRotate::leave_() { - ksys::act::ai::Action::leave_(); -} - void RestorePlayerPosAndRotate::loadParams_() { getDynamicParam(&mGameDataVec3fPlayerPos_d, "GameDataVec3fPlayerPos"); getDynamicParam(&mGameDataFloatPlayerDirectionY_d, "GameDataFloatPlayerDirectionY"); } -void RestorePlayerPosAndRotate::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionRestorePlayerPosAndRotate.h b/src/Game/AI/Action/actionRestorePlayerPosAndRotate.h index cdaa8de0..4b834994 100644 --- a/src/Game/AI/Action/actionRestorePlayerPosAndRotate.h +++ b/src/Game/AI/Action/actionRestorePlayerPosAndRotate.h @@ -11,13 +11,9 @@ public: ~RestorePlayerPosAndRotate() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 sead::SafeString* mGameDataVec3fPlayerPos_d{}; // dynamic_param at offset 0x30 diff --git a/src/Game/AI/Action/actionRestorePouchForQuest.cpp b/src/Game/AI/Action/actionRestorePouchForQuest.cpp index 1f0cc88b..f7912f79 100644 --- a/src/Game/AI/Action/actionRestorePouchForQuest.cpp +++ b/src/Game/AI/Action/actionRestorePouchForQuest.cpp @@ -10,18 +10,6 @@ bool RestorePouchForQuest::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void RestorePouchForQuest::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void RestorePouchForQuest::leave_() { - ksys::act::ai::Action::leave_(); -} - void RestorePouchForQuest::loadParams_() {} -void RestorePouchForQuest::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionRestorePouchForQuest.h b/src/Game/AI/Action/actionRestorePouchForQuest.h index c3212427..dbdc1cf7 100644 --- a/src/Game/AI/Action/actionRestorePouchForQuest.h +++ b/src/Game/AI/Action/actionRestorePouchForQuest.h @@ -11,12 +11,9 @@ public: ~RestorePouchForQuest() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionReviveEnemies.cpp b/src/Game/AI/Action/actionReviveEnemies.cpp index 1f26fd93..125ce1db 100644 --- a/src/Game/AI/Action/actionReviveEnemies.cpp +++ b/src/Game/AI/Action/actionReviveEnemies.cpp @@ -10,18 +10,6 @@ bool ReviveEnemies::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void ReviveEnemies::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void ReviveEnemies::leave_() { - ksys::act::ai::Action::leave_(); -} - void ReviveEnemies::loadParams_() {} -void ReviveEnemies::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionReviveEnemies.h b/src/Game/AI/Action/actionReviveEnemies.h index 890e998b..529120b5 100644 --- a/src/Game/AI/Action/actionReviveEnemies.h +++ b/src/Game/AI/Action/actionReviveEnemies.h @@ -11,12 +11,9 @@ public: ~ReviveEnemies() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionRideHorseAction.cpp b/src/Game/AI/Action/actionRideHorseAction.cpp index aea0e049..844a042e 100644 --- a/src/Game/AI/Action/actionRideHorseAction.cpp +++ b/src/Game/AI/Action/actionRideHorseAction.cpp @@ -14,16 +14,8 @@ void RideHorseAction::enter_(ksys::act::ai::InlineParamPack* params) { ksys::act::ai::Action::enter_(params); } -void RideHorseAction::leave_() { - ksys::act::ai::Action::leave_(); -} - void RideHorseAction::loadParams_() { getDynamicParam(&mHorse_d, "Horse"); } -void RideHorseAction::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionRideHorseAction.h b/src/Game/AI/Action/actionRideHorseAction.h index 24a1b311..d3642f9e 100644 --- a/src/Game/AI/Action/actionRideHorseAction.h +++ b/src/Game/AI/Action/actionRideHorseAction.h @@ -12,12 +12,9 @@ public: bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 ksys::act::BaseProcLink* mHorse_d{}; }; diff --git a/src/Game/AI/Action/actionRodMagicPhysBall.cpp b/src/Game/AI/Action/actionRodMagicPhysBall.cpp index 43345150..bfc03ee9 100644 --- a/src/Game/AI/Action/actionRodMagicPhysBall.cpp +++ b/src/Game/AI/Action/actionRodMagicPhysBall.cpp @@ -6,10 +6,6 @@ RodMagicPhysBall::RodMagicPhysBall(const InitArg& arg) : ChemicalPhysBall(arg) { RodMagicPhysBall::~RodMagicPhysBall() = default; -bool RodMagicPhysBall::init_(sead::Heap* heap) { - return ChemicalPhysBall::init_(heap); -} - void RodMagicPhysBall::enter_(ksys::act::ai::InlineParamPack* params) { ChemicalPhysBall::enter_(params); } diff --git a/src/Game/AI/Action/actionRodMagicPhysBall.h b/src/Game/AI/Action/actionRodMagicPhysBall.h index c7c15e14..c3fe8420 100644 --- a/src/Game/AI/Action/actionRodMagicPhysBall.h +++ b/src/Game/AI/Action/actionRodMagicPhysBall.h @@ -11,7 +11,6 @@ public: explicit RodMagicPhysBall(const InitArg& arg); ~RodMagicPhysBall() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionRopeNormal.cpp b/src/Game/AI/Action/actionRopeNormal.cpp index 035fc038..9d475d82 100644 --- a/src/Game/AI/Action/actionRopeNormal.cpp +++ b/src/Game/AI/Action/actionRopeNormal.cpp @@ -4,8 +4,6 @@ namespace uking::action { RopeNormal::RopeNormal(const InitArg& arg) : ksys::act::ai::Action(arg) {} -RopeNormal::~RopeNormal() = default; - bool RopeNormal::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } diff --git a/src/Game/AI/Action/actionRopeNormal.h b/src/Game/AI/Action/actionRopeNormal.h index 64929ba1..fa984852 100644 --- a/src/Game/AI/Action/actionRopeNormal.h +++ b/src/Game/AI/Action/actionRopeNormal.h @@ -8,7 +8,6 @@ class RopeNormal : public ksys::act::ai::Action { SEAD_RTTI_OVERRIDE(RopeNormal, ksys::act::ai::Action) public: explicit RopeNormal(const InitArg& arg); - ~RopeNormal() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/AI/Action/actionRun.cpp b/src/Game/AI/Action/actionRun.cpp index cc279a24..e889e48c 100644 --- a/src/Game/AI/Action/actionRun.cpp +++ b/src/Game/AI/Action/actionRun.cpp @@ -4,40 +4,8 @@ namespace uking::action { Run::Run(const InitArg& arg) : MoveBase(arg) {} -Run::~Run() = default; - -bool Run::init_(sead::Heap* heap) { - return MoveBase::init_(heap); -} - void Run::enter_(ksys::act::ai::InlineParamPack* params) { MoveBase::enter_(params); } -void Run::leave_() { - MoveBase::leave_(); -} - -void Run::loadParams_() { - getStaticParam(&mWeaponIdx_s, "WeaponIdx"); - getStaticParam(&mWallHitLimitTime_s, "WallHitLimitTime"); - getStaticParam(&mMoveAngCliffLimitTime_s, "MoveAngCliffLimitTime"); - getStaticParam(&mSpeed_s, "Speed"); - getStaticParam(&mRotSpd_s, "RotSpd"); - getStaticParam(&mFinRadius_s, "FinRadius"); - getStaticParam(&mFinRotate_s, "FinRotate"); - getStaticParam(&mBaseRotRatio_s, "BaseRotRatio"); - getStaticParam(&mAccRatio_s, "AccRatio"); - getStaticParam(&mJumpUpSpeedReduceRatio_s, "JumpUpSpeedReduceRatio"); - getStaticParam(&mFollowGround_s, "FollowGround"); - getStaticParam(&mIgnoreLastCurve_s, "IgnoreLastCurve"); - getStaticParam(&mIgnoreDecelerationFrontCliff_s, "IgnoreDecelerationFrontCliff"); - getStaticParam(&mIgnoreMoveDirCoHit_s, "IgnoreMoveDirCoHit"); - getDynamicParam(&mTargetPos_d, "TargetPos"); -} - -void Run::calc_() { - MoveBase::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionRun.h b/src/Game/AI/Action/actionRun.h index c9c8b787..54bee288 100644 --- a/src/Game/AI/Action/actionRun.h +++ b/src/Game/AI/Action/actionRun.h @@ -9,46 +9,10 @@ class Run : public MoveBase { SEAD_RTTI_OVERRIDE(Run, MoveBase) public: explicit Run(const InitArg& arg); - ~Run() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; protected: - void calc_() override; - - // static_param at offset 0x20 - const int* mWeaponIdx_s{}; - // static_param at offset 0x28 - const int* mWallHitLimitTime_s{}; - // static_param at offset 0x30 - const int* mMoveAngCliffLimitTime_s{}; - // static_param at offset 0x38 - const float* mSpeed_s{}; - // static_param at offset 0x40 - const float* mRotSpd_s{}; - // static_param at offset 0x48 - const float* mFinRadius_s{}; - // static_param at offset 0x50 - const float* mFinRotate_s{}; - // static_param at offset 0x58 - const float* mBaseRotRatio_s{}; - // static_param at offset 0x60 - const float* mAccRatio_s{}; - // static_param at offset 0x68 - const float* mJumpUpSpeedReduceRatio_s{}; - // static_param at offset 0x70 - const bool* mFollowGround_s{}; - // static_param at offset 0x78 - const bool* mIgnoreLastCurve_s{}; - // static_param at offset 0x80 - const bool* mIgnoreDecelerationFrontCliff_s{}; - // static_param at offset 0x88 - const bool* mIgnoreMoveDirCoHit_s{}; - // dynamic_param at offset 0x90 - sead::Vector3f* mTargetPos_d{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionSceneBgmCtrlAction.cpp b/src/Game/AI/Action/actionSceneBgmCtrlAction.cpp index 14b59e31..d6adca0d 100644 --- a/src/Game/AI/Action/actionSceneBgmCtrlAction.cpp +++ b/src/Game/AI/Action/actionSceneBgmCtrlAction.cpp @@ -10,20 +10,8 @@ bool SceneBgmCtrlAction::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void SceneBgmCtrlAction::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void SceneBgmCtrlAction::leave_() { - ksys::act::ai::Action::leave_(); -} - void SceneBgmCtrlAction::loadParams_() { getDynamicParam(&mCtrlType_d, "CtrlType"); } -void SceneBgmCtrlAction::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionSceneBgmCtrlAction.h b/src/Game/AI/Action/actionSceneBgmCtrlAction.h index 4c69bdc6..03a3127c 100644 --- a/src/Game/AI/Action/actionSceneBgmCtrlAction.h +++ b/src/Game/AI/Action/actionSceneBgmCtrlAction.h @@ -11,13 +11,9 @@ public: ~SceneBgmCtrlAction() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 sead::SafeString* mCtrlType_d{}; }; diff --git a/src/Game/AI/Action/actionSceneSoundCtrlAction.cpp b/src/Game/AI/Action/actionSceneSoundCtrlAction.cpp index 396a7000..cbc7f7d1 100644 --- a/src/Game/AI/Action/actionSceneSoundCtrlAction.cpp +++ b/src/Game/AI/Action/actionSceneSoundCtrlAction.cpp @@ -10,21 +10,9 @@ bool SceneSoundCtrlAction::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void SceneSoundCtrlAction::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void SceneSoundCtrlAction::leave_() { - ksys::act::ai::Action::leave_(); -} - void SceneSoundCtrlAction::loadParams_() { getDynamicParam(&mBgmCtrlType_d, "BgmCtrlType"); getDynamicParam(&mSeCtrlType_d, "SeCtrlType"); } -void SceneSoundCtrlAction::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionSceneSoundCtrlAction.h b/src/Game/AI/Action/actionSceneSoundCtrlAction.h index 47463c29..eb90bb70 100644 --- a/src/Game/AI/Action/actionSceneSoundCtrlAction.h +++ b/src/Game/AI/Action/actionSceneSoundCtrlAction.h @@ -11,13 +11,9 @@ public: ~SceneSoundCtrlAction() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 sead::SafeString* mBgmCtrlType_d{}; // dynamic_param at offset 0x30 diff --git a/src/Game/AI/Action/actionSceneSoundKillDuckingAction.cpp b/src/Game/AI/Action/actionSceneSoundKillDuckingAction.cpp index 9ab2ffbd..aa0f28f8 100644 --- a/src/Game/AI/Action/actionSceneSoundKillDuckingAction.cpp +++ b/src/Game/AI/Action/actionSceneSoundKillDuckingAction.cpp @@ -11,20 +11,8 @@ bool SceneSoundKillDuckingAction::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void SceneSoundKillDuckingAction::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void SceneSoundKillDuckingAction::leave_() { - ksys::act::ai::Action::leave_(); -} - void SceneSoundKillDuckingAction::loadParams_() { getDynamicParam(&mDuckerType_d, "DuckerType"); } -void SceneSoundKillDuckingAction::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionSceneSoundKillDuckingAction.h b/src/Game/AI/Action/actionSceneSoundKillDuckingAction.h index b1282196..a18656aa 100644 --- a/src/Game/AI/Action/actionSceneSoundKillDuckingAction.h +++ b/src/Game/AI/Action/actionSceneSoundKillDuckingAction.h @@ -11,13 +11,9 @@ public: ~SceneSoundKillDuckingAction() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 sead::SafeString* mDuckerType_d{}; }; diff --git a/src/Game/AI/Action/actionSceneSoundNotifyTalkAction.cpp b/src/Game/AI/Action/actionSceneSoundNotifyTalkAction.cpp index 987035b4..6ffd42b4 100644 --- a/src/Game/AI/Action/actionSceneSoundNotifyTalkAction.cpp +++ b/src/Game/AI/Action/actionSceneSoundNotifyTalkAction.cpp @@ -11,20 +11,8 @@ bool SceneSoundNotifyTalkAction::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void SceneSoundNotifyTalkAction::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void SceneSoundNotifyTalkAction::leave_() { - ksys::act::ai::Action::leave_(); -} - void SceneSoundNotifyTalkAction::loadParams_() { getDynamicParam(&mCtrlType_d, "CtrlType"); } -void SceneSoundNotifyTalkAction::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionSceneSoundNotifyTalkAction.h b/src/Game/AI/Action/actionSceneSoundNotifyTalkAction.h index 1fe2ba1d..46e61a83 100644 --- a/src/Game/AI/Action/actionSceneSoundNotifyTalkAction.h +++ b/src/Game/AI/Action/actionSceneSoundNotifyTalkAction.h @@ -11,13 +11,9 @@ public: ~SceneSoundNotifyTalkAction() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 sead::SafeString* mCtrlType_d{}; }; diff --git a/src/Game/AI/Action/actionSceneSoundSetEndProcAction.cpp b/src/Game/AI/Action/actionSceneSoundSetEndProcAction.cpp index a29e8fc0..4ae536c5 100644 --- a/src/Game/AI/Action/actionSceneSoundSetEndProcAction.cpp +++ b/src/Game/AI/Action/actionSceneSoundSetEndProcAction.cpp @@ -11,20 +11,8 @@ bool SceneSoundSetEndProcAction::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void SceneSoundSetEndProcAction::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void SceneSoundSetEndProcAction::leave_() { - ksys::act::ai::Action::leave_(); -} - void SceneSoundSetEndProcAction::loadParams_() { getDynamicParam(&mCtrlType_d, "CtrlType"); } -void SceneSoundSetEndProcAction::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionSceneSoundSetEndProcAction.h b/src/Game/AI/Action/actionSceneSoundSetEndProcAction.h index 7596963c..d003e61f 100644 --- a/src/Game/AI/Action/actionSceneSoundSetEndProcAction.h +++ b/src/Game/AI/Action/actionSceneSoundSetEndProcAction.h @@ -11,13 +11,9 @@ public: ~SceneSoundSetEndProcAction() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 sead::SafeString* mCtrlType_d{}; }; diff --git a/src/Game/AI/Action/actionSceneSoundSetStartProcAction.cpp b/src/Game/AI/Action/actionSceneSoundSetStartProcAction.cpp index d0c1c822..0063aded 100644 --- a/src/Game/AI/Action/actionSceneSoundSetStartProcAction.cpp +++ b/src/Game/AI/Action/actionSceneSoundSetStartProcAction.cpp @@ -11,21 +11,9 @@ bool SceneSoundSetStartProcAction::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void SceneSoundSetStartProcAction::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void SceneSoundSetStartProcAction::leave_() { - ksys::act::ai::Action::leave_(); -} - void SceneSoundSetStartProcAction::loadParams_() { getDynamicParam(&mBgmCtrlType_d, "BgmCtrlType"); getDynamicParam(&mSeCtrlType_d, "SeCtrlType"); } -void SceneSoundSetStartProcAction::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionSceneSoundSetStartProcAction.h b/src/Game/AI/Action/actionSceneSoundSetStartProcAction.h index 21fb2593..17942226 100644 --- a/src/Game/AI/Action/actionSceneSoundSetStartProcAction.h +++ b/src/Game/AI/Action/actionSceneSoundSetStartProcAction.h @@ -11,13 +11,9 @@ public: ~SceneSoundSetStartProcAction() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 sead::SafeString* mBgmCtrlType_d{}; // dynamic_param at offset 0x30 diff --git a/src/Game/AI/Action/actionSceneSoundStartDuckingAction.cpp b/src/Game/AI/Action/actionSceneSoundStartDuckingAction.cpp index 753cd8ba..bd9fd08c 100644 --- a/src/Game/AI/Action/actionSceneSoundStartDuckingAction.cpp +++ b/src/Game/AI/Action/actionSceneSoundStartDuckingAction.cpp @@ -11,20 +11,8 @@ bool SceneSoundStartDuckingAction::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void SceneSoundStartDuckingAction::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void SceneSoundStartDuckingAction::leave_() { - ksys::act::ai::Action::leave_(); -} - void SceneSoundStartDuckingAction::loadParams_() { getDynamicParam(&mDuckerType_d, "DuckerType"); } -void SceneSoundStartDuckingAction::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionSceneSoundStartDuckingAction.h b/src/Game/AI/Action/actionSceneSoundStartDuckingAction.h index 348ff5dc..3577cb5a 100644 --- a/src/Game/AI/Action/actionSceneSoundStartDuckingAction.h +++ b/src/Game/AI/Action/actionSceneSoundStartDuckingAction.h @@ -11,13 +11,9 @@ public: ~SceneSoundStartDuckingAction() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 sead::SafeString* mDuckerType_d{}; }; diff --git a/src/Game/AI/Action/actionSceneSoundStopDuckingAction.cpp b/src/Game/AI/Action/actionSceneSoundStopDuckingAction.cpp index 32ce7d89..5a526839 100644 --- a/src/Game/AI/Action/actionSceneSoundStopDuckingAction.cpp +++ b/src/Game/AI/Action/actionSceneSoundStopDuckingAction.cpp @@ -11,20 +11,8 @@ bool SceneSoundStopDuckingAction::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void SceneSoundStopDuckingAction::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void SceneSoundStopDuckingAction::leave_() { - ksys::act::ai::Action::leave_(); -} - void SceneSoundStopDuckingAction::loadParams_() { getDynamicParam(&mDuckerType_d, "DuckerType"); } -void SceneSoundStopDuckingAction::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionSceneSoundStopDuckingAction.h b/src/Game/AI/Action/actionSceneSoundStopDuckingAction.h index e6ea0860..b3dfeb18 100644 --- a/src/Game/AI/Action/actionSceneSoundStopDuckingAction.h +++ b/src/Game/AI/Action/actionSceneSoundStopDuckingAction.h @@ -11,13 +11,9 @@ public: ~SceneSoundStopDuckingAction() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 sead::SafeString* mDuckerType_d{}; }; diff --git a/src/Game/AI/Action/actionSearch.cpp b/src/Game/AI/Action/actionSearch.cpp index f0ff3c3a..db170965 100644 --- a/src/Game/AI/Action/actionSearch.cpp +++ b/src/Game/AI/Action/actionSearch.cpp @@ -6,18 +6,10 @@ Search::Search(const InitArg& arg) : ActionWithAS(arg) {} Search::~Search() = default; -bool Search::init_(sead::Heap* heap) { - return ActionWithAS::init_(heap); -} - void Search::enter_(ksys::act::ai::InlineParamPack* params) { ActionWithAS::enter_(params); } -void Search::leave_() { - ActionWithAS::leave_(); -} - void Search::loadParams_() { ActionWithPosAngReduce::loadParams_(); getStaticParam(&mNoChangeTime_s, "NoChangeTime"); diff --git a/src/Game/AI/Action/actionSearch.h b/src/Game/AI/Action/actionSearch.h index 7ba7d597..5964ae63 100644 --- a/src/Game/AI/Action/actionSearch.h +++ b/src/Game/AI/Action/actionSearch.h @@ -11,9 +11,7 @@ public: explicit Search(const InitArg& arg); ~Search() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: diff --git a/src/Game/AI/Action/actionSendSignalForSignalFlowAct.cpp b/src/Game/AI/Action/actionSendSignalForSignalFlowAct.cpp index 7f9d968b..b2b54b69 100644 --- a/src/Game/AI/Action/actionSendSignalForSignalFlowAct.cpp +++ b/src/Game/AI/Action/actionSendSignalForSignalFlowAct.cpp @@ -11,21 +11,9 @@ bool SendSignalForSignalFlowAct::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void SendSignalForSignalFlowAct::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void SendSignalForSignalFlowAct::leave_() { - ksys::act::ai::Action::leave_(); -} - void SendSignalForSignalFlowAct::loadParams_() { getDynamicParam(&mSignalType_d, "SignalType"); getDynamicParam(&mValue_d, "Value"); } -void SendSignalForSignalFlowAct::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionSendSignalForSignalFlowAct.h b/src/Game/AI/Action/actionSendSignalForSignalFlowAct.h index 6c366e4f..98cf582e 100644 --- a/src/Game/AI/Action/actionSendSignalForSignalFlowAct.h +++ b/src/Game/AI/Action/actionSendSignalForSignalFlowAct.h @@ -11,13 +11,9 @@ public: ~SendSignalForSignalFlowAct() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 int* mSignalType_d{}; // dynamic_param at offset 0x28 diff --git a/src/Game/AI/Action/actionSetActorNameToGameDataString.cpp b/src/Game/AI/Action/actionSetActorNameToGameDataString.cpp index 916cd49b..bffcf195 100644 --- a/src/Game/AI/Action/actionSetActorNameToGameDataString.cpp +++ b/src/Game/AI/Action/actionSetActorNameToGameDataString.cpp @@ -11,21 +11,9 @@ bool SetActorNameToGameDataString::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void SetActorNameToGameDataString::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void SetActorNameToGameDataString::leave_() { - ksys::act::ai::Action::leave_(); -} - void SetActorNameToGameDataString::loadParams_() { getDynamicParam(&mGameDataStringName_d, "GameDataStringName"); getDynamicParam(&mActorName_d, "ActorName"); } -void SetActorNameToGameDataString::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionSetActorNameToGameDataString.h b/src/Game/AI/Action/actionSetActorNameToGameDataString.h index 1190afde..20fc1476 100644 --- a/src/Game/AI/Action/actionSetActorNameToGameDataString.h +++ b/src/Game/AI/Action/actionSetActorNameToGameDataString.h @@ -11,13 +11,9 @@ public: ~SetActorNameToGameDataString() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 sead::SafeString* mGameDataStringName_d{}; // dynamic_param at offset 0x30 diff --git a/src/Game/AI/Action/actionSetChallengeIcon.cpp b/src/Game/AI/Action/actionSetChallengeIcon.cpp index 4b718f7c..43ef43c3 100644 --- a/src/Game/AI/Action/actionSetChallengeIcon.cpp +++ b/src/Game/AI/Action/actionSetChallengeIcon.cpp @@ -10,20 +10,8 @@ bool SetChallengeIcon::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void SetChallengeIcon::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void SetChallengeIcon::leave_() { - ksys::act::ai::Action::leave_(); -} - void SetChallengeIcon::loadParams_() { getDynamicParam(&mChallengeName_d, "ChallengeName"); } -void SetChallengeIcon::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionSetChallengeIcon.h b/src/Game/AI/Action/actionSetChallengeIcon.h index 9270d39d..b8eaadd8 100644 --- a/src/Game/AI/Action/actionSetChallengeIcon.h +++ b/src/Game/AI/Action/actionSetChallengeIcon.h @@ -11,13 +11,9 @@ public: ~SetChallengeIcon() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 sead::SafeString* mChallengeName_d{}; }; diff --git a/src/Game/AI/Action/actionSetCookItemInDemo.cpp b/src/Game/AI/Action/actionSetCookItemInDemo.cpp index 912e2c20..2116c2ed 100644 --- a/src/Game/AI/Action/actionSetCookItemInDemo.cpp +++ b/src/Game/AI/Action/actionSetCookItemInDemo.cpp @@ -10,14 +10,6 @@ bool SetCookItemInDemo::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void SetCookItemInDemo::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void SetCookItemInDemo::leave_() { - ksys::act::ai::Action::leave_(); -} - void SetCookItemInDemo::loadParams_() { getDynamicParam(&mSetNum_d, "SetNum"); getDynamicParam(&mPorchItemName01_d, "PorchItemName01"); @@ -27,8 +19,4 @@ void SetCookItemInDemo::loadParams_() { getDynamicParam(&mPorchItemName05_d, "PorchItemName05"); } -void SetCookItemInDemo::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionSetCookItemInDemo.h b/src/Game/AI/Action/actionSetCookItemInDemo.h index f56203ab..cd877fbc 100644 --- a/src/Game/AI/Action/actionSetCookItemInDemo.h +++ b/src/Game/AI/Action/actionSetCookItemInDemo.h @@ -11,13 +11,9 @@ public: ~SetCookItemInDemo() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 int* mSetNum_d{}; // dynamic_param at offset 0x28 diff --git a/src/Game/AI/Action/actionSetCurrentDungeonClearFlag.cpp b/src/Game/AI/Action/actionSetCurrentDungeonClearFlag.cpp index 02f61f13..410e725a 100644 --- a/src/Game/AI/Action/actionSetCurrentDungeonClearFlag.cpp +++ b/src/Game/AI/Action/actionSetCurrentDungeonClearFlag.cpp @@ -11,18 +11,6 @@ bool SetCurrentDungeonClearFlag::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void SetCurrentDungeonClearFlag::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void SetCurrentDungeonClearFlag::leave_() { - ksys::act::ai::Action::leave_(); -} - void SetCurrentDungeonClearFlag::loadParams_() {} -void SetCurrentDungeonClearFlag::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionSetCurrentDungeonClearFlag.h b/src/Game/AI/Action/actionSetCurrentDungeonClearFlag.h index d30cda13..e1568dc1 100644 --- a/src/Game/AI/Action/actionSetCurrentDungeonClearFlag.h +++ b/src/Game/AI/Action/actionSetCurrentDungeonClearFlag.h @@ -11,12 +11,9 @@ public: ~SetCurrentDungeonClearFlag() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionSetDispHeartGauge.cpp b/src/Game/AI/Action/actionSetDispHeartGauge.cpp index 3f36bbe6..5ab89269 100644 --- a/src/Game/AI/Action/actionSetDispHeartGauge.cpp +++ b/src/Game/AI/Action/actionSetDispHeartGauge.cpp @@ -10,22 +10,10 @@ bool SetDispHeartGauge::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void SetDispHeartGauge::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void SetDispHeartGauge::leave_() { - ksys::act::ai::Action::leave_(); -} - void SetDispHeartGauge::loadParams_() { getDynamicParam(&mIsDisplay_d, "IsDisplay"); getDynamicParam(&mIsDisplayEx_d, "IsDisplayEx"); getDynamicParam(&mIsGetDemo_d, "IsGetDemo"); } -void SetDispHeartGauge::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionSetDispHeartGauge.h b/src/Game/AI/Action/actionSetDispHeartGauge.h index 8f2dc9c6..bcaa54de 100644 --- a/src/Game/AI/Action/actionSetDispHeartGauge.h +++ b/src/Game/AI/Action/actionSetDispHeartGauge.h @@ -11,13 +11,9 @@ public: ~SetDispHeartGauge() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 bool* mIsDisplay_d{}; // dynamic_param at offset 0x28 diff --git a/src/Game/AI/Action/actionSetDispStaminaGauge.cpp b/src/Game/AI/Action/actionSetDispStaminaGauge.cpp index 76a2587b..ea094e03 100644 --- a/src/Game/AI/Action/actionSetDispStaminaGauge.cpp +++ b/src/Game/AI/Action/actionSetDispStaminaGauge.cpp @@ -10,21 +10,9 @@ bool SetDispStaminaGauge::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void SetDispStaminaGauge::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void SetDispStaminaGauge::leave_() { - ksys::act::ai::Action::leave_(); -} - void SetDispStaminaGauge::loadParams_() { getDynamicParam(&mIsDisplay_d, "IsDisplay"); getDynamicParam(&mIsDisplayEx_d, "IsDisplayEx"); } -void SetDispStaminaGauge::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionSetDispStaminaGauge.h b/src/Game/AI/Action/actionSetDispStaminaGauge.h index 573faa66..bfdf0f8e 100644 --- a/src/Game/AI/Action/actionSetDispStaminaGauge.h +++ b/src/Game/AI/Action/actionSetDispStaminaGauge.h @@ -11,13 +11,9 @@ public: ~SetDispStaminaGauge() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 bool* mIsDisplay_d{}; // dynamic_param at offset 0x28 diff --git a/src/Game/AI/Action/actionSetEnterDungeonFlag.cpp b/src/Game/AI/Action/actionSetEnterDungeonFlag.cpp index 6f832e2e..57520ba8 100644 --- a/src/Game/AI/Action/actionSetEnterDungeonFlag.cpp +++ b/src/Game/AI/Action/actionSetEnterDungeonFlag.cpp @@ -10,18 +10,6 @@ bool SetEnterDungeonFlag::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void SetEnterDungeonFlag::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void SetEnterDungeonFlag::leave_() { - ksys::act::ai::Action::leave_(); -} - void SetEnterDungeonFlag::loadParams_() {} -void SetEnterDungeonFlag::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionSetEnterDungeonFlag.h b/src/Game/AI/Action/actionSetEnterDungeonFlag.h index da23d56f..40229ff6 100644 --- a/src/Game/AI/Action/actionSetEnterDungeonFlag.h +++ b/src/Game/AI/Action/actionSetEnterDungeonFlag.h @@ -11,12 +11,9 @@ public: ~SetEnterDungeonFlag() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionSetExtraEnergyOfPlayer.cpp b/src/Game/AI/Action/actionSetExtraEnergyOfPlayer.cpp index 3bfddb35..5077b957 100644 --- a/src/Game/AI/Action/actionSetExtraEnergyOfPlayer.cpp +++ b/src/Game/AI/Action/actionSetExtraEnergyOfPlayer.cpp @@ -10,21 +10,9 @@ bool SetExtraEnergyOfPlayer::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void SetExtraEnergyOfPlayer::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void SetExtraEnergyOfPlayer::leave_() { - ksys::act::ai::Action::leave_(); -} - void SetExtraEnergyOfPlayer::loadParams_() { getDynamicParam(&mValue_d, "Value"); getDynamicParam(&mProcessingMode_d, "ProcessingMode"); } -void SetExtraEnergyOfPlayer::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionSetExtraEnergyOfPlayer.h b/src/Game/AI/Action/actionSetExtraEnergyOfPlayer.h index d3f49f18..f132b56c 100644 --- a/src/Game/AI/Action/actionSetExtraEnergyOfPlayer.h +++ b/src/Game/AI/Action/actionSetExtraEnergyOfPlayer.h @@ -11,13 +11,9 @@ public: ~SetExtraEnergyOfPlayer() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 int* mValue_d{}; // dynamic_param at offset 0x28 diff --git a/src/Game/AI/Action/actionSetExtraLifeOfPlayer.cpp b/src/Game/AI/Action/actionSetExtraLifeOfPlayer.cpp index 13897d64..8da902d3 100644 --- a/src/Game/AI/Action/actionSetExtraLifeOfPlayer.cpp +++ b/src/Game/AI/Action/actionSetExtraLifeOfPlayer.cpp @@ -10,21 +10,9 @@ bool SetExtraLifeOfPlayer::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void SetExtraLifeOfPlayer::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void SetExtraLifeOfPlayer::leave_() { - ksys::act::ai::Action::leave_(); -} - void SetExtraLifeOfPlayer::loadParams_() { getDynamicParam(&mValue_d, "Value"); getDynamicParam(&mProcessingMode_d, "ProcessingMode"); } -void SetExtraLifeOfPlayer::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionSetExtraLifeOfPlayer.h b/src/Game/AI/Action/actionSetExtraLifeOfPlayer.h index 1e37fbfe..eb6a47d8 100644 --- a/src/Game/AI/Action/actionSetExtraLifeOfPlayer.h +++ b/src/Game/AI/Action/actionSetExtraLifeOfPlayer.h @@ -11,13 +11,9 @@ public: ~SetExtraLifeOfPlayer() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 int* mValue_d{}; // dynamic_param at offset 0x28 diff --git a/src/Game/AI/Action/actionSetGetFlag.cpp b/src/Game/AI/Action/actionSetGetFlag.cpp index 00619e37..00c54a85 100644 --- a/src/Game/AI/Action/actionSetGetFlag.cpp +++ b/src/Game/AI/Action/actionSetGetFlag.cpp @@ -10,20 +10,8 @@ bool SetGetFlag::init_(sead::Heap* heap) { return SetGetFlagBase::init_(heap); } -void SetGetFlag::enter_(ksys::act::ai::InlineParamPack* params) { - SetGetFlagBase::enter_(params); -} - -void SetGetFlag::leave_() { - SetGetFlagBase::leave_(); -} - void SetGetFlag::loadParams_() { SetGetFlagBase::loadParams_(); } -void SetGetFlag::calc_() { - SetGetFlagBase::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionSetGetFlag.h b/src/Game/AI/Action/actionSetGetFlag.h index a69ecf54..02e4ce7a 100644 --- a/src/Game/AI/Action/actionSetGetFlag.h +++ b/src/Game/AI/Action/actionSetGetFlag.h @@ -12,12 +12,9 @@ public: ~SetGetFlag() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionSetGetFlagBase.cpp b/src/Game/AI/Action/actionSetGetFlagBase.cpp index 7fd9da80..35a75318 100644 --- a/src/Game/AI/Action/actionSetGetFlagBase.cpp +++ b/src/Game/AI/Action/actionSetGetFlagBase.cpp @@ -10,18 +10,6 @@ bool SetGetFlagBase::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void SetGetFlagBase::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void SetGetFlagBase::leave_() { - ksys::act::ai::Action::leave_(); -} - void SetGetFlagBase::loadParams_() {} -void SetGetFlagBase::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionSetGetFlagBase.h b/src/Game/AI/Action/actionSetGetFlagBase.h index 1e0efd79..21594d79 100644 --- a/src/Game/AI/Action/actionSetGetFlagBase.h +++ b/src/Game/AI/Action/actionSetGetFlagBase.h @@ -11,12 +11,9 @@ public: ~SetGetFlagBase() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionSetGetFlagByActorName.cpp b/src/Game/AI/Action/actionSetGetFlagByActorName.cpp index a294eed2..f056957c 100644 --- a/src/Game/AI/Action/actionSetGetFlagByActorName.cpp +++ b/src/Game/AI/Action/actionSetGetFlagByActorName.cpp @@ -10,21 +10,9 @@ bool SetGetFlagByActorName::init_(sead::Heap* heap) { return SetGetFlagBase::init_(heap); } -void SetGetFlagByActorName::enter_(ksys::act::ai::InlineParamPack* params) { - SetGetFlagBase::enter_(params); -} - -void SetGetFlagByActorName::leave_() { - SetGetFlagBase::leave_(); -} - void SetGetFlagByActorName::loadParams_() { SetGetFlagBase::loadParams_(); getDynamicParam(&mActorName_d, "ActorName"); } -void SetGetFlagByActorName::calc_() { - SetGetFlagBase::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionSetGetFlagByActorName.h b/src/Game/AI/Action/actionSetGetFlagByActorName.h index 033ce13f..3140c0ce 100644 --- a/src/Game/AI/Action/actionSetGetFlagByActorName.h +++ b/src/Game/AI/Action/actionSetGetFlagByActorName.h @@ -12,13 +12,9 @@ public: ~SetGetFlagByActorName() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 sead::SafeString* mActorName_d{}; }; diff --git a/src/Game/AI/Action/actionSetHorseFamiliarityPassedFlag.cpp b/src/Game/AI/Action/actionSetHorseFamiliarityPassedFlag.cpp index 6f1943a0..5a1e3d7e 100644 --- a/src/Game/AI/Action/actionSetHorseFamiliarityPassedFlag.cpp +++ b/src/Game/AI/Action/actionSetHorseFamiliarityPassedFlag.cpp @@ -11,18 +11,6 @@ bool SetHorseFamiliarityPassedFlag::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void SetHorseFamiliarityPassedFlag::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void SetHorseFamiliarityPassedFlag::leave_() { - ksys::act::ai::Action::leave_(); -} - void SetHorseFamiliarityPassedFlag::loadParams_() {} -void SetHorseFamiliarityPassedFlag::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionSetHorseFamiliarityPassedFlag.h b/src/Game/AI/Action/actionSetHorseFamiliarityPassedFlag.h index aa6377e0..6284fc5c 100644 --- a/src/Game/AI/Action/actionSetHorseFamiliarityPassedFlag.h +++ b/src/Game/AI/Action/actionSetHorseFamiliarityPassedFlag.h @@ -11,12 +11,9 @@ public: ~SetHorseFamiliarityPassedFlag() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionSetInstEventFlag.cpp b/src/Game/AI/Action/actionSetInstEventFlag.cpp index a06b3795..4c55f299 100644 --- a/src/Game/AI/Action/actionSetInstEventFlag.cpp +++ b/src/Game/AI/Action/actionSetInstEventFlag.cpp @@ -10,18 +10,6 @@ bool SetInstEventFlag::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void SetInstEventFlag::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void SetInstEventFlag::leave_() { - ksys::act::ai::Action::leave_(); -} - void SetInstEventFlag::loadParams_() {} -void SetInstEventFlag::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionSetInstEventFlag.h b/src/Game/AI/Action/actionSetInstEventFlag.h index 19cef60c..77f0e67b 100644 --- a/src/Game/AI/Action/actionSetInstEventFlag.h +++ b/src/Game/AI/Action/actionSetInstEventFlag.h @@ -11,12 +11,9 @@ public: ~SetInstEventFlag() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionSetMaterialVisible.cpp b/src/Game/AI/Action/actionSetMaterialVisible.cpp index fa682768..4d83ab39 100644 --- a/src/Game/AI/Action/actionSetMaterialVisible.cpp +++ b/src/Game/AI/Action/actionSetMaterialVisible.cpp @@ -10,21 +10,9 @@ bool SetMaterialVisible::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void SetMaterialVisible::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void SetMaterialVisible::leave_() { - ksys::act::ai::Action::leave_(); -} - void SetMaterialVisible::loadParams_() { getStaticParam(&mIsVisible_s, "IsVisible"); getDynamicParam(&mMaterialName_d, "MaterialName"); } -void SetMaterialVisible::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionSetMaterialVisible.h b/src/Game/AI/Action/actionSetMaterialVisible.h index e51cb38e..efa108c3 100644 --- a/src/Game/AI/Action/actionSetMaterialVisible.h +++ b/src/Game/AI/Action/actionSetMaterialVisible.h @@ -11,13 +11,9 @@ public: ~SetMaterialVisible() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // static_param at offset 0x20 const bool* mIsVisible_s{}; // dynamic_param at offset 0x28 diff --git a/src/Game/AI/Action/actionSetOpenState.cpp b/src/Game/AI/Action/actionSetOpenState.cpp index a725a286..c205eb5f 100644 --- a/src/Game/AI/Action/actionSetOpenState.cpp +++ b/src/Game/AI/Action/actionSetOpenState.cpp @@ -10,20 +10,8 @@ bool SetOpenState::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void SetOpenState::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void SetOpenState::leave_() { - ksys::act::ai::Action::leave_(); -} - void SetOpenState::loadParams_() { getAITreeVariable(&mIsOpenTreasureBox_a, "IsOpenTreasureBox"); } -void SetOpenState::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionSetOpenState.h b/src/Game/AI/Action/actionSetOpenState.h index 4f688e29..75431ea6 100644 --- a/src/Game/AI/Action/actionSetOpenState.h +++ b/src/Game/AI/Action/actionSetOpenState.h @@ -11,13 +11,9 @@ public: ~SetOpenState() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // aitree_variable at offset 0x20 bool* mIsOpenTreasureBox_a{}; }; diff --git a/src/Game/AI/Action/actionSetOwnedHorseAS.cpp b/src/Game/AI/Action/actionSetOwnedHorseAS.cpp index 7b9981ee..d945c566 100644 --- a/src/Game/AI/Action/actionSetOwnedHorseAS.cpp +++ b/src/Game/AI/Action/actionSetOwnedHorseAS.cpp @@ -10,20 +10,8 @@ bool SetOwnedHorseAS::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void SetOwnedHorseAS::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void SetOwnedHorseAS::leave_() { - ksys::act::ai::Action::leave_(); -} - void SetOwnedHorseAS::loadParams_() { getDynamicParam(&mASName_d, "ASName"); } -void SetOwnedHorseAS::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionSetOwnedHorseAS.h b/src/Game/AI/Action/actionSetOwnedHorseAS.h index 612532a6..8b988c8f 100644 --- a/src/Game/AI/Action/actionSetOwnedHorseAS.h +++ b/src/Game/AI/Action/actionSetOwnedHorseAS.h @@ -11,13 +11,9 @@ public: ~SetOwnedHorseAS() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 sead::SafeString* mASName_d{}; }; diff --git a/src/Game/AI/Action/actionSetPlayerDrawingSword.cpp b/src/Game/AI/Action/actionSetPlayerDrawingSword.cpp index b69a84b2..8224dd2a 100644 --- a/src/Game/AI/Action/actionSetPlayerDrawingSword.cpp +++ b/src/Game/AI/Action/actionSetPlayerDrawingSword.cpp @@ -10,18 +10,6 @@ bool SetPlayerDrawingSword::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void SetPlayerDrawingSword::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void SetPlayerDrawingSword::leave_() { - ksys::act::ai::Action::leave_(); -} - void SetPlayerDrawingSword::loadParams_() {} -void SetPlayerDrawingSword::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionSetPlayerDrawingSword.h b/src/Game/AI/Action/actionSetPlayerDrawingSword.h index 631f5230..b3d5bf20 100644 --- a/src/Game/AI/Action/actionSetPlayerDrawingSword.h +++ b/src/Game/AI/Action/actionSetPlayerDrawingSword.h @@ -11,12 +11,9 @@ public: ~SetPlayerDrawingSword() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionSetPlayerStateToUnequipAndWait.cpp b/src/Game/AI/Action/actionSetPlayerStateToUnequipAndWait.cpp index aced650e..6133d411 100644 --- a/src/Game/AI/Action/actionSetPlayerStateToUnequipAndWait.cpp +++ b/src/Game/AI/Action/actionSetPlayerStateToUnequipAndWait.cpp @@ -11,18 +11,6 @@ bool SetPlayerStateToUnequipAndWait::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void SetPlayerStateToUnequipAndWait::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void SetPlayerStateToUnequipAndWait::leave_() { - ksys::act::ai::Action::leave_(); -} - void SetPlayerStateToUnequipAndWait::loadParams_() {} -void SetPlayerStateToUnequipAndWait::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionSetPlayerStateToUnequipAndWait.h b/src/Game/AI/Action/actionSetPlayerStateToUnequipAndWait.h index cfc121d8..cbe96219 100644 --- a/src/Game/AI/Action/actionSetPlayerStateToUnequipAndWait.h +++ b/src/Game/AI/Action/actionSetPlayerStateToUnequipAndWait.h @@ -11,12 +11,9 @@ public: ~SetPlayerStateToUnequipAndWait() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionSetQuestStepAction.cpp b/src/Game/AI/Action/actionSetQuestStepAction.cpp index 6c440ef7..028bf607 100644 --- a/src/Game/AI/Action/actionSetQuestStepAction.cpp +++ b/src/Game/AI/Action/actionSetQuestStepAction.cpp @@ -10,22 +10,10 @@ bool SetQuestStepAction::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void SetQuestStepAction::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void SetQuestStepAction::leave_() { - ksys::act::ai::Action::leave_(); -} - void SetQuestStepAction::loadParams_() { getDynamicParam(&mForceRunTelop_d, "ForceRunTelop"); getDynamicParam(&mQuestName_d, "QuestName"); getDynamicParam(&mStepName_d, "StepName"); } -void SetQuestStepAction::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionSetQuestStepAction.h b/src/Game/AI/Action/actionSetQuestStepAction.h index cbd339aa..a1d16bda 100644 --- a/src/Game/AI/Action/actionSetQuestStepAction.h +++ b/src/Game/AI/Action/actionSetQuestStepAction.h @@ -11,13 +11,9 @@ public: ~SetQuestStepAction() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 bool* mForceRunTelop_d{}; // dynamic_param at offset 0x28 diff --git a/src/Game/AI/Action/actionSetRetryDataAction.cpp b/src/Game/AI/Action/actionSetRetryDataAction.cpp index 6806000d..c3336ee1 100644 --- a/src/Game/AI/Action/actionSetRetryDataAction.cpp +++ b/src/Game/AI/Action/actionSetRetryDataAction.cpp @@ -10,18 +10,6 @@ bool SetRetryDataAction::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void SetRetryDataAction::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void SetRetryDataAction::leave_() { - ksys::act::ai::Action::leave_(); -} - void SetRetryDataAction::loadParams_() {} -void SetRetryDataAction::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionSetRetryDataAction.h b/src/Game/AI/Action/actionSetRetryDataAction.h index 06d6e103..6a579448 100644 --- a/src/Game/AI/Action/actionSetRetryDataAction.h +++ b/src/Game/AI/Action/actionSetRetryDataAction.h @@ -11,12 +11,9 @@ public: ~SetRetryDataAction() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionSetTreasure.cpp b/src/Game/AI/Action/actionSetTreasure.cpp index 38c57c2f..b8e9dbc8 100644 --- a/src/Game/AI/Action/actionSetTreasure.cpp +++ b/src/Game/AI/Action/actionSetTreasure.cpp @@ -10,21 +10,9 @@ bool SetTreasure::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void SetTreasure::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void SetTreasure::leave_() { - ksys::act::ai::Action::leave_(); -} - void SetTreasure::loadParams_() { getDynamicParam(&mActorName_d, "ActorName"); getAITreeVariable(&mDropActorName_a, "DropActorName"); } -void SetTreasure::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionSetTreasure.h b/src/Game/AI/Action/actionSetTreasure.h index b9b460f8..d849c640 100644 --- a/src/Game/AI/Action/actionSetTreasure.h +++ b/src/Game/AI/Action/actionSetTreasure.h @@ -11,13 +11,9 @@ public: ~SetTreasure() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 sead::SafeString* mActorName_d{}; // aitree_variable at offset 0x30 diff --git a/src/Game/AI/Action/actionSetWanderPathIndex.cpp b/src/Game/AI/Action/actionSetWanderPathIndex.cpp index f0f490f6..087aabdd 100644 --- a/src/Game/AI/Action/actionSetWanderPathIndex.cpp +++ b/src/Game/AI/Action/actionSetWanderPathIndex.cpp @@ -10,18 +10,6 @@ bool SetWanderPathIndex::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void SetWanderPathIndex::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void SetWanderPathIndex::leave_() { - ksys::act::ai::Action::leave_(); -} - void SetWanderPathIndex::loadParams_() {} -void SetWanderPathIndex::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionSetWanderPathIndex.h b/src/Game/AI/Action/actionSetWanderPathIndex.h index 9744acc4..b1ded9ec 100644 --- a/src/Game/AI/Action/actionSetWanderPathIndex.h +++ b/src/Game/AI/Action/actionSetWanderPathIndex.h @@ -11,12 +11,9 @@ public: ~SetWanderPathIndex() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionSetupGetDemoModeNumUi.cpp b/src/Game/AI/Action/actionSetupGetDemoModeNumUi.cpp index 7066ccbe..3095a40b 100644 --- a/src/Game/AI/Action/actionSetupGetDemoModeNumUi.cpp +++ b/src/Game/AI/Action/actionSetupGetDemoModeNumUi.cpp @@ -10,21 +10,9 @@ bool SetupGetDemoModeNumUi::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void SetupGetDemoModeNumUi::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void SetupGetDemoModeNumUi::leave_() { - ksys::act::ai::Action::leave_(); -} - void SetupGetDemoModeNumUi::loadParams_() { getDynamicParam(&mNumUiType_d, "NumUiType"); getDynamicParam(&mAddNum_d, "AddNum"); } -void SetupGetDemoModeNumUi::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionSetupGetDemoModeNumUi.h b/src/Game/AI/Action/actionSetupGetDemoModeNumUi.h index b690a205..6568cafe 100644 --- a/src/Game/AI/Action/actionSetupGetDemoModeNumUi.h +++ b/src/Game/AI/Action/actionSetupGetDemoModeNumUi.h @@ -11,13 +11,9 @@ public: ~SetupGetDemoModeNumUi() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 int* mNumUiType_d{}; // dynamic_param at offset 0x28 diff --git a/src/Game/AI/Action/actionShock.cpp b/src/Game/AI/Action/actionShock.cpp index 1e051b2b..1b3bc4ad 100644 --- a/src/Game/AI/Action/actionShock.cpp +++ b/src/Game/AI/Action/actionShock.cpp @@ -6,10 +6,6 @@ Shock::Shock(const InitArg& arg) : ksys::act::ai::Action(arg) {} Shock::~Shock() = default; -bool Shock::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - void Shock::enter_(ksys::act::ai::InlineParamPack* params) { ksys::act::ai::Action::enter_(params); } diff --git a/src/Game/AI/Action/actionShock.h b/src/Game/AI/Action/actionShock.h index 8f1cbab0..b79de685 100644 --- a/src/Game/AI/Action/actionShock.h +++ b/src/Game/AI/Action/actionShock.h @@ -10,7 +10,6 @@ public: explicit Shock(const InitArg& arg); ~Shock() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionShockDynamicWeapon.cpp b/src/Game/AI/Action/actionShockDynamicWeapon.cpp index cb28fd10..d5dfc61a 100644 --- a/src/Game/AI/Action/actionShockDynamicWeapon.cpp +++ b/src/Game/AI/Action/actionShockDynamicWeapon.cpp @@ -6,10 +6,6 @@ ShockDynamicWeapon::ShockDynamicWeapon(const InitArg& arg) : Shock(arg) {} ShockDynamicWeapon::~ShockDynamicWeapon() = default; -bool ShockDynamicWeapon::init_(sead::Heap* heap) { - return Shock::init_(heap); -} - void ShockDynamicWeapon::enter_(ksys::act::ai::InlineParamPack* params) { Shock::enter_(params); } diff --git a/src/Game/AI/Action/actionShockDynamicWeapon.h b/src/Game/AI/Action/actionShockDynamicWeapon.h index c7828fdd..8cda570a 100644 --- a/src/Game/AI/Action/actionShockDynamicWeapon.h +++ b/src/Game/AI/Action/actionShockDynamicWeapon.h @@ -11,7 +11,6 @@ public: explicit ShockDynamicWeapon(const InitArg& arg); ~ShockDynamicWeapon() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionShootArrow.cpp b/src/Game/AI/Action/actionShootArrow.cpp index 987933ed..bf2d74b5 100644 --- a/src/Game/AI/Action/actionShootArrow.cpp +++ b/src/Game/AI/Action/actionShootArrow.cpp @@ -6,18 +6,10 @@ ShootArrow::ShootArrow(const InitArg& arg) : ActionEx(arg) {} ShootArrow::~ShootArrow() = default; -bool ShootArrow::init_(sead::Heap* heap) { - return ActionEx::init_(heap); -} - void ShootArrow::enter_(ksys::act::ai::InlineParamPack* params) { ActionEx::enter_(params); } -void ShootArrow::leave_() { - ActionEx::leave_(); -} - void ShootArrow::loadParams_() {} void ShootArrow::calc_() { diff --git a/src/Game/AI/Action/actionShootArrow.h b/src/Game/AI/Action/actionShootArrow.h index 4dc47f63..fc532b0f 100644 --- a/src/Game/AI/Action/actionShootArrow.h +++ b/src/Game/AI/Action/actionShootArrow.h @@ -11,9 +11,7 @@ public: explicit ShootArrow(const InitArg& arg); ~ShootArrow() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: diff --git a/src/Game/AI/Action/actionShowMemoryPhoto.cpp b/src/Game/AI/Action/actionShowMemoryPhoto.cpp index 3780edd7..e9f7149a 100644 --- a/src/Game/AI/Action/actionShowMemoryPhoto.cpp +++ b/src/Game/AI/Action/actionShowMemoryPhoto.cpp @@ -10,20 +10,8 @@ bool ShowMemoryPhoto::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void ShowMemoryPhoto::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void ShowMemoryPhoto::leave_() { - ksys::act::ai::Action::leave_(); -} - void ShowMemoryPhoto::loadParams_() { getDynamicParam(&mPhotoNo_d, "PhotoNo"); } -void ShowMemoryPhoto::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionShowMemoryPhoto.h b/src/Game/AI/Action/actionShowMemoryPhoto.h index 1343a643..c226988b 100644 --- a/src/Game/AI/Action/actionShowMemoryPhoto.h +++ b/src/Game/AI/Action/actionShowMemoryPhoto.h @@ -11,13 +11,9 @@ public: ~ShowMemoryPhoto() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 int* mPhotoNo_d{}; }; diff --git a/src/Game/AI/Action/actionShowPhoto.cpp b/src/Game/AI/Action/actionShowPhoto.cpp index b0270122..c0903c99 100644 --- a/src/Game/AI/Action/actionShowPhoto.cpp +++ b/src/Game/AI/Action/actionShowPhoto.cpp @@ -10,20 +10,8 @@ bool ShowPhoto::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void ShowPhoto::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void ShowPhoto::leave_() { - ksys::act::ai::Action::leave_(); -} - void ShowPhoto::loadParams_() { getDynamicParam(&mActorName_d, "ActorName"); } -void ShowPhoto::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionShowPhoto.h b/src/Game/AI/Action/actionShowPhoto.h index ddbb94a4..e129b23b 100644 --- a/src/Game/AI/Action/actionShowPhoto.h +++ b/src/Game/AI/Action/actionShowPhoto.h @@ -11,13 +11,9 @@ public: ~ShowPhoto() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 sead::SafeString* mActorName_d{}; }; diff --git a/src/Game/AI/Action/actionSideStep.cpp b/src/Game/AI/Action/actionSideStep.cpp index 29e13419..4cf9c8f0 100644 --- a/src/Game/AI/Action/actionSideStep.cpp +++ b/src/Game/AI/Action/actionSideStep.cpp @@ -6,10 +6,6 @@ SideStep::SideStep(const InitArg& arg) : ksys::act::ai::Action(arg) {} SideStep::~SideStep() = default; -bool SideStep::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - void SideStep::enter_(ksys::act::ai::InlineParamPack* params) { ksys::act::ai::Action::enter_(params); } diff --git a/src/Game/AI/Action/actionSideStep.h b/src/Game/AI/Action/actionSideStep.h index 402d5089..5b1a0fab 100644 --- a/src/Game/AI/Action/actionSideStep.h +++ b/src/Game/AI/Action/actionSideStep.h @@ -10,7 +10,6 @@ public: explicit SideStep(const InitArg& arg); ~SideStep() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionSideStepWait.cpp b/src/Game/AI/Action/actionSideStepWait.cpp index d48a2754..c10799dc 100644 --- a/src/Game/AI/Action/actionSideStepWait.cpp +++ b/src/Game/AI/Action/actionSideStepWait.cpp @@ -6,10 +6,6 @@ SideStepWait::SideStepWait(const InitArg& arg) : ksys::act::ai::Action(arg) {} SideStepWait::~SideStepWait() = default; -bool SideStepWait::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - void SideStepWait::enter_(ksys::act::ai::InlineParamPack* params) { ksys::act::ai::Action::enter_(params); } diff --git a/src/Game/AI/Action/actionSideStepWait.h b/src/Game/AI/Action/actionSideStepWait.h index 8d36fbf0..ac3307b2 100644 --- a/src/Game/AI/Action/actionSideStepWait.h +++ b/src/Game/AI/Action/actionSideStepWait.h @@ -10,7 +10,6 @@ public: explicit SideStepWait(const InitArg& arg); ~SideStepWait() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionSimpleGrabWithAS.cpp b/src/Game/AI/Action/actionSimpleGrabWithAS.cpp index d449c3eb..c2138aa9 100644 --- a/src/Game/AI/Action/actionSimpleGrabWithAS.cpp +++ b/src/Game/AI/Action/actionSimpleGrabWithAS.cpp @@ -6,25 +6,9 @@ SimpleGrabWithAS::SimpleGrabWithAS(const InitArg& arg) : SimpleGrabWithASBase(ar SimpleGrabWithAS::~SimpleGrabWithAS() = default; -bool SimpleGrabWithAS::init_(sead::Heap* heap) { - return SimpleGrabWithASBase::init_(heap); -} - -void SimpleGrabWithAS::enter_(ksys::act::ai::InlineParamPack* params) { - SimpleGrabWithASBase::enter_(params); -} - -void SimpleGrabWithAS::leave_() { - SimpleGrabWithASBase::leave_(); -} - void SimpleGrabWithAS::loadParams_() { SimpleGrabWithASBase::loadParams_(); getStaticParam(&mASName_s, "ASName"); } -void SimpleGrabWithAS::calc_() { - SimpleGrabWithASBase::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionSimpleGrabWithAS.h b/src/Game/AI/Action/actionSimpleGrabWithAS.h index 5d2ab3dd..d56e47a5 100644 --- a/src/Game/AI/Action/actionSimpleGrabWithAS.h +++ b/src/Game/AI/Action/actionSimpleGrabWithAS.h @@ -11,14 +11,9 @@ public: explicit SimpleGrabWithAS(const InitArg& arg); ~SimpleGrabWithAS() override; - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // static_param at offset 0x50 sead::SafeString mASName_s{}; }; diff --git a/src/Game/AI/Action/actionSimpleGrabWithASBase.cpp b/src/Game/AI/Action/actionSimpleGrabWithASBase.cpp index a683857e..76a33540 100644 --- a/src/Game/AI/Action/actionSimpleGrabWithASBase.cpp +++ b/src/Game/AI/Action/actionSimpleGrabWithASBase.cpp @@ -6,24 +6,8 @@ SimpleGrabWithASBase::SimpleGrabWithASBase(const InitArg& arg) : Grab(arg) {} SimpleGrabWithASBase::~SimpleGrabWithASBase() = default; -bool SimpleGrabWithASBase::init_(sead::Heap* heap) { - return Grab::init_(heap); -} - -void SimpleGrabWithASBase::enter_(ksys::act::ai::InlineParamPack* params) { - Grab::enter_(params); -} - -void SimpleGrabWithASBase::leave_() { - Grab::leave_(); -} - void SimpleGrabWithASBase::loadParams_() { Grab::loadParams_(); } -void SimpleGrabWithASBase::calc_() { - Grab::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionSimpleGrabWithASBase.h b/src/Game/AI/Action/actionSimpleGrabWithASBase.h index 90eb89b6..28d6a9ef 100644 --- a/src/Game/AI/Action/actionSimpleGrabWithASBase.h +++ b/src/Game/AI/Action/actionSimpleGrabWithASBase.h @@ -11,13 +11,9 @@ public: explicit SimpleGrabWithASBase(const InitArg& arg); ~SimpleGrabWithASBase() override; - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionSiteBossFlyWaitTurnToTarget.cpp b/src/Game/AI/Action/actionSiteBossFlyWaitTurnToTarget.cpp index 41b739a5..686f8898 100644 --- a/src/Game/AI/Action/actionSiteBossFlyWaitTurnToTarget.cpp +++ b/src/Game/AI/Action/actionSiteBossFlyWaitTurnToTarget.cpp @@ -8,7 +8,7 @@ SiteBossFlyWaitTurnToTarget::SiteBossFlyWaitTurnToTarget(const InitArg& arg) SiteBossFlyWaitTurnToTarget::~SiteBossFlyWaitTurnToTarget() = default; bool SiteBossFlyWaitTurnToTarget::init_(sead::Heap* heap) { - return LastBossFlyWait::init_(heap); // NOLINT(bugprone-parent-virtual-call) + return LastBossFlyWaitTurnToTarget::init_(heap); } void SiteBossFlyWaitTurnToTarget::enter_(ksys::act::ai::InlineParamPack* params) { diff --git a/src/Game/AI/Action/actionSiteBossLswordWhirlSlash.cpp b/src/Game/AI/Action/actionSiteBossLswordWhirlSlash.cpp index 20a0c055..bca747e1 100644 --- a/src/Game/AI/Action/actionSiteBossLswordWhirlSlash.cpp +++ b/src/Game/AI/Action/actionSiteBossLswordWhirlSlash.cpp @@ -7,18 +7,6 @@ SiteBossLswordWhirlSlash::SiteBossLswordWhirlSlash(const InitArg& arg) SiteBossLswordWhirlSlash::~SiteBossLswordWhirlSlash() = default; -bool SiteBossLswordWhirlSlash::init_(sead::Heap* heap) { - return SiteBossLswordAtkWithChemical::init_(heap); -} - -void SiteBossLswordWhirlSlash::enter_(ksys::act::ai::InlineParamPack* params) { - SiteBossLswordAtkWithChemical::enter_(params); -} - -void SiteBossLswordWhirlSlash::leave_() { - SiteBossLswordAtkWithChemical::leave_(); -} - void SiteBossLswordWhirlSlash::loadParams_() { SiteBossLswordAtkWithChemical::loadParams_(); getStaticParam(&mEmitChangeDist_s, "EmitChangeDist"); diff --git a/src/Game/AI/Action/actionSiteBossLswordWhirlSlash.h b/src/Game/AI/Action/actionSiteBossLswordWhirlSlash.h index ea5770f2..cf6d4f68 100644 --- a/src/Game/AI/Action/actionSiteBossLswordWhirlSlash.h +++ b/src/Game/AI/Action/actionSiteBossLswordWhirlSlash.h @@ -11,9 +11,6 @@ public: explicit SiteBossLswordWhirlSlash(const InitArg& arg); ~SiteBossLswordWhirlSlash() override; - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: diff --git a/src/Game/AI/Action/actionSmallDamage.cpp b/src/Game/AI/Action/actionSmallDamage.cpp index 4878c259..8ebd68be 100644 --- a/src/Game/AI/Action/actionSmallDamage.cpp +++ b/src/Game/AI/Action/actionSmallDamage.cpp @@ -4,34 +4,8 @@ namespace uking::action { SmallDamage::SmallDamage(const InitArg& arg) : SmallDamageBase(arg) {} -SmallDamage::~SmallDamage() = default; - -bool SmallDamage::init_(sead::Heap* heap) { - return SmallDamageBase::init_(heap); -} - void SmallDamage::enter_(ksys::act::ai::InlineParamPack* params) { SmallDamageBase::enter_(params); } -void SmallDamage::leave_() { - SmallDamageBase::leave_(); -} - -void SmallDamage::loadParams_() { - getStaticParam(&mHitImpactForceSmallSwordS_s, "HitImpactForceSmallSwordS"); - getStaticParam(&mHitImpactForceSmallSwordL_s, "HitImpactForceSmallSwordL"); - getStaticParam(&mHitImpactForceLargeSwordS_s, "HitImpactForceLargeSwordS"); - getStaticParam(&mHitImpactForceLargeSwordL_s, "HitImpactForceLargeSwordL"); - getStaticParam(&mHitImpactForceSpearS_s, "HitImpactForceSpearS"); - getStaticParam(&mHitImpactForceSpearL_s, "HitImpactForceSpearL"); - getStaticParam(&mVelReduce_s, "VelReduce"); - getStaticParam(&mHighSpeedY_s, "HighSpeedY"); - getStaticParam(&mVelReduceY_s, "VelReduceY"); -} - -void SmallDamage::calc_() { - SmallDamageBase::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionSmallDamage.h b/src/Game/AI/Action/actionSmallDamage.h index 2d16098e..53e2d61d 100644 --- a/src/Game/AI/Action/actionSmallDamage.h +++ b/src/Game/AI/Action/actionSmallDamage.h @@ -9,34 +9,10 @@ class SmallDamage : public SmallDamageBase { SEAD_RTTI_OVERRIDE(SmallDamage, SmallDamageBase) public: explicit SmallDamage(const InitArg& arg); - ~SmallDamage() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; protected: - void calc_() override; - - // static_param at offset 0x20 - const float* mVelReduce_s{}; - // static_param at offset 0x28 - const float* mHighSpeedY_s{}; - // static_param at offset 0x30 - const float* mVelReduceY_s{}; - // static_param at offset 0x38 - const float* mHitImpactForceSmallSwordS_s{}; - // static_param at offset 0x40 - const float* mHitImpactForceSmallSwordL_s{}; - // static_param at offset 0x48 - const float* mHitImpactForceLargeSwordS_s{}; - // static_param at offset 0x50 - const float* mHitImpactForceLargeSwordL_s{}; - // static_param at offset 0x58 - const float* mHitImpactForceSpearS_s{}; - // static_param at offset 0x60 - const float* mHitImpactForceSpearL_s{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionSmallDamageBase.cpp b/src/Game/AI/Action/actionSmallDamageBase.cpp index d68fd891..459d0b46 100644 --- a/src/Game/AI/Action/actionSmallDamageBase.cpp +++ b/src/Game/AI/Action/actionSmallDamageBase.cpp @@ -4,32 +4,10 @@ namespace uking::action { SmallDamageBase::SmallDamageBase(const InitArg& arg) : TakeHitImpactForce(arg) {} -SmallDamageBase::~SmallDamageBase() = default; - -bool SmallDamageBase::init_(sead::Heap* heap) { - return TakeHitImpactForce::init_(heap); -} - void SmallDamageBase::enter_(ksys::act::ai::InlineParamPack* params) { TakeHitImpactForce::enter_(params); } -void SmallDamageBase::leave_() { - TakeHitImpactForce::leave_(); -} - -void SmallDamageBase::loadParams_() { - getStaticParam(&mHitImpactForceSmallSwordS_s, "HitImpactForceSmallSwordS"); - getStaticParam(&mHitImpactForceSmallSwordL_s, "HitImpactForceSmallSwordL"); - getStaticParam(&mHitImpactForceLargeSwordS_s, "HitImpactForceLargeSwordS"); - getStaticParam(&mHitImpactForceLargeSwordL_s, "HitImpactForceLargeSwordL"); - getStaticParam(&mHitImpactForceSpearS_s, "HitImpactForceSpearS"); - getStaticParam(&mHitImpactForceSpearL_s, "HitImpactForceSpearL"); - getStaticParam(&mVelReduce_s, "VelReduce"); - getStaticParam(&mHighSpeedY_s, "HighSpeedY"); - getStaticParam(&mVelReduceY_s, "VelReduceY"); -} - void SmallDamageBase::calc_() { TakeHitImpactForce::calc_(); } diff --git a/src/Game/AI/Action/actionSmallDamageBase.h b/src/Game/AI/Action/actionSmallDamageBase.h index adfa685c..ce6964e4 100644 --- a/src/Game/AI/Action/actionSmallDamageBase.h +++ b/src/Game/AI/Action/actionSmallDamageBase.h @@ -9,34 +9,11 @@ class SmallDamageBase : public TakeHitImpactForce { SEAD_RTTI_OVERRIDE(SmallDamageBase, TakeHitImpactForce) public: explicit SmallDamageBase(const InitArg& arg); - ~SmallDamageBase() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; protected: void calc_() override; - - // static_param at offset 0x20 - const float* mVelReduce_s{}; - // static_param at offset 0x28 - const float* mHighSpeedY_s{}; - // static_param at offset 0x30 - const float* mVelReduceY_s{}; - // static_param at offset 0x38 - const float* mHitImpactForceSmallSwordS_s{}; - // static_param at offset 0x40 - const float* mHitImpactForceSmallSwordL_s{}; - // static_param at offset 0x48 - const float* mHitImpactForceLargeSwordS_s{}; - // static_param at offset 0x50 - const float* mHitImpactForceLargeSwordL_s{}; - // static_param at offset 0x58 - const float* mHitImpactForceSpearS_s{}; - // static_param at offset 0x60 - const float* mHitImpactForceSpearL_s{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionSmallDamageDirectPreTargetBack.cpp b/src/Game/AI/Action/actionSmallDamageDirectPreTargetBack.cpp index b5766448..ddf15153 100644 --- a/src/Game/AI/Action/actionSmallDamageDirectPreTargetBack.cpp +++ b/src/Game/AI/Action/actionSmallDamageDirectPreTargetBack.cpp @@ -7,27 +7,4 @@ SmallDamageDirectPreTargetBack::SmallDamageDirectPreTargetBack(const InitArg& ar SmallDamageDirectPreTargetBack::~SmallDamageDirectPreTargetBack() = default; -bool SmallDamageDirectPreTargetBack::init_(sead::Heap* heap) { - return SmallDamageDirectPreTargetBone::init_(heap); -} - -void SmallDamageDirectPreTargetBack::enter_(ksys::act::ai::InlineParamPack* params) { - SmallDamageDirectPreTargetBone::enter_(params); -} - -void SmallDamageDirectPreTargetBack::leave_() { - SmallDamageDirectPreTargetBone::leave_(); -} - -void SmallDamageDirectPreTargetBack::loadParams_() { - TakeHitImpactForce::loadParams_(); - getStaticParam(&mPreTargetBone_s, "PreTargetBone"); - getStaticParam(&mASName_s, "ASName"); - getStaticParam(&mIsSetHitPosSelecter_s, "IsSetHitPosSelecter"); -} - -void SmallDamageDirectPreTargetBack::calc_() { - SmallDamageDirectPreTargetBone::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionSmallDamageDirectPreTargetBack.h b/src/Game/AI/Action/actionSmallDamageDirectPreTargetBack.h index 3fd08d47..467ae64e 100644 --- a/src/Game/AI/Action/actionSmallDamageDirectPreTargetBack.h +++ b/src/Game/AI/Action/actionSmallDamageDirectPreTargetBack.h @@ -11,20 +11,7 @@ public: explicit SmallDamageDirectPreTargetBack(const InitArg& arg); ~SmallDamageDirectPreTargetBack() override; - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; - protected: - void calc_() override; - - // static_param at offset 0x90 - const int* mPreTargetBone_s{}; - // static_param at offset 0x98 - sead::SafeString mASName_s{}; - // static_param at offset 0xa8 - const bool* mIsSetHitPosSelecter_s{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionSmallDamageDirectPreTargetBone.cpp b/src/Game/AI/Action/actionSmallDamageDirectPreTargetBone.cpp index 84665513..56a2be92 100644 --- a/src/Game/AI/Action/actionSmallDamageDirectPreTargetBone.cpp +++ b/src/Game/AI/Action/actionSmallDamageDirectPreTargetBone.cpp @@ -7,18 +7,6 @@ SmallDamageDirectPreTargetBone::SmallDamageDirectPreTargetBone(const InitArg& ar SmallDamageDirectPreTargetBone::~SmallDamageDirectPreTargetBone() = default; -bool SmallDamageDirectPreTargetBone::init_(sead::Heap* heap) { - return SmallDamage::init_(heap); -} - -void SmallDamageDirectPreTargetBone::enter_(ksys::act::ai::InlineParamPack* params) { - SmallDamage::enter_(params); -} - -void SmallDamageDirectPreTargetBone::leave_() { - SmallDamage::leave_(); -} - void SmallDamageDirectPreTargetBone::loadParams_() { TakeHitImpactForce::loadParams_(); getStaticParam(&mPreTargetBone_s, "PreTargetBone"); @@ -26,8 +14,4 @@ void SmallDamageDirectPreTargetBone::loadParams_() { getStaticParam(&mIsSetHitPosSelecter_s, "IsSetHitPosSelecter"); } -void SmallDamageDirectPreTargetBone::calc_() { - SmallDamage::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionSmallDamageDirectPreTargetBone.h b/src/Game/AI/Action/actionSmallDamageDirectPreTargetBone.h index 13f166e3..1a87175f 100644 --- a/src/Game/AI/Action/actionSmallDamageDirectPreTargetBone.h +++ b/src/Game/AI/Action/actionSmallDamageDirectPreTargetBone.h @@ -11,14 +11,9 @@ public: explicit SmallDamageDirectPreTargetBone(const InitArg& arg); ~SmallDamageDirectPreTargetBone() override; - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // static_param at offset 0x90 const int* mPreTargetBone_s{}; // static_param at offset 0x98 diff --git a/src/Game/AI/Action/actionSoundTriggerFadeAction.cpp b/src/Game/AI/Action/actionSoundTriggerFadeAction.cpp index 82f70911..9e6c5d35 100644 --- a/src/Game/AI/Action/actionSoundTriggerFadeAction.cpp +++ b/src/Game/AI/Action/actionSoundTriggerFadeAction.cpp @@ -10,20 +10,8 @@ bool SoundTriggerFadeAction::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void SoundTriggerFadeAction::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void SoundTriggerFadeAction::leave_() { - ksys::act::ai::Action::leave_(); -} - void SoundTriggerFadeAction::loadParams_() { getDynamicParam(&mSound_d, "Sound"); } -void SoundTriggerFadeAction::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionSoundTriggerFadeAction.h b/src/Game/AI/Action/actionSoundTriggerFadeAction.h index ae6f9abc..8ed4d1b6 100644 --- a/src/Game/AI/Action/actionSoundTriggerFadeAction.h +++ b/src/Game/AI/Action/actionSoundTriggerFadeAction.h @@ -11,13 +11,9 @@ public: ~SoundTriggerFadeAction() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 sead::SafeString* mSound_d{}; }; diff --git a/src/Game/AI/Action/actionStalEnemyBlownOff.cpp b/src/Game/AI/Action/actionStalEnemyBlownOff.cpp index 03e0999d..f629eb13 100644 --- a/src/Game/AI/Action/actionStalEnemyBlownOff.cpp +++ b/src/Game/AI/Action/actionStalEnemyBlownOff.cpp @@ -6,10 +6,6 @@ StalEnemyBlownOff::StalEnemyBlownOff(const InitArg& arg) : ksys::act::ai::Action StalEnemyBlownOff::~StalEnemyBlownOff() = default; -bool StalEnemyBlownOff::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - void StalEnemyBlownOff::enter_(ksys::act::ai::InlineParamPack* params) { ksys::act::ai::Action::enter_(params); } diff --git a/src/Game/AI/Action/actionStalEnemyBlownOff.h b/src/Game/AI/Action/actionStalEnemyBlownOff.h index 8ed52c94..25ae06f8 100644 --- a/src/Game/AI/Action/actionStalEnemyBlownOff.h +++ b/src/Game/AI/Action/actionStalEnemyBlownOff.h @@ -10,7 +10,6 @@ public: explicit StalEnemyBlownOff(const InitArg& arg); ~StalEnemyBlownOff() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionStartLifeUpDemo.cpp b/src/Game/AI/Action/actionStartLifeUpDemo.cpp index 7ad3ab99..855bf053 100644 --- a/src/Game/AI/Action/actionStartLifeUpDemo.cpp +++ b/src/Game/AI/Action/actionStartLifeUpDemo.cpp @@ -14,10 +14,6 @@ void StartLifeUpDemo::enter_(ksys::act::ai::InlineParamPack* params) { ksys::act::ai::Action::enter_(params); } -void StartLifeUpDemo::leave_() { - ksys::act::ai::Action::leave_(); -} - void StartLifeUpDemo::loadParams_() {} void StartLifeUpDemo::calc_() { diff --git a/src/Game/AI/Action/actionStartLifeUpDemo.h b/src/Game/AI/Action/actionStartLifeUpDemo.h index 4922a286..5965f374 100644 --- a/src/Game/AI/Action/actionStartLifeUpDemo.h +++ b/src/Game/AI/Action/actionStartLifeUpDemo.h @@ -12,7 +12,6 @@ public: bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: diff --git a/src/Game/AI/Action/actionStartMapOpenDemo.cpp b/src/Game/AI/Action/actionStartMapOpenDemo.cpp index fd7658ee..7b61d7bc 100644 --- a/src/Game/AI/Action/actionStartMapOpenDemo.cpp +++ b/src/Game/AI/Action/actionStartMapOpenDemo.cpp @@ -10,20 +10,8 @@ bool StartMapOpenDemo::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void StartMapOpenDemo::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void StartMapOpenDemo::leave_() { - ksys::act::ai::Action::leave_(); -} - void StartMapOpenDemo::loadParams_() { getDynamicParam(&mIsPlayerClose_d, "IsPlayerClose"); } -void StartMapOpenDemo::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionStartMapOpenDemo.h b/src/Game/AI/Action/actionStartMapOpenDemo.h index a99e93cf..f41c0ad9 100644 --- a/src/Game/AI/Action/actionStartMapOpenDemo.h +++ b/src/Game/AI/Action/actionStartMapOpenDemo.h @@ -11,13 +11,9 @@ public: ~StartMapOpenDemo() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 bool* mIsPlayerClose_d{}; }; diff --git a/src/Game/AI/Action/actionStartStaminaUpDemo.cpp b/src/Game/AI/Action/actionStartStaminaUpDemo.cpp index a0d7f343..e03dcfa9 100644 --- a/src/Game/AI/Action/actionStartStaminaUpDemo.cpp +++ b/src/Game/AI/Action/actionStartStaminaUpDemo.cpp @@ -10,18 +10,6 @@ bool StartStaminaUpDemo::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void StartStaminaUpDemo::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void StartStaminaUpDemo::leave_() { - ksys::act::ai::Action::leave_(); -} - void StartStaminaUpDemo::loadParams_() {} -void StartStaminaUpDemo::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionStartStaminaUpDemo.h b/src/Game/AI/Action/actionStartStaminaUpDemo.h index 84b39caf..d14bea5c 100644 --- a/src/Game/AI/Action/actionStartStaminaUpDemo.h +++ b/src/Game/AI/Action/actionStartStaminaUpDemo.h @@ -11,12 +11,9 @@ public: ~StartStaminaUpDemo() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionStartupTelescope.cpp b/src/Game/AI/Action/actionStartupTelescope.cpp index b4adf593..652aa27c 100644 --- a/src/Game/AI/Action/actionStartupTelescope.cpp +++ b/src/Game/AI/Action/actionStartupTelescope.cpp @@ -14,10 +14,6 @@ void StartupTelescope::enter_(ksys::act::ai::InlineParamPack* params) { ksys::act::ai::Action::enter_(params); } -void StartupTelescope::leave_() { - ksys::act::ai::Action::leave_(); -} - void StartupTelescope::loadParams_() {} void StartupTelescope::calc_() { diff --git a/src/Game/AI/Action/actionStartupTelescope.h b/src/Game/AI/Action/actionStartupTelescope.h index d7bc6f2f..877efcfe 100644 --- a/src/Game/AI/Action/actionStartupTelescope.h +++ b/src/Game/AI/Action/actionStartupTelescope.h @@ -12,7 +12,6 @@ public: bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: diff --git a/src/Game/AI/Action/actionStepDoubleAttack.cpp b/src/Game/AI/Action/actionStepDoubleAttack.cpp index dbafaffc..de2d43bd 100644 --- a/src/Game/AI/Action/actionStepDoubleAttack.cpp +++ b/src/Game/AI/Action/actionStepDoubleAttack.cpp @@ -6,10 +6,6 @@ StepDoubleAttack::StepDoubleAttack(const InitArg& arg) : ksys::act::ai::Action(a StepDoubleAttack::~StepDoubleAttack() = default; -bool StepDoubleAttack::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - void StepDoubleAttack::enter_(ksys::act::ai::InlineParamPack* params) { ksys::act::ai::Action::enter_(params); } diff --git a/src/Game/AI/Action/actionStepDoubleAttack.h b/src/Game/AI/Action/actionStepDoubleAttack.h index e8371142..59536f22 100644 --- a/src/Game/AI/Action/actionStepDoubleAttack.h +++ b/src/Game/AI/Action/actionStepDoubleAttack.h @@ -10,7 +10,6 @@ public: explicit StepDoubleAttack(const InitArg& arg); ~StepDoubleAttack() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionStepDoubleLargeAttack.cpp b/src/Game/AI/Action/actionStepDoubleLargeAttack.cpp index 4cfec943..9061d313 100644 --- a/src/Game/AI/Action/actionStepDoubleLargeAttack.cpp +++ b/src/Game/AI/Action/actionStepDoubleLargeAttack.cpp @@ -4,33 +4,4 @@ namespace uking::action { StepDoubleLargeAttack::StepDoubleLargeAttack(const InitArg& arg) : StepDoubleAttack(arg) {} -StepDoubleLargeAttack::~StepDoubleLargeAttack() = default; - -bool StepDoubleLargeAttack::init_(sead::Heap* heap) { - return StepDoubleAttack::init_(heap); -} - -void StepDoubleLargeAttack::enter_(ksys::act::ai::InlineParamPack* params) { - StepDoubleAttack::enter_(params); -} - -void StepDoubleLargeAttack::leave_() { - StepDoubleAttack::leave_(); -} - -void StepDoubleLargeAttack::loadParams_() { - getStaticParam(&mWeaponIdx_s, "WeaponIdx"); - getStaticParam(&mCloseDist_s, "CloseDist"); - getStaticParam(&mSpeed_s, "Speed"); - getStaticParam(&mRotSpd_s, "RotSpd"); - getStaticParam(&mJustAvoidSideDist_s, "JustAvoidSideDist"); - getStaticParam(&mJustAvoidBackDist_s, "JustAvoidBackDist"); - getStaticParam(&mJustAvoidAngle_s, "JustAvoidAngle"); - getDynamicParam(&mTargetPos_d, "TargetPos"); -} - -void StepDoubleLargeAttack::calc_() { - StepDoubleAttack::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionStepDoubleLargeAttack.h b/src/Game/AI/Action/actionStepDoubleLargeAttack.h index 752063e7..e9122747 100644 --- a/src/Game/AI/Action/actionStepDoubleLargeAttack.h +++ b/src/Game/AI/Action/actionStepDoubleLargeAttack.h @@ -9,32 +9,8 @@ class StepDoubleLargeAttack : public StepDoubleAttack { SEAD_RTTI_OVERRIDE(StepDoubleLargeAttack, StepDoubleAttack) public: explicit StepDoubleLargeAttack(const InitArg& arg); - ~StepDoubleLargeAttack() override; - - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; protected: - void calc_() override; - - // static_param at offset 0x20 - const int* mWeaponIdx_s{}; - // static_param at offset 0x28 - const float* mCloseDist_s{}; - // static_param at offset 0x30 - const float* mSpeed_s{}; - // static_param at offset 0x38 - const float* mRotSpd_s{}; - // static_param at offset 0x40 - const float* mJustAvoidSideDist_s{}; - // static_param at offset 0x48 - const float* mJustAvoidBackDist_s{}; - // static_param at offset 0x50 - const float* mJustAvoidAngle_s{}; - // dynamic_param at offset 0x58 - sead::Vector3f* mTargetPos_d{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionStick.cpp b/src/Game/AI/Action/actionStick.cpp index 0c01dbff..34fbb759 100644 --- a/src/Game/AI/Action/actionStick.cpp +++ b/src/Game/AI/Action/actionStick.cpp @@ -6,10 +6,6 @@ Stick::Stick(const InitArg& arg) : ActionEx(arg) {} Stick::~Stick() = default; -bool Stick::init_(sead::Heap* heap) { - return ActionEx::init_(heap); -} - void Stick::enter_(ksys::act::ai::InlineParamPack* params) { ActionEx::enter_(params); } diff --git a/src/Game/AI/Action/actionStick.h b/src/Game/AI/Action/actionStick.h index b015c143..da879094 100644 --- a/src/Game/AI/Action/actionStick.h +++ b/src/Game/AI/Action/actionStick.h @@ -11,7 +11,6 @@ public: explicit Stick(const InitArg& arg); ~Stick() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionStopASIgnite.cpp b/src/Game/AI/Action/actionStopASIgnite.cpp index 23c2c69a..1304fd79 100644 --- a/src/Game/AI/Action/actionStopASIgnite.cpp +++ b/src/Game/AI/Action/actionStopASIgnite.cpp @@ -4,8 +4,6 @@ namespace uking::action { StopASIgnite::StopASIgnite(const InitArg& arg) : OnetimeStopASPlay(arg) {} -StopASIgnite::~StopASIgnite() = default; - bool StopASIgnite::init_(sead::Heap* heap) { return OnetimeStopASPlay::init_(heap); } diff --git a/src/Game/AI/Action/actionStopASIgnite.h b/src/Game/AI/Action/actionStopASIgnite.h index a3188dd7..94b1f036 100644 --- a/src/Game/AI/Action/actionStopASIgnite.h +++ b/src/Game/AI/Action/actionStopASIgnite.h @@ -9,7 +9,6 @@ class StopASIgnite : public OnetimeStopASPlay { SEAD_RTTI_OVERRIDE(StopASIgnite, OnetimeStopASPlay) public: explicit StopASIgnite(const InitArg& arg); - ~StopASIgnite() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/AI/Action/actionStopASPlay.cpp b/src/Game/AI/Action/actionStopASPlay.cpp index 76e62b4b..3f8562d2 100644 --- a/src/Game/AI/Action/actionStopASPlay.cpp +++ b/src/Game/AI/Action/actionStopASPlay.cpp @@ -6,10 +6,6 @@ StopASPlay::StopASPlay(const InitArg& arg) : ActionWithPosAngReduce(arg) {} StopASPlay::~StopASPlay() = default; -bool StopASPlay::init_(sead::Heap* heap) { - return ActionWithPosAngReduce::init_(heap); -} - void StopASPlay::enter_(ksys::act::ai::InlineParamPack* params) { ActionWithPosAngReduce::enter_(params); } diff --git a/src/Game/AI/Action/actionStopASPlay.h b/src/Game/AI/Action/actionStopASPlay.h index 5f8aab67..f8995384 100644 --- a/src/Game/AI/Action/actionStopASPlay.h +++ b/src/Game/AI/Action/actionStopASPlay.h @@ -11,7 +11,6 @@ public: explicit StopASPlay(const InitArg& arg); ~StopASPlay() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionStopChargeChemicalWeaponPower.cpp b/src/Game/AI/Action/actionStopChargeChemicalWeaponPower.cpp index 53b3388b..c96a0a50 100644 --- a/src/Game/AI/Action/actionStopChargeChemicalWeaponPower.cpp +++ b/src/Game/AI/Action/actionStopChargeChemicalWeaponPower.cpp @@ -11,20 +11,8 @@ bool StopChargeChemicalWeaponPower::init_(sead::Heap* heap) { return SetChemicalWeaponPower::init_(heap); } -void StopChargeChemicalWeaponPower::enter_(ksys::act::ai::InlineParamPack* params) { - SetChemicalWeaponPower::enter_(params); -} - -void StopChargeChemicalWeaponPower::leave_() { - SetChemicalWeaponPower::leave_(); -} - void StopChargeChemicalWeaponPower::loadParams_() { SetChemicalWeaponPower::loadParams_(); } -void StopChargeChemicalWeaponPower::calc_() { - SetChemicalWeaponPower::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionStopChargeChemicalWeaponPower.h b/src/Game/AI/Action/actionStopChargeChemicalWeaponPower.h index 53f9fe97..2a6325ad 100644 --- a/src/Game/AI/Action/actionStopChargeChemicalWeaponPower.h +++ b/src/Game/AI/Action/actionStopChargeChemicalWeaponPower.h @@ -12,12 +12,9 @@ public: ~StopChargeChemicalWeaponPower() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionStopEventMiniGameTime.cpp b/src/Game/AI/Action/actionStopEventMiniGameTime.cpp index 0db0bab7..0a506865 100644 --- a/src/Game/AI/Action/actionStopEventMiniGameTime.cpp +++ b/src/Game/AI/Action/actionStopEventMiniGameTime.cpp @@ -10,18 +10,6 @@ bool StopEventMiniGameTime::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void StopEventMiniGameTime::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void StopEventMiniGameTime::leave_() { - ksys::act::ai::Action::leave_(); -} - void StopEventMiniGameTime::loadParams_() {} -void StopEventMiniGameTime::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionStopEventMiniGameTime.h b/src/Game/AI/Action/actionStopEventMiniGameTime.h index 835dd7de..b5dc42a5 100644 --- a/src/Game/AI/Action/actionStopEventMiniGameTime.h +++ b/src/Game/AI/Action/actionStopEventMiniGameTime.h @@ -11,12 +11,9 @@ public: ~StopEventMiniGameTime() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionStorePlayerPosAndRotate.cpp b/src/Game/AI/Action/actionStorePlayerPosAndRotate.cpp index e6be9bf7..a8ecd7d2 100644 --- a/src/Game/AI/Action/actionStorePlayerPosAndRotate.cpp +++ b/src/Game/AI/Action/actionStorePlayerPosAndRotate.cpp @@ -10,21 +10,9 @@ bool StorePlayerPosAndRotate::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void StorePlayerPosAndRotate::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void StorePlayerPosAndRotate::leave_() { - ksys::act::ai::Action::leave_(); -} - void StorePlayerPosAndRotate::loadParams_() { getDynamicParam(&mGameDataVec3fPlayerPos_d, "GameDataVec3fPlayerPos"); getDynamicParam(&mGameDataFloatPlayerDirectionY_d, "GameDataFloatPlayerDirectionY"); } -void StorePlayerPosAndRotate::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionStorePlayerPosAndRotate.h b/src/Game/AI/Action/actionStorePlayerPosAndRotate.h index ac3d9472..f3a80d38 100644 --- a/src/Game/AI/Action/actionStorePlayerPosAndRotate.h +++ b/src/Game/AI/Action/actionStorePlayerPosAndRotate.h @@ -11,13 +11,9 @@ public: ~StorePlayerPosAndRotate() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 sead::SafeString* mGameDataVec3fPlayerPos_d{}; // dynamic_param at offset 0x30 diff --git a/src/Game/AI/Action/actionStun.cpp b/src/Game/AI/Action/actionStun.cpp index 66341db3..3a6841dd 100644 --- a/src/Game/AI/Action/actionStun.cpp +++ b/src/Game/AI/Action/actionStun.cpp @@ -6,10 +6,6 @@ Stun::Stun(const InitArg& arg) : ksys::act::ai::Action(arg) {} Stun::~Stun() = default; -bool Stun::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - void Stun::enter_(ksys::act::ai::InlineParamPack* params) { ksys::act::ai::Action::enter_(params); } diff --git a/src/Game/AI/Action/actionStun.h b/src/Game/AI/Action/actionStun.h index 863432ab..caa131cd 100644 --- a/src/Game/AI/Action/actionStun.h +++ b/src/Game/AI/Action/actionStun.h @@ -10,7 +10,6 @@ public: explicit Stun(const InitArg& arg); ~Stun() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionSwimGetUp.cpp b/src/Game/AI/Action/actionSwimGetUp.cpp index be9ef825..2ed0c9bb 100644 --- a/src/Game/AI/Action/actionSwimGetUp.cpp +++ b/src/Game/AI/Action/actionSwimGetUp.cpp @@ -6,10 +6,6 @@ SwimGetUp::SwimGetUp(const InitArg& arg) : GetUp(arg) {} SwimGetUp::~SwimGetUp() = default; -bool SwimGetUp::init_(sead::Heap* heap) { - return GetUp::init_(heap); -} - void SwimGetUp::enter_(ksys::act::ai::InlineParamPack* params) { GetUp::enter_(params); } diff --git a/src/Game/AI/Action/actionSwimGetUp.h b/src/Game/AI/Action/actionSwimGetUp.h index 63b9c787..6cf68ddb 100644 --- a/src/Game/AI/Action/actionSwimGetUp.h +++ b/src/Game/AI/Action/actionSwimGetUp.h @@ -11,7 +11,6 @@ public: explicit SwimGetUp(const InitArg& arg); ~SwimGetUp() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionSwimMoveASHoldEvent.cpp b/src/Game/AI/Action/actionSwimMoveASHoldEvent.cpp index 50d0e5e6..ca1ab92b 100644 --- a/src/Game/AI/Action/actionSwimMoveASHoldEvent.cpp +++ b/src/Game/AI/Action/actionSwimMoveASHoldEvent.cpp @@ -6,26 +6,14 @@ SwimMoveASHoldEvent::SwimMoveASHoldEvent(const InitArg& arg) : SwimMoveBase(arg) SwimMoveASHoldEvent::~SwimMoveASHoldEvent() = default; -bool SwimMoveASHoldEvent::init_(sead::Heap* heap) { - return SwimMoveBase::init_(heap); -} - void SwimMoveASHoldEvent::enter_(ksys::act::ai::InlineParamPack* params) { SwimMoveBase::enter_(params); } -void SwimMoveASHoldEvent::leave_() { - SwimMoveBase::leave_(); -} - void SwimMoveASHoldEvent::loadParams_() { SwimMoveBase::loadParams_(); getStaticParam(&mPosReduceRatio_s, "PosReduceRatio"); getStaticParam(&mASName_s, "ASName"); } -void SwimMoveASHoldEvent::calc_() { - SwimMoveBase::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionSwimMoveASHoldEvent.h b/src/Game/AI/Action/actionSwimMoveASHoldEvent.h index 9241f967..cb483a60 100644 --- a/src/Game/AI/Action/actionSwimMoveASHoldEvent.h +++ b/src/Game/AI/Action/actionSwimMoveASHoldEvent.h @@ -11,14 +11,10 @@ public: explicit SwimMoveASHoldEvent(const InitArg& arg); ~SwimMoveASHoldEvent() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // static_param at offset 0xe8 const float* mPosReduceRatio_s{}; // static_param at offset 0xf0 diff --git a/src/Game/AI/Action/actionSwimNoticeTurn.cpp b/src/Game/AI/Action/actionSwimNoticeTurn.cpp index 38ed4846..2ad09e54 100644 --- a/src/Game/AI/Action/actionSwimNoticeTurn.cpp +++ b/src/Game/AI/Action/actionSwimNoticeTurn.cpp @@ -6,10 +6,6 @@ SwimNoticeTurn::SwimNoticeTurn(const InitArg& arg) : WaterFloatBase(arg) {} SwimNoticeTurn::~SwimNoticeTurn() = default; -bool SwimNoticeTurn::init_(sead::Heap* heap) { - return WaterFloatBase::init_(heap); -} - void SwimNoticeTurn::enter_(ksys::act::ai::InlineParamPack* params) { WaterFloatBase::enter_(params); } diff --git a/src/Game/AI/Action/actionSwimNoticeTurn.h b/src/Game/AI/Action/actionSwimNoticeTurn.h index acf75522..69f315b4 100644 --- a/src/Game/AI/Action/actionSwimNoticeTurn.h +++ b/src/Game/AI/Action/actionSwimNoticeTurn.h @@ -11,7 +11,6 @@ public: explicit SwimNoticeTurn(const InitArg& arg); ~SwimNoticeTurn() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionSwimSmallDamage.cpp b/src/Game/AI/Action/actionSwimSmallDamage.cpp index 2381fd0b..5cf8253d 100644 --- a/src/Game/AI/Action/actionSwimSmallDamage.cpp +++ b/src/Game/AI/Action/actionSwimSmallDamage.cpp @@ -6,10 +6,6 @@ SwimSmallDamage::SwimSmallDamage(const InitArg& arg) : SmallDamage(arg) {} SwimSmallDamage::~SwimSmallDamage() = default; -bool SwimSmallDamage::init_(sead::Heap* heap) { - return SmallDamage::init_(heap); -} - void SwimSmallDamage::enter_(ksys::act::ai::InlineParamPack* params) { SmallDamage::enter_(params); } @@ -26,8 +22,4 @@ void SwimSmallDamage::loadParams_() { getStaticParam(&mASName_s, "ASName"); } -void SwimSmallDamage::calc_() { - SmallDamage::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionSwimSmallDamage.h b/src/Game/AI/Action/actionSwimSmallDamage.h index 67baee90..50272de5 100644 --- a/src/Game/AI/Action/actionSwimSmallDamage.h +++ b/src/Game/AI/Action/actionSwimSmallDamage.h @@ -11,14 +11,11 @@ public: explicit SwimSmallDamage(const InitArg& arg); ~SwimSmallDamage() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; protected: - void calc_() override; - // static_param at offset 0x90 const float* mInWaterDepth_s{}; // static_param at offset 0x98 diff --git a/src/Game/AI/Action/actionSwitchElectricOff.cpp b/src/Game/AI/Action/actionSwitchElectricOff.cpp index 7471b453..929f1962 100644 --- a/src/Game/AI/Action/actionSwitchElectricOff.cpp +++ b/src/Game/AI/Action/actionSwitchElectricOff.cpp @@ -4,8 +4,6 @@ namespace uking::action { SwitchElectricOff::SwitchElectricOff(const InitArg& arg) : ksys::act::ai::Action(arg) {} -SwitchElectricOff::~SwitchElectricOff() = default; - bool SwitchElectricOff::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } diff --git a/src/Game/AI/Action/actionSwitchElectricOff.h b/src/Game/AI/Action/actionSwitchElectricOff.h index 520c4093..53191322 100644 --- a/src/Game/AI/Action/actionSwitchElectricOff.h +++ b/src/Game/AI/Action/actionSwitchElectricOff.h @@ -8,7 +8,6 @@ class SwitchElectricOff : public ksys::act::ai::Action { SEAD_RTTI_OVERRIDE(SwitchElectricOff, ksys::act::ai::Action) public: explicit SwitchElectricOff(const InitArg& arg); - ~SwitchElectricOff() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/AI/Action/actionSwitchElectricOn.cpp b/src/Game/AI/Action/actionSwitchElectricOn.cpp index 792afa5c..2d2bc8b7 100644 --- a/src/Game/AI/Action/actionSwitchElectricOn.cpp +++ b/src/Game/AI/Action/actionSwitchElectricOn.cpp @@ -4,8 +4,6 @@ namespace uking::action { SwitchElectricOn::SwitchElectricOn(const InitArg& arg) : ksys::act::ai::Action(arg) {} -SwitchElectricOn::~SwitchElectricOn() = default; - bool SwitchElectricOn::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } diff --git a/src/Game/AI/Action/actionSwitchElectricOn.h b/src/Game/AI/Action/actionSwitchElectricOn.h index 1728379c..108cf156 100644 --- a/src/Game/AI/Action/actionSwitchElectricOn.h +++ b/src/Game/AI/Action/actionSwitchElectricOn.h @@ -8,7 +8,6 @@ class SwitchElectricOn : public ksys::act::ai::Action { SEAD_RTTI_OVERRIDE(SwitchElectricOn, ksys::act::ai::Action) public: explicit SwitchElectricOn(const InitArg& arg); - ~SwitchElectricOn() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/AI/Action/actionSwitchStepSliderConstraintOnce.cpp b/src/Game/AI/Action/actionSwitchStepSliderConstraintOnce.cpp index 880ae233..d633c7c6 100644 --- a/src/Game/AI/Action/actionSwitchStepSliderConstraintOnce.cpp +++ b/src/Game/AI/Action/actionSwitchStepSliderConstraintOnce.cpp @@ -5,8 +5,6 @@ namespace uking::action { SwitchStepSliderConstraintOnce::SwitchStepSliderConstraintOnce(const InitArg& arg) : SwitchStepSliderConstraint(arg) {} -SwitchStepSliderConstraintOnce::~SwitchStepSliderConstraintOnce() = default; - bool SwitchStepSliderConstraintOnce::init_(sead::Heap* heap) { return SwitchStepSliderConstraint::init_(heap); } diff --git a/src/Game/AI/Action/actionSwitchStepSliderConstraintOnce.h b/src/Game/AI/Action/actionSwitchStepSliderConstraintOnce.h index b332f039..16aadb94 100644 --- a/src/Game/AI/Action/actionSwitchStepSliderConstraintOnce.h +++ b/src/Game/AI/Action/actionSwitchStepSliderConstraintOnce.h @@ -9,7 +9,6 @@ class SwitchStepSliderConstraintOnce : public SwitchStepSliderConstraint { SEAD_RTTI_OVERRIDE(SwitchStepSliderConstraintOnce, SwitchStepSliderConstraint) public: explicit SwitchStepSliderConstraintOnce(const InitArg& arg); - ~SwitchStepSliderConstraintOnce() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/AI/Action/actionSystemApplyEnvSetAction.cpp b/src/Game/AI/Action/actionSystemApplyEnvSetAction.cpp index dfb54a9d..2dd38c1c 100644 --- a/src/Game/AI/Action/actionSystemApplyEnvSetAction.cpp +++ b/src/Game/AI/Action/actionSystemApplyEnvSetAction.cpp @@ -6,10 +6,6 @@ SystemApplyEnvSetAction::SystemApplyEnvSetAction(const InitArg& arg) : ksys::act SystemApplyEnvSetAction::~SystemApplyEnvSetAction() = default; -bool SystemApplyEnvSetAction::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - void SystemApplyEnvSetAction::enter_(ksys::act::ai::InlineParamPack* params) { ksys::act::ai::Action::enter_(params); } diff --git a/src/Game/AI/Action/actionSystemApplyEnvSetAction.h b/src/Game/AI/Action/actionSystemApplyEnvSetAction.h index 4162ce7b..adb89531 100644 --- a/src/Game/AI/Action/actionSystemApplyEnvSetAction.h +++ b/src/Game/AI/Action/actionSystemApplyEnvSetAction.h @@ -10,7 +10,6 @@ public: explicit SystemApplyEnvSetAction(const InitArg& arg); ~SystemApplyEnvSetAction() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionSystemSetWindAction.cpp b/src/Game/AI/Action/actionSystemSetWindAction.cpp index e0f47ed6..d433b4da 100644 --- a/src/Game/AI/Action/actionSystemSetWindAction.cpp +++ b/src/Game/AI/Action/actionSystemSetWindAction.cpp @@ -4,8 +4,6 @@ namespace uking::action { SystemSetWindAction::SystemSetWindAction(const InitArg& arg) : ksys::act::ai::Action(arg) {} -SystemSetWindAction::~SystemSetWindAction() = default; - bool SystemSetWindAction::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } diff --git a/src/Game/AI/Action/actionSystemSetWindAction.h b/src/Game/AI/Action/actionSystemSetWindAction.h index 1d11fb4b..33425df7 100644 --- a/src/Game/AI/Action/actionSystemSetWindAction.h +++ b/src/Game/AI/Action/actionSystemSetWindAction.h @@ -8,7 +8,6 @@ class SystemSetWindAction : public ksys::act::ai::Action { SEAD_RTTI_OVERRIDE(SystemSetWindAction, ksys::act::ai::Action) public: explicit SystemSetWindAction(const InitArg& arg); - ~SystemSetWindAction() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/AI/Action/actionTakeHitImpactForce.cpp b/src/Game/AI/Action/actionTakeHitImpactForce.cpp index 8ae87c2b..490c0080 100644 --- a/src/Game/AI/Action/actionTakeHitImpactForce.cpp +++ b/src/Game/AI/Action/actionTakeHitImpactForce.cpp @@ -6,18 +6,10 @@ TakeHitImpactForce::TakeHitImpactForce(const InitArg& arg) : ActionEx(arg) {} TakeHitImpactForce::~TakeHitImpactForce() = default; -bool TakeHitImpactForce::init_(sead::Heap* heap) { - return ActionEx::init_(heap); -} - void TakeHitImpactForce::enter_(ksys::act::ai::InlineParamPack* params) { ActionEx::enter_(params); } -void TakeHitImpactForce::leave_() { - ActionEx::leave_(); -} - void TakeHitImpactForce::loadParams_() { getStaticParam(&mHitImpactForceSmallSwordS_s, "HitImpactForceSmallSwordS"); getStaticParam(&mHitImpactForceSmallSwordL_s, "HitImpactForceSmallSwordL"); diff --git a/src/Game/AI/Action/actionTakeHitImpactForce.h b/src/Game/AI/Action/actionTakeHitImpactForce.h index 8f01cb24..5c0acc76 100644 --- a/src/Game/AI/Action/actionTakeHitImpactForce.h +++ b/src/Game/AI/Action/actionTakeHitImpactForce.h @@ -11,9 +11,7 @@ public: explicit TakeHitImpactForce(const InitArg& arg); ~TakeHitImpactForce() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: diff --git a/src/Game/AI/Action/actionTargetCircleGuardWalk.cpp b/src/Game/AI/Action/actionTargetCircleGuardWalk.cpp index 9ba2a1f7..4178c4df 100644 --- a/src/Game/AI/Action/actionTargetCircleGuardWalk.cpp +++ b/src/Game/AI/Action/actionTargetCircleGuardWalk.cpp @@ -4,8 +4,6 @@ namespace uking::action { TargetCircleGuardWalk::TargetCircleGuardWalk(const InitArg& arg) : TargetCircle(arg) {} -TargetCircleGuardWalk::~TargetCircleGuardWalk() = default; - bool TargetCircleGuardWalk::init_(sead::Heap* heap) { return TargetCircle::init_(heap); } diff --git a/src/Game/AI/Action/actionTargetCircleGuardWalk.h b/src/Game/AI/Action/actionTargetCircleGuardWalk.h index a92c1f41..24fe7607 100644 --- a/src/Game/AI/Action/actionTargetCircleGuardWalk.h +++ b/src/Game/AI/Action/actionTargetCircleGuardWalk.h @@ -9,7 +9,6 @@ class TargetCircleGuardWalk : public TargetCircle { SEAD_RTTI_OVERRIDE(TargetCircleGuardWalk, TargetCircle) public: explicit TargetCircleGuardWalk(const InitArg& arg); - ~TargetCircleGuardWalk() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/AI/Action/actionTargetCircleSwim.cpp b/src/Game/AI/Action/actionTargetCircleSwim.cpp index 11834b70..b12b01ac 100644 --- a/src/Game/AI/Action/actionTargetCircleSwim.cpp +++ b/src/Game/AI/Action/actionTargetCircleSwim.cpp @@ -6,10 +6,6 @@ TargetCircleSwim::TargetCircleSwim(const InitArg& arg) : TargetCircle(arg) {} TargetCircleSwim::~TargetCircleSwim() = default; -bool TargetCircleSwim::init_(sead::Heap* heap) { - return TargetCircle::init_(heap); -} - void TargetCircleSwim::enter_(ksys::act::ai::InlineParamPack* params) { TargetCircle::enter_(params); } @@ -27,8 +23,4 @@ void TargetCircleSwim::loadParams_() { getStaticParam(&mChangeDepthSpeed_s, "ChangeDepthSpeed"); } -void TargetCircleSwim::calc_() { - TargetCircle::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionTargetCircleSwim.h b/src/Game/AI/Action/actionTargetCircleSwim.h index cb589cfb..8d2a289d 100644 --- a/src/Game/AI/Action/actionTargetCircleSwim.h +++ b/src/Game/AI/Action/actionTargetCircleSwim.h @@ -11,14 +11,11 @@ public: explicit TargetCircleSwim(const InitArg& arg); ~TargetCircleSwim() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; protected: - void calc_() override; - // static_param at offset 0x80 const float* mFloatDepth_s{}; // static_param at offset 0x88 diff --git a/src/Game/AI/Action/actionTargetCircleWalk.cpp b/src/Game/AI/Action/actionTargetCircleWalk.cpp index 2d26c8e4..26c31399 100644 --- a/src/Game/AI/Action/actionTargetCircleWalk.cpp +++ b/src/Game/AI/Action/actionTargetCircleWalk.cpp @@ -4,8 +4,6 @@ namespace uking::action { TargetCircleWalk::TargetCircleWalk(const InitArg& arg) : TargetCircle(arg) {} -TargetCircleWalk::~TargetCircleWalk() = default; - bool TargetCircleWalk::init_(sead::Heap* heap) { return TargetCircle::init_(heap); } diff --git a/src/Game/AI/Action/actionTargetCircleWalk.h b/src/Game/AI/Action/actionTargetCircleWalk.h index 71a699cf..b03ce7f0 100644 --- a/src/Game/AI/Action/actionTargetCircleWalk.h +++ b/src/Game/AI/Action/actionTargetCircleWalk.h @@ -9,7 +9,6 @@ class TargetCircleWalk : public TargetCircle { SEAD_RTTI_OVERRIDE(TargetCircleWalk, TargetCircle) public: explicit TargetCircleWalk(const InitArg& arg); - ~TargetCircleWalk() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/AI/Action/actionThrowLeft.cpp b/src/Game/AI/Action/actionThrowLeft.cpp index 99718bdd..9f759e20 100644 --- a/src/Game/AI/Action/actionThrowLeft.cpp +++ b/src/Game/AI/Action/actionThrowLeft.cpp @@ -4,26 +4,4 @@ namespace uking::action { ThrowLeft::ThrowLeft(const InitArg& arg) : Throw(arg) {} -ThrowLeft::~ThrowLeft() = default; - -bool ThrowLeft::init_(sead::Heap* heap) { - return Throw::init_(heap); -} - -void ThrowLeft::enter_(ksys::act::ai::InlineParamPack* params) { - Throw::enter_(params); -} - -void ThrowLeft::leave_() { - Throw::leave_(); -} - -void ThrowLeft::loadParams_() { - ActionWithPosAngReduce::loadParams_(); -} - -void ThrowLeft::calc_() { - Throw::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionThrowLeft.h b/src/Game/AI/Action/actionThrowLeft.h index a496cb4d..2364f1e4 100644 --- a/src/Game/AI/Action/actionThrowLeft.h +++ b/src/Game/AI/Action/actionThrowLeft.h @@ -9,15 +9,8 @@ class ThrowLeft : public Throw { SEAD_RTTI_OVERRIDE(ThrowLeft, Throw) public: explicit ThrowLeft(const InitArg& arg); - ~ThrowLeft() override; - - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionThrowRight.cpp b/src/Game/AI/Action/actionThrowRight.cpp index 62b0a645..bef0e89b 100644 --- a/src/Game/AI/Action/actionThrowRight.cpp +++ b/src/Game/AI/Action/actionThrowRight.cpp @@ -4,26 +4,4 @@ namespace uking::action { ThrowRight::ThrowRight(const InitArg& arg) : Throw(arg) {} -ThrowRight::~ThrowRight() = default; - -bool ThrowRight::init_(sead::Heap* heap) { - return Throw::init_(heap); -} - -void ThrowRight::enter_(ksys::act::ai::InlineParamPack* params) { - Throw::enter_(params); -} - -void ThrowRight::leave_() { - Throw::leave_(); -} - -void ThrowRight::loadParams_() { - ActionWithPosAngReduce::loadParams_(); -} - -void ThrowRight::calc_() { - Throw::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionThrowRight.h b/src/Game/AI/Action/actionThrowRight.h index 2e99eacf..fdf35923 100644 --- a/src/Game/AI/Action/actionThrowRight.h +++ b/src/Game/AI/Action/actionThrowRight.h @@ -9,15 +9,8 @@ class ThrowRight : public Throw { SEAD_RTTI_OVERRIDE(ThrowRight, Throw) public: explicit ThrowRight(const InitArg& arg); - ~ThrowRight() override; - - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionThrowWeapon.cpp b/src/Game/AI/Action/actionThrowWeapon.cpp index 9195e309..51aaec9b 100644 --- a/src/Game/AI/Action/actionThrowWeapon.cpp +++ b/src/Game/AI/Action/actionThrowWeapon.cpp @@ -6,10 +6,6 @@ ThrowWeapon::ThrowWeapon(const InitArg& arg) : ActionWithAS(arg) {} ThrowWeapon::~ThrowWeapon() = default; -bool ThrowWeapon::init_(sead::Heap* heap) { - return ActionWithAS::init_(heap); -} - void ThrowWeapon::enter_(ksys::act::ai::InlineParamPack* params) { ActionWithAS::enter_(params); } diff --git a/src/Game/AI/Action/actionThrowWeapon.h b/src/Game/AI/Action/actionThrowWeapon.h index a6a18743..0867041b 100644 --- a/src/Game/AI/Action/actionThrowWeapon.h +++ b/src/Game/AI/Action/actionThrowWeapon.h @@ -11,7 +11,6 @@ public: explicit ThrowWeapon(const InitArg& arg); ~ThrowWeapon() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; @@ -35,6 +34,9 @@ protected: sead::Vector3f* mTargetPos_d{}; // static_param at offset 0x68 const bool* mIsForceDead_s{}; + + void* _70; + void* _78; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionThrowWeaponRight.cpp b/src/Game/AI/Action/actionThrowWeaponRight.cpp index 63923b57..1a788745 100644 --- a/src/Game/AI/Action/actionThrowWeaponRight.cpp +++ b/src/Game/AI/Action/actionThrowWeaponRight.cpp @@ -6,32 +6,4 @@ ThrowWeaponRight::ThrowWeaponRight(const InitArg& arg) : ThrowWeapon(arg) {} ThrowWeaponRight::~ThrowWeaponRight() = default; -bool ThrowWeaponRight::init_(sead::Heap* heap) { - return ThrowWeapon::init_(heap); -} - -void ThrowWeaponRight::enter_(ksys::act::ai::InlineParamPack* params) { - ThrowWeapon::enter_(params); -} - -void ThrowWeaponRight::leave_() { - ThrowWeapon::leave_(); -} - -void ThrowWeaponRight::loadParams_() { - ActionWithPosAngReduce::loadParams_(); - getStaticParam(&mWeaponIdx_s, "WeaponIdx"); - getStaticParam(&mSpeedMin_s, "SpeedMin"); - getStaticParam(&mSpeedMax_s, "SpeedMax"); - getStaticParam(&mThrowAng_s, "ThrowAng"); - getStaticParam(&mThrowBoomerangAng_s, "ThrowBoomerangAng"); - getStaticParam(&mThrowBoomerangSpeedMax_s, "ThrowBoomerangSpeedMax"); - getDynamicParam(&mTargetPos_d, "TargetPos"); - getStaticParam(&mIsForceDead_s, "IsForceDead"); -} - -void ThrowWeaponRight::calc_() { - ThrowWeapon::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionThrowWeaponRight.h b/src/Game/AI/Action/actionThrowWeaponRight.h index 733e6a5e..3ee040ef 100644 --- a/src/Game/AI/Action/actionThrowWeaponRight.h +++ b/src/Game/AI/Action/actionThrowWeaponRight.h @@ -11,30 +11,7 @@ public: explicit ThrowWeaponRight(const InitArg& arg); ~ThrowWeaponRight() override; - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; - protected: - void calc_() override; - - // static_param at offset 0x30 - const int* mWeaponIdx_s{}; - // static_param at offset 0x38 - const float* mSpeedMin_s{}; - // static_param at offset 0x40 - const float* mSpeedMax_s{}; - // static_param at offset 0x48 - const float* mThrowAng_s{}; - // static_param at offset 0x50 - const float* mThrowBoomerangAng_s{}; - // static_param at offset 0x58 - const float* mThrowBoomerangSpeedMax_s{}; - // dynamic_param at offset 0x60 - sead::Vector3f* mTargetPos_d{}; - // static_param at offset 0x68 - const bool* mIsForceDead_s{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionThrown.cpp b/src/Game/AI/Action/actionThrown.cpp index d4ccb47b..1f5344d1 100644 --- a/src/Game/AI/Action/actionThrown.cpp +++ b/src/Game/AI/Action/actionThrown.cpp @@ -6,10 +6,6 @@ Thrown::Thrown(const InitArg& arg) : ActionEx(arg) {} Thrown::~Thrown() = default; -bool Thrown::init_(sead::Heap* heap) { - return ActionEx::init_(heap); -} - void Thrown::enter_(ksys::act::ai::InlineParamPack* params) { ActionEx::enter_(params); } diff --git a/src/Game/AI/Action/actionThrown.h b/src/Game/AI/Action/actionThrown.h index 6eddcbdc..8170f3e2 100644 --- a/src/Game/AI/Action/actionThrown.h +++ b/src/Game/AI/Action/actionThrown.h @@ -11,7 +11,6 @@ public: explicit Thrown(const InitArg& arg); ~Thrown() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionThrownSpear.cpp b/src/Game/AI/Action/actionThrownSpear.cpp index c57c8fb4..6eb5ab1b 100644 --- a/src/Game/AI/Action/actionThrownSpear.cpp +++ b/src/Game/AI/Action/actionThrownSpear.cpp @@ -6,10 +6,6 @@ ThrownSpear::ThrownSpear(const InitArg& arg) : ksys::act::ai::Action(arg) {} ThrownSpear::~ThrownSpear() = default; -bool ThrownSpear::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - void ThrownSpear::enter_(ksys::act::ai::InlineParamPack* params) { ksys::act::ai::Action::enter_(params); } diff --git a/src/Game/AI/Action/actionThrownSpear.h b/src/Game/AI/Action/actionThrownSpear.h index 6a08ea08..dd8eb105 100644 --- a/src/Game/AI/Action/actionThrownSpear.h +++ b/src/Game/AI/Action/actionThrownSpear.h @@ -10,7 +10,6 @@ public: explicit ThrownSpear(const InitArg& arg); ~ThrownSpear() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionTimeredNeckSpin.cpp b/src/Game/AI/Action/actionTimeredNeckSpin.cpp index 2c56d206..0523d401 100644 --- a/src/Game/AI/Action/actionTimeredNeckSpin.cpp +++ b/src/Game/AI/Action/actionTimeredNeckSpin.cpp @@ -6,10 +6,6 @@ TimeredNeckSpin::TimeredNeckSpin(const InitArg& arg) : NeckSpin(arg) {} TimeredNeckSpin::~TimeredNeckSpin() = default; -bool TimeredNeckSpin::init_(sead::Heap* heap) { - return NeckSpin::init_(heap); -} - void TimeredNeckSpin::enter_(ksys::act::ai::InlineParamPack* params) { NeckSpin::enter_(params); } diff --git a/src/Game/AI/Action/actionTimeredNeckSpin.h b/src/Game/AI/Action/actionTimeredNeckSpin.h index 56dc9047..27580931 100644 --- a/src/Game/AI/Action/actionTimeredNeckSpin.h +++ b/src/Game/AI/Action/actionTimeredNeckSpin.h @@ -11,7 +11,6 @@ public: explicit TimeredNeckSpin(const InitArg& arg); ~TimeredNeckSpin() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionTriggerAllPartsSleep.cpp b/src/Game/AI/Action/actionTriggerAllPartsSleep.cpp index 80837679..5e762fdd 100644 --- a/src/Game/AI/Action/actionTriggerAllPartsSleep.cpp +++ b/src/Game/AI/Action/actionTriggerAllPartsSleep.cpp @@ -10,18 +10,6 @@ bool TriggerAllPartsSleep::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void TriggerAllPartsSleep::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void TriggerAllPartsSleep::leave_() { - ksys::act::ai::Action::leave_(); -} - void TriggerAllPartsSleep::loadParams_() {} -void TriggerAllPartsSleep::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionTriggerAllPartsSleep.h b/src/Game/AI/Action/actionTriggerAllPartsSleep.h index 2d99a1a0..ae160d49 100644 --- a/src/Game/AI/Action/actionTriggerAllPartsSleep.h +++ b/src/Game/AI/Action/actionTriggerAllPartsSleep.h @@ -11,12 +11,9 @@ public: ~TriggerAllPartsSleep() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionTumble.cpp b/src/Game/AI/Action/actionTumble.cpp index 7e034e2f..bce8495d 100644 --- a/src/Game/AI/Action/actionTumble.cpp +++ b/src/Game/AI/Action/actionTumble.cpp @@ -6,10 +6,6 @@ Tumble::Tumble(const InitArg& arg) : ksys::act::ai::Action(arg) {} Tumble::~Tumble() = default; -bool Tumble::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - void Tumble::enter_(ksys::act::ai::InlineParamPack* params) { ksys::act::ai::Action::enter_(params); } diff --git a/src/Game/AI/Action/actionTumble.h b/src/Game/AI/Action/actionTumble.h index 32602321..ba1bf218 100644 --- a/src/Game/AI/Action/actionTumble.h +++ b/src/Game/AI/Action/actionTumble.h @@ -10,7 +10,6 @@ public: explicit Tumble(const InitArg& arg); ~Tumble() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionTurn.cpp b/src/Game/AI/Action/actionTurn.cpp index 057d6ceb..88e10e08 100644 --- a/src/Game/AI/Action/actionTurn.cpp +++ b/src/Game/AI/Action/actionTurn.cpp @@ -4,33 +4,8 @@ namespace uking::action { Turn::Turn(const InitArg& arg) : TurnBase(arg) {} -Turn::~Turn() = default; - -bool Turn::init_(sead::Heap* heap) { - return TurnBase::init_(heap); -} - void Turn::enter_(ksys::act::ai::InlineParamPack* params) { TurnBase::enter_(params); } -void Turn::leave_() { - TurnBase::leave_(); -} - -void Turn::loadParams_() { - getStaticParam(&mRotSpd_s, "RotSpd"); - getStaticParam(&mFinRotate_s, "FinRotate"); - getStaticParam(&mPosReduceRatio_s, "PosReduceRatio"); - getStaticParam(&mBaseRotRatio_s, "BaseRotRatio"); - getStaticParam(&mIsFollowGround_s, "IsFollowGround"); - getStaticParam(&mIsChangeable_s, "IsChangeable"); - getDynamicParam(&mTargetPos_d, "TargetPos"); - getStaticParam(&mRotMinSpeedRatio_s, "RotMinSpeedRatio"); -} - -void Turn::calc_() { - TurnBase::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionTurn.h b/src/Game/AI/Action/actionTurn.h index efdad1ad..19b0c22b 100644 --- a/src/Game/AI/Action/actionTurn.h +++ b/src/Game/AI/Action/actionTurn.h @@ -9,32 +9,10 @@ class Turn : public TurnBase { SEAD_RTTI_OVERRIDE(Turn, TurnBase) public: explicit Turn(const InitArg& arg); - ~Turn() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; protected: - void calc_() override; - - // static_param at offset 0x20 - const float* mRotSpd_s{}; - // static_param at offset 0x28 - const float* mFinRotate_s{}; - // static_param at offset 0x30 - const float* mPosReduceRatio_s{}; - // static_param at offset 0x38 - const float* mBaseRotRatio_s{}; - // static_param at offset 0x40 - const bool* mIsFollowGround_s{}; - // static_param at offset 0x48 - const float* mRotMinSpeedRatio_s{}; - // static_param at offset 0x50 - const bool* mIsChangeable_s{}; - // dynamic_param at offset 0x58 - sead::Vector3f* mTargetPos_d{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionTurnBase.cpp b/src/Game/AI/Action/actionTurnBase.cpp index 0cf85d91..c4880158 100644 --- a/src/Game/AI/Action/actionTurnBase.cpp +++ b/src/Game/AI/Action/actionTurnBase.cpp @@ -6,10 +6,6 @@ TurnBase::TurnBase(const InitArg& arg) : ActionEx(arg) {} TurnBase::~TurnBase() = default; -bool TurnBase::init_(sead::Heap* heap) { - return ActionEx::init_(heap); -} - void TurnBase::enter_(ksys::act::ai::InlineParamPack* params) { ActionEx::enter_(params); } diff --git a/src/Game/AI/Action/actionTurnBase.h b/src/Game/AI/Action/actionTurnBase.h index 98186e26..9cb095e7 100644 --- a/src/Game/AI/Action/actionTurnBase.h +++ b/src/Game/AI/Action/actionTurnBase.h @@ -11,7 +11,6 @@ public: explicit TurnBase(const InitArg& arg); ~TurnBase() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionUnarmedAttack.cpp b/src/Game/AI/Action/actionUnarmedAttack.cpp index 85d83227..683fece0 100644 --- a/src/Game/AI/Action/actionUnarmedAttack.cpp +++ b/src/Game/AI/Action/actionUnarmedAttack.cpp @@ -6,10 +6,6 @@ UnarmedAttack::UnarmedAttack(const InitArg& arg) : ActionEx(arg) {} UnarmedAttack::~UnarmedAttack() = default; -bool UnarmedAttack::init_(sead::Heap* heap) { - return ActionEx::init_(heap); -} - void UnarmedAttack::enter_(ksys::act::ai::InlineParamPack* params) { ActionEx::enter_(params); } diff --git a/src/Game/AI/Action/actionUnarmedAttack.h b/src/Game/AI/Action/actionUnarmedAttack.h index 3be2a067..06e7b4e3 100644 --- a/src/Game/AI/Action/actionUnarmedAttack.h +++ b/src/Game/AI/Action/actionUnarmedAttack.h @@ -11,7 +11,6 @@ public: explicit UnarmedAttack(const InitArg& arg); ~UnarmedAttack() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionUnarmedLargeAttack.cpp b/src/Game/AI/Action/actionUnarmedLargeAttack.cpp index 82c1b991..d5f12f0f 100644 --- a/src/Game/AI/Action/actionUnarmedLargeAttack.cpp +++ b/src/Game/AI/Action/actionUnarmedLargeAttack.cpp @@ -6,22 +6,4 @@ UnarmedLargeAttack::UnarmedLargeAttack(const InitArg& arg) : UnarmedAttack(arg) UnarmedLargeAttack::~UnarmedLargeAttack() = default; -bool UnarmedLargeAttack::init_(sead::Heap* heap) { - return UnarmedAttack::init_(heap); -} - -void UnarmedLargeAttack::enter_(ksys::act::ai::InlineParamPack* params) { - UnarmedAttack::enter_(params); -} - -void UnarmedLargeAttack::leave_() { - UnarmedAttack::leave_(); -} - -void UnarmedLargeAttack::loadParams_() {} - -void UnarmedLargeAttack::calc_() { - UnarmedAttack::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionUnarmedLargeAttack.h b/src/Game/AI/Action/actionUnarmedLargeAttack.h index 6c18b5be..9568bd65 100644 --- a/src/Game/AI/Action/actionUnarmedLargeAttack.h +++ b/src/Game/AI/Action/actionUnarmedLargeAttack.h @@ -11,13 +11,7 @@ public: explicit UnarmedLargeAttack(const InitArg& arg); ~UnarmedLargeAttack() override; - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; - protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionUpdateDataByGetDemoAction.cpp b/src/Game/AI/Action/actionUpdateDataByGetDemoAction.cpp index aa055d96..16d9514e 100644 --- a/src/Game/AI/Action/actionUpdateDataByGetDemoAction.cpp +++ b/src/Game/AI/Action/actionUpdateDataByGetDemoAction.cpp @@ -11,18 +11,6 @@ bool UpdateDataByGetDemoAction::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void UpdateDataByGetDemoAction::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void UpdateDataByGetDemoAction::leave_() { - ksys::act::ai::Action::leave_(); -} - void UpdateDataByGetDemoAction::loadParams_() {} -void UpdateDataByGetDemoAction::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionUpdateDataByGetDemoAction.h b/src/Game/AI/Action/actionUpdateDataByGetDemoAction.h index d1d30875..08323a07 100644 --- a/src/Game/AI/Action/actionUpdateDataByGetDemoAction.h +++ b/src/Game/AI/Action/actionUpdateDataByGetDemoAction.h @@ -11,12 +11,9 @@ public: ~UpdateDataByGetDemoAction() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionWait.cpp b/src/Game/AI/Action/actionWait.cpp index da8f25bd..f4c2fd60 100644 --- a/src/Game/AI/Action/actionWait.cpp +++ b/src/Game/AI/Action/actionWait.cpp @@ -4,28 +4,8 @@ namespace uking::action { Wait::Wait(const InitArg& arg) : WaitBase(arg) {} -Wait::~Wait() = default; - -bool Wait::init_(sead::Heap* heap) { - return WaitBase::init_(heap); -} - void Wait::enter_(ksys::act::ai::InlineParamPack* params) { WaitBase::enter_(params); } -void Wait::leave_() { - WaitBase::leave_(); -} - -void Wait::loadParams_() { - ActionWithPosAngReduce::loadParams_(); - getStaticParam(&mTime_s, "Time"); - getStaticParam(&mTimeRand_s, "TimeRand"); -} - -void Wait::calc_() { - WaitBase::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionWait.h b/src/Game/AI/Action/actionWait.h index 1d40713a..5104aac5 100644 --- a/src/Game/AI/Action/actionWait.h +++ b/src/Game/AI/Action/actionWait.h @@ -9,20 +9,10 @@ class Wait : public WaitBase { SEAD_RTTI_OVERRIDE(Wait, WaitBase) public: explicit Wait(const InitArg& arg); - ~Wait() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; protected: - void calc_() override; - - // static_param at offset 0x30 - const int* mTime_s{}; - // static_param at offset 0x38 - const int* mTimeRand_s{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionWaitBase.cpp b/src/Game/AI/Action/actionWaitBase.cpp index 2acdaed5..87dfa621 100644 --- a/src/Game/AI/Action/actionWaitBase.cpp +++ b/src/Game/AI/Action/actionWaitBase.cpp @@ -6,18 +6,10 @@ WaitBase::WaitBase(const InitArg& arg) : ActionWithPosAngReduce(arg) {} WaitBase::~WaitBase() = default; -bool WaitBase::init_(sead::Heap* heap) { - return ActionWithPosAngReduce::init_(heap); -} - void WaitBase::enter_(ksys::act::ai::InlineParamPack* params) { ActionWithPosAngReduce::enter_(params); } -void WaitBase::leave_() { - ActionWithPosAngReduce::leave_(); -} - void WaitBase::loadParams_() { ActionWithPosAngReduce::loadParams_(); getStaticParam(&mTime_s, "Time"); diff --git a/src/Game/AI/Action/actionWaitBase.h b/src/Game/AI/Action/actionWaitBase.h index 0df46be2..363cf7b8 100644 --- a/src/Game/AI/Action/actionWaitBase.h +++ b/src/Game/AI/Action/actionWaitBase.h @@ -2,6 +2,7 @@ #include "Game/AI/Action/actionActionWithPosAngReduce.h" #include "KingSystem/ActorSystem/actAiAction.h" +#include "KingSystem/System/Timer.h" namespace uking::action { @@ -11,9 +12,7 @@ public: explicit WaitBase(const InitArg& arg); ~WaitBase() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: @@ -23,6 +22,8 @@ protected: const int* mTime_s{}; // static_param at offset 0x38 const int* mTimeRand_s{}; + + ksys::Timer mTimer; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionWaitHeartDemo.cpp b/src/Game/AI/Action/actionWaitHeartDemo.cpp index a4583ed4..495749ed 100644 --- a/src/Game/AI/Action/actionWaitHeartDemo.cpp +++ b/src/Game/AI/Action/actionWaitHeartDemo.cpp @@ -10,18 +10,6 @@ bool WaitHeartDemo::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void WaitHeartDemo::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void WaitHeartDemo::leave_() { - ksys::act::ai::Action::leave_(); -} - void WaitHeartDemo::loadParams_() {} -void WaitHeartDemo::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionWaitHeartDemo.h b/src/Game/AI/Action/actionWaitHeartDemo.h index f44488a1..bfbf2a6a 100644 --- a/src/Game/AI/Action/actionWaitHeartDemo.h +++ b/src/Game/AI/Action/actionWaitHeartDemo.h @@ -11,12 +11,9 @@ public: ~WaitHeartDemo() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionWalk.cpp b/src/Game/AI/Action/actionWalk.cpp index 82852df6..500fb976 100644 --- a/src/Game/AI/Action/actionWalk.cpp +++ b/src/Game/AI/Action/actionWalk.cpp @@ -4,40 +4,8 @@ namespace uking::action { Walk::Walk(const InitArg& arg) : MoveBase(arg) {} -Walk::~Walk() = default; - -bool Walk::init_(sead::Heap* heap) { - return MoveBase::init_(heap); -} - void Walk::enter_(ksys::act::ai::InlineParamPack* params) { MoveBase::enter_(params); } -void Walk::leave_() { - MoveBase::leave_(); -} - -void Walk::loadParams_() { - getStaticParam(&mWeaponIdx_s, "WeaponIdx"); - getStaticParam(&mWallHitLimitTime_s, "WallHitLimitTime"); - getStaticParam(&mMoveAngCliffLimitTime_s, "MoveAngCliffLimitTime"); - getStaticParam(&mSpeed_s, "Speed"); - getStaticParam(&mRotSpd_s, "RotSpd"); - getStaticParam(&mFinRadius_s, "FinRadius"); - getStaticParam(&mFinRotate_s, "FinRotate"); - getStaticParam(&mBaseRotRatio_s, "BaseRotRatio"); - getStaticParam(&mAccRatio_s, "AccRatio"); - getStaticParam(&mJumpUpSpeedReduceRatio_s, "JumpUpSpeedReduceRatio"); - getStaticParam(&mFollowGround_s, "FollowGround"); - getStaticParam(&mIgnoreLastCurve_s, "IgnoreLastCurve"); - getStaticParam(&mIgnoreDecelerationFrontCliff_s, "IgnoreDecelerationFrontCliff"); - getStaticParam(&mIgnoreMoveDirCoHit_s, "IgnoreMoveDirCoHit"); - getDynamicParam(&mTargetPos_d, "TargetPos"); -} - -void Walk::calc_() { - MoveBase::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionWalk.h b/src/Game/AI/Action/actionWalk.h index 52c17876..409f6701 100644 --- a/src/Game/AI/Action/actionWalk.h +++ b/src/Game/AI/Action/actionWalk.h @@ -9,46 +9,10 @@ class Walk : public MoveBase { SEAD_RTTI_OVERRIDE(Walk, MoveBase) public: explicit Walk(const InitArg& arg); - ~Walk() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; protected: - void calc_() override; - - // static_param at offset 0x20 - const int* mWeaponIdx_s{}; - // static_param at offset 0x28 - const int* mWallHitLimitTime_s{}; - // static_param at offset 0x30 - const int* mMoveAngCliffLimitTime_s{}; - // static_param at offset 0x38 - const float* mSpeed_s{}; - // static_param at offset 0x40 - const float* mRotSpd_s{}; - // static_param at offset 0x48 - const float* mFinRadius_s{}; - // static_param at offset 0x50 - const float* mFinRotate_s{}; - // static_param at offset 0x58 - const float* mBaseRotRatio_s{}; - // static_param at offset 0x60 - const float* mAccRatio_s{}; - // static_param at offset 0x68 - const float* mJumpUpSpeedReduceRatio_s{}; - // static_param at offset 0x70 - const bool* mFollowGround_s{}; - // static_param at offset 0x78 - const bool* mIgnoreLastCurve_s{}; - // static_param at offset 0x80 - const bool* mIgnoreDecelerationFrontCliff_s{}; - // static_param at offset 0x88 - const bool* mIgnoreMoveDirCoHit_s{}; - // dynamic_param at offset 0x90 - sead::Vector3f* mTargetPos_d{}; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionWarpMyHorse.cpp b/src/Game/AI/Action/actionWarpMyHorse.cpp index e8e35b61..1cfea2f1 100644 --- a/src/Game/AI/Action/actionWarpMyHorse.cpp +++ b/src/Game/AI/Action/actionWarpMyHorse.cpp @@ -10,14 +10,6 @@ bool WarpMyHorse::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void WarpMyHorse::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void WarpMyHorse::leave_() { - ksys::act::ai::Action::leave_(); -} - void WarpMyHorse::loadParams_() { getDynamicParam(&mPositionX_d, "PositionX"); getDynamicParam(&mPositionY_d, "PositionY"); @@ -25,8 +17,4 @@ void WarpMyHorse::loadParams_() { getDynamicParam(&mDirection_d, "Direction"); } -void WarpMyHorse::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionWarpMyHorse.h b/src/Game/AI/Action/actionWarpMyHorse.h index 4f51199e..31007e38 100644 --- a/src/Game/AI/Action/actionWarpMyHorse.h +++ b/src/Game/AI/Action/actionWarpMyHorse.h @@ -11,13 +11,9 @@ public: ~WarpMyHorse() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 float* mPositionX_d{}; // dynamic_param at offset 0x28 diff --git a/src/Game/AI/Action/actionWarpOwnedHorse.cpp b/src/Game/AI/Action/actionWarpOwnedHorse.cpp index 36c270a5..4db606af 100644 --- a/src/Game/AI/Action/actionWarpOwnedHorse.cpp +++ b/src/Game/AI/Action/actionWarpOwnedHorse.cpp @@ -6,22 +6,6 @@ WarpOwnedHorse::WarpOwnedHorse(const InitArg& arg) : ksys::act::ai::Action(arg) WarpOwnedHorse::~WarpOwnedHorse() = default; -bool WarpOwnedHorse::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - -void WarpOwnedHorse::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void WarpOwnedHorse::leave_() { - ksys::act::ai::Action::leave_(); -} - void WarpOwnedHorse::loadParams_() {} -void WarpOwnedHorse::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionWarpOwnedHorse.h b/src/Game/AI/Action/actionWarpOwnedHorse.h index b64d224a..1b7de73c 100644 --- a/src/Game/AI/Action/actionWarpOwnedHorse.h +++ b/src/Game/AI/Action/actionWarpOwnedHorse.h @@ -10,13 +10,9 @@ public: explicit WarpOwnedHorse(const InitArg& arg); ~WarpOwnedHorse() override; - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; }; } // namespace uking::action diff --git a/src/Game/AI/Action/actionWarpToActor.cpp b/src/Game/AI/Action/actionWarpToActor.cpp index e56e8662..a9af8337 100644 --- a/src/Game/AI/Action/actionWarpToActor.cpp +++ b/src/Game/AI/Action/actionWarpToActor.cpp @@ -10,14 +10,6 @@ bool WarpToActor::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void WarpToActor::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void WarpToActor::leave_() { - ksys::act::ai::Action::leave_(); -} - void WarpToActor::loadParams_() { getDynamicParam(&mDestinationX_d, "DestinationX"); getDynamicParam(&mDestinationY_d, "DestinationY"); @@ -28,8 +20,4 @@ void WarpToActor::loadParams_() { getDynamicParam(&mGameDataVec3fRotDir_d, "GameDataVec3fRotDir"); } -void WarpToActor::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionWarpToActor.h b/src/Game/AI/Action/actionWarpToActor.h index e91c2d5d..90a6fcf3 100644 --- a/src/Game/AI/Action/actionWarpToActor.h +++ b/src/Game/AI/Action/actionWarpToActor.h @@ -11,13 +11,9 @@ public: ~WarpToActor() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 float* mDestinationX_d{}; // dynamic_param at offset 0x28 diff --git a/src/Game/AI/Action/actionWarpToAnchor.cpp b/src/Game/AI/Action/actionWarpToAnchor.cpp index 6175b7d3..782ed3cb 100644 --- a/src/Game/AI/Action/actionWarpToAnchor.cpp +++ b/src/Game/AI/Action/actionWarpToAnchor.cpp @@ -10,14 +10,6 @@ bool WarpToAnchor::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void WarpToAnchor::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void WarpToAnchor::leave_() { - ksys::act::ai::Action::leave_(); -} - void WarpToAnchor::loadParams_() { getDynamicParam(&mDirectionY_d, "DirectionY"); getDynamicParam(&mDestinationY_d, "DestinationY"); @@ -25,8 +17,4 @@ void WarpToAnchor::loadParams_() { getDynamicParam(&mDestinationX_d, "DestinationX"); } -void WarpToAnchor::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionWarpToAnchor.h b/src/Game/AI/Action/actionWarpToAnchor.h index 4a17ceac..758e5ce0 100644 --- a/src/Game/AI/Action/actionWarpToAnchor.h +++ b/src/Game/AI/Action/actionWarpToAnchor.h @@ -11,13 +11,9 @@ public: ~WarpToAnchor() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 float* mDirectionY_d{}; // dynamic_param at offset 0x28 diff --git a/src/Game/AI/Action/actionWarpToGameDataVec3f.cpp b/src/Game/AI/Action/actionWarpToGameDataVec3f.cpp index 2fb67147..3bf20777 100644 --- a/src/Game/AI/Action/actionWarpToGameDataVec3f.cpp +++ b/src/Game/AI/Action/actionWarpToGameDataVec3f.cpp @@ -10,14 +10,6 @@ bool WarpToGameDataVec3f::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void WarpToGameDataVec3f::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void WarpToGameDataVec3f::leave_() { - ksys::act::ai::Action::leave_(); -} - void WarpToGameDataVec3f::loadParams_() { getDynamicParam(&mDestinationX_d, "DestinationX"); getDynamicParam(&mDestinationY_d, "DestinationY"); @@ -28,8 +20,4 @@ void WarpToGameDataVec3f::loadParams_() { getDynamicParam(&mGameDataVec3fRotDir_d, "GameDataVec3fRotDir"); } -void WarpToGameDataVec3f::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionWarpToGameDataVec3f.h b/src/Game/AI/Action/actionWarpToGameDataVec3f.h index 57f3b761..193065bb 100644 --- a/src/Game/AI/Action/actionWarpToGameDataVec3f.h +++ b/src/Game/AI/Action/actionWarpToGameDataVec3f.h @@ -11,13 +11,9 @@ public: ~WarpToGameDataVec3f() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 float* mDestinationX_d{}; // dynamic_param at offset 0x28 diff --git a/src/Game/AI/Action/actionWarpToPos.cpp b/src/Game/AI/Action/actionWarpToPos.cpp index f950901f..136682d0 100644 --- a/src/Game/AI/Action/actionWarpToPos.cpp +++ b/src/Game/AI/Action/actionWarpToPos.cpp @@ -10,21 +10,9 @@ bool WarpToPos::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void WarpToPos::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void WarpToPos::leave_() { - ksys::act::ai::Action::leave_(); -} - void WarpToPos::loadParams_() { getDynamicParam(&mTargetPos_d, "TargetPos"); getDynamicParam(&mTargetRot_d, "TargetRot"); } -void WarpToPos::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionWarpToPos.h b/src/Game/AI/Action/actionWarpToPos.h index 45ccc3dc..7ce07fe0 100644 --- a/src/Game/AI/Action/actionWarpToPos.h +++ b/src/Game/AI/Action/actionWarpToPos.h @@ -11,13 +11,9 @@ public: ~WarpToPos() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 sead::Vector3f* mTargetPos_d{}; // dynamic_param at offset 0x28 diff --git a/src/Game/AI/Action/actionWarpToScheduleAnchor.cpp b/src/Game/AI/Action/actionWarpToScheduleAnchor.cpp index a5c9c9af..6350bc7f 100644 --- a/src/Game/AI/Action/actionWarpToScheduleAnchor.cpp +++ b/src/Game/AI/Action/actionWarpToScheduleAnchor.cpp @@ -10,21 +10,9 @@ bool WarpToScheduleAnchor::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void WarpToScheduleAnchor::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void WarpToScheduleAnchor::leave_() { - ksys::act::ai::Action::leave_(); -} - void WarpToScheduleAnchor::loadParams_() { getDynamicParam(&mAnchorName_d, "AnchorName"); getDynamicParam(&mUniqueName_d, "UniqueName"); } -void WarpToScheduleAnchor::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionWarpToScheduleAnchor.h b/src/Game/AI/Action/actionWarpToScheduleAnchor.h index 6c3789de..495a922d 100644 --- a/src/Game/AI/Action/actionWarpToScheduleAnchor.h +++ b/src/Game/AI/Action/actionWarpToScheduleAnchor.h @@ -11,13 +11,9 @@ public: ~WarpToScheduleAnchor() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 sead::SafeString* mAnchorName_d{}; // dynamic_param at offset 0x30 diff --git a/src/Game/AI/Action/actionWarpToStaticAnchor.cpp b/src/Game/AI/Action/actionWarpToStaticAnchor.cpp index ca13d7bb..64c14230 100644 --- a/src/Game/AI/Action/actionWarpToStaticAnchor.cpp +++ b/src/Game/AI/Action/actionWarpToStaticAnchor.cpp @@ -10,21 +10,9 @@ bool WarpToStaticAnchor::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void WarpToStaticAnchor::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void WarpToStaticAnchor::leave_() { - ksys::act::ai::Action::leave_(); -} - void WarpToStaticAnchor::loadParams_() { getDynamicParam(&mAnchorName_d, "AnchorName"); getDynamicParam(&mUniqueName_d, "UniqueName"); } -void WarpToStaticAnchor::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionWarpToStaticAnchor.h b/src/Game/AI/Action/actionWarpToStaticAnchor.h index f889e334..e4eed2e9 100644 --- a/src/Game/AI/Action/actionWarpToStaticAnchor.h +++ b/src/Game/AI/Action/actionWarpToStaticAnchor.h @@ -11,13 +11,9 @@ public: ~WarpToStaticAnchor() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 sead::SafeString* mAnchorName_d{}; // dynamic_param at offset 0x30 diff --git a/src/Game/AI/Action/actionWaterFloatElectricParalysis.cpp b/src/Game/AI/Action/actionWaterFloatElectricParalysis.cpp index e75a86e8..1e3a3e69 100644 --- a/src/Game/AI/Action/actionWaterFloatElectricParalysis.cpp +++ b/src/Game/AI/Action/actionWaterFloatElectricParalysis.cpp @@ -7,18 +7,6 @@ WaterFloatElectricParalysis::WaterFloatElectricParalysis(const InitArg& arg) WaterFloatElectricParalysis::~WaterFloatElectricParalysis() = default; -bool WaterFloatElectricParalysis::init_(sead::Heap* heap) { - return OneTimeWaterFloatStopASPlay::init_(heap); -} - -void WaterFloatElectricParalysis::enter_(ksys::act::ai::InlineParamPack* params) { - OneTimeWaterFloatStopASPlay::enter_(params); -} - -void WaterFloatElectricParalysis::leave_() { - OneTimeWaterFloatStopASPlay::leave_(); -} - void WaterFloatElectricParalysis::loadParams_() { OneTimeWaterFloatStopASPlay::loadParams_(); } diff --git a/src/Game/AI/Action/actionWaterFloatElectricParalysis.h b/src/Game/AI/Action/actionWaterFloatElectricParalysis.h index bcf2afea..27e7e9f8 100644 --- a/src/Game/AI/Action/actionWaterFloatElectricParalysis.h +++ b/src/Game/AI/Action/actionWaterFloatElectricParalysis.h @@ -11,9 +11,6 @@ public: explicit WaterFloatElectricParalysis(const InitArg& arg); ~WaterFloatElectricParalysis() override; - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: diff --git a/src/Game/AI/Action/actionWaterFloatFreeze.cpp b/src/Game/AI/Action/actionWaterFloatFreeze.cpp index fd25ba67..ba416490 100644 --- a/src/Game/AI/Action/actionWaterFloatFreeze.cpp +++ b/src/Game/AI/Action/actionWaterFloatFreeze.cpp @@ -6,10 +6,6 @@ WaterFloatFreeze::WaterFloatFreeze(const InitArg& arg) : WaterFloatImmobile(arg) WaterFloatFreeze::~WaterFloatFreeze() = default; -bool WaterFloatFreeze::init_(sead::Heap* heap) { - return WaterFloatImmobile::init_(heap); -} - void WaterFloatFreeze::enter_(ksys::act::ai::InlineParamPack* params) { WaterFloatImmobile::enter_(params); } diff --git a/src/Game/AI/Action/actionWaterFloatFreeze.h b/src/Game/AI/Action/actionWaterFloatFreeze.h index f19ea456..059b4e0d 100644 --- a/src/Game/AI/Action/actionWaterFloatFreeze.h +++ b/src/Game/AI/Action/actionWaterFloatFreeze.h @@ -11,7 +11,6 @@ public: explicit WaterFloatFreeze(const InitArg& arg); ~WaterFloatFreeze() override; - bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; void loadParams_() override; diff --git a/src/Game/AI/Action/actionWaterFloatImmobile.cpp b/src/Game/AI/Action/actionWaterFloatImmobile.cpp index 690e8fe5..c16580bb 100644 --- a/src/Game/AI/Action/actionWaterFloatImmobile.cpp +++ b/src/Game/AI/Action/actionWaterFloatImmobile.cpp @@ -4,8 +4,6 @@ namespace uking::action { WaterFloatImmobile::WaterFloatImmobile(const InitArg& arg) : WaterFloatBase(arg) {} -WaterFloatImmobile::~WaterFloatImmobile() = default; - bool WaterFloatImmobile::init_(sead::Heap* heap) { return WaterFloatBase::init_(heap); } diff --git a/src/Game/AI/Action/actionWaterFloatImmobile.h b/src/Game/AI/Action/actionWaterFloatImmobile.h index b3027a25..17ae467f 100644 --- a/src/Game/AI/Action/actionWaterFloatImmobile.h +++ b/src/Game/AI/Action/actionWaterFloatImmobile.h @@ -9,7 +9,6 @@ class WaterFloatImmobile : public WaterFloatBase { SEAD_RTTI_OVERRIDE(WaterFloatImmobile, WaterFloatBase) public: explicit WaterFloatImmobile(const InitArg& arg); - ~WaterFloatImmobile() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/AI/Action/actionXLinkEventCreateAction.cpp b/src/Game/AI/Action/actionXLinkEventCreateAction.cpp index ace40948..df1f7982 100644 --- a/src/Game/AI/Action/actionXLinkEventCreateAction.cpp +++ b/src/Game/AI/Action/actionXLinkEventCreateAction.cpp @@ -10,22 +10,10 @@ bool XLinkEventCreateAction::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void XLinkEventCreateAction::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void XLinkEventCreateAction::leave_() { - ksys::act::ai::Action::leave_(); -} - void XLinkEventCreateAction::loadParams_() { getDynamicParam(&mIsTargetDemoSLinkUser_d, "IsTargetDemoSLinkUser"); getDynamicParam(&mELinkKey_d, "ELinkKey"); getDynamicParam(&mSLinkKey_d, "SLinkKey"); } -void XLinkEventCreateAction::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionXLinkEventCreateAction.h b/src/Game/AI/Action/actionXLinkEventCreateAction.h index f231bc56..b9dd2cde 100644 --- a/src/Game/AI/Action/actionXLinkEventCreateAction.h +++ b/src/Game/AI/Action/actionXLinkEventCreateAction.h @@ -11,13 +11,9 @@ public: ~XLinkEventCreateAction() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 bool* mIsTargetDemoSLinkUser_d{}; // dynamic_param at offset 0x28 diff --git a/src/Game/AI/Action/actionXLinkEventEnable.cpp b/src/Game/AI/Action/actionXLinkEventEnable.cpp index 99d27e8d..1efcceb4 100644 --- a/src/Game/AI/Action/actionXLinkEventEnable.cpp +++ b/src/Game/AI/Action/actionXLinkEventEnable.cpp @@ -10,20 +10,8 @@ bool XLinkEventEnable::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void XLinkEventEnable::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void XLinkEventEnable::leave_() { - ksys::act::ai::Action::leave_(); -} - void XLinkEventEnable::loadParams_() { getDynamicParam(&mIsEnable_d, "IsEnable"); } -void XLinkEventEnable::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionXLinkEventEnable.h b/src/Game/AI/Action/actionXLinkEventEnable.h index 2e4d474a..e7e8884b 100644 --- a/src/Game/AI/Action/actionXLinkEventEnable.h +++ b/src/Game/AI/Action/actionXLinkEventEnable.h @@ -11,13 +11,9 @@ public: ~XLinkEventEnable() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 bool* mIsEnable_d{}; }; diff --git a/src/Game/AI/Action/actionXLinkEventFadeAction.cpp b/src/Game/AI/Action/actionXLinkEventFadeAction.cpp index 4de0b678..7d829e87 100644 --- a/src/Game/AI/Action/actionXLinkEventFadeAction.cpp +++ b/src/Game/AI/Action/actionXLinkEventFadeAction.cpp @@ -10,21 +10,9 @@ bool XLinkEventFadeAction::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void XLinkEventFadeAction::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void XLinkEventFadeAction::leave_() { - ksys::act::ai::Action::leave_(); -} - void XLinkEventFadeAction::loadParams_() { getDynamicParam(&mELinkKey_d, "ELinkKey"); getDynamicParam(&mSLinkKey_d, "SLinkKey"); } -void XLinkEventFadeAction::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionXLinkEventFadeAction.h b/src/Game/AI/Action/actionXLinkEventFadeAction.h index 8219a2a3..82ef0084 100644 --- a/src/Game/AI/Action/actionXLinkEventFadeAction.h +++ b/src/Game/AI/Action/actionXLinkEventFadeAction.h @@ -11,13 +11,9 @@ public: ~XLinkEventFadeAction() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 sead::SafeString* mELinkKey_d{}; // dynamic_param at offset 0x30 diff --git a/src/Game/AI/Action/actionXLinkEventKillAction.cpp b/src/Game/AI/Action/actionXLinkEventKillAction.cpp index 03f0813a..098b3477 100644 --- a/src/Game/AI/Action/actionXLinkEventKillAction.cpp +++ b/src/Game/AI/Action/actionXLinkEventKillAction.cpp @@ -10,21 +10,9 @@ bool XLinkEventKillAction::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void XLinkEventKillAction::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void XLinkEventKillAction::leave_() { - ksys::act::ai::Action::leave_(); -} - void XLinkEventKillAction::loadParams_() { getDynamicParam(&mELinkKey_d, "ELinkKey"); getDynamicParam(&mSLinkKey_d, "SLinkKey"); } -void XLinkEventKillAction::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionXLinkEventKillAction.h b/src/Game/AI/Action/actionXLinkEventKillAction.h index 3929b3d2..c3ed44c2 100644 --- a/src/Game/AI/Action/actionXLinkEventKillAction.h +++ b/src/Game/AI/Action/actionXLinkEventKillAction.h @@ -11,13 +11,9 @@ public: ~XLinkEventKillAction() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // dynamic_param at offset 0x20 sead::SafeString* mELinkKey_d{}; // dynamic_param at offset 0x30 diff --git a/src/Game/AI/Action/actionZoraHeroRescuePlayer.cpp b/src/Game/AI/Action/actionZoraHeroRescuePlayer.cpp index b6e8d3b1..2ff8b388 100644 --- a/src/Game/AI/Action/actionZoraHeroRescuePlayer.cpp +++ b/src/Game/AI/Action/actionZoraHeroRescuePlayer.cpp @@ -10,20 +10,8 @@ bool ZoraHeroRescuePlayer::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void ZoraHeroRescuePlayer::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void ZoraHeroRescuePlayer::leave_() { - ksys::act::ai::Action::leave_(); -} - void ZoraHeroRescuePlayer::loadParams_() { getAITreeVariable(&mZoraHeroShowMsgUnit_a, "ZoraHeroShowMsgUnit"); } -void ZoraHeroRescuePlayer::calc_() { - ksys::act::ai::Action::calc_(); -} - } // namespace uking::action diff --git a/src/Game/AI/Action/actionZoraHeroRescuePlayer.h b/src/Game/AI/Action/actionZoraHeroRescuePlayer.h index 8fe4a263..ba7699d1 100644 --- a/src/Game/AI/Action/actionZoraHeroRescuePlayer.h +++ b/src/Game/AI/Action/actionZoraHeroRescuePlayer.h @@ -11,13 +11,9 @@ public: ~ZoraHeroRescuePlayer() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; void loadParams_() override; protected: - void calc_() override; - // aitree_variable at offset 0x20 void* mZoraHeroShowMsgUnit_a{}; }; diff --git a/tools/ai_generate_actions.py b/tools/ai_generate_actions.py index d4a9e560..58c069ca 100755 --- a/tools/ai_generate_actions.py +++ b/tools/ai_generate_actions.py @@ -1,11 +1,13 @@ #!/usr/bin/env python3 +import enum + import cxxfilt import zlib -from typing import List, Dict, Iterable, Optional +from typing import List, Dict, Iterable, Optional, Set from pathlib import Path import textwrap -from util import ai_common +from util import ai_common, elf def get_member_name(entry) -> str: @@ -85,7 +87,19 @@ def generate_action_param_member_vars(parent: str, info: list) -> str: return "\n".join(out) -def generate_action(class_dir: Path, name: str, info: list, parent: str) -> None: +@enum.unique +class CommonVIndex(enum.IntEnum): + Dtor = 2 + OneShot = 10 + Init = 11 + Enter = 12 + Leave = 14 + LoadParams = 15 + Calc = 31 + + +def generate_action(class_dir: Path, name: str, info: list, parent: str, seen_virtual_functions: Set[int], + vtable: int) -> None: name = name[0].upper() + name[1:] if parent: parent = parent[0].upper() + parent[1:] @@ -95,6 +109,13 @@ def generate_action(class_dir: Path, name: str, info: list, parent: str) -> None parent_class_name = parent if parent else 'ksys::act::ai::Action' + own_virtual_functions: Set[int] = set() + for i, fn in enumerate(elf.get_vtable_fns_from_base_elf(vtable, 32)): + if i not in CommonVIndex.__members__.values() or fn in seen_virtual_functions: + continue + own_virtual_functions.add(i) + seen_virtual_functions.add(fn) + # Header out = [] out.append("#pragma once") @@ -109,16 +130,22 @@ def generate_action(class_dir: Path, name: str, info: list, parent: str) -> None out.append(f" SEAD_RTTI_OVERRIDE({cpp_class_name}, {parent_class_name})") out.append("public:") out.append(f" explicit {cpp_class_name}(const InitArg& arg);") - out.append(f" ~{cpp_class_name}() override;") + if CommonVIndex.Dtor in own_virtual_functions: + out.append(f" ~{cpp_class_name}() override;") out.append("") - out.append(" bool init_(sead::Heap* heap) override;") - out.append(" void enter_(ksys::act::ai::InlineParamPack* params) override;") - out.append(" void leave_() override;") - out.append(" void loadParams_() override;") + if CommonVIndex.Init in own_virtual_functions: + out.append(" bool init_(sead::Heap* heap) override;") + if CommonVIndex.Enter in own_virtual_functions: + out.append(" void enter_(ksys::act::ai::InlineParamPack* params) override;") + if CommonVIndex.Leave in own_virtual_functions: + out.append(" void leave_() override;") + if CommonVIndex.LoadParams in own_virtual_functions: + out.append(" void loadParams_() override;") out.append("") out.append("protected:") - out.append(" void calc_() override;") - out.append("") + if CommonVIndex.Calc in own_virtual_functions: + out.append(" void calc_() override;") + out.append("") out.append(textwrap.indent(generate_action_param_member_vars(parent, info), " " * 4)) out.append("};") # =================================== end of class out.append("") @@ -134,28 +161,34 @@ def generate_action(class_dir: Path, name: str, info: list, parent: str) -> None out.append("") out.append(f"{cpp_class_name}::{cpp_class_name}(const InitArg& arg) : {parent_class_name}(arg) {{}}") out.append("") - out.append(f"{cpp_class_name}::~{cpp_class_name}() = default;") - out.append("") - out.append(f"bool {cpp_class_name}::init_(sead::Heap* heap) {{") - out.append(f" return {parent_class_name}::init_(heap);") - out.append(f"}}") - out.append("") - out.append(f"void {cpp_class_name}::enter_(ksys::act::ai::InlineParamPack* params) {{") - out.append(f" {parent_class_name}::enter_(params);") - out.append(f"}}") - out.append("") - out.append(f"void {cpp_class_name}::leave_() {{") - out.append(f" {parent_class_name}::leave_();") - out.append(f"}}") - out.append("") - out.append(f"void {cpp_class_name}::loadParams_() {{") - out.append(textwrap.indent(generate_action_loadparam_body(info), " " * 4)) - out.append(f"}}") - out.append("") - out.append(f"void {cpp_class_name}::calc_() {{") - out.append(f" {parent_class_name}::calc_();") - out.append(f"}}") - out.append("") + if CommonVIndex.Dtor in own_virtual_functions: + out.append(f"{cpp_class_name}::~{cpp_class_name}() = default;") + out.append("") + if CommonVIndex.Init in own_virtual_functions: + out.append(f"bool {cpp_class_name}::init_(sead::Heap* heap) {{") + out.append(f" return {parent_class_name}::init_(heap);") + out.append(f"}}") + out.append("") + if CommonVIndex.Enter in own_virtual_functions: + out.append(f"void {cpp_class_name}::enter_(ksys::act::ai::InlineParamPack* params) {{") + out.append(f" {parent_class_name}::enter_(params);") + out.append(f"}}") + out.append("") + if CommonVIndex.Leave in own_virtual_functions: + out.append(f"void {cpp_class_name}::leave_() {{") + out.append(f" {parent_class_name}::leave_();") + out.append(f"}}") + out.append("") + if CommonVIndex.LoadParams in own_virtual_functions: + out.append(f"void {cpp_class_name}::loadParams_() {{") + out.append(textwrap.indent(generate_action_loadparam_body(info), " " * 4)) + out.append(f"}}") + out.append("") + if CommonVIndex.Calc in own_virtual_functions: + out.append(f"void {cpp_class_name}::calc_() {{") + out.append(f" {parent_class_name}::calc_();") + out.append(f"}}") + out.append("") out.append("} // namespace uking::action") out.append("") (class_dir / f"action{name}.cpp").write_text("\n".join(out)) @@ -202,6 +235,10 @@ def main() -> None: action_params = ai_common.get_action_params() vtable_names = ai_common.get_action_vtable_names() + seen_virtual_functions = set() + seen_virtual_functions.update(elf.get_vtable_fns_from_base_elf(0x24d8d68, 31)) + seen_virtual_functions.update(elf.get_vtable_fns_from_base_elf(0x25129f0, 32)) + generated = set() for vtables in action_vtables.values(): vtables = list(dict.fromkeys(vtables)) @@ -224,7 +261,8 @@ def main() -> None: if vtable not in generated: generated.add(vtable) - generate_action(class_dir, action_name, action_params[action_name], parent_name) + generate_action(class_dir, action_name, action_params[action_name], parent_name, seen_virtual_functions, + vtable) generate_action_factories(class_dir, action_vtables.keys()) diff --git a/tools/util/elf.py b/tools/util/elf.py index 44d5ecaf..841aff47 100644 --- a/tools/util/elf.py +++ b/tools/util/elf.py @@ -1,5 +1,6 @@ import io -from typing import Any, Dict, NamedTuple +import struct +from typing import Any, Dict, NamedTuple, Tuple from elftools.elf.elffile import ELFFile from elftools.elf.relocation import RelocationSection @@ -76,6 +77,7 @@ def build_name_to_symbol_table(symtab) -> Dict[str, Symbol]: def read_from_elf(elf: ELFFile, addr: int, size: int) -> bytes: + addr &= ~0x7100000000 offset: int = get_file_offset(elf, addr) elf.stream.seek(offset) return elf.stream.read(size) @@ -106,3 +108,19 @@ def build_glob_data_table(elf: ELFFile) -> Dict[int, int]: table[reloc["r_offset"]] = sym_value + reloc["r_addend"] return table + + +def unpack_vtable_fns(vtable_bytes: bytes, num_entries: int) -> Tuple[int, ...]: + return struct.unpack(f"<{num_entries}Q", vtable_bytes[:num_entries * 8]) + + +def get_vtable_fns_from_base_elf(vtable_addr: int, num_entries: int) -> Tuple[int, ...]: + vtable_bytes = read_from_elf(base_elf, vtable_addr, num_entries * 8) + return unpack_vtable_fns(vtable_bytes, num_entries) + + +def get_vtable_fns_from_my_elf(vtable_name: str, num_entries: int) -> Tuple[int, ...]: + offset, size = get_symbol_file_offset_and_size(my_elf, my_symtab, vtable_name) + my_elf.stream.seek(offset + 0x10) + vtable_bytes = my_elf.stream.read(size - 0x10) + return unpack_vtable_fns(vtable_bytes, num_entries)