diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-12-07 13:32:07 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-12-07 13:32:07 -0500 |
| commit | c745dd677753e9b7820665f5ebd325731c5b728e (patch) | |
| tree | e2dd149d07fb2bdf2b8e24e0e6d76f27843ed243 /engine/phone | |
| parent | 60e6657c63c07a52bcc17b899704ca3e5bfe8660 (diff) | |
FarString -> PlaceFarString, and FarPlaceString -> BrokenPlaceFarString
Diffstat (limited to 'engine/phone')
| -rw-r--r-- | engine/phone/phone.asm | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/engine/phone/phone.asm b/engine/phone/phone.asm index 49b3eb2f..796aed9b 100644 --- a/engine/phone/phone.asm +++ b/engine/phone/phone.asm @@ -93,7 +93,8 @@ GetRemainingSpaceInPhoneList: INCLUDE "data/phone/permanent_numbers.asm" -FarPlaceString: +BrokenPlaceFarString: +; This routine is not in bank 0 and will fail or crash if called. ldh a, [hROMBank] push af ld a, b @@ -459,14 +460,14 @@ RingTwice_StartCall: .Ring: call Phone_StartRinging call Phone_Wait20Frames - call Phone_CallerTextboxWithName + call .CallerTextboxWithName call Phone_Wait20Frames call Phone_CallerTextbox call Phone_Wait20Frames - call Phone_CallerTextboxWithName + call .CallerTextboxWithName ret -Phone_CallerTextboxWithName: +.CallerTextboxWithName: ld a, [wCurCaller] ld b, a call Phone_TextboxWithName @@ -479,19 +480,19 @@ PhoneCall:: ld [wPhoneCaller], a ld a, d ld [wPhoneCaller + 1], a - call Phone_Ring + call .Ring ; fallthrough (rings a second time) -Phone_Ring: +.Ring: call Phone_StartRinging call Phone_Wait20Frames - call Phone_CallerTextboxWithName2 + call .CallerTextboxWithName call Phone_Wait20Frames call Phone_CallerTextbox call Phone_Wait20Frames - call Phone_CallerTextboxWithName2 + call .CallerTextboxWithName ret -Phone_CallerTextboxWithName2: +.CallerTextboxWithName: call Phone_CallerTextbox hlcoord 1, 2 ld [hl], "☎" @@ -503,7 +504,7 @@ Phone_CallerTextboxWithName2: ld e, a ld a, [wPhoneCaller + 1] ld d, a - call FarPlaceString + call BrokenPlaceFarString ret Phone_NoSignal: |