diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-14 10:53:36 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-14 10:53:36 -0500 |
| commit | 1ff1e8ce9547d646b17b135b3013a516d17f35db (patch) | |
| tree | c23fbb425b230e81529932482ddb0fe7fc6a1376 /ld_script.txt | |
| parent | daa0a98ee0129be1797274de318a35df30d39020 (diff) | |
| parent | b9388f078ed95e80ac73b35eeb206e52ce376b0c (diff) | |
Merge branch 'master' into pokemon_storage_system
Diffstat (limited to 'ld_script.txt')
| -rw-r--r-- | ld_script.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ld_script.txt b/ld_script.txt index b0b5d4796..5791fbc78 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -305,7 +305,7 @@ SECTIONS { asm/dark.o(.text); asm/ground.o(.text); asm/normal.o(.text); - asm/battle_intro.o(.text); + src/battle/anim/battle_intro.o(.text); src/field/bike.o(.text); src/easy_chat_1.o(.text); src/easy_chat_2.o(.text); @@ -582,6 +582,7 @@ SECTIONS { src/field/rotating_gate.o(.rodata); src/field/item_use.o(.rodata); data/battle_anim_80CA710.o(.rodata); + src/battle/anim/battle_intro.o(.rodata); src/field/bike.o(.rodata); src/easy_chat_1.o(.rodata); src/easy_chat_2.o(.rodata); |