pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-09-08 08:13:02 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rename buttonsound to promptbutton

Browse Source
This commit is contained in:
Rangi
2019-11-03 12:48:54 -05:00
parent 5134266b9a
commit 4aeab6b879
149 changed files with 804 additions and 801 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
data/text/common_1.asm
View File

@@ -94,7 +94,7 @@ _GrewToLevelText::
text_decimal wCurPartyLevel, 1, 3 text_decimal wCurPartyLevel, 1, 3
text "!@" text "!@"
sound_dex_fanfare_50_79 ; plays SFX_DEX_FANFARE_50_79, identical to SFX_LEVEL_UP sound_dex_fanfare_50_79 ; plays SFX_DEX_FANFARE_50_79, identical to SFX_LEVEL_UP
text_waitbutton text_promptbutton
text_end text_end
text_end ; unused text_end ; unused
@@ -1343,7 +1343,7 @@ _ReceiveItemText::
text_ram wStringBuffer1 text_ram wStringBuffer1
text "!@" text "!@"
sound_item sound_item
text_waitbutton text_promptbutton
text_end text_end
text_end ; unused text_end ; unused

8
data/text/common_2.asm
View File

@@ -314,7 +314,7 @@ _CutNothingText::
_BlindingFlashText:: _BlindingFlashText::
text "A blinding FLASH" text "A blinding FLASH"
line "lights the area!@" line "lights the area!@"
text_waitbutton text_promptbutton
text_end text_end
text_end ; unused text_end ; unused
@@ -794,7 +794,7 @@ _BreedEggHatchText::
text " came" text " came"
line "out of its EGG!@" line "out of its EGG!@"
sound_caught_mon sound_caught_mon
text_waitbutton text_promptbutton
text_end text_end
text_end ; unused text_end ; unused
@@ -1055,7 +1055,7 @@ _KarpGuruRecordText::
text " caught by" text " caught by"
line "@" line "@"
text_ram wMagikarpRecordHoldersName text_ram wMagikarpRecordHoldersName
text_waitbutton text_promptbutton
text_end text_end
text_end ; unused text_end ; unused
@@ -1551,7 +1551,7 @@ _OakText2::
text_end text_end
_OakText3:: _OakText3::
text_waitbutton text_promptbutton
text_end text_end
text_end ; unused text_end ; unused

8
data/text/common_3.asm
View File

@@ -959,7 +959,7 @@ _LearnedMoveText::
text_ram wStringBuffer2 text_ram wStringBuffer2
text "!@" text "!@"
sound_dex_fanfare_50_79 sound_dex_fanfare_50_79
text_waitbutton text_promptbutton
text_end text_end
text_end ; unused text_end ; unused
@@ -1244,7 +1244,7 @@ Text_BallCaught::
text_end ; unused text_end ; unused
_WaitButtonText:: _WaitButtonText::
text_waitbutton text_promptbutton
text_end text_end
text_end ; unused text_end ; unused
@@ -1261,7 +1261,7 @@ _NewDexDataText::
line "was newly added to" line "was newly added to"
cont "the #DEX.@" cont "the #DEX.@"
sound_slot_machine_start sound_slot_machine_start
text_waitbutton text_promptbutton
text_end text_end
text_end ; unused text_end ; unused
@@ -1308,7 +1308,7 @@ _FluteWakeUpText::
Text_PlayedPokeFlute:: Text_PlayedPokeFlute::
text "<PLAYER> played the" text "<PLAYER> played the"
line "# FLUTE.@" line "# FLUTE.@"
text_waitbutton text_promptbutton
text_end text_end
text_end ; unused text_end ; unused

2
docs/event_commands.md
View File

@@ -298,7 +298,7 @@ If <code><i>item_id</i></code> = `USE_SCRIPT_VAR`, then it uses `[wScriptVar]` i
## `$54`: `waitbutton` ## `$54`: `waitbutton`
## `$55`: `buttonsound` ## `$55`: `promptbutton`
## `$56`: <code>pokepic <i>mon_id</i></code> ## `$56`: <code>pokepic <i>mon_id</i></code>

4
docs/text_commands.md
View File

@@ -35,7 +35,7 @@ Draw a box.
Write text at (1, 16). Write text at (1, 16).
## `$06`: `text_waitbutton` ## `$06`: `text_promptbutton`
Wait for button press; show arrow. Wait for button press; show arrow.
@@ -71,7 +71,7 @@ Play `SFX_DEX_FANFARE_50_79`.
Print *n* `"…"`s, pausing for 10 frames after each; interrupt if A or B is pressed. Print *n* `"…"`s, pausing for 10 frames after each; interrupt if A or B is pressed.
## `$0D`: `text_linkwaitbutton` ## `$0D`: `text_linkpromptbutton`
Wait for button press; show arrow. Wait for button press; show arrow.

6
engine/events/fruit_trees.asm
View File

