make: Added maps/ to the include search path list

diff --git a/makefile b/makefile
index 468873ec2bb0fde16759bbf2fed6e0581db65d34..184c0a845c2398661d92810dd8c7801c6d45f923 100644 (file)
--- 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 b018614ea97a431321007dbba77daad3bd793448..0b45d15eee051db512a305dff2713b00ee6f88c6 100644 (file)
--- 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