From 6f0b81504d6471afe7df6adae83791cc81933ca6 Mon Sep 17 00:00:00 2001 From: xCrystal Date: Tue, 2 Jan 2018 16:04:21 +0100 Subject: More unreferenced labels cleanup --- home/menu.asm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'home/menu.asm') diff --git a/home/menu.asm b/home/menu.asm index 03cec64df..57277acd5 100644 --- a/home/menu.asm +++ b/home/menu.asm @@ -28,8 +28,7 @@ MenuTextBox:: ; 1d4f jp PrintText ; 1d57 -ret_1d57:: ; 1d57 -; unreferenced +; unused ret ; 1d58 @@ -453,8 +452,7 @@ PlaceNthMenuStrings:: ; 1f8d ret ; 1f9e -Function1f9e:: ; 1f9e -; unreferenced +Unreferenced_Function1f9e:: ; 1f9e call GetMenuDataPointerTableEntry inc hl inc hl -- cgit v1.2.3 From 9d0ba6bfd3b2f10fae9969a784aa7b2b573e8411 Mon Sep 17 00:00:00 2001 From: Adelaide Walter Date: Wed, 3 Jan 2018 19:12:45 -0500 Subject: Use BANK for hardcoded WRAM banks (except where bankswitches appear unnecessary). --- home/menu.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'home/menu.asm') diff --git a/home/menu.asm b/home/menu.asm index 03cec64df..2be46120d 100644 --- a/home/menu.asm +++ b/home/menu.asm @@ -499,7 +499,7 @@ ClearWindowData:: ; 1fbf ld a, [rSVBK] push af - ld a, $7 + ld a, BANK(wWindowStack) ld [rSVBK], a xor a -- cgit v1.2.3 From a849c3557b8ee3dd2b464ccdc646aebd33d7b2a7 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Tue, 9 Jan 2018 15:39:48 -0500 Subject: More comments Fix some constants --- home/menu.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'home/menu.asm') diff --git a/home/menu.asm b/home/menu.asm index 03cec64df..b2aacf61e 100644 --- a/home/menu.asm +++ b/home/menu.asm @@ -517,7 +517,7 @@ ClearWindowData:: ; 1fbf ; 1ff0 .bytefill ; 1ff0 - ld bc, $0010 + ld bc, $10 xor a call ByteFill ret -- cgit v1.2.3 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) --- home/menu.asm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'home/menu.asm') diff --git a/home/menu.asm b/home/menu.asm index b2aacf61e..e44e1b2ca 100644 --- a/home/menu.asm +++ b/home/menu.asm @@ -41,8 +41,7 @@ LoadMenuTextBox:: ; 1d58 .MenuDataHeader: ; 1d5f db $40 ; tile backup - db 12, 0 ; start coords - db 17, 19 ; end coords + menu_coords 0, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1 dw vTiles0 db 0 ; default option ; 1d67 @@ -61,8 +60,7 @@ LoadStandardMenuDataHeader:: ; 1d6e .MenuDataHeader: ; 1d75 db $40 ; tile backup - db 0, 0 ; start coords - db 17, 19 ; end coords + menu_coords 0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1 dw 0 db 1 ; default option ; 1d7d @@ -184,8 +182,7 @@ InterpretTwoOptionMenu:: ; 1dfe YesNoMenuDataHeader:: ; 1e1d db $40 ; tile backup - db 5, 10 ; start coords - db 9, 15 ; end coords + menu_coords 10, 5, 15, 9 dw .MenuData2 db 1 ; default option ; 1e25 -- 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. --- home/menu.asm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'home/menu.asm') diff --git a/home/menu.asm b/home/menu.asm index 03cec64df..1495b3f36 100644 --- a/home/menu.asm +++ b/home/menu.asm @@ -40,7 +40,7 @@ LoadMenuTextBox:: ; 1d58 ; 1d5f .MenuDataHeader: ; 1d5f - db $40 ; tile backup + db MENU_BACKUP_TILES ; flags db 12, 0 ; start coords db 17, 19 ; end coords dw vTiles0 @@ -60,7 +60,7 @@ LoadStandardMenuDataHeader:: ; 1d6e ; 1d75 .MenuDataHeader: ; 1d75 - db $40 ; tile backup + db MENU_BACKUP_TILES ; flags db 0, 0 ; start coords db 17, 19 ; end coords dw 0 @@ -183,7 +183,7 @@ InterpretTwoOptionMenu:: ; 1dfe ; 1e1d YesNoMenuDataHeader:: ; 1e1d - db $40 ; tile backup + db MENU_BACKUP_TILES ; flags db 5, 10 ; start coords db 9, 15 ; end coords dw .MenuData2 @@ -191,7 +191,7 @@ YesNoMenuDataHeader:: ; 1e1d ; 1e25 .MenuData2: ; 1e25 - db $c0 ; flags + db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags db 2 db "YES@" db "NO@" -- cgit v1.2.3