@@ -4,7 +4,7 @@ FruitTreeScript::
readmem wCurFruit readmem wCurFruit
getitemname STRING_BUFFER_3, USE_SCRIPT_VAR getitemname STRING_BUFFER_3, USE_SCRIPT_VAR
writetext FruitBearingTreeText writetext FruitBearingTreeText
buttonsound promptbutton
callasm TryResetFruitTrees callasm TryResetFruitTrees
callasm CheckFruitTree callasm CheckFruitTree
iffalse .fruit iffalse .fruit
@@ -17,7 +17,7 @@ FruitTreeScript::
readmem wCurFruit readmem wCurFruit
giveitem ITEM_FROM_MEM giveitem ITEM_FROM_MEM
iffalse .packisfull iffalse .packisfull
buttonsound promptbutton
writetext ObtainedFruitText writetext ObtainedFruitText
callasm PickedFruitTree callasm PickedFruitTree
specialsound specialsound
@@ -25,7 +25,7 @@ FruitTreeScript::
sjump .end sjump .end
.packisfull .packisfull
buttonsound promptbutton
writetext FruitPackIsFullText writetext FruitPackIsFullText
waitbutton waitbutton

2
engine/events/misc_scripts_2.asm
View File

@@ -22,7 +22,7 @@ HiddenItemScript::
sjump .finish sjump .finish
.bag_full .bag_full
buttonsound promptbutton
writetext .ButNoSpaceText writetext .ButNoSpaceText
waitbutton waitbutton

66
engine/events/std_scripts.asm
View File

