Merge pull request #2 from pret/master

be up to date with master2

1 files changed, 3 insertions, 3 deletions

diff --git a/ld_script.txt b/ld_script.txt
index b20e05223..281f1781d 100755
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -78,7 +78,7 @@ SECTIONS {
         asm/egg_hatch.o(.text);
         src/battle_interface.o(.text);
         src/smokescreen.o(.text);
-        asm/pokeball.o(.text);
+        src/pokeball.o(.text);
         src/load_save.o(.text);
         asm/trade.o(.text);
         asm/berry_blender.o(.text);
@@ -334,12 +334,12 @@ SECTIONS {
         data/data2.o(.rodata);
         data/pokemon.o(.rodata);
         . = ALIGN(4);
-        data/trig.o(.rodata);
+        src/trig.o(.rodata);
         data/util.o(.rodata);
         data/daycare.o(.rodata);
         data/egg_hatch.o(.rodata);
         data/battle_interface.o(.rodata);
-        data/pokeball.o(.rodata);
+        src/pokeball.o(.rodata);
         data/trade.o(.rodata);
         data/berry_blender.o(.rodata);
         src/new_game.o(.rodata);