matched AbilityBattleEffects
This commit is contained in:
@@ -479,7 +479,7 @@ void sub_80C71A8(u8 a)
|
||||
BATTLE_HISTORY->usedMoves[a / 2][i] = 0;
|
||||
}
|
||||
|
||||
void sub_80C71D0(u8 a, u8 b)
|
||||
void RecordAbilityBattle(u8 a, u8 b)
|
||||
{
|
||||
if (GetBattlerSide(a) == 0)
|
||||
BATTLE_HISTORY->abilities[GetBattlerPosition(a) & 1] = b;
|
||||
|
||||
+1204
-26
File diff suppressed because it is too large
Load Diff
+1
-1
@@ -2567,7 +2567,7 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de
|
||||
}
|
||||
|
||||
// flash fire triggered
|
||||
if ((gBattleResources->flags->flags[battlerIdAtk] & UNKNOWN_FLAG_FLASH_FIRE) && type == TYPE_FIRE)
|
||||
if ((gBattleResources->flags->flags[battlerIdAtk] & RESOURCE_FLAG_FLASH_FIRE) && type == TYPE_FIRE)
|
||||
damage = (15 * damage) / 10;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user