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

Rename some call/jump script commands to avoid confusion with jr/jp asm instructions

Browse Source 
Fixes #580
This commit is contained in:
Rangi
2019-03-10 16:39:31 -04:00
parent e002b536af
commit f5c9958aea
164 changed files with 840 additions and 832 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
engine/phone/scripts/alan.asm
View File

@@ -13,15 +13,15 @@ AlanPhoneCalleeScript:
iftrue AlanWednesdayDay
.NotWednesday:
farjump UnknownScript_0xa0970
farsjump UnknownScript_0xa0970
.WantsBattle:
getlandmarkname STRING_BUFFER_5, ROUTE_36
farjump UnknownScript_0xa0a73
farsjump UnknownScript_0xa0a73
.FireStone:
getlandmarkname STRING_BUFFER_5, ROUTE_36
farjump UnknownScript_0xa0ac5
farsjump UnknownScript_0xa0ac5
AlanPhoneCallerScript:
gettrainername STRING_BUFFER_3, SCHOOLBOY, ALAN1
@@ -44,7 +44,7 @@ AlanPhoneCallerScript:
ifequal 0, AlanHasFireStone
.Generic:
farjump Phone_GenericCall_Male
farsjump Phone_GenericCall_Male
AlanWednesdayDay:
setflag ENGINE_ALAN_WEDNESDAY_AFTERNOON
@@ -52,9 +52,9 @@ AlanWednesdayDay:
AlanWantsBattle:
getlandmarkname STRING_BUFFER_5, ROUTE_36
setflag ENGINE_ALAN
farjump PhoneScript_WantsToBattle_Male
farsjump PhoneScript_WantsToBattle_Male
AlanHasFireStone:
setflag ENGINE_ALAN_HAS_FIRE_STONE
getlandmarkname STRING_BUFFER_5, ROUTE_36
farjump PhoneScript_FoundItem_Male
farsjump PhoneScript_FoundItem_Male

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

@@ -13,15 +13,15 @@ AnthonyPhoneCalleeScript:
.NotFriday:
checkflag ENGINE_DUNSPARCE_SWARM
iftrue .AlreadySwarming
farjump UnknownScript_0xa0950
farsjump UnknownScript_0xa0950
.WantsBattle:
getlandmarkname STRING_BUFFER_5, ROUTE_33
farjump UnknownScript_0xa0a5f
farsjump UnknownScript_0xa0a5f
.AlreadySwarming:
getlandmarkname STRING_BUFFER_5, ROUTE_33
farjump UnknownScript_0xa0afa
farsjump UnknownScript_0xa0afa
AnthonyPhoneCallerScript:
gettrainername STRING_BUFFER_3, HIKER, ANTHONY2
@@ -38,7 +38,7 @@ AnthonyPhoneCallerScript:
.TriesSwarm:
farscall PhoneScript_Random5
ifequal 0, AnthonyTriesDunsparceSwarm
farjump Phone_GenericCall_Male
farsjump Phone_GenericCall_Male
AnthonyFridayNight:
setflag ENGINE_ANTHONY_FRIDAY_NIGHT
@@ -46,7 +46,7 @@ AnthonyFridayNight:
AnthonyWantsBattle:
getlandmarkname STRING_BUFFER_5, ROUTE_33
setflag ENGINE_ANTHONY
farjump PhoneScript_WantsToBattle_Male
farsjump PhoneScript_WantsToBattle_Male
AnthonyTriesDunsparceSwarm:
checkflag ENGINE_DUNSPARCE_SWARM
@@ -55,7 +55,7 @@ AnthonyTriesDunsparceSwarm:
getmonname STRING_BUFFER_4, DUNSPARCE
swarm SWARM_DUNSPARCE, DARK_CAVE_VIOLET_ENTRANCE
getlandmarkname STRING_BUFFER_5, DARK_CAVE
farjump UnknownScript_0xa05de
farsjump UnknownScript_0xa05de
.Generic:
farjump Phone_GenericCall_Male
farsjump Phone_GenericCall_Male

16
engine/phone/scripts/arnie.asm
View File

