Fix simple script handling

2022-06-26 23:32:15 -05:00 · 2022-06-26 23:32:15 -05:00 · b7d061e666
parent 8aafd5812b
commit b7d061e666
4 changed files with 3 additions and 6 deletions
--- a/demos/sprites/gen/App.TileSetAnim.s
+++ b/demos/sprites/gen/App.TileSetAnim.s
@ -12,7 +12,6 @@ TileAnimInit
            pea #170
            pea #3
            _GTECopyTileToDynamic
-            rts

            pea #15
            pea #^TileAnim
--- a/src/GTE.s
+++ b/src/GTE.s
@ -20,8 +20,6 @@ SetBG1XPos         EXT
 SetBG1YPos         EXT
 CopyBG0Tile        EXT
 CopyBG1Tile        EXT
-CopyTileToDyn      EXT
-Render             EXT

 ; SCB/Palette binding (high bit of array point indicates whether to bind to BG0 Y position (0)
 ; or BG1 Y position (1).
--- a/src/Script.s
+++ b/src/Script.s
@ -47,7 +47,6 @@ _StartScript   phx                      ; Save the script array address
               sta   Timers+8,x
               pla
               sta   Timers+10,x
-
               rts

 :err
@ -84,6 +83,7 @@ _dss_loop      phx                      ; Save the command address
               txy                      ; Cache in the y-register

               lda:  0,x                ; Load the command word
+
               pha                      ; Stash it

               and   #$001E             ; Only have 16 built-in commands.  Use the _UserCallback
@ -162,7 +162,7 @@ _SetDTile
               ldx:  ARG1,y
               lda:  ARG2,y
               tay
-               jsl   CopyTileToDyn
+               jsr   CopyTileToDyn
               brl   _dss_cmd_rtn

 _UserCallback
--- a/src/Timer.s
+++ b/src/Timer.s
@ -70,7 +70,7 @@ _AddTimer

 :oneshot        txa                                           ; return the slot ID and a success status
                clc
-                rtl
+                rts

 :notimers       ply
                pla