diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-29 19:54:15 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-29 19:54:15 +0100 |
| commit | e8ecb01ab2f7d7e67a525621e6ea7ada08c52952 (patch) | |
| tree | 9764a85781bb0d70d0259d870e18085fb1189bf2 /asm/battle_transition.s | |
| parent | 10470ef536132c317f0c478e42ad37657a0f00aa (diff) | |
more work on battle setup
Diffstat (limited to 'asm/battle_transition.s')
| -rw-r--r-- | asm/battle_transition.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/battle_transition.s b/asm/battle_transition.s index 13869eea9..b7f2746ec 100644 --- a/asm/battle_transition.s +++ b/asm/battle_transition.s @@ -71,15 +71,15 @@ BattleTransition_StartOnField: @ 8145EF4 .pool 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 |