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_linkopponent.s | |
| parent | dd0f19476c3a15514e3d08855cee3266fdbdf2ed (diff) | |
| parent | 8ceecd9fba385442f55bff2d19977e3c2fd6e5e8 (diff) | |
fix merge conflicts
Diffstat (limited to 'asm/battle_controller_linkopponent.s')
| -rw-r--r-- | asm/battle_controller_linkopponent.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/asm/battle_controller_linkopponent.s b/asm/battle_controller_linkopponent.s index ddc506b8c..ceed97584 100644 --- a/asm/battle_controller_linkopponent.s +++ b/asm/battle_controller_linkopponent.s @@ -1572,7 +1572,7 @@ _0806513A: lsrs r1, 16 movs r0, 0x1 mov r2, sp - bl dp01_build_cmdbuf_x1D_1D_numargs_varargs + bl EmitDataTransfer bl LinkOpponentBufferExecCompleted add sp, 0x100 pop {r4-r6} |