Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Identify more bit flags (#1153)

Browse Source
This commit is contained in:
Sylvie
2024-11-29 19:29:30 -05:00
committed by GitHub
parent 8894e29da2
commit 644bd42fb0
78 changed files with 539 additions and 472 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
engine/menus/scrolling_menu.asm
View File

@@ -110,7 +110,7 @@ ScrollingMenuJoyAction:
.select
ld a, [wMenuDataFlags]
bit 7, a
bit SCROLLINGMENU_ENABLE_SELECT_F, a
jp z, xor_a_dec_a
ld a, [wMenuCursorY]
dec a
@@ -127,7 +127,7 @@ ScrollingMenuJoyAction:
.start
ld a, [wMenuDataFlags]
bit 6, a
bit SCROLLINGMENU_ENABLE_START_F, a
jp z, xor_a_dec_a
ld a, START
scf
@@ -135,10 +135,10 @@ ScrollingMenuJoyAction:
.d_left
ld hl, w2DMenuFlags2
bit 7, [hl]
bit _2DMENU_DISABLE_JOYPAD_FILTER_F, [hl]
jp z, xor_a_dec_a
ld a, [wMenuDataFlags]
bit 3, a
bit SCROLLINGMENU_ENABLE_LEFT_F, a
jp z, xor_a_dec_a
ld a, D_LEFT
scf
@@ -146,10 +146,10 @@ ScrollingMenuJoyAction:
.d_right
ld hl, w2DMenuFlags2
bit 7, [hl]
bit _2DMENU_DISABLE_JOYPAD_FILTER_F, [hl]
jp z, xor_a_dec_a
ld a, [wMenuDataFlags]
bit 2, a
bit SCROLLINGMENU_ENABLE_RIGHT_F, a
jp z, xor_a_dec_a
ld a, D_RIGHT
scf
@@ -157,7 +157,7 @@ ScrollingMenuJoyAction:
.d_up
ld hl, w2DMenuFlags2
bit 7, [hl]
bit _2DMENU_DISABLE_JOYPAD_FILTER_F, [hl]
jp z, xor_a
ld hl, wMenuScrollPosition
ld a, [hl]
@@ -171,7 +171,7 @@ ScrollingMenuJoyAction:
.d_down
ld hl, w2DMenuFlags2
bit 7, [hl]
bit _2DMENU_DISABLE_JOYPAD_FILTER_F, [hl]
jp z, xor_a
ld hl, wMenuScrollPosition
ld a, [wMenuData_ScrollingMenuHeight]
@@ -277,15 +277,15 @@ ScrollingMenu_InitFlags:
ld [w2DMenuNumRows], a
ld a, 1
ld [w2DMenuNumCols], a
ld a, $8c
bit 2, c
ld a, _2DMENU_EXIT_UP | _2DMENU_EXIT_DOWN | _2DMENU_DISABLE_JOYPAD_FILTER
bit SCROLLINGMENU_ENABLE_RIGHT_F, c
jr z, .skip_set_0
set 0, a
set _2DMENU_EXIT_RIGHT_F, a
.skip_set_0
bit 3, c
bit SCROLLINGMENU_ENABLE_LEFT_F, c
jr z, .skip_set_1
set 1, a
set _2DMENU_EXIT_LEFT_F, a
.skip_set_1
ld [w2DMenuFlags1], a
@@ -294,12 +294,12 @@ ScrollingMenu_InitFlags:
ld a, $20
ld [w2DMenuCursorOffsets], a
ld a, A_BUTTON | B_BUTTON | D_UP | D_DOWN
bit 7, c
bit SCROLLINGMENU_ENABLE_SELECT_F, c
jr z, .disallow_select
add SELECT
.disallow_select
bit 6, c
bit SCROLLINGMENU_ENABLE_START_F, c
jr z, .disallow_start
add START
@@ -345,7 +345,7 @@ ScrollingMenu_ValidateSwitchItem:
ScrollingMenu_UpdateDisplay:
call ClearWholeMenuBox
ld a, [wMenuDataFlags]
bit 4, a ; place arrows
bit SCROLLINGMENU_DISPLAY_ARROWS_F, a
jr z, .okay
ld a, [wMenuScrollPosition]
and a
@@ -385,7 +385,7 @@ ScrollingMenu_UpdateDisplay:
cp b
jr nz, .loop
ld a, [wMenuDataFlags]
bit 4, a ; place arrows
bit SCROLLINGMENU_DISPLAY_ARROWS_F, a
jr z, .done
ld a, [wMenuBorderBottomCoord]
ld b, a
@@ -399,7 +399,7 @@ ScrollingMenu_UpdateDisplay:
.cancel
ld a, [wMenuDataFlags]
bit 0, a ; call function on cancel
bit SCROLLINGMENU_CALL_FUNCTION1_CANCEL_F, a
jr nz, .call_function
ld de, .CancelString
call PlaceString
@@ -468,9 +468,9 @@ ScrollingMenu_PlaceCursor:
ScrollingMenu_CheckCallFunction3:
ld a, [wMenuDataFlags]
bit 5, a ; call function 3
bit SCROLLINGMENU_ENABLE_FUNCTION3_F, a
ret z
bit 1, a ; call function 3 if not switching items
bit SCROLLINGMENU_CALL_FUNCTION3_NO_SWITCH_F, a
jr z, .call
ld a, [wSwitchItem]
and a