summaryrefslogtreecommitdiff
path: root/src/battle_transition.c
diff options
context:
space:
mode:
authorKDSKardabox <bollygame94@gmail.com>2018-02-16 09:29:11 +0530
committerKDSKardabox <bollygame94@gmail.com>2018-02-16 09:29:11 +0530
commitffeca135bcaa449267bc7540f25eeb02cf4c92fa (patch)
tree4d9ca1668dc8b49a739c3bb8f83b453f20e2e41d /src/battle_transition.c
parenta200d9406b15f722b34775050f6fe73894d23629 (diff)
parentcfec30413c36f3a571d80162796c11a030f42767 (diff)
Merge branch 'master' of https://github.com/pret/pokeemerald
Diffstat (limited to 'src/battle_transition.c')
-rw-r--r--src/battle_transition.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/battle_transition.c b/src/battle_transition.c
index e0d208f23..8b9b50140 100644
--- a/src/battle_transition.c
+++ b/src/battle_transition.c
@@ -919,7 +919,7 @@ static void CB2_TestBattleTransition(void)
if (IsBattleTransitionDone())
{
sTestingTransitionState = 0;
- SetMainCallback2(c2_exit_to_overworld_2_switch);
+ SetMainCallback2(CB2_ReturnToField);
}
break;
}