diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2017-10-19 12:40:56 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-19 12:40:56 -0500 |
| commit | 8ceecd9fba385442f55bff2d19977e3c2fd6e5e8 (patch) | |
| tree | 5fecc007490abd7ec3b12ee75249229c2bb760bf /src/battle_2.c | |
| parent | 0f0ba1e28c5c14bb93d403fd2df4a2d89e057a65 (diff) | |
| parent | 455202eca00fd1b51e9ba8b75434d97ae5c750a8 (diff) | |
Merge pull request #81 from DizzyEggg/decompile_rom3
Decompile rom_3
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; } |