Merge branch 'master' into secret_base_data_fix

36 files changed, 46 insertions, 45 deletions

diff --git a/include/pokemon.h b/include/pokemon.h
index dabdff626..0fbc325c3 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -32,7 +32,7 @@
 #define MON_DATA_HP_EV             26
 #define MON_DATA_ATK_EV            27
 #define MON_DATA_DEF_EV            28
-#define MON_DATA_SPD_EV            29
+#define MON_DATA_SPEED_EV          29
 #define MON_DATA_SPATK_EV          30
 #define MON_DATA_SPDEF_EV          31
 #define MON_DATA_FRIENDSHIP        32
@@ -45,7 +45,7 @@
 #define MON_DATA_HP_IV             39
 #define MON_DATA_ATK_IV            40
 #define MON_DATA_DEF_IV            41
-#define MON_DATA_SPEED_IV            42
+#define MON_DATA_SPEED_IV          42
 #define MON_DATA_SPATK_IV          43
 #define MON_DATA_SPDEF_IV          44
 #define MON_DATA_IS_EGG            45
@@ -64,7 +64,7 @@
 #define MON_DATA_MAX_HP            58
 #define MON_DATA_ATK               59
 #define MON_DATA_DEF               60
-#define MON_DATA_SPEED               61
+#define MON_DATA_SPEED             61
 #define MON_DATA_SPATK             62
 #define MON_DATA_SPDEF             63
 #define MON_DATA_MAIL              64
@@ -89,7 +89,7 @@
 #define MON_DATA_83                83
 #define MON_DATA_ATK2              84
 #define MON_DATA_DEF2              85
-#define MON_DATA_SPD2              86
+#define MON_DATA_SPEED2            86
 #define MON_DATA_SPATK2            87
 #define MON_DATA_SPDEF2            88
 
diff --git a/src/battle/battle_controller_linkopponent.c b/src/battle/battle_controller_linkopponent.c
index 83b690719..edfd7e675 100644
--- a/src/battle/battle_controller_linkopponent.c
+++ b/src/battle/battle_controller_linkopponent.c
@@ -713,7 +713,7 @@ u32 dp01_getattr_by_ch1_for_player_pokemon__(u8 a, u8 *buffer)
         size = 1;
         break;
     case 22:
-        buffer[0] = GetMonData(&gEnemyParty[a], MON_DATA_SPD_EV);
+        buffer[0] = GetMonData(&gEnemyParty[a], MON_DATA_SPEED_EV);
         size = 1;
         break;
     case 23:
@@ -1019,7 +1019,7 @@ void sub_8038900(u8 a)
         SetMonData(&gEnemyParty[a], MON_DATA_DEF_EV, &gBattleBufferA[gActiveBank][3]);
         break;
     case 22:
-        SetMonData(&gEnemyParty[a], MON_DATA_SPD_EV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_SPEED_EV, &gBattleBufferA[gActiveBank][3]);
         break;
     case 23:
         SetMonData(&gEnemyParty[a], MON_DATA_SPATK_EV, &gBattleBufferA[gActiveBank][3]);
diff --git a/src/battle/battle_controller_linkpartner.c b/src/battle/battle_controller_linkpartner.c
index ca20f6262..335ebcb12 100644
--- a/src/battle/battle_controller_linkpartner.c
+++ b/src/battle/battle_controller_linkpartner.c
@@ -669,7 +669,7 @@ u32 dp01_getattr_by_ch1_for_player_pokemon(u8 a, u8 *buffer)
         size = 1;
         break;
     case 22:
-        buffer[0] = GetMonData(&gPlayerParty[a], MON_DATA_SPD_EV);
+        buffer[0] = GetMonData(&gPlayerParty[a], MON_DATA_SPEED_EV);
         size = 1;
         break;
     case 23:
@@ -976,7 +976,7 @@ void sub_811EC68(u8 a)
         SetMonData(&gPlayerParty[a], MON_DATA_DEF_EV, &gBattleBufferA[gActiveBank][3]);
         break;
     case 22:
-        SetMonData(&gPlayerParty[a], MON_DATA_SPD_EV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_SPEED_EV, &gBattleBufferA[gActiveBank][3]);
         break;
     case 23:
         SetMonData(&gPlayerParty[a], MON_DATA_SPATK_EV, &gBattleBufferA[gActiveBank][3]);
diff --git a/src/battle/battle_controller_opponent.c b/src/battle/battle_controller_opponent.c
index cf90d5817..d03ef2967 100644
--- a/src/battle/battle_controller_opponent.c
+++ b/src/battle/battle_controller_opponent.c
@@ -677,7 +677,7 @@ u32 sub_8033598(u8 a, u8 *buffer)
         size = 1;
         break;
     case 22:
-        buffer[0] = GetMonData(&gEnemyParty[a], MON_DATA_SPD_EV);
+        buffer[0] = GetMonData(&gEnemyParty[a], MON_DATA_SPEED_EV);
         size = 1;
         break;
     case 23:
@@ -991,7 +991,7 @@ void sub_8033E24(u8 a)
         SetMonData(&gEnemyParty[a], MON_DATA_DEF_EV, &gBattleBufferA[gActiveBank][3]);
         break;
     case 22:
-        SetMonData(&gEnemyParty[a], MON_DATA_SPD_EV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gEnemyParty[a], MON_DATA_SPEED_EV, &gBattleBufferA[gActiveBank][3]);
         break;
     case 23:
         SetMonData(&gEnemyParty[a], MON_DATA_SPATK_EV, &gBattleBufferA[gActiveBank][3]);
diff --git a/src/battle/battle_controller_player.c b/src/battle/battle_controller_player.c
index dd94b2f4b..7f5c6c490 100644
--- a/src/battle/battle_controller_player.c
+++ b/src/battle/battle_controller_player.c
@@ -1849,7 +1849,7 @@ u32 dp01_getattr_by_ch1_for_player_pokemon_(u8 a, u8 *buffer)
         size = 1;
         break;
     case 22:
-        buffer[0] = GetMonData(&gPlayerParty[a], MON_DATA_SPD_EV);
+        buffer[0] = GetMonData(&gPlayerParty[a], MON_DATA_SPEED_EV);
         size = 1;
         break;
     case 23:
@@ -2164,7 +2164,7 @@ void dp01_setattr_by_ch1_for_player_pokemon(u8 a)
         SetMonData(&gPlayerParty[a], MON_DATA_DEF_EV, &gBattleBufferA[gActiveBank][3]);
         break;
     case 22:
-        SetMonData(&gPlayerParty[a], MON_DATA_SPD_EV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_SPEED_EV, &gBattleBufferA[gActiveBank][3]);
         break;
     case 23:
         SetMonData(&gPlayerParty[a], MON_DATA_SPATK_EV, &gBattleBufferA[gActiveBank][3]);
diff --git a/src/battle/battle_controller_wally.c b/src/battle/battle_controller_wally.c
index 97c78ecd8..3531c1771 100644
--- a/src/battle/battle_controller_wally.c
+++ b/src/battle/battle_controller_wally.c
@@ -645,7 +645,7 @@ u32 sub_8137A84(u8 a, u8 *buffer)
         size = 1;
         break;
     case 22:
-        buffer[0] = GetMonData(&gPlayerParty[a], MON_DATA_SPD_EV);
+        buffer[0] = GetMonData(&gPlayerParty[a], MON_DATA_SPEED_EV);
         size = 1;
         break;
     case 23:
@@ -951,7 +951,7 @@ void sub_8138294(u8 a)
         SetMonData(&gPlayerParty[a], MON_DATA_DEF_EV, &gBattleBufferA[gActiveBank][3]);
         break;
     case 22:
