feat(catalan): Clean up implementation

1 files changed, 7 insertions, 7 deletions

diff --git a/catalan/basic_starter.a65 b/catalan/basic_starter.a65
index 5242418..8257a4c 100644
--- a/catalan/basic_starter.a65
+++ b/catalan/basic_starter.a65
@@ -12,11 +12,12 @@
  * Since in basic we need to provide a decimal string, but we store a decimal value, we need
  * to do this complicated convertion.
  */
-#define main_addr_ch1 "0" + main / 10000
-#define main_addr_ch2 "0" + (main - main / 10000 * 10000) / 1000
-#define main_addr_ch3 "0" + (main - main / 1000 * 1000) / 100
-#define main_addr_ch4 "0" + (main - main / 100 * 100) / 10
-#define main_addr_ch5 "0" + main - main / 10 * 10
+#define addr_to_ch(addr)                            \
+	"0" + addr / 10000,                         \
+	"0" + (addr - addr / 10000 * 10000) / 1000, \
+	"0" + (addr - addr / 1000 * 1000) / 100,    \
+	"0" + (addr - addr / 100 * 100) / 10,       \
+	"0" + addr - addr / 10 * 10
 
 .word $0801 ; Header -- addr 2049
 * = $0801   ; Program Counter
@@ -24,8 +25,7 @@
 .(
 	.word eol
 	.word 10
-	.byt $9e," "
-	.byt main_addr_ch1,main_addr_ch2,main_addr_ch3,main_addr_ch4,main_addr_ch5,0
+	.byt $9e," ",addr_to_ch(main),0
 eol	.word 0
 .)