diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-07-23 15:48:11 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-07-23 15:48:11 -0400 |
| commit | 0352a72d2ef5f820d6e8c4ad1806f5a8128b6d2f (patch) | |
| tree | 1cda7283e7e7ac4678a14843a30d2519a37d3b34 /ld_script.txt | |
| parent | e3993e2b34282933f149b85a4cfe7f45e051b504 (diff) | |
| parent | e4acfdf20b7d56b83cee6f4e49b257a2ecb92a95 (diff) | |
Merge branch 'master' of github.com:pret/pokefirered
Diffstat (limited to 'ld_script.txt')
| -rw-r--r-- | ld_script.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ld_script.txt b/ld_script.txt index bf6ddadc4..c6b35f651 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -76,7 +76,6 @@ SECTIONS { asm/battle_ai_switch_items.o(.text); asm/battle_controller_link_opponent.o(.text); src/pokemon.o(.text); - asm/pokemon_3.o(.text); src/trig.o(.text); src/random.o(.text); src/util.o(.text); @@ -381,6 +380,7 @@ SECTIONS { src/bg_regs.o(.rodata); src/string_util.o(.rodata); data/data.o(.rodata); + src/pokemon.o(.rodata); src/trig.o(.rodata); src/util.o(.rodata); src/daycare.o(.rodata); |