diff options
| author | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-08-25 06:58:56 +0800 |
|---|---|---|
| committer | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-08-25 06:58:56 +0800 |
| commit | 8b14f4e90abf8010e83d6b38a26034458ce36d5d (patch) | |
| tree | b435edeb745cd9d232011cdcea7662711987e1d1 /asm/battle_script_commands.s | |
| parent | 41a7e6967dd4fd79eb01a45f4d77cf7c2ca11dc1 (diff) | |
| parent | 74e2a0e123be0ecd0e0df516ce242aea9c348117 (diff) | |
Merge branch 'master' into battle
Diffstat (limited to 'asm/battle_script_commands.s')
| -rw-r--r-- | asm/battle_script_commands.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/asm/battle_script_commands.s b/asm/battle_script_commands.s index f1d80c4fc..8c70f5d8a 100644 --- a/asm/battle_script_commands.s +++ b/asm/battle_script_commands.s @@ -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 |