removed most test maps

diff --git a/makefile b/makefile
index cc44b29a55a9f018399c5753e9525ee61cd6cfee..c4d0dcce000f42fedc3fc7a6bb4d73da45273883 100644 (file)
--- a/makefile
+++ b/makefile
@@ -18,12 +18,4 @@ tiles:
 
 .PHONY: maps
 maps:
-       ./tools/tms2map.py assets/maps/map_c.tmx map_c > maps/map_c.s
-       ./tools/tms2map.py assets/maps/map_ce.tmx map_ce > maps/map_ce.s
-       ./tools/tms2map.py assets/maps/map_cw.tmx map_cw > maps/map_cw.s
-       ./tools/tms2map.py assets/maps/map_te.tmx map_te > maps/map_te.s
-       ./tools/tms2map.py assets/maps/map_tc.tmx map_tc > maps/map_tc.s
-       ./tools/tms2map.py assets/maps/map_tw.tmx map_tw > maps/map_tw.s
-       ./tools/tms2map.py assets/maps/map_be.tmx map_be > maps/map_be.s
-       ./tools/tms2map.py assets/maps/map_bc.tmx map_bc > maps/map_bc.s
-       ./tools/tms2map.py assets/maps/map_bw.tmx map_bw > maps/map_bw.s
+       ./tools/tms2map.py assets/maps/l1.tmx l1 > maps/l1.s

diff --git a/maps/l1.s b/maps/l1.s
new file mode 100644 (file)
index 0000000..ec7172e
--- /dev/null
+++ b/maps/l1.s
@@ -0,0 +1,60 @@
+l1_header:
+.db 0, 0, 0, 0 ; flags
+.str "NONAME  "
+dw l1_bg
+dw l1_tile_flags
+dw st_map_null
+dw map_actor_table_null
+dw bank8000
+dw bank8800
+dw bank8C00
+dw bank9000
+
+l1_bg:
+
+.db 0x1, 0x2, 0xe, 0x4, 0x1, 0x6, 0x1, 0x22
+.db 0xe, 0x0, 0x1, 0x26, 0x1, 0x22, 0xe, 0x0
+.db 0x1, 0x26, 0x1, 0x22, 0x2, 0x0, 0x1, 0x2
+.db 0x1, 0x4, 0x1, 0x6, 0x4, 0x0, 0x1, 0x2
+.db 0x1, 0x4, 0x1, 0x6, 0x2, 0x0, 0x1, 0x26
+.db 0x1, 0x22, 0x2, 0x0, 0x1, 0x22, 0x1, 0x6e
+.db 0x1, 0x26, 0x4, 0x0, 0x1, 0x22, 0x1, 0x6e
+.db 0x1, 0x26, 0x2, 0x0, 0x1, 0x26, 0x1, 0x22
+.db 0x2, 0x0, 0x1, 0x42, 0x1, 0x44, 0x1, 0x46
+.db 0x4, 0x0, 0x1, 0x42, 0x1, 0x44, 0x1, 0x46
+.db 0x2, 0x0, 0x1, 0x26, 0x1, 0x22, 0xe, 0x0
+.db 0x1, 0x26, 0x1, 0x22, 0x5, 0x0, 0x1, 0x2
+.db 0x2, 0x4, 0x1, 0x6, 0x5, 0x0, 0x1, 0x26
+.db 0x1, 0x22, 0x5, 0x0, 0x1, 0x22, 0x2, 0x6e
+.db 0x1, 0x26, 0x5, 0x0, 0x1, 0x26, 0x1, 0x22
+.db 0x5, 0x0, 0x1, 0x42, 0x2, 0x44, 0x1, 0x46
+.db 0x5, 0x0, 0x1, 0x26, 0x1, 0x22, 0xe, 0x0
+.db 0x1, 0x26, 0x1, 0x22, 0x2, 0x0, 0x1, 0x2
+.db 0x1, 0x4, 0x1, 0x6, 0x4, 0x0, 0x1, 0x2
+.db 0x1, 0x4, 0x1, 0x6, 0x2, 0x0, 0x1, 0x26
+.db 0x1, 0x22, 0x2, 0x0, 0x1, 0x22, 0x1, 0x6e
+.db 0x1, 0x26, 0x4, 0x0, 0x1, 0x22, 0x1, 0x6e
+.db 0x1, 0x26, 0x2, 0x0, 0x1, 0x26, 0x1, 0x22
+.db 0x2, 0x0, 0x1, 0x42, 0x1, 0x44, 0x1, 0x46
+.db 0x4, 0x0, 0x1, 0x42, 0x1, 0x44, 0x1, 0x46
+.db 0x2, 0x0, 0x1, 0x26, 0x1, 0x22, 0xe, 0x0
+.db 0x1, 0x26, 0x1, 0x42, 0xe, 0x44, 0x1, 0x46
+.db 0x00 ; termiante data
+l1_tile_flags:
+
+.db 0x11, 0x1, 0xe, 0x0, 0x2, 0x1, 0xe, 0x0
+.db 0x2, 0x1, 0x2, 0x0, 0x3, 0x1, 0x4, 0x0
+.db 0x3, 0x1, 0x2, 0x0, 0x2, 0x1, 0x2, 0x0
+.db 0x3, 0x1, 0x4, 0x0, 0x3, 0x1, 0x2, 0x0
+.db 0x2, 0x1, 0x2, 0x0, 0x3, 0x1, 0x4, 0x0
+.db 0x3, 0x1, 0x2, 0x0, 0x2, 0x1, 0xe, 0x0
+.db 0x2, 0x1, 0x5, 0x0, 0x4, 0x1, 0x5, 0x0
+.db 0x2, 0x1, 0x5, 0x0, 0x4, 0x1, 0x5, 0x0
+.db 0x2, 0x1, 0x5, 0x0, 0x4, 0x1, 0x5, 0x0
+.db 0x2, 0x1, 0xe, 0x0, 0x2, 0x1, 0x2, 0x0
+.db 0x3, 0x1, 0x4, 0x0, 0x3, 0x1, 0x2, 0x0
+.db 0x2, 0x1, 0x2, 0x0, 0x3, 0x1, 0x4, 0x0
+.db 0x3, 0x1, 0x2, 0x0, 0x2, 0x1, 0x2, 0x0
+.db 0x3, 0x1, 0x4, 0x0, 0x3, 0x1, 0x2, 0x0
+.db 0x2, 0x1, 0xe, 0x0, 0x11, 0x1
+.db 0x00 ; termiante data

