Merge branch 'master' into fix-eventobj

This commit is contained in:
GriffinR authored and GitHub committed 2019-12-18 13:16:38 -05:00
commit 949509aade
82 files changed
+3472 -6562

No files matched your search

@@ -146,7 +146,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241E22:: @ 8241E22
tower_save CHALLENGE_STATUS_PAUSED
playse SE_SAVE
waitse
fadescreen 1
fadescreen FADE_TO_BLACK
frontier_reset
end