Merge branch 'master' of https://github.com/pret/pokeemerald into decomp_scrcmd

2017-10-13 20:29:11 -05:00
parent 2852f4f1b8 f6af9e7013
commit 924c0c6b5a
106 changed files with 14610 additions and 25063 deletions
@@ -1059,7 +1059,7 @@ _080B2C5C:
 	lsls r0, 24
 	lsrs r4, r0, 24
 _080B2C7E:
-	bl sub_8009FCC
+	bl GetLinkPlayerCount
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r4, r0
@@ -1361,7 +1361,7 @@ _080B2F0C:
 	movs r0, 0
 	mov r8, r0
 	mov r9, r0
-	bl sub_8009FCC
+	bl GetLinkPlayerCount
 	lsls r0, 24
 	lsrs r5, r0, 24
 	movs r4, 0
@@ -1984,7 +1984,7 @@ _080B3474:
 	adds r5, 0x1C
 	adds r4, 0x1
 _080B349A:
-	bl sub_8009FCC
+	bl GetLinkPlayerCount
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r4, r0
@@ -2080,7 +2080,7 @@ _080B3574:
 	beq _080B35F8
 	b _080B35FE
 _080B357A:
-	bl sub_8009FCC
+	bl GetLinkPlayerCount
 	lsls r0, 24
 	lsrs r3, r0, 24
 	movs r4, 0