Merge branch 'master' into decompile_rom3

This commit is contained in:
DizzyEggg
2017-10-14 11:36:28 +02:00
121 changed files with 3591 additions and 9777 deletions
+1 -1
View File
@@ -2266,7 +2266,7 @@ sub_80E7F68: @ 80E7F68
bne _080E7FE4
ldrh r0, [r4]
movs r1, 0x1
bl sub_80D6D1C
bl CheckPCHasItem
lsls r0, 24
cmp r0, 0
bne _080E7FE4