diff options
Diffstat (limited to 'misc/mobile_40.asm')
| -rw-r--r-- | misc/mobile_40.asm | 118 |
1 files changed, 59 insertions, 59 deletions
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 |