@@ -69,33 +69,33 @@ PokecenterNurseScript:
checkevent EVENT_WELCOMED_TO_POKECOM_CENTER checkevent EVENT_WELCOMED_TO_POKECOM_CENTER
iftrue .morn_comcenter iftrue .morn_comcenter
farwritetext NurseMornText farwritetext NurseMornText
buttonsound promptbutton
sjump .ok sjump .ok
.morn_comcenter .morn_comcenter
farwritetext PokeComNurseMornText farwritetext PokeComNurseMornText
buttonsound promptbutton
sjump .ok sjump .ok
.day .day
checkevent EVENT_WELCOMED_TO_POKECOM_CENTER checkevent EVENT_WELCOMED_TO_POKECOM_CENTER
iftrue .day_comcenter iftrue .day_comcenter
farwritetext NurseDayText farwritetext NurseDayText
buttonsound promptbutton
sjump .ok sjump .ok
.day_comcenter .day_comcenter
farwritetext PokeComNurseDayText farwritetext PokeComNurseDayText
buttonsound promptbutton
sjump .ok sjump .ok
.nite .nite
checkevent EVENT_WELCOMED_TO_POKECOM_CENTER checkevent EVENT_WELCOMED_TO_POKECOM_CENTER
iftrue .nite_comcenter iftrue .nite_comcenter
farwritetext NurseNiteText farwritetext NurseNiteText
buttonsound promptbutton
sjump .ok sjump .ok
.nite_comcenter .nite_comcenter
farwritetext PokeComNurseNiteText farwritetext PokeComNurseNiteText
buttonsound promptbutton
sjump .ok sjump .ok
.ok .ok
@@ -326,19 +326,19 @@ BugContestResultsScript:
ifequal 2, BugContestResults_SecondPlace ifequal 2, BugContestResults_SecondPlace
ifequal 3, BugContestResults_ThirdPlace ifequal 3, BugContestResults_ThirdPlace
farwritetext ContestResults_ConsolationPrizeText farwritetext ContestResults_ConsolationPrizeText
buttonsound promptbutton
waitsfx waitsfx
verbosegiveitem BERRY verbosegiveitem BERRY
iffalse BugContestResults_NoRoomForBerry iffalse BugContestResults_NoRoomForBerry
BugContestResults_DidNotWin: BugContestResults_DidNotWin:
farwritetext ContestResults_DidNotWinText farwritetext ContestResults_DidNotWinText
buttonsound promptbutton
sjump BugContestResults_FinishUp sjump BugContestResults_FinishUp
BugContestResults_ReturnAfterWinnersPrize: BugContestResults_ReturnAfterWinnersPrize:
farwritetext ContestResults_JoinUsNextTimeText farwritetext ContestResults_JoinUsNextTimeText
buttonsound promptbutton
BugContestResults_FinishUp: BugContestResults_FinishUp:
checkevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER checkevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER
@@ -408,25 +408,25 @@ BugContestResults_ThirdPlace:
BugContestResults_NoRoomForSunStone: BugContestResults_NoRoomForSunStone:
farwritetext BugContestPrizeNoRoomText farwritetext BugContestPrizeNoRoomText
buttonsound promptbutton
setevent EVENT_CONTEST_OFFICER_HAS_SUN_STONE setevent EVENT_CONTEST_OFFICER_HAS_SUN_STONE
sjump BugContestResults_ReturnAfterWinnersPrize sjump BugContestResults_ReturnAfterWinnersPrize
BugContestResults_NoRoomForEverstone: BugContestResults_NoRoomForEverstone:
farwritetext BugContestPrizeNoRoomText farwritetext BugContestPrizeNoRoomText
buttonsound promptbutton
setevent EVENT_CONTEST_OFFICER_HAS_EVERSTONE setevent EVENT_CONTEST_OFFICER_HAS_EVERSTONE
sjump BugContestResults_ReturnAfterWinnersPrize sjump BugContestResults_ReturnAfterWinnersPrize
BugContestResults_NoRoomForGoldBerry: BugContestResults_NoRoomForGoldBerry:
farwritetext BugContestPrizeNoRoomText farwritetext BugContestPrizeNoRoomText
buttonsound promptbutton
setevent EVENT_CONTEST_OFFICER_HAS_GOLD_BERRY setevent EVENT_CONTEST_OFFICER_HAS_GOLD_BERRY
sjump BugContestResults_ReturnAfterWinnersPrize sjump BugContestResults_ReturnAfterWinnersPrize
BugContestResults_NoRoomForBerry: BugContestResults_NoRoomForBerry:
farwritetext BugContestPrizeNoRoomText farwritetext BugContestPrizeNoRoomText
buttonsound promptbutton
setevent EVENT_CONTEST_OFFICER_HAS_BERRY setevent EVENT_CONTEST_OFFICER_HAS_BERRY
sjump BugContestResults_DidNotWin sjump BugContestResults_DidNotWin
@@ -786,7 +786,7 @@ RegisteredNumberMScript:
farwritetext RegisteredNumber1Text farwritetext RegisteredNumber1Text
playsound SFX_REGISTER_PHONE_NUMBER playsound SFX_REGISTER_PHONE_NUMBER
waitsfx waitsfx
buttonsound promptbutton
end end
NumberAcceptedMScript: NumberAcceptedMScript:
@@ -1279,31 +1279,31 @@ GiftMScript:
.Jose: .Jose:
farwritetext JoseGiftText farwritetext JoseGiftText
buttonsound promptbutton
end end
.Wade: .Wade:
farwritetext WadeGiftText farwritetext WadeGiftText
buttonsound promptbutton
end end
.Alan: .Alan:
farwritetext AlanGiftText farwritetext AlanGiftText
buttonsound promptbutton
end end
.Derek: .Derek:
farwritetext DerekGiftText farwritetext DerekGiftText
buttonsound promptbutton
end end
.Tully: .Tully:
farwritetext TullyGiftText farwritetext TullyGiftText
buttonsound promptbutton
end end
.Wilton: .Wilton:
farwritetext WiltonGiftText farwritetext WiltonGiftText
buttonsound promptbutton
end end
.Kenji: .Kenji:
farwritetext KenjiGiftText farwritetext KenjiGiftText
buttonsound promptbutton
end end
PackFullMScript: PackFullMScript:
@@ -1386,19 +1386,19 @@ RematchGiftMScript:
.Huey: .Huey:
farwritetext HueyRematchGiftText farwritetext HueyRematchGiftText
buttonsound promptbutton
end end
.Joey: .Joey:
farwritetext JoeyRematchGiftText farwritetext JoeyRematchGiftText
buttonsound promptbutton
end end
.Vance: .Vance:
farwritetext VanceRematchGiftText farwritetext VanceRematchGiftText
buttonsound promptbutton
end end
.Parry: .Parry:
farwritetext ParryRematchGiftText farwritetext ParryRematchGiftText
buttonsound promptbutton
end end
AskNumber1FScript: AskNumber1FScript:
@@ -1477,7 +1477,7 @@ RegisteredNumberFScript:
farwritetext RegisteredNumber2Text farwritetext RegisteredNumber2Text
playsound SFX_REGISTER_PHONE_NUMBER playsound SFX_REGISTER_PHONE_NUMBER
waitsfx waitsfx
buttonsound promptbutton
end end
NumberAcceptedFScript: NumberAcceptedFScript:
@@ -1691,19 +1691,19 @@ GiftFScript:
.Beverly: .Beverly:
farwritetext BeverlyGiftText farwritetext BeverlyGiftText
buttonsound promptbutton
end end
.Gina: .Gina:
farwritetext GinaGiftText farwritetext GinaGiftText
buttonsound promptbutton
end end
.Dana: .Dana:
farwritetext DanaGiftText farwritetext DanaGiftText
buttonsound promptbutton
end end
.Tiffany: .Tiffany:
farwritetext TiffanyGiftText farwritetext TiffanyGiftText
buttonsound promptbutton
end end
PackFullFScript: PackFullFScript:
@@ -1747,7 +1747,7 @@ RematchGiftFScript:
.Erin: .Erin:
opentext opentext
farwritetext ErinRematchGiftText farwritetext ErinRematchGiftText
buttonsound promptbutton
end end
GymStatue1Script: GymStatue1Script:
@@ -1762,7 +1762,7 @@ GymStatue2Script:
getcurlandmarkname STRING_BUFFER_3 getcurlandmarkname STRING_BUFFER_3
opentext opentext
farwritetext GymStatue_CityGymText farwritetext GymStatue_CityGymText
buttonsound promptbutton
farwritetext GymStatue_WinningTrainersText farwritetext GymStatue_WinningTrainersText
waitbutton waitbutton
closetext closetext
@@ -1786,7 +1786,7 @@ GameCornerCoinVendorScript:
faceplayer faceplayer
opentext opentext
farwritetext CoinVendor_WelcomeText farwritetext CoinVendor_WelcomeText
buttonsound promptbutton
checkitem COIN_CASE checkitem COIN_CASE
iftrue CoinVendor_IntroScript iftrue CoinVendor_IntroScript
farwritetext CoinVendor_NoCoinCaseText farwritetext CoinVendor_NoCoinCaseText

