Merge branch 'master' into learn

1 files changed, 2 insertions, 2 deletions

diff --git a/ld_script.txt b/ld_script.txt
index 2711044c8..8436904e2 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -165,12 +165,12 @@ SECTIONS {
         src/fight.o(.text);
         src/poison.o(.text);
         asm/flying.o(.text);
-        asm/psychic.o(.text);
+        src/psychic.o(.text);
         src/bug.o(.text);
         src/rock.o(.text);
         src/ghost.o(.text);
         src/dragon.o(.text);
-        asm/dark.o(.text);
+        src/dark.o(.text);
         src/ground.o(.text);
         src/normal.o(.text);
         src/battle_anim_utility_funcs.o(.text);