Merge branch 'master' into event_object_movement

1 files changed, 63 insertions, 52 deletions

diff --git a/ld_script.txt b/ld_script.txt
index 6cf0c0d62..bde78a522 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -63,7 +63,7 @@ SECTIONS {
         src/main_menu.o(.text);
         src/battle_controllers.o(.text);
         src/decompress.o(.text);
-        asm/battle_bg.o(.text);
+        src/battle_bg.o(.text);
         src/battle_main.o(.text);
         src/battle_util.o(.text);
         src/battle_script_commands.o(.text);
@@ -90,14 +90,13 @@ SECTIONS {
         asm/overworld.o(.text);
         src/fieldmap.o(.text);
         src/metatile_behavior.o(.text);
-        asm/field_camera.o(.text);
+        src/field_camera.o(.text);
         src/field_door.o(.text);
         asm/field_player_avatar.o(.text);
         src/event_object_movement.o(.text);
         asm/event_object_movement.o(.text);
-        asm/field_ground_effect.o(.text);
-        asm/event_object_80688E4.o(.text);
-        asm/field_message_box.o(.text);
+        src/event_object_80688E4.o(.text); /* event_object_movement */
+        src/field_message_box.o(.text);
         src/event_object_lock.o(.text);
         src/text_window_graphics.o(.text);
         src/script.o(.text);
@@ -122,28 +121,28 @@ SECTIONS {
         src/field_fadetransition.o(.text);
         src/field_screen_effect.o(.text);
         src/battle_setup.o(.text);
-        asm/cable_club.o(.text);
-        asm/trainer_see.o(.text);
+        src/cable_club.o(.text);
+        src/trainer_see.o(.text);
         src/wild_encounter.o(.text);
-        asm/field_effect.o(.text);
+        src/field_effect.o(.text);
         src/scanline_effect.o(.text);
         src/option_menu.o(.text);
         src/pokedex.o(.text);
         src/trainer_card.o(.text);
         asm/pokemon_storage_system.o(.text);
         src/pokemon_icon.o(.text);
-        asm/script_movement.o(.text);
-        asm/fldeff_cut.o(.text);
+        src/script_movement.o(.text);
+        src/fldeff_cut.o(.text);
         src/mail_data.o(.text);
         src/map_name_popup.o(.text);
         src/item_menu_icons.o(.text);
         src/battle_anim_mon_movement.o(.text);
         src/item.o(.text);
         src/shop.o(.text);
-        src/sea_cottage_special_anim.o(.text);
+        src/special_field_anim.o(.text);
         src/berry.o(.text);
         src/script_menu.o(.text);
-        asm/naming_screen.o(.text);
+        src/naming_screen.o(.text);
         src/money.o(.text);
         src/script_pokemon_util.o(.text);
         src/field_poison.o(.text);
@@ -185,7 +184,7 @@ SECTIONS {
         src/battle_ai_script_commands.o(.text);
         src/fldeff_rocksmash.o(.text);
         src/fldeff_dig.o(.text);
-        asm/fldeff_flash.o(.text);
+        src/fldeff_flash.o(.text);
         src/post_battle_event_funcs.o(.text);
         src/prof_pc.o(.text);
         src/hof_pc.o(.text);
@@ -202,7 +201,7 @@ SECTIONS {
         src/cable_car_util.o(.text);
         src/save.o(.text);
         src/mystery_event_script.o(.text);
-        asm/field_effect_helpers.o(.text);
+        src/field_effect_helpers.o(.text);
         src/battle_anim_sound_tasks.o(.text);
         src/battle_controller_safari.o(.text);
         src/fldeff_sweetscent.o(.text);
@@ -218,7 +217,7 @@ SECTIONS {
         src/credits.o(.text);
         src/diploma.o(.text);
         src/save_failed_screen.o(.text);
-        asm/clear_save_data_screen.o(.text);
+        src/clear_save_data_screen.o(.text);
         src/evolution_graphics.o(.text);
         src/fldeff_teleport.o(.text);
         src/new_menu_helpers.o(.text);
@@ -227,8 +226,9 @@ SECTIONS {
         src/map_preview_screen.o(.text);
         src/link_rfu_2.o(.text);
         src/link_rfu_3.o(.text);
-        src/link_rfu.o(.text);
-        asm/easy_chat_2.o(.text);
+        src/AgbRfu_LinkManager.o(.text);
+        src/easy_chat_2.o(.text);
+        src/easy_chat_3.o(.text);
         src/pokedex_screen.o(.text);
         asm/pokedex_screen.o(.text);
         src/list_menu.o(.text);
@@ -271,32 +271,37 @@ SECTIONS {
         src/mevent_server_helpers.o(.text);
         src/mevent_client.o(.text);
         src/mevent_server.o(.text);
-        src/mevent_8145654.o(.text);
+        src/mevent_show_card.o(.text);
+        src/mevent_show_news.o(.text);
         src/menews_jisan.o(.text);
         src/seagallop.o(.text);
-        asm/pokemon_jump.o(.text);
-        asm/pokemon_jump_2.o(.text);
-        asm/berry_crush.o(.text);
-        asm/berry_crush_2.o(.text);
-        asm/berry_crush_3.o(.text);
+        src/pokemon_jump.o(.text);
+        src/pokemon_jump_2.o(.text);
+        src/pokemon_jump_3.o(.text);
+        src/pokemon_jump_4.o(.text);
+        src/pokemon_jump_5.o(.text);
+        src/pokemon_jump_6.o(.text);
+        src/berry_crush.o(.text);
+        src/berry_crush_2.o(.text);
+        src/berry_crush_3.o(.text);
         src/wireless_communication_status_screen.o(.text);
         src/braille_text.o(.text);
         src/text_window.o(.text);
         src/quest_log_player.o(.text);
-        asm/dodrio_berry_picking.o(.text);
+        src/dodrio_berry_picking.o(.text);
+        src/dodrio_berry_picking_2.o(.text);
         src/battle_controller_pokedude.o(.text);
         src/quest_log_objects.o(.text);
-        src/dodrio_berry_picking_2.o(.text);
-        asm/dodrio_berry_picking_2.o(.text);
+        src/dodrio_berry_picking_3.o(.text);
         src/teachy_tv.o(.text);
         src/ereader_helpers.o(.text);
-        src/unk_815C980.o(.text);
+        src/digit_obj_util.o(.text);
         src/ss_anne.o(.text);
         src/cereader_tool.o(.text);
         src/renewable_hidden_items.o(.text);
         src/trainer_tower.o(.text);
         src/berry_powder.o(.text);
-        src/unk_815F138.o(.text);
+        src/minigame_countdown.o(.text);
         src/berry_fix_program.o(.text);
     } =0
 
@@ -323,7 +328,7 @@ SECTIONS {
         src/agb_flash_mx.o(.text);
         src/agb_flash_le.o(.text);
         src/librfu_stwi.o(.text);
-        asm/librfu_intr.o(.text);
+        src/librfu_intr.o(.text);
         src/librfu_rfu.o(.text);
         src/librfu_sio32id.o(.text);
         src/isagbprn.o(.text);
@@ -397,7 +402,7 @@ SECTIONS {
         src/link.o(.rodata);
         src/main_menu.o(.rodata);
         src/data.o(.rodata);
-        data/battle_bg.o(.rodata);
+        src/battle_bg.o(.rodata);
         src/battle_main.o(.rodata);
         src/battle_util.o(.rodata);
         src/battle_script_commands.o(.rodata);
@@ -422,8 +427,7 @@ SECTIONS {
         src/field_door.o(.rodata);
         data/field_player_avatar.o(.rodata);
         data/event_object_movement.o(.rodata);
-        data/field_ground_effect.o(.rodata);
-        data/event_object_80688E4.o(.rodata);
+        src/event_object_80688E4.o(.rodata); /* event_object_movement */
         src/scrcmd.o(.rodata);
         src/coord_event_weather.o(.rodata);
         src/field_tasks.o(.rodata);
@@ -439,24 +443,24 @@ SECTIONS {
         data/field_weather.o(.rodata);
         src/field_screen_effect.o(.rodata);
         src/battle_setup.o(.rodata);
-        data/cable_club.o(.rodata);
-        data/trainer_see.o(.rodata);
+        src/cable_club.o(.rodata);
+        src/trainer_see.o(.rodata);
         src/wild_encounter.o(.rodata);
-        data/field_effect.o(.rodata);
+        src/field_effect.o(.rodata);
         src/option_menu.o(.rodata);
         src/trainer_card.o(.rodata);
         data/pokemon_storage_system.o(.rodata);
         src/pokemon_icon.o(.rodata);
-        data/fldeff_cut.o(.rodata);
+        src/fldeff_cut.o(.rodata);
         src/map_name_popup.o(.rodata);
         src/item_menu_icons.o(.rodata);
         src/battle_anim_mon_movement.o(.rodata);
         src/item.o(.rodata);
         src/shop.o(.rodata);
-        src/sea_cottage_special_anim.o(.rodata);
+        src/special_field_anim.o(.rodata);
         src/berry.o(.rodata);
         src/script_menu.o(.rodata);
-        data/naming_screen.o(.rodata);
+        src/naming_screen.o(.rodata);
         src/pokemon_size_record.o(.rodata);
         src/item_use.o(.rodata);
         src/battle_anim_effects_1.o(.rodata);
@@ -486,7 +490,7 @@ SECTIONS {
         src/region_map.o(.rodata);
         src/image_processing_effects.o(.rodata);
         src/battle_ai_script_commands.o(.rodata);
-        data/fldeff_flash.o(.rodata);
+        src/fldeff_flash.o(.rodata);
         src/field_specials.o(.rodata);
         src/battle_records.o(.rodata);
         src/evolution_scene.o(.rodata);
@@ -494,7 +498,7 @@ SECTIONS {
         src/battle_controller_link_partner.o(.rodata);
         src/battle_message.o(.rodata);
         src/save.o(.rodata);
-        data/field_effect_helpers.o(.rodata);
+        src/field_effect_helpers.o(.rodata);
         src/battle_controller_safari.o(.rodata);
         src/battle_anim_effects_3.o(.rodata);
         src/learn_move.o(.rodata);
@@ -506,16 +510,17 @@ SECTIONS {
         src/hall_of_fame.o(.rodata);
         src/credits.o(.rodata);
         src/diploma.o(.rodata);
-        data/strings.o(.rodata);
+        src/strings.o(.rodata);
         src/save_failed_screen.o(.rodata);
-        data/clear_save_data_screen.o(.rodata);
+        src/clear_save_data_screen.o(.rodata);
         src/evolution_graphics.o(.rodata);
         src/new_menu_helpers.o(.rodata);
         src/box_party_pokemon_dropdown.o(.rodata);
         src/map_preview_screen.o(.rodata);
         src/link_rfu_2.o(.rodata);
         src/link_rfu_3.o(.rodata);
-        data/easy_chat_2.o(.rodata);
+        src/easy_chat_2.o(.rodata);
+        src/easy_chat_3.o(.rodata);
         src/pokedex_screen.o(.rodata);
         data/pokedex_screen.o(.rodata);
         src/list_menu.o(.rodata);
@@ -559,30 +564,36 @@ SECTIONS {
         src/mevent_server_helpers.o(.rodata);
         src/mevent_client.o(.rodata);
         src/mevent_server.o(.rodata);
-        src/mevent_8145654.o(.rodata);
+        src/mevent_show_card.o(.rodata);
+        src/mevent_show_news.o(.rodata);
         src/mevent_scripts.o(.rodata);
         src/menews_jisan.o(.rodata);
         src/menews_jisan.o(.rodata.str1.4);
         src/seagallop.o(.rodata);
-        data/pokemon_jump.o(.rodata);
-        data/berry_crush.o(.rodata);
+        src/pokemon_jump.o(.rodata);
+        src/pokemon_jump_2.o(.rodata);
+        src/pokemon_jump_4.o(.rodata);
+        src/pokemon_jump_5.o(.rodata);
+        src/pokemon_jump_6.o(.rodata);
+        src/berry_crush_2.o(.rodata);
+        src/berry_crush_3.o(.rodata);
         src/wireless_communication_status_screen.o(.rodata);
         src/braille_text.o(.rodata);
         src/text_window_graphics.o(.rodata);
         src/quest_log_player.o(.rodata);
-        data/berry_powder.o(.rodata);
         src/dodrio_berry_picking.o(.rodata);
+        src/dodrio_berry_picking_2.o(.rodata);
         src/battle_controller_pokedude.o(.rodata);
         src/teachy_tv.o(.rodata);
-        src/unk_815C980.o(.rodata);
-        data/data_8479668.o(.rodata);
+        src/digit_obj_util.o(.rodata);
         src/ss_anne.o(.rodata);
         src/cereader_tool.o(.rodata);
         src/renewable_hidden_items.o(.rodata);
         src/trainer_tower.o(.rodata);
-        src/unk_815F138.o(.rodata);
+        src/minigame_countdown.o(.rodata);
         src/berry_fix_program.o(.rodata);
-        data/data_8479668.o(.rodata.after_trainer_tower);
+        src/keyboard_text.o(.rodata);
+        data/data_8479668.o(.rodata);
 
         /* These should not be moved to C files */
         src/mystery_event_msg.o(.rodata);
@@ -1008,7 +1019,7 @@ SECTIONS {
     gfx_data :
     ALIGN(4)
     {
-        data/graphics.o(gfx_data);
+        src/graphics.o(.rodata);
     } =0
 
     /* DWARF 2 sections */