maps: Added 2 additional base maps

diff --git a/makefile b/makefile
index 184c0a845c2398661d92810dd8c7801c6d45f923..a25fdd074e3a8f3b036eb1212ae5dd53c735f0ed 100644 (file)
--- a/makefile
+++ b/makefile
@@ -18,3 +18,5 @@ tiles:
 maps:
        ./tools/tms2map.py assets/maps/base.tmx base_room > maps/base_room.s
        ./tools/tms2map.py assets/maps/base2.tmx base_room2 > maps/base_room2.s
+       ./tools/tms2map.py assets/maps/base3.tmx base_room3 > maps/base_room3.s
+       ./tools/tms2map.py assets/maps/base4.tmx base_room4 > maps/base_room4.s

diff --git a/maps/base_room.s b/maps/base_room.s
index c4f830829872692431cb2916839b30ae8a78c6bd..c26859fdfcecae617479ee2dda7192f298d3c11e 100644 (file)
--- a/maps/base_room.s
+++ b/maps/base_room.s
@@ -5,7 +5,7 @@ dw base_room_flags
 dw base_room_actors
 dw room_empty_exits
 base_room_actors:
-.db  1 , 64 , 72 , 0
+.db  1 , 96 , 104 , 0
 .db  1 , 48 , 56 , 0
 .db  0 , 16 , 8 , 0
 .db  0 , 16 , 8 , 0
@@ -14,6 +14,6 @@ base_room_actors:
 .db  0 , 16 , 8 , 0
 .db  0 , 16 , 8 , 0
 base_room_bg:
-.db 0x60, 0x62, 0x62, 0x64, 0x62, 0x62, 0x66, 0x62, 0x62, 0x68, 0x4c, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x6a, 0x46, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0xe0, 0x4c, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x6a, 0x4c, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x6a, 0x48, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0xe2, 0x4c, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x6a, 0x6c, 0x4a, 0x4a, 0x42, 0x4a, 0x4a, 0x44, 0x4a, 0x4a, 0x6e
+.db 0x60, 0x62, 0x62, 0x64, 0x62, 0x62, 0x66, 0x62, 0x62, 0x68, 0x4c, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x6a, 0x46, 0x40, 0x82, 0x40, 0x40, 0x40, 0x40, 0x82, 0x40, 0xe0, 0x4c, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x6a, 0x4c, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x6a, 0x48, 0x40, 0x82, 0x40, 0x40, 0x40, 0x40, 0x82, 0x40, 0xe2, 0x4c, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x6a, 0x6c, 0x4a, 0x4a, 0x42, 0x4a, 0x4a, 0x44, 0x4a, 0x4a, 0x6e
 base_room_flags:
-.db 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1
+.db 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0x1, 0x0, 0x1, 0x0, 0x0, 0x0, 0x0, 0x1, 0x0, 0x1, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0x1, 0x0, 0x1, 0x0, 0x0, 0x0, 0x0, 0x1, 0x0, 0x1, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1

diff --git a/maps/base_room3.s b/maps/base_room3.s
new file mode 100644 (file)
index 0000000..53127f1
--- /dev/null
+++ b/maps/base_room3.s
@@ -0,0 +1,19 @@
+ ; struct for  base_room3
+base_room3_header:
+dw base_room3_bg
+dw base_room3_flags
+dw base_room3_actors
+dw room_empty_exits
+base_room3_actors:
+.db  1 , 112 , 136 , 0
+.db  1 , 48 , 40 , 0
+.db  0 , 16 , 8 , 0
+.db  0 , 16 , 8 , 0
+.db  0 , 16 , 8 , 0
+.db  0 , 16 , 8 , 0
+.db  0 , 16 , 8 , 0
+.db  0 , 16 , 8 , 0
+base_room3_bg:
+.db 0x60, 0x62, 0x62, 0x64, 0x62, 0x62, 0x66, 0x62, 0x62, 0x68, 0x4c, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x6a, 0x46, 0x40, 0x40, 0x40, 0x82, 0x82, 0x40, 0x40, 0x40, 0xe0, 0x4c, 0x40, 0x82, 0x40, 0x40, 0x40, 0x40, 0x82, 0x40, 0x6a, 0x4c, 0x40, 0x82, 0x40, 0x40, 0x40, 0x40, 0x82, 0x40, 0x6a, 0x48, 0x40, 0x40, 0x40, 0x82, 0x82, 0x40, 0x40, 0x40, 0xe2, 0x4c, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x6a, 0x6c, 0x4a, 0x4a, 0x42, 0x4a, 0x4a, 0x44, 0x4a, 0x4a, 0x6e
+base_room3_flags:
+.db 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0x1, 0x0, 0x0, 0x0, 0x1, 0x1, 0x0, 0x0, 0x0, 0x1, 0x1, 0x0, 0x1, 0x0, 0x0, 0x0, 0x0, 0x1, 0x0, 0x1, 0x1, 0x0, 0x1, 0x0, 0x0, 0x0, 0x0, 0x1, 0x0, 0x1, 0x1, 0x0, 0x0, 0x0, 0x1, 0x1, 0x0, 0x0, 0x0, 0x1, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1

