From 77a468b9c132382d70e890c299909c22e72dff6f Mon Sep 17 00:00:00 2001 From: Pecusx Date: Sun, 21 Dec 2025 00:14:57 +0100 Subject: [PATCH] 10 or 20 rounds in Team game and better credits --- Atari/display_static.asm | 3 ++- Atari/textproc.asm | 4 +++- constants.asm | 11 +++++++---- scorch.asm | 3 +++ scorch.xex | Bin 32558 -> 32578 bytes 5 files changed, 15 insertions(+), 6 deletions(-) diff --git a/Atari/display_static.asm b/Atari/display_static.asm index 3b92e4d..d723358 100644 --- a/Atari/display_static.asm +++ b/Atari/display_static.asm @@ -9,7 +9,8 @@ OptionsScreen dta d"Welcome to Scorch v. " build ; 4 bytes from scorch.asm (fancy method) :) - dta d" (un)2000-2025" + dta d" (un)2000-" + year ; 4 bytes from scorch.asm .IF TARGET = 800 dta d" Please select option with " diff --git a/Atari/textproc.asm b/Atari/textproc.asm index 74906c5..2beb1f6 100644 --- a/Atari/textproc.asm +++ b/Atari/textproc.asm @@ -78,7 +78,9 @@ OptionsMainLoop bit TeamGame bvc NoTeamMoreRounds - mva #0 OptionsTable+4 ; In Team game only 10 rounds available + lda OptionsTable+4 ; In Team game only 10 or 20 rounds available + and #%00000001 + sta OptionsTable+4 NoTeamMoreRounds jsr OptionsInversion jsr GetKey diff --git a/constants.asm b/constants.asm index a808919..2630574 100644 --- a/constants.asm +++ b/constants.asm @@ -622,8 +622,9 @@ CreditsStart dta d"You were playing"^ dta d"Scorch"^ dta d"Warsaw, Miami"^ - dta d"2000-2025"^ - dta d" "* + dta d" 2000-" + year ; 4 bytes ftom scorch.asm + dta d" "* dta d"Programming"^ dta d"Tomasz 'Pecus' Pecko"^ dta d"Pawel 'pirx' Kalinowski"^ @@ -665,7 +666,7 @@ CreditsStart dta d"RB5200, Krzysztof 'Kaz' Ziembik"^ .ENDIF dta d" "* - dta d"Additional testing"^ + dta d"Additional testing and Teams idea"^ dta d"Arek and Alex Pecko"^ dta d" "* dta d"Special thanks"^ @@ -686,7 +687,9 @@ CreditsEnd .IF TARGET = 5200 ; Atari 5200 splash NewSplashText=* - dta d" 2025 atariage", $4e, "com " ; $4e - non blinking dot + dta d" " + year ; 4 bytes ftom scorch.asm + dta d" atariage", $4e, "com " ; $4e - non blinking dot .ENDIF .endif ; .IF *>0 diff --git a/scorch.asm b/scorch.asm index 6feded0..cad1d74 100644 --- a/scorch.asm +++ b/scorch.asm @@ -43,6 +43,9 @@ .macro build dta d"1.55" ; number of this build (4 bytes) .endm +.macro year + dta d"2025" ; year of this build (4 bytes) +.endm .macro RMTSong lda #:1 diff --git a/scorch.xex b/scorch.xex index 3b428e6ca3d3efb50678f1245ed86dae7a62227c..84383a1d71a5a2c929e8fa7c57fc2b277d831a6f 100644 GIT binary patch delta 5720 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