From cedf29ff0250a06d99570eaafa1caa64a0ff81bb Mon Sep 17 00:00:00 2001 From: Alexey 'Cluster' Avdyukhin Date: Fri, 28 Oct 2022 15:52:01 +0400 Subject: Palette class is immutable now. Faster and uses less memory. --- NesTiler/Palette.cs | 59 +- NesTiler/Program.cs | 23 +- Tests/References/belaya_akula_palette_0.bin | 2 +- Tests/References/belaya_akula_palette_1.bin | 2 +- Tests/References/belaya_akula_palette_3.bin | 2 +- Tests/References/belaya_akula_palettes.csv | 6 +- Tests/References/belaya_akula_pattern_0.bin | Bin 4096 -> 4096 bytes Tests/References/belaya_akula_pattern_1.bin | Bin 3920 -> 3920 bytes Tests/References/belaya_akula_pattern_2.bin | Bin 4096 -> 4096 bytes Tests/References/belaya_akula_pattern_3.bin | Bin 3072 -> 3072 bytes ...ster_left_blaster_master_right_name_table_1.bin | Bin 960 -> 960 bytes ..._master_left_blaster_master_right_palette_0.bin | 2 +- ..._master_left_blaster_master_right_palette_1.bin | 2 +- ..._master_left_blaster_master_right_palette_2.bin | 2 +- ..._master_left_blaster_master_right_palette_3.bin | Bin 4 -> 4 bytes ...r_master_left_blaster_master_right_palettes.csv | 8 +- ..._master_left_blaster_master_right_pattern_0.bin | Bin 3984 -> 4000 bytes ...ster_master_left_blaster_master_right_tiles.csv | 472 ++++----- .../blaster_master_right_name_table_0.bin | Bin 960 -> 960 bytes .../References/blaster_master_right_palette_0.bin | 2 +- .../References/blaster_master_right_palette_1.bin | 2 +- .../References/blaster_master_right_palette_2.bin | 2 +- .../References/blaster_master_right_palette_3.bin | Bin 4 -> 4 bytes Tests/References/blaster_master_right_palettes.csv | 8 +- .../References/blaster_master_right_pattern_0.bin | Bin 2800 -> 2816 bytes Tests/References/blaster_master_right_tiles.csv | 472 ++++----- Tests/References/buhanka_name_table_1.bin | Bin 256 -> 256 bytes Tests/References/buhanka_palette_0.bin | 2 +- Tests/References/buhanka_palette_2.bin | 2 +- Tests/References/buhanka_palettes.csv | 4 +- Tests/References/buhanka_pattern_0.bin | Bin 4096 -> 4096 bytes Tests/References/buhanka_pattern_1.bin | Bin 3904 -> 3904 bytes Tests/References/buhanka_pattern_2.bin | Bin 4096 -> 4096 bytes Tests/References/buhanka_tiles.csv | 156 +-- Tests/References/chernobyl_palette_0.bin | 2 +- Tests/References/chernobyl_palette_1.bin | 2 +- Tests/References/chernobyl_palettes.csv | 4 +- Tests/References/chernobyl_pattern_0.bin | Bin 3696 -> 3696 bytes Tests/References/chernobyl_pattern_1.bin | Bin 4048 -> 4048 bytes Tests/References/chernobyl_pattern_2.bin | Bin 4048 -> 4048 bytes Tests/References/chernobyl_pattern_3.bin | Bin 3072 -> 3072 bytes Tests/References/dira_attr_table_0.bin | Bin 16 -> 16 bytes Tests/References/dira_attr_table_1.bin | Bin 16 -> 16 bytes Tests/References/dira_attr_table_2.bin | Bin 16 -> 16 bytes Tests/References/dira_attr_table_3.bin | Bin 16 -> 16 bytes Tests/References/dira_palette_0.bin | 2 +- Tests/References/dira_palette_1.bin | 2 +- Tests/References/dira_palette_2.bin | 2 +- Tests/References/dira_palette_3.bin | 2 +- Tests/References/dira_palettes.csv | 8 +- Tests/References/dira_pattern_0.bin | Bin 4096 -> 4096 bytes Tests/References/dira_pattern_1.bin | Bin 4096 -> 4096 bytes Tests/References/dira_pattern_2.bin | Bin 4096 -> 4096 bytes Tests/References/dira_pattern_3.bin | Bin 3072 -> 3072 bytes Tests/References/dira_tiles.csv | 120 +-- Tests/References/glaza_palette_0.bin | 2 +- Tests/References/glaza_palettes.csv | 2 +- Tests/References/glaza_pattern_0.bin | Bin 1056 -> 1056 bytes Tests/References/glaza_pattern_1.bin | Bin 1392 -> 1392 bytes Tests/References/glaza_pattern_2.bin | Bin 1056 -> 1056 bytes Tests/References/glaza_pattern_3.bin | Bin 800 -> 800 bytes Tests/References/gorgona_name_table_3.bin | Bin 192 -> 192 bytes Tests/References/gorgona_palette_0.bin | Bin 4 -> 4 bytes Tests/References/gorgona_palette_1.bin | 2 +- Tests/References/gorgona_palette_3.bin | Bin 4 -> 4 bytes Tests/References/gorgona_palettes.csv | 6 +- Tests/References/gorgona_pattern_0.bin | Bin 768 -> 768 bytes Tests/References/gorgona_pattern_1.bin | Bin 1408 -> 1408 bytes Tests/References/gorgona_pattern_2.bin | Bin 2000 -> 2000 bytes Tests/References/gorgona_pattern_3.bin | Bin 1392 -> 1376 bytes Tests/References/gorgona_tiles.csv | 58 +- Tests/References/jurassic2_name_table_1.bin | Bin 448 -> 448 bytes Tests/References/jurassic2_palette_0.bin | 2 +- Tests/References/jurassic2_palette_1.bin | 2 +- Tests/References/jurassic2_palettes.csv | 4 +- Tests/References/jurassic2_pattern_0.bin | Bin 3760 -> 3760 bytes Tests/References/jurassic2_pattern_1.bin | Bin 4000 -> 3984 bytes Tests/References/jurassic2_tiles.csv | 492 ++++----- Tests/References/jurassic_palette_0.bin | 2 +- Tests/References/jurassic_palettes.csv | 2 +- Tests/References/jurassic_pattern_0.bin | Bin 3616 -> 3616 bytes Tests/References/jurassic_pattern_1.bin | Bin 2864 -> 2864 bytes Tests/References/me_attr_table_0.bin | Bin 32 -> 32 bytes Tests/References/me_attr_table_1.bin | Bin 32 -> 32 bytes Tests/References/me_name_table_0.bin | Bin 512 -> 512 bytes Tests/References/me_name_table_1.bin | Bin 448 -> 448 bytes Tests/References/me_palette_0.bin | 2 +- Tests/References/me_palette_1.bin | 2 +- Tests/References/me_palette_2.bin | 2 +- Tests/References/me_palette_3.bin | 2 +- Tests/References/me_palettes.csv | 8 +- Tests/References/me_pattern_0.bin | Bin 3680 -> 3696 bytes Tests/References/me_pattern_1.bin | Bin 2912 -> 2896 bytes Tests/References/me_tiles.csv | 1096 ++++++++++---------- Tests/References/myatej_name_table_2.bin | Bin 256 -> 256 bytes Tests/References/myatej_palette_0.bin | 2 +- Tests/References/myatej_palette_1.bin | Bin 4 -> 4 bytes Tests/References/myatej_palette_2.bin | Bin 4 -> 4 bytes Tests/References/myatej_palette_3.bin | 2 +- Tests/References/myatej_palettes.csv | 8 +- Tests/References/myatej_pattern_0.bin | Bin 4080 -> 4080 bytes Tests/References/myatej_pattern_1.bin | Bin 3664 -> 3664 bytes Tests/References/myatej_pattern_2.bin | Bin 3536 -> 3520 bytes Tests/References/myatej_pattern_3.bin | Bin 3056 -> 3056 bytes Tests/References/myatej_tiles.csv | 40 +- Tests/References/pagoda_name_table_0.bin | Bin 256 -> 256 bytes Tests/References/pagoda_name_table_1.bin | Bin 256 -> 256 bytes Tests/References/pagoda_name_table_2.bin | Bin 256 -> 256 bytes Tests/References/pagoda_name_table_3.bin | Bin 192 -> 192 bytes Tests/References/pagoda_palette_0.bin | 2 +- Tests/References/pagoda_palette_1.bin | 2 +- Tests/References/pagoda_palette_2.bin | 2 +- Tests/References/pagoda_palettes.csv | 6 +- Tests/References/pagoda_pattern_0.bin | Bin 3792 -> 3808 bytes Tests/References/pagoda_pattern_1.bin | Bin 4064 -> 4064 bytes Tests/References/pagoda_pattern_2.bin | Bin 3824 -> 3808 bytes Tests/References/pagoda_pattern_3.bin | Bin 2736 -> 2720 bytes Tests/References/pagoda_tiles.csv | 674 ++++++------ Tests/References/rayon4_palette_0.bin | Bin 4 -> 4 bytes Tests/References/rayon4_palette_1.bin | 2 +- Tests/References/rayon4_palette_2.bin | Bin 4 -> 4 bytes Tests/References/rayon4_palette_3.bin | Bin 4 -> 4 bytes Tests/References/rayon4_palettes.csv | 8 +- Tests/References/rayon4_pattern_0.bin | Bin 3824 -> 3824 bytes Tests/References/rayon4_pattern_1.bin | Bin 4096 -> 4096 bytes Tests/References/rayon4_pattern_2.bin | Bin 3472 -> 3472 bytes Tests/References/rayon4_pattern_3.bin | Bin 2592 -> 2592 bytes Tests/References/shkola_palette_0.bin | 2 +- Tests/References/shkola_palette_1.bin | 2 +- Tests/References/shkola_palette_2.bin | 2 +- Tests/References/shkola_palettes.csv | 6 +- Tests/References/shkola_pattern_0.bin | Bin 3888 -> 3888 bytes Tests/References/shkola_pattern_1.bin | Bin 4048 -> 4048 bytes Tests/References/shkola_pattern_2.bin | Bin 4096 -> 4096 bytes Tests/References/shkola_pattern_3.bin | Bin 3072 -> 3072 bytes Tests/References/sindikat_name_table_0.bin | Bin 256 -> 256 bytes Tests/References/sindikat_palette_1.bin | 2 +- Tests/References/sindikat_palette_2.bin | 2 +- Tests/References/sindikat_palette_3.bin | 2 +- Tests/References/sindikat_palettes.csv | 6 +- Tests/References/sindikat_pattern_0.bin | Bin 2224 -> 2240 bytes Tests/References/sindikat_pattern_1.bin | Bin 4000 -> 4000 bytes Tests/References/sindikat_pattern_2.bin | Bin 3872 -> 3872 bytes Tests/References/sindikat_pattern_3.bin | Bin 2096 -> 2096 bytes Tests/References/sindikat_tiles.csv | 200 ++-- Tests/References/sprites1_palette_0.bin | 2 +- Tests/References/sprites1_pattern_0.bin | Bin 192 -> 192 bytes Tests/References/sprites2_palette_0.bin | 2 +- Tests/References/sprites2_pattern_0.bin | Bin 224 -> 224 bytes Tests/References/sputnik_palette_0.bin | 2 +- Tests/References/sputnik_palette_1.bin | 2 +- Tests/References/sputnik_palettes.csv | 4 +- Tests/References/sputnik_pattern_0.bin | Bin 3696 -> 3696 bytes Tests/References/sputnik_pattern_1.bin | Bin 4000 -> 4000 bytes Tests/References/sputnik_pattern_2.bin | Bin 4096 -> 4096 bytes Tests/References/sputnik_pattern_3.bin | Bin 2992 -> 2992 bytes Tests/References/sworm_name_table_0.bin | Bin 256 -> 256 bytes Tests/References/sworm_name_table_2.bin | Bin 256 -> 256 bytes Tests/References/sworm_name_table_3.bin | Bin 192 -> 192 bytes Tests/References/sworm_palette_0.bin | Bin 4 -> 4 bytes Tests/References/sworm_palette_1.bin | Bin 4 -> 4 bytes Tests/References/sworm_palette_2.bin | Bin 4 -> 4 bytes Tests/References/sworm_palette_3.bin | Bin 4 -> 4 bytes Tests/References/sworm_palettes.csv | 8 +- Tests/References/sworm_pattern_0.bin | Bin 3968 -> 3984 bytes Tests/References/sworm_pattern_1.bin | Bin 4096 -> 4096 bytes Tests/References/sworm_pattern_2.bin | Bin 3888 -> 3888 bytes Tests/References/sworm_pattern_3.bin | Bin 1920 -> 1904 bytes Tests/References/sworm_tiles.csv | 590 +++++------ Tests/References/trailer-park_palette_0.bin | 2 +- Tests/References/trailer-park_palette_1.bin | 2 +- Tests/References/trailer-park_palette_2.bin | 2 +- Tests/References/trailer-park_palettes.csv | 6 +- Tests/References/trailer-park_pattern_0.bin | Bin 4096 -> 4096 bytes Tests/References/trailer-park_pattern_1.bin | Bin 4096 -> 4096 bytes Tests/References/trailer-park_pattern_2.bin | Bin 3888 -> 3888 bytes Tests/References/trailer-park_pattern_3.bin | Bin 3072 -> 3072 bytes Tests/References/warface_logo_palette_0.bin | 2 +- Tests/References/warface_logo_palettes.csv | 2 +- Tests/References/warface_logo_pattern_0.bin | Bin 544 -> 544 bytes Tests/References/warface_logo_pattern_1.bin | Bin 1264 -> 1264 bytes Tests/References/warface_logo_pattern_2.bin | Bin 1904 -> 1904 bytes Tests/References/warface_logo_pattern_3.bin | Bin 336 -> 336 bytes 183 files changed, 2309 insertions(+), 2349 deletions(-) diff --git a/NesTiler/Palette.cs b/NesTiler/Palette.cs index 224c29b..5944b1c 100644 --- a/NesTiler/Palette.cs +++ b/NesTiler/Palette.cs @@ -10,28 +10,19 @@ namespace com.clusterrr.Famicom.NesTiler { class Palette : IEquatable, IEnumerable { - private SKColor?[] colors = new SKColor?[3]; + private SKColor[] colors; private Dictionary deltaCache = new(); public SKColor? this[int i] { get { - if (i < 1 || i > 3) throw new IndexOutOfRangeException("Color index must be between 1 and 3"); + if (i > colors.Length) return null; + if (i <= 0) throw new ArgumentOutOfRangeException("Invalid color index"); return colors[i - 1]; } - set - { - if (i < 1 || i > 3) throw new IndexOutOfRangeException("Color index must be between 1 and 3"); - colors[i - 1] = value; - } - } - public int Count { get => colors.Where(c => c.HasValue).Count(); } - - public Palette() - { - // Empty palette } + public int Count => colors.Length; public Palette(FastBitmap image, int leftX, int topY, int width, int height, SKColor bgColor) { @@ -48,25 +39,13 @@ namespace com.clusterrr.Famicom.NesTiler } } - var sortedColors = colorCounter - .OrderByDescending(kv => kv.Value).ToArray(); - for (int i = 0; i < 3; i++) - if (sortedColors.Length > i) - this[i + 1] = sortedColors[i].Key; - } - - public void Add(SKColor color) - { - if (Count >= 3) throw new IndexOutOfRangeException(); - this[Count + 1] = color; - deltaCache.Clear(); + // TODO: one more lossy level? + colors = colorCounter.OrderByDescending(kv => kv.Value).Take(3).OrderBy(kv => kv.Key.ToArgb()).Select(kv => kv.Key).ToArray(); } public Palette(IEnumerable colors) { - var colorsList = colors.ToList(); - for (int i = 0; i < 3; i++) - if (colorsList.Count > i) this[i + 1] = colorsList[i]; + this.colors = colors.OrderBy(c => c.ToArgb()).Take(3).ToArray(); } public double GetTileDelta(FastBitmap image, int leftX, int topY, int width, int height, SKColor bgColor) @@ -92,7 +71,7 @@ namespace com.clusterrr.Famicom.NesTiler Color2 = bgColor }; if (deltaCache.ContainsKey(pair)) return deltaCache[pair]; - var ac = Enumerable.Concat(colors.Where(c => c.HasValue).Select(c => c!.Value), new SKColor[] { bgColor }); + var ac = Enumerable.Concat(colors, new SKColor[] { bgColor }); var result = ac.OrderBy(c => c.GetDelta(color)).First(); var r = (result, result.GetDelta(color)); deltaCache[pair] = r; @@ -102,27 +81,15 @@ namespace com.clusterrr.Famicom.NesTiler public bool Equals(Palette? other) { if (other == null) return false; - var colors1 = colors.Where(c => c.HasValue) - .Select(c => c!.Value.ToArgb()) - .OrderBy(c => c) - .ToArray(); - var colors2 = new SKColor?[] { other[1], other[2], other[3] } - .Where(c => c.HasValue) - .Select(c => c!.Value.ToArgb()) - .OrderBy(c => c) - .ToArray(); - var r = Enumerable.SequenceEqual(colors1, colors2); + var r = Enumerable.SequenceEqual(this, other); return r; } public bool Contains(Palette other) { - var thisColors = colors.Where(c => c.HasValue); - var otherColors = new SKColor?[] { other[1], other[2], other[3] }.Where(c => c.HasValue).Select(c => c!.Value); - - foreach (var color in otherColors) + foreach (var color in other) { - if (!thisColors.Contains(color)) + if (!this.Contains(color)) return false; } return true; @@ -130,7 +97,7 @@ namespace com.clusterrr.Famicom.NesTiler public IEnumerator GetEnumerator() { - return colors.Where(c => c.HasValue).Select(c => c!.Value).GetEnumerator(); + return colors.Select(c => c).GetEnumerator(); // wtf? } IEnumerator IEnumerable.GetEnumerator() @@ -138,7 +105,7 @@ namespace com.clusterrr.Famicom.NesTiler return GetEnumerator(); } - public override string ToString() => string.Join(", ", colors.Where(c => c.HasValue).Select(c => ColorTranslator.ToHtml(c!.Value.ToColor())).OrderBy(c => c)); + public override string ToString() => string.Join(", ", colors.Select(c => ColorTranslator.ToHtml(c.ToColor())).OrderBy(c => c)); public override int GetHashCode() => (int)((this[1]?.ToArgb() ?? 0) + ((this[2]?.ToArgb() ?? 0) << 4) + ((this[3]?.ToArgb() ?? 0) << 8)); } diff --git a/NesTiler/Program.cs b/NesTiler/Program.cs index 9d210e0..92f50fd 100644 --- a/NesTiler/Program.cs +++ b/NesTiler/Program.cs @@ -141,6 +141,7 @@ namespace com.clusterrr.Famicom.NesTiler var color = image.GetPixelColor(x, y); if (color.Alpha >= 0x80 || c.Mode == Config.TilesMode.Backgrounds) { + // TODO: more lossy levels? var similarColor = nesColors.FindSimilarColor(color); image.SetPixelColor(x, y, similarColor); } @@ -241,15 +242,8 @@ namespace com.clusterrr.Famicom.NesTiler } else if (calculatedPalettes.Any()) { - if (calculatedPalettes.Any()) - { - palettes[i] = calculatedPalettes.First(); - calculatedPalettes.RemoveAt(0); - } - else - { - palettes[i] = new Palette(); - } + palettes[i] = calculatedPalettes.First(); + calculatedPalettes.RemoveAt(0); } if (palettes[i] != null) @@ -544,8 +538,7 @@ namespace com.clusterrr.Famicom.NesTiler foreach (var imageNum in images.Keys) { var image = images[imageNum]; - int attributeTableOffset; - attributeTableOffsets.TryGetValue(imageNum, out attributeTableOffset); + attributeTableOffsets.TryGetValue(imageNum, out int attributeTableOffset); // For each tile/sprite for (int tileY = 0; tileY < (image.Height + attributeTableOffset) / tilePalHeight; tileY++) { @@ -604,19 +597,19 @@ namespace com.clusterrr.Famicom.NesTiler bool grouped = false; foreach (var t in top) { - if (t.Count < 3) + if (paletteCounter[t] > 0 && t.Count < 3) { foreach (var p in result) { var newColors = p.Where(c => !t.Contains(c)); - if (p != t && (newColors.Count() + t.Count <= 3)) + if ((p != t) && (paletteCounter[p] > 0) && (newColors.Count() + t.Count <= 3)) { var count1 = paletteCounter[t]; var count2 = paletteCounter[p]; paletteCounter[t] = 0; paletteCounter[p] = 0; - foreach (var c in newColors) t.Add(c); - paletteCounter[t] = count1 + count2; + var newPalette = new Palette(Enumerable.Concat(t, p).Distinct()); + paletteCounter[newPalette] = count1 + count2; grouped = true; } } diff --git a/Tests/References/belaya_akula_palette_0.bin b/Tests/References/belaya_akula_palette_0.bin index 915fb59..126167d 100644 --- a/Tests/References/belaya_akula_palette_0.bin +++ b/Tests/References/belaya_akula_palette_0.bin @@ -1 +1 @@ - "01 \ No newline at end of file + "10 \ No newline at end of file diff --git a/Tests/References/belaya_akula_palette_1.bin b/Tests/References/belaya_akula_palette_1.bin index f38f3e3..e2ac44d 100644 --- a/Tests/References/belaya_akula_palette_1.bin +++ b/Tests/References/belaya_akula_palette_1.bin @@ -1 +1 @@ - - \ No newline at end of file + - \ No newline at end of file diff --git a/Tests/References/belaya_akula_palette_3.bin b/Tests/References/belaya_akula_palette_3.bin index 91d8d18..fcf41c4 100644 --- a/Tests/References/belaya_akula_palette_3.bin +++ b/Tests/References/belaya_akula_palette_3.bin @@ -1 +1 @@ - 7 \ No newline at end of file + 7 \ No newline at end of file diff --git a/Tests/References/belaya_akula_palettes.csv b/Tests/References/belaya_akula_palettes.csv index 50d5b41..c672c5f 100644 --- a/Tests/References/belaya_akula_palettes.csv +++ b/Tests/References/belaya_akula_palettes.csv @@ -1,5 +1,5 @@ palette_id,color0,color1,color2,color3 -0,#183C5C,#5C94FC,#FFFFFF,#A8E4FC -1,#183C5C,#787878,#009038,#000000 +0,#183C5C,#5C94FC,#A8E4FC,#FFFFFF +1,#183C5C,#000000,#009038,#787878 2,#183C5C,#787878,#C4D4FC,#FFFFFF -3,#183C5C,#FCD8A8,#C84C0C,#000000 +3,#183C5C,#000000,#C84C0C,#FCD8A8 diff --git a/Tests/References/belaya_akula_pattern_0.bin b/Tests/References/belaya_akula_pattern_0.bin index b93aef3..021fe66 100644 Binary files a/Tests/References/belaya_akula_pattern_0.bin and b/Tests/References/belaya_akula_pattern_0.bin differ diff --git a/Tests/References/belaya_akula_pattern_1.bin b/Tests/References/belaya_akula_pattern_1.bin index 17d08b7..6aab515 100644 Binary files a/Tests/References/belaya_akula_pattern_1.bin and b/Tests/References/belaya_akula_pattern_1.bin differ diff --git a/Tests/References/belaya_akula_pattern_2.bin b/Tests/References/belaya_akula_pattern_2.bin index 32edab4..1e278b7 100644 Binary files a/Tests/References/belaya_akula_pattern_2.bin and b/Tests/References/belaya_akula_pattern_2.bin differ diff --git a/Tests/References/belaya_akula_pattern_3.bin b/Tests/References/belaya_akula_pattern_3.bin index 7495ce5..1cac7e7 100644 Binary files a/Tests/References/belaya_akula_pattern_3.bin and b/Tests/References/belaya_akula_pattern_3.bin differ diff --git a/Tests/References/blaster_master_left_blaster_master_right_name_table_1.bin b/Tests/References/blaster_master_left_blaster_master_right_name_table_1.bin index dd3427c..b273c57 100644 Binary files a/Tests/References/blaster_master_left_blaster_master_right_name_table_1.bin and b/Tests/References/blaster_master_left_blaster_master_right_name_table_1.bin differ diff --git a/Tests/References/blaster_master_left_blaster_master_right_palette_0.bin b/Tests/References/blaster_master_left_blaster_master_right_palette_0.bin index e823a57..ca803c7 100644 --- a/Tests/References/blaster_master_left_blaster_master_right_palette_0.bin +++ b/Tests/References/blaster_master_left_blaster_master_right_palette_0.bin @@ -1 +1 @@ - ! \ No newline at end of file +! \ No newline at end of file diff --git a/Tests/References/blaster_master_left_blaster_master_right_palette_1.bin b/Tests/References/blaster_master_left_blaster_master_right_palette_1.bin index 977f53a..66a703a 100644 --- a/Tests/References/blaster_master_left_blaster_master_right_palette_1.bin +++ b/Tests/References/blaster_master_left_blaster_master_right_palette_1.bin @@ -1,2 +1,2 @@  -* \ No newline at end of file +* \ No newline at end of file diff --git a/Tests/References/blaster_master_left_blaster_master_right_palette_2.bin b/Tests/References/blaster_master_left_blaster_master_right_palette_2.bin index 3246d2a..e43c33f 100644 --- a/Tests/References/blaster_master_left_blaster_master_right_palette_2.bin +++ b/Tests/References/blaster_master_left_blaster_master_right_palette_2.bin @@ -1 +1 @@ - , \ No newline at end of file +, \ No newline at end of file diff --git a/Tests/References/blaster_master_left_blaster_master_right_palette_3.bin b/Tests/References/blaster_master_left_blaster_master_right_palette_3.bin index 739efd9..4fc6142 100644 Binary files a/Tests/References/blaster_master_left_blaster_master_right_palette_3.bin and b/Tests/References/blaster_master_left_blaster_master_right_palette_3.bin differ diff --git a/Tests/References/blaster_master_left_blaster_master_right_palettes.csv b/Tests/References/blaster_master_left_blaster_master_right_palettes.csv index 26d33fc..3a00088 100644 --- a/Tests/References/blaster_master_left_blaster_master_right_palettes.csv +++ b/Tests/References/blaster_master_left_blaster_master_right_palettes.csv @@ -1,5 +1,5 @@ palette_id,color0,color1,color2,color3 -0,#000000,#009038,#FCFCFC,#3CBCFC -1,#000000,#005000,#4CDC48,#00A800 -2,#000000,#183C5C,#009038,#00E8D8 -3,#000000,#E40058,#FCFCFC,#747474 +0,#000000,#009038,#3CBCFC,#FCFCFC +1,#000000,#005000,#00A800,#4CDC48 +2,#000000,#009038,#00E8D8,#183C5C +3,#000000,#747474,#E40058,#FCFCFC diff --git a/Tests/References/blaster_master_left_blaster_master_right_pattern_0.bin b/Tests/References/blaster_master_left_blaster_master_right_pattern_0.bin index 1ad25a2..ea60cb4 100644 Binary files a/Tests/References/blaster_master_left_blaster_master_right_pattern_0.bin and b/Tests/References/blaster_master_left_blaster_master_right_pattern_0.bin differ diff --git a/Tests/References/blaster_master_left_blaster_master_right_tiles.csv b/Tests/References/blaster_master_left_blaster_master_right_tiles.csv index dae4366..d085810 100644 --- a/Tests/References/blaster_master_left_blaster_master_right_tiles.csv +++ b/Tests/References/blaster_master_left_blaster_master_right_tiles.csv @@ -1618,89 +1618,89 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 1,Images\blaster_master_right.png,20,16,128,160,8,8,45,3 1,Images\blaster_master_right.png,20,17,136,160,8,8,47,3 1,Images\blaster_master_right.png,20,18,144,160,8,8,49,3 -1,Images\blaster_master_right.png,20,19,152,160,8,8,0,3 -1,Images\blaster_master_right.png,20,20,160,160,8,8,0,3 -1,Images\blaster_master_right.png,20,21,168,160,8,8,51,3 -1,Images\blaster_master_right.png,20,22,176,160,8,8,53,3 -1,Images\blaster_master_right.png,20,23,184,160,8,8,55,3 -1,Images\blaster_master_right.png,20,24,192,160,8,8,57,3 -1,Images\blaster_master_right.png,20,25,200,160,8,8,0,3 -1,Images\blaster_master_right.png,20,26,208,160,8,8,59,3 +1,Images\blaster_master_right.png,20,19,152,160,8,8,51,3 +1,Images\blaster_master_right.png,20,20,160,160,8,8,51,3 +1,Images\blaster_master_right.png,20,21,168,160,8,8,53,3 +1,Images\blaster_master_right.png,20,22,176,160,8,8,55,3 +1,Images\blaster_master_right.png,20,23,184,160,8,8,57,3 +1,Images\blaster_master_right.png,20,24,192,160,8,8,59,3 +1,Images\blaster_master_right.png,20,25,200,160,8,8,51,3 +1,Images\blaster_master_right.png,20,26,208,160,8,8,61,3 1,Images\blaster_master_right.png,20,27,216,160,8,8,52,3 1,Images\blaster_master_right.png,20,28,224,160,8,8,52,0 1,Images\blaster_master_right.png,20,29,232,160,8,8,52,0 -1,Images\blaster_master_right.png,20,30,240,160,8,8,61,1 -1,Images\blaster_master_right.png,20,31,248,160,8,8,63,1 -1,Images\blaster_master_right.png,21,0,0,168,8,8,65,1 -1,Images\blaster_master_right.png,21,1,8,168,8,8,67,1 -1,Images\blaster_master_right.png,21,2,16,168,8,8,65,1 -1,Images\blaster_master_right.png,21,3,24,168,8,8,67,1 -1,Images\blaster_master_right.png,21,4,32,168,8,8,65,1 -1,Images\blaster_master_right.png,21,5,40,168,8,8,67,1 -1,Images\blaster_master_right.png,21,6,48,168,8,8,65,1 -1,Images\blaster_master_right.png,21,7,56,168,8,8,67,1 -1,Images\blaster_master_right.png,21,8,64,168,8,8,65,1 -1,Images\blaster_master_right.png,21,9,72,168,8,8,67,1 -1,Images\blaster_master_right.png,21,10,80,168,8,8,65,1 -1,Images\blaster_master_right.png,21,11,88,168,8,8,67,1 -1,Images\blaster_master_right.png,21,12,96,168,8,8,65,1 -1,Images\blaster_master_right.png,21,13,104,168,8,8,67,1 -1,Images\blaster_master_right.png,21,14,112,168,8,8,69,3 -1,Images\blaster_master_right.png,21,15,120,168,8,8,71,3 -1,Images\blaster_master_right.png,21,16,128,168,8,8,73,3 -1,Images\blaster_master_right.png,21,17,136,168,8,8,75,3 -1,Images\blaster_master_right.png,21,18,144,168,8,8,77,3 -1,Images\blaster_master_right.png,21,19,152,168,8,8,79,3 -1,Images\blaster_master_right.png,21,20,160,168,8,8,81,3 -1,Images\blaster_master_right.png,21,21,168,168,8,8,83,3 -1,Images\blaster_master_right.png,21,22,176,168,8,8,85,3 -1,Images\blaster_master_right.png,21,23,184,168,8,8,87,3 -1,Images\blaster_master_right.png,21,24,192,168,8,8,89,3 -1,Images\blaster_master_right.png,21,25,200,168,8,8,91,3 -1,Images\blaster_master_right.png,21,26,208,168,8,8,93,3 +1,Images\blaster_master_right.png,20,30,240,160,8,8,63,1 +1,Images\blaster_master_right.png,20,31,248,160,8,8,65,1 +1,Images\blaster_master_right.png,21,0,0,168,8,8,67,1 +1,Images\blaster_master_right.png,21,1,8,168,8,8,69,1 +1,Images\blaster_master_right.png,21,2,16,168,8,8,67,1 +1,Images\blaster_master_right.png,21,3,24,168,8,8,69,1 +1,Images\blaster_master_right.png,21,4,32,168,8,8,67,1 +1,Images\blaster_master_right.png,21,5,40,168,8,8,69,1 +1,Images\blaster_master_right.png,21,6,48,168,8,8,67,1 +1,Images\blaster_master_right.png,21,7,56,168,8,8,69,1 +1,Images\blaster_master_right.png,21,8,64,168,8,8,67,1 +1,Images\blaster_master_right.png,21,9,72,168,8,8,69,1 +1,Images\blaster_master_right.png,21,10,80,168,8,8,67,1 +1,Images\blaster_master_right.png,21,11,88,168,8,8,69,1 +1,Images\blaster_master_right.png,21,12,96,168,8,8,67,1 +1,Images\blaster_master_right.png,21,13,104,168,8,8,69,1 +1,Images\blaster_master_right.png,21,14,112,168,8,8,71,3 +1,Images\blaster_master_right.png,21,15,120,168,8,8,73,3 +1,Images\blaster_master_right.png,21,16,128,168,8,8,75,3 +1,Images\blaster_master_right.png,21,17,136,168,8,8,77,3 +1,Images\blaster_master_right.png,21,18,144,168,8,8,79,3 +1,Images\blaster_master_right.png,21,19,152,168,8,8,81,3 +1,Images\blaster_master_right.png,21,20,160,168,8,8,83,3 +1,Images\blaster_master_right.png,21,21,168,168,8,8,85,3 +1,Images\blaster_master_right.png,21,22,176,168,8,8,87,3 +1,Images\blaster_master_right.png,21,23,184,168,8,8,89,3 +1,Images\blaster_master_right.png,21,24,192,168,8,8,91,3 +1,Images\blaster_master_right.png,21,25,200,168,8,8,93,3 +1,Images\blaster_master_right.png,21,26,208,168,8,8,95,3 1,Images\blaster_master_right.png,21,27,216,168,8,8,52,3 1,Images\blaster_master_right.png,21,28,224,168,8,8,52,0 1,Images\blaster_master_right.png,21,29,232,168,8,8,52,0 -1,Images\blaster_master_right.png,21,30,240,168,8,8,95,1 -1,Images\blaster_master_right.png,21,31,248,168,8,8,97,1 -1,Images\blaster_master_right.png,22,0,0,176,8,8,99,1 -1,Images\blaster_master_right.png,22,1,8,176,8,8,101,1 -1,Images\blaster_master_right.png,22,2,16,176,8,8,99,1 -1,Images\blaster_master_right.png,22,3,24,176,8,8,101,1 -1,Images\blaster_master_right.png,22,4,32,176,8,8,99,1 -1,Images\blaster_master_right.png,22,5,40,176,8,8,101,1 -1,Images\blaster_master_right.png,22,6,48,176,8,8,99,1 -1,Images\blaster_master_right.png,22,7,56,176,8,8,101,1 -1,Images\blaster_master_right.png,22,8,64,176,8,8,99,1 -1,Images\blaster_master_right.png,22,9,72,176,8,8,101,1 -1,Images\blaster_master_right.png,22,10,80,176,8,8,99,1 -1,Images\blaster_master_right.png,22,11,88,176,8,8,101,1 -1,Images\blaster_master_right.png,22,12,96,176,8,8,99,1 -1,Images\blaster_master_right.png,22,13,104,176,8,8,101,1 -1,Images\blaster_master_right.png,22,14,112,176,8,8,103,3 -1,Images\blaster_master_right.png,22,15,120,176,8,8,105,3 -1,Images\blaster_master_right.png,22,16,128,176,8,8,107,3 -1,Images\blaster_master_right.png,22,17,136,176,8,8,109,3 -1,Images\blaster_master_right.png,22,18,144,176,8,8,111,3 -1,Images\blaster_master_right.png,22,19,152,176,8,8,113,3 +1,Images\blaster_master_right.png,21,30,240,168,8,8,97,1 +1,Images\blaster_master_right.png,21,31,248,168,8,8,99,1 +1,Images\blaster_master_right.png,22,0,0,176,8,8,101,1 +1,Images\blaster_master_right.png,22,1,8,176,8,8,103,1 +1,Images\blaster_master_right.png,22,2,16,176,8,8,101,1 +1,Images\blaster_master_right.png,22,3,24,176,8,8,103,1 +1,Images\blaster_master_right.png,22,4,32,176,8,8,101,1 +1,Images\blaster_master_right.png,22,5,40,176,8,8,103,1 +1,Images\blaster_master_right.png,22,6,48,176,8,8,101,1 +1,Images\blaster_master_right.png,22,7,56,176,8,8,103,1 +1,Images\blaster_master_right.png,22,8,64,176,8,8,101,1 +1,Images\blaster_master_right.png,22,9,72,176,8,8,103,1 +1,Images\blaster_master_right.png,22,10,80,176,8,8,101,1 +1,Images\blaster_master_right.png,22,11,88,176,8,8,103,1 +1,Images\blaster_master_right.png,22,12,96,176,8,8,101,1 +1,Images\blaster_master_right.png,22,13,104,176,8,8,103,1 +1,Images\blaster_master_right.png,22,14,112,176,8,8,105,3 +1,Images\blaster_master_right.png,22,15,120,176,8,8,107,3 +1,Images\blaster_master_right.png,22,16,128,176,8,8,109,3 +1,Images\blaster_master_right.png,22,17,136,176,8,8,111,3 +1,Images\blaster_master_right.png,22,18,144,176,8,8,113,3 +1,Images\blaster_master_right.png,22,19,152,176,8,8,115,3 1,Images\blaster_master_right.png,22,20,160,176,8,8,52,3 -1,Images\blaster_master_right.png,22,21,168,176,8,8,115,3 -1,Images\blaster_master_right.png,22,22,176,176,8,8,117,3 -1,Images\blaster_master_right.png,22,23,184,176,8,8,119,3 -1,Images\blaster_master_right.png,22,24,192,176,8,8,121,3 -1,Images\blaster_master_right.png,22,25,200,176,8,8,123,3 -1,Images\blaster_master_right.png,22,26,208,176,8,8,125,3 +1,Images\blaster_master_right.png,22,21,168,176,8,8,117,3 +1,Images\blaster_master_right.png,22,22,176,176,8,8,119,3 +1,Images\blaster_master_right.png,22,23,184,176,8,8,121,3 +1,Images\blaster_master_right.png,22,24,192,176,8,8,123,3 +1,Images\blaster_master_right.png,22,25,200,176,8,8,125,3 +1,Images\blaster_master_right.png,22,26,208,176,8,8,127,3 1,Images\blaster_master_right.png,22,27,216,176,8,8,52,3 -1,Images\blaster_master_right.png,22,28,224,176,8,8,61,1 -1,Images\blaster_master_right.png,22,29,232,176,8,8,127,1 -1,Images\blaster_master_right.png,22,30,240,176,8,8,129,1 -1,Images\blaster_master_right.png,22,31,248,176,8,8,97,1 -1,Images\blaster_master_right.png,23,0,0,184,8,8,131,1 -1,Images\blaster_master_right.png,23,1,8,184,8,8,133,1 +1,Images\blaster_master_right.png,22,28,224,176,8,8,63,1 +1,Images\blaster_master_right.png,22,29,232,176,8,8,129,1 +1,Images\blaster_master_right.png,22,30,240,176,8,8,131,1 +1,Images\blaster_master_right.png,22,31,248,176,8,8,99,1 +1,Images\blaster_master_right.png,23,0,0,184,8,8,133,1 +1,Images\blaster_master_right.png,23,1,8,184,8,8,135,1 1,Images\blaster_master_right.png,23,2,16,184,8,8,52,1 1,Images\blaster_master_right.png,23,3,24,184,8,8,52,1 -1,Images\blaster_master_right.png,23,4,32,184,8,8,61,1 -1,Images\blaster_master_right.png,23,5,40,184,8,8,133,1 +1,Images\blaster_master_right.png,23,4,32,184,8,8,63,1 +1,Images\blaster_master_right.png,23,5,40,184,8,8,135,1 1,Images\blaster_master_right.png,23,6,48,184,8,8,52,1 1,Images\blaster_master_right.png,23,7,56,184,8,8,52,1 1,Images\blaster_master_right.png,23,8,64,184,8,8,52,1 @@ -1709,184 +1709,184 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 1,Images\blaster_master_right.png,23,11,88,184,8,8,52,1 1,Images\blaster_master_right.png,23,12,96,184,8,8,52,1 1,Images\blaster_master_right.png,23,13,104,184,8,8,52,1 -1,Images\blaster_master_right.png,23,14,112,184,8,8,135,3 -1,Images\blaster_master_right.png,23,15,120,184,8,8,137,3 -1,Images\blaster_master_right.png,23,16,128,184,8,8,139,3 +1,Images\blaster_master_right.png,23,14,112,184,8,8,137,3 +1,Images\blaster_master_right.png,23,15,120,184,8,8,139,3 +1,Images\blaster_master_right.png,23,16,128,184,8,8,141,3 1,Images\blaster_master_right.png,23,17,136,184,8,8,52,3 -1,Images\blaster_master_right.png,23,18,144,184,8,8,141,3 -1,Images\blaster_master_right.png,23,19,152,184,8,8,143,3 -1,Images\blaster_master_right.png,23,20,160,184,8,8,145,3 -1,Images\blaster_master_right.png,23,21,168,184,8,8,147,3 +1,Images\blaster_master_right.png,23,18,144,184,8,8,143,3 +1,Images\blaster_master_right.png,23,19,152,184,8,8,145,3 +1,Images\blaster_master_right.png,23,20,160,184,8,8,147,3 +1,Images\blaster_master_right.png,23,21,168,184,8,8,149,3 1,Images\blaster_master_right.png,23,22,176,184,8,8,52,3 -1,Images\blaster_master_right.png,23,23,184,184,8,8,149,3 -1,Images\blaster_master_right.png,23,24,192,184,8,8,151,3 -1,Images\blaster_master_right.png,23,25,200,184,8,8,153,3 -1,Images\blaster_master_right.png,23,26,208,184,8,8,155,3 +1,Images\blaster_master_right.png,23,23,184,184,8,8,151,3 +1,Images\blaster_master_right.png,23,24,192,184,8,8,153,3 +1,Images\blaster_master_right.png,23,25,200,184,8,8,155,3 +1,Images\blaster_master_right.png,23,26,208,184,8,8,157,3 1,Images\blaster_master_right.png,23,27,216,184,8,8,52,3 -1,Images\blaster_master_right.png,23,28,224,184,8,8,95,1 -1,Images\blaster_master_right.png,23,29,232,184,8,8,97,1 -1,Images\blaster_master_right.png,23,30,240,184,8,8,157,1 -1,Images\blaster_master_right.png,23,31,248,184,8,8,159,1 -1,Images\blaster_master_right.png,24,0,0,192,8,8,129,1 -1,Images\blaster_master_right.png,24,1,8,192,8,8,161,1 -1,Images\blaster_master_right.png,24,2,16,192,8,8,131,1 -1,Images\blaster_master_right.png,24,3,24,192,8,8,127,1 -1,Images\blaster_master_right.png,24,4,32,192,8,8,129,1 -1,Images\blaster_master_right.png,24,5,40,192,8,8,161,1 -1,Images\blaster_master_right.png,24,6,48,192,8,8,131,1 -1,Images\blaster_master_right.png,24,7,56,192,8,8,133,1 +1,Images\blaster_master_right.png,23,28,224,184,8,8,97,1 +1,Images\blaster_master_right.png,23,29,232,184,8,8,99,1 +1,Images\blaster_master_right.png,23,30,240,184,8,8,159,1 +1,Images\blaster_master_right.png,23,31,248,184,8,8,161,1 +1,Images\blaster_master_right.png,24,0,0,192,8,8,131,1 +1,Images\blaster_master_right.png,24,1,8,192,8,8,163,1 +1,Images\blaster_master_right.png,24,2,16,192,8,8,133,1 +1,Images\blaster_master_right.png,24,3,24,192,8,8,129,1 +1,Images\blaster_master_right.png,24,4,32,192,8,8,131,1 +1,Images\blaster_master_right.png,24,5,40,192,8,8,163,1 +1,Images\blaster_master_right.png,24,6,48,192,8,8,133,1 +1,Images\blaster_master_right.png,24,7,56,192,8,8,135,1 1,Images\blaster_master_right.png,24,8,64,192,8,8,52,0 1,Images\blaster_master_right.png,24,9,72,192,8,8,52,0 -1,Images\blaster_master_right.png,24,10,80,192,8,8,163,2 -1,Images\blaster_master_right.png,24,11,88,192,8,8,165,2 -1,Images\blaster_master_right.png,24,12,96,192,8,8,167,2 -1,Images\blaster_master_right.png,24,13,104,192,8,8,165,2 -1,Images\blaster_master_right.png,24,14,112,192,8,8,167,2 -1,Images\blaster_master_right.png,24,15,120,192,8,8,169,2 -1,Images\blaster_master_right.png,24,16,128,192,8,8,171,2 -1,Images\blaster_master_right.png,24,17,136,192,8,8,173,2 -1,Images\blaster_master_right.png,24,18,144,192,8,8,175,2 -1,Images\blaster_master_right.png,24,19,152,192,8,8,177,2 -1,Images\blaster_master_right.png,24,20,160,192,8,8,171,2 -1,Images\blaster_master_right.png,24,21,168,192,8,8,173,2 -1,Images\blaster_master_right.png,24,22,176,192,8,8,175,2 -1,Images\blaster_master_right.png,24,23,184,192,8,8,177,2 -1,Images\blaster_master_right.png,24,24,192,192,8,8,171,2 -1,Images\blaster_master_right.png,24,25,200,192,8,8,173,2 -1,Images\blaster_master_right.png,24,26,208,192,8,8,175,2 -1,Images\blaster_master_right.png,24,27,216,192,8,8,177,2 -1,Images\blaster_master_right.png,24,28,224,192,8,8,171,2 -1,Images\blaster_master_right.png,24,29,232,192,8,8,173,2 -1,Images\blaster_master_right.png,24,30,240,192,8,8,175,2 -1,Images\blaster_master_right.png,24,31,248,192,8,8,177,2 -1,Images\blaster_master_right.png,25,0,0,200,8,8,157,1 -1,Images\blaster_master_right.png,25,1,8,200,8,8,159,1 -1,Images\blaster_master_right.png,25,2,16,200,8,8,129,1 -1,Images\blaster_master_right.png,25,3,24,200,8,8,97,1 -1,Images\blaster_master_right.png,25,4,32,200,8,8,129,1 -1,Images\blaster_master_right.png,25,5,40,200,8,8,97,1 -1,Images\blaster_master_right.png,25,6,48,200,8,8,129,1 -1,Images\blaster_master_right.png,25,7,56,200,8,8,161,1 +1,Images\blaster_master_right.png,24,10,80,192,8,8,165,2 +1,Images\blaster_master_right.png,24,11,88,192,8,8,167,2 +1,Images\blaster_master_right.png,24,12,96,192,8,8,169,2 +1,Images\blaster_master_right.png,24,13,104,192,8,8,167,2 +1,Images\blaster_master_right.png,24,14,112,192,8,8,169,2 +1,Images\blaster_master_right.png,24,15,120,192,8,8,171,2 +1,Images\blaster_master_right.png,24,16,128,192,8,8,173,2 +1,Images\blaster_master_right.png,24,17,136,192,8,8,175,2 +1,Images\blaster_master_right.png,24,18,144,192,8,8,177,2 +1,Images\blaster_master_right.png,24,19,152,192,8,8,179,2 +1,Images\blaster_master_right.png,24,20,160,192,8,8,173,2 +1,Images\blaster_master_right.png,24,21,168,192,8,8,175,2 +1,Images\blaster_master_right.png,24,22,176,192,8,8,177,2 +1,Images\blaster_master_right.png,24,23,184,192,8,8,179,2 +1,Images\blaster_master_right.png,24,24,192,192,8,8,173,2 +1,Images\blaster_master_right.png,24,25,200,192,8,8,175,2 +1,Images\blaster_master_right.png,24,26,208,192,8,8,177,2 +1,Images\blaster_master_right.png,24,27,216,192,8,8,179,2 +1,Images\blaster_master_right.png,24,28,224,192,8,8,173,2 +1,Images\blaster_master_right.png,24,29,232,192,8,8,175,2 +1,Images\blaster_master_right.png,24,30,240,192,8,8,177,2 +1,Images\blaster_master_right.png,24,31,248,192,8,8,179,2 +1,Images\blaster_master_right.png,25,0,0,200,8,8,159,1 +1,Images\blaster_master_right.png,25,1,8,200,8,8,161,1 +1,Images\blaster_master_right.png,25,2,16,200,8,8,131,1 +1,Images\blaster_master_right.png,25,3,24,200,8,8,99,1 +1,Images\blaster_master_right.png,25,4,32,200,8,8,131,1 +1,Images\blaster_master_right.png,25,5,40,200,8,8,99,1 +1,Images\blaster_master_right.png,25,6,48,200,8,8,131,1 +1,Images\blaster_master_right.png,25,7,56,200,8,8,163,1 1,Images\blaster_master_right.png,25,8,64,200,8,8,52,0 1,Images\blaster_master_right.png,25,9,72,200,8,8,52,0 -1,Images\blaster_master_right.png,25,10,80,200,8,8,179,2 -1,Images\blaster_master_right.png,25,11,88,200,8,8,181,2 -1,Images\blaster_master_right.png,25,12,96,200,8,8,183,2 -1,Images\blaster_master_right.png,25,13,104,200,8,8,181,2 -1,Images\blaster_master_right.png,25,14,112,200,8,8,183,2 -1,Images\blaster_master_right.png,25,15,120,200,8,8,185,2 -1,Images\blaster_master_right.png,25,16,128,200,8,8,187,2 -1,Images\blaster_master_right.png,25,17,136,200,8,8,189,2 -1,Images\blaster_master_right.png,25,18,144,200,8,8,191,2 -1,Images\blaster_master_right.png,25,19,152,200,8,8,193,2 -1,Images\blaster_master_right.png,25,20,160,200,8,8,187,2 -1,Images\blaster_master_right.png,25,21,168,200,8,8,189,2 -1,Images\blaster_master_right.png,25,22,176,200,8,8,191,2 -1,Images\blaster_master_right.png,25,23,184,200,8,8,193,2 -1,Images\blaster_master_right.png,25,24,192,200,8,8,187,2 -1,Images\blaster_master_right.png,25,25,200,200,8,8,189,2 -1,Images\blaster_master_right.png,25,26,208,200,8,8,191,2 -1,Images\blaster_master_right.png,25,27,216,200,8,8,193,2 -1,Images\blaster_master_right.png,25,28,224,200,8,8,187,2 -1,Images\blaster_master_right.png,25,29,232,200,8,8,189,2 -1,Images\blaster_master_right.png,25,30,240,200,8,8,191,2 -1,Images\blaster_master_right.png,25,31,248,200,8,8,193,2 -1,Images\blaster_master_right.png,26,0,0,208,8,8,195,1 -1,Images\blaster_master_right.png,26,1,8,208,8,8,197,1 -1,Images\blaster_master_right.png,26,2,16,208,8,8,195,1 -1,Images\blaster_master_right.png,26,3,24,208,8,8,197,1 -1,Images\blaster_master_right.png,26,4,32,208,8,8,195,1 -1,Images\blaster_master_right.png,26,5,40,208,8,8,197,1 -1,Images\blaster_master_right.png,26,6,48,208,8,8,129,1 -1,Images\blaster_master_right.png,26,7,56,208,8,8,97,1 -1,Images\blaster_master_right.png,26,8,64,208,8,8,131,1 -1,Images\blaster_master_right.png,26,9,72,208,8,8,133,1 +1,Images\blaster_master_right.png,25,10,80,200,8,8,181,2 +1,Images\blaster_master_right.png,25,11,88,200,8,8,183,2 +1,Images\blaster_master_right.png,25,12,96,200,8,8,185,2 +1,Images\blaster_master_right.png,25,13,104,200,8,8,183,2 +1,Images\blaster_master_right.png,25,14,112,200,8,8,185,2 +1,Images\blaster_master_right.png,25,15,120,200,8,8,187,2 +1,Images\blaster_master_right.png,25,16,128,200,8,8,189,2 +1,Images\blaster_master_right.png,25,17,136,200,8,8,191,2 +1,Images\blaster_master_right.png,25,18,144,200,8,8,193,2 +1,Images\blaster_master_right.png,25,19,152,200,8,8,195,2 +1,Images\blaster_master_right.png,25,20,160,200,8,8,189,2 +1,Images\blaster_master_right.png,25,21,168,200,8,8,191,2 +1,Images\blaster_master_right.png,25,22,176,200,8,8,193,2 +1,Images\blaster_master_right.png,25,23,184,200,8,8,195,2 +1,Images\blaster_master_right.png,25,24,192,200,8,8,189,2 +1,Images\blaster_master_right.png,25,25,200,200,8,8,191,2 +1,Images\blaster_master_right.png,25,26,208,200,8,8,193,2 +1,Images\blaster_master_right.png,25,27,216,200,8,8,195,2 +1,Images\blaster_master_right.png,25,28,224,200,8,8,189,2 +1,Images\blaster_master_right.png,25,29,232,200,8,8,191,2 +1,Images\blaster_master_right.png,25,30,240,200,8,8,193,2 +1,Images\blaster_master_right.png,25,31,248,200,8,8,195,2 +1,Images\blaster_master_right.png,26,0,0,208,8,8,197,1 +1,Images\blaster_master_right.png,26,1,8,208,8,8,199,1 +1,Images\blaster_master_right.png,26,2,16,208,8,8,197,1 +1,Images\blaster_master_right.png,26,3,24,208,8,8,199,1 +1,Images\blaster_master_right.png,26,4,32,208,8,8,197,1 +1,Images\blaster_master_right.png,26,5,40,208,8,8,199,1 +1,Images\blaster_master_right.png,26,6,48,208,8,8,131,1 +1,Images\blaster_master_right.png,26,7,56,208,8,8,99,1 +1,Images\blaster_master_right.png,26,8,64,208,8,8,133,1 +1,Images\blaster_master_right.png,26,9,72,208,8,8,135,1 1,Images\blaster_master_right.png,26,10,80,208,8,8,52,0 1,Images\blaster_master_right.png,26,11,88,208,8,8,52,0 -1,Images\blaster_master_right.png,26,12,96,208,8,8,199,2 -1,Images\blaster_master_right.png,26,13,104,208,8,8,201,2 -1,Images\blaster_master_right.png,26,14,112,208,8,8,203,2 -1,Images\blaster_master_right.png,26,15,120,208,8,8,205,2 -1,Images\blaster_master_right.png,26,16,128,208,8,8,207,2 -1,Images\blaster_master_right.png,26,17,136,208,8,8,209,2 -1,Images\blaster_master_right.png,26,18,144,208,8,8,211,2 -1,Images\blaster_master_right.png,26,19,152,208,8,8,213,2 -1,Images\blaster_master_right.png,26,20,160,208,8,8,207,2 -1,Images\blaster_master_right.png,26,21,168,208,8,8,209,2 -1,Images\blaster_master_right.png,26,22,176,208,8,8,211,2 -1,Images\blaster_master_right.png,26,23,184,208,8,8,213,2 -1,Images\blaster_master_right.png,26,24,192,208,8,8,207,2 -1,Images\blaster_master_right.png,26,25,200,208,8,8,209,2 -1,Images\blaster_master_right.png,26,26,208,208,8,8,211,2 -1,Images\blaster_master_right.png,26,27,216,208,8,8,213,2 -1,Images\blaster_master_right.png,26,28,224,208,8,8,207,2 -1,Images\blaster_master_right.png,26,29,232,208,8,8,209,2 -1,Images\blaster_master_right.png,26,30,240,208,8,8,211,2 -1,Images\blaster_master_right.png,26,31,248,208,8,8,213,2 -1,Images\blaster_master_right.png,27,0,0,216,8,8,157,1 -1,Images\blaster_master_right.png,27,1,8,216,8,8,159,1 -1,Images\blaster_master_right.png,27,2,16,216,8,8,157,1 -1,Images\blaster_master_right.png,27,3,24,216,8,8,159,1 -1,Images\blaster_master_right.png,27,4,32,216,8,8,157,1 -1,Images\blaster_master_right.png,27,5,40,216,8,8,159,1 -1,Images\blaster_master_right.png,27,6,48,216,8,8,157,1 -1,Images\blaster_master_right.png,27,7,56,216,8,8,159,1 -1,Images\blaster_master_right.png,27,8,64,216,8,8,129,1 -1,Images\blaster_master_right.png,27,9,72,216,8,8,161,1 +1,Images\blaster_master_right.png,26,12,96,208,8,8,201,2 +1,Images\blaster_master_right.png,26,13,104,208,8,8,203,2 +1,Images\blaster_master_right.png,26,14,112,208,8,8,205,2 +1,Images\blaster_master_right.png,26,15,120,208,8,8,207,2 +1,Images\blaster_master_right.png,26,16,128,208,8,8,209,2 +1,Images\blaster_master_right.png,26,17,136,208,8,8,211,2 +1,Images\blaster_master_right.png,26,18,144,208,8,8,213,2 +1,Images\blaster_master_right.png,26,19,152,208,8,8,215,2 +1,Images\blaster_master_right.png,26,20,160,208,8,8,209,2 +1,Images\blaster_master_right.png,26,21,168,208,8,8,211,2 +1,Images\blaster_master_right.png,26,22,176,208,8,8,213,2 +1,Images\blaster_master_right.png,26,23,184,208,8,8,215,2 +1,Images\blaster_master_right.png,26,24,192,208,8,8,209,2 +1,Images\blaster_master_right.png,26,25,200,208,8,8,211,2 +1,Images\blaster_master_right.png,26,26,208,208,8,8,213,2 +1,Images\blaster_master_right.png,26,27,216,208,8,8,215,2 +1,Images\blaster_master_right.png,26,28,224,208,8,8,209,2 +1,Images\blaster_master_right.png,26,29,232,208,8,8,211,2 +1,Images\blaster_master_right.png,26,30,240,208,8,8,213,2 +1,Images\blaster_master_right.png,26,31,248,208,8,8,215,2 +1,Images\blaster_master_right.png,27,0,0,216,8,8,159,1 +1,Images\blaster_master_right.png,27,1,8,216,8,8,161,1 +1,Images\blaster_master_right.png,27,2,16,216,8,8,159,1 +1,Images\blaster_master_right.png,27,3,24,216,8,8,161,1 +1,Images\blaster_master_right.png,27,4,32,216,8,8,159,1 +1,Images\blaster_master_right.png,27,5,40,216,8,8,161,1 +1,Images\blaster_master_right.png,27,6,48,216,8,8,159,1 +1,Images\blaster_master_right.png,27,7,56,216,8,8,161,1 +1,Images\blaster_master_right.png,27,8,64,216,8,8,131,1 +1,Images\blaster_master_right.png,27,9,72,216,8,8,163,1 1,Images\blaster_master_right.png,27,10,80,216,8,8,52,0 1,Images\blaster_master_right.png,27,11,88,216,8,8,52,0 -1,Images\blaster_master_right.png,27,12,96,216,8,8,215,2 -1,Images\blaster_master_right.png,27,13,104,216,8,8,217,2 -1,Images\blaster_master_right.png,27,14,112,216,8,8,219,2 -1,Images\blaster_master_right.png,27,15,120,216,8,8,221,2 -1,Images\blaster_master_right.png,27,16,128,216,8,8,223,2 -1,Images\blaster_master_right.png,27,17,136,216,8,8,225,2 -1,Images\blaster_master_right.png,27,18,144,216,8,8,227,2 -1,Images\blaster_master_right.png,27,19,152,216,8,8,229,2 -1,Images\blaster_master_right.png,27,20,160,216,8,8,223,2 -1,Images\blaster_master_right.png,27,21,168,216,8,8,225,2 -1,Images\blaster_master_right.png,27,22,176,216,8,8,227,2 -1,Images\blaster_master_right.png,27,23,184,216,8,8,229,2 -1,Images\blaster_master_right.png,27,24,192,216,8,8,223,2 -1,Images\blaster_master_right.png,27,25,200,216,8,8,225,2 -1,Images\blaster_master_right.png,27,26,208,216,8,8,227,2 -1,Images\blaster_master_right.png,27,27,216,216,8,8,229,2 -1,Images\blaster_master_right.png,27,28,224,216,8,8,223,2 -1,Images\blaster_master_right.png,27,29,232,216,8,8,225,2 -1,Images\blaster_master_right.png,27,30,240,216,8,8,227,2 -1,Images\blaster_master_right.png,27,31,248,216,8,8,229,2 -1,Images\blaster_master_right.png,28,0,0,224,8,8,231,1 -1,Images\blaster_master_right.png,28,1,8,224,8,8,233,1 -1,Images\blaster_master_right.png,28,2,16,224,8,8,231,1 -1,Images\blaster_master_right.png,28,3,24,224,8,8,233,1 -1,Images\blaster_master_right.png,28,4,32,224,8,8,231,1 -1,Images\blaster_master_right.png,28,5,40,224,8,8,233,1 -1,Images\blaster_master_right.png,28,6,48,224,8,8,195,1 -1,Images\blaster_master_right.png,28,7,56,224,8,8,197,1 -1,Images\blaster_master_right.png,28,8,64,224,8,8,195,1 -1,Images\blaster_master_right.png,28,9,72,224,8,8,197,1 +1,Images\blaster_master_right.png,27,12,96,216,8,8,217,2 +1,Images\blaster_master_right.png,27,13,104,216,8,8,219,2 +1,Images\blaster_master_right.png,27,14,112,216,8,8,221,2 +1,Images\blaster_master_right.png,27,15,120,216,8,8,223,2 +1,Images\blaster_master_right.png,27,16,128,216,8,8,225,2 +1,Images\blaster_master_right.png,27,17,136,216,8,8,227,2 +1,Images\blaster_master_right.png,27,18,144,216,8,8,229,2 +1,Images\blaster_master_right.png,27,19,152,216,8,8,231,2 +1,Images\blaster_master_right.png,27,20,160,216,8,8,225,2 +1,Images\blaster_master_right.png,27,21,168,216,8,8,227,2 +1,Images\blaster_master_right.png,27,22,176,216,8,8,229,2 +1,Images\blaster_master_right.png,27,23,184,216,8,8,231,2 +1,Images\blaster_master_right.png,27,24,192,216,8,8,225,2 +1,Images\blaster_master_right.png,27,25,200,216,8,8,227,2 +1,Images\blaster_master_right.png,27,26,208,216,8,8,229,2 +1,Images\blaster_master_right.png,27,27,216,216,8,8,231,2 +1,Images\blaster_master_right.png,27,28,224,216,8,8,225,2 +1,Images\blaster_master_right.png,27,29,232,216,8,8,227,2 +1,Images\blaster_master_right.png,27,30,240,216,8,8,229,2 +1,Images\blaster_master_right.png,27,31,248,216,8,8,231,2 +1,Images\blaster_master_right.png,28,0,0,224,8,8,233,1 +1,Images\blaster_master_right.png,28,1,8,224,8,8,235,1 +1,Images\blaster_master_right.png,28,2,16,224,8,8,233,1 +1,Images\blaster_master_right.png,28,3,24,224,8,8,235,1 +1,Images\blaster_master_right.png,28,4,32,224,8,8,233,1 +1,Images\blaster_master_right.png,28,5,40,224,8,8,235,1 +1,Images\blaster_master_right.png,28,6,48,224,8,8,197,1 +1,Images\blaster_master_right.png,28,7,56,224,8,8,199,1 +1,Images\blaster_master_right.png,28,8,64,224,8,8,197,1 +1,Images\blaster_master_right.png,28,9,72,224,8,8,199,1 1,Images\blaster_master_right.png,28,10,80,224,8,8,52,0 1,Images\blaster_master_right.png,28,11,88,224,8,8,52,0 1,Images\blaster_master_right.png,28,12,96,224,8,8,52,0 1,Images\blaster_master_right.png,28,13,104,224,8,8,52,0 -1,Images\blaster_master_right.png,28,14,112,224,8,8,235,2 -1,Images\blaster_master_right.png,28,15,120,224,8,8,237,2 -1,Images\blaster_master_right.png,28,16,128,224,8,8,239,2 -1,Images\blaster_master_right.png,28,17,136,224,8,8,241,2 -1,Images\blaster_master_right.png,28,18,144,224,8,8,235,2 -1,Images\blaster_master_right.png,28,19,152,224,8,8,237,2 -1,Images\blaster_master_right.png,28,20,160,224,8,8,239,2 -1,Images\blaster_master_right.png,28,21,168,224,8,8,241,2 -1,Images\blaster_master_right.png,28,22,176,224,8,8,235,2 -1,Images\blaster_master_right.png,28,23,184,224,8,8,237,2 -1,Images\blaster_master_right.png,28,24,192,224,8,8,239,2 -1,Images\blaster_master_right.png,28,25,200,224,8,8,241,2 -1,Images\blaster_master_right.png,28,26,208,224,8,8,235,2 -1,Images\blaster_master_right.png,28,27,216,224,8,8,237,2 -1,Images\blaster_master_right.png,28,28,224,224,8,8,239,2 -1,Images\blaster_master_right.png,28,29,232,224,8,8,241,2 -1,Images\blaster_master_right.png,28,30,240,224,8,8,235,2 -1,Images\blaster_master_right.png,28,31,248,224,8,8,237,2 +1,Images\blaster_master_right.png,28,14,112,224,8,8,237,2 +1,Images\blaster_master_right.png,28,15,120,224,8,8,239,2 +1,Images\blaster_master_right.png,28,16,128,224,8,8,241,2 +1,Images\blaster_master_right.png,28,17,136,224,8,8,243,2 +1,Images\blaster_master_right.png,28,18,144,224,8,8,237,2 +1,Images\blaster_master_right.png,28,19,152,224,8,8,239,2 +1,Images\blaster_master_right.png,28,20,160,224,8,8,241,2 +1,Images\blaster_master_right.png,28,21,168,224,8,8,243,2 +1,Images\blaster_master_right.png,28,22,176,224,8,8,237,2 +1,Images\blaster_master_right.png,28,23,184,224,8,8,239,2 +1,Images\blaster_master_right.png,28,24,192,224,8,8,241,2 +1,Images\blaster_master_right.png,28,25,200,224,8,8,243,2 +1,Images\blaster_master_right.png,28,26,208,224,8,8,237,2 +1,Images\blaster_master_right.png,28,27,216,224,8,8,239,2 +1,Images\blaster_master_right.png,28,28,224,224,8,8,241,2 +1,Images\blaster_master_right.png,28,29,232,224,8,8,243,2 +1,Images\blaster_master_right.png,28,30,240,224,8,8,237,2 +1,Images\blaster_master_right.png,28,31,248,224,8,8,239,2 1,Images\blaster_master_right.png,29,0,0,232,8,8,52,1 1,Images\blaster_master_right.png,29,1,8,232,8,8,52,1 1,Images\blaster_master_right.png,29,2,16,232,8,8,52,1 diff --git a/Tests/References/blaster_master_right_name_table_0.bin b/Tests/References/blaster_master_right_name_table_0.bin index 7ca0104..48b11f5 100644 Binary files a/Tests/References/blaster_master_right_name_table_0.bin and b/Tests/References/blaster_master_right_name_table_0.bin differ diff --git a/Tests/References/blaster_master_right_palette_0.bin b/Tests/References/blaster_master_right_palette_0.bin index e823a57..ca803c7 100644 --- a/Tests/References/blaster_master_right_palette_0.bin +++ b/Tests/References/blaster_master_right_palette_0.bin @@ -1 +1 @@ - ! \ No newline at end of file +! \ No newline at end of file diff --git a/Tests/References/blaster_master_right_palette_1.bin b/Tests/References/blaster_master_right_palette_1.bin index 977f53a..66a703a 100644 --- a/Tests/References/blaster_master_right_palette_1.bin +++ b/Tests/References/blaster_master_right_palette_1.bin @@ -1,2 +1,2 @@  -* \ No newline at end of file +* \ No newline at end of file diff --git a/Tests/References/blaster_master_right_palette_2.bin b/Tests/References/blaster_master_right_palette_2.bin index 3246d2a..e43c33f 100644 --- a/Tests/References/blaster_master_right_palette_2.bin +++ b/Tests/References/blaster_master_right_palette_2.bin @@ -1 +1 @@ - , \ No newline at end of file +, \ No newline at end of file diff --git a/Tests/References/blaster_master_right_palette_3.bin b/Tests/References/blaster_master_right_palette_3.bin index 739efd9..4fc6142 100644 Binary files a/Tests/References/blaster_master_right_palette_3.bin and b/Tests/References/blaster_master_right_palette_3.bin differ diff --git a/Tests/References/blaster_master_right_palettes.csv b/Tests/References/blaster_master_right_palettes.csv index 26d33fc..3a00088 100644 --- a/Tests/References/blaster_master_right_palettes.csv +++ b/Tests/References/blaster_master_right_palettes.csv @@ -1,5 +1,5 @@ palette_id,color0,color1,color2,color3 -0,#000000,#009038,#FCFCFC,#3CBCFC -1,#000000,#005000,#4CDC48,#00A800 -2,#000000,#183C5C,#009038,#00E8D8 -3,#000000,#E40058,#FCFCFC,#747474 +0,#000000,#009038,#3CBCFC,#FCFCFC +1,#000000,#005000,#00A800,#4CDC48 +2,#000000,#009038,#00E8D8,#183C5C +3,#000000,#747474,#E40058,#FCFCFC diff --git a/Tests/References/blaster_master_right_pattern_0.bin b/Tests/References/blaster_master_right_pattern_0.bin index df82172..d29bf52 100644 Binary files a/Tests/References/blaster_master_right_pattern_0.bin and b/Tests/References/blaster_master_right_pattern_0.bin differ diff --git a/Tests/References/blaster_master_right_tiles.csv b/Tests/References/blaster_master_right_tiles.csv index 8d4e48a..7304c94 100644 --- a/Tests/References/blaster_master_right_tiles.csv +++ b/Tests/References/blaster_master_right_tiles.csv @@ -658,89 +658,89 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 0,Images\blaster_master_right.png,20,16,128,160,8,8,152,3 0,Images\blaster_master_right.png,20,17,136,160,8,8,154,3 0,Images\blaster_master_right.png,20,18,144,160,8,8,156,3 -0,Images\blaster_master_right.png,20,19,152,160,8,8,0,3 -0,Images\blaster_master_right.png,20,20,160,160,8,8,0,3 -0,Images\blaster_master_right.png,20,21,168,160,8,8,158,3 -0,Images\blaster_master_right.png,20,22,176,160,8,8,160,3 -0,Images\blaster_master_right.png,20,23,184,160,8,8,162,3 -0,Images\blaster_master_right.png,20,24,192,160,8,8,164,3 -0,Images\blaster_master_right.png,20,25,200,160,8,8,0,3 -0,Images\blaster_master_right.png,20,26,208,160,8,8,166,3 +0,Images\blaster_master_right.png,20,19,152,160,8,8,158,3 +0,Images\blaster_master_right.png,20,20,160,160,8,8,158,3 +0,Images\blaster_master_right.png,20,21,168,160,8,8,160,3 +0,Images\blaster_master_right.png,20,22,176,160,8,8,162,3 +0,Images\blaster_master_right.png,20,23,184,160,8,8,164,3 +0,Images\blaster_master_right.png,20,24,192,160,8,8,166,3 +0,Images\blaster_master_right.png,20,25,200,160,8,8,158,3 +0,Images\blaster_master_right.png,20,26,208,160,8,8,168,3 0,Images\blaster_master_right.png,20,27,216,160,8,8,64,3 0,Images\blaster_master_right.png,20,28,224,160,8,8,64,0 0,Images\blaster_master_right.png,20,29,232,160,8,8,64,0 -0,Images\blaster_master_right.png,20,30,240,160,8,8,168,1 -0,Images\blaster_master_right.png,20,31,248,160,8,8,170,1 -0,Images\blaster_master_right.png,21,0,0,168,8,8,172,1 -0,Images\blaster_master_right.png,21,1,8,168,8,8,174,1 -0,Images\blaster_master_right.png,21,2,16,168,8,8,172,1 -0,Images\blaster_master_right.png,21,3,24,168,8,8,174,1 -0,Images\blaster_master_right.png,21,4,32,168,8,8,172,1 -0,Images\blaster_master_right.png,21,5,40,168,8,8,174,1 -0,Images\blaster_master_right.png,21,6,48,168,8,8,172,1 -0,Images\blaster_master_right.png,21,7,56,168,8,8,174,1 -0,Images\blaster_master_right.png,21,8,64,168,8,8,172,1 -0,Images\blaster_master_right.png,21,9,72,168,8,8,174,1 -0,Images\blaster_master_right.png,21,10,80,168,8,8,172,1 -0,Images\blaster_master_right.png,21,11,88,168,8,8,174,1 -0,Images\blaster_master_right.png,21,12,96,168,8,8,172,1 -0,Images\blaster_master_right.png,21,13,104,168,8,8,174,1 -0,Images\blaster_master_right.png,21,14,112,168,8,8,176,3 -0,Images\blaster_master_right.png,21,15,120,168,8,8,178,3 -0,Images\blaster_master_right.png,21,16,128,168,8,8,180,3 -0,Images\blaster_master_right.png,21,17,136,168,8,8,182,3 -0,Images\blaster_master_right.png,21,18,144,168,8,8,184,3 -0,Images\blaster_master_right.png,21,19,152,168,8,8,186,3 -0,Images\blaster_master_right.png,21,20,160,168,8,8,188,3 -0,Images\blaster_master_right.png,21,21,168,168,8,8,190,3 -0,Images\blaster_master_right.png,21,22,176,168,8,8,192,3 -0,Images\blaster_master_right.png,21,23,184,168,8,8,194,3 -0,Images\blaster_master_right.png,21,24,192,168,8,8,196,3 -0,Images\blaster_master_right.png,21,25,200,168,8,8,198,3 -0,Images\blaster_master_right.png,21,26,208,168,8,8,200,3 +0,Images\blaster_master_right.png,20,30,240,160,8,8,170,1 +0,Images\blaster_master_right.png,20,31,248,160,8,8,172,1 +0,Images\blaster_master_right.png,21,0,0,168,8,8,174,1 +0,Images\blaster_master_right.png,21,1,8,168,8,8,176,1 +0,Images\blaster_master_right.png,21,2,16,168,8,8,174,1 +0,Images\blaster_master_right.png,21,3,24,168,8,8,176,1 +0,Images\blaster_master_right.png,21,4,32,168,8,8,174,1 +0,Images\blaster_master_right.png,21,5,40,168,8,8,176,1 +0,Images\blaster_master_right.png,21,6,48,168,8,8,174,1 +0,Images\blaster_master_right.png,21,7,56,168,8,8,176,1 +0,Images\blaster_master_right.png,21,8,64,168,8,8,174,1 +0,Images\blaster_master_right.png,21,9,72,168,8,8,176,1 +0,Images\blaster_master_right.png,21,10,80,168,8,8,174,1 +0,Images\blaster_master_right.png,21,11,88,168,8,8,176,1 +0,Images\blaster_master_right.png,21,12,96,168,8,8,174,1 +0,Images\blaster_master_right.png,21,13,104,168,8,8,176,1 +0,Images\blaster_master_right.png,21,14,112,168,8,8,178,3 +0,Images\blaster_master_right.png,21,15,120,168,8,8,180,3 +0,Images\blaster_master_right.png,21,16,128,168,8,8,182,3 +0,Images\blaster_master_right.png,21,17,136,168,8,8,184,3 +0,Images\blaster_master_right.png,21,18,144,168,8,8,186,3 +0,Images\blaster_master_right.png,21,19,152,168,8,8,188,3 +0,Images\blaster_master_right.png,21,20,160,168,8,8,190,3 +0,Images\blaster_master_right.png,21,21,168,168,8,8,192,3 +0,Images\blaster_master_right.png,21,22,176,168,8,8,194,3 +0,Images\blaster_master_right.png,21,23,184,168,8,8,196,3 +0,Images\blaster_master_right.png,21,24,192,168,8,8,198,3 +0,Images\blaster_master_right.png,21,25,200,168,8,8,200,3 +0,Images\blaster_master_right.png,21,26,208,168,8,8,202,3 0,Images\blaster_master_right.png,21,27,216,168,8,8,64,3 0,Images\blaster_master_right.png,21,28,224,168,8,8,64,0 0,Images\blaster_master_right.png,21,29,232,168,8,8,64,0 -0,Images\blaster_master_right.png,21,30,240,168,8,8,202,1 -0,Images\blaster_master_right.png,21,31,248,168,8,8,204,1 -0,Images\blaster_master_right.png,22,0,0,176,8,8,206,1 -0,Images\blaster_master_right.png,22,1,8,176,8,8,208,1 -0,Images\blaster_master_right.png,22,2,16,176,8,8,206,1 -0,Images\blaster_master_right.png,22,3,24,176,8,8,208,1 -0,Images\blaster_master_right.png,22,4,32,176,8,8,206,1 -0,Images\blaster_master_right.png,22,5,40,176,8,8,208,1 -0,Images\blaster_master_right.png,22,6,48,176,8,8,206,1 -0,Images\blaster_master_right.png,22,7,56,176,8,8,208,1 -0,Images\blaster_master_right.png,22,8,64,176,8,8,206,1 -0,Images\blaster_master_right.png,22,9,72,176,8,8,208,1 -0,Images\blaster_master_right.png,22,10,80,176,8,8,206,1 -0,Images\blaster_master_right.png,22,11,88,176,8,8,208,1 -0,Images\blaster_master_right.png,22,12,96,176,8,8,206,1 -0,Images\blaster_master_right.png,22,13,104,176,8,8,208,1 -0,Images\blaster_master_right.png,22,14,112,176,8,8,210,3 -0,Images\blaster_master_right.png,22,15,120,176,8,8,212,3 -0,Images\blaster_master_right.png,22,16,128,176,8,8,214,3 -0,Images\blaster_master_right.png,22,17,136,176,8,8,216,3 -0,Images\blaster_master_right.png,22,18,144,176,8,8,218,3 -0,Images\blaster_master_right.png,22,19,152,176,8,8,220,3 +0,Images\blaster_master_right.png,21,30,240,168,8,8,204,1 +0,Images\blaster_master_right.png,21,31,248,168,8,8,206,1 +0,Images\blaster_master_right.png,22,0,0,176,8,8,208,1 +0,Images\blaster_master_right.png,22,1,8,176,8,8,210,1 +0,Images\blaster_master_right.png,22,2,16,176,8,8,208,1 +0,Images\blaster_master_right.png,22,3,24,176,8,8,210,1 +0,Images\blaster_master_right.png,22,4,32,176,8,8,208,1 +0,Images\blaster_master_right.png,22,5,40,176,8,8,210,1 +0,Images\blaster_master_right.png,22,6,48,176,8,8,208,1 +0,Images\blaster_master_right.png,22,7,56,176,8,8,210,1 +0,Images\blaster_master_right.png,22,8,64,176,8,8,208,1 +0,Images\blaster_master_right.png,22,9,72,176,8,8,210,1 +0,Images\blaster_master_right.png,22,10,80,176,8,8,208,1 +0,Images\blaster_master_right.png,22,11,88,176,8,8,210,1 +0,Images\blaster_master_right.png,22,12,96,176,8,8,208,1 +0,Images\blaster_master_right.png,22,13,104,176,8,8,210,1 +0,Images\blaster_master_right.png,22,14,112,176,8,8,212,3 +0,Images\blaster_master_right.png,22,15,120,176,8,8,214,3 +0,Images\blaster_master_right.png,22,16,128,176,8,8,216,3 +0,Images\blaster_master_right.png,22,17,136,176,8,8,218,3 +0,Images\blaster_master_right.png,22,18,144,176,8,8,220,3 +0,Images\blaster_master_right.png,22,19,152,176,8,8,222,3 0,Images\blaster_master_right.png,22,20,160,176,8,8,64,3 -0,Images\blaster_master_right.png,22,21,168,176,8,8,222,3 -0,Images\blaster_master_right.png,22,22,176,176,8,8,224,3 -0,Images\blaster_master_right.png,22,23,184,176,8,8,226,3 -0,Images\blaster_master_right.png,22,24,192,176,8,8,228,3 -0,Images\blaster_master_right.png,22,25,200,176,8,8,230,3 -0,Images\blaster_master_right.png,22,26,208,176,8,8,232,3 +0,Images\blaster_master_right.png,22,21,168,176,8,8,224,3 +0,Images\blaster_master_right.png,22,22,176,176,8,8,226,3 +0,Images\blaster_master_right.png,22,23,184,176,8,8,228,3 +0,Images\blaster_master_right.png,22,24,192,176,8,8,230,3 +0,Images\blaster_master_right.png,22,25,200,176,8,8,232,3 +0,Images\blaster_master_right.png,22,26,208,176,8,8,234,3 0,Images\blaster_master_right.png,22,27,216,176,8,8,64,3 -0,Images\blaster_master_right.png,22,28,224,176,8,8,168,1 -0,Images\blaster_master_right.png,22,29,232,176,8,8,234,1 -0,Images\blaster_master_right.png,22,30,240,176,8,8,236,1 -0,Images\blaster_master_right.png,22,31,248,176,8,8,204,1 -0,Images\blaster_master_right.png,23,0,0,184,8,8,238,1 -0,Images\blaster_master_right.png,23,1,8,184,8,8,240,1 +0,Images\blaster_master_right.png,22,28,224,176,8,8,170,1 +0,Images\blaster_master_right.png,22,29,232,176,8,8,236,1 +0,Images\blaster_master_right.png,22,30,240,176,8,8,238,1 +0,Images\blaster_master_right.png,22,31,248,176,8,8,206,1 +0,Images\blaster_master_right.png,23,0,0,184,8,8,240,1 +0,Images\blaster_master_right.png,23,1,8,184,8,8,242,1 0,Images\blaster_master_right.png,23,2,16,184,8,8,64,1 0,Images\blaster_master_right.png,23,3,24,184,8,8,64,1 -0,Images\blaster_master_right.png,23,4,32,184,8,8,168,1 -0,Images\blaster_master_right.png,23,5,40,184,8,8,240,1 +0,Images\blaster_master_right.png,23,4,32,184,8,8,170,1 +0,Images\blaster_master_right.png,23,5,40,184,8,8,242,1 0,Images\blaster_master_right.png,23,6,48,184,8,8,64,1 0,Images\blaster_master_right.png,23,7,56,184,8,8,64,1 0,Images\blaster_master_right.png,23,8,64,184,8,8,64,1 @@ -749,184 +749,184 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 0,Images\blaster_master_right.png,23,11,88,184,8,8,64,1 0,Images\blaster_master_right.png,23,12,96,184,8,8,64,1 0,Images\blaster_master_right.png,23,13,104,184,8,8,64,1 -0,Images\blaster_master_right.png,23,14,112,184,8,8,242,3 -0,Images\blaster_master_right.png,23,15,120,184,8,8,244,3 -0,Images\blaster_master_right.png,23,16,128,184,8,8,246,3 +0,Images\blaster_master_right.png,23,14,112,184,8,8,244,3 +0,Images\blaster_master_right.png,23,15,120,184,8,8,246,3 +0,Images\blaster_master_right.png,23,16,128,184,8,8,248,3 0,Images\blaster_master_right.png,23,17,136,184,8,8,64,3 -0,Images\blaster_master_right.png,23,18,144,184,8,8,248,3 -0,Images\blaster_master_right.png,23,19,152,184,8,8,250,3 -0,Images\blaster_master_right.png,23,20,160,184,8,8,252,3 -0,Images\blaster_master_right.png,23,21,168,184,8,8,254,3 +0,Images\blaster_master_right.png,23,18,144,184,8,8,250,3 +0,Images\blaster_master_right.png,23,19,152,184,8,8,252,3 +0,Images\blaster_master_right.png,23,20,160,184,8,8,254,3 +0,Images\blaster_master_right.png,23,21,168,184,8,8,1,3 0,Images\blaster_master_right.png,23,22,176,184,8,8,64,3 -0,Images\blaster_master_right.png,23,23,184,184,8,8,1,3 -0,Images\blaster_master_right.png,23,24,192,184,8,8,3,3 -0,Images\blaster_master_right.png,23,25,200,184,8,8,5,3 -0,Images\blaster_master_right.png,23,26,208,184,8,8,7,3 +0,Images\blaster_master_right.png,23,23,184,184,8,8,3,3 +0,Images\blaster_master_right.png,23,24,192,184,8,8,5,3 +0,Images\blaster_master_right.png,23,25,200,184,8,8,7,3 +0,Images\blaster_master_right.png,23,26,208,184,8,8,9,3 0,Images\blaster_master_right.png,23,27,216,184,8,8,64,3 -0,Images\blaster_master_right.png,23,28,224,184,8,8,202,1 -0,Images\blaster_master_right.png,23,29,232,184,8,8,204,1 -0,Images\blaster_master_right.png,23,30,240,184,8,8,9,1 -0,Images\blaster_master_right.png,23,31,248,184,8,8,11,1 -0,Images\blaster_master_right.png,24,0,0,192,8,8,236,1 -0,Images\blaster_master_right.png,24,1,8,192,8,8,13,1 -0,Images\blaster_master_right.png,24,2,16,192,8,8,238,1 -0,Images\blaster_master_right.png,24,3,24,192,8,8,234,1 -0,Images\blaster_master_right.png,24,4,32,192,8,8,236,1 -0,Images\blaster_master_right.png,24,5,40,192,8,8,13,1 -0,Images\blaster_master_right.png,24,6,48,192,8,8,238,1 -0,Images\blaster_master_right.png,24,7,56,192,8,8,240,1 +0,Images\blaster_master_right.png,23,28,224,184,8,8,204,1 +0,Images\blaster_master_right.png,23,29,232,184,8,8,206,1 +0,Images\blaster_master_right.png,23,30,240,184,8,8,11,1 +0,Images\blaster_master_right.png,23,31,248,184,8,8,13,1 +0,Images\blaster_master_right.png,24,0,0,192,8,8,238,1 +0,Images\blaster_master_right.png,24,1,8,192,8,8,15,1 +0,Images\blaster_master_right.png,24,2,16,192,8,8,240,1 +0,Images\blaster_master_right.png,24,3,24,192,8,8,236,1 +0,Images\blaster_master_right.png,24,4,32,192,8,8,238,1 +0,Images\blaster_master_right.png,24,5,40,192,8,8,15,1 +0,Images\blaster_master_right.png,24,6,48,192,8,8,240,1 +0,Images\blaster_master_right.png,24,7,56,192,8,8,242,1 0,Images\blaster_master_right.png,24,8,64,192,8,8,64,0 0,Images\blaster_master_right.png,24,9,72,192,8,8,64,0 -0,Images\blaster_master_right.png,24,10,80,192,8,8,15,2 -0,Images\blaster_master_right.png,24,11,88,192,8,8,17,2 -0,Images\blaster_master_right.png,24,12,96,192,8,8,19,2 -0,Images\blaster_master_right.png,24,13,104,192,8,8,17,2 -0,Images\blaster_master_right.png,24,14,112,192,8,8,19,2 -0,Images\blaster_master_right.png,24,15,120,192,8,8,21,2 -0,Images\blaster_master_right.png,24,16,128,192,8,8,23,2 -0,Images\blaster_master_right.png,24,17,136,192,8,8,25,2 -0,Images\blaster_master_right.png,24,18,144,192,8,8,27,2 -0,Images\blaster_master_right.png,24,19,152,192,8,8,29,2 -0,Images\blaster_master_right.png,24,20,160,192,8,8,23,2 -0,Images\blaster_master_right.png,24,21,168,192,8,8,25,2 -0,Images\blaster_master_right.png,24,22,176,192,8,8,27,2 -0,Images\blaster_master_right.png,24,23,184,192,8,8,29,2 -0,Images\blaster_master_right.png,24,24,192,192,8,8,23,2 -0,Images\blaster_master_right.png,24,25,200,192,8,8,25,2 -0,Images\blaster_master_right.png,24,26,208,192,8,8,27,2 -0,Images\blaster_master_right.png,24,27,216,192,8,8,29,2 -0,Images\blaster_master_right.png,24,28,224,192,8,8,23,2 -0,Images\blaster_master_right.png,24,29,232,192,8,8,25,2 -0,Images\blaster_master_right.png,24,30,240,192,8,8,27,2 -0,Images\blaster_master_right.png,24,31,248,192,8,8,29,2 -0,Images\blaster_master_right.png,25,0,0,200,8,8,9,1 -0,Images\blaster_master_right.png,25,1,8,200,8,8,11,1 -0,Images\blaster_master_right.png,25,2,16,200,8,8,236,1 -0,Images\blaster_master_right.png,25,3,24,200,8,8,204,1 -0,Images\blaster_master_right.png,25,4,32,200,8,8,236,1 -0,Images\blaster_master_right.png,25,5,40,200,8,8,204,1 -0,Images\blaster_master_right.png,25,6,48,200,8,8,236,1 -0,Images\blaster_master_right.png,25,7,56,200,8,8,13,1 +0,Images\blaster_master_right.png,24,10,80,192,8,8,17,2 +0,Images\blaster_master_right.png,24,11,88,192,8,8,19,2 +0,Images\blaster_master_right.png,24,12,96,192,8,8,21,2 +0,Images\blaster_master_right.png,24,13,104,192,8,8,19,2 +0,Images\blaster_master_right.png,24,14,112,192,8,8,21,2 +0,Images\blaster_master_right.png,24,15,120,192,8,8,23,2 +0,Images\blaster_master_right.png,24,16,128,192,8,8,25,2 +0,Images\blaster_master_right.png,24,17,136,192,8,8,27,2 +0,Images\blaster_master_right.png,24,18,144,192,8,8,29,2 +0,Images\blaster_master_right.png,24,19,152,192,8,8,31,2 +0,Images\blaster_master_right.png,24,20,160,192,8,8,25,2 +0,Images\blaster_master_right.png,24,21,168,192,8,8,27,2 +0,Images\blaster_master_right.png,24,22,176,192,8,8,29,2 +0,Images\blaster_master_right.png,24,23,184,192,8,8,31,2 +0,Images\blaster_master_right.png,24,24,192,192,8,8,25,2 +0,Images\blaster_master_right.png,24,25,200,192,8,8,27,2 +0,Images\blaster_master_right.png,24,26,208,192,8,8,29,2 +0,Images\blaster_master_right.png,24,27,216,192,8,8,31,2 +0,Images\blaster_master_right.png,24,28,224,192,8,8,25,2 +0,Images\blaster_master_right.png,24,29,232,192,8,8,27,2 +0,Images\blaster_master_right.png,24,30,240,192,8,8,29,2 +0,Images\blaster_master_right.png,24,31,248,192,8,8,31,2 +0,Images\blaster_master_right.png,25,0,0,200,8,8,11,1 +0,Images\blaster_master_right.png,25,1,8,200,8,8,13,1 +0,Images\blaster_master_right.png,25,2,16,200,8,8,238,1 +0,Images\blaster_master_right.png,25,3,24,200,8,8,206,1 +0,Images\blaster_master_right.png,25,4,32,200,8,8,238,1 +0,Images\blaster_master_right.png,25,5,40,200,8,8,206,1 +0,Images\blaster_master_right.png,25,6,48,200,8,8,238,1 +0,Images\blaster_master_right.png,25,7,56,200,8,8,15,1 0,Images\blaster_master_right.png,25,8,64,200,8,8,64,0 0,Images\blaster_master_right.png,25,9,72,200,8,8,64,0 -0,Images\blaster_master_right.png,25,10,80,200,8,8,31,2 -0,Images\blaster_master_right.png,25,11,88,200,8,8,33,2 -0,Images\blaster_master_right.png,25,12,96,200,8,8,35,2 -0,Images\blaster_master_right.png,25,13,104,200,8,8,33,2 -0,Images\blaster_master_right.png,25,14,112,200,8,8,35,2 -0,Images\blaster_master_right.png,25,15,120,200,8,8,37,2 -0,Images\blaster_master_right.png,25,16,128,200,8,8,39,2 -0,Images\blaster_master_right.png,25,17,136,200,8,8,41,2 -0,Images\blaster_master_right.png,25,18,144,200,8,8,43,2 -0,Images\blaster_master_right.png,25,19,152,200,8,8,45,2 -0,Images\blaster_master_right.png,25,20,160,200,8,8,39,2 -0,Images\blaster_master_right.png,25,21,168,200,8,8,41,2 -0,Images\blaster_master_right.png,25,22,176,200,8,8,43,2 -0,Images\blaster_master_right.png,25,23,184,200,8,8,45,2 -0,Images\blaster_master_right.png,25,24,192,200,8,8,39,2 -0,Images\blaster_master_right.png,25,25,200,200,8,8,41,2 -0,Images\blaster_master_right.png,25,26,208,200,8,8,43,2 -0,Images\blaster_master_right.png,25,27,216,200,8,8,45,2 -0,Images\blaster_master_right.png,25,28,224,200,8,8,39,2 -0,Images\blaster_master_right.png,25,29,232,200,8,8,41,2 -0,Images\blaster_master_right.png,25,30,240,200,8,8,43,2 -0,Images\blaster_master_right.png,25,31,248,200,8,8,45,2 -0,Images\blaster_master_right.png,26,0,0,208,8,8,47,1 -0,Images\blaster_master_right.png,26,1,8,208,8,8,49,1 -0,Images\blaster_master_right.png,26,2,16,208,8,8,47,1 -0,Images\blaster_master_right.png,26,3,24,208,8,8,49,1 -0,Images\blaster_master_right.png,26,4,32,208,8,8,47,1 -0,Images\blaster_master_right.png,26,5,40,208,8,8,49,1 -0,Images\blaster_master_right.png,26,6,48,208,8,8,236,1 -0,Images\blaster_master_right.png,26,7,56,208,8,8,204,1 -0,Images\blaster_master_right.png,26,8,64,208,8,8,238,1 -0,Images\blaster_master_right.png,26,9,72,208,8,8,240,1 +0,Images\blaster_master_right.png,25,10,80,200,8,8,33,2 +0,Images\blaster_master_right.png,25,11,88,200,8,8,35,2 +0,Images\blaster_master_right.png,25,12,96,200,8,8,37,2 +0,Images\blaster_master_right.png,25,13,104,200,8,8,35,2 +0,Images\blaster_master_right.png,25,14,112,200,8,8,37,2 +0,Images\blaster_master_right.png,25,15,120,200,8,8,39,2 +0,Images\blaster_master_right.png,25,16,128,200,8,8,41,2 +0,Images\blaster_master_right.png,25,17,136,200,8,8,43,2 +0,Images\blaster_master_right.png,25,18,144,200,8,8,45,2 +0,Images\blaster_master_right.png,25,19,152,200,8,8,47,2 +0,Images\blaster_master_right.png,25,20,160,200,8,8,41,2 +0,Images\blaster_master_right.png,25,21,168,200,8,8,43,2 +0,Images\blaster_master_right.png,25,22,176,200,8,8,45,2 +0,Images\blaster_master_right.png,25,23,184,200,8,8,47,2 +0,Images\blaster_master_right.png,25,24,192,200,8,8,41,2 +0,Images\blaster_master_right.png,25,25,200,200,8,8,43,2 +0,Images\blaster_master_right.png,25,26,208,200,8,8,45,2 +0,Images\blaster_master_right.png,25,27,216,200,8,8,47,2 +0,Images\blaster_master_right.png,25,28,224,200,8,8,41,2 +0,Images\blaster_master_right.png,25,29,232,200,8,8,43,2 +0,Images\blaster_master_right.png,25,30,240,200,8,8,45,2 +0,Images\blaster_master_right.png,25,31,248,200,8,8,47,2 +0,Images\blaster_master_right.png,26,0,0,208,8,8,49,1 +0,Images\blaster_master_right.png,26,1,8,208,8,8,51,1 +0,Images\blaster_master_right.png,26,2,16,208,8,8,49,1 +0,Images\blaster_master_right.png,26,3,24,208,8,8,51,1 +0,Images\blaster_master_right.png,26,4,32,208,8,8,49,1 +0,Images\blaster_master_right.png,26,5,40,208,8,8,51,1 +0,Images\blaster_master_right.png,26,6,48,208,8,8,238,1 +0,Images\blaster_master_right.png,26,7,56,208,8,8,206,1 +0,Images\blaster_master_right.png,26,8,64,208,8,8,240,1 +0,Images\blaster_master_right.png,26,9,72,208,8,8,242,1 0,Images\blaster_master_right.png,26,10,80,208,8,8,64,0 0,Images\blaster_master_right.png,26,11,88,208,8,8,64,0 -0,Images\blaster_master_right.png,26,12,96,208,8,8,51,2 -0,Images\blaster_master_right.png,26,13,104,208,8,8,53,2 -0,Images\blaster_master_right.png,26,14,112,208,8,8,55,2 -0,Images\blaster_master_right.png,26,15,120,208,8,8,57,2 -0,Images\blaster_master_right.png,26,16,128,208,8,8,59,2 -0,Images\blaster_master_right.png,26,17,136,208,8,8,61,2 -0,Images\blaster_master_right.png,26,18,144,208,8,8,63,2 -0,Images\blaster_master_right.png,26,19,152,208,8,8,65,2 -0,Images\blaster_master_right.png,26,20,160,208,8,8,59,2 -0,Images\blaster_master_right.png,26,21,168,208,8,8,61,2 -0,Images\blaster_master_right.png,26,22,176,208,8,8,63,2 -0,Images\blaster_master_right.png,26,23,184,208,8,8,65,2 -0,Images\blaster_master_right.png,26,24,192,208,8,8,59,2 -0,Images\blaster_master_right.png,26,25,200,208,8,8,61,2 -0,Images\blaster_master_right.png,26,26,208,208,8,8,63,2 -0,Images\blaster_master_right.png,26,27,216,208,8,8,65,2 -0,Images\blaster_master_right.png,26,28,224,208,8,8,59,2 -0,Images\blaster_master_right.png,26,29,232,208,8,8,61,2 -0,Images\blaster_master_right.png,26,30,240,208,8,8,63,2 -0,Images\blaster_master_right.png,26,31,248,208,8,8,65,2 -0,Images\blaster_master_right.png,27,0,0,216,8,8,9,1 -0,Images\blaster_master_right.png,27,1,8,216,8,8,11,1 -0,Images\blaster_master_right.png,27,2,16,216,8,8,9,1 -0,Images\blaster_master_right.png,27,3,24,216,8,8,11,1 -0,Images\blaster_master_right.png,27,4,32,216,8,8,9,1 -0,Images\blaster_master_right.png,27,5,40,216,8,8,11,1 -0,Images\blaster_master_right.png,27,6,48,216,8,8,9,1 -0,Images\blaster_master_right.png,27,7,56,216,8,8,11,1 -0,Images\blaster_master_right.png,27,8,64,216,8,8,236,1 -0,Images\blaster_master_right.png,27,9,72,216,8,8,13,1 +0,Images\blaster_master_right.png,26,12,96,208,8,8,53,2 +0,Images\blaster_master_right.png,26,13,104,208,8,8,55,2 +0,Images\blaster_master_right.png,26,14,112,208,8,8,57,2 +0,Images\blaster_master_right.png,26,15,120,208,8,8,59,2 +0,Images\blaster_master_right.png,26,16,128,208,8,8,61,2 +0,Images\blaster_master_right.png,26,17,136,208,8,8,63,2 +0,Images\blaster_master_right.png,26,18,144,208,8,8,65,2 +0,Images\blaster_master_right.png,26,19,152,208,8,8,67,2 +0,Images\blaster_master_right.png,26,20,160,208,8,8,61,2 +0,Images\blaster_master_right.png,26,21,168,208,8,8,63,2 +0,Images\blaster_master_right.png,26,22,176,208,8,8,65,2 +0,Images\blaster_master_right.png,26,23,184,208,8,8,67,2 +0,Images\blaster_master_right.png,26,24,192,208,8,8,61,2 +0,Images\blaster_master_right.png,26,25,200,208,8,8,63,2 +0,Images\blaster_master_right.png,26,26,208,208,8,8,65,2 +0,Images\blaster_master_right.png,26,27,216,208,8,8,67,2 +0,Images\blaster_master_right.png,26,28,224,208,8,8,61,2 +0,Images\blaster_master_right.png,26,29,232,208,8,8,63,2 +0,Images\blaster_master_right.png,26,30,240,208,8,8,65,2 +0,Images\blaster_master_right.png,26,31,248,208,8,8,67,2 +0,Images\blaster_master_right.png,27,0,0,216,8,8,11,1 +0,Images\blaster_master_right.png,27,1,8,216,8,8,13,1 +0,Images\blaster_master_right.png,27,2,16,216,8,8,11,1 +0,Images\blaster_master_right.png,27,3,24,216,8,8,13,1 +0,Images\blaster_master_right.png,27,4,32,216,8,8,11,1 +0,Images\blaster_master_right.png,27,5,40,216,8,8,13,1 +0,Images\blaster_master_right.png,27,6,48,216,8,8,11,1 +0,Images\blaster_master_right.png,27,7,56,216,8,8,13,1 +0,Images\blaster_master_right.png,27,8,64,216,8,8,238,1 +0,Images\blaster_master_right.png,27,9,72,216,8,8,15,1 0,Images\blaster_master_right.png,27,10,80,216,8,8,64,0 0,Images\blaster_master_right.png,27,11,88,216,8,8,64,0 -0,Images\blaster_master_right.png,27,12,96,216,8,8,67,2 -0,Images\blaster_master_right.png,27,13,104,216,8,8,69,2 -0,Images\blaster_master_right.png,27,14,112,216,8,8,71,2 -0,Images\blaster_master_right.png,27,15,120,216,8,8,73,2 -0,Images\blaster_master_right.png,27,16,128,216,8,8,75,2 -0,Images\blaster_master_right.png,27,17,136,216,8,8,77,2 -0,Images\blaster_master_right.png,27,18,144,216,8,8,79,2 -0,Images\blaster_master_right.png,27,19,152,216,8,8,81,2 -0,Images\blaster_master_right.png,27,20,160,216,8,8,75,2 -0,Images\blaster_master_right.png,27,21,168,216,8,8,77,2 -0,Images\blaster_master_right.png,27,22,176,216,8,8,79,2 -0,Images\blaster_master_right.png,27,23,184,216,8,8,81,2 -0,Images\blaster_master_right.png,27,24,192,216,8,8,75,2 -0,Images\blaster_master_right.png,27,25,200,216,8,8,77,2 -0,Images\blaster_master_right.png,27,26,208,216,8,8,79,2 -0,Images\blaster_master_right.png,27,27,216,216,8,8,81,2 -0,Images\blaster_master_right.png,27,28,224,216,8,8,75,2 -0,Images\blaster_master_right.png,27,29,232,216,8,8,77,2 -0,Images\blaster_master_right.png,27,30,240,216,8,8,79,2 -0,Images\blaster_master_right.png,27,31,248,216,8,8,81,2 -0,Images\blaster_master_right.png,28,0,0,224,8,8,83,1 -0,Images\blaster_master_right.png,28,1,8,224,8,8,85,1 -0,Images\blaster_master_right.png,28,2,16,224,8,8,83,1 -0,Images\blaster_master_right.png,28,3,24,224,8,8,85,1 -0,Images\blaster_master_right.png,28,4,32,224,8,8,83,1 -0,Images\blaster_master_right.png,28,5,40,224,8,8,85,1 -0,Images\blaster_master_right.png,28,6,48,224,8,8,47,1 -0,Images\blaster_master_right.png,28,7,56,224,8,8,49,1 -0,Images\blaster_master_right.png,28,8,64,224,8,8,47,1 -0,Images\blaster_master_right.png,28,9,72,224,8,8,49,1 +0,Images\blaster_master_right.png,27,12,96,216,8,8,69,2 +0,Images\blaster_master_right.png,27,13,104,216,8,8,71,2 +0,Images\blaster_master_right.png,27,14,112,216,8,8,73,2 +0,Images\blaster_master_right.png,27,15,120,216,8,8,75,2 +0,Images\blaster_master_right.png,27,16,128,216,8,8,77,2 +0,Images\blaster_master_right.png,27,17,136,216,8,8,79,2 +0,Images\blaster_master_right.png,27,18,144,216,8,8,81,2 +0,Images\blaster_master_right.png,27,19,152,216,8,8,83,2 +0,Images\blaster_master_right.png,27,20,160,216,8,8,77,2 +0,Images\blaster_master_right.png,27,21,168,216,8,8,79,2 +0,Images\blaster_master_right.png,27,22,176,216,8,8,81,2 +0,Images\blaster_master_right.png,27,23,184,216,8,8,83,2 +0,Images\blaster_master_right.png,27,24,192,216,8,8,77,2 +0,Images\blaster_master_right.png,27,25,200,216,8,8,79,2 +0,Images\blaster_master_right.png,27,26,208,216,8,8,81,2 +0,Images\blaster_master_right.png,27,27,216,216,8,8,83,2 +0,Images\blaster_master_right.png,27,28,224,216,8,8,77,2 +0,Images\blaster_master_right.png,27,29,232,216,8,8,79,2 +0,Images\blaster_master_right.png,27,30,240,216,8,8,81,2 +0,Images\blaster_master_right.png,27,31,248,216,8,8,83,2 +0,Images\blaster_master_right.png,28,0,0,224,8,8,85,1 +0,Images\blaster_master_right.png,28,1,8,224,8,8,87,1 +0,Images\blaster_master_right.png,28,2,16,224,8,8,85,1 +0,Images\blaster_master_right.png,28,3,24,224,8,8,87,1 +0,Images\blaster_master_right.png,28,4,32,224,8,8,85,1 +0,Images\blaster_master_right.png,28,5,40,224,8,8,87,1 +0,Images\blaster_master_right.png,28,6,48,224,8,8,49,1 +0,Images\blaster_master_right.png,28,7,56,224,8,8,51,1 +0,Images\blaster_master_right.png,28,8,64,224,8,8,49,1 +0,Images\blaster_master_right.png,28,9,72,224,8,8,51,1 0,Images\blaster_master_right.png,28,10,80,224,8,8,64,0 0,Images\blaster_master_right.png,28,11,88,224,8,8,64,0 0,Images\blaster_master_right.png,28,12,96,224,8,8,64,0 0,Images\blaster_master_right.png,28,13,104,224,8,8,64,0 -0,Images\blaster_master_right.png,28,14,112,224,8,8,87,2 -0,Images\blaster_master_right.png,28,15,120,224,8,8,89,2 -0,Images\blaster_master_right.png,28,16,128,224,8,8,91,2 -0,Images\blaster_master_right.png,28,17,136,224,8,8,93,2 -0,Images\blaster_master_right.png,28,18,144,224,8,8,87,2 -0,Images\blaster_master_right.png,28,19,152,224,8,8,89,2 -0,Images\blaster_master_right.png,28,20,160,224,8,8,91,2 -0,Images\blaster_master_right.png,28,21,168,224,8,8,93,2 -0,Images\blaster_master_right.png,28,22,176,224,8,8,87,2 -0,Images\blaster_master_right.png,28,23,184,224,8,8,89,2 -0,Images\blaster_master_right.png,28,24,192,224,8,8,91,2 -0,Images\blaster_master_right.png,28,25,200,224,8,8,93,2 -0,Images\blaster_master_right.png,28,26,208,224,8,8,87,2 -0,Images\blaster_master_right.png,28,27,216,224,8,8,89,2 -0,Images\blaster_master_right.png,28,28,224,224,8,8,91,2 -0,Images\blaster_master_right.png,28,29,232,224,8,8,93,2 -0,Images\blaster_master_right.png,28,30,240,224,8,8,87,2 -0,Images\blaster_master_right.png,28,31,248,224,8,8,89,2 +0,Images\blaster_master_right.png,28,14,112,224,8,8,89,2 +0,Images\blaster_master_right.png,28,15,120,224,8,8,91,2 +0,Images\blaster_master_right.png,28,16,128,224,8,8,93,2 +0,Images\blaster_master_right.png,28,17,136,224,8,8,95,2 +0,Images\blaster_master_right.png,28,18,144,224,8,8,89,2 +0,Images\blaster_master_right.png,28,19,152,224,8,8,91,2 +0,Images\blaster_master_right.png,28,20,160,224,8,8,93,2 +0,Images\blaster_master_right.png,28,21,168,224,8,8,95,2 +0,Images\blaster_master_right.png,28,22,176,224,8,8,89,2 +0,Images\blaster_master_right.png,28,23,184,224,8,8,91,2 +0,Images\blaster_master_right.png,28,24,192,224,8,8,93,2 +0,Images\blaster_master_right.png,28,25,200,224,8,8,95,2 +0,Images\blaster_master_right.png,28,26,208,224,8,8,89,2 +0,Images\blaster_master_right.png,28,27,216,224,8,8,91,2 +0,Images\blaster_master_right.png,28,28,224,224,8,8,93,2 +0,Images\blaster_master_right.png,28,29,232,224,8,8,95,2 +0,Images\blaster_master_right.png,28,30,240,224,8,8,89,2 +0,Images\blaster_master_right.png,28,31,248,224,8,8,91,2 0,Images\blaster_master_right.png,29,0,0,232,8,8,64,1 0,Images\blaster_master_right.png,29,1,8,232,8,8,64,1 0,Images\blaster_master_right.png,29,2,16,232,8,8,64,1 diff --git a/Tests/References/buhanka_name_table_1.bin b/Tests/References/buhanka_name_table_1.bin index 8368ad0..b391ec0 100644 Binary files a/Tests/References/buhanka_name_table_1.bin and b/Tests/References/buhanka_name_table_1.bin differ diff --git a/Tests/References/buhanka_palette_0.bin b/Tests/References/buhanka_palette_0.bin index 080784d..d9cd74b 100644 --- a/Tests/References/buhanka_palette_0.bin +++ b/Tests/References/buhanka_palette_0.bin @@ -1 +1 @@ - -(1 \ No newline at end of file + -1( \ No newline at end of file diff --git a/Tests/References/buhanka_palette_2.bin b/Tests/References/buhanka_palette_2.bin index 9b4c3ff..671e7a6 100644 --- a/Tests/References/buhanka_palette_2.bin +++ b/Tests/References/buhanka_palette_2.bin @@ -1 +1 @@ - -"1 \ No newline at end of file + "-1 \ No newline at end of file diff --git a/Tests/References/buhanka_palettes.csv b/Tests/References/buhanka_palettes.csv index 11ec8e4..2640c6d 100644 --- a/Tests/References/buhanka_palettes.csv +++ b/Tests/References/buhanka_palettes.csv @@ -1,5 +1,5 @@ palette_id,color0,color1,color2,color3 -0,#183C5C,#787878,#F0BC3C,#A8E4FC +0,#183C5C,#787878,#A8E4FC,#F0BC3C 1,#183C5C,#000000,#402C00,#787878 -2,#183C5C,#787878,#5C94FC,#A8E4FC +2,#183C5C,#5C94FC,#787878,#A8E4FC 3,#183C5C,#000000,#787878,#C4C4C4 diff --git a/Tests/References/buhanka_pattern_0.bin b/Tests/References/buhanka_pattern_0.bin index 1cbccd1..6a41294 100644 Binary files a/Tests/References/buhanka_pattern_0.bin and b/Tests/References/buhanka_pattern_0.bin differ diff --git a/Tests/References/buhanka_pattern_1.bin b/Tests/References/buhanka_pattern_1.bin index d8b42d8..1525c43 100644 Binary files a/Tests/References/buhanka_pattern_1.bin and b/Tests/References/buhanka_pattern_1.bin differ diff --git a/Tests/References/buhanka_pattern_2.bin b/Tests/References/buhanka_pattern_2.bin index 4252984..f43e7c9 100644 Binary files a/Tests/References/buhanka_pattern_2.bin and b/Tests/References/buhanka_pattern_2.bin differ diff --git a/Tests/References/buhanka_tiles.csv b/Tests/References/buhanka_tiles.csv index 18ce74c..dab85e8 100644 --- a/Tests/References/buhanka_tiles.csv +++ b/Tests/References/buhanka_tiles.csv @@ -271,86 +271,86 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 1,Images\buhanka.gif:64:64,0,13,104,0,8,8,26,0 1,Images\buhanka.gif:64:64,0,14,112,0,8,8,28,0 1,Images\buhanka.gif:64:64,0,15,120,0,8,8,30,0 -1,Images\buhanka.gif:64:64,0,16,128,0,8,8,16,2 -1,Images\buhanka.gif:64:64,0,17,136,0,8,8,16,2 -1,Images\buhanka.gif:64:64,0,18,144,0,8,8,16,2 -1,Images\buhanka.gif:64:64,0,19,152,0,8,8,32,2 -1,Images\buhanka.gif:64:64,0,20,160,0,8,8,34,0 -1,Images\buhanka.gif:64:64,0,21,168,0,8,8,36,0 -1,Images\buhanka.gif:64:64,0,22,176,0,8,8,38,0 -1,Images\buhanka.gif:64:64,0,23,184,0,8,8,40,0 -1,Images\buhanka.gif:64:64,0,24,192,0,8,8,42,0 -1,Images\buhanka.gif:64:64,0,25,200,0,8,8,44,0 -1,Images\buhanka.gif:64:64,0,26,208,0,8,8,46,0 -1,Images\buhanka.gif:64:64,0,27,216,0,8,8,48,0 -1,Images\buhanka.gif:64:64,0,28,224,0,8,8,50,0 -1,Images\buhanka.gif:64:64,0,29,232,0,8,8,52,0 -1,Images\buhanka.gif:64:64,0,30,240,0,8,8,54,3 -1,Images\buhanka.gif:64:64,0,31,248,0,8,8,56,3 -1,Images\buhanka.gif:64:64,1,0,0,8,8,8,58,0 -1,Images\buhanka.gif:64:64,1,1,8,8,8,8,60,0 -1,Images\buhanka.gif:64:64,1,2,16,8,8,8,62,0 -1,Images\buhanka.gif:64:64,1,3,24,8,8,8,64,0 -1,Images\buhanka.gif:64:64,1,4,32,8,8,8,66,0 +1,Images\buhanka.gif:64:64,0,16,128,0,8,8,32,2 +1,Images\buhanka.gif:64:64,0,17,136,0,8,8,32,2 +1,Images\buhanka.gif:64:64,0,18,144,0,8,8,32,2 +1,Images\buhanka.gif:64:64,0,19,152,0,8,8,34,2 +1,Images\buhanka.gif:64:64,0,20,160,0,8,8,36,0 +1,Images\buhanka.gif:64:64,0,21,168,0,8,8,38,0 +1,Images\buhanka.gif:64:64,0,22,176,0,8,8,40,0 +1,Images\buhanka.gif:64:64,0,23,184,0,8,8,42,0 +1,Images\buhanka.gif:64:64,0,24,192,0,8,8,44,0 +1,Images\buhanka.gif:64:64,0,25,200,0,8,8,46,0 +1,Images\buhanka.gif:64:64,0,26,208,0,8,8,48,0 +1,Images\buhanka.gif:64:64,0,27,216,0,8,8,50,0 +1,Images\buhanka.gif:64:64,0,28,224,0,8,8,52,0 +1,Images\buhanka.gif:64:64,0,29,232,0,8,8,54,0 +1,Images\buhanka.gif:64:64,0,30,240,0,8,8,56,3 +1,Images\buhanka.gif:64:64,0,31,248,0,8,8,58,3 +1,Images\buhanka.gif:64:64,1,0,0,8,8,8,60,0 +1,Images\buhanka.gif:64:64,1,1,8,8,8,8,62,0 +1,Images\buhanka.gif:64:64,1,2,16,8,8,8,64,0 +1,Images\buhanka.gif:64:64,1,3,24,8,8,8,66,0 +1,Images\buhanka.gif:64:64,1,4,32,8,8,8,68,0 1,Images\buhanka.gif:64:64,1,5,40,8,8,8,16,0 -1,Images\buhanka.gif:64:64,1,6,48,8,8,8,68,0 -1,Images\buhanka.gif:64:64,1,7,56,8,8,8,70,0 -1,Images\buhanka.gif:64:64,1,8,64,8,8,8,72,0 -1,Images\buhanka.gif:64:64,1,9,72,8,8,8,74,0 -1,Images\buhanka.gif:64:64,1,10,80,8,8,8,76,0 -1,Images\buhanka.gif:64:64,1,11,88,8,8,8,78,0 -1,Images\buhanka.gif:64:64,1,12,96,8,8,8,80,0 -1,Images\buhanka.gif:64:64,1,13,104,8,8,8,82,0 -1,Images\buhanka.gif:64:64,1,14,112,8,8,8,84,0 -1,Images\buhanka.gif:64:64,1,15,120,8,8,8,86,0 -1,Images\buhanka.gif:64:64,1,16,128,8,8,8,88,2 -1,Images\buhanka.gif:64:64,1,17,136,8,8,8,90,2 -1,Images\buhanka.gif:64:64,1,18,144,8,8,8,92,2 -1,Images\buhanka.gif:64:64,1,19,152,8,8,8,94,2 -1,Images\buhanka.gif:64:64,1,20,160,8,8,8,96,0 -1,Images\buhanka.gif:64:64,1,21,168,8,8,8,98,0 -1,Images\buhanka.gif:64:64,1,22,176,8,8,8,100,0 -1,Images\buhanka.gif:64:64,1,23,184,8,8,8,102,0 -1,Images\buhanka.gif:64:64,1,24,192,8,8,8,104,0 -1,Images\buhanka.gif:64:64,1,25,200,8,8,8,106,0 -1,Images\buhanka.gif:64:64,1,26,208,8,8,8,108,0 -1,Images\buhanka.gif:64:64,1,27,216,8,8,8,110,0 -1,Images\buhanka.gif:64:64,1,28,224,8,8,8,112,0 -1,Images\buhanka.gif:64:64,1,29,232,8,8,8,114,0 -1,Images\buhanka.gif:64:64,1,30,240,8,8,8,116,3 -1,Images\buhanka.gif:64:64,1,31,248,8,8,8,118,3 -1,Images\buhanka.gif:64:64,2,0,0,16,8,8,120,0 -1,Images\buhanka.gif:64:64,2,1,8,16,8,8,122,0 -1,Images\buhanka.gif:64:64,2,2,16,16,8,8,124,0 -1,Images\buhanka.gif:64:64,2,3,24,16,8,8,126,0 +1,Images\buhanka.gif:64:64,1,6,48,8,8,8,70,0 +1,Images\buhanka.gif:64:64,1,7,56,8,8,8,72,0 +1,Images\buhanka.gif:64:64,1,8,64,8,8,8,74,0 +1,Images\buhanka.gif:64:64,1,9,72,8,8,8,76,0 +1,Images\buhanka.gif:64:64,1,10,80,8,8,8,78,0 +1,Images\buhanka.gif:64:64,1,11,88,8,8,8,80,0 +1,Images\buhanka.gif:64:64,1,12,96,8,8,8,82,0 +1,Images\buhanka.gif:64:64,1,13,104,8,8,8,84,0 +1,Images\buhanka.gif:64:64,1,14,112,8,8,8,86,0 +1,Images\buhanka.gif:64:64,1,15,120,8,8,8,88,0 +1,Images\buhanka.gif:64:64,1,16,128,8,8,8,90,2 +1,Images\buhanka.gif:64:64,1,17,136,8,8,8,92,2 +1,Images\buhanka.gif:64:64,1,18,144,8,8,8,94,2 +1,Images\buhanka.gif:64:64,1,19,152,8,8,8,96,2 +1,Images\buhanka.gif:64:64,1,20,160,8,8,8,98,0 +1,Images\buhanka.gif:64:64,1,21,168,8,8,8,100,0 +1,Images\buhanka.gif:64:64,1,22,176,8,8,8,102,0 +1,Images\buhanka.gif:64:64,1,23,184,8,8,8,104,0 +1,Images\buhanka.gif:64:64,1,24,192,8,8,8,106,0 +1,Images\buhanka.gif:64:64,1,25,200,8,8,8,108,0 +1,Images\buhanka.gif:64:64,1,26,208,8,8,8,110,0 +1,Images\buhanka.gif:64:64,1,27,216,8,8,8,112,0 +1,Images\buhanka.gif:64:64,1,28,224,8,8,8,114,0 +1,Images\buhanka.gif:64:64,1,29,232,8,8,8,116,0 +1,Images\buhanka.gif:64:64,1,30,240,8,8,8,118,3 +1,Images\buhanka.gif:64:64,1,31,248,8,8,8,120,3 +1,Images\buhanka.gif:64:64,2,0,0,16,8,8,122,0 +1,Images\buhanka.gif:64:64,2,1,8,16,8,8,124,0 +1,Images\buhanka.gif:64:64,2,2,16,16,8,8,126,0 +1,Images\buhanka.gif:64:64,2,3,24,16,8,8,128,0 1,Images\buhanka.gif:64:64,2,4,32,16,8,8,16,0 -1,Images\buhanka.gif:64:64,2,5,40,16,8,8,128,0 -1,Images\buhanka.gif:64:64,2,6,48,16,8,8,130,0 -1,Images\buhanka.gif:64:64,2,7,56,16,8,8,132,0 -1,Images\buhanka.gif:64:64,2,8,64,16,8,8,134,3 -1,Images\buhanka.gif:64:64,2,9,72,16,8,8,136,3 -1,Images\buhanka.gif:64:64,2,10,80,16,8,8,138,3 -1,Images\buhanka.gif:64:64,2,11,88,16,8,8,140,3 -1,Images\buhanka.gif:64:64,2,12,96,16,8,8,142,1 -1,Images\buhanka.gif:64:64,2,13,104,16,8,8,144,1 -1,Images\buhanka.gif:64:64,2,14,112,16,8,8,146,1 -1,Images\buhanka.gif:64:64,2,15,120,16,8,8,148,1 -1,Images\buhanka.gif:64:64,2,16,128,16,8,8,150,2 -1,Images\buhanka.gif:64:64,2,17,136,16,8,8,152,2 -1,Images\buhanka.gif:64:64,2,18,144,16,8,8,154,2 -1,Images\buhanka.gif:64:64,2,19,152,16,8,8,156,2 -1,Images\buhanka.gif:64:64,2,20,160,16,8,8,158,2 -1,Images\buhanka.gif:64:64,2,21,168,16,8,8,160,2 -1,Images\buhanka.gif:64:64,2,22,176,16,8,8,162,0 -1,Images\buhanka.gif:64:64,2,23,184,16,8,8,164,0 -1,Images\buhanka.gif:64:64,2,24,192,16,8,8,166,0 -1,Images\buhanka.gif:64:64,2,25,200,16,8,8,168,0 -1,Images\buhanka.gif:64:64,2,26,208,16,8,8,170,0 -1,Images\buhanka.gif:64:64,2,27,216,16,8,8,172,0 -1,Images\buhanka.gif:64:64,2,28,224,16,8,8,174,0 -1,Images\buhanka.gif:64:64,2,29,232,16,8,8,176,0 -1,Images\buhanka.gif:64:64,2,30,240,16,8,8,178,3 -1,Images\buhanka.gif:64:64,2,31,248,16,8,8,180,3 +1,Images\buhanka.gif:64:64,2,5,40,16,8,8,130,0 +1,Images\buhanka.gif:64:64,2,6,48,16,8,8,132,0 +1,Images\buhanka.gif:64:64,2,7,56,16,8,8,134,0 +1,Images\buhanka.gif:64:64,2,8,64,16,8,8,136,3 +1,Images\buhanka.gif:64:64,2,9,72,16,8,8,138,3 +1,Images\buhanka.gif:64:64,2,10,80,16,8,8,140,3 +1,Images\buhanka.gif:64:64,2,11,88,16,8,8,142,3 +1,Images\buhanka.gif:64:64,2,12,96,16,8,8,144,1 +1,Images\buhanka.gif:64:64,2,13,104,16,8,8,146,1 +1,Images\buhanka.gif:64:64,2,14,112,16,8,8,148,1 +1,Images\buhanka.gif:64:64,2,15,120,16,8,8,150,1 +1,Images\buhanka.gif:64:64,2,16,128,16,8,8,152,2 +1,Images\buhanka.gif:64:64,2,17,136,16,8,8,154,2 +1,Images\buhanka.gif:64:64,2,18,144,16,8,8,156,2 +1,Images\buhanka.gif:64:64,2,19,152,16,8,8,158,2 +1,Images\buhanka.gif:64:64,2,20,160,16,8,8,160,2 +1,Images\buhanka.gif:64:64,2,21,168,16,8,8,162,2 +1,Images\buhanka.gif:64:64,2,22,176,16,8,8,164,0 +1,Images\buhanka.gif:64:64,2,23,184,16,8,8,166,0 +1,Images\buhanka.gif:64:64,2,24,192,16,8,8,168,0 +1,Images\buhanka.gif:64:64,2,25,200,16,8,8,170,0 +1,Images\buhanka.gif:64:64,2,26,208,16,8,8,172,0 +1,Images\buhanka.gif:64:64,2,27,216,16,8,8,174,0 +1,Images\buhanka.gif:64:64,2,28,224,16,8,8,176,0 +1,Images\buhanka.gif:64:64,2,29,232,16,8,8,178,0 +1,Images\buhanka.gif:64:64,2,30,240,16,8,8,180,3 +1,Images\buhanka.gif:64:64,2,31,248,16,8,8,16,3 1,Images\buhanka.gif:64:64,3,0,0,24,8,8,182,0 1,Images\buhanka.gif:64:64,3,1,8,24,8,8,184,0 1,Images\buhanka.gif:64:64,3,2,16,24,8,8,186,0 diff --git a/Tests/References/chernobyl_palette_0.bin b/Tests/References/chernobyl_palette_0.bin index c80e501..314f36e 100644 --- a/Tests/References/chernobyl_palette_0.bin +++ b/Tests/References/chernobyl_palette_0.bin @@ -1 +1 @@ -6- \ No newline at end of file +6 - \ No newline at end of file diff --git a/Tests/References/chernobyl_palette_1.bin b/Tests/References/chernobyl_palette_1.bin index 3946846..7672d2d 100644 --- a/Tests/References/chernobyl_palette_1.bin +++ b/Tests/References/chernobyl_palette_1.bin @@ -1 +1 @@ -6-" \ No newline at end of file +6 "- \ No newline at end of file diff --git a/Tests/References/chernobyl_palettes.csv b/Tests/References/chernobyl_palettes.csv index 68dfeb4..24eaf66 100644 --- a/Tests/References/chernobyl_palettes.csv +++ b/Tests/References/chernobyl_palettes.csv @@ -1,3 +1,3 @@ palette_id,color0,color1,color2,color3 -0,#FCBCB0,#000000,#787878,#183C5C -1,#FCBCB0,#787878,#5C94FC,#183C5C +0,#FCBCB0,#000000,#183C5C,#787878 +1,#FCBCB0,#183C5C,#5C94FC,#787878 diff --git a/Tests/References/chernobyl_pattern_0.bin b/Tests/References/chernobyl_pattern_0.bin index 9257e5b..e0a2fd9 100644 Binary files a/Tests/References/chernobyl_pattern_0.bin and b/Tests/References/chernobyl_pattern_0.bin differ diff --git a/Tests/References/chernobyl_pattern_1.bin b/Tests/References/chernobyl_pattern_1.bin index 0bb2816..95897d9 100644 Binary files a/Tests/References/chernobyl_pattern_1.bin and b/Tests/References/chernobyl_pattern_1.bin differ diff --git a/Tests/References/chernobyl_pattern_2.bin b/Tests/References/chernobyl_pattern_2.bin index 1ee9c3f..e2639f5 100644 Binary files a/Tests/References/chernobyl_pattern_2.bin and b/Tests/References/chernobyl_pattern_2.bin differ diff --git a/Tests/References/chernobyl_pattern_3.bin b/Tests/References/chernobyl_pattern_3.bin index 641e075..d7c7098 100644 Binary files a/Tests/References/chernobyl_pattern_3.bin and b/Tests/References/chernobyl_pattern_3.bin differ diff --git a/Tests/References/dira_attr_table_0.bin b/Tests/References/dira_attr_table_0.bin index ab906d5..284d799 100644 Binary files a/Tests/References/dira_attr_table_0.bin and b/Tests/References/dira_attr_table_0.bin differ diff --git a/Tests/References/dira_attr_table_1.bin b/Tests/References/dira_attr_table_1.bin index 419c93b..fa56913 100644 Binary files a/Tests/References/dira_attr_table_1.bin and b/Tests/References/dira_attr_table_1.bin differ diff --git a/Tests/References/dira_attr_table_2.bin b/Tests/References/dira_attr_table_2.bin index 4c6596b..44997fb 100644 Binary files a/Tests/References/dira_attr_table_2.bin and b/Tests/References/dira_attr_table_2.bin differ diff --git a/Tests/References/dira_attr_table_3.bin b/Tests/References/dira_attr_table_3.bin index 0f863be..72d7b56 100644 Binary files a/Tests/References/dira_attr_table_3.bin and b/Tests/References/dira_attr_table_3.bin differ diff --git a/Tests/References/dira_palette_0.bin b/Tests/References/dira_palette_0.bin index 008ff1e..0b641d5 100644 --- a/Tests/References/dira_palette_0.bin +++ b/Tests/References/dira_palette_0.bin @@ -1 +1 @@ --7 \ No newline at end of file +-7 \ No newline at end of file diff --git a/Tests/References/dira_palette_1.bin b/Tests/References/dira_palette_1.bin index d84d431..01a20a9 100644 --- a/Tests/References/dira_palette_1.bin +++ b/Tests/References/dira_palette_1.bin @@ -1 +1 @@ --0( \ No newline at end of file +-(0 \ No newline at end of file diff --git a/Tests/References/dira_palette_2.bin b/Tests/References/dira_palette_2.bin index 23d2739..3534dda 100644 --- a/Tests/References/dira_palette_2.bin +++ b/Tests/References/dira_palette_2.bin @@ -1 +1 @@ -- \ No newline at end of file +-7 \ No newline at end of file diff --git a/Tests/References/dira_palette_3.bin b/Tests/References/dira_palette_3.bin index 8245c46..23d2739 100644 --- a/Tests/References/dira_palette_3.bin +++ b/Tests/References/dira_palette_3.bin @@ -1 +1 @@ --7 \ No newline at end of file +- \ No newline at end of file diff --git a/Tests/References/dira_palettes.csv b/Tests/References/dira_palettes.csv index a224fa3..67bbe24 100644 --- a/Tests/References/dira_palettes.csv +++ b/Tests/References/dira_palettes.csv @@ -1,5 +1,5 @@ palette_id,color0,color1,color2,color3 -0,#787878,#FCD8A8,#402C00,#FCFCFC -1,#787878,#FFFFFF,#402C00,#F0BC3C -2,#787878,#000000,#402C00,#BCBCBC -3,#787878,#FCD8A8,#402C00,#000000 +0,#787878,#402C00,#FCD8A8,#FCFCFC +1,#787878,#402C00,#F0BC3C,#FFFFFF +2,#787878,#000000,#402C00,#FCD8A8 +3,#787878,#000000,#402C00,#BCBCBC diff --git a/Tests/References/dira_pattern_0.bin b/Tests/References/dira_pattern_0.bin index 88313a3..ac61b7f 100644 Binary files a/Tests/References/dira_pattern_0.bin and b/Tests/References/dira_pattern_0.bin differ diff --git a/Tests/References/dira_pattern_1.bin b/Tests/References/dira_pattern_1.bin index 2633ee4..47f6dd4 100644 Binary files a/Tests/References/dira_pattern_1.bin and b/Tests/References/dira_pattern_1.bin differ diff --git a/Tests/References/dira_pattern_2.bin b/Tests/References/dira_pattern_2.bin index 42dfa4d..9114fe8 100644 Binary files a/Tests/References/dira_pattern_2.bin and b/Tests/References/dira_pattern_2.bin differ diff --git a/Tests/References/dira_pattern_3.bin b/Tests/References/dira_pattern_3.bin index e4d8b9c..4f23357 100644 Binary files a/Tests/References/dira_pattern_3.bin and b/Tests/References/dira_pattern_3.bin differ diff --git a/Tests/References/dira_tiles.csv b/Tests/References/dira_tiles.csv index af64945..175e255 100644 --- a/Tests/References/dira_tiles.csv +++ b/Tests/References/dira_tiles.csv @@ -205,8 +205,8 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 0,Images\dira.gif:0:64,6,11,88,48,8,8,151,1 0,Images\dira.gif:0:64,6,12,96,48,8,8,153,1 0,Images\dira.gif:0:64,6,13,104,48,8,8,155,1 -0,Images\dira.gif:0:64,6,14,112,48,8,8,157,3 -0,Images\dira.gif:0:64,6,15,120,48,8,8,159,3 +0,Images\dira.gif:0:64,6,14,112,48,8,8,157,2 +0,Images\dira.gif:0:64,6,15,120,48,8,8,159,2 0,Images\dira.gif:0:64,6,16,128,48,8,8,161,0 0,Images\dira.gif:0:64,6,17,136,48,8,8,163,0 0,Images\dira.gif:0:64,6,18,144,48,8,8,165,0 @@ -237,8 +237,8 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 0,Images\dira.gif:0:64,7,11,88,56,8,8,215,1 0,Images\dira.gif:0:64,7,12,96,56,8,8,217,1 0,Images\dira.gif:0:64,7,13,104,56,8,8,219,1 -0,Images\dira.gif:0:64,7,14,112,56,8,8,221,3 -0,Images\dira.gif:0:64,7,15,120,56,8,8,223,3 +0,Images\dira.gif:0:64,7,14,112,56,8,8,221,2 +0,Images\dira.gif:0:64,7,15,120,56,8,8,223,2 0,Images\dira.gif:0:64,7,16,128,56,8,8,225,0 0,Images\dira.gif:0:64,7,17,136,56,8,8,227,0 0,Images\dira.gif:0:64,7,18,144,56,8,8,229,0 @@ -401,8 +401,8 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 1,Images\dira.gif:64:64,4,15,120,32,8,8,31,2 1,Images\dira.gif:64:64,4,16,128,32,8,8,33,2 1,Images\dira.gif:64:64,4,17,136,32,8,8,35,2 -1,Images\dira.gif:64:64,4,18,144,32,8,8,37,2 -1,Images\dira.gif:64:64,4,19,152,32,8,8,39,2 +1,Images\dira.gif:64:64,4,18,144,32,8,8,37,3 +1,Images\dira.gif:64:64,4,19,152,32,8,8,39,3 1,Images\dira.gif:64:64,4,20,160,32,8,8,41,0 1,Images\dira.gif:64:64,4,21,168,32,8,8,43,0 1,Images\dira.gif:64:64,4,22,176,32,8,8,45,1 @@ -433,8 +433,8 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 1,Images\dira.gif:64:64,5,15,120,40,8,8,95,2 1,Images\dira.gif:64:64,5,16,128,40,8,8,97,2 1,Images\dira.gif:64:64,5,17,136,40,8,8,99,2 -1,Images\dira.gif:64:64,5,18,144,40,8,8,101,2 -1,Images\dira.gif:64:64,5,19,152,40,8,8,103,2 +1,Images\dira.gif:64:64,5,18,144,40,8,8,101,3 +1,Images\dira.gif:64:64,5,19,152,40,8,8,103,3 1,Images\dira.gif:64:64,5,20,160,40,8,8,105,0 1,Images\dira.gif:64:64,5,21,168,40,8,8,107,0 1,Images\dira.gif:64:64,5,22,176,40,8,8,109,1 @@ -467,8 +467,8 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 1,Images\dira.gif:64:64,6,17,136,48,8,8,163,2 1,Images\dira.gif:64:64,6,18,144,48,8,8,165,2 1,Images\dira.gif:64:64,6,19,152,48,8,8,167,2 -1,Images\dira.gif:64:64,6,20,160,48,8,8,169,3 -1,Images\dira.gif:64:64,6,21,168,48,8,8,171,3 +1,Images\dira.gif:64:64,6,20,160,48,8,8,169,2 +1,Images\dira.gif:64:64,6,21,168,48,8,8,171,2 1,Images\dira.gif:64:64,6,22,176,48,8,8,173,1 1,Images\dira.gif:64:64,6,23,184,48,8,8,175,1 1,Images\dira.gif:64:64,6,24,192,48,8,8,177,1 @@ -499,8 +499,8 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 1,Images\dira.gif:64:64,7,17,136,56,8,8,227,2 1,Images\dira.gif:64:64,7,18,144,56,8,8,229,2 1,Images\dira.gif:64:64,7,19,152,56,8,8,231,2 -1,Images\dira.gif:64:64,7,20,160,56,8,8,233,3 -1,Images\dira.gif:64:64,7,21,168,56,8,8,235,3 +1,Images\dira.gif:64:64,7,20,160,56,8,8,233,2 +1,Images\dira.gif:64:64,7,21,168,56,8,8,235,2 1,Images\dira.gif:64:64,7,22,176,56,8,8,237,1 1,Images\dira.gif:64:64,7,23,184,56,8,8,239,1 1,Images\dira.gif:64:64,7,24,192,56,8,8,241,1 @@ -523,16 +523,16 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 2,Images\dira.gif:128:64,0,9,72,0,8,8,18,0 2,Images\dira.gif:128:64,0,10,80,0,8,8,20,0 2,Images\dira.gif:128:64,0,11,88,0,8,8,22,0 -2,Images\dira.gif:128:64,0,12,96,0,8,8,24,2 -2,Images\dira.gif:128:64,0,13,104,0,8,8,26,2 +2,Images\dira.gif:128:64,0,12,96,0,8,8,24,3 +2,Images\dira.gif:128:64,0,13,104,0,8,8,26,3 2,Images\dira.gif:128:64,0,14,112,0,8,8,28,2 2,Images\dira.gif:128:64,0,15,120,0,8,8,30,2 2,Images\dira.gif:128:64,0,16,128,0,8,8,32,2 2,Images\dira.gif:128:64,0,17,136,0,8,8,34,2 2,Images\dira.gif:128:64,0,18,144,0,8,8,36,2 2,Images\dira.gif:128:64,0,19,152,0,8,8,38,2 -2,Images\dira.gif:128:64,0,20,160,0,8,8,40,3 -2,Images\dira.gif:128:64,0,21,168,0,8,8,42,3 +2,Images\dira.gif:128:64,0,20,160,0,8,8,40,2 +2,Images\dira.gif:128:64,0,21,168,0,8,8,42,2 2,Images\dira.gif:128:64,0,22,176,0,8,8,44,1 2,Images\dira.gif:128:64,0,23,184,0,8,8,46,1 2,Images\dira.gif:128:64,0,24,192,0,8,8,48,1 @@ -555,16 +555,16 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 2,Images\dira.gif:128:64,1,9,72,8,8,8,82,0 2,Images\dira.gif:128:64,1,10,80,8,8,8,84,0 2,Images\dira.gif:128:64,1,11,88,8,8,8,86,0 -2,Images\dira.gif:128:64,1,12,96,8,8,8,88,2 -2,Images\dira.gif:128:64,1,13,104,8,8,8,90,2 +2,Images\dira.gif:128:64,1,12,96,8,8,8,88,3 +2,Images\dira.gif:128:64,1,13,104,8,8,8,90,3 2,Images\dira.gif:128:64,1,14,112,8,8,8,92,2 2,Images\dira.gif:128:64,1,15,120,8,8,8,94,2 2,Images\dira.gif:128:64,1,16,128,8,8,8,96,2 2,Images\dira.gif:128:64,1,17,136,8,8,8,98,2 2,Images\dira.gif:128:64,1,18,144,8,8,8,100,2 2,Images\dira.gif:128:64,1,19,152,8,8,8,102,2 -2,Images\dira.gif:128:64,1,20,160,8,8,8,104,3 -2,Images\dira.gif:128:64,1,21,168,8,8,8,106,3 +2,Images\dira.gif:128:64,1,20,160,8,8,8,104,2 +2,Images\dira.gif:128:64,1,21,168,8,8,8,106,2 2,Images\dira.gif:128:64,1,22,176,8,8,8,108,1 2,Images\dira.gif:128:64,1,23,184,8,8,8,110,1 2,Images\dira.gif:128:64,1,24,192,8,8,8,112,1 @@ -587,14 +587,14 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 2,Images\dira.gif:128:64,2,9,72,16,8,8,146,0 2,Images\dira.gif:128:64,2,10,80,16,8,8,148,0 2,Images\dira.gif:128:64,2,11,88,16,8,8,150,0 -2,Images\dira.gif:128:64,2,12,96,16,8,8,152,2 -2,Images\dira.gif:128:64,2,13,104,16,8,8,154,2 +2,Images\dira.gif:128:64,2,12,96,16,8,8,152,3 +2,Images\dira.gif:128:64,2,13,104,16,8,8,154,3 2,Images\dira.gif:128:64,2,14,112,16,8,8,156,2 2,Images\dira.gif:128:64,2,15,120,16,8,8,158,2 2,Images\dira.gif:128:64,2,16,128,16,8,8,160,2 2,Images\dira.gif:128:64,2,17,136,16,8,8,162,2 -2,Images\dira.gif:128:64,2,18,144,16,8,8,164,2 -2,Images\dira.gif:128:64,2,19,152,16,8,8,166,2 +2,Images\dira.gif:128:64,2,18,144,16,8,8,164,3 +2,Images\dira.gif:128:64,2,19,152,16,8,8,166,3 2,Images\dira.gif:128:64,2,20,160,16,8,8,168,0 2,Images\dira.gif:128:64,2,21,168,16,8,8,170,0 2,Images\dira.gif:128:64,2,22,176,16,8,8,172,1 @@ -619,14 +619,14 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 2,Images\dira.gif:128:64,3,9,72,24,8,8,210,0 2,Images\dira.gif:128:64,3,10,80,24,8,8,212,0 2,Images\dira.gif:128:64,3,11,88,24,8,8,214,0 -2,Images\dira.gif:128:64,3,12,96,24,8,8,216,2 -2,Images\dira.gif:128:64,3,13,104,24,8,8,218,2 +2,Images\dira.gif:128:64,3,12,96,24,8,8,216,3 +2,Images\dira.gif:128:64,3,13,104,24,8,8,218,3 2,Images\dira.gif:128:64,3,14,112,24,8,8,220,2 2,Images\dira.gif:128:64,3,15,120,24,8,8,222,2 2,Images\dira.gif:128:64,3,16,128,24,8,8,224,2 2,Images\dira.gif:128:64,3,17,136,24,8,8,226,2 -2,Images\dira.gif:128:64,3,18,144,24,8,8,228,2 -2,Images\dira.gif:128:64,3,19,152,24,8,8,230,2 +2,Images\dira.gif:128:64,3,18,144,24,8,8,228,3 +2,Images\dira.gif:128:64,3,19,152,24,8,8,230,3 2,Images\dira.gif:128:64,3,20,160,24,8,8,232,0 2,Images\dira.gif:128:64,3,21,168,24,8,8,234,0 2,Images\dira.gif:128:64,3,22,176,24,8,8,236,1 @@ -651,14 +651,14 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 2,Images\dira.gif:128:64,4,9,72,32,8,8,19,0 2,Images\dira.gif:128:64,4,10,80,32,8,8,21,0 2,Images\dira.gif:128:64,4,11,88,32,8,8,23,0 -2,Images\dira.gif:128:64,4,12,96,32,8,8,25,2 -2,Images\dira.gif:128:64,4,13,104,32,8,8,27,2 +2,Images\dira.gif:128:64,4,12,96,32,8,8,25,3 +2,Images\dira.gif:128:64,4,13,104,32,8,8,27,3 2,Images\dira.gif:128:64,4,14,112,32,8,8,29,2 2,Images\dira.gif:128:64,4,15,120,32,8,8,31,2 2,Images\dira.gif:128:64,4,16,128,32,8,8,33,2 2,Images\dira.gif:128:64,4,17,136,32,8,8,35,2 -2,Images\dira.gif:128:64,4,18,144,32,8,8,37,2 -2,Images\dira.gif:128:64,4,19,152,32,8,8,39,2 +2,Images\dira.gif:128:64,4,18,144,32,8,8,37,3 +2,Images\dira.gif:128:64,4,19,152,32,8,8,39,3 2,Images\dira.gif:128:64,4,20,160,32,8,8,41,0 2,Images\dira.gif:128:64,4,21,168,32,8,8,43,0 2,Images\dira.gif:128:64,4,22,176,32,8,8,45,0 @@ -683,14 +683,14 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 2,Images\dira.gif:128:64,5,9,72,40,8,8,83,0 2,Images\dira.gif:128:64,5,10,80,40,8,8,85,0 2,Images\dira.gif:128:64,5,11,88,40,8,8,87,0 -2,Images\dira.gif:128:64,5,12,96,40,8,8,89,2 -2,Images\dira.gif:128:64,5,13,104,40,8,8,91,2 +2,Images\dira.gif:128:64,5,12,96,40,8,8,89,3 +2,Images\dira.gif:128:64,5,13,104,40,8,8,91,3 2,Images\dira.gif:128:64,5,14,112,40,8,8,93,2 2,Images\dira.gif:128:64,5,15,120,40,8,8,95,2 2,Images\dira.gif:128:64,5,16,128,40,8,8,97,2 2,Images\dira.gif:128:64,5,17,136,40,8,8,99,2 -2,Images\dira.gif:128:64,5,18,144,40,8,8,101,2 -2,Images\dira.gif:128:64,5,19,152,40,8,8,103,2 +2,Images\dira.gif:128:64,5,18,144,40,8,8,101,3 +2,Images\dira.gif:128:64,5,19,152,40,8,8,103,3 2,Images\dira.gif:128:64,5,20,160,40,8,8,105,0 2,Images\dira.gif:128:64,5,21,168,40,8,8,107,0 2,Images\dira.gif:128:64,5,22,176,40,8,8,109,0 @@ -715,14 +715,14 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 2,Images\dira.gif:128:64,6,9,72,48,8,8,147,0 2,Images\dira.gif:128:64,6,10,80,48,8,8,149,0 2,Images\dira.gif:128:64,6,11,88,48,8,8,151,0 -2,Images\dira.gif:128:64,6,12,96,48,8,8,153,2 -2,Images\dira.gif:128:64,6,13,104,48,8,8,155,2 +2,Images\dira.gif:128:64,6,12,96,48,8,8,153,3 +2,Images\dira.gif:128:64,6,13,104,48,8,8,155,3 2,Images\dira.gif:128:64,6,14,112,48,8,8,157,2 2,Images\dira.gif:128:64,6,15,120,48,8,8,159,2 2,Images\dira.gif:128:64,6,16,128,48,8,8,161,2 2,Images\dira.gif:128:64,6,17,136,48,8,8,163,2 -2,Images\dira.gif:128:64,6,18,144,48,8,8,165,2 -2,Images\dira.gif:128:64,6,19,152,48,8,8,167,2 +2,Images\dira.gif:128:64,6,18,144,48,8,8,165,3 +2,Images\dira.gif:128:64,6,19,152,48,8,8,167,3 2,Images\dira.gif:128:64,6,20,160,48,8,8,169,0 2,Images\dira.gif:128:64,6,21,168,48,8,8,171,0 2,Images\dira.gif:128:64,6,22,176,48,8,8,173,0 @@ -747,14 +747,14 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 2,Images\dira.gif:128:64,7,9,72,56,8,8,211,0 2,Images\dira.gif:128:64,7,10,80,56,8,8,213,0 2,Images\dira.gif:128:64,7,11,88,56,8,8,215,0 -2,Images\dira.gif:128:64,7,12,96,56,8,8,217,2 -2,Images\dira.gif:128:64,7,13,104,56,8,8,219,2 +2,Images\dira.gif:128:64,7,12,96,56,8,8,217,3 +2,Images\dira.gif:128:64,7,13,104,56,8,8,219,3 2,Images\dira.gif:128:64,7,14,112,56,8,8,221,2 2,Images\dira.gif:128:64,7,15,120,56,8,8,223,2 2,Images\dira.gif:128:64,7,16,128,56,8,8,225,2 2,Images\dira.gif:128:64,7,17,136,56,8,8,227,2 -2,Images\dira.gif:128:64,7,18,144,56,8,8,229,2 -2,Images\dira.gif:128:64,7,19,152,56,8,8,231,2 +2,Images\dira.gif:128:64,7,18,144,56,8,8,229,3 +2,Images\dira.gif:128:64,7,19,152,56,8,8,231,3 2,Images\dira.gif:128:64,7,20,160,56,8,8,233,0 2,Images\dira.gif:128:64,7,21,168,56,8,8,235,0 2,Images\dira.gif:128:64,7,22,176,56,8,8,237,0 @@ -781,10 +781,10 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 3,Images\dira.gif:192:48,0,11,88,0,8,8,22,0 3,Images\dira.gif:192:48,0,12,96,0,8,8,24,0 3,Images\dira.gif:192:48,0,13,104,0,8,8,26,0 -3,Images\dira.gif:192:48,0,14,112,0,8,8,28,3 -3,Images\dira.gif:192:48,0,15,120,0,8,8,30,3 -3,Images\dira.gif:192:48,0,16,128,0,8,8,32,3 -3,Images\dira.gif:192:48,0,17,136,0,8,8,34,3 +3,Images\dira.gif:192:48,0,14,112,0,8,8,28,2 +3,Images\dira.gif:192:48,0,15,120,0,8,8,30,2 +3,Images\dira.gif:192:48,0,16,128,0,8,8,32,2 +3,Images\dira.gif:192:48,0,17,136,0,8,8,34,2 3,Images\dira.gif:192:48,0,18,144,0,8,8,36,0 3,Images\dira.gif:192:48,0,19,152,0,8,8,38,0 3,Images\dira.gif:192:48,0,20,160,0,8,8,40,0 @@ -813,10 +813,10 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 3,Images\dira.gif:192:48,1,11,88,8,8,8,86,0 3,Images\dira.gif:192:48,1,12,96,8,8,8,88,0 3,Images\dira.gif:192:48,1,13,104,8,8,8,90,0 -3,Images\dira.gif:192:48,1,14,112,8,8,8,92,3 -3,Images\dira.gif:192:48,1,15,120,8,8,8,94,3 -3,Images\dira.gif:192:48,1,16,128,8,8,8,96,3 -3,Images\dira.gif:192:48,1,17,136,8,8,8,98,3 +3,Images\dira.gif:192:48,1,14,112,8,8,8,92,2 +3,Images\dira.gif:192:48,1,15,120,8,8,8,94,2 +3,Images\dira.gif:192:48,1,16,128,8,8,8,96,2 +3,Images\dira.gif:192:48,1,17,136,8,8,8,98,2 3,Images\dira.gif:192:48,1,18,144,8,8,8,100,0 3,Images\dira.gif:192:48,1,19,152,8,8,8,102,0 3,Images\dira.gif:192:48,1,20,160,8,8,8,104,0 @@ -853,8 +853,8 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 3,Images\dira.gif:192:48,2,19,152,16,8,8,166,0 3,Images\dira.gif:192:48,2,20,160,16,8,8,168,0 3,Images\dira.gif:192:48,2,21,168,16,8,8,170,0 -3,Images\dira.gif:192:48,2,22,176,16,8,8,172,3 -3,Images\dira.gif:192:48,2,23,184,16,8,8,174,3 +3,Images\dira.gif:192:48,2,22,176,16,8,8,172,2 +3,Images\dira.gif:192:48,2,23,184,16,8,8,174,2 3,Images\dira.gif:192:48,2,24,192,16,8,8,176,0 3,Images\dira.gif:192:48,2,25,200,16,8,8,178,0 3,Images\dira.gif:192:48,2,26,208,16,8,8,180,0 @@ -885,8 +885,8 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 3,Images\dira.gif:192:48,3,19,152,24,8,8,230,0 3,Images\dira.gif:192:48,3,20,160,24,8,8,232,0 3,Images\dira.gif:192:48,3,21,168,24,8,8,234,0 -3,Images\dira.gif:192:48,3,22,176,24,8,8,236,3 -3,Images\dira.gif:192:48,3,23,184,24,8,8,238,3 +3,Images\dira.gif:192:48,3,22,176,24,8,8,236,2 +3,Images\dira.gif:192:48,3,23,184,24,8,8,238,2 3,Images\dira.gif:192:48,3,24,192,24,8,8,240,0 3,Images\dira.gif:192:48,3,25,200,24,8,8,242,0 3,Images\dira.gif:192:48,3,26,208,24,8,8,244,0 @@ -917,8 +917,8 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 3,Images\dira.gif:192:48,4,19,152,32,8,8,39,0 3,Images\dira.gif:192:48,4,20,160,32,8,8,41,0 3,Images\dira.gif:192:48,4,21,168,32,8,8,43,0 -3,Images\dira.gif:192:48,4,22,176,32,8,8,45,3 -3,Images\dira.gif:192:48,4,23,184,32,8,8,47,3 +3,Images\dira.gif:192:48,4,22,176,32,8,8,45,2 +3,Images\dira.gif:192:48,4,23,184,32,8,8,47,2 3,Images\dira.gif:192:48,4,24,192,32,8,8,49,0 3,Images\dira.gif:192:48,4,25,200,32,8,8,51,0 3,Images\dira.gif:192:48,4,26,208,32,8,8,53,0 @@ -949,8 +949,8 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 3,Images\dira.gif:192:48,5,19,152,40,8,8,103,0 3,Images\dira.gif:192:48,5,20,160,40,8,8,105,0 3,Images\dira.gif:192:48,5,21,168,40,8,8,107,0 -3,Images\dira.gif:192:48,5,22,176,40,8,8,109,3 -3,Images\dira.gif:192:48,5,23,184,40,8,8,111,3 +3,Images\dira.gif:192:48,5,22,176,40,8,8,109,2 +3,Images\dira.gif:192:48,5,23,184,40,8,8,111,2 3,Images\dira.gif:192:48,5,24,192,40,8,8,113,0 3,Images\dira.gif:192:48,5,25,200,40,8,8,115,0 3,Images\dira.gif:192:48,5,26,208,40,8,8,117,0 diff --git a/Tests/References/glaza_palette_0.bin b/Tests/References/glaza_palette_0.bin index 17d1908..32ef88e 100644 --- a/Tests/References/glaza_palette_0.bin +++ b/Tests/References/glaza_palette_0.bin @@ -1 +1 @@ -0: \ No newline at end of file +:0 \ No newline at end of file diff --git a/Tests/References/glaza_palettes.csv b/Tests/References/glaza_palettes.csv index 2f4eccd..62d5083 100644 --- a/Tests/References/glaza_palettes.csv +++ b/Tests/References/glaza_palettes.csv @@ -1,2 +1,2 @@ palette_id,color0,color1,color2,color3 -0,#000000,#009400,#FFFFFF,#A8F0BC +0,#000000,#009400,#A8F0BC,#FFFFFF diff --git a/Tests/References/glaza_pattern_0.bin b/Tests/References/glaza_pattern_0.bin index 2844aef..c4c6202 100644 Binary files a/Tests/References/glaza_pattern_0.bin and b/Tests/References/glaza_pattern_0.bin differ diff --git a/Tests/References/glaza_pattern_1.bin b/Tests/References/glaza_pattern_1.bin index 41b3e44..fe84867 100644 Binary files a/Tests/References/glaza_pattern_1.bin and b/Tests/References/glaza_pattern_1.bin differ diff --git a/Tests/References/glaza_pattern_2.bin b/Tests/References/glaza_pattern_2.bin index b178fcd..e94aa31 100644 Binary files a/Tests/References/glaza_pattern_2.bin and b/Tests/References/glaza_pattern_2.bin differ diff --git a/Tests/References/glaza_pattern_3.bin b/Tests/References/glaza_pattern_3.bin index 489c162..ad08870 100644 Binary files a/Tests/References/glaza_pattern_3.bin and b/Tests/References/glaza_pattern_3.bin differ diff --git a/Tests/References/gorgona_name_table_3.bin b/Tests/References/gorgona_name_table_3.bin index cb83901..1b13b3b 100644 Binary files a/Tests/References/gorgona_name_table_3.bin and b/Tests/References/gorgona_name_table_3.bin differ diff --git a/Tests/References/gorgona_palette_0.bin b/Tests/References/gorgona_palette_0.bin index 290cfde..d1979c4 100644 Binary files a/Tests/References/gorgona_palette_0.bin and b/Tests/References/gorgona_palette_0.bin differ diff --git a/Tests/References/gorgona_palette_1.bin b/Tests/References/gorgona_palette_1.bin index a665827..f4ab61d 100644 --- a/Tests/References/gorgona_palette_1.bin +++ b/Tests/References/gorgona_palette_1.bin @@ -1 +1 @@ -&7 \ No newline at end of file + &7 \ No newline at end of file diff --git a/Tests/References/gorgona_palette_3.bin b/Tests/References/gorgona_palette_3.bin index 1036325..7d3dd5b 100644 Binary files a/Tests/References/gorgona_palette_3.bin and b/Tests/References/gorgona_palette_3.bin differ diff --git a/Tests/References/gorgona_palettes.csv b/Tests/References/gorgona_palettes.csv index 0b7879a..002aa09 100644 --- a/Tests/References/gorgona_palettes.csv +++ b/Tests/References/gorgona_palettes.csv @@ -1,5 +1,5 @@ palette_id,color0,color1,color2,color3 -0,#000000,#747474,#402C00,#183C5C -1,#000000,#FC7460,#FCD8A8,#183C5C +0,#000000,#183C5C,#402C00,#747474 +1,#000000,#183C5C,#FC7460,#FCD8A8 2,#000000,#747474,#FCBCB0,#FCD8A8 -3,#000000,#747474,#5C94FC,#183C5C +3,#000000,#183C5C,#5C94FC,#747474 diff --git a/Tests/References/gorgona_pattern_0.bin b/Tests/References/gorgona_pattern_0.bin index 973b687..a02a8f1 100644 Binary files a/Tests/References/gorgona_pattern_0.bin and b/Tests/References/gorgona_pattern_0.bin differ diff --git a/Tests/References/gorgona_pattern_1.bin b/Tests/References/gorgona_pattern_1.bin index c9ff2e8..47aa1df 100644 Binary files a/Tests/References/gorgona_pattern_1.bin and b/Tests/References/gorgona_pattern_1.bin differ diff --git a/Tests/References/gorgona_pattern_2.bin b/Tests/References/gorgona_pattern_2.bin index a607404..1b4fcfa 100644 Binary files a/Tests/References/gorgona_pattern_2.bin and b/Tests/References/gorgona_pattern_2.bin differ diff --git a/Tests/References/gorgona_pattern_3.bin b/Tests/References/gorgona_pattern_3.bin index 3c4398b..6c703f1 100644 Binary files a/Tests/References/gorgona_pattern_3.bin and b/Tests/References/gorgona_pattern_3.bin differ diff --git a/Tests/References/gorgona_tiles.csv b/Tests/References/gorgona_tiles.csv index 8d54ea4..a3fd52d 100644 --- a/Tests/References/gorgona_tiles.csv +++ b/Tests/References/gorgona_tiles.csv @@ -901,22 +901,22 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 3,Images\gorgona.gif:192:48,4,3,24,32,8,8,0,0 3,Images\gorgona.gif:192:48,4,4,32,32,8,8,0,0 3,Images\gorgona.gif:192:48,4,5,40,32,8,8,0,0 -3,Images\gorgona.gif:192:48,4,6,48,32,8,8,118,3 -3,Images\gorgona.gif:192:48,4,7,56,32,8,8,120,3 -3,Images\gorgona.gif:192:48,4,8,64,32,8,8,122,3 -3,Images\gorgona.gif:192:48,4,9,72,32,8,8,124,3 -3,Images\gorgona.gif:192:48,4,10,80,32,8,8,126,3 -3,Images\gorgona.gif:192:48,4,11,88,32,8,8,128,3 -3,Images\gorgona.gif:192:48,4,12,96,32,8,8,130,0 -3,Images\gorgona.gif:192:48,4,13,104,32,8,8,132,0 -3,Images\gorgona.gif:192:48,4,14,112,32,8,8,134,0 -3,Images\gorgona.gif:192:48,4,15,120,32,8,8,136,0 -3,Images\gorgona.gif:192:48,4,16,128,32,8,8,138,1 -3,Images\gorgona.gif:192:48,4,17,136,32,8,8,140,1 +3,Images\gorgona.gif:192:48,4,6,48,32,8,8,50,3 +3,Images\gorgona.gif:192:48,4,7,56,32,8,8,118,3 +3,Images\gorgona.gif:192:48,4,8,64,32,8,8,120,3 +3,Images\gorgona.gif:192:48,4,9,72,32,8,8,122,3 +3,Images\gorgona.gif:192:48,4,10,80,32,8,8,124,3 +3,Images\gorgona.gif:192:48,4,11,88,32,8,8,126,3 +3,Images\gorgona.gif:192:48,4,12,96,32,8,8,128,0 +3,Images\gorgona.gif:192:48,4,13,104,32,8,8,130,0 +3,Images\gorgona.gif:192:48,4,14,112,32,8,8,132,0 +3,Images\gorgona.gif:192:48,4,15,120,32,8,8,134,0 +3,Images\gorgona.gif:192:48,4,16,128,32,8,8,136,1 +3,Images\gorgona.gif:192:48,4,17,136,32,8,8,138,1 3,Images\gorgona.gif:192:48,4,18,144,32,8,8,0,0 3,Images\gorgona.gif:192:48,4,19,152,32,8,8,0,0 -3,Images\gorgona.gif:192:48,4,20,160,32,8,8,142,2 -3,Images\gorgona.gif:192:48,4,21,168,32,8,8,144,2 +3,Images\gorgona.gif:192:48,4,20,160,32,8,8,140,2 +3,Images\gorgona.gif:192:48,4,21,168,32,8,8,142,2 3,Images\gorgona.gif:192:48,4,22,176,32,8,8,0,0 3,Images\gorgona.gif:192:48,4,23,184,32,8,8,0,0 3,Images\gorgona.gif:192:48,4,24,192,32,8,8,0,0 @@ -934,22 +934,22 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 3,Images\gorgona.gif:192:48,5,4,32,40,8,8,0,0 3,Images\gorgona.gif:192:48,5,5,40,40,8,8,0,0 3,Images\gorgona.gif:192:48,5,6,48,40,8,8,0,3 -3,Images\gorgona.gif:192:48,5,7,56,40,8,8,146,3 -3,Images\gorgona.gif:192:48,5,8,64,40,8,8,148,3 -3,Images\gorgona.gif:192:48,5,9,72,40,8,8,150,3 -3,Images\gorgona.gif:192:48,5,10,80,40,8,8,152,3 -3,Images\gorgona.gif:192:48,5,11,88,40,8,8,154,3 -3,Images\gorgona.gif:192:48,5,12,96,40,8,8,156,0 -3,Images\gorgona.gif:192:48,5,13,104,40,8,8,158,0 -3,Images\gorgona.gif:192:48,5,14,112,40,8,8,160,0 -3,Images\gorgona.gif:192:48,5,15,120,40,8,8,162,0 -3,Images\gorgona.gif:192:48,5,16,128,40,8,8,164,1 -3,Images\gorgona.gif:192:48,5,17,136,40,8,8,166,1 -3,Images\gorgona.gif:192:48,5,18,144,40,8,8,168,0 +3,Images\gorgona.gif:192:48,5,7,56,40,8,8,144,3 +3,Images\gorgona.gif:192:48,5,8,64,40,8,8,146,3 +3,Images\gorgona.gif:192:48,5,9,72,40,8,8,148,3 +3,Images\gorgona.gif:192:48,5,10,80,40,8,8,150,3 +3,Images\gorgona.gif:192:48,5,11,88,40,8,8,152,3 +3,Images\gorgona.gif:192:48,5,12,96,40,8,8,154,0 +3,Images\gorgona.gif:192:48,5,13,104,40,8,8,156,0 +3,Images\gorgona.gif:192:48,5,14,112,40,8,8,158,0 +3,Images\gorgona.gif:192:48,5,15,120,40,8,8,160,0 +3,Images\gorgona.gif:192:48,5,16,128,40,8,8,162,1 +3,Images\gorgona.gif:192:48,5,17,136,40,8,8,164,1 +3,Images\gorgona.gif:192:48,5,18,144,40,8,8,166,0 3,Images\gorgona.gif:192:48,5,19,152,40,8,8,0,0 -3,Images\gorgona.gif:192:48,5,20,160,40,8,8,170,2 -3,Images\gorgona.gif:192:48,5,21,168,40,8,8,172,2 -3,Images\gorgona.gif:192:48,5,22,176,40,8,8,168,0 +3,Images\gorgona.gif:192:48,5,20,160,40,8,8,168,2 +3,Images\gorgona.gif:192:48,5,21,168,40,8,8,170,2 +3,Images\gorgona.gif:192:48,5,22,176,40,8,8,166,0 3,Images\gorgona.gif:192:48,5,23,184,40,8,8,0,0 3,Images\gorgona.gif:192:48,5,24,192,40,8,8,0,0 3,Images\gorgona.gif:192:48,5,25,200,40,8,8,0,0 diff --git a/Tests/References/jurassic2_name_table_1.bin b/Tests/References/jurassic2_name_table_1.bin index 1729395..e958322 100644 Binary files a/Tests/References/jurassic2_name_table_1.bin and b/Tests/References/jurassic2_name_table_1.bin differ diff --git a/Tests/References/jurassic2_palette_0.bin b/Tests/References/jurassic2_palette_0.bin index 6642275..9c3d0bf 100644 --- a/Tests/References/jurassic2_palette_0.bin +++ b/Tests/References/jurassic2_palette_0.bin @@ -1 +1 @@ -( \ No newline at end of file +( \ No newline at end of file diff --git a/Tests/References/jurassic2_palette_1.bin b/Tests/References/jurassic2_palette_1.bin index 68c649a..62e527c 100644 --- a/Tests/References/jurassic2_palette_1.bin +++ b/Tests/References/jurassic2_palette_1.bin @@ -1 +1 @@ -(  \ No newline at end of file +( \ No newline at end of file diff --git a/Tests/References/jurassic2_palettes.csv b/Tests/References/jurassic2_palettes.csv index 45aa239..02c3175 100644 --- a/Tests/References/jurassic2_palettes.csv +++ b/Tests/References/jurassic2_palettes.csv @@ -1,3 +1,3 @@ palette_id,color0,color1,color2,color3 -0,#F0BC3C,#C84C0C,#000000,#887000 -1,#F0BC3C,#000000,#FCFCFC,#D82800 +0,#F0BC3C,#000000,#887000,#C84C0C +1,#F0BC3C,#000000,#D82800,#FCFCFC diff --git a/Tests/References/jurassic2_pattern_0.bin b/Tests/References/jurassic2_pattern_0.bin index 6575ee7..56c2d9e 100644 Binary files a/Tests/References/jurassic2_pattern_0.bin and b/Tests/References/jurassic2_pattern_0.bin differ diff --git a/Tests/References/jurassic2_pattern_1.bin b/Tests/References/jurassic2_pattern_1.bin index 2c1c4b4..14f08fd 100644 Binary files a/Tests/References/jurassic2_pattern_1.bin and b/Tests/References/jurassic2_pattern_1.bin differ diff --git a/Tests/References/jurassic2_tiles.csv b/Tests/References/jurassic2_tiles.csv index 78c2b21..01d6b40 100644 --- a/Tests/References/jurassic2_tiles.csv +++ b/Tests/References/jurassic2_tiles.csv @@ -545,64 +545,64 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 1,Images\jurassic2.png:128:112,0,31,248,0,8,8,0,0 1,Images\jurassic2.png:128:112,1,0,0,8,8,8,0,0 1,Images\jurassic2.png:128:112,1,1,8,8,8,8,0,0 -1,Images\jurassic2.png:128:112,1,2,16,8,8,8,42,1 -1,Images\jurassic2.png:128:112,1,3,24,8,8,8,42,1 -1,Images\jurassic2.png:128:112,1,4,32,8,8,8,44,1 +1,Images\jurassic2.png:128:112,1,2,16,8,8,8,0,1 +1,Images\jurassic2.png:128:112,1,3,24,8,8,8,0,1 +1,Images\jurassic2.png:128:112,1,4,32,8,8,8,42,1 1,Images\jurassic2.png:128:112,1,5,40,8,8,8,12,1 -1,Images\jurassic2.png:128:112,1,6,48,8,8,8,46,1 +1,Images\jurassic2.png:128:112,1,6,48,8,8,8,44,1 1,Images\jurassic2.png:128:112,1,7,56,8,8,8,12,1 -1,Images\jurassic2.png:128:112,1,8,64,8,8,8,48,1 -1,Images\jurassic2.png:128:112,1,9,72,8,8,8,50,1 +1,Images\jurassic2.png:128:112,1,8,64,8,8,8,46,1 +1,Images\jurassic2.png:128:112,1,9,72,8,8,8,48,1 1,Images\jurassic2.png:128:112,1,10,80,8,8,8,12,1 1,Images\jurassic2.png:128:112,1,11,88,8,8,8,12,1 1,Images\jurassic2.png:128:112,1,12,96,8,8,8,12,1 -1,Images\jurassic2.png:128:112,1,13,104,8,8,8,52,1 -1,Images\jurassic2.png:128:112,1,14,112,8,8,8,54,1 -1,Images\jurassic2.png:128:112,1,15,120,8,8,8,56,1 -1,Images\jurassic2.png:128:112,1,16,128,8,8,8,58,1 -1,Images\jurassic2.png:128:112,1,17,136,8,8,8,60,1 -1,Images\jurassic2.png:128:112,1,18,144,8,8,8,62,1 +1,Images\jurassic2.png:128:112,1,13,104,8,8,8,50,1 +1,Images\jurassic2.png:128:112,1,14,112,8,8,8,52,1 +1,Images\jurassic2.png:128:112,1,15,120,8,8,8,54,1 +1,Images\jurassic2.png:128:112,1,16,128,8,8,8,56,1 +1,Images\jurassic2.png:128:112,1,17,136,8,8,8,58,1 +1,Images\jurassic2.png:128:112,1,18,144,8,8,8,60,1 1,Images\jurassic2.png:128:112,1,19,152,8,8,8,12,1 1,Images\jurassic2.png:128:112,1,20,160,8,8,8,12,1 1,Images\jurassic2.png:128:112,1,21,168,8,8,8,12,1 -1,Images\jurassic2.png:128:112,1,22,176,8,8,8,64,1 -1,Images\jurassic2.png:128:112,1,23,184,8,8,8,66,1 +1,Images\jurassic2.png:128:112,1,22,176,8,8,8,62,1 +1,Images\jurassic2.png:128:112,1,23,184,8,8,8,64,1 1,Images\jurassic2.png:128:112,1,24,192,8,8,8,12,1 -1,Images\jurassic2.png:128:112,1,25,200,8,8,8,68,1 +1,Images\jurassic2.png:128:112,1,25,200,8,8,8,66,1 1,Images\jurassic2.png:128:112,1,26,208,8,8,8,12,1 -1,Images\jurassic2.png:128:112,1,27,216,8,8,8,70,1 -1,Images\jurassic2.png:128:112,1,28,224,8,8,8,42,1 -1,Images\jurassic2.png:128:112,1,29,232,8,8,8,42,1 +1,Images\jurassic2.png:128:112,1,27,216,8,8,8,68,1 +1,Images\jurassic2.png:128:112,1,28,224,8,8,8,0,1 +1,Images\jurassic2.png:128:112,1,29,232,8,8,8,0,1 1,Images\jurassic2.png:128:112,1,30,240,8,8,8,0,0 1,Images\jurassic2.png:128:112,1,31,248,8,8,8,0,0 1,Images\jurassic2.png:128:112,2,0,0,16,8,8,0,0 1,Images\jurassic2.png:128:112,2,1,8,16,8,8,0,0 1,Images\jurassic2.png:128:112,2,2,16,16,8,8,0,0 1,Images\jurassic2.png:128:112,2,3,24,16,8,8,0,0 -1,Images\jurassic2.png:128:112,2,4,32,16,8,8,72,1 +1,Images\jurassic2.png:128:112,2,4,32,16,8,8,70,1 1,Images\jurassic2.png:128:112,2,5,40,16,8,8,12,1 -1,Images\jurassic2.png:128:112,2,6,48,16,8,8,74,1 +1,Images\jurassic2.png:128:112,2,6,48,16,8,8,72,1 1,Images\jurassic2.png:128:112,2,7,56,16,8,8,12,1 1,Images\jurassic2.png:128:112,2,8,64,16,8,8,12,1 1,Images\jurassic2.png:128:112,2,9,72,16,8,8,12,1 1,Images\jurassic2.png:128:112,2,10,80,16,8,8,12,1 1,Images\jurassic2.png:128:112,2,11,88,16,8,8,12,1 -1,Images\jurassic2.png:128:112,2,12,96,16,8,8,76,1 -1,Images\jurassic2.png:128:112,2,13,104,16,8,8,78,1 -1,Images\jurassic2.png:128:112,2,14,112,16,8,8,42,1 -1,Images\jurassic2.png:128:112,2,15,120,16,8,8,80,1 -1,Images\jurassic2.png:128:112,2,16,128,16,8,8,82,1 -1,Images\jurassic2.png:128:112,2,17,136,16,8,8,84,1 -1,Images\jurassic2.png:128:112,2,18,144,16,8,8,86,1 -1,Images\jurassic2.png:128:112,2,19,152,16,8,8,88,1 +1,Images\jurassic2.png:128:112,2,12,96,16,8,8,74,1 +1,Images\jurassic2.png:128:112,2,13,104,16,8,8,76,1 +1,Images\jurassic2.png:128:112,2,14,112,16,8,8,0,1 +1,Images\jurassic2.png:128:112,2,15,120,16,8,8,78,1 +1,Images\jurassic2.png:128:112,2,16,128,16,8,8,80,1 +1,Images\jurassic2.png:128:112,2,17,136,16,8,8,82,1 +1,Images\jurassic2.png:128:112,2,18,144,16,8,8,84,1 +1,Images\jurassic2.png:128:112,2,19,152,16,8,8,86,1 1,Images\jurassic2.png:128:112,2,20,160,16,8,8,12,1 1,Images\jurassic2.png:128:112,2,21,168,16,8,8,12,1 1,Images\jurassic2.png:128:112,2,22,176,16,8,8,12,1 1,Images\jurassic2.png:128:112,2,23,184,16,8,8,12,1 1,Images\jurassic2.png:128:112,2,24,192,16,8,8,12,1 -1,Images\jurassic2.png:128:112,2,25,200,16,8,8,90,1 +1,Images\jurassic2.png:128:112,2,25,200,16,8,8,88,1 1,Images\jurassic2.png:128:112,2,26,208,16,8,8,12,1 -1,Images\jurassic2.png:128:112,2,27,216,16,8,8,92,1 +1,Images\jurassic2.png:128:112,2,27,216,16,8,8,90,1 1,Images\jurassic2.png:128:112,2,28,224,16,8,8,0,0 1,Images\jurassic2.png:128:112,2,29,232,16,8,8,0,0 1,Images\jurassic2.png:128:112,2,30,240,16,8,8,0,0 @@ -611,255 +611,255 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 1,Images\jurassic2.png:128:112,3,1,8,24,8,8,0,0 1,Images\jurassic2.png:128:112,3,2,16,24,8,8,0,0 1,Images\jurassic2.png:128:112,3,3,24,24,8,8,0,0 -1,Images\jurassic2.png:128:112,3,4,32,24,8,8,94,1 +1,Images\jurassic2.png:128:112,3,4,32,24,8,8,92,1 1,Images\jurassic2.png:128:112,3,5,40,24,8,8,12,1 -1,Images\jurassic2.png:128:112,3,6,48,24,8,8,96,1 +1,Images\jurassic2.png:128:112,3,6,48,24,8,8,94,1 1,Images\jurassic2.png:128:112,3,7,56,24,8,8,12,1 1,Images\jurassic2.png:128:112,3,8,64,24,8,8,12,1 1,Images\jurassic2.png:128:112,3,9,72,24,8,8,12,1 1,Images\jurassic2.png:128:112,3,10,80,24,8,8,12,1 1,Images\jurassic2.png:128:112,3,11,88,24,8,8,12,1 1,Images\jurassic2.png:128:112,3,12,96,24,8,8,12,1 -1,Images\jurassic2.png:128:112,3,13,104,24,8,8,42,1 -1,Images\jurassic2.png:128:112,3,14,112,24,8,8,42,1 -1,Images\jurassic2.png:128:112,3,15,120,24,8,8,42,1 -1,Images\jurassic2.png:128:112,3,16,128,24,8,8,42,1 -1,Images\jurassic2.png:128:112,3,17,136,24,8,8,42,1 -1,Images\jurassic2.png:128:112,3,18,144,24,8,8,42,1 +1,Images\jurassic2.png:128:112,3,13,104,24,8,8,0,1 +1,Images\jurassic2.png:128:112,3,14,112,24,8,8,0,1 +1,Images\jurassic2.png:128:112,3,15,120,24,8,8,0,1 +1,Images\jurassic2.png:128:112,3,16,128,24,8,8,0,1 +1,Images\jurassic2.png:128:112,3,17,136,24,8,8,0,1 +1,Images\jurassic2.png:128:112,3,18,144,24,8,8,0,1 1,Images\jurassic2.png:128:112,3,19,152,24,8,8,12,1 1,Images\jurassic2.png:128:112,3,20,160,24,8,8,12,1 1,Images\jurassic2.png:128:112,3,21,168,24,8,8,12,1 1,Images\jurassic2.png:128:112,3,22,176,24,8,8,12,1 1,Images\jurassic2.png:128:112,3,23,184,24,8,8,12,1 1,Images\jurassic2.png:128:112,3,24,192,24,8,8,12,1 -1,Images\jurassic2.png:128:112,3,25,200,24,8,8,98,1 +1,Images\jurassic2.png:128:112,3,25,200,24,8,8,96,1 1,Images\jurassic2.png:128:112,3,26,208,24,8,8,12,1 -1,Images\jurassic2.png:128:112,3,27,216,24,8,8,100,1 +1,Images\jurassic2.png:128:112,3,27,216,24,8,8,98,1 1,Images\jurassic2.png:128:112,3,28,224,24,8,8,0,0 1,Images\jurassic2.png:128:112,3,29,232,24,8,8,0,0 1,Images\jurassic2.png:128:112,3,30,240,24,8,8,0,0 1,Images\jurassic2.png:128:112,3,31,248,24,8,8,0,0 1,Images\jurassic2.png:128:112,4,0,0,32,8,8,0,0 1,Images\jurassic2.png:128:112,4,1,8,32,8,8,0,0 -1,Images\jurassic2.png:128:112,4,2,16,32,8,8,42,1 -1,Images\jurassic2.png:128:112,4,3,24,32,8,8,42,1 -1,Images\jurassic2.png:128:112,4,4,32,32,8,8,102,1 +1,Images\jurassic2.png:128:112,4,2,16,32,8,8,0,1 +1,Images\jurassic2.png:128:112,4,3,24,32,8,8,0,1 +1,Images\jurassic2.png:128:112,4,4,32,32,8,8,100,1 1,Images\jurassic2.png:128:112,4,5,40,32,8,8,12,1 -1,Images\jurassic2.png:128:112,4,6,48,32,8,8,104,1 +1,Images\jurassic2.png:128:112,4,6,48,32,8,8,102,1 1,Images\jurassic2.png:128:112,4,7,56,32,8,8,12,1 -1,Images\jurassic2.png:128:112,4,8,64,32,8,8,106,1 -1,Images\jurassic2.png:128:112,4,9,72,32,8,8,108,1 +1,Images\jurassic2.png:128:112,4,8,64,32,8,8,104,1 +1,Images\jurassic2.png:128:112,4,9,72,32,8,8,106,1 1,Images\jurassic2.png:128:112,4,10,80,32,8,8,12,1 -1,Images\jurassic2.png:128:112,4,11,88,32,8,8,110,1 -1,Images\jurassic2.png:128:112,4,12,96,32,8,8,112,1 +1,Images\jurassic2.png:128:112,4,11,88,32,8,8,108,1 +1,Images\jurassic2.png:128:112,4,12,96,32,8,8,110,1 1,Images\jurassic2.png:128:112,4,13,104,32,8,8,18,1 -1,Images\jurassic2.png:128:112,4,14,112,32,8,8,114,1 -1,Images\jurassic2.png:128:112,4,15,120,32,8,8,116,1 -1,Images\jurassic2.png:128:112,4,16,128,32,8,8,118,1 +1,Images\jurassic2.png:128:112,4,14,112,32,8,8,112,1 +1,Images\jurassic2.png:128:112,4,15,120,32,8,8,114,1 +1,Images\jurassic2.png:128:112,4,16,128,32,8,8,116,1 1,Images\jurassic2.png:128:112,4,17,136,32,8,8,12,1 1,Images\jurassic2.png:128:112,4,18,144,32,8,8,18,1 -1,Images\jurassic2.png:128:112,4,19,152,32,8,8,120,1 -1,Images\jurassic2.png:128:112,4,20,160,32,8,8,122,1 +1,Images\jurassic2.png:128:112,4,19,152,32,8,8,118,1 +1,Images\jurassic2.png:128:112,4,20,160,32,8,8,120,1 1,Images\jurassic2.png:128:112,4,21,168,32,8,8,12,1 -1,Images\jurassic2.png:128:112,4,22,176,32,8,8,124,1 -1,Images\jurassic2.png:128:112,4,23,184,32,8,8,126,1 +1,Images\jurassic2.png:128:112,4,22,176,32,8,8,122,1 +1,Images\jurassic2.png:128:112,4,23,184,32,8,8,124,1 1,Images\jurassic2.png:128:112,4,24,192,32,8,8,12,1 -1,Images\jurassic2.png:128:112,4,25,200,32,8,8,128,1 +1,Images\jurassic2.png:128:112,4,25,200,32,8,8,126,1 1,Images\jurassic2.png:128:112,4,26,208,32,8,8,12,1 -1,Images\jurassic2.png:128:112,4,27,216,32,8,8,130,1 -1,Images\jurassic2.png:128:112,4,28,224,32,8,8,42,1 -1,Images\jurassic2.png:128:112,4,29,232,32,8,8,42,1 +1,Images\jurassic2.png:128:112,4,27,216,32,8,8,128,1 +1,Images\jurassic2.png:128:112,4,28,224,32,8,8,0,1 +1,Images\jurassic2.png:128:112,4,29,232,32,8,8,0,1 1,Images\jurassic2.png:128:112,4,30,240,32,8,8,0,0 1,Images\jurassic2.png:128:112,4,31,248,32,8,8,0,0 1,Images\jurassic2.png:128:112,5,0,0,40,8,8,0,0 1,Images\jurassic2.png:128:112,5,1,8,40,8,8,0,0 -1,Images\jurassic2.png:128:112,5,2,16,40,8,8,132,1 -1,Images\jurassic2.png:128:112,5,3,24,40,8,8,134,1 -1,Images\jurassic2.png:128:112,5,4,32,40,8,8,136,1 -1,Images\jurassic2.png:128:112,5,5,40,40,8,8,138,1 -1,Images\jurassic2.png:128:112,5,6,48,40,8,8,140,1 +1,Images\jurassic2.png:128:112,5,2,16,40,8,8,130,1 +1,Images\jurassic2.png:128:112,5,3,24,40,8,8,132,1 +1,Images\jurassic2.png:128:112,5,4,32,40,8,8,134,1 +1,Images\jurassic2.png:128:112,5,5,40,40,8,8,136,1 +1,Images\jurassic2.png:128:112,5,6,48,40,8,8,138,1 1,Images\jurassic2.png:128:112,5,7,56,40,8,8,12,1 -1,Images\jurassic2.png:128:112,5,8,64,40,8,8,142,1 -1,Images\jurassic2.png:128:112,5,9,72,40,8,8,144,1 +1,Images\jurassic2.png:128:112,5,8,64,40,8,8,140,1 +1,Images\jurassic2.png:128:112,5,9,72,40,8,8,142,1 1,Images\jurassic2.png:128:112,5,10,80,40,8,8,12,1 1,Images\jurassic2.png:128:112,5,11,88,40,8,8,12,1 -1,Images\jurassic2.png:128:112,5,12,96,40,8,8,146,1 +1,Images\jurassic2.png:128:112,5,12,96,40,8,8,144,1 1,Images\jurassic2.png:128:112,5,13,104,40,8,8,12,1 1,Images\jurassic2.png:128:112,5,14,112,40,8,8,12,1 1,Images\jurassic2.png:128:112,5,15,120,40,8,8,12,1 1,Images\jurassic2.png:128:112,5,16,128,40,8,8,12,1 1,Images\jurassic2.png:128:112,5,17,136,40,8,8,12,1 1,Images\jurassic2.png:128:112,5,18,144,40,8,8,12,1 -1,Images\jurassic2.png:128:112,5,19,152,40,8,8,148,1 +1,Images\jurassic2.png:128:112,5,19,152,40,8,8,146,1 1,Images\jurassic2.png:128:112,5,20,160,40,8,8,12,1 1,Images\jurassic2.png:128:112,5,21,168,40,8,8,12,1 -1,Images\jurassic2.png:128:112,5,22,176,40,8,8,150,1 -1,Images\jurassic2.png:128:112,5,23,184,40,8,8,152,1 +1,Images\jurassic2.png:128:112,5,22,176,40,8,8,148,1 +1,Images\jurassic2.png:128:112,5,23,184,40,8,8,150,1 1,Images\jurassic2.png:128:112,5,24,192,40,8,8,12,1 -1,Images\jurassic2.png:128:112,5,25,200,40,8,8,154,1 -1,Images\jurassic2.png:128:112,5,26,208,40,8,8,156,1 -1,Images\jurassic2.png:128:112,5,27,216,40,8,8,158,1 -1,Images\jurassic2.png:128:112,5,28,224,40,8,8,160,1 -1,Images\jurassic2.png:128:112,5,29,232,40,8,8,162,1 +1,Images\jurassic2.png:128:112,5,25,200,40,8,8,152,1 +1,Images\jurassic2.png:128:112,5,26,208,40,8,8,154,1 +1,Images\jurassic2.png:128:112,5,27,216,40,8,8,156,1 +1,Images\jurassic2.png:128:112,5,28,224,40,8,8,158,1 +1,Images\jurassic2.png:128:112,5,29,232,40,8,8,160,1 1,Images\jurassic2.png:128:112,5,30,240,40,8,8,0,0 1,Images\jurassic2.png:128:112,5,31,248,40,8,8,0,0 1,Images\jurassic2.png:128:112,6,0,0,48,8,8,0,0 1,Images\jurassic2.png:128:112,6,1,8,48,8,8,0,0 -1,Images\jurassic2.png:128:112,6,2,16,48,8,8,164,0 -1,Images\jurassic2.png:128:112,6,3,24,48,8,8,166,0 -1,Images\jurassic2.png:128:112,6,4,32,48,8,8,168,1 -1,Images\jurassic2.png:128:112,6,5,40,48,8,8,170,1 -1,Images\jurassic2.png:128:112,6,6,48,48,8,8,172,1 -1,Images\jurassic2.png:128:112,6,7,56,48,8,8,174,1 -1,Images\jurassic2.png:128:112,6,8,64,48,8,8,176,1 -1,Images\jurassic2.png:128:112,6,9,72,48,8,8,178,1 +1,Images\jurassic2.png:128:112,6,2,16,48,8,8,162,0 +1,Images\jurassic2.png:128:112,6,3,24,48,8,8,164,0 +1,Images\jurassic2.png:128:112,6,4,32,48,8,8,166,1 +1,Images\jurassic2.png:128:112,6,5,40,48,8,8,168,1 +1,Images\jurassic2.png:128:112,6,6,48,48,8,8,170,1 +1,Images\jurassic2.png:128:112,6,7,56,48,8,8,172,1 +1,Images\jurassic2.png:128:112,6,8,64,48,8,8,174,1 +1,Images\jurassic2.png:128:112,6,9,72,48,8,8,176,1 1,Images\jurassic2.png:128:112,6,10,80,48,8,8,12,1 -1,Images\jurassic2.png:128:112,6,11,88,48,8,8,180,1 -1,Images\jurassic2.png:128:112,6,12,96,48,8,8,182,1 -1,Images\jurassic2.png:128:112,6,13,104,48,8,8,88,1 +1,Images\jurassic2.png:128:112,6,11,88,48,8,8,178,1 +1,Images\jurassic2.png:128:112,6,12,96,48,8,8,180,1 +1,Images\jurassic2.png:128:112,6,13,104,48,8,8,86,1 1,Images\jurassic2.png:128:112,6,14,112,48,8,8,12,1 -1,Images\jurassic2.png:128:112,6,15,120,48,8,8,184,1 -1,Images\jurassic2.png:128:112,6,16,128,48,8,8,186,1 +1,Images\jurassic2.png:128:112,6,15,120,48,8,8,182,1 +1,Images\jurassic2.png:128:112,6,16,128,48,8,8,184,1 1,Images\jurassic2.png:128:112,6,17,136,48,8,8,22,1 -1,Images\jurassic2.png:128:112,6,18,144,48,8,8,188,1 -1,Images\jurassic2.png:128:112,6,19,152,48,8,8,88,1 +1,Images\jurassic2.png:128:112,6,18,144,48,8,8,186,1 +1,Images\jurassic2.png:128:112,6,19,152,48,8,8,86,1 1,Images\jurassic2.png:128:112,6,20,160,48,8,8,24,1 1,Images\jurassic2.png:128:112,6,21,168,48,8,8,12,1 -1,Images\jurassic2.png:128:112,6,22,176,48,8,8,190,1 -1,Images\jurassic2.png:128:112,6,23,184,48,8,8,192,1 -1,Images\jurassic2.png:128:112,6,24,192,48,8,8,194,1 -1,Images\jurassic2.png:128:112,6,25,200,48,8,8,196,1 -1,Images\jurassic2.png:128:112,6,26,208,48,8,8,198,1 -1,Images\jurassic2.png:128:112,6,27,216,48,8,8,200,1 -1,Images\jurassic2.png:128:112,6,28,224,48,8,8,202,0 -1,Images\jurassic2.png:128:112,6,29,232,48,8,8,204,0 +1,Images\jurassic2.png:128:112,6,22,176,48,8,8,188,1 +1,Images\jurassic2.png:128:112,6,23,184,48,8,8,190,1 +1,Images\jurassic2.png:128:112,6,24,192,48,8,8,192,1 +1,Images\jurassic2.png:128:112,6,25,200,48,8,8,194,1 +1,Images\jurassic2.png:128:112,6,26,208,48,8,8,196,1 +1,Images\jurassic2.png:128:112,6,27,216,48,8,8,198,1 +1,Images\jurassic2.png:128:112,6,28,224,48,8,8,200,0 +1,Images\jurassic2.png:128:112,6,29,232,48,8,8,202,0 1,Images\jurassic2.png:128:112,6,30,240,48,8,8,0,0 1,Images\jurassic2.png:128:112,6,31,248,48,8,8,0,0 1,Images\jurassic2.png:128:112,7,0,0,56,8,8,0,0 1,Images\jurassic2.png:128:112,7,1,8,56,8,8,0,0 -1,Images\jurassic2.png:128:112,7,2,16,56,8,8,206,0 -1,Images\jurassic2.png:128:112,7,3,24,56,8,8,208,0 -1,Images\jurassic2.png:128:112,7,4,32,56,8,8,210,1 -1,Images\jurassic2.png:128:112,7,5,40,56,8,8,212,1 -1,Images\jurassic2.png:128:112,7,6,48,56,8,8,214,1 -1,Images\jurassic2.png:128:112,7,7,56,56,8,8,216,1 -1,Images\jurassic2.png:128:112,7,8,64,56,8,8,218,1 -1,Images\jurassic2.png:128:112,7,9,72,56,8,8,220,1 -1,Images\jurassic2.png:128:112,7,10,80,56,8,8,222,1 -1,Images\jurassic2.png:128:112,7,11,88,56,8,8,224,1 -1,Images\jurassic2.png:128:112,7,12,96,56,8,8,226,1 +1,Images\jurassic2.png:128:112,7,2,16,56,8,8,204,0 +1,Images\jurassic2.png:128:112,7,3,24,56,8,8,206,0 +1,Images\jurassic2.png:128:112,7,4,32,56,8,8,208,1 +1,Images\jurassic2.png:128:112,7,5,40,56,8,8,210,1 +1,Images\jurassic2.png:128:112,7,6,48,56,8,8,212,1 +1,Images\jurassic2.png:128:112,7,7,56,56,8,8,214,1 +1,Images\jurassic2.png:128:112,7,8,64,56,8,8,216,1 +1,Images\jurassic2.png:128:112,7,9,72,56,8,8,218,1 +1,Images\jurassic2.png:128:112,7,10,80,56,8,8,220,1 +1,Images\jurassic2.png:128:112,7,11,88,56,8,8,222,1 +1,Images\jurassic2.png:128:112,7,12,96,56,8,8,224,1 1,Images\jurassic2.png:128:112,7,13,104,56,8,8,12,1 -1,Images\jurassic2.png:128:112,7,14,112,56,8,8,228,1 +1,Images\jurassic2.png:128:112,7,14,112,56,8,8,226,1 1,Images\jurassic2.png:128:112,7,15,120,56,8,8,12,1 1,Images\jurassic2.png:128:112,7,16,128,56,8,8,12,1 -1,Images\jurassic2.png:128:112,7,17,136,56,8,8,230,1 +1,Images\jurassic2.png:128:112,7,17,136,56,8,8,228,1 1,Images\jurassic2.png:128:112,7,18,144,56,8,8,12,1 -1,Images\jurassic2.png:128:112,7,19,152,56,8,8,232,1 -1,Images\jurassic2.png:128:112,7,20,160,56,8,8,234,1 -1,Images\jurassic2.png:128:112,7,21,168,56,8,8,236,1 -1,Images\jurassic2.png:128:112,7,22,176,56,8,8,238,1 -1,Images\jurassic2.png:128:112,7,23,184,56,8,8,240,1 -1,Images\jurassic2.png:128:112,7,24,192,56,8,8,242,1 -1,Images\jurassic2.png:128:112,7,25,200,56,8,8,244,1 -1,Images\jurassic2.png:128:112,7,26,208,56,8,8,246,1 -1,Images\jurassic2.png:128:112,7,27,216,56,8,8,248,1 -1,Images\jurassic2.png:128:112,7,28,224,56,8,8,250,0 -1,Images\jurassic2.png:128:112,7,29,232,56,8,8,252,0 +1,Images\jurassic2.png:128:112,7,19,152,56,8,8,230,1 +1,Images\jurassic2.png:128:112,7,20,160,56,8,8,232,1 +1,Images\jurassic2.png:128:112,7,21,168,56,8,8,234,1 +1,Images\jurassic2.png:128:112,7,22,176,56,8,8,236,1 +1,Images\jurassic2.png:128:112,7,23,184,56,8,8,238,1 +1,Images\jurassic2.png:128:112,7,24,192,56,8,8,240,1 +1,Images\jurassic2.png:128:112,7,25,200,56,8,8,242,1 +1,Images\jurassic2.png:128:112,7,26,208,56,8,8,244,1 +1,Images\jurassic2.png:128:112,7,27,216,56,8,8,246,1 +1,Images\jurassic2.png:128:112,7,28,224,56,8,8,248,0 +1,Images\jurassic2.png:128:112,7,29,232,56,8,8,250,0 1,Images\jurassic2.png:128:112,7,30,240,56,8,8,0,0 1,Images\jurassic2.png:128:112,7,31,248,56,8,8,0,0 1,Images\jurassic2.png:128:112,8,0,0,64,8,8,0,0 1,Images\jurassic2.png:128:112,8,1,8,64,8,8,0,0 1,Images\jurassic2.png:128:112,8,2,16,64,8,8,0,0 -1,Images\jurassic2.png:128:112,8,3,24,64,8,8,254,0 -1,Images\jurassic2.png:128:112,8,4,32,64,8,8,1,0 -1,Images\jurassic2.png:128:112,8,5,40,64,8,8,3,0 -1,Images\jurassic2.png:128:112,8,6,48,64,8,8,5,0 -1,Images\jurassic2.png:128:112,8,7,56,64,8,8,7,0 -1,Images\jurassic2.png:128:112,8,8,64,64,8,8,9,1 -1,Images\jurassic2.png:128:112,8,9,72,64,8,8,11,1 -1,Images\jurassic2.png:128:112,8,10,80,64,8,8,13,1 -1,Images\jurassic2.png:128:112,8,11,88,64,8,8,15,1 -1,Images\jurassic2.png:128:112,8,12,96,64,8,8,17,1 -1,Images\jurassic2.png:128:112,8,13,104,64,8,8,19,1 -1,Images\jurassic2.png:128:112,8,14,112,64,8,8,21,1 -1,Images\jurassic2.png:128:112,8,15,120,64,8,8,23,1 -1,Images\jurassic2.png:128:112,8,16,128,64,8,8,25,1 -1,Images\jurassic2.png:128:112,8,17,136,64,8,8,27,1 -1,Images\jurassic2.png:128:112,8,18,144,64,8,8,29,1 -1,Images\jurassic2.png:128:112,8,19,152,64,8,8,31,1 -1,Images\jurassic2.png:128:112,8,20,160,64,8,8,33,1 -1,Images\jurassic2.png:128:112,8,21,168,64,8,8,35,1 -1,Images\jurassic2.png:128:112,8,22,176,64,8,8,37,1 -1,Images\jurassic2.png:128:112,8,23,184,64,8,8,39,1 -1,Images\jurassic2.png:128:112,8,24,192,64,8,8,41,1 -1,Images\jurassic2.png:128:112,8,25,200,64,8,8,5,1 -1,Images\jurassic2.png:128:112,8,26,208,64,8,8,43,0 -1,Images\jurassic2.png:128:112,8,27,216,64,8,8,45,0 -1,Images\jurassic2.png:128:112,8,28,224,64,8,8,47,0 +1,Images\jurassic2.png:128:112,8,3,24,64,8,8,252,0 +1,Images\jurassic2.png:128:112,8,4,32,64,8,8,254,0 +1,Images\jurassic2.png:128:112,8,5,40,64,8,8,1,0 +1,Images\jurassic2.png:128:112,8,6,48,64,8,8,3,0 +1,Images\jurassic2.png:128:112,8,7,56,64,8,8,5,0 +1,Images\jurassic2.png:128:112,8,8,64,64,8,8,7,1 +1,Images\jurassic2.png:128:112,8,9,72,64,8,8,9,1 +1,Images\jurassic2.png:128:112,8,10,80,64,8,8,11,1 +1,Images\jurassic2.png:128:112,8,11,88,64,8,8,13,1 +1,Images\jurassic2.png:128:112,8,12,96,64,8,8,15,1 +1,Images\jurassic2.png:128:112,8,13,104,64,8,8,17,1 +1,Images\jurassic2.png:128:112,8,14,112,64,8,8,19,1 +1,Images\jurassic2.png:128:112,8,15,120,64,8,8,21,1 +1,Images\jurassic2.png:128:112,8,16,128,64,8,8,23,1 +1,Images\jurassic2.png:128:112,8,17,136,64,8,8,25,1 +1,Images\jurassic2.png:128:112,8,18,144,64,8,8,27,1 +1,Images\jurassic2.png:128:112,8,19,152,64,8,8,29,1 +1,Images\jurassic2.png:128:112,8,20,160,64,8,8,31,1 +1,Images\jurassic2.png:128:112,8,21,168,64,8,8,33,1 +1,Images\jurassic2.png:128:112,8,22,176,64,8,8,35,1 +1,Images\jurassic2.png:128:112,8,23,184,64,8,8,37,1 +1,Images\jurassic2.png:128:112,8,24,192,64,8,8,39,1 +1,Images\jurassic2.png:128:112,8,25,200,64,8,8,3,1 +1,Images\jurassic2.png:128:112,8,26,208,64,8,8,41,0 +1,Images\jurassic2.png:128:112,8,27,216,64,8,8,43,0 +1,Images\jurassic2.png:128:112,8,28,224,64,8,8,45,0 1,Images\jurassic2.png:128:112,8,29,232,64,8,8,0,0 1,Images\jurassic2.png:128:112,8,30,240,64,8,8,0,0 1,Images\jurassic2.png:128:112,8,31,248,64,8,8,0,0 1,Images\jurassic2.png:128:112,9,0,0,72,8,8,0,0 1,Images\jurassic2.png:128:112,9,1,8,72,8,8,0,0 1,Images\jurassic2.png:128:112,9,2,16,72,8,8,0,0 -1,Images\jurassic2.png:128:112,9,3,24,72,8,8,49,0 -1,Images\jurassic2.png:128:112,9,4,32,72,8,8,51,0 -1,Images\jurassic2.png:128:112,9,5,40,72,8,8,53,0 -1,Images\jurassic2.png:128:112,9,6,48,72,8,8,55,0 -1,Images\jurassic2.png:128:112,9,7,56,72,8,8,57,0 -1,Images\jurassic2.png:128:112,9,8,64,72,8,8,59,1 -1,Images\jurassic2.png:128:112,9,9,72,72,8,8,61,1 -1,Images\jurassic2.png:128:112,9,10,80,72,8,8,63,1 -1,Images\jurassic2.png:128:112,9,11,88,72,8,8,65,1 -1,Images\jurassic2.png:128:112,9,12,96,72,8,8,67,1 -1,Images\jurassic2.png:128:112,9,13,104,72,8,8,69,1 -1,Images\jurassic2.png:128:112,9,14,112,72,8,8,71,1 -1,Images\jurassic2.png:128:112,9,15,120,72,8,8,73,1 -1,Images\jurassic2.png:128:112,9,16,128,72,8,8,75,1 -1,Images\jurassic2.png:128:112,9,17,136,72,8,8,77,1 -1,Images\jurassic2.png:128:112,9,18,144,72,8,8,79,1 -1,Images\jurassic2.png:128:112,9,19,152,72,8,8,81,1 -1,Images\jurassic2.png:128:112,9,20,160,72,8,8,83,1 -1,Images\jurassic2.png:128:112,9,21,168,72,8,8,85,1 -1,Images\jurassic2.png:128:112,9,22,176,72,8,8,87,1 -1,Images\jurassic2.png:128:112,9,23,184,72,8,8,89,1 -1,Images\jurassic2.png:128:112,9,24,192,72,8,8,91,1 -1,Images\jurassic2.png:128:112,9,25,200,72,8,8,93,1 -1,Images\jurassic2.png:128:112,9,26,208,72,8,8,95,0 -1,Images\jurassic2.png:128:112,9,27,216,72,8,8,97,0 -1,Images\jurassic2.png:128:112,9,28,224,72,8,8,99,0 +1,Images\jurassic2.png:128:112,9,3,24,72,8,8,47,0 +1,Images\jurassic2.png:128:112,9,4,32,72,8,8,49,0 +1,Images\jurassic2.png:128:112,9,5,40,72,8,8,51,0 +1,Images\jurassic2.png:128:112,9,6,48,72,8,8,53,0 +1,Images\jurassic2.png:128:112,9,7,56,72,8,8,55,0 +1,Images\jurassic2.png:128:112,9,8,64,72,8,8,57,1 +1,Images\jurassic2.png:128:112,9,9,72,72,8,8,59,1 +1,Images\jurassic2.png:128:112,9,10,80,72,8,8,61,1 +1,Images\jurassic2.png:128:112,9,11,88,72,8,8,63,1 +1,Images\jurassic2.png:128:112,9,12,96,72,8,8,65,1 +1,Images\jurassic2.png:128:112,9,13,104,72,8,8,67,1 +1,Images\jurassic2.png:128:112,9,14,112,72,8,8,69,1 +1,Images\jurassic2.png:128:112,9,15,120,72,8,8,71,1 +1,Images\jurassic2.png:128:112,9,16,128,72,8,8,73,1 +1,Images\jurassic2.png:128:112,9,17,136,72,8,8,75,1 +1,Images\jurassic2.png:128:112,9,18,144,72,8,8,77,1 +1,Images\jurassic2.png:128:112,9,19,152,72,8,8,79,1 +1,Images\jurassic2.png:128:112,9,20,160,72,8,8,81,1 +1,Images\jurassic2.png:128:112,9,21,168,72,8,8,83,1 +1,Images\jurassic2.png:128:112,9,22,176,72,8,8,85,1 +1,Images\jurassic2.png:128:112,9,23,184,72,8,8,87,1 +1,Images\jurassic2.png:128:112,9,24,192,72,8,8,89,1 +1,Images\jurassic2.png:128:112,9,25,200,72,8,8,91,1 +1,Images\jurassic2.png:128:112,9,26,208,72,8,8,93,0 +1,Images\jurassic2.png:128:112,9,27,216,72,8,8,95,0 +1,Images\jurassic2.png:128:112,9,28,224,72,8,8,97,0 1,Images\jurassic2.png:128:112,9,29,232,72,8,8,0,0 1,Images\jurassic2.png:128:112,9,30,240,72,8,8,0,0 1,Images\jurassic2.png:128:112,9,31,248,72,8,8,0,0 1,Images\jurassic2.png:128:112,10,0,0,80,8,8,0,0 1,Images\jurassic2.png:128:112,10,1,8,80,8,8,0,0 1,Images\jurassic2.png:128:112,10,2,16,80,8,8,0,0 -1,Images\jurassic2.png:128:112,10,3,24,80,8,8,101,0 -1,Images\jurassic2.png:128:112,10,4,32,80,8,8,103,0 -1,Images\jurassic2.png:128:112,10,5,40,80,8,8,105,0 -1,Images\jurassic2.png:128:112,10,6,48,80,8,8,107,0 -1,Images\jurassic2.png:128:112,10,7,56,80,8,8,109,0 -1,Images\jurassic2.png:128:112,10,8,64,80,8,8,111,0 -1,Images\jurassic2.png:128:112,10,9,72,80,8,8,113,0 -1,Images\jurassic2.png:128:112,10,10,80,80,8,8,115,0 -1,Images\jurassic2.png:128:112,10,11,88,80,8,8,117,0 -1,Images\jurassic2.png:128:112,10,12,96,80,8,8,119,0 -1,Images\jurassic2.png:128:112,10,13,104,80,8,8,121,0 -1,Images\jurassic2.png:128:112,10,14,112,80,8,8,123,0 -1,Images\jurassic2.png:128:112,10,15,120,80,8,8,125,0 -1,Images\jurassic2.png:128:112,10,16,128,80,8,8,127,0 -1,Images\jurassic2.png:128:112,10,17,136,80,8,8,129,0 -1,Images\jurassic2.png:128:112,10,18,144,80,8,8,131,0 -1,Images\jurassic2.png:128:112,10,19,152,80,8,8,133,0 -1,Images\jurassic2.png:128:112,10,20,160,80,8,8,135,0 -1,Images\jurassic2.png:128:112,10,21,168,80,8,8,137,0 -1,Images\jurassic2.png:128:112,10,22,176,80,8,8,139,0 -1,Images\jurassic2.png:128:112,10,23,184,80,8,8,141,0 -1,Images\jurassic2.png:128:112,10,24,192,80,8,8,143,0 -1,Images\jurassic2.png:128:112,10,25,200,80,8,8,145,0 -1,Images\jurassic2.png:128:112,10,26,208,80,8,8,147,0 -1,Images\jurassic2.png:128:112,10,27,216,80,8,8,149,0 -1,Images\jurassic2.png:128:112,10,28,224,80,8,8,151,0 +1,Images\jurassic2.png:128:112,10,3,24,80,8,8,99,0 +1,Images\jurassic2.png:128:112,10,4,32,80,8,8,101,0 +1,Images\jurassic2.png:128:112,10,5,40,80,8,8,103,0 +1,Images\jurassic2.png:128:112,10,6,48,80,8,8,105,0 +1,Images\jurassic2.png:128:112,10,7,56,80,8,8,107,0 +1,Images\jurassic2.png:128:112,10,8,64,80,8,8,109,0 +1,Images\jurassic2.png:128:112,10,9,72,80,8,8,111,0 +1,Images\jurassic2.png:128:112,10,10,80,80,8,8,113,0 +1,Images\jurassic2.png:128:112,10,11,88,80,8,8,115,0 +1,Images\jurassic2.png:128:112,10,12,96,80,8,8,117,0 +1,Images\jurassic2.png:128:112,10,13,104,80,8,8,119,0 +1,Images\jurassic2.png:128:112,10,14,112,80,8,8,121,0 +1,Images\jurassic2.png:128:112,10,15,120,80,8,8,123,0 +1,Images\jurassic2.png:128:112,10,16,128,80,8,8,125,0 +1,Images\jurassic2.png:128:112,10,17,136,80,8,8,127,0 +1,Images\jurassic2.png:128:112,10,18,144,80,8,8,129,0 +1,Images\jurassic2.png:128:112,10,19,152,80,8,8,131,0 +1,Images\jurassic2.png:128:112,10,20,160,80,8,8,133,0 +1,Images\jurassic2.png:128:112,10,21,168,80,8,8,135,0 +1,Images\jurassic2.png:128:112,10,22,176,80,8,8,137,0 +1,Images\jurassic2.png:128:112,10,23,184,80,8,8,139,0 +1,Images\jurassic2.png:128:112,10,24,192,80,8,8,141,0 +1,Images\jurassic2.png:128:112,10,25,200,80,8,8,143,0 +1,Images\jurassic2.png:128:112,10,26,208,80,8,8,145,0 +1,Images\jurassic2.png:128:112,10,27,216,80,8,8,147,0 +1,Images\jurassic2.png:128:112,10,28,224,80,8,8,149,0 1,Images\jurassic2.png:128:112,10,29,232,80,8,8,0,0 1,Images\jurassic2.png:128:112,10,30,240,80,8,8,0,0 1,Images\jurassic2.png:128:112,10,31,248,80,8,8,0,0 @@ -867,30 +867,30 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 1,Images\jurassic2.png:128:112,11,1,8,88,8,8,0,0 1,Images\jurassic2.png:128:112,11,2,16,88,8,8,0,0 1,Images\jurassic2.png:128:112,11,3,24,88,8,8,12,0 -1,Images\jurassic2.png:128:112,11,4,32,88,8,8,153,0 -1,Images\jurassic2.png:128:112,11,5,40,88,8,8,155,0 -1,Images\jurassic2.png:128:112,11,6,48,88,8,8,157,0 -1,Images\jurassic2.png:128:112,11,7,56,88,8,8,159,0 -1,Images\jurassic2.png:128:112,11,8,64,88,8,8,161,0 -1,Images\jurassic2.png:128:112,11,9,72,88,8,8,163,0 -1,Images\jurassic2.png:128:112,11,10,80,88,8,8,165,0 -1,Images\jurassic2.png:128:112,11,11,88,88,8,8,167,0 -1,Images\jurassic2.png:128:112,11,12,96,88,8,8,169,0 -1,Images\jurassic2.png:128:112,11,13,104,88,8,8,171,0 -1,Images\jurassic2.png:128:112,11,14,112,88,8,8,173,0 -1,Images\jurassic2.png:128:112,11,15,120,88,8,8,175,0 -1,Images\jurassic2.png:128:112,11,16,128,88,8,8,177,0 -1,Images\jurassic2.png:128:112,11,17,136,88,8,8,179,0 -1,Images\jurassic2.png:128:112,11,18,144,88,8,8,181,0 -1,Images\jurassic2.png:128:112,11,19,152,88,8,8,183,0 -1,Images\jurassic2.png:128:112,11,20,160,88,8,8,185,0 -1,Images\jurassic2.png:128:112,11,21,168,88,8,8,187,0 -1,Images\jurassic2.png:128:112,11,22,176,88,8,8,189,0 -1,Images\jurassic2.png:128:112,11,23,184,88,8,8,191,0 -1,Images\jurassic2.png:128:112,11,24,192,88,8,8,193,0 -1,Images\jurassic2.png:128:112,11,25,200,88,8,8,195,0 -1,Images\jurassic2.png:128:112,11,26,208,88,8,8,197,0 -1,Images\jurassic2.png:128:112,11,27,216,88,8,8,199,0 +1,Images\jurassic2.png:128:112,11,4,32,88,8,8,151,0 +1,Images\jurassic2.png:128:112,11,5,40,88,8,8,153,0 +1,Images\jurassic2.png:128:112,11,6,48,88,8,8,155,0 +1,Images\jurassic2.png:128:112,11,7,56,88,8,8,157,0 +1,Images\jurassic2.png:128:112,11,8,64,88,8,8,159,0 +1,Images\jurassic2.png:128:112,11,9,72,88,8,8,161,0 +1,Images\jurassic2.png:128:112,11,10,80,88,8,8,163,0 +1,Images\jurassic2.png:128:112,11,11,88,88,8,8,165,0 +1,Images\jurassic2.png:128:112,11,12,96,88,8,8,167,0 +1,Images\jurassic2.png:128:112,11,13,104,88,8,8,169,0 +1,Images\jurassic2.png:128:112,11,14,112,88,8,8,171,0 +1,Images\jurassic2.png:128:112,11,15,120,88,8,8,173,0 +1,Images\jurassic2.png:128:112,11,16,128,88,8,8,175,0 +1,Images\jurassic2.png:128:112,11,17,136,88,8,8,177,0 +1,Images\jurassic2.png:128:112,11,18,144,88,8,8,179,0 +1,Images\jurassic2.png:128:112,11,19,152,88,8,8,181,0 +1,Images\jurassic2.png:128:112,11,20,160,88,8,8,183,0 +1,Images\jurassic2.png:128:112,11,21,168,88,8,8,185,0 +1,Images\jurassic2.png:128:112,11,22,176,88,8,8,187,0 +1,Images\jurassic2.png:128:112,11,23,184,88,8,8,189,0 +1,Images\jurassic2.png:128:112,11,24,192,88,8,8,191,0 +1,Images\jurassic2.png:128:112,11,25,200,88,8,8,193,0 +1,Images\jurassic2.png:128:112,11,26,208,88,8,8,195,0 +1,Images\jurassic2.png:128:112,11,27,216,88,8,8,197,0 1,Images\jurassic2.png:128:112,11,28,224,88,8,8,12,0 1,Images\jurassic2.png:128:112,11,29,232,88,8,8,0,0 1,Images\jurassic2.png:128:112,11,30,240,88,8,8,0,0 @@ -900,28 +900,28 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 1,Images\jurassic2.png:128:112,12,2,16,96,8,8,0,0 1,Images\jurassic2.png:128:112,12,3,24,96,8,8,12,0 1,Images\jurassic2.png:128:112,12,4,32,96,8,8,12,0 -1,Images\jurassic2.png:128:112,12,5,40,96,8,8,201,0 -1,Images\jurassic2.png:128:112,12,6,48,96,8,8,203,0 -1,Images\jurassic2.png:128:112,12,7,56,96,8,8,205,0 -1,Images\jurassic2.png:128:112,12,8,64,96,8,8,207,0 -1,Images\jurassic2.png:128:112,12,9,72,96,8,8,209,0 -1,Images\jurassic2.png:128:112,12,10,80,96,8,8,211,0 -1,Images\jurassic2.png:128:112,12,11,88,96,8,8,213,0 -1,Images\jurassic2.png:128:112,12,12,96,96,8,8,215,0 -1,Images\jurassic2.png:128:112,12,13,104,96,8,8,217,0 -1,Images\jurassic2.png:128:112,12,14,112,96,8,8,219,0 -1,Images\jurassic2.png:128:112,12,15,120,96,8,8,221,0 -1,Images\jurassic2.png:128:112,12,16,128,96,8,8,223,0 -1,Images\jurassic2.png:128:112,12,17,136,96,8,8,225,0 -1,Images\jurassic2.png:128:112,12,18,144,96,8,8,227,0 -1,Images\jurassic2.png:128:112,12,19,152,96,8,8,229,0 -1,Images\jurassic2.png:128:112,12,20,160,96,8,8,231,0 -1,Images\jurassic2.png:128:112,12,21,168,96,8,8,233,0 -1,Images\jurassic2.png:128:112,12,22,176,96,8,8,235,0 -1,Images\jurassic2.png:128:112,12,23,184,96,8,8,237,0 -1,Images\jurassic2.png:128:112,12,24,192,96,8,8,239,0 -1,Images\jurassic2.png:128:112,12,25,200,96,8,8,241,0 -1,Images\jurassic2.png:128:112,12,26,208,96,8,8,243,0 +1,Images\jurassic2.png:128:112,12,5,40,96,8,8,199,0 +1,Images\jurassic2.png:128:112,12,6,48,96,8,8,201,0 +1,Images\jurassic2.png:128:112,12,7,56,96,8,8,203,0 +1,Images\jurassic2.png:128:112,12,8,64,96,8,8,205,0 +1,Images\jurassic2.png:128:112,12,9,72,96,8,8,207,0 +1,Images\jurassic2.png:128:112,12,10,80,96,8,8,209,0 +1,Images\jurassic2.png:128:112,12,11,88,96,8,8,211,0 +1,Images\jurassic2.png:128:112,12,12,96,96,8,8,213,0 +1,Images\jurassic2.png:128:112,12,13,104,96,8,8,215,0 +1,Images\jurassic2.png:128:112,12,14,112,96,8,8,217,0 +1,Images\jurassic2.png:128:112,12,15,120,96,8,8,219,0 +1,Images\jurassic2.png:128:112,12,16,128,96,8,8,221,0 +1,Images\jurassic2.png:128:112,12,17,136,96,8,8,223,0 +1,Images\jurassic2.png:128:112,12,18,144,96,8,8,225,0 +1,Images\jurassic2.png:128:112,12,19,152,96,8,8,227,0 +1,Images\jurassic2.png:128:112,12,20,160,96,8,8,229,0 +1,Images\jurassic2.png:128:112,12,21,168,96,8,8,231,0 +1,Images\jurassic2.png:128:112,12,22,176,96,8,8,233,0 +1,Images\jurassic2.png:128:112,12,23,184,96,8,8,235,0 +1,Images\jurassic2.png:128:112,12,24,192,96,8,8,237,0 +1,Images\jurassic2.png:128:112,12,25,200,96,8,8,239,0 +1,Images\jurassic2.png:128:112,12,26,208,96,8,8,241,0 1,Images\jurassic2.png:128:112,12,27,216,96,8,8,12,0 1,Images\jurassic2.png:128:112,12,28,224,96,8,8,12,0 1,Images\jurassic2.png:128:112,12,29,232,96,8,8,0,0 diff --git a/Tests/References/jurassic_palette_0.bin b/Tests/References/jurassic_palette_0.bin index 1085866..47cd909 100644 --- a/Tests/References/jurassic_palette_0.bin +++ b/Tests/References/jurassic_palette_0.bin @@ -1 +1 @@ -' \ No newline at end of file +' \ No newline at end of file diff --git a/Tests/References/jurassic_palettes.csv b/Tests/References/jurassic_palettes.csv index f49c505..bffc867 100644 --- a/Tests/References/jurassic_palettes.csv +++ b/Tests/References/jurassic_palettes.csv @@ -1,3 +1,3 @@ palette_id,color0,color1,color2,color3 -0,#000000,#887000,#FC9838,#C84C0C +0,#000000,#887000,#C84C0C,#FC9838 1,#000000,#887000,#F0BC3C, diff --git a/Tests/References/jurassic_pattern_0.bin b/Tests/References/jurassic_pattern_0.bin index 7b31865..a0fcd6a 100644 Binary files a/Tests/References/jurassic_pattern_0.bin and b/Tests/References/jurassic_pattern_0.bin differ diff --git a/Tests/References/jurassic_pattern_1.bin b/Tests/References/jurassic_pattern_1.bin index d1b3120..7c7e0f5 100644 Binary files a/Tests/References/jurassic_pattern_1.bin and b/Tests/References/jurassic_pattern_1.bin differ diff --git a/Tests/References/me_attr_table_0.bin b/Tests/References/me_attr_table_0.bin index 6027776..090d058 100644 Binary files a/Tests/References/me_attr_table_0.bin and b/Tests/References/me_attr_table_0.bin differ diff --git a/Tests/References/me_attr_table_1.bin b/Tests/References/me_attr_table_1.bin index 4799ff1..b60f018 100644 Binary files a/Tests/References/me_attr_table_1.bin and b/Tests/References/me_attr_table_1.bin differ diff --git a/Tests/References/me_name_table_0.bin b/Tests/References/me_name_table_0.bin index 1de5029..05be57a 100644 Binary files a/Tests/References/me_name_table_0.bin and b/Tests/References/me_name_table_0.bin differ diff --git a/Tests/References/me_name_table_1.bin b/Tests/References/me_name_table_1.bin index 10c876b..4a6b503 100644 Binary files a/Tests/References/me_name_table_1.bin and b/Tests/References/me_name_table_1.bin differ diff --git a/Tests/References/me_palette_0.bin b/Tests/References/me_palette_0.bin index 26c7e40..1a65e7d 100644 --- a/Tests/References/me_palette_0.bin +++ b/Tests/References/me_palette_0.bin @@ -1 +1 @@ -0 \ No newline at end of file + 0 \ No newline at end of file diff --git a/Tests/References/me_palette_1.bin b/Tests/References/me_palette_1.bin index 256e022..478773d 100644 --- a/Tests/References/me_palette_1.bin +++ b/Tests/References/me_palette_1.bin @@ -1 +1 @@ -8( \ No newline at end of file +' \ No newline at end of file diff --git a/Tests/References/me_palette_2.bin b/Tests/References/me_palette_2.bin index 8c3a7e9..002cb02 100644 --- a/Tests/References/me_palette_2.bin +++ b/Tests/References/me_palette_2.bin @@ -1 +1 @@ -' \ No newline at end of file +(8 \ No newline at end of file diff --git a/Tests/References/me_palette_3.bin b/Tests/References/me_palette_3.bin index de580ce..126a5c4 100644 --- a/Tests/References/me_palette_3.bin +++ b/Tests/References/me_palette_3.bin @@ -1 +1 @@ -0 \ No newline at end of file +0 \ No newline at end of file diff --git a/Tests/References/me_palettes.csv b/Tests/References/me_palettes.csv index a2198db..86a54b6 100644 --- a/Tests/References/me_palettes.csv +++ b/Tests/References/me_palettes.csv @@ -1,5 +1,5 @@ palette_id,color0,color1,color2,color3 -0,#402C00,#000000,#FFFFFF,#FCFCFC -1,#402C00,#000000,#FCE4A0,#F0BC3C -2,#402C00,#887000,#000000,#FC9838 -3,#402C00,#887000,#000000,#FFFFFF +0,#402C00,#000000,#FCFCFC,#FFFFFF +1,#402C00,#000000,#887000,#FC9838 +2,#402C00,#000000,#F0BC3C,#FCE4A0 +3,#402C00,#000000,#887000,#FFFFFF diff --git a/Tests/References/me_pattern_0.bin b/Tests/References/me_pattern_0.bin index 4095f7f..0e5000c 100644 Binary files a/Tests/References/me_pattern_0.bin and b/Tests/References/me_pattern_0.bin differ diff --git a/Tests/References/me_pattern_1.bin b/Tests/References/me_pattern_1.bin index 7263634..d2a8d1f 100644 Binary files a/Tests/References/me_pattern_1.bin and b/Tests/References/me_pattern_1.bin differ diff --git a/Tests/References/me_tiles.csv b/Tests/References/me_tiles.csv index 7e1aa99..0cbfcca 100644 --- a/Tests/References/me_tiles.csv +++ b/Tests/References/me_tiles.csv @@ -71,22 +71,22 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 0,Images\me.png:0:128,2,5,40,16,8,8,0,0 0,Images\me.png:0:128,2,6,48,16,8,8,0,0 0,Images\me.png:0:128,2,7,56,16,8,8,0,0 -0,Images\me.png:0:128,2,8,64,16,8,8,4,3 -0,Images\me.png:0:128,2,9,72,16,8,8,4,3 -0,Images\me.png:0:128,2,10,80,16,8,8,4,3 -0,Images\me.png:0:128,2,11,88,16,8,8,4,3 -0,Images\me.png:0:128,2,12,96,16,8,8,4,3 -0,Images\me.png:0:128,2,13,104,16,8,8,6,3 -0,Images\me.png:0:128,2,14,112,16,8,8,8,3 -0,Images\me.png:0:128,2,15,120,16,8,8,10,3 -0,Images\me.png:0:128,2,16,128,16,8,8,12,3 -0,Images\me.png:0:128,2,17,136,16,8,8,4,3 +0,Images\me.png:0:128,2,8,64,16,8,8,0,3 +0,Images\me.png:0:128,2,9,72,16,8,8,0,3 +0,Images\me.png:0:128,2,10,80,16,8,8,0,3 +0,Images\me.png:0:128,2,11,88,16,8,8,0,3 +0,Images\me.png:0:128,2,12,96,16,8,8,0,3 +0,Images\me.png:0:128,2,13,104,16,8,8,4,3 +0,Images\me.png:0:128,2,14,112,16,8,8,6,3 +0,Images\me.png:0:128,2,15,120,16,8,8,8,3 +0,Images\me.png:0:128,2,16,128,16,8,8,10,3 +0,Images\me.png:0:128,2,17,136,16,8,8,0,3 0,Images\me.png:0:128,2,18,144,16,8,8,0,0 0,Images\me.png:0:128,2,19,152,16,8,8,0,0 -0,Images\me.png:0:128,2,20,160,16,8,8,4,3 -0,Images\me.png:0:128,2,21,168,16,8,8,4,3 -0,Images\me.png:0:128,2,22,176,16,8,8,4,3 -0,Images\me.png:0:128,2,23,184,16,8,8,4,3 +0,Images\me.png:0:128,2,20,160,16,8,8,0,3 +0,Images\me.png:0:128,2,21,168,16,8,8,0,3 +0,Images\me.png:0:128,2,22,176,16,8,8,0,3 +0,Images\me.png:0:128,2,23,184,16,8,8,0,3 0,Images\me.png:0:128,2,24,192,16,8,8,0,0 0,Images\me.png:0:128,2,25,200,16,8,8,0,0 0,Images\me.png:0:128,2,26,208,16,8,8,0,0 @@ -103,22 +103,22 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 0,Images\me.png:0:128,3,5,40,24,8,8,0,0 0,Images\me.png:0:128,3,6,48,24,8,8,0,0 0,Images\me.png:0:128,3,7,56,24,8,8,0,0 -0,Images\me.png:0:128,3,8,64,24,8,8,4,3 -0,Images\me.png:0:128,3,9,72,24,8,8,14,3 -0,Images\me.png:0:128,3,10,80,24,8,8,16,3 -0,Images\me.png:0:128,3,11,88,24,8,8,18,3 -0,Images\me.png:0:128,3,12,96,24,8,8,20,3 -0,Images\me.png:0:128,3,13,104,24,8,8,22,3 -0,Images\me.png:0:128,3,14,112,24,8,8,24,3 -0,Images\me.png:0:128,3,15,120,24,8,8,26,3 -0,Images\me.png:0:128,3,16,128,24,8,8,28,3 -0,Images\me.png:0:128,3,17,136,24,8,8,30,3 +0,Images\me.png:0:128,3,8,64,24,8,8,0,3 +0,Images\me.png:0:128,3,9,72,24,8,8,12,3 +0,Images\me.png:0:128,3,10,80,24,8,8,14,3 +0,Images\me.png:0:128,3,11,88,24,8,8,16,3 +0,Images\me.png:0:128,3,12,96,24,8,8,18,3 +0,Images\me.png:0:128,3,13,104,24,8,8,20,3 +0,Images\me.png:0:128,3,14,112,24,8,8,22,3 +0,Images\me.png:0:128,3,15,120,24,8,8,24,3 +0,Images\me.png:0:128,3,16,128,24,8,8,26,3 +0,Images\me.png:0:128,3,17,136,24,8,8,28,3 0,Images\me.png:0:128,3,18,144,24,8,8,0,0 0,Images\me.png:0:128,3,19,152,24,8,8,0,0 -0,Images\me.png:0:128,3,20,160,24,8,8,4,3 -0,Images\me.png:0:128,3,21,168,24,8,8,32,3 -0,Images\me.png:0:128,3,22,176,24,8,8,34,3 -0,Images\me.png:0:128,3,23,184,24,8,8,4,3 +0,Images\me.png:0:128,3,20,160,24,8,8,0,3 +0,Images\me.png:0:128,3,21,168,24,8,8,30,3 +0,Images\me.png:0:128,3,22,176,24,8,8,32,3 +0,Images\me.png:0:128,3,23,184,24,8,8,0,3 0,Images\me.png:0:128,3,24,192,24,8,8,0,0 0,Images\me.png:0:128,3,25,200,24,8,8,0,0 0,Images\me.png:0:128,3,26,208,24,8,8,0,0 @@ -133,26 +133,26 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 0,Images\me.png:0:128,4,3,24,32,8,8,0,0 0,Images\me.png:0:128,4,4,32,32,8,8,0,0 0,Images\me.png:0:128,4,5,40,32,8,8,0,0 -0,Images\me.png:0:128,4,6,48,32,8,8,36,3 -0,Images\me.png:0:128,4,7,56,32,8,8,4,3 -0,Images\me.png:0:128,4,8,64,32,8,8,38,3 -0,Images\me.png:0:128,4,9,72,32,8,8,40,3 -0,Images\me.png:0:128,4,10,80,32,8,8,42,3 -0,Images\me.png:0:128,4,11,88,32,8,8,44,3 -0,Images\me.png:0:128,4,12,96,32,8,8,46,3 -0,Images\me.png:0:128,4,13,104,32,8,8,48,3 -0,Images\me.png:0:128,4,14,112,32,8,8,50,2 -0,Images\me.png:0:128,4,15,120,32,8,8,52,2 -0,Images\me.png:0:128,4,16,128,32,8,8,54,2 -0,Images\me.png:0:128,4,17,136,32,8,8,56,2 -0,Images\me.png:0:128,4,18,144,32,8,8,58,3 -0,Images\me.png:0:128,4,19,152,32,8,8,4,3 -0,Images\me.png:0:128,4,20,160,32,8,8,60,3 -0,Images\me.png:0:128,4,21,168,32,8,8,62,3 -0,Images\me.png:0:128,4,22,176,32,8,8,64,3 -0,Images\me.png:0:128,4,23,184,32,8,8,66,3 -0,Images\me.png:0:128,4,24,192,32,8,8,68,0 -0,Images\me.png:0:128,4,25,200,32,8,8,70,0 +0,Images\me.png:0:128,4,6,48,32,8,8,34,3 +0,Images\me.png:0:128,4,7,56,32,8,8,0,3 +0,Images\me.png:0:128,4,8,64,32,8,8,36,3 +0,Images\me.png:0:128,4,9,72,32,8,8,38,3 +0,Images\me.png:0:128,4,10,80,32,8,8,40,3 +0,Images\me.png:0:128,4,11,88,32,8,8,42,3 +0,Images\me.png:0:128,4,12,96,32,8,8,44,3 +0,Images\me.png:0:128,4,13,104,32,8,8,46,3 +0,Images\me.png:0:128,4,14,112,32,8,8,48,1 +0,Images\me.png:0:128,4,15,120,32,8,8,50,1 +0,Images\me.png:0:128,4,16,128,32,8,8,52,1 +0,Images\me.png:0:128,4,17,136,32,8,8,54,1 +0,Images\me.png:0:128,4,18,144,32,8,8,56,3 +0,Images\me.png:0:128,4,19,152,32,8,8,0,3 +0,Images\me.png:0:128,4,20,160,32,8,8,58,3 +0,Images\me.png:0:128,4,21,168,32,8,8,60,3 +0,Images\me.png:0:128,4,22,176,32,8,8,62,3 +0,Images\me.png:0:128,4,23,184,32,8,8,64,3 +0,Images\me.png:0:128,4,24,192,32,8,8,66,0 +0,Images\me.png:0:128,4,25,200,32,8,8,68,0 0,Images\me.png:0:128,4,26,208,32,8,8,0,0 0,Images\me.png:0:128,4,27,216,32,8,8,0,0 0,Images\me.png:0:128,4,28,224,32,8,8,0,0 @@ -164,26 +164,26 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 0,Images\me.png:0:128,5,2,16,40,8,8,0,0 0,Images\me.png:0:128,5,3,24,40,8,8,0,0 0,Images\me.png:0:128,5,4,32,40,8,8,0,0 -0,Images\me.png:0:128,5,5,40,40,8,8,72,0 -0,Images\me.png:0:128,5,6,48,40,8,8,74,3 -0,Images\me.png:0:128,5,7,56,40,8,8,76,3 -0,Images\me.png:0:128,5,8,64,40,8,8,78,3 -0,Images\me.png:0:128,5,9,72,40,8,8,80,3 -0,Images\me.png:0:128,5,10,80,40,8,8,82,3 -0,Images\me.png:0:128,5,11,88,40,8,8,84,3 -0,Images\me.png:0:128,5,12,96,40,8,8,86,3 -0,Images\me.png:0:128,5,13,104,40,8,8,88,3 -0,Images\me.png:0:128,5,14,112,40,8,8,90,2 -0,Images\me.png:0:128,5,15,120,40,8,8,92,2 -0,Images\me.png:0:128,5,16,128,40,8,8,94,2 -0,Images\me.png:0:128,5,17,136,40,8,8,96,2 -0,Images\me.png:0:128,5,18,144,40,8,8,98,3 -0,Images\me.png:0:128,5,19,152,40,8,8,100,3 -0,Images\me.png:0:128,5,20,160,40,8,8,102,3 -0,Images\me.png:0:128,5,21,168,40,8,8,104,3 -0,Images\me.png:0:128,5,22,176,40,8,8,106,3 -0,Images\me.png:0:128,5,23,184,40,8,8,108,3 -0,Images\me.png:0:128,5,24,192,40,8,8,110,0 +0,Images\me.png:0:128,5,5,40,40,8,8,70,0 +0,Images\me.png:0:128,5,6,48,40,8,8,72,3 +0,Images\me.png:0:128,5,7,56,40,8,8,74,3 +0,Images\me.png:0:128,5,8,64,40,8,8,76,3 +0,Images\me.png:0:128,5,9,72,40,8,8,78,3 +0,Images\me.png:0:128,5,10,80,40,8,8,80,3 +0,Images\me.png:0:128,5,11,88,40,8,8,82,3 +0,Images\me.png:0:128,5,12,96,40,8,8,84,3 +0,Images\me.png:0:128,5,13,104,40,8,8,86,3 +0,Images\me.png:0:128,5,14,112,40,8,8,88,1 +0,Images\me.png:0:128,5,15,120,40,8,8,90,1 +0,Images\me.png:0:128,5,16,128,40,8,8,92,1 +0,Images\me.png:0:128,5,17,136,40,8,8,94,1 +0,Images\me.png:0:128,5,18,144,40,8,8,96,3 +0,Images\me.png:0:128,5,19,152,40,8,8,98,3 +0,Images\me.png:0:128,5,20,160,40,8,8,100,3 +0,Images\me.png:0:128,5,21,168,40,8,8,102,3 +0,Images\me.png:0:128,5,22,176,40,8,8,104,3 +0,Images\me.png:0:128,5,23,184,40,8,8,106,3 +0,Images\me.png:0:128,5,24,192,40,8,8,108,0 0,Images\me.png:0:128,5,25,200,40,8,8,0,0 0,Images\me.png:0:128,5,26,208,40,8,8,0,0 0,Images\me.png:0:128,5,27,216,40,8,8,0,0 @@ -195,30 +195,30 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 0,Images\me.png:0:128,6,1,8,48,8,8,0,0 0,Images\me.png:0:128,6,2,16,48,8,8,0,0 0,Images\me.png:0:128,6,3,24,48,8,8,0,0 -0,Images\me.png:0:128,6,4,32,48,8,8,4,3 -0,Images\me.png:0:128,6,5,40,48,8,8,112,3 -0,Images\me.png:0:128,6,6,48,48,8,8,114,3 -0,Images\me.png:0:128,6,7,56,48,8,8,116,3 -0,Images\me.png:0:128,6,8,64,48,8,8,118,3 -0,Images\me.png:0:128,6,9,72,48,8,8,120,3 -0,Images\me.png:0:128,6,10,80,48,8,8,122,2 -0,Images\me.png:0:128,6,11,88,48,8,8,124,2 -0,Images\me.png:0:128,6,12,96,48,8,8,126,2 -0,Images\me.png:0:128,6,13,104,48,8,8,128,2 -0,Images\me.png:0:128,6,14,112,48,8,8,130,2 -0,Images\me.png:0:128,6,15,120,48,8,8,4,2 -0,Images\me.png:0:128,6,16,128,48,8,8,4,2 -0,Images\me.png:0:128,6,17,136,48,8,8,4,2 -0,Images\me.png:0:128,6,18,144,48,8,8,132,2 -0,Images\me.png:0:128,6,19,152,48,8,8,134,2 -0,Images\me.png:0:128,6,20,160,48,8,8,136,2 -0,Images\me.png:0:128,6,21,168,48,8,8,138,2 -0,Images\me.png:0:128,6,22,176,48,8,8,140,3 -0,Images\me.png:0:128,6,23,184,48,8,8,142,3 -0,Images\me.png:0:128,6,24,192,48,8,8,4,3 -0,Images\me.png:0:128,6,25,200,48,8,8,4,3 -0,Images\me.png:0:128,6,26,208,48,8,8,4,3 -0,Images\me.png:0:128,6,27,216,48,8,8,4,3 +0,Images\me.png:0:128,6,4,32,48,8,8,0,3 +0,Images\me.png:0:128,6,5,40,48,8,8,110,3 +0,Images\me.png:0:128,6,6,48,48,8,8,112,3 +0,Images\me.png:0:128,6,7,56,48,8,8,114,3 +0,Images\me.png:0:128,6,8,64,48,8,8,116,3 +0,Images\me.png:0:128,6,9,72,48,8,8,118,3 +0,Images\me.png:0:128,6,10,80,48,8,8,120,1 +0,Images\me.png:0:128,6,11,88,48,8,8,122,1 +0,Images\me.png:0:128,6,12,96,48,8,8,124,1 +0,Images\me.png:0:128,6,13,104,48,8,8,126,1 +0,Images\me.png:0:128,6,14,112,48,8,8,128,1 +0,Images\me.png:0:128,6,15,120,48,8,8,0,1 +0,Images\me.png:0:128,6,16,128,48,8,8,0,1 +0,Images\me.png:0:128,6,17,136,48,8,8,0,1 +0,Images\me.png:0:128,6,18,144,48,8,8,130,1 +0,Images\me.png:0:128,6,19,152,48,8,8,132,1 +0,Images\me.png:0:128,6,20,160,48,8,8,134,1 +0,Images\me.png:0:128,6,21,168,48,8,8,136,1 +0,Images\me.png:0:128,6,22,176,48,8,8,138,3 +0,Images\me.png:0:128,6,23,184,48,8,8,140,3 +0,Images\me.png:0:128,6,24,192,48,8,8,0,3 +0,Images\me.png:0:128,6,25,200,48,8,8,0,3 +0,Images\me.png:0:128,6,26,208,48,8,8,0,3 +0,Images\me.png:0:128,6,27,216,48,8,8,0,3 0,Images\me.png:0:128,6,28,224,48,8,8,0,0 0,Images\me.png:0:128,6,29,232,48,8,8,0,0 0,Images\me.png:0:128,6,30,240,48,8,8,0,0 @@ -227,30 +227,30 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 0,Images\me.png:0:128,7,1,8,56,8,8,0,0 0,Images\me.png:0:128,7,2,16,56,8,8,0,0 0,Images\me.png:0:128,7,3,24,56,8,8,0,0 -0,Images\me.png:0:128,7,4,32,56,8,8,4,3 -0,Images\me.png:0:128,7,5,40,56,8,8,4,3 -0,Images\me.png:0:128,7,6,48,56,8,8,144,3 -0,Images\me.png:0:128,7,7,56,56,8,8,146,3 -0,Images\me.png:0:128,7,8,64,56,8,8,148,3 -0,Images\me.png:0:128,7,9,72,56,8,8,150,3 -0,Images\me.png:0:128,7,10,80,56,8,8,152,2 -0,Images\me.png:0:128,7,11,88,56,8,8,154,2 -0,Images\me.png:0:128,7,12,96,56,8,8,156,2 -0,Images\me.png:0:128,7,13,104,56,8,8,4,2 -0,Images\me.png:0:128,7,14,112,56,8,8,4,2 -0,Images\me.png:0:128,7,15,120,56,8,8,4,2 -0,Images\me.png:0:128,7,16,128,56,8,8,4,2 -0,Images\me.png:0:128,7,17,136,56,8,8,4,2 -0,Images\me.png:0:128,7,18,144,56,8,8,4,2 -0,Images\me.png:0:128,7,19,152,56,8,8,4,2 -0,Images\me.png:0:128,7,20,160,56,8,8,158,2 -0,Images\me.png:0:128,7,21,168,56,8,8,160,2 -0,Images\me.png:0:128,7,22,176,56,8,8,162,3 -0,Images\me.png:0:128,7,23,184,56,8,8,164,3 -0,Images\me.png:0:128,7,24,192,56,8,8,166,3 -0,Images\me.png:0:128,7,25,200,56,8,8,168,3 -0,Images\me.png:0:128,7,26,208,56,8,8,170,3 -0,Images\me.png:0:128,7,27,216,56,8,8,4,3 +0,Images\me.png:0:128,7,4,32,56,8,8,0,3 +0,Images\me.png:0:128,7,5,40,56,8,8,0,3 +0,Images\me.png:0:128,7,6,48,56,8,8,142,3 +0,Images\me.png:0:128,7,7,56,56,8,8,144,3 +0,Images\me.png:0:128,7,8,64,56,8,8,146,3 +0,Images\me.png:0:128,7,9,72,56,8,8,148,3 +0,Images\me.png:0:128,7,10,80,56,8,8,150,1 +0,Images\me.png:0:128,7,11,88,56,8,8,152,1 +0,Images\me.png:0:128,7,12,96,56,8,8,154,1 +0,Images\me.png:0:128,7,13,104,56,8,8,0,1 +0,Images\me.png:0:128,7,14,112,56,8,8,0,1 +0,Images\me.png:0:128,7,15,120,56,8,8,0,1 +0,Images\me.png:0:128,7,16,128,56,8,8,0,1 +0,Images\me.png:0:128,7,17,136,56,8,8,0,1 +0,Images\me.png:0:128,7,18,144,56,8,8,0,1 +0,Images\me.png:0:128,7,19,152,56,8,8,0,1 +0,Images\me.png:0:128,7,20,160,56,8,8,156,1 +0,Images\me.png:0:128,7,21,168,56,8,8,158,1 +0,Images\me.png:0:128,7,22,176,56,8,8,160,3 +0,Images\me.png:0:128,7,23,184,56,8,8,162,3 +0,Images\me.png:0:128,7,24,192,56,8,8,164,3 +0,Images\me.png:0:128,7,25,200,56,8,8,166,3 +0,Images\me.png:0:128,7,26,208,56,8,8,168,3 +0,Images\me.png:0:128,7,27,216,56,8,8,0,3 0,Images\me.png:0:128,7,28,224,56,8,8,0,0 0,Images\me.png:0:128,7,29,232,56,8,8,0,0 0,Images\me.png:0:128,7,30,240,56,8,8,0,0 @@ -259,30 +259,30 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 0,Images\me.png:0:128,8,1,8,64,8,8,0,0 0,Images\me.png:0:128,8,2,16,64,8,8,0,0 0,Images\me.png:0:128,8,3,24,64,8,8,0,0 -0,Images\me.png:0:128,8,4,32,64,8,8,172,0 -0,Images\me.png:0:128,8,5,40,64,8,8,174,0 -0,Images\me.png:0:128,8,6,48,64,8,8,176,3 -0,Images\me.png:0:128,8,7,56,64,8,8,178,3 -0,Images\me.png:0:128,8,8,64,64,8,8,180,2 -0,Images\me.png:0:128,8,9,72,64,8,8,182,2 -0,Images\me.png:0:128,8,10,80,64,8,8,184,2 -0,Images\me.png:0:128,8,11,88,64,8,8,4,2 -0,Images\me.png:0:128,8,12,96,64,8,8,4,2 -0,Images\me.png:0:128,8,13,104,64,8,8,4,2 -0,Images\me.png:0:128,8,14,112,64,8,8,4,2 -0,Images\me.png:0:128,8,15,120,64,8,8,4,2 -0,Images\me.png:0:128,8,16,128,64,8,8,4,2 -0,Images\me.png:0:128,8,17,136,64,8,8,4,2 -0,Images\me.png:0:128,8,18,144,64,8,8,4,2 -0,Images\me.png:0:128,8,19,152,64,8,8,4,2 -0,Images\me.png:0:128,8,20,160,64,8,8,186,2 -0,Images\me.png:0:128,8,21,168,64,8,8,188,2 -0,Images\me.png:0:128,8,22,176,64,8,8,190,2 -0,Images\me.png:0:128,8,23,184,64,8,8,192,2 -0,Images\me.png:0:128,8,24,192,64,8,8,194,3 -0,Images\me.png:0:128,8,25,200,64,8,8,4,3 -0,Images\me.png:0:128,8,26,208,64,8,8,196,3 -0,Images\me.png:0:128,8,27,216,64,8,8,4,3 +0,Images\me.png:0:128,8,4,32,64,8,8,170,0 +0,Images\me.png:0:128,8,5,40,64,8,8,172,0 +0,Images\me.png:0:128,8,6,48,64,8,8,174,3 +0,Images\me.png:0:128,8,7,56,64,8,8,176,3 +0,Images\me.png:0:128,8,8,64,64,8,8,178,1 +0,Images\me.png:0:128,8,9,72,64,8,8,180,1 +0,Images\me.png:0:128,8,10,80,64,8,8,182,1 +0,Images\me.png:0:128,8,11,88,64,8,8,0,1 +0,Images\me.png:0:128,8,12,96,64,8,8,0,1 +0,Images\me.png:0:128,8,13,104,64,8,8,0,1 +0,Images\me.png:0:128,8,14,112,64,8,8,0,1 +0,Images\me.png:0:128,8,15,120,64,8,8,0,1 +0,Images\me.png:0:128,8,16,128,64,8,8,0,1 +0,Images\me.png:0:128,8,17,136,64,8,8,0,1 +0,Images\me.png:0:128,8,18,144,64,8,8,0,1 +0,Images\me.png:0:128,8,19,152,64,8,8,0,1 +0,Images\me.png:0:128,8,20,160,64,8,8,184,1 +0,Images\me.png:0:128,8,21,168,64,8,8,186,1 +0,Images\me.png:0:128,8,22,176,64,8,8,188,1 +0,Images\me.png:0:128,8,23,184,64,8,8,190,1 +0,Images\me.png:0:128,8,24,192,64,8,8,192,3 +0,Images\me.png:0:128,8,25,200,64,8,8,0,3 +0,Images\me.png:0:128,8,26,208,64,8,8,194,3 +0,Images\me.png:0:128,8,27,216,64,8,8,0,3 0,Images\me.png:0:128,8,28,224,64,8,8,0,0 0,Images\me.png:0:128,8,29,232,64,8,8,0,0 0,Images\me.png:0:128,8,30,240,64,8,8,0,0 @@ -291,30 +291,30 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 0,Images\me.png:0:128,9,1,8,72,8,8,0,0 0,Images\me.png:0:128,9,2,16,72,8,8,0,0 0,Images\me.png:0:128,9,3,24,72,8,8,0,0 -0,Images\me.png:0:128,9,4,32,72,8,8,198,0 -0,Images\me.png:0:128,9,5,40,72,8,8,200,0 -0,Images\me.png:0:128,9,6,48,72,8,8,202,3 -0,Images\me.png:0:128,9,7,56,72,8,8,204,3 -0,Images\me.png:0:128,9,8,64,72,8,8,206,2 -0,Images\me.png:0:128,9,9,72,72,8,8,208,2 -0,Images\me.png:0:128,9,10,80,72,8,8,210,2 -0,Images\me.png:0:128,9,11,88,72,8,8,4,2 -0,Images\me.png:0:128,9,12,96,72,8,8,4,2 -0,Images\me.png:0:128,9,13,104,72,8,8,4,2 -0,Images\me.png:0:128,9,14,112,72,8,8,4,2 -0,Images\me.png:0:128,9,15,120,72,8,8,4,2 -0,Images\me.png:0:128,9,16,128,72,8,8,212,2 -0,Images\me.png:0:128,9,17,136,72,8,8,4,2 -0,Images\me.png:0:128,9,18,144,72,8,8,4,2 -0,Images\me.png:0:128,9,19,152,72,8,8,4,2 -0,Images\me.png:0:128,9,20,160,72,8,8,4,2 -0,Images\me.png:0:128,9,21,168,72,8,8,4,2 -0,Images\me.png:0:128,9,22,176,72,8,8,196,2 -0,Images\me.png:0:128,9,23,184,72,8,8,214,2 -0,Images\me.png:0:128,9,24,192,72,8,8,216,3 -0,Images\me.png:0:128,9,25,200,72,8,8,218,3 -0,Images\me.png:0:128,9,26,208,72,8,8,220,3 -0,Images\me.png:0:128,9,27,216,72,8,8,4,3 +0,Images\me.png:0:128,9,4,32,72,8,8,196,0 +0,Images\me.png:0:128,9,5,40,72,8,8,198,0 +0,Images\me.png:0:128,9,6,48,72,8,8,200,3 +0,Images\me.png:0:128,9,7,56,72,8,8,202,3 +0,Images\me.png:0:128,9,8,64,72,8,8,204,1 +0,Images\me.png:0:128,9,9,72,72,8,8,206,1 +0,Images\me.png:0:128,9,10,80,72,8,8,208,1 +0,Images\me.png:0:128,9,11,88,72,8,8,0,1 +0,Images\me.png:0:128,9,12,96,72,8,8,0,1 +0,Images\me.png:0:128,9,13,104,72,8,8,0,1 +0,Images\me.png:0:128,9,14,112,72,8,8,0,1 +0,Images\me.png:0:128,9,15,120,72,8,8,0,1 +0,Images\me.png:0:128,9,16,128,72,8,8,210,1 +0,Images\me.png:0:128,9,17,136,72,8,8,0,1 +0,Images\me.png:0:128,9,18,144,72,8,8,0,1 +0,Images\me.png:0:128,9,19,152,72,8,8,0,1 +0,Images\me.png:0:128,9,20,160,72,8,8,0,1 +0,Images\me.png:0:128,9,21,168,72,8,8,0,1 +0,Images\me.png:0:128,9,22,176,72,8,8,194,1 +0,Images\me.png:0:128,9,23,184,72,8,8,212,1 +0,Images\me.png:0:128,9,24,192,72,8,8,214,3 +0,Images\me.png:0:128,9,25,200,72,8,8,216,3 +0,Images\me.png:0:128,9,26,208,72,8,8,218,3 +0,Images\me.png:0:128,9,27,216,72,8,8,0,3 0,Images\me.png:0:128,9,28,224,72,8,8,0,0 0,Images\me.png:0:128,9,29,232,72,8,8,0,0 0,Images\me.png:0:128,9,30,240,72,8,8,0,0 @@ -323,30 +323,30 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 0,Images\me.png:0:128,10,1,8,80,8,8,0,0 0,Images\me.png:0:128,10,2,16,80,8,8,0,0 0,Images\me.png:0:128,10,3,24,80,8,8,0,0 -0,Images\me.png:0:128,10,4,32,80,8,8,222,0 -0,Images\me.png:0:128,10,5,40,80,8,8,224,0 -0,Images\me.png:0:128,10,6,48,80,8,8,226,3 -0,Images\me.png:0:128,10,7,56,80,8,8,228,3 -0,Images\me.png:0:128,10,8,64,80,8,8,230,2 -0,Images\me.png:0:128,10,9,72,80,8,8,232,2 -0,Images\me.png:0:128,10,10,80,80,8,8,4,2 -0,Images\me.png:0:128,10,11,88,80,8,8,234,2 -0,Images\me.png:0:128,10,12,96,80,8,8,236,2 -0,Images\me.png:0:128,10,13,104,80,8,8,238,2 -0,Images\me.png:0:128,10,14,112,80,8,8,240,2 -0,Images\me.png:0:128,10,15,120,80,8,8,242,2 -0,Images\me.png:0:128,10,16,128,80,8,8,244,1 -0,Images\me.png:0:128,10,17,136,80,8,8,246,1 -0,Images\me.png:0:128,10,18,144,80,8,8,248,2 -0,Images\me.png:0:128,10,19,152,80,8,8,4,2 -0,Images\me.png:0:128,10,20,160,80,8,8,4,2 -0,Images\me.png:0:128,10,21,168,80,8,8,4,2 -0,Images\me.png:0:128,10,22,176,80,8,8,4,2 -0,Images\me.png:0:128,10,23,184,80,8,8,250,2 -0,Images\me.png:0:128,10,24,192,80,8,8,252,2 -0,Images\me.png:0:128,10,25,200,80,8,8,254,2 -0,Images\me.png:0:128,10,26,208,80,8,8,1,3 -0,Images\me.png:0:128,10,27,216,80,8,8,3,3 +0,Images\me.png:0:128,10,4,32,80,8,8,220,0 +0,Images\me.png:0:128,10,5,40,80,8,8,222,0 +0,Images\me.png:0:128,10,6,48,80,8,8,224,3 +0,Images\me.png:0:128,10,7,56,80,8,8,226,3 +0,Images\me.png:0:128,10,8,64,80,8,8,228,1 +0,Images\me.png:0:128,10,9,72,80,8,8,230,1 +0,Images\me.png:0:128,10,10,80,80,8,8,0,1 +0,Images\me.png:0:128,10,11,88,80,8,8,232,1 +0,Images\me.png:0:128,10,12,96,80,8,8,234,1 +0,Images\me.png:0:128,10,13,104,80,8,8,236,1 +0,Images\me.png:0:128,10,14,112,80,8,8,238,1 +0,Images\me.png:0:128,10,15,120,80,8,8,240,1 +0,Images\me.png:0:128,10,16,128,80,8,8,242,2 +0,Images\me.png:0:128,10,17,136,80,8,8,244,2 +0,Images\me.png:0:128,10,18,144,80,8,8,246,1 +0,Images\me.png:0:128,10,19,152,80,8,8,0,1 +0,Images\me.png:0:128,10,20,160,80,8,8,0,1 +0,Images\me.png:0:128,10,21,168,80,8,8,0,1 +0,Images\me.png:0:128,10,22,176,80,8,8,0,1 +0,Images\me.png:0:128,10,23,184,80,8,8,248,1 +0,Images\me.png:0:128,10,24,192,80,8,8,250,1 +0,Images\me.png:0:128,10,25,200,80,8,8,252,1 +0,Images\me.png:0:128,10,26,208,80,8,8,254,3 +0,Images\me.png:0:128,10,27,216,80,8,8,1,3 0,Images\me.png:0:128,10,28,224,80,8,8,0,0 0,Images\me.png:0:128,10,29,232,80,8,8,0,0 0,Images\me.png:0:128,10,30,240,80,8,8,0,0 @@ -357,28 +357,28 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 0,Images\me.png:0:128,11,3,24,88,8,8,0,0 0,Images\me.png:0:128,11,4,32,88,8,8,0,0 0,Images\me.png:0:128,11,5,40,88,8,8,0,0 -0,Images\me.png:0:128,11,6,48,88,8,8,5,3 -0,Images\me.png:0:128,11,7,56,88,8,8,7,3 -0,Images\me.png:0:128,11,8,64,88,8,8,9,2 -0,Images\me.png:0:128,11,9,72,88,8,8,11,2 -0,Images\me.png:0:128,11,10,80,88,8,8,4,2 -0,Images\me.png:0:128,11,11,88,88,8,8,13,2 -0,Images\me.png:0:128,11,12,96,88,8,8,15,2 -0,Images\me.png:0:128,11,13,104,88,8,8,17,2 -0,Images\me.png:0:128,11,14,112,88,8,8,19,2 -0,Images\me.png:0:128,11,15,120,88,8,8,21,2 -0,Images\me.png:0:128,11,16,128,88,8,8,23,1 -0,Images\me.png:0:128,11,17,136,88,8,8,25,1 -0,Images\me.png:0:128,11,18,144,88,8,8,27,2 -0,Images\me.png:0:128,11,19,152,88,8,8,29,2 -0,Images\me.png:0:128,11,20,160,88,8,8,31,2 -0,Images\me.png:0:128,11,21,168,88,8,8,33,2 -0,Images\me.png:0:128,11,22,176,88,8,8,4,2 -0,Images\me.png:0:128,11,23,184,88,8,8,4,2 -0,Images\me.png:0:128,11,24,192,88,8,8,35,2 -0,Images\me.png:0:128,11,25,200,88,8,8,37,2 -0,Images\me.png:0:128,11,26,208,88,8,8,39,3 -0,Images\me.png:0:128,11,27,216,88,8,8,4,3 +0,Images\me.png:0:128,11,6,48,88,8,8,3,3 +0,Images\me.png:0:128,11,7,56,88,8,8,5,3 +0,Images\me.png:0:128,11,8,64,88,8,8,7,1 +0,Images\me.png:0:128,11,9,72,88,8,8,9,1 +0,Images\me.png:0:128,11,10,80,88,8,8,0,1 +0,Images\me.png:0:128,11,11,88,88,8,8,11,1 +0,Images\me.png:0:128,11,12,96,88,8,8,13,1 +0,Images\me.png:0:128,11,13,104,88,8,8,15,1 +0,Images\me.png:0:128,11,14,112,88,8,8,17,1 +0,Images\me.png:0:128,11,15,120,88,8,8,19,1 +0,Images\me.png:0:128,11,16,128,88,8,8,21,2 +0,Images\me.png:0:128,11,17,136,88,8,8,23,2 +0,Images\me.png:0:128,11,18,144,88,8,8,25,1 +0,Images\me.png:0:128,11,19,152,88,8,8,27,1 +0,Images\me.png:0:128,11,20,160,88,8,8,29,1 +0,Images\me.png:0:128,11,21,168,88,8,8,31,1 +0,Images\me.png:0:128,11,22,176,88,8,8,0,1 +0,Images\me.png:0:128,11,23,184,88,8,8,0,1 +0,Images\me.png:0:128,11,24,192,88,8,8,33,1 +0,Images\me.png:0:128,11,25,200,88,8,8,35,1 +0,Images\me.png:0:128,11,26,208,88,8,8,37,3 +0,Images\me.png:0:128,11,27,216,88,8,8,0,3 0,Images\me.png:0:128,11,28,224,88,8,8,0,0 0,Images\me.png:0:128,11,29,232,88,8,8,0,0 0,Images\me.png:0:128,11,30,240,88,8,8,0,0 @@ -389,26 +389,26 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 0,Images\me.png:0:128,12,3,24,96,8,8,0,0 0,Images\me.png:0:128,12,4,32,96,8,8,0,0 0,Images\me.png:0:128,12,5,40,96,8,8,0,0 -0,Images\me.png:0:128,12,6,48,96,8,8,41,3 -0,Images\me.png:0:128,12,7,56,96,8,8,43,3 -0,Images\me.png:0:128,12,8,64,96,8,8,45,2 -0,Images\me.png:0:128,12,9,72,96,8,8,47,2 -0,Images\me.png:0:128,12,10,80,96,8,8,49,2 -0,Images\me.png:0:128,12,11,88,96,8,8,51,2 -0,Images\me.png:0:128,12,12,96,96,8,8,53,2 -0,Images\me.png:0:128,12,13,104,96,8,8,55,2 -0,Images\me.png:0:128,12,14,112,96,8,8,57,1 -0,Images\me.png:0:128,12,15,120,96,8,8,4,1 -0,Images\me.png:0:128,12,16,128,96,8,8,4,1 -0,Images\me.png:0:128,12,17,136,96,8,8,59,1 -0,Images\me.png:0:128,12,18,144,96,8,8,61,2 -0,Images\me.png:0:128,12,19,152,96,8,8,63,2 -0,Images\me.png:0:128,12,20,160,96,8,8,65,2 -0,Images\me.png:0:128,12,21,168,96,8,8,67,2 -0,Images\me.png:0:128,12,22,176,96,8,8,69,2 -0,Images\me.png:0:128,12,23,184,96,8,8,71,2 -0,Images\me.png:0:128,12,24,192,96,8,8,73,2 -0,Images\me.png:0:128,12,25,200,96,8,8,75,2 +0,Images\me.png:0:128,12,6,48,96,8,8,39,3 +0,Images\me.png:0:128,12,7,56,96,8,8,41,3 +0,Images\me.png:0:128,12,8,64,96,8,8,43,1 +0,Images\me.png:0:128,12,9,72,96,8,8,45,1 +0,Images\me.png:0:128,12,10,80,96,8,8,47,1 +0,Images\me.png:0:128,12,11,88,96,8,8,49,1 +0,Images\me.png:0:128,12,12,96,96,8,8,51,1 +0,Images\me.png:0:128,12,13,104,96,8,8,53,1 +0,Images\me.png:0:128,12,14,112,96,8,8,55,2 +0,Images\me.png:0:128,12,15,120,96,8,8,57,2 +0,Images\me.png:0:128,12,16,128,96,8,8,57,2 +0,Images\me.png:0:128,12,17,136,96,8,8,59,2 +0,Images\me.png:0:128,12,18,144,96,8,8,61,1 +0,Images\me.png:0:128,12,19,152,96,8,8,63,1 +0,Images\me.png:0:128,12,20,160,96,8,8,65,1 +0,Images\me.png:0:128,12,21,168,96,8,8,67,1 +0,Images\me.png:0:128,12,22,176,96,8,8,69,1 +0,Images\me.png:0:128,12,23,184,96,8,8,71,1 +0,Images\me.png:0:128,12,24,192,96,8,8,73,1 +0,Images\me.png:0:128,12,25,200,96,8,8,75,1 0,Images\me.png:0:128,12,26,208,96,8,8,77,3 0,Images\me.png:0:128,12,27,216,96,8,8,79,3 0,Images\me.png:0:128,12,28,224,96,8,8,0,0 @@ -423,26 +423,26 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 0,Images\me.png:0:128,13,5,40,104,8,8,0,0 0,Images\me.png:0:128,13,6,48,104,8,8,81,3 0,Images\me.png:0:128,13,7,56,104,8,8,83,3 -0,Images\me.png:0:128,13,8,64,104,8,8,85,2 -0,Images\me.png:0:128,13,9,72,104,8,8,87,2 -0,Images\me.png:0:128,13,10,80,104,8,8,89,2 -0,Images\me.png:0:128,13,11,88,104,8,8,91,2 -0,Images\me.png:0:128,13,12,96,104,8,8,93,2 -0,Images\me.png:0:128,13,13,104,104,8,8,95,2 -0,Images\me.png:0:128,13,14,112,104,8,8,97,1 -0,Images\me.png:0:128,13,15,120,104,8,8,99,1 -0,Images\me.png:0:128,13,16,128,104,8,8,101,1 -0,Images\me.png:0:128,13,17,136,104,8,8,103,1 -0,Images\me.png:0:128,13,18,144,104,8,8,105,2 -0,Images\me.png:0:128,13,19,152,104,8,8,107,2 -0,Images\me.png:0:128,13,20,160,104,8,8,109,2 -0,Images\me.png:0:128,13,21,168,104,8,8,111,2 -0,Images\me.png:0:128,13,22,176,104,8,8,113,2 -0,Images\me.png:0:128,13,23,184,104,8,8,115,2 -0,Images\me.png:0:128,13,24,192,104,8,8,117,2 -0,Images\me.png:0:128,13,25,200,104,8,8,0,2 -0,Images\me.png:0:128,13,26,208,104,8,8,119,3 -0,Images\me.png:0:128,13,27,216,104,8,8,4,3 +0,Images\me.png:0:128,13,8,64,104,8,8,85,1 +0,Images\me.png:0:128,13,9,72,104,8,8,87,1 +0,Images\me.png:0:128,13,10,80,104,8,8,89,1 +0,Images\me.png:0:128,13,11,88,104,8,8,91,1 +0,Images\me.png:0:128,13,12,96,104,8,8,93,1 +0,Images\me.png:0:128,13,13,104,104,8,8,95,1 +0,Images\me.png:0:128,13,14,112,104,8,8,97,2 +0,Images\me.png:0:128,13,15,120,104,8,8,99,2 +0,Images\me.png:0:128,13,16,128,104,8,8,101,2 +0,Images\me.png:0:128,13,17,136,104,8,8,103,2 +0,Images\me.png:0:128,13,18,144,104,8,8,105,1 +0,Images\me.png:0:128,13,19,152,104,8,8,107,1 +0,Images\me.png:0:128,13,20,160,104,8,8,109,1 +0,Images\me.png:0:128,13,21,168,104,8,8,111,1 +0,Images\me.png:0:128,13,22,176,104,8,8,113,1 +0,Images\me.png:0:128,13,23,184,104,8,8,115,1 +0,Images\me.png:0:128,13,24,192,104,8,8,117,1 +0,Images\me.png:0:128,13,25,200,104,8,8,119,1 +0,Images\me.png:0:128,13,26,208,104,8,8,121,3 +0,Images\me.png:0:128,13,27,216,104,8,8,0,3 0,Images\me.png:0:128,13,28,224,104,8,8,0,0 0,Images\me.png:0:128,13,29,232,104,8,8,0,0 0,Images\me.png:0:128,13,30,240,104,8,8,0,0 @@ -453,28 +453,28 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 0,Images\me.png:0:128,14,3,24,112,8,8,0,0 0,Images\me.png:0:128,14,4,32,112,8,8,0,0 0,Images\me.png:0:128,14,5,40,112,8,8,0,0 -0,Images\me.png:0:128,14,6,48,112,8,8,121,3 -0,Images\me.png:0:128,14,7,56,112,8,8,123,3 -0,Images\me.png:0:128,14,8,64,112,8,8,125,3 -0,Images\me.png:0:128,14,9,72,112,8,8,127,3 -0,Images\me.png:0:128,14,10,80,112,8,8,129,2 -0,Images\me.png:0:128,14,11,88,112,8,8,131,2 -0,Images\me.png:0:128,14,12,96,112,8,8,133,2 -0,Images\me.png:0:128,14,13,104,112,8,8,135,2 -0,Images\me.png:0:128,14,14,112,112,8,8,137,3 -0,Images\me.png:0:128,14,15,120,112,8,8,139,3 -0,Images\me.png:0:128,14,16,128,112,8,8,141,3 -0,Images\me.png:0:128,14,17,136,112,8,8,143,3 -0,Images\me.png:0:128,14,18,144,112,8,8,145,3 -0,Images\me.png:0:128,14,19,152,112,8,8,147,3 -0,Images\me.png:0:128,14,20,160,112,8,8,149,2 -0,Images\me.png:0:128,14,21,168,112,8,8,151,2 -0,Images\me.png:0:128,14,22,176,112,8,8,153,2 -0,Images\me.png:0:128,14,23,184,112,8,8,155,2 -0,Images\me.png:0:128,14,24,192,112,8,8,157,2 -0,Images\me.png:0:128,14,25,200,112,8,8,159,2 -0,Images\me.png:0:128,14,26,208,112,8,8,161,3 -0,Images\me.png:0:128,14,27,216,112,8,8,4,3 +0,Images\me.png:0:128,14,6,48,112,8,8,123,3 +0,Images\me.png:0:128,14,7,56,112,8,8,125,3 +0,Images\me.png:0:128,14,8,64,112,8,8,127,3 +0,Images\me.png:0:128,14,9,72,112,8,8,129,3 +0,Images\me.png:0:128,14,10,80,112,8,8,131,1 +0,Images\me.png:0:128,14,11,88,112,8,8,133,1 +0,Images\me.png:0:128,14,12,96,112,8,8,135,1 +0,Images\me.png:0:128,14,13,104,112,8,8,137,1 +0,Images\me.png:0:128,14,14,112,112,8,8,139,3 +0,Images\me.png:0:128,14,15,120,112,8,8,141,3 +0,Images\me.png:0:128,14,16,128,112,8,8,143,3 +0,Images\me.png:0:128,14,17,136,112,8,8,145,3 +0,Images\me.png:0:128,14,18,144,112,8,8,147,3 +0,Images\me.png:0:128,14,19,152,112,8,8,149,3 +0,Images\me.png:0:128,14,20,160,112,8,8,151,1 +0,Images\me.png:0:128,14,21,168,112,8,8,153,1 +0,Images\me.png:0:128,14,22,176,112,8,8,155,1 +0,Images\me.png:0:128,14,23,184,112,8,8,157,1 +0,Images\me.png:0:128,14,24,192,112,8,8,159,1 +0,Images\me.png:0:128,14,25,200,112,8,8,161,1 +0,Images\me.png:0:128,14,26,208,112,8,8,163,3 +0,Images\me.png:0:128,14,27,216,112,8,8,0,3 0,Images\me.png:0:128,14,28,224,112,8,8,0,0 0,Images\me.png:0:128,14,29,232,112,8,8,0,0 0,Images\me.png:0:128,14,30,240,112,8,8,0,0 @@ -485,28 +485,28 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 0,Images\me.png:0:128,15,3,24,120,8,8,0,0 0,Images\me.png:0:128,15,4,32,120,8,8,0,0 0,Images\me.png:0:128,15,5,40,120,8,8,0,0 -0,Images\me.png:0:128,15,6,48,120,8,8,163,3 -0,Images\me.png:0:128,15,7,56,120,8,8,165,3 -0,Images\me.png:0:128,15,8,64,120,8,8,167,3 -0,Images\me.png:0:128,15,9,72,120,8,8,169,3 -0,Images\me.png:0:128,15,10,80,120,8,8,171,2 -0,Images\me.png:0:128,15,11,88,120,8,8,173,2 -0,Images\me.png:0:128,15,12,96,120,8,8,175,2 -0,Images\me.png:0:128,15,13,104,120,8,8,177,2 -0,Images\me.png:0:128,15,14,112,120,8,8,179,3 -0,Images\me.png:0:128,15,15,120,120,8,8,181,3 -0,Images\me.png:0:128,15,16,128,120,8,8,183,3 -0,Images\me.png:0:128,15,17,136,120,8,8,185,3 -0,Images\me.png:0:128,15,18,144,120,8,8,187,3 -0,Images\me.png:0:128,15,19,152,120,8,8,189,3 -0,Images\me.png:0:128,15,20,160,120,8,8,191,2 -0,Images\me.png:0:128,15,21,168,120,8,8,193,2 -0,Images\me.png:0:128,15,22,176,120,8,8,195,2 -0,Images\me.png:0:128,15,23,184,120,8,8,197,2 -0,Images\me.png:0:128,15,24,192,120,8,8,199,2 -0,Images\me.png:0:128,15,25,200,120,8,8,201,2 -0,Images\me.png:0:128,15,26,208,120,8,8,203,3 -0,Images\me.png:0:128,15,27,216,120,8,8,4,3 +0,Images\me.png:0:128,15,6,48,120,8,8,165,3 +0,Images\me.png:0:128,15,7,56,120,8,8,167,3 +0,Images\me.png:0:128,15,8,64,120,8,8,169,3 +0,Images\me.png:0:128,15,9,72,120,8,8,171,3 +0,Images\me.png:0:128,15,10,80,120,8,8,173,1 +0,Images\me.png:0:128,15,11,88,120,8,8,175,1 +0,Images\me.png:0:128,15,12,96,120,8,8,177,1 +0,Images\me.png:0:128,15,13,104,120,8,8,179,1 +0,Images\me.png:0:128,15,14,112,120,8,8,181,3 +0,Images\me.png:0:128,15,15,120,120,8,8,183,3 +0,Images\me.png:0:128,15,16,128,120,8,8,185,3 +0,Images\me.png:0:128,15,17,136,120,8,8,187,3 +0,Images\me.png:0:128,15,18,144,120,8,8,189,3 +0,Images\me.png:0:128,15,19,152,120,8,8,191,3 +0,Images\me.png:0:128,15,20,160,120,8,8,193,1 +0,Images\me.png:0:128,15,21,168,120,8,8,195,1 +0,Images\me.png:0:128,15,22,176,120,8,8,197,1 +0,Images\me.png:0:128,15,23,184,120,8,8,199,1 +0,Images\me.png:0:128,15,24,192,120,8,8,201,1 +0,Images\me.png:0:128,15,25,200,120,8,8,203,1 +0,Images\me.png:0:128,15,26,208,120,8,8,205,3 +0,Images\me.png:0:128,15,27,216,120,8,8,0,3 0,Images\me.png:0:128,15,28,224,120,8,8,0,0 0,Images\me.png:0:128,15,29,232,120,8,8,0,0 0,Images\me.png:0:128,15,30,240,120,8,8,0,0 @@ -517,28 +517,28 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 1,Images\me.png:128:112,0,3,24,0,8,8,0,0 1,Images\me.png:128:112,0,4,32,0,8,8,0,0 1,Images\me.png:128:112,0,5,40,0,8,8,0,0 -1,Images\me.png:128:112,0,6,48,0,8,8,2,3 -1,Images\me.png:128:112,0,7,56,0,8,8,4,3 -1,Images\me.png:128:112,0,8,64,0,8,8,2,3 -1,Images\me.png:128:112,0,9,72,0,8,8,6,3 -1,Images\me.png:128:112,0,10,80,0,8,8,8,3 -1,Images\me.png:128:112,0,11,88,0,8,8,10,3 -1,Images\me.png:128:112,0,12,96,0,8,8,12,1 -1,Images\me.png:128:112,0,13,104,0,8,8,14,1 -1,Images\me.png:128:112,0,14,112,0,8,8,16,3 -1,Images\me.png:128:112,0,15,120,0,8,8,18,3 -1,Images\me.png:128:112,0,16,128,0,8,8,20,3 -1,Images\me.png:128:112,0,17,136,0,8,8,22,3 -1,Images\me.png:128:112,0,18,144,0,8,8,24,3 -1,Images\me.png:128:112,0,19,152,0,8,8,26,3 -1,Images\me.png:128:112,0,20,160,0,8,8,28,1 -1,Images\me.png:128:112,0,21,168,0,8,8,30,1 -1,Images\me.png:128:112,0,22,176,0,8,8,32,1 -1,Images\me.png:128:112,0,23,184,0,8,8,34,1 -1,Images\me.png:128:112,0,24,192,0,8,8,36,3 -1,Images\me.png:128:112,0,25,200,0,8,8,38,3 -1,Images\me.png:128:112,0,26,208,0,8,8,40,3 -1,Images\me.png:128:112,0,27,216,0,8,8,2,3 +1,Images\me.png:128:112,0,6,48,0,8,8,0,3 +1,Images\me.png:128:112,0,7,56,0,8,8,2,3 +1,Images\me.png:128:112,0,8,64,0,8,8,0,3 +1,Images\me.png:128:112,0,9,72,0,8,8,4,3 +1,Images\me.png:128:112,0,10,80,0,8,8,6,3 +1,Images\me.png:128:112,0,11,88,0,8,8,8,3 +1,Images\me.png:128:112,0,12,96,0,8,8,10,2 +1,Images\me.png:128:112,0,13,104,0,8,8,12,2 +1,Images\me.png:128:112,0,14,112,0,8,8,14,3 +1,Images\me.png:128:112,0,15,120,0,8,8,16,3 +1,Images\me.png:128:112,0,16,128,0,8,8,18,3 +1,Images\me.png:128:112,0,17,136,0,8,8,20,3 +1,Images\me.png:128:112,0,18,144,0,8,8,22,3 +1,Images\me.png:128:112,0,19,152,0,8,8,24,3 +1,Images\me.png:128:112,0,20,160,0,8,8,26,2 +1,Images\me.png:128:112,0,21,168,0,8,8,28,2 +1,Images\me.png:128:112,0,22,176,0,8,8,30,2 +1,Images\me.png:128:112,0,23,184,0,8,8,32,2 +1,Images\me.png:128:112,0,24,192,0,8,8,34,3 +1,Images\me.png:128:112,0,25,200,0,8,8,36,3 +1,Images\me.png:128:112,0,26,208,0,8,8,38,3 +1,Images\me.png:128:112,0,27,216,0,8,8,0,3 1,Images\me.png:128:112,0,28,224,0,8,8,0,0 1,Images\me.png:128:112,0,29,232,0,8,8,0,0 1,Images\me.png:128:112,0,30,240,0,8,8,0,0 @@ -549,28 +549,28 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 1,Images\me.png:128:112,1,3,24,8,8,8,0,0 1,Images\me.png:128:112,1,4,32,8,8,8,0,0 1,Images\me.png:128:112,1,5,40,8,8,8,0,0 -1,Images\me.png:128:112,1,6,48,8,8,8,2,3 -1,Images\me.png:128:112,1,7,56,8,8,8,42,3 -1,Images\me.png:128:112,1,8,64,8,8,8,44,3 -1,Images\me.png:128:112,1,9,72,8,8,8,46,3 -1,Images\me.png:128:112,1,10,80,8,8,8,48,3 -1,Images\me.png:128:112,1,11,88,8,8,8,50,3 -1,Images\me.png:128:112,1,12,96,8,8,8,52,1 -1,Images\me.png:128:112,1,13,104,8,8,8,54,1 -1,Images\me.png:128:112,1,14,112,8,8,8,56,3 -1,Images\me.png:128:112,1,15,120,8,8,8,58,3 -1,Images\me.png:128:112,1,16,128,8,8,8,60,3 -1,Images\me.png:128:112,1,17,136,8,8,8,62,3 -1,Images\me.png:128:112,1,18,144,8,8,8,64,3 -1,Images\me.png:128:112,1,19,152,8,8,8,66,3 -1,Images\me.png:128:112,1,20,160,8,8,8,68,1 -1,Images\me.png:128:112,1,21,168,8,8,8,0,1 -1,Images\me.png:128:112,1,22,176,8,8,8,70,1 -1,Images\me.png:128:112,1,23,184,8,8,8,72,1 -1,Images\me.png:128:112,1,24,192,8,8,8,74,3 -1,Images\me.png:128:112,1,25,200,8,8,8,76,3 -1,Images\me.png:128:112,1,26,208,8,8,8,78,3 -1,Images\me.png:128:112,1,27,216,8,8,8,2,3 +1,Images\me.png:128:112,1,6,48,8,8,8,0,3 +1,Images\me.png:128:112,1,7,56,8,8,8,40,3 +1,Images\me.png:128:112,1,8,64,8,8,8,42,3 +1,Images\me.png:128:112,1,9,72,8,8,8,44,3 +1,Images\me.png:128:112,1,10,80,8,8,8,46,3 +1,Images\me.png:128:112,1,11,88,8,8,8,48,3 +1,Images\me.png:128:112,1,12,96,8,8,8,50,2 +1,Images\me.png:128:112,1,13,104,8,8,8,52,2 +1,Images\me.png:128:112,1,14,112,8,8,8,54,3 +1,Images\me.png:128:112,1,15,120,8,8,8,56,3 +1,Images\me.png:128:112,1,16,128,8,8,8,58,3 +1,Images\me.png:128:112,1,17,136,8,8,8,60,3 +1,Images\me.png:128:112,1,18,144,8,8,8,62,3 +1,Images\me.png:128:112,1,19,152,8,8,8,64,3 +1,Images\me.png:128:112,1,20,160,8,8,8,66,2 +1,Images\me.png:128:112,1,21,168,8,8,8,0,2 +1,Images\me.png:128:112,1,22,176,8,8,8,68,2 +1,Images\me.png:128:112,1,23,184,8,8,8,70,2 +1,Images\me.png:128:112,1,24,192,8,8,8,72,3 +1,Images\me.png:128:112,1,25,200,8,8,8,74,3 +1,Images\me.png:128:112,1,26,208,8,8,8,76,3 +1,Images\me.png:128:112,1,27,216,8,8,8,0,3 1,Images\me.png:128:112,1,28,224,8,8,8,0,0 1,Images\me.png:128:112,1,29,232,8,8,8,0,0 1,Images\me.png:128:112,1,30,240,8,8,8,0,0 @@ -582,25 +582,25 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 1,Images\me.png:128:112,2,4,32,16,8,8,0,0 1,Images\me.png:128:112,2,5,40,16,8,8,0,0 1,Images\me.png:128:112,2,6,48,16,8,8,0,0 -1,Images\me.png:128:112,2,7,56,16,8,8,80,0 -1,Images\me.png:128:112,2,8,64,16,8,8,82,1 -1,Images\me.png:128:112,2,9,72,16,8,8,0,1 -1,Images\me.png:128:112,2,10,80,16,8,8,84,1 -1,Images\me.png:128:112,2,11,88,16,8,8,86,1 -1,Images\me.png:128:112,2,12,96,16,8,8,0,1 -1,Images\me.png:128:112,2,13,104,16,8,8,88,1 -1,Images\me.png:128:112,2,14,112,16,8,8,90,1 -1,Images\me.png:128:112,2,15,120,16,8,8,92,1 -1,Images\me.png:128:112,2,16,128,16,8,8,94,1 -1,Images\me.png:128:112,2,17,136,16,8,8,96,1 -1,Images\me.png:128:112,2,18,144,16,8,8,98,1 -1,Images\me.png:128:112,2,19,152,16,8,8,100,1 -1,Images\me.png:128:112,2,20,160,16,8,8,0,1 -1,Images\me.png:128:112,2,21,168,16,8,8,0,1 -1,Images\me.png:128:112,2,22,176,16,8,8,102,1 -1,Images\me.png:128:112,2,23,184,16,8,8,104,1 -1,Images\me.png:128:112,2,24,192,16,8,8,106,3 -1,Images\me.png:128:112,2,25,200,16,8,8,108,3 +1,Images\me.png:128:112,2,7,56,16,8,8,78,0 +1,Images\me.png:128:112,2,8,64,16,8,8,80,2 +1,Images\me.png:128:112,2,9,72,16,8,8,0,2 +1,Images\me.png:128:112,2,10,80,16,8,8,82,2 +1,Images\me.png:128:112,2,11,88,16,8,8,84,2 +1,Images\me.png:128:112,2,12,96,16,8,8,0,2 +1,Images\me.png:128:112,2,13,104,16,8,8,86,2 +1,Images\me.png:128:112,2,14,112,16,8,8,88,2 +1,Images\me.png:128:112,2,15,120,16,8,8,90,2 +1,Images\me.png:128:112,2,16,128,16,8,8,92,2 +1,Images\me.png:128:112,2,17,136,16,8,8,94,2 +1,Images\me.png:128:112,2,18,144,16,8,8,96,2 +1,Images\me.png:128:112,2,19,152,16,8,8,98,2 +1,Images\me.png:128:112,2,20,160,16,8,8,0,2 +1,Images\me.png:128:112,2,21,168,16,8,8,0,2 +1,Images\me.png:128:112,2,22,176,16,8,8,100,2 +1,Images\me.png:128:112,2,23,184,16,8,8,102,2 +1,Images\me.png:128:112,2,24,192,16,8,8,104,3 +1,Images\me.png:128:112,2,25,200,16,8,8,106,3 1,Images\me.png:128:112,2,26,208,16,8,8,0,0 1,Images\me.png:128:112,2,27,216,16,8,8,0,0 1,Images\me.png:128:112,2,28,224,16,8,8,0,0 @@ -615,24 +615,24 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 1,Images\me.png:128:112,3,5,40,24,8,8,0,0 1,Images\me.png:128:112,3,6,48,24,8,8,0,0 1,Images\me.png:128:112,3,7,56,24,8,8,0,0 -1,Images\me.png:128:112,3,8,64,24,8,8,110,1 -1,Images\me.png:128:112,3,9,72,24,8,8,112,1 -1,Images\me.png:128:112,3,10,80,24,8,8,114,1 -1,Images\me.png:128:112,3,11,88,24,8,8,116,1 -1,Images\me.png:128:112,3,12,96,24,8,8,0,1 -1,Images\me.png:128:112,3,13,104,24,8,8,118,1 -1,Images\me.png:128:112,3,14,112,24,8,8,120,1 -1,Images\me.png:128:112,3,15,120,24,8,8,122,1 -1,Images\me.png:128:112,3,16,128,24,8,8,124,1 -1,Images\me.png:128:112,3,17,136,24,8,8,126,1 -1,Images\me.png:128:112,3,18,144,24,8,8,128,1 -1,Images\me.png:128:112,3,19,152,24,8,8,0,1 -1,Images\me.png:128:112,3,20,160,24,8,8,0,1 -1,Images\me.png:128:112,3,21,168,24,8,8,0,1 -1,Images\me.png:128:112,3,22,176,24,8,8,130,1 -1,Images\me.png:128:112,3,23,184,24,8,8,132,1 -1,Images\me.png:128:112,3,24,192,24,8,8,134,3 -1,Images\me.png:128:112,3,25,200,24,8,8,2,3 +1,Images\me.png:128:112,3,8,64,24,8,8,108,2 +1,Images\me.png:128:112,3,9,72,24,8,8,110,2 +1,Images\me.png:128:112,3,10,80,24,8,8,112,2 +1,Images\me.png:128:112,3,11,88,24,8,8,114,2 +1,Images\me.png:128:112,3,12,96,24,8,8,0,2 +1,Images\me.png:128:112,3,13,104,24,8,8,116,2 +1,Images\me.png:128:112,3,14,112,24,8,8,118,2 +1,Images\me.png:128:112,3,15,120,24,8,8,120,2 +1,Images\me.png:128:112,3,16,128,24,8,8,122,2 +1,Images\me.png:128:112,3,17,136,24,8,8,124,2 +1,Images\me.png:128:112,3,18,144,24,8,8,126,2 +1,Images\me.png:128:112,3,19,152,24,8,8,0,2 +1,Images\me.png:128:112,3,20,160,24,8,8,0,2 +1,Images\me.png:128:112,3,21,168,24,8,8,0,2 +1,Images\me.png:128:112,3,22,176,24,8,8,128,2 +1,Images\me.png:128:112,3,23,184,24,8,8,130,2 +1,Images\me.png:128:112,3,24,192,24,8,8,132,3 +1,Images\me.png:128:112,3,25,200,24,8,8,0,3 1,Images\me.png:128:112,3,26,208,24,8,8,0,0 1,Images\me.png:128:112,3,27,216,24,8,8,0,0 1,Images\me.png:128:112,3,28,224,24,8,8,0,0 @@ -647,24 +647,24 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 1,Images\me.png:128:112,4,5,40,32,8,8,0,0 1,Images\me.png:128:112,4,6,48,32,8,8,0,0 1,Images\me.png:128:112,4,7,56,32,8,8,0,0 -1,Images\me.png:128:112,4,8,64,32,8,8,136,3 -1,Images\me.png:128:112,4,9,72,32,8,8,138,3 -1,Images\me.png:128:112,4,10,80,32,8,8,140,1 -1,Images\me.png:128:112,4,11,88,32,8,8,0,1 -1,Images\me.png:128:112,4,12,96,32,8,8,0,1 -1,Images\me.png:128:112,4,13,104,32,8,8,0,1 -1,Images\me.png:128:112,4,14,112,32,8,8,142,1 -1,Images\me.png:128:112,4,15,120,32,8,8,144,1 -1,Images\me.png:128:112,4,16,128,32,8,8,146,1 -1,Images\me.png:128:112,4,17,136,32,8,8,148,1 -1,Images\me.png:128:112,4,18,144,32,8,8,0,1 -1,Images\me.png:128:112,4,19,152,32,8,8,0,1 -1,Images\me.png:128:112,4,20,160,32,8,8,0,1 -1,Images\me.png:128:112,4,21,168,32,8,8,0,1 -1,Images\me.png:128:112,4,22,176,32,8,8,150,1 -1,Images\me.png:128:112,4,23,184,32,8,8,152,1 -1,Images\me.png:128:112,4,24,192,32,8,8,154,3 -1,Images\me.png:128:112,4,25,200,32,8,8,2,3 +1,Images\me.png:128:112,4,8,64,32,8,8,134,3 +1,Images\me.png:128:112,4,9,72,32,8,8,136,3 +1,Images\me.png:128:112,4,10,80,32,8,8,138,2 +1,Images\me.png:128:112,4,11,88,32,8,8,0,2 +1,Images\me.png:128:112,4,12,96,32,8,8,0,2 +1,Images\me.png:128:112,4,13,104,32,8,8,0,2 +1,Images\me.png:128:112,4,14,112,32,8,8,140,2 +1,Images\me.png:128:112,4,15,120,32,8,8,142,2 +1,Images\me.png:128:112,4,16,128,32,8,8,144,2 +1,Images\me.png:128:112,4,17,136,32,8,8,146,2 +1,Images\me.png:128:112,4,18,144,32,8,8,0,2 +1,Images\me.png:128:112,4,19,152,32,8,8,0,2 +1,Images\me.png:128:112,4,20,160,32,8,8,0,2 +1,Images\me.png:128:112,4,21,168,32,8,8,0,2 +1,Images\me.png:128:112,4,22,176,32,8,8,148,2 +1,Images\me.png:128:112,4,23,184,32,8,8,150,2 +1,Images\me.png:128:112,4,24,192,32,8,8,152,3 +1,Images\me.png:128:112,4,25,200,32,8,8,0,3 1,Images\me.png:128:112,4,26,208,32,8,8,0,0 1,Images\me.png:128:112,4,27,216,32,8,8,0,0 1,Images\me.png:128:112,4,28,224,32,8,8,0,0 @@ -679,24 +679,24 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 1,Images\me.png:128:112,5,5,40,40,8,8,0,0 1,Images\me.png:128:112,5,6,48,40,8,8,0,0 1,Images\me.png:128:112,5,7,56,40,8,8,0,0 -1,Images\me.png:128:112,5,8,64,40,8,8,156,3 -1,Images\me.png:128:112,5,9,72,40,8,8,158,3 -1,Images\me.png:128:112,5,10,80,40,8,8,160,1 -1,Images\me.png:128:112,5,11,88,40,8,8,162,1 -1,Images\me.png:128:112,5,12,96,40,8,8,164,1 -1,Images\me.png:128:112,5,13,104,40,8,8,0,1 -1,Images\me.png:128:112,5,14,112,40,8,8,0,1 -1,Images\me.png:128:112,5,15,120,40,8,8,166,1 -1,Images\me.png:128:112,5,16,128,40,8,8,168,1 -1,Images\me.png:128:112,5,17,136,40,8,8,0,1 -1,Images\me.png:128:112,5,18,144,40,8,8,170,1 -1,Images\me.png:128:112,5,19,152,40,8,8,172,1 -1,Images\me.png:128:112,5,20,160,40,8,8,0,1 -1,Images\me.png:128:112,5,21,168,40,8,8,174,1 -1,Images\me.png:128:112,5,22,176,40,8,8,176,1 -1,Images\me.png:128:112,5,23,184,40,8,8,178,1 -1,Images\me.png:128:112,5,24,192,40,8,8,180,3 -1,Images\me.png:128:112,5,25,200,40,8,8,182,3 +1,Images\me.png:128:112,5,8,64,40,8,8,154,3 +1,Images\me.png:128:112,5,9,72,40,8,8,156,3 +1,Images\me.png:128:112,5,10,80,40,8,8,158,2 +1,Images\me.png:128:112,5,11,88,40,8,8,160,2 +1,Images\me.png:128:112,5,12,96,40,8,8,162,2 +1,Images\me.png:128:112,5,13,104,40,8,8,0,2 +1,Images\me.png:128:112,5,14,112,40,8,8,0,2 +1,Images\me.png:128:112,5,15,120,40,8,8,164,2 +1,Images\me.png:128:112,5,16,128,40,8,8,166,2 +1,Images\me.png:128:112,5,17,136,40,8,8,0,2 +1,Images\me.png:128:112,5,18,144,40,8,8,168,2 +1,Images\me.png:128:112,5,19,152,40,8,8,170,2 +1,Images\me.png:128:112,5,20,160,40,8,8,0,2 +1,Images\me.png:128:112,5,21,168,40,8,8,172,2 +1,Images\me.png:128:112,5,22,176,40,8,8,174,2 +1,Images\me.png:128:112,5,23,184,40,8,8,176,2 +1,Images\me.png:128:112,5,24,192,40,8,8,178,3 +1,Images\me.png:128:112,5,25,200,40,8,8,180,3 1,Images\me.png:128:112,5,26,208,40,8,8,0,0 1,Images\me.png:128:112,5,27,216,40,8,8,0,0 1,Images\me.png:128:112,5,28,224,40,8,8,0,0 @@ -711,24 +711,24 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 1,Images\me.png:128:112,6,5,40,48,8,8,0,0 1,Images\me.png:128:112,6,6,48,48,8,8,0,0 1,Images\me.png:128:112,6,7,56,48,8,8,0,0 -1,Images\me.png:128:112,6,8,64,48,8,8,184,3 -1,Images\me.png:128:112,6,9,72,48,8,8,186,3 -1,Images\me.png:128:112,6,10,80,48,8,8,188,3 -1,Images\me.png:128:112,6,11,88,48,8,8,190,3 -1,Images\me.png:128:112,6,12,96,48,8,8,192,1 -1,Images\me.png:128:112,6,13,104,48,8,8,0,1 -1,Images\me.png:128:112,6,14,112,48,8,8,0,1 -1,Images\me.png:128:112,6,15,120,48,8,8,0,1 -1,Images\me.png:128:112,6,16,128,48,8,8,0,1 -1,Images\me.png:128:112,6,17,136,48,8,8,194,1 -1,Images\me.png:128:112,6,18,144,48,8,8,196,1 -1,Images\me.png:128:112,6,19,152,48,8,8,198,1 -1,Images\me.png:128:112,6,20,160,48,8,8,200,1 -1,Images\me.png:128:112,6,21,168,48,8,8,202,1 -1,Images\me.png:128:112,6,22,176,48,8,8,204,1 -1,Images\me.png:128:112,6,23,184,48,8,8,206,1 -1,Images\me.png:128:112,6,24,192,48,8,8,208,1 -1,Images\me.png:128:112,6,25,200,48,8,8,210,1 +1,Images\me.png:128:112,6,8,64,48,8,8,182,3 +1,Images\me.png:128:112,6,9,72,48,8,8,184,3 +1,Images\me.png:128:112,6,10,80,48,8,8,186,3 +1,Images\me.png:128:112,6,11,88,48,8,8,188,3 +1,Images\me.png:128:112,6,12,96,48,8,8,190,2 +1,Images\me.png:128:112,6,13,104,48,8,8,0,2 +1,Images\me.png:128:112,6,14,112,48,8,8,0,2 +1,Images\me.png:128:112,6,15,120,48,8,8,0,2 +1,Images\me.png:128:112,6,16,128,48,8,8,0,2 +1,Images\me.png:128:112,6,17,136,48,8,8,192,2 +1,Images\me.png:128:112,6,18,144,48,8,8,194,2 +1,Images\me.png:128:112,6,19,152,48,8,8,196,2 +1,Images\me.png:128:112,6,20,160,48,8,8,198,2 +1,Images\me.png:128:112,6,21,168,48,8,8,200,2 +1,Images\me.png:128:112,6,22,176,48,8,8,202,2 +1,Images\me.png:128:112,6,23,184,48,8,8,204,2 +1,Images\me.png:128:112,6,24,192,48,8,8,206,2 +1,Images\me.png:128:112,6,25,200,48,8,8,208,2 1,Images\me.png:128:112,6,26,208,48,8,8,0,0 1,Images\me.png:128:112,6,27,216,48,8,8,0,0 1,Images\me.png:128:112,6,28,224,48,8,8,0,0 @@ -743,24 +743,24 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 1,Images\me.png:128:112,7,5,40,56,8,8,0,0 1,Images\me.png:128:112,7,6,48,56,8,8,0,0 1,Images\me.png:128:112,7,7,56,56,8,8,0,0 -1,Images\me.png:128:112,7,8,64,56,8,8,212,3 -1,Images\me.png:128:112,7,9,72,56,8,8,214,3 -1,Images\me.png:128:112,7,10,80,56,8,8,216,3 -1,Images\me.png:128:112,7,11,88,56,8,8,218,3 -1,Images\me.png:128:112,7,12,96,56,8,8,0,1 -1,Images\me.png:128:112,7,13,104,56,8,8,0,1 -1,Images\me.png:128:112,7,14,112,56,8,8,0,1 -1,Images\me.png:128:112,7,15,120,56,8,8,0,1 -1,Images\me.png:128:112,7,16,128,56,8,8,220,1 -1,Images\me.png:128:112,7,17,136,56,8,8,222,1 -1,Images\me.png:128:112,7,18,144,56,8,8,224,1 -1,Images\me.png:128:112,7,19,152,56,8,8,226,1 -1,Images\me.png:128:112,7,20,160,56,8,8,2,1 -1,Images\me.png:128:112,7,21,168,56,8,8,228,1 -1,Images\me.png:128:112,7,22,176,56,8,8,230,1 -1,Images\me.png:128:112,7,23,184,56,8,8,232,1 -1,Images\me.png:128:112,7,24,192,56,8,8,234,1 -1,Images\me.png:128:112,7,25,200,56,8,8,236,1 +1,Images\me.png:128:112,7,8,64,56,8,8,210,3 +1,Images\me.png:128:112,7,9,72,56,8,8,212,3 +1,Images\me.png:128:112,7,10,80,56,8,8,214,3 +1,Images\me.png:128:112,7,11,88,56,8,8,216,3 +1,Images\me.png:128:112,7,12,96,56,8,8,0,2 +1,Images\me.png:128:112,7,13,104,56,8,8,0,2 +1,Images\me.png:128:112,7,14,112,56,8,8,0,2 +1,Images\me.png:128:112,7,15,120,56,8,8,0,2 +1,Images\me.png:128:112,7,16,128,56,8,8,218,2 +1,Images\me.png:128:112,7,17,136,56,8,8,220,2 +1,Images\me.png:128:112,7,18,144,56,8,8,222,2 +1,Images\me.png:128:112,7,19,152,56,8,8,224,2 +1,Images\me.png:128:112,7,20,160,56,8,8,14,2 +1,Images\me.png:128:112,7,21,168,56,8,8,226,2 +1,Images\me.png:128:112,7,22,176,56,8,8,228,2 +1,Images\me.png:128:112,7,23,184,56,8,8,230,2 +1,Images\me.png:128:112,7,24,192,56,8,8,232,2 +1,Images\me.png:128:112,7,25,200,56,8,8,234,2 1,Images\me.png:128:112,7,26,208,56,8,8,0,0 1,Images\me.png:128:112,7,27,216,56,8,8,0,0 1,Images\me.png:128:112,7,28,224,56,8,8,0,0 @@ -776,25 +776,25 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 1,Images\me.png:128:112,8,6,48,64,8,8,0,0 1,Images\me.png:128:112,8,7,56,64,8,8,0,0 1,Images\me.png:128:112,8,8,64,64,8,8,0,0 -1,Images\me.png:128:112,8,9,72,64,8,8,238,0 -1,Images\me.png:128:112,8,10,80,64,8,8,240,1 -1,Images\me.png:128:112,8,11,88,64,8,8,242,1 -1,Images\me.png:128:112,8,12,96,64,8,8,0,1 -1,Images\me.png:128:112,8,13,104,64,8,8,0,1 -1,Images\me.png:128:112,8,14,112,64,8,8,244,1 -1,Images\me.png:128:112,8,15,120,64,8,8,246,1 -1,Images\me.png:128:112,8,16,128,64,8,8,248,1 -1,Images\me.png:128:112,8,17,136,64,8,8,250,1 -1,Images\me.png:128:112,8,18,144,64,8,8,2,1 -1,Images\me.png:128:112,8,19,152,64,8,8,2,1 -1,Images\me.png:128:112,8,20,160,64,8,8,252,1 -1,Images\me.png:128:112,8,21,168,64,8,8,254,1 -1,Images\me.png:128:112,8,22,176,64,8,8,0,1 -1,Images\me.png:128:112,8,23,184,64,8,8,1,1 -1,Images\me.png:128:112,8,24,192,64,8,8,3,1 -1,Images\me.png:128:112,8,25,200,64,8,8,5,1 -1,Images\me.png:128:112,8,26,208,64,8,8,2,3 -1,Images\me.png:128:112,8,27,216,64,8,8,2,3 +1,Images\me.png:128:112,8,9,72,64,8,8,236,0 +1,Images\me.png:128:112,8,10,80,64,8,8,238,2 +1,Images\me.png:128:112,8,11,88,64,8,8,240,2 +1,Images\me.png:128:112,8,12,96,64,8,8,0,2 +1,Images\me.png:128:112,8,13,104,64,8,8,0,2 +1,Images\me.png:128:112,8,14,112,64,8,8,242,2 +1,Images\me.png:128:112,8,15,120,64,8,8,244,2 +1,Images\me.png:128:112,8,16,128,64,8,8,246,2 +1,Images\me.png:128:112,8,17,136,64,8,8,248,2 +1,Images\me.png:128:112,8,18,144,64,8,8,14,2 +1,Images\me.png:128:112,8,19,152,64,8,8,14,2 +1,Images\me.png:128:112,8,20,160,64,8,8,250,2 +1,Images\me.png:128:112,8,21,168,64,8,8,252,2 +1,Images\me.png:128:112,8,22,176,64,8,8,0,2 +1,Images\me.png:128:112,8,23,184,64,8,8,254,2 +1,Images\me.png:128:112,8,24,192,64,8,8,1,2 +1,Images\me.png:128:112,8,25,200,64,8,8,3,2 +1,Images\me.png:128:112,8,26,208,64,8,8,0,3 +1,Images\me.png:128:112,8,27,216,64,8,8,0,3 1,Images\me.png:128:112,8,28,224,64,8,8,0,0 1,Images\me.png:128:112,8,29,232,64,8,8,0,0 1,Images\me.png:128:112,8,30,240,64,8,8,0,0 @@ -809,24 +809,24 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 1,Images\me.png:128:112,9,7,56,72,8,8,0,0 1,Images\me.png:128:112,9,8,64,72,8,8,0,0 1,Images\me.png:128:112,9,9,72,72,8,8,0,0 -1,Images\me.png:128:112,9,10,80,72,8,8,7,1 -1,Images\me.png:128:112,9,11,88,72,8,8,9,1 -1,Images\me.png:128:112,9,12,96,72,8,8,11,1 -1,Images\me.png:128:112,9,13,104,72,8,8,13,1 -1,Images\me.png:128:112,9,14,112,72,8,8,15,1 -1,Images\me.png:128:112,9,15,120,72,8,8,17,1 -1,Images\me.png:128:112,9,16,128,72,8,8,19,1 -1,Images\me.png:128:112,9,17,136,72,8,8,21,1 -1,Images\me.png:128:112,9,18,144,72,8,8,23,1 -1,Images\me.png:128:112,9,19,152,72,8,8,2,1 -1,Images\me.png:128:112,9,20,160,72,8,8,25,1 -1,Images\me.png:128:112,9,21,168,72,8,8,0,1 -1,Images\me.png:128:112,9,22,176,72,8,8,0,1 -1,Images\me.png:128:112,9,23,184,72,8,8,27,1 -1,Images\me.png:128:112,9,24,192,72,8,8,29,1 -1,Images\me.png:128:112,9,25,200,72,8,8,31,1 -1,Images\me.png:128:112,9,26,208,72,8,8,33,3 -1,Images\me.png:128:112,9,27,216,72,8,8,2,3 +1,Images\me.png:128:112,9,10,80,72,8,8,5,2 +1,Images\me.png:128:112,9,11,88,72,8,8,7,2 +1,Images\me.png:128:112,9,12,96,72,8,8,9,2 +1,Images\me.png:128:112,9,13,104,72,8,8,11,2 +1,Images\me.png:128:112,9,14,112,72,8,8,13,2 +1,Images\me.png:128:112,9,15,120,72,8,8,15,2 +1,Images\me.png:128:112,9,16,128,72,8,8,17,2 +1,Images\me.png:128:112,9,17,136,72,8,8,19,2 +1,Images\me.png:128:112,9,18,144,72,8,8,21,2 +1,Images\me.png:128:112,9,19,152,72,8,8,14,2 +1,Images\me.png:128:112,9,20,160,72,8,8,23,2 +1,Images\me.png:128:112,9,21,168,72,8,8,0,2 +1,Images\me.png:128:112,9,22,176,72,8,8,0,2 +1,Images\me.png:128:112,9,23,184,72,8,8,25,2 +1,Images\me.png:128:112,9,24,192,72,8,8,27,2 +1,Images\me.png:128:112,9,25,200,72,8,8,29,2 +1,Images\me.png:128:112,9,26,208,72,8,8,31,3 +1,Images\me.png:128:112,9,27,216,72,8,8,0,3 1,Images\me.png:128:112,9,28,224,72,8,8,0,0 1,Images\me.png:128:112,9,29,232,72,8,8,0,0 1,Images\me.png:128:112,9,30,240,72,8,8,0,0 @@ -841,24 +841,24 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 1,Images\me.png:128:112,10,7,56,80,8,8,0,0 1,Images\me.png:128:112,10,8,64,80,8,8,0,0 1,Images\me.png:128:112,10,9,72,80,8,8,0,0 -1,Images\me.png:128:112,10,10,80,80,8,8,2,3 -1,Images\me.png:128:112,10,11,88,80,8,8,35,3 -1,Images\me.png:128:112,10,12,96,80,8,8,37,3 -1,Images\me.png:128:112,10,13,104,80,8,8,39,3 -1,Images\me.png:128:112,10,14,112,80,8,8,41,3 -1,Images\me.png:128:112,10,15,120,80,8,8,43,3 -1,Images\me.png:128:112,10,16,128,80,8,8,45,1 -1,Images\me.png:128:112,10,17,136,80,8,8,47,1 -1,Images\me.png:128:112,10,18,144,80,8,8,49,1 -1,Images\me.png:128:112,10,19,152,80,8,8,51,1 -1,Images\me.png:128:112,10,20,160,80,8,8,53,1 -1,Images\me.png:128:112,10,21,168,80,8,8,0,1 -1,Images\me.png:128:112,10,22,176,80,8,8,0,1 -1,Images\me.png:128:112,10,23,184,80,8,8,0,1 -1,Images\me.png:128:112,10,24,192,80,8,8,55,1 -1,Images\me.png:128:112,10,25,200,80,8,8,57,1 -1,Images\me.png:128:112,10,26,208,80,8,8,59,3 -1,Images\me.png:128:112,10,27,216,80,8,8,2,3 +1,Images\me.png:128:112,10,10,80,80,8,8,0,3 +1,Images\me.png:128:112,10,11,88,80,8,8,33,3 +1,Images\me.png:128:112,10,12,96,80,8,8,35,3 +1,Images\me.png:128:112,10,13,104,80,8,8,37,3 +1,Images\me.png:128:112,10,14,112,80,8,8,39,3 +1,Images\me.png:128:112,10,15,120,80,8,8,41,3 +1,Images\me.png:128:112,10,16,128,80,8,8,43,2 +1,Images\me.png:128:112,10,17,136,80,8,8,45,2 +1,Images\me.png:128:112,10,18,144,80,8,8,47,2 +1,Images\me.png:128:112,10,19,152,80,8,8,49,2 +1,Images\me.png:128:112,10,20,160,80,8,8,51,2 +1,Images\me.png:128:112,10,21,168,80,8,8,0,2 +1,Images\me.png:128:112,10,22,176,80,8,8,0,2 +1,Images\me.png:128:112,10,23,184,80,8,8,0,2 +1,Images\me.png:128:112,10,24,192,80,8,8,53,2 +1,Images\me.png:128:112,10,25,200,80,8,8,55,2 +1,Images\me.png:128:112,10,26,208,80,8,8,57,3 +1,Images\me.png:128:112,10,27,216,80,8,8,0,3 1,Images\me.png:128:112,10,28,224,80,8,8,0,0 1,Images\me.png:128:112,10,29,232,80,8,8,0,0 1,Images\me.png:128:112,10,30,240,80,8,8,0,0 @@ -873,24 +873,24 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 1,Images\me.png:128:112,11,7,56,88,8,8,0,0 1,Images\me.png:128:112,11,8,64,88,8,8,0,0 1,Images\me.png:128:112,11,9,72,88,8,8,0,0 -1,Images\me.png:128:112,11,10,80,88,8,8,2,3 -1,Images\me.png:128:112,11,11,88,88,8,8,2,3 -1,Images\me.png:128:112,11,12,96,88,8,8,2,3 -1,Images\me.png:128:112,11,13,104,88,8,8,2,3 -1,Images\me.png:128:112,11,14,112,88,8,8,61,3 -1,Images\me.png:128:112,11,15,120,88,8,8,63,3 -1,Images\me.png:128:112,11,16,128,88,8,8,65,1 -1,Images\me.png:128:112,11,17,136,88,8,8,67,1 -1,Images\me.png:128:112,11,18,144,88,8,8,69,1 -1,Images\me.png:128:112,11,19,152,88,8,8,71,1 -1,Images\me.png:128:112,11,20,160,88,8,8,0,1 -1,Images\me.png:128:112,11,21,168,88,8,8,0,1 -1,Images\me.png:128:112,11,22,176,88,8,8,0,1 -1,Images\me.png:128:112,11,23,184,88,8,8,0,1 -1,Images\me.png:128:112,11,24,192,88,8,8,73,1 -1,Images\me.png:128:112,11,25,200,88,8,8,75,1 -1,Images\me.png:128:112,11,26,208,88,8,8,77,3 -1,Images\me.png:128:112,11,27,216,88,8,8,2,3 +1,Images\me.png:128:112,11,10,80,88,8,8,0,3 +1,Images\me.png:128:112,11,11,88,88,8,8,0,3 +1,Images\me.png:128:112,11,12,96,88,8,8,0,3 +1,Images\me.png:128:112,11,13,104,88,8,8,0,3 +1,Images\me.png:128:112,11,14,112,88,8,8,59,3 +1,Images\me.png:128:112,11,15,120,88,8,8,61,3 +1,Images\me.png:128:112,11,16,128,88,8,8,63,2 +1,Images\me.png:128:112,11,17,136,88,8,8,65,2 +1,Images\me.png:128:112,11,18,144,88,8,8,67,2 +1,Images\me.png:128:112,11,19,152,88,8,8,69,2 +1,Images\me.png:128:112,11,20,160,88,8,8,0,2 +1,Images\me.png:128:112,11,21,168,88,8,8,0,2 +1,Images\me.png:128:112,11,22,176,88,8,8,0,2 +1,Images\me.png:128:112,11,23,184,88,8,8,0,2 +1,Images\me.png:128:112,11,24,192,88,8,8,71,2 +1,Images\me.png:128:112,11,25,200,88,8,8,73,2 +1,Images\me.png:128:112,11,26,208,88,8,8,75,3 +1,Images\me.png:128:112,11,27,216,88,8,8,0,3 1,Images\me.png:128:112,11,28,224,88,8,8,0,0 1,Images\me.png:128:112,11,29,232,88,8,8,0,0 1,Images\me.png:128:112,11,30,240,88,8,8,0,0 @@ -909,20 +909,20 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 1,Images\me.png:128:112,12,11,88,96,8,8,0,0 1,Images\me.png:128:112,12,12,96,96,8,8,0,0 1,Images\me.png:128:112,12,13,104,96,8,8,0,0 -1,Images\me.png:128:112,12,14,112,96,8,8,79,3 -1,Images\me.png:128:112,12,15,120,96,8,8,81,3 -1,Images\me.png:128:112,12,16,128,96,8,8,83,1 -1,Images\me.png:128:112,12,17,136,96,8,8,85,1 -1,Images\me.png:128:112,12,18,144,96,8,8,87,1 -1,Images\me.png:128:112,12,19,152,96,8,8,0,1 -1,Images\me.png:128:112,12,20,160,96,8,8,0,1 -1,Images\me.png:128:112,12,21,168,96,8,8,0,1 -1,Images\me.png:128:112,12,22,176,96,8,8,0,1 -1,Images\me.png:128:112,12,23,184,96,8,8,0,1 -1,Images\me.png:128:112,12,24,192,96,8,8,0,1 -1,Images\me.png:128:112,12,25,200,96,8,8,89,1 -1,Images\me.png:128:112,12,26,208,96,8,8,91,3 -1,Images\me.png:128:112,12,27,216,96,8,8,93,3 +1,Images\me.png:128:112,12,14,112,96,8,8,77,3 +1,Images\me.png:128:112,12,15,120,96,8,8,79,3 +1,Images\me.png:128:112,12,16,128,96,8,8,81,2 +1,Images\me.png:128:112,12,17,136,96,8,8,83,2 +1,Images\me.png:128:112,12,18,144,96,8,8,85,2 +1,Images\me.png:128:112,12,19,152,96,8,8,0,2 +1,Images\me.png:128:112,12,20,160,96,8,8,0,2 +1,Images\me.png:128:112,12,21,168,96,8,8,0,2 +1,Images\me.png:128:112,12,22,176,96,8,8,0,2 +1,Images\me.png:128:112,12,23,184,96,8,8,0,2 +1,Images\me.png:128:112,12,24,192,96,8,8,0,2 +1,Images\me.png:128:112,12,25,200,96,8,8,87,2 +1,Images\me.png:128:112,12,26,208,96,8,8,89,3 +1,Images\me.png:128:112,12,27,216,96,8,8,91,3 1,Images\me.png:128:112,12,28,224,96,8,8,0,0 1,Images\me.png:128:112,12,29,232,96,8,8,0,0 1,Images\me.png:128:112,12,30,240,96,8,8,0,0 @@ -941,20 +941,20 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 1,Images\me.png:128:112,13,11,88,104,8,8,0,0 1,Images\me.png:128:112,13,12,96,104,8,8,0,0 1,Images\me.png:128:112,13,13,104,104,8,8,0,0 -1,Images\me.png:128:112,13,14,112,104,8,8,95,3 -1,Images\me.png:128:112,13,15,120,104,8,8,97,3 -1,Images\me.png:128:112,13,16,128,104,8,8,99,1 -1,Images\me.png:128:112,13,17,136,104,8,8,101,1 -1,Images\me.png:128:112,13,18,144,104,8,8,0,1 -1,Images\me.png:128:112,13,19,152,104,8,8,0,1 -1,Images\me.png:128:112,13,20,160,104,8,8,0,1 -1,Images\me.png:128:112,13,21,168,104,8,8,0,1 -1,Images\me.png:128:112,13,22,176,104,8,8,0,1 -1,Images\me.png:128:112,13,23,184,104,8,8,0,1 -1,Images\me.png:128:112,13,24,192,104,8,8,0,1 -1,Images\me.png:128:112,13,25,200,104,8,8,103,1 -1,Images\me.png:128:112,13,26,208,104,8,8,105,3 -1,Images\me.png:128:112,13,27,216,104,8,8,107,3 +1,Images\me.png:128:112,13,14,112,104,8,8,93,3 +1,Images\me.png:128:112,13,15,120,104,8,8,95,3 +1,Images\me.png:128:112,13,16,128,104,8,8,97,2 +1,Images\me.png:128:112,13,17,136,104,8,8,99,2 +1,Images\me.png:128:112,13,18,144,104,8,8,0,2 +1,Images\me.png:128:112,13,19,152,104,8,8,0,2 +1,Images\me.png:128:112,13,20,160,104,8,8,0,2 +1,Images\me.png:128:112,13,21,168,104,8,8,0,2 +1,Images\me.png:128:112,13,22,176,104,8,8,0,2 +1,Images\me.png:128:112,13,23,184,104,8,8,0,2 +1,Images\me.png:128:112,13,24,192,104,8,8,0,2 +1,Images\me.png:128:112,13,25,200,104,8,8,101,2 +1,Images\me.png:128:112,13,26,208,104,8,8,103,3 +1,Images\me.png:128:112,13,27,216,104,8,8,105,3 1,Images\me.png:128:112,13,28,224,104,8,8,0,0 1,Images\me.png:128:112,13,29,232,104,8,8,0,0 1,Images\me.png:128:112,13,30,240,104,8,8,0,0 diff --git a/Tests/References/myatej_name_table_2.bin b/Tests/References/myatej_name_table_2.bin index cfd83c6..34d9268 100644 Binary files a/Tests/References/myatej_name_table_2.bin and b/Tests/References/myatej_name_table_2.bin differ diff --git a/Tests/References/myatej_palette_0.bin b/Tests/References/myatej_palette_0.bin index 2f52914..20b2671 100644 --- a/Tests/References/myatej_palette_0.bin +++ b/Tests/References/myatej_palette_0.bin @@ -1 +1 @@ -2 -= \ No newline at end of file +2-= \ No newline at end of file diff --git a/Tests/References/myatej_palette_1.bin b/Tests/References/myatej_palette_1.bin index c5522a6..bb2fca1 100644 Binary files a/Tests/References/myatej_palette_1.bin and b/Tests/References/myatej_palette_1.bin differ diff --git a/Tests/References/myatej_palette_2.bin b/Tests/References/myatej_palette_2.bin index 3853064..7f7215a 100644 Binary files a/Tests/References/myatej_palette_2.bin and b/Tests/References/myatej_palette_2.bin differ diff --git a/Tests/References/myatej_palette_3.bin b/Tests/References/myatej_palette_3.bin index 8382859..53eef14 100644 --- a/Tests/References/myatej_palette_3.bin +++ b/Tests/References/myatej_palette_3.bin @@ -1 +1 @@ -2-0) \ No newline at end of file +2-)0 \ No newline at end of file diff --git a/Tests/References/myatej_palettes.csv b/Tests/References/myatej_palettes.csv index 8e2e60f..3dbdd5f 100644 --- a/Tests/References/myatej_palettes.csv +++ b/Tests/References/myatej_palettes.csv @@ -1,5 +1,5 @@ palette_id,color0,color1,color2,color3 -0,#C4D4FC,#FCFCFC,#787878,#C4C4C4 -1,#C4D4FC,#402C00,#BCBCBC,#747474 -2,#C4D4FC,#FCD8A8,#747474,#FFFFFF -3,#C4D4FC,#787878,#FFFFFF,#80D010 +0,#C4D4FC,#787878,#C4C4C4,#FCFCFC +1,#C4D4FC,#402C00,#747474,#BCBCBC +2,#C4D4FC,#747474,#FCD8A8,#FFFFFF +3,#C4D4FC,#787878,#80D010,#FFFFFF diff --git a/Tests/References/myatej_pattern_0.bin b/Tests/References/myatej_pattern_0.bin index 67c4b7c..f0dca5a 100644 Binary files a/Tests/References/myatej_pattern_0.bin and b/Tests/References/myatej_pattern_0.bin differ diff --git a/Tests/References/myatej_pattern_1.bin b/Tests/References/myatej_pattern_1.bin index 5d3214f..c6cb499 100644 Binary files a/Tests/References/myatej_pattern_1.bin and b/Tests/References/myatej_pattern_1.bin differ diff --git a/Tests/References/myatej_pattern_2.bin b/Tests/References/myatej_pattern_2.bin index 66d2341..53ea6bb 100644 Binary files a/Tests/References/myatej_pattern_2.bin and b/Tests/References/myatej_pattern_2.bin differ diff --git a/Tests/References/myatej_pattern_3.bin b/Tests/References/myatej_pattern_3.bin index f063a84..a97bfc7 100644 Binary files a/Tests/References/myatej_pattern_3.bin and b/Tests/References/myatej_pattern_3.bin differ diff --git a/Tests/References/myatej_tiles.csv b/Tests/References/myatej_tiles.csv index 0754eb0..d69c3b7 100644 --- a/Tests/References/myatej_tiles.csv +++ b/Tests/References/myatej_tiles.csv @@ -747,26 +747,26 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 2,Images\myatej.gif:128:64,7,9,72,56,8,8,141,0 2,Images\myatej.gif:128:64,7,10,80,56,8,8,143,1 2,Images\myatej.gif:128:64,7,11,88,56,8,8,145,1 -2,Images\myatej.gif:128:64,7,12,96,56,8,8,147,1 -2,Images\myatej.gif:128:64,7,13,104,56,8,8,149,1 -2,Images\myatej.gif:128:64,7,14,112,56,8,8,151,3 -2,Images\myatej.gif:128:64,7,15,120,56,8,8,153,3 -2,Images\myatej.gif:128:64,7,16,128,56,8,8,155,3 -2,Images\myatej.gif:128:64,7,17,136,56,8,8,157,3 -2,Images\myatej.gif:128:64,7,18,144,56,8,8,159,3 -2,Images\myatej.gif:128:64,7,19,152,56,8,8,161,3 -2,Images\myatej.gif:128:64,7,20,160,56,8,8,163,2 -2,Images\myatej.gif:128:64,7,21,168,56,8,8,165,2 -2,Images\myatej.gif:128:64,7,22,176,56,8,8,167,2 -2,Images\myatej.gif:128:64,7,23,184,56,8,8,169,2 -2,Images\myatej.gif:128:64,7,24,192,56,8,8,171,0 -2,Images\myatej.gif:128:64,7,25,200,56,8,8,173,0 -2,Images\myatej.gif:128:64,7,26,208,56,8,8,175,0 -2,Images\myatej.gif:128:64,7,27,216,56,8,8,177,0 -2,Images\myatej.gif:128:64,7,28,224,56,8,8,179,1 -2,Images\myatej.gif:128:64,7,29,232,56,8,8,181,1 -2,Images\myatej.gif:128:64,7,30,240,56,8,8,183,1 -2,Images\myatej.gif:128:64,7,31,248,56,8,8,185,1 +2,Images\myatej.gif:128:64,7,12,96,56,8,8,18,1 +2,Images\myatej.gif:128:64,7,13,104,56,8,8,147,1 +2,Images\myatej.gif:128:64,7,14,112,56,8,8,149,3 +2,Images\myatej.gif:128:64,7,15,120,56,8,8,151,3 +2,Images\myatej.gif:128:64,7,16,128,56,8,8,153,3 +2,Images\myatej.gif:128:64,7,17,136,56,8,8,155,3 +2,Images\myatej.gif:128:64,7,18,144,56,8,8,157,3 +2,Images\myatej.gif:128:64,7,19,152,56,8,8,159,3 +2,Images\myatej.gif:128:64,7,20,160,56,8,8,161,2 +2,Images\myatej.gif:128:64,7,21,168,56,8,8,163,2 +2,Images\myatej.gif:128:64,7,22,176,56,8,8,165,2 +2,Images\myatej.gif:128:64,7,23,184,56,8,8,167,2 +2,Images\myatej.gif:128:64,7,24,192,56,8,8,169,0 +2,Images\myatej.gif:128:64,7,25,200,56,8,8,171,0 +2,Images\myatej.gif:128:64,7,26,208,56,8,8,173,0 +2,Images\myatej.gif:128:64,7,27,216,56,8,8,175,0 +2,Images\myatej.gif:128:64,7,28,224,56,8,8,177,1 +2,Images\myatej.gif:128:64,7,29,232,56,8,8,179,1 +2,Images\myatej.gif:128:64,7,30,240,56,8,8,181,1 +2,Images\myatej.gif:128:64,7,31,248,56,8,8,183,1 3,Images\myatej.gif:192:48,0,0,0,0,8,8,0,0 3,Images\myatej.gif:192:48,0,1,8,0,8,8,2,0 3,Images\myatej.gif:192:48,0,2,16,0,8,8,4,0 diff --git a/Tests/References/pagoda_name_table_0.bin b/Tests/References/pagoda_name_table_0.bin index 34d3f7c..707b4ee 100644 Binary files a/Tests/References/pagoda_name_table_0.bin and b/Tests/References/pagoda_name_table_0.bin differ diff --git a/Tests/References/pagoda_name_table_1.bin b/Tests/References/pagoda_name_table_1.bin index 7c4ece6..1827c03 100644 Binary files a/Tests/References/pagoda_name_table_1.bin and b/Tests/References/pagoda_name_table_1.bin differ diff --git a/Tests/References/pagoda_name_table_2.bin b/Tests/References/pagoda_name_table_2.bin index a887cc4..63f2692 100644 Binary files a/Tests/References/pagoda_name_table_2.bin and b/Tests/References/pagoda_name_table_2.bin differ diff --git a/Tests/References/pagoda_name_table_3.bin b/Tests/References/pagoda_name_table_3.bin index 72daa47..edcd3b6 100644 Binary files a/Tests/References/pagoda_name_table_3.bin and b/Tests/References/pagoda_name_table_3.bin differ diff --git a/Tests/References/pagoda_palette_0.bin b/Tests/References/pagoda_palette_0.bin index 42a2ecd..2e8bfed 100644 --- a/Tests/References/pagoda_palette_0.bin +++ b/Tests/References/pagoda_palette_0.bin @@ -1 +1 @@ - %1 \ No newline at end of file + 1% \ No newline at end of file diff --git a/Tests/References/pagoda_palette_1.bin b/Tests/References/pagoda_palette_1.bin index f4a95f7..0046f73 100644 --- a/Tests/References/pagoda_palette_1.bin +++ b/Tests/References/pagoda_palette_1.bin @@ -1 +1 @@ - - \ No newline at end of file + - \ No newline at end of file diff --git a/Tests/References/pagoda_palette_2.bin b/Tests/References/pagoda_palette_2.bin index 760b433..40fe36d 100644 --- a/Tests/References/pagoda_palette_2.bin +++ b/Tests/References/pagoda_palette_2.bin @@ -1 +1 @@ - 3 \ No newline at end of file + 3 \ No newline at end of file diff --git a/Tests/References/pagoda_palettes.csv b/Tests/References/pagoda_palettes.csv index 1293f95..ae832df 100644 --- a/Tests/References/pagoda_palettes.csv +++ b/Tests/References/pagoda_palettes.csv @@ -1,4 +1,4 @@ palette_id,color0,color1,color2,color3 -0,#183C5C,#000000,#FC74B4,#A8E4FC -1,#183C5C,#000000,#787878,#402C00 -2,#183C5C,#BCBCBC,#D4C8FC,#000000 +0,#183C5C,#000000,#A8E4FC,#FC74B4 +1,#183C5C,#000000,#402C00,#787878 +2,#183C5C,#000000,#BCBCBC,#D4C8FC diff --git a/Tests/References/pagoda_pattern_0.bin b/Tests/References/pagoda_pattern_0.bin index 243b2ec..0de5c51 100644 Binary files a/Tests/References/pagoda_pattern_0.bin and b/Tests/References/pagoda_pattern_0.bin differ diff --git a/Tests/References/pagoda_pattern_1.bin b/Tests/References/pagoda_pattern_1.bin index 4f77b6d..615b325 100644 Binary files a/Tests/References/pagoda_pattern_1.bin and b/Tests/References/pagoda_pattern_1.bin differ diff --git a/Tests/References/pagoda_pattern_2.bin b/Tests/References/pagoda_pattern_2.bin index d2007da..d901021 100644 Binary files a/Tests/References/pagoda_pattern_2.bin and b/Tests/References/pagoda_pattern_2.bin differ diff --git a/Tests/References/pagoda_pattern_3.bin b/Tests/References/pagoda_pattern_3.bin index 686fef6..09ba3b2 100644 Binary files a/Tests/References/pagoda_pattern_3.bin and b/Tests/References/pagoda_pattern_3.bin differ diff --git a/Tests/References/pagoda_tiles.csv b/Tests/References/pagoda_tiles.csv index 552b6a9..51ff119 100644 --- a/Tests/References/pagoda_tiles.csv +++ b/Tests/References/pagoda_tiles.csv @@ -191,70 +191,70 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 0,Images\pagoda.gif:0:64,5,29,232,40,8,8,91,0 0,Images\pagoda.gif:0:64,5,30,240,40,8,8,93,2 0,Images\pagoda.gif:0:64,5,31,248,40,8,8,95,2 -0,Images\pagoda.gif:0:64,6,0,0,48,8,8,8,2 -0,Images\pagoda.gif:0:64,6,1,8,48,8,8,8,2 -0,Images\pagoda.gif:0:64,6,2,16,48,8,8,8,2 -0,Images\pagoda.gif:0:64,6,3,24,48,8,8,97,2 -0,Images\pagoda.gif:0:64,6,4,32,48,8,8,99,2 -0,Images\pagoda.gif:0:64,6,5,40,48,8,8,101,2 -0,Images\pagoda.gif:0:64,6,6,48,48,8,8,103,0 -0,Images\pagoda.gif:0:64,6,7,56,48,8,8,105,0 -0,Images\pagoda.gif:0:64,6,8,64,48,8,8,107,0 -0,Images\pagoda.gif:0:64,6,9,72,48,8,8,109,0 -0,Images\pagoda.gif:0:64,6,10,80,48,8,8,111,0 -0,Images\pagoda.gif:0:64,6,11,88,48,8,8,113,0 -0,Images\pagoda.gif:0:64,6,12,96,48,8,8,115,0 -0,Images\pagoda.gif:0:64,6,13,104,48,8,8,117,0 -0,Images\pagoda.gif:0:64,6,14,112,48,8,8,119,0 -0,Images\pagoda.gif:0:64,6,15,120,48,8,8,121,0 -0,Images\pagoda.gif:0:64,6,16,128,48,8,8,123,0 -0,Images\pagoda.gif:0:64,6,17,136,48,8,8,125,0 -0,Images\pagoda.gif:0:64,6,18,144,48,8,8,127,0 -0,Images\pagoda.gif:0:64,6,19,152,48,8,8,129,0 -0,Images\pagoda.gif:0:64,6,20,160,48,8,8,131,0 -0,Images\pagoda.gif:0:64,6,21,168,48,8,8,133,0 -0,Images\pagoda.gif:0:64,6,22,176,48,8,8,135,0 -0,Images\pagoda.gif:0:64,6,23,184,48,8,8,137,0 -0,Images\pagoda.gif:0:64,6,24,192,48,8,8,139,0 -0,Images\pagoda.gif:0:64,6,25,200,48,8,8,141,0 -0,Images\pagoda.gif:0:64,6,26,208,48,8,8,143,0 -0,Images\pagoda.gif:0:64,6,27,216,48,8,8,145,0 -0,Images\pagoda.gif:0:64,6,28,224,48,8,8,147,0 -0,Images\pagoda.gif:0:64,6,29,232,48,8,8,149,0 -0,Images\pagoda.gif:0:64,6,30,240,48,8,8,151,2 -0,Images\pagoda.gif:0:64,6,31,248,48,8,8,153,2 -0,Images\pagoda.gif:0:64,7,0,0,56,8,8,155,2 -0,Images\pagoda.gif:0:64,7,1,8,56,8,8,157,2 -0,Images\pagoda.gif:0:64,7,2,16,56,8,8,159,2 -0,Images\pagoda.gif:0:64,7,3,24,56,8,8,161,2 -0,Images\pagoda.gif:0:64,7,4,32,56,8,8,163,2 -0,Images\pagoda.gif:0:64,7,5,40,56,8,8,165,2 -0,Images\pagoda.gif:0:64,7,6,48,56,8,8,167,0 -0,Images\pagoda.gif:0:64,7,7,56,56,8,8,169,0 -0,Images\pagoda.gif:0:64,7,8,64,56,8,8,171,0 -0,Images\pagoda.gif:0:64,7,9,72,56,8,8,173,0 -0,Images\pagoda.gif:0:64,7,10,80,56,8,8,175,0 -0,Images\pagoda.gif:0:64,7,11,88,56,8,8,177,0 -0,Images\pagoda.gif:0:64,7,12,96,56,8,8,179,0 -0,Images\pagoda.gif:0:64,7,13,104,56,8,8,181,0 -0,Images\pagoda.gif:0:64,7,14,112,56,8,8,183,0 -0,Images\pagoda.gif:0:64,7,15,120,56,8,8,185,0 -0,Images\pagoda.gif:0:64,7,16,128,56,8,8,187,0 -0,Images\pagoda.gif:0:64,7,17,136,56,8,8,189,0 -0,Images\pagoda.gif:0:64,7,18,144,56,8,8,191,0 -0,Images\pagoda.gif:0:64,7,19,152,56,8,8,193,0 -0,Images\pagoda.gif:0:64,7,20,160,56,8,8,195,0 -0,Images\pagoda.gif:0:64,7,21,168,56,8,8,197,0 -0,Images\pagoda.gif:0:64,7,22,176,56,8,8,199,0 -0,Images\pagoda.gif:0:64,7,23,184,56,8,8,201,0 -0,Images\pagoda.gif:0:64,7,24,192,56,8,8,203,0 -0,Images\pagoda.gif:0:64,7,25,200,56,8,8,205,0 -0,Images\pagoda.gif:0:64,7,26,208,56,8,8,207,0 -0,Images\pagoda.gif:0:64,7,27,216,56,8,8,209,0 -0,Images\pagoda.gif:0:64,7,28,224,56,8,8,211,0 -0,Images\pagoda.gif:0:64,7,29,232,56,8,8,213,0 -0,Images\pagoda.gif:0:64,7,30,240,56,8,8,215,2 -0,Images\pagoda.gif:0:64,7,31,248,56,8,8,217,2 +0,Images\pagoda.gif:0:64,6,0,0,48,8,8,97,2 +0,Images\pagoda.gif:0:64,6,1,8,48,8,8,97,2 +0,Images\pagoda.gif:0:64,6,2,16,48,8,8,97,2 +0,Images\pagoda.gif:0:64,6,3,24,48,8,8,99,2 +0,Images\pagoda.gif:0:64,6,4,32,48,8,8,101,2 +0,Images\pagoda.gif:0:64,6,5,40,48,8,8,103,2 +0,Images\pagoda.gif:0:64,6,6,48,48,8,8,105,0 +0,Images\pagoda.gif:0:64,6,7,56,48,8,8,107,0 +0,Images\pagoda.gif:0:64,6,8,64,48,8,8,109,0 +0,Images\pagoda.gif:0:64,6,9,72,48,8,8,111,0 +0,Images\pagoda.gif:0:64,6,10,80,48,8,8,113,0 +0,Images\pagoda.gif:0:64,6,11,88,48,8,8,115,0 +0,Images\pagoda.gif:0:64,6,12,96,48,8,8,117,0 +0,Images\pagoda.gif:0:64,6,13,104,48,8,8,119,0 +0,Images\pagoda.gif:0:64,6,14,112,48,8,8,121,0 +0,Images\pagoda.gif:0:64,6,15,120,48,8,8,123,0 +0,Images\pagoda.gif:0:64,6,16,128,48,8,8,125,0 +0,Images\pagoda.gif:0:64,6,17,136,48,8,8,127,0 +0,Images\pagoda.gif:0:64,6,18,144,48,8,8,129,0 +0,Images\pagoda.gif:0:64,6,19,152,48,8,8,131,0 +0,Images\pagoda.gif:0:64,6,20,160,48,8,8,133,0 +0,Images\pagoda.gif:0:64,6,21,168,48,8,8,135,0 +0,Images\pagoda.gif:0:64,6,22,176,48,8,8,137,0 +0,Images\pagoda.gif:0:64,6,23,184,48,8,8,139,0 +0,Images\pagoda.gif:0:64,6,24,192,48,8,8,141,0 +0,Images\pagoda.gif:0:64,6,25,200,48,8,8,143,0 +0,Images\pagoda.gif:0:64,6,26,208,48,8,8,145,0 +0,Images\pagoda.gif:0:64,6,27,216,48,8,8,147,0 +0,Images\pagoda.gif:0:64,6,28,224,48,8,8,149,0 +0,Images\pagoda.gif:0:64,6,29,232,48,8,8,151,0 +0,Images\pagoda.gif:0:64,6,30,240,48,8,8,153,2 +0,Images\pagoda.gif:0:64,6,31,248,48,8,8,155,2 +0,Images\pagoda.gif:0:64,7,0,0,56,8,8,157,2 +0,Images\pagoda.gif:0:64,7,1,8,56,8,8,159,2 +0,Images\pagoda.gif:0:64,7,2,16,56,8,8,161,2 +0,Images\pagoda.gif:0:64,7,3,24,56,8,8,163,2 +0,Images\pagoda.gif:0:64,7,4,32,56,8,8,165,2 +0,Images\pagoda.gif:0:64,7,5,40,56,8,8,167,2 +0,Images\pagoda.gif:0:64,7,6,48,56,8,8,169,0 +0,Images\pagoda.gif:0:64,7,7,56,56,8,8,171,0 +0,Images\pagoda.gif:0:64,7,8,64,56,8,8,173,0 +0,Images\pagoda.gif:0:64,7,9,72,56,8,8,175,0 +0,Images\pagoda.gif:0:64,7,10,80,56,8,8,177,0 +0,Images\pagoda.gif:0:64,7,11,88,56,8,8,179,0 +0,Images\pagoda.gif:0:64,7,12,96,56,8,8,181,0 +0,Images\pagoda.gif:0:64,7,13,104,56,8,8,183,0 +0,Images\pagoda.gif:0:64,7,14,112,56,8,8,185,0 +0,Images\pagoda.gif:0:64,7,15,120,56,8,8,187,0 +0,Images\pagoda.gif:0:64,7,16,128,56,8,8,189,0 +0,Images\pagoda.gif:0:64,7,17,136,56,8,8,191,0 +0,Images\pagoda.gif:0:64,7,18,144,56,8,8,193,0 +0,Images\pagoda.gif:0:64,7,19,152,56,8,8,195,0 +0,Images\pagoda.gif:0:64,7,20,160,56,8,8,197,0 +0,Images\pagoda.gif:0:64,7,21,168,56,8,8,199,0 +0,Images\pagoda.gif:0:64,7,22,176,56,8,8,201,0 +0,Images\pagoda.gif:0:64,7,23,184,56,8,8,203,0 +0,Images\pagoda.gif:0:64,7,24,192,56,8,8,205,0 +0,Images\pagoda.gif:0:64,7,25,200,56,8,8,207,0 +0,Images\pagoda.gif:0:64,7,26,208,56,8,8,209,0 +0,Images\pagoda.gif:0:64,7,27,216,56,8,8,211,0 +0,Images\pagoda.gif:0:64,7,28,224,56,8,8,213,0 +0,Images\pagoda.gif:0:64,7,29,232,56,8,8,215,0 +0,Images\pagoda.gif:0:64,7,30,240,56,8,8,217,2 +0,Images\pagoda.gif:0:64,7,31,248,56,8,8,219,2 1,Images\pagoda.gif:64:64,0,0,0,0,8,8,0,2 1,Images\pagoda.gif:64:64,0,1,8,0,8,8,2,2 1,Images\pagoda.gif:64:64,0,2,16,0,8,8,4,2 @@ -313,112 +313,112 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 1,Images\pagoda.gif:64:64,1,23,184,8,8,8,108,0 1,Images\pagoda.gif:64:64,1,24,192,8,8,8,110,0 1,Images\pagoda.gif:64:64,1,25,200,8,8,8,112,0 -1,Images\pagoda.gif:64:64,1,26,208,8,8,8,16,0 -1,Images\pagoda.gif:64:64,1,27,216,8,8,8,114,0 -1,Images\pagoda.gif:64:64,1,28,224,8,8,8,116,0 -1,Images\pagoda.gif:64:64,1,29,232,8,8,8,118,0 -1,Images\pagoda.gif:64:64,1,30,240,8,8,8,120,2 -1,Images\pagoda.gif:64:64,1,31,248,8,8,8,122,2 -1,Images\pagoda.gif:64:64,2,0,0,16,8,8,124,2 -1,Images\pagoda.gif:64:64,2,1,8,16,8,8,126,2 -1,Images\pagoda.gif:64:64,2,2,16,16,8,8,128,2 -1,Images\pagoda.gif:64:64,2,3,24,16,8,8,130,2 -1,Images\pagoda.gif:64:64,2,4,32,16,8,8,132,2 -1,Images\pagoda.gif:64:64,2,5,40,16,8,8,134,2 -1,Images\pagoda.gif:64:64,2,6,48,16,8,8,136,2 -1,Images\pagoda.gif:64:64,2,7,56,16,8,8,138,2 -1,Images\pagoda.gif:64:64,2,8,64,16,8,8,140,2 -1,Images\pagoda.gif:64:64,2,9,72,16,8,8,142,2 -1,Images\pagoda.gif:64:64,2,10,80,16,8,8,144,2 -1,Images\pagoda.gif:64:64,2,11,88,16,8,8,146,2 -1,Images\pagoda.gif:64:64,2,12,96,16,8,8,148,0 -1,Images\pagoda.gif:64:64,2,13,104,16,8,8,150,0 -1,Images\pagoda.gif:64:64,2,14,112,16,8,8,152,0 -1,Images\pagoda.gif:64:64,2,15,120,16,8,8,154,0 -1,Images\pagoda.gif:64:64,2,16,128,16,8,8,156,0 -1,Images\pagoda.gif:64:64,2,17,136,16,8,8,158,0 -1,Images\pagoda.gif:64:64,2,18,144,16,8,8,160,0 -1,Images\pagoda.gif:64:64,2,19,152,16,8,8,162,0 -1,Images\pagoda.gif:64:64,2,20,160,16,8,8,164,0 -1,Images\pagoda.gif:64:64,2,21,168,16,8,8,166,0 -1,Images\pagoda.gif:64:64,2,22,176,16,8,8,168,0 -1,Images\pagoda.gif:64:64,2,23,184,16,8,8,170,0 -1,Images\pagoda.gif:64:64,2,24,192,16,8,8,172,0 -1,Images\pagoda.gif:64:64,2,25,200,16,8,8,174,0 -1,Images\pagoda.gif:64:64,2,26,208,16,8,8,176,0 -1,Images\pagoda.gif:64:64,2,27,216,16,8,8,178,0 -1,Images\pagoda.gif:64:64,2,28,224,16,8,8,180,0 -1,Images\pagoda.gif:64:64,2,29,232,16,8,8,182,0 -1,Images\pagoda.gif:64:64,2,30,240,16,8,8,184,2 -1,Images\pagoda.gif:64:64,2,31,248,16,8,8,186,2 -1,Images\pagoda.gif:64:64,3,0,0,24,8,8,188,2 -1,Images\pagoda.gif:64:64,3,1,8,24,8,8,190,2 -1,Images\pagoda.gif:64:64,3,2,16,24,8,8,192,2 -1,Images\pagoda.gif:64:64,3,3,24,24,8,8,194,2 -1,Images\pagoda.gif:64:64,3,4,32,24,8,8,196,2 -1,Images\pagoda.gif:64:64,3,5,40,24,8,8,198,2 -1,Images\pagoda.gif:64:64,3,6,48,24,8,8,200,2 -1,Images\pagoda.gif:64:64,3,7,56,24,8,8,202,2 -1,Images\pagoda.gif:64:64,3,8,64,24,8,8,204,2 -1,Images\pagoda.gif:64:64,3,9,72,24,8,8,206,2 -1,Images\pagoda.gif:64:64,3,10,80,24,8,8,208,2 -1,Images\pagoda.gif:64:64,3,11,88,24,8,8,210,2 -1,Images\pagoda.gif:64:64,3,12,96,24,8,8,212,0 -1,Images\pagoda.gif:64:64,3,13,104,24,8,8,214,0 -1,Images\pagoda.gif:64:64,3,14,112,24,8,8,216,0 -1,Images\pagoda.gif:64:64,3,15,120,24,8,8,218,0 -1,Images\pagoda.gif:64:64,3,16,128,24,8,8,220,0 -1,Images\pagoda.gif:64:64,3,17,136,24,8,8,222,0 -1,Images\pagoda.gif:64:64,3,18,144,24,8,8,224,0 -1,Images\pagoda.gif:64:64,3,19,152,24,8,8,226,0 -1,Images\pagoda.gif:64:64,3,20,160,24,8,8,228,0 -1,Images\pagoda.gif:64:64,3,21,168,24,8,8,230,0 -1,Images\pagoda.gif:64:64,3,22,176,24,8,8,232,0 -1,Images\pagoda.gif:64:64,3,23,184,24,8,8,234,0 -1,Images\pagoda.gif:64:64,3,24,192,24,8,8,236,0 -1,Images\pagoda.gif:64:64,3,25,200,24,8,8,238,0 -1,Images\pagoda.gif:64:64,3,26,208,24,8,8,240,0 -1,Images\pagoda.gif:64:64,3,27,216,24,8,8,242,0 -1,Images\pagoda.gif:64:64,3,28,224,24,8,8,244,0 -1,Images\pagoda.gif:64:64,3,29,232,24,8,8,246,0 -1,Images\pagoda.gif:64:64,3,30,240,24,8,8,248,2 -1,Images\pagoda.gif:64:64,3,31,248,24,8,8,250,2 -1,Images\pagoda.gif:64:64,4,0,0,32,8,8,252,2 -1,Images\pagoda.gif:64:64,4,1,8,32,8,8,254,2 -1,Images\pagoda.gif:64:64,4,2,16,32,8,8,1,2 -1,Images\pagoda.gif:64:64,4,3,24,32,8,8,3,2 -1,Images\pagoda.gif:64:64,4,4,32,32,8,8,5,2 -1,Images\pagoda.gif:64:64,4,5,40,32,8,8,7,2 -1,Images\pagoda.gif:64:64,4,6,48,32,8,8,9,2 -1,Images\pagoda.gif:64:64,4,7,56,32,8,8,11,2 -1,Images\pagoda.gif:64:64,4,8,64,32,8,8,13,2 -1,Images\pagoda.gif:64:64,4,9,72,32,8,8,15,2 -1,Images\pagoda.gif:64:64,4,10,80,32,8,8,17,2 -1,Images\pagoda.gif:64:64,4,11,88,32,8,8,19,2 -1,Images\pagoda.gif:64:64,4,12,96,32,8,8,21,2 -1,Images\pagoda.gif:64:64,4,13,104,32,8,8,23,2 -1,Images\pagoda.gif:64:64,4,14,112,32,8,8,25,2 -1,Images\pagoda.gif:64:64,4,15,120,32,8,8,27,2 -1,Images\pagoda.gif:64:64,4,16,128,32,8,8,29,0 -1,Images\pagoda.gif:64:64,4,17,136,32,8,8,31,0 -1,Images\pagoda.gif:64:64,4,18,144,32,8,8,33,0 -1,Images\pagoda.gif:64:64,4,19,152,32,8,8,35,0 -1,Images\pagoda.gif:64:64,4,20,160,32,8,8,37,0 -1,Images\pagoda.gif:64:64,4,21,168,32,8,8,39,0 -1,Images\pagoda.gif:64:64,4,22,176,32,8,8,41,0 -1,Images\pagoda.gif:64:64,4,23,184,32,8,8,43,0 -1,Images\pagoda.gif:64:64,4,24,192,32,8,8,45,0 -1,Images\pagoda.gif:64:64,4,25,200,32,8,8,47,0 -1,Images\pagoda.gif:64:64,4,26,208,32,8,8,49,0 -1,Images\pagoda.gif:64:64,4,27,216,32,8,8,51,0 -1,Images\pagoda.gif:64:64,4,28,224,32,8,8,53,0 -1,Images\pagoda.gif:64:64,4,29,232,32,8,8,55,0 -1,Images\pagoda.gif:64:64,4,30,240,32,8,8,57,0 -1,Images\pagoda.gif:64:64,4,31,248,32,8,8,59,0 -1,Images\pagoda.gif:64:64,5,0,0,40,8,8,61,2 -1,Images\pagoda.gif:64:64,5,1,8,40,8,8,63,2 -1,Images\pagoda.gif:64:64,5,2,16,40,8,8,65,2 -1,Images\pagoda.gif:64:64,5,3,24,40,8,8,67,2 +1,Images\pagoda.gif:64:64,1,26,208,8,8,8,114,0 +1,Images\pagoda.gif:64:64,1,27,216,8,8,8,116,0 +1,Images\pagoda.gif:64:64,1,28,224,8,8,8,118,0 +1,Images\pagoda.gif:64:64,1,29,232,8,8,8,120,0 +1,Images\pagoda.gif:64:64,1,30,240,8,8,8,122,2 +1,Images\pagoda.gif:64:64,1,31,248,8,8,8,124,2 +1,Images\pagoda.gif:64:64,2,0,0,16,8,8,126,2 +1,Images\pagoda.gif:64:64,2,1,8,16,8,8,128,2 +1,Images\pagoda.gif:64:64,2,2,16,16,8,8,130,2 +1,Images\pagoda.gif:64:64,2,3,24,16,8,8,132,2 +1,Images\pagoda.gif:64:64,2,4,32,16,8,8,134,2 +1,Images\pagoda.gif:64:64,2,5,40,16,8,8,136,2 +1,Images\pagoda.gif:64:64,2,6,48,16,8,8,138,2 +1,Images\pagoda.gif:64:64,2,7,56,16,8,8,140,2 +1,Images\pagoda.gif:64:64,2,8,64,16,8,8,142,2 +1,Images\pagoda.gif:64:64,2,9,72,16,8,8,144,2 +1,Images\pagoda.gif:64:64,2,10,80,16,8,8,146,2 +1,Images\pagoda.gif:64:64,2,11,88,16,8,8,148,2 +1,Images\pagoda.gif:64:64,2,12,96,16,8,8,150,0 +1,Images\pagoda.gif:64:64,2,13,104,16,8,8,152,0 +1,Images\pagoda.gif:64:64,2,14,112,16,8,8,154,0 +1,Images\pagoda.gif:64:64,2,15,120,16,8,8,156,0 +1,Images\pagoda.gif:64:64,2,16,128,16,8,8,158,0 +1,Images\pagoda.gif:64:64,2,17,136,16,8,8,160,0 +1,Images\pagoda.gif:64:64,2,18,144,16,8,8,162,0 +1,Images\pagoda.gif:64:64,2,19,152,16,8,8,164,0 +1,Images\pagoda.gif:64:64,2,20,160,16,8,8,166,0 +1,Images\pagoda.gif:64:64,2,21,168,16,8,8,168,0 +1,Images\pagoda.gif:64:64,2,22,176,16,8,8,170,0 +1,Images\pagoda.gif:64:64,2,23,184,16,8,8,172,0 +1,Images\pagoda.gif:64:64,2,24,192,16,8,8,174,0 +1,Images\pagoda.gif:64:64,2,25,200,16,8,8,176,0 +1,Images\pagoda.gif:64:64,2,26,208,16,8,8,178,0 +1,Images\pagoda.gif:64:64,2,27,216,16,8,8,180,0 +1,Images\pagoda.gif:64:64,2,28,224,16,8,8,182,0 +1,Images\pagoda.gif:64:64,2,29,232,16,8,8,184,0 +1,Images\pagoda.gif:64:64,2,30,240,16,8,8,186,2 +1,Images\pagoda.gif:64:64,2,31,248,16,8,8,188,2 +1,Images\pagoda.gif:64:64,3,0,0,24,8,8,190,2 +1,Images\pagoda.gif:64:64,3,1,8,24,8,8,192,2 +1,Images\pagoda.gif:64:64,3,2,16,24,8,8,194,2 +1,Images\pagoda.gif:64:64,3,3,24,24,8,8,196,2 +1,Images\pagoda.gif:64:64,3,4,32,24,8,8,198,2 +1,Images\pagoda.gif:64:64,3,5,40,24,8,8,200,2 +1,Images\pagoda.gif:64:64,3,6,48,24,8,8,202,2 +1,Images\pagoda.gif:64:64,3,7,56,24,8,8,204,2 +1,Images\pagoda.gif:64:64,3,8,64,24,8,8,206,2 +1,Images\pagoda.gif:64:64,3,9,72,24,8,8,208,2 +1,Images\pagoda.gif:64:64,3,10,80,24,8,8,210,2 +1,Images\pagoda.gif:64:64,3,11,88,24,8,8,212,2 +1,Images\pagoda.gif:64:64,3,12,96,24,8,8,214,0 +1,Images\pagoda.gif:64:64,3,13,104,24,8,8,216,0 +1,Images\pagoda.gif:64:64,3,14,112,24,8,8,218,0 +1,Images\pagoda.gif:64:64,3,15,120,24,8,8,220,0 +1,Images\pagoda.gif:64:64,3,16,128,24,8,8,222,0 +1,Images\pagoda.gif:64:64,3,17,136,24,8,8,224,0 +1,Images\pagoda.gif:64:64,3,18,144,24,8,8,226,0 +1,Images\pagoda.gif:64:64,3,19,152,24,8,8,228,0 +1,Images\pagoda.gif:64:64,3,20,160,24,8,8,230,0 +1,Images\pagoda.gif:64:64,3,21,168,24,8,8,232,0 +1,Images\pagoda.gif:64:64,3,22,176,24,8,8,234,0 +1,Images\pagoda.gif:64:64,3,23,184,24,8,8,236,0 +1,Images\pagoda.gif:64:64,3,24,192,24,8,8,238,0 +1,Images\pagoda.gif:64:64,3,25,200,24,8,8,240,0 +1,Images\pagoda.gif:64:64,3,26,208,24,8,8,242,0 +1,Images\pagoda.gif:64:64,3,27,216,24,8,8,244,0 +1,Images\pagoda.gif:64:64,3,28,224,24,8,8,246,0 +1,Images\pagoda.gif:64:64,3,29,232,24,8,8,248,0 +1,Images\pagoda.gif:64:64,3,30,240,24,8,8,250,2 +1,Images\pagoda.gif:64:64,3,31,248,24,8,8,252,2 +1,Images\pagoda.gif:64:64,4,0,0,32,8,8,254,2 +1,Images\pagoda.gif:64:64,4,1,8,32,8,8,1,2 +1,Images\pagoda.gif:64:64,4,2,16,32,8,8,3,2 +1,Images\pagoda.gif:64:64,4,3,24,32,8,8,5,2 +1,Images\pagoda.gif:64:64,4,4,32,32,8,8,7,2 +1,Images\pagoda.gif:64:64,4,5,40,32,8,8,9,2 +1,Images\pagoda.gif:64:64,4,6,48,32,8,8,11,2 +1,Images\pagoda.gif:64:64,4,7,56,32,8,8,13,2 +1,Images\pagoda.gif:64:64,4,8,64,32,8,8,15,2 +1,Images\pagoda.gif:64:64,4,9,72,32,8,8,17,2 +1,Images\pagoda.gif:64:64,4,10,80,32,8,8,19,2 +1,Images\pagoda.gif:64:64,4,11,88,32,8,8,21,2 +1,Images\pagoda.gif:64:64,4,12,96,32,8,8,23,2 +1,Images\pagoda.gif:64:64,4,13,104,32,8,8,25,2 +1,Images\pagoda.gif:64:64,4,14,112,32,8,8,27,2 +1,Images\pagoda.gif:64:64,4,15,120,32,8,8,29,2 +1,Images\pagoda.gif:64:64,4,16,128,32,8,8,31,0 +1,Images\pagoda.gif:64:64,4,17,136,32,8,8,33,0 +1,Images\pagoda.gif:64:64,4,18,144,32,8,8,35,0 +1,Images\pagoda.gif:64:64,4,19,152,32,8,8,37,0 +1,Images\pagoda.gif:64:64,4,20,160,32,8,8,39,0 +1,Images\pagoda.gif:64:64,4,21,168,32,8,8,41,0 +1,Images\pagoda.gif:64:64,4,22,176,32,8,8,43,0 +1,Images\pagoda.gif:64:64,4,23,184,32,8,8,45,0 +1,Images\pagoda.gif:64:64,4,24,192,32,8,8,47,0 +1,Images\pagoda.gif:64:64,4,25,200,32,8,8,49,0 +1,Images\pagoda.gif:64:64,4,26,208,32,8,8,51,0 +1,Images\pagoda.gif:64:64,4,27,216,32,8,8,53,0 +1,Images\pagoda.gif:64:64,4,28,224,32,8,8,55,0 +1,Images\pagoda.gif:64:64,4,29,232,32,8,8,57,0 +1,Images\pagoda.gif:64:64,4,30,240,32,8,8,59,0 +1,Images\pagoda.gif:64:64,4,31,248,32,8,8,61,0 +1,Images\pagoda.gif:64:64,5,0,0,40,8,8,63,2 +1,Images\pagoda.gif:64:64,5,1,8,40,8,8,65,2 +1,Images\pagoda.gif:64:64,5,2,16,40,8,8,67,2 +1,Images\pagoda.gif:64:64,5,3,24,40,8,8,114,2 1,Images\pagoda.gif:64:64,5,4,32,40,8,8,69,2 1,Images\pagoda.gif:64:64,5,5,40,40,8,8,71,2 1,Images\pagoda.gif:64:64,5,6,48,40,8,8,73,2 @@ -647,126 +647,126 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 2,Images\pagoda.gif:128:64,4,5,40,32,8,8,9,1 2,Images\pagoda.gif:128:64,4,6,48,32,8,8,11,1 2,Images\pagoda.gif:128:64,4,7,56,32,8,8,13,1 -2,Images\pagoda.gif:128:64,4,8,64,32,8,8,15,0 -2,Images\pagoda.gif:128:64,4,9,72,32,8,8,15,0 -2,Images\pagoda.gif:128:64,4,10,80,32,8,8,15,0 -2,Images\pagoda.gif:128:64,4,11,88,32,8,8,15,0 -2,Images\pagoda.gif:128:64,4,12,96,32,8,8,15,0 -2,Images\pagoda.gif:128:64,4,13,104,32,8,8,15,0 -2,Images\pagoda.gif:128:64,4,14,112,32,8,8,15,0 -2,Images\pagoda.gif:128:64,4,15,120,32,8,8,15,0 -2,Images\pagoda.gif:128:64,4,16,128,32,8,8,17,2 -2,Images\pagoda.gif:128:64,4,17,136,32,8,8,19,2 -2,Images\pagoda.gif:128:64,4,18,144,32,8,8,21,2 -2,Images\pagoda.gif:128:64,4,19,152,32,8,8,23,2 -2,Images\pagoda.gif:128:64,4,20,160,32,8,8,25,1 -2,Images\pagoda.gif:128:64,4,21,168,32,8,8,27,1 -2,Images\pagoda.gif:128:64,4,22,176,32,8,8,29,1 -2,Images\pagoda.gif:128:64,4,23,184,32,8,8,31,1 -2,Images\pagoda.gif:128:64,4,24,192,32,8,8,33,1 -2,Images\pagoda.gif:128:64,4,25,200,32,8,8,35,1 -2,Images\pagoda.gif:128:64,4,26,208,32,8,8,37,1 -2,Images\pagoda.gif:128:64,4,27,216,32,8,8,39,1 -2,Images\pagoda.gif:128:64,4,28,224,32,8,8,41,1 -2,Images\pagoda.gif:128:64,4,29,232,32,8,8,43,1 -2,Images\pagoda.gif:128:64,4,30,240,32,8,8,45,1 -2,Images\pagoda.gif:128:64,4,31,248,32,8,8,47,1 -2,Images\pagoda.gif:128:64,5,0,0,40,8,8,49,1 -2,Images\pagoda.gif:128:64,5,1,8,40,8,8,51,1 -2,Images\pagoda.gif:128:64,5,2,16,40,8,8,53,1 -2,Images\pagoda.gif:128:64,5,3,24,40,8,8,55,1 -2,Images\pagoda.gif:128:64,5,4,32,40,8,8,57,1 -2,Images\pagoda.gif:128:64,5,5,40,40,8,8,59,1 -2,Images\pagoda.gif:128:64,5,6,48,40,8,8,61,1 -2,Images\pagoda.gif:128:64,5,7,56,40,8,8,63,1 -2,Images\pagoda.gif:128:64,5,8,64,40,8,8,65,0 -2,Images\pagoda.gif:128:64,5,9,72,40,8,8,67,0 -2,Images\pagoda.gif:128:64,5,10,80,40,8,8,15,0 -2,Images\pagoda.gif:128:64,5,11,88,40,8,8,15,0 -2,Images\pagoda.gif:128:64,5,12,96,40,8,8,15,0 -2,Images\pagoda.gif:128:64,5,13,104,40,8,8,15,0 -2,Images\pagoda.gif:128:64,5,14,112,40,8,8,15,0 -2,Images\pagoda.gif:128:64,5,15,120,40,8,8,69,0 -2,Images\pagoda.gif:128:64,5,16,128,40,8,8,71,2 -2,Images\pagoda.gif:128:64,5,17,136,40,8,8,73,2 -2,Images\pagoda.gif:128:64,5,18,144,40,8,8,75,2 -2,Images\pagoda.gif:128:64,5,19,152,40,8,8,77,2 -2,Images\pagoda.gif:128:64,5,20,160,40,8,8,79,1 -2,Images\pagoda.gif:128:64,5,21,168,40,8,8,81,1 -2,Images\pagoda.gif:128:64,5,22,176,40,8,8,83,1 -2,Images\pagoda.gif:128:64,5,23,184,40,8,8,85,1 -2,Images\pagoda.gif:128:64,5,24,192,40,8,8,87,1 -2,Images\pagoda.gif:128:64,5,25,200,40,8,8,89,1 -2,Images\pagoda.gif:128:64,5,26,208,40,8,8,91,1 -2,Images\pagoda.gif:128:64,5,27,216,40,8,8,93,1 -2,Images\pagoda.gif:128:64,5,28,224,40,8,8,95,1 -2,Images\pagoda.gif:128:64,5,29,232,40,8,8,97,1 -2,Images\pagoda.gif:128:64,5,30,240,40,8,8,99,1 -2,Images\pagoda.gif:128:64,5,31,248,40,8,8,101,1 -2,Images\pagoda.gif:128:64,6,0,0,48,8,8,103,1 -2,Images\pagoda.gif:128:64,6,1,8,48,8,8,105,1 -2,Images\pagoda.gif:128:64,6,2,16,48,8,8,107,1 -2,Images\pagoda.gif:128:64,6,3,24,48,8,8,109,1 -2,Images\pagoda.gif:128:64,6,4,32,48,8,8,111,1 -2,Images\pagoda.gif:128:64,6,5,40,48,8,8,113,1 -2,Images\pagoda.gif:128:64,6,6,48,48,8,8,115,1 -2,Images\pagoda.gif:128:64,6,7,56,48,8,8,117,1 -2,Images\pagoda.gif:128:64,6,8,64,48,8,8,119,1 -2,Images\pagoda.gif:128:64,6,9,72,48,8,8,121,1 -2,Images\pagoda.gif:128:64,6,10,80,48,8,8,15,0 -2,Images\pagoda.gif:128:64,6,11,88,48,8,8,123,0 -2,Images\pagoda.gif:128:64,6,12,96,48,8,8,15,0 -2,Images\pagoda.gif:128:64,6,13,104,48,8,8,125,0 -2,Images\pagoda.gif:128:64,6,14,112,48,8,8,127,0 -2,Images\pagoda.gif:128:64,6,15,120,48,8,8,129,0 -2,Images\pagoda.gif:128:64,6,16,128,48,8,8,131,0 -2,Images\pagoda.gif:128:64,6,17,136,48,8,8,133,0 -2,Images\pagoda.gif:128:64,6,18,144,48,8,8,135,2 -2,Images\pagoda.gif:128:64,6,19,152,48,8,8,137,2 -2,Images\pagoda.gif:128:64,6,20,160,48,8,8,139,2 -2,Images\pagoda.gif:128:64,6,21,168,48,8,8,141,2 -2,Images\pagoda.gif:128:64,6,22,176,48,8,8,143,2 -2,Images\pagoda.gif:128:64,6,23,184,48,8,8,145,2 -2,Images\pagoda.gif:128:64,6,24,192,48,8,8,147,1 -2,Images\pagoda.gif:128:64,6,25,200,48,8,8,149,1 -2,Images\pagoda.gif:128:64,6,26,208,48,8,8,151,1 -2,Images\pagoda.gif:128:64,6,27,216,48,8,8,153,1 -2,Images\pagoda.gif:128:64,6,28,224,48,8,8,155,1 -2,Images\pagoda.gif:128:64,6,29,232,48,8,8,157,1 -2,Images\pagoda.gif:128:64,6,30,240,48,8,8,159,1 -2,Images\pagoda.gif:128:64,6,31,248,48,8,8,161,1 -2,Images\pagoda.gif:128:64,7,0,0,56,8,8,163,1 -2,Images\pagoda.gif:128:64,7,1,8,56,8,8,165,1 -2,Images\pagoda.gif:128:64,7,2,16,56,8,8,167,1 -2,Images\pagoda.gif:128:64,7,3,24,56,8,8,169,1 -2,Images\pagoda.gif:128:64,7,4,32,56,8,8,171,1 -2,Images\pagoda.gif:128:64,7,5,40,56,8,8,173,1 -2,Images\pagoda.gif:128:64,7,6,48,56,8,8,175,1 -2,Images\pagoda.gif:128:64,7,7,56,56,8,8,177,1 -2,Images\pagoda.gif:128:64,7,8,64,56,8,8,179,1 -2,Images\pagoda.gif:128:64,7,9,72,56,8,8,181,1 -2,Images\pagoda.gif:128:64,7,10,80,56,8,8,183,0 -2,Images\pagoda.gif:128:64,7,11,88,56,8,8,185,0 -2,Images\pagoda.gif:128:64,7,12,96,56,8,8,187,0 -2,Images\pagoda.gif:128:64,7,13,104,56,8,8,189,0 -2,Images\pagoda.gif:128:64,7,14,112,56,8,8,191,0 -2,Images\pagoda.gif:128:64,7,15,120,56,8,8,15,0 -2,Images\pagoda.gif:128:64,7,16,128,56,8,8,15,0 -2,Images\pagoda.gif:128:64,7,17,136,56,8,8,193,0 -2,Images\pagoda.gif:128:64,7,18,144,56,8,8,195,2 -2,Images\pagoda.gif:128:64,7,19,152,56,8,8,197,2 -2,Images\pagoda.gif:128:64,7,20,160,56,8,8,199,2 -2,Images\pagoda.gif:128:64,7,21,168,56,8,8,201,2 -2,Images\pagoda.gif:128:64,7,22,176,56,8,8,203,2 -2,Images\pagoda.gif:128:64,7,23,184,56,8,8,205,2 -2,Images\pagoda.gif:128:64,7,24,192,56,8,8,207,1 -2,Images\pagoda.gif:128:64,7,25,200,56,8,8,209,1 -2,Images\pagoda.gif:128:64,7,26,208,56,8,8,211,1 -2,Images\pagoda.gif:128:64,7,27,216,56,8,8,213,1 -2,Images\pagoda.gif:128:64,7,28,224,56,8,8,215,1 -2,Images\pagoda.gif:128:64,7,29,232,56,8,8,217,1 -2,Images\pagoda.gif:128:64,7,30,240,56,8,8,219,1 -2,Images\pagoda.gif:128:64,7,31,248,56,8,8,221,1 +2,Images\pagoda.gif:128:64,4,8,64,32,8,8,216,0 +2,Images\pagoda.gif:128:64,4,9,72,32,8,8,216,0 +2,Images\pagoda.gif:128:64,4,10,80,32,8,8,216,0 +2,Images\pagoda.gif:128:64,4,11,88,32,8,8,216,0 +2,Images\pagoda.gif:128:64,4,12,96,32,8,8,216,0 +2,Images\pagoda.gif:128:64,4,13,104,32,8,8,216,0 +2,Images\pagoda.gif:128:64,4,14,112,32,8,8,216,0 +2,Images\pagoda.gif:128:64,4,15,120,32,8,8,216,0 +2,Images\pagoda.gif:128:64,4,16,128,32,8,8,15,2 +2,Images\pagoda.gif:128:64,4,17,136,32,8,8,17,2 +2,Images\pagoda.gif:128:64,4,18,144,32,8,8,19,2 +2,Images\pagoda.gif:128:64,4,19,152,32,8,8,21,2 +2,Images\pagoda.gif:128:64,4,20,160,32,8,8,23,1 +2,Images\pagoda.gif:128:64,4,21,168,32,8,8,25,1 +2,Images\pagoda.gif:128:64,4,22,176,32,8,8,27,1 +2,Images\pagoda.gif:128:64,4,23,184,32,8,8,29,1 +2,Images\pagoda.gif:128:64,4,24,192,32,8,8,31,1 +2,Images\pagoda.gif:128:64,4,25,200,32,8,8,33,1 +2,Images\pagoda.gif:128:64,4,26,208,32,8,8,35,1 +2,Images\pagoda.gif:128:64,4,27,216,32,8,8,37,1 +2,Images\pagoda.gif:128:64,4,28,224,32,8,8,39,1 +2,Images\pagoda.gif:128:64,4,29,232,32,8,8,41,1 +2,Images\pagoda.gif:128:64,4,30,240,32,8,8,43,1 +2,Images\pagoda.gif:128:64,4,31,248,32,8,8,45,1 +2,Images\pagoda.gif:128:64,5,0,0,40,8,8,47,1 +2,Images\pagoda.gif:128:64,5,1,8,40,8,8,49,1 +2,Images\pagoda.gif:128:64,5,2,16,40,8,8,51,1 +2,Images\pagoda.gif:128:64,5,3,24,40,8,8,53,1 +2,Images\pagoda.gif:128:64,5,4,32,40,8,8,55,1 +2,Images\pagoda.gif:128:64,5,5,40,40,8,8,57,1 +2,Images\pagoda.gif:128:64,5,6,48,40,8,8,59,1 +2,Images\pagoda.gif:128:64,5,7,56,40,8,8,61,1 +2,Images\pagoda.gif:128:64,5,8,64,40,8,8,63,0 +2,Images\pagoda.gif:128:64,5,9,72,40,8,8,65,0 +2,Images\pagoda.gif:128:64,5,10,80,40,8,8,216,0 +2,Images\pagoda.gif:128:64,5,11,88,40,8,8,216,0 +2,Images\pagoda.gif:128:64,5,12,96,40,8,8,216,0 +2,Images\pagoda.gif:128:64,5,13,104,40,8,8,216,0 +2,Images\pagoda.gif:128:64,5,14,112,40,8,8,216,0 +2,Images\pagoda.gif:128:64,5,15,120,40,8,8,67,0 +2,Images\pagoda.gif:128:64,5,16,128,40,8,8,69,2 +2,Images\pagoda.gif:128:64,5,17,136,40,8,8,71,2 +2,Images\pagoda.gif:128:64,5,18,144,40,8,8,73,2 +2,Images\pagoda.gif:128:64,5,19,152,40,8,8,75,2 +2,Images\pagoda.gif:128:64,5,20,160,40,8,8,77,1 +2,Images\pagoda.gif:128:64,5,21,168,40,8,8,79,1 +2,Images\pagoda.gif:128:64,5,22,176,40,8,8,81,1 +2,Images\pagoda.gif:128:64,5,23,184,40,8,8,83,1 +2,Images\pagoda.gif:128:64,5,24,192,40,8,8,85,1 +2,Images\pagoda.gif:128:64,5,25,200,40,8,8,87,1 +2,Images\pagoda.gif:128:64,5,26,208,40,8,8,89,1 +2,Images\pagoda.gif:128:64,5,27,216,40,8,8,91,1 +2,Images\pagoda.gif:128:64,5,28,224,40,8,8,93,1 +2,Images\pagoda.gif:128:64,5,29,232,40,8,8,95,1 +2,Images\pagoda.gif:128:64,5,30,240,40,8,8,97,1 +2,Images\pagoda.gif:128:64,5,31,248,40,8,8,99,1 +2,Images\pagoda.gif:128:64,6,0,0,48,8,8,101,1 +2,Images\pagoda.gif:128:64,6,1,8,48,8,8,103,1 +2,Images\pagoda.gif:128:64,6,2,16,48,8,8,105,1 +2,Images\pagoda.gif:128:64,6,3,24,48,8,8,107,1 +2,Images\pagoda.gif:128:64,6,4,32,48,8,8,109,1 +2,Images\pagoda.gif:128:64,6,5,40,48,8,8,111,1 +2,Images\pagoda.gif:128:64,6,6,48,48,8,8,113,1 +2,Images\pagoda.gif:128:64,6,7,56,48,8,8,115,1 +2,Images\pagoda.gif:128:64,6,8,64,48,8,8,117,1 +2,Images\pagoda.gif:128:64,6,9,72,48,8,8,119,1 +2,Images\pagoda.gif:128:64,6,10,80,48,8,8,216,0 +2,Images\pagoda.gif:128:64,6,11,88,48,8,8,121,0 +2,Images\pagoda.gif:128:64,6,12,96,48,8,8,216,0 +2,Images\pagoda.gif:128:64,6,13,104,48,8,8,123,0 +2,Images\pagoda.gif:128:64,6,14,112,48,8,8,125,0 +2,Images\pagoda.gif:128:64,6,15,120,48,8,8,127,0 +2,Images\pagoda.gif:128:64,6,16,128,48,8,8,129,0 +2,Images\pagoda.gif:128:64,6,17,136,48,8,8,131,0 +2,Images\pagoda.gif:128:64,6,18,144,48,8,8,133,2 +2,Images\pagoda.gif:128:64,6,19,152,48,8,8,135,2 +2,Images\pagoda.gif:128:64,6,20,160,48,8,8,137,2 +2,Images\pagoda.gif:128:64,6,21,168,48,8,8,139,2 +2,Images\pagoda.gif:128:64,6,22,176,48,8,8,141,2 +2,Images\pagoda.gif:128:64,6,23,184,48,8,8,143,2 +2,Images\pagoda.gif:128:64,6,24,192,48,8,8,145,1 +2,Images\pagoda.gif:128:64,6,25,200,48,8,8,147,1 +2,Images\pagoda.gif:128:64,6,26,208,48,8,8,149,1 +2,Images\pagoda.gif:128:64,6,27,216,48,8,8,151,1 +2,Images\pagoda.gif:128:64,6,28,224,48,8,8,153,1 +2,Images\pagoda.gif:128:64,6,29,232,48,8,8,155,1 +2,Images\pagoda.gif:128:64,6,30,240,48,8,8,157,1 +2,Images\pagoda.gif:128:64,6,31,248,48,8,8,159,1 +2,Images\pagoda.gif:128:64,7,0,0,56,8,8,161,1 +2,Images\pagoda.gif:128:64,7,1,8,56,8,8,163,1 +2,Images\pagoda.gif:128:64,7,2,16,56,8,8,165,1 +2,Images\pagoda.gif:128:64,7,3,24,56,8,8,167,1 +2,Images\pagoda.gif:128:64,7,4,32,56,8,8,169,1 +2,Images\pagoda.gif:128:64,7,5,40,56,8,8,171,1 +2,Images\pagoda.gif:128:64,7,6,48,56,8,8,173,1 +2,Images\pagoda.gif:128:64,7,7,56,56,8,8,175,1 +2,Images\pagoda.gif:128:64,7,8,64,56,8,8,177,1 +2,Images\pagoda.gif:128:64,7,9,72,56,8,8,179,1 +2,Images\pagoda.gif:128:64,7,10,80,56,8,8,181,0 +2,Images\pagoda.gif:128:64,7,11,88,56,8,8,183,0 +2,Images\pagoda.gif:128:64,7,12,96,56,8,8,185,0 +2,Images\pagoda.gif:128:64,7,13,104,56,8,8,187,0 +2,Images\pagoda.gif:128:64,7,14,112,56,8,8,189,0 +2,Images\pagoda.gif:128:64,7,15,120,56,8,8,216,0 +2,Images\pagoda.gif:128:64,7,16,128,56,8,8,216,0 +2,Images\pagoda.gif:128:64,7,17,136,56,8,8,191,0 +2,Images\pagoda.gif:128:64,7,18,144,56,8,8,193,2 +2,Images\pagoda.gif:128:64,7,19,152,56,8,8,195,2 +2,Images\pagoda.gif:128:64,7,20,160,56,8,8,197,2 +2,Images\pagoda.gif:128:64,7,21,168,56,8,8,199,2 +2,Images\pagoda.gif:128:64,7,22,176,56,8,8,201,2 +2,Images\pagoda.gif:128:64,7,23,184,56,8,8,203,2 +2,Images\pagoda.gif:128:64,7,24,192,56,8,8,205,1 +2,Images\pagoda.gif:128:64,7,25,200,56,8,8,207,1 +2,Images\pagoda.gif:128:64,7,26,208,56,8,8,209,1 +2,Images\pagoda.gif:128:64,7,27,216,56,8,8,211,1 +2,Images\pagoda.gif:128:64,7,28,224,56,8,8,213,1 +2,Images\pagoda.gif:128:64,7,29,232,56,8,8,215,1 +2,Images\pagoda.gif:128:64,7,30,240,56,8,8,217,1 +2,Images\pagoda.gif:128:64,7,31,248,56,8,8,219,1 3,Images\pagoda.gif:192:48,0,0,0,0,8,8,0,1 3,Images\pagoda.gif:192:48,0,1,8,0,8,8,2,1 3,Images\pagoda.gif:192:48,0,2,16,0,8,8,4,1 @@ -909,53 +909,53 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 3,Images\pagoda.gif:192:48,4,11,88,32,8,8,248,0 3,Images\pagoda.gif:192:48,4,12,96,32,8,8,28,0 3,Images\pagoda.gif:192:48,4,13,104,32,8,8,250,0 -3,Images\pagoda.gif:192:48,4,14,112,32,8,8,252,2 -3,Images\pagoda.gif:192:48,4,15,120,32,8,8,252,2 -3,Images\pagoda.gif:192:48,4,16,128,32,8,8,254,2 -3,Images\pagoda.gif:192:48,4,17,136,32,8,8,1,2 -3,Images\pagoda.gif:192:48,4,18,144,32,8,8,3,2 -3,Images\pagoda.gif:192:48,4,19,152,32,8,8,5,2 -3,Images\pagoda.gif:192:48,4,20,160,32,8,8,7,2 -3,Images\pagoda.gif:192:48,4,21,168,32,8,8,9,2 -3,Images\pagoda.gif:192:48,4,22,176,32,8,8,11,2 -3,Images\pagoda.gif:192:48,4,23,184,32,8,8,13,2 -3,Images\pagoda.gif:192:48,4,24,192,32,8,8,15,2 -3,Images\pagoda.gif:192:48,4,25,200,32,8,8,17,2 -3,Images\pagoda.gif:192:48,4,26,208,32,8,8,19,2 -3,Images\pagoda.gif:192:48,4,27,216,32,8,8,21,2 -3,Images\pagoda.gif:192:48,4,28,224,32,8,8,23,1 -3,Images\pagoda.gif:192:48,4,29,232,32,8,8,25,1 -3,Images\pagoda.gif:192:48,4,30,240,32,8,8,27,1 -3,Images\pagoda.gif:192:48,4,31,248,32,8,8,29,1 +3,Images\pagoda.gif:192:48,4,14,112,32,8,8,28,2 +3,Images\pagoda.gif:192:48,4,15,120,32,8,8,28,2 +3,Images\pagoda.gif:192:48,4,16,128,32,8,8,252,2 +3,Images\pagoda.gif:192:48,4,17,136,32,8,8,254,2 +3,Images\pagoda.gif:192:48,4,18,144,32,8,8,1,2 +3,Images\pagoda.gif:192:48,4,19,152,32,8,8,3,2 +3,Images\pagoda.gif:192:48,4,20,160,32,8,8,5,2 +3,Images\pagoda.gif:192:48,4,21,168,32,8,8,7,2 +3,Images\pagoda.gif:192:48,4,22,176,32,8,8,9,2 +3,Images\pagoda.gif:192:48,4,23,184,32,8,8,11,2 +3,Images\pagoda.gif:192:48,4,24,192,32,8,8,13,2 +3,Images\pagoda.gif:192:48,4,25,200,32,8,8,15,2 +3,Images\pagoda.gif:192:48,4,26,208,32,8,8,17,2 +3,Images\pagoda.gif:192:48,4,27,216,32,8,8,19,2 +3,Images\pagoda.gif:192:48,4,28,224,32,8,8,21,1 +3,Images\pagoda.gif:192:48,4,29,232,32,8,8,23,1 +3,Images\pagoda.gif:192:48,4,30,240,32,8,8,25,1 +3,Images\pagoda.gif:192:48,4,31,248,32,8,8,27,1 3,Images\pagoda.gif:192:48,5,0,0,40,8,8,28,1 -3,Images\pagoda.gif:192:48,5,1,8,40,8,8,31,1 -3,Images\pagoda.gif:192:48,5,2,16,40,8,8,33,1 -3,Images\pagoda.gif:192:48,5,3,24,40,8,8,35,1 -3,Images\pagoda.gif:192:48,5,4,32,40,8,8,37,1 -3,Images\pagoda.gif:192:48,5,5,40,40,8,8,39,1 -3,Images\pagoda.gif:192:48,5,6,48,40,8,8,41,1 -3,Images\pagoda.gif:192:48,5,7,56,40,8,8,43,1 +3,Images\pagoda.gif:192:48,5,1,8,40,8,8,29,1 +3,Images\pagoda.gif:192:48,5,2,16,40,8,8,31,1 +3,Images\pagoda.gif:192:48,5,3,24,40,8,8,33,1 +3,Images\pagoda.gif:192:48,5,4,32,40,8,8,35,1 +3,Images\pagoda.gif:192:48,5,5,40,40,8,8,37,1 +3,Images\pagoda.gif:192:48,5,6,48,40,8,8,39,1 +3,Images\pagoda.gif:192:48,5,7,56,40,8,8,41,1 3,Images\pagoda.gif:192:48,5,8,64,40,8,8,28,0 -3,Images\pagoda.gif:192:48,5,9,72,40,8,8,45,0 -3,Images\pagoda.gif:192:48,5,10,80,40,8,8,47,0 -3,Images\pagoda.gif:192:48,5,11,88,40,8,8,49,0 +3,Images\pagoda.gif:192:48,5,9,72,40,8,8,43,0 +3,Images\pagoda.gif:192:48,5,10,80,40,8,8,45,0 +3,Images\pagoda.gif:192:48,5,11,88,40,8,8,47,0 3,Images\pagoda.gif:192:48,5,12,96,40,8,8,28,0 -3,Images\pagoda.gif:192:48,5,13,104,40,8,8,51,0 -3,Images\pagoda.gif:192:48,5,14,112,40,8,8,252,2 -3,Images\pagoda.gif:192:48,5,15,120,40,8,8,53,2 -3,Images\pagoda.gif:192:48,5,16,128,40,8,8,55,2 -3,Images\pagoda.gif:192:48,5,17,136,40,8,8,57,2 -3,Images\pagoda.gif:192:48,5,18,144,40,8,8,59,2 -3,Images\pagoda.gif:192:48,5,19,152,40,8,8,61,2 -3,Images\pagoda.gif:192:48,5,20,160,40,8,8,63,2 -3,Images\pagoda.gif:192:48,5,21,168,40,8,8,65,2 -3,Images\pagoda.gif:192:48,5,22,176,40,8,8,67,2 -3,Images\pagoda.gif:192:48,5,23,184,40,8,8,69,2 -3,Images\pagoda.gif:192:48,5,24,192,40,8,8,71,2 -3,Images\pagoda.gif:192:48,5,25,200,40,8,8,73,2 -3,Images\pagoda.gif:192:48,5,26,208,40,8,8,75,2 -3,Images\pagoda.gif:192:48,5,27,216,40,8,8,77,2 -3,Images\pagoda.gif:192:48,5,28,224,40,8,8,79,1 -3,Images\pagoda.gif:192:48,5,29,232,40,8,8,81,1 -3,Images\pagoda.gif:192:48,5,30,240,40,8,8,83,1 -3,Images\pagoda.gif:192:48,5,31,248,40,8,8,85,1 +3,Images\pagoda.gif:192:48,5,13,104,40,8,8,49,0 +3,Images\pagoda.gif:192:48,5,14,112,40,8,8,28,2 +3,Images\pagoda.gif:192:48,5,15,120,40,8,8,51,2 +3,Images\pagoda.gif:192:48,5,16,128,40,8,8,53,2 +3,Images\pagoda.gif:192:48,5,17,136,40,8,8,55,2 +3,Images\pagoda.gif:192:48,5,18,144,40,8,8,57,2 +3,Images\pagoda.gif:192:48,5,19,152,40,8,8,59,2 +3,Images\pagoda.gif:192:48,5,20,160,40,8,8,61,2 +3,Images\pagoda.gif:192:48,5,21,168,40,8,8,63,2 +3,Images\pagoda.gif:192:48,5,22,176,40,8,8,65,2 +3,Images\pagoda.gif:192:48,5,23,184,40,8,8,67,2 +3,Images\pagoda.gif:192:48,5,24,192,40,8,8,69,2 +3,Images\pagoda.gif:192:48,5,25,200,40,8,8,71,2 +3,Images\pagoda.gif:192:48,5,26,208,40,8,8,73,2 +3,Images\pagoda.gif:192:48,5,27,216,40,8,8,75,2 +3,Images\pagoda.gif:192:48,5,28,224,40,8,8,77,1 +3,Images\pagoda.gif:192:48,5,29,232,40,8,8,79,1 +3,Images\pagoda.gif:192:48,5,30,240,40,8,8,81,1 +3,Images\pagoda.gif:192:48,5,31,248,40,8,8,83,1 diff --git a/Tests/References/rayon4_palette_0.bin b/Tests/References/rayon4_palette_0.bin index 783504d..c17f5a6 100644 Binary files a/Tests/References/rayon4_palette_0.bin and b/Tests/References/rayon4_palette_0.bin differ diff --git a/Tests/References/rayon4_palette_1.bin b/Tests/References/rayon4_palette_1.bin index 0758456..4f9ee08 100644 --- a/Tests/References/rayon4_palette_1.bin +++ b/Tests/References/rayon4_palette_1.bin @@ -1 +1 @@ -6=0 \ No newline at end of file +=60 \ No newline at end of file diff --git a/Tests/References/rayon4_palette_2.bin b/Tests/References/rayon4_palette_2.bin index f08589a..0883fbe 100644 Binary files a/Tests/References/rayon4_palette_2.bin and b/Tests/References/rayon4_palette_2.bin differ diff --git a/Tests/References/rayon4_palette_3.bin b/Tests/References/rayon4_palette_3.bin index f81b702..41f7525 100644 Binary files a/Tests/References/rayon4_palette_3.bin and b/Tests/References/rayon4_palette_3.bin differ diff --git a/Tests/References/rayon4_palettes.csv b/Tests/References/rayon4_palettes.csv index e6aa836..3590501 100644 --- a/Tests/References/rayon4_palettes.csv +++ b/Tests/References/rayon4_palettes.csv @@ -1,5 +1,5 @@ palette_id,color0,color1,color2,color3 -0,#402C00,#747474,#3CBCFC,#C4C4C4 -1,#402C00,#FCBCB0,#C4C4C4,#FFFFFF -2,#402C00,#7C0800,#FCBCB0,#747474 -3,#402C00,#C4C4C4,#747474,#FFFFFF +0,#402C00,#3CBCFC,#747474,#C4C4C4 +1,#402C00,#C4C4C4,#FCBCB0,#FFFFFF +2,#402C00,#747474,#7C0800,#FCBCB0 +3,#402C00,#747474,#C4C4C4,#FFFFFF diff --git a/Tests/References/rayon4_pattern_0.bin b/Tests/References/rayon4_pattern_0.bin index 9f5d393..f3431ed 100644 Binary files a/Tests/References/rayon4_pattern_0.bin and b/Tests/References/rayon4_pattern_0.bin differ diff --git a/Tests/References/rayon4_pattern_1.bin b/Tests/References/rayon4_pattern_1.bin index 7152baf..4e9dd9b 100644 Binary files a/Tests/References/rayon4_pattern_1.bin and b/Tests/References/rayon4_pattern_1.bin differ diff --git a/Tests/References/rayon4_pattern_2.bin b/Tests/References/rayon4_pattern_2.bin index 370c261..b0365fe 100644 Binary files a/Tests/References/rayon4_pattern_2.bin and b/Tests/References/rayon4_pattern_2.bin differ diff --git a/Tests/References/rayon4_pattern_3.bin b/Tests/References/rayon4_pattern_3.bin index fc8dd02..4b2091e 100644 Binary files a/Tests/References/rayon4_pattern_3.bin and b/Tests/References/rayon4_pattern_3.bin differ diff --git a/Tests/References/shkola_palette_0.bin b/Tests/References/shkola_palette_0.bin index a860a98..35930e0 100644 --- a/Tests/References/shkola_palette_0.bin +++ b/Tests/References/shkola_palette_0.bin @@ -1 +1 @@ --  \ No newline at end of file +-  \ No newline at end of file diff --git a/Tests/References/shkola_palette_1.bin b/Tests/References/shkola_palette_1.bin index 460c274..9b910a8 100644 --- a/Tests/References/shkola_palette_1.bin +++ b/Tests/References/shkola_palette_1.bin @@ -1 +1 @@ --= \ No newline at end of file +-= \ No newline at end of file diff --git a/Tests/References/shkola_palette_2.bin b/Tests/References/shkola_palette_2.bin index 918bfa4..48121c2 100644 --- a/Tests/References/shkola_palette_2.bin +++ b/Tests/References/shkola_palette_2.bin @@ -1 +1 @@ --=3 \ No newline at end of file +-=3 \ No newline at end of file diff --git a/Tests/References/shkola_palettes.csv b/Tests/References/shkola_palettes.csv index 1c79734..fbe4790 100644 --- a/Tests/References/shkola_palettes.csv +++ b/Tests/References/shkola_palettes.csv @@ -1,4 +1,4 @@ palette_id,color0,color1,color2,color3 -0,#787878,#183C5C,#000000,#402C00 -1,#787878,#887000,#000000,#C4C4C4 -2,#787878,#C4C4C4,#000000,#D4C8FC +0,#787878,#000000,#183C5C,#402C00 +1,#787878,#000000,#887000,#C4C4C4 +2,#787878,#000000,#C4C4C4,#D4C8FC diff --git a/Tests/References/shkola_pattern_0.bin b/Tests/References/shkola_pattern_0.bin index 2a004c4..40f5f07 100644 Binary files a/Tests/References/shkola_pattern_0.bin and b/Tests/References/shkola_pattern_0.bin differ diff --git a/Tests/References/shkola_pattern_1.bin b/Tests/References/shkola_pattern_1.bin index 9862a90..95380e1 100644 Binary files a/Tests/References/shkola_pattern_1.bin and b/Tests/References/shkola_pattern_1.bin differ diff --git a/Tests/References/shkola_pattern_2.bin b/Tests/References/shkola_pattern_2.bin index 369a3b0..c5fce16 100644 Binary files a/Tests/References/shkola_pattern_2.bin and b/Tests/References/shkola_pattern_2.bin differ diff --git a/Tests/References/shkola_pattern_3.bin b/Tests/References/shkola_pattern_3.bin index 15043ab..61b1716 100644 Binary files a/Tests/References/shkola_pattern_3.bin and b/Tests/References/shkola_pattern_3.bin differ diff --git a/Tests/References/sindikat_name_table_0.bin b/Tests/References/sindikat_name_table_0.bin index 1c0d744..6f7dd32 100644 Binary files a/Tests/References/sindikat_name_table_0.bin and b/Tests/References/sindikat_name_table_0.bin differ diff --git a/Tests/References/sindikat_palette_1.bin b/Tests/References/sindikat_palette_1.bin index 692d33c..10302ae 100644 --- a/Tests/References/sindikat_palette_1.bin +++ b/Tests/References/sindikat_palette_1.bin @@ -1 +1 @@ -= \ No newline at end of file += \ No newline at end of file diff --git a/Tests/References/sindikat_palette_2.bin b/Tests/References/sindikat_palette_2.bin index 13a6ea0..d3a845a 100644 --- a/Tests/References/sindikat_palette_2.bin +++ b/Tests/References/sindikat_palette_2.bin @@ -1 +1 @@ -& \ No newline at end of file +& \ No newline at end of file diff --git a/Tests/References/sindikat_palette_3.bin b/Tests/References/sindikat_palette_3.bin index 17e6cda..4564714 100644 --- a/Tests/References/sindikat_palette_3.bin +++ b/Tests/References/sindikat_palette_3.bin @@ -1 +1 @@ -" \ No newline at end of file +" \ No newline at end of file diff --git a/Tests/References/sindikat_palettes.csv b/Tests/References/sindikat_palettes.csv index 39785ad..ab36d6a 100644 --- a/Tests/References/sindikat_palettes.csv +++ b/Tests/References/sindikat_palettes.csv @@ -1,5 +1,5 @@ palette_id,color0,color1,color2,color3 0,#000000,#008088,#183C5C,#3CBCFC -1,#000000,#A80010,#C4C4C4,#0070EC -2,#000000,#7C0800,#FC7460,#D82800 -3,#000000,#5C94FC,#24188C,#8C0074 +1,#000000,#0070EC,#A80010,#C4C4C4 +2,#000000,#7C0800,#D82800,#FC7460 +3,#000000,#24188C,#5C94FC,#8C0074 diff --git a/Tests/References/sindikat_pattern_0.bin b/Tests/References/sindikat_pattern_0.bin index 21d3842..a642623 100644 Binary files a/Tests/References/sindikat_pattern_0.bin and b/Tests/References/sindikat_pattern_0.bin differ diff --git a/Tests/References/sindikat_pattern_1.bin b/Tests/References/sindikat_pattern_1.bin index 62f65a6..b220882 100644 Binary files a/Tests/References/sindikat_pattern_1.bin and b/Tests/References/sindikat_pattern_1.bin differ diff --git a/Tests/References/sindikat_pattern_2.bin b/Tests/References/sindikat_pattern_2.bin index dd572dc..395d3b7 100644 Binary files a/Tests/References/sindikat_pattern_2.bin and b/Tests/References/sindikat_pattern_2.bin differ diff --git a/Tests/References/sindikat_pattern_3.bin b/Tests/References/sindikat_pattern_3.bin index a82a0aa..8d3a445 100644 Binary files a/Tests/References/sindikat_pattern_3.bin and b/Tests/References/sindikat_pattern_3.bin differ diff --git a/Tests/References/sindikat_tiles.csv b/Tests/References/sindikat_tiles.csv index cd35a77..a63f44d 100644 --- a/Tests/References/sindikat_tiles.csv +++ b/Tests/References/sindikat_tiles.csv @@ -84,7 +84,7 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 0,Images\sindikat.gif:0:64,2,18,144,16,8,8,46,1 0,Images\sindikat.gif:0:64,2,19,152,16,8,8,48,1 0,Images\sindikat.gif:0:64,2,20,160,16,8,8,50,1 -0,Images\sindikat.gif:0:64,2,21,168,16,8,8,4,1 +0,Images\sindikat.gif:0:64,2,21,168,16,8,8,10,1 0,Images\sindikat.gif:0:64,2,22,176,16,8,8,16,2 0,Images\sindikat.gif:0:64,2,23,184,16,8,8,52,2 0,Images\sindikat.gif:0:64,2,24,192,16,8,8,4,2 @@ -116,7 +116,7 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 0,Images\sindikat.gif:0:64,3,18,144,24,8,8,76,1 0,Images\sindikat.gif:0:64,3,19,152,24,8,8,78,1 0,Images\sindikat.gif:0:64,3,20,160,24,8,8,80,1 -0,Images\sindikat.gif:0:64,3,21,168,24,8,8,4,1 +0,Images\sindikat.gif:0:64,3,21,168,24,8,8,10,1 0,Images\sindikat.gif:0:64,3,22,176,24,8,8,16,2 0,Images\sindikat.gif:0:64,3,23,184,24,8,8,82,2 0,Images\sindikat.gif:0:64,3,24,192,24,8,8,4,2 @@ -133,125 +133,125 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 0,Images\sindikat.gif:0:64,4,3,24,32,8,8,92,1 0,Images\sindikat.gif:0:64,4,4,32,32,8,8,94,1 0,Images\sindikat.gif:0:64,4,5,40,32,8,8,0,1 -0,Images\sindikat.gif:0:64,4,6,48,32,8,8,2,1 -0,Images\sindikat.gif:0:64,4,7,56,32,8,8,96,1 +0,Images\sindikat.gif:0:64,4,6,48,32,8,8,96,1 +0,Images\sindikat.gif:0:64,4,7,56,32,8,8,98,1 0,Images\sindikat.gif:0:64,4,8,64,32,8,8,0,2 -0,Images\sindikat.gif:0:64,4,9,72,32,8,8,98,2 -0,Images\sindikat.gif:0:64,4,10,80,32,8,8,100,1 -0,Images\sindikat.gif:0:64,4,11,88,32,8,8,102,1 -0,Images\sindikat.gif:0:64,4,12,96,32,8,8,104,2 +0,Images\sindikat.gif:0:64,4,9,72,32,8,8,100,2 +0,Images\sindikat.gif:0:64,4,10,80,32,8,8,102,1 +0,Images\sindikat.gif:0:64,4,11,88,32,8,8,104,1 +0,Images\sindikat.gif:0:64,4,12,96,32,8,8,106,2 0,Images\sindikat.gif:0:64,4,13,104,32,8,8,8,2 -0,Images\sindikat.gif:0:64,4,14,112,32,8,8,106,2 -0,Images\sindikat.gif:0:64,4,15,120,32,8,8,108,2 -0,Images\sindikat.gif:0:64,4,16,128,32,8,8,110,1 -0,Images\sindikat.gif:0:64,4,17,136,32,8,8,112,1 -0,Images\sindikat.gif:0:64,4,18,144,32,8,8,114,1 -0,Images\sindikat.gif:0:64,4,19,152,32,8,8,116,1 -0,Images\sindikat.gif:0:64,4,20,160,32,8,8,118,1 -0,Images\sindikat.gif:0:64,4,21,168,32,8,8,4,1 +0,Images\sindikat.gif:0:64,4,14,112,32,8,8,108,2 +0,Images\sindikat.gif:0:64,4,15,120,32,8,8,110,2 +0,Images\sindikat.gif:0:64,4,16,128,32,8,8,112,1 +0,Images\sindikat.gif:0:64,4,17,136,32,8,8,114,1 +0,Images\sindikat.gif:0:64,4,18,144,32,8,8,116,1 +0,Images\sindikat.gif:0:64,4,19,152,32,8,8,118,1 +0,Images\sindikat.gif:0:64,4,20,160,32,8,8,120,1 +0,Images\sindikat.gif:0:64,4,21,168,32,8,8,10,1 0,Images\sindikat.gif:0:64,4,22,176,32,8,8,16,2 -0,Images\sindikat.gif:0:64,4,23,184,32,8,8,120,2 +0,Images\sindikat.gif:0:64,4,23,184,32,8,8,122,2 0,Images\sindikat.gif:0:64,4,24,192,32,8,8,4,2 -0,Images\sindikat.gif:0:64,4,25,200,32,8,8,122,2 -0,Images\sindikat.gif:0:64,4,26,208,32,8,8,124,1 -0,Images\sindikat.gif:0:64,4,27,216,32,8,8,126,1 -0,Images\sindikat.gif:0:64,4,28,224,32,8,8,128,0 +0,Images\sindikat.gif:0:64,4,25,200,32,8,8,124,2 +0,Images\sindikat.gif:0:64,4,26,208,32,8,8,126,1 +0,Images\sindikat.gif:0:64,4,27,216,32,8,8,128,1 +0,Images\sindikat.gif:0:64,4,28,224,32,8,8,130,0 0,Images\sindikat.gif:0:64,4,29,232,32,8,8,0,0 0,Images\sindikat.gif:0:64,4,30,240,32,8,8,0,0 0,Images\sindikat.gif:0:64,4,31,248,32,8,8,0,0 0,Images\sindikat.gif:0:64,5,0,0,40,8,8,0,3 -0,Images\sindikat.gif:0:64,5,1,8,40,8,8,130,3 -0,Images\sindikat.gif:0:64,5,2,16,40,8,8,132,1 -0,Images\sindikat.gif:0:64,5,3,24,40,8,8,134,1 -0,Images\sindikat.gif:0:64,5,4,32,40,8,8,136,1 -0,Images\sindikat.gif:0:64,5,5,40,40,8,8,138,1 -0,Images\sindikat.gif:0:64,5,6,48,40,8,8,140,1 -0,Images\sindikat.gif:0:64,5,7,56,40,8,8,142,1 -0,Images\sindikat.gif:0:64,5,8,64,40,8,8,144,2 +0,Images\sindikat.gif:0:64,5,1,8,40,8,8,132,3 +0,Images\sindikat.gif:0:64,5,2,16,40,8,8,134,1 +0,Images\sindikat.gif:0:64,5,3,24,40,8,8,136,1 +0,Images\sindikat.gif:0:64,5,4,32,40,8,8,138,1 +0,Images\sindikat.gif:0:64,5,5,40,40,8,8,140,1 +0,Images\sindikat.gif:0:64,5,6,48,40,8,8,142,1 +0,Images\sindikat.gif:0:64,5,7,56,40,8,8,144,1 +0,Images\sindikat.gif:0:64,5,8,64,40,8,8,146,2 0,Images\sindikat.gif:0:64,5,9,72,40,8,8,4,2 -0,Images\sindikat.gif:0:64,5,10,80,40,8,8,146,1 -0,Images\sindikat.gif:0:64,5,11,88,40,8,8,148,1 -0,Images\sindikat.gif:0:64,5,12,96,40,8,8,150,2 -0,Images\sindikat.gif:0:64,5,13,104,40,8,8,152,2 -0,Images\sindikat.gif:0:64,5,14,112,40,8,8,154,2 -0,Images\sindikat.gif:0:64,5,15,120,40,8,8,156,2 -0,Images\sindikat.gif:0:64,5,16,128,40,8,8,158,1 -0,Images\sindikat.gif:0:64,5,17,136,40,8,8,160,1 -0,Images\sindikat.gif:0:64,5,18,144,40,8,8,162,1 -0,Images\sindikat.gif:0:64,5,19,152,40,8,8,164,1 -0,Images\sindikat.gif:0:64,5,20,160,40,8,8,166,1 -0,Images\sindikat.gif:0:64,5,21,168,40,8,8,4,1 -0,Images\sindikat.gif:0:64,5,22,176,40,8,8,168,2 +0,Images\sindikat.gif:0:64,5,10,80,40,8,8,148,1 +0,Images\sindikat.gif:0:64,5,11,88,40,8,8,150,1 +0,Images\sindikat.gif:0:64,5,12,96,40,8,8,152,2 +0,Images\sindikat.gif:0:64,5,13,104,40,8,8,154,2 +0,Images\sindikat.gif:0:64,5,14,112,40,8,8,156,2 +0,Images\sindikat.gif:0:64,5,15,120,40,8,8,158,2 +0,Images\sindikat.gif:0:64,5,16,128,40,8,8,160,1 +0,Images\sindikat.gif:0:64,5,17,136,40,8,8,162,1 +0,Images\sindikat.gif:0:64,5,18,144,40,8,8,164,1 +0,Images\sindikat.gif:0:64,5,19,152,40,8,8,166,1 +0,Images\sindikat.gif:0:64,5,20,160,40,8,8,168,1 +0,Images\sindikat.gif:0:64,5,21,168,40,8,8,10,1 +0,Images\sindikat.gif:0:64,5,22,176,40,8,8,170,2 0,Images\sindikat.gif:0:64,5,23,184,40,8,8,82,2 0,Images\sindikat.gif:0:64,5,24,192,40,8,8,4,2 -0,Images\sindikat.gif:0:64,5,25,200,40,8,8,170,2 -0,Images\sindikat.gif:0:64,5,26,208,40,8,8,172,1 -0,Images\sindikat.gif:0:64,5,27,216,40,8,8,174,1 -0,Images\sindikat.gif:0:64,5,28,224,40,8,8,176,0 +0,Images\sindikat.gif:0:64,5,25,200,40,8,8,172,2 +0,Images\sindikat.gif:0:64,5,26,208,40,8,8,174,1 +0,Images\sindikat.gif:0:64,5,27,216,40,8,8,176,1 +0,Images\sindikat.gif:0:64,5,28,224,40,8,8,178,0 0,Images\sindikat.gif:0:64,5,29,232,40,8,8,0,0 0,Images\sindikat.gif:0:64,5,30,240,40,8,8,0,0 0,Images\sindikat.gif:0:64,5,31,248,40,8,8,0,0 -0,Images\sindikat.gif:0:64,6,0,0,48,8,8,178,3 -0,Images\sindikat.gif:0:64,6,1,8,48,8,8,180,3 +0,Images\sindikat.gif:0:64,6,0,0,48,8,8,180,3 +0,Images\sindikat.gif:0:64,6,1,8,48,8,8,182,3 0,Images\sindikat.gif:0:64,6,2,16,48,8,8,0,1 -0,Images\sindikat.gif:0:64,6,3,24,48,8,8,182,1 -0,Images\sindikat.gif:0:64,6,4,32,48,8,8,184,0 -0,Images\sindikat.gif:0:64,6,5,40,48,8,8,186,0 -0,Images\sindikat.gif:0:64,6,6,48,48,8,8,188,1 -0,Images\sindikat.gif:0:64,6,7,56,48,8,8,190,1 -0,Images\sindikat.gif:0:64,6,8,64,48,8,8,192,1 -0,Images\sindikat.gif:0:64,6,9,72,48,8,8,194,1 -0,Images\sindikat.gif:0:64,6,10,80,48,8,8,196,0 -0,Images\sindikat.gif:0:64,6,11,88,48,8,8,198,0 +0,Images\sindikat.gif:0:64,6,3,24,48,8,8,184,1 +0,Images\sindikat.gif:0:64,6,4,32,48,8,8,186,0 +0,Images\sindikat.gif:0:64,6,5,40,48,8,8,188,0 +0,Images\sindikat.gif:0:64,6,6,48,48,8,8,190,1 +0,Images\sindikat.gif:0:64,6,7,56,48,8,8,192,1 +0,Images\sindikat.gif:0:64,6,8,64,48,8,8,194,1 +0,Images\sindikat.gif:0:64,6,9,72,48,8,8,196,1 +0,Images\sindikat.gif:0:64,6,10,80,48,8,8,198,0 +0,Images\sindikat.gif:0:64,6,11,88,48,8,8,200,0 0,Images\sindikat.gif:0:64,6,12,96,48,8,8,0,1 -0,Images\sindikat.gif:0:64,6,13,104,48,8,8,200,1 -0,Images\sindikat.gif:0:64,6,14,112,48,8,8,202,1 -0,Images\sindikat.gif:0:64,6,15,120,48,8,8,204,1 -0,Images\sindikat.gif:0:64,6,16,128,48,8,8,206,1 -0,Images\sindikat.gif:0:64,6,17,136,48,8,8,208,1 -0,Images\sindikat.gif:0:64,6,18,144,48,8,8,210,0 -0,Images\sindikat.gif:0:64,6,19,152,48,8,8,212,0 -0,Images\sindikat.gif:0:64,6,20,160,48,8,8,214,1 -0,Images\sindikat.gif:0:64,6,21,168,48,8,8,216,1 -0,Images\sindikat.gif:0:64,6,22,176,48,8,8,218,1 -0,Images\sindikat.gif:0:64,6,23,184,48,8,8,4,1 -0,Images\sindikat.gif:0:64,6,24,192,48,8,8,4,1 -0,Images\sindikat.gif:0:64,6,25,200,48,8,8,220,1 -0,Images\sindikat.gif:0:64,6,26,208,48,8,8,222,1 -0,Images\sindikat.gif:0:64,6,27,216,48,8,8,224,1 -0,Images\sindikat.gif:0:64,6,28,224,48,8,8,226,0 +0,Images\sindikat.gif:0:64,6,13,104,48,8,8,202,1 +0,Images\sindikat.gif:0:64,6,14,112,48,8,8,204,1 +0,Images\sindikat.gif:0:64,6,15,120,48,8,8,206,1 +0,Images\sindikat.gif:0:64,6,16,128,48,8,8,208,1 +0,Images\sindikat.gif:0:64,6,17,136,48,8,8,210,1 +0,Images\sindikat.gif:0:64,6,18,144,48,8,8,212,0 +0,Images\sindikat.gif:0:64,6,19,152,48,8,8,214,0 +0,Images\sindikat.gif:0:64,6,20,160,48,8,8,216,1 +0,Images\sindikat.gif:0:64,6,21,168,48,8,8,218,1 +0,Images\sindikat.gif:0:64,6,22,176,48,8,8,220,1 +0,Images\sindikat.gif:0:64,6,23,184,48,8,8,10,1 +0,Images\sindikat.gif:0:64,6,24,192,48,8,8,10,1 +0,Images\sindikat.gif:0:64,6,25,200,48,8,8,222,1 +0,Images\sindikat.gif:0:64,6,26,208,48,8,8,224,1 +0,Images\sindikat.gif:0:64,6,27,216,48,8,8,226,1 +0,Images\sindikat.gif:0:64,6,28,224,48,8,8,228,0 0,Images\sindikat.gif:0:64,6,29,232,48,8,8,0,0 0,Images\sindikat.gif:0:64,6,30,240,48,8,8,0,0 0,Images\sindikat.gif:0:64,6,31,248,48,8,8,0,0 -0,Images\sindikat.gif:0:64,7,0,0,56,8,8,228,3 -0,Images\sindikat.gif:0:64,7,1,8,56,8,8,230,3 +0,Images\sindikat.gif:0:64,7,0,0,56,8,8,230,3 +0,Images\sindikat.gif:0:64,7,1,8,56,8,8,232,3 0,Images\sindikat.gif:0:64,7,2,16,56,8,8,0,1 -0,Images\sindikat.gif:0:64,7,3,24,56,8,8,232,1 -0,Images\sindikat.gif:0:64,7,4,32,56,8,8,234,0 -0,Images\sindikat.gif:0:64,7,5,40,56,8,8,236,0 -0,Images\sindikat.gif:0:64,7,6,48,56,8,8,238,1 -0,Images\sindikat.gif:0:64,7,7,56,56,8,8,4,1 -0,Images\sindikat.gif:0:64,7,8,64,56,8,8,4,1 -0,Images\sindikat.gif:0:64,7,9,72,56,8,8,240,1 -0,Images\sindikat.gif:0:64,7,10,80,56,8,8,242,0 -0,Images\sindikat.gif:0:64,7,11,88,56,8,8,244,0 +0,Images\sindikat.gif:0:64,7,3,24,56,8,8,234,1 +0,Images\sindikat.gif:0:64,7,4,32,56,8,8,236,0 +0,Images\sindikat.gif:0:64,7,5,40,56,8,8,238,0 +0,Images\sindikat.gif:0:64,7,6,48,56,8,8,240,1 +0,Images\sindikat.gif:0:64,7,7,56,56,8,8,10,1 +0,Images\sindikat.gif:0:64,7,8,64,56,8,8,10,1 +0,Images\sindikat.gif:0:64,7,9,72,56,8,8,242,1 +0,Images\sindikat.gif:0:64,7,10,80,56,8,8,244,0 +0,Images\sindikat.gif:0:64,7,11,88,56,8,8,246,0 0,Images\sindikat.gif:0:64,7,12,96,56,8,8,0,1 -0,Images\sindikat.gif:0:64,7,13,104,56,8,8,246,1 -0,Images\sindikat.gif:0:64,7,14,112,56,8,8,248,1 -0,Images\sindikat.gif:0:64,7,15,120,56,8,8,250,1 -0,Images\sindikat.gif:0:64,7,16,128,56,8,8,252,1 -0,Images\sindikat.gif:0:64,7,17,136,56,8,8,254,1 -0,Images\sindikat.gif:0:64,7,18,144,56,8,8,1,0 -0,Images\sindikat.gif:0:64,7,19,152,56,8,8,3,0 -0,Images\sindikat.gif:0:64,7,20,160,56,8,8,5,1 -0,Images\sindikat.gif:0:64,7,21,168,56,8,8,7,1 -0,Images\sindikat.gif:0:64,7,22,176,56,8,8,9,1 -0,Images\sindikat.gif:0:64,7,23,184,56,8,8,11,1 -0,Images\sindikat.gif:0:64,7,24,192,56,8,8,13,1 -0,Images\sindikat.gif:0:64,7,25,200,56,8,8,15,1 -0,Images\sindikat.gif:0:64,7,26,208,56,8,8,17,1 -0,Images\sindikat.gif:0:64,7,27,216,56,8,8,19,1 -0,Images\sindikat.gif:0:64,7,28,224,56,8,8,21,0 +0,Images\sindikat.gif:0:64,7,13,104,56,8,8,248,1 +0,Images\sindikat.gif:0:64,7,14,112,56,8,8,250,1 +0,Images\sindikat.gif:0:64,7,15,120,56,8,8,252,1 +0,Images\sindikat.gif:0:64,7,16,128,56,8,8,254,1 +0,Images\sindikat.gif:0:64,7,17,136,56,8,8,1,1 +0,Images\sindikat.gif:0:64,7,18,144,56,8,8,3,0 +0,Images\sindikat.gif:0:64,7,19,152,56,8,8,5,0 +0,Images\sindikat.gif:0:64,7,20,160,56,8,8,7,1 +0,Images\sindikat.gif:0:64,7,21,168,56,8,8,9,1 +0,Images\sindikat.gif:0:64,7,22,176,56,8,8,11,1 +0,Images\sindikat.gif:0:64,7,23,184,56,8,8,13,1 +0,Images\sindikat.gif:0:64,7,24,192,56,8,8,15,1 +0,Images\sindikat.gif:0:64,7,25,200,56,8,8,17,1 +0,Images\sindikat.gif:0:64,7,26,208,56,8,8,19,1 +0,Images\sindikat.gif:0:64,7,27,216,56,8,8,21,1 +0,Images\sindikat.gif:0:64,7,28,224,56,8,8,23,0 0,Images\sindikat.gif:0:64,7,29,232,56,8,8,0,0 0,Images\sindikat.gif:0:64,7,30,240,56,8,8,0,0 0,Images\sindikat.gif:0:64,7,31,248,56,8,8,0,0 diff --git a/Tests/References/sprites1_palette_0.bin b/Tests/References/sprites1_palette_0.bin index cf16aa7..35139bc 100644 --- a/Tests/References/sprites1_palette_0.bin +++ b/Tests/References/sprites1_palette_0.bin @@ -1 +1 @@ -$' \ No newline at end of file +$' \ No newline at end of file diff --git a/Tests/References/sprites1_pattern_0.bin b/Tests/References/sprites1_pattern_0.bin index 471269d..5cdee30 100644 Binary files a/Tests/References/sprites1_pattern_0.bin and b/Tests/References/sprites1_pattern_0.bin differ diff --git a/Tests/References/sprites2_palette_0.bin b/Tests/References/sprites2_palette_0.bin index 21cb787..ce70564 100644 --- a/Tests/References/sprites2_palette_0.bin +++ b/Tests/References/sprites2_palette_0.bin @@ -1 +1 @@ -' \ No newline at end of file +' \ No newline at end of file diff --git a/Tests/References/sprites2_pattern_0.bin b/Tests/References/sprites2_pattern_0.bin index 7f532c0..50c6b50 100644 Binary files a/Tests/References/sprites2_pattern_0.bin and b/Tests/References/sprites2_pattern_0.bin differ diff --git a/Tests/References/sputnik_palette_0.bin b/Tests/References/sputnik_palette_0.bin index 95f0913..fbcedbc 100644 --- a/Tests/References/sputnik_palette_0.bin +++ b/Tests/References/sputnik_palette_0.bin @@ -1 +1 @@ -  \ No newline at end of file +  \ No newline at end of file diff --git a/Tests/References/sputnik_palette_1.bin b/Tests/References/sputnik_palette_1.bin index c87a260..587672a 100644 --- a/Tests/References/sputnik_palette_1.bin +++ b/Tests/References/sputnik_palette_1.bin @@ -1 +1 @@ - 2" \ No newline at end of file + "2 \ No newline at end of file diff --git a/Tests/References/sputnik_palettes.csv b/Tests/References/sputnik_palettes.csv index 45224ca..7661ebe 100644 --- a/Tests/References/sputnik_palettes.csv +++ b/Tests/References/sputnik_palettes.csv @@ -1,3 +1,3 @@ palette_id,color0,color1,color2,color3 -0,#183C5C,#BCBCBC,#402C00,#000000 -1,#183C5C,#C4D4FC,#000000,#5C94FC +0,#183C5C,#000000,#402C00,#BCBCBC +1,#183C5C,#000000,#5C94FC,#C4D4FC diff --git a/Tests/References/sputnik_pattern_0.bin b/Tests/References/sputnik_pattern_0.bin index d49b161..0dc967b 100644 Binary files a/Tests/References/sputnik_pattern_0.bin and b/Tests/References/sputnik_pattern_0.bin differ diff --git a/Tests/References/sputnik_pattern_1.bin b/Tests/References/sputnik_pattern_1.bin index 2aa11e5..3350e1c 100644 Binary files a/Tests/References/sputnik_pattern_1.bin and b/Tests/References/sputnik_pattern_1.bin differ diff --git a/Tests/References/sputnik_pattern_2.bin b/Tests/References/sputnik_pattern_2.bin index ad491d7..ff8ce1e 100644 Binary files a/Tests/References/sputnik_pattern_2.bin and b/Tests/References/sputnik_pattern_2.bin differ diff --git a/Tests/References/sputnik_pattern_3.bin b/Tests/References/sputnik_pattern_3.bin index cb90756..d83ef68 100644 Binary files a/Tests/References/sputnik_pattern_3.bin and b/Tests/References/sputnik_pattern_3.bin differ diff --git a/Tests/References/sworm_name_table_0.bin b/Tests/References/sworm_name_table_0.bin index 332d5e4..51280fa 100644 Binary files a/Tests/References/sworm_name_table_0.bin and b/Tests/References/sworm_name_table_0.bin differ diff --git a/Tests/References/sworm_name_table_2.bin b/Tests/References/sworm_name_table_2.bin index 08abb0f..28a2e78 100644 Binary files a/Tests/References/sworm_name_table_2.bin and b/Tests/References/sworm_name_table_2.bin differ diff --git a/Tests/References/sworm_name_table_3.bin b/Tests/References/sworm_name_table_3.bin index 52648e6..bfa9c33 100644 Binary files a/Tests/References/sworm_name_table_3.bin and b/Tests/References/sworm_name_table_3.bin differ diff --git a/Tests/References/sworm_palette_0.bin b/Tests/References/sworm_palette_0.bin index da0c822..28ff349 100644 Binary files a/Tests/References/sworm_palette_0.bin and b/Tests/References/sworm_palette_0.bin differ diff --git a/Tests/References/sworm_palette_1.bin b/Tests/References/sworm_palette_1.bin index 6a46dbc..d5e1d59 100644 Binary files a/Tests/References/sworm_palette_1.bin and b/Tests/References/sworm_palette_1.bin differ diff --git a/Tests/References/sworm_palette_2.bin b/Tests/References/sworm_palette_2.bin index 0ecf67d..35ce8c2 100644 Binary files a/Tests/References/sworm_palette_2.bin and b/Tests/References/sworm_palette_2.bin differ diff --git a/Tests/References/sworm_palette_3.bin b/Tests/References/sworm_palette_3.bin index b9af6f7..df34dad 100644 Binary files a/Tests/References/sworm_palette_3.bin and b/Tests/References/sworm_palette_3.bin differ diff --git a/Tests/References/sworm_palettes.csv b/Tests/References/sworm_palettes.csv index 42d5a01..7f3f2a7 100644 --- a/Tests/References/sworm_palettes.csv +++ b/Tests/References/sworm_palettes.csv @@ -1,5 +1,5 @@ palette_id,color0,color1,color2,color3 -0,#747474,#C4C4C4,#000000,#BCBCBC -1,#747474,#BCBCBC,#FFFFFF,#C4C4C4 -2,#747474,#C4C4C4,#FFFFFF,#000000 -3,#747474,#000000,#FFFFFF,#BCBCBC +0,#747474,#000000,#BCBCBC,#C4C4C4 +1,#747474,#BCBCBC,#C4C4C4,#FFFFFF +2,#747474,#000000,#C4C4C4,#FFFFFF +3,#747474,#000000,#BCBCBC,#FFFFFF diff --git a/Tests/References/sworm_pattern_0.bin b/Tests/References/sworm_pattern_0.bin index 0c8a945..0729116 100644 Binary files a/Tests/References/sworm_pattern_0.bin and b/Tests/References/sworm_pattern_0.bin differ diff --git a/Tests/References/sworm_pattern_1.bin b/Tests/References/sworm_pattern_1.bin index 5affcab..1e3a5e4 100644 Binary files a/Tests/References/sworm_pattern_1.bin and b/Tests/References/sworm_pattern_1.bin differ diff --git a/Tests/References/sworm_pattern_2.bin b/Tests/References/sworm_pattern_2.bin index 814fdbf..2db6ade 100644 Binary files a/Tests/References/sworm_pattern_2.bin and b/Tests/References/sworm_pattern_2.bin differ diff --git a/Tests/References/sworm_pattern_3.bin b/Tests/References/sworm_pattern_3.bin index 152b636..787e913 100644 Binary files a/Tests/References/sworm_pattern_3.bin and b/Tests/References/sworm_pattern_3.bin differ diff --git a/Tests/References/sworm_tiles.csv b/Tests/References/sworm_tiles.csv index eb496c0..1b58a1a 100644 --- a/Tests/References/sworm_tiles.csv +++ b/Tests/References/sworm_tiles.csv @@ -30,231 +30,231 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 0,Images\sworm.gif:0:64,0,28,224,0,8,8,52,0 0,Images\sworm.gif:0:64,0,29,232,0,8,8,54,0 0,Images\sworm.gif:0:64,0,30,240,0,8,8,56,0 -0,Images\sworm.gif:0:64,0,31,248,0,8,8,30,0 -0,Images\sworm.gif:0:64,1,0,0,8,8,8,58,0 -0,Images\sworm.gif:0:64,1,1,8,8,8,8,60,0 -0,Images\sworm.gif:0:64,1,2,16,8,8,8,62,2 -0,Images\sworm.gif:0:64,1,3,24,8,8,8,64,2 -0,Images\sworm.gif:0:64,1,4,32,8,8,8,66,1 -0,Images\sworm.gif:0:64,1,5,40,8,8,8,68,1 -0,Images\sworm.gif:0:64,1,6,48,8,8,8,70,1 -0,Images\sworm.gif:0:64,1,7,56,8,8,8,72,1 -0,Images\sworm.gif:0:64,1,8,64,8,8,8,74,1 -0,Images\sworm.gif:0:64,1,9,72,8,8,8,76,1 -0,Images\sworm.gif:0:64,1,10,80,8,8,8,78,1 -0,Images\sworm.gif:0:64,1,11,88,8,8,8,80,1 -0,Images\sworm.gif:0:64,1,12,96,8,8,8,82,1 -0,Images\sworm.gif:0:64,1,13,104,8,8,8,84,1 -0,Images\sworm.gif:0:64,1,14,112,8,8,8,86,1 -0,Images\sworm.gif:0:64,1,15,120,8,8,8,88,1 -0,Images\sworm.gif:0:64,1,16,128,8,8,8,90,1 -0,Images\sworm.gif:0:64,1,17,136,8,8,8,92,1 -0,Images\sworm.gif:0:64,1,18,144,8,8,8,94,1 -0,Images\sworm.gif:0:64,1,19,152,8,8,8,96,1 -0,Images\sworm.gif:0:64,1,20,160,8,8,8,98,1 -0,Images\sworm.gif:0:64,1,21,168,8,8,8,100,1 -0,Images\sworm.gif:0:64,1,22,176,8,8,8,102,2 -0,Images\sworm.gif:0:64,1,23,184,8,8,8,104,2 -0,Images\sworm.gif:0:64,1,24,192,8,8,8,106,3 -0,Images\sworm.gif:0:64,1,25,200,8,8,8,108,3 -0,Images\sworm.gif:0:64,1,26,208,8,8,8,110,0 -0,Images\sworm.gif:0:64,1,27,216,8,8,8,112,0 -0,Images\sworm.gif:0:64,1,28,224,8,8,8,114,0 -0,Images\sworm.gif:0:64,1,29,232,8,8,8,116,0 -0,Images\sworm.gif:0:64,1,30,240,8,8,8,118,0 -0,Images\sworm.gif:0:64,1,31,248,8,8,8,30,0 -0,Images\sworm.gif:0:64,2,0,0,16,8,8,120,0 -0,Images\sworm.gif:0:64,2,1,8,16,8,8,122,0 -0,Images\sworm.gif:0:64,2,2,16,16,8,8,124,2 -0,Images\sworm.gif:0:64,2,3,24,16,8,8,126,2 -0,Images\sworm.gif:0:64,2,4,32,16,8,8,128,1 -0,Images\sworm.gif:0:64,2,5,40,16,8,8,130,1 -0,Images\sworm.gif:0:64,2,6,48,16,8,8,132,3 -0,Images\sworm.gif:0:64,2,7,56,16,8,8,134,3 -0,Images\sworm.gif:0:64,2,8,64,16,8,8,136,1 -0,Images\sworm.gif:0:64,2,9,72,16,8,8,138,1 -0,Images\sworm.gif:0:64,2,10,80,16,8,8,140,1 -0,Images\sworm.gif:0:64,2,11,88,16,8,8,142,1 -0,Images\sworm.gif:0:64,2,12,96,16,8,8,144,1 -0,Images\sworm.gif:0:64,2,13,104,16,8,8,146,1 -0,Images\sworm.gif:0:64,2,14,112,16,8,8,148,1 -0,Images\sworm.gif:0:64,2,15,120,16,8,8,150,1 -0,Images\sworm.gif:0:64,2,16,128,16,8,8,152,1 -0,Images\sworm.gif:0:64,2,17,136,16,8,8,154,1 -0,Images\sworm.gif:0:64,2,18,144,16,8,8,156,1 -0,Images\sworm.gif:0:64,2,19,152,16,8,8,158,1 -0,Images\sworm.gif:0:64,2,20,160,16,8,8,160,2 -0,Images\sworm.gif:0:64,2,21,168,16,8,8,162,2 -0,Images\sworm.gif:0:64,2,22,176,16,8,8,164,2 -0,Images\sworm.gif:0:64,2,23,184,16,8,8,166,2 -0,Images\sworm.gif:0:64,2,24,192,16,8,8,168,2 -0,Images\sworm.gif:0:64,2,25,200,16,8,8,170,2 -0,Images\sworm.gif:0:64,2,26,208,16,8,8,172,0 -0,Images\sworm.gif:0:64,2,27,216,16,8,8,174,0 -0,Images\sworm.gif:0:64,2,28,224,16,8,8,176,0 -0,Images\sworm.gif:0:64,2,29,232,16,8,8,178,0 -0,Images\sworm.gif:0:64,2,30,240,16,8,8,180,0 -0,Images\sworm.gif:0:64,2,31,248,16,8,8,30,0 -0,Images\sworm.gif:0:64,3,0,0,24,8,8,182,0 -0,Images\sworm.gif:0:64,3,1,8,24,8,8,184,0 -0,Images\sworm.gif:0:64,3,2,16,24,8,8,186,2 -0,Images\sworm.gif:0:64,3,3,24,24,8,8,188,2 -0,Images\sworm.gif:0:64,3,4,32,24,8,8,190,1 -0,Images\sworm.gif:0:64,3,5,40,24,8,8,192,1 -0,Images\sworm.gif:0:64,3,6,48,24,8,8,194,3 -0,Images\sworm.gif:0:64,3,7,56,24,8,8,196,3 -0,Images\sworm.gif:0:64,3,8,64,24,8,8,198,1 -0,Images\sworm.gif:0:64,3,9,72,24,8,8,200,1 -0,Images\sworm.gif:0:64,3,10,80,24,8,8,202,1 -0,Images\sworm.gif:0:64,3,11,88,24,8,8,204,1 -0,Images\sworm.gif:0:64,3,12,96,24,8,8,206,1 -0,Images\sworm.gif:0:64,3,13,104,24,8,8,208,1 -0,Images\sworm.gif:0:64,3,14,112,24,8,8,210,1 -0,Images\sworm.gif:0:64,3,15,120,24,8,8,212,1 -0,Images\sworm.gif:0:64,3,16,128,24,8,8,214,1 -0,Images\sworm.gif:0:64,3,17,136,24,8,8,216,1 -0,Images\sworm.gif:0:64,3,18,144,24,8,8,218,1 -0,Images\sworm.gif:0:64,3,19,152,24,8,8,220,1 -0,Images\sworm.gif:0:64,3,20,160,24,8,8,222,2 -0,Images\sworm.gif:0:64,3,21,168,24,8,8,224,2 -0,Images\sworm.gif:0:64,3,22,176,24,8,8,226,2 -0,Images\sworm.gif:0:64,3,23,184,24,8,8,228,2 -0,Images\sworm.gif:0:64,3,24,192,24,8,8,230,2 -0,Images\sworm.gif:0:64,3,25,200,24,8,8,232,2 -0,Images\sworm.gif:0:64,3,26,208,24,8,8,234,0 -0,Images\sworm.gif:0:64,3,27,216,24,8,8,236,0 -0,Images\sworm.gif:0:64,3,28,224,24,8,8,238,0 -0,Images\sworm.gif:0:64,3,29,232,24,8,8,240,0 -0,Images\sworm.gif:0:64,3,30,240,24,8,8,242,0 -0,Images\sworm.gif:0:64,3,31,248,24,8,8,30,0 -0,Images\sworm.gif:0:64,4,0,0,32,8,8,244,0 -0,Images\sworm.gif:0:64,4,1,8,32,8,8,246,0 -0,Images\sworm.gif:0:64,4,2,16,32,8,8,248,1 -0,Images\sworm.gif:0:64,4,3,24,32,8,8,250,1 -0,Images\sworm.gif:0:64,4,4,32,32,8,8,252,1 -0,Images\sworm.gif:0:64,4,5,40,32,8,8,254,1 -0,Images\sworm.gif:0:64,4,6,48,32,8,8,1,1 -0,Images\sworm.gif:0:64,4,7,56,32,8,8,3,1 -0,Images\sworm.gif:0:64,4,8,64,32,8,8,5,3 -0,Images\sworm.gif:0:64,4,9,72,32,8,8,7,3 -0,Images\sworm.gif:0:64,4,10,80,32,8,8,9,3 -0,Images\sworm.gif:0:64,4,11,88,32,8,8,11,3 -0,Images\sworm.gif:0:64,4,12,96,32,8,8,13,1 -0,Images\sworm.gif:0:64,4,13,104,32,8,8,15,1 -0,Images\sworm.gif:0:64,4,14,112,32,8,8,17,1 -0,Images\sworm.gif:0:64,4,15,120,32,8,8,19,1 -0,Images\sworm.gif:0:64,4,16,128,32,8,8,21,1 -0,Images\sworm.gif:0:64,4,17,136,32,8,8,23,1 -0,Images\sworm.gif:0:64,4,18,144,32,8,8,25,1 -0,Images\sworm.gif:0:64,4,19,152,32,8,8,27,1 -0,Images\sworm.gif:0:64,4,20,160,32,8,8,29,2 -0,Images\sworm.gif:0:64,4,21,168,32,8,8,31,2 -0,Images\sworm.gif:0:64,4,22,176,32,8,8,33,3 -0,Images\sworm.gif:0:64,4,23,184,32,8,8,35,3 -0,Images\sworm.gif:0:64,4,24,192,32,8,8,37,2 -0,Images\sworm.gif:0:64,4,25,200,32,8,8,186,2 -0,Images\sworm.gif:0:64,4,26,208,32,8,8,39,1 -0,Images\sworm.gif:0:64,4,27,216,32,8,8,41,1 -0,Images\sworm.gif:0:64,4,28,224,32,8,8,43,3 -0,Images\sworm.gif:0:64,4,29,232,32,8,8,45,3 -0,Images\sworm.gif:0:64,4,30,240,32,8,8,47,0 -0,Images\sworm.gif:0:64,4,31,248,32,8,8,49,0 -0,Images\sworm.gif:0:64,5,0,0,40,8,8,51,0 -0,Images\sworm.gif:0:64,5,1,8,40,8,8,53,0 -0,Images\sworm.gif:0:64,5,2,16,40,8,8,55,1 -0,Images\sworm.gif:0:64,5,3,24,40,8,8,57,1 -0,Images\sworm.gif:0:64,5,4,32,40,8,8,59,1 -0,Images\sworm.gif:0:64,5,5,40,40,8,8,61,1 -0,Images\sworm.gif:0:64,5,6,48,40,8,8,63,1 -0,Images\sworm.gif:0:64,5,7,56,40,8,8,65,1 -0,Images\sworm.gif:0:64,5,8,64,40,8,8,67,3 -0,Images\sworm.gif:0:64,5,9,72,40,8,8,69,3 -0,Images\sworm.gif:0:64,5,10,80,40,8,8,71,3 -0,Images\sworm.gif:0:64,5,11,88,40,8,8,73,3 -0,Images\sworm.gif:0:64,5,12,96,40,8,8,75,1 -0,Images\sworm.gif:0:64,5,13,104,40,8,8,77,1 -0,Images\sworm.gif:0:64,5,14,112,40,8,8,79,1 -0,Images\sworm.gif:0:64,5,15,120,40,8,8,81,1 -0,Images\sworm.gif:0:64,5,16,128,40,8,8,83,1 -0,Images\sworm.gif:0:64,5,17,136,40,8,8,85,1 -0,Images\sworm.gif:0:64,5,18,144,40,8,8,87,1 -0,Images\sworm.gif:0:64,5,19,152,40,8,8,89,1 -0,Images\sworm.gif:0:64,5,20,160,40,8,8,91,2 -0,Images\sworm.gif:0:64,5,21,168,40,8,8,93,2 -0,Images\sworm.gif:0:64,5,22,176,40,8,8,95,3 -0,Images\sworm.gif:0:64,5,23,184,40,8,8,97,3 -0,Images\sworm.gif:0:64,5,24,192,40,8,8,99,2 -0,Images\sworm.gif:0:64,5,25,200,40,8,8,186,2 -0,Images\sworm.gif:0:64,5,26,208,40,8,8,101,1 -0,Images\sworm.gif:0:64,5,27,216,40,8,8,103,1 -0,Images\sworm.gif:0:64,5,28,224,40,8,8,105,3 -0,Images\sworm.gif:0:64,5,29,232,40,8,8,107,3 -0,Images\sworm.gif:0:64,5,30,240,40,8,8,109,0 -0,Images\sworm.gif:0:64,5,31,248,40,8,8,111,0 -0,Images\sworm.gif:0:64,6,0,0,48,8,8,113,3 -0,Images\sworm.gif:0:64,6,1,8,48,8,8,115,3 -0,Images\sworm.gif:0:64,6,2,16,48,8,8,117,1 -0,Images\sworm.gif:0:64,6,3,24,48,8,8,119,1 -0,Images\sworm.gif:0:64,6,4,32,48,8,8,121,1 -0,Images\sworm.gif:0:64,6,5,40,48,8,8,123,1 -0,Images\sworm.gif:0:64,6,6,48,48,8,8,125,1 -0,Images\sworm.gif:0:64,6,7,56,48,8,8,127,1 -0,Images\sworm.gif:0:64,6,8,64,48,8,8,129,2 -0,Images\sworm.gif:0:64,6,9,72,48,8,8,131,2 -0,Images\sworm.gif:0:64,6,10,80,48,8,8,133,1 -0,Images\sworm.gif:0:64,6,11,88,48,8,8,135,1 -0,Images\sworm.gif:0:64,6,12,96,48,8,8,137,1 -0,Images\sworm.gif:0:64,6,13,104,48,8,8,139,1 -0,Images\sworm.gif:0:64,6,14,112,48,8,8,141,3 -0,Images\sworm.gif:0:64,6,15,120,48,8,8,143,3 -0,Images\sworm.gif:0:64,6,16,128,48,8,8,145,3 -0,Images\sworm.gif:0:64,6,17,136,48,8,8,147,3 -0,Images\sworm.gif:0:64,6,18,144,48,8,8,149,1 -0,Images\sworm.gif:0:64,6,19,152,48,8,8,151,1 -0,Images\sworm.gif:0:64,6,20,160,48,8,8,153,3 -0,Images\sworm.gif:0:64,6,21,168,48,8,8,155,3 -0,Images\sworm.gif:0:64,6,22,176,48,8,8,157,2 -0,Images\sworm.gif:0:64,6,23,184,48,8,8,159,2 -0,Images\sworm.gif:0:64,6,24,192,48,8,8,161,1 -0,Images\sworm.gif:0:64,6,25,200,48,8,8,163,1 -0,Images\sworm.gif:0:64,6,26,208,48,8,8,165,1 -0,Images\sworm.gif:0:64,6,27,216,48,8,8,167,1 -0,Images\sworm.gif:0:64,6,28,224,48,8,8,169,0 -0,Images\sworm.gif:0:64,6,29,232,48,8,8,171,0 -0,Images\sworm.gif:0:64,6,30,240,48,8,8,173,0 -0,Images\sworm.gif:0:64,6,31,248,48,8,8,175,0 -0,Images\sworm.gif:0:64,7,0,0,56,8,8,177,3 -0,Images\sworm.gif:0:64,7,1,8,56,8,8,179,3 -0,Images\sworm.gif:0:64,7,2,16,56,8,8,181,1 -0,Images\sworm.gif:0:64,7,3,24,56,8,8,183,1 -0,Images\sworm.gif:0:64,7,4,32,56,8,8,185,1 -0,Images\sworm.gif:0:64,7,5,40,56,8,8,187,1 -0,Images\sworm.gif:0:64,7,6,48,56,8,8,189,1 -0,Images\sworm.gif:0:64,7,7,56,56,8,8,191,1 -0,Images\sworm.gif:0:64,7,8,64,56,8,8,193,2 -0,Images\sworm.gif:0:64,7,9,72,56,8,8,195,2 -0,Images\sworm.gif:0:64,7,10,80,56,8,8,197,1 -0,Images\sworm.gif:0:64,7,11,88,56,8,8,199,1 -0,Images\sworm.gif:0:64,7,12,96,56,8,8,201,1 -0,Images\sworm.gif:0:64,7,13,104,56,8,8,203,1 -0,Images\sworm.gif:0:64,7,14,112,56,8,8,205,3 -0,Images\sworm.gif:0:64,7,15,120,56,8,8,207,3 -0,Images\sworm.gif:0:64,7,16,128,56,8,8,209,3 -0,Images\sworm.gif:0:64,7,17,136,56,8,8,211,3 -0,Images\sworm.gif:0:64,7,18,144,56,8,8,213,1 -0,Images\sworm.gif:0:64,7,19,152,56,8,8,215,1 -0,Images\sworm.gif:0:64,7,20,160,56,8,8,217,3 -0,Images\sworm.gif:0:64,7,21,168,56,8,8,219,3 -0,Images\sworm.gif:0:64,7,22,176,56,8,8,221,2 -0,Images\sworm.gif:0:64,7,23,184,56,8,8,223,2 -0,Images\sworm.gif:0:64,7,24,192,56,8,8,225,1 -0,Images\sworm.gif:0:64,7,25,200,56,8,8,227,1 -0,Images\sworm.gif:0:64,7,26,208,56,8,8,229,1 -0,Images\sworm.gif:0:64,7,27,216,56,8,8,231,1 -0,Images\sworm.gif:0:64,7,28,224,56,8,8,233,0 -0,Images\sworm.gif:0:64,7,29,232,56,8,8,235,0 -0,Images\sworm.gif:0:64,7,30,240,56,8,8,237,0 -0,Images\sworm.gif:0:64,7,31,248,56,8,8,239,0 +0,Images\sworm.gif:0:64,0,31,248,0,8,8,58,0 +0,Images\sworm.gif:0:64,1,0,0,8,8,8,60,0 +0,Images\sworm.gif:0:64,1,1,8,8,8,8,62,0 +0,Images\sworm.gif:0:64,1,2,16,8,8,8,64,2 +0,Images\sworm.gif:0:64,1,3,24,8,8,8,66,2 +0,Images\sworm.gif:0:64,1,4,32,8,8,8,68,1 +0,Images\sworm.gif:0:64,1,5,40,8,8,8,70,1 +0,Images\sworm.gif:0:64,1,6,48,8,8,8,72,1 +0,Images\sworm.gif:0:64,1,7,56,8,8,8,74,1 +0,Images\sworm.gif:0:64,1,8,64,8,8,8,76,1 +0,Images\sworm.gif:0:64,1,9,72,8,8,8,78,1 +0,Images\sworm.gif:0:64,1,10,80,8,8,8,80,1 +0,Images\sworm.gif:0:64,1,11,88,8,8,8,82,1 +0,Images\sworm.gif:0:64,1,12,96,8,8,8,84,1 +0,Images\sworm.gif:0:64,1,13,104,8,8,8,86,1 +0,Images\sworm.gif:0:64,1,14,112,8,8,8,88,1 +0,Images\sworm.gif:0:64,1,15,120,8,8,8,90,1 +0,Images\sworm.gif:0:64,1,16,128,8,8,8,92,1 +0,Images\sworm.gif:0:64,1,17,136,8,8,8,94,1 +0,Images\sworm.gif:0:64,1,18,144,8,8,8,96,1 +0,Images\sworm.gif:0:64,1,19,152,8,8,8,98,1 +0,Images\sworm.gif:0:64,1,20,160,8,8,8,100,1 +0,Images\sworm.gif:0:64,1,21,168,8,8,8,102,1 +0,Images\sworm.gif:0:64,1,22,176,8,8,8,104,2 +0,Images\sworm.gif:0:64,1,23,184,8,8,8,106,2 +0,Images\sworm.gif:0:64,1,24,192,8,8,8,108,3 +0,Images\sworm.gif:0:64,1,25,200,8,8,8,110,3 +0,Images\sworm.gif:0:64,1,26,208,8,8,8,112,0 +0,Images\sworm.gif:0:64,1,27,216,8,8,8,114,0 +0,Images\sworm.gif:0:64,1,28,224,8,8,8,116,0 +0,Images\sworm.gif:0:64,1,29,232,8,8,8,118,0 +0,Images\sworm.gif:0:64,1,30,240,8,8,8,120,0 +0,Images\sworm.gif:0:64,1,31,248,8,8,8,58,0 +0,Images\sworm.gif:0:64,2,0,0,16,8,8,122,0 +0,Images\sworm.gif:0:64,2,1,8,16,8,8,124,0 +0,Images\sworm.gif:0:64,2,2,16,16,8,8,126,2 +0,Images\sworm.gif:0:64,2,3,24,16,8,8,128,2 +0,Images\sworm.gif:0:64,2,4,32,16,8,8,130,1 +0,Images\sworm.gif:0:64,2,5,40,16,8,8,132,1 +0,Images\sworm.gif:0:64,2,6,48,16,8,8,134,3 +0,Images\sworm.gif:0:64,2,7,56,16,8,8,136,3 +0,Images\sworm.gif:0:64,2,8,64,16,8,8,138,1 +0,Images\sworm.gif:0:64,2,9,72,16,8,8,140,1 +0,Images\sworm.gif:0:64,2,10,80,16,8,8,142,1 +0,Images\sworm.gif:0:64,2,11,88,16,8,8,144,1 +0,Images\sworm.gif:0:64,2,12,96,16,8,8,146,1 +0,Images\sworm.gif:0:64,2,13,104,16,8,8,148,1 +0,Images\sworm.gif:0:64,2,14,112,16,8,8,150,1 +0,Images\sworm.gif:0:64,2,15,120,16,8,8,152,1 +0,Images\sworm.gif:0:64,2,16,128,16,8,8,154,1 +0,Images\sworm.gif:0:64,2,17,136,16,8,8,156,1 +0,Images\sworm.gif:0:64,2,18,144,16,8,8,158,1 +0,Images\sworm.gif:0:64,2,19,152,16,8,8,160,1 +0,Images\sworm.gif:0:64,2,20,160,16,8,8,162,2 +0,Images\sworm.gif:0:64,2,21,168,16,8,8,164,2 +0,Images\sworm.gif:0:64,2,22,176,16,8,8,166,2 +0,Images\sworm.gif:0:64,2,23,184,16,8,8,168,2 +0,Images\sworm.gif:0:64,2,24,192,16,8,8,170,2 +0,Images\sworm.gif:0:64,2,25,200,16,8,8,172,2 +0,Images\sworm.gif:0:64,2,26,208,16,8,8,174,0 +0,Images\sworm.gif:0:64,2,27,216,16,8,8,176,0 +0,Images\sworm.gif:0:64,2,28,224,16,8,8,178,0 +0,Images\sworm.gif:0:64,2,29,232,16,8,8,180,0 +0,Images\sworm.gif:0:64,2,30,240,16,8,8,182,0 +0,Images\sworm.gif:0:64,2,31,248,16,8,8,58,0 +0,Images\sworm.gif:0:64,3,0,0,24,8,8,184,0 +0,Images\sworm.gif:0:64,3,1,8,24,8,8,186,0 +0,Images\sworm.gif:0:64,3,2,16,24,8,8,188,2 +0,Images\sworm.gif:0:64,3,3,24,24,8,8,190,2 +0,Images\sworm.gif:0:64,3,4,32,24,8,8,192,1 +0,Images\sworm.gif:0:64,3,5,40,24,8,8,194,1 +0,Images\sworm.gif:0:64,3,6,48,24,8,8,196,3 +0,Images\sworm.gif:0:64,3,7,56,24,8,8,198,3 +0,Images\sworm.gif:0:64,3,8,64,24,8,8,200,1 +0,Images\sworm.gif:0:64,3,9,72,24,8,8,202,1 +0,Images\sworm.gif:0:64,3,10,80,24,8,8,204,1 +0,Images\sworm.gif:0:64,3,11,88,24,8,8,206,1 +0,Images\sworm.gif:0:64,3,12,96,24,8,8,208,1 +0,Images\sworm.gif:0:64,3,13,104,24,8,8,210,1 +0,Images\sworm.gif:0:64,3,14,112,24,8,8,212,1 +0,Images\sworm.gif:0:64,3,15,120,24,8,8,214,1 +0,Images\sworm.gif:0:64,3,16,128,24,8,8,216,1 +0,Images\sworm.gif:0:64,3,17,136,24,8,8,218,1 +0,Images\sworm.gif:0:64,3,18,144,24,8,8,220,1 +0,Images\sworm.gif:0:64,3,19,152,24,8,8,222,1 +0,Images\sworm.gif:0:64,3,20,160,24,8,8,224,2 +0,Images\sworm.gif:0:64,3,21,168,24,8,8,226,2 +0,Images\sworm.gif:0:64,3,22,176,24,8,8,228,2 +0,Images\sworm.gif:0:64,3,23,184,24,8,8,230,2 +0,Images\sworm.gif:0:64,3,24,192,24,8,8,232,2 +0,Images\sworm.gif:0:64,3,25,200,24,8,8,234,2 +0,Images\sworm.gif:0:64,3,26,208,24,8,8,236,0 +0,Images\sworm.gif:0:64,3,27,216,24,8,8,238,0 +0,Images\sworm.gif:0:64,3,28,224,24,8,8,240,0 +0,Images\sworm.gif:0:64,3,29,232,24,8,8,242,0 +0,Images\sworm.gif:0:64,3,30,240,24,8,8,244,0 +0,Images\sworm.gif:0:64,3,31,248,24,8,8,58,0 +0,Images\sworm.gif:0:64,4,0,0,32,8,8,246,0 +0,Images\sworm.gif:0:64,4,1,8,32,8,8,248,0 +0,Images\sworm.gif:0:64,4,2,16,32,8,8,250,1 +0,Images\sworm.gif:0:64,4,3,24,32,8,8,252,1 +0,Images\sworm.gif:0:64,4,4,32,32,8,8,254,1 +0,Images\sworm.gif:0:64,4,5,40,32,8,8,1,1 +0,Images\sworm.gif:0:64,4,6,48,32,8,8,3,1 +0,Images\sworm.gif:0:64,4,7,56,32,8,8,5,1 +0,Images\sworm.gif:0:64,4,8,64,32,8,8,7,3 +0,Images\sworm.gif:0:64,4,9,72,32,8,8,9,3 +0,Images\sworm.gif:0:64,4,10,80,32,8,8,11,3 +0,Images\sworm.gif:0:64,4,11,88,32,8,8,13,3 +0,Images\sworm.gif:0:64,4,12,96,32,8,8,15,1 +0,Images\sworm.gif:0:64,4,13,104,32,8,8,17,1 +0,Images\sworm.gif:0:64,4,14,112,32,8,8,19,1 +0,Images\sworm.gif:0:64,4,15,120,32,8,8,21,1 +0,Images\sworm.gif:0:64,4,16,128,32,8,8,23,1 +0,Images\sworm.gif:0:64,4,17,136,32,8,8,25,1 +0,Images\sworm.gif:0:64,4,18,144,32,8,8,27,1 +0,Images\sworm.gif:0:64,4,19,152,32,8,8,29,1 +0,Images\sworm.gif:0:64,4,20,160,32,8,8,31,2 +0,Images\sworm.gif:0:64,4,21,168,32,8,8,33,2 +0,Images\sworm.gif:0:64,4,22,176,32,8,8,35,3 +0,Images\sworm.gif:0:64,4,23,184,32,8,8,37,3 +0,Images\sworm.gif:0:64,4,24,192,32,8,8,39,2 +0,Images\sworm.gif:0:64,4,25,200,32,8,8,188,2 +0,Images\sworm.gif:0:64,4,26,208,32,8,8,41,1 +0,Images\sworm.gif:0:64,4,27,216,32,8,8,43,1 +0,Images\sworm.gif:0:64,4,28,224,32,8,8,45,3 +0,Images\sworm.gif:0:64,4,29,232,32,8,8,47,3 +0,Images\sworm.gif:0:64,4,30,240,32,8,8,49,0 +0,Images\sworm.gif:0:64,4,31,248,32,8,8,51,0 +0,Images\sworm.gif:0:64,5,0,0,40,8,8,53,0 +0,Images\sworm.gif:0:64,5,1,8,40,8,8,55,0 +0,Images\sworm.gif:0:64,5,2,16,40,8,8,57,1 +0,Images\sworm.gif:0:64,5,3,24,40,8,8,59,1 +0,Images\sworm.gif:0:64,5,4,32,40,8,8,61,1 +0,Images\sworm.gif:0:64,5,5,40,40,8,8,63,1 +0,Images\sworm.gif:0:64,5,6,48,40,8,8,65,1 +0,Images\sworm.gif:0:64,5,7,56,40,8,8,67,1 +0,Images\sworm.gif:0:64,5,8,64,40,8,8,69,3 +0,Images\sworm.gif:0:64,5,9,72,40,8,8,71,3 +0,Images\sworm.gif:0:64,5,10,80,40,8,8,73,3 +0,Images\sworm.gif:0:64,5,11,88,40,8,8,75,3 +0,Images\sworm.gif:0:64,5,12,96,40,8,8,77,1 +0,Images\sworm.gif:0:64,5,13,104,40,8,8,79,1 +0,Images\sworm.gif:0:64,5,14,112,40,8,8,81,1 +0,Images\sworm.gif:0:64,5,15,120,40,8,8,83,1 +0,Images\sworm.gif:0:64,5,16,128,40,8,8,85,1 +0,Images\sworm.gif:0:64,5,17,136,40,8,8,87,1 +0,Images\sworm.gif:0:64,5,18,144,40,8,8,89,1 +0,Images\sworm.gif:0:64,5,19,152,40,8,8,91,1 +0,Images\sworm.gif:0:64,5,20,160,40,8,8,93,2 +0,Images\sworm.gif:0:64,5,21,168,40,8,8,95,2 +0,Images\sworm.gif:0:64,5,22,176,40,8,8,97,3 +0,Images\sworm.gif:0:64,5,23,184,40,8,8,99,3 +0,Images\sworm.gif:0:64,5,24,192,40,8,8,101,2 +0,Images\sworm.gif:0:64,5,25,200,40,8,8,188,2 +0,Images\sworm.gif:0:64,5,26,208,40,8,8,103,1 +0,Images\sworm.gif:0:64,5,27,216,40,8,8,105,1 +0,Images\sworm.gif:0:64,5,28,224,40,8,8,107,3 +0,Images\sworm.gif:0:64,5,29,232,40,8,8,109,3 +0,Images\sworm.gif:0:64,5,30,240,40,8,8,111,0 +0,Images\sworm.gif:0:64,5,31,248,40,8,8,113,0 +0,Images\sworm.gif:0:64,6,0,0,48,8,8,115,3 +0,Images\sworm.gif:0:64,6,1,8,48,8,8,117,3 +0,Images\sworm.gif:0:64,6,2,16,48,8,8,119,1 +0,Images\sworm.gif:0:64,6,3,24,48,8,8,121,1 +0,Images\sworm.gif:0:64,6,4,32,48,8,8,123,1 +0,Images\sworm.gif:0:64,6,5,40,48,8,8,125,1 +0,Images\sworm.gif:0:64,6,6,48,48,8,8,127,1 +0,Images\sworm.gif:0:64,6,7,56,48,8,8,129,1 +0,Images\sworm.gif:0:64,6,8,64,48,8,8,131,2 +0,Images\sworm.gif:0:64,6,9,72,48,8,8,133,2 +0,Images\sworm.gif:0:64,6,10,80,48,8,8,135,1 +0,Images\sworm.gif:0:64,6,11,88,48,8,8,137,1 +0,Images\sworm.gif:0:64,6,12,96,48,8,8,139,1 +0,Images\sworm.gif:0:64,6,13,104,48,8,8,141,1 +0,Images\sworm.gif:0:64,6,14,112,48,8,8,143,3 +0,Images\sworm.gif:0:64,6,15,120,48,8,8,145,3 +0,Images\sworm.gif:0:64,6,16,128,48,8,8,147,3 +0,Images\sworm.gif:0:64,6,17,136,48,8,8,149,3 +0,Images\sworm.gif:0:64,6,18,144,48,8,8,151,1 +0,Images\sworm.gif:0:64,6,19,152,48,8,8,153,1 +0,Images\sworm.gif:0:64,6,20,160,48,8,8,155,3 +0,Images\sworm.gif:0:64,6,21,168,48,8,8,157,3 +0,Images\sworm.gif:0:64,6,22,176,48,8,8,159,2 +0,Images\sworm.gif:0:64,6,23,184,48,8,8,161,2 +0,Images\sworm.gif:0:64,6,24,192,48,8,8,163,1 +0,Images\sworm.gif:0:64,6,25,200,48,8,8,165,1 +0,Images\sworm.gif:0:64,6,26,208,48,8,8,167,1 +0,Images\sworm.gif:0:64,6,27,216,48,8,8,169,1 +0,Images\sworm.gif:0:64,6,28,224,48,8,8,171,0 +0,Images\sworm.gif:0:64,6,29,232,48,8,8,173,0 +0,Images\sworm.gif:0:64,6,30,240,48,8,8,175,0 +0,Images\sworm.gif:0:64,6,31,248,48,8,8,177,0 +0,Images\sworm.gif:0:64,7,0,0,56,8,8,179,3 +0,Images\sworm.gif:0:64,7,1,8,56,8,8,181,3 +0,Images\sworm.gif:0:64,7,2,16,56,8,8,183,1 +0,Images\sworm.gif:0:64,7,3,24,56,8,8,185,1 +0,Images\sworm.gif:0:64,7,4,32,56,8,8,187,1 +0,Images\sworm.gif:0:64,7,5,40,56,8,8,189,1 +0,Images\sworm.gif:0:64,7,6,48,56,8,8,191,1 +0,Images\sworm.gif:0:64,7,7,56,56,8,8,193,1 +0,Images\sworm.gif:0:64,7,8,64,56,8,8,195,2 +0,Images\sworm.gif:0:64,7,9,72,56,8,8,197,2 +0,Images\sworm.gif:0:64,7,10,80,56,8,8,199,1 +0,Images\sworm.gif:0:64,7,11,88,56,8,8,201,1 +0,Images\sworm.gif:0:64,7,12,96,56,8,8,203,1 +0,Images\sworm.gif:0:64,7,13,104,56,8,8,205,1 +0,Images\sworm.gif:0:64,7,14,112,56,8,8,207,3 +0,Images\sworm.gif:0:64,7,15,120,56,8,8,209,3 +0,Images\sworm.gif:0:64,7,16,128,56,8,8,211,3 +0,Images\sworm.gif:0:64,7,17,136,56,8,8,213,3 +0,Images\sworm.gif:0:64,7,18,144,56,8,8,215,1 +0,Images\sworm.gif:0:64,7,19,152,56,8,8,217,1 +0,Images\sworm.gif:0:64,7,20,160,56,8,8,219,3 +0,Images\sworm.gif:0:64,7,21,168,56,8,8,221,3 +0,Images\sworm.gif:0:64,7,22,176,56,8,8,223,2 +0,Images\sworm.gif:0:64,7,23,184,56,8,8,225,2 +0,Images\sworm.gif:0:64,7,24,192,56,8,8,227,1 +0,Images\sworm.gif:0:64,7,25,200,56,8,8,229,1 +0,Images\sworm.gif:0:64,7,26,208,56,8,8,231,1 +0,Images\sworm.gif:0:64,7,27,216,56,8,8,233,1 +0,Images\sworm.gif:0:64,7,28,224,56,8,8,235,0 +0,Images\sworm.gif:0:64,7,29,232,56,8,8,237,0 +0,Images\sworm.gif:0:64,7,30,240,56,8,8,239,0 +0,Images\sworm.gif:0:64,7,31,248,56,8,8,241,0 1,Images\sworm.gif:64:64,0,0,0,0,8,8,0,0 1,Images\sworm.gif:64:64,0,1,8,0,8,8,2,0 1,Images\sworm.gif:64:64,0,2,16,0,8,8,4,0 @@ -700,65 +700,65 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 2,Images\sworm.gif:128:64,5,26,208,40,8,8,105,3 2,Images\sworm.gif:128:64,5,27,216,40,8,8,107,3 2,Images\sworm.gif:128:64,5,28,224,40,8,8,109,3 -2,Images\sworm.gif:128:64,5,29,232,40,8,8,111,3 -2,Images\sworm.gif:128:64,5,30,240,40,8,8,113,0 -2,Images\sworm.gif:128:64,5,31,248,40,8,8,115,0 -2,Images\sworm.gif:128:64,6,0,0,48,8,8,117,2 -2,Images\sworm.gif:128:64,6,1,8,48,8,8,119,2 -2,Images\sworm.gif:128:64,6,2,16,48,8,8,121,3 -2,Images\sworm.gif:128:64,6,3,24,48,8,8,123,3 -2,Images\sworm.gif:128:64,6,4,32,48,8,8,125,0 -2,Images\sworm.gif:128:64,6,5,40,48,8,8,127,0 -2,Images\sworm.gif:128:64,6,6,48,48,8,8,129,0 -2,Images\sworm.gif:128:64,6,7,56,48,8,8,131,0 -2,Images\sworm.gif:128:64,6,8,64,48,8,8,133,0 -2,Images\sworm.gif:128:64,6,9,72,48,8,8,135,0 -2,Images\sworm.gif:128:64,6,10,80,48,8,8,137,1 -2,Images\sworm.gif:128:64,6,11,88,48,8,8,139,1 -2,Images\sworm.gif:128:64,6,12,96,48,8,8,141,1 -2,Images\sworm.gif:128:64,6,13,104,48,8,8,143,1 -2,Images\sworm.gif:128:64,6,14,112,48,8,8,145,1 -2,Images\sworm.gif:128:64,6,15,120,48,8,8,147,1 -2,Images\sworm.gif:128:64,6,16,128,48,8,8,149,1 -2,Images\sworm.gif:128:64,6,17,136,48,8,8,151,1 -2,Images\sworm.gif:128:64,6,18,144,48,8,8,153,2 -2,Images\sworm.gif:128:64,6,19,152,48,8,8,155,2 -2,Images\sworm.gif:128:64,6,20,160,48,8,8,157,2 -2,Images\sworm.gif:128:64,6,21,168,48,8,8,159,2 -2,Images\sworm.gif:128:64,6,22,176,48,8,8,161,2 -2,Images\sworm.gif:128:64,6,23,184,48,8,8,163,2 -2,Images\sworm.gif:128:64,6,24,192,48,8,8,165,1 -2,Images\sworm.gif:128:64,6,25,200,48,8,8,167,1 -2,Images\sworm.gif:128:64,6,26,208,48,8,8,169,3 -2,Images\sworm.gif:128:64,6,27,216,48,8,8,171,3 -2,Images\sworm.gif:128:64,6,28,224,48,8,8,173,0 +2,Images\sworm.gif:128:64,5,29,232,40,8,8,186,3 +2,Images\sworm.gif:128:64,5,30,240,40,8,8,111,0 +2,Images\sworm.gif:128:64,5,31,248,40,8,8,113,0 +2,Images\sworm.gif:128:64,6,0,0,48,8,8,115,2 +2,Images\sworm.gif:128:64,6,1,8,48,8,8,117,2 +2,Images\sworm.gif:128:64,6,2,16,48,8,8,119,3 +2,Images\sworm.gif:128:64,6,3,24,48,8,8,121,3 +2,Images\sworm.gif:128:64,6,4,32,48,8,8,123,0 +2,Images\sworm.gif:128:64,6,5,40,48,8,8,125,0 +2,Images\sworm.gif:128:64,6,6,48,48,8,8,127,0 +2,Images\sworm.gif:128:64,6,7,56,48,8,8,129,0 +2,Images\sworm.gif:128:64,6,8,64,48,8,8,131,0 +2,Images\sworm.gif:128:64,6,9,72,48,8,8,133,0 +2,Images\sworm.gif:128:64,6,10,80,48,8,8,135,1 +2,Images\sworm.gif:128:64,6,11,88,48,8,8,137,1 +2,Images\sworm.gif:128:64,6,12,96,48,8,8,139,1 +2,Images\sworm.gif:128:64,6,13,104,48,8,8,141,1 +2,Images\sworm.gif:128:64,6,14,112,48,8,8,143,1 +2,Images\sworm.gif:128:64,6,15,120,48,8,8,145,1 +2,Images\sworm.gif:128:64,6,16,128,48,8,8,147,1 +2,Images\sworm.gif:128:64,6,17,136,48,8,8,149,1 +2,Images\sworm.gif:128:64,6,18,144,48,8,8,151,2 +2,Images\sworm.gif:128:64,6,19,152,48,8,8,153,2 +2,Images\sworm.gif:128:64,6,20,160,48,8,8,155,2 +2,Images\sworm.gif:128:64,6,21,168,48,8,8,157,2 +2,Images\sworm.gif:128:64,6,22,176,48,8,8,159,2 +2,Images\sworm.gif:128:64,6,23,184,48,8,8,161,2 +2,Images\sworm.gif:128:64,6,24,192,48,8,8,163,1 +2,Images\sworm.gif:128:64,6,25,200,48,8,8,165,1 +2,Images\sworm.gif:128:64,6,26,208,48,8,8,167,3 +2,Images\sworm.gif:128:64,6,27,216,48,8,8,169,3 +2,Images\sworm.gif:128:64,6,28,224,48,8,8,171,0 2,Images\sworm.gif:128:64,6,29,232,48,8,8,186,0 2,Images\sworm.gif:128:64,6,30,240,48,8,8,186,0 2,Images\sworm.gif:128:64,6,31,248,48,8,8,186,0 -2,Images\sworm.gif:128:64,7,0,0,56,8,8,175,2 -2,Images\sworm.gif:128:64,7,1,8,56,8,8,177,2 -2,Images\sworm.gif:128:64,7,2,16,56,8,8,179,3 -2,Images\sworm.gif:128:64,7,3,24,56,8,8,181,3 -2,Images\sworm.gif:128:64,7,4,32,56,8,8,183,0 -2,Images\sworm.gif:128:64,7,5,40,56,8,8,185,0 -2,Images\sworm.gif:128:64,7,6,48,56,8,8,187,0 -2,Images\sworm.gif:128:64,7,7,56,56,8,8,189,0 -2,Images\sworm.gif:128:64,7,8,64,56,8,8,191,0 -2,Images\sworm.gif:128:64,7,9,72,56,8,8,193,0 -2,Images\sworm.gif:128:64,7,10,80,56,8,8,195,1 -2,Images\sworm.gif:128:64,7,11,88,56,8,8,197,1 -2,Images\sworm.gif:128:64,7,12,96,56,8,8,199,1 -2,Images\sworm.gif:128:64,7,13,104,56,8,8,201,1 -2,Images\sworm.gif:128:64,7,14,112,56,8,8,203,1 -2,Images\sworm.gif:128:64,7,15,120,56,8,8,205,1 -2,Images\sworm.gif:128:64,7,16,128,56,8,8,207,1 -2,Images\sworm.gif:128:64,7,17,136,56,8,8,209,1 -2,Images\sworm.gif:128:64,7,18,144,56,8,8,211,2 -2,Images\sworm.gif:128:64,7,19,152,56,8,8,213,2 -2,Images\sworm.gif:128:64,7,20,160,56,8,8,215,2 -2,Images\sworm.gif:128:64,7,21,168,56,8,8,217,2 -2,Images\sworm.gif:128:64,7,22,176,56,8,8,219,2 -2,Images\sworm.gif:128:64,7,23,184,56,8,8,111,2 +2,Images\sworm.gif:128:64,7,0,0,56,8,8,173,2 +2,Images\sworm.gif:128:64,7,1,8,56,8,8,175,2 +2,Images\sworm.gif:128:64,7,2,16,56,8,8,177,3 +2,Images\sworm.gif:128:64,7,3,24,56,8,8,179,3 +2,Images\sworm.gif:128:64,7,4,32,56,8,8,181,0 +2,Images\sworm.gif:128:64,7,5,40,56,8,8,183,0 +2,Images\sworm.gif:128:64,7,6,48,56,8,8,185,0 +2,Images\sworm.gif:128:64,7,7,56,56,8,8,187,0 +2,Images\sworm.gif:128:64,7,8,64,56,8,8,189,0 +2,Images\sworm.gif:128:64,7,9,72,56,8,8,191,0 +2,Images\sworm.gif:128:64,7,10,80,56,8,8,193,1 +2,Images\sworm.gif:128:64,7,11,88,56,8,8,195,1 +2,Images\sworm.gif:128:64,7,12,96,56,8,8,197,1 +2,Images\sworm.gif:128:64,7,13,104,56,8,8,199,1 +2,Images\sworm.gif:128:64,7,14,112,56,8,8,201,1 +2,Images\sworm.gif:128:64,7,15,120,56,8,8,203,1 +2,Images\sworm.gif:128:64,7,16,128,56,8,8,205,1 +2,Images\sworm.gif:128:64,7,17,136,56,8,8,207,1 +2,Images\sworm.gif:128:64,7,18,144,56,8,8,209,2 +2,Images\sworm.gif:128:64,7,19,152,56,8,8,211,2 +2,Images\sworm.gif:128:64,7,20,160,56,8,8,213,2 +2,Images\sworm.gif:128:64,7,21,168,56,8,8,215,2 +2,Images\sworm.gif:128:64,7,22,176,56,8,8,217,2 +2,Images\sworm.gif:128:64,7,23,184,56,8,8,219,2 2,Images\sworm.gif:128:64,7,24,192,56,8,8,221,1 2,Images\sworm.gif:128:64,7,25,200,56,8,8,223,1 2,Images\sworm.gif:128:64,7,26,208,56,8,8,225,3 @@ -892,7 +892,7 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 3,Images\sworm.gif:192:48,3,26,208,24,8,8,206,0 3,Images\sworm.gif:192:48,3,27,216,24,8,8,208,0 3,Images\sworm.gif:192:48,3,28,224,24,8,8,210,3 -3,Images\sworm.gif:192:48,3,29,232,24,8,8,212,3 +3,Images\sworm.gif:192:48,3,29,232,24,8,8,54,3 3,Images\sworm.gif:192:48,3,30,240,24,8,8,54,0 3,Images\sworm.gif:192:48,3,31,248,24,8,8,54,0 3,Images\sworm.gif:192:48,4,0,0,32,8,8,54,0 @@ -903,31 +903,31 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 3,Images\sworm.gif:192:48,4,5,40,32,8,8,54,0 3,Images\sworm.gif:192:48,4,6,48,32,8,8,54,0 3,Images\sworm.gif:192:48,4,7,56,32,8,8,54,0 -3,Images\sworm.gif:192:48,4,8,64,32,8,8,214,0 +3,Images\sworm.gif:192:48,4,8,64,32,8,8,212,0 3,Images\sworm.gif:192:48,4,9,72,32,8,8,54,0 -3,Images\sworm.gif:192:48,4,10,80,32,8,8,216,0 -3,Images\sworm.gif:192:48,4,11,88,32,8,8,218,0 +3,Images\sworm.gif:192:48,4,10,80,32,8,8,214,0 +3,Images\sworm.gif:192:48,4,11,88,32,8,8,216,0 3,Images\sworm.gif:192:48,4,12,96,32,8,8,54,0 -3,Images\sworm.gif:192:48,4,13,104,32,8,8,220,0 -3,Images\sworm.gif:192:48,4,14,112,32,8,8,222,0 -3,Images\sworm.gif:192:48,4,15,120,32,8,8,224,0 +3,Images\sworm.gif:192:48,4,13,104,32,8,8,218,0 +3,Images\sworm.gif:192:48,4,14,112,32,8,8,220,0 +3,Images\sworm.gif:192:48,4,15,120,32,8,8,222,0 3,Images\sworm.gif:192:48,4,16,128,32,8,8,54,0 3,Images\sworm.gif:192:48,4,17,136,32,8,8,54,0 -3,Images\sworm.gif:192:48,4,18,144,32,8,8,226,0 -3,Images\sworm.gif:192:48,4,19,152,32,8,8,228,0 +3,Images\sworm.gif:192:48,4,18,144,32,8,8,224,0 +3,Images\sworm.gif:192:48,4,19,152,32,8,8,226,0 3,Images\sworm.gif:192:48,4,20,160,32,8,8,54,0 3,Images\sworm.gif:192:48,4,21,168,32,8,8,54,0 -3,Images\sworm.gif:192:48,4,22,176,32,8,8,230,0 +3,Images\sworm.gif:192:48,4,22,176,32,8,8,228,0 3,Images\sworm.gif:192:48,4,23,184,32,8,8,54,0 3,Images\sworm.gif:192:48,4,24,192,32,8,8,54,0 -3,Images\sworm.gif:192:48,4,25,200,32,8,8,232,0 +3,Images\sworm.gif:192:48,4,25,200,32,8,8,230,0 3,Images\sworm.gif:192:48,4,26,208,32,8,8,54,0 3,Images\sworm.gif:192:48,4,27,216,32,8,8,54,0 3,Images\sworm.gif:192:48,4,28,224,32,8,8,54,0 3,Images\sworm.gif:192:48,4,29,232,32,8,8,54,0 3,Images\sworm.gif:192:48,4,30,240,32,8,8,54,0 3,Images\sworm.gif:192:48,4,31,248,32,8,8,54,0 -3,Images\sworm.gif:192:48,5,0,0,40,8,8,234,0 +3,Images\sworm.gif:192:48,5,0,0,40,8,8,232,0 3,Images\sworm.gif:192:48,5,1,8,40,8,8,54,0 3,Images\sworm.gif:192:48,5,2,16,40,8,8,54,0 3,Images\sworm.gif:192:48,5,3,24,40,8,8,54,0 @@ -940,7 +940,7 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 3,Images\sworm.gif:192:48,5,10,80,40,8,8,54,0 3,Images\sworm.gif:192:48,5,11,88,40,8,8,54,0 3,Images\sworm.gif:192:48,5,12,96,40,8,8,54,0 -3,Images\sworm.gif:192:48,5,13,104,40,8,8,236,0 +3,Images\sworm.gif:192:48,5,13,104,40,8,8,234,0 3,Images\sworm.gif:192:48,5,14,112,40,8,8,54,0 3,Images\sworm.gif:192:48,5,15,120,40,8,8,54,0 3,Images\sworm.gif:192:48,5,16,128,40,8,8,54,0 @@ -956,6 +956,6 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 3,Images\sworm.gif:192:48,5,26,208,40,8,8,54,0 3,Images\sworm.gif:192:48,5,27,216,40,8,8,54,0 3,Images\sworm.gif:192:48,5,28,224,40,8,8,54,0 -3,Images\sworm.gif:192:48,5,29,232,40,8,8,238,0 +3,Images\sworm.gif:192:48,5,29,232,40,8,8,236,0 3,Images\sworm.gif:192:48,5,30,240,40,8,8,54,0 3,Images\sworm.gif:192:48,5,31,248,40,8,8,54,0 diff --git a/Tests/References/trailer-park_palette_0.bin b/Tests/References/trailer-park_palette_0.bin index 2133d55..1bb3f1e 100644 --- a/Tests/References/trailer-park_palette_0.bin +++ b/Tests/References/trailer-park_palette_0.bin @@ -1 +1 @@ -- 7 \ No newline at end of file +- 7 \ No newline at end of file diff --git a/Tests/References/trailer-park_palette_1.bin b/Tests/References/trailer-park_palette_1.bin index fa97f2c..b7df1b8 100644 --- a/Tests/References/trailer-park_palette_1.bin +++ b/Tests/References/trailer-park_palette_1.bin @@ -1 +1 @@ --"< \ No newline at end of file +-"< \ No newline at end of file diff --git a/Tests/References/trailer-park_palette_2.bin b/Tests/References/trailer-park_palette_2.bin index ec323c9..8f49e94 100644 --- a/Tests/References/trailer-park_palette_2.bin +++ b/Tests/References/trailer-park_palette_2.bin @@ -1 +1 @@ --7( \ No newline at end of file +-(7 \ No newline at end of file diff --git a/Tests/References/trailer-park_palettes.csv b/Tests/References/trailer-park_palettes.csv index 861f105..f6dd913 100644 --- a/Tests/References/trailer-park_palettes.csv +++ b/Tests/References/trailer-park_palettes.csv @@ -1,5 +1,5 @@ palette_id,color0,color1,color2,color3 -0,#787878,#183C5C,#FCD8A8,#000000 -1,#787878,#BCBCBC,#5C94FC,#9CFCF0 -2,#787878,#000000,#FCD8A8,#F0BC3C +0,#787878,#000000,#183C5C,#FCD8A8 +1,#787878,#5C94FC,#9CFCF0,#BCBCBC +2,#787878,#000000,#F0BC3C,#FCD8A8 3,#787878,#402C00,#E0FCA0,#FFFFFF diff --git a/Tests/References/trailer-park_pattern_0.bin b/Tests/References/trailer-park_pattern_0.bin index 9e930bf..fe570d6 100644 Binary files a/Tests/References/trailer-park_pattern_0.bin and b/Tests/References/trailer-park_pattern_0.bin differ diff --git a/Tests/References/trailer-park_pattern_1.bin b/Tests/References/trailer-park_pattern_1.bin index 04c75bc..e1b969d 100644 Binary files a/Tests/References/trailer-park_pattern_1.bin and b/Tests/References/trailer-park_pattern_1.bin differ diff --git a/Tests/References/trailer-park_pattern_2.bin b/Tests/References/trailer-park_pattern_2.bin index 3c11809..25195ab 100644 Binary files a/Tests/References/trailer-park_pattern_2.bin and b/Tests/References/trailer-park_pattern_2.bin differ diff --git a/Tests/References/trailer-park_pattern_3.bin b/Tests/References/trailer-park_pattern_3.bin index e2786bc..d5208b5 100644 Binary files a/Tests/References/trailer-park_pattern_3.bin and b/Tests/References/trailer-park_pattern_3.bin differ diff --git a/Tests/References/warface_logo_palette_0.bin b/Tests/References/warface_logo_palette_0.bin index 5b160a9..4244a60 100644 --- a/Tests/References/warface_logo_palette_0.bin +++ b/Tests/References/warface_logo_palette_0.bin @@ -1 +1 @@ -- = \ No newline at end of file +-= \ No newline at end of file diff --git a/Tests/References/warface_logo_palettes.csv b/Tests/References/warface_logo_palettes.csv index 13b50df..d577b85 100644 --- a/Tests/References/warface_logo_palettes.csv +++ b/Tests/References/warface_logo_palettes.csv @@ -1,2 +1,2 @@ palette_id,color0,color1,color2,color3 -0,#000000,#787878,#FCFCFC,#C4C4C4 +0,#000000,#787878,#C4C4C4,#FCFCFC diff --git a/Tests/References/warface_logo_pattern_0.bin b/Tests/References/warface_logo_pattern_0.bin index 765c9e6..07fbfa8 100644 Binary files a/Tests/References/warface_logo_pattern_0.bin and b/Tests/References/warface_logo_pattern_0.bin differ diff --git a/Tests/References/warface_logo_pattern_1.bin b/Tests/References/warface_logo_pattern_1.bin index 21cc671..99277bf 100644 Binary files a/Tests/References/warface_logo_pattern_1.bin and b/Tests/References/warface_logo_pattern_1.bin differ diff --git a/Tests/References/warface_logo_pattern_2.bin b/Tests/References/warface_logo_pattern_2.bin index 91b5140..ffd99e8 100644 Binary files a/Tests/References/warface_logo_pattern_2.bin and b/Tests/References/warface_logo_pattern_2.bin differ diff --git a/Tests/References/warface_logo_pattern_3.bin b/Tests/References/warface_logo_pattern_3.bin index e5cac00..50122f5 100644 Binary files a/Tests/References/warface_logo_pattern_3.bin and b/Tests/References/warface_logo_pattern_3.bin differ -- cgit v1.2.3