diff --git a/maps/map_bc.s b/maps/map_bc.s
deleted file mode 100644 (file)
index 1a6e090..0000000
--- a/maps/map_bc.s
+++ /dev/null
@@ -1,42 +0,0 @@
-map_bc_header:
-.db 0, 0, 0, 0 ; flags
-.str "BC      "
-dw map_bc_bg
-dw map_bc_tile_flags
-dw st_map_null
-dw map_c_actor_table
-dw bank8000
-dw bank8800
-dw bank8C00
-dw bank9000
-
-map_bc_bg:
-
-.db 0x1, 0x2, 0xe, 0x4, 0x1, 0x6, 0x1, 0x22
-.db 0xe, 0x0, 0x1, 0x26, 0x1, 0x22, 0xe, 0x0
-.db 0x1, 0x26, 0x1, 0x22, 0xe, 0x0, 0x1, 0x26
-.db 0x1, 0x22, 0xe, 0x0, 0x1, 0x26, 0x1, 0x22
-.db 0xe, 0x0, 0x1, 0x26, 0x1, 0x22, 0xe, 0x0
-.db 0x1, 0x26, 0x1, 0x22, 0xe, 0x0, 0x1, 0x26
-.db 0x1, 0x22, 0xe, 0x0, 0x1, 0x26, 0x1, 0x22
-.db 0xe, 0x0, 0x1, 0x26, 0x1, 0x22, 0xe, 0x0
-.db 0x1, 0x26, 0x1, 0x22, 0xe, 0x0, 0x1, 0x26
-.db 0x1, 0x22, 0xe, 0x0, 0x1, 0x26, 0x1, 0x22
-.db 0xe, 0x0, 0x1, 0x26, 0x1, 0x22, 0xe, 0x0
-.db 0x1, 0x26, 0x1, 0x42, 0xe, 0x44, 0x1, 0x46
-.db 0x00 ; termiante data
-map_bc_tile_flags:
-
-.db 0x10, 0x33, 0x1, 0x13, 0xe, 0x0, 0x1, 0x23
-.db 0x1, 0x13, 0xe, 0x0, 0x1, 0x23, 0x1, 0x13
-.db 0xe, 0x0, 0x1, 0x23, 0x1, 0x13, 0xe, 0x0
-.db 0x1, 0x23, 0x1, 0x13, 0xe, 0x0, 0x1, 0x23
-.db 0x1, 0x13, 0xe, 0x0, 0x1, 0x23, 0x1, 0x13
-.db 0xe, 0x0, 0x1, 0x23, 0x1, 0x13, 0xe, 0x0
-.db 0x1, 0x23, 0x1, 0x13, 0xe, 0x0, 0x1, 0x23
-.db 0x1, 0x13, 0xe, 0x0, 0x1, 0x23, 0x1, 0x13
-.db 0xe, 0x0, 0x1, 0x23, 0x1, 0x13, 0xe, 0x0
-.db 0x1, 0x23, 0x1, 0x13, 0xe, 0x0, 0x1, 0x23
-.db 0x1, 0x13, 0xe, 0x0, 0x1, 0x23, 0x1, 0x13
-.db 0xe, 0x3, 0x1, 0x23
-.db 0x00 ; termiante data

diff --git a/maps/map_be.s b/maps/map_be.s
deleted file mode 100644 (file)
index 7103599..0000000
--- a/maps/map_be.s
+++ /dev/null
@@ -1,60 +0,0 @@
-map_be_header:
-.db 0, 0, 0, 0 ; flags
-.str "BE      "
-dw map_be_bg
-dw map_be_tile_flags
-dw st_map_null
-dw map_actor_table_null
-dw bank8000
-dw bank8800
-dw bank8C00
-dw bank9000
-
-map_be_bg:
-
-.db 0x1, 0x2, 0xe, 0x4, 0x1, 0x6, 0x1, 0x22
-.db 0xe, 0x0, 0x1, 0x26, 0x1, 0x22, 0x1, 0x0
-.db 0x1, 0x2, 0x1, 0x4, 0x1, 0x6, 0x6, 0x0
-.db 0x1, 0x2, 0x1, 0x4, 0x1, 0x6, 0x1, 0x0
-.db 0x1, 0x26, 0x1, 0x22, 0x1, 0x0, 0x1, 0x22
-.db 0x1, 0x6e, 0x1, 0x26, 0x6, 0x0, 0x1, 0x22
-.db 0x1, 0x6e, 0x1, 0x26, 0x1, 0x0, 0x1, 0x26
-.db 0x1, 0x22, 0x1, 0x0, 0x1, 0x42, 0x1, 0x44
-.db 0x1, 0x46, 0x6, 0x0, 0x1, 0x42, 0x1, 0x44
-.db 0x1, 0x46, 0x1, 0x0, 0x1, 0x26, 0x1, 0x22
-.db 0xe, 0x0, 0x1, 0x26, 0x1, 0x22, 0xe, 0x0
-.db 0x1, 0x26, 0x1, 0x22, 0xe, 0x0, 0x1, 0x26
-.db 0x1, 0x22, 0xe, 0x0, 0x1, 0x26, 0x1, 0x22
-.db 0xe, 0x0, 0x1, 0x26, 0x1, 0x22, 0xe, 0x0
-.db 0x1, 0x26, 0x1, 0x22, 0x1, 0x0, 0x1, 0x2
-.db 0x1, 0x4, 0x1, 0x6, 0x6, 0x0, 0x1, 0x2
-.db 0x1, 0x4, 0x1, 0x6, 0x1, 0x0, 0x1, 0x26
-.db 0x1, 0x22, 0x1, 0x0, 0x1, 0x22, 0x1, 0x6e
-.db 0x1, 0x26, 0x6, 0x0, 0x1, 0x22, 0x1, 0x6e
-.db 0x1, 0x26, 0x1, 0x0, 0x1, 0x26, 0x1, 0x22
-.db 0x1, 0x0, 0x1, 0x42, 0x1, 0x44, 0x1, 0x46
-.db 0x6, 0x0, 0x1, 0x42, 0x1, 0x44, 0x1, 0x46
-.db 0x1, 0x0, 0x1, 0x26, 0x1, 0x22, 0xe, 0x0
-.db 0x1, 0x26, 0x1, 0x42, 0xe, 0x44, 0x1, 0x46
-.db 0x00 ; termiante data
-map_be_tile_flags:
-
-.db 0x10, 0x33, 0x1, 0x13, 0xe, 0x0, 0x1, 0x23
-.db 0x1, 0x13, 0x1, 0x0, 0x3, 0x1, 0x6, 0x0
-.db 0x3, 0x1, 0x1, 0x0, 0x1, 0x23, 0x1, 0x13
-.db 0x1, 0x0, 0x3, 0x1, 0x6, 0x0, 0x3, 0x1
-.db 0x1, 0x0, 0x1, 0x23, 0x1, 0x13, 0x1, 0x0
-.db 0x3, 0x1, 0x6, 0x0, 0x3, 0x1, 0x1, 0x0
-.db 0x1, 0x23, 0x1, 0x13, 0xe, 0x0, 0x1, 0x23
-.db 0x1, 0x13, 0xe, 0x0, 0x1, 0x23, 0x1, 0x13
-.db 0xe, 0x0, 0x1, 0x23, 0x1, 0x13, 0xe, 0x0
-.db 0x1, 0x23, 0x1, 0x13, 0xe, 0x0, 0x1, 0x23
-.db 0x1, 0x13, 0xe, 0x0, 0x1, 0x23, 0x1, 0x13
-.db 0x1, 0x0, 0x3, 0x1, 0x6, 0x0, 0x3, 0x1
-.db 0x1, 0x0, 0x1, 0x23, 0x1, 0x13, 0x1, 0x0
-.db 0x3, 0x1, 0x6, 0x0, 0x3, 0x1, 0x1, 0x0
-.db 0x1, 0x23, 0x1, 0x13, 0x1, 0x0, 0x3, 0x1
-.db 0x6, 0x0, 0x3, 0x1, 0x1, 0x0, 0x1, 0x23
-.db 0x1, 0x13, 0xe, 0x0, 0x1, 0x23, 0x1, 0x13
-.db 0xe, 0x3, 0x1, 0x23
-.db 0x00 ; termiante data

