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 more script commands for consistency and predictability

Browse Source 
Fixes #540
This commit is contained in:
Rangi
2019-03-10 15:31:59 -04:00
parent 6393ecb7e5
commit e002b536af
157 changed files with 1494 additions and 1004 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
AlanPhoneCalleeScript:
trainertotext SCHOOLBOY, ALAN1, MEM_BUFFER_0
gettrainername STRING_BUFFER_3, SCHOOLBOY, ALAN1
checkflag ENGINE_ALAN
iftrue .WantsBattle
farscall PhoneScript_AnswerPhone_Male
@@ -7,7 +7,7 @@ AlanPhoneCalleeScript:
iftrue .NotWednesday
checkflag ENGINE_ALAN_HAS_FIRE_STONE
iftrue .FireStone
checkcode VAR_WEEKDAY
readvar VAR_WEEKDAY
ifnotequal WEDNESDAY, .NotWednesday
checktime DAY
iftrue AlanWednesdayDay
@@ -16,15 +16,15 @@ AlanPhoneCalleeScript:
farjump UnknownScript_0xa0970
.WantsBattle:
landmarktotext ROUTE_36, MEM_BUFFER_2
getlandmarkname STRING_BUFFER_5, ROUTE_36
farjump UnknownScript_0xa0a73
.FireStone:
landmarktotext ROUTE_36, MEM_BUFFER_2
getlandmarkname STRING_BUFFER_5, ROUTE_36
farjump UnknownScript_0xa0ac5
AlanPhoneCallerScript:
trainertotext SCHOOLBOY, ALAN1, MEM_BUFFER_0
gettrainername STRING_BUFFER_3, SCHOOLBOY, ALAN1
farscall PhoneScript_GreetPhone_Male
checkflag ENGINE_ALAN
iftrue .Generic
@@ -50,11 +50,11 @@ AlanWednesdayDay:
setflag ENGINE_ALAN_WEDNESDAY_AFTERNOON
AlanWantsBattle:
landmarktotext ROUTE_36, MEM_BUFFER_2
getlandmarkname STRING_BUFFER_5, ROUTE_36
setflag ENGINE_ALAN
farjump PhoneScript_WantsToBattle_Male
AlanHasFireStone:
setflag ENGINE_ALAN_HAS_FIRE_STONE
landmarktotext ROUTE_36, MEM_BUFFER_2
getlandmarkname STRING_BUFFER_5, ROUTE_36
farjump PhoneScript_FoundItem_Male

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

@@ -1,11 +1,11 @@
AnthonyPhoneCalleeScript:
trainertotext HIKER, ANTHONY2, MEM_BUFFER_0
gettrainername STRING_BUFFER_3, HIKER, ANTHONY2
checkflag ENGINE_ANTHONY
iftrue .WantsBattle
farscall PhoneScript_AnswerPhone_Male
checkflag ENGINE_ANTHONY_FRIDAY_NIGHT
iftrue .NotFriday
checkcode VAR_WEEKDAY
readvar VAR_WEEKDAY
ifnotequal FRIDAY, .NotFriday
checktime NITE
iftrue AnthonyFridayNight
@@ -16,15 +16,15 @@ AnthonyPhoneCalleeScript:
farjump UnknownScript_0xa0950
.WantsBattle:
landmarktotext ROUTE_33, MEM_BUFFER_2
getlandmarkname STRING_BUFFER_5, ROUTE_33
farjump UnknownScript_0xa0a5f
.AlreadySwarming:
landmarktotext ROUTE_33, MEM_BUFFER_2
getlandmarkname STRING_BUFFER_5, ROUTE_33
farjump UnknownScript_0xa0afa
AnthonyPhoneCallerScript:
trainertotext HIKER, ANTHONY2, MEM_BUFFER_0
gettrainername STRING_BUFFER_3, HIKER, ANTHONY2
farscall PhoneScript_GreetPhone_Male
checkflag ENGINE_FLYPOINT_GOLDENROD
iffalse .TriesSwarm
@@ -44,7 +44,7 @@ AnthonyFridayNight:
setflag ENGINE_ANTHONY_FRIDAY_NIGHT
AnthonyWantsBattle:
landmarktotext ROUTE_33, MEM_BUFFER_2
getlandmarkname STRING_BUFFER_5, ROUTE_33
setflag ENGINE_ANTHONY
farjump PhoneScript_WantsToBattle_Male
@@ -52,9 +52,9 @@ AnthonyTriesDunsparceSwarm:
checkflag ENGINE_DUNSPARCE_SWARM
iftrue .Generic
setflag ENGINE_DUNSPARCE_SWARM
pokenamemem DUNSPARCE, MEM_BUFFER_1
getmonname STRING_BUFFER_4, DUNSPARCE
swarm SWARM_DUNSPARCE, DARK_CAVE_VIOLET_ENTRANCE
landmarktotext DARK_CAVE, MEM_BUFFER_2
getlandmarkname STRING_BUFFER_5, DARK_CAVE
farjump UnknownScript_0xa05de
.Generic:

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

