36 files changed, 95 insertions, 349 deletions
diff --git a/include/pokemon.h b/include/pokemon.h
index 77ed10142..1ab326b6a 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 4845988e8..7b7c7ed82 100644
--- a/src/battle/battle_controller_linkopponent.c
+++ b/src/battle/battle_controller_linkopponent.c
@@ -710,7 +710,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:
@@ -1016,7 +1016,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 6d7c3115f..7f3cf9d37 100644
--- a/src/battle/battle_controller_linkpartner.c
+++ b/src/battle/battle_controller_linkpartner.c
@@ -665,7 +665,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:
@@ -972,7 +972,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 8ad4075e5..9b3808824 100644
--- a/src/battle/battle_controller_opponent.c
+++ b/src/battle/battle_controller_opponent.c
@@ -673,7 +673,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:
@@ -987,7 +987,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 423d036df..62da661f0 100644
--- a/src/battle/battle_controller_player.c
+++ b/src/battle/battle_controller_player.c
@@ -1845,7 +1845,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:
@@ -2160,7 +2160,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 838e99c83..d2baa293b 100644
--- a/src/battle/battle_controller_wally.c
+++ b/src/battle/battle_controller_wally.c
@@ -641,7 +641,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:
@@ -947,7 +947,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 97765e676..dd74f59e0 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 f2ed6adb6..2bc94f118 100644
--- a/src/field/secret_base.c
+++ b/src/field/secret_base.c
@@ -72,54 +72,30 @@ const struct
 
 
 const u8 gUnknown_083D1374[] = {
-    MAP_ID_SECRET_BASE_RED_CAVE1,     0,
-    MAP_ID_SECRET_BASE_BROWN_CAVE1,   3,
-    MAP_ID_SECRET_BASE_RED_CAVE2,     0,
-    MAP_ID_SECRET_BASE_SHRUB1,        9,
-    MAP_ID_SECRET_BASE_RED_CAVE3,     0,
-    MAP_ID_SECRET_BASE_BROWN_CAVE1,   3,
-    MAP_ID_SECRET_BASE_RED_CAVE4,     0,
-    MAP_ID_SECRET_BASE_BROWN_CAVE2,  13,
-    MAP_ID_SECRET_BASE_BROWN_CAVE1,   0,
-    MAP_ID_SECRET_BASE_BLUE_CAVE1,    3,
-    MAP_ID_SECRET_BASE_BROWN_CAVE2,   0,
-    MAP_ID_SECRET_BASE_YELLOW_CAVE2,  2,
-    MAP_ID_SECRET_BASE_BROWN_CAVE3,   0,
-    MAP_ID_SECRET_BASE_BROWN_CAVE3,   4,
-    MAP_ID_SECRET_BASE_BROWN_CAVE4,   0,
-    MAP_ID_SECRET_BASE_BROWN_CAVE1,   2,
-    MAP_ID_SECRET_BASE_BLUE_CAVE1,    0,
-    MAP_ID_SECRET_BASE_BROWN_CAVE1,   3,
-    MAP_ID_SECRET_BASE_BLUE_CAVE2,    0,
-    MAP_ID_SECRET_BASE_BROWN_CAVE1,   2,
-    MAP_ID_SECRET_BASE_BLUE_CAVE3,    0,
-    MAP_ID_SECRET_BASE_YELLOW_CAVE1, 15,
-    MAP_ID_SECRET_BASE_BLUE_CAVE4,    0,
-    MAP_ID_SECRET_BASE_YELLOW_CAVE1, 14,
-    MAP_ID_SECRET_BASE_YELLOW_CAVE1,  0,
-    MAP_ID_SECRET_BASE_YELLOW_CAVE2,  3,
-    MAP_ID_SECRET_BASE_YELLOW_CAVE2,  0,
-    MAP_ID_SECRET_BASE_BLUE_CAVE2,    7,
-    MAP_ID_SECRET_BASE_YELLOW_CAVE3,  0,
-    MAP_ID_SECRET_BASE_YELLOW_CAVE1,  6,
-    MAP_ID_SECRET_BASE_YELLOW_CAVE4,  0,
-    MAP_ID_SECRET_BASE_SHRUB1,        9,
-    MAP_ID_SECRET_BASE_TREE1,         0,
-    MAP_ID_SECRET_BASE_BLUE_CAVE1,    3,
-    MAP_ID_SECRET_BASE_TREE2,         0,
-    MAP_ID_SECRET_BASE_SHRUB1,        6,
-    MAP_ID_SECRET_BASE_TREE3,         0,
-    MAP_ID_SECRET_BASE_YELLOW_CAVE3,  3,
-    MAP_ID_SECRET_BASE_TREE4,         0,
-    MAP_ID_SECRET_BASE_TREE1,        10,
-    MAP_ID_SECRET_BASE_SHRUB1,        0,
-    MAP_ID_SECRET_BASE_YELLOW_CAVE1,  3,
-    MAP_ID_SECRET_BASE_SHRUB2,        0,
-    MAP_ID_SECRET_BASE_BROWN_CAVE1,   2,
-    MAP_ID_SECRET_BASE_SHRUB3,        0,
-    MAP_ID_SECRET_BASE_BROWN_CAVE2,   8,
-    MAP_ID_SECRET_BASE_SHRUB4,        0,
-    MAP_ID_SECRET_BASE_YELLOW_CAVE2,  6
+    MAP_ID_SECRET_BASE_RED_CAVE1,     0,  1,  3,
+    MAP_ID_SECRET_BASE_RED_CAVE2,     0,  5,  9,
+    MAP_ID_SECRET_BASE_RED_CAVE3,     0,  1,  3,
+    MAP_ID_SECRET_BASE_RED_CAVE4,     0,  7, 13,
+    MAP_ID_SECRET_BASE_BROWN_CAVE1,   0,  2,  3,
+    MAP_ID_SECRET_BASE_BROWN_CAVE2,   0,  9,  2,
+    MAP_ID_SECRET_BASE_BROWN_CAVE3,   0, 13,  4,
+    MAP_ID_SECRET_BASE_BROWN_CAVE4,   0,  1,  2,
+    MAP_ID_SECRET_BASE_BLUE_CAVE1,    0,  1,  3,
+    MAP_ID_SECRET_BASE_BLUE_CAVE2,    0,  1,  2,
+    MAP_ID_SECRET_BASE_BLUE_CAVE3,    0,  3, 15,
+    MAP_ID_SECRET_BASE_BLUE_CAVE4,    0,  3, 14,
+    MAP_ID_SECRET_BASE_YELLOW_CAVE1,  0,  9,  3,
+    MAP_ID_SECRET_BASE_YELLOW_CAVE2,  0,  8,  7,
+    MAP_ID_SECRET_BASE_YELLOW_CAVE3,  0,  3,  6,
+    MAP_ID_SECRET_BASE_YELLOW_CAVE4,  0,  5,  9,
+    MAP_ID_SECRET_BASE_TREE1,         0,  2,  3,
+    MAP_ID_SECRET_BASE_TREE2,         0,  5,  6,
+    MAP_ID_SECRET_BASE_TREE3,         0, 15,  3,
+    MAP_ID_SECRET_BASE_TREE4,         0,  4, 10,
+    MAP_ID_SECRET_BASE_SHRUB1,        0,  3,  3,
+    MAP_ID_SECRET_BASE_SHRUB2,        0,  1,  2,
+    MAP_ID_SECRET_BASE_SHRUB3,        0,  7,  8,
+    MAP_ID_SECRET_BASE_SHRUB4,        0,  9,  6
 };
 
 const struct MenuAction2 gUnknown_083D13D4[] = {
@@ -455,17 +431,15 @@ void sub_80BBCCC(u8 flagIn)
     }
 }
 
