diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-10-13 11:16:34 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-10-13 11:16:34 -0400 |
| commit | e24f3808f47d292776f4e7506217f93756dd19bf (patch) | |
| tree | d910619ff23e466bfd4b673381c1642656e3dc5c /asm/battle_controller_safari.s | |
| parent | 74c59af856216332b6c73cbc382edff3518a0eab (diff) | |
| parent | 52db3ad5aa83ae70e06eae87f502b09fff55aecc (diff) | |
Merge branch 'master' into mail
Diffstat (limited to 'asm/battle_controller_safari.s')
| -rw-r--r-- | asm/battle_controller_safari.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/battle_controller_safari.s b/asm/battle_controller_safari.s index a5acca8c1..c3fbd0aad 100644 --- a/asm/battle_controller_safari.s +++ b/asm/battle_controller_safari.s @@ -103,13 +103,13 @@ _0815942A: movs r1, 0x7 _0815942E: movs r2, 0 - bl dp01_build_cmdbuf_x21_a_bb + bl EmitCmd_x21 b _08159440 _08159436: movs r0, 0x1 movs r1, 0x8 movs r2, 0 - bl dp01_build_cmdbuf_x21_a_bb + bl EmitCmd_x21 _08159440: bl SafariBufferExecCompleted b _0815954E |