@@ -1,11 +1,11 @@
ArniePhoneCalleeScript:
trainertotext BUG_CATCHER, ARNIE1, MEM_BUFFER_0
gettrainername STRING_BUFFER_3, BUG_CATCHER, ARNIE1
checkflag ENGINE_ARNIE
iftrue .WantsBattle
farscall PhoneScript_AnswerPhone_Male
checkflag ENGINE_ARNIE_TUESDAY_MORNING
iftrue .NotTuesday
checkcode VAR_WEEKDAY
readvar VAR_WEEKDAY
ifnotequal TUESDAY, .NotTuesday
checktime MORN
iftrue ArnieTuesdayMorning
@@ -16,15 +16,15 @@ ArniePhoneCalleeScript:
farjump UnknownScript_0xa0968
.WantsBattle:
landmarktotext ROUTE_35, MEM_BUFFER_2
getlandmarkname STRING_BUFFER_5, ROUTE_35
farjump UnknownScript_0xa0a6e
.AlreadySwarming:
landmarktotext ROUTE_35, MEM_BUFFER_2
getlandmarkname STRING_BUFFER_5, ROUTE_35
farjump UnknownScript_0xa0aff
ArniePhoneCallerScript:
trainertotext BUG_CATCHER, ARNIE1, MEM_BUFFER_0
gettrainername STRING_BUFFER_3, BUG_CATCHER, ARNIE1
farscall PhoneScript_GreetPhone_Male
checkflag ENGINE_ARNIE
iftrue .Swarm
@@ -44,7 +44,7 @@ ArnieTuesdayMorning:
setflag ENGINE_ARNIE_TUESDAY_MORNING
ArnieWantsBattle:
landmarktotext ROUTE_35, MEM_BUFFER_2
getlandmarkname STRING_BUFFER_5, ROUTE_35
setflag ENGINE_ARNIE
farjump PhoneScript_WantsToBattle_Male
@@ -52,9 +52,9 @@ ArnieYanmaSwarm: ; start swarm
checkflag ENGINE_YANMA_SWARM
iftrue ArnieYanmaAlreadySwarming
setflag ENGINE_YANMA_SWARM
pokenamemem YANMA, MEM_BUFFER_1
getmonname STRING_BUFFER_4, YANMA
swarm SWARM_YANMA, ROUTE_35
landmarktotext ROUTE_35, MEM_BUFFER_2
getlandmarkname STRING_BUFFER_5, ROUTE_35
farjump UnknownScript_0xa05ce
ArnieFoundRare:

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

@@ -1,11 +1,11 @@
BethPhoneCalleeScript:
trainertotext COOLTRAINERF, BETH1, MEM_BUFFER_0
gettrainername STRING_BUFFER_3, COOLTRAINERF, BETH1
checkflag ENGINE_BETH
iftrue .WantsBattle
farscall PhoneScript_AnswerPhone_Female
checkflag ENGINE_BETH_FRIDAY_AFTERNOON
iftrue .NotFriday
checkcode VAR_WEEKDAY
readvar VAR_WEEKDAY
ifnotequal FRIDAY, .NotFriday
checktime DAY
iftrue BethFridayAfternoon
@@ -14,11 +14,11 @@ BethPhoneCalleeScript:
farjump UnknownScript_0xa0918
.WantsBattle:
landmarktotext ROUTE_26, MEM_BUFFER_2
getlandmarkname STRING_BUFFER_5, ROUTE_26
farjump BethBattleReminderScript
BethPhoneCallerScript:
trainertotext COOLTRAINERF, BETH1, MEM_BUFFER_0
gettrainername STRING_BUFFER_3, COOLTRAINERF, BETH1
farscall PhoneScript_GreetPhone_Female
checkflag ENGINE_BETH
iftrue .Generic
@@ -34,6 +34,6 @@ BethFridayAfternoon:
setflag ENGINE_BETH_FRIDAY_AFTERNOON
BethWantsBattle:
landmarktotext ROUTE_26, MEM_BUFFER_2
getlandmarkname STRING_BUFFER_5, ROUTE_26
setflag ENGINE_BETH
farjump PhoneScript_WantsToBattle_Female

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

@@ -1,16 +1,16 @@
BeverlyPhoneCalleeScript:
trainertotext POKEFANF, BEVERLY1, MEM_BUFFER_0
gettrainername STRING_BUFFER_3, POKEFANF, BEVERLY1
farscall PhoneScript_AnswerPhone_Female
checkflag ENGINE_BEVERLY_HAS_NUGGET
iftrue .HasNugget
farjump UnknownScript_0xa0900
.HasNugget:
landmarktotext NATIONAL_PARK, MEM_BUFFER_2
getlandmarkname STRING_BUFFER_5, NATIONAL_PARK
farjump UnknownScript_0xa0aa5
BeverlyPhoneCallerScript:
trainertotext POKEFANF, BEVERLY1, MEM_BUFFER_0
gettrainername STRING_BUFFER_3, POKEFANF, BEVERLY1
farscall PhoneScript_GreetPhone_Female
checkflag ENGINE_BEVERLY_HAS_NUGGET
iftrue .HasNugget
@@ -22,5 +22,5 @@ BeverlyPhoneCallerScript:
.FoundNugget:
setflag ENGINE_BEVERLY_HAS_NUGGET
landmarktotext NATIONAL_PARK, MEM_BUFFER_2
getlandmarkname STRING_BUFFER_5, NATIONAL_PARK
farjump PhoneScript_FoundItem_Female

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

