removed unused maps

diff --git a/assets b/assets
index e5587bbdf36fd15379f76b987af2c8c5b0c76ead..b557acc9fbec8b8913a546f20efc3cbbb554ff35 160000 (submodule)
--- a/assets
+++ b/assets
@@ -1 +1 @@
-Subproject commit e5587bbdf36fd15379f76b987af2c8c5b0c76ead
+Subproject commit b557acc9fbec8b8913a546f20efc3cbbb554ff35

diff --git a/levels/l1.inc b/levels/l1.inc
deleted file mode 100644 (file)
index fd8872c..0000000
--- a/levels/l1.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-; this map was generated by tmx2map.py
-
-.db 0x9, 0xc, 0xc, 0x5, 0x8, 0xc, 0x5, 0x9, 0x4, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0
-.db 0x3, 0x0, 0x0, 0xa, 0xd, 0xc, 0xe, 0x6, 0x0, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0
-.db 0xb, 0xc, 0x4, 0x0, 0xa, 0xd, 0xc, 0xc, 0xc, 0x6, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0
-.db 0xb, 0xc, 0x5, 0x9, 0xc, 0xf, 0xc, 0xc, 0x4, 0x0, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0
-.db 0x3, 0x0, 0xb, 0x6, 0x1, 0xa, 0xc, 0x5, 0x0, 0x0, 0x3, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0
-.db 0x3, 0x0, 0x3, 0x9, 0xf, 0x4, 0x0, 0xa, 0xc, 0xc, 0xf, 0x5, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0
-.db 0x3, 0x0, 0xa, 0x6, 0x3, 0x0, 0x1, 0x0, 0x0, 0x0, 0x3, 0x2, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0
-.db 0xb, 0xd, 0xd, 0x5, 0xb, 0xc, 0xe, 0x5, 0x0, 0x0, 0x3, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0
-.db 0xb, 0xf, 0xf, 0x7, 0x2, 0x0, 0x0, 0x3, 0x0, 0x0, 0x2, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0
-.db 0xb, 0xf, 0xf, 0xf, 0x5, 0x0, 0x0, 0x3, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0
-.db 0xb, 0xf, 0xf, 0xf, 0x7, 0x0, 0x0, 0x2, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0
-.db 0xa, 0xe, 0xe, 0xe, 0x6, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0
-.db 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0
-.db 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0
-

diff --git a/makefile b/makefile
index 91d1a59303f2b18db12a7eb8b2d99c8428fa7582..20079f596e821a685280ae7597552b70644434a4 100644 (file)
--- a/makefile
+++ b/makefile
@@ -4,7 +4,7 @@ AS=ulas
 FLAGS=-D DEBUG
 #SYMTYPE=sym
 SYMTYPE=mlb
-INCS=-I ./src -I ./tiles -I ./maps -I ./levels -I ./sprites
+INCS=-I ./src -I ./tiles -I ./maps  
 
 bin:
        $(AS) $(FLAGS) -o $(NAME).gb -l ${NAME}.lst -s $(NAME).$(SYMTYPE) -S $(SYMTYPE) $(INCS) src/main.s
@@ -21,37 +21,5 @@ tiles:
 
 .PHONY: maps
 maps: 
-       ./tools/tmx2map.py assets/maps/near_wall.tmx 1 > maps/near_wall.inc
-       ./tools/tmx2map.py assets/maps/far_wall.tmx 1 > maps/far_wall.inc
+       ./tools/tmx2map.py assets/maps/l1.tmx > maps/l1.inc
 
