source clean-up

.gitignore

@@ -1,7 +1,5 @@
 .project
 *.bak
-scorch.lab
+*.lab
-scorch.lst
+*.lst
-textproc.lab
-textproc.lst
 artwork/talk.as_

Atari/display_static.asm

@@ -113,11 +113,6 @@ OptionsTitle
    dta d"       scorch       "*
 .ELIF TARGET = 5200
    dta d" scorch supersystem "*
-; dta d"     scorch "*
-; dta             d"5"
-; dta              d"k"*
-; dta               d"2"
-; dta                d"     "*
 .ENDIF
 DifficultyTitle
  dta d"   difficulty   "*

Atari/interrupts.asm

@@ -170,7 +170,15 @@ nextlinedisplay
 ;    bne EndOfCreditsVBI
     mwa #Credits DLCreditsAddr
 EndOfCreditsVBI
-    .IF TARGET = 5200
+    .IF TARGET = 800
+        ; support for joysticks :)
+        ldx JoystickNumber
+        lda STICK0,x
+        sta STICK0
+        lda STRIG0,x
+        sta STRIG0
+        jmp XITVBV
+    .ELIF TARGET = 5200
         lda SkStatSimulator
         bmi @+
         inc SkStatSimulator
@@ -225,14 +233,6 @@ EndOfCreditsVBI
         tax
         pla
         rti
-    .ELSE    
-        ; support for joysticks :)
-        ldx JoystickNumber
-        lda STICK0,x
-        sta STICK0
-        lda STRIG0,x
-        sta STRIG0
-        jmp XITVBV
     .ENDIF
 .endp
     .IF TARGET = 5200

artwork/joytest.asm

@@ -17,4 +17,3 @@ pressed
     jmp @-
 
     run joytest
-    

artwork/sfx/rmtplayr_modified.asm

@@ -620,7 +620,7 @@ rmt_p5
 .IF TARGET = 800
     ldx #$10                ; pseudo stereo
     bne SetPokey_OffsetX    ; pseudo stereo
-.ELSE
+.ELIF TARGET = 5200
     rts
 .ENDIF
 SetPokey

artwork/splash_v2/lzss_player.asm

@@ -150,4 +150,3 @@ skip
 
 stereo_buff    ; stereo
     .ds 9    ; stereo
-    

constants.asm

@@ -59,9 +59,9 @@ LineGameOver
 seppukuText
     dta d"#  SEPPUKU!  #"
 areYouSureText
-    .IF target != 5200
+    .IF TARGET = 800
         dta d"# SURE?  Y/N #"
-    .ELSE
+    .ELIF TARGET = 5200
         dta d"#END? Y-1/N-0#"
     .ENDIF
 
@@ -631,7 +631,7 @@ CreditsStart
     dta   d"SFX, Music and Suppor",d"t"*
     dta   d"Michal 'Miker' Szpilowsk",d"i"*
     dta   d" "*
-    .IF target != 5200
+    .IF TARGET = 800
       dta d"Additional Musi",d"c"*
       dta d"Mario 'Emkay' Kri",d"x"*
       dta d" "*
@@ -641,7 +641,7 @@ CreditsStart
     dta   d" "*
     dta   d"Ar",d"t"*
     dta   d"Adam Wachowsk",d"i"*
-    .IF target != 5200
+    .IF TARGET = 800
       dta d"Roman 'xorcerer' Fierfa",d"s"*
     .ENDIF
     dta   d" "*
@@ -651,12 +651,12 @@ CreditsStart
     dta   d"Beeblebrox, KrzysRog, lopezpb",d","*
     dta   d"brad-colbert, archon800, nowy80",d","*
     dta   d"Shaggy the Atarian, RetroBorsuk, ZPH"
-    .IF target = 5200
+    .IF TARGET = 800
+      dta d" "*
+    .ELIF TARGET = 5200
       dta d","*
       dta d"x-usr(1536), Aking, JAC!, phaeron",d","*
       dta d"RB520",d"0"*
-    .ELSE
-    dta d" "*
     .ENDIF
     dta   d" "*
     dta   d"Additional testin",d"g"*
@@ -664,20 +664,22 @@ CreditsStart
     dta   d" "*
     dta   d"Special thank",d"s"*
     dta   d"Krzysztof 'Kaz' Ziembi",d"k"*
-    .IF target != 5200
+    .IF TARGET = 800
       dta d"  "*
       dta d"Stay tuned for the FujiNet version",d"!"*
     .ENDIF
     dta d"         "*
 CreditsEnd
-.IF target = 5200
+.IF TARGET = 800
-  CreditsLines=34 + 7; add 7 for scrollout
-.ELSE
   CreditsLines=40 + 7  ; add 7 for scrollout
+.ELIF TARGET = 5200
+  CreditsLines=34 + 7; add 7 for scrollout
 .ENDIF
-.IF target = 5200
+
+.IF TARGET = 5200
   ; Atari 5200 splash
   NewSplashText=*
     dta d" 2023  atariage", $4e, "com "  ; $4e - non blinking dot
 .ENDIF
-.endif
+
+.endif  ; .IF *>0

scorch.asm

@@ -7,7 +7,7 @@
 
 ;---------------------------------------------------
 .IFNDEF TARGET
