diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-13 12:18:32 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-13 12:18:32 +0200 |
| commit | b229a1c295f9c4a722959ec564a1cb86d1a9eaef (patch) | |
| tree | 59bb968ae154c586342dfee05d9cc8b2c1776b4f /asm/battle_controller_wally.s | |
| parent | e382a73e9d706fee763723b5a275b36db3b0fc97 (diff) | |
| parent | 428dd0e0a8539b171fccc59ea717fda970a22e91 (diff) | |
Merge branch 'master' into decompile_reshow_battle_screen
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 548414222..de17547a1 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} |