summaryrefslogtreecommitdiff
path: root/ld_script.txt
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@users.noreply.github.com>2019-07-30 19:39:07 -0400
committerGitHub <noreply@github.com>2019-07-30 19:39:07 -0400
commit1a34a06758175b4d39ee0a81c3441ac958d005fd (patch)
tree6d45cd2c009eabf36e6a34550607bfa80cad5ed9 /ld_script.txt
parentd4cc0e161bf103d3d3e01fefa02e867d4a2053c2 (diff)
parentd4ace1162fd85d0531da5bf2296102bf1f503073 (diff)
Merge pull request #84 from jiangzhengwenjz/battle_transition
battle_transition
Diffstat (limited to 'ld_script.txt')
-rw-r--r--ld_script.txt4
1 files changed, 3 insertions, 1 deletions
diff --git a/ld_script.txt b/ld_script.txt
index c6b35f651..d9506d33f 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);