Game-Decompilation/Petari
1
0
Fork 0
mirror of https://github.com/SMGCommunity/Petari.git synced 2024-11-27 15:30:44 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Match MarioActor::control2

Browse Source
This commit is contained in:
Headpenguin 2023-07-04 08:04:09 -04:00
parent 99c469a9be
commit fd207d16c7
3 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
csv/Player.csv
View File

@ -189,7 +189,7 @@ updateRotationInfo__10MarioActorFv,MarioActor.o,Player.a,false
exeWait__10MarioActorFv,MarioActor.o,Player.a,true
movement__10MarioActorFv,MarioActor.o,Player.a,true
control__10MarioActorFv,MarioActor.o,Player.a,true
control2__10MarioActorFv,MarioActor.o,Player.a,false
control2__10MarioActorFv,MarioActor.o,Player.a,true
controlMain__10MarioActorFv,MarioActor.o,Player.a,false
updateBehavior__10MarioActorFv,MarioActor.o,Player.a,false
updateBindRatio__10MarioActorFv,MarioActor.o,Player.a,false

1 Symbol Name Object File Library Archive Matching
189 exeWait__10MarioActorFv MarioActor.o Player.a true
190 movement__10MarioActorFv MarioActor.o Player.a true
191 control__10MarioActorFv MarioActor.o Player.a true
192 control2__10MarioActorFv MarioActor.o Player.a false true
193 controlMain__10MarioActorFv MarioActor.o Player.a false
194 updateBehavior__10MarioActorFv MarioActor.o Player.a false
195 updateBindRatio__10MarioActorFv MarioActor.o Player.a false

2
include/Game/Player/Mario.h
View File

@ -83,6 +83,8 @@ public:
void push(const TVec3f &);
void stopJump();
void updateGroundInfo();
void checkEnforceMove();
bool isDamaging() const;
//u32 _8;
union {

30
source/Game/Player/MarioActor.cpp
View File

@ -456,3 +456,33 @@ void MarioActor::control() {
control2();
_294 = mPosition;
}
void MarioActor::control2() {
if((_3d8 && _3d4) || _3da) {
_230 -> _350.zero();
_230 -> _35C.zero();
_7dc = 0;
_930 = 0;
mVelocity.zero();
_264.zero();
_270 = mPosition;
if(isMoving() && !MR::isSameMtx(_230 -> _45C -> getPrevBaseMtx() -> toMtxPtr(), _230 -> _45C -> getBaseMtx() -> toMtxPtr())) {
_230 -> _130 = mPosition;
_230 -> checkEnforceMove();
mPosition = _230 -> _130;
}
}
else {
if(_bc4) _bc4--;
_951 = 0;
controlMain();
if(!_ea4) {
if(!_f44) MR::offBind(this);
else MR::onBind(this);
}
_978 = mVelocity;
if(_230 -> _18_b) mBinder -> _1ec &= ~(u32)0x40; // suspected bitfield
else mBinder -> _1ec |= 0x40;
if(_230 -> isDamaging()) _424 = 0;
}
}