diff options
author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-09-28 17:13:59 -0400 |
---|---|---|
committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-09-28 17:13:59 -0400 |
commit | 0cac170dfd3bfa9c2386b0b230655ace9dea7f11 (patch) | |
tree | 482835fe4eb9347f9f365b683cd188ed88d7f1b7 /src/scene/evolution_scene.c | |
parent | eb1da945b499641e0e1eb0283a05a001df0bfd32 (diff) | |
parent | c1c2015f7046676b043641c0d1f9d9e29bc73647 (diff) |
merge
Diffstat (limited to 'src/scene/evolution_scene.c')
-rw-r--r-- | src/scene/evolution_scene.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/scene/evolution_scene.c b/src/scene/evolution_scene.c index eeeb04f56..e312b081f 100644 --- a/src/scene/evolution_scene.c +++ b/src/scene/evolution_scene.c @@ -19,7 +19,7 @@ #include "species.h" #include "sound.h" #include "songs.h" -#include "rom4.h" +#include "overworld.h" #include "battle_message.h" #include "pokemon_summary_screen.h" #include "menu_cursor.h" @@ -212,7 +212,7 @@ void EvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, bool8 canStopEvo, gUnknown_030041B8 = 0; InitWindowFromConfig(&gUnknown_03004210, &gWindowConfig_81E6C58); - gBattleTerrain = 9; + gBattleTerrain = BATTLE_TERRAIN_PLAIN; sub_800D6D4(); sub_800DAB8(); @@ -320,7 +320,7 @@ static void CB2_EvolutionSceneLoadGraphics(void) gUnknown_030041B8 = 0; InitWindowFromConfig(&gUnknown_03004210, &gWindowConfig_81E6C58); - gBattleTerrain = 9; + gBattleTerrain = BATTLE_TERRAIN_PLAIN; sub_800D6D4(); sub_800DAB8(); |