@@ -13,15 +13,15 @@ ArniePhoneCalleeScript:
.NotTuesday:
checkflag ENGINE_YANMA_SWARM
iftrue .AlreadySwarming
farjump UnknownScript_0xa0968
farsjump UnknownScript_0xa0968
.WantsBattle:
getlandmarkname STRING_BUFFER_5, ROUTE_35
farjump UnknownScript_0xa0a6e
farsjump UnknownScript_0xa0a6e
.AlreadySwarming:
getlandmarkname STRING_BUFFER_5, ROUTE_35
farjump UnknownScript_0xa0aff
farsjump UnknownScript_0xa0aff
ArniePhoneCallerScript:
gettrainername STRING_BUFFER_3, BUG_CATCHER, ARNIE1
@@ -38,7 +38,7 @@ ArniePhoneCallerScript:
ifequal 0, ArnieYanmaSwarm
farscall PhoneScript_Random3
ifequal 0, ArnieFoundRare
farjump Phone_GenericCall_Male
farsjump Phone_GenericCall_Male
ArnieTuesdayMorning:
setflag ENGINE_ARNIE_TUESDAY_MORNING
@@ -46,7 +46,7 @@ ArnieTuesdayMorning:
ArnieWantsBattle:
getlandmarkname STRING_BUFFER_5, ROUTE_35
setflag ENGINE_ARNIE
farjump PhoneScript_WantsToBattle_Male
farsjump PhoneScript_WantsToBattle_Male
ArnieYanmaSwarm: ; start swarm
checkflag ENGINE_YANMA_SWARM
@@ -55,10 +55,10 @@ ArnieYanmaSwarm: ; start swarm
getmonname STRING_BUFFER_4, YANMA
swarm SWARM_YANMA, ROUTE_35
getlandmarkname STRING_BUFFER_5, ROUTE_35
farjump UnknownScript_0xa05ce
farsjump UnknownScript_0xa05ce
ArnieFoundRare:
farjump Phone_CheckIfUnseenRare_Male
farsjump Phone_CheckIfUnseenRare_Male
ArnieYanmaAlreadySwarming:
farjump Phone_GenericCall_Male
farsjump Phone_GenericCall_Male

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

@@ -11,11 +11,11 @@ BethPhoneCalleeScript:
iftrue BethFridayAfternoon
.NotFriday:
farjump UnknownScript_0xa0918
farsjump UnknownScript_0xa0918
.WantsBattle:
getlandmarkname STRING_BUFFER_5, ROUTE_26
farjump BethBattleReminderScript
farsjump BethBattleReminderScript
BethPhoneCallerScript:
gettrainername STRING_BUFFER_3, COOLTRAINERF, BETH1
@@ -28,7 +28,7 @@ BethPhoneCallerScript:
ifequal 0, BethWantsBattle
.Generic:
farjump Phone_GenericCall_Female
farsjump Phone_GenericCall_Female
BethFridayAfternoon:
setflag ENGINE_BETH_FRIDAY_AFTERNOON
@@ -36,4 +36,4 @@ BethFridayAfternoon:
BethWantsBattle:
getlandmarkname STRING_BUFFER_5, ROUTE_26
setflag ENGINE_BETH
farjump PhoneScript_WantsToBattle_Female
farsjump PhoneScript_WantsToBattle_Female

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

@@ -3,11 +3,11 @@ BeverlyPhoneCalleeScript:
farscall PhoneScript_AnswerPhone_Female
checkflag ENGINE_BEVERLY_HAS_NUGGET
iftrue .HasNugget
farjump UnknownScript_0xa0900
farsjump UnknownScript_0xa0900
.HasNugget:
getlandmarkname STRING_BUFFER_5, NATIONAL_PARK
farjump UnknownScript_0xa0aa5
farsjump UnknownScript_0xa0aa5
BeverlyPhoneCallerScript:
gettrainername STRING_BUFFER_3, POKEFANF, BEVERLY1
@@ -18,9 +18,9 @@ BeverlyPhoneCallerScript:
ifequal 0, .FoundNugget
.HasNugget:
farjump Phone_GenericCall_Female
farsjump Phone_GenericCall_Female
.FoundNugget:
setflag ENGINE_BEVERLY_HAS_NUGGET
getlandmarkname STRING_BUFFER_5, NATIONAL_PARK
farjump PhoneScript_FoundItem_Female
farsjump PhoneScript_FoundItem_Female

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

@@ -5,17 +5,17 @@ BillPhoneCalleeScript:
iftrue .nitegreet
farwritetext BillPhoneMornGreetingText
buttonsound
jump .main
sjump .main
.daygreet
farwritetext BillPhoneDayGreetingText
buttonsound
jump .main
sjump .main
.nitegreet
farwritetext BillPhoneNiteGreetingText
buttonsound
jump .main
sjump .main
.main
farwritetext BillPhoneGenericText

10
engine/phone/scripts/brent.asm
View File

@@ -11,11 +11,11 @@ BrentPhoneCalleeScript:
iftrue BrentMondayMorning
.NotMonday:
farjump UnknownScript_0xa0998
farsjump UnknownScript_0xa0998
.WantsBattle:
getlandmarkname STRING_BUFFER_5, ROUTE_43
farjump UnknownScript_0xa0a87
farsjump UnknownScript_0xa0a87
BrentPhoneCallerScript:
gettrainername STRING_BUFFER_3, POKEMANIAC, BRENT1
@@ -30,7 +30,7 @@ BrentPhoneCallerScript:
ifequal 0, BrentWantsBattle
.Generic:
farjump Phone_GenericCall_Male
farsjump Phone_GenericCall_Male
BrentMondayMorning:
setflag ENGINE_BRENT_MONDAY_MORNING
@@ -38,7 +38,7 @@ BrentMondayMorning:
BrentWantsBattle:
getlandmarkname STRING_BUFFER_5, ROUTE_43
setflag ENGINE_BRENT
farjump PhoneScript_WantsToBattle_Male
farsjump PhoneScript_WantsToBattle_Male
BrentBillTrivia:
farjump BrentBillTriviaScript
farsjump BrentBillTriviaScript

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

