Merge branch 'master' into decomp_berry

2017-09-13 18:24:59 +02:00
parent a08cd8e5a7 78009a835f
commit c80b76e85a
8 changed files with 532 additions and 481 deletions
--- 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);