From 62fc459fba6304905d9150f0882458296f1306de Mon Sep 17 00:00:00 2001 From: blondie7575 Date: Mon, 11 Jun 2018 18:01:19 -0600 Subject: [PATCH] Fixed a nasty bug in cratering --- gscats.2mg | Bin 819264 -> 819264 bytes projectile.s | 2 +- terrain.s | 8 ++++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/gscats.2mg b/gscats.2mg index 7670d8bb2a276e659d0837cde13d82bc3a1ef958..cb73e5a1619dd4da9c622c5229a4e425f8d122a9 100644 GIT binary patch delta 2254 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 Lh;Qxj_+I`GU`J#q diff --git a/projectile.s b/projectile.s index 72a856f..3b37de4 100644 --- a/projectile.s +++ b/projectile.s @@ -39,7 +39,7 @@ GRAVITY = $ffff ; 8.8 fixed point projectileTypes: ; Spit .word 3 ; Damage - .word 9 ; Crater radius + .word 3 ; Crater radius .word 4 ; Frame 0 .word 5 ; Frame 1 .word 6 ; Frame 2 diff --git a/terrain.s b/terrain.s index 58e3df4..99e6c84 100644 --- a/terrain.s +++ b/terrain.s @@ -63,7 +63,7 @@ renderTerrainDone: ; ; PARAML0 = X pos of center in pixels from logical left terrain edge ; PARAML1 = Y pos of center in pixels from bottom terrain edge -; Y = Radius of circle, in pixels +; Y = Radius of circle, in pixels (minimum is 3) ; ; Trashes SCRATCHL craterTerrain: @@ -74,15 +74,19 @@ craterTerrain: sbc PARAML0 sty SCRATCHL ; Center width in bytes sbc SCRATCHL + sbc SCRATCHL and #$fffe ; Force even clc adc #terrainData sta PARAML0 + tya + asl + tay lda circleTable,y ; Look up circle data sta SCRATCHL - tya ; Iterate over diameter + tya ; Iterate over diameter words asl tay