diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-19 19:46:37 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-19 19:46:37 +0200 |
| commit | dee61330769b3e3a93844c9a0ef609500fe399d3 (patch) | |
| tree | 1f36102b4133fdfe5fe2fd8a062d085e9673b062 /asm/battle_controller_player_partner.s | |
| parent | dd0f19476c3a15514e3d08855cee3266fdbdf2ed (diff) | |
| parent | 8ceecd9fba385442f55bff2d19977e3c2fd6e5e8 (diff) | |
fix merge conflicts
Diffstat (limited to 'asm/battle_controller_player_partner.s')
| -rw-r--r-- | asm/battle_controller_player_partner.s | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/asm/battle_controller_player_partner.s b/asm/battle_controller_player_partner.s index 90ceaf291..10dc24fe4 100644 --- a/asm/battle_controller_player_partner.s +++ b/asm/battle_controller_player_partner.s @@ -645,7 +645,7 @@ _081BB2E2: lsrs r2, 16 movs r0, 0x1 movs r1, 0xB - bl EmitCmd_x21 + bl EmitCmd33 strb r5, [r4] bl IsDoubleBattle lsls r0, 24 @@ -918,7 +918,7 @@ _081BB514: lsrs r2, 16 movs r0, 0x1 movs r1, 0xB - bl EmitCmd_x21 + bl EmitCmd33 strb r5, [r4] ldr r0, =sub_81BB628 str r0, [r6] @@ -1688,7 +1688,7 @@ _081BBCBE: lsrs r1, 16 movs r0, 0x1 mov r2, sp - bl dp01_build_cmdbuf_x1D_1D_numargs_varargs + bl EmitDataTransfer bl PlayerPartnerBufferExecCompleted add sp, 0x100 pop {r4-r6} @@ -5068,7 +5068,7 @@ _081BDB3C: orrs r2, r5 movs r0, 0x1 movs r1, 0xA - bl EmitCmd_x21 + bl EmitCmd33 bl PlayerPartnerBufferExecCompleted pop {r4-r6} pop {r0} @@ -5138,7 +5138,7 @@ _081BDBD0: lsrs r1, 24 movs r0, 0x1 movs r2, 0 - bl dp01_build_cmdbuf_x22_a_three_bytes + bl EmitCmd34 bl PlayerPartnerBufferExecCompleted pop {r4-r6} pop {r0} |