diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-04-05 19:46:54 -0700 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2018-04-05 19:46:54 -0700 |
| commit | 12fb25f4e38942a64b1ab4803516228f0b900bc9 (patch) | |
| tree | 295de7d68a1ca8a8bdbfd7ebbe0c579ffdda6d8d /src/evolution_scene.c | |
| parent | 20f41da2d2538c81d53ece27d17ead845a40ccd5 (diff) | |
| parent | b1d091e233b81262e0905ce06607cfa7c4d4c9dd (diff) | |
Merge remote-tracking branch 'upstream/master' into contest_effect
Diffstat (limited to 'src/evolution_scene.c')
| -rw-r--r-- | src/evolution_scene.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/evolution_scene.c b/src/evolution_scene.c index 3ba325574..a3a5dbcec 100644 --- a/src/evolution_scene.c +++ b/src/evolution_scene.c @@ -212,7 +212,7 @@ void EvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, bool8 canStopEvo, gBattleTerrain = BATTLE_TERRAIN_PLAIN; sub_800D6D4(); - sub_800DAB8(); + LoadBattleTextboxAndBackground(); ResetSpriteData(); ScanlineEffect_Stop(); ResetTasks(); @@ -320,7 +320,7 @@ static void CB2_EvolutionSceneLoadGraphics(void) gBattleTerrain = BATTLE_TERRAIN_PLAIN; sub_800D6D4(); - sub_800DAB8(); + LoadBattleTextboxAndBackground(); ResetSpriteData(); FreeAllSpritePalettes(); gReservedSpritePaletteCount = 4; |