Mega/Primal enemy party mon does not revert to base form after battle

[AaghatIsLive]

Description

I have encountered an issue with the Battle Form Refractor PR #2411. It appears that the PR does not undo the mega/primal evolution of trainer/wild Pokemon.

When the player's party mon mega evolves, the changedSpecies attribute is set to the base form of the mon. However, this behavior is not applied to the enemy party mon.

// Saves the original species on the first form change for the player.
- if (side == B_SIDE_PLAYER && gBattleStruct->changedSpecies[monId] == SPECIES_NONE)
gBattleStruct->changedSpecies[monId] = gBattleMons[battlerId].species;

// Saves the original species on the first form change for the player.
+ if (gBattleStruct->changedSpecies[monId] == SPECIES_NONE)
gBattleStruct->changedSpecies[monId] = gBattleMons[battlerId].species;

removing side == B_SIDE_PLAYER from the check will cause the player's party mon to be turned into the enemy's reverted mon.

Version

1.5.0 (Default)

Upcoming Version

No response

Discord contact info

Aaghat#2527

[DizzyEggg]

Why would this matter for the opponent's mon to revert to the base form? What's a scenario where the enemy party would be used/read after the battle's over?

[AsparagusEduardo]

Why would this matter for the opponent's mon to revert to the base form? What's a scenario where the enemy party would be used/read after the battle's over?

Catching Primal Groudon/Kyogre 👀

[DizzyEggg]

Why would this matter for the opponent's mon to revert to the base form? What's a scenario where the enemy party would be used/read after the battle's over?

Catching Primal Groudon/Kyogre 👀

Oh yeah, this needs to be fixed asap then :D

[gruxor]

Why would this matter for the opponent's mon to revert to the base form? What's a scenario where the enemy party would be used/read after the battle's over?

Catching Primal Groudon/Kyogre 👀

Not entirely relevant to the repo (yet?) but also mega/primal Shadow Pokémon would likely trigger this on a wider scale.

I'd also assume something like a mega/primal Totem Pokémon (if that's even possible), or maybe Dynamax-esque "mega raids" or any implementation of a wild mega/primal for any reason downstream would encounter this issue.