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

This commit is contained in:
Diegoisawesome
2017-11-15 00:47:34 -06:00
121 changed files with 6022 additions and 11283 deletions
+1 -1
View File
@@ -1116,7 +1116,7 @@ sub_81C4778: @ 81C4778
bne _081C47AE
adds r0, r1, 0
adds r0, 0xC
bl sub_805F110
bl ShouldPlayNormalPokeCry
cmp r0, 0x1
bne _081C47A4
ldrh r0, [r4, 0x2]