Merge branch 'master' into doc-miscbattle

This commit is contained in:
GriffinR authored and GitHub committed 2021-10-15 22:46:43 -04:00
commit e1900efe1e
46 files changed
+2863 -2829

No files matched your search

+1 -1
View File
@@ -43,7 +43,7 @@ gSpecials::
def_special CloseLink
def_special ColosseumPlayerSpotTriggered
def_special PlayerEnteredTradeSeat
def_special nullsub_37
def_special Script_StartWiredTrade
def_special CableClubSaveGame
def_special TryBerryBlenderLinkup
def_special GetLinkPartnerNames