diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-12-09 08:59:59 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-12-09 08:59:59 -0500 |
| commit | 9d70b8a4d9fc69064b5a0bde6670b4aaca25cf5e (patch) | |
| tree | 4f0f3dc6ac18497b1452a02ab55490fce1f89e74 /ld_script.txt | |
| parent | 7871a505b39e5452f0a39f96ce2deea810099906 (diff) | |
| parent | f21b113bc6caee136d696aadfe8dc13d6e8f3622 (diff) | |
Merge branch 'master' of github.com:pret/pokefirered into pokedex_screen
Diffstat (limited to 'ld_script.txt')
| -rw-r--r-- | ld_script.txt | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/ld_script.txt b/ld_script.txt index e46625ad3..f6da871fb 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -111,11 +111,11 @@ SECTIONS { src/tileset_anims.o(.text); src/palette.o(.text); src/sound.o(.text); - asm/battle_anim.o(.text); + src/battle_anim.o(.text); src/battle_anim_mons.o(.text); src/task.o(.text); src/reshow_battle_screen.o(.text); - asm/battle_anim_status_effects.o(.text); + src/battle_anim_status_effects.o(.text); src/title_screen.o(.text); src/reset_save_heap.o(.text); asm/field_weather.o(.text); @@ -155,8 +155,8 @@ SECTIONS { src/field_special_scene.o(.text); src/safari_zone.o(.text); src/item_use.o(.text); - asm/battle_anim_effects_1.o(.text); - asm/battle_anim_effects_2.o(.text); + src/battle_anim_effects_1.o(.text); + src/battle_anim_effects_2.o(.text); asm/water.o(.text); src/fire.o(.text); src/electric.o(.text); @@ -206,14 +206,14 @@ SECTIONS { src/battle_anim_sound_tasks.o(.text); src/battle_controller_safari.o(.text); src/fldeff_sweetscent.o(.text); - asm/battle_anim_effects_3.o(.text); + src/battle_anim_effects_3.o(.text); src/learn_move.o(.text); src/fldeff_softboiled.o(.text); src/battle_tower.o(.text); src/battle_controller_oak_old_man.o(.text); src/player_pc.o(.text); src/intro.o(.text); - asm/battle_anim_special.o(.text); + src/battle_anim_special.o(.text); src/hall_of_fame.o(.text); src/credits.o(.text); src/diploma.o(.text); @@ -422,10 +422,10 @@ SECTIONS { src/tileset_anims.o(.rodata); src/palette.o(.rodata); src/sound.o(.rodata); - data/battle_anim.o(.rodata); + src/battle_anim.o(.rodata); src/battle_anim_mons.o(.rodata); data/map_events.o(.rodata); - data/battle_anim_status_effects.o(.rodata); + src/battle_anim_status_effects.o(.rodata); src/title_screen.o(.rodata); data/field_weather.o(.rodata); data/field_screen_effect.o(.rodata); @@ -450,6 +450,8 @@ SECTIONS { data/naming_screen.o(.rodata); src/pokemon_size_record.o(.rodata); src/item_use.o(.rodata); + src/battle_anim_effects_1.o(.rodata); + src/battle_anim_effects_2.o(.rodata); data/battle_anim_effects_misc.o(.rodata); src/fire.o(.rodata); src/electric.o(.rodata); @@ -484,13 +486,13 @@ SECTIONS { src/save.o(.rodata); data/field_effect_helpers.o(.rodata); src/battle_controller_safari.o(.rodata); - data/battle_anim_effects_3.o(.rodata); + src/battle_anim_effects_3.o(.rodata); src/learn_move.o(.rodata); src/battle_tower.o(.rodata); src/battle_controller_oak_old_man.o(.rodata); src/player_pc.o(.rodata); src/intro.o(.rodata); - data/battle_anim_special.o(.rodata); + src/battle_anim_special.o(.rodata); src/hall_of_fame.o(.rodata); src/credits.o(.rodata); src/diploma.o(.rodata); |