diff options
| author | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-07-30 02:54:50 +0800 |
|---|---|---|
| committer | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-07-31 07:58:09 +0800 |
| commit | 045331d139f04169df59f4550fd2f5fadac14a58 (patch) | |
| tree | d2788306fa202a3d5559a253f52c38fcb961032d /asm/battle_controller_link_partner.s | |
| parent | 604347808138a0514933b3b994ac0f4eb62237a8 (diff) | |
ported battle_controllers from pokeem
Diffstat (limited to 'asm/battle_controller_link_partner.s')
| -rw-r--r-- | asm/battle_controller_link_partner.s | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/asm/battle_controller_link_partner.s b/asm/battle_controller_link_partner.s index c2dc58efd..a536d91b8 100644 --- a/asm/battle_controller_link_partner.s +++ b/asm/battle_controller_link_partner.s @@ -10,8 +10,8 @@ nullsub_77: @ 80D4200 bx lr thumb_func_end nullsub_77 - thumb_func_start sub_80D4204 -sub_80D4204: @ 80D4204 + thumb_func_start SetControllerToLinkPartner +SetControllerToLinkPartner: @ 80D4204 ldr r1, _080D4214 @ =gBattlerControllerFuncs ldr r0, _080D4218 @ =gActiveBattler ldrb r0, [r0] @@ -24,7 +24,7 @@ sub_80D4204: @ 80D4204 _080D4214: .4byte gBattlerControllerFuncs _080D4218: .4byte gActiveBattler _080D421C: .4byte LinkPartnerBufferRunCommand - thumb_func_end sub_80D4204 + thumb_func_end SetControllerToLinkPartner thumb_func_start LinkPartnerBufferRunCommand LinkPartnerBufferRunCommand: @ 80D4220 @@ -1144,7 +1144,7 @@ _080D4B1A: lsrs r1, 16 movs r0, 0x1 mov r2, sp - bl EmitDataTransfer + bl BtlController_EmitDataTransfer bl sub_80D49E8 add sp, 0x100 pop {r4-r6} |