From: Lukas Krickl <lukas@krickl.dev>
Date: Wed, 4 Feb 2026 04:40:19 +0000 (+0100)
Subject: actor: fixed actor -> actor collision
X-Git-Url: https://git.krickl.dev/?a=commitdiff_plain;h=a7518b7995cde6d23dc9847eeed558deb5ac6dba;p=gbrg%2F.git

actor: fixed actor -> actor collision

The stack here was messed up due to an incorrect jump.
It is surprising this did not crash :^)
---

diff --git a/src/actor.s b/src/actor.s
index fe57087..efe03c1 100644
--- a/src/actor.s
+++ b/src/actor.s
@@ -376,6 +376,7 @@ act_set_tact:
 	call map_get_tile
 	; get tile
 
+
 	ld bc, t_act
 	add hl, bc
 
@@ -478,7 +479,7 @@ act_move_to:
 	; if not NULL do not move
 	ld a, [hl+]
 	or a, [hl]
-	jp nz, @hit
+	jp nz, @act_hit
 
 
 	pop bc
@@ -501,6 +502,7 @@ act_move_to:
 @hit:
 	; clean up stack
 	pop de
+@act_hit:
 	pop de 
 	pop de