diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-10-13 12:55:06 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-13 12:55:06 -0500 |
| commit | 32fbf67d479c15351c718851412d84b4925acfdf (patch) | |
| tree | e15fd2a025a49d29d9ff770ccbb8639aa3ffcc2c /ld_script.txt | |
| parent | b24559d69b6fa0abf042a1b7cdbcab3d1ec91fd6 (diff) | |
| parent | 0c1d33da4f6db7b90913586a39ed60ea2b13f39e (diff) | |
Merge branch 'master' into shop
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 336c96d1e..1be83563e 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -118,7 +118,7 @@ SECTIONS { src/title_screen.o(.text); asm/field_screen.o(.text); src/battle_setup.o(.text); - asm/cable_club.o(.text); + src/cable_club.o(.text); src/trainer_see.o(.text); src/wild_encounter.o(.text); src/field_effect.o(.text); @@ -428,7 +428,7 @@ SECTIONS { src/title_screen.o(.rodata); data/field_screen.o(.rodata); src/battle_setup.o(.rodata); - data/cable_club.o(.rodata); + src/cable_club.o(.rodata); src/trainer_see.o(.rodata); src/wild_encounter.o(.rodata); src/field_effect.o(.rodata); |