izzy/Ghostship
0
0
Fork 0
mirror of https://github.com/izzy2lost/Ghostship.git synced 2026-06-19 01:17:03 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed mario not decrementing health when underwater

Browse Source
This commit is contained in:
KiritoDv
2026-01-08 21:41:28 -06:00
parent b4be421a76
commit 3cfa6195d9
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/mario.c
+4 -4
View File
@@ -1467,8 +1467,8 @@ void update_mario_health(struct MarioState *m) {
CALL_CANCELLABLE_EVENT(PlayerHealthChange, m, amount) {
m->health += amount;
}
} else if (!gDebugLevelSelect) {
s32 amount = (terrainIsSnow ? 3 : 1);
} else /* if (!gDebugLevelSelect) */ {
s32 amount = -(terrainIsSnow ? 3 : 1);
CALL_CANCELLABLE_EVENT(PlayerHealthChange, m, amount) {
m->health += amount;
}
@@ -1481,15 +1481,15 @@ void update_mario_health(struct MarioState *m) {
s32 amount = 0x40;
CALL_CANCELLABLE_EVENT(PlayerHealthChange, m, amount) {
m->health += amount;
m->healCounter--;
}
m->healCounter--;
}
if (m->hurtCounter > 0) {
s32 amount = -0x40;
CALL_CANCELLABLE_EVENT(PlayerHealthChange, m, amount) {
m->health += amount;
m->hurtCounter--;
}
m->hurtCounter--;
}
if (m->health > 0x880) {