diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-01-17 19:40:35 -0500 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-01-17 19:40:35 -0500 |
| commit | 5d8db75db9f80785d1b6916418ad22f20b8ff90d (patch) | |
| tree | 514b137a5a95ab5d75d6d04d685d9f4e4f7d37eb /ld_script.txt | |
| parent | 449d64593690fd95e58f09c245c7b0f034ce57df (diff) | |
| parent | 24e0edee9f428a68715c47051ebba3cda5a3e5a7 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into dump_pokenav.s
Diffstat (limited to 'ld_script.txt')
| -rw-r--r-- | ld_script.txt | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/ld_script.txt b/ld_script.txt index ae8dd057d..68365e252 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -197,7 +197,7 @@ SECTIONS { src/coins.o(.text); src/landmark.o(.text); asm/fldeff_strength.o(.text); - asm/battle_transition.o(.text); + src/battle_transition.o(.text); src/battle_controller_link_partner.o(.text); src/battle_message.o(.text); asm/cable_car.o(.text); @@ -275,7 +275,6 @@ SECTIONS { asm/trainer_rematch.o(.text); asm/unk_sprite_file.o(.text); asm/unk_transition.o(.text); - asm/unk_transition_2.o(.text); src/international_string_util.o(.text); asm/international_string_util.o(.text); } =0 @@ -482,7 +481,7 @@ SECTIONS { data/roulette.o(.rodata); data/pokedex_cry_screen.o(.rodata); src/landmark.o(.rodata); - data/battle_transition.o(.rodata); + src/battle_transition.o(.rodata); src/battle_controller_link_partner.o(.rodata); src/battle_message.o(.rodata); data/cable_car.o(.rodata); |