summaryrefslogtreecommitdiff
path: root/ld_script.txt
diff options
context:
space:
mode:
authorProjectRevoTPP <projectrevotpp@hotmail.com>2018-10-08 18:51:14 -0400
committerProjectRevoTPP <projectrevotpp@hotmail.com>2018-10-08 18:51:14 -0400
commit967b4e6612eb7f81dfe44989c2e2c79000c7d6f3 (patch)
treedef9e67fe788da2963c41585c309b61eb109247d /ld_script.txt
parent02fb51cbe7f6016d23d01d58dcbe8f4b3786bc5e (diff)
parent10fff9c6f2d29899952d1751d3de827e7e98bb60 (diff)
merge and nonmatching PokemonUseItemEffects2
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 578a3f147..f5a685e07 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -246,7 +246,7 @@ SECTIONS {
asm/mevent.o(.text);
asm/mevent_server.o(.text);
asm/mevent_8145654.o(.text);
- asm/menews_jisan.o(.text);
+ src/menews_jisan.o(.text);
asm/seagallop.o(.text);
asm/unk_8147500.o(.text);
asm/unk_8147AA8.o(.text);
@@ -366,6 +366,8 @@ SECTIONS {
data/data.o(.rodata);
src/battle_ai_script_commands.o(.rodata);
data/data_84827AC.o(.rodata);
+ src/menews_jisan.o(.rodata);
+ data/data_84827AC.o(.rodata.8468C98);
src/m4a_tables.o(.rodata);
data/sound_data.o(.rodata);
} =0