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::control

Browse Source
This commit is contained in:
Headpenguin 2023-07-03 20:04:15 -04:00
parent cc8569b625
commit 99c469a9be
5 changed files with 42 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
csv/Player.csv
View File

@ -188,7 +188,7 @@ getJointCtrl__10MarioActorCFPCc,MarioActor.o,Player.a,true
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,false
control__10MarioActorFv,MarioActor.o,Player.a,true
control2__10MarioActorFv,MarioActor.o,Player.a,false
controlMain__10MarioActorFv,MarioActor.o,Player.a,false
updateBehavior__10MarioActorFv,MarioActor.o,Player.a,false

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

8
include/Game/Player/MarioParts.h Normal file
View File

@ -0,0 +1,8 @@
#pragma once
#include "Game/LiveActor/LiveActor.h"
class MarioParts : public LiveActor {
public:
};

1
include/Game/Util/LiveActorUtil.h
View File

@ -75,6 +75,7 @@ namespace MR {
void hideModelIfHidden(LiveActor *);
void hideModelAndOnCalcAnim(LiveActor *);
void stopAnimFrame(LiveActor *);
ResourceHolder* getResourceHolder(const LiveActor *);
ResourceHolder* getModelResourceHolder(const LiveActor *);

1
include/Game/Util/ScreenUtil.h
View File

@ -46,6 +46,7 @@ namespace MR {
void forceToBlankCinemaFrame();
void requestOneUp();
void requestPowerupHPMeter();
void startToCaptureScreen(const char *);

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

@ -11,6 +11,7 @@
#include "Game/Enemy/KariKariDirector.h"
#include "Game/Animation/XanimePlayer.h"
#include "Game/Map/CollisionParts.h"
#include "Game/Player/MarioParts.h"
static bool isLuigi;
@ -219,7 +220,6 @@ bool MarioActor::isDebugMode() const {
return _230 -> _8_16;
}
void MarioActor::updateRotationInfo() {
TRot3f stack_44;
PSMTXConcat(getBaseMtx(), _e3c.toMtxPtr(), stack_44.toMtxPtr());
@ -426,3 +426,33 @@ void MarioActor::movement() {
_f3c_vec[_f40] = _230 -> _208;
_f40 = (u16)(_f40 + 1) % _f42;
}
void MarioActor::control() {
if(_ee8) {
if(MR::tryStartDemoWithoutCinemaFrame(this, "マリオスーパー化")) {
_ee8 = false;
changeMaxLife(6);
MR::stopAnimFrame(this);
MR::requestPowerupHPMeter();
_230 -> startPadVib("マリオ[変身]");
MR::startSystemSE("SE_SY_SUPER_KINOKO_GET", -1, -1);
_3da = 0x5a;
}
}
else if(_ee9) {
if(MR::tryStartDemoWithoutCinemaFrame(this, "マリオ変身")) {
_ee9 = false;
_eea = true;
if(_3d4 == 6) {
MR::requestMovementOn(_9a4);
changeTeresaAnimation("change", -1);
}
_3d8 = 0x40;
MR::stopAnimFrame(this);
playEffect("変身");
_230 -> startPadVib("マリオ[変身]");
}
}
control2();
_294 = mPosition;
}