fix: properly fix missing item 255

arleypadua · Dec 5, 2024 · 887a865 · 887a865
1 parent bd9dd54
commit 887a865
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/src/PKHeX.Facade/Repositories/ItemRepository.cs b/src/PKHeX.Facade/Repositories/ItemRepository.cs
@@ -21,14 +21,16 @@ public ItemRepository(SaveFile saveFile)
         _gameItems = GameInfo.Strings.GetItemStrings(saveFile.Context, saveFile.Version)
             .Select((itemName, id) => (id: Convert.ToUInt16(id), itemName))
             .ToDictionary(x => Convert.ToUInt16(x.id), x => new ItemDefinition(Convert.ToUInt16(x.id), x.itemName));
+
+        if (saveFile.Version == GameVersion.C)
+        {
+            // for whatever reason, Pokemon Crystal has this last item
+            _gameItems[255] = new ItemDefinition(255, "Collapsible bike");
+        }
     }
 
     public ISet<ItemDefinition> GameItems => _gameItems.Values.ToHashSet();
-    public ItemDefinition GetGameItem(ushort id) => _gameItems.GetValueOrDefault(id)
-                                                    // for whatever reason, some items are not in the game's item list
-                                                    // and that ends up failing
-                                                    // falling back to the all items list (is this even correct?)
-                                                    ?? GetItem(id);
+    public ItemDefinition GetGameItem(ushort id) => _gameItems[id];
     public ItemDefinition? GetGameItemByName(string name) => _gameItems.Values
         .FirstOrDefault(i => i.Name.Equals(name, StringComparison.InvariantCultureIgnoreCase));