Merge branch 'master' into decomp_berry

2017-09-13 10:03:07 +02:00
parent 625b1b6949 0918cadae3
commit a83d07e1b3
53 changed files with 1012 additions and 1446 deletions
@@ -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);