From d1789e17601eddd135d8367db020fe920027a4c1 Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Wed, 30 Mar 2022 15:10:49 -0400 Subject: [PATCH] lemm: implement bashers --- games/lemm/TODO | 3 +++ games/lemm/move_lemming.s | 35 ++++++++++------------------------- 2 files changed, 13 insertions(+), 25 deletions(-) diff --git a/games/lemm/TODO b/games/lemm/TODO index 06459a24..d458ec7b 100644 --- a/games/lemm/TODO +++ b/games/lemm/TODO @@ -1,3 +1,6 @@ ++ bridges you can walk through from underneath, not + sure how to implement that + + wait a second after last lemming gone to exit + dig off the map, end level + fill in some of the ground so we don't get stuck when digging diff --git a/games/lemm/move_lemming.s b/games/lemm/move_lemming.s index 6742a5a1..7f03dbd8 100644 --- a/games/lemm/move_lemming.s +++ b/games/lemm/move_lemming.s @@ -311,15 +311,10 @@ done_mining: ; bashing ;===================== do_lemming_bashing: -.if 0 - jsr collide_below - -mining_mining: - ldy CURRENT_LEMMING lda lemming_frame,Y and #$f - bne no_mining_this_frame + bne no_bashing_this_frame ldx #0 stx HGR_COLOR @@ -328,6 +323,8 @@ mining_mining: jsr hgr_box_page_toggle ldy CURRENT_LEMMING lda lemming_x,Y + clc + adc lemming_direction,Y tax lda lemming_y,Y ldy #9 @@ -336,32 +333,20 @@ mining_mining: jsr hgr_box_page_toggle ldy CURRENT_LEMMING lda lemming_x,Y + clc + adc lemming_direction,Y tax lda lemming_y,Y ldy #9 jsr hgr_box - - ldx CURRENT_LEMMING - inc lemming_y,X - inc lemming_y,X - inc lemming_y,X - - lda lemming_x,X + ldy CURRENT_LEMMING ; FIXME: combine with earlier? + lda lemming_x,Y clc - adc lemming_direction,X - sta lemming_x,X + adc lemming_direction,Y + sta lemming_x,Y -no_mining_this_frame: - jmp done_mining - - -mining_falling: - ldy CURRENT_LEMMING - lda #LEMMING_FALLING - sta lemming_status,Y -done_mining: -.endif +no_bashing_this_frame: jmp done_move_lemming