battle_controller_link_partner

data/data_83F5738.s

@@ -133,10 +133,10 @@ gUnknown_83F846D:: @ 83F846D
 gUnknown_83F847D:: @ 83F847D
 	.incbin "baserom.gba", 0x3F847D, 0x323
 
-	.section .rodata.83FB134
+	.section .rodata.83FB218
 
-gUnknown_83FB134:: @ 83FB134
-	.incbin "baserom.gba", 0x3FB134, 0xA80
+gUnknown_83FB218:: @ 83FB218
+	.incbin "baserom.gba", 0x3FB218, 0x99C
 
 BattleText_MistShroud:: @ 83FBBB4
 	.incbin "baserom.gba", 0x3FBBB4, 0x35

include/data.h

@@ -1,5 +1,5 @@
-#ifndef GUARD_DATA2_H
-#define GUARD_DATA2_H
+#ifndef GUARD_DATA_H
+#define GUARD_DATA_H
 
 #include "global.h"
 #include "constants/species.h"
@@ -59,4 +59,4 @@ extern const struct SpriteFrameImage gUnknown_8234788[];
 extern const struct SpriteFrameImage gUnknown_82347A8[];
 extern const struct SpriteFrameImage gUnknown_82347C8[];
 
-#endif // GUARD_DATA2_H
+#endif // GUARD_DATA_H

ld_script.txt

@@ -192,7 +192,7 @@ SECTIONS {
         src/coins.o(.text);
         src/fldeff_strength.o(.text);
         src/battle_transition.o(.text);
-        asm/battle_controller_link_partner.o(.text);
+        src/battle_controller_link_partner.o(.text);
         asm/battle_message.o(.text);
         src/math_util.o(.text);
         src/roulette_util.o(.text);
@@ -426,7 +426,8 @@ SECTIONS {
         src/battle_records.o(.rodata);
         data/data_83F5738.o(.rodata.83F6C90);
         src/battle_transition.o(.rodata);
-        data/data_83F5738.o(.rodata.83FB134);
+        src/battle_controller_link_partner.o(.rodata);
+        data/data_83F5738.o(.rodata.83FB218);
         src/save.o(.rodata);
         data/data_83FECCC.o(.rodata);
         src/battle_controller_safari.o(.rodata);

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"