Merge branch 'master' into lilycove_lady

1 files changed, 2 insertions, 3 deletions

diff --git a/ld_script.txt b/ld_script.txt
index 4a07cf85e..392946e70 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -239,9 +239,8 @@ SECTIONS {
         asm/recorded_battle.o(.text);
         asm/battle_controller_recorded_opponent.o(.text);
         asm/battle_controller_recorded_player.o(.text);
-        asm/battle_dome_cards.o(.text);
+        src/battle_dome_cards.o(.text);
         src/lilycove_lady.o(.text);
-        asm/lilycove_lady.o(.text);
         asm/battle_frontier_1.o(.text);
         asm/new_menu_helpers.o(.text);
         asm/menu.o(.text);
@@ -379,7 +378,7 @@ SECTIONS {
         data/data_860A4AC.o(.rodata);
         data/battle_controller_recorded_opponent.o(.rodata);
         data/battle_controller_recorded_player.o(.rodata);
-        data/data_emerald.o(.rodata.deleteme);
+        src/battle_dome_cards.o(.rodata);
         src/lilycove_lady.o(.rodata);
         data/data_emerald.o(.rodata);
         data/battle_controller_player_partner.o(.rodata);