summaryrefslogtreecommitdiff
path: root/data/maps/NavelRock_Base
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/NavelRock_Base
parent26f7ba482384ad4f63063797a527b7fb33572aa1 (diff)
Sync compare macros, some event_scripts.s doc, begin map_scripts constants
Diffstat (limited to 'data/maps/NavelRock_Base')
-rw-r--r--data/maps/NavelRock_Base/scripts.inc10
1 files changed, 5 insertions, 5 deletions
diff --git a/data/maps/NavelRock_Base/scripts.inc b/data/maps/NavelRock_Base/scripts.inc
index 20cff0f8f..dfe55b6b2 100644
--- a/data/maps/NavelRock_Base/scripts.inc
+++ b/data/maps/NavelRock_Base/scripts.inc
@@ -27,14 +27,14 @@ NavelRock_Base_MapScript2_165116:: @ 8165116
EventScript_165120:: @ 8165120
specialvar VAR_RESULT, Special_GetBattleOutcome
- compare_var_to_value VAR_RESULT, B_OUTCOME_CAUGHT
+ compare VAR_RESULT, B_OUTCOME_CAUGHT
goto_if ne, EventScript_1A77A9
removeobject 1
return
NavelRock_Base_EventScript_165134:: @ 8165134
special sub_8110AB4
- compare_var_to_value VAR_RESULT, 2
+ compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
special sub_8112364
lock
@@ -69,11 +69,11 @@ NavelRock_Base_EventScript_165134:: @ 8165134
waitstate
clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
specialvar VAR_RESULT, Special_GetBattleOutcome
- compare_var_to_value VAR_RESULT, B_OUTCOME_WON
+ compare VAR_RESULT, B_OUTCOME_WON
goto_if eq, EventScript_1651D9
- compare_var_to_value VAR_RESULT, B_OUTCOME_RAN
+ compare VAR_RESULT, B_OUTCOME_RAN
goto_if eq, EventScript_1651E7
- compare_var_to_value VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
+ compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if eq, EventScript_1651E7
setflag FLAG_FOUGHT_LUGIA
release