Improve string I/O helper macros

2 files changed, 5 insertions, 5 deletions

diff --git a/asm/ext_string_io.py b/asm/ext_string_io.py
index cf7d598..7b026ba 100644
--- a/asm/ext_string_io.py
+++ b/asm/ext_string_io.py
@@ -13,6 +13,7 @@ def get_unique_name(prefix: str):
   return ret
 
 def expand_put_char(cursor_reg: str, scratch_reg: str, c: str) -> ExpandResult:
+  c = c.strip("\"")
   return [
     ["ldi", str(to_char_code(c)), scratch_reg],
     ["str", scratch_reg, cursor_reg],
@@ -21,6 +22,7 @@ def expand_put_char(cursor_reg: str, scratch_reg: str, c: str) -> ExpandResult:
 
 def expand_put_string(cursor_reg: str, scratch_reg: str, *rest: str) -> ExpandResult:
   string = " ".join(rest)
+  string = string.strip("\"")
   result: ExpandResult = []
   for c in string:
     result += expand_put_char(cursor_reg, scratch_reg, c)
diff --git a/asm/text_mode.atk16 b/asm/text_mode.atk16
index f4d84ae..f33120d 100644
--- a/asm/text_mode.atk16
+++ b/asm/text_mode.atk16
@@ -9,11 +9,9 @@
 
 @label main
   cursor_to_line RA 1
-  put_char RA RB %SPACE
-  put_string RA RB HELLO CORECAMP
-  cursor_to_line RA 3
-  put_char RA RB %SPACE
-  put_string RA RB BY JAN
+  put_string RA RB " HELLO CORECAMP"
+  cursor_to_line RA 2
+  put_string RA RB " BY JAN"
 
   ; set graphics mode to sprite mode
   ; set_graphics_mode gr_sprite_mode