diff options
| author | Marco Willems (M17.1) <progreon@gmail.com> | 2018-01-06 00:07:36 +0100 |
|---|---|---|
| committer | Marco Willems (M17.1) <progreon@gmail.com> | 2018-01-06 00:07:36 +0100 |
| commit | 6fae3c9b75221ac611871fe5ec4bca057f6f79a2 (patch) | |
| tree | 051f350cbce1c2547902fe8982fcda4b55f89bc1 /ld_script.txt | |
| parent | 0bbbc1c6dfc6c2b8646276de94cedab9ddc8bc4b (diff) | |
| parent | f5fbe5b66226f4e7e38fe5d4638831d1ce19b36b (diff) | |
Merge branch 'master' into battle_anim
Diffstat (limited to 'ld_script.txt')
| -rw-r--r-- | ld_script.txt | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/ld_script.txt b/ld_script.txt index 4eeaab513..2a7164635 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -320,10 +320,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); @@ -434,7 +431,9 @@ SECTIONS { tools/agbcc/lib/libgcc.a:fp-bit.o(.text); tools/agbcc/lib/libgcc.a:_lshrdi3.o(.text); tools/agbcc/lib/libgcc.a:_negdi2.o(.text); - src/libs/libc.o(.text); + tools/agbcc/lib/libc.a:memcpy.o(.text); + tools/agbcc/lib/libc.a:memset.o(.text); + tools/agbcc/lib/libc.a:strcmp.o(.text); } =0 .rodata : @@ -553,7 +552,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); |