diff options
Diffstat (limited to 'misc/mobile_12.asm')
| -rwxr-xr-x | misc/mobile_12.asm | 55 |
1 files changed, 28 insertions, 27 deletions
diff --git a/misc/mobile_12.asm b/misc/mobile_12.asm index 185d19e89..7dca10581 100755 --- a/misc/mobile_12.asm +++ b/misc/mobile_12.asm @@ -6,7 +6,7 @@ InitMobileProfile: ; 4802f (12:402f) set 0, [hl] ld a, c and a - call z, Function48000 + call z, InitCrystalData call ClearBGPalettes call Function48d3d ld a, [wd479] @@ -46,7 +46,7 @@ InitMobileProfile: ; 4802f (12:402f) ld c, 20 call DelayFrames ld b, $1 - call Function4930f + call GetMysteryGift_MobileAdapterLayout call ClearBGPalettes hlcoord 0, 0 ld b, $2 @@ -112,17 +112,17 @@ InitMobileProfile: ; 4802f (12:402f) ld de, String_48275 call PlaceString call Function48187 - call Function3200 + 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 @@ -214,8 +214,8 @@ String_48202: ; 48202 ; 4820d Function4820d: ; 4820d (12:420d) - call Function1bee - ld hl, MenuSelection2 + call PlaceHollowCursor + 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 @@ -361,7 +361,7 @@ Function48304: ; 48304 (12:4304) ld [wMenuScrollPosition], a callba Function104148 .asm_48348 - call HandleScrollingMenu + call ScrollingMenu ld de, $629 call Function48383 jr c, .asm_48348 @@ -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 @@ -426,7 +426,7 @@ Function48383: ; 48383 (12:4383) ret Function483bb: ; 483bb (12:43bb) - ld hl, wcf77 + ld hl, wScrollingMenuCursorPosition ld a, [hl] inc a ld [wd474], a @@ -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 @@ -665,7 +665,7 @@ Function48689: ; 48689 (12:4689) ld c, 7 call DelayFrames ld b, $1 - call Function4930f + call GetMysteryGift_MobileAdapterLayout call ClearBGPalettes hlcoord 0, 0 ld b, $4 @@ -687,7 +687,7 @@ Function48689: ; 48689 (12:4689) ret Function486bf: ; 486bf (12:46bf) - ld hl, wcfa1 + ld hl, w2DMenuCursorInitY ld a, [wd002] bit 6, a jr nz, .asm_486ce @@ -772,7 +772,7 @@ Function48725: ; 48725 (12:4725) ret Function4873c: ; 4873c (12:473c) - ld hl, wcfa1 + ld hl, w2DMenuCursorInitY ld a, $4 ld [hli], a ld a, $c @@ -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 @@ -1217,11 +1217,11 @@ Function48a3a: ; 48a3a (12:4a3a) call LoadMenuDataHeader call Function4873c ld a, $a - ld [wcfa1], a + ld [w2DMenuCursorInitY], a ld a, $b - ld [wcfa2], a + ld [w2DMenuCursorInitX], 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] @@ -1605,7 +1605,8 @@ Function48c63: ; 48c63 ; 48c8e Function48c8e: ; 48c8e - ld hl, wd02a +; unreferenced + ld hl, $d02a ld d, h ld e, l callba Function48c63 |