diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-03-09 22:54:57 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-03-09 22:54:57 +0100 |
| commit | 711a345fd43da3edf0d1eed99e9df646c436ba16 (patch) | |
| tree | e8fa8e32ed217ccd7f8d46e333bedfdd9977a3d7 /ld_script.txt | |
| parent | 70ec55386ce640b6844f7c0bf93a7a447888cb66 (diff) | |
| parent | ae214eca8b9086db64af3741aecaf05acf007b96 (diff) | |
fix conflicts
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 ceb12540c..7ead2a863 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -247,7 +247,7 @@ SECTIONS { src/menu.o(.text); asm/battle_frontier_2.o(.text); src/item_menu.o(.text); - asm/list_menu.o(.text); + src/list_menu.o(.text); asm/menu_indicators.o(.text); src/unk_text_util.o(.text); src/save_location.o(.text); |