egg hatch almost decompiled

asm/battle_4.s

@@ -30996,7 +30996,7 @@ _08056D0A:
 	movs r0, 0x2
 	adds r2, r6, 0
 	adds r3, r5, 0
-	bl do_choose_name_or_words_screen
+	bl DoNamingScreen
 	ldr r1, =gBattleCommunication
 	ldrb r0, [r1]
 	adds r0, 0x1

asm/main_menu.s

@@ -2951,7 +2951,7 @@ task_new_game_prof_birch_speech_17: @ 8031090
 	str r0, [sp, 0x4]
 	movs r0, 0
 	movs r3, 0
-	bl do_choose_name_or_words_screen
+	bl DoNamingScreen
 _080310EC:
 	add sp, 0x8
 	pop {r4,r5}

asm/naming_screen.s

@@ -5,9 +5,9 @@
 
 	.text
 
-	thumb_func_start do_choose_name_or_words_screen
-@ int do_choose_name_or_words_screen(u8 type, sav2 *sav2_ptr, s16 player_gender, s16 a4, int a5, void ( *after_finishing_callback)())
-do_choose_name_or_words_screen: @ 80E2D78
+	thumb_func_start DoNamingScreen
+@ int DoNamingScreen(u8 type, sav2 *sav2_ptr, s16 player_gender, s16 a4, int a5, void ( *after_finishing_callback)())
+DoNamingScreen: @ 80E2D78
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -65,7 +65,7 @@ _080E2DE2:
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end do_choose_name_or_words_screen
+	thumb_func_end DoNamingScreen
 
 	thumb_func_start c2_choose_name_or_words_screen
 c2_choose_name_or_words_screen: @ 80E2E04
@@ -4197,7 +4197,7 @@ sub_80E5074: @ 80E5074
 	str r0, [sp, 0x4]
 	movs r0, 0
 	movs r3, 0
-	bl do_choose_name_or_words_screen
+	bl DoNamingScreen
 	add sp, 0x8
 	pop {r0}
 	bx r0
@@ -4217,7 +4217,7 @@ sub_80E509C: @ 80E509C
 	str r0, [sp, 0x4]
 	movs r0, 0x1
 	movs r3, 0
-	bl do_choose_name_or_words_screen
+	bl DoNamingScreen
 	add sp, 0x8
 	pop {r0}
 	bx r0
@@ -4237,7 +4237,7 @@ sub_80E50C4: @ 80E50C4
 	str r0, [sp, 0x4]
 	movs r0, 0x2
 	movs r3, 0
-	bl do_choose_name_or_words_screen
+	bl DoNamingScreen
 	add sp, 0x8
 	pop {r0}
 	bx r0
@@ -4257,7 +4257,7 @@ sub_80E50EC: @ 80E50EC
 	str r0, [sp, 0x4]
 	movs r0, 0x3
 	movs r3, 0
-	bl do_choose_name_or_words_screen
+	bl DoNamingScreen
 	add sp, 0x8
 	pop {r0}
 	bx r0

asm/pokemon_storage_system.s

@@ -5433,7 +5433,7 @@ _080C9F1C:
 	movs r0, 0x1
 	movs r2, 0
 	movs r3, 0
-	bl do_choose_name_or_words_screen
+	bl DoNamingScreen
 	b _080C9F56
 	.pool
 _080C9F48:

asm/tv.s

@@ -7530,7 +7530,7 @@ sub_80EFDDC: @ 80EFDDC
 	mov r1, r10
 	adds r2, r5, 0
 	adds r3, r4, 0
-	bl do_choose_name_or_words_screen
+	bl DoNamingScreen
 	add sp, 0x8
 	pop {r3-r5}
 	mov r8, r3
@@ -7604,7 +7604,7 @@ sub_80EFEC4: @ 80EFEC4
 	mov r1, r8
 	adds r2, r5, 0
 	adds r3, r4, 0
-	bl do_choose_name_or_words_screen
+	bl DoNamingScreen
 	add sp, 0x8
 	pop {r3}
 	mov r8, r3

asm/walda_phrase.s

@@ -22,7 +22,7 @@ walda_maybe: @ 81D99E4
 	adds r1, r4, 0
 	movs r2, 0
 	movs r3, 0
-	bl do_choose_name_or_words_screen
+	bl DoNamingScreen
 	add sp, 0x8
 	pop {r4}
 	pop {r0}