diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-07-20 12:41:34 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-20 12:41:34 -0400 |
| commit | e4acfdf20b7d56b83cee6f4e49b257a2ecb92a95 (patch) | |
| tree | 4346f5efdcea0f2adf207bc769488d3f129016fe /ld_script.txt | |
| parent | e13e7eccafdc48b648bf20f8e02f72130c51d1ab (diff) | |
| parent | 9054fa32a01e102e668d1668c4e3893f2faffde8 (diff) | |
Merge pull request #82 from jiangzhengwenjz/pokemon
pokemon
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); |