@@ -20,8 +20,8 @@ BillPhoneCalleeScript:
.main
farwritetext BillPhoneGenericText
buttonsound
checkcode VAR_BOXSPACE
vartomem MEM_BUFFER_0
readvar VAR_BOXSPACE
getnum STRING_BUFFER_3
ifequal 0, .full
ifless PARTY_LENGTH, .nearlyfull
farwritetext BillPhoneNotFullText

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

@@ -1,11 +1,11 @@
BrentPhoneCalleeScript:
trainertotext POKEMANIAC, BRENT1, MEM_BUFFER_0
gettrainername STRING_BUFFER_3, POKEMANIAC, BRENT1
checkflag ENGINE_BRENT
iftrue .WantsBattle
farscall PhoneScript_AnswerPhone_Male
checkflag ENGINE_BRENT_MONDAY_MORNING
iftrue .NotMonday
checkcode VAR_WEEKDAY
readvar VAR_WEEKDAY
ifnotequal MONDAY, .NotMonday
checktime MORN
iftrue BrentMondayMorning
@@ -14,11 +14,11 @@ BrentPhoneCalleeScript:
farjump UnknownScript_0xa0998
.WantsBattle:
landmarktotext ROUTE_43, MEM_BUFFER_2
getlandmarkname STRING_BUFFER_5, ROUTE_43
farjump UnknownScript_0xa0a87
BrentPhoneCallerScript:
trainertotext POKEMANIAC, BRENT1, MEM_BUFFER_0
gettrainername STRING_BUFFER_3, POKEMANIAC, BRENT1
farscall PhoneScript_GreetPhone_Male
farscall PhoneScript_Random2
ifequal 0, BrentBillTrivia
@@ -36,7 +36,7 @@ BrentMondayMorning:
setflag ENGINE_BRENT_MONDAY_MORNING
BrentWantsBattle:
landmarktotext ROUTE_43, MEM_BUFFER_2
getlandmarkname STRING_BUFFER_5, ROUTE_43
setflag ENGINE_BRENT
farjump PhoneScript_WantsToBattle_Male

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

@@ -1,7 +1,7 @@
BuenaPhoneCalleeScript:
checkflag ENGINE_ROCKETS_IN_RADIO_TOWER
iftrue BuenaPhoneScript_Rocket
checkcode VAR_HOUR
readvar VAR_HOUR
ifgreater 17, BuenaPhoneScript_AfterMidnight1
scall BuenaPhoneScript_CheckTimeOfDay1
jump BuenaPhoneScript_Random1
@@ -36,7 +36,7 @@ BuenaPhoneScript_AfterMidnight1:
end
BuenaPhoneScript_CheckTimeOfDay2:
checkcode VAR_HOUR
readvar VAR_HOUR
ifgreater 17, BuenaPhoneScript_AfterMidnight2
checktime MORN
iftrue .morn

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

@@ -1,11 +1,11 @@
ChadPhoneCalleeScript:
trainertotext SCHOOLBOY, CHAD1, MEM_BUFFER_0
gettrainername STRING_BUFFER_3, SCHOOLBOY, CHAD1
checkflag ENGINE_CHAD
iftrue .WantsBattle
farscall PhoneScript_AnswerPhone_Male
checkflag ENGINE_CHAD_FRIDAY_MORNING
iftrue .NotFriday
checkcode VAR_WEEKDAY
readvar VAR_WEEKDAY
ifnotequal FRIDAY, .NotFriday
checktime MORN
iftrue ChadFridayMorning
@@ -14,11 +14,11 @@ ChadPhoneCalleeScript:
farjump UnknownScript_0xa0980
.WantsBattle:
landmarktotext ROUTE_38, MEM_BUFFER_2
getlandmarkname STRING_BUFFER_5, ROUTE_38
farjump UnknownScript_0xa0a7d
ChadPhoneCallerScript:
trainertotext SCHOOLBOY, CHAD1, MEM_BUFFER_0
gettrainername STRING_BUFFER_3, SCHOOLBOY, CHAD1
farscall PhoneScript_GreetPhone_Male
farscall PhoneScript_Random2
ifequal 0, ChadOakGossip
@@ -38,7 +38,7 @@ ChadFridayMorning:
setflag ENGINE_CHAD_FRIDAY_MORNING
ChadWantsBattle:
landmarktotext ROUTE_38, MEM_BUFFER_2
getlandmarkname STRING_BUFFER_5, ROUTE_38
setflag ENGINE_CHAD
farjump PhoneScript_WantsToBattle_Male

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

