mapgen: Added more floor patterns

makefile: Added clean option that clean all generated files

diff --git a/assets b/assets
index 49200b3a091eca46b333f2d636e56f371d07fe52..e9ea59d31a901e3b83706038af58940b0d3ed90a 160000 (submodule)
--- a/assets
+++ b/assets
@@ -1 +1 @@
-Subproject commit 49200b3a091eca46b333f2d636e56f371d07fe52
+Subproject commit e9ea59d31a901e3b83706038af58940b0d3ed90a

diff --git a/makefile b/makefile
index ba4d6d2a834848728ad7469fc0b0bdf61fcfbf4b..cf1e459f2b864a2d0d30042902f55793457b55f7 100644 (file)
--- a/makefile
+++ b/makefile
@@ -20,8 +20,15 @@ tiles:
        ./tools/png2chr.py assets/tiles/bank9000.png > tiles/bank9000.inc
 
 .PHONY: maps
-maps: 
+maps:
        ./tools/tmx2map.py assets/maps/l1.tmx > maps/l1.inc
        ./tools/tmx2map.py assets/maps/f1r1.tmx > maps/f1r1.inc
        ./tools/tmx2map.py assets/maps/f1r2.tmx > maps/f1r2.inc
+       ./tools/tmx2map.py assets/maps/f1r3.tmx > maps/f1r3.inc
+       ./tools/tmx2map.py assets/maps/f1r4.tmx > maps/f1r4.inc
+
+.PHONY: maps
+clean:
+       rm -f ./maps/*.inc
+       rm -f ./tiles/*.inc
 

diff --git a/maps/f1r3.inc b/maps/f1r3.inc
new file mode 100644 (file)
index 0000000..87de482
--- /dev/null
+++ b/maps/f1r3.inc
@@ -0,0 +1,7 @@
+; this map was generated by tmx2map.py
+
+.db 0x0, 0x0, 0x0, 0x2, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0x1, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0x1, 0x1
+.db 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0x1, 0x1, 0x0, 0x0, 0x0, 0x0, 0x2, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x2
+.db 0x0, 0x0, 0x0, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x2
+.db 0x0, 0x0, 0x0, 0x0
+

diff --git a/maps/f1r4.inc b/maps/f1r4.inc
new file mode 100644 (file)
index 0000000..28d924c
--- /dev/null
+++ b/maps/f1r4.inc
@@ -0,0 +1,7 @@
+; this map was generated by tmx2map.py
+
+.db 0x0, 0x0, 0x0, 0x2, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x0, 0x0, 0x1, 0x1, 0x1
+.db 0x1, 0x1, 0x1, 0x0, 0x0, 0x3, 0x3, 0x1, 0x0, 0x0, 0x0, 0x0, 0x2, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x2
+.db 0x0, 0x3, 0x3, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0x1, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x2
+.db 0x0, 0x0, 0x0, 0x0
+

diff --git a/src/mapgen.s b/src/mapgen.s
index 6bebab633caecc8fdfa9998dfc10a21c27a9e92b..6902d48574f91fb1b7202f2d01b041971a5a69d1 100644 (file)
--- a/src/mapgen.s
+++ b/src/mapgen.s
@@ -89,7 +89,6 @@ map_generate:
        ld [srand], a
        ld a, [mapgen_game_seed+1]
        ld [srand+1], a
-       BREAK
        ret
 
        ; makes a room at a sector offset
@@ -230,9 +229,15 @@ f1r1:
 #include "f1r1.inc"
 f1r2:
 #include "f1r2.inc"
+f1r3:
+#include "f1r3.inc"
+f1r4:
+#include "f1r4.inc"
 
 
 floor1_patterns:
 dw f1r1
 dw f1r2
+dw f1r3
+dw f1r4
 floor1_patterns_end: