diff options
| author | garak <garakmon@gmail.com> | 2018-10-17 12:30:45 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-17 12:30:45 -0400 |
| commit | 7d88b9647f92d099177fc734f32e94fc472f2cbf (patch) | |
| tree | 3b3d6ea2a092b2fd482d03145094689a05ec1b92 /ld_script.txt | |
| parent | ff97873c309e28beec91efe11393c093a08b19d3 (diff) | |
| parent | f67bbbdaaa905833f1c2a315624128aafef9a4cb (diff) | |
Merge branch 'master' into event-flags
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 50ce3bb6d..9592d5cf6 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -99,7 +99,7 @@ SECTIONS { src/text_window.o(.text); src/script.o(.text); src/scrcmd.o(.text); - asm/field_control_avatar.o(.text); + src/field_control_avatar.o(.text); src/event_data.o(.text); src/coord_event_weather.o(.text); src/field_tasks.o(.text); |