diff options
Diffstat (limited to 'data/maps/FarawayIsland_Interior/scripts.inc')
| -rw-r--r-- | data/maps/FarawayIsland_Interior/scripts.inc | 38 |
1 files changed, 17 insertions, 21 deletions
diff --git a/data/maps/FarawayIsland_Interior/scripts.inc b/data/maps/FarawayIsland_Interior/scripts.inc index 7b62ab578..55fd591e2 100644 --- a/data/maps/FarawayIsland_Interior/scripts.inc +++ b/data/maps/FarawayIsland_Interior/scripts.inc @@ -6,20 +6,19 @@ FarawayIsland_Interior_MapScripts:: @ 8267CFA .byte 0 FarawayIsland_Interior_MapScript1_267D0F: @ 8267D0F - checkflag FLAG_SYS_CTRL_OBJ_DELETE - call_if 1, FarawayIsland_Interior_EventScript_267D19 + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, FarawayIsland_Interior_EventScript_267D19 end FarawayIsland_Interior_EventScript_267D19:: @ 8267D19 specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 1 - goto_eq FarawayIsland_Interior_EventScript_267D4B + goto_if_eq FarawayIsland_Interior_EventScript_267D4B compare VAR_RESULT, 4 - goto_eq FarawayIsland_Interior_EventScript_267D4B + goto_if_eq FarawayIsland_Interior_EventScript_267D4B compare VAR_RESULT, 5 - goto_eq FarawayIsland_Interior_EventScript_267D4B + goto_if_eq FarawayIsland_Interior_EventScript_267D4B compare VAR_RESULT, 10 - goto_eq FarawayIsland_Interior_EventScript_267D4B + goto_if_eq FarawayIsland_Interior_EventScript_267D4B return FarawayIsland_Interior_EventScript_267D4B:: @ 8267D4B @@ -28,27 +27,24 @@ FarawayIsland_Interior_EventScript_267D4B:: @ 8267D4B return FarawayIsland_Interior_MapScript1_267D54: @ 8267D54 - checkflag FLAG_SYS_CTRL_OBJ_DELETE - call_if 1, FarawayIsland_Interior_EventScript_267D5E + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, FarawayIsland_Interior_EventScript_267D5E end FarawayIsland_Interior_EventScript_267D5E:: @ 8267D5E specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if 5, FarawayIsland_Interior_EventScript_27374E + goto_if_ne FarawayIsland_Interior_EventScript_27374E removeobject VAR_LAST_TALKED return FarawayIsland_Interior_MapScript1_267D72: @ 8267D72 setvar VAR_0x403A, 0 setvar VAR_TEMP_1, 1 - checkflag FLAG_0x1CA - call_if 0, FarawayIsland_Interior_EventScript_267D86 + call_if_unset FLAG_0x1CA, FarawayIsland_Interior_EventScript_267D86 end FarawayIsland_Interior_EventScript_267D86:: @ 8267D86 - checkflag FLAG_0x1C7 - goto_eq FarawayIsland_Interior_EventScript_27374E + goto_if_set FLAG_0x1C7, FarawayIsland_Interior_EventScript_27374E clearflag FLAG_HIDE_MEW setvar VAR_TEMP_1, 0 return @@ -130,13 +126,13 @@ FarawayIsland_Interior_EventScript_267DF2:: @ 8267DF2 waitse playmoncry SPECIES_MEW, 2 compare VAR_FACING, 2 - call_if 1, FarawayIsland_Interior_EventScript_267EAF + call_if_eq FarawayIsland_Interior_EventScript_267EAF compare VAR_FACING, 1 - call_if 1, FarawayIsland_Interior_EventScript_267EBA + call_if_eq FarawayIsland_Interior_EventScript_267EBA compare VAR_FACING, 3 - call_if 1, FarawayIsland_Interior_EventScript_267EC5 + call_if_eq FarawayIsland_Interior_EventScript_267EC5 compare VAR_FACING, 4 - call_if 1, FarawayIsland_Interior_EventScript_267ED0 + call_if_eq FarawayIsland_Interior_EventScript_267ED0 special sub_81D4BEC delay 40 waitmoncry @@ -150,13 +146,13 @@ FarawayIsland_Interior_EventScript_267DF2:: @ 8267DF2 clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 1 - goto_eq FarawayIsland_Interior_EventScript_267E96 + goto_if_eq FarawayIsland_Interior_EventScript_267E96 compare VAR_RESULT, 4 - goto_eq FarawayIsland_Interior_EventScript_267EA4 + goto_if_eq FarawayIsland_Interior_EventScript_267EA4 compare VAR_RESULT, 5 - goto_eq FarawayIsland_Interior_EventScript_267EA4 + goto_if_eq FarawayIsland_Interior_EventScript_267EA4 compare VAR_RESULT, 10 - goto_eq FarawayIsland_Interior_EventScript_267EA4 + goto_if_eq FarawayIsland_Interior_EventScript_267EA4 setflag FLAG_0x1CA release end |