From 7a3855a17aef9de6b092cb5c5e974db46d53331d Mon Sep 17 00:00:00 2001
From: "Mike A. Trethewey" <miketrethewey@gmail.com>
Date: Sat, 22 Feb 2020 02:43:56 -0800
Subject: [PATCH] Fix Custom Item Pool (again)

---
 CLI.py                                        | 142 +++++++++---------
 gui/bottom.py                                 |  19 +--
 .../app/gui/custom/overview/widgets.json      |   2 +-
 3 files changed, 82 insertions(+), 81 deletions(-)

diff --git a/CLI.py b/CLI.py
index c8bdab49..c01e44ca 100644
--- a/CLI.py
+++ b/CLI.py
@@ -373,77 +373,77 @@ def get_settings():
     "race": False,
     "custom": False,
     "customitemarray": [
-      0,
-      0,
-      1,
-      1,
-      1,
-      1,
-      1,
-      1,
-      1,
-      1,
-      1,
-      1,
-      1,
-      1,
-      1,
-      1,
-      1,
-      1,
-      4,
-      1,
-      1,
-      1,
-      1,
-      1,
-      0,
-      0,
-      2,
-      1,
-      1,
-      24,
-      10,
-      1,
-      0,
-      0,
-      0,
-      0,
-      4,
-      0,
-      0,
-      0,
-      3,
-      0,
-      0,
-      2,
-      1,
-      0,
-      0,
-      0,
-      0,
-      0,
-      1,
-      12,
-      0,
-      16,
-      1,
-      2,
-      4,
-      28,
-      7,
-      1,
-      5,
-      0,
-      0,
-      0,
-      0,
-      0,
-      0,
-      0,
-      0,
-      0,
-      10
+      0,  # Bow
+      2,  # Progessive Bow
+      1,  # Blue Boomerang
+      1,  # Red Boomerang
+      1,  # Hookshot
+      1,  # Mushroom
+      1,  # Magic Powder
+      1,  # Fire Rod
+      1,  # Ice Rod
+      1,  # Bombos
+      1,  # Ether
+      1,  # Quake
+      1,  # Lamp
+      1,  # Hammer
+      1,  # Shovel
+      1,  # Flute
+      1,  # Bug Net
+      1,  # Book
+      4,  # Bottle
+      1,  # Cane of Somaria
+      1,  # Cane of Byrna
+      1,  # Magic Cape
+      1,  # Magic Mirror
+      1,  # Pegasus Boots
+      0,  # Power Glove
+      0,  # Titan's Mitt
+      2,  # Progressive Glove
+      1,  # Flippers
+      1,  # Moon Pearl
+      24, # Piece of Heart
+      10, # Heart Container
+      1,  # Sanctuary Heart
+      0,  # FS
+      0,  # MS
+      0,  # TS
+      0,  # GS
+      4,  # Progressive Sword
+      0,  # Fighters' Shield
+      0,  # Fire Shield
+      0,  # Mirror Shield
+      3,  # Progressive Shield
+      0,  # Blue Mail
+      0,  # Red Mail
+      2,  # Progressive Mail
+      1,  # Half Magic
+      0,  # Quarter Magic
+      0,  # Bombs  + 5
+      0,  # Bombs  +10
+      0,  # Arrows + 5
+      0,  # Arrows +10
+      1,  # Single Arrow
+      12, # 10 Arrows
+      0,  # Single Bomb
+      16, #   3 Bombs
+      1,  #  10 Bombs
+      2,  #   1 Rupee
+      4,  #   5 Rupees
+      28, #  20 Rupees
+      7,  #  50 Rupees
+      1,  # 100 Rupees
+      5,  # 300 Rupees
+      0,  # Blue Clock
+      0,  # Green Clock
+      0,  # Red Clock
+      0,  # Silver Arrows Upgrade
+      0,  # Generic Keys
+      0,  # Triforce Pieces
+      0,  # Triforce Pieces Goal
+      0,  # Triforce (win game)
+      0,  # Rupoors
+      10  # Rupoor Cost
     ],
     "rom": os.path.join(".","Zelda no Densetsu - Kamigami no Triforce (Japan).sfc"),
     "sprite": None,
diff --git a/gui/bottom.py b/gui/bottom.py
index eafa9ebb..12a1dc51 100644
--- a/gui/bottom.py
+++ b/gui/bottom.py
@@ -179,15 +179,16 @@ def create_guiargs(parent):
       setattr(guiargs,"adjust." + internal, parent.pages["adjust"].content.widgets[adjustarg].storageVar.get())
 
     customitems = [
-      "bow", "silversupgrade", "boomerang", "redmerang", "hookshot", "mushroom", "powder", "firerod",
-      "icerod", "bombos", "ether", "quake", "lamp", "hammer", "shovel", "flute", "bugnet",
-      "book", "bottle", "somaria", "byrna", "cape", "mirror", "boots", "powerglove", "titansmitt",
-      "progressiveglove", "flippers", "pearl", "heartpiece", "heartcontainer", "sancheart", "sword1", "sword2",
-      "sword3", "sword4", "progressivesword", "shield1", "shield2", "shield3", "progressiveshield", "mail2",
-      "mail3", "progressivemail", "halfmagic", "quartermagic", "bombsplus5", "bombsplus10", "arrowsplus5", "arrowsplus10",
-      "arrow1", "arrow10", "bomb1", "bomb3", "rupee1", "rupee5", "rupee20", "rupee50", "rupee100",
-      "rupee300", "rupoor", "blueclock", "greenclock", "redclock", "progressivebow", "bomb10", "triforcepieces", "triforcepiecesgoal",
-      "triforce", "rupoorcost", "generickeys"
+      "bow",            "progressivebow",   "boomerang",  "redmerang",          "hookshot",   "mushroom",     "powder",       "firerod",
+      "icerod",         "bombos",           "ether",      "quake",              "lamp",       "hammer",       "shovel",
+      "flute",          "bugnet",           "book",       "bottle",             "somaria",    "byrna",        "cape",         "mirror",
+      "boots",          "powerglove",       "titansmitt", "progressiveglove",   "flippers",   "pearl",        "heartpiece",
+      "heartcontainer", "sancheart",        "sword1",     "sword2",             "sword3",     "sword4",       "progressivesword",
+      "shield1",        "shield2",          "shield3",    "progressiveshield",  "mail2",
+      "mail3",          "progressivemail",  "halfmagic",  "quartermagic",       "bombsplus5", "bombsplus10",  "arrowsplus5",  "arrowsplus10",
+      "arrow1",         "arrow10",          "bomb1",      "bomb3",              "bomb10",     "rupee1",       "rupee5",       "rupee20",
+      "rupee50",        "rupee100",         "rupee300",   "blueclock",          "greenclock", "redclock",     "silversupgrade", "generickeys",
+      "triforcepieces", "triforcepiecesgoal", "triforce", "rupoor", "rupoorcost"
     ]
     guiargs.customitemarray = []
     for customitem in customitems:
diff --git a/resources/app/gui/custom/overview/widgets.json b/resources/app/gui/custom/overview/widgets.json
index c57eead1..faaa9637 100644
--- a/resources/app/gui/custom/overview/widgets.json
+++ b/resources/app/gui/custom/overview/widgets.json
@@ -705,7 +705,7 @@
         "label": {
           "sticky": "w"
         },
-        "default": 13
+        "default": 16
       }
     },
     "bomb10": {