From e1a6c8b9a960b49d3de845ed26d8b9d101a8bd39 Mon Sep 17 00:00:00 2001
From: Zoe Roux <zoe.roux@sdg.moe>
Date: Sat, 3 Jul 2021 18:07:16 +0200
Subject: [PATCH] Cleanin upo

---
 sources/Debugger/CPU/CPUDebug.cpp | 12 ++++++------
 sources/PPU/PPU.cpp               | 29 ++++++++++++-----------------
 2 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/sources/Debugger/CPU/CPUDebug.cpp b/sources/Debugger/CPU/CPUDebug.cpp
index 61e848c..231e454 100644
--- a/sources/Debugger/CPU/CPUDebug.cpp
+++ b/sources/Debugger/CPU/CPUDebug.cpp
@@ -316,12 +316,12 @@ namespace ComSquare::Debugger
 		std::string symbolPath = romPath.replace_extension(".sym");
 		std::ifstream sym(symbolPath);
 
-		if (sym) {
-			std::vector<Label> symLabels = WlaDx::parse(sym);
-			labels.insert(labels.end(),
-			              std::make_move_iterator(symLabels.begin()),
-			              std::make_move_iterator(symLabels.end()));
-		}
+//		if (sym) {
+//			std::vector<Label> symLabels = WlaDx::parse(sym);
+//			labels.insert(labels.end(),
+//			              std::make_move_iterator(symLabels.begin()),
+//			              std::make_move_iterator(symLabels.end()));
+//		}
 		return labels;
 	}
 }
diff --git a/sources/PPU/PPU.cpp b/sources/PPU/PPU.cpp
index b6fe012..bf9ba31 100644
--- a/sources/PPU/PPU.cpp
+++ b/sources/PPU/PPU.cpp
@@ -123,18 +123,12 @@ namespace ComSquare::PPU
 		case PpuRegisters::bg2sc:
 		case PpuRegisters::bg3sc:
 		case PpuRegisters::bg4sc:
-			this->_registers._bgsc[addr - PpuRegisters::bg1sc].raw = data;
+			this->_registers._bgsc[addr - 0x07].raw = data;
 			// update background tilemap address
-			this->_backgrounds[addr - PpuRegisters::bg1sc].setTileMapStartAddress(
-				this->getTileMapStartAddress(addr - PpuRegisters::bg1sc + 1));
-			this->_backgrounds[addr - PpuRegisters::bg1sc + 1].setTileMapStartAddress(
-				this->getTileMapStartAddress(addr - PpuRegisters::bg1sc + 1));
-			this->_backgrounds[addr - PpuRegisters::bg1sc].setTilemaps(
-				{static_cast<bool>(this->_registers._bgsc[addr - PpuRegisters::bg1sc].tilemapHorizontalMirroring),
-				 static_cast<bool>(this->_registers._bgsc[addr - PpuRegisters::bg1sc].tilemapVerticalMirroring)});
-			this->_backgrounds[addr - PpuRegisters::bg1sc + 1].setTilemaps(
-				{static_cast<bool>(this->_registers._bgsc[addr - PpuRegisters::bg1sc].tilemapHorizontalMirroring),
-				 static_cast<bool>(this->_registers._bgsc[addr - PpuRegisters::bg1sc].tilemapVerticalMirroring)});
+			this->_backgrounds[addr - 0x07].setTileMapStartAddress(this->getTileMapStartAddress(addr - 0x07 + 1));
+			this->_backgrounds[addr - 0x07 + 1].setTileMapStartAddress(this->getTileMapStartAddress(addr - 0x07 + 1));
+			this->_backgrounds[addr - 0x07].setTilemaps({this->_registers._bgsc[addr - 0x07].tilemapHorizontalMirroring, this->_registers._bgsc[addr - 0x07].tilemapVerticalMirroring});
+			this->_backgrounds[addr - 0x07 + 1].setTilemaps({this->_registers._bgsc[addr - 0x07].tilemapHorizontalMirroring, this->_registers._bgsc[addr - 0x07].tilemapVerticalMirroring});
 			break;
 		case PpuRegisters::bg12nba:
 		case PpuRegisters::bg34nba:
@@ -309,6 +303,7 @@ namespace ComSquare::PPU
 	{
 		(void)cycles;
 
+
 		this->renderMainAndSubScreen();
 		this->add_buffer(this->_screen, this->_subScreen);
 		this->add_buffer(this->_screen, this->_mainScreen);
@@ -540,12 +535,12 @@ namespace ComSquare::PPU
 		return baseAddress;
 	}
 
-	Vector2<bool> PPU::getBackgroundMirroring(int bgNumber) const
+	Vector2<int> PPU::getBackgroundSize(int bgNumber) const
 	{
-		Vector2<bool> backgroundSize(false, false);
+		Vector2<int> backgroundSize(0,0);
 
-		backgroundSize.y = this->_registers._bgsc[bgNumber - 1].tilemapVerticalMirroring;
-		backgroundSize.x = this->_registers._bgsc[bgNumber - 1].tilemapHorizontalMirroring;
+		backgroundSize.y = (this->_registers._bgsc[bgNumber - 1].tilemapVerticalMirroring) ? 2 : 1;
+		backgroundSize.x = (this->_registers._bgsc[bgNumber - 1].tilemapHorizontalMirroring) ? 2 : 1;
 		return backgroundSize;
 	}
 
@@ -553,9 +548,9 @@ namespace ComSquare::PPU
 	{
 		uint16_t colorPalette;
 		// should only render backgrounds needed (depending of th bgMode)
-		int i = 0;
+		//int i = 0;
 		for (auto &_background : this->_backgrounds) {
-			i++;
+			//i++;
 			_background.renderBackground();
 		}
 		// TODO make a function getDefaultBgColor