summaryrefslogtreecommitdiff
path: root/ld_script.txt
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2017-09-20 23:37:59 -0400
committerGitHub <noreply@github.com>2017-09-20 23:37:59 -0400
commited9e0e20547e2c96833cddea67c6b423ef7af7ef (patch)
treee9666a04c3fd57eedd27a341a94fcf57150fd822 /ld_script.txt
parent40c1e81d03f4e4fc21675564ca5b879a577a399e (diff)
parent27903a102b3b99da6fb8f0a18957598bff65b428 (diff)
Merge pull request #37 from PikalaxALT/berry_fix_program
Berry fix program
Diffstat (limited to 'ld_script.txt')
-rw-r--r--ld_script.txt4
1 files changed, 3 insertions, 1 deletions
diff --git a/ld_script.txt b/ld_script.txt
index 392946e70..177f36888 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -259,7 +259,7 @@ SECTIONS {
asm/battle_controller_player_partner.o(.text);
asm/fldeff_groundshake.o(.text);
asm/fossil_specials.o(.text);
- asm/berry_fix_program.o(.text);
+ src/berry_fix_program.o(.text);
asm/pokemon_summary_screen.o(.text);
asm/pokenav.o(.text);
asm/rayquaza_scene.o(.text);
@@ -382,6 +382,8 @@ SECTIONS {
src/lilycove_lady.o(.rodata);
data/data_emerald.o(.rodata);
data/battle_controller_player_partner.o(.rodata);
+ data/data_emerald2pre1.o(.rodata);
+ src/berry_fix_program.o(.rodata);
data/data_emerald2.o(.rodata);
data/fonts.o(.rodata);
data/mystery_event_msg.o(.rodata);