@@ -1,5 +1,5 @@
DanaPhoneCalleeScript:
trainertotext LASS, DANA1, MEM_BUFFER_0
gettrainername STRING_BUFFER_3, LASS, DANA1
checkflag ENGINE_DANA
iftrue .WantsBattle
farscall PhoneScript_AnswerPhone_Female
@@ -7,7 +7,7 @@ DanaPhoneCalleeScript:
iftrue .NotThursday
checkflag ENGINE_DANA_HAS_THUNDERSTONE
iftrue .HasThunderstone
checkcode VAR_WEEKDAY
readvar VAR_WEEKDAY
ifnotequal THURSDAY, .NotThursday
checktime NITE
iftrue DanaThursdayNight
@@ -16,15 +16,15 @@ DanaPhoneCalleeScript:
farjump UnknownScript_0xa0978
.WantsBattle:
landmarktotext ROUTE_38, MEM_BUFFER_2
getlandmarkname STRING_BUFFER_5, ROUTE_38
farjump UnknownScript_0xa0a78
.HasThunderstone:
landmarktotext ROUTE_38, MEM_BUFFER_2
getlandmarkname STRING_BUFFER_5, ROUTE_38
farjump UnknownScript_0xa0acd
DanaPhoneCallerScript:
trainertotext LASS, DANA1, MEM_BUFFER_0
gettrainername STRING_BUFFER_3, LASS, DANA1
farscall PhoneScript_GreetPhone_Female
checkflag ENGINE_DANA
iftrue .Generic
@@ -52,7 +52,7 @@ DanaThursdayNight:
setflag ENGINE_DANA_THURSDAY_NIGHT
DanaWantsBattle:
landmarktotext ROUTE_38, MEM_BUFFER_2
getlandmarkname STRING_BUFFER_5, ROUTE_38
setflag ENGINE_DANA
farjump PhoneScript_WantsToBattle_Female
@@ -61,5 +61,5 @@ DanaFoundRare:
DanaHasThunderstone:
setflag ENGINE_DANA_HAS_THUNDERSTONE
landmarktotext ROUTE_38, MEM_BUFFER_2
getlandmarkname STRING_BUFFER_5, ROUTE_38
farjump PhoneScript_FoundItem_Female

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

@@ -1,5 +1,5 @@
DerekPhoneCalleeScript:
trainertotext POKEFANM, DEREK1, MEM_BUFFER_0
gettrainername STRING_BUFFER_3, POKEFANM, DEREK1
farscall PhoneScript_AnswerPhone_Male
checkflag ENGINE_DEREK_HAS_NUGGET
iftrue .Nugget
@@ -7,7 +7,7 @@ DerekPhoneCalleeScript:
ifequal 0, .NoContest
checkflag ENGINE_DAILY_BUG_CONTEST
iftrue .NoContest
checkcode VAR_WEEKDAY
readvar VAR_WEEKDAY
ifequal TUESDAY, .ContestToday
ifequal THURSDAY, .ContestToday
ifequal SATURDAY, .ContestToday
@@ -19,17 +19,17 @@ DerekPhoneCalleeScript:
farjump PhoneScript_BugCatchingContest
.Nugget:
landmarktotext ROUTE_39, MEM_BUFFER_2
getlandmarkname STRING_BUFFER_5, ROUTE_39
farjump UnknownScript_0xa0ad5
DerekPhoneCallerScript:
trainertotext POKEFANM, DEREK1, MEM_BUFFER_0
gettrainername STRING_BUFFER_3, POKEFANM, DEREK1
farscall PhoneScript_GreetPhone_Male
farscall PhoneScript_Random2
ifequal 0, .NoContest
checkflag ENGINE_DAILY_BUG_CONTEST
iftrue .NoContest
checkcode VAR_WEEKDAY
readvar VAR_WEEKDAY
ifequal TUESDAY, .ContestToday
ifequal THURSDAY, .ContestToday
ifequal SATURDAY, .ContestToday
@@ -44,5 +44,5 @@ DerekPhoneCallerScript:
.Nugget:
setflag ENGINE_DEREK_HAS_NUGGET
landmarktotext ROUTE_39, MEM_BUFFER_2
getlandmarkname STRING_BUFFER_5, ROUTE_39
farjump PhoneScript_FoundItem_Male

4
engine/phone/scripts/elm.asm
View File

@@ -1,5 +1,5 @@
ElmPhoneCalleeScript:
checkcode VAR_SPECIALPHONECALL
readvar VAR_SPECIALPHONECALL
ifequal SPECIALCALL_POKERUS, .pokerus
checkevent EVENT_SHOWED_TOGEPI_TO_ELM
iftrue .discovery
@@ -62,7 +62,7 @@ ElmPhoneCalleeScript:
end
ElmPhoneCallerScript:
checkcode VAR_SPECIALPHONECALL
readvar VAR_SPECIALPHONECALL
ifequal SPECIALCALL_ROBBED, .disaster
ifequal SPECIALCALL_ASSISTANT, .assistant
ifequal SPECIALCALL_WEIRDBROADCAST, .rocket

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

