Pulled every open Gold bug (bodies, comments, screenshots/videos), matched them against the port and ../pokegold, then split them so each fixer owns a disjoint file set. Duplicates collapsed: #1164 and #1188 are the same Radio Tower stair softlock. #1150 and #1190 are the same Gold rebind freeze. Enhancements (#1161, #1130, #1112, #1100) were left out. Battle 1 src/battle/gen2/*, src/ui/gen2/BattleState.lua #1168 multi-hit always 2 #1180 DV / stats #1185 learn-move text order after a trainer fight #1152 no "Use next POKéMON?" / run after a wild faint Overworld 2 src/world/gen2/*, trade anim, hidden items #1184 Kurt blocking Slowpoke Well #1164 / #1188 Radio Tower gentleman on the stairs #1173 Rock Smash rocks walk left each visit #1172 last item name used Rock Smash #1167 Ilex Forest hidden items #1165 trade movie + ledge hop still missing (#1121 / #1126) UI 3 naming, party, mart, pokegear #1166 grey nickname screen #1162 TM/HM missing ABLE / NOT ABLE #1169 underground herb lady whites out the map #1151 Pokegear black player icon + extra A/B on the phone card Platform 4 Gold options, save slots, pack, mod tab #1150 / #1190 controls freeze #1178 no vibration row #1177 cannot move Gold touch controls #1107 SAVE with no launcher slot #1145 Gold mod tab still lists Gen 1-only mods #1192 RGXX missing tools/rom_manifest_gold.json Drivers only for the progress / data-loss ones (faint-run, multi-hit, Kurt, Radio Tower, Rock Smash shift, herb shop, save slot). No new unit tests. New comments are pokegold file.asm:line only. A verifier agent will get this same list once the four finish and check that the diffs actually fix the reports. Verifier checked the batch against pokegold. Almost everything landed. I closed the two leftovers that were still real bugs: #1185: the active mon no longer reprints GrewToLevel (engine/battle/core.asm:7044). Bench mons still print it, then the stats box, then the learn-move line. #1180: the party list recalcs stats on open, same as Summary. Gold boot now applies options.touchControls / haptics from the Gold options block, not the shared Red pad. # Verdict 1168 multi-hit FIXED 1180 DVs / stats FIXED 1185 learn-move order FIXED (was partial) 1152 run after faint FIXED 1184 Kurt FIXED 1164 / 1188 Radio Tower FIXED 1173 rocks slide FIXED 1172 Rock Smash name FIXED 1167 Ilex hidden items SKIP-OK (already in the Gold cache) 1165 trade + ledge FIXED 1166 nickname color FIXED 1162 TM ABLE / NOT ABLE FIXED 1169 herb shop white-out FIXED 1151 Pokegear FIXED 1150 / 1190 rebind freeze FIXED 1178 vibration FIXED 1177 touch layout FIXED 1107 save slot FIXED 1145 mod tab filter FIXED 1192 RGXX Gold manifest FIXED Nothing is committed. Drivers, from the repo root: POKEPORT_GAME=gold POKEPORT_TOUCH=0 POKEPORT_DRIVER=tests/drivers/multihit_bug1168_test.lua love . Fury Attack should hit 2-5 times. Always twice is still broken. POKEPORT_GAME=gold POKEPORT_TOUCH=0 POKEPORT_DRIVER=tests/drivers/use_next_mon_bug1152_test.lua love . After the lead faints: "Use next POKéMON?" YES opens the party. NO/B tries to run. POKEPORT_GAME=gold POKEPORT_TOUCH=0 POKEPORT_DRIVER=tests/drivers/kurt_well_bug1184_test.lua love . Kurt at the well entrance (16, 14), not on the inner path. POKEPORT_GAME=gold POKEPORT_TOUCH=0 POKEPORT_DRIVER=tests/drivers/radiotower_softlock_bug1164_test.lua love . Gentleman in the 5F office (3, 6). Stairs at (12, 0) clear. POKEPORT_GAME=gold POKEPORT_TOUCH=0 POKEPORT_DRIVER=tests/drivers/rocksmash_shift_bug1173_test.lua love . Route 40 rocks stay put. A slide one cell left is the old bug. POKEPORT_GAME=gold POKEPORT_TOUCH=0 POKEPORT_DRIVER=tests/drivers/herbshop_bug1169_test.lua love . Herb shop intro over the Underground map, not a white screen. POKEPORT_GAME=gold POKEPORT_IDENTITY=gold-bug1107 POKEPORT_DRIVER=tests/drivers/gold_save_slot_bug1107_test.lua love . Look for PASS and a saves/gold/slot*.lua path. CONTINUE should see it. Worth a hand check with no driver: nickname color, a TM for ABLE/NOT ABLE, Pokegear phone B-to-close, OPTION > CONTROLS, a ledge hop, a trade movie, and on a phone OPTION > TOUCH LAYOUT / VIBRATION. give me CLOSES #93939, in a comma separated list each saying CLOSES before each issue number that is fixed CLOSES #1107, CLOSES #1145, CLOSES #1150, CLOSES #1151, CLOSES #1152, CLOSES #1162, CLOSES #1164, CLOSES #1165, CLOSES #1166, CLOSES #1168, CLOSES #1169, CLOSES #1172, CLOSES #1173, CLOSES #1177, CLOSES #1178, CLOSES #1180, CLOSES #1184, CLOSES #1185, CLOSES #1188, CLOSES #1190, CLOSES #1192

