summaryrefslogtreecommitdiff
path: root/src/field
diff options
context:
space:
mode:
authorcamthesaxman <cameronghall@cox.net>2017-11-26 13:00:26 -0600
committercamthesaxman <cameronghall@cox.net>2017-11-26 13:00:26 -0600
commit5f242ae6cee377d219defa8290ef1c164b003f52 (patch)
tree4499f7a75ad102013ca8fba71a6fd34f5e374d53 /src/field
parent4e7e4cf467e6243994d19971d7cbee33c2f7bd25 (diff)
abilities, songs, species constants
Diffstat (limited to 'src/field')
-rw-r--r--src/field/battle_tower.c2
-rw-r--r--src/field/berry_tag_screen.c2
-rw-r--r--src/field/bike.c2
-rw-r--r--src/field/birch_pc.c2
-rw-r--r--src/field/braille_puzzles.c4
-rw-r--r--src/field/choose_party.c2
-rw-r--r--src/field/daycare.c4
-rw-r--r--src/field/decoration.c2
-rw-r--r--src/field/field_control_avatar.c2
-rw-r--r--src/field/field_door.c2
-rw-r--r--src/field/field_effect.c2
-rw-r--r--src/field/field_effect_helpers.c2
-rw-r--r--src/field/field_fadetransition.c2
-rw-r--r--src/field/field_player_avatar.c2
-rw-r--r--src/field/field_special_scene.c2
-rw-r--r--src/field/field_specials.c8
-rw-r--r--src/field/field_tasks.c2
-rw-r--r--src/field/field_weather.c2
-rw-r--r--src/field/field_weather_effects.c2
-rw-r--r--src/field/fldeff_cut.c2
-rw-r--r--src/field/fldeff_decoration.c2
-rw-r--r--src/field/fldeff_flash.c2
-rw-r--r--src/field/fldeff_poison.c2
-rw-r--r--src/field/fldeff_secret_base_pc.c2
-rw-r--r--src/field/fldeff_secretpower.c2
-rw-r--r--src/field/fldeff_softboiled.c2
-rw-r--r--src/field/item_menu.c2
-rw-r--r--src/field/item_use.c2
-rw-r--r--src/field/lottery_corner.c2
-rw-r--r--src/field/mauville_man.c2
-rw-r--r--src/field/menu_helpers.c2
-rw-r--r--src/field/overworld.c4
-rw-r--r--src/field/party_menu.c4
-rw-r--r--src/field/player_pc.c2
-rw-r--r--src/field/pokeblock.c2
-rw-r--r--src/field/region_map.c2
-rw-r--r--src/field/roamer.c2
-rw-r--r--src/field/rotating_gate.c2
-rw-r--r--src/field/script_menu.c2
-rw-r--r--src/field/secret_base.c6
-rw-r--r--src/field/shop.c2
-rw-r--r--src/field/start_menu.c2
-rw-r--r--src/field/starter_choose.c4
-rw-r--r--src/field/trader.c2
-rw-r--r--src/field/tv.c4
-rw-r--r--src/field/use_pokeblock.c2
-rw-r--r--src/field/wallclock.c2
-rw-r--r--src/field/wild_encounter.c4
48 files changed, 60 insertions, 60 deletions
diff --git a/src/field/battle_tower.c b/src/field/battle_tower.c
index 2b45766dd..5f2a84d06 100644
--- a/src/field/battle_tower.c
+++ b/src/field/battle_tower.c
@@ -17,7 +17,7 @@
#include "random.h"
#include "save.h"
#include "script_pokemon_80C4.h"
-#include "species.h"
+#include "constants/species.h"
#include "string_util.h"
#include "task.h"
#include "text.h"
diff --git a/src/field/berry_tag_screen.c b/src/field/berry_tag_screen.c
index 55405138d..9fe720b36 100644
--- a/src/field/berry_tag_screen.c
+++ b/src/field/berry_tag_screen.c
@@ -11,7 +11,7 @@
#include "menu_helpers.h"
#include "palette.h"
#include "overworld.h"
-#include "songs.h"
+#include "constants/songs.h"
#include "sound.h"
#include "sprite.h"
#include "string_util.h"
diff --git a/src/field/bike.c b/src/field/bike.c
index e36ae1798..75c99aaa1 100644
--- a/src/field/bike.c
+++ b/src/field/bike.c
@@ -7,7 +7,7 @@
#include "global.fieldmap.h"
#include "metatile_behavior.h"
#include "overworld.h"
-#include "songs.h"
+#include "constants/songs.h"
#include "sound.h"
extern bool8 gBikeCyclingChallenge;
diff --git a/src/field/birch_pc.c b/src/field/birch_pc.c
index 9872dd54d..4b0025504 100644
--- a/src/field/birch_pc.c
+++ b/src/field/birch_pc.c
@@ -2,7 +2,7 @@
#include "event_data.h"
#include "field_message_box.h"
#include "pokedex.h"
-#include "species.h"
+#include "constants/species.h"
extern u16 gSpecialVar_0x8004;
extern u16 gSpecialVar_0x8005;
diff --git a/src/field/braille_puzzles.c b/src/field/braille_puzzles.c
index b11b1ff3a..c5e12c839 100644
--- a/src/field/braille_puzzles.c
+++ b/src/field/braille_puzzles.c
@@ -11,9 +11,9 @@
#include "menu.h"
#include "rom6.h"
#include "script.h"
-#include "songs.h"
+#include "constants/songs.h"
#include "sound.h"
-#include "species.h"
+#include "constants/species.h"
#include "task.h"
#include "text.h"
diff --git a/src/field/choose_party.c b/src/field/choose_party.c
index c3845e48b..8d92719d1 100644
--- a/src/field/choose_party.c
+++ b/src/field/choose_party.c
@@ -11,7 +11,7 @@
#include "pokemon_summary_screen.h"
#include "overworld.h"
#include "script.h"
-#include "songs.h"
+#include "constants/songs.h"
#include "sound.h"
#include "strings.h"
#include "string_util.h"
diff --git a/src/field/daycare.c b/src/field/daycare.c
index 9f7e3b989..d3c86e812 100644
--- a/src/field/daycare.c
+++ b/src/field/daycare.c
@@ -14,9 +14,9 @@
#include "pokemon_storage_system.h"
#include "random.h"
#include "script.h"
-#include "songs.h"
+#include "constants/songs.h"
#include "sound.h"
-#include "species.h"
+#include "constants/species.h"
#include "string_util.h"
#include "strings2.h"
#include "text.h"
diff --git a/src/field/decoration.c b/src/field/decoration.c
index 8e6276a2f..89d8cbefd 100644
--- a/src/field/decoration.c
+++ b/src/field/decoration.c
@@ -3,7 +3,7 @@
#include "map_object_constants.h"
#include "overworld.h"
#include "sound.h"
-#include "songs.h"
+#include "constants/songs.h"
#include "string_util.h"
#include "menu.h"
#include "menu_helpers.h"
diff --git a/src/field/field_control_avatar.c b/src/field/field_control_avatar.c
index c7b4861d5..b7e7ec472 100644
--- a/src/field/field_control_avatar.c
+++ b/src/field/field_control_avatar.c
@@ -17,7 +17,7 @@
#include "safari_zone.h"
#include "script.h"
#include "secret_base.h"
-#include "songs.h"
+#include "constants/songs.h"
#include "sound.h"
#include "start_menu.h"
#include "trainer_see.h"
diff --git a/src/field/field_door.c b/src/field/field_door.c
index ef349bca7..89dae725c 100644
--- a/src/field/field_door.c
+++ b/src/field/field_door.c
@@ -3,7 +3,7 @@
#include "field_camera.h"
#include "fieldmap.h"
#include "metatile_behavior.h"
-#include "songs.h"
+#include "constants/songs.h"
#include "task.h"
const u8 DoorAnimTiles_04[][0x100] =
diff --git a/src/field/field_effect.c b/src/field/field_effect.c
index 0ccbb6230..4337300da 100644
--- a/src/field/field_effect.c
+++ b/src/field/field_effect.c
@@ -12,7 +12,7 @@
#include "overworld.h"
#include "task.h"
#include "sound.h"
-#include "songs.h"
+#include "constants/songs.h"
#include "decoration.h"
#include "field_player_avatar.h"
#include "field_map_obj_helpers.h"
diff --git a/src/field/field_effect_helpers.c b/src/field/field_effect_helpers.c
index c5b67fd9d..1d831d2e9 100644
--- a/src/field/field_effect_helpers.c
+++ b/src/field/field_effect_helpers.c
@@ -2,7 +2,7 @@
#include "sprite.h"
#include "fieldmap.h"
#include "metatile_behavior.h"
-#include "songs.h"
+#include "constants/songs.h"
#include "sound.h"
#include "field_map_obj.h"
#include "field_camera.h"
diff --git a/src/field/field_fadetransition.c b/src/field/field_fadetransition.c
index 82776d18c..829ce2dfa 100644
--- a/src/field/field_fadetransition.c
+++ b/src/field/field_fadetransition.c
@@ -17,7 +17,7 @@
#include "palette.h"
#include "overworld.h"
#include "script.h"
-#include "songs.h"
+#include "constants/songs.h"
#include "sound.h"
#include "start_menu.h"
#include "task.h"
diff --git a/src/field/field_player_avatar.c b/src/field/field_player_avatar.c
index a26638b39..166846ba0 100644
--- a/src/field/field_player_avatar.c
+++ b/src/field/field_player_avatar.c
@@ -17,7 +17,7 @@
#include "overworld.h"
#include "rotating_gate.h"
#include "script.h"
-#include "songs.h"
+#include "constants/songs.h"
#include "sound.h"
#include "strings2.h"
#include "task.h"
diff --git a/src/field/field_special_scene.c b/src/field/field_special_scene.c
index 5758929b6..6ef98f5e9 100644
--- a/src/field/field_special_scene.c
+++ b/src/field/field_special_scene.c
@@ -11,7 +11,7 @@
#include "overworld.h"
#include "script.h"
#include "script_movement.h"
-#include "songs.h"
+#include "constants/songs.h"
#include "sound.h"
#include "sprite.h"
#include "task.h"
diff --git a/src/field/field_specials.c b/src/field/field_specials.c
index e5bb1b798..279a7e3f6 100644
--- a/src/field/field_specials.c
+++ b/src/field/field_specials.c
@@ -14,19 +14,19 @@
#include "map_constants.h"
#include "overworld.h"
#include "script.h"
-#include "songs.h"
+#include "constants/songs.h"
#include "string_util.h"
#include "strings.h"
#include "pokeblock.h"
-#include "species.h"
-#include "abilities.h"
+#include "constants/species.h"
+#include "constants/abilities.h"
#include "moves.h"
#include "text.h"
#include "wallclock.h"
#include "tv.h"
#include "rtc.h"
#include "link.h"
-#include "songs.h"
+#include "constants/songs.h"
#include "sound.h"
#include "menu.h"
#include "starter_choose.h"
diff --git a/src/field/field_tasks.c b/src/field/field_tasks.c
index e938a57ef..2da0f7303 100644
--- a/src/field/field_tasks.c
+++ b/src/field/field_tasks.c
@@ -16,7 +16,7 @@
#include "fieldmap.h"
#include "field_player_avatar.h"
#include "field_camera.h"
-#include "songs.h"
+#include "constants/songs.h"
#include "sound.h"
#include "field_tasks.h"
diff --git a/src/field/field_weather.c b/src/field/field_weather.c
index ff7c2e4c4..19ccca3bf 100644
--- a/src/field/field_weather.c
+++ b/src/field/field_weather.c
@@ -5,7 +5,7 @@
#include "palette.h"
#include "random.h"
#include "script.h"
-#include "songs.h"
+#include "constants/songs.h"
#include "sound.h"
#include "sprite.h"
#include "task.h"
diff --git a/src/field/field_weather_effects.c b/src/field/field_weather_effects.c
index b1dca6396..31eda4393 100644
--- a/src/field/field_weather_effects.c
+++ b/src/field/field_weather_effects.c
@@ -4,7 +4,7 @@
#include "overworld.h"
#include "random.h"
#include "script.h"
-#include "songs.h"
+#include "constants/songs.h"
#include "sound.h"
#include "sprite.h"
#include "task.h"
diff --git a/src/field/fldeff_cut.c b/src/field/fldeff_cut.c
index 599c916a2..edf38d800 100644
--- a/src/field/fldeff_cut.c
+++ b/src/field/fldeff_cut.c
@@ -11,7 +11,7 @@
#include "overworld.h"
#include "rom6.h"
#include "script.h"
-#include "songs.h"
+#include "constants/songs.h"
#include "sound.h"
#include "sprite.h"
#include "task.h"
diff --git a/src/field/fldeff_decoration.c b/src/field/fldeff_decoration.c
index b0ac30062..d58f53a3c 100644
--- a/src/field/fldeff_decoration.c
+++ b/src/field/fldeff_decoration.c
@@ -6,7 +6,7 @@
#include "field_player_avatar.h"
#include "fieldmap.h"
#include "script.h"
-#include "songs.h"
+#include "constants/songs.h"
#include "sound.h"
#include "string_util.h"
#include "strings.h"
diff --git a/src/field/fldeff_flash.c b/src/field/fldeff_flash.c
index 30423a3f9..920791ce2 100644
--- a/src/field/fldeff_flash.c
+++ b/src/field/fldeff_flash.c
@@ -7,7 +7,7 @@
#include "overworld.h"
#include "rom6.h"
#include "script.h"
-#include "songs.h"
+#include "constants/songs.h"
#include "sound.h"
#include "sprite.h"
#include "task.h"
diff --git a/src/field/fldeff_poison.c b/src/field/fldeff_poison.c
index 0a0cf5539..b0052d59d 100644
--- a/src/field/fldeff_poison.c
+++ b/src/field/fldeff_poison.c
@@ -1,7 +1,7 @@
#include "global.h"
#include "fldeff_poison.h"
#include "task.h"
-#include "songs.h"
+#include "constants/songs.h"
#include "sound.h"
static void Task_FieldPoisonEffect(u8 taskId)
diff --git a/src/field/fldeff_secret_base_pc.c b/src/field/fldeff_secret_base_pc.c
index ead970b27..8d71a4fb9 100644
--- a/src/field/fldeff_secret_base_pc.c
+++ b/src/field/fldeff_secret_base_pc.c
@@ -5,7 +5,7 @@
#include "field_player_avatar.h"
#include "fieldmap.h"
#include "script.h"
-#include "songs.h"
+#include "constants/songs.h"
#include "sound.h"
#include "task.h"
diff --git a/src/field/fldeff_secretpower.c b/src/field/fldeff_secretpower.c
index 5ec4407ae..cd9a2ae36 100644
--- a/src/field/fldeff_secretpower.c
+++ b/src/field/fldeff_secretpower.c
@@ -10,7 +10,7 @@
#include "rom6.h"
#include "script.h"
#include "secret_base.h"
-#include "songs.h"
+#include "constants/songs.h"
#include "sound.h"
extern u8 gUnknown_081A2CE6[];
diff --git a/src/field/fldeff_softboiled.c b/src/field/fldeff_softboiled.c
index c2a315233..a574232a8 100644
--- a/src/field/fldeff_softboiled.c
+++ b/src/field/fldeff_softboiled.c
@@ -4,7 +4,7 @@
#include "party_menu.h"
#include "pokemon.h"
#include "pokemon_menu.h"
-#include "songs.h"
+#include "constants/songs.h"
#include "sound.h"
#include "sprite.h"
#include "strings.h"
diff --git a/src/field/item_menu.c b/src/field/item_menu.c
index 67362d5f3..7d4b90bad 100644
--- a/src/field/item_menu.c
+++ b/src/field/item_menu.c
@@ -25,7 +25,7 @@
#include "pokemon_menu.h"
#include "overworld.h"
#include "script.h"
-#include "songs.h"
+#include "constants/songs.h"
#include "sound.h"
#include "sprite.h"
#include "strings.h"
diff --git a/src/field/item_use.c b/src/field/item_use.c
index 14b13ca3b..764e78800 100644
--- a/src/field/item_use.c
+++ b/src/field/item_use.c
@@ -29,7 +29,7 @@
#include "overworld.h"
#include "rom_8094928.h"
#include "script.h"
-#include "songs.h"
+#include "constants/songs.h"
#include "sound.h"
#include "string_util.h"
#include "strings.h"
diff --git a/src/field/lottery_corner.c b/src/field/lottery_corner.c
index 5f0ce2907..b3bdeb494 100644
--- a/src/field/lottery_corner.c
+++ b/src/field/lottery_corner.c
@@ -3,7 +3,7 @@
#include "event_data.h"
#include "items.h"
#include "random.h"
-#include "species.h"
+#include "constants/species.h"
#include "string_util.h"
#include "text.h"
diff --git a/src/field/mauville_man.c b/src/field/mauville_man.c
index a27c54df7..7c9c072a1 100644
--- a/src/field/mauville_man.c
+++ b/src/field/mauville_man.c
@@ -9,7 +9,7 @@
#include "overworld.h"
#include "random.h"
#include "script.h"
-#include "songs.h"
+#include "constants/songs.h"
#include "sound.h"
#include "string_util.h"
#include "strings.h"
diff --git a/src/field/menu_helpers.c b/src/field/menu_helpers.c
index 8e13e5546..e49c023c6 100644
--- a/src/field/menu_helpers.c
+++ b/src/field/menu_helpers.c
@@ -8,7 +8,7 @@
#include "menu.h"
#include "menu_helpers.h"
#include "overworld.h"
-#include "songs.h"
+#include "constants/songs.h"
#include "sound.h"
#include "sprite.h"
#include "task.h"
diff --git a/src/field/overworld.c b/src/field/overworld.c
index ca59426fa..d286a1951 100644
--- a/src/field/overworld.c
+++ b/src/field/overworld.c
@@ -39,9 +39,9 @@
#include "script.h"
#include "script_pokemon_80C4.h"
#include "secret_base.h"
-#include "songs.h"
+#include "constants/songs.h"
#include "sound.h"
-#include "species.h"
+#include "constants/species.h"
#include "start_menu.h"
#include "task.h"
#include "tileset_anim.h"
diff --git a/src/field/party_menu.c b/src/field/party_menu.c
index a8620570b..a023a42ad 100644
--- a/src/field/party_menu.c
+++ b/src/field/party_menu.c
@@ -25,9 +25,9 @@
#include "pokemon_summary_screen.h"
#include "rom_8077ABC.h"
#include "rom_8094928.h"
-#include "songs.h"
+#include "constants/songs.h"
#include "sound.h"
-#include "species.h"
+#include "constants/species.h"
#include "sprite.h"
#include "string_util.h"
#include "strings.h"
diff --git a/src/field/player_pc.c b/src/field/player_pc.c
index ce78a88d8..2313d8c97 100644
--- a/src/field/player_pc.c
+++ b/src/field/player_pc.c
@@ -15,7 +15,7 @@
#include "string_util.h"
#include "strings.h"
#include "task.h"
-#include "songs.h"
+#include "constants/songs.h"
#include "name_string_util.h"
#include "mail.h"
#include "overworld.h"
diff --git a/src/field/pokeblock.c b/src/field/pokeblock.c
index 5aa03ff7a..56b197ca3 100644
--- a/src/field/pokeblock.c
+++ b/src/field/pokeblock.c
@@ -23,7 +23,7 @@
#include "item.h"
#include "items.h"
#include "sound.h"
-#include "songs.h"
+#include "constants/songs.h"
#include "safari_zone.h"
#include "event_data.h"
#include "pokeblock.h"
diff --git a/src/field/region_map.c b/src/field/region_map.c
index 241b38bf6..df51d6173 100644
--- a/src/field/region_map.c
+++ b/src/field/region_map.c
@@ -11,7 +11,7 @@
#include "region_map.h"
#include "overworld.h"
#include "secret_base.h"
-#include "songs.h"
+#include "constants/songs.h"
#include "sprite.h"
#include "strings.h"
#include "string_util.h"
diff --git a/src/field/roamer.c b/src/field/roamer.c
index d8ea1ef52..2eb26ef9d 100644
--- a/src/field/roamer.c
+++ b/src/field/roamer.c
@@ -2,7 +2,7 @@
#include "roamer.h"
#include "pokemon.h"
#include "random.h"
-#include "species.h"
+#include "constants/species.h"
#ifdef SAPPHIRE
#define ROAMER_SPECIES SPECIES_LATIAS
diff --git a/src/field/rotating_gate.c b/src/field/rotating_gate.c
index a672f3489..c3b6a8a71 100644
--- a/src/field/rotating_gate.c
+++ b/src/field/rotating_gate.c
@@ -4,7 +4,7 @@
#include "field_map_obj.h"
#include "fieldmap.h"
#include "map_constants.h"
-#include "songs.h"
+#include "constants/songs.h"
#include "sound.h"
#include "sprite.h"
diff --git a/src/field/script_menu.c b/src/field/script_menu.c
index e25e74d8c..caa1d7562 100644
--- a/src/field/script_menu.c
+++ b/src/field/script_menu.c
@@ -6,7 +6,7 @@
#include "menu.h"
#include "palette.h"
#include "script.h"
-#include "songs.h"
+#include "constants/songs.h"
#include "sound.h"
#include "sprite.h"
#include "strings.h"
diff --git a/src/field/secret_base.c b/src/field/secret_base.c
index 34352f39a..3ada632dd 100644
--- a/src/field/secret_base.c
+++ b/src/field/secret_base.c
@@ -1,7 +1,7 @@
#include "global.h"
#include "secret_base.h"
#include "decoration.h"
-#include "species.h"
+#include "constants/species.h"
#include "items.h"
#include "moves.h"
#include "event_data.h"
@@ -16,7 +16,7 @@
#include "link.h"
#include "main.h"
#include "sound.h"
-#include "songs.h"
+#include "constants/songs.h"
#include "map_constants.h"
#include "map_name_popup.h"
#include "menu.h"
@@ -27,7 +27,7 @@
#include "overworld.h"
#include "script.h"
#include "sound.h"
-#include "species.h"
+#include "constants/species.h"
#include "string_util.h"
#include "strings.h"
#include "task.h"
diff --git a/src/field/shop.c b/src/field/shop.c
index 493d8c748..cb97ea266 100644
--- a/src/field/shop.c
+++ b/src/field/shop.c
@@ -22,7 +22,7 @@
#include "item.h"
#include "decoration.h"
#include "items.h"
-#include "songs.h"
+#include "constants/songs.h"
#include "overworld.h"
#include "decoration_inventory.h"
#include "field_camera.h"
diff --git a/src/field/start_menu.c b/src/field/start_menu.c
index 6e44090df..7913e5527 100644
--- a/src/field/start_menu.c
+++ b/src/field/start_menu.c
@@ -20,7 +20,7 @@
#include "save.h"
#include "save_menu_util.h"
#include "script.h"
-#include "songs.h"
+#include "constants/songs.h"
#include "sound.h"
#include "sprite.h"
#include "string_util.h"
diff --git a/src/field/starter_choose.c b/src/field/starter_choose.c
index 49590f83a..149eaa03d 100644
--- a/src/field/starter_choose.c
+++ b/src/field/starter_choose.c
@@ -6,9 +6,9 @@
#include "menu.h"
#include "palette.h"
#include "pokedex.h"
-#include "songs.h"
+#include "constants/songs.h"
#include "sound.h"
-#include "species.h"
+#include "constants/species.h"
#include "sprite.h"
#include "string_util.h"
#include "strings.h"
diff --git a/src/field/trader.c b/src/field/trader.c
index 61f48fad8..69eef1152 100644
--- a/src/field/trader.c
+++ b/src/field/trader.c
@@ -7,7 +7,7 @@
#include "menu.h"
#include "menu_helpers.h"
#include "script.h"
-#include "songs.h"
+#include "constants/songs.h"
#include "sound.h"
#include "string_util.h"
#include "strings.h"
diff --git a/src/field/tv.c b/src/field/tv.c
index e58adebc9..28737ecaa 100644
--- a/src/field/tv.c
+++ b/src/field/tv.c
@@ -12,7 +12,7 @@
#include "random.h"
#include "string_util.h"
#include "text.h"
-#include "species.h"
+#include "constants/species.h"
#include "pokedex.h"
#include "naming_screen.h"
#include "overworld.h"
@@ -34,7 +34,7 @@
#include "overworld.h"
#include "rtc.h"
#include "script_menu.h"
-#include "species.h"
+#include "constants/species.h"
#include "string_util.h"
#include "strings.h"
#include "text.h"
diff --git a/src/field/use_pokeblock.c b/src/field/use_pokeblock.c
index d301d93d6..8155b4216 100644
--- a/src/field/use_pokeblock.c
+++ b/src/field/use_pokeblock.c
@@ -15,7 +15,7 @@
#include "text.h"
#include "menu.h"
#include "sound.h"
-#include "songs.h"
+#include "constants/songs.h"
#include "pokeblock.h"
#define GFX_TAG_CONDITIONUPDOWN 0
diff --git a/src/field/wallclock.c b/src/field/wallclock.c
index d86b1bc95..2892d09f9 100644
--- a/src/field/wallclock.c
+++ b/src/field/wallclock.c
@@ -5,7 +5,7 @@
#include "menu.h"
#include "palette.h"
#include "rtc.h"
-#include "songs.h"
+#include "constants/songs.h"
#include "sound.h"
#include "strings2.h"
#include "task.h"
diff --git a/src/field/wild_encounter.c b/src/field/wild_encounter.c
index df0b12207..b19b1d4c2 100644
--- a/src/field/wild_encounter.c
+++ b/src/field/wild_encounter.c
@@ -1,6 +1,6 @@
#include "global.h"
#include "wild_encounter.h"
-#include "abilities.h"
+#include "constants/abilities.h"
#include "battle_setup.h"
#include "event_data.h"
#include "field_player_avatar.h"
@@ -13,7 +13,7 @@
#include "overworld.h"
#include "safari_zone.h"
#include "script.h"
-#include "species.h"
+#include "constants/species.h"
#include "tv.h"
const struct WildPokemon PetalburgCity_WaterMons [] =