diff options
| author | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2018-11-12 14:14:50 +0000 |
|---|---|---|
| committer | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2018-11-12 14:14:50 +0000 |
| commit | 1b895ff52c011d51a9516791148cd5088ba411b5 (patch) | |
| tree | 3f1dee86f96098d38131426e11a0f9c39a1244fe /src/evolution_scene.c | |
| parent | be33878b94cc38913447682d3e34e674df68619f (diff) | |
| parent | 65f053fd89e09b13e407ac53488043b728660e6e (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into synchronise
Diffstat (limited to 'src/evolution_scene.c')
| -rw-r--r-- | src/evolution_scene.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/evolution_scene.c b/src/evolution_scene.c index 067e103c2..c1d2ce59e 100644 --- a/src/evolution_scene.c +++ b/src/evolution_scene.c @@ -531,7 +531,7 @@ void TradeEvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, u8 preEvoSpri gBattle_BG3_X = 256; gBattle_BG3_Y = 0; - gTextFlags.flag_1 = 1; + gTextFlags.useAlternateDownArrow = 1; SetVBlankCallback(VBlankCB_TradeEvolutionScene); SetMainCallback2(CB2_TradeEvolutionSceneUpdate); @@ -1135,7 +1135,7 @@ static void Task_TradeEvolutionScene(u8 taskID) DestroyTask(taskID); Free(sEvoStructPtr); sEvoStructPtr = NULL; - gTextFlags.flag_1 = 0; + gTextFlags.useAlternateDownArrow = 0; SetMainCallback2(gCB2_AfterEvolution); } break; @@ -1218,7 +1218,7 @@ static void Task_TradeEvolutionScene(u8 taskID) } break; case 4: - switch (Menu_ProcessInputNoWrap_()) + switch (Menu_ProcessInputNoWrapClearOnChoose()) { case 0: sEvoCursorPos = 0; |