@@ -14,49 +14,49 @@ BrentBillTriviaScript:
.Father:
farwritetext UnknownText_0x662bc
buttonsound
jump PhoneScript_HangupText_Male
sjump PhoneScript_HangupText_Male
.Grandpa:
farwritetext UnknownText_0x662fc
buttonsound
jump PhoneScript_HangupText_Male
sjump PhoneScript_HangupText_Male
.Goldenrod:
farwritetext UnknownText_0x66335
buttonsound
jump PhoneScript_HangupText_Male
sjump PhoneScript_HangupText_Male
.Route25:
farwritetext UnknownText_0x66366
buttonsound
jump PhoneScript_HangupText_Male
sjump PhoneScript_HangupText_Male
.Abra:
farwritetext UnknownText_0x663a1
buttonsound
jump PhoneScript_HangupText_Male
sjump PhoneScript_HangupText_Male
.Sister:
farwritetext UnknownText_0x663e6
buttonsound
jump PhoneScript_HangupText_Male
sjump PhoneScript_HangupText_Male
.Milk:
farwritetext UnknownText_0x66421
buttonsound
jump PhoneScript_HangupText_Male
sjump PhoneScript_HangupText_Male
.Battling:
farwritetext UnknownText_0x6645f
buttonsound
jump PhoneScript_HangupText_Male
sjump PhoneScript_HangupText_Male
.FlowerShop:
farwritetext UnknownText_0x6649b
buttonsound
jump PhoneScript_HangupText_Male
sjump PhoneScript_HangupText_Male
.KimonoGirl:
farwritetext UnknownText_0x664dd
buttonsound
jump PhoneScript_HangupText_Male
sjump PhoneScript_HangupText_Male

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

@@ -4,13 +4,13 @@ BuenaPhoneCalleeScript:
readvar VAR_HOUR
ifgreater 17, BuenaPhoneScript_AfterMidnight1
scall BuenaPhoneScript_CheckTimeOfDay1
jump BuenaPhoneScript_Random1
sjump BuenaPhoneScript_Random1
BuenaPhoneCallerScript:
checkflag ENGINE_ROCKETS_IN_RADIO_TOWER
iftrue BuenaPhoneScript_Rocket
scall BuenaPhoneScript_CheckTimeOfDay2
jump BuenaPhoneScript_Random2
sjump BuenaPhoneScript_Random2
BuenaPhoneScript_CheckTimeOfDay1:
checktime MORN
@@ -69,7 +69,7 @@ BuenaPhoneScript_Random2:
checkevent EVENT_BEAT_ELITE_FOUR
iftrue .PostE4
random 11
jump .Jumptable
sjump .Jumptable
.PostE4:
random 14
@@ -92,55 +92,55 @@ BuenaPhoneScript_Random2:
.zero
writetext UnknownText_0xa0efb
jump .finish
sjump .finish
.one
writetext UnknownText_0xa0fcf
jump .finish
sjump .finish
.two
writetext UnknownText_0xa109d
jump .finish
sjump .finish
.three
writetext UnknownText_0xa1143
jump .finish
sjump .finish
.four
writetext UnknownText_0xa1244
jump .finish
sjump .finish
.five
writetext UnknownText_0xa1318
jump .finish
sjump .finish
.six
writetext UnknownText_0xa13d8
jump .finish
sjump .finish
.seven
writetext UnknownText_0xa1488
jump .finish
sjump .finish
.eight
writetext UnknownText_0xa15de
jump .finish
sjump .finish
.nine
writetext UnknownText_0xa1717
jump .finish
sjump .finish
.ten
writetext UnknownText_0xa183d
jump .finish
sjump .finish
.eleven
writetext UnknownText_0xa19b1
jump .finish
sjump .finish
.twelve
writetext UnknownText_0xa1ac0
jump .finish
sjump .finish
.thirteen
writetext UnknownText_0xa1bed

12
engine/phone/scripts/chad.asm
View File

