Many fixes

4 files changed, 5 insertions, 11 deletions

diff --git a/Makefile b/Makefile
index 44d7ed8..89aa9e1 100644
--- a/Makefile
+++ b/Makefile
@@ -277,7 +277,7 @@ $(TEXT_0_BIN) $(TEXT_1_BIN) $(TEXT_2_BIN) $(TEXT_3_BIN) $(SYMBOLS_PATTERN_BIN) $
 	-C frame_0_attr_table_0_bin=$(FRAME_0_ATTR_TABLE_0_BIN) -C frame_0_attr_table_1_bin=$(FRAME_0_ATTR_TABLE_1_BIN) \
 	-C frame_0_attr_table_2_bin=$(FRAME_0_ATTR_TABLE_2_BIN) -C frame_0_attr_table_3_bin=$(FRAME_0_ATTR_TABLE_3_BIN) \
 	-C frame_0_palette_0_bin=$(FRAME_0_PALETTE_0_BIN) -C frame_0_palette_1_bin=$(FRAME_0_PALETTE_1_BIN) \
-	-C frame_0_palette_2_bin=$(FRAME_0_PALETTE_2_BIN) -C frame_0_palette_3_bin=$(TITLE_PALETTE_3_BIN) \
+	-C frame_0_palette_2_bin=$(FRAME_0_PALETTE_2_BIN) -C frame_0_palette_3_bin=$(FRAME_0_PALETTE_3_BIN) \
 	-C frame_1_pattern_0_bin=$(FRAME_1_PATTERN_0_BIN) -C frame_1_pattern_1_bin=$(FRAME_1_PATTERN_1_BIN) \
 	-C frame_1_pattern_2_bin=$(FRAME_1_PATTERN_2_BIN) -C frame_1_pattern_3_bin=$(FRAME_1_PATTERN_3_BIN) \
 	-C frame_1_name_table_0_bin=$(FRAME_1_NAME_TABLE_0_BIN) -C frame_1_name_table_1_bin=$(FRAME_1_NAME_TABLE_1_BIN) \
@@ -285,7 +285,7 @@ $(TEXT_0_BIN) $(TEXT_1_BIN) $(TEXT_2_BIN) $(TEXT_3_BIN) $(SYMBOLS_PATTERN_BIN) $
 	-C frame_1_attr_table_0_bin=$(FRAME_1_ATTR_TABLE_0_BIN) -C frame_1_attr_table_1_bin=$(FRAME_1_ATTR_TABLE_1_BIN) \
 	-C frame_1_attr_table_2_bin=$(FRAME_1_ATTR_TABLE_2_BIN) -C frame_1_attr_table_3_bin=$(FRAME_1_ATTR_TABLE_3_BIN) \
 	-C frame_1_palette_0_bin=$(FRAME_1_PALETTE_0_BIN) -C frame_1_palette_1_bin=$(FRAME_1_PALETTE_1_BIN) \
-	-C frame_1_palette_2_bin=$(FRAME_1_PALETTE_2_BIN) -C frame_1_palette_3_bin=$(TITLE_PALETTE_3_BIN) \
+	-C frame_1_palette_2_bin=$(FRAME_1_PALETTE_2_BIN) -C frame_1_palette_3_bin=$(FRAME_1_PALETTE_3_BIN) \
 	-C frame_2_pattern_0_bin=$(FRAME_2_PATTERN_0_BIN) -C frame_2_pattern_1_bin=$(FRAME_2_PATTERN_1_BIN) \
 	-C frame_2_pattern_2_bin=$(FRAME_2_PATTERN_2_BIN) -C frame_2_pattern_3_bin=$(FRAME_2_PATTERN_3_BIN) \
 	-C frame_2_name_table_0_bin=$(FRAME_2_NAME_TABLE_0_BIN) -C frame_2_name_table_1_bin=$(FRAME_2_NAME_TABLE_1_BIN) \
@@ -293,7 +293,7 @@ $(TEXT_0_BIN) $(TEXT_1_BIN) $(TEXT_2_BIN) $(TEXT_3_BIN) $(SYMBOLS_PATTERN_BIN) $
 	-C frame_2_attr_table_0_bin=$(FRAME_2_ATTR_TABLE_0_BIN) -C frame_2_attr_table_1_bin=$(FRAME_2_ATTR_TABLE_1_BIN) \
 	-C frame_2_attr_table_2_bin=$(FRAME_2_ATTR_TABLE_2_BIN) -C frame_2_attr_table_3_bin=$(FRAME_2_ATTR_TABLE_3_BIN) \
 	-C frame_2_palette_0_bin=$(FRAME_2_PALETTE_0_BIN) -C frame_2_palette_1_bin=$(FRAME_2_PALETTE_1_BIN) \
