From cacec77a67046050e9a3fb2601bedf36a868541a Mon Sep 17 00:00:00 2001 From: JappaWakka Date: Wed, 20 Aug 2025 16:34:35 +0200 Subject: [PATCH] Fix Cute Charm affecting same gender or genderless --- P3D/Battle/BattleSystemV2/Battle.vb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/P3D/Battle/BattleSystemV2/Battle.vb b/P3D/Battle/BattleSystemV2/Battle.vb index 0f521d99f..3b56b9366 100644 --- a/P3D/Battle/BattleSystemV2/Battle.vb +++ b/P3D/Battle/BattleSystemV2/Battle.vb @@ -2593,7 +2593,9 @@ Case "cute charm" If moveUsed.MakesContact = True AndAlso p.HasVolatileStatus(Pokemon.VolatileStatus.Infatuation) = False Then If Core.Random.Next(0, 100) < 30 Then - InflictInfatuate(own, Not own, BattleScreen, op.GetDisplayName() & "'s Cute Charm affects " & p.GetDisplayName() & "!", "cutecharm") + If p.Gender <> Pokemon.Genders.Genderless AndAlso op.Gender <> Pokemon.Genders.Genderless AndAlso op.Gender <> p.Gender Then + InflictInfatuate(own, Not own, BattleScreen, op.GetDisplayName() & "'s Cute Charm affects " & p.GetDisplayName() & "!", "cutecharm") + End If End If End If Case "aftermath"