176 files changed, 16 insertions, 16 deletions

diff --git a/src/battle_10.c b/src/battle/battle_10.c
index 0237bab4b..0237bab4b 100644
--- a/src/battle_10.c
+++ b/src/battle/battle_10.c
diff --git a/src/battle_2.c b/src/battle/battle_2.c
index 7772444d7..7772444d7 100644
--- a/src/battle_2.c
+++ b/src/battle/battle_2.c
diff --git a/src/battle_4.c b/src/battle/battle_4.c
index d58ae4145..d58ae4145 100644
--- a/src/battle_4.c
+++ b/src/battle/battle_4.c
diff --git a/src/battle_6.c b/src/battle/battle_6.c
index c833aef5e..c833aef5e 100644
--- a/src/battle_6.c
+++ b/src/battle/battle_6.c
diff --git a/src/battle_7.c b/src/battle/battle_7.c
index f2838467e..f2838467e 100644
--- a/src/battle_7.c
+++ b/src/battle/battle_7.c
diff --git a/src/battle_8.c b/src/battle/battle_8.c
index 75f10c4b1..75f10c4b1 100644
--- a/src/battle_8.c
+++ b/src/battle/battle_8.c
diff --git a/src/battle_811DA74.c b/src/battle/battle_811DA74.c
index 36a287efc..36a287efc 100644
--- a/src/battle_811DA74.c
+++ b/src/battle/battle_811DA74.c
diff --git a/src/battle_ai.c b/src/battle/battle_ai.c
index a1cb805d9..a1cb805d9 100644
--- a/src/battle_ai.c
+++ b/src/battle/battle_ai.c
diff --git a/src/battle_anim.c b/src/battle/battle_anim.c
index 6bd98099a..6bd98099a 100644
--- a/src/battle_anim.c
+++ b/src/battle/battle_anim.c
diff --git a/src/battle_anim_80A7E7C.c b/src/battle/battle_anim_80A7E7C.c
index 31984977f..31984977f 100644
--- a/src/battle_anim_80A7E7C.c
+++ b/src/battle/battle_anim_80A7E7C.c
diff --git a/src/battle_anim_81258BC.c b/src/battle/battle_anim_81258BC.c
index 5bdbb4946..5bdbb4946 100644
--- a/src/battle_anim_81258BC.c
+++ b/src/battle/battle_anim_81258BC.c
diff --git a/src/battle_anim_8137220.c b/src/battle/battle_anim_8137220.c
index bb181d5fb..bb181d5fb 100644
--- a/src/battle_anim_8137220.c
+++ b/src/battle/battle_anim_8137220.c
diff --git a/src/battle_interface.c b/src/battle/battle_interface.c
index 246bda62b..246bda62b 100644
--- a/src/battle_interface.c
+++ b/src/battle/battle_interface.c
diff --git a/src/battle_party_menu.c b/src/battle/battle_party_menu.c
index 73b847713..73b847713 100644
--- a/src/battle_party_menu.c
+++ b/src/battle/battle_party_menu.c
diff --git a/src/battle_records.c b/src/battle/battle_records.c
index 61dc09792..61dc09792 100644
--- a/src/battle_records.c
+++ b/src/battle/battle_records.c
diff --git a/src/battle_setup.c b/src/battle/battle_setup.c
index 04674e739..04674e739 100644
--- a/src/battle_setup.c
+++ b/src/battle/battle_setup.c
diff --git a/src/calculate_base_damage.c b/src/battle/calculate_base_damage.c
index 0f2605e5b..0f2605e5b 100644
--- a/src/calculate_base_damage.c
+++ b/src/battle/calculate_base_damage.c
diff --git a/src/contest_link_80C857C.c b/src/battle/contest_link_80C857C.c
index 0ae98af09..0ae98af09 100644
--- a/src/contest_link_80C857C.c
+++ b/src/battle/contest_link_80C857C.c
diff --git a/src/pokeball.c b/src/battle/pokeball.c
index ee3b95678..ee3b95678 100644
--- a/src/pokeball.c
+++ b/src/battle/pokeball.c
diff --git a/src/post_battle_event_funcs.c b/src/battle/post_battle_event_funcs.c
index 8d85705c8..8d85705c8 100644
--- a/src/post_battle_event_funcs.c
+++ b/src/battle/post_battle_event_funcs.c
diff --git a/src/smokescreen.c b/src/battle/smokescreen.c
index 8345cb6ad..8345cb6ad 100644
--- a/src/smokescreen.c
+++ b/src/battle/smokescreen.c
diff --git a/src/matsuda_debug_menu.c b/src/debug/matsuda_debug_menu.c
index 3665cabd8..3665cabd8 100644
--- a/src/matsuda_debug_menu.c
+++ b/src/debug/matsuda_debug_menu.c
diff --git a/src/mori_debug_menu.c b/src/debug/mori_debug_menu.c
index 273191192..273191192 100644
--- a/src/mori_debug_menu.c
+++ b/src/debug/mori_debug_menu.c
diff --git a/src/unknown_debug_menu.c b/src/debug/unknown_debug_menu.c
index a81625f2a..a81625f2a 100644
--- a/src/unknown_debug_menu.c
+++ b/src/debug/unknown_debug_menu.c
diff --git a/src/agb_flash.c b/src/engine/agb_flash.c
index 340d469a7..340d469a7 100644
--- a/src/agb_flash.c
+++ b/src/engine/agb_flash.c
diff --git a/src/agb_flash_1m.c b/src/engine/agb_flash_1m.c
index e249fab9a..e249fab9a 100644
--- a/src/agb_flash_1m.c
+++ b/src/engine/agb_flash_1m.c
diff --git a/src/agb_flash_le.c b/src/engine/agb_flash_le.c
index 39d956e27..39d956e27 100644
--- a/src/agb_flash_le.c
+++ b/src/engine/agb_flash_le.c
diff --git a/src/agb_flash_mx.c b/src/engine/agb_flash_mx.c
index 67348901f..67348901f 100644
--- a/src/agb_flash_mx.c
+++ b/src/engine/agb_flash_mx.c
diff --git a/src/blend_palette.c b/src/engine/blend_palette.c
index 843c50ac1..843c50ac1 100644
--- a/src/blend_palette.c
+++ b/src/engine/blend_palette.c
diff --git a/src/cable_club.c b/src/engine/cable_club.c
index 20b087f4e..20b087f4e 100644
--- a/src/cable_club.c
+++ b/src/engine/cable_club.c
diff --git a/src/clear_save_data_menu.c b/src/engine/clear_save_data_menu.c
index 498562fe0..498562fe0 100644
--- a/src/clear_save_data_menu.c
+++ b/src/engine/clear_save_data_menu.c
diff --git a/src/clock.c b/src/engine/clock.c
index 1f2aac9fd..1f2aac9fd 100644
--- a/src/clock.c
+++ b/src/engine/clock.c
diff --git a/src/decompress.c b/src/engine/decompress.c
index d7f7087a7..d7f7087a7 100644
--- a/src/decompress.c
+++ b/src/engine/decompress.c
diff --git a/src/libc.c b/src/engine/libc.c
index 920673e3e..920673e3e 100644
--- a/src/libc.c
+++ b/src/engine/libc.c
diff --git a/src/link.c b/src/engine/link.c
index 5858ad8bf..5858ad8bf 100644
--- a/src/link.c
+++ b/src/engine/link.c
diff --git a/src/load_save.c b/src/engine/load_save.c
index 730aea2b8..730aea2b8 100644
--- a/src/load_save.c
+++ b/src/engine/load_save.c
diff --git a/src/m4a_2.c b/src/engine/m4a_2.c
index 2d3c65848..2d3c65848 100644
--- a/src/m4a_2.c
+++ b/src/engine/m4a_2.c
diff --git a/src/m4a_4.c b/src/engine/m4a_4.c
index 99195ec00..99195ec00 100644
--- a/src/m4a_4.c
+++ b/src/engine/m4a_4.c
diff --git a/src/m4a_tables.c b/src/engine/m4a_tables.c
index 91f00a31d..91f00a31d 100644
--- a/src/m4a_tables.c
+++ b/src/engine/m4a_tables.c
diff --git a/src/main.c b/src/engine/main.c
index afaa0e77a..afaa0e77a 100644
--- a/src/main.c
+++ b/src/engine/main.c
diff --git a/src/main_menu.c b/src/engine/main_menu.c
index 09fd06d9e..09fd06d9e 100644
--- a/src/main_menu.c
+++ b/src/engine/main_menu.c
diff --git a/src/menu.c b/src/engine/menu.c
index ef458124b..ef458124b 100644
--- a/src/menu.c
+++ b/src/engine/menu.c
diff --git a/src/menu_cursor.c b/src/engine/menu_cursor.c
index 64ab36573..64ab36573 100644
--- a/src/menu_cursor.c
+++ b/src/engine/menu_cursor.c
diff --git a/src/mystery_event_menu.c b/src/engine/mystery_event_menu.c
index 46b76fd88..46b76fd88 100644
--- a/src/mystery_event_menu.c
+++ b/src/engine/mystery_event_menu.c
diff --git a/src/mystery_event_script.c b/src/engine/mystery_event_script.c
index f507942a7..f507942a7 100644
--- a/src/mystery_event_script.c
+++ b/src/engine/mystery_event_script.c
diff --git a/src/name_string_util.c b/src/engine/name_string_util.c
index f1a935453..f1a935453 100644
--- a/src/name_string_util.c
+++ b/src/engine/name_string_util.c
diff --git a/src/naming_screen.c b/src/engine/naming_screen.c
index 6c107f022..6c107f022 100644
--- a/src/naming_screen.c
+++ b/src/engine/naming_screen.c
diff --git a/src/option_menu.c b/src/engine/option_menu.c
index 7f8d76528..7f8d76528 100644
--- a/src/option_menu.c
+++ b/src/engine/option_menu.c
diff --git a/src/palette.c b/src/engine/palette.c
index 94a4f8092..94a4f8092 100644
--- a/src/palette.c
+++ b/src/engine/palette.c
diff --git a/src/play_time.c b/src/engine/play_time.c
index 9882c9c4b..9882c9c4b 100644
--- a/src/play_time.c
+++ b/src/engine/play_time.c
diff --git a/src/record_mixing.c b/src/engine/record_mixing.c
index d1083910c..d1083910c 100644
--- a/src/record_mixing.c
+++ b/src/engine/record_mixing.c
diff --git a/src/reset_rtc_screen.c b/src/engine/reset_rtc_screen.c
index d052992ad..d052992ad 100644
--- a/src/reset_rtc_screen.c
+++ b/src/engine/reset_rtc_screen.c
diff --git a/src/rng.c b/src/engine/rng.c
index 7d4b5600e..7d4b5600e 100644
--- a/src/rng.c
+++ b/src/engine/rng.c
diff --git a/src/rtc.c b/src/engine/rtc.c
index d73f943d2..d73f943d2 100644
--- a/src/rtc.c
+++ b/src/engine/rtc.c
diff --git a/src/save.c b/src/engine/save.c
index adf39268e..adf39268e 100644
--- a/src/save.c
+++ b/src/engine/save.c
diff --git a/src/save_failed_screen.c b/src/engine/save_failed_screen.c
index b91e8b5bf..b91e8b5bf 100644
--- a/src/save_failed_screen.c
+++ b/src/engine/save_failed_screen.c
diff --git a/src/save_menu_util.c b/src/engine/save_menu_util.c
index a2d17bd36..a2d17bd36 100644
--- a/src/save_menu_util.c
+++ b/src/engine/save_menu_util.c
diff --git a/src/script.c b/src/engine/script.c
index 8f12da437..8f12da437 100644
--- a/src/script.c
+++ b/src/engine/script.c
diff --git a/src/siirtc.c b/src/engine/siirtc.c
index 965a068f1..965a068f1 100644
--- a/src/siirtc.c
+++ b/src/engine/siirtc.c
diff --git a/src/sound.c b/src/engine/sound.c
index 8d23b7d7a..8d23b7d7a 100644
--- a/src/sound.c
+++ b/src/engine/sound.c
diff --git a/src/sound_check_menu.c b/src/engine/sound_check_menu.c
index d97ae6d86..d97ae6d86 100644
--- a/src/sound_check_menu.c
+++ b/src/engine/sound_check_menu.c
diff --git a/src/sprite.c b/src/engine/sprite.c
index fb8c2b648..fb8c2b648 100644
--- a/src/sprite.c
+++ b/src/engine/sprite.c
diff --git a/src/string_util.c b/src/engine/string_util.c
index 9686256a1..9686256a1 100644
--- a/src/string_util.c
+++ b/src/engine/string_util.c
diff --git a/src/task.c b/src/engine/task.c
index 7bd2b5937..7bd2b5937 100644
--- a/src/task.c
+++ b/src/engine/task.c
diff --git a/src/text.c b/src/engine/text.c
index b27084b86..abde4484a 100644
--- a/src/text.c
+++ b/src/engine/text.c
@@ -219,12 +219,12 @@ static const u8 sBrailleGlyphs[] = INCBIN_U8("graphics/fonts/font6_braille.1bpp"
 static const u32 sDownArrowTiles[] = INCBIN_U32("graphics/fonts/down_arrow.4bpp");
 
 // clang-format off
-#include "data/text/type1_map.h"
-#include "data/text/type3_map.h"
-#include "data/text/font1_widths.h"
-#include "data/text/font4_widths.h"
-#include "data/text/font0_widths.h"
-#include "data/text/font3_widths.h"
+#include "../data/text/type1_map.h"
+#include "../data/text/type3_map.h"
+#include "../data/text/font1_widths.h"
+#include "../data/text/font4_widths.h"
+#include "../data/text/font0_widths.h"
+#include "../data/text/font3_widths.h"
 // clang-format on
 
 const u16 gUnknownPalette_81E6692[] = INCBIN_U16("graphics/fonts/unknown_81E6692.gbapal");
diff --git a/src/text_window.c b/src/engine/text_window.c
index 9a88789d1..9a88789d1 100644
--- a/src/text_window.c
+++ b/src/engine/text_window.c
diff --git a/src/tileset_anim.c b/src/engine/tileset_anim.c
index 34685381d..34685381d 100644
--- a/src/tileset_anim.c
+++ b/src/engine/tileset_anim.c
diff --git a/src/time_events.c b/src/engine/time_events.c
index e1b9a2e9e..e1b9a2e9e 100644
--- a/src/time_events.c
+++ b/src/engine/time_events.c
diff --git a/src/trade.c b/src/engine/trade.c
index cb190d194..cb190d194 100644
--- a/src/trade.c
+++ b/src/engine/trade.c
diff --git a/src/trainer_card.c b/src/engine/trainer_card.c
index 626c5a7bf..626c5a7bf 100644
--- a/src/trainer_card.c
+++ b/src/engine/trainer_card.c
diff --git a/src/trig.c b/src/engine/trig.c
index e16a69e63..e16a69e63 100644
--- a/src/trig.c
+++ b/src/engine/trig.c
diff --git a/src/util.c b/src/engine/util.c
index 582b9f806..582b9f806 100644
--- a/src/util.c
+++ b/src/engine/util.c
diff --git a/src/bard_music.c b/src/field/bard_music.c
index a31568475..a31568475 100644
--- a/src/bard_music.c
+++ b/src/field/bard_music.c
diff --git a/src/berry.c b/src/field/berry.c
index fa15672e7..fa15672e7 100644
--- a/src/berry.c
+++ b/src/field/berry.c
diff --git a/src/berry_tag_screen.c b/src/field/berry_tag_screen.c
index ff430e7b2..ff430e7b2 100644
--- a/src/berry_tag_screen.c
+++ b/src/field/berry_tag_screen.c
diff --git a/src/bike.c b/src/field/bike.c
index 58a4f38f4..58a4f38f4 100644
--- a/src/bike.c
+++ b/src/field/bike.c
diff --git a/src/birch_pc.c b/src/field/birch_pc.c
index 5fb6427c3..5fb6427c3 100644
--- a/src/birch_pc.c
+++ b/src/field/birch_pc.c
diff --git a/src/braille_puzzles.c b/src/field/braille_puzzles.c
index b8d7cd386..b8d7cd386 100644
--- a/src/braille_puzzles.c
+++ b/src/field/braille_puzzles.c
diff --git a/src/choose_party.c b/src/field/choose_party.c
index d8df44028..d8df44028 100644
--- a/src/choose_party.c
+++ b/src/field/choose_party.c
diff --git a/src/coins.c b/src/field/coins.c
index 3c6356612..3c6356612 100644
--- a/src/coins.c
+++ b/src/field/coins.c
diff --git a/src/coord_event_weather.c b/src/field/coord_event_weather.c
index 9c5a1ca4d..9c5a1ca4d 100644
--- a/src/coord_event_weather.c
+++ b/src/field/coord_event_weather.c
diff --git a/src/daycare.c b/src/field/daycare.c
index cded18207..cded18207 100644
--- a/src/daycare.c
+++ b/src/field/daycare.c
diff --git a/src/decoration.c b/src/field/decoration.c
index da33b3ab7..da33b3ab7 100644
--- a/src/decoration.c
+++ b/src/field/decoration.c
diff --git a/src/decoration_inventory.c b/src/field/decoration_inventory.c
index 35ba7e228..35ba7e228 100644
--- a/src/decoration_inventory.c
+++ b/src/field/decoration_inventory.c
diff --git a/src/dewford_trend.c b/src/field/dewford_trend.c
index aaf4dd66a..aaf4dd66a 100644
--- a/src/dewford_trend.c
+++ b/src/field/dewford_trend.c
diff --git a/src/diploma.c b/src/field/diploma.c
index ba7de58aa..ba7de58aa 100644
--- a/src/diploma.c
+++ b/src/field/diploma.c
diff --git a/src/easy_chat.c b/src/field/easy_chat.c
index cca8c1355..cca8c1355 100644
--- a/src/easy_chat.c
+++ b/src/field/easy_chat.c
diff --git a/src/event_data.c b/src/field/event_data.c
index 0484bae02..0484bae02 100644
--- a/src/event_data.c
+++ b/src/field/event_data.c
diff --git a/src/field_camera.c b/src/field/field_camera.c
index db51cf054..db51cf054 100644
--- a/src/field_camera.c
+++ b/src/field/field_camera.c
diff --git a/src/field_control_avatar.c b/src/field/field_control_avatar.c
index a8f6b6b9b..a8f6b6b9b 100644
--- a/src/field_control_avatar.c
+++ b/src/field/field_control_avatar.c
diff --git a/src/field_door.c b/src/field/field_door.c
index 791ed4c94..791ed4c94 100644
--- a/src/field_door.c
+++ b/src/field/field_door.c
diff --git a/src/field_effect.c b/src/field/field_effect.c
index 3632d7053..3632d7053 100644
--- a/src/field_effect.c
+++ b/src/field/field_effect.c
diff --git a/src/field_fadetransition.c b/src/field/field_fadetransition.c
index e614d899a..e614d899a 100644
--- a/src/field_fadetransition.c
+++ b/src/field/field_fadetransition.c
diff --git a/src/field_ground_effect.c b/src/field/field_ground_effect.c
index 42862d0ff..42862d0ff 100644
--- a/src/field_ground_effect.c
+++ b/src/field/field_ground_effect.c
diff --git a/src/field_map_obj.c b/src/field/field_map_obj.c
index f60b1b233..f60b1b233 100644
--- a/src/field_map_obj.c
+++ b/src/field/field_map_obj.c
diff --git a/src/field_map_obj_helpers.c b/src/field/field_map_obj_helpers.c
index 87be8e011..87be8e011 100644
--- a/src/field_map_obj_helpers.c
+++ b/src/field/field_map_obj_helpers.c
diff --git a/src/field_message_box.c b/src/field/field_message_box.c
index 35aac7ac9..35aac7ac9 100644
--- a/src/field_message_box.c
+++ b/src/field/field_message_box.c
diff --git a/src/field_player_avatar.c b/src/field/field_player_avatar.c
index 2a7b2f3e0..2a7b2f3e0 100644
--- a/src/field_player_avatar.c
+++ b/src/field/field_player_avatar.c
diff --git a/src/field_poison.c b/src/field/field_poison.c
index 8c9e029e1..8c9e029e1 100644
--- a/src/field_poison.c
+++ b/src/field/field_poison.c
diff --git a/src/field_region_map.c b/src/field/field_region_map.c
index 7cb22e5df..7cb22e5df 100644
--- a/src/field_region_map.c
+++ b/src/field/field_region_map.c
diff --git a/src/field_screen_effect.c b/src/field/field_screen_effect.c
index 79913e1c5..79913e1c5 100644
--- a/src/field_screen_effect.c
+++ b/src/field/field_screen_effect.c
diff --git a/src/field_special_scene.c b/src/field/field_special_scene.c
index 82a7a13e3..82a7a13e3 100644
--- a/src/field_special_scene.c
+++ b/src/field/field_special_scene.c
diff --git a/src/field_specials.c b/src/field/field_specials.c
index 454bd8d96..454bd8d96 100644
--- a/src/field_specials.c
+++ b/src/field/field_specials.c
diff --git a/src/field_tasks.c b/src/field/field_tasks.c
index caf2ce6b9..caf2ce6b9 100644
--- a/src/field_tasks.c
+++ b/src/field/field_tasks.c
diff --git a/src/field_weather.c b/src/field/field_weather.c
index 5ff2eddf9..5ff2eddf9 100644
--- a/src/field_weather.c
+++ b/src/field/field_weather.c
diff --git a/src/fieldmap.c b/src/field/fieldmap.c
index 0e0ec246c..0e0ec246c 100644
--- a/src/fieldmap.c
+++ b/src/field/fieldmap.c
diff --git a/src/fldeff_cut.c b/src/field/fldeff_cut.c
index b394d1e4c..b394d1e4c 100644
--- a/src/fldeff_cut.c
+++ b/src/field/fldeff_cut.c
diff --git a/src/fldeff_flash.c b/src/field/fldeff_flash.c
index 6c2633567..6c2633567 100644
--- a/src/fldeff_flash.c
+++ b/src/field/fldeff_flash.c
diff --git a/src/fldeff_softboiled.c b/src/field/fldeff_softboiled.c
index cb26d9966..cb26d9966 100644
--- a/src/fldeff_softboiled.c
+++ b/src/field/fldeff_softboiled.c
diff --git a/src/fldeff_strength.c b/src/field/fldeff_strength.c
index 81f4f63c6..81f4f63c6 100644
--- a/src/fldeff_strength.c
+++ b/src/field/fldeff_strength.c
diff --git a/src/fldeff_sweetscent.c b/src/field/fldeff_sweetscent.c
index 4c3e6bf4a..4c3e6bf4a 100644
--- a/src/fldeff_sweetscent.c
+++ b/src/field/fldeff_sweetscent.c
diff --git a/src/fldeff_teleport.c b/src/field/fldeff_teleport.c
index 74e68df06..74e68df06 100644
--- a/src/fldeff_teleport.c
+++ b/src/field/fldeff_teleport.c
diff --git a/src/heal_location.c b/src/field/heal_location.c
index 42bc18567..42bc18567 100644
--- a/src/heal_location.c
+++ b/src/field/heal_location.c
diff --git a/src/hof_pc.c b/src/field/hof_pc.c
index 4646d171c..4646d171c 100644
--- a/src/hof_pc.c
+++ b/src/field/hof_pc.c
diff --git a/src/item.c b/src/field/item.c
index 36871285a..fd49f5c39 100644
--- a/src/item.c
+++ b/src/field/item.c
@@ -30,11 +30,11 @@ enum
 };
 
 #if ENGLISH
