diff --git a/README.md b/README.md index c2ddbef..566fdc2 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Scorch is a multi-player, turn-based, artillery video game. Tanks do turn-based by Tomasz 'Pecus' Pecko and Pawel 'pirx' Kalinowski -Warsaw, Miami 2000, 2001, 2002, 2003, 2009, 2012, 2013, 2022 +Warsaw, Miami 2000, 2001, 2002, 2003, 2009, 2012, 2013, 2022, 2023 Contributors: - Miker ([mikerro](https://github.com/mikerro)) - in-game music and sfx, ideas, QA @@ -17,8 +17,9 @@ Contributors: - xorcerer ([xauberer](https://github.com/xauberer)) - prompt for AI generated splash and sticker -QA: Probabilitydragon, KrzysRog, Beeblebrox, EnderDude, lopezpb, Dracon, brad-colbert, archon800, -Shaggy the Atarian, x=usr(1536), Aking, Kenshi +QA: Probabilitydragon, EnderDude, Dracon, Beeblebrox, KrzysRog, lopezpb, +brad-colbert, archon800, nowy80, Sabreman, Shaggy the Atarian, RetroBorsuk, ZPH, +x=usr(1536), Aking, RB520 Special thanks to tebe ([tebe6502](https://github.com/tebe6502)), JAC! ([peterdell](https://github.com/peterdell)) and phaeron ([Altirra](https://www.virtualdub.org/altirra.html)) for their fantastic tools and support. @@ -29,7 +30,7 @@ This source code was originally compiled with [OMC65 crossassembler](https://git Compilation: `mads scorch.asm -o:scorch.xex` -Game source code is split into 5+4 parts: +Game source code is split into several parts: - scorch.asm is the main game code (with many assorted routines) - grafproc.asm - graphics routines like line or circle - textproc.asm - text routines like list of weapons and shop diff --git a/scorch.asm b/scorch.asm index 9f29cb4..5c4a6bf 100644 --- a/scorch.asm +++ b/scorch.asm @@ -1489,11 +1489,11 @@ BubbleBobble bcc nextishigher bne swapvalues nextisequal - ; if results are equal, check Direct Hits (only lower byte - sorry memory) + ; if results are equal, check Direct Hits ldy TankSequence,x - lda DirectHitsL,y + lda DirectHits,y ldy TankSequence+1,x - cmp DirectHitsL,y + cmp DirectHits,y ; beq nextishigher ; this is to block hangs when 2 equal values meet bcc nextishigher diff --git a/scorch.bin b/scorch.bin index 942a9d8..1801e81 100644 Binary files a/scorch.bin and b/scorch.bin differ diff --git a/scorch.xex b/scorch.xex index 4e6d842..dd03251 100644 Binary files a/scorch.xex and b/scorch.xex differ diff --git a/textproc.asm b/textproc.asm index 838bf84..7b55476 100644 --- a/textproc.asm +++ b/textproc.asm @@ -1845,11 +1845,11 @@ NextChar jsr displaydec5 mva #0 displayposition ; overwrite first digit ; put hits points on the screen + sta decimal+1 ; pozor!!! A=0 ldx TankNr - lda DirectHitsL,x + lda DirectHits,x sta decimal - lda DirectHitsH,x - sta decimal+1 +; lda DirectHitsH,x ; one byte enough adw temp #19 displayposition jsr displaydec5 mva #0 displayposition ; overwrite first digit diff --git a/variables.asm b/variables.asm index 8b0b205..933ad6d 100644 --- a/variables.asm +++ b/variables.asm @@ -102,9 +102,9 @@ ResultsTable ;the results in the gameeeeee .DS MaxPlayers TempResults .DS MaxPlayers -DirectHitsH - .DS MaxPlayers -DirectHitsL +;DirectHitsH ; one byte enough +; .DS MaxPlayers +DirectHits .DS MaxPlayers EarnedMoneyH .DS MaxPlayers diff --git a/weapons.asm b/weapons.asm index 7c75f5e..e5f186e 100644 --- a/weapons.asm +++ b/weapons.asm @@ -1867,9 +1867,9 @@ EndOfFlight2 cpx HitFlag ; we don't count suicides :) beq @+ dex - inc DirectHitsL,x - bne @+ - inc DirectHitsH,x + inc DirectHits,x +; bne @+ ; one byte enough +; inc DirectHitsH,x @ ; tank hit - check defensive weapon of this tank tax