diff --git a/maps/map_bw.s b/maps/map_bw.s
deleted file mode 100644 (file)
index 043a431..0000000
--- a/maps/map_bw.s
+++ /dev/null
@@ -1,61 +0,0 @@
-map_bw_header:
-.db 0, 0, 0, 0 ; flags
-.str "BW      "
-dw map_bw_bg
-dw map_bw_tile_flags
-dw st_map_null
-dw map_actor_table_null
-dw bank8000
-dw bank8800
-dw bank8C00
-dw bank9000
-
-map_bw_bg:
-
-.db 0x1, 0x2, 0xe, 0x4, 0x1, 0x6, 0x1, 0x22
-.db 0xe, 0x0, 0x1, 0x26, 0x1, 0x22, 0x7, 0x0
-.db 0x1, 0x2, 0x4, 0x4, 0x1, 0x6, 0x1, 0x0
-.db 0x1, 0x26, 0x1, 0x22, 0x7, 0x0, 0x1, 0x22
-.db 0x4, 0x6e, 0x1, 0x26, 0x1, 0x0, 0x1, 0x26
-.db 0x1, 0x22, 0x7, 0x0, 0x1, 0x22, 0x4, 0x6e
-.db 0x1, 0x26, 0x1, 0x0, 0x1, 0x26, 0x1, 0x22
-.db 0x7, 0x0, 0x1, 0x22, 0x4, 0x6e, 0x1, 0x26
-.db 0x1, 0x0, 0x1, 0x26, 0x1, 0x22, 0x3, 0x0
-.db 0x1, 0x2, 0x3, 0x4, 0x1, 0x42, 0x4, 0x44
-.db 0x1, 0x46, 0x1, 0x0, 0x1, 0x26, 0x1, 0x22
-.db 0x3, 0x0, 0x1, 0x22, 0x3, 0x6e, 0x1, 0x26
-.db 0x6, 0x0, 0x1, 0x26, 0x1, 0x22, 0x3, 0x0
-.db 0x1, 0x22, 0x3, 0x6e, 0x1, 0x26, 0x6, 0x0
-.db 0x1, 0x26, 0x1, 0x22, 0x3, 0x0, 0x1, 0x22
-.db 0x3, 0x6e, 0x1, 0x26, 0x6, 0x0, 0x1, 0x26
-.db 0x1, 0x22, 0x3, 0x0, 0x1, 0x42, 0x3, 0x44
-.db 0x1, 0x2, 0x4, 0x4, 0x1, 0x6, 0x1, 0x0
-.db 0x1, 0x26, 0x1, 0x22, 0x7, 0x0, 0x1, 0x22
-.db 0x4, 0x6e, 0x1, 0x26, 0x1, 0x0, 0x1, 0x26
-.db 0x1, 0x22, 0x7, 0x0, 0x1, 0x22, 0x4, 0x6e
-.db 0x1, 0x26, 0x1, 0x0, 0x1, 0x26, 0x1, 0x22
-.db 0x7, 0x0, 0x1, 0x42, 0x4, 0x44, 0x1, 0x46
-.db 0x1, 0x0, 0x1, 0x26, 0x1, 0x22, 0xe, 0x0
-.db 0x1, 0x26, 0x1, 0x42, 0xe, 0x44, 0x1, 0x46
-.db 0x00 ; termiante data
-map_bw_tile_flags:
-
-.db 0x10, 0x33, 0x1, 0x13, 0xe, 0x0, 0x1, 0x23
-.db 0x1, 0x13, 0x7, 0x0, 0x6, 0x1, 0x1, 0x0
-.db 0x1, 0x23, 0x1, 0x13, 0x7, 0x0, 0x6, 0x1
-.db 0x1, 0x0, 0x1, 0x23, 0x1, 0x13, 0x7, 0x0
-.db 0x6, 0x1, 0x1, 0x0, 0x1, 0x23, 0x1, 0x13
-.db 0x7, 0x0, 0x6, 0x1, 0x1, 0x0, 0x1, 0x23
-.db 0x1, 0x13, 0x3, 0x0, 0xa, 0x1, 0x1, 0x0
-.db 0x1, 0x23, 0x1, 0x13, 0x3, 0x0, 0x5, 0x1
-.db 0x6, 0x0, 0x1, 0x23, 0x1, 0x13, 0x3, 0x0
-.db 0x5, 0x1, 0x6, 0x0, 0x1, 0x23, 0x1, 0x13
-.db 0x3, 0x0, 0x5, 0x1, 0x6, 0x0, 0x1, 0x23
-.db 0x1, 0x13, 0x3, 0x0, 0xa, 0x1, 0x1, 0x0
-.db 0x1, 0x23, 0x1, 0x13, 0x7, 0x0, 0x6, 0x1
-.db 0x1, 0x0, 0x1, 0x23, 0x1, 0x13, 0x7, 0x0
-.db 0x6, 0x1, 0x1, 0x0, 0x1, 0x23, 0x1, 0x13
-.db 0x7, 0x0, 0x6, 0x1, 0x1, 0x0, 0x1, 0x23
-.db 0x1, 0x13, 0xe, 0x0, 0x1, 0x23, 0x1, 0x13
-.db 0xe, 0x3, 0x1, 0x23
-.db 0x00 ; termiante data

