maps: renamed maps to indicate their direction.

This is because maps will just serve as a template for room placement
soon.

diff --git a/makefile b/makefile
index 55c026ad61275feed72322d3172beec53c0259ed..ad453b3d1c82a06fe1fdcf3fd52d178130931683 100644 (file)
--- a/makefile
+++ b/makefile
@@ -18,6 +18,6 @@ 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
-       ./tools/tms2map.py assets/maps/west_woods.tmx west_woods_map > maps/west_woods_map.s
+       ./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

diff --git a/maps/default_map.s b/maps/default_map.s
deleted file mode 100644 (file)
index d650c8a..0000000
--- a/maps/default_map.s
+++ /dev/null
@@ -1,34 +0,0 @@
-default_map_header:
-.db 0, 0, 0, 0 ; flags
-.str "NONAME  "
-dw default_map_bg
-dw default_map_tile_flags
-dw st_map_null
-dw default_map_actor_table
-dw bank8000
-dw bank8800
-dw bank8C00
-dw bank9000
-dw default_map_exit_table
-
-default_map_bg:
-
-.db 0x1, 0x42, 0xe, 0x60, 0x1, 0x62, 0x1, 0x60
-.db 0xf, 0x60, 0x1, 0x60, 0x6, 0x60, 0x4, 0x44
-.db 0x5, 0x60, 0x1, 0x60, 0xf, 0x60, 0x1, 0x60
-.db 0xf, 0x60, 0x1, 0x60, 0xf, 0x60, 0x1, 0x60
-.db 0xf, 0x60, 0x1, 0x60, 0x2, 0x60, 0x4, 0x44
-.db 0x8, 0x60, 0x1, 0x6e, 0x1, 0x60, 0x7, 0x60
-.db 0x3, 0x62, 0x4, 0x60, 0x1, 0x6e, 0x1, 0x6e
-.db 0x7, 0x60, 0x3, 0x62, 0x5, 0x60, 0x1, 0x6e
-.db 0x7, 0x60, 0x3, 0x62, 0x5, 0x60, 0x1, 0x60
-.db 0xf, 0x60, 0x1, 0x60, 0xf, 0x60, 0x1, 0x60
-.db 0xf, 0x60, 0x1, 0x60, 0xf, 0x60, 0x1, 0x62
-.db 0xe, 0x60, 0x1, 0x42
-.db 0x00 ; termiante data
-default_map_tile_flags:
-
-.db 0x27, 0x0, 0x4, 0x1, 0x48, 0x0, 0x4, 0x1
-.db 0x8, 0x0, 0x1, 0x2, 0xf, 0x0, 0x1, 0x2
-.db 0x1, 0x12, 0xf, 0x0, 0x1, 0x12, 0x5f, 0x0
-.db 0x00 ; termiante data

diff --git a/maps/map_c.s b/maps/map_c.s
new file mode 100644 (file)
index 0000000..3524d57
--- /dev/null
+++ b/maps/map_c.s
@@ -0,0 +1,34 @@
+map_c_header:
+.db 0, 0, 0, 0 ; flags
+.str "NONAME  "
+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
+dw map_c_exit_table
+
+map_c_bg:
+
+.db 0x1, 0x42, 0xe, 0x60, 0x1, 0x62, 0x1, 0x60
+.db 0xf, 0x60, 0x1, 0x60, 0x6, 0x60, 0x4, 0x44
+.db 0x5, 0x60, 0x1, 0x60, 0xf, 0x60, 0x1, 0x60
+.db 0xf, 0x60, 0x1, 0x60, 0xf, 0x60, 0x1, 0x60
+.db 0xf, 0x60, 0x1, 0x60, 0x2, 0x60, 0x4, 0x44
+.db 0x8, 0x60, 0x1, 0x6e, 0x1, 0x60, 0x7, 0x60
+.db 0x3, 0x62, 0x4, 0x60, 0x1, 0x6e, 0x1, 0x6e
+.db 0x7, 0x60, 0x3, 0x62, 0x5, 0x60, 0x1, 0x6e
+.db 0x7, 0x60, 0x3, 0x62, 0x5, 0x60, 0x1, 0x60
+.db 0xf, 0x60, 0x1, 0x60, 0xf, 0x60, 0x1, 0x60
+.db 0xf, 0x60, 0x1, 0x60, 0xf, 0x60, 0x1, 0x62
+.db 0xe, 0x60, 0x1, 0x42
+.db 0x00 ; termiante data
+map_c_tile_flags:
+
+.db 0x27, 0x0, 0x4, 0x1, 0x48, 0x0, 0x4, 0x1
+.db 0x8, 0x0, 0x1, 0x2, 0xf, 0x0, 0x1, 0x2
+.db 0x1, 0x12, 0xf, 0x0, 0x1, 0x12, 0x5f, 0x0
+.db 0x00 ; termiante data