8
engine/overworld/scripting.asm
View File

@@ -148,7 +148,7 @@ ScriptCommandTable:
dw Script_farjumptext ; 52 dw Script_farjumptext ; 52
dw Script_jumptext ; 53 dw Script_jumptext ; 53
dw Script_waitbutton ; 54 dw Script_waitbutton ; 54
dw Script_buttonsound ; 55 dw Script_promptbutton ; 55
dw Script_pokepic ; 56 dw Script_pokepic ; 56
dw Script_closepokepic ; 57 dw Script_closepokepic ; 57
dw Script__2dmenu ; 58 dw Script__2dmenu ; 58
@@ -398,7 +398,7 @@ Script_waitbutton:
jp WaitButton jp WaitButton
Script_buttonsound: Script_promptbutton:
; script command 0x55 ; script command 0x55
ldh a, [hOAMUpdate] ldh a, [hOAMUpdate]
@@ -406,7 +406,7 @@ Script_buttonsound:
ld a, $1 ld a, $1
ldh [hOAMUpdate], a ldh [hOAMUpdate], a
call WaitBGMap call WaitBGMap
call ButtonSound call PromptButton
pop af pop af
ldh [hOAMUpdate], a ldh [hOAMUpdate], a
ret ret
@@ -525,7 +525,7 @@ GiveItemScript:
end end
.Full: .Full:
buttonsound promptbutton
pocketisfull pocketisfull
end end

8
engine/phone/scripts/bill.asm
View File

@@ -4,22 +4,22 @@ BillPhoneCalleeScript:
checktime NITE checktime NITE
iftrue .nitegreet iftrue .nitegreet
farwritetext BillPhoneMornGreetingText farwritetext BillPhoneMornGreetingText
buttonsound promptbutton
sjump .main sjump .main
.daygreet .daygreet
farwritetext BillPhoneDayGreetingText farwritetext BillPhoneDayGreetingText
buttonsound promptbutton
sjump .main sjump .main
.nitegreet .nitegreet
farwritetext BillPhoneNiteGreetingText farwritetext BillPhoneNiteGreetingText
buttonsound promptbutton
sjump .main sjump .main
.main .main
farwritetext BillPhoneGenericText farwritetext BillPhoneGenericText
buttonsound promptbutton
readvar VAR_BOXSPACE readvar VAR_BOXSPACE
getnum STRING_BUFFER_3 getnum STRING_BUFFER_3
ifequal 0, .full ifequal 0, .full

20
engine/phone/scripts/brent_gossip.asm
View File

@@ -13,50 +13,50 @@ BrentBillTriviaScript:
.Father: .Father:
farwritetext BrentFatherGossipText farwritetext BrentFatherGossipText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Male sjump PhoneScript_HangUpText_Male
.Grandpa: .Grandpa:
farwritetext BrentGrandpaGossipText farwritetext BrentGrandpaGossipText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Male sjump PhoneScript_HangUpText_Male
.Goldenrod: .Goldenrod:
farwritetext BrentGoldenrodGossipText farwritetext BrentGoldenrodGossipText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Male sjump PhoneScript_HangUpText_Male
.Route25: .Route25:
farwritetext BrentRoute25GossipText farwritetext BrentRoute25GossipText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Male sjump PhoneScript_HangUpText_Male
.Abra: .Abra:
farwritetext BrentAbraGossipText farwritetext BrentAbraGossipText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Male sjump PhoneScript_HangUpText_Male
.Sister: .Sister:
farwritetext BrentSisterGossipText farwritetext BrentSisterGossipText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Male sjump PhoneScript_HangUpText_Male
.Milk: .Milk:
farwritetext BrentMilkGossipText farwritetext BrentMilkGossipText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Male sjump PhoneScript_HangUpText_Male
.Battling: .Battling:
farwritetext BrentBattlingGossipText farwritetext BrentBattlingGossipText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Male sjump PhoneScript_HangUpText_Male
.FlowerShop: .FlowerShop:
farwritetext BrentFlowerShopGossipText farwritetext BrentFlowerShopGossipText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Male sjump PhoneScript_HangUpText_Male
.KimonoGirl: .KimonoGirl:
farwritetext BrentKimonoGirlGossipText farwritetext BrentKimonoGirlGossipText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Male sjump PhoneScript_HangUpText_Male

14
engine/phone/scripts/buena.asm
View File