-        SetMonData(&gPlayerParty[a], MON_DATA_SPD_EV, &gBattleBufferA[gActiveBank][3]);
+        SetMonData(&gPlayerParty[a], MON_DATA_SPEED_EV, &gBattleBufferA[gActiveBank][3]);
         break;
     case 23:
         SetMonData(&gPlayerParty[a], MON_DATA_SPATK_EV, &gBattleBufferA[gActiveBank][3]);
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/field/secret_base.c b/src/field/secret_base.c
index 708bd7fe1..8c1b7c8c1 100644
--- a/src/field/secret_base.c
+++ b/src/field/secret_base.c
@@ -596,7 +596,7 @@ u8 sub_80BC298(struct Pokemon *mon) { // 80bc298
     u16 evsum = GetMonData(mon, MON_DATA_HP_EV);
     evsum += GetMonData(mon, MON_DATA_ATK_EV);
     evsum += GetMonData(mon, MON_DATA_DEF_EV);
-    evsum += GetMonData(mon, MON_DATA_SPD_EV);
+    evsum += GetMonData(mon, MON_DATA_SPEED_EV);
     evsum += GetMonData(mon, MON_DATA_SPATK_EV);
     evsum += GetMonData(mon, MON_DATA_SPDEF_EV);
     return (u8)(evsum / 6);
diff --git a/src/pokemon/pokemon_1.c b/src/pokemon/pokemon_1.c
index 345a9668b..204baddbf 100644
--- a/src/pokemon/pokemon_1.c
+++ b/src/pokemon/pokemon_1.c
@@ -314,7 +314,7 @@ void sub_803ADE8(struct Pokemon *mon, struct UnknownPokemonStruct *src)
     SetMonData(mon, MON_DATA_HP_EV, (u8 *)&src->hpEV);
     SetMonData(mon, MON_DATA_ATK_EV, (u8 *)&src->attackEV);
     SetMonData(mon, MON_DATA_DEF_EV, (u8 *)&src->defenseEV);
-    SetMonData(mon, MON_DATA_SPD_EV, (u8 *)&src->speedEV);
+    SetMonData(mon, MON_DATA_SPEED_EV, (u8 *)&src->speedEV);
     SetMonData(mon, MON_DATA_SPATK_EV, (u8 *)&src->spAttackEV);
     SetMonData(mon, MON_DATA_SPDEF_EV, (u8 *)&src->spDefenseEV);
     value = src->altAbility;
@@ -356,7 +356,7 @@ void sub_803AF78(struct Pokemon *mon, struct UnknownPokemonStruct *dest)
     dest->hpEV = GetMonData(mon, MON_DATA_HP_EV, NULL);
     dest->attackEV = GetMonData(mon, MON_DATA_ATK_EV, NULL);
     dest->defenseEV = GetMonData(mon, MON_DATA_DEF_EV, NULL);
-    dest->speedEV = GetMonData(mon, MON_DATA_SPD_EV, NULL);
+    dest->speedEV = GetMonData(mon, MON_DATA_SPEED_EV, NULL);
     dest->spAttackEV = GetMonData(mon, MON_DATA_SPATK_EV, NULL);
     dest->spDefenseEV = GetMonData(mon, MON_DATA_SPDEF_EV, NULL);
     dest->friendship = GetMonData(mon, MON_DATA_FRIENDSHIP, NULL);
@@ -415,7 +415,7 @@ void CalculateMonStats(struct Pokemon *mon)
     s32 defenseIV = GetMonData(mon, MON_DATA_DEF_IV, NULL);
     s32 defenseEV = GetMonData(mon, MON_DATA_DEF_EV, NULL);
     s32 speedIV = GetMonData(mon, MON_DATA_SPEED_IV, NULL);
-    s32 speedEV = GetMonData(mon, MON_DATA_SPD_EV, NULL);
+    s32 speedEV = GetMonData(mon, MON_DATA_SPEED_EV, NULL);
     s32 spAttackIV = GetMonData(mon, MON_DATA_SPATK_IV, NULL);
     s32 spAttackEV = GetMonData(mon, MON_DATA_SPATK_EV, NULL);
     s32 spDefenseIV = GetMonData(mon, MON_DATA_SPDEF_IV, NULL);
diff --git a/src/pokemon/pokemon_2.c b/src/pokemon/pokemon_2.c
index eaa0b86b8..447d95768 100644
--- a/src/pokemon/pokemon_2.c
+++ b/src/pokemon/pokemon_2.c
@@ -422,7 +422,7 @@ u32 GetBoxMonData(struct BoxPokemon *boxMon, s32 field, u8 *data)
     case MON_DATA_DEF_EV:
         retVal = substruct2->defenseEV;
         break;
-    case MON_DATA_SPD_EV:
+    case MON_DATA_SPEED_EV:
         retVal = substruct2->speedEV;
         break;
     case MON_DATA_SPATK_EV:
@@ -784,7 +784,7 @@ void SetBoxMonData(struct BoxPokemon *boxMon, s32 field, const u8 *data)
     case MON_DATA_DEF_EV:
         SET8(substruct2->defenseEV);
         break;
-    case MON_DATA_SPD_EV:
+    case MON_DATA_SPEED_EV:
         SET8(substruct2->speedEV);
         break;
     case MON_DATA_SPATK_EV:
diff --git a/src/pokemon/pokemon_data.c b/src/pokemon/pokemon_data.c
index 6414134fb..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
@@ -93,7 +93,7 @@ const u8 gUnknown_082082F2[] = {
     MON_DATA_HP_EV,
     MON_DATA_ATK_EV,
     MON_DATA_DEF_EV,
-    MON_DATA_SPD_EV,
+    MON_DATA_SPEED_EV,
     MON_DATA_SPDEF_EV,
     MON_DATA_SPATK_EV
 };