Merge branch 'master' into pokenav_match_call

1 files changed, 11 insertions, 10 deletions

diff --git a/ld_script.txt b/ld_script.txt
index 7acbd18c4..a4d60c597 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -47,7 +47,7 @@ SECTIONS {
         src/dma3_manager.o(.text);
         src/gpu_regs.o(.text);
         src/bg.o(.text);
-        asm/blit.o(.text);
+        src/blit.o(.text);
         src/window.o(.text);
         src/text.o(.text);
         src/sprite.o(.text);
@@ -180,7 +180,7 @@ SECTIONS {
         src/wallclock.o(.text);
         asm/rom6.o(.text);
         src/pokeblock.o(.text);
-        asm/fldeff_flash.o(.text);
+        src/fldeff_flash.o(.text);
         asm/post_battle_event_funcs.o(.text);
         src/time_events.o(.text);
         src/birch_pc.o(.text);
@@ -236,7 +236,7 @@ SECTIONS {
         src/evolution_graphics.o(.text);
         src/bard_music.o(.text);
         src/fldeff_teleport.o(.text);
-        asm/battle_link_817C95C.o(.text);
+        src/battle_tv.o(.text);
         src/pokemon_animation.o(.text);
         src/recorded_battle.o(.text);
         src/battle_controller_recorded_opponent.o(.text);
@@ -258,7 +258,8 @@ SECTIONS {
         src/multiboot.o(.text);
         src/unk_81BAD84.o(.text);
         src/battle_controller_player_partner.o(.text);
-        asm/fldeff_groundshake.o(.text);
+        src/fldeff_groundshake.o(.text);
+        src/fossil_specials.o(.text);
         asm/fossil_specials.o(.text);
         src/berry_fix_program.o(.text);
         src/pokemon_summary_screen.o(.text);
@@ -270,7 +271,7 @@ SECTIONS {
         src/rayquaza_scene.o(.text);
         src/walda_phrase.o(.text);
         asm/contest_link_81D9DE4.o(.text);
-        asm/trainer_rematch.o(.text);
+        src/gym_leader_rematch.o(.text);
         src/unk_transition.o(.text);
         src/international_string_util.o(.text);
         asm/international_string_util.o(.text);
@@ -384,7 +385,6 @@ SECTIONS {
         data/smokescreen.o(.rodata);
         src/battle_controller_opponent.o(.rodata);
         src/battle_controller_link_opponent.o(.rodata);
-        data/data2c.o(.rodata);
         src/pokemon.o(.rodata);
         src/trig.o(.rodata);
         src/util.o(.rodata);
@@ -472,7 +472,7 @@ SECTIONS {
         data/starter_choose.o(.rodata);
         src/wallclock.o(.rodata);
         src/pokeblock.o(.rodata);
-        data/fldeff_flash.o(.rodata);
+        src/fldeff_flash.o(.rodata);
         src/time_events.o(.rodata);
         data/field_specials.o(.rodata);
         data/battle_records.o(.rodata);
@@ -514,7 +514,7 @@ SECTIONS {
         src/intro_credits_graphics.o(.rodata);
         src/evolution_graphics.o(.rodata);
         src/bard_music.o(.rodata);
-        data/battle_link_817C95C.o(.rodata);
+        src/battle_tv.o(.rodata);
         src/pokemon_animation.o(.rodata);
         src/battle_controller_recorded_opponent.o(.rodata);
         src/battle_controller_recorded_player.o(.rodata);
@@ -533,7 +533,8 @@ SECTIONS {
         src/unk_text_util_2.o(.rodata);
         src/unk_81BAD84.o(.rodata);
         src/battle_controller_player_partner.o(.rodata);
-        data/fossil_special_fldeff_groundshake.o(.rodata);
+        src/fossil_specials.o(.rodata);
+        src/fldeff_groundshake.o(.rodata);
         src/berry_fix_program.o(.rodata);
         data/pokemon_summary_screen.o(.rodata);
         data/pokenav.o(.rodata);
@@ -541,7 +542,7 @@ SECTIONS {
         data/pokenav.o(.rodata.after.match.call);
         src/rayquaza_scene.o(.rodata);
         src/walda_phrase.o(.rodata);
-        data/trainer_rematch.o(.rodata);
+        src/gym_leader_rematch.o(.rodata);
         data/unk_transition.o(.rodata);
         src/unk_transition.o(.rodata);
         data/text_input_strings.o(.rodata);