mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-07-05 07:52:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed case of switching out by selecting the Pokemon command

Browse Source
This commit is contained in:
Wlowscha 2025-05-15 00:08:49 +02:00
parent 5ad2bd237d
commit 09a345d5a7
No known key found for this signature in database
GPG Key ID: 3C8F1AD330565D04
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/ui/party-ui-handler.ts
View File

@ -807,8 +807,8 @@ export default class PartyUiHandler extends MessageUiHandler {
return true; return true;
} }
// TODO: This case is probably for when a baton is on // This is used when switching out using the Pokemon command (possibly holding a Baton held item).
if (option === PartyOption.PASS_BATON && !this.selectCallback) { if ((option === PartyOption.PASS_BATON || option === PartyOption.SEND_OUT) && !this.selectCallback) {
(globalScene.getCurrentPhase() as CommandPhase).handleCommand( (globalScene.getCurrentPhase() as CommandPhase).handleCommand(
Command.POKEMON, Command.POKEMON,
this.cursor, this.cursor,
@ -818,8 +818,8 @@ export default class PartyUiHandler extends MessageUiHandler {
if ( if (
[ [
PartyOption.SEND_OUT, PartyOption.SEND_OUT, // When sending out at the start of battle, or due to an effect
PartyOption.PASS_BATON, PartyOption.PASS_BATON, // When passing the baton due to the Baton Pass move
PartyOption.REVIVE, PartyOption.REVIVE,
PartyOption.APPLY, PartyOption.APPLY,
PartyOption.TEACH, PartyOption.TEACH,