diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-07-30 19:40:00 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-07-30 19:40:00 -0400 |
| commit | fba22dbd24a797a45345dbc7e0ff8fb520ecba19 (patch) | |
| tree | 961ec5145112e039542f50a79032a06481cf12a0 /ld_script.txt | |
| parent | 9b3b3244f7dad9c0a1d6335a8786da1fdfedd870 (diff) | |
| parent | 1a34a06758175b4d39ee0a81c3441ac958d005fd (diff) | |
Merge branch 'master' into slot_machine
Diffstat (limited to 'ld_script.txt')
| -rw-r--r-- | ld_script.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ld_script.txt b/ld_script.txt index faa82e34e..36c882c32 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -191,7 +191,7 @@ SECTIONS { asm/evolution_scene.o(.text); src/coins.o(.text); src/fldeff_strength.o(.text); - asm/battle_transition.o(.text); + src/battle_transition.o(.text); asm/battle_controller_link_partner.o(.text); asm/battle_message.o(.text); src/math_util.o(.text); @@ -418,6 +418,8 @@ SECTIONS { data/data_83F5738.o(.rodata); src/battle_records.o(.rodata); data/data_83F5738.o(.rodata.83F6C90); + src/battle_transition.o(.rodata); + data/data_83F5738.o(.rodata.83FB134); src/save.o(.rodata); data/data_83FECCC.o(.rodata); src/intro.o(.rodata); |