-	-C frame_2_palette_2_bin=$(FRAME_2_PALETTE_2_BIN) -C frame_2_palette_3_bin=$(TITLE_PALETTE_3_BIN) \
+	-C frame_2_palette_2_bin=$(FRAME_2_PALETTE_2_BIN) -C frame_2_palette_3_bin=$(FRAME_2_PALETTE_3_BIN) \
 	-C frame_3_pattern_0_bin=$(FRAME_3_PATTERN_0_BIN) -C frame_3_pattern_1_bin=$(FRAME_3_PATTERN_1_BIN) \
 	-C frame_3_pattern_2_bin=$(FRAME_3_PATTERN_2_BIN) -C frame_3_pattern_3_bin=$(FRAME_3_PATTERN_3_BIN) \
 	-C frame_3_name_table_0_bin=$(FRAME_3_NAME_TABLE_0_BIN) -C frame_3_name_table_1_bin=$(FRAME_3_NAME_TABLE_1_BIN) \
diff --git a/Mapper/WarfaceMapper.v b/Mapper/WarfaceMapper.v
index 03e6dbb..7a3b497 100644
--- a/Mapper/WarfaceMapper.v
+++ b/Mapper/WarfaceMapper.v
@@ -54,7 +54,7 @@ assign ppu_addr_out[16:10] = !ppu_addr_in[12]
 		? {chr_bank[4:2], chr_latch[1:0], ppu_addr_in[11:10]} // $0000-$0FFF is autoswitchable

 		: {chr_bank[4:0], ppu_addr_in[11:10]} // $0000-$0FFF is switchable manually

 	)

-	: {5'b11111, ppu_addr_in[11:10]}; // $1000-$1FFF is fixed to last

+	: {5'b11111, ppu_addr_in[11:10]}; // $1000-$1FFF is fixed to the last

 

 assign ciram_a10 = ppu_addr_in[11]; // horizontal mirroring

 

diff --git a/tools_sources/NesTiler b/tools_sources/NesTiler
-Subproject 65405b0ce1711497e6dcbf37249dadaea54f111
+Subproject b7fc0da7291ca14e68955944d56cf37cec53d63
diff --git a/tools_sources/Warface.sln b/tools_sources/Warface.sln
index 0075944..990ea92 100644
--- a/tools_sources/Warface.sln
+++ b/tools_sources/Warface.sln
@@ -3,9 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16

 VisualStudioVersion = 16.0.30621.155

 MinimumVisualStudioVersion = 10.0.40219.1

-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NesTiler", "NesTiler\NesTiler.csproj", "{9CAA1868-07BD-4C76-B211-0E314E15F253}"

-EndProject

-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImageSplitter", "ImageSplitter\ImageSplitter.csproj", "{3BFAF77A-90AB-4B12-AB06-90290FEBCAC9}"

+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NesTiler", "NesTiler\NesTiler.csproj", "{9CAA1868-07BD-4C76-B211-0E314E15F253}"

 EndProject

 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TextConverter", "TextConverter\TextConverter.csproj", "{DA9CDBC5-EC58-402A-BA2B-59D957E3BF04}"

 EndProject

@@ -19,10 +17,6 @@ Global
 		{9CAA1868-07BD-4C76-B211-0E314E15F253}.Debug|Any CPU.Build.0 = Debug|Any CPU

 		{9CAA1868-07BD-4C76-B211-0E314E15F253}.Release|Any CPU.ActiveCfg = Release|Any CPU

 		{9CAA1868-07BD-4C76-B211-0E314E15F253}.Release|Any CPU.Build.0 = Release|Any CPU

-		{3BFAF77A-90AB-4B12-AB06-90290FEBCAC9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-		{3BFAF77A-90AB-4B12-AB06-90290FEBCAC9}.Debug|Any CPU.Build.0 = Debug|Any CPU

-		{3BFAF77A-90AB-4B12-AB06-90290FEBCAC9}.Release|Any CPU.ActiveCfg = Release|Any CPU

-		{3BFAF77A-90AB-4B12-AB06-90290FEBCAC9}.Release|Any CPU.Build.0 = Release|Any CPU

 		{DA9CDBC5-EC58-402A-BA2B-59D957E3BF04}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

 		{DA9CDBC5-EC58-402A-BA2B-59D957E3BF04}.Debug|Any CPU.Build.0 = Debug|Any CPU

 		{DA9CDBC5-EC58-402A-BA2B-59D957E3BF04}.Release|Any CPU.ActiveCfg = Release|Any CPU