-#ifdef NONMATCHING
-// The only nonmatching property of this function is that the implicit variables &gSaveBlock1 and &roomdecor[decidx]
-// are stored in the wrong registers.
 void sub_80BBDD0(void)
 {
     u8 *roomdecor;
     u8 *roomdecorpos;
-    u8 ndecor;
     u8 decidx;
     u8 objid = 0;
     u8 metatile;
+    u8 permission;
+    u8 ndecor;
     u16 curBase = VarGet(VAR_0x4054);
     if (!CurrentMapIsSecretBase()) {
         roomdecor = gSaveBlock1.playerRoomDecor;
@@ -477,262 +451,33 @@ void sub_80BBDD0(void)
         ndecor = 16;
     }
     for (decidx=0; decidx<ndecor; decidx++) {
-        if (roomdecor[decidx] != 0 && gDecorations[roomdecor[decidx]].permission == DECORPERM_SOLID_MAT)
-        {
-            for (objid=0; objid<gMapHeader.events->mapObjectCount; objid++) {
-                if (gMapHeader.events->mapObjects[objid].flagId == gSpecialVar_0x8004 + 0xAE)
-                    break;
-            }
-            if (objid == gMapHeader.events->mapObjectCount)
-                continue;
-            gSpecialVar_0x8006 = roomdecorpos[decidx] >> 4;
-            gSpecialVar_0x8007 = roomdecorpos[decidx] & 0xF;
-            metatile = MapGridGetMetatileBehaviorAt(gSpecialVar_0x8006 + 7, gSpecialVar_0x8007 + 7);
-            if (sub_80572D8(metatile) == TRUE || sub_80572EC(metatile) == TRUE) {
-                gScriptResult = gMapHeader.events->mapObjects[objid].graphicsId + VAR_0x3F20;
-                VarSet(gScriptResult, gDecorations[roomdecor[decidx]].tiles[0]);
-                gScriptResult = gMapHeader.events->mapObjects[objid].localId;
-                FlagClear(gSpecialVar_0x8004 + 0xAE);
-                show_sprite(gScriptResult, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup);
-                sub_805C0F8(gScriptResult, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup, gSpecialVar_0x8006, gSpecialVar_0x8007);
-                sub_805C78C(gScriptResult, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup);
-                gSpecialVar_0x8004 ++;
+        if (roomdecor[decidx] != DECOR_NONE) {
+            permission = gDecorations[roomdecor[decidx]].permission;
+            if (permission == DECORPERM_SOLID_MAT)
+            {
+                for (objid=0; objid<gMapHeader.events->mapObjectCount; objid++) {
+                    if (gMapHeader.events->mapObjects[objid].flagId == gSpecialVar_0x8004 + 0xAE)
+                        break;
+                }
+                if (objid == gMapHeader.events->mapObjectCount)
+                    continue;
+                gSpecialVar_0x8006 = roomdecorpos[decidx] >> 4;
+                gSpecialVar_0x8007 = roomdecorpos[decidx] & 0xF;
+                metatile = MapGridGetMetatileBehaviorAt(gSpecialVar_0x8006 + 7, gSpecialVar_0x8007 + 7);
+                if (sub_80572D8(metatile) == TRUE || sub_80572EC(metatile) == TRUE) {
+                    gScriptResult = gMapHeader.events->mapObjects[objid].graphicsId + VAR_0x3F20;
+                    VarSet(gScriptResult, gDecorations[roomdecor[decidx]].tiles[0]);
+                    gScriptResult = gMapHeader.events->mapObjects[objid].localId;
+                    FlagClear(gSpecialVar_0x8004 + 0xAE);
+                    show_sprite(gScriptResult, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup);
+                    sub_805C0F8(gScriptResult, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup, gSpecialVar_0x8006, gSpecialVar_0x8007);
+                    sub_805C78C(gScriptResult, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup);
+                    gSpecialVar_0x8004 ++;
+                }
             }
         }
     }
 }
-#else
-__attribute__((naked))
-void sub_80BBDD0(void)
-{
-    asm(".syntax unified\n\
-    push {r4-r7,lr}\n\
-    mov r7, r10\n\
-    mov r6, r9\n\
-    mov r5, r8\n\
-    push {r5-r7}\n\
-    sub sp, 0x14\n\
-    ldr r0, _080BBE00 @ =0x00004054\n\
-    bl VarGet\n\
-    lsls r0, 16\n\
-    lsrs r4, r0, 16\n\
-    bl CurrentMapIsSecretBase\n\
-    lsls r0, 24\n\
-    cmp r0, 0\n\
-    bne _080BBE08\n\
-    ldr r0, _080BBE04 @ =gSaveBlock1 + 0x2688\n\
-    str r0, [sp, 0x4]\n\
-    adds r0, 0xC\n\
-    str r0, [sp, 0x8]\n\
-    movs r1, 0xC\n\
-    str r1, [sp, 0xC]\n\
-    b _080BBE1E\n\
-    .align 2, 0\n\
-_080BBE00: .4byte 0x00004054\n\
-_080BBE04: .4byte gSaveBlock1 + 0x2688\n\
-_080BBE08:\n\
-    lsls r1, r4, 2\n\
-    adds r1, r4\n\
-    lsls r1, 5\n\
-    ldr r0, _080BBF7C @ =gSaveBlock1 + 0x1A1A\n\
-    adds r2, r1, r0\n\
-    str r2, [sp, 0x4]\n\
-    adds r0, 0x10\n\
-    adds r1, r0\n\
-    str r1, [sp, 0x8]\n\
-    movs r3, 0x10\n\
-    str r3, [sp, 0xC]\n\
-_080BBE1E:\n\
-    movs r6, 0\n\
-    ldr r4, [sp, 0xC]\n\
-    cmp r6, r4\n\
-    bcc _080BBE28\n\
-    b _080BBF6C\n\
-_080BBE28:\n\
-    ldr r5, _080BBF80 @ =gSaveBlock1\n\
-    mov r10, r5\n\
-_080BBE2C:\n\
-    ldr r1, [sp, 0x4]\n\
-    adds r0, r1, r6\n\
-    ldrb r1, [r0]\n\
-    mov r9, r0\n\
-    adds r2, r6, 0x1\n\
-    str r2, [sp, 0x10]\n\
-    cmp r1, 0\n\
-    bne _080BBE3E\n\
-    b _080BBF5E\n\
-_080BBE3E:\n\
-    ldrb r0, [r0]\n\
-    lsls r0, 5\n\
-    ldr r3, _080BBF84 @ =gDecorations\n\
-    adds r0, r3\n\
-    ldrb r0, [r0, 0x11]\n\
-    cmp r0, 0x4\n\
-    beq _080BBE4E\n\
-    b _080BBF5E\n\
-_080BBE4E:\n\
-    movs r5, 0\n\
-    ldr r0, _080BBF88 @ =gMapHeader\n\
-    ldr r2, [r0, 0x4]\n\
-    ldrb r3, [r2]\n\
-    mov r8, r0\n\
-    cmp r5, r3\n\
-    bcs _080BBE8E\n\
-    ldr r0, [r2, 0x4]\n\
-    ldrh r1, [r0, 0x14]\n\
-    ldr r4, _080BBF8C @ =gSpecialVar_0x8004\n\
-    ldrh r0, [r4]\n\
-    adds r0, 0xAE\n\
-    adds r7, r4, 0\n\
-    cmp r1, r0\n\
-    beq _080BBE8E\n\
-    adds r4, r2, 0\n\
-    adds r2, r3, 0\n\
-_080BBE70:\n\
-    adds r0, r5, 0x1\n\
-    lsls r0, 24\n\
-    lsrs r5, r0, 24\n\
-    cmp r5, r2\n\
-    bcs _080BBE8E\n\
-    ldr r1, [r4, 0x4]\n\
-    lsls r0, r5, 1\n\
-    adds r0, r5\n\
-    lsls r0, 3\n\
-    adds r0, r1\n\
-    ldrh r1, [r0, 0x14]\n\
-    ldrh r0, [r7]\n\
-    adds r0, 0xAE\n\
-    cmp r1, r0\n\
-    bne _080BBE70\n\
-_080BBE8E:\n\
-    mov r1, r8\n\
-    ldr r0, [r1, 0x4]\n\
-    ldrb r0, [r0]\n\
-    cmp r5, r0\n\
-    beq _080BBF5E\n\
-    ldr r7, _080BBF90 @ =gSpecialVar_0x8006\n\
-    ldr r2, [sp, 0x8]\n\
-    adds r1, r2, r6\n\
-    ldrb r0, [r1]\n\
-    lsrs r0, 4\n\
-    strh r0, [r7]\n\
-    ldr r6, _080BBF94 @ =gSpecialVar_0x8007\n\
-    ldrb r1, [r1]\n\
-    movs r0, 0xF\n\
-    ands r0, r1\n\
-    strh r0, [r6]\n\
-    ldrh r0, [r7]\n\
-    adds r0, 0x7\n\
-    ldrh r1, [r6]\n\
-    adds r1, 0x7\n\
-    bl MapGridGetMetatileBehaviorAt\n\
-    lsls r0, 24\n\
-    lsrs r4, r0, 24\n\
-    adds r0, r4, 0\n\
-    bl sub_80572D8\n\
-    lsls r0, 24\n\
-    lsrs r0, 24\n\
-    cmp r0, 0x1\n\
-    beq _080BBEDA\n\
-    adds r0, r4, 0\n\
-    bl sub_80572EC\n\
-    lsls r0, 24\n\
-    lsrs r0, 24\n\
-    cmp r0, 0x1\n\
-    bne _080BBF5E\n\
-_080BBEDA:\n\
-    mov r3, r8\n\
-    ldr r0, [r3, 0x4]\n\
-    ldr r1, [r0, 0x4]\n\
-    lsls r4, r5, 1\n\
-    adds r4, r5\n\
-    lsls r4, 3\n\
-    adds r1, r4, r1\n\
-    ldr r5, _080BBF98 @ =0x00003f20\n\
-    adds r0, r5, 0\n\
-    ldrb r1, [r1, 0x1]\n\
-    adds r0, r1\n\
-    ldr r1, _080BBF9C @ =gScriptResult\n\
-    strh r0, [r1]\n\
-    ldrh r0, [r1]\n\
-    mov r2, r9\n\
-    ldrb r1, [r2]\n\
-    lsls r1, 5\n\
-    ldr r3, _080BBFA0 @ =gDecorations + 0x1C\n\
-    adds r1, r3\n\
-    ldr r1, [r1]\n\
-    ldrh r1, [r1]\n\
-    bl VarSet\n\
-    mov r5, r8\n\
-    ldr r0, [r5, 0x4]\n\
-    ldr r0, [r0, 0x4]\n\
-    adds r4, r0\n\
-    ldrb r0, [r4]\n\
-    ldr r1, _080BBF9C @ =gScriptResult\n\
-    strh r0, [r1]\n\
-    ldr r2, _080BBF8C @ =gSpecialVar_0x8004\n\
-    ldrh r0, [r2]\n\
-    adds r0, 0xAE\n\
-    lsls r0, 16\n\
-    lsrs r0, 16\n\
-    bl FlagClear\n\
-    ldr r3, _080BBF9C @ =gScriptResult\n\
-    ldrb r0, [r3]\n\
-    mov r4, r10\n\
-    ldrb r1, [r4, 0x5]\n\
-    ldrb r2, [r4, 0x4]\n\
-    bl show_sprite\n\
-    ldr r5, _080BBF9C @ =gScriptResult\n\
-    ldrb r0, [r5]\n\
-    ldrb r1, [r4, 0x5]\n\
-    ldrb r2, [r4, 0x4]\n\
-    movs r4, 0\n\
-    ldrsh r3, [r7, r4]\n\
-    movs r5, 0\n\
-    ldrsh r4, [r6, r5]\n\
-    str r4, [sp]\n\
-    bl sub_805C0F8\n\
-    ldr r1, _080BBF9C @ =gScriptResult\n\
-    ldrb r0, [r1]\n\
-    mov r2, r10\n\
-    ldrb r1, [r2, 0x5]\n\
-    ldrb r2, [r2, 0x4]\n\
-    bl sub_805C78C\n\
-    ldr r3, _080BBF8C @ =gSpecialVar_0x8004\n\
-    ldrh r0, [r3]\n\
-    adds r0, 0x1\n\
-    strh r0, [r3]\n\
-_080BBF5E:\n\
-    ldr r4, [sp, 0x10]\n\
-    lsls r0, r4, 24\n\
-    lsrs r6, r0, 24\n\
-    ldr r5, [sp, 0xC]\n\
-    cmp r6, r5\n\
-    bcs _080BBF6C\n\
-    b _080BBE2C\n\
-_080BBF6C:\n\
-    add sp, 0x14\n\
-    pop {r3-r5}\n\
-    mov r8, r3\n\
-    mov r9, r4\n\
-    mov r10, r5\n\
-    pop {r4-r7}\n\
-    pop {r0}\n\
-    bx r0\n\
-    .align 2, 0\n\
-_080BBF7C: .4byte gSaveBlock1 + 0x1A1A\n\
-_080BBF80: .4byte gSaveBlock1\n\
-_080BBF84: .4byte gDecorations\n\
-_080BBF88: .4byte gMapHeader\n\
-_080BBF8C: .4byte gSpecialVar_0x8004\n\
-_080BBF90: .4byte gSpecialVar_0x8006\n\
-_080BBF94: .4byte gSpecialVar_0x8007\n\
-_080BBF98: .4byte 0x00003f20\n\
-_080BBF9C: .4byte gScriptResult\n\
-_080BBFA0: .4byte gDecorations + 0x1C\n\
-.syntax divided\n");
-}
-#endif
 
 void sub_80BBFA4(void)
 {
@@ -851,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 a0e1d8801..0c0d14d7a 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, &src->hpEV);
     SetMonData(mon, MON_DATA_ATK_EV, &src->attackEV);
     SetMonData(mon, MON_DATA_DEF_EV, &src->defenseEV);
-    SetMonData(mon, MON_DATA_SPD_EV, &src->speedEV);
+    SetMonData(mon, MON_DATA_SPEED_EV, &src->speedEV);
     SetMonData(mon, MON_DATA_SPATK_EV, &src->spAttackEV);
     SetMonData(mon, MON_DATA_SPDEF_EV, &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 285ecfe6e..72d41c7a6 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:
@@ -786,7 +786,7 @@ void SetBoxMonData(struct BoxPokemon *boxMon, s32 field, const void *dataArg)
     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
 };