Merge branch 'master' into battle

1 files changed, 26 insertions, 20 deletions

diff --git a/ld_script.txt b/ld_script.txt
index 116cfdca2..d9694130a 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -103,7 +103,7 @@ SECTIONS {
         src/script.o(.text);
         src/scrcmd.o(.text);
         asm/field_control_avatar.o(.text);
-        asm/event_data.o(.text);
+        src/event_data.o(.text);
         src/coord_event_weather.o(.text);
         asm/field_tasks.o(.text);
         src/start_menu.o(.text);
@@ -122,7 +122,6 @@ SECTIONS {
         src/field_fadetransition.o(.text);
         asm/field_screen_effect.o(.text);
         src/battle_setup.o(.text);
-        asm/battle_setup.o(.text);
         asm/cable_club.o(.text);
         asm/trainer_see.o(.text);
         asm/wild_encounter.o(.text);
@@ -132,7 +131,7 @@ SECTIONS {
         src/pokedex.o(.text);
         asm/trainer_card.o(.text);
         asm/pokemon_storage_system.o(.text);
-        asm/pokemon_icon.o(.text);
+        src/pokemon_icon.o(.text);
         asm/script_movement.o(.text);
         asm/fldeff_cut.o(.text);
         src/mail_data.o(.text);
@@ -284,6 +283,7 @@ SECTIONS {
         src/unk_815C980.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);
@@ -383,9 +383,8 @@ SECTIONS {
         src/string_util.o(.rodata);
         src/link.o(.rodata);
         src/main_menu.o(.rodata);
-        data/data.o(.rodata);
         src/data.o(.rodata);
-        data/data.o(.rodata.82350AC);
+        data/data.o(.rodata);
         src/battle_main.o(.rodata);
         src/battle_util.o(.rodata);
         src/battle_script_commands.o(.rodata);
@@ -399,6 +398,7 @@ SECTIONS {
         src/daycare.o(.rodata);
         src/battle_gfx_sfx_util.o(.rodata);
         data/data.o(.rodata.8260270);
+        data/overworld.o(.rodata);
         data/tilesets.o(.rodata);
         data/maps.o(.rodata);
         src/fieldmap.o(.rodata);
@@ -425,6 +425,8 @@ SECTIONS {
         data/data_835B488.o(.rodata);
         src/battle_setup.o(.rodata);
         data/data_835B488.o(.rodata.83C6AB0);
+        src/pokemon_icon.o(.rodata);
+        data/data_835B488.o(.rodata.83D4100);
         src/item_menu_icons.o(.rodata);
         src/battle_anim_mon_movement.o(.rodata);
         src/item.o(.rodata);
@@ -512,22 +514,26 @@ SECTIONS {
         src/text_window_graphics.o(.rodata);
         src/quest_log_8150454.o(.rodata);
         data/data_8471F00.o(.rodata);
+        src/unk_8159F40.o(.rodata);
         src/teachy_tv.o(.rodata);
         src/unk_815C980.o(.rodata);
         data/data_8471F00.o(.rodata.8479668);
         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/berry_fix_program.o(.rodata);
         data/data_8471F00.o(.rodata.after_trainer_tower);
+
+        /* These should not be moved to C files */
         src/mystery_event_msg.o(.rodata);
         data/mystery_event_msg.o(.rodata);
         src/m4a_tables.o(.rodata);
         data/sound_data.o(.rodata);
     } =0
 
-    songs :
+    song_data :
     ALIGN(4)
     {
         sound/songs/midi/mus_dummy.o(.rodata);
@@ -771,7 +777,7 @@ SECTIONS {
         sound/songs/se_w287b.o(.rodata);
         sound/songs/se_w114.o(.rodata);
         sound/songs/se_w063b.o(.rodata);
-        sound/songs/mus_w_door.o(.rodata);
+        sound/songs/midi/mus_w_door.o(.rodata);
         sound/songs/se_card1.o(.rodata);
         sound/songs/se_card2.o(.rodata);
         sound/songs/se_card3.o(.rodata);
@@ -787,19 +793,19 @@ SECTIONS {
         sound/songs/se_excellent.o(.rodata);
         sound/songs/se_nawamiss.o(.rodata);
         sound/songs/midi/mus_me_asa.o(.rodata);
-        sound/songs/mus_fanfa1.o(.rodata);
-        sound/songs/mus_fanfa4.o(.rodata);
-        sound/songs/mus_fanfa5.o(.rodata);
-        sound/songs/mus_me_bachi.o(.rodata);
-        sound/songs/mus_me_waza.o(.rodata);
-        sound/songs/mus_me_kinomi.o(.rodata);
-        sound/songs/mus_me_shinka.o(.rodata);
-        sound/songs/mus_shinka.o(.rodata);
-        sound/songs/mus_battle32.o(.rodata);
-        sound/songs/mus_battle20.o(.rodata);
-        sound/songs/mus_p_school.o(.rodata);
-        sound/songs/mus_me_b_big.o(.rodata);
-        sound/songs/mus_me_b_small.o(.rodata);
+        sound/songs/midi/mus_fanfa1.o(.rodata);
+        sound/songs/midi/mus_fanfa4.o(.rodata);
+        sound/songs/midi/mus_fanfa5.o(.rodata);
+        sound/songs/midi/mus_me_bachi.o(.rodata);
+        sound/songs/midi/mus_me_waza.o(.rodata);
+        sound/songs/midi/mus_me_kinomi.o(.rodata);
+        sound/songs/midi/mus_me_shinka.o(.rodata);
+        sound/songs/midi/mus_shinka.o(.rodata);
+        sound/songs/midi/mus_battle32.o(.rodata);
+        sound/songs/midi/mus_battle20.o(.rodata);
+        sound/songs/midi/mus_p_school.o(.rodata);
+        sound/songs/midi/mus_me_b_big.o(.rodata);
+        sound/songs/midi/mus_me_b_small.o(.rodata);
         sound/songs/midi/mus_me_wasure.o(.rodata);
         sound/songs/midi/mus_me_zannen.o(.rodata);
         sound/songs/midi/mus_annai.o(.rodata);