-       ./tools/tmx2map.py assets/maps/near_left_door.tmx 1 > maps/near_left_door.inc 
-       ./tools/tmx2map.py assets/maps/near_right_door.tmx 1 > maps/near_right_door.inc 
-       ./tools/tmx2map.py assets/maps/far_left_door.tmx 1 > maps/far_left_door.inc 
-       ./tools/tmx2map.py assets/maps/far_right_door.tmx 1 > maps/far_right_door.inc 
-
-       ./tools/tmx2map.py assets/maps/far_center_door.tmx 1 > maps/far_center_door.inc 
-       ./tools/tmx2map.py assets/maps/far_center_wall.tmx 1 > maps/far_center_wall.inc 
-
-       ./tools/tmx2map.py assets/maps/near_center_wall_left.tmx 1 > maps/near_center_wall_left.inc 
-       ./tools/tmx2map.py assets/maps/near_center_wall_middle.tmx 1 > maps/near_center_wall_middle.inc 
-       ./tools/tmx2map.py assets/maps/near_center_wall_right.tmx 1 > maps/near_center_wall_right.inc 
-       
-       ./tools/tmx2map.py assets/maps/near_left_wall.tmx 1 > maps/near_left_wall.inc 
-       ./tools/tmx2map.py assets/maps/near_right_wall.tmx 1 > maps/near_right_wall.inc 
-
-       ./tools/tmx2map.py assets/maps/far_left_wall.tmx 1 > maps/far_left_wall.inc 
-       ./tools/tmx2map.py assets/maps/far_right_wall.tmx 1 > maps/far_right_wall.inc 
-
-       ./tools/tmx2map.py assets/maps/far_center_right_wall.tmx 1 > maps/far_center_right_wall.inc 
-       ./tools/tmx2map.py assets/maps/far_center_left_wall.tmx 1 > maps/far_center_left_wall.inc 
-
-       ./tools/tmx2map.py assets/maps/near_right_center_wall.tmx 1 > maps/near_right_center_wall.inc 
-       ./tools/tmx2map.py assets/maps/near_left_center_wall.tmx 1 > maps/near_left_center_wall.inc 
-
-.PHONY: levels
-levels:
-       ./tools/tmx2map.py assets/levels/l1.tmx > levels/l1.inc
-
-.PHONY: sprites
-sprites:
-       ./tools/tmx2map.py assets/sprites/sword.tmx 1 > sprites/sword.inc

diff --git a/maps/far_center_door.inc b/maps/far_center_door.inc
deleted file mode 100644 (file)
index 1d5e274..0000000
--- a/maps/far_center_door.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-; this map was generated by tmx2map.py
-
-.db 0x8, 0x9, 0xe, 0xf, 0x2d, 0x17, 0x17, 0x1d, 0x38, 0x39, 0x3e, 0x3f
-

diff --git a/maps/far_center_left_wall.inc b/maps/far_center_left_wall.inc
deleted file mode 100644 (file)
index 887959b..0000000
--- a/maps/far_center_left_wall.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-; this map was generated by tmx2map.py
-
-.db 0x48, 0x49, 0x4a, 0x3, 0x15, 0x21, 0x21, 0x21, 0x10, 0x12, 0x12, 0x12, 0x25, 0x22, 0x22, 0x22, 0x38, 0x39, 0x3a, 0x33
-

diff --git a/maps/far_center_right_wall.inc b/maps/far_center_right_wall.inc
deleted file mode 100644 (file)
index 10600bd..0000000
--- a/maps/far_center_right_wall.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-; this map was generated by tmx2map.py
-
-.db 0x4, 0x4d, 0x4e, 0x4f, 0x21, 0x21, 0x21, 0x16, 0x12, 0x12, 0x12, 0x20, 0x22, 0x22, 0x22, 0x26, 0x34, 0x3d, 0x3e, 0x3f
-

diff --git a/maps/far_center_wall.inc b/maps/far_center_wall.inc
deleted file mode 100644 (file)
index a781530..0000000
--- a/maps/far_center_wall.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-; this map was generated by tmx2map.py
-
-.db 0x15, 0x21, 0x21, 0x16, 0x10, 0x12, 0x12, 0x20, 0x25, 0x22, 0x22, 0x26
-

diff --git a/maps/far_left_door.inc b/maps/far_left_door.inc
deleted file mode 100644 (file)
index 87f3fc1..0000000
--- a/maps/far_left_door.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-; this map was generated by tmx2map.py
-
-.db 0x8, 0x9, 0xa, 0x3, 0x2d, 0x17, 0x17, 0x7f, 0x2d, 0x17, 0x17, 0x7e, 0x2d, 0x17, 0x17, 0x7d, 0x38, 0x39, 0x3a, 0x33
-

