From: Lukas Krickl <lukas@krickl.dev>
Date: Tue, 29 Jul 2025 20:54:44 +0000 (+0200)
Subject: mapgen: added door fixup for all directions
X-Git-Url: https://git.krickl.dev/?a=commitdiff_plain;h=eb2945d971b423f233fa9f39dfc0648ae87d8009;p=gbrg%2F.git

mapgen: added door fixup for all directions

Doors still do not get collision from this, but eventually closed doors *will* have collision anyway.
---

diff --git a/src/mapgen.s b/src/mapgen.s
index bc80bb8..2ab91b7 100644
--- a/src/mapgen.s
+++ b/src/mapgen.s
@@ -322,6 +322,7 @@ mapgen_draw_room_pattern_row:
 	;	preserves:
 	;		hl, bc, de
 #macro mapgen_fix_door_fixup
+.beginscope
 	push hl
 	push de
 
@@ -345,6 +346,7 @@ mapgen_draw_room_pattern_row:
 
 	pop de
 	pop hl
+.endscope
 #endmacro
 
 
@@ -373,18 +375,15 @@ mapgen_fix_door_adjacent_to_collider:
 
 	ret
 @up_door:
-
-	; move up one row
-	; and see if the tile is a collider
-
+	mapgen_fix_door_fixup (-c_size) * MAP_W, RPUW
 	ret
-
 @down_door:
+	mapgen_fix_door_fixup c_size * MAP_W, RPBW
 	ret
 @left_door:
 	mapgen_fix_door_fixup -c_size, RPLW
 	ret
 @right_door:
-	
+	mapgen_fix_door_fixup c_size, RPRW	
 
 	ret