Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_item_menu

1 files changed, 9 insertions, 11 deletions

diff --git a/ld_script.txt b/ld_script.txt
index 2aebc9adb..86e0d58d3 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -52,7 +52,10 @@ SECTIONS {
         src/text.o(.text);
         src/sprite.o(.text);
         src/string_util.o(.text);
-        asm/link.o(.text);
+        src/link.o(.text);
+        src/link_rfu.o(.text);
+        asm/link_rfu.o(.text);
+        asm/rom_8011DC0.o(.text);
         src/rtc.o(.text);
         asm/main_menu.o(.text);
         src/battle_controllers.o(.text);
@@ -68,13 +71,7 @@ SECTIONS {
         src/battle_controller_opponent.o(.text);
         src/battle_ai_switch_items.o(.text);
         src/battle_controller_link_opponent.o(.text);
-        src/pokemon_1.o(.text);
-        asm/pokemon_1.o(.text);
-        src/calculate_base_damage.o(.text);
-        src/pokemon_2.o(.text);
-        asm/pokemon_item_effect.o(.text);
-        src/pokemon_3.o(.text);
-        asm/pokemon_3.o(.text);
+        src/pokemon.o(.text);
         src/trig.o(.text);
         src/random.o(.text);
         src/util.o(.text);
@@ -370,7 +367,9 @@ SECTIONS {
         src/sprite.o(.rodata);
         data/io_reg.o(.rodata);
         src/string_util.o(.rodata);
-        data/link.o(.rodata);
+        src/link.o(.rodata);
+        src/link_rfu.o(.rodata);
+        data/rom_8011DC0.o(.rodata);
         src/rtc.o(.rodata);
         data/main_menu.o(.rodata);
         data/battle_1.o(.rodata);
@@ -383,8 +382,7 @@ SECTIONS {
         src/battle_controller_opponent.o(.rodata);
         src/battle_controller_link_opponent.o(.rodata);
         data/data2c.o(.rodata);
-        src/pokemon_1.o(.rodata);
-        data/data2e.o(.rodata);
+        src/pokemon.o(.rodata);
         src/trig.o(.rodata);
         src/util.o(.rodata);
         src/daycare.o(.rodata);