Add support for reading and editing Underground Items (#2987)

Adds a sub-editor with localized support for editing Underground Items.
2024-11-10 06:34:19 +00:00 · 2020-09-13 23:55:50 +02:00 · 2020-09-13 23:55:50 +02:00 · 4b1a9a89da
commit 4b1a9a89da
parent 2e6d1fce1f
40 changed files with 2284 additions and 44 deletions
--- a/PKHeX.Core/Game/GameStrings/GameStrings.cs
+++ b/PKHeX.Core/Game/GameStrings/GameStrings.cs
@ -27,6 +27,7 @@ namespace PKHeX.Core

        // Misc
        public readonly string[] wallpapernames, puffs, walkercourses;
+        public readonly string[] uggoods, ugspheres, ugtraps, ugtreasures;
        private readonly string lang;
        private readonly int LanguageIndex;

@ -105,6 +106,11 @@ namespace PKHeX.Core

            walkercourses = Get("hgss_walkercourses");

+            uggoods = Get("dppt_uggoods");
+            ugspheres = Get("dppt_ugspheres");
+            ugtraps = Get("dppt_ugtraps");
+            ugtreasures = Get("dppt_ugtreasures");
+
            EggName = specieslist[0];
            metHGSS_00000 = Get("hgss_00000");
            metHGSS_02000 = Get("hgss_02000");
--- a/PKHeX.Core/PKHeX.Core.csproj
+++ b/PKHeX.Core/PKHeX.Core.csproj
@ -128,6 +128,10 @@
    <None Remove="Resources\text\de\text_bw2_40000_de.txt" />
    <None Remove="Resources\text\de\text_bw2_60000_de.txt" />
    <None Remove="Resources\text\de\text_Character_de.txt" />
+    <None Remove="Resources\text\de\text_dppt_uggoods_de.txt" />
+    <None Remove="Resources\text\de\text_dppt_ugspheres_de.txt" />
+    <None Remove="Resources\text\de\text_dppt_ugtraps_de.txt" />
+    <None Remove="Resources\text\de\text_dppt_ugtreasures_de.txt" />
    <None Remove="Resources\text\de\text_EncounterType_de.txt" />
    <None Remove="Resources\text\de\text_Forms_de.txt" />
    <None Remove="Resources\text\de\text_Games_de.txt" />
@ -183,6 +187,10 @@
    <None Remove="Resources\text\en\text_bw2_40000_en.txt" />
    <None Remove="Resources\text\en\text_bw2_60000_en.txt" />
    <None Remove="Resources\text\en\text_Character_en.txt" />
+    <None Remove="Resources\text\en\text_dppt_uggoods_en.txt" />
+    <None Remove="Resources\text\en\text_dppt_ugspheres_en.txt" />
+    <None Remove="Resources\text\en\text_dppt_ugtraps_en.txt" />
+    <None Remove="Resources\text\en\text_dppt_ugtreasures_en.txt" />
    <None Remove="Resources\text\en\text_EncounterType_en.txt" />
    <None Remove="Resources\text\en\text_Forms_en.txt" />
    <None Remove="Resources\text\en\text_Games_en.txt" />
@ -238,6 +246,10 @@
    <None Remove="Resources\text\es\text_bw2_40000_es.txt" />
    <None Remove="Resources\text\es\text_bw2_60000_es.txt" />
    <None Remove="Resources\text\es\text_Character_es.txt" />
+    <None Remove="Resources\text\es\text_dppt_uggoods_es.txt" />
+    <None Remove="Resources\text\es\text_dppt_ugspheres_es.txt" />
+    <None Remove="Resources\text\es\text_dppt_ugtraps_es.txt" />
+    <None Remove="Resources\text\es\text_dppt_ugtreasures_es.txt" />
    <None Remove="Resources\text\es\text_EncounterType_es.txt" />
    <None Remove="Resources\text\es\text_Forms_es.txt" />
    <None Remove="Resources\text\es\text_Games_es.txt" />
@ -293,6 +305,10 @@
    <None Remove="Resources\text\fr\text_bw2_40000_fr.txt" />
    <None Remove="Resources\text\fr\text_bw2_60000_fr.txt" />
    <None Remove="Resources\text\fr\text_Character_fr.txt" />
+    <None Remove="Resources\text\fr\text_dppt_uggoods_fr.txt" />
+    <None Remove="Resources\text\fr\text_dppt_ugspheres_fr.txt" />
+    <None Remove="Resources\text\fr\text_dppt_ugtraps_fr.txt" />
+    <None Remove="Resources\text\fr\text_dppt_ugtreasures_fr.txt" />
    <None Remove="Resources\text\fr\text_EncounterType_fr.txt" />
    <None Remove="Resources\text\fr\text_Forms_fr.txt" />
    <None Remove="Resources\text\fr\text_Games_fr.txt" />
@ -372,6 +388,10 @@
    <None Remove="Resources\text\it\text_bw2_40000_it.txt" />
    <None Remove="Resources\text\it\text_bw2_60000_it.txt" />
    <None Remove="Resources\text\it\text_Character_it.txt" />
+    <None Remove="Resources\text\it\text_dppt_uggoods_it.txt" />
+    <None Remove="Resources\text\it\text_dppt_ugspheres_it.txt" />
+    <None Remove="Resources\text\it\text_dppt_ugtraps_it.txt" />
+    <None Remove="Resources\text\it\text_dppt_ugtreasures_it.txt" />
    <None Remove="Resources\text\it\text_EncounterType_it.txt" />
    <None Remove="Resources\text\it\text_Forms_it.txt" />
    <None Remove="Resources\text\it\text_Games_it.txt" />
@ -427,6 +447,10 @@
    <None Remove="Resources\text\ja\text_bw2_40000_ja.txt" />
    <None Remove="Resources\text\ja\text_bw2_60000_ja.txt" />
    <None Remove="Resources\text\ja\text_Character_ja.txt" />
+    <None Remove="Resources\text\ja\text_dppt_uggoods_ja.txt" />
+    <None Remove="Resources\text\ja\text_dppt_ugspheres_ja.txt" />
+    <None Remove="Resources\text\ja\text_dppt_ugtraps_ja.txt" />
+    <None Remove="Resources\text\ja\text_dppt_ugtreasures_ja.txt" />
    <None Remove="Resources\text\ja\text_EncounterType_ja.txt" />
    <None Remove="Resources\text\ja\text_Forms_ja.txt" />
    <None Remove="Resources\text\ja\text_Games_ja.txt" />
@ -482,6 +506,10 @@
    <None Remove="Resources\text\ko\text_bw2_40000_ko.txt" />
    <None Remove="Resources\text\ko\text_bw2_60000_ko.txt" />
    <None Remove="Resources\text\ko\text_Character_ko.txt" />
+    <None Remove="Resources\text\ko\text_dppt_uggoods_ko.txt" />
+    <None Remove="Resources\text\ko\text_dppt_ugspheres_ko.txt" />
+    <None Remove="Resources\text\ko\text_dppt_ugtraps_ko.txt" />
+    <None Remove="Resources\text\ko\text_dppt_ugtreasures_ko.txt" />
    <None Remove="Resources\text\ko\text_EncounterType_ko.txt" />
    <None Remove="Resources\text\ko\text_Forms_ko.txt" />
    <None Remove="Resources\text\ko\text_Games_ko.txt" />
@ -942,6 +970,10 @@
    <EmbeddedResource Include="Resources\text\de\text_bw2_40000_de.txt" />
    <EmbeddedResource Include="Resources\text\de\text_bw2_60000_de.txt" />
    <EmbeddedResource Include="Resources\text\de\text_Character_de.txt" />
+    <EmbeddedResource Include="Resources\text\de\text_dppt_uggoods_de.txt" />
+    <EmbeddedResource Include="Resources\text\de\text_dppt_ugspheres_de.txt" />
+    <EmbeddedResource Include="Resources\text\de\text_dppt_ugtraps_de.txt" />
+    <EmbeddedResource Include="Resources\text\de\text_dppt_ugtreasures_de.txt" />
    <EmbeddedResource Include="Resources\text\de\text_EncounterType_de.txt" />
    <EmbeddedResource Include="Resources\text\de\text_Forms_de.txt" />
    <EmbeddedResource Include="Resources\text\de\text_Games_de.txt" />
@ -997,6 +1029,10 @@
    <EmbeddedResource Include="Resources\text\en\text_bw2_40000_en.txt" />
    <EmbeddedResource Include="Resources\text\en\text_bw2_60000_en.txt" />
    <EmbeddedResource Include="Resources\text\en\text_Character_en.txt" />
+    <EmbeddedResource Include="Resources\text\en\text_dppt_uggoods_en.txt" />
+    <EmbeddedResource Include="Resources\text\en\text_dppt_ugspheres_en.txt" />
+    <EmbeddedResource Include="Resources\text\en\text_dppt_ugtraps_en.txt" />
+    <EmbeddedResource Include="Resources\text\en\text_dppt_ugtreasures_en.txt" />
    <EmbeddedResource Include="Resources\text\en\text_EncounterType_en.txt" />
    <EmbeddedResource Include="Resources\text\en\text_Forms_en.txt" />
    <EmbeddedResource Include="Resources\text\en\text_Games_en.txt" />
@ -1052,6 +1088,10 @@
    <EmbeddedResource Include="Resources\text\es\text_bw2_40000_es.txt" />
    <EmbeddedResource Include="Resources\text\es\text_bw2_60000_es.txt" />
    <EmbeddedResource Include="Resources\text\es\text_Character_es.txt" />
+    <EmbeddedResource Include="Resources\text\es\text_dppt_uggoods_es.txt" />
+    <EmbeddedResource Include="Resources\text\es\text_dppt_ugspheres_es.txt" />
+    <EmbeddedResource Include="Resources\text\es\text_dppt_ugtraps_es.txt" />
+    <EmbeddedResource Include="Resources\text\es\text_dppt_ugtreasures_es.txt" />
    <EmbeddedResource Include="Resources\text\es\text_EncounterType_es.txt" />
    <EmbeddedResource Include="Resources\text\es\text_Forms_es.txt" />
    <EmbeddedResource Include="Resources\text\es\text_Games_es.txt" />
@ -1107,6 +1147,10 @@
    <EmbeddedResource Include="Resources\text\fr\text_bw2_40000_fr.txt" />
    <EmbeddedResource Include="Resources\text\fr\text_bw2_60000_fr.txt" />
    <EmbeddedResource Include="Resources\text\fr\text_Character_fr.txt" />
+    <EmbeddedResource Include="Resources\text\fr\text_dppt_uggoods_fr.txt" />
+    <EmbeddedResource Include="Resources\text\fr\text_dppt_ugspheres_fr.txt" />
+    <EmbeddedResource Include="Resources\text\fr\text_dppt_ugtraps_fr.txt" />
+    <EmbeddedResource Include="Resources\text\fr\text_dppt_ugtreasures_fr.txt" />
    <EmbeddedResource Include="Resources\text\fr\text_EncounterType_fr.txt" />
    <EmbeddedResource Include="Resources\text\fr\text_Forms_fr.txt" />
    <EmbeddedResource Include="Resources\text\fr\text_Games_fr.txt" />
@ -1186,6 +1230,10 @@
    <EmbeddedResource Include="Resources\text\it\text_bw2_40000_it.txt" />
    <EmbeddedResource Include="Resources\text\it\text_bw2_60000_it.txt" />
    <EmbeddedResource Include="Resources\text\it\text_Character_it.txt" />
+    <EmbeddedResource Include="Resources\text\it\text_dppt_uggoods_it.txt" />
+    <EmbeddedResource Include="Resources\text\it\text_dppt_ugspheres_it.txt" />
+    <EmbeddedResource Include="Resources\text\it\text_dppt_ugtraps_it.txt" />
+    <EmbeddedResource Include="Resources\text\it\text_dppt_ugtreasures_it.txt" />
    <EmbeddedResource Include="Resources\text\it\text_EncounterType_it.txt" />
    <EmbeddedResource Include="Resources\text\it\text_Forms_it.txt" />
    <EmbeddedResource Include="Resources\text\it\text_Games_it.txt" />
@ -1241,6 +1289,10 @@
    <EmbeddedResource Include="Resources\text\ja\text_bw2_40000_ja.txt" />
    <EmbeddedResource Include="Resources\text\ja\text_bw2_60000_ja.txt" />
    <EmbeddedResource Include="Resources\text\ja\text_Character_ja.txt" />
+    <EmbeddedResource Include="Resources\text\ja\text_dppt_uggoods_ja.txt" />
+    <EmbeddedResource Include="Resources\text\ja\text_dppt_ugspheres_ja.txt" />
+    <EmbeddedResource Include="Resources\text\ja\text_dppt_ugtraps_ja.txt" />
+    <EmbeddedResource Include="Resources\text\ja\text_dppt_ugtreasures_ja.txt" />
    <EmbeddedResource Include="Resources\text\ja\text_EncounterType_ja.txt" />
    <EmbeddedResource Include="Resources\text\ja\text_Forms_ja.txt" />
    <EmbeddedResource Include="Resources\text\ja\text_Games_ja.txt" />
@ -1296,6 +1348,10 @@
    <EmbeddedResource Include="Resources\text\ko\text_bw2_40000_ko.txt" />
    <EmbeddedResource Include="Resources\text\ko\text_bw2_60000_ko.txt" />
    <EmbeddedResource Include="Resources\text\ko\text_Character_ko.txt" />
+    <EmbeddedResource Include="Resources\text\ko\text_dppt_uggoods_ko.txt" />
+    <EmbeddedResource Include="Resources\text\ko\text_dppt_ugspheres_ko.txt" />
+    <EmbeddedResource Include="Resources\text\ko\text_dppt_ugtraps_ko.txt" />
+    <EmbeddedResource Include="Resources\text\ko\text_dppt_ugtreasures_ko.txt" />
    <EmbeddedResource Include="Resources\text\ko\text_EncounterType_ko.txt" />
    <EmbeddedResource Include="Resources\text\ko\text_Forms_ko.txt" />
    <EmbeddedResource Include="Resources\text\ko\text_Games_ko.txt" />
--- a/PKHeX.Core/Resources/text/de/text_dppt_uggoods_de.txt
+++ b/PKHeX.Core/Resources/text/de/text_dppt_uggoods_de.txt
@ -0,0 +1,139 @@
+(Kein)
+
+
+
+
+
+
+Gelbes Kissen
+Blaues Kissen
+Holzstuhl
+Großer Tisch
+Einfacher Tisch
+Kleiner Tisch
+Langer Tisch
+Breiter Tisch
+Poké-Tisch
+Gr. Bücherregal
+Kl. Bücherregal
+Laborregal
+Werkzeugregal
+Ladenregal
+Vitrine
+Schrank
+Holzkommode
+Rosa Kommode
+Fernseher
+Kühlschrank
+Spülbecken
+Leichtes Bett
+Abfalleimer
+Pappkarton
+Kiste
+Behälter
+Ölfass
+Ölvorrat
+Eisenträger
+Topfpflanze
+Poké-Blume
+Vitalisator
+Labormaschine
+Testmaschine
+Spielkonsole
+Getränke
+Rotes Fahrrad
+Grünes Fahrrad
+Fernglas
+Globus
+Arena-Statue
+Rotes Zelt
+Blaues Zelt
+Helles Zelt
+Irrblock 1
+Irrblock 2
+Irrblock 3
+Irrblock 4
+Irrblock 5
+Lochwerkzeug
+Grubenwerkzeug
+Dunstwerkzeug
+Rauchwerkzeug
+Felswerkzeug
+Gesteinswerkz.
+Schaumwerkzeug
+Blasenwerkzeug
+Botschaft 1
+Botschaft 2
+Botschaft 3
+Botschaft 4
+Blätterwerkz.
+Blumenwerkzeug
+Aschewerkzeug
+Feuerwerkzeug
+Anmut-Cup
+Coolness-Cup
+Schönheit-Cup
+Stärke-Cup
+Klugheit-Cup
+Blauer Kristall
+Rosa Kristall
+Roter Kristall
+Gelber Kristall
+Hübsches Juwel
+Leuchten. Juwel
+Mystisch. Juwel
+Funkeln. Juwel
+Bronzetrophäe
+Silbertrophäe
+Goldtrophäe
+Supertrophäe
+Ballornament
+Rundes Ornament
+Klares Ornament
+GLUMANDA-Puppe
+BISASAM-Puppe
+SCHIGGY-Puppe
+FEURIGEL-Puppe
+ENDIVIE-Puppe
+KARNIMANI-Pup.
+FLEMMLI-Puppe
+GECKARBOR-Pup.
+HYDROPI-Puppe
+PANFLAM-Puppe
+CHELAST-Puppe
+PLINFA-Puppe
+PIKACHU-Puppe
+PLUSLE-Puppe
+MINUN-Puppe
+PIEPI-Puppe
+PUMMELUFF-Pup.
+WOINGENAU-Pup.
+MAUZI-Puppe
+ENECO-Puppe
+CHARMIAN-Puppe
+HASPIROR-Puppe
+SNIBUNNA-Puppe
+MAMPFAXO-Puppe
+MOBAI-Puppe
+PANTIMIMI-Pup.
+LUCARIO-Puppe
+MANTIRPS-Puppe
+BAMELIN-Puppe
+PLAUDAGEI-Pup.
+MANAPHY-Puppe
+RELAXO-Puppe
+WAILORD-Puppe
+MAGNEZONE-Pup.
+DRIFTLON-Puppe
+WONNEIRA-Puppe
+PACHIRISU-Pup.
+
+
+
+
+Breites Sofa
+Bonsai
+Zarte Blumen
+Schöne Blumen
+Hübsche Blumen
+Üppige Blumen
--- a/PKHeX.Core/Resources/text/de/text_dppt_ugspheres_de.txt
+++ b/PKHeX.Core/Resources/text/de/text_dppt_ugspheres_de.txt
@ -0,0 +1,11 @@
+(Kein)
+Prismensphäre (K)
+Weißsphäre (K)
+Purpursphäre (K)
+Indigosphäre (K)
+Jadesphäre (K)
+Prismensphäre (G)
+Weißsphäre (G)
+Purpursphäre (G)
+Indigosphäre (G)
+Jadesphäre (G)
--- a/PKHeX.Core/Resources/text/de/text_dppt_ugtraps_de.txt
+++ b/PKHeX.Core/Resources/text/de/text_dppt_ugtraps_de.txt
@ -0,0 +1,34 @@
+(Kein)
+Bewegungsfal. ↑
+Bewegungsfal. →
+Bewegungsfal. ↓
+Bewegungsfal. ←
+Schleuderfal. ↑
+Schleuderfal. →
+Schleuderfal. ↓
+Schleuderfal. ←
+Warp-Falle
+XXL-Warp-Falle
+Loch-Falle
+Gruben-Falle
+Retour-Falle
+Chaos-Falle
+Sprint-Falle
+Tarn-Falle
+Lahm-Falle
+Dunst-Falle
+Rauch-Falle
+Fels-Falle
+Gestein-Falle
+Schaum-Falle
+Blasen-Falle
+Botsch.-Falle 1
+Botsch.-Falle 2
+Botsch.-Falle 3
+Botsch.-Falle 4
+Blätter-Falle
+Blumen-Falle
+Asche-Falle
+Feuer-Falle
+Radar-Falle
+Einweg-Bohrer
--- a/PKHeX.Core/Resources/text/de/text_dppt_ugtreasures_de.txt
+++ b/PKHeX.Core/Resources/text/de/text_dppt_ugtreasures_de.txt
@ -0,0 +1,60 @@
+(Kein)
+
+
+
+
+
+
+
+
+
+
+Ovaler Stein
+Spiritkern
+Sonnenstein
+Sternenstück
+Mondstein
+Granitstein
+Donnerstein
+Ewigstein
+Feuerstein
+Wasserstein
+Blattstein
+Nugget
+Helixfossil
+Domfossil
+Klauenfossil
+Wurzelfossil
+Altbernstein
+Steinknochen
+Beleber
+Top-Beleber
+Purpurstück
+Indigostück
+Gelbstück
+Grünstück
+Herzschuppe
+Panzerfossil
+Kopffossil
+Lichtlehm
+Eisenkugel
+Eisbrocken
+Glattbrocken
+Heißbrocken
+Nassbrocken
+Feuertafel
+Wassertafel
+Blitztafel
+Wiesentafel
+Frosttafel
+Fausttafel
+Gifttafel
+Erdtafel
+Wolkentafel
+Hirntafel
+Käfertafel
+Steintafel
+Spuktafel
+Dracotafel
+Furchttafel
+Eisentafel
--- a/PKHeX.Core/Resources/text/en/text_dppt_uggoods_en.txt
+++ b/PKHeX.Core/Resources/text/en/text_dppt_uggoods_en.txt
@ -0,0 +1,139 @@
+(None)
+
+
+
+
+
+
+Yellow Cushion
+Blue Cushion
+Wooden Chair
+Big Table
+Plain Table
+Small Table
+Long Table
+Wide Table
+Poké Table
+Big Bookshelf
+Small Bookshelf
+Research Shelf
+Bike Rack
+Shop Shelf
+Display Shelf
+Cupboard
+Wood Dresser
+Pink Dresser
+TV
+Refrigerator
+Pretty Sink
+Feathery Bed
+Trash Can
+Cardboard Box
+Crate
+Container
+Oil Drum
+Big Oil Drum
+Iron Beam
+Potted Plant
+Poké Flower
+Healing Machine
+Lab Machine
+Test Machine
+Game System
+Vending Machine
+Red Bike
+Green Bike
+Binoculars
+Globe
+Gym Statue
+Red Tent
+Blue Tent
+Clear Tent
+Maze Block 1
+Maze Block 2
+Maze Block 3
+Maze Block 4
+Maze Block 5
+Hole Tool
+Pit Tool
+Smoke Tool
+Big Smoke Tool
+Rock Tool
+Rockfall Tool
+Foam Tool
+Bubble Tool
+Alert Tool 1
+Alert Tool 2
+Alert Tool 3
+Alert Tool 4
+Leaf Tool
+Flower Tool
+Ember Tool
+Fire Tool
+Cute Cup
+Cool Cup
+Beauty Cup
+Tough Cup
+Clever Cup
+Blue Crystal
+Pink Crystal
+Red Crystal
+Yellow Crystal
+Pretty Gem
+Shiny Gem
+Mystic Gem
+Glitter Gem
+Bronze Trophy
+Silver Trophy
+Gold Trophy
+Great Trophy
+Ball Ornament
+Round Ornament
+Clear Ornament
+CHARMANDER Doll
+BULBASAUR Doll
+SQUIRTLE Doll
+CYNDAQUIL Doll
+CHIKORITA Doll
+TOTODILE Doll
+TORCHIC Doll
+TREECKO Doll
+MUDKIP Doll
+CHIMCHAR Doll
+TURTWIG Doll
+PIPLUP Doll
+PIKACHU Doll
+PLUSLE Doll
+MINUN Doll
+CLEFAIRY Doll
+JIGGLYPUFF Doll
+WOBBUFFET Doll
+MEOWTH Doll
+SKITTY Doll
+GLAMEOW Doll
+BUNEARY Doll
+WEAVILE Doll
+MUNCHLAX Doll
+BONSLY Doll
+MIME JR. Doll
+LUCARIO Doll
+MANTYKE Doll
+BUIZEL Doll
+CHATOT Doll
+MANAPHY Doll
+SNORLAX Doll
+WAILORD Doll
+MAGNEZONE Doll
+DRIFLOON Doll
+HAPPINY Doll
+PACHIRISU Doll
+
+
+
+
+Wide Sofa
+Bonsai
+Dainty Flowers
+Lovely Flowers
+Pretty Flowers
+Lavish Flowers
--- a/PKHeX.Core/Resources/text/en/text_dppt_ugspheres_en.txt
+++ b/PKHeX.Core/Resources/text/en/text_dppt_ugspheres_en.txt
@ -0,0 +1,11 @@
+(None)
+Prism Sphere (S)
+Pale Sphere (S)
+Red Sphere (S)
+Blue Sphere (S)
+Green Sphere (S)
+Prism Sphere (L)
+Pale Sphere (L)
+Red Sphere (L)
+Blue Sphere (L)
+Green Sphere (L)
--- a/PKHeX.Core/Resources/text/en/text_dppt_ugtraps_en.txt
+++ b/PKHeX.Core/Resources/text/en/text_dppt_ugtraps_en.txt
@ -0,0 +1,34 @@
+(None)
+Move Trap ↑
+Move Trap →
+Move Trap ↓
+Move Trap ←
+Hurl Trap ↑
+Hurl Trap →
+Hurl Trap ↓
+Hurl Trap ←
+Warp Trap
+Hi-Warp Trap
+Hole Trap
+Pit Trap
+Reverse Trap
+Confuse Trap
+Run Trap
+Fade Trap
+Slow Trap
+Smoke Trap
+Big Smoke Trap
+Rock Trap
+Rockfall Trap
+Foam Trap
+Bubble Trap
+Alert Trap 1
+Alert Trap 2
+Alert Trap 3
+Alert Trap 4
+Leaf Trap
+Flower Trap
+Ember Trap
+Fire Trap
+Radar Trap
+Digger Drill
--- a/PKHeX.Core/Resources/text/en/text_dppt_ugtreasures_en.txt
+++ b/PKHeX.Core/Resources/text/en/text_dppt_ugtreasures_en.txt
@ -0,0 +1,60 @@
+(None)
+
+
+
+
+
+
+
+
+
+
+Oval Stone
+Odd Keystone
+Sun Stone
+Star Piece
+Moon Stone
+Hard Stone
+Thunderstone
+Everstone
+Fire Stone
+Water Stone
+Leaf Stone
+Nugget
+Helix Fossil
+Dome Fossil
+Claw Fossil
+Root Fossil
+Old Amber
+Rare Bone
+Revive
+Max Revive
+Red Shard
+Blue Shard
+Yellow Shard
+Green Shard
+Heart Scale
+Armor Fossil
+Skull Fossil
+Light Clay
+Iron Ball
+Icy Rock
+Smooth Rock
+Heat Rock
+Damp Rock
+Flame Plate
+Splash Plate
+Zap Plate
+Meadow Plate
+Icicle Plate
+Fist Plate
+Toxic Plate
+Earth Plate
+Sky Plate
+Mind Plate
+Insect Plate
+Stone Plate
+Spooky Plate
+Draco Plate
+Dread Plate
+Iron Plate
--- a/PKHeX.Core/Resources/text/es/text_dppt_uggoods_es.txt
+++ b/PKHeX.Core/Resources/text/es/text_dppt_uggoods_es.txt
@ -0,0 +1,139 @@
+(Ninguno)
+
+
+
+
+
+
+Cojín Amarillo
+Cojín Azul
+Silla Madera
+Mesa Grande
+Mesa Común
+Mesa Pequeña
+Mesa Larga
+Mesa Ancha
+Mesa Pokémon
+Estante Grande
+Estante Pequeño
+Estante Estudio
+Estante Bici
+Estante Tienda
+Estante Muestra
+Armario
+Mueble Madera
+Mueble Rosa
+Televisor
+Frigorífico
+Lavabo Bonito
+Cama Plumas
+Cubo Basura
+Caja Cartón
+Caja
+Contenedor
+Bidón Aceite
+Bidón Ac. Gr.
+Barra Hierro
+Maceta
+Flor Pokémon
+Máq. Curación
+Máq. Laborat.
+Máquina Pruebas
+Consola Juegos
+Máq. Expended.
+Bici Roja
+Bici Verde
+Prismáticos
+Globo Terr.
+Estatua Gimn.
+Tienda Roja
+Tienda Azul
+Tienda Transp.
+Bloque Laber. 1
+Bloque Laber. 2
+Bloque Laber. 3
+Bloque Laber. 4
+Bloque Laber. 5
+Herram. Agujero
+Herram. Fosa
+Herram. Humo
+Herr. Humo Gr.
+Herram. Piedras
+Herram. Rocas
+Herram. Espuma
+Herram. Burbuja
+Herr. Alerta 1
+Herr. Alerta 2
+Herr. Alerta 3
+Herr. Alerta 4
+Herram. Hoja
+Herram. Flor
+Herram. Brasas
+Herram. Fuego
+Copa Dulzura
+Copa Carisma
+Copa Belleza
+Copa Dureza
+Copa Ingenio
+Cristal Azul
+Cristal Rosa
+Cristal Rojo
+Cristal Amar.
+Joya Preciosa
+Joya Brillante
+Joya Mística
+Joya Reluciente
+Trofeo Bronce
+Trofeo Plata
+Trofeo Oro
+Gran Trofeo
+Adorno Ball
+Adorno Redondo
+Adorno Transp.
+Muñ. CHARMANDER
+Muñ. BULBASAUR
+Muñeco SQUIRTLE
+Muñ. CYNDAQUIL
+Muñ. CHIKORITA
+Muñ. TOTODILE
+Muñeco TORCHIC
+Muñeco TREECKO
+Muñeco MUDKIP
+Muñeco CHIMCHAR
+Muñeco TURTWIG
+Muñeco PIPLUP
+Muñeco PIKACHU
+Muñeco PLUSLE
+Muñeco MINUN
+Muñeco CLEFAIRY
+Muñ. JIGGLYPUFF
+Muñ. WOBBUFFET
+Muñeco MEOWTH
+Muñeco SKITTY
+Muñeco GLAMEOW
+Muñeco BUNEARY
+Muñeco WEAVILE
+Muñeco MUNCHLAX
+Muñeco BONSLY
+Muñeco MIME JR.
+Muñeco LUCARIO
+Muñeco MANTYKE
+Muñeco BUIZEL
+Muñeco CHATOT
+Muñeco MANAPHY
+Muñeco SNORLAX
+Muñeco WAILORD
+Muñ. MAGNEZONE
+Muñeco DRIFLOON
+Muñeco HAPPINY
+Muñ. PACHIRISU
+
+
+
+
+Sofá Grande
+Bonsái
+Flores Sublimes
+Flores Hermosas
+Flores Bonitas
+Flores Vistosas
--- a/PKHeX.Core/Resources/text/es/text_dppt_ugspheres_es.txt
+++ b/PKHeX.Core/Resources/text/es/text_dppt_ugspheres_es.txt
@ -0,0 +1,11 @@
+(Ninguno)
+Gema Prisma (P)
+Gema Blanca (P)
+Gema Roja (P)
+Gema Azul (P)
+Gema Verde (P)
+Gema Prisma (G)
+Gema Blanca (G)
+Gema Roja (G)
+Gema Azul (G)
+Gema Verde (G)
--- a/PKHeX.Core/Resources/text/es/text_dppt_ugtraps_es.txt
+++ b/PKHeX.Core/Resources/text/es/text_dppt_ugtraps_es.txt
@ -0,0 +1,34 @@
+(Ninguno)
+Trampa Movim. ↑
+Trampa Movim. →
+Trampa Movim. ↓
+Trampa Movim. ←
+Trampa Salto ↑
+Trampa Salto →
+Trampa Salto ↓
+Trampa Salto ←
+Teletrampa
+Superteletr.
+Trampa Agujero
+Trampa Fosa
+Trampa Inversa
+Trampa Confusa
+Corretrampa
+Trampa Desapar.
+Trampa Ralentí
+Trampa Humo
+Trampa Humo Gr.
+Trampa Piedras
+Trampa Rocas
+Trampa Espuma
+Trampa Burbuja
+Trampa Alerta 1
+Trampa Alerta 2
+Trampa Alerta 3
+Trampa Alerta 4
+Trampa Hoja
+Trampa Flor
+Trampa Brasas
+Trampa Fuego
+Trampa Radar
+Taladro
--- a/PKHeX.Core/Resources/text/es/text_dppt_ugtreasures_es.txt
+++ b/PKHeX.Core/Resources/text/es/text_dppt_ugtreasures_es.txt
@ -0,0 +1,60 @@
+(Ninguno)
+
+
+
+
+
+
+
+
+
+
+Piedra Oval
+P. Espíritu
+Piedra Solar
+Tr. Estrella
+Piedra Lunar
+Piedra Dura
+Piedratrueno
+Piedraeterna
+Piedra Fuego
+Piedra Agua
+Piedra Hoja
+Pepita
+Fósil Helix
+Fósil Domo
+Fósil Garra
+Fósil Raíz
+Ámbar Viejo
+Hueso Raro
+Revivir
+Máx. Revivir
+Parte Roja
+Parte Azul
+Parte Amarilla
+Parte Verde
+Escama Corazón
+Fósil Coraza
+Fósil Cráneo
+Refleluz
+Bola Férrea
+Roca Helada
+Roca Suave
+Roca Calor
+Roca Lluvia
+Tabla Llama
+Tabla Linfa
+Tabla Trueno
+Tabla Pradal
+Tabla Helada
+Tabla Fuerte
+Tabla Tóxica
+Tabla Terrax
+Tabla Cielo
+Tabla Mental
+Tabla Bicho
+Tabla Pétrea
+Tabla Terror
+Tabla Draco
+Tabla Oscura
+Tabla Acero
--- a/PKHeX.Core/Resources/text/fr/text_dppt_uggoods_fr.txt
+++ b/PKHeX.Core/Resources/text/fr/text_dppt_uggoods_fr.txt
@ -0,0 +1,139 @@
+(Aucun)
+
+
+
+
+
+
+Coussin Jaune
+Coussin Bleu
+Siège en Bois
+Grande Table
+Table Simple
+Petite Table
+Table Verticale
+Table Horizont.
+Table Poké
+Grande Biblio
+Petite Biblio
+Meuble Archives
+Etabli
+Etagère Magasin
+Présentoir
+Buffet
+Armoire Bois
+Armoire Rose
+TV
+Réfrigérateur
+Bel Evier
+Lit en Plumes
+Poubelle
+Carton
+Caisse
+Conteneur
+Baril
+Set de Barils
+Poutres Métal
+Plante en Pot
+Fleur Poké
+Machine Soins
+Machine Labo
+Machine Test
+Console de Jeu
+Distributeur
+Vélo Rouge
+Vélo Vert
+Jumelles
+Globe Terrestre
+Statue Arène
+Tente Rouge
+Tente Bleue
+Tente Transpa.
+Bloc Laby. 1
+Bloc Laby. 2
+Bloc Laby. 3
+Bloc Laby. 4
+Bloc Laby. 5
+Outil Trou
+Outil Grotrou
+Outil Fumée
+Outil Nuage
+Outil Rocher
+Outil Grorocher
+Outil Mousse
+Outil Bulle
+Outil Alerte 1
+Outil Alerte 2
+Outil Alerte 3
+Outil Alerte 4
+Outil Feuille
+Outil Fleur
+Outil Feu
+Outil Brasier
+Coupe Grâce
+Coupe Sg-fd
+Coupe Beauté
+Coupe Robust.
+Coupe Intellig.
+Cristal Bleu
+Cristal Rose
+Cristal Rouge
+Cristal Jaune
+Jolie Gemme
+Gemme Brillante
+Gemme Mystique
+Gemme Pailletée
+Trophée Bronze
+Trophée Argent
+Trophée Or
+Grand Trophée
+Ornement Ball
+Ornement Rond
+Ornement Clair
+Poup. SALAMECHE
+P. BULBIZARRE
+Poupée CARAPUCE
+Poup.HERICENDRE
+Poup. GERMIGNON
+Poupée KAIMINUS
+Poup.POUSSIFEU
+Poupée ARCKO
+Poupée GOBOU
+P. OUISTICRAM
+P. TORTIPOUSS
+Poupée TIPLOUF
+Poupée PIKACHU
+Poupée POSIPI
+Poupée NEGAPI
+Poupée MELOFEE
+Poup. RONDOUDOU
+Poup. QULBUTOKE
+Poupée MIAOUSS
+Poupée SKITTY
+Poupée CHAGLAM
+P. LAPOREILLE
+Poupée DIMORET
+Poupée GOINFREX
+Poupée MANZAI
+Poupée MIME JR.
+Poupée LUCARIO
+Poup. BABIMANTA
+P. MUSTEBOUEE
+Poup. PIJAKO
+Poupée MANAPHY
+Poupée RONFLEX
+Poupée WAILORD
+Poup. MAGNEZONE
+Poupée BAUDRIVE
+Poupée PTIRAVI
+Poup. PACHIRISU
+
+
+
+
+Large Canapé
+Bonsaï
+Fleurs Fines
+Belles Fleurs
+Jolies Fleurs
+Fleurs Superbes
--- a/PKHeX.Core/Resources/text/fr/text_dppt_ugspheres_fr.txt
+++ b/PKHeX.Core/Resources/text/fr/text_dppt_ugspheres_fr.txt
@ -0,0 +1,11 @@
+(Aucun)
+Sphère Prisme (P)
+Sphère Pâle (P)
+Sphère Rouge (P)
+Sphère Bleue (P)
+Sphère Verte (P)
+Sphère Prisme (G)
+Sphère Pâle (G)
+Sphère Rouge (G)
+Sphère Bleue (G)
+Sphère Verte (G)
--- a/PKHeX.Core/Resources/text/fr/text_dppt_ugtraps_fr.txt
+++ b/PKHeX.Core/Resources/text/fr/text_dppt_ugtraps_fr.txt
@ -0,0 +1,34 @@
+(Aucun)
+Piège Fronde ↑
+Piège Fronde →
+Piège Fronde ↓
+Piège Fronde ←
+Piège Baliste ↑
+Piège Baliste →
+Piège Baliste ↓
+Piège Baliste ←
+Piège Télé
+Méga Piège Télé
+Piège Trou
+Piège Grotrou
+Piège Inversion
+Piège Confusion
+Piège Coureur
+Piège Invisible
+Piège Ralenti
+Piège Fumée
+Piège Nuage
+Piège Rocher
+Piège Grorocher
+Piège Mousse
+Piège Bulle
+Piège Alerte 1
+Piège Alerte 2
+Piège Alerte 3
+Piège Alerte 4
+Piège Feuille
+Piège Fleur
+Piège Feu
+Piège Brasier
+Piège Radar
+Foreuse
--- a/PKHeX.Core/Resources/text/fr/text_dppt_ugtreasures_fr.txt
+++ b/PKHeX.Core/Resources/text/fr/text_dppt_ugtreasures_fr.txt
@ -0,0 +1,60 @@
+(Aucun)
+
+
+
+
+
+
+
+
+
+
+Pierre Ovale
+Clé de Voûte
+Pierresoleil
+Morc. Etoile
+Pierre Lune
+Pierre Dure
+Pierrefoudre
+Pierre Stase
+Pierre Feu
+Pierre Eau
+Pierreplante
+Pépite
+Nautile
+Fossile Dôme
+Foss. Griffe
+Foss. Racine
+Vieil Ambre
+Os Rare
+Rappel
+Rappel Max
+Tesson Rouge
+Tesson Bleu
+Tesson Jaune
+Tesson Vert
+Ecaillecoeur
+Foss. Armure
+Foss. Crâne
+Lumargile
+Balle Fer
+Roche Glace
+Roche Lisse
+Roche Chaude
+Roche Humide
+Plaque Flam
+Plaque Hydro
+Plaque Volt
+Plaque Herbe
+Plaque Glace
+Plaque Poing
+Plaque Toxic
+Plaque Terre
+Plaque Ciel
+Plaquesprit
+Plaquinsect
+Plaque Roc
+Plaque Fantô
+Plaque Draco
+Plaque Ombre
+Plaque Fer
--- a/PKHeX.Core/Resources/text/it/text_dppt_uggoods_it.txt
+++ b/PKHeX.Core/Resources/text/it/text_dppt_uggoods_it.txt
@ -0,0 +1,139 @@
+(Niente)
+
+
+
+
+
+
+Cuscino Giallo
+Cuscino Blu
+Sedia di Legno
+Tavolo Grande
+Tavolo Comune
+Tavolino
+Tavolo Lungo
+Tavolo Largo
+Poké Tavolo
+Libreria Grande
+Minilibreria
+Archivio
+Scaff. Attrezzi
+Scaffale Market
+Vetrinetta
+Credenza
+Comò di Legno
+Comò Rosa
+TV
+Frigorifero
+Bel Lavello
+Letto di Piume
+Cestino
+Scatolone
+Cassa
+Contenitore
+Bidone
+Set di Bidoni
+Set di Travi
+Pianta nel Vaso
+Poké Fiore
+Pokénergetica
+Macc. Ricerca
+Macchina Test
+Console
+Distributore
+Bici Rossa
+Bici Verde
+Binocolo
+Mappamondo
+Statua Palestra
+Tenda Rossa
+Tenda Blu
+Tenda Chiara
+Dedaloblocco 1
+Dedaloblocco 2
+Dedaloblocco 3
+Dedaloblocco 4
+Dedaloblocco 5
+Bucaingegno
+Abissoingegno
+Fumoingegno
+Smogingegno
+Massoingegno
+Franaingegno
+Bollaingegno
+Spumaingegno
+Chiamoingegno 1
+Chiamoingegno 2
+Chiamoingegno 3
+Chiamoingegno 4
+Fogliaingegno
+Fioreingegno
+Fuocoingegno
+Fiammaingegno
+Coppa Grazia
+Coppa Classe
+Coppa Bellezza
+Coppa Grinta
+Coppa Acume
+Cristallo Blu
+Cristallo Rosa
+Cristallo Rosso
+Cristal. Giallo
+Gemma Graziosa
+Gemma Brillante
+Gemma Mistica
+Gemma Lucente
+Trof. di Bronzo
+Trof. d’Argento
+Trofeo d’Oro
+Gran Trofeo
+Ornamento Ball
+Ornamento Tondo
+Ornamen. Chiaro
+Bamb.CHARMANDER
+Bamb. BULBASAUR
+Bamb. SQUIRTLE
+Bamb. CYNDAQUIL
+Bamb. CHIKORITA
+Bamb. TOTODILE
+Bambola TORCHIC
+Bambola TREECKO
+Bambola MUDKIP
+Bamb. CHIMCHAR
+Bambola TURTWIG
+Bambola PIPLUP
+Bambola PIKACHU
+Bambola PLUSLE
+Bambola MINUN
+Bamb. CLEFAIRY
+Bamb.JIGGLYPUFF
+Bamb. WOBBUFFET
+Bamb. MEOWTH
+Bambola SKITTY
+Bambola GLAMEOW
+Bambola BUNEARY
+Bambola WEAVILE
+Bamb. MUNCHLAX
+Bambola BONSLY
+Bamb. MIME JR.
+Bambola LUCARIO
+Bambola MANTYKE
+Bambola BUIZEL
+Bambola CHATOT
+Bambola MANAPHY
+Bambola SNORLAX
+Bambola WAILORD
+Bamb. MAGNEZONE
+Bamb. DRIFLOON
+Bambola HAPPINY
+Bamb. PACHIRISU
+
+
+
+
+Sofà Grande
+Bonsai
+Fiori Graziosi
+Fiori Stupendi
+Bei Fiori
+Fiori Magnifici
--- a/PKHeX.Core/Resources/text/it/text_dppt_ugspheres_it.txt
+++ b/PKHeX.Core/Resources/text/it/text_dppt_ugspheres_it.txt
@ -0,0 +1,11 @@
+(Niente)
+Bilia Prisma (P)
+Bilia Tersa (P)
+Bilia Rossa (P)
+Bilia Blu (P)
+Bilia Verde (P)
+Bilia Prisma (G)
+Bilia Tersa (G)
+Bilia Rossa (G)
+Bilia Blu (G)
+Bilia Verde (G)
--- a/PKHeX.Core/Resources/text/it/text_dppt_ugtraps_it.txt
+++ b/PKHeX.Core/Resources/text/it/text_dppt_ugtraps_it.txt
@ -0,0 +1,34 @@
+(Niente)
+Trappovai ↑
+Trappovai →
+Trappovai ↓
+Trappovai ←
+Trappolancio ↑
+Trappolancio →
+Trappolancio ↓
+Trappolancio ←
+Trappotele
+Trappotele Mega
+Trappobuca
+Trappoabisso
+Trappopposto
+Trappocaos
+Trappocorsa
+Trapposfumo
+Trappolento
+Trappofumo
+Trapposmog
+Trappomasso
+Trappofrana
+Trappobolla
+Trappospuma
+Trappochiamo 1
+Trappochiamo 2
+Trappochiamo 3
+Trappochiamo 4
+Trappofoglia
+Trappofiore
+Trappofuoco
+Trappofiamma
+Trapporadar
+Trivella
--- a/PKHeX.Core/Resources/text/it/text_dppt_ugtreasures_it.txt
+++ b/PKHeX.Core/Resources/text/it/text_dppt_ugtreasures_it.txt
@ -0,0 +1,60 @@
+(Niente)
+
+
+
+
+
+
+
+
+
+
+Pietraovale
+Roccianima
+Pietrasolare
+Pezzo Stella
+Pietralunare
+Pietradura
+Pietratuono
+Pietrastante
+Pietrafocaia
+Pietraidrica
+Pietrafoglia
+Pepita
+Helixfossile
+Domofossile
+Fossilunghia
+Radifossile
+Ambra Antica
+Osso Raro
+Revitaliz.
+Revital. Max
+Coccio Rosso
+Coccio Blu
+Coccio Gial.
+Coccio Verde
+Squama Cuore
+Fossilscudo
+Fossilcranio
+Creta Luce
+Ferropalla
+Rocciafredda
+Roccialiscia
+Rocciacalda
+Rocciaumida
+Lastrarogo
+Lastraidro
+Lastrasaetta
+Lastraprato
+Lastragelo
+Lastrapugno
+Lastrafiele
+Lastrageo
+Lastracielo
+Lastramente
+Lastrabaco
+Lastrapietra
+Lastratetra
+Lastradrakon
+Lastratimore
+Lastraferro
--- a/PKHeX.Core/Resources/text/ja/text_dppt_uggoods_ja.txt
+++ b/PKHeX.Core/Resources/text/ja/text_dppt_uggoods_ja.txt
@ -0,0 +1,139 @@
+(なし)
+
+
+
+
+
+
+きいろクッション
+あおクッション
+きのイス
+おおきなテ－ブル
+ふつうのテ－ブル
+ちいさいテ－ブル
+たてながテ－ブル
+よこながテ－ブル
+ポケセンテ－ブル
+おおきいほんだな
+ちいさいほんだな
+けんきゅうだな
+じてんしゃだな
+ショップだな
+しょうひんだな
+しょっきだな
+きのタンス
+ピンクのタンス
+おおきなテレビ
+れいぞうこ
+きれいなシンク
+ふかふかベッド
+ごみばこ
+ダンボ－ル
+きばこ
+コンテナ
+ドラムかん
+おおいドラムかん
+てっきん
+うえき
+ポケセンフラワ－
+かいふくマシン
+けんきゅうマシン
+じっけんマシン
+ゲ－ムき
+じどうはんばいき
+あかいじてんしゃ
+みどりじてんしゃ
+そうがんきょう
+ちきゅうぎ
+ジムのせきぞう
+あかいテント
+あおいテント
+とうめいテント
+めいろブロック１
+めいろブロック２
+めいろブロック３
+めいろブロック４
+めいろブロック５
+あなそうち
+おおあなそうち
+けむりそうち
+えんまくそうち
+いわそうち
+らくせきそうち
+あわそうち
+バブルそうち
+あいずそうち１
+あいずそうち２
+あいずそうち３
+あいずそうち４
+このはそうち
+はなびらそうち
+ひのこそうち
+ほのおそうち
+かわいいカップ
+かっこいいカップ
+うつくしいカップ
+たくましいカップ
+かしこいカップ
+あおいすいしょう
+ピンクすいしょう
+あかいすいしょう
+きいろすいしょう
+きれいなほうせき
+かがやくほうせき
+しんぴのほうせき
+きらめくほうせき
+どうのトロフィ
+ぎんのトロフィ
+きんのトロフィ
+すごいトロフィ
+ボ－ルのオブジェ
+まんまるオブジェ
+とうめいオブジェ
+ヒトカゲド－ル
+フシギダネド－ル
+ゼニガメド－ル
+ヒノアラシド－ル
+チコリ－タド－ル
+ワニノコド－ル
+アチャモド－ル
+キモリド－ル
+ミズゴロウド－ル
+ヒコザルド－ル
+ナエトルド－ル
+ポッチャマド－ル
+ピカチュウド－ル
+プラスルド－ル
+マイナンド－ル
+ピッピド－ル
+プリンド－ル
+ソ－ナンスド－ル
+ニャ－スド－ル
+エネコド－ル
+ニャルマ－ド－ル
+ミミロルド－ル
+マニュ－ラド－ル
+ゴンベド－ル
+ウソハチド－ル
+マネネド－ル
+ルカリオド－ル
+タマンタド－ル
+ブイゼルド－ル
+ペラップド－ル
+マナフィド－ル
+カビゴンド－ル
+ホエルオ－ド－ル
+ジバコイルド－ル
+フワンテド－ル
+ピンプクド－ル
+パチリスド－ル
+
+
+
+
+よこながソファ
+ぼんさい
+きれいなはな
+うつくしいはな
+かわいいはな
+ごうかなはな
--- a/PKHeX.Core/Resources/text/ja/text_dppt_ugspheres_ja.txt
+++ b/PKHeX.Core/Resources/text/ja/text_dppt_ugspheres_ja.txt
@ -0,0 +1,11 @@
+(なし)
+こんごうダマ (小)
+しらタマ (小)
+べにタマ (小)
+あおタマ (小)
+みどりタマ (小)
+こんごうダマ (大)
+しらタマ (大)
+べにタマ (大)
+あおタマ (大)
+みどりタマ (大)
--- a/PKHeX.Core/Resources/text/ja/text_dppt_ugtraps_ja.txt
+++ b/PKHeX.Core/Resources/text/ja/text_dppt_ugtraps_ja.txt
@ -0,0 +1,34 @@
+(なし)
+いどうトラップ↑
+いどうトラップ→
+いどうトラップ↓
+いどうトラップ←
+とばしトラップ↑
+とばしトラップ→
+とばしトラップ↓
+とばしトラップ←
+ワ－プトラップ
+テレポ－トトラップ
+あなトラップ
+おおあなトラップ
+はんてんトラップ
+こんらんトラップ
+はしりトラップ
+きえるトラップ
+おそいトラップ
+けむりトラップ
+えんまくトラップ
+いわトラップ
+らくせきトラップ
+あわトラップ
+バブルトラップ
+あいずトラップ１
+あいずトラップ２
+あいずトラップ３
+あいずトラップ４
+このはトラップ
+はなびらトラップ
+ひのこトラップ
+ほのおトラップ
+レ－ダ－トラップ
+あなほりドリル
--- a/PKHeX.Core/Resources/text/ja/text_dppt_ugtreasures_ja.txt
+++ b/PKHeX.Core/Resources/text/ja/text_dppt_ugtreasures_ja.txt
@ -0,0 +1,60 @@
+(なし)
+
+
+
+
+
+
+
+
+
+
+まんまるいし
+かなめいし
+たいようのいし
+ほしのかけら
+つきのいし
+かたいいし
+かみなりのいし
+かわらずのいし
+ほのおのいし
+みずのいし
+リ－フのいし
+きんのたま
+かいのカセキ
+こうらのカセキ
+ツメのカセキ
+ねっこのカセキ
+ひみつのコハク
+きちょうなホネ
+げんきのかけら
+げんきのかたまり
+あかいかけら
+あおいかけら
+きいろいかけら
+みどりのかけら
+ハ－トのウロコ
+たてのカセキ
+ずがいのカセキ
+ひかりのねんど
+くろいてっきゅう
+つめたいいわ
+さらさらいわ
+あついいわ
+しめったいわ
+ひのたまプレ－ト
+しずくプレ－ト
+いかずちプレ－ト
+みどりのプレ－ト
+つららのプレ－ト
+こぶしのプレ－ト
+もうどくプレ－ト
+だいちのプレ－ト
+あおぞらプレ－ト
+ふしぎのプレ－ト
+たまむしプレ－ト
+がんせきプレ－ト
+もののけプレ－ト
+りゅうのプレ－ト
+こわもてプレ－ト
+こうてつプレ－ト
--- a/PKHeX.Core/Resources/text/ko/text_dppt_uggoods_ko.txt
+++ b/PKHeX.Core/Resources/text/ko/text_dppt_uggoods_ko.txt
@ -0,0 +1,139 @@
+(없음)
+
+
+
+
+
+
+노랑쿠션
+파랑쿠션
+나무의자
+큰 테이블
+보통테이블
+작은 테이블
+긴 테이블A
+긴 테이블B
+포켓센테이블
+큰 책장
+작은 책장
+연구선반
+자전거선반
+숍선반
+상품선반
+식기선반
+나무옷장
+핑크옷장
+큰 TV
+냉장고
+아름다운 싱크대
+푹신푹신침대
+쓰레기통
+골판지상자
+나무상자
+컨테이너
+드럼통
+큰 드럼통
+철근
+화분
+포켓센플라워
+회복머신
+연구머신
+실험머신
+게임기
+자동판매기
+빨갖자전거
+초록자전거
+쌍안경
+지구본
+체육관석상
+빨갖텐트
+파랑텐트
+투명텐트
+미로블록1
+미로블록2
+미로블록3
+미로블록4
+미로블록5
+함정장치
+큰 함정장치
+연기장치
+연막장치
+바위장치
+낙석장치
+거품장치
+버블장치
+신호장치1
+신호장치2
+신호장치3
+신호장치4
+나뭇잎장치
+꽃잎장치
+불꽃세례장치
+불꽃장치
+귀여운 컵
+근사한 컵
+아름다운 컵
+갖인한 컵
+슬기로운 컵
+파랑수정
+분홍수정
+빨갖수정
+노랑수정
+아름다운 보석
+빛나는 보석
+신비의 보석
+반짝반짝보석
+동트로피
+은트로피
+금트로피
+대단한 트로피
+볼오브제
+동글동글오브제
+투명오브제
+파이리인형
+이상해씨인형
+꼬부기인형
+브케인인형
+치코리타인형
+리아코인형
+아차모인형
+나무지기인형
+물짱이인형
+불꽃숭이인형
+모부기인형
+팽도리인형
+피카츄인형
+플러시인형
+마이농인형
+삐삐인형
+푸린인형
+마자용인형
+나옹인형
+에나비인형
+나옹마인형
+이어롤인형
+포푸니라인형
+먹고자인형
+꼬지지인형
+흉내내인형
+루카리오인형
+타만타인형
+브이젤인형
+페라페인형
+마나피인형
+잠만보인형
+고래왕인형
+자포코일인형
+흔들풍손인형
+핑복인형
+파치리스인형
+
+
+
+
+긴 소파
+분재
+예쁜 꽃
+아름다운 꽃
+귀여운 꽃
+호화로운 꽃
--- a/PKHeX.Core/Resources/text/ko/text_dppt_ugspheres_ko.txt
+++ b/PKHeX.Core/Resources/text/ko/text_dppt_ugspheres_ko.txt
@ -0,0 +1,11 @@
+(없음)
+금갖구슬 (작은)
+하양구슬 (작은)
+빨갖구슬 (작은)
+파랑구슬 (작은)
+초록구슬 (작은)
+금갖구슬 (큰)
+하양구슬 (큰)
+빨갖구슬 (큰)
+파랑구슬 (큰)
+초록구슬 (큰)
--- a/PKHeX.Core/Resources/text/ko/text_dppt_ugtraps_ko.txt
+++ b/PKHeX.Core/Resources/text/ko/text_dppt_ugtraps_ko.txt
@ -0,0 +1,34 @@
+(없음)
+이동트랩↑
+이동트랩→
+이동트랩↓
+이동트랩←
+날리기트랩↑
+날리기트랩→
+날리기트랩↓
+날리기트랩←
+워프트랩
+순갇이동트랩
+구멍트랩
+큰구멍트랩
+반전트랩
+혼란트랩
+달리기트랩
+사라지기트랩
+느려짐트랩
+연기트랩
+연막트랩
+바위트랩
+낙석트랩
+거품트랩
+버블트랩
+신호트랩1
+신호트랩2
+신호트랩3
+신호트랩4
+나뭇잎트랩
+꽃잎트랩
+불티트랩
+불꽃트랩
+레이더트랩
+구멍파기드릴
--- a/PKHeX.Core/Resources/text/ko/text_dppt_ugtreasures_ko.txt
+++ b/PKHeX.Core/Resources/text/ko/text_dppt_ugtreasures_ko.txt
@ -0,0 +1,60 @@
+(없음)
+
+
+
+
+
+
+
+
+
+
+동글동글돌
+쐐기돌
+태양의돌
+별의조간
+달의돌
+딱딱한돌
+천둥의돌
+변함없는돌
+불꽃의돌
+물의돌
+리프의돌
+금구슬
+조개화석
+껍질화석
+발톱화석
+뿌리화석
+비밀의호박
+귀중한뼈
+기력의조간
+기력의덩어리
+빨갖조간
+파랑조간
+노랑조간
+초록조간
+하트비늘
+방패의화석
+두개의화석
+빛의점토
+검은철구
+차각운바위
+보송보송바위
+뜨거운바위
+축축한바위
+불구슬플레이트
+물방울플레이트
+우뢰플레이트
+초록플레이트
+고드름플레이트
+주먹플레이트
+맹독플레이트
+대지플레이트
+푸른하늘플레이트
+이상한플레이트
+비단벌레플레이트
+암석플레이트
+원령플레이트
+용의플레이트
+공포플레이트
+갖철플레이트
--- a/PKHeX.Core/Saves/SAV4DP.cs
+++ b/PKHeX.Core/Saves/SAV4DP.cs
@ -38,6 +38,7 @@ namespace PKHeX.Core
            OFS_HONEY = 0x72E4;

            OFS_UG_Stats = 0x3A2C;
+            OFS_UG_Items = 0x42B0;

            PoketchStart = 0x114C;
            Seal = 0x6178;
--- a/PKHeX.Core/Saves/SAV4Pt.cs
+++ b/PKHeX.Core/Saves/SAV4Pt.cs
@ -37,6 +37,7 @@ namespace PKHeX.Core
            OFS_HONEY = 0x7F38;

            OFS_UG_Stats = 0x3CB4;
+            OFS_UG_Items = 0x4538;

            PoketchStart = 0x1160;

--- a/PKHeX.Core/Saves/SAV4Sinnoh.cs
+++ b/PKHeX.Core/Saves/SAV4Sinnoh.cs
@ -153,6 +153,7 @@ namespace PKHeX.Core

        public int OFS_PoffinCase { get; protected set; }

+        #region Underground
        //Underground Scores
        protected int OFS_UG_Stats;
        public uint UG_PlayersMet { get => BitConverter.ToUInt32(General, OFS_UG_Stats); set => SetData(General, BitConverter.GetBytes(value), OFS_UG_Stats); }
@ -162,6 +163,36 @@ namespace PKHeX.Core
        public uint UG_TrapsAvoided { get => BitConverter.ToUInt32(General, OFS_UG_Stats + 0x18); set => SetData(General, BitConverter.GetBytes(value), OFS_UG_Stats + 0x18); }
        public uint UG_TrapsTriggered { get => BitConverter.ToUInt32(General, OFS_UG_Stats + 0x1C); set => SetData(General, BitConverter.GetBytes(value), OFS_UG_Stats + 0x1C); }
        public uint UG_Flags { get => BitConverter.ToUInt32(General, OFS_UG_Stats + 0x34); set => SetData(General, BitConverter.GetBytes(value), OFS_UG_Stats + 0x34); }
+
+        //Underground Items
+        protected int OFS_UG_Items;
+
+        public const int UG_POUCH_SIZE = 0x28; // 40 for each of the inventory pouches
+        public byte[] UGI_Traps
+        {
+            get => General.Slice(OFS_UG_Items, UG_POUCH_SIZE);
+            set => SetData(General, value, OFS_UG_Items);
+        }
+
+        public byte[] UGI_Goods
+        {
+            get => General.Slice(OFS_UG_Items + 0x28, UG_POUCH_SIZE);
+            set => SetData(General, value, OFS_UG_Items + 0x28);
+        }
+
+        public byte[] UGI_Treasures
+        {
+            get => General.Slice(OFS_UG_Items + 0x50, UG_POUCH_SIZE);
+            set => SetData(General, value, OFS_UG_Items + 0x50);
+        }
+
+        public byte[] UGI_Spheres
+        {
+            get => General.Slice(OFS_UG_Items + 0x78, UG_POUCH_SIZE * 2); // first 40 are the sphere type, last 40 are the sphere sizes
+            set => SetData(General, value, OFS_UG_Items + 0x78);
+        }
+        #endregion
+
    }

    public enum PoketchColor
