Compare commits

...

2 Commits

Author SHA1 Message Date
Jess 92216ce4e8 Merge branch 'quickrun' into 'main'
Pressing B in wild encounters now moves the cursor to the "RUN" option.

See merge request tbld/game!11
2022-12-22 02:58:38 +00:00
Jess 521e1120bb Update src/battle_controller_player.c 2022-12-06 02:09:33 +00:00
1 changed files with 10 additions and 0 deletions

View File

@ -322,6 +322,16 @@ static void HandleInputChooseAction(void)
BtlController_EmitTwoReturnValues(BUFFER_B, B_ACTION_CANCEL_PARTNER, 0);
PlayerBufferExecCompleted();
}
else
{
if(!(gBattleTypeFlags & BATTLE_TYPE_TRAINER)) //if wild, pressing B moves cursor to run
{
PlaySE(SE_SELECT);
ActionSelectionDestroyCursorAt(gActionSelectionCursor[gActiveBattler]);
gActionSelectionCursor[gActiveBattler] = 3;
ActionSelectionCreateCursorAt(gActionSelectionCursor[gActiveBattler], 0);
}
}
}
else if (JOY_NEW(START_BUTTON))
{