Merge c51c5a2b34 into 800b8c9905

src/field/pokemon.ts

@@ -1821,6 +1821,8 @@ export abstract class Pokemon extends Phaser.GameObjects.Container {
    * @returns An array of {@linkcode PokemonMove}, as described above.
    */
   getMoveset(ignoreOverride = false): PokemonMove[] {
+    const ret = !ignoreOverride && this.summonData.moveset ? this.summonData.moveset : this.moveset;
+
     // Overrides moveset based on arrays specified in overrides.ts
     let overrideArray: MoveId | Array<MoveId> = this.isPlayer()
       ? Overrides.MOVESET_OVERRIDE
@@ -1836,7 +1838,7 @@ export abstract class Pokemon extends Phaser.GameObjects.Container {
       });
     }
 
-    return !ignoreOverride && this.summonData.moveset ? this.summonData.moveset : this.moveset;
+    return ret;
   }
 
   /**

src/ui/party-ui-handler.ts

@@ -827,11 +827,6 @@ export class PartyUiHandler extends MessageUiHandler {
       globalScene.triggerPokemonFormChange(pokemon, SpeciesFormChangeItemTrigger, false, true);
     }
 
-    // This is processed before the filter result since releasing does not depend on status.
-    if (option === PartyOption.RELEASE) {
-      return this.processReleaseOption(pokemon);
-    }
-
     // If the pokemon is filtered out for this option, we cannot continue
     const filterResult = this.getFilterResult(option, pokemon);
     if (filterResult) {
@@ -855,6 +850,10 @@ export class PartyUiHandler extends MessageUiHandler {
     // PartyUiMode.POST_BATTLE_SWITCH (SEND_OUT)
 
     // These are the options that need a callback
+    if (option === PartyOption.RELEASE) {
+      return this.processReleaseOption(pokemon);
+    }
+
     if (this.partyUiMode === PartyUiMode.SPLICE) {
       if (option === PartyOption.SPLICE) {
         (this.selectCallback as PartyModifierSpliceSelectCallback)(this.transferCursor, this.cursor);