diff --git a/maps/map_ce.s b/maps/map_ce.s
new file mode 100644 (file)
index 0000000..ce05bed
--- /dev/null
+++ b/maps/map_ce.s
@@ -0,0 +1,33 @@
+map_ce_header:
+.db 0, 0, 0, 0 ; flags
+.str "NONAME  "
+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
+dw map_ce_exit_table
+
+map_ce_bg:
+
+.db 0x1, 0x62, 0xe, 0x60, 0x1, 0x42, 0x1, 0x60
+.db 0xf, 0x60, 0x1, 0x60, 0x6, 0x60, 0x4, 0x44
+.db 0x5, 0x60, 0x1, 0x60, 0xf, 0x60, 0x1, 0x60
+.db 0xf, 0x60, 0x1, 0x60, 0xf, 0x60, 0x1, 0x60
+.db 0xf, 0x60, 0x1, 0x6e, 0x2, 0x60, 0x4, 0x44
+.db 0x9, 0x60, 0x1, 0x6e, 0x7, 0x60, 0x3, 0x62
+.db 0x5, 0x60, 0x1, 0x60, 0x7, 0x60, 0x3, 0x62
+.db 0x5, 0x60, 0x1, 0x60, 0x7, 0x60, 0x3, 0x62
+.db 0x5, 0x60, 0x1, 0x60, 0xf, 0x60, 0x1, 0x60
+.db 0xf, 0x60, 0x1, 0x60, 0xf, 0x60, 0x1, 0x60
+.db 0xf, 0x60, 0x1, 0x42, 0xe, 0x60, 0x1, 0x62
+.db 0x00 ; termiante data
+map_ce_tile_flags:
+
+.db 0x27, 0x0, 0x4, 0x1, 0x45, 0x0, 0x1, 0x2
+.db 0x2, 0x0, 0x4, 0x1, 0x9, 0x0, 0x1, 0x2
+.db 0x7f, 0x0
+.db 0x00 ; termiante data

diff --git a/maps/map_cw.s b/maps/map_cw.s
new file mode 100644 (file)
index 0000000..3adb6c0
--- /dev/null
+++ b/maps/map_cw.s
@@ -0,0 +1,33 @@
+map_cw_header:
+.db 0, 0, 0, 0 ; flags
+.str "NONAME  "
+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
+dw map_cw_exit_table
+
+map_cw_bg:
+
+.db 0x1, 0x42, 0xf, 0x42, 0x1, 0x42, 0xf, 0x42
+.db 0x1, 0x42, 0xf, 0x42, 0x1, 0x42, 0xf, 0x42
+.db 0x1, 0x42, 0xf, 0x42, 0x1, 0x42, 0x6, 0x42
+.db 0x2, 0x46, 0x7, 0x42, 0x1, 0x42, 0x6, 0x42
+.db 0x2, 0x46, 0x7, 0x42, 0x1, 0x42, 0x6, 0x42
+.db 0x2, 0x46, 0x7, 0x42, 0x1, 0x42, 0x6, 0x42
+.db 0x2, 0x46, 0x7, 0x42, 0x1, 0x42, 0x6, 0x42
+.db 0x8, 0x46, 0x1, 0x6e, 0x1, 0x42, 0x6, 0x42
+.db 0x8, 0x46, 0x1, 0x6e, 0x1, 0x42, 0xf, 0x42
+.db 0x1, 0x42, 0xf, 0x42, 0x1, 0x42, 0xf, 0x42
+.db 0x1, 0x42, 0xf, 0x42, 0x1, 0x42, 0xe, 0x42
+.db 0x1, 0x42
+.db 0x00 ; termiante data
+map_cw_tile_flags:
+
+.db 0x9f, 0x0, 0x1, 0x2, 0xf, 0x0, 0x1, 0x2
+.db 0x50, 0x0
+.db 0x00 ; termiante data

