wip-hugo/routines/text/text.s

@@ -4,7 +4,7 @@
 ;; Takes in a PETSKI-code in CODE
 ;; And prints it ON X_pos, Y_pos
 ;; Note that this is the real positions divided by 8
-.proc char_draw
+.proc text
         X_pos = $FA
         Y_pos = $F9
         charset = $FB
@@ -26,11 +26,14 @@
         ;;We need the relative offset for bytes to read and write.
         ;; This is code *10 because 8byte is one character
         ;; *10 = 2*2*2 + 2
-        ASL code ;Will never owerflow, therefore 8byte
-        Mult_16 >petski_position, <petski_position, !
-        Mult_16 >petski_position, <petski_position, !
-        ;; Add starting position
-        Add_16 >petski_position, <petski_position, #<Character_generator_ROM , #>Character_generator_ROM, !
+        ASL code ;Will never owerflow 8byte
+        LDY code
+        Mult_16 >petski_position, <petski_position ; May overflow 8byte (therefore using 16)
+        Mult_16 >petski_position, <petski_position ; May overflow 8byte (therefore using 16)
+        ;TYA
+        ;Add_16_A >petski_position, <petski_position, #$00
+
+        Add_16 >petski_position, <petski_position, #<Character_generator_ROM , #>Character_generator_ROM
 
         ;;Calculate screen_position to use
         Mov_16 >screen_position, <screen_position, #<VIC_bank, #>VIC_bank

wip-hugo/source.s

@@ -4,12 +4,12 @@
 
 .include "STARTUP.s"
 ;.include "routines/line/line_test_time.s"
-jsr char_draw
+jsr text
 ;;This is used by .s files to terminate nicely without reading includes at the end!
 exit:
 jmp exit
 
-.include "routines/text/char_draw.s"
+.include "routines/text/text.s"
 .include "routines/memory/memset.s"
 .include "routines/memory/pixel_draw.s"
 .include "routines/memory/memcpy.s"