@@ -11,11 +11,11 @@ ChadPhoneCalleeScript:
iftrue ChadFridayMorning
.NotFriday:
farjump UnknownScript_0xa0980
farsjump UnknownScript_0xa0980
.WantsBattle:
getlandmarkname STRING_BUFFER_5, ROUTE_38
farjump UnknownScript_0xa0a7d
farsjump UnknownScript_0xa0a7d
ChadPhoneCallerScript:
gettrainername STRING_BUFFER_3, SCHOOLBOY, CHAD1
@@ -32,7 +32,7 @@ ChadPhoneCallerScript:
.Generic:
farscall PhoneScript_Random3
ifequal 0, ChadFoundRare
farjump Phone_GenericCall_Male
farsjump Phone_GenericCall_Male
ChadFridayMorning:
setflag ENGINE_CHAD_FRIDAY_MORNING
@@ -40,10 +40,10 @@ ChadFridayMorning:
ChadWantsBattle:
getlandmarkname STRING_BUFFER_5, ROUTE_38
setflag ENGINE_CHAD
farjump PhoneScript_WantsToBattle_Male
farsjump PhoneScript_WantsToBattle_Male
ChadFoundRare:
farjump Phone_CheckIfUnseenRare_Male
farsjump Phone_CheckIfUnseenRare_Male
ChadOakGossip:
farjump ChadOakGossipScript
farsjump ChadOakGossipScript

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

@@ -14,49 +14,49 @@ ChadOakGossipScript:
.Blue:
farwritetext ChadBlueGossipText
buttonsound
jump PhoneScript_HangupText_Male
sjump PhoneScript_HangupText_Male
.Daisy:
farwritetext ChadDaisyGossipText
buttonsound
jump PhoneScript_HangupText_Male
sjump PhoneScript_HangupText_Male
.ProfElm:
farwritetext ChadProfElmGossipText
buttonsound
jump PhoneScript_HangupText_Male
sjump PhoneScript_HangupText_Male
.Dream:
farwritetext ChadDreamGossipText
buttonsound
jump PhoneScript_HangupText_Male
sjump PhoneScript_HangupText_Male
.Kurt:
farwritetext ChadKurtGossipText
buttonsound
jump PhoneScript_HangupText_Male
sjump PhoneScript_HangupText_Male
.League:
farwritetext ChadLeagueGossipText
buttonsound
jump PhoneScript_HangupText_Male
sjump PhoneScript_HangupText_Male
.RadioShow:
farwritetext ChadRadioShowGossipText
buttonsound
jump PhoneScript_HangupText_Male
sjump PhoneScript_HangupText_Male
.Battling:
farwritetext ChadBattlingGossipText
buttonsound
jump PhoneScript_HangupText_Male
sjump PhoneScript_HangupText_Male
.DaisyTea:
farwritetext ChadDaisyTeaGossipText
buttonsound
jump PhoneScript_HangupText_Male
sjump PhoneScript_HangupText_Male
.Traveled:
farwritetext ChadTravelGossipText
buttonsound
jump PhoneScript_HangupText_Male
sjump PhoneScript_HangupText_Male

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

@@ -13,15 +13,15 @@ DanaPhoneCalleeScript:
iftrue DanaThursdayNight
.NotThursday:
farjump UnknownScript_0xa0978
farsjump UnknownScript_0xa0978
.WantsBattle:
getlandmarkname STRING_BUFFER_5, ROUTE_38
farjump UnknownScript_0xa0a78
farsjump UnknownScript_0xa0a78
.HasThunderstone:
getlandmarkname STRING_BUFFER_5, ROUTE_38
farjump UnknownScript_0xa0acd
farsjump UnknownScript_0xa0acd
DanaPhoneCallerScript:
gettrainername STRING_BUFFER_3, LASS, DANA1
@@ -46,7 +46,7 @@ DanaPhoneCallerScript:
.Generic:
farscall PhoneScript_Random3
ifequal 0, DanaFoundRare
farjump Phone_GenericCall_Female
farsjump Phone_GenericCall_Female
DanaThursdayNight:
setflag ENGINE_DANA_THURSDAY_NIGHT
@@ -54,12 +54,12 @@ DanaThursdayNight:
DanaWantsBattle:
getlandmarkname STRING_BUFFER_5, ROUTE_38
setflag ENGINE_DANA
farjump PhoneScript_WantsToBattle_Female
farsjump PhoneScript_WantsToBattle_Female
DanaFoundRare:
farjump Phone_CheckIfUnseenRare_Female
farsjump Phone_CheckIfUnseenRare_Female
DanaHasThunderstone:
setflag ENGINE_DANA_HAS_THUNDERSTONE
getlandmarkname STRING_BUFFER_5, ROUTE_38
farjump PhoneScript_FoundItem_Female
farsjump PhoneScript_FoundItem_Female

12
engine/phone/scripts/derek.asm
View File

