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::changeGameOverAnimation except for strings

Browse Source
This commit is contained in:
Headpenguin 2023-06-29 08:48:59 -04:00
parent 640506ae71
commit fb2f6822fd
4 changed files with 84 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
csv/Player.csv
View File

@ -183,7 +183,7 @@ isAnimationRun__10MarioActorCFPCc,MarioActor.o,Player.a,true
changeNullAnimation__10MarioActorFPCcSc,MarioActor.o,Player.a,true
clearNullAnimation__10MarioActorFSc,MarioActor.o,Player.a,false
isStopNullAnimation__10MarioActorCFv,MarioActor.o,Player.a,true
changeGameOverAnimation__10MarioActorFv,MarioActor.o,Player.a,false
changeGameOverAnimation__10MarioActorFv,MarioActor.o,Player.a,true
getJointCtrl__10MarioActorCFPCc,MarioActor.o,Player.a,false
updateRotationInfo__10MarioActorFv,MarioActor.o,Player.a,false
exeWait__10MarioActorFv,MarioActor.o,Player.a,false

1 Symbol Name Object File Library Archive Matching
183 changeNullAnimation__10MarioActorFPCcSc MarioActor.o Player.a true
184 clearNullAnimation__10MarioActorFSc MarioActor.o Player.a false
185 isStopNullAnimation__10MarioActorCFv MarioActor.o Player.a true
186 changeGameOverAnimation__10MarioActorFv MarioActor.o Player.a false true
187 getJointCtrl__10MarioActorCFPCc MarioActor.o Player.a false
188 updateRotationInfo__10MarioActorFv MarioActor.o Player.a false
189 exeWait__10MarioActorFv MarioActor.o Player.a false

5
include/Game/Enemy/KariKariDirector.h Normal file
View File

@ -0,0 +1,5 @@
#pragma once
namespace MR {
unsigned long getKariKariClingNum();
}

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

@ -43,6 +43,8 @@ class MarioTalk;
class MarioMove;
class Triangle;
class FloorCode;
struct SoundList;
class MarioState;
class Mario : public MarioModule {
public:
@ -71,6 +73,9 @@ public:
void initSound();
void initTask();
bool isIgnoreTriangle(const Triangle *);
bool isStatusActive(unsigned long) const;
bool isSwimming() const;
void closeStatus(MarioState *);
u32 _8;
u32 _C;

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

@ -8,6 +8,7 @@
#include "JSystem/JAudio2/JAIAudible.h"
#include "JSystem/JMath/JMath.h"
#include "Game/Player/MarioNullBck.h"
#include "Game/Enemy/KariKariDirector.h"
static bool isLuigi;
@ -132,3 +133,75 @@ bool MarioActor::isStopNullAnimation() const {
}
return true;
}
void MarioActor::changeGameOverAnimation() {
int r30 = 0;
if(_230 -> isStatusActive(0x12)) _230 -> closeStatus(NULL);
if(_230 -> isAnimationRun("0x001")) r30 = 0;
if(_230 -> isAnimationRun("0x002")) r30 = 0;
if(_230 -> isAnimationRun("0x003")) r30 = 0;
if(_230 -> isAnimationRun("0x004")) r30 = 0;
if(_230 -> isAnimationRun("0x005")) r30 = 1;
if(_230 -> isAnimationRun("0x006")) r30 = 1;
if(_230 -> isAnimationRun("0x007")) r30 = 2;
if(_230 -> isAnimationRun("0x008")) r30 = 2;
if(_230 -> isAnimationRun("0x009")) r30 = 3;
if(_230 -> isAnimationRun("0x00a")) r30 = 3;
if(_230 -> isAnimationRun("0x00b")) r30 = 3;
if(_230 -> isAnimationRun("0x00c")) r30 = 4;
if(_230 -> isAnimationRun("0x00d")) r30 = 4;
if(_230 -> isAnimationRun("0x00e")) r30 = 4;
if(_230 -> isAnimationRun("0x00f")) r30 = 5;
if(_230 -> isAnimationRun("0x010")) r30 = 5;
if(_230 -> isAnimationRun("0x011")) r30 = 6;
if(_230 -> isAnimationRun("0x012")) r30 = 6;
if(!_230 -> isAnimationRun("0x013") && !_230 -> isStatusActive(0xd));
else r30 = -1;
if(_230 -> isSwimming()) r30 = 7;
if(isNerve(&NrvMarioActor::MarioActorNrvGameOverSink::sInstance)) r30 = 8;
if(MR::getKariKariClingNum() && _230 -> _8 >> 0x1e & 1) r30 = 4;
if(_39d == 2) r30 = 9;
if(_39d == 1) r30 = 10;
switch(r30) {
case 0:
_230 -> changeAnimationNonStop("0x015");
break;
case 1:
_230 -> changeAnimationNonStop("0x016");
break;
case 2:
_230 -> changeAnimationNonStop("0x017");
break;
case 3:
_230 -> changeAnimationNonStop("0x018");
break;
case 4:
_230 -> changeAnimationNonStop("0x019");
break;
case 5:
if(_230 -> _8 >> 0x1e & 1) _230 -> changeAnimationNonStop("0x01a");
else _230 -> changeAnimationNonStop("0x01b");
break;
case 6:
_230 -> changeAnimationNonStop("0x01c");
break;
case 7:
_230 -> changeAnimationNonStop("0x01d");
break;
case 8:
_230 -> changeAnimationNonStop("0x01e");
break;
case 9:
_230 -> changeAnimationNonStop("0x01f");
break;
case 10:
_230 -> changeAnimationNonStop("0x020");
break;
}
_b90 = 1;
stopEffect("0x021");
_a6e = 0;
}