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_safari.s | |
| parent | e382a73e9d706fee763723b5a275b36db3b0fc97 (diff) | |
| parent | 428dd0e0a8539b171fccc59ea717fda970a22e91 (diff) | |
Merge branch 'master' into decompile_reshow_battle_screen
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 0783d2c6d..a45ae6cee 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 |