Merge branch 'master' into quest_log

1 files changed, 1 insertions, 4 deletions

diff --git a/ld_script.txt b/ld_script.txt
index 53c8fe077..4ef96aae7 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -75,10 +75,7 @@ SECTIONS {
         asm/battle_controller_opponent.o(.text);
         asm/battle_ai_switch_items.o(.text);
         asm/battle_controller_link_opponent.o(.text);
-        asm/pokemon_1.o(.text);
-        asm/calculate_base_damage.o(.text);
-        asm/pokemon_2.o(.text);
-        asm/pokemon_item_effect.o(.text);
+        src/pokemon.o(.text);
         asm/pokemon_3.o(.text);
         asm/trig.o(.text);
         src/random.o(.text);