Merge remote-tracking branch 'pret/master'

2017-09-16 03:21:42 -05:00
parent 448497dfbb 78009a835f
commit 6ba1dc8169
58 changed files with 1542 additions and 1925 deletions
@@ -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);
@@ -99,7 +99,7 @@ SECTIONS {
        asm/field_message_box.o(.text);
        asm/map_obj_lock.o(.text);
        src/text_window.o(.text);
-        asm/script.o(.text);
+        src/script.o(.text);
        asm/scrcmd.o(.text);
        asm/field_control_avatar.o(.text);
        src/event_data.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/pokemon_size_record.o(.rodata)
        data/data3b.o(.rodata);