diff options
Diffstat (limited to 'data/maps/MeteorFalls_1F_1R/scripts.inc')
| -rw-r--r-- | data/maps/MeteorFalls_1F_1R/scripts.inc | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/data/maps/MeteorFalls_1F_1R/scripts.inc b/data/maps/MeteorFalls_1F_1R/scripts.inc index 23afa4845..7732e8e7d 100644 --- a/data/maps/MeteorFalls_1F_1R/scripts.inc +++ b/data/maps/MeteorFalls_1F_1R/scripts.inc @@ -3,8 +3,7 @@ MeteorFalls_1F_1R_MapScripts:: @ 822BD2A .byte 0 MeteorFalls_1F_1R_MapScript1_22BD30: @ 822BD30 - checkflag FLAG_SYS_GAME_CLEAR - call_if 1, MeteorFalls_1F_1R_EventScript_22BD3A + call_if_set FLAG_SYS_GAME_CLEAR, MeteorFalls_1F_1R_EventScript_22BD3A end MeteorFalls_1F_1R_EventScript_22BD3A:: @ 822BD3A @@ -17,7 +16,7 @@ MeteorFalls_1F_1R_EventScript_22BD3A:: @ 822BD3A MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F lockall playbgm MUS_MGM0, 0 - applymovement 255, MeteorFalls_1F_1R_Movement_2725B0 + applymovement EVENT_OBJ_ID_PLAYER, MeteorFalls_1F_1R_Movement_2725B0 waitmovement 0 delay 30 applymovement 5, MeteorFalls_1F_1R_Movement_2725B4 @@ -38,7 +37,7 @@ MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F waitmovement 0 msgbox MeteorFalls_1F_1R_Text_22BFE4, MSGBOX_DEFAULT closemessage - applymovement 255, MeteorFalls_1F_1R_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, MeteorFalls_1F_1R_Movement_2725A4 applymovement 5, MeteorFalls_1F_1R_Movement_2725A4 applymovement 6, MeteorFalls_1F_1R_Movement_2725A4 waitmovement 0 @@ -55,7 +54,7 @@ MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F waitmovement 0 msgbox MeteorFalls_1F_1R_Text_22C04E, MSGBOX_DEFAULT closemessage - applymovement 255, MeteorFalls_1F_1R_Movement_22BF1D + applymovement EVENT_OBJ_ID_PLAYER, MeteorFalls_1F_1R_Movement_22BF1D applymovement 5, MeteorFalls_1F_1R_Movement_22BEC4 applymovement 6, MeteorFalls_1F_1R_Movement_22BECE waitmovement 0 @@ -221,8 +220,7 @@ MeteorFalls_1F_1R_Movement_22BF1D: @ 822BF1D MeteorFalls_1F_1R_EventScript_22BF25:: @ 822BF25 lock faceplayer - checkflag FLAG_0x0F4 - goto_eq MeteorFalls_1F_1R_EventScript_22BF3D + goto_if_set FLAG_0x0F4, MeteorFalls_1F_1R_EventScript_22BF3D setflag FLAG_0x0F4 msgbox MeteorFalls_1F_1R_Text_22C342, MSGBOX_DEFAULT release |