diff options
| author | Garak <thomastaps194@comcast.net> | 2018-06-26 00:01:17 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-26 00:01:17 -0400 |
| commit | 1cada74444df875649b239ed488c6ee4deb8a7f1 (patch) | |
| tree | 0cd68b160fa8d4a27cd65d6ffa80159b231f715c /src/battle/battle_controller_linkpartner.c | |
| parent | b3dec86071ae7d2eb5c1258ea778f0e823a5f636 (diff) | |
| parent | fa0e1ca4de35c9723a0972efeb6f7de4dca25594 (diff) | |
Merge pull request #3 from pret/master
upstream merge
Diffstat (limited to 'src/battle/battle_controller_linkpartner.c')
| -rw-r--r-- | src/battle/battle_controller_linkpartner.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/battle/battle_controller_linkpartner.c b/src/battle/battle_controller_linkpartner.c index 12eb62a2b..16aef5791 100644 --- a/src/battle/battle_controller_linkpartner.c +++ b/src/battle/battle_controller_linkpartner.c @@ -48,8 +48,6 @@ extern u8 gAnimFriendship; extern u16 gWeatherMoveAnim; extern u8 gAnimMoveTurn; extern struct Window gUnknown_03004210; -extern u16 gBattle_BG0_Y; -extern u16 gBattle_BG0_X; extern MainCallback gPreBattleCallback1; extern void (*gBattleBankFunc[])(void); extern u8 gHealthboxIDs[]; @@ -1091,7 +1089,7 @@ void LinkPartnerHandlecmd3(void) u8 *dst; u8 i; - MEMSET_ALT(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]] + gBattleBufferA[gActiveBattler][1], + MEMSET_ALT(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]] + gBattleBufferA[gActiveBattler][1], gBattleBufferA[gActiveBattler][3 + i], gBattleBufferA[gActiveBattler][2], i, dst); LinkPartnerBufferExecCompleted(); |