@@ -13,14 +13,14 @@ DerekPhoneCalleeScript:
ifequal SATURDAY, .ContestToday
.NoContest:
farjump UnknownScript_0xa0988
farsjump UnknownScript_0xa0988
.ContestToday:
farjump PhoneScript_BugCatchingContest
farsjump PhoneScript_BugCatchingContest
.Nugget:
getlandmarkname STRING_BUFFER_5, ROUTE_39
farjump UnknownScript_0xa0ad5
farsjump UnknownScript_0xa0ad5
DerekPhoneCallerScript:
gettrainername STRING_BUFFER_3, POKEFANM, DEREK1
@@ -37,12 +37,12 @@ DerekPhoneCallerScript:
.NoContest:
farscall PhoneScript_Random4
ifequal 0, .Nugget
farjump Phone_GenericCall_Male
farsjump Phone_GenericCall_Male
.ContestToday:
farjump PhoneScript_BugCatchingContest
farsjump PhoneScript_BugCatchingContest
.Nugget:
setflag ENGINE_DEREK_HAS_NUGGET
getlandmarkname STRING_BUFFER_5, ROUTE_39
farjump PhoneScript_FoundItem_Male
farsjump PhoneScript_FoundItem_Male

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

@@ -11,11 +11,11 @@ ErinPhoneCalleeScript:
iftrue ErinSaturdayNight
.NotSaturday:
farjump ErinWorkingHardScript
farsjump ErinWorkingHardScript
.WantsBattle:
getlandmarkname STRING_BUFFER_5, ROUTE_46
farjump ErinComeBattleScript
farsjump ErinComeBattleScript
ErinPhoneCallerScript:
gettrainername STRING_BUFFER_3, PICNICKER, ERIN1
@@ -29,7 +29,7 @@ ErinPhoneCallerScript:
ifequal 1, ErinWantsBattle
.GenericCall:
farjump Phone_GenericCall_Female
farsjump Phone_GenericCall_Female
ErinSaturdayNight:
setflag ENGINE_ERIN_SATURDAY_NIGHT
@@ -37,4 +37,4 @@ ErinSaturdayNight:
ErinWantsBattle:
getlandmarkname STRING_BUFFER_5, ROUTE_46
setflag ENGINE_ERIN
farjump PhoneScript_WantsToBattle_Female
farsjump PhoneScript_WantsToBattle_Female

10
engine/phone/scripts/gaven.asm
View File

@@ -11,11 +11,11 @@ GavenPhoneCalleeScript:
iftrue GavenThursdayMorning
.NotThursday:
farjump UnknownScript_0xa0910
farsjump UnknownScript_0xa0910
.WantsBattle:
getlandmarkname STRING_BUFFER_5, ROUTE_26
farjump UnknownScript_0xa0a37
farsjump UnknownScript_0xa0a37
GavenPhoneCallerScript:
gettrainername STRING_BUFFER_3, COOLTRAINERM, GAVEN3
@@ -30,7 +30,7 @@ GavenPhoneCallerScript:
.WaitingForBattle:
farscall PhoneScript_Random3
ifequal 0, GavenFoundRare
farjump Phone_GenericCall_Male
farsjump Phone_GenericCall_Male
GavenThursdayMorning:
setflag ENGINE_GAVEN_THURSDAY_MORNING
@@ -38,7 +38,7 @@ GavenThursdayMorning:
GavenWantsRematch:
getlandmarkname STRING_BUFFER_5, ROUTE_26
setflag ENGINE_GAVEN
farjump PhoneScript_WantsToBattle_Male
farsjump PhoneScript_WantsToBattle_Male
GavenFoundRare:
farjump Phone_CheckIfUnseenRare_Male
farsjump Phone_CheckIfUnseenRare_Male

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

@@ -1245,15 +1245,15 @@ PhoneScript_MonFlavorText:
ifequal $0, .TooEnergetic
farwritetext UnknownText_0x1b518b
buttonsound
farjump PhoneScript_HangupText_Male
farsjump PhoneScript_HangupText_Male
.TooEnergetic:
farjump .unnecessary
farsjump .unnecessary
.unnecessary
farwritetext UnknownText_0x1b522b
buttonsound
farjump PhoneScript_HangupText_Male
farsjump PhoneScript_HangupText_Male
GrandmaString: db "Grandma@"
GrandpaString: db "Grandpa@"

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

