diff --git a/data/file_list.yml b/data/file_list.yml index d90a48ed46..4adf5f10cc 100644 --- a/data/file_list.yml +++ b/data/file_list.yml @@ -108949,7 +108949,7 @@ Npc/SmallBirdStateFlyAway.o: - offset: 0x3d0cdc size: 2016 label: _ZN21SmallBirdStateFlyAway10exeFlyAwayEv - status: NonMatchingMinor + status: NonMatchingMajor - offset: 0x3d14bc size: 340 label: _ZN21SmallBirdStateFlyAway21exeFlyAwayHomeLandingEv @@ -113340,7 +113340,7 @@ Player/HackCap.o: - offset: 0x3fa644 size: 512 label: _ZN17HackCapThrowParamC2EPN2al9LiveActorE - status: Matching + status: NotDecompiled lazy: true - offset: 0x3fa844 size: 272 @@ -201703,7 +201703,7 @@ sead/framework/nx/seadGameFrameworkNx.o: - offset: 0x731120 size: 4 label: _ZN4sead18LogicalFrameBufferD2Ev - status: Matching + status: NotDecompiled lazy: true - offset: 0x731124 size: 52 @@ -201866,17 +201866,17 @@ sead/framework/nx/seadGameFrameworkNx.o: - offset: 0x732708 size: 112 label: _ZNK4sead18LogicalFrameBuffer27checkDerivedRuntimeTypeInfoEPKNS_15RuntimeTypeInfo9InterfaceE - status: Matching + status: NotDecompiled lazy: true - offset: 0x732778 size: 92 label: _ZNK4sead18LogicalFrameBuffer18getRuntimeTypeInfoEv - status: Matching + status: NotDecompiled lazy: true - offset: 0x7327d4 size: 4 label: _ZN4sead18LogicalFrameBufferD0Ev - status: Matching + status: NotDecompiled lazy: true - offset: 0x7327d8 size: 48 @@ -202816,11 +202816,11 @@ sead/gfx/nvn/seadDebugFontMgrJis1Nvn.o: label: - _ZN4sead19DebugFontMgrJis1NvnD1Ev - _ZN4sead19DebugFontMgrJis1NvnD2Ev - status: NonMatchingMinor + status: Matching - offset: 0x738760 size: 4 label: _ZN4sead19DebugFontMgrJis1NvnD0Ev - status: NonMatchingMinor + status: Matching - offset: 0x738764 size: 288 label: _ZN4sead19DebugFontMgrJis1Nvn10initializeEPNS_4HeapEPKcS4_S4_j @@ -202901,11 +202901,11 @@ sead/gfx/nvn/seadDebugFontMgrNvn.o: label: - _ZN4sead15DebugFontMgrNvnD1Ev - _ZN4sead15DebugFontMgrNvnD2Ev - status: NonMatchingMinor + status: Matching - offset: 0x739328 size: 4 label: _ZN4sead15DebugFontMgrNvnD0Ev - status: NonMatchingMinor + status: Matching - offset: 0x73932c size: 240 label: _ZN4sead15DebugFontMgrNvn10initializeEPNS_4HeapEPKcS4_j @@ -210150,7 +210150,7 @@ sead/gfx/seadDrawLockContext.o: - offset: 0x7730b4 size: 76 label: _ZN4sead14MathCalcCommonIiE3gcdEii - status: Matching + status: NonMatchingMajor - offset: 0x773100 size: 92 label: _ZN4sead14MathCalcCommonIiE3lcmEii @@ -210158,7 +210158,7 @@ sead/gfx/seadDrawLockContext.o: - offset: 0x77315c size: 76 label: _ZN4sead14MathCalcCommonIjE3gcdEjj - status: Matching + status: NonMatchingMajor - offset: 0x7731a8 size: 92 label: _ZN4sead14MathCalcCommonIjE3lcmEjj @@ -210178,7 +210178,7 @@ sead/gfx/seadDrawLockContext.o: - offset: 0x773314 size: 76 label: _ZN4sead14MathCalcCommonIlE3gcdEll - status: Matching + status: NonMatchingMajor - offset: 0x773360 size: 92 label: _ZN4sead14MathCalcCommonIlE3lcmEll @@ -210186,7 +210186,7 @@ sead/gfx/seadDrawLockContext.o: - offset: 0x7733bc size: 76 label: _ZN4sead14MathCalcCommonImE3gcdEmm - status: Matching + status: NonMatchingMajor - offset: 0x773408 size: 92 label: _ZN4sead14MathCalcCommonImE3lcmEmm @@ -281447,12 +281447,12 @@ Library/Sequence/Sequence.o: - offset: 0x9f223c size: 4 label: _ZN2al8Sequence4initERKNS_16SequenceInitInfoE - status: Matching + status: NotDecompiled lazy: true - offset: 0x9f2240 size: 8 label: _ZNK2al8Sequence12isDisposableEv - status: Matching + status: NotDecompiled lazy: true - offset: 0x9f2248 size: 8 @@ -281462,12 +281462,12 @@ Library/Sequence/Sequence.o: - offset: 0x9f2250 size: 20 label: _ZN2al16IUseSceneCreatorD2Ev - status: Matching + status: NotDecompiled lazy: true - offset: 0x9f2264 size: 4 label: _ZN2al16IUseSceneCreatorD0Ev - status: Matching + status: NotDecompiled lazy: true - offset: 0x9f2268 size: 8 @@ -285367,17 +285367,17 @@ Library/Shadow/ShadowMaskCtrl.o: - offset: 0xa2095c size: 8 label: _ZN15alYamlMacroUtil13YamlParamBaseIPKcE8clearPtrEv - status: Matching + status: NotDecompiled lazy: true - offset: 0xa20964 size: 8 label: _ZNK15alYamlMacroUtil20YamlParam_YamlString10getClassIdEv - status: Matching + status: NotDecompiled lazy: true - offset: 0xa2096c size: 16 label: _ZNK15alYamlMacroUtil13YamlParamBaseIPKcE10isValidPtrEv - status: Matching + status: NotDecompiled lazy: true - offset: 0xa2097c size: 4 @@ -285427,7 +285427,7 @@ Library/Shadow/ShadowMaskCtrl.o: - offset: 0xa209a0 size: 8 label: _ZN15alYamlMacroUtil20YamlParam_YamlString17setPtr_YamlStringEPPKc - status: Matching + status: NotDecompiled lazy: true - offset: 0xa209a8 size: 4 @@ -285437,122 +285437,122 @@ Library/Shadow/ShadowMaskCtrl.o: - offset: 0xa209ac size: 8 label: _ZN15alYamlMacroUtil13YamlParamBaseIN4sead7Vector3IfEEE8clearPtrEv - status: Matching + status: NotDecompiled lazy: true - offset: 0xa209b4 size: 8 label: _ZNK15alYamlMacroUtil13YamlParam_V3f10getClassIdEv - status: Matching + status: NotDecompiled lazy: true - offset: 0xa209bc size: 16 label: _ZNK15alYamlMacroUtil13YamlParamBaseIN4sead7Vector3IfEEE10isValidPtrEv - status: Matching + status: NotDecompiled lazy: true - offset: 0xa209cc size: 8 label: _ZN15alYamlMacroUtil13YamlParam_V3f10setPtr_V3fEPN4sead7Vector3IfEE - status: Matching + status: NotDecompiled lazy: true - offset: 0xa209d4 size: 8 label: _ZN15alYamlMacroUtil13YamlParamBaseIN4sead7Color4fEE8clearPtrEv - status: Matching + status: NotDecompiled lazy: true - offset: 0xa209dc size: 8 label: _ZNK15alYamlMacroUtil19YamlParam_YamlColor10getClassIdEv - status: Matching + status: NotDecompiled lazy: true - offset: 0xa209e4 size: 16 label: _ZNK15alYamlMacroUtil13YamlParamBaseIN4sead7Color4fEE10isValidPtrEv - status: Matching + status: NotDecompiled lazy: true - offset: 0xa209f4 size: 8 label: _ZN15alYamlMacroUtil19YamlParam_YamlColor16setPtr_YamlColorEPN4sead7Color4fE - status: Matching + status: NotDecompiled lazy: true - offset: 0xa209fc size: 8 label: _ZN15alYamlMacroUtil13YamlParamBaseIbE8clearPtrEv - status: Matching + status: NotDecompiled lazy: true - offset: 0xa20a04 size: 8 label: _ZNK15alYamlMacroUtil14YamlParam_bool10getClassIdEv - status: Matching + status: NotDecompiled lazy: true - offset: 0xa20a0c size: 16 label: _ZNK15alYamlMacroUtil13YamlParamBaseIbE10isValidPtrEv - status: Matching + status: NotDecompiled lazy: true - offset: 0xa20a1c size: 8 label: _ZN15alYamlMacroUtil14YamlParam_bool11setPtr_boolEPb - status: Matching + status: NotDecompiled lazy: true - offset: 0xa20a24 size: 8 label: _ZN15alYamlMacroUtil13YamlParamBaseIhE8clearPtrEv - status: Matching + status: NotDecompiled lazy: true - offset: 0xa20a2c size: 8 label: _ZNK15alYamlMacroUtil12YamlParam_u810getClassIdEv - status: Matching + status: NotDecompiled lazy: true - offset: 0xa20a34 size: 16 label: _ZNK15alYamlMacroUtil13YamlParamBaseIhE10isValidPtrEv - status: Matching + status: NotDecompiled lazy: true - offset: 0xa20a44 size: 8 label: _ZN15alYamlMacroUtil12YamlParam_u89setPtr_u8EPh - status: Matching + status: NotDecompiled lazy: true - offset: 0xa20a4c size: 8 label: _ZN15alYamlMacroUtil13YamlParamBaseIfE8clearPtrEv - status: Matching + status: NotDecompiled lazy: true - offset: 0xa20a54 size: 8 label: _ZNK15alYamlMacroUtil13YamlParam_f3210getClassIdEv - status: Matching + status: NotDecompiled lazy: true - offset: 0xa20a5c size: 16 label: _ZNK15alYamlMacroUtil13YamlParamBaseIfE10isValidPtrEv - status: Matching + status: NotDecompiled lazy: true - offset: 0xa20a6c size: 8 label: _ZN15alYamlMacroUtil13YamlParam_f3210setPtr_f32EPf - status: Matching + status: NotDecompiled lazy: true - offset: 0xa20a74 size: 8 label: _ZN15alYamlMacroUtil13YamlParamBaseIN4sead7Vector2IfEEE8clearPtrEv - status: Matching + status: NotDecompiled lazy: true - offset: 0xa20a7c size: 8 label: _ZNK15alYamlMacroUtil13YamlParam_V2f10getClassIdEv - status: Matching + status: NotDecompiled lazy: true - offset: 0xa20a84 size: 16 label: _ZNK15alYamlMacroUtil13YamlParamBaseIN4sead7Vector2IfEEE10isValidPtrEv - status: Matching + status: NotDecompiled lazy: true - offset: 0xa20a94 size: 8 label: _ZN15alYamlMacroUtil13YamlParam_V2f10setPtr_V2fEPN4sead7Vector2IfEE - status: Matching + status: NotDecompiled lazy: true - offset: 0xa20a9c size: 428 @@ -317945,7 +317945,7 @@ Unknown/SePlayer.o: - offset: 0xb61a7c size: 156 label: _ZN4sead17StringBuilderBaseIDsE27rstripUnprintableAsciiCharsEv - status: NonMatchingMajor + status: Matching - offset: 0xb61b18 size: 72 label: _ZN4sead17StringBuilderBaseIDsE4trimEi @@ -317957,7 +317957,7 @@ Unknown/SePlayer.o: - offset: 0xb61be8 size: 68 label: _ZN4sead17StringBuilderBaseIDsE11replaceCharEDsDs - status: NonMatchingMajor + status: Matching - offset: 0xb61c2c size: 368 label: _ZN4sead17StringBuilderBaseIDsE15replaceCharListERKNS_14SafeStringBaseIDsEES5_ @@ -318410,7 +318410,7 @@ Unknown/SePlayer.o: - offset: 0xb65bec size: 4 label: _ZN4sead8FontBaseD2Ev - status: Matching + status: NotDecompiled lazy: true - offset: 0xb65bf0 size: 124 diff --git a/lib/al/Library/Sequence/IUseSceneCreator.cpp b/lib/al/Library/Sequence/IUseSceneCreator.cpp deleted file mode 100644 index 9f0edaf8ea..0000000000 --- a/lib/al/Library/Sequence/IUseSceneCreator.cpp +++ /dev/null @@ -1,9 +0,0 @@ -#include "Library/Sequence/IUseSceneCreator.h" - -namespace al { - -IUseSceneCreator::~IUseSceneCreator() { - ; -} - -} // namespace al diff --git a/lib/al/Library/Sequence/IUseSceneCreator.h b/lib/al/Library/Sequence/IUseSceneCreator.h index eb49694604..6dc845ff41 100644 --- a/lib/al/Library/Sequence/IUseSceneCreator.h +++ b/lib/al/Library/Sequence/IUseSceneCreator.h @@ -5,7 +5,7 @@ class SceneCreator; class IUseSceneCreator { public: - virtual ~IUseSceneCreator(); + virtual ~IUseSceneCreator() = default; virtual void setSceneCreator(SceneCreator* creator) = 0; virtual SceneCreator* getSceneCreator() const = 0; diff --git a/lib/al/Library/Sequence/Sequence.cpp b/lib/al/Library/Sequence/Sequence.cpp index 84c99454f1..c356061df8 100644 --- a/lib/al/Library/Sequence/Sequence.cpp +++ b/lib/al/Library/Sequence/Sequence.cpp @@ -4,14 +4,8 @@ namespace al { Sequence::Sequence(const char* name) : NerveExecutor(name), mName(name) {} -void Sequence::init(const SequenceInitInfo& initInfo) {} - void Sequence::kill() { mIsAlive = false; } -bool Sequence::isDisposable() const { - return true; -} - } // namespace al diff --git a/lib/al/Library/Sequence/Sequence.h b/lib/al/Library/Sequence/Sequence.h index ee07255dd6..3691d548e5 100644 --- a/lib/al/Library/Sequence/Sequence.h +++ b/lib/al/Library/Sequence/Sequence.h @@ -19,7 +19,7 @@ class Sequence : public NerveExecutor, public IUseAudioKeeper, public IUseSceneC Sequence(const char* name); ~Sequence() override; - virtual void init(const SequenceInitInfo& initInfo); + virtual void init(const SequenceInitInfo& initInfo) {} virtual void update(); virtual void kill(); @@ -28,7 +28,7 @@ class Sequence : public NerveExecutor, public IUseAudioKeeper, public IUseSceneC AudioKeeper* getAudioKeeper() const override { return mAudioKeeper; } - virtual bool isDisposable() const; + virtual bool isDisposable() const { return true; } virtual Scene* getCurrentScene() const { return nullptr; } diff --git a/lib/al/Library/Yaml/MacroUtil.cpp b/lib/al/Library/Yaml/MacroUtil.cpp index 63fbd66dd3..ae338d7d69 100644 --- a/lib/al/Library/Yaml/MacroUtil.cpp +++ b/lib/al/Library/Yaml/MacroUtil.cpp @@ -127,32 +127,4 @@ void YamlParamGroup::readParam(const al::ByamlIter& iter) { } } -YamlClassId YamlParam_YamlString::getClassId() const { - return YamlClassId::String; -} - -YamlClassId YamlParam_V3f::getClassId() const { - return YamlClassId::V3f; -} - -YamlClassId YamlParam_YamlColor::getClassId() const { - return YamlClassId::Color; -} - -YamlClassId YamlParam_bool::getClassId() const { - return YamlClassId::Bool; -} - -YamlClassId YamlParam_u8::getClassId() const { - return YamlClassId::U8; -} - -YamlClassId YamlParam_f32::getClassId() const { - return YamlClassId::F32; -} - -YamlClassId YamlParam_V2f::getClassId() const { - return YamlClassId::V2f; -} - } // namespace alYamlMacroUtil diff --git a/lib/al/Library/Yaml/MacroUtil.h b/lib/al/Library/Yaml/MacroUtil.h index ff78808403..f94fd4df39 100644 --- a/lib/al/Library/Yaml/MacroUtil.h +++ b/lib/al/Library/Yaml/MacroUtil.h @@ -104,7 +104,7 @@ class YamlParam_YamlString : public YamlParamBase { public: YamlParam_YamlString(const char* name) : YamlParamBase(name) {} - YamlClassId getClassId() const override; + YamlClassId getClassId() const override { return YamlClassId::String; } void setPtr_YamlString(const char** value) override { setParamPtr(value); } }; @@ -113,7 +113,7 @@ class YamlParam_V3f : public YamlParamBase { public: YamlParam_V3f(const char* name) : YamlParamBase(name) {} - YamlClassId getClassId() const override; + YamlClassId getClassId() const override { return YamlClassId::V3f; } void setPtr_V3f(sead::Vector3f* value) override { setParamPtr(value); } }; @@ -122,7 +122,7 @@ class YamlParam_YamlColor : public YamlParamBase { public: YamlParam_YamlColor(const char* name) : YamlParamBase(name) {} - YamlClassId getClassId() const override; + YamlClassId getClassId() const override { return YamlClassId::Color; } void setPtr_YamlColor(sead::Color4f* value) override { setParamPtr(value); } }; @@ -131,7 +131,7 @@ class YamlParam_bool : public YamlParamBase { public: YamlParam_bool(const char* name) : YamlParamBase(name) {} - YamlClassId getClassId() const override; + YamlClassId getClassId() const override { return YamlClassId::Bool; } void setPtr_bool(bool* value) override { setParamPtr(value); } }; @@ -140,7 +140,7 @@ class YamlParam_u8 : public YamlParamBase { public: YamlParam_u8(const char* name) : YamlParamBase(name) {} - YamlClassId getClassId() const override; + YamlClassId getClassId() const override { return YamlClassId::U8; } void setPtr_u8(u8* value) override { setParamPtr(value); } }; @@ -149,7 +149,7 @@ class YamlParam_f32 : public YamlParamBase { public: YamlParam_f32(const char* name) : YamlParamBase(name) {} - YamlClassId getClassId() const override; + YamlClassId getClassId() const override { return YamlClassId::F32; } void setPtr_f32(f32* value) override { setParamPtr(value); } }; @@ -158,7 +158,7 @@ class YamlParam_V2f : public YamlParamBase { public: YamlParam_V2f(const char* name) : YamlParamBase(name) {} - YamlClassId getClassId() const override; + YamlClassId getClassId() const override { return YamlClassId::V2f; } void setPtr_V2f(sead::Vector2f* value) override { setParamPtr(value); } }; diff --git a/lib/sead b/lib/sead index f90b24c4e3..12ad63c549 160000 --- a/lib/sead +++ b/lib/sead @@ -1 +1 @@ -Subproject commit f90b24c4e35a816fb93e5497e95b6a987bc1421b +Subproject commit 12ad63c5493d19d054bd3a3b07e0e7b4534d2361 diff --git a/src/Player/CollidedShapeResult.h b/src/Player/CollidedShapeResult.h index f5b0e0de2f..40a3c735cc 100644 --- a/src/Player/CollidedShapeResult.h +++ b/src/Player/CollidedShapeResult.h @@ -29,7 +29,8 @@ class CollidedShapeResult { const CollisionShapeInfoSphere* getShapeInfoSphere() const; const CollisionShapeInfoDisk* getShapeInfoDisk() const; - void operator=(const CollidedShapeResult& other); + // TODO: Find an alternative solution to weak + void __attribute__((weak)) operator=(const CollidedShapeResult & other); private: const CollisionShapeInfoBase* mShapeInfo; diff --git a/src/Player/HackCapThrowParam.cpp b/src/Player/HackCapThrowParam.cpp deleted file mode 100644 index b9e7a80226..0000000000 --- a/src/Player/HackCapThrowParam.cpp +++ /dev/null @@ -1,30 +0,0 @@ -#include "Player/HackCapThrowParam.h" - -#include "Library/LiveActor/ActorParamHolderUtil.h" - -HackCapThrowParam::HackCapThrowParam(al::LiveActor* actor) { - mHackThrowHeight = al::findActorParamF32(actor, "投げる高さ"); - mMaxVel = al::findActorParamF32(actor, "最高速度"); - mContinuousThrowSpeed = al::findActorParamF32(actor, "連続投げ速度"); - mBreakTime = al::findActorParamS32(actor, "ブレーキ時間"); - mMaxDist = al::findActorParamF32(actor, "到達距離"); - mEndpointStopTime = al::findActorParamS32(actor, "端点停止時間"); - mMaxEndpointStopTime = al::findActorParamS32(actor, "最大端点停止時間"); - mReturnStrength = al::findActorParamF32(actor, "戻り強さ"); - mMaxRetSpeed = al::findActorParamF32(actor, "戻り最高速度"); - mTurnAngleLimit = al::findActorParamF32(actor, "ターン限界角度"); - mWaterMaxSpeed = al::findActorParamF32(actor, "[水中]最高速度"); - mWaterDist = al::findActorParamF32(actor, "[水中]到達距離"); - mWaterBreakTime = al::findActorParamS32(actor, "[水中]ブレーキ時間"); - mWaterMaxRetSpeed = al::findActorParamF32(actor, "[水中]戻り最高速度"); - mTornadoDist = al::findActorParamF32(actor, "[竜巻投げ]到達距離"); - mTornadoMaxDist = al::findActorParamF32(actor, "[竜巻投げ]最高到達距離"); - mTornadoReflectTime = al::findActorParamS32(actor, "[竜巻投げ]反射時間"); - mRollSpeed = al::findActorParamF32(actor, "[転がし投げ]速度"); - mRollDistTop = al::findActorParamF32(actor, "[転がし投げ]到達距離[上]"); - mRollDistBottom = al::findActorParamF32(actor, "[転がし投げ]到達距離[下]"); - mRollBrakeTimeTop = al::findActorParamS32(actor, "[転がし投げ]ブレーキ時間[上]"); - mRollBrakeTimeBottom = al::findActorParamS32(actor, "[転がし投げ]ブレーキ時間[下]"); - mRollGroundGroundedPoseTrack = al::findActorParamF32(actor, "[転がし投げ]姿勢追従[接地]"); - mRollGroundAerialPoseTrack = al::findActorParamF32(actor, "[転がし投げ]姿勢追従[空中]"); -} diff --git a/src/Player/HackCapThrowParam.h b/src/Player/HackCapThrowParam.h index 5f57684749..0fb828626e 100644 --- a/src/Player/HackCapThrowParam.h +++ b/src/Player/HackCapThrowParam.h @@ -2,6 +2,8 @@ #include +#include "Library/LiveActor/ActorParamHolderUtil.h" + namespace al { struct ActorParamF32; struct ActorParamS32; @@ -10,7 +12,32 @@ class LiveActor; class HackCapThrowParam { public: - HackCapThrowParam(al::LiveActor* actor); + HackCapThrowParam(al::LiveActor* actor) { + mHackThrowHeight = al::findActorParamF32(actor, "投げる高さ"); + mMaxVel = al::findActorParamF32(actor, "最高速度"); + mContinuousThrowSpeed = al::findActorParamF32(actor, "連続投げ速度"); + mBreakTime = al::findActorParamS32(actor, "ブレーキ時間"); + mMaxDist = al::findActorParamF32(actor, "到達距離"); + mEndpointStopTime = al::findActorParamS32(actor, "端点停止時間"); + mMaxEndpointStopTime = al::findActorParamS32(actor, "最大端点停止時間"); + mReturnStrength = al::findActorParamF32(actor, "戻り強さ"); + mMaxRetSpeed = al::findActorParamF32(actor, "戻り最高速度"); + mTurnAngleLimit = al::findActorParamF32(actor, "ターン限界角度"); + mWaterMaxSpeed = al::findActorParamF32(actor, "[水中]最高速度"); + mWaterDist = al::findActorParamF32(actor, "[水中]到達距離"); + mWaterBreakTime = al::findActorParamS32(actor, "[水中]ブレーキ時間"); + mWaterMaxRetSpeed = al::findActorParamF32(actor, "[水中]戻り最高速度"); + mTornadoDist = al::findActorParamF32(actor, "[竜巻投げ]到達距離"); + mTornadoMaxDist = al::findActorParamF32(actor, "[竜巻投げ]最高到達距離"); + mTornadoReflectTime = al::findActorParamS32(actor, "[竜巻投げ]反射時間"); + mRollSpeed = al::findActorParamF32(actor, "[転がし投げ]速度"); + mRollDistTop = al::findActorParamF32(actor, "[転がし投げ]到達距離[上]"); + mRollDistBottom = al::findActorParamF32(actor, "[転がし投げ]到達距離[下]"); + mRollBrakeTimeTop = al::findActorParamS32(actor, "[転がし投げ]ブレーキ時間[上]"); + mRollBrakeTimeBottom = al::findActorParamS32(actor, "[転がし投げ]ブレーキ時間[下]"); + mRollGroundGroundedPoseTrack = al::findActorParamF32(actor, "[転がし投げ]姿勢追従[接地]"); + mRollGroundAerialPoseTrack = al::findActorParamF32(actor, "[転がし投げ]姿勢追従[空中]"); + } private: al::ActorParamF32* mHackThrowHeight;