diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-20 10:49:21 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-20 10:49:21 +0200 |
| commit | b65da491a97e77ed2aa122ab7342c7fb94d35606 (patch) | |
| tree | 02e7c17f29426d6bca7bae4d133e1462dc81c355 /src/battle_2.c | |
| parent | 9ccc472b97b1a7f85703f813665cb4a30f7891b6 (diff) | |
| parent | ae5aa3c4dfd81fc25e5abeef1b915bb2da68b8d1 (diff) | |
merge with master, fix conflicts
Diffstat (limited to 'src/battle_2.c')
| -rw-r--r-- | src/battle_2.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/battle_2.c b/src/battle_2.c index aeba69213..16c07114a 100644 --- a/src/battle_2.c +++ b/src/battle_2.c @@ -204,9 +204,6 @@ extern const u8 BattleScript_ActionSwitch[]; extern const u8 BattleScript_PrintFailedToRunString[]; // functions -extern void HandleLinkBattleSetup(void); // rom_3 -extern void SetUpBattleVarsAndBirchZigzagoon(void); // rom_3 -extern void sub_8032768(void); // rom_3 extern void dp12_8087EA4(void); extern void sub_80356D0(void); extern void GetFrontierTrainerName(u8* dst, u16 trainerId); // battle tower @@ -4083,7 +4080,7 @@ static void HandleTurnActionSelectionState(void) if (gBattleMons[GetBankByIdentity(GetBankIdentity(gActiveBank) ^ BIT_MON)].status2 & STATUS2_MULTIPLETURNS || gBattleMons[GetBankByIdentity(GetBankIdentity(gActiveBank) ^ BIT_MON)].status2 & STATUS2_RECHARGE) { - Emit_x32(0); + EmitCmd50(0); MarkBufferBankForExecution(gActiveBank); return; } @@ -4111,7 +4108,7 @@ static void HandleTurnActionSelectionState(void) { RecordedBattle_ClearBankAction(GetBankByIdentity(GetBankIdentity(gActiveBank) ^ BIT_MON), 3); } - Emit_x32(0); + EmitCmd50(0); MarkBufferBankForExecution(gActiveBank); return; } |