Merge master into doc-tower

This commit is contained in:
GriffinR committed 2019-12-17 21:17:46 -05:00
commit 23f952b34e
145 files changed
+7875 -10345

No files matched your search

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