--- a/PKHeX.WinForms/Resources/text/lang_de.txt
+++ b/PKHeX.WinForms/Resources/text/lang_de.txt
@ -50,7 +50,7 @@ SAV_Trainer=Trainer Data Editor
 SAV_Trainer7=Trainer Data Editor
 SAV_Trainer7GG=Trainer Data Editor
 SAV_Trainer8=Trainer Data Editor
-SAV_Underground=Underground Scores Editor
+SAV_Underground=Underground Editor
 SAV_Wondercard=Mystery Gift I/O
 SAV_ZygardeCell=Cells/Sticker Editor
 SettingsEditor=Settings
--- a/PKHeX.WinForms/Resources/text/lang_en.txt
+++ b/PKHeX.WinForms/Resources/text/lang_en.txt
@ -50,7 +50,7 @@ SAV_Trainer=Trainer Data Editor
 SAV_Trainer7=Trainer Data Editor
 SAV_Trainer7GG=Trainer Data Editor
 SAV_Trainer8=Trainer Data Editor
-SAV_Underground=Underground Scores Editor
+SAV_Underground=Underground Editor
 SAV_Wondercard=Mystery Gift I/O
 SAV_ZygardeCell=Cells/Sticker Editor
 SettingsEditor=Settings
--- a/PKHeX.WinForms/Resources/text/lang_es.txt
+++ b/PKHeX.WinForms/Resources/text/lang_es.txt
@ -50,7 +50,7 @@ SAV_Trainer=Editor de datos del Entrenador
 SAV_Trainer7=Editor de datos del Entrenador
 SAV_Trainer7GG=Editor de datos del Entrenador
 SAV_Trainer8=Editor de datos del Entrenador
