Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Trick Room, Stall, Lagging Tail

Browse Source
This commit is contained in:
DizzyEggg 2018-07-22 19:02:41 +02:00
parent fee81d03ab
commit c2f8d176dc
1 changed files with 50 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
src/battle_main.c
View File

@ -4679,16 +4679,20 @@ u8 GetWhoStrikesFirst(u8 battler1, u8 battler2, bool8 ignoreChosenMoves)
u8 strikesFirst = 0; u8 strikesFirst = 0;
u32 speedBattler1 = 0, speedBattler2 = 0; u32 speedBattler1 = 0, speedBattler2 = 0;
u16 moveBattler1 = 0, moveBattler2 = 0; u16 moveBattler1 = 0, moveBattler2 = 0;
u32 holdEffectBattler1 = 0, holdEffectBattler2 = 0;
bool32 quickClawBattler1 = FALSE, quickClawBattler2 = FALSE;
speedBattler1 = GetBattlerTotalSpeedStat(battler1); speedBattler1 = GetBattlerTotalSpeedStat(battler1);
if (GetBattlerHoldEffect(battler1, TRUE) == HOLD_EFFECT_QUICK_CLAW holdEffectBattler1 = GetBattlerHoldEffect(battler1, TRUE);
if (holdEffectBattler1 == HOLD_EFFECT_QUICK_CLAW
&& gRandomTurnNumber < (0xFFFF * GetBattlerHoldEffectParam(battler1)) / 100) && gRandomTurnNumber < (0xFFFF * GetBattlerHoldEffectParam(battler1)) / 100)
speedBattler1 = UINT_MAX; quickClawBattler1 = TRUE;
speedBattler2 = GetBattlerTotalSpeedStat(battler2); speedBattler2 = GetBattlerTotalSpeedStat(battler2);
if (GetBattlerHoldEffect(battler2, TRUE) == HOLD_EFFECT_QUICK_CLAW holdEffectBattler2 = GetBattlerHoldEffect(battler2, TRUE);
if (holdEffectBattler2 == HOLD_EFFECT_QUICK_CLAW
&& gRandomTurnNumber < (0xFFFF * GetBattlerHoldEffectParam(battler2)) / 100) && gRandomTurnNumber < (0xFFFF * GetBattlerHoldEffectParam(battler2)) / 100)
speedBattler2 = UINT_MAX; quickClawBattler2 = TRUE;
if (ignoreChosenMoves) if (ignoreChosenMoves)
{ {
@ -4718,35 +4722,59 @@ u8 GetWhoStrikesFirst(u8 battler1, u8 battler2, bool8 ignoreChosenMoves)
moveBattler2 = MOVE_NONE; moveBattler2 = MOVE_NONE;
} }
// both move priorities are different than 0
if (gBattleMoves[moveBattler1].priority != 0 || gBattleMoves[moveBattler2].priority != 0) if (gBattleMoves[moveBattler1].priority == gBattleMoves[moveBattler2].priority)
{ {
// both priorities are the same // QUICK CLAW - always first
if (gBattleMoves[moveBattler1].priority == gBattleMoves[moveBattler2].priority) // LAGGING TAIL - always last
// STALL - always last
if (quickClawBattler1 && !quickClawBattler2)
strikesFirst = 0;
else if (quickClawBattler2 && !quickClawBattler1)
strikesFirst = 1;
else if (holdEffectBattler1 == HOLD_EFFECT_LAGGING_TAIL && holdEffectBattler2 != HOLD_EFFECT_LAGGING_TAIL)
strikesFirst = 1;
else if (holdEffectBattler2 == HOLD_EFFECT_LAGGING_TAIL && holdEffectBattler1 != HOLD_EFFECT_LAGGING_TAIL)
strikesFirst = 0;
else if (GetBattlerAbility(battler1) == ABILITY_STALL && GetBattlerAbility(battler2) != ABILITY_STALL)
strikesFirst = 1;
else if (GetBattlerAbility(battler2) == ABILITY_STALL && GetBattlerAbility(battler1) != ABILITY_STALL)
strikesFirst = 0;
else
{ {
if (speedBattler1 == speedBattler2 && Random() & 1) if (speedBattler1 == speedBattler2 && Random() & 1)
{
strikesFirst = 2; // same speeds, same priorities strikesFirst = 2; // same speeds, same priorities
}
else if (speedBattler1 < speedBattler2) else if (speedBattler1 < speedBattler2)
strikesFirst = 1; // battler2 has more speed {
// battler2 has more speed
// else battler1 has more speed if (gFieldStatuses & STATUS_FIELD_TRICK_ROOM)
strikesFirst = 0;
else
strikesFirst = 1;
}
else
{
// battler1 has more speed
if (gFieldStatuses & STATUS_FIELD_TRICK_ROOM)
strikesFirst = 1;
else
strikesFirst = 0;
}
} }
else if (gBattleMoves[moveBattler1].priority < gBattleMoves[moveBattler2].priority)
strikesFirst = 1; // battler2's move has greater priority
// else battler1's move has greater priority
} }
// both priorities are equal to 0 else if (gBattleMoves[moveBattler1].priority < gBattleMoves[moveBattler2].priority)
{
strikesFirst = 1; // battler2's move has greater priority
}
else else
{ {
if (speedBattler1 == speedBattler2 && Random() & 1) strikesFirst = 0; // battler1's move has greater priority
strikesFirst = 2; // same speeds, same priorities
else if (speedBattler1 < speedBattler2)
strikesFirst = 1; // battler2 has more speed
// else battler1 has more speed
} }
return strikesFirst; return strikesFirst;
} }