Merge branch 'master' into easy_chat

2017-11-02 18:34:41 -04:00
parent 975e28c01e af197ccd3b
commit ed7ded0748
147 changed files with 37165 additions and 72938 deletions
@@ -8984,8 +8984,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
@@ -9029,7 +9029,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)