Merge branch 'master' into fix-eventobj

This commit is contained in:
GriffinR
2019-12-18 13:16:38 -05:00
committed by GitHub
82 changed files with 3472 additions and 6562 deletions
@@ -219,7 +219,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_2492DB:: @ 82492DB
tower_save CHALLENGE_STATUS_PAUSED
playse SE_SAVE
waitse
fadescreen 1
fadescreen FADE_TO_BLACK
frontier_reset
end