Tiles CSV file fix

ClusterM · Sep 19, 2023 · bced52e · bced52e
1 parent da52163
commit bced52e
Show file tree

Hide file tree

Showing 23 changed files with 16,653 additions and 16,654 deletions.
diff --git a/NesTiler/Program.cs b/NesTiler/Program.cs
@@ -498,8 +498,7 @@ public static int Main(string[] args)
                                 currentTileID = tileID;
                                 tileID++;
                             }
-                            // TODO: fix it
-                            //if (c.Mode == Config.TilesMode.Sprites8x16)
+                            if (c.Mode == Config.TilesMode.Sprites8x16)
                                 currentTileID = ((currentTileID & 0x7F) << 1) | ((currentTileID & 0x80) >> 7);
                             // Write CSV if required
                             outTilesCsvLines?.Add($"{imageNum},{c.ImageFiles[imageNum]},{tileY},{tileX},{tileX * c.TileWidth},{tileY * c.TileHeight},{c.TileWidth},{c.TileHeight},{currentTileID},{paletteID}");

diff --git a/Tests/References/belaya_akula_tiles.csv b/Tests/References/belaya_akula_tiles.csv
diff --git a/Tests/References/blaster_master_left_blaster_master_right_tiles.csv b/Tests/References/blaster_master_left_blaster_master_right_tiles.csv
diff --git a/Tests/References/blaster_master_left_tiles.csv b/Tests/References/blaster_master_left_tiles.csv
diff --git a/Tests/References/blaster_master_right_tiles.csv b/Tests/References/blaster_master_right_tiles.csv
diff --git a/Tests/References/buhanka_tiles.csv b/Tests/References/buhanka_tiles.csv
diff --git a/Tests/References/chernobyl_tiles.csv b/Tests/References/chernobyl_tiles.csv
diff --git a/Tests/References/dira_tiles.csv b/Tests/References/dira_tiles.csv
diff --git a/Tests/References/glaza_tiles.csv b/Tests/References/glaza_tiles.csv
diff --git a/Tests/References/gorgona_tiles.csv b/Tests/References/gorgona_tiles.csv
diff --git a/Tests/References/jurassic2_tiles.csv b/Tests/References/jurassic2_tiles.csv
diff --git a/Tests/References/jurassic_tiles.csv b/Tests/References/jurassic_tiles.csv
diff --git a/Tests/References/me_tiles.csv b/Tests/References/me_tiles.csv
diff --git a/Tests/References/myatej_tiles.csv b/Tests/References/myatej_tiles.csv
diff --git a/Tests/References/pagoda_tiles.csv b/Tests/References/pagoda_tiles.csv
diff --git a/Tests/References/rayon4_tiles.csv b/Tests/References/rayon4_tiles.csv
diff --git a/Tests/References/shkola_tiles.csv b/Tests/References/shkola_tiles.csv
diff --git a/Tests/References/sindikat_tiles.csv b/Tests/References/sindikat_tiles.csv
diff --git a/Tests/References/sprites1_sprites.csv b/Tests/References/sprites1_sprites.csv
@@ -1,13 +1,13 @@
 image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,palette_id
 0,Images\sprites1.png,0,0,0,0,8,8,0,0
-0,Images\sprites1.png,0,1,8,0,8,8,2,0
-0,Images\sprites1.png,0,2,16,0,8,8,4,0
-0,Images\sprites1.png,0,3,24,0,8,8,6,0
-0,Images\sprites1.png,0,4,32,0,8,8,8,0
-0,Images\sprites1.png,0,5,40,0,8,8,10,0
-0,Images\sprites1.png,0,6,48,0,8,8,12,0
-0,Images\sprites1.png,0,7,56,0,8,8,14,0
-0,Images\sprites1.png,0,8,64,0,8,8,16,0
-0,Images\sprites1.png,0,9,72,0,8,8,18,0
-0,Images\sprites1.png,0,10,80,0,8,8,20,0
-0,Images\sprites1.png,0,11,88,0,8,8,22,0
+0,Images\sprites1.png,0,1,8,0,8,8,1,0
+0,Images\sprites1.png,0,2,16,0,8,8,2,0
+0,Images\sprites1.png,0,3,24,0,8,8,3,0
+0,Images\sprites1.png,0,4,32,0,8,8,4,0
+0,Images\sprites1.png,0,5,40,0,8,8,5,0
+0,Images\sprites1.png,0,6,48,0,8,8,6,0
+0,Images\sprites1.png,0,7,56,0,8,8,7,0
+0,Images\sprites1.png,0,8,64,0,8,8,8,0
+0,Images\sprites1.png,0,9,72,0,8,8,9,0
+0,Images\sprites1.png,0,10,80,0,8,8,10,0
+0,Images\sprites1.png,0,11,88,0,8,8,11,0
diff --git a/Tests/References/sputnik_tiles.csv b/Tests/References/sputnik_tiles.csv
diff --git a/Tests/References/sworm_tiles.csv b/Tests/References/sworm_tiles.csv
diff --git a/Tests/References/trailer-park_tiles.csv b/Tests/References/trailer-park_tiles.csv
diff --git a/Tests/References/warface_logo_tiles.csv b/Tests/References/warface_logo_tiles.csv