diff --git a/maps/far_left_wall.inc b/maps/far_left_wall.inc
deleted file mode 100644 (file)
index 047e48a..0000000
--- a/maps/far_left_wall.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-; this map was generated by tmx2map.py
-
-.db 0x0, 0x1, 0x2, 0x3, 0x10, 0x12, 0x12, 0x13, 0x10, 0x12, 0x12, 0x12, 0x10, 0x12, 0x12, 0x23, 0x30, 0x31, 0x32, 0x33
-

diff --git a/maps/far_right_door.inc b/maps/far_right_door.inc
deleted file mode 100644 (file)
index 4280a33..0000000
--- a/maps/far_right_door.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-; this map was generated by tmx2map.py
-
-.db 0x4, 0xd, 0xe, 0xf, 0x7a, 0x17, 0x17, 0x1d, 0x78, 0x17, 0x17, 0x1d, 0x79, 0x17, 0x17, 0x1d, 0x34, 0x3d, 0x3e, 0x3f
-

diff --git a/maps/far_right_wall.inc b/maps/far_right_wall.inc
deleted file mode 100644 (file)
index 34d17d4..0000000
--- a/maps/far_right_wall.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-; this map was generated by tmx2map.py
-
-.db 0x4, 0x5, 0x6, 0x7, 0x14, 0x12, 0x12, 0x20, 0x12, 0x12, 0x12, 0x20, 0x24, 0x12, 0x12, 0x20, 0x34, 0x35, 0x36, 0x37
-

diff --git a/maps/far_wall.inc b/maps/far_wall.inc
deleted file mode 100644 (file)
index 938cfe9..0000000
--- a/maps/far_wall.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-; this map was generated by tmx2map.py
-
-.db 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11
-.db 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11
-.db 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11
-.db 0x0, 0x1, 0x2, 0x3, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x4, 0x5, 0x6, 0x7
-.db 0x10, 0x12, 0x12, 0x13, 0x0, 0x1, 0x2, 0x3, 0x11, 0x11, 0x11, 0x11, 0x4, 0x5, 0x6, 0x7, 0x14, 0x12, 0x12, 0x20
-.db 0x10, 0x12, 0x12, 0x12, 0x10, 0x12, 0x12, 0x13, 0x15, 0x21, 0x21, 0x16, 0x14, 0x12, 0x12, 0x20, 0x12, 0x12, 0x12, 0x20
-.db 0x10, 0x12, 0x12, 0x12, 0x10, 0x12, 0x12, 0x12, 0x10, 0x12, 0x12, 0x20, 0x12, 0x12, 0x12, 0x20, 0x12, 0x12, 0x12, 0x20
-.db 0x10, 0x12, 0x12, 0x12, 0x10, 0x12, 0x12, 0x23, 0x25, 0x22, 0x22, 0x26, 0x24, 0x12, 0x12, 0x20, 0x12, 0x12, 0x12, 0x20
-.db 0x10, 0x12, 0x12, 0x23, 0x30, 0x31, 0x32, 0x33, 0x17, 0x17, 0x17, 0x17, 0x34, 0x35, 0x36, 0x37, 0x24, 0x12, 0x12, 0x20
-.db 0x30, 0x31, 0x32, 0x33, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x34, 0x35, 0x36, 0x37
-.db 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x17, 0x17, 0x17, 0x17
-.db 0x17, 0x17, 0x70, 0x71, 0x72, 0x73, 0x74, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17
-.db 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17
-.db 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17
-

