Merge master into doc-tower

This commit is contained in:
GriffinR
2019-12-17 21:17:46 -05:00
145 changed files with 7875 additions and 10345 deletions

View File

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