-SAV_Underground=Editor de puntuación del Subsuelo
+SAV_Underground=Editor del Subsuelo
 SAV_Wondercard=Editor de Tarjetas Misteriosas
 SAV_ZygardeCell=Editor de Células/Stickers
 SettingsEditor=Configuración
--- a/PKHeX.WinForms/Resources/text/lang_fr.txt
+++ b/PKHeX.WinForms/Resources/text/lang_fr.txt
@ -50,7 +50,7 @@ SAV_Trainer=Trainer Data Editor
 SAV_Trainer7=Trainer Data Editor
 SAV_Trainer7GG=Trainer Data Editor
 SAV_Trainer8=Trainer Data Editor
-SAV_Underground=Underground Scores Editor
+SAV_Underground=Underground Editor
 SAV_Wondercard=Mystery Gift I/O
 SAV_ZygardeCell=Cells/Sticker Editor
 SettingsEditor=Paramètres
--- a/PKHeX.WinForms/Resources/text/lang_it.txt
+++ b/PKHeX.WinForms/Resources/text/lang_it.txt
@ -50,7 +50,7 @@ SAV_Trainer=Trainer Data Editor
 SAV_Trainer7=Trainer Data Editor
 SAV_Trainer7GG=Trainer Data Editor
 SAV_Trainer8=Trainer Data Editor
