diff options
author | Diegoisawesome <diego@domoreaweso.me> | 2017-12-22 01:22:16 -0600 |
---|---|---|
committer | Diegoisawesome <diego@domoreaweso.me> | 2017-12-22 01:22:16 -0600 |
commit | 6bd6cfcac7ae76806c8c9d940163dc3ece6a9acf (patch) | |
tree | f71ad889881572488c2a2be299c50fc09393e1a2 /asm/international_string_util.s | |
parent | 0e8d6645f84057a9eaf9e60ac9312bc259f15be1 (diff) | |
parent | 4554b546ef1699d4b3bde9ef27e7477e620d38d9 (diff) |
Merge remote-tracking branch 'pret/master'
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 08e435249..469d88787 100755 --- a/asm/international_string_util.s +++ b/asm/international_string_util.s @@ -113,8 +113,8 @@ _081DB4D4: bx r1 thumb_func_end sub_81DB494 - thumb_func_start sub_81DB4DC -sub_81DB4DC: @ 81DB4DC + thumb_func_start PadNameString +PadNameString: @ 81DB4DC push {r4,r5,lr} adds r4, r0, 0 lsls r1, 24 @@ -156,7 +156,7 @@ _081DB51E: pop {r4,r5} pop {r0} bx r0 - thumb_func_end sub_81DB4DC + thumb_func_end PadNameString thumb_func_start sub_81DB52C sub_81DB52C: @ 81DB52C |