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/easy_chat.s | |
| parent | 2852f4f1b86f1a5fbfdceb296d184158068b5ad5 (diff) | |
| parent | f6af9e7013107154df62d2eff53e3accb7a24b3d (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into decomp_scrcmd
Diffstat (limited to 'asm/easy_chat.s')
| -rw-r--r-- | asm/easy_chat.s | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/asm/easy_chat.s b/asm/easy_chat.s index c05da82ac..a85169b61 100644 --- a/asm/easy_chat.s +++ b/asm/easy_chat.s @@ -565,7 +565,7 @@ _0811A72C: ldr r4, =gStringVar3 adds r0, r4, 0 movs r1, 0x2 - bl sub_811F88C + bl InitializeEasyChatWordArray b _0811A7C2 .pool _0811A73C: @@ -3704,7 +3704,7 @@ sub_811BDF0: @ 811BDF0 ldrb r2, [r0] mov r0, sp adds r1, r5, 0 - bl sub_81DB5E8 + bl TVShowConvertInternationalString movs r0, 0 mov r1, sp bl sub_81AFC0C @@ -11109,8 +11109,8 @@ _0811F886: bx r1 thumb_func_end sub_811F860 - thumb_func_start sub_811F88C -sub_811F88C: @ 811F88C + thumb_func_start InitializeEasyChatWordArray +InitializeEasyChatWordArray: @ 811F88C push {lr} adds r2, r0, 0 lsls r1, 16 @@ -11133,7 +11133,7 @@ _0811F8AE: pop {r0} bx r0 .pool - thumb_func_end sub_811F88C + thumb_func_end InitializeEasyChatWordArray thumb_func_start sub_811F8BC sub_811F8BC: @ 811F8BC |