#641 fixes and additions. (#646)

Name a lot of text labels according to our conventions
This commit is contained in:
mid-kid
2019-10-20 22:24:17 +00:00
committed by Rangi
parent 3fc2ba41f7
commit e3e0bcd653
203 changed files with 4077 additions and 4598 deletions

View File

@@ -361,8 +361,8 @@ Function90199:
jr .DoPhoneCall
.OutOfArea:
ld b, BANK(UnknownScript_0x90209)
ld de, UnknownScript_0x90209
ld b, BANK(LoadOutOfAreaScript)
ld de, LoadOutOfAreaScript
call ExecuteCallbackScript
ret
@@ -373,17 +373,17 @@ Function90199:
ld [wPhoneCaller], a
ld a, h
ld [wPhoneCaller + 1], a
ld b, BANK(UnknownScript_0x90205)
ld de, UnknownScript_0x90205
ld b, BANK(LoadPhoneScriptBank)
ld de, LoadPhoneScriptBank
call ExecuteCallbackScript
ret
UnknownScript_0x90205:
LoadPhoneScriptBank:
memcall wPhoneScriptBank
return
UnknownScript_0x90209:
scall UnknownScript_0x90657
LoadOutOfAreaScript:
scall PhoneOutOfAreaScript
return
LoadCallerScript:
@@ -413,11 +413,10 @@ WrongNumber:
db TRAINER_NONE, PHONE_00
dba .script
.script
writetext .text
writetext .PhoneWrongNumberText
end
.text
; Huh? Sorry, wrong number!
text_far UnknownText_0x1c5565
.PhoneWrongNumberText:
text_far _PhoneWrongNumberText
text_end
Script_ReceivePhoneCall:
@@ -438,7 +437,7 @@ Script_SpecialBillCall::
ld e, PHONE_BILL
jp LoadCallerScript
UnknownScript_0x90261:
LoadElmCallScript:
callasm .LoadElmScript
pause 30
sjump Script_ReceivePhoneCall
@@ -535,23 +534,23 @@ Function90316:
ret
HangUp_Beep:
ld hl, UnknownText_0x9032a
ld hl, PhoneClickText
call PrintText
ld de, SFX_HANG_UP
call PlaySFX
ret
UnknownText_0x9032a:
text_far UnknownText_0x1c5580
PhoneClickText:
text_far _PhoneClickText
text_end
HangUp_BoopOn:
ld hl, UnknownText_0x90336
ld hl, PhoneEllipseText
call PrintText
ret
UnknownText_0x90336:
text_far UnknownText_0x1c5588
PhoneEllipseText:
text_far _PhoneEllipseText
text_end
HangUp_BoopOff:
@@ -705,29 +704,26 @@ INCLUDE "data/phone/phone_contacts.asm"
INCLUDE "data/phone/special_calls.asm"
UnknownScript_0x90657:
writetext UnknownText_0x9065b
PhoneOutOfAreaScript:
writetext PhoneOutOfAreaText
end
UnknownText_0x9065b:
; That number is out of the area.
text_far UnknownText_0x1c558b
PhoneOutOfAreaText:
text_far _PhoneOutOfAreaText
text_end
PhoneScript_JustTalkToThem:
writetext UnknownText_0x90664
writetext PhoneJustTalkToThemText
end
UnknownText_0x90664:
; Just go talk to that person!
text_far UnknownText_0x1c55ac
PhoneJustTalkToThemText:
text_far _PhoneJustTalkToThemText
text_end
UnknownScript_0x90669:
writetext UnknownText_0x9066d
PhoneThankYouTextScript:
writetext PhoneThankYouText
end
UnknownText_0x9066d:
; Thank you!
text_far UnknownText_0x1c55ca
PhoneThankYouText:
text_far _PhoneThankYouText
text_end