finished safari_zone

asm/battle_setup.s

@@ -221,7 +221,7 @@ sub_807F7D8: @ 807F7D8
 	bl player_bitmagic
 	bl sub_805C780
 	ldr r1, _0807F804 @ =gMain
-	ldr r0, _0807F808 @ =sub_80A0F4C
+	ldr r0, _0807F808 @ =CB2_EndSafariBattle
 	str r0, [r1, 0x8]
 	ldr r1, _0807F80C @ =gBattleTypeFlags
 	movs r0, 0x80
@@ -235,7 +235,7 @@ sub_807F7D8: @ 807F7D8
 	bx r0
 	.align 2, 0
 _0807F804: .4byte gMain
-_0807F808: .4byte sub_80A0F4C
+_0807F808: .4byte CB2_EndSafariBattle
 _0807F80C: .4byte gBattleTypeFlags
 	thumb_func_end sub_807F7D8
 
@@ -300,7 +300,7 @@ sub_807F888: @ 807F888
 	bl CreateMaleMon
 	bl ScriptContext2_Enable
 	ldr r1, _0807F8B8 @ =gMain
-	ldr r0, _0807F8BC @ =c2_exit_to_overworld_1_continue_scripts_restart_music
+	ldr r0, _0807F8BC @ =CB2_ReturnToFieldContinueScriptPlayMapMusic
 	str r0, [r1, 0x8]
 	ldr r1, _0807F8C0 @ =gBattleTypeFlags
 	movs r0, 0x80
@@ -314,7 +314,7 @@ sub_807F888: @ 807F888
 	.align 2, 0
 _0807F8B4: .4byte gEnemyParty
 _0807F8B8: .4byte gMain
-_0807F8BC: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
+_0807F8BC: .4byte CB2_ReturnToFieldContinueScriptPlayMapMusic
 _0807F8C0: .4byte gBattleTypeFlags
 	thumb_func_end sub_807F888
 
@@ -679,14 +679,14 @@ _0807FBD4: .4byte 0x01000100
 _0807FBD8: .4byte gBattleOutcome
 _0807FBDC: .4byte c2_whiteout
 _0807FBE0:
-	ldr r0, _0807FBEC @ =c2_exit_to_overworld_1_continue_scripts_restart_music
+	ldr r0, _0807FBEC @ =CB2_ReturnToFieldContinueScriptPlayMapMusic
 	bl SetMainCallback2
 _0807FBE6:
 	add sp, 0x4
 	pop {r0}
 	bx r0
 	.align 2, 0
-_0807FBEC: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
+_0807FBEC: .4byte CB2_ReturnToFieldContinueScriptPlayMapMusic
 	thumb_func_end sub_807FBA0
 
 	thumb_func_start sub_807FBF0
@@ -731,7 +731,7 @@ _0807FC40:
 	movs r0, 0x1
 	strh r0, [r1]
 _0807FC46:
-	ldr r0, _0807FC58 @ =c2_exit_to_overworld_1_continue_scripts_restart_music
+	ldr r0, _0807FC58 @ =CB2_ReturnToFieldContinueScriptPlayMapMusic
 	bl SetMainCallback2
 _0807FC4C:
 	add sp, 0x4
@@ -740,7 +740,7 @@ _0807FC4C:
 	bx r0
 	.align 2, 0
 _0807FC54: .4byte gSpecialVar_Result
-_0807FC58: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
+_0807FC58: .4byte CB2_ReturnToFieldContinueScriptPlayMapMusic
 	thumb_func_end sub_807FBF0
 
 	thumb_func_start sub_807FC5C
@@ -1878,14 +1878,14 @@ _080804E8:
 	movs r1, 0
 	strh r1, [r0]
 _080804EE:
-	ldr r0, _08080504 @ =c2_exit_to_overworld_1_continue_scripts_restart_music
+	ldr r0, _08080504 @ =CB2_ReturnToFieldContinueScriptPlayMapMusic
 	bl SetMainCallback2
 	bl sub_80803FC
 	bl sub_81139BC
 	b _0808054E
 	.align 2, 0
 _08080500: .4byte gSpecialVar_Result
-_08080504: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
+_08080504: .4byte CB2_ReturnToFieldContinueScriptPlayMapMusic
 _08080508:
 	ldr r0, _0808051C @ =gTrainerBattleOpponent_A
 	ldrh r1, [r0]
@@ -1893,12 +1893,12 @@ _08080508:
 	lsls r0, 3
 	cmp r1, r0
 	bne _08080524
-	ldr r0, _08080520 @ =c2_exit_to_overworld_1_continue_scripts_restart_music
+	ldr r0, _08080520 @ =CB2_ReturnToFieldContinueScriptPlayMapMusic
 	bl SetMainCallback2
 	b _0808054E
 	.align 2, 0
 _0808051C: .4byte gTrainerBattleOpponent_A
-_08080520: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
+_08080520: .4byte CB2_ReturnToFieldContinueScriptPlayMapMusic
 _08080524:
 	ldr r0, _08080538 @ =gBattleOutcome
 	ldrb r0, [r0]
@@ -1913,7 +1913,7 @@ _08080530:
 _08080538: .4byte gBattleOutcome
 _0808053C: .4byte c2_whiteout
 _08080540:
-	ldr r0, _08080554 @ =c2_exit_to_overworld_1_continue_scripts_restart_music
+	ldr r0, _08080554 @ =CB2_ReturnToFieldContinueScriptPlayMapMusic
 	bl SetMainCallback2
 	bl sub_80803FC
 	bl sub_81139BC
@@ -1921,7 +1921,7 @@ _0808054E:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08080554: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
+_08080554: .4byte CB2_ReturnToFieldContinueScriptPlayMapMusic
 	thumb_func_end sub_80804AC
 
 	thumb_func_start sub_8080558
@@ -1933,12 +1933,12 @@ sub_8080558: @ 8080558
 	lsls r0, 3
 	cmp r1, r0
 	bne _08080578
-	ldr r0, _08080574 @ =c2_exit_to_overworld_1_continue_scripts_restart_music
+	ldr r0, _08080574 @ =CB2_ReturnToFieldContinueScriptPlayMapMusic
 	bl SetMainCallback2
 	b _080805A6
 	.align 2, 0
 _08080570: .4byte gTrainerBattleOpponent_A
-_08080574: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
+_08080574: .4byte CB2_ReturnToFieldContinueScriptPlayMapMusic
 _08080578:
 	ldr r0, _0808058C @ =gBattleOutcome
 	ldrb r0, [r0]
@@ -1952,7 +1952,7 @@ _08080578:
 _0808058C: .4byte gBattleOutcome
 _08080590: .4byte c2_whiteout
 _08080594:
-	ldr r0, _080805AC @ =c2_exit_to_overworld_1_continue_scripts_restart_music
+	ldr r0, _080805AC @ =CB2_ReturnToFieldContinueScriptPlayMapMusic
 	bl SetMainCallback2
 	bl sub_80803FC
 	bl sub_810CDE8
@@ -1961,7 +1961,7 @@ _080805A6:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_080805AC: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
+_080805AC: .4byte CB2_ReturnToFieldContinueScriptPlayMapMusic
 	thumb_func_end sub_8080558
 
 	thumb_func_start sub_80805B0