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/international_string_util.s | |
parent | 2852f4f1b86f1a5fbfdceb296d184158068b5ad5 (diff) | |
parent | f6af9e7013107154df62d2eff53e3accb7a24b3d (diff) |
Merge branch 'master' of https://github.com/pret/pokeemerald into decomp_scrcmd
Diffstat (limited to 'asm/international_string_util.s')
-rwxr-xr-x | asm/international_string_util.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/international_string_util.s b/asm/international_string_util.s index 7c52fc41a..c4369887d 100755 --- a/asm/international_string_util.s +++ b/asm/international_string_util.s @@ -389,8 +389,8 @@ _081DB5E4: bx r0 thumb_func_end sub_81DB5AC - thumb_func_start sub_81DB5E8 -sub_81DB5E8: @ 81DB5E8 + thumb_func_start TVShowConvertInternationalString +TVShowConvertInternationalString: @ 81DB5E8 push {r4,r5,lr} adds r5, r0, 0 adds r4, r2, 0 @@ -403,7 +403,7 @@ sub_81DB5E8: @ 81DB5E8 pop {r4,r5} pop {r0} bx r0 - thumb_func_end sub_81DB5E8 + thumb_func_end TVShowConvertInternationalString thumb_func_start sub_81DB604 sub_81DB604: @ 81DB604 |