ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-02-21 11:43:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix Simple Beam

Browse Source 
- No longer freezes the game
- Now fails if the target already has simple
- Explicitly checks and changes the target's ability instead of gActiveBattler's ability
This commit is contained in:
BuffelSaft 2021-10-06 15:30:52 +13:00
parent 2119c33989
commit a6198e5d46
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/battle_script_commands.c
View File

@ -7910,15 +7910,15 @@ static void Cmd_various(void)
gBattlescriptCurrInstr += 7; gBattlescriptCurrInstr += 7;
return; return;
case VARIOUS_SET_SIMPLE_BEAM: case VARIOUS_SET_SIMPLE_BEAM:
if (IsEntrainmentTargetOrSimpleBeamBannedAbility(gBattleMons[gActiveBattler].ability)) if (IsEntrainmentTargetOrSimpleBeamBannedAbility(gBattleMons[gBattlerTarget].ability)
|| gBattleMons[gBattlerTarget].ability == ABILITY_SIMPLE)
{ {
gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 3); gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 3);
} }
else else
{ {
gBattleMons[gActiveBattler].ability = ABILITY_SIMPLE; gBattleMons[gBattlerTarget].ability = ABILITY_SIMPLE;
gBattlescriptCurrInstr += 7; gBattlescriptCurrInstr += 7;
break;
} }
return; return;
case VARIOUS_TRY_ENTRAINMENT: case VARIOUS_TRY_ENTRAINMENT: