diff --git a/Atari/textproc.asm b/Atari/textproc.asm index b162e4d..1c88cc7 100644 --- a/Atari/textproc.asm +++ b/Atari/textproc.asm @@ -253,7 +253,7 @@ invertme ldx TankNr lda SkillTable,x beq ManualPurchase - jsr PurchaseAI ; remember to make ActivateAI :) !!! + jsr PurchaseAI ; skill of the TankNr in A, TankNr in X jmp AfterManualPurchase ManualPurchase lda JoyNumber,x diff --git a/ai.asm b/ai.asm index 191dca9..5a281e8 100644 --- a/ai.asm +++ b/ai.asm @@ -130,7 +130,7 @@ firstShoot ; compare the x position with the middle of the screen lda LowResDistances,x cmp #(screenwidth/8) ; screenwidth/2 but LowResDistances are already /4 -@ bcc tankIsOnTheRight + bcc tankIsOnTheRight ; enemy tank is on the left ;randomize 95 125 @@ -202,13 +202,11 @@ AngleIsSet adc AngleTable,y sta NewAngle -forceNow mwa #300 RandBoundaryLow mwa #700 RandBoundaryHigh ; ldx TankNr ; looks like not necessary jsr RandomizeForce -endo ; choose the best weapon jmp ChooseBestOffensive @@ -846,15 +844,15 @@ TankHit ;---------------------------------------------- .proc PurchaseAI ; -; A - skill of the TankNr +; A - skill of the TankNr, TankNr in X ; makes purchase for AI opponents ; results of this routine are not visible on the screen ;---------------------------------------------- asl - tax - lda PurchaseAIRoutines-1,x ; -1 and -2 because AI players are numbered from 1 not from 0 (Human) + tay + lda PurchaseAIRoutines-1,y ; -1 and -2 because AI players are numbered from 1 not from 0 (Human) pha - lda PurchaseAIRoutines-2,x + lda PurchaseAIRoutines-2,y pha ; rts ; MoronPurchase has rts :) .endp @@ -944,17 +942,10 @@ SorryNoPurchase ;---------------------------------------------- .proc ShooterPurchase ; first try to buy defensives -; mva #2 tempXroller; number of offensive purchases to perform - ldx TankNr -@ randomize ind_Battery ind_StrongParachute jsr TryToPurchaseOnePiece -; dec tempXroller -; bne @- - ; and now offensives mva #4 tempXroller; number of offensive purchases to perform - ;ldx TankNr @ randomize ind_Missile ind_Heavy_Roller jsr TryToPurchaseOnePiece @@ -966,13 +957,9 @@ SorryNoPurchase ;---------------------------------------------- .proc PoolsharkPurchase ; first try to buy defensives -; mva #2 tempXroller; number of offensive purchases to perform - ldx TankNr -@ randomize ind_Battery ind_Bouncy_Castle jsr TryToPurchaseOnePiece dec tempXroller -; bpl @- ; and now offensives mva #6 tempXroller; number of purchases to perform @@ -987,14 +974,11 @@ SorryNoPurchase .endp ;---------------------------------------------- .proc TosserPurchase - ; what is my money level - ldx TankNr lda MoneyH,x ; money / 256 lsr ; /2 sta tempXroller ; perform this many purchase attempts ; first try to buy defensives -; mva #1 tempXroller; number of defensive purchases to perform @ randomize ind_Battery ind_Bouncy_Castle jsr TryToPurchaseOnePiece @@ -1015,14 +999,11 @@ SorryNoPurchase .endp ;---------------------------------------------- .proc CyborgPurchase - ; what is my money level - ldx TankNr lda MoneyH,x ; money / 256 lsr ; /2 sta tempXroller ; perform this many purchase attempts ; first try to buy defensives -; mva #1 tempXroller; number of defensive purchases to perform @ randomize ind_Battery ind_Bouncy_Castle jsr TryToPurchaseOnePiece2 diff --git a/artwork/talk.asm b/artwork/talk.asm index 4c773f7..f60d805 100644 --- a/artwork/talk.asm +++ b/artwork/talk.asm @@ -78,7 +78,7 @@ dta d"OH MAN!"^ dta d"DOOUGH!"^ dta d"NEW DAY, NEW BOMB."^ - dta d"THIS IS THE END."^ + dta d"THIS IS THE END, MY ONLY FRIEND."^ dta d"VERY FUNNY."^ dta d"THE FAT LADY SANG."^ dta d"WHY DOES HAPPEN TO ME?"^ diff --git a/scorch.bin b/scorch.bin index b1b87e2..8064bfc 100644 Binary files a/scorch.bin and b/scorch.bin differ diff --git a/scorch.xex b/scorch.xex index fd2aa9e..414b890 100644 Binary files a/scorch.xex and b/scorch.xex differ diff --git a/scorchC64.asm b/scorchC64.asm index 45ebfa3..a12c6ac 100644 --- a/scorchC64.asm +++ b/scorchC64.asm @@ -24,7 +24,7 @@ ;--------------------------------------------------- .macro build - dta d"1.41" ; number of this build (4 bytes) + dta d"1.42" ; number of this build (4 bytes) .endm .macro RMTSong diff --git a/scorchC64.prg b/scorchC64.prg index c92b41e..9b2d53f 100644 Binary files a/scorchC64.prg and b/scorchC64.prg differ diff --git a/scorch_cart.xex b/scorch_cart.xex index 278c559..969147a 100644 Binary files a/scorch_cart.xex and b/scorch_cart.xex differ diff --git a/weapons.asm b/weapons.asm index d28836a..e54dabb 100644 --- a/weapons.asm +++ b/weapons.asm @@ -2939,7 +2939,6 @@ ItIsMe ldx TankNr mva #sfx_shield_off sfx_effect jsr ClearTankNr - mva #0 Erase ; x correction for P/M ; -- .IF XCORRECTION_FOR_PM = 1 @@ -2949,17 +2948,17 @@ ItIsMe .ENDIF ; -- GoDown - - mwa #mountaintable temp + mvy #0 Erase ; Y=0 +; mwa #mountaintable temp clc - lda temp + lda #mountaintable adc XtankstableH,x sta temp+1 adw temp #4 ; center of the tank - ldy #0 + ;ldy #0 lda (temp),y tay dey ; 1 pixel up!