Merge 7eb6cc21ce into 01677393e2

Makefile

@@ -94,13 +94,11 @@ C_SUBDIR = src
 ASM_SUBDIR = asm
 DATA_SRC_SUBDIR = src/data
 DATA_ASM_SUBDIR = data
-SONG_SUBDIR = sound/songs
 MID_SUBDIR = sound/songs/midi
 
 C_BUILDDIR = $(OBJ_DIR)/$(C_SUBDIR)
 ASM_BUILDDIR = $(OBJ_DIR)/$(ASM_SUBDIR)
 DATA_ASM_BUILDDIR = $(OBJ_DIR)/$(DATA_ASM_SUBDIR)
-SONG_BUILDDIR = $(OBJ_DIR)/$(SONG_SUBDIR)
 MID_BUILDDIR = $(OBJ_DIR)/$(MID_SUBDIR)
 
 SHELL := bash -o pipefail
@@ -211,13 +209,10 @@ REGULAR_DATA_ASM_SRCS := $(filter-out $(DATA_ASM_SUBDIR)/maps.s $(DATA_ASM_SUBDI
 DATA_ASM_SRCS := $(wildcard $(DATA_ASM_SUBDIR)/*.s)
 DATA_ASM_OBJS := $(patsubst $(DATA_ASM_SUBDIR)/%.s,$(DATA_ASM_BUILDDIR)/%.o,$(DATA_ASM_SRCS))
 
-SONG_SRCS := $(wildcard $(SONG_SUBDIR)/*.s)
-SONG_OBJS := $(patsubst $(SONG_SUBDIR)/%.s,$(SONG_BUILDDIR)/%.o,$(SONG_SRCS))
-
 MID_SRCS := $(wildcard $(MID_SUBDIR)/*.mid)
 MID_OBJS := $(patsubst $(MID_SUBDIR)/%.mid,$(MID_BUILDDIR)/%.o,$(MID_SRCS))
 
-OBJS     := $(C_OBJS) $(C_ASM_OBJS) $(ASM_OBJS) $(DATA_ASM_OBJS) $(SONG_OBJS) $(MID_OBJS)
+OBJS     := $(C_OBJS) $(C_ASM_OBJS) $(ASM_OBJS) $(DATA_ASM_OBJS) $(MID_OBJS)
 OBJS_REL := $(patsubst $(OBJ_DIR)/%,%,$(OBJS))
 
 SUBDIRS  := $(sort $(dir $(OBJS)))

ld_script.ld

@@ -713,8 +713,8 @@ SECTIONS {
         sound/songs/midi/se_pc_off.o(.rodata);
         sound/songs/midi/se_pc_on.o(.rodata);
         sound/songs/midi/se_select.o(.rodata);
-        sound/songs/se_win_open.o(.rodata);
-        sound/songs/se_wall_hit.o(.rodata);
+        sound/songs/midi/se_win_open.o(.rodata);
+        sound/songs/midi/se_wall_hit.o(.rodata);
         sound/songs/midi/se_door.o(.rodata);
         sound/songs/midi/se_exit.o(.rodata);
         sound/songs/midi/se_ledge.o(.rodata);
@@ -815,8 +815,8 @@ SECTIONS {
         sound/songs/midi/se_applause.o(.rodata);
         sound/songs/midi/se_vend.o(.rodata);
         sound/songs/midi/se_orb.o(.rodata);
-        sound/songs/se_dex_scroll.o(.rodata);
-        sound/songs/se_dex_page.o(.rodata);
+        sound/songs/midi/se_dex_scroll.o(.rodata);
+        sound/songs/midi/se_dex_page.o(.rodata);
         sound/songs/midi/se_pokenav_on.o(.rodata);
         sound/songs/midi/se_pokenav_off.o(.rodata);
         sound/songs/midi/se_dex_search.o(.rodata);
@@ -825,136 +825,136 @@ SECTIONS {
         sound/songs/midi/se_ball_tray_ball.o(.rodata);
         sound/songs/midi/se_ball_tray_exit.o(.rodata);
         sound/songs/midi/se_glass_flute.o(.rodata);
-        sound/songs/se_m_thunderbolt.o(.rodata);
-        sound/songs/se_m_thunderbolt2.o(.rodata);
-        sound/songs/se_m_harden.o(.rodata);
-        sound/songs/se_m_nightmare.o(.rodata);
-        sound/songs/se_m_vital_throw.o(.rodata);
-        sound/songs/se_m_vital_throw2.o(.rodata);
-        sound/songs/se_m_bubble.o(.rodata);
-        sound/songs/se_m_bubble2.o(.rodata);
-        sound/songs/se_m_bubble3.o(.rodata);
-        sound/songs/se_m_rain_dance.o(.rodata);
+        sound/songs/midi/se_m_thunderbolt.o(.rodata);
+        sound/songs/midi/se_m_thunderbolt2.o(.rodata);
+        sound/songs/midi/se_m_harden.o(.rodata);
+        sound/songs/midi/se_m_nightmare.o(.rodata);
+        sound/songs/midi/se_m_vital_throw.o(.rodata);
+        sound/songs/midi/se_m_vital_throw2.o(.rodata);
+        sound/songs/midi/se_m_bubble.o(.rodata);
+        sound/songs/midi/se_m_bubble2.o(.rodata);
+        sound/songs/midi/se_m_bubble3.o(.rodata);
+        sound/songs/midi/se_m_rain_dance.o(.rodata);
         sound/songs/midi/se_m_cut.o(.rodata);
-        sound/songs/se_m_string_shot.o(.rodata);
-        sound/songs/se_m_string_shot2.o(.rodata);
-        sound/songs/se_m_rock_throw.o(.rodata);
+        sound/songs/midi/se_m_string_shot.o(.rodata);
+        sound/songs/midi/se_m_string_shot2.o(.rodata);
+        sound/songs/midi/se_m_rock_throw.o(.rodata);
         sound/songs/midi/se_m_gust.o(.rodata);
         sound/songs/midi/se_m_gust2.o(.rodata);
         sound/songs/midi/se_m_double_slap.o(.rodata);
-        sound/songs/se_m_double_team.o(.rodata);
+        sound/songs/midi/se_m_double_team.o(.rodata);
         sound/songs/midi/se_m_razor_wind.o(.rodata);
-        sound/songs/se_m_icy_wind.o(.rodata);
-        sound/songs/se_m_thunder_wave.o(.rodata);
+        sound/songs/midi/se_m_icy_wind.o(.rodata);
+        sound/songs/midi/se_m_thunder_wave.o(.rodata);
         sound/songs/midi/se_m_comet_punch.o(.rodata);
         sound/songs/midi/se_m_mega_kick.o(.rodata);
         sound/songs/midi/se_m_mega_kick2.o(.rodata);
-        sound/songs/se_m_crabhammer.o(.rodata);
+        sound/songs/midi/se_m_crabhammer.o(.rodata);
         sound/songs/midi/se_m_jump_kick.o(.rodata);
-        sound/songs/se_m_flame_wheel.o(.rodata);
-        sound/songs/se_m_flame_wheel2.o(.rodata);
-        sound/songs/se_m_flamethrower.o(.rodata);
+        sound/songs/midi/se_m_flame_wheel.o(.rodata);
+        sound/songs/midi/se_m_flame_wheel2.o(.rodata);
+        sound/songs/midi/se_m_flamethrower.o(.rodata);
         sound/songs/midi/se_m_fire_punch.o(.rodata);
-        sound/songs/se_m_toxic.o(.rodata);
-        sound/songs/se_m_sacred_fire.o(.rodata);
-        sound/songs/se_m_sacred_fire2.o(.rodata);
-        sound/songs/se_m_ember.o(.rodata);
+        sound/songs/midi/se_m_toxic.o(.rodata);
+        sound/songs/midi/se_m_sacred_fire.o(.rodata);
+        sound/songs/midi/se_m_sacred_fire2.o(.rodata);
+        sound/songs/midi/se_m_ember.o(.rodata);
         sound/songs/midi/se_m_take_down.o(.rodata);
-        sound/songs/se_m_blizzard.o(.rodata);
-        sound/songs/se_m_blizzard2.o(.rodata);
+        sound/songs/midi/se_m_blizzard.o(.rodata);
+        sound/songs/midi/se_m_blizzard2.o(.rodata);
         sound/songs/midi/se_m_scratch.o(.rodata);
         sound/songs/midi/se_m_vicegrip.o(.rodata);
         sound/songs/midi/se_m_wing_attack.o(.rodata);
         sound/songs/midi/se_m_fly.o(.rodata);
         sound/songs/midi/se_m_sand_attack.o(.rodata);
         sound/songs/midi/se_m_razor_wind2.o(.rodata);
-        sound/songs/se_m_bite.o(.rodata);
+        sound/songs/midi/se_m_bite.o(.rodata);
         sound/songs/midi/se_m_headbutt.o(.rodata);
-        sound/songs/se_m_surf.o(.rodata);
-        sound/songs/se_m_hydro_pump.o(.rodata);
-        sound/songs/se_m_whirlpool.o(.rodata);
+        sound/songs/midi/se_m_surf.o(.rodata);
+        sound/songs/midi/se_m_hydro_pump.o(.rodata);
+        sound/songs/midi/se_m_whirlpool.o(.rodata);
         sound/songs/midi/se_m_horn_attack.o(.rodata);
         sound/songs/midi/se_m_tail_whip.o(.rodata);
-        sound/songs/se_m_mist.o(.rodata);
-        sound/songs/se_m_poison_powder.o(.rodata);
+        sound/songs/midi/se_m_mist.o(.rodata);
+        sound/songs/midi/se_m_poison_powder.o(.rodata);
         sound/songs/midi/se_m_bind.o(.rodata);
-        sound/songs/se_m_dragon_rage.o(.rodata);
-        sound/songs/se_m_sing.o(.rodata);
-        sound/songs/se_m_perish_song.o(.rodata);
+        sound/songs/midi/se_m_dragon_rage.o(.rodata);
+        sound/songs/midi/se_m_sing.o(.rodata);
+        sound/songs/midi/se_m_perish_song.o(.rodata);
         sound/songs/midi/se_m_pay_day.o(.rodata);
-        sound/songs/se_m_dig.o(.rodata);
-        sound/songs/se_m_dizzy_punch.o(.rodata);
-        sound/songs/se_m_self_destruct.o(.rodata);
-        sound/songs/se_m_explosion.o(.rodata);
-        sound/songs/se_m_absorb_2.o(.rodata);
-        sound/songs/se_m_absorb.o(.rodata);
-        sound/songs/se_m_screech.o(.rodata);
-        sound/songs/se_m_bubble_beam.o(.rodata);
-        sound/songs/se_m_bubble_beam2.o(.rodata);
-        sound/songs/se_m_supersonic.o(.rodata);
-        sound/songs/se_m_belly_drum.o(.rodata);
-        sound/songs/se_m_metronome.o(.rodata);
-        sound/songs/se_m_bonemerang.o(.rodata);
-        sound/songs/se_m_lick.o(.rodata);
-        sound/songs/se_m_psybeam.o(.rodata);
-        sound/songs/se_m_faint_attack.o(.rodata);
+        sound/songs/midi/se_m_dig.o(.rodata);
+        sound/songs/midi/se_m_dizzy_punch.o(.rodata);
+        sound/songs/midi/se_m_self_destruct.o(.rodata);
+        sound/songs/midi/se_m_explosion.o(.rodata);
+        sound/songs/midi/se_m_absorb_2.o(.rodata);
+        sound/songs/midi/se_m_absorb.o(.rodata);
+        sound/songs/midi/se_m_screech.o(.rodata);
+        sound/songs/midi/se_m_bubble_beam.o(.rodata);
+        sound/songs/midi/se_m_bubble_beam2.o(.rodata);
+        sound/songs/midi/se_m_supersonic.o(.rodata);
+        sound/songs/midi/se_m_belly_drum.o(.rodata);
+        sound/songs/midi/se_m_metronome.o(.rodata);
+        sound/songs/midi/se_m_bonemerang.o(.rodata);
+        sound/songs/midi/se_m_lick.o(.rodata);
+        sound/songs/midi/se_m_psybeam.o(.rodata);
+        sound/songs/midi/se_m_faint_attack.o(.rodata);
         sound/songs/midi/se_m_swords_dance.o(.rodata);
         sound/songs/midi/se_m_leer.o(.rodata);
-        sound/songs/se_m_swagger.o(.rodata);
-        sound/songs/se_m_swagger2.o(.rodata);
-        sound/songs/se_m_heal_bell.o(.rodata);
-        sound/songs/se_m_confuse_ray.o(.rodata);
-        sound/songs/se_m_snore.o(.rodata);
-        sound/songs/se_m_brick_break.o(.rodata);
-        sound/songs/se_m_giga_drain.o(.rodata);
-        sound/songs/se_m_psybeam2.o(.rodata);
-        sound/songs/se_m_solar_beam.o(.rodata);
-        sound/songs/se_m_petal_dance.o(.rodata);
-        sound/songs/se_m_teleport.o(.rodata);
-        sound/songs/se_m_minimize.o(.rodata);
-        sound/songs/se_m_sketch.o(.rodata);
-        sound/songs/se_m_swift.o(.rodata);
-        sound/songs/se_m_reflect.o(.rodata);
-        sound/songs/se_m_barrier.o(.rodata);
-        sound/songs/se_m_detect.o(.rodata);
-        sound/songs/se_m_lock_on.o(.rodata);
-        sound/songs/se_m_moonlight.o(.rodata);
-        sound/songs/se_m_charm.o(.rodata);
-        sound/songs/se_m_charge.o(.rodata);
-        sound/songs/se_m_strength.o(.rodata);
-        sound/songs/se_m_hyper_beam.o(.rodata);
-        sound/songs/se_m_waterfall.o(.rodata);
-        sound/songs/se_m_reversal.o(.rodata);
-        sound/songs/se_m_acid_armor.o(.rodata);
-        sound/songs/se_m_sandstorm.o(.rodata);
-        sound/songs/se_m_tri_attack.o(.rodata);
-        sound/songs/se_m_tri_attack2.o(.rodata);
-        sound/songs/se_m_encore.o(.rodata);
-        sound/songs/se_m_encore2.o(.rodata);
-        sound/songs/se_m_baton_pass.o(.rodata);
-        sound/songs/se_m_milk_drink.o(.rodata);
-        sound/songs/se_m_attract.o(.rodata);
-        sound/songs/se_m_attract2.o(.rodata);
-        sound/songs/se_m_morning_sun.o(.rodata);
-        sound/songs/se_m_flatter.o(.rodata);
-        sound/songs/se_m_sand_tomb.o(.rodata);
-        sound/songs/se_m_grasswhistle.o(.rodata);
-        sound/songs/se_m_spit_up.o(.rodata);
-        sound/songs/se_m_dive.o(.rodata);
-        sound/songs/se_m_earthquake.o(.rodata);
-        sound/songs/se_m_twister.o(.rodata);
-        sound/songs/se_m_sweet_scent.o(.rodata);
-        sound/songs/se_m_yawn.o(.rodata);
-        sound/songs/se_m_sky_uppercut.o(.rodata);
-        sound/songs/se_m_stat_increase.o(.rodata);
-        sound/songs/se_m_heat_wave.o(.rodata);
-        sound/songs/se_m_uproar.o(.rodata);
-        sound/songs/se_m_hail.o(.rodata);
-        sound/songs/se_m_cosmic_power.o(.rodata);
-        sound/songs/se_m_teeter_dance.o(.rodata);
-        sound/songs/se_m_stat_decrease.o(.rodata);
-        sound/songs/se_m_haze.o(.rodata);
-        sound/songs/se_m_hyper_beam2.o(.rodata);
+        sound/songs/midi/se_m_swagger.o(.rodata);
+        sound/songs/midi/se_m_swagger2.o(.rodata);
+        sound/songs/midi/se_m_heal_bell.o(.rodata);
+        sound/songs/midi/se_m_confuse_ray.o(.rodata);
+        sound/songs/midi/se_m_snore.o(.rodata);
+        sound/songs/midi/se_m_brick_break.o(.rodata);
+        sound/songs/midi/se_m_giga_drain.o(.rodata);
+        sound/songs/midi/se_m_psybeam2.o(.rodata);
+        sound/songs/midi/se_m_solar_beam.o(.rodata);
+        sound/songs/midi/se_m_petal_dance.o(.rodata);
+        sound/songs/midi/se_m_teleport.o(.rodata);
+        sound/songs/midi/se_m_minimize.o(.rodata);
+        sound/songs/midi/se_m_sketch.o(.rodata);
+        sound/songs/midi/se_m_swift.o(.rodata);
+        sound/songs/midi/se_m_reflect.o(.rodata);
+        sound/songs/midi/se_m_barrier.o(.rodata);
+        sound/songs/midi/se_m_detect.o(.rodata);
+        sound/songs/midi/se_m_lock_on.o(.rodata);
+        sound/songs/midi/se_m_moonlight.o(.rodata);
+        sound/songs/midi/se_m_charm.o(.rodata);
+        sound/songs/midi/se_m_charge.o(.rodata);
+        sound/songs/midi/se_m_strength.o(.rodata);
+        sound/songs/midi/se_m_hyper_beam.o(.rodata);
+        sound/songs/midi/se_m_waterfall.o(.rodata);
+        sound/songs/midi/se_m_reversal.o(.rodata);
+        sound/songs/midi/se_m_acid_armor.o(.rodata);
+        sound/songs/midi/se_m_sandstorm.o(.rodata);
+        sound/songs/midi/se_m_tri_attack.o(.rodata);
+        sound/songs/midi/se_m_tri_attack2.o(.rodata);
+        sound/songs/midi/se_m_encore.o(.rodata);
+        sound/songs/midi/se_m_encore2.o(.rodata);
+        sound/songs/midi/se_m_baton_pass.o(.rodata);
+        sound/songs/midi/se_m_milk_drink.o(.rodata);
+        sound/songs/midi/se_m_attract.o(.rodata);
+        sound/songs/midi/se_m_attract2.o(.rodata);
+        sound/songs/midi/se_m_morning_sun.o(.rodata);
+        sound/songs/midi/se_m_flatter.o(.rodata);
+        sound/songs/midi/se_m_sand_tomb.o(.rodata);
+        sound/songs/midi/se_m_grasswhistle.o(.rodata);
+        sound/songs/midi/se_m_spit_up.o(.rodata);
+        sound/songs/midi/se_m_dive.o(.rodata);
+        sound/songs/midi/se_m_earthquake.o(.rodata);
+        sound/songs/midi/se_m_twister.o(.rodata);
+        sound/songs/midi/se_m_sweet_scent.o(.rodata);
+        sound/songs/midi/se_m_yawn.o(.rodata);
+        sound/songs/midi/se_m_sky_uppercut.o(.rodata);
+        sound/songs/midi/se_m_stat_increase.o(.rodata);
+        sound/songs/midi/se_m_heat_wave.o(.rodata);
+        sound/songs/midi/se_m_uproar.o(.rodata);
+        sound/songs/midi/se_m_hail.o(.rodata);
+        sound/songs/midi/se_m_cosmic_power.o(.rodata);
+        sound/songs/midi/se_m_teeter_dance.o(.rodata);
+        sound/songs/midi/se_m_stat_decrease.o(.rodata);
+        sound/songs/midi/se_m_haze.o(.rodata);
+        sound/songs/midi/se_m_hyper_beam2.o(.rodata);
         sound/songs/midi/se_rg_door.o(.rodata);
         sound/songs/midi/se_rg_card_flip.o(.rodata);
         sound/songs/midi/se_rg_card_flipping.o(.rodata);

sound/songs/midi/midi.cfg

@@ -294,6 +294,8 @@ se_contest_icon_change.mid:    -E -R50 -G_rs_sfx_2 -V110 -P5
 se_contest_icon_clear.mid:     -E -R50 -G_rs_sfx_2 -V090 -P5
 se_contest_mons_turn.mid:      -E -R50 -G_rs_sfx_2 -V090 -P5
 se_contest_place.mid:          -E -R50 -G_rs_sfx_1 -V110 -P4
+se_dex_page.mid:               -E -R50 -G_rs_sfx_1 -P5
+se_dex_scroll.mid:             -E -R50 -G_rs_sfx_1 -P5
 se_dex_search.mid:             -E -R50 -G_rs_sfx_1 -v100 -P5
 se_ding_dong.mid:              -E -R50 -G_rs_sfx_1 -V090 -P5
 se_door.mid:                   -E -R50 -G_rs_sfx_1 -V080 -P5
@@ -323,30 +325,136 @@ se_itemfinder.mid:             -E -R50 -G_rs_sfx_1 -V090 -P5
 se_lavaridge_fall_warp.mid:    -E -R50 -G_rs_sfx_1 -P4
 se_ledge.mid:                  -E -R50 -G_rs_sfx_1 -V100 -P4
 se_low_health.mid:             -E -R50 -G_rs_sfx_1 -V100 -P3
+se_m_absorb.mid:               -E -R50 -G_rs_sfx_2 -P4
+se_m_absorb_2.mid:             -E -R50 -G_rs_sfx_2 -P4
+se_m_acid_armor.mid:           -E -R50 -G_rs_sfx_2 -P4
+se_m_attract.mid:              -E -R50 -G_rs_sfx_2 -P4
+se_m_attract2.mid:             -E -R50 -G_rs_sfx_2 -P4
+se_m_barrier.mid:              -E -R50 -G_rs_sfx_2 -P4
+se_m_baton_pass.mid:           -E -R50 -G_rs_sfx_2 -P4
+se_m_belly_drum.mid:           -E -R50 -G_rs_sfx_2 -P4
 se_m_bind.mid:                 -E -R50 -G_rs_sfx_2 -V100 -P4
+se_m_bite.mid:                 -E -R50 -G_rs_sfx_2 -P4
+se_m_blizzard.mid:             -E -R50 -G_rs_sfx_2 -P4
+se_m_blizzard2.mid:            -E -R50 -G_rs_sfx_2 -P4
+se_m_bonemerang.mid:           -E -R50 -G_rs_sfx_2 -P4
+se_m_brick_break.mid:          -E -R50 -G_rs_sfx_2 -P4
+se_m_bubble.mid:               -E -R50 -G_rs_sfx_2 -P4
+se_m_bubble2.mid:              -E -R50 -G_rs_sfx_2 -P4
+se_m_bubble3.mid:              -E -R50 -G_rs_sfx_2 -P4
+se_m_bubble_beam.mid:          -E -R50 -G_rs_sfx_2 -P4
+se_m_bubble_beam2.mid:         -E -R50 -G_rs_sfx_2 -P4
+se_m_charge.mid:               -E -R50 -G_rs_sfx_2 -P4
+se_m_charm.mid:                -E -R50 -G_rs_sfx_2 -P4
 se_m_comet_punch.mid:          -E -R50 -G_rs_sfx_2 -V120 -P4
+se_m_confuse_ray.mid:          -E -R50 -G_rs_sfx_2 -P4
+se_m_cosmic_power.mid:         -E -R50 -G_rs_sfx_2 -P4
+se_m_crabhammer.mid:           -E -R50 -G_rs_sfx_2 -P4
 se_m_cut.mid:                  -E -R50 -G_rs_sfx_2 -V120 -P4
+se_m_detect.mid:               -E -R50 -G_rs_sfx_2 -P4
+se_m_dig.mid:                  -E -R50 -G_rs_sfx_2 -P4
+se_m_dive.mid:                 -E -R50 -G_rs_sfx_2 -P4
+se_m_dizzy_punch.mid:          -E -R50 -G_rs_sfx_2 -P4
 se_m_double_slap.mid:          -E -R50 -G_rs_sfx_2 -V110 -P4
+se_m_double_team.mid:          -E -R50 -G_rs_sfx_2 -P4
+se_m_dragon_rage.mid:          -E -R50 -G_rs_sfx_2 -P4
+se_m_earthquake.mid:           -E -R50 -G_rs_sfx_2 -P4
+se_m_ember.mid:                -E -R50 -G_rs_sfx_2 -P4
+se_m_encore.mid:               -E -R50 -G_rs_sfx_2 -P4
+se_m_encore2.mid:              -E -R50 -G_rs_sfx_2 -P4
+se_m_explosion.mid:            -E -R50 -G_rs_sfx_2 -P4
+se_m_faint_attack.mid:         -E -R50 -G_rs_sfx_2 -P4
 se_m_fire_punch.mid:           -E -R50 -G_rs_sfx_2 -V110 -P4
+se_m_flame_wheel.mid:          -E -R50 -G_rs_sfx_2 -P4
+se_m_flame_wheel2.mid:         -E -R50 -G_rs_sfx_2 -P4
+se_m_flamethrower.mid:         -E -R50 -G_rs_sfx_2 -P4
+se_m_flatter.mid:              -E -R50 -G_rs_sfx_2 -P4
 se_m_fly.mid:                  -E -R50 -G_rs_sfx_2 -V110 -P4
+se_m_giga_drain.mid:           -E -R50 -G_rs_sfx_2 -P4
+se_m_grasswhistle.mid:         -E -R50 -G_rs_sfx_2 -P4
 se_m_gust.mid:                 -E -R50 -G_rs_sfx_2 -V110 -P4
 se_m_gust2.mid:                -E -R50 -G_rs_sfx_2 -V110 -P4
+se_m_hail.mid:                 -E -R50 -G_rs_sfx_2 -P4
+se_m_harden.mid:               -E -R50 -G_rs_sfx_2 -P4
+se_m_haze.mid:                 -E -R50 -G_rs_sfx_2 -P4
 se_m_headbutt.mid:             -E -R50 -G_rs_sfx_2 -V110 -P4
+se_m_heal_bell.mid:            -E -R50 -G_rs_sfx_2 -P4
+se_m_heat_wave.mid:            -E -R50 -G_rs_sfx_2 -P4
 se_m_horn_attack.mid:          -E -R50 -G_rs_sfx_2 -V110 -P4
+se_m_hydro_pump.mid:           -E -R50 -G_rs_sfx_2 -P4
+se_m_hyper_beam.mid:           -E -R50 -G_rs_sfx_2 -P4
+se_m_hyper_beam2.mid:          -E -R50 -G_rs_sfx_2 -P4
+se_m_icy_wind.mid:             -E -R50 -G_rs_sfx_2 -P4
 se_m_jump_kick.mid:            -E -R50 -G_rs_sfx_2 -V110 -P4
 se_m_leer.mid:                 -E -R50 -G_rs_sfx_2 -V110 -P4
+se_m_lick.mid:                 -E -R50 -G_rs_sfx_2 -P4
+se_m_lock_on.mid:              -E -R50 -G_rs_sfx_2 -P4
 se_m_mega_kick.mid:            -E -R50 -G_rs_sfx_2 -V090 -P4
 se_m_mega_kick2.mid:           -E -R50 -G_rs_sfx_2 -V110 -P4
+se_m_metronome.mid:            -E -R50 -G_rs_sfx_2 -P4
+se_m_milk_drink.mid:           -E -R50 -G_rs_sfx_2 -P4
+se_m_minimize.mid:             -E -R50 -G_rs_sfx_2 -P4
+se_m_mist.mid:                 -E -R50 -G_rs_sfx_2 -P4
+se_m_moonlight.mid:            -E -R50 -G_rs_sfx_2 -P4
+se_m_morning_sun.mid:          -E -R50 -G_rs_sfx_2 -P5
+se_m_nightmare.mid:            -E -R50 -G_rs_sfx_2 -P4
 se_m_pay_day.mid:              -E -R50 -G_rs_sfx_2 -V095 -P4
+se_m_perish_song.mid:          -E -R50 -G_rs_sfx_2 -P4
+se_m_petal_dance.mid:          -E -R50 -G_rs_sfx_2 -P4
+se_m_poison_powder.mid:        -E -R50 -G_rs_sfx_2 -P4
+se_m_psybeam.mid:              -E -R50 -G_rs_sfx_2 -P4
+se_m_psybeam2.mid:             -E -R50 -G_rs_sfx_2 -P4
+se_m_rain_dance.mid:           -E -R50 -G_rs_sfx_2 -P4
 se_m_razor_wind.mid:           -E -R50 -G_rs_sfx_2 -V110 -P4
 se_m_razor_wind2.mid:          -E -R50 -G_rs_sfx_2 -V090 -P4
+se_m_reflect.mid:              -E -R50 -G_rs_sfx_2 -P4
+se_m_reversal.mid:             -E -R50 -G_rs_sfx_2 -P4
+se_m_rock_throw.mid:           -E -R50 -G_rs_sfx_2 -P4
+se_m_sacred_fire.mid:          -E -R50 -G_rs_sfx_2 -P4
+se_m_sacred_fire2.mid:         -E -R50 -G_rs_sfx_2 -P4
 se_m_sand_attack.mid:          -E -R50 -G_rs_sfx_2 -V110 -P4
+se_m_sand_tomb.mid:            -E -R50 -G_rs_sfx_2 -P4
+se_m_sandstorm.mid:            -E -R50 -G_rs_sfx_2 -P4
 se_m_scratch.mid:              -E -R50 -G_rs_sfx_2 -V110 -P4
+se_m_screech.mid:              -E -R50 -G_rs_sfx_2 -V110 -P4
+se_m_self_destruct.mid:        -E -R50 -G_rs_sfx_2 -P4
+se_m_sing.mid:                 -E -R50 -G_rs_sfx_2 -P4
+se_m_sketch.mid:               -E -R50 -G_rs_sfx_2 -P4
+se_m_sky_uppercut.mid:         -E -R50 -G_rs_sfx_2 -P4
+se_m_snore.mid:                -E -R50 -G_rs_sfx_2 -V120 -P4
+se_m_solar_beam.mid:           -E -R50 -G_rs_sfx_2 -P4
+se_m_spit_up.mid:              -E -R50 -G_rs_sfx_2 -P4
+se_m_stat_decrease.mid:        -E -R50 -G_rs_sfx_2 -P4
+se_m_stat_increase.mid:        -E -R50 -G_rs_sfx_2 -P4
+se_m_strength.mid:             -E -R50 -G_rs_sfx_2 -P4
+se_m_string_shot.mid:          -E -R50 -G_rs_sfx_2 -P4
+se_m_string_shot2.mid:         -E -R50 -G_rs_sfx_2 -P4
+se_m_supersonic.mid:           -E -R50 -G_rs_sfx_2 -P4
+se_m_surf.mid:                 -E -R50 -G_rs_sfx_2 -P4
+se_m_swagger.mid:              -E -R50 -G_rs_sfx_2 -P4
+se_m_swagger2.mid:             -E -R50 -G_rs_sfx_2 -P4
+se_m_sweet_scent.mid:          -E -R50 -G_rs_sfx_2 -P4
+se_m_swift.mid:                -E -R50 -G_rs_sfx_2 -P4
 se_m_swords_dance.mid:         -E -R50 -G_rs_sfx_2 -V100 -P4
 se_m_tail_whip.mid:            -E -R50 -G_rs_sfx_2 -V110 -P4
 se_m_take_down.mid:            -E -R50 -G_rs_sfx_2 -V105 -P4
+se_m_teeter_dance.mid:         -E -R50 -G_rs_sfx_2 -P4
+se_m_teleport.mid:             -E -R50 -G_rs_sfx_2 -P4
+se_m_thunder_wave.mid:         -E -R50 -G_rs_sfx_2 -P4
+se_m_thunderbolt.mid:          -E -R50 -G_rs_sfx_2 -P4
+se_m_thunderbolt2.mid:         -E -R50 -G_rs_sfx_2 -P4
+se_m_toxic.mid:                -E -R50 -G_rs_sfx_2 -P4
+se_m_tri_attack.mid:           -E -R50 -G_rs_sfx_2 -P4
+se_m_tri_attack2.mid:          -E -R50 -G_rs_sfx_2 -P4
+se_m_twister.mid:              -E -R50 -G_rs_sfx_2 -P4
+se_m_uproar.mid:               -E -R50 -G_rs_sfx_2 -P4
 se_m_vicegrip.mid:             -E -R50 -G_rs_sfx_2 -V110 -P4
+se_m_vital_throw.mid:          -E -R50 -G_rs_sfx_2 -P4
+se_m_vital_throw2.mid:         -E -R50 -G_rs_sfx_2 -P4
+se_m_waterfall.mid:            -E -R50 -G_rs_sfx_2 -P4
+se_m_whirlpool.mid:            -E -R50 -G_rs_sfx_2 -P4
 se_m_wing_attack.mid:          -E -R50 -G_rs_sfx_2 -V105 -P4
+se_m_yawn.mid:                 -E -R50 -G_rs_sfx_2 -V110 -P4
 se_mud_ball.mid:               -E -R50 -G_rs_sfx_2 -V110 -P4
 se_mugshot.mid:                -E -R50 -G_rs_sfx_2 -V090 -P5
 se_n.mid:                      -E -R50 -G_rs_sfx_2 -P4
@@ -416,5 +524,7 @@ se_u.mid:                      -E -R50 -G_rs_sfx_2 -P4
 se_unlock.mid:                 -E -R50 -G_rs_sfx_2 -V100 -P4
 se_use_item.mid:               -E -R50 -G_rs_sfx_1 -V100 -P5
 se_vend.mid:                   -E -R50 -G_rs_sfx_2 -V110 -P4
+se_wall_hit.mid:               -E -R50 -G_rs_sfx_1 -P2
 se_warp_in.mid:                -E -R50 -G_rs_sfx_1 -V090 -P4
 se_warp_out.mid:               -E -R50 -G_rs_sfx_1 -V090 -P4
+se_win_open.mid:               -E -R50 -G_rs_sfx_1 -P5