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

1 files changed, 63 insertions, 60 deletions

diff --git a/ld_script.txt b/ld_script.txt
index 9dc6efaa6..407df435a 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -76,7 +76,6 @@ SECTIONS {
         src/trig.o(.text);
         src/random.o(.text);
         src/util.o(.text);
-        src/blend_palette.o(.text);
         src/daycare.o(.text);
         src/egg_hatch.o(.text);
         src/battle_interface.o(.text);
@@ -100,7 +99,7 @@ SECTIONS {
         src/text_window.o(.text);
         src/script.o(.text);
         src/scrcmd.o(.text);
-        asm/field_control_avatar.o(.text);
+        src/field_control_avatar.o(.text);
         src/event_data.o(.text);
         src/coord_event_weather.o(.text);
         src/field_tasks.o(.text);
@@ -118,7 +117,7 @@ SECTIONS {
         src/title_screen.o(.text);
         asm/field_screen.o(.text);
         src/battle_setup.o(.text);
-        asm/cable_club.o(.text);
+        src/cable_club.o(.text);
         src/trainer_see.o(.text);
         src/wild_encounter.o(.text);
         src/field_effect.o(.text);
@@ -138,6 +137,7 @@ SECTIONS {
         src/item.o(.text);
         src/contest.o(.text);
         asm/contest.o(.text);
+        src/shop.o(.text);
         asm/shop.o(.text);
         src/berry.o(.text);
         asm/script_menu.o(.text);
@@ -201,7 +201,7 @@ SECTIONS {
         src/rom_81520A8.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/contest_ai.o(.text);
         src/battle_anim_sound_tasks.o(.text);
         src/battle_controller_safari.o(.text);
@@ -247,6 +247,7 @@ SECTIONS {
         asm/battle_frontier_1.o(.text);
         src/menu.o(.text);
         src/battle_factory.o(.text);
+        src/apprentice.o(.text);
         asm/battle_frontier_2.o(.text);
         src/item_menu.o(.text);
         src/list_menu.o(.text);
@@ -428,7 +429,7 @@ SECTIONS {
         src/title_screen.o(.rodata);
         data/field_screen.o(.rodata);
         src/battle_setup.o(.rodata);
-        data/cable_club.o(.rodata);
+        src/cable_club.o(.rodata);
         src/trainer_see.o(.rodata);
         src/wild_encounter.o(.rodata);
         src/field_effect.o(.rodata);
@@ -492,6 +493,7 @@ SECTIONS {
         src/battle_message.o(.rodata);
         data/cable_car.o(.rodata);
         src/save.o(.rodata);
+        src/field_effect_helpers.o(.rodata);
         data/field_effect_helpers.o(.rodata);
         src/contest_ai.o(.rodata);
         src/battle_controller_safari.o(.rodata);
@@ -530,6 +532,7 @@ SECTIONS {
         data/battle_frontier_1.o(.rodata);
         src/menu.o(.rodata);
         src/battle_factory.o(.rodata);
+        src/apprentice.o(.rodata);
         data/battle_frontier_2.o(.rodata);
         src/item_menu.o(.rodata);
         src/list_menu.o(.rodata);
@@ -566,65 +569,65 @@ SECTIONS {
     ALIGN(4)
     {
         sound/songs/midi/mus_dummy.o(.rodata);
-        sound/songs/se_kaifuku.o(.rodata);
+        sound/songs/midi/se_kaifuku.o(.rodata);
         sound/songs/se_pc_login.o(.rodata);
         sound/songs/se_pc_off.o(.rodata);
         sound/songs/se_pc_on.o(.rodata);
         sound/songs/se_select.o(.rodata);
         sound/songs/se_win_open.o(.rodata);
         sound/songs/se_wall_hit.o(.rodata);
-        sound/songs/se_door.o(.rodata);
-        sound/songs/se_kaidan.o(.rodata);
-        sound/songs/se_dansa.o(.rodata);
-        sound/songs/se_jitensya.o(.rodata);
-        sound/songs/se_kouka_l.o(.rodata);
-        sound/songs/se_kouka_m.o(.rodata);
-        sound/songs/se_kouka_h.o(.rodata);
-        sound/songs/se_bowa2.o(.rodata);
+        sound/songs/midi/se_door.o(.rodata);
+        sound/songs/midi/se_kaidan.o(.rodata);
+        sound/songs/midi/se_dansa.o(.rodata);
+        sound/songs/midi/se_jitensya.o(.rodata);
+        sound/songs/midi/se_kouka_l.o(.rodata);
+        sound/songs/midi/se_kouka_m.o(.rodata);
+        sound/songs/midi/se_kouka_h.o(.rodata);
+        sound/songs/midi/se_bowa2.o(.rodata);
         sound/songs/se_poke_dead.o(.rodata);
         sound/songs/se_nigeru.o(.rodata);
-        sound/songs/se_jido_doa.o(.rodata);
+        sound/songs/midi/se_jido_doa.o(.rodata);
         sound/songs/se_naminori.o(.rodata);
-        sound/songs/se_ban.o(.rodata);
+        sound/songs/midi/se_ban.o(.rodata);
         sound/songs/se_pin.o(.rodata);
-        sound/songs/se_boo.o(.rodata);
-        sound/songs/se_bowa.o(.rodata);
-        sound/songs/se_jyuni.o(.rodata);
-        sound/songs/se_a.o(.rodata);
-        sound/songs/se_i.o(.rodata);
+        sound/songs/midi/se_boo.o(.rodata);
+        sound/songs/midi/se_bowa.o(.rodata);
+        sound/songs/midi/se_jyuni.o(.rodata);
+        sound/songs/midi/se_a.o(.rodata);
+        sound/songs/midi/se_i.o(.rodata);
         sound/songs/se_u.o(.rodata);
-        sound/songs/se_e.o(.rodata);
+        sound/songs/midi/se_e.o(.rodata);
         sound/songs/se_o.o(.rodata);
         sound/songs/se_n.o(.rodata);
         sound/songs/se_seikai.o(.rodata);
-        sound/songs/se_hazure.o(.rodata);
-        sound/songs/se_exp.o(.rodata);
-        sound/songs/se_jite_pyoko.o(.rodata);
+        sound/songs/midi/se_hazure.o(.rodata);
+        sound/songs/midi/se_exp.o(.rodata);
+        sound/songs/midi/se_jite_pyoko.o(.rodata);
         sound/songs/se_mu_pachi.o(.rodata);
         sound/songs/se_tk_kasya.o(.rodata);
-        sound/songs/se_fu_zaku.o(.rodata);
-        sound/songs/se_fu_zaku2.o(.rodata);
-        sound/songs/se_fu_zuzuzu.o(.rodata);
+        sound/songs/midi/se_fu_zaku.o(.rodata);
+        sound/songs/midi/se_fu_zaku2.o(.rodata);
+        sound/songs/midi/se_fu_zuzuzu.o(.rodata);
         sound/songs/se_ru_gashin.o(.rodata);
         sound/songs/se_ru_gasyan.o(.rodata);
         sound/songs/se_ru_bari.o(.rodata);
         sound/songs/se_ru_hyuu.o(.rodata);
-        sound/songs/se_ki_gasyan.o(.rodata);
+        sound/songs/midi/se_ki_gasyan.o(.rodata);
         sound/songs/se_tk_warpin.o(.rodata);
         sound/songs/se_tk_warpout.o(.rodata);
         sound/songs/se_tu_saa.o(.rodata);
-        sound/songs/se_hi_turun.o(.rodata);
+        sound/songs/midi/se_hi_turun.o(.rodata);
         sound/songs/se_track_move.o(.rodata);
         sound/songs/se_track_stop.o(.rodata);
         sound/songs/se_track_haiki.o(.rodata);
         sound/songs/se_track_door.o(.rodata);
         sound/songs/se_moter.o(.rodata);
-        sound/songs/se_card.o(.rodata);
+        sound/songs/midi/se_card.o(.rodata);
         sound/songs/se_save.o(.rodata);
-        sound/songs/se_kon.o(.rodata);
-        sound/songs/se_kon2.o(.rodata);
-        sound/songs/se_kon3.o(.rodata);
-        sound/songs/se_kon4.o(.rodata);
+        sound/songs/midi/se_kon.o(.rodata);
+        sound/songs/midi/se_kon2.o(.rodata);
+        sound/songs/midi/se_kon3.o(.rodata);
+        sound/songs/midi/se_kon4.o(.rodata);
         sound/songs/se_suikomu.o(.rodata);
         sound/songs/se_nageru.o(.rodata);
         sound/songs/se_toy_c.o(.rodata);
@@ -636,16 +639,16 @@ SECTIONS {
         sound/songs/se_toy_b.o(.rodata);
         sound/songs/se_toy_c1.o(.rodata);
         sound/songs/se_mizu.o(.rodata);
-        sound/songs/se_hashi.o(.rodata);
-        sound/songs/se_daugi.o(.rodata);
+        sound/songs/midi/se_hashi.o(.rodata);
+        sound/songs/midi/se_daugi.o(.rodata);
         sound/songs/se_pinpon.o(.rodata);
-        sound/songs/se_fuusen1.o(.rodata);
-        sound/songs/se_fuusen2.o(.rodata);
-        sound/songs/se_fuusen3.o(.rodata);
+        sound/songs/midi/se_fuusen1.o(.rodata);
+        sound/songs/midi/se_fuusen2.o(.rodata);
+        sound/songs/midi/se_fuusen3.o(.rodata);
         sound/songs/se_toy_kabe.o(.rodata);
         sound/songs/se_toy_dango.o(.rodata);
-        sound/songs/se_doku.o(.rodata);
-        sound/songs/se_esuka.o(.rodata);
+        sound/songs/midi/se_doku.o(.rodata);
+        sound/songs/midi/se_esuka.o(.rodata);
         sound/songs/se_t_ame.o(.rodata);
         sound/songs/se_t_ame_e.o(.rodata);
         sound/songs/se_t_ooame.o(.rodata);
@@ -654,24 +657,24 @@ SECTIONS {
         sound/songs/se_t_koame_e.o(.rodata);
         sound/songs/se_t_kami.o(.rodata);
         sound/songs/se_t_kami2.o(.rodata);
-        sound/songs/se_elebeta.o(.rodata);
-        sound/songs/se_hinsi.o(.rodata);
-        sound/songs/se_expmax.o(.rodata);
+        sound/songs/midi/se_elebeta.o(.rodata);
+        sound/songs/midi/se_hinsi.o(.rodata);
+        sound/songs/midi/se_expmax.o(.rodata);
         sound/songs/se_tamakoro.o(.rodata);
         sound/songs/se_tamakoro_e.o(.rodata);
-        sound/songs/se_basabasa.o(.rodata);
+        sound/songs/midi/se_basabasa.o(.rodata);
         sound/songs/se_regi.o(.rodata);
-        sound/songs/se_c_gaji.o(.rodata);
-        sound/songs/se_c_maku_u.o(.rodata);
-        sound/songs/se_c_maku_d.o(.rodata);
-        sound/songs/se_c_pasi.o(.rodata);
-        sound/songs/se_c_syu.o(.rodata);
-        sound/songs/se_c_pikon.o(.rodata);
+        sound/songs/midi/se_c_gaji.o(.rodata);
+        sound/songs/midi/se_c_maku_u.o(.rodata);
+        sound/songs/midi/se_c_maku_d.o(.rodata);
+        sound/songs/midi/se_c_pasi.o(.rodata);
+        sound/songs/midi/se_c_syu.o(.rodata);
+        sound/songs/midi/se_c_pikon.o(.rodata);
         sound/songs/se_reapoke.o(.rodata);
         sound/songs/se_op_basyu.o(.rodata);
-        sound/songs/se_bt_start.o(.rodata);
-        sound/songs/se_dendou.o(.rodata);
-        sound/songs/se_jihanki.o(.rodata);
+        sound/songs/midi/se_bt_start.o(.rodata);
+        sound/songs/midi/se_dendou.o(.rodata);
+        sound/songs/midi/se_jihanki.o(.rodata);
         sound/songs/se_tama.o(.rodata);
         sound/songs/se_z_scroll.o(.rodata);
         sound/songs/se_z_page.o(.rodata);
@@ -682,7 +685,7 @@ SECTIONS {
         sound/songs/se_tb_start.o(.rodata);
         sound/songs/se_tb_kon.o(.rodata);
         sound/songs/se_tb_kara.o(.rodata);
-        sound/songs/se_bidoro.o(.rodata);
+        sound/songs/midi/se_bidoro.o(.rodata);
         sound/songs/se_w085.o(.rodata);
         sound/songs/se_w085b.o(.rodata);
         sound/songs/se_w231.o(.rodata);
@@ -830,10 +833,10 @@ SECTIONS {
         sound/songs/se_rg_nawamiss.o(.rodata);
         sound/songs/se_toreeye.o(.rodata);
         sound/songs/se_toreoff.o(.rodata);
-        sound/songs/se_hantei1.o(.rodata);
-        sound/songs/se_hantei2.o(.rodata);
-        sound/songs/se_curtain.o(.rodata);
-        sound/songs/se_curtain1.o(.rodata);
+        sound/songs/midi/se_hantei1.o(.rodata);
+        sound/songs/midi/se_hantei2.o(.rodata);
+        sound/songs/midi/se_curtain.o(.rodata);
+        sound/songs/midi/se_curtain1.o(.rodata);
         sound/songs/se_ussoki.o(.rodata);
         sound/songs/midi/mus_tetsuji.o(.rodata);
         sound/songs/midi/mus_field13.o(.rodata);