diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-02-04 23:06:04 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-02-04 23:06:04 -0500 |
| commit | ecfdc57e1cff1fa34ff7edcf7524aeadbc265b69 (patch) | |
| tree | 123155f492599caf4597b6fc812a0a064d3962bd /ld_script.txt | |
| parent | 9776f51f0643a8d988fcd5fc2ac404a7ea285235 (diff) | |
| parent | f1f6c7337f4f2f002b456468b0ccc327fc494d02 (diff) | |
Merge branch 'master' into fix_nonmatching
Diffstat (limited to 'ld_script.txt')
| -rw-r--r-- | ld_script.txt | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/ld_script.txt b/ld_script.txt index fc13444f1..cb3e55242 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -128,9 +128,12 @@ SECTIONS { src/engine/save_menu_util.o(.text); src/battle/battle_party_menu.o(.text); asm/unk_text_8095904.o(.text); - asm/pokemon_storage_system.o(.text); src/pokemon/pokemon_storage_system.o(.text); - asm/pokemon_storage_system.o(.text_8098A38); + src/pokemon/pokemon_storage_system_2.o(.text); + src/pokemon/pokemon_storage_system_3.o(.text); + src/pokemon/pokemon_storage_system_4.o(.text); + src/pokemon/pokemon_storage_system_5.o(.text); + asm/pokemon_storage_system.o(.text); src/pokemon/pokemon_icon.o(.text); src/pokemon/pokemon_summary_screen.o(.text); src/field/script_movement.o(.text); @@ -293,9 +296,9 @@ SECTIONS { asm/fight.o(.text); src/battle/anim/poison.o(.text); asm/flying.o(.text); - asm/psychic.o(.text); + src/battle/anim/psychic.o(.text); src/battle/anim/bug.o(.text); - asm/rock.o(.text); + src/battle/anim/rock.o(.text); asm/ghost.o(.text); src/battle/anim/dragon.o(.text); src/battle/anim/dark.o(.text); @@ -555,6 +558,11 @@ SECTIONS { src/pokemon/pokedex.o(.rodata); src/engine/trainer_card.o(.rodata); src/battle/battle_party_menu.o(.rodata); + src/pokemon/pokemon_storage_system.o(.rodata); + src/pokemon/pokemon_storage_system_2.o(.rodata); + src/pokemon/pokemon_storage_system_3.o(.rodata); + src/pokemon/pokemon_storage_system_4.o(.rodata); + src/pokemon/pokemon_storage_system_5.o(.rodata); data/pokemon_storage_system.o(.rodata); src/pokemon/pokemon_icon.o(.rodata); src/pokemon/pokemon_summary_screen.o(.rodata); |