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

@@ -458,7 +458,7 @@ gSpecials:: @ 81DBA64
def_special sub_813A630
def_special BufferBattleTowerElevatorFloors
def_special TryStoreHeldItemsInPyramidBag
def_special sub_81C4F24
def_special ChooseItemsToTossFromPyramidBag
def_special DoBattlePyramidMonsHaveHeldItem
def_special BattlePyramidChooseMonHeldItems
def_special SetBattleTowerLinkPlayerGfx