diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-04-04 20:10:46 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-04 20:10:46 -0700 |
| commit | 62388f3bfd5b1abd9fa369628b805e683e64c302 (patch) | |
| tree | 7b57d749b99b491905f1590d7791780a7ff69596 /src/evolution_scene.c | |
| parent | ce75a3895c73f25d6dc7b019ed06e4193965ab35 (diff) | |
| parent | 09411d29f66c427367a2db3de155fed8c98138f5 (diff) | |
Merge pull request #561 from yenatch/battle-1
almost all of battle_1
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; |