diff options
Diffstat (limited to 'data/maps/DesertRuins/scripts.inc')
| -rw-r--r-- | data/maps/DesertRuins/scripts.inc | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/data/maps/DesertRuins/scripts.inc b/data/maps/DesertRuins/scripts.inc index 760336d91..685d8f5cf 100644 --- a/data/maps/DesertRuins/scripts.inc +++ b/data/maps/DesertRuins/scripts.inc @@ -5,20 +5,18 @@ DesertRuins_MapScripts:: @ 822D95B .byte 0 DesertRuins_MapScript1_22D96B: @ 822D96B - checkflag FLAG_SYS_CTRL_OBJ_DELETE - call_if 1, DesertRuins_EventScript_22D975 + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, DesertRuins_EventScript_22D975 end DesertRuins_EventScript_22D975:: @ 822D975 specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if 5, DesertRuins_EventScript_27374E + goto_if_ne DesertRuins_EventScript_27374E removeobject VAR_LAST_TALKED return DesertRuins_MapScript1_22D989: @ 822D989 - checkflag FLAG_SYS_BRAILLE_STRENGTH - call_if 0, DesertRuins_EventScript_22D993 + call_if_unset FLAG_SYS_BRAILLE_STRENGTH, DesertRuins_EventScript_22D993 end DesertRuins_EventScript_22D993:: @ 822D993 @@ -32,8 +30,7 @@ DesertRuins_EventScript_22D993:: @ 822D993 DesertRuins_MapScript1_22D9CA: @ 822D9CA setflag FLAG_LANDMARK_DESERT_RUINS - checkflag FLAG_0x1BB - call_if 0, DesertRuins_EventScript_22D9D7 + call_if_unset FLAG_0x1BB, DesertRuins_EventScript_22D9D7 end DesertRuins_EventScript_22D9D7:: @ 822D9D7 @@ -42,8 +39,7 @@ DesertRuins_EventScript_22D9D7:: @ 822D9D7 DesertRuins_EventScript_22D9DB:: @ 822D9DB lockall - checkflag FLAG_SYS_BRAILLE_STRENGTH - goto_eq DesertRuins_EventScript_22D9EE + goto_if_set FLAG_SYS_BRAILLE_STRENGTH, DesertRuins_EventScript_22D9EE braillemessage DesertRuins_Braille_2A6CA0 waitbuttonpress hidebox2 @@ -77,11 +73,11 @@ DesertRuins_EventScript_22DA02:: @ 822DA02 clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 1 - goto_eq DesertRuins_EventScript_22DA49 + goto_if_eq DesertRuins_EventScript_22DA49 compare VAR_RESULT, 4 - goto_eq DesertRuins_EventScript_22DA52 + goto_if_eq DesertRuins_EventScript_22DA52 compare VAR_RESULT, 5 - goto_eq DesertRuins_EventScript_22DA52 + goto_if_eq DesertRuins_EventScript_22DA52 setflag FLAG_0x1BB release end |