diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-12-18 05:31:39 -0500 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-12-18 05:31:39 -0500 |
| commit | c259ee46d3e0b0fc7e9a43e6448ef74247fedbf0 (patch) | |
| tree | 7a4e53444248dd49aacbbf23a3af9f91cca8ef24 /ld_script.txt | |
| parent | 076d07f6fe24691d6d9d8872c049b18e2e16fa57 (diff) | |
| parent | c74468fd11b551e1babf18a4d320e114fe495bd8 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_party_menu
Diffstat (limited to 'ld_script.txt')
| -rw-r--r-- | ld_script.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ld_script.txt b/ld_script.txt index 1b6efb504..1d86a44ca 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -158,10 +158,10 @@ SECTIONS { asm/contest_link_80FC4F4.o(.text); src/item_use.o(.text); src/battle_anim_effects_1.o(.text); - asm/battle_anim_effects_2.o(.text); + src/battle_anim_effects_2.o(.text); asm/water.o(.text); src/fire.o(.text); - asm/electric.o(.text); + src/electric.o(.text); asm/ice.o(.text); src/fight.o(.text); src/poison.o(.text); @@ -485,7 +485,7 @@ SECTIONS { src/rotating_gate.o(.rodata); src/item_use.o(.rodata); src/battle_anim_effects_1.o(.rodata); - src/effects_2.o(.rodata); + src/battle_anim_effects_2.o(.rodata); src/water.o(.rodata); src/fire.o(.rodata); src/electric.o(.rodata); |