Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FarString -> PlaceFarString, and document a BrokenPlaceFarString bug

Browse Source
This commit is contained in:
Rangi
2020-12-07 13:32:08 -05:00
parent 4ef556cbc8
commit 098903fc97
6 changed files with 43 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
engine/phone/phone.asm
View File

@@ -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: