diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-05-11 09:25:26 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-05-11 09:25:26 -0400 |
| commit | 4488bbe9e69a8551cb5bb34e70b8ffb9d8e554db (patch) | |
| tree | d9c5a70fd1c4f42dc29f43becd142cc89456f19d /ld_script.txt | |
| parent | c15b50ac686632130512de37d01037bff6e10cd2 (diff) | |
| parent | 3e93615e38842643b8dd115c1fd2e0b4a0dbcd01 (diff) | |
Merge branch 'master' into contest
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 5cbf62f2d..cd4893cad 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -121,7 +121,7 @@ SECTIONS { asm/cable_club.o(.text); src/trainer_see.o(.text); src/wild_encounter.o(.text); - asm/field_effect.o(.text); + src/field_effect.o(.text); src/scanline_effect.o(.text); src/option_menu.o(.text); src/pokedex.o(.text); @@ -423,7 +423,7 @@ SECTIONS { data/cable_club.o(.rodata); src/trainer_see.o(.rodata); src/wild_encounter.o(.rodata); - data/field_effect.o(.rodata); + src/field_effect.o(.rodata); src/option_menu.o(.rodata); src/pokedex.o(.rodata); data/pokedex.o(.rodata); |