Merge origin/master into pikalaxalt/link

2017-11-16 08:36:51 -05:00
parent 50501396b2 c0d180a870
commit 236cbf96c8
2913 changed files with 158852 additions and 19880 deletions
@@ -142,8 +142,8 @@ gSpecials:: @ 81DBA64
 	def_special sub_8122A30
 	def_special sub_80D6EDC
 	def_special CalculatePlayerPartyCount
-	def_special sub_80C7008
-	def_special sub_80C70AC
+	def_special CountPartyNonEggMons
+	def_special CountPartyAliveNonEggMons_IgnoreVar0x8004Slot
 	def_special sub_80F88E8
 	def_special sub_80F88DC
 	def_special sub_80F8864