Game-Decompilation/Petari
1
0
Fork 0
mirror of https://github.com/SMGCommunity/Petari.git synced 2024-11-23 21:49:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Match MarioAnimator::isAnimationStop

Browse Source
This commit is contained in:
Headpenguin 2024-04-14 13:47:31 -04:00
parent 53dce61f4b
commit a4cb8bb396
4 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
csv/Player.csv
View File

@ -558,7 +558,7 @@ exeGameOverBlackHole2__10MarioActorFv,MarioActorBlackHole.o,Player.a,false
__sinit_\MarioActorBlackHole_cpp,MarioActorBlackHole.o,Player.a,false
__ct__13MarioAnimatorFP10MarioActor,MarioAnimator.o,Player.a,true
init__13MarioAnimatorFv,MarioAnimator.o,Player.a,true
isAnimationStop__13MarioAnimatorCFv,MarioAnimator.o,Player.a,false
isAnimationStop__13MarioAnimatorCFv,MarioAnimator.o,Player.a,true
targetWeight__13MarioAnimatorFPfff,MarioAnimator.o,Player.a,false
setWalkWeight__13MarioAnimatorFPCf,MarioAnimator.o,Player.a,false
setBlendWeight__13MarioAnimatorFPCff,MarioAnimator.o,Player.a,false

1 Symbol Name Object File Library Archive Matching
558 __sinit_\MarioActorBlackHole_cpp MarioActorBlackHole.o Player.a false
559 __ct__13MarioAnimatorFP10MarioActor MarioAnimator.o Player.a true
560 init__13MarioAnimatorFv MarioAnimator.o Player.a true
561 isAnimationStop__13MarioAnimatorCFv MarioAnimator.o Player.a false true
562 targetWeight__13MarioAnimatorFPfff MarioAnimator.o Player.a false
563 setWalkWeight__13MarioAnimatorFPCf MarioAnimator.o Player.a false
564 setBlendWeight__13MarioAnimatorFPCff MarioAnimator.o Player.a false

5
include/Game/Animation/XanimePlayer.hpp
View File

@ -37,7 +37,10 @@ public:
J3DModel *mModel; // _0
J3DModelData* mModelData; // _4
u8 _8[0x6C-0x8];
u8 _8[0x5C-8];
u32 _5C;
u32 _60;
u8 _64[8];
XanimeCore* mCore; // _6C
u8 _70[0x1C];
};

2
include/Game/Player/MarioAnimator.hpp
View File

@ -16,7 +16,7 @@ public:
void update();
void setHoming();
bool isAnimationStop();
bool isAnimationStop() const;
void setSpeed(f32);
void forceSetBlendWeight(const f32 *);
void waterToGround();

4
source/Game/Player/MarioAnimator.cpp
View File

@ -61,3 +61,7 @@ void MarioAnimator::init()
_10->mCore->shareJointTransform(_C->mCore);
PSMTXCopy(MR::tmpMtxRotYRad(3.14159274101f), _DC.toMtxPtr());
}
bool MarioAnimator::isAnimationStop() const {
return _C->_5C - _C->_60 == 0;
}