diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-12-18 13:16:38 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-18 13:16:38 -0500 |
| commit | 949509aade2627ded031669c296453c3d0ea9e59 (patch) | |
| tree | 5e8ba850c7592a5cf85dc07971e756b8963ecdfb /data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc | |
| parent | db8a5c6c2be2ceedadf836a8e61c71eb0ff6407b (diff) | |
| parent | f8cef9a6a86fb85634e21370e5a7a0d2ac4a9ba2 (diff) | |
Merge branch 'master' into fix-eventobj
Diffstat (limited to 'data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc')
| -rw-r--r-- | data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc index 701ea9a86..dd5440299 100644 --- a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc @@ -39,7 +39,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_EnterRoom:: @ 8259AF9 call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_CommentOnOpponentType call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_CommentOnOpponentStyle msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_HoldMonsChooseFromSelection, MSGBOX_DEFAULT - fadescreen 1 + fadescreen FADE_TO_BLACK factory_setswapped factory_rentmons waitstate @@ -163,7 +163,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskSwapMon:: @ 8259D98 case MULTI_B_PRESSED, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_EnterBattleRoom BattleFrontier_BattleFactoryPreBattleRoom_EventScript_SwapMons:: @ 8259DF2 - fadescreen 1 + fadescreen FADE_TO_BLACK factory_swapmons waitstate compare VAR_RESULT, 1 @@ -208,7 +208,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_PauseChallenge:: @ 8259E47 factory_save CHALLENGE_STATUS_PAUSED playse SE_SAVE waitse - fadescreen 1 + fadescreen FADE_TO_BLACK frontier_reset end |