From 8aa56174e9d1f6a4dac7d8ee8c58f56c206c9b15 Mon Sep 17 00:00:00 2001 From: Lukas Krickl Date: Sat, 5 Jul 2025 09:57:02 +0200 Subject: [PATCH] maps: wip added second map --- makefile | 1 + maps/start_map.s | 31 +++++++++++++++++++++++++++++++ src/exittables.s | 4 ++-- src/map.s | 1 + 4 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 maps/start_map.s diff --git a/makefile b/makefile index 30f3e12..ff23bed 100644 --- 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 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 ce89138..cee78df 100644 --- 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 0b1fa3a..76897f1 100644 --- a/src/map.s +++ b/src/map.s @@ -429,3 +429,4 @@ map_null_state: ret #include "default_map.s" +#include "start_map.s" -- 2.30.2