From 2e5546f828f998e048aecb2c34a072306b721f31 Mon Sep 17 00:00:00 2001 From: xCrystal Date: Sun, 21 Jan 2024 13:07:23 +0100 Subject: [PATCH] Adjust level selection menu tilemap to make room for two rows of text at the bottom (#12) --- data/levels/level_selection_menu.asm | 16 ++++++++-------- engine/menus/level_selection_menu.asm | 4 ++-- gfx/level_selection_menu/page_1.tilemap | Bin 361 -> 361 bytes gfx/level_selection_menu/page_2.tilemap | Bin 361 -> 361 bytes gfx/level_selection_menu/page_3.tilemap | Bin 361 -> 361 bytes gfx/level_selection_menu/page_4.tilemap | Bin 361 -> 361 bytes 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/data/levels/level_selection_menu.asm b/data/levels/level_selection_menu.asm index 8e0d07b27..320738026 100755 --- a/data/levels/level_selection_menu.asm +++ b/data/levels/level_selection_menu.asm @@ -19,14 +19,14 @@ ENDM LevelSelectionMenu_Landmarks: table_width 6, LevelSelectionMenu_Landmarks .landmark1 - level_selection_menu_landmark 0, 16, 12, .Level1LandmarkName, SPAWN_LEVEL_1 ; LANDMARK_LEVEL_1 + level_selection_menu_landmark 0, 16, 11, .Level1LandmarkName, SPAWN_LEVEL_1 ; LANDMARK_LEVEL_1 .landmark2 if DEF(_DEBUG) - level_selection_menu_landmark 0, 16, 11, .DebugLevel1LandmarkName, SPAWN_DEBUGLEVEL_1 ; LANDMARK_DEBUGLEVEL_1 - level_selection_menu_landmark 0, 11, 9, .DebugLevel2LandmarkName, SPAWN_DEBUGLEVEL_2 ; LANDMARK_DEBUGLEVEL_2 - level_selection_menu_landmark 0, 9, 11, .DebugLevel3LandmarkName, SPAWN_DEBUGLEVEL_3 ; LANDMARK_DEBUGLEVEL_3 - level_selection_menu_landmark 1, 16, 11, .DebugLevel4LandmarkName, SPAWN_DEBUGLEVEL_4 ; LANDMARK_DEBUGLEVEL_4 - level_selection_menu_landmark 2, 9, 5, .DebugLevel5LandmarkName, SPAWN_DEBUGLEVEL_5 ; LANDMARK_DEBUGLEVEL_5 + level_selection_menu_landmark 0, 16, 10, .DebugLevel1LandmarkName, SPAWN_DEBUGLEVEL_1 ; LANDMARK_DEBUGLEVEL_1 + level_selection_menu_landmark 0, 11, 8, .DebugLevel2LandmarkName, SPAWN_DEBUGLEVEL_2 ; LANDMARK_DEBUGLEVEL_2 + level_selection_menu_landmark 0, 9, 10, .DebugLevel3LandmarkName, SPAWN_DEBUGLEVEL_3 ; LANDMARK_DEBUGLEVEL_3 + level_selection_menu_landmark 1, 16, 10, .DebugLevel4LandmarkName, SPAWN_DEBUGLEVEL_4 ; LANDMARK_DEBUGLEVEL_4 + level_selection_menu_landmark 2, 9, 4, .DebugLevel5LandmarkName, SPAWN_DEBUGLEVEL_5 ; LANDMARK_DEBUGLEVEL_5 endc assert_table_length NUM_LANDMARKS @@ -82,7 +82,7 @@ if DEF(_DEBUG) level_selection_menu_landmark_transition RIGHT, FALSE ; LANDMARK_DEBUGLEVEL_3 - level_selection_menu_landmark_transition DOWN, 7, DOWN, 1, LANDMARK_DEBUGLEVEL_5 + level_selection_menu_landmark_transition DOWN, 7, LANDMARK_DEBUGLEVEL_5 level_selection_menu_landmark_transition UP, 5, RIGHT, 2, DOWN, 3, LANDMARK_DEBUGLEVEL_2 level_selection_menu_landmark_transition LEFT, 7, LEFT, 4, LANDMARK_DEBUGLEVEL_4 level_selection_menu_landmark_transition RIGHT, 7, LANDMARK_DEBUGLEVEL_1 @@ -95,7 +95,7 @@ if DEF(_DEBUG) ; LANDMARK_DEBUGLEVEL_5 level_selection_menu_landmark_transition DOWN, FALSE - level_selection_menu_landmark_transition UP, 7, UP, 1, LANDMARK_DEBUGLEVEL_3 + level_selection_menu_landmark_transition UP, 7, LANDMARK_DEBUGLEVEL_3 level_selection_menu_landmark_transition LEFT, FALSE level_selection_menu_landmark_transition RIGHT, FALSE endc diff --git a/engine/menus/level_selection_menu.asm b/engine/menus/level_selection_menu.asm index 046e692bb..a45a2837c 100755 --- a/engine/menus/level_selection_menu.asm +++ b/engine/menus/level_selection_menu.asm @@ -395,14 +395,14 @@ LevelSelectionMenu_DoPageChangeEvent: ; =------------------= ; =------------------= ; =------------------= -; =------------------= ; =========DD========= ; =========DD========= ; ==================== +; ==================== ; for movements spanning two pages, when one edge is reached, the page change occurs ; and the player appears in the other page at the coordinate of the new edge. ; hence, for calculating movement length, it's as if both pages were adjacent without the border frame. -DEF PAGE_EDGE_DOWN EQU $90 +DEF PAGE_EDGE_DOWN EQU $88 DEF PAGE_EDGE_UP EQU $10 DEF PAGE_EDGE_LEFT EQU $08 DEF PAGE_EDGE_RIGHT EQU $a8 diff --git a/gfx/level_selection_menu/page_1.tilemap b/gfx/level_selection_menu/page_1.tilemap index 891631fd753eb720dcd7b2af924e2eba700b7048..6ac788b5088f02799f5fc2a311a08973a0d81252 100755 GIT binary patch delta 14 VcmaFK^pa_U*hVca#>ozhngA&@1b_el delta 33 fcmaFK^pa_Um=LQV94M=Z0D<;K5go?KA&jB`aXJO> diff --git a/gfx/level_selection_menu/page_2.tilemap b/gfx/level_selection_menu/page_2.tilemap index 693ad4f66abd8ce23ae4113bdbc5da0154418f8d..e9cec72a51b0a883b089f1476d6b7bde47c97bff 100755 GIT binary patch delta 15 WcmaFK^pa_V1mk2KMvci1jG6!}83cs@ delta 34 lcmaFK^pa_V1f!6c1PDk(qu74t;r#bq5yp;20Q=& diff --git a/gfx/level_selection_menu/page_3.tilemap b/gfx/level_selection_menu/page_3.tilemap index 693ad4f66abd8ce23ae4113bdbc5da0154418f8d..e9cec72a51b0a883b089f1476d6b7bde47c97bff 100755 GIT binary patch delta 15 WcmaFK^pa_V1mk2KMvci1jG6!}83cs@ delta 34 lcmaFK^pa_V1f!6c1PDk(qu74t;r#bq5yp;20Q=& diff --git a/gfx/level_selection_menu/page_4.tilemap b/gfx/level_selection_menu/page_4.tilemap index 693ad4f66abd8ce23ae4113bdbc5da0154418f8d..e9cec72a51b0a883b089f1476d6b7bde47c97bff 100755 GIT binary patch delta 15 WcmaFK^pa_V1mk2KMvci1jG6!}83cs@ delta 34 lcmaFK^pa_V1f!6c1PDk(qu74t;r#bq5yp;20Q=&