Merge branch 'master' into mail

2017-10-19 18:45:38 -04:00
parent a252140f3b 8ceecd9fba
commit 7bc152e2ed
41 changed files with 1938 additions and 4083 deletions
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -54,7 +54,7 @@ SECTIONS {
        asm/link.o(.text);
        src/rtc.o(.text);
        asm/main_menu.o(.text);
-        asm/rom3.o(.text);
+        src/battle_controllers.o(.text);
        src/decompress.o(.text);
        asm/battle_1.o(.text);
        src/battle_2.o(.text);
@@ -263,6 +263,7 @@ SECTIONS {
        asm/unk_sprite_file.o(.text);
        asm/unk_transition.o(.text);
        asm/unk_transition_2.o(.text);
+        src/international_string_util.o(.text);
        asm/international_string_util.o(.text);
    } =0