From 82f58b95ac34121904df52cb0178a5e81b1af1a5 Mon Sep 17 00:00:00 2001
From: Rangi <35663410+Rangi42@users.noreply.github.com>
Date: Sun, 13 Sep 2026 15:00:58 -0400
Subject: [PATCH] Fix reversing some images with an input tileset (#2081)

---
 src/gfx/reverse.cpp                    |   2 +-
 test/gfx/reverse_input_tileset.2bpp    | Bin 0 -> 80 bytes
 test/gfx/reverse_input_tileset.attrmap | Bin 0 -> 4 bytes
 test/gfx/reverse_input_tileset.flags   |   5 +++++
 test/gfx/reverse_input_tileset.in.2bpp | Bin 0 -> 48 bytes
 test/gfx/reverse_input_tileset.tilemap | Bin 0 -> 4 bytes
 6 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 test/gfx/reverse_input_tileset.2bpp
 create mode 100644 test/gfx/reverse_input_tileset.attrmap
 create mode 100644 test/gfx/reverse_input_tileset.flags
 create mode 100644 test/gfx/reverse_input_tileset.in.2bpp
 create mode 100644 test/gfx/reverse_input_tileset.tilemap

diff --git a/src/gfx/reverse.cpp b/src/gfx/reverse.cpp
index 85b2db53..496a6dab 100644
--- a/src/gfx/reverse.cpp
+++ b/src/gfx/reverse.cpp
@@ -552,7 +552,7 @@ void reverse() {
 			// Get the tile ID at this location
 			size_t tileOfs =
 			    tilemap ? static_cast<uint8_t>((*tilemap)[index] - options.baseTileIDs[bank])
-			                  + (bank ? nbTilesInBank[0] : 0)
+			                  + (bank ? options.maxNbTiles[0] : 0)
 			            : index;
 			// This should have been enforced by the earlier checking.
 			assume(tileOfs < nbTiles + options.trim);
diff --git a/test/gfx/reverse_input_tileset.2bpp b/test/gfx/reverse_input_tileset.2bpp
new file mode 100644
index 0000000000000000000000000000000000000000..61e3d4ff8ed7778bcb3ba1223195c2cc7e063592
GIT binary patch
literal 80
fcmWFyU9~C{3G<@?1}OLs1rRQX17kHJf&c#jPF5b}

literal 0
HcmV?d00001

diff --git a/test/gfx/reverse_input_tileset.attrmap b/test/gfx/reverse_input_tileset.attrmap
new file mode 100644
index 0000000000000000000000000000000000000000..8c2a6c0ef8c845cd8c29067a821a08ca1abbac19
GIT binary patch
literal 4
LcmZQz;NSoN02}}j

literal 0
HcmV?d00001

diff --git a/test/gfx/reverse_input_tileset.flags b/test/gfx/reverse_input_tileset.flags
new file mode 100644
index 00000000..5c2e3fb1
--- /dev/null
+++ b/test/gfx/reverse_input_tileset.flags
@@ -0,0 +1,5 @@
+-u
+-N 3,2
+-i reverse_input_tileset.in.2bpp
+-t reverse_input_tileset.tilemap
+-a reverse_input_tileset.attrmap
diff --git a/test/gfx/reverse_input_tileset.in.2bpp b/test/gfx/reverse_input_tileset.in.2bpp
new file mode 100644
index 0000000000000000000000000000000000000000..875b69f935d206ce850a4a4c38401791b52d078d
GIT binary patch
literal 48
VcmWFyU9~C{3G<@?1}OLs1ps>|5a9p-

literal 0
HcmV?d00001

diff --git a/test/gfx/reverse_input_tileset.tilemap b/test/gfx/reverse_input_tileset.tilemap
new file mode 100644
index 0000000000000000000000000000000000000000..693ddc9ccea2f9aa65dd6de5f6d8836eea782945
GIT binary patch
literal 4
LcmZQzWMBjU00;mB

literal 0
HcmV?d00001