From 9c5c701ca19070d363263400e2ebbb008cd3297c Mon Sep 17 00:00:00 2001 From: Pecusx Date: Fri, 16 Sep 2022 17:54:56 +0200 Subject: [PATCH] Display dynamic->static optimizations --- display.asm | 13 +++---------- display_static.asm | 35 ++++++++++++++++++++++++++++++----- scorch.asm | 9 ++------- scorch.xex | Bin 48613 -> 48617 bytes weapons.asm | 31 +------------------------------ 5 files changed, 36 insertions(+), 52 deletions(-) diff --git a/display.asm b/display.asm index 7dbfcbd..70a1e48 100644 --- a/display.asm +++ b/display.asm @@ -28,23 +28,16 @@ OptionsHere OptionsScreenEnd ;----------------------------------------------- -NameScreen - dta d" Enter names of players " +NameScreen2 dta d" Tank 01 Name:" NameAdr - dta d" " - dta d" Human/Atari (difficulty level) " + dta d" " +NameScreen4 dta d" " NamesOfLevels dta d" HUMAN Moron Shooter " dta d" Poolshark Tosser Chooser " dta d" Spoiler Cyborg Unknown " - dta d" " - dta d"Tab"* - dta d" - Player/Difficulty level " - dta d" " - dta d"Return"* - dta d" - Proceed " ;--------------------------------------------------- textbuffer ; 0123456789012345678901234567890123456789 diff --git a/display_static.asm b/display_static.asm index c81c5a6..9430e9d 100644 --- a/display_static.asm +++ b/display_static.asm @@ -9,9 +9,23 @@ OptionsScreen dta d"Welcome to Scorch v. " build ; 4 bytes from scorch.asm (fancy method) :) - dta d" (un)2000-2022" + dta d" (un)2000-2022" dta d" Please select option with cursor keys " dta d" and press (Return) to proceed " + ; 0123456789012345678901234567890123456789 +;----------------------------------------------- +NameScreen + dta d" Enter names of players " +NameScreen3 + dta d" Human/Atari (difficulty level) " +NameScreen5 + dta d" " + dta d"Tab"* + dta d" - Player/Difficulty level " + dta d" " + dta d"Return"* + dta d" - Proceed " +;----------------------------------------------- MoreUp dta d" " dta 92,92,92 @@ -132,12 +146,23 @@ NameDL .byte $70 .byte $47 .word DifficultyTitle - .byte $70,$70 + .byte $70,$70 ; 16 empty lines .byte $42 .word NameScreen - .byte $30 - .byte $02,$30+$80,$02 - .byte $10,$02,$02,$02,$30,$02,$02 + .byte $30 ; 4 empty lines + .byte $42 + .word NameScreen2 + .byte $30+$80 ; 4 empty lines + DLI + .byte $42 + .word NameScreen3 + .byte $10 ; 2 empty lines + .byte $42 + .word NameScreen4 + .byte $02,$02 + .byte $30 ; 4 empty lines + .byte $42 + .word NameScreen5 + .byte $02 .byte $41 .word NameDL ; ------------------------------------------------- diff --git a/scorch.asm b/scorch.asm index b3c4a5e..59711b2 100644 --- a/scorch.asm +++ b/scorch.asm @@ -77,7 +77,6 @@ .zpvar Counter .byte ;temporary Counter for outside loops .zpvar ExplosionRadius .word ;because when adding in xdraw it is double byte .zpvar ResultY .byte -; .zpvar FallDown2 .byte .zpvar xcircle .word .zpvar ycircle .word .zpvar vy .word @@ -620,8 +619,6 @@ ShootNow lda HitFlag ;0 if missed beq missed - lda #0 -; sta FallDown2 jsr Explosion continueMainRoundLoopAfterSeppuku @@ -647,8 +644,8 @@ NoExistNoFall dex bpl TanksFallDown mvx tempor2 TankNr -missed +missed ; TODO: IS IT OK??? possibly a fix here needed for #56 ldy WeaponDepleted bne @+ @@ -782,7 +779,6 @@ NoPlayerNoDeath ;cleanup of the soil fall down ranges (left and right) sta RangeRight sta RangeRight+1 -; sta FallDown2 mwa #screenwidth RangeLeft ; We are randomizing the weapon now. @@ -889,11 +885,10 @@ NotNegativeShieldEnergy ;--------------------------------- .proc Seppuku lda #0 - ;sta FallDown2 sta ydraw+1 ; get position of the tank ldx TankNr - lda #0 ; turn off defense weapons when hara-kiring +; lda #0 ; turn off defense weapons when hara-kiring sta ActiveDefenceWeapon,x sta ShieldEnergy,x jsr SetupXYdraw diff --git a/scorch.xex b/scorch.xex index 71a7811bafda3fca192a99638c735c245553e8e8..0abaa045478f326d15c6833d246a05f8afd186a1 100644 GIT binary patch delta 8371 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 A@Bjb+ delta 8346 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 diff --git a/weapons.asm b/weapons.asm index 60d8780..22ddbce 100644 --- a/weapons.asm +++ b/weapons.asm @@ -17,7 +17,6 @@ pha lda ExplosionRoutines,x pha -; inc FallDown2 rts ExplosionRoutines .word babymissile-1 ;Baby_Missile___;_00 @@ -62,35 +61,30 @@ tracer ; ------------------------ .proc babymissile mva #sfx_baby_missile sfx_effect -; inc FallDown2 mva #11 ExplosionRadius jmp xmissile .endp ; ------------------------ .proc missile ; mva #sfx_baby_missile sfx_effect -; inc FallDown2 mva #17 ExplosionRadius jmp xmissile .endp ; ------------------------ .proc babynuke mva #sfx_nuke sfx_effect -; inc FallDown2 mva #25 ExplosionRadius jmp xmissile .endp ; ------------------------ .proc nuke mva #sfx_nuke sfx_effect -; inc FallDown2 mva #30 ExplosionRadius jmp xmissile .endp ; ------------------------ .proc leapfrog mva #sfx_baby_missile sfx_effect -; inc FallDown2 mva #17 ExplosionRadius jsr xmissile @@ -143,7 +137,6 @@ EndOfLeapping .endp ; ------------------------ .proc mirv ; the whole mirv is performed by Flight routine -; inc FallDown2 rts .endp ; ------------------------ @@ -151,7 +144,6 @@ EndOfLeapping mva #sfx_baby_missile sfx_effect mwa xtraj+1 xtrajfb sbw ytraj+1 #$05 ytrajfb ; funky missiles start point goes 5 pixel UP to prevent multiple explosion at one point if tank is hit (4 pixels tank height + 1) -; inc FallDown2 ;central Explosion mva #21 ExplosionRadius jsr CalculateExplosionRange0 @@ -198,7 +190,6 @@ NoWallsInFunky .endp ; ------------------------ .proc deathshead -; inc FallDown2 mva #30 ExplosionRadius mva #sfx_nuke sfx_effect SaveDrawXY @@ -250,7 +241,6 @@ NoLowerCircle ; ------------------------ .proc napalm mva #sfx_napalm sfx_effect -; inc FallDown2 mva #(napalmRadius+4) ExplosionRadius ; real radius + 4 pixels (half characrer width) jsr CalculateExplosionRange mva #0 ExplosionRadius ; in this weapon - flag: 0 - napalm, 1 - hotnapalm @@ -259,7 +249,6 @@ NoLowerCircle ; ------------------------ .proc hotnapalm mva #sfx_napalm sfx_effect -; inc FallDown2 mva #(napalmRadius+4) ExplosionRadius ; real radius + 4 pixels (half characrer width) jsr CalculateExplosionRange mva #1 ExplosionRadius ; in this weapon - flag: 0 - napalm, 1 - hotnapalm @@ -324,7 +313,6 @@ CharOffTheScreen dec magic jpl RepeatNapalm ; after napalm -; inc FallDown2 ;now we must check tanks in range ldx NumberOfPlayers dex @@ -372,32 +360,27 @@ EndNurnedCheckLoop .endp ; ------------------------ .proc babyroller -; inc FallDown2 mva #11 ExplosionRadius jmp xroller .endp ; ------------------------ .proc roller ; -; inc FallDown2 mva #21 ExplosionRadius jmp xroller .endp ; ------------------------ .proc heavyroller -; inc FallDown2 mva #30 ExplosionRadius jmp xroller .endp ; ------------------------ .proc riotbomb -; inc FallDown2 mva #17 ExplosionRadius jsr CalculateExplosionRange jmp xriotbomb .endp ; ------------------------ .proc heavyriotbomb -; inc FallDown2 mva #29 ExplosionRadius jsr CalculateExplosionRange jmp xriotbomb @@ -406,7 +389,6 @@ EndNurnedCheckLoop .proc babydigger mva #sfx_digger sfx_effect mva #0 sandhogflag -; inc FallDown2 mva #13 DigLong mva #1 diggery ; how many branches (-1) jmp xdigger @@ -415,7 +397,6 @@ EndNurnedCheckLoop .proc digger ; mva #sfx_digger sfx_effect mva #0 sandhogflag -; inc FallDown2 mva #13 DigLong mva #3 diggery ; how many branches (-1) jmp xdigger @@ -424,7 +405,6 @@ EndNurnedCheckLoop .proc heavydigger mva #sfx_digger sfx_effect mva #0 sandhogflag -; inc FallDown2 mva #13 DigLong mva #7 diggery ; how many branches (-1) jmp xdigger @@ -548,7 +528,6 @@ DiggerCharacter .proc babysandhog mva #sfx_sandhog sfx_effect mva #char_sandhog_offset sandhogflag -; inc FallDown2 mva #13 DigLong mva #1 diggery ; how many branches (-1) jmp xdigger @@ -557,7 +536,6 @@ DiggerCharacter .proc sandhog mva #sfx_sandhog sfx_effect mva #char_sandhog_offset sandhogflag -; inc FallDown2 mva #13 DigLong mva #3 diggery ; how many branches (-1) jmp xdigger @@ -566,35 +544,30 @@ DiggerCharacter .proc heavysandhog mva #sfx_sandhog sfx_effect mva #char_sandhog_offset sandhogflag -; inc FallDown2 mva #13 DigLong mva #5 diggery ; how many branches (-1) jmp xdigger .endp ; ------------------------ .proc dirtclod -; inc FallDown2 mva #12 ExplosionRadius jsr CalculateExplosionRange jmp xdirt .endp ; ------------------------ .proc dirtball -; inc FallDown2 mva #22 ExplosionRadius jsr CalculateExplosionRange jmp xdirt .endp ; ------------------------ .proc tonofdirt -; inc FallDown2 mva #31 ExplosionRadius jsr CalculateExplosionRange jmp xdirt .endp ; ------------------------ .proc dirtcharge -; inc FallDown2 mva #61 ExplosionRadius jsr CalculateExplosionRange jmp ofdirt @@ -602,7 +575,6 @@ DiggerCharacter ; ------------------------ .proc riotcharge mva #sfx_riot_blast sfx_effect -; inc FallDown2 mva #31 ExplosionRadius jsr CalculateExplosionRange jmp cleanDirt @@ -610,7 +582,6 @@ DiggerCharacter ; ------------------------ .proc riotblast mva #sfx_riot_blast sfx_effect -; inc FallDown2 mva #61 ExplosionRadius jsr CalculateExplosionRange jmp cleanDirt @@ -1893,7 +1864,7 @@ MagDeflector bit random ; left or right deflection ? bpl RightDeflection LeftDeflection - sbw XHit #18 ; 18 pixels to right and explode... + sbw XHit #18 ; 18 pixels to left and explode... bit XHit+1 ; if off-screen ... bpl EndOfMagDeflector ; hit of course but we need RTS adw XHit #36 ; change to right :)