-SAV_Underground=Underground Scores Editor
+SAV_Underground=Underground Editor
 SAV_Wondercard=Mystery Gift I/O
 SAV_ZygardeCell=Cells/Sticker Editor
 SettingsEditor=Settings
--- a/Editors/Gen4/SAV_Underground.Designer.cs
+++ b/Editors/Gen4/SAV_Underground.Designer.cs
@ -28,6 +28,7 @@
        /// </summary>
        private void InitializeComponent()
        {
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
            this.B_Save = new System.Windows.Forms.Button();
            this.B_Cancel = new System.Windows.Forms.Button();
            this.LU_PlayersMet = new System.Windows.Forms.Label();
@ -44,6 +45,21 @@
            this.U_TrapsT = new System.Windows.Forms.NumericUpDown();
            this.LU_Flags = new System.Windows.Forms.Label();
            this.U_Flags = new System.Windows.Forms.NumericUpDown();
+            this.GB_UScores = new System.Windows.Forms.GroupBox();
+            this.TC_UGItems = new System.Windows.Forms.TabControl();
+            this.TB_UGGoods = new System.Windows.Forms.TabPage();
+            this.DGV_UGGoods = new System.Windows.Forms.DataGridView();
+            this.Item_Goods = new System.Windows.Forms.DataGridViewComboBoxColumn();
+            this.TB_UGSpheres = new System.Windows.Forms.TabPage();
+            this.DGV_UGSpheres = new System.Windows.Forms.DataGridView();
+            this.Item_Spheres = new System.Windows.Forms.DataGridViewComboBoxColumn();
+            this.Size_Spheres = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.TB_UGTraps = new System.Windows.Forms.TabPage();
+            this.DGV_UGTraps = new System.Windows.Forms.DataGridView();
+            this.Item_Traps = new System.Windows.Forms.DataGridViewComboBoxColumn();
+            this.TB_UGTreasures = new System.Windows.Forms.TabPage();
+            this.DGV_UGTreasures = new System.Windows.Forms.DataGridView();
+            this.Item_Treasures = new System.Windows.Forms.DataGridViewComboBoxColumn();
            ((System.ComponentModel.ISupportInitialize)(this.U_PlayersMet)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.U_Gifts)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.U_Spheres)).BeginInit();
