Merge branch 'master' into decomp_pokemon

2017-09-13 18:24:01 +02:00
parent c9603c40d8 78009a835f
commit 117f8a6abd
8 changed files with 532 additions and 481 deletions
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -77,7 +77,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);
@@ -304,6 +304,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/pokemon_size_record.o(.rodata)
        data/data3a.o(.rodata)