summaryrefslogtreecommitdiff
path: root/ld_script.txt
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@users.noreply.github.com>2019-04-11 13:21:26 -0400
committerGitHub <noreply@github.com>2019-04-11 13:21:26 -0400
commitc17af4853c5c5854170702292ebd573bc14b5b0e (patch)
tree4b10ee7f38e45cf1c0f74eafb1274afe70405155 /ld_script.txt
parent7f920b887f9a060524347b4cc3a5e3f3abdd3b03 (diff)
parent18b20721d91e811595491d70e9512ace654e4f5a (diff)
Merge pull request #46 from PikalaxALT/oak_speech
Oak speech
Diffstat (limited to 'ld_script.txt')
-rw-r--r--ld_script.txt5
1 files changed, 3 insertions, 2 deletions
diff --git a/ld_script.txt b/ld_script.txt
index b342f0b8a..d5ed81e21 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -128,7 +128,7 @@ SECTIONS {
asm/trainer_see.o(.text);
asm/wild_encounter.o(.text);
asm/field_effect.o(.text);
- asm/unknown_task.o(.text);
+ src/scanline_effect.o(.text);
asm/option_menu.o(.text);
asm/pokedex.o(.text);
asm/trainer_card.o(.text);
@@ -228,7 +228,7 @@ SECTIONS {
src/quest_log_battle.o(.text);
src/fame_checker.o(.text);
asm/menu2.o(.text);
- asm/oak_speech.o(.text);
+ src/oak_speech.o(.text);
asm/tm_case.o(.text);
asm/menu_indicators.o(.text);
asm/pokedex_area_markers.o(.text);
@@ -382,6 +382,7 @@ SECTIONS {
src/quest_log.o(.rodata);
data/data_83FECCC.o(.rodata.8456C74);
src/fame_checker.o(.rodata);
+ src/oak_speech.o(.rodata);
data/data_845FD54.o(.rodata);
src/mevent.o(.rodata);
src/mevent_server_helpers.o(.rodata);