maps: set up exit tables

diff --git a/maps/map_bc.s b/maps/map_bc.s
index 4705a8789c7d3ec9882d8822f12e5b22bba96783..77d76900232fcbed2c0fdf731a34e9d59c39aae9 100644 (file)
--- a/maps/map_bc.s
+++ b/maps/map_bc.s
@@ -9,7 +9,7 @@ dw bank8000
 dw bank8800
 dw bank8C00
 dw bank9000
-dw map_c_exit_table
+dw map_bc_exit_table
 
 map_bc_bg:
 

diff --git a/maps/map_be.s b/maps/map_be.s
index a9853e826e2183b0dae8f6321c16def2780a598d..d7a6d32922739f3c3789a191c201a380d1ea5e2a 100644 (file)
--- a/maps/map_be.s
+++ b/maps/map_be.s
@@ -9,7 +9,7 @@ dw bank8000
 dw bank8800
 dw bank8C00
 dw bank9000
-dw map_cw_exit_table
+dw map_bw_exit_table
 
 map_be_bg:
 

diff --git a/maps/map_bw.s b/maps/map_bw.s
index 53733b3a18277ac9a82e304916fb22a700631f16..188e2a009da4339e3f15c04a4ff6d604cfade232 100644 (file)
--- a/maps/map_bw.s
+++ b/maps/map_bw.s
@@ -9,7 +9,7 @@ dw bank8000
 dw bank8800
 dw bank8C00
 dw bank9000
-dw map_cw_exit_table
+dw map_bw_exit_table
 
 map_bw_bg:
 

diff --git a/maps/map_tc.s b/maps/map_tc.s
index d40f7f4b468c3b2da965a6a30cbe93dee4213851..6483d0f399511b0ded51ad11378897b33569fa2d 100644 (file)
--- a/maps/map_tc.s
+++ b/maps/map_tc.s
@@ -9,7 +9,7 @@ dw bank8000
 dw bank8800
 dw bank8C00
 dw bank9000
-dw map_c_exit_table
+dw map_tc_exit_table
 
 map_tc_bg:
 

diff --git a/maps/map_te.s b/maps/map_te.s
index 497f75643c76273601b752c86131ccacc260401f..c24dda3a0e900471ed57f559e7e442bc9dc7dd28 100644 (file)
--- a/maps/map_te.s
+++ b/maps/map_te.s
@@ -9,7 +9,7 @@ dw bank8000
 dw bank8800
 dw bank8C00
 dw bank9000
-dw map_cw_exit_table
+dw map_te_exit_table
 
 map_te_bg:
 

diff --git a/maps/map_tw.s b/maps/map_tw.s
index 4bd433d24a22b506dd64ace6b35c2f2a0c2c184d..3912de3a890e7baf52210780375c13853e0e785f 100644 (file)
--- a/maps/map_tw.s
+++ b/maps/map_tw.s
@@ -9,7 +9,7 @@ dw bank8000
 dw bank8800
 dw bank8C00
 dw bank9000
-dw map_cw_exit_table
+dw map_tw_exit_table
 
 map_tw_bg:
 

diff --git a/src/exittables.s b/src/exittables.s
index 2f9cadcac8eb14a043112b780c04dd89629658a0..ad25915fec422717b79ac35a46294e1ecdf79204 100644 (file)
--- a/src/exittables.s
+++ b/src/exittables.s
@@ -4,14 +4,56 @@
 ;   right: 2
 ;   up: 3
 
-map_c_exit_table:
+map_tc_exit_table:
+exit_def EXITF_GOTOXY_REL, BTNDOWN, -15, 0, map_c_header 
+exit_def EXITF_GOTOXY_REL, BTNLEFT, 0, 15, map_tw_header 
+exit_def EXITF_GOTOXY_REL, BTNRIGHT, 0, -15, map_te_header 
+exit_def EXITF_GOTOXY_REL, BTNUP, 15, 0, map_c_header 
+
+map_te_exit_table:
 exit_def EXITF_GOTOXY_REL, BTNDOWN, -15, 0, map_ce_header 
+exit_def EXITF_GOTOXY_REL, BTNLEFT, 0, 15, map_tc_header 
+exit_def EXITF_GOTOXY_REL, BTNRIGHT, 0, -15, map_c_header 
+exit_def EXITF_GOTOXY_REL, BTNUP, 15, 0, map_c_header 
+
+map_tw_exit_table:
+exit_def EXITF_GOTOXY_REL, BTNDOWN, -15, 0, map_cw_header 
+exit_def EXITF_GOTOXY_REL, BTNLEFT, 0, 15, map_c_header 
+exit_def EXITF_GOTOXY_REL, BTNRIGHT, 0, -15, map_tc_header 
+exit_def EXITF_GOTOXY_REL, BTNUP, 15, 0, map_c_header 
+
+map_c_exit_table:
+exit_def EXITF_GOTOXY_REL, BTNDOWN, -15, 0, map_bc_header 
 exit_def EXITF_GOTOXY_REL, BTNLEFT, 0, 15, map_cw_header 
-exit_def EXITF_GOTOXY_REL, BTNRIGHT, 0, -15, map_cw_header 
-exit_def EXITF_GOTOXY_REL, BTNUP, 15, 0, map_cw_header 
+exit_def EXITF_GOTOXY_REL, BTNRIGHT, 0, -15, map_ce_header 
+exit_def EXITF_GOTOXY_REL, BTNUP, 15, 0, map_tc_header 
 
 map_ce_exit_table:
+exit_def EXITF_GOTOXY_REL, BTNDOWN, -15, 0, map_be_header 
 exit_def EXITF_GOTOXY_REL, BTNLEFT, 0, 15, map_c_header 
+exit_def EXITF_GOTOXY_REL, BTNRIGHT, 0, -15, map_c_header 
+exit_def EXITF_GOTOXY_REL, BTNUP, 15, 0, map_te_header 
 
 map_cw_exit_table:
+exit_def EXITF_GOTOXY_REL, BTNDOWN, -15, 0, map_bw_header 
+exit_def EXITF_GOTOXY_REL, BTNLEFT, 0, 15, map_c_header 
 exit_def EXITF_GOTOXY_REL, BTNRIGHT, 0, -15, map_c_header 
+exit_def EXITF_GOTOXY_REL, BTNUP, 15, 0, map_tw_header 
+
+map_bc_exit_table:
+exit_def EXITF_GOTOXY_REL, BTNDOWN, -15, 0, map_c_header 
+exit_def EXITF_GOTOXY_REL, BTNLEFT, 0, 15, map_bw_header 
+exit_def EXITF_GOTOXY_REL, BTNRIGHT, 0, -15, map_be_header 
+exit_def EXITF_GOTOXY_REL, BTNUP, 15, 0, map_c_header 
+
+map_be_exit_table:
+exit_def EXITF_GOTOXY_REL, BTNDOWN, -15, 0, map_c_header 
+exit_def EXITF_GOTOXY_REL, BTNLEFT, 0, 15, map_bc_header 
+exit_def EXITF_GOTOXY_REL, BTNRIGHT, 0, -15, map_bc_header 
+exit_def EXITF_GOTOXY_REL, BTNUP, 15, 0, map_ce_header 
+
+map_bw_exit_table:
+exit_def EXITF_GOTOXY_REL, BTNDOWN, -15, 0, map_c_header 
+exit_def EXITF_GOTOXY_REL, BTNLEFT, 0, 15, map_c_header 
+exit_def EXITF_GOTOXY_REL, BTNRIGHT, 0, -15, map_bc_header 
+exit_def EXITF_GOTOXY_REL, BTNUP, 15, 0, map_cw_header