Leahnaya/PKHeX
1
0
Fork 0
mirror of https://github.com/kwsch/PKHeX.git synced 2026-03-21 17:48:28 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

FR/LG VC: Handle unobtainable balls

Browse Source 
https: //github.com/kwsch/PKHeX/pull/4735#issuecomment-3986152531
Co-Authored-By: Carbonara <108797333+Mimigris@users.noreply.github.com>
This commit is contained in:
Kurt 2026-03-03 00:35:18 -06:00
parent 85ad6495e6
commit 79a08822ea
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
PKHeX.Core/Items/ItemStorage3FRLG.cs
View File

@ -46,16 +46,24 @@ public sealed class ItemStorage3FRLG_VC : IItemStorage // TODO VC RSE: delete me
private static ReadOnlySpan<ushort> 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
];
}

3
PKHeX.Core/Legality/Verifiers/Misc/MiscVerifierG3.cs
View File

@ -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);
}