ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-17 03:57:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Another condition fix

Browse Source 
I accidentally broke Gulp Missile's interaction with the user's Dive, lol.
This commit is contained in:
LOuroboros 2021-09-27 19:53:42 -03:00
parent a49ea33dd0
commit ceffaa4e76
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/battle_util.c
View File

@ -5063,9 +5063,8 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u16 ability, u8 special, u16 move
break; break;
case ABILITY_GULP_MISSILE: case ABILITY_GULP_MISSILE:
if ((effect = ShouldChangeFormHpBased(gBattlerAttacker)) if ((effect = ShouldChangeFormHpBased(gBattlerAttacker))
&& (gCurrentMove == MOVE_SURF || gStatuses3[gBattlerAttacker] & STATUS3_UNDERWATER) && ((gCurrentMove == MOVE_SURF && TARGET_TURN_DAMAGED) || gStatuses3[gBattlerAttacker] & STATUS3_UNDERWATER)
&& TARGET_TURN_DAMAGED && IsBattlerAlive(gBattlerTarget))
&& IsBattlerAlive(gBattlerAttacker))
{ {
BattleScriptPushCursor(); BattleScriptPushCursor();
gBattlescriptCurrInstr = BattleScript_AttackerFormChange; gBattlescriptCurrInstr = BattleScript_AttackerFormChange;