put all C data headers in src/

27 files changed, 25 insertions, 24 deletions

diff --git a/include/data/field_map_obj/anim_func_ptrs.h b/src/data/field_map_obj/anim_func_ptrs.h
index 1d1fac71e..1d1fac71e 100644
--- a/include/data/field_map_obj/anim_func_ptrs.h
+++ b/src/data/field_map_obj/anim_func_ptrs.h
diff --git a/include/data/field_map_obj/base_oam.h b/src/data/field_map_obj/base_oam.h
index 49c14e8c2..49c14e8c2 100644
--- a/include/data/field_map_obj/base_oam.h
+++ b/src/data/field_map_obj/base_oam.h
diff --git a/include/data/field_map_obj/berry_tree_graphics_tables.h b/src/data/field_map_obj/berry_tree_graphics_tables.h
index 5b60fee6f..5b60fee6f 100644
--- a/include/data/field_map_obj/berry_tree_graphics_tables.h
+++ b/src/data/field_map_obj/berry_tree_graphics_tables.h
diff --git a/include/data/field_map_obj/callback_subroutine_pointers.h b/src/data/field_map_obj/callback_subroutine_pointers.h
index a324066b7..a324066b7 100644
--- a/include/data/field_map_obj/callback_subroutine_pointers.h
+++ b/src/data/field_map_obj/callback_subroutine_pointers.h
diff --git a/include/data/field_map_obj/field_effect_object_template_pointers.h b/src/data/field_map_obj/field_effect_object_template_pointers.h
index 320af1ff8..320af1ff8 100644
--- a/include/data/field_map_obj/field_effect_object_template_pointers.h
+++ b/src/data/field_map_obj/field_effect_object_template_pointers.h
diff --git a/include/data/field_map_obj/field_effect_objects.h b/src/data/field_map_obj/field_effect_objects.h
index 9d3ae343d..9d3ae343d 100644
--- a/include/data/field_map_obj/field_effect_objects.h
+++ b/src/data/field_map_obj/field_effect_objects.h
diff --git a/include/data/field_map_obj/map_object_anims.h b/src/data/field_map_obj/map_object_anims.h
index 0993f3efd..0993f3efd 100644
--- a/include/data/field_map_obj/map_object_anims.h
+++ b/src/data/field_map_obj/map_object_anims.h
diff --git a/include/data/field_map_obj/map_object_graphics_info.h b/src/data/field_map_obj/map_object_graphics_info.h
index 7b021b66d..7b021b66d 100644
--- a/include/data/field_map_obj/map_object_graphics_info.h
+++ b/src/data/field_map_obj/map_object_graphics_info.h
diff --git a/include/data/field_map_obj/map_object_graphics_info_pointers.h b/src/data/field_map_obj/map_object_graphics_info_pointers.h
index 22a052b0d..22a052b0d 100644
--- a/include/data/field_map_obj/map_object_graphics_info_pointers.h
+++ b/src/data/field_map_obj/map_object_graphics_info_pointers.h
diff --git a/include/data/field_map_obj/map_object_pic_tables.h b/src/data/field_map_obj/map_object_pic_tables.h
index ecb5c8836..ecb5c8836 100644
--- a/include/data/field_map_obj/map_object_pic_tables.h
+++ b/src/data/field_map_obj/map_object_pic_tables.h
diff --git a/include/data/field_map_obj/map_object_subsprites.h b/src/data/field_map_obj/map_object_subsprites.h
index 951d71e99..951d71e99 100644
--- a/include/data/field_map_obj/map_object_subsprites.h
+++ b/src/data/field_map_obj/map_object_subsprites.h
diff --git a/include/data/pokemon/base_stats.h b/src/data/pokemon/base_stats.h
index 37f59e1c6..37f59e1c6 100644
--- a/include/data/pokemon/base_stats.h
+++ b/src/data/pokemon/base_stats.h
diff --git a/include/data/pokemon/cry_ids.h b/src/data/pokemon/cry_ids.h
index 6207a92f0..6207a92f0 100644
--- a/include/data/pokemon/cry_ids.h
+++ b/src/data/pokemon/cry_ids.h
diff --git a/include/data/pokemon/dex_order.h b/src/data/pokemon/dex_order.h
index cbb7182ed..cbb7182ed 100644
--- a/include/data/pokemon/dex_order.h
+++ b/src/data/pokemon/dex_order.h
diff --git a/include/data/pokemon/egg_moves.h b/src/data/pokemon/egg_moves.h
index ab1b1dd33..ab1b1dd33 100644
--- a/include/data/pokemon/egg_moves.h
+++ b/src/data/pokemon/egg_moves.h
diff --git a/include/data/pokemon/evolution.h b/src/data/pokemon/evolution.h
index 919416fee..919416fee 100644
--- a/include/data/pokemon/evolution.h
+++ b/src/data/pokemon/evolution.h
diff --git a/include/data/pokemon/experience_tables.h b/src/data/pokemon/experience_tables.h
index 2fb416fe9..2fb416fe9 100644
--- a/include/data/pokemon/experience_tables.h
+++ b/src/data/pokemon/experience_tables.h
diff --git a/include/data/pokemon/item_effects.h b/src/data/pokemon/item_effects.h
index cd06228dd..cd06228dd 100644
--- a/include/data/pokemon/item_effects.h
+++ b/src/data/pokemon/item_effects.h
diff --git a/include/data/pokemon/level_up_learnset_pointers.h b/src/data/pokemon/level_up_learnset_pointers.h
index 19761c996..19761c996 100644
--- a/include/data/pokemon/level_up_learnset_pointers.h
+++ b/src/data/pokemon/level_up_learnset_pointers.h
diff --git a/include/data/pokemon/level_up_learnsets.h b/src/data/pokemon/level_up_learnsets.h
index bc1de82de..bc1de82de 100644
--- a/include/data/pokemon/level_up_learnsets.h
+++ b/src/data/pokemon/level_up_learnsets.h
diff --git a/include/data/pokemon/nature_stats.h b/src/data/pokemon/nature_stats.h
index fcef2a0ac..fcef2a0ac 100644
--- a/include/data/pokemon/nature_stats.h
+++ b/src/data/pokemon/nature_stats.h
diff --git a/include/data/pokemon/spinda_spots.h b/src/data/pokemon/spinda_spots.h
index d045e0734..d045e0734 100644
--- a/include/data/pokemon/spinda_spots.h
+++ b/src/data/pokemon/spinda_spots.h
diff --git a/include/data/pokemon/tmhm_learnsets.h b/src/data/pokemon/tmhm_learnsets.h
index 02cd22d56..02cd22d56 100644
--- a/include/data/pokemon/tmhm_learnsets.h
+++ b/src/data/pokemon/tmhm_learnsets.h
diff --git a/include/data/pokemon/trainer_class_lookups.h b/src/data/pokemon/trainer_class_lookups.h
index c86e795c4..c86e795c4 100644
--- a/include/data/pokemon/trainer_class_lookups.h
+++ b/src/data/pokemon/trainer_class_lookups.h
diff --git a/src/field/daycare.c b/src/field/daycare.c
index 9c5808a0e..d182e121b 100644
--- a/src/field/daycare.c
+++ b/src/field/daycare.c
@@ -13,7 +13,6 @@
 #include "moves.h"
 #include "trade.h"
 #include "strings2.h"
