From 774125da9e2ff6e57024ccb409437de75920c85d Mon Sep 17 00:00:00 2001 From: JappaWakka Date: Sat, 18 Mar 2023 20:50:34 +0100 Subject: [PATCH] =?UTF-8?q?Fix=20struggle=20naming=20the=20wrong=20pok?= =?UTF-8?q?=C3=A9mon?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- P3D/Pokemon/Attacks/Normal/Struggle.vb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/P3D/Pokemon/Attacks/Normal/Struggle.vb b/P3D/Pokemon/Attacks/Normal/Struggle.vb index d22242ec5..db71839ef 100644 --- a/P3D/Pokemon/Attacks/Normal/Struggle.vb +++ b/P3D/Pokemon/Attacks/Normal/Struggle.vb @@ -55,7 +55,11 @@ End Sub Public Overrides Sub MoveSelected(own As Boolean, BattleScreen As BattleScreen) - BattleScreen.BattleQuery.Add(New TextQueryObject(BattleScreen.OwnPokemon.GetDisplayName() & " has no usable attacks left!")) + Dim p As Pokemon = BattleScreen.OwnPokemon + If own = False Then + p = BattleScreen.OppPokemon + End If + BattleScreen.BattleQuery.Add(New TextQueryObject(p.GetDisplayName() & " has no usable attacks left!")) End Sub Public Overrides Sub MoveHits(own As Boolean, BattleScreen As BattleScreen)