diff --git a/maps/start_map.s b/maps/start_map.s
deleted file mode 100644 (file)
index a26ad20..0000000
--- a/maps/start_map.s
+++ /dev/null
@@ -1,33 +0,0 @@
-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 start_map_exit_table
-
-start_map_bg:
-
-.db 0x1, 0x62, 0xe, 0x60, 0x1, 0x42, 0x1, 0x60
-.db 0xf, 0x60, 0x1, 0x60, 0x6, 0x60, 0x4, 0x44
-.db 0x5, 0x60, 0x1, 0x60, 0xf, 0x60, 0x1, 0x60
-.db 0xf, 0x60, 0x1, 0x60, 0xf, 0x60, 0x1, 0x60
-.db 0xf, 0x60, 0x1, 0x6e, 0x2, 0x60, 0x4, 0x44
-.db 0x9, 0x60, 0x1, 0x6e, 0x7, 0x60, 0x3, 0x62
-.db 0x5, 0x60, 0x1, 0x60, 0x7, 0x60, 0x3, 0x62
-.db 0x5, 0x60, 0x1, 0x60, 0x7, 0x60, 0x3, 0x62
-.db 0x5, 0x60, 0x1, 0x60, 0xf, 0x60, 0x1, 0x60
-.db 0xf, 0x60, 0x1, 0x60, 0xf, 0x60, 0x1, 0x60
-.db 0xf, 0x60, 0x1, 0x42, 0xe, 0x60, 0x1, 0x62
-.db 0x00 ; termiante data
-start_map_tile_flags:
-
-.db 0x27, 0x0, 0x4, 0x1, 0x45, 0x0, 0x1, 0x2
-.db 0x2, 0x0, 0x4, 0x1, 0x9, 0x0, 0x1, 0x2
-.db 0x7f, 0x0
-.db 0x00 ; termiante data

diff --git a/maps/west_woods_map.s b/maps/west_woods_map.s
deleted file mode 100644 (file)
index e30146e..0000000
--- a/maps/west_woods_map.s
+++ /dev/null
@@ -1,33 +0,0 @@
-west_woods_map_header:
-.db 0, 0, 0, 0 ; flags
-.str "NONAME  "
-dw west_woods_map_bg
-dw west_woods_map_tile_flags
-dw st_map_null
-dw map_actor_table_null
-dw bank8000
-dw bank8800
-dw bank8C00
-dw bank9000
-dw west_woods_map_exit_table
-
-west_woods_map_bg:
-
-.db 0x1, 0x42, 0xf, 0x42, 0x1, 0x42, 0xf, 0x42
-.db 0x1, 0x42, 0xf, 0x42, 0x1, 0x42, 0xf, 0x42
-.db 0x1, 0x42, 0xf, 0x42, 0x1, 0x42, 0x6, 0x42
-.db 0x2, 0x46, 0x7, 0x42, 0x1, 0x42, 0x6, 0x42
-.db 0x2, 0x46, 0x7, 0x42, 0x1, 0x42, 0x6, 0x42
-.db 0x2, 0x46, 0x7, 0x42, 0x1, 0x42, 0x6, 0x42
-.db 0x2, 0x46, 0x7, 0x42, 0x1, 0x42, 0x6, 0x42
-.db 0x8, 0x46, 0x1, 0x6e, 0x1, 0x42, 0x6, 0x42
-.db 0x8, 0x46, 0x1, 0x6e, 0x1, 0x42, 0xf, 0x42
-.db 0x1, 0x42, 0xf, 0x42, 0x1, 0x42, 0xf, 0x42
-.db 0x1, 0x42, 0xf, 0x42, 0x1, 0x42, 0xe, 0x42
-.db 0x1, 0x42
-.db 0x00 ; termiante data
-west_woods_map_tile_flags:
-
-.db 0x9f, 0x0, 0x1, 0x2, 0xf, 0x0, 0x1, 0x2
-.db 0x50, 0x0
-.db 0x00 ; termiante data

