From 68b2c18aa30a76e35ded3a2ea3d2fbb4e1204493 Mon Sep 17 00:00:00 2001 From: Lukas Krickl Date: Sat, 20 Sep 2025 18:15:22 +0200 Subject: [PATCH] scroll: fixed scrolling triggering too frequently --- src/actor.s | 8 ++++++++ src/player.s | 5 +++++ src/video.s | 4 ++-- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/actor.s b/src/actor.s index 29632a3..d7a2a64 100644 --- a/src/actor.s +++ b/src/actor.s @@ -122,3 +122,11 @@ actor_load_test: ld [actors+act_pos_x], a ret + + ; despawns an actor + ; inputs: + ; de: actor ptr +actor_despawn: + xor a, a + ld [de], a + ret diff --git a/src/player.s b/src/player.s index 5949dcd..b894661 100644 --- a/src/player.s +++ b/src/player.s @@ -66,6 +66,11 @@ player_update: ; inputs: ; player setp up counter player_try_scroll_up: + ; do not scroll if the scroll timer is enabled + ld a, [scroll_timer] + cp a, 0 + ret nz + ld a, [game_flags] and a, GPF_NO_SCROLL ret nz ; no scroll allowed for now diff --git a/src/video.s b/src/video.s index 657c927..fc61a84 100644 --- a/src/video.s +++ b/src/video.s @@ -58,7 +58,6 @@ video_map_adjust_scroll: dec a ld [scroll_timer], a - ld a, [scroll_y] dec a ld [scroll_y], a @@ -80,7 +79,7 @@ scroll_up_adjust: ld a, [hl] add a, 1 ld [hl+], a ; hl = page y pos hi - + ld a, [hl] adc a, 0 ld [hl], a @@ -92,6 +91,7 @@ scroll_up_adjust: add hl, de jr nz, @act_loop REL + ; adjust player ld a, [player+act_pos_y] -- 2.30.2