diff --git a/maps/l1.inc b/maps/l1.inc
new file mode 100644 (file)
index 0000000..fd8872c
--- /dev/null
+++ b/maps/l1.inc
@@ -0,0 +1,17 @@
+; this map was generated by tmx2map.py
+
+.db 0x9, 0xc, 0xc, 0x5, 0x8, 0xc, 0x5, 0x9, 0x4, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0
+.db 0x3, 0x0, 0x0, 0xa, 0xd, 0xc, 0xe, 0x6, 0x0, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0
+.db 0xb, 0xc, 0x4, 0x0, 0xa, 0xd, 0xc, 0xc, 0xc, 0x6, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0
+.db 0xb, 0xc, 0x5, 0x9, 0xc, 0xf, 0xc, 0xc, 0x4, 0x0, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0
+.db 0x3, 0x0, 0xb, 0x6, 0x1, 0xa, 0xc, 0x5, 0x0, 0x0, 0x3, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0
+.db 0x3, 0x0, 0x3, 0x9, 0xf, 0x4, 0x0, 0xa, 0xc, 0xc, 0xf, 0x5, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0
+.db 0x3, 0x0, 0xa, 0x6, 0x3, 0x0, 0x1, 0x0, 0x0, 0x0, 0x3, 0x2, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0
+.db 0xb, 0xd, 0xd, 0x5, 0xb, 0xc, 0xe, 0x5, 0x0, 0x0, 0x3, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0
+.db 0xb, 0xf, 0xf, 0x7, 0x2, 0x0, 0x0, 0x3, 0x0, 0x0, 0x2, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0
+.db 0xb, 0xf, 0xf, 0xf, 0x5, 0x0, 0x0, 0x3, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0
+.db 0xb, 0xf, 0xf, 0xf, 0x7, 0x0, 0x0, 0x2, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0
+.db 0xa, 0xe, 0xe, 0xe, 0x6, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0
+.db 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0
+.db 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0
+

diff --git a/maps/near_center_wall_left.inc b/maps/near_center_wall_left.inc
deleted file mode 100644 (file)
index e880587..0000000
--- a/maps/near_center_wall_left.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-; this map was generated by tmx2map.py
-
-.db 0x15, 0x21, 0x21, 0x21, 0x10, 0x12, 0x12, 0x12, 0x10, 0x12, 0x12, 0x12, 0x10, 0x12, 0x12, 0x12, 0x25, 0x22, 0x22, 0x22
-

diff --git a/maps/near_center_wall_middle.inc b/maps/near_center_wall_middle.inc
deleted file mode 100644 (file)
index 930e93a..0000000
--- a/maps/near_center_wall_middle.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-; this map was generated by tmx2map.py
-
-.db 0x21, 0x21, 0x21, 0x21, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12, 0x22, 0x22, 0x22, 0x22
-

diff --git a/maps/near_center_wall_right.inc b/maps/near_center_wall_right.inc
deleted file mode 100644 (file)
index 3ad38ca..0000000
--- a/maps/near_center_wall_right.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-; this map was generated by tmx2map.py
-
-.db 0x21, 0x21, 0x21, 0x16, 0x12, 0x12, 0x12, 0x20, 0x12, 0x12, 0x12, 0x20, 0x12, 0x12, 0x12, 0x20, 0x22, 0x22, 0x22, 0x26
-

diff --git a/maps/near_left_center_wall.inc b/maps/near_left_center_wall.inc
deleted file mode 100644 (file)
index f27d958..0000000
--- a/maps/near_left_center_wall.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-; this map was generated by tmx2map.py
-
-.db 0x48, 0x49, 0x4a, 0x3, 0x21, 0x21, 0x21, 0x21, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12
-.db 0x22, 0x22, 0x22, 0x22
-

diff --git a/maps/near_left_door.inc b/maps/near_left_door.inc
deleted file mode 100644 (file)
index dffdb60..0000000
--- a/maps/near_left_door.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-; this map was generated by tmx2map.py
-
-.db 0x8, 0x9, 0xa, 0x3, 0x2d, 0x17, 0x17, 0x7f, 0x2d, 0x17, 0x17, 0x7e, 0x2d, 0x17, 0x17, 0x7e, 0x2d, 0x17, 0x17, 0x7e
-.db 0x2d, 0x17, 0x17, 0x7d, 0x38, 0x39, 0x3a, 0x33
-

