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_wally.s | |
| parent | 74c59af856216332b6c73cbc382edff3518a0eab (diff) | |
| parent | 52db3ad5aa83ae70e06eae87f502b09fff55aecc (diff) | |
Merge branch 'master' into mail
Diffstat (limited to 'asm/battle_controller_wally.s')
| -rw-r--r-- | asm/battle_controller_wally.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/battle_controller_wally.s b/asm/battle_controller_wally.s index 64c8b4442..f80292bcc 100644 --- a/asm/battle_controller_wally.s +++ b/asm/battle_controller_wally.s @@ -153,7 +153,7 @@ _081684CE: movs r1, 0x9 _081684E4: movs r2, 0 - bl dp01_build_cmdbuf_x21_a_bb + bl EmitCmd_x21 bl WallyBufferExecCompleted ldr r1, [r4] adds r1, 0x94 @@ -208,7 +208,7 @@ _08168540: movs r0, 0x1 movs r1, 0x1 movs r2, 0 - bl dp01_build_cmdbuf_x21_a_bb + bl EmitCmd_x21 bl WallyBufferExecCompleted _08168564: pop {r4,r5} @@ -3777,7 +3777,7 @@ _0816A550: lsls r2, 1 movs r0, 0x1 movs r1, 0xA - bl dp01_build_cmdbuf_x21_a_bb + bl EmitCmd_x21 bl WallyBufferExecCompleted _0816A574: pop {r4} |