ref: 68d855c21312f871115984ccc932ce28861cf787
parent: b7e44124d31c66cb7de4f8f609a48dd1dba78c96
author: Rangi <remy.oukaour+rangi42@gmail.com>
date: Fri Feb 2 16:09:17 EST 2018
Script commands don't have underscores
--- a/docs/event_commands.md
+++ b/docs/event_commands.md
@@ -17,17 +17,17 @@
## `$05`: <code>ptjump <i>script</i></code>
-## `$06`: <code>if_equal <i>byte</i>, <i>script</i></code>
+## `$06`: <code>ifequal <i>byte</i>, <i>script</i></code>
-## `$07`: <code>if_not_equal <i>byte</i>, <i>script</i></code>
+## `$07`: <code>ifnotequal <i>byte</i>, <i>script</i></code>
## `$08`: <code>iffalse <i>script</i></code>
## `$09`: <code>iftrue <i>script</i></code>
-## `$0A`: <code>if_greater_than <i>byte</i>, <i>script</i></code>
+## `$0A`: <code>ifgreater <i>byte</i>, <i>script</i></code>
-## `$0B`: <code>if_less_than <i>byte</i>, <i>script</i></code>
+## `$0B`: <code>ifless <i>byte</i>, <i>script</i></code>
## `$0C`: <code>jumpstd <i>std_script</i></code>
@@ -213,9 +213,9 @@
## `$65`: `scripttalkafter`
-## `$66`: `end_if_just_battled`
+## `$66`: `endifjustbattled`
-## `$67`: `check_just_battled`
+## `$67`: `checkjustbattled`
## `$68`: <code>setlasttalked <i>object_id</i></code>
@@ -303,7 +303,7 @@
## `$92`: <code>reloadandreturn <i>which_method</i></code>
-## `$93`: `end_all`
+## `$93`: `endall`
## `$94`: <code>pokemart <i>dialog_id</i>, <i>mart_id</i></code>
@@ -347,4 +347,4 @@
## `$A8`: <code>wait <i>duration</i></code>
-## `$A9`: `check_save`
+## `$A9`: `checksave`
--- a/engine/events.asm
+++ b/engine/events.asm
@@ -914,8 +914,8 @@
StartMenuCallback:
SelectMenuCallback: ; 96b66
copybytetovar hMenuReturn
- if_equal HMENURETURN_SCRIPT, .Script
- if_equal HMENURETURN_ASM, .Asm
+ ifequal HMENURETURN_SCRIPT, .Script
+ ifequal HMENURETURN_ASM, .Asm
end
; 96b72
--- a/engine/events/forced_movement.asm
+++ b/engine/events/forced_movement.asm
@@ -1,9 +1,9 @@
Script_ForcedMovement:: ; 0x1253d
checkcode VAR_FACING
- if_equal DOWN, .down
- if_equal UP, .up
- if_equal LEFT, .left
- if_equal RIGHT, .right
+ ifequal DOWN, .down
+ ifequal UP, .up
+ ifequal LEFT, .left
+ ifequal RIGHT, .right
end
; 0x12550
--- a/engine/events/overworld.asm
+++ b/engine/events/overworld.asm
@@ -1044,7 +1044,7 @@
AskStrengthScript:
callasm TryStrengthOW
iffalse .AskStrength
- if_equal $1, .DontMeetRequirements
+ ifequal $1, .DontMeetRequirements
jump .AlreadyUsedStrength
.DontMeetRequirements: ; 0xcd59
@@ -1413,7 +1413,7 @@
AskRockSmashScript: ; 0xcf5d
callasm HasRockSmash
- if_equal 1, .no
+ ifequal 1, .no
opentext
writetext UnknownText_0xcf77
--- a/engine/events/std_scripts.asm
+++ b/engine/events/std_scripts.asm
@@ -245,12 +245,12 @@
DayToTextScript:
checkcode VAR_WEEKDAY
- if_equal MONDAY, .Monday
- if_equal TUESDAY, .Tuesday
- if_equal WEDNESDAY, .Wednesday
- if_equal THURSDAY, .Thursday
- if_equal FRIDAY, .Friday
- if_equal SATURDAY, .Saturday
+ ifequal MONDAY, .Monday
+ ifequal TUESDAY, .Tuesday
+ ifequal WEDNESDAY, .Wednesday
+ ifequal THURSDAY, .Thursday
+ ifequal FRIDAY, .Friday
+ ifequal SATURDAY, .Saturday
stringtotext .SundayText, MEM_BUFFER_0
end
.Monday:
@@ -322,9 +322,9 @@
waitbutton
special BugContestJudging
vartomem MEM_BUFFER_0
- if_equal 1, BugContestResults_FirstPlace
- if_equal 2, BugContestResults_SecondPlace
- if_equal 3, BugContestResults_ThirdPlace
+ ifequal 1, BugContestResults_FirstPlace
+ ifequal 2, BugContestResults_SecondPlace
+ ifequal 3, BugContestResults_ThirdPlace
farwritetext ContestResults_ConsolationPrizeText
buttonsound
waitsfx
@@ -349,8 +349,8 @@
special ContestReturnMons
BugContestResults_DidNotLeaveMons
special CheckPartyFullAfterContest
- if_equal BUGCONTEST_CAUGHT_MON, BugContestResults_CleanUp
- if_equal BUGCONTEST_NO_CATCH, BugContestResults_CleanUp
+ ifequal BUGCONTEST_CAUGHT_MON, BugContestResults_CleanUp
+ ifequal BUGCONTEST_NO_CATCH, BugContestResults_CleanUp
; BUGCONTEST_BOXED_MON
farwritetext ContestResults_PartyFullText
waitbutton
@@ -624,26 +624,26 @@
AskNumber1MScript:
special RandomPhoneMon
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 JackAskNumber1Text
@@ -709,26 +709,26 @@
AskNumber2MScript:
special RandomPhoneMon
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 JackAskNumber2Text
@@ -800,26 +800,26 @@
NumberAcceptedMScript:
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 JackNumberAcceptedText
@@ -924,26 +924,26 @@
NumberDeclinedMScript:
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 JackNumberDeclinedText
@@ -1048,26 +1048,26 @@
PhoneFullMScript:
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 JackPhoneFullText
@@ -1172,23 +1172,23 @@
RematchMScript:
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 JackRematchText
@@ -1278,13 +1278,13 @@
GiftMScript:
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
- if_equal PHONE_BLACKBELT_KENJI, .Kenji
+ 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
+ ifequal PHONE_BLACKBELT_KENJI, .Kenji
.Jose:
farwritetext JoseGiftText
@@ -1317,17 +1317,17 @@
PackFullMScript:
checkcode VAR_CALLERID
- if_equal PHONE_SAILOR_HUEY, .Huey
- if_equal PHONE_BIRDKEEPER_JOSE, .Jose
- if_equal PHONE_YOUNGSTER_JOEY, .Joey
- 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_BIRDKEEPER_VANCE, .Vance
- if_equal PHONE_FISHER_WILTON, .Wilton
- if_equal PHONE_BLACKBELT_KENJI, .Kenji
- if_equal PHONE_HIKER_PARRY, .Parry
+ ifequal PHONE_SAILOR_HUEY, .Huey
+ ifequal PHONE_BIRDKEEPER_JOSE, .Jose
+ ifequal PHONE_YOUNGSTER_JOEY, .Joey
+ ifequal PHONE_BUG_CATCHER_WADE, .Wade
+ ifequal PHONE_SCHOOLBOY_ALAN, .Alan
+ ifequal PHONE_POKEFANM_DEREK, .Derek
+ ifequal PHONE_FISHER_TULLY, .Tully
+ ifequal PHONE_BIRDKEEPER_VANCE, .Vance
+ ifequal PHONE_FISHER_WILTON, .Wilton
+ ifequal PHONE_BLACKBELT_KENJI, .Kenji
+ ifequal PHONE_HIKER_PARRY, .Parry
.Huey:
farwritetext HueyPackFullText
@@ -1388,10 +1388,10 @@
RematchGiftMScript:
opentext
checkcode VAR_CALLERID
- if_equal PHONE_SAILOR_HUEY, .Huey
- if_equal PHONE_YOUNGSTER_JOEY, .Joey
- if_equal PHONE_BIRDKEEPER_VANCE, .Vance
- if_equal PHONE_HIKER_PARRY, .Parry
+ ifequal PHONE_SAILOR_HUEY, .Huey
+ ifequal PHONE_YOUNGSTER_JOEY, .Joey
+ ifequal PHONE_BIRDKEEPER_VANCE, .Vance
+ ifequal PHONE_HIKER_PARRY, .Parry
.Huey:
farwritetext HueyRematchGiftText
@@ -1412,14 +1412,14 @@
AskNumber1FScript:
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 BeverlyAskNumber1Text
@@ -1448,14 +1448,14 @@
AskNumber2FScript:
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 BeverlyAskNumber2Text
@@ -1491,14 +1491,14 @@
NumberAcceptedFScript: ; 0xbcbd3
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 BeverlyNumberAcceptedText
@@ -1543,14 +1543,14 @@
NumberDeclinedFScript:
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 BeverlyNumberDeclinedText
@@ -1595,14 +1595,14 @@
PhoneFullFScript:
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 BeverlyPhoneFullText
@@ -1647,13 +1647,13 @@
RematchFScript:
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 BethRematchText
@@ -1693,10 +1693,10 @@
GiftFScript:
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 BeverlyGiftText
@@ -1717,11 +1717,11 @@
PackFullFScript:
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
- if_equal PHONE_PICNICKER_ERIN, .Erin
+ ifequal PHONE_POKEFAN_BEVERLY, .Beverly
+ ifequal PHONE_PICNICKER_GINA, .Gina
+ ifequal PHONE_LASS_DANA, .Dana
+ ifequal PHONE_PICNICKER_TIFFANY, .Tiffany
+ ifequal PHONE_PICNICKER_ERIN, .Erin
.Beverly:
farwritetext BeverlyPackFullText
@@ -1751,7 +1751,7 @@
RematchGiftFScript:
checkcode VAR_CALLERID
- if_equal PHONE_PICNICKER_ERIN, .Erin
+ ifequal PHONE_PICNICKER_ERIN, .Erin
.Erin:
opentext
@@ -1814,16 +1814,16 @@
loadmenuheader .MenuHeader
verticalmenu
closewindow
- if_equal 1, .Buy50
- if_equal 2, .Buy500
+ ifequal 1, .Buy50
+ ifequal 2, .Buy500
jump .Cancel
; 0xbcdf7
.Buy50: ; 0xbcdf7
checkcoins MAX_COINS - 50
- if_equal HAVE_MORE, .CoinCaseFull
+ ifequal HAVE_MORE, .CoinCaseFull
checkmoney YOUR_MONEY, 1000
- if_equal HAVE_LESS, .NotEnoughMoney
+ ifequal HAVE_LESS, .NotEnoughMoney
givecoins 50
takemoney YOUR_MONEY, 1000
waitsfx
@@ -1835,9 +1835,9 @@
.Buy500: ; 0xbce1b
checkcoins MAX_COINS - 500
- if_equal HAVE_MORE, .CoinCaseFull
+ ifequal HAVE_MORE, .CoinCaseFull
checkmoney YOUR_MONEY, 10000
- if_equal HAVE_LESS, .NotEnoughMoney
+ ifequal HAVE_LESS, .NotEnoughMoney
givecoins 500
takemoney YOUR_MONEY, 10000
waitsfx
@@ -1888,8 +1888,8 @@
faceplayer
opentext
special GetFirstPokemonHappiness
- if_less_than 50, .Unhappy
- if_less_than 150, .KindaHappy
+ ifless 50, .Unhappy
+ ifless 150, .KindaHappy
farwritetext HappinessText3
waitbutton
closetext
--- a/engine/events/whiteout.asm
+++ b/engine/events/whiteout.asm
@@ -20,7 +20,7 @@
farscall Script_AbortBugContest
special WarpToSpawnPoint
newloadmap MAPSETUP_WARP
- end_all
+ endall
.bug_contest
jumpstd bugcontestresultswarp
--- a/engine/phone/buenas_password.asm
+++ b/engine/phone/buenas_password.asm
@@ -2,7 +2,7 @@
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
@@ -37,7 +37,7 @@
BuenaPhoneScript_CheckTimeOfDay2:
checkcode VAR_HOUR
- if_greater_than 17, BuenaPhoneScript_AfterMidnight2
+ ifgreater 17, BuenaPhoneScript_AfterMidnight2
checkmorn
iftrue .morn
checkday
@@ -75,20 +75,20 @@
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_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
--- a/engine/phone/generic_calls.asm
+++ b/engine/phone/generic_calls.asm
@@ -24,26 +24,26 @@
checknite
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_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_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
@@ -397,14 +397,14 @@
checknite
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_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_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
@@ -554,26 +554,26 @@
checknite
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_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_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
@@ -927,14 +927,14 @@
checknite
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_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_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_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_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
@@ -1242,7 +1242,7 @@
PhoneScript_MonFlavorText:
special RandomPhoneMon
farscall PhoneScript_Random2
- if_equal $0, .TooEnergetic
+ ifequal $0, .TooEnergetic
farwritetext UnknownText_0x1b518b
buttonsound
farjump PhoneScript_HangupText_Male
--- a/engine/phone/phone_callers.asm
+++ b/engine/phone/phone_callers.asm
@@ -1,7 +1,7 @@
Phone_GenericCall_Male:
special RandomPhoneMon
farscall PhoneScript_Random2
- if_equal 0, .Bragging
+ ifequal 0, .Bragging
farscall PhoneScript_Generic_Male
farjump Phone_FoundAMon_Male
@@ -11,7 +11,7 @@
Phone_GenericCall_Female:
special RandomPhoneMon
farscall PhoneScript_Random2
- if_equal 0, .Bragging
+ ifequal 0, .Bragging
farscall PhoneScript_Generic_Female
farjump Phone_FoundAMon_Female
@@ -29,7 +29,7 @@
Phone_FoundAMon_Male:
special RandomPhoneWildMon
farscall PhoneScript_Random2
- if_equal 0, .GotAway
+ ifequal 0, .GotAway
farscall Phone_WhoDefeatedMon_Male
farjump PhoneScript_HangupText_Male
@@ -39,7 +39,7 @@
Phone_FoundAMon_Female:
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_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_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_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_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_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_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_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_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 @@
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_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
@@ -856,8 +856,8 @@
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 @@
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_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
--- 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 @@
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 @@
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 @@
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 @@
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 @@
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
--- a/engine/phone/phone_scripts.asm
+++ b/engine/phone/phone_scripts.asm
@@ -22,8 +22,8 @@
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 @@
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 @@
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
@@ -173,8 +173,8 @@
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 @@
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 @@
.discovery ; 0xbd069
random 2
- if_equal 0, .nextdiscovery
+ ifequal 0, .nextdiscovery
farwritetext ElmPhoneDiscovery1Text
end
@@ -258,11 +258,11 @@
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,7 +306,7 @@
checkflag ENGINE_JACK_MONDAY_MORNING
iftrue .NotMonday
checkcode VAR_WEEKDAY
- if_not_equal MONDAY, .NotMonday
+ ifnotequal MONDAY, .NotMonday
checkmorn
iftrue JackMondayMorning
@@ -321,17 +321,17 @@
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 @@
checkflag ENGINE_BEVERLY_HAS_NUGGET
iftrue .HasNugget
farscall PhoneScript_Random4
- if_equal 0, .FoundNugget
+ ifequal 0, .FoundNugget
.HasNugget:
farjump Phone_GenericCall_Female
@@ -387,7 +387,7 @@
checkflag ENGINE_HUEY_WEDNESDAY_NIGHT
iftrue .NotWednesday
checkcode VAR_WEEKDAY
- if_not_equal WEDNESDAY, .NotWednesday
+ ifnotequal WEDNESDAY, .NotWednesday
checknite
iftrue HueyWednesdayNight
@@ -407,8 +407,8 @@
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,7 +431,7 @@
checkflag ENGINE_GAVEN_THURSDAY_MORNING
iftrue .NotThursday
checkcode VAR_WEEKDAY
- if_not_equal THURSDAY, .NotThursday
+ ifnotequal THURSDAY, .NotThursday
checkmorn
iftrue GavenThursdayMorning
@@ -450,11 +450,11 @@
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,7 +478,7 @@
checkflag ENGINE_BETH_FRIDAY_AFTERNOON
iftrue .NotFriday
checkcode VAR_WEEKDAY
- if_not_equal FRIDAY, .NotFriday
+ ifnotequal FRIDAY, .NotFriday
checkday
iftrue BethFridayAfternoon
@@ -497,7 +497,7 @@
checkflag ENGINE_BETH_FRIDAY_AFTERNOON
iftrue .Generic
farscall PhoneScript_Random2
- if_equal 0, BethWantsBattle
+ ifequal 0, BethWantsBattle
.Generic:
farjump Phone_GenericCall_Female
@@ -522,7 +522,7 @@
checkflag ENGINE_JOSE_HAS_STAR_PIECE
iftrue .HasItem
checkcode VAR_WEEKDAY
- if_not_equal SATURDAY, .NotSaturday
+ ifnotequal SATURDAY, .NotSaturday
checknite
iftrue JoseSaturdayNight
@@ -547,13 +547,13 @@
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,7 +582,7 @@
checkflag ENGINE_REENA_SUNDAY_MORNING
iftrue .NotSunday
checkcode VAR_WEEKDAY
- if_not_equal SUNDAY, .NotSunday
+ ifnotequal SUNDAY, .NotSunday
checkmorn
iftrue ReenaSundayMorning
@@ -601,7 +601,7 @@
checkflag ENGINE_REENA_SUNDAY_MORNING
iftrue .Generic
farscall PhoneScript_Random2
- if_equal 0, ReenaWantsBattle
+ ifequal 0, ReenaWantsBattle
.Generic:
farjump Phone_GenericCall_Female
@@ -624,7 +624,7 @@
checkflag ENGINE_JOEY_MONDAY_AFTERNOON
iftrue .NotMonday
checkcode VAR_WEEKDAY
- if_not_equal MONDAY, .NotMonday
+ ifnotequal MONDAY, .NotMonday
checkday
iftrue JoeyMondayAfternoon
@@ -644,8 +644,8 @@
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 @@
checkflag ENGINE_WADE_HAS_ITEM
iftrue WadeHasItem
checkcode VAR_WEEKDAY
- if_not_equal TUESDAY, .NotTuesday
+ ifnotequal TUESDAY, .NotTuesday
checknite
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 @@
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 @@
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 @@
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,7 +784,7 @@
checkflag ENGINE_RALPH_WEDNESDAY_MORNING
iftrue Ralph_CheckSwarm
checkcode VAR_WEEKDAY
- if_not_equal WEDNESDAY, Ralph_CheckSwarm
+ ifnotequal WEDNESDAY, Ralph_CheckSwarm
checkmorn
iftrue Ralph_WednesdayMorning
Ralph_CheckSwarm:
@@ -810,10 +810,10 @@
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:
@@ -846,7 +846,7 @@
checkflag ENGINE_LIZ_THURSDAY_AFTERNOON
iftrue .NotThursday
checkcode VAR_WEEKDAY
- if_not_equal THURSDAY, .NotThursday
+ ifnotequal THURSDAY, .NotThursday
checkday
iftrue LizThursdayAfternoon
@@ -861,7 +861,7 @@
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 @@
.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 @@
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,7 +951,7 @@
checkflag ENGINE_ANTHONY_FRIDAY_NIGHT
iftrue .NotFriday
checkcode VAR_WEEKDAY
- if_not_equal FRIDAY, .NotFriday
+ ifnotequal FRIDAY, .NotFriday
checknite
iftrue AnthonyFridayNight
@@ -978,11 +978,11 @@
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,7 +1015,7 @@
checkflag ENGINE_TODD_SATURDAY_MORNING
iftrue .NotSaturday
checkcode VAR_WEEKDAY
- if_not_equal SATURDAY, .NotSaturday
+ ifnotequal SATURDAY, .NotSaturday
checkmorn
iftrue ToddSaturdayMorning
@@ -1041,15 +1041,15 @@
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,7 +1079,7 @@
checkflag ENGINE_GINA_HAS_LEAF_STONE
iftrue .HasLeafStone
checkcode VAR_WEEKDAY
- if_not_equal SUNDAY, .NotSunday
+ ifnotequal SUNDAY, .NotSunday
checkday
iftrue GinaSundayDay
@@ -1113,15 +1113,15 @@
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,7 +1174,7 @@
checkflag ENGINE_ARNIE_TUESDAY_MORNING
iftrue .NotTuesday
checkcode VAR_WEEKDAY
- if_not_equal TUESDAY, .NotTuesday
+ ifnotequal TUESDAY, .NotTuesday
checkmorn
iftrue ArnieTuesdayMorning
@@ -1199,13 +1199,13 @@
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,7 +1243,7 @@
checkflag ENGINE_ALAN_HAS_FIRE_STONE
iftrue .FireStone
checkcode VAR_WEEKDAY
- if_not_equal WEDNESDAY, .NotWednesday
+ ifnotequal WEDNESDAY, .NotWednesday
checkday
iftrue AlanWednesdayDay
@@ -1268,15 +1268,15 @@
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,7 +1306,7 @@
checkflag ENGINE_DANA_HAS_THUNDERSTONE
iftrue .HasThunderstone
checkcode VAR_WEEKDAY
- if_not_equal THURSDAY, .NotThursday
+ ifnotequal THURSDAY, .NotThursday
checknite
iftrue DanaThursdayNight
@@ -1331,19 +1331,19 @@
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,7 +1372,7 @@
checkflag ENGINE_CHAD_FRIDAY_MORNING
iftrue .NotFriday
checkcode VAR_WEEKDAY
- if_not_equal FRIDAY, .NotFriday
+ ifnotequal FRIDAY, .NotFriday
checkmorn
iftrue ChadFridayMorning
@@ -1387,17 +1387,17 @@
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 @@
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 @@
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,7 +1473,7 @@
checkflag ENGINE_TULLY_HAS_WATER_STONE
iftrue TullyHasWaterStone
checkcode VAR_WEEKDAY
- if_not_equal SUNDAY, .NotSunday
+ ifnotequal SUNDAY, .NotSunday
checknite
iftrue TullySundayNight
@@ -1498,15 +1498,15 @@
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,7 +1532,7 @@
checkflag ENGINE_BRENT_MONDAY_MORNING
iftrue .NotMonday
checkcode VAR_WEEKDAY
- if_not_equal MONDAY, .NotMonday
+ ifnotequal MONDAY, .NotMonday
checkmorn
iftrue BrentMondayMorning
@@ -1547,13 +1547,13 @@
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,7 +1579,7 @@
checkflag ENGINE_TIFFANY_HAS_PINK_BOW
iftrue .HasItem
checkcode VAR_WEEKDAY
- if_not_equal TUESDAY, .NotTuesday
+ ifnotequal TUESDAY, .NotTuesday
checkday
iftrue TiffanyTuesdayAfternoon
@@ -1597,7 +1597,7 @@
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 @@
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 @@
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,7 +1678,7 @@
checkflag ENGINE_VANCE_WEDNESDAY_NIGHT
iftrue .NotWednesday
checkcode VAR_WEEKDAY
- if_not_equal WEDNESDAY, .NotWednesday
+ ifnotequal WEDNESDAY, .NotWednesday
checknite
iftrue VanceWednesdayNight
@@ -1697,8 +1697,8 @@
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,7 +1721,7 @@
checkflag ENGINE_WILTON_HAS_ITEM
iftrue .HasItem
checkcode VAR_WEEKDAY
- if_not_equal THURSDAY, .NotThursday
+ ifnotequal THURSDAY, .NotThursday
checkmorn
iftrue WiltonThursdayMorning
@@ -1746,9 +1746,9 @@
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 @@
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,7 +1809,7 @@
checkflag ENGINE_PARRY_FRIDAY_AFTERNOON
iftrue .WantsRematch
checkcode VAR_WEEKDAY
- if_not_equal FRIDAY, .WantsRematch
+ ifnotequal FRIDAY, .WantsRematch
checkday
iftrue ParryFridayDay
@@ -1828,8 +1828,8 @@
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,7 +1852,7 @@
checkflag ENGINE_ERIN_SATURDAY_NIGHT
iftrue .NotSaturday
checkcode VAR_WEEKDAY
- if_not_equal SATURDAY, .NotSaturday
+ ifnotequal SATURDAY, .NotSaturday
checknite
iftrue ErinSaturdayNight
@@ -1871,8 +1871,8 @@
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
--- a/engine/scripting.asm
+++ b/engine/scripting.asm
@@ -71,12 +71,12 @@
dw Script_jump ; 03
dw Script_farjump ; 04
dw Script_ptjump ; 05
- dw Script_if_equal ; 06
- dw Script_if_not_equal ; 07
+ dw Script_ifequal ; 06
+ dw Script_ifnotequal ; 07
dw Script_iffalse ; 08
dw Script_iftrue ; 09
- dw Script_if_greater_than ; 0a
- dw Script_if_less_than ; 0b
+ dw Script_ifgreater ; 0a
+ dw Script_ifless ; 0b
dw Script_jumpstd ; 0c
dw Script_callstd ; 0d
dw Script_callasm ; 0e
@@ -136,7 +136,7 @@
dw Script_stringtotext ; 44
dw Script_itemnotify ; 45
dw Script_pocketisfull ; 46
- dw Script_textbox ; 47
+ dw Script_opentext ; 47
dw Script_refreshscreen ; 48
dw Script_closetext ; 49
dw Script_loadbytec2cf ; 4a
@@ -169,8 +169,8 @@
dw Script_trainerflagaction ; 63
dw Script_winlosstext ; 64
dw Script_scripttalkafter ; 65
- dw Script_end_if_just_battled ; 66
- dw Script_check_just_battled ; 67
+ dw Script_endifjustbattled ; 66
+ dw Script_checkjustbattled ; 67
dw Script_setlasttalked ; 68
dw Script_applymovement ; 69
dw Script_applymovement2 ; 6a
@@ -214,7 +214,7 @@
dw Script_return ; 90
dw Script_end ; 91
dw Script_reloadandreturn ; 92
- dw Script_end_all ; 93
+ dw Script_endall ; 93
dw Script_pokemart ; 94
dw Script_elevator ; 95
dw Script_trade ; 96
@@ -236,7 +236,7 @@
dw Script_trainerclassname ; a6
dw Script_name ; a7
dw Script_wait ; a8
- dw Script_check_save ; a9
+ dw Script_checksave ; a9
StartScript:
ld hl, ScriptFlags
@@ -839,7 +839,7 @@
ld [hli], a
ret
-Script_end_if_just_battled:
+Script_endifjustbattled:
; script command 0x66
ld a, [wRunningTrainerBattleScript]
@@ -847,7 +847,7 @@
ret z
jp Script_end
-Script_check_just_battled:
+Script_checkjustbattled:
; script command 0x67
ld a, TRUE
@@ -1561,7 +1561,7 @@
jp nz, Script_jump
jp SkipTwoScriptBytes
-Script_if_equal:
+Script_ifequal:
; script command 0x6
; parameters: byte, pointer
@@ -1571,7 +1571,7 @@
jr z, Script_jump
jr SkipTwoScriptBytes
-Script_if_not_equal:
+Script_ifnotequal:
; script command 0x7
; parameters: byte, pointer
@@ -1581,7 +1581,7 @@
jr nz, Script_jump
jr SkipTwoScriptBytes
-Script_if_greater_than:
+Script_ifgreater:
; script command 0xa
; parameters: byte, pointer
@@ -1592,7 +1592,7 @@
jr c, Script_jump
jr SkipTwoScriptBytes
-Script_if_less_than:
+Script_ifless:
; script command 0xb
; parameters: byte, pointer
@@ -2646,7 +2646,7 @@
call Script_newloadmap
jp Script_end
-Script_textbox:
+Script_opentext:
; script command 0x47
call OpenText
@@ -2787,7 +2787,7 @@
scf
ret
-Script_end_all:
+Script_endall:
; script command 0x93
xor a
@@ -2817,7 +2817,7 @@
farcall RedCredits
ReturnFromCredits:
- call Script_end_all
+ call Script_endall
ld a, $3
call LoadMapStatus
call StopScript
@@ -2839,7 +2839,7 @@
pop bc
ret
-Script_check_save:
+Script_checksave:
; script command 0xa9
farcall CheckSave
--- a/macros/scripts/events.asm
+++ b/macros/scripts/events.asm
@@ -37,16 +37,16 @@
dw \1 ; pointer
ENDM
- enum if_equal_command ; $06
-if_equal: MACRO
- db if_equal_command
+ enum ifequal_command ; $06
+ifequal: MACRO
+ db ifequal_command
db \1 ; byte
dw \2 ; pointer
ENDM
- enum if_not_equal_command ; $07
-if_not_equal: MACRO
- db if_not_equal_command
+ enum ifnotequal_command ; $07
+ifnotequal: MACRO
+ db ifnotequal_command
db \1 ; byte
dw \2 ; pointer
ENDM
@@ -63,16 +63,16 @@
dw \1 ; pointer
ENDM
- enum if_greater_than_command ; $0a
-if_greater_than: MACRO
- db if_greater_than_command
+ enum ifgreater_command ; $0a
+ifgreater: MACRO
+ db ifgreater_command
db \1 ; byte
dw \2 ; pointer
ENDM
- enum if_less_than_command ; $0b
-if_less_than: MACRO
- db if_less_than_command
+ enum ifless_command ; $0b
+ifless: MACRO
+ db ifless_command
db \1 ; byte
dw \2 ; pointer
ENDM
@@ -298,20 +298,20 @@
db givepoke_command
db \1 ; pokemon
db \2 ; level
- if _NARG >= 3
+if _NARG >= 3
db \3 ; item
- if _NARG >= 4
+if _NARG >= 4
db \4 ; trainer
- if \4
+if \4
dw \5 ; trainer_name_pointer
dw \6 ; pkmn_nickname
- endc
- else
+endc
+else
db 0
- endc
- else
+endc
+else
db 0, 0
- endc
+endc
ENDM
enum giveegg_command ; $2e
@@ -651,14 +651,14 @@
db scripttalkafter_command
ENDM
- enum end_if_just_battled_command ; $66
-end_if_just_battled: MACRO
- db end_if_just_battled_command
+ enum endifjustbattled_command ; $66
+endifjustbattled: MACRO
+ db endifjustbattled_command
ENDM
- enum check_just_battled_command ; $67
-check_just_battled: MACRO
- db check_just_battled_command
+ enum checkjustbattled_command ; $67
+checkjustbattled: MACRO
+ db checkjustbattled_command
ENDM
enum setlasttalked_command ; $68
@@ -920,9 +920,9 @@
db \1 ; which_method
ENDM
- enum end_all_command ; $93
-end_all: MACRO
- db end_all_command
+ enum endall_command ; $93
+endall: MACRO
+ db endall_command
ENDM
enum pokemart_command ; $94
@@ -1062,7 +1062,7 @@
db \1 ; duration
ENDM
- enum check_save_command ; $a9
-check_save: MACRO
- db check_save_command
+ enum checksave_command ; $a9
+checksave: MACRO
+ db checksave_command
ENDM
--- a/maps/AzaleaGym.asm
+++ b/maps/AzaleaGym.asm
@@ -57,8 +57,8 @@
end
AzaleaGymActivateRockets:
- if_equal 7, .RadioTowerRockets
- if_equal 6, .GoldenrodRockets
+ ifequal 7, .RadioTowerRockets
+ ifequal 6, .GoldenrodRockets
end
.GoldenrodRockets:
@@ -71,7 +71,7 @@
trainer TWINS, AMYANDMAY1, EVENT_BEAT_TWINS_AMY_AND_MAY, TwinsAmyandmay1SeenText, TwinsAmyandmay1BeatenText, 0, .AfterScript
.AfterScript:
- end_if_just_battled
+ endifjustbattled
opentext
writetext TwinsAmyandmay1AfterBattleText
waitbutton
@@ -82,7 +82,7 @@
trainer TWINS, AMYANDMAY2, EVENT_BEAT_TWINS_AMY_AND_MAY, TwinsAmyandmay2SeenText, TwinsAmyandmay2BeatenText, 0, .AfterScript
.AfterScript:
- end_if_just_battled
+ endifjustbattled
opentext
writetext TwinsAmyandmay2AfterBattleText
waitbutton
@@ -93,7 +93,7 @@
trainer BUG_CATCHER, BUG_CATCHER_BENNY, EVENT_BEAT_BUG_CATCHER_BENNY, BugCatcherBennySeenText, BugCatcherBennyBeatenText, 0, .AfterScript
.AfterScript:
- end_if_just_battled
+ endifjustbattled
opentext
writetext BugCatcherBennyAfterBattleText
waitbutton
@@ -104,7 +104,7 @@
trainer BUG_CATCHER, AL, EVENT_BEAT_BUG_CATCHER_AL, BugCatcherAlSeenText, BugCatcherAlBeatenText, 0, .AfterScript
.AfterScript:
- end_if_just_battled
+ endifjustbattled
opentext
writetext BugCatcherAlAfterBattleText
waitbutton
@@ -115,7 +115,7 @@
trainer BUG_CATCHER, JOSH, EVENT_BEAT_BUG_CATCHER_JOSH, BugCatcherJoshSeenText, BugCatcherJoshBeatenText, 0, .AfterScript
.AfterScript:
- end_if_just_battled
+ endifjustbattled
opentext
writetext BugCatcherJoshAfterBattleText
waitbutton
--- a/maps/BattleTower1F.asm
+++ b/maps/BattleTower1F.asm
@@ -18,10 +18,10 @@
iffalse .SkipEverything
writebyte BATTLETOWERACTION_GET_CHALLENGE_STATE ; copybytetovar sBattleTowerChallengeState
special BattleTowerAction
- if_equal $0, .SkipEverything
- if_equal $2, .priorityjump1
- if_equal $3, .SkipEverything
- if_equal $4, .SkipEverything
+ ifequal $0, .SkipEverything
+ ifequal $2, .priorityjump1
+ ifequal $3, .SkipEverything
+ ifequal $4, .SkipEverything
opentext
writetext Text_WeveBeenWaitingForYou
waitbutton
@@ -54,13 +54,13 @@
ReceptionistScript_0x9e3e2:
writebyte BATTLETOWERACTION_GET_CHALLENGE_STATE ; copybytetovar sBattleTowerChallengeState
special BattleTowerAction
- if_equal $3, Script_BeatenAllTrainers2 ; maps/BattleTowerBattleRoom.asm
+ ifequal $3, Script_BeatenAllTrainers2 ; maps/BattleTowerBattleRoom.asm
opentext
writetext Text_BattleTowerWelcomesYou
buttonsound
writebyte BATTLETOWERACTION_CHECK_EXPLANATION_READ ; if new save file: bit 1, [sBattleTowerSaveFileFlags]
special BattleTowerAction
- if_not_equal $0, Script_Menu_ChallengeExplanationCancel
+ ifnotequal $0, Script_Menu_ChallengeExplanationCancel
jump Script_BattleTowerIntroductionYesNo
Script_Menu_ChallengeExplanationCancel: ; 0x9e3fc
@@ -67,8 +67,8 @@
writetext Text_WantToGoIntoABattleRoom
writebyte TRUE
special Menu_ChallengeExplanationCancel
- if_equal 1, Script_ChooseChallenge
- if_equal 2, Script_BattleTowerExplanation
+ ifequal 1, Script_ChooseChallenge
+ ifequal 2, Script_BattleTowerExplanation
jump Script_BattleTowerHopeToServeYouAgain
Script_ChooseChallenge: ; 0x9e40f
@@ -75,7 +75,7 @@
writebyte BATTLETOWERACTION_RESETDATA ; ResetBattleTowerTrainerSRAM
special BattleTowerAction
special CheckForBattleTowerRules
- if_not_equal FALSE, Script_WaitButton
+ ifnotequal FALSE, Script_WaitButton
writetext Text_SaveBeforeEnteringBattleRoom
yesorno
iffalse Script_Menu_ChallengeExplanationCancel
@@ -86,8 +86,8 @@
writebyte BATTLETOWERACTION_SET_EXPLANATION_READ ; set 1, [sBattleTowerSaveFileFlags]
special BattleTowerAction
special BattleTowerRoomMenu
- if_equal $a, Script_Menu_ChallengeExplanationCancel
- if_not_equal $0, Script_MobileError
+ ifequal $a, Script_Menu_ChallengeExplanationCancel
+ ifnotequal $0, Script_MobileError
writebyte BATTLETOWERACTION_11
special BattleTowerAction
writetext Text_RightThisWayToYourBattleRoom
@@ -122,7 +122,7 @@
special BattleTowerAction
writebyte BATTLETOWERACTION_GIVEREWARD
special BattleTowerAction
- if_equal POTION, Script_YourPackIsStuffedFull
+ ifequal POTION, Script_YourPackIsStuffedFull
itemtotext USE_SCRIPT_VAR, MEM_BUFFER_1
giveitem ITEM_FROM_MEM, 5
writetext Text_PlayerGotFive
@@ -173,8 +173,8 @@
writebyte BATTLETOWERACTION_SET_EXPLANATION_READ
special BattleTowerAction
special Function1700ba
- if_equal $a, Script_Menu_ChallengeExplanationCancel
- if_not_equal $0, Script_MobileError
+ ifequal $a, Script_Menu_ChallengeExplanationCancel
+ ifnotequal $0, Script_MobileError
writetext Text_ReceivedAListOfLeadersOnTheHonorRoll
spriteface BATTLETOWER1F_RECEPTIONIST, LEFT
writetext Text_PleaseConfirmOnThisMonitor
@@ -186,15 +186,15 @@
UnreferencedScript_0x9e4ea:
writebyte BATTLETOWERACTION_LEVEL_CHECK
special BattleTowerAction
- if_not_equal $0, Script_APkmnLevelExceeds
+ ifnotequal $0, Script_APkmnLevelExceeds
writebyte BATTLETOWERACTION_UBERS_CHECK
special BattleTowerAction
- if_not_equal $0, Script_MayNotEnterABattleRoomUnderL70
+ ifnotequal $0, Script_MayNotEnterABattleRoomUnderL70
special CheckForBattleTowerRules
- if_not_equal FALSE, Script_WaitButton
+ ifnotequal FALSE, Script_WaitButton
writebyte BATTLETOWERACTION_05
special BattleTowerAction
- if_equal $0, .zero
+ ifequal $0, .zero
writetext Text_CantBeRegistered_PreviousRecordDeleted
jump continue
--- a/maps/BattleTowerBattleRoom.asm
+++ b/maps/BattleTowerBattleRoom.asm
@@ -33,9 +33,9 @@
special BattleTowerBattle ; calls predef startbattle
special FadeOutPalettes
reloadmap
- if_not_equal $0, Script_FailedBattleTowerChallenge
+ ifnotequal $0, Script_FailedBattleTowerChallenge
copybytetovar wNrOfBeatenBattleTowerTrainers ; wcf64
- if_equal BATTLETOWER_STREAK_LENGTH, Script_BeatenAllTrainers
+ ifequal BATTLETOWER_STREAK_LENGTH, Script_BeatenAllTrainers
applymovement BATTLETOWERBATTLEROOM_YOUNGSTER, MovementData_BattleTowerBattleRoomOpponentWalksOut
warpsound
disappear BATTLETOWERBATTLEROOM_YOUNGSTER
--- a/maps/BattleTowerHallway.asm
+++ b/maps/BattleTowerHallway.asm
@@ -36,14 +36,14 @@
; at least it should look like that
; because all warps lead to the same room
.WalkToChosenBattleRoom: ; 0x9f5dc
- if_equal 3, .L30L40
- if_equal 4, .L30L40
- if_equal 5, .L50L60
- if_equal 6, .L50L60
- if_equal 7, .L70L80
- if_equal 8, .L70L80
- if_equal 9, .L90L100
- if_equal 10, .L90L100
+ ifequal 3, .L30L40
+ ifequal 4, .L30L40
+ ifequal 5, .L50L60
+ ifequal 6, .L50L60
+ ifequal 7, .L70L80
+ ifequal 8, .L70L80
+ ifequal 9, .L90L100
+ ifequal 10, .L90L100
applymovement BATTLETOWERHALLWAY_RECEPTIONIST, MovementData_BattleTowerHallwayWalkTo1020Room
jump .EnterBattleRoom
--- a/maps/BillsFamilysHouse.asm
+++ b/maps/BillsFamilysHouse.asm
@@ -20,7 +20,7 @@
buttonsound
waitsfx
checkcode VAR_PARTYCOUNT
- if_equal PARTY_LENGTH, UnknownScript_0x54c13
+ ifequal PARTY_LENGTH, UnknownScript_0x54c13
writetext UnknownText_0x54dae
playsound SFX_CAUGHT_MON
waitsfx
@@ -72,8 +72,8 @@
iftrue UnknownScript_0x54c58
writetext UnknownText_0x54f9e
askforphonenumber PHONE_BILL
- if_equal PHONE_CONTACTS_FULL, UnknownScript_0x54c64
- if_equal PHONE_CONTACT_REFUSED, UnknownScript_0x54c5e
+ ifequal PHONE_CONTACTS_FULL, UnknownScript_0x54c64
+ ifequal PHONE_CONTACT_REFUSED, UnknownScript_0x54c5e
waitsfx
addcellnum PHONE_BILL
writetext UnknownText_0x54fd9
--- a/maps/BillsHouse.asm
+++ b/maps/BillsHouse.asm
@@ -37,7 +37,7 @@
scall .ExcitedToSee
special BillsGrandfather
iffalse .SaidNo
- if_not_equal LICKITUNG, .WrongPokemon
+ ifnotequal LICKITUNG, .WrongPokemon
scall .CorrectPokemon
setevent EVENT_SHOWED_LICKITUNG_TO_BILLS_GRANDPA
jump .ShowedLickitung
@@ -51,7 +51,7 @@
scall .ExcitedToSee
special BillsGrandfather
iffalse .SaidNo
- if_not_equal ODDISH, .WrongPokemon
+ ifnotequal ODDISH, .WrongPokemon
scall .CorrectPokemon
setevent EVENT_SHOWED_ODDISH_TO_BILLS_GRANDPA
jump .ShowedOddish
@@ -65,7 +65,7 @@
scall .ExcitedToSee
special BillsGrandfather
iffalse .SaidNo
- if_not_equal STARYU, .WrongPokemon
+ ifnotequal STARYU, .WrongPokemon
scall .CorrectPokemon
setevent EVENT_SHOWED_STARYU_TO_BILLS_GRANDPA
jump .ShowedStaryu
@@ -81,7 +81,7 @@
scall .ExcitedToSee
special BillsGrandfather
iffalse .SaidNo
- if_not_equal GROWLITHE, .WrongPokemon
+ ifnotequal GROWLITHE, .WrongPokemon
scall .CorrectPokemon
setevent EVENT_SHOWED_GROWLITHE_VULPIX_TO_BILLS_GRANDPA
jump .ShowedGrowlitheVulpix
@@ -95,7 +95,7 @@
scall .ExcitedToSee
special BillsGrandfather
iffalse .SaidNo
- if_not_equal VULPIX, .WrongPokemon
+ ifnotequal VULPIX, .WrongPokemon
scall .CorrectPokemon
setevent EVENT_SHOWED_GROWLITHE_VULPIX_TO_BILLS_GRANDPA
jump .ShowedGrowlitheVulpix
@@ -109,7 +109,7 @@
scall .ExcitedToSee
special BillsGrandfather
iffalse .SaidNo
- if_not_equal PICHU, .WrongPokemon
+ ifnotequal PICHU, .WrongPokemon
scall .CorrectPokemon
setevent EVENT_SHOWED_PICHU_TO_BILLS_GRANDPA
jump .ShowedPichu
--- a/maps/BlackthornCity.asm
+++ b/maps/BlackthornCity.asm
@@ -22,7 +22,7 @@
.Santos:
checkcode VAR_WEEKDAY
- if_equal SATURDAY, .SantosAppears
+ ifequal SATURDAY, .SantosAppears
disappear BLACKTHORNCITY_SANTOS
return
@@ -91,7 +91,7 @@
checkevent EVENT_GOT_SPELL_TAG_FROM_SANTOS
iftrue .Saturday
checkcode VAR_WEEKDAY
- if_not_equal SATURDAY, .NotSaturday
+ ifnotequal SATURDAY, .NotSaturday
checkevent EVENT_MET_SANTOS_OF_SATURDAY
iftrue .MetSantos
writetext MeetSantosText
--- a/maps/BlackthornGym1F.asm
+++ b/maps/BlackthornGym1F.asm
@@ -94,7 +94,7 @@
trainer COOLTRAINERM, PAUL, EVENT_BEAT_COOLTRAINERM_PAUL, CooltrainermPaulSeenText, CooltrainermPaulBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext CooltrainermPaulAfterBattleText
waitbutton
@@ -105,7 +105,7 @@
trainer COOLTRAINERM, MIKE, EVENT_BEAT_COOLTRAINERM_MIKE, CooltrainermMikeSeenText, CooltrainermMikeBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext CooltrainermMikeAfterBattleText
waitbutton
@@ -116,7 +116,7 @@
trainer COOLTRAINERF, LOLA, EVENT_BEAT_COOLTRAINERF_LOLA, CooltrainerfLolaSeenText, CooltrainerfLolaBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext CooltrainerfLolaAfterBattleText
waitbutton
--- a/maps/BlackthornGym2F.asm
+++ b/maps/BlackthornGym2F.asm
@@ -60,7 +60,7 @@
trainer COOLTRAINERM, CODY, EVENT_BEAT_COOLTRAINERM_CODY, CooltrainermCodySeenText, CooltrainermCodyBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext CooltrainermCodyAfterBattleText
waitbutton
@@ -71,7 +71,7 @@
trainer COOLTRAINERF, FRAN, EVENT_BEAT_COOLTRAINERF_FRAN, CooltrainerfFranSeenText, CooltrainerfFranBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext CooltrainerfFranAfterBattleText
waitbutton
--- a/maps/BluesHouse.asm
+++ b/maps/BluesHouse.asm
@@ -10,7 +10,7 @@
faceplayer
opentext
checkcode VAR_HOUR
- if_equal 15, .ThreePM
+ ifequal 15, .ThreePM
writetext DaisyHelloText
waitbutton
closetext
@@ -25,8 +25,8 @@
writetext DaisyWhichMonText
waitbutton
special DaisysGrooming
- if_equal $0, .Refused
- if_equal $1, .CantGroomEgg
+ ifequal $0, .Refused
+ ifequal $1, .CantGroomEgg
setflag ENGINE_DAISYS_GROOMING
writetext DaisyAlrightText
waitbutton
--- a/maps/BurnedTowerB1F.asm
+++ b/maps/BurnedTowerB1F.asm
@@ -104,7 +104,7 @@
waitbutton
closetext
checkcode VAR_FACING
- if_equal UP, .Movement
+ ifequal UP, .Movement
applymovement BURNEDTOWERB1F_EUSINE, BurnedTowerB1FEusineMovement1
jump UnknownScript_0x18622a
--- a/maps/CeladonDeptStore6F.asm
+++ b/maps/CeladonDeptStore6F.asm
@@ -26,15 +26,15 @@
loadmenuheader .MenuHeader
verticalmenu
closewindow
- if_equal 1, .FreshWater
- if_equal 2, .SodaPop
- if_equal 3, .Lemonade
+ ifequal 1, .FreshWater
+ ifequal 2, .SodaPop
+ ifequal 3, .Lemonade
closetext
end
.FreshWater:
checkmoney YOUR_MONEY, 200
- if_equal HAVE_LESS, .NotEnoughMoney
+ ifequal HAVE_LESS, .NotEnoughMoney
giveitem FRESH_WATER
iffalse .NotEnoughSpace
takemoney YOUR_MONEY, 200
@@ -43,7 +43,7 @@
.SodaPop:
checkmoney YOUR_MONEY, 300
- if_equal HAVE_LESS, .NotEnoughMoney
+ ifequal HAVE_LESS, .NotEnoughMoney
giveitem SODA_POP
iffalse .NotEnoughSpace
takemoney YOUR_MONEY, 300
@@ -52,7 +52,7 @@
.Lemonade:
checkmoney YOUR_MONEY, 350
- if_equal HAVE_LESS, .NotEnoughMoney
+ ifequal HAVE_LESS, .NotEnoughMoney
giveitem LEMONADE
iffalse .NotEnoughSpace
takemoney YOUR_MONEY, 350
--- a/maps/CeladonGameCorner.asm
+++ b/maps/CeladonGameCorner.asm
@@ -57,7 +57,7 @@
checkitem COIN_CASE
iffalse .NoCoinCase
checkcoins MAX_COINS - 1
- if_equal HAVE_MORE, .FullCoinCase
+ ifequal HAVE_MORE, .FullCoinCase
stringtotext .coinname, MEM_BUFFER_1
scall .GiveCoins
givecoins 18
@@ -110,7 +110,7 @@
CeladonGameCornerLuckySlotMachineScript:
random 6
- if_equal 0, CeladonGameCornerSlotMachineScript
+ ifequal 0, CeladonGameCornerSlotMachineScript
refreshscreen
writebyte FALSE
special SlotMachine
--- a/maps/CeladonGameCornerPrizeRoom.asm
+++ b/maps/CeladonGameCornerPrizeRoom.asm
@@ -26,14 +26,14 @@
loadmenuheader CeladonPrizeRoom_TMMenuHeader
verticalmenu
closewindow
- if_equal 1, .doubleteam
- if_equal 2, .psychic
- if_equal 3, .hyperbeam
+ ifequal 1, .doubleteam
+ ifequal 2, .psychic
+ ifequal 3, .hyperbeam
jump CeladonPrizeRoom_cancel
.doubleteam
checkcoins 1500
- if_equal HAVE_LESS, CeladonPrizeRoom_notenoughcoins
+ ifequal HAVE_LESS, CeladonPrizeRoom_notenoughcoins
itemtotext TM_DOUBLE_TEAM, MEM_BUFFER_0
scall CeladonPrizeRoom_askbuy
iffalse CeladonPrizeRoom_cancel
@@ -44,7 +44,7 @@
.psychic
checkcoins 3500
- if_equal HAVE_LESS, CeladonPrizeRoom_notenoughcoins
+ ifequal HAVE_LESS, CeladonPrizeRoom_notenoughcoins
itemtotext TM_PSYCHIC_M, MEM_BUFFER_0
scall CeladonPrizeRoom_askbuy
iffalse CeladonPrizeRoom_cancel
@@ -55,7 +55,7 @@
.hyperbeam
checkcoins 7500
- if_equal HAVE_LESS, CeladonPrizeRoom_notenoughcoins
+ ifequal HAVE_LESS, CeladonPrizeRoom_notenoughcoins
itemtotext TM_HYPER_BEAM, MEM_BUFFER_0
scall CeladonPrizeRoom_askbuy
iffalse CeladonPrizeRoom_cancel
@@ -127,16 +127,16 @@
loadmenuheader .MenuHeader
verticalmenu
closewindow
- if_equal 1, .pikachu
- if_equal 2, .porygon
- if_equal 3, .larvitar
+ ifequal 1, .pikachu
+ ifequal 2, .porygon
+ ifequal 3, .larvitar
jump CeladonPrizeRoom_cancel
.pikachu
checkcoins 2222
- if_equal HAVE_LESS, CeladonPrizeRoom_notenoughcoins
+ ifequal HAVE_LESS, CeladonPrizeRoom_notenoughcoins
checkcode VAR_PARTYCOUNT
- if_equal PARTY_LENGTH, CeladonPrizeRoom_notenoughroom
+ ifequal PARTY_LENGTH, CeladonPrizeRoom_notenoughroom
pokenamemem PIKACHU, MEM_BUFFER_0
scall CeladonPrizeRoom_askbuy
iffalse CeladonPrizeRoom_cancel
@@ -152,9 +152,9 @@
.porygon
checkcoins 5555
- if_equal HAVE_LESS, CeladonPrizeRoom_notenoughcoins
+ ifequal HAVE_LESS, CeladonPrizeRoom_notenoughcoins
checkcode VAR_PARTYCOUNT
- if_equal PARTY_LENGTH, CeladonPrizeRoom_notenoughroom
+ ifequal PARTY_LENGTH, CeladonPrizeRoom_notenoughroom
pokenamemem PORYGON, MEM_BUFFER_0
scall CeladonPrizeRoom_askbuy
iffalse CeladonPrizeRoom_cancel
@@ -170,9 +170,9 @@
.larvitar
checkcoins 8888
- if_equal HAVE_LESS, CeladonPrizeRoom_notenoughcoins
+ ifequal HAVE_LESS, CeladonPrizeRoom_notenoughcoins
checkcode VAR_PARTYCOUNT
- if_equal PARTY_LENGTH, CeladonPrizeRoom_notenoughroom
+ ifequal PARTY_LENGTH, CeladonPrizeRoom_notenoughroom
pokenamemem LARVITAR, MEM_BUFFER_0
scall CeladonPrizeRoom_askbuy
iffalse CeladonPrizeRoom_cancel
--- a/maps/CeladonGym.asm
+++ b/maps/CeladonGym.asm
@@ -51,7 +51,7 @@
trainer LASS, MICHELLE, EVENT_BEAT_LASS_MICHELLE, LassMichelleSeenText, LassMichelleBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext LassMichelleAfterBattleText
waitbutton
@@ -62,7 +62,7 @@
trainer PICNICKER, TANYA, EVENT_BEAT_PICNICKER_TANYA, PicnickerTanyaSeenText, PicnickerTanyaBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext PicnickerTanyaAfterBattleText
waitbutton
@@ -73,7 +73,7 @@
trainer BEAUTY, JULIA, EVENT_BEAT_BEAUTY_JULIA, BeautyJuliaSeenText, BeautyJuliaBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext BeautyJuliaAfterBattleText
waitbutton
@@ -84,7 +84,7 @@
trainer TWINS, JOANDZOE1, EVENT_BEAT_TWINS_JO_AND_ZOE, TwinsJoandzoe1SeenText, TwinsJoandzoe1BeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext TwinsJoandzoe1AfterBattleText
waitbutton
@@ -95,7 +95,7 @@
trainer TWINS, JOANDZOE2, EVENT_BEAT_TWINS_JO_AND_ZOE, TwinsJoandzoe2SeenText, TwinsJoandzoe2BeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext TwinsJoandzoe2AfterBattleText
waitbutton
--- a/maps/CeladonMansion3F.asm
+++ b/maps/CeladonMansion3F.asm
@@ -14,7 +14,7 @@
opentext
writetext UnknownText_0x716ce
checkcode VAR_DEXCAUGHT
- if_greater_than NUM_POKEMON - 2 - 1, UnknownScript_0x7167e ; ignore Mew and Celebi
+ ifgreater NUM_POKEMON - 2 - 1, UnknownScript_0x7167e ; ignore Mew and Celebi
waitbutton
closetext
end
--- a/maps/CeladonPokecenter1F.asm
+++ b/maps/CeladonPokecenter1F.asm
@@ -43,7 +43,7 @@
waitbutton
closetext
checkcode VAR_FACING
- if_equal UP, .Location1
+ ifequal UP, .Location1
applymovement CELADONPOKECENTER1F_EUSINE, .Movement1
jump .Continue
--- a/maps/CeruleanGym.asm
+++ b/maps/CeruleanGym.asm
@@ -87,7 +87,7 @@
trainer SWIMMERF, DIANA, EVENT_BEAT_SWIMMERF_DIANA, SwimmerfDianaSeenText, SwimmerfDianaBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext SwimmerfDianaAfterBattleText
waitbutton
@@ -98,7 +98,7 @@
trainer SWIMMERF, BRIANA, EVENT_BEAT_SWIMMERF_BRIANA, SwimmerfBrianaSeenText, SwimmerfBrianaBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext SwimmerfBrianaAfterBattleText
waitbutton
@@ -109,7 +109,7 @@
trainer SWIMMERM, PARKER, EVENT_BEAT_SWIMMERM_PARKER, SwimmermParkerSeenText, SwimmermParkerBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext SwimmermParkerAfterBattleText
waitbutton
--- a/maps/CianwoodGym.asm
+++ b/maps/CianwoodGym.asm
@@ -74,8 +74,8 @@
end
CianwoodGymActivateRockets:
- if_equal 7, .RadioTowerRockets
- if_equal 6, .GoldenrodRockets
+ ifequal 7, .RadioTowerRockets
+ ifequal 6, .GoldenrodRockets
end
.GoldenrodRockets:
@@ -88,7 +88,7 @@
trainer BLACKBELT_T, YOSHI, EVENT_BEAT_BLACKBELT_YOSHI, BlackbeltYoshiSeenText, BlackbeltYoshiBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext BlackbeltYoshiAfterText
waitbutton
@@ -99,7 +99,7 @@
trainer BLACKBELT_T, LAO, EVENT_BEAT_BLACKBELT_LAO, BlackbeltLaoSeenText, BlackbeltLaoBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext BlackbeltLaoAfterText
waitbutton
@@ -110,7 +110,7 @@
trainer BLACKBELT_T, NOB, EVENT_BEAT_BLACKBELT_NOB, BlackbeltNobSeenText, BlackbeltNobBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext BlackbeltNobAfterText
waitbutton
@@ -121,7 +121,7 @@
trainer BLACKBELT_T, LUNG, EVENT_BEAT_BLACKBELT_LUNG, BlackbeltLungSeenText, BlackbeltLungBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext BlackbeltLungAfterText
waitbutton
--- a/maps/DanceTheatre.asm
+++ b/maps/DanceTheatre.asm
@@ -18,7 +18,7 @@
trainer KIMONO_GIRL, NAOKO2, EVENT_BEAT_KIMONO_GIRL_NAOKO, KimonoGirlNaoko2SeenText, KimonoGirlNaoko2BeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext KimonoGirlNaoko2AfterBattleText
waitbutton
@@ -29,7 +29,7 @@
trainer KIMONO_GIRL, SAYO, EVENT_BEAT_KIMONO_GIRL_SAYO, KimonoGirlSayoSeenText, KimonoGirlSayoBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext KimonoGirlSayoAfterBattleText
waitbutton
@@ -40,7 +40,7 @@
trainer KIMONO_GIRL, ZUKI, EVENT_BEAT_KIMONO_GIRL_ZUKI, KimonoGirlZukiSeenText, KimonoGirlZukiBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext KimonoGirlZukiAfterBattleText
waitbutton
@@ -51,7 +51,7 @@
trainer KIMONO_GIRL, KUNI, EVENT_BEAT_KIMONO_GIRL_KUNI, KimonoGirlKuniSeenText, KimonoGirlKuniBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext KimonoGirlKuniAfterBattleText
waitbutton
@@ -62,7 +62,7 @@
trainer KIMONO_GIRL, MIKI, EVENT_BEAT_KIMONO_GIRL_MIKI, KimonoGirlMikiSeenText, KimonoGirlMikiBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext KimonoGirlMikiAfterBattleText
waitbutton
--- a/maps/DayCare.asm
+++ b/maps/DayCare.asm
@@ -29,7 +29,7 @@
buttonsound
closetext
checkcode VAR_PARTYCOUNT
- if_equal PARTY_LENGTH, .PartyFull
+ ifequal PARTY_LENGTH, .PartyFull
special GiveOddEgg
opentext
writetext DayCareText_GotOddEgg
--- a/maps/DragonShrine.asm
+++ b/maps/DragonShrine.asm
@@ -31,9 +31,9 @@
loadmenuheader DragonShrineQuestion1_MenuHeader
verticalmenu
closewindow
- if_equal 1, .RightAnswer
- if_equal 2, .WrongAnswer
- if_equal 3, .RightAnswer
+ ifequal 1, .RightAnswer
+ ifequal 2, .WrongAnswer
+ ifequal 3, .RightAnswer
end
.Question2:
@@ -43,9 +43,9 @@
loadmenuheader DragonShrineQuestion2_MenuHeader
verticalmenu
closewindow
- if_equal 1, .RightAnswer
- if_equal 2, .RightAnswer
- if_equal 3, .WrongAnswer
+ ifequal 1, .RightAnswer
+ ifequal 2, .RightAnswer
+ ifequal 3, .WrongAnswer
.Question3:
setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_4
writetext DragonShrineQuestion3Text
@@ -53,9 +53,9 @@
loadmenuheader DragonShrineQuestion3_MenuHeader
verticalmenu
closewindow
- if_equal 1, .WrongAnswer
- if_equal 2, .RightAnswer
- if_equal 3, .RightAnswer
+ ifequal 1, .WrongAnswer
+ ifequal 2, .RightAnswer
+ ifequal 3, .RightAnswer
.Question4:
setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_5
writetext DragonShrineQuestion4Text
@@ -63,9 +63,9 @@
loadmenuheader DragonShrineQuestion4_MenuHeader
verticalmenu
closewindow
- if_equal 1, .RightAnswer
- if_equal 2, .WrongAnswer
- if_equal 3, .RightAnswer
+ ifequal 1, .RightAnswer
+ ifequal 2, .WrongAnswer
+ ifequal 3, .RightAnswer
.Question5:
setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_6
writetext DragonShrineQuestion5Text
@@ -73,9 +73,9 @@
loadmenuheader DragonShrineQuestion5_MenuHeader
verticalmenu
closewindow
- if_equal 1, .WrongAnswer
- if_equal 2, .RightAnswer
- if_equal 3, .WrongAnswer
+ ifequal 1, .WrongAnswer
+ ifequal 2, .RightAnswer
+ ifequal 3, .WrongAnswer
.RightAnswer:
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_6
iftrue .PassedTheTest
@@ -209,7 +209,7 @@
writetext DragonShrineTakeThisDratiniText
waitbutton
checkcode VAR_PARTYCOUNT
- if_equal PARTY_LENGTH, .PartyFull
+ ifequal PARTY_LENGTH, .PartyFull
writetext DragonShrinePlayerReceivedDratiniText
playsound SFX_CAUGHT_MON
waitsfx
--- a/maps/DragonsDenB1F.asm
+++ b/maps/DragonsDenB1F.asm
@@ -31,8 +31,8 @@
.CheckDay:
checkcode VAR_WEEKDAY
- if_equal TUESDAY, .AppearSilver
- if_equal THURSDAY, .AppearSilver
+ ifequal TUESDAY, .AppearSilver
+ ifequal THURSDAY, .AppearSilver
disappear DRAGONSDENB1F_SILVER
return
@@ -85,7 +85,7 @@
trainer COOLTRAINERM, DARIN, EVENT_BEAT_COOLTRAINERM_DARIN, CooltrainermDarinSeenText, CooltrainermDarinBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext CooltrainermDarinAfterBattleText
waitbutton
@@ -96,7 +96,7 @@
trainer COOLTRAINERF, CARA, EVENT_BEAT_COOLTRAINERF_CARA, CooltrainerfCaraSeenText, CooltrainerfCaraBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext CooltrainerfCaraAfterBattleText
waitbutton
@@ -107,7 +107,7 @@
trainer TWINS, LEAANDPIA1, EVENT_BEAT_TWINS_LEA_AND_PIA, TwinsLeaandpia1SeenText, TwinsLeaandpia1BeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext TwinsLeaandpia1AfterBattleText
waitbutton
@@ -118,7 +118,7 @@
trainer TWINS, LEAANDPIA1, EVENT_BEAT_TWINS_LEA_AND_PIA, TwinsLeaandpia2SeenText, TwinsLeaandpia2BeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext TwinsLeaandpia2AfterBattleText
waitbutton
--- a/maps/EarlsPokemonAcademy.asm
+++ b/maps/EarlsPokemonAcademy.asm
@@ -67,11 +67,11 @@
loadmenuheader .BlackboardMenuHeader
_2dmenu
closewindow
- if_equal 1, .Poison
- if_equal 2, .Paralysis
- if_equal 3, .Sleep
- if_equal 4, .Burn
- if_equal 5, .Freeze
+ ifequal 1, .Poison
+ ifequal 2, .Paralysis
+ ifequal 3, .Sleep
+ ifequal 4, .Burn
+ ifequal 5, .Freeze
closetext
end
--- a/maps/EcruteakGym.asm
+++ b/maps/EcruteakGym.asm
@@ -69,8 +69,8 @@
end
EcruteakGymActivateRockets:
- if_equal 7, .RadioTowerRockets
- if_equal 6, .GoldenrodRockets
+ ifequal 7, .RadioTowerRockets
+ ifequal 6, .GoldenrodRockets
end
.GoldenrodRockets:
@@ -99,7 +99,7 @@
trainer SAGE, JEFFREY, EVENT_BEAT_SAGE_JEFFREY, SageJeffreySeenText, SageJeffreyBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext SageJeffreyAfterBattleText
waitbutton
@@ -110,7 +110,7 @@
trainer SAGE, PING, EVENT_BEAT_SAGE_PING, SagePingSeenText, SagePingBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext SagePingAfterBattleText
waitbutton
@@ -121,7 +121,7 @@
trainer MEDIUM, MARTHA, EVENT_BEAT_MEDIUM_MARTHA, MediumMarthaSeenText, MediumMarthaBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext MediumMarthaAfterBattleText
waitbutton
@@ -132,7 +132,7 @@
trainer MEDIUM, GRACE, EVENT_BEAT_MEDIUM_GRACE, MediumGraceSeenText, MediumGraceBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext MediumGraceAfterBattleText
waitbutton
--- a/maps/ElmsLab.asm
+++ b/maps/ElmsLab.asm
@@ -181,7 +181,7 @@
givepoke CYNDAQUIL, 5, BERRY
closetext
checkcode VAR_FACING
- if_equal RIGHT, ElmDirectionsScript
+ ifequal RIGHT, ElmDirectionsScript
applymovement PLAYER, AfterCyndaquilMovement
jump ElmDirectionsScript
@@ -420,19 +420,19 @@
ElmJumpBackScript1:
closetext
checkcode VAR_FACING
- if_equal DOWN, ElmJumpDownScript
- if_equal UP, ElmJumpUpScript
- if_equal LEFT, ElmJumpLeftScript
- if_equal RIGHT, ElmJumpRightScript
+ ifequal DOWN, ElmJumpDownScript
+ ifequal UP, ElmJumpUpScript
+ ifequal LEFT, ElmJumpLeftScript
+ ifequal RIGHT, ElmJumpRightScript
end
ElmJumpBackScript2:
closetext
checkcode VAR_FACING
- if_equal DOWN, ElmJumpUpScript
- if_equal UP, ElmJumpDownScript
- if_equal LEFT, ElmJumpRightScript
- if_equal RIGHT, ElmJumpLeftScript
+ ifequal DOWN, ElmJumpUpScript
+ ifequal UP, ElmJumpDownScript
+ ifequal LEFT, ElmJumpRightScript
+ ifequal RIGHT, ElmJumpLeftScript
end
ElmJumpUpScript:
--- a/maps/FastShip1F.asm
+++ b/maps/FastShip1F.asm
@@ -88,7 +88,7 @@
.LetThePlayerOut:
checkcode VAR_FACING
- if_equal RIGHT, .YouAreFacingRight
+ ifequal RIGHT, .YouAreFacingRight
applymovement FASTSHIP1F_SAILOR1, MovementData_0x7520e
applymovement PLAYER, MovementData_0x75235
end
--- a/maps/FastShipB1F.asm
+++ b/maps/FastShipB1F.asm
@@ -95,7 +95,7 @@
trainer SAILOR, JEFF, EVENT_BEAT_SAILOR_JEFF, SailorJeffSeenText, SailorJeffBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext SailorJeffAfterBattleText
waitbutton
@@ -106,7 +106,7 @@
trainer PICNICKER, DEBRA, EVENT_BEAT_PICNICKER_DEBRA, PicnickerDebraSeenText, PicnickerDebraBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext PicnickerDebraAfterBattleText
waitbutton
@@ -117,7 +117,7 @@
trainer JUGGLER, FRITZ, EVENT_BEAT_JUGGLER_FRITZ, JugglerFritzSeenText, JugglerFritzBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext JugglerFritzAfterBattleText
waitbutton
@@ -128,7 +128,7 @@
trainer SAILOR, GARRETT, EVENT_BEAT_SAILOR_GARRETT, SailorGarrettSeenText, SailorGarrettBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext SailorGarrettAfterBattleText
waitbutton
@@ -139,7 +139,7 @@
trainer FISHER, JONAH, EVENT_BEAT_FISHER_JONAH, FisherJonahSeenText, FisherJonahBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext FisherJonahAfterBattleText
waitbutton
@@ -150,7 +150,7 @@
trainer BLACKBELT_T, WAI, EVENT_BEAT_BLACKBELT_WAI, BlackbeltWaiSeenText, BlackbeltWaiBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext BlackbeltWaiAfterBattleText
waitbutton
@@ -161,7 +161,7 @@
trainer SAILOR, KENNETH, EVENT_BEAT_SAILOR_KENNETH, SailorKennethSeenText, SailorKennethBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext SailorKennethAfterBattleText
waitbutton
@@ -172,7 +172,7 @@
trainer TEACHER, SHIRLEY, EVENT_BEAT_TEACHER_SHIRLEY, TeacherShirleySeenText, TeacherShirleyBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext TeacherShirleyAfterBattleText
waitbutton
@@ -183,7 +183,7 @@
trainer SCHOOLBOY, NATE, EVENT_BEAT_SCHOOLBOY_NATE, SchoolboyNateSeenText, SchoolboyNateBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext SchoolboyNateAfterBattleText
waitbutton
@@ -194,7 +194,7 @@
trainer SCHOOLBOY, RICKY, EVENT_BEAT_SCHOOLBOY_RICKY, SchoolboyRickySeenText, SchoolboyRickyBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext SchoolboyRickyAfterBattleText
waitbutton
--- a/maps/FastShipCabins_NNW_NNE_NE.asm
+++ b/maps/FastShipCabins_NNW_NNE_NE.asm
@@ -16,7 +16,7 @@
trainer COOLTRAINERM, SEAN, EVENT_BEAT_COOLTRAINERM_SEAN, CooltrainermSeanSeenText, CooltrainermSeanBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext CooltrainermSeanAfterBattleText
waitbutton
@@ -27,7 +27,7 @@
trainer COOLTRAINERF, CAROL, EVENT_BEAT_COOLTRAINERF_CAROL, CooltrainerfCarolSeenText, CooltrainerfCarolBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext CooltrainerfCarolAfterBattleText
waitbutton
@@ -38,7 +38,7 @@
trainer POKEMANIAC, ETHAN, EVENT_BEAT_POKEMANIAC_ETHAN, PokemaniacEthanSeenText, PokemaniacEthanBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext PokemaniacEthanAfterBattleText
waitbutton
@@ -49,7 +49,7 @@
trainer HIKER, NOLAND, EVENT_BEAT_HIKER_NOLAND, HikerNolandSeenText, HikerNolandBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext HikerNolandAfterBattleText
waitbutton
@@ -60,7 +60,7 @@
trainer GENTLEMAN, EDWARD, EVENT_BEAT_GENTLEMAN_EDWARD, GentlemanEdwardSeenText, GentlemanEdwardBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext GentlemanEdwardAfterBattleText
waitbutton
@@ -71,7 +71,7 @@
trainer BURGLAR, COREY, EVENT_BEAT_BURGLAR_COREY, BurglarCoreySeenText, BurglarCoreyBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext BurglarCoreyAfterBattleText
waitbutton
@@ -98,7 +98,7 @@
setevent EVENT_FAST_SHIP_LAZY_SAILOR
setmapscene FAST_SHIP_B1F, SCENE_FINISHED
checkcode VAR_FACING
- if_equal RIGHT, UnknownScript_0x75629
+ ifequal RIGHT, UnknownScript_0x75629
applymovement FASTSHIPCABINS_NNW_NNE_NE_SAILOR, MovementData_0x75637
playsound SFX_EXIT_BUILDING
disappear FASTSHIPCABINS_NNW_NNE_NE_SAILOR
--- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
+++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
@@ -142,7 +142,7 @@
trainer POKEFANM, COLIN, EVENT_BEAT_POKEFANM_COLIN, PokefanmColinSeenText, PokefanmColinBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext PokefanmColinAfterBattleText
waitbutton
@@ -153,7 +153,7 @@
trainer TWINS, MEGANDPEG1, EVENT_BEAT_TWINS_MEG_AND_PEG, TwinsMegandpeg1SeenText, TwinsMegandpeg1BeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext TwinsMegandpeg1AfterBattleText
waitbutton
@@ -164,7 +164,7 @@
trainer TWINS, MEGANDPEG2, EVENT_BEAT_TWINS_MEG_AND_PEG, TwinsMegandpeg2SeenText, TwinsMegandpeg2BeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext TwinsMegandpeg2AfterBattleText
waitbutton
@@ -175,7 +175,7 @@
trainer PSYCHIC_T, RODNEY, EVENT_BEAT_PSYCHIC_RODNEY, PsychicRodneySeenText, PsychicRodneyBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext PsychicRodneyAfterBattleText
waitbutton
@@ -186,7 +186,7 @@
trainer POKEFANM, JEREMY, EVENT_BEAT_POKEFANM_JEREMY, PokefanmJeremySeenText, PokefanmJeremyBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext PokefanmJeremyAfterBattleText
waitbutton
@@ -197,7 +197,7 @@
trainer POKEFANF, GEORGIA, EVENT_BEAT_POKEFANF_GEORGIA, PokefanfGeorgiaSeenText, PokefanfGeorgiaBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext PokefanfGeorgiaAfterBattleText
waitbutton
@@ -208,7 +208,7 @@
trainer SUPER_NERD, SHAWN, EVENT_BEAT_SUPER_NERD_SHAWN, SupernerdShawnSeenText, SupernerdShawnBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext SupernerdShawnAfterBattleText
waitbutton
--- a/maps/FastShipCabins_SW_SSW_NW.asm
+++ b/maps/FastShipCabins_SW_SSW_NW.asm
@@ -13,7 +13,7 @@
trainer FIREBREATHER, LYLE, EVENT_BEAT_FIREBREATHER_LYLE, FirebreatherLyleSeenText, FirebreatherLyleBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext FirebreatherLyleAfterBattleText
waitbutton
@@ -24,7 +24,7 @@
trainer BUG_CATCHER, KEN, EVENT_BEAT_BUG_CATCHER_KEN, BugCatcherKenSeenText, BugCatcherKenBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext BugCatcherKenAfterBattleText
waitbutton
@@ -35,7 +35,7 @@
trainer BEAUTY, CASSIE, EVENT_BEAT_BEAUTY_CASSIE, BeautyCassieSeenText, BeautyCassieBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext BeautyCassieAfterBattleText
waitbutton
@@ -46,7 +46,7 @@
trainer GUITARIST, CLYDE, EVENT_BEAT_GUITARIST_CLYDE, GuitaristClydeSeenText, GuitaristClydeBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
special Mobile_DummyReturnFalse
iftrue .mobile
opentext
--- a/maps/GoldenrodCity.asm
+++ b/maps/GoldenrodCity.asm
@@ -37,8 +37,8 @@
checkitem COIN_CASE
iffalse .MoveTutorDisappear
checkcode VAR_WEEKDAY
- if_equal WEDNESDAY, .MoveTutorAppear
- if_equal SATURDAY, .MoveTutorAppear
+ ifequal WEDNESDAY, .MoveTutorAppear
+ ifequal SATURDAY, .MoveTutorAppear
.MoveTutorDisappear:
disappear GOLDENRODCITY_POKEFAN_M2
return
@@ -61,14 +61,14 @@
yesorno
iffalse .Refused2
checkcoins 4000
- if_equal HAVE_LESS, .NotEnoughMoney
+ ifequal HAVE_LESS, .NotEnoughMoney
writetext UnknownText_0x1990ce
loadmenuheader .MoveMenuHeader
verticalmenu
closewindow
- if_equal MOVETUTOR_FLAMETHROWER, .Flamethrower
- if_equal MOVETUTOR_THUNDERBOLT, .Thunderbolt
- if_equal MOVETUTOR_ICE_BEAM, .IceBeam
+ ifequal MOVETUTOR_FLAMETHROWER, .Flamethrower
+ ifequal MOVETUTOR_THUNDERBOLT, .Thunderbolt
+ ifequal MOVETUTOR_ICE_BEAM, .IceBeam
jump .Incompatible
.Flamethrower:
@@ -75,7 +75,7 @@
writebyte MOVETUTOR_FLAMETHROWER
writetext UnknownText_0x1991cf
special MoveTutor
- if_equal FALSE, .TeachMove
+ ifequal FALSE, .TeachMove
jump .Incompatible
.Thunderbolt:
@@ -82,7 +82,7 @@
writebyte MOVETUTOR_THUNDERBOLT
writetext UnknownText_0x1991cf
special MoveTutor
- if_equal FALSE, .TeachMove
+ ifequal FALSE, .TeachMove
jump .Incompatible
.IceBeam:
@@ -89,7 +89,7 @@
writebyte MOVETUTOR_ICE_BEAM
writetext UnknownText_0x1991cf
special MoveTutor
- if_equal FALSE, .TeachMove
+ ifequal FALSE, .TeachMove
jump .Incompatible
.MoveMenuHeader:
@@ -129,7 +129,7 @@
waitbutton
closetext
checkcode VAR_FACING
- if_equal LEFT, .WalkAroundPlayer
+ ifequal LEFT, .WalkAroundPlayer
applymovement GOLDENRODCITY_POKEFAN_M2, MovementData_0x198a5f
jump .GoInside
--- a/maps/GoldenrodDeptStore5F.asm
+++ b/maps/GoldenrodDeptStore5F.asm
@@ -14,7 +14,7 @@
.CheckIfSunday:
checkcode VAR_WEEKDAY
- if_equal SUNDAY, .yes
+ ifequal SUNDAY, .yes
disappear GOLDENRODDEPTSTORE5F_RECEPTIONIST
return
@@ -60,14 +60,14 @@
faceplayer
opentext
checkcode VAR_WEEKDAY
- if_not_equal SUNDAY, .EventIsOver
+ ifnotequal SUNDAY, .EventIsOver
checkflag ENGINE_GOLDENROD_DEPT_STORE_TM27_RETURN
iftrue .EventIsOver
special GetFirstPokemonHappiness
writetext UnknownText_0x56143
buttonsound
- if_greater_than 150 - 1, .VeryHappy
- if_greater_than 50 - 1, .SomewhatHappy
+ ifgreater 150 - 1, .VeryHappy
+ ifgreater 50 - 1, .SomewhatHappy
jump .NotVeryHappy
.VeryHappy:
@@ -105,7 +105,7 @@
faceplayer
opentext
special GameboyCheck
- if_not_equal GBCHECK_CGB, .NotGBC ; This is a dummy check from Gold/Silver
+ ifnotequal GBCHECK_CGB, .NotGBC ; This is a dummy check from Gold/Silver
writetext UnknownText_0x56241
waitbutton
closetext
--- a/maps/GoldenrodDeptStore6F.asm
+++ b/maps/GoldenrodDeptStore6F.asm
@@ -15,15 +15,15 @@
loadmenuheader .MenuHeader
verticalmenu
closewindow
- if_equal 1, .FreshWater
- if_equal 2, .SodaPop
- if_equal 3, .Lemonade
+ ifequal 1, .FreshWater
+ ifequal 2, .SodaPop
+ ifequal 3, .Lemonade
closetext
end
.FreshWater:
checkmoney YOUR_MONEY, 200
- if_equal HAVE_LESS, .NotEnoughMoney
+ ifequal HAVE_LESS, .NotEnoughMoney
giveitem FRESH_WATER
iffalse .NotEnoughSpace
takemoney YOUR_MONEY, 200
@@ -32,7 +32,7 @@
.SodaPop:
checkmoney YOUR_MONEY, 300
- if_equal HAVE_LESS, .NotEnoughMoney
+ ifequal HAVE_LESS, .NotEnoughMoney
giveitem SODA_POP
iffalse .NotEnoughSpace
takemoney YOUR_MONEY, 300
@@ -41,7 +41,7 @@
.Lemonade:
checkmoney YOUR_MONEY, 350
- if_equal HAVE_LESS, .NotEnoughMoney
+ ifequal HAVE_LESS, .NotEnoughMoney
giveitem LEMONADE
iffalse .NotEnoughSpace
takemoney YOUR_MONEY, 350
--- a/maps/GoldenrodGameCorner.asm
+++ b/maps/GoldenrodGameCorner.asm
@@ -24,8 +24,8 @@
checkitem COIN_CASE
iffalse .move_tutor_inside
checkcode VAR_WEEKDAY
- if_equal WEDNESDAY, .move_tutor_outside
- if_equal SATURDAY, .move_tutor_outside
+ ifequal WEDNESDAY, .move_tutor_outside
+ ifequal SATURDAY, .move_tutor_outside
.move_tutor_inside
appear GOLDENRODGAMECORNER_POKEFAN_M3
return
@@ -62,14 +62,14 @@
loadmenuheader GoldenrodGameCornerTMVendorMenuHeader
verticalmenu
closewindow
- if_equal 1, .Thunder
- if_equal 2, .Blizzard
- if_equal 3, .FireBlast
+ ifequal 1, .Thunder
+ ifequal 2, .Blizzard
+ ifequal 3, .FireBlast
jump GoldenrodGameCornerPrizeVendor_CancelPurchaseScript
.Thunder:
checkcoins 5500
- if_equal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript
+ ifequal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript
itemtotext TM_THUNDER, MEM_BUFFER_0
scall GoldenrodGameCornerPrizeVendor_ConfirmPurchaseScript
iffalse GoldenrodGameCornerPrizeVendor_CancelPurchaseScript
@@ -80,7 +80,7 @@
.Blizzard:
checkcoins 5500
- if_equal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript
+ ifequal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript
itemtotext TM_BLIZZARD, MEM_BUFFER_0
scall GoldenrodGameCornerPrizeVendor_ConfirmPurchaseScript
iffalse GoldenrodGameCornerPrizeVendor_CancelPurchaseScript
@@ -91,7 +91,7 @@
.FireBlast:
checkcoins 5500
- if_equal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript
+ ifequal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript
itemtotext TM_FIRE_BLAST, MEM_BUFFER_0
scall GoldenrodGameCornerPrizeVendor_ConfirmPurchaseScript
iffalse GoldenrodGameCornerPrizeVendor_CancelPurchaseScript
@@ -163,16 +163,16 @@
loadmenuheader .MenuHeader
verticalmenu
closewindow
- if_equal 1, .abra
- if_equal 2, .cubone
- if_equal 3, .wobbuffet
+ ifequal 1, .abra
+ ifequal 2, .cubone
+ ifequal 3, .wobbuffet
jump GoldenrodGameCornerPrizeVendor_CancelPurchaseScript
.abra
checkcoins 100
- if_equal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript
+ ifequal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript
checkcode VAR_PARTYCOUNT
- if_equal PARTY_LENGTH, GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript
+ ifequal PARTY_LENGTH, GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript
pokenamemem ABRA, MEM_BUFFER_0
scall GoldenrodGameCornerPrizeVendor_ConfirmPurchaseScript
iffalse GoldenrodGameCornerPrizeVendor_CancelPurchaseScript
@@ -188,9 +188,9 @@
.cubone
checkcoins 800
- if_equal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript
+ ifequal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript
checkcode VAR_PARTYCOUNT
- if_equal PARTY_LENGTH, GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript
+ ifequal PARTY_LENGTH, GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript
pokenamemem CUBONE, MEM_BUFFER_0
scall GoldenrodGameCornerPrizeVendor_ConfirmPurchaseScript
iffalse GoldenrodGameCornerPrizeVendor_CancelPurchaseScript
@@ -206,9 +206,9 @@
.wobbuffet
checkcoins 1500
- if_equal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript
+ ifequal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript
checkcode VAR_PARTYCOUNT
- if_equal PARTY_LENGTH, GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript
+ ifequal PARTY_LENGTH, GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript
pokenamemem WOBBUFFET, MEM_BUFFER_0
scall GoldenrodGameCornerPrizeVendor_ConfirmPurchaseScript
iffalse GoldenrodGameCornerPrizeVendor_CancelPurchaseScript
@@ -292,7 +292,7 @@
GoldenrodGameCornerSlotsMachineScript:
random 6
- if_equal 0, GoldenrodGameCornerLuckySlotsMachineScript
+ ifequal 0, GoldenrodGameCornerLuckySlotsMachineScript
refreshscreen
writebyte FALSE
special SlotMachine
--- a/maps/GoldenrodGym.asm
+++ b/maps/GoldenrodGym.asm
@@ -80,8 +80,8 @@
end
GoldenrodGymActivateRockets:
- if_equal 7, .RadioTowerRockets
- if_equal 6, .GoldenrodRockets
+ ifequal 7, .RadioTowerRockets
+ ifequal 6, .GoldenrodRockets
end
.GoldenrodRockets:
@@ -94,7 +94,7 @@
trainer LASS, CARRIE, EVENT_BEAT_LASS_CARRIE, LassCarrieSeenText, LassCarrieBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext LassCarrieAfterBattleText
waitbutton
@@ -118,7 +118,7 @@
trainer LASS, BRIDGET, EVENT_BEAT_LASS_BRIDGET, LassBridgetSeenText, LassBridgetBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext LassBridgetAfterBattleText
waitbutton
@@ -129,7 +129,7 @@
trainer BEAUTY, VICTORIA, EVENT_BEAT_BEAUTY_VICTORIA, BeautyVictoriaSeenText, BeautyVictoriaBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext BeautyVictoriaAfterBattleText
waitbutton
@@ -140,7 +140,7 @@
trainer BEAUTY, SAMANTHA, EVENT_BEAT_BEAUTY_SAMANTHA, BeautySamanthaSeenText, BeautySamanthaBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext BeautySamanthaAfterBattleText
waitbutton
--- a/maps/GoldenrodHappinessRater.asm
+++ b/maps/GoldenrodHappinessRater.asm
@@ -14,11 +14,11 @@
special GetFirstPokemonHappiness
writetext UnknownText_0x549a3
buttonsound
- if_greater_than 250 - 1, UnknownScript_0x54973
- if_greater_than 200 - 1, UnknownScript_0x54979
- if_greater_than 150 - 1, UnknownScript_0x5497f
- if_greater_than 100 - 1, UnknownScript_0x54985
- if_greater_than 50 - 1, UnknownScript_0x5498b
+ ifgreater 250 - 1, UnknownScript_0x54973
+ ifgreater 200 - 1, UnknownScript_0x54979
+ ifgreater 150 - 1, UnknownScript_0x5497f
+ ifgreater 100 - 1, UnknownScript_0x54985
+ ifgreater 50 - 1, UnknownScript_0x5498b
jump UnknownScript_0x54991
UnknownScript_0x54973:
--- a/maps/GoldenrodPokecenter1F.asm
+++ b/maps/GoldenrodPokecenter1F.asm
@@ -16,7 +16,7 @@
GoldenrodPokecenter1F_GSBallSceneLeft:
writebyte BATTLETOWERACTION_CHECKMOBILEEVENT
special BattleTowerAction
- if_equal MOBILE_EVENT_OBJECT_GS_BALL, .gsball
+ ifequal MOBILE_EVENT_OBJECT_GS_BALL, .gsball
end
.gsball
@@ -48,7 +48,7 @@
GoldenrodPokecenter1F_GSBallSceneRight:
writebyte BATTLETOWERACTION_CHECKMOBILEEVENT
special BattleTowerAction
- if_equal MOBILE_EVENT_OBJECT_GS_BALL, .gsball
+ ifequal MOBILE_EVENT_OBJECT_GS_BALL, .gsball
end
.gsball
--- a/maps/GoldenrodUnderground.asm
+++ b/maps/GoldenrodUnderground.asm
@@ -48,12 +48,12 @@
.CheckDayOfWeek:
checkcode VAR_WEEKDAY
- if_equal MONDAY, .Monday
- if_equal TUESDAY, .Tuesday
- if_equal WEDNESDAY, .Wednesday
- if_equal THURSDAY, .Thursday
- if_equal FRIDAY, .Friday
- if_equal SATURDAY, .Saturday
+ ifequal MONDAY, .Monday
+ ifequal TUESDAY, .Tuesday
+ ifequal WEDNESDAY, .Wednesday
+ ifequal THURSDAY, .Thursday
+ ifequal FRIDAY, .Friday
+ ifequal SATURDAY, .Saturday
.Sunday:
disappear GOLDENRODUNDERGROUND_GRAMPS
@@ -112,7 +112,7 @@
trainer SUPER_NERD, ERIC, EVENT_BEAT_SUPER_NERD_ERIC, SupernerdEricSeenText, SupernerdEricBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext SupernerdEricAfterBattleText
waitbutton
@@ -123,7 +123,7 @@
trainer SUPER_NERD, TERU, EVENT_BEAT_SUPER_NERD_TERU, SupernerdTeruSeenText, SupernerdTeruBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext SupernerdTeruAfterBattleText
waitbutton
@@ -134,7 +134,7 @@
trainer POKEMANIAC, ISSAC, EVENT_BEAT_POKEMANIAC_ISSAC, PokemaniacIssacSeenText, PokemaniacIssacBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext PokemaniacIssacAfterBattleText
waitbutton
@@ -145,7 +145,7 @@
trainer POKEMANIAC, DONALD, EVENT_BEAT_POKEMANIAC_DONALD, PokemaniacDonaldSeenText, PokemaniacDonaldBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext PokemaniacDonaldAfterBattleText
waitbutton
@@ -155,8 +155,8 @@
GrannyScript_0x7c132:
opentext
checkcode VAR_WEEKDAY
- if_equal SUNDAY, .Open
- if_equal SATURDAY, .Open
+ ifequal SUNDAY, .Open
+ ifequal SATURDAY, .Open
jump GoldenrodUndergroundScript_ShopClosed
.Open:
@@ -169,7 +169,7 @@
checkflag ENGINE_GOLDENROD_UNDERGROUND_MERCHANT_CLOSED
iftrue GoldenrodUndergroundScript_ShopClosed
checkcode VAR_WEEKDAY
- if_equal MONDAY, .CheckMorn
+ ifequal MONDAY, .CheckMorn
jump GoldenrodUndergroundScript_ShopClosed
.CheckMorn:
@@ -182,9 +182,9 @@
OlderHaircutBrotherScript:
opentext
checkcode VAR_WEEKDAY
- if_equal TUESDAY, .DoHaircut
- if_equal THURSDAY, .DoHaircut
- if_equal SATURDAY, .DoHaircut
+ ifequal TUESDAY, .DoHaircut
+ ifequal THURSDAY, .DoHaircut
+ ifequal SATURDAY, .DoHaircut
jump GoldenrodUndergroundScript_ShopClosed
.DoHaircut:
@@ -195,15 +195,15 @@
yesorno
iffalse .Refused
checkmoney YOUR_MONEY, 500
- if_equal HAVE_LESS, .NotEnoughMoney
+ ifequal HAVE_LESS, .NotEnoughMoney
writetext UnknownText_0x7c69a
buttonsound
special YoungerHaircutBrother
- if_equal $0, .Refused
- if_equal $1, .Refused
+ ifequal $0, .Refused
+ ifequal $1, .Refused
setflag ENGINE_GOLDENROD_UNDERGROUND_GOT_HAIRCUT
- if_equal $2, .two
- if_equal $3, .three
+ ifequal $2, .two
+ ifequal $3, .three
jump .else
.two
@@ -265,9 +265,9 @@
YoungerHaircutBrotherScript:
opentext
checkcode VAR_WEEKDAY
- if_equal SUNDAY, .DoHaircut
- if_equal WEDNESDAY, .DoHaircut
- if_equal FRIDAY, .DoHaircut
+ ifequal SUNDAY, .DoHaircut
+ ifequal WEDNESDAY, .DoHaircut
+ ifequal FRIDAY, .DoHaircut
jump GoldenrodUndergroundScript_ShopClosed
.DoHaircut:
@@ -278,15 +278,15 @@
yesorno
iffalse .Refused
checkmoney YOUR_MONEY, 300
- if_equal HAVE_LESS, .NotEnoughMoney
+ ifequal HAVE_LESS, .NotEnoughMoney
writetext UnknownText_0x7c7f1
buttonsound
special OlderHaircutBrother
- if_equal $0, .Refused
- if_equal $1, .Refused
+ ifequal $0, .Refused
+ ifequal $1, .Refused
setflag ENGINE_GOLDENROD_UNDERGROUND_GOT_HAIRCUT
- if_equal $2, .two
- if_equal $3, .three
+ ifequal $2, .two
+ ifequal $3, .three
jump .else
.two
--- a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm
+++ b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm
@@ -208,7 +208,7 @@
trainer GRUNTM, GRUNTM_11, EVENT_BEAT_ROCKET_GRUNTM_11, GruntM11SeenText, GruntM11BeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext GruntM11AfterBattleText
waitbutton
@@ -219,7 +219,7 @@
trainer GRUNTM, GRUNTM_25, EVENT_BEAT_ROCKET_GRUNTM_25, GruntM25SeenText, GruntM25BeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext GruntM25AfterBattleText
waitbutton
@@ -230,7 +230,7 @@
trainer BURGLAR, DUNCAN, EVENT_BEAT_BURGLAR_DUNCAN, BurglarDuncanSeenText, BurglarDuncanBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext BurglarDuncanAfterBattleText
waitbutton
@@ -241,7 +241,7 @@
trainer BURGLAR, EDDIE, EVENT_BEAT_BURGLAR_EDDIE, BurglarEddieSeenText, BurglarEddieBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext BurglarEddieAfterBattleText
waitbutton
@@ -252,7 +252,7 @@
trainer GRUNTM, GRUNTM_13, EVENT_BEAT_ROCKET_GRUNTM_13, GruntM13SeenText, GruntM13BeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext GruntM13AfterBattleText
waitbutton
@@ -263,7 +263,7 @@
trainer GRUNTF, GRUNTF_3, EVENT_BEAT_ROCKET_GRUNTF_3, GruntF3SeenText, GruntF3BeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext GruntF3AfterBattleText
waitbutton
@@ -380,14 +380,14 @@
GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors:
copybytetovar UndergroundSwitchPositions
- if_equal 0, .Position0
- if_equal 1, .Position1
- if_equal 2, .Position2
- if_equal 3, .Position3
- if_equal 4, .Position4
- if_equal 5, .Position5
- if_equal 6, .Position6
- if_equal 7, .EmergencyPosition
+ ifequal 0, .Position0
+ ifequal 1, .Position1
+ ifequal 2, .Position2
+ ifequal 3, .Position3
+ ifequal 4, .Position4
+ ifequal 5, .Position5
+ ifequal 6, .Position6
+ ifequal 7, .EmergencyPosition
.Position0:
playsound SFX_ENTER_DOOR
scall .Clear4
--- a/maps/GoldenrodUndergroundWarehouse.asm
+++ b/maps/GoldenrodUndergroundWarehouse.asm
@@ -37,7 +37,7 @@
trainer GRUNTM, GRUNTM_24, EVENT_BEAT_ROCKET_GRUNTM_24, GruntM24SeenText, GruntM24BeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext GruntM24AfterBattleText
waitbutton
@@ -48,7 +48,7 @@
trainer GRUNTM, GRUNTM_14, EVENT_BEAT_ROCKET_GRUNTM_14, GruntM14SeenText, GruntM14BeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext GruntM14AfterBattleText
waitbutton
@@ -59,7 +59,7 @@
trainer GRUNTM, GRUNTM_15, EVENT_BEAT_ROCKET_GRUNTM_15, GruntM15SeenText, GruntM15BeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext GruntM15AfterBattleText
waitbutton
--- a/maps/IlexForest.asm
+++ b/maps/IlexForest.asm
@@ -21,16 +21,16 @@
checkevent EVENT_GOT_HM01_CUT
iftrue .Static
copybytetovar FarfetchdPosition
- if_equal 1, .PositionOne
- if_equal 2, .PositionTwo
- if_equal 3, .PositionThree
- if_equal 4, .PositionFour
- if_equal 5, .PositionFive
- if_equal 6, .PositionSix
- if_equal 7, .PositionSeven
- if_equal 8, .PositionEight
- if_equal 9, .PositionNine
- if_equal 10, .PositionTen
+ ifequal 1, .PositionOne
+ ifequal 2, .PositionTwo
+ ifequal 3, .PositionThree
+ ifequal 4, .PositionFour
+ ifequal 5, .PositionFive
+ ifequal 6, .PositionSix
+ ifequal 7, .PositionSeven
+ ifequal 8, .PositionEight
+ ifequal 9, .PositionNine
+ ifequal 10, .PositionTen
.Static:
return
@@ -102,16 +102,16 @@
IlexForestFarfetchdScript:
copybytetovar FarfetchdPosition
- if_equal 1, .Position1
- if_equal 2, .Position2
- if_equal 3, .Position3
- if_equal 4, .Position4
- if_equal 5, .Position5
- if_equal 6, .Position6
- if_equal 7, .Position7
- if_equal 8, .Position8
- if_equal 9, .Position9
- if_equal 10, .Position10
+ ifequal 1, .Position1
+ ifequal 2, .Position2
+ ifequal 3, .Position3
+ ifequal 4, .Position4
+ ifequal 5, .Position5
+ ifequal 6, .Position6
+ ifequal 7, .Position7
+ ifequal 8, .Position8
+ ifequal 9, .Position9
+ ifequal 10, .Position10
.Position1:
faceplayer
@@ -131,7 +131,7 @@
.Position2:
scall .CryAndCheckFacing
- if_equal DOWN, .Position2_Down
+ ifequal DOWN, .Position2_Down
applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetchd_Pos2_Pos3
moveobject ILEXFOREST_FARFETCHD, 20, 24
disappear ILEXFOREST_FARFETCHD
@@ -149,7 +149,7 @@
.Position3:
scall .CryAndCheckFacing
- if_equal LEFT, .Position3_Left
+ ifequal LEFT, .Position3_Left
applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetchd_Pos3_Pos4
moveobject ILEXFOREST_FARFETCHD, 29, 22
disappear ILEXFOREST_FARFETCHD
@@ -167,7 +167,7 @@
.Position4:
scall .CryAndCheckFacing
- if_equal UP, .Position4_Up
+ ifequal UP, .Position4_Up
applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetchd_Pos4_Pos5
moveobject ILEXFOREST_FARFETCHD, 28, 31
disappear ILEXFOREST_FARFETCHD
@@ -185,9 +185,9 @@
.Position5:
scall .CryAndCheckFacing
- if_equal UP, .Position5_Up
- if_equal LEFT, .Position5_Left
- if_equal RIGHT, .Position5_Right
+ ifequal UP, .Position5_Up
+ ifequal LEFT, .Position5_Left
+ ifequal RIGHT, .Position5_Right
applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetchd_Pos5_Pos6
moveobject ILEXFOREST_FARFETCHD, 24, 35
disappear ILEXFOREST_FARFETCHD
@@ -221,7 +221,7 @@
.Position6:
scall .CryAndCheckFacing
- if_equal RIGHT, .Position6_Right
+ ifequal RIGHT, .Position6_Right
applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetched_Pos6_Pos7
moveobject ILEXFOREST_FARFETCHD, 22, 31
disappear ILEXFOREST_FARFETCHD
@@ -239,8 +239,8 @@
.Position7:
scall .CryAndCheckFacing
- if_equal DOWN, .Position7_Down
- if_equal LEFT, .Position7_Left
+ ifequal DOWN, .Position7_Down
+ ifequal LEFT, .Position7_Left
applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetched_Pos7_Pos8
moveobject ILEXFOREST_FARFETCHD, 15, 29
disappear ILEXFOREST_FARFETCHD
@@ -266,9 +266,9 @@
.Position8:
scall .CryAndCheckFacing
- if_equal UP, .Position8_Up
- if_equal LEFT, .Position8_Left
- if_equal RIGHT, .Position8_Right
+ ifequal UP, .Position8_Up
+ ifequal LEFT, .Position8_Left
+ ifequal RIGHT, .Position8_Right
applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetched_Pos8_Pos9
moveobject ILEXFOREST_FARFETCHD, 10, 35
disappear ILEXFOREST_FARFETCHD
@@ -295,8 +295,8 @@
.Position9:
scall .CryAndCheckFacing
- if_equal DOWN, .Position9_Down
- if_equal RIGHT, .Position9_Right
+ ifequal DOWN, .Position9_Down
+ ifequal RIGHT, .Position9_Right
applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetched_Pos9_Pos10
moveobject ILEXFOREST_FARFETCHD, 6, 28
disappear ILEXFOREST_FARFETCHD
@@ -389,7 +389,7 @@
trainer BUG_CATCHER, WAYNE, EVENT_BEAT_BUG_CATCHER_WAYNE, BugCatcherWayneSeenText, BugCatcherWayneBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext BugCatcherWayneAfterBattleText
waitbutton
--- a/maps/IndigoPlateauPokecenter1F.asm
+++ b/maps/IndigoPlateauPokecenter1F.asm
@@ -47,11 +47,11 @@
checkflag ENGINE_INDIGO_PLATEAU_RIVAL_FIGHT
iftrue PlateauRivalScriptDone
checkcode VAR_WEEKDAY
- if_equal SUNDAY, PlateauRivalScriptDone
- if_equal TUESDAY, PlateauRivalScriptDone
- if_equal THURSDAY, PlateauRivalScriptDone
- if_equal FRIDAY, PlateauRivalScriptDone
- if_equal SATURDAY, PlateauRivalScriptDone
+ ifequal SUNDAY, PlateauRivalScriptDone
+ ifequal TUESDAY, PlateauRivalScriptDone
+ ifequal THURSDAY, PlateauRivalScriptDone
+ ifequal FRIDAY, PlateauRivalScriptDone
+ ifequal SATURDAY, PlateauRivalScriptDone
moveobject INDIGOPLATEAUPOKECENTER1F_SILVER, 17, 9
appear INDIGOPLATEAUPOKECENTER1F_SILVER
spriteface PLAYER, DOWN
@@ -69,11 +69,11 @@
checkflag ENGINE_INDIGO_PLATEAU_RIVAL_FIGHT
iftrue PlateauRivalScriptDone
checkcode VAR_WEEKDAY
- if_equal SUNDAY, PlateauRivalScriptDone
- if_equal TUESDAY, PlateauRivalScriptDone
- if_equal THURSDAY, PlateauRivalScriptDone
- if_equal FRIDAY, PlateauRivalScriptDone
- if_equal SATURDAY, PlateauRivalScriptDone
+ ifequal SUNDAY, PlateauRivalScriptDone
+ ifequal TUESDAY, PlateauRivalScriptDone
+ ifequal THURSDAY, PlateauRivalScriptDone
+ ifequal FRIDAY, PlateauRivalScriptDone
+ ifequal SATURDAY, PlateauRivalScriptDone
appear INDIGOPLATEAUPOKECENTER1F_SILVER
spriteface PLAYER, DOWN
showemote EMOTE_SHOCK, PLAYER, 15
--- a/maps/KurtsHouse.asm
+++ b/maps/KurtsHouse.asm
@@ -45,7 +45,7 @@
special FadeOutMusic
setevent EVENT_AZALEA_TOWN_SLOWPOKETAIL_ROCKET
checkcode VAR_FACING
- if_equal UP, .RunAround
+ ifequal UP, .RunAround
spriteface PLAYER, DOWN
playsound SFX_FLY
applymovement KURTSHOUSE_KURT1, MovementData_0x18e466
@@ -130,13 +130,13 @@
buttonsound
setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3
special SelectApricornForKurt
- if_equal FALSE, .Cancel
- if_equal BLU_APRICORN, .Blu
- if_equal YLW_APRICORN, .Ylw
- if_equal GRN_APRICORN, .Grn
- if_equal WHT_APRICORN, .Wht
- if_equal BLK_APRICORN, .Blk
- if_equal PNK_APRICORN, .Pnk
+ ifequal FALSE, .Cancel
+ ifequal BLU_APRICORN, .Blu
+ ifequal YLW_APRICORN, .Ylw
+ ifequal GRN_APRICORN, .Grn
+ ifequal WHT_APRICORN, .Wht
+ ifequal BLK_APRICORN, .Blk
+ ifequal PNK_APRICORN, .Pnk
; .Red
setevent EVENT_GAVE_KURT_RED_APRICORN
jump .GaveKurtApricorns
@@ -293,7 +293,7 @@
pause 20
showemote EMOTE_SHOCK, KURTSHOUSE_KURT1, 30
checkcode VAR_FACING
- if_equal UP, .GSBallRunAround
+ ifequal UP, .GSBallRunAround
spriteface PLAYER, DOWN
playsound SFX_FLY
applymovement KURTSHOUSE_KURT1, MovementData_0x18e466
--- a/maps/LakeOfRage.asm
+++ b/maps/LakeOfRage.asm
@@ -33,7 +33,7 @@
.Wesley:
checkcode VAR_WEEKDAY
- if_equal WEDNESDAY, .WesleyAppears
+ ifequal WEDNESDAY, .WesleyAppears
disappear LAKEOFRAGE_WESLEY
return
@@ -87,7 +87,7 @@
loadwildmon GYARADOS, 30
writecode VAR_BATTLETYPE, BATTLETYPE_SHINY
startbattle
- if_equal $1, UnknownScript_0x7007a
+ ifequal $1, UnknownScript_0x7007a
disappear LAKEOFRAGE_GYARADOS
UnknownScript_0x7007a:
reloadmapafterbattle
@@ -147,7 +147,7 @@
trainer FISHER, ANDRE, EVENT_BEAT_FISHER_ANDRE, FisherAndreSeenText, FisherAndreBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext FisherAndreAfterBattleText
waitbutton
@@ -158,7 +158,7 @@
trainer FISHER, RAYMOND, EVENT_BEAT_FISHER_RAYMOND, FisherRaymondSeenText, FisherRaymondBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext FisherRaymondAfterBattleText
waitbutton
@@ -169,7 +169,7 @@
trainer COOLTRAINERM, AARON, EVENT_BEAT_COOLTRAINERM_AARON, CooltrainermAaronSeenText, CooltrainermAaronBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext CooltrainermAaronAfterBattleText
waitbutton
@@ -180,7 +180,7 @@
trainer COOLTRAINERF, LOIS, EVENT_BEAT_COOLTRAINERF_LOIS, CooltrainerfLoisSeenText, CooltrainerfLoisBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext CooltrainerfLoisAfterBattleText
waitbutton
@@ -193,7 +193,7 @@
checkevent EVENT_GOT_BLACKBELT_FROM_WESLEY
iftrue WesleyWednesdayScript
checkcode VAR_WEEKDAY
- if_not_equal WEDNESDAY, WesleyNotWednesdayScript
+ ifnotequal WEDNESDAY, WesleyNotWednesdayScript
checkevent EVENT_MET_WESLEY_OF_WEDNESDAY
iftrue .MetWesley
writetext MeetWesleyText
--- a/maps/LakeOfRageMagikarpHouse.asm
+++ b/maps/LakeOfRageMagikarpHouse.asm
@@ -43,9 +43,9 @@
writetext UnknownText_0x19a93e
waitbutton
special CheckMagikarpLength
- if_equal MAGIKARPLENGTH_NOT_MAGIKARP, UnknownScript_0x19a71c
- if_equal MAGIKARPLENGTH_REFUSED, UnknownScript_0x19a722
- if_equal MAGIKARPLENGTH_TOO_SHORT, UnknownScript_0x19a716
+ ifequal MAGIKARPLENGTH_NOT_MAGIKARP, UnknownScript_0x19a71c
+ ifequal MAGIKARPLENGTH_REFUSED, UnknownScript_0x19a722
+ ifequal MAGIKARPLENGTH_TOO_SHORT, UnknownScript_0x19a716
; MAGIKARPLENGTH_BEAT_RECORD
jump UnknownScript_0x19a6fe
--- a/maps/MahoganyGym.asm
+++ b/maps/MahoganyGym.asm
@@ -58,8 +58,8 @@
end
MahoganyGymActivateRockets:
- if_equal 7, .RadioTowerRockets
- if_equal 6, .GoldenrodRockets
+ ifequal 7, .RadioTowerRockets
+ ifequal 6, .GoldenrodRockets
end
.GoldenrodRockets:
@@ -72,7 +72,7 @@
trainer SKIER, ROXANNE, EVENT_BEAT_SKIER_ROXANNE, SkierRoxanneSeenText, SkierRoxanneBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext SkierRoxanneAfterBattleText
waitbutton
@@ -83,7 +83,7 @@
trainer SKIER, CLARISSA, EVENT_BEAT_SKIER_CLARISSA, SkierClarissaSeenText, SkierClarissaBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext SkierClarissaAfterBattleText
waitbutton
@@ -94,7 +94,7 @@
trainer BOARDER, RONALD, EVENT_BEAT_BOARDER_RONALD, BoarderRonaldSeenText, BoarderRonaldBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext BoarderRonaldAfterBattleText
waitbutton
@@ -105,7 +105,7 @@
trainer BOARDER, BRAD, EVENT_BEAT_BOARDER_BRAD, BoarderBradSeenText, BoarderBradBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext BoarderBradAfterBattleText
waitbutton
@@ -116,7 +116,7 @@
trainer BOARDER, DOUGLAS, EVENT_BEAT_BOARDER_DOUGLAS, BoarderDouglasSeenText, BoarderDouglasBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext BoarderDouglasAfterBattleText
waitbutton
--- a/maps/MahoganyTown.asm
+++ b/maps/MahoganyTown.asm
@@ -55,7 +55,7 @@
yesorno
iffalse UnknownScript_0x190072
checkmoney YOUR_MONEY, 300
- if_equal HAVE_LESS, UnknownScript_0x19006c
+ ifequal HAVE_LESS, UnknownScript_0x19006c
giveitem RAGECANDYBAR
iffalse UnknownScript_0x190078
waitsfx
--- a/maps/ManiasHouse.asm
+++ b/maps/ManiasHouse.asm
@@ -53,10 +53,10 @@
yesorno
iffalse .refused
special ReturnShuckle
- if_equal SHUCKIE_WRONG_MON, .wrong
- if_equal SHUCKIE_REFUSED, .refused
- if_equal SHUCKIE_HAPPY, .superhappy
- if_equal SHUCKIE_FAINTED, .default_postevent
+ ifequal SHUCKIE_WRONG_MON, .wrong
+ ifequal SHUCKIE_REFUSED, .refused
+ ifequal SHUCKIE_HAPPY, .superhappy
+ ifequal SHUCKIE_FAINTED, .default_postevent
; SHUCKIE_RETURNED
writetext ManiaText_ThankYou
waitbutton
--- a/maps/MobileBattleRoom.asm
+++ b/maps/MobileBattleRoom.asm
@@ -20,11 +20,11 @@
MapMobileBattleRoomSignpost0Script:
refreshscreen
special Function1037c2
- if_equal $1, .one
+ ifequal $1, .one
special Function1037eb
iffalse .false
- if_equal $1, .one_
- if_equal $2, .two_
+ ifequal $1, .one_
+ ifequal $2, .two_
jump .false
.one_
--- a/maps/MountMoonSquare.asm
+++ b/maps/MountMoonSquare.asm
@@ -26,7 +26,7 @@
checkflag ENGINE_MT_MOON_SQUARE_CLEFAIRY
iftrue .NoDancing
checkcode VAR_WEEKDAY
- if_not_equal MONDAY, .NoDancing
+ ifnotequal MONDAY, .NoDancing
checknite
iffalse .NoDancing
appear MOUNTMOONSQUARE_FAIRY1
--- a/maps/MountMortar1FInside.asm
+++ b/maps/MountMortar1FInside.asm
@@ -19,7 +19,7 @@
trainer POKEMANIAC, MILLER, EVENT_BEAT_POKEMANIAC_MILLER, PokemaniacMillerSeenText, PokemaniacMillerBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext PokemaniacMillerAfterBattleText
waitbutton
@@ -30,7 +30,7 @@
trainer SUPER_NERD, MARKUS, EVENT_BEAT_SUPER_NERD_MARKUS, SupernerdMarkusSeenText, SupernerdMarkusBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext SupernerdMarkusAfterBattleText
waitbutton
--- a/maps/MountMortar2FInside.asm
+++ b/maps/MountMortar2FInside.asm
@@ -16,7 +16,7 @@
trainer SUPER_NERD, HUGH, EVENT_BEAT_SUPER_NERD_HUGH, SupernerdHughSeenText, SupernerdHughBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext SupernerdHughAfterBattleText
waitbutton
--- a/maps/MountMortarB1F.asm
+++ b/maps/MountMortarB1F.asm
@@ -33,7 +33,7 @@
buttonsound
waitsfx
checkcode VAR_PARTYCOUNT
- if_equal PARTY_LENGTH, UnknownScript_0x7e237
+ ifequal PARTY_LENGTH, UnknownScript_0x7e237
writetext UnknownText_0x7e355
playsound SFX_CAUGHT_MON
waitsfx
--- a/maps/NationalPark.asm
+++ b/maps/NationalPark.asm
@@ -74,7 +74,7 @@
.Script:
writecode VAR_CALLERID, PHONE_SCHOOLBOY_JACK
- end_if_just_battled
+ endifjustbattled
opentext
checkflag ENGINE_JACK
iftrue UnknownScript_0x5c088
@@ -92,8 +92,8 @@
scall UnknownScript_0x5c100
UnknownScript_0x5c074:
askforphonenumber PHONE_SCHOOLBOY_JACK
- if_equal PHONE_CONTACTS_FULL, UnknownScript_0x5c110
- if_equal PHONE_CONTACT_REFUSED, UnknownScript_0x5c10c
+ ifequal PHONE_CONTACTS_FULL, UnknownScript_0x5c110
+ ifequal PHONE_CONTACT_REFUSED, UnknownScript_0x5c10c
trainertotext SCHOOLBOY, JACK1, MEM_BUFFER_0
scall UnknownScript_0x5c104
jump UnknownScript_0x5c108
@@ -102,11 +102,11 @@
scall UnknownScript_0x5c114
winlosstext SchoolboyJack1BeatenText, 0
copybytetovar wJackFightCount
- if_equal 4, .Fight4
- if_equal 3, .Fight3
- if_equal 2, .Fight2
- if_equal 1, .Fight1
- if_equal 0, .LoadFight0
+ ifequal 4, .Fight4
+ ifequal 3, .Fight3
+ ifequal 2, .Fight2
+ ifequal 1, .Fight1
+ ifequal 0, .LoadFight0
.Fight4:
checkevent EVENT_RESTORED_POWER_TO_KANTO
iftrue .LoadFight4
@@ -190,7 +190,7 @@
trainer POKEFANM, WILLIAM, EVENT_BEAT_POKEFANM_WILLIAM, PokefanmWilliamSeenText, PokefanmWilliamBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext PokefanmWilliamAfterBattleText
waitbutton
@@ -202,7 +202,7 @@
.Script:
writecode VAR_CALLERID, PHONE_POKEFAN_BEVERLY
- end_if_just_battled
+ endifjustbattled
opentext
checkflag ENGINE_BEVERLY_HAS_NUGGET
iftrue UnknownScript_0x5c177
@@ -222,8 +222,8 @@
scall UnknownScript_0x5c193
UnknownScript_0x5c163:
askforphonenumber PHONE_POKEFAN_BEVERLY
- if_equal PHONE_CONTACTS_FULL, UnknownScript_0x5c1a3
- if_equal PHONE_CONTACT_REFUSED, UnknownScript_0x5c19f
+ ifequal PHONE_CONTACTS_FULL, UnknownScript_0x5c1a3
+ ifequal PHONE_CONTACT_REFUSED, UnknownScript_0x5c19f
trainertotext POKEFANF, BEVERLY1, MEM_BUFFER_0
scall UnknownScript_0x5c197
jump UnknownScript_0x5c19b
@@ -280,7 +280,7 @@
trainer LASS, KRISE, EVENT_BEAT_LASS_KRISE, LassKriseSeenText, LassKriseBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext LassKriseAfterBattleText
waitbutton
--- a/maps/OaksLab.asm
+++ b/maps/OaksLab.asm
@@ -24,8 +24,8 @@
setevent EVENT_TALKED_TO_OAK_IN_KANTO
.CheckBadges:
checkcode VAR_BADGES
- if_equal NUM_BADGES, .OpenMtSilver
- if_equal NUM_JOHTO_BADGES, .Complain
+ ifequal NUM_BADGES, .OpenMtSilver
+ ifequal NUM_JOHTO_BADGES, .Complain
jump .AhGood
.CheckPokedex:
--- a/maps/OlivineCity.asm
+++ b/maps/OlivineCity.asm
@@ -77,7 +77,7 @@
faceplayer
opentext
random 2
- if_equal 0, UnknownScript_0x1a88b4
+ ifequal 0, UnknownScript_0x1a88b4
writetext UnknownText_0x1a8b04
waitbutton
closetext
--- a/maps/OlivineGym.asm
+++ b/maps/OlivineGym.asm
@@ -48,8 +48,8 @@
end
OlivineGymActivateRockets:
- if_equal 7, .RadioTowerRockets
- if_equal 6, .GoldenrodRockets
+ ifequal 7, .RadioTowerRockets
+ ifequal 6, .GoldenrodRockets
end
.GoldenrodRockets:
--- a/maps/OlivineLighthouse2F.asm
+++ b/maps/OlivineLighthouse2F.asm
@@ -11,7 +11,7 @@
trainer GENTLEMAN, ALFRED, EVENT_BEAT_GENTLEMAN_ALFRED, GentlemanAlfredSeenText, GentlemanAlfredBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext GentlemanAlfredAfterBattleText
waitbutton
@@ -23,7 +23,7 @@
.Script:
writecode VAR_CALLERID, PHONE_SAILOR_HUEY
- end_if_just_battled
+ endifjustbattled
opentext
checkflag ENGINE_HUEY
iftrue UnknownScript_0x5afc7
@@ -39,8 +39,8 @@
scall UnknownScript_0x5b057
UnknownScript_0x5afb3:
askforphonenumber PHONE_SAILOR_HUEY
- if_equal PHONE_CONTACTS_FULL, UnknownScript_0x5b067
- if_equal PHONE_CONTACT_REFUSED, UnknownScript_0x5b063
+ ifequal PHONE_CONTACTS_FULL, UnknownScript_0x5b067
+ ifequal PHONE_CONTACT_REFUSED, UnknownScript_0x5b063
trainertotext SAILOR, HUEY1, MEM_BUFFER_0
scall UnknownScript_0x5b05b
jump UnknownScript_0x5b05f
@@ -49,10 +49,10 @@
scall UnknownScript_0x5b06b
winlosstext SailorHuey1BeatenText, 0
copybytetovar wHueyFightCount
- if_equal 3, .Fight3
- if_equal 2, .Fight2
- if_equal 1, .Fight1
- if_equal 0, .LoadFight0
+ ifequal 3, .Fight3
+ ifequal 2, .Fight2
+ ifequal 1, .Fight1
+ ifequal 0, .LoadFight0
.Fight3:
checkevent EVENT_RESTORED_POWER_TO_KANTO
iftrue .LoadFight3
--- a/maps/OlivineLighthouse3F.asm
+++ b/maps/OlivineLighthouse3F.asm
@@ -13,7 +13,7 @@
trainer BIRD_KEEPER, THEO, EVENT_BEAT_BIRD_KEEPER_THEO, BirdKeeperTheoSeenText, BirdKeeperTheoBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext BirdKeeperTheoAfterBattleText
waitbutton
@@ -24,7 +24,7 @@
trainer GENTLEMAN, PRESTON, EVENT_BEAT_GENTLEMAN_PRESTON, GentlemanPrestonSeenText, GentlemanPrestonBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext GentlemanPrestonAfterBattleText
waitbutton
@@ -35,7 +35,7 @@
trainer SAILOR, TERRELL, EVENT_BEAT_SAILOR_TERRELL, SailorTerrellSeenText, SailorTerrellBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext SailorTerrellAfterBattleText
waitbutton
--- a/maps/OlivineLighthouse4F.asm
+++ b/maps/OlivineLighthouse4F.asm
@@ -11,7 +11,7 @@
trainer LASS, CONNIE1, EVENT_BEAT_LASS_CONNIE, LassConnie1SeenText, LassConnie1BeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext LassConnie1AfterBattleText
waitbutton
@@ -22,7 +22,7 @@
trainer SAILOR, KENT, EVENT_BEAT_SAILOR_KENT, SailorKentSeenText, SailorKentBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext SailorKentAfterBattleText
waitbutton
--- a/maps/OlivineLighthouse5F.asm
+++ b/maps/OlivineLighthouse5F.asm
@@ -14,7 +14,7 @@
trainer BIRD_KEEPER, DENIS, EVENT_BEAT_BIRD_KEEPER_DENIS, BirdKeeperDenisSeenText, BirdKeeperDenisBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext BirdKeeperDenisAfterBattleText
waitbutton
@@ -25,7 +25,7 @@
trainer SAILOR, ERNEST, EVENT_BEAT_SAILOR_ERNEST, SailorErnestSeenText, SailorErnestBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext SailorErnestAfterBattleText
waitbutton
--- a/maps/OlivineLighthouse6F.asm
+++ b/maps/OlivineLighthouse6F.asm
@@ -68,8 +68,8 @@
setevent EVENT_JASMINE_RETURNED_TO_GYM
clearevent EVENT_OLIVINE_GYM_JASMINE
checkcode VAR_FACING
- if_equal DOWN, UnknownScript_0x60c17
- if_equal RIGHT, UnknownScript_0x60c1e
+ ifequal DOWN, UnknownScript_0x60c17
+ ifequal RIGHT, UnknownScript_0x60c1e
applymovement OLIVINELIGHTHOUSE6F_JASMINE, MovementData_0x60c68
disappear OLIVINELIGHTHOUSE6F_JASMINE
end
--- a/maps/OlivinePort.asm
+++ b/maps/OlivinePort.asm
@@ -83,11 +83,11 @@
checkevent EVENT_FAST_SHIP_FIRST_TIME
iffalse UnknownScript_0x7494e
checkcode VAR_WEEKDAY
- if_equal SUNDAY, UnknownScript_0x74977
- if_equal SATURDAY, UnknownScript_0x74977
- if_equal TUESDAY, UnknownScript_0x74981
- if_equal WEDNESDAY, UnknownScript_0x74981
- if_equal THURSDAY, UnknownScript_0x74981
+ ifequal SUNDAY, UnknownScript_0x74977
+ ifequal SATURDAY, UnknownScript_0x74977
+ ifequal TUESDAY, UnknownScript_0x74981
+ ifequal WEDNESDAY, UnknownScript_0x74981
+ ifequal THURSDAY, UnknownScript_0x74981
UnknownScript_0x7494e:
writetext UnknownText_0x74a9c
yesorno
@@ -148,11 +148,11 @@
checkevent EVENT_FAST_SHIP_FIRST_TIME
iffalse UnknownScript_0x749c0
checkcode VAR_WEEKDAY
- if_equal SUNDAY, UnknownScript_0x749f2
- if_equal SATURDAY, UnknownScript_0x749f2
- if_equal TUESDAY, UnknownScript_0x749f8
- if_equal WEDNESDAY, UnknownScript_0x749f8
- if_equal THURSDAY, UnknownScript_0x749f8
+ ifequal SUNDAY, UnknownScript_0x749f2
+ ifequal SATURDAY, UnknownScript_0x749f2
+ ifequal TUESDAY, UnknownScript_0x749f8
+ ifequal WEDNESDAY, UnknownScript_0x749f8
+ ifequal THURSDAY, UnknownScript_0x749f8
UnknownScript_0x749c0:
writetext UnknownText_0x74a9c
yesorno
@@ -166,7 +166,7 @@
closetext
setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
checkcode VAR_FACING
- if_equal RIGHT, UnknownScript_0x749e5
+ ifequal RIGHT, UnknownScript_0x749e5
applymovement PLAYER, MovementData_0x74a3f
jump SailorScript_0x748c0
--- a/maps/PewterGym.asm
+++ b/maps/PewterGym.asm
@@ -42,7 +42,7 @@
trainer CAMPER, JERRY, EVENT_BEAT_CAMPER_JERRY, CamperJerrySeenText, CamperJerryBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext CamperJerryAfterBattleText
waitbutton
--- a/maps/Pokecenter2F.asm
+++ b/maps/Pokecenter2F.asm
@@ -17,7 +17,7 @@
.Scene0:
special CheckMysteryGift
- if_equal $0, .Scene0Done
+ ifequal $0, .Scene0Done
clearevent EVENT_MYSTERY_GIFT_DELIVERY_GUY
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
iftrue .Scene0Done
@@ -79,7 +79,7 @@
writetext Text_TradeReceptionistMobile
special AskMobileOrCable
iffalse .Cancel
- if_equal $1, .Mobile
+ ifequal $1, .Mobile
.NoMobile:
special SetBitsForLinkTradeRequest
writetext Text_PleaseWait
@@ -181,7 +181,7 @@
writetext Text_BattleReceptionistMobile
special AskMobileOrCable
iffalse .Cancel
- if_equal $1, .Mobile
+ ifequal $1, .Mobile
.NoMobile:
special SetBitsForBattleRequest
writetext Text_PleaseWait
@@ -271,9 +271,9 @@
.SelectThreeMons:
special Mobile_SelectThreeMons
iffalse .Mobile_DidNotSelect
- if_equal $1, .Mobile_OK
- if_equal $2, .Mobile_OK
- if_equal $3, .Mobile_InvalidParty
+ ifequal $1, .Mobile_OK
+ ifequal $2, .Mobile_OK
+ ifequal $3, .Mobile_InvalidParty
jump .Mobile_DidNotSelect
.Mobile_InvalidParty:
@@ -308,9 +308,9 @@
yesorno
iffalse .Cancel
special CheckTimeCapsuleCompatibility
- if_equal $1, .MonTooNew
- if_equal $2, .MonMoveTooNew
- if_equal $3, .MonHasMail
+ ifequal $1, .MonTooNew
+ ifequal $2, .MonMoveTooNew
+ ifequal $3, .MonHasMail
writetext Text_PleaseWait
special WaitForLinkedFriend
iffalse .FriendNotReady
@@ -494,8 +494,8 @@
checkflag ENGINE_PLAYER_IS_FEMALE
iftrue .Female
checkcode VAR_FACING
- if_equal LEFT, .MaleFacingLeft
- if_equal RIGHT, .MaleFacingRight
+ ifequal LEFT, .MaleFacingLeft
+ ifequal RIGHT, .MaleFacingRight
applymovement2 Pokecenter2FMovementData_ReceptionistStepsLeftLooksDown
applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesTwoStepsUp_2
end
@@ -512,8 +512,8 @@
.Female:
checkcode VAR_FACING
- if_equal RIGHT, .FemaleFacingRight
- if_equal LEFT, .FemaleFacingLeft
+ ifequal RIGHT, .FemaleFacingRight
+ ifequal LEFT, .FemaleFacingLeft
applymovement2 Pokecenter2FMovementData_ReceptionistStepsLeftLooksRight_2
applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesOneStepUp_2
jump .FemaleContinue
@@ -532,7 +532,7 @@
waitbutton
closetext
checkcode VAR_FACING
- if_not_equal UP, .FemaleChangeApperance
+ ifnotequal UP, .FemaleChangeApperance
spriteface PLAYER, LEFT
.FemaleChangeApperance:
opentext
--- a/maps/PokecomCenterAdminRoomMobile.asm
+++ b/maps/PokecomCenterAdminRoomMobile.asm
@@ -26,8 +26,8 @@
loadmenuheader MenuHeader_0x62602
verticalmenu
closewindow
- if_equal 1, UnknownScript_0x625f0
- if_equal 2, UnknownScript_0x625f8
+ ifequal 1, UnknownScript_0x625f0
+ ifequal 2, UnknownScript_0x625f8
jump UnknownScript_0x62600
UnknownScript_0x625f0:
@@ -68,8 +68,8 @@
loadmenuheader MenuHeader_0x6264c
verticalmenu
closewindow
- if_equal 1, UnknownScript_0x6263a
- if_equal 2, UnknownScript_0x62642
+ ifequal 1, UnknownScript_0x6263a
+ ifequal 2, UnknownScript_0x62642
jump UnknownScript_0x6264a
UnknownScript_0x6263a:
--- a/maps/RadioTower1F.asm
+++ b/maps/RadioTower1F.asm
@@ -55,9 +55,9 @@
closetext
applymovement RADIOTOWER1F_GENTLEMAN, MovementData_0x5ce74
opentext
- if_equal 1, .FirstPlace
- if_equal 2, .SecondPlace
- if_equal 3, .ThirdPlace
+ ifequal 1, .FirstPlace
+ ifequal 2, .SecondPlace
+ ifequal 3, .ThirdPlace
jump .NoPrize
.GameOver:
@@ -187,7 +187,7 @@
trainer GRUNTM, GRUNTM_3, EVENT_BEAT_ROCKET_GRUNTM_3, GruntM3SeenText, GruntM3BeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext GruntM3AfterBattleText
waitbutton
--- a/maps/RadioTower2F.asm
+++ b/maps/RadioTower2F.asm
@@ -56,7 +56,7 @@
trainer GRUNTM, GRUNTM_4, EVENT_BEAT_ROCKET_GRUNTM_4, GruntM4SeenText, GruntM4BeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext GruntM4AfterBattleText
waitbutton
@@ -67,7 +67,7 @@
trainer GRUNTM, GRUNTM_5, EVENT_BEAT_ROCKET_GRUNTM_5, GruntM5SeenText, GruntM5BeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext GruntM5AfterBattleText
waitbutton
@@ -78,7 +78,7 @@
trainer GRUNTM, GRUNTM_6, EVENT_BEAT_ROCKET_GRUNTM_6, GruntM6SeenText, GruntM6BeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext GruntM6AfterBattleText
waitbutton
@@ -89,7 +89,7 @@
trainer GRUNTF, GRUNTF_2, EVENT_BEAT_ROCKET_GRUNTF_2, GruntF2SeenText, GruntF2BeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext GruntF2AfterBattleText
waitbutton
@@ -106,13 +106,13 @@
checkflag ENGINE_BUENAS_PASSWORD_2
iftrue UnknownScript_0x5d82f
checkcode VAR_HOUR
- if_less_than 18, UnknownScript_0x5d893
+ ifless 18, UnknownScript_0x5d893
checkflag ENGINE_BUENAS_PASSWORD
iffalse UnknownScript_0x5d80a
checkitem BLUE_CARD
iffalse UnknownScript_0x5d86b
checkcode VAR_BLUECARDBALANCE
- if_equal 30, UnknownScript_0x5d87f
+ ifequal 30, UnknownScript_0x5d87f
playmusic MUSIC_BUENAS_PASSWORD
writetext UnknownText_0x5de35
special AskRememberPassword
@@ -122,7 +122,7 @@
closetext
spriteface RADIOTOWER2F_BUENA, RIGHT
checkcode VAR_FACING
- if_not_equal RIGHT, UnknownScript_0x5d7be
+ ifnotequal RIGHT, UnknownScript_0x5d7be
applymovement PLAYER, MovementData_0x5d921
UnknownScript_0x5d7be:
spriteface PLAYER, RIGHT
@@ -155,7 +155,7 @@
pause 20
special RestartMapMusic
checkcode VAR_BLUECARDBALANCE
- if_equal 30, UnknownScript_0x5d8a4
+ ifequal 30, UnknownScript_0x5d8a4
end
UnknownScript_0x5d800:
@@ -279,8 +279,8 @@
writetext UnknownText_0x5e2bf
UnknownScript_0x5d8d0:
askforphonenumber PHONE_BUENA
- if_equal PHONE_CONTACTS_FULL, UnknownScript_0x5d8f6
- if_equal PHONE_CONTACT_REFUSED, UnknownScript_0x5d8ed
+ ifequal PHONE_CONTACTS_FULL, UnknownScript_0x5d8f6
+ ifequal PHONE_CONTACT_REFUSED, UnknownScript_0x5d8ed
writetext UnknownText_0x5e2f3
playsound SFX_REGISTER_PHONE_NUMBER
waitsfx
--- a/maps/RadioTower3F.asm
+++ b/maps/RadioTower3F.asm
@@ -84,7 +84,7 @@
trainer GRUNTM, GRUNTM_7, EVENT_BEAT_ROCKET_GRUNTM_7, GruntM7SeenText, GruntM7BeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext GruntM7AfterBattleText
waitbutton
@@ -95,7 +95,7 @@
trainer GRUNTM, GRUNTM_8, EVENT_BEAT_ROCKET_GRUNTM_8, GruntM8SeenText, GruntM8BeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext GruntM8AfterBattleText
waitbutton
@@ -106,7 +106,7 @@
trainer GRUNTM, GRUNTM_9, EVENT_BEAT_ROCKET_GRUNTM_9, GruntM9SeenText, GruntM9BeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext GruntM9AfterBattleText
waitbutton
@@ -117,7 +117,7 @@
trainer SCIENTIST, MARC, EVENT_BEAT_SCIENTIST_MARC, ScientistMarcSeenText, ScientistMarcBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext ScientistMarcAfterBattleText
waitbutton
--- a/maps/RadioTower4F.asm
+++ b/maps/RadioTower4F.asm
@@ -57,7 +57,7 @@
trainer GRUNTM, GRUNTM_10, EVENT_BEAT_ROCKET_GRUNTM_10, GruntM10SeenText, GruntM10BeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext GruntM10AfterBattleText
waitbutton
@@ -68,7 +68,7 @@
trainer EXECUTIVEM, EXECUTIVEM_2, EVENT_BEAT_ROCKET_EXECUTIVEM_2, Executivem2SeenText, Executivem2BeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext Executivem2AfterBattleText
waitbutton
@@ -79,7 +79,7 @@
trainer GRUNTF, GRUNTF_4, EVENT_BEAT_ROCKET_GRUNTF_4, GruntF4SeenText, GruntF4BeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext GruntF4AfterBattleText
waitbutton
@@ -90,7 +90,7 @@
trainer SCIENTIST, RICH, EVENT_BEAT_SCIENTIST_RICH, ScientistRichSeenText, ScientistRichBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext ScientistRichAfterBattleText
waitbutton
--- a/maps/RadioTower5F.asm
+++ b/maps/RadioTower5F.asm
@@ -69,7 +69,7 @@
trainer EXECUTIVEF, EXECUTIVEF_1, EVENT_BEAT_ROCKET_EXECUTIVEF_1, Executivef1SeenText, Executivef1BeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext Executivef1AfterBattleText
waitbutton
--- a/maps/Route1.asm
+++ b/maps/Route1.asm
@@ -12,7 +12,7 @@
trainer SCHOOLBOY, DANNY, EVENT_BEAT_SCHOOLBOY_DANNY, SchoolboyDannySeenText, SchoolboyDannyBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext SchoolboyDannyAfterBattleText
waitbutton
@@ -23,7 +23,7 @@
trainer COOLTRAINERF, QUINN, EVENT_BEAT_COOLTRAINERF_QUINN, CooltrainerfQuinnSeenText, CooltrainerfQuinnBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext CooltrainerfQuinnAfterBattleText
waitbutton
--- a/maps/Route10South.asm
+++ b/maps/Route10South.asm
@@ -11,7 +11,7 @@
trainer HIKER, JIM, EVENT_BEAT_HIKER_JIM, HikerJimSeenText, HikerJimBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext HikerJimAfterBattleText
waitbutton
@@ -22,7 +22,7 @@
trainer POKEFANM, ROBERT, EVENT_BEAT_POKEFANM_ROBERT, PokefanmRobertSeenText, PokefanmRobertBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext PokefanmRobertAfterBattleText
waitbutton
--- a/maps/Route11.asm
+++ b/maps/Route11.asm
@@ -14,7 +14,7 @@
trainer YOUNGSTER, OWEN, EVENT_BEAT_YOUNGSTER_OWEN, YoungsterOwenSeenText, YoungsterOwenBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext YoungsterOwenAfterBattleText
waitbutton
@@ -25,7 +25,7 @@
trainer YOUNGSTER, JASON, EVENT_BEAT_YOUNGSTER_JASON, YoungsterJasonSeenText, YoungsterJasonBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext YoungsterJasonAfterBattleText
waitbutton
@@ -36,7 +36,7 @@
trainer PSYCHIC_T, HERMAN, EVENT_BEAT_PSYCHIC_HERMAN, PsychicHermanSeenText, PsychicHermanBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext PsychicHermanAfterBattleText
waitbutton
@@ -47,7 +47,7 @@
trainer PSYCHIC_T, FIDEL, EVENT_BEAT_PSYCHIC_FIDEL, PsychicFidelSeenText, PsychicFidelBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext PsychicFidelAfterBattleText
waitbutton
--- a/maps/Route12.asm
+++ b/maps/Route12.asm
@@ -15,7 +15,7 @@
trainer FISHER, KYLE, EVENT_BEAT_FISHER_KYLE, FisherKyleSeenText, FisherKyleBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext FisherKyleAfterBattleText
waitbutton
@@ -26,7 +26,7 @@
trainer FISHER, MARTIN, EVENT_BEAT_FISHER_MARTIN, FisherMartinSeenText, FisherMartinBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext FisherMartinAfterBattleText
waitbutton
@@ -37,7 +37,7 @@
trainer FISHER, STEPHEN, EVENT_BEAT_FISHER_STEPHEN, FisherStephenSeenText, FisherStephenBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext FisherStephenAfterBattleText
waitbutton
@@ -48,7 +48,7 @@
trainer FISHER, BARNEY, EVENT_BEAT_FISHER_BARNEY, FisherBarneySeenText, FisherBarneyBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext FisherBarneyAfterBattleText
waitbutton
--- a/maps/Route13.asm
+++ b/maps/Route13.asm
@@ -14,7 +14,7 @@
trainer POKEFANM, ALEX, EVENT_BEAT_POKEFANM_ALEX, PokefanmAlexSeenText, PokefanmAlexBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext PokefanmAlexAfterBattleText
waitbutton
@@ -25,7 +25,7 @@
trainer POKEFANM, JOSHUA, EVENT_BEAT_POKEFANM_JOSHUA, PokefanmJoshuaSeenText, PokefanmJoshuaBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext PokefanmJoshuaAfterBattleText
waitbutton
@@ -36,7 +36,7 @@
trainer BIRD_KEEPER, PERRY, EVENT_BEAT_BIRD_KEEPER_PERRY, BirdKeeperPerrySeenText, BirdKeeperPerryBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext BirdKeeperPerryAfterBattleText
waitbutton
@@ -47,7 +47,7 @@
trainer BIRD_KEEPER, BRET, EVENT_BEAT_BIRD_KEEPER_BRET, BirdKeeperBretSeenText, BirdKeeperBretBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext BirdKeeperBretAfterBattleText
waitbutton
@@ -58,7 +58,7 @@
trainer HIKER, KENNY, EVENT_BEAT_HIKER_KENNY, HikerKennySeenText, HikerKennyBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext HikerKennyAfterBattleText
waitbutton
--- a/maps/Route14.asm
+++ b/maps/Route14.asm
@@ -21,7 +21,7 @@
trainer POKEFANM, CARTER, EVENT_BEAT_POKEFANM_CARTER, PokefanmCarterSeenText, PokefanmCarterBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext PokefanmCarterAfterBattleText
waitbutton
@@ -32,7 +32,7 @@
trainer BIRD_KEEPER, ROY, EVENT_BEAT_BIRD_KEEPER_ROY, BirdKeeperRoySeenText, BirdKeeperRoyBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext BirdKeeperRoyAfterBattleText
waitbutton
@@ -43,7 +43,7 @@
trainer POKEFANM, TREVOR, EVENT_BEAT_POKEFANM_TREVOR, PokefanmTrevorSeenText, PokefanmTrevorBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext PokefanmTrevorAfterBattleText
waitbutton
--- a/maps/Route15.asm
+++ b/maps/Route15.asm
@@ -16,7 +16,7 @@
trainer TEACHER, COLETTE, EVENT_BEAT_TEACHER_COLETTE, TeacherColetteSeenText, TeacherColetteBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext TeacherColetteAfterBattleText
waitbutton
@@ -27,7 +27,7 @@
trainer TEACHER, HILLARY, EVENT_BEAT_TEACHER_HILLARY, TeacherHillarySeenText, TeacherHillaryBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext TeacherHillaryAfterBattleText
waitbutton
@@ -38,7 +38,7 @@
trainer SCHOOLBOY, KIPP, EVENT_BEAT_SCHOOLBOY_KIP, SchoolboyKippSeenText, SchoolboyKippBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext SchoolboyKippAfterBattleText
waitbutton
@@ -49,7 +49,7 @@
trainer SCHOOLBOY, TOMMY, EVENT_BEAT_SCHOOLBOY_TOMMY, SchoolboyTommySeenText, SchoolboyTommyBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext SchoolboyTommyAfterBattleText
waitbutton
@@ -60,7 +60,7 @@
trainer SCHOOLBOY, JOHNNY, EVENT_BEAT_SCHOOLBOY_JOHNNY, SchoolboyJohnnySeenText, SchoolboyJohnnyBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext SchoolboyJohnnyAfterBattleText
waitbutton
@@ -71,7 +71,7 @@
trainer SCHOOLBOY, BILLY, EVENT_BEAT_SCHOOLBOY_BILLY, SchoolboyBillySeenText, SchoolboyBillyBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext SchoolboyBillyAfterBattleText
waitbutton
--- a/maps/Route16.asm
+++ b/maps/Route16.asm
@@ -6,9 +6,9 @@
.AlwaysOnBike:
checkcode VAR_YCOORD
- if_less_than 5, .CanWalk
+ ifless 5, .CanWalk
checkcode VAR_XCOORD
- if_greater_than 13, .CanWalk
+ ifgreater 13, .CanWalk
setflag ENGINE_ALWAYS_ON_BIKE
return
--- a/maps/Route17.asm
+++ b/maps/Route17.asm
@@ -19,7 +19,7 @@
trainer BIKER, CHARLES, EVENT_BEAT_BIKER_CHARLES, BikerCharlesSeenText, BikerCharlesBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext BikerCharlesAfterBattleText
waitbutton
@@ -30,7 +30,7 @@
trainer BIKER, RILEY, EVENT_BEAT_BIKER_RILEY, BikerRileySeenText, BikerRileyBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext BikerRileyAfterBattleText
waitbutton
@@ -41,7 +41,7 @@
trainer BIKER, JOEL, EVENT_BEAT_BIKER_JOEL, BikerJoelSeenText, BikerJoelBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext BikerJoelAfterBattleText
waitbutton
@@ -52,7 +52,7 @@
trainer BIKER, GLENN, EVENT_BEAT_BIKER_GLENN, BikerGlennSeenText, BikerGlennBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext BikerGlennAfterBattleText
waitbutton
--- a/maps/Route18.asm
+++ b/maps/Route18.asm
@@ -11,7 +11,7 @@
trainer BIRD_KEEPER, BORIS, EVENT_BEAT_BIRD_KEEPER_BORIS, BirdKeeperBorisSeenText, BirdKeeperBorisBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext BirdKeeperBorisAfterBattleText
waitbutton
@@ -22,7 +22,7 @@
trainer BIRD_KEEPER, BOB, EVENT_BEAT_BIRD_KEEPER_BOB, BirdKeeperBobSeenText, BirdKeeperBobBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext BirdKeeperBobAfterBattleText
waitbutton
--- a/maps/Route19.asm
+++ b/maps/Route19.asm
@@ -28,7 +28,7 @@
trainer SWIMMERF, DAWN, EVENT_BEAT_SWIMMERF_DAWN, SwimmerfDawnSeenText, SwimmerfDawnBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext SwimmerfDawnAfterBattleText
waitbutton
@@ -39,7 +39,7 @@
trainer SWIMMERM, HAROLD, EVENT_BEAT_SWIMMERM_HAROLD, SwimmermHaroldSeenText, SwimmermHaroldBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext SwimmermHaroldAfterBattleText
waitbutton
@@ -50,7 +50,7 @@
trainer SWIMMERM, JEROME, EVENT_BEAT_SWIMMERM_JEROME, SwimmermJeromeSeenText, SwimmermJeromeBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext SwimmermJeromeAfterBattleText
waitbutton
@@ -61,7 +61,7 @@
trainer SWIMMERM, TUCKER, EVENT_BEAT_SWIMMERM_TUCKER, SwimmermTuckerSeenText, SwimmermTuckerBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext SwimmermTuckerAfterBattleText
waitbutton
--- a/maps/Route2.asm
+++ b/maps/Route2.asm
@@ -17,7 +17,7 @@
trainer BUG_CATCHER, ROB, EVENT_BEAT_BUG_CATCHER_ROB, BugCatcherRobSeenText, BugCatcherRobBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext BugCatcherRobAfterBattleText
waitbutton
@@ -28,7 +28,7 @@
trainer BUG_CATCHER, ED, EVENT_BEAT_BUG_CATCHER_ED, BugCatcherEdSeenText, BugCatcherEdBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext BugCatcherEdAfterBattleText
waitbutton
@@ -39,7 +39,7 @@
trainer BUG_CATCHER, DOUG, EVENT_BEAT_BUG_CATCHER_DOUG, BugCatcherDougSeenText, BugCatcherDougBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext BugCatcherDougAfterBattleText
waitbutton
--- a/maps/Route20.asm
+++ b/maps/Route20.asm
@@ -17,7 +17,7 @@
trainer SWIMMERF, NICOLE, EVENT_BEAT_SWIMMERF_NICOLE, SwimmerfNicoleSeenText, SwimmerfNicoleBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext SwimmerfNicoleAfterBattleText
waitbutton
@@ -28,7 +28,7 @@
trainer SWIMMERF, LORI, EVENT_BEAT_SWIMMERF_LORI, SwimmerfLoriSeenText, SwimmerfLoriBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext SwimmerfLoriAfterBattleText
waitbutton
@@ -39,7 +39,7 @@
trainer SWIMMERM, CAMERON, EVENT_BEAT_SWIMMERM_CAMERON, SwimmermCameronSeenText, SwimmermCameronBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext SwimmermCameronAfterBattleText
waitbutton
--- a/maps/Route21.asm
+++ b/maps/Route21.asm
@@ -12,7 +12,7 @@
trainer SWIMMERM, SETH, EVENT_BEAT_SWIMMERM_SETH, SwimmermSethSeenText, SwimmermSethBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext SwimmermSethAfterBattleText
waitbutton
@@ -23,7 +23,7 @@
trainer SWIMMERF, NIKKI, EVENT_BEAT_SWIMMERF_NIKKI, SwimmerfNikkiSeenText, SwimmerfNikkiBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext SwimmerfNikkiAfterBattleText
waitbutton
@@ -34,7 +34,7 @@
trainer FISHER, ARNOLD, EVENT_BEAT_FISHER_ARNOLD, FisherArnoldSeenText, FisherArnoldBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext FisherArnoldAfterBattleText
waitbutton
--- a/maps/Route25.asm
+++ b/maps/Route25.asm
@@ -80,7 +80,7 @@
trainer SCHOOLBOY, DUDLEY, EVENT_BEAT_SCHOOLBOY_DUDLEY, SchoolboyDudleySeenText, SchoolboyDudleyBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext SchoolboyDudleyAfterBattleText
waitbutton
@@ -91,7 +91,7 @@
trainer LASS, ELLEN, EVENT_BEAT_LASS_ELLEN, LassEllenSeenText, LassEllenBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext LassEllenAfterBattleText
waitbutton
@@ -102,7 +102,7 @@
trainer SCHOOLBOY, JOE, EVENT_BEAT_SCHOOLBOY_JOE, SchoolboyJoeSeenText, SchoolboyJoeBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext SchoolboyJoeAfterBattleText
waitbutton
@@ -113,7 +113,7 @@
trainer LASS, LAURA, EVENT_BEAT_LASS_LAURA, LassLauraSeenText, LassLauraBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext LassLauraAfterBattleText
waitbutton
@@ -124,7 +124,7 @@
trainer CAMPER, LLOYD, EVENT_BEAT_CAMPER_LLOYD, CamperLloydSeenText, CamperLloydBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext CamperLloydAfterBattleText
waitbutton
@@ -135,7 +135,7 @@
trainer LASS, SHANNON, EVENT_BEAT_LASS_SHANNON, LassShannonSeenText, LassShannonBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext LassShannonAfterBattleText
waitbutton
@@ -146,7 +146,7 @@
trainer SUPER_NERD, PAT, EVENT_BEAT_SUPER_NERD_PAT, SupernerdPatSeenText, SupernerdPatBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext SupernerdPatAfterBattleText
waitbutton
--- a/maps/Route26.asm
+++ b/maps/Route26.asm
@@ -17,7 +17,7 @@
trainer COOLTRAINERM, JAKE, EVENT_BEAT_COOLTRAINERM_JAKE, CooltrainermJakeSeenText, CooltrainermJakeBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext CooltrainermJakeAfterBattleText
waitbutton
@@ -29,7 +29,7 @@
.Script:
writecode VAR_CALLERID, PHONE_COOLTRAINERM_GAVEN
- end_if_just_battled
+ endifjustbattled
opentext
checkflag ENGINE_GAVEN
iftrue .WantsBattle
@@ -47,8 +47,8 @@
scall .AskNumber2
.AskForNumber:
askforphonenumber PHONE_COOLTRAINERM_GAVEN
- if_equal PHONE_CONTACTS_FULL, .PhoneFull
- if_equal PHONE_CONTACT_REFUSED, .NumberDeclined
+ ifequal PHONE_CONTACTS_FULL, .PhoneFull
+ ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
trainertotext COOLTRAINERM, GAVEN3, MEM_BUFFER_0
scall .RegisteredNumber
jump .NumberAccepted
@@ -57,9 +57,9 @@
scall .Rematch
winlosstext CooltrainermGaven3BeatenText, 0
copybytetovar wGavenFightCount
- if_equal 2, .Fight2
- if_equal 1, .Fight1
- if_equal 0, .LoadFight0
+ ifequal 2, .Fight2
+ ifequal 1, .Fight1
+ ifequal 0, .LoadFight0
.Fight2:
checkevent EVENT_RESTORED_POWER_TO_KANTO
iftrue .LoadFight2
@@ -121,7 +121,7 @@
trainer COOLTRAINERF, JOYCE, EVENT_BEAT_COOLTRAINERF_JOYCE, CooltrainerfJoyceSeenText, CooltrainerfJoyceBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext CooltrainerfJoyceAfterBattleText
waitbutton
@@ -133,7 +133,7 @@
.Script:
writecode VAR_CALLERID, PHONE_COOLTRAINERF_BETH
- end_if_just_battled
+ endifjustbattled
opentext
checkflag ENGINE_BETH
iftrue .WantsBattle
@@ -151,8 +151,8 @@
scall .AskNumber2
.AskForNumber:
askforphonenumber PHONE_COOLTRAINERF_BETH
- if_equal PHONE_CONTACTS_FULL, .PhoneFull
- if_equal PHONE_CONTACT_REFUSED, .NumberDeclined
+ ifequal PHONE_CONTACTS_FULL, .PhoneFull
+ ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
trainertotext COOLTRAINERF, BETH1, MEM_BUFFER_0
scall .RegisteredNumber
jump .NumberAccepted
@@ -161,9 +161,9 @@
scall .Rematch
winlosstext CooltrainerfBeth1BeatenText, 0
copybytetovar wBethFightCount
- if_equal 2, .Fight2
- if_equal 1, .Fight1
- if_equal 0, .LoadFight0
+ ifequal 2, .Fight2
+ ifequal 1, .Fight1
+ ifequal 0, .LoadFight0
.Fight2:
checkevent EVENT_RESTORED_POWER_TO_KANTO
iftrue .LoadFight2
@@ -225,7 +225,7 @@
trainer PSYCHIC_T, RICHARD, EVENT_BEAT_PSYCHIC_RICHARD, PsychicRichardSeenText, PsychicRichardBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext PsychicRichardAfterBattleText
waitbutton
@@ -236,7 +236,7 @@
trainer FISHER, SCOTT, EVENT_BEAT_FISHER_SCOTT, FisherScottSeenText, FisherScottBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext FisherScottAfterBattleText
waitbutton
--- a/maps/Route27.asm
+++ b/maps/Route27.asm
@@ -50,7 +50,7 @@
trainer PSYCHIC_T, GILBERT, EVENT_BEAT_PSYCHIC_GILBERT, PsychicGilbertSeenText, PsychicGilbertBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext PsychicGilbertAfterBattleText
waitbutton
@@ -62,7 +62,7 @@
.Script:
writecode VAR_CALLERID, PHONE_BIRDKEEPER_JOSE
- end_if_just_battled
+ endifjustbattled
opentext
checkflag ENGINE_JOSE
iftrue .WantsBattle
@@ -82,8 +82,8 @@
scall .AskNumber2
.AskForNumber:
askforphonenumber PHONE_BIRDKEEPER_JOSE
- if_equal PHONE_CONTACTS_FULL, .PhoneFull
- if_equal PHONE_CONTACT_REFUSED, .NumberDeclined
+ ifequal PHONE_CONTACTS_FULL, .PhoneFull
+ ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
trainertotext BIRD_KEEPER, JOSE2, MEM_BUFFER_0
scall .RegisteredNumber
jump .NumberAccepted
@@ -92,9 +92,9 @@
scall .Rematch
winlosstext BirdKeeperJose2BeatenText, 0
copybytetovar wJoseFightCount
- if_equal 2, .Fight2
- if_equal 1, .Fight1
- if_equal 0, .LoadFight0
+ ifequal 2, .Fight2
+ ifequal 1, .Fight1
+ ifequal 0, .LoadFight0
.Fight2:
checkevent EVENT_RESTORED_POWER_TO_KANTO
iftrue .LoadFight2
@@ -174,7 +174,7 @@
trainer COOLTRAINERM, BLAKE, EVENT_BEAT_COOLTRAINERM_BLAKE, CooltrainermBlakeSeenText, CooltrainermBlakeBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext CooltrainermBlakeAfterBattleText
waitbutton
@@ -185,7 +185,7 @@
trainer COOLTRAINERM, BRIAN, EVENT_BEAT_COOLTRAINERM_BRIAN, CooltrainermBrianSeenText, CooltrainermBrianBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext CooltrainermBrianAfterBattleText
waitbutton
@@ -197,7 +197,7 @@
.Script:
writecode VAR_CALLERID, PHONE_COOLTRAINERF_REENA
- end_if_just_battled
+ endifjustbattled
opentext
checkflag ENGINE_REENA
iftrue .WantsBattle
@@ -215,8 +215,8 @@
scall .AskNumber2
.AskForNumber:
askforphonenumber PHONE_COOLTRAINERF_REENA
- if_equal PHONE_CONTACTS_FULL, .PhoneFull
- if_equal PHONE_CONTACT_REFUSED, .NumberDeclined
+ ifequal PHONE_CONTACTS_FULL, .PhoneFull
+ ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
trainertotext COOLTRAINERF, REENA1, MEM_BUFFER_0
scall .RegisteredNumber
jump .NumberAccepted
@@ -225,9 +225,9 @@
scall .Rematch
winlosstext CooltrainerfReenaBeatenText, 0
copybytetovar wReenaFightCount
- if_equal 2, .Fight2
- if_equal 1, .Fight1
- if_equal 0, .LoadFight0
+ ifequal 2, .Fight2
+ ifequal 1, .Fight1
+ ifequal 0, .LoadFight0
.Fight2:
checkevent EVENT_RESTORED_POWER_TO_KANTO
iftrue .LoadFight2
@@ -289,7 +289,7 @@
trainer COOLTRAINERF, MEGAN, EVENT_BEAT_COOLTRAINERF_MEGAN, CooltrainerfMeganSeenText, CooltrainerfMeganBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext CooltrainerfMeganAfterBattleText
waitbutton
--- a/maps/Route27SandstormHouse.asm
+++ b/maps/Route27SandstormHouse.asm
@@ -14,7 +14,7 @@
special GetFirstPokemonHappiness
writetext SandstormHouseWomanText1
buttonsound
- if_greater_than 150 - 1, .Loyal
+ ifgreater 150 - 1, .Loyal
jump .Disloyal
.Loyal:
--- a/maps/Route29.asm
+++ b/maps/Route29.asm
@@ -32,7 +32,7 @@
.DoesTuscanyAppear:
checkcode VAR_WEEKDAY
- if_not_equal TUESDAY, .TuscanyDisappears
+ ifnotequal TUESDAY, .TuscanyDisappears
appear ROUTE29_TUSCANY
return
@@ -106,7 +106,7 @@
faceplayer
opentext
checkcode VAR_BOXSPACE
- if_equal 0, .BoxFull
+ ifequal 0, .BoxFull
checkevent EVENT_LEARNED_TO_CATCH_POKEMON
iftrue .BoxFull
checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM
@@ -170,7 +170,7 @@
checkevent EVENT_GOT_PINK_BOW_FROM_TUSCANY
iftrue TuscanyTuesdayScript
checkcode VAR_WEEKDAY
- if_not_equal TUESDAY, TuscanyNotTuesdayScript
+ ifnotequal TUESDAY, TuscanyNotTuesdayScript
checkevent EVENT_MET_TUSCANY_OF_TUESDAY
iftrue .MetTuscany
writetext MeetTuscanyText
--- a/maps/Route3.asm
+++ b/maps/Route3.asm
@@ -13,7 +13,7 @@
trainer FIREBREATHER, OTIS, EVENT_BEAT_FIREBREATHER_OTIS, FirebreatherOtisSeenText, FirebreatherOtisBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext FirebreatherOtisAfterBattleText
waitbutton
@@ -24,7 +24,7 @@
trainer YOUNGSTER, WARREN, EVENT_BEAT_YOUNGSTER_WARREN, YoungsterWarrenSeenText, YoungsterWarrenBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext YoungsterWarrenAfterBattleText
waitbutton
@@ -35,7 +35,7 @@
trainer YOUNGSTER, JIMMY, EVENT_BEAT_YOUNGSTER_JIMMY, YoungsterJimmySeenText, YoungsterJimmyBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext YoungsterJimmyAfterBattleText
waitbutton
@@ -46,7 +46,7 @@
trainer FIREBREATHER, BURT, EVENT_BEAT_FIREBREATHER_BURT, FirebreatherBurtSeenText, FirebreatherBurtBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext FirebreatherBurtAfterBattleText
waitbutton
--- a/maps/Route30.asm
+++ b/maps/Route30.asm
@@ -41,7 +41,7 @@
.Script:
writecode VAR_CALLERID, PHONE_YOUNGSTER_JOEY
- end_if_just_battled
+ endifjustbattled
opentext
checkflag ENGINE_JOEY
iftrue .Rematch
@@ -59,8 +59,8 @@
scall .AskNumber2
.RequestNumber:
askforphonenumber PHONE_YOUNGSTER_JOEY
- if_equal PHONE_CONTACTS_FULL, .PhoneFull
- if_equal PHONE_CONTACT_REFUSED, .NumberDeclined
+ ifequal PHONE_CONTACTS_FULL, .PhoneFull
+ ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
trainertotext YOUNGSTER, JOEY1, MEM_BUFFER_0
scall .RegisteredNumber
jump .NumberAccepted
@@ -69,11 +69,11 @@
scall .RematchStd
winlosstext YoungsterJoey1BeatenText, 0
copybytetovar wJoeyFightCount
- if_equal 4, .Fight4
- if_equal 3, .Fight3
- if_equal 2, .Fight2
- if_equal 1, .Fight1
- if_equal 0, .LoadFight0
+ ifequal 4, .Fight4
+ ifequal 3, .Fight3
+ ifequal 2, .Fight2
+ ifequal 1, .Fight1
+ ifequal 0, .LoadFight0
.Fight4:
checkevent EVENT_BEAT_ELITE_FOUR
iftrue .LoadFight4
@@ -187,7 +187,7 @@
trainer YOUNGSTER, MIKEY, EVENT_BEAT_YOUNGSTER_MIKEY, YoungsterMikeySeenText, YoungsterMikeyBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext YoungsterMikeyAfterText
waitbutton
@@ -198,7 +198,7 @@
trainer BUG_CATCHER, DON, EVENT_BEAT_BUG_CATCHER_DON, BugCatcherDonSeenText, BugCatcherDonBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext BugCatcherDonAfterText
waitbutton
--- a/maps/Route31.asm
+++ b/maps/Route31.asm
@@ -27,7 +27,7 @@
.Script:
writecode VAR_CALLERID, PHONE_BUG_CATCHER_WADE
- end_if_just_battled
+ endifjustbattled
opentext
checkflag ENGINE_WADE
iftrue .WadeRematch
@@ -47,8 +47,8 @@
scall .AskAgainSTD
.Continue:
askforphonenumber PHONE_BUG_CATCHER_WADE
- if_equal PHONE_CONTACTS_FULL, .PhoneFullSTD
- if_equal PHONE_CONTACT_REFUSED, .DeclinedNumberSTD
+ ifequal PHONE_CONTACTS_FULL, .PhoneFullSTD
+ ifequal PHONE_CONTACT_REFUSED, .DeclinedNumberSTD
trainertotext BUG_CATCHER, WADE1, MEM_BUFFER_0
scall .RegisterNumberSTD
jump .AcceptedNumberSTD
@@ -57,11 +57,11 @@
scall .RematchSTD
winlosstext BugCatcherWade1BeatenText, 0
copybytetovar wWadeFightCount
- if_equal 4, .Fight4
- if_equal 3, .Fight3
- if_equal 2, .Fight2
- if_equal 1, .Fight1
- if_equal 0, .LoadFight0
+ ifequal 4, .Fight4
+ ifequal 3, .Fight3
+ ifequal 2, .Fight2
+ ifequal 1, .Fight1
+ ifequal 0, .LoadFight0
.Fight4:
checkevent EVENT_BEAT_ELITE_FOUR
iftrue .LoadFight4
@@ -196,10 +196,10 @@
writetext Text_Route31SleepyManGotMail
buttonsound
checkpokeitem ReceivedSpearowMailText
- if_equal POKEMAIL_WRONG_MAIL, .WrongMail
- if_equal POKEMAIL_REFUSED, .Refused
- if_equal POKEMAIL_NO_MAIL, .NoMail
- if_equal POKEMAIL_LAST_MON, .LastMon
+ ifequal POKEMAIL_WRONG_MAIL, .WrongMail
+ ifequal POKEMAIL_REFUSED, .Refused
+ ifequal POKEMAIL_NO_MAIL, .NoMail
+ ifequal POKEMAIL_LAST_MON, .LastMon
; POKEMAIL_CORRECT
writetext Text_Route31HandOverMailMon
buttonsound
--- a/maps/Route32.asm
+++ b/maps/Route32.asm
@@ -34,7 +34,7 @@
.Frieda:
checkcode VAR_WEEKDAY
- if_equal FRIDAY, .FriedaAppears
+ ifequal FRIDAY, .FriedaAppears
disappear ROUTE32_FRIEDA
return
@@ -145,7 +145,7 @@
trainer CAMPER, ROLAND, EVENT_BEAT_CAMPER_ROLAND, CamperRolandSeenText, CamperRolandBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext CamperRolandAfterText
waitbutton
@@ -156,7 +156,7 @@
trainer FISHER, JUSTIN, EVENT_BEAT_FISHER_JUSTIN, FisherJustinSeenText, FisherJustinBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext FisherJustinAfterText
waitbutton
@@ -168,7 +168,7 @@
.Script:
writecode VAR_CALLERID, PHONE_FISHER_RALPH
- end_if_just_battled
+ endifjustbattled
opentext
checkflag ENGINE_RALPH
iftrue .Rematch
@@ -188,8 +188,8 @@
scall .AskNumber2
.AskForNumber:
askforphonenumber PHONE_FISHER_RALPH
- if_equal PHONE_CONTACTS_FULL, .PhoneFull
- if_equal PHONE_CONTACT_REFUSED, .NumberDeclined
+ ifequal PHONE_CONTACTS_FULL, .PhoneFull
+ ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
trainertotext FISHER, RALPH1, MEM_BUFFER_0
scall .RegisteredNumber
jump .NumberAccepted
@@ -198,11 +198,11 @@
scall .RematchStd
winlosstext FisherRalph1BeatenText, 0
copybytetovar wRalphFightCount
- if_equal 4, .Fight4
- if_equal 3, .Fight3
- if_equal 2, .Fight2
- if_equal 1, .Fight1
- if_equal 0, .LoadFight0
+ ifequal 4, .Fight4
+ ifequal 3, .Fight3
+ ifequal 2, .Fight2
+ ifequal 1, .Fight1
+ ifequal 0, .LoadFight0
.Fight4:
checkevent EVENT_RESTORED_POWER_TO_KANTO
iftrue .LoadFight4
@@ -292,7 +292,7 @@
trainer FISHER, HENRY, EVENT_BEAT_FISHER_HENRY, FisherHenrySeenText, FisherHenryBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext FisherHenryAfterText
waitbutton
@@ -304,7 +304,7 @@
.Script:
writecode VAR_CALLERID, PHONE_PICNICKER_LIZ
- end_if_just_battled
+ endifjustbattled
opentext
checkflag ENGINE_LIZ
iftrue .Rematch
@@ -322,8 +322,8 @@
scall .AskNumber2
.AskForNumber:
askforphonenumber PHONE_PICNICKER_LIZ
- if_equal PHONE_CONTACTS_FULL, .PhoneFull
- if_equal PHONE_CONTACT_REFUSED, .NumberDeclined
+ ifequal PHONE_CONTACTS_FULL, .PhoneFull
+ ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
trainertotext PICNICKER, LIZ1, MEM_BUFFER_0
scall .RegisteredNumber
jump .NumberAccepted
@@ -332,11 +332,11 @@
scall .RematchStd
winlosstext PicnickerLiz1BeatenText, 0
copybytetovar wLizFightCount
- if_equal 4, .Fight4
- if_equal 3, .Fight3
- if_equal 2, .Fight2
- if_equal 1, .Fight1
- if_equal 0, .LoadFight0
+ ifequal 4, .Fight4
+ ifequal 3, .Fight3
+ ifequal 2, .Fight2
+ ifequal 1, .Fight1
+ ifequal 0, .LoadFight0
.Fight4:
checkevent EVENT_BEAT_ELITE_FOUR
iftrue .LoadFight4
@@ -420,7 +420,7 @@
trainer YOUNGSTER, ALBERT, EVENT_BEAT_YOUNGSTER_ALBERT, YoungsterAlbertSeenText, YoungsterAlbertBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext YoungsterAlbertAfterText
waitbutton
@@ -431,7 +431,7 @@
trainer YOUNGSTER, GORDON, EVENT_BEAT_YOUNGSTER_GORDON, YoungsterGordonSeenText, YoungsterGordonBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext YoungsterGordonAfterText
waitbutton
@@ -442,7 +442,7 @@
trainer BIRD_KEEPER, PETER, EVENT_BEAT_BIRD_KEEPER_PETER, BirdKeeperPeterSeenText, BirdKeeperPeterBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext BirdKeeperPeterAfterText
waitbutton
@@ -455,7 +455,7 @@
checkevent EVENT_GOT_POISON_BARB_FROM_FRIEDA
iftrue .Friday
checkcode VAR_WEEKDAY
- if_not_equal FRIDAY, .NotFriday
+ ifnotequal FRIDAY, .NotFriday
checkevent EVENT_MET_FRIEDA_OF_FRIDAY
iftrue .MetFrieda
writetext MeetFriedaText
--- a/maps/Route33.asm
+++ b/maps/Route33.asm
@@ -16,7 +16,7 @@
.Script:
writecode VAR_CALLERID, PHONE_HIKER_ANTHONY
- end_if_just_battled
+ endifjustbattled
opentext
checkflag ENGINE_ANTHONY
iftrue .Rematch
@@ -36,8 +36,8 @@
scall .AskNumber2
.AskForPhoneNumber:
askforphonenumber PHONE_HIKER_ANTHONY
- if_equal PHONE_CONTACTS_FULL, .PhoneFull
- if_equal PHONE_CONTACT_REFUSED, .NumberDeclined
+ ifequal PHONE_CONTACTS_FULL, .PhoneFull
+ ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
trainertotext HIKER, ANTHONY2, MEM_BUFFER_0
scall .RegisteredNumber
jump .NumberAccepted
@@ -46,11 +46,11 @@
scall .RematchStd
winlosstext HikerAnthony2BeatenText, 0
copybytetovar wAnthonyFightCount
- if_equal 4, .Fight4
- if_equal 3, .Fight3
- if_equal 2, .Fight2
- if_equal 1, .Fight1
- if_equal 0, .LoadFight0
+ ifequal 4, .Fight4
+ ifequal 3, .Fight3
+ ifequal 2, .Fight2
+ ifequal 1, .Fight1
+ ifequal 0, .LoadFight0
.Fight4:
checkevent EVENT_RESTORED_POWER_TO_KANTO
iftrue .LoadFight4
--- a/maps/Route34.asm
+++ b/maps/Route34.asm
@@ -57,10 +57,10 @@
special DayCareManOutside
waitbutton
closetext
- if_equal TRUE, .end_fail
+ ifequal TRUE, .end_fail
clearflag ENGINE_DAY_CARE_MAN_HAS_EGG
checkcode VAR_FACING
- if_equal RIGHT, .walk_around_player
+ ifequal RIGHT, .walk_around_player
applymovement ROUTE34_GRAMPS, Route34MovementData_DayCareManWalksBackInside
playsound SFX_ENTER_DOOR
disappear ROUTE34_GRAMPS
@@ -90,7 +90,7 @@
.Script:
writecode VAR_CALLERID, PHONE_CAMPER_TODD
- end_if_just_battled
+ endifjustbattled
opentext
checkflag ENGINE_TODD
iftrue .Rematch
@@ -110,8 +110,8 @@
scall .AskNumber2
.FinishAsk:
askforphonenumber PHONE_CAMPER_TODD
- if_equal PHONE_CONTACTS_FULL, .PhoneFull
- if_equal PHONE_CONTACT_REFUSED, .NumberDeclined
+ ifequal PHONE_CONTACTS_FULL, .PhoneFull
+ ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
trainertotext CAMPER, TODD1, MEM_BUFFER_0
scall .RegisteredNumber
jump .NumberAccepted
@@ -120,11 +120,11 @@
scall .RematchStd
winlosstext CamperTodd1BeatenText, 0
copybytetovar wToddFightCount
- if_equal 4, .Fight4
- if_equal 3, .Fight3
- if_equal 2, .Fight2
- if_equal 1, .Fight1
- if_equal 0, .LoadFight0
+ ifequal 4, .Fight4
+ ifequal 3, .Fight3
+ ifequal 2, .Fight2
+ ifequal 1, .Fight1
+ ifequal 0, .LoadFight0
.Fight4:
checkevent EVENT_RESTORED_POWER_TO_KANTO
iftrue .LoadFight4
@@ -215,7 +215,7 @@
.Script:
writecode VAR_CALLERID, PHONE_PICNICKER_GINA
- end_if_just_battled
+ endifjustbattled
opentext
checkflag ENGINE_GINA
iftrue .Rematch
@@ -235,8 +235,8 @@
scall .AskNumber2
.FinishAsk:
askforphonenumber PHONE_PICNICKER_GINA
- if_equal PHONE_CONTACTS_FULL, .PhoneFull
- if_equal PHONE_CONTACT_REFUSED, .NumberDeclined
+ ifequal PHONE_CONTACTS_FULL, .PhoneFull
+ ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
trainertotext PICNICKER, GINA1, MEM_BUFFER_0
scall .RegisteredNumber
jump .NumberAccepted
@@ -245,11 +245,11 @@
scall .RematchStd
winlosstext PicnickerGina1BeatenText, 0
copybytetovar wGinaFightCount
- if_equal 4, .Fight4
- if_equal 3, .Fight3
- if_equal 2, .Fight2
- if_equal 1, .Fight1
- if_equal 0, .LoadFight0
+ ifequal 4, .Fight4
+ ifequal 3, .Fight3
+ ifequal 2, .Fight2
+ ifequal 1, .Fight1
+ ifequal 0, .LoadFight0
.Fight4:
checkevent EVENT_RESTORED_POWER_TO_KANTO
iftrue .LoadFight4
@@ -383,7 +383,7 @@
trainer YOUNGSTER, SAMUEL, EVENT_BEAT_YOUNGSTER_SAMUEL, YoungsterSamuelSeenText, YoungsterSamuelBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext YoungsterSamuelAfterText
waitbutton
@@ -394,7 +394,7 @@
trainer YOUNGSTER, IAN, EVENT_BEAT_YOUNGSTER_IAN, YoungsterIanSeenText, YoungsterIanBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext YoungsterIanAfterText
waitbutton
@@ -405,7 +405,7 @@
trainer POKEFANM, BRANDON, EVENT_BEAT_POKEFANM_BRANDON, PokefanmBrandonSeenText, PokefanmBrandonBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext PokefanmBrandonAfterText
waitbutton
@@ -416,7 +416,7 @@
trainer COOLTRAINERF, IRENE, EVENT_BEAT_COOLTRAINERF_IRENE, CooltrainerfIreneSeenText, CooltrainerfIreneBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
checkevent EVENT_GOT_SOFT_SAND_FROM_KATE
iftrue .GotSoftSand
@@ -435,7 +435,7 @@
trainer COOLTRAINERF, JENN, EVENT_BEAT_COOLTRAINERF_JENN, CooltrainerfJennSeenText, CooltrainerfJennBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
checkevent EVENT_GOT_SOFT_SAND_FROM_KATE
iftrue .GotSoftSand
@@ -454,7 +454,7 @@
trainer COOLTRAINERF, KATE, EVENT_BEAT_COOLTRAINERF_KATE, CooltrainerfKateSeenText, CooltrainerfKateBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
checkevent EVENT_GOT_SOFT_SAND_FROM_KATE
iftrue .GotSoftSand
--- a/maps/Route35.asm
+++ b/maps/Route35.asm
@@ -20,7 +20,7 @@
trainer BIRD_KEEPER, BRYAN, EVENT_BEAT_BIRD_KEEPER_BRYAN, BirdKeeperBryanSeenText, BirdKeeperBryanBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext BirdKeeperBryanAfterBattleText
waitbutton
@@ -32,7 +32,7 @@
.Script:
writecode VAR_CALLERID, PHONE_JUGGLER_IRWIN
- end_if_just_battled
+ endifjustbattled
opentext
checkcellnum PHONE_JUGGLER_IRWIN
iftrue Route35NumberAcceptedM
@@ -48,8 +48,8 @@
scall Route35AskNumber2M
.AskForNumber:
askforphonenumber PHONE_JUGGLER_IRWIN
- if_equal PHONE_CONTACTS_FULL, Route35PhoneFullM
- if_equal PHONE_CONTACT_REFUSED, Route35NumberDeclinedM
+ ifequal PHONE_CONTACTS_FULL, Route35PhoneFullM
+ ifequal PHONE_CONTACT_REFUSED, Route35NumberDeclinedM
trainertotext JUGGLER, IRWIN1, MEM_BUFFER_0
scall Route35RegisteredNumberM
jump Route35NumberAcceptedM
@@ -86,7 +86,7 @@
trainer CAMPER, IVAN, EVENT_BEAT_CAMPER_IVAN, CamperIvanSeenText, CamperIvanBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext CamperIvanAfterBattleText
waitbutton
@@ -97,7 +97,7 @@
trainer CAMPER, ELLIOT, EVENT_BEAT_CAMPER_ELLIOT, CamperElliotSeenText, CamperElliotBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext CamperElliotAfterBattleText
waitbutton
@@ -108,7 +108,7 @@
trainer PICNICKER, BROOKE, EVENT_BEAT_PICNICKER_BROOKE, PicnickerBrookeSeenText, PicnickerBrookeBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext PicnickerBrookeAfterBattleText
waitbutton
@@ -119,7 +119,7 @@
trainer PICNICKER, KIM, EVENT_BEAT_PICNICKER_KIM, PicnickerKimSeenText, PicnickerKimBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext PicnickerKimAfterBattleText
waitbutton
@@ -131,7 +131,7 @@
.Script:
writecode VAR_CALLERID, PHONE_BUG_CATCHER_ARNIE
- end_if_just_battled
+ endifjustbattled
opentext
checkflag ENGINE_ARNIE
iftrue .WantsBattle
@@ -151,8 +151,8 @@
scall Route35AskNumber2M
.AskForNumber:
askforphonenumber PHONE_BUG_CATCHER_ARNIE
- if_equal PHONE_CONTACTS_FULL, Route35PhoneFullM
- if_equal PHONE_CONTACT_REFUSED, Route35NumberDeclinedM
+ ifequal PHONE_CONTACTS_FULL, Route35PhoneFullM
+ ifequal PHONE_CONTACT_REFUSED, Route35NumberDeclinedM
trainertotext BUG_CATCHER, ARNIE1, MEM_BUFFER_0
scall Route35RegisteredNumberM
jump Route35NumberAcceptedM
@@ -161,11 +161,11 @@
scall Route35RematchM
winlosstext BugCatcherArnieBeatenText, 0
copybytetovar wArnieFightCount
- if_equal 4, .Fight4
- if_equal 3, .Fight3
- if_equal 2, .Fight2
- if_equal 1, .Fight1
- if_equal 0, .LoadFight0
+ ifequal 4, .Fight4
+ ifequal 3, .Fight3
+ ifequal 2, .Fight2
+ ifequal 1, .Fight1
+ ifequal 0, .LoadFight0
.Fight4:
checkevent EVENT_RESTORED_POWER_TO_KANTO
iftrue .LoadFight4
@@ -227,7 +227,7 @@
trainer FIREBREATHER, WALT, EVENT_BEAT_FIREBREATHER_WALT, FirebreatherWaltSeenText, FirebreatherWaltBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext FirebreatherWaltAfterBattleText
waitbutton
--- a/maps/Route35GoldenrodGate.asm
+++ b/maps/Route35GoldenrodGate.asm
@@ -24,7 +24,7 @@
buttonsound
waitsfx
checkcode VAR_PARTYCOUNT
- if_equal PARTY_LENGTH, .partyfull
+ ifequal PARTY_LENGTH, .partyfull
writetext UnknownText_0x69eb8
playsound SFX_KEY_ITEM
waitsfx
--- a/maps/Route35NationalParkGate.asm
+++ b/maps/Route35NationalParkGate.asm
@@ -35,9 +35,9 @@
.CheckIfContestAvailable:
checkcode VAR_WEEKDAY
- if_equal TUESDAY, .SetContestOfficer
- if_equal THURSDAY, .SetContestOfficer
- if_equal SATURDAY, .SetContestOfficer
+ ifequal TUESDAY, .SetContestOfficer
+ ifequal THURSDAY, .SetContestOfficer
+ ifequal SATURDAY, .SetContestOfficer
checkflag ENGINE_BUG_CONTEST_TIMER
iftrue .BugContestIsRunning
disappear ROUTE35NATIONALPARKGATE_OFFICER1
@@ -79,10 +79,10 @@
OfficerScript_0x6a204:
checkcode VAR_WEEKDAY
- if_equal SUNDAY, Route35NationalParkGate_NoContestToday
- if_equal MONDAY, Route35NationalParkGate_NoContestToday
- if_equal WEDNESDAY, Route35NationalParkGate_NoContestToday
- if_equal FRIDAY, Route35NationalParkGate_NoContestToday
+ ifequal SUNDAY, Route35NationalParkGate_NoContestToday
+ ifequal MONDAY, Route35NationalParkGate_NoContestToday
+ ifequal WEDNESDAY, Route35NationalParkGate_NoContestToday
+ ifequal FRIDAY, Route35NationalParkGate_NoContestToday
faceplayer
opentext
checkflag ENGINE_DAILY_BUG_CONTEST
@@ -92,7 +92,7 @@
yesorno
iffalse Route35NationalParkGate_DeclinedToParticipate
checkcode VAR_PARTYCOUNT
- if_greater_than 1, Route35NationalParkGate_LeaveTheRestBehind
+ ifgreater 1, Route35NationalParkGate_LeaveTheRestBehind
special ContestDropOffMons
clearevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER
Route35NationalParkGate_OkayToProceed:
@@ -117,7 +117,7 @@
Route35NationalParkGate_EnterContest:
checkcode VAR_FACING
- if_equal LEFT, Route35NationalParkGate_FacingLeft
+ ifequal LEFT, Route35NationalParkGate_FacingLeft
applymovement PLAYER, MovementData_0x6a2e5
end
@@ -127,13 +127,13 @@
Route35NationalParkGate_LeaveTheRestBehind:
checkcode VAR_PARTYCOUNT
- if_less_than PARTY_LENGTH, Route35NationalParkGate_LessThanFullParty
+ ifless PARTY_LENGTH, Route35NationalParkGate_LessThanFullParty
checkcode VAR_BOXSPACE
- if_equal 0, Route35NationalParkGate_NoRoomInBox
+ ifequal 0, Route35NationalParkGate_NoRoomInBox
Route35NationalParkGate_LessThanFullParty: ; 6a27d
special CheckFirstMonIsEgg
- if_equal TRUE, Route35NationalParkGate_FirstMonIsEgg
+ ifequal TRUE, Route35NationalParkGate_FirstMonIsEgg
writetext UnknownText_0x6a4c6
yesorno
iffalse Route35NationalParkGate_DeclinedToLeaveMonsBehind
--- a/maps/Route36.asm
+++ b/maps/Route36.asm
@@ -25,7 +25,7 @@
.ArthurCallback:
checkcode VAR_WEEKDAY
- if_equal THURSDAY, .ArthurAppears
+ ifequal THURSDAY, .ArthurAppears
disappear ROUTE36_ARTHUR
return
@@ -77,7 +77,7 @@
loadwildmon SUDOWOODO, 20
startbattle
setevent EVENT_FOUGHT_SUDOWOODO
- if_equal $2, DidntCatchSudowoodo
+ ifequal $2, DidntCatchSudowoodo
disappear ROUTE36_WEIRD_TREE
variablesprite SPRITE_WEIRD_TREE, SPRITE_TWIN
reloadmapafterbattle
@@ -107,7 +107,7 @@
closetext
clearevent EVENT_FLORIA_AT_FLOWER_SHOP
checkcode VAR_FACING
- if_equal UP, .Up
+ ifequal UP, .Up
applymovement ROUTE36_FLORIA, FloriaMovement1
disappear ROUTE36_FLORIA
end
@@ -169,7 +169,7 @@
.Script:
writecode VAR_CALLERID, PHONE_SCHOOLBOY_ALAN
- end_if_just_battled
+ endifjustbattled
opentext
checkflag ENGINE_ALAN
iftrue .ChooseRematch
@@ -189,8 +189,8 @@
scall .AskNumber2
.ContinueAskForPhoneNumber:
askforphonenumber PHONE_SCHOOLBOY_ALAN
- if_equal PHONE_CONTACTS_FULL, .PhoneFull
- if_equal PHONE_CONTACT_REFUSED, .NumberDeclined
+ ifequal PHONE_CONTACTS_FULL, .PhoneFull
+ ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
trainertotext SCHOOLBOY, ALAN1, MEM_BUFFER_0
scall .RegisteredNumber
jump .NumberAccepted
@@ -199,11 +199,11 @@
scall .Rematch
winlosstext SchoolboyAlan1BeatenText, 0
copybytetovar wAlanFightCount
- if_equal 4, .Fight4
- if_equal 3, .Fight3
- if_equal 2, .Fight2
- if_equal 1, .Fight1
- if_equal 0, .LoadFight0
+ ifequal 4, .Fight4
+ ifequal 3, .Fight3
+ ifequal 2, .Fight2
+ ifequal 1, .Fight1
+ ifequal 0, .LoadFight0
.Fight4:
checkevent EVENT_RESTORED_POWER_TO_KANTO
iftrue .LoadFight4
@@ -306,7 +306,7 @@
trainer PSYCHIC_T, MARK, EVENT_BEAT_PSYCHIC_MARK, PsychicMarkSeenText, PsychicMarkBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext PsychicMarkAfterBattleText
waitbutton
@@ -319,7 +319,7 @@
checkevent EVENT_GOT_HARD_STONE_FROM_ARTHUR
iftrue .AlreadyGotStone
checkcode VAR_WEEKDAY
- if_not_equal THURSDAY, ArthurNotThursdayScript
+ ifnotequal THURSDAY, ArthurNotThursdayScript
checkevent EVENT_MET_ARTHUR_OF_THURSDAY
iftrue .MetArthur
writetext MeetArthurText
--- a/maps/Route36NationalParkGate.asm
+++ b/maps/Route36NationalParkGate.asm
@@ -46,9 +46,9 @@
checkevent EVENT_WARPED_FROM_ROUTE_35_NATIONAL_PARK_GATE
iftrue .Return
checkcode VAR_WEEKDAY
- if_equal TUESDAY, .SetContestOfficer
- if_equal THURSDAY, .SetContestOfficer
- if_equal SATURDAY, .SetContestOfficer
+ ifequal TUESDAY, .SetContestOfficer
+ ifequal THURSDAY, .SetContestOfficer
+ ifequal SATURDAY, .SetContestOfficer
checkflag ENGINE_BUG_CONTEST_TIMER
iftrue .SetContestOfficer
disappear ROUTE36NATIONALPARKGATE_OFFICER1
@@ -140,10 +140,10 @@
Route36OfficerScriptContest:
checkcode VAR_WEEKDAY
- if_equal SUNDAY, _ContestNotOn
- if_equal MONDAY, _ContestNotOn
- if_equal WEDNESDAY, _ContestNotOn
- if_equal FRIDAY, _ContestNotOn
+ ifequal SUNDAY, _ContestNotOn
+ ifequal MONDAY, _ContestNotOn
+ ifequal WEDNESDAY, _ContestNotOn
+ ifequal FRIDAY, _ContestNotOn
faceplayer
opentext
checkflag ENGINE_DAILY_BUG_CONTEST
@@ -153,7 +153,7 @@
yesorno
iffalse .DecidedNotToJoinContest
checkcode VAR_PARTYCOUNT
- if_greater_than 1, .LeaveMonsWithOfficer
+ ifgreater 1, .LeaveMonsWithOfficer
special ContestDropOffMons
clearevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER
.ResumeStartingContest:
@@ -180,12 +180,12 @@
.LeaveMonsWithOfficer:
checkcode VAR_PARTYCOUNT
- if_less_than PARTY_LENGTH, .ContinueLeavingMons
+ ifless PARTY_LENGTH, .ContinueLeavingMons
checkcode VAR_BOXSPACE
- if_equal 0, .BoxFull
+ ifequal 0, .BoxFull
.ContinueLeavingMons:
special CheckFirstMonIsEgg
- if_equal TRUE, .FirstMonIsEgg
+ ifequal TRUE, .FirstMonIsEgg
writetext UnknownText_0x6afb0
yesorno
iffalse .RefusedToLeaveMons
--- a/maps/Route37.asm
+++ b/maps/Route37.asm
@@ -15,7 +15,7 @@
.Sunny:
checkcode VAR_WEEKDAY
- if_equal SUNDAY, .SunnyAppears
+ ifequal SUNDAY, .SunnyAppears
disappear ROUTE37_SUNNY
return
@@ -27,7 +27,7 @@
trainer TWINS, ANNANDANNE1, EVENT_BEAT_TWINS_ANN_AND_ANNE, TwinsAnnandanne1SeenText, TwinsAnnandanne1BeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext TwinsAnnandanne1AfterBattleText
waitbutton
@@ -38,7 +38,7 @@
trainer TWINS, ANNANDANNE2, EVENT_BEAT_TWINS_ANN_AND_ANNE, TwinsAnnandanne2SeenText, TwinsAnnandanne2BeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext TwinsAnnandanne2AfterBattleText
waitbutton
@@ -49,7 +49,7 @@
trainer PSYCHIC_T, GREG, EVENT_BEAT_PSYCHIC_GREG, PsychicGregSeenText, PsychicGregBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext PsychicGregAfterBattleText
waitbutton
@@ -62,7 +62,7 @@
checkevent EVENT_GOT_MAGNET_FROM_SUNNY
iftrue SunnySundayScript
checkcode VAR_WEEKDAY
- if_not_equal SUNDAY, SunnyNotSundayScript
+ ifnotequal SUNDAY, SunnyNotSundayScript
checkevent EVENT_MET_SUNNY_OF_SUNDAY
iftrue .MetSunny
writetext MeetSunnyText
--- a/maps/Route38.asm
+++ b/maps/Route38.asm
@@ -16,7 +16,7 @@
trainer BIRD_KEEPER, TOBY, EVENT_BEAT_BIRD_KEEPER_TOBY, BirdKeeperTobySeenText, BirdKeeperTobyBeatenText, 0, .Script
.Script
- end_if_just_battled
+ endifjustbattled
opentext
writetext BirdKeeperTobyAfterBattleText
waitbutton
@@ -27,7 +27,7 @@
trainer SAILOR, HARRY, EVENT_BEAT_SAILOR_HARRY, SailorHarrySeenText, SailorHarryBeatenText, 0, .Script
.Script
- end_if_just_battled
+ endifjustbattled
opentext
writetext SailorHarryAfterBattleText
waitbutton
@@ -39,7 +39,7 @@
.Script
writecode VAR_CALLERID, PHONE_LASS_DANA
- end_if_just_battled
+ endifjustbattled
opentext
checkflag ENGINE_DANA
iftrue .DanaRematch
@@ -59,8 +59,8 @@
scall .AskNumber2F
.AskForPhoneNumber:
askforphonenumber PHONE_LASS_DANA
- if_equal PHONE_CONTACTS_FULL, .PhoneFull
- if_equal PHONE_CONTACT_REFUSED, .DeclinedPhoneNumber
+ ifequal PHONE_CONTACTS_FULL, .PhoneFull
+ ifequal PHONE_CONTACT_REFUSED, .DeclinedPhoneNumber
trainertotext LASS, DANA1, MEM_BUFFER_0
scall .RegisteredPhoneNumber
jump .NumberAccepted
@@ -69,11 +69,11 @@
scall .Rematch
winlosstext LassDana1BeatenText, 0
copybytetovar wDanaFightCount
- if_equal 4, .Fight4
- if_equal 3, .Fight3
- if_equal 2, .Fight2
- if_equal 1, .Fight1
- if_equal 0, .LoadFight0
+ ifequal 4, .Fight4
+ ifequal 3, .Fight3
+ ifequal 2, .Fight2
+ ifequal 1, .Fight1
+ ifequal 0, .LoadFight0
.Fight4:
checkevent EVENT_RESTORED_POWER_TO_KANTO
iftrue .LoadFight4
@@ -177,7 +177,7 @@
.Script
writecode VAR_CALLERID, PHONE_SCHOOLBOY_CHAD
- end_if_just_battled
+ endifjustbattled
opentext
checkflag ENGINE_CHAD
iftrue .ChadRematch
@@ -195,8 +195,8 @@
scall .AskPhoneNumber2
.AskToRegisterNumber:
askforphonenumber PHONE_SCHOOLBOY_CHAD
- if_equal PHONE_CONTACTS_FULL, .PhoneFull
- if_equal PHONE_CONTACT_REFUSED, .SaidNo
+ ifequal PHONE_CONTACTS_FULL, .PhoneFull
+ ifequal PHONE_CONTACT_REFUSED, .SaidNo
trainertotext SCHOOLBOY, CHAD1, MEM_BUFFER_0
scall .RegisteredChad
jump .HaveChadsNumber
@@ -205,11 +205,11 @@
scall .Rematch
winlosstext SchoolboyChad1BeatenText, 0
copybytetovar wChadFightCount
- if_equal 4, .Fight4
- if_equal 3, .Fight3
- if_equal 2, .Fight2
- if_equal 1, .Fight1
- if_equal 0, .LoadFight0
+ ifequal 4, .Fight4
+ ifequal 3, .Fight3
+ ifequal 2, .Fight2
+ ifequal 1, .Fight1
+ ifequal 0, .LoadFight0
.Fight4:
checkevent EVENT_RESTORED_POWER_TO_KANTO
iftrue .LoadFight4
@@ -293,7 +293,7 @@
trainer BEAUTY, VALERIE, EVENT_BEAT_BEAUTY_VALERIE, BeautyValerieSeenText, BeautyValerieBeatenText, 0, .Script
.Script
- end_if_just_battled
+ endifjustbattled
opentext
writetext BeautyValerieAfterBattleText
waitbutton
@@ -304,7 +304,7 @@
trainer BEAUTY, OLIVIA, EVENT_BEAT_BEAUTY_OLIVIA, BeautyOliviaSeenText, BeautyOliviaBeatenText, 0, .Script
.Script
- end_if_just_battled
+ endifjustbattled
opentext
writetext BeautyOliviaAfterBattleText
waitbutton
--- a/maps/Route39.asm
+++ b/maps/Route39.asm
@@ -28,7 +28,7 @@
.Script:
writecode VAR_CALLERID, PHONE_POKEFANM_DEREK
- end_if_just_battled
+ endifjustbattled
opentext
checkflag ENGINE_DEREK_HAS_NUGGET
iftrue .HasNugget
@@ -48,8 +48,8 @@
scall .AskNumber2
.AskForNumber:
askforphonenumber PHONE_POKEFANM_DEREK
- if_equal PHONE_CONTACTS_FULL, .PhoneFull
- if_equal PHONE_CONTACT_REFUSED, .NumberDeclined
+ ifequal PHONE_CONTACTS_FULL, .PhoneFull
+ ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
trainertotext POKEFANM, DEREK1, MEM_BUFFER_0
scall .RegisteredNumber
jump .NumberAccepted
@@ -106,7 +106,7 @@
trainer POKEFANF, RUTH, EVENT_BEAT_POKEFANF_RUTH, PokefanfRuthSeenText, PokefanfRuthBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext PokefanfRuthAfterBattleText
waitbutton
@@ -117,7 +117,7 @@
trainer SAILOR, EUGENE, EVENT_BEAT_SAILOR_EUGENE, SailorEugeneSeenText, SailorEugeneBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext SailorEugeneAfterBattleText
waitbutton
@@ -128,7 +128,7 @@
trainer PSYCHIC_T, NORMAN, EVENT_BEAT_PSYCHIC_NORMAN, PsychicNormanSeenText, PsychicNormanBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext PsychicNormanAfterBattleText
waitbutton
--- a/maps/Route39Barn.asm
+++ b/maps/Route39Barn.asm
@@ -70,9 +70,9 @@
copybytetovar MooMooBerries
addvar 1
copyvartobyte MooMooBerries
- if_equal 3, .ThreeBerries
- if_equal 5, .FiveBerries
- if_equal 7, .SevenBerries
+ ifequal 3, .ThreeBerries
+ ifequal 5, .FiveBerries
+ ifequal 7, .SevenBerries
writetext Text_GaveBerry
waitbutton
closetext
--- a/maps/Route39Farmhouse.asm
+++ b/maps/Route39Farmhouse.asm
@@ -26,7 +26,7 @@
yesorno
iffalse FarmerMScript_NoSale
checkmoney YOUR_MONEY, 500
- if_equal HAVE_LESS, FarmerMScript_NoMoney
+ ifequal HAVE_LESS, FarmerMScript_NoMoney
giveitem MOOMOO_MILK
iffalse FarmerMScript_NoRoom
takemoney YOUR_MONEY, 500
--- a/maps/Route4.asm
+++ b/maps/Route4.asm
@@ -13,7 +13,7 @@
trainer BIRD_KEEPER, HANK, EVENT_BEAT_BIRD_KEEPER_HANK, BirdKeeperHankSeenText, BirdKeeperHankBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext BirdKeeperHankAfterBattleText
waitbutton
@@ -24,7 +24,7 @@
trainer PICNICKER, HOPE, EVENT_BEAT_PICNICKER_HOPE, PicnickerHopeSeenText, PicnickerHopeBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext PicnickerHopeAfterBattleText
waitbutton
@@ -35,7 +35,7 @@
trainer PICNICKER, SHARON, EVENT_BEAT_PICNICKER_SHARON, PicnickerSharonSeenText, PicnickerSharonBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext PicnickerSharonAfterBattleText
waitbutton
--- a/maps/Route40.asm
+++ b/maps/Route40.asm
@@ -21,7 +21,7 @@
.MonicaCallback:
clearevent EVENT_BATTLE_TOWER_OUTSIDE_SAILOR
checkcode VAR_WEEKDAY
- if_equal MONDAY, .MonicaAppears
+ ifequal MONDAY, .MonicaAppears
disappear ROUTE40_MONICA
return
@@ -33,7 +33,7 @@
trainer SWIMMERF, ELAINE, EVENT_BEAT_SWIMMERF_ELAINE, SwimmerfElaineSeenText, SwimmerfElaineBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext SwimmerfElaineAfterBattleText
waitbutton
@@ -44,7 +44,7 @@
trainer SWIMMERF, PAULA, EVENT_BEAT_SWIMMERF_PAULA, SwimmerfPaulaSeenText, SwimmerfPaulaBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext SwimmerfPaulaAfterBattleText
waitbutton
@@ -55,7 +55,7 @@
trainer SWIMMERM, SIMON, EVENT_BEAT_SWIMMERM_SIMON, SwimmermSimonSeenText, SwimmermSimonBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext SwimmermSimonAfterBattleText
waitbutton
@@ -66,7 +66,7 @@
trainer SWIMMERM, RANDALL, EVENT_BEAT_SWIMMERM_RANDALL, SwimmermRandallSeenText, SwimmermRandallBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext SwimmermRandallAfterBattleText
waitbutton
@@ -96,7 +96,7 @@
checkevent EVENT_GOT_SHARP_BEAK_FROM_MONICA
iftrue .Monday
checkcode VAR_WEEKDAY
- if_not_equal MONDAY, .NotMonday
+ ifnotequal MONDAY, .NotMonday
checkevent EVENT_MET_MONICA_OF_MONDAY
iftrue .MetMonica
writetext MeetMonicaText
--- a/maps/Route41.asm
+++ b/maps/Route41.asm
@@ -19,7 +19,7 @@
trainer SWIMMERF, KAYLEE, EVENT_BEAT_SWIMMERF_KAYLEE, SwimmerfKayleeSeenText, SwimmerfKayleeBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext SwimmerfKayleeAfterBattleText
waitbutton
@@ -30,7 +30,7 @@
trainer SWIMMERF, SUSIE, EVENT_BEAT_SWIMMERF_SUSIE, SwimmerfSusieSeenText, SwimmerfSusieBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext SwimmerfSusieAfterBattleText
waitbutton
@@ -41,7 +41,7 @@
trainer SWIMMERF, DENISE, EVENT_BEAT_SWIMMERF_DENISE, SwimmerfDeniseSeenText, SwimmerfDeniseBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext SwimmerfDeniseAfterBattleText
waitbutton
@@ -52,7 +52,7 @@
trainer SWIMMERF, KARA, EVENT_BEAT_SWIMMERF_KARA, SwimmerfKaraSeenText, SwimmerfKaraBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext SwimmerfKaraAfterBattleText
waitbutton
@@ -63,7 +63,7 @@
trainer SWIMMERF, WENDY, EVENT_BEAT_SWIMMERF_WENDY, SwimmerfWendySeenText, SwimmerfWendyBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext SwimmerfWendyAfterBattleText
waitbutton
@@ -74,7 +74,7 @@
trainer SWIMMERM, CHARLIE, EVENT_BEAT_SWIMMERM_CHARLIE, SwimmermCharlieSeenText, SwimmermCharlieBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext SwimmermCharlieAfterBattleText
waitbutton
@@ -85,7 +85,7 @@
trainer SWIMMERM, GEORGE, EVENT_BEAT_SWIMMERM_GEORGE, SwimmermGeorgeSeenText, SwimmermGeorgeBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext SwimmermGeorgeAfterBattleText
waitbutton
@@ -96,7 +96,7 @@
trainer SWIMMERM, BERKE, EVENT_BEAT_SWIMMERM_BERKE, SwimmermBerkeSeenText, SwimmermBerkeBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext SwimmermBerkeAfterBattleText
waitbutton
@@ -107,7 +107,7 @@
trainer SWIMMERM, KIRK, EVENT_BEAT_SWIMMERM_KIRK, SwimmermKirkSeenText, SwimmermKirkBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext SwimmermKirkAfterBattleText
waitbutton
@@ -118,7 +118,7 @@
trainer SWIMMERM, MATHEW, EVENT_BEAT_SWIMMERM_MATHEW, SwimmermMathewSeenText, SwimmermMathewBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext SwimmermMathewAfterBattleText
waitbutton
--- a/maps/Route42.asm
+++ b/maps/Route42.asm
@@ -39,7 +39,7 @@
.Script:
writecode VAR_CALLERID, PHONE_FISHER_TULLY
- end_if_just_battled
+ endifjustbattled
opentext
checkflag ENGINE_TULLY
iftrue .WantsBattle
@@ -59,8 +59,8 @@
scall .AskNumber2
.AskForNumber:
askforphonenumber PHONE_FISHER_TULLY
- if_equal PHONE_CONTACTS_FULL, .PhoneFull
- if_equal PHONE_CONTACT_REFUSED, .NumberDeclined
+ ifequal PHONE_CONTACTS_FULL, .PhoneFull
+ ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
trainertotext FISHER, TULLY1, MEM_BUFFER_0
scall .RegisteredNumber
jump .NumberAccepted
@@ -69,10 +69,10 @@
scall .Rematch
winlosstext FisherTullyBeatenText, 0
copybytetovar wTullyFightCount
- if_equal 3, .Fight3
- if_equal 2, .Fight2
- if_equal 1, .Fight1
- if_equal 0, .LoadFight0
+ ifequal 3, .Fight3
+ ifequal 2, .Fight2
+ ifequal 1, .Fight1
+ ifequal 0, .LoadFight0
.Fight3:
checkevent EVENT_RESTORED_POWER_TO_KANTO
iftrue .LoadFight3
@@ -164,7 +164,7 @@
trainer POKEMANIAC, SHANE, EVENT_BEAT_POKEMANIAC_SHANE, PokemaniacShaneSeenText, PokemaniacShaneBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext PokemaniacShaneAfterBattleText
waitbutton
@@ -175,7 +175,7 @@
trainer HIKER, BENJAMIN, EVENT_BEAT_HIKER_BENJAMIN, HikerBenjaminSeenText, HikerBenjaminBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext HikerBenjaminAfterBattleText
waitbutton
--- a/maps/Route43.asm
+++ b/maps/Route43.asm
@@ -28,7 +28,7 @@
trainer CAMPER, SPENCER, EVENT_BEAT_CAMPER_SPENCER, CamperSpencerSeenText, CamperSpencerBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext CamperSpencerAfterBattleText
waitbutton
@@ -39,7 +39,7 @@
trainer POKEMANIAC, BEN, EVENT_BEAT_POKEMANIAC_BEN, PokemaniacBenSeenText, PokemaniacBenBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext PokemaniacBenAfterBattleText
waitbutton
@@ -51,7 +51,7 @@
.Script:
writecode VAR_CALLERID, PHONE_POKEMANIAC_BRENT
- end_if_just_battled
+ endifjustbattled
opentext
checkflag ENGINE_BRENT
iftrue .WantsBattle
@@ -69,8 +69,8 @@
scall .AskNumber2
.AskForNumber:
askforphonenumber PHONE_POKEMANIAC_BRENT
- if_equal PHONE_CONTACTS_FULL, .PhoneFull
- if_equal PHONE_CONTACT_REFUSED, .NumberDeclined
+ ifequal PHONE_CONTACTS_FULL, .PhoneFull
+ ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
trainertotext POKEMANIAC, BRENT1, MEM_BUFFER_0
scall .RegisteredNumber
jump .NumberAccepted
@@ -79,10 +79,10 @@
scall .Rematch
winlosstext PokemaniacBrentBeatenText, 0
copybytetovar wBrentFightCount
- if_equal 3, .Fight3
- if_equal 2, .Fight2
- if_equal 1, .Fight1
- if_equal 0, .LoadFight0
+ ifequal 3, .Fight3
+ ifequal 2, .Fight2
+ ifequal 1, .Fight1
+ ifequal 0, .LoadFight0
.Fight3:
checkevent EVENT_RESTORED_POWER_TO_KANTO
iftrue .LoadFight3
@@ -155,7 +155,7 @@
trainer POKEMANIAC, RON, EVENT_BEAT_POKEMANIAC_RON, PokemaniacRonSeenText, PokemaniacRonBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext PokemaniacRonAfterBattleText
waitbutton
@@ -166,7 +166,7 @@
trainer FISHER, MARVIN, EVENT_BEAT_FISHER_MARVIN, FisherMarvinSeenText, FisherMarvinBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext FisherMarvinAfterBattleText
waitbutton
@@ -178,7 +178,7 @@
.Script:
writecode VAR_CALLERID, PHONE_PICNICKER_TIFFANY
- end_if_just_battled
+ endifjustbattled
opentext
checkflag ENGINE_TIFFANY
iftrue .WantsBattle
@@ -200,8 +200,8 @@
scall .AskNumber2
.AskForNumber:
askforphonenumber PHONE_PICNICKER_TIFFANY
- if_equal PHONE_CONTACTS_FULL, .PhoneFull
- if_equal PHONE_CONTACT_REFUSED, .NumberDeclined
+ ifequal PHONE_CONTACTS_FULL, .PhoneFull
+ ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
trainertotext PICNICKER, TIFFANY3, MEM_BUFFER_0
scall .RegisteredNumber
jump .NumberAccepted
@@ -210,10 +210,10 @@
scall .Rematch
winlosstext PicnickerTiffanyBeatenText, 0
copybytetovar wTiffanyFightCount
- if_equal 3, .Fight3
- if_equal 2, .Fight2
- if_equal 1, .Fight1
- if_equal 0, .LoadFight0
+ ifequal 3, .Fight3
+ ifequal 2, .Fight2
+ ifequal 1, .Fight1
+ ifequal 0, .LoadFight0
.Fight3:
checkevent EVENT_RESTORED_POWER_TO_KANTO
iftrue .LoadFight3
--- a/maps/Route43Gate.asm
+++ b/maps/Route43Gate.asm
@@ -33,8 +33,8 @@
.RocketTakeover:
playmusic MUSIC_ROCKET_ENCOUNTER
checkcode VAR_FACING
- if_equal DOWN, RocketScript_Southbound
- if_equal UP, RocketScript_Northbound
+ ifequal DOWN, RocketScript_Southbound
+ ifequal UP, RocketScript_Northbound
setscene SCENE_FINISHED
end
@@ -49,7 +49,7 @@
writetext RocketText_TollFee
buttonsound
checkmoney YOUR_MONEY, ROUTE43GATE_TOLL - 1
- if_equal HAVE_MORE, RocketScript_TollSouth
+ ifequal HAVE_MORE, RocketScript_TollSouth
jump RocketScript_YoureBrokeSouth
RocketScript_TollSouth:
@@ -81,7 +81,7 @@
writetext RocketText_TollFee
buttonsound
checkmoney YOUR_MONEY, ROUTE43GATE_TOLL - 1
- if_equal HAVE_MORE, RocketScript_TollNorth
+ ifequal HAVE_MORE, RocketScript_TollNorth
jump RocketScript_YoureBrokeNorth
RocketScript_TollNorth:
--- a/maps/Route44.asm
+++ b/maps/Route44.asm
@@ -21,7 +21,7 @@
.Script:
writecode VAR_CALLERID, PHONE_BIRDKEEPER_VANCE
- end_if_just_battled
+ endifjustbattled
opentext
checkflag ENGINE_VANCE
iftrue .WantsBattle
@@ -39,8 +39,8 @@
scall Route44AskNumber2M
.AskForNumber:
askforphonenumber PHONE_BIRDKEEPER_VANCE
- if_equal PHONE_CONTACTS_FULL, Route44PhoneFullM
- if_equal PHONE_CONTACT_REFUSED, Route44NumberDeclinedM
+ ifequal PHONE_CONTACTS_FULL, Route44PhoneFullM
+ ifequal PHONE_CONTACT_REFUSED, Route44NumberDeclinedM
trainertotext BIRD_KEEPER, VANCE1, MEM_BUFFER_0
scall Route44RegisteredNumberM
jump Route44NumberAcceptedM
@@ -49,9 +49,9 @@
scall Route44RematchM
winlosstext BirdKeeperVance1BeatenText, 0
copybytetovar wVanceFightCount
- if_equal 2, .Fight2
- if_equal 1, .Fight1
- if_equal 0, .LoadFight0
+ ifequal 2, .Fight2
+ ifequal 1, .Fight1
+ ifequal 0, .LoadFight0
.Fight2:
checkevent EVENT_RESTORED_POWER_TO_KANTO
iftrue .LoadFight2
@@ -151,7 +151,7 @@
trainer PSYCHIC_T, PHIL, EVENT_BEAT_PSYCHIC_PHIL, PsychicPhilSeenText, PsychicPhilBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext PsychicPhilAfterBattleText
waitbutton
@@ -163,7 +163,7 @@
.Script:
writecode VAR_CALLERID, PHONE_FISHER_WILTON
- end_if_just_battled
+ endifjustbattled
opentext
checkflag ENGINE_WILTON
iftrue .WantsBattle
@@ -183,8 +183,8 @@
scall Route44AskNumber2M
.AskForNumber:
askforphonenumber PHONE_FISHER_WILTON
- if_equal PHONE_CONTACTS_FULL, Route44PhoneFullM
- if_equal PHONE_CONTACT_REFUSED, Route44NumberDeclinedM
+ ifequal PHONE_CONTACTS_FULL, Route44PhoneFullM
+ ifequal PHONE_CONTACT_REFUSED, Route44NumberDeclinedM
trainertotext FISHER, WILTON1, MEM_BUFFER_0
scall Route44RegisteredNumberM
jump Route44NumberAcceptedM
@@ -193,9 +193,9 @@
scall Route44RematchM
winlosstext FisherWilton1BeatenText, 0
copybytetovar wWiltonFightCount
- if_equal 2, .Fight2
- if_equal 1, .Fight1
- if_equal 0, .LoadFight0
+ ifequal 2, .Fight2
+ ifequal 1, .Fight1
+ ifequal 0, .LoadFight0
.Fight2:
checkevent EVENT_RESTORED_POWER_TO_KANTO
iftrue .LoadFight2
@@ -257,7 +257,7 @@
trainer FISHER, EDGAR, EVENT_BEAT_FISHER_EDGAR, FisherEdgarSeenText, FisherEdgarBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext FisherEdgarAfterBattleText
waitbutton
@@ -268,7 +268,7 @@
trainer COOLTRAINERF, CYBIL, EVENT_BEAT_COOLTRAINERF_CYBIL, CooltrainerfCybilSeenText, CooltrainerfCybilBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext CooltrainerfCybilAfterBattleText
waitbutton
@@ -279,7 +279,7 @@
trainer POKEMANIAC, ZACH, EVENT_BEAT_POKEMANIAC_ZACH, PokemaniacZachSeenText, PokemaniacZachBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext PokemaniacZachAfterBattleText
waitbutton
@@ -290,7 +290,7 @@
trainer COOLTRAINERM, ALLEN, EVENT_BEAT_COOLTRAINERM_ALLEN, CooltrainermAllenSeenText, CooltrainermAllenBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext CooltrainermAllenAfterBattleText
waitbutton
--- a/maps/Route45.asm
+++ b/maps/Route45.asm
@@ -23,7 +23,7 @@
.Script:
writecode VAR_CALLERID, PHONE_BLACKBELT_KENJI
- end_if_just_battled
+ endifjustbattled
opentext
checkcellnum PHONE_BLACKBELT_KENJI
iftrue .Registered
@@ -40,8 +40,8 @@
scall Route45AskNumber2M
.AskForNumber:
askforphonenumber PHONE_BLACKBELT_KENJI
- if_equal PHONE_CONTACTS_FULL, Route45PhoneFullM
- if_equal PHONE_CONTACT_REFUSED, Route45NumberDeclinedM
+ ifequal PHONE_CONTACTS_FULL, Route45PhoneFullM
+ ifequal PHONE_CONTACT_REFUSED, Route45NumberDeclinedM
trainertotext BLACKBELT_T, KENJI3, MEM_BUFFER_0
scall Route45RegisteredNumberM
jump Route45NumberAcceptedM
@@ -48,7 +48,7 @@
.Registered:
checkcode VAR_KENJI_BREAK
- if_not_equal 1, Route45NumberAcceptedM
+ ifnotequal 1, Route45NumberAcceptedM
checkmorn
iftrue .Morning
checknite
@@ -126,7 +126,7 @@
trainer HIKER, ERIK, EVENT_BEAT_HIKER_ERIK, HikerErikSeenText, HikerErikBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext HikerErikAfterBattleText
waitbutton
@@ -137,7 +137,7 @@
trainer HIKER, MICHAEL, EVENT_BEAT_HIKER_MICHAEL, HikerMichaelSeenText, HikerMichaelBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext HikerMichaelAfterBattleText
waitbutton
@@ -149,7 +149,7 @@
.Script:
writecode VAR_CALLERID, PHONE_HIKER_PARRY
- end_if_just_battled
+ endifjustbattled
opentext
checkflag ENGINE_PARRY
iftrue .WantsBattle
@@ -167,8 +167,8 @@
scall Route45AskNumber2M
.AskForNumber:
askforphonenumber PHONE_HIKER_PARRY
- if_equal PHONE_CONTACTS_FULL, Route45PhoneFullM
- if_equal PHONE_CONTACT_REFUSED, Route45NumberDeclinedM
+ ifequal PHONE_CONTACTS_FULL, Route45PhoneFullM
+ ifequal PHONE_CONTACT_REFUSED, Route45NumberDeclinedM
trainertotext HIKER, PARRY1, MEM_BUFFER_0
scall Route45RegisteredNumberM
jump Route45NumberAcceptedM
@@ -177,9 +177,9 @@
scall Route45RematchM
winlosstext HikerParry3BeatenText, 0
copybytetovar wParryFightCount
- if_equal 2, .Fight2
- if_equal 1, .Fight1
- if_equal 0, .LoadFight0
+ ifequal 2, .Fight2
+ ifequal 1, .Fight1
+ ifequal 0, .LoadFight0
.Fight2:
checkevent EVENT_RESTORED_POWER_TO_KANTO
iftrue .LoadFight2
@@ -234,7 +234,7 @@
trainer HIKER, TIMOTHY, EVENT_BEAT_HIKER_TIMOTHY, HikerTimothySeenText, HikerTimothyBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext HikerTimothyAfterBattleText
waitbutton
@@ -245,7 +245,7 @@
trainer COOLTRAINERM, RYAN, EVENT_BEAT_COOLTRAINERM_RYAN, CooltrainermRyanSeenText, CooltrainermRyanBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext CooltrainermRyanAfterBattleText
waitbutton
@@ -256,7 +256,7 @@
trainer COOLTRAINERF, KELLY, EVENT_BEAT_COOLTRAINERF_KELLY, CooltrainerfKellySeenText, CooltrainerfKellyBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext CooltrainerfKellyAfterBattleText
waitbutton
--- a/maps/Route46.asm
+++ b/maps/Route46.asm
@@ -15,7 +15,7 @@
trainer CAMPER, TED, EVENT_BEAT_CAMPER_TED, CamperTedSeenText, CamperTedBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext CamperTedAfterBattleText
waitbutton
@@ -27,7 +27,7 @@
.Script:
writecode VAR_CALLERID, PHONE_PICNICKER_ERIN
- end_if_just_battled
+ endifjustbattled
opentext
checkflag ENGINE_ERIN
iftrue .WantsBattle
@@ -45,8 +45,8 @@
scall Route46AskNumber2F
.AskForNumber:
askforphonenumber PHONE_PICNICKER_ERIN
- if_equal PHONE_CONTACTS_FULL, Route46PhoneFullF
- if_equal PHONE_CONTACT_REFUSED, Route46NumberDeclinedF
+ ifequal PHONE_CONTACTS_FULL, Route46PhoneFullF
+ ifequal PHONE_CONTACT_REFUSED, Route46NumberDeclinedF
trainertotext PICNICKER, ERIN1, MEM_BUFFER_0
scall Route46RegisteredNumberF
jump Route46NumberAcceptedF
@@ -55,9 +55,9 @@
scall Route46RematchF
winlosstext PicnickerErin1BeatenText, 0
copybytetovar wErinFightCount
- if_equal 2, .Fight2
- if_equal 1, .Fight1
- if_equal 0, .LoadFight0
+ ifequal 2, .Fight2
+ ifequal 1, .Fight1
+ ifequal 0, .LoadFight0
.Fight2:
checkevent EVENT_RESTORED_POWER_TO_KANTO
iftrue .LoadFight2
@@ -149,7 +149,7 @@
trainer HIKER, BAILEY, EVENT_BEAT_HIKER_BAILEY, HikerBaileySeenText, HikerBaileyBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext HikerBaileyAfterBattleText
waitbutton
--- a/maps/Route6.asm
+++ b/maps/Route6.asm
@@ -12,7 +12,7 @@
trainer POKEFANM, REX, EVENT_BEAT_POKEFANM_REX, PokefanmRexSeenText, PokefanmRexBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext PokefanmRexAfterBattleText
waitbutton
@@ -23,7 +23,7 @@
trainer POKEFANM, ALLAN, EVENT_BEAT_POKEFANM_ALLAN, PokefanmAllanSeenText, PokefanmAllanBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext PokefanmAllanAfterBattleText
waitbutton
--- a/maps/Route8.asm
+++ b/maps/Route8.asm
@@ -15,7 +15,7 @@
trainer BIKER, DWAYNE, EVENT_BEAT_BIKER_DWAYNE, BikerDwayneSeenText, BikerDwayneBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext BikerDwayneAfterBattleText
waitbutton
@@ -26,7 +26,7 @@
trainer BIKER, HARRIS, EVENT_BEAT_BIKER_HARRIS, BikerHarrisSeenText, BikerHarrisBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext BikerHarrisAfterBattleText
waitbutton
@@ -37,7 +37,7 @@
trainer BIKER, ZEKE, EVENT_BEAT_BIKER_ZEKE, BikerZekeSeenText, BikerZekeBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext BikerZekeAfterBattleText
waitbutton
@@ -48,7 +48,7 @@
trainer SUPER_NERD, SAM, EVENT_BEAT_SUPER_NERD_SAM, SupernerdSamSeenText, SupernerdSamBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext SupernerdSamAfterBattleText
waitbutton
@@ -59,7 +59,7 @@
trainer SUPER_NERD, TOM, EVENT_BEAT_SUPER_NERD_TOM, SupernerdTomSeenText, SupernerdTomBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext SupernerdTomAfterBattleText
waitbutton
--- a/maps/Route9.asm
+++ b/maps/Route9.asm
@@ -15,7 +15,7 @@
trainer CAMPER, DEAN, EVENT_BEAT_CAMPER_DEAN, CamperDeanSeenText, CamperDeanBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext CamperDeanAfterBattleText
waitbutton
@@ -26,7 +26,7 @@
trainer PICNICKER, HEIDI, EVENT_BEAT_PICNICKER_HEIDI, PicnickerHeidiSeenText, PicnickerHeidiBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext PicnickerHeidiAfterBattleText
waitbutton
@@ -37,7 +37,7 @@
trainer CAMPER, SID, EVENT_BEAT_CAMPER_SID, CamperSidSeenText, CamperSidBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext CamperSidAfterBattleText
waitbutton
@@ -48,7 +48,7 @@
trainer PICNICKER, EDNA, EVENT_BEAT_PICNICKER_EDNA, PicnickerEdnaSeenText, PicnickerEdnaBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext PicnickerEdnaAfterBattleText
waitbutton
@@ -59,7 +59,7 @@
trainer HIKER, TIM, EVENT_BEAT_HIKER_TIM, HikerTimSeenText, HikerTimBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext HikerTimAfterBattleText
waitbutton
@@ -70,7 +70,7 @@
trainer HIKER, SIDNEY, EVENT_BEAT_HIKER_SIDNEY, HikerSidneySeenText, HikerSidneyBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext HikerSidneyAfterBattleText
waitbutton
--- a/maps/RuinsOfAlphKabutoChamber.asm
+++ b/maps/RuinsOfAlphKabutoChamber.asm
@@ -84,7 +84,7 @@
faceplayer
opentext
checkcode VAR_UNOWNCOUNT
- if_equal NUM_UNOWN, UnknownScript_0x587cf
+ ifequal NUM_UNOWN, UnknownScript_0x587cf
checkevent EVENT_WALL_OPENED_IN_KABUTO_CHAMBER
iftrue UnknownScript_0x587c9
checkevent EVENT_SOLVED_KABUTO_PUZZLE
--- a/maps/RuinsOfAlphOutside.asm
+++ b/maps/RuinsOfAlphOutside.asm
@@ -28,7 +28,7 @@
.MaybeScientist:
checkcode VAR_UNOWNCOUNT
- if_greater_than 2, .YesScientist
+ ifgreater 2, .YesScientist
jump .NoScientist
.YesScientist:
@@ -103,7 +103,7 @@
trainer PSYCHIC_T, NATHAN, EVENT_BEAT_PSYCHIC_NATHAN, PsychicNathanSeenText, PsychicNathanBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext PsychicNathanAfterBattleText
waitbutton
@@ -114,7 +114,7 @@
trainer SUPER_NERD, STAN, EVENT_BEAT_SUPER_NERD_STAN, UnknownText_0x581e5, UnknownText_0x58217, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext SuperNerdStanAfterBattleText
waitbutton
--- a/maps/RuinsOfAlphResearchCenter.asm
+++ b/maps/RuinsOfAlphResearchCenter.asm
@@ -20,7 +20,7 @@
.ScientistCallback:
checkscene
- if_equal SCENE_RUINSOFALPHRESEARCHCENTER_GET_UNOWN_DEX, .ShowScientist
+ ifequal SCENE_RUINSOFALPHRESEARCHCENTER_GET_UNOWN_DEX, .ShowScientist
return
.ShowScientist:
@@ -61,7 +61,7 @@
faceplayer
opentext
checkcode VAR_UNOWNCOUNT
- if_equal NUM_UNOWN, UnknownScript_0x591df
+ ifequal NUM_UNOWN, UnknownScript_0x591df
writetext UnknownText_0x59311
waitbutton
closetext
@@ -77,7 +77,7 @@
faceplayer
opentext
checkcode VAR_UNOWNCOUNT
- if_equal NUM_UNOWN, UnknownScript_0x5920b
+ ifequal NUM_UNOWN, UnknownScript_0x5920b
checkflag ENGINE_UNOWN_DEX
iftrue UnknownScript_0x59205
checkevent EVENT_MADE_UNOWN_APPEAR_IN_RUINS
@@ -110,7 +110,7 @@
faceplayer
opentext
checkcode VAR_UNOWNCOUNT
- if_equal NUM_UNOWN, UnknownScript_0x5922e
+ ifequal NUM_UNOWN, UnknownScript_0x5922e
checkevent EVENT_MADE_UNOWN_APPEAR_IN_RUINS
iftrue UnknownScript_0x59228
writetext UnknownText_0x5954f
@@ -135,7 +135,7 @@
checkevent EVENT_RUINS_OF_ALPH_RESEARCH_CENTER_SCIENTIST
iftrue UnknownScript_0x59241
checkcode VAR_UNOWNCOUNT
- if_equal NUM_UNOWN, UnknownScript_0x59247
+ ifequal NUM_UNOWN, UnknownScript_0x59247
UnknownScript_0x59241:
writetext UnknownText_0x597b6
waitbutton
@@ -153,7 +153,7 @@
checkevent EVENT_RUINS_OF_ALPH_RESEARCH_CENTER_SCIENTIST
iftrue UnknownScript_0x5925a
checkcode VAR_UNOWNCOUNT
- if_equal NUM_UNOWN, UnknownScript_0x59260
+ ifequal NUM_UNOWN, UnknownScript_0x59260
UnknownScript_0x5925a:
writetext UnknownText_0x5980e
waitbutton
--- a/maps/SaffronGym.asm
+++ b/maps/SaffronGym.asm
@@ -48,7 +48,7 @@
trainer MEDIUM, REBECCA, EVENT_BEAT_MEDIUM_REBECCA, MediumRebeccaSeenText, MediumRebeccaBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext MediumRebeccaAfterBattleText
waitbutton
@@ -59,7 +59,7 @@
trainer PSYCHIC_T, FRANKLIN, EVENT_BEAT_PSYCHIC_FRANKLIN, PsychicFranklinSeenText, PsychicFranklinBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext PsychicFranklinAfterBattleText
waitbutton
@@ -70,7 +70,7 @@
trainer MEDIUM, DORIS, EVENT_BEAT_MEDIUM_DORIS, MediumDorisSeenText, MediumDorisBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext MediumDorisAfterBattleText
waitbutton
@@ -81,7 +81,7 @@
trainer PSYCHIC_T, JARED, EVENT_BEAT_PSYCHIC_JARED, PsychicJaredSeenText, PsychicJaredBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext PsychicJaredAfterBattleText
waitbutton
--- a/maps/SlowpokeWellB1F.asm
+++ b/maps/SlowpokeWellB1F.asm
@@ -21,7 +21,7 @@
trainer GRUNTM, GRUNTM_29, EVENT_BEAT_ROCKET_GRUNTM_29, GruntM29SeenText, GruntM29BeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext GruntM29AfterBattleText
waitbutton
@@ -75,7 +75,7 @@
trainer GRUNTM, GRUNTM_2, EVENT_BEAT_ROCKET_GRUNTM_2, GruntM2SeenText, GruntM2BeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext GruntM2AfterBattleText
waitbutton
@@ -86,7 +86,7 @@
trainer GRUNTF, GRUNTF_1, EVENT_BEAT_ROCKET_GRUNTF_1, GruntF1SeenText, GruntF1BeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext GruntF1AfterBattleText
waitbutton
--- a/maps/SproutTower1F.asm
+++ b/maps/SproutTower1F.asm
@@ -27,7 +27,7 @@
trainer SAGE, CHOW, EVENT_BEAT_SAGE_CHOW, SageChowSeenText, SageChowBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext SageChowAfterBattleText
waitbutton
--- a/maps/SproutTower2F.asm
+++ b/maps/SproutTower2F.asm
@@ -12,7 +12,7 @@
trainer SAGE, NICO, EVENT_BEAT_SAGE_NICO, SageNicoSeenText, SageNicoBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext SageNicoAfterBattleText
waitbutton
@@ -23,7 +23,7 @@
trainer SAGE, EDMOND, EVENT_BEAT_SAGE_EDMOND, SageEdmondSeenText, SageEdmondBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext SageEdmondAfterBattleText
waitbutton
--- a/maps/SproutTower3F.asm
+++ b/maps/SproutTower3F.asm
@@ -94,7 +94,7 @@
trainer SAGE, JIN, EVENT_BEAT_SAGE_JIN, SageJinSeenText, SageJinBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext SageJinAfterBattleText
waitbutton
@@ -105,7 +105,7 @@
trainer SAGE, TROY, EVENT_BEAT_SAGE_TROY, SageTroySeenText, SageTroyBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext SageTroyAfterBattleText
waitbutton
@@ -116,7 +116,7 @@
trainer SAGE, NEAL, EVENT_BEAT_SAGE_NEAL, SageNealSeenText, SageNealBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext SageNealAfterBattleText
waitbutton
--- a/maps/TeamRocketBaseB1F.asm
+++ b/maps/TeamRocketBaseB1F.asm
@@ -33,7 +33,7 @@
spriteface PLAYER, LEFT
applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1
scall TrainerCameraGrunt1
- if_equal TRUE, NoSecurityCamera
+ ifequal TRUE, NoSecurityCamera
scall PlaySecurityCameraSounds
showemote EMOTE_SHOCK, PLAYER, 15
playmusic MUSIC_ROCKET_ENCOUNTER
@@ -41,7 +41,7 @@
appear TEAMROCKETBASEB1F_ROCKET1
applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1
scall TrainerCameraGrunt2
- if_equal TRUE, NoSecurityCamera
+ ifequal TRUE, NoSecurityCamera
setevent EVENT_SECURITY_CAMERA_1
end
@@ -58,7 +58,7 @@
spriteface PLAYER, LEFT
applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1
scall TrainerCameraGrunt1
- if_equal TRUE, NoSecurityCamera
+ ifequal TRUE, NoSecurityCamera
scall PlaySecurityCameraSounds
showemote EMOTE_SHOCK, PLAYER, 15
playmusic MUSIC_ROCKET_ENCOUNTER
@@ -66,7 +66,7 @@
appear TEAMROCKETBASEB1F_ROCKET1
applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1
scall TrainerCameraGrunt2
- if_equal TRUE, NoSecurityCamera
+ ifequal TRUE, NoSecurityCamera
setevent EVENT_SECURITY_CAMERA_1
end
@@ -83,7 +83,7 @@
spriteface PLAYER, LEFT
applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement2
scall TrainerCameraGrunt1
- if_equal TRUE, NoSecurityCamera
+ ifequal TRUE, NoSecurityCamera
scall PlaySecurityCameraSounds
showemote EMOTE_SHOCK, PLAYER, 15
playmusic MUSIC_ROCKET_ENCOUNTER
@@ -92,7 +92,7 @@
appear TEAMROCKETBASEB1F_ROCKET1
applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement3
scall TrainerCameraGrunt2
- if_equal TRUE, NoSecurityCamera
+ ifequal TRUE, NoSecurityCamera
setevent EVENT_SECURITY_CAMERA_2
end
@@ -109,7 +109,7 @@
spriteface PLAYER, LEFT
applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement4
scall TrainerCameraGrunt1
- if_equal TRUE, NoSecurityCamera
+ ifequal TRUE, NoSecurityCamera
scall PlaySecurityCameraSounds
showemote EMOTE_SHOCK, PLAYER, 15
playmusic MUSIC_ROCKET_ENCOUNTER
@@ -118,7 +118,7 @@
appear TEAMROCKETBASEB1F_ROCKET1
applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement5
scall TrainerCameraGrunt2
- if_equal TRUE, NoSecurityCamera
+ ifequal TRUE, NoSecurityCamera
setevent EVENT_SECURITY_CAMERA_2
end
@@ -135,7 +135,7 @@
spriteface PLAYER, LEFT
applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1
scall TrainerCameraGrunt1
- if_equal TRUE, NoSecurityCamera
+ ifequal TRUE, NoSecurityCamera
scall PlaySecurityCameraSounds
showemote EMOTE_SHOCK, PLAYER, 15
playmusic MUSIC_ROCKET_ENCOUNTER
@@ -144,7 +144,7 @@
appear TEAMROCKETBASEB1F_ROCKET1
applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement6
scall TrainerCameraGrunt2
- if_equal TRUE, NoSecurityCamera
+ ifequal TRUE, NoSecurityCamera
setevent EVENT_SECURITY_CAMERA_3
end
@@ -161,7 +161,7 @@
spriteface PLAYER, LEFT
applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1
scall TrainerCameraGrunt1
- if_equal TRUE, NoSecurityCamera
+ ifequal TRUE, NoSecurityCamera
scall PlaySecurityCameraSounds
showemote EMOTE_SHOCK, PLAYER, 15
playmusic MUSIC_ROCKET_ENCOUNTER
@@ -170,7 +170,7 @@
appear TEAMROCKETBASEB1F_ROCKET1
applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement7
scall TrainerCameraGrunt2
- if_equal TRUE, NoSecurityCamera
+ ifequal TRUE, NoSecurityCamera
setevent EVENT_SECURITY_CAMERA_3
end
@@ -187,7 +187,7 @@
spriteface PLAYER, LEFT
applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1
scall TrainerCameraGrunt1
- if_equal TRUE, NoSecurityCamera
+ ifequal TRUE, NoSecurityCamera
scall PlaySecurityCameraSounds
showemote EMOTE_SHOCK, PLAYER, 15
playmusic MUSIC_ROCKET_ENCOUNTER
@@ -196,7 +196,7 @@
appear TEAMROCKETBASEB1F_ROCKET1
applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement8
scall TrainerCameraGrunt2
- if_equal TRUE, NoSecurityCamera
+ ifequal TRUE, NoSecurityCamera
setevent EVENT_SECURITY_CAMERA_4
end
@@ -213,7 +213,7 @@
spriteface PLAYER, LEFT
applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1
scall TrainerCameraGrunt1
- if_equal TRUE, NoSecurityCamera
+ ifequal TRUE, NoSecurityCamera
scall PlaySecurityCameraSounds
showemote EMOTE_SHOCK, PLAYER, 15
playmusic MUSIC_ROCKET_ENCOUNTER
@@ -222,7 +222,7 @@
appear TEAMROCKETBASEB1F_ROCKET1
applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement9
scall TrainerCameraGrunt2
- if_equal TRUE, NoSecurityCamera
+ ifequal TRUE, NoSecurityCamera
setevent EVENT_SECURITY_CAMERA_5
end
@@ -482,7 +482,7 @@
trainer SCIENTIST, JED, EVENT_BEAT_SCIENTIST_JED, ScientistJedSeenText, ScientistJedBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext ScientistJedAfterBattleText
waitbutton
@@ -493,7 +493,7 @@
trainer GRUNTM, GRUNTM_16, EVENT_BEAT_ROCKET_GRUNTM_16, GruntM16SeenText, GruntM16BeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext GruntM16AfterBattleText
waitbutton
--- a/maps/TeamRocketBaseB2F.asm
+++ b/maps/TeamRocketBaseB2F.asm
@@ -176,7 +176,7 @@
setscene SCENE_TEAMROCKETBASEB2F_ROCKET_BOSS
setevent EVENT_LANCE_HEALED_YOU_IN_TEAM_ROCKET_BASE
checkcode VAR_FACING
- if_equal RIGHT, .FacingRight
+ ifequal RIGHT, .FacingRight
applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d212
disappear TEAMROCKETBASEB2F_LANCE
end
@@ -190,7 +190,7 @@
trainer GRUNTM, GRUNTM_17, EVENT_BEAT_ROCKET_GRUNTM_17, GruntM17SeenText, GruntM17BeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext GruntM17AfterBattleText
waitbutton
@@ -201,7 +201,7 @@
trainer GRUNTM, GRUNTM_18, EVENT_BEAT_ROCKET_GRUNTM_18, GruntM18SeenText, GruntM18BeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext GruntM18AfterBattleText
waitbutton
@@ -212,7 +212,7 @@
trainer GRUNTM, GRUNTM_19, EVENT_BEAT_ROCKET_GRUNTM_19, GruntM19SeenText, GruntM19BeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext GruntM19AfterBattleText
waitbutton
--- a/maps/TeamRocketBaseB3F.asm
+++ b/maps/TeamRocketBaseB3F.asm
@@ -129,7 +129,7 @@
trainer GRUNTF, GRUNTF_5, EVENT_BEAT_ROCKET_GRUNTF_5, GruntF5SeenText, GruntF5BeatenText, 0, GruntF5Script
GruntF5Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext GruntF5AfterBattleText
waitbutton
@@ -141,7 +141,7 @@
trainer GRUNTM, GRUNTM_28, EVENT_BEAT_ROCKET_GRUNTM_28, GruntM28SeenText, GruntM28BeatenText, 0, GruntM28Script
GruntM28Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext GruntM28AfterBattleText
waitbutton
@@ -153,7 +153,7 @@
trainer SCIENTIST, ROSS, EVENT_BEAT_SCIENTIST_ROSS, ScientistRossSeenText, ScientistRossBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext ScientistRossAfterBattleText
waitbutton
@@ -164,7 +164,7 @@
trainer SCIENTIST, MITCH, EVENT_BEAT_SCIENTIST_MITCH, ScientistMitchSeenText, ScientistMitchBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext ScientistMitchAfterBattleText
waitbutton
--- a/maps/UnionCave1F.asm
+++ b/maps/UnionCave1F.asm
@@ -18,7 +18,7 @@
trainer POKEMANIAC, LARRY, EVENT_BEAT_POKEMANIAC_LARRY, PokemaniacLarrySeenText, PokemaniacLarryBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext PokemaniacLarryAfterBattleText
waitbutton
@@ -29,7 +29,7 @@
trainer HIKER, RUSSELL, EVENT_BEAT_HIKER_RUSSELL, HikerRussellSeenText, HikerRussellBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext HikerRussellAfterBattleText
waitbutton
@@ -40,7 +40,7 @@
trainer HIKER, DANIEL, EVENT_BEAT_HIKER_DANIEL, HikerDanielSeenText, HikerDanielBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext HikerDanielAfterBattleText
waitbutton
@@ -51,7 +51,7 @@
trainer FIREBREATHER, BILL, EVENT_BEAT_FIREBREATHER_BILL, FirebreatherBillSeenText, FirebreatherBillBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext FirebreatherBillAfterBattleText
waitbutton
@@ -62,7 +62,7 @@
trainer FIREBREATHER, RAY, EVENT_BEAT_FIREBREATHER_RAY, FirebreatherRaySeenText, FirebreatherRayBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext FirebreatherRayAfterBattleText
waitbutton
--- a/maps/UnionCaveB1F.asm
+++ b/maps/UnionCaveB1F.asm
@@ -16,7 +16,7 @@
trainer POKEMANIAC, ANDREW, EVENT_BEAT_POKEMANIAC_ANDREW, PokemaniacAndrewSeenText, PokemaniacAndrewBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext PokemaniacAndrewAfterBattleText
waitbutton
@@ -27,7 +27,7 @@
trainer POKEMANIAC, CALVIN, EVENT_BEAT_POKEMANIAC_CALVIN, PokemaniacCalvinSeenText, PokemaniacCalvinBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext PokemaniacCalvinAfterBattleText
waitbutton
@@ -38,7 +38,7 @@
trainer HIKER, PHILLIP, EVENT_BEAT_HIKER_PHILLIP, HikerPhillipSeenText, HikerPhillipBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext HikerPhillipAfterBattleText
waitbutton
@@ -49,7 +49,7 @@
trainer HIKER, LEONARD, EVENT_BEAT_HIKER_LEONARD, HikerLeonardSeenText, HikerLeonardBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext HikerLeonardAfterBattleText
waitbutton
--- a/maps/UnionCaveB2F.asm
+++ b/maps/UnionCaveB2F.asm
@@ -16,7 +16,7 @@
checkflag ENGINE_UNION_CAVE_LAPRAS
iftrue .NoAppear
checkcode VAR_WEEKDAY
- if_equal FRIDAY, .Appear
+ ifequal FRIDAY, .Appear
.NoAppear:
disappear UNIONCAVEB2F_LAPRAS
return
@@ -39,7 +39,7 @@
trainer COOLTRAINERM, NICK, EVENT_BEAT_COOLTRAINERM_NICK, CooltrainermNickSeenText, CooltrainermNickBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext CooltrainermNickAfterBattleText
waitbutton
@@ -50,7 +50,7 @@
trainer COOLTRAINERF, GWEN, EVENT_BEAT_COOLTRAINERF_GWEN, CooltrainerfGwenSeenText, CooltrainerfGwenBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext CooltrainerfGwenAfterBattleText
waitbutton
@@ -61,7 +61,7 @@
trainer COOLTRAINERF, EMMA, EVENT_BEAT_COOLTRAINERF_EMMA, CooltrainerfEmmaSeenText, CooltrainerfEmmaBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext CooltrainerfEmmaAfterBattleText
waitbutton
--- a/maps/VermilionCity.asm
+++ b/maps/VermilionCity.asm
@@ -66,9 +66,9 @@
checkevent EVENT_GOT_HP_UP_FROM_VERMILION_GUY
iftrue .AlreadyGotItem
checkcode VAR_BADGES
- if_equal NUM_BADGES, .AllBadges
- if_greater_than 13, .MostBadges
- if_greater_than 9, .SomeBadges
+ ifequal NUM_BADGES, .AllBadges
+ ifgreater 13, .MostBadges
+ ifgreater 9, .SomeBadges
writetext UnknownText_0x1aabc8
waitbutton
closetext
--- a/maps/VermilionGym.asm
+++ b/maps/VermilionGym.asm
@@ -46,7 +46,7 @@
trainer GENTLEMAN, GREGORY, EVENT_BEAT_GENTLEMAN_GREGORY, GentlemanGregorySeenText, GentlemanGregoryBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext GentlemanGregoryAfterBattleText
waitbutton
@@ -57,7 +57,7 @@
trainer GUITARIST, VINCENT, EVENT_BEAT_GUITARIST_VINCENT, GuitaristVincentSeenText, GuitaristVincentBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext GuitaristVincentAfterBattleText
waitbutton
@@ -68,7 +68,7 @@
trainer JUGGLER, HORTON, EVENT_BEAT_JUGGLER_HORTON, JugglerHortonSeenText, JugglerHortonBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext JugglerHortonAfterBattleText
waitbutton
--- a/maps/VermilionPort.asm
+++ b/maps/VermilionPort.asm
@@ -85,11 +85,11 @@
spriteface PLAYER, LEFT
opentext
checkcode VAR_WEEKDAY
- if_equal MONDAY, UnknownScript_0x74e72
- if_equal TUESDAY, UnknownScript_0x74e72
- if_equal THURSDAY, UnknownScript_0x74e7c
- if_equal FRIDAY, UnknownScript_0x74e7c
- if_equal SATURDAY, UnknownScript_0x74e7c
+ ifequal MONDAY, UnknownScript_0x74e72
+ ifequal TUESDAY, UnknownScript_0x74e72
+ ifequal THURSDAY, UnknownScript_0x74e7c
+ ifequal FRIDAY, UnknownScript_0x74e7c
+ ifequal SATURDAY, UnknownScript_0x74e7c
writetext UnknownText_0x74f4d
yesorno
iffalse UnknownScript_0x74e8d
@@ -147,11 +147,11 @@
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
iftrue UnknownScript_0x74e1a
checkcode VAR_WEEKDAY
- if_equal MONDAY, .NextShipWednesday
- if_equal TUESDAY, .NextShipWednesday
- if_equal THURSDAY, .NextShipSunday
- if_equal FRIDAY, .NextShipSunday
- if_equal SATURDAY, .NextShipSunday
+ ifequal MONDAY, .NextShipWednesday
+ ifequal TUESDAY, .NextShipWednesday
+ ifequal THURSDAY, .NextShipSunday
+ ifequal FRIDAY, .NextShipSunday
+ ifequal SATURDAY, .NextShipSunday
writetext UnknownText_0x74f4d
yesorno
iffalse UnknownScript_0x74e87
--- a/maps/VictoryRoadGate.asm
+++ b/maps/VictoryRoadGate.asm
@@ -27,7 +27,7 @@
writetext VictoryRoadGateOfficerText
buttonsound
checkcode VAR_BADGES
- if_greater_than NUM_JOHTO_BADGES - 1, .AllEightBadges
+ ifgreater NUM_JOHTO_BADGES - 1, .AllEightBadges
writetext VictoryRoadGateNotEnoughBadgesText
waitbutton
closetext
--- a/maps/VioletGym.asm
+++ b/maps/VioletGym.asm
@@ -54,8 +54,8 @@
end
VioletGymActivateRockets:
- if_equal 7, .RadioTowerRockets
- if_equal 6, .GoldenrodRockets
+ ifequal 7, .RadioTowerRockets
+ ifequal 6, .GoldenrodRockets
end
.GoldenrodRockets:
@@ -68,7 +68,7 @@
trainer BIRD_KEEPER, ROD, EVENT_BEAT_BIRD_KEEPER_ROD, BirdKeeperRodSeenText, BirdKeeperRodBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext BirdKeeperRodAfterBattleText
waitbutton
@@ -79,7 +79,7 @@
trainer BIRD_KEEPER, ABE, EVENT_BEAT_BIRD_KEEPER_ABE, BirdKeeperAbeSeenText, BirdKeeperAbeBeatenText, 0, .Script
.Script:
- end_if_just_battled
+ endifjustbattled
opentext
writetext BirdKeeperAbeAfterBattleText
waitbutton
--- a/maps/VioletPokecenter1F.asm
+++ b/maps/VioletPokecenter1F.asm
@@ -23,7 +23,7 @@
yesorno
iffalse .RefusedEgg
checkcode VAR_PARTYCOUNT
- if_equal PARTY_LENGTH, .PartyFull
+ ifequal PARTY_LENGTH, .PartyFull
giveegg TOGEPI, 5
stringtotext .eggname, MEM_BUFFER_1
scall .AideGivesEgg
@@ -35,7 +35,7 @@
waitbutton
closetext
checkcode VAR_FACING
- if_equal UP, .AideWalksAroundPlayer
+ ifequal UP, .AideWalksAroundPlayer
spriteface PLAYER, DOWN
applymovement VIOLETPOKECENTER1F_SCIENTIST, MovementData_AideWalksStraightOutOfPokecenter
playsound SFX_EXIT_BUILDING