@ -51,12 +67,22 @@
            ((System.ComponentModel.ISupportInitialize)(this.U_TrapsA)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.U_TrapsT)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.U_Flags)).BeginInit();
+            this.GB_UScores.SuspendLayout();
+            this.TC_UGItems.SuspendLayout();
+            this.TB_UGGoods.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.DGV_UGGoods)).BeginInit();
+            this.TB_UGSpheres.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.DGV_UGSpheres)).BeginInit();
+            this.TB_UGTraps.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.DGV_UGTraps)).BeginInit();
+            this.TB_UGTreasures.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.DGV_UGTreasures)).BeginInit();
            this.SuspendLayout();
            // 
            // B_Save
            // 
            this.B_Save.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.B_Save.Location = new System.Drawing.Point(269, 223);
+            this.B_Save.Location = new System.Drawing.Point(472, 248);
            this.B_Save.Margin = new System.Windows.Forms.Padding(4);
            this.B_Save.Name = "B_Save";
            this.B_Save.Size = new System.Drawing.Size(100, 28);
@ -68,7 +94,7 @@
            // B_Cancel
            // 
            this.B_Cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.B_Cancel.Location = new System.Drawing.Point(161, 223);
+            this.B_Cancel.Location = new System.Drawing.Point(364, 248);
            this.B_Cancel.Margin = new System.Windows.Forms.Padding(4);
            this.B_Cancel.Name = "B_Cancel";
            this.B_Cancel.Size = new System.Drawing.Size(100, 28);
