fix: move/rename declarations

asm/overworld.s

@@ -3799,8 +3799,8 @@ _080568F4: .4byte gFieldCallback
 _080568F8: .4byte FieldCallback_ReturnToEventScript2
 	thumb_func_end c2_exit_to_overworld_1_continue_scripts_restart_music
 
-	thumb_func_start sub_80568FC
-sub_80568FC: @ 80568FC
+	thumb_func_start CB2_Overworld
+CB2_Overworld: @ 80568FC
 	push {lr}
 	bl sub_80569BC
 	ldr r1, _08056910 @ =gFieldCallback
@@ -3812,7 +3812,7 @@ sub_80568FC: @ 80568FC
 	.align 2, 0
 _08056910: .4byte gFieldCallback
 _08056914: .4byte sub_807DF7C
-	thumb_func_end sub_80568FC
+	thumb_func_end CB2_Overworld
 
 	thumb_func_start sub_8056918
 sub_8056918: @ 8056918

asm/pokedex.s

@@ -220,8 +220,8 @@ _08088F7C:
 	bx r1
 	thumb_func_end sub_8088F58
 
-	thumb_func_start sub_8088F84
-sub_8088F84: @ 8088F84
+	thumb_func_start HasAllKantoMons
+HasAllKantoMons: @ 8088F84
 	push {r4,r5,lr}
 	movs r0, 0
 _08088F88:
@@ -277,6 +277,6 @@ _08088FE8:
 	pop {r4,r5}
 	pop {r1}
 	bx r1
-	thumb_func_end sub_8088F84
+	thumb_func_end HasAllKantoMons
 
 	.align 2, 0 @ Don't pad with nop.

asm/trainer_card.s

@@ -1070,7 +1070,7 @@ _080898BE:
 	adds r0, 0x1
 	strb r0, [r5, 0x1]
 _080898CE:
-	bl sub_8088F84
+	bl HasAllKantoMons
 	lsls r0, 16
 	cmp r0, 0
 	beq _080898DE
@@ -1117,7 +1117,7 @@ _08089918:
 _0808991C:
 	bl sub_8088F58
 	strb r0, [r5, 0x3]
-	bl sub_8088F84
+	bl HasAllKantoMons
 	adds r6, r5, 0
 	adds r6, 0x4D
 	strb r0, [r6]