@@ -3,56 +3,56 @@ Phone_GenericCall_Male:
farscall PhoneScript_Random2
ifequal 0, .Bragging
farscall PhoneScript_Generic_Male
farjump Phone_FoundAMon_Male
farsjump Phone_FoundAMon_Male
.Bragging:
farjump Phone_BraggingCall_Male
farsjump Phone_BraggingCall_Male
Phone_GenericCall_Female:
special RandomPhoneMon
farscall PhoneScript_Random2
ifequal 0, .Bragging
farscall PhoneScript_Generic_Female
farjump Phone_FoundAMon_Female
farsjump Phone_FoundAMon_Female
.Bragging:
farjump Phone_BraggingCall_Female
farsjump Phone_BraggingCall_Female
Phone_BraggingCall_Male:
farscall Phone_WhosBragging_Male
farjump Phone_FoundAMon_Male
farsjump Phone_FoundAMon_Male
Phone_BraggingCall_Female:
farscall Phone_WhosBragging_Female
farjump Phone_FoundAMon_Female
farsjump Phone_FoundAMon_Female
Phone_FoundAMon_Male:
special RandomPhoneWildMon
farscall PhoneScript_Random2
ifequal 0, .GotAway
farscall Phone_WhoDefeatedMon_Male
farjump PhoneScript_HangupText_Male
farsjump PhoneScript_HangupText_Male
.GotAway:
farjump Phone_GotAwayCall_Male
farsjump Phone_GotAwayCall_Male
Phone_FoundAMon_Female:
special RandomPhoneWildMon
farscall PhoneScript_Random2
ifequal 0, .GotAway
farscall Phone_WhoDefeatedMon_Female
farjump PhoneScript_HangupText_Female
farsjump PhoneScript_HangupText_Female
.GotAway:
farjump Phone_GotAwayCall_Female
farsjump Phone_GotAwayCall_Female
Phone_GotAwayCall_Male:
farscall Phone_WhoLostAMon_Male
farjump PhoneScript_HangupText_Male
farsjump PhoneScript_HangupText_Male
Phone_GotAwayCall_Female:
farscall Phone_WhoLostAMon_Female
farjump PhoneScript_HangupText_Female
farsjump PhoneScript_HangupText_Female
Phone_WhosBragging_Male:
readvar VAR_CALLERID
@@ -524,11 +524,11 @@ Phone_WhoLostAMon_Female:
PhoneScript_WantsToBattle_Male:
farscall PhoneScript_RematchText_Male
farjump PhoneScript_HangupText_Male
farsjump PhoneScript_HangupText_Male
PhoneScript_WantsToBattle_Female:
farscall PhoneScript_RematchText_Female
farjump PhoneScript_HangupText_Female
farsjump PhoneScript_HangupText_Female
PhoneScript_RematchText_Male:
readvar VAR_CALLERID
@@ -837,18 +837,18 @@ PhoneScript_HangupText_Female:
Phone_CheckIfUnseenRare_Male:
scall PhoneScriptRareWildMon
iffalse .HangUp
farjump Phone_GenericCall_Male
farsjump Phone_GenericCall_Male
.HangUp:
farjump PhoneScript_HangupText_Male
farsjump PhoneScript_HangupText_Male
Phone_CheckIfUnseenRare_Female:
scall PhoneScriptRareWildMon
iffalse .HangUp
farjump Phone_GenericCall_Female
farsjump Phone_GenericCall_Female
.HangUp:
farjump PhoneScript_HangupText_Female
farsjump PhoneScript_HangupText_Female
PhoneScriptRareWildMon:
special RandomUnseenWildMon
@@ -862,37 +862,37 @@ PhoneScript_BugCatchingContest:
.Wade:
farwritetext WadeBugCatchingContestText
buttonsound
jump PhoneScript_HangupText_Male
sjump PhoneScript_HangupText_Male
.Derek:
farwritetext DerekBugCatchingContestText
buttonsound
jump PhoneScript_HangupText_Male
sjump PhoneScript_HangupText_Male
IrwinRocketRumor:
farwritetext UnknownText_0x64032
buttonsound
jump PhoneScript_HangupText_Male
sjump PhoneScript_HangupText_Male
UnknownScript_0xa05c6:
farwritetext UnknownText_0x177378
buttonsound
jump PhoneScript_HangupText_Female
sjump PhoneScript_HangupText_Female
UnknownScript_0xa05ce:
farwritetext UnknownText_0x64b5f
buttonsound
jump PhoneScript_HangupText_Male
sjump PhoneScript_HangupText_Male
UnknownScript_0xa05d6:
farwritetext UnknownText_0x175dd9
buttonsound
jump PhoneScript_HangupText_Male
sjump PhoneScript_HangupText_Male
UnknownScript_0xa05de:
farwritetext UnknownText_0x176c61
buttonsound
jump PhoneScript_HangupText_Male
sjump PhoneScript_HangupText_Male
PhoneScript_FoundItem_Male:
readvar VAR_CALLERID
@@ -953,9 +953,9 @@ PhoneScript_FoundItem_Female:
UnknownScript_0xa0644:
farwritetext UnknownText_0x176feb
buttonsound
jump PhoneScript_HangupText_Male
sjump PhoneScript_HangupText_Male
KenjiCallingPhoneScript:
farwritetext UnknownText_0x66dc5
buttonsound
jump PhoneScript_HangupText_Male
sjump PhoneScript_HangupText_Male

16
engine/phone/scripts/gina.asm
View File