@@ -1,11 +1,11 @@
ErinPhoneCalleeScript:
trainertotext PICNICKER, ERIN1, MEM_BUFFER_0
gettrainername STRING_BUFFER_3, PICNICKER, ERIN1
checkflag ENGINE_ERIN
iftrue .WantsBattle
farscall PhoneScript_AnswerPhone_Female
checkflag ENGINE_ERIN_SATURDAY_NIGHT
iftrue .NotSaturday
checkcode VAR_WEEKDAY
readvar VAR_WEEKDAY
ifnotequal SATURDAY, .NotSaturday
checktime NITE
iftrue ErinSaturdayNight
@@ -14,11 +14,11 @@ ErinPhoneCalleeScript:
farjump ErinWorkingHardScript
.WantsBattle:
landmarktotext ROUTE_46, MEM_BUFFER_2
getlandmarkname STRING_BUFFER_5, ROUTE_46
farjump ErinComeBattleScript
ErinPhoneCallerScript:
trainertotext PICNICKER, ERIN1, MEM_BUFFER_0
gettrainername STRING_BUFFER_3, PICNICKER, ERIN1
farscall PhoneScript_GreetPhone_Female
checkflag ENGINE_ERIN
iftrue .GenericCall
@@ -35,6 +35,6 @@ ErinSaturdayNight:
setflag ENGINE_ERIN_SATURDAY_NIGHT
ErinWantsBattle:
landmarktotext ROUTE_46, MEM_BUFFER_2
getlandmarkname STRING_BUFFER_5, ROUTE_46
setflag ENGINE_ERIN
farjump PhoneScript_WantsToBattle_Female

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

@@ -1,11 +1,11 @@
GavenPhoneCalleeScript:
trainertotext COOLTRAINERM, GAVEN3, MEM_BUFFER_0
gettrainername STRING_BUFFER_3, COOLTRAINERM, GAVEN3
checkflag ENGINE_GAVEN
iftrue .WantsBattle
farscall PhoneScript_AnswerPhone_Male
checkflag ENGINE_GAVEN_THURSDAY_MORNING
iftrue .NotThursday
checkcode VAR_WEEKDAY
readvar VAR_WEEKDAY
ifnotequal THURSDAY, .NotThursday
checktime MORN
iftrue GavenThursdayMorning
@@ -14,11 +14,11 @@ GavenPhoneCalleeScript:
farjump UnknownScript_0xa0910
.WantsBattle:
landmarktotext ROUTE_26, MEM_BUFFER_2
getlandmarkname STRING_BUFFER_5, ROUTE_26
farjump UnknownScript_0xa0a37
GavenPhoneCallerScript:
trainertotext COOLTRAINERM, GAVEN3, MEM_BUFFER_0
gettrainername STRING_BUFFER_3, COOLTRAINERM, GAVEN3
farscall PhoneScript_GreetPhone_Male
checkflag ENGINE_GAVEN
iftrue .WaitingForBattle
@@ -36,7 +36,7 @@ GavenThursdayMorning:
setflag ENGINE_GAVEN_THURSDAY_MORNING
GavenWantsRematch:
landmarktotext ROUTE_26, MEM_BUFFER_2
getlandmarkname STRING_BUFFER_5, ROUTE_26
setflag ENGINE_GAVEN
farjump PhoneScript_WantsToBattle_Male

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

