Merge remote-tracking branch 'origin/master' into render_text

2018-11-06 11:33:21 -06:00
parent f8d337e491 32d2640dc7
commit 43a8534fce
6 changed files with 98 additions and 168 deletions
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -196,7 +196,7 @@ SECTIONS {
        src/rom6.o(.text);
        src/pokeblock.o(.text);
        src/fldeff_flash.o(.text);
-        asm/post_battle_event_funcs.o(.text);
+        src/post_battle_event_funcs.o(.text);
        src/time_events.o(.text);
        src/birch_pc.o(.text);
        src/hof_pc.o(.text);