diff --git a/maps/near_left_wall.inc b/maps/near_left_wall.inc
deleted file mode 100644 (file)
index aeb8543..0000000
--- a/maps/near_left_wall.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-; this map was generated by tmx2map.py
-
-.db 0x0, 0x1, 0x2, 0x3, 0x10, 0x12, 0x12, 0x13, 0x10, 0x12, 0x12, 0x12, 0x10, 0x12, 0x12, 0x12, 0x10, 0x12, 0x12, 0x12
-.db 0x10, 0x12, 0x12, 0x23, 0x30, 0x31, 0x32, 0x33
-

diff --git a/maps/near_right_center_wall.inc b/maps/near_right_center_wall.inc
deleted file mode 100644 (file)
index 0bbb00e..0000000
--- a/maps/near_right_center_wall.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-; this map was generated by tmx2map.py
-
-.db 0x4, 0x4d, 0x4e, 0x4f, 0x21, 0x21, 0x21, 0x21, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12
-.db 0x22, 0x22, 0x22, 0x22
-

diff --git a/maps/near_right_door.inc b/maps/near_right_door.inc
deleted file mode 100644 (file)
index 6394a34..0000000
--- a/maps/near_right_door.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-; this map was generated by tmx2map.py
-
-.db 0x4, 0xd, 0xe, 0xf, 0x7a, 0x17, 0x17, 0x1d, 0x78, 0x17, 0x17, 0x1d, 0x78, 0x17, 0x17, 0x1d, 0x78, 0x17, 0x17, 0x1d
-.db 0x79, 0x17, 0x17, 0x1d, 0x34, 0x3d, 0x3e, 0x3f
-

diff --git a/maps/near_right_wall.inc b/maps/near_right_wall.inc
deleted file mode 100644 (file)
index a58b7be..0000000
--- a/maps/near_right_wall.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-; this map was generated by tmx2map.py
-
-.db 0x4, 0x5, 0x6, 0x7, 0x14, 0x12, 0x12, 0x20, 0x12, 0x12, 0x12, 0x20, 0x12, 0x12, 0x12, 0x20, 0x12, 0x12, 0x12, 0x20
-.db 0x24, 0x12, 0x12, 0x20, 0x34, 0x35, 0x36, 0x37
-

diff --git a/maps/near_wall.inc b/maps/near_wall.inc
deleted file mode 100644 (file)
index 9282895..0000000
--- a/maps/near_wall.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-; this map was generated by tmx2map.py
-
-.db 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11
-.db 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11
-.db 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11
-.db 0x0, 0x1, 0x2, 0x3, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x4, 0x5, 0x6, 0x7
-.db 0x10, 0x12, 0x12, 0x13, 0x15, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x16, 0x14, 0x12, 0x12, 0x20
-.db 0x10, 0x12, 0x12, 0x12, 0x10, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12, 0x20, 0x12, 0x12, 0x12, 0x20
-.db 0x10, 0x12, 0x12, 0x12, 0x10, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12, 0x20, 0x12, 0x12, 0x12, 0x20
-.db 0x10, 0x12, 0x12, 0x12, 0x10, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12, 0x20, 0x12, 0x12, 0x12, 0x20
-.db 0x10, 0x12, 0x12, 0x23, 0x25, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x26, 0x24, 0x12, 0x12, 0x20
-.db 0x30, 0x31, 0x32, 0x33, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x34, 0x35, 0x36, 0x37
-.db 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x17, 0x17, 0x17, 0x17
-.db 0x17, 0x17, 0x70, 0x71, 0x72, 0x73, 0x74, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17
-.db 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17
-.db 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17
-