@ -79,16 +105,16 @@
            // 
            // LU_PlayersMet
            // 
-            this.LU_PlayersMet.Location = new System.Drawing.Point(12, 17);
+            this.LU_PlayersMet.Location = new System.Drawing.Point(10, 24);
            this.LU_PlayersMet.Name = "LU_PlayersMet";
-            this.LU_PlayersMet.Size = new System.Drawing.Size(161, 22);
+            this.LU_PlayersMet.Size = new System.Drawing.Size(142, 22);
            this.LU_PlayersMet.TabIndex = 3;
            this.LU_PlayersMet.Text = "Players Met";
            this.LU_PlayersMet.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
            // 
            // U_PlayersMet
            // 
-            this.U_PlayersMet.Location = new System.Drawing.Point(179, 17);
+            this.U_PlayersMet.Location = new System.Drawing.Point(158, 24);
            this.U_PlayersMet.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
            this.U_PlayersMet.Maximum = new decimal(new int[] {
            999999,
@ -101,16 +127,16 @@
            // 
            // LU_Gifts
            // 
-            this.LU_Gifts.Location = new System.Drawing.Point(12, 45);
+            this.LU_Gifts.Location = new System.Drawing.Point(10, 52);
            this.LU_Gifts.Name = "LU_Gifts";
-            this.LU_Gifts.Size = new System.Drawing.Size(161, 22);
+            this.LU_Gifts.Size = new System.Drawing.Size(142, 22);
            this.LU_Gifts.TabIndex = 5;
            this.LU_Gifts.Text = "Gifts Given";
            this.LU_Gifts.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
            // 
            // U_Gifts
            // 
-            this.U_Gifts.Location = new System.Drawing.Point(179, 45);
+            this.U_Gifts.Location = new System.Drawing.Point(158, 52);
            this.U_Gifts.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
            this.U_Gifts.Maximum = new decimal(new int[] {
            999999,
@ -123,16 +149,16 @@
            // 
            // LU_Spheres
            // 
-            this.LU_Spheres.Location = new System.Drawing.Point(12, 73);
+            this.LU_Spheres.Location = new System.Drawing.Point(10, 80);
            this.LU_Spheres.Name = "LU_Spheres";
-            this.LU_Spheres.Size = new System.Drawing.Size(161, 22);
+            this.LU_Spheres.Size = new System.Drawing.Size(142, 22);
            this.LU_Spheres.TabIndex = 7;
            this.LU_Spheres.Text = "Spheres Obtained";
            this.LU_Spheres.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
            // 
            // U_Spheres
            // 
-            this.U_Spheres.Location = new System.Drawing.Point(179, 73);
+            this.U_Spheres.Location = new System.Drawing.Point(158, 80);
            this.U_Spheres.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
            this.U_Spheres.Maximum = new decimal(new int[] {
            999999,
@ -145,16 +171,16 @@
            // 
            // LU_Fossils
            // 
-            this.LU_Fossils.Location = new System.Drawing.Point(12, 101);
+            this.LU_Fossils.Location = new System.Drawing.Point(10, 108);
            this.LU_Fossils.Name = "LU_Fossils";
-            this.LU_Fossils.Size = new System.Drawing.Size(161, 22);
+            this.LU_Fossils.Size = new System.Drawing.Size(142, 22);
            this.LU_Fossils.TabIndex = 9;
            this.LU_Fossils.Text = "Fossils Obtained";
            this.LU_Fossils.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
            // 
            // U_Fossils
            // 
-            this.U_Fossils.Location = new System.Drawing.Point(179, 101);
+            this.U_Fossils.Location = new System.Drawing.Point(158, 108);
            this.U_Fossils.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
            this.U_Fossils.Maximum = new decimal(new int[] {
            999999,
@ -167,16 +193,16 @@
            // 
            // LU_TrapsA
            // 
-            this.LU_TrapsA.Location = new System.Drawing.Point(12, 129);
+            this.LU_TrapsA.Location = new System.Drawing.Point(10, 136);
            this.LU_TrapsA.Name = "LU_TrapsA";
-            this.LU_TrapsA.Size = new System.Drawing.Size(161, 22);
+            this.LU_TrapsA.Size = new System.Drawing.Size(142, 22);
            this.LU_TrapsA.TabIndex = 11;
            this.LU_TrapsA.Text = "Traps Avoided";
            this.LU_TrapsA.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
            // 
            // U_TrapsA
            // 
-            this.U_TrapsA.Location = new System.Drawing.Point(179, 129);
+            this.U_TrapsA.Location = new System.Drawing.Point(158, 136);
            this.U_TrapsA.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
            this.U_TrapsA.Maximum = new decimal(new int[] {
            999999,
@ -189,16 +215,16 @@
            // 
            // LU_TrapsT
            // 
-            this.LU_TrapsT.Location = new System.Drawing.Point(12, 157);
+            this.LU_TrapsT.Location = new System.Drawing.Point(10, 164);
            this.LU_TrapsT.Name = "LU_TrapsT";
-            this.LU_TrapsT.Size = new System.Drawing.Size(161, 22);
+            this.LU_TrapsT.Size = new System.Drawing.Size(142, 22);
            this.LU_TrapsT.TabIndex = 13;
            this.LU_TrapsT.Text = "Traps Triggered";
            this.LU_TrapsT.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
            // 
            // U_TrapsT
            // 
-            this.U_TrapsT.Location = new System.Drawing.Point(179, 157);
+            this.U_TrapsT.Location = new System.Drawing.Point(158, 164);
            this.U_TrapsT.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
            this.U_TrapsT.Maximum = new decimal(new int[] {
            999999,
@ -211,16 +237,16 @@
            // 
            // LU_Flags
            // 
-            this.LU_Flags.Location = new System.Drawing.Point(12, 184);
+            this.LU_Flags.Location = new System.Drawing.Point(10, 191);
            this.LU_Flags.Name = "LU_Flags";
-            this.LU_Flags.Size = new System.Drawing.Size(161, 22);
+            this.LU_Flags.Size = new System.Drawing.Size(142, 22);
            this.LU_Flags.TabIndex = 15;
            this.LU_Flags.Text = "Flags Captured";
            this.LU_Flags.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
            // 
            // U_Flags
            // 
-            this.U_Flags.Location = new System.Drawing.Point(179, 184);
+            this.U_Flags.Location = new System.Drawing.Point(158, 191);
            this.U_Flags.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
            this.U_Flags.Maximum = new decimal(new int[] {
            999999,
@ -231,31 +257,254 @@
            this.U_Flags.Size = new System.Drawing.Size(95, 22);
            this.U_Flags.TabIndex = 7;
            // 
+            // GB_UScores
+            // 
+            this.GB_UScores.Controls.Add(this.U_Flags);
+            this.GB_UScores.Controls.Add(this.LU_Flags);
+            this.GB_UScores.Controls.Add(this.U_TrapsT);
+            this.GB_UScores.Controls.Add(this.LU_TrapsT);
+            this.GB_UScores.Controls.Add(this.U_TrapsA);
+            this.GB_UScores.Controls.Add(this.LU_TrapsA);
+            this.GB_UScores.Controls.Add(this.U_Fossils);
+            this.GB_UScores.Controls.Add(this.LU_Fossils);
+            this.GB_UScores.Controls.Add(this.U_Spheres);
+            this.GB_UScores.Controls.Add(this.LU_Spheres);
+            this.GB_UScores.Controls.Add(this.U_Gifts);
+            this.GB_UScores.Controls.Add(this.LU_Gifts);
+            this.GB_UScores.Controls.Add(this.U_PlayersMet);
+            this.GB_UScores.Controls.Add(this.LU_PlayersMet);
+            this.GB_UScores.Location = new System.Drawing.Point(13, 13);
+            this.GB_UScores.Name = "GB_UScores";
+            this.GB_UScores.Size = new System.Drawing.Size(264, 223);
+            this.GB_UScores.TabIndex = 27;
+            this.GB_UScores.TabStop = false;
+            this.GB_UScores.Text = "Scores";
+            // 
+            // TC_UGItems
+            // 
+            this.TC_UGItems.Controls.Add(this.TB_UGGoods);
+            this.TC_UGItems.Controls.Add(this.TB_UGSpheres);
+            this.TC_UGItems.Controls.Add(this.TB_UGTraps);
+            this.TC_UGItems.Controls.Add(this.TB_UGTreasures);
+            this.TC_UGItems.Location = new System.Drawing.Point(287, 13);
+            this.TC_UGItems.Name = "TC_UGItems";
+            this.TC_UGItems.SelectedIndex = 0;
+            this.TC_UGItems.Size = new System.Drawing.Size(284, 223);
+            this.TC_UGItems.TabIndex = 28;
+            // 
+            // TB_UGGoods
+            // 
+            this.TB_UGGoods.Controls.Add(this.DGV_UGGoods);
+            this.TB_UGGoods.Location = new System.Drawing.Point(4, 25);
+            this.TB_UGGoods.Name = "TB_UGGoods";
+            this.TB_UGGoods.Padding = new System.Windows.Forms.Padding(3);
+            this.TB_UGGoods.Size = new System.Drawing.Size(276, 194);
+            this.TB_UGGoods.TabIndex = 0;
+            this.TB_UGGoods.Text = "Goods";
+            this.TB_UGGoods.UseVisualStyleBackColor = true;
+            // 
+            // DGV_UGGoods
+            // 
+            this.DGV_UGGoods.AllowUserToAddRows = false;
+            this.DGV_UGGoods.AllowUserToDeleteRows = false;
+            this.DGV_UGGoods.AllowUserToResizeColumns = false;
+            this.DGV_UGGoods.AllowUserToResizeRows = false;
+            this.DGV_UGGoods.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None;
+            this.DGV_UGGoods.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
+            this.DGV_UGGoods.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            this.DGV_UGGoods.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.Item_Goods});
+            this.DGV_UGGoods.EditMode = System.Windows.Forms.DataGridViewEditMode.EditOnEnter;
+            this.DGV_UGGoods.Location = new System.Drawing.Point(5, 7);
+            this.DGV_UGGoods.MultiSelect = false;
+            this.DGV_UGGoods.Name = "DGV_UGGoods";
+            this.DGV_UGGoods.RowHeadersVisible = false;
+            this.DGV_UGGoods.RowHeadersWidth = 51;
+            this.DGV_UGGoods.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
+            this.DGV_UGGoods.RowTemplate.Height = 24;
+            this.DGV_UGGoods.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect;
+            this.DGV_UGGoods.ShowEditingIcon = false;
+            this.DGV_UGGoods.Size = new System.Drawing.Size(265, 180);
+            this.DGV_UGGoods.TabIndex = 0;
+            // 
+            // Item_Goods
+            // 
+            this.Item_Goods.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            this.Item_Goods.DisplayStyle = System.Windows.Forms.DataGridViewComboBoxDisplayStyle.ComboBox;
+            this.Item_Goods.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.Item_Goods.HeaderText = "Item";
+            this.Item_Goods.MinimumWidth = 6;
+            this.Item_Goods.Name = "Item_Goods";
+            this.Item_Goods.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.Item_Goods.Width = 175;
+            // 
+            // TB_UGSpheres
+            // 
+            this.TB_UGSpheres.Controls.Add(this.DGV_UGSpheres);
+            this.TB_UGSpheres.Location = new System.Drawing.Point(4, 25);
+            this.TB_UGSpheres.Name = "TB_UGSpheres";
+            this.TB_UGSpheres.Padding = new System.Windows.Forms.Padding(3);
+            this.TB_UGSpheres.Size = new System.Drawing.Size(276, 194);
+            this.TB_UGSpheres.TabIndex = 1;
+            this.TB_UGSpheres.Text = "Spheres";
+            this.TB_UGSpheres.UseVisualStyleBackColor = true;
+            // 
+            // DGV_UGSpheres
+            // 
+            this.DGV_UGSpheres.AllowUserToAddRows = false;
+            this.DGV_UGSpheres.AllowUserToDeleteRows = false;
+            this.DGV_UGSpheres.AllowUserToResizeColumns = false;
+            this.DGV_UGSpheres.AllowUserToResizeRows = false;
+            this.DGV_UGSpheres.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None;
+            this.DGV_UGSpheres.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
+            this.DGV_UGSpheres.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            this.DGV_UGSpheres.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.Item_Spheres,
+            this.Size_Spheres});
+            this.DGV_UGSpheres.EditMode = System.Windows.Forms.DataGridViewEditMode.EditOnEnter;
+            this.DGV_UGSpheres.Location = new System.Drawing.Point(5, 7);
+            this.DGV_UGSpheres.MultiSelect = false;
+            this.DGV_UGSpheres.Name = "DGV_UGSpheres";
+            this.DGV_UGSpheres.RowHeadersVisible = false;
+            this.DGV_UGSpheres.RowHeadersWidth = 51;
+            this.DGV_UGSpheres.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
+            this.DGV_UGSpheres.RowTemplate.Height = 24;
+            this.DGV_UGSpheres.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect;
+            this.DGV_UGSpheres.ShowEditingIcon = false;
+            this.DGV_UGSpheres.Size = new System.Drawing.Size(265, 180);
+            this.DGV_UGSpheres.TabIndex = 1;
+            // 
+            // Item_Spheres
+            // 
+            this.Item_Spheres.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            this.Item_Spheres.DisplayStyle = System.Windows.Forms.DataGridViewComboBoxDisplayStyle.ComboBox;
+            this.Item_Spheres.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.Item_Spheres.HeaderText = "Sphere";
+            this.Item_Spheres.MinimumWidth = 6;
+            this.Item_Spheres.Name = "Item_Spheres";
+            this.Item_Spheres.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.Item_Spheres.Width = 150;
+            // 
+            // Size_Spheres
+            // 
+            this.Size_Spheres.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.Size_Spheres.DefaultCellStyle = dataGridViewCellStyle1;
+            this.Size_Spheres.HeaderText = "Size";
+            this.Size_Spheres.MaxInputLength = 2;
+            this.Size_Spheres.MinimumWidth = 6;
+            this.Size_Spheres.Name = "Size_Spheres";
+            this.Size_Spheres.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.Size_Spheres.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.Size_Spheres.Width = 75;
+            // 
+            // TB_UGTraps
+            // 
+            this.TB_UGTraps.Controls.Add(this.DGV_UGTraps);
+            this.TB_UGTraps.Location = new System.Drawing.Point(4, 25);
+            this.TB_UGTraps.Name = "TB_UGTraps";
+            this.TB_UGTraps.Padding = new System.Windows.Forms.Padding(3);
+            this.TB_UGTraps.Size = new System.Drawing.Size(276, 194);
+            this.TB_UGTraps.TabIndex = 2;
+            this.TB_UGTraps.Text = "Traps";
+            this.TB_UGTraps.UseVisualStyleBackColor = true;
+            // 
+            // DGV_UGTraps
+            // 
+            this.DGV_UGTraps.AllowUserToAddRows = false;
+            this.DGV_UGTraps.AllowUserToDeleteRows = false;
+            this.DGV_UGTraps.AllowUserToResizeColumns = false;
+            this.DGV_UGTraps.AllowUserToResizeRows = false;
+            this.DGV_UGTraps.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None;
+            this.DGV_UGTraps.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
+            this.DGV_UGTraps.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            this.DGV_UGTraps.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.Item_Traps});
+            this.DGV_UGTraps.EditMode = System.Windows.Forms.DataGridViewEditMode.EditOnEnter;
+            this.DGV_UGTraps.Location = new System.Drawing.Point(5, 7);
+            this.DGV_UGTraps.MultiSelect = false;
+            this.DGV_UGTraps.Name = "DGV_UGTraps";
+            this.DGV_UGTraps.RowHeadersVisible = false;
+            this.DGV_UGTraps.RowHeadersWidth = 51;
+            this.DGV_UGTraps.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
+            this.DGV_UGTraps.RowTemplate.Height = 24;
+            this.DGV_UGTraps.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect;
+            this.DGV_UGTraps.ShowEditingIcon = false;
+            this.DGV_UGTraps.Size = new System.Drawing.Size(265, 180);
+            this.DGV_UGTraps.TabIndex = 1;
+            // 
+            // Item_Traps
+            // 
+            this.Item_Traps.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            this.Item_Traps.DisplayStyle = System.Windows.Forms.DataGridViewComboBoxDisplayStyle.ComboBox;
+            this.Item_Traps.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.Item_Traps.HeaderText = "Item";
+            this.Item_Traps.MinimumWidth = 6;
+            this.Item_Traps.Name = "Item_Traps";
+            this.Item_Traps.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.Item_Traps.Width = 175;
+            // 
+            // TB_UGTreasures
+            // 
+            this.TB_UGTreasures.Controls.Add(this.DGV_UGTreasures);
+            this.TB_UGTreasures.Location = new System.Drawing.Point(4, 25);
+            this.TB_UGTreasures.Name = "TB_UGTreasures";
+            this.TB_UGTreasures.Padding = new System.Windows.Forms.Padding(3);
+            this.TB_UGTreasures.Size = new System.Drawing.Size(276, 194);
+            this.TB_UGTreasures.TabIndex = 3;
+            this.TB_UGTreasures.Text = "Treasures";
+            this.TB_UGTreasures.UseVisualStyleBackColor = true;
+            // 
+            // DGV_UGTreasures
+            // 
+            this.DGV_UGTreasures.AllowUserToAddRows = false;
+            this.DGV_UGTreasures.AllowUserToDeleteRows = false;
+            this.DGV_UGTreasures.AllowUserToResizeColumns = false;
+            this.DGV_UGTreasures.AllowUserToResizeRows = false;
+            this.DGV_UGTreasures.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None;
+            this.DGV_UGTreasures.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
+            this.DGV_UGTreasures.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            this.DGV_UGTreasures.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.Item_Treasures});
+            this.DGV_UGTreasures.EditMode = System.Windows.Forms.DataGridViewEditMode.EditOnEnter;
+            this.DGV_UGTreasures.Location = new System.Drawing.Point(5, 7);
+            this.DGV_UGTreasures.MultiSelect = false;
+            this.DGV_UGTreasures.Name = "DGV_UGTreasures";
+            this.DGV_UGTreasures.RowHeadersVisible = false;
+            this.DGV_UGTreasures.RowHeadersWidth = 51;
+            this.DGV_UGTreasures.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
+            this.DGV_UGTreasures.RowTemplate.Height = 24;
+            this.DGV_UGTreasures.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect;
+            this.DGV_UGTreasures.ShowEditingIcon = false;
+            this.DGV_UGTreasures.Size = new System.Drawing.Size(265, 180);
+            this.DGV_UGTreasures.TabIndex = 1;
+            // 
+            // Item_Treasures
+            // 
+            this.Item_Treasures.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            this.Item_Treasures.DisplayStyle = System.Windows.Forms.DataGridViewComboBoxDisplayStyle.ComboBox;
+            this.Item_Treasures.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.Item_Treasures.HeaderText = "Item";
+            this.Item_Treasures.MinimumWidth = 6;
+            this.Item_Treasures.Name = "Item_Treasures";
+            this.Item_Treasures.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.Item_Treasures.Width = 175;
+            // 
            // SAV_Underground
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(379, 261);
-            this.Controls.Add(this.U_Flags);
-            this.Controls.Add(this.LU_Flags);
-            this.Controls.Add(this.U_TrapsT);
-            this.Controls.Add(this.LU_TrapsT);
-            this.Controls.Add(this.U_TrapsA);
-            this.Controls.Add(this.LU_TrapsA);
-            this.Controls.Add(this.U_Fossils);
-            this.Controls.Add(this.LU_Fossils);
-            this.Controls.Add(this.U_Spheres);
-            this.Controls.Add(this.LU_Spheres);
-            this.Controls.Add(this.U_Gifts);
-            this.Controls.Add(this.LU_Gifts);
-            this.Controls.Add(this.U_PlayersMet);
-            this.Controls.Add(this.LU_PlayersMet);
+            this.ClientSize = new System.Drawing.Size(582, 286);
+            this.Controls.Add(this.TC_UGItems);
+            this.Controls.Add(this.GB_UScores);
            this.Controls.Add(this.B_Cancel);
            this.Controls.Add(this.B_Save);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
            this.Icon = global::PKHeX.WinForms.Properties.Resources.Icon;
            this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.MaximizeBox = false;
            this.Name = "SAV_Underground";
-            this.Text = "Underground Scores Editor";
+            this.Text = "Underground Editor";
            ((System.ComponentModel.ISupportInitialize)(this.U_PlayersMet)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.U_Gifts)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.U_Spheres)).EndInit();
@ -263,6 +512,16 @@
            ((System.ComponentModel.ISupportInitialize)(this.U_TrapsA)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.U_TrapsT)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.U_Flags)).EndInit();
+            this.GB_UScores.ResumeLayout(false);
+            this.TC_UGItems.ResumeLayout(false);
+            this.TB_UGGoods.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.DGV_UGGoods)).EndInit();
+            this.TB_UGSpheres.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.DGV_UGSpheres)).EndInit();
+            this.TB_UGTraps.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.DGV_UGTraps)).EndInit();
+            this.TB_UGTreasures.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.DGV_UGTreasures)).EndInit();
            this.ResumeLayout(false);

        }
