Merge branch 'master' into decomp_berry

1 files changed, 2 insertions, 1 deletions

diff --git a/ld_script.txt b/ld_script.txt
index 5ff90ee52..d97480010 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -76,7 +76,7 @@ SECTIONS {
         asm/pokemon_3.o(.text);
         src/trig.o(.text);
         src/rng.o(.text);
-        asm/util.o(.text);
+        src/util.o(.text);
         src/blend_palette.o(.text);
         asm/daycare.o(.text);
         asm/egg_hatch.o(.text);
@@ -303,6 +303,7 @@ SECTIONS {
         data/battle_controller_link_opponent.o(.rodata);
         data/data2c.o(.rodata);
         src/trig.o(.rodata);
+        src/util.o(.rodata);
         data/data3.o(.rodata);
         src/berry.o(.rodata);
         data/data3_a1.o(.rodata);