diff --git a/maps/map_c.s b/maps/map_c.s
deleted file mode 100644 (file)
index 1494891..0000000
--- a/maps/map_c.s
+++ /dev/null
@@ -1,64 +0,0 @@
-map_c_header:
-.db 0, 0, 0, 0 ; flags
-.str "C       "
-dw map_c_bg
-dw map_c_tile_flags
-dw st_map_null
-dw map_c_actor_table
-dw bank8000
-dw bank8800
-dw bank8C00
-dw bank9000
-
-map_c_bg:
-
-.db 0x1, 0x2, 0xe, 0x4, 0x1, 0x6, 0x1, 0x22
-.db 0xe, 0x0, 0x1, 0x26, 0x1, 0x22, 0xe, 0x0
-.db 0x1, 0x26, 0x1, 0x22, 0x2, 0x0, 0x1, 0x2
-.db 0x1, 0x4, 0x1, 0x6, 0x4, 0x0, 0x1, 0x2
-.db 0x1, 0x4, 0x1, 0x6, 0x2, 0x0, 0x1, 0x26
-.db 0x1, 0x22, 0x2, 0x0, 0x1, 0x22, 0x1, 0x6e
-.db 0x1, 0x26, 0x4, 0x0, 0x1, 0x22, 0x1, 0x6e
-.db 0x1, 0x26, 0x2, 0x0, 0x1, 0x26, 0x1, 0x22
-.db 0x2, 0x0, 0x1, 0x42, 0x1, 0x44, 0x1, 0x46
-.db 0x4, 0x0, 0x1, 0x42, 0x1, 0x44, 0x1, 0x46
-.db 0x2, 0x0, 0x1, 0x26, 0x1, 0x22, 0xe, 0x0
-.db 0x1, 0x26, 0x1, 0x22, 0x5, 0x0, 0x1, 0x2
-.db 0x2, 0x4, 0x1, 0x6, 0x5, 0x0, 0x1, 0x26
-.db 0x1, 0x22, 0x5, 0x0, 0x1, 0x22, 0x2, 0x6e
-.db 0x1, 0x26, 0x5, 0x0, 0x1, 0x26, 0x1, 0x22
-.db 0x5, 0x0, 0x1, 0x42, 0x2, 0x44, 0x1, 0x46
-.db 0x5, 0x0, 0x1, 0x26, 0x1, 0x22, 0xe, 0x0
-.db 0x1, 0x26, 0x1, 0x22, 0x2, 0x0, 0x1, 0x2
-.db 0x1, 0x4, 0x1, 0x6, 0x4, 0x0, 0x1, 0x2
-.db 0x1, 0x4, 0x1, 0x6, 0x2, 0x0, 0x1, 0x26
-.db 0x1, 0x22, 0x2, 0x0, 0x1, 0x22, 0x1, 0x6e
-.db 0x1, 0x26, 0x4, 0x0, 0x1, 0x22, 0x1, 0x6e
-.db 0x1, 0x26, 0x2, 0x0, 0x1, 0x26, 0x1, 0x22
-.db 0x2, 0x0, 0x1, 0x42, 0x1, 0x44, 0x1, 0x46
-.db 0x4, 0x0, 0x1, 0x42, 0x1, 0x44, 0x1, 0x46
-.db 0x2, 0x0, 0x1, 0x26, 0x1, 0x22, 0xe, 0x0
-.db 0x1, 0x26, 0x1, 0x42, 0xe, 0x44, 0x1, 0x46
-.db 0x00 ; termiante data
-map_c_tile_flags:
-
-.db 0x10, 0x33, 0x1, 0x13, 0xe, 0x0, 0x1, 0x23
-.db 0x1, 0x13, 0xe, 0x0, 0x1, 0x23, 0x1, 0x13
-.db 0x2, 0x0, 0x3, 0x1, 0x4, 0x0, 0x3, 0x1
-.db 0x2, 0x0, 0x1, 0x23, 0x1, 0x13, 0x2, 0x0
-.db 0x3, 0x1, 0x4, 0x0, 0x3, 0x1, 0x2, 0x0
-.db 0x1, 0x23, 0x1, 0x13, 0x2, 0x0, 0x3, 0x1
-.db 0x4, 0x0, 0x3, 0x1, 0x2, 0x0, 0x1, 0x23
-.db 0x1, 0x13, 0xe, 0x0, 0x1, 0x23, 0x1, 0x13
-.db 0x5, 0x0, 0x4, 0x1, 0x5, 0x0, 0x1, 0x23
-.db 0x1, 0x13, 0x5, 0x0, 0x4, 0x1, 0x5, 0x0
-.db 0x1, 0x23, 0x1, 0x13, 0x5, 0x0, 0x4, 0x1
-.db 0x5, 0x0, 0x1, 0x23, 0x1, 0x13, 0xe, 0x0
-.db 0x1, 0x23, 0x1, 0x13, 0x2, 0x0, 0x3, 0x1
-.db 0x4, 0x0, 0x3, 0x1, 0x2, 0x0, 0x1, 0x23
-.db 0x1, 0x13, 0x2, 0x0, 0x3, 0x1, 0x4, 0x0
-.db 0x3, 0x1, 0x2, 0x0, 0x1, 0x23, 0x1, 0x13
-.db 0x2, 0x0, 0x3, 0x1, 0x4, 0x0, 0x3, 0x1
-.db 0x2, 0x0, 0x1, 0x23, 0x1, 0x13, 0xe, 0x0
-.db 0x1, 0x23, 0x1, 0x13, 0xe, 0x3, 0x1, 0x23
-.db 0x00 ; termiante data