@ -284,5 +543,20 @@
        private System.Windows.Forms.NumericUpDown U_TrapsT;
        private System.Windows.Forms.Label LU_Flags;
        private System.Windows.Forms.NumericUpDown U_Flags;
+        private System.Windows.Forms.GroupBox GB_UScores;
+        private System.Windows.Forms.TabControl TC_UGItems;
+        private System.Windows.Forms.TabPage TB_UGGoods;
+        private System.Windows.Forms.TabPage TB_UGSpheres;
+        private System.Windows.Forms.TabPage TB_UGTraps;
+        private System.Windows.Forms.TabPage TB_UGTreasures;
+        private System.Windows.Forms.DataGridView DGV_UGGoods;
+        private System.Windows.Forms.DataGridView DGV_UGTraps;
+        private System.Windows.Forms.DataGridView DGV_UGTreasures;
+        private System.Windows.Forms.DataGridView DGV_UGSpheres;
+        private System.Windows.Forms.DataGridViewComboBoxColumn Item_Goods;
+        private System.Windows.Forms.DataGridViewComboBoxColumn Item_Traps;
+        private System.Windows.Forms.DataGridViewComboBoxColumn Item_Treasures;
+        private System.Windows.Forms.DataGridViewComboBoxColumn Item_Spheres;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Size_Spheres;
    }
 }