diff --git a/src/actortables.s b/src/actortables.s
index 64e0dd053de80e4dfe40a1cb84716629607e32c7..c6029d9479e474e381b0e146d8d29e76d0237cdc 100644 (file)
--- a/src/actortables.s
+++ b/src/actortables.s
@@ -1,6 +1,6 @@
 #include "unit_demo.s"
 
-default_map_actor_table:
+map_c_actor_table:
 .db 10 ; size
 dw unit_demo_2
 dw unit_demo_warrior

diff --git a/src/exittables.s b/src/exittables.s
index 6a698b387f43402bc30916ad325367bf11432edc..2429516056f67bb7979b76687a6257d5c7f04756 100644 (file)
--- a/src/exittables.s
+++ b/src/exittables.s
@@ -1,9 +1,9 @@
-default_map_exit_table:
-exit_def EXITF_GOTOXY_REL, BTNRIGHT, 0, -15, start_map_header 
-exit_def EXITF_GOTOXY_REL, BTNLEFT, 0, 15, west_woods_map_header 
+map_c_exit_table:
+exit_def EXITF_GOTOXY_REL, BTNRIGHT, 0, -15, map_ce_header 
+exit_def EXITF_GOTOXY_REL, BTNLEFT, 0, 15, map_cw_header 
 
-start_map_exit_table:
-exit_def EXITF_GOTOXY_REL, BTNLEFT, 0, 15, default_map_header
+map_ce_exit_table:
+exit_def EXITF_GOTOXY_REL, BTNLEFT, 0, 15, map_c_header 
 
-west_woods_map_exit_table:
-exit_def EXITF_GOTOXY_REL, BTNRIGHT, 0, -15, default_map_header 
+map_cw_exit_table:
+exit_def EXITF_GOTOXY_REL, BTNRIGHT, 0, -15, map_c_header 

diff --git a/src/mainmenu.s b/src/mainmenu.s
index df26ed9d349b4626f079c27576da60324d5a6fe9..eec7f28ee30729e95ddfe7e11768367021ba565f 100644 (file)
--- a/src/mainmenu.s
+++ b/src/mainmenu.s
@@ -104,7 +104,7 @@ main_menu_init:
   call unit_load_default_player
 
   ; load tile banks of default map
-  ld hl, default_map_header
+  ld hl, map_c_header
   call map_tile_banks_load
   
 

diff --git a/src/map.s b/src/map.s
index 22330a6d3ac57edb488ba82f8d35ce8ae2ecae89..e952bf71fcf0e9017ffee72618f0bbff248b986e 100644 (file)
--- a/src/map.s
+++ b/src/map.s
@@ -1,7 +1,7 @@
 
   ; initial map setup
 map_init:
-  ld hl, default_map_header 
+  ld hl, map_c_header 
 
   ; loads a new map
   ; inputs:
@@ -515,6 +515,6 @@ map_null_state:
   ldnull bc
   ret
 
-#include "default_map.s"
-#include "start_map.s"
-#include "west_woods_map.s"
+#include "map_c.s"
+#include "map_ce.s"
+#include "map_cw.s"

diff --git a/tools/tms2map.py b/tools/tms2map.py
index d2e950409e42596450a46495c1ccdcbadf60fdbf..64a99cf6ec626d3f92decb4da3aec5c34b6d487d 100755 (executable)
--- a/tools/tms2map.py
+++ b/tools/tms2map.py
@@ -13,7 +13,7 @@ tile_bank0 = "bank8000"
 tile_bank1 = "bank8800"
 tile_bank2 = "bank8C00"
 tile_bank3 = "bank9000"
-exit_table = "default_map_exit_table"
+exit_table = "map_c_exit_table"
 actor_table_ptr = "map_actor_table_null"
 map_name = "noname"
 NAME_LEN = 8