Merge master into ObjEvent rename

This commit is contained in:
GriffinR
2019-12-15 02:00:00 -05:00
49 changed files with 1845 additions and 1829 deletions
@@ -6,7 +6,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_MapScripts:: @ 8243D92
.byte 0
BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DA7: @ 8243DA7
pyramid_healparty
pyramid_resetparty
end
BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DB0: @ 8243DB0