From 148c64f158b80241f979defb95c6086f1af6a806 Mon Sep 17 00:00:00 2001 From: pkali Date: Mon, 31 Oct 2022 01:51:20 -0400 Subject: [PATCH] version, README and manual_en update --- MANUAL_EN.md | 22 ++++++++++++---------- README.md | 15 +++++++++++++++ constants.asm | 7 +++++-- definitions.asm | 2 +- scorch.asm | 7 ++++--- scorch.bin | Bin 32768 -> 32768 bytes scorch.xex | Bin 48627 -> 48633 bytes 7 files changed, 37 insertions(+), 16 deletions(-) diff --git a/MANUAL_EN.md b/MANUAL_EN.md index 9312e6d..15dbb22 100644 --- a/MANUAL_EN.md +++ b/MANUAL_EN.md @@ -56,16 +56,18 @@ The status line shows which player is currently allowed to take a shot and a set * in parentheses is the name of the active defensive weapon - if there is any activated by the player. The keyboard controls here are simple, cursor keys or joystick: left/right - change the angle of the barrel, up/down - change the the force of the shot. -* [SPACE] or joystick button pressed briefly - firing a shot. -* [TAB] or [SELECT] - selection of offensive weapons (this option is not available directly with the joystick - you need to select Inventory). -* [I] or longer holding the joystick button - go to Inventory. It is a screen (actually two) with the same layout as the shopping menu, it also works similarly except that here you don't buy weapons, but choose one of the offensive ones to shoot or activate a defensive weapon. -* [A] or [OPTION] - go directly to the defensive weapons activation. -* [M] key - disable/enable background music. -* [S] key - disable/enable effect sounds. -* [START] - speed up some game animations. -* [O] - end the current game and jump to the Game Over screen with a summary. The summary of the results does not take into account the current round of the game, but only the rounds completed earlier. This corresponds to pressing the [ESC] key with the difference that the summary and credits are displayed. -* [START] + [OPTION] - immediately force the end of the game (Game Over), just like [O] but without confirmation. -* [ESC] - during the entire game at any time (unless the computer is playing, then sometimes you have to wait a while) you can press the [ESC] key, which allows you to abort the game and return to the beginning (of course, there is protection against accidental pressing). +| A800 | 5200 | function | +| --- | --- | +| [SPACE] | [0] | or joystick button pressed briefly - firing a shot.| +| [TAB] or [SELECT] | [5] | selection of offensive weapons (this option is not available directly with the joystick - you need to select Inventory) | +| [I] | [9] | or longer holding the joystick button - go to Inventory. It is a screen (actually two) with the same layout as the shopping menu, it also works similarly except that here you don't buy weapons, but choose one of the offensive ones to shoot or activate a defensive weapon. | +| [A] or [OPTION] | [7] | go directly to the defensive weapons activation. +| [M] | [PAUSE] | disable/enable background music. | +| [S] key | [RESET] | disable/enable effect sounds. | +| [START] | N/A | speed up some game animations. | +| [O] | [3] | end the current game and jump to the Game Over screen with a summary. The summary of the results does not take into account the current round of the game, but only the rounds completed earlier. This corresponds to pressing the [ESC] key with the difference that the summary and credits are displayed. | +| [START] + [OPTION] | N/A | immediately force the end of the game (Game Over), just like [O] but without confirmation. +| [ESC] | [*] | during the entire game at any time (unless the computer is playing, then sometimes you have to wait a while) you can press the [ESC] key, which allows you to abort the game and return to the beginning (of course, there is protection against accidental pressing). | ## 5. Game mechanics - offensive weapons diff --git a/README.md b/README.md index 5320bd7..1bd8c04 100644 --- a/README.md +++ b/README.md @@ -48,6 +48,21 @@ With the advent of [fujinet](https://fujinet.online/) we are thinking about maki ## Changelog: +###### Version 1.17 +2022-10-31 + +Mostly 5200 console port and NTSC improvements. +* Updated songs from Miker do not require skipping frames on NTSC machines. Crucial for the next point. +* Bouncy Castle bouncing of Funky Bomb fixed https://github.com/pkali/scorch_src/issues/129 +* 5200 version had various graphical and sound glitches. Although mostly harmless, it hurt our sense of aesthetics. First of all the flickering credits roll is all good now. +* Rare hang-ups on NTSC machines fixed +* Screen lowered down by 7 scan lines to help top status line on NTSC CRTs. +* 5200 ATTRACT mode not going away fixed +* Autorepeat added to menus what should help 5200 users with their non-centering abomination of a controller. +* DLI interrupts optimized, few cycles saved. +* 5200 keypad sort-of-works. Please refer to manual for key bindings. + + ###### Version 1.16 2022-10-16 diff --git a/constants.asm b/constants.asm index 45f1464..68d4cba 100644 --- a/constants.asm +++ b/constants.asm @@ -594,11 +594,14 @@ CreditsStart dta d"Krzysztof 'Kaz' Ziembi",d"k"* .ENDIF dta d" "* - dta d"Ideas and Q",d"A"* + dta d"Ideas, help and Q",d"A"* dta d"Bocianu, Probabilitydragon, EnderDude",d","* dta d"Beeblebrox, KrzysRog, lopezpb, Dracon",d","* dta d"brad-colbert, archon800, nowy80",d","* dta d"Shaggy the Atarian, RetroBorsuk, ZP",d"H"* + .IF target = 5200 + dta d"x-usr(1536), Aking, JAC!, phaero",d"n"* + .ENDIF dta d" "* dta d"Additional testin",d"g"* dta d"Arek and Alex Peck",d"o"* @@ -609,7 +612,7 @@ CreditsStart dta d" "* CreditsEnd .IF target = 5200 - CreditsLines=36 + CreditsLines=37 .ELSE CreditsLines=42 ; 34 in reality. add 7? .ENDIF diff --git a/definitions.asm b/definitions.asm index 412e3af..eb3d0b3 100644 --- a/definitions.asm +++ b/definitions.asm @@ -25,7 +25,7 @@ TextBackgroundColor = $02 ; REAL constans - use: LDA #TextBackgroundColor TextForegroundColor = $0A space = 0 ; space in screencodes -KeyRepeatSpeed = 15 ; (max 127 !!!) +KeyRepeatSpeed = 10 ; (max 127 !!!) ;character codes for symbols (tank, parachute, etc. ) char_parachute_______ = $02 diff --git a/scorch.asm b/scorch.asm index c0eb67a..c1f483b 100644 --- a/scorch.asm +++ b/scorch.asm @@ -6,7 +6,7 @@ ;Miami & Warsaw 2022 ;--------------------------------------------------- -.def TARGET = 800 ;5200 ; or 800 +.def TARGET = 800; 5200 ; or 800 ;atari800 -5200 -cart ${outputFilePath} -cart-type 4 ;atari800 -run ${outputFilePath} ;--------------------------------------------------- @@ -15,7 +15,7 @@ ;--------------------------------------------------- .macro build - dta d"1.16" ; number of this build (4 bytes) + dta d"1.17" ; number of this build (4 bytes) .endm .macro RMTSong @@ -1152,10 +1152,11 @@ MakeTanksVisible lda dliColorsFore nop nop + nop .IF TARGET = 800 nop ; necessary on 800 because DLIs take less time, jitter visible without it nop - nop + .ENDIF sta COLPF2 lda DliColorBack diff --git a/scorch.bin b/scorch.bin index 1836cd1f0436fb57418119791992d8fb658a058c..0fc73fe72717f49bc38b9ad66e6526902ccca8d4 100644 GIT binary patch delta 7717 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 E0rB+c&Hw-a delta 7602 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 S_~@$K9YdUkNrnfs%=>?TR>M00 diff --git a/scorch.xex b/scorch.xex index e591325683b4cf531d60e6f3b2463403020af767..91716678684d06650c0b1dfb807de8d3dd630a62 100644 GIT binary patch delta 5915 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 UCuf%)Z9F{rjHUC3wqL3L1I-8&FaQ7m delta 5798 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