new map, different light colours

Former-commit-id: 33a1521384fd26924a3bf9647ba7542148295642

diff --git a/fishladder.c.REMOVED.git-id b/fishladder.c.REMOVED.git-id
index 478cf43aa8078ec65b8077edcd36436519410196..52725dd5e2aa43d42b6f3ae3b5c294d1859233f5 100644 (file)
--- a/fishladder.c.REMOVED.git-id
+++ b/fishladder.c.REMOVED.git-id
@@ -1 +1 @@
-493b70401eabe3fec2ad0d5dd8efa1decf3b78d9
\ No newline at end of file
+22438c9c45f7fa3133a1c3c4d6102c22a336a308
\ No newline at end of file

diff --git a/fishladder_resources.h.REMOVED.git-id b/fishladder_resources.h.REMOVED.git-id
index be4b01571651fbf890af46e3a9897ee683d0ee21..efce8c95fc3c1116100e7a1b299434f2138ad154 100644 (file)
--- a/fishladder_resources.h.REMOVED.git-id
+++ b/fishladder_resources.h.REMOVED.git-id
@@ -1 +1 @@
-a3a2a87bc08ce8ba3b180035e11d866a00d92661
\ No newline at end of file
+90303019e2c7aa2e9a286b5f9e7ce7d555ba21ce
\ No newline at end of file

diff --git a/maps/cmp_binary.map b/maps/cmp_binary.map
index a4743782d1701fbc3cc30581fb6e7d30962794c4..9966653d53a8cc669e8f3b6d077ee2b5e6d6c388 100644 (file)
--- a/maps/cmp_binary.map
+++ b/maps/cmp_binary.map
@@ -1,5 +1,5 @@
 #####################;
-########-#-#-########;a:a::,:a:a:a,:::a
+##########-.-.-######;a:a::,:a:a:a,:::a
 ##                 ##;
 ##                 ##;
 ##                 ##;

diff --git a/maps/cmp_p7.map b/maps/cmp_p7.map
new file mode 100644 (file)
index 0000000..ef8292e
--- /dev/null
+++ b/maps/cmp_p7.map
@@ -0,0 +1,9 @@
+########;
+##-#####;db
+##    ##;
+##### ##;
+### # ##;
+### # ##;
+### # ##;
+###+#*##;a,bd
+########;

diff --git a/maps/cmp_plot3x3.map b/maps/cmp_plot3x3.map
index cfb4d01f0b234fb655ea4167352de11398a6d76f..3ce83b91fa293b3344672c8f0595506ab13f6164 100644 (file)
--- a/maps/cmp_plot3x3.map
+++ b/maps/cmp_plot3x3.map
@@ -21,5 +21,5 @@
 ##                 ##;
 ##                 ##;
 ###               ###;
-####+###+#+###+#+####;b:b:b:b:b:b,:a::::,a:::a:a:,::a::a:,a:::::
+####+###+.+###+.+####;b:b:b:b:b:b,:a::::,a:::a:a:,::a::a:,a:::::
 #####################;

diff --git a/sprites_autocombine.h b/sprites_autocombine.h
index 809278815583b9d9d4cc8ed785feff5431797291..44a163a9d4bc8c81000125386578a1625adbdbbb 100644 (file)
--- a/sprites_autocombine.h
+++ b/sprites_autocombine.h
@@ -5,6 +5,7 @@ enum sprites_auto_combine_index
        k_sprite_brk_r,
        k_sprite_brk_u,
        k_sprite_flare_b,
+       k_sprite_flare_w,
        k_sprite_flare_y,
        k_sprite_jack_1,
        k_sprite_jack_2,
@@ -19,7 +20,8 @@ static struct vg_sprite sprites_auto_combine[] =
        {{ 0.468750, 0.000000, 0.156250, 0.156250 }},
        {{ 0.625000, 0.000000, 0.125000, 0.125000 }},
        {{ 0.750000, 0.000000, 0.125000, 0.125000 }},
-       {{ 0.875000, 0.000000, 0.062500, 0.062500 }},
-       {{ 0.937500, 0.000000, 0.062500, 0.062500 }},
-       {{ 0.875000, 0.062500, 0.062500, 0.062500 }}
+       {{ 0.875000, 0.000000, 0.125000, 0.125000 }},
+       {{ 0.000000, 0.156250, 0.062500, 0.062500 }},
+       {{ 0.062500, 0.156250, 0.062500, 0.062500 }},
+       {{ 0.125000, 0.156250, 0.062500, 0.062500 }}
 };
\ No newline at end of file

diff --git a/textures_combine/flare_w.png.REMOVED.git-id b/textures_combine/flare_w.png.REMOVED.git-id
new file mode 100644 (file)
index 0000000..66bbeb9
--- /dev/null
+++ b/textures_combine/flare_w.png.REMOVED.git-id
@@ -0,0 +1 @@
+0cc28f17161f126100f680f3945f9fd2cbdc868c
\ No newline at end of file