From 2ab60fa8a49dfe9e20ebb620471ba4c2ca64a4aa Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Sat, 13 Jan 2018 16:38:14 -0500 Subject: menu_coords macro for (x1, y1, x2, y2) order (see issue #440) --- engine/delete_save_change_clock.asm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'engine/delete_save_change_clock.asm') diff --git a/engine/delete_save_change_clock.asm b/engine/delete_save_change_clock.asm index e77874e1c..6e9a37b71 100755 --- a/engine/delete_save_change_clock.asm +++ b/engine/delete_save_change_clock.asm @@ -48,8 +48,7 @@ _ResetClock: ; 4d3b1 .NoYes_MenuDataHeader: ; 0x4d40d db $00 ; flags - db 07, 14 ; start coords - db 11, 19 ; end coords + menu_coords 14, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 dw .NoYes_MenuData2 db 1 ; default option @@ -286,8 +285,7 @@ _DeleteSaveData: ; 4d54c .NoYesMenuDataHeader: ; 0x4d585 db $00 ; flags - db 07, 14 ; start coords - db 11, 19 ; end coords + menu_coords 14, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 dw .MenuData2 db 1 ; default option -- cgit v1.2.3 From 11d67567d2c0182864a755a7bebcff0f29e877d6 Mon Sep 17 00:00:00 2001 From: mid-kid Date: Sun, 14 Jan 2018 11:59:56 +0100 Subject: Use constants for menu flags Added a bunch of constants for the bitflags of each kind of menu. Some are slightly vague or too long, but I'm not sure how to else name them. --- engine/delete_save_change_clock.asm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'engine/delete_save_change_clock.asm') diff --git a/engine/delete_save_change_clock.asm b/engine/delete_save_change_clock.asm index e77874e1c..b00c1ccc4 100755 --- a/engine/delete_save_change_clock.asm +++ b/engine/delete_save_change_clock.asm @@ -47,14 +47,14 @@ _ResetClock: ; 4d3b1 db "@" .NoYes_MenuDataHeader: ; 0x4d40d - db $00 ; flags + db 0 ; flags db 07, 14 ; start coords db 11, 19 ; end coords dw .NoYes_MenuData2 db 1 ; default option .NoYes_MenuData2: ; 0x4d415 - db $c0 ; flags + db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags db 2 ; items db "NO@" db "YES@" @@ -285,14 +285,14 @@ _DeleteSaveData: ; 4d54c db "@" .NoYesMenuDataHeader: ; 0x4d585 - db $00 ; flags + db 0 ; flags db 07, 14 ; start coords db 11, 19 ; end coords dw .MenuData2 db 1 ; default option .MenuData2: ; 0x4d58d - db $c0 ; flags + db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags db 2 ; items db "NO@" db "YES@" -- cgit v1.2.3