diff --git a/maps/newat_wall.inc b/maps/newat_wall.inc
deleted file mode 100644 (file)
index 9a0e205..0000000
--- a/maps/newat_wall.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-; this map was generated by tmx2map.py
-
-.db 0x9, 0xd, 0xd, 0xd, 0xd, 0xd, 0xd, 0xd, 0xd, 0xd, 0xd, 0xd, 0xd, 0xd, 0xd, 0xd, 0xd, 0xd, 0xd, 0x5
-.db 0xb, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0x7
-.db 0xb, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0x7
-.db 0xb, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0x7
-.db 0xb, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0x7
-.db 0xb, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0x7
-.db 0xb, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0x7
-.db 0xb, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0x7
-.db 0xb, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0x7
-.db 0xb, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0x7
-.db 0xb, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0x7
-.db 0xb, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0x7
-.db 0xb, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, 0x7
-.db 0xa, 0xe, 0xe, 0xe, 0xe, 0xe, 0xe, 0xe, 0xe, 0xe, 0xe, 0xe, 0xe, 0xe, 0xe, 0xe, 0xe, 0xe, 0xe, 0x6

diff --git a/sprites/sword.inc b/sprites/sword.inc
deleted file mode 100644 (file)
index d397140..0000000
--- a/sprites/sword.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-; this map was generated by tmx2map.py
-
-.db 0x1e, 0x0, 0x0, 0x0, 0x2d, 0x1e, 0xf, 0x2f, 0x0, 0x2d, 0x2e, 0x0, 0x0, 0x3e, 0x0, 0x3f
-

diff --git a/src/main.s b/src/main.s
index cad1cc7c0aef54bd6ec4c3f1da989628edeb4d2c..2f9d183bf9843ba788c638635622295d95afd20e 100644 (file)
--- a/src/main.s
+++ b/src/main.s
@@ -70,7 +70,6 @@ main:
 #include "levels.s"
 #include "attributes.s"
 #include "item.s"
-#include "sprites.s"
 #include "render.s"
 
 #include "tiles.inc"

diff --git a/src/map.s b/src/map.s
index 93379cdc6c31404da7df054b44657dd55d9b8039..9ceaa7c52e6dd459ff71bb64d15c42255440568e 100644 (file)
--- a/src/map.s
+++ b/src/map.s
@@ -254,8 +254,6 @@ map_full_draw_oam_clear:
        call shadow_oam_clear
        ; draw UI again
        call compass_draw
-       ; draw player again
-       call player_draw_weapon
        call next_vblank_wait
        ; dma empty oam 
        call OAMDMAFN

diff --git a/src/player.s b/src/player.s
index 85b02fb973b33618340bf8eebfc3f0f1ffc0a40f..70f716908e2e035370ceaa876b494e1877f7a88a 100644 (file)
--- a/src/player.s
+++ b/src/player.s
@@ -76,18 +76,10 @@ player_update:
        ld de, player
 
        call player_handle_move
-
-       call player_draw_weapon
        
 
        ret
 
-
-       ; draws weapon spirte
-player_draw_weapon:
-       ld de, so_sword
-       call sprite_overlay_draw
-       ret
        
        ; player attack call
 player_attack:

