diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-08-28 17:08:26 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-08-28 17:08:26 +0200 |
| commit | e303133664cf749770fdfedc2415ac82397a3bb7 (patch) | |
| tree | c56e128c9719d444dbf2216a60c92e16652a3696 /asm | |
| parent | 0340a09a1b45d6a663e8e9260986ca19d96ce34e (diff) | |
| parent | 5cfb890e9351b737786ce263b081599513a99ae6 (diff) | |
Merge branch 'master' into decompile_evolution_scene
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 |