From f4bb3808021e800443f64838b12a856643ed7ea1 Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Thu, 24 Mar 2022 20:27:20 -0400 Subject: [PATCH] lemm: particles start at right place --- games/lemm/draw_lemming.s | 3 --- games/lemm/move_lemming.s | 4 ++-- games/lemm/particle_hgr.s | 10 ++++++---- games/lemm/release_lemming.s | 2 +- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/games/lemm/draw_lemming.s b/games/lemm/draw_lemming.s index 9380a62d..49ca2d63 100644 --- a/games/lemm/draw_lemming.s +++ b/games/lemm/draw_lemming.s @@ -342,9 +342,6 @@ handle_particles: still_going: - - - not_done_particle: rts diff --git a/games/lemm/move_lemming.s b/games/lemm/move_lemming.s index 0f252fc0..fde9af46 100644 --- a/games/lemm/move_lemming.s +++ b/games/lemm/move_lemming.s @@ -18,8 +18,8 @@ lemming_exploding: .byte 0,0,0,0,0,0,0,0,0,0 lemming_fall_distance: .byte 0,0,0,0,0,0,0,0,0,0 - - +lemming_attribute: + .byte 0,0,0,0,0,0,0,0,0,0 diff --git a/games/lemm/particle_hgr.s b/games/lemm/particle_hgr.s index 6f2bac8f..87f6ae8d 100644 --- a/games/lemm/particle_hgr.s +++ b/games/lemm/particle_hgr.s @@ -155,15 +155,17 @@ init_particle: ; lda #128 ; init x - lda lemming_x + ldy CURRENT_LEMMING + + lda lemming_x,Y asl - adc lemming_x + adc lemming_x,Y asl - adc lemming_x ; mul by 7 + adc lemming_x,Y ; mul by 7 sta particle_x,X - lda lemming_y + lda lemming_y,Y ; lda #100 ; init y sta particle_y,X diff --git a/games/lemm/release_lemming.s b/games/lemm/release_lemming.s index c42ec2a1..96deb1b1 100644 --- a/games/lemm/release_lemming.s +++ b/games/lemm/release_lemming.s @@ -17,7 +17,6 @@ clear_lemmings_loop: ;======================= ; Release Lemmings ;======================= - ; TODO: adjust speed based on release speed release_lemming: ; don't release if we've released them all @@ -41,6 +40,7 @@ release_lemming_speed: lda #0 sta lemming_exploding,Y sta lemming_fall_distance,Y + sta lemming_attribute,Y lda INIT_X sta lemming_x,Y lda INIT_Y