summaryrefslogtreecommitdiff
path: root/ld_script.txt
diff options
context:
space:
mode:
authorDiegoisawesome <diego@domoreaweso.me>2017-09-16 03:21:42 -0500
committerDiegoisawesome <diego@domoreaweso.me>2017-09-16 03:21:42 -0500
commit6ba1dc8169f148adc9f7f68fec0490dc017c892a (patch)
tree7dfe1cc18efed9adff4c24f279586b369554b434 /ld_script.txt
parent448497dfbbc1157c640bc09745454b3c97dc947e (diff)
parent78009a835f840864b3d30af00c65a745f75b80fa (diff)
Merge remote-tracking branch 'pret/master'
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 d7e038996..d05b56fb6 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -76,7 +76,7 @@ SECTIONS {
asm/pokemon_3.o(.text);
src/trig.o(.text);
src/rng.o(.text);
- asm/util.o(.text);
+ src/util.o(.text);
src/blend_palette.o(.text);
asm/daycare.o(.text);
asm/egg_hatch.o(.text);
@@ -99,7 +99,7 @@ SECTIONS {
asm/field_message_box.o(.text);
asm/map_obj_lock.o(.text);
src/text_window.o(.text);
- asm/script.o(.text);
+ src/script.o(.text);
asm/scrcmd.o(.text);
asm/field_control_avatar.o(.text);
src/event_data.o(.text);
@@ -303,6 +303,7 @@ SECTIONS {
data/battle_controller_link_opponent.o(.rodata);
data/data2c.o(.rodata);
src/trig.o(.rodata);
+ src/util.o(.rodata);
data/data3.o(.rodata);
src/pokemon_size_record.o(.rodata)
data/data3b.o(.rodata);