Merge branch 'master' of https://github.com/pret/pokeemerald into menu

1 files changed, 23 insertions, 23 deletions

diff --git a/ld_script.txt b/ld_script.txt
index 61ea86a3e..6a6e098e1 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -59,7 +59,7 @@ SECTIONS {
         src/decompress.o(.text);
         asm/rom_8034C54.o(.text);
         src/battle_bg.o(.text);
-        src/battle_2.o(.text);
+        src/battle_main.o(.text);
         src/battle_util.o(.text);
         src/battle_script_commands.o(.text);
         src/battle_util2.o(.text);
@@ -97,18 +97,18 @@ SECTIONS {
         asm/field_player_avatar.o(.text);
         src/field_map_obj.o(.text);
         asm/field_ground_effect.o(.text);
-        asm/map_obj_8097404.o(.text);
-        asm/field_message_box.o(.text);
+        src/field_map_obj_helpers.o(.text);
+        src/field_message_box.o(.text);
         asm/map_obj_lock.o(.text);
         src/text_window.o(.text);
         src/script.o(.text);
         src/scrcmd.o(.text);
         asm/field_control_avatar.o(.text);
         src/event_data.o(.text);
-        asm/coord_event_weather.o(.text);
+        src/coord_event_weather.o(.text);
         asm/field_tasks.o(.text);
         src/clock.o(.text);
-        asm/reset_rtc_screen.o(.text);
+        src/reset_rtc_screen.o(.text);
         src/start_menu.o(.text);
         asm/start_menu.o(.text);
         src/tileset_anims.o(.text);
@@ -119,14 +119,14 @@ SECTIONS {
         src/task.o(.text);
         src/reshow_battle_screen.o(.text);
         asm/battle_anim_80A9C70.o(.text);
-        asm/title_screen.o(.text);
+        src/title_screen.o(.text);
         asm/field_screen.o(.text);
         src/battle_setup.o(.text);
         asm/cable_club.o(.text);
         src/trainer_see.o(.text);
         src/wild_encounter.o(.text);
         asm/field_effect.o(.text);
-        asm/unknown_task.o(.text);
+        src/scanline_effect.o(.text);
         src/option_menu.o(.text);
         src/pokedex.o(.text);
         asm/pokedex.o(.text);
@@ -162,7 +162,7 @@ SECTIONS {
         asm/rotating_gate.o(.text);
         src/safari_zone.o(.text);
         asm/contest_link_80FC4F4.o(.text);
-        asm/item_use.o(.text);
+        src/item_use.o(.text);
         asm/battle_anim_80FE840.o(.text);
         src/bike.o(.text);
         asm/easy_chat.o(.text);
@@ -185,7 +185,7 @@ SECTIONS {
         src/pokeblock.o(.text);
         asm/fldeff_flash.o(.text);
         asm/post_battle_event_funcs.o(.text);
-        asm/time_events.o(.text);
+        src/time_events.o(.text);
         asm/birch_pc.o(.text);
         src/hof_pc.o(.text);
         asm/field_specials.o(.text);
@@ -229,8 +229,8 @@ SECTIONS {
         asm/credits.o(.text);
         src/lottery_corner.o(.text);
         src/diploma.o(.text);
-        asm/berry_tag_screen.o(.text);
-        asm/mystery_event_menu.o(.text);
+        src/berry_tag_screen.o(.text);
+        src/mystery_event_menu.o(.text);
         src/save_failed_screen.o(.text);
         src/braille_puzzles.o(.text);
         src/pokeblock_feed.o(.text);
@@ -240,7 +240,7 @@ SECTIONS {
         src/bard_music.o(.text);
         src/fldeff_teleport.o(.text);
         asm/battle_link_817C95C.o(.text);
-        asm/pokemon_animation.o(.text);
+        src/pokemon_animation.o(.text);
         src/recorded_battle.o(.text);
         src/battle_controller_recorded_opponent.o(.text);
         src/battle_controller_recorded_player.o(.text);
@@ -254,7 +254,7 @@ SECTIONS {
         asm/menu_indicators.o(.text);
         src/unk_text_util.o(.text);
         src/save_location.o(.text);
-        asm/item_icon.o(.text);
+        src/item_icon.o(.text);
         asm/party_menu.o(.text);
         asm/battle_tent.o(.text);
         src/unk_text_util_2.o(.text);
@@ -268,7 +268,6 @@ SECTIONS {
         asm/pokemon_summary_screen.o(.text);
         asm/pokenav.o(.text);
         src/rayquaza_scene.o(.text);
-        asm/rayquaza_scene.o(.text);
         src/walda_phrase.o(.text);
         asm/contest_link_81D9DE4.o(.text);
         asm/trainer_rematch.o(.text);
@@ -376,7 +375,7 @@ SECTIONS {
         data/main_menu.o(.rodata);
         data/battle_1.o(.rodata);
         data/data2b.o(.rodata);
-        src/battle_2.o(.rodata);
+        src/battle_main.o(.rodata);
         src/battle_util.o(.rodata);
         src/battle_script_commands.o(.rodata);
         src/battle_controller_player.o(.rodata);
@@ -406,9 +405,9 @@ SECTIONS {
         data/map_obj_8097404.o(.rodata);
         src/text_window.o(.rodata);
         src/scrcmd.o(.rodata);
-        data/coord_event_weather.o(.rodata);
+        src/coord_event_weather.o(.rodata);
         data/field_tasks.o(.rodata);
-        data/reset_rtc_screen.o(.rodata);
+        src/reset_rtc_screen.o(.rodata);
         src/start_menu.o(.rodata);
         src/tileset_anims.o(.rodata);
         src/palette.o(.rodata);
@@ -418,7 +417,7 @@ SECTIONS {
         data/rom_8525F58.o(.rodata);
         data/map_events.o(.rodata);
         data/battle_anim_80A9C70.o(.rodata);
-        data/title_screen.o(.rodata);
+        src/title_screen.o(.rodata);
         data/field_screen.o(.rodata);
         src/battle_setup.o(.rodata);
         data/cable_club.o(.rodata);
@@ -471,7 +470,7 @@ SECTIONS {
         src/wallclock.o(.rodata);
         src/pokeblock.o(.rodata);
         data/fldeff_flash.o(.rodata);
-        data/time_events.o(.rodata);
+        src/time_events.o(.rodata);
         data/field_specials.o(.rodata);
         data/battle_records.o(.rodata);
         data/pokedex_area_screen.o(.rodata);
@@ -483,7 +482,7 @@ SECTIONS {
         src/battle_controller_link_partner.o(.rodata);
         src/battle_message.o(.rodata);
         data/cable_car.o(.rodata);
-        data/save.o(.rodata);
+        src/save.o(.rodata);
         data/field_effect_helpers.o(.rodata);
         data/contest_ai.o(.rodata);
         src/battle_controller_safari.o(.rodata);
@@ -503,8 +502,8 @@ SECTIONS {
         src/lottery_corner.o(.rodata);
         src/diploma.o(.rodata);
         data/strings.o(.rodata);
-        data/berry_tag_screen.o(.rodata);
-        data/mystery_event_menu.o(.rodata);
+        src/berry_tag_screen.o(.rodata);
+        src/mystery_event_menu.o(.rodata);
         src/save_failed_screen.o(.rodata);
         data/braille_puzzles.o(.rodata);
         src/pokeblock_feed.o(.rodata);
@@ -513,7 +512,7 @@ SECTIONS {
         src/evolution_graphics.o(.rodata);
         src/bard_music.o(.rodata);
         data/battle_link_817C95C.o(.rodata);
-        data/pokemon_animation.o(.rodata);
+        src/pokemon_animation.o(.rodata);
         src/battle_controller_recorded_opponent.o(.rodata);
         src/battle_controller_recorded_player.o(.rodata);
         src/battle_dome_cards.o(.rodata);
@@ -525,6 +524,7 @@ SECTIONS {
         data/menu_indicators.o(.rodata);
         src/save_location.o(.rodata);
         data/item_icon.o(.rodata);
+        src/item_icon.o(.rodata);
         data/party_menu.o(.rodata);
         data/battle_tent.o(.rodata);
         src/unk_text_util_2.o(.rodata);