diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-08-12 01:30:45 -0400 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-08-12 01:30:45 -0400 |
| commit | 6695219f406722e740fff860fe8e094966565d7f (patch) | |
| tree | 058066f0002654c448447c6705b9e61c8de824e7 /ld_script.txt | |
| parent | 1a8fe435e7deabf06029c8e50201136518e3af73 (diff) | |
| parent | ea36898775f5e31c6a175251339da1ed60de218d (diff) | |
merge
Diffstat (limited to 'ld_script.txt')
| -rw-r--r-- | ld_script.txt | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ld_script.txt b/ld_script.txt index 338d8c8c7..17cc3bb13 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -53,7 +53,7 @@ SECTIONS { asm/battle_1.o(.text_800DC24); src/battle/battle_2.o(.text); asm/battle_2.o(.text); - asm/battle_3.o(.text); + src/battle/battle_3.o(.text); src/battle/battle_4.o(.text); asm/battle_5.o(.text); src/battle/battle_6.o(.text); @@ -122,7 +122,7 @@ SECTIONS { src/misc/rom_8077ABC.o(.text); src/engine/task.o(.text); asm/reshow_battle_screen.o(.text); - asm/battle_anim_807B69C.o(.text); + src/battle/battle_anim_807B69C.o(.text); src/scene/title_screen.o(.text); src/field/field_weather.o(.text); asm/field_weather.o(.text); @@ -332,6 +332,7 @@ SECTIONS { data/data2a.o(.rodata); src/battle/battle_4.o(.rodata); data/data2b.o(.rodata); + src/battle/battle_3.o(.rodata); src/pokemon/pokemon_data.o(.rodata); . = ALIGN(4); src/engine/trig.o(.rodata); @@ -372,7 +373,7 @@ SECTIONS { data/map_events.o(.rodata); data/data_8393054.o(.rodata); src/engine/task.o(.rodata); - data/battle_anim_807B69C.o(.rodata); + src/battle/battle_anim_807B69C.o(.rodata); src/scene/title_screen.o(.rodata); data/field_weather.o(.rodata); src/field/field_screen_effect.o(.rodata); |