Pecus/scorch_src
1
0
Fork 0
mirror of https://github.com/Pecusx/scorch_src.git synced 2026-05-20 22:33:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

opty + purchaseTable fix

Browse Source
This commit is contained in:
pkali
2022-08-28 11:46:55 -04:00
parent 57844f2df0
commit ef361d044e
4 changed files with 71 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
constants.asm
+61 -58
View File
@@ -447,16 +447,14 @@ PurchaseMeTable ;weapons good to be purchased by the robot
; "Heavy Sandhog ","Dirt Clod ","Dirt Ball ","Ton of Dirt " ; "Heavy Sandhog ","Dirt Clod ","Dirt Ball ","Ton of Dirt "
; "Liquid Dirt ","Dirt Charge ","Buy me! ","Plasma Blast " ; "Liquid Dirt ","Dirt Charge ","Buy me! ","Plasma Blast "
.by %00000000 .by %00000000
; "Laser " ; "Laser ","White Flag ","Battery ","Bal Guidance "
.by %00000000 ; "Horz Guidance ","Hovercraft ","Lazy Boy ","Parachute "
.by 0 ; offset to defensives .by %00100001
; "White Flag ","Battery ","Bal Guidance ","Horz Guidance " ; "Strong Parachute","Mag Deflector ","Shield ","Heavy Shield "
; "Hovercraft ","Lazy Boy ","Parachute ","Strong Parachute" ; "Force Shield ","Super Mag ","Bouncy Castle ","Long Barrel "
.by %01000011 .by %11111010
; "Mag Deflector ","Shield ","Heavy Shield ","Force Shield " ; "Nuclear Winter "
; "Super Mag ","Bouncy Castle ","Long Barrel ","Nuclear Winter " .by %00000000
.by %11110100
PurchaseMeTable2 ;weapons good to be purchased by the robot (Cyborg) PurchaseMeTable2 ;weapons good to be purchased by the robot (Cyborg)
;the comment is an index in the tables ;the comment is an index in the tables
; "Baby Missile ","Missile ","Baby Nuke ","Nuke " ; "Baby Missile ","Missile ","Baby Nuke ","Nuke "
@@ -471,16 +469,14 @@ PurchaseMeTable2 ;weapons good to be purchased by the robot (Cyborg)
; "Heavy Sandhog ","Dirt Clod ","Dirt Ball ","Ton of Dirt " ; "Heavy Sandhog ","Dirt Clod ","Dirt Ball ","Ton of Dirt "
; "Liquid Dirt ","Dirt Charge ","Buy me! ","Plasma Blast " ; "Liquid Dirt ","Dirt Charge ","Buy me! ","Plasma Blast "
.by %00000000 .by %00000000
; "Laser " ; "Laser ","White Flag ","Battery ","Bal Guidance "
.by %00000000 ; "Horz Guidance ","Hovercraft ","Lazy Boy ","Parachute "
.by 0 ; offset to defensives .by %00100000
; "White Flag ","Battery ","Bal Guidance ","Horz Guidance " ;,"Strong Parachute","Mag Deflector ","Shield ","Heavy Shield "
; "Hovercraft ","Lazy Boy ","Parachute ","Strong Parachute" ;,"Force Shield ","Super Mag ","Bouncy Castle ","Long Barrel "
.by %01000001 .by %11011010
; "Mag Deflector ","Shield ","Heavy Shield ","Force Shield " ;"Nuclear Winter "
; "Super Mag ","Bouncy Castle ","Long Barrel ","Nuclear Winter " .by %00000000
.by %10110100
;------------------------------------------------- ;-------------------------------------------------
; Screen codes of icons (chars) representing a given weapon ; Screen codes of icons (chars) representing a given weapon
WeaponSymbols WeaponSymbols
@@ -546,43 +542,59 @@ NamesOfWeapons ;the comment is an index in the tables
dta d"White Flag " ; 33 dta d"White Flag " ; 33
dta d"Battery " ; 34 dta d"Battery " ; 34
dta d"Bal Guidance " ; 35 ;dta d"Bal Guidance " ; 35
dta d"Horz Guidance " ; 36 ;-----------------------------------
dta d"Hovercraft " ; 37 DefensiveEnergy ; OPTIMIZATION - unused name of the weapon
dta d"Lazy Boy " ; 38 .by 00 ; White Flag
.by 00 ; Heat Guidance
.by 00 ; Bal Guidance
.by 00 ; Horz Guidance
.by 98 ; Let's go!
.by 00 ; Lazy Boy
.by 00 ; Parachute
.by 99 ; Strong Parachute
.by 99 ; Mag Deflector
.by 00 ; Shield
.by 99 ; Heavy Shield
.by 99 ; Force Shield
.by 00 ; Super Mag
.by 99 ; Bouncy Castle
.by 00 ; Long Barrel
.by 00 ; Nuclear Winter
;-----------------------------------
;dta d"Horz Guidance " ; 36
;-----------------------------------
weaponsOfDeath ; weapons used in tank death animations
dta 1,2,3,7,17,18,19,20,21,22,23,24,25,26,27 ; OPTIMIZATION - unused name of the weapon
weaponsOfDeathEnd dta d"Hovercraft " ; 37
;-----------------------------------
dta 0 ; ALIGN to 16
; dta d"Lazy Boy " ; 38
;-----------------------------------
joyToKeyTable; OPTIMIZATION - unused name of the weapon
; .by 00, 01, 02, 03, 04, 05, 06, 07, 08, 09, 10, 11, 12, 13, 14, 15
.by $ff,$ff,$ff,$ff,$ff,$ff,$ff,$07,$ff,$ff,$ff,$06,$ff,$0f,$0e,$ff
;-----------------------------------
dta d"Parachute " ; 39 - no energy dta d"Parachute " ; 39 - no energy
dta d"Strong Parachute" ; 40 - with energy (earlier Battery) dta d"Strong Parachute" ; 40 - with energy (earlier Battery)
dta d"Mag Deflector " ; 41 - with shield and energy dta d"Mag Deflector " ; 41 - with shield and energy
dta d"Shield " ; 42 - shield for one shot - no energy dta d"Shield " ; 42 - shield for one shot - no energy
dta d"Heavy Shield " ; 43 - shield with energy dta d"Heavy Shield " ; 43 - shield with energy
dta d"Force Shield " ; 44 - shield with energy and parachute dta d"Force Shield " ; 44 - shield with energy and parachute
dta d"Super Mag " ; 45 ;dta d"Super Mag " ; 45
;-----------------------------------
gameOverSpritesTop ; OPTIMIZATION - unused name of the weapon
; end of the Gover sprites by number of players
; 1 2 3 4 5 6
.by 130,130,136,142,148,154
;-------decimal constans
zero
digits dta d"0123456789"
;-----------------------------------
dta d"Bouncy Castle " ; 46 - with shield and energy dta d"Bouncy Castle " ; 46 - with shield and energy
dta d"Long Schlong " ; 47 dta d"Long Schlong " ; 47
dta d"Nuclear Winter " ; 48 dta d"Nuclear Winter " ; 48
DefensiveEnergy = * - 48
.by 00 ; White Flag
.by 00 ; Heat Guidance
.by 00 ; Bal Guidance
.by 00 ; Horz Guidance
.by 98 ; Let's go!
.by 00 ; Lazy Boy
.by 00 ; Parachute
.by 99 ; Strong Parachute
.by 99 ; Mag Deflector
.by 00 ; Shield
.by 99 ; Heavy Shield
.by 99 ; Force Shield
.by 00 ; Super Mag
.by 99 ; Bouncy Castle
.by 00 ; Long Barrel
.by 00 ; Nuclear Winter
weaponsOfDeath ; weapons used in tank death animations
dta 1,2,3,7,17,18,19,20,21,22,23,24,25,26,27
weaponsOfDeathEnd
joyToKeyTable
; .by 00, 01, 02, 03, 04, 05, 06, 07, 08, 09, 10, 11, 12, 13, 14, 15
.by $ff,$ff,$ff,$ff,$ff,$ff,$ff,$07,$ff,$ff,$ff,$06,$ff,$0f,$0e,$ff
;----------------------------------- ;-----------------------------------
keycodes ;tables for converting KeyCode to Screen Code (38 -1 characters) keycodes ;tables for converting KeyCode to Screen Code (38 -1 characters)
@@ -598,16 +610,7 @@ scrcodes
dta d"qrstuvwx" dta d"qrstuvwx"
dta d"yz123456" dta d"yz123456"
dta d"7890. " ; "-" dta d"7890. " ; "-"
;-----------------------------------
gameOverSpritesTop
; end of the Gover sprites by number of players
; 1 2 3 4 5 6
.by 130,130,136,142,148,154
;-------decimal constans
zero
digits dta d"0123456789"
nineplus dta d"9"+1
space dta d" "
;------credits ;------credits
CreditsStart CreditsStart
dta d" "* dta d" "*
definitions.asm
+1
View File
@@ -26,6 +26,7 @@ LongBarrel = 20 ; long barrel length
TextBackgroundColor = $02 ; REAL constans - use: LDA #TextBackgroundColor TextBackgroundColor = $02 ; REAL constans - use: LDA #TextBackgroundColor
TextForegroundColor = $0A TextForegroundColor = $0A
space = 0 ; space in screencodes
;character codes for symbols (tank, parachute, etc. ) ;character codes for symbols (tank, parachute, etc. )
char_parachute_______ = $02 char_parachute_______ = $02
scorch.xex
BIN
View File
Binary file not shown.
textproc.asm
+9 -9
View File
@@ -1454,7 +1454,7 @@ displayloop
beq noleading0 ; if 00000 - last 0 must be beq noleading0 ; if 00000 - last 0 must be
cmp zero cmp zero
bne noleading0 bne noleading0
lda space lda #space
beq displaychar ; space = 0 ! beq displaychar ; space = 0 !
noleading0 noleading0
inx ; set flag (no leading zeroes to cut) inx ; set flag (no leading zeroes to cut)
@@ -1501,7 +1501,7 @@ TooLittle001 dex
lda decimalresult lda decimalresult
cmp zero cmp zero
bne decimalend1 bne decimalend1
lda space lda #space
sta decimalresult sta decimalresult
decimalend1 decimalend1
@@ -2327,7 +2327,7 @@ EndOfCredits
lda ActiveDefenceWeapon,x lda ActiveDefenceWeapon,x
bne ActiveDefence bne ActiveDefence
; clear brackets ; clear brackets
lda #$00 ; space lda #space
sta textbuffer+80+22 sta textbuffer+80+22
sta textbuffer+80+39 sta textbuffer+80+39
mwa #emptyLine temp mwa #emptyLine temp
@@ -2365,7 +2365,7 @@ ClearingOnly
;displaying the energy of a tank shield (if exist) ;displaying the energy of a tank shield (if exist)
;--------------------- ;---------------------
; clear (if no shield) ; clear (if no shield)
lda #$00 ; space lda #space
sta textbuffer+40+10 sta textbuffer+40+10
sta textbuffer+40+11 sta textbuffer+40+11
sta textbuffer+40+12 sta textbuffer+40+12
@@ -2394,7 +2394,7 @@ NoShieldEnergy
bmi DisplayLeftWind bmi DisplayLeftWind
lda #$7f ; (tab) char lda #$7f ; (tab) char
sta textbuffer+80+20 sta textbuffer+80+20
lda #0 ;space lda #space
sta textbuffer+80+17 sta textbuffer+80+17
beq DisplayWindValue beq DisplayWindValue
DisplayLeftWind DisplayLeftWind
@@ -2407,7 +2407,7 @@ DisplayLeftWind
sta temp+1 sta temp+1
lda #$7e ;(del) char lda #$7e ;(del) char
sta textbuffer+80+17 sta textbuffer+80+17
lda #0 ;space lda #space
sta textbuffer+80+20 sta textbuffer+80+20
DisplayWindValue DisplayWindValue
:4 lsrw temp ;divide by 16 to have a nice value on a screen :4 lsrw temp ;divide by 16 to have a nice value on a screen
@@ -2449,7 +2449,7 @@ AngleToRight
sta decimal sta decimal
lda #$7f ; (tab) character lda #$7f ; (tab) character
sta textbuffer+40+25 sta textbuffer+40+25
lda #0 ;space lda #space
sta textbuffer+40+22 sta textbuffer+40+22
beq AngleDisplay beq AngleDisplay
AngleToLeft AngleToLeft
@@ -2460,13 +2460,13 @@ AngleToLeft
sta decimal sta decimal
lda #$7e ;(del) char lda #$7e ;(del) char
sta textbuffer+40+22 sta textbuffer+40+22
lda #0 ;space lda #space
sta textbuffer+40+25 sta textbuffer+40+25
beq AngleDisplay beq AngleDisplay
VerticallyUp VerticallyUp
; now we have value 90 ; now we have value 90
sta decimal sta decimal
lda #0 ;space lda #space
sta textbuffer+40+25 sta textbuffer+40+25
sta textbuffer+40+22 sta textbuffer+40+22