diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2017-10-12 20:00:38 -0500 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2017-10-12 20:00:38 -0500 |
| commit | 428dd0e0a8539b171fccc59ea717fda970a22e91 (patch) | |
| tree | 5f2c075582cdc263c8fb2922f1ec428e3c2004d6 /asm/rom3.s | |
| parent | 9ac5f464fd01fe5663e9f3532667d2de7218bf0f (diff) | |
| parent | df04aca8d2c4c834cccabf94825fb310f34fcb1c (diff) | |
Merge branch 'DizzyEggg-decompile_battle_9'
Diffstat (limited to 'asm/rom3.s')
| -rw-r--r-- | asm/rom3.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/rom3.s b/asm/rom3.s index bde493568..649097eb6 100644 --- a/asm/rom3.s +++ b/asm/rom3.s @@ -3259,8 +3259,8 @@ _0803413E: .pool thumb_func_end sub_8034110 - thumb_func_start dp01_build_cmdbuf_x21_a_bb -dp01_build_cmdbuf_x21_a_bb: @ 8034158 + thumb_func_start EmitCmd_x21 +EmitCmd_x21: @ 8034158 push {r4,lr} adds r4, r1, 0 lsls r0, 24 @@ -3280,7 +3280,7 @@ dp01_build_cmdbuf_x21_a_bb: @ 8034158 pop {r0} bx r0 .pool - thumb_func_end dp01_build_cmdbuf_x21_a_bb + thumb_func_end EmitCmd_x21 thumb_func_start dp01_build_cmdbuf_x22_a_three_bytes dp01_build_cmdbuf_x22_a_three_bytes: @ 8034184 |