--- a/Editors/Gen4/SAV_Underground.cs
+++ b/Editors/Gen4/SAV_Underground.cs
@ -1,4 +1,5 @@
 using System;
+using System.Linq;
 using System.Windows.Forms;
 using PKHeX.Core;

@ -9,13 +10,165 @@ namespace PKHeX.WinForms
        private readonly SaveFile Origin;
        private readonly SAV4Sinnoh SAV;

+        private const int MAX_SIZE = SAV4Sinnoh.UG_POUCH_SIZE;
+        private string[] ugGoods, ugSpheres, ugTraps, ugTreasures;
+        private string[] ugGoodsSorted, ugTrapsSorted, ugTreasuresSorted;
+
        public SAV_Underground(SaveFile sav)
        {
            InitializeComponent();
            WinFormsUtil.TranslateInterface(this, Main.CurrentLanguage);
            SAV = (SAV4Sinnoh)(Origin = sav).Clone();

+            InitializeDGV();
+
            GetUGScores();
+            ReadUGData();
+        }
+
+        private void InitializeDGV()
+        {
+            ugGoods = GameInfo.Strings.uggoods;
+            ugSpheres = GameInfo.Strings.ugspheres;
+            ugTraps = GameInfo.Strings.ugtraps;
+            ugTreasures = GameInfo.Strings.ugtreasures;
+
+            // Goods
+            ugGoodsSorted = SanitizeList(ugGoods);
+            DGV_UGGoods.Rows.Add(SAV4Sinnoh.UG_POUCH_SIZE);
+
+            Item_Goods.DataSource = new BindingSource(ugGoodsSorted, null);
+            Item_Goods.DisplayIndex = 0;
+            DGV_UGGoods.CancelEdit();
+
+            // Spheres
+            DGV_UGSpheres.Rows.Add(MAX_SIZE);
+
+            Item_Spheres.DataSource = new BindingSource(ugSpheres, null);
+            Item_Spheres.DisplayIndex = 0;
+            DGV_UGSpheres.CancelEdit();
+
+            // Traps
+            ugTrapsSorted = SanitizeList(ugTraps);
+            DGV_UGTraps.Rows.Add(MAX_SIZE);
+
+            Item_Traps.DataSource = new BindingSource(ugTrapsSorted, null);
+            Item_Traps.DisplayIndex = 0;
+            DGV_UGTraps.CancelEdit();
+
+            // Treasures
+            ugTreasuresSorted = SanitizeList(ugTreasures);
+            DGV_UGTreasures.Rows.Add(MAX_SIZE);
+
+            Item_Treasures.DataSource = new BindingSource(ugTreasuresSorted, null);
+            Item_Treasures.DisplayIndex = 0;
+            DGV_UGTreasures.CancelEdit();
+        }
+
+        private void ReadUGData()
+        {
+            byte[] goodsList = SAV.UGI_Goods;
+            byte[] spheresList = SAV.UGI_Spheres;
+            byte[] trapsList = SAV.UGI_Traps;
+            byte[] treasuresList = SAV.UGI_Treasures;
+
+            // Goods
+            for (int i = 0; i < goodsList.Length; i++)
+            {
+                DGV_UGGoods.Rows[i].Cells[0].Value = ugGoods[goodsList[i]];
+            }
+
+            // Spheres (split in two, first 40 positions are the sphere type, last 40 are their size)
+            for (int i = 0; i < (spheresList.Length / 2); i++)
+            {
+                var row = DGV_UGSpheres.Rows[i];
+                row.Cells[0].Value = ugSpheres[spheresList[i]];
+                row.Cells[1].Value = spheresList[i + MAX_SIZE].ToString();
+            }
+
+            // Traps
+            for (int i = 0; i < trapsList.Length; i++)
+            {
+                DGV_UGTraps.Rows[i].Cells[0].Value = ugTraps[trapsList[i]];
+            }
+
+            // Treasures
+            for (int i = 0; i < treasuresList.Length; i++)
+            {
+                DGV_UGTreasures.Rows[i].Cells[0].Value = ugTreasures[treasuresList[i]];
+            }
+        }
+
+        private void SaveUGData()
+        {
+            byte[] goodsList = new byte[SAV.UGI_Goods.Length];
+            byte[] spheresList = new byte[SAV.UGI_Spheres.Length];
+            byte[] trapsList = new byte[SAV.UGI_Traps.Length];
+            byte[] treasuresList = new byte[SAV.UGI_Treasures.Length];
+
+            // Goods
+            int ctr = 0;
+            for (int i = 0; i < DGV_UGGoods.Rows.Count; i++)
+            {
+                var str = DGV_UGGoods.Rows[i].Cells[0].Value.ToString();
+                var itemindex = Array.IndexOf(ugGoods, str);
+
+                if (itemindex <= 0)
+                    continue; // ignore empty slot
+
+                goodsList[ctr] = (byte)itemindex;
+                ctr++;
+            }
+
+            // Spheres
+            ctr = 0;
+            for (int i = 0; i < DGV_UGSpheres.Rows.Count; i++)
+            {
+                var row = DGV_UGSpheres.Rows[i];
+                var str = row.Cells[0].Value.ToString();
+                var itemindex = Array.IndexOf(ugSpheres, str);
+
+                bool success = int.TryParse(row.Cells[1].Value?.ToString(), out var itemcnt);
+                if (!success || itemindex <= 0)
+                    continue;  // ignore empty slot or non-numeric values
+
+                spheresList[ctr] = (byte)itemindex;
+                spheresList[ctr + MAX_SIZE] = (byte)itemcnt;
+                ctr++;
+            }
+
+            // Traps
+            ctr = 0;
+            for (int i = 0; i < DGV_UGTraps.Rows.Count; i++)
+            {
+                var str = DGV_UGTraps.Rows[i].Cells[0].Value.ToString();
+                var itemindex = Array.IndexOf(ugTraps, str);
+
+                if (itemindex <= 0)
+                    continue; // ignore empty slot
+
+                trapsList[ctr] = (byte)itemindex;
+                ctr++;
+            }
+
+            // Treasures
+            ctr = 0;
+            for (int i = 0; i < DGV_UGTreasures.Rows.Count; i++)
+            {
+                var str = DGV_UGTreasures.Rows[i].Cells[0].Value.ToString();
+                var itemindex = Array.IndexOf(ugTreasures, str);
+
+                if (itemindex <= 0)
+                    continue; // ignore empty slot
+
+                treasuresList[ctr] = (byte)itemindex;
+                ctr++;
+            }
+
+            SAV.UGI_Goods = goodsList;
+            SAV.UGI_Spheres = spheresList;
+            SAV.UGI_Traps = trapsList;
+            SAV.UGI_Treasures = treasuresList;
        }

        private void GetUGScores()
@ -40,9 +193,19 @@ namespace PKHeX.WinForms
            SAV.UG_Flags = (uint)U_Flags.Value;
        }

+        private string[] SanitizeList(string[] inputlist)
+        {
+            string[] listSorted = inputlist.Where(x => !string.IsNullOrEmpty(x)).ToArray();
+            Array.Sort(listSorted);
+
+            return listSorted;
+        }
+
        private void B_Save_Click(object sender, EventArgs e)
        {
            SetUGScores();
+            SaveUGData();
+
            Origin.CopyChangesFrom(SAV);
            Close();
        }