diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-11-26 23:33:31 -0600 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-11-26 23:33:31 -0600 |
| commit | 5d74d11d3e3047b4b53153365325db9e6999c627 (patch) | |
| tree | f15fe9425296d4f95d0cd7190d6f19f852fbfe93 /src/scene/evolution_scene.c | |
| parent | 48ec0941b4ebbe78fe70ef93d205ce52d2de89b2 (diff) | |
| parent | e6500d12a21e9833e08ad25cc6a76b075cff42dd (diff) | |
fix merge conflicts
Diffstat (limited to 'src/scene/evolution_scene.c')
| -rw-r--r-- | src/scene/evolution_scene.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/scene/evolution_scene.c b/src/scene/evolution_scene.c index f5612f86b..e0b42e1c7 100644 --- a/src/scene/evolution_scene.c +++ b/src/scene/evolution_scene.c @@ -817,7 +817,7 @@ static void Task_EvolutionScene(u8 taskID) case 5: if (!gPaletteFade.active) { - sub_809D9F0(gPlayerParty, gTasks[taskID].tPartyID, + ShowSelectMovePokemonSummaryScreen(gPlayerParty, gTasks[taskID].tPartyID, gPlayerPartyCount - 1, CB2_EvolutionSceneLoadGraphics, gMoveToLearn); gTasks[taskID].tLearnMoveState++; @@ -1137,7 +1137,7 @@ static void Task_TradeEvolutionScene(u8 taskID) case 5: if (!gPaletteFade.active) { - sub_809D9F0(gPlayerParty, gTasks[taskID].tPartyID, + ShowSelectMovePokemonSummaryScreen(gPlayerParty, gTasks[taskID].tPartyID, gPlayerPartyCount - 1, CB2_TradeEvolutionSceneLoadGraphics, gMoveToLearn); gTasks[taskID].tLearnMoveState++; |