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

This commit is contained in:
Diegoisawesome
2017-10-13 20:29:11 -05:00
106 changed files with 14610 additions and 25063 deletions
+1 -1
View File
@@ -4494,7 +4494,7 @@ sub_80EAF80: @ 80EAF80
bne _080EAF9A
b _080EB16A
_080EAF9A:
bl sub_8009FCC
bl GetLinkPlayerCount
lsls r0, 24
lsrs r0, 24
cmp r0, 0x2