diff --git a/maps/map_ce.s b/maps/map_ce.s
deleted file mode 100644 (file)
index c11a08c..0000000
--- a/maps/map_ce.s
+++ /dev/null
@@ -1,55 +0,0 @@
-map_ce_header:
-.db 0, 0, 0, 0 ; flags
-.str "CE      "
-dw map_ce_bg
-dw map_ce_tile_flags
-dw st_map_null
-dw map_actor_table_null
-dw bank8000
-dw bank8800
-dw bank8C00
-dw bank9000
-
-map_ce_bg:
-
-.db 0x1, 0x2, 0xe, 0x4, 0x1, 0x6, 0x1, 0x22
-.db 0xe, 0x0, 0x1, 0x26, 0x1, 0x22, 0xe, 0x0
-.db 0x1, 0x26, 0x1, 0x22, 0xe, 0x0, 0x1, 0x26
-.db 0x1, 0x22, 0xe, 0x0, 0x1, 0x26, 0x1, 0x22
-.db 0xe, 0x0, 0x1, 0x26, 0x1, 0x22, 0x2, 0x0
-.db 0x1, 0x2, 0x1, 0x4, 0x1, 0x6, 0x1, 0x0
-.db 0x1, 0x2, 0x1, 0x4, 0x1, 0x6, 0x1, 0x0
-.db 0x1, 0x2, 0x1, 0x4, 0x1, 0x6, 0x1, 0x0
-.db 0x1, 0x26, 0x1, 0x22, 0x2, 0x0, 0x1, 0x22
-.db 0x1, 0x6e, 0x1, 0x26, 0x1, 0x0, 0x1, 0x22
-.db 0x1, 0x6e, 0x1, 0x26, 0x1, 0x0, 0x1, 0x22
-.db 0x1, 0x6e, 0x1, 0x26, 0x1, 0x0, 0x1, 0x26
-.db 0x1, 0x22, 0x2, 0x0, 0x1, 0x42, 0x1, 0x44
-.db 0x1, 0x46, 0x1, 0x0, 0x1, 0x42, 0x1, 0x44
-.db 0x1, 0x46, 0x1, 0x0, 0x1, 0x42, 0x1, 0x44
-.db 0x1, 0x46, 0x1, 0x0, 0x1, 0x26, 0x1, 0x22
-.db 0xe, 0x0, 0x1, 0x26, 0x1, 0x22, 0xe, 0x0
-.db 0x1, 0x26, 0x1, 0x22, 0xe, 0x0, 0x1, 0x26
-.db 0x1, 0x22, 0xe, 0x0, 0x1, 0x26, 0x1, 0x22
-.db 0xe, 0x0, 0x1, 0x26, 0x1, 0x22, 0xe, 0x0
-.db 0x1, 0x26, 0x1, 0x42, 0xe, 0x44, 0x1, 0x46
-.db 0x00 ; termiante data
-map_ce_tile_flags:
-
-.db 0x10, 0x33, 0x1, 0x13, 0xe, 0x0, 0x1, 0x23
-.db 0x1, 0x13, 0xe, 0x0, 0x1, 0x23, 0x1, 0x13
-.db 0xe, 0x0, 0x1, 0x23, 0x1, 0x13, 0xe, 0x0
-.db 0x1, 0x23, 0x1, 0x13, 0xe, 0x0, 0x1, 0x23
-.db 0x1, 0x13, 0x2, 0x0, 0x3, 0x1, 0x1, 0x0
-.db 0x3, 0x1, 0x1, 0x0, 0x3, 0x1, 0x1, 0x0
-.db 0x1, 0x23, 0x1, 0x13, 0x2, 0x0, 0x3, 0x1
-.db 0x1, 0x0, 0x3, 0x1, 0x1, 0x0, 0x3, 0x1
-.db 0x1, 0x0, 0x1, 0x23, 0x1, 0x13, 0x2, 0x0
-.db 0x3, 0x1, 0x1, 0x0, 0x3, 0x1, 0x1, 0x0
-.db 0x3, 0x1, 0x1, 0x0, 0x1, 0x23, 0x1, 0x13
-.db 0xe, 0x0, 0x1, 0x23, 0x1, 0x13, 0xe, 0x0
-.db 0x1, 0x23, 0x1, 0x13, 0xe, 0x0, 0x1, 0x23
-.db 0x1, 0x13, 0xe, 0x0, 0x1, 0x23, 0x1, 0x13
-.db 0xe, 0x0, 0x1, 0x23, 0x1, 0x13, 0xe, 0x0
-.db 0x1, 0x23, 0x1, 0x13, 0xe, 0x3, 0x1, 0x23
-.db 0x00 ; termiante data

