Game-Decompilation/Petari
1
0
Fork 0
mirror of https://github.com/SMGCommunity/Petari.git synced 2025-02-20 14:10:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Match

Browse Source 
MarioActor::updateLife
        MarioActor::decLife
        MarioActor::decLifeLarge
        MarioActor::decLifeMiddle
        MarioActor::decLifeSmall
This commit is contained in:
Headpenguin 2023-07-07 17:15:11 -04:00
parent 84c6fdb6bc
commit 47b04d177b
2 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
csv/Player.csv
View File

@ -202,11 +202,11 @@ checkClapCatchStart__10MarioActorFv,MarioActor.o,Player.a,false
updateRealMtx__10MarioActorFv,MarioActor.o,Player.a,true
setUpperRotateY__10MarioActorFf,MarioActor.o,Player.a,false
decLife__10MarioActorFUs,MarioActor.o,Player.a,true
decLifeLarge__10MarioActorFv,MarioActor.o,Player.a,false
decLifeMiddle__10MarioActorFv,MarioActor.o,Player.a,false
decLifeSmall__10MarioActorFv,MarioActor.o,Player.a,false
resetWaterLife__10MarioActorFv,MarioActor.o,Player.a,false
updateLife__10MarioActorFv,MarioActor.o,Player.a,false
decLifeLarge__10MarioActorFv,MarioActor.o,Player.a,true
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
changeMaxLife__10MarioActorFl,MarioActor.o,Player.a,false
doPressing__10MarioActorFv,MarioActor.o,Player.a,false

1 Symbol Name Object File Library Archive Matching
202 updateRealMtx__10MarioActorFv MarioActor.o Player.a true
203 setUpperRotateY__10MarioActorFf MarioActor.o Player.a false
204 decLife__10MarioActorFUs MarioActor.o Player.a true
205 decLifeLarge__10MarioActorFv MarioActor.o Player.a false true
206 decLifeMiddle__10MarioActorFv MarioActor.o Player.a false true
207 decLifeSmall__10MarioActorFv MarioActor.o Player.a false true
208 resetWaterLife__10MarioActorFv MarioActor.o Player.a false true
209 updateLife__10MarioActorFv MarioActor.o Player.a false true
210 incLife__10MarioActorFUl MarioActor.o Player.a false
211 changeMaxLife__10MarioActorFl MarioActor.o Player.a false
212 doPressing__10MarioActorFv MarioActor.o Player.a false

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

@ -843,3 +843,26 @@ void MarioActor::decLife(unsigned short amt) {
if(_380 > 3) return;
_3e0 = 3;
}
void MarioActor::decLifeLarge() {
decLife(0);
}
void MarioActor::decLifeMiddle() {
decLife(0);
}
void MarioActor::decLifeSmall() {
decLife(0);
}
void MarioActor::resetWaterLife() {
_384 = 8;
}
void MarioActor::updateLife() {
if(!_388) return;
if(--_388 != 0) return;
if(!_380) return;
_380--;
}