diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2017-09-16 14:24:47 -0500 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2017-09-16 14:24:47 -0500 |
| commit | 5a74c0e91354276a92ea01152b76a85462d30d4e (patch) | |
| tree | 8bca428892e561dcca4c75be7a91fed1406d4890 /ld_script.txt | |
| parent | 3c63063831f7d26874dc49143e2d19f6acc1be18 (diff) | |
| parent | 19d2d73c7064375e6cef64ced734052170d4361b (diff) | |
Merge remote-tracking branch 'pret/master'
Diffstat (limited to 'ld_script.txt')
| -rw-r--r-- | ld_script.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ld_script.txt b/ld_script.txt index ba20f2ad6..940616eeb 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -73,6 +73,7 @@ SECTIONS { src/pokemon_2.o(.text); asm/pokemon_2.o(.text); asm/pokemon_item_effect.o(.text); + src/pokemon_3.o(.text); asm/pokemon_3.o(.text); src/trig.o(.text); src/rng.o(.text); @@ -135,7 +136,7 @@ SECTIONS { asm/item.o(.text); asm/contest.o(.text); asm/shop.o(.text); - asm/berry.o(.text); + src/berry.o(.text); asm/script_menu.o(.text); asm/naming_screen.o(.text); src/money.o(.text); @@ -305,6 +306,8 @@ SECTIONS { src/trig.o(.rodata); src/util.o(.rodata); data/data3.o(.rodata); + src/berry.o(.rodata); + data/data3_a1.o(.rodata); src/pokemon_size_record.o(.rodata) data/data3b.o(.rodata); src/battle_ai.o(.rodata); |