diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-12-07 13:32:08 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-12-07 13:32:08 -0500 |
| commit | 098903fc971fdb4fbaec1c72de2b6b2414c5ad90 (patch) | |
| tree | a33453b37aa91e918a580680805f6a3563cbddb2 /engine/phone | |
| parent | 4ef556cbc83659683454f0bf4415af52e4371d56 (diff) | |
FarString -> PlaceFarString, and document a BrokenPlaceFarString bug
Diffstat (limited to 'engine/phone')
| -rw-r--r-- | engine/phone/phone.asm | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/engine/phone/phone.asm b/engine/phone/phone.asm index 27acc48f1..c8c9744ed 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 @@ -455,14 +456,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 @@ -475,22 +476,22 @@ PhoneCall:: ld [wPhoneCaller], a ld a, d ld [wPhoneCaller + 1], a - call Phone_FirstOfTwoRings - call Phone_FirstOfTwoRings + call .Ring + call .Ring farcall StubbedTrainerRankings_PhoneCalls ret -Phone_FirstOfTwoRings: +.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], "☎" @@ -502,7 +503,7 @@ Phone_CallerTextboxWithName2: ld e, a ld a, [wPhoneCaller + 1] ld d, a - call FarPlaceString + call BrokenPlaceFarString ret Phone_NoSignal: |