Merge branch 'master' into decompile_battle_interface

2017-10-18 23:05:55 +02:00
parent 25a9c851cf 0f0ba1e28c
commit 7c24b03742
5 changed files with 77 additions and 132 deletions
@@ -264,6 +264,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