diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2018-01-30 23:37:27 -0500 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2018-01-30 23:37:27 -0500 |
| commit | 51ade392bf16ae4c87a18f8965b8e650fe983d03 (patch) | |
| tree | abca9b93197138cc4e375c0b7ed4412d52007c0c /ld_script.txt | |
| parent | f5b348f8d0b2587145c1d17e2b35fb2c49a3fb93 (diff) | |
| parent | 2bd2dd1db7252a928a84cd65ea0510ed1533fa9b (diff) | |
Merge branch 'master' of https://github.com/pret/pokeruby
Diffstat (limited to 'ld_script.txt')
| -rw-r--r-- | ld_script.txt | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/ld_script.txt b/ld_script.txt index 1b7656f38..49078af94 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -126,9 +126,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,7 +296,7 @@ SECTIONS { asm/flying.o(.text); asm/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); @@ -551,6 +554,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); |