diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-02-16 11:28:03 -0500 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-02-16 11:28:03 -0500 |
| commit | fd0fc184d6d06e01e017ba88b06d3c1709e626de (patch) | |
| tree | 56e7852cb2d20931985caf1e25003fdc43391025 /src/battle_main.c | |
| parent | 91844cdfb2e0c3c1fd00fae45d1cec2be763c522 (diff) | |
| parent | 4e07002d13c97f90cb8885298c0db2c331dc2b07 (diff) | |
Merge branch 'master' of https://github.com/pret/pokefirered into doc-pokemonleague
Diffstat (limited to 'src/battle_main.c')
| -rw-r--r-- | src/battle_main.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/battle_main.c b/src/battle_main.c index fd8aeffbc..faad8bafb 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -50,6 +50,7 @@ #include "cable_club.h" #include "constants/abilities.h" #include "constants/battle_move_effects.h" +#include "constants/battle_setup.h" #include "constants/hold_effects.h" #include "constants/items.h" #include "constants/moves.h" @@ -1151,9 +1152,9 @@ static void CB2_PreInitMultiBattle(void) { ++gBattleCommunication[MULTIUSE_STATE]; if (gWirelessCommType) - sub_800AB9C(); + PrepareSendLinkCmd2FFE_or_RfuCmd6600(); else - sub_800AAC0(); + Link_TryStartSend5FFF(); } break; case 3: @@ -3716,12 +3717,12 @@ static void HandleEndTurn_BattleLost(void) } else { - if (gBattleTypeFlags & BATTLE_TYPE_TRAINER && ScrSpecial_GetTrainerBattleMode() == 9) + if (gBattleTypeFlags & BATTLE_TYPE_TRAINER && ScrSpecial_GetTrainerBattleMode() == TRAINER_BATTLE_EARLY_RIVAL) { - if (sub_80803D8() & 1) - gBattleCommunication[MULTISTRING_CHOOSER] = 1; + if (GetRivalBattleFlags() & RIVAL_BATTLE_HEAL_AFTER) + gBattleCommunication[MULTISTRING_CHOOSER] = 1; // Dont do white out text else - gBattleCommunication[MULTISTRING_CHOOSER] = 2; + gBattleCommunication[MULTISTRING_CHOOSER] = 2; // Do white out text gBattlerAttacker = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT); } else @@ -4163,7 +4164,6 @@ bool8 TryRunFromBattle(u8 battler) { bool8 effect = FALSE; u8 holdEffect; - u8 pyramidMultiplier; u8 speedVar; if (gBattleMons[battler].item == ITEM_ENIGMA_BERRY) |