From 31365d8dfd2a35a129f6e05ee724a6a148f51d23 Mon Sep 17 00:00:00 2001
From: johnjohto <johtoboy@atomicmail.io>
Date: Mon, 27 Jul 2026 10:38:03 -0400
Subject: [PATCH] Keep the used-move text up during battle animations (#296)
 (#302)

The battle textbox redraws its text every frame, but only while a
message was current. Once the player dismissed "Enemy X used GUST!"
and the move animation started, nothing drew the text, so the box sat
empty for the whole animation. The original game's animations never
touch the textbox, so the text stays up. Draw the held lines while an
animation is playing; everything else is unchanged.

Co-authored-by: johnjohto <johnjohto@users.noreply.github.com>
---
 src/battle/BattleState.lua |  5 ++++-
 tests/run_tests.lua        | 26 ++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/src/battle/BattleState.lua b/src/battle/BattleState.lua
index 51ad400d..0744f65b 100644
--- a/src/battle/BattleState.lua
+++ b/src/battle/BattleState.lua
@@ -4312,7 +4312,10 @@ end
 function BattleState:drawTextArea()
   Font.drawBox(0, 12, 20, 6)
   love.graphics.setColor(0, 0, 0, 1)
-  if self.phase == "messages" and self.current then
+  if self.phase == "messages" and (self.current or self.animPlaying) then
+    -- during the move animation self.current is nil but shown still holds
+    -- the "used X!" lines; keep drawing them like pokered, whose move
+    -- animations only touch sprites and never the textbox tilemap (#296)
     -- rolling 2-line window: shown[1] at row y=112, shown[2] at y=128 (battle
     -- text uses every other tile row, hlcoord *,14 / *,16).  scrollPx animates
     -- the lines up one row (ScrollTextUpOneLine) so a 3rd line scrolls into
diff --git a/tests/run_tests.lua b/tests/run_tests.lua
index 325803e2..396db06d 100644
--- a/tests/run_tests.lua
+++ b/tests/run_tests.lua
@@ -2860,6 +2860,32 @@ do
   eq(ys[1], 112, "battle text line 1 at row 14 (y=112)")
   eq(ys[2], 128, "battle text line 2 at row 16 (y=128)")
 end
+
+-- issue #296: the used-move text stays up during the move animation.
+-- current is nil once the message is dismissed, but shown still holds the
+-- lines; pokered's animations never touch the textbox tilemap.
+do
+  local Font = require("src.render.Font")
+  local drawn, origCode, origBox = 0, Font.drawCode, Font.drawBox
+  Font.drawBox = function() end
+  Font.drawCode = function() drawn = drawn + 1 end
+  local battle = setmetatable({
+    phase = "messages",
+    current = nil,
+    animPlaying = true,
+    shown = { { 0x80 }, { 0x81 } },
+  }, BattleState)
+  battle:drawTextArea()
+  eq(drawn, 2, "text keeps drawing while the move animation plays")
+
+  -- without an animation the dismissed message is still hidden, so states
+  -- that clear the box (e.g. pushed UI rows) are unchanged
+  drawn = 0
+  battle.animPlaying = nil
+  battle:drawTextArea()
+  Font.drawCode, Font.drawBox = origCode, origBox
+  eq(drawn, 0, "no current message and no animation draws no text")
+end
 end
 
 -- ================= BUGS.md batch: ledge-shadow =================