@@ -15,18 +15,18 @@ GinaPhoneCalleeScript:
.NotSunday:
checkflag ENGINE_ROCKETS_IN_RADIO_TOWER
iftrue .Rockets
farjump UnknownScript_0xa0960
farsjump UnknownScript_0xa0960
.Rockets:
farjump UnknownScript_0xa05c6
farsjump UnknownScript_0xa05c6
.WantsBattle:
getlandmarkname STRING_BUFFER_5, ROUTE_34
farjump UnknownScript_0xa0a69
farsjump UnknownScript_0xa0a69
.HasLeafStone:
getlandmarkname STRING_BUFFER_5, ROUTE_34
farjump UnknownScript_0xa0abd
farsjump UnknownScript_0xa0abd
GinaPhoneCallerScript:
gettrainername STRING_BUFFER_3, PICNICKER, GINA1
@@ -53,7 +53,7 @@ GinaPhoneCallerScript:
ifequal 0, GinaWantsBattle
.Generic:
farjump Phone_GenericCall_Female
farsjump Phone_GenericCall_Female
GinaSundayDay:
setflag ENGINE_GINA_SUNDAY_AFTERNOON
@@ -61,12 +61,12 @@ GinaSundayDay:
GinaWantsBattle:
getlandmarkname STRING_BUFFER_5, ROUTE_34
setflag ENGINE_GINA
farjump PhoneScript_WantsToBattle_Female
farsjump PhoneScript_WantsToBattle_Female
GinaRockets:
farjump UnknownScript_0xa05c6
farsjump UnknownScript_0xa05c6
GinaHasLeafStone:
setflag ENGINE_GINA_HAS_LEAF_STONE
getlandmarkname STRING_BUFFER_5, ROUTE_34
farjump PhoneScript_FoundItem_Female
farsjump PhoneScript_FoundItem_Female

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

@@ -1,132 +1,132 @@
JackPhoneTips:
farwritetext UnknownText_0x1745c2
buttonsound
jump PhoneScript_HangupText_Male
sjump PhoneScript_HangupText_Male
UnknownScript_0xa0900:
farwritetext UnknownText_0x17485b
buttonsound
jump PhoneScript_HangupText_Female
sjump PhoneScript_HangupText_Female
UnknownScript_0xa0908:
farwritetext UnknownText_0x17496b
buttonsound
jump PhoneScript_HangupText_Male
sjump PhoneScript_HangupText_Male
UnknownScript_0xa0910:
farwritetext UnknownText_0x174c29
buttonsound
jump PhoneScript_HangupText_Male
sjump PhoneScript_HangupText_Male
UnknownScript_0xa0918:
farwritetext UnknownText_0x174ec5
buttonsound
jump PhoneScript_HangupText_Female
sjump PhoneScript_HangupText_Female
UnknownScript_0xa0920:
farwritetext UnknownText_0x17519b
buttonsound
jump PhoneScript_HangupText_Male
sjump PhoneScript_HangupText_Male
UnknownScript_0xa0928:
farwritetext UnknownText_0x17549b
buttonsound
jump PhoneScript_HangupText_Female
sjump PhoneScript_HangupText_Female
UnknownScript_0xa0930:
farwritetext UnknownText_0x17571d
buttonsound
jump PhoneScript_HangupText_Male
sjump PhoneScript_HangupText_Male
UnknownScript_0xa0938:
farwritetext UnknownText_0x175abe
buttonsound
jump PhoneScript_HangupText_Male
sjump PhoneScript_HangupText_Male
UnknownScript_0xa0940:
farwritetext UnknownText_0x175eaf
buttonsound
jump PhoneScript_HangupText_Male
sjump PhoneScript_HangupText_Male
UnknownScript_0xa0948:
farwritetext UnknownText_0x1768b0
buttonsound
jump PhoneScript_HangupText_Female
sjump PhoneScript_HangupText_Female
UnknownScript_0xa0950:
farwritetext UnknownText_0x176d32
buttonsound
jump PhoneScript_HangupText_Male
sjump PhoneScript_HangupText_Male
UnknownScript_0xa0958:
farwritetext UnknownText_0x1770fb
buttonsound
jump PhoneScript_HangupText_Male
sjump PhoneScript_HangupText_Male
UnknownScript_0xa0960:
farwritetext UnknownText_0x177465
buttonsound
jump PhoneScript_HangupText_Female
sjump PhoneScript_HangupText_Female
UnknownScript_0xa0968:
farwritetext UnknownText_0x64bc6
buttonsound
jump PhoneScript_HangupText_Male
sjump PhoneScript_HangupText_Male
UnknownScript_0xa0970:
farwritetext UnknownText_0x64e90
buttonsound
jump PhoneScript_HangupText_Male
sjump PhoneScript_HangupText_Male
UnknownScript_0xa0978:
farwritetext UnknownText_0x65161
buttonsound
jump PhoneScript_HangupText_Female
sjump PhoneScript_HangupText_Female
UnknownScript_0xa0980:
farwritetext UnknownText_0x65a23
buttonsound
jump PhoneScript_HangupText_Male
sjump PhoneScript_HangupText_Male
UnknownScript_0xa0988:
farwritetext UnknownText_0x65d5c
buttonsound
jump PhoneScript_HangupText_Male
sjump PhoneScript_HangupText_Male
UnknownScript_0xa0990:
farwritetext UnknownText_0x65ff2
buttonsound
jump PhoneScript_HangupText_Male
sjump PhoneScript_HangupText_Male
UnknownScript_0xa0998:
farwritetext UnknownText_0x6651e
buttonsound
jump PhoneScript_HangupText_Male
sjump PhoneScript_HangupText_Male
UnknownScript_0xa09a0:
farwritetext UnknownText_0x66882
buttonsound
jump PhoneScript_HangupText_Female
sjump PhoneScript_HangupText_Female
VanceLookingForward:
farwritetext VanceLookingForwardText
buttonsound
jump PhoneScript_HangupText_Male
sjump PhoneScript_HangupText_Male
WiltonHaventFoundAnything:
farwritetext WiltonHaventFoundAnythingText
buttonsound
jump PhoneScript_HangupText_Male
sjump PhoneScript_HangupText_Male
ParryBattleWithMe:
farwritetext ParryBattleWithMeText
buttonsound
jump PhoneScript_HangupText_Male
sjump PhoneScript_HangupText_Male
ErinWorkingHardScript:
farwritetext ErinWorkingHardText
buttonsound
jump PhoneScript_HangupText_Female
sjump PhoneScript_HangupText_Female
UnknownScript_0xa09c8:
random 3
@@ -137,17 +137,17 @@ UnknownScript_0xa09c8:
UnknownScript_0xa09d6:
farwritetext UnknownText_0x64846
buttonsound
jump PhoneScript_HangupText_Male
sjump PhoneScript_HangupText_Male
UnknownScript_0xa09de:
farwritetext UnknownText_0x64881
buttonsound
jump PhoneScript_HangupText_Male
sjump PhoneScript_HangupText_Male
UnknownScript_0xa09e6:
farwritetext UnknownText_0x648dc
buttonsound
jump PhoneScript_HangupText_Male
sjump PhoneScript_HangupText_Male
KenjiAnswerPhoneScript:
readvar VAR_KENJI_BREAK
@@ -155,12 +155,12 @@ KenjiAnswerPhoneScript:
ifequal 1, .OnBreak
farwritetext UnknownText_0x66e17
buttonsound
jump PhoneScript_HangupText_Male
sjump PhoneScript_HangupText_Male
.Training:
farwritetext UnknownText_0x66e67
buttonsound
jump PhoneScript_HangupText_Male
sjump PhoneScript_HangupText_Male
.OnBreak:
checktime MORN
@@ -170,14 +170,14 @@ KenjiAnswerPhoneScript:
setevent EVENT_KENJI_ON_BREAK
farwritetext KenjiBreakText
buttonsound
jump PhoneScript_HangupText_Male
sjump PhoneScript_HangupText_Male
.Morning:
farwritetext UnknownText_0x66ed3
buttonsound
jump PhoneScript_HangupText_Male
sjump PhoneScript_HangupText_Male
.Night:
farwritetext UnknownText_0x66f52
buttonsound
jump PhoneScript_HangupText_Male
sjump PhoneScript_HangupText_Male

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

