summaryrefslogtreecommitdiff
path: root/ld_script.txt
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2018-01-04 22:22:35 -0500
committerPikalaxALT <pikalaxalt@gmail.com>2018-01-04 22:22:35 -0500
commita269efbcf3cfa8df6a285d01a286933804103bd5 (patch)
tree42651b5ebe89ef42cd7b6ae24033ca21c13f9c12 /ld_script.txt
parent5f6867767ca6dfa9496816421242ad4d563e1758 (diff)
parentf0e98a9204bf19981c0c9652bc9ed82ae95438e4 (diff)
Merge branch 'master' into use_agbcc_libc
Diffstat (limited to 'ld_script.txt')
-rw-r--r--ld_script.txt5
1 files changed, 1 insertions, 4 deletions
diff --git a/ld_script.txt b/ld_script.txt
index aef34202a..3d63bca17 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -319,10 +319,7 @@ SECTIONS {
src/scene/cute_sketch.o(.text);
asm/cute_sketch.o(.text);
src/field/decoration.o(.text);
- asm/slot_machine.o(.text);
src/field/slot_machine.o(.text);
- asm/slot_machine.o(.text_8104D30)
- src/field/slot_machine.o(.text_b);
src/scene/contest_painting.o(.text);
src/battle/battle_ai.o(.text);
src/field/trader.o(.text);
@@ -554,7 +551,7 @@ SECTIONS {
src/field/region_map.o(.rodata);
data/cute_sketch.o(.rodata);
src/field/decoration.o(.rodata);
- data/slot_machine.o(.rodata);
+ src/field/slot_machine.o(.rodata);
src/scene/contest_painting.o(.rodata);
src/battle/battle_ai.o(.rodata);
src/field/trader.o(.rodata);