diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-08-27 16:13:37 -0400 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-08-27 16:13:37 -0400 |
| commit | e154155a2916939bb504e26b3c6be1924b18b921 (patch) | |
| tree | f0222cff03482d7ca30c42b7c6810430da240f14 /asm | |
| parent | bd59586968791b7c322bc79ef571f9cbff80c38a (diff) | |
| parent | 3d9ef5ea2c6c1ba173c17e98d91044926167bf6a (diff) | |
Merge branch 'master' of https://github.com/pret/pokeruby into refactor_src
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 |