summaryrefslogtreecommitdiff
path: root/data/maps/Route123
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/Route123
parent5cb875b6cb798cf890e156f54a150ff90735ddab (diff)
parent42a83ee50e3364f3f7361dacb3d3616053f4c5bf (diff)
Merge pull request #1558 from GriffinRichards/update-macros
Update event macro comments
Diffstat (limited to 'data/maps/Route123')
-rw-r--r--data/maps/Route123/scripts.inc15
1 files changed, 5 insertions, 10 deletions
diff --git a/data/maps/Route123/scripts.inc b/data/maps/Route123/scripts.inc
index 6ce0de654..fe6366126 100644
--- a/data/maps/Route123/scripts.inc
+++ b/data/maps/Route123/scripts.inc
@@ -12,12 +12,10 @@ Route123_EventScript_GigaDrainGirl::
goto_if_set FLAG_RECEIVED_TM19, Route123_EventScript_ReceivedGigaDrain
msgbox Route123_Text_LoveGrassMonsHaveAny, MSGBOX_DEFAULT
special IsGrassTypeInParty
- compare VAR_RESULT, FALSE
- goto_if_eq Route123_EventScript_NoGrassMons
+ goto_if_eq VAR_RESULT, FALSE, Route123_EventScript_NoGrassMons
msgbox Route123_Text_YouLikeGrassMonsTooHaveThis, MSGBOX_DEFAULT
giveitem ITEM_TM19
- compare VAR_RESULT, FALSE
- goto_if_eq Common_EventScript_ShowBagIsFull
+ goto_if_eq VAR_RESULT, FALSE, Common_EventScript_ShowBagIsFull
setflag FLAG_RECEIVED_TM19
msgbox Route123_Text_CheckTreesWithMyGrassMon, MSGBOX_DEFAULT
release
@@ -62,8 +60,7 @@ Route123_EventScript_Violet::
Route123_EventScript_Cameron::
trainerbattle_single TRAINER_CAMERON_1, Route123_Text_CameronIntro, Route123_Text_CameronDefeat, Route123_EventScript_RegisterCameron
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, TRUE
- goto_if_eq Route123_EventScript_RematchCameron
+ goto_if_eq VAR_RESULT, TRUE, Route123_EventScript_RematchCameron
msgbox Route123_Text_CameronPostBattle, MSGBOX_DEFAULT
release
end
@@ -84,8 +81,7 @@ Route123_EventScript_RematchCameron::
Route123_EventScript_Jacki::
trainerbattle_single TRAINER_JACKI_1, Route123_Text_JackiIntro, Route123_Text_JackiDefeat, Route123_EventScript_RegisterJacki
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, TRUE
- goto_if_eq Route123_EventScript_RematchJacki
+ goto_if_eq VAR_RESULT, TRUE, Route123_EventScript_RematchJacki
msgbox Route123_Text_JackiPostBattle, MSGBOX_DEFAULT
release
end
@@ -156,8 +152,7 @@ Route123_EventScript_Davis::
Route123_EventScript_Fernando::
trainerbattle_single TRAINER_FERNANDO_1, Route123_Text_FernandoIntro, Route123_Text_FernandoDefeat, Route123_EventScript_RegisterFernando
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, TRUE
- goto_if_eq Route123_EventScript_RematchFernando
+ goto_if_eq VAR_RESULT, TRUE, Route123_EventScript_RematchFernando
msgbox Route123_Text_FernandoPostBattle, MSGBOX_DEFAULT
release
end