@@ -1,49 +1,49 @@
UnknownScript_0xa0aa5:
farwritetext UnknownText_0x174895
buttonsound
jump PhoneScript_HangupText_Female
sjump PhoneScript_HangupText_Female
UnknownScript_0xa0aad:
farwritetext UnknownText_0x17529c
buttonsound
jump PhoneScript_HangupText_Male
sjump PhoneScript_HangupText_Male
UnknownScript_0xa0ab5:
farwritetext UnknownText_0x175b6d
buttonsound
jump PhoneScript_HangupText_Male
sjump PhoneScript_HangupText_Male
UnknownScript_0xa0abd:
farwritetext UnknownText_0x17750e
buttonsound
jump PhoneScript_HangupText_Female
sjump PhoneScript_HangupText_Female
UnknownScript_0xa0ac5:
farwritetext UnknownText_0x64f1a
buttonsound
jump PhoneScript_HangupText_Male
sjump PhoneScript_HangupText_Male
UnknownScript_0xa0acd:
farwritetext UnknownText_0x6520f
buttonsound
jump PhoneScript_HangupText_Female
sjump PhoneScript_HangupText_Female
UnknownScript_0xa0ad5:
farwritetext UnknownText_0x65da6
buttonsound
jump PhoneScript_HangupText_Male
sjump PhoneScript_HangupText_Male
UnknownScript_0xa0add:
farwritetext UnknownText_0x66087
buttonsound
jump PhoneScript_HangupText_Male
sjump PhoneScript_HangupText_Male
UnknownScript_0xa0ae5:
farwritetext UnknownText_0x6691d
buttonsound
jump PhoneScript_HangupText_Female
sjump PhoneScript_HangupText_Female
WiltonWantThis:
farwritetext WiltonWantThisText
buttonsound
jump PhoneScript_HangupText_Male
sjump PhoneScript_HangupText_Male

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