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

Identify some missed bit 7 menu flags

Browse Source
This commit is contained in:
Rangi42
2024-12-02 12:20:52 -05:00
parent 03a1c6efad
commit 99af3f4f3b
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
engine/link/link_trade.asm
View File

@@ -203,7 +203,7 @@ LinkTradeMenu:
.MenuAction: .MenuAction:
ld hl, w2DMenuFlags2 ld hl, w2DMenuFlags2
res 7, [hl] res _2DMENU_EXITING_F, [hl]
ldh a, [hBGMapMode] ldh a, [hBGMapMode]
push af push af
call .loop call .loop
@@ -219,7 +219,7 @@ LinkTradeMenu:
farcall _2DMenuInterpretJoypad farcall _2DMenuInterpretJoypad
jr c, .done jr c, .done
ld a, [w2DMenuFlags1] ld a, [w2DMenuFlags1]
bit 7, a bit _2DMENU_DISABLE_JOYPAD_FILTER_F, a
jr nz, .done jr nz, .done
call .GetJoypad call .GetJoypad
ld b, a ld b, a
@@ -247,7 +247,7 @@ LinkTradeMenu:
call .TryAnims call .TryAnims
ret c ret c
ld a, [w2DMenuFlags1] ld a, [w2DMenuFlags1]
bit 7, a bit _2DMENU_DISABLE_JOYPAD_FILTER_F, a
jr z, .loop2 jr z, .loop2
and a and a
ret ret

2
engine/menus/menu.asm
View File

@@ -32,7 +32,7 @@ _InterpretMobileMenu::
call ApplyTilemap call ApplyTilemap
call Init2DMenuCursorPosition call Init2DMenuCursorPosition
ld hl, w2DMenuFlags1 ld hl, w2DMenuFlags1
set 7, [hl] set _2DMENU_DISABLE_JOYPAD_FILTER_F, [hl]
.loop .loop
call DelayFrame call DelayFrame
farcall Function10032e farcall Function10032e