@@ -23,7 +23,7 @@ PhoneScript_AnswerPhone_Male:
iftrue PhoneScript_AnswerPhone_Male_Day
checktime NITE
iftrue PhoneScript_AnswerPhone_Male_Nite
checkcode VAR_CALLERID
readvar VAR_CALLERID
ifequal PHONE_SCHOOLBOY_JACK, .Jack
ifequal PHONE_SAILOR_HUEY, .Huey
ifequal PHONE_COOLTRAINERM_GAVEN, .Gaven
@@ -146,7 +146,7 @@ PhoneScript_AnswerPhone_Male:
end
PhoneScript_AnswerPhone_Male_Day:
checkcode VAR_CALLERID
readvar VAR_CALLERID
ifequal PHONE_SCHOOLBOY_JACK, .Jack
ifequal PHONE_SAILOR_HUEY, .Huey
ifequal PHONE_COOLTRAINERM_GAVEN, .Gaven
@@ -269,7 +269,7 @@ PhoneScript_AnswerPhone_Male_Day:
end
PhoneScript_AnswerPhone_Male_Nite:
checkcode VAR_CALLERID
readvar VAR_CALLERID
ifequal PHONE_SCHOOLBOY_JACK, .Jack
ifequal PHONE_SAILOR_HUEY, .Huey
ifequal PHONE_COOLTRAINERM_GAVEN, .Gaven
@@ -396,7 +396,7 @@ PhoneScript_AnswerPhone_Female:
iftrue PhoneScript_AnswerPhone_Female_Day
checktime NITE
iftrue PhoneScript_AnswerPhone_Female_Nite
checkcode VAR_CALLERID
readvar VAR_CALLERID
ifequal PHONE_POKEFAN_BEVERLY, .Beverly
ifequal PHONE_COOLTRAINERF_BETH, .Beth
ifequal PHONE_COOLTRAINERF_REENA, .Reena
@@ -447,7 +447,7 @@ PhoneScript_AnswerPhone_Female:
end
PhoneScript_AnswerPhone_Female_Day:
checkcode VAR_CALLERID
readvar VAR_CALLERID
ifequal PHONE_POKEFAN_BEVERLY, .Beverly
ifequal PHONE_COOLTRAINERF_BETH, .Beth
ifequal PHONE_COOLTRAINERF_REENA, .Reena
@@ -498,7 +498,7 @@ PhoneScript_AnswerPhone_Female_Day:
end
PhoneScript_AnswerPhone_Female_Nite:
checkcode VAR_CALLERID
readvar VAR_CALLERID
ifequal PHONE_POKEFAN_BEVERLY, .Beverly
ifequal PHONE_COOLTRAINERF_BETH, .Beth
ifequal PHONE_COOLTRAINERF_REENA, .Reena
@@ -553,7 +553,7 @@ PhoneScript_GreetPhone_Male:
iftrue PhoneScript_GreetPhone_Male_Day
checktime NITE
iftrue PhoneScript_GreetPhone_Male_Nite
checkcode VAR_CALLERID
readvar VAR_CALLERID
ifequal PHONE_SCHOOLBOY_JACK, .Jack
ifequal PHONE_SAILOR_HUEY, .Huey
ifequal PHONE_COOLTRAINERM_GAVEN, .Gaven
@@ -676,7 +676,7 @@ PhoneScript_GreetPhone_Male:
end
PhoneScript_GreetPhone_Male_Day:
checkcode VAR_CALLERID
readvar VAR_CALLERID
ifequal PHONE_SCHOOLBOY_JACK, .Jack
ifequal PHONE_SAILOR_HUEY, .Huey
ifequal PHONE_COOLTRAINERM_GAVEN, .Gaven
@@ -799,7 +799,7 @@ PhoneScript_GreetPhone_Male_Day:
end
PhoneScript_GreetPhone_Male_Nite:
checkcode VAR_CALLERID
readvar VAR_CALLERID
ifequal PHONE_SCHOOLBOY_JACK, .Jack
ifequal PHONE_SAILOR_HUEY, .Huey
ifequal PHONE_COOLTRAINERM_GAVEN, .Gaven
@@ -926,7 +926,7 @@ PhoneScript_GreetPhone_Female:
iftrue PhoneScript_GreetPhone_Female_Day
checktime NITE
iftrue PhoneScript_GreetPhone_Female_Nite
checkcode VAR_CALLERID
readvar VAR_CALLERID
ifequal PHONE_POKEFAN_BEVERLY, .Beverly
ifequal PHONE_COOLTRAINERF_BETH, .Beth
ifequal PHONE_COOLTRAINERF_REENA, .Reena
@@ -977,7 +977,7 @@ PhoneScript_GreetPhone_Female:
end
PhoneScript_GreetPhone_Female_Day:
checkcode VAR_CALLERID
readvar VAR_CALLERID
ifequal PHONE_POKEFAN_BEVERLY, .Beverly
ifequal PHONE_COOLTRAINERF_BETH, .Beth
ifequal PHONE_COOLTRAINERF_REENA, .Reena
@@ -1028,7 +1028,7 @@ PhoneScript_GreetPhone_Female_Day:
end
PhoneScript_GreetPhone_Female_Nite:
checkcode VAR_CALLERID
readvar VAR_CALLERID
ifequal PHONE_POKEFAN_BEVERLY, .Beverly
ifequal PHONE_COOLTRAINERF_BETH, .Beth
ifequal PHONE_COOLTRAINERF_REENA, .Reena
@@ -1079,7 +1079,7 @@ PhoneScript_GreetPhone_Female_Nite:
end
PhoneScript_Generic_Male:
checkcode VAR_CALLERID
readvar VAR_CALLERID
ifequal PHONE_SCHOOLBOY_JACK, .Jack
ifequal PHONE_COOLTRAINERM_GAVEN, .Gaven
ifequal PHONE_BIRDKEEPER_JOSE, .Jose
@@ -1189,7 +1189,7 @@ PhoneScript_Generic_Male:
end
PhoneScript_Generic_Female:
checkcode VAR_CALLERID
readvar VAR_CALLERID
ifequal PHONE_POKEFAN_BEVERLY, .Beverly
ifequal PHONE_COOLTRAINERF_BETH, .Beth
ifequal PHONE_COOLTRAINERF_REENA, .Reena

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

