CLOSES #785, CLOSES #807, CLOSES #811, CLOSES #814

src/ui/ListMenu.lua

@@ -237,8 +237,11 @@ function ListMenu:draw()
     if i == self.index then
       -- hollowIndex: a chosen row keeps the hollow '▷' left behind by
       -- pokered's PlaceUnfilledArrowMenuCursor (the old man demo's
-      -- auto A-press, home/list_menu.asm:89-91)
-      Font.drawCode((self.swapIndex == i or self.hollowIndex == i)
+      -- auto A-press, home/list_menu.asm:89-91).  A swap-marked row does
+      -- NOT stay hollow under the cursor: PlaceMenuCursor writes '▶'
+      -- into the tilemap over the '▷' whenever the cursor sits there
+      -- (home/window.asm:184-185) and restores it on the way out (#814)
+      Font.drawCode(self.hollowIndex == i
                     and Theme.cursorHollow or Theme.cursor, 8, y)
     end
     if self.swapIndex == i and i ~= self.index then

src/ui/PartyMenu.lua

@@ -776,8 +776,10 @@ function PartyMenu:draw()
     if i == self.index then
       Font.drawCode(Theme.cursor, 0, cursorY)
     end
-    if i == self.swapFrom or i == self.softboiledFrom then
-      Font.drawCode(Theme.cursorHollow, 0, cursorY) -- the unfilled swap arrow
+    -- the unfilled swap arrow; the filled cursor replaces it in the tilemap
+    -- when they share a row (PlaceMenuCursor, home/window.asm:184-185) (#814)
+    if (i == self.swapFrom or i == self.softboiledFrom) and i ~= self.index then
+      Font.drawCode(Theme.cursorHollow, 0, cursorY)
     end
   end
   if self.swapFrom then