Menu joy flags; started with link address space

engine/learn.asm

@@ -158,7 +158,7 @@ ForgetMove: ; 65d3
 	ld [wMenuCursorY], a
 	ld [wMenuCursorX], a
 	ld a, $3
-	ld [w2DMenuFlags4], a
+	ld [wMenuJoypadFilter], a
 	ld a, $20
 	ld [w2DMenuFlags1], a
 	xor a

engine/menu.asm

@@ -42,7 +42,7 @@ _InterpretMobileMenu:: ; 2403c
 	and a
 	jr nz, .quit
 	call MobileMenuJoypad
-	ld a, [w2DMenuFlags4]
+	ld a, [wMenuJoypadFilter]
 	and c
 	jr z, .loop
 	call Mobile_GetMenuSelection
@@ -246,16 +246,16 @@ Init2DMenuCursorPosition: ; 2411a (9:411a)
 
 .InitFlags_c: ; 24193
 	ld hl, wMenuData2Flags
-	ld a, %001
+	ld a, A_BUTTON
 	bit 0, [hl]
 	jr nz, .skip
-	or %010
+	or B_BUTTON
 .skip
 	bit 1, [hl]
 	jr z, .skip2
-	or %100
+	or SELECT
 .skip2
-	ld [w2DMenuFlags4], a
+	ld [wMenuJoypadFilter], a
 	ret
 ; 241a8
 
@@ -307,7 +307,7 @@ Function241d5: ; 241d5
 	jr nz, .done
 	call GetMenuJoypad
 	ld c, a
-	ld a, [w2DMenuFlags4]
+	ld a, [wMenuJoypadFilter]
 	and c
 	jr z, .loop
 
@@ -345,7 +345,7 @@ MenuJoypadLoop: ; 24216
 	jr nz, .done
 	call GetMenuJoypad
 	ld b, a
-	ld a, [w2DMenuFlags4]
+	ld a, [wMenuJoypadFilter]
 	and b
 	jr z, .loop
 
@@ -812,11 +812,11 @@ _InitVerticalMenuCursor:: ; 2446d
 ; w2DMenuFlags3
 	ld a, %00100000
 	ld [hli], a
-; w2DMenuFlags4
-	ld a, %001
+; wMenuJoypadFilter
+	ld a, A_BUTTON
 	bit 0, b
 	jr nz, .skip_bit_1
-	add %010
+	add B_BUTTON
 .skip_bit_1
 	ld [hli], a
 ; wMenuCursorY

engine/party_menu.asm

@@ -693,12 +693,12 @@ InitPartyMenuWithCancel: ; 50405
 	jr c, .done
 
 .skip
-	ld a, $1
+	ld a, 1
 
 .done
 	ld [wMenuCursorY], a
 	ld a, A_BUTTON | B_BUTTON
-	ld [w2DMenuFlags4], a
+	ld [wMenuJoypadFilter], a
 	ret
 ; 5042d
 
@@ -716,11 +716,11 @@ InitPartyMenuNoCancel: ; 0x5042d
 	cp b
 	jr c, .done
 .skip
-	ld a, $1
+	ld a, 1
 .done
 	ld [wMenuCursorY], a
 	ld a, A_BUTTON | B_BUTTON
-	ld [w2DMenuFlags4], a
+	ld [wMenuJoypadFilter], a
 	ret
 ; 5044f (14:444f)
 

engine/scrolling_menu.asm

@@ -279,65 +279,64 @@ ScrollingMenu_InitFlags: ; 24764
 	ld a, [wScrollingMenuListSize]
 	ld b, a
 	ld a, [wMenuBorderTopCoord]
-	add $1
+	add 1
 	ld [w2DMenuCursorInitY], a
 	ld a, [wMenuBorderLeftCoord]
-	add $0
+	add 0
 	ld [w2DMenuCursorInitX], a
 	ld a, [wMenuData2_ScrollingMenuHeight]
 	cp b
-	jr c, .asm_24786
-	jr z, .asm_24786
+	jr c, .no_extra_row
+	jr z, .no_extra_row
 	ld a, b
 	inc a
-
-.asm_24786
+.no_extra_row
 	ld [w2DMenuNumRows], a
-	ld a, $1
+	ld a, 1
 	ld [w2DMenuNumCols], a
 	ld a, $8c
 	bit 2, c
-	jr z, .asm_24796
+	jr z, .skip_set_0
 	set 0, a
 
-.asm_24796
+.skip_set_0
 	bit 3, c
-	jr z, .asm_2479c
+	jr z, .skip_set_1
 	set 1, a
 
-.asm_2479c
+.skip_set_1
 	ld [w2DMenuFlags1], a
 	xor a
 	ld [w2DMenuFlags2], a
 	ld a, $20
 	ld [w2DMenuFlags3], a
-	ld a, $c3
+	ld a, A_BUTTON | B_BUTTON | D_UP | D_DOWN
 	bit 7, c
-	jr z, .asm_247b0
-	add $4
+	jr z, .disallow_select
+	add SELECT
 
-.asm_247b0
+.disallow_select
 	bit 6, c
-	jr z, .asm_247b6
-	add $8
+	jr z, .disallow_start
+	add START
 
-.asm_247b6
-	ld [w2DMenuFlags4], a
+.disallow_start
+	ld [wMenuJoypadFilter], a
 	ld a, [w2DMenuNumRows]
 	ld b, a
 	ld a, [wMenuCursorBuffer]
 	and a
-	jr z, .asm_247c8
+	jr z, .reset_cursor
 	cp b
-	jr z, .asm_247ca
-	jr c, .asm_247ca
+	jr z, .cursor_okay
+	jr c, .cursor_okay
 
-.asm_247c8
-	ld a, $1
+.reset_cursor
+	ld a, 1
 
-.asm_247ca
+.cursor_okay
 	ld [wMenuCursorY], a
-	ld a, $1
+	ld a, 1
 	ld [wMenuCursorX], a
 	xor a
 	ld [wCursorCurrentTile], a

engine/tmhm2.asm

@@ -216,8 +216,8 @@ TMHM_PocketLoop: ; 2c8d3 (b:48d3)
 	ld [w2DMenuFlags2], a
 	ld a, $20
 	ld [w2DMenuFlags3], a
-	ld a, $f3
-	ld [w2DMenuFlags4], a
+	ld a, A_BUTTON | B_BUTTON | D_UP | D_DOWN | D_LEFT | D_RIGHT
+	ld [wMenuJoypadFilter], a
 	ld a, [wTMHMPocketCursor]
 	inc a
 	ld [wMenuCursorY], a