@@ -18,17 +18,17 @@ BuenaPhoneScript_CheckTimeOfDayCallee:
checktime DAY checktime DAY
iftrue .day iftrue .day
writetext BuenaPhoneNiteAnswerText writetext BuenaPhoneNiteAnswerText
buttonsound promptbutton
end end
.morn .morn
writetext BuenaPhoneMorningAnswerText writetext BuenaPhoneMorningAnswerText
buttonsound promptbutton
end end
.day .day
writetext BuenaPhoneDayAnswerText writetext BuenaPhoneDayAnswerText
buttonsound promptbutton
end end
BuenaPhoneScript_AfterMidnightCallee: BuenaPhoneScript_AfterMidnightCallee:
@@ -43,22 +43,22 @@ BuenaPhoneScript_CheckTimeOfDayCaller:
checktime DAY checktime DAY
iftrue .day iftrue .day
writetext BuenaPhoneNiteText writetext BuenaPhoneNiteText
buttonsound promptbutton
end end
.morn .morn
writetext BuenaPhoneMorningText writetext BuenaPhoneMorningText
buttonsound promptbutton
end end
.day .day
writetext BuenaPhoneDayText writetext BuenaPhoneDayText
buttonsound promptbutton
end end
BuenaPhoneScript_AfterMidnightCaller: BuenaPhoneScript_AfterMidnightCaller:
writetext BuenaPhoneMidnightText writetext BuenaPhoneMidnightText
buttonsound promptbutton
end end
BuenaPhoneScript_Rocket: BuenaPhoneScript_Rocket:

20
engine/phone/scripts/chad_gossip.asm
View File

@@ -13,50 +13,50 @@ ChadOakGossipScript:
.Blue: .Blue:
farwritetext ChadBlueGossipText farwritetext ChadBlueGossipText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Male sjump PhoneScript_HangUpText_Male
.Daisy: .Daisy:
farwritetext ChadDaisyGossipText farwritetext ChadDaisyGossipText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Male sjump PhoneScript_HangUpText_Male
.ProfElm: .ProfElm:
farwritetext ChadProfElmGossipText farwritetext ChadProfElmGossipText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Male sjump PhoneScript_HangUpText_Male
.Dream: .Dream:
farwritetext ChadProfOaksDreamGossipText farwritetext ChadProfOaksDreamGossipText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Male sjump PhoneScript_HangUpText_Male
.Kurt: .Kurt:
farwritetext ChadKurtGossipText farwritetext ChadKurtGossipText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Male sjump PhoneScript_HangUpText_Male
.League: .League:
farwritetext ChadLeagueGossipText farwritetext ChadLeagueGossipText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Male sjump PhoneScript_HangUpText_Male
.RadioShow: .RadioShow:
farwritetext ChadPokemonTalkGossipText farwritetext ChadPokemonTalkGossipText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Male sjump PhoneScript_HangUpText_Male
.Battling: .Battling:
farwritetext ChadProfOakTrainerGossipText farwritetext ChadProfOakTrainerGossipText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Male sjump PhoneScript_HangUpText_Male
.DaisyTea: .DaisyTea:
farwritetext ChadDaisyTeaGossipText farwritetext ChadDaisyTeaGossipText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Male sjump PhoneScript_HangUpText_Male
.Traveled: .Traveled:
farwritetext ChadProfOakTravelingGossipText farwritetext ChadProfOakTravelingGossipText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Male sjump PhoneScript_HangUpText_Male

392
engine/phone/scripts/generic_callee.asm
View File

File diff suppressed because it is too large Load Diff

216
engine/phone/scripts/generic_caller.asm
View File

File diff suppressed because it is too large Load Diff

68
engine/phone/scripts/hangups.asm
View File

