theme selection

Former-commit-id: ec1dd5de4848534241c8bea3841ef36fe047915b

diff --git a/fishladder.c.REMOVED.git-id b/fishladder.c.REMOVED.git-id
index 6fabe710f9385fc11925001df0fb851491829545..acf7e95d56640e74af1208ab0c1ce9ee3b466517 100644 (file)
--- a/fishladder.c.REMOVED.git-id
+++ b/fishladder.c.REMOVED.git-id
@@ -1 +1 @@
-e0cfd67458a364ea41326f5c052916e34509662c
\ No newline at end of file
+2a2da7520751101d4ff725de383d1bdd0817622a
\ No newline at end of file

diff --git a/fishladder_resources.h.REMOVED.git-id b/fishladder_resources.h.REMOVED.git-id
index 85d94d2ad659a43281f47f1f627e98984ee0f3a4..d735c3e3e849a43e95fa10366084d0d75b6e47a1 100644 (file)
--- a/fishladder_resources.h.REMOVED.git-id
+++ b/fishladder_resources.h.REMOVED.git-id
@@ -1 +1 @@
-7b12859d44f94bb993c23fab06b9dd5627826e4f
\ No newline at end of file
+d1f2210fe8b08d0362a676427627a3372507e7af
\ No newline at end of file

diff --git a/sprites_autocombine.h b/sprites_autocombine.h
index 2808eb0586c0235c39125d3035c45efec38e5f8d..aa9e326705a9508c82e0ccbf58a1b0ccd67be250 100644 (file)
--- a/sprites_autocombine.h
+++ b/sprites_autocombine.h
@@ -1,6 +1,8 @@
-static enum sprites_auto_combine_index
+enum sprites_auto_combine_index
 {
        k_sprite_donut,
+       k_sprite_flare_b,
+       k_sprite_flare_y,
        k_sprite_jack_1,
        k_sprite_jack_2,
        k_sprite_peg,
@@ -8,8 +10,10 @@ static enum sprites_auto_combine_index
 
 static struct vg_sprite sprites_auto_combine[] = 
 {
-       { 0, 0, 8192, 8192 },
-       { 8192, 0, 4096, 4096 },
-       { 12288, 0, 4096, 4096 },
-       { 16384, 0, 4096, 4096 },
+       {{ 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 }}
 };
\ No newline at end of file

diff --git a/texsheet.c.REMOVED.git-id b/texsheet.c.REMOVED.git-id
index 470450e5a3cf020fd840b2125bc78cd7dbaaddac..401e049d5ff3b4ef1a6f790d3e68262e44790d8d 100644 (file)
--- a/texsheet.c.REMOVED.git-id
+++ b/texsheet.c.REMOVED.git-id
@@ -1 +1 @@
-f420866bd1a6dfc5ef6d9f5b033fb7e3f4bf0d97
\ No newline at end of file
+367136bbc3e8d1d009cad32c479575e8725c5fc7
\ No newline at end of file

diff --git a/textures/tile_lab.png.REMOVED.git-id b/textures/tile_lab.png.REMOVED.git-id
new file mode 100644 (file)
index 0000000..2b1380e
--- /dev/null
+++ b/textures/tile_lab.png.REMOVED.git-id
@@ -0,0 +1 @@
+638f727e1848fea170fbb0f6fc43c8ad919b4b69
\ No newline at end of file

diff --git a/textures/tile_minimal.png.REMOVED.git-id b/textures/tile_minimal.png.REMOVED.git-id
new file mode 100644 (file)
index 0000000..bb2297c
--- /dev/null
+++ b/textures/tile_minimal.png.REMOVED.git-id
@@ -0,0 +1 @@
+5e431ac015840fa6563d325ce3f1f7500d5665ea
\ No newline at end of file

diff --git a/textures/tile_wood.png.REMOVED.git-id b/textures/tile_wood.png.REMOVED.git-id
new file mode 100644 (file)
index 0000000..79fdc08
--- /dev/null
+++ b/textures/tile_wood.png.REMOVED.git-id
@@ -0,0 +1 @@
+81c0817eeb130627c7a8d900815bb4771890a4ef
\ No newline at end of file

diff --git a/textures/wood.png.REMOVED.git-id b/textures/wood.png.REMOVED.git-id
deleted file mode 100644 (file)
index 79fdc08..0000000
--- a/textures/wood.png.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-81c0817eeb130627c7a8d900815bb4771890a4ef
\ No newline at end of file

diff --git a/textures_combine/flare_b.png.REMOVED.git-id b/textures_combine/flare_b.png.REMOVED.git-id
new file mode 100644 (file)
index 0000000..96eb478
--- /dev/null
+++ b/textures_combine/flare_b.png.REMOVED.git-id
@@ -0,0 +1 @@
+55ce1559c9831dc6ce2987424facb45f4f6fd77a
\ No newline at end of file

diff --git a/textures_combine/flare_y.png.REMOVED.git-id b/textures_combine/flare_y.png.REMOVED.git-id
new file mode 100644 (file)
index 0000000..f4651d3
--- /dev/null
+++ b/textures_combine/flare_y.png.REMOVED.git-id
@@ -0,0 +1 @@
+f802877f584ab292db70ce561964632beaa669d6
\ 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 7705d839d8d7f9caab5cde9ddfd42d9a8a7afb71..f1b1d91c1743a9e6b6c90e8cf09c94d8a7899a9f 100644 (file)
--- a/textures_combine/jack-1.png.REMOVED.git-id
+++ b/textures_combine/jack-1.png.REMOVED.git-id
@@ -1 +1 @@
-7d88b8799dc051a017fabbb244deb520fa517a8a
\ No newline at end of file
+e6f94c3d27a8958c577907d71e310939e848f715
\ 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 72104fa657171b0575c990fb1166a3b06c981b1b..cfa5284bc337b9ee2cbf499fdd99ce124d40cbd2 100644 (file)
--- a/textures_combine/jack-2.png.REMOVED.git-id
+++ b/textures_combine/jack-2.png.REMOVED.git-id
@@ -1 +1 @@
-92488da62865fa671db2845c776c0c4ff7bd7782
\ No newline at end of file
+9c862ac010cd236fda65e4c1b90231d8ccfd2ba7
\ 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 04d372e3acb7a379989ce110c41bc6e442c49b29..b9c179b2f8b795d276ba30768f4ca46282c5a2f2 100644 (file)
--- a/textures_combine/peg.png.REMOVED.git-id
+++ b/textures_combine/peg.png.REMOVED.git-id
@@ -1 +1 @@
-83b366b374f16d68dbec866f5adc6f878fe37f24
\ No newline at end of file
+d541803fe723d9e848482b08d8775e7c789c6b90
\ No newline at end of file

diff --git a/vg/vg_tex.h.REMOVED.git-id b/vg/vg_tex.h.REMOVED.git-id
index ce02ef42374f3cdaca44de4b828b6e65c0283706..a6cd0da7a69a02ed7a7e8dd5b67a8622590e45d0 100644 (file)
--- a/vg/vg_tex.h.REMOVED.git-id
+++ b/vg/vg_tex.h.REMOVED.git-id
@@ -1 +1 @@
-c757b1826a42996aa643fe51259195e5d7d66c3f
\ No newline at end of file
+4c14540ca431a4b5404534dc5d44f27938e04467
\ No newline at end of file