smol edits + wip

grafproc.asm

@@ -2065,6 +2065,18 @@ ybarrel
     bpl @-
     LDA TankColoursTable+4
     STA COLOR3     ; joined missiles (5th tank)
+    rts
+.endp
+;--------------------------------------------------
+.proc Lissajous
+;--------------------------------------------------
+;  x = Asin(at + fi)
+;  y = Bsin(bt)
+; center: xdraw, ydraw
+
+
+
+
     rts
 .endp
 

scorch.asm

@@ -126,7 +126,7 @@ FirstZpageVariable = $51
     .zpvar XHit             .word
     .zpvar delta            .word
     .zpvar HowMuchToFall    .byte
-    .zpvar magic .word
+    .zpvar magic            .word  ; worst var name in the whole business
     .zpvar xtraj            .word
     .zpvar xtraj_           .byte  ; 3 bytes
     .zpvar ytraj            .word
@@ -153,10 +153,9 @@ FirstZpageVariable = $51
     .zpvar OffsetDL1        .byte
     .zpvar L1               .byte
     HotNapalmFlag = FunkyBombCounter ; reuse variable!
-    ;* RMT ZeroPage addresses in artwork/sfx/rmtplayr.a65
-
     displayposition = modify
     LineAddress4x4 = xcircle
+    ;* RMT ZeroPage addresses in artwork/sfx/scorch_str9-NTSC.rmt
 
 ;-----------------------------------------------
 ; libraries
@@ -209,7 +208,6 @@ FirstZpageVariable = $51
         _atari = $fd  ; not used in 5200
         _ret   = $fd  ; not used in 5200
         _none  = $0f
-
       .ende
     .ENDIF
 
@@ -251,7 +249,6 @@ StatusBufferCopyEnd
 
 
     icl 'Atari/display_static.asm'
-;----------------------------------------------
 
 ;--------------------------------------------------
 ; Game Code
@@ -341,7 +338,7 @@ no5200splash
 
     .IF TARGET = 800
       ; pokeys init
-      lda #3    ; stereo
+      lda #3        ; stereo (pseudo)
       sta POKEY+$0f ; stereo
       sta POKEY+$1f ; stereo
 
@@ -720,8 +717,7 @@ font4x4
     asl
     asl ; 8 chars per name
     tax
-@
-    lda CheatName,y
+@     lda CheatName,y
       sec
       sbc tanksnames,x
       cmp #$27
@@ -752,14 +748,12 @@ CheatName
     bne EndofBFGDLI
     lda dliColorsFore
     bit random
-    bmi @+
-    lda DliColorBack
-@    sta COLPF2
+    smi:lda DliColorBack
+    sta COLPF2
     lda dliColorsFore
     bit random
-    bmi @+
-    lda DliColorBack
-@    sta COLPF1
+    smi:lda DliColorBack
+    sta COLPF1
 EndofBFGDLI
     inc dliCounter
     pla