Merge remote-tracking branch 'origin/master' into field_specials

1 files changed, 2 insertions, 2 deletions

diff --git a/ld_script.txt b/ld_script.txt
index 5112e39ea..fd946156f 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);
@@ -338,7 +338,7 @@ SECTIONS {
         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);