diff options
| author | paul <nintendo6496@googlemail.com> | 2018-10-11 18:56:58 +0200 |
|---|---|---|
| committer | paul <nintendo6496@googlemail.com> | 2018-10-11 18:56:58 +0200 |
| commit | 50fcc3a1e96a1e35576d2d0769aec251a40805dd (patch) | |
| tree | f100b156dfa1eb6fe773d90004d79bb246e9dcbf /ld_script.txt | |
| parent | acdd8cab26671a975b4f155b84b24388df9d84bc (diff) | |
| parent | bd88c803793a6e5c8f5d2ac1a852c912e980ef1d (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'ld_script.txt')
| -rw-r--r-- | ld_script.txt | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/ld_script.txt b/ld_script.txt index 70084ef0e..f5a685e07 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -75,10 +75,7 @@ SECTIONS { asm/battle_controller_opponent.o(.text); asm/battle_ai_switch_items.o(.text); asm/battle_controller_link_opponent.o(.text); - asm/pokemon_1.o(.text); - asm/calculate_base_damage.o(.text); - asm/pokemon_2.o(.text); - asm/pokemon_item_effect.o(.text); + src/pokemon.o(.text); asm/pokemon_3.o(.text); asm/trig.o(.text); src/random.o(.text); |