Label CheckPhoneCall.

This commit is contained in:
yenatch 2014-07-24 20:19:56 -07:00
parent 07693817ce
commit b922fe72a1
2 changed files with 30 additions and 19 deletions

View File

@ -509,26 +509,28 @@ Function968ec: ; 968ec
Function9693a: ; 9693a Function9693a: ; 9693a
ld a, [InLinkBattle] ld a, [InLinkBattle]
and a and a
jr nz, .asm_96964 jr nz, .nothing
ld hl, StatusFlags2 ld hl, StatusFlags2
bit 2, [hl] bit 2, [hl]
jr z, .asm_96951 jr z, .asm_96951
callba Function114a4 callba Function114a4
jr c, .asm_96966 jr c, .elevator
xor a xor a
ret ret
.asm_96951 .asm_96951
callba Function11452 callba Function11452
callba Function114e7 callba Function114e7
callba Function90074 callba CheckPhoneCall
ret c ret c
.asm_96964 .nothing
xor a xor a
ret ret
.asm_96966 .elevator
ld a, BANK(UnknownScript_0x135f8) ld a, BANK(UnknownScript_0x135f8)
ld hl, UnknownScript_0x135f8 ld hl, UnknownScript_0x135f8
call CallScript call CallScript

View File

@ -78392,23 +78392,30 @@ Function90069: ; 90069
; 90074 ; 90074
Function90074:: ; 90074 (24:4074) CheckPhoneCall:: ; 90074 (24:4074)
; Check if the phone is ringing in the overworld.
call CheckStandingOnEntrance call CheckStandingOnEntrance
jr z, .asm_900a4 jr z, .no_call
call Function900a6 call Function900a6
nop nop
jr nc, .asm_900a4 jr nc, .no_call
call Random call Random
ld b, a ld b, a
and $7f and $7f
cp b cp b
jr nz, .asm_900a4 jr nz, .no_call
call Function2d05 call Function2d05
and a and a
jr nz, .asm_900a4 jr nz, .no_call
call Function900de call Function900de
call Function900bf call Function900bf
jr nc, .asm_900a4 jr nc, .no_call
ld e, a ld e, a
call Function9020d call Function9020d
ld a, BANK(UnknownScript_0x90241) ld a, BANK(UnknownScript_0x90241)
@ -78416,7 +78423,8 @@ Function90074:: ; 90074 (24:4074)
call CallScript call CallScript
scf scf
ret ret
.asm_900a4
.no_call
xor a xor a
ret ret
@ -78676,13 +78684,14 @@ Function9020d: ; 9020d (24:420d)
; 90233 (24:4233) ; 90233 (24:4233)
Unknown_90233: ; 90233 Unknown_90233: ; 90233
db $00, $00 db 0, 0
db $24, $38 dbw BANK(UnknownScript_0x90238), UnknownScript_0x90238
db $42, $4c UnknownScript_0x90238:
db $3c, $42 2writetext UnknownText_0x9023c
db $91, $16 end
db $65, $55 UnknownText_0x9023c:
db $71, $50 text_jump UnknownText_0x1c5565
db "@"
; 90241 ; 90241
UnknownScript_0x90241: ; 0x90241 UnknownScript_0x90241: ; 0x90241