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 1836cd1..0fc73fe 100644 Binary files a/scorch.bin and b/scorch.bin differ diff --git a/scorch.xex b/scorch.xex index e591325..9171667 100644 Binary files a/scorch.xex and b/scorch.xex differ