@@ -1,131 +1,131 @@
JackPhoneTipsScript: JackPhoneTipsScript:
farwritetext JackHeardSomeGreatTipsText farwritetext JackHeardSomeGreatTipsText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Male sjump PhoneScript_HangUpText_Male
BeverlyHangUpScript: BeverlyHangUpScript:
farwritetext BeverlyLetsChatAboutMonAgainText farwritetext BeverlyLetsChatAboutMonAgainText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Female sjump PhoneScript_HangUpText_Female
HueyHangUpScript: HueyHangUpScript:
farwritetext HueyWeHaveToBattleAgainSometimeText farwritetext HueyWeHaveToBattleAgainSometimeText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Male sjump PhoneScript_HangUpText_Male
GavenHangUpNotThursdayScript: GavenHangUpNotThursdayScript:
farwritetext GavenHangUpNotThursdayText farwritetext GavenHangUpNotThursdayText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Male sjump PhoneScript_HangUpText_Male
BethHangUpScript: BethHangUpScript:
farwritetext BethLetsBattleAgainSometimeText farwritetext BethLetsBattleAgainSometimeText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Female sjump PhoneScript_HangUpText_Female
JoseHangUpScript: JoseHangUpScript:
farwritetext JoseHaventGottenItemYetText farwritetext JoseHaventGottenItemYetText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Male sjump PhoneScript_HangUpText_Male
ReenaForwardScript: ReenaForwardScript:
farwritetext ReenaForwardText farwritetext ReenaForwardText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Female sjump PhoneScript_HangUpText_Female
JoeyHangUpScript: JoeyHangUpScript:
farwritetext JoeyDevisingStrategiesText farwritetext JoeyDevisingStrategiesText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Male sjump PhoneScript_HangUpText_Male
WadeNoBerriesScript: WadeNoBerriesScript:
farwritetext WadeNoBerriesText farwritetext WadeNoBerriesText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Male sjump PhoneScript_HangUpText_Male
RalphNoItemScript: RalphNoItemScript:
farwritetext RalphNoItemText farwritetext RalphNoItemText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Male sjump PhoneScript_HangUpText_Male
LizHangUpScript: LizHangUpScript:
farwritetext LizFawningOverMonText farwritetext LizFawningOverMonText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Female sjump PhoneScript_HangUpText_Female
AnthonyHangUpScript: AnthonyHangUpScript:
farwritetext AnthonyWasntPayingAttentionText farwritetext AnthonyWasntPayingAttentionText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Male sjump PhoneScript_HangUpText_Male
ToddNoItemScript: ToddNoItemScript:
farwritetext ToddSavingUpForBargainSaleText farwritetext ToddSavingUpForBargainSaleText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Male sjump PhoneScript_HangUpText_Male
GinaHangUpScript: GinaHangUpScript:
farwritetext GinaHaventFoundAnythingYetText farwritetext GinaHaventFoundAnythingYetText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Female sjump PhoneScript_HangUpText_Female
ArnieHangUpScript: ArnieHangUpScript:
farwritetext ArnieHaventSeenRareMonText farwritetext ArnieHaventSeenRareMonText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Male sjump PhoneScript_HangUpText_Male
AlanHangUpScript: AlanHangUpScript:
farwritetext AlanHaventPickedUpAnythingText farwritetext AlanHaventPickedUpAnythingText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Male sjump PhoneScript_HangUpText_Male
DanaHangUpScript: DanaHangUpScript:
farwritetext DanaCanYouWaitABitLongerText farwritetext DanaCanYouWaitABitLongerText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Female sjump PhoneScript_HangUpText_Female
ChadHangUpScript: ChadHangUpScript:
farwritetext ChadGoingToStudyHardText farwritetext ChadGoingToStudyHardText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Male sjump PhoneScript_HangUpText_Male
DerekHangUpScript: DerekHangUpScript:
farwritetext DerekLetsGetTogetherText farwritetext DerekLetsGetTogetherText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Male sjump PhoneScript_HangUpText_Male
TullyNoItemScript: TullyNoItemScript:
farwritetext TullyNoItemText farwritetext TullyNoItemText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Male sjump PhoneScript_HangUpText_Male
BrentHangUpScript: BrentHangUpScript:
farwritetext BrentSorryImTooBusyText farwritetext BrentSorryImTooBusyText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Male sjump PhoneScript_HangUpText_Male
TiffanyNoItemScript: TiffanyNoItemScript:
farwritetext TiffanyNoItemText farwritetext TiffanyNoItemText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Female sjump PhoneScript_HangUpText_Female
VanceLookingForwardScript: VanceLookingForwardScript:
farwritetext VanceLookingForwardText farwritetext VanceLookingForwardText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Male sjump PhoneScript_HangUpText_Male
WiltonHaventFoundAnythingScript: WiltonHaventFoundAnythingScript:
farwritetext WiltonHaventFoundAnythingText farwritetext WiltonHaventFoundAnythingText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Male sjump PhoneScript_HangUpText_Male
ParryBattleWithMeScript: ParryBattleWithMeScript:
farwritetext ParryBattleWithMeText farwritetext ParryBattleWithMeText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Male sjump PhoneScript_HangUpText_Male
ErinWorkingHardScript: ErinWorkingHardScript:
farwritetext ErinWorkingHardText farwritetext ErinWorkingHardText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Female sjump PhoneScript_HangUpText_Female
IrwinRandomTextScript: IrwinRandomTextScript:
@@ -136,17 +136,17 @@ IrwinRandomTextScript:
IrwinEscapadeScript: IrwinEscapadeScript:
farwritetext IrwinYourEscapadesRockText farwritetext IrwinYourEscapadesRockText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Male sjump PhoneScript_HangUpText_Male
IrwinGoodMatchScript: IrwinGoodMatchScript:
farwritetext IrwinGoodMatchText farwritetext IrwinGoodMatchText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Male sjump PhoneScript_HangUpText_Male
IrwinSoMuchToChatAboutScript: IrwinSoMuchToChatAboutScript:
farwritetext IrwinSoMuchToChatAboutText farwritetext IrwinSoMuchToChatAboutText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Male sjump PhoneScript_HangUpText_Male
KenjiAnswerPhoneScript: KenjiAnswerPhoneScript:
@@ -154,12 +154,12 @@ KenjiAnswerPhoneScript:
ifequal 2, .Training ifequal 2, .Training
ifequal 1, .OnBreak ifequal 1, .OnBreak
farwritetext KenjiCallMeBackAnotherTimeText farwritetext KenjiCallMeBackAnotherTimeText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Male sjump PhoneScript_HangUpText_Male
.Training: .Training:
farwritetext KenjiIllHaveTimeToChatTomorrowText farwritetext KenjiIllHaveTimeToChatTomorrowText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Male sjump PhoneScript_HangUpText_Male
.OnBreak: .OnBreak:
@@ -169,15 +169,15 @@ KenjiAnswerPhoneScript:
iftrue .Night iftrue .Night
setevent EVENT_KENJI_ON_BREAK setevent EVENT_KENJI_ON_BREAK
farwritetext KenjiTakingABreakText farwritetext KenjiTakingABreakText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Male sjump PhoneScript_HangUpText_Male
.Morning: .Morning:
farwritetext KenjiHangUpMorningText farwritetext KenjiHangUpMorningText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Male sjump PhoneScript_HangUpText_Male
.Night: .Night:
farwritetext KenjiHangUpNightText farwritetext KenjiHangUpNightText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Male sjump PhoneScript_HangUpText_Male

