summaryrefslogtreecommitdiff
path: root/src/scene
diff options
context:
space:
mode:
Diffstat (limited to 'src/scene')
-rw-r--r--src/scene/berry_blender.c2
-rw-r--r--src/scene/egg_hatch.c2
-rw-r--r--src/scene/evolution_scene.c6
-rw-r--r--src/scene/hall_of_fame.c2
-rw-r--r--src/scene/new_game.c2
5 files changed, 7 insertions, 7 deletions
diff --git a/src/scene/berry_blender.c b/src/scene/berry_blender.c
index 029d352df..455aabc45 100644
--- a/src/scene/berry_blender.c
+++ b/src/scene/berry_blender.c
@@ -12,7 +12,7 @@
#include "string_util.h"
#include "link.h"
#include "task.h"
-#include "rom4.h"
+#include "overworld.h"
#include "item.h"
#include "items.h"
#include "rng.h"
diff --git a/src/scene/egg_hatch.c b/src/scene/egg_hatch.c
index aa3d45250..90d1ee039 100644
--- a/src/scene/egg_hatch.c
+++ b/src/scene/egg_hatch.c
@@ -6,7 +6,7 @@
#include "task.h"
#include "script.h"
#include "palette.h"
-#include "rom4.h"
+#include "overworld.h"
#include "main.h"
#include "event_data.h"
#include "sound.h"
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();
diff --git a/src/scene/hall_of_fame.c b/src/scene/hall_of_fame.c
index 78909e289..10c999ef3 100644
--- a/src/scene/hall_of_fame.c
+++ b/src/scene/hall_of_fame.c
@@ -11,7 +11,7 @@
#include "menu.h"
#include "save.h"
#include "species.h"
-#include "rom4.h"
+#include "overworld.h"
#include "m4a.h"
#include "data2.h"
#include "decompress.h"
diff --git a/src/scene/new_game.c b/src/scene/new_game.c
index 46df14acd..3f9e9f5a1 100644
--- a/src/scene/new_game.c
+++ b/src/scene/new_game.c
@@ -20,7 +20,7 @@
#include "pokemon_storage_system.h"
#include "rng.h"
#include "roamer.h"
-#include "rom4.h"
+#include "overworld.h"
#include "rtc.h"
#include "script.h"
#include "secret_base.h"