diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2019-10-26 10:23:13 -0400 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2019-10-26 10:23:13 -0400 |
| commit | 93f0703fcdda810062071fde4febe111146c18cc (patch) | |
| tree | 241164c7e5fd5e71a9e3eca6eb8d6a918566d963 /src/battle_controller_player.c | |
| parent | fd78afa5a7d4441fe0d76693e301deb6bc2557dc (diff) | |
| parent | 1f569f0136952135a0e17fe22cf180c0e87dd007 (diff) | |
Merge branch 'master' of github.com:pret/pokefirered into script_menu
Diffstat (limited to 'src/battle_controller_player.c')
| -rw-r--r-- | src/battle_controller_player.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index a9bb5bc6e..f8d5958ba 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -839,7 +839,7 @@ void sub_802F6A8(void) else { m4aSongNumStop(SE_HINSI); - gMain.inBattle = 0; + gMain.inBattle = FALSE; gMain.callback1 = gPreBattleCallback1; SetMainCallback2(gMain.savedCallback); } @@ -1318,7 +1318,6 @@ static void WaitForMonSelection(void) BtlController_EmitChosenMonReturnValue(1, gUnknown_203B0C1, gUnknown_203B0DC); else BtlController_EmitChosenMonReturnValue(1, 6, NULL); - if ((gBattleBufferA[gActiveBattler][1] & 0xF) == 1) PrintLinkStandbyMsg(); PlayerBufferExecCompleted(); |