diff options
| author | Bryan Bishop <kanzure@gmail.com> | 2014-08-16 19:43:42 -0500 |
|---|---|---|
| committer | Bryan Bishop <kanzure@gmail.com> | 2014-08-16 19:43:42 -0500 |
| commit | 4f018846fb35ca08cb2b0dc7a1f9159905c16777 (patch) | |
| tree | e6dfa70a0676f08bfba0b1680c9784af4d090567 /engine/events.asm | |
| parent | 85fe70ecba172bb48794b33a90c1733b35f2e0ed (diff) | |
| parent | b922fe72a19bb82d4f0c0ebaadf415e8dfcb7166 (diff) | |
Merge pull request #260 from yenatch/master
Dump the phone scripts.
Diffstat (limited to 'engine/events.asm')
| -rw-r--r-- | engine/events.asm | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/engine/events.asm b/engine/events.asm index c2aff6dfb..18ec40838 100644 --- a/engine/events.asm +++ b/engine/events.asm @@ -509,26 +509,28 @@ Function968ec: ; 968ec Function9693a: ; 9693a ld a, [InLinkBattle] and a - jr nz, .asm_96964 + jr nz, .nothing + ld hl, StatusFlags2 bit 2, [hl] jr z, .asm_96951 + callba Function114a4 - jr c, .asm_96966 + jr c, .elevator xor a ret .asm_96951 callba Function11452 callba Function114e7 - callba Function90074 + callba CheckPhoneCall ret c -.asm_96964 +.nothing xor a ret -.asm_96966 +.elevator ld a, BANK(UnknownScript_0x135f8) ld hl, UnknownScript_0x135f8 call CallScript |