diff options
| author | Alexey 'Cluster' Avdyukhin <clusterrr@clusterrr.com> | 2022-10-27 22:57:24 +0300 |
|---|---|---|
| committer | Alexey 'Cluster' Avdyukhin <clusterrr@clusterrr.com> | 2022-10-27 22:57:24 +0300 |
| commit | c4cb1535c87ea2d44e61716af8058e769271b65e (patch) | |
| tree | 68bfbee6d4f1d2057e4d54f6bceb83299dc20fe5 | |
| parent | 37d459ac45432f546ec998a01c0d0c425a24947d (diff) | |
New hash function.
166 files changed, 1026 insertions, 1020 deletions
diff --git a/NesTiler/Palette.cs b/NesTiler/Palette.cs index 44cb940..2f6ddf6 100644 --- a/NesTiler/Palette.cs +++ b/NesTiler/Palette.cs @@ -112,6 +112,20 @@ namespace com.clusterrr.Famicom.NesTiler .Select(c => c!.Value)
.ToArray();
return Enumerable.SequenceEqual(colors1, colors2);
+ /*
+ 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);
+ return r;
+ */
}
public bool Contains(Palette other)
@@ -139,11 +153,6 @@ namespace com.clusterrr.Famicom.NesTiler public override string ToString() => string.Join(", ", colors.Where(c => c.HasValue).Select(c => ColorTranslator.ToHtml(c!.Value.ToColor())).OrderBy(c => c));
- public override int GetHashCode()
- {
- return ((this[1]?.Red ?? 0) + (this[2]?.Red ?? 0) + (this[3]?.Red ?? 0))
- | (((this[1]?.Green ?? 0) + (this[2]?.Green ?? 0) + (this[3]?.Green ?? 0)) << 10)
- | (((this[1]?.Blue ?? 0) + (this[2]?.Blue ?? 0) + (this[3]?.Blue ?? 0)) << 20);
- }
+ public override int GetHashCode() => (int)((this[1]?.ToArgb() ?? 0) + ((this[2]?.ToArgb() ?? 0) << 4) + ((this[3]?.ToArgb() ?? 0) << 8));
}
}
diff --git a/NesTiler/Tile.cs b/NesTiler/Tile.cs index 57aca75..98739c0 100644 --- a/NesTiler/Tile.cs +++ b/NesTiler/Tile.cs @@ -9,7 +9,6 @@ namespace com.clusterrr.Famicom.NesTiler public readonly byte[] Pixels;
public const int Width = 8;
public readonly int Height;
- private int? hash;
private byte[]? data = null;
public Tile(byte[] data, int height)
@@ -52,12 +51,10 @@ namespace com.clusterrr.Famicom.NesTiler public override int GetHashCode()
{
- if (hash != null) return hash.Value;
var crc = new Crc32();
crc.Append(GetAsPatternData());
var hashBytes = crc.GetCurrentHash();
- hash = BitConverter.ToInt32(hashBytes, 0);
- return hash.Value;
+ return BitConverter.ToInt32(hashBytes, 0);
}
}
}
diff --git a/Tests/References/belaya_akula_palette_3.bin b/Tests/References/belaya_akula_palette_3.bin index fcf41c4..91d8d18 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 5870324..50d5b41 100644 --- a/Tests/References/belaya_akula_palettes.csv +++ b/Tests/References/belaya_akula_palettes.csv @@ -2,4 +2,4 @@ palette_id,color0,color1,color2,color3 0,#183C5C,#5C94FC,#FFFFFF,#A8E4FC
1,#183C5C,#787878,#009038,#000000
2,#183C5C,#787878,#C4D4FC,#FFFFFF
-3,#183C5C,#000000,#C84C0C,#FCD8A8
+3,#183C5C,#FCD8A8,#C84C0C,#000000
diff --git a/Tests/References/belaya_akula_pattern_0.bin b/Tests/References/belaya_akula_pattern_0.bin Binary files differindex 10db261..b93aef3 100644 --- a/Tests/References/belaya_akula_pattern_0.bin +++ b/Tests/References/belaya_akula_pattern_0.bin diff --git a/Tests/References/belaya_akula_pattern_1.bin b/Tests/References/belaya_akula_pattern_1.bin Binary files differindex 1c402bf..17d08b7 100644 --- a/Tests/References/belaya_akula_pattern_1.bin +++ b/Tests/References/belaya_akula_pattern_1.bin diff --git a/Tests/References/belaya_akula_pattern_2.bin b/Tests/References/belaya_akula_pattern_2.bin Binary files differindex 9564d31..32edab4 100644 --- a/Tests/References/belaya_akula_pattern_2.bin +++ b/Tests/References/belaya_akula_pattern_2.bin 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 d083327..e823a57 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 66a703a..977f53a 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 e43c33f..3246d2a 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 Binary files differindex 6d9efbb..739efd9 100644 --- a/Tests/References/blaster_master_left_blaster_master_right_palette_3.bin +++ b/Tests/References/blaster_master_left_blaster_master_right_palette_3.bin 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 4771cda..26d33fc 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,#FCFCFC,#009038,#3CBCFC
-1,#000000,#005000,#00A800,#4CDC48
-2,#000000,#009038,#00E8D8,#183C5C
-3,#000000,#FCFCFC,#E40058,#747474
+0,#000000,#009038,#FCFCFC,#3CBCFC
+1,#000000,#005000,#4CDC48,#00A800
+2,#000000,#183C5C,#009038,#00E8D8
+3,#000000,#E40058,#FCFCFC,#747474
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 Binary files differindex b1565ca..1ad25a2 100644 --- a/Tests/References/blaster_master_left_blaster_master_right_pattern_0.bin +++ b/Tests/References/blaster_master_left_blaster_master_right_pattern_0.bin diff --git a/Tests/References/blaster_master_left_palette_0.bin b/Tests/References/blaster_master_left_palette_0.bin index d083327..ca803c7 100644 --- a/Tests/References/blaster_master_left_palette_0.bin +++ b/Tests/References/blaster_master_left_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_palettes.csv b/Tests/References/blaster_master_left_palettes.csv index 0fffc9a..9c5b867 100644 --- a/Tests/References/blaster_master_left_palettes.csv +++ b/Tests/References/blaster_master_left_palettes.csv @@ -1,3 +1,3 @@ palette_id,color0,color1,color2,color3
-0,#000000,#FCFCFC,#009038,#3CBCFC
+0,#000000,#009038,#3CBCFC,#FCFCFC
1,#000000,#005000,#00A800,#4CDC48
diff --git a/Tests/References/blaster_master_left_pattern_0.bin b/Tests/References/blaster_master_left_pattern_0.bin Binary files differindex 67a233c..92567af 100644 --- a/Tests/References/blaster_master_left_pattern_0.bin +++ b/Tests/References/blaster_master_left_pattern_0.bin diff --git a/Tests/References/blaster_master_right_palette_0.bin b/Tests/References/blaster_master_right_palette_0.bin index d083327..e823a57 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 66a703a..977f53a 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 e43c33f..3246d2a 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 Binary files differindex 6d9efbb..739efd9 100644 --- a/Tests/References/blaster_master_right_palette_3.bin +++ b/Tests/References/blaster_master_right_palette_3.bin diff --git a/Tests/References/blaster_master_right_palettes.csv b/Tests/References/blaster_master_right_palettes.csv index 4771cda..26d33fc 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,#FCFCFC,#009038,#3CBCFC
-1,#000000,#005000,#00A800,#4CDC48
-2,#000000,#009038,#00E8D8,#183C5C
-3,#000000,#FCFCFC,#E40058,#747474
+0,#000000,#009038,#FCFCFC,#3CBCFC
+1,#000000,#005000,#4CDC48,#00A800
+2,#000000,#183C5C,#009038,#00E8D8
+3,#000000,#E40058,#FCFCFC,#747474
diff --git a/Tests/References/blaster_master_right_pattern_0.bin b/Tests/References/blaster_master_right_pattern_0.bin Binary files differindex 7ba2246..df82172 100644 --- a/Tests/References/blaster_master_right_pattern_0.bin +++ b/Tests/References/blaster_master_right_pattern_0.bin diff --git a/Tests/References/buhanka_name_table_1.bin b/Tests/References/buhanka_name_table_1.bin Binary files differindex fdf4bde..8368ad0 100644 --- a/Tests/References/buhanka_name_table_1.bin +++ b/Tests/References/buhanka_name_table_1.bin diff --git a/Tests/References/buhanka_palette_0.bin b/Tests/References/buhanka_palette_0.bin index d9cd74b..080784d 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_1.bin b/Tests/References/buhanka_palette_1.bin index 54f4f4a..0046f73 100644 --- a/Tests/References/buhanka_palette_1.bin +++ b/Tests/References/buhanka_palette_1.bin @@ -1 +1 @@ - -
\ No newline at end of file + -
\ No newline at end of file diff --git a/Tests/References/buhanka_palette_2.bin b/Tests/References/buhanka_palette_2.bin index fda1546..9b4c3ff 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_palette_3.bin b/Tests/References/buhanka_palette_3.bin index efd7bad..0347d0c 100644 --- a/Tests/References/buhanka_palette_3.bin +++ b/Tests/References/buhanka_palette_3.bin @@ -1 +1 @@ - -=
\ No newline at end of file + -=
\ No newline at end of file diff --git a/Tests/References/buhanka_palettes.csv b/Tests/References/buhanka_palettes.csv index 1ef718b..11ec8e4 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,#A8E4FC,#F0BC3C
-1,#183C5C,#402C00,#787878,#000000
-2,#183C5C,#A8E4FC,#787878,#5C94FC
-3,#183C5C,#787878,#C4C4C4,#000000
+0,#183C5C,#787878,#F0BC3C,#A8E4FC
+1,#183C5C,#000000,#402C00,#787878
+2,#183C5C,#787878,#5C94FC,#A8E4FC
+3,#183C5C,#000000,#787878,#C4C4C4
diff --git a/Tests/References/buhanka_pattern_0.bin b/Tests/References/buhanka_pattern_0.bin Binary files differindex a65ccae..1cbccd1 100644 --- a/Tests/References/buhanka_pattern_0.bin +++ b/Tests/References/buhanka_pattern_0.bin diff --git a/Tests/References/buhanka_pattern_1.bin b/Tests/References/buhanka_pattern_1.bin Binary files differindex 942f00d..d8b42d8 100644 --- a/Tests/References/buhanka_pattern_1.bin +++ b/Tests/References/buhanka_pattern_1.bin diff --git a/Tests/References/buhanka_pattern_2.bin b/Tests/References/buhanka_pattern_2.bin Binary files differindex 1258e41..4252984 100644 --- a/Tests/References/buhanka_pattern_2.bin +++ b/Tests/References/buhanka_pattern_2.bin diff --git a/Tests/References/buhanka_pattern_3.bin b/Tests/References/buhanka_pattern_3.bin Binary files differindex fbc4d1f..36e69e0 100644 --- a/Tests/References/buhanka_pattern_3.bin +++ b/Tests/References/buhanka_pattern_3.bin diff --git a/Tests/References/buhanka_tiles.csv b/Tests/References/buhanka_tiles.csv index 9642a57..18ce74c 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,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,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,1,5,40,8,8,8,16,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,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,2,4,32,16,8,8,16,0
-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,32,3
+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,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 a557362..c80e501 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 e9ee4cb..3946846 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 a7cde8d..68dfeb4 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,#787878,#183C5C,#000000
-1,#FCBCB0,#787878,#183C5C,#5C94FC
+0,#FCBCB0,#000000,#787878,#183C5C
+1,#FCBCB0,#787878,#5C94FC,#183C5C
diff --git a/Tests/References/chernobyl_pattern_0.bin b/Tests/References/chernobyl_pattern_0.bin Binary files differindex 2ddbfcb..9257e5b 100644 --- a/Tests/References/chernobyl_pattern_0.bin +++ b/Tests/References/chernobyl_pattern_0.bin diff --git a/Tests/References/chernobyl_pattern_1.bin b/Tests/References/chernobyl_pattern_1.bin Binary files differindex 27ff189..0bb2816 100644 --- a/Tests/References/chernobyl_pattern_1.bin +++ b/Tests/References/chernobyl_pattern_1.bin diff --git a/Tests/References/chernobyl_pattern_2.bin b/Tests/References/chernobyl_pattern_2.bin Binary files differindex 99fc5ba..1ee9c3f 100644 --- a/Tests/References/chernobyl_pattern_2.bin +++ b/Tests/References/chernobyl_pattern_2.bin diff --git a/Tests/References/chernobyl_pattern_3.bin b/Tests/References/chernobyl_pattern_3.bin Binary files differindex e45db68..641e075 100644 --- a/Tests/References/chernobyl_pattern_3.bin +++ b/Tests/References/chernobyl_pattern_3.bin diff --git a/Tests/References/dira_attr_table_0.bin b/Tests/References/dira_attr_table_0.bin Binary files differindex 284d799..ab906d5 100644 --- a/Tests/References/dira_attr_table_0.bin +++ b/Tests/References/dira_attr_table_0.bin diff --git a/Tests/References/dira_attr_table_1.bin b/Tests/References/dira_attr_table_1.bin Binary files differindex fa56913..419c93b 100644 --- a/Tests/References/dira_attr_table_1.bin +++ b/Tests/References/dira_attr_table_1.bin diff --git a/Tests/References/dira_attr_table_2.bin b/Tests/References/dira_attr_table_2.bin Binary files differindex 44997fb..4c6596b 100644 --- a/Tests/References/dira_attr_table_2.bin +++ b/Tests/References/dira_attr_table_2.bin diff --git a/Tests/References/dira_attr_table_3.bin b/Tests/References/dira_attr_table_3.bin Binary files differindex 72d7b56..0f863be 100644 --- a/Tests/References/dira_attr_table_3.bin +++ b/Tests/References/dira_attr_table_3.bin diff --git a/Tests/References/dira_palette_0.bin b/Tests/References/dira_palette_0.bin index 5f86fdb..008ff1e 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 c90da24..d84d431 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 218486d..23d2739 100644 --- a/Tests/References/dira_palette_2.bin +++ b/Tests/References/dira_palette_2.bin @@ -1 +1 @@ --7
\ No newline at end of file +-
\ No newline at end of file diff --git a/Tests/References/dira_palette_3.bin b/Tests/References/dira_palette_3.bin index 75cafce..8245c46 100644 --- a/Tests/References/dira_palette_3.bin +++ b/Tests/References/dira_palette_3.bin @@ -1 +1 @@ --
\ No newline at end of file +-7
\ No newline at end of file diff --git a/Tests/References/dira_palettes.csv b/Tests/References/dira_palettes.csv index 7081eed..a224fa3 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,#FCFCFC,#402C00
-1,#787878,#FFFFFF,#F0BC3C,#402C00
-2,#787878,#402C00,#FCD8A8,#000000
-3,#787878,#402C00,#000000,#BCBCBC
+0,#787878,#FCD8A8,#402C00,#FCFCFC
+1,#787878,#FFFFFF,#402C00,#F0BC3C
+2,#787878,#000000,#402C00,#BCBCBC
+3,#787878,#FCD8A8,#402C00,#000000
diff --git a/Tests/References/dira_pattern_0.bin b/Tests/References/dira_pattern_0.bin Binary files differindex 1c7b527..88313a3 100644 --- a/Tests/References/dira_pattern_0.bin +++ b/Tests/References/dira_pattern_0.bin diff --git a/Tests/References/dira_pattern_1.bin b/Tests/References/dira_pattern_1.bin Binary files differindex 2f20d4c..2633ee4 100644 --- a/Tests/References/dira_pattern_1.bin +++ b/Tests/References/dira_pattern_1.bin diff --git a/Tests/References/dira_pattern_2.bin b/Tests/References/dira_pattern_2.bin Binary files differindex 725d0e2..42dfa4d 100644 --- a/Tests/References/dira_pattern_2.bin +++ b/Tests/References/dira_pattern_2.bin diff --git a/Tests/References/dira_pattern_3.bin b/Tests/References/dira_pattern_3.bin Binary files differindex d3b5105..e4d8b9c 100644 --- a/Tests/References/dira_pattern_3.bin +++ b/Tests/References/dira_pattern_3.bin diff --git a/Tests/References/dira_tiles.csv b/Tests/References/dira_tiles.csv index 175e255..af64945 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,2
-0,Images\dira.gif:0:64,6,15,120,48,8,8,159,2
+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,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,2
-0,Images\dira.gif:0:64,7,15,120,56,8,8,223,2
+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,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,3
-1,Images\dira.gif:64:64,4,19,152,32,8,8,39,3
+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,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,3
-1,Images\dira.gif:64:64,5,19,152,40,8,8,103,3
+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,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,2
-1,Images\dira.gif:64:64,6,21,168,48,8,8,171,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,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,2
-1,Images\dira.gif:64:64,7,21,168,56,8,8,235,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,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,3
-2,Images\dira.gif:128:64,0,13,104,0,8,8,26,3
+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,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,2
-2,Images\dira.gif:128:64,0,21,168,0,8,8,42,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,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,3
-2,Images\dira.gif:128:64,1,13,104,8,8,8,90,3
+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,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,2
-2,Images\dira.gif:128:64,1,21,168,8,8,8,106,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,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,3
-2,Images\dira.gif:128:64,2,13,104,16,8,8,154,3
+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,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,3
-2,Images\dira.gif:128:64,2,19,152,16,8,8,166,3
+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,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,3
-2,Images\dira.gif:128:64,3,13,104,24,8,8,218,3
+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,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,3
-2,Images\dira.gif:128:64,3,19,152,24,8,8,230,3
+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,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,3
-2,Images\dira.gif:128:64,4,13,104,32,8,8,27,3
+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,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,3
-2,Images\dira.gif:128:64,4,19,152,32,8,8,39,3
+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,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,3
-2,Images\dira.gif:128:64,5,13,104,40,8,8,91,3
+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,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,3
-2,Images\dira.gif:128:64,5,19,152,40,8,8,103,3
+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,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,3
-2,Images\dira.gif:128:64,6,13,104,48,8,8,155,3
+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,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,3
-2,Images\dira.gif:128:64,6,19,152,48,8,8,167,3
+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,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,3
-2,Images\dira.gif:128:64,7,13,104,56,8,8,219,3
+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,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,3
-2,Images\dira.gif:128:64,7,19,152,56,8,8,231,3
+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,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,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,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,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,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,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,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,2
-3,Images\dira.gif:192:48,2,23,184,16,8,8,174,2
+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,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,2
-3,Images\dira.gif:192:48,3,23,184,24,8,8,238,2
+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,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,2
-3,Images\dira.gif:192:48,4,23,184,32,8,8,47,2
+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,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,2
-3,Images\dira.gif:192:48,5,23,184,40,8,8,111,2
+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,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 7125ee5..17d1908 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 370b46d..2f4eccd 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,#FFFFFF,#A8F0BC,#009400
+0,#000000,#009400,#FFFFFF,#A8F0BC
diff --git a/Tests/References/glaza_pattern_0.bin b/Tests/References/glaza_pattern_0.bin Binary files differindex 105a24e..2844aef 100644 --- a/Tests/References/glaza_pattern_0.bin +++ b/Tests/References/glaza_pattern_0.bin diff --git a/Tests/References/glaza_pattern_1.bin b/Tests/References/glaza_pattern_1.bin Binary files differindex 955239c..41b3e44 100644 --- a/Tests/References/glaza_pattern_1.bin +++ b/Tests/References/glaza_pattern_1.bin diff --git a/Tests/References/glaza_pattern_2.bin b/Tests/References/glaza_pattern_2.bin Binary files differindex 6e38880..b178fcd 100644 --- a/Tests/References/glaza_pattern_2.bin +++ b/Tests/References/glaza_pattern_2.bin diff --git a/Tests/References/glaza_pattern_3.bin b/Tests/References/glaza_pattern_3.bin Binary files differindex bae3de7..489c162 100644 --- a/Tests/References/glaza_pattern_3.bin +++ b/Tests/References/glaza_pattern_3.bin diff --git a/Tests/References/gorgona_name_table_3.bin b/Tests/References/gorgona_name_table_3.bin Binary files differindex 1b13b3b..cb83901 100644 --- a/Tests/References/gorgona_name_table_3.bin +++ b/Tests/References/gorgona_name_table_3.bin diff --git a/Tests/References/gorgona_palette_0.bin b/Tests/References/gorgona_palette_0.bin Binary files differindex d1979c4..290cfde 100644 --- a/Tests/References/gorgona_palette_0.bin +++ b/Tests/References/gorgona_palette_0.bin diff --git a/Tests/References/gorgona_palette_1.bin b/Tests/References/gorgona_palette_1.bin index a7c0cb8..a665827 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 Binary files differindex 0c7dd4f..1036325 100644 --- a/Tests/References/gorgona_palette_3.bin +++ b/Tests/References/gorgona_palette_3.bin diff --git a/Tests/References/gorgona_palettes.csv b/Tests/References/gorgona_palettes.csv index 5e57a6a..0b7879a 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,#183C5C,#402C00,#747474
-1,#000000,#183C5C,#FCD8A8,#FC7460
+0,#000000,#747474,#402C00,#183C5C
+1,#000000,#FC7460,#FCD8A8,#183C5C
2,#000000,#747474,#FCBCB0,#FCD8A8
-3,#000000,#183C5C,#747474,#5C94FC
+3,#000000,#747474,#5C94FC,#183C5C
diff --git a/Tests/References/gorgona_pattern_0.bin b/Tests/References/gorgona_pattern_0.bin Binary files differindex 0f8bd87..973b687 100644 --- a/Tests/References/gorgona_pattern_0.bin +++ b/Tests/References/gorgona_pattern_0.bin diff --git a/Tests/References/gorgona_pattern_1.bin b/Tests/References/gorgona_pattern_1.bin Binary files differindex 54df572..c9ff2e8 100644 --- a/Tests/References/gorgona_pattern_1.bin +++ b/Tests/References/gorgona_pattern_1.bin diff --git a/Tests/References/gorgona_pattern_2.bin b/Tests/References/gorgona_pattern_2.bin Binary files differindex c3dea52..a607404 100644 --- a/Tests/References/gorgona_pattern_2.bin +++ b/Tests/References/gorgona_pattern_2.bin diff --git a/Tests/References/gorgona_pattern_3.bin b/Tests/References/gorgona_pattern_3.bin Binary files differindex 01fbbc1..3c4398b 100644 --- a/Tests/References/gorgona_pattern_3.bin +++ b/Tests/References/gorgona_pattern_3.bin diff --git a/Tests/References/gorgona_tiles.csv b/Tests/References/gorgona_tiles.csv index a3fd52d..8d54ea4 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,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,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,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,140,2
-3,Images\gorgona.gif:192:48,4,21,168,32,8,8,142,2
+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,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,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,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,19,152,40,8,8,0,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,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,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_0.bin b/Tests/References/jurassic2_name_table_0.bin Binary files differindex bf2f87d..a49a9c2 100644 --- a/Tests/References/jurassic2_name_table_0.bin +++ b/Tests/References/jurassic2_name_table_0.bin diff --git a/Tests/References/jurassic2_name_table_1.bin b/Tests/References/jurassic2_name_table_1.bin Binary files differindex d121fc3..1729395 100644 --- a/Tests/References/jurassic2_name_table_1.bin +++ b/Tests/References/jurassic2_name_table_1.bin diff --git a/Tests/References/jurassic2_palette_0.bin b/Tests/References/jurassic2_palette_0.bin index 9c3d0bf..6642275 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_palettes.csv b/Tests/References/jurassic2_palettes.csv index 269f930..45aa239 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,#000000,#887000,#C84C0C
+0,#F0BC3C,#C84C0C,#000000,#887000
1,#F0BC3C,#000000,#FCFCFC,#D82800
diff --git a/Tests/References/jurassic2_pattern_0.bin b/Tests/References/jurassic2_pattern_0.bin Binary files differindex 087753b..6575ee7 100644 --- a/Tests/References/jurassic2_pattern_0.bin +++ b/Tests/References/jurassic2_pattern_0.bin diff --git a/Tests/References/jurassic2_pattern_1.bin b/Tests/References/jurassic2_pattern_1.bin Binary files differindex 20dda95..2c1c4b4 100644 --- a/Tests/References/jurassic2_pattern_1.bin +++ b/Tests/References/jurassic2_pattern_1.bin diff --git a/Tests/References/jurassic2_tiles.csv b/Tests/References/jurassic2_tiles.csv index cf75b3d..78c2b21 100644 --- a/Tests/References/jurassic2_tiles.csv +++ b/Tests/References/jurassic2_tiles.csv @@ -457,58 +457,58 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 0,Images\jurassic2.png:0:128,14,7,56,112,8,8,145,1
0,Images\jurassic2.png:0:128,14,8,64,112,8,8,147,1
0,Images\jurassic2.png:0:128,14,9,72,112,8,8,149,1
-0,Images\jurassic2.png:0:128,14,10,80,112,8,8,151,1
-0,Images\jurassic2.png:0:128,14,11,88,112,8,8,153,1
-0,Images\jurassic2.png:0:128,14,12,96,112,8,8,155,1
-0,Images\jurassic2.png:0:128,14,13,104,112,8,8,157,1
-0,Images\jurassic2.png:0:128,14,14,112,112,8,8,159,1
-0,Images\jurassic2.png:0:128,14,15,120,112,8,8,151,1
-0,Images\jurassic2.png:0:128,14,16,128,112,8,8,151,1
-0,Images\jurassic2.png:0:128,14,17,136,112,8,8,161,1
-0,Images\jurassic2.png:0:128,14,18,144,112,8,8,163,1
-0,Images\jurassic2.png:0:128,14,19,152,112,8,8,165,1
-0,Images\jurassic2.png:0:128,14,20,160,112,8,8,167,1
-0,Images\jurassic2.png:0:128,14,21,168,112,8,8,151,1
-0,Images\jurassic2.png:0:128,14,22,176,112,8,8,169,1
-0,Images\jurassic2.png:0:128,14,23,184,112,8,8,171,1
-0,Images\jurassic2.png:0:128,14,24,192,112,8,8,173,1
-0,Images\jurassic2.png:0:128,14,25,200,112,8,8,175,1
-0,Images\jurassic2.png:0:128,14,26,208,112,8,8,177,1
-0,Images\jurassic2.png:0:128,14,27,216,112,8,8,179,1
-0,Images\jurassic2.png:0:128,14,28,224,112,8,8,181,0
-0,Images\jurassic2.png:0:128,14,29,232,112,8,8,183,0
+0,Images\jurassic2.png:0:128,14,10,80,112,8,8,52,1
+0,Images\jurassic2.png:0:128,14,11,88,112,8,8,151,1
+0,Images\jurassic2.png:0:128,14,12,96,112,8,8,153,1
+0,Images\jurassic2.png:0:128,14,13,104,112,8,8,155,1
+0,Images\jurassic2.png:0:128,14,14,112,112,8,8,157,1
+0,Images\jurassic2.png:0:128,14,15,120,112,8,8,52,1
+0,Images\jurassic2.png:0:128,14,16,128,112,8,8,52,1
+0,Images\jurassic2.png:0:128,14,17,136,112,8,8,159,1
+0,Images\jurassic2.png:0:128,14,18,144,112,8,8,161,1
+0,Images\jurassic2.png:0:128,14,19,152,112,8,8,163,1
+0,Images\jurassic2.png:0:128,14,20,160,112,8,8,165,1
+0,Images\jurassic2.png:0:128,14,21,168,112,8,8,52,1
+0,Images\jurassic2.png:0:128,14,22,176,112,8,8,167,1
+0,Images\jurassic2.png:0:128,14,23,184,112,8,8,169,1
+0,Images\jurassic2.png:0:128,14,24,192,112,8,8,171,1
+0,Images\jurassic2.png:0:128,14,25,200,112,8,8,173,1
+0,Images\jurassic2.png:0:128,14,26,208,112,8,8,175,1
+0,Images\jurassic2.png:0:128,14,27,216,112,8,8,177,1
+0,Images\jurassic2.png:0:128,14,28,224,112,8,8,179,0
+0,Images\jurassic2.png:0:128,14,29,232,112,8,8,181,0
0,Images\jurassic2.png:0:128,14,30,240,112,8,8,0,0
0,Images\jurassic2.png:0:128,14,31,248,112,8,8,0,0
0,Images\jurassic2.png:0:128,15,0,0,120,8,8,0,0
0,Images\jurassic2.png:0:128,15,1,8,120,8,8,0,0
-0,Images\jurassic2.png:0:128,15,2,16,120,8,8,185,0
-0,Images\jurassic2.png:0:128,15,3,24,120,8,8,187,0
-0,Images\jurassic2.png:0:128,15,4,32,120,8,8,189,1
-0,Images\jurassic2.png:0:128,15,5,40,120,8,8,191,1
-0,Images\jurassic2.png:0:128,15,6,48,120,8,8,193,1
-0,Images\jurassic2.png:0:128,15,7,56,120,8,8,195,1
-0,Images\jurassic2.png:0:128,15,8,64,120,8,8,197,1
-0,Images\jurassic2.png:0:128,15,9,72,120,8,8,199,1
-0,Images\jurassic2.png:0:128,15,10,80,120,8,8,151,1
-0,Images\jurassic2.png:0:128,15,11,88,120,8,8,151,1
-0,Images\jurassic2.png:0:128,15,12,96,120,8,8,151,1
-0,Images\jurassic2.png:0:128,15,13,104,120,8,8,151,1
-0,Images\jurassic2.png:0:128,15,14,112,120,8,8,151,1
-0,Images\jurassic2.png:0:128,15,15,120,120,8,8,151,1
-0,Images\jurassic2.png:0:128,15,16,128,120,8,8,151,1
-0,Images\jurassic2.png:0:128,15,17,136,120,8,8,151,1
-0,Images\jurassic2.png:0:128,15,18,144,120,8,8,151,1
-0,Images\jurassic2.png:0:128,15,19,152,120,8,8,151,1
-0,Images\jurassic2.png:0:128,15,20,160,120,8,8,151,1
-0,Images\jurassic2.png:0:128,15,21,168,120,8,8,151,1
-0,Images\jurassic2.png:0:128,15,22,176,120,8,8,201,1
-0,Images\jurassic2.png:0:128,15,23,184,120,8,8,203,1
-0,Images\jurassic2.png:0:128,15,24,192,120,8,8,205,1
-0,Images\jurassic2.png:0:128,15,25,200,120,8,8,207,1
-0,Images\jurassic2.png:0:128,15,26,208,120,8,8,209,1
-0,Images\jurassic2.png:0:128,15,27,216,120,8,8,211,1
-0,Images\jurassic2.png:0:128,15,28,224,120,8,8,213,0
-0,Images\jurassic2.png:0:128,15,29,232,120,8,8,215,0
+0,Images\jurassic2.png:0:128,15,2,16,120,8,8,183,0
+0,Images\jurassic2.png:0:128,15,3,24,120,8,8,185,0
+0,Images\jurassic2.png:0:128,15,4,32,120,8,8,187,1
+0,Images\jurassic2.png:0:128,15,5,40,120,8,8,189,1
+0,Images\jurassic2.png:0:128,15,6,48,120,8,8,191,1
+0,Images\jurassic2.png:0:128,15,7,56,120,8,8,193,1
+0,Images\jurassic2.png:0:128,15,8,64,120,8,8,195,1
+0,Images\jurassic2.png:0:128,15,9,72,120,8,8,197,1
+0,Images\jurassic2.png:0:128,15,10,80,120,8,8,52,1
+0,Images\jurassic2.png:0:128,15,11,88,120,8,8,52,1
+0,Images\jurassic2.png:0:128,15,12,96,120,8,8,52,1
+0,Images\jurassic2.png:0:128,15,13,104,120,8,8,52,1
+0,Images\jurassic2.png:0:128,15,14,112,120,8,8,52,1
+0,Images\jurassic2.png:0:128,15,15,120,120,8,8,52,1
+0,Images\jurassic2.png:0:128,15,16,128,120,8,8,52,1
+0,Images\jurassic2.png:0:128,15,17,136,120,8,8,52,1
+0,Images\jurassic2.png:0:128,15,18,144,120,8,8,52,1
+0,Images\jurassic2.png:0:128,15,19,152,120,8,8,52,1
+0,Images\jurassic2.png:0:128,15,20,160,120,8,8,52,1
+0,Images\jurassic2.png:0:128,15,21,168,120,8,8,52,1
+0,Images\jurassic2.png:0:128,15,22,176,120,8,8,199,1
+0,Images\jurassic2.png:0:128,15,23,184,120,8,8,201,1
+0,Images\jurassic2.png:0:128,15,24,192,120,8,8,203,1
+0,Images\jurassic2.png:0:128,15,25,200,120,8,8,205,1
+0,Images\jurassic2.png:0:128,15,26,208,120,8,8,207,1
+0,Images\jurassic2.png:0:128,15,27,216,120,8,8,209,1
+0,Images\jurassic2.png:0:128,15,28,224,120,8,8,211,0
+0,Images\jurassic2.png:0:128,15,29,232,120,8,8,213,0
0,Images\jurassic2.png:0:128,15,30,240,120,8,8,0,0
0,Images\jurassic2.png:0:128,15,31,248,120,8,8,0,0
1,Images\jurassic2.png:128:112,0,0,0,0,8,8,0,0
@@ -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,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,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,5,40,8,8,8,12,1
-1,Images\jurassic2.png:128:112,1,6,48,8,8,8,44,1
+1,Images\jurassic2.png:128:112,1,6,48,8,8,8,46,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,46,1
-1,Images\jurassic2.png:128:112,1,9,72,8,8,8,48,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,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,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,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,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,62,1
-1,Images\jurassic2.png:128:112,1,23,184,8,8,8,64,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,24,192,8,8,8,12,1
-1,Images\jurassic2.png:128:112,1,25,200,8,8,8,66,1
+1,Images\jurassic2.png:128:112,1,25,200,8,8,8,68,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,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,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,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,70,1
+1,Images\jurassic2.png:128:112,2,4,32,16,8,8,72,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,72,1
+1,Images\jurassic2.png:128:112,2,6,48,16,8,8,74,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,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,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,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,88,1
+1,Images\jurassic2.png:128:112,2,25,200,16,8,8,90,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,90,1
+1,Images\jurassic2.png:128:112,2,27,216,16,8,8,92,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,262 +611,262 @@ 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,92,1
+1,Images\jurassic2.png:128:112,3,4,32,24,8,8,94,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,94,1
+1,Images\jurassic2.png:128:112,3,6,48,24,8,8,96,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,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,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,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,96,1
+1,Images\jurassic2.png:128:112,3,25,200,24,8,8,98,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,98,1
+1,Images\jurassic2.png:128:112,3,27,216,24,8,8,100,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,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,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,5,40,32,8,8,12,1
-1,Images\jurassic2.png:128:112,4,6,48,32,8,8,102,1
+1,Images\jurassic2.png:128:112,4,6,48,32,8,8,104,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,104,1
-1,Images\jurassic2.png:128:112,4,9,72,32,8,8,106,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,10,80,32,8,8,12,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,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,13,104,32,8,8,18,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,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,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,118,1
-1,Images\jurassic2.png:128:112,4,20,160,32,8,8,120,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,21,168,32,8,8,12,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,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,24,192,32,8,8,12,1
-1,Images\jurassic2.png:128:112,4,25,200,32,8,8,126,1
+1,Images\jurassic2.png:128:112,4,25,200,32,8,8,128,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,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,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,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,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,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,7,56,40,8,8,12,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,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,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,144,1
+1,Images\jurassic2.png:128:112,5,12,96,40,8,8,146,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,146,1
+1,Images\jurassic2.png:128:112,5,19,152,40,8,8,148,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,148,1
-1,Images\jurassic2.png:128:112,5,23,184,40,8,8,150,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,24,192,40,8,8,12,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,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,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,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,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,10,80,48,8,8,12,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,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,14,112,48,8,8,12,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,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,17,136,48,8,8,22,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,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,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,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,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,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,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,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,13,104,56,8,8,12,1
-1,Images\jurassic2.png:128:112,7,14,112,56,8,8,226,1
+1,Images\jurassic2.png:128:112,7,14,112,56,8,8,228,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,228,1
+1,Images\jurassic2.png:128:112,7,17,136,56,8,8,230,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,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,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,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,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,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,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,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,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,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,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,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,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
1,Images\jurassic2.png:128:112,11,0,0,88,8,8,0,0
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,151,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
@@ -891,15 +891,15 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 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,28,224,88,8,8,151,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
1,Images\jurassic2.png:128:112,11,31,248,88,8,8,0,0
1,Images\jurassic2.png:128:112,12,0,0,96,8,8,0,0
1,Images\jurassic2.png:128:112,12,1,8,96,8,8,0,0
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,151,0
-1,Images\jurassic2.png:128:112,12,4,32,96,8,8,151,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
@@ -922,8 +922,8 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 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,27,216,96,8,8,151,0
-1,Images\jurassic2.png:128:112,12,28,224,96,8,8,151,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
1,Images\jurassic2.png:128:112,12,30,240,96,8,8,0,0
1,Images\jurassic2.png:128:112,12,31,248,96,8,8,0,0
diff --git a/Tests/References/jurassic_palette_0.bin b/Tests/References/jurassic_palette_0.bin index 47cd909..1085866 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 bffc867..f49c505 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,#C84C0C,#FC9838
+0,#000000,#887000,#FC9838,#C84C0C
1,#000000,#887000,#F0BC3C,
diff --git a/Tests/References/jurassic_pattern_0.bin b/Tests/References/jurassic_pattern_0.bin Binary files differindex a0fcd6a..7b31865 100644 --- a/Tests/References/jurassic_pattern_0.bin +++ b/Tests/References/jurassic_pattern_0.bin diff --git a/Tests/References/jurassic_pattern_1.bin b/Tests/References/jurassic_pattern_1.bin Binary files differindex 7c7e0f5..d1b3120 100644 --- a/Tests/References/jurassic_pattern_1.bin +++ b/Tests/References/jurassic_pattern_1.bin diff --git a/Tests/References/me_attr_table_0.bin b/Tests/References/me_attr_table_0.bin Binary files differindex 090d058..6027776 100644 --- a/Tests/References/me_attr_table_0.bin +++ b/Tests/References/me_attr_table_0.bin diff --git a/Tests/References/me_attr_table_1.bin b/Tests/References/me_attr_table_1.bin Binary files differindex b60f018..4799ff1 100644 --- a/Tests/References/me_attr_table_1.bin +++ b/Tests/References/me_attr_table_1.bin diff --git a/Tests/References/me_name_table_1.bin b/Tests/References/me_name_table_1.bin Binary files differindex 4ddf550..10c876b 100644 --- a/Tests/References/me_name_table_1.bin +++ b/Tests/References/me_name_table_1.bin diff --git a/Tests/References/me_palette_0.bin b/Tests/References/me_palette_0.bin index cca90b4..26c7e40 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 478773d..256e022 100644 --- a/Tests/References/me_palette_1.bin +++ b/Tests/References/me_palette_1.bin @@ -1 +1 @@ - '
\ No newline at end of file + 8(
\ No newline at end of file diff --git a/Tests/References/me_palette_2.bin b/Tests/References/me_palette_2.bin index 256e022..8c3a7e9 100644 --- a/Tests/References/me_palette_2.bin +++ b/Tests/References/me_palette_2.bin @@ -1 +1 @@ - 8(
\ No newline at end of file + '
\ No newline at end of file diff --git a/Tests/References/me_palette_3.bin b/Tests/References/me_palette_3.bin index 126a5c4..de580ce 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 f7244eb..a2198db 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,#FFFFFF,#000000,#FCFCFC
-1,#402C00,#000000,#887000,#FC9838
-2,#402C00,#000000,#FCE4A0,#F0BC3C
-3,#402C00,#000000,#887000,#FFFFFF
+0,#402C00,#000000,#FFFFFF,#FCFCFC
+1,#402C00,#000000,#FCE4A0,#F0BC3C
+2,#402C00,#887000,#000000,#FC9838
+3,#402C00,#887000,#000000,#FFFFFF
diff --git a/Tests/References/me_pattern_0.bin b/Tests/References/me_pattern_0.bin Binary files differindex 16ae730..4095f7f 100644 --- a/Tests/References/me_pattern_0.bin +++ b/Tests/References/me_pattern_0.bin diff --git a/Tests/References/me_pattern_1.bin b/Tests/References/me_pattern_1.bin Binary files differindex 6f0ba17..7263634 100644 --- a/Tests/References/me_pattern_1.bin +++ b/Tests/References/me_pattern_1.bin diff --git a/Tests/References/me_tiles.csv b/Tests/References/me_tiles.csv index 95f8153..7e1aa99 100644 --- a/Tests/References/me_tiles.csv +++ b/Tests/References/me_tiles.csv @@ -141,10 +141,10 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 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,1
-0,Images\me.png:0:128,4,15,120,32,8,8,52,1
-0,Images\me.png:0:128,4,16,128,32,8,8,54,1
-0,Images\me.png:0:128,4,17,136,32,8,8,56,1
+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
@@ -173,10 +173,10 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 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,1
-0,Images\me.png:0:128,5,15,120,40,8,8,92,1
-0,Images\me.png:0:128,5,16,128,40,8,8,94,1
-0,Images\me.png:0:128,5,17,136,40,8,8,96,1
+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
@@ -201,18 +201,18 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 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,1
-0,Images\me.png:0:128,6,11,88,48,8,8,124,1
-0,Images\me.png:0:128,6,12,96,48,8,8,126,1
-0,Images\me.png:0:128,6,13,104,48,8,8,128,1
-0,Images\me.png:0:128,6,14,112,48,8,8,130,1
-0,Images\me.png:0:128,6,15,120,48,8,8,4,1
-0,Images\me.png:0:128,6,16,128,48,8,8,4,1
-0,Images\me.png:0:128,6,17,136,48,8,8,4,1
-0,Images\me.png:0:128,6,18,144,48,8,8,132,1
-0,Images\me.png:0:128,6,19,152,48,8,8,134,1
-0,Images\me.png:0:128,6,20,160,48,8,8,136,1
-0,Images\me.png:0:128,6,21,168,48,8,8,138,1
+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
@@ -233,18 +233,18 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 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,1
-0,Images\me.png:0:128,7,11,88,56,8,8,154,1
-0,Images\me.png:0:128,7,12,96,56,8,8,156,1
-0,Images\me.png:0:128,7,13,104,56,8,8,4,1
-0,Images\me.png:0:128,7,14,112,56,8,8,4,1
-0,Images\me.png:0:128,7,15,120,56,8,8,4,1
-0,Images\me.png:0:128,7,16,128,56,8,8,4,1
-0,Images\me.png:0:128,7,17,136,56,8,8,4,1
-0,Images\me.png:0:128,7,18,144,56,8,8,4,1
-0,Images\me.png:0:128,7,19,152,56,8,8,4,1
-0,Images\me.png:0:128,7,20,160,56,8,8,158,1
-0,Images\me.png:0:128,7,21,168,56,8,8,160,1
+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
@@ -263,22 +263,22 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 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,1
-0,Images\me.png:0:128,8,9,72,64,8,8,182,1
-0,Images\me.png:0:128,8,10,80,64,8,8,184,1
-0,Images\me.png:0:128,8,11,88,64,8,8,4,1
-0,Images\me.png:0:128,8,12,96,64,8,8,4,1
-0,Images\me.png:0:128,8,13,104,64,8,8,4,1
-0,Images\me.png:0:128,8,14,112,64,8,8,4,1
-0,Images\me.png:0:128,8,15,120,64,8,8,4,1
-0,Images\me.png:0:128,8,16,128,64,8,8,4,1
-0,Images\me.png:0:128,8,17,136,64,8,8,4,1
-0,Images\me.png:0:128,8,18,144,64,8,8,4,1
-0,Images\me.png:0:128,8,19,152,64,8,8,4,1
-0,Images\me.png:0:128,8,20,160,64,8,8,186,1
-0,Images\me.png:0:128,8,21,168,64,8,8,188,1
-0,Images\me.png:0:128,8,22,176,64,8,8,190,1
-0,Images\me.png:0:128,8,23,184,64,8,8,192,1
+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
@@ -295,22 +295,22 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 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,1
-0,Images\me.png:0:128,9,9,72,72,8,8,208,1
-0,Images\me.png:0:128,9,10,80,72,8,8,210,1
-0,Images\me.png:0:128,9,11,88,72,8,8,4,1
-0,Images\me.png:0:128,9,12,96,72,8,8,4,1
-0,Images\me.png:0:128,9,13,104,72,8,8,4,1
-0,Images\me.png:0:128,9,14,112,72,8,8,4,1
-0,Images\me.png:0:128,9,15,120,72,8,8,4,1
-0,Images\me.png:0:128,9,16,128,72,8,8,212,1
-0,Images\me.png:0:128,9,17,136,72,8,8,4,1
-0,Images\me.png:0:128,9,18,144,72,8,8,4,1
-0,Images\me.png:0:128,9,19,152,72,8,8,4,1
-0,Images\me.png:0:128,9,20,160,72,8,8,4,1
-0,Images\me.png:0:128,9,21,168,72,8,8,4,1
-0,Images\me.png:0:128,9,22,176,72,8,8,196,1
-0,Images\me.png:0:128,9,23,184,72,8,8,214,1
+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
@@ -327,24 +327,24 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 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,1
-0,Images\me.png:0:128,10,9,72,80,8,8,232,1
-0,Images\me.png:0:128,10,10,80,80,8,8,4,1
-0,Images\me.png:0:128,10,11,88,80,8,8,234,1
-0,Images\me.png:0:128,10,12,96,80,8,8,236,1
-0,Images\me.png:0:128,10,13,104,80,8,8,238,1
-0,Images\me.png:0:128,10,14,112,80,8,8,240,1
-0,Images\me.png:0:128,10,15,120,80,8,8,242,1
-0,Images\me.png:0:128,10,16,128,80,8,8,244,2
-0,Images\me.png:0:128,10,17,136,80,8,8,246,2
-0,Images\me.png:0:128,10,18,144,80,8,8,248,1
-0,Images\me.png:0:128,10,19,152,80,8,8,4,1
-0,Images\me.png:0:128,10,20,160,80,8,8,4,1
-0,Images\me.png:0:128,10,21,168,80,8,8,4,1
-0,Images\me.png:0:128,10,22,176,80,8,8,4,1
-0,Images\me.png:0:128,10,23,184,80,8,8,250,1
-0,Images\me.png:0:128,10,24,192,80,8,8,252,1
-0,Images\me.png:0:128,10,25,200,80,8,8,254,1
+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,28,224,80,8,8,0,0
@@ -359,24 +359,24 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 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,1
-0,Images\me.png:0:128,11,9,72,88,8,8,11,1
-0,Images\me.png:0:128,11,10,80,88,8,8,4,1
-0,Images\me.png:0:128,11,11,88,88,8,8,13,1
-0,Images\me.png:0:128,11,12,96,88,8,8,15,1
-0,Images\me.png:0:128,11,13,104,88,8,8,17,1
-0,Images\me.png:0:128,11,14,112,88,8,8,19,1
-0,Images\me.png:0:128,11,15,120,88,8,8,21,1
-0,Images\me.png:0:128,11,16,128,88,8,8,23,2
-0,Images\me.png:0:128,11,17,136,88,8,8,25,2
-0,Images\me.png:0:128,11,18,144,88,8,8,27,1
-0,Images\me.png:0:128,11,19,152,88,8,8,29,1
-0,Images\me.png:0:128,11,20,160,88,8,8,31,1
-0,Images\me.png:0:128,11,21,168,88,8,8,33,1
-0,Images\me.png:0:128,11,22,176,88,8,8,4,1
-0,Images\me.png:0:128,11,23,184,88,8,8,4,1
-0,Images\me.png:0:128,11,24,192,88,8,8,35,1
-0,Images\me.png:0:128,11,25,200,88,8,8,37,1
+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,28,224,88,8,8,0,0
@@ -391,24 +391,24 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 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,1
-0,Images\me.png:0:128,12,9,72,96,8,8,47,1
-0,Images\me.png:0:128,12,10,80,96,8,8,49,1
-0,Images\me.png:0:128,12,11,88,96,8,8,51,1
-0,Images\me.png:0:128,12,12,96,96,8,8,53,1
-0,Images\me.png:0:128,12,13,104,96,8,8,55,1
-0,Images\me.png:0:128,12,14,112,96,8,8,57,2
-0,Images\me.png:0:128,12,15,120,96,8,8,4,2
-0,Images\me.png:0:128,12,16,128,96,8,8,4,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,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,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,24 +423,24 @@ 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,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,0,1
+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,28,224,104,8,8,0,0
@@ -457,22 +457,22 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 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,1
-0,Images\me.png:0:128,14,11,88,112,8,8,131,1
-0,Images\me.png:0:128,14,12,96,112,8,8,133,1
-0,Images\me.png:0:128,14,13,104,112,8,8,135,1
+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,1
-0,Images\me.png:0:128,14,21,168,112,8,8,151,1
-0,Images\me.png:0:128,14,22,176,112,8,8,153,1
-0,Images\me.png:0:128,14,23,184,112,8,8,155,1
-0,Images\me.png:0:128,14,24,192,112,8,8,157,1
-0,Images\me.png:0:128,14,25,200,112,8,8,159,1
+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,28,224,112,8,8,0,0
@@ -489,22 +489,22 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 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,1
-0,Images\me.png:0:128,15,11,88,120,8,8,173,1
-0,Images\me.png:0:128,15,12,96,120,8,8,175,1
-0,Images\me.png:0:128,15,13,104,120,8,8,177,1
+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,1
-0,Images\me.png:0:128,15,21,168,120,8,8,193,1
-0,Images\me.png:0:128,15,22,176,120,8,8,195,1
-0,Images\me.png:0:128,15,23,184,120,8,8,197,1
-0,Images\me.png:0:128,15,24,192,120,8,8,199,1
-0,Images\me.png:0:128,15,25,200,120,8,8,201,1
+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,28,224,120,8,8,0,0
@@ -523,18 +523,18 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 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,2
-1,Images\me.png:128:112,0,13,104,0,8,8,14,2
+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,2
-1,Images\me.png:128:112,0,21,168,0,8,8,30,2
-1,Images\me.png:128:112,0,22,176,0,8,8,32,2
-1,Images\me.png:128:112,0,23,184,0,8,8,34,2
+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
@@ -555,18 +555,18 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 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,2
-1,Images\me.png:128:112,1,13,104,8,8,8,54,2
+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,2
-1,Images\me.png:128:112,1,21,168,8,8,8,16,2
-1,Images\me.png:128:112,1,22,176,8,8,8,70,2
-1,Images\me.png:128:112,1,23,184,8,8,8,72,2
+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
@@ -583,22 +583,22 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 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,2
-1,Images\me.png:128:112,2,9,72,16,8,8,16,2
-1,Images\me.png:128:112,2,10,80,16,8,8,84,2
-1,Images\me.png:128:112,2,11,88,16,8,8,86,2
-1,Images\me.png:128:112,2,12,96,16,8,8,16,2
-1,Images\me.png:128:112,2,13,104,16,8,8,88,2
-1,Images\me.png:128:112,2,14,112,16,8,8,90,2
-1,Images\me.png:128:112,2,15,120,16,8,8,92,2
-1,Images\me.png:128:112,2,16,128,16,8,8,94,2
-1,Images\me.png:128:112,2,17,136,16,8,8,96,2
-1,Images\me.png:128:112,2,18,144,16,8,8,98,2
-1,Images\me.png:128:112,2,19,152,16,8,8,100,2
-1,Images\me.png:128:112,2,20,160,16,8,8,16,2
-1,Images\me.png:128:112,2,21,168,16,8,8,16,2
-1,Images\me.png:128:112,2,22,176,16,8,8,102,2
-1,Images\me.png:128:112,2,23,184,16,8,8,104,2
+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,26,208,16,8,8,0,0
@@ -615,22 +615,22 @@ 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,2
-1,Images\me.png:128:112,3,9,72,24,8,8,112,2
-1,Images\me.png:128:112,3,10,80,24,8,8,114,2
-1,Images\me.png:128:112,3,11,88,24,8,8,116,2
-1,Images\me.png:128:112,3,12,96,24,8,8,16,2
-1,Images\me.png:128:112,3,13,104,24,8,8,118,2
-1,Images\me.png:128:112,3,14,112,24,8,8,120,2
-1,Images\me.png:128:112,3,15,120,24,8,8,122,2
-1,Images\me.png:128:112,3,16,128,24,8,8,124,2
-1,Images\me.png:128:112,3,17,136,24,8,8,126,2
-1,Images\me.png:128:112,3,18,144,24,8,8,128,2
-1,Images\me.png:128:112,3,19,152,24,8,8,16,2
-1,Images\me.png:128:112,3,20,160,24,8,8,16,2
-1,Images\me.png:128:112,3,21,168,24,8,8,16,2
-1,Images\me.png:128:112,3,22,176,24,8,8,130,2
-1,Images\me.png:128:112,3,23,184,24,8,8,132,2
+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,26,208,24,8,8,0,0
@@ -649,20 +649,20 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 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,2
-1,Images\me.png:128:112,4,11,88,32,8,8,16,2
-1,Images\me.png:128:112,4,12,96,32,8,8,16,2
-1,Images\me.png:128:112,4,13,104,32,8,8,16,2
-1,Images\me.png:128:112,4,14,112,32,8,8,142,2
-1,Images\me.png:128:112,4,15,120,32,8,8,144,2
-1,Images\me.png:128:112,4,16,128,32,8,8,146,2
-1,Images\me.png:128:112,4,17,136,32,8,8,148,2
-1,Images\me.png:128:112,4,18,144,32,8,8,16,2
-1,Images\me.png:128:112,4,19,152,32,8,8,16,2
-1,Images\me.png:128:112,4,20,160,32,8,8,16,2
-1,Images\me.png:128:112,4,21,168,32,8,8,16,2
-1,Images\me.png:128:112,4,22,176,32,8,8,150,2
-1,Images\me.png:128:112,4,23,184,32,8,8,152,2
+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,26,208,32,8,8,0,0
@@ -681,20 +681,20 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 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,2
-1,Images\me.png:128:112,5,11,88,40,8,8,162,2
-1,Images\me.png:128:112,5,12,96,40,8,8,164,2
-1,Images\me.png:128:112,5,13,104,40,8,8,16,2
-1,Images\me.png:128:112,5,14,112,40,8,8,16,2
-1,Images\me.png:128:112,5,15,120,40,8,8,166,2
-1,Images\me.png:128:112,5,16,128,40,8,8,168,2
-1,Images\me.png:128:112,5,17,136,40,8,8,16,2
-1,Images\me.png:128:112,5,18,144,40,8,8,170,2
-1,Images\me.png:128:112,5,19,152,40,8,8,172,2
-1,Images\me.png:128:112,5,20,160,40,8,8,16,2
-1,Images\me.png:128:112,5,21,168,40,8,8,174,2
-1,Images\me.png:128:112,5,22,176,40,8,8,176,2
-1,Images\me.png:128:112,5,23,184,40,8,8,178,2
+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,26,208,40,8,8,0,0
@@ -715,20 +715,20 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 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,2
-1,Images\me.png:128:112,6,13,104,48,8,8,16,2
-1,Images\me.png:128:112,6,14,112,48,8,8,16,2
-1,Images\me.png:128:112,6,15,120,48,8,8,16,2
-1,Images\me.png:128:112,6,16,128,48,8,8,16,2
-1,Images\me.png:128:112,6,17,136,48,8,8,194,2
-1,Images\me.png:128:112,6,18,144,48,8,8,196,2
-1,Images\me.png:128:112,6,19,152,48,8,8,198,2
-1,Images\me.png:128:112,6,20,160,48,8,8,200,2
-1,Images\me.png:128:112,6,21,168,48,8,8,202,2
-1,Images\me.png:128:112,6,22,176,48,8,8,204,2
-1,Images\me.png:128:112,6,23,184,48,8,8,206,2
-1,Images\me.png:128:112,6,24,192,48,8,8,208,2
-1,Images\me.png:128:112,6,25,200,48,8,8,210,2
+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,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
@@ -747,20 +747,20 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 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,16,2
-1,Images\me.png:128:112,7,13,104,56,8,8,16,2
-1,Images\me.png:128:112,7,14,112,56,8,8,16,2
-1,Images\me.png:128:112,7,15,120,56,8,8,16,2
-1,Images\me.png:128:112,7,16,128,56,8,8,220,2
-1,Images\me.png:128:112,7,17,136,56,8,8,222,2
-1,Images\me.png:128:112,7,18,144,56,8,8,224,2
-1,Images\me.png:128:112,7,19,152,56,8,8,226,2
-1,Images\me.png:128:112,7,20,160,56,8,8,2,2
-1,Images\me.png:128:112,7,21,168,56,8,8,228,2
-1,Images\me.png:128:112,7,22,176,56,8,8,230,2
-1,Images\me.png:128:112,7,23,184,56,8,8,232,2
-1,Images\me.png:128:112,7,24,192,56,8,8,234,2
-1,Images\me.png:128:112,7,25,200,56,8,8,236,2
+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,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
@@ -777,22 +777,22 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 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,2
-1,Images\me.png:128:112,8,11,88,64,8,8,242,2
-1,Images\me.png:128:112,8,12,96,64,8,8,16,2
-1,Images\me.png:128:112,8,13,104,64,8,8,16,2
-1,Images\me.png:128:112,8,14,112,64,8,8,244,2
-1,Images\me.png:128:112,8,15,120,64,8,8,246,2
-1,Images\me.png:128:112,8,16,128,64,8,8,248,2
-1,Images\me.png:128:112,8,17,136,64,8,8,250,2
-1,Images\me.png:128:112,8,18,144,64,8,8,2,2
-1,Images\me.png:128:112,8,19,152,64,8,8,2,2
-1,Images\me.png:128:112,8,20,160,64,8,8,252,2
-1,Images\me.png:128:112,8,21,168,64,8,8,254,2
-1,Images\me.png:128:112,8,22,176,64,8,8,16,2
-1,Images\me.png:128:112,8,23,184,64,8,8,1,2
-1,Images\me.png:128:112,8,24,192,64,8,8,3,2
-1,Images\me.png:128:112,8,25,200,64,8,8,5,2
+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,28,224,64,8,8,0,0
@@ -809,22 +809,22 @@ 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,2
-1,Images\me.png:128:112,9,11,88,72,8,8,9,2
-1,Images\me.png:128:112,9,12,96,72,8,8,11,2
-1,Images\me.png:128:112,9,13,104,72,8,8,13,2
-1,Images\me.png:128:112,9,14,112,72,8,8,15,2
-1,Images\me.png:128:112,9,15,120,72,8,8,17,2
-1,Images\me.png:128:112,9,16,128,72,8,8,19,2
-1,Images\me.png:128:112,9,17,136,72,8,8,21,2
-1,Images\me.png:128:112,9,18,144,72,8,8,23,2
-1,Images\me.png:128:112,9,19,152,72,8,8,2,2
-1,Images\me.png:128:112,9,20,160,72,8,8,25,2
-1,Images\me.png:128:112,9,21,168,72,8,8,16,2
-1,Images\me.png:128:112,9,22,176,72,8,8,16,2
-1,Images\me.png:128:112,9,23,184,72,8,8,27,2
-1,Images\me.png:128:112,9,24,192,72,8,8,29,2
-1,Images\me.png:128:112,9,25,200,72,8,8,31,2
+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,28,224,72,8,8,0,0
@@ -847,16 +847,16 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 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,2
-1,Images\me.png:128:112,10,17,136,80,8,8,47,2
-1,Images\me.png:128:112,10,18,144,80,8,8,49,2
-1,Images\me.png:128:112,10,19,152,80,8,8,51,2
-1,Images\me.png:128:112,10,20,160,80,8,8,53,2
-1,Images\me.png:128:112,10,21,168,80,8,8,16,2
-1,Images\me.png:128:112,10,22,176,80,8,8,16,2
-1,Images\me.png:128:112,10,23,184,80,8,8,16,2
-1,Images\me.png:128:112,10,24,192,80,8,8,55,2
-1,Images\me.png:128:112,10,25,200,80,8,8,57,2
+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,28,224,80,8,8,0,0
@@ -879,16 +879,16 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 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,2
-1,Images\me.png:128:112,11,17,136,88,8,8,67,2
-1,Images\me.png:128:112,11,18,144,88,8,8,69,2
-1,Images\me.png:128:112,11,19,152,88,8,8,71,2
-1,Images\me.png:128:112,11,20,160,88,8,8,16,2
-1,Images\me.png:128:112,11,21,168,88,8,8,16,2
-1,Images\me.png:128:112,11,22,176,88,8,8,16,2
-1,Images\me.png:128:112,11,23,184,88,8,8,16,2
-1,Images\me.png:128:112,11,24,192,88,8,8,73,2
-1,Images\me.png:128:112,11,25,200,88,8,8,75,2
+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,28,224,88,8,8,0,0
@@ -911,16 +911,16 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 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,2
-1,Images\me.png:128:112,12,17,136,96,8,8,85,2
-1,Images\me.png:128:112,12,18,144,96,8,8,87,2
-1,Images\me.png:128:112,12,19,152,96,8,8,16,2
-1,Images\me.png:128:112,12,20,160,96,8,8,16,2
-1,Images\me.png:128:112,12,21,168,96,8,8,16,2
-1,Images\me.png:128:112,12,22,176,96,8,8,16,2
-1,Images\me.png:128:112,12,23,184,96,8,8,16,2
-1,Images\me.png:128:112,12,24,192,96,8,8,16,2
-1,Images\me.png:128:112,12,25,200,96,8,8,89,2
+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,28,224,96,8,8,0,0
@@ -943,16 +943,16 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 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,2
-1,Images\me.png:128:112,13,17,136,104,8,8,101,2
-1,Images\me.png:128:112,13,18,144,104,8,8,16,2
-1,Images\me.png:128:112,13,19,152,104,8,8,16,2
-1,Images\me.png:128:112,13,20,160,104,8,8,16,2
-1,Images\me.png:128:112,13,21,168,104,8,8,16,2
-1,Images\me.png:128:112,13,22,176,104,8,8,16,2
-1,Images\me.png:128:112,13,23,184,104,8,8,16,2
-1,Images\me.png:128:112,13,24,192,104,8,8,16,2
-1,Images\me.png:128:112,13,25,200,104,8,8,103,2
+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,28,224,104,8,8,0,0
diff --git a/Tests/References/myatej_palette_0.bin b/Tests/References/myatej_palette_0.bin index 5d7712f..2f52914 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 Binary files differindex 9580d55..c5522a6 100644 --- a/Tests/References/myatej_palette_1.bin +++ b/Tests/References/myatej_palette_1.bin diff --git a/Tests/References/myatej_palette_2.bin b/Tests/References/myatej_palette_2.bin Binary files differindex 249df0c..3853064 100644 --- a/Tests/References/myatej_palette_2.bin +++ b/Tests/References/myatej_palette_2.bin diff --git a/Tests/References/myatej_palette_3.bin b/Tests/References/myatej_palette_3.bin index f85ad03..8382859 100644 --- a/Tests/References/myatej_palette_3.bin +++ b/Tests/References/myatej_palette_3.bin @@ -1 +1 @@ -20-)
\ 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 93f559e..8e2e60f 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,#C4C4C4,#787878,#FCFCFC
-1,#C4D4FC,#747474,#BCBCBC,#402C00
-2,#C4D4FC,#FFFFFF,#747474,#FCD8A8
-3,#C4D4FC,#FFFFFF,#787878,#80D010
+0,#C4D4FC,#FCFCFC,#787878,#C4C4C4
+1,#C4D4FC,#402C00,#BCBCBC,#747474
+2,#C4D4FC,#FCD8A8,#747474,#FFFFFF
+3,#C4D4FC,#787878,#FFFFFF,#80D010
diff --git a/Tests/References/myatej_pattern_0.bin b/Tests/References/myatej_pattern_0.bin Binary files differindex 7ddf86a..67c4b7c 100644 --- a/Tests/References/myatej_pattern_0.bin +++ b/Tests/References/myatej_pattern_0.bin diff --git a/Tests/References/myatej_pattern_1.bin b/Tests/References/myatej_pattern_1.bin Binary files differindex ca9c4d2..5d3214f 100644 --- a/Tests/References/myatej_pattern_1.bin +++ b/Tests/References/myatej_pattern_1.bin diff --git a/Tests/References/myatej_pattern_2.bin b/Tests/References/myatej_pattern_2.bin Binary files differindex 2c968a9..66d2341 100644 --- a/Tests/References/myatej_pattern_2.bin +++ b/Tests/References/myatej_pattern_2.bin diff --git a/Tests/References/myatej_pattern_3.bin b/Tests/References/myatej_pattern_3.bin Binary files differindex 6761fbb..f063a84 100644 --- a/Tests/References/myatej_pattern_3.bin +++ b/Tests/References/myatej_pattern_3.bin diff --git a/Tests/References/pagoda_name_table_2.bin b/Tests/References/pagoda_name_table_2.bin Binary files differindex 5411895..a887cc4 100644 --- a/Tests/References/pagoda_name_table_2.bin +++ b/Tests/References/pagoda_name_table_2.bin diff --git a/Tests/References/pagoda_palette_0.bin b/Tests/References/pagoda_palette_0.bin index 0252a00..42a2ecd 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 54f4f4a..f4a95f7 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 4a6df51..760b433 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 6910eff..1293f95 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,#FC74B4,#A8E4FC,#000000
-1,#183C5C,#402C00,#787878,#000000
-2,#183C5C,#BCBCBC,#000000,#D4C8FC
+0,#183C5C,#000000,#FC74B4,#A8E4FC
+1,#183C5C,#000000,#787878,#402C00
+2,#183C5C,#BCBCBC,#D4C8FC,#000000
diff --git a/Tests/References/pagoda_pattern_0.bin b/Tests/References/pagoda_pattern_0.bin Binary files differindex 7506a1b..243b2ec 100644 --- a/Tests/References/pagoda_pattern_0.bin +++ b/Tests/References/pagoda_pattern_0.bin diff --git a/Tests/References/pagoda_pattern_1.bin b/Tests/References/pagoda_pattern_1.bin Binary files differindex 53b163b..4f77b6d 100644 --- a/Tests/References/pagoda_pattern_1.bin +++ b/Tests/References/pagoda_pattern_1.bin diff --git a/Tests/References/pagoda_pattern_2.bin b/Tests/References/pagoda_pattern_2.bin Binary files differindex d06ced1..d2007da 100644 --- a/Tests/References/pagoda_pattern_2.bin +++ b/Tests/References/pagoda_pattern_2.bin diff --git a/Tests/References/pagoda_pattern_3.bin b/Tests/References/pagoda_pattern_3.bin Binary files differindex f932c52..686fef6 100644 --- a/Tests/References/pagoda_pattern_3.bin +++ b/Tests/References/pagoda_pattern_3.bin diff --git a/Tests/References/pagoda_tiles.csv b/Tests/References/pagoda_tiles.csv index 5bdb0c9..552b6a9 100644 --- a/Tests/References/pagoda_tiles.csv +++ b/Tests/References/pagoda_tiles.csv @@ -759,14 +759,14 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 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,216,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
+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
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
diff --git a/Tests/References/rayon4_palette_0.bin b/Tests/References/rayon4_palette_0.bin Binary files differindex c17f5a6..783504d 100644 --- a/Tests/References/rayon4_palette_0.bin +++ b/Tests/References/rayon4_palette_0.bin diff --git a/Tests/References/rayon4_palette_1.bin b/Tests/References/rayon4_palette_1.bin index 4f9ee08..0758456 100644 --- a/Tests/References/rayon4_palette_1.bin +++ b/Tests/References/rayon4_palette_1.bin @@ -1 +1 @@ -=60
\ No newline at end of file +6=0
\ No newline at end of file diff --git a/Tests/References/rayon4_palette_2.bin b/Tests/References/rayon4_palette_2.bin Binary files differindex a97fe83..f08589a 100644 --- a/Tests/References/rayon4_palette_2.bin +++ b/Tests/References/rayon4_palette_2.bin diff --git a/Tests/References/rayon4_palettes.csv b/Tests/References/rayon4_palettes.csv index a94b238..e6aa836 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,#3CBCFC,#747474,#C4C4C4
-1,#402C00,#C4C4C4,#FCBCB0,#FFFFFF
-2,#402C00,#FCBCB0,#747474,#7C0800
+0,#402C00,#747474,#3CBCFC,#C4C4C4
+1,#402C00,#FCBCB0,#C4C4C4,#FFFFFF
+2,#402C00,#7C0800,#FCBCB0,#747474
3,#402C00,#C4C4C4,#747474,#FFFFFF
diff --git a/Tests/References/rayon4_pattern_0.bin b/Tests/References/rayon4_pattern_0.bin Binary files differindex f3431ed..9f5d393 100644 --- a/Tests/References/rayon4_pattern_0.bin +++ b/Tests/References/rayon4_pattern_0.bin diff --git a/Tests/References/rayon4_pattern_1.bin b/Tests/References/rayon4_pattern_1.bin Binary files differindex e4b540a..7152baf 100644 --- a/Tests/References/rayon4_pattern_1.bin +++ b/Tests/References/rayon4_pattern_1.bin diff --git a/Tests/References/rayon4_pattern_2.bin b/Tests/References/rayon4_pattern_2.bin Binary files differindex e372878..370c261 100644 --- a/Tests/References/rayon4_pattern_2.bin +++ b/Tests/References/rayon4_pattern_2.bin diff --git a/Tests/References/rayon4_pattern_3.bin b/Tests/References/rayon4_pattern_3.bin Binary files differindex 4b2091e..fc8dd02 100644 --- a/Tests/References/rayon4_pattern_3.bin +++ b/Tests/References/rayon4_pattern_3.bin diff --git a/Tests/References/shkola_palette_0.bin b/Tests/References/shkola_palette_0.bin index 8170446..a860a98 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_palettes.csv b/Tests/References/shkola_palettes.csv index baa1fe3..1c79734 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,#402C00,#000000,#183C5C
+0,#787878,#183C5C,#000000,#402C00
1,#787878,#887000,#000000,#C4C4C4
2,#787878,#C4C4C4,#000000,#D4C8FC
diff --git a/Tests/References/shkola_pattern_0.bin b/Tests/References/shkola_pattern_0.bin Binary files differindex b95af55..2a004c4 100644 --- a/Tests/References/shkola_pattern_0.bin +++ b/Tests/References/shkola_pattern_0.bin diff --git a/Tests/References/shkola_pattern_1.bin b/Tests/References/shkola_pattern_1.bin Binary files differindex 07459a1..9862a90 100644 --- a/Tests/References/shkola_pattern_1.bin +++ b/Tests/References/shkola_pattern_1.bin diff --git a/Tests/References/shkola_pattern_2.bin b/Tests/References/shkola_pattern_2.bin Binary files differindex 1383afc..369a3b0 100644 --- a/Tests/References/shkola_pattern_2.bin +++ b/Tests/References/shkola_pattern_2.bin diff --git a/Tests/References/shkola_pattern_3.bin b/Tests/References/shkola_pattern_3.bin Binary files differindex 9641a89..15043ab 100644 --- a/Tests/References/shkola_pattern_3.bin +++ b/Tests/References/shkola_pattern_3.bin diff --git a/Tests/References/sindikat_name_table_3.bin b/Tests/References/sindikat_name_table_3.bin Binary files differindex 38b7caf..fc809d0 100644 --- a/Tests/References/sindikat_name_table_3.bin +++ b/Tests/References/sindikat_name_table_3.bin diff --git a/Tests/References/sindikat_palette_0.bin b/Tests/References/sindikat_palette_0.bin index 56fcdbf..14e669e 100644 --- a/Tests/References/sindikat_palette_0.bin +++ b/Tests/References/sindikat_palette_0.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 d3a845a..13a6ea0 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_palettes.csv b/Tests/References/sindikat_palettes.csv index 56bdc52..39785ad 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,#183C5C,#3CBCFC,#008088
+0,#000000,#008088,#183C5C,#3CBCFC
1,#000000,#A80010,#C4C4C4,#0070EC
-2,#000000,#7C0800,#D82800,#FC7460
+2,#000000,#7C0800,#FC7460,#D82800
3,#000000,#5C94FC,#24188C,#8C0074
diff --git a/Tests/References/sindikat_pattern_0.bin b/Tests/References/sindikat_pattern_0.bin Binary files differindex 4559b2d..21d3842 100644 --- a/Tests/References/sindikat_pattern_0.bin +++ b/Tests/References/sindikat_pattern_0.bin diff --git a/Tests/References/sindikat_pattern_1.bin b/Tests/References/sindikat_pattern_1.bin Binary files differindex 92db036..62f65a6 100644 --- a/Tests/References/sindikat_pattern_1.bin +++ b/Tests/References/sindikat_pattern_1.bin diff --git a/Tests/References/sindikat_pattern_2.bin b/Tests/References/sindikat_pattern_2.bin Binary files differindex 44d426f..dd572dc 100644 --- a/Tests/References/sindikat_pattern_2.bin +++ b/Tests/References/sindikat_pattern_2.bin diff --git a/Tests/References/sindikat_pattern_3.bin b/Tests/References/sindikat_pattern_3.bin Binary files differindex 59bb833..a82a0aa 100644 --- a/Tests/References/sindikat_pattern_3.bin +++ b/Tests/References/sindikat_pattern_3.bin diff --git a/Tests/References/sindikat_tiles.csv b/Tests/References/sindikat_tiles.csv index c7c0661..cd35a77 100644 --- a/Tests/References/sindikat_tiles.csv +++ b/Tests/References/sindikat_tiles.csv @@ -941,21 +941,21 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 3,Images\sindikat.gif:192:48,5,11,88,40,8,8,0,0
3,Images\sindikat.gif:192:48,5,12,96,40,8,8,232,0
3,Images\sindikat.gif:192:48,5,13,104,40,8,8,234,0
-3,Images\sindikat.gif:192:48,5,14,112,40,8,8,220,0
+3,Images\sindikat.gif:192:48,5,14,112,40,8,8,236,0
3,Images\sindikat.gif:192:48,5,15,120,40,8,8,0,0
-3,Images\sindikat.gif:192:48,5,16,128,40,8,8,236,0
-3,Images\sindikat.gif:192:48,5,17,136,40,8,8,238,0
-3,Images\sindikat.gif:192:48,5,18,144,40,8,8,240,0
-3,Images\sindikat.gif:192:48,5,19,152,40,8,8,242,0
-3,Images\sindikat.gif:192:48,5,20,160,40,8,8,244,0
-3,Images\sindikat.gif:192:48,5,21,168,40,8,8,246,0
-3,Images\sindikat.gif:192:48,5,22,176,40,8,8,248,3
+3,Images\sindikat.gif:192:48,5,16,128,40,8,8,238,0
+3,Images\sindikat.gif:192:48,5,17,136,40,8,8,240,0
+3,Images\sindikat.gif:192:48,5,18,144,40,8,8,242,0
+3,Images\sindikat.gif:192:48,5,19,152,40,8,8,244,0
+3,Images\sindikat.gif:192:48,5,20,160,40,8,8,246,0
+3,Images\sindikat.gif:192:48,5,21,168,40,8,8,248,0
+3,Images\sindikat.gif:192:48,5,22,176,40,8,8,250,3
3,Images\sindikat.gif:192:48,5,23,184,40,8,8,0,3
-3,Images\sindikat.gif:192:48,5,24,192,40,8,8,250,2
-3,Images\sindikat.gif:192:48,5,25,200,40,8,8,252,2
+3,Images\sindikat.gif:192:48,5,24,192,40,8,8,252,2
+3,Images\sindikat.gif:192:48,5,25,200,40,8,8,254,2
3,Images\sindikat.gif:192:48,5,26,208,40,8,8,0,0
3,Images\sindikat.gif:192:48,5,27,216,40,8,8,0,0
-3,Images\sindikat.gif:192:48,5,28,224,40,8,8,254,2
-3,Images\sindikat.gif:192:48,5,29,232,40,8,8,1,2
-3,Images\sindikat.gif:192:48,5,30,240,40,8,8,3,0
+3,Images\sindikat.gif:192:48,5,28,224,40,8,8,1,2
+3,Images\sindikat.gif:192:48,5,29,232,40,8,8,3,2
+3,Images\sindikat.gif:192:48,5,30,240,40,8,8,5,0
3,Images\sindikat.gif:192:48,5,31,248,40,8,8,0,0
diff --git a/Tests/References/sprites1_palette_0.bin b/Tests/References/sprites1_palette_0.bin index f319e6d..cf16aa7 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 Binary files differindex e105e75..471269d 100644 --- a/Tests/References/sprites1_pattern_0.bin +++ b/Tests/References/sprites1_pattern_0.bin diff --git a/Tests/References/sprites2_palette_0.bin b/Tests/References/sprites2_palette_0.bin index 015095f..21cb787 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 Binary files differindex d9e771a..7f532c0 100644 --- a/Tests/References/sprites2_pattern_0.bin +++ b/Tests/References/sprites2_pattern_0.bin diff --git a/Tests/References/sputnik_palette_0.bin b/Tests/References/sputnik_palette_0.bin index fbcedbc..95f0913 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 879e9db..c87a260 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 9581383..45224ca 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,#000000,#402C00,#BCBCBC
-1,#183C5C,#C4D4FC,#5C94FC,#000000
+0,#183C5C,#BCBCBC,#402C00,#000000
+1,#183C5C,#C4D4FC,#000000,#5C94FC
diff --git a/Tests/References/sputnik_pattern_0.bin b/Tests/References/sputnik_pattern_0.bin Binary files differindex fe48050..d49b161 100644 --- a/Tests/References/sputnik_pattern_0.bin +++ b/Tests/References/sputnik_pattern_0.bin diff --git a/Tests/References/sputnik_pattern_1.bin b/Tests/References/sputnik_pattern_1.bin Binary files differindex f809b84..2aa11e5 100644 --- a/Tests/References/sputnik_pattern_1.bin +++ b/Tests/References/sputnik_pattern_1.bin diff --git a/Tests/References/sputnik_pattern_2.bin b/Tests/References/sputnik_pattern_2.bin Binary files differindex 73b8135..ad491d7 100644 --- a/Tests/References/sputnik_pattern_2.bin +++ b/Tests/References/sputnik_pattern_2.bin diff --git a/Tests/References/sputnik_pattern_3.bin b/Tests/References/sputnik_pattern_3.bin Binary files differindex 64d6c62..cb90756 100644 --- a/Tests/References/sputnik_pattern_3.bin +++ b/Tests/References/sputnik_pattern_3.bin diff --git a/Tests/References/sworm_name_table_0.bin b/Tests/References/sworm_name_table_0.bin Binary files differindex d9b6093..332d5e4 100644 --- a/Tests/References/sworm_name_table_0.bin +++ b/Tests/References/sworm_name_table_0.bin diff --git a/Tests/References/sworm_name_table_2.bin b/Tests/References/sworm_name_table_2.bin Binary files differindex 0144178..08abb0f 100644 --- a/Tests/References/sworm_name_table_2.bin +++ b/Tests/References/sworm_name_table_2.bin diff --git a/Tests/References/sworm_name_table_3.bin b/Tests/References/sworm_name_table_3.bin Binary files differindex bfa9c33..52648e6 100644 --- a/Tests/References/sworm_name_table_3.bin +++ b/Tests/References/sworm_name_table_3.bin diff --git a/Tests/References/sworm_palette_0.bin b/Tests/References/sworm_palette_0.bin Binary files differindex 28ff349..da0c822 100644 --- a/Tests/References/sworm_palette_0.bin +++ b/Tests/References/sworm_palette_0.bin diff --git a/Tests/References/sworm_palette_1.bin b/Tests/References/sworm_palette_1.bin Binary files differindex 8b68efc..6a46dbc 100644 --- a/Tests/References/sworm_palette_1.bin +++ b/Tests/References/sworm_palette_1.bin diff --git a/Tests/References/sworm_palette_2.bin b/Tests/References/sworm_palette_2.bin Binary files differindex 3b3b0c8..0ecf67d 100644 --- a/Tests/References/sworm_palette_2.bin +++ b/Tests/References/sworm_palette_2.bin diff --git a/Tests/References/sworm_palette_3.bin b/Tests/References/sworm_palette_3.bin Binary files differindex df34dad..b9af6f7 100644 --- a/Tests/References/sworm_palette_3.bin +++ b/Tests/References/sworm_palette_3.bin diff --git a/Tests/References/sworm_palettes.csv b/Tests/References/sworm_palettes.csv index d01ec27..42d5a01 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,#000000,#BCBCBC,#C4C4C4
-1,#747474,#C4C4C4,#BCBCBC,#FFFFFF
-2,#747474,#C4C4C4,#000000,#FFFFFF
-3,#747474,#000000,#BCBCBC,#FFFFFF
+0,#747474,#C4C4C4,#000000,#BCBCBC
+1,#747474,#BCBCBC,#FFFFFF,#C4C4C4
+2,#747474,#C4C4C4,#FFFFFF,#000000
+3,#747474,#000000,#FFFFFF,#BCBCBC
diff --git a/Tests/References/sworm_pattern_0.bin b/Tests/References/sworm_pattern_0.bin Binary files differindex 560b1b3..0c8a945 100644 --- a/Tests/References/sworm_pattern_0.bin +++ b/Tests/References/sworm_pattern_0.bin diff --git a/Tests/References/sworm_pattern_1.bin b/Tests/References/sworm_pattern_1.bin Binary files differindex efae8c9..5affcab 100644 --- a/Tests/References/sworm_pattern_1.bin +++ b/Tests/References/sworm_pattern_1.bin diff --git a/Tests/References/sworm_pattern_2.bin b/Tests/References/sworm_pattern_2.bin Binary files differindex 488b599..814fdbf 100644 --- a/Tests/References/sworm_pattern_2.bin +++ b/Tests/References/sworm_pattern_2.bin diff --git a/Tests/References/sworm_pattern_3.bin b/Tests/References/sworm_pattern_3.bin Binary files differindex 76c1989..152b636 100644 --- a/Tests/References/sworm_pattern_3.bin +++ b/Tests/References/sworm_pattern_3.bin diff --git a/Tests/References/sworm_tiles.csv b/Tests/References/sworm_tiles.csv index 35798df..eb496c0 100644 --- a/Tests/References/sworm_tiles.csv +++ b/Tests/References/sworm_tiles.csv @@ -30,74 +30,74 @@ 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,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,58,2
+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
@@ -126,7 +126,7 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 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,58,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
@@ -152,7 +152,7 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 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,58,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
@@ -184,7 +184,7 @@ image_id,image_file,line,column,tile_x,tile_y,tile_width,tile_height,tile_id,pal 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,58,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
@@ -700,70 +700,70 @@ 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,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,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,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,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,186,2
-2,Images\sworm.gif:128:64,7,24,192,56,8,8,219,1
-2,Images\sworm.gif:128:64,7,25,200,56,8,8,221,1
-2,Images\sworm.gif:128:64,7,26,208,56,8,8,223,3
-2,Images\sworm.gif:128:64,7,27,216,56,8,8,225,3
-2,Images\sworm.gif:128:64,7,28,224,56,8,8,227,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,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
+2,Images\sworm.gif:128:64,7,27,216,56,8,8,227,3
+2,Images\sworm.gif:128:64,7,28,224,56,8,8,229,0
2,Images\sworm.gif:128:64,7,29,232,56,8,8,186,0
2,Images\sworm.gif:128:64,7,30,240,56,8,8,186,0
2,Images\sworm.gif:128:64,7,31,248,56,8,8,186,0
@@ -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,54,3
+3,Images\sworm.gif:192:48,3,29,232,24,8,8,212,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,212,0
+3,Images\sworm.gif:192:48,4,8,64,32,8,8,214,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,214,0
-3,Images\sworm.gif:192:48,4,11,88,32,8,8,216,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,12,96,32,8,8,54,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,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,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,224,0
-3,Images\sworm.gif:192:48,4,19,152,32,8,8,226,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,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,228,0
+3,Images\sworm.gif:192:48,4,22,176,32,8,8,230,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,230,0
+3,Images\sworm.gif:192:48,4,25,200,32,8,8,232,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,232,0
+3,Images\sworm.gif:192:48,5,0,0,40,8,8,234,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,234,0
+3,Images\sworm.gif:192:48,5,13,104,40,8,8,236,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,236,0
+3,Images\sworm.gif:192:48,5,29,232,40,8,8,238,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 6b0cf88..2133d55 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 633bc81..fa97f2c 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 ef2f299..ec323c9 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 558ff36..861f105 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,#FCD8A8,#183C5C,#000000
-1,#787878,#9CFCF0,#5C94FC,#BCBCBC
-2,#787878,#FCD8A8,#000000,#F0BC3C
+0,#787878,#183C5C,#FCD8A8,#000000
+1,#787878,#BCBCBC,#5C94FC,#9CFCF0
+2,#787878,#000000,#FCD8A8,#F0BC3C
3,#787878,#402C00,#E0FCA0,#FFFFFF
diff --git a/Tests/References/trailer-park_pattern_0.bin b/Tests/References/trailer-park_pattern_0.bin Binary files differindex cb37253..9e930bf 100644 --- a/Tests/References/trailer-park_pattern_0.bin +++ b/Tests/References/trailer-park_pattern_0.bin diff --git a/Tests/References/trailer-park_pattern_1.bin b/Tests/References/trailer-park_pattern_1.bin Binary files differindex 380ddbf..04c75bc 100644 --- a/Tests/References/trailer-park_pattern_1.bin +++ b/Tests/References/trailer-park_pattern_1.bin diff --git a/Tests/References/trailer-park_pattern_2.bin b/Tests/References/trailer-park_pattern_2.bin Binary files differindex c3ca538..3c11809 100644 --- a/Tests/References/trailer-park_pattern_2.bin +++ b/Tests/References/trailer-park_pattern_2.bin diff --git a/Tests/References/trailer-park_pattern_3.bin b/Tests/References/trailer-park_pattern_3.bin Binary files differindex 8572aef..e2786bc 100644 --- a/Tests/References/trailer-park_pattern_3.bin +++ b/Tests/References/trailer-park_pattern_3.bin |