Merge remote-tracking branch 'upstream/master' into shop

# Conflicts:
#	asm/shop.s

1 files changed, 332 insertions, 333 deletions

diff --git a/ld_script.txt b/ld_script.txt
index 1a94ae87a..336c96d1e 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -111,10 +111,10 @@ SECTIONS {
         src/palette.o(.text);
         src/sound.o(.text);
         src/battle_anim.o(.text);
-        asm/battle_anim_80A5C6C.o(.text);
+        src/battle_anim_80A5C6C.o(.text);
         src/task.o(.text);
         src/reshow_battle_screen.o(.text);
-        asm/battle_anim_80A9C70.o(.text);
+        src/battle_anim_80A9C70.o(.text);
         src/title_screen.o(.text);
         asm/field_screen.o(.text);
         src/battle_setup.o(.text);
@@ -134,7 +134,7 @@ SECTIONS {
         src/mail_data.o(.text);
         src/map_name_popup.o(.text);
         src/item_menu_icons.o(.text);
-        asm/battle_anim_80D51AC.o(.text);
+        src/battle_anim_80D51AC.o(.text);
         src/item.o(.text);
         src/contest.o(.text);
         asm/contest.o(.text);
@@ -172,7 +172,6 @@ SECTIONS {
         asm/cute_sketch.o(.text);
         src/decoration.o(.text);
         src/slot_machine.o(.text);
-        asm/slot_machine.o(.text);
         asm/contest_painting.o(.text);
         src/battle_ai_script_commands.o(.text);
         src/trader.o(.text);
@@ -200,7 +199,7 @@ SECTIONS {
         asm/cable_car.o(.text);
         src/math_util.o(.text);
         asm/roulette_util.o(.text);
-        asm/cable_car_util.o(.text);
+        src/rom_81520A8.o(.text);
         src/save.o(.text);
         src/mystery_event_script.o(.text);
         asm/field_effect_helpers.o(.text);
@@ -248,6 +247,7 @@ SECTIONS {
         src/battle_frontier_1.o(.text);
         asm/battle_frontier_1.o(.text);
         src/menu.o(.text);
+        src/battle_factory.o(.text);
         asm/battle_frontier_2.o(.text);
         src/item_menu.o(.text);
         src/list_menu.o(.text);
@@ -256,7 +256,6 @@ SECTIONS {
         src/item_icon.o(.text);
         asm/party_menu.o(.text);
         src/battle_tent.o(.text);
-        asm/battle_tent.o(.text);
         src/unk_text_util_2.o(.text);
         src/multiboot.o(.text);
         src/unk_81BAD84.o(.text);
@@ -381,9 +380,9 @@ SECTIONS {
         src/rtc.o(.rodata);
         src/main_menu.o(.rodata);
         src/rom_8034C54.o(.rodata);
-        data/data2b.o(.rodata);
         src/data2b.o(.rodata);
         src/battle_data.o(.rodata);
+        src/battle_bg.o(.rodata);
         data/data2c.o(.rodata);
         src/battle_main.o(.rodata);
         src/battle_util.o(.rodata);
@@ -410,7 +409,6 @@ SECTIONS {
         src/metatile_behavior.o(.rodata);
         src/field_door.o(.rodata);
         src/field_player_avatar.o(.rodata);
-        data/field_player_avatar.o(.rodata);
         src/event_object_movement.o(.rodata);
         src/text_window.o(.rodata);
         src/scrcmd.o(.rodata);
@@ -423,9 +421,10 @@ SECTIONS {
         data/fanfares.o(.rodata);
         data/battle_anims.o(.rodata);
         src/battle_anim.o(.rodata);
-        data/rom_8525F58.o(.rodata);
+        src/battle_anim_80A5C6C.o(.rodata);
         data/map_events.o(.rodata);
         data/battle_anim_80A9C70.o(.rodata);
+        src/battle_anim_80A9C70.o(.rodata);
         src/title_screen.o(.rodata);
         data/field_screen.o(.rodata);
         src/battle_setup.o(.rodata);
@@ -457,9 +456,9 @@ SECTIONS {
         data/script_pokemon_util_80F87D8.o(.rodata);
         src/pokemon_size_record.o(.rodata)
         data/field_effect_misc.o(.rodata);
-        data/field_special_scene.o(.rodata);
+        src/field_special_scene.o(.rodata);
         src/rotating_gate.o(.rodata);
-        data/item_use.o(.rodata);
+        src/item_use.o(.rodata);
         data/battle_anim_80FE840.o(.rodata);
         src/bike.o(.rodata);
         data/easy_chat.o(.rodata);
@@ -476,7 +475,7 @@ SECTIONS {
         data/contest_painting.o(.rodata);
         src/battle_ai_script_commands.o(.rodata);
         src/trader.o(.rodata);
-        data/starter_choose.o(.rodata);
+        src/starter_choose.o(.rodata);
         src/wallclock.o(.rodata);
         src/pokeblock.o(.rodata);
         src/fldeff_flash.o(.rodata);
@@ -515,7 +514,7 @@ SECTIONS {
         src/berry_tag_screen.o(.rodata);
         src/mystery_event_menu.o(.rodata);
         src/save_failed_screen.o(.rodata);
-        data/braille_puzzles.o(.rodata);
+        src/braille_puzzles.o(.rodata);
         src/pokeblock_feed.o(.rodata);
         src/clear_save_data_screen.o(.rodata);
         src/intro_credits_graphics.o(.rodata);
@@ -530,6 +529,7 @@ SECTIONS {
         src/battle_dome.o(.rodata);
         data/battle_frontier_1.o(.rodata);
         src/menu.o(.rodata);
+        src/battle_factory.o(.rodata);
         data/battle_frontier_2.o(.rodata);
         src/item_menu.o(.rodata);
         src/list_menu.o(.rodata);
@@ -546,7 +546,6 @@ SECTIONS {
         src/pokemon_summary_screen.o(.rodata);
         src/unk_pokedex_area_screen_helper.o(.rodata);
         src/battle_pyramid_bag.o(.rodata);
-        data/battle_pyramid_bag.o(.rodata);
         data/pokenav.o(.rodata);
         src/match_call.o(.rodata);
         data/pokenav.o(.rodata.after.match.call);
@@ -566,66 +565,66 @@ SECTIONS {
     song_data :
     ALIGN(4)
     {
-        sound/songs/mus_dummy.o(.rodata);
-        sound/songs/se_kaifuku.o(.rodata);
+        sound/songs/midi/mus_dummy.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);
@@ -637,16 +636,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);
@@ -655,35 +654,35 @@ 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);
         sound/songs/se_pn_on.o(.rodata);
         sound/songs/se_pn_off.o(.rodata);
-        sound/songs/se_z_search.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/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);
@@ -831,271 +830,271 @@ 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/mus_tetsuji.o(.rodata);
-        sound/songs/mus_field13.o(.rodata);
-        sound/songs/mus_kachi22.o(.rodata);
-        sound/songs/mus_kachi2.o(.rodata);
-        sound/songs/mus_kachi3.o(.rodata);
-        sound/songs/mus_kachi5.o(.rodata);
-        sound/songs/mus_pcc.o(.rodata);
-        sound/songs/mus_nibi.o(.rodata);
-        sound/songs/mus_suikun.o(.rodata);
-        sound/songs/mus_dooro1.o(.rodata);
-        sound/songs/mus_dooro_x1.o(.rodata);
-        sound/songs/mus_dooro_x3.o(.rodata);
-        sound/songs/mus_machi_s2.o(.rodata);
-        sound/songs/mus_machi_s4.o(.rodata);
-        sound/songs/mus_gim.o(.rodata);
-        sound/songs/mus_naminori.o(.rodata);
-        sound/songs/mus_dan01.o(.rodata);
-        sound/songs/mus_fanfa1.o(.rodata);
-        sound/songs/mus_me_asa.o(.rodata);
-        sound/songs/mus_me_bachi.o(.rodata);
-        sound/songs/mus_fanfa4.o(.rodata);
-        sound/songs/mus_fanfa5.o(.rodata);
-        sound/songs/mus_me_waza.o(.rodata);
-        sound/songs/mus_bijyutu.o(.rodata);
-        sound/songs/mus_dooro_x4.o(.rodata);
-        sound/songs/mus_fune_kan.o(.rodata);
-        sound/songs/mus_me_shinka.o(.rodata);
-        sound/songs/mus_shinka.o(.rodata);
-        sound/songs/mus_me_wasure.o(.rodata);
-        sound/songs/mus_syoujoeye.o(.rodata);
-        sound/songs/mus_boyeye.o(.rodata);
-        sound/songs/mus_dan02.o(.rodata);
-        sound/songs/mus_machi_s3.o(.rodata);
-        sound/songs/mus_odamaki.o(.rodata);
-        sound/songs/mus_b_tower.o(.rodata);
-        sound/songs/mus_swimeye.o(.rodata);
-        sound/songs/mus_dan03.o(.rodata);
-        sound/songs/mus_me_kinomi.o(.rodata);
-        sound/songs/mus_me_tama.o(.rodata);
-        sound/songs/mus_me_b_big.o(.rodata);
-        sound/songs/mus_me_b_small.o(.rodata);
-        sound/songs/mus_me_zannen.o(.rodata);
-        sound/songs/mus_bd_time.o(.rodata);
-        sound/songs/mus_test1.o(.rodata);
-        sound/songs/mus_test2.o(.rodata);
-        sound/songs/mus_test3.o(.rodata);
-        sound/songs/mus_test4.o(.rodata);
-        sound/songs/mus_test.o(.rodata);
-        sound/songs/mus_gomachi0.o(.rodata);
-        sound/songs/mus_gotown.o(.rodata);
-        sound/songs/mus_pokecen.o(.rodata);
-        sound/songs/mus_nextroad.o(.rodata);
-        sound/songs/mus_granroad.o(.rodata);
-        sound/songs/mus_cycling.o(.rodata);
-        sound/songs/mus_friendly.o(.rodata);
-        sound/songs/mus_mishiro.o(.rodata);
-        sound/songs/mus_tozan.o(.rodata);
-        sound/songs/mus_girleye.o(.rodata);
-        sound/songs/mus_minamo.o(.rodata);
-        sound/songs/mus_ashroad.o(.rodata);
-        sound/songs/mus_event0.o(.rodata);
-        sound/songs/mus_deepdeep.o(.rodata);
-        sound/songs/mus_kachi1.o(.rodata);
-        sound/songs/mus_title3.o(.rodata);
-        sound/songs/mus_demo1.o(.rodata);
-        sound/songs/mus_girl_sup.o(.rodata);
-        sound/songs/mus_hageshii.o(.rodata);
-        sound/songs/mus_kakkoii.o(.rodata);
-        sound/songs/mus_kazanbai.o(.rodata);
-        sound/songs/mus_aqa_0.o(.rodata);
-        sound/songs/mus_tsuretek.o(.rodata);
-        sound/songs/mus_boy_sup.o(.rodata);
-        sound/songs/mus_rainbow.o(.rodata);
-        sound/songs/mus_ayasii.o(.rodata);
-        sound/songs/mus_kachi4.o(.rodata);
-        sound/songs/mus_ropeway.o(.rodata);
-        sound/songs/mus_casino.o(.rodata);
-        sound/songs/mus_hightown.o(.rodata);
-        sound/songs/mus_safari.o(.rodata);
-        sound/songs/mus_c_road.o(.rodata);
-        sound/songs/mus_ajito.o(.rodata);
-        sound/songs/mus_m_boat.o(.rodata);
-        sound/songs/mus_m_dungon.o(.rodata);
-        sound/songs/mus_finecity.o(.rodata);
-        sound/songs/mus_machupi.o(.rodata);
-        sound/songs/mus_p_school.o(.rodata);
-        sound/songs/mus_dendou.o(.rodata);
-        sound/songs/mus_tonekusa.o(.rodata);
-        sound/songs/mus_maborosi.o(.rodata);
-        sound/songs/mus_con_fan.o(.rodata);
-        sound/songs/mus_contest0.o(.rodata);
-        sound/songs/mus_mgm0.o(.rodata);
-        sound/songs/mus_t_battle.o(.rodata);
-        sound/songs/mus_ooame.o(.rodata);
-        sound/songs/mus_hideri.o(.rodata);
-        sound/songs/mus_runecity.o(.rodata);
-        sound/songs/mus_con_k.o(.rodata);
-        sound/songs/mus_eikou_r.o(.rodata);
-        sound/songs/mus_karakuri.o(.rodata);
-        sound/songs/mus_hutago.o(.rodata);
-        sound/songs/mus_sitennou.o(.rodata);
-        sound/songs/mus_yama_eye.o(.rodata);
-        sound/songs/mus_conlobby.o(.rodata);
-        sound/songs/mus_inter_v.o(.rodata);
-        sound/songs/mus_daigo.o(.rodata);
-        sound/songs/mus_thankfor.o(.rodata);
-        sound/songs/mus_end.o(.rodata);
-        sound/songs/mus_b_frontier.o(.rodata);
-        sound/songs/mus_b_arena.o(.rodata);
-        sound/songs/mus_me_pointget.o(.rodata);
-        sound/songs/mus_me_tore_eye.o(.rodata);
-        sound/songs/mus_pyramid.o(.rodata);
-        sound/songs/mus_pyramid_top.o(.rodata);
-        sound/songs/mus_b_palace.o(.rodata);
-        sound/songs/mus_rekkuu_kourin.o(.rodata);
-        sound/songs/mus_sattower.o(.rodata);
-        sound/songs/mus_me_symbolget.o(.rodata);
-        sound/songs/mus_b_dome.o(.rodata);
-        sound/songs/mus_b_tube.o(.rodata);
-        sound/songs/mus_b_factory.o(.rodata);
-        sound/songs/mus_vs_rekku.o(.rodata);
-        sound/songs/mus_vs_front.o(.rodata);
-        sound/songs/mus_vs_mew.o(.rodata);
-        sound/songs/mus_b_dome1.o(.rodata);
-        sound/songs/mus_battle27.o(.rodata);
-        sound/songs/mus_battle31.o(.rodata);
-        sound/songs/mus_battle20.o(.rodata);
-        sound/songs/mus_battle32.o(.rodata);
-        sound/songs/mus_battle33.o(.rodata);
-        sound/songs/mus_battle36.o(.rodata);
-        sound/songs/mus_battle34.o(.rodata);
-        sound/songs/mus_battle35.o(.rodata);
-        sound/songs/mus_battle38.o(.rodata);
-        sound/songs/mus_battle30.o(.rodata);
-        sound/songs/mus_rg_annai.o(.rodata);
-        sound/songs/mus_rg_slot.o(.rodata);
-        sound/songs/mus_rg_ajito.o(.rodata);
-        sound/songs/mus_rg_gym.o(.rodata);
-        sound/songs/mus_rg_purin.o(.rodata);
-        sound/songs/mus_rg_demo.o(.rodata);
-        sound/songs/mus_rg_title.o(.rodata);
-        sound/songs/mus_rg_guren.o(.rodata);
-        sound/songs/mus_rg_shion.o(.rodata);
-        sound/songs/mus_rg_kaihuku.o(.rodata);
-        sound/songs/mus_rg_cycling.o(.rodata);
-        sound/songs/mus_rg_rocket.o(.rodata);
-        sound/songs/mus_rg_shoujo.o(.rodata);
-        sound/songs/mus_rg_shounen.o(.rodata);
-        sound/songs/mus_rg_dendou.o(.rodata);
-        sound/songs/mus_rg_t_mori.o(.rodata);
-        sound/songs/mus_rg_otsukimi.o(.rodata);
-        sound/songs/mus_rg_pokeyashi.o(.rodata);
-        sound/songs/mus_rg_ending.o(.rodata);
-        sound/songs/mus_rg_load01.o(.rodata);
-        sound/songs/mus_rg_opening.o(.rodata);
-        sound/songs/mus_rg_load02.o(.rodata);
-        sound/songs/mus_rg_load03.o(.rodata);
-        sound/songs/mus_rg_champ_r.o(.rodata);
-        sound/songs/mus_rg_vs_gym.o(.rodata);
-        sound/songs/mus_rg_vs_tore.o(.rodata);
-        sound/songs/mus_rg_vs_yasei.o(.rodata);
-        sound/songs/mus_rg_vs_last.o(.rodata);
-        sound/songs/mus_rg_masara.o(.rodata);
-        sound/songs/mus_rg_kenkyu.o(.rodata);
-        sound/songs/mus_rg_ohkido.o(.rodata);
-        sound/songs/mus_rg_pokecen.o(.rodata);
-        sound/songs/mus_rg_santoan.o(.rodata);
-        sound/songs/mus_rg_naminori.o(.rodata);
-        sound/songs/mus_rg_p_tower.o(.rodata);
-        sound/songs/mus_rg_shiruhu.o(.rodata);
-        sound/songs/mus_rg_hanada.o(.rodata);
-        sound/songs/mus_rg_tamamusi.o(.rodata);
-        sound/songs/mus_rg_win_tre.o(.rodata);
-        sound/songs/mus_rg_win_yasei.o(.rodata);
-        sound/songs/mus_rg_win_gym.o(.rodata);
-        sound/songs/mus_rg_kuchiba.o(.rodata);
-        sound/songs/mus_rg_nibi.o(.rodata);
-        sound/songs/mus_rg_rival1.o(.rodata);
-        sound/songs/mus_rg_rival2.o(.rodata);
-        sound/songs/mus_rg_fan2.o(.rodata);
-        sound/songs/mus_rg_fan5.o(.rodata);
-        sound/songs/mus_rg_fan6.o(.rodata);
-        sound/songs/mus_me_rg_photo.o(.rodata);
-        sound/songs/mus_rg_titlerog.o(.rodata);
-        sound/songs/mus_rg_get_yasei.o(.rodata);
-        sound/songs/mus_rg_sousa.o(.rodata);
-        sound/songs/mus_rg_sekaikan.o(.rodata);
-        sound/songs/mus_rg_seibetu.o(.rodata);
-        sound/songs/mus_rg_jump.o(.rodata);
-        sound/songs/mus_rg_union.o(.rodata);
-        sound/songs/mus_rg_network.o(.rodata);
-        sound/songs/mus_rg_okurimono.o(.rodata);
-        sound/songs/mus_rg_kinomikui.o(.rodata);
-        sound/songs/mus_rg_nanadungeon.o(.rodata);
-        sound/songs/mus_rg_oshie_tv.o(.rodata);
-        sound/songs/mus_rg_nanashima.o(.rodata);
-        sound/songs/mus_rg_nanaiseki.o(.rodata);
-        sound/songs/mus_rg_nana123.o(.rodata);
-        sound/songs/mus_rg_nana45.o(.rodata);
-        sound/songs/mus_rg_nana67.o(.rodata);
-        sound/songs/mus_rg_pokefue.o(.rodata);
-        sound/songs/mus_rg_vs_deo.o(.rodata);
-        sound/songs/mus_rg_vs_myu2.o(.rodata);
-        sound/songs/mus_rg_vs_den.o(.rodata);
-        sound/songs/mus_rg_exeye.o(.rodata);
-        sound/songs/mus_rg_deoeye.o(.rodata);
-        sound/songs/mus_rg_t_tower.o(.rodata);
-        sound/songs/mus_rg_slowmasara.o(.rodata);
-        sound/songs/mus_rg_tvnoize.o(.rodata);
-        sound/songs/ph_trap_blend.o(.rodata);
-        sound/songs/ph_trap_held.o(.rodata);
-        sound/songs/ph_trap_solo.o(.rodata);
-        sound/songs/ph_face_blend.o(.rodata);
-        sound/songs/ph_face_held.o(.rodata);
-        sound/songs/ph_face_solo.o(.rodata);
-        sound/songs/ph_cloth_blend.o(.rodata);
-        sound/songs/ph_cloth_held.o(.rodata);
-        sound/songs/ph_cloth_solo.o(.rodata);
-        sound/songs/ph_dress_blend.o(.rodata);
-        sound/songs/ph_dress_held.o(.rodata);
-        sound/songs/ph_dress_solo.o(.rodata);
-        sound/songs/ph_fleece_blend.o(.rodata);
-        sound/songs/ph_fleece_held.o(.rodata);
-        sound/songs/ph_fleece_solo.o(.rodata);
-        sound/songs/ph_kit_blend.o(.rodata);
-        sound/songs/ph_kit_held.o(.rodata);
-        sound/songs/ph_kit_solo.o(.rodata);
-        sound/songs/ph_price_blend.o(.rodata);
-        sound/songs/ph_price_held.o(.rodata);
-        sound/songs/ph_price_solo.o(.rodata);
-        sound/songs/ph_lot_blend.o(.rodata);
-        sound/songs/ph_lot_held.o(.rodata);
-        sound/songs/ph_lot_solo.o(.rodata);
-        sound/songs/ph_goat_blend.o(.rodata);
-        sound/songs/ph_goat_held.o(.rodata);
-        sound/songs/ph_goat_solo.o(.rodata);
-        sound/songs/ph_thought_blend.o(.rodata);
-        sound/songs/ph_thought_held.o(.rodata);
-        sound/songs/ph_thought_solo.o(.rodata);
-        sound/songs/ph_choice_blend.o(.rodata);
-        sound/songs/ph_choice_held.o(.rodata);
-        sound/songs/ph_choice_solo.o(.rodata);
-        sound/songs/ph_mouth_blend.o(.rodata);
-        sound/songs/ph_mouth_held.o(.rodata);
-        sound/songs/ph_mouth_solo.o(.rodata);
-        sound/songs/ph_foot_blend.o(.rodata);
-        sound/songs/ph_foot_held.o(.rodata);
-        sound/songs/ph_foot_solo.o(.rodata);
-        sound/songs/ph_goose_blend.o(.rodata);
-        sound/songs/ph_goose_held.o(.rodata);
-        sound/songs/ph_goose_solo.o(.rodata);
-        sound/songs/ph_strut_blend.o(.rodata);
-        sound/songs/ph_strut_held.o(.rodata);
-        sound/songs/ph_strut_solo.o(.rodata);
-        sound/songs/ph_cure_blend.o(.rodata);
-        sound/songs/ph_cure_held.o(.rodata);
-        sound/songs/ph_cure_solo.o(.rodata);
-        sound/songs/ph_nurse_blend.o(.rodata);
-        sound/songs/ph_nurse_held.o(.rodata);
-        sound/songs/ph_nurse_solo.o(.rodata);
+        sound/songs/midi/mus_tetsuji.o(.rodata);
+        sound/songs/midi/mus_field13.o(.rodata);
+        sound/songs/midi/mus_kachi22.o(.rodata);
+        sound/songs/midi/mus_kachi2.o(.rodata);
+        sound/songs/midi/mus_kachi3.o(.rodata);
+        sound/songs/midi/mus_kachi5.o(.rodata);
+        sound/songs/midi/mus_pcc.o(.rodata);
+        sound/songs/midi/mus_nibi.o(.rodata);
+        sound/songs/midi/mus_suikun.o(.rodata);
+        sound/songs/midi/mus_dooro1.o(.rodata);
+        sound/songs/midi/mus_dooro_x1.o(.rodata);
+        sound/songs/midi/mus_dooro_x3.o(.rodata);
+        sound/songs/midi/mus_machi_s2.o(.rodata);
+        sound/songs/midi/mus_machi_s4.o(.rodata);
+        sound/songs/midi/mus_gim.o(.rodata);
+        sound/songs/midi/mus_naminori.o(.rodata);
+        sound/songs/midi/mus_dan01.o(.rodata);
+        sound/songs/midi/mus_fanfa1.o(.rodata);
+        sound/songs/midi/mus_me_asa.o(.rodata);
+        sound/songs/midi/mus_me_bachi.o(.rodata);
+        sound/songs/midi/mus_fanfa4.o(.rodata);
+        sound/songs/midi/mus_fanfa5.o(.rodata);
+        sound/songs/midi/mus_me_waza.o(.rodata);
+        sound/songs/midi/mus_bijyutu.o(.rodata);
+        sound/songs/midi/mus_dooro_x4.o(.rodata);
+        sound/songs/midi/mus_fune_kan.o(.rodata);
+        sound/songs/midi/mus_me_shinka.o(.rodata);
+        sound/songs/midi/mus_shinka.o(.rodata);
+        sound/songs/midi/mus_me_wasure.o(.rodata);
+        sound/songs/midi/mus_syoujoeye.o(.rodata);
+        sound/songs/midi/mus_boyeye.o(.rodata);
+        sound/songs/midi/mus_dan02.o(.rodata);
+        sound/songs/midi/mus_machi_s3.o(.rodata);
+        sound/songs/midi/mus_odamaki.o(.rodata);
+        sound/songs/midi/mus_b_tower.o(.rodata);
+        sound/songs/midi/mus_swimeye.o(.rodata);
+        sound/songs/midi/mus_dan03.o(.rodata);
+        sound/songs/midi/mus_me_kinomi.o(.rodata);
+        sound/songs/midi/mus_me_tama.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_zannen.o(.rodata);
+        sound/songs/midi/mus_bd_time.o(.rodata);
+        sound/songs/midi/mus_test1.o(.rodata);
+        sound/songs/midi/mus_test2.o(.rodata);
+        sound/songs/midi/mus_test3.o(.rodata);
+        sound/songs/midi/mus_test4.o(.rodata);
+        sound/songs/midi/mus_test.o(.rodata);
+        sound/songs/midi/mus_gomachi0.o(.rodata);
+        sound/songs/midi/mus_gotown.o(.rodata);
+        sound/songs/midi/mus_pokecen.o(.rodata);
+        sound/songs/midi/mus_nextroad.o(.rodata);
+        sound/songs/midi/mus_granroad.o(.rodata);
+        sound/songs/midi/mus_cycling.o(.rodata);
+        sound/songs/midi/mus_friendly.o(.rodata);
+        sound/songs/midi/mus_mishiro.o(.rodata);
+        sound/songs/midi/mus_tozan.o(.rodata);
+        sound/songs/midi/mus_girleye.o(.rodata);
+        sound/songs/midi/mus_minamo.o(.rodata);
+        sound/songs/midi/mus_ashroad.o(.rodata);
+        sound/songs/midi/mus_event0.o(.rodata);
+        sound/songs/midi/mus_deepdeep.o(.rodata);
+        sound/songs/midi/mus_kachi1.o(.rodata);
+        sound/songs/midi/mus_title3.o(.rodata);
+        sound/songs/midi/mus_demo1.o(.rodata);
+        sound/songs/midi/mus_girl_sup.o(.rodata);
+        sound/songs/midi/mus_hageshii.o(.rodata);
+        sound/songs/midi/mus_kakkoii.o(.rodata);
+        sound/songs/midi/mus_kazanbai.o(.rodata);
+        sound/songs/midi/mus_aqa_0.o(.rodata);
+        sound/songs/midi/mus_tsuretek.o(.rodata);
+        sound/songs/midi/mus_boy_sup.o(.rodata);
+        sound/songs/midi/mus_rainbow.o(.rodata);
+        sound/songs/midi/mus_ayasii.o(.rodata);
+        sound/songs/midi/mus_kachi4.o(.rodata);
+        sound/songs/midi/mus_ropeway.o(.rodata);
+        sound/songs/midi/mus_casino.o(.rodata);
+        sound/songs/midi/mus_hightown.o(.rodata);
+        sound/songs/midi/mus_safari.o(.rodata);
+        sound/songs/midi/mus_c_road.o(.rodata);
+        sound/songs/midi/mus_ajito.o(.rodata);
+        sound/songs/midi/mus_m_boat.o(.rodata);
+        sound/songs/midi/mus_m_dungon.o(.rodata);
+        sound/songs/midi/mus_finecity.o(.rodata);
+        sound/songs/midi/mus_machupi.o(.rodata);
+        sound/songs/midi/mus_p_school.o(.rodata);
+        sound/songs/midi/mus_dendou.o(.rodata);
+        sound/songs/midi/mus_tonekusa.o(.rodata);
+        sound/songs/midi/mus_maborosi.o(.rodata);
+        sound/songs/midi/mus_con_fan.o(.rodata);
+        sound/songs/midi/mus_contest0.o(.rodata);
+        sound/songs/midi/mus_mgm0.o(.rodata);
+        sound/songs/midi/mus_t_battle.o(.rodata);
+        sound/songs/midi/mus_ooame.o(.rodata);
+        sound/songs/midi/mus_hideri.o(.rodata);
+        sound/songs/midi/mus_runecity.o(.rodata);
+        sound/songs/midi/mus_con_k.o(.rodata);
+        sound/songs/midi/mus_eikou_r.o(.rodata);
+        sound/songs/midi/mus_karakuri.o(.rodata);
+        sound/songs/midi/mus_hutago.o(.rodata);
+        sound/songs/midi/mus_sitennou.o(.rodata);
+        sound/songs/midi/mus_yama_eye.o(.rodata);
+        sound/songs/midi/mus_conlobby.o(.rodata);
+        sound/songs/midi/mus_inter_v.o(.rodata);
+        sound/songs/midi/mus_daigo.o(.rodata);
+        sound/songs/midi/mus_thankfor.o(.rodata);
+        sound/songs/midi/mus_end.o(.rodata);
+        sound/songs/midi/mus_b_frontier.o(.rodata);
+        sound/songs/midi/mus_b_arena.o(.rodata);
+        sound/songs/midi/mus_me_pointget.o(.rodata);
+        sound/songs/midi/mus_me_tore_eye.o(.rodata);
+        sound/songs/midi/mus_pyramid.o(.rodata);
+        sound/songs/midi/mus_pyramid_top.o(.rodata);
+        sound/songs/midi/mus_b_palace.o(.rodata);
+        sound/songs/midi/mus_rekkuu_kourin.o(.rodata);
+        sound/songs/midi/mus_sattower.o(.rodata);
+        sound/songs/midi/mus_me_symbolget.o(.rodata);
+        sound/songs/midi/mus_b_dome.o(.rodata);
+        sound/songs/midi/mus_b_tube.o(.rodata);
+        sound/songs/midi/mus_b_factory.o(.rodata);
+        sound/songs/midi/mus_vs_rekku.o(.rodata);
+        sound/songs/midi/mus_vs_front.o(.rodata);
+        sound/songs/midi/mus_vs_mew.o(.rodata);
+        sound/songs/midi/mus_b_dome1.o(.rodata);
+        sound/songs/midi/mus_battle27.o(.rodata);
+        sound/songs/midi/mus_battle31.o(.rodata);
+        sound/songs/midi/mus_battle20.o(.rodata);
+        sound/songs/midi/mus_battle32.o(.rodata);
+        sound/songs/midi/mus_battle33.o(.rodata);
+        sound/songs/midi/mus_battle36.o(.rodata);
+        sound/songs/midi/mus_battle34.o(.rodata);
+        sound/songs/midi/mus_battle35.o(.rodata);
+        sound/songs/midi/mus_battle38.o(.rodata);
+        sound/songs/midi/mus_battle30.o(.rodata);
+        sound/songs/midi/mus_rg_annai.o(.rodata);
+        sound/songs/midi/mus_rg_slot.o(.rodata);
+        sound/songs/midi/mus_rg_ajito.o(.rodata);
+        sound/songs/midi/mus_rg_gym.o(.rodata);
+        sound/songs/midi/mus_rg_purin.o(.rodata);
+        sound/songs/midi/mus_rg_demo.o(.rodata);
+        sound/songs/midi/mus_rg_title.o(.rodata);
+        sound/songs/midi/mus_rg_guren.o(.rodata);
+        sound/songs/midi/mus_rg_shion.o(.rodata);
+        sound/songs/midi/mus_rg_kaihuku.o(.rodata);
+        sound/songs/midi/mus_rg_cycling.o(.rodata);
+        sound/songs/midi/mus_rg_rocket.o(.rodata);
+        sound/songs/midi/mus_rg_shoujo.o(.rodata);
+        sound/songs/midi/mus_rg_shounen.o(.rodata);
+        sound/songs/midi/mus_rg_dendou.o(.rodata);
+        sound/songs/midi/mus_rg_t_mori.o(.rodata);
+        sound/songs/midi/mus_rg_otsukimi.o(.rodata);
+        sound/songs/midi/mus_rg_pokeyashi.o(.rodata);
+        sound/songs/midi/mus_rg_ending.o(.rodata);
+        sound/songs/midi/mus_rg_load01.o(.rodata);
+        sound/songs/midi/mus_rg_opening.o(.rodata);
+        sound/songs/midi/mus_rg_load02.o(.rodata);
+        sound/songs/midi/mus_rg_load03.o(.rodata);
+        sound/songs/midi/mus_rg_champ_r.o(.rodata);
+        sound/songs/midi/mus_rg_vs_gym.o(.rodata);
+        sound/songs/midi/mus_rg_vs_tore.o(.rodata);
+        sound/songs/midi/mus_rg_vs_yasei.o(.rodata);
+        sound/songs/midi/mus_rg_vs_last.o(.rodata);
+        sound/songs/midi/mus_rg_masara.o(.rodata);
+        sound/songs/midi/mus_rg_kenkyu.o(.rodata);
+        sound/songs/midi/mus_rg_ohkido.o(.rodata);
+        sound/songs/midi/mus_rg_pokecen.o(.rodata);
+        sound/songs/midi/mus_rg_santoan.o(.rodata);
+        sound/songs/midi/mus_rg_naminori.o(.rodata);
+        sound/songs/midi/mus_rg_p_tower.o(.rodata);
+        sound/songs/midi/mus_rg_shiruhu.o(.rodata);
+        sound/songs/midi/mus_rg_hanada.o(.rodata);
+        sound/songs/midi/mus_rg_tamamusi.o(.rodata);
+        sound/songs/midi/mus_rg_win_tre.o(.rodata);
+        sound/songs/midi/mus_rg_win_yasei.o(.rodata);
+        sound/songs/midi/mus_rg_win_gym.o(.rodata);
+        sound/songs/midi/mus_rg_kuchiba.o(.rodata);
+        sound/songs/midi/mus_rg_nibi.o(.rodata);
+        sound/songs/midi/mus_rg_rival1.o(.rodata);
+        sound/songs/midi/mus_rg_rival2.o(.rodata);
+        sound/songs/midi/mus_rg_fan2.o(.rodata);
+        sound/songs/midi/mus_rg_fan5.o(.rodata);
+        sound/songs/midi/mus_rg_fan6.o(.rodata);
+        sound/songs/midi/mus_me_rg_photo.o(.rodata);
+        sound/songs/midi/mus_rg_titlerog.o(.rodata);
+        sound/songs/midi/mus_rg_get_yasei.o(.rodata);
+        sound/songs/midi/mus_rg_sousa.o(.rodata);
+        sound/songs/midi/mus_rg_sekaikan.o(.rodata);
+        sound/songs/midi/mus_rg_seibetu.o(.rodata);
+        sound/songs/midi/mus_rg_jump.o(.rodata);
+        sound/songs/midi/mus_rg_union.o(.rodata);
+        sound/songs/midi/mus_rg_network.o(.rodata);
+        sound/songs/midi/mus_rg_okurimono.o(.rodata);
+        sound/songs/midi/mus_rg_kinomikui.o(.rodata);
+        sound/songs/midi/mus_rg_nanadungeon.o(.rodata);
+        sound/songs/midi/mus_rg_oshie_tv.o(.rodata);
+        sound/songs/midi/mus_rg_nanashima.o(.rodata);
+        sound/songs/midi/mus_rg_nanaiseki.o(.rodata);
+        sound/songs/midi/mus_rg_nana123.o(.rodata);
+        sound/songs/midi/mus_rg_nana45.o(.rodata);
+        sound/songs/midi/mus_rg_nana67.o(.rodata);
+        sound/songs/midi/mus_rg_pokefue.o(.rodata);
+        sound/songs/midi/mus_rg_vs_deo.o(.rodata);
+        sound/songs/midi/mus_rg_vs_myu2.o(.rodata);
+        sound/songs/midi/mus_rg_vs_den.o(.rodata);
+        sound/songs/midi/mus_rg_exeye.o(.rodata);
+        sound/songs/midi/mus_rg_deoeye.o(.rodata);
+        sound/songs/midi/mus_rg_t_tower.o(.rodata);
+        sound/songs/midi/mus_rg_slowmasara.o(.rodata);
+        sound/songs/midi/mus_rg_tvnoize.o(.rodata);
+        sound/songs/midi/ph_trap_blend.o(.rodata);
+        sound/songs/midi/ph_trap_held.o(.rodata);
+        sound/songs/midi/ph_trap_solo.o(.rodata);
+        sound/songs/midi/ph_face_blend.o(.rodata);
+        sound/songs/midi/ph_face_held.o(.rodata);
+        sound/songs/midi/ph_face_solo.o(.rodata);
+        sound/songs/midi/ph_cloth_blend.o(.rodata);
+        sound/songs/midi/ph_cloth_held.o(.rodata);
+        sound/songs/midi/ph_cloth_solo.o(.rodata);
+        sound/songs/midi/ph_dress_blend.o(.rodata);
+        sound/songs/midi/ph_dress_held.o(.rodata);
+        sound/songs/midi/ph_dress_solo.o(.rodata);
+        sound/songs/midi/ph_fleece_blend.o(.rodata);
+        sound/songs/midi/ph_fleece_held.o(.rodata);
+        sound/songs/midi/ph_fleece_solo.o(.rodata);
+        sound/songs/midi/ph_kit_blend.o(.rodata);
+        sound/songs/midi/ph_kit_held.o(.rodata);
+        sound/songs/midi/ph_kit_solo.o(.rodata);
+        sound/songs/midi/ph_price_blend.o(.rodata);
+        sound/songs/midi/ph_price_held.o(.rodata);
+        sound/songs/midi/ph_price_solo.o(.rodata);
+        sound/songs/midi/ph_lot_blend.o(.rodata);
+        sound/songs/midi/ph_lot_held.o(.rodata);
+        sound/songs/midi/ph_lot_solo.o(.rodata);
+        sound/songs/midi/ph_goat_blend.o(.rodata);
+        sound/songs/midi/ph_goat_held.o(.rodata);
+        sound/songs/midi/ph_goat_solo.o(.rodata);
+        sound/songs/midi/ph_thought_blend.o(.rodata);
+        sound/songs/midi/ph_thought_held.o(.rodata);
+        sound/songs/midi/ph_thought_solo.o(.rodata);
+        sound/songs/midi/ph_choice_blend.o(.rodata);
+        sound/songs/midi/ph_choice_held.o(.rodata);
+        sound/songs/midi/ph_choice_solo.o(.rodata);
+        sound/songs/midi/ph_mouth_blend.o(.rodata);
+        sound/songs/midi/ph_mouth_held.o(.rodata);
+        sound/songs/midi/ph_mouth_solo.o(.rodata);
+        sound/songs/midi/ph_foot_blend.o(.rodata);
+        sound/songs/midi/ph_foot_held.o(.rodata);
+        sound/songs/midi/ph_foot_solo.o(.rodata);
+        sound/songs/midi/ph_goose_blend.o(.rodata);
+        sound/songs/midi/ph_goose_held.o(.rodata);
+        sound/songs/midi/ph_goose_solo.o(.rodata);
+        sound/songs/midi/ph_strut_blend.o(.rodata);
+        sound/songs/midi/ph_strut_held.o(.rodata);
+        sound/songs/midi/ph_strut_solo.o(.rodata);
+        sound/songs/midi/ph_cure_blend.o(.rodata);
+        sound/songs/midi/ph_cure_held.o(.rodata);
+        sound/songs/midi/ph_cure_solo.o(.rodata);
+        sound/songs/midi/ph_nurse_blend.o(.rodata);
+        sound/songs/midi/ph_nurse_held.o(.rodata);
+        sound/songs/midi/ph_nurse_solo.o(.rodata);
     } =0
 
     lib_rodata :
@@ -1133,7 +1132,7 @@ SECTIONS {
     anim_mon_front_pic_data :
     ALIGN(4)
     {
-        data/anim_mon_front_pics.o(anim_mon_front_pic_data);
+        src/anim_mon_front_pics.o(.rodata);
     } =0
 
     gap2 :
@@ -1146,7 +1145,7 @@ SECTIONS {
     gfx_data :
     ALIGN(4)
     {
-        data/graphics.o(gfx_data);
+        src/graphics.o(.rodata);
     } =0
 
     /* Discard everything not specifically mentioned above. */