diff options
Diffstat (limited to 'data/maps/TerraCave_End/scripts.inc')
| -rw-r--r-- | data/maps/TerraCave_End/scripts.inc | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/data/maps/TerraCave_End/scripts.inc b/data/maps/TerraCave_End/scripts.inc index b23cc23f1..bd057eac6 100644 --- a/data/maps/TerraCave_End/scripts.inc +++ b/data/maps/TerraCave_End/scripts.inc @@ -4,20 +4,18 @@ TerraCave_End_MapScripts:: @ 823B0B0 .byte 0 TerraCave_End_MapScript1_23B0BB: @ 823B0BB - checkflag FLAG_SYS_CTRL_OBJ_DELETE - call_if 1, TerraCave_End_EventScript_23B0C5 + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, TerraCave_End_EventScript_23B0C5 end TerraCave_End_EventScript_23B0C5:: @ 823B0C5 specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if 5, TerraCave_End_EventScript_27374E + goto_if_ne TerraCave_End_EventScript_27374E removeobject 1 return TerraCave_End_MapScript1_23B0D9: @ 823B0D9 - checkflag FLAG_0x1BF - call_if 0, TerraCave_End_EventScript_23B0E3 + call_if_unset FLAG_0x1BF, TerraCave_End_EventScript_23B0E3 end TerraCave_End_EventScript_23B0E3:: @ 823B0E3 @@ -27,7 +25,7 @@ TerraCave_End_EventScript_23B0E3:: @ 823B0E3 TerraCave_End_EventScript_23B0EC:: @ 823B0EC lockall - applymovement 255, TerraCave_End_Movement_2725B2 + applymovement EVENT_OBJ_ID_PLAYER, TerraCave_End_Movement_2725B2 waitmovement 0 applymovement 1, TerraCave_End_Movement_23B16E waitmovement 0 @@ -44,11 +42,11 @@ TerraCave_End_EventScript_23B0EC:: @ 823B0EC setvar VAR_TEMP_1, 0 specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 1 - goto_eq TerraCave_End_EventScript_23B155 + goto_if_eq TerraCave_End_EventScript_23B155 compare VAR_RESULT, 4 - goto_eq TerraCave_End_EventScript_23B163 + goto_if_eq TerraCave_End_EventScript_23B163 compare VAR_RESULT, 5 - goto_eq TerraCave_End_EventScript_23B163 + goto_if_eq TerraCave_End_EventScript_23B163 setvar VAR_0x4039, 1 setflag FLAG_0x1BF releaseall |