diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-12-02 19:38:05 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-12-02 19:38:05 +0100 |
| commit | 9828e0e97b8403a7614f4bec127af9233ae923cb (patch) | |
| tree | 7a2b5d14e654e6f8171548692dc5f241de8cb748 /data/maps/BattleFrontier_BattleFactoryBattleRoom | |
| parent | a42bfd7a0eeff5bd0cf0014ab133ef5ff4b5becf (diff) | |
| parent | c123b8d6f1787abce2d1e3920d40192811b5fa39 (diff) | |
Merge with master
Diffstat (limited to 'data/maps/BattleFrontier_BattleFactoryBattleRoom')
| -rw-r--r-- | data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc index 74b10e0f0..8e08404cd 100644 --- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc @@ -51,7 +51,7 @@ BattleFrontier_BattleFactoryBattleRoom_MapScript2_25AE31: @ 825AE31 .2byte 0 BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE3B:: @ 825AE3B - msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B1E2, 4 + msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B1E2, MSGBOX_DEFAULT closemessage applymovement 2, BattleFrontier_BattleFactoryBattleRoom_Movement_25B18B applymovement 8, BattleFrontier_BattleFactoryBattleRoom_Movement_25B17B @@ -82,7 +82,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AEA7:: @ 825AEA7 setvar VAR_0x8004, 5 special CallBattlePalaceFunction lockall - msgbox gStringVar4, 4 + msgbox gStringVar4, MSGBOX_DEFAULT waitmessage closemessage setvar VAR_0x8004, 2 @@ -153,13 +153,13 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF9C:: @ 825AF9C special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AFEF - msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B1FB, 4 + msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B1FB, MSGBOX_DEFAULT setvar VAR_0x8004, 2 setvar VAR_0x8005, 7 special CallFrontierUtilFunc BattleFrontier_BattleFactoryBattleRoom_EventScript_25AFEF:: @ 825AFEF - msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B3F1, 4 + msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B3F1, MSGBOX_DEFAULT call BattleFrontier_BattleFactoryBattleRoom_EventScript_25B0E0 compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25B00C @@ -170,7 +170,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B00C:: @ 825B00C special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105 - msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B42D, 4 + msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B42D, MSGBOX_DEFAULT closemessage applymovement 8, BattleFrontier_BattleFactoryBattleRoom_Movement_25B182 waitmovement 0 @@ -180,7 +180,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B00C:: @ 825B00C waitfanfare setvar VAR_0x8004, 13 special CallFrontierUtilFunc - msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B498, 4 + msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B498, MSGBOX_DEFAULT goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105 BattleFrontier_BattleFactoryBattleRoom_EventScript_25B051:: @ 825B051 @@ -189,13 +189,13 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B051:: @ 825B051 special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25B07E - msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B517, 4 + msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B517, MSGBOX_DEFAULT setvar VAR_0x8004, 2 setvar VAR_0x8005, 7 special CallFrontierUtilFunc BattleFrontier_BattleFactoryBattleRoom_EventScript_25B07E:: @ 825B07E - msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B5CF, 4 + msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B5CF, MSGBOX_DEFAULT call BattleFrontier_BattleFactoryBattleRoom_EventScript_25B0E0 compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25B09B @@ -206,7 +206,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B09B:: @ 825B09B special CallFrontierUtilFunc compare VAR_RESULT, 2 goto_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105 - msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B5E7, 4 + msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B5E7, MSGBOX_DEFAULT waitmessage applymovement 8, BattleFrontier_BattleFactoryBattleRoom_Movement_25B182 waitmovement 0 @@ -216,7 +216,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B09B:: @ 825B09B waitfanfare setvar VAR_0x8004, 13 special CallFrontierUtilFunc - msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B66D, 4 + msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B66D, MSGBOX_DEFAULT goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105 BattleFrontier_BattleFactoryBattleRoom_EventScript_25B0E0:: @ 825B0E0 |