From: Lukas Krickl <lukas@krickl.dev>
Date: Fri, 10 Oct 2025 16:14:33 +0000 (+0200)
Subject: map: l1 now has correct collision
X-Git-Url: https://git.krickl.dev/?a=commitdiff_plain;h=fefc7bb23b26953c6854baca82ab99fc02474c27;p=gbrg%2F.git

map: l1 now has correct collision
---

diff --git a/src/map.s b/src/map.s
index b21d156..93f00df 100644
--- a/src/map.s
+++ b/src/map.s
@@ -366,27 +366,29 @@ l1_objs:
 	modef MOT_RECT, 0, 8, 0x0703
 	
 
-	; center rectangle
-	; modef MOT_RECT, 0, 8, 0x8303
-
 	; rectangle at y/x 0/0 with height 32 width 48 
 	modef MOT_RECT, 0, 8, 0xE503
 
 	modef MOT_SET_PAT, 0, 10, pat_center_grass 
 	modef2 MOT_ACTOR_SPAWNER, 0, 11, ACT_T_GUARD, 0x80 
-	modef MOT_SET_PAT, 0, 18, pat_center_empty_wall
+	modef MOT_SET_PAT, 0, 18, pat_left_wall
 
 	modef MOT_RECT_CLEAR, 0, 18, 0
 	modef2 MOT_RECT, 0, 18, 0x0F, 0x07
 	modef2 MOT_ACTOR_SPAWNER, 0, 18, ACT_T_GUARD, 0x40 
 
-	modef MOT_SET_PAT, 0, 0x1E, pat_empty 
+	modef MOT_SET_PAT, 0, 0x1A, pat_empty 
 	modef2 MOT_ACTOR_SPAWNER, 0, 0x1F, ACT_T_GUARD, 0x40 
 	modef MOT_DISABLE_SCROLL, 0, 0x20, 0
 	modef MOT_SET_MAP_ROUTINE, 0, 0x20, map_r_enable_scroll_all_enemies_defeated
 	
 	modef MOT_RECT_CLEAR, 0, 0x21, 0
-	modef MOT_SET_PAT, 0, 0x21, pat_center_empty_wall
+	modef2 MOT_RECT, 0, 0x21, 0x0F, 0xE7
+	modef MOT_SET_PAT, 0, 0x21, pat_right_wall
+
+	modef2 MOT_RECT, 0, 0x29, 0x09, 0x07
+	modef MOT_SET_PAT, 0, 0x29, pat_left_wall
+
 	modef MOT_SET_PAT, 0, 0x2E, pat_empty 
 	modef MOT_DISABLE_SCROLL, 0, 0x30, 0
 	modef MOT_NOP, 0, 0xFF, 0
diff --git a/src/rowpatterns.s b/src/rowpatterns.s
index 6673ca4..66ef421 100644
--- a/src/rowpatterns.s
+++ b/src/rowpatterns.s
@@ -16,6 +16,12 @@ pat_center_grass:
 
 pat_center_empty_wall:
 .db WG, WG, WG, TS, TS, TS, WG, WG, WG, WG
+
+pat_right_wall:
+.db WG, WG, WG, TS, TS, TS, TS, TS, TS, TS
+
+pat_left_wall:
+.db TS, TS, TS, TS, TS, TS, WG, WG, WG, WG
 	
 	; enf of level row pattern
 pat_eol: