Merge branch 'master' into pokedex_2

asm/battle_setup.s

@@ -30,13 +30,13 @@ _0807F644:
 	bne _0807F686
 	bl sub_812B478
 	ldrb r0, [r4, 0x2]
-	bl sub_80D08B8
+	bl BT_StartOnField
 	ldrh r0, [r4]
 	adds r0, 0x1
 	strh r0, [r4]
 	b _0807F686
 _0807F65E:
-	bl sub_80D08F8
+	bl BT_IsDone
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1

asm/battle_tower.s

@@ -2025,7 +2025,7 @@ sub_80E68C4: @ 80E68C4
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
-	bl sub_80D08F8
+	bl BT_IsDone
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -2114,7 +2114,7 @@ _080E6970:
 	bl sub_8080060
 	lsls r0, 24
 	lsrs r0, 24
-	bl sub_80D08B8
+	bl BT_StartOnField
 	b _080E69E6
 	.align 2, 0
 _080E698C: .4byte gSaveBlock1Ptr
@@ -2154,7 +2154,7 @@ _080E69A0:
 	bl sub_8080060
 	lsls r0, 24
 	lsrs r0, 24
-	bl sub_80D08B8
+	bl BT_StartOnField
 _080E69E6:
 	add sp, 0x4
 	pop {r4-r6}

asm/clear_save_data_screen.s

@@ -26,8 +26,8 @@ sub_80F558C: @ 80F558C
 	bx r0
 	thumb_func_end sub_80F558C
 
-	thumb_func_start sub_80F55A0
-sub_80F55A0: @ 80F55A0
+	thumb_func_start CB2_SaveClearScreen_Init
+CB2_SaveClearScreen_Init: @ 80F55A0
 	push {r4,lr}
 	ldr r4, _080F55D0 @ =gUnknown_203AB54
 	movs r0, 0x4
@@ -52,7 +52,7 @@ sub_80F55A0: @ 80F55A0
 _080F55D0: .4byte gUnknown_203AB54
 _080F55D4: .4byte sub_80F55DC
 _080F55D8: .4byte sub_80F5574
-	thumb_func_end sub_80F55A0
+	thumb_func_end CB2_SaveClearScreen_Init
 
 	thumb_func_start sub_80F55DC
 sub_80F55DC: @ 80F55DC

asm/overworld.s

@@ -3398,13 +3398,13 @@ sub_8056578: @ 8056578
 	bx r0
 	thumb_func_end sub_8056578
 
-	thumb_func_start sub_80565A8
-sub_80565A8: @ 80565A8
+	thumb_func_start CB2_OverworldBasic
+CB2_OverworldBasic: @ 80565A8
 	push {lr}
 	bl sub_8056578
 	pop {r0}
 	bx r0
-	thumb_func_end sub_80565A8
+	thumb_func_end CB2_OverworldBasic
 
 	thumb_func_start sub_80565B4
 sub_80565B4: @ 80565B4