-#include "data/pokemon/egg_moves.h"
 #include "party_menu.h"
 #include "field_effect.h"
 #include "main.h"
@@ -33,6 +32,8 @@ static void sub_80417F4(struct DayCareMail *);
 static void sub_80420FC(struct Pokemon *, u16, struct DayCareData *);
 static u8 daycare_relationship_score(struct DayCareData *);
 
+#include "../data/pokemon/egg_moves.h"
+
 const u8 *const gUnknown_08209AC4[] = {
     DaycareText_GetAlongVeryWell,
     DaycareText_GetAlong,
diff --git a/src/field/field_map_obj.c b/src/field/field_map_obj.c
index 0e1ce2a31..094e70107 100644
--- a/src/field/field_map_obj.c
+++ b/src/field/field_map_obj.c
@@ -1578,13 +1578,13 @@ void (*const gUnknown_0836DA88[])(struct Sprite *) =
 const u8 gUnknown_0836DBBC[] = {0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
 const u8 gUnknown_0836DC09[] = {DIR_SOUTH, DIR_SOUTH, DIR_SOUTH, DIR_NORTH, DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_NORTH, DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_SOUTH, DIR_SOUTH, DIR_SOUTH, DIR_WEST, DIR_NORTH, DIR_NORTH, DIR_SOUTH, DIR_SOUTH, DIR_SOUTH, DIR_SOUTH, DIR_NORTH, DIR_SOUTH, DIR_SOUTH, DIR_SOUTH, DIR_NORTH, DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_NORTH, DIR_EAST, DIR_SOUTH, DIR_WEST, DIR_NORTH, DIR_WEST, DIR_SOUTH, DIR_EAST, DIR_WEST, DIR_NORTH, DIR_EAST, DIR_SOUTH, DIR_EAST, DIR_NORTH, DIR_WEST, DIR_SOUTH, DIR_NORTH, DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_NORTH, DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_NORTH, DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_SOUTH, DIR_SOUTH, DIR_NORTH, DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_SOUTH, DIR_SOUTH, DIR_NORTH, DIR_WEST, DIR_EAST, DIR_SOUTH, DIR_NORTH, DIR_WEST, DIR_EAST, DIR_SOUTH, DIR_NORTH, DIR_WEST, DIR_EAST, DIR_SOUTH};
 
-#include "data/field_map_obj/map_object_graphics_info_pointers.h"
-#include "data/field_map_obj/field_effect_object_template_pointers.h"
-#include "data/field_map_obj/map_object_pic_tables.h"
-#include "data/field_map_obj/map_object_anims.h"
-#include "data/field_map_obj/base_oam.h"
-#include "data/field_map_obj/map_object_subsprites.h"
-#include "data/field_map_obj/map_object_graphics_info.h"
+#include "../data/field_map_obj/map_object_graphics_info_pointers.h"
+#include "../data/field_map_obj/field_effect_object_template_pointers.h"
+#include "../data/field_map_obj/map_object_pic_tables.h"
+#include "../data/field_map_obj/map_object_anims.h"
+#include "../data/field_map_obj/base_oam.h"
+#include "../data/field_map_obj/map_object_subsprites.h"
+#include "../data/field_map_obj/map_object_graphics_info.h"
 
 const struct SpritePalette gUnknown_0837377C[] = {
     {gMapObjectPalette0, 0x1103},
@@ -1790,14 +1790,14 @@ const u16 *const gUnknown_0837399C[] = {
     Unknown_8373988
 };
 
-#include "data/field_map_obj/berry_tree_graphics_tables.h"
-#include "data/field_map_obj/field_effect_objects.h"
+#include "../data/field_map_obj/berry_tree_graphics_tables.h"
+#include "../data/field_map_obj/field_effect_objects.h"
 
 const s16 gUnknown_0837520C[] = {0x20, 0x40, 0x60, 0x80};
 const s16 gUnknown_08375204[] = {0x20, 0x40, 0x80, 0xc0};
 const s16 gUnknown_0837521C[] = {0x20, 0x30, 0x40, 0x50};
 
-#include "data/field_map_obj/callback_subroutine_pointers.h"
+#include "../data/field_map_obj/callback_subroutine_pointers.h"
 
 const u8 gUnknown_083755F4[] = {0x00, 0x00, 0x01, 0x02, 0x03, 0x00, 0x00, 0x01, 0x01};
 const u8 gUnknown_083755FD[] = {0x04, 0x04, 0x05, 0x06, 0x07, 0x04, 0x04, 0x05, 0x05};
@@ -1886,7 +1886,7 @@ const u8 gUnknown_08375767[][4] = {
     {3, 4, 2, 1}
 };
 
-#include "data/field_map_obj/anim_func_ptrs.h"
+#include "../data/field_map_obj/anim_func_ptrs.h"
 
 // text
 
diff --git a/src/pokemon/pokemon_data.c b/src/pokemon/pokemon_data.c
index b74f8045a..3d13a3390 100644
--- a/src/pokemon/pokemon_data.c
+++ b/src/pokemon/pokemon_data.c
@@ -9,18 +9,18 @@
 #include "sprite.h"
 #include "data2.h"
 
-#include "data/pokemon/dex_order.h"
-#include "data/pokemon/spinda_spots.h"
-#include "data/pokemon/item_effects.h"
-#include "data/pokemon/nature_stats.h"
-#include "data/pokemon/tmhm_learnsets.h"
-#include "data/pokemon/trainer_class_lookups.h"
-#include "data/pokemon/cry_ids.h"
-#include "data/pokemon/experience_tables.h"
-#include "data/pokemon/base_stats.h"
-#include "data/pokemon/level_up_learnsets.h"
-#include "data/pokemon/evolution.h"
-#include "data/pokemon/level_up_learnset_pointers.h"
+#include "../data/pokemon/dex_order.h"
+#include "../data/pokemon/spinda_spots.h"
+#include "../data/pokemon/item_effects.h"
+#include "../data/pokemon/nature_stats.h"
+#include "../data/pokemon/tmhm_learnsets.h"
+#include "../data/pokemon/trainer_class_lookups.h"
+#include "../data/pokemon/cry_ids.h"
+#include "../data/pokemon/experience_tables.h"
+#include "../data/pokemon/base_stats.h"
+#include "../data/pokemon/level_up_learnsets.h"
+#include "../data/pokemon/evolution.h"
+#include "../data/pokemon/level_up_learnset_pointers.h"
 
 const u8 gUnknown_08208238[] = { // Masks for getting PP Up count, also PP Max values
     0x03, 0x0c, 0x30, 0xc0