diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2017-10-13 20:29:11 -0500 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2017-10-13 20:29:11 -0500 |
| commit | 924c0c6b5a9ceeb27fdc9e41e69d283c2b8d36d8 (patch) | |
| tree | 2c22380365ddf70f1432cac5f9cbede0bdef2abc /asm/rom3.s | |
| parent | 2852f4f1b86f1a5fbfdceb296d184158068b5ad5 (diff) | |
| parent | f6af9e7013107154df62d2eff53e3accb7a24b3d (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into decomp_scrcmd
Diffstat (limited to 'asm/rom3.s')
| -rw-r--r-- | asm/rom3.s | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/asm/rom3.s b/asm/rom3.s index bde493568..0159a453a 100644 --- a/asm/rom3.s +++ b/asm/rom3.s @@ -1963,7 +1963,7 @@ _08033726: lsls r0, r1, 24 lsrs r4, r0, 24 _0803372C: - bl sub_8009FCC + bl GetLinkPlayerCount lsls r0, 24 lsrs r0, 24 cmp r4, r0 @@ -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 |