diff --git a/maps/base_room4.s b/maps/base_room4.s
new file mode 100644 (file)
index 0000000..ec20fa6
--- /dev/null
+++ b/maps/base_room4.s
@@ -0,0 +1,19 @@
+ ; struct for  base_room4
+base_room4_header:
+dw base_room4_bg
+dw base_room4_flags
+dw base_room4_actors
+dw room_empty_exits
+base_room4_actors:
+.db  1 , 112 , 136 , 0
+.db  1 , 48 , 24 , 0
+.db  1 , 48 , 136 , 0
+.db  1 , 112 , 40 , 0
+.db  1 , 32 , 72 , 0
+.db  1 , 112 , 104 , 0
+.db  1 , 32 , 88 , 0
+.db  1 , 32 , 56 , 0
+base_room4_bg:
+.db 0x60, 0x62, 0x62, 0x64, 0x62, 0x62, 0x66, 0x62, 0x62, 0x68, 0x4c, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x6a, 0x46, 0x40, 0x40, 0x82, 0x82, 0x82, 0x82, 0x40, 0x40, 0xe0, 0x4c, 0x40, 0x82, 0x40, 0x40, 0x40, 0x40, 0x82, 0x40, 0x6a, 0x4c, 0x40, 0x82, 0x40, 0x40, 0x40, 0x40, 0x82, 0x40, 0x6a, 0x48, 0x40, 0x40, 0x40, 0x82, 0x82, 0x40, 0x40, 0x40, 0xe2, 0x4c, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x6a, 0x6c, 0x4a, 0x4a, 0x42, 0x4a, 0x4a, 0x44, 0x4a, 0x4a, 0x6e
+base_room4_flags:
+.db 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0x1, 0x0, 0x0, 0x1, 0x1, 0x1, 0x1, 0x0, 0x0, 0x1, 0x1, 0x0, 0x1, 0x0, 0x0, 0x0, 0x0, 0x1, 0x0, 0x1, 0x1, 0x0, 0x1, 0x0, 0x0, 0x0, 0x0, 0x1, 0x0, 0x1, 0x1, 0x0, 0x0, 0x0, 0x1, 0x1, 0x0, 0x0, 0x0, 0x1, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1

diff --git a/src/map.s b/src/map.s
index 7c9a60eef4f036a672bdc4f962e739b92c576c23..050e054b3c6410a10e1c93665b0f37e4d00e133e 100644 (file)
--- a/src/map.s
+++ b/src/map.s
@@ -1016,6 +1016,8 @@ map_gen_copy_base_room:
   ; by the map gen
 #include "base_room.s"
 #include "base_room2.s"
+#include "base_room3.s"
+#include "base_room4.s"
 
   ;  count of all pointers in base room table
 #define F1_ROOM_TABLE_LEN ((f1_room_table_end - f1_room_table) / 2)
@@ -1027,6 +1029,8 @@ f1_room_table:
   .db F1_ROOM_TABLE_LEN
   dw base_room_header
   dw base_room2_header
+  dw base_room3_header
+  dw base_room4_header
 f1_room_table_end:
 
   ; a table of all room tables