From 589f6b20a6b08a2e809fa979d21ac20a8430d75a Mon Sep 17 00:00:00 2001
From: Devine Lu Linvega <aliceffekt@gmail.com>
Date: Tue, 27 Aug 2024 08:38:21 -0700
Subject: [PATCH] Improved theme support

---
 gui/m291/src/assets.tal |  8 ++++----
 gui/m291/src/m291.tal   | 20 ++++++++++----------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/gui/m291/src/assets.tal b/gui/m291/src/assets.tal
index 3834099..ce20d5d 100644
--- a/gui/m291/src/assets.tal
+++ b/gui/m291/src/assets.tal
@@ -27,14 +27,14 @@
 	0804 0201 0000 0000 0000 0080 601f 0000
 	0000 0001 06f8 0000 1020 4080 0000 0000 ]
 
-@play-icn [
-	0000 000c 0f0f 0f0f 0000 0000 00c0 f0fc
-	0f0f 0f0f 0c00 0000 fcf0 c000 0000 0000 ]
-
 @pause-icn [
 	0000 001e 1e1e 1e1e 0000 0078 7878 7878
 	1e1e 1e1e 1e00 0000 7878 7878 7800 0000 ]
 
+@play-icn [
+	0000 000c 0f0f 0f0f 0000 0000 00c0 f0fc
+	0f0f 0f0f 0c00 0000 fcf0 c000 0000 0000 ]
+
 @play-wait-icn [
 	0000 000c 0b08 0808 0000 0000 00c0 300c
 	0808 080b 0c00 0000 0c30 c000 0000 0000 ]
diff --git a/gui/m291/src/m291.tal b/gui/m291/src/m291.tal
index d96d5fc..1b59a33 100644
--- a/gui/m291/src/m291.tal
+++ b/gui/m291/src/m291.tal
@@ -31,7 +31,7 @@
 @on-reset ( -> )
 	;meta #06 DEO2
 	( | theme )
-	#d2d2 DUP2 .System/r DEO2
+	#e1e1 DUP2 .System/r DEO2
 	DUP2 .System/g DEO2
 	.System/b DEO2
 	<load-theme>
@@ -485,13 +485,13 @@
 	#0054 .Screen/y DEO2
 	[ LIT2 36 -Screen/auto ] DEO
 	;button-icn .Screen/addr DEO2
-	[ LIT2 01 -Screen/sprite ] DEOk DEOk DEOk DEO
+	[ LIT2 03 -Screen/sprite ] DEOk DEOk DEOk DEO
 	( | icon )
 	[ LIT2 16 -Screen/auto ] DEO
 	#0078 .Screen/x DEO2
 	#005c .Screen/y DEO2
-	;play-icn #00 .paused LDZ #50 SFT2 ADD2 .Screen/addr DEO2
-	[ LIT2 01 -Screen/sprite ] DEOk DEO
+	;pause-icn #00 .paused LDZ #50 SFT2 ADD2 .Screen/addr DEO2
+	[ LIT2 03 -Screen/sprite ] DEOk DEO
 	JMP2r
 
 @<draw-prev> ( -- )
@@ -499,7 +499,7 @@
 	#0058 .Screen/x DEO2
 	#005c .Screen/y DEO2
 	;prev-icn .Screen/addr DEO2
-	[ LIT2 01 -Screen/sprite ] DEOk DEO
+	[ LIT2 03 -Screen/sprite ] DEOk DEO
 	JMP2r
 
 @<draw-next> ( -- )
@@ -507,7 +507,7 @@
 	#0098 .Screen/x DEO2
 	#005c .Screen/y DEO2
 	;next-icn .Screen/addr DEO2
-	[ LIT2 01 -Screen/sprite ] DEOk DEO
+	[ LIT2 03 -Screen/sprite ] DEOk DEO
 	JMP2r
 
 @<draw-progress> ( -- )
@@ -520,17 +520,17 @@
 	#0088 .Screen/y DEO2
 	( | cap left )
 	;progress-icn/left .Screen/addr DEO2
-	[ LIT2 01 -Screen/sprite ] DEO
+	[ LIT2 03 -Screen/sprite ] DEO
 	( | fill )
 	#e3
 	&>t ( -- )
 		;progress-icn/middle .Screen/addr DEO2
-		[ LIT2 01 -Screen/sprite ] DEO
+		[ LIT2 03 -Screen/sprite ] DEO
 		INC DUP ?&>t
 	POP
 	( | cap right )
 	;progress-icn/right .Screen/addr DEO2
-	[ LIT2 01 -Screen/sprite ] DEO
+	[ LIT2 03 -Screen/sprite ] DEO
 	( | fill )
 	#0008 .Screen/x DEO2
 	[ LIT2 00 -Screen/auto ] DEO
@@ -592,7 +592,7 @@
 	#0000 .Screen/x DEO2
 	.Screen/addr DEO2
 	[ LIT2 f2 -Screen/auto ] DEO
-	[ LIT2 05 -Screen/sprite ] DEOk #0080 .Screen/x DEO2
+	[ LIT2 0f -Screen/sprite ] DEOk #0080 .Screen/x DEO2
 	.Screen/y DEI2 #0008 SUB2 .Screen/y DEO2
 	DEO
 	JMP2r