diff options
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/mobile_40.asm | 16 | ||||
| -rwxr-xr-x | misc/mobile_41.asm | 23 |
2 files changed, 24 insertions, 15 deletions
diff --git a/misc/mobile_40.asm b/misc/mobile_40.asm index 4743f2c27..ce3035c35 100644 --- a/misc/mobile_40.asm +++ b/misc/mobile_40.asm @@ -7686,9 +7686,9 @@ Unknown_1035d7: ; 1035d7 dw Unknown_103608 dw Unknown_1035fe - dw Function103612 - dw Function103612 - dw Function103612 + dw AskMobileOrCable + dw AskMobileOrCable + dw AskMobileOrCable Unknown_1035e7: ; 1035e7 dwcoord 0, 6 @@ -7719,18 +7719,18 @@ Unknown_103608: ; 103608 db 2, 2, 3 ; 103612 -Function103612: ; 103612 +AskMobileOrCable: ; 103612 ld hl, MenuDataHeader_103640 call LoadMenuDataHeader ld a, [wdc40] and $f - jr z, .asm_103622 + jr z, .skip_load ld [wMenuCursorBuffer], a -.asm_103622 +.skip_load call InterpretMenu2 call WriteBackup - jr c, .asm_10363b + jr c, .pressed_b ld a, [MenuSelection2] ld [ScriptVar], a ld c, a @@ -7740,7 +7740,7 @@ Function103612: ; 103612 ld [wdc40], a ret -.asm_10363b +.pressed_b xor a ld [ScriptVar], a ret diff --git a/misc/mobile_41.asm b/misc/mobile_41.asm index 9b2664e6b..69abe1cd2 100755 --- a/misc/mobile_41.asm +++ b/misc/mobile_41.asm @@ -743,7 +743,9 @@ endr ret ; 10630f -Function10630f: ; 10630f +; functions related to the cable club and various NPC scripts referencing mobile communications + +Mobile_DummyReturnFalse: ; 10630f xor a ld [ScriptVar], a ret @@ -766,8 +768,10 @@ MobileFn_106314: mobile ; 106314 Function10632f: ; 10632f or a - mobile + ret +Function106331: ; 106331 - called by Mobile_DummyReturnFalse in Crystal-J + ; check ~[4:b000] == [7:a800] ld a, $4 call GetSRAMBank ld a, [$b000] @@ -781,17 +785,22 @@ Function10632f: ; 10632f call CloseSRAM ld a, c cp b - jr nz, .asm_106359 + jr nz, .nope + + ; check [7:a800] != 0 and a - jr z, .asm_106359 - and $8f + jr z, .nope + + ; check !([7:a800] & %01110000) + and %10001111 cp c - jr nz, .asm_106359 + jr nz, .nope + ld c, a scf ret -.asm_106359 +.nope xor a ld c, a ret |