diff options
Diffstat (limited to 'data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc')
| -rw-r--r-- | data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc index 28d634162..6cf1c7817 100644 --- a/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc @@ -9,7 +9,7 @@ BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B204: @ 824B204 BattleFrontier_BattleDomePreBattleRoom_EventScript_24B20E:: @ 824B20E setvar VAR_TEMP_1, 1 - turnobject 255, 2 + turnobject EVENT_OBJ_ID_PLAYER, 2 end BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B218: @ 824B218 @@ -18,13 +18,13 @@ BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B218: @ 824B218 BattleFrontier_BattleDomePreBattleRoom_EventScript_24B222:: @ 824B222 compare VAR_0x8006, 1 - goto_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5C7 + goto_if_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5C7 setvar VAR_0x8004, 2 setvar VAR_0x8005, 6 setvar VAR_0x8006, 1 special CallFrontierUtilFunc setvar VAR_TEMP_0, 1 - applymovement 255, BattleFrontier_BattleDomePreBattleRoom_Movement_24B652 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomePreBattleRoom_Movement_24B652 waitmovement 0 lockall @@ -34,7 +34,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F:: @ 824B24F switch VAR_RESULT call BattleFrontier_BattleDomePreBattleRoom_EventScript_23E8E0 compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B2C1 + goto_if_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B2C1 multichoice 16, 0, 73, 1 switch VAR_RESULT case 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3DD @@ -159,7 +159,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B46D:: @ 824B46D setvar VAR_0x8004, 21 special CallFrontierUtilFunc compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F + goto_if_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F setvar VAR_0x8004, 2 setvar VAR_0x8005, 8 special CallBattleDomeFunction @@ -171,11 +171,11 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B46D:: @ 824B46D closemessage applymovement 1, BattleFrontier_BattleDomePreBattleRoom_Movement_24B64F waitmovement 0 - applymovement 255, BattleFrontier_BattleDomePreBattleRoom_Movement_24B657 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomePreBattleRoom_Movement_24B657 waitmovement 0 opendoor 5, 1 waitdooranim - applymovement 255, BattleFrontier_BattleDomePreBattleRoom_Movement_24B659 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomePreBattleRoom_Movement_24B659 waitmovement 0 closedoor 5, 1 waitdooranim @@ -219,15 +219,13 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B54C:: @ 824B54C return BattleFrontier_BattleDomePreBattleRoom_EventScript_24B58B:: @ 824B58B - checkflag FLAG_TEMP_1 - goto_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5B5 + goto_if_set FLAG_TEMP_1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5B5 msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BB2E, MSGBOX_DEFAULT setflag FLAG_TEMP_1 return BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5A0:: @ 824B5A0 - checkflag FLAG_TEMP_1 - goto_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5BE + goto_if_set FLAG_TEMP_1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5BE msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BBAC, MSGBOX_DEFAULT setflag FLAG_TEMP_1 return |