matched AbilityBattleEffects

This commit is contained in:
jiangzhengwenjz
2019-08-01 12:25:38 +08:00
parent c88c9c6edf
commit 3eb1f1bc78
13 changed files with 1349 additions and 5083 deletions
+1 -1
View File
@@ -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
View File
File diff suppressed because it is too large Load Diff
+1 -1
View File
@@ -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;
}