-    .def TARGET = 800 ; 5200  ; or 64
+    .def TARGET = 800 ; 5200
 .ENDIF
 ;atari800  -5200 -cart ${outputFilePath} -cart-type 4
 ;atari800  -run ${outputFilePath}
@@ -152,7 +152,11 @@ FirstZpageVariable = $57
 ;-----------------------------------------------
 ; libraries
 ;-----------------------------------------------
-    .IF TARGET = 5200
+    .IF TARGET = 800
+      icl 'Atari/lib/ATARISYS.ASM'
+      icl 'Atari/lib/MACRO.ASM'
+      icl 'artwork/splash_v2/splash.asm'  ; splash screen and musix
+    .ELIF TARGET = 5200
       OPT h-f+  ; no headers, single block --> cart bin file
       icl 'Atari/lib/5200SYS.ASM'
       icl 'Atari/lib/5200MACRO.ASM'
@@ -193,10 +197,6 @@ FirstZpageVariable = $57
         _none = $0f
 
       .ende
-    .ELSE
-      icl 'Atari/lib/ATARISYS.ASM'
-      icl 'Atari/lib/MACRO.ASM'
-      icl 'artwork/splash_v2/splash.asm'  ; splash screen and musix
     .ENDIF
 
 ;-----------------------------------------------
@@ -246,13 +246,8 @@ FirstSTART
     .IF TARGET = 5200
     ; start in 5200 diagnostic mode
     ; move original startup procedure to RAM
-    Modified5200Splash = $2100  ; apparently there is some free space here
-    ; 6502 initialization
-    ; SEI
-    ; CLD
-    ; LDX #$FF
-    ; TXS
 
+    Modified5200Splash = $2100  ; apparently there is some free space here
     ; check kernel version
     Atari5200KernelByte = $fff8
     ; $32 - 4 joy
@@ -327,7 +322,6 @@ no5200splash
     jsr GenerateLineTable
 
     .IF TARGET = 800
-
       ; pokeys init
       lda #3    ; stereo
       sta POKEY+$0f ; stereo
@@ -341,9 +335,6 @@ no5200splash
       ; 5 values in RMT file
       ; not elegant :(
       mva #$06 MODUL-6+$967    ; $07 > $06
-    ;mva #$06 MODUL-6+$bc3    ; $07 > $06
-    ;mva #$06 MODUL-6+$e69    ; $08 > $06
-    ;mva #$06 MODUL-6+$ebc    ; $08 > $06
       sta MODUL-6+$bc3    ; $07 > $06
       sta MODUL-6+$e69    ; $08 > $06
       sta MODUL-6+$ebc    ; $08 > $06
@@ -354,13 +345,8 @@ no5200splash
       ; and mountains colors table address
       mva #<dliColorsFore2PAL GradientAddrL+2
       mva #>dliColorsFore2PAL GradientAddrH+2
-;    mva #$c4 dliColorsFore2+16
-;    mva #$c6 dliColorsFore2+17
-;    mva #$a4 dliColorsFore2+18
-;    mva #$a6 dliColorsFore2+19
-;    sta dliColorsFore2+20
 NoRMT_PALchange
-    .ELSE
+    .ELIF TARGET = 5200
       mva #$7f SkStatSimulator
     .ENDIF
 
@@ -396,14 +382,14 @@ NoRMT_PALchange
 ; result: A=keycode
 ;--------------------------------------------------
     jsr WaitForKeyRelease
-@
+getKeyAfterWait
     .IF TARGET = 800
       lda SKSTAT
       cmp #$ff
       beq checkJoyGetKey ; key not pressed, check Joy
       cmp #$f7  ; SHIFT
       beq checkJoyGetKey
-      .ELSE
+    .ELIF TARGET = 5200
       lda SkStatSimulator
       and #%11111110
       bne checkJoyGetKey ; key not pressed, check Joy
@@ -442,7 +428,7 @@ checkSelectKey
       lda CONSOL
       and #%00000100    ; Option
     .ENDIF
-    bne @-
+    bne getKeyAfterWait
 OptionPressed
     lda #@kbcode._atari    ; Option key
     bne getkeyend
@@ -488,7 +474,7 @@ StillWait
       and #%00000110    ; Select and Option only
       cmp #%00000110
       bne StillWait
-    .ELSE
+    .ELIF TARGET = 5200
       lda SkStatSimulator
       and #%11111110
       beq StillWait
@@ -757,7 +743,9 @@ MODULEND
 ;----------------------------------------------
 
   .ECHO "Bytes on top left: ",$bfe8-* ;ROM_SETTINGS-*
-  .IF target = 5200
+  .IF TARGET = 800
+     run FirstSTART
+  .ELIF TARGET = 5200
     .IF * > ROM_SETTINGS-1
       .ERROR 'Code and RMT song too long to fit in 5200'
     .ENDIF
@@ -766,6 +754,4 @@ MODULEND
     .byte " scorch supersystem "    ;20 characters title
     .byte " ", $ff          ;$BFFD == $ff means diagnostic cart, no splash screen
     .word FirstSTART
-  .ELSE
-     run FirstSTART
   .ENDIF

scorchC64.asm

@@ -442,4 +442,3 @@ NMI
          INC $D020      ; change border colour, indication for a NMI
         RTI             ; exit interrupt
                         ; (not acknowledged!)
-  

weapons.asm

@@ -3087,4 +3087,3 @@ noBullets
 
 
     .ENDIF
-