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

Browse Source
This commit is contained in:
Headpenguin 2023-07-09 08:51:20 -04:00
parent 47b04d177b
commit bece5c6409
5 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
csv/Player.csv
View File

@ -207,7 +207,7 @@ decLifeMiddle__10MarioActorFv,MarioActor.o,Player.a,true
decLifeSmall__10MarioActorFv,MarioActor.o,Player.a,true
resetWaterLife__10MarioActorFv,MarioActor.o,Player.a,true
updateLife__10MarioActorFv,MarioActor.o,Player.a,true
incLife__10MarioActorFUl,MarioActor.o,Player.a,false
incLife__10MarioActorFUl,MarioActor.o,Player.a,true
changeMaxLife__10MarioActorFl,MarioActor.o,Player.a,false
doPressing__10MarioActorFv,MarioActor.o,Player.a,false
careMovingObject__10MarioActorFv,MarioActor.o,Player.a,false

1 Symbol Name Object File Library Archive Matching
207 decLifeSmall__10MarioActorFv MarioActor.o Player.a true
208 resetWaterLife__10MarioActorFv MarioActor.o Player.a true
209 updateLife__10MarioActorFv MarioActor.o Player.a true
210 incLife__10MarioActorFUl MarioActor.o Player.a false true
211 changeMaxLife__10MarioActorFl MarioActor.o Player.a false
212 doPressing__10MarioActorFv MarioActor.o Player.a false
213 careMovingObject__10MarioActorFv MarioActor.o Player.a false

2
include/Game/Animation/XanimePlayer.h
View File

@ -21,6 +21,8 @@ public:
void changeAnimationBck(const char *);
void changeInterpoleFrame(s32);
void changeTrackAnimation(unsigned char, const char *);
const char* getCurrentAnimationName() const;

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

@ -94,6 +94,7 @@ public:
unsigned long getCurrentStatus() const;
bool trySpinJump(unsigned char);
void startTeresaDisappear();
void startBas(const char *, bool, f32, f32);
inline bool getPunchFlag1() const { // poor name
return _8_8;
@ -635,11 +636,8 @@ public:
u16 _964[3];
u16 _96A;
// FAKE
u32 _96C;
u32 _970;
// NOT FAKE
HashSortTable* _96C; //Sounds
const char* _970; // Sounds or somthing
u32 _974;
//Fake

1
include/Game/Player/MarioAnimator.h
View File

@ -22,6 +22,7 @@ public:
virtual void draw3D() const;
void setHoming();
bool isAnimationStop();
XanimeResourceTable* _8;
XanimePlayer* _c;

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

@ -580,10 +580,6 @@ bool MarioActor::isInPunchTimerRange() const {
return ret;
}
inline const Mario::Nonsense& bs(const MarioActor &actor) {
return actor._230 -> bitfieldStruct;
}
void MarioActor::updatePunching() {
if(_944) {
bool r6 = true;
@ -866,3 +862,19 @@ void MarioActor::updateLife() {
if(!_380) return;
_380--;
}
void MarioActor::incLife(unsigned long amt) {
if(isEnableNerveChange() && !_3e4) {
const u32 tmp = getHealth();
if(_380 != _3e0) _230 -> playSound("ライフ回復", -1);
_380 += amt;
if(_380 >= _3e0) _380 = _3e0;
if(tmp == 1 && _234 -> isAnimationStop()) {
_234 -> _c -> changeTrackAnimation(3, "ノーマルウエイト");
if(_230 -> _970 && strcmp(_230 -> _970, "DamageWait")) {
_230 -> startBas(NULL, false, 0f, 0f);
setBlink(NULL);
}
}
}
}