summaryrefslogtreecommitdiff
path: root/ld_script.txt
diff options
context:
space:
mode:
Diffstat (limited to 'ld_script.txt')
-rw-r--r--ld_script.txt9
1 files changed, 5 insertions, 4 deletions
diff --git a/ld_script.txt b/ld_script.txt
index db160d60a..c895c4d06 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -54,7 +54,7 @@ SECTIONS {
src/battle_2.o(.text);
asm/battle_2.o(.text);
asm/battle_3.o(.text);
- asm/battle_4.o(.text);
+ src/battle_4.o(.text);
asm/battle_5.o(.text);
src/battle_6.o(.text);
src/battle_7.o(.text);
@@ -237,7 +237,6 @@ SECTIONS {
src/unused_8124F94.o(.text);
src/save.o(.text);
src/mystery_event_script.o(.text);
- asm/mystery_event_script.o(.text);
asm/field_effect_helpers.o(.text);
asm/contest_ai.o(.text);
asm/battle_anim_81258BC.o(.text);
@@ -286,7 +285,7 @@ SECTIONS {
data/battle_scripts_2.o(script_data);
data/battle_ai_scripts.o(script_data);
data/contest_ai_scripts.o(script_data);
- data/script_funcs.o(script_data);
+ data/mystery_event_script_cmd_table.o(script_data);
} =0
lib_text :
@@ -330,7 +329,9 @@ SECTIONS {
src/link.o(.rodata);
src/rtc.o(.rodata);
data/main_menu.o(.rodata);
- data/data2.o(.rodata);
+ data/data2a.o(.rodata);
+ src/battle_4.o(.rodata);
+ data/data2b.o(.rodata);
src/pokemon_data.o(.rodata);
. = ALIGN(4);
src/trig.o(.rodata);