From 916c69d2b054e87b65caba942f8853b62d721969 Mon Sep 17 00:00:00 2001 From: JappaWakka Date: Fri, 21 Jul 2023 19:06:43 +0200 Subject: [PATCH] Dex form switch and cry tweak --- P3D/Screens/Pokedex/PokedexScreen.vb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/P3D/Screens/Pokedex/PokedexScreen.vb b/P3D/Screens/Pokedex/PokedexScreen.vb index 8644c4dd5..083d6fafb 100644 --- a/P3D/Screens/Pokedex/PokedexScreen.vb +++ b/P3D/Screens/Pokedex/PokedexScreen.vb @@ -1688,7 +1688,7 @@ Public Class PokedexViewScreen CanSwitchCount += 1 End If Next - If CanSwitchCount > 1 Then + If CanSwitchCount > 1 OrElse CanSwitchCount = 1 AndAlso Pokedex.GetEntryType(Core.Player.PokedexData, PokemonForms.GetPokemonDataFileName(Me.Pokemon.Number, Me.Pokemon.AdditionalData, True)) = 0 Then Core.SpriteBatch.DrawString(FontManager.MainFont, "Press [Shift] to switch forms", New Vector2(CInt(windowSize.Width - FontManager.MainFont.MeasureString("Press [Shift] to switch forms").X - 128), 36), Color.White, 0.0F, Vector2.Zero, 1.0F, SpriteEffects.None, 0.0F) End If End If @@ -2006,7 +2006,11 @@ Public Class PokedexViewScreen Dim newPokemon As Pokemon = Pokemon.GetPokemonByID(PokeID, PokeAD, True) - LoadPokemonData(-1, newPokemon, True) + Dim playCry As Boolean = True + If FormIndex = OriginalFormIndex Then + playCry = False + End If + LoadPokemonData(-1, newPokemon, playCry) End If End If