Merge branch 'master' into decomp_battle2

2017-10-06 17:07:56 +02:00
parent 3cc20c7c3f 1bd7739ea6
commit 19e2255c34
7 changed files with 592 additions and 636 deletions
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -222,7 +222,7 @@ SECTIONS {
        asm/berry_tag_screen.o(.text);
        asm/mystery_event_menu.o(.text);
        asm/save_failed_screen.o(.text);
-        asm/braille_puzzles.o(.text);
+        src/braille_puzzles.o(.text);
        asm/pokeblock_feed.o(.text);
        asm/clear_save_data_screen.o(.text);
        asm/intro_credits_graphics.o(.text);