ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-18 17:34:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed chances of confusion self-damage. (#371)

Browse Source
This commit is contained in:
Eduardo Alvaro Quezada D'Ottone 2020-05-18 08:51:30 -04:00 committed by GitHub
parent f82bd2f9c4
commit 4c5de0998a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/battle_util.c
View File

@ -2311,12 +2311,7 @@ u8 AtkCanceller_UnableToUseMove(void)
gBattleMons[gBattlerAttacker].status2--; gBattleMons[gBattlerAttacker].status2--;
if (gBattleMons[gBattlerAttacker].status2 & STATUS2_CONFUSION) if (gBattleMons[gBattlerAttacker].status2 & STATUS2_CONFUSION)
{ {
if (Random() % ((B_CONFUSION_SELF_DMG_CHANCE >= GEN_7) ? 3 : 2 == 0)) if (Random() % ((B_CONFUSION_SELF_DMG_CHANCE >= GEN_7) ? 3 : 2 == 0)) // confusion dmg
{
gBattleCommunication[MULTISTRING_CHOOSER] = 0;
BattleScriptPushCursor();
}
else // confusion dmg
{ {
gBattleCommunication[MULTISTRING_CHOOSER] = 1; gBattleCommunication[MULTISTRING_CHOOSER] = 1;
gBattlerTarget = gBattlerAttacker; gBattlerTarget = gBattlerAttacker;
@ -2324,6 +2319,11 @@ u8 AtkCanceller_UnableToUseMove(void)
gProtectStructs[gBattlerAttacker].confusionSelfDmg = 1; gProtectStructs[gBattlerAttacker].confusionSelfDmg = 1;
gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE; gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE;
} }
else
{
gBattleCommunication[MULTISTRING_CHOOSER] = 0;
BattleScriptPushCursor();
}
gBattlescriptCurrInstr = BattleScript_MoveUsedIsConfused; gBattlescriptCurrInstr = BattleScript_MoveUsedIsConfused;
} }
else // snapped out of confusion else // snapped out of confusion