summaryrefslogtreecommitdiff
path: root/data/maps/MeteorFalls_1F_2R/scripts.inc
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/MeteorFalls_1F_2R/scripts.inc
parent5cb875b6cb798cf890e156f54a150ff90735ddab (diff)
parent42a83ee50e3364f3f7361dacb3d3616053f4c5bf (diff)
Merge pull request #1558 from GriffinRichards/update-macros
Update event macro comments
Diffstat (limited to 'data/maps/MeteorFalls_1F_2R/scripts.inc')
-rw-r--r--data/maps/MeteorFalls_1F_2R/scripts.inc9
1 files changed, 3 insertions, 6 deletions
diff --git a/data/maps/MeteorFalls_1F_2R/scripts.inc b/data/maps/MeteorFalls_1F_2R/scripts.inc
index 706d362be..4e3e9b321 100644
--- a/data/maps/MeteorFalls_1F_2R/scripts.inc
+++ b/data/maps/MeteorFalls_1F_2R/scripts.inc
@@ -4,8 +4,7 @@ MeteorFalls_1F_2R_MapScripts::
MeteorFalls_1F_2R_EventScript_Nicolas::
trainerbattle_single TRAINER_NICOLAS_1, MeteorFalls_1F_2R_Text_NicolasIntro, MeteorFalls_1F_2R_Text_NicolasDefeat, MeteorFalls_1F_2R_EventScript_RegisterNicolas
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, TRUE
- goto_if_eq MeteorFalls_1F_2R_EventScript_RematchNicolas
+ goto_if_eq VAR_RESULT, TRUE, MeteorFalls_1F_2R_EventScript_RematchNicolas
msgbox MeteorFalls_1F_2R_Text_NicolasPostBattle, MSGBOX_DEFAULT
release
end
@@ -26,8 +25,7 @@ MeteorFalls_1F_2R_EventScript_RematchNicolas::
MeteorFalls_1F_2R_EventScript_John::
trainerbattle_double TRAINER_JOHN_AND_JAY_1, MeteorFalls_1F_2R_Text_JohnIntro, MeteorFalls_1F_2R_Text_JohnDefeat, MeteorFalls_1F_2R_Text_JohnNotEnoughMons, MeteorFalls_1F_2R_EventScript_RegisterJohn
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, TRUE
- goto_if_eq MeteorFalls_1F_2R_EventScript_RematchJohn
+ goto_if_eq VAR_RESULT, TRUE, MeteorFalls_1F_2R_EventScript_RematchJohn
msgbox MeteorFalls_1F_2R_Text_JohnPostBattle, MSGBOX_DEFAULT
release
end
@@ -46,8 +44,7 @@ MeteorFalls_1F_2R_EventScript_RematchJohn::
MeteorFalls_1F_2R_EventScript_Jay::
trainerbattle_double TRAINER_JOHN_AND_JAY_1, MeteorFalls_1F_2R_Text_JayIntro, MeteorFalls_1F_2R_Text_JayDefeat, MeteorFalls_1F_2R_Text_JayNotEnoughMons, MeteorFalls_1F_2R_EventScript_RegisterJay
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, TRUE
- goto_if_eq MeteorFalls_1F_2R_EventScript_RematchJay
+ goto_if_eq VAR_RESULT, TRUE, MeteorFalls_1F_2R_EventScript_RematchJay
msgbox MeteorFalls_1F_2R_Text_JayPostBattle, MSGBOX_DEFAULT
release
end