diff options
| author | Cameron Hall <camthesaxman@users.noreply.github.com> | 2017-08-27 13:19:16 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-27 13:19:16 -0500 |
| commit | 3d9ef5ea2c6c1ba173c17e98d91044926167bf6a (patch) | |
| tree | 0279b0c58f40bf27cf40c7e175aa671c9a6fde00 /asm | |
| parent | d58e89a51850a38bf6ae332736bdedcfd62770f7 (diff) | |
| parent | df0edd693361f4f4e587a39360fd035e7cec8cda (diff) | |
Merge pull request #422 from DizzyEggg/fix_nonmatching_emits
fix emits nonmatchings and add a few labels
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/battle_controller_linkopponent1.s | 2 | ||||
| -rw-r--r-- | asm/battle_controller_safari.s | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/asm/battle_controller_linkopponent1.s b/asm/battle_controller_linkopponent1.s index e53531703..4fa523c83 100644 --- a/asm/battle_controller_linkopponent1.s +++ b/asm/battle_controller_linkopponent1.s @@ -1384,7 +1384,7 @@ LinkOpponentBufferExecCompleted: @ 8038004 movs r0, 0x2 movs r1, 0x4 mov r2, sp - bl dp01_prepare_buffer_wireless_probably + bl PrepareBufferDataTransferLink ldr r1, _08038054 @ =gBattleBufferA ldrb r0, [r4] lsls r0, 9 diff --git a/asm/battle_controller_safari.s b/asm/battle_controller_safari.s index 97bcd15b5..e98d4ccd0 100644 --- a/asm/battle_controller_safari.s +++ b/asm/battle_controller_safari.s @@ -466,7 +466,7 @@ SafariBufferExecCompleted: @ 812B7C0 movs r0, 0x2 movs r1, 0x4 mov r2, sp - bl dp01_prepare_buffer_wireless_probably + bl PrepareBufferDataTransferLink ldr r1, _0812B810 @ =gBattleBufferA ldrb r0, [r4] lsls r0, 9 |