added emitter sprites

Former-commit-id: 6ecfd9973b89075070c88f9879cb784261b8b11c

diff --git a/fishladder.c.REMOVED.git-id b/fishladder.c.REMOVED.git-id
index f3441de31f160fcf752a18ae9b8a990acb8c2979..527786ccd8afc77839272f705080fd14720c4272 100644 (file)
--- a/fishladder.c.REMOVED.git-id
+++ b/fishladder.c.REMOVED.git-id
@@ -1 +1 @@
-015ddd8901f42b181caf158fc97cacd1d9ddb639
\ No newline at end of file
+2bc927787b8c58973887175543ff0ca407d73f59
\ No newline at end of file

diff --git a/maps/emit_test.map b/maps/emit_test.map
index b1c1728c589370a04b3b0aedd539ff3fddd4c8e7..8a769fedbc7a25f5daa46f20894d9fc95c246992 100644 (file)
--- a/maps/emit_test.map
+++ b/maps/emit_test.map
@@ -8,5 +8,5 @@
 ##            ##;
 ##            ##;
 ##            ##;
-###+###*########;a,b
+###+###*########;a,bb
 ################;

diff --git a/sprites_autocombine.h b/sprites_autocombine.h
index aa9e326705a9508c82e0ccbf58a1b0ccd67be250..809278815583b9d9d4cc8ed785feff5431797291 100644 (file)
--- a/sprites_autocombine.h
+++ b/sprites_autocombine.h
@@ -1,6 +1,9 @@
 enum sprites_auto_combine_index
 {
-       k_sprite_donut,
+       k_sprite_brk_d,
+       k_sprite_brk_l,
+       k_sprite_brk_r,
+       k_sprite_brk_u,
        k_sprite_flare_b,
        k_sprite_flare_y,
        k_sprite_jack_1,
@@ -10,10 +13,13 @@ enum sprites_auto_combine_index
 
 static struct vg_sprite sprites_auto_combine[] = 
 {
-       {{ 0.000000, 0.000000, 0.125000, 0.125000 }},
-       {{ 0.125000, 0.000000, 0.125000, 0.125000 }},
-       {{ 0.250000, 0.000000, 0.125000, 0.125000 }},
-       {{ 0.375000, 0.000000, 0.062500, 0.062500 }},
-       {{ 0.437500, 0.000000, 0.062500, 0.062500 }},
-       {{ 0.500000, 0.000000, 0.062500, 0.062500 }}
+       {{ 0.000000, 0.000000, 0.156250, 0.156250 }},
+       {{ 0.156250, 0.000000, 0.156250, 0.156250 }},
+       {{ 0.312500, 0.000000, 0.156250, 0.156250 }},
+       {{ 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 }}
 };
\ No newline at end of file

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

diff --git a/textures_combine/brk_l.png.REMOVED.git-id b/textures_combine/brk_l.png.REMOVED.git-id
new file mode 100644 (file)
index 0000000..8adcc75
--- /dev/null
+++ b/textures_combine/brk_l.png.REMOVED.git-id
@@ -0,0 +1 @@
+142fc92dfb5983e77b344925523f0c5ae396f7bc
\ No newline at end of file

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

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

diff --git a/textures_combine/donut.png.REMOVED.git-id b/textures_combine/donut.png.REMOVED.git-id
deleted file mode 100644 (file)
index b7312bd..0000000
--- a/textures_combine/donut.png.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-a585c5ebb2721a5b510105c793a563f8cef4bc5c
\ No newline at end of file

diff --git a/textures_combine/jack-1.png.REMOVED.git-id b/textures_combine/jack-1.png.REMOVED.git-id
index f1b1d91c1743a9e6b6c90e8cf09c94d8a7899a9f..4dbcb74e78d6e589e876786c215ec065837544bf 100644 (file)
--- a/textures_combine/jack-1.png.REMOVED.git-id
+++ b/textures_combine/jack-1.png.REMOVED.git-id
@@ -1 +1 @@
-e6f94c3d27a8958c577907d71e310939e848f715
\ No newline at end of file
+cca2b5bff796981bfa80fcf1f2b2ae9d3455b245
\ No newline at end of file

diff --git a/textures_combine/jack-2.png.REMOVED.git-id b/textures_combine/jack-2.png.REMOVED.git-id
index cfa5284bc337b9ee2cbf499fdd99ce124d40cbd2..b3c59e2e9c3118e0e9ce42d78cf64c0c9e8dcad3 100644 (file)
--- a/textures_combine/jack-2.png.REMOVED.git-id
+++ b/textures_combine/jack-2.png.REMOVED.git-id
@@ -1 +1 @@
-9c862ac010cd236fda65e4c1b90231d8ccfd2ba7
\ No newline at end of file
+6ca3d9999692f26bb376cd8b42dd19f2023ec2ca
\ No newline at end of file

diff --git a/textures_combine/peg.png.REMOVED.git-id b/textures_combine/peg.png.REMOVED.git-id
index b9c179b2f8b795d276ba30768f4ca46282c5a2f2..afbc4f1b31fa10e1d3f2ec38e81b3477d9a9915d 100644 (file)
--- a/textures_combine/peg.png.REMOVED.git-id
+++ b/textures_combine/peg.png.REMOVED.git-id
@@ -1 +1 @@
-d541803fe723d9e848482b08d8775e7c789c6b90
\ No newline at end of file
+1b016fca0417925c7e00396d65e219b6ead7d647
\ No newline at end of file

diff --git a/vg/vg_console.h.REMOVED.git-id b/vg/vg_console.h.REMOVED.git-id
index 667db43a5ae229cc4f75437173ae1b206bdf7e84..8eb5ac9600807b280a6c5ea941a804e4b6ce1176 100644 (file)
--- a/vg/vg_console.h.REMOVED.git-id
+++ b/vg/vg_console.h.REMOVED.git-id
@@ -1 +1 @@
-8ab3256b4e86ccba1d0b550b692529a8d49e025d
\ No newline at end of file
+76d38007241ef256112d1440159b7dcccc38331c
\ No newline at end of file