summaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
Diffstat (limited to 'engine')
-rw-r--r--engine/events/fruit_trees.asm6
-rw-r--r--engine/events/misc_scripts_2.asm2
-rw-r--r--engine/events/std_scripts.asm66
-rw-r--r--engine/overworld/scripting.asm8
-rw-r--r--engine/phone/scripts/bill.asm8
-rw-r--r--engine/phone/scripts/brent_gossip.asm20
-rw-r--r--engine/phone/scripts/buena.asm14
-rw-r--r--engine/phone/scripts/chad_gossip.asm20
-rw-r--r--engine/phone/scripts/generic_callee.asm392
-rw-r--r--engine/phone/scripts/generic_caller.asm216
-rw-r--r--engine/phone/scripts/hangups.asm68
-rw-r--r--engine/phone/scripts/hangups_2.asm20
-rw-r--r--engine/phone/scripts/irwin_gossip.asm26
-rw-r--r--engine/phone/scripts/jack_gossip.asm22
-rw-r--r--engine/phone/scripts/liz_gossip.asm20
-rw-r--r--engine/phone/scripts/mom.asm18
-rw-r--r--engine/pokemon/breeding.asm4
17 files changed, 465 insertions, 465 deletions
diff --git a/engine/events/fruit_trees.asm b/engine/events/fruit_trees.asm
index 5401f76f9..eba4d998e 100644
--- a/engine/events/fruit_trees.asm
+++ b/engine/events/fruit_trees.asm
@@ -4,7 +4,7 @@ FruitTreeScript::
readmem wCurFruit
getitemname STRING_BUFFER_3, USE_SCRIPT_VAR
writetext FruitBearingTreeText
- buttonsound
+ promptbutton
callasm TryResetFruitTrees
callasm CheckFruitTree
iffalse .fruit
@@ -17,7 +17,7 @@ FruitTreeScript::
readmem wCurFruit
giveitem ITEM_FROM_MEM
iffalse .packisfull
- buttonsound
+ promptbutton
writetext ObtainedFruitText
callasm PickedFruitTree
specialsound
@@ -25,7 +25,7 @@ FruitTreeScript::
sjump .end
.packisfull
- buttonsound
+ promptbutton
writetext FruitPackIsFullText
waitbutton
diff --git a/engine/events/misc_scripts_2.asm b/engine/events/misc_scripts_2.asm
index 4889b30aa..3d01c3250 100644
--- a/engine/events/misc_scripts_2.asm
+++ b/engine/events/misc_scripts_2.asm
@@ -22,7 +22,7 @@ HiddenItemScript::
sjump .finish
.bag_full
- buttonsound
+ promptbutton
writetext .ButNoSpaceText
waitbutton
diff --git a/engine/events/std_scripts.asm b/engine/events/std_scripts.asm
index 1ca5eb4c9..b7426caec 100644
--- a/engine/events/std_scripts.asm
+++ b/engine/events/std_scripts.asm
@@ -69,33 +69,33 @@ PokecenterNurseScript:
checkevent EVENT_WELCOMED_TO_POKECOM_CENTER
iftrue .morn_comcenter
farwritetext NurseMornText
- buttonsound
+ promptbutton
sjump .ok
.morn_comcenter
farwritetext PokeComNurseMornText
- buttonsound
+ promptbutton
sjump .ok
.day
checkevent EVENT_WELCOMED_TO_POKECOM_CENTER
iftrue .day_comcenter
farwritetext NurseDayText
- buttonsound
+ promptbutton
sjump .ok
.day_comcenter
farwritetext PokeComNurseDayText
- buttonsound
+ promptbutton
sjump .ok
.nite
checkevent EVENT_WELCOMED_TO_POKECOM_CENTER
iftrue .nite_comcenter
farwritetext NurseNiteText
- buttonsound
+ promptbutton
sjump .ok
.nite_comcenter
farwritetext PokeComNurseNiteText
- buttonsound
+ promptbutton
sjump .ok
.ok
@@ -326,19 +326,19 @@ BugContestResultsScript:
ifequal 2, BugContestResults_SecondPlace
ifequal 3, BugContestResults_ThirdPlace
farwritetext ContestResults_ConsolationPrizeText
- buttonsound
+ promptbutton
waitsfx
verbosegiveitem BERRY
iffalse BugContestResults_NoRoomForBerry
BugContestResults_DidNotWin:
farwritetext ContestResults_DidNotWinText
- buttonsound
+ promptbutton
sjump BugContestResults_FinishUp
BugContestResults_ReturnAfterWinnersPrize:
farwritetext ContestResults_JoinUsNextTimeText
- buttonsound
+ promptbutton
BugContestResults_FinishUp:
checkevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER
@@ -408,25 +408,25 @@ BugContestResults_ThirdPlace:
BugContestResults_NoRoomForSunStone:
farwritetext BugContestPrizeNoRoomText
- buttonsound
+ promptbutton
setevent EVENT_CONTEST_OFFICER_HAS_SUN_STONE
sjump BugContestResults_ReturnAfterWinnersPrize
BugContestResults_NoRoomForEverstone:
farwritetext BugContestPrizeNoRoomText
- buttonsound
+ promptbutton
setevent EVENT_CONTEST_OFFICER_HAS_EVERSTONE
sjump BugContestResults_ReturnAfterWinnersPrize
BugContestResults_NoRoomForGoldBerry:
farwritetext BugContestPrizeNoRoomText
- buttonsound
+ promptbutton
setevent EVENT_CONTEST_OFFICER_HAS_GOLD_BERRY
sjump BugContestResults_ReturnAfterWinnersPrize
BugContestResults_NoRoomForBerry:
farwritetext BugContestPrizeNoRoomText
- buttonsound
+ promptbutton
setevent EVENT_CONTEST_OFFICER_HAS_BERRY
sjump BugContestResults_DidNotWin
@@ -786,7 +786,7 @@ RegisteredNumberMScript:
farwritetext RegisteredNumber1Text
playsound SFX_REGISTER_PHONE_NUMBER
waitsfx
- buttonsound
+ promptbutton
end
NumberAcceptedMScript:
@@ -1279,31 +1279,31 @@ GiftMScript:
.Jose:
farwritetext JoseGiftText
- buttonsound
+ promptbutton
end
.Wade:
farwritetext WadeGiftText
- buttonsound
+ promptbutton
end
.Alan:
farwritetext AlanGiftText
- buttonsound
+ promptbutton
end
.Derek:
farwritetext DerekGiftText
- buttonsound
+ promptbutton
end
.Tully:
farwritetext TullyGiftText
- buttonsound
+ promptbutton
end
.Wilton:
farwritetext WiltonGiftText
- buttonsound
+ promptbutton
end
.Kenji:
farwritetext KenjiGiftText
- buttonsound
+ promptbutton
end
PackFullMScript:
@@ -1386,19 +1386,19 @@ RematchGiftMScript:
.Huey:
farwritetext HueyRematchGiftText
- buttonsound
+ promptbutton
end
.Joey:
farwritetext JoeyRematchGiftText
- buttonsound
+ promptbutton
end
.Vance:
farwritetext VanceRematchGiftText
- buttonsound
+ promptbutton
end
.Parry:
farwritetext ParryRematchGiftText
- buttonsound
+ promptbutton
end
AskNumber1FScript:
@@ -1477,7 +1477,7 @@ RegisteredNumberFScript:
farwritetext RegisteredNumber2Text
playsound SFX_REGISTER_PHONE_NUMBER
waitsfx
- buttonsound
+ promptbutton
end
NumberAcceptedFScript:
@@ -1691,19 +1691,19 @@ GiftFScript:
.Beverly:
farwritetext BeverlyGiftText
- buttonsound
+ promptbutton
end
.Gina:
farwritetext GinaGiftText
- buttonsound
+ promptbutton
end
.Dana:
farwritetext DanaGiftText
- buttonsound
+ promptbutton
end
.Tiffany:
farwritetext TiffanyGiftText
- buttonsound
+ promptbutton
end
PackFullFScript:
@@ -1747,7 +1747,7 @@ RematchGiftFScript:
.Erin:
opentext
farwritetext ErinRematchGiftText
- buttonsound
+ promptbutton
end
GymStatue1Script:
@@ -1762,7 +1762,7 @@ GymStatue2Script:
getcurlandmarkname STRING_BUFFER_3
opentext
farwritetext GymStatue_CityGymText
- buttonsound
+ promptbutton
farwritetext GymStatue_WinningTrainersText
waitbutton
closetext
@@ -1786,7 +1786,7 @@ GameCornerCoinVendorScript:
faceplayer
opentext
farwritetext CoinVendor_WelcomeText
- buttonsound
+ promptbutton
checkitem COIN_CASE
iftrue CoinVendor_IntroScript
farwritetext CoinVendor_NoCoinCaseText
diff --git a/engine/overworld/scripting.asm b/engine/overworld/scripting.asm
index 128439205..7f82ea81d 100644
--- a/engine/overworld/scripting.asm
+++ b/engine/overworld/scripting.asm
@@ -148,7 +148,7 @@ ScriptCommandTable:
dw Script_farjumptext ; 52
dw Script_jumptext ; 53
dw Script_waitbutton ; 54
- dw Script_buttonsound ; 55
+ dw Script_promptbutton ; 55
dw Script_pokepic ; 56
dw Script_closepokepic ; 57
dw Script__2dmenu ; 58
@@ -398,7 +398,7 @@ Script_waitbutton:
jp WaitButton
-Script_buttonsound:
+Script_promptbutton:
; script command 0x55
ldh a, [hOAMUpdate]
@@ -406,7 +406,7 @@ Script_buttonsound:
ld a, $1
ldh [hOAMUpdate], a
call WaitBGMap
- call ButtonSound
+ call PromptButton
pop af
ldh [hOAMUpdate], a
ret
@@ -525,7 +525,7 @@ GiveItemScript:
end
.Full:
- buttonsound
+ promptbutton
pocketisfull
end
diff --git a/engine/phone/scripts/bill.asm b/engine/phone/scripts/bill.asm
index ccc74dd73..96e2f406d 100644
--- a/engine/phone/scripts/bill.asm
+++ b/engine/phone/scripts/bill.asm
@@ -4,22 +4,22 @@ BillPhoneCalleeScript:
checktime NITE
iftrue .nitegreet
farwritetext BillPhoneMornGreetingText
- buttonsound
+ promptbutton
sjump .main
.daygreet
farwritetext BillPhoneDayGreetingText
- buttonsound
+ promptbutton
sjump .main
.nitegreet
farwritetext BillPhoneNiteGreetingText
- buttonsound
+ promptbutton
sjump .main
.main
farwritetext BillPhoneGenericText
- buttonsound
+ promptbutton
readvar VAR_BOXSPACE
getnum STRING_BUFFER_3
ifequal 0, .full
diff --git a/engine/phone/scripts/brent_gossip.asm b/engine/phone/scripts/brent_gossip.asm
index 3c92d420a..76fb1c156 100644
--- a/engine/phone/scripts/brent_gossip.asm
+++ b/engine/phone/scripts/brent_gossip.asm
@@ -13,50 +13,50 @@ BrentBillTriviaScript:
.Father:
farwritetext BrentFatherGossipText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Male
.Grandpa:
farwritetext BrentGrandpaGossipText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Male
.Goldenrod:
farwritetext BrentGoldenrodGossipText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Male
.Route25:
farwritetext BrentRoute25GossipText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Male
.Abra:
farwritetext BrentAbraGossipText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Male
.Sister:
farwritetext BrentSisterGossipText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Male
.Milk:
farwritetext BrentMilkGossipText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Male
.Battling:
farwritetext BrentBattlingGossipText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Male
.FlowerShop:
farwritetext BrentFlowerShopGossipText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Male
.KimonoGirl:
farwritetext BrentKimonoGirlGossipText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Male
diff --git a/engine/phone/scripts/buena.asm b/engine/phone/scripts/buena.asm
index edfe5c0a7..02a6c0a97 100644
--- a/engine/phone/scripts/buena.asm
+++ b/engine/phone/scripts/buena.asm
@@ -18,17 +18,17 @@ BuenaPhoneScript_CheckTimeOfDayCallee:
checktime DAY
iftrue .day
writetext BuenaPhoneNiteAnswerText
- buttonsound
+ promptbutton
end
.morn
writetext BuenaPhoneMorningAnswerText
- buttonsound
+ promptbutton
end
.day
writetext BuenaPhoneDayAnswerText
- buttonsound
+ promptbutton
end
BuenaPhoneScript_AfterMidnightCallee:
@@ -43,22 +43,22 @@ BuenaPhoneScript_CheckTimeOfDayCaller:
checktime DAY
iftrue .day
writetext BuenaPhoneNiteText
- buttonsound
+ promptbutton
end
.morn
writetext BuenaPhoneMorningText
- buttonsound
+ promptbutton
end
.day
writetext BuenaPhoneDayText
- buttonsound
+ promptbutton
end
BuenaPhoneScript_AfterMidnightCaller:
writetext BuenaPhoneMidnightText
- buttonsound
+ promptbutton
end
BuenaPhoneScript_Rocket:
diff --git a/engine/phone/scripts/chad_gossip.asm b/engine/phone/scripts/chad_gossip.asm
index 544c25b21..58192232c 100644
--- a/engine/phone/scripts/chad_gossip.asm
+++ b/engine/phone/scripts/chad_gossip.asm
@@ -13,50 +13,50 @@ ChadOakGossipScript:
.Blue:
farwritetext ChadBlueGossipText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Male
.Daisy:
farwritetext ChadDaisyGossipText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Male
.ProfElm:
farwritetext ChadProfElmGossipText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Male
.Dream:
farwritetext ChadProfOaksDreamGossipText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Male
.Kurt:
farwritetext ChadKurtGossipText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Male
.League:
farwritetext ChadLeagueGossipText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Male
.RadioShow:
farwritetext ChadPokemonTalkGossipText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Male
.Battling:
farwritetext ChadProfOakTrainerGossipText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Male
.DaisyTea:
farwritetext ChadDaisyTeaGossipText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Male
.Traveled:
farwritetext ChadProfOakTravelingGossipText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Male
diff --git a/engine/phone/scripts/generic_callee.asm b/engine/phone/scripts/generic_callee.asm
index 76d26f922..f8a5f7394 100644
--- a/engine/phone/scripts/generic_callee.asm
+++ b/engine/phone/scripts/generic_callee.asm
@@ -47,102 +47,102 @@ PhoneScript_AnswerPhone_Male:
.Jack:
farwritetext JackAnswerPhoneText
- buttonsound
+ promptbutton
end
.Huey:
farwritetext HueyAnswerPhoneText
- buttonsound
+ promptbutton
end
.Gaven:
farwritetext GavenAnswerPhoneText
- buttonsound
+ promptbutton
end
.Jose:
farwritetext JoseAnswerPhoneText
- buttonsound
+ promptbutton
end
.Joey:
farwritetext JoeyAnswerPhoneText
- buttonsound
+ promptbutton
end
.Wade:
farwritetext WadeAnswerPhoneText
- buttonsound
+ promptbutton
end
.Ralph:
farwritetext RalphAnswerPhoneText
- buttonsound
+ promptbutton
end
.Anthony:
farwritetext AnthonyAnswerPhoneText
- buttonsound
+ promptbutton
end
.Todd:
farwritetext ToddAnswerPhoneText
- buttonsound
+ promptbutton
end
.Irwin:
farwritetext IrwinAnswerPhoneText
- buttonsound
+ promptbutton
end
.Arnie:
farwritetext ArnieAnswerPhoneText
- buttonsound
+ promptbutton
end
.Alan:
farwritetext AlanAnswerPhoneText
- buttonsound
+ promptbutton
end
.Chad:
farwritetext ChadAnswerPhoneText
- buttonsound
+ promptbutton
end
.Derek:
farwritetext DerekAnswerPhoneText
- buttonsound
+ promptbutton
end
.Tully:
farwritetext TullyAnswerPhoneText
- buttonsound
+ promptbutton
end
.Brent:
farwritetext BrentAnswerPhoneText
- buttonsound
+ promptbutton
end
.Vance:
farwritetext VanceAnswerPhoneText
- buttonsound
+ promptbutton
end
.Wilton:
farwritetext WiltonAnswerPhoneText
- buttonsound
+ promptbutton
end
.Kenji:
farwritetext KenjiAnswerPhoneText
- buttonsound
+ promptbutton
end
.Parry:
farwritetext ParryAnswerPhoneText
- buttonsound
+ promptbutton
end
PhoneScript_AnswerPhone_Male_Day:
@@ -170,102 +170,102 @@ PhoneScript_AnswerPhone_Male_Day:
.Jack:
farwritetext JackAnswerPhoneDayText
- buttonsound
+ promptbutton
end
.Huey:
farwritetext HueyAnswerPhoneDayText
- buttonsound
+ promptbutton
end
.Gaven:
farwritetext GavenAnswerPhoneDayText
- buttonsound
+ promptbutton
end
.Jose:
farwritetext JoseAnswerPhoneDayText
- buttonsound
+ promptbutton
end
.Joey:
farwritetext JoeyAnswerPhoneDayText
- buttonsound
+ promptbutton
end
.Wade:
farwritetext WadeAnswerPhoneDayText
- buttonsound
+ promptbutton
end
.Ralph:
farwritetext RalphAnswerPhoneDayText
- buttonsound
+ promptbutton
end
.Anthony:
farwritetext AnthonyAnswerPhoneDayText
- buttonsound
+ promptbutton
end
.Todd:
farwritetext ToddAnswerPhoneDayText
- buttonsound
+ promptbutton
end
.Irwin:
farwritetext IrwinAnswerPhoneDayText
- buttonsound
+ promptbutton
end
.Arnie:
farwritetext ArnieAnswerPhoneDayText
- buttonsound
+ promptbutton
end
.Alan:
farwritetext AlanAnswerPhoneDayText
- buttonsound
+ promptbutton
end
.Chad:
farwritetext ChadAnswerPhoneDayText
- buttonsound
+ promptbutton
end
.Derek:
farwritetext DerekAnswerPhoneDayText
- buttonsound
+ promptbutton
end
.Tully:
farwritetext TullyAnswerPhoneDayText
- buttonsound
+ promptbutton
end
.Brent:
farwritetext BrentAnswerPhoneDayText
- buttonsound
+ promptbutton
end
.Vance:
farwritetext VanceAnswerPhoneDayText
- buttonsound
+ promptbutton
end
.Wilton:
farwritetext WiltonAnswerPhoneDayText
- buttonsound
+ promptbutton
end
.Kenji:
farwritetext KenjiAnswerPhoneDayText
- buttonsound
+ promptbutton
end
.Parry:
farwritetext ParryAnswerPhoneDayText
- buttonsound
+ promptbutton
end
PhoneScript_AnswerPhone_Male_Nite:
@@ -293,102 +293,102 @@ PhoneScript_AnswerPhone_Male_Nite:
.Jack:
farwritetext JackAnswerPhoneNiteText
- buttonsound
+ promptbutton
end
.Huey:
farwritetext HueyAnswerPhoneNiteText
- buttonsound
+ promptbutton
end
.Gaven:
farwritetext GavenAnswerPhoneNiteText
- buttonsound
+ promptbutton
end
.Jose:
farwritetext JoseAnswerPhoneNiteText
- buttonsound
+ promptbutton
end
.Joey:
farwritetext JoeyAnswerPhoneNiteText
- buttonsound
+ promptbutton
end
.Wade:
farwritetext WadeAnswerPhoneNiteText
- buttonsound
+ promptbutton
end
.Ralph:
farwritetext RalphAnswerPhoneNiteText
- buttonsound
+ promptbutton
end
.Anthony:
farwritetext AnthonyAnswerPhoneNiteText
- buttonsound
+ promptbutton
end
.Todd:
farwritetext ToddAnswerPhoneNiteText
- buttonsound
+ promptbutton
end
.Irwin:
farwritetext IrwinAnswerPhoneNiteText
- buttonsound
+ promptbutton
end
.Arnie:
farwritetext ArnieAnswerPhoneNiteText
- buttonsound
+ promptbutton
end
.Alan:
farwritetext AlanAnswerPhoneNiteText
- buttonsound
+ promptbutton
end
.Chad:
farwritetext ChadAnswerPhoneNiteText
- buttonsound
+ promptbutton
end
.Derek:
farwritetext DerekAnswerPhoneNiteText
- buttonsound
+ promptbutton
end
.Tully:
farwritetext TullyAnswerPhoneNiteText
- buttonsound
+ promptbutton
end
.Brent:
farwritetext BrentAnswerPhoneNiteText
- buttonsound
+ promptbutton
end
.Vance:
farwritetext VanceAnswerPhoneNiteText
- buttonsound
+ promptbutton
end
.Wilton:
farwritetext WiltonAnswerPhoneNiteText
- buttonsound
+ promptbutton
end
.Kenji:
farwritetext KenjiAnswerPhoneNiteText
- buttonsound
+ promptbutton
end
.Parry:
farwritetext ParryAnswerPhoneNiteText
- buttonsound
+ promptbutton
end
PhoneScript_AnswerPhone_Female:
@@ -408,42 +408,42 @@ PhoneScript_AnswerPhone_Female:
.Beverly:
farwritetext BeverlyAnswerPhoneText
- buttonsound
+ promptbutton
end
.Beth:
farwritetext BethAnswerPhoneText
- buttonsound
+ promptbutton
end
.Reena:
farwritetext ReenaAnswerPhoneText
- buttonsound
+ promptbutton
end
.Liz:
farwritetext LizAnswerPhoneText
- buttonsound
+ promptbutton
end
.Gina:
farwritetext GinaAnswerPhoneText
- buttonsound
+ promptbutton
end
.Dana:
farwritetext DanaAnswerPhoneText
- buttonsound
+ promptbutton
end
.Tiffany:
farwritetext TiffanyAnswerPhoneText
- buttonsound
+ promptbutton
end
.Erin:
farwritetext ErinAnswerPhoneText
- buttonsound
+ promptbutton
end
PhoneScript_AnswerPhone_Female_Day:
@@ -459,42 +459,42 @@ PhoneScript_AnswerPhone_Female_Day:
.Beverly:
farwritetext BeverlyAnswerPhoneDayText
- buttonsound
+ promptbutton
end
.Beth:
farwritetext BethAnswerPhoneDayText
- buttonsound
+ promptbutton
end
.Reena:
farwritetext ReenaAnswerPhoneDayText
- buttonsound
+ promptbutton
end
.Liz:
farwritetext LizAnswerPhoneDayText
- buttonsound
+ promptbutton
end
.Gina:
farwritetext GinaAnswerPhoneDayText
- buttonsound
+ promptbutton
end
.Dana:
farwritetext DanaAnswerPhoneDayText
- buttonsound
+ promptbutton
end
.Tiffany:
farwritetext TiffanyAnswerPhoneDayText
- buttonsound
+ promptbutton
end
.Erin:
farwritetext ErinAnswerPhoneDayText
- buttonsound
+ promptbutton
end
PhoneScript_AnswerPhone_Female_Nite:
@@ -510,42 +510,42 @@ PhoneScript_AnswerPhone_Female_Nite:
.Beverly:
farwritetext BeverlyAnswerPhoneNiteText
- buttonsound
+ promptbutton
end
.Beth:
farwritetext BethAnswerPhoneNiteText
- buttonsound
+ promptbutton
end
.Reena:
farwritetext ReenaAnswerPhoneNiteText
- buttonsound
+ promptbutton
end
.Liz:
farwritetext LizAnswerPhoneNiteText
- buttonsound
+ promptbutton
end
.Gina:
farwritetext GinaAnswerPhoneNiteText
- buttonsound
+ promptbutton
end
.Dana:
farwritetext DanaAnswerPhoneNiteText
- buttonsound
+ promptbutton
end
.Tiffany:
farwritetext TiffanyAnswerPhoneNiteText
- buttonsound
+ promptbutton
end
.Erin:
farwritetext ErinAnswerPhoneNiteText
- buttonsound
+ promptbutton
end
PhoneScript_GreetPhone_Male:
@@ -577,102 +577,102 @@ PhoneScript_GreetPhone_Male:
.Jack:
farwritetext JackGreetText
- buttonsound
+ promptbutton
end
.Huey:
farwritetext HueyGreetText
- buttonsound
+ promptbutton
end
.Gaven:
farwritetext GavenGreetText
- buttonsound
+ promptbutton
end
.Jose:
farwritetext JoseGreetText
- buttonsound
+ promptbutton
end
.Joey:
farwritetext JoeyGreetText
- buttonsound
+ promptbutton
end
.Wade:
farwritetext WadeGreetText
- buttonsound
+ promptbutton
end
.Ralph:
farwritetext RalphGreetText
- buttonsound
+ promptbutton
end
.Anthony:
farwritetext AnthonyGreetText
- buttonsound
+ promptbutton
end
.Todd:
farwritetext ToddGreetText
- buttonsound
+ promptbutton
end
.Irwin:
farwritetext IrwinGreetText
- buttonsound
+ promptbutton
end
.Arnie:
farwritetext ArnieGreetText
- buttonsound
+ promptbutton
end
.Alan:
farwritetext AlanGreetText
- buttonsound
+ promptbutton
end
.Chad:
farwritetext ChadGreetText
- buttonsound
+ promptbutton
end
.Derek:
farwritetext DerekGreetText
- buttonsound
+ promptbutton
end
.Tully:
farwritetext TullyGreetText
- buttonsound
+ promptbutton
end
.Brent:
farwritetext BrentGreetText
- buttonsound
+ promptbutton
end
.Vance:
farwritetext VanceGreetText
- buttonsound
+ promptbutton
end
.Wilton:
farwritetext WiltonGreetText
- buttonsound
+ promptbutton
end
.Kenji:
farwritetext KenjiGreetText
- buttonsound
+ promptbutton
end
.Parry:
farwritetext ParryGreetText
- buttonsound
+ promptbutton
end
PhoneScript_GreetPhone_Male_Day:
@@ -700,102 +700,102 @@ PhoneScript_GreetPhone_Male_Day:
.Jack:
farwritetext JackGreetDayText
- buttonsound
+ promptbutton
end
.Huey:
farwritetext HueyGreetDayText
- buttonsound
+ promptbutton
end
.Gaven:
farwritetext GavenGreetDayText
- buttonsound
+ promptbutton
end
.Jose:
farwritetext JoseGreetDayText
- buttonsound
+ promptbutton
end
.Joey:
farwritetext JoeyGreetDayText
- buttonsound
+ promptbutton
end
.Wade:
farwritetext WadeGreetDayText
- buttonsound
+ promptbutton
end
.Ralph:
farwritetext RalphGreetDayText
- buttonsound
+ promptbutton
end
.Anthony:
farwritetext AnthonyGreetDayText
- buttonsound
+ promptbutton
end
.Todd:
farwritetext ToddGreetDayText
- buttonsound
+ promptbutton
end
.Irwin:
farwritetext IrwinGreetDayText
- buttonsound
+ promptbutton
end
.Arnie:
farwritetext ArnieGreetDayText
- buttonsound
+ promptbutton
end
.Alan:
farwritetext AlanGreetDayText
- buttonsound
+ promptbutton
end
.Chad:
farwritetext ChadGreetDayText
- buttonsound
+ promptbutton
end
.Derek:
farwritetext DerekGreetDayText
- buttonsound
+ promptbutton
end
.Tully:
farwritetext TullyGreetDayText
- buttonsound
+ promptbutton
end
.Brent:
farwritetext BrentGreetDayText
- buttonsound
+ promptbutton
end
.Vance:
farwritetext VanceGreetDayText
- buttonsound
+ promptbutton
end
.Wilton:
farwritetext WiltonGreetDayText
- buttonsound
+ promptbutton
end
.Kenji:
farwritetext KenjiGreetDayText
- buttonsound
+ promptbutton
end
.Parry:
farwritetext ParryGreetDayText
- buttonsound
+ promptbutton
end
PhoneScript_GreetPhone_Male_Nite:
@@ -823,102 +823,102 @@ PhoneScript_GreetPhone_Male_Nite:
.Jack:
farwritetext JackGreetNiteText
- buttonsound
+ promptbutton
end
.Huey:
farwritetext HueyGreetNiteText
- buttonsound
+ promptbutton
end
.Gaven:
farwritetext GavenGreetNiteText
- buttonsound
+ promptbutton
end
.Jose:
farwritetext JoseGreetNiteText
- buttonsound
+ promptbutton
end
.Joey:
farwritetext JoeyGreetNiteText
- buttonsound
+ promptbutton
end
.Wade:
farwritetext WadeGreetNiteText
- buttonsound
+ promptbutton
end
.Ralph:
farwritetext RalphGreetNiteText
- buttonsound
+ promptbutton
end
.Anthony:
farwritetext AnthonyGreetNiteText
- buttonsound
+ promptbutton
end
.Todd:
farwritetext ToddGreetNiteText
- buttonsound
+ promptbutton
end
.Irwin:
farwritetext IrwinGreetNiteText
- buttonsound
+ promptbutton
end
.Arnie:
farwritetext ArnieGreetNiteText
- buttonsound
+ promptbutton
end
.Alan:
farwritetext AlanGreetNiteText
- buttonsound
+ promptbutton
end
.Chad:
farwritetext ChadGreetNiteText
- buttonsound
+ promptbutton
end
.Derek:
farwritetext DerekGreetNiteText
- buttonsound
+ promptbutton
end
.Tully:
farwritetext TullyGreetNiteText
- buttonsound
+ promptbutton
end
.Brent:
farwritetext BrentGreetNiteText
- buttonsound
+ promptbutton
end
.Vance:
farwritetext VanceGreetNiteText
- buttonsound
+ promptbutton
end
.Wilton:
farwritetext WiltonGreetNiteText
- buttonsound
+ promptbutton
end
.Kenji:
farwritetext KenjiGreetNiteText
- buttonsound
+ promptbutton
end
.Parry:
farwritetext ParryGreetNiteText
- buttonsound
+ promptbutton
end
PhoneScript_GreetPhone_Female:
@@ -938,42 +938,42 @@ PhoneScript_GreetPhone_Female:
.Beverly:
farwritetext BeverlyGreetText
- buttonsound
+ promptbutton
end
.Beth:
farwritetext BethGreetText
- buttonsound
+ promptbutton
end
.Reena:
farwritetext ReenaGreetText
- buttonsound
+ promptbutton
end
.Liz:
farwritetext LizGreetText
- buttonsound
+ promptbutton
end
.Gina:
farwritetext GinaGreetText
- buttonsound
+ promptbutton
end
.Dana:
farwritetext DanaGreetText
- buttonsound
+ promptbutton
end
.Tiffany:
farwritetext TiffanyGreetText
- buttonsound
+ promptbutton
end
.Erin:
farwritetext ErinGreetText
- buttonsound
+ promptbutton
end
PhoneScript_GreetPhone_Female_Day:
@@ -989,42 +989,42 @@ PhoneScript_GreetPhone_Female_Day:
.Beverly:
farwritetext BeverlyGreetDayText
- buttonsound
+ promptbutton
end
.Beth:
farwritetext BethGreetDayText
- buttonsound
+ promptbutton
end
.Reena:
farwritetext ReenaGreetDayText
- buttonsound
+ promptbutton
end
.Liz:
farwritetext LizGreetDayText
- buttonsound
+ promptbutton
end
.Gina:
farwritetext GinaGreetDayText
- buttonsound
+ promptbutton
end
.Dana:
farwritetext DanaGreetDayText
- buttonsound
+ promptbutton
end
.Tiffany:
farwritetext TiffanyGreetDayText
- buttonsound
+ promptbutton
end
.Erin:
farwritetext ErinGreetDayText
- buttonsound
+ promptbutton
end
PhoneScript_GreetPhone_Female_Nite:
@@ -1040,42 +1040,42 @@ PhoneScript_GreetPhone_Female_Nite:
.Beverly:
farwritetext BeverlyGreetNiteText
- buttonsound
+ promptbutton
end
.Beth:
farwritetext BethGreetNiteText
- buttonsound
+ promptbutton
end
.Reena:
farwritetext ReenaGreetNiteText
- buttonsound
+ promptbutton
end
.Liz:
farwritetext LizGreetNiteText
- buttonsound
+ promptbutton
end
.Gina:
farwritetext GinaGreetNiteText
- buttonsound
+ promptbutton
end
.Dana:
farwritetext DanaGreetNiteText
- buttonsound
+ promptbutton
end
.Tiffany:
farwritetext TiffanyGreetNiteText
- buttonsound
+ promptbutton
end
.Erin:
farwritetext ErinGreetNiteText
- buttonsound
+ promptbutton
end
PhoneScript_Generic_Male:
@@ -1100,92 +1100,92 @@ PhoneScript_Generic_Male:
.Jack:
farwritetext JackGenericText
- buttonsound
+ promptbutton
end
.Unknown:
farwritetext UnknownGenericText
- buttonsound
+ promptbutton
end
.Gaven:
farwritetext GavenGenericText
- buttonsound
+ promptbutton
end
.Jose:
farwritetext JoseGenericText
- buttonsound
+ promptbutton
end
.Joey:
farwritetext JoeyGenericText
- buttonsound
+ promptbutton
end
.Wade:
farwritetext WadeGenericText
- buttonsound
+ promptbutton
end
.Ralph:
farwritetext RalphGenericText
- buttonsound
+ promptbutton
end
.Anthony:
farwritetext AnthonyGenericText
- buttonsound
+ promptbutton
end
.Todd:
farwritetext ToddGenericText
- buttonsound
+ promptbutton
end
.Arnie:
farwritetext ArnieGenericText
- buttonsound
+ promptbutton
end
.Alan:
farwritetext AlanGenericText
- buttonsound
+ promptbutton
end
.Chad:
farwritetext ChadGenericText
- buttonsound
+ promptbutton
end
.Derek:
farwritetext DerekGenericText
- buttonsound
+ promptbutton
end
.Tully:
farwritetext TullyGenericText
- buttonsound
+ promptbutton
end
.Brent:
farwritetext BrentGenericText
- buttonsound
+ promptbutton
end
.Vance:
farwritetext VanceGenericText
- buttonsound
+ promptbutton
end
.Wilton:
farwritetext WiltonGenericText
- buttonsound
+ promptbutton
end
.Parry:
farwritetext ParryGenericText
- buttonsound
+ promptbutton
end
PhoneScript_Generic_Female:
@@ -1201,42 +1201,42 @@ PhoneScript_Generic_Female:
.Beverly:
farwritetext BeverlyGenericText
- buttonsound
+ promptbutton
end
.Beth:
farwritetext BethGenericText
- buttonsound
+ promptbutton
end
.Reena:
farwritetext ReenaGenericText
- buttonsound
+ promptbutton
end
.Liz:
farwritetext LizGenericText
- buttonsound
+ promptbutton
end
.Gina:
farwritetext GinaGenericText
- buttonsound
+ promptbutton
end
.Dana:
farwritetext DanaGenericText
- buttonsound
+ promptbutton
end
.Tiffany:
farwritetext TiffanyGenericText
- buttonsound
+ promptbutton
end
.Erin:
farwritetext ErinGenericText
- buttonsound
+ promptbutton
end
PhoneScript_MonFlavorText:
@@ -1244,7 +1244,7 @@ PhoneScript_MonFlavorText:
farscall PhoneScript_Random2
ifequal $0, .TooEnergetic
farwritetext UnknownGenericText
- buttonsound
+ promptbutton
farsjump PhoneScript_HangUpText_Male
.TooEnergetic:
@@ -1252,7 +1252,7 @@ PhoneScript_MonFlavorText:
.unnecessary
farwritetext UnknownTougherThanEverText
- buttonsound
+ promptbutton
farsjump PhoneScript_HangUpText_Male
GrandmaString: db "Grandma@"
diff --git a/engine/phone/scripts/generic_caller.asm b/engine/phone/scripts/generic_caller.asm
index 6c4e9fd7d..5dff5654b 100644
--- a/engine/phone/scripts/generic_caller.asm
+++ b/engine/phone/scripts/generic_caller.asm
@@ -76,87 +76,87 @@ Phone_WhosBragging_Male:
.Jack:
farwritetext JackIntelligenceKeepsRisingText
- buttonsound
+ promptbutton
end
.Gaven:
farwritetext GavenMonGreaterThanImaginedText
- buttonsound
+ promptbutton
end
.Jose:
farwritetext JoseMonsStickHasADeliciousAromaText
- buttonsound
+ promptbutton
end
.Joey:
farwritetext JoeyMonLookingSharperText
- buttonsound
+ promptbutton
end
.Wade:
farwritetext WadeAreYourMonGrowingText
- buttonsound
+ promptbutton
end
.Ralph:
farwritetext RalphNeglectingKidsText
- buttonsound
+ promptbutton
end
.Anthony:
farwritetext AnthonyMonAteSomeBerriesText
- buttonsound
+ promptbutton
end
.Todd:
farwritetext ToddLooksCuteLikeMeText
- buttonsound
+ promptbutton
end
.Arnie:
farwritetext ArnieMonIsSoCuteText
- buttonsound
+ promptbutton
end
.Alan:
farwritetext AlanGettingStrongerText
- buttonsound
+ promptbutton
end
.Chad:
farwritetext ChadObservingWildText
- buttonsound
+ promptbutton
end
.Derek:
farwritetext DerekCheekPinchingText
- buttonsound
+ promptbutton
end
.Tully:
farwritetext TullyMonHasGrownText
- buttonsound
+ promptbutton
end
.Brent:
farwritetext BrentRareTradeText
- buttonsound
+ promptbutton
end
.Vance:
farwritetext VanceMonHasBecomeTougherText
- buttonsound
+ promptbutton
end
.Wilton:
farwritetext WiltonMonHasGrownText
- buttonsound
+ promptbutton
end
.Parry:
farwritetext ParryNothingCanMatchText
- buttonsound
+ promptbutton
end
Phone_WhosBragging_Female:
@@ -172,42 +172,42 @@ Phone_WhosBragging_Female:
.Beverly:
farwritetext BeverlyMadeMonEvenCuterText
- buttonsound
+ promptbutton
end
.Beth:
farwritetext BethExhilaratingRideText
- buttonsound
+ promptbutton
end
.Reena:
farwritetext ReenaMonsIsAPerfectMatchText
- buttonsound
+ promptbutton
end
.Liz:
farwritetext LizMonAlwaysWantsToNuzzleText
- buttonsound
+ promptbutton
end
.Gina:
farwritetext GinaGettingInSyncWithMonText
- buttonsound
+ promptbutton
end
.Dana:
farwritetext DanaTakingPhotosText
- buttonsound
+ promptbutton
end
.Tiffany:
farwritetext TiffanyMonIsAdorableText
- buttonsound
+ promptbutton
end
.Erin:
farwritetext ErinMonIsMuchStrongerText
- buttonsound
+ promptbutton
end
Phone_WhoDefeatedMon_Male:
@@ -232,87 +232,87 @@ Phone_WhoDefeatedMon_Male:
.Jack:
farwritetext JackDefeatedMonText
- buttonsound
+ promptbutton
end
.Gaven:
farwritetext GavenDefeatedMonText
- buttonsound
+ promptbutton
end
.Jose:
farwritetext JoseDefeatedMonText
- buttonsound
+ promptbutton
end
.Joey:
farwritetext JoeyDefeatedMonText
- buttonsound
+ promptbutton
end
.Wade:
farwritetext WadeDefeatedMonText
- buttonsound
+ promptbutton
end
.Ralph:
farwritetext RalphDefeatedMonText
- buttonsound
+ promptbutton
end
.Anthony:
farwritetext AnthonyDefeatedMonText
- buttonsound
+ promptbutton
end
.Todd:
farwritetext ToddDefeatedMonText
- buttonsound
+ promptbutton
end
.Arnie:
farwritetext ArnieDefeatedMonText
- buttonsound
+ promptbutton
end
.Alan:
farwritetext AlanDefeatedMonText
- buttonsound
+ promptbutton
end
.Chad:
farwritetext ChadDefeatedMonText
- buttonsound
+ promptbutton
end
.Derek:
farwritetext DerekDefeatedMonText
- buttonsound
+ promptbutton
end
.Tully:
farwritetext TullyDefeatedMonText
- buttonsound
+ promptbutton
end
.Brent:
farwritetext BrentDefeatedMonText
- buttonsound
+ promptbutton
end
.Vance:
farwritetext VanceDefeatedMonText
- buttonsound
+ promptbutton
end
.Wilton:
farwritetext WiltonDefeatedMonText
- buttonsound
+ promptbutton
end
.Parry:
farwritetext ParryDefeatedMonText
- buttonsound
+ promptbutton
end
Phone_WhoDefeatedMon_Female:
@@ -328,42 +328,42 @@ Phone_WhoDefeatedMon_Female:
.Beverly:
farwritetext BeverlyDefeatedMonText
- buttonsound
+ promptbutton
end
.Beth:
farwritetext BethDefeatedMonText
- buttonsound
+ promptbutton
end
.Reena:
farwritetext ReenaDefeatedMonText
- buttonsound
+ promptbutton
end
.Liz:
farwritetext LizDefeatedMonText
- buttonsound
+ promptbutton
end
.Gina:
farwritetext GinaDefeatedMonText
- buttonsound
+ promptbutton
end
.Dana:
farwritetext DanaDefeatedMonText
- buttonsound
+ promptbutton
end
.Tiffany:
farwritetext TiffanyDefeatedMonText
- buttonsound
+ promptbutton
end
.Erin:
farwritetext ErinDefeatedMonText
- buttonsound
+ promptbutton
end
Phone_WhoLostAMon_Male:
@@ -388,87 +388,87 @@ Phone_WhoLostAMon_Male:
.Jack:
farwritetext JackLostAMonText
- buttonsound
+ promptbutton
end
.Gaven:
farwritetext GavenLostAMonText
- buttonsound
+ promptbutton
end
.Jose:
farwritetext JoseLostAMonText
- buttonsound
+ promptbutton
end
.Joey:
farwritetext JoeyLostAMonText
- buttonsound
+ promptbutton
end
.Wade:
farwritetext WadeLostAMonText
- buttonsound
+ promptbutton
end
.Ralph:
farwritetext RalphLostAMonText
- buttonsound
+ promptbutton
end
.Anthony:
farwritetext AnthonyLostAMonText
- buttonsound
+ promptbutton
end
.Todd:
farwritetext ToddLostAMonText
- buttonsound
+ promptbutton
end
.Arnie:
farwritetext ArnieLostAMonText
- buttonsound
+ promptbutton
end
.Alan:
farwritetext AlanLostAMonText
- buttonsound
+ promptbutton
end
.Chad:
farwritetext ChadLostAMonText
- buttonsound
+ promptbutton
end
.Derek:
farwritetext DerekLostAMonText
- buttonsound
+ promptbutton
end
.Tully:
farwritetext TullyLostAMonText
- buttonsound
+ promptbutton
end
.Brent:
farwritetext BrentLostAMonText
- buttonsound
+ promptbutton
end
.Vance:
farwritetext VanceLostAMonText
- buttonsound
+ promptbutton
end
.Wilton:
farwritetext WiltonLostAMonText
- buttonsound
+ promptbutton
end
.Parry:
farwritetext ParryLostAMonText
- buttonsound
+ promptbutton
end
Phone_WhoLostAMon_Female:
@@ -484,42 +484,42 @@ Phone_WhoLostAMon_Female:
.Beverly:
farwritetext BeverlyLostAMonText
- buttonsound
+ promptbutton
end
.Beth:
farwritetext BethLostAMonText
- buttonsound
+ promptbutton
end
.Reena:
farwritetext ReenaLostAMonText
- buttonsound
+ promptbutton
end
.Liz:
farwritetext LizLostAMonText
- buttonsound
+ promptbutton
end
.Gina:
farwritetext GinaLostAMonText
- buttonsound
+ promptbutton
end
.Dana:
farwritetext DanaLostAMonText
- buttonsound
+ promptbutton
end
.Tiffany:
farwritetext TiffanyLostAMonText
- buttonsound
+ promptbutton
end
.Erin:
farwritetext ErinLostAMonText
- buttonsound
+ promptbutton
end
PhoneScript_WantsToBattle_Male:
@@ -552,87 +552,87 @@ PhoneScript_RematchText_Male:
.Jack:
farwritetext JackBattleRematchText
- buttonsound
+ promptbutton
end
.Huey:
farwritetext HueyBattleRematchText
- buttonsound
+ promptbutton
end
.Gaven:
farwritetext GavenBattleRematchText
- buttonsound
+ promptbutton
end
.Jose:
farwritetext JoseBattleRematchText
- buttonsound
+ promptbutton
end
.Joey:
farwritetext JoeyBattleRematchText
- buttonsound
+ promptbutton
end
.Wade:
farwritetext WadeBattleRematchText
- buttonsound
+ promptbutton
end
.Ralph:
farwritetext RalphBattleRematchText
- buttonsound
+ promptbutton
end
.Anthony:
farwritetext AnthonyBattleRematchText
- buttonsound
+ promptbutton
end
.Todd:
farwritetext ToddBattleRematchText
- buttonsound
+ promptbutton
end
.Arnie:
farwritetext ArnieBattleRematchText
- buttonsound
+ promptbutton
end
.Alan:
farwritetext AlanBattleRematchText
- buttonsound
+ promptbutton
end
.Chad:
farwritetext ChadBattleRematchText
- buttonsound
+ promptbutton
end
.Tully:
farwritetext TullyBattleRematchText
- buttonsound
+ promptbutton
end
.Brent:
farwritetext BrentBattleRematchText
- buttonsound
+ promptbutton
end
.Vance:
farwritetext VanceBattleRematchText
- buttonsound
+ promptbutton
end
.Wilton:
farwritetext WiltonBattleRematchText
- buttonsound
+ promptbutton
end
.Parry:
farwritetext ParryBattleRematchText
- buttonsound
+ promptbutton
end
PhoneScript_RematchText_Female:
@@ -647,37 +647,37 @@ PhoneScript_RematchText_Female:
.Beth:
farwritetext BethBattleRematchText
- buttonsound
+ promptbutton
end
.Reena:
farwritetext ReenaBattleRematchText
- buttonsound
+ promptbutton
end
.Liz:
farwritetext LizBattleRematchText
- buttonsound
+ promptbutton
end
.Gina:
farwritetext GinaBattleRematchText
- buttonsound
+ promptbutton
end
.Dana:
farwritetext DanaBattleRematchText
- buttonsound
+ promptbutton
end
.Tiffany:
farwritetext TiffanyBattleRematchText
- buttonsound
+ promptbutton
end
.Erin:
farwritetext ErinBattleRematchText
- buttonsound
+ promptbutton
end
LizWrongNumberScript:
@@ -861,37 +861,37 @@ PhoneScript_BugCatchingContest:
.Wade:
farwritetext WadeBugCatchingContestText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Male
.Derek:
farwritetext DerekBugCatchingContestText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Male
IrwinRocketRumorScript:
farwritetext IrwinRocketTakeoverRumorText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Male
GinaRocketRumorScript:
farwritetext GinaRocketTakeoverRumorText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Female
ArnieSwarmScript:
farwritetext ArnieSwarmText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Male
RalphItemScript:
farwritetext RalphItemText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Male
AnthonySwarmScript:
farwritetext AnthonySwarmText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Male
PhoneScript_FoundItem_Male:
@@ -952,10 +952,10 @@ PhoneScript_FoundItem_Female:
ToddItemScript:
farwritetext ToddDepartmentStoreBargainSaleText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Male
KenjiCallingPhoneScript:
farwritetext KenjiRemainDedicatedText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Male
diff --git a/engine/phone/scripts/hangups.asm b/engine/phone/scripts/hangups.asm
index e524ca0fc..7ca1db51c 100644
--- a/engine/phone/scripts/hangups.asm
+++ b/engine/phone/scripts/hangups.asm
@@ -1,131 +1,131 @@
JackPhoneTipsScript:
farwritetext JackHeardSomeGreatTipsText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Male
BeverlyHangUpScript:
farwritetext BeverlyLetsChatAboutMonAgainText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Female
HueyHangUpScript:
farwritetext HueyWeHaveToBattleAgainSometimeText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Male
GavenHangUpNotThursdayScript:
farwritetext GavenHangUpNotThursdayText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Male
BethHangUpScript:
farwritetext BethLetsBattleAgainSometimeText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Female
JoseHangUpScript:
farwritetext JoseHaventGottenItemYetText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Male
ReenaForwardScript:
farwritetext ReenaForwardText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Female
JoeyHangUpScript:
farwritetext JoeyDevisingStrategiesText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Male
WadeNoBerriesScript:
farwritetext WadeNoBerriesText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Male
RalphNoItemScript:
farwritetext RalphNoItemText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Male
LizHangUpScript:
farwritetext LizFawningOverMonText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Female
AnthonyHangUpScript:
farwritetext AnthonyWasntPayingAttentionText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Male
ToddNoItemScript:
farwritetext ToddSavingUpForBargainSaleText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Male
GinaHangUpScript:
farwritetext GinaHaventFoundAnythingYetText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Female
ArnieHangUpScript:
farwritetext ArnieHaventSeenRareMonText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Male
AlanHangUpScript:
farwritetext AlanHaventPickedUpAnythingText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Male
DanaHangUpScript:
farwritetext DanaCanYouWaitABitLongerText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Female
ChadHangUpScript:
farwritetext ChadGoingToStudyHardText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Male
DerekHangUpScript:
farwritetext DerekLetsGetTogetherText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Male
TullyNoItemScript:
farwritetext TullyNoItemText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Male
BrentHangUpScript:
farwritetext BrentSorryImTooBusyText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Male
TiffanyNoItemScript:
farwritetext TiffanyNoItemText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Female
VanceLookingForwardScript:
farwritetext VanceLookingForwardText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Male
WiltonHaventFoundAnythingScript:
farwritetext WiltonHaventFoundAnythingText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Male
ParryBattleWithMeScript:
farwritetext ParryBattleWithMeText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Male
ErinWorkingHardScript:
farwritetext ErinWorkingHardText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Female
IrwinRandomTextScript:
@@ -136,17 +136,17 @@ IrwinRandomTextScript:
IrwinEscapadeScript:
farwritetext IrwinYourEscapadesRockText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Male
IrwinGoodMatchScript:
farwritetext IrwinGoodMatchText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Male
IrwinSoMuchToChatAboutScript:
farwritetext IrwinSoMuchToChatAboutText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Male
KenjiAnswerPhoneScript:
@@ -154,12 +154,12 @@ KenjiAnswerPhoneScript:
ifequal 2, .Training
ifequal 1, .OnBreak
farwritetext KenjiCallMeBackAnotherTimeText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Male
.Training:
farwritetext KenjiIllHaveTimeToChatTomorrowText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Male
.OnBreak:
@@ -169,15 +169,15 @@ KenjiAnswerPhoneScript:
iftrue .Night
setevent EVENT_KENJI_ON_BREAK
farwritetext KenjiTakingABreakText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Male
.Morning:
farwritetext KenjiHangUpMorningText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Male
.Night:
farwritetext KenjiHangUpNightText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Male
diff --git a/engine/phone/scripts/hangups_2.asm b/engine/phone/scripts/hangups_2.asm
index c0fa7217a..aad10df21 100644
--- a/engine/phone/scripts/hangups_2.asm
+++ b/engine/phone/scripts/hangups_2.asm
@@ -1,49 +1,49 @@
BeverlyComePickUpScript:
farwritetext BeverlyComePickUpText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Female
JoseComePickUpScript:
farwritetext JoseComePickUpText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Male
WadeComeQuickScript:
farwritetext WadeComeQuickText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Male
GinaComePickUpScript:
farwritetext GinaComePickUpText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Female
AlanComePickUpScript:
farwritetext AlanComePickUpGiftText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Male
DanaComePickUpScript:
farwritetext DanaComePickUpText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Female
DerekComePickUpScript:
farwritetext DerekComePickUpText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Male
TullyHurryScript:
farwritetext TullyHurryText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Male
TiffanyHurryScript:
farwritetext TiffanyHurryText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Female
WiltonWantThisScript:
farwritetext WiltonWantThisText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Male
diff --git a/engine/phone/scripts/irwin_gossip.asm b/engine/phone/scripts/irwin_gossip.asm
index 97816d6e8..2a377e243 100644
--- a/engine/phone/scripts/irwin_gossip.asm
+++ b/engine/phone/scripts/irwin_gossip.asm
@@ -24,65 +24,65 @@ IrwinRumorScript:
checkflag ENGINE_PLAINBADGE
iftrue .PlainBadge
farwritetext IrwinCalledRightAwayText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Male
.PlainBadge:
farwritetext IrwinPlainBadgeGossipText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Male
.JasmineReturned:
farwritetext IrwinJasmineReturnedGossipText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Male
.RocketHideout:
farwritetext IrwinRocketHideoutGossipText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Male
.RadioTower:
farwritetext IrwinRadioTowerGossipText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Male
.RisingBadge:
farwritetext IrwinRisingBadgeGossipText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Male
.EliteFour:
farwritetext IrwinEliteFourGossipText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Male
.VermilionCity:
farwritetext IrwinVermilionCityGossipText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Male
.TrainPass:
farwritetext IrwinTrainPassGossipText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Male
.Snorlax:
farwritetext IrwinSnorlaxGossipText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Male
.MtSilver:
farwritetext IrwinMtSilverGossipText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Male
.FogBadge:
farwritetext IrwinFogBadgeGossipText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Male
.MarshBadge:
farwritetext IrwinMarshBadgeGossipText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Male
diff --git a/engine/phone/scripts/jack_gossip.asm b/engine/phone/scripts/jack_gossip.asm
index ffb8cb59f..0ebdf3a1b 100644
--- a/engine/phone/scripts/jack_gossip.asm
+++ b/engine/phone/scripts/jack_gossip.asm
@@ -14,55 +14,55 @@ JackTriviaScript:
.Thunder:
farwritetext JackThunderTriviaText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Male
.Rollout:
farwritetext JackRolloutTriviaText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Male
.Solarbeam:
farwritetext JackSolarbeamTriviaText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Male
.Stomp:
farwritetext JackStompTriviaText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Male
.Gust:
farwritetext JackGustTriviaText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Male
.Twister:
farwritetext JackTwisterTriviaText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Male
.Earthquake:
farwritetext JackEarthquakeTriviaText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Male
.Magnitude:
farwritetext JackMagnitudeTriviaText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Male
.Sandstorm:
farwritetext JackSandstormTriviaText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Male
.SunnyDay:
farwritetext JackSunnyDayTriviaText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Male
.RainDance:
farwritetext JackRainDanceTriviaText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Male
diff --git a/engine/phone/scripts/liz_gossip.asm b/engine/phone/scripts/liz_gossip.asm
index e57ea1162..cbd8206e5 100644
--- a/engine/phone/scripts/liz_gossip.asm
+++ b/engine/phone/scripts/liz_gossip.asm
@@ -13,50 +13,50 @@ LizGossipRandomScript:
.RuinsOfAlph:
farwritetext LizRuinsOfAlphGossipText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Female
.Falkner:
farwritetext LizFalknerGossipText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Female
.Earl:
farwritetext LizEarlGossipText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Female
.SurfPikachu:
farwritetext LizSurfPikachuGossipText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Female
.MooMooMilk:
farwritetext LizMooMooMilkGossipText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Female
.Salon:
farwritetext LizSalonGossipText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Female
.Whitney:
farwritetext LizWhitneyGossipText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Female
.BugCatchingContest:
farwritetext LizBugCatchingContestGossipText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Female
.BeautifulMon:
farwritetext LizBeautifulMonGossipText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Female
.Forgot:
farwritetext LizForgotGossipText
- buttonsound
+ promptbutton
sjump PhoneScript_HangUpText_Female
diff --git a/engine/phone/scripts/mom.asm b/engine/phone/scripts/mom.asm
index 5b5ca7982..900e48be6 100644
--- a/engine/phone/scripts/mom.asm
+++ b/engine/phone/scripts/mom.asm
@@ -13,7 +13,7 @@ MomPhoneCalleeScript:
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_8
iftrue MomPhoneHangUpScript
farwritetext MomPhoneGreetingText
- buttonsound
+ promptbutton
getcurlandmarkname STRING_BUFFER_3
readvar VAR_ROOFPALETTE
ifequal 1, MomPhonePalette1
@@ -22,7 +22,7 @@ MomPhoneCalleeScript:
MomPhoneLandmark:
farwritetext MomPhoneLandmarkText
- buttonsound
+ promptbutton
sjump MomSavingMoney
MomPhonePalette1:
@@ -33,17 +33,17 @@ MomPhonePalette1:
ifequal GROUP_AZALEA_TOWN, .azalea
ifequal GROUP_GOLDENROD_CITY, .goldenrod
farwritetext MomPhoneGenericAreaText
- buttonsound
+ promptbutton
sjump MomSavingMoney
.newbark
farwritetext MomPhoneNewBarkText
- buttonsound
+ promptbutton
sjump MomSavingMoney
.cherrygrove
farwritetext MomPhoneCherrygroveText
- buttonsound
+ promptbutton
sjump MomSavingMoney
.violet
@@ -58,12 +58,12 @@ MomPhonePalette1:
MomPhonePalette2:
farwritetext MomOtherAreaText
- buttonsound
+ promptbutton
sjump MomSavingMoney
MomPhoneOther:
farwritetext MomDeterminedText
- buttonsound
+ promptbutton
sjump MomSavingMoney
MomSavingMoney:
@@ -107,13 +107,13 @@ MomSavingMoney:
MomPhoneSaveMoneyScript:
setflag ENGINE_MOM_SAVING_MONEY
farwritetext MomOKIllSaveText
- buttonsound
+ promptbutton
sjump MomPhoneHangUpScript
MomPhoneWontSaveMoneyScript:
clearflag ENGINE_MOM_SAVING_MONEY
farwritetext MomPhoneWontSaveMoneyText
- buttonsound
+ promptbutton
sjump MomPhoneHangUpScript
MomPhoneHangUpScript:
diff --git a/engine/pokemon/breeding.asm b/engine/pokemon/breeding.asm
index 34a0f2bbe..9751a90cf 100644
--- a/engine/pokemon/breeding.asm
+++ b/engine/pokemon/breeding.asm
@@ -869,7 +869,7 @@ DayCareMon1:
ld a, [wDayCareLady]
bit DAYCARELADY_HAS_MON_F, a
jr z, DayCareMonCursor
- call ButtonSound
+ call PromptButton
ld hl, wBreedMon2Nick
call DayCareMonCompatibilityText
jp PrintText
@@ -882,7 +882,7 @@ DayCareMon2:
ld a, [wDayCareMan]
bit DAYCAREMAN_HAS_MON_F, a
jr z, DayCareMonCursor
- call ButtonSound
+ call PromptButton
ld hl, wBreedMon1Nick
call DayCareMonCompatibilityText
jp PrintText
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-27 07:10:31 +0000