Merge branch 'master' into field_effect_helpers

4 files changed, 16 insertions, 16 deletions

diff --git a/asm/battle_tower.s b/asm/battle_tower.s
index 3f019e1ea..65fbd0c05 100644
--- a/asm/battle_tower.s
+++ b/asm/battle_tower.s
@@ -2163,10 +2163,10 @@ _081355D6:
 	bl CreateTask
 	movs r0, 0
 	bl current_map_music_set__default_for_battle
-	bl GetBattleTowerBattleTransition
+	bl BattleSetup_GetBattleTowerBattleTransition
 	lsls r0, 24
 	lsrs r0, 24
-	bl sub_811AABC
+	bl BattleTransition_StartOnField
 	b _08135648
 	.align 2, 0
 _081355F4: .4byte gPlayerParty
@@ -2200,10 +2200,10 @@ _08135606:
 	bl CreateTask
 	movs r0, 0
 	bl current_map_music_set__default_for_battle
-	bl GetBattleTowerBattleTransition
+	bl BattleSetup_GetBattleTowerBattleTransition
 	lsls r0, 24
 	lsrs r0, 24
-	bl sub_811AABC
+	bl BattleTransition_StartOnField
 _08135648:
 	add sp, 0x4
 	pop {r4,r5}
diff --git a/asm/fldeff_80C5CD4.s b/asm/fldeff_80C5CD4.s
index e049db56a..011ce6427 100644
--- a/asm/fldeff_80C5CD4.s
+++ b/asm/fldeff_80C5CD4.s
@@ -815,7 +815,7 @@ SetUpFieldMove_SecretPower: @ 80C62C4
 	bne _080C6330
 	bl sub_80C6264
 	ldr r1, _080C6320 @ =gFieldCallback
-	ldr r0, _080C6324 @ =sub_808AB90
+	ldr r0, _080C6324 @ =FieldCallback_Teleport
 	str r0, [r1]
 	ldr r1, _080C6328 @ =gUnknown_03005CE4
 	ldr r0, _080C632C @ =sub_80C639C
@@ -824,7 +824,7 @@ SetUpFieldMove_SecretPower: @ 80C62C4
 _080C6318: .4byte gScriptResult
 _080C631C: .4byte gUnknown_0203923C
 _080C6320: .4byte gFieldCallback
-_080C6324: .4byte sub_808AB90
+_080C6324: .4byte FieldCallback_Teleport
 _080C6328: .4byte gUnknown_03005CE4
 _080C632C: .4byte sub_80C639C
 _080C6330:
@@ -836,14 +836,14 @@ _080C6330:
 	bne _080C6360
 	bl sub_80C6264
 	ldr r1, _080C6350 @ =gFieldCallback
-	ldr r0, _080C6354 @ =sub_808AB90
+	ldr r0, _080C6354 @ =FieldCallback_Teleport
 	str r0, [r1]
 	ldr r1, _080C6358 @ =gUnknown_03005CE4
 	ldr r0, _080C635C @ =sub_80C64A8
 	b _080C6380
 	.align 2, 0
 _080C6350: .4byte gFieldCallback
-_080C6354: .4byte sub_808AB90
+_080C6354: .4byte FieldCallback_Teleport
 _080C6358: .4byte gUnknown_03005CE4
 _080C635C: .4byte sub_80C64A8
 _080C6360:
@@ -859,7 +859,7 @@ _080C636E:
 _080C6372:
 	bl sub_80C6264
 	ldr r1, _080C638C @ =gFieldCallback
-	ldr r0, _080C6390 @ =sub_808AB90
+	ldr r0, _080C6390 @ =FieldCallback_Teleport
 	str r0, [r1]
 	ldr r1, _080C6394 @ =gUnknown_03005CE4
 	ldr r0, _080C6398 @ =sub_80C660C
@@ -872,7 +872,7 @@ _080C6384:
 	bx r1
 	.align 2, 0
 _080C638C: .4byte gFieldCallback
-_080C6390: .4byte sub_808AB90
+_080C6390: .4byte FieldCallback_Teleport
 _080C6394: .4byte gUnknown_03005CE4
 _080C6398: .4byte sub_80C660C
 	thumb_func_end SetUpFieldMove_SecretPower
diff --git a/asm/pokedex_area_screen.s b/asm/pokedex_area_screen.s
index 542eed201..9e380f597 100644
--- a/asm/pokedex_area_screen.s
+++ b/asm/pokedex_area_screen.s
@@ -518,7 +518,7 @@ _08110A44:
 	bl GetRoamerLocation
 	ldrb r0, [r4, 0x10]
 	ldrb r1, [r4, 0x11]
-	bl get_mapheader_by_bank_and_number
+	bl Overworld_GetMapHeaderByGroupAndId
 	ldrb r0, [r0, 0x14]
 	strh r0, [r4, 0x12]
 	movs r3, 0x88
@@ -566,7 +566,7 @@ SetAreaHasMon: @ 8110A98
 	adds r0, r5
 	strb r1, [r0, 0x11]
 	adds r0, r2, 0
-	bl get_mapheader_by_bank_and_number
+	bl Overworld_GetMapHeaderByGroupAndId
 	ldrb r0, [r0, 0x14]
 	bl sub_80FBA04
 	ldrh r1, [r4]
@@ -599,7 +599,7 @@ SetSpecialMapHasMon: @ 8110AE4
 	cmp r0, 0x1F
 	bhi _08110B96
 	adds r0, r2, 0
-	bl get_mapheader_by_bank_and_number
+	bl Overworld_GetMapHeaderByGroupAndId
 	adds r6, r0, 0
 	ldrb r0, [r6, 0x14]
 	cmp r0, 0x57
diff --git a/asm/pokenav.s b/asm/pokenav.s
index cb6a40450..1062abc48 100644
--- a/asm/pokenav.s
+++ b/asm/pokenav.s
@@ -22370,7 +22370,7 @@ _080F6C3A:
 	adds r6, r0, r1
 	ldrh r7, [r6]
 	adds r0, r7, 0
-	bl trainer_flag_check
+	bl HasTrainerAlreadyBeenFought
 	lsls r0, 24
 	cmp r0, 0
 	beq _080F6CA0
@@ -22402,7 +22402,7 @@ _080F6C3A:
 	strb r1, [r0]
 	ldrh r0, [r6, 0xA]
 	ldrh r1, [r6, 0xC]
-	bl get_mapheader_by_bank_and_number
+	bl Overworld_GetMapHeaderByGroupAndId
 	ldrh r1, [r5]
 	lsls r1, 3
 	adds r4, r1
@@ -22431,7 +22431,7 @@ _080F6CB4:
 	adds r5, r0, r1
 	ldrh r4, [r5]
 	adds r0, r4, 0
-	bl trainer_flag_check
+	bl HasTrainerAlreadyBeenFought
 	lsls r0, 24
 	cmp r0, 0
 	beq _080F6D0E