From f3f5bda9e687038b001206caef34a9559b2e2304 Mon Sep 17 00:00:00 2001 From: Lukas Krickl Date: Sat, 11 Oct 2025 17:19:50 +0200 Subject: [PATCH] map: Added main menu map For now this map just loads l1 right away. In the future there will be a menu here :) --- src/main.s | 1 + src/mainmenu.s | 16 ++++++++++++++++ src/map.s | 7 +++++++ src/update.s | 2 +- 4 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 src/mainmenu.s diff --git a/src/main.s b/src/main.s index ca2b769..e0f331a 100644 --- a/src/main.s +++ b/src/main.s @@ -68,6 +68,7 @@ main: #include "actor.s" #include "rectangle.s" #include "projectile.s" +#include "mainmenu.s" #include "tiles.inc" #include "text.s" diff --git a/src/mainmenu.s b/src/mainmenu.s new file mode 100644 index 0000000..8004e89 --- /dev/null +++ b/src/mainmenu.s @@ -0,0 +1,16 @@ + + ; map routine that loads l1 +map_r_load_l1: + ld de, l1_map + call map_load + ret + +l_main_menu: + mapdef 0, pat_empty, l_main_menu_objs, bank8000, bank8800, bank8C00, bank9000 + +l_main_menu_objs: + modef MOT_SET_MAP_ROUTINE, 0, 0, map_r_load_l1 + modef MOT_DISABLE_SCROLL, 0, 0, 0 + modef MOT_NOP, 0, 0xFF, 0 + + diff --git a/src/map.s b/src/map.s index 93f00df..fa7c308 100644 --- a/src/map.s +++ b/src/map.s @@ -16,6 +16,13 @@ map_clear_routine: ; inputs: ; de: map ptr map_load: + ; clear row + xor a, a + ld [map_curr_row], a + + ; enable scroll + call mo_enable_scroll + ; clear map routine call map_clear_routine diff --git a/src/update.s b/src/update.s index 4248076..1c08a84 100644 --- a/src/update.s +++ b/src/update.s @@ -25,7 +25,7 @@ update_game: ret new_game: - ld de, l1_map + ld de, l_main_menu call map_load ld hl, update_game -- 2.30.2