maps: wip added second map

diff --git a/makefile b/makefile
index 30f3e1200c9be502aca012e9e18c0428ec477f52..ff23bed4dda6e8d9fd569b17dd462ab53103af4a 100644 (file)
--- a/makefile
+++ b/makefile
@@ -19,3 +19,4 @@ tiles:
 .PHONY: maps
 maps:
        ./tools/tms2map.py assets/maps/base1616.tmx default_map > maps/default_map.s
+       ./tools/tms2map.py assets/maps/start.tmx start_map > maps/start_map.s

diff --git a/maps/start_map.s b/maps/start_map.s
new file mode 100644 (file)
index 0000000..be46722
--- /dev/null
+++ b/maps/start_map.s
@@ -0,0 +1,31 @@
+start_map_header:
+.db 0, 0, 0, 0 ; flags
+.str "NONAME  "
+dw start_map_bg
+dw start_map_tile_flags
+dw st_map_null
+dw map_actor_table_null
+dw bank8000
+dw bank8800
+dw bank8C00
+dw bank9000
+dw default_map_exit_table
+
+start_map_bg:
+
+.db 0x1, 0x42, 0x1, 0x60, 0x4, 0x44, 0xa, 0x60
+.db 0x1, 0x60, 0xf, 0x60, 0x1, 0x60, 0xf, 0x60
+.db 0x1, 0x60, 0xf, 0x60, 0x1, 0x60, 0xf, 0x60
+.db 0x1, 0x60, 0xf, 0x60, 0x1, 0x60, 0x4, 0x60
+.db 0x4, 0x44, 0x7, 0x60, 0x1, 0x60, 0xf, 0x60
+.db 0x1, 0x60, 0xf, 0x60, 0x1, 0x60, 0xf, 0x60
+.db 0x1, 0x60, 0xf, 0x60, 0x1, 0x60, 0xf, 0x60
+.db 0x1, 0x60, 0xf, 0x60, 0x1, 0x60, 0xf, 0x60
+.db 0x1, 0x60, 0xf, 0x60, 0x1, 0x60, 0xe, 0x60
+.db 0x1, 0x60
+.db 0x00 ; termiante data
+start_map_tile_flags:
+
+.db 0x2, 0x0, 0x4, 0x1, 0x5f, 0x0, 0x4, 0x1
+.db 0x97, 0x0
+.db 0x00 ; termiante data

diff --git a/src/exittables.s b/src/exittables.s
index ce89138dd97c6ab7af53bfd77bb5deed31aae119..cee78df4b923a7757e1a16b28a7e435fddf52828 100644 (file)
--- a/src/exittables.s
+++ b/src/exittables.s
@@ -1,3 +1,3 @@
 default_map_exit_table:
-exit_def EXITF_GOTOXY_REL, BTNRIGHT, 0, -15, default_map_header 
-exit_def EXITF_GOTOXY_REL, BTNLEFT, 0, 15, default_map_header 
+exit_def EXITF_GOTOXY_REL, BTNRIGHT, 0, -15, start_map_header 
+exit_def EXITF_GOTOXY_REL, BTNLEFT, 0, 15, start_map_header 

diff --git a/src/map.s b/src/map.s
index 0b1fa3a92689687f4e10feab9c16e38657feb4fa..76897f1c84685099b73392dd65d0201f8a58f228 100644 (file)
--- a/src/map.s
+++ b/src/map.s
@@ -429,3 +429,4 @@ map_null_state:
   ret
 
 #include "default_map.s"
+#include "start_map.s"