From: Lukas Krickl <lukas@krickl.dev>
Date: Thu, 2 Jan 2025 18:57:34 +0000 (+0100)
Subject: make: Added maps/ to the include search path list
X-Git-Url: https://git.krickl.dev/?a=commitdiff_plain;h=48a17adbbe2c43ab62eb576a284559220e799bdd;p=gbrg%2F.git

make: Added maps/ to the include search path list
---

diff --git a/makefile b/makefile
index 468873e..184c0a8 100644
--- a/makefile
+++ b/makefile
@@ -4,7 +4,7 @@ AS=ulas
 FLAGS=-D DEBUG
 
 bin:
-	$(AS) $(FLAGS) -o $(NAME).gb -l ${NAME}.lst -s $(NAME).mlb -S mlb -I ./src -I ./tiles src/main.s
+	$(AS) $(FLAGS) -o $(NAME).gb -l ${NAME}.lst -s $(NAME).mlb -S mlb -I ./src -I ./tiles -I ./maps src/main.s
 
 test:
 	$(AS) $(FLAGS) -o $(TEST_NAME).gb -l ${TEST_NAME}.lst -s $(TEST_NAME).mlb -S mlb -I ./src -I ./tiles src/main.s
diff --git a/src/map.s b/src/map.s
index b018614..0b45d15 100644
--- a/src/map.s
+++ b/src/map.s
@@ -952,8 +952,8 @@ map_gen_copy_base_room:
   ; base room 
   ; this can be copied and modified 
   ; by the map gen
-#include "./maps/base_room.s"
-#include "./maps/base_room2.s"
+#include "base_room.s"
+#include "base_room2.s"
 
   ; a table of all base room ptrs
   ; length must be divisible by 2