Merge branch 'master' into battle

This commit is contained in:
jiangzhengwenjz
2019-08-25 06:58:56 +08:00
31 changed files with 8275 additions and 1631 deletions
+1 -1
View File
@@ -25315,7 +25315,7 @@ _0802C8E8:
lsls r0, 16
lsrs r0, 16
movs r1, 0x1
bl sub_8088E38
bl GetPokedexHeightWeight
ldrh r1, [r4]
lsls r0, 16
lsrs r0, 16