diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2017-10-27 02:02:36 -0500 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2017-10-27 02:02:36 -0500 |
| commit | 49c88e63439a4ca08ca9fac7a85de51d4f56c8bd (patch) | |
| tree | 69504e13ad956a1596d7f5f188279f0c25ddad55 /src/battle_2.c | |
| parent | 431e737453feb99c18349060cad53d551ba41dcf (diff) | |
| parent | 5ea2f463d71d0bc2663e70a553557de0ccf40eef (diff) | |
Merge branch 'master' of github.com:pret/pokeemerald into dump_maps
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 cee845c75..6b7c4063e 100644 --- a/src/battle_2.c +++ b/src/battle_2.c @@ -205,9 +205,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 @@ -4075,7 +4072,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; } @@ -4103,7 +4100,7 @@ static void HandleTurnActionSelectionState(void) { RecordedBattle_ClearBankAction(GetBankByIdentity(GetBankIdentity(gActiveBank) ^ BIT_MON), 3); } - Emit_x32(0); + EmitCmd50(0); MarkBufferBankForExecution(gActiveBank); return; } |