dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #465 from SatoMew/master

Browse Source 
Add fix to disallow negative current HP values
This commit is contained in:
GriffinR
2021-09-14 13:27:28 -04:00
committed by GitHub
parent 6de0d61daf e13a99717b
commit b0698e27f9
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pokemon.c
+7 -1
View File
@@ -2112,8 +2112,14 @@ void CalculateMonStats(struct Pokemon *mon)
{ {
if (currentHP == 0 && oldMaxHP == 0) if (currentHP == 0 && oldMaxHP == 0)
currentHP = newMaxHP; currentHP = newMaxHP;
else if (currentHP != 0) else if (currentHP != 0) {
// BUG: currentHP is unintentionally able to become <= 0 after the instruction below.
currentHP += newMaxHP - oldMaxHP; currentHP += newMaxHP - oldMaxHP;
#ifdef BUGFIX
if (currentHP <= 0)
currentHP = 1;
#endif
}
else else
return; return;
} }