From 53fc50229f293aaaf6ed316ec7648fdc97407271 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Fri, 29 Jul 2022 10:21:59 -0400 Subject: [PATCH] Review changes from pokeemerald #1719 --- src/battle_script_commands.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 3b45edde4..8f9c081f2 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -3213,7 +3213,7 @@ static void Cmd_getexp(void) { // music change in wild battle after fainting a poke if (!(gBattleTypeFlags & (BATTLE_TYPE_TRAINER | BATTLE_TYPE_POKEDUDE)) - && gBattleMons[0].hp + && gBattleMons[0].hp != 0 && !gBattleStruct->wildVictorySong) { BattleStopLowHpSound(); @@ -4123,7 +4123,7 @@ static void Cmd_moveend(void) effect = TRUE; gBattleScripting.moveendState++; break; - case MOVEEND_ON_DAMAGE_ABILITIES: // Such as abilities activating on contact(Poison Spore, Rough Skin, etc.). + case MOVEEND_ON_DAMAGE_ABILITIES: // Such as abilities activating on contact (Effect Spore, Rough Skin, etc.). if (AbilityBattleEffects(ABILITYEFFECT_ON_DAMAGE, gBattlerTarget, 0, 0, 0)) effect = TRUE; gBattleScripting.moveendState++; @@ -6008,7 +6008,7 @@ static void Cmd_hpthresholds(void) if (result == 0) result = 1; - if (result > 69 || !gBattleMons[opposingBattler].hp) + if (result > 69 || !gBattleMons[opposingBattler].hp == 0) gBattleStruct->hpScale = 0; else if (result > 39) gBattleStruct->hpScale = 1;