Merge master into ObjEvent rename and prune accidental inclusions

This commit is contained in:
GriffinR
2020-01-08 05:43:06 -05:00
parent 68cdd7b1cb
commit ef67f2d33b
85 changed files with 4548 additions and 4729 deletions
+1 -1
View File
@@ -513,7 +513,7 @@ gSpecials:: @ 81DBA64
def_special TurnOnTVScreen
def_special sub_81D4A90
def_special ShouldDistributeEonTicket
def_special sub_813B568
def_special LinkRetireStatusWithBattleTowerPartner
def_special sub_813B534
def_special CallTrainerHillFunction
def_special Script_DoRayquazaScene @ Listed twice