From 1b19403bafcc468eb94c2fa009e2e37e08e78a28 Mon Sep 17 00:00:00 2001 From: Lukas Krickl Date: Sun, 20 Jul 2025 05:23:36 +0200 Subject: [PATCH] maps: Added additional template maps --- makefile | 6 ++++++ maps/map_bc.s | 34 ++++++++++++++++++++++++++++++++++ maps/map_be.s | 33 +++++++++++++++++++++++++++++++++ maps/map_bw.s | 33 +++++++++++++++++++++++++++++++++ maps/map_tc.s | 34 ++++++++++++++++++++++++++++++++++ maps/map_te.s | 33 +++++++++++++++++++++++++++++++++ maps/map_tw.s | 33 +++++++++++++++++++++++++++++++++ src/map.s | 8 ++++++++ 8 files changed, 214 insertions(+) create mode 100644 maps/map_bc.s create mode 100644 maps/map_be.s create mode 100644 maps/map_bw.s create mode 100644 maps/map_tc.s create mode 100644 maps/map_te.s create mode 100644 maps/map_tw.s diff --git a/makefile b/makefile index ad453b3..cc44b29 100644 --- a/makefile +++ b/makefile @@ -21,3 +21,9 @@ 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 diff --git a/maps/map_bc.s b/maps/map_bc.s new file mode 100644 index 0000000..8c72602 --- /dev/null +++ b/maps/map_bc.s @@ -0,0 +1,34 @@ +map_bc_header: +.db 0, 0, 0, 0 ; flags +.str "NONAME " +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 +dw map_c_exit_table + +map_bc_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_bc_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_be.s b/maps/map_be.s new file mode 100644 index 0000000..1705d48 --- /dev/null +++ b/maps/map_be.s @@ -0,0 +1,33 @@ +map_be_header: +.db 0, 0, 0, 0 ; flags +.str "NONAME " +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 +dw map_cw_exit_table + +map_be_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_be_tile_flags: + +.db 0x9f, 0x0, 0x1, 0x2, 0xf, 0x0, 0x1, 0x2 +.db 0x50, 0x0 +.db 0x00 ; termiante data diff --git a/maps/map_bw.s b/maps/map_bw.s new file mode 100644 index 0000000..b79c55a --- /dev/null +++ b/maps/map_bw.s @@ -0,0 +1,33 @@ +map_bw_header: +.db 0, 0, 0, 0 ; flags +.str "NONAME " +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 +dw map_cw_exit_table + +map_bw_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_bw_tile_flags: + +.db 0x9f, 0x0, 0x1, 0x2, 0xf, 0x0, 0x1, 0x2 +.db 0x50, 0x0 +.db 0x00 ; termiante data diff --git a/maps/map_tc.s b/maps/map_tc.s new file mode 100644 index 0000000..e55dd49 --- /dev/null +++ b/maps/map_tc.s @@ -0,0 +1,34 @@ +map_tc_header: +.db 0, 0, 0, 0 ; flags +.str "NONAME " +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 +dw map_c_exit_table + +map_tc_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_tc_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_te.s b/maps/map_te.s new file mode 100644 index 0000000..150bda1 --- /dev/null +++ b/maps/map_te.s @@ -0,0 +1,33 @@ +map_te_header: +.db 0, 0, 0, 0 ; flags +.str "NONAME " +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 +dw map_cw_exit_table + +map_te_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_te_tile_flags: + +.db 0x9f, 0x0, 0x1, 0x2, 0xf, 0x0, 0x1, 0x2 +.db 0x50, 0x0 +.db 0x00 ; termiante data diff --git a/maps/map_tw.s b/maps/map_tw.s new file mode 100644 index 0000000..efec5d1 --- /dev/null +++ b/maps/map_tw.s @@ -0,0 +1,33 @@ +map_tw_header: +.db 0, 0, 0, 0 ; flags +.str "NONAME " +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 +dw map_cw_exit_table + +map_tw_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_tw_tile_flags: + +.db 0x9f, 0x0, 0x1, 0x2, 0xf, 0x0, 0x1, 0x2 +.db 0x50, 0x0 +.db 0x00 ; termiante data diff --git a/src/map.s b/src/map.s index e952bf7..22c28c6 100644 --- a/src/map.s +++ b/src/map.s @@ -518,3 +518,11 @@ map_null_state: #include "map_c.s" #include "map_ce.s" #include "map_cw.s" + +#include "map_te.s" +#include "map_tc.s" +#include "map_tw.s" + +#include "map_be.s" +#include "map_bc.s" +#include "map_bw.s" -- 2.30.2