From d29b8418e459845e3ccb55a804cfe7c12748e180 Mon Sep 17 00:00:00 2001 From: Pecusx Date: Mon, 22 Dec 2025 22:44:36 +0100 Subject: [PATCH] Teams sortnig and earned money bug fix --- Atari/textproc.asm | 2 +- game.asm | 30 +++++++++++++++++++++--------- scorch.xex | Bin 32708 -> 32721 bytes 3 files changed, 22 insertions(+), 10 deletions(-) diff --git a/Atari/textproc.asm b/Atari/textproc.asm index 3ae604d..162d219 100644 --- a/Atari/textproc.asm +++ b/Atari/textproc.asm @@ -1699,10 +1699,10 @@ NextChar adw temp #19 displayposition jsr displaydec5 mva #0 displayposition ; overwrite first digit + ldx TankNr bit TeamGame bvs TeamsNoJoy ; put AI symbol or joystick only if no Teams - ldx TankNr ldy SkillTable,x bne ThisIsAI ldy JoyNumber,x diff --git a/game.asm b/game.asm index 658963b..76316fc 100644 --- a/game.asm +++ b/game.asm @@ -1188,8 +1188,28 @@ Bubble ldx #0 ;i=x stx temp2 ; sortflag=temp2 inx ; because NumberOfPlayers start from 1 (not 0) - BubbleBobble + jsr SortOnePass + inx + cpx NumberOfPlayers ; if no team game + bne BubbleBobble + + lda temp2 ; sortflag + bne Bubble + + ; amd Teams sorting + bit TeamGame + bvc NoTeamsSort + ldx #MaxPlayers+1 ;i=x + jsr SortOnePass ; for 2 Teams one pass is sufficient +NoTeamsSort + rts +.endp + +;-------------------------------------------------- +.proc SortOnePass +; optimalisation for 2 sorting procedures +;-------------------------------------------------- ldy TankSequence-1,x ; x count from 1 to NumberOfPlayers (we need cout from 0 to NumberOfPlayers-1) lda ResultsTable,y ldy TankSequence,x @@ -1232,14 +1252,6 @@ swapvalues sta TankSequence,x inc temp2 nextishigher - inx - cpx NumberOfPlayers - bne BubbleBobble - - lda temp2 - - bne Bubble - rts .endp ;-------------------------------------------------- diff --git a/scorch.xex b/scorch.xex index cca4784a9a71663c64a230191c91d26e87a6c1c3..5498bd6d68023ccef755cd9c020bbbf47376e3c4 100644 GIT binary patch delta 7572 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 V^W>*l);O>vtC(hV^=@!_{~uS&yKDde delta 7646 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 W&(Qs8))}BMRx$ZFbL(Z7-~R)(vf=^&