summaryrefslogtreecommitdiff
path: root/engine/phone
diff options
context:
space:
mode:
Diffstat (limited to 'engine/phone')
-rw-r--r--engine/phone/buenas_password.asm46
-rw-r--r--engine/phone/generic_calls.asm406
-rw-r--r--engine/phone/phone.asm16
-rw-r--r--engine/phone/phone_callers.asm296
-rw-r--r--engine/phone/phone_gossip.asm96
-rw-r--r--engine/phone/phone_scripts.asm352
6 files changed, 599 insertions, 613 deletions
diff --git a/engine/phone/buenas_password.asm b/engine/phone/buenas_password.asm
index 0d144afa6..82a696648 100644
--- a/engine/phone/buenas_password.asm
+++ b/engine/phone/buenas_password.asm
@@ -2,7 +2,7 @@ BuenaPhoneScript1:
checkflag ENGINE_ROCKETS_IN_RADIO_TOWER
iftrue BuenaPhoneScript_Rocket
checkcode VAR_HOUR
- if_greater_than 17, BuenaPhoneScript_AfterMidnight1
+ ifgreater 17, BuenaPhoneScript_AfterMidnight1
scall BuenaPhoneScript_CheckTimeOfDay1
jump BuenaPhoneScript_Random1
@@ -13,9 +13,9 @@ BuenaPhoneScript2:
jump BuenaPhoneScript_Random2
BuenaPhoneScript_CheckTimeOfDay1:
- checkmorn
+ checktime MORN
iftrue .morn
- checkday
+ checktime DAY
iftrue .day
writetext UnknownText_0xa0d42
buttonsound
@@ -37,10 +37,10 @@ BuenaPhoneScript_AfterMidnight1:
BuenaPhoneScript_CheckTimeOfDay2:
checkcode VAR_HOUR
- if_greater_than 17, BuenaPhoneScript_AfterMidnight2
- checkmorn
+ ifgreater 17, BuenaPhoneScript_AfterMidnight2
+ checktime MORN
iftrue .morn
- checkday
+ checktime DAY
iftrue .day
writetext UnknownText_0xa0e29
buttonsound
@@ -75,20 +75,20 @@ BuenaPhoneScript_Random2:
random 14
.Jumptable:
- if_equal 0, .zero
- if_equal 1, .one
- if_equal 2, .two
- if_equal 3, .three
- if_equal 4, .four
- if_equal 5, .five
- if_equal 6, .six
- if_equal 7, .seven
- if_equal 8, .eight
- if_equal 9, .nine
- if_equal 10, .ten
- if_equal 11, .eleven
- if_equal 12, .twelve
- if_equal 13, .thirteen
+ ifequal 0, .zero
+ ifequal 1, .one
+ ifequal 2, .two
+ ifequal 3, .three
+ ifequal 4, .four
+ ifequal 5, .five
+ ifequal 6, .six
+ ifequal 7, .seven
+ ifequal 8, .eight
+ ifequal 9, .nine
+ ifequal 10, .ten
+ ifequal 11, .eleven
+ ifequal 12, .twelve
+ ifequal 13, .thirteen
.zero
writetext UnknownText_0xa0efb
@@ -150,9 +150,9 @@ BuenaPhoneScript_Random2:
BuenaPhoneScript_Random1:
random 3
- if_equal 0, .zero
- if_equal 1, .one
- if_equal 2, .two
+ ifequal 0, .zero
+ ifequal 1, .one
+ ifequal 2, .two
.zero
writetext UnknownText_0xa1c88
diff --git a/engine/phone/generic_calls.asm b/engine/phone/generic_calls.asm
index 937fc67c0..b3b3eb56a 100644
--- a/engine/phone/generic_calls.asm
+++ b/engine/phone/generic_calls.asm
@@ -19,31 +19,31 @@ PhoneScript_Random11:
end
PhoneScript_AnswerPhone_Male:
- checkday
+ checktime DAY
iftrue PhoneScript_AnswerPhone_Male_Day
- checknite
+ checktime NITE
iftrue PhoneScript_AnswerPhone_Male_Nite
checkcode VAR_CALLERID
- if_equal PHONE_SCHOOLBOY_JACK, .Jack
- if_equal PHONE_SAILOR_HUEY, .Huey
- if_equal PHONE_COOLTRAINERM_GAVEN, .Gaven
- if_equal PHONE_BIRDKEEPER_JOSE, .Jose
- if_equal PHONE_YOUNGSTER_JOEY, .Joey
- if_equal PHONE_BUG_CATCHER_WADE, .Wade
- if_equal PHONE_FISHER_RALPH, .Ralph
- if_equal PHONE_HIKER_ANTHONY, .Anthony
- if_equal PHONE_CAMPER_TODD, .Todd
- if_equal PHONE_JUGGLER_IRWIN, .Irwin
- if_equal PHONE_BUG_CATCHER_ARNIE, .Arnie
- if_equal PHONE_SCHOOLBOY_ALAN, .Alan
- if_equal PHONE_SCHOOLBOY_CHAD, .Chad
- if_equal PHONE_POKEFANM_DEREK, .Derek
- if_equal PHONE_FISHER_TULLY, .Tully
- if_equal PHONE_POKEMANIAC_BRENT, .Brent
- if_equal PHONE_BIRDKEEPER_VANCE, .Vance
- if_equal PHONE_FISHER_WILTON, .Wilton
- if_equal PHONE_BLACKBELT_KENJI, .Kenji
- if_equal PHONE_HIKER_PARRY, .Parry
+ ifequal PHONE_SCHOOLBOY_JACK, .Jack
+ ifequal PHONE_SAILOR_HUEY, .Huey
+ ifequal PHONE_COOLTRAINERM_GAVEN, .Gaven
+ ifequal PHONE_BIRDKEEPER_JOSE, .Jose
+ ifequal PHONE_YOUNGSTER_JOEY, .Joey
+ ifequal PHONE_BUG_CATCHER_WADE, .Wade
+ ifequal PHONE_FISHER_RALPH, .Ralph
+ ifequal PHONE_HIKER_ANTHONY, .Anthony
+ ifequal PHONE_CAMPER_TODD, .Todd
+ ifequal PHONE_JUGGLER_IRWIN, .Irwin
+ ifequal PHONE_BUG_CATCHER_ARNIE, .Arnie
+ ifequal PHONE_SCHOOLBOY_ALAN, .Alan
+ ifequal PHONE_SCHOOLBOY_CHAD, .Chad
+ ifequal PHONE_POKEFANM_DEREK, .Derek
+ ifequal PHONE_FISHER_TULLY, .Tully
+ ifequal PHONE_POKEMANIAC_BRENT, .Brent
+ ifequal PHONE_BIRDKEEPER_VANCE, .Vance
+ ifequal PHONE_FISHER_WILTON, .Wilton
+ ifequal PHONE_BLACKBELT_KENJI, .Kenji
+ ifequal PHONE_HIKER_PARRY, .Parry
.Jack:
farwritetext UnknownText_0x1b4dc5
@@ -147,26 +147,26 @@ PhoneScript_AnswerPhone_Male:
PhoneScript_AnswerPhone_Male_Day:
checkcode VAR_CALLERID
- if_equal PHONE_SCHOOLBOY_JACK, .Jack
- if_equal PHONE_SAILOR_HUEY, .Huey
- if_equal PHONE_COOLTRAINERM_GAVEN, .Gaven
- if_equal PHONE_BIRDKEEPER_JOSE, .Jose
- if_equal PHONE_YOUNGSTER_JOEY, .Joey
- if_equal PHONE_BUG_CATCHER_WADE, .Wade
- if_equal PHONE_FISHER_RALPH, .Ralph
- if_equal PHONE_HIKER_ANTHONY, .Anthony
- if_equal PHONE_CAMPER_TODD, .Todd
- if_equal PHONE_JUGGLER_IRWIN, .Irwin
- if_equal PHONE_BUG_CATCHER_ARNIE, .Arnie
- if_equal PHONE_SCHOOLBOY_ALAN, .Alan
- if_equal PHONE_SCHOOLBOY_CHAD, .Chad
- if_equal PHONE_POKEFANM_DEREK, .Derek
- if_equal PHONE_FISHER_TULLY, .Tully
- if_equal PHONE_POKEMANIAC_BRENT, .Brent
- if_equal PHONE_BIRDKEEPER_VANCE, .Vance
- if_equal PHONE_FISHER_WILTON, .Wilton
- if_equal PHONE_BLACKBELT_KENJI, .Kenji
- if_equal PHONE_HIKER_PARRY, .Parry
+ ifequal PHONE_SCHOOLBOY_JACK, .Jack
+ ifequal PHONE_SAILOR_HUEY, .Huey
+ ifequal PHONE_COOLTRAINERM_GAVEN, .Gaven
+ ifequal PHONE_BIRDKEEPER_JOSE, .Jose
+ ifequal PHONE_YOUNGSTER_JOEY, .Joey
+ ifequal PHONE_BUG_CATCHER_WADE, .Wade
+ ifequal PHONE_FISHER_RALPH, .Ralph
+ ifequal PHONE_HIKER_ANTHONY, .Anthony
+ ifequal PHONE_CAMPER_TODD, .Todd
+ ifequal PHONE_JUGGLER_IRWIN, .Irwin
+ ifequal PHONE_BUG_CATCHER_ARNIE, .Arnie
+ ifequal PHONE_SCHOOLBOY_ALAN, .Alan
+ ifequal PHONE_SCHOOLBOY_CHAD, .Chad
+ ifequal PHONE_POKEFANM_DEREK, .Derek
+ ifequal PHONE_FISHER_TULLY, .Tully
+ ifequal PHONE_POKEMANIAC_BRENT, .Brent
+ ifequal PHONE_BIRDKEEPER_VANCE, .Vance
+ ifequal PHONE_FISHER_WILTON, .Wilton
+ ifequal PHONE_BLACKBELT_KENJI, .Kenji
+ ifequal PHONE_HIKER_PARRY, .Parry
.Jack:
farwritetext UnknownText_0x1b4ded
@@ -270,26 +270,26 @@ PhoneScript_AnswerPhone_Male_Day:
PhoneScript_AnswerPhone_Male_Nite:
checkcode VAR_CALLERID
- if_equal PHONE_SCHOOLBOY_JACK, .Jack
- if_equal PHONE_SAILOR_HUEY, .Huey
- if_equal PHONE_COOLTRAINERM_GAVEN, .Gaven
- if_equal PHONE_BIRDKEEPER_JOSE, .Jose
- if_equal PHONE_YOUNGSTER_JOEY, .Joey
- if_equal PHONE_BUG_CATCHER_WADE, .Wade
- if_equal PHONE_FISHER_RALPH, .Ralph
- if_equal PHONE_HIKER_ANTHONY, .Anthony
- if_equal PHONE_CAMPER_TODD, .Todd
- if_equal PHONE_JUGGLER_IRWIN, .Irwin
- if_equal PHONE_BUG_CATCHER_ARNIE, .Arnie
- if_equal PHONE_SCHOOLBOY_ALAN, .Alan
- if_equal PHONE_SCHOOLBOY_CHAD, .Chad
- if_equal PHONE_POKEFANM_DEREK, .Derek
- if_equal PHONE_FISHER_TULLY, .Tully
- if_equal PHONE_POKEMANIAC_BRENT, .Brent
- if_equal PHONE_BIRDKEEPER_VANCE, .Vance
- if_equal PHONE_FISHER_WILTON, .Wilton
- if_equal PHONE_BLACKBELT_KENJI, .Kenji
- if_equal PHONE_HIKER_PARRY, .Parry
+ ifequal PHONE_SCHOOLBOY_JACK, .Jack
+ ifequal PHONE_SAILOR_HUEY, .Huey
+ ifequal PHONE_COOLTRAINERM_GAVEN, .Gaven
+ ifequal PHONE_BIRDKEEPER_JOSE, .Jose
+ ifequal PHONE_YOUNGSTER_JOEY, .Joey
+ ifequal PHONE_BUG_CATCHER_WADE, .Wade
+ ifequal PHONE_FISHER_RALPH, .Ralph
+ ifequal PHONE_HIKER_ANTHONY, .Anthony
+ ifequal PHONE_CAMPER_TODD, .Todd
+ ifequal PHONE_JUGGLER_IRWIN, .Irwin
+ ifequal PHONE_BUG_CATCHER_ARNIE, .Arnie
+ ifequal PHONE_SCHOOLBOY_ALAN, .Alan
+ ifequal PHONE_SCHOOLBOY_CHAD, .Chad
+ ifequal PHONE_POKEFANM_DEREK, .Derek
+ ifequal PHONE_FISHER_TULLY, .Tully
+ ifequal PHONE_POKEMANIAC_BRENT, .Brent
+ ifequal PHONE_BIRDKEEPER_VANCE, .Vance
+ ifequal PHONE_FISHER_WILTON, .Wilton
+ ifequal PHONE_BLACKBELT_KENJI, .Kenji
+ ifequal PHONE_HIKER_PARRY, .Parry
.Jack:
farwritetext UnknownText_0x1b4e16
@@ -392,19 +392,19 @@ PhoneScript_AnswerPhone_Male_Nite:
end
PhoneScript_AnswerPhone_Female:
- checkday
+ checktime DAY
iftrue PhoneScript_AnswerPhone_Female_Day
- checknite
+ checktime NITE
iftrue PhoneScript_AnswerPhone_Female_Nite
checkcode VAR_CALLERID
- if_equal PHONE_POKEFAN_BEVERLY, .Beverly
- if_equal PHONE_COOLTRAINERF_BETH, .Beth
- if_equal PHONE_COOLTRAINERF_REENA, .Reena
- if_equal PHONE_PICNICKER_LIZ, .Liz
- if_equal PHONE_PICNICKER_GINA, .Gina
- if_equal PHONE_LASS_DANA, .Dana
- if_equal PHONE_PICNICKER_TIFFANY, .Tiffany
- if_equal PHONE_PICNICKER_ERIN, .Erin
+ ifequal PHONE_POKEFAN_BEVERLY, .Beverly
+ ifequal PHONE_COOLTRAINERF_BETH, .Beth
+ ifequal PHONE_COOLTRAINERF_REENA, .Reena
+ ifequal PHONE_PICNICKER_LIZ, .Liz
+ ifequal PHONE_PICNICKER_GINA, .Gina
+ ifequal PHONE_LASS_DANA, .Dana
+ ifequal PHONE_PICNICKER_TIFFANY, .Tiffany
+ ifequal PHONE_PICNICKER_ERIN, .Erin
.Beverly:
farwritetext UnknownText_0x1b4f21
@@ -448,14 +448,14 @@ PhoneScript_AnswerPhone_Female:
PhoneScript_AnswerPhone_Female_Day:
checkcode VAR_CALLERID
- if_equal PHONE_POKEFAN_BEVERLY, .Beverly
- if_equal PHONE_COOLTRAINERF_BETH, .Beth
- if_equal PHONE_COOLTRAINERF_REENA, .Reena
- if_equal PHONE_PICNICKER_LIZ, .Liz
- if_equal PHONE_PICNICKER_GINA, .Gina
- if_equal PHONE_LASS_DANA, .Dana
- if_equal PHONE_PICNICKER_TIFFANY, .Tiffany
- if_equal PHONE_PICNICKER_ERIN, .Erin
+ ifequal PHONE_POKEFAN_BEVERLY, .Beverly
+ ifequal PHONE_COOLTRAINERF_BETH, .Beth
+ ifequal PHONE_COOLTRAINERF_REENA, .Reena
+ ifequal PHONE_PICNICKER_LIZ, .Liz
+ ifequal PHONE_PICNICKER_GINA, .Gina
+ ifequal PHONE_LASS_DANA, .Dana
+ ifequal PHONE_PICNICKER_TIFFANY, .Tiffany
+ ifequal PHONE_PICNICKER_ERIN, .Erin
.Beverly:
farwritetext UnknownText_0x1b4f4d
@@ -499,14 +499,14 @@ PhoneScript_AnswerPhone_Female_Day:
PhoneScript_AnswerPhone_Female_Nite:
checkcode VAR_CALLERID
- if_equal PHONE_POKEFAN_BEVERLY, .Beverly
- if_equal PHONE_COOLTRAINERF_BETH, .Beth
- if_equal PHONE_COOLTRAINERF_REENA, .Reena
- if_equal PHONE_PICNICKER_LIZ, .Liz
- if_equal PHONE_PICNICKER_GINA, .Gina
- if_equal PHONE_LASS_DANA, .Dana
- if_equal PHONE_PICNICKER_TIFFANY, .Tiffany
- if_equal PHONE_PICNICKER_ERIN, .Erin
+ ifequal PHONE_POKEFAN_BEVERLY, .Beverly
+ ifequal PHONE_COOLTRAINERF_BETH, .Beth
+ ifequal PHONE_COOLTRAINERF_REENA, .Reena
+ ifequal PHONE_PICNICKER_LIZ, .Liz
+ ifequal PHONE_PICNICKER_GINA, .Gina
+ ifequal PHONE_LASS_DANA, .Dana
+ ifequal PHONE_PICNICKER_TIFFANY, .Tiffany
+ ifequal PHONE_PICNICKER_ERIN, .Erin
.Beverly:
farwritetext UnknownText_0x1b4f75
@@ -549,31 +549,31 @@ PhoneScript_AnswerPhone_Female_Nite:
end
PhoneScript_GreetPhone_Male:
- checkday
+ checktime DAY
iftrue PhoneScript_GreetPhone_Male_Day
- checknite
+ checktime NITE
iftrue PhoneScript_GreetPhone_Male_Nite
checkcode VAR_CALLERID
- if_equal PHONE_SCHOOLBOY_JACK, .Jack
- if_equal PHONE_SAILOR_HUEY, .Huey
- if_equal PHONE_COOLTRAINERM_GAVEN, .Gaven
- if_equal PHONE_BIRDKEEPER_JOSE, .Jose
- if_equal PHONE_YOUNGSTER_JOEY, .Joey
- if_equal PHONE_BUG_CATCHER_WADE, .Wade
- if_equal PHONE_FISHER_RALPH, .Ralph
- if_equal PHONE_HIKER_ANTHONY, .Anthony
- if_equal PHONE_CAMPER_TODD, .Todd
- if_equal PHONE_JUGGLER_IRWIN, .Irwin
- if_equal PHONE_BUG_CATCHER_ARNIE, .Arnie
- if_equal PHONE_SCHOOLBOY_ALAN, .Alan
- if_equal PHONE_SCHOOLBOY_CHAD, .Chad
- if_equal PHONE_POKEFANM_DEREK, .Derek
- if_equal PHONE_FISHER_TULLY, .Tully
- if_equal PHONE_POKEMANIAC_BRENT, .Brent
- if_equal PHONE_BIRDKEEPER_VANCE, .Vance
- if_equal PHONE_FISHER_WILTON, .Wilton
- if_equal PHONE_BLACKBELT_KENJI, .Kenji
- if_equal PHONE_HIKER_PARRY, .Parry
+ ifequal PHONE_SCHOOLBOY_JACK, .Jack
+ ifequal PHONE_SAILOR_HUEY, .Huey
+ ifequal PHONE_COOLTRAINERM_GAVEN, .Gaven
+ ifequal PHONE_BIRDKEEPER_JOSE, .Jose
+ ifequal PHONE_YOUNGSTER_JOEY, .Joey
+ ifequal PHONE_BUG_CATCHER_WADE, .Wade
+ ifequal PHONE_FISHER_RALPH, .Ralph
+ ifequal PHONE_HIKER_ANTHONY, .Anthony
+ ifequal PHONE_CAMPER_TODD, .Todd
+ ifequal PHONE_JUGGLER_IRWIN, .Irwin
+ ifequal PHONE_BUG_CATCHER_ARNIE, .Arnie
+ ifequal PHONE_SCHOOLBOY_ALAN, .Alan
+ ifequal PHONE_SCHOOLBOY_CHAD, .Chad
+ ifequal PHONE_POKEFANM_DEREK, .Derek
+ ifequal PHONE_FISHER_TULLY, .Tully
+ ifequal PHONE_POKEMANIAC_BRENT, .Brent
+ ifequal PHONE_BIRDKEEPER_VANCE, .Vance
+ ifequal PHONE_FISHER_WILTON, .Wilton
+ ifequal PHONE_BLACKBELT_KENJI, .Kenji
+ ifequal PHONE_HIKER_PARRY, .Parry
.Jack:
farwritetext UnknownText_0x1b4e3e
@@ -677,26 +677,26 @@ PhoneScript_GreetPhone_Male:
PhoneScript_GreetPhone_Male_Day:
checkcode VAR_CALLERID
- if_equal PHONE_SCHOOLBOY_JACK, .Jack
- if_equal PHONE_SAILOR_HUEY, .Huey
- if_equal PHONE_COOLTRAINERM_GAVEN, .Gaven
- if_equal PHONE_BIRDKEEPER_JOSE, .Jose
- if_equal PHONE_YOUNGSTER_JOEY, .Joey
- if_equal PHONE_BUG_CATCHER_WADE, .Wade
- if_equal PHONE_FISHER_RALPH, .Ralph
- if_equal PHONE_HIKER_ANTHONY, .Anthony
- if_equal PHONE_CAMPER_TODD, .Todd
- if_equal PHONE_JUGGLER_IRWIN, .Irwin
- if_equal PHONE_BUG_CATCHER_ARNIE, .Arnie
- if_equal PHONE_SCHOOLBOY_ALAN, .Alan
- if_equal PHONE_SCHOOLBOY_CHAD, .Chad
- if_equal PHONE_POKEFANM_DEREK, .Derek
- if_equal PHONE_FISHER_TULLY, .Tully
- if_equal PHONE_POKEMANIAC_BRENT, .Brent
- if_equal PHONE_BIRDKEEPER_VANCE, .Vance
- if_equal PHONE_FISHER_WILTON, .Wilton
- if_equal PHONE_BLACKBELT_KENJI, .Kenji
- if_equal PHONE_HIKER_PARRY, .Parry
+ ifequal PHONE_SCHOOLBOY_JACK, .Jack
+ ifequal PHONE_SAILOR_HUEY, .Huey
+ ifequal PHONE_COOLTRAINERM_GAVEN, .Gaven
+ ifequal PHONE_BIRDKEEPER_JOSE, .Jose
+ ifequal PHONE_YOUNGSTER_JOEY, .Joey
+ ifequal PHONE_BUG_CATCHER_WADE, .Wade
+ ifequal PHONE_FISHER_RALPH, .Ralph
+ ifequal PHONE_HIKER_ANTHONY, .Anthony
+ ifequal PHONE_CAMPER_TODD, .Todd
+ ifequal PHONE_JUGGLER_IRWIN, .Irwin
+ ifequal PHONE_BUG_CATCHER_ARNIE, .Arnie
+ ifequal PHONE_SCHOOLBOY_ALAN, .Alan
+ ifequal PHONE_SCHOOLBOY_CHAD, .Chad
+ ifequal PHONE_POKEFANM_DEREK, .Derek
+ ifequal PHONE_FISHER_TULLY, .Tully
+ ifequal PHONE_POKEMANIAC_BRENT, .Brent
+ ifequal PHONE_BIRDKEEPER_VANCE, .Vance
+ ifequal PHONE_FISHER_WILTON, .Wilton
+ ifequal PHONE_BLACKBELT_KENJI, .Kenji
+ ifequal PHONE_HIKER_PARRY, .Parry
.Jack:
farwritetext UnknownText_0x1b4e72
@@ -800,26 +800,26 @@ PhoneScript_GreetPhone_Male_Day:
PhoneScript_GreetPhone_Male_Nite:
checkcode VAR_CALLERID
- if_equal PHONE_SCHOOLBOY_JACK, .Jack
- if_equal PHONE_SAILOR_HUEY, .Huey
- if_equal PHONE_COOLTRAINERM_GAVEN, .Gaven
- if_equal PHONE_BIRDKEEPER_JOSE, .Jose
- if_equal PHONE_YOUNGSTER_JOEY, .Joey
- if_equal PHONE_BUG_CATCHER_WADE, .Wade
- if_equal PHONE_FISHER_RALPH, .Ralph
- if_equal PHONE_HIKER_ANTHONY, .Anthony
- if_equal PHONE_CAMPER_TODD, .Todd
- if_equal PHONE_JUGGLER_IRWIN, .Irwin
- if_equal PHONE_BUG_CATCHER_ARNIE, .Arnie
- if_equal PHONE_SCHOOLBOY_ALAN, .Alan
- if_equal PHONE_SCHOOLBOY_CHAD, .Chad
- if_equal PHONE_POKEFANM_DEREK, .Derek
- if_equal PHONE_FISHER_TULLY, .Tully
- if_equal PHONE_POKEMANIAC_BRENT, .Brent
- if_equal PHONE_BIRDKEEPER_VANCE, .Vance
- if_equal PHONE_FISHER_WILTON, .Wilton
- if_equal PHONE_BLACKBELT_KENJI, .Kenji
- if_equal PHONE_HIKER_PARRY, .Parry
+ ifequal PHONE_SCHOOLBOY_JACK, .Jack
+ ifequal PHONE_SAILOR_HUEY, .Huey
+ ifequal PHONE_COOLTRAINERM_GAVEN, .Gaven
+ ifequal PHONE_BIRDKEEPER_JOSE, .Jose
+ ifequal PHONE_YOUNGSTER_JOEY, .Joey
+ ifequal PHONE_BUG_CATCHER_WADE, .Wade
+ ifequal PHONE_FISHER_RALPH, .Ralph
+ ifequal PHONE_HIKER_ANTHONY, .Anthony
+ ifequal PHONE_CAMPER_TODD, .Todd
+ ifequal PHONE_JUGGLER_IRWIN, .Irwin
+ ifequal PHONE_BUG_CATCHER_ARNIE, .Arnie
+ ifequal PHONE_SCHOOLBOY_ALAN, .Alan
+ ifequal PHONE_SCHOOLBOY_CHAD, .Chad
+ ifequal PHONE_POKEFANM_DEREK, .Derek
+ ifequal PHONE_FISHER_TULLY, .Tully
+ ifequal PHONE_POKEMANIAC_BRENT, .Brent
+ ifequal PHONE_BIRDKEEPER_VANCE, .Vance
+ ifequal PHONE_FISHER_WILTON, .Wilton
+ ifequal PHONE_BLACKBELT_KENJI, .Kenji
+ ifequal PHONE_HIKER_PARRY, .Parry
.Jack:
farwritetext UnknownText_0x1b4e9e
@@ -922,19 +922,19 @@ PhoneScript_GreetPhone_Male_Nite:
end
PhoneScript_GreetPhone_Female:
- checkday
+ checktime DAY
iftrue PhoneScript_GreetPhone_Female_Day
- checknite
+ checktime NITE
iftrue PhoneScript_GreetPhone_Female_Nite
checkcode VAR_CALLERID
- if_equal PHONE_POKEFAN_BEVERLY, .Beverly
- if_equal PHONE_COOLTRAINERF_BETH, .Beth
- if_equal PHONE_COOLTRAINERF_REENA, .Reena
- if_equal PHONE_PICNICKER_LIZ, .Liz
- if_equal PHONE_PICNICKER_GINA, .Gina
- if_equal PHONE_LASS_DANA, .Dana
- if_equal PHONE_PICNICKER_TIFFANY, .Tiffany
- if_equal PHONE_PICNICKER_ERIN, .Erin
+ ifequal PHONE_POKEFAN_BEVERLY, .Beverly
+ ifequal PHONE_COOLTRAINERF_BETH, .Beth
+ ifequal PHONE_COOLTRAINERF_REENA, .Reena
+ ifequal PHONE_PICNICKER_LIZ, .Liz
+ ifequal PHONE_PICNICKER_GINA, .Gina
+ ifequal PHONE_LASS_DANA, .Dana
+ ifequal PHONE_PICNICKER_TIFFANY, .Tiffany
+ ifequal PHONE_PICNICKER_ERIN, .Erin
.Beverly:
farwritetext UnknownText_0x1b4fa1
@@ -978,14 +978,14 @@ PhoneScript_GreetPhone_Female:
PhoneScript_GreetPhone_Female_Day:
checkcode VAR_CALLERID
- if_equal PHONE_POKEFAN_BEVERLY, .Beverly
- if_equal PHONE_COOLTRAINERF_BETH, .Beth
- if_equal PHONE_COOLTRAINERF_REENA, .Reena
- if_equal PHONE_PICNICKER_LIZ, .Liz
- if_equal PHONE_PICNICKER_GINA, .Gina
- if_equal PHONE_LASS_DANA, .Dana
- if_equal PHONE_PICNICKER_TIFFANY, .Tiffany
- if_equal PHONE_PICNICKER_ERIN, .Erin
+ ifequal PHONE_POKEFAN_BEVERLY, .Beverly
+ ifequal PHONE_COOLTRAINERF_BETH, .Beth
+ ifequal PHONE_COOLTRAINERF_REENA, .Reena
+ ifequal PHONE_PICNICKER_LIZ, .Liz
+ ifequal PHONE_PICNICKER_GINA, .Gina
+ ifequal PHONE_LASS_DANA, .Dana
+ ifequal PHONE_PICNICKER_TIFFANY, .Tiffany
+ ifequal PHONE_PICNICKER_ERIN, .Erin
.Beverly:
farwritetext UnknownText_0x1b4fda
@@ -1029,14 +1029,14 @@ PhoneScript_GreetPhone_Female_Day:
PhoneScript_GreetPhone_Female_Nite:
checkcode VAR_CALLERID
- if_equal PHONE_POKEFAN_BEVERLY, .Beverly
- if_equal PHONE_COOLTRAINERF_BETH, .Beth
- if_equal PHONE_COOLTRAINERF_REENA, .Reena
- if_equal PHONE_PICNICKER_LIZ, .Liz
- if_equal PHONE_PICNICKER_GINA, .Gina
- if_equal PHONE_LASS_DANA, .Dana
- if_equal PHONE_PICNICKER_TIFFANY, .Tiffany
- if_equal PHONE_PICNICKER_ERIN, .Erin
+ ifequal PHONE_POKEFAN_BEVERLY, .Beverly
+ ifequal PHONE_COOLTRAINERF_BETH, .Beth
+ ifequal PHONE_COOLTRAINERF_REENA, .Reena
+ ifequal PHONE_PICNICKER_LIZ, .Liz
+ ifequal PHONE_PICNICKER_GINA, .Gina
+ ifequal PHONE_LASS_DANA, .Dana
+ ifequal PHONE_PICNICKER_TIFFANY, .Tiffany
+ ifequal PHONE_PICNICKER_ERIN, .Erin
.Beverly:
farwritetext UnknownText_0x1b5004
@@ -1080,23 +1080,23 @@ PhoneScript_GreetPhone_Female_Nite:
PhoneScript_Generic_Male:
checkcode VAR_CALLERID
- if_equal PHONE_SCHOOLBOY_JACK, .Jack
- if_equal PHONE_COOLTRAINERM_GAVEN, .Gaven
- if_equal PHONE_BIRDKEEPER_JOSE, .Jose
- if_equal PHONE_YOUNGSTER_JOEY, .Joey
- if_equal PHONE_BUG_CATCHER_WADE, .Wade
- if_equal PHONE_FISHER_RALPH, .Ralph
- if_equal PHONE_HIKER_ANTHONY, .Anthony
- if_equal PHONE_CAMPER_TODD, .Todd
- if_equal PHONE_BUG_CATCHER_ARNIE, .Arnie
- if_equal PHONE_SCHOOLBOY_ALAN, .Alan
- if_equal PHONE_SCHOOLBOY_CHAD, .Chad
- if_equal PHONE_POKEFANM_DEREK, .Derek
- if_equal PHONE_FISHER_TULLY, .Tully
- if_equal PHONE_POKEMANIAC_BRENT, .Brent
- if_equal PHONE_BIRDKEEPER_VANCE, .Vance
- if_equal PHONE_FISHER_WILTON, .Wilton
- if_equal PHONE_HIKER_PARRY, .Parry
+ ifequal PHONE_SCHOOLBOY_JACK, .Jack
+ ifequal PHONE_COOLTRAINERM_GAVEN, .Gaven
+ ifequal PHONE_BIRDKEEPER_JOSE, .Jose
+ ifequal PHONE_YOUNGSTER_JOEY, .Joey
+ ifequal PHONE_BUG_CATCHER_WADE, .Wade
+ ifequal PHONE_FISHER_RALPH, .Ralph
+ ifequal PHONE_HIKER_ANTHONY, .Anthony
+ ifequal PHONE_CAMPER_TODD, .Todd
+ ifequal PHONE_BUG_CATCHER_ARNIE, .Arnie
+ ifequal PHONE_SCHOOLBOY_ALAN, .Alan
+ ifequal PHONE_SCHOOLBOY_CHAD, .Chad
+ ifequal PHONE_POKEFANM_DEREK, .Derek
+ ifequal PHONE_FISHER_TULLY, .Tully
+ ifequal PHONE_POKEMANIAC_BRENT, .Brent
+ ifequal PHONE_BIRDKEEPER_VANCE, .Vance
+ ifequal PHONE_FISHER_WILTON, .Wilton
+ ifequal PHONE_HIKER_PARRY, .Parry
.Jack:
farwritetext UnknownText_0x1b4ecd
@@ -1190,14 +1190,14 @@ PhoneScript_Generic_Male:
PhoneScript_Generic_Female:
checkcode VAR_CALLERID
- if_equal PHONE_POKEFAN_BEVERLY, .Beverly
- if_equal PHONE_COOLTRAINERF_BETH, .Beth
- if_equal PHONE_COOLTRAINERF_REENA, .Reena
- if_equal PHONE_PICNICKER_LIZ, .Liz
- if_equal PHONE_PICNICKER_GINA, .Gina
- if_equal PHONE_LASS_DANA, .Dana
- if_equal PHONE_PICNICKER_TIFFANY, .Tiffany
- if_equal PHONE_PICNICKER_ERIN, .Erin
+ ifequal PHONE_POKEFAN_BEVERLY, .Beverly
+ ifequal PHONE_COOLTRAINERF_BETH, .Beth
+ ifequal PHONE_COOLTRAINERF_REENA, .Reena
+ ifequal PHONE_PICNICKER_LIZ, .Liz
+ ifequal PHONE_PICNICKER_GINA, .Gina
+ ifequal PHONE_LASS_DANA, .Dana
+ ifequal PHONE_PICNICKER_TIFFANY, .Tiffany
+ ifequal PHONE_PICNICKER_ERIN, .Erin
.Beverly:
farwritetext UnknownText_0x1b502b
@@ -1240,9 +1240,9 @@ PhoneScript_Generic_Female:
end
PhoneScript_MonFlavorText:
- special Special_RandomPhoneMon
+ special RandomPhoneMon
farscall PhoneScript_Random2
- if_equal $0, .TooEnergetic
+ ifequal $0, .TooEnergetic
farwritetext UnknownText_0x1b518b
buttonsound
farjump PhoneScript_HangupText_Male
diff --git a/engine/phone/phone.asm b/engine/phone/phone.asm
index fad859bfe..633096cd9 100644
--- a/engine/phone/phone.asm
+++ b/engine/phone/phone.asm
@@ -704,21 +704,7 @@ GetCallerName: ; 903a9 (24:43a9)
ret
; 903d6 (24:43d6)
-NonTrainerCallerNames: ; 903d6
- dw .none
- dw .mom
- dw .bikeshop
- dw .bill
- dw .elm
- dw .buena
-
-.none db "----------@"
-.mom db "MOM:@"
-.bill db "BILL:@"
-.elm db "PROF.ELM:@"
-.bikeshop db "BIKE SHOP:@"
-.buena db "BUENA:<LNBRK> DISC JOCKEY@"
-; 90423
+INCLUDE "data/phone/non_trainer_names.asm"
Phone_GetTrainerName: ; 90423 (24:4423)
push hl
diff --git a/engine/phone/phone_callers.asm b/engine/phone/phone_callers.asm
index cb333ae8d..a929ba1d8 100644
--- a/engine/phone/phone_callers.asm
+++ b/engine/phone/phone_callers.asm
@@ -1,7 +1,7 @@
Phone_GenericCall_Male:
- special Special_RandomPhoneMon
+ special RandomPhoneMon
farscall PhoneScript_Random2
- if_equal 0, .Bragging
+ ifequal 0, .Bragging
farscall PhoneScript_Generic_Male
farjump Phone_FoundAMon_Male
@@ -9,9 +9,9 @@ Phone_GenericCall_Male:
farjump Phone_BraggingCall_Male
Phone_GenericCall_Female:
- special Special_RandomPhoneMon
+ special RandomPhoneMon
farscall PhoneScript_Random2
- if_equal 0, .Bragging
+ ifequal 0, .Bragging
farscall PhoneScript_Generic_Female
farjump Phone_FoundAMon_Female
@@ -27,9 +27,9 @@ Phone_BraggingCall_Female:
farjump Phone_FoundAMon_Female
Phone_FoundAMon_Male:
- special Special_RandomPhoneWildMon
+ special RandomPhoneWildMon
farscall PhoneScript_Random2
- if_equal 0, .GotAway
+ ifequal 0, .GotAway
farscall Phone_WhoDefeatedMon_Male
farjump PhoneScript_HangupText_Male
@@ -37,9 +37,9 @@ Phone_FoundAMon_Male:
farjump Phone_GotAwayCall_Male
Phone_FoundAMon_Female:
- special Special_RandomPhoneWildMon
+ special RandomPhoneWildMon
farscall PhoneScript_Random2
- if_equal 0, .GotAway
+ ifequal 0, .GotAway
farscall Phone_WhoDefeatedMon_Female
farjump PhoneScript_HangupText_Female
@@ -56,23 +56,23 @@ Phone_GotAwayCall_Female:
Phone_WhosBragging_Male:
checkcode VAR_CALLERID
- if_equal PHONE_SCHOOLBOY_JACK, .Jack
- if_equal PHONE_COOLTRAINERM_GAVEN, .Gaven
- if_equal PHONE_BIRDKEEPER_JOSE, .Jose
- if_equal PHONE_YOUNGSTER_JOEY, .Joey
- if_equal PHONE_BUG_CATCHER_WADE, .Wade
- if_equal PHONE_FISHER_RALPH, .Ralph
- if_equal PHONE_HIKER_ANTHONY, .Anthony
- if_equal PHONE_CAMPER_TODD, .Todd
- if_equal PHONE_BUG_CATCHER_ARNIE, .Arnie
- if_equal PHONE_SCHOOLBOY_ALAN, .Alan
- if_equal PHONE_SCHOOLBOY_CHAD, .Chad
- if_equal PHONE_POKEFANM_DEREK, .Derek
- if_equal PHONE_FISHER_TULLY, .Tully
- if_equal PHONE_POKEMANIAC_BRENT, .Brent
- if_equal PHONE_BIRDKEEPER_VANCE, .Vance
- if_equal PHONE_FISHER_WILTON, .Wilton
- if_equal PHONE_HIKER_PARRY, .Parry
+ ifequal PHONE_SCHOOLBOY_JACK, .Jack
+ ifequal PHONE_COOLTRAINERM_GAVEN, .Gaven
+ ifequal PHONE_BIRDKEEPER_JOSE, .Jose
+ ifequal PHONE_YOUNGSTER_JOEY, .Joey
+ ifequal PHONE_BUG_CATCHER_WADE, .Wade
+ ifequal PHONE_FISHER_RALPH, .Ralph
+ ifequal PHONE_HIKER_ANTHONY, .Anthony
+ ifequal PHONE_CAMPER_TODD, .Todd
+ ifequal PHONE_BUG_CATCHER_ARNIE, .Arnie
+ ifequal PHONE_SCHOOLBOY_ALAN, .Alan
+ ifequal PHONE_SCHOOLBOY_CHAD, .Chad
+ ifequal PHONE_POKEFANM_DEREK, .Derek
+ ifequal PHONE_FISHER_TULLY, .Tully
+ ifequal PHONE_POKEMANIAC_BRENT, .Brent
+ ifequal PHONE_BIRDKEEPER_VANCE, .Vance
+ ifequal PHONE_FISHER_WILTON, .Wilton
+ ifequal PHONE_HIKER_PARRY, .Parry
.Jack:
farwritetext JackIntelligenceText
@@ -161,14 +161,14 @@ Phone_WhosBragging_Male:
Phone_WhosBragging_Female:
checkcode VAR_CALLERID
- if_equal PHONE_POKEFAN_BEVERLY, .Beverly
- if_equal PHONE_COOLTRAINERF_BETH, .Beth
- if_equal PHONE_COOLTRAINERF_REENA, .Reena
- if_equal PHONE_PICNICKER_LIZ, .Liz
- if_equal PHONE_PICNICKER_GINA, .Gina
- if_equal PHONE_LASS_DANA, .Dana
- if_equal PHONE_PICNICKER_TIFFANY, .Tiffany
- if_equal PHONE_PICNICKER_ERIN, .Erin
+ ifequal PHONE_POKEFAN_BEVERLY, .Beverly
+ ifequal PHONE_COOLTRAINERF_BETH, .Beth
+ ifequal PHONE_COOLTRAINERF_REENA, .Reena
+ ifequal PHONE_PICNICKER_LIZ, .Liz
+ ifequal PHONE_PICNICKER_GINA, .Gina
+ ifequal PHONE_LASS_DANA, .Dana
+ ifequal PHONE_PICNICKER_TIFFANY, .Tiffany
+ ifequal PHONE_PICNICKER_ERIN, .Erin
.Beverly:
farwritetext UnknownText_0x174688
@@ -212,23 +212,23 @@ Phone_WhosBragging_Female:
Phone_WhoDefeatedMon_Male:
checkcode VAR_CALLERID
- if_equal PHONE_SCHOOLBOY_JACK, .Jack
- if_equal PHONE_COOLTRAINERM_GAVEN, .Gaven
- if_equal PHONE_BIRDKEEPER_JOSE, .Jose
- if_equal PHONE_YOUNGSTER_JOEY, .Joey
- if_equal PHONE_BUG_CATCHER_WADE, .Wade
- if_equal PHONE_FISHER_RALPH, .Ralph
- if_equal PHONE_HIKER_ANTHONY, .Anthony
- if_equal PHONE_CAMPER_TODD, .Todd
- if_equal PHONE_BUG_CATCHER_ARNIE, .Arnie
- if_equal PHONE_SCHOOLBOY_ALAN, .Alan
- if_equal PHONE_SCHOOLBOY_CHAD, .Chad
- if_equal PHONE_POKEFANM_DEREK, .Derek
- if_equal PHONE_FISHER_TULLY, .Tully
- if_equal PHONE_POKEMANIAC_BRENT, .Brent
- if_equal PHONE_BIRDKEEPER_VANCE, .Vance
- if_equal PHONE_FISHER_WILTON, .Wilton
- if_equal PHONE_HIKER_PARRY, .Parry
+ ifequal PHONE_SCHOOLBOY_JACK, .Jack
+ ifequal PHONE_COOLTRAINERM_GAVEN, .Gaven
+ ifequal PHONE_BIRDKEEPER_JOSE, .Jose
+ ifequal PHONE_YOUNGSTER_JOEY, .Joey
+ ifequal PHONE_BUG_CATCHER_WADE, .Wade
+ ifequal PHONE_FISHER_RALPH, .Ralph
+ ifequal PHONE_HIKER_ANTHONY, .Anthony
+ ifequal PHONE_CAMPER_TODD, .Todd
+ ifequal PHONE_BUG_CATCHER_ARNIE, .Arnie
+ ifequal PHONE_SCHOOLBOY_ALAN, .Alan
+ ifequal PHONE_SCHOOLBOY_CHAD, .Chad
+ ifequal PHONE_POKEFANM_DEREK, .Derek
+ ifequal PHONE_FISHER_TULLY, .Tully
+ ifequal PHONE_POKEMANIAC_BRENT, .Brent
+ ifequal PHONE_BIRDKEEPER_VANCE, .Vance
+ ifequal PHONE_FISHER_WILTON, .Wilton
+ ifequal PHONE_HIKER_PARRY, .Parry
.Jack:
farwritetext JackDefeatedMonText
@@ -317,14 +317,14 @@ Phone_WhoDefeatedMon_Male:
Phone_WhoDefeatedMon_Female:
checkcode VAR_CALLERID
- if_equal PHONE_POKEFAN_BEVERLY, .Beverly
- if_equal PHONE_COOLTRAINERF_BETH, .Beth
- if_equal PHONE_COOLTRAINERF_REENA, .Reena
- if_equal PHONE_PICNICKER_LIZ, .Liz
- if_equal PHONE_PICNICKER_GINA, .Gina
- if_equal PHONE_LASS_DANA, .Dana
- if_equal PHONE_PICNICKER_TIFFANY, .Tiffany
- if_equal PHONE_PICNICKER_ERIN, .Erin
+ ifequal PHONE_POKEFAN_BEVERLY, .Beverly
+ ifequal PHONE_COOLTRAINERF_BETH, .Beth
+ ifequal PHONE_COOLTRAINERF_REENA, .Reena
+ ifequal PHONE_PICNICKER_LIZ, .Liz
+ ifequal PHONE_PICNICKER_GINA, .Gina
+ ifequal PHONE_LASS_DANA, .Dana
+ ifequal PHONE_PICNICKER_TIFFANY, .Tiffany
+ ifequal PHONE_PICNICKER_ERIN, .Erin
.Beverly:
farwritetext UnknownText_0x1746c3
@@ -368,23 +368,23 @@ Phone_WhoDefeatedMon_Female:
Phone_WhoLostAMon_Male:
checkcode VAR_CALLERID
- if_equal PHONE_SCHOOLBOY_JACK, .Jack
- if_equal PHONE_COOLTRAINERM_GAVEN, .Gaven
- if_equal PHONE_BIRDKEEPER_JOSE, .Jose
- if_equal PHONE_YOUNGSTER_JOEY, .Joey
- if_equal PHONE_BUG_CATCHER_WADE, .Wade
- if_equal PHONE_FISHER_RALPH, .Ralph
- if_equal PHONE_HIKER_ANTHONY, .Anthony
- if_equal PHONE_CAMPER_TODD, .Todd
- if_equal PHONE_BUG_CATCHER_ARNIE, .Arnie
- if_equal PHONE_SCHOOLBOY_ALAN, .Alan
- if_equal PHONE_SCHOOLBOY_CHAD, .Chad
- if_equal PHONE_POKEFANM_DEREK, .Derek
- if_equal PHONE_FISHER_TULLY, .Tully
- if_equal PHONE_POKEMANIAC_BRENT, .Brent
- if_equal PHONE_BIRDKEEPER_VANCE, .Vance
- if_equal PHONE_FISHER_WILTON, .Wilton
- if_equal PHONE_HIKER_PARRY, .Parry
+ ifequal PHONE_SCHOOLBOY_JACK, .Jack
+ ifequal PHONE_COOLTRAINERM_GAVEN, .Gaven
+ ifequal PHONE_BIRDKEEPER_JOSE, .Jose
+ ifequal PHONE_YOUNGSTER_JOEY, .Joey
+ ifequal PHONE_BUG_CATCHER_WADE, .Wade
+ ifequal PHONE_FISHER_RALPH, .Ralph
+ ifequal PHONE_HIKER_ANTHONY, .Anthony
+ ifequal PHONE_CAMPER_TODD, .Todd
+ ifequal PHONE_BUG_CATCHER_ARNIE, .Arnie
+ ifequal PHONE_SCHOOLBOY_ALAN, .Alan
+ ifequal PHONE_SCHOOLBOY_CHAD, .Chad
+ ifequal PHONE_POKEFANM_DEREK, .Derek
+ ifequal PHONE_FISHER_TULLY, .Tully
+ ifequal PHONE_POKEMANIAC_BRENT, .Brent
+ ifequal PHONE_BIRDKEEPER_VANCE, .Vance
+ ifequal PHONE_FISHER_WILTON, .Wilton
+ ifequal PHONE_HIKER_PARRY, .Parry
.Jack:
farwritetext UnknownText_0x174165
@@ -473,14 +473,14 @@ Phone_WhoLostAMon_Male:
Phone_WhoLostAMon_Female:
checkcode VAR_CALLERID
- if_equal PHONE_POKEFAN_BEVERLY, .Beverly
- if_equal PHONE_COOLTRAINERF_BETH, .Beth
- if_equal PHONE_COOLTRAINERF_REENA, .Reena
- if_equal PHONE_PICNICKER_LIZ, .Liz
- if_equal PHONE_PICNICKER_GINA, .Gina
- if_equal PHONE_LASS_DANA, .Dana
- if_equal PHONE_PICNICKER_TIFFANY, .Tiffany
- if_equal PHONE_PICNICKER_ERIN, .Erin
+ ifequal PHONE_POKEFAN_BEVERLY, .Beverly
+ ifequal PHONE_COOLTRAINERF_BETH, .Beth
+ ifequal PHONE_COOLTRAINERF_REENA, .Reena
+ ifequal PHONE_PICNICKER_LIZ, .Liz
+ ifequal PHONE_PICNICKER_GINA, .Gina
+ ifequal PHONE_LASS_DANA, .Dana
+ ifequal PHONE_PICNICKER_TIFFANY, .Tiffany
+ ifequal PHONE_PICNICKER_ERIN, .Erin
.Beverly:
farwritetext UnknownText_0x174734
@@ -532,23 +532,23 @@ PhoneScript_WantsToBattle_Female:
PhoneScript_RematchText_Male:
checkcode VAR_CALLERID
- if_equal PHONE_SCHOOLBOY_JACK, .Jack
- if_equal PHONE_SAILOR_HUEY, .Huey
- if_equal PHONE_COOLTRAINERM_GAVEN, .Gaven
- if_equal PHONE_BIRDKEEPER_JOSE, .Jose
- if_equal PHONE_YOUNGSTER_JOEY, .Joey
- if_equal PHONE_BUG_CATCHER_WADE, .Wade
- if_equal PHONE_FISHER_RALPH, .Ralph
- if_equal PHONE_HIKER_ANTHONY, .Anthony
- if_equal PHONE_CAMPER_TODD, .Todd
- if_equal PHONE_BUG_CATCHER_ARNIE, .Arnie
- if_equal PHONE_SCHOOLBOY_ALAN, .Alan
- if_equal PHONE_SCHOOLBOY_CHAD, .Chad
- if_equal PHONE_FISHER_TULLY, .Tully
- if_equal PHONE_POKEMANIAC_BRENT, .Brent
- if_equal PHONE_BIRDKEEPER_VANCE, .Vance
- if_equal PHONE_FISHER_WILTON, .Wilton
- if_equal PHONE_HIKER_PARRY, .Parry
+ ifequal PHONE_SCHOOLBOY_JACK, .Jack
+ ifequal PHONE_SAILOR_HUEY, .Huey
+ ifequal PHONE_COOLTRAINERM_GAVEN, .Gaven
+ ifequal PHONE_BIRDKEEPER_JOSE, .Jose
+ ifequal PHONE_YOUNGSTER_JOEY, .Joey
+ ifequal PHONE_BUG_CATCHER_WADE, .Wade
+ ifequal PHONE_FISHER_RALPH, .Ralph
+ ifequal PHONE_HIKER_ANTHONY, .Anthony
+ ifequal PHONE_CAMPER_TODD, .Todd
+ ifequal PHONE_BUG_CATCHER_ARNIE, .Arnie
+ ifequal PHONE_SCHOOLBOY_ALAN, .Alan
+ ifequal PHONE_SCHOOLBOY_CHAD, .Chad
+ ifequal PHONE_FISHER_TULLY, .Tully
+ ifequal PHONE_POKEMANIAC_BRENT, .Brent
+ ifequal PHONE_BIRDKEEPER_VANCE, .Vance
+ ifequal PHONE_FISHER_WILTON, .Wilton
+ ifequal PHONE_HIKER_PARRY, .Parry
.Jack:
farwritetext UnknownText_0x1741e1
@@ -637,13 +637,13 @@ PhoneScript_RematchText_Male:
PhoneScript_RematchText_Female:
checkcode VAR_CALLERID
- if_equal PHONE_COOLTRAINERF_BETH, .Beth
- if_equal PHONE_COOLTRAINERF_REENA, .Reena
- if_equal PHONE_PICNICKER_LIZ, .Liz
- if_equal PHONE_PICNICKER_GINA, .Gina
- if_equal PHONE_LASS_DANA, .Dana
- if_equal PHONE_PICNICKER_TIFFANY, .Tiffany
- if_equal PHONE_PICNICKER_ERIN, .Erin
+ ifequal PHONE_COOLTRAINERF_BETH, .Beth
+ ifequal PHONE_COOLTRAINERF_REENA, .Reena
+ ifequal PHONE_PICNICKER_LIZ, .Liz
+ ifequal PHONE_PICNICKER_GINA, .Gina
+ ifequal PHONE_LASS_DANA, .Dana
+ ifequal PHONE_PICNICKER_TIFFANY, .Tiffany
+ ifequal PHONE_PICNICKER_ERIN, .Erin
.Beth:
farwritetext UnknownText_0x174e4e
@@ -690,26 +690,26 @@ TiffanyItsAwful:
PhoneScript_HangupText_Male:
checkcode VAR_CALLERID
- if_equal PHONE_SCHOOLBOY_JACK, .Jack
- if_equal PHONE_SAILOR_HUEY, .Huey
- if_equal PHONE_COOLTRAINERM_GAVEN, .Gaven
- if_equal PHONE_BIRDKEEPER_JOSE, .Jose
- if_equal PHONE_YOUNGSTER_JOEY, .Joey
- if_equal PHONE_BUG_CATCHER_WADE, .Wade
- if_equal PHONE_FISHER_RALPH, .Ralph
- if_equal PHONE_HIKER_ANTHONY, .Anthony
- if_equal PHONE_CAMPER_TODD, .Todd
- if_equal PHONE_JUGGLER_IRWIN, .Irwin
- if_equal PHONE_BUG_CATCHER_ARNIE, .Arnie
- if_equal PHONE_SCHOOLBOY_ALAN, .Alan
- if_equal PHONE_SCHOOLBOY_CHAD, .Chad
- if_equal PHONE_POKEFANM_DEREK, .Derek
- if_equal PHONE_FISHER_TULLY, .Tully
- if_equal PHONE_POKEMANIAC_BRENT, .Brent
- if_equal PHONE_BIRDKEEPER_VANCE, .Vance
- if_equal PHONE_FISHER_WILTON, .Wilton
- if_equal PHONE_BLACKBELT_KENJI, .Kenji
- if_equal PHONE_HIKER_PARRY, .Parry
+ ifequal PHONE_SCHOOLBOY_JACK, .Jack
+ ifequal PHONE_SAILOR_HUEY, .Huey
+ ifequal PHONE_COOLTRAINERM_GAVEN, .Gaven
+ ifequal PHONE_BIRDKEEPER_JOSE, .Jose
+ ifequal PHONE_YOUNGSTER_JOEY, .Joey
+ ifequal PHONE_BUG_CATCHER_WADE, .Wade
+ ifequal PHONE_FISHER_RALPH, .Ralph
+ ifequal PHONE_HIKER_ANTHONY, .Anthony
+ ifequal PHONE_CAMPER_TODD, .Todd
+ ifequal PHONE_JUGGLER_IRWIN, .Irwin
+ ifequal PHONE_BUG_CATCHER_ARNIE, .Arnie
+ ifequal PHONE_SCHOOLBOY_ALAN, .Alan
+ ifequal PHONE_SCHOOLBOY_CHAD, .Chad
+ ifequal PHONE_POKEFANM_DEREK, .Derek
+ ifequal PHONE_FISHER_TULLY, .Tully
+ ifequal PHONE_POKEMANIAC_BRENT, .Brent
+ ifequal PHONE_BIRDKEEPER_VANCE, .Vance
+ ifequal PHONE_FISHER_WILTON, .Wilton
+ ifequal PHONE_BLACKBELT_KENJI, .Kenji
+ ifequal PHONE_HIKER_PARRY, .Parry
.Jack:
farwritetext UnknownText_0x174251
@@ -793,14 +793,14 @@ PhoneScript_HangupText_Male:
PhoneScript_HangupText_Female:
checkcode VAR_CALLERID
- if_equal PHONE_POKEFAN_BEVERLY, .Beverly
- if_equal PHONE_COOLTRAINERF_BETH, .Beth
- if_equal PHONE_COOLTRAINERF_REENA, .Reena
- if_equal PHONE_PICNICKER_LIZ, .Liz
- if_equal PHONE_PICNICKER_GINA, .Gina
- if_equal PHONE_LASS_DANA, .Dana
- if_equal PHONE_PICNICKER_TIFFANY, .Tiffany
- if_equal PHONE_PICNICKER_ERIN, .Erin
+ ifequal PHONE_POKEFAN_BEVERLY, .Beverly
+ ifequal PHONE_COOLTRAINERF_BETH, .Beth
+ ifequal PHONE_COOLTRAINERF_REENA, .Reena
+ ifequal PHONE_PICNICKER_LIZ, .Liz
+ ifequal PHONE_PICNICKER_GINA, .Gina
+ ifequal PHONE_LASS_DANA, .Dana
+ ifequal PHONE_PICNICKER_TIFFANY, .Tiffany
+ ifequal PHONE_PICNICKER_ERIN, .Erin
.Beverly:
farwritetext UnknownText_0x1747ac
@@ -851,13 +851,13 @@ Phone_CheckIfUnseenRare_Female:
farjump PhoneScript_HangupText_Female
PhoneScriptRareWildMon:
- special Special_RandomUnseenWildMon
+ special RandomUnseenWildMon
end
PhoneScript_BugCatchingContest:
checkcode VAR_CALLERID
- if_equal PHONE_BUG_CATCHER_WADE, .Wade
- if_equal PHONE_POKEFANM_DEREK, .Derek
+ ifequal PHONE_BUG_CATCHER_WADE, .Wade
+ ifequal PHONE_POKEFANM_DEREK, .Derek
.Wade:
farwritetext WadeBugCatchingContestText
@@ -896,12 +896,12 @@ UnknownScript_0xa05de:
PhoneScript_FoundItem_Male:
checkcode VAR_CALLERID
- if_equal PHONE_BIRDKEEPER_JOSE, .Jose
- if_equal PHONE_BUG_CATCHER_WADE, .Wade
- if_equal PHONE_SCHOOLBOY_ALAN, .Alan
- if_equal PHONE_POKEFANM_DEREK, .Derek
- if_equal PHONE_FISHER_TULLY, .Tully
- if_equal PHONE_FISHER_WILTON, .Wilton
+ ifequal PHONE_BIRDKEEPER_JOSE, .Jose
+ ifequal PHONE_BUG_CATCHER_WADE, .Wade
+ ifequal PHONE_SCHOOLBOY_ALAN, .Alan
+ ifequal PHONE_POKEFANM_DEREK, .Derek
+ ifequal PHONE_FISHER_TULLY, .Tully
+ ifequal PHONE_FISHER_WILTON, .Wilton
.Jose:
farwritetext JoseFoundSomethingText
@@ -929,10 +929,10 @@ PhoneScript_FoundItem_Male:
PhoneScript_FoundItem_Female:
checkcode VAR_CALLERID
- if_equal PHONE_POKEFAN_BEVERLY, .Beverly
- if_equal PHONE_PICNICKER_GINA, .Gina
- if_equal PHONE_LASS_DANA, .Dana
- if_equal PHONE_PICNICKER_TIFFANY, .Tiffany
+ ifequal PHONE_POKEFAN_BEVERLY, .Beverly
+ ifequal PHONE_PICNICKER_GINA, .Gina
+ ifequal PHONE_LASS_DANA, .Dana
+ ifequal PHONE_PICNICKER_TIFFANY, .Tiffany
.Beverly:
farwritetext BeverlyFoundNuggetText
diff --git a/engine/phone/phone_gossip.asm b/engine/phone/phone_gossip.asm
index 8f45c8807..9a37c72cf 100644
--- a/engine/phone/phone_gossip.asm
+++ b/engine/phone/phone_gossip.asm
@@ -1,16 +1,16 @@
JackTriviaScript:
random 11
- if_equal 0, .Thunder
- if_equal 1, .Rollout
- if_equal 2, .Solarbeam
- if_equal 3, .Stomp
- if_equal 4, .Gust
- if_equal 5, .Twister
- if_equal 6, .Earthquake
- if_equal 7, .Magnitude
- if_equal 8, .Sandstorm
- if_equal 9, .SunnyDay
- if_equal 10, .RainDance
+ ifequal 0, .Thunder
+ ifequal 1, .Rollout
+ ifequal 2, .Solarbeam
+ ifequal 3, .Stomp
+ ifequal 4, .Gust
+ ifequal 5, .Twister
+ ifequal 6, .Earthquake
+ ifequal 7, .Magnitude
+ ifequal 8, .Sandstorm
+ ifequal 9, .SunnyDay
+ ifequal 10, .RainDance
.Thunder:
farwritetext JackThunderTriviaText
@@ -69,16 +69,16 @@ JackTriviaScript:
UnknownScript_0xa06da:
random 10
- if_equal 0, .RuinsOfAlph
- if_equal 1, .Falkner
- if_equal 2, .Earl
- if_equal 3, .SurfPikachu
- if_equal 4, .MooMooMilk
- if_equal 5, .Salon
- if_equal 6, .Whitney
- if_equal 7, .BugCatchingContest
- if_equal 8, .BeautifulMon
- if_equal 9, .Forgot
+ ifequal 0, .RuinsOfAlph
+ ifequal 1, .Falkner
+ ifequal 2, .Earl
+ ifequal 3, .SurfPikachu
+ ifequal 4, .MooMooMilk
+ ifequal 5, .Salon
+ ifequal 6, .Whitney
+ ifequal 7, .BugCatchingContest
+ ifequal 8, .BeautifulMon
+ ifequal 9, .Forgot
.RuinsOfAlph:
farwritetext UnknownText_0x176223
@@ -132,16 +132,16 @@ UnknownScript_0xa06da:
ChadOakGossipScript:
random 10
- if_equal 0, .Blue
- if_equal 1, .Daisy
- if_equal 2, .ProfElm
- if_equal 3, .Dream
- if_equal 4, .Kurt
- if_equal 5, .League
- if_equal 6, .RadioShow
- if_equal 7, .Battling
- if_equal 8, .DaisyTea
- if_equal 9, .Traveled
+ ifequal 0, .Blue
+ ifequal 1, .Daisy
+ ifequal 2, .ProfElm
+ ifequal 3, .Dream
+ ifequal 4, .Kurt
+ ifequal 5, .League
+ ifequal 6, .RadioShow
+ ifequal 7, .Battling
+ ifequal 8, .DaisyTea
+ ifequal 9, .Traveled
.Blue:
farwritetext ChadBlueGossipText
@@ -195,16 +195,16 @@ ChadOakGossipScript:
BrentBillTriviaScript:
random 10
- if_equal 0, .Father
- if_equal 1, .Grandpa
- if_equal 2, .Goldenrod
- if_equal 3, .Route25
- if_equal 4, .Abra
- if_equal 5, .Sister
- if_equal 6, .Milk
- if_equal 7, .Battling
- if_equal 8, .FlowerShop
- if_equal 9, .KimonoGirl
+ ifequal 0, .Father
+ ifequal 1, .Grandpa
+ ifequal 2, .Goldenrod
+ ifequal 3, .Route25
+ ifequal 4, .Abra
+ ifequal 5, .Sister
+ ifequal 6, .Milk
+ ifequal 7, .Battling
+ ifequal 8, .FlowerShop
+ ifequal 9, .KimonoGirl
.Father:
farwritetext UnknownText_0x662bc
@@ -477,9 +477,9 @@ ErinWorkingHardScript:
UnknownScript_0xa09c8:
random 3
- if_equal 0, UnknownScript_0xa09d6
- if_equal 1, UnknownScript_0xa09de
- if_equal 2, UnknownScript_0xa09e6
+ ifequal 0, UnknownScript_0xa09d6
+ ifequal 1, UnknownScript_0xa09de
+ ifequal 2, UnknownScript_0xa09e6
UnknownScript_0xa09d6:
farwritetext UnknownText_0x64846
@@ -498,8 +498,8 @@ UnknownScript_0xa09e6:
KenjiAnswerPhoneScript:
checkcode VAR_KENJI_BREAK
- if_equal 2, .Training
- if_equal 1, .OnBreak
+ ifequal 2, .Training
+ ifequal 1, .OnBreak
farwritetext UnknownText_0x66e17
buttonsound
jump PhoneScript_HangupText_Male
@@ -510,9 +510,9 @@ KenjiAnswerPhoneScript:
jump PhoneScript_HangupText_Male
.OnBreak:
- checkmorn
+ checktime MORN
iftrue .Morning
- checknite
+ checktime NITE
iftrue .Night
setevent EVENT_KENJI_ON_BREAK
farwritetext KenjiBreakText
diff --git a/engine/phone/phone_scripts.asm b/engine/phone/phone_scripts.asm
index 646040641..87bc227b3 100644
--- a/engine/phone/phone_scripts.asm
+++ b/engine/phone/phone_scripts.asm
@@ -16,14 +16,14 @@ MomPhoneScript: ; 0xbceaa
jump MomPhoneNoPokemonScript
.bcec5 ; 0xbcec5
- checkevent EVENT_IN_YOUR_ROOM
+ checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_8
iftrue MomPhoneHangUpScript
farwritetext MomPhoneGreetingText
buttonsound
mapnametotext MEM_BUFFER_0
checkcode VAR_ROOFPALETTE
- if_equal 1, MomPhonePalette1
- if_equal 2, MomPhonePalette2
+ ifequal 1, MomPhonePalette1
+ ifequal 2, MomPhonePalette2
jump MomPhoneOther
MomPhoneLandmark: ; 0xbcedf
@@ -33,11 +33,11 @@ MomPhoneLandmark: ; 0xbcedf
MomPhonePalette1: ; 0xbcee7
checkcode VAR_MAPGROUP
- if_equal GROUP_NEW_BARK_TOWN, .newbark
- if_equal GROUP_CHERRYGROVE_CITY, .cherrygrove
- if_equal GROUP_VIOLET_CITY, .violet
- if_equal GROUP_AZALEA_TOWN, .azalea
- if_equal GROUP_GOLDENROD_CITY, .goldenrod
+ ifequal GROUP_NEW_BARK_TOWN, .newbark
+ ifequal GROUP_CHERRYGROVE_CITY, .cherrygrove
+ ifequal GROUP_VIOLET_CITY, .violet
+ ifequal GROUP_AZALEA_TOWN, .azalea
+ ifequal GROUP_GOLDENROD_CITY, .goldenrod
farwritetext MomPhoneGenericAreaText
buttonsound
jump MomSavingMoney
@@ -76,12 +76,12 @@ MomSavingMoney: ; 0xbcf37
checkflag ENGINE_MOM_SAVING_MONEY
iffalse MomIsNotSaving
checkmoney MOMS_MONEY, 0
- if_equal HAVE_MORE, MomSavingHasMoney
+ ifequal HAVE_MORE, MomSavingHasMoney
jump MomSavingButBroke
MomIsNotSaving: ; 0xbcf49
checkmoney MOMS_MONEY, 0
- if_equal HAVE_MORE, MomHasMoney
+ ifequal HAVE_MORE, MomHasMoney
jump MomHasNoMoney
MomSavingHasMoney: ; 0xbcf55
@@ -140,7 +140,7 @@ MomPhoneNoGymQuestScript: ; 0xbcfac
MomPhoneLectureScript: ; 0xbcfb1
setevent EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST
- setflag ENGINE_DST
+ setflag ENGINE_MOM_ACTIVE
specialphonecall SPECIALCALL_NONE
farwritetext MomPhoneLectureText
yesorno
@@ -150,9 +150,9 @@ MomPhoneLectureScript: ; 0xbcfb1
; Bill
BillPhoneScript1: ; 0xbcfc5
- checkday
+ checktime DAY
iftrue .daygreet
- checknite
+ checktime NITE
iftrue .nitegreet
farwritetext BillPhoneMornGreetingText
buttonsound
@@ -173,8 +173,8 @@ BillPhoneScript1: ; 0xbcfc5
buttonsound
checkcode VAR_BOXSPACE
vartomem MEM_BUFFER_0
- if_equal 0, .full
- if_less_than PARTY_LENGTH, .nearlyfull
+ ifequal 0, .full
+ ifless PARTY_LENGTH, .nearlyfull
farwritetext BillPhoneNotFullText
end
@@ -195,7 +195,7 @@ BillPhoneScript2: ; 0xbd007
ElmPhoneScript1: ; 0xbd00d
checkcode VAR_SPECIALPHONECALL
- if_equal SPECIALCALL_POKERUS, .pokerus
+ ifequal SPECIALCALL_POKERUS, .pokerus
checkevent EVENT_SHOWED_TOGEPI_TO_ELM
iftrue .discovery
checkevent EVENT_GOT_TOGEPI_EGG_FROM_ELMS_AIDE
@@ -243,7 +243,7 @@ ElmPhoneScript1: ; 0xbd00d
.discovery ; 0xbd069
random 2
- if_equal 0, .nextdiscovery
+ ifequal 0, .nextdiscovery
farwritetext ElmPhoneDiscovery1Text
end
@@ -258,11 +258,11 @@ ElmPhoneScript1: ; 0xbd00d
ElmPhoneScript2: ; 0xbd081
checkcode VAR_SPECIALPHONECALL
- if_equal SPECIALCALL_ROBBED, .disaster
- if_equal SPECIALCALL_ASSISTANT, .assistant
- if_equal SPECIALCALL_WEIRDBROADCAST, .rocket
- if_equal SPECIALCALL_SSTICKET, .gift
- if_equal SPECIALCALL_MASTERBALL, .gift
+ ifequal SPECIALCALL_ROBBED, .disaster
+ ifequal SPECIALCALL_ASSISTANT, .assistant
+ ifequal SPECIALCALL_WEIRDBROADCAST, .rocket
+ ifequal SPECIALCALL_SSTICKET, .gift
+ ifequal SPECIALCALL_MASTERBALL, .gift
farwritetext ElmPhonePokerusText
specialphonecall SPECIALCALL_NONE
end
@@ -306,8 +306,8 @@ JackPhoneScript1:
checkflag ENGINE_JACK_MONDAY_MORNING
iftrue .NotMonday
checkcode VAR_WEEKDAY
- if_not_equal MONDAY, .NotMonday
- checkmorn
+ ifnotequal MONDAY, .NotMonday
+ checktime MORN
iftrue JackMondayMorning
.NotMonday:
@@ -321,17 +321,17 @@ JackPhoneScript2:
trainertotext SCHOOLBOY, JACK1, MEM_BUFFER_0
farscall PhoneScript_GreetPhone_Male
farscall PhoneScript_Random2
- if_equal 0, JackBattleTrivia
+ ifequal 0, JackBattleTrivia
checkflag ENGINE_JACK
iftrue .WaitingForBattle
checkflag ENGINE_JACK_MONDAY_MORNING
iftrue .WaitingForBattle
farscall PhoneScript_Random2
- if_equal 0, JackWantsToBattle
+ ifequal 0, JackWantsToBattle
.WaitingForBattle:
farscall PhoneScript_Random3
- if_equal 0, JackFindsRare
+ ifequal 0, JackFindsRare
farjump Phone_GenericCall_Male
JackMondayMorning:
@@ -367,7 +367,7 @@ BeverlyPhoneScript2:
checkflag ENGINE_BEVERLY_HAS_NUGGET
iftrue .HasNugget
farscall PhoneScript_Random4
- if_equal 0, .FoundNugget
+ ifequal 0, .FoundNugget
.HasNugget:
farjump Phone_GenericCall_Female
@@ -387,12 +387,12 @@ HueyPhoneScript1:
checkflag ENGINE_HUEY_WEDNESDAY_NIGHT
iftrue .NotWednesday
checkcode VAR_WEEKDAY
- if_not_equal WEDNESDAY, .NotWednesday
- checknite
+ ifnotequal WEDNESDAY, .NotWednesday
+ checktime NITE
iftrue HueyWednesdayNight
.NotWednesday:
- special Special_RandomPhoneMon
+ special RandomPhoneMon
farjump UnknownScript_0xa0908
.WantsBattle:
@@ -407,8 +407,8 @@ HueyPhoneScript2:
checkflag ENGINE_HUEY_WEDNESDAY_NIGHT
iftrue .Flavor
farscall PhoneScript_Random3
- if_equal 0, HueyWantsBattle
- if_equal 1, HueyWantsBattle
+ ifequal 0, HueyWantsBattle
+ ifequal 1, HueyWantsBattle
.Flavor:
farjump PhoneScript_MonFlavorText
@@ -431,8 +431,8 @@ GavenPhoneScript1:
checkflag ENGINE_GAVEN_THURSDAY_MORNING
iftrue .NotThursday
checkcode VAR_WEEKDAY
- if_not_equal THURSDAY, .NotThursday
- checkmorn
+ ifnotequal THURSDAY, .NotThursday
+ checktime MORN
iftrue GavenThursdayMorning
.NotThursday:
@@ -450,11 +450,11 @@ GavenPhoneScript2:
checkflag ENGINE_GAVEN_THURSDAY_MORNING
iftrue .WaitingForBattle
farscall PhoneScript_Random2
- if_equal 0, GavenWantsRematch
+ ifequal 0, GavenWantsRematch
.WaitingForBattle:
farscall PhoneScript_Random3
- if_equal 0, GavenFoundRare
+ ifequal 0, GavenFoundRare
farjump Phone_GenericCall_Male
GavenThursdayMorning:
@@ -478,8 +478,8 @@ BethPhoneScript1:
checkflag ENGINE_BETH_FRIDAY_AFTERNOON
iftrue .NotFriday
checkcode VAR_WEEKDAY
- if_not_equal FRIDAY, .NotFriday
- checkday
+ ifnotequal FRIDAY, .NotFriday
+ checktime DAY
iftrue BethFridayAfternoon
.NotFriday:
@@ -497,7 +497,7 @@ BethPhoneScript2:
checkflag ENGINE_BETH_FRIDAY_AFTERNOON
iftrue .Generic
farscall PhoneScript_Random2
- if_equal 0, BethWantsBattle
+ ifequal 0, BethWantsBattle
.Generic:
farjump Phone_GenericCall_Female
@@ -522,8 +522,8 @@ JosePhoneScript1:
checkflag ENGINE_JOSE_HAS_STAR_PIECE
iftrue .HasItem
checkcode VAR_WEEKDAY
- if_not_equal SATURDAY, .NotSaturday
- checknite
+ ifnotequal SATURDAY, .NotSaturday
+ checktime NITE
iftrue JoseSaturdayNight
.NotSaturday:
@@ -547,13 +547,13 @@ JosePhoneScript2:
checkflag ENGINE_JOSE_HAS_STAR_PIECE
iftrue .Generic
farscall PhoneScript_Random3
- if_equal 0, JoseWantsBattle
+ ifequal 0, JoseWantsBattle
farscall PhoneScript_Random3
- if_equal 0, JoseHasStarPiece
+ ifequal 0, JoseHasStarPiece
.Generic:
farscall PhoneScript_Random3
- if_equal 0, JoseFoundRare
+ ifequal 0, JoseFoundRare
farjump Phone_GenericCall_Male
JoseSaturdayNight:
@@ -582,8 +582,8 @@ ReenaPhoneScript1:
checkflag ENGINE_REENA_SUNDAY_MORNING
iftrue .NotSunday
checkcode VAR_WEEKDAY
- if_not_equal SUNDAY, .NotSunday
- checkmorn
+ ifnotequal SUNDAY, .NotSunday
+ checktime MORN
iftrue ReenaSundayMorning
.NotSunday:
@@ -601,7 +601,7 @@ ReenaPhoneScript2:
checkflag ENGINE_REENA_SUNDAY_MORNING
iftrue .Generic
farscall PhoneScript_Random2
- if_equal 0, ReenaWantsBattle
+ ifequal 0, ReenaWantsBattle
.Generic:
farjump Phone_GenericCall_Female
@@ -624,12 +624,12 @@ JoeyPhoneScript1:
checkflag ENGINE_JOEY_MONDAY_AFTERNOON
iftrue .NotMonday
checkcode VAR_WEEKDAY
- if_not_equal MONDAY, .NotMonday
- checkday
+ ifnotequal MONDAY, .NotMonday
+ checktime DAY
iftrue JoeyMondayAfternoon
.NotMonday:
- special Special_RandomPhoneMon
+ special RandomPhoneMon
farjump UnknownScript_0xa0930
.WantsBattle:
@@ -644,8 +644,8 @@ JoeyPhoneScript2:
checkflag ENGINE_JOEY_MONDAY_AFTERNOON
iftrue .Generic
farscall PhoneScript_Random3
- if_equal 0, JoeyWantsBattle
- if_equal 1, JoeyWantsBattle
+ ifequal 0, JoeyWantsBattle
+ ifequal 1, JoeyWantsBattle
.Generic:
farjump Phone_GenericCall_Male
@@ -670,19 +670,19 @@ WadePhoneScript1:
checkflag ENGINE_WADE_HAS_ITEM
iftrue WadeHasItem
checkcode VAR_WEEKDAY
- if_not_equal TUESDAY, .NotTuesday
- checknite
+ ifnotequal TUESDAY, .NotTuesday
+ checktime NITE
iftrue WadeTuesdayNight
.NotTuesday:
farscall PhoneScript_Random2
- if_equal 0, .NoContest
+ ifequal 0, .NoContest
checkflag ENGINE_DAILY_BUG_CONTEST
iftrue .NoContest
checkcode VAR_WEEKDAY
- if_equal TUESDAY, WadeContestToday
- if_equal THURSDAY, WadeContestToday
- if_equal SATURDAY, WadeContestToday
+ ifequal TUESDAY, WadeContestToday
+ ifequal THURSDAY, WadeContestToday
+ ifequal SATURDAY, WadeContestToday
.NoContest:
farjump UnknownScript_0xa0938
@@ -702,13 +702,13 @@ WadePhoneScript2:
trainertotext BUG_CATCHER, WADE1, MEM_BUFFER_0
farscall PhoneScript_GreetPhone_Male
farscall PhoneScript_Random2
- if_equal 0, .NoContest
+ ifequal 0, .NoContest
checkflag ENGINE_DAILY_BUG_CONTEST
iftrue .NoContest
checkcode VAR_WEEKDAY
- if_equal TUESDAY, Wade_ContestToday
- if_equal THURSDAY, Wade_ContestToday
- if_equal SATURDAY, Wade_ContestToday
+ ifequal TUESDAY, Wade_ContestToday
+ ifequal THURSDAY, Wade_ContestToday
+ ifequal SATURDAY, Wade_ContestToday
.NoContest:
checkflag ENGINE_WADE
@@ -718,15 +718,15 @@ WadePhoneScript2:
checkflag ENGINE_WADE_HAS_ITEM
iftrue .next
farscall PhoneScript_Random2
- if_equal 0, WadeHasItem2
+ ifequal 0, WadeHasItem2
checkflag ENGINE_FLYPOINT_GOLDENROD
iffalse .next
farscall PhoneScript_Random2
- if_equal 0, WadeWantsBattle2
+ ifequal 0, WadeWantsBattle2
.next:
farscall PhoneScript_Random3
- if_equal 0, WadeFoundRare
+ ifequal 0, WadeFoundRare
farjump Phone_GenericCall_Male
Wade_ContestToday:
@@ -751,10 +751,10 @@ WadeHasItem2:
clearevent EVENT_WADE_HAS_PRZCUREBERRY
clearevent EVENT_WADE_HAS_BITTER_BERRY
random 4
- if_equal 0, .Berry
- if_equal 1, .PsnCureBerry
- if_equal 2, .PrzCureBerry
- if_equal 3, .Bitterberry
+ ifequal 0, .Berry
+ ifequal 1, .PsnCureBerry
+ ifequal 2, .PrzCureBerry
+ ifequal 3, .Bitterberry
.Berry:
setevent EVENT_WADE_HAS_BERRY
@@ -784,11 +784,11 @@ RalphPhoneScript1:
checkflag ENGINE_RALPH_WEDNESDAY_MORNING
iftrue Ralph_CheckSwarm
checkcode VAR_WEEKDAY
- if_not_equal WEDNESDAY, Ralph_CheckSwarm
- checkmorn
+ ifnotequal WEDNESDAY, Ralph_CheckSwarm
+ checktime MORN
iftrue Ralph_WednesdayMorning
Ralph_CheckSwarm:
- checkflag ENGINE_SPECIAL_WILDDATA
+ checkflag ENGINE_FISH_SWARM
iftrue Ralph_ReportSwarm
farjump UnknownScript_0xa0940
@@ -810,10 +810,10 @@ RalphPhoneScript2:
checkflag ENGINE_RALPH_WEDNESDAY_MORNING
iftrue Ralph_CheckSwarm2
farscall PhoneScript_Random2
- if_equal 0, Ralph_FightMe
+ ifequal 0, Ralph_FightMe
Ralph_CheckSwarm2:
farscall PhoneScript_Random5
- if_equal 0, Ralph_SetUpSwarm
+ ifequal 0, Ralph_SetUpSwarm
farjump Phone_GenericCall_Male
Ralph_WednesdayMorning:
@@ -824,13 +824,13 @@ Ralph_FightMe:
farjump PhoneScript_WantsToBattle_Male
Ralph_SetUpSwarm:
- checkflag ENGINE_SPECIAL_WILDDATA
+ checkflag ENGINE_FISH_SWARM
iftrue .Generic
- setflag ENGINE_SPECIAL_WILDDATA
+ setflag ENGINE_FISH_SWARM
pokenamemem QWILFISH, MEM_BUFFER_1
landmarktotext ROUTE_32, MEM_BUFFER_2
writebyte FISHSWARM_QWILFISH
- special Special_ActivateFishingSwarm
+ special ActivateFishingSwarm
farjump UnknownScript_0xa05d6
.Generic:
@@ -846,12 +846,12 @@ LizPhoneScript1:
checkflag ENGINE_LIZ_THURSDAY_AFTERNOON
iftrue .NotThursday
checkcode VAR_WEEKDAY
- if_not_equal THURSDAY, .NotThursday
- checkday
+ ifnotequal THURSDAY, .NotThursday
+ checktime DAY
iftrue LizThursdayAfternoon
.NotThursday:
- special Special_RandomPhoneMon
+ special RandomPhoneMon
farjump UnknownScript_0xa0948
.WantsBattle:
@@ -861,7 +861,7 @@ LizPhoneScript1:
LizPhoneScript2:
trainertotext PICNICKER, LIZ1, MEM_BUFFER_0
farscall PhoneScript_Random4
- if_equal 0, LizWrongNumber
+ ifequal 0, LizWrongNumber
farscall PhoneScript_GreetPhone_Female
checkflag ENGINE_LIZ
iftrue .next
@@ -870,11 +870,11 @@ LizPhoneScript2:
.next:
farscall PhoneScript_Random2
- if_equal 0, LizGossip
+ ifequal 0, LizGossip
checkflag ENGINE_FLYPOINT_GOLDENROD
iffalse .Generic
farscall PhoneScript_Random2
- if_equal 0, LizWantsBattle
+ ifequal 0, LizWantsBattle
.Generic:
farjump Phone_GenericCall_Female
@@ -892,15 +892,15 @@ LizWrongNumber:
LizGossip:
random 9
- if_equal 0, .CoolTrainerM
- if_equal 1, .Beauty
- if_equal 2, .Grunt
- if_equal 3, .Teacher
- if_equal 4, .SwimmerF
- if_equal 5, .KimonoGirl
- if_equal 6, .Skier
- if_equal 7, .Medium
- if_equal 8, .PokefanM
+ ifequal 0, .CoolTrainerM
+ ifequal 1, .Beauty
+ ifequal 2, .Grunt
+ ifequal 3, .Teacher
+ ifequal 4, .SwimmerF
+ ifequal 5, .KimonoGirl
+ ifequal 6, .Skier
+ ifequal 7, .Medium
+ ifequal 8, .PokefanM
.CoolTrainerM:
trainerclassname COOLTRAINERM, NICK
@@ -951,8 +951,8 @@ AnthonyPhoneScript1:
checkflag ENGINE_ANTHONY_FRIDAY_NIGHT
iftrue .NotFriday
checkcode VAR_WEEKDAY
- if_not_equal FRIDAY, .NotFriday
- checknite
+ ifnotequal FRIDAY, .NotFriday
+ checktime NITE
iftrue AnthonyFridayNight
.NotFriday:
@@ -978,11 +978,11 @@ AnthonyPhoneScript2:
checkflag ENGINE_ANTHONY_FRIDAY_NIGHT
iftrue .TriesSwarm
farscall PhoneScript_Random2
- if_equal 0, AnthonyWantsBattle
+ ifequal 0, AnthonyWantsBattle
.TriesSwarm:
farscall PhoneScript_Random5
- if_equal 0, AnthonyTriesDunsparceSwarm
+ ifequal 0, AnthonyTriesDunsparceSwarm
farjump Phone_GenericCall_Male
AnthonyFridayNight:
@@ -1015,8 +1015,8 @@ ToddPhoneScript1:
checkflag ENGINE_TODD_SATURDAY_MORNING
iftrue .NotSaturday
checkcode VAR_WEEKDAY
- if_not_equal SATURDAY, .NotSaturday
- checkmorn
+ ifnotequal SATURDAY, .NotSaturday
+ checktime MORN
iftrue ToddSaturdayMorning
.NotSaturday:
@@ -1041,15 +1041,15 @@ ToddPhoneScript2:
checkflag ENGINE_FLYPOINT_GOLDENROD
iffalse ToddNoGoldenrod
farscall PhoneScript_Random2
- if_equal 0, ToddWantsBattle
+ ifequal 0, ToddWantsBattle
.TryForSale:
farscall PhoneScript_Random2
- if_equal 0, ToddDeptStoreSale
+ ifequal 0, ToddDeptStoreSale
ToddNoGoldenrod:
farscall PhoneScript_Random3
- if_equal 0, ToddFoundRare
+ ifequal 0, ToddFoundRare
farjump Phone_GenericCall_Male
ToddSaturdayMorning:
@@ -1079,8 +1079,8 @@ GinaPhoneScript1:
checkflag ENGINE_GINA_HAS_LEAF_STONE
iftrue .HasLeafStone
checkcode VAR_WEEKDAY
- if_not_equal SUNDAY, .NotSunday
- checkday
+ ifnotequal SUNDAY, .NotSunday
+ checktime DAY
iftrue GinaSundayDay
.NotSunday:
@@ -1113,15 +1113,15 @@ GinaPhoneScript2:
checkevent EVENT_GINA_GAVE_LEAF_STONE
iftrue .GaveLeafStone
farscall PhoneScript_Random2
- if_equal 0, GinaHasLeafStone
+ ifequal 0, GinaHasLeafStone
.GaveLeafStone:
farscall PhoneScript_Random11
- if_equal 0, GinaHasLeafStone
+ ifequal 0, GinaHasLeafStone
checkflag ENGINE_FLYPOINT_GOLDENROD
iffalse .Generic
farscall PhoneScript_Random3
- if_equal 0, GinaWantsBattle
+ ifequal 0, GinaWantsBattle
.Generic:
farjump Phone_GenericCall_Female
@@ -1174,8 +1174,8 @@ ArniePhoneScript1:
checkflag ENGINE_ARNIE_TUESDAY_MORNING
iftrue .NotTuesday
checkcode VAR_WEEKDAY
- if_not_equal TUESDAY, .NotTuesday
- checkmorn
+ ifnotequal TUESDAY, .NotTuesday
+ checktime MORN
iftrue ArnieTuesdayMorning
.NotTuesday:
@@ -1199,13 +1199,13 @@ ArniePhoneScript2:
checkflag ENGINE_ARNIE_TUESDAY_MORNING
iftrue .Swarm
farscall PhoneScript_Random2
- if_equal 0, ArnieWantsBattle
+ ifequal 0, ArnieWantsBattle
.Swarm:
farscall PhoneScript_Random5
- if_equal 0, ArnieYanmaSwarm
+ ifequal 0, ArnieYanmaSwarm
farscall PhoneScript_Random3
- if_equal 0, ArnieFoundRare
+ ifequal 0, ArnieFoundRare
farjump Phone_GenericCall_Male
ArnieTuesdayMorning:
@@ -1243,8 +1243,8 @@ AlanPhoneScript1:
checkflag ENGINE_ALAN_HAS_FIRE_STONE
iftrue .FireStone
checkcode VAR_WEEKDAY
- if_not_equal WEDNESDAY, .NotWednesday
- checkday
+ ifnotequal WEDNESDAY, .NotWednesday
+ checktime DAY
iftrue AlanWednesdayDay
.NotWednesday:
@@ -1268,15 +1268,15 @@ AlanPhoneScript2:
checkflag ENGINE_ALAN_HAS_FIRE_STONE
iftrue AlanGenericCall
farscall PhoneScript_Random3
- if_equal 0, AlanWantsBattle
+ ifequal 0, AlanWantsBattle
checkevent EVENT_ALAN_GAVE_FIRE_STONE
iftrue .FireStone
farscall PhoneScript_Random2
- if_equal 0, AlanHasFireStone
+ ifequal 0, AlanHasFireStone
.FireStone:
farscall PhoneScript_Random11
- if_equal 0, AlanHasFireStone
+ ifequal 0, AlanHasFireStone
AlanGenericCall:
farjump Phone_GenericCall_Male
@@ -1306,8 +1306,8 @@ DanaPhoneScript1:
checkflag ENGINE_DANA_HAS_THUNDERSTONE
iftrue .HasThunderstone
checkcode VAR_WEEKDAY
- if_not_equal THURSDAY, .NotThursday
- checknite
+ ifnotequal THURSDAY, .NotThursday
+ checktime NITE
iftrue DanaThursdayNight
.NotThursday:
@@ -1331,19 +1331,19 @@ DanaPhoneScript2:
checkflag ENGINE_DANA_HAS_THUNDERSTONE
iftrue .Generic
farscall PhoneScript_Random3
- if_equal 0, DanaWantsBattle
+ ifequal 0, DanaWantsBattle
checkevent EVENT_DANA_GAVE_THUNDERSTONE
iftrue .Thunderstone
farscall PhoneScript_Random2
- if_equal 0, DanaHasThunderstone
+ ifequal 0, DanaHasThunderstone
.Thunderstone:
farscall PhoneScript_Random11
- if_equal 0, DanaHasThunderstone
+ ifequal 0, DanaHasThunderstone
.Generic:
farscall PhoneScript_Random3
- if_equal 0, DanaFoundRare
+ ifequal 0, DanaFoundRare
farjump Phone_GenericCall_Female
DanaThursdayNight:
@@ -1372,8 +1372,8 @@ ChadPhoneScript1:
checkflag ENGINE_CHAD_FRIDAY_MORNING
iftrue .NotFriday
checkcode VAR_WEEKDAY
- if_not_equal FRIDAY, .NotFriday
- checkmorn
+ ifnotequal FRIDAY, .NotFriday
+ checktime MORN
iftrue ChadFridayMorning
.NotFriday:
@@ -1387,17 +1387,17 @@ ChadPhoneScript2:
trainertotext SCHOOLBOY, CHAD1, MEM_BUFFER_0
farscall PhoneScript_GreetPhone_Male
farscall PhoneScript_Random2
- if_equal 0, ChadOakGossip
+ ifequal 0, ChadOakGossip
checkflag ENGINE_CHAD
iftrue .Generic
checkflag ENGINE_CHAD_FRIDAY_MORNING
iftrue .Generic
farscall PhoneScript_Random2
- if_equal 0, ChadWantsBattle
+ ifequal 0, ChadWantsBattle
.Generic:
farscall PhoneScript_Random3
- if_equal 0, ChadFoundRare
+ ifequal 0, ChadFoundRare
farjump Phone_GenericCall_Male
ChadFridayMorning:
@@ -1420,13 +1420,13 @@ DerekPhoneScript1:
checkflag ENGINE_DEREK_HAS_NUGGET
iftrue .Nugget
farscall PhoneScript_Random2
- if_equal 0, .NoContest
+ ifequal 0, .NoContest
checkflag ENGINE_DAILY_BUG_CONTEST
iftrue .NoContest
checkcode VAR_WEEKDAY
- if_equal TUESDAY, .ContestToday
- if_equal THURSDAY, .ContestToday
- if_equal SATURDAY, .ContestToday
+ ifequal TUESDAY, .ContestToday
+ ifequal THURSDAY, .ContestToday
+ ifequal SATURDAY, .ContestToday
.NoContest:
farjump UnknownScript_0xa0988
@@ -1442,17 +1442,17 @@ DerekPhoneScript2:
trainertotext POKEFANM, DEREK1, MEM_BUFFER_0
farscall PhoneScript_GreetPhone_Male
farscall PhoneScript_Random2
- if_equal 0, .NoContest
+ ifequal 0, .NoContest
checkflag ENGINE_DAILY_BUG_CONTEST
iftrue .NoContest
checkcode VAR_WEEKDAY
- if_equal TUESDAY, .ContestToday
- if_equal THURSDAY, .ContestToday
- if_equal SATURDAY, .ContestToday
+ ifequal TUESDAY, .ContestToday
+ ifequal THURSDAY, .ContestToday
+ ifequal SATURDAY, .ContestToday
.NoContest:
farscall PhoneScript_Random4
- if_equal 0, .Nugget
+ ifequal 0, .Nugget
farjump Phone_GenericCall_Male
.ContestToday:
@@ -1473,8 +1473,8 @@ TullyPhoneScript1:
checkflag ENGINE_TULLY_HAS_WATER_STONE
iftrue TullyHasWaterStone
checkcode VAR_WEEKDAY
- if_not_equal SUNDAY, .NotSunday
- checknite
+ ifnotequal SUNDAY, .NotSunday
+ checktime NITE
iftrue TullySundayNight
.NotSunday:
@@ -1498,15 +1498,15 @@ TullyPhoneScript2:
checkflag ENGINE_TULLY_HAS_WATER_STONE
iftrue .Generic
farscall PhoneScript_Random3
- if_equal 0, TullyWantsBattle
+ ifequal 0, TullyWantsBattle
checkevent EVENT_TULLY_GAVE_WATER_STONE
iftrue .WaterStone
farscall PhoneScript_Random2
- if_equal 0, TullyFoundWaterStone
+ ifequal 0, TullyFoundWaterStone
.WaterStone:
farscall PhoneScript_Random11
- if_equal 0, TullyFoundWaterStone
+ ifequal 0, TullyFoundWaterStone
.Generic:
farjump Phone_GenericCall_Male
@@ -1532,8 +1532,8 @@ BrentPhoneScript1:
checkflag ENGINE_BRENT_MONDAY_MORNING
iftrue .NotMonday
checkcode VAR_WEEKDAY
- if_not_equal MONDAY, .NotMonday
- checkmorn
+ ifnotequal MONDAY, .NotMonday
+ checktime MORN
iftrue BrentMondayMorning
.NotMonday:
@@ -1547,13 +1547,13 @@ BrentPhoneScript2:
trainertotext POKEMANIAC, BRENT1, MEM_BUFFER_0
farscall PhoneScript_GreetPhone_Male
farscall PhoneScript_Random2
- if_equal 0, BrentBillTrivia
+ ifequal 0, BrentBillTrivia
checkflag ENGINE_BRENT
iftrue .Generic
checkflag ENGINE_BRENT_MONDAY_MORNING
iftrue .Generic
farscall PhoneScript_Random2
- if_equal 0, BrentWantsBattle
+ ifequal 0, BrentWantsBattle
.Generic:
farjump Phone_GenericCall_Male
@@ -1579,8 +1579,8 @@ TiffanyPhoneScript1:
checkflag ENGINE_TIFFANY_HAS_PINK_BOW
iftrue .HasItem
checkcode VAR_WEEKDAY
- if_not_equal TUESDAY, .NotTuesday
- checkday
+ ifnotequal TUESDAY, .NotTuesday
+ checktime DAY
iftrue TiffanyTuesdayAfternoon
.NotTuesday:
@@ -1597,7 +1597,7 @@ TiffanyPhoneScript1:
TiffanyPhoneScript2:
trainertotext PICNICKER, TIFFANY3, MEM_BUFFER_0
farscall PhoneScript_Random4
- if_equal 0, TiffanysFamilyMembers
+ ifequal 0, TiffanysFamilyMembers
farscall PhoneScript_GreetPhone_Female
checkflag ENGINE_TIFFANY
iftrue TiffanyGenericCall
@@ -1606,15 +1606,15 @@ TiffanyPhoneScript2:
checkflag ENGINE_TIFFANY_HAS_PINK_BOW
iftrue TiffanyGenericCall
farscall PhoneScript_Random3
- if_equal 0, TiffanyWantsBattle
+ ifequal 0, TiffanyWantsBattle
checkevent EVENT_TIFFANY_GAVE_PINK_BOW
iftrue .PinkBow
farscall PhoneScript_Random2
- if_equal 0, TiffanyHasPinkBow
+ ifequal 0, TiffanyHasPinkBow
.PinkBow:
farscall PhoneScript_Random11
- if_equal 0, TiffanyHasPinkBow
+ ifequal 0, TiffanyHasPinkBow
TiffanyGenericCall:
farjump Phone_GenericCall_Female
@@ -1629,12 +1629,12 @@ TiffanyWantsBattle:
TiffanysFamilyMembers:
random 6
- if_equal 0, .Grandma
- if_equal 1, .Grandpa
- if_equal 2, .Mom
- if_equal 3, .Dad
- if_equal 4, .Sister
- if_equal 5, .Brother
+ ifequal 0, .Grandma
+ ifequal 1, .Grandpa
+ ifequal 2, .Mom
+ ifequal 3, .Dad
+ ifequal 4, .Sister
+ ifequal 5, .Brother
.Grandma:
stringtotext GrandmaString, MEM_BUFFER_1
@@ -1678,8 +1678,8 @@ VancePhoneScript1:
checkflag ENGINE_VANCE_WEDNESDAY_NIGHT
iftrue .NotWednesday
checkcode VAR_WEEKDAY
- if_not_equal WEDNESDAY, .NotWednesday
- checknite
+ ifnotequal WEDNESDAY, .NotWednesday
+ checktime NITE
iftrue VanceWednesdayNight
.NotWednesday:
@@ -1697,8 +1697,8 @@ VancePhoneScript2:
checkflag ENGINE_VANCE_WEDNESDAY_NIGHT
iftrue .WantsBattle
farscall PhoneScript_Random3
- if_equal 0, VanceWantsRematch
- if_equal 1, VanceWantsRematch
+ ifequal 0, VanceWantsRematch
+ ifequal 1, VanceWantsRematch
.WantsBattle:
farjump Phone_GenericCall_Male
@@ -1721,8 +1721,8 @@ WiltonPhoneScript1:
checkflag ENGINE_WILTON_HAS_ITEM
iftrue .HasItem
checkcode VAR_WEEKDAY
- if_not_equal THURSDAY, .NotThursday
- checkmorn
+ ifnotequal THURSDAY, .NotThursday
+ checktime MORN
iftrue WiltonThursdayMorning
.NotThursday:
@@ -1746,9 +1746,9 @@ WiltonPhoneScript2:
checkflag ENGINE_WILTON_HAS_ITEM
iftrue .GenericCall
farscall PhoneScript_Random2
- if_equal 0, WiltonWantsBattle
+ ifequal 0, WiltonWantsBattle
farscall PhoneScript_Random2
- if_equal 0, WiltonHasItem
+ ifequal 0, WiltonHasItem
.GenericCall:
farjump Phone_GenericCall_Male
@@ -1768,9 +1768,9 @@ WiltonHasItem:
clearevent EVENT_WILTON_HAS_GREAT_BALL
clearevent EVENT_WILTON_HAS_POKE_BALL
random 5
- if_equal 0, .UltraBall
+ ifequal 0, .UltraBall
random 3
- if_equal 0, .GreatBall
+ ifequal 0, .GreatBall
jump .PokeBall
.UltraBall:
@@ -1809,8 +1809,8 @@ ParryPhoneScript1:
checkflag ENGINE_PARRY_FRIDAY_AFTERNOON
iftrue .WantsRematch
checkcode VAR_WEEKDAY
- if_not_equal FRIDAY, .WantsRematch
- checkday
+ ifnotequal FRIDAY, .WantsRematch
+ checktime DAY
iftrue ParryFridayDay
.WantsRematch:
@@ -1828,8 +1828,8 @@ ParryPhoneScript2:
checkflag ENGINE_PARRY_FRIDAY_AFTERNOON
iftrue .GenericCall
farscall PhoneScript_Random2
- if_equal 0, ParryWantsBattle
- if_equal 1, ParryWantsBattle
+ ifequal 0, ParryWantsBattle
+ ifequal 1, ParryWantsBattle
.GenericCall:
farjump Phone_GenericCall_Male
@@ -1852,8 +1852,8 @@ ErinPhoneScript1:
checkflag ENGINE_ERIN_SATURDAY_NIGHT
iftrue .NotSaturday
checkcode VAR_WEEKDAY
- if_not_equal SATURDAY, .NotSaturday
- checknite
+ ifnotequal SATURDAY, .NotSaturday
+ checktime NITE
iftrue ErinSaturdayNight
.NotSaturday:
@@ -1871,8 +1871,8 @@ ErinPhoneScript2:
checkflag ENGINE_ERIN_SATURDAY_NIGHT
iftrue .GenericCall
farscall PhoneScript_Random3
- if_equal 0, ErinWantsBattle
- if_equal 1, ErinWantsBattle
+ ifequal 0, ErinWantsBattle
+ ifequal 1, ErinWantsBattle
.GenericCall:
farjump Phone_GenericCall_Female
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-07 09:06:46 +0000