-#include "data/item_descriptions_en.h"
-#include "data/items_en.h"
+#include "../data/item_descriptions_en.h"
+#include "../data/items_en.h"
 #elif GERMAN
-#include "data/item_descriptions_de.h"
-#include "data/items_de.h"
+#include "../data/item_descriptions_de.h"
+#include "../data/items_de.h"
 #endif
 
 static void CompactPCItems(void);
diff --git a/src/item_menu.c b/src/field/item_menu.c
index 350ba3db4..350ba3db4 100644
--- a/src/item_menu.c
+++ b/src/field/item_menu.c
diff --git a/src/item_use.c b/src/field/item_use.c
index 1750c1584..1750c1584 100644
--- a/src/item_use.c
+++ b/src/field/item_use.c
diff --git a/src/landmark.c b/src/field/landmark.c
index 6a53716bb..6a53716bb 100644
--- a/src/landmark.c
+++ b/src/field/landmark.c
diff --git a/src/lottery_corner.c b/src/field/lottery_corner.c
index c2c25b9ac..c2c25b9ac 100644
--- a/src/lottery_corner.c
+++ b/src/field/lottery_corner.c
diff --git a/src/map_name_popup.c b/src/field/map_name_popup.c
index 01105d0db..01105d0db 100644
--- a/src/map_name_popup.c
+++ b/src/field/map_name_popup.c
diff --git a/src/map_obj_lock.c b/src/field/map_obj_lock.c
index bd40bcacc..bd40bcacc 100644
--- a/src/map_obj_lock.c
+++ b/src/field/map_obj_lock.c
diff --git a/src/mauville_old_man.c b/src/field/mauville_old_man.c
index 93684fc60..93684fc60 100644
--- a/src/mauville_old_man.c
+++ b/src/field/mauville_old_man.c
diff --git a/src/menu_helpers.c b/src/field/menu_helpers.c
index 9915d67ac..9915d67ac 100644
--- a/src/menu_helpers.c
+++ b/src/field/menu_helpers.c
diff --git a/src/metatile_behavior.c b/src/field/metatile_behavior.c
index d05ba0b89..d05ba0b89 100644
--- a/src/metatile_behavior.c
+++ b/src/field/metatile_behavior.c
diff --git a/src/money.c b/src/field/money.c
index 5d9d0b689..5d9d0b689 100644
--- a/src/money.c
+++ b/src/field/money.c
diff --git a/src/party_menu.c b/src/field/party_menu.c
index 1fcd2cdda..1fcd2cdda 100644
--- a/src/party_menu.c
+++ b/src/field/party_menu.c
diff --git a/src/player_pc.c b/src/field/player_pc.c
index 6d52c560a..6d52c560a 100644
--- a/src/player_pc.c
+++ b/src/field/player_pc.c
diff --git a/src/pokeblock.c b/src/field/pokeblock.c
index 775280f6e..775280f6e 100644
--- a/src/pokeblock.c
+++ b/src/field/pokeblock.c
diff --git a/src/pokenav.c b/src/field/pokenav.c
index 84ed7b14b..84ed7b14b 100644
--- a/src/pokenav.c
+++ b/src/field/pokenav.c
diff --git a/src/region_map.c b/src/field/region_map.c
index 076dfecec..7ca7e809f 100644
--- a/src/region_map.c
+++ b/src/field/region_map.c
@@ -140,12 +140,12 @@ static const u16 sRegionMapBkgnd_Pal[] = INCBIN_U16("graphics/pokenav/region_map
 static const u8 sRegionMapBkgnd_ImageLZ[] = INCBIN_U8("graphics/pokenav/region_map.8bpp.lz");
 static const u8 sRegionMapBkgnd_TilemapLZ[] = INCBIN_U8("graphics/pokenav/region_map_map.bin.lz");
 
-#include "data/region_map_layout.h"
+#include "../data/region_map_layout.h"
 
 #if ENGLISH
-#include "data/region_map_names_en.h"
+#include "../data/region_map_names_en.h"
 #elif GERMAN
-#include "data/region_map_names_de.h"
+#include "../data/region_map_names_de.h"
 #endif
 
 struct RegionMapLocation
diff --git a/src/roamer.c b/src/field/roamer.c
index 948828d5e..948828d5e 100644
--- a/src/roamer.c
+++ b/src/field/roamer.c
diff --git a/src/rotating_gate.c b/src/field/rotating_gate.c
index bb3c31dfc..bb3c31dfc 100644
--- a/src/rotating_gate.c
+++ b/src/field/rotating_gate.c
diff --git a/src/safari_zone.c b/src/field/safari_zone.c
index a47c8e951..a47c8e951 100644
--- a/src/safari_zone.c
+++ b/src/field/safari_zone.c
diff --git a/src/scrcmd.c b/src/field/scrcmd.c
index 66578f350..66578f350 100644
--- a/src/scrcmd.c
+++ b/src/field/scrcmd.c
diff --git a/src/script_menu.c b/src/field/script_menu.c
index f4ac55fb9..f4ac55fb9 100644
--- a/src/script_menu.c
+++ b/src/field/script_menu.c
diff --git a/src/script_movement.c b/src/field/script_movement.c
index e25b60a3c..e25b60a3c 100644
--- a/src/script_movement.c
+++ b/src/field/script_movement.c
diff --git a/src/secret_base.c b/src/field/secret_base.c
index 4e8331f5c..4e8331f5c 100644
--- a/src/secret_base.c
+++ b/src/field/secret_base.c
diff --git a/src/shop.c b/src/field/shop.c
index d53646a88..d53646a88 100644
--- a/src/shop.c
+++ b/src/field/shop.c
diff --git a/src/slot_machine.c b/src/field/slot_machine.c
index c9a06a758..c9a06a758 100644
--- a/src/slot_machine.c
+++ b/src/field/slot_machine.c
diff --git a/src/start_menu.c b/src/field/start_menu.c
index 411690aff..411690aff 100644
--- a/src/start_menu.c
+++ b/src/field/start_menu.c
diff --git a/src/starter_choose.c b/src/field/starter_choose.c
index 2b28df4f0..2b28df4f0 100644
--- a/src/starter_choose.c
+++ b/src/field/starter_choose.c
diff --git a/src/trader.c b/src/field/trader.c
index ea06058e9..ea06058e9 100644
--- a/src/trader.c
+++ b/src/field/trader.c
diff --git a/src/trainer_see.c b/src/field/trainer_see.c
index feb35c67c..feb35c67c 100644
--- a/src/trainer_see.c
+++ b/src/field/trainer_see.c
diff --git a/src/tv.c b/src/field/tv.c
index a254bcd5f..a254bcd5f 100644
--- a/src/tv.c
+++ b/src/field/tv.c
diff --git a/src/use_pokeblock.c b/src/field/use_pokeblock.c
index 3aa2f1fa5..3aa2f1fa5 100644
--- a/src/use_pokeblock.c
+++ b/src/field/use_pokeblock.c
diff --git a/src/wallclock.c b/src/field/wallclock.c
index 8db13dc2d..8db13dc2d 100644
--- a/src/wallclock.c
+++ b/src/field/wallclock.c
diff --git a/src/wild_encounter.c b/src/field/wild_encounter.c
index 96f47c067..96f47c067 100644
--- a/src/wild_encounter.c
+++ b/src/field/wild_encounter.c
diff --git a/src/de_rom_8040FE0.c b/src/misc/de_rom_8040FE0.c
index c618ebdb2..c618ebdb2 100644
--- a/src/de_rom_8040FE0.c
+++ b/src/misc/de_rom_8040FE0.c
diff --git a/src/rom3.c b/src/misc/rom3.c
index 803bbf943..803bbf943 100644
--- a/src/rom3.c
+++ b/src/misc/rom3.c
diff --git a/src/rom4.c b/src/misc/rom4.c
index f9006efba..f9006efba 100644
--- a/src/rom4.c
+++ b/src/misc/rom4.c
diff --git a/src/rom6.c b/src/misc/rom6.c
index ff032b6c2..ff032b6c2 100644
--- a/src/rom6.c
+++ b/src/misc/rom6.c
diff --git a/src/rom_800D42C.c b/src/misc/rom_800D42C.c
index f51779e65..f51779e65 100644
--- a/src/rom_800D42C.c
+++ b/src/misc/rom_800D42C.c
diff --git a/src/rom_8077ABC.c b/src/misc/rom_8077ABC.c
index 249146b37..249146b37 100644
--- a/src/rom_8077ABC.c
+++ b/src/misc/rom_8077ABC.c
diff --git a/src/script_pokemon_util_80C4BF0.c b/src/misc/script_pokemon_util_80C4BF0.c
index cbca07011..cbca07011 100644
--- a/src/script_pokemon_util_80C4BF0.c
+++ b/src/misc/script_pokemon_util_80C4BF0.c
diff --git a/src/script_pokemon_util_80F99CC.c b/src/misc/script_pokemon_util_80F99CC.c
index 2b48cc0d8..2b48cc0d8 100644
--- a/src/script_pokemon_util_80F99CC.c
+++ b/src/misc/script_pokemon_util_80F99CC.c
diff --git a/src/unknown_task.c b/src/misc/unknown_task.c
index 81b89ef92..81b89ef92 100644
--- a/src/unknown_task.c
+++ b/src/misc/unknown_task.c
diff --git a/src/unused_8124F94.c b/src/misc/unused_8124F94.c
index 93b569058..93b569058 100644
--- a/src/unused_8124F94.c
+++ b/src/misc/unused_8124F94.c
diff --git a/src/mail.c b/src/pokemon/mail.c
index 658d37976..658d37976 100644
--- a/src/mail.c
+++ b/src/pokemon/mail.c
diff --git a/src/mail_data.c b/src/pokemon/mail_data.c
index ae3f4b3e8..ae3f4b3e8 100644
--- a/src/mail_data.c
+++ b/src/pokemon/mail_data.c
diff --git a/src/mon_markings.c b/src/pokemon/mon_markings.c
index 0cad8db59..0cad8db59 100644
--- a/src/mon_markings.c
+++ b/src/pokemon/mon_markings.c
diff --git a/src/pokedex.c b/src/pokemon/pokedex.c
index c132635cb..6a17a89e0 100644
--- a/src/pokedex.c
+++ b/src/pokemon/pokedex.c
@@ -186,7 +186,7 @@ static const u8 gUnknown_0839FA7C[] = INCBIN_U8("graphics/pokedex/noball.4bpp.lz
 extern const u8 gUnknown_0839FA7C[];
 #endif
 
-#include "data/pokedex_orders.h"
+#include "../data/pokedex_orders.h"
 static const struct OamData gOamData_83A0404 =
 {
     .y = 160,
@@ -515,9 +515,9 @@ static const u8 gUnknown_083A05F1[] = {16, 8, 4, 2, 1};
 const u8 gEmptySpacce_83A05F6[] = {0, 0};  // Padding, maybe?
 static const u8 gUnknown_083A05F8[] = _("");
 #if ENGLISH
-#include "data/pokedex_entries_en.h"
+#include "../data/pokedex_entries_en.h"
 #elif GERMAN
-#include "data/pokedex_entries_de.h"
+#include "../data/pokedex_entries_de.h"
 #endif
 static const u16 gUnknown_083B4EC4[16] = {0};
 static const u8 *const sMonFootprintTable[] =
diff --git a/src/pokedex_cry_screen.c b/src/pokemon/pokedex_cry_screen.c
index 92fd832fc..92fd832fc 100644
--- a/src/pokedex_cry_screen.c
+++ b/src/pokemon/pokedex_cry_screen.c
diff --git a/src/pokemon_1.c b/src/pokemon/pokemon_1.c
index c65bfa185..c65bfa185 100644
--- a/src/pokemon_1.c
+++ b/src/pokemon/pokemon_1.c
diff --git a/src/pokemon_2.c b/src/pokemon/pokemon_2.c
index a77edbdb2..a77edbdb2 100644
--- a/src/pokemon_2.c
+++ b/src/pokemon/pokemon_2.c
diff --git a/src/pokemon_3.c b/src/pokemon/pokemon_3.c
index 3d85a1c8f..3d85a1c8f 100644
--- a/src/pokemon_3.c
+++ b/src/pokemon/pokemon_3.c
diff --git a/src/pokemon_data.c b/src/pokemon/pokemon_data.c
index 6414134fb..6414134fb 100644
--- a/src/pokemon_data.c
+++ b/src/pokemon/pokemon_data.c
diff --git a/src/pokemon_icon.c b/src/pokemon/pokemon_icon.c
index 8994ea49e..8994ea49e 100644
--- a/src/pokemon_icon.c
+++ b/src/pokemon/pokemon_icon.c
diff --git a/src/pokemon_size_record.c b/src/pokemon/pokemon_size_record.c
index f2222bd3b..f2222bd3b 100644
--- a/src/pokemon_size_record.c
+++ b/src/pokemon/pokemon_size_record.c
diff --git a/src/pokemon_storage_system.c b/src/pokemon/pokemon_storage_system.c
index 5e97523e2..5e97523e2 100644
--- a/src/pokemon_storage_system.c
+++ b/src/pokemon/pokemon_storage_system.c
diff --git a/src/pokemon_summary_screen.c b/src/pokemon/pokemon_summary_screen.c
index 00a0bea29..00a0bea29 100644
--- a/src/pokemon_summary_screen.c
+++ b/src/pokemon/pokemon_summary_screen.c
diff --git a/src/contest_painting.c b/src/scene/contest_painting.c
index 391cbdfaa..391cbdfaa 100644
--- a/src/contest_painting.c
+++ b/src/scene/contest_painting.c
diff --git a/src/credits.c b/src/scene/credits.c
index df70674b6..df70674b6 100644
--- a/src/credits.c
+++ b/src/scene/credits.c
diff --git a/src/egg_hatch.c b/src/scene/egg_hatch.c
index 32fbe1547..32fbe1547 100644
--- a/src/egg_hatch.c
+++ b/src/scene/egg_hatch.c
diff --git a/src/intro.c b/src/scene/intro.c
index a43e0356c..a43e0356c 100644
--- a/src/intro.c
+++ b/src/scene/intro.c
diff --git a/src/new_game.c b/src/scene/new_game.c
index 226ac9bb7..226ac9bb7 100644
--- a/src/new_game.c
+++ b/src/scene/new_game.c
diff --git a/src/title_screen.c b/src/scene/title_screen.c
index ab0f1d505..ab0f1d505 100644
--- a/src/title_screen.c
+++ b/src/scene/title_screen.c