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

Review changes

Browse Source
This commit is contained in:
Eduardo Quezada
2022-07-29 10:21:20 -04:00
parent 7b3401ee27
commit fa32f337be
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/battle_script_commands.c
+3 -3
View File
@@ -3323,7 +3323,7 @@ static void Cmd_getexp(void)
{ {
// music change in wild battle after fainting a poke // music change in wild battle after fainting a poke
if (!(gBattleTypeFlags & BATTLE_TYPE_TRAINER) if (!(gBattleTypeFlags & BATTLE_TYPE_TRAINER)
&& gBattleMons[0].hp && gBattleMons[0].hp != 0
&& !gBattleStruct->wildVictorySong) && !gBattleStruct->wildVictorySong)
{ {
BattleStopLowHpSound(); BattleStopLowHpSound();
@@ -4246,7 +4246,7 @@ static void Cmd_moveend(void)
effect = TRUE; effect = TRUE;
gBattleScripting.moveendState++; gBattleScripting.moveendState++;
break; 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)) if (AbilityBattleEffects(ABILITYEFFECT_ON_DAMAGE, gBattlerTarget, 0, 0, 0))
effect = TRUE; effect = TRUE;
gBattleScripting.moveendState++; gBattleScripting.moveendState++;
@@ -6237,7 +6237,7 @@ static void Cmd_hpthresholds(void)
if (result == 0) if (result == 0)
result = 1; result = 1;
if (result > 69 || !gBattleMons[opposingBattler].hp) if (result > 69 || !gBattleMons[opposingBattler].hp == 0)
gBattleStruct->hpScale = 0; gBattleStruct->hpScale = 0;
else if (result > 39) else if (result > 39)
gBattleStruct->hpScale = 1; gBattleStruct->hpScale = 1;