Debugger: GBA - Tilemap viewer - Fixed incorrect data in row 32 and c…

…olumn 32
SourMesen · May 10, 2024 · bb034e6 · bb034e6
1 parent 202b8f3
commit bb034e6
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/Core/GBA/Debugger/GbaPpuTools.cpp b/Core/GBA/Debugger/GbaPpuTools.cpp
@@ -84,10 +84,10 @@ DebugTilemapInfo GbaPpuTools::GetTilemap(GetTilemapOptions options, BaseState& b
 						vramAddr = layer.TilemapAddr + row * result.ColumnCount + column;
 					} else {
 						vramAddr = layer.TilemapAddr + (((row & 0x1F) * 32 + (column & 0x1F)) * 2);
-						if(column > 32) {
+						if(column >= 32) {
 							vramAddr += 0x800;
 						}
-						if(row > 32) {
+						if(row >= 32) {
 							vramAddr += layer.DoubleWidth ? 0x1000 : 0x800;
 						}
 					}
@@ -297,10 +297,10 @@ DebugTilemapTileInfo GbaPpuTools::GetTilemapTileInfo(uint32_t x, uint32_t y, uin
 				tilemapAddr = offset + row * columnCount + column;
 			} else {
 				tilemapAddr = offset + (((row & 0x1F) << 5) + column) * 2;
-				if(column > 32) {
+				if(column >= 32) {
 					tilemapAddr += 0x800;
 				}
-				if(row > 32) {
+				if(row >= 32) {
 					tilemapAddr += size.Width > 256 ? 0x1000 : 0x800;
 				}
 			}