battle_controller_link_partner

src/battle_controller_link_opponent.c

@@ -1,6 +1,6 @@
 #include "global.h"
 #include "bg.h"
-#include "data2.h"
+#include "data.h"
 #include "link.h"
 #include "main.h"
 #include "m4a.h"
@@ -535,7 +535,7 @@ static u32 CopyLinkOpponentMonData(u8 monId, u8 *dst)
             moveData.pp[size] = GetMonData(&gEnemyParty[monId], MON_DATA_PP1 + size);
         }
         moveData.ppBonuses = GetMonData(&gEnemyParty[monId], MON_DATA_PP_BONUSES);
-        src = (u8*)(&moveData);
+        src = (u8 *)(&moveData);
         for (size = 0; size < sizeof(moveData); ++size)
             dst[size] = src[size];
         break;

src/battle_controller_opponent.c

@@ -1,6 +1,6 @@
 #include "global.h"
 #include "bg.h"
-#include "data2.h"
+#include "data.h"
 #include "item.h"
 #include "link.h"
 #include "main.h"

src/battle_controller_player.c

@@ -1,6 +1,6 @@
 #include "global.h"
 #include "bg.h"
-#include "data2.h"
+#include "data.h"
 #include "item.h"
 #include "item_menu.h"
 #include "link.h"

src/battle_controller_safari.c

@@ -5,7 +5,7 @@
 #include "battle_interface.h"
 #include "battle_message.h"
 #include "bg.h"
-#include "data2.h"
+#include "data.h"
 #include "item_menu.h"
 #include "link.h"
 #include "main.h"

src/battle_gfx_sfx_util.c

@@ -8,7 +8,7 @@
 #include "decompress.h"
 #include "palette.h"
 #include "sprite.h"
-#include "data2.h"
+#include "data.h"
 #include "util.h"
 #include "party_menu.h"
 #include "battle.h"

src/item_pc.c

@@ -1,6 +1,6 @@
 #include "global.h"
 #include "bg.h"
-#include "data2.h"
+#include "data.h"
 #include "decompress.h"
 #include "gpu_regs.h"
 #include "graphics.h"

src/pokemon.c

@@ -5,7 +5,7 @@
 #include "random.h"
 #include "main.h"
 #include "text.h"
-#include "data2.h"
+#include "data.h"
 #include "string_util.h"
 #include "battle.h"
 #include "battle_main.h"
@@ -13,7 +13,7 @@
 #include "event_data.h"
 #include "util.h"
 #include "pokemon_storage_system.h"
-#include "data2.h"
+#include "data.h"
 #include "battle_gfx_sfx_util.h"
 #include "battle_controllers.h"
 #include "evolution_scene.h"

src/quest_log.c

@@ -1,7 +1,7 @@
 #include "global.h"
 #include "constants/species.h"
 #include "constants/items.h"
-#include "data2.h"
+#include "data.h"
 #include "malloc.h"
 #include "main.h"
 #include "task.h"

src/reshow_battle_screen.c

@@ -4,7 +4,7 @@
 #include "pokemon.h"
 #include "main.h"
 #include "link.h"
-#include "data2.h"
+#include "data.h"
 #include "sprite.h"
 #include "text.h"
 #include "gpu_regs.h"

src/scrcmd.c

@@ -25,7 +25,7 @@
 #include "start_menu.h"
 #include "script_menu.h"
 #include "string_util.h"
-#include "data2.h"
+#include "data.h"
 #include "field_specials.h"
 #include "constants/items.h"
 #include "script_pokemon_util_80A0058.h"

src/tm_case.c

@@ -21,7 +21,7 @@
 #include "pokemon_storage_system.h"
 #include "string_util.h"
 #include "party_menu.h"
-#include "data2.h"
+#include "data.h"
 #include "scanline_effect.h"
 #include "sound.h"
 #include "strings.h"