Merge branch 'master' into decompile_rom3

2017-10-14 11:36:28 +02:00
parent 14e41d6c50 0d38d443b5
commit 455202eca0
121 changed files with 3591 additions and 9777 deletions
@@ -101,7 +101,7 @@ SECTIONS {
        asm/map_obj_lock.o(.text);
        src/text_window.o(.text);
        src/script.o(.text);
-        asm/scrcmd.o(.text);
+        src/scrcmd.o(.text);
        asm/field_control_avatar.o(.text);
        src/event_data.o(.text);
        asm/coord_event_weather.o(.text);
@@ -354,7 +354,7 @@ SECTIONS {
        data/field_ground_effect.o(.rodata);
        data/map_obj_8097404.o(.rodata);
        data/text_window.o(.rodata);
-        data/scrcmd.o(.rodata);
+        src/scrcmd.o(.rodata);
        data/coord_event_weather.o(.rodata);
        data/field_tasks.o(.rodata);
        data/reset_rtc_screen.o(.rodata);