From 79a08822ea610df61a2c01bf14227b14a4d63434 Mon Sep 17 00:00:00 2001 From: Kurt Date: Tue, 3 Mar 2026 00:35:18 -0600 Subject: [PATCH] FR/LG VC: Handle unobtainable balls https: //github.com/kwsch/PKHeX/pull/4735#issuecomment-3986152531 Co-Authored-By: Carbonara <108797333+Mimigris@users.noreply.github.com> --- PKHeX.Core/Items/ItemStorage3FRLG.cs | 19 ++++++++++++------- .../Legality/Verifiers/Misc/MiscVerifierG3.cs | 3 +++ 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/PKHeX.Core/Items/ItemStorage3FRLG.cs b/PKHeX.Core/Items/ItemStorage3FRLG.cs index 4bcd04e8d..52924360b 100644 --- a/PKHeX.Core/Items/ItemStorage3FRLG.cs +++ b/PKHeX.Core/Items/ItemStorage3FRLG.cs @@ -46,16 +46,24 @@ public sealed class ItemStorage3FRLG_VC : IItemStorage // TODO VC RSE: delete me private static ReadOnlySpan Unreleased => [ + // Unobtainable 005, // Safari + + // TODO RSE VC: Remove these + 007, 012, // Dive Ball, Premier Ball (Unobtainable without trading from R/S/E) 039, 041, 042, 043, // Flutes (Yellow is obtainable via Coins) + + // Unobtainable 044, // Berry Juice + + // TODO RSE VC: Remove these 046, 047, // Shoal Salt, Shoal Shell 048, 049, 050, 051, // Shards 081, // Fluffy Tail - 121, 122, 123, 124, 125, 126, 127, 128, 129, // Mail - 168, // Liechi Berry (Mirage Island) + + // Event Berries (Unobtainable) 169, // Ganlon Berry (Event) 170, // Salac Berry (Event) 171, // Petaya Berry (Event) @@ -63,7 +71,8 @@ public sealed class ItemStorage3FRLG_VC : IItemStorage // TODO VC RSE: delete me 173, // Lansat Berry (Event) 174, // Starf Berry (Event) 175, // Enigma Berry (Event) - + + // TODO RSE VC: Remove these 179, // BrightPowder 180, // White Herb 185, // Mental Herb @@ -71,13 +80,9 @@ public sealed class ItemStorage3FRLG_VC : IItemStorage // TODO VC RSE: delete me 191, // Soul Dew 192, // DeepSeaTooth 193, // DeepSeaScale - 198, // Scope Lens - 202, // Light Ball - 219, // Shell Bell - 254, 255, 256, 257, 258, 259, // Scarves ]; } diff --git a/PKHeX.Core/Legality/Verifiers/Misc/MiscVerifierG3.cs b/PKHeX.Core/Legality/Verifiers/Misc/MiscVerifierG3.cs index 2495a0f8a..d1c1945c0 100644 --- a/PKHeX.Core/Legality/Verifiers/Misc/MiscVerifierG3.cs +++ b/PKHeX.Core/Legality/Verifiers/Misc/MiscVerifierG3.cs @@ -32,6 +32,9 @@ internal void Verify(LegalityAnalysis data, G3PKM pk) if (ItemStorage3FRLG_VC.IsUnreleasedHeld(pk.HeldItem)) data.AddLine(GetInvalid(ItemUnreleased)); + if ((Ball)pk.Ball is Ball.Dive or Ball.Premier) + data.AddLine(GetInvalid(BallUnavailable)); + if (pk is PK3 pk3) VerifyTrash(data, pk3); }