diff --git a/src/sprites.s b/src/sprites.s
deleted file mode 100644 (file)
index a46e762..0000000
--- a/src/sprites.s
+++ /dev/null
@@ -1,113 +0,0 @@
-       ; this file contains rendering code for sprite overlays
-       ; this can be e.g. weapons displayed in first person view
-
-#define PLAYER_WEAPON_Y WINDOW_Y-16
-#define PLAYER_WEAPON_X 120
-
-so_sword:
-osdef 9, PLAYER_WEAPON_Y, PLAYER_WEAPON_X
-#include "sword.inc"
-       
-       ; draws the next object
-       ; in the so list
-       ; inputs:
-       ;               hl: oam
-       ;               de: oam data
-       ;               bc: current y/x position
-       ; returns:
-       ;               hl: next obj
-       ;               de: next oam data
-       ;               bc: x position + 8
-#macro _so_draw_next
-.beginscope
-       ; do not draw if the tile id is 0
-       ld a, [de]
-       cp a, 0
-       jr z, @skip REL
-       
-       ; y/x
-       ld a, b
-       ld [hl+], a
-       ld a, c
-       ld [hl+], a
-       
-       ; tile
-       ld a, [de]
-       ; static offset to get to oam tilese
-       add a, 0x80 
-       ld [hl+], a
-
-       ; flags
-       xor a, a
-       ld [hl+], a
-       
-@skip:
-       inc de
-       ; x pos + 8
-       ld a, c
-       add a, 8
-       ld c, a
-       
-.endscope
-#endmacro
-       
-       ; advances the y position by 8 pixels
-       ; subtracts OS_WIDT*8 from x
-       ; inputs:
-       ;               bc: current y/x position
-#macro _so_next_row
-       ld a, b
-       add a, 8
-       ld b, a
-
-       ld a, c
-       sub a, OS_WIDTH*8
-       ld c, a
-#endmacro
-
-       ; draws a sprite overlay
-       ; inputs:
-       ;               de: sprite overlay ptr
-sprite_overlay_draw:
-       ld a, [de]
-       inc de 
-       ; a = required objects
-       push de
-       call oamalloc
-       ; hl = oam ptr
-       pop de
-       
-       ; load y/x origin
-       ld a, [de]
-       ld b, a
-       inc de
-       ld a, [de]
-       ld c, a
-       inc de
-
-       ; de = oam data
-       _so_draw_next
-       _so_draw_next
-       _so_draw_next
-       _so_draw_next
-       _so_next_row
-
-       _so_draw_next
-       _so_draw_next
-       _so_draw_next
-       _so_draw_next
-       _so_next_row
-
-       _so_draw_next
-       _so_draw_next
-       _so_draw_next
-       _so_draw_next
-       _so_next_row
-
-       _so_draw_next
-       _so_draw_next
-       _so_draw_next
-       _so_draw_next
-       _so_next_row
-
-       ret

diff --git a/src/tiles.s b/src/tiles.s
index 3d693626b5a3cea9c7cbc0b6b7ec9b4c02d7806b..929378af8697829bf3d331787796be256f0cd6d2 100644 (file)
--- a/src/tiles.s
+++ b/src/tiles.s
@@ -5,80 +5,6 @@
 tile_null:
        tiledef 0, 0, 0, 0
 
-far_wall:
-#include "far_wall.inc"
-
-near_wall:
-#include "near_wall.inc"
-
-; 4x7 tiles
-near_left_door:
-#include "near_left_door.inc"
-
-; 4x7 tiles
-near_right_door:
-#include "near_right_door.inc"
-
-; 4x5 tiles
-far_right_door:
-#include "far_right_door.inc"
-
-; 4x5 tiles
-far_left_door:
-#include "far_left_door.inc"
-
-; 4x3 tiles
-far_center_door:
-#include "far_center_door.inc"
-
-;      4x3 tiles
-far_center_wall:
-#include "far_center_wall.inc"
-
-       ; 4x5 tiles
-near_center_wall_left:
-#include "near_center_wall_left.inc"
-
-       ; 4x5 tiles
-near_center_wall_middle:
-#include "near_center_wall_middle.inc"
-
-       ; 4x5 tiles
-near_center_wall_right:
-#include "near_center_wall_right.inc"
-
-       ; 4x7 tiles
-near_left_wall:
-#include "near_left_wall.inc"
-
-       ; 4x7 tiles
-near_right_wall:
-#include "near_right_wall.inc"
-       
-       ; 4x5 tiles
-far_left_wall:
-#include "far_left_wall.inc"
-
-       ; 4x5 tiles
-far_right_wall:
-#include "far_right_wall.inc"
-
-       ; 4x5 tiles
-far_center_left_wall:
-#include "far_center_left_wall.inc"
-
-       ; 4x5 tiles
-far_center_right_wall:
-#include "far_center_right_wall.inc"
-       
-       ; 4x6 tiles
-near_center_left_wall:
-#include "near_left_center_wall.inc"
-
-       ; 4x6 tiles
-near_center_right_wall:
-#include "near_right_center_wall.inc"
-
        ; copies a row of tiles
        ; from a linear buffer into a new block
        ; blocks must be 4 tiles wide