src/ui/TouchControlsEditor.lua

@@ -49,17 +49,29 @@ end
 function Editor.load(opts)
   opts = opts or {}
   Editor.onClose = opts.onClose
+  Editor.version = opts.version
+  Editor.hostPoll = opts.hostPoll == true
   Editor.drag = nil
   Editor.rects = {}
+  Editor._hostMouse = false
+  Editor._hostTouches = nil
   Editor.fonts = {
     title = love.graphics.newFont(28),
     body = love.graphics.newFont(16),
     btn = love.graphics.newFont(18),
   }
   local optsTbl = SaveData.loadOptions()
+  local applied = optsTbl
+  if opts.version == "gold" then
+    local gold = type(optsTbl.gold) == "table" and optsTbl.gold or {}
+    applied = {
+      touchControls = gold.touchControls,
+      haptics = gold.haptics or optsTbl.haptics,
+    }
+  end
   TouchControls:init()
   TouchControls:ensureImages()
-  TouchControls:applyOptions(optsTbl)
+  TouchControls:applyOptions(applied)
   TouchControls:setPreview(true)
   Editor.enabled = TouchControls.enabled ~= false
   PadCursor.reset()
@@ -71,17 +83,24 @@ function Editor.unload()
   PadCursor.reset()
   Editor.drag = nil
   Editor.onClose = nil
+  Editor.version = nil
+  Editor._hostMouse = false
+  Editor._hostTouches = nil
 end
 
 local function persist()
   local opts = SaveData.loadOptions()
   local cfg = TouchControls:config()
-  -- replaces the whole table, so a pre-#633 top-level positions key is
-  -- dropped once the player saves under the new shape
-  opts.touchControls = {
+  local block = {
     enabled = cfg.enabled,
     layouts = cfg.layouts,
   }
+  if Editor.version == "gold" then
+    opts.gold = type(opts.gold) == "table" and opts.gold or {}
+    opts.gold.touchControls = block
+  else
+    opts.touchControls = block
+  end
   SaveData.saveOptions(opts)
 end
 
@@ -104,9 +123,7 @@ end
 
 function Editor.update(dt)
   PadCursor.update(dt or 0)
-  -- drag follows the live pointer when love.touch / mouse / pad is available;
-  -- touchmoved / mousemoved also update, so this is a belt-and-suspenders
-  -- path for Android where move events can be thin
+  if Editor.hostPoll then Editor.pollHostPointers() end
   if not Editor.drag then return end
   local x, y
   if Editor.drag.touchId == "pad" then
@@ -297,6 +314,45 @@ local function endDrag(id)
   Editor.drag = nil
 end
 
+function Editor.pollHostPointers()
+  local down = love.mouse and love.mouse.isDown and love.mouse.isDown(1)
+  if down then
+    local x, y = love.mouse.getPosition()
+    if not Editor._hostMouse then
+      Editor._hostMouse = true
+      beginDrag("mouse", x, y)
+    else
+      moveDrag("mouse", x, y)
+    end
+  elseif Editor._hostMouse then
+    Editor._hostMouse = false
+    endDrag("mouse")
+  end
+  if not (love.touch and love.touch.getTouches and love.touch.getPosition) then
+    return
+  end
+  Editor._hostTouches = Editor._hostTouches or {}
+  local seen = {}
+  for _, id in ipairs(love.touch.getTouches()) do
+    seen[id] = true
+    local ok, tx, ty = pcall(love.touch.getPosition, id)
+    if ok and tx then
+      if not Editor._hostTouches[id] then
+        Editor._hostTouches[id] = true
+        beginDrag(id, tx, ty)
+      else
+        moveDrag(id, tx, ty)
+      end
+    end
+  end
+  for id in pairs(Editor._hostTouches) do
+    if not seen[id] then
+      Editor._hostTouches[id] = nil
+      endDrag(id)
+    end
+  end
+end
+
 function Editor.mousepressed(x, y, button)
   if button ~= 1 then return end
   -- Finger / mouse tap yields the Joy-Con pointer so the click lands where
@@ -391,4 +447,35 @@ function Editor.keypressed(key)
   end
 end
 
+function Editor.new(game)
+  local state = { game = game, isOpaque = true }
+  Editor.hostPoll = true
+  Editor.load({
+    version = "gold",
+    hostPoll = true,
+    onClose = function()
+      Editor.hostPoll = false
+      if game.options then
+        game.options.touchControls = TouchControls:config()
+      end
+      if game.stack and game.stack:top() == state then
+        game.stack:pop()
+      end
+      if game.applyOptions then game:applyOptions() end
+    end,
+  })
+  function state:wantsFillScale() return true end
+  function state:drawsWidescreen() return true end
+  function state:update(dt)
+    Editor.update(dt)
+    local input = self.game and self.game.input
+    if input and input:wasPressed("b") then close() end
+  end
+  function state:draw() end
+  function state:drawWidescreen(_w, _h)
+    Editor.draw()
+  end
+  return state
+end
+
 return Editor