Merge branch 'master' into pokenav-decomp-again

1 files changed, 103 insertions, 74 deletions

diff --git a/ld_script.txt b/ld_script.txt
index e60badcc2..8f44e0abf 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -54,8 +54,22 @@ SECTIONS {
         src/string_util.o(.text);
         src/link.o(.text);
         src/link_rfu.o(.text);
-        src/rom_8011DC0.o(.text);
-        asm/rom_8011DC0.o(.text);
+        src/union_room.o(.text);
+        src/mystery_gift.o(.text);
+        src/union_room_player_avatar.o(.text);
+        src/union_room_battle.o(.text);
+        src/mevent2.o(.text);
+        src/mevent_801BAAC.o(.text);
+        src/mevent_server.o(.text);
+        src/mevent_client.o(.text);
+        src/mevent_server_helpers.o(.text);
+        src/mevent_news.o(.text);
+        src/union_room_chat.o(.text);
+        src/berry_crush.o(.text);
+        asm/berry_crush.o(.text);
+        src/berry_powder.o(.text);
+        asm/dodrio_berry_picking.o(.text);
+        asm/pokemon_jump.o(.text);
         src/rtc.o(.text);
         src/main_menu.o(.text);
         src/battle_controllers.o(.text);
@@ -108,10 +122,10 @@ SECTIONS {
         src/palette.o(.text);
         src/sound.o(.text);
         src/battle_anim.o(.text);
-        src/battle_anim_80A5C6C.o(.text);
+        src/battle_anim_mons.o(.text);
         src/task.o(.text);
         src/reshow_battle_screen.o(.text);
-        src/battle_anim_80A9C70.o(.text);
+        src/battle_anim_status_effects.o(.text);
         src/title_screen.o(.text);
         src/field_weather.o(.text);
         src/field_weather_effect.o(.text);
@@ -133,7 +147,7 @@ SECTIONS {
         src/mail_data.o(.text);
         src/map_name_popup.o(.text);
         src/item_menu_icons.o(.text);
-        src/battle_anim_80D51AC.o(.text);
+        src/battle_anim_mon_movement.o(.text);
         src/item.o(.text);
         src/contest.o(.text);
         src/shop.o(.text);
@@ -185,7 +199,6 @@ SECTIONS {
         src/heal_location.o(.text);
         src/region_map.o(.text);
         src/contest_painting_effects.o(.text);
-        asm/contest_painting_effects.o(.text);
         src/decoration.o(.text);
         src/slot_machine.o(.text);
         src/contest_painting.o(.text);
@@ -225,19 +238,18 @@ SECTIONS {
         src/battle_controller_safari.o(.text);
         src/fldeff_sweetscent.o(.text);
         src/battle_anim_effects_3.o(.text);
-        src/learn_move.o(.text);
+        src/move_relearner.o(.text);
         src/fldeff_softboiled.o(.text);
         src/decoration_inventory.o(.text);
         src/roamer.o(.text);
         src/battle_tower.o(.text);
         src/use_pokeblock.o(.text);
-        asm/use_pokeblock.o(.text);
         src/battle_controller_wally.o(.text);
         src/player_pc.o(.text);
         src/intro.o(.text);
         src/reset_save_heap.o(.text);
         src/field_region_map.o(.text);
-        src/battle_anim_8170478.o(.text);
+        src/battle_anim_special.o(.text);
         src/hall_of_fame.o(.text);
         src/credits.o(.text);
         src/lottery_corner.o(.text);
@@ -290,7 +302,10 @@ SECTIONS {
         src/pokenav.o(.text);
         asm/pokenav.o(.text);
         src/pokenav_match_call.o(.text);
-        asm/rom_81D1C44.o(.text);
+        src/menu_specialized.o(.text);
+        src/ereader_helpers.o(.text);
+        src/faraway_island.o(.text);
+        src/ereader_screen.o(.text);
         src/trainer_hill.o(.text);
         src/rayquaza_scene.o(.text);
         src/walda_phrase.o(.text);
@@ -394,13 +409,24 @@ SECTIONS {
         src/string_util.o(.rodata);
         src/link.o(.rodata);
         src/link_rfu.o(.rodata);
-        src/rom_8011DC0.o(.rodata);
-        data/rom_8011DC0.o(.rodata);
+        src/union_room.o(.rodata);
+        src/mystery_gift.o(.rodata);
+        src/union_room_player_avatar.o(.rodata);
+        src/union_room_battle.o(.rodata);
+        src/mevent2.o(.rodata);
+        src/mevent_801BAAC.o(.rodata);
+        src/mevent_server.o(.rodata);
+        src/mevent_client.o(.rodata);
+        src/mevent_scripts.o(.rodata);
+        src/union_room_chat.o(.rodata);
+        data/berry_crush.o(.rodata);
+        data/berry_powder.o(.rodata);
+        data/dodrio_berry_picking.o(.rodata);
+        data/pokemon_jump.o(.rodata);
         src/rtc.o(.rodata);
         src/main_menu.o(.rodata);
         src/rom_8034C54.o(.rodata);
-        src/data2b.o(.rodata);
-        src/battle_data.o(.rodata);
+        src/data.o(.rodata);
         src/battle_bg.o(.rodata);
         src/battle_main.o(.rodata);
         src/battle_util.o(.rodata);
@@ -438,9 +464,9 @@ SECTIONS {
         src/palette.o(.rodata);
         src/sound.o(.rodata);
         src/battle_anim.o(.rodata);
-        src/battle_anim_80A5C6C.o(.rodata);
+        src/battle_anim_mons.o(.rodata);
         data/map_events.o(.rodata);
-        src/battle_anim_80A9C70.o(.rodata);
+        src/battle_anim_status_effects.o(.rodata);
         src/title_screen.o(.rodata);
         src/field_weather.o(.rodata);
         src/field_weather_effect.o(.rodata);
@@ -459,9 +485,9 @@ SECTIONS {
         src/fldeff_cut.o(.rodata);
         src/map_name_popup.o(.rodata);
         src/item_menu_icons.o(.rodata);
-        src/battle_anim_80D51AC.o(.rodata);
+        src/battle_anim_mon_movement.o(.rodata);
         src/item.o(.rodata);
-        data/contest.o(.rodata);
+        src/contest.o(.rodata);
         src/shop.o(.rodata);
         src/fldeff_escalator.o(.rodata);
         src/berry.o(.rodata);
@@ -534,7 +560,7 @@ SECTIONS {
         src/contest_ai.o(.rodata);
         src/battle_controller_safari.o(.rodata);
         src/battle_anim_effects_3.o(.rodata);
-        src/learn_move.o(.rodata);
+        src/move_relearner.o(.rodata);
         src/roamer.o(.rodata);
         src/battle_tower.o(.rodata);
         src/use_pokeblock.o(.rodata);
@@ -543,7 +569,7 @@ SECTIONS {
         src/player_pc.o(.rodata);
         src/intro.o(.rodata);
         src/field_region_map.o(.rodata);
-        src/battle_anim_8170478.o(.rodata);
+        src/battle_anim_special.o(.rodata);
         src/hall_of_fame.o(.rodata);
         src/credits.o(.rodata);
         src/lottery_corner.o(.rodata);
@@ -593,7 +619,10 @@ SECTIONS {
         src/pokenav.o(.rodata);
         data/pokenav.o(.rodata);
         src/pokenav_match_call.o(.rodata);
-        data/rom_81D1C44.o(.rodata);
+        src/menu_specialized.o(.rodata);
+        data/ereader_helpers.o(.rodata);
+        src/faraway_island.o(.rodata);
+        data/ereader_screen.o(.rodata);
         src/trainer_hill.o(.rodata);
         src/rayquaza_scene.o(.rodata);
         src/walda_phrase.o(.rodata);
@@ -637,7 +666,7 @@ SECTIONS {
         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/midi/se_u.o(.rodata);
         sound/songs/midi/se_e.o(.rodata);
         sound/songs/midi/se_o.o(.rodata);
         sound/songs/midi/se_n.o(.rodata);
@@ -646,7 +675,7 @@ SECTIONS {
         sound/songs/midi/se_exp.o(.rodata);
         sound/songs/midi/se_jite_pyoko.o(.rodata);
         sound/songs/midi/se_mu_pachi.o(.rodata);
-        sound/songs/se_tk_kasya.o(.rodata);
+        sound/songs/midi/se_tk_kasya.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);
@@ -655,14 +684,14 @@ SECTIONS {
         sound/songs/midi/se_ru_bari.o(.rodata);
         sound/songs/midi/se_ru_hyuu.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/midi/se_tk_warpin.o(.rodata);
+        sound/songs/midi/se_tk_warpout.o(.rodata);
+        sound/songs/midi/se_tu_saa.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/midi/se_track_move.o(.rodata);
+        sound/songs/midi/se_track_stop.o(.rodata);
+        sound/songs/midi/se_track_haiki.o(.rodata);
+        sound/songs/midi/se_track_door.o(.rodata);
         sound/songs/midi/se_moter.o(.rodata);
         sound/songs/midi/se_card.o(.rodata);
         sound/songs/midi/se_save.o(.rodata);
@@ -672,14 +701,14 @@ SECTIONS {
         sound/songs/midi/se_kon4.o(.rodata);
         sound/songs/midi/se_suikomu.o(.rodata);
         sound/songs/midi/se_nageru.o(.rodata);
-        sound/songs/se_toy_c.o(.rodata);
-        sound/songs/se_toy_d.o(.rodata);
-        sound/songs/se_toy_e.o(.rodata);
-        sound/songs/se_toy_f.o(.rodata);
-        sound/songs/se_toy_g.o(.rodata);
-        sound/songs/se_toy_a.o(.rodata);
-        sound/songs/se_toy_b.o(.rodata);
-        sound/songs/se_toy_c1.o(.rodata);
+        sound/songs/midi/se_toy_c.o(.rodata);
+        sound/songs/midi/se_toy_d.o(.rodata);
+        sound/songs/midi/se_toy_e.o(.rodata);
+        sound/songs/midi/se_toy_f.o(.rodata);
+        sound/songs/midi/se_toy_g.o(.rodata);
+        sound/songs/midi/se_toy_a.o(.rodata);
+        sound/songs/midi/se_toy_b.o(.rodata);
+        sound/songs/midi/se_toy_c1.o(.rodata);
         sound/songs/midi/se_mizu.o(.rodata);
         sound/songs/midi/se_hashi.o(.rodata);
         sound/songs/midi/se_daugi.o(.rodata);
@@ -687,8 +716,8 @@ SECTIONS {
         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/midi/se_toy_kabe.o(.rodata);
+        sound/songs/midi/se_toy_dango.o(.rodata);
         sound/songs/midi/se_doku.o(.rodata);
         sound/songs/midi/se_esuka.o(.rodata);
         sound/songs/midi/se_t_ame.o(.rodata);
@@ -702,8 +731,8 @@ SECTIONS {
         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/midi/se_tamakoro.o(.rodata);
+        sound/songs/midi/se_tamakoro_e.o(.rodata);
         sound/songs/midi/se_basabasa.o(.rodata);
         sound/songs/midi/se_regi.o(.rodata);
         sound/songs/midi/se_c_gaji.o(.rodata);
@@ -717,16 +746,16 @@ SECTIONS {
         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/midi/se_tama.o(.rodata);
         sound/songs/se_z_scroll.o(.rodata);
         sound/songs/se_z_page.o(.rodata);
         sound/songs/midi/se_pn_on.o(.rodata);
         sound/songs/midi/se_pn_off.o(.rodata);
         sound/songs/midi/se_z_search.o(.rodata);
-        sound/songs/se_tamago.o(.rodata);
-        sound/songs/se_tb_start.o(.rodata);
-        sound/songs/se_tb_kon.o(.rodata);
-        sound/songs/se_tb_kara.o(.rodata);
+        sound/songs/midi/se_tamago.o(.rodata);
+        sound/songs/midi/se_tb_start.o(.rodata);
+        sound/songs/midi/se_tb_kon.o(.rodata);
+        sound/songs/midi/se_tb_kara.o(.rodata);
         sound/songs/midi/se_bidoro.o(.rodata);
         sound/songs/se_w085.o(.rodata);
         sound/songs/se_w085b.o(.rodata);
@@ -738,53 +767,53 @@ SECTIONS {
         sound/songs/se_w145b.o(.rodata);
         sound/songs/se_w145c.o(.rodata);
         sound/songs/se_w240.o(.rodata);
-        sound/songs/se_w015.o(.rodata);
+        sound/songs/midi/se_w015.o(.rodata);
         sound/songs/se_w081.o(.rodata);
         sound/songs/se_w081b.o(.rodata);
         sound/songs/se_w088.o(.rodata);
-        sound/songs/se_w016.o(.rodata);
-        sound/songs/se_w016b.o(.rodata);
-        sound/songs/se_w003.o(.rodata);
+        sound/songs/midi/se_w016.o(.rodata);
+        sound/songs/midi/se_w016b.o(.rodata);
+        sound/songs/midi/se_w003.o(.rodata);
         sound/songs/se_w104.o(.rodata);
-        sound/songs/se_w013.o(.rodata);
+        sound/songs/midi/se_w013.o(.rodata);
         sound/songs/se_w196.o(.rodata);
         sound/songs/se_w086.o(.rodata);
-        sound/songs/se_w004.o(.rodata);
-        sound/songs/se_w025.o(.rodata);
-        sound/songs/se_w025b.o(.rodata);
+        sound/songs/midi/se_w004.o(.rodata);
+        sound/songs/midi/se_w025.o(.rodata);
+        sound/songs/midi/se_w025b.o(.rodata);
         sound/songs/se_w152.o(.rodata);
-        sound/songs/se_w026.o(.rodata);
+        sound/songs/midi/se_w026.o(.rodata);
         sound/songs/se_w172.o(.rodata);
         sound/songs/se_w172b.o(.rodata);
         sound/songs/se_w053.o(.rodata);
-        sound/songs/se_w007.o(.rodata);
+        sound/songs/midi/se_w007.o(.rodata);
         sound/songs/se_w092.o(.rodata);
         sound/songs/se_w221.o(.rodata);
         sound/songs/se_w221b.o(.rodata);
         sound/songs/se_w052.o(.rodata);
-        sound/songs/se_w036.o(.rodata);
+        sound/songs/midi/se_w036.o(.rodata);
         sound/songs/se_w059.o(.rodata);
         sound/songs/se_w059b.o(.rodata);
-        sound/songs/se_w010.o(.rodata);
-        sound/songs/se_w011.o(.rodata);
-        sound/songs/se_w017.o(.rodata);
-        sound/songs/se_w019.o(.rodata);
-        sound/songs/se_w028.o(.rodata);
-        sound/songs/se_w013b.o(.rodata);
+        sound/songs/midi/se_w010.o(.rodata);
+        sound/songs/midi/se_w011.o(.rodata);
+        sound/songs/midi/se_w017.o(.rodata);
+        sound/songs/midi/se_w019.o(.rodata);
+        sound/songs/midi/se_w028.o(.rodata);
+        sound/songs/midi/se_w013b.o(.rodata);
         sound/songs/se_w044.o(.rodata);
-        sound/songs/se_w029.o(.rodata);
+        sound/songs/midi/se_w029.o(.rodata);
         sound/songs/se_w057.o(.rodata);
         sound/songs/se_w056.o(.rodata);
         sound/songs/se_w250.o(.rodata);
-        sound/songs/se_w030.o(.rodata);
-        sound/songs/se_w039.o(.rodata);
+        sound/songs/midi/se_w030.o(.rodata);
+        sound/songs/midi/se_w039.o(.rodata);
         sound/songs/se_w054.o(.rodata);
         sound/songs/se_w077.o(.rodata);
-        sound/songs/se_w020.o(.rodata);
+        sound/songs/midi/se_w020.o(.rodata);
         sound/songs/se_w082.o(.rodata);
         sound/songs/se_w047.o(.rodata);
         sound/songs/se_w195.o(.rodata);
-        sound/songs/se_w006.o(.rodata);
+        sound/songs/midi/se_w006.o(.rodata);
         sound/songs/se_w091.o(.rodata);
         sound/songs/se_w146.o(.rodata);
         sound/songs/se_w120.o(.rodata);
@@ -801,8 +830,8 @@ SECTIONS {
         sound/songs/se_w122.o(.rodata);
         sound/songs/se_w060.o(.rodata);
         sound/songs/se_w185.o(.rodata);
-        sound/songs/se_w014.o(.rodata);
-        sound/songs/se_w043.o(.rodata);
+        sound/songs/midi/se_w014.o(.rodata);
+        sound/songs/midi/se_w043.o(.rodata);
         sound/songs/se_w207.o(.rodata);
         sound/songs/se_w207b.o(.rodata);
         sound/songs/se_w215.o(.rodata);
@@ -873,13 +902,13 @@ SECTIONS {
         sound/songs/midi/se_rg_deomov.o(.rodata);
         sound/songs/midi/se_rg_excellent.o(.rodata);
         sound/songs/midi/se_rg_nawamiss.o(.rodata);
-        sound/songs/se_toreeye.o(.rodata);
-        sound/songs/se_toreoff.o(.rodata);
+        sound/songs/midi/se_toreeye.o(.rodata);
+        sound/songs/midi/se_toreoff.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/se_ussoki.o(.rodata);
         sound/songs/midi/mus_tetsuji.o(.rodata);
         sound/songs/midi/mus_field13.o(.rodata);
         sound/songs/midi/mus_kachi22.o(.rodata);