summaryrefslogtreecommitdiff
path: root/asm/battle_transition.s
diff options
context:
space:
mode:
Diffstat (limited to 'asm/battle_transition.s')
-rw-r--r--asm/battle_transition.s12
1 files changed, 6 insertions, 6 deletions
diff --git a/asm/battle_transition.s b/asm/battle_transition.s
index 6ffa17320..b7f2746ec 100644
--- a/asm/battle_transition.s
+++ b/asm/battle_transition.s
@@ -57,8 +57,8 @@ TestBattleTransition: @ 8145EDC
.pool
thumb_func_end TestBattleTransition
- thumb_func_start sub_8145EF4
-sub_8145EF4: @ 8145EF4
+ thumb_func_start BattleTransition_StartOnField
+BattleTransition_StartOnField: @ 8145EF4
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -69,17 +69,17 @@ sub_8145EF4: @ 8145EF4
pop {r0}
bx r0
.pool
- thumb_func_end sub_8145EF4
+ thumb_func_end BattleTransition_StartOnField
- thumb_func_start sub_8145F10
-sub_8145F10: @ 8145F10
+ thumb_func_start BattleTransition_Start
+BattleTransition_Start: @ 8145F10
push {lr}
lsls r0, 24
lsrs r0, 24
bl LaunchBattleTransitionTask
pop {r0}
bx r0
- thumb_func_end sub_8145F10
+ thumb_func_end BattleTransition_Start
thumb_func_start IsBattleTransitionDone
IsBattleTransitionDone: @ 8145F20