diff --git a/maps/map_cw.s b/maps/map_cw.s
deleted file mode 100644 (file)
index 265db86..0000000
--- a/maps/map_cw.s
+++ /dev/null
@@ -1,55 +0,0 @@
-map_cw_header:
-.db 0, 0, 0, 0 ; flags
-.str "CW      "
-dw map_cw_bg
-dw map_cw_tile_flags
-dw st_map_null
-dw map_actor_table_null
-dw bank8000
-dw bank8800
-dw bank8C00
-dw bank9000
-
-map_cw_bg:
-
-.db 0x1, 0x2, 0xe, 0x4, 0x1, 0x6, 0x1, 0x22
-.db 0xe, 0x0, 0x1, 0x26, 0x1, 0x22, 0xe, 0x0
-.db 0x1, 0x26, 0x1, 0x22, 0x2, 0x0, 0x1, 0x2
-.db 0x6, 0x4, 0x1, 0x6, 0x4, 0x0, 0x1, 0x26
-.db 0x1, 0x22, 0x2, 0x0, 0x1, 0x22, 0x6, 0x0
-.db 0x1, 0x26, 0x4, 0x0, 0x1, 0x26, 0x1, 0x22
-.db 0x2, 0x0, 0x1, 0x22, 0xb, 0x0, 0x1, 0x26
-.db 0x1, 0x22, 0x2, 0x0, 0x1, 0x22, 0xb, 0x0
-.db 0x1, 0x26, 0x1, 0x22, 0x2, 0x0, 0x1, 0x22
-.db 0x6, 0x0, 0x1, 0x26, 0x4, 0x0, 0x1, 0x26
-.db 0x1, 0x22, 0x2, 0x0, 0x1, 0x42, 0x6, 0x44
-.db 0x1, 0x46, 0x4, 0x0, 0x1, 0x26, 0x1, 0x22
-.db 0xe, 0x0, 0x1, 0x26, 0x1, 0x22, 0x2, 0x0
-.db 0x1, 0x2, 0x7, 0x4, 0x1, 0x6, 0x3, 0x0
-.db 0x1, 0x26, 0x1, 0x22, 0x2, 0x0, 0x1, 0x22
-.db 0x7, 0x6e, 0x1, 0x26, 0x3, 0x0, 0x1, 0x26
-.db 0x1, 0x22, 0x2, 0x0, 0x1, 0x42, 0x7, 0x44
-.db 0x1, 0x46, 0x3, 0x0, 0x1, 0x26, 0x1, 0x22
-.db 0xe, 0x0, 0x1, 0x26, 0x1, 0x22, 0xe, 0x0
-.db 0x1, 0x26, 0x1, 0x42, 0xe, 0x44, 0x1, 0x46
-.db 0x00 ; termiante data
-map_cw_tile_flags:
-
-.db 0x10, 0x33, 0x1, 0x13, 0xe, 0x0, 0x1, 0x23
-.db 0x1, 0x13, 0xe, 0x0, 0x1, 0x23, 0x1, 0x13
-.db 0x2, 0x0, 0x8, 0x1, 0x4, 0x0, 0x1, 0x23
-.db 0x1, 0x13, 0x2, 0x0, 0x1, 0x1, 0x6, 0x0
-.db 0x1, 0x1, 0x4, 0x0, 0x1, 0x23, 0x1, 0x13
-.db 0x2, 0x0, 0x1, 0x1, 0xb, 0x0, 0x1, 0x23
-.db 0x1, 0x13, 0x2, 0x0, 0x1, 0x1, 0xb, 0x0
-.db 0x1, 0x23, 0x1, 0x13, 0x2, 0x0, 0x1, 0x1
-.db 0x6, 0x0, 0x1, 0x1, 0x4, 0x0, 0x1, 0x23
-.db 0x1, 0x13, 0x2, 0x0, 0x8, 0x1, 0x4, 0x0
-.db 0x1, 0x23, 0x1, 0x13, 0xe, 0x0, 0x1, 0x23
-.db 0x1, 0x13, 0x2, 0x0, 0x9, 0x1, 0x3, 0x0
-.db 0x1, 0x23, 0x1, 0x13, 0x2, 0x0, 0x9, 0x1
-.db 0x3, 0x0, 0x1, 0x23, 0x1, 0x13, 0x2, 0x0
-.db 0x9, 0x1, 0x3, 0x0, 0x1, 0x23, 0x1, 0x13
-.db 0xe, 0x0, 0x1, 0x23, 0x1, 0x13, 0xe, 0x0
-.db 0x1, 0x23, 0x1, 0x13, 0xe, 0x3, 0x1, 0x23
-.db 0x00 ; termiante data

