From 4f1a940d9e9bfeea075017a5a80995203e4e5557 Mon Sep 17 00:00:00 2001 From: JappaWakka Date: Mon, 4 Dec 2023 13:31:37 +0100 Subject: [PATCH] Fix Mega forms not resetting after battle --- P3D/Battle/BattleSystemV2/Battle.vb | 2 +- P3D/Battle/BattleSystemV2/BattleScreen.vb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/P3D/Battle/BattleSystemV2/Battle.vb b/P3D/Battle/BattleSystemV2/Battle.vb index 00d9e0d38..ff8ffa798 100644 --- a/P3D/Battle/BattleSystemV2/Battle.vb +++ b/P3D/Battle/BattleSystemV2/Battle.vb @@ -595,7 +595,7 @@ BattleScreen.BattleQuery.Add(New PlaySoundQueryObject("Battle\Effects\MegaEvolution", False)) End If BattleScreen.BattleQuery.Add(New ToggleEntityQueryObject(own, ToggleEntityQueryObject.BattleEntities.OwnPokemon, PokemonForms.GetOverworldSpriteName(p), 0, 1, -1, -1)) - BattleScreen.BattleQuery.Add(New TextQueryObject(_base & " has Mega Evolved into " & p.GetName(True))) + BattleScreen.BattleQuery.Add(New TextQueryObject(_base & " has Mega Evolved into " & p.GetName(True) & "!")) TriggerAbilityEffect(BattleScreen, own) End If End Sub diff --git a/P3D/Battle/BattleSystemV2/BattleScreen.vb b/P3D/Battle/BattleSystemV2/BattleScreen.vb index 29d4d257d..873808f34 100644 --- a/P3D/Battle/BattleSystemV2/BattleScreen.vb +++ b/P3D/Battle/BattleSystemV2/BattleScreen.vb @@ -1247,12 +1247,12 @@ nextIndex: 'Level.StopOffsetMapUpdate() Dim str As String = "" - 'Call the EndBattle function of the abilities and Reverts battle only Pokemon formes. + 'Call the EndBattle function of the abilities and Reverts battle-only Pokemon forms. For Each p As Pokemon In Core.Player.Pokemons str = p.AdditionalData.ToLower() Select Case str Case "mega", "mega_x", "mega_y", "primal", "blade" - p.AdditionalData = PokemonForms.GetInitialAdditionalData(p) + p.AdditionalData = "" p.ReloadDefinitions() p.CalculateStats() If str <> "blade" Then