diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-02 07:59:29 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-02 07:59:29 -0400 |
| commit | ab3b8cd51a88f02dbdb72c276a1c35591e8331f4 (patch) | |
| tree | 29d5e0c8c1aa2ddd211b65c0160af98044d76678 /ld_script.txt | |
| parent | 6543d7f2d6e7e12e159588f494895ba02b7d5090 (diff) | |
| parent | af197ccd3bd62fab813154dc4311e65f9992a676 (diff) | |
Merge branch 'master' into heal_location
Diffstat (limited to 'ld_script.txt')
| -rw-r--r-- | ld_script.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ld_script.txt b/ld_script.txt index 116023c56..5fef46a46 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -147,7 +147,7 @@ SECTIONS { src/money.o(.text); asm/contest_effect.o(.text); asm/record_mixing.o(.text); - asm/secret_base.o(.text); + src/secret_base.o(.text); src/tv.o(.text); asm/contest_link_80F57C4.o(.text); asm/script_pokemon_util_80F87D8.o(.text); @@ -226,7 +226,7 @@ SECTIONS { src/clear_save_data_screen.o(.text); asm/intro_credits_graphics.o(.text); src/evolution_graphics.o(.text); - asm/bard_music.o(.text); + src/bard_music.o(.text); asm/fldeff_teleport.o(.text); asm/battle_link_817C95C.o(.text); asm/pokemon_animation.o(.text); @@ -394,7 +394,7 @@ SECTIONS { src/money.o(.rodata); data/contest_effect.o(.rodata); data/record_mixing.o(.rodata); - data/secret_base.o(.rodata); + src/secret_base.o(.rodata); src/tv.o(.rodata); data/contest_link_80F57C4.o(.rodata); data/script_pokemon_util_80F87D8.o(.rodata); @@ -448,7 +448,7 @@ SECTIONS { src/clear_save_data_screen.o(.rodata); data/intro_credits_graphics.o(.rodata); src/evolution_graphics.o(.rodata); - data/bard_music.o(.rodata); + src/bard_music.o(.rodata); data/data_860A4AC.o(.rodata); src/battle_controller_recorded_opponent.o(.rodata); src/battle_controller_recorded_player.o(.rodata); |