From b8e3f16d23ec3877c2a0eb278c08244c8999812c Mon Sep 17 00:00:00 2001 From: Pecusx Date: Sat, 12 Nov 2022 20:51:05 +0100 Subject: [PATCH] Funky Bomb soildown fix. --- scorch.bin | Bin 32768 -> 32768 bytes scorch.xex | Bin 49065 -> 49072 bytes weapons.asm | 5 +++-- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/scorch.bin b/scorch.bin index fa4d55c6121f5ed0e090348574c3179853f48e64..18592a0443f9ada0a1c6ca1e57a2d140211ea752 100644 GIT binary patch delta 4471 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 delta 4409 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 O{e#=XjcYUay8Q>XqG1pK diff --git a/scorch.xex b/scorch.xex index bc2379f9413d60e0dd0d957f29038b4ee95aabc8..d275e4c7c6aaf2789f86d618b2d412a451f942ab 100644 GIT binary patch delta 2591 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 diff --git a/weapons.asm b/weapons.asm index fdc9a9d..782751c 100644 --- a/weapons.asm +++ b/weapons.asm @@ -152,8 +152,8 @@ EndOfLeapping jsr SoilDown2 ; jsr cleartanks ; maybe not? - sta FunkyWallFlag mva #1 color + sta FunkyWallFlag mva #5 FunkyBombCounter FunkyBombLoop mva #1 tracerflag @@ -172,7 +172,8 @@ FunkyBombLoop mwa ytrajfb ytraj+1 mva #sfx_funky_hit sfx_effect jsr Flight - + mva #1 ExplosionRadius ; if no explosion (off screen) + jsr CalculateExplosionRange ; add end of flight coordinates to soildown range lda HitFlag beq NoExplosionInFunkyBomb mva #sfx_baby_missile sfx_effect