summaryrefslogtreecommitdiff
path: root/data/maps/Route22
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2020-01-08 18:09:24 -0500
committerGriffinR <griffin.g.richards@gmail.com>2020-01-08 18:09:24 -0500
commit31d31d326034fde26dedaf2dadb1c608e00fb92f (patch)
treebe13ed87df14390256c9a3e582fb11adbe4090b8 /data/maps/Route22
parent26f7ba482384ad4f63063797a527b7fb33572aa1 (diff)
Sync compare macros, some event_scripts.s doc, begin map_scripts constants
Diffstat (limited to 'data/maps/Route22')
-rw-r--r--data/maps/Route22/scripts.inc30
1 files changed, 15 insertions, 15 deletions
diff --git a/data/maps/Route22/scripts.inc b/data/maps/Route22/scripts.inc
index 8a775e09c..e68c25b17 100644
--- a/data/maps/Route22/scripts.inc
+++ b/data/maps/Route22/scripts.inc
@@ -31,29 +31,29 @@ EventScript_1682BE:: @ 81682BE
textcolor 0
playbgm MUS_RIVAL1, 0
addobject 1
- compare_var_to_value VAR_0x4001, 0
+ compare VAR_0x4001, 0
call_if eq, EventScript_168350
- compare_var_to_value VAR_0x4001, 1
+ compare VAR_0x4001, 1
call_if eq, EventScript_168350
- compare_var_to_value VAR_0x4001, 2
+ compare VAR_0x4001, 2
call_if eq, EventScript_16835B
delay 6
msgbox gUnknown_8188890
- compare_var_to_value VAR_STARTER_MON, 2
+ compare VAR_STARTER_MON, 2
call_if eq, EventScript_16836D
- compare_var_to_value VAR_STARTER_MON, 1
+ compare VAR_STARTER_MON, 1
call_if eq, EventScript_16837C
- compare_var_to_value VAR_STARTER_MON, 0
+ compare VAR_STARTER_MON, 0
call_if eq, EventScript_16838B
msgbox gUnknown_8188974
closemessage
delay 10
playbgm MUS_RIVAL2, 0
- compare_var_to_value VAR_0x4001, 0
+ compare VAR_0x4001, 0
call_if eq, EventScript_16839A
- compare_var_to_value VAR_0x4001, 1
+ compare VAR_0x4001, 1
call_if eq, EventScript_16839A
- compare_var_to_value VAR_0x4001, 2
+ compare VAR_0x4001, 2
call_if eq, EventScript_1683A5
fadedefaultbgm
removeobject 1
@@ -197,19 +197,19 @@ EventScript_16841F:: @ 816841F
textcolor 0
playbgm MUS_RIVAL1, 0
addobject 1
- compare_var_to_value VAR_0x4001, 0
+ compare VAR_0x4001, 0
call_if eq, EventScript_16849C
- compare_var_to_value VAR_0x4001, 1
+ compare VAR_0x4001, 1
call_if eq, EventScript_16849C
- compare_var_to_value VAR_0x4001, 2
+ compare VAR_0x4001, 2
call_if eq, EventScript_1684A7
msgbox gUnknown_8188A3C
setvar VAR_LAST_TALKED, 1
- compare_var_to_value VAR_STARTER_MON, 2
+ compare VAR_STARTER_MON, 2
call_if eq, EventScript_1684B9
- compare_var_to_value VAR_STARTER_MON, 1
+ compare VAR_STARTER_MON, 1
call_if eq, EventScript_1684C4
- compare_var_to_value VAR_STARTER_MON, 0
+ compare VAR_STARTER_MON, 0
call_if eq, EventScript_1684CF
msgbox gUnknown_8188B29
closemessage