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

Updated Dire Claw's effect again

Browse Source 
Thanks to MGriffin for providing a much nicer code for it.
This commit is contained in:
LOuroboros 2022-12-28 08:18:15 -03:00
parent 0159065dea
commit f5c165ff0c
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/battle_script_commands.c
View File

@ -3654,13 +3654,9 @@ void SetMoveEffect(bool32 primary, u32 certain)
}
else
{
DIRE_CLAW_STATUS_PICK:
gBattleScripting.moveEffect = Random() % 6;
if (gBattleScripting.moveEffect == 0
|| gBattleScripting.moveEffect == MOVE_EFFECT_BURN
|| gBattleScripting.moveEffect == MOVE_EFFECT_FREEZE)
goto DIRE_CLAW_STATUS_PICK;
SetMoveEffect(FALSE, 0);
static const u8 sDireClawEffects[] = { MOVE_EFFECT_POISON, MOVE_EFFECT_PARALYSIS, MOVE_EFFECT_SLEEP };
gBattleScripting.moveEffect = sDireClawEffects[Random() % 3];
SetMoveEffect(TRUE, 0);
}
break;
}
@ -11942,8 +11938,8 @@ static void Cmd_trysetencore(void)
}
if (gLastMoves[gBattlerTarget] == MOVE_STRUGGLE
|| gLastMoves[gBattlerTarget] == MOVE_ENCORE
|| gLastMoves[gBattlerTarget] == MOVE_MIRROR_MOVE)
|| gLastMoves[gBattlerTarget] == MOVE_ENCORE
|| gLastMoves[gBattlerTarget] == MOVE_MIRROR_MOVE)
{
i = MAX_MON_MOVES;
}