diff options
author | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-08-03 06:55:42 +0800 |
---|---|---|
committer | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-08-03 06:55:42 +0800 |
commit | 6a063cf74ad8168e9080c1f3be20e5dfe3c3187c (patch) | |
tree | fb1c3ab1ea836434cdd86be3b4e59a5fc8b8571f /asm/battle_2.s | |
parent | 742a7ee1beab323e30d60c599697a2a831c4f4de (diff) |
ported battle_controller_opponent from pokeem and corrected lots of stuff
Diffstat (limited to 'asm/battle_2.s')
-rw-r--r-- | asm/battle_2.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/battle_2.s b/asm/battle_2.s index b206cc493..d4fb29c16 100644 --- a/asm/battle_2.s +++ b/asm/battle_2.s @@ -4061,8 +4061,8 @@ _08011E98: .4byte nullsub_10 _08011E9C: .4byte gUnknown_2022AE8 thumb_func_end sub_8011E3C - thumb_func_start sub_8011EA0 -sub_8011EA0: @ 8011EA0 + thumb_func_start SpriteCB_FaintOpponentMon +SpriteCB_FaintOpponentMon: @ 8011EA0 push {r4-r7,lr} mov r7, r9 mov r6, r8 @@ -4201,7 +4201,7 @@ _08011F8C: .align 2, 0 _08011FAC: .4byte gUnknown_82349CC _08011FB0: .4byte sub_8011FB4 - thumb_func_end sub_8011EA0 + thumb_func_end SpriteCB_FaintOpponentMon thumb_func_start sub_8011FB4 sub_8011FB4: @ 8011FB4 |