diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2018-05-10 18:38:24 -0500 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2018-05-10 18:38:24 -0500 |
| commit | 2b6d2dfadd00d88c5193c63da4da46e73f791549 (patch) | |
| tree | 2650fcf5b16620bb315581e9cf790f2cf716956b /ld_script.txt | |
| parent | 416d67c8325758d01decad6e5648263aa7e906df (diff) | |
| parent | 7defc27b994069715e5749245700d20dd740e4f0 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald
Diffstat (limited to 'ld_script.txt')
| -rw-r--r-- | ld_script.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ld_script.txt b/ld_script.txt index fc6385cd8..cf218af51 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -161,7 +161,7 @@ SECTIONS { src/bike.o(.text); asm/easy_chat.o(.text); src/mon_markings.o(.text); - asm/mauville_old_man.o(.text); + src/mauville_old_man.o(.text); src/mail.o(.text); asm/menu_helpers.o(.text); src/dewford_trend.o(.text); @@ -454,7 +454,7 @@ SECTIONS { src/bike.o(.rodata); data/easy_chat.o(.rodata); src/mon_markings.o(.rodata); - data/mauville_old_man.o(.rodata); + src/mauville_old_man.o(.rodata); src/mail.o(.rodata); data/menu_helpers.o(.rodata); src/heal_location.o(.rodata); |