diff --git a/maps/map_tc.s b/maps/map_tc.s
deleted file mode 100644 (file)
index c70ac4f..0000000
--- a/maps/map_tc.s
+++ /dev/null
@@ -1,54 +0,0 @@
-map_tc_header:
-.db 0, 0, 0, 0 ; flags
-.str "TC      "
-dw map_tc_bg
-dw map_tc_tile_flags
-dw st_map_null
-dw map_c_actor_table
-dw bank8000
-dw bank8800
-dw bank8C00
-dw bank9000
-
-map_tc_bg:
-
-.db 0x1, 0x2, 0xe, 0x4, 0x1, 0x6, 0x1, 0x22
-.db 0xe, 0x0, 0x1, 0x26, 0x1, 0x22, 0x1, 0x0
-.db 0x1, 0x2, 0xa, 0x4, 0x1, 0x6, 0x1, 0x0
-.db 0x1, 0x26, 0x1, 0x22, 0x1, 0x0, 0x1, 0x22
-.db 0xa, 0x24, 0x1, 0x26, 0x1, 0x0, 0x1, 0x26
-.db 0x1, 0x22, 0x1, 0x0, 0x1, 0x22, 0x9, 0x0
-.db 0x1, 0x24, 0x1, 0x26, 0x1, 0x0, 0x1, 0x26
-.db 0x1, 0x22, 0xb, 0x0, 0x1, 0x24, 0x2, 0x0
-.db 0x1, 0x26, 0x1, 0x22, 0x1, 0x0, 0x1, 0x22
-.db 0x9, 0x0, 0x1, 0x24, 0x1, 0x26, 0x1, 0x0
-.db 0x1, 0x26, 0x1, 0x22, 0x1, 0x0, 0x1, 0x22
-.db 0xa, 0x24, 0x1, 0x26, 0x1, 0x0, 0x1, 0x26
-.db 0x1, 0x22, 0x1, 0x0, 0x1, 0x42, 0xa, 0x44
-.db 0x1, 0x46, 0x1, 0x0, 0x1, 0x26, 0x1, 0x22
-.db 0xe, 0x0, 0x1, 0x26, 0x1, 0x22, 0xe, 0x0
-.db 0x1, 0x26, 0x1, 0x22, 0xe, 0x0, 0x1, 0x26
-.db 0x1, 0x22, 0xe, 0x0, 0x1, 0x26, 0x1, 0x22
-.db 0xe, 0x0, 0x1, 0x26, 0x1, 0x22, 0xe, 0x0
-.db 0x1, 0x26, 0x1, 0x42, 0xe, 0x44, 0x1, 0x46
-.db 0x00 ; termiante data
-map_tc_tile_flags:
-
-.db 0x10, 0x33, 0x1, 0x13, 0xe, 0x0, 0x1, 0x23
-.db 0x1, 0x13, 0x1, 0x0, 0xc, 0x1, 0x1, 0x0
-.db 0x1, 0x23, 0x1, 0x13, 0x1, 0x0, 0x1, 0x1
-.db 0xa, 0x0, 0x1, 0x1, 0x1, 0x0, 0x1, 0x23
-.db 0x1, 0x13, 0x1, 0x0, 0x1, 0x1, 0xa, 0x0
-.db 0x1, 0x1, 0x1, 0x0, 0x1, 0x23, 0x1, 0x13
-.db 0xe, 0x0, 0x1, 0x23, 0x1, 0x13, 0x1, 0x0
-.db 0x1, 0x1, 0xa, 0x0, 0x1, 0x1, 0x1, 0x0
-.db 0x1, 0x23, 0x1, 0x13, 0x1, 0x0, 0x1, 0x1
-.db 0xa, 0x0, 0x1, 0x1, 0x1, 0x0, 0x1, 0x23
-.db 0x1, 0x13, 0x1, 0x0, 0xc, 0x1, 0x1, 0x0
-.db 0x1, 0x23, 0x1, 0x13, 0xe, 0x0, 0x1, 0x23
-.db 0x1, 0x13, 0xe, 0x0, 0x1, 0x23, 0x1, 0x13
-.db 0xe, 0x0, 0x1, 0x23, 0x1, 0x13, 0xe, 0x0
-.db 0x1, 0x23, 0x1, 0x13, 0xe, 0x0, 0x1, 0x23
-.db 0x1, 0x13, 0xe, 0x0, 0x1, 0x23, 0x1, 0x13
-.db 0xe, 0x3, 0x1, 0x23
-.db 0x00 ; termiante data

diff --git a/maps/map_te.s b/maps/map_te.s
deleted file mode 100644 (file)
index 1077695..0000000
--- a/maps/map_te.s
+++ /dev/null
@@ -1,54 +0,0 @@
-map_te_header:
-.db 0, 0, 0, 0 ; flags
-.str "TE      "
-dw map_te_bg
-dw map_te_tile_flags
-dw st_map_null
-dw map_actor_table_null
-dw bank8000
-dw bank8800
-dw bank8C00
-dw bank9000
-
-map_te_bg:
-
-.db 0x1, 0x2, 0xe, 0x4, 0x1, 0x6, 0x1, 0x22
-.db 0xe, 0x0, 0x1, 0x26, 0x1, 0x22, 0x2, 0x0
-.db 0x1, 0x2, 0x8, 0x4, 0x1, 0x6, 0x2, 0x0
-.db 0x1, 0x26, 0x1, 0x22, 0x2, 0x0, 0x1, 0x22
-.db 0x8, 0x6e, 0x1, 0x26, 0x2, 0x0, 0x1, 0x26
-.db 0x1, 0x22, 0x2, 0x0, 0x1, 0x22, 0x8, 0x6e
-.db 0x1, 0x26, 0x2, 0x0, 0x1, 0x26, 0x1, 0x22
-.db 0x2, 0x0, 0x1, 0x22, 0x8, 0x6e, 0x1, 0x26
-.db 0x2, 0x0, 0x1, 0x26, 0x1, 0x22, 0x2, 0x0
-.db 0x1, 0x22, 0x8, 0x6e, 0x1, 0x26, 0x2, 0x0
-.db 0x1, 0x26, 0x1, 0x22, 0x2, 0x0, 0x1, 0x22
-.db 0x8, 0x6e, 0x1, 0x26, 0x2, 0x0, 0x1, 0x26
-.db 0x1, 0x22, 0x2, 0x0, 0x1, 0x22, 0x8, 0x6e
-.db 0x1, 0x26, 0x2, 0x0, 0x1, 0x26, 0x1, 0x22
-.db 0x2, 0x0, 0x1, 0x42, 0x8, 0x44, 0x1, 0x46
-.db 0x2, 0x0, 0x1, 0x26, 0x1, 0x22, 0xe, 0x0
-.db 0x1, 0x26, 0x1, 0x22, 0xe, 0x0, 0x1, 0x26
-.db 0x1, 0x22, 0xe, 0x0, 0x1, 0x26, 0x1, 0x22
-.db 0xe, 0x0, 0x1, 0x26, 0x1, 0x22, 0xe, 0x0
-.db 0x1, 0x26, 0x1, 0x42, 0xe, 0x44, 0x1, 0x46
-.db 0x00 ; termiante data
-map_te_tile_flags:
-
-.db 0x10, 0x33, 0x1, 0x13, 0xe, 0x0, 0x1, 0x23
-.db 0x1, 0x13, 0x2, 0x0, 0xa, 0x1, 0x2, 0x0
-.db 0x1, 0x23, 0x1, 0x13, 0x2, 0x0, 0xa, 0x1
-.db 0x2, 0x0, 0x1, 0x23, 0x1, 0x13, 0x2, 0x0
-.db 0xa, 0x1, 0x2, 0x0, 0x1, 0x23, 0x1, 0x13
-.db 0x2, 0x0, 0xa, 0x1, 0x2, 0x0, 0x1, 0x23
-.db 0x1, 0x13, 0x2, 0x0, 0xa, 0x1, 0x2, 0x0
-.db 0x1, 0x23, 0x1, 0x13, 0x2, 0x0, 0xa, 0x1
-.db 0x2, 0x0, 0x1, 0x23, 0x1, 0x13, 0x2, 0x0
-.db 0xa, 0x1, 0x2, 0x0, 0x1, 0x23, 0x1, 0x13
-.db 0x2, 0x0, 0xa, 0x1, 0x2, 0x0, 0x1, 0x23
-.db 0x1, 0x13, 0xe, 0x0, 0x1, 0x23, 0x1, 0x13
-.db 0xe, 0x0, 0x1, 0x23, 0x1, 0x13, 0xe, 0x0
-.db 0x1, 0x23, 0x1, 0x13, 0xe, 0x0, 0x1, 0x23
-.db 0x1, 0x13, 0xe, 0x0, 0x1, 0x23, 0x1, 0x13
-.db 0xe, 0x3, 0x1, 0x23
-.db 0x00 ; termiante data