20
engine/phone/scripts/hangups_2.asm
View File

@@ -1,49 +1,49 @@
BeverlyComePickUpScript: BeverlyComePickUpScript:
farwritetext BeverlyComePickUpText farwritetext BeverlyComePickUpText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Female sjump PhoneScript_HangUpText_Female
JoseComePickUpScript: JoseComePickUpScript:
farwritetext JoseComePickUpText farwritetext JoseComePickUpText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Male sjump PhoneScript_HangUpText_Male
WadeComeQuickScript: WadeComeQuickScript:
farwritetext WadeComeQuickText farwritetext WadeComeQuickText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Male sjump PhoneScript_HangUpText_Male
GinaComePickUpScript: GinaComePickUpScript:
farwritetext GinaComePickUpText farwritetext GinaComePickUpText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Female sjump PhoneScript_HangUpText_Female
AlanComePickUpScript: AlanComePickUpScript:
farwritetext AlanComePickUpGiftText farwritetext AlanComePickUpGiftText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Male sjump PhoneScript_HangUpText_Male
DanaComePickUpScript: DanaComePickUpScript:
farwritetext DanaComePickUpText farwritetext DanaComePickUpText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Female sjump PhoneScript_HangUpText_Female
DerekComePickUpScript: DerekComePickUpScript:
farwritetext DerekComePickUpText farwritetext DerekComePickUpText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Male sjump PhoneScript_HangUpText_Male
TullyHurryScript: TullyHurryScript:
farwritetext TullyHurryText farwritetext TullyHurryText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Male sjump PhoneScript_HangUpText_Male
TiffanyHurryScript: TiffanyHurryScript:
farwritetext TiffanyHurryText farwritetext TiffanyHurryText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Female sjump PhoneScript_HangUpText_Female
WiltonWantThisScript: WiltonWantThisScript:
farwritetext WiltonWantThisText farwritetext WiltonWantThisText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Male sjump PhoneScript_HangUpText_Male

26
engine/phone/scripts/irwin_gossip.asm
View File

@@ -24,65 +24,65 @@ IrwinRumorScript:
checkflag ENGINE_PLAINBADGE checkflag ENGINE_PLAINBADGE
iftrue .PlainBadge iftrue .PlainBadge
farwritetext IrwinCalledRightAwayText farwritetext IrwinCalledRightAwayText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Male sjump PhoneScript_HangUpText_Male
.PlainBadge: .PlainBadge:
farwritetext IrwinPlainBadgeGossipText farwritetext IrwinPlainBadgeGossipText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Male sjump PhoneScript_HangUpText_Male
.JasmineReturned: .JasmineReturned:
farwritetext IrwinJasmineReturnedGossipText farwritetext IrwinJasmineReturnedGossipText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Male sjump PhoneScript_HangUpText_Male
.RocketHideout: .RocketHideout:
farwritetext IrwinRocketHideoutGossipText farwritetext IrwinRocketHideoutGossipText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Male sjump PhoneScript_HangUpText_Male
.RadioTower: .RadioTower:
farwritetext IrwinRadioTowerGossipText farwritetext IrwinRadioTowerGossipText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Male sjump PhoneScript_HangUpText_Male
.RisingBadge: .RisingBadge:
farwritetext IrwinRisingBadgeGossipText farwritetext IrwinRisingBadgeGossipText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Male sjump PhoneScript_HangUpText_Male
.EliteFour: .EliteFour:
farwritetext IrwinEliteFourGossipText farwritetext IrwinEliteFourGossipText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Male sjump PhoneScript_HangUpText_Male
.VermilionCity: .VermilionCity:
farwritetext IrwinVermilionCityGossipText farwritetext IrwinVermilionCityGossipText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Male sjump PhoneScript_HangUpText_Male
.TrainPass: .TrainPass:
farwritetext IrwinTrainPassGossipText farwritetext IrwinTrainPassGossipText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Male sjump PhoneScript_HangUpText_Male
.Snorlax: .Snorlax:
farwritetext IrwinSnorlaxGossipText farwritetext IrwinSnorlaxGossipText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Male sjump PhoneScript_HangUpText_Male
.MtSilver: .MtSilver:
farwritetext IrwinMtSilverGossipText farwritetext IrwinMtSilverGossipText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Male sjump PhoneScript_HangUpText_Male
.FogBadge: .FogBadge:
farwritetext IrwinFogBadgeGossipText farwritetext IrwinFogBadgeGossipText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Male sjump PhoneScript_HangUpText_Male
.MarshBadge: .MarshBadge:
farwritetext IrwinMarshBadgeGossipText farwritetext IrwinMarshBadgeGossipText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Male sjump PhoneScript_HangUpText_Male

