From 3b238d047207441a9ed4c3ae503f323e04b62bef Mon Sep 17 00:00:00 2001 From: Miquel Sabaté Solà Date: Mon, 16 Mar 2026 22:04:19 +0100 Subject: Wait for items to fall before changing screen MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit More specifically, whenever the player dies and we need to reset the screen, wait for items to fall in the same way as we do for explosions to disappear. This also brought with it some other changes like removing sprite reset on screen initialization. Signed-off-by: Miquel Sabaté Solà --- src/player.s | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/player.s') diff --git a/src/player.s b/src/player.s index 48b0bb0..fa649c6 100644 --- a/src/player.s +++ b/src/player.s @@ -834,6 +834,9 @@ ;; That's just german for "the Bart, the". .proc die_bart_die + ;; If the player was grabbing an item when it happened, let go of it. + jsr Items::let_go_on_death + ;; Decrement the life. lda Globals::zp_multiplayer and #$01 @@ -841,8 +844,6 @@ dec Player::zp_lifes, x bne @nmi_update - ;; TODO: if it was grabbing an item, turn it into 'falling' state. - ;; If this poor guy is over, then mark it in the multiplayer bitmap. cpx #0 bne @player_2_over -- cgit v1.2.3