diff options
author | Diegoisawesome <diego@domoreaweso.me> | 2018-11-06 11:33:21 -0600 |
---|---|---|
committer | Diegoisawesome <diego@domoreaweso.me> | 2018-11-06 11:33:21 -0600 |
commit | 43a8534fced2c4327acdd8dc9690f5bc6751e2db (patch) | |
tree | 33797ee29121db198f87afe10e4f2d27bc5cc9ec /ld_script.txt | |
parent | f8d337e491f531285f6067e2e7f39a8d606036d6 (diff) | |
parent | 32d2640dc728055923b0e6120277093fcae5e9c3 (diff) |
Merge remote-tracking branch 'origin/master' into render_text
Diffstat (limited to 'ld_script.txt')
-rw-r--r-- | ld_script.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ld_script.txt b/ld_script.txt index 427313081..dad5b79cc 100644 --- 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); |