summaryrefslogtreecommitdiff
path: root/data/maps/Route117
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2021-11-22 19:10:49 -0500
committerGitHub <noreply@github.com>2021-11-22 19:10:49 -0500
commite0fae879da1b773bf90fca145e047ccdb7613938 (patch)
treeb1be0ec73e33fccf2fe2deac44d62aa10ae391e4 /data/maps/Route117
parent5cb875b6cb798cf890e156f54a150ff90735ddab (diff)
parent42a83ee50e3364f3f7361dacb3d3616053f4c5bf (diff)
Merge pull request #1558 from GriffinRichards/update-macros
Update event macro comments
Diffstat (limited to 'data/maps/Route117')
-rw-r--r--data/maps/Route117/scripts.inc18
1 files changed, 6 insertions, 12 deletions
diff --git a/data/maps/Route117/scripts.inc b/data/maps/Route117/scripts.inc
index f6ab88591..37d589ce3 100644
--- a/data/maps/Route117/scripts.inc
+++ b/data/maps/Route117/scripts.inc
@@ -41,8 +41,7 @@ Route117_EventScript_DayCareSign::
Route117_EventScript_Isaac::
trainerbattle_single TRAINER_ISAAC_1, Route117_Text_IsaacIntro, Route117_Text_IsaacDefeat, Route117_EventScript_RegisterIsaac
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, TRUE
- goto_if_eq Route117_EventScript_RematchIsaac
+ goto_if_eq VAR_RESULT, TRUE, Route117_EventScript_RematchIsaac
msgbox Route117_Text_IsaacPostBattle, MSGBOX_DEFAULT
release
end
@@ -63,8 +62,7 @@ Route117_EventScript_RematchIsaac::
Route117_EventScript_Lydia::
trainerbattle_single TRAINER_LYDIA_1, Route117_Text_LydiaIntro, Route117_Text_LydiaDefeat, Route117_EventScript_RegisterLydia
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, TRUE
- goto_if_eq Route117_EventScript_RematchLydia
+ goto_if_eq VAR_RESULT, TRUE, Route117_EventScript_RematchLydia
msgbox Route117_Text_LydiaPostBattle, MSGBOX_DEFAULT
release
end
@@ -85,8 +83,7 @@ Route117_EventScript_RematchLydia::
Route117_EventScript_Dylan::
trainerbattle_single TRAINER_DYLAN_1, Route117_Text_DylanIntro, Route117_Text_DylanDefeat, Route117_EventScript_RegisterDylan
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, TRUE
- goto_if_eq Route117_EventScript_RematchDylan
+ goto_if_eq VAR_RESULT, TRUE, Route117_EventScript_RematchDylan
msgbox Route117_Text_DylanPostBattle, MSGBOX_DEFAULT
release
end
@@ -107,8 +104,7 @@ Route117_EventScript_RematchDylan::
Route117_EventScript_Maria::
trainerbattle_single TRAINER_MARIA_1, Route117_Text_MariaIntro, Route117_Text_MariaDefeat, Route117_EventScript_RegisterMaria
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, TRUE
- goto_if_eq Route117_EventScript_RematchMaria
+ goto_if_eq VAR_RESULT, TRUE, Route117_EventScript_RematchMaria
msgbox Route117_Text_MariaPostBattle, MSGBOX_DEFAULT
release
end
@@ -134,8 +130,7 @@ Route117_EventScript_Derek::
Route117_EventScript_Anna::
trainerbattle_double TRAINER_ANNA_AND_MEG_1, Route117_Text_AnnaIntro, Route117_Text_AnnaDefeat, Route117_Text_AnnaNotEnoughMons, Route117_EventScript_RegisterAnna
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, TRUE
- goto_if_eq Route117_EventScript_RematchAnna
+ goto_if_eq VAR_RESULT, TRUE, Route117_EventScript_RematchAnna
msgbox Route117_Text_AnnaPostBattle, MSGBOX_DEFAULT
release
end
@@ -154,8 +149,7 @@ Route117_EventScript_RematchAnna::
Route117_EventScript_Meg::
trainerbattle_double TRAINER_ANNA_AND_MEG_1, Route117_Text_MegIntro, Route117_Text_MegDefeat, Route117_Text_MegNotEnoughMons, Route117_EventScript_RegisterMeg
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, TRUE
- goto_if_eq Route117_EventScript_RematchMeg
+ goto_if_eq VAR_RESULT, TRUE, Route117_EventScript_RematchMeg
msgbox Route117_Text_MegPostBattle, MSGBOX_DEFAULT
release
end