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 MarioActor::updateSwingAction

Browse Source
This commit is contained in:
Headpenguin 2023-07-07 11:59:41 -04:00
parent e7f926fedd
commit 93e5c7b569
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
csv/Player.csv
View File

@ -197,7 +197,7 @@ isInPunchTimerRange__10MarioActorCFv,MarioActor.o,Player.a,true
updatePunching__10MarioActorFv,MarioActor.o,Player.a,true
doRush__10MarioActorFv,MarioActor.o,Player.a,true
updateSwingTimer__10MarioActorFv,MarioActor.o,Player.a,true
updateSwingAction__10MarioActorFv,MarioActor.o,Player.a,false
updateSwingAction__10MarioActorFv,MarioActor.o,Player.a,true
checkClapCatchStart__10MarioActorFv,MarioActor.o,Player.a,false
updateRealMtx__10MarioActorFv,MarioActor.o,Player.a,false
setUpperRotateY__10MarioActorFf,MarioActor.o,Player.a,false

1 Symbol Name Object File Library Archive Matching
197 updatePunching__10MarioActorFv MarioActor.o Player.a true
198 doRush__10MarioActorFv MarioActor.o Player.a true
199 updateSwingTimer__10MarioActorFv MarioActor.o Player.a true
200 updateSwingAction__10MarioActorFv MarioActor.o Player.a false true
201 checkClapCatchStart__10MarioActorFv MarioActor.o Player.a false
202 updateRealMtx__10MarioActorFv MarioActor.o Player.a false
203 setUpperRotateY__10MarioActorFf MarioActor.o Player.a false

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

@ -741,7 +741,7 @@ void MarioActor::updateSwingAction() {
tryReleaseBombTeresa();
if(r30) MR::start2PJumpAssistSound();
}
else if(!getStates()._8_f && _230 -> isAnimationRun("地上ひねり")) {
else if(!getStates()._8_f && !_230 -> isAnimationRun("地上ひねり")) {
const char *lastAnimationName = _234 -> _10 -> getCurrentAnimationName();
if(_3d4 == 4) {
if(!_230 -> isAnimationRun("ハチスピン")) r291 = trySpinPunch();
@ -760,7 +760,7 @@ void MarioActor::updateSwingAction() {
}
_230 -> changeAnimation("ハチスピン空中", (const char *)NULL);
}
else if(!getStates()._8_a && _9f1) _230 -> changeAnimation("サマーソルト", (const char *)NULL);
else if(!getStates()._8_a || _9f1) _230 -> changeAnimation("サマーソルト", (const char *)NULL);
else _230 -> changeAnimation("ハチスピン", (const char *)NULL);
}
if(r291) _946 = _23c -> _0[_23c -> _8] -> _426 + 0x22;