@@ -55,7 +55,7 @@ Phone_GotAwayCall_Female:
farjump PhoneScript_HangupText_Female
Phone_WhosBragging_Male:
checkcode VAR_CALLERID
readvar VAR_CALLERID
ifequal PHONE_SCHOOLBOY_JACK, .Jack
ifequal PHONE_COOLTRAINERM_GAVEN, .Gaven
ifequal PHONE_BIRDKEEPER_JOSE, .Jose
@@ -160,7 +160,7 @@ Phone_WhosBragging_Male:
end
Phone_WhosBragging_Female:
checkcode VAR_CALLERID
readvar VAR_CALLERID
ifequal PHONE_POKEFAN_BEVERLY, .Beverly
ifequal PHONE_COOLTRAINERF_BETH, .Beth
ifequal PHONE_COOLTRAINERF_REENA, .Reena
@@ -211,7 +211,7 @@ Phone_WhosBragging_Female:
end
Phone_WhoDefeatedMon_Male:
checkcode VAR_CALLERID
readvar VAR_CALLERID
ifequal PHONE_SCHOOLBOY_JACK, .Jack
ifequal PHONE_COOLTRAINERM_GAVEN, .Gaven
ifequal PHONE_BIRDKEEPER_JOSE, .Jose
@@ -316,7 +316,7 @@ Phone_WhoDefeatedMon_Male:
end
Phone_WhoDefeatedMon_Female:
checkcode VAR_CALLERID
readvar VAR_CALLERID
ifequal PHONE_POKEFAN_BEVERLY, .Beverly
ifequal PHONE_COOLTRAINERF_BETH, .Beth
ifequal PHONE_COOLTRAINERF_REENA, .Reena
@@ -367,7 +367,7 @@ Phone_WhoDefeatedMon_Female:
end
Phone_WhoLostAMon_Male:
checkcode VAR_CALLERID
readvar VAR_CALLERID
ifequal PHONE_SCHOOLBOY_JACK, .Jack
ifequal PHONE_COOLTRAINERM_GAVEN, .Gaven
ifequal PHONE_BIRDKEEPER_JOSE, .Jose
@@ -472,7 +472,7 @@ Phone_WhoLostAMon_Male:
end
Phone_WhoLostAMon_Female:
checkcode VAR_CALLERID
readvar VAR_CALLERID
ifequal PHONE_POKEFAN_BEVERLY, .Beverly
ifequal PHONE_COOLTRAINERF_BETH, .Beth
ifequal PHONE_COOLTRAINERF_REENA, .Reena
@@ -531,7 +531,7 @@ PhoneScript_WantsToBattle_Female:
farjump PhoneScript_HangupText_Female
PhoneScript_RematchText_Male:
checkcode VAR_CALLERID
readvar VAR_CALLERID
ifequal PHONE_SCHOOLBOY_JACK, .Jack
ifequal PHONE_SAILOR_HUEY, .Huey
ifequal PHONE_COOLTRAINERM_GAVEN, .Gaven
@@ -636,7 +636,7 @@ PhoneScript_RematchText_Male:
end
PhoneScript_RematchText_Female:
checkcode VAR_CALLERID
readvar VAR_CALLERID
ifequal PHONE_COOLTRAINERF_BETH, .Beth
ifequal PHONE_COOLTRAINERF_REENA, .Reena
ifequal PHONE_PICNICKER_LIZ, .Liz
@@ -689,7 +689,7 @@ TiffanyItsAwful:
end
PhoneScript_HangupText_Male:
checkcode VAR_CALLERID
readvar VAR_CALLERID
ifequal PHONE_SCHOOLBOY_JACK, .Jack
ifequal PHONE_SAILOR_HUEY, .Huey
ifequal PHONE_COOLTRAINERM_GAVEN, .Gaven
@@ -792,7 +792,7 @@ PhoneScript_HangupText_Male:
end
PhoneScript_HangupText_Female:
checkcode VAR_CALLERID
readvar VAR_CALLERID
ifequal PHONE_POKEFAN_BEVERLY, .Beverly
ifequal PHONE_COOLTRAINERF_BETH, .Beth
ifequal PHONE_COOLTRAINERF_REENA, .Reena
@@ -855,7 +855,7 @@ PhoneScriptRareWildMon:
end
PhoneScript_BugCatchingContest:
checkcode VAR_CALLERID
readvar VAR_CALLERID
ifequal PHONE_BUG_CATCHER_WADE, .Wade
ifequal PHONE_POKEFANM_DEREK, .Derek
@@ -895,7 +895,7 @@ UnknownScript_0xa05de:
jump PhoneScript_HangupText_Male
PhoneScript_FoundItem_Male:
checkcode VAR_CALLERID
readvar VAR_CALLERID
ifequal PHONE_BIRDKEEPER_JOSE, .Jose
ifequal PHONE_BUG_CATCHER_WADE, .Wade
ifequal PHONE_SCHOOLBOY_ALAN, .Alan
@@ -928,7 +928,7 @@ PhoneScript_FoundItem_Male:
end
PhoneScript_FoundItem_Female:
checkcode VAR_CALLERID
readvar VAR_CALLERID
ifequal PHONE_POKEFAN_BEVERLY, .Beverly
ifequal PHONE_PICNICKER_GINA, .Gina
ifequal PHONE_LASS_DANA, .Dana

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

