summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
Diffstat (limited to 'misc')
-rwxr-xr-xmisc/fixed_words.asm8
-rwxr-xr-xmisc/mobile_12.asm30
-rwxr-xr-xmisc/mobile_12_2.asm50
-rw-r--r--misc/mobile_22.asm30
-rw-r--r--misc/mobile_22_2.asm6
-rw-r--r--misc/mobile_40.asm118
-rwxr-xr-xmisc/mobile_41.asm2
-rwxr-xr-xmisc/mobile_46.asm40
-rwxr-xr-xmisc/mobile_5b.asm16
-rw-r--r--misc/mobile_5f.asm18
10 files changed, 159 insertions, 159 deletions
diff --git a/misc/fixed_words.asm b/misc/fixed_words.asm
index e1f1caa30..4f56936a8 100755
--- a/misc/fixed_words.asm
+++ b/misc/fixed_words.asm
@@ -288,7 +288,7 @@ Function11c1ca: ; 11c1ca
ld [wcd2b], a
ld a, $ff
ld [wcd24], a
- ld a, [MenuSelection2]
+ ld a, [wMenuCursorY]
dec a
call Function11c254
call ClearBGPalettes
@@ -1733,7 +1733,7 @@ String_11cb31: ; 11cb31
Function11cb52: ; 11cb52 (47:4b52)
ld hl, Unknown_11cc01
- ld a, [MenuSelection2]
+ ld a, [wMenuCursorY]
.asm_11cb58
dec a
jr z, .asm_11cb5f
@@ -1771,7 +1771,7 @@ Function11cb66: ; 11cb66 (47:4b66)
ld a, $4
call GetSRAMBank
ld hl, $a007
- ld a, [MenuSelection2]
+ ld a, [wMenuCursorY]
dec a
sla a
sla a
@@ -1794,7 +1794,7 @@ Function11cb66: ; 11cb66 (47:4b66)
ld de, Unknown_11cfc6
call Function11cfce
ld hl, Unknown_11cc7e
- ld a, [MenuSelection2]
+ ld a, [wMenuCursorY]
.asm_11cbba
dec a
jr z, .asm_11cbc1
diff --git a/misc/mobile_12.asm b/misc/mobile_12.asm
index e8af6c8ac..63fa6df4a 100755
--- a/misc/mobile_12.asm
+++ b/misc/mobile_12.asm
@@ -114,15 +114,15 @@ InitMobileProfile: ; 4802f (12:402f)
call Function48187
call WaitBGMap2
call SetPalettes
- call Function1bc9
- ld hl, MenuSelection2
+ call StaticMenuJoypad
+ ld hl, wMenuCursorY
ld b, [hl]
push bc
jr asm_4815f
Function48157: ; 48157 (12:4157)
- call Function1bd3
- ld hl, MenuSelection2
+ call ScrollingMenuJoypad
+ ld hl, wMenuCursorY
ld b, [hl]
push bc
@@ -215,7 +215,7 @@ String_48202: ; 48202
Function4820d: ; 4820d (12:420d)
call Function1bee
- ld hl, MenuSelection2
+ ld hl, wMenuCursorY
ld a, [hl]
push af
ld a, [wd002]
@@ -235,7 +235,7 @@ Function4820d: ; 4820d (12:420d)
cp $4
jp z, Function488d3
ld a, $2
- call Function1ff8
+ call MenuClickSound
ld a, [wd002]
bit 6, a
jr z, .asm_4825c
@@ -301,12 +301,12 @@ asm_4828d: ; 4828d (12:428d)
ld a, [PlayerGender]
inc a
ld [wMenuCursorBuffer], a
- call Function1bc9
+ call StaticMenuJoypad
call PlayClickSFX
call ExitMenu
bit 0, a
jp z, Function4840c
- ld hl, MenuSelection2
+ ld hl, wMenuCursorY
ld a, [hl]
ld hl, Strings_484fb
cp $1
@@ -415,7 +415,7 @@ Function48383: ; 48383 (12:4383)
ld [wMenuScrollPosition], a
jr .asm_483af
.asm_483af
- ld hl, MenuSelection2
+ ld hl, wMenuCursorY
ld a, [hl]
ld [wMenuCursorBuffer], a
scf
@@ -493,7 +493,7 @@ Function4840c: ; 4840c (12:440c)
call PlaceString
call Function486bf
pop bc
- ld hl, MenuSelection2
+ ld hl, wMenuCursorY
ld [hl], b
ld a, [wd002]
bit 6, a
@@ -853,7 +853,7 @@ Function4876f: ; 4876f (12:476f)
call Function4880e
jr nc, .asm_487c6
ld a, $1
- call Function1ff8
+ call MenuClickSound
pop bc
jr nz, .asm_487da
ld a, b
@@ -1154,7 +1154,7 @@ asm_48972: ; 48972 (12:4972)
push de
push hl
ld a, $1
- call Function1ff8
+ call MenuClickSound
pop hl
pop de
pop bc
@@ -1221,7 +1221,7 @@ Function48a3a: ; 48a3a (12:4a3a)
ld a, $b
ld [wcfa2], a
ld a, $1
- ld [MenuSelection2], a
+ ld [wMenuCursorY], a
hlcoord 10, 8
ld b, $4
ld c, $8
@@ -1229,14 +1229,14 @@ Function48a3a: ; 48a3a (12:4a3a)
hlcoord 12, 10
ld de, String_48aa1
call PlaceString
- call Function1bc9
+ call StaticMenuJoypad
push af
call PlayClickSFX
call ExitMenu
pop af
bit 1, a
jp nz, Function48a9a
- ld a, [MenuSelection2]
+ ld a, [wMenuCursorY]
cp $1
jr z, .asm_48a98
ld a, [wd003]
diff --git a/misc/mobile_12_2.asm b/misc/mobile_12_2.asm
index 5b15f40d7..f8ebdbb00 100755
--- a/misc/mobile_12_2.asm
+++ b/misc/mobile_12_2.asm
@@ -494,7 +494,7 @@ Function4ab1a: ; 4ab1a
ld a, $2
ld [wcfa4], a
call Function4adf7
- call Function1bc9
+ call StaticMenuJoypad
call Function4abc3
jr c, .asm_4ab1a
push af
@@ -506,11 +506,11 @@ Function4ab1a: ; 4ab1a
ld a, [PartyCount]
inc a
ld b, a
- ld a, [MenuSelection2]
+ ld a, [wMenuCursorY]
ld [wd0d8], a
cp b
jr z, .asm_4ab7e
- ld a, [MenuSelection2]
+ ld a, [wMenuCursorY]
dec a
ld [CurPartyMon], a
ld c, a
@@ -527,7 +527,7 @@ Function4ab1a: ; 4ab1a
ret
.asm_4ab6d
- ld a, [MenuSelection2]
+ ld a, [wMenuCursorY]
ld [wd0d8], a
.asm_4ab73
ld de, SFX_READ_TEXT_2
@@ -539,7 +539,7 @@ Function4ab1a: ; 4ab1a
.asm_4ab7e
ld a, $1
ld [wd018], a
- ld a, [wcfaa]
+ ld a, [wMenuCursorX]
cp $2
jr z, .asm_4ab73
ld de, SFX_READ_TEXT_2
@@ -593,38 +593,38 @@ Function4abc3: ; 4abc3
jr z, .asm_4abd5
ld a, [PartyCount]
inc a
- ld [MenuSelection2], a
+ ld [wMenuCursorY], a
ld a, $1
- ld [wcfaa], a
+ ld [wMenuCursorX], a
jr .asm_4ac29
.asm_4abd5
bit 6, a
jr z, .asm_4abeb
- ld a, [MenuSelection2]
- ld [MenuSelection2], a
+ ld a, [wMenuCursorY]
+ ld [wMenuCursorY], a
and a
jr nz, .asm_4ac29
ld a, [PartyCount]
inc a
- ld [MenuSelection2], a
+ ld [wMenuCursorY], a
jr .asm_4ac29
.asm_4abeb
bit 7, a
jr z, .asm_4ac08
- ld a, [MenuSelection2]
- ld [MenuSelection2], a
+ ld a, [wMenuCursorY]
+ ld [wMenuCursorY], a
ld a, [PartyCount]
rept 2
inc a
endr
ld b, a
- ld a, [MenuSelection2]
+ ld a, [wMenuCursorY]
cp b
jr nz, .asm_4ac29
ld a, $1
- ld [MenuSelection2], a
+ ld [wMenuCursorY], a
jr .asm_4ac29
.asm_4ac08
@@ -634,20 +634,20 @@ endr
jr z, .asm_4ac56
.asm_4ac10
- ld a, [MenuSelection2]
+ ld a, [wMenuCursorY]
ld b, a
ld a, [PartyCount]
inc a
cp b
jr nz, .asm_4ac29
- ld a, [wcfaa]
+ ld a, [wMenuCursorX]
cp $1
jr z, .asm_4ac26
ld a, $1
jr .asm_4ac29
.asm_4ac26
- ld [wcfaa], a
+ ld [wMenuCursorX], a
.asm_4ac29
hlcoord 0, 1
@@ -662,14 +662,14 @@ endr
dec a
jr nz, .asm_4ac3b
ld [hl], $7f
- ld a, [MenuSelection2]
+ ld a, [wMenuCursorY]
ld b, a
ld a, [PartyCount]
inc a
cp b
jr z, .asm_4ac54
ld a, $1
- ld [wcfaa], a
+ ld [wMenuCursorX], a
.asm_4ac54
scf
@@ -747,10 +747,10 @@ Function4acaa: ; 4acaa
ld [wMenuBorderLeftCoord], a
ld a, $1
ld [wMenuCursorBuffer], a
- call Function1c10
+ call InitVerticalMenuCursor
ld hl, wcfa5
set 6, [hl]
- call Function1bc9
+ call StaticMenuJoypad
ld de, SFX_READ_TEXT_2
call PlaySFX
ld a, [hJoyPressed]
@@ -767,7 +767,7 @@ Function4acaa: ; 4acaa
ld a, [wd019]
bit 1, a
jr nz, .asm_4ad0e
- ld a, [MenuSelection2]
+ ld a, [wMenuCursorY]
cp $1
jr z, Function4ad17
cp $2
@@ -777,7 +777,7 @@ Function4acaa: ; 4acaa
jr .asm_4acf3
.asm_4ad0e
- ld a, [MenuSelection2]
+ ld a, [wMenuCursorY]
cp $1
jr z, Function4ad56
jr .asm_4acf3
@@ -927,9 +927,9 @@ Function4adf7: ; 4adf7
ret z
ld a, [PartyCount]
inc a
- ld [MenuSelection2], a
+ ld [wMenuCursorY], a
ld a, $1
- ld [wcfaa], a
+ ld [wMenuCursorX], a
ld a, [wd019]
res 0, a
ld [wd019], a
diff --git a/misc/mobile_22.asm b/misc/mobile_22.asm
index cdc596e6f..3a65dd1bb 100644
--- a/misc/mobile_22.asm
+++ b/misc/mobile_22.asm
@@ -251,7 +251,7 @@ Function89261: ; 89261
call BackUpTiles
call Function8923c
call Function89209
- call InterpretMenu2
+ call VerticalMenu
push af
ld c, $a
call DelayFrames
@@ -259,7 +259,7 @@ Function89261: ; 89261
call Function8920f
pop af
jr c, .done
- ld a, [MenuSelection2]
+ ld a, [wMenuCursorY]
cp $2
jr z, .done
and a
@@ -2198,8 +2198,8 @@ Function89d5e: ; 89d5e (22:5d5e)
pop af
ld [wMenuCursorBuffer], a
call Function8923c
- call Function1c89
- call Function1c10
+ call PlaceVerticalMenuItems
+ call InitVerticalMenuCursor
ld hl, wcfa5
set 7, [hl]
ret
@@ -2224,7 +2224,7 @@ asm_89d90: ; 89d90 (22:5d90)
push hl
call _hl_
call Function89dab
- ld a, [MenuSelection2]
+ ld a, [wMenuCursorY]
push af
call Function891ab
pop af
@@ -2239,7 +2239,7 @@ asm_89d90: ; 89d90 (22:5d90)
Function89dab: ; 89dab (22:5dab)
call Function8923c
- callba Function241ba
+ callba MobileMenuJoypad
call Function8923c
ld a, c
ld hl, wcfa8
@@ -2255,7 +2255,7 @@ Function89dab: ; 89dab (22:5dab)
call PlayClickSFX
ld a, [wcfa3]
ld c, a
- ld a, [MenuSelection2]
+ ld a, [wMenuCursorY]
cp c
jr z, .asm_89dd9
call Function1bee
@@ -2275,7 +2275,7 @@ Function89de0: ; 89de0 (22:5de0)
.asm_89dea
call Function8a31c
jr z, .asm_89dfd
- ld a, [MenuSelection2]
+ ld a, [wMenuCursorY]
ld c, a
push bc
ld hl, Jumptable_89e04
@@ -2784,7 +2784,7 @@ Function8a116: ; 8a116 (22:6116)
call Function8923c
call Function8a17b
jr c, .asm_8a16b
- ld a, [MenuSelection2]
+ ld a, [wMenuCursorY]
ld [wd030], a
dec d
jr z, .asm_8a140
@@ -2867,7 +2867,7 @@ Function8a1b0: ; 8a1b0
ld c, $12
call TextBox
hlcoord 1, 14
- ld a, [MenuSelection2]
+ ld a, [wMenuCursorY]
ld de, Strings_8a1cc
dec a
ld c, a
@@ -3054,8 +3054,8 @@ Function8a31c: ; 8a31c (22:631c)
ld a, c
ld [wMenuCursorBuffer], a
ld [MenuSelection], a
- call Function1c89
- call Function1c10
+ call PlaceVerticalMenuItems
+ call InitVerticalMenuCursor
ld hl, wcfa5
set 7, [hl]
.asm_8a34e
@@ -3086,7 +3086,7 @@ Function8a31c: ; 8a31c (22:631c)
ret
Function8a383: ; 8a383 (22:6383)
- callba Function241ba
+ callba MobileMenuJoypad
ld a, c
ld hl, wcfa8
and [hl]
@@ -3106,7 +3106,7 @@ Function8a383: ; 8a383 (22:6383)
ret
Function8a3a2: ; 8a3a2 (22:63a2)
- ld a, [MenuSelection2]
+ ld a, [wMenuCursorY]
dec a
ld hl, wd002
ld e, a
@@ -3834,7 +3834,7 @@ Function8a930: ; 8a930 (22:6930)
ld [wd0e3], a
.asm_8a943
call Function8b7bd
- ld a, [wcf73]
+ ld a, [wMenuJoypad]
and $1
jr nz, .asm_8a953
ld a, c
diff --git a/misc/mobile_22_2.asm b/misc/mobile_22_2.asm
index b794ba33a..e9e52bfeb 100644
--- a/misc/mobile_22_2.asm
+++ b/misc/mobile_22_2.asm
@@ -830,7 +830,7 @@ Function8b7bd: ; 8b7bd
call Function89209
call HandleScrollingMenu
call Function8920f
- ld a, [wcf73]
+ ld a, [wMenuJoypad]
cp $2
jr z, .asm_8b823
cp $20
@@ -854,7 +854,7 @@ Function8b7bd: ; 8b7bd
.asm_8b824
ld c, a
- ld a, [MenuSelection2]
+ ld a, [wMenuCursorY]
ld [wd030], a
ld a, [wMenuScrollPosition]
ld [wd031], a
@@ -880,7 +880,7 @@ Function8b83e: ; 8b83e
Function8b84b: ; 8b84b
ld [wMenuScrollPosition], a
- ld a, [MenuSelection2]
+ ld a, [wMenuCursorY]
ld [wMenuCursorBuffer], a
ret
; 8b855
diff --git a/misc/mobile_40.asm b/misc/mobile_40.asm
index f0ba0f957..a33f90952 100644
--- a/misc/mobile_40.asm
+++ b/misc/mobile_40.asm
@@ -89,7 +89,7 @@ Function100082: ; 100082
ld [hMapAnims], a
ld [hLCDStatCustom], a
ld a, $1
- ld [hFFC9], a
+ ld [hMobileReceive], a
ld [hMobile], a
ei
ret
@@ -98,7 +98,7 @@ Function100082: ; 100082
Function1000a4: ; 1000a4
di
xor a
- ld [hFFC9], a
+ ld [hMobileReceive], a
ld [hMobile], a
xor a
ld [hVBlank], a
@@ -173,7 +173,7 @@ Function1000fa: ; 1000fa
and $13
ld [rIE], a
xor a
- ld [hFFC9], a
+ ld [hMobileReceive], a
ld [hMobile], a
ei
@@ -818,8 +818,8 @@ Function100504: ; 100504
Function100513: ; 100513
call Function3f7c
- call Function1c89
- call Function1c10
+ call PlaceVerticalMenuItems
+ call InitVerticalMenuCursor
ld hl, wcfa5
set 7, [hl]
ret
@@ -858,12 +858,12 @@ Function100545: ; 100545
; 10054d
Function10054d: ; 10054d
- callba Function241ba
+ callba MobileMenuJoypad
ld a, c
ld hl, wcfa8
and [hl]
ret z
- call Function1ff8
+ call MenuClickSound
bit 0, a
jr nz, .asm_100565
bit 1, a
@@ -913,7 +913,7 @@ Function100597: ; 100597
ret z
jr nc, .asm_1005a6
xor a
- ld [MenuSelection2], a
+ ld [wMenuCursorY], a
.asm_1005a6
call ExitMenu
@@ -965,7 +965,7 @@ Function1005e1: ; 1005e1
ret z
jr nc, .asm_1005f0
xor a
- ld [MenuSelection2], a
+ ld [wMenuCursorY], a
.asm_1005f0
call ExitMenu
ld a, [wcd26]
@@ -1823,7 +1823,7 @@ Function100b45: ; 100b45
call Function100b7a
.asm_100b48
call Function100dd2
- callba Function241ba
+ callba MobileMenuJoypad
push bc
callba Function10402d
call Function100e2d
@@ -1832,7 +1832,7 @@ Function100b45: ; 100b45
ld a, [wcfa8]
and c
jr z, .asm_100b48
- callba Function24098
+ callba Mobile_GetMenuSelection
ret
.asm_100b6b
@@ -1849,11 +1849,11 @@ Function100b7a: ; 100b7a
ld hl, CopyMenuData2
ld a, [wcf94]
rst FarCall
- callba Function24085
+ callba Draw2DMenu
callba MobileTextBorder
call UpdateSprites
call ApplyTilemap
- callba Function2411a
+ callba Init2DMenuCursorPosition
ld hl, wcfa5
set 7, [hl]
ret
@@ -1884,7 +1884,7 @@ Function100bc2: ; 100bc2
callba MoveInfoBox
.asm_100bd1
call Function100dd2
- callba Function241ba
+ callba MobileMenuJoypad
push bc
callba Function10402d
call Function100e2d
@@ -1903,16 +1903,16 @@ Function100bc2: ; 100bc2
jr .asm_100bd1
.asm_100bff
- ld a, [MenuSelection2]
+ ld a, [wMenuCursorY]
and a
jp nz, .asm_100bcb
ld a, [wNumMoves]
inc a
- ld [MenuSelection2], a
+ ld [wMenuCursorY], a
jp .asm_100bcb
.asm_100c10
- ld a, [MenuSelection2]
+ ld a, [wMenuCursorY]
ld b, a
ld a, [wNumMoves]
rept 2
@@ -1921,11 +1921,11 @@ endr
cp b
jp nz, .asm_100bcb
ld a, $1
- ld [MenuSelection2], a
+ ld [wMenuCursorY], a
jp .asm_100bcb
.asm_100c25
- ld a, [MenuSelection2]
+ ld a, [wMenuCursorY]
dec a
ld [CurMoveNum], a
ld a, $1
@@ -1933,10 +1933,10 @@ endr
ret
.asm_100c30
- ld a, [MenuSelection2]
+ ld a, [wMenuCursorY]
dec a
ld [CurMoveNum], a
- ld a, [MenuSelection2]
+ ld a, [wMenuCursorY]
dec a
ld c, a
ld b, 0
@@ -1951,7 +1951,7 @@ endr
dec a
cp c
jr z, .asm_100c63
- ld a, [MenuSelection2]
+ ld a, [wMenuCursorY]
dec a
ld c, a
ld b, 0
@@ -1999,7 +1999,7 @@ Function100c98: ; 100c98
ld [wcfa3], a
ld a, [CurMoveNum]
inc a
- ld [MenuSelection2], a
+ ld [wMenuCursorY], a
ret
; 100cad
@@ -2014,7 +2014,7 @@ Function100cb5: ; 100cb5
res 6, [hl]
.asm_100cc0
call Function100dd2
- callba Function241ba
+ callba MobileMenuJoypad
push bc
callba PlaySpriteAnimations
callba Function10402d
@@ -2028,7 +2028,7 @@ Function100cb5: ; 100cb5
ld a, [PartyCount]
inc a
ld b, a
- ld a, [MenuSelection2]
+ ld a, [wMenuCursorY]
cp b
jr z, .asm_100d17
ld [wd0d8], a
@@ -2036,7 +2036,7 @@ Function100cb5: ; 100cb5
ld b, a
bit 1, b
jr nz, .asm_100d17
- ld a, [MenuSelection2]
+ ld a, [wMenuCursorY]
dec a
ld [CurPartyMon], a
ld c, a
@@ -2068,7 +2068,7 @@ MobileBattleMonMenu: ; 100d22
res 6, [hl]
.asm_100d30
call Function100dd2
- callba Function241ba
+ callba MobileMenuJoypad
push bc
callba PlaySpriteAnimations
callba Function10402d
@@ -2107,10 +2107,10 @@ Function100d67: ; 100d67
ld [hBGMapMode], a
call MenuBox
call UpdateSprites
- call Function1c89
+ call PlaceVerticalMenuItems
call WaitBGMap
call CopyMenuData2
- call Function1c10
+ call InitVerticalMenuCursor
ld hl, wcfa5
set 6, [hl]
ret
@@ -4186,7 +4186,7 @@ Function101b2b: ; 101b2b
call Function1013dd
ld a, 0
ld [wcd26], a
- ld a, [MenuSelection2]
+ ld a, [wMenuCursorY]
cp $1
jr z, .asm_101b51
ld a, $2
@@ -4239,7 +4239,7 @@ Function101b8f: ; 101b8f
call Function1013dd
ld a, 0
ld [wcd26], a
- ld a, [MenuSelection2]
+ ld a, [wMenuCursorY]
cp $1
jr z, .asm_101bbc
ld a, $1
@@ -4283,7 +4283,7 @@ Function101be5: ; 101be5
call Function1013dd
ld a, 0
ld [wcd26], a
- ld a, [MenuSelection2]
+ ld a, [wMenuCursorY]
cp $1
jr nz, .asm_101c0b
ld a, $2a
@@ -5375,7 +5375,7 @@ Function102387: ; 102387
call Function102d9a
call Function102dd3
ld a, $1
- ld [MenuSelection2], a
+ ld [wMenuCursorY], a
Function1023a1: ; 1023a1
call Function102283
@@ -5721,7 +5721,7 @@ Function1025ff: ; 1025ff
set 2, [hl]
callba Function1009f3
ret c
- callba Function241ba
+ callba MobileMenuJoypad
ld a, [wcfa8]
and c
ret z
@@ -5741,20 +5741,20 @@ Function1025ff: ; 1025ff
ret
.asm_10262e
- ld a, [MenuSelection2]
+ ld a, [wMenuCursorY]
ld b, a
ld a, [OTPartyCount]
cp b
ret nz
call Function1bf7
ld a, [PartyCount]
- ld [MenuSelection2], a
+ ld [wMenuCursorY], a
ld a, $1d
ld [wcd49], a
ret
.asm_102646
- ld a, [MenuSelection2]
+ ld a, [wMenuCursorY]
cp $1
ret nz
ld a, $23
@@ -5783,7 +5783,7 @@ Function10266b: ; 10266b
set 2, [hl]
callba Function1009f3
ret c
- callba Function241ba
+ callba MobileMenuJoypad
ld a, [wcfa8]
and c
ret z
@@ -5803,7 +5803,7 @@ Function10266b: ; 10266b
ret
.asm_10269a
- ld a, [MenuSelection2]
+ ld a, [wMenuCursorY]
dec a
ret nz
call Function1bf7
@@ -5812,7 +5812,7 @@ Function10266b: ; 10266b
ret
.asm_1026a8
- ld a, [MenuSelection2]
+ ld a, [wMenuCursorY]
ld b, a
ld a, [PartyCount]
cp b
@@ -5872,7 +5872,7 @@ Function1026f3: ; 1026f3
hlcoord 9, 17
ld [hl], $7f
ld a, $1
- ld [MenuSelection2], a
+ ld [wMenuCursorY], a
ld a, $1d
ld [wcd49], a
ret
@@ -5881,7 +5881,7 @@ Function1026f3: ; 1026f3
hlcoord 9, 17
ld [hl], $7f
ld a, [OTPartyCount]
- ld [MenuSelection2], a
+ ld [wMenuCursorY], a
ld a, $1f
ld [wcd49], a
ret
@@ -5992,7 +5992,7 @@ asm_1027c6:
asm_1027d1:
ld hl, wcd4b
set 3, [hl]
- ld a, [MenuSelection2]
+ ld a, [wMenuCursorY]
ld [wcd4c], a
ld a, $7
ld [wcd49], a
@@ -6023,7 +6023,7 @@ String_102804: ; 102804
; 102814
Function102814: ; 102814
- ld a, [MenuSelection2]
+ ld a, [wMenuCursorY]
ld [wcd52], a
ld a, [wcd4c]
dec a
@@ -6075,7 +6075,7 @@ Function10286f: ; 10286f
call Function1028fc
ret nc
ld a, [wcd52]
- ld [MenuSelection2], a
+ ld [wMenuCursorY], a
ld a, [wcd51]
cp $8
jr nz, .asm_102886
@@ -6107,7 +6107,7 @@ Function1028a5: ; 1028a5
Function1028ab: ; 1028ab
ld a, [wcd52]
- ld [MenuSelection2], a
+ ld [wMenuCursorY], a
call Function102f15
ld hl, wcd4b
set 1, [hl]
@@ -6325,7 +6325,7 @@ Function1029cf: ; 1029cf
Function1029fe: ; 1029fe
callba Function1009f3
ret c
- callba Function241ba
+ callba MobileMenuJoypad
ld a, c
ld hl, wcfa8
and [hl]
@@ -6333,7 +6333,7 @@ Function1029fe: ; 1029fe
push af
call ExitMenu
pop af
- ld a, [MenuSelection2]
+ ld a, [wMenuCursorY]
cp $1
jr nz, .asm_102a21
ld a, $1
@@ -6484,12 +6484,12 @@ Function102b32: ; 102b32
Function102b4e: ; 102b4e
ld a, $1
ld [MonType], a
- ld a, [MenuSelection2]
+ ld a, [wMenuCursorY]
push af
ld de, Unknown_102b73
call InitMenu3
pop af
- ld [MenuSelection2], a
+ ld [wMenuCursorY], a
ld a, [OTPartyCount]
ld [wcfa3], a
ret
@@ -6497,7 +6497,7 @@ Function102b4e: ; 102b4e
Function102b68: ; 102b68 ; unreferenced
xor a
- ld hl, wcf71
+ ld hl, wWindowStackPointer
ld bc, $10
call ByteFill
ret
@@ -6509,12 +6509,12 @@ Unknown_102b73:
Function102b7b: ; 102b7b
xor a
ld [MonType], a
- ld a, [MenuSelection2]
+ ld a, [wMenuCursorY]
push af
ld de, Unknown_102b94
call InitMenu3
pop af
- ld [MenuSelection2], a
+ ld [wMenuCursorY], a
ld a, [PartyCount]
ld [wcfa3], a
ret
@@ -6534,7 +6534,7 @@ Function102b9c: ; 102b9c
; 102bac
Function102bac: ; 102bac
- ld a, [MenuSelection2]
+ ld a, [wMenuCursorY]
dec a
ld [CurPartyMon], a
call LowVolume
@@ -6542,7 +6542,7 @@ Function102bac: ; 102bac
callba Function4dc8f
ld a, [CurPartyMon]
inc a
- ld [MenuSelection2], a
+ ld [wMenuCursorY], a
call Function102d9a
call ClearPalettes
call DelayFrame
@@ -7737,10 +7737,10 @@ AskMobileOrCable: ; 103612
ld [wMenuCursorBuffer], a
.skip_load
- call InterpretMenu2
+ call VerticalMenu
call WriteBackup
jr c, .pressed_b
- ld a, [MenuSelection2]
+ ld a, [wMenuCursorY]
ld [ScriptVar], a
ld c, a
ld a, [wdc40]
@@ -7825,10 +7825,10 @@ Mobile_SelectThreeMons: ; 10366e
jr c, .asm_1036f4
ld hl, MenuDataHeader_103747
call LoadMenuDataHeader
- call InterpretMenu2
+ call VerticalMenu
call ExitMenu
jr c, .asm_1036f4
- ld a, [MenuSelection2]
+ ld a, [wMenuCursorY]
cp $1
jr z, .asm_1036d9
cp $2
diff --git a/misc/mobile_41.asm b/misc/mobile_41.asm
index 90c775299..cc78c84e7 100755
--- a/misc/mobile_41.asm
+++ b/misc/mobile_41.asm
@@ -960,7 +960,7 @@ Function106442: ; 106442
call Function3e32
xor a
ld [hMobile], a
- ld [hFFC9], a
+ ld [hMobileReceive], a
ld a, [wcd25]
inc a
ld [wcd25], a
diff --git a/misc/mobile_46.asm b/misc/mobile_46.asm
index 8a5a79b93..0689d4653 100755
--- a/misc/mobile_46.asm
+++ b/misc/mobile_46.asm
@@ -486,7 +486,7 @@ Function1183cb: ; 1183cb
ld a, $f
ld [rIE], a
ld a, $1
- ld [hFFC9], a
+ ld [hMobileReceive], a
ld [hMobile], a
ei
callba MobileFunc_106462
@@ -516,7 +516,7 @@ Function118440: ; 118440
Function118452: ; 118452
di
xor a
- ld [hFFC9], a
+ ld [hMobileReceive], a
ld [hMobile], a
ld [hVBlank], a
call NormalSpeed
@@ -5961,7 +5961,7 @@ Function11ad1b: ; 11ad1b
call ClearSprites
call ClearTileMap
callba Function17c000
- ld a, [MenuSelection2]
+ ld a, [wMenuCursorY]
ld [wcd82], a
dec a
ld [hObjectStructIndexBuffer], a
@@ -6035,7 +6035,7 @@ Function11ad95: ; 11ad95
callba ReloadMapPart
call Function11ad8a
ld a, $1
- ld [MenuSelection2], a
+ ld [wMenuCursorY], a
ld hl, Unknown_11afcc
call Function11afb7
@@ -6062,13 +6062,13 @@ Function11adc4:
jr .asm_11ae2e
.asm_11ade6
- ld a, [MenuSelection2]
+ ld a, [wMenuCursorY]
dec a
ret z
jr .asm_11adf4
.asm_11aded
- ld a, [MenuSelection2]
+ ld a, [wMenuCursorY]
inc a
cp $4
ret z
@@ -6078,21 +6078,21 @@ Function11adc4:
ld hl, Unknown_11afcc
call Function11afbb
pop af
- ld [MenuSelection2], a
+ ld [wMenuCursorY], a
ld hl, Unknown_11afcc
call Function11afb7
ret
.asm_11ae06
call PlayClickSFX
- ld a, [MenuSelection2]
+ ld a, [wMenuCursorY]
dec a
ld hl, wcd30
ld [hl], a
and a
jr z, .asm_11ae28
hlcoord 2, 14
- ld a, [MenuSelection2]
+ ld a, [wMenuCursorY]
cp $2
jr z, .asm_11ae23
call Function11b272
@@ -6152,7 +6152,7 @@ Function11ae4e: ; 11ae4e
callba ReloadMapPart
call Function11ad8a
ld a, $1
- ld [MenuSelection2], a
+ ld [wMenuCursorY], a
ld hl, Unknown_11afd2
call Function11afb7
@@ -6183,13 +6183,13 @@ Function11ae98:
jr .asm_11aef7
.asm_11aec1
- ld a, [MenuSelection2]
+ ld a, [wMenuCursorY]
dec a
ret z
jr .asm_11aecf
.asm_11aec8
- ld a, [MenuSelection2]
+ ld a, [wMenuCursorY]
inc a
cp $3
ret z
@@ -6199,14 +6199,14 @@ Function11ae98:
ld hl, Unknown_11afd2
call Function11afbb
pop af
- ld [MenuSelection2], a
+ ld [wMenuCursorY], a
ld hl, Unknown_11afd2
call Function11afb7
ret
.asm_11aee1
call PlayClickSFX
- ld a, [MenuSelection2]
+ ld a, [wMenuCursorY]
cp $2
jr z, .asm_11aeb4
ld a, [wcd4b]
@@ -6243,7 +6243,7 @@ Function11af04: ; 11af04
callba ReloadMapPart
call Function11ad8a
ld a, $2
- ld [MenuSelection2], a
+ ld [wMenuCursorY], a
ld hl, Unknown_11afd2
call Function11afb7
@@ -6274,13 +6274,13 @@ Function11af4e:
jr .asm_11afaa
.asm_11af77
- ld a, [MenuSelection2]
+ ld a, [wMenuCursorY]
dec a
ret z
jr .asm_11af85
.asm_11af7e
- ld a, [MenuSelection2]
+ ld a, [wMenuCursorY]
inc a
cp $3
ret z
@@ -6290,14 +6290,14 @@ Function11af4e:
ld hl, Unknown_11afd2
call Function11afbb
pop af
- ld [MenuSelection2], a
+ ld [wMenuCursorY], a
ld hl, Unknown_11afd2
call Function11afb7
ret
.asm_11af97
call PlayClickSFX
- ld a, [MenuSelection2]
+ ld a, [wMenuCursorY]
cp $2
jr z, .asm_11af6a
ld a, $6
@@ -6320,7 +6320,7 @@ Function11afbb:
ld e, $7f
asm_11afbd:
- ld a, [MenuSelection2]
+ ld a, [wMenuCursorY]
dec a
ld c, a
ld b, 0
diff --git a/misc/mobile_5b.asm b/misc/mobile_5b.asm
index 484a92ca0..fca94e3ba 100755
--- a/misc/mobile_5b.asm
+++ b/misc/mobile_5b.asm
@@ -1100,7 +1100,7 @@ Function16d734: ; 16d734
call Function16d759
call Function16d76a
jr nc, .asm_16d758
- callba Function24270
+ callba _2DMenuInterpretJoypad
jr c, .asm_16d758
ld a, [wcfa5]
bit 7, a
@@ -1141,14 +1141,14 @@ Function16d76a: ; 16d76a
; 16d77a
Function16d77a: ; 16d77a
- ld hl, wcfac
+ ld hl, wCursorCurrentTile
ld a, [hli]
ld h, [hl]
ld l, a
ld a, [hl]
cp $1f
jr nz, .asm_16d792
- ld a, [wcfab]
+ ld a, [wCursorOffCharacter]
ld [hl], a
push hl
push bc
@@ -1168,7 +1168,7 @@ Function16d77a: ; 16d77a
swap a
and $f
ld c, a
- ld a, [MenuSelection2]
+ ld a, [wMenuCursorY]
ld b, a
xor a
dec b
@@ -1184,7 +1184,7 @@ Function16d77a: ; 16d77a
ld a, [wcfa7]
and $f
ld c, a
- ld a, [wcfaa]
+ ld a, [wMenuCursorX]
ld b, a
xor a
dec b
@@ -1200,7 +1200,7 @@ Function16d77a: ; 16d77a
ld a, [hl]
cp $1f
jr z, .asm_16d7de
- ld [wcfab], a
+ ld [wCursorOffCharacter], a
ld [hl], $1f
push hl
push bc
@@ -1212,9 +1212,9 @@ Function16d77a: ; 16d77a
.asm_16d7de
ld a, l
- ld [wcfac], a
+ ld [wCursorCurrentTile], a
ld a, h
- ld [wcfad], a
+ ld [wCursorCurrentTile + 1], a
ret
; 16d7e7
diff --git a/misc/mobile_5f.asm b/misc/mobile_5f.asm
index 5a49698d9..928a59410 100644
--- a/misc/mobile_5f.asm
+++ b/misc/mobile_5f.asm
@@ -461,20 +461,20 @@ Special_Menu_ChallengeExplanationCancel: ; 17d224
; 17d246
Function17d246: ; 17d246
- call InterpretMenu2
+ call VerticalMenu
jr c, .Exit
ld a, [ScriptVar]
cp $5
- jr nz, .UseMenuSelection2
- ld a, [MenuSelection2]
+ jr nz, .UsewMenuCursorY
+ ld a, [wMenuCursorY]
cp $3
ret z
- jr c, .UseMenuSelection2
+ jr c, .UsewMenuCursorY
dec a
jr .LoadToScriptVar
-.UseMenuSelection2
- ld a, [MenuSelection2]
+.UsewMenuCursorY
+ ld a, [wMenuCursorY]
.LoadToScriptVar
ld [ScriptVar], a
@@ -1933,16 +1933,16 @@ Function17dc1f: ; 17dc1f
ld [wEnemyGoesFirst], a
ld hl, wc708
call LoadMenuDataHeader
- call InterpretMenu2
+ call VerticalMenu
jr nc, .asm_17dc6e
ld a, $2
- ld [MenuSelection2], a
+ ld [wMenuCursorY], a
.asm_17dc6e
call WriteBackup
pop af
ld [rSVBK], a
- ld a, [MenuSelection2]
+ ld a, [wMenuCursorY]
cp $1
jr nz, .asm_17dc85
ld a, [$c68a]
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-09 19:02:17 +0000