From d3594c047d5cd0b4d118a07f0e3b36656b8a9778 Mon Sep 17 00:00:00 2001
From: Lukas Krickl <lukas@krickl.dev>
Date: Wed, 13 Aug 2025 17:02:11 +0200
Subject: [PATCH] objanim: Added left and right door opening animations

---
 src/objanim.s | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/src/objanim.s b/src/objanim.s
index 85ea0f4..459a875 100644
--- a/src/objanim.s
+++ b/src/objanim.s
@@ -178,7 +178,6 @@ objanim_door_open_left_fn:
 
 	; adjust x position based on timer
 	; offset position by counter 
-	sra a
 	ld b, a
 	ld a, [hl]
 	sub a, b
@@ -195,7 +194,7 @@ objanim_door_open_left_fn:
 	
 	; hl = obj2 y 
 	ld a, [hl]
-	add a, b
+	sub a, b
 	; write adjusted obj2 y 
 	ld [hl+], a
 	inc hl ; skip obj2 x 
@@ -218,34 +217,40 @@ objanim_door_open_right_fn:
 	pop af
 	push bc ; save next state
 	; hl = oam ptr
-	inc hl ; skip obj1 y
 
 	; adjust x position based on timer
 	; offset position by counter 
-	sra a
 	ld b, a
 	ld a, [hl]
 	sub a, b
-	; wirte adjusted obj1 x 
+	; wirte adjusted obj1 y 
 	ld [hl+], a ; hl = obj1 tile
+	inc hl ; skip obj1 x 
 
-	inc hl ; skip obj1 tile
-	ld a, OAM_FYFLIP
+	; adjust tile by 4 (next tile) and ++
+	ld a, DOOR_SPRITE_TILE + 6 
+	ld [hl+], a
+	
+	ld a, OAM_FXFLIP
 	ld [hl+], a ; write obj1 flag and ++
-	inc hl ; skip obj2 y 
 	
-	; hl = obj2 x 
+	; hl = obj2 y 
 	ld a, [hl]
-	add a, b
-	; write adjusted obj2 x
+	sub a, b
+	; write adjusted obj2 y 
+	ld [hl+], a
+	inc hl ; skip obj2 x 
+	
+	; adjust tile by 4 (next tile) and ++
+	ld a, DOOR_SPRITE_TILE + 4 
 	ld [hl+], a
 
-	inc hl ; skip obj2 tile
-	ld a, OAM_FYFLIP ; write obj2 flag 
+	ld a, OAM_FXFLIP
 	ld [hl], a
 	
 	pop bc ; restore next state
 	ret
+
 	; state function for door opening animation
 	; is called by more specific functions that take this base setup
 	; and set the right tiles and animations after
-- 
2.30.2