dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1296 from GriffinRichards/bugfix-typo

Browse Source 
Add missing braces to bugfix in CalculateMonStats
This commit is contained in:
GriffinR
2021-01-10 12:34:39 -05:00
committed by GitHub
parent 42a0b20e57 8afc28c98f
commit e6aebc16da
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/pokemon.c
View File

@@ -2859,13 +2859,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. This causes the pomeg berry glitch. // BUG: currentHP is unintentionally able to become <= 0 after the instruction below. This causes the pomeg berry glitch.
currentHP += newMaxHP - oldMaxHP; currentHP += newMaxHP - oldMaxHP;
#ifdef BUGFIX #ifdef BUGFIX
if (currentHP <= 0) if (currentHP <= 0)
currentHP = 1; currentHP = 1;
#endif #endif
}
else else
return; return;
} }