diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-06-24 23:22:50 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-06-24 23:22:50 -0400 |
| commit | 67d1364c7acfd5e8e2256080e16a14cfa59a5abc (patch) | |
| tree | fcf1bcbc2990b8fdeb5d63159d15382a8bdf719a /engine/phone | |
| parent | 91f914718a263839daef24d44eda857bfc7cca95 (diff) | |
Fix triple newlines left over from removing address comments
Diffstat (limited to 'engine/phone')
| -rw-r--r-- | engine/phone/generic_calls.asm | 1 | ||||
| -rw-r--r-- | engine/phone/phone.asm | 12 |
2 files changed, 0 insertions, 13 deletions
diff --git a/engine/phone/generic_calls.asm b/engine/phone/generic_calls.asm index 359d0146b..9abcf95af 100644 --- a/engine/phone/generic_calls.asm +++ b/engine/phone/generic_calls.asm @@ -1255,7 +1255,6 @@ PhoneScript_MonFlavorText: buttonsound farjump PhoneScript_HangupText_Male - GrandmaString: db "Grandma@" GrandpaString: db "Grandpa@" MomString: db "Mom@" diff --git a/engine/phone/phone.asm b/engine/phone/phone.asm index 5c8425c75..06a241cad 100644 --- a/engine/phone/phone.asm +++ b/engine/phone/phone.asm @@ -11,7 +11,6 @@ AddPhoneNumber:: scf ret - DelCellNum:: call _CheckCellNum jr nc, .not_in_list @@ -94,7 +93,6 @@ GetRemainingSpaceInPhoneList: INCLUDE "data/phone/permanent_numbers.asm" - FarPlaceString: ld a, [hROMBank] push af @@ -107,7 +105,6 @@ FarPlaceString: rst Bankswitch ret - CheckPhoneCall:: ; Check if the phone is ringing in the overworld. @@ -508,7 +505,6 @@ Phone_CallerTextboxWithName2: call FarPlaceString ret - Phone_NoSignal: ld de, SFX_NO_SIGNAL call PlaySFX @@ -548,7 +544,6 @@ UnknownText_0x9032a: text_jump UnknownText_0x1c5580 db "@" - HangUp_BoopOn: ld hl, UnknownText_0x90336 call PrintText @@ -558,7 +553,6 @@ UnknownText_0x90336: text_jump UnknownText_0x1c5588 db "@" - HangUp_BoopOff: call SpeechTextBox ret @@ -581,7 +575,6 @@ Phone_Wait20Frames: farcall PhoneRing_CopyTilemapAtOnce ret - Function90363: push bc call Phone_CallerTextbox @@ -595,7 +588,6 @@ Function90363: call Function90380 ret - Phone_CallerTextbox: hlcoord 0, 0 ld b, 2 @@ -603,7 +595,6 @@ Phone_CallerTextbox: call TextBox ret - Function90380: ld h, d ld l, e @@ -637,7 +628,6 @@ GetCallerTrainerClass: pop hl ret - GetCallerName: ld a, c and a @@ -710,12 +700,10 @@ GetCallerLocation: pop de ret - INCLUDE "data/phone/phone_contacts.asm" INCLUDE "data/phone/special_calls.asm" - UnknownScript_0x90657: writetext UnknownText_0x9065b end |