diff --git a/maps/map_tw.s b/maps/map_tw.s
deleted file mode 100644 (file)
index d19a6ea..0000000
--- a/maps/map_tw.s
+++ /dev/null
@@ -1,58 +0,0 @@
-map_tw_header:
-.db 0, 0, 0, 0 ; flags
-.str "TW      "
-dw map_tw_bg
-dw map_tw_tile_flags
-dw st_map_null
-dw map_actor_table_null
-dw bank8000
-dw bank8800
-dw bank8C00
-dw bank9000
-
-map_tw_bg:
-
-.db 0x1, 0x2, 0xe, 0x4, 0x1, 0x6, 0x1, 0x22
-.db 0xe, 0x0, 0x1, 0x26, 0x1, 0x22, 0x2, 0x0
-.db 0x1, 0x2, 0x9, 0x4, 0x1, 0x6, 0x1, 0x0
-.db 0x1, 0x26, 0x1, 0x22, 0x2, 0x0, 0x1, 0x22
-.db 0x9, 0x0, 0x1, 0x26, 0x1, 0x0, 0x1, 0x26
-.db 0x1, 0x22, 0x2, 0x0, 0x1, 0x22, 0x9, 0x0
-.db 0x1, 0x26, 0x1, 0x0, 0x1, 0x26, 0x1, 0x22
-.db 0x2, 0x0, 0x1, 0x22, 0x9, 0x0, 0x1, 0x26
-.db 0x1, 0x0, 0x1, 0x26, 0x1, 0x22, 0x2, 0x0
-.db 0x1, 0x22, 0x9, 0x0, 0x1, 0x26, 0x1, 0x0
-.db 0x1, 0x26, 0x1, 0x22, 0x2, 0x0, 0x1, 0x22
-.db 0x9, 0x0, 0x1, 0x26, 0x1, 0x0, 0x1, 0x26
-.db 0x1, 0x22, 0x2, 0x0, 0x1, 0x22, 0x9, 0x0
-.db 0x1, 0x26, 0x1, 0x0, 0x1, 0x26, 0x1, 0x22
-.db 0x2, 0x0, 0x1, 0x42, 0x3, 0x44, 0x2, 0x0
-.db 0x4, 0x44, 0x1, 0x46, 0x1, 0x0, 0x1, 0x26
-.db 0x1, 0x22, 0xe, 0x0, 0x1, 0x26, 0x1, 0x22
-.db 0xe, 0x0, 0x1, 0x26, 0x1, 0x22, 0xe, 0x0
-.db 0x1, 0x26, 0x1, 0x22, 0xe, 0x0, 0x1, 0x26
-.db 0x1, 0x22, 0xe, 0x0, 0x1, 0x26, 0x1, 0x42
-.db 0xe, 0x44, 0x1, 0x46
-.db 0x00 ; termiante data
-map_tw_tile_flags:
-
-.db 0x10, 0x33, 0x1, 0x13, 0xe, 0x0, 0x1, 0x23
-.db 0x1, 0x13, 0x2, 0x0, 0xb, 0x1, 0x1, 0x0
-.db 0x1, 0x23, 0x1, 0x13, 0x2, 0x0, 0x1, 0x1
-.db 0x9, 0x0, 0x1, 0x1, 0x1, 0x0, 0x1, 0x23
-.db 0x1, 0x13, 0x2, 0x0, 0x1, 0x1, 0x9, 0x0
-.db 0x1, 0x1, 0x1, 0x0, 0x1, 0x23, 0x1, 0x13
-.db 0x2, 0x0, 0x1, 0x1, 0x9, 0x0, 0x1, 0x1
-.db 0x1, 0x0, 0x1, 0x23, 0x1, 0x13, 0x2, 0x0
-.db 0x1, 0x1, 0x9, 0x0, 0x1, 0x1, 0x1, 0x0
-.db 0x1, 0x23, 0x1, 0x13, 0x2, 0x0, 0x1, 0x1
-.db 0x9, 0x0, 0x1, 0x1, 0x1, 0x0, 0x1, 0x23
-.db 0x1, 0x13, 0x2, 0x0, 0x1, 0x1, 0x9, 0x0
-.db 0x1, 0x1, 0x1, 0x0, 0x1, 0x23, 0x1, 0x13
-.db 0x2, 0x0, 0x4, 0x1, 0x2, 0x0, 0x5, 0x1
-.db 0x1, 0x0, 0x1, 0x23, 0x1, 0x13, 0xe, 0x0
-.db 0x1, 0x23, 0x1, 0x13, 0xe, 0x0, 0x1, 0x23
-.db 0x1, 0x13, 0xe, 0x0, 0x1, 0x23, 0x1, 0x13
-.db 0xe, 0x0, 0x1, 0x23, 0x1, 0x13, 0xe, 0x0
-.db 0x1, 0x23, 0x1, 0x13, 0xe, 0x3, 0x1, 0x23
-.db 0x00 ; termiante data

diff --git a/src/map.s b/src/map.s
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..916032d48c0d9eabdd3082f4c19bb8ba990e013c 100644 (file)
--- a/src/map.s
+++ b/src/map.s
@@ -0,0 +1,12 @@
+       ; loads a map 
+       ; including the required tileset
+       ; sets current page to 0
+       ; draws page 0 to the screen
+       ; loads map objects
+map_load:
+       ret
+       
+       ; draws a single row of tiles:w
+map_draw_row:
+       ret
+