diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-27 20:06:38 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-27 20:06:38 -0500 |
| commit | 41eb2ed59e3a54819ccf7ef6dbdcde3215331a3f (patch) | |
| tree | 62d368f42e177673f4bb99beb7f571f231142ea7 /ld_script.txt | |
| parent | da04898840083653835db7ca997b6d57f1d3c353 (diff) | |
| parent | 18c6b8efc21a509121ab4d6f5b9c8523689d27a2 (diff) | |
Merge branch 'master' into coins
Diffstat (limited to 'ld_script.txt')
| -rw-r--r-- | ld_script.txt | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/ld_script.txt b/ld_script.txt index 5292183c3..d6dd9341b 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -83,10 +83,8 @@ SECTIONS { asm/smokescreen.o(.text); asm/pokeball.o(.text); src/load_save.o(.text); - asm/load_save.o(.text); asm/trade.o(.text); src/berry_blender.o(.text); - asm/berry_blender.o(.text); src/play_time.o(.text); src/new_game.o(.text); asm/rom4.o(.text); @@ -243,7 +241,7 @@ SECTIONS { asm/item_menu.o(.text); asm/list_menu.o(.text); asm/menu_indicators.o(.text); - asm/unk_text_util.o(.text); + src/unk_text_util.o(.text); src/save_location.o(.text); asm/item_icon.o(.text); asm/party_menu.o(.text); |