From 56d3f1e2b82bf6caf376c56183fbefcb619b5fb6 Mon Sep 17 00:00:00 2001
From: hgn <hgodden00@gmail.com>
Date: Sun, 23 Jan 2022 22:15:13 +0000
Subject: [PATCH] new map, different light colours

Former-commit-id: 33a1521384fd26924a3bf9647ba7542148295642
---
 fishladder.c.REMOVED.git-id                 | 2 +-
 fishladder_resources.h.REMOVED.git-id       | 2 +-
 maps/cmp_binary.map                         | 2 +-
 maps/cmp_p7.map                             | 9 +++++++++
 maps/cmp_plot3x3.map                        | 2 +-
 sprites_autocombine.h                       | 8 +++++---
 textures_combine/flare_w.png.REMOVED.git-id | 1 +
 7 files changed, 19 insertions(+), 7 deletions(-)
 create mode 100644 maps/cmp_p7.map
 create mode 100644 textures_combine/flare_w.png.REMOVED.git-id

diff --git a/fishladder.c.REMOVED.git-id b/fishladder.c.REMOVED.git-id
index 478cf43..52725dd 100644
--- 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 be4b015..efce8c9 100644
--- 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 a474378..9966653 100644
--- 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
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 cfb4d01..3ce83b9 100644
--- 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 8092788..44a163a 100644
--- 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
index 0000000..66bbeb9
--- /dev/null
+++ b/textures_combine/flare_w.png.REMOVED.git-id
@@ -0,0 +1 @@
+0cc28f17161f126100f680f3945f9fd2cbdc868c
\ No newline at end of file
-- 
2.25.1