diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/battle/battle_2.c | 2 | ||||
| -rw-r--r-- | src/battle/battle_message.c | 2 | ||||
| -rw-r--r-- | src/battle/calculate_base_damage.c | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/battle/battle_2.c b/src/battle/battle_2.c index b372413de..411a1ae46 100644 --- a/src/battle/battle_2.c +++ b/src/battle/battle_2.c @@ -543,7 +543,7 @@ void sub_800EC9C(void) SetMainCallback2(BattleMainCB2); if (gBattleTypeFlags & BATTLE_TYPE_LINK) { - gTrainerBattleOpponent = 0x800; + gTrainerBattleOpponent = LINK_BATTLE_OPPONENT; gBattleTypeFlags |= BATTLE_TYPE_20; } } diff --git a/src/battle/battle_message.c b/src/battle/battle_message.c index dcca5f006..30d127be3 100644 --- a/src/battle/battle_message.c +++ b/src/battle/battle_message.c @@ -318,7 +318,7 @@ void BufferStringBattle(u16 stringID) } else { - if (gTrainerBattleOpponent == 0x800) + if (gTrainerBattleOpponent == LINK_BATTLE_OPPONENT) { if (gBattleTypeFlags & BATTLE_TYPE_MULTI) stringPtr = BattleText_WithdrewPoke3; diff --git a/src/battle/calculate_base_damage.c b/src/battle/calculate_base_damage.c index 0022cf9fe..cc9d567bb 100644 --- a/src/battle/calculate_base_damage.c +++ b/src/battle/calculate_base_damage.c @@ -135,7 +135,7 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_EREADER_TRAINER))) { if ((gBattleTypeFlags & BATTLE_TYPE_TRAINER) - && gTrainerBattleOpponent != 1024 + && gTrainerBattleOpponent != SECRET_BASE_OPPONENT && FlagGet(FLAG_BADGE01_GET) && !GetBattlerSide(bankAtk)) attack = (110 * attack) / 100; @@ -143,7 +143,7 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_EREADER_TRAINER))) { if ((gBattleTypeFlags & BATTLE_TYPE_TRAINER) - && gTrainerBattleOpponent != 1024 + && gTrainerBattleOpponent != SECRET_BASE_OPPONENT && FlagGet(FLAG_BADGE05_GET) && !GetBattlerSide(bankDef)) defense = (110 * defense) / 100; @@ -151,7 +151,7 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_EREADER_TRAINER))) { if ((gBattleTypeFlags & BATTLE_TYPE_TRAINER) - && gTrainerBattleOpponent != 1024 + && gTrainerBattleOpponent != SECRET_BASE_OPPONENT && FlagGet(FLAG_BADGE07_GET) && !GetBattlerSide(bankAtk)) spAttack = (110 * spAttack) / 100; @@ -159,7 +159,7 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_EREADER_TRAINER))) { if ((gBattleTypeFlags & BATTLE_TYPE_TRAINER) - && gTrainerBattleOpponent != 1024 + && gTrainerBattleOpponent != SECRET_BASE_OPPONENT && FlagGet(FLAG_BADGE07_GET) && !GetBattlerSide(bankDef)) spDefense = (110 * spDefense) / 100; |