From 3757c6b6343f979da62b37c1936885c280902eef Mon Sep 17 00:00:00 2001 From: cawtds <38510667+cawtds@users.noreply.github.com> Date: Tue, 7 Jan 2025 23:19:16 +0100 Subject: [PATCH] readd first battle condition --- src/battle_controller_player.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index e9c281ac9..30921fafd 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -1060,7 +1060,10 @@ void HandleMoveSwitching(u32 battler) } } - gBattlerControllerFuncs[battler] = HandleInputChooseMove; + if (gBattleTypeFlags & BATTLE_TYPE_FIRST_BATTLE) + gBattlerControllerFuncs[battler] = OakOldManHandleInputChooseMove; + else + gBattlerControllerFuncs[battler] = HandleInputChooseMove; gMoveSelectionCursor[battler] = gMultiUsePlayerCursor; MoveSelectionCreateCursorAt(gMoveSelectionCursor[battler], 0); MoveSelectionDisplayPpString(battler);