diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-02-16 13:57:05 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-16 13:57:05 -0500 |
| commit | c1d17b2df183689c0befd3c7bc08810308f2bcd2 (patch) | |
| tree | d2e6483613f61af4142e6c313ac1007552a52941 /src/battle_main.c | |
| parent | 1cfeae9ffa11bb86a214721bb264f26ca8cb7d5a (diff) | |
| parent | 13357596b7ed70246a00d438ee37dc1c84b78415 (diff) | |
Merge branch 'master' into doc-routes2
Diffstat (limited to 'src/battle_main.c')
| -rw-r--r-- | src/battle_main.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/battle_main.c b/src/battle_main.c index 76f373f8f..faad8bafb 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -1152,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: @@ -4164,7 +4164,6 @@ bool8 TryRunFromBattle(u8 battler) { bool8 effect = FALSE; u8 holdEffect; - u8 pyramidMultiplier; u8 speedVar; if (gBattleMons[battler].item == ITEM_ENIGMA_BERRY) |