22
engine/phone/scripts/jack_gossip.asm
View File

@@ -14,55 +14,55 @@ JackTriviaScript:
.Thunder: .Thunder:
farwritetext JackThunderTriviaText farwritetext JackThunderTriviaText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Male sjump PhoneScript_HangUpText_Male
.Rollout: .Rollout:
farwritetext JackRolloutTriviaText farwritetext JackRolloutTriviaText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Male sjump PhoneScript_HangUpText_Male
.Solarbeam: .Solarbeam:
farwritetext JackSolarbeamTriviaText farwritetext JackSolarbeamTriviaText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Male sjump PhoneScript_HangUpText_Male
.Stomp: .Stomp:
farwritetext JackStompTriviaText farwritetext JackStompTriviaText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Male sjump PhoneScript_HangUpText_Male
.Gust: .Gust:
farwritetext JackGustTriviaText farwritetext JackGustTriviaText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Male sjump PhoneScript_HangUpText_Male
.Twister: .Twister:
farwritetext JackTwisterTriviaText farwritetext JackTwisterTriviaText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Male sjump PhoneScript_HangUpText_Male
.Earthquake: .Earthquake:
farwritetext JackEarthquakeTriviaText farwritetext JackEarthquakeTriviaText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Male sjump PhoneScript_HangUpText_Male
.Magnitude: .Magnitude:
farwritetext JackMagnitudeTriviaText farwritetext JackMagnitudeTriviaText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Male sjump PhoneScript_HangUpText_Male
.Sandstorm: .Sandstorm:
farwritetext JackSandstormTriviaText farwritetext JackSandstormTriviaText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Male sjump PhoneScript_HangUpText_Male
.SunnyDay: .SunnyDay:
farwritetext JackSunnyDayTriviaText farwritetext JackSunnyDayTriviaText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Male sjump PhoneScript_HangUpText_Male
.RainDance: .RainDance:
farwritetext JackRainDanceTriviaText farwritetext JackRainDanceTriviaText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Male sjump PhoneScript_HangUpText_Male

20
engine/phone/scripts/liz_gossip.asm
View File

@@ -13,50 +13,50 @@ LizGossipRandomScript:
.RuinsOfAlph: .RuinsOfAlph:
farwritetext LizRuinsOfAlphGossipText farwritetext LizRuinsOfAlphGossipText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Female sjump PhoneScript_HangUpText_Female
.Falkner: .Falkner:
farwritetext LizFalknerGossipText farwritetext LizFalknerGossipText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Female sjump PhoneScript_HangUpText_Female
.Earl: .Earl:
farwritetext LizEarlGossipText farwritetext LizEarlGossipText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Female sjump PhoneScript_HangUpText_Female
.SurfPikachu: .SurfPikachu:
farwritetext LizSurfPikachuGossipText farwritetext LizSurfPikachuGossipText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Female sjump PhoneScript_HangUpText_Female
.MooMooMilk: .MooMooMilk:
farwritetext LizMooMooMilkGossipText farwritetext LizMooMooMilkGossipText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Female sjump PhoneScript_HangUpText_Female
.Salon: .Salon:
farwritetext LizSalonGossipText farwritetext LizSalonGossipText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Female sjump PhoneScript_HangUpText_Female
.Whitney: .Whitney:
farwritetext LizWhitneyGossipText farwritetext LizWhitneyGossipText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Female sjump PhoneScript_HangUpText_Female
.BugCatchingContest: .BugCatchingContest:
farwritetext LizBugCatchingContestGossipText farwritetext LizBugCatchingContestGossipText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Female sjump PhoneScript_HangUpText_Female
.BeautifulMon: .BeautifulMon:
farwritetext LizBeautifulMonGossipText farwritetext LizBeautifulMonGossipText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Female sjump PhoneScript_HangUpText_Female
.Forgot: .Forgot:
farwritetext LizForgotGossipText farwritetext LizForgotGossipText
buttonsound promptbutton
sjump PhoneScript_HangUpText_Female sjump PhoneScript_HangUpText_Female

Some files were not shown because too many files have changed in this diff Show More