@@ -1,5 +1,5 @@
GinaPhoneCalleeScript:
trainertotext PICNICKER, GINA1, MEM_BUFFER_0
gettrainername STRING_BUFFER_3, PICNICKER, GINA1
checkflag ENGINE_GINA
iftrue .WantsBattle
farscall PhoneScript_AnswerPhone_Female
@@ -7,7 +7,7 @@ GinaPhoneCalleeScript:
iftrue .NotSunday
checkflag ENGINE_GINA_HAS_LEAF_STONE
iftrue .HasLeafStone
checkcode VAR_WEEKDAY
readvar VAR_WEEKDAY
ifnotequal SUNDAY, .NotSunday
checktime DAY
iftrue GinaSundayDay
@@ -21,15 +21,15 @@ GinaPhoneCalleeScript:
farjump UnknownScript_0xa05c6
.WantsBattle:
landmarktotext ROUTE_34, MEM_BUFFER_2
getlandmarkname STRING_BUFFER_5, ROUTE_34
farjump UnknownScript_0xa0a69
.HasLeafStone:
landmarktotext ROUTE_34, MEM_BUFFER_2
getlandmarkname STRING_BUFFER_5, ROUTE_34
farjump UnknownScript_0xa0abd
GinaPhoneCallerScript:
trainertotext PICNICKER, GINA1, MEM_BUFFER_0
gettrainername STRING_BUFFER_3, PICNICKER, GINA1
farscall PhoneScript_GreetPhone_Female
checkflag ENGINE_ROCKETS_IN_RADIO_TOWER
iftrue GinaRockets
@@ -59,7 +59,7 @@ GinaSundayDay:
setflag ENGINE_GINA_SUNDAY_AFTERNOON
GinaWantsBattle:
landmarktotext ROUTE_34, MEM_BUFFER_2
getlandmarkname STRING_BUFFER_5, ROUTE_34
setflag ENGINE_GINA
farjump PhoneScript_WantsToBattle_Female
@@ -68,5 +68,5 @@ GinaRockets:
GinaHasLeafStone:
setflag ENGINE_GINA_HAS_LEAF_STONE
landmarktotext ROUTE_34, MEM_BUFFER_2
getlandmarkname STRING_BUFFER_5, ROUTE_34
farjump PhoneScript_FoundItem_Female

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

@@ -150,7 +150,7 @@ UnknownScript_0xa09e6:
jump PhoneScript_HangupText_Male
KenjiAnswerPhoneScript:
checkcode VAR_KENJI_BREAK
readvar VAR_KENJI_BREAK
ifequal 2, .Training
ifequal 1, .OnBreak
farwritetext UnknownText_0x66e17

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

@@ -1,11 +1,11 @@
HueyPhoneCalleeScript:
trainertotext SAILOR, HUEY1, MEM_BUFFER_0
gettrainername STRING_BUFFER_3, SAILOR, HUEY1
checkflag ENGINE_HUEY
iftrue .WantsBattle
farscall PhoneScript_AnswerPhone_Male
checkflag ENGINE_HUEY_WEDNESDAY_NIGHT
iftrue .NotWednesday
checkcode VAR_WEEKDAY
readvar VAR_WEEKDAY
ifnotequal WEDNESDAY, .NotWednesday
checktime NITE
iftrue HueyWednesdayNight
@@ -15,11 +15,11 @@ HueyPhoneCalleeScript:
farjump UnknownScript_0xa0908
.WantsBattle:
landmarktotext LIGHTHOUSE, MEM_BUFFER_2
getlandmarkname STRING_BUFFER_5, LIGHTHOUSE
farjump HueyWantsBattleScript
HueyPhoneCallerScript:
trainertotext SAILOR, HUEY1, MEM_BUFFER_0
gettrainername STRING_BUFFER_3, SAILOR, HUEY1
farscall PhoneScript_GreetPhone_Male
checkflag ENGINE_HUEY
iftrue .Flavor
@@ -36,6 +36,6 @@ HueyWednesdayNight:
setflag ENGINE_HUEY_WEDNESDAY_NIGHT
HueyWantsBattle:
landmarktotext LIGHTHOUSE, MEM_BUFFER_2
getlandmarkname STRING_BUFFER_5, LIGHTHOUSE
setflag ENGINE_HUEY
farjump PhoneScript_WantsToBattle_Male

4
engine/phone/scripts/irwin.asm
View File

@@ -1,5 +1,5 @@
IrwinPhoneCalleeScript:
trainertotext JUGGLER, IRWIN1, MEM_BUFFER_0
gettrainername STRING_BUFFER_3, JUGGLER, IRWIN1
farscall PhoneScript_AnswerPhone_Male
checkflag ENGINE_ROCKETS_IN_RADIO_TOWER
iftrue .Rockets
@@ -9,7 +9,7 @@ IrwinPhoneCalleeScript:
farjump IrwinRocketRumor
IrwinPhoneCallerScript:
trainertotext JUGGLER, IRWIN1, MEM_BUFFER_0
gettrainername STRING_BUFFER_3, JUGGLER, IRWIN1
farscall PhoneScript_GreetPhone_Male
checkflag ENGINE_ROCKETS_IN_RADIO_TOWER
iftrue .Rockets

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