starred/scorch_src
1
0
Fork 0
mirror of https://github.com/pkali/scorch_src.git synced 2026-05-20 22:34:21 +02:00
Code Issues 29 Packages Projects Releases 10 Wiki Activity

source clean-up

Browse Source
This commit is contained in:
pkali
2023-05-20 09:48:28 -04:00
parent 401d94eec9
commit 4fa861af3d
23 changed files with 805 additions and 12540 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+2 -4
View File
@@ -1,7 +1,5 @@
.project .project
*.bak *.bak
scorch.lab *.lab
scorch.lst *.lst
textproc.lab
textproc.lst
artwork/talk.as_ artwork/talk.as_
Atari/display_static.asm
+53 -58
View File
@@ -12,50 +12,50 @@ OptionsScreen
dta d" (un)2000-2023" dta d" (un)2000-2023"
.IF TARGET = 800 .IF TARGET = 800
dta d" Please select option with " dta d" Please select option with "
dta $fe,$dc,$dd,$ff ; cursors in inverse dta $fe,$dc,$dd,$ff ; cursors in inverse
dta d" and " dta d" and "
dta d"Tab"* dta d"Tab"*
dta d" " dta d" "
dta d" Press " dta d" Press "
dta d"Return"* dta d"Return"*
dta d" to proceed " dta d" to proceed "
.ELIF TARGET = 5200 .ELIF TARGET = 5200
dta d" Please select option with joystick one " dta d" Please select option with joystick one "
dta d" and press FIRE to proceed " dta d" and press FIRE to proceed "
.ENDIF .ENDIF
; 0123456789012345678901234567890123456789 ; 0123456789012345678901234567890123456789
;----------------------------------------------- ;-----------------------------------------------
NameScreen NameScreen
.IF TARGET = 800 .IF TARGET = 800
dta d" Enter names of players " dta d" Enter names of players "
.ELIF TARGET = 5200 .ELIF TARGET = 5200
dta d"Hold " dta d"Hold "
dta d "FIRE"* dta d "FIRE"*
dta d " to enter player names " dta d " to enter player names "
.ENDIF .ENDIF
NameScreen3 NameScreen3
dta d" Human/Atari (difficulty level) " dta d" Human/Atari (difficulty level) "
NameScreen5 NameScreen5
.IF TARGET = 800 .IF TARGET = 800
dta d"TAB"* dta d"TAB"*
dta d" - Port nr " dta d" - Port nr "
dta $fe,$dc,$dd,$ff ; cursors in inverse dta $fe,$dc,$dd,$ff ; cursors in inverse
dta d" - Difficulty" dta d" - Difficulty"
dta d" " dta d" "
dta d"INV"* dta d"INV"*
dta d" - Shape " dta d" - Shape "
dta d"Return"* dta d"Return"*
dta d" - Proceed " dta d" - Proceed "
.ELIF TARGET = 5200 .ELIF TARGET = 5200
dta d" " dta d" "
dta d"(5)"* dta d"(5)"*
dta d" - Port/Shape " dta d" - Port/Shape "
dta d"Joy"* dta d"Joy"*
dta d" - Diffic. " dta d" - Diffic. "
dta d" " dta d" "
dta d"FIRE"* dta d"FIRE"*
dta d" - Proceed " dta d" - Proceed "
.ENDIF .ENDIF
;----------------------------------------------- ;-----------------------------------------------
MoreUp MoreUp
@@ -73,51 +73,46 @@ MoreDown
WeaponsDescription WeaponsDescription
; 0123456789012345678901234567890123456789 ; 0123456789012345678901234567890123456789
.IF TARGET = 800 .IF TARGET = 800
dta d"Tab"* dta d"Tab"*
dta d ": Defensive/Offensive weapon " dta d ": Defensive/Offensive weapon "
.ELIF TARGET = 5200 .ELIF TARGET = 5200
dta d"Left"* dta d"Left"*
dta d ": Defensive/Offensive weapon" dta d ": Defensive/Offensive weapon"
.ENDIF .ENDIF
PurchaseDescription PurchaseDescription
; 0123456789012345678901234567890123456789 ; 0123456789012345678901234567890123456789
.IF TARGET = 800 .IF TARGET = 800
dta d"Space"* dta d"Space"*
dta d": Purchase " dta d": Purchase "
dta d"Return"* dta d"Return"*
dta d": Finish " dta d": Finish "
.ELIF TARGET = 5200 .ELIF TARGET = 5200
dta d"Right"* dta d"Right"*
dta d": Purchase " dta d": Purchase "
dta d"FIRE"* dta d"FIRE"*
dta d": Finish " dta d": Finish "
.ENDIF .ENDIF
ActivateDescription ActivateDescription
; 0123456789012345678901234567890123456789 ; 0123456789012345678901234567890123456789
.IF TARGET = 800 .IF TARGET = 800
dta d"Space"* dta d"Space"*
dta d": Activate " dta d": Activate "
dta d"Return"* dta d"Return"*
dta d": Finish " dta d": Finish "
.ELIF TARGET = 5200 .ELIF TARGET = 5200
dta d"Right"* dta d"Right"*
dta d": Activate " dta d": Activate "
dta d"FIRE"* dta d"FIRE"*
dta d": Finish " dta d": Finish "
.ENDIF .ENDIF
EmptyLine EmptyLine
dta d" " dta d" "
;--------------------------------------------------- ;---------------------------------------------------
OptionsTitle OptionsTitle
.IF TARGET = 800 .IF TARGET = 800
dta d" scorch "* dta d" scorch "*
.ELIF TARGET = 5200 .ELIF TARGET = 5200
dta d" scorch supersystem "* dta d" scorch supersystem "*
; dta d" scorch "*
; dta d"5"
; dta d"k"*
; dta d"2"
; dta d" "*
.ENDIF .ENDIF
DifficultyTitle DifficultyTitle
dta d" difficulty "* dta d" difficulty "*
Atari/interrupts.asm
+9 -9
View File
@@ -170,7 +170,15 @@ nextlinedisplay
; bne EndOfCreditsVBI ; bne EndOfCreditsVBI
mwa #Credits DLCreditsAddr mwa #Credits DLCreditsAddr
EndOfCreditsVBI 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 lda SkStatSimulator
bmi @+ bmi @+
inc SkStatSimulator inc SkStatSimulator
@@ -225,14 +233,6 @@ EndOfCreditsVBI
tax tax
pla pla
rti rti
.ELSE
; support for joysticks :)
ldx JoystickNumber
lda STICK0,x
sta STICK0
lda STRIG0,x
sta STRIG0
jmp XITVBV
.ENDIF .ENDIF
.endp .endp
.IF TARGET = 5200 .IF TARGET = 5200
artwork/joytest.asm
-1
View File
@@ -17,4 +17,3 @@ pressed
jmp @- jmp @-
run joytest run joytest
artwork/sfx/rmtplayr_modified.asm
+1 -1
View File
@@ -620,7 +620,7 @@ rmt_p5
.IF TARGET = 800 .IF TARGET = 800
ldx #$10 ; pseudo stereo ldx #$10 ; pseudo stereo
bne SetPokey_OffsetX ; pseudo stereo bne SetPokey_OffsetX ; pseudo stereo
.ELSE .ELIF TARGET = 5200
rts rts
.ENDIF .ENDIF
SetPokey SetPokey
artwork/splash_v2/lzss_player.asm
-1
View File
@@ -150,4 +150,3 @@ skip
stereo_buff ; stereo stereo_buff ; stereo
.ds 9 ; stereo .ds 9 ; stereo
constants.asm
+49 -47
View File
@@ -59,9 +59,9 @@ LineGameOver
seppukuText seppukuText
dta d"# SEPPUKU! #" dta d"# SEPPUKU! #"
areYouSureText areYouSureText
.IF target != 5200 .IF TARGET = 800
dta d"# SURE? Y/N #" dta d"# SURE? Y/N #"
.ELSE .ELIF TARGET = 5200
dta d"#END? Y-1/N-0#" dta d"#END? Y-1/N-0#"
.ENDIF .ENDIF
@@ -618,66 +618,68 @@ gameOverSpritesTop
.by 130+7,130+7,136+7,142+7,148+7,154+7 .by 130+7,130+7,136+7,142+7,148+7,154+7
;------credits ;------credits
CreditsStart CreditsStart
dta d" "* dta d" "*
dta d"You were playin",d"g"* dta d"You were playin",d"g"*
dta d"Scorc",d"h"* dta d"Scorc",d"h"*
dta d"Warsaw, Miam",d"i"* dta d"Warsaw, Miam",d"i"*
dta d"2000-202",d"3"* dta d"2000-202",d"3"*
dta d" "* dta d" "*
dta d"Programmin",d"g"* dta d"Programmin",d"g"*
dta d"Tomasz 'Pecus' Peck",d"o"* dta d"Tomasz 'Pecus' Peck",d"o"*
dta d"Pawel 'pirx' Kalinowsk",d"i"* dta d"Pawel 'pirx' Kalinowsk",d"i"*
dta d" "* dta d" "*
dta d"SFX, Music and Suppor",d"t"* dta d"SFX, Music and Suppor",d"t"*
dta d"Michal 'Miker' Szpilowsk",d"i"* dta d"Michal 'Miker' Szpilowsk",d"i"*
dta d" "* dta d" "*
.IF target != 5200 .IF TARGET = 800
dta d"Additional Musi",d"c"* dta d"Additional Musi",d"c"*
dta d"Mario 'Emkay' Kri",d"x"* dta d"Mario 'Emkay' Kri",d"x"*
dta d" "* dta d" "*
.ENDIF .ENDIF
dta d"Code Optimizatio",d"n"* dta d"Code Optimizatio",d"n"*
dta d"Piotr '0xF' Fusi",d"k"* dta d"Piotr '0xF' Fusi",d"k"*
dta d" "* dta d" "*
dta d"Ar",d"t"* dta d"Ar",d"t"*
dta d"Adam Wachowsk",d"i"* dta d"Adam Wachowsk",d"i"*
.IF target != 5200 .IF TARGET = 800
dta d"Roman 'xorcerer' Fierfa",d"s"* dta d"Roman 'xorcerer' Fierfa",d"s"*
.ENDIF .ENDIF
dta d" "* dta d" "*
dta d"Ideas, help and Q",d"A"* dta d"Ideas, help and Q",d"A"*
dta d"Bocianu, Probabilitydragon",d","* dta d"Bocianu, Probabilitydragon",d","*
dta d"EnderDude, Dracon",d","* dta d"EnderDude, Dracon",d","*
dta d"Beeblebrox, KrzysRog, lopezpb",d","* dta d"Beeblebrox, KrzysRog, lopezpb",d","*
dta d"brad-colbert, archon800, nowy80",d","* dta d"brad-colbert, archon800, nowy80",d","*
dta d"Shaggy the Atarian, RetroBorsuk, ZPH" dta d"Shaggy the Atarian, RetroBorsuk, ZPH"
.IF target = 5200 .IF TARGET = 800
dta d","* dta d" "*
dta d"x-usr(1536), Aking, JAC!, phaeron",d","* .ELIF TARGET = 5200
dta d"RB520",d"0"* dta d","*
.ELSE dta d"x-usr(1536), Aking, JAC!, phaeron",d","*
dta d" "* dta d"RB520",d"0"*
.ENDIF .ENDIF
dta d" "* dta d" "*
dta d"Additional testin",d"g"* dta d"Additional testin",d"g"*
dta d"Arek and Alex Peck",d"o"* dta d"Arek and Alex Peck",d"o"*
dta d" "* dta d" "*
dta d"Special thank",d"s"* dta d"Special thank",d"s"*
dta d"Krzysztof 'Kaz' Ziembi",d"k"* dta d"Krzysztof 'Kaz' Ziembi",d"k"*
.IF target != 5200 .IF TARGET = 800
dta d" "* dta d" "*
dta d"Stay tuned for the FujiNet version",d"!"* dta d"Stay tuned for the FujiNet version",d"!"*
.ENDIF .ENDIF
dta d" "* dta d" "*
CreditsEnd CreditsEnd
.IF target = 5200 .IF TARGET = 800
CreditsLines=34 + 7; add 7 for scrollout
.ELSE
CreditsLines=40 + 7 ; add 7 for scrollout CreditsLines=40 + 7 ; add 7 for scrollout
.ELIF TARGET = 5200
CreditsLines=34 + 7; add 7 for scrollout
.ENDIF .ENDIF
.IF target = 5200
.IF TARGET = 5200
; Atari 5200 splash ; Atari 5200 splash
NewSplashText=* NewSplashText=*
dta d" 2023 atariage", $4e, "com " ; $4e - non blinking dot dta d" 2023 atariage", $4e, "com " ; $4e - non blinking dot
.ENDIF .ENDIF
.endif
.endif ; .IF *>0
scorch.asm
+64 -78
View File
@@ -7,7 +7,7 @@
;--------------------------------------------------- ;---------------------------------------------------
.IFNDEF TARGET .IFNDEF TARGET
.def TARGET = 800 ; 5200 ; or 64 .def TARGET = 800 ; 5200
.ENDIF .ENDIF
;atari800 -5200 -cart ${outputFilePath} -cart-type 4 ;atari800 -5200 -cart ${outputFilePath} -cart-type 4
;atari800 -run ${outputFilePath} ;atari800 -run ${outputFilePath}
@@ -152,7 +152,11 @@ FirstZpageVariable = $57
;----------------------------------------------- ;-----------------------------------------------
; libraries ; 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 OPT h-f+ ; no headers, single block --> cart bin file
icl 'Atari/lib/5200SYS.ASM' icl 'Atari/lib/5200SYS.ASM'
icl 'Atari/lib/5200MACRO.ASM' icl 'Atari/lib/5200MACRO.ASM'
@@ -193,10 +197,6 @@ FirstZpageVariable = $57
_none = $0f _none = $0f
.ende .ende
.ELSE
icl 'Atari/lib/ATARISYS.ASM'
icl 'Atari/lib/MACRO.ASM'
icl 'artwork/splash_v2/splash.asm' ; splash screen and musix
.ENDIF .ENDIF
;----------------------------------------------- ;-----------------------------------------------
@@ -246,13 +246,8 @@ FirstSTART
.IF TARGET = 5200 .IF TARGET = 5200
; start in 5200 diagnostic mode ; start in 5200 diagnostic mode
; move original startup procedure to RAM ; 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 ; check kernel version
Atari5200KernelByte = $fff8 Atari5200KernelByte = $fff8
; $32 - 4 joy ; $32 - 4 joy
@@ -327,41 +322,32 @@ no5200splash
jsr GenerateLineTable jsr GenerateLineTable
.IF TARGET = 800 .IF TARGET = 800
; pokeys init
lda #3 ; stereo
sta POKEY+$0f ; stereo
sta POKEY+$1f ; stereo
; pokeys init lda PAL
lda #3 ; stereo and #%00001110
sta POKEY+$0f ; stereo bne NoRMT_PALchange
sta POKEY+$1f ; stereo ;it is PAL here
; Change RMT to PAL version
; 5 values in RMT file
; not elegant :(
mva #$06 MODUL-6+$967 ; $07 > $06
sta MODUL-6+$bc3 ; $07 > $06
sta MODUL-6+$e69 ; $08 > $06
sta MODUL-6+$ebc ; $08 > $06
mva #$10 MODUL-6+$a69 ; $12 > $10
mva #$04 MODUL-6+$bf8 ; $05 > $04
mva #$08 MODUL-6+$e3d ; $0a > $08
lda PAL ; and mountains colors table address
and #%00001110 mva #<dliColorsFore2PAL GradientAddrL+2
bne NoRMT_PALchange mva #>dliColorsFore2PAL GradientAddrH+2
;it is PAL here
; Change RMT to PAL version
; 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
mva #$10 MODUL-6+$a69 ; $12 > $10
mva #$04 MODUL-6+$bf8 ; $05 > $04
mva #$08 MODUL-6+$e3d ; $0a > $08
; 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 NoRMT_PALchange
.ELSE .ELIF TARGET = 5200
mva #$7f SkStatSimulator mva #$7f SkStatSimulator
.ENDIF .ENDIF
@@ -396,26 +382,26 @@ NoRMT_PALchange
; result: A=keycode ; result: A=keycode
;-------------------------------------------------- ;--------------------------------------------------
jsr WaitForKeyRelease jsr WaitForKeyRelease
@ getKeyAfterWait
.IF TARGET = 800 .IF TARGET = 800
lda SKSTAT lda SKSTAT
cmp #$ff cmp #$ff
beq checkJoyGetKey ; key not pressed, check Joy beq checkJoyGetKey ; key not pressed, check Joy
cmp #$f7 ; SHIFT cmp #$f7 ; SHIFT
beq checkJoyGetKey beq checkJoyGetKey
.ELSE .ELIF TARGET = 5200
lda SkStatSimulator lda SkStatSimulator
and #%11111110 and #%11111110
bne checkJoyGetKey ; key not pressed, check Joy bne checkJoyGetKey ; key not pressed, check Joy
.ENDIF .ENDIF
lda kbcode lda kbcode
cmp #@kbcode._none cmp #@kbcode._none
beq checkJoyGetKey beq checkJoyGetKey
and #$3f ;CTRL and SHIFT ellimination and #$3f ;CTRL and SHIFT ellimination
cmp #@kbcode._esc ; 28 ; ESC cmp #@kbcode._esc ; 28 ; ESC
bne getkeyend bne getkeyend
mvy #$80 escFlag mvy #$80 escFlag
bne getkeyend bne getkeyend
checkJoyGetKey checkJoyGetKey
;------------JOY------------- ;------------JOY-------------
@@ -434,15 +420,15 @@ notpressedJoyGetKey
lda STRIG0 lda STRIG0
beq JoyButton beq JoyButton
.IF TARGET = 800 ; Select and Option key only on A800 .IF TARGET = 800 ; Select and Option key only on A800
bne checkSelectKey bne checkSelectKey
checkSelectKey checkSelectKey
lda CONSOL lda CONSOL
and #%00000010 ; Select and #%00000010 ; Select
beq SelectPressed beq SelectPressed
lda CONSOL lda CONSOL
and #%00000100 ; Option and #%00000100 ; Option
.ENDIF .ENDIF
bne @- bne getKeyAfterWait
OptionPressed OptionPressed
lda #@kbcode._atari ; Option key lda #@kbcode._atari ; Option key
bne getkeyend bne getkeyend
@@ -488,10 +474,10 @@ StillWait
and #%00000110 ; Select and Option only and #%00000110 ; Select and Option only
cmp #%00000110 cmp #%00000110
bne StillWait bne StillWait
.ELSE .ELIF TARGET = 5200
lda SkStatSimulator lda SkStatSimulator
and #%11111110 and #%11111110
beq StillWait beq StillWait
.ENDIF .ENDIF
KeyReleased KeyReleased
rts rts
@@ -757,7 +743,9 @@ MODULEND
;---------------------------------------------- ;----------------------------------------------
.ECHO "Bytes on top left: ",$bfe8-* ;ROM_SETTINGS-* .ECHO "Bytes on top left: ",$bfe8-* ;ROM_SETTINGS-*
.IF target = 5200 .IF TARGET = 800
run FirstSTART
.ELIF TARGET = 5200
.IF * > ROM_SETTINGS-1 .IF * > ROM_SETTINGS-1
.ERROR 'Code and RMT song too long to fit in 5200' .ERROR 'Code and RMT song too long to fit in 5200'
.ENDIF .ENDIF
@@ -766,6 +754,4 @@ MODULEND
.byte " scorch supersystem " ;20 characters title .byte " scorch supersystem " ;20 characters title
.byte " ", $ff ;$BFFD == $ff means diagnostic cart, no splash screen .byte " ", $ff ;$BFFD == $ff means diagnostic cart, no splash screen
.word FirstSTART .word FirstSTART
.ELSE
run FirstSTART
.ENDIF .ENDIF
scorchC64.asm
-1
View File
@@ -442,4 +442,3 @@ NMI
INC $D020 ; change border colour, indication for a NMI INC $D020 ; change border colour, indication for a NMI
RTI ; exit interrupt RTI ; exit interrupt
; (not acknowledged!) ; (not acknowledged!)
scorchC64.lst
-11712
View File
File diff suppressed because it is too large Load Diff
weapons.asm
+10 -11
View File
@@ -1163,12 +1163,12 @@ NoSpyHard
jumpFromStick jumpFromStick
.IF TARGET = 800 .IF TARGET = 800
cmp #$80|17 ; Ctrl+Help cmp #$80|17 ; Ctrl+Help
bne NoVdebugSwitch bne NoVdebugSwitch
lda Vdebug lda Vdebug
eor #$ff eor #$ff
sta Vdebug sta Vdebug
jmp ReleaseAndLoop jmp ReleaseAndLoop
NoVdebugSwitch NoVdebugSwitch
.ENDIF .ENDIF
and #$3f ;CTRL and SHIFT ellimination and #$3f ;CTRL and SHIFT ellimination
@@ -1189,10 +1189,10 @@ NoVdebugSwitch
cmp #@kbcode._S ; $3e ; S cmp #@kbcode._S ; $3e ; S
jeq pressedS jeq pressedS
.IF TARGET = 800 .IF TARGET = 800
cmp #61 ; G cmp #61 ; G
bne EndKeys bne EndKeys
jsr SelectNextGradient.NotWind jsr SelectNextGradient.NotWind
jmp ReleaseAndLoop jmp ReleaseAndLoop
.ENDIF .ENDIF
EndKeys EndKeys
jmp notpressed jmp notpressed
@@ -3087,4 +3087,3 @@ noBullets
.ENDIF .ENDIF