thru OakOldManHandleSwitchInAnim

src/battle_controller_opponent.c

@@ -45,7 +45,7 @@ static void OpponentHandleTrainerSlideBack(void);
 static void OpponentHandleFaintAnimation(void);
 static void OpponentHandlePaletteFade(void);
 static void OpponentHandleSuccessBallThrowAnim(void);
-static void OpponentHandleBallThrow(void);
+static void OpponentHandleBallThrowAnim(void);
 static void OpponentHandlePause(void);
 static void OpponentHandleMoveAnimation(void);
 static void OpponentHandlePrintString(void);
@@ -116,7 +116,7 @@ static void (*const sOpponentBufferCommands[CONTROLLER_CMDS_COUNT])(void) =
     OpponentHandleFaintAnimation,
     OpponentHandlePaletteFade,
     OpponentHandleSuccessBallThrowAnim,
-    OpponentHandleBallThrow,
+    OpponentHandleBallThrowAnim,
     OpponentHandlePause,
     OpponentHandleMoveAnimation,
     OpponentHandlePrintString,
@@ -1231,7 +1231,7 @@ static void OpponentHandleSuccessBallThrowAnim(void)
     OpponentBufferExecCompleted();
 }
 
-static void OpponentHandleBallThrow(void)
+static void OpponentHandleBallThrowAnim(void)
 {
     OpponentBufferExecCompleted();
 }

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();