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

@@ -6,7 +6,7 @@ BattleFrontier_BattleTowerMultiPartnerRoom_MapScripts:: @ 8243D92
.byte 0
BattleFrontier_BattleTowerMultiPartnerRoom_OnResume: @ 8243DA7
pyramid_healparty
pyramid_resetparty
end
BattleFrontier_BattleTowerMultiPartnerRoom_OnTransition: @ 8243DB0