diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-01-08 18:09:24 -0500 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-01-08 18:09:24 -0500 |
| commit | 31d31d326034fde26dedaf2dadb1c608e00fb92f (patch) | |
| tree | be13ed87df14390256c9a3e582fb11adbe4090b8 /data/maps/SilphCo_11F/scripts.inc | |
| parent | 26f7ba482384ad4f63063797a527b7fb33572aa1 (diff) | |
Sync compare macros, some event_scripts.s doc, begin map_scripts constants
Diffstat (limited to 'data/maps/SilphCo_11F/scripts.inc')
| -rw-r--r-- | data/maps/SilphCo_11F/scripts.inc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/data/maps/SilphCo_11F/scripts.inc b/data/maps/SilphCo_11F/scripts.inc index 292498c7b..4465e16b7 100644 --- a/data/maps/SilphCo_11F/scripts.inc +++ b/data/maps/SilphCo_11F/scripts.inc @@ -4,7 +4,7 @@ SilphCo_11F_MapScripts:: @ 8161DEE SilphCo_11F_MapScript1_161DF4:: @ 8161DF4 checkflag FLAG_SILPH_11F_DOOR - call_if FALSE, EventScript_1A8504 + call_if FALSE, EventScript_Close11FDoor end SilphCo_11F_EventScript_161DFE:: @ 8161DFE @@ -13,12 +13,12 @@ SilphCo_11F_EventScript_161DFE:: @ 8161DFE checkflag FLAG_GOT_MASTER_BALL_FROM_SILPH goto_if TRUE, EventScript_161E75 checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if eq, EventScript_161E59 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if eq, EventScript_161E62 checkitemspace ITEM_MASTER_BALL, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if eq, EventScript_161E6B additem ITEM_MASTER_BALL, 1 giveitemfanfaremsg gUnknown_8176FBD, ITEM_MASTER_BALL, 1, MUS_FAN5 @@ -72,9 +72,9 @@ EventScript_161EA0:: @ 8161EA0 delay 25 msgbox gUnknown_8177108 closemessage - compare_var_to_value VAR_0x4001, 0 + compare VAR_0x4001, 0 call_if eq, EventScript_161F00 - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if eq, EventScript_161F12 setvar VAR_LAST_TALKED, 3 trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_BOSS_GIOVANNI_2, 0, Text_1771AB |