From 87d94e036d945e417944be6e6adc6628daa63520 Mon Sep 17 00:00:00 2001 From: Lukas Krickl Date: Sat, 19 Jul 2025 17:03:42 +0200 Subject: [PATCH] maps: renamed maps to indicate their direction. This is because maps will just serve as a template for room placement soon. --- makefile | 6 +++--- maps/{default_map.s => map_c.s} | 14 +++++++------- maps/{start_map.s => map_ce.s} | 12 ++++++------ maps/{west_woods_map.s => map_cw.s} | 12 ++++++------ src/actortables.s | 2 +- src/exittables.s | 14 +++++++------- src/mainmenu.s | 2 +- src/map.s | 8 ++++---- tools/tms2map.py | 2 +- 9 files changed, 36 insertions(+), 36 deletions(-) rename maps/{default_map.s => map_c.s} (84%) rename maps/{start_map.s => map_ce.s} (87%) rename maps/{west_woods_map.s => map_cw.s} (83%) diff --git a/makefile b/makefile index 55c026a..ad453b3 100644 --- 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/map_c.s similarity index 84% rename from maps/default_map.s rename to maps/map_c.s index d650c8a..3524d57 100644 --- a/maps/default_map.s +++ b/maps/map_c.s @@ -1,17 +1,17 @@ -default_map_header: +map_c_header: .db 0, 0, 0, 0 ; flags .str "NONAME " -dw default_map_bg -dw default_map_tile_flags +dw map_c_bg +dw map_c_tile_flags dw st_map_null -dw default_map_actor_table +dw map_c_actor_table dw bank8000 dw bank8800 dw bank8C00 dw bank9000 -dw default_map_exit_table +dw map_c_exit_table -default_map_bg: +map_c_bg: .db 0x1, 0x42, 0xe, 0x60, 0x1, 0x62, 0x1, 0x60 .db 0xf, 0x60, 0x1, 0x60, 0x6, 0x60, 0x4, 0x44 @@ -26,7 +26,7 @@ default_map_bg: .db 0xf, 0x60, 0x1, 0x60, 0xf, 0x60, 0x1, 0x62 .db 0xe, 0x60, 0x1, 0x42 .db 0x00 ; termiante data -default_map_tile_flags: +map_c_tile_flags: .db 0x27, 0x0, 0x4, 0x1, 0x48, 0x0, 0x4, 0x1 .db 0x8, 0x0, 0x1, 0x2, 0xf, 0x0, 0x1, 0x2 diff --git a/maps/start_map.s b/maps/map_ce.s similarity index 87% rename from maps/start_map.s rename to maps/map_ce.s index a26ad20..ce05bed 100644 --- a/maps/start_map.s +++ b/maps/map_ce.s @@ -1,17 +1,17 @@ -start_map_header: +map_ce_header: .db 0, 0, 0, 0 ; flags .str "NONAME " -dw start_map_bg -dw start_map_tile_flags +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 start_map_exit_table +dw map_ce_exit_table -start_map_bg: +map_ce_bg: .db 0x1, 0x62, 0xe, 0x60, 0x1, 0x42, 0x1, 0x60 .db 0xf, 0x60, 0x1, 0x60, 0x6, 0x60, 0x4, 0x44 @@ -25,7 +25,7 @@ start_map_bg: .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: +map_ce_tile_flags: .db 0x27, 0x0, 0x4, 0x1, 0x45, 0x0, 0x1, 0x2 .db 0x2, 0x0, 0x4, 0x1, 0x9, 0x0, 0x1, 0x2 diff --git a/maps/west_woods_map.s b/maps/map_cw.s similarity index 83% rename from maps/west_woods_map.s rename to maps/map_cw.s index e30146e..3adb6c0 100644 --- a/maps/west_woods_map.s +++ b/maps/map_cw.s @@ -1,17 +1,17 @@ -west_woods_map_header: +map_cw_header: .db 0, 0, 0, 0 ; flags .str "NONAME " -dw west_woods_map_bg -dw west_woods_map_tile_flags +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 west_woods_map_exit_table +dw map_cw_exit_table -west_woods_map_bg: +map_cw_bg: .db 0x1, 0x42, 0xf, 0x42, 0x1, 0x42, 0xf, 0x42 .db 0x1, 0x42, 0xf, 0x42, 0x1, 0x42, 0xf, 0x42 @@ -26,7 +26,7 @@ west_woods_map_bg: .db 0x1, 0x42, 0xf, 0x42, 0x1, 0x42, 0xe, 0x42 .db 0x1, 0x42 .db 0x00 ; termiante data -west_woods_map_tile_flags: +map_cw_tile_flags: .db 0x9f, 0x0, 0x1, 0x2, 0xf, 0x0, 0x1, 0x2 .db 0x50, 0x0 diff --git a/src/actortables.s b/src/actortables.s index 64e0dd0..c6029d9 100644 --- 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 6a698b3..2429516 100644 --- 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 df26ed9..eec7f28 100644 --- 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 22330a6..e952bf7 100644 --- 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 d2e9504..64a99cf 100755 --- 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 -- 2.30.2