Merge branch 'master' of https://github.com/pret/pokeemerald

asm/easy_chat.s

@@ -9243,8 +9243,8 @@ _0811EA68:
 	bx r1
 	thumb_func_end sub_811EA28
 
-	thumb_func_start start_menu_is_selected_item_valid
-start_menu_is_selected_item_valid: @ 811EA6C
+	thumb_func_start EasyChat_GetNumWordsInGroup
+EasyChat_GetNumWordsInGroup: @ 811EA6C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -9273,7 +9273,7 @@ _0811EA9A:
 	pop {r1}
 	bx r1
 	.pool
-	thumb_func_end start_menu_is_selected_item_valid
+	thumb_func_end EasyChat_GetNumWordsInGroup
 
 	thumb_func_start sub_811EAA4
 sub_811EAA4: @ 811EAA4
@@ -10145,7 +10145,7 @@ sub_811F0F8: @ 811F0F8
 sub_811F108: @ 811F108
 	push {r4-r7,lr}
 	movs r0, 0
-	bl start_menu_is_selected_item_valid
+	bl EasyChat_GetNumWordsInGroup
 	lsls r0, 16
 	lsrs r4, r0, 16
 	cmp r4, 0

asm/record_mixing.s

@@ -1438,7 +1438,7 @@ _080E791A:
 	add r1, r9
 	movs r2, 0x40
 	bl memcpy
-	bl sub_8120670
+	bl ResetMauvilleOldManFlag
 	add sp, 0x10
 	pop {r3,r4}
 	mov r8, r3