diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-02 07:59:29 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-02 07:59:29 -0400 |
| commit | ab3b8cd51a88f02dbdb72c276a1c35591e8331f4 (patch) | |
| tree | 29d5e0c8c1aa2ddd211b65c0160af98044d76678 /asm/easy_chat.s | |
| parent | 6543d7f2d6e7e12e159588f494895ba02b7d5090 (diff) | |
| parent | af197ccd3bd62fab813154dc4311e65f9992a676 (diff) | |
Merge branch 'master' into heal_location
Diffstat (limited to 'asm/easy_chat.s')
| -rw-r--r-- | asm/easy_chat.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/easy_chat.s b/asm/easy_chat.s index a85169b61..e9565dfa9 100644 --- a/asm/easy_chat.s +++ b/asm/easy_chat.s @@ -9335,8 +9335,8 @@ _0811EB0A: bx r1 thumb_func_end sub_811EAA4 - thumb_func_start sub_811EB10 -sub_811EB10: @ 811EB10 + thumb_func_start ECWord_CheckIfOutsideOfValidRange +ECWord_CheckIfOutsideOfValidRange: @ 811EB10 push {lr} lsls r0, 16 lsrs r2, r0, 25 @@ -9380,7 +9380,7 @@ _0811EB5C: _0811EB5E: pop {r1} bx r1 - thumb_func_end sub_811EB10 + thumb_func_end ECWord_CheckIfOutsideOfValidRange thumb_func_start GetEasyChatWord @ char *GetEasyChatWord(u8 groupId, u16 wordId) |