Menu joy flags; started with link address space

This commit is contained in:
PikalaxALT
2015-12-20 12:54:08 -05:00
parent 987ed1fafb
commit 047effba94
18 changed files with 1279 additions and 1207 deletions

View File

@@ -488,7 +488,7 @@ Function4ab06: ; 4ab06
Function4ab1a: ; 4ab1a
.asm_4ab1a
ld a, $fb
ld [w2DMenuFlags4], a
ld [wMenuJoypadFilter], a
ld a, $26
ld [w2DMenuFlags3], a
ld a, $2

View File

@@ -2242,7 +2242,7 @@ Function89dab: ; 89dab (22:5dab)
callba MobileMenuJoypad
call Function8923c
ld a, c
ld hl, w2DMenuFlags4
ld hl, wMenuJoypadFilter
and [hl]
ret z
bit 0, a
@@ -3088,7 +3088,7 @@ Function8a31c: ; 8a31c (22:631c)
Function8a383: ; 8a383 (22:6383)
callba MobileMenuJoypad
ld a, c
ld hl, w2DMenuFlags4
ld hl, wMenuJoypadFilter
and [hl]
ret z
bit 0, a

View File

@@ -860,7 +860,7 @@ Function100545: ; 100545
Function10054d: ; 10054d
callba MobileMenuJoypad
ld a, c
ld hl, w2DMenuFlags4
ld hl, wMenuJoypadFilter
and [hl]
ret z
call MenuClickSound
@@ -1829,7 +1829,7 @@ Function100b45: ; 100b45
call Function100e2d
pop bc
jr c, .asm_100b6b
ld a, [w2DMenuFlags4]
ld a, [wMenuJoypadFilter]
and c
jr z, .asm_100b48
callba Mobile_GetMenuSelection
@@ -1890,7 +1890,7 @@ Function100bc2: ; 100bc2
call Function100e2d
pop bc
jr c, .asm_100c25
ld a, [w2DMenuFlags4]
ld a, [wMenuJoypadFilter]
and c
bit 6, a
jp nz, .asm_100bff
@@ -2021,7 +2021,7 @@ Function100cb5: ; 100cb5
call Function100dfd
pop bc
jr c, .asm_100d17
ld a, [w2DMenuFlags4]
ld a, [wMenuJoypadFilter]
and c
jr z, .asm_100cc0
call PlaceHollowCursor
@@ -2075,7 +2075,7 @@ MobileBattleMonMenu: ; 100d22
call Function100dfd
pop bc
jr c, .asm_100d54
ld a, [w2DMenuFlags4]
ld a, [wMenuJoypadFilter]
and c
jr nz, .asm_100d56
jr .asm_100d30
@@ -5722,7 +5722,7 @@ Function1025ff: ; 1025ff
callba Function1009f3
ret c
callba MobileMenuJoypad
ld a, [w2DMenuFlags4]
ld a, [wMenuJoypadFilter]
and c
ret z
bit 0, c
@@ -5784,7 +5784,7 @@ Function10266b: ; 10266b
callba Function1009f3
ret c
callba MobileMenuJoypad
ld a, [w2DMenuFlags4]
ld a, [wMenuJoypadFilter]
and c
ret z
bit 0, c
@@ -6327,7 +6327,7 @@ Function1029fe: ; 1029fe
ret c
callba MobileMenuJoypad
ld a, c
ld hl, w2DMenuFlags4
ld hl, wMenuJoypadFilter
and [hl]
ret z
push af

View File

@@ -1107,7 +1107,7 @@ Function16d734: ; 16d734
jr nz, .asm_16d758
call Function16d713
ld b, a
ld a, [w2DMenuFlags4]
ld a, [wMenuJoypadFilter]
and b
jr z, .asm_16d734

882
misc/mobile_menu.asm Executable file

File diff suppressed because it is too large Load Diff