From 7cf14a8e9e77782fea717d1a710b89fd4f5f3f6d Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sun, 22 Feb 2026 08:42:04 -0600 Subject: [PATCH 01/14] Fix CI --- .github/workflows/build.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index adc4cf6cd..c834234d5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -32,7 +32,9 @@ jobs: ref: 'symbols' - name: Install binutils - run: sudo apt install gcc-arm-none-eabi binutils-arm-none-eabi libpng-dev + run: | + sudo apt update + sudo apt install gcc-arm-none-eabi binutils-arm-none-eabi libpng-dev # build-essential and git are already installed # gcc-arm-none-eabi is only needed for the modern build # as an alternative to dkP From 7e3f822652ecce0c99b626d74f455c3b93660377 Mon Sep 17 00:00:00 2001 From: SiliconA-Z Date: Sun, 22 Feb 2026 09:48:40 -0500 Subject: [PATCH 02/14] CopyValue functions should involve volatile accesses (#720) * CopyValue functions should involve volatile accesses These are writing to specific registers in memory that are memory mapped to do things, so we cannot do any optimizations here regarding memory. * match pokeemerald's style --------- Co-authored-by: Marcus Huderle --- src/scanline_effect.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/scanline_effect.c b/src/scanline_effect.c index e664945cd..7b50649a2 100644 --- a/src/scanline_effect.c +++ b/src/scanline_effect.c @@ -107,16 +107,16 @@ void ScanlineEffect_InitHBlankDmaTransfer(void) static void CopyValue16Bit(void) { - u16 *dest = (u16 *)gScanlineEffect.dmaDest; - u16 *src = (u16 *)&gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer]; + vu16 *dest = (vu16 *)gScanlineEffect.dmaDest; + vu16 *src = (vu16 *)&gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer]; *dest = *src; } static void CopyValue32Bit(void) { - u32 *dest = (u32 *)gScanlineEffect.dmaDest; - u32 *src = (u32 *)&gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer]; + vu32 *dest = (vu32 *)gScanlineEffect.dmaDest; + vu32 *src = (vu32 *)&gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer]; *dest = *src; } From 45c0c01f14392a59a2ebc5ea424f4ed420eb5539 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sat, 21 Mar 2026 10:20:43 -0500 Subject: [PATCH 03/14] Convert most .s files to .midi --- ld_script.ld | 220 ++++++++-------- sound/songs/midi/midi.cfg | 110 ++++++++ sound/songs/midi/se_dex_page.mid | Bin 0 -> 132 bytes sound/songs/midi/se_dex_scroll.mid | Bin 0 -> 100 bytes sound/songs/midi/se_m_absorb.mid | Bin 0 -> 175 bytes sound/songs/midi/se_m_absorb_2.mid | Bin 0 -> 495 bytes sound/songs/midi/se_m_acid_armor.mid | Bin 0 -> 581 bytes sound/songs/midi/se_m_attract.mid | Bin 0 -> 383 bytes sound/songs/midi/se_m_attract2.mid | Bin 0 -> 335 bytes sound/songs/midi/se_m_barrier.mid | Bin 0 -> 795 bytes sound/songs/midi/se_m_baton_pass.mid | Bin 0 -> 451 bytes sound/songs/midi/se_m_belly_drum.mid | Bin 0 -> 140 bytes sound/songs/midi/se_m_bite.mid | Bin 0 -> 274 bytes sound/songs/midi/se_m_blizzard.mid | Bin 0 -> 234 bytes sound/songs/midi/se_m_blizzard2.mid | Bin 0 -> 144 bytes sound/songs/midi/se_m_bonemerang.mid | Bin 0 -> 136 bytes sound/songs/midi/se_m_brick_break.mid | Bin 0 -> 282 bytes sound/songs/midi/se_m_bubble.mid | Bin 0 -> 120 bytes sound/songs/midi/se_m_bubble2.mid | Bin 0 -> 119 bytes sound/songs/midi/se_m_bubble3.mid | Bin 0 -> 128 bytes sound/songs/midi/se_m_bubble_beam.mid | Bin 0 -> 400 bytes sound/songs/midi/se_m_bubble_beam2.mid | Bin 0 -> 348 bytes sound/songs/midi/se_m_charge.mid | Bin 0 -> 432 bytes sound/songs/midi/se_m_charm.mid | Bin 0 -> 240 bytes sound/songs/midi/se_m_confuse_ray.mid | Bin 0 -> 280 bytes sound/songs/midi/se_m_cosmic_power.mid | Bin 0 -> 703 bytes sound/songs/midi/se_m_crabhammer.mid | Bin 0 -> 128 bytes sound/songs/midi/se_m_detect.mid | Bin 0 -> 240 bytes sound/songs/midi/se_m_dig.mid | Bin 0 -> 158 bytes sound/songs/midi/se_m_dive.mid | Bin 0 -> 315 bytes sound/songs/midi/se_m_dizzy_punch.mid | Bin 0 -> 192 bytes sound/songs/midi/se_m_double_team.mid | Bin 0 -> 147 bytes sound/songs/midi/se_m_dragon_rage.mid | Bin 0 -> 356 bytes sound/songs/midi/se_m_earthquake.mid | Bin 0 -> 1278 bytes sound/songs/midi/se_m_ember.mid | Bin 0 -> 120 bytes sound/songs/midi/se_m_encore.mid | Bin 0 -> 116 bytes sound/songs/midi/se_m_encore2.mid | Bin 0 -> 556 bytes sound/songs/midi/se_m_explosion.mid | Bin 0 -> 279 bytes sound/songs/midi/se_m_faint_attack.mid | Bin 0 -> 204 bytes sound/songs/midi/se_m_flame_wheel.mid | Bin 0 -> 283 bytes sound/songs/midi/se_m_flame_wheel2.mid | Bin 0 -> 211 bytes sound/songs/midi/se_m_flamethrower.mid | Bin 0 -> 463 bytes sound/songs/midi/se_m_flatter.mid | Bin 0 -> 152 bytes sound/songs/midi/se_m_giga_drain.mid | Bin 0 -> 200 bytes sound/songs/midi/se_m_grasswhistle.mid | Bin 0 -> 311 bytes sound/songs/midi/se_m_hail.mid | Bin 0 -> 283 bytes sound/songs/midi/se_m_harden.mid | Bin 0 -> 155 bytes sound/songs/midi/se_m_haze.mid | Bin 0 -> 619 bytes sound/songs/midi/se_m_heal_bell.mid | Bin 0 -> 176 bytes sound/songs/midi/se_m_heat_wave.mid | Bin 0 -> 451 bytes sound/songs/midi/se_m_hydro_pump.mid | Bin 0 -> 255 bytes sound/songs/midi/se_m_hyper_beam.mid | Bin 0 -> 235 bytes sound/songs/midi/se_m_hyper_beam2.mid | Bin 0 -> 311 bytes sound/songs/midi/se_m_icy_wind.mid | Bin 0 -> 167 bytes sound/songs/midi/se_m_lick.mid | Bin 0 -> 320 bytes sound/songs/midi/se_m_lock_on.mid | Bin 0 -> 176 bytes sound/songs/midi/se_m_metronome.mid | Bin 0 -> 176 bytes sound/songs/midi/se_m_milk_drink.mid | Bin 0 -> 343 bytes sound/songs/midi/se_m_minimize.mid | Bin 0 -> 424 bytes sound/songs/midi/se_m_mist.mid | Bin 0 -> 228 bytes sound/songs/midi/se_m_moonlight.mid | Bin 0 -> 951 bytes sound/songs/midi/se_m_morning_sun.mid | Bin 0 -> 427 bytes sound/songs/midi/se_m_nightmare.mid | Bin 0 -> 479 bytes sound/songs/midi/se_m_perish_song.mid | Bin 0 -> 527 bytes sound/songs/midi/se_m_petal_dance.mid | Bin 0 -> 707 bytes sound/songs/midi/se_m_poison_powder.mid | Bin 0 -> 127 bytes sound/songs/midi/se_m_psybeam.mid | Bin 0 -> 327 bytes sound/songs/midi/se_m_psybeam2.mid | Bin 0 -> 605 bytes sound/songs/midi/se_m_rain_dance.mid | Bin 0 -> 240 bytes sound/songs/midi/se_m_reflect.mid | Bin 0 -> 759 bytes sound/songs/midi/se_m_reversal.mid | Bin 0 -> 1004 bytes sound/songs/midi/se_m_rock_throw.mid | Bin 0 -> 156 bytes sound/songs/midi/se_m_sacred_fire.mid | Bin 0 -> 231 bytes sound/songs/midi/se_m_sacred_fire2.mid | Bin 0 -> 399 bytes sound/songs/midi/se_m_sand_tomb.mid | Bin 0 -> 535 bytes sound/songs/midi/se_m_sandstorm.mid | Bin 0 -> 835 bytes sound/songs/midi/se_m_screech.mid | Bin 0 -> 239 bytes sound/songs/midi/se_m_self_destruct.mid | Bin 0 -> 156 bytes sound/songs/midi/se_m_sing.mid | Bin 0 -> 547 bytes sound/songs/midi/se_m_sketch.mid | Bin 0 -> 159 bytes sound/songs/midi/se_m_sky_uppercut.mid | Bin 0 -> 250 bytes sound/songs/midi/se_m_snore.mid | Bin 0 -> 262 bytes sound/songs/midi/se_m_solar_beam.mid | Bin 0 -> 348 bytes sound/songs/midi/se_m_spit_up.mid | Bin 0 -> 219 bytes sound/songs/midi/se_m_stat_decrease.mid | Bin 0 -> 851 bytes sound/songs/midi/se_m_stat_increase.mid | Bin 0 -> 875 bytes sound/songs/midi/se_m_strength.mid | Bin 0 -> 227 bytes sound/songs/midi/se_m_string_shot.mid | Bin 0 -> 168 bytes sound/songs/midi/se_m_string_shot2.mid | Bin 0 -> 383 bytes sound/songs/midi/se_m_supersonic.mid | Bin 0 -> 428 bytes sound/songs/midi/se_m_surf.mid | Bin 0 -> 224 bytes sound/songs/midi/se_m_swagger.mid | Bin 0 -> 168 bytes sound/songs/midi/se_m_swagger2.mid | Bin 0 -> 132 bytes sound/songs/midi/se_m_sweet_scent.mid | Bin 0 -> 443 bytes sound/songs/midi/se_m_swift.mid | Bin 0 -> 283 bytes sound/songs/midi/se_m_teeter_dance.mid | Bin 0 -> 379 bytes sound/songs/midi/se_m_teleport.mid | Bin 0 -> 424 bytes sound/songs/midi/se_m_thunder_wave.mid | Bin 0 -> 263 bytes sound/songs/midi/se_m_thunderbolt.mid | Bin 0 -> 283 bytes sound/songs/midi/se_m_thunderbolt2.mid | Bin 0 -> 231 bytes sound/songs/midi/se_m_toxic.mid | Bin 0 -> 235 bytes sound/songs/midi/se_m_tri_attack.mid | Bin 0 -> 239 bytes sound/songs/midi/se_m_tri_attack2.mid | Bin 0 -> 291 bytes sound/songs/midi/se_m_twister.mid | Bin 0 -> 443 bytes sound/songs/midi/se_m_uproar.mid | Bin 0 -> 184 bytes sound/songs/midi/se_m_vital_throw.mid | Bin 0 -> 178 bytes sound/songs/midi/se_m_vital_throw2.mid | Bin 0 -> 271 bytes sound/songs/midi/se_m_waterfall.mid | Bin 0 -> 363 bytes sound/songs/midi/se_m_whirlpool.mid | Bin 0 -> 252 bytes sound/songs/midi/se_m_yawn.mid | Bin 0 -> 259 bytes sound/songs/midi/se_wall_hit.mid | Bin 0 -> 72 bytes sound/songs/midi/se_win_open.mid | Bin 0 -> 76 bytes sound/songs/se_dex_page.s | 54 ---- sound/songs/se_dex_scroll.s | 46 ---- sound/songs/se_m_absorb.s | 73 ----- sound/songs/se_m_absorb_2.s | 155 ----------- sound/songs/se_m_acid_armor.s | 202 -------------- sound/songs/se_m_attract.s | 126 --------- sound/songs/se_m_attract2.s | 127 --------- sound/songs/se_m_barrier.s | 276 ------------------- sound/songs/se_m_baton_pass.s | 169 ------------ sound/songs/se_m_belly_drum.s | 72 ----- sound/songs/se_m_bite.s | 100 ------- sound/songs/se_m_blizzard.s | 103 -------- sound/songs/se_m_blizzard2.s | 72 ----- sound/songs/se_m_bonemerang.s | 57 ---- sound/songs/se_m_brick_break.s | 100 ------- sound/songs/se_m_bubble.s | 57 ---- sound/songs/se_m_bubble2.s | 60 ----- sound/songs/se_m_bubble3.s | 62 ----- sound/songs/se_m_bubble_beam.s | 173 ------------ sound/songs/se_m_bubble_beam2.s | 131 --------- sound/songs/se_m_charge.s | 186 ------------- sound/songs/se_m_charm.s | 96 ------- sound/songs/se_m_confuse_ray.s | 117 --------- sound/songs/se_m_cosmic_power.s | 208 --------------- sound/songs/se_m_crabhammer.s | 58 ---- sound/songs/se_m_detect.s | 95 ------- sound/songs/se_m_dig.s | 66 ----- sound/songs/se_m_dive.s | 123 --------- sound/songs/se_m_dizzy_punch.s | 79 ------ sound/songs/se_m_double_team.s | 71 ----- sound/songs/se_m_dragon_rage.s | 150 ----------- sound/songs/se_m_earthquake.s | 326 ----------------------- sound/songs/se_m_ember.s | 61 ----- sound/songs/se_m_encore.s | 58 ---- sound/songs/se_m_encore2.s | 173 ------------ sound/songs/se_m_explosion.s | 118 --------- sound/songs/se_m_faint_attack.s | 89 ------- sound/songs/se_m_flame_wheel.s | 124 --------- sound/songs/se_m_flame_wheel2.s | 99 ------- sound/songs/se_m_flamethrower.s | 175 ------------ sound/songs/se_m_flatter.s | 67 ----- sound/songs/se_m_giga_drain.s | 81 ------ sound/songs/se_m_grasswhistle.s | 130 --------- sound/songs/se_m_hail.s | 98 ------- sound/songs/se_m_harden.s | 74 ------ sound/songs/se_m_haze.s | 250 ------------------ sound/songs/se_m_heal_bell.s | 83 ------ sound/songs/se_m_heat_wave.s | 206 --------------- sound/songs/se_m_hydro_pump.s | 124 --------- sound/songs/se_m_hyper_beam.s | 84 ------ sound/songs/se_m_hyper_beam2.s | 115 -------- sound/songs/se_m_icy_wind.s | 72 ----- sound/songs/se_m_lick.s | 129 --------- sound/songs/se_m_lock_on.s | 69 ----- sound/songs/se_m_metronome.s | 79 ------ sound/songs/se_m_milk_drink.s | 129 --------- sound/songs/se_m_minimize.s | 165 ------------ sound/songs/se_m_mist.s | 94 ------- sound/songs/se_m_moonlight.s | 218 --------------- sound/songs/se_m_morning_sun.s | 135 ---------- sound/songs/se_m_nightmare.s | 146 ---------- sound/songs/se_m_perish_song.s | 221 ---------------- sound/songs/se_m_petal_dance.s | 205 --------------- sound/songs/se_m_poison_powder.s | 58 ---- sound/songs/se_m_psybeam.s | 144 ---------- sound/songs/se_m_psybeam2.s | 216 --------------- sound/songs/se_m_rain_dance.s | 116 -------- sound/songs/se_m_reflect.s | 267 ------------------- sound/songs/se_m_reversal.s | 336 ------------------------ sound/songs/se_m_rock_throw.s | 65 ----- sound/songs/se_m_sacred_fire.s | 105 -------- sound/songs/se_m_sacred_fire2.s | 180 ------------- sound/songs/se_m_sand_tomb.s | 197 -------------- sound/songs/se_m_sandstorm.s | 290 -------------------- sound/songs/se_m_screech.s | 112 -------- sound/songs/se_m_self_destruct.s | 74 ------ sound/songs/se_m_sing.s | 198 -------------- sound/songs/se_m_sketch.s | 68 ----- sound/songs/se_m_sky_uppercut.s | 103 -------- sound/songs/se_m_snore.s | 105 -------- sound/songs/se_m_solar_beam.s | 164 ------------ sound/songs/se_m_spit_up.s | 88 ------- sound/songs/se_m_stat_decrease.s | 271 ------------------- sound/songs/se_m_stat_increase.s | 283 -------------------- sound/songs/se_m_strength.s | 84 ------ sound/songs/se_m_string_shot.s | 80 ------ sound/songs/se_m_string_shot2.s | 134 ---------- sound/songs/se_m_supersonic.s | 161 ------------ sound/songs/se_m_surf.s | 109 -------- sound/songs/se_m_swagger.s | 77 ------ sound/songs/se_m_swagger2.s | 56 ---- sound/songs/se_m_sweet_scent.s | 192 -------------- sound/songs/se_m_swift.s | 111 -------- sound/songs/se_m_teeter_dance.s | 121 --------- sound/songs/se_m_teleport.s | 165 ------------ sound/songs/se_m_thunder_wave.s | 106 -------- sound/songs/se_m_thunderbolt.s | 117 --------- sound/songs/se_m_thunderbolt2.s | 85 ------ sound/songs/se_m_toxic.s | 87 ------ sound/songs/se_m_tri_attack.s | 99 ------- sound/songs/se_m_tri_attack2.s | 124 --------- sound/songs/se_m_twister.s | 210 --------------- sound/songs/se_m_uproar.s | 86 ------ sound/songs/se_m_vital_throw.s | 75 ------ sound/songs/se_m_vital_throw2.s | 108 -------- sound/songs/se_m_waterfall.s | 137 ---------- sound/songs/se_m_whirlpool.s | 125 --------- sound/songs/se_m_yawn.s | 127 --------- sound/songs/se_wall_hit.s | 41 --- sound/songs/se_win_open.s | 42 --- 222 files changed, 220 insertions(+), 14070 deletions(-) create mode 100644 sound/songs/midi/se_dex_page.mid create mode 100644 sound/songs/midi/se_dex_scroll.mid create mode 100644 sound/songs/midi/se_m_absorb.mid create mode 100644 sound/songs/midi/se_m_absorb_2.mid create mode 100644 sound/songs/midi/se_m_acid_armor.mid create mode 100644 sound/songs/midi/se_m_attract.mid create mode 100644 sound/songs/midi/se_m_attract2.mid create mode 100644 sound/songs/midi/se_m_barrier.mid create mode 100644 sound/songs/midi/se_m_baton_pass.mid create mode 100644 sound/songs/midi/se_m_belly_drum.mid create mode 100644 sound/songs/midi/se_m_bite.mid create mode 100644 sound/songs/midi/se_m_blizzard.mid create mode 100644 sound/songs/midi/se_m_blizzard2.mid create mode 100644 sound/songs/midi/se_m_bonemerang.mid create mode 100644 sound/songs/midi/se_m_brick_break.mid create mode 100644 sound/songs/midi/se_m_bubble.mid create mode 100644 sound/songs/midi/se_m_bubble2.mid create mode 100644 sound/songs/midi/se_m_bubble3.mid create mode 100644 sound/songs/midi/se_m_bubble_beam.mid create mode 100644 sound/songs/midi/se_m_bubble_beam2.mid create mode 100644 sound/songs/midi/se_m_charge.mid create mode 100644 sound/songs/midi/se_m_charm.mid create mode 100644 sound/songs/midi/se_m_confuse_ray.mid create mode 100644 sound/songs/midi/se_m_cosmic_power.mid create mode 100644 sound/songs/midi/se_m_crabhammer.mid create mode 100644 sound/songs/midi/se_m_detect.mid create mode 100644 sound/songs/midi/se_m_dig.mid create mode 100644 sound/songs/midi/se_m_dive.mid create mode 100644 sound/songs/midi/se_m_dizzy_punch.mid create mode 100644 sound/songs/midi/se_m_double_team.mid create mode 100644 sound/songs/midi/se_m_dragon_rage.mid create mode 100644 sound/songs/midi/se_m_earthquake.mid create mode 100644 sound/songs/midi/se_m_ember.mid create mode 100644 sound/songs/midi/se_m_encore.mid create mode 100644 sound/songs/midi/se_m_encore2.mid create mode 100644 sound/songs/midi/se_m_explosion.mid create mode 100644 sound/songs/midi/se_m_faint_attack.mid create mode 100644 sound/songs/midi/se_m_flame_wheel.mid create mode 100644 sound/songs/midi/se_m_flame_wheel2.mid create mode 100644 sound/songs/midi/se_m_flamethrower.mid create mode 100644 sound/songs/midi/se_m_flatter.mid create mode 100644 sound/songs/midi/se_m_giga_drain.mid create mode 100644 sound/songs/midi/se_m_grasswhistle.mid create mode 100644 sound/songs/midi/se_m_hail.mid create mode 100644 sound/songs/midi/se_m_harden.mid create mode 100644 sound/songs/midi/se_m_haze.mid create mode 100644 sound/songs/midi/se_m_heal_bell.mid create mode 100644 sound/songs/midi/se_m_heat_wave.mid create mode 100644 sound/songs/midi/se_m_hydro_pump.mid create mode 100644 sound/songs/midi/se_m_hyper_beam.mid create mode 100644 sound/songs/midi/se_m_hyper_beam2.mid create mode 100644 sound/songs/midi/se_m_icy_wind.mid create mode 100644 sound/songs/midi/se_m_lick.mid create mode 100644 sound/songs/midi/se_m_lock_on.mid create mode 100644 sound/songs/midi/se_m_metronome.mid create mode 100644 sound/songs/midi/se_m_milk_drink.mid create mode 100644 sound/songs/midi/se_m_minimize.mid create mode 100644 sound/songs/midi/se_m_mist.mid create mode 100644 sound/songs/midi/se_m_moonlight.mid create mode 100644 sound/songs/midi/se_m_morning_sun.mid create mode 100644 sound/songs/midi/se_m_nightmare.mid create mode 100644 sound/songs/midi/se_m_perish_song.mid create mode 100644 sound/songs/midi/se_m_petal_dance.mid create mode 100644 sound/songs/midi/se_m_poison_powder.mid create mode 100644 sound/songs/midi/se_m_psybeam.mid create mode 100644 sound/songs/midi/se_m_psybeam2.mid create mode 100644 sound/songs/midi/se_m_rain_dance.mid create mode 100644 sound/songs/midi/se_m_reflect.mid create mode 100644 sound/songs/midi/se_m_reversal.mid create mode 100644 sound/songs/midi/se_m_rock_throw.mid create mode 100644 sound/songs/midi/se_m_sacred_fire.mid create mode 100644 sound/songs/midi/se_m_sacred_fire2.mid create mode 100644 sound/songs/midi/se_m_sand_tomb.mid create mode 100644 sound/songs/midi/se_m_sandstorm.mid create mode 100644 sound/songs/midi/se_m_screech.mid create mode 100644 sound/songs/midi/se_m_self_destruct.mid create mode 100644 sound/songs/midi/se_m_sing.mid create mode 100644 sound/songs/midi/se_m_sketch.mid create mode 100644 sound/songs/midi/se_m_sky_uppercut.mid create mode 100644 sound/songs/midi/se_m_snore.mid create mode 100644 sound/songs/midi/se_m_solar_beam.mid create mode 100644 sound/songs/midi/se_m_spit_up.mid create mode 100644 sound/songs/midi/se_m_stat_decrease.mid create mode 100644 sound/songs/midi/se_m_stat_increase.mid create mode 100644 sound/songs/midi/se_m_strength.mid create mode 100644 sound/songs/midi/se_m_string_shot.mid create mode 100644 sound/songs/midi/se_m_string_shot2.mid create mode 100644 sound/songs/midi/se_m_supersonic.mid create mode 100644 sound/songs/midi/se_m_surf.mid create mode 100644 sound/songs/midi/se_m_swagger.mid create mode 100644 sound/songs/midi/se_m_swagger2.mid create mode 100644 sound/songs/midi/se_m_sweet_scent.mid create mode 100644 sound/songs/midi/se_m_swift.mid create mode 100644 sound/songs/midi/se_m_teeter_dance.mid create mode 100644 sound/songs/midi/se_m_teleport.mid create mode 100644 sound/songs/midi/se_m_thunder_wave.mid create mode 100644 sound/songs/midi/se_m_thunderbolt.mid create mode 100644 sound/songs/midi/se_m_thunderbolt2.mid create mode 100644 sound/songs/midi/se_m_toxic.mid create mode 100644 sound/songs/midi/se_m_tri_attack.mid create mode 100644 sound/songs/midi/se_m_tri_attack2.mid create mode 100644 sound/songs/midi/se_m_twister.mid create mode 100644 sound/songs/midi/se_m_uproar.mid create mode 100644 sound/songs/midi/se_m_vital_throw.mid create mode 100644 sound/songs/midi/se_m_vital_throw2.mid create mode 100644 sound/songs/midi/se_m_waterfall.mid create mode 100644 sound/songs/midi/se_m_whirlpool.mid create mode 100644 sound/songs/midi/se_m_yawn.mid create mode 100644 sound/songs/midi/se_wall_hit.mid create mode 100644 sound/songs/midi/se_win_open.mid delete mode 100644 sound/songs/se_dex_page.s delete mode 100644 sound/songs/se_dex_scroll.s delete mode 100644 sound/songs/se_m_absorb.s delete mode 100644 sound/songs/se_m_absorb_2.s delete mode 100644 sound/songs/se_m_acid_armor.s delete mode 100644 sound/songs/se_m_attract.s delete mode 100644 sound/songs/se_m_attract2.s delete mode 100644 sound/songs/se_m_barrier.s delete mode 100644 sound/songs/se_m_baton_pass.s delete mode 100644 sound/songs/se_m_belly_drum.s delete mode 100644 sound/songs/se_m_bite.s delete mode 100644 sound/songs/se_m_blizzard.s delete mode 100644 sound/songs/se_m_blizzard2.s delete mode 100644 sound/songs/se_m_bonemerang.s delete mode 100644 sound/songs/se_m_brick_break.s delete mode 100644 sound/songs/se_m_bubble.s delete mode 100644 sound/songs/se_m_bubble2.s delete mode 100644 sound/songs/se_m_bubble3.s delete mode 100644 sound/songs/se_m_bubble_beam.s delete mode 100644 sound/songs/se_m_bubble_beam2.s delete mode 100644 sound/songs/se_m_charge.s delete mode 100644 sound/songs/se_m_charm.s delete mode 100644 sound/songs/se_m_confuse_ray.s delete mode 100644 sound/songs/se_m_cosmic_power.s delete mode 100644 sound/songs/se_m_crabhammer.s delete mode 100644 sound/songs/se_m_detect.s delete mode 100644 sound/songs/se_m_dig.s delete mode 100644 sound/songs/se_m_dive.s delete mode 100644 sound/songs/se_m_dizzy_punch.s delete mode 100644 sound/songs/se_m_double_team.s delete mode 100644 sound/songs/se_m_dragon_rage.s delete mode 100644 sound/songs/se_m_earthquake.s delete mode 100644 sound/songs/se_m_ember.s delete mode 100644 sound/songs/se_m_encore.s delete mode 100644 sound/songs/se_m_encore2.s delete mode 100644 sound/songs/se_m_explosion.s delete mode 100644 sound/songs/se_m_faint_attack.s delete mode 100644 sound/songs/se_m_flame_wheel.s delete mode 100644 sound/songs/se_m_flame_wheel2.s delete mode 100644 sound/songs/se_m_flamethrower.s delete mode 100644 sound/songs/se_m_flatter.s delete mode 100644 sound/songs/se_m_giga_drain.s delete mode 100644 sound/songs/se_m_grasswhistle.s delete mode 100644 sound/songs/se_m_hail.s delete mode 100644 sound/songs/se_m_harden.s delete mode 100644 sound/songs/se_m_haze.s delete mode 100644 sound/songs/se_m_heal_bell.s delete mode 100644 sound/songs/se_m_heat_wave.s delete mode 100644 sound/songs/se_m_hydro_pump.s delete mode 100644 sound/songs/se_m_hyper_beam.s delete mode 100644 sound/songs/se_m_hyper_beam2.s delete mode 100644 sound/songs/se_m_icy_wind.s delete mode 100644 sound/songs/se_m_lick.s delete mode 100644 sound/songs/se_m_lock_on.s delete mode 100644 sound/songs/se_m_metronome.s delete mode 100644 sound/songs/se_m_milk_drink.s delete mode 100644 sound/songs/se_m_minimize.s delete mode 100644 sound/songs/se_m_mist.s delete mode 100644 sound/songs/se_m_moonlight.s delete mode 100644 sound/songs/se_m_morning_sun.s delete mode 100644 sound/songs/se_m_nightmare.s delete mode 100644 sound/songs/se_m_perish_song.s delete mode 100644 sound/songs/se_m_petal_dance.s delete mode 100644 sound/songs/se_m_poison_powder.s delete mode 100644 sound/songs/se_m_psybeam.s delete mode 100644 sound/songs/se_m_psybeam2.s delete mode 100644 sound/songs/se_m_rain_dance.s delete mode 100644 sound/songs/se_m_reflect.s delete mode 100644 sound/songs/se_m_reversal.s delete mode 100644 sound/songs/se_m_rock_throw.s delete mode 100644 sound/songs/se_m_sacred_fire.s delete mode 100644 sound/songs/se_m_sacred_fire2.s delete mode 100644 sound/songs/se_m_sand_tomb.s delete mode 100644 sound/songs/se_m_sandstorm.s delete mode 100644 sound/songs/se_m_screech.s delete mode 100644 sound/songs/se_m_self_destruct.s delete mode 100644 sound/songs/se_m_sing.s delete mode 100644 sound/songs/se_m_sketch.s delete mode 100644 sound/songs/se_m_sky_uppercut.s delete mode 100644 sound/songs/se_m_snore.s delete mode 100644 sound/songs/se_m_solar_beam.s delete mode 100644 sound/songs/se_m_spit_up.s delete mode 100644 sound/songs/se_m_stat_decrease.s delete mode 100644 sound/songs/se_m_stat_increase.s delete mode 100644 sound/songs/se_m_strength.s delete mode 100644 sound/songs/se_m_string_shot.s delete mode 100644 sound/songs/se_m_string_shot2.s delete mode 100644 sound/songs/se_m_supersonic.s delete mode 100644 sound/songs/se_m_surf.s delete mode 100644 sound/songs/se_m_swagger.s delete mode 100644 sound/songs/se_m_swagger2.s delete mode 100644 sound/songs/se_m_sweet_scent.s delete mode 100644 sound/songs/se_m_swift.s delete mode 100644 sound/songs/se_m_teeter_dance.s delete mode 100644 sound/songs/se_m_teleport.s delete mode 100644 sound/songs/se_m_thunder_wave.s delete mode 100644 sound/songs/se_m_thunderbolt.s delete mode 100644 sound/songs/se_m_thunderbolt2.s delete mode 100644 sound/songs/se_m_toxic.s delete mode 100644 sound/songs/se_m_tri_attack.s delete mode 100644 sound/songs/se_m_tri_attack2.s delete mode 100644 sound/songs/se_m_twister.s delete mode 100644 sound/songs/se_m_uproar.s delete mode 100644 sound/songs/se_m_vital_throw.s delete mode 100644 sound/songs/se_m_vital_throw2.s delete mode 100644 sound/songs/se_m_waterfall.s delete mode 100644 sound/songs/se_m_whirlpool.s delete mode 100644 sound/songs/se_m_yawn.s delete mode 100644 sound/songs/se_wall_hit.s delete mode 100644 sound/songs/se_win_open.s diff --git a/ld_script.ld b/ld_script.ld index 3bbcfc8fa..60bf68eb1 100644 --- a/ld_script.ld +++ b/ld_script.ld @@ -622,8 +622,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_rs_door.o(.rodata); sound/songs/midi/se_exit.o(.rodata); sound/songs/midi/se_ledge.o(.rodata); @@ -717,8 +717,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); @@ -727,136 +727,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_door.o(.rodata); sound/songs/se_card_flip.o(.rodata); sound/songs/se_card_flipping.o(.rodata); diff --git a/sound/songs/midi/midi.cfg b/sound/songs/midi/midi.cfg index 5c419ac3f..b2807d863 100644 --- a/sound/songs/midi/midi.cfg +++ b/sound/songs/midi/midi.cfg @@ -173,6 +173,8 @@ se_contest_icon_change.mid: -E -R50 -G128 -V110 -P5 se_contest_icon_clear.mid: -E -R50 -G128 -V090 -P5 se_contest_mons_turn.mid: -E -R50 -G128 -V090 -P5 se_contest_place.mid: -E -R50 -G127 -V110 -P4 +se_dex_page.mid: -E -R50 -G127 -P5 +se_dex_scroll.mid: -E -R50 -G127 -P5 se_dex_search.mid: -E -R50 -G127 -v100 -P5 se_ding_dong.mid: -E -R50 -G127 -V090 -P5 se_door.mid: -E -R50 -G129 -V100 -P5 @@ -200,30 +202,136 @@ se_itemfinder.mid: -E -R50 -G127 -V090 -P5 se_lavaridge_fall_warp.mid: -E -R50 -G127 -P4 se_ledge.mid: -E -R50 -G127 -V100 -P4 se_low_health.mid: -E -R50 -G127 -V100 -P3 +se_m_absorb.mid: -E -R50 -G128 -P4 +se_m_absorb_2.mid: -E -R50 -G128 -P4 +se_m_acid_armor.mid: -E -R50 -G128 -P4 +se_m_attract.mid: -E -R50 -G128 -P4 +se_m_attract2.mid: -E -R50 -G128 -P4 +se_m_barrier.mid: -E -R50 -G128 -P4 +se_m_baton_pass.mid: -E -R50 -G128 -P4 +se_m_belly_drum.mid: -E -R50 -G128 -P4 se_m_bind.mid: -E -R50 -G128 -V100 -P4 +se_m_bite.mid: -E -R50 -G128 -P4 +se_m_blizzard.mid: -E -R50 -G128 -P4 +se_m_blizzard2.mid: -E -R50 -G128 -P4 +se_m_bonemerang.mid: -E -R50 -G128 -P4 +se_m_brick_break.mid: -E -R50 -G128 -P4 +se_m_bubble.mid: -E -R50 -G128 -P4 +se_m_bubble2.mid: -E -R50 -G128 -P4 +se_m_bubble3.mid: -E -R50 -G128 -P4 +se_m_bubble_beam.mid: -E -R50 -G128 -P4 +se_m_bubble_beam2.mid: -E -R50 -G128 -P4 +se_m_charge.mid: -E -R50 -G128 -P4 +se_m_charm.mid: -E -R50 -G128 -P4 se_m_comet_punch.mid: -E -R50 -G128 -V120 -P4 +se_m_confuse_ray.mid: -E -R50 -G128 -P4 +se_m_cosmic_power.mid: -E -R50 -G128 -P4 +se_m_crabhammer.mid: -E -R50 -G128 -P4 se_m_cut.mid: -E -R50 -G128 -V120 -P4 +se_m_detect.mid: -E -R50 -G128 -P4 +se_m_dig.mid: -E -R50 -G128 -P4 +se_m_dive.mid: -E -R50 -G128 -P4 +se_m_dizzy_punch.mid: -E -R50 -G128 -P4 se_m_double_slap.mid: -E -R50 -G128 -V110 -P4 +se_m_double_team.mid: -E -R50 -G128 -P4 +se_m_dragon_rage.mid: -E -R50 -G128 -P4 +se_m_earthquake.mid: -E -R50 -G128 -P4 +se_m_ember.mid: -E -R50 -G128 -P4 +se_m_encore.mid: -E -R50 -G128 -P4 +se_m_encore2.mid: -E -R50 -G128 -P4 +se_m_explosion.mid: -E -R50 -G128 -P4 +se_m_faint_attack.mid: -E -R50 -G128 -P4 se_m_fire_punch.mid: -E -R50 -G128 -V110 -P4 +se_m_flame_wheel.mid: -E -R50 -G128 -P4 +se_m_flame_wheel2.mid: -E -R50 -G128 -P4 +se_m_flamethrower.mid: -E -R50 -G128 -P4 +se_m_flatter.mid: -E -R50 -G128 -P4 se_m_fly.mid: -E -R50 -G128 -V110 -P4 +se_m_giga_drain.mid: -E -R50 -G128 -P4 +se_m_grasswhistle.mid: -E -R50 -G128 -P4 se_m_gust.mid: -E -R50 -G128 -V110 -P4 se_m_gust2.mid: -E -R50 -G128 -V110 -P4 +se_m_hail.mid: -E -R50 -G128 -P4 +se_m_harden.mid: -E -R50 -G128 -P4 +se_m_haze.mid: -E -R50 -G128 -P4 se_m_headbutt.mid: -E -R50 -G128 -V110 -P4 +se_m_heal_bell.mid: -E -R50 -G128 -P4 +se_m_heat_wave.mid: -E -R50 -G128 -P4 se_m_horn_attack.mid: -E -R50 -G128 -V110 -P4 +se_m_hydro_pump.mid: -E -R50 -G128 -P4 +se_m_hyper_beam.mid: -E -R50 -G128 -P4 +se_m_hyper_beam2.mid: -E -R50 -G128 -P4 +se_m_icy_wind.mid: -E -R50 -G128 -P4 se_m_jump_kick.mid: -E -R50 -G128 -V110 -P4 se_m_leer.mid: -E -R50 -G128 -V110 -P4 +se_m_lick.mid: -E -R50 -G128 -P4 +se_m_lock_on.mid: -E -R50 -G128 -P4 se_m_mega_kick.mid: -E -R50 -G128 -V090 -P4 se_m_mega_kick2.mid: -E -R50 -G128 -V110 -P4 +se_m_metronome.mid: -E -R50 -G128 -P4 +se_m_milk_drink.mid: -E -R50 -G128 -P4 +se_m_minimize.mid: -E -R50 -G128 -P4 +se_m_mist.mid: -E -R50 -G128 -P4 +se_m_moonlight.mid: -E -R50 -G128 -P4 +se_m_morning_sun.mid: -E -R50 -G128 -P5 +se_m_nightmare.mid: -E -R50 -G128 -P4 se_m_pay_day.mid: -E -R50 -G128 -V095 -P4 +se_m_perish_song.mid: -E -R50 -G128 -P4 +se_m_petal_dance.mid: -E -R50 -G128 -P4 +se_m_poison_powder.mid: -E -R50 -G128 -P4 +se_m_psybeam.mid: -E -R50 -G128 -P4 +se_m_psybeam2.mid: -E -R50 -G128 -P4 +se_m_rain_dance.mid: -E -R50 -G128 -P4 se_m_razor_wind.mid: -E -R50 -G128 -V110 -P4 se_m_razor_wind2.mid: -E -R50 -G128 -V090 -P4 +se_m_reflect.mid: -E -R50 -G128 -P4 +se_m_reversal.mid: -E -R50 -G128 -P4 +se_m_rock_throw.mid: -E -R50 -G128 -P4 +se_m_sacred_fire.mid: -E -R50 -G128 -P4 +se_m_sacred_fire2.mid: -E -R50 -G128 -P4 se_m_sand_attack.mid: -E -R50 -G128 -V110 -P4 +se_m_sand_tomb.mid: -E -R50 -G128 -P4 +se_m_sandstorm.mid: -E -R50 -G128 -P4 se_m_scratch.mid: -E -R50 -G128 -V110 -P4 +se_m_screech.mid: -E -R50 -G128 -V110 -P4 +se_m_self_destruct.mid: -E -R50 -G128 -P4 +se_m_sing.mid: -E -R50 -G128 -P4 +se_m_sketch.mid: -E -R50 -G128 -P4 +se_m_sky_uppercut.mid: -E -R50 -G128 -P4 +se_m_snore.mid: -E -R50 -G128 -V120 -P4 +se_m_solar_beam.mid: -E -R50 -G128 -P4 +se_m_spit_up.mid: -E -R50 -G128 -P4 +se_m_stat_decrease.mid: -E -R50 -G128 -P4 +se_m_stat_increase.mid: -E -R50 -G128 -P4 +se_m_strength.mid: -E -R50 -G128 -P4 +se_m_string_shot.mid: -E -R50 -G128 -P4 +se_m_string_shot2.mid: -E -R50 -G128 -P4 +se_m_supersonic.mid: -E -R50 -G128 -P4 +se_m_surf.mid: -E -R50 -G128 -P4 +se_m_swagger.mid: -E -R50 -G128 -P4 +se_m_swagger2.mid: -E -R50 -G128 -P4 +se_m_sweet_scent.mid: -E -R50 -G128 -P4 +se_m_swift.mid: -E -R50 -G128 -P4 se_m_swords_dance.mid: -E -R50 -G128 -V100 -P4 se_m_tail_whip.mid: -E -R50 -G128 -V110 -P4 se_m_take_down.mid: -E -R50 -G128 -V105 -P4 +se_m_teeter_dance.mid: -E -R50 -G128 -P4 +se_m_teleport.mid: -E -R50 -G128 -P4 +se_m_thunder_wave.mid: -E -R50 -G128 -P4 +se_m_thunderbolt.mid: -E -R50 -G128 -P4 +se_m_thunderbolt2.mid: -E -R50 -G128 -P4 +se_m_toxic.mid: -E -R50 -G128 -P4 +se_m_tri_attack.mid: -E -R50 -G128 -P4 +se_m_tri_attack2.mid: -E -R50 -G128 -P4 +se_m_twister.mid: -E -R50 -G128 -P4 +se_m_uproar.mid: -E -R50 -G128 -P4 se_m_vicegrip.mid: -E -R50 -G128 -V110 -P4 +se_m_vital_throw.mid: -E -R50 -G128 -P4 +se_m_vital_throw2.mid: -E -R50 -G128 -P4 +se_m_waterfall.mid: -E -R50 -G128 -P4 +se_m_whirlpool.mid: -E -R50 -G128 -P4 se_m_wing_attack.mid: -E -R50 -G128 -V105 -P4 +se_m_yawn.mid: -E -R50 -G128 -V110 -P4 se_mud_ball.mid: -E -R50 -G128 -V110 -P4 se_mugshot.mid: -E -R50 -G128 -V090 -P5 se_not_effective.mid: -E -R50 -G127 -V110 -P5 @@ -271,5 +379,7 @@ se_truck_unload.mid: -E -R50 -G127 -P4 se_unlock.mid: -E -R50 -G128 -V100 -P4 se_use_item.mid: -E -R50 -G127 -V100 -P5 se_vend.mid: -E -R50 -G128 -V110 -P4 +se_wall_hit.mid: -E -R50 -G127 -P2 se_warp_in.mid: -E -R50 -G127 -V090 -P4 se_warp_out.mid: -E -R50 -G127 -V090 -P4 +se_win_open.mid: -E -R50 -G127 -P5 diff --git a/sound/songs/midi/se_dex_page.mid b/sound/songs/midi/se_dex_page.mid new file mode 100644 index 0000000000000000000000000000000000000000..a1799c5231e4edf8d0d1267df6eb603c2ff2a407 GIT binary patch literal 132 zcmeYb$w*;fU|?flWME>D@C_--2J(a%{s%I1svltZAHl-HB*DS(U!MUg70hseg<*pT z55opI4u%c#TtJ$WVS_A?%^t<@fWd`fLWl!nLkI(q7J<@e`~)CBfq`*C0#H7IfeC0d E07yd}x&QzG literal 0 HcmV?d00001 diff --git a/sound/songs/midi/se_dex_scroll.mid b/sound/songs/midi/se_dex_scroll.mid new file mode 100644 index 0000000000000000000000000000000000000000..254b7c787ec1cf742af75ef179731e87be7a1719 GIT binary patch literal 100 zcmeYb$w*;fU|?flWME>D@C_--2J(a%{s%I1svltZAHl-HB*DS(U!MUgWz2AZg<*pT q55opI4u%c#TtJ$WVS_A?&91@lfWd`ff`2_@gFge176H+WK&=1D@C_--2J(a%{s%I%Ni{J1k6>Y8lHg$Yug?ILs$)1H!LWfn zk70ud55op72Zjd>4h$0#>KPjn7#Jp`7ce%YGcX)b11hm%nBZT)xPjdTsLTVXOb5vJ t2C^-HYyqYX?7>iRJ)n3LRNM>5P6e_(fojr$Y@jt@^+4nO8JK{s000AND}ew2 literal 0 HcmV?d00001 diff --git a/sound/songs/midi/se_m_absorb_2.mid b/sound/songs/midi/se_m_absorb_2.mid new file mode 100644 index 0000000000000000000000000000000000000000..dea60f498f2f64f47cf1570a088af50e3f9a46ad GIT binary patch literal 495 zcmYk1L2AN47=_J@X~Y{CfwW0|kwEng9Lp=@Iq%uG243f3;dVen9<<%aQKlkigs* zFx?m?%5cOJs${Q@NLd+c!zy%{0EZr5`9w9?t8xJL6I3btlt-Krydp zQkl@K#%^)2YdF}70~I*f3eEDg_PfPF-f+PFzk}78mb-F-zB+ghbBKdin?oG1ci+M} V$asSwN9bTCG!2S_7opqyH%j9@Fn>NE(HE`1m2pIm)!vNupnH8t@W~vc*@c8}%wd`bkZqrNo6V;k z=4rOStTQj~^SgB~JKd+sXI#3hTWCBgL+lUNtyY_V({r`Ir_-wh9<3E+W9f~0@=j0G c3zuG~!yc_ykae40t9Lber&aZt9-qGI4ft1N&;S4c literal 0 HcmV?d00001 diff --git a/sound/songs/midi/se_m_attract2.mid b/sound/songs/midi/se_m_attract2.mid new file mode 100644 index 0000000000000000000000000000000000000000..1adbb512231cb2c14a771b2a7f73f0e4afb336f6 GIT binary patch literal 335 zcmYk0F$%&!5JkVbtgfwb2 z;?2&AnXtzB8R%#O#NkehS@CVnTCxHgg`hvlo!>lrt3RihcYB>v#CRf^Wij#yV&;r7 z=gNWazLf{cVs7Mq$KCm+T;w<$cx26W>^I2$Cb>pt|KnS-<^0z-YBk>FtXug?IHV&Y~vAk45q zgoj}RmjlBF_IQQ|49*M_5+WEkutxyd7K|IXT!G>iK(;=RZ3SdY0NHXtHb^};kS)yA zkiY=d>j2an0@Z7Zq*n(?uQZZgK_tEQK)pU#^lBsNl|s@hfTq`hOucqMdtv?r`Pl?& zAIQ&IK(+_e&yqm48Pw1G5WC@F1~LQWM^IRiXa+dULHbpY^cw@&ps*&@4Kn1JQP02z zPZA8*84j2tB?oJ!39$}LKyLvtFqqgS7#m_C(LEv70wP`y;-kx%5SGKxV}QdR9US5s NIK)-Z#aV#f0|1w7!j=F4 literal 0 HcmV?d00001 diff --git a/sound/songs/midi/se_m_baton_pass.mid b/sound/songs/midi/se_m_baton_pass.mid new file mode 100644 index 0000000000000000000000000000000000000000..321766b47e3f5e0aa3ea6e8456a144bc9af67c9c GIT binary patch literal 451 zcma)(y-or_9K>huh!{dA#Z}f68XH5R5@Y1!4iN5QE{GE2M<`6R(ZZH}gng8K1RjMq z!QTdnt;J+#W@l$N{~eca3rTx2ij|DZuXj{kn^~n2CHvZ(XzQ7lRtNHpx_s?QzFOB> zpK^I&eDw%EWxZrCV{e2m(RZvbtk3vo_zU#6S!-!*F8QUR(B<-`fycjIygHUQhg_9# zq{R^;oeygI@UHQ-9)1BI;DyS9%2{MPR8qIrwOnt3my&IxZ{W9J9@*Y5)0Ioxcy!c4 z?*v|g$H=C;OkXZ*;*H3hlgZ&z@D$l>ml?EC|hD@C_--2J(a%{s%I%Ni{J1k6>Y8lHg$Yug?ILie@;##;`$z zhhYPIF~bHf2Zjd>4h$14>lq&~SOKva5E}up2@{0YW8A==15~2}6w?B-Nin}fZ#f2BJNAM=*2p%OjiBk|4 zlQ%OzA-_<&ei2Hp1`H8=o$8rwtvX(0&So z6tCD@C_--2J(a%{s%I%Ni{J1k6>Y8lHg$Yug?ILif1?=#;`$z zhhYPk1H%UPJcb7h4h$2VbC@=8>9PRD7&ovdGH&1s0Ma4M8`yn->YSK1u$u#E3m~ly bR0mQc2~^_&qD@C_--2J(a%{s%I%Ni{J1k6>Y8lHg$Yug?IL3THSV!LUJu uhhYPk1H%UPJcb7h4h$1Q>KPkC7=U743=;w=SF3yaQH^nLsG#&sTxgi+< literal 0 HcmV?d00001 diff --git a/sound/songs/midi/se_m_brick_break.mid b/sound/songs/midi/se_m_brick_break.mid new file mode 100644 index 0000000000000000000000000000000000000000..528482d13ba4d7f7c9c510c8871b7008247b1035 GIT binary patch literal 282 zcmYL@u?oU45QhJ2LY1yM6emZWTpUC?6r$Lng$kj#>EIv;BECR_Pmo8+BlOMcB^5e^ zyZ`@kcYmcHcK|U60%@f`PgXPZXAv(9`iqoNIz_+1AAQlS;U+J*B!?|pG6i6DOD;L` z+mq2iCk9-<$0RanXX-1|NjS;f7A;4?oD@C_--2J(a%{s%I%XofTVk6>Y8lHg$Yug?ILa%VUo&ai4h$1)>X|oi835UCj1L$Bm^N?)0NJTPb^%j^4Fgo2J;MZtdgcZP I1|Fbs03~4@mH+?% literal 0 HcmV?d00001 diff --git a/sound/songs/midi/se_m_bubble2.mid b/sound/songs/midi/se_m_bubble2.mid new file mode 100644 index 0000000000000000000000000000000000000000..38ba6b330a5b16ab6738c0f9c57f0497034807ac GIT binary patch literal 119 zcmeYb$w*;fU|?flWMF2H@C_--2J(a%{s%I%XofTVk6>Y8lHg$Yug?ILQfD|I!LWfn zk70ud55op72Zjd>4$Kq$>zN)f!~?M$YlA-n4??*(!vPkEa-h-)9y*K-9t`3@X#n;_ B8*Kmp literal 0 HcmV?d00001 diff --git a/sound/songs/midi/se_m_bubble3.mid b/sound/songs/midi/se_m_bubble3.mid new file mode 100644 index 0000000000000000000000000000000000000000..9d65ba21863ca5113f56aebe3ca63f5aee868b3f GIT binary patch literal 128 zcmeYb$w*;fU|?flWME>D@C_--2J(a%{s%I%XofTVk6>Y8lHg$Yug?IL@@F_8&ai4h$2_>)AGN=>yqrj1L$Bm^N?)0NIg1c05yqIRjLkJu^@pGenIq JNSqmHEC3Vz9=8Ah literal 0 HcmV?d00001 diff --git a/sound/songs/midi/se_m_bubble_beam.mid b/sound/songs/midi/se_m_bubble_beam.mid new file mode 100644 index 0000000000000000000000000000000000000000..d192866b75380e1893a963917b223e2f7e31e755 GIT binary patch literal 400 zcmbV|F$%&!5Jms4A*-1TVTH`TpJ!-fpqN>umE zcjunDnRtCjB>6J3YQ*c)kyB0Cs^o{MvYqGIMp;>3@0N*ltH{-@Ty-iJgu1J(>-J(? z&?K92?!p~-3=iNDyr9mhL$aQA!RB)}BHzQ4rw2Y$TPEEK4#}s_9Dl;h-+pFuKXYF{ cUUq)HL0QSdjJ3c literal 0 HcmV?d00001 diff --git a/sound/songs/midi/se_m_charge.mid b/sound/songs/midi/se_m_charge.mid new file mode 100644 index 0000000000000000000000000000000000000000..4310f8820b20dc62c4256975eed7143729714245 GIT binary patch literal 432 zcmYjOK}y3=6r6l(z685bDWP;@txzml#D%4V5=wE^77BkMu3ZT3yg++|9_1gwqj-}z zle|I};k}u8Z~h;zd$ubBPDzMULoFGB4#C` zAL0)sj$xm~Y>`Ai5zl@}UU)9-8tsjJLB6orb!&F+qW>UXX_sHgxtXeFxi9>3(!>!z zvlfkatv{N+qV}NP_QcmdXl$ z=glXvuJHg0C}b$Dd)(=Uh{s+rX%WwPo|S#X1tfaoGea1a2m^zl$M|B8mwl?B=iF`S zcdE5uwx(av8_Dgzlk%XQu!k(@S~$nO7v`e6TNO3kxKa(ZAz!5~*^~5coHx?*oR=x@ NI(jNho!+GQjUPTuJh=b> literal 0 HcmV?d00001 diff --git a/sound/songs/midi/se_m_confuse_ray.mid b/sound/songs/midi/se_m_confuse_ray.mid new file mode 100644 index 0000000000000000000000000000000000000000..4ad9b70d9ed9f7057ccda1d2cc81e4b1f6007a9b GIT binary patch literal 280 zcmeYb$w*;fU|?flWME>D@C_--2J(a%{s%I%XofTVk6>Y8lHg$Yug?ILdd_gbgkb}F zJ;MeO9)=BE4h#<%92h3JRWLqaumEBM#s)VApqM?w1gm=H4O}ijwg=M&E*l{24U`XJ z+`#1pWXCW)U`PhC&6paj7?8}#0hz-DF+(572APus)DJcXXdZ?+Ks8`=v@FM;YbJo literal 0 HcmV?d00001 diff --git a/sound/songs/midi/se_m_cosmic_power.mid b/sound/songs/midi/se_m_cosmic_power.mid new file mode 100644 index 0000000000000000000000000000000000000000..b75abd0e7dfcb24eedeb94ba78a61fec4f9f8982 GIT binary patch literal 703 zcmZXRO-jQ+7>3_8XXPdgU^y)H(Tc%5>6bD*8Rse%2=yjOARI=fEqad;Sa2fKTyizZa(h%3Ky?i*Je`%@t2 zm18&j#I$nA f|Kji?hmRdTa`=9QzjOGW!(TdlSKo&^C&%;)hq1d9 literal 0 HcmV?d00001 diff --git a/sound/songs/midi/se_m_crabhammer.mid b/sound/songs/midi/se_m_crabhammer.mid new file mode 100644 index 0000000000000000000000000000000000000000..1f52315098aae1502c3f2981458317ee12baa8c5 GIT binary patch literal 128 zcmeYb$w*;fU|?flWME>D@C_--2J(a%{s%I%Ni{J1k6>Y8lHg$Yug?IL@@F_8&aiP7D+5>KQk1nE}}@j16`SK(+^v?FJMN0kT1AJi+1*80?uIFeCuQ MEtr7n_<+U&00#peAOHXW literal 0 HcmV?d00001 diff --git a/sound/songs/midi/se_m_detect.mid b/sound/songs/midi/se_m_detect.mid new file mode 100644 index 0000000000000000000000000000000000000000..946f76b36407614f87eb62f9c7a8b46e0fec292b GIT binary patch literal 240 zcmeYb$w*;fU|?flWME>D@C_--2J(a%{s%I%XofTVk6>Y8lHg$Yug?IL+Rt#nj9~+N z3d05w9)=BE4h#<%92q9W)iZA3asslQ7#}dWFgC<7K*Zxg;tot3>KT|D;-O-389*^R zkXj~)Iv1cGpc(NXaR(NlT1JH00HBx)7IOobKxz@{41j!VusT#T4M1ix1I=Uts$~Is F0|3|CJ;(q6 literal 0 HcmV?d00001 diff --git a/sound/songs/midi/se_m_dig.mid b/sound/songs/midi/se_m_dig.mid new file mode 100644 index 0000000000000000000000000000000000000000..10e273bd4c2defd6d40fcb5fcd7214c6ba26cc89 GIT binary patch literal 158 zcmeYb$w*;fU|?flWME>D@C_--2J(a%{s%I%Ni{J1k6>Y8lHg$Yug?IL%4Im9!mvSv zhhYPk1H%UPVul9{4h$0v3K$y<7#I#nF-)+jXWYQ$3KVu>Y_MSf(g9F03m`j&2_lxu e2r`As2cp}?0xZ0to`HD-mkCh03W(1Lv=jg&o+b+b literal 0 HcmV?d00001 diff --git a/sound/songs/midi/se_m_dive.mid b/sound/songs/midi/se_m_dive.mid new file mode 100644 index 0000000000000000000000000000000000000000..3b561ee7af0f4f4a25826f35de60cea7fc273060 GIT binary patch literal 315 zcmYk2F>b;@5Jms)8gFE|iwlBMf<%D`iewQd0ugMXNQeT-1x1v~MGzeqV2|LVOqZ6U za1-Y*xS*Q1Z~yF!c2oXV0757jbT{Skz|$j|tqFS$%`OOZ_W{id+N(dD`;a7tL<@-B z!5^FifzcbM;$KCpCoS&|1*V!<18BkAIr>w;&bOl!| V`W-nz-T1k6iJ>z$7kj7qBmalmOZ)%; literal 0 HcmV?d00001 diff --git a/sound/songs/midi/se_m_dizzy_punch.mid b/sound/songs/midi/se_m_dizzy_punch.mid new file mode 100644 index 0000000000000000000000000000000000000000..efbb0bef6a80b504df2fdf48a4805a793ede9939 GIT binary patch literal 192 zcmeYb$w*;fU|?flWME>D@C_--2J(a%{s%I%Ni{J1k6>Y8lHg$Yug?IL>Ss70%&jC xvjD}kfNV|1hIj@b+Zd#lVL}4P94DxHN2p$ynIJu(Ky|K+4G9dqAajAv0swtiE;9fC literal 0 HcmV?d00001 diff --git a/sound/songs/midi/se_m_double_team.mid b/sound/songs/midi/se_m_double_team.mid new file mode 100644 index 0000000000000000000000000000000000000000..0a3c73dc5e957bbd5e0a56872f84d89f7e3969b8 GIT binary patch literal 147 zcmeYb$w*;fU|?flWME>D@C_--2J(a%{s%I%Ni{J1k6>Y8lHg$Yug?ILN@6%5#;`$z zhhYPk1H%UPJcb7hdJGfna+n@4STb&4Pi5S|WeybcVA{YQ0;FA-fa-wa4nVdsP!1%n c3uG$-X$6oOj0c#2(!4++9_9u+23DX=0C&YAUH||9 literal 0 HcmV?d00001 diff --git a/sound/songs/midi/se_m_dragon_rage.mid b/sound/songs/midi/se_m_dragon_rage.mid new file mode 100644 index 0000000000000000000000000000000000000000..91b6137a1eaf581a60733a9f229c81516a91f502 GIT binary patch literal 356 zcmZ9IJ!%6n6of}w;};f#i#Wjq(&PZyBDgS%7h!N?aN*!$n^gHBIGwBQR!7iL-Vt&X z-()k-R+Z`@&FGtX+8w?>0F2?_G2b0dKRn%H*cao6h@l;g{QL$(g{$OV@cRgzO`zol zDt9;|AT4{ZQaLSyQ)#`HHD|{eTwEgiwn#O7<%U{i8t>bJUe3-(r)C-S zN}JintX*8uD>G)lAvJy0jA?AkH+EOVhS`@c*7Fl7SiWUEXZ9D_oxS%lSiW^J?h$GI jejwPVzHo5j|IWfmLkPNZ|*1Tmz4bkKc##aj=h(9>*^m%L0~W@n4XH4)Xwkfr8q@%9YsoQ`+4)=KGkUon;D869JCA$v)O z7UdTW%IibQ`ISCtNLgoZ(+@rZ6tog5$huFMe^{C z8p+z_NsSJ2)Q|jR>;1?t@W^#|m+SDJU-6FH;XSw3_q?IL@P_)rtNncUUi2i~JJ-AR zCH$UeFLy(okgGEYTFWq8dOP^TiC5#8|7$#KLOi!QZ}g9WyNmj; jSCPyJc9iq7qVoz0D}GYKkANSP@NJLx$|=5~c&PRTN2f4z literal 0 HcmV?d00001 diff --git a/sound/songs/midi/se_m_ember.mid b/sound/songs/midi/se_m_ember.mid new file mode 100644 index 0000000000000000000000000000000000000000..2c686616a64b12992af9fa6c5147d01f25290308 GIT binary patch literal 120 zcmeYb$w*;fU|?flWME>D@C_--2J(a%{s%I%Ni{J1k6>Y8lHg$Yug?ILa%VUo%dkO& zhhYPk1H%S(TZRV=9t;zl>lrt&hX8RRkRJe~^B5m6xHCOqFafe7f!F~kE(WBP7#o}! I_<+U%04U5HE&u=k literal 0 HcmV?d00001 diff --git a/sound/songs/midi/se_m_encore.mid b/sound/songs/midi/se_m_encore.mid new file mode 100644 index 0000000000000000000000000000000000000000..f0c5597f44ef815e1d78c639480130fd0cbb7c9f GIT binary patch literal 116 zcmeYb$w*;fU|?flWME>D@C_--2J(a%{s%I%Ni{J1k6>Y8lHg$Yug?ILa%MPS&9Fg) zhhYPI9>WGM2Zjd>4h$0<>KQk1c>u9F5c>hK8B>D;16Y27s{xQ70K^824XzB#K%)Su Ccp7;C literal 0 HcmV?d00001 diff --git a/sound/songs/midi/se_m_encore2.mid b/sound/songs/midi/se_m_encore2.mid new file mode 100644 index 0000000000000000000000000000000000000000..a98882c8df90224b7ee234eb225f408f0d15fa70 GIT binary patch literal 556 zcmeYb$w*;fU|?flWME>D@C_--2J(a%{s%I%Ni{J1k6>YBmf&Fcug?IHV*Jf;z=mOi z2oJ*sc1eZ}Tn-Em7#tWT*wiy_;Bo?DSH=zON+329P!7n}1FEqD@@<$luv>uG5OKI# zHzc(INNOWc)v_l5`K~~{Ky%qsfNY@IFmpj>)-yoGz;1x38!2kQVFL;eSop^vg=q*V t9D#gL_14Ff0%008N>h(iDX literal 0 HcmV?d00001 diff --git a/sound/songs/midi/se_m_explosion.mid b/sound/songs/midi/se_m_explosion.mid new file mode 100644 index 0000000000000000000000000000000000000000..3d8fd5f00de488b47cc0b5592d19de3b23f3b70c GIT binary patch literal 279 zcmZ9HF$%&k7=>SwYD*OybSU1y$wjb~LR$hY6bcF*baxQk+$A|eZsD3E^eDYa{bL2i z;pg#q-~Z>OX|ERmQ!ofbO?$tQTVgnh=~`nrc^;1f3|oAnC%O%+|A1Z1VZ$6fa+pjp zodG5xO~7mz!$?J1F)hIz_s^I@&3Z^-mCH-IQ+dR(9yR%x^dLsxlCOA=v%5n~Ol(V8 s=~&X3GU?uO8P^4ZZ{0mQZ>;;STEL_`X8oG!6chK2AHSd~ksDfn0Ti`HTL1t6 literal 0 HcmV?d00001 diff --git a/sound/songs/midi/se_m_faint_attack.mid b/sound/songs/midi/se_m_faint_attack.mid new file mode 100644 index 0000000000000000000000000000000000000000..01c8a09b893da569f11172cd5776a87f2fb5ab0e GIT binary patch literal 204 zcmeYb$w*;fU|?flWME>D@C_--2J(a%{s%I%Ni{J1k6>Y8lHg$Yug?ILn$2)Pmtg~Y z3d05wCWZ}M4h#<%tQjWQ6fizu@B-pgATDQauwekonM34k6Hw)BL2~X8IlBN1^|qdqSR)pTxOS zl46;e-J6?P75@tF|(DoCqL<(tz>FEHT0Vsbw<6_e)5Z@|Em%3wxeE>uY{5V;!vm@W{L>V lysL9XHEXMs!GiX-201I_AewlhiT%Zyy@}E>T}04Ed;z#xMv4Fc literal 0 HcmV?d00001 diff --git a/sound/songs/midi/se_m_flame_wheel2.mid b/sound/songs/midi/se_m_flame_wheel2.mid new file mode 100644 index 0000000000000000000000000000000000000000..0e8082196bddbd8fef8b187fd9c052c9825cf49e GIT binary patch literal 211 zcmeYb$w*;fU|?flWMF2H@C_--2J(a%{s%I%Ni{J1k6>Y8lHg$Yug?IL%4awr%dkO& zhhYPk1H%UPJcb7h4h$1K>e)7MxiCLqaAMxT L=4ERz2WtTUas4vm literal 0 HcmV?d00001 diff --git a/sound/songs/midi/se_m_flamethrower.mid b/sound/songs/midi/se_m_flamethrower.mid new file mode 100644 index 0000000000000000000000000000000000000000..bf5de7d65ba9cbab0d98ef7dda8233f00b8e8231 GIT binary patch literal 463 zcmc&xONzok6s%4=wlwaXMaJM6#D!*Hf`l;(6$G78a49%2g5bgnBuDTl?+6|xH_6mX z7PE5gqIsXH;?;Y-+Ma#@v|(TouC~`Rs~)P2ZTAaQ`<4m94yqv<$b92IfV_4g?gH@{ zN?dVEa#P|Ei2q={4obW;pEDmZpBV8mW6GZLKU)oNX~n0?XUwSIsh-%Jb!kgJv+%I>bKX;&?+G8MYufEl%5x3ACiBE~wUfCP67qb^p%blE8tlq0g@PAs& haE}P3^=WV8#EUz=i2I^s!ZB~Q81oD{!bgw4^aqAEbh!Wk literal 0 HcmV?d00001 diff --git a/sound/songs/midi/se_m_flatter.mid b/sound/songs/midi/se_m_flatter.mid new file mode 100644 index 0000000000000000000000000000000000000000..9c794051157dbf4635a3722ba798bbfa5fb38181 GIT binary patch literal 152 zcmeYb$w*;fU|?flWME>D@C_--2J(a%{s%I%Ni{J1k6>Y8lHg$Yug?ILN@qBr$*_Sv zg<*pT55op72Zjd>4h$2*>KPlt7#Jq_18ILC9Z}D;fy<3)1A7cmjRoTd_Fy3G2Bh6V fe4rj1AX^W}_6D*+@?t=?36O2b*bu?M2(%6WNzx== literal 0 HcmV?d00001 diff --git a/sound/songs/midi/se_m_giga_drain.mid b/sound/songs/midi/se_m_giga_drain.mid new file mode 100644 index 0000000000000000000000000000000000000000..f11c1d774aeed75f58e102a742c5b3f79ba7af16 GIT binary patch literal 200 zcmXX=I|{-;5Ph==Q5HJ|gSCZLrVv7Y5Y%8}3L%9DND&Y$yg=p%+j)&WLXMJ~#7Ri^ z=FR(+RZ|1-Kv3|@>id>!jp6BdJI3&GUF9z^oG`zB==QLi6|Bx-7a#Pq|fP>)1Ha=~Z8$I&%*P5Dvna0GD|Fv-K= P1kxYFWCz6=Nap7CsnaHn0h2QpAketvKN?&YL1nMn%%3+yNG?O;-Q_ literal 0 HcmV?d00001 diff --git a/sound/songs/midi/se_m_hail.mid b/sound/songs/midi/se_m_hail.mid new file mode 100644 index 0000000000000000000000000000000000000000..e0a5a0e00e0cba72e61d5b16b4e6738308b39fb0 GIT binary patch literal 283 zcmYL@Jqp4=5JtcKAMX<6=XJKiR%7v8>#K3xh6oQR-f$R<3qwEoKvpADPQq7xh z-V9SU&lW%i0foG3J}>IF7;Y-t2MiCbWxmF6#60?Y8lHg$Yug?ILa%MOn!?1xp zg<%7i1H%J`0EP)J0gMkA(tx;*vB8CbaY8@>^9C+ACZIf!wgAyU>;_~zFf{})Fe8kT XXE?wDH)?{94P%2312a&&AXFIuw5TN) literal 0 HcmV?d00001 diff --git a/sound/songs/midi/se_m_haze.mid b/sound/songs/midi/se_m_haze.mid new file mode 100644 index 0000000000000000000000000000000000000000..85f815c0e9d66504e8823f0c23f8f0690ca7fd0b GIT binary patch literal 619 zcmZ{g-AV#c6ovQvG$V%yLMtUIF9Hz~p`b_zCNGK{XH*oiq(3pS41-=EUm);N&Leo& zb#Ks{*w+sUgIz4v+Uu;n_cAU)i%hGf57WACrj>*89VSToG0J5wc4X@QSZYw_>jC${%dCm zl+hk{sG#eXei3vNugL5Rdagl-zEkQR8SbD;=pp+k@GY=Q|x@gTSPnNs35a1mp7T5{C>Gde8_iuG7b_B p*Z;#P5E+LNFT|@vyb4}5;#L32&6_uGZ#gor%shYQjr{NDd;&+XoZbKc literal 0 HcmV?d00001 diff --git a/sound/songs/midi/se_m_heal_bell.mid b/sound/songs/midi/se_m_heal_bell.mid new file mode 100644 index 0000000000000000000000000000000000000000..09271d4a2a731b21b494898479dcc36b03cb4d65 GIT binary patch literal 176 zcmeYb$w*;fU|?flWME>D@C_--2J(a%{s%I%Ni{J1k6>Y8lHg$Yug?ILs%JQ0%&cq!D5d_Tw+9h-;cL`le zc2d8;g*tL@Iggxk|I43Z`u-*1*HtOkvY2}=?sM)ruXwj$>APeMe=yH?@e}+8{tW-v^yvmJ{=&}!mkhx!x&&M3 z9IS_xYIcubsTtx0mD-jCJC*@Y!Le8AY;W5+r_-l1jL@7hnUQ7jugvG&-yw71Iron2 zJvM{cFU%ZRmUqt36ZD03$lTcs`$qp7-XU{|-zC$uKKdA*;vEEwLVs)1Osk{a%9hy) d(cQY>C8IVgg4=q^lrhmFQ{?6{p8kjYnP1n~ad!X! literal 0 HcmV?d00001 diff --git a/sound/songs/midi/se_m_hydro_pump.mid b/sound/songs/midi/se_m_hydro_pump.mid new file mode 100644 index 0000000000000000000000000000000000000000..00cda6cfe42925c3adb5e02b6d877a4d3c42c867 GIT binary patch literal 255 zcmZvXI|{;J5QHbM|CeZ|MYOW8w-Ey|U?75p1{5NwbwI(+93bgzbCf+oj^a(?1X851 z_}Itn4!cSE%m64Du;3->`^9RE=4`21iRNnCrZ+&dL??YvFCdc<#El?2#}^SQzfj_a zWKA|CB0F;EVq5>!P01l}`TJ)u+oYF_{oGot%P{k*s bo-#dh%*^pz?wdD literal 0 HcmV?d00001 diff --git a/sound/songs/midi/se_m_hyper_beam.mid b/sound/songs/midi/se_m_hyper_beam.mid new file mode 100644 index 0000000000000000000000000000000000000000..9597a911cb341c4bb08a0f249c88a9cd23f58768 GIT binary patch literal 235 zcmeYb$w*;fU|?flWMF2H@C_--2J(a%{s%I%Ni{J1k6>YBk>FtXug?ILif1?=#IS)q zk70ud55op72Zjd>4h$0<>X{lG7#JtG)iXA@F)&SV2J)SOd`}?XlYwaimpf362ULv* zSj`45ONI%~8c=l_V08#8U>-5(fJ$d85kzmh(OhVX=ZFYBk>FtXug?ILTFr1kmtg~Y z9>WF^9)=BE4h#<%92h1z$1px%@CM=-#s+5wh?plxERM0klL1Hr)wm(4af7PyfvWLg zVBEmv4mC>ys2<%ckQl_Q4P2HGb#4L(b#U`QVnB63^AJuBW;nnKcJc%p1;z#&21Y2& XjLzRs&%iLjMg*z`OfzE>0~!qgTc1nZ literal 0 HcmV?d00001 diff --git a/sound/songs/midi/se_m_icy_wind.mid b/sound/songs/midi/se_m_icy_wind.mid new file mode 100644 index 0000000000000000000000000000000000000000..a4afad71bdad01f257a6aea3b20f4bc37a6ece8b GIT binary patch literal 167 zcmeYb$w*;fU|?flWMF2H@C_--2J(a%{s%I%Ni{J1k6>Y8lHg$Yug?ILvSv8I%&>ty zg<%7i1H%OG0>%b!2IdW1ZVVHGH5eO$L2PT7I7Ce_P)#rc6T%2%h6Ah!BfNmxycn1# bxC3c-2F49smP{MCJQ*iI#DPXwg0unvBlIS@ literal 0 HcmV?d00001 diff --git a/sound/songs/midi/se_m_lick.mid b/sound/songs/midi/se_m_lick.mid new file mode 100644 index 0000000000000000000000000000000000000000..69436bd5cb9b92f2d396feafc794cd9226176b50 GIT binary patch literal 320 zcmXYtF$%&^5JV?2BoYJ*EuxL3jUZwnXoP?wibfJik-|n05d;e_V2! zR$FYMZ$}#H7YU4YA>9%0}2*!KjhXp?2 z+cN%|^Nbo%r__)-Qa`lozNdb!{ZjpgD(6?^Of@g}nc!oiIto81KUQ tq}-7z+*vZ+ohg?yOO=!T!lk-LzOA~qdbjZ=%w?D4JD@C_--2J(a%{s%I%Ni{J1k6>Y8lHg$Yug?ILs%JQ$!LUJu zhhYPk1H%UPJcb7h4h$1KQWzUN7#JovJ1{ml18MgZ#tmFD@C_--2J(a%{s%I%Ni{J1k6>Y8lHg$Yug?ILs%JQ$%CJF% zhhYPk1H%UPVul9{4h$0<>KQk1xd7QVK-vLFTLNhtAZ-feTQfoA9iV(?sJt7L?+K(q Y`u%|FK>9SS26DXOz+O1F<{gJ$$ZF@&BBpq&7^7o$Xg zJdH&OPiW^zy$ki$#Czh9cuvgOCGkjRDJZ|=tYEHloku&0a_sV3m(S6ot=>rIBpyBDfHjZnTJ4q{NU|)1;-*Mk59kDp*j^g^1wNd4zeCc?2IN zZxYYc%;GZlocqn0pQ3tQ1L#9QA}FfQH>w@9FA4oTc>csjsQe+2>NtvDwq$89M)>pV5C1#t*sPQkPs8+>=U` zll4{|{{)?V(67l($t>CDtVF8JWj;cumZ`{$T@H05RqB`;dh$+hNhT*Vvl*0MGqNdl)V*aSRpK&B=s4tT)@5GUJl2U+v16{FqXT+VGBzt>KVl7~ XiX5|m4hQruyBwQ&$~uxNg#G?MPBLw} literal 0 HcmV?d00001 diff --git a/sound/songs/midi/se_m_mist.mid b/sound/songs/midi/se_m_mist.mid new file mode 100644 index 0000000000000000000000000000000000000000..2d184451fd0876f88a1701bee8d2f364532a0996 GIT binary patch literal 228 zcmeYb$w*;fU|?flWME>D@C_--2J(a%{s%I%Ni{J1k6>Y8lHg$Yug?IL+RSi3g<*pT z55op72Zjyo>J)lS|B|@cc=lyRe<7xKw1GvvjAx+ LriKs(HlWi1x%@Wg literal 0 HcmV?d00001 diff --git a/sound/songs/midi/se_m_moonlight.mid b/sound/songs/midi/se_m_moonlight.mid new file mode 100644 index 0000000000000000000000000000000000000000..ea53803101b5c78e770f5cda3abc410a24e93a5a GIT binary patch literal 951 zcmd^-K}y3w6o%iJn96Jv%%ZrE?(9mt(?u2m!Cj$+SqRNyNCFkylwQEzz&Xksp-1rs z9-)4D9rX<2BK&VA-+W2Y8lHg$Yug?ILI?ixFk6{CQ zJi`VNCWZ}M4h#<%{Fx^t7cg(AXJBqfW?+~QkpW>x0NKe2Na7K2@eN!yK)C?89LSsr z5gthLEwY literal 0 HcmV?d00001 diff --git a/sound/songs/midi/se_m_nightmare.mid b/sound/songs/midi/se_m_nightmare.mid new file mode 100644 index 0000000000000000000000000000000000000000..434a24f5aa9509985a7d5c7f32e281d18f2e9515 GIT binary patch literal 479 zcmY+Au};G<6h$vM3awR%fec-sV(fsLEtn-~6m_CfD^;RH2ZjulDlxDyl27n|u=o@D zDf|aRcvng3WAZ&de$UTdZuT{R7#A=YFE{T8p&PVo6HQ;xZlmaOJU}}`ufA|J2v=_i z$q2y~_(l=?Y-gGbCfF1{+cL+&=J4g-G$jx|=~lwxO6CGSmz?)CUG8e!t7#nf*YHlx zxV~2uiP^ip3})4T^^lB{=qRpxEml$tgJ(XTgiNabu#`3d|I0(W%)w5 wR!lEr{PU$^`bWjAe^yMtP)sjR|LaHpq?rCeG5x(_`b07PP%%ADd@Wz_3tBmJA^-pY literal 0 HcmV?d00001 diff --git a/sound/songs/midi/se_m_perish_song.mid b/sound/songs/midi/se_m_perish_song.mid new file mode 100644 index 0000000000000000000000000000000000000000..2adf5f39a82f8d7d2364ac7b445ccbc6cfd1e095 GIT binary patch literal 527 zcmb`EF;2rk6hz0_V22eF1t7&mid48kK_W$p2)S@%Ba|X25)_mvkZ2GWu#e!Q>=Dv& z4Q^uIt|K9(h2m?*fA`Pqe6P1}J4vx38I9N5&v(8q)NRb^^SpSXqI2yZ z>blXf&K2p}j??25&grz)wo} zlOcSzzz;UAsXm?mhTB&_Q|!9Au(_%uuGzTH=H^~|7w&0_mwwM@OY_^r=aCQlPlVgDlWXTAT=eU8IJmwIyb zmm5v}(LHKkt|^tfw7FJda^)pgT5@G2*G#Uw_~k6sFLQajWdHyG literal 0 HcmV?d00001 diff --git a/sound/songs/midi/se_m_poison_powder.mid b/sound/songs/midi/se_m_poison_powder.mid new file mode 100644 index 0000000000000000000000000000000000000000..a1ad27fee736df5f9d79b3a3cee5332b843ef26f GIT binary patch literal 127 zcmeYb$w*;fU|?flWME>D@C_--2J(a%{s%I%Ni{J1k6>Y8lHg$Yug?IL@?$t4#IQkx zhhYP|Il~4n2Zjd>jtmnLQWzT&7=U7Vj0aS}QWMex7(v{IbOz=PTp7E9n=5- literal 0 HcmV?d00001 diff --git a/sound/songs/midi/se_m_psybeam.mid b/sound/songs/midi/se_m_psybeam.mid new file mode 100644 index 0000000000000000000000000000000000000000..28df1b2235162ffee107d67d6da0471b367d349f GIT binary patch literal 327 zcmZutF$%&!5S&XwE~M2Wm1VFo=_CdOMMNwtj242BG!}wjVPzLTAo!F6Kael@1Ah`{ zLqH3QWoCD7c86PSj|TuQ6l?^m?d8O-gL-W{uRH3U<5+=*Iz}r!Q4L_a9*jSM(IJfL z;f*OC=~Wqj#+q|JA}*ED3yVGZl(URDVU5XiVoGgDekP_e7u_-?+;$K9rTAImFGQDj zFoUtzy%B}!s+bugR3setP$+iC|`oWhAou0s3SYT_69|- zg`#UYOi2oT|uU(`s#zr4;94J7&b3E4hO?;@mBI^WW`^?+YBk>FtXug?IHVtmbTK$u~J z2oJ*sE(eAU>`@F47~B{pqz5oQV6b7_z~u@Q^8$()0ohhSwhfT22xNoQiU8T-ObzJ_ zP<;+SeI7u4rbzm9kn~9-=@UfKXAjipf~HR!NuLywJ^?g+He~3t1KMW-G}9I6eh>}v z7s!uVK(+_ekCH&P8Pt#b5If=F1JZ9mx_)rjg7j)Y^%?_da_m+hU4K0T8$8MxE;Af3 zg+({hgcJuRp!b0o7~Sk5j19ol14;%HQY;|i^&mdFoC#q$3_S)o?9ss?u7N{b1zns4 G=rsTdF1zml literal 0 HcmV?d00001 diff --git a/sound/songs/midi/se_m_reversal.mid b/sound/songs/midi/se_m_reversal.mid new file mode 100644 index 0000000000000000000000000000000000000000..6898925c1f2134bad101c87b7e96661b8e4bd8ab GIT binary patch literal 1004 zcmZvaJx;?w5QS&$C_!{65sIKl>k1?aT3jNekU#(1v6~b~bX*`lf=iC!BjhODB)r|7 zn9+)2W&7=X`#f)F8GRgxXiSQHnlGcTPkc@3yz$3(EuFK`$eUl$`H}3F_f4lM^|Lwk zlLPhFp?P*urTWP$RzN@0s5T-x-D3M0pCNUtqiR=>KpN@=@`Ad!@-)@P1l^K`db89T z)LKxXr4r-iwTVMLS!x4nBPjMtoj*)T8LxLsZ9#1X#a@|1Whl{oJy>c7YKMcIzH*1k znc7+^0;L1GQ0!H38pZ#8#h?(>KyhCsr%^f-_mzM`Py@wYmGg%cnh^Juf=UI&UVDey zqeN4DUm2)Oq`_XbL)A?2Y~-MHK$kSwtKl>nr!V#@Kp`lMk>4L_Jj|!Mr_+s|G7ob| zT@)w`Al5=hu2711=&{gavbBlO60S=F?1d%_oMG!SQ|F;oZEv+)u(|LlgkG>uDYTM( gD)y+NkdKId0bD@C_--2J(a%{s%I%Ni{J1k6>Y8lHg$Yug?IL%4Rqq#jrty zhhYPk1H%UPOoj&x4h$0<>X|oiSpeB`%nc3BlVQa8q0J3#}YFwBfFo=WXMS)fV0IwV*?f?J) literal 0 HcmV?d00001 diff --git a/sound/songs/midi/se_m_sacred_fire.mid b/sound/songs/midi/se_m_sacred_fire.mid new file mode 100644 index 0000000000000000000000000000000000000000..436081798fcc7c6f026e6af68eb1536c2e11e34f GIT binary patch literal 231 zcmYj~O$vfg6ot=wPc+0?4Wu7v0YXCuN4@OeGZtzc&Xtapd?bM(+?(?(fe z3zGtE*+}ar!g^=^cGQ}>qTW;IqQ`+g6XU%{A*~mYlW;GYsd?WDQ-b_J{%SLH3&!-j YwvE@q#1Ma5v5r$YM027MCz<(TUS^#(w*UYD literal 0 HcmV?d00001 diff --git a/sound/songs/midi/se_m_sacred_fire2.mid b/sound/songs/midi/se_m_sacred_fire2.mid new file mode 100644 index 0000000000000000000000000000000000000000..54db24f80d828dac6a7afff718e64d2f33ef148e GIT binary patch literal 399 zcmYLFO=`kG6#gb-6C0F5l@OGIn}RD#S6KvNAc!uEC literal 0 HcmV?d00001 diff --git a/sound/songs/midi/se_m_sand_tomb.mid b/sound/songs/midi/se_m_sand_tomb.mid new file mode 100644 index 0000000000000000000000000000000000000000..91509bc3432a60bb0f57021131fff3f4c2204bcc GIT binary patch literal 535 zcmb7>K}rKb6hy1LLq?)IgM_&80Ff*lF$rUsRT9)-gh51INfv^Tg%`*iVUE&A@F;Tw zj}Tucqr`v<7oYl7zpLvvJ-euBy?eK91y@ z2l9@C<@R0ck{@l+_Gj{8MV@r=<-X>Zak_yX2-LuhYTBhTRGpJ cf8;-heaTM3zGTEUp+^I!~g&Q literal 0 HcmV?d00001 diff --git a/sound/songs/midi/se_m_sandstorm.mid b/sound/songs/midi/se_m_sandstorm.mid new file mode 100644 index 0000000000000000000000000000000000000000..669b04658c319d58c5c032b8dc759fbd9dd6d35d GIT binary patch literal 835 zcmc&z%SyvQ6g`tk8yPE9tPsRS1s8$^3(dloP~rnC+Cr5g-3TIG6kI6&K>G;+e`G$P z;E&9o)HBHhB+|8u%gsG=?>YA#$Y?U30jNSiA{gZ0!GUbuzz8S*DF zz{-Pe)Sy)zI@pFmf;3r39qjV^$uqbWItW=e?HhB%xL^!D9ZWg5&-}{1g!x?y;IEO8B;T#(`w3|Lic5Z?!3_Tb?|BTC&veOpW7RF-!nPvt&f(AJy-1M@ZDlf z-nv7)CzlC++4+rCmzE^7GDaHDY8lHg$Yug?ILYGyc~!>~bw ziD3hm1H%Ib2Zjkz1&kZGtby2!VFSAmkhTHR20+>YNCz-&;Bo=7y@2dQAPr=*7l8Bv z+15-O*z198Ga%arh(TgtwLtL_pg2fvB1A2_17kxJ10&ErCWKRr84hTHq#@2obzlRs SnZdZ80Y-z2Wok%;YXtx&Xga9? literal 0 HcmV?d00001 diff --git a/sound/songs/midi/se_m_self_destruct.mid b/sound/songs/midi/se_m_self_destruct.mid new file mode 100644 index 0000000000000000000000000000000000000000..504109dd1792241319d9c12d8c5343768142e6d5 GIT binary patch literal 156 zcmeYb$w*;fU|?flWME>D@C_--2J(a%{s%I%Ni{J1k6>Y8lHg$Yug?IL%4RsA$*_UF zm|=qm55op72Zjd>4h$2V>lquI85kzm0BIW_?OM;afy<2rD9^ZoJ&kDtmjzHy1oH-V kKSqd{GvfmWJ0RN~D6Y%&fWZQ&j+e2)l>us|p%~Cg0Ll$oK%xwK!*cqc6Qt zq4%RJ*C&+I>5D@C_--2J(a%{s%I%iitA(k6>Y8lHg$Yug?IL%40a7#;`$z zhhYPk1H%UPJcb7h4h$3g>lrt&djZ*|j1B$_3L03EF+O#lD@ literal 0 HcmV?d00001 diff --git a/sound/songs/midi/se_m_sky_uppercut.mid b/sound/songs/midi/se_m_sky_uppercut.mid new file mode 100644 index 0000000000000000000000000000000000000000..a5c5a1d00b9adcf1f6ef741772c8f0edc8e4d88d GIT binary patch literal 250 zcmYk0Jqp4=6oh9tOClmz7{n6@sVoDU_|r(5K!gPau@j64DZD^ZS?^Ky2suh_5@$uw z;_)#vyYpVI%PRmM0v=|$emKv^6BZs17@i!}#trd6PCcyE<0nY8lHg$Yug?ILN@6&m#;`$z zhhYPk1H%S(S%wD;4h$1?>lrt&2LN$B%Z7ReCJ0-Ou|b!C>3|AQSp>rblLDY{ED$F$ z0hIuirUThIK)M7-SAev#HkdFV*_6$2KpLpcgb^srIKc==8v$u3A7liY7}(eeCJqqw b7C_p9foXyrkhTNqLlI{L>xam(06hl)bEG~f literal 0 HcmV?d00001 diff --git a/sound/songs/midi/se_m_solar_beam.mid b/sound/songs/midi/se_m_solar_beam.mid new file mode 100644 index 0000000000000000000000000000000000000000..1b948a8ee78d05879fbdc023f847783907658ae0 GIT binary patch literal 348 zcmXw#u}T9$6h-guPIhD(3oTZ$un-hPErf_+e1e}c zf3luu)?%3Z-n;j{J2RcXE+v)9l&hM~Ki;Tz)Xj==f35D(xxCs^ccINFJJrvT;%=qr z_Y^~;q%VC>-d*%3c?>o6XA%8X5yKF?0zZI9;OBC~Uu4lQ2Qjp!rFU-{ZmU-==>?yr zNP0q7b1%$`xp~Zbk6YvCNv%WQYa5$!YWidPe;WKo=GXJD|M^+ckPNox()KX7yyxV# py=eR$^)dVgd;|ZGeoOW=*hlS91UW literal 0 HcmV?d00001 diff --git a/sound/songs/midi/se_m_spit_up.mid b/sound/songs/midi/se_m_spit_up.mid new file mode 100644 index 0000000000000000000000000000000000000000..9fed3c5e134e18d520710a9277ab69b5ef2fca2e GIT binary patch literal 219 zcmeYb$w*;fU|?flWMF2H@C_--2J(a%{s%I%Ni{J1k6>Y8lHg$Yug?ILDrPv~$gn|# zhhYPI9>WGM2Zjd>4h$2V3m7+WSpwPmK-vRH%P=-LGcatZX8`h{YWxeBAZq*>8~lNC yV0AG-F_^pq)C_+nBzb0p)%pwvEWy@Ja4=zRaDW&OWHW)R0rHt9I4HoxLD~R6=QaZX literal 0 HcmV?d00001 diff --git a/sound/songs/midi/se_m_stat_decrease.mid b/sound/songs/midi/se_m_stat_decrease.mid new file mode 100644 index 0000000000000000000000000000000000000000..9cb5e83a68f921f74a04f15eb92d2d7fef7755c6 GIT binary patch literal 851 zcmZ9~Pfo%>6bA6u0TqcmU9eHP0WL@+1}O5Uk?Za_3M{kGMxs|>kAQ`l0yZm1kuMko-XMa7EYeO=$I6XqEez`jr1!~qkWIE zGmo-zhYs{ca_2h-+BoTs@SHeV*~6TWj8*PCX-vpe_le|EWdkQ&s%{tg17?Th*ca*8 z^k8n;+*)SDW@NfB7i=ypGk_VG9?T7!8_S%rIWt|D37d&!`Y?UdgSlpNZJARxr=|;Y z&gR@QM=(dG2Xn>d$}&SXL(_#BH}v<6jak>*v#vJv{etMAheAc9C^S_w_F1BeF+yc>eY~$U4aM)O{D33*W^tUA${!w%O-hwys3l RVqfnL>jT`a=v5%-8@~f;WPcC3Gpw zSwy+U&k^Om(sdnPz^@WIzNl<|*aq{tw(>d*jg`?*$+RuwcSt-%}hRjd$k#;_1 zCn05JkG{zxwTuL&NSB0jM`Yy?Gaxn8`IAV8giLoMQd6A`L^{>o8S)3r4XK{a-$dH8 zUAQZDSB^VkcVxS8XY9@#x6f|hcHyqsT|4fW-LdV$owGZ4+=$)CcHwT=-8gQ-ZeqJ| z7wj$^H)c1sUAS9zw~jkucVfHRy*KxpyESvavCeV72d>WWZn+zwi+7vo9Pf7ERvq`2 zU7fqG&i=atc6Dyt{Bxoo+TBrhRif;=jCo4gC3bvXs$P?6orIm)C-w%iMm`CdR83^f zd1DRckXWqw<>6v)yXT6OI;t2GAu|?JV)l0m#zCvj}Of)Aj ak~+hwdN;Q0G`o?f6*n|W5*Kqw literal 0 HcmV?d00001 diff --git a/sound/songs/midi/se_m_string_shot.mid b/sound/songs/midi/se_m_string_shot.mid new file mode 100644 index 0000000000000000000000000000000000000000..bebbaeef89bdf84b973b751d391d97d250229265 GIT binary patch literal 168 zcmeYb$w*;fU|?flWME>D@C_--2J(a%{s%HMuWVrWAHl-HB*DS(U!MUgRnBlgjA4Ta z55op72Zjyoc?=I292h3}<}h#Ias{&8fV4l5_5spvKsuD^0fPtQ1}=Lb-yF!d0Mdp) k+6am70OUKcZD5aL-oWk-#8yD83B=Ms%+B24%K)+-01!ne?B@g z!1NXu=AAjryjgk21AsIPC|E1+dgiNuXsgu2N3=^C2`h`J4r#scG@*-m=*$V)oFK#$ zfqPLQ=8UU+7l{xHLz^1}>kscUP35nlv^k~U5r0HJ6MsyJ2-U!w1kRTx|Rn#^~|ET-`Fe`nqBOvy=01Wr5WJD=|k5cF90Sl_{OEM zvGaR7uc&WV00sdR;-Y@t$!6%w&@5W?jn*n2qu=6heehjF=2M7WLZS>EGQ8bWi`^)R zoa*2Mu`ZM-A>I==#3}JnGf(~?uBdsw4Yk}5b284bUr|e#yNtw^>`2*hFk=1C7j`J= c?bzi*u`B+Q(?2P(6W(B$@#JUIIt*w307IHL3IG5A literal 0 HcmV?d00001 diff --git a/sound/songs/midi/se_m_swagger.mid b/sound/songs/midi/se_m_swagger.mid new file mode 100644 index 0000000000000000000000000000000000000000..bd5a220f2c8bf97460560e4bbfc687717315696c GIT binary patch literal 168 zcmeYb$w*;fU|?flWME>D@C_--2J(a%{s%I%Taxz@W>tf!!S_rVJF*1kzGKnjc8>FgEBiFaxaz0Qs6IlK=n! literal 0 HcmV?d00001 diff --git a/sound/songs/midi/se_m_swagger2.mid b/sound/songs/midi/se_m_swagger2.mid new file mode 100644 index 0000000000000000000000000000000000000000..cd7119905981373484ff4696c97e34bd4b0239df GIT binary patch literal 132 zcmeYb$w*;fU|?flWME>D@C_--2J(a%{s%I%Ni{J1k6>Y8lHg$Yug?IL3T8N9!LUJu zhhYPk1H%S(M}`Ls9t;x_3m6*`8GvjDh6zb2j15T)K-vaGGe2OkV3?2$luw4rrvT-F PR!&F(%BL_e1C0g%r05_g literal 0 HcmV?d00001 diff --git a/sound/songs/midi/se_m_sweet_scent.mid b/sound/songs/midi/se_m_sweet_scent.mid new file mode 100644 index 0000000000000000000000000000000000000000..8896334d8e3498d52f1be26925658850bb918c1f GIT binary patch literal 443 zcmYjM%Sr=55Ukx9Ghto5D7tu8FM^^VB5|{iBqlK%2!s&uV1$TDAP0ZI{e=CLxqHdY z-`GD{t4$6$6jfc_T{E4HKjr{xaG(%m)e53&GU{mBV|ojt>4J#g|0O>^v=lv;k$W)t#f{`I@+8Q^PDqA z$0*V{SFRZ!x+R*7iK+X9a p{*7OqX?pT)))Ur4C3Duam?`hw)4w90@=fNMWBN@wLFMWH34gk~axnk^ literal 0 HcmV?d00001 diff --git a/sound/songs/midi/se_m_swift.mid b/sound/songs/midi/se_m_swift.mid new file mode 100644 index 0000000000000000000000000000000000000000..deaa005d351677ce48610fd920a02d1536601bf4 GIT binary patch literal 283 zcmeYb$w*;fU|?flWMF2H@C_--2J(a%{s%I%iitA(k6>Y8lHg$Yug?IL+Rt!6fMJ6O z55op72ZjyoDGU!792h1fr!YQXFlF4p5G4d@O$8xaQFfJ@0v zZvMGZm}Ww=rKQx(;%!UiLTSyIQTqL-#&IWGM4%8 zF6M!MGLBv8>wl+T@tDF7oA9HAZwr1vUFq^0ul&YJN&2ZSX}Lzyb)iKw(@>)6H6VuG f#2LekTGDNpB|nY~J!iu?qL~#OGed9a`SPqEtiE08 literal 0 HcmV?d00001 diff --git a/sound/songs/midi/se_m_teleport.mid b/sound/songs/midi/se_m_teleport.mid new file mode 100644 index 0000000000000000000000000000000000000000..c886fad834c919f68b8b202f18eae07a2af1cfeb GIT binary patch literal 424 zcmZvYK}y3w7=_=ArIBpyBDfHjZi=`Qi6ym7lT;gR2wD*>ND)C7B7#fj2y>JK1|Pp zaRV6V7)BhSKmhIki2`F`oHL$<^b+bj>PyxOseIHu1+Jh6KlCH|kua{${f2tZJ!8+4 zR0Fck((+^I;ER4jc0wj)opU`)6||WX=wZcNler*s%le*cDb=uL66nzlo9KoY_6MI8~ zuD&;W?fmnH(K!ZCfq(@sjII~H+Q@d6Jv<;g+P3tn$VT|07m^l?dxPoJV3bCR6Q2HE z8nqB9v@mKcA3jPpJ(F$7=44y>nEsf~a~5+v6Y?4VEqM>6apP~^6UN=sQ_KeJU6J+K uiO($KHbv1D)XNpuNStCtwZv0%9Sv3l)Pr2xtfB7Z+9`bR&u`?q%W-c6;X`!* literal 0 HcmV?d00001 diff --git a/sound/songs/midi/se_m_thunderbolt2.mid b/sound/songs/midi/se_m_thunderbolt2.mid new file mode 100644 index 0000000000000000000000000000000000000000..0e483f5e4bb714e9c18e0e1fed89b10b487a4ee4 GIT binary patch literal 231 zcmeYb$w*;fU|?flWMF2H@C_--2J(a%{s%I%XofTVk6>Y8lHg$Yug?ILie@+<#IS)q zg<*pT55op72Zjd>4h$1KBA6RI7??M3nFHAYP_`$K?Ez&Q0ND;ub^wrVgCuSOV)G-c t2xd6I3bBFAln7X28lZ$iQ6EFTOf%WfY<^+qXCqEHOv42 literal 0 HcmV?d00001 diff --git a/sound/songs/midi/se_m_toxic.mid b/sound/songs/midi/se_m_toxic.mid new file mode 100644 index 0000000000000000000000000000000000000000..27a7d2c7e95db7281864ef5ad25685b30d1209ba GIT binary patch literal 235 zcmYLEI}UUk$yV>mB@oxyPNeJ@&KIN)Qw(Cy*E2i#@_r!w@&V3SsQT*V|n zx1FW95vOwER!oe4R5zZ{BR|nAnVBlY>PBWghfRr7R&hybwv#3hHjn9Va&k+$zg?$} RV<+z^rI_}uCe{e~!5glyIc@*| literal 0 HcmV?d00001 diff --git a/sound/songs/midi/se_m_tri_attack.mid b/sound/songs/midi/se_m_tri_attack.mid new file mode 100644 index 0000000000000000000000000000000000000000..bdf1fe69cc399b2c39138ee3336766922f84b720 GIT binary patch literal 239 zcmYMtK?;IU5C-7?Jtd`G*uqt~X%Pl3lMqo0RwJPK5tA8hNEGw&KN4wl&+0ogWu|fZU;Sgp{Fsl<)DWL<-dit zeD-U4paHGvp5Ez6_NYaVhE;QR9cQ$nxztupx6DgA-k8yaY<<}O*C{%aFCS2uC)*5A YDNSiY69^U4m^q>mb4WwxfCk@FA5#K2tN;K2 literal 0 HcmV?d00001 diff --git a/sound/songs/midi/se_m_tri_attack2.mid b/sound/songs/midi/se_m_tri_attack2.mid new file mode 100644 index 0000000000000000000000000000000000000000..3269e369d9627317bafb197071ae1b6d546a8bff GIT binary patch literal 291 zcmYL^y-EX75QWd(+1!;S5J(gjtAK@=MkGa2+`tlu#X<@pLAx{o1;HYfg|Pbw`zZ4W z0bk_4$$BP6EQVpeIcI*>o3}jx4+lZ9-W=XpjnF+wdiRX(B~6p!0^L2%t#2HM(91qF zFQM57B1*KYS|YZLQkoUW9?3pgFP-L95-}6aXXH2D`sO|PLhU2w(ggE7pj~{?6R55H zuVyYwVd7Q|3}x za-&kIR^1}9v&&OY7m(_gI@)udZD=?d<@Uw z$8~cV{fJo#KSk#q*QYx03-rnhuYAmg%yK-xKK9(9S3dH-{dgzdOSTu#@4olD(WmHR za^8lPJTS{^mR$R+^cnpLIO6*O-ZuY|`nTz~nfIe*SAVC{OzVT{M60~%&*M+y&qB?q i#g-Ln{j0qyUZI3o4Za15P{>D!Sq--9tg0{bYRwmOz;E;b literal 0 HcmV?d00001 diff --git a/sound/songs/midi/se_m_uproar.mid b/sound/songs/midi/se_m_uproar.mid new file mode 100644 index 0000000000000000000000000000000000000000..e797289a02cea2572b82ea59b1791bd9480fcb83 GIT binary patch literal 184 zcmeYb$w*;fU|?flWME>D@C_--2J(a%{s%I%Ni{J1k6>Y8lHg$Yug?ILYG*iL!>~bw zhhYP|B*O+S2Zjd>4h$14>KQk1IRV9tfwU`-_F~+?9to6lgo>vy0o4N8c0e%~AZ-KW pgV?T6aVL;IAlnJTXAcFMZ3j{ZGz&Y8lHg$Yug?IL3S&4R#;}1s zk70ud55oqo0EPz)c?=V5>X|pNX8`#QKz=xo9SdX|0NIAj4K@r62SmYI9xymCOz^K~ qZt!Pd25FrT0%V6UupvxWW;nnCQp&l3%L8bt2}n0ksU?gJQVIZLb1M%3 literal 0 HcmV?d00001 diff --git a/sound/songs/midi/se_m_vital_throw2.mid b/sound/songs/midi/se_m_vital_throw2.mid new file mode 100644 index 0000000000000000000000000000000000000000..d5c77149e0e43cf43289c4f0b702a4f9b3cc7e60 GIT binary patch literal 271 zcmYk1F$%&!6hvpU(IksqQp7?ntVF~{F%iKuA{HrxpdP?N5G=faIYK(G@sE(B6{7xfh1t0&4f#JNF&4#Xs=kf2yS zRD}i4SczG37c#@jSNJNeaS15UfnbL`H9V5KkU*b&I0n0>Kp&MI}NWASig#2j~-gNseCR(dX9%&Q*(ifiqQZ7PF1o0oRXy6?_U5lL)M&FP XmKsWerzgRkdZO;ghVxuC*;s!A(+NVr literal 0 HcmV?d00001 diff --git a/sound/songs/midi/se_wall_hit.mid b/sound/songs/midi/se_wall_hit.mid new file mode 100644 index 0000000000000000000000000000000000000000..8197a78a5e68fe90a5d6e584036e2f6e888b8b41 GIT binary patch literal 72 zcmeYb$w*;fU|?flWME>D@C_--2J(a%{s%I%XofTVk6>Y8lHg$Yug?IL5@$FN$*_Sv UfZ+jy1H%OEdZ7kw1~#BH0RNB=rT_o{ literal 0 HcmV?d00001 diff --git a/sound/songs/midi/se_win_open.mid b/sound/songs/midi/se_win_open.mid new file mode 100644 index 0000000000000000000000000000000000000000..a6a7c4ea0cc82c93d692a34c674474eb9f3f87c2 GIT binary patch literal 76 zcmeYb$w*;fU|?flWME>D@C_--2J(a%{s%I%XofTVk6>Y8lHg$Yug?ILl4dwi&#-|# Yk70s+J#&LS1H%OWdj1A~1~#A)07xDYBLDyZ literal 0 HcmV?d00001 diff --git a/sound/songs/se_dex_page.s b/sound/songs/se_dex_page.s deleted file mode 100644 index 884f0d12a..000000000 --- a/sound/songs/se_dex_page.s +++ /dev/null @@ -1,54 +0,0 @@ - .include "MPlayDef.s" - - .equ se_dex_page_grp, voicegroup127 - .equ se_dex_page_pri, 5 - .equ se_dex_page_rev, reverb_set+50 - .equ se_dex_page_mvl, 127 - .equ se_dex_page_key, 0 - .equ se_dex_page_tbs, 1 - .equ se_dex_page_exg, 0 - .equ se_dex_page_cmp, 1 - - .section .rodata - .global se_dex_page - .align 2 - -@********************** Track 1 **********************@ - -se_dex_page_1: - .byte KEYSH , se_dex_page_key+0 - .byte TEMPO , 100*se_dex_page_tbs/2 - .byte VOICE , 4 - .byte BENDR , 12 - .byte XCMD , xIECV , 10 - .byte xIECL , 8 - .byte VOL , 90*se_dex_page_mvl/mxv - .byte BEND , c_v+4 - .byte N01 , Cn5 , v064 - .byte W01 - .byte Cn5 , v020 - .byte W01 - .byte Cn5 , v064 - .byte W01 - .byte Cn5 , v020 - .byte W01 - .byte Cn6 , v064 - .byte W02 - .byte Cn6 , v020 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_dex_page: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_dex_page_pri @ Priority - .byte se_dex_page_rev @ Reverb. - - .word se_dex_page_grp - - .word se_dex_page_1 - - .end diff --git a/sound/songs/se_dex_scroll.s b/sound/songs/se_dex_scroll.s deleted file mode 100644 index 6c7ad7746..000000000 --- a/sound/songs/se_dex_scroll.s +++ /dev/null @@ -1,46 +0,0 @@ - .include "MPlayDef.s" - - .equ se_dex_scroll_grp, voicegroup127 - .equ se_dex_scroll_pri, 5 - .equ se_dex_scroll_rev, reverb_set+50 - .equ se_dex_scroll_mvl, 127 - .equ se_dex_scroll_key, 0 - .equ se_dex_scroll_tbs, 1 - .equ se_dex_scroll_exg, 0 - .equ se_dex_scroll_cmp, 1 - - .section .rodata - .global se_dex_scroll - .align 2 - -@********************** Track 1 **********************@ - -se_dex_scroll_1: - .byte KEYSH , se_dex_scroll_key+0 - .byte TEMPO , 100*se_dex_scroll_tbs/2 - .byte VOICE , 4 - .byte BENDR , 12 - .byte XCMD , xIECV , 10 - .byte xIECL , 8 - .byte VOL , 40*se_dex_scroll_mvl/mxv - .byte BEND , c_v+4 - .byte N01 , Gn4 , v127 - .byte W01 - .byte Gn4 , v020 - .byte W02 - .byte FINE - -@******************************************************@ - .align 2 - -se_dex_scroll: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_dex_scroll_pri @ Priority - .byte se_dex_scroll_rev @ Reverb. - - .word se_dex_scroll_grp - - .word se_dex_scroll_1 - - .end diff --git a/sound/songs/se_m_absorb.s b/sound/songs/se_m_absorb.s deleted file mode 100644 index 35213fdaa..000000000 --- a/sound/songs/se_m_absorb.s +++ /dev/null @@ -1,73 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_absorb_grp, voicegroup128 - .equ se_m_absorb_pri, 4 - .equ se_m_absorb_rev, reverb_set+50 - .equ se_m_absorb_mvl, 127 - .equ se_m_absorb_key, 0 - .equ se_m_absorb_tbs, 1 - .equ se_m_absorb_exg, 0 - .equ se_m_absorb_cmp, 1 - - .section .rodata - .global se_m_absorb - .align 2 - -@********************** Track 1 **********************@ - -se_m_absorb_1: - .byte KEYSH , se_m_absorb_key+0 - .byte TEMPO , 150*se_m_absorb_tbs/2 - .byte VOICE , 24 - .byte VOL , 110*se_m_absorb_mvl/mxv - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N01 , Cn6 , v127 - .byte W01 - .byte Gn6 , v112 - .byte W01 - .byte VOICE , 38 - .byte VOL , 58*se_m_absorb_mvl/mxv - .byte N08 , Gn4 - .byte W01 - .byte VOL , 68*se_m_absorb_mvl/mxv - .byte PAN , c_v+8 - .byte BEND , c_v-20 - .byte W01 - .byte VOL , 75*se_m_absorb_mvl/mxv - .byte PAN , c_v-8 - .byte BEND , c_v-48 - .byte W02 - .byte VOL , 83*se_m_absorb_mvl/mxv - .byte PAN , c_v+8 - .byte BEND , c_v-18 - .byte W01 - .byte VOL , 90*se_m_absorb_mvl/mxv - .byte PAN , c_v-8 - .byte BEND , c_v+10 - .byte W01 - .byte VOL , 101*se_m_absorb_mvl/mxv - .byte PAN , c_v+9 - .byte BEND , c_v+39 - .byte W01 - .byte VOL , 110*se_m_absorb_mvl/mxv - .byte PAN , c_v-8 - .byte BEND , c_v+63 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_absorb: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_absorb_pri @ Priority - .byte se_m_absorb_rev @ Reverb. - - .word se_m_absorb_grp - - .word se_m_absorb_1 - - .end diff --git a/sound/songs/se_m_absorb_2.s b/sound/songs/se_m_absorb_2.s deleted file mode 100644 index 3f9df6dc4..000000000 --- a/sound/songs/se_m_absorb_2.s +++ /dev/null @@ -1,155 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_absorb_2_grp, voicegroup128 - .equ se_m_absorb_2_pri, 4 - .equ se_m_absorb_2_rev, reverb_set+50 - .equ se_m_absorb_2_mvl, 127 - .equ se_m_absorb_2_key, 0 - .equ se_m_absorb_2_tbs, 1 - .equ se_m_absorb_2_exg, 0 - .equ se_m_absorb_2_cmp, 1 - - .section .rodata - .global se_m_absorb_2 - .align 2 - -@********************** Track 1 **********************@ - -se_m_absorb_2_1: - .byte KEYSH , se_m_absorb_2_key+0 - .byte TEMPO , 150*se_m_absorb_2_tbs/2 - .byte VOICE , 46 - .byte VOL , 110*se_m_absorb_2_mvl/mxv - .byte BENDR , 2 - .byte PAN , c_v+0 - .byte BEND , c_v+15 - .byte W01 - .byte N02 , Dn6 , v112 - .byte W02 - .byte Cs6 - .byte W03 - .byte PAN , c_v+8 - .byte N02 , An5 - .byte W02 - .byte Fs5 - .byte W01 - .byte W01 - .byte Dn5 - .byte W02 - .byte PAN , c_v-7 - .byte W01 - .byte N02 , Dn5 , v104 - .byte W02 - .byte Cs5 , v100 - .byte W03 - .byte PAN , c_v+0 - .byte N02 , An4 , v096 - .byte W02 - .byte Fs4 , v092 - .byte W01 - .byte W01 - .byte Dn4 , v088 - .byte W02 - .byte PAN , c_v+15 - .byte W01 - .byte N02 , Dn6 - .byte W02 - .byte Cs6 , v084 - .byte W03 - .byte An5 , v080 - .byte W02 - .byte Fs5 , v076 - .byte W01 - .byte W01 - .byte Dn5 , v072 - .byte W02 - .byte PAN , c_v-16 - .byte W01 - .byte N02 , Dn6 , v068 - .byte W02 - .byte Cs6 , v064 - .byte W03 - .byte An5 , v060 - .byte W02 - .byte Fs5 , v056 - .byte W01 - .byte W01 - .byte Dn5 , v052 - .byte W02 - .byte W03 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_absorb_2_2: - .byte KEYSH , se_m_absorb_2_key+0 - .byte VOICE , 53 - .byte BENDR , 2 - .byte VOL , 43*se_m_absorb_2_mvl/mxv - .byte BEND , c_v+15 - .byte N02 , An6 , v112 - .byte W02 - .byte Fs6 - .byte W01 - .byte W01 - .byte Dn6 - .byte W02 - .byte W01 - .byte Cs6 - .byte W02 - .byte An5 - .byte W03 - .byte N02 - .byte W02 - .byte Fs5 , v104 - .byte W01 - .byte W01 - .byte Dn5 , v100 - .byte W02 - .byte W01 - .byte Cs5 , v096 - .byte W02 - .byte An4 , v092 - .byte W03 - .byte An6 , v088 - .byte W02 - .byte Fs6 , v084 - .byte W01 - .byte W01 - .byte Dn6 , v080 - .byte W02 - .byte W01 - .byte Cs6 , v076 - .byte W02 - .byte An5 , v072 - .byte W03 - .byte An6 , v068 - .byte W02 - .byte Fs6 , v064 - .byte W01 - .byte W01 - .byte Dn6 , v060 - .byte W02 - .byte W01 - .byte Cs6 , v056 - .byte W02 - .byte An5 , v052 - .byte W03 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_absorb_2: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_absorb_2_pri @ Priority - .byte se_m_absorb_2_rev @ Reverb. - - .word se_m_absorb_2_grp - - .word se_m_absorb_2_1 - .word se_m_absorb_2_2 - - .end diff --git a/sound/songs/se_m_acid_armor.s b/sound/songs/se_m_acid_armor.s deleted file mode 100644 index c7f350a9b..000000000 --- a/sound/songs/se_m_acid_armor.s +++ /dev/null @@ -1,202 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_acid_armor_grp, voicegroup128 - .equ se_m_acid_armor_pri, 4 - .equ se_m_acid_armor_rev, reverb_set+50 - .equ se_m_acid_armor_mvl, 127 - .equ se_m_acid_armor_key, 0 - .equ se_m_acid_armor_tbs, 1 - .equ se_m_acid_armor_exg, 0 - .equ se_m_acid_armor_cmp, 1 - - .section .rodata - .global se_m_acid_armor - .align 2 - -@********************** Track 1 **********************@ - -se_m_acid_armor_1: - .byte KEYSH , se_m_acid_armor_key+0 - .byte TEMPO , 150*se_m_acid_armor_tbs/2 - .byte VOICE , 31 - .byte VOL , 110*se_m_acid_armor_mvl/mxv - .byte BENDR , 24 - .byte PAN , c_v+0 - .byte BEND , c_v-37 - .byte N06 , Gn0 , v127 - .byte W01 - .byte BEND , c_v-16 - .byte W01 - .byte c_v+0 - .byte W01 - .byte c_v+27 - .byte W01 - .byte c_v+46 - .byte W02 - .byte VOICE , 23 - .byte PAN , c_v+11 - .byte N01 , Cn1 - .byte W01 - .byte PAN , c_v-10 - .byte N01 , Cn2 - .byte W01 - .byte VOICE , 31 - .byte PAN , c_v+6 - .byte BEND , c_v-37 - .byte N06 , Dn1 - .byte W01 - .byte BEND , c_v-16 - .byte W01 - .byte c_v+0 - .byte W02 - .byte c_v+27 - .byte W01 - .byte c_v+46 - .byte W01 - .byte VOICE , 23 - .byte PAN , c_v-1 - .byte N01 , Fn1 - .byte W01 - .byte PAN , c_v-10 - .byte N01 , Fn2 - .byte W01 - .byte VOICE , 31 - .byte PAN , c_v+0 - .byte BEND , c_v-37 - .byte N02 , Gn0 - .byte W02 - .byte BEND , c_v-16 - .byte W01 - .byte c_v+0 - .byte W01 - .byte PAN , c_v+5 - .byte BEND , c_v+27 - .byte N02 - .byte W01 - .byte BEND , c_v+46 - .byte W01 - .byte VOICE , 23 - .byte PAN , c_v+10 - .byte N01 , Cn1 - .byte W02 - .byte PAN , c_v-9 - .byte N01 , Cn2 - .byte W01 - .byte VOICE , 31 - .byte PAN , c_v+0 - .byte BEND , c_v-37 - .byte N06 , Dn1 - .byte W01 - .byte BEND , c_v-16 - .byte W01 - .byte c_v+0 - .byte W01 - .byte c_v+27 - .byte W02 - .byte c_v+46 - .byte W01 - .byte VOICE , 23 - .byte PAN , c_v+5 - .byte N01 , Cn1 - .byte W01 - .byte PAN , c_v-8 - .byte N01 , Cn2 - .byte W01 - .byte VOICE , 31 - .byte PAN , c_v+0 - .byte BEND , c_v-37 - .byte N06 , Gn0 , v112 - .byte W01 - .byte BEND , c_v-16 - .byte W02 - .byte c_v+0 - .byte W01 - .byte c_v+27 - .byte W01 - .byte c_v+46 - .byte W01 - .byte VOICE , 23 - .byte PAN , c_v+11 - .byte N01 , Cn1 , v100 - .byte W01 - .byte PAN , c_v-10 - .byte N01 , Cn2 , v096 - .byte W02 - .byte VOICE , 31 - .byte PAN , c_v+6 - .byte BEND , c_v-37 - .byte N06 , Dn1 - .byte W01 - .byte BEND , c_v-16 - .byte W01 - .byte c_v+0 - .byte W01 - .byte c_v+27 - .byte W01 - .byte c_v+46 - .byte W02 - .byte VOICE , 23 - .byte PAN , c_v-1 - .byte N01 , Fn1 , v084 - .byte W01 - .byte PAN , c_v-10 - .byte N01 , Fn2 - .byte W01 - .byte VOICE , 31 - .byte PAN , c_v+0 - .byte BEND , c_v-37 - .byte N02 , Gn0 , v080 - .byte W01 - .byte BEND , c_v-16 - .byte W01 - .byte c_v+0 - .byte W02 - .byte PAN , c_v+5 - .byte BEND , c_v+27 - .byte N02 , Gn0 , v072 - .byte W01 - .byte BEND , c_v+46 - .byte W01 - .byte VOICE , 23 - .byte PAN , c_v+10 - .byte N01 , Cn1 , v068 - .byte W01 - .byte PAN , c_v-9 - .byte N01 , Cn2 - .byte W01 - .byte VOICE , 31 - .byte PAN , c_v+0 - .byte BEND , c_v-37 - .byte N06 , Dn1 , v064 - .byte W02 - .byte BEND , c_v-16 - .byte W01 - .byte c_v+0 - .byte W01 - .byte c_v+27 - .byte W01 - .byte c_v+46 - .byte W01 - .byte VOICE , 23 - .byte PAN , c_v+5 - .byte N01 , Cn1 , v056 - .byte W02 - .byte PAN , c_v-8 - .byte N01 , Cn2 , v052 - .byte W06 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_acid_armor: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_acid_armor_pri @ Priority - .byte se_m_acid_armor_rev @ Reverb. - - .word se_m_acid_armor_grp - - .word se_m_acid_armor_1 - - .end diff --git a/sound/songs/se_m_attract.s b/sound/songs/se_m_attract.s deleted file mode 100644 index 8e18c16dc..000000000 --- a/sound/songs/se_m_attract.s +++ /dev/null @@ -1,126 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_attract_grp, voicegroup128 - .equ se_m_attract_pri, 4 - .equ se_m_attract_rev, reverb_set+50 - .equ se_m_attract_mvl, 127 - .equ se_m_attract_key, 0 - .equ se_m_attract_tbs, 1 - .equ se_m_attract_exg, 0 - .equ se_m_attract_cmp, 1 - - .section .rodata - .global se_m_attract - .align 2 - -@********************** Track 1 **********************@ - -se_m_attract_1: - .byte KEYSH , se_m_attract_key+0 - .byte TEMPO , 210*se_m_attract_tbs/2 - .byte VOICE , 46 - .byte VOL , 95*se_m_attract_mvl/mxv - .byte BENDR , 2 - .byte PAN , c_v+0 - .byte BEND , c_v+15 - .byte W03 - .byte N06 , Cn6 , v116 - .byte W03 - .byte W03 - .byte En6 , v108 - .byte W03 - .byte W03 - .byte Cs5 , v100 - .byte W03 - .byte W03 - .byte Gs5 , v088 - .byte W03 - .byte W03 - .byte PAN , c_v-4 - .byte N06 , Cs6 , v080 - .byte W03 - .byte W03 - .byte PAN , c_v+0 - .byte N06 , Dn6 , v072 - .byte W03 - .byte W03 - .byte PAN , c_v+4 - .byte N06 , Fs6 , v060 - .byte W03 - .byte W03 - .byte PAN , c_v+0 - .byte N06 , Ds5 , v052 - .byte W03 - .byte W03 - .byte PAN , c_v-4 - .byte N06 , As5 , v040 - .byte W03 - .byte W03 - .byte PAN , c_v+0 - .byte W03 - .byte W03 - .byte c_v+4 - .byte W03 - .byte W03 - .byte c_v+0 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_attract_2: - .byte KEYSH , se_m_attract_key+0 - .byte VOICE , 53 - .byte BENDR , 2 - .byte VOL , 43*se_m_attract_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+15 - .byte N06 , Cn5 , v120 - .byte W03 - .byte W03 - .byte Gn5 , v112 - .byte W03 - .byte W03 - .byte Cn6 , v104 - .byte W03 - .byte W03 - .byte Cs6 , v092 - .byte W03 - .byte W03 - .byte Fn6 , v084 - .byte W03 - .byte W03 - .byte Dn5 , v076 - .byte W03 - .byte W03 - .byte An5 , v064 - .byte W03 - .byte W03 - .byte Dn6 , v056 - .byte W03 - .byte W03 - .byte Ds6 , v048 - .byte W03 - .byte W03 - .byte Gn6 , v036 - .byte W03 - .byte W03 - .byte W03 - .byte W03 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_attract: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_attract_pri @ Priority - .byte se_m_attract_rev @ Reverb. - - .word se_m_attract_grp - - .word se_m_attract_1 - .word se_m_attract_2 - - .end diff --git a/sound/songs/se_m_attract2.s b/sound/songs/se_m_attract2.s deleted file mode 100644 index 7d3d6f3c5..000000000 --- a/sound/songs/se_m_attract2.s +++ /dev/null @@ -1,127 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_attract2_grp, voicegroup128 - .equ se_m_attract2_pri, 4 - .equ se_m_attract2_rev, reverb_set+50 - .equ se_m_attract2_mvl, 127 - .equ se_m_attract2_key, 0 - .equ se_m_attract2_tbs, 1 - .equ se_m_attract2_exg, 0 - .equ se_m_attract2_cmp, 1 - - .section .rodata - .global se_m_attract2 - .align 2 - -@********************** Track 1 **********************@ - -se_m_attract2_1: - .byte KEYSH , se_m_attract2_key+0 - .byte TEMPO , 150*se_m_attract2_tbs/2 - .byte VOICE , 61 - .byte BENDR , 44 - .byte PAN , c_v+0 - .byte VOL , 110*se_m_attract2_mvl/mxv - .byte MOD , 30 - .byte BEND , c_v+2 - .byte N54 , Dn4 , v080 - .byte W12 - .byte PAN , c_v-4 - .byte W12 - .byte c_v-10 - .byte W12 - .byte c_v-4 - .byte W12 - .byte c_v+0 - .byte W06 - .byte N54 , Cn4 - .byte W06 - .byte PAN , c_v+6 - .byte W12 - .byte c_v+9 - .byte W12 - .byte c_v+5 - .byte W12 - .byte c_v+0 - .byte W12 - .byte c_v-4 - .byte N54 , Dn4 - .byte W12 - .byte PAN , c_v-10 - .byte W12 - .byte c_v-4 - .byte W12 - .byte c_v+0 - .byte W12 - .byte c_v+6 - .byte W06 - .byte N54 , Cn4 - .byte W06 - .byte PAN , c_v+9 - .byte W12 - .byte c_v+5 - .byte W12 - .byte c_v+0 - .byte W12 - .byte c_v-4 - .byte W12 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_attract2_2: - .byte KEYSH , se_m_attract2_key+0 - .byte VOICE , 62 - .byte BENDR , 44 - .byte VOL , 110*se_m_attract2_mvl/mxv - .byte MOD , 30 - .byte PAN , c_v+1 - .byte BEND , c_v+1 - .byte N24 , Dn4 , v040 - .byte W24 - .byte W02 - .byte PAN , c_v+47 - .byte N24 , Dn4 , v032 - .byte W22 - .byte W06 - .byte PAN , c_v+0 - .byte N24 , Cn4 , v040 - .byte W18 - .byte W08 - .byte PAN , c_v-49 - .byte N24 , Cn4 , v032 - .byte W16 - .byte W12 - .byte PAN , c_v+1 - .byte N24 , Dn4 , v040 - .byte W12 - .byte W14 - .byte PAN , c_v+47 - .byte N24 , Dn4 , v032 - .byte W10 - .byte W18 - .byte PAN , c_v+0 - .byte N24 , Cn4 , v040 - .byte W06 - .byte W20 - .byte PAN , c_v-48 - .byte N24 , Cn4 , v032 - .byte W04 - .byte W24 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_attract2: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_attract2_pri @ Priority - .byte se_m_attract2_rev @ Reverb. - - .word se_m_attract2_grp - - .word se_m_attract2_1 - .word se_m_attract2_2 - - .end diff --git a/sound/songs/se_m_barrier.s b/sound/songs/se_m_barrier.s deleted file mode 100644 index 54d57700f..000000000 --- a/sound/songs/se_m_barrier.s +++ /dev/null @@ -1,276 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_barrier_grp, voicegroup128 - .equ se_m_barrier_pri, 4 - .equ se_m_barrier_rev, reverb_set+50 - .equ se_m_barrier_mvl, 127 - .equ se_m_barrier_key, 0 - .equ se_m_barrier_tbs, 1 - .equ se_m_barrier_exg, 0 - .equ se_m_barrier_cmp, 1 - - .section .rodata - .global se_m_barrier - .align 2 - -@********************** Track 1 **********************@ - -se_m_barrier_1: - .byte KEYSH , se_m_barrier_key+0 - .byte TEMPO , 150*se_m_barrier_tbs/2 - .byte VOICE , 19 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 95*se_m_barrier_mvl/mxv - .byte BEND , c_v+3 - .byte N06 , Cn6 , v088 - .byte W01 - .byte VOL , 88*se_m_barrier_mvl/mxv - .byte BEND , c_v-8 - .byte W01 - .byte PAN , c_v+5 - .byte VOL , 56*se_m_barrier_mvl/mxv - .byte BEND , c_v-17 - .byte W01 - .byte PAN , c_v-6 - .byte VOL , 24*se_m_barrier_mvl/mxv - .byte BEND , c_v-34 - .byte W01 - .byte PAN , c_v+0 - .byte VOL , 11*se_m_barrier_mvl/mxv - .byte BEND , c_v-45 - .byte W02 - .byte VOL , 95*se_m_barrier_mvl/mxv - .byte BEND , c_v+0 - .byte N06 , Cn6 , v084 - .byte W01 - .byte VOL , 88*se_m_barrier_mvl/mxv - .byte BEND , c_v-11 - .byte W01 - .byte PAN , c_v+5 - .byte VOL , 56*se_m_barrier_mvl/mxv - .byte BEND , c_v-20 - .byte W01 - .byte PAN , c_v-6 - .byte VOL , 24*se_m_barrier_mvl/mxv - .byte BEND , c_v-37 - .byte W01 - .byte PAN , c_v+0 - .byte VOL , 11*se_m_barrier_mvl/mxv - .byte BEND , c_v-47 - .byte W02 - .byte VOL , 95*se_m_barrier_mvl/mxv - .byte BEND , c_v-1 - .byte N06 , Cn6 , v076 - .byte W01 - .byte VOL , 88*se_m_barrier_mvl/mxv - .byte BEND , c_v-11 - .byte W01 - .byte PAN , c_v+5 - .byte VOL , 56*se_m_barrier_mvl/mxv - .byte BEND , c_v-21 - .byte W01 - .byte PAN , c_v-6 - .byte VOL , 24*se_m_barrier_mvl/mxv - .byte BEND , c_v-38 - .byte W01 - .byte PAN , c_v+0 - .byte VOL , 11*se_m_barrier_mvl/mxv - .byte BEND , c_v-48 - .byte W02 - .byte VOL , 95*se_m_barrier_mvl/mxv - .byte BEND , c_v-1 - .byte N06 , Cn6 , v064 - .byte W01 - .byte VOL , 88*se_m_barrier_mvl/mxv - .byte BEND , c_v-11 - .byte W01 - .byte PAN , c_v+5 - .byte VOL , 56*se_m_barrier_mvl/mxv - .byte BEND , c_v-21 - .byte W01 - .byte PAN , c_v-6 - .byte VOL , 24*se_m_barrier_mvl/mxv - .byte BEND , c_v-38 - .byte W01 - .byte PAN , c_v+0 - .byte VOL , 11*se_m_barrier_mvl/mxv - .byte BEND , c_v-48 - .byte W02 - .byte VOL , 95*se_m_barrier_mvl/mxv - .byte BEND , c_v-2 - .byte N06 , Cn6 , v056 - .byte W01 - .byte PAN , c_v+5 - .byte VOL , 88*se_m_barrier_mvl/mxv - .byte BEND , c_v-12 - .byte W01 - .byte PAN , c_v-6 - .byte VOL , 56*se_m_barrier_mvl/mxv - .byte BEND , c_v-22 - .byte W01 - .byte PAN , c_v+8 - .byte VOL , 24*se_m_barrier_mvl/mxv - .byte BEND , c_v-39 - .byte W01 - .byte PAN , c_v-10 - .byte VOL , 11*se_m_barrier_mvl/mxv - .byte BEND , c_v-49 - .byte W02 - .byte PAN , c_v+0 - .byte VOL , 95*se_m_barrier_mvl/mxv - .byte BEND , c_v-2 - .byte N06 , Cn6 , v044 - .byte W01 - .byte PAN , c_v+5 - .byte VOL , 88*se_m_barrier_mvl/mxv - .byte BEND , c_v-12 - .byte W01 - .byte PAN , c_v-6 - .byte VOL , 56*se_m_barrier_mvl/mxv - .byte BEND , c_v-22 - .byte W01 - .byte PAN , c_v+8 - .byte VOL , 24*se_m_barrier_mvl/mxv - .byte BEND , c_v-39 - .byte W01 - .byte PAN , c_v-10 - .byte VOL , 11*se_m_barrier_mvl/mxv - .byte BEND , c_v-49 - .byte W02 - .byte VOL , 95*se_m_barrier_mvl/mxv - .byte BEND , c_v-2 - .byte N06 , Cn6 , v036 - .byte W01 - .byte PAN , c_v+5 - .byte VOL , 88*se_m_barrier_mvl/mxv - .byte BEND , c_v-13 - .byte W01 - .byte PAN , c_v-6 - .byte VOL , 56*se_m_barrier_mvl/mxv - .byte BEND , c_v-22 - .byte W01 - .byte PAN , c_v+8 - .byte VOL , 24*se_m_barrier_mvl/mxv - .byte BEND , c_v-39 - .byte W01 - .byte PAN , c_v-10 - .byte VOL , 11*se_m_barrier_mvl/mxv - .byte BEND , c_v-49 - .byte W02 - .byte PAN , c_v+0 - .byte VOL , 95*se_m_barrier_mvl/mxv - .byte BEND , c_v-2 - .byte N06 , Cn6 , v028 - .byte W01 - .byte PAN , c_v+5 - .byte VOL , 88*se_m_barrier_mvl/mxv - .byte BEND , c_v-13 - .byte W01 - .byte PAN , c_v-6 - .byte VOL , 56*se_m_barrier_mvl/mxv - .byte BEND , c_v-22 - .byte W01 - .byte PAN , c_v+8 - .byte VOL , 24*se_m_barrier_mvl/mxv - .byte BEND , c_v-39 - .byte W01 - .byte PAN , c_v-10 - .byte VOL , 11*se_m_barrier_mvl/mxv - .byte BEND , c_v-49 - .byte W02 - .byte W06 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_barrier_2: - .byte KEYSH , se_m_barrier_key+0 - .byte VOICE , 53 - .byte PAN , c_v+0 - .byte VOL , 95*se_m_barrier_mvl/mxv - .byte BEND , c_v-5 - .byte W02 - .byte N06 , An5 , v064 - .byte W02 - .byte VOL , 88*se_m_barrier_mvl/mxv - .byte W02 - .byte 56*se_m_barrier_mvl/mxv - .byte W01 - .byte 24*se_m_barrier_mvl/mxv - .byte W01 - .byte 95*se_m_barrier_mvl/mxv - .byte N06 , An5 , v056 - .byte W02 - .byte VOL , 88*se_m_barrier_mvl/mxv - .byte W02 -se_m_barrier_2_000: - .byte VOL , 56*se_m_barrier_mvl/mxv - .byte W01 - .byte 24*se_m_barrier_mvl/mxv - .byte W01 - .byte 95*se_m_barrier_mvl/mxv - .byte N06 , An5 , v052 - .byte W02 - .byte VOL , 88*se_m_barrier_mvl/mxv - .byte W02 - .byte PEND - .byte PATT - .word se_m_barrier_2_000 - .byte VOL , 56*se_m_barrier_mvl/mxv - .byte W01 - .byte 24*se_m_barrier_mvl/mxv - .byte W01 - .byte 95*se_m_barrier_mvl/mxv - .byte N06 , An5 , v048 - .byte W02 - .byte VOL , 88*se_m_barrier_mvl/mxv - .byte W02 - .byte 56*se_m_barrier_mvl/mxv - .byte W01 - .byte 24*se_m_barrier_mvl/mxv - .byte W01 - .byte 95*se_m_barrier_mvl/mxv - .byte N06 , An5 , v044 - .byte W02 - .byte VOL , 88*se_m_barrier_mvl/mxv - .byte W02 - .byte 56*se_m_barrier_mvl/mxv - .byte W01 - .byte 24*se_m_barrier_mvl/mxv - .byte W01 - .byte 95*se_m_barrier_mvl/mxv - .byte N06 , An5 , v040 - .byte W02 - .byte VOL , 88*se_m_barrier_mvl/mxv - .byte W02 - .byte 56*se_m_barrier_mvl/mxv - .byte W01 - .byte 24*se_m_barrier_mvl/mxv - .byte W01 - .byte 95*se_m_barrier_mvl/mxv - .byte N06 , An5 , v036 - .byte W02 - .byte VOL , 88*se_m_barrier_mvl/mxv - .byte W02 - .byte 56*se_m_barrier_mvl/mxv - .byte W01 - .byte 24*se_m_barrier_mvl/mxv - .byte W05 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_barrier: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_barrier_pri @ Priority - .byte se_m_barrier_rev @ Reverb. - - .word se_m_barrier_grp - - .word se_m_barrier_1 - .word se_m_barrier_2 - - .end diff --git a/sound/songs/se_m_baton_pass.s b/sound/songs/se_m_baton_pass.s deleted file mode 100644 index 30027e5b6..000000000 --- a/sound/songs/se_m_baton_pass.s +++ /dev/null @@ -1,169 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_baton_pass_grp, voicegroup128 - .equ se_m_baton_pass_pri, 4 - .equ se_m_baton_pass_rev, reverb_set+50 - .equ se_m_baton_pass_mvl, 127 - .equ se_m_baton_pass_key, 0 - .equ se_m_baton_pass_tbs, 1 - .equ se_m_baton_pass_exg, 0 - .equ se_m_baton_pass_cmp, 1 - - .section .rodata - .global se_m_baton_pass - .align 2 - -@********************** Track 1 **********************@ - -se_m_baton_pass_1: - .byte KEYSH , se_m_baton_pass_key+0 - .byte VOICE , 19 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 12*se_m_baton_pass_mvl/mxv - .byte BEND , c_v+49 - .byte N06 , Gn4 , v080 - .byte W01 - .byte VOL , 44*se_m_baton_pass_mvl/mxv - .byte BEND , c_v+22 - .byte W01 - .byte VOL , 62*se_m_baton_pass_mvl/mxv - .byte PAN , c_v+8 - .byte VOL , 75*se_m_baton_pass_mvl/mxv - .byte BEND , c_v+20 - .byte W01 - .byte VOL , 87*se_m_baton_pass_mvl/mxv - .byte BEND , c_v+33 - .byte W01 - .byte VOL , 96*se_m_baton_pass_mvl/mxv - .byte PAN , c_v-7 - .byte VOL , 100*se_m_baton_pass_mvl/mxv - .byte BEND , c_v+54 - .byte W01 - .byte c_v+63 - .byte W01 - .byte W02 - .byte PAN , c_v+0 - .byte N04 , Gn4 , v040 - .byte W01 - .byte W03 - .byte W03 - .byte VOICE , 45 - .byte MOD , 30 - .byte BENDR , 24 - .byte VOL , 54*se_m_baton_pass_mvl/mxv - .byte BEND , c_v+0 - .byte N06 , Gn3 , v108 - .byte W01 - .byte VOL , 70*se_m_baton_pass_mvl/mxv - .byte BEND , c_v+4 - .byte W01 - .byte PAN , c_v+5 - .byte VOL , 80*se_m_baton_pass_mvl/mxv - .byte BEND , c_v+9 - .byte W01 - .byte VOL , 100*se_m_baton_pass_mvl/mxv - .byte BEND , c_v+16 - .byte W01 - .byte c_v+24 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v+2 - .byte N06 , An3 , v100 - .byte W01 - .byte BEND , c_v+7 - .byte W01 - .byte PAN , c_v-4 - .byte BEND , c_v+12 - .byte W01 - .byte c_v+18 - .byte W01 - .byte c_v+27 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v+4 - .byte N06 , Bn3 , v060 - .byte W01 - .byte BEND , c_v+9 - .byte W01 - .byte PAN , c_v+6 - .byte BEND , c_v+14 - .byte W01 - .byte c_v+20 - .byte W01 - .byte c_v+29 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v+6 - .byte N06 , Cn4 , v040 - .byte W01 - .byte BEND , c_v+11 - .byte W01 - .byte PAN , c_v-6 - .byte BEND , c_v+15 - .byte W01 - .byte c_v+22 - .byte W01 - .byte c_v+31 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v+9 - .byte N06 , Dn4 , v020 - .byte W01 - .byte BEND , c_v+14 - .byte W01 - .byte PAN , c_v+8 - .byte BEND , c_v+18 - .byte W01 - .byte c_v+25 - .byte W01 - .byte c_v+34 - .byte W02 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_baton_pass_2: - .byte KEYSH , se_m_baton_pass_key+0 - .byte VOICE , 57 - .byte VOL , 59*se_m_baton_pass_mvl/mxv - .byte N06 , Gs4 , v052 - .byte W01 - .byte VOL , 72*se_m_baton_pass_mvl/mxv - .byte W01 - .byte 90*se_m_baton_pass_mvl/mxv - .byte W01 - .byte 100*se_m_baton_pass_mvl/mxv - .byte W03 - .byte W02 - .byte N04 , Gs4 , v024 - .byte W01 - .byte W03 - .byte W03 - .byte W03 - .byte W03 - .byte W03 - .byte W03 - .byte W03 - .byte W03 - .byte W03 - .byte W03 - .byte W03 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_baton_pass: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_baton_pass_pri @ Priority - .byte se_m_baton_pass_rev @ Reverb. - - .word se_m_baton_pass_grp - - .word se_m_baton_pass_1 - .word se_m_baton_pass_2 - - .end diff --git a/sound/songs/se_m_belly_drum.s b/sound/songs/se_m_belly_drum.s deleted file mode 100644 index 919c02b16..000000000 --- a/sound/songs/se_m_belly_drum.s +++ /dev/null @@ -1,72 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_belly_drum_grp, voicegroup128 - .equ se_m_belly_drum_pri, 4 - .equ se_m_belly_drum_rev, reverb_set+50 - .equ se_m_belly_drum_mvl, 127 - .equ se_m_belly_drum_key, 0 - .equ se_m_belly_drum_tbs, 1 - .equ se_m_belly_drum_exg, 0 - .equ se_m_belly_drum_cmp, 1 - - .section .rodata - .global se_m_belly_drum - .align 2 - -@********************** Track 1 **********************@ - -se_m_belly_drum_1: - .byte KEYSH , se_m_belly_drum_key+0 - .byte TEMPO , 150*se_m_belly_drum_tbs/2 - .byte VOICE , 6 - .byte BENDR , 12 - .byte VOL , 115*se_m_belly_drum_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N19 , An2 , v127 - .byte W01 - .byte BEND , c_v-6 - .byte W01 - .byte c_v-10 - .byte W01 - .byte c_v-14 - .byte W01 - .byte c_v-12 - .byte W02 - .byte c_v-14 - .byte W01 - .byte c_v-18 - .byte W01 - .byte VOL , 108*se_m_belly_drum_mvl/mxv - .byte BEND , c_v-20 - .byte W01 - .byte c_v-22 - .byte W01 - .byte VOL , 94*se_m_belly_drum_mvl/mxv - .byte W03 - .byte 78*se_m_belly_drum_mvl/mxv - .byte W01 - .byte 62*se_m_belly_drum_mvl/mxv - .byte W01 - .byte 40*se_m_belly_drum_mvl/mxv - .byte W01 - .byte 27*se_m_belly_drum_mvl/mxv - .byte W02 - .byte 12*se_m_belly_drum_mvl/mxv - .byte W06 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_belly_drum: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_belly_drum_pri @ Priority - .byte se_m_belly_drum_rev @ Reverb. - - .word se_m_belly_drum_grp - - .word se_m_belly_drum_1 - - .end diff --git a/sound/songs/se_m_bite.s b/sound/songs/se_m_bite.s deleted file mode 100644 index 3c51a8f2f..000000000 --- a/sound/songs/se_m_bite.s +++ /dev/null @@ -1,100 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_bite_grp, voicegroup128 - .equ se_m_bite_pri, 4 - .equ se_m_bite_rev, reverb_set+50 - .equ se_m_bite_mvl, 127 - .equ se_m_bite_key, 0 - .equ se_m_bite_tbs, 1 - .equ se_m_bite_exg, 0 - .equ se_m_bite_cmp, 1 - - .section .rodata - .global se_m_bite - .align 2 - -@********************** Track 1 **********************@ - -se_m_bite_1: - .byte KEYSH , se_m_bite_key+0 - .byte TEMPO , 220*se_m_bite_tbs/2 - .byte VOICE , 26 - .byte BENDR , 12 - .byte PAN , c_v+6 - .byte VOL , 110*se_m_bite_mvl/mxv - .byte BEND , c_v+0 - .byte N02 , Gn3 , v112 - .byte W02 - .byte Gs3 - .byte W01 - .byte PAN , c_v-7 - .byte W01 - .byte N02 , An3 - .byte W02 - .byte PAN , c_v+7 - .byte W02 - .byte c_v-8 - .byte W02 - .byte VOICE , 21 - .byte PAN , c_v+0 - .byte N01 , Cn5 , v116 - .byte W02 - .byte PAN , c_v+10 - .byte N01 , Cn4 , v108 - .byte W01 - .byte PAN , c_v-8 - .byte N01 , Gn4 , v104 - .byte W01 - .byte PAN , c_v+0 - .byte N01 , Gn3 , v096 - .byte W01 - .byte PAN , c_v+10 - .byte N01 , Cn4 , v088 - .byte W01 - .byte PAN , c_v-8 - .byte N01 , Cn3 , v080 - .byte W02 - .byte PAN , c_v+0 - .byte N01 , Gn3 , v072 - .byte W01 - .byte PAN , c_v+10 - .byte N01 , Gn2 , v064 - .byte W01 - .byte PAN , c_v-8 - .byte N01 , Cn3 , v056 - .byte W01 - .byte PAN , c_v+0 - .byte N01 , Gn2 , v048 - .byte W03 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_bite_2: - .byte KEYSH , se_m_bite_key+0 - .byte VOICE , 27 - .byte VOL , 110*se_m_bite_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte W10 - .byte N01 , Gn2 , v040 - .byte W08 - .byte N01 - .byte W06 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_bite: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_bite_pri @ Priority - .byte se_m_bite_rev @ Reverb. - - .word se_m_bite_grp - - .word se_m_bite_1 - .word se_m_bite_2 - - .end diff --git a/sound/songs/se_m_blizzard.s b/sound/songs/se_m_blizzard.s deleted file mode 100644 index 6bce3c987..000000000 --- a/sound/songs/se_m_blizzard.s +++ /dev/null @@ -1,103 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_blizzard_grp, voicegroup128 - .equ se_m_blizzard_pri, 4 - .equ se_m_blizzard_rev, reverb_set+50 - .equ se_m_blizzard_mvl, 127 - .equ se_m_blizzard_key, 0 - .equ se_m_blizzard_tbs, 1 - .equ se_m_blizzard_exg, 0 - .equ se_m_blizzard_cmp, 1 - - .section .rodata - .global se_m_blizzard - .align 2 - -@********************** Track 1 **********************@ - -se_m_blizzard_1: - .byte KEYSH , se_m_blizzard_key+0 - .byte TEMPO , 150*se_m_blizzard_tbs/2 - .byte VOICE , 22 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 64*se_m_blizzard_mvl/mxv - .byte BEND , c_v+0 - .byte N24 , Gn3 , v108 - .byte W03 - .byte VOL , 79*se_m_blizzard_mvl/mxv - .byte BEND , c_v+22 - .byte W02 - .byte c_v+8 - .byte W01 - .byte VOL , 84*se_m_blizzard_mvl/mxv - .byte PAN , c_v-4 - .byte W03 - .byte VOL , 91*se_m_blizzard_mvl/mxv - .byte BEND , c_v+0 - .byte W03 - .byte VOL , 100*se_m_blizzard_mvl/mxv - .byte PAN , c_v-8 - .byte W03 - .byte VOL , 110*se_m_blizzard_mvl/mxv - .byte W03 - .byte PAN , c_v-12 - .byte W06 -se_m_blizzard_1_B1: - .byte PAN , c_v-17 - .byte BEND , c_v+0 - .byte N48 , Gn3 , v108 - .byte W03 - .byte BEND , c_v-7 - .byte W03 - .byte PAN , c_v-9 - .byte BEND , c_v-12 - .byte W03 - .byte c_v-20 - .byte W03 - .byte PAN , c_v-3 - .byte W03 - .byte c_v+6 - .byte BEND , c_v-13 - .byte W03 - .byte PAN , c_v+10 - .byte W03 - .byte BEND , c_v-6 - .byte W03 - .byte PAN , c_v+16 - .byte W03 - .byte BEND , c_v+6 - .byte W03 - .byte PAN , c_v+13 - .byte BEND , c_v+11 - .byte W03 - .byte c_v+20 - .byte W03 - .byte PAN , c_v+8 - .byte W03 - .byte c_v+0 - .byte BEND , c_v+12 - .byte W03 - .byte PAN , c_v-8 - .byte BEND , c_v+7 - .byte W03 - .byte PAN , c_v-11 - .byte W03 - .byte GOTO - .word se_m_blizzard_1_B1 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_blizzard: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_blizzard_pri @ Priority - .byte se_m_blizzard_rev @ Reverb. - - .word se_m_blizzard_grp - - .word se_m_blizzard_1 - - .end diff --git a/sound/songs/se_m_blizzard2.s b/sound/songs/se_m_blizzard2.s deleted file mode 100644 index 8c1518e63..000000000 --- a/sound/songs/se_m_blizzard2.s +++ /dev/null @@ -1,72 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_blizzard2_grp, voicegroup128 - .equ se_m_blizzard2_pri, 4 - .equ se_m_blizzard2_rev, reverb_set+50 - .equ se_m_blizzard2_mvl, 127 - .equ se_m_blizzard2_key, 0 - .equ se_m_blizzard2_tbs, 1 - .equ se_m_blizzard2_exg, 0 - .equ se_m_blizzard2_cmp, 1 - - .section .rodata - .global se_m_blizzard2 - .align 2 - -@********************** Track 1 **********************@ - -se_m_blizzard2_1: - .byte KEYSH , se_m_blizzard2_key+0 - .byte TEMPO , 150*se_m_blizzard2_tbs/2 - .byte VOICE , 22 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 110*se_m_blizzard2_mvl/mxv - .byte BEND , c_v+0 - .byte N24 , Gn3 , v108 - .byte W02 - .byte PAN , c_v-19 - .byte W04 - .byte c_v+0 - .byte W01 - .byte VOL , 97*se_m_blizzard2_mvl/mxv - .byte W01 - .byte PAN , c_v+16 - .byte W01 - .byte VOL , 84*se_m_blizzard2_mvl/mxv - .byte W03 - .byte 76*se_m_blizzard2_mvl/mxv - .byte PAN , c_v+2 - .byte W02 - .byte VOL , 55*se_m_blizzard2_mvl/mxv - .byte PAN , c_v-8 - .byte W02 - .byte VOL , 39*se_m_blizzard2_mvl/mxv - .byte W02 - .byte PAN , c_v+0 - .byte W01 - .byte VOL , 25*se_m_blizzard2_mvl/mxv - .byte W01 - .byte PAN , c_v+8 - .byte W01 - .byte VOL , 13*se_m_blizzard2_mvl/mxv - .byte W03 - .byte 7*se_m_blizzard2_mvl/mxv - .byte PAN , c_v+0 - .byte W24 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_blizzard2: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_blizzard2_pri @ Priority - .byte se_m_blizzard2_rev @ Reverb. - - .word se_m_blizzard2_grp - - .word se_m_blizzard2_1 - - .end diff --git a/sound/songs/se_m_bonemerang.s b/sound/songs/se_m_bonemerang.s deleted file mode 100644 index 11f035347..000000000 --- a/sound/songs/se_m_bonemerang.s +++ /dev/null @@ -1,57 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_bonemerang_grp, voicegroup128 - .equ se_m_bonemerang_pri, 4 - .equ se_m_bonemerang_rev, reverb_set+50 - .equ se_m_bonemerang_mvl, 127 - .equ se_m_bonemerang_key, 0 - .equ se_m_bonemerang_tbs, 1 - .equ se_m_bonemerang_exg, 0 - .equ se_m_bonemerang_cmp, 1 - - .section .rodata - .global se_m_bonemerang - .align 2 - -@********************** Track 1 **********************@ - -se_m_bonemerang_1: - .byte KEYSH , se_m_bonemerang_key+0 - .byte TEMPO , 150*se_m_bonemerang_tbs/2 - .byte VOICE , 24 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 110*se_m_bonemerang_mvl/mxv - .byte BEND , c_v+0 - .byte N01 , Cn5 , v127 - .byte W01 - .byte PAN , c_v+10 - .byte N01 , Cn6 - .byte W01 - .byte PAN , c_v+0 - .byte N01 , Cn5 - .byte W04 - .byte N01 - .byte W01 - .byte PAN , c_v-11 - .byte N01 , Cn6 - .byte W01 - .byte PAN , c_v+0 - .byte N01 , Cn5 - .byte W04 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_bonemerang: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_bonemerang_pri @ Priority - .byte se_m_bonemerang_rev @ Reverb. - - .word se_m_bonemerang_grp - - .word se_m_bonemerang_1 - - .end diff --git a/sound/songs/se_m_brick_break.s b/sound/songs/se_m_brick_break.s deleted file mode 100644 index 08058089f..000000000 --- a/sound/songs/se_m_brick_break.s +++ /dev/null @@ -1,100 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_brick_break_grp, voicegroup128 - .equ se_m_brick_break_pri, 4 - .equ se_m_brick_break_rev, reverb_set+50 - .equ se_m_brick_break_mvl, 127 - .equ se_m_brick_break_key, 0 - .equ se_m_brick_break_tbs, 1 - .equ se_m_brick_break_exg, 0 - .equ se_m_brick_break_cmp, 1 - - .section .rodata - .global se_m_brick_break - .align 2 - -@********************** Track 1 **********************@ - -se_m_brick_break_1: - .byte KEYSH , se_m_brick_break_key+0 - .byte TEMPO , 150*se_m_brick_break_tbs/2 - .byte VOICE , 41 - .byte VOL , 110*se_m_brick_break_mvl/mxv - .byte PAN , c_v+0 - .byte N01 , Cn4 , v127 - .byte W01 - .byte N03 , Cn5 - .byte W01 - .byte PAN , c_v+5 - .byte W01 - .byte c_v-6 - .byte W01 - .byte VOICE , 3 - .byte PAN , c_v+0 - .byte N01 , Gs4 , v112 - .byte W02 - .byte W03 - .byte PAN , c_v+7 - .byte N01 , Dn5 , v096 - .byte W03 - .byte W02 - .byte PAN , c_v+0 - .byte N01 , Gs4 , v084 - .byte W04 - .byte W01 - .byte PAN , c_v-8 - .byte N01 , Dn5 , v068 - .byte W05 - .byte PAN , c_v+7 - .byte N01 , Gs4 , v052 - .byte W04 - .byte PAN , c_v-8 - .byte N01 , Dn5 , v032 - .byte W02 - .byte W06 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_brick_break_2: - .byte KEYSH , se_m_brick_break_key+0 - .byte VOICE , 4 - .byte VOL , 110*se_m_brick_break_mvl/mxv - .byte PAN , c_v+0 - .byte N01 , Cn3 , v064 - .byte W01 - .byte N03 , Gn3 - .byte W05 - .byte W01 - .byte N02 , En4 , v040 - .byte W05 - .byte Gn3 - .byte W04 - .byte En4 , v032 - .byte W02 - .byte W03 - .byte Gn3 - .byte W03 - .byte W02 - .byte En4 , v020 - .byte W04 - .byte W01 - .byte Gn3 - .byte W05 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_brick_break: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_brick_break_pri @ Priority - .byte se_m_brick_break_rev @ Reverb. - - .word se_m_brick_break_grp - - .word se_m_brick_break_1 - .word se_m_brick_break_2 - - .end diff --git a/sound/songs/se_m_bubble.s b/sound/songs/se_m_bubble.s deleted file mode 100644 index ee31a176b..000000000 --- a/sound/songs/se_m_bubble.s +++ /dev/null @@ -1,57 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_bubble_grp, voicegroup128 - .equ se_m_bubble_pri, 4 - .equ se_m_bubble_rev, reverb_set+50 - .equ se_m_bubble_mvl, 127 - .equ se_m_bubble_key, 0 - .equ se_m_bubble_tbs, 1 - .equ se_m_bubble_exg, 0 - .equ se_m_bubble_cmp, 1 - - .section .rodata - .global se_m_bubble - .align 2 - -@********************** Track 1 **********************@ - -se_m_bubble_1: - .byte KEYSH , se_m_bubble_key+0 - .byte TEMPO , 220*se_m_bubble_tbs/2 - .byte VOICE , 23 - .byte VOL , 95*se_m_bubble_mvl/mxv - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N09 , Cn3 , v127 - .byte W03 - .byte PAN , c_v-16 - .byte BEND , c_v+6 - .byte W01 - .byte c_v+16 - .byte W02 - .byte PAN , c_v+16 - .byte BEND , c_v+37 - .byte W01 - .byte c_v+48 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v-1 - .byte N03 , En3 - .byte W15 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_bubble: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_bubble_pri @ Priority - .byte se_m_bubble_rev @ Reverb. - - .word se_m_bubble_grp - - .word se_m_bubble_1 - - .end diff --git a/sound/songs/se_m_bubble2.s b/sound/songs/se_m_bubble2.s deleted file mode 100644 index 97e7cbbf8..000000000 --- a/sound/songs/se_m_bubble2.s +++ /dev/null @@ -1,60 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_bubble2_grp, voicegroup128 - .equ se_m_bubble2_pri, 4 - .equ se_m_bubble2_rev, reverb_set+50 - .equ se_m_bubble2_mvl, 127 - .equ se_m_bubble2_key, 0 - .equ se_m_bubble2_tbs, 1 - .equ se_m_bubble2_exg, 0 - .equ se_m_bubble2_cmp, 1 - - .section .rodata - .global se_m_bubble2 - .align 2 - -@********************** Track 1 **********************@ - -se_m_bubble2_1: - .byte KEYSH , se_m_bubble2_key+0 - .byte TEMPO , 220*se_m_bubble2_tbs/2 - .byte VOICE , 24 - .byte VOL , 110*se_m_bubble2_mvl/mxv - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte W03 - .byte N09 , Gn4 , v127 - .byte W02 - .byte BEND , c_v+31 - .byte W02 - .byte c_v-34 - .byte W17 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_bubble2_2: - .byte KEYSH , se_m_bubble2_key+0 - .byte VOICE , 4 - .byte VOL , 110*se_m_bubble2_mvl/mxv - .byte PAN , c_v+0 - .byte N01 , Cn4 , v044 - .byte W24 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_bubble2: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_bubble2_pri @ Priority - .byte se_m_bubble2_rev @ Reverb. - - .word se_m_bubble2_grp - - .word se_m_bubble2_1 - .word se_m_bubble2_2 - - .end diff --git a/sound/songs/se_m_bubble3.s b/sound/songs/se_m_bubble3.s deleted file mode 100644 index c14badb5a..000000000 --- a/sound/songs/se_m_bubble3.s +++ /dev/null @@ -1,62 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_bubble3_grp, voicegroup128 - .equ se_m_bubble3_pri, 4 - .equ se_m_bubble3_rev, reverb_set+50 - .equ se_m_bubble3_mvl, 127 - .equ se_m_bubble3_key, 0 - .equ se_m_bubble3_tbs, 1 - .equ se_m_bubble3_exg, 0 - .equ se_m_bubble3_cmp, 1 - - .section .rodata - .global se_m_bubble3 - .align 2 - -@********************** Track 1 **********************@ - -se_m_bubble3_1: - .byte KEYSH , se_m_bubble3_key+0 - .byte TEMPO , 220*se_m_bubble3_tbs/2 - .byte VOICE , 23 - .byte VOL , 95*se_m_bubble3_mvl/mxv - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N12 , Gn2 , v127 - .byte W06 - .byte PAN , c_v-17 - .byte BEND , c_v+6 - .byte W01 - .byte c_v+16 - .byte W02 - .byte PAN , c_v+16 - .byte BEND , c_v+25 - .byte W01 - .byte c_v+31 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v-1 - .byte W03 - .byte N06 - .byte W03 - .byte BEND , c_v+6 - .byte W01 - .byte c_v+13 - .byte W05 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_bubble3: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_bubble3_pri @ Priority - .byte se_m_bubble3_rev @ Reverb. - - .word se_m_bubble3_grp - - .word se_m_bubble3_1 - - .end diff --git a/sound/songs/se_m_bubble_beam.s b/sound/songs/se_m_bubble_beam.s deleted file mode 100644 index 621882b03..000000000 --- a/sound/songs/se_m_bubble_beam.s +++ /dev/null @@ -1,173 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_bubble_beam_grp, voicegroup128 - .equ se_m_bubble_beam_pri, 4 - .equ se_m_bubble_beam_rev, reverb_set+50 - .equ se_m_bubble_beam_mvl, 127 - .equ se_m_bubble_beam_key, 0 - .equ se_m_bubble_beam_tbs, 1 - .equ se_m_bubble_beam_exg, 0 - .equ se_m_bubble_beam_cmp, 1 - - .section .rodata - .global se_m_bubble_beam - .align 2 - -@********************** Track 1 **********************@ - -se_m_bubble_beam_1: - .byte KEYSH , se_m_bubble_beam_key+0 - .byte TEMPO , 150*se_m_bubble_beam_tbs/2 - .byte VOICE , 9 - .byte BENDR , 2 - .byte PAN , c_v+0 - .byte VOL , 24*se_m_bubble_beam_mvl/mxv - .byte BEND , c_v-17 - .byte N78 , Bn4 , v080 - .byte W01 - .byte VOL , 32*se_m_bubble_beam_mvl/mxv - .byte PAN , c_v+6 - .byte W01 - .byte VOL , 38*se_m_bubble_beam_mvl/mxv - .byte PAN , c_v-7 - .byte W01 - .byte VOL , 48*se_m_bubble_beam_mvl/mxv - .byte PAN , c_v+9 - .byte W01 - .byte VOL , 66*se_m_bubble_beam_mvl/mxv - .byte PAN , c_v-13 - .byte W02 - .byte VOL , 78*se_m_bubble_beam_mvl/mxv - .byte PAN , c_v+6 - .byte W01 - .byte VOL , 94*se_m_bubble_beam_mvl/mxv - .byte PAN , c_v-6 - .byte W01 - .byte VOL , 110*se_m_bubble_beam_mvl/mxv - .byte PAN , c_v+0 - .byte W01 - .byte c_v+6 - .byte W01 - .byte c_v-7 - .byte W02 -se_m_bubble_beam_1_000: - .byte PAN , c_v+9 - .byte W01 - .byte c_v-13 - .byte W01 - .byte c_v+6 - .byte W01 - .byte c_v-6 - .byte W01 - .byte c_v+0 - .byte W02 - .byte PEND -se_m_bubble_beam_1_001: - .byte PAN , c_v+6 - .byte W01 - .byte c_v-7 - .byte W01 - .byte c_v+9 - .byte W01 - .byte c_v-13 - .byte W01 - .byte c_v+6 - .byte W02 - .byte PEND - .byte c_v-6 - .byte W01 - .byte c_v+0 - .byte W01 - .byte c_v+6 - .byte W01 - .byte c_v-7 - .byte W01 - .byte c_v+9 - .byte W02 - .byte c_v-13 - .byte W01 - .byte c_v+6 - .byte W01 - .byte c_v-6 - .byte W01 - .byte c_v+0 - .byte W01 - .byte c_v+6 - .byte W02 - .byte c_v-7 - .byte W01 - .byte c_v+9 - .byte W01 - .byte c_v-13 - .byte W01 - .byte c_v+6 - .byte W01 - .byte c_v-6 - .byte W02 - .byte c_v+0 - .byte W01 - .byte c_v+6 - .byte W01 - .byte c_v-7 - .byte W01 - .byte c_v+9 - .byte W01 - .byte c_v-13 - .byte W02 - .byte c_v+6 - .byte W01 - .byte c_v-6 - .byte W01 - .byte c_v+0 - .byte W01 - .byte c_v+6 - .byte W01 - .byte c_v-7 - .byte W02 - .byte PATT - .word se_m_bubble_beam_1_000 - .byte PATT - .word se_m_bubble_beam_1_001 - .byte PAN , c_v-6 - .byte W01 - .byte c_v+0 - .byte W01 - .byte c_v+6 - .byte W01 - .byte VOL , 103*se_m_bubble_beam_mvl/mxv - .byte PAN , c_v-7 - .byte W01 - .byte VOL , 91*se_m_bubble_beam_mvl/mxv - .byte PAN , c_v+9 - .byte W02 - .byte VOL , 72*se_m_bubble_beam_mvl/mxv - .byte PAN , c_v-13 - .byte W01 - .byte VOL , 58*se_m_bubble_beam_mvl/mxv - .byte PAN , c_v+6 - .byte W01 - .byte VOL , 38*se_m_bubble_beam_mvl/mxv - .byte PAN , c_v-6 - .byte W01 - .byte VOL , 15*se_m_bubble_beam_mvl/mxv - .byte PAN , c_v+0 - .byte W01 - .byte VOL , 7*se_m_bubble_beam_mvl/mxv - .byte PAN , c_v+6 - .byte W02 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_bubble_beam: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_bubble_beam_pri @ Priority - .byte se_m_bubble_beam_rev @ Reverb. - - .word se_m_bubble_beam_grp - - .word se_m_bubble_beam_1 - - .end diff --git a/sound/songs/se_m_bubble_beam2.s b/sound/songs/se_m_bubble_beam2.s deleted file mode 100644 index 0e8cbf5e4..000000000 --- a/sound/songs/se_m_bubble_beam2.s +++ /dev/null @@ -1,131 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_bubble_beam2_grp, voicegroup128 - .equ se_m_bubble_beam2_pri, 4 - .equ se_m_bubble_beam2_rev, reverb_set+50 - .equ se_m_bubble_beam2_mvl, 127 - .equ se_m_bubble_beam2_key, 0 - .equ se_m_bubble_beam2_tbs, 1 - .equ se_m_bubble_beam2_exg, 0 - .equ se_m_bubble_beam2_cmp, 1 - - .section .rodata - .global se_m_bubble_beam2 - .align 2 - -@********************** Track 1 **********************@ - -se_m_bubble_beam2_1: - .byte KEYSH , se_m_bubble_beam2_key+0 - .byte TEMPO , 150*se_m_bubble_beam2_tbs/2 - .byte VOICE , 9 - .byte BENDR , 2 - .byte PAN , c_v+0 - .byte VOL , 26*se_m_bubble_beam2_mvl/mxv - .byte BEND , c_v-23 - .byte N09 , Dn5 , v127 - .byte W01 - .byte VOL , 34*se_m_bubble_beam2_mvl/mxv - .byte PAN , c_v+6 - .byte BEND , c_v-20 - .byte W01 - .byte VOL , 42*se_m_bubble_beam2_mvl/mxv - .byte PAN , c_v-7 - .byte BEND , c_v-16 - .byte W01 - .byte VOL , 52*se_m_bubble_beam2_mvl/mxv - .byte PAN , c_v+9 - .byte W01 - .byte VOL , 72*se_m_bubble_beam2_mvl/mxv - .byte PAN , c_v-13 - .byte BEND , c_v-18 - .byte W02 - .byte VOL , 85*se_m_bubble_beam2_mvl/mxv - .byte PAN , c_v+6 - .byte BEND , c_v-21 - .byte W01 - .byte VOL , 102*se_m_bubble_beam2_mvl/mxv - .byte PAN , c_v-6 - .byte BEND , c_v-23 - .byte W01 - .byte VOL , 120*se_m_bubble_beam2_mvl/mxv - .byte BEND , c_v-24 - .byte W02 - .byte VOL , 26*se_m_bubble_beam2_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v-23 - .byte N09 , Dn5 , v100 - .byte W02 - .byte VOL , 34*se_m_bubble_beam2_mvl/mxv - .byte PAN , c_v+6 - .byte BEND , c_v-20 - .byte W01 - .byte VOL , 42*se_m_bubble_beam2_mvl/mxv - .byte PAN , c_v-7 - .byte BEND , c_v-16 - .byte W01 - .byte VOL , 52*se_m_bubble_beam2_mvl/mxv - .byte PAN , c_v+9 - .byte W01 - .byte VOL , 72*se_m_bubble_beam2_mvl/mxv - .byte PAN , c_v-13 - .byte BEND , c_v-18 - .byte W01 - .byte VOL , 85*se_m_bubble_beam2_mvl/mxv - .byte PAN , c_v+6 - .byte BEND , c_v-21 - .byte W02 - .byte VOL , 102*se_m_bubble_beam2_mvl/mxv - .byte PAN , c_v-6 - .byte BEND , c_v-23 - .byte W01 - .byte VOL , 120*se_m_bubble_beam2_mvl/mxv - .byte BEND , c_v-24 - .byte W02 - .byte VOL , 26*se_m_bubble_beam2_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v-23 - .byte N09 , Dn5 , v080 - .byte W01 - .byte VOL , 34*se_m_bubble_beam2_mvl/mxv - .byte PAN , c_v+6 - .byte BEND , c_v-20 - .byte W02 - .byte VOL , 42*se_m_bubble_beam2_mvl/mxv - .byte PAN , c_v-7 - .byte BEND , c_v-16 - .byte W01 - .byte VOL , 52*se_m_bubble_beam2_mvl/mxv - .byte PAN , c_v+9 - .byte W01 - .byte VOL , 72*se_m_bubble_beam2_mvl/mxv - .byte PAN , c_v-13 - .byte BEND , c_v-18 - .byte W01 - .byte VOL , 85*se_m_bubble_beam2_mvl/mxv - .byte PAN , c_v+6 - .byte BEND , c_v-21 - .byte W01 - .byte VOL , 102*se_m_bubble_beam2_mvl/mxv - .byte PAN , c_v-6 - .byte BEND , c_v-23 - .byte W02 - .byte VOL , 120*se_m_bubble_beam2_mvl/mxv - .byte BEND , c_v-24 - .byte W06 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_bubble_beam2: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_bubble_beam2_pri @ Priority - .byte se_m_bubble_beam2_rev @ Reverb. - - .word se_m_bubble_beam2_grp - - .word se_m_bubble_beam2_1 - - .end diff --git a/sound/songs/se_m_charge.s b/sound/songs/se_m_charge.s deleted file mode 100644 index 47d70a4bf..000000000 --- a/sound/songs/se_m_charge.s +++ /dev/null @@ -1,186 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_charge_grp, voicegroup128 - .equ se_m_charge_pri, 4 - .equ se_m_charge_rev, reverb_set+50 - .equ se_m_charge_mvl, 127 - .equ se_m_charge_key, 0 - .equ se_m_charge_tbs, 1 - .equ se_m_charge_exg, 0 - .equ se_m_charge_cmp, 1 - - .section .rodata - .global se_m_charge - .align 2 - -@********************** Track 1 **********************@ - -se_m_charge_1: - .byte KEYSH , se_m_charge_key+0 - .byte TEMPO , 150*se_m_charge_tbs/2 - .byte VOICE , 18 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 34*se_m_charge_mvl/mxv - .byte BEND , c_v+0 - .byte N66 , Cn5 , v127 - .byte W01 - .byte PAN , c_v-2 - .byte W01 - .byte VOL , 43*se_m_charge_mvl/mxv - .byte PAN , c_v+0 - .byte W01 - .byte c_v+2 - .byte BEND , c_v-2 - .byte W01 - .byte VOL , 58*se_m_charge_mvl/mxv - .byte PAN , c_v+0 - .byte W02 - .byte c_v-2 - .byte W01 - .byte VOL , 70*se_m_charge_mvl/mxv - .byte PAN , c_v-4 - .byte BEND , c_v-4 - .byte W01 - .byte PAN , c_v-2 - .byte W01 - .byte VOL , 76*se_m_charge_mvl/mxv - .byte PAN , c_v+0 - .byte W01 - .byte c_v+2 - .byte BEND , c_v-6 - .byte W02 - .byte VOL , 90*se_m_charge_mvl/mxv - .byte PAN , c_v+4 - .byte W01 - .byte c_v+2 - .byte W01 - .byte c_v+0 - .byte BEND , c_v-8 - .byte W01 - .byte PAN , c_v+0 - .byte W01 - .byte c_v-2 - .byte W02 - .byte c_v+0 - .byte BEND , c_v-13 - .byte W01 - .byte PAN , c_v+2 - .byte W01 - .byte c_v+0 - .byte W01 - .byte c_v-2 - .byte BEND , c_v-15 - .byte W01 - .byte PAN , c_v-4 - .byte W02 - .byte c_v-2 - .byte W01 - .byte c_v+0 - .byte BEND , c_v-19 - .byte W01 - .byte PAN , c_v+2 - .byte W01 - .byte c_v+4 - .byte BEND , c_v-22 - .byte W01 - .byte PAN , c_v+2 - .byte W02 - .byte c_v+0 - .byte BEND , c_v-19 - .byte W01 - .byte PAN , c_v+0 - .byte W01 - .byte c_v-2 - .byte BEND , c_v-17 - .byte W01 - .byte PAN , c_v+0 - .byte W01 - .byte c_v+2 - .byte W02 - .byte c_v+0 - .byte BEND , c_v-19 - .byte W01 - .byte PAN , c_v-2 - .byte W01 - .byte c_v-4 - .byte W01 - .byte c_v-2 - .byte BEND , c_v-22 - .byte W01 - .byte PAN , c_v+0 - .byte W02 - .byte c_v+2 - .byte BEND , c_v-28 - .byte W01 - .byte PAN , c_v+4 - .byte BEND , c_v-24 - .byte W01 - .byte PAN , c_v+2 - .byte W01 - .byte VOL , 84*se_m_charge_mvl/mxv - .byte PAN , c_v+0 - .byte W01 - .byte c_v+0 - .byte W02 - .byte c_v-2 - .byte W01 - .byte VOL , 78*se_m_charge_mvl/mxv - .byte PAN , c_v+0 - .byte W01 - .byte c_v+2 - .byte BEND , c_v-27 - .byte W01 - .byte PAN , c_v+0 - .byte W01 - .byte VOL , 70*se_m_charge_mvl/mxv - .byte PAN , c_v-2 - .byte W02 - .byte c_v-4 - .byte W01 - .byte VOL , 55*se_m_charge_mvl/mxv - .byte PAN , c_v-2 - .byte BEND , c_v-29 - .byte W01 - .byte PAN , c_v+0 - .byte W01 - .byte VOL , 46*se_m_charge_mvl/mxv - .byte PAN , c_v+2 - .byte W01 - .byte c_v+4 - .byte BEND , c_v-31 - .byte W02 - .byte VOL , 36*se_m_charge_mvl/mxv - .byte PAN , c_v+2 - .byte W01 - .byte c_v+0 - .byte W01 - .byte VOL , 24*se_m_charge_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v-36 - .byte W01 - .byte PAN , c_v-2 - .byte W01 - .byte VOL , 13*se_m_charge_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v-42 - .byte W02 - .byte VOL , 5*se_m_charge_mvl/mxv - .byte PAN , c_v+2 - .byte W06 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_charge: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_charge_pri @ Priority - .byte se_m_charge_rev @ Reverb. - - .word se_m_charge_grp - - .word se_m_charge_1 - - .end diff --git a/sound/songs/se_m_charm.s b/sound/songs/se_m_charm.s deleted file mode 100644 index ef10cb3e3..000000000 --- a/sound/songs/se_m_charm.s +++ /dev/null @@ -1,96 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_charm_grp, voicegroup128 - .equ se_m_charm_pri, 4 - .equ se_m_charm_rev, reverb_set+50 - .equ se_m_charm_mvl, 127 - .equ se_m_charm_key, 0 - .equ se_m_charm_tbs, 1 - .equ se_m_charm_exg, 0 - .equ se_m_charm_cmp, 1 - - .section .rodata - .global se_m_charm - .align 2 - -@********************** Track 1 **********************@ - -se_m_charm_1: - .byte KEYSH , se_m_charm_key+0 - .byte TEMPO , 150*se_m_charm_tbs/2 - .byte VOICE , 37 - .byte BENDR , 24 - .byte PAN , c_v+0 - .byte VOL , 25*se_m_charm_mvl/mxv - .byte BEND , c_v+11 - .byte N02 , Fn4 , v127 - .byte W01 - .byte VOL , 42*se_m_charm_mvl/mxv - .byte PAN , c_v+4 - .byte BEND , c_v+5 - .byte W01 - .byte VOL , 62*se_m_charm_mvl/mxv - .byte PAN , c_v-4 - .byte BEND , c_v+0 - .byte N15 - .byte W01 - .byte VOL , 77*se_m_charm_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+5 - .byte W01 - .byte VOL , 84*se_m_charm_mvl/mxv - .byte PAN , c_v+4 - .byte BEND , c_v+12 - .byte W02 - .byte VOL , 96*se_m_charm_mvl/mxv - .byte PAN , c_v-4 - .byte BEND , c_v+20 - .byte W01 - .byte VOL , 100*se_m_charm_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+25 - .byte W01 - .byte PAN , c_v+4 - .byte BEND , c_v+30 - .byte W01 - .byte PAN , c_v-4 - .byte BEND , c_v+34 - .byte W01 - .byte PAN , c_v+0 - .byte BEND , c_v+40 - .byte W02 - .byte VOL , 94*se_m_charm_mvl/mxv - .byte PAN , c_v+4 - .byte W01 - .byte VOL , 85*se_m_charm_mvl/mxv - .byte PAN , c_v-4 - .byte BEND , c_v+37 - .byte W01 - .byte VOL , 66*se_m_charm_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+36 - .byte W01 - .byte VOL , 49*se_m_charm_mvl/mxv - .byte PAN , c_v+4 - .byte BEND , c_v+34 - .byte W01 - .byte VOL , 32*se_m_charm_mvl/mxv - .byte PAN , c_v-4 - .byte BEND , c_v+32 - .byte W02 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_charm: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_charm_pri @ Priority - .byte se_m_charm_rev @ Reverb. - - .word se_m_charm_grp - - .word se_m_charm_1 - - .end diff --git a/sound/songs/se_m_confuse_ray.s b/sound/songs/se_m_confuse_ray.s deleted file mode 100644 index 12aea8ab8..000000000 --- a/sound/songs/se_m_confuse_ray.s +++ /dev/null @@ -1,117 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_confuse_ray_grp, voicegroup128 - .equ se_m_confuse_ray_pri, 4 - .equ se_m_confuse_ray_rev, reverb_set+50 - .equ se_m_confuse_ray_mvl, 127 - .equ se_m_confuse_ray_key, 0 - .equ se_m_confuse_ray_tbs, 1 - .equ se_m_confuse_ray_exg, 0 - .equ se_m_confuse_ray_cmp, 1 - - .section .rodata - .global se_m_confuse_ray - .align 2 - -@********************** Track 1 **********************@ - -se_m_confuse_ray_1: - .byte KEYSH , se_m_confuse_ray_key+0 - .byte TEMPO , 220*se_m_confuse_ray_tbs/2 - .byte VOICE , 52 - .byte VOL , 127*se_m_confuse_ray_mvl/mxv - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N03 , As3 , v120 - .byte W01 - .byte BEND , c_v-8 - .byte W01 - .byte c_v-16 - .byte W01 - .byte c_v-1 - .byte N12 , As2 , v127 - .byte W03 - .byte PAN , c_v+4 - .byte BEND , c_v+8 - .byte W02 - .byte PAN , c_v-4 - .byte BEND , c_v+11 - .byte W01 - .byte c_v+18 - .byte W01 - .byte PAN , c_v+10 - .byte BEND , c_v+28 - .byte W02 - .byte c_v+35 - .byte W01 - .byte PAN , c_v-10 - .byte W02 - .byte c_v+0 - .byte BEND , c_v+0 - .byte N03 , As3 , v108 - .byte W01 - .byte BEND , c_v-8 - .byte W02 - .byte c_v-17 - .byte W01 - .byte c_v-1 - .byte N12 , As2 - .byte W02 - .byte PAN , c_v+4 - .byte BEND , c_v+8 - .byte W03 - .byte PAN , c_v-4 - .byte BEND , c_v+11 - .byte W01 - .byte c_v+18 - .byte W01 - .byte PAN , c_v+10 - .byte BEND , c_v+28 - .byte W01 - .byte c_v+35 - .byte W01 - .byte PAN , c_v-10 - .byte W03 - .byte c_v+0 - .byte BEND , c_v+0 - .byte N03 , As3 , v072 - .byte W01 - .byte BEND , c_v-8 - .byte W01 - .byte c_v-16 - .byte W01 - .byte c_v-1 - .byte N12 , As2 - .byte W03 - .byte PAN , c_v+4 - .byte BEND , c_v+8 - .byte W02 - .byte PAN , c_v-4 - .byte BEND , c_v+11 - .byte W01 - .byte c_v+18 - .byte W02 - .byte PAN , c_v+10 - .byte BEND , c_v+28 - .byte W01 - .byte c_v+35 - .byte W01 - .byte PAN , c_v-10 - .byte W04 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_confuse_ray: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_confuse_ray_pri @ Priority - .byte se_m_confuse_ray_rev @ Reverb. - - .word se_m_confuse_ray_grp - - .word se_m_confuse_ray_1 - - .end diff --git a/sound/songs/se_m_cosmic_power.s b/sound/songs/se_m_cosmic_power.s deleted file mode 100644 index 76812478b..000000000 --- a/sound/songs/se_m_cosmic_power.s +++ /dev/null @@ -1,208 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_cosmic_power_grp, voicegroup128 - .equ se_m_cosmic_power_pri, 4 - .equ se_m_cosmic_power_rev, reverb_set+50 - .equ se_m_cosmic_power_mvl, 127 - .equ se_m_cosmic_power_key, 0 - .equ se_m_cosmic_power_tbs, 1 - .equ se_m_cosmic_power_exg, 0 - .equ se_m_cosmic_power_cmp, 1 - - .section .rodata - .global se_m_cosmic_power - .align 2 - -@********************** Track 1 **********************@ - -se_m_cosmic_power_1: - .byte KEYSH , se_m_cosmic_power_key+0 - .byte TEMPO , 150*se_m_cosmic_power_tbs/2 - .byte VOICE , 46 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 110*se_m_cosmic_power_mvl/mxv - .byte BEND , c_v-4 - .byte N09 , As5 , v112 - .byte W06 - .byte W03 - .byte PAN , c_v-5 - .byte N08 , Cn5 - .byte W03 - .byte W06 - .byte PAN , c_v-9 - .byte N10 , Gn5 - .byte W06 - .byte W04 - .byte PAN , c_v-5 - .byte N09 , Fn6 - .byte W02 - .byte W06 - .byte W02 - .byte PAN , c_v+0 - .byte N09 , An5 - .byte W04 - .byte W06 - .byte PAN , c_v+4 - .byte N09 , As5 - .byte W06 - .byte W03 - .byte PAN , c_v+9 - .byte N08 , Cn5 , v108 - .byte W03 - .byte W06 - .byte PAN , c_v+4 - .byte N10 , Gn5 , v104 - .byte W06 - .byte W04 - .byte PAN , c_v+0 - .byte N09 , Fn6 , v096 - .byte W02 - .byte W06 - .byte W02 - .byte PAN , c_v-5 - .byte N09 , An5 , v092 - .byte W04 - .byte W04 - .byte PAN , c_v-9 - .byte W02 - .byte N09 , As5 , v084 - .byte W06 - .byte W03 - .byte PAN , c_v-5 - .byte N08 , Cn5 , v080 - .byte W03 - .byte W06 - .byte N10 , Gn5 , v072 - .byte W01 - .byte PAN , c_v+0 - .byte W05 - .byte W04 - .byte c_v+4 - .byte N09 , Fn6 , v068 - .byte W02 - .byte W06 - .byte W02 - .byte PAN , c_v+9 - .byte N09 , An5 , v060 - .byte W04 - .byte W04 - .byte PAN , c_v+4 - .byte W02 - .byte N09 , As5 , v056 - .byte W06 - .byte W03 - .byte PAN , c_v+0 - .byte N08 , Cn5 , v052 - .byte W03 - .byte W06 - .byte N10 , Gn5 , v044 - .byte W01 - .byte PAN , c_v-5 - .byte W05 - .byte W03 - .byte c_v-9 - .byte W01 - .byte N09 , Fn6 , v040 - .byte W02 - .byte W06 - .byte W02 - .byte PAN , c_v-5 - .byte N09 , An5 , v032 - .byte W04 - .byte W06 - .byte PAN , c_v+0 - .byte W06 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_cosmic_power_2: - .byte KEYSH , se_m_cosmic_power_key+0 - .byte VOICE , 53 - .byte XCMD , xIECV , 9 - .byte xIECL , 8 - .byte VOL , 43*se_m_cosmic_power_mvl/mxv - .byte BEND , c_v-2 - .byte W04 - .byte N08 , Fn5 , v112 - .byte W02 - .byte W06 - .byte W01 - .byte N10 , Ds5 - .byte W05 - .byte W06 - .byte N09 , As6 - .byte W06 - .byte W03 - .byte Cn6 - .byte W03 - .byte W06 - .byte N10 , Fn5 - .byte W06 - .byte W04 - .byte N08 - .byte W02 - .byte W06 - .byte W01 - .byte N10 , Ds5 , v104 - .byte W05 - .byte W06 - .byte N09 , As6 , v100 - .byte W06 - .byte W03 - .byte Cn6 , v092 - .byte W03 - .byte W06 - .byte N10 , Fn5 , v088 - .byte W06 - .byte W04 - .byte N08 , Fn5 , v080 - .byte W02 - .byte W06 - .byte W01 - .byte N10 , Ds5 , v076 - .byte W05 - .byte W06 - .byte N09 , As6 , v072 - .byte W06 - .byte W03 - .byte Cn6 , v064 - .byte W03 - .byte W06 - .byte N10 , Fn5 , v060 - .byte W06 - .byte W04 - .byte N08 , Fn5 , v052 - .byte W02 - .byte W06 - .byte W01 - .byte N10 , Ds5 , v048 - .byte W05 - .byte W06 - .byte N09 , As6 , v040 - .byte W06 - .byte W03 - .byte Cn6 , v036 - .byte W03 - .byte W06 - .byte N12 , Fn5 , v032 - .byte W06 - .byte W06 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_cosmic_power: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_cosmic_power_pri @ Priority - .byte se_m_cosmic_power_rev @ Reverb. - - .word se_m_cosmic_power_grp - - .word se_m_cosmic_power_1 - .word se_m_cosmic_power_2 - - .end diff --git a/sound/songs/se_m_crabhammer.s b/sound/songs/se_m_crabhammer.s deleted file mode 100644 index 6333150dc..000000000 --- a/sound/songs/se_m_crabhammer.s +++ /dev/null @@ -1,58 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_crabhammer_grp, voicegroup128 - .equ se_m_crabhammer_pri, 4 - .equ se_m_crabhammer_rev, reverb_set+50 - .equ se_m_crabhammer_mvl, 127 - .equ se_m_crabhammer_key, 0 - .equ se_m_crabhammer_tbs, 1 - .equ se_m_crabhammer_exg, 0 - .equ se_m_crabhammer_cmp, 1 - - .section .rodata - .global se_m_crabhammer - .align 2 - -@********************** Track 1 **********************@ - -se_m_crabhammer_1: - .byte KEYSH , se_m_crabhammer_key+0 - .byte TEMPO , 150*se_m_crabhammer_tbs/2 - .byte VOICE , 23 - .byte VOL , 100*se_m_crabhammer_mvl/mxv - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte BEND , c_v+2 - .byte N02 , Dn3 , v127 - .byte W01 - .byte PAN , c_v-10 - .byte BEND , c_v+4 - .byte W02 - .byte PAN , c_v+8 - .byte BEND , c_v+6 - .byte N02 , Dn3 , v084 - .byte W01 - .byte PAN , c_v+0 - .byte BEND , c_v+9 - .byte W02 - .byte c_v-1 - .byte W02 - .byte c_v+32 - .byte N02 , Dn3 , v056 - .byte W16 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_crabhammer: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_crabhammer_pri @ Priority - .byte se_m_crabhammer_rev @ Reverb. - - .word se_m_crabhammer_grp - - .word se_m_crabhammer_1 - - .end diff --git a/sound/songs/se_m_detect.s b/sound/songs/se_m_detect.s deleted file mode 100644 index 181fb4079..000000000 --- a/sound/songs/se_m_detect.s +++ /dev/null @@ -1,95 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_detect_grp, voicegroup128 - .equ se_m_detect_pri, 4 - .equ se_m_detect_rev, reverb_set+50 - .equ se_m_detect_mvl, 127 - .equ se_m_detect_key, 0 - .equ se_m_detect_tbs, 1 - .equ se_m_detect_exg, 0 - .equ se_m_detect_cmp, 1 - - .section .rodata - .global se_m_detect - .align 2 - -@********************** Track 1 **********************@ - -se_m_detect_1: - .byte KEYSH , se_m_detect_key+0 - .byte TEMPO , 220*se_m_detect_tbs/2 - .byte VOICE , 54 - .byte VOL , 100*se_m_detect_mvl/mxv - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte BEND , c_v+1 - .byte N03 , As5 , v127 - .byte W01 - .byte PAN , c_v+2 - .byte BEND , c_v+2 - .byte W01 - .byte c_v+4 - .byte W01 - .byte c_v+1 - .byte N06 , Bn5 - .byte W01 - .byte PAN , c_v+0 - .byte W02 - .byte W03 - .byte BEND , c_v+1 - .byte N03 , As5 , v104 - .byte W01 - .byte PAN , c_v-2 - .byte BEND , c_v+2 - .byte W02 - .byte c_v+4 - .byte W01 - .byte c_v+1 - .byte N06 , Bn5 - .byte W01 - .byte PAN , c_v+0 - .byte W04 - .byte W01 - .byte BEND , c_v+1 - .byte N03 , As5 , v080 - .byte W01 - .byte PAN , c_v+4 - .byte BEND , c_v+2 - .byte W01 - .byte c_v+4 - .byte W01 - .byte c_v+1 - .byte N06 , Bn5 - .byte W02 - .byte PAN , c_v+0 - .byte W04 - .byte BEND , c_v+1 - .byte N03 , As5 , v048 - .byte W02 - .byte PAN , c_v-5 - .byte BEND , c_v+2 - .byte W01 - .byte c_v+4 - .byte W01 - .byte c_v+1 - .byte N06 , Bn5 - .byte W01 - .byte PAN , c_v+0 - .byte W03 - .byte W06 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_detect: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_detect_pri @ Priority - .byte se_m_detect_rev @ Reverb. - - .word se_m_detect_grp - - .word se_m_detect_1 - - .end diff --git a/sound/songs/se_m_dig.s b/sound/songs/se_m_dig.s deleted file mode 100644 index 42fed8ab5..000000000 --- a/sound/songs/se_m_dig.s +++ /dev/null @@ -1,66 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_dig_grp, voicegroup128 - .equ se_m_dig_pri, 4 - .equ se_m_dig_rev, reverb_set+50 - .equ se_m_dig_mvl, 127 - .equ se_m_dig_key, 0 - .equ se_m_dig_tbs, 1 - .equ se_m_dig_exg, 0 - .equ se_m_dig_cmp, 1 - - .section .rodata - .global se_m_dig - .align 2 - -@********************** Track 1 **********************@ - -se_m_dig_1: - .byte KEYSH , se_m_dig_key+0 - .byte TEMPO , 150*se_m_dig_tbs/2 - .byte VOICE , 36 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 115*se_m_dig_mvl/mxv - .byte BEND , c_v+0 - .byte N01 , Cn2 , v112 - .byte W01 - .byte VOICE , 26 - .byte N02 , Cn3 , v127 - .byte W01 - .byte PAN , c_v+5 - .byte BEND , c_v+4 - .byte W01 - .byte c_v+16 - .byte N03 - .byte W01 - .byte PAN , c_v-8 - .byte BEND , c_v+28 - .byte W02 - .byte c_v+45 - .byte W01 - .byte VOICE , 36 - .byte PAN , c_v+12 - .byte BEND , c_v+0 - .byte N02 , Cn3 , v056 - .byte W02 - .byte W03 - .byte PAN , c_v-12 - .byte N02 , Cn3 , v036 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_dig: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_dig_pri @ Priority - .byte se_m_dig_rev @ Reverb. - - .word se_m_dig_grp - - .word se_m_dig_1 - - .end diff --git a/sound/songs/se_m_dive.s b/sound/songs/se_m_dive.s deleted file mode 100644 index 2313667fc..000000000 --- a/sound/songs/se_m_dive.s +++ /dev/null @@ -1,123 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_dive_grp, voicegroup128 - .equ se_m_dive_pri, 4 - .equ se_m_dive_rev, reverb_set+50 - .equ se_m_dive_mvl, 127 - .equ se_m_dive_key, 0 - .equ se_m_dive_tbs, 1 - .equ se_m_dive_exg, 0 - .equ se_m_dive_cmp, 1 - - .section .rodata - .global se_m_dive - .align 2 - -@********************** Track 1 **********************@ - -se_m_dive_1: - .byte KEYSH , se_m_dive_key+0 - .byte TEMPO , 150*se_m_dive_tbs/2 - .byte VOICE , 36 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 105*se_m_dive_mvl/mxv - .byte BEND , c_v-18 - .byte N06 , Fn2 , v127 - .byte W03 - .byte PAN , c_v+3 - .byte BEND , c_v-16 - .byte W04 - .byte PAN , c_v+6 - .byte BEND , c_v-14 - .byte N04 - .byte W03 - .byte PAN , c_v+3 - .byte BEND , c_v-11 - .byte W02 - .byte N36 , Gn3 , v092 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v-8 - .byte W04 - .byte PAN , c_v-3 - .byte BEND , c_v-5 - .byte W02 - .byte VOL , 100*se_m_dive_mvl/mxv - .byte W01 - .byte PAN , c_v-6 - .byte BEND , c_v-2 - .byte W03 - .byte VOL , 94*se_m_dive_mvl/mxv - .byte W01 - .byte PAN , c_v-3 - .byte BEND , c_v+1 - .byte W02 - .byte VOL , 84*se_m_dive_mvl/mxv - .byte W01 - .byte PAN , c_v+0 - .byte BEND , c_v+4 - .byte W04 - .byte PAN , c_v+3 - .byte VOL , 72*se_m_dive_mvl/mxv - .byte BEND , c_v+2 - .byte W04 - .byte PAN , c_v+6 - .byte VOL , 57*se_m_dive_mvl/mxv - .byte BEND , c_v-3 - .byte W03 - .byte PAN , c_v+3 - .byte VOL , 37*se_m_dive_mvl/mxv - .byte BEND , c_v-7 - .byte W03 - .byte VOL , 20*se_m_dive_mvl/mxv - .byte W01 - .byte PAN , c_v+0 - .byte BEND , c_v-11 - .byte W01 - .byte VOL , 7*se_m_dive_mvl/mxv - .byte W02 - .byte PAN , c_v-3 - .byte BEND , c_v-16 - .byte W02 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_dive_2: - .byte KEYSH , se_m_dive_key+0 - .byte VOICE , 25 - .byte VOL , 105*se_m_dive_mvl/mxv - .byte N06 , An2 , v040 - .byte W06 - .byte Gn2 - .byte W06 - .byte Gs3 , v044 - .byte W07 - .byte Gs3 , v036 - .byte W05 - .byte W02 - .byte Gs3 , v028 - .byte W07 - .byte Gs3 , v020 - .byte W03 - .byte W04 - .byte Gs3 , v012 - .byte W08 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_dive: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_dive_pri @ Priority - .byte se_m_dive_rev @ Reverb. - - .word se_m_dive_grp - - .word se_m_dive_1 - .word se_m_dive_2 - - .end diff --git a/sound/songs/se_m_dizzy_punch.s b/sound/songs/se_m_dizzy_punch.s deleted file mode 100644 index 886a4bc4e..000000000 --- a/sound/songs/se_m_dizzy_punch.s +++ /dev/null @@ -1,79 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_dizzy_punch_grp, voicegroup128 - .equ se_m_dizzy_punch_pri, 4 - .equ se_m_dizzy_punch_rev, reverb_set+50 - .equ se_m_dizzy_punch_mvl, 127 - .equ se_m_dizzy_punch_key, 0 - .equ se_m_dizzy_punch_tbs, 1 - .equ se_m_dizzy_punch_exg, 0 - .equ se_m_dizzy_punch_cmp, 1 - - .section .rodata - .global se_m_dizzy_punch - .align 2 - -@********************** Track 1 **********************@ - -se_m_dizzy_punch_1: - .byte KEYSH , se_m_dizzy_punch_key+0 - .byte TEMPO , 150*se_m_dizzy_punch_tbs/2 - .byte VOICE , 19 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 5*se_m_dizzy_punch_mvl/mxv - .byte BEND , c_v+0 - .byte N07 , Bn5 , v080 - .byte W01 - .byte VOL , 55*se_m_dizzy_punch_mvl/mxv - .byte PAN , c_v+11 - .byte BEND , c_v+3 - .byte W01 - .byte VOL , 67*se_m_dizzy_punch_mvl/mxv - .byte PAN , c_v+22 - .byte BEND , c_v+0 - .byte W01 - .byte VOL , 90*se_m_dizzy_punch_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v-6 - .byte W01 - .byte PAN , c_v-12 - .byte BEND , c_v-14 - .byte W02 - .byte VOL , 4*se_m_dizzy_punch_mvl/mxv - .byte PAN , c_v-22 - .byte BEND , c_v-23 - .byte W01 - .byte PAN , c_v-13 - .byte BEND , c_v+0 - .byte N04 , Cn6 - .byte W01 - .byte VOL , 66*se_m_dizzy_punch_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+1 - .byte W01 - .byte VOL , 90*se_m_dizzy_punch_mvl/mxv - .byte PAN , c_v+11 - .byte BEND , c_v+3 - .byte W01 - .byte VOL , 4*se_m_dizzy_punch_mvl/mxv - .byte PAN , c_v+21 - .byte BEND , c_v+5 - .byte W14 - .byte VOL , 90*se_m_dizzy_punch_mvl/mxv - .byte FINE - -@******************************************************@ - .align 2 - -se_m_dizzy_punch: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_dizzy_punch_pri @ Priority - .byte se_m_dizzy_punch_rev @ Reverb. - - .word se_m_dizzy_punch_grp - - .word se_m_dizzy_punch_1 - - .end diff --git a/sound/songs/se_m_double_team.s b/sound/songs/se_m_double_team.s deleted file mode 100644 index 49bcfb13d..000000000 --- a/sound/songs/se_m_double_team.s +++ /dev/null @@ -1,71 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_double_team_grp, voicegroup128 - .equ se_m_double_team_pri, 4 - .equ se_m_double_team_rev, reverb_set+50 - .equ se_m_double_team_mvl, 127 - .equ se_m_double_team_key, 0 - .equ se_m_double_team_tbs, 1 - .equ se_m_double_team_exg, 0 - .equ se_m_double_team_cmp, 1 - - .section .rodata - .global se_m_double_team - .align 2 - -@********************** Track 1 **********************@ - -se_m_double_team_1: - .byte KEYSH , se_m_double_team_key+0 - .byte TEMPO , 150*se_m_double_team_tbs/2 - .byte VOICE , 22 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 110*se_m_double_team_mvl/mxv - .byte BEND , c_v-18 - .byte N19 , Dn3 , v108 - .byte W02 - .byte BEND , c_v-7 - .byte W01 - .byte VOL , 101*se_m_double_team_mvl/mxv - .byte W01 - .byte PAN , c_v-9 - .byte BEND , c_v+8 - .byte W02 - .byte VOL , 84*se_m_double_team_mvl/mxv - .byte BEND , c_v+4 - .byte W02 - .byte PAN , c_v+0 - .byte W01 - .byte VOL , 64*se_m_double_team_mvl/mxv - .byte BEND , c_v-13 - .byte W01 - .byte PAN , c_v+8 - .byte W02 - .byte VOL , 45*se_m_double_team_mvl/mxv - .byte BEND , c_v-31 - .byte W02 - .byte VOL , 32*se_m_double_team_mvl/mxv - .byte PAN , c_v+0 - .byte W01 - .byte VOICE , 2 - .byte W01 - .byte VOL , 13*se_m_double_team_mvl/mxv - .byte BEND , c_v-52 - .byte W08 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_double_team: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_double_team_pri @ Priority - .byte se_m_double_team_rev @ Reverb. - - .word se_m_double_team_grp - - .word se_m_double_team_1 - - .end diff --git a/sound/songs/se_m_dragon_rage.s b/sound/songs/se_m_dragon_rage.s deleted file mode 100644 index e9eaefca0..000000000 --- a/sound/songs/se_m_dragon_rage.s +++ /dev/null @@ -1,150 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_dragon_rage_grp, voicegroup128 - .equ se_m_dragon_rage_pri, 4 - .equ se_m_dragon_rage_rev, reverb_set+50 - .equ se_m_dragon_rage_mvl, 127 - .equ se_m_dragon_rage_key, 0 - .equ se_m_dragon_rage_tbs, 1 - .equ se_m_dragon_rage_exg, 0 - .equ se_m_dragon_rage_cmp, 1 - - .section .rodata - .global se_m_dragon_rage - .align 2 - -@********************** Track 1 **********************@ - -se_m_dragon_rage_1: - .byte KEYSH , se_m_dragon_rage_key+0 - .byte TEMPO , 150*se_m_dragon_rage_tbs/2 - .byte VOICE , 29 - .byte BENDR , 12 - .byte PAN , c_v+5 - .byte VOL , 21*se_m_dragon_rage_mvl/mxv - .byte BEND , c_v+0 - .byte N10 , An2 , v127 - .byte W02 - .byte VOL , 47*se_m_dragon_rage_mvl/mxv - .byte W01 - .byte PAN , c_v+0 - .byte W01 - .byte VOL , 88*se_m_dragon_rage_mvl/mxv - .byte W02 - .byte PAN , c_v-5 - .byte W01 - .byte VOL , 120*se_m_dragon_rage_mvl/mxv - .byte W02 - .byte PAN , c_v+0 - .byte W01 - .byte VOL , 21*se_m_dragon_rage_mvl/mxv - .byte BEND , c_v+10 - .byte N10 , Bn2 - .byte W02 - .byte PAN , c_v+5 - .byte W01 - .byte VOL , 47*se_m_dragon_rage_mvl/mxv - .byte W02 - .byte PAN , c_v+0 - .byte VOL , 88*se_m_dragon_rage_mvl/mxv - .byte W03 - .byte PAN , c_v-5 - .byte VOL , 120*se_m_dragon_rage_mvl/mxv - .byte W03 - .byte PAN , c_v-2 - .byte VOL , 21*se_m_dragon_rage_mvl/mxv - .byte BEND , c_v+18 - .byte N10 , Cs3 - .byte W03 - .byte PAN , c_v+5 - .byte VOL , 47*se_m_dragon_rage_mvl/mxv - .byte W02 - .byte 88*se_m_dragon_rage_mvl/mxv - .byte W01 - .byte PAN , c_v+0 - .byte W01 - .byte VOL , 120*se_m_dragon_rage_mvl/mxv - .byte W02 - .byte PAN , c_v-5 - .byte W02 - .byte VOL , 20*se_m_dragon_rage_mvl/mxv - .byte BEND , c_v+29 - .byte N10 , Dn3 - .byte W01 - .byte PAN , c_v+0 - .byte W01 - .byte VOL , 47*se_m_dragon_rage_mvl/mxv - .byte W02 - .byte PAN , c_v+5 - .byte W01 - .byte VOL , 88*se_m_dragon_rage_mvl/mxv - .byte W02 - .byte PAN , c_v+0 - .byte VOL , 120*se_m_dragon_rage_mvl/mxv - .byte W03 - .byte PAN , c_v-5 - .byte W01 - .byte VOL , 21*se_m_dragon_rage_mvl/mxv - .byte BEND , c_v+37 - .byte N10 , En3 - .byte W02 - .byte PAN , c_v-2 - .byte VOL , 46*se_m_dragon_rage_mvl/mxv - .byte W03 - .byte PAN , c_v+5 - .byte VOL , 102*se_m_dragon_rage_mvl/mxv - .byte W02 - .byte 120*se_m_dragon_rage_mvl/mxv - .byte W01 - .byte PAN , c_v+0 - .byte W03 - .byte c_v-5 - .byte VOL , 20*se_m_dragon_rage_mvl/mxv - .byte BEND , c_v+42 - .byte N20 , Fs3 - .byte W02 - .byte VOL , 47*se_m_dragon_rage_mvl/mxv - .byte W01 - .byte PAN , c_v+0 - .byte W01 - .byte VOL , 88*se_m_dragon_rage_mvl/mxv - .byte W02 - .byte PAN , c_v+5 - .byte W01 - .byte VOL , 120*se_m_dragon_rage_mvl/mxv - .byte W02 - .byte PAN , c_v+0 - .byte W01 - .byte VOL , 99*se_m_dragon_rage_mvl/mxv - .byte BEND , c_v+50 - .byte W02 - .byte PAN , c_v-5 - .byte W01 - .byte VOL , 74*se_m_dragon_rage_mvl/mxv - .byte W01 - .byte BEND , c_v+56 - .byte W01 - .byte PAN , c_v-2 - .byte VOL , 53*se_m_dragon_rage_mvl/mxv - .byte W03 - .byte 34*se_m_dragon_rage_mvl/mxv - .byte BEND , c_v+63 - .byte W01 - .byte VOL , 15*se_m_dragon_rage_mvl/mxv - .byte W23 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_dragon_rage: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_dragon_rage_pri @ Priority - .byte se_m_dragon_rage_rev @ Reverb. - - .word se_m_dragon_rage_grp - - .word se_m_dragon_rage_1 - - .end diff --git a/sound/songs/se_m_earthquake.s b/sound/songs/se_m_earthquake.s deleted file mode 100644 index 104eb1bef..000000000 --- a/sound/songs/se_m_earthquake.s +++ /dev/null @@ -1,326 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_earthquake_grp, voicegroup128 - .equ se_m_earthquake_pri, 4 - .equ se_m_earthquake_rev, reverb_set+50 - .equ se_m_earthquake_mvl, 127 - .equ se_m_earthquake_key, 0 - .equ se_m_earthquake_tbs, 1 - .equ se_m_earthquake_exg, 0 - .equ se_m_earthquake_cmp, 1 - - .section .rodata - .global se_m_earthquake - .align 2 - -@********************** Track 1 **********************@ - -se_m_earthquake_1: - .byte KEYSH , se_m_earthquake_key+0 - .byte TEMPO , 150*se_m_earthquake_tbs/2 - .byte VOICE , 26 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 110*se_m_earthquake_mvl/mxv - .byte BEND , c_v+0 - .byte N03 , Cs2 , v127 - .byte W03 - .byte PAN , c_v+6 - .byte N03 , Cn2 , v120 - .byte W03 - .byte W01 - .byte PAN , c_v-6 - .byte N03 , Bn1 , v116 - .byte W03 - .byte PAN , c_v+11 - .byte N03 , Cn2 , v112 - .byte W02 -se_m_earthquake_1_000: - .byte W02 - .byte PAN , c_v-11 - .byte N03 , Cs2 , v108 - .byte W04 - .byte PEND -se_m_earthquake_1_001: - .byte PAN , c_v+0 - .byte N03 , Cn2 , v100 - .byte W03 - .byte PAN , c_v+6 - .byte N03 , Cs2 , v116 - .byte W03 - .byte PEND -se_m_earthquake_1_002: - .byte W01 - .byte PAN , c_v-6 - .byte N03 , Cn2 , v112 - .byte W03 - .byte PAN , c_v+11 - .byte N03 , Cs2 , v108 - .byte W02 - .byte PEND -se_m_earthquake_1_003: - .byte W02 - .byte PAN , c_v-11 - .byte N03 , Cn2 , v100 - .byte W04 - .byte PEND -se_m_earthquake_1_004: - .byte PAN , c_v+0 - .byte N03 , Cs2 , v116 - .byte W03 - .byte PAN , c_v+6 - .byte N03 , Cn2 , v112 - .byte W03 - .byte PEND -se_m_earthquake_1_005: - .byte W01 - .byte PAN , c_v-6 - .byte N03 , Cs2 , v108 - .byte W03 - .byte PAN , c_v+11 - .byte N03 , Cn2 , v100 - .byte W02 - .byte PEND -se_m_earthquake_1_006: - .byte W02 - .byte PAN , c_v-11 - .byte N03 , Cs2 , v116 - .byte W04 - .byte PEND - .byte PAN , c_v+0 - .byte N03 , Cn2 , v112 - .byte W03 - .byte PAN , c_v+6 - .byte N03 , Cs2 , v108 - .byte W03 - .byte W01 - .byte PAN , c_v-6 - .byte N03 , Cn2 , v100 - .byte W03 - .byte PAN , c_v+11 - .byte N03 , Cs2 , v116 - .byte W02 - .byte W02 - .byte PAN , c_v-11 - .byte N03 , Cn2 , v112 - .byte W04 -se_m_earthquake_1_007: - .byte PAN , c_v+0 - .byte N03 , Cs2 , v108 - .byte W03 - .byte PAN , c_v+6 - .byte N03 , Cn2 , v100 - .byte W03 - .byte PEND -se_m_earthquake_1_008: - .byte W01 - .byte PAN , c_v-6 - .byte N03 , Cs2 , v116 - .byte W03 - .byte PAN , c_v+11 - .byte N03 , Cn2 , v112 - .byte W02 - .byte PEND - .byte PATT - .word se_m_earthquake_1_000 - .byte PATT - .word se_m_earthquake_1_001 - .byte PATT - .word se_m_earthquake_1_002 - .byte PATT - .word se_m_earthquake_1_003 - .byte PATT - .word se_m_earthquake_1_007 - .byte PATT - .word se_m_earthquake_1_008 - .byte PATT - .word se_m_earthquake_1_000 - .byte PATT - .word se_m_earthquake_1_001 - .byte PATT - .word se_m_earthquake_1_002 - .byte PATT - .word se_m_earthquake_1_003 - .byte PATT - .word se_m_earthquake_1_004 - .byte PATT - .word se_m_earthquake_1_005 - .byte PATT - .word se_m_earthquake_1_006 - .byte VOL , 106*se_m_earthquake_mvl/mxv - .byte PAN , c_v+0 - .byte N03 , Cn2 , v112 - .byte W03 - .byte VOL , 103*se_m_earthquake_mvl/mxv - .byte PAN , c_v+6 - .byte N03 , Cs2 , v108 - .byte W03 - .byte W01 - .byte VOL , 97*se_m_earthquake_mvl/mxv - .byte PAN , c_v-6 - .byte N03 , Cn2 , v100 - .byte W03 - .byte VOL , 89*se_m_earthquake_mvl/mxv - .byte PAN , c_v+11 - .byte N03 , Cs2 , v116 - .byte W02 - .byte W02 - .byte VOL , 85*se_m_earthquake_mvl/mxv - .byte PAN , c_v-11 - .byte N03 , Cn2 , v112 - .byte W04 - .byte VOL , 78*se_m_earthquake_mvl/mxv - .byte PAN , c_v+0 - .byte N03 , Cs2 , v108 - .byte W03 - .byte VOL , 72*se_m_earthquake_mvl/mxv - .byte PAN , c_v+6 - .byte N03 , Cn2 , v100 - .byte W03 - .byte W01 - .byte VOL , 66*se_m_earthquake_mvl/mxv - .byte PAN , c_v-6 - .byte N03 , Cs2 , v116 - .byte W03 - .byte VOL , 58*se_m_earthquake_mvl/mxv - .byte PAN , c_v+11 - .byte N03 , Cn2 , v112 - .byte W02 - .byte W02 - .byte VOL , 46*se_m_earthquake_mvl/mxv - .byte PAN , c_v-11 - .byte N03 , Cs2 , v108 - .byte W04 - .byte VOL , 30*se_m_earthquake_mvl/mxv - .byte PAN , c_v+0 - .byte N03 , Cn2 , v100 - .byte W03 - .byte VOL , 12*se_m_earthquake_mvl/mxv - .byte PAN , c_v+6 - .byte W03 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_earthquake_2: - .byte KEYSH , se_m_earthquake_key+0 - .byte VOICE , 5 - .byte PAN , c_v+0 - .byte VOL , 110*se_m_earthquake_mvl/mxv - .byte N02 , Fn2 , v072 - .byte W02 - .byte N01 - .byte W01 - .byte N02 , Gn2 - .byte W03 - .byte N01 , Gs2 , v060 - .byte W06 - .byte VOICE , 27 - .byte N06 , Bn1 , v080 - .byte W06 -se_m_earthquake_2_000: - .byte PAN , c_v+0 - .byte N06 , Bn1 , v080 - .byte W06 - .byte PEND - .byte N06 - .byte W06 - .byte N06 - .byte W06 - .byte PATT - .word se_m_earthquake_2_000 - .byte N06 , Bn1 , v080 - .byte W06 - .byte N06 - .byte W06 - .byte PATT - .word se_m_earthquake_2_000 - .byte N06 , Bn1 , v080 - .byte W06 - .byte N06 - .byte W06 - .byte PATT - .word se_m_earthquake_2_000 - .byte N06 , Bn1 , v080 - .byte W06 - .byte N06 - .byte W06 - .byte PATT - .word se_m_earthquake_2_000 - .byte N06 , Bn1 , v080 - .byte W06 - .byte N06 - .byte W06 - .byte PATT - .word se_m_earthquake_2_000 - .byte N06 , Bn1 , v080 - .byte W06 - .byte N06 - .byte W06 - .byte PATT - .word se_m_earthquake_2_000 - .byte N06 , Bn1 , v080 - .byte W06 - .byte N06 - .byte W06 - .byte PATT - .word se_m_earthquake_2_000 - .byte N06 , Bn1 , v080 - .byte W06 - .byte N06 - .byte W06 - .byte VOL , 106*se_m_earthquake_mvl/mxv - .byte PAN , c_v+0 - .byte N06 - .byte W03 - .byte VOL , 103*se_m_earthquake_mvl/mxv - .byte W03 - .byte N06 - .byte W01 - .byte VOL , 97*se_m_earthquake_mvl/mxv - .byte W03 - .byte 89*se_m_earthquake_mvl/mxv - .byte W02 - .byte N06 - .byte W02 - .byte VOL , 85*se_m_earthquake_mvl/mxv - .byte W04 - .byte 78*se_m_earthquake_mvl/mxv - .byte PAN , c_v+0 - .byte N06 - .byte W03 - .byte VOL , 72*se_m_earthquake_mvl/mxv - .byte W03 - .byte N06 - .byte W01 - .byte VOL , 66*se_m_earthquake_mvl/mxv - .byte W03 - .byte 58*se_m_earthquake_mvl/mxv - .byte W02 - .byte N06 - .byte W02 - .byte VOL , 46*se_m_earthquake_mvl/mxv - .byte W04 - .byte 30*se_m_earthquake_mvl/mxv - .byte PAN , c_v+0 - .byte N06 - .byte W03 - .byte VOL , 12*se_m_earthquake_mvl/mxv - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_earthquake: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_earthquake_pri @ Priority - .byte se_m_earthquake_rev @ Reverb. - - .word se_m_earthquake_grp - - .word se_m_earthquake_1 - .word se_m_earthquake_2 - - .end diff --git a/sound/songs/se_m_ember.s b/sound/songs/se_m_ember.s deleted file mode 100644 index a685ca24c..000000000 --- a/sound/songs/se_m_ember.s +++ /dev/null @@ -1,61 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_ember_grp, voicegroup128 - .equ se_m_ember_pri, 4 - .equ se_m_ember_rev, reverb_set+50 - .equ se_m_ember_mvl, 127 - .equ se_m_ember_key, 0 - .equ se_m_ember_tbs, 1 - .equ se_m_ember_exg, 0 - .equ se_m_ember_cmp, 1 - - .section .rodata - .global se_m_ember - .align 2 - -@********************** Track 1 **********************@ - -se_m_ember_1: - .byte KEYSH , se_m_ember_key+0 - .byte TEMPO , 150*se_m_ember_tbs/2 - .byte VOICE , 29 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 61*se_m_ember_mvl/mxv - .byte BEND , c_v+8 - .byte N10 , Gn3 , v127 - .byte W01 - .byte VOL , 84*se_m_ember_mvl/mxv - .byte W01 - .byte 97*se_m_ember_mvl/mxv - .byte BEND , c_v+16 - .byte W01 - .byte VOL , 110*se_m_ember_mvl/mxv - .byte W01 - .byte BEND , c_v+7 - .byte W02 - .byte c_v-12 - .byte W01 - .byte VOL , 89*se_m_ember_mvl/mxv - .byte W01 - .byte 64*se_m_ember_mvl/mxv - .byte BEND , c_v-42 - .byte W01 - .byte VOL , 34*se_m_ember_mvl/mxv - .byte W15 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_ember: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_ember_pri @ Priority - .byte se_m_ember_rev @ Reverb. - - .word se_m_ember_grp - - .word se_m_ember_1 - - .end diff --git a/sound/songs/se_m_encore.s b/sound/songs/se_m_encore.s deleted file mode 100644 index cf13ab761..000000000 --- a/sound/songs/se_m_encore.s +++ /dev/null @@ -1,58 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_encore_grp, voicegroup128 - .equ se_m_encore_pri, 4 - .equ se_m_encore_rev, reverb_set+50 - .equ se_m_encore_mvl, 127 - .equ se_m_encore_key, 0 - .equ se_m_encore_tbs, 1 - .equ se_m_encore_exg, 0 - .equ se_m_encore_cmp, 1 - - .section .rodata - .global se_m_encore - .align 2 - -@********************** Track 1 **********************@ - -se_m_encore_1: - .byte KEYSH , se_m_encore_key+0 - .byte TEMPO , 150*se_m_encore_tbs/2 - .byte VOICE , 59 - .byte BENDR , 12 - .byte VOL , 110*se_m_encore_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N06 , En3 , v127 - .byte W01 - .byte PAN , c_v+8 - .byte W01 - .byte c_v-9 - .byte W01 - .byte c_v+14 - .byte W01 - .byte c_v-10 - .byte W02 - .byte c_v+0 - .byte N03 , An3 , v048 - .byte W01 - .byte PAN , c_v+16 - .byte W01 - .byte c_v-16 - .byte W04 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_encore: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_encore_pri @ Priority - .byte se_m_encore_rev @ Reverb. - - .word se_m_encore_grp - - .word se_m_encore_1 - - .end diff --git a/sound/songs/se_m_encore2.s b/sound/songs/se_m_encore2.s deleted file mode 100644 index 9c53cdfe3..000000000 --- a/sound/songs/se_m_encore2.s +++ /dev/null @@ -1,173 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_encore2_grp, voicegroup128 - .equ se_m_encore2_pri, 4 - .equ se_m_encore2_rev, reverb_set+50 - .equ se_m_encore2_mvl, 127 - .equ se_m_encore2_key, 0 - .equ se_m_encore2_tbs, 1 - .equ se_m_encore2_exg, 0 - .equ se_m_encore2_cmp, 1 - - .section .rodata - .global se_m_encore2 - .align 2 - -@********************** Track 1 **********************@ - -se_m_encore2_1: - .byte KEYSH , se_m_encore2_key+0 - .byte TEMPO , 150*se_m_encore2_tbs/2 - .byte VOICE , 60 - .byte BENDR , 12 - .byte VOL , 25*se_m_encore2_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte TIE , Cn3 , v127 - .byte W01 - .byte PAN , c_v+2 - .byte W01 - .byte c_v+5 - .byte W01 - .byte VOL , 34*se_m_encore2_mvl/mxv - .byte W01 - .byte PAN , c_v+2 - .byte W02 - .byte c_v+0 - .byte W01 - .byte VOL , 46*se_m_encore2_mvl/mxv - .byte PAN , c_v-2 - .byte W01 - .byte c_v-4 - .byte W02 - .byte VOL , 56*se_m_encore2_mvl/mxv - .byte PAN , c_v-2 - .byte W02 - .byte c_v+0 - .byte W01 - .byte c_v+2 - .byte W01 - .byte c_v+5 - .byte W01 - .byte VOL , 70*se_m_encore2_mvl/mxv - .byte W01 - .byte PAN , c_v+2 - .byte W02 - .byte c_v+0 - .byte W01 - .byte VOL , 80*se_m_encore2_mvl/mxv - .byte PAN , c_v-2 - .byte W01 - .byte c_v-4 - .byte W02 - .byte VOL , 88*se_m_encore2_mvl/mxv - .byte PAN , c_v-2 - .byte W02 - .byte c_v+0 - .byte W01 - .byte c_v+2 - .byte W01 - .byte VOL , 96*se_m_encore2_mvl/mxv - .byte PAN , c_v+5 - .byte W02 - .byte c_v+2 - .byte W02 - .byte VOL , 100*se_m_encore2_mvl/mxv - .byte PAN , c_v+0 - .byte W01 - .byte c_v-2 - .byte W01 - .byte c_v-4 - .byte W02 - .byte c_v-2 - .byte W02 -se_m_encore2_1_000: - .byte PAN , c_v+0 - .byte W01 - .byte c_v+2 - .byte W01 - .byte c_v+5 - .byte W02 - .byte c_v+2 - .byte W02 - .byte c_v+0 - .byte W01 - .byte c_v-2 - .byte W01 - .byte c_v-4 - .byte W02 - .byte c_v-2 - .byte W02 - .byte PEND - .byte PATT - .word se_m_encore2_1_000 - .byte PATT - .word se_m_encore2_1_000 - .byte PATT - .word se_m_encore2_1_000 - .byte PATT - .word se_m_encore2_1_000 - .byte PATT - .word se_m_encore2_1_000 - .byte PATT - .word se_m_encore2_1_000 - .byte VOL , 96*se_m_encore2_mvl/mxv - .byte PAN , c_v+0 - .byte W01 - .byte c_v+2 - .byte W01 - .byte c_v+5 - .byte W01 - .byte VOL , 92*se_m_encore2_mvl/mxv - .byte W01 - .byte PAN , c_v+2 - .byte W02 - .byte c_v+0 - .byte W01 - .byte VOL , 84*se_m_encore2_mvl/mxv - .byte PAN , c_v-2 - .byte W01 - .byte c_v-4 - .byte W02 - .byte VOL , 72*se_m_encore2_mvl/mxv - .byte PAN , c_v-2 - .byte W02 - .byte c_v+0 - .byte W01 - .byte c_v+2 - .byte W01 - .byte VOL , 63*se_m_encore2_mvl/mxv - .byte PAN , c_v+5 - .byte W02 - .byte VOL , 52*se_m_encore2_mvl/mxv - .byte PAN , c_v+2 - .byte W02 - .byte c_v+0 - .byte W01 - .byte VOL , 37*se_m_encore2_mvl/mxv - .byte PAN , c_v-2 - .byte W01 - .byte c_v-4 - .byte W01 - .byte VOL , 22*se_m_encore2_mvl/mxv - .byte W01 - .byte 12*se_m_encore2_mvl/mxv - .byte PAN , c_v-2 - .byte W02 - .byte EOT , Cn3 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_encore2: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_encore2_pri @ Priority - .byte se_m_encore2_rev @ Reverb. - - .word se_m_encore2_grp - - .word se_m_encore2_1 - - .end diff --git a/sound/songs/se_m_explosion.s b/sound/songs/se_m_explosion.s deleted file mode 100644 index c93f485b8..000000000 --- a/sound/songs/se_m_explosion.s +++ /dev/null @@ -1,118 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_explosion_grp, voicegroup128 - .equ se_m_explosion_pri, 4 - .equ se_m_explosion_rev, reverb_set+50 - .equ se_m_explosion_mvl, 127 - .equ se_m_explosion_key, 0 - .equ se_m_explosion_tbs, 1 - .equ se_m_explosion_exg, 0 - .equ se_m_explosion_cmp, 1 - - .section .rodata - .global se_m_explosion - .align 2 - -@********************** Track 1 **********************@ - -se_m_explosion_1: - .byte KEYSH , se_m_explosion_key+0 - .byte TEMPO , 150*se_m_explosion_tbs/2 - .byte VOICE , 41 - .byte VOL , 125*se_m_explosion_mvl/mxv - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N01 , Ds3 , v127 - .byte W01 - .byte As2 - .byte W02 - .byte PAN , c_v-8 - .byte N02 , Gn3 - .byte W01 - .byte PAN , c_v+7 - .byte W03 - .byte c_v+0 - .byte N01 , Ds3 - .byte W01 - .byte As2 - .byte W02 - .byte N54 , Fn3 - .byte W11 - .byte BEND , c_v+3 - .byte W03 - .byte W02 - .byte PAN , c_v+6 - .byte BEND , c_v+7 - .byte W04 - .byte PAN , c_v+0 - .byte W01 - .byte BEND , c_v+10 - .byte W02 - .byte PAN , c_v-8 - .byte W01 - .byte BEND , c_v+16 - .byte W03 - .byte PAN , c_v+0 - .byte W01 - .byte BEND , c_v+20 - .byte W02 - .byte PAN , c_v+7 - .byte W02 - .byte BEND , c_v+25 - .byte W02 - .byte PAN , c_v+0 - .byte W04 - .byte c_v-8 - .byte BEND , c_v+20 - .byte W03 - .byte PAN , c_v+6 - .byte W01 - .byte BEND , c_v+10 - .byte W03 - .byte PAN , c_v-8 - .byte W02 - .byte BEND , c_v+3 - .byte W01 - .byte PAN , c_v+7 - .byte W04 - .byte c_v-8 - .byte W10 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_explosion_2: - .byte KEYSH , se_m_explosion_key+0 - .byte VOICE , 4 - .byte VOL , 125*se_m_explosion_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+1 - .byte N02 , Cn3 , v052 - .byte W01 - .byte VOL , 74*se_m_explosion_mvl/mxv - .byte W06 - .byte 125*se_m_explosion_mvl/mxv - .byte N02 - .byte W01 - .byte VOL , 74*se_m_explosion_mvl/mxv - .byte W16 - .byte W24 - .byte W24 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_explosion: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_explosion_pri @ Priority - .byte se_m_explosion_rev @ Reverb. - - .word se_m_explosion_grp - - .word se_m_explosion_1 - .word se_m_explosion_2 - - .end diff --git a/sound/songs/se_m_faint_attack.s b/sound/songs/se_m_faint_attack.s deleted file mode 100644 index ce53c7173..000000000 --- a/sound/songs/se_m_faint_attack.s +++ /dev/null @@ -1,89 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_faint_attack_grp, voicegroup128 - .equ se_m_faint_attack_pri, 4 - .equ se_m_faint_attack_rev, reverb_set+50 - .equ se_m_faint_attack_mvl, 127 - .equ se_m_faint_attack_key, 0 - .equ se_m_faint_attack_tbs, 1 - .equ se_m_faint_attack_exg, 0 - .equ se_m_faint_attack_cmp, 1 - - .section .rodata - .global se_m_faint_attack - .align 2 - -@********************** Track 1 **********************@ - -se_m_faint_attack_1: - .byte KEYSH , se_m_faint_attack_key+0 - .byte TEMPO , 150*se_m_faint_attack_tbs/2 - .byte VOICE , 45 - .byte VOL , 100*se_m_faint_attack_mvl/mxv - .byte BENDR , 2 - .byte PAN , c_v+0 - .byte BEND , c_v-5 - .byte N06 , Cn3 , v112 - .byte W01 - .byte BEND , c_v+10 - .byte W01 - .byte c_v+37 - .byte W01 - .byte c_v+55 - .byte W03 - .byte PAN , c_v-9 - .byte BEND , c_v-5 - .byte N06 , Cs3 , v096 - .byte W01 - .byte BEND , c_v+10 - .byte W01 - .byte c_v+37 - .byte W01 - .byte c_v+55 - .byte W03 - .byte PAN , c_v+7 - .byte BEND , c_v-5 - .byte N06 , Dn3 , v080 - .byte W01 - .byte BEND , c_v+10 - .byte W01 - .byte c_v+37 - .byte W01 - .byte c_v+55 - .byte W03 - .byte PAN , c_v-14 - .byte BEND , c_v-5 - .byte N06 , Ds3 , v060 - .byte W01 - .byte BEND , c_v+10 - .byte W01 - .byte c_v+37 - .byte W01 - .byte c_v+55 - .byte W03 - .byte PAN , c_v+14 - .byte BEND , c_v-5 - .byte N06 , En3 , v040 - .byte W01 - .byte BEND , c_v+10 - .byte W01 - .byte c_v+37 - .byte W01 - .byte c_v+55 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_faint_attack: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_faint_attack_pri @ Priority - .byte se_m_faint_attack_rev @ Reverb. - - .word se_m_faint_attack_grp - - .word se_m_faint_attack_1 - - .end diff --git a/sound/songs/se_m_flame_wheel.s b/sound/songs/se_m_flame_wheel.s deleted file mode 100644 index 797073466..000000000 --- a/sound/songs/se_m_flame_wheel.s +++ /dev/null @@ -1,124 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_flame_wheel_grp, voicegroup128 - .equ se_m_flame_wheel_pri, 4 - .equ se_m_flame_wheel_rev, reverb_set+50 - .equ se_m_flame_wheel_mvl, 127 - .equ se_m_flame_wheel_key, 0 - .equ se_m_flame_wheel_tbs, 1 - .equ se_m_flame_wheel_exg, 0 - .equ se_m_flame_wheel_cmp, 1 - - .section .rodata - .global se_m_flame_wheel - .align 2 - -@********************** Track 1 **********************@ - -se_m_flame_wheel_1: - .byte KEYSH , se_m_flame_wheel_key+0 - .byte TEMPO , 150*se_m_flame_wheel_tbs/2 - .byte VOICE , 29 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 22*se_m_flame_wheel_mvl/mxv - .byte BEND , c_v+0 - .byte N30 , Dn4 , v127 - .byte W01 - .byte VOL , 49*se_m_flame_wheel_mvl/mxv - .byte W01 - .byte 71*se_m_flame_wheel_mvl/mxv - .byte W01 - .byte 95*se_m_flame_wheel_mvl/mxv - .byte BEND , c_v+8 - .byte W01 - .byte VOL , 110*se_m_flame_wheel_mvl/mxv - .byte W02 - .byte PAN , c_v+5 - .byte BEND , c_v+16 - .byte W01 - .byte VOL , 95*se_m_flame_wheel_mvl/mxv - .byte W02 - .byte 88*se_m_flame_wheel_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+7 - .byte W01 - .byte VOL , 93*se_m_flame_wheel_mvl/mxv - .byte W02 - .byte 110*se_m_flame_wheel_mvl/mxv - .byte PAN , c_v-5 - .byte BEND , c_v+0 - .byte W02 - .byte VOL , 86*se_m_flame_wheel_mvl/mxv - .byte W01 - .byte PAN , c_v+0 - .byte BEND , c_v-9 - .byte W01 - .byte VOL , 63*se_m_flame_wheel_mvl/mxv - .byte W02 - .byte 37*se_m_flame_wheel_mvl/mxv - .byte BEND , c_v-24 - .byte W03 - .byte VOL , 13*se_m_flame_wheel_mvl/mxv - .byte BEND , c_v-46 - .byte W03 - .byte W03 - .byte W03 - .byte W03 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_flame_wheel_2: - .byte KEYSH , se_m_flame_wheel_key+0 - .byte VOICE , 27 - .byte PAN , c_v+0 - .byte VOL , 22*se_m_flame_wheel_mvl/mxv - .byte N30 , Gn2 , v032 - .byte W01 - .byte VOL , 49*se_m_flame_wheel_mvl/mxv - .byte W01 - .byte 71*se_m_flame_wheel_mvl/mxv - .byte W01 - .byte 95*se_m_flame_wheel_mvl/mxv - .byte W01 - .byte 110*se_m_flame_wheel_mvl/mxv - .byte W02 - .byte W01 - .byte 95*se_m_flame_wheel_mvl/mxv - .byte W02 - .byte 88*se_m_flame_wheel_mvl/mxv - .byte W01 - .byte 93*se_m_flame_wheel_mvl/mxv - .byte W02 - .byte 110*se_m_flame_wheel_mvl/mxv - .byte W02 - .byte 86*se_m_flame_wheel_mvl/mxv - .byte W01 - .byte W01 - .byte 63*se_m_flame_wheel_mvl/mxv - .byte W02 - .byte 37*se_m_flame_wheel_mvl/mxv - .byte W03 - .byte 13*se_m_flame_wheel_mvl/mxv - .byte W03 - .byte W03 - .byte W03 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_flame_wheel: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_flame_wheel_pri @ Priority - .byte se_m_flame_wheel_rev @ Reverb. - - .word se_m_flame_wheel_grp - - .word se_m_flame_wheel_1 - .word se_m_flame_wheel_2 - - .end diff --git a/sound/songs/se_m_flame_wheel2.s b/sound/songs/se_m_flame_wheel2.s deleted file mode 100644 index 21f911b0b..000000000 --- a/sound/songs/se_m_flame_wheel2.s +++ /dev/null @@ -1,99 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_flame_wheel2_grp, voicegroup128 - .equ se_m_flame_wheel2_pri, 4 - .equ se_m_flame_wheel2_rev, reverb_set+50 - .equ se_m_flame_wheel2_mvl, 127 - .equ se_m_flame_wheel2_key, 0 - .equ se_m_flame_wheel2_tbs, 1 - .equ se_m_flame_wheel2_exg, 0 - .equ se_m_flame_wheel2_cmp, 1 - - .section .rodata - .global se_m_flame_wheel2 - .align 2 - -@********************** Track 1 **********************@ - -se_m_flame_wheel2_1: - .byte KEYSH , se_m_flame_wheel2_key+0 - .byte TEMPO , 150*se_m_flame_wheel2_tbs/2 - .byte VOICE , 29 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 110*se_m_flame_wheel2_mvl/mxv - .byte BEND , c_v+0 - .byte N48 , Cn4 , v127 - .byte W06 - .byte PAN , c_v+4 - .byte W03 - .byte BEND , c_v+2 - .byte W03 - .byte PAN , c_v+10 - .byte W03 - .byte BEND , c_v+5 - .byte W03 - .byte VOL , 98*se_m_flame_wheel2_mvl/mxv - .byte PAN , c_v+4 - .byte W03 - .byte BEND , c_v+3 - .byte W03 - .byte VOL , 88*se_m_flame_wheel2_mvl/mxv - .byte PAN , c_v+0 - .byte W03 - .byte BEND , c_v-5 - .byte W03 - .byte VOL , 68*se_m_flame_wheel2_mvl/mxv - .byte PAN , c_v-5 - .byte W03 - .byte c_v+7 - .byte BEND , c_v-9 - .byte W03 - .byte VOL , 44*se_m_flame_wheel2_mvl/mxv - .byte PAN , c_v+0 - .byte W03 - .byte BEND , c_v-15 - .byte W03 - .byte VOL , 13*se_m_flame_wheel2_mvl/mxv - .byte BEND , c_v-24 - .byte W03 - .byte c_v-40 - .byte W03 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_flame_wheel2_2: - .byte KEYSH , se_m_flame_wheel2_key+0 - .byte VOICE , 27 - .byte PAN , c_v+0 - .byte VOL , 110*se_m_flame_wheel2_mvl/mxv - .byte N48 , Gn2 , v032 - .byte W18 - .byte VOL , 98*se_m_flame_wheel2_mvl/mxv - .byte W06 - .byte 88*se_m_flame_wheel2_mvl/mxv - .byte W06 - .byte 68*se_m_flame_wheel2_mvl/mxv - .byte W06 - .byte 44*se_m_flame_wheel2_mvl/mxv - .byte W06 - .byte 13*se_m_flame_wheel2_mvl/mxv - .byte W06 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_flame_wheel2: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_flame_wheel2_pri @ Priority - .byte se_m_flame_wheel2_rev @ Reverb. - - .word se_m_flame_wheel2_grp - - .word se_m_flame_wheel2_1 - .word se_m_flame_wheel2_2 - - .end diff --git a/sound/songs/se_m_flamethrower.s b/sound/songs/se_m_flamethrower.s deleted file mode 100644 index 29438337f..000000000 --- a/sound/songs/se_m_flamethrower.s +++ /dev/null @@ -1,175 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_flamethrower_grp, voicegroup128 - .equ se_m_flamethrower_pri, 4 - .equ se_m_flamethrower_rev, reverb_set+50 - .equ se_m_flamethrower_mvl, 127 - .equ se_m_flamethrower_key, 0 - .equ se_m_flamethrower_tbs, 1 - .equ se_m_flamethrower_exg, 0 - .equ se_m_flamethrower_cmp, 1 - - .section .rodata - .global se_m_flamethrower - .align 2 - -@********************** Track 1 **********************@ - -se_m_flamethrower_1: - .byte KEYSH , se_m_flamethrower_key+0 - .byte TEMPO , 150*se_m_flamethrower_tbs/2 - .byte VOICE , 29 - .byte BENDR , 12 - .byte VOL , 110*se_m_flamethrower_mvl/mxv - .byte PAN , c_v+4 - .byte BEND , c_v+50 - .byte TIE , Cn3 , v127 - .byte W01 - .byte BEND , c_v+32 - .byte W02 - .byte PAN , c_v-5 - .byte BEND , c_v+16 - .byte W02 - .byte c_v-8 - .byte W02 - .byte PAN , c_v+8 - .byte BEND , c_v-15 - .byte W02 - .byte c_v-10 - .byte W01 - .byte PAN , c_v-9 - .byte W02 - .byte BEND , c_v+0 - .byte W02 - .byte PAN , c_v+4 - .byte BEND , c_v+2 - .byte W04 - .byte PAN , c_v-5 - .byte BEND , c_v+10 - .byte W03 - .byte PAN , c_v+0 - .byte BEND , c_v+16 - .byte W03 - .byte PAN , c_v+4 - .byte W01 - .byte BEND , c_v+21 - .byte W02 - .byte PAN , c_v-5 - .byte W04 - .byte c_v+8 - .byte W03 - .byte c_v-9 - .byte W04 - .byte c_v+4 - .byte W04 - .byte c_v-5 - .byte W03 - .byte c_v+0 - .byte W03 -se_m_flamethrower_1_000: - .byte PAN , c_v+4 - .byte W03 - .byte c_v-5 - .byte W04 - .byte c_v+8 - .byte W03 - .byte c_v-9 - .byte W04 - .byte c_v+4 - .byte W04 - .byte c_v-5 - .byte W03 - .byte c_v+0 - .byte W03 - .byte PEND - .byte PATT - .word se_m_flamethrower_1_000 - .byte PATT - .word se_m_flamethrower_1_000 - .byte PATT - .word se_m_flamethrower_1_000 - .byte PAN , c_v+4 - .byte W03 - .byte c_v-5 - .byte W03 - .byte VOL , 103*se_m_flamethrower_mvl/mxv - .byte W01 - .byte PAN , c_v+8 - .byte W03 - .byte VOL , 96*se_m_flamethrower_mvl/mxv - .byte PAN , c_v-9 - .byte W04 - .byte c_v+4 - .byte W02 - .byte VOL , 88*se_m_flamethrower_mvl/mxv - .byte W02 - .byte PAN , c_v-5 - .byte W03 - .byte c_v+0 - .byte W01 - .byte VOL , 73*se_m_flamethrower_mvl/mxv - .byte W02 - .byte PAN , c_v+4 - .byte W03 - .byte VOL , 62*se_m_flamethrower_mvl/mxv - .byte PAN , c_v-5 - .byte W04 - .byte c_v+8 - .byte W01 - .byte VOL , 47*se_m_flamethrower_mvl/mxv - .byte W02 - .byte PAN , c_v-9 - .byte W03 - .byte VOL , 27*se_m_flamethrower_mvl/mxv - .byte W01 - .byte PAN , c_v+4 - .byte W04 - .byte VOL , 10*se_m_flamethrower_mvl/mxv - .byte PAN , c_v-5 - .byte W03 - .byte c_v+0 - .byte W03 - .byte EOT , Cn3 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_flamethrower_2: - .byte KEYSH , se_m_flamethrower_key+0 - .byte VOICE , 27 - .byte PAN , c_v+0 - .byte VOL , 110*se_m_flamethrower_mvl/mxv - .byte N24 , Fn2 , v060 - .byte W10 - .byte VOL , 99*se_m_flamethrower_mvl/mxv - .byte W05 - .byte 82*se_m_flamethrower_mvl/mxv - .byte W04 - .byte 54*se_m_flamethrower_mvl/mxv - .byte W02 - .byte 25*se_m_flamethrower_mvl/mxv - .byte W03 - .byte W24 - .byte W24 - .byte W24 - .byte W24 - .byte W24 - .byte W24 - .byte W24 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_flamethrower: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_flamethrower_pri @ Priority - .byte se_m_flamethrower_rev @ Reverb. - - .word se_m_flamethrower_grp - - .word se_m_flamethrower_1 - .word se_m_flamethrower_2 - - .end diff --git a/sound/songs/se_m_flatter.s b/sound/songs/se_m_flatter.s deleted file mode 100644 index e3746c990..000000000 --- a/sound/songs/se_m_flatter.s +++ /dev/null @@ -1,67 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_flatter_grp, voicegroup128 - .equ se_m_flatter_pri, 4 - .equ se_m_flatter_rev, reverb_set+50 - .equ se_m_flatter_mvl, 127 - .equ se_m_flatter_key, 0 - .equ se_m_flatter_tbs, 1 - .equ se_m_flatter_exg, 0 - .equ se_m_flatter_cmp, 1 - - .section .rodata - .global se_m_flatter - .align 2 - -@********************** Track 1 **********************@ - -se_m_flatter_1: - .byte KEYSH , se_m_flatter_key+0 - .byte TEMPO , 150*se_m_flatter_tbs/2 - .byte VOICE , 41 - .byte VOL , 100*se_m_flatter_mvl/mxv - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N01 , Dn5 , v127 - .byte W01 - .byte Gn4 - .byte W01 - .byte N09 , En5 - .byte W02 - .byte PAN , c_v+6 - .byte W02 - .byte VOL , 92*se_m_flatter_mvl/mxv - .byte PAN , c_v-8 - .byte W01 - .byte VOL , 83*se_m_flatter_mvl/mxv - .byte PAN , c_v+6 - .byte W01 - .byte VOL , 71*se_m_flatter_mvl/mxv - .byte PAN , c_v-8 - .byte BEND , c_v-4 - .byte W01 - .byte VOL , 46*se_m_flatter_mvl/mxv - .byte PAN , c_v+11 - .byte BEND , c_v-8 - .byte W01 - .byte VOL , 22*se_m_flatter_mvl/mxv - .byte PAN , c_v-12 - .byte BEND , c_v-15 - .byte W02 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_flatter: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_flatter_pri @ Priority - .byte se_m_flatter_rev @ Reverb. - - .word se_m_flatter_grp - - .word se_m_flatter_1 - - .end diff --git a/sound/songs/se_m_giga_drain.s b/sound/songs/se_m_giga_drain.s deleted file mode 100644 index 4596a0252..000000000 --- a/sound/songs/se_m_giga_drain.s +++ /dev/null @@ -1,81 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_giga_drain_grp, voicegroup128 - .equ se_m_giga_drain_pri, 4 - .equ se_m_giga_drain_rev, reverb_set+50 - .equ se_m_giga_drain_mvl, 127 - .equ se_m_giga_drain_key, 0 - .equ se_m_giga_drain_tbs, 1 - .equ se_m_giga_drain_exg, 0 - .equ se_m_giga_drain_cmp, 1 - - .section .rodata - .global se_m_giga_drain - .align 2 - -@********************** Track 1 **********************@ - -se_m_giga_drain_1: - .byte KEYSH , se_m_giga_drain_key+0 - .byte TEMPO , 150*se_m_giga_drain_tbs/2 - .byte VOICE , 36 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 110*se_m_giga_drain_mvl/mxv - .byte BEND , c_v+0 - .byte N03 , Gn2 , v127 - .byte W02 - .byte PAN , c_v+3 - .byte BEND , c_v+2 - .byte W01 - .byte VOICE , 23 - .byte N02 , Cn3 , v104 - .byte W01 - .byte PAN , c_v-3 - .byte BEND , c_v+5 - .byte W02 - .byte VOICE , 36 - .byte N02 , Cn2 , v127 - .byte W01 - .byte PAN , c_v+7 - .byte W01 - .byte VOICE , 23 - .byte BEND , c_v+4 - .byte N06 , Cn3 , v104 - .byte W01 - .byte PAN , c_v-6 - .byte BEND , c_v+0 - .byte W01 - .byte c_v-5 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v-12 - .byte W01 - .byte c_v-23 - .byte W01 - .byte VOICE , 36 - .byte BEND , c_v+0 - .byte N03 , An2 , v100 - .byte W04 - .byte PAN , c_v+5 - .byte N03 , Bn2 , v076 - .byte W03 - .byte PAN , c_v-6 - .byte N02 , Cs3 , v040 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_giga_drain: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_giga_drain_pri @ Priority - .byte se_m_giga_drain_rev @ Reverb. - - .word se_m_giga_drain_grp - - .word se_m_giga_drain_1 - - .end diff --git a/sound/songs/se_m_grasswhistle.s b/sound/songs/se_m_grasswhistle.s deleted file mode 100644 index 111bc2166..000000000 --- a/sound/songs/se_m_grasswhistle.s +++ /dev/null @@ -1,130 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_grasswhistle_grp, voicegroup128 - .equ se_m_grasswhistle_pri, 4 - .equ se_m_grasswhistle_rev, reverb_set+50 - .equ se_m_grasswhistle_mvl, 127 - .equ se_m_grasswhistle_key, 0 - .equ se_m_grasswhistle_tbs, 1 - .equ se_m_grasswhistle_exg, 0 - .equ se_m_grasswhistle_cmp, 1 - - .section .rodata - .global se_m_grasswhistle - .align 2 - -@********************** Track 1 **********************@ - -se_m_grasswhistle_1: - .byte KEYSH , se_m_grasswhistle_key+0 - .byte TEMPO , 100*se_m_grasswhistle_tbs/2 - .byte VOICE , 64 - .byte BENDR , 2 - .byte LFOS , 40 - .byte PAN , c_v+0 - .byte VOL , 70*se_m_grasswhistle_mvl/mxv - .byte BEND , c_v-16 - .byte N21 , Gn5 , v112 - .byte W03 - .byte BEND , c_v-8 - .byte W03 - .byte c_v+0 - .byte W03 - .byte MOD , 10 - .byte W03 - .byte W09 - .byte 0 - .byte W03 - .byte N09 , An5 - .byte W12 - .byte En5 - .byte W12 - .byte BEND , c_v-14 - .byte N66 , Gn5 - .byte W06 - .byte BEND , c_v-8 - .byte W06 - .byte c_v-4 - .byte W06 - .byte c_v+0 - .byte W06 - .byte MOD , 10 - .byte W12 - .byte W12 - .byte W06 - .byte VOL , 61*se_m_grasswhistle_mvl/mxv - .byte W06 - .byte 51*se_m_grasswhistle_mvl/mxv - .byte W06 - .byte 36*se_m_grasswhistle_mvl/mxv - .byte W06 - .byte 18*se_m_grasswhistle_mvl/mxv - .byte W12 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_grasswhistle_2: - .byte KEYSH , se_m_grasswhistle_key+0 - .byte VOICE , 64 - .byte BENDR , 2 - .byte LFOS , 40 - .byte VOL , 70*se_m_grasswhistle_mvl/mxv - .byte W12 - .byte PAN , c_v+12 - .byte BEND , c_v-16 - .byte N21 , Gn5 , v072 - .byte W03 - .byte BEND , c_v-8 - .byte W03 - .byte c_v+0 - .byte W03 - .byte MOD , 10 - .byte W03 - .byte W09 - .byte 0 - .byte W03 - .byte PAN , c_v-12 - .byte N09 , An5 - .byte W12 - .byte PAN , c_v+14 - .byte N09 , En5 - .byte W12 - .byte PAN , c_v-15 - .byte BEND , c_v-14 - .byte N66 , Gn5 - .byte W06 - .byte BEND , c_v-8 - .byte W06 - .byte c_v-4 - .byte W06 - .byte c_v+0 - .byte W06 - .byte MOD , 10 - .byte W12 - .byte W06 - .byte VOL , 61*se_m_grasswhistle_mvl/mxv - .byte W06 - .byte 51*se_m_grasswhistle_mvl/mxv - .byte W06 - .byte 36*se_m_grasswhistle_mvl/mxv - .byte W06 - .byte 18*se_m_grasswhistle_mvl/mxv - .byte W12 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_grasswhistle: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_grasswhistle_pri @ Priority - .byte se_m_grasswhistle_rev @ Reverb. - - .word se_m_grasswhistle_grp - - .word se_m_grasswhistle_1 - .word se_m_grasswhistle_2 - - .end diff --git a/sound/songs/se_m_hail.s b/sound/songs/se_m_hail.s deleted file mode 100644 index 0c04af212..000000000 --- a/sound/songs/se_m_hail.s +++ /dev/null @@ -1,98 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_hail_grp, voicegroup128 - .equ se_m_hail_pri, 4 - .equ se_m_hail_rev, reverb_set+50 - .equ se_m_hail_mvl, 127 - .equ se_m_hail_key, 0 - .equ se_m_hail_tbs, 1 - .equ se_m_hail_exg, 0 - .equ se_m_hail_cmp, 1 - - .section .rodata - .global se_m_hail - .align 2 - -@********************** Track 1 **********************@ - -se_m_hail_1: - .byte KEYSH , se_m_hail_key+0 - .byte TEMPO , 150*se_m_hail_tbs/2 - .byte VOICE , 3 - .byte VOL , 100*se_m_hail_mvl/mxv - .byte PAN , c_v+0 - .byte N01 , Fn4 , v112 - .byte W04 - .byte PAN , c_v+6 - .byte N02 , Ds5 , v040 - .byte W02 - .byte W02 - .byte PAN , c_v-5 - .byte N01 , Gn4 , v112 - .byte W01 - .byte PAN , c_v+0 - .byte N01 , Ds5 - .byte W03 - .byte W01 - .byte PAN , c_v+6 - .byte N02 , Ds5 , v020 - .byte W03 - .byte PAN , c_v-5 - .byte N01 , Gn4 , v064 - .byte W02 - .byte PAN , c_v+0 - .byte N01 , Ds5 - .byte W03 - .byte PAN , c_v+11 - .byte N02 , Ds5 , v020 - .byte W03 - .byte W01 - .byte PAN , c_v-13 - .byte N01 , Gn4 , v064 - .byte W01 - .byte PAN , c_v+0 - .byte N01 , Ds5 - .byte W04 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_hail_2: - .byte KEYSH , se_m_hail_key+0 - .byte VOICE , 4 - .byte VOL , 100*se_m_hail_mvl/mxv - .byte PAN , c_v+0 - .byte N01 , Dn4 , v040 - .byte W04 - .byte Bn3 - .byte W02 - .byte W03 - .byte Dn4 - .byte W03 - .byte W01 - .byte Bn3 , v032 - .byte W05 - .byte Dn4 - .byte W03 - .byte Bn3 , v012 - .byte W03 - .byte W02 - .byte Dn4 - .byte W04 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_hail: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_hail_pri @ Priority - .byte se_m_hail_rev @ Reverb. - - .word se_m_hail_grp - - .word se_m_hail_1 - .word se_m_hail_2 - - .end diff --git a/sound/songs/se_m_harden.s b/sound/songs/se_m_harden.s deleted file mode 100644 index e9bd888de..000000000 --- a/sound/songs/se_m_harden.s +++ /dev/null @@ -1,74 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_harden_grp, voicegroup128 - .equ se_m_harden_pri, 4 - .equ se_m_harden_rev, reverb_set+50 - .equ se_m_harden_mvl, 127 - .equ se_m_harden_key, 0 - .equ se_m_harden_tbs, 1 - .equ se_m_harden_exg, 0 - .equ se_m_harden_cmp, 1 - - .section .rodata - .global se_m_harden - .align 2 - -@********************** Track 1 **********************@ - -se_m_harden_1: - .byte KEYSH , se_m_harden_key+0 - .byte TEMPO , 150*se_m_harden_tbs/2 - .byte VOICE , 28 - .byte VOL , 100*se_m_harden_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+16 - .byte N03 , Gs3 , v080 - .byte W01 - .byte BEND , c_v+38 - .byte W01 - .byte c_v+62 - .byte W02 - .byte N17 , Gs4 , v096 - .byte W03 - .byte PAN , c_v+6 - .byte W02 - .byte c_v+0 - .byte W03 - .byte c_v-8 - .byte W02 - .byte c_v+0 - .byte W02 - .byte c_v+6 - .byte W03 - .byte c_v+0 - .byte W05 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_harden_2: - .byte KEYSH , se_m_harden_key+0 - .byte VOICE , 4 - .byte VOL , 100*se_m_harden_mvl/mxv - .byte PAN , c_v+0 - .byte N01 , En4 , v060 - .byte W04 - .byte N17 , Gs4 , v096 - .byte W20 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_harden: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_harden_pri @ Priority - .byte se_m_harden_rev @ Reverb. - - .word se_m_harden_grp - - .word se_m_harden_1 - .word se_m_harden_2 - - .end diff --git a/sound/songs/se_m_haze.s b/sound/songs/se_m_haze.s deleted file mode 100644 index 4bf61faa6..000000000 --- a/sound/songs/se_m_haze.s +++ /dev/null @@ -1,250 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_haze_grp, voicegroup128 - .equ se_m_haze_pri, 4 - .equ se_m_haze_rev, reverb_set+50 - .equ se_m_haze_mvl, 127 - .equ se_m_haze_key, 0 - .equ se_m_haze_tbs, 1 - .equ se_m_haze_exg, 0 - .equ se_m_haze_cmp, 1 - - .section .rodata - .global se_m_haze - .align 2 - -@********************** Track 1 **********************@ - -se_m_haze_1: - .byte KEYSH , se_m_haze_key+0 - .byte TEMPO , 190*se_m_haze_tbs/2 - .byte VOICE , 45 - .byte BENDR , 8 - .byte PAN , c_v-47 - .byte VOL , 10*se_m_haze_mvl/mxv - .byte MOD , 30 - .byte BEND , c_v+1 - .byte TIE , As2 , v100 - .byte W03 - .byte VOL , 14*se_m_haze_mvl/mxv - .byte W03 - .byte 22*se_m_haze_mvl/mxv - .byte PAN , c_v-45 - .byte W02 - .byte VOL , 31*se_m_haze_mvl/mxv - .byte W02 - .byte 39*se_m_haze_mvl/mxv - .byte W02 - .byte PAN , c_v-43 - .byte W02 - .byte VOL , 45*se_m_haze_mvl/mxv - .byte W02 - .byte 50*se_m_haze_mvl/mxv - .byte W02 - .byte PAN , c_v-41 - .byte W01 - .byte VOL , 61*se_m_haze_mvl/mxv - .byte W02 - .byte 66*se_m_haze_mvl/mxv - .byte W03 - .byte PAN , c_v-39 - .byte VOL , 73*se_m_haze_mvl/mxv - .byte W02 - .byte 78*se_m_haze_mvl/mxv - .byte W04 - .byte 84*se_m_haze_mvl/mxv - .byte PAN , c_v-37 - .byte W03 - .byte VOL , 91*se_m_haze_mvl/mxv - .byte W03 - .byte 98*se_m_haze_mvl/mxv - .byte PAN , c_v-35 - .byte W02 - .byte VOL , 104*se_m_haze_mvl/mxv - .byte W04 - .byte 110*se_m_haze_mvl/mxv - .byte PAN , c_v-32 - .byte W06 - .byte c_v-28 - .byte W06 - .byte c_v-25 - .byte VOL , 106*se_m_haze_mvl/mxv - .byte W04 - .byte 104*se_m_haze_mvl/mxv - .byte W02 - .byte PAN , c_v-23 - .byte W03 - .byte VOL , 101*se_m_haze_mvl/mxv - .byte W03 - .byte PAN , c_v-20 - .byte W03 - .byte VOL , 97*se_m_haze_mvl/mxv - .byte W03 - .byte PAN , c_v-17 - .byte W02 - .byte VOL , 91*se_m_haze_mvl/mxv - .byte W04 - .byte PAN , c_v-13 - .byte W03 - .byte VOL , 88*se_m_haze_mvl/mxv - .byte W03 - .byte PAN , c_v-10 - .byte W03 - .byte VOL , 81*se_m_haze_mvl/mxv - .byte W03 - .byte PAN , c_v-7 - .byte W04 - .byte VOL , 75*se_m_haze_mvl/mxv - .byte W02 - .byte PAN , c_v-3 - .byte W02 - .byte VOL , 74*se_m_haze_mvl/mxv - .byte W02 - .byte 76*se_m_haze_mvl/mxv - .byte W02 - .byte PAN , c_v+0 - .byte W01 - .byte VOL , 79*se_m_haze_mvl/mxv - .byte W02 - .byte 83*se_m_haze_mvl/mxv - .byte W03 - .byte W01 - .byte 86*se_m_haze_mvl/mxv - .byte W02 - .byte PAN , c_v+2 - .byte VOL , 90*se_m_haze_mvl/mxv - .byte W03 - .byte 95*se_m_haze_mvl/mxv - .byte W03 - .byte 98*se_m_haze_mvl/mxv - .byte W03 - .byte PAN , c_v+7 - .byte VOL , 102*se_m_haze_mvl/mxv - .byte W02 - .byte 104*se_m_haze_mvl/mxv - .byte W04 - .byte PAN , c_v+10 - .byte VOL , 110*se_m_haze_mvl/mxv - .byte W06 - .byte PAN , c_v+14 - .byte W06 - .byte c_v+16 - .byte W02 - .byte VOL , 106*se_m_haze_mvl/mxv - .byte W04 - .byte PAN , c_v+19 - .byte W01 - .byte VOL , 100*se_m_haze_mvl/mxv - .byte W05 - .byte PAN , c_v+22 - .byte VOL , 94*se_m_haze_mvl/mxv - .byte W06 - .byte PAN , c_v+25 - .byte VOL , 88*se_m_haze_mvl/mxv - .byte W04 - .byte 83*se_m_haze_mvl/mxv - .byte W02 - .byte PAN , c_v+27 - .byte W06 - .byte c_v+29 - .byte VOL , 75*se_m_haze_mvl/mxv - .byte W06 - .byte PAN , c_v+32 - .byte VOL , 64*se_m_haze_mvl/mxv - .byte W06 - .byte PAN , c_v+34 - .byte W01 - .byte VOL , 55*se_m_haze_mvl/mxv - .byte W05 - .byte PAN , c_v+38 - .byte W01 - .byte VOL , 47*se_m_haze_mvl/mxv - .byte W05 - .byte PAN , c_v+41 - .byte W01 - .byte VOL , 41*se_m_haze_mvl/mxv - .byte W05 - .byte PAN , c_v+44 - .byte VOL , 32*se_m_haze_mvl/mxv - .byte W03 - .byte 25*se_m_haze_mvl/mxv - .byte W03 - .byte PAN , c_v+47 - .byte W01 - .byte VOL , 12*se_m_haze_mvl/mxv - .byte W03 - .byte 6*se_m_haze_mvl/mxv - .byte W02 - .byte EOT - .byte FINE - -@********************** Track 2 **********************@ - -se_m_haze_2: - .byte KEYSH , se_m_haze_key+0 - .byte VOICE , 70 - .byte BENDR , 8 - .byte PAN , c_v+0 - .byte VOL , 110*se_m_haze_mvl/mxv - .byte BEND , c_v+0 - .byte N24 , Fn4 , v020 - .byte W06 - .byte W06 - .byte W06 - .byte W06 - .byte Fs4 - .byte W06 - .byte W06 - .byte W06 - .byte W06 - .byte Gn4 - .byte W06 - .byte W06 - .byte W06 - .byte W06 - .byte Gs4 - .byte W06 - .byte W06 - .byte W06 - .byte W06 - .byte Gn4 - .byte W06 - .byte W06 - .byte W06 - .byte W06 - .byte Fs4 - .byte W06 - .byte W06 - .byte W06 - .byte W06 - .byte Fn4 - .byte W06 - .byte W06 - .byte W06 - .byte W06 - .byte En4 - .byte W06 - .byte W06 - .byte W06 - .byte W06 - .byte N18 , Ds4 - .byte W06 - .byte W06 - .byte W06 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_haze: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_haze_pri @ Priority - .byte se_m_haze_rev @ Reverb. - - .word se_m_haze_grp - - .word se_m_haze_1 - .word se_m_haze_2 - - .end diff --git a/sound/songs/se_m_heal_bell.s b/sound/songs/se_m_heal_bell.s deleted file mode 100644 index b2b17f7d8..000000000 --- a/sound/songs/se_m_heal_bell.s +++ /dev/null @@ -1,83 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_heal_bell_grp, voicegroup128 - .equ se_m_heal_bell_pri, 4 - .equ se_m_heal_bell_rev, reverb_set+50 - .equ se_m_heal_bell_mvl, 127 - .equ se_m_heal_bell_key, 0 - .equ se_m_heal_bell_tbs, 1 - .equ se_m_heal_bell_exg, 0 - .equ se_m_heal_bell_cmp, 1 - - .section .rodata - .global se_m_heal_bell - .align 2 - -@********************** Track 1 **********************@ - -se_m_heal_bell_1: - .byte KEYSH , se_m_heal_bell_key+0 - .byte TEMPO , 150*se_m_heal_bell_tbs/2 - .byte VOICE , 51 - .byte BENDR , 2 - .byte PAN , c_v+0 - .byte VOL , 90*se_m_heal_bell_mvl/mxv - .byte BEND , c_v+4 - .byte N03 , As5 , v100 - .byte W01 - .byte PAN , c_v-13 - .byte W01 - .byte c_v+11 - .byte W01 - .byte c_v+1 - .byte N01 , An5 - .byte W01 - .byte MOD , 7 - .byte N18 , Bn5 - .byte W02 - .byte PAN , c_v+11 - .byte W01 - .byte MOD , 0 - .byte PAN , c_v-14 - .byte W01 - .byte c_v+11 - .byte W01 - .byte c_v-13 - .byte W01 - .byte c_v+11 - .byte W02 - .byte c_v-14 - .byte W01 - .byte c_v+11 - .byte W01 - .byte c_v-13 - .byte W01 - .byte c_v+11 - .byte W01 - .byte MOD , 7 - .byte PAN , c_v-14 - .byte W02 - .byte c_v+11 - .byte W01 - .byte c_v-14 - .byte W01 - .byte c_v+11 - .byte W01 - .byte c_v-13 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_heal_bell: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_heal_bell_pri @ Priority - .byte se_m_heal_bell_rev @ Reverb. - - .word se_m_heal_bell_grp - - .word se_m_heal_bell_1 - - .end diff --git a/sound/songs/se_m_heat_wave.s b/sound/songs/se_m_heat_wave.s deleted file mode 100644 index a4b5cc896..000000000 --- a/sound/songs/se_m_heat_wave.s +++ /dev/null @@ -1,206 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_heat_wave_grp, voicegroup128 - .equ se_m_heat_wave_pri, 4 - .equ se_m_heat_wave_rev, reverb_set+50 - .equ se_m_heat_wave_mvl, 127 - .equ se_m_heat_wave_key, 0 - .equ se_m_heat_wave_tbs, 1 - .equ se_m_heat_wave_exg, 0 - .equ se_m_heat_wave_cmp, 1 - - .section .rodata - .global se_m_heat_wave - .align 2 - -@********************** Track 1 **********************@ - -se_m_heat_wave_1: - .byte KEYSH , se_m_heat_wave_key+0 - .byte TEMPO , 150*se_m_heat_wave_tbs/2 - .byte VOICE , 29 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 23*se_m_heat_wave_mvl/mxv - .byte BEND , c_v+0 - .byte TIE , Fn4 , v127 - .byte W01 - .byte VOL , 51*se_m_heat_wave_mvl/mxv - .byte W01 - .byte 75*se_m_heat_wave_mvl/mxv - .byte W01 - .byte 99*se_m_heat_wave_mvl/mxv - .byte BEND , c_v+8 - .byte W01 - .byte VOL , 115*se_m_heat_wave_mvl/mxv - .byte W02 - .byte PAN , c_v+6 - .byte BEND , c_v+16 - .byte W01 - .byte VOL , 99*se_m_heat_wave_mvl/mxv - .byte W02 - .byte 92*se_m_heat_wave_mvl/mxv - .byte BEND , c_v+7 - .byte W01 - .byte VOL , 97*se_m_heat_wave_mvl/mxv - .byte W02 - .byte 105*se_m_heat_wave_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte W03 - .byte VOL , 110*se_m_heat_wave_mvl/mxv - .byte BEND , c_v-9 - .byte W03 - .byte PAN , c_v-8 - .byte BEND , c_v-24 - .byte W03 - .byte VOL , 115*se_m_heat_wave_mvl/mxv - .byte BEND , c_v-38 - .byte W03 - .byte PAN , c_v+0 - .byte BEND , c_v-41 - .byte W04 - .byte c_v-45 - .byte W02 - .byte PAN , c_v+6 - .byte W02 - .byte BEND , c_v-39 - .byte W04 - .byte PAN , c_v+0 - .byte W03 - .byte BEND , c_v-35 - .byte W03 - .byte PAN , c_v-8 - .byte W03 - .byte BEND , c_v-30 - .byte W03 - .byte PAN , c_v+0 - .byte W03 - .byte BEND , c_v-26 - .byte W03 - .byte PAN , c_v+6 - .byte W01 - .byte BEND , c_v-22 - .byte W05 - .byte PAN , c_v+0 - .byte BEND , c_v-18 - .byte W04 - .byte c_v-13 - .byte W02 - .byte PAN , c_v-8 - .byte W06 - .byte c_v+0 - .byte W06 - .byte c_v+6 - .byte W03 - .byte BEND , c_v-7 - .byte W03 - .byte PAN , c_v+0 - .byte W04 - .byte BEND , c_v-3 - .byte W02 - .byte PAN , c_v-8 - .byte VOL , 113*se_m_heat_wave_mvl/mxv - .byte W04 - .byte 110*se_m_heat_wave_mvl/mxv - .byte W02 - .byte PAN , c_v+0 - .byte W02 - .byte BEND , c_v-7 - .byte W02 - .byte VOL , 105*se_m_heat_wave_mvl/mxv - .byte W02 - .byte PAN , c_v+6 - .byte W03 - .byte VOL , 98*se_m_heat_wave_mvl/mxv - .byte BEND , c_v-11 - .byte W03 - .byte PAN , c_v+0 - .byte W01 - .byte VOL , 91*se_m_heat_wave_mvl/mxv - .byte W03 - .byte 81*se_m_heat_wave_mvl/mxv - .byte BEND , c_v-15 - .byte W02 - .byte PAN , c_v-8 - .byte W02 - .byte VOL , 74*se_m_heat_wave_mvl/mxv - .byte W01 - .byte BEND , c_v-22 - .byte W03 - .byte PAN , c_v+0 - .byte VOL , 63*se_m_heat_wave_mvl/mxv - .byte W01 - .byte BEND , c_v-30 - .byte W01 - .byte VOL , 50*se_m_heat_wave_mvl/mxv - .byte W02 - .byte 40*se_m_heat_wave_mvl/mxv - .byte BEND , c_v-39 - .byte W02 - .byte PAN , c_v+6 - .byte W01 - .byte VOL , 28*se_m_heat_wave_mvl/mxv - .byte BEND , c_v-52 - .byte W02 - .byte VOL , 17*se_m_heat_wave_mvl/mxv - .byte W03 - .byte EOT - .byte FINE - -@********************** Track 2 **********************@ - -se_m_heat_wave_2: - .byte KEYSH , se_m_heat_wave_key+0 - .byte VOICE , 27 - .byte PAN , c_v+0 - .byte VOL , 23*se_m_heat_wave_mvl/mxv - .byte N30 , Gn2 , v032 - .byte W01 - .byte VOL , 51*se_m_heat_wave_mvl/mxv - .byte W01 - .byte 75*se_m_heat_wave_mvl/mxv - .byte W01 - .byte 99*se_m_heat_wave_mvl/mxv - .byte W01 - .byte 115*se_m_heat_wave_mvl/mxv - .byte W03 - .byte 99*se_m_heat_wave_mvl/mxv - .byte W02 - .byte 92*se_m_heat_wave_mvl/mxv - .byte W01 - .byte 97*se_m_heat_wave_mvl/mxv - .byte W02 - .byte 115*se_m_heat_wave_mvl/mxv - .byte W12 - .byte PAN , c_v+0 - .byte W12 - .byte W12 - .byte c_v+0 - .byte W12 - .byte W12 - .byte c_v+0 - .byte W12 - .byte W12 - .byte c_v+0 - .byte W12 - .byte W12 - .byte c_v+0 - .byte W12 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_heat_wave: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_heat_wave_pri @ Priority - .byte se_m_heat_wave_rev @ Reverb. - - .word se_m_heat_wave_grp - - .word se_m_heat_wave_1 - .word se_m_heat_wave_2 - - .end diff --git a/sound/songs/se_m_hydro_pump.s b/sound/songs/se_m_hydro_pump.s deleted file mode 100644 index 050f6281b..000000000 --- a/sound/songs/se_m_hydro_pump.s +++ /dev/null @@ -1,124 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_hydro_pump_grp, voicegroup128 - .equ se_m_hydro_pump_pri, 4 - .equ se_m_hydro_pump_rev, reverb_set+50 - .equ se_m_hydro_pump_mvl, 127 - .equ se_m_hydro_pump_key, 0 - .equ se_m_hydro_pump_tbs, 1 - .equ se_m_hydro_pump_exg, 0 - .equ se_m_hydro_pump_cmp, 1 - - .section .rodata - .global se_m_hydro_pump - .align 2 - -@********************** Track 1 **********************@ - -se_m_hydro_pump_1: - .byte KEYSH , se_m_hydro_pump_key+0 - .byte TEMPO , 150*se_m_hydro_pump_tbs/2 - .byte VOICE , 36 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 115*se_m_hydro_pump_mvl/mxv - .byte BEND , c_v+0 - .byte TIE , Gn2 , v127 - .byte W06 - .byte PAN , c_v-4 - .byte W06 - .byte c_v-10 - .byte W06 - .byte c_v-5 - .byte W06 - .byte c_v+0 - .byte W06 - .byte c_v+4 - .byte W06 - .byte c_v+11 - .byte W06 - .byte c_v+4 - .byte W06 - .byte c_v+0 - .byte W06 - .byte c_v-4 - .byte W06 - .byte c_v-10 - .byte W06 - .byte c_v-5 - .byte W06 - .byte c_v+0 - .byte W06 - .byte c_v+4 - .byte W06 - .byte c_v+11 - .byte W02 - .byte VOL , 103*se_m_hydro_pump_mvl/mxv - .byte W04 - .byte PAN , c_v+4 - .byte W01 - .byte VOL , 85*se_m_hydro_pump_mvl/mxv - .byte W05 - .byte PAN , c_v+0 - .byte W01 - .byte VOL , 71*se_m_hydro_pump_mvl/mxv - .byte W05 - .byte 52*se_m_hydro_pump_mvl/mxv - .byte PAN , c_v-4 - .byte W04 - .byte VOL , 32*se_m_hydro_pump_mvl/mxv - .byte W02 - .byte PAN , c_v-10 - .byte W03 - .byte VOL , 11*se_m_hydro_pump_mvl/mxv - .byte W03 - .byte PAN , c_v-5 - .byte W01 - .byte VOL , 6*se_m_hydro_pump_mvl/mxv - .byte W05 - .byte EOT - .byte FINE - -@********************** Track 2 **********************@ - -se_m_hydro_pump_2: - .byte KEYSH , se_m_hydro_pump_key+0 - .byte VOL , 58*se_m_hydro_pump_mvl/mxv - .byte N14 , Gn3 , v080 - .byte W01 - .byte VOICE , 25 - .byte VOL , 76*se_m_hydro_pump_mvl/mxv - .byte W01 - .byte 89*se_m_hydro_pump_mvl/mxv - .byte W01 - .byte 100*se_m_hydro_pump_mvl/mxv - .byte W01 - .byte 115*se_m_hydro_pump_mvl/mxv - .byte W06 - .byte 90*se_m_hydro_pump_mvl/mxv - .byte W02 - .byte 76*se_m_hydro_pump_mvl/mxv - .byte W01 - .byte 58*se_m_hydro_pump_mvl/mxv - .byte W11 - .byte W24 - .byte W24 - .byte W24 - .byte W24 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_hydro_pump: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_hydro_pump_pri @ Priority - .byte se_m_hydro_pump_rev @ Reverb. - - .word se_m_hydro_pump_grp - - .word se_m_hydro_pump_1 - .word se_m_hydro_pump_2 - - .end diff --git a/sound/songs/se_m_hyper_beam.s b/sound/songs/se_m_hyper_beam.s deleted file mode 100644 index bce85a21a..000000000 --- a/sound/songs/se_m_hyper_beam.s +++ /dev/null @@ -1,84 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_hyper_beam_grp, voicegroup128 - .equ se_m_hyper_beam_pri, 4 - .equ se_m_hyper_beam_rev, reverb_set+50 - .equ se_m_hyper_beam_mvl, 127 - .equ se_m_hyper_beam_key, 0 - .equ se_m_hyper_beam_tbs, 1 - .equ se_m_hyper_beam_exg, 0 - .equ se_m_hyper_beam_cmp, 1 - - .section .rodata - .global se_m_hyper_beam - .align 2 - -@********************** Track 1 **********************@ - -se_m_hyper_beam_1: - .byte KEYSH , se_m_hyper_beam_key+0 - .byte TEMPO , 150*se_m_hyper_beam_tbs/2 - .byte VOICE , 18 - .byte VOL , 110*se_m_hyper_beam_mvl/mxv - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N02 , En3 , v127 - .byte W03 - .byte N01 , As3 - .byte W03 - .byte N02 , Gn3 - .byte W03 - .byte N01 , Cs4 - .byte W03 - .byte PAN , c_v+7 - .byte N02 , En3 , v072 - .byte W03 - .byte N01 , As3 - .byte W03 - .byte PAN , c_v-7 - .byte N02 , Gn3 , v040 - .byte W03 - .byte N01 , Cs4 - .byte W03 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_hyper_beam_2: - .byte KEYSH , se_m_hyper_beam_key+0 - .byte VOICE , 5 - .byte VOL , 110*se_m_hyper_beam_mvl/mxv - .byte N01 , Cn3 , v040 - .byte W02 - .byte N01 - .byte W04 - .byte N01 - .byte W02 - .byte N01 - .byte W04 -se_m_hyper_beam_2_000: - .byte N01 , Cn3 , v020 - .byte W02 - .byte N01 - .byte W04 - .byte PEND - .byte PATT - .word se_m_hyper_beam_2_000 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_hyper_beam: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_hyper_beam_pri @ Priority - .byte se_m_hyper_beam_rev @ Reverb. - - .word se_m_hyper_beam_grp - - .word se_m_hyper_beam_1 - .word se_m_hyper_beam_2 - - .end diff --git a/sound/songs/se_m_hyper_beam2.s b/sound/songs/se_m_hyper_beam2.s deleted file mode 100644 index 304fa7b3f..000000000 --- a/sound/songs/se_m_hyper_beam2.s +++ /dev/null @@ -1,115 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_hyper_beam2_grp, voicegroup128 - .equ se_m_hyper_beam2_pri, 4 - .equ se_m_hyper_beam2_rev, reverb_set+50 - .equ se_m_hyper_beam2_mvl, 127 - .equ se_m_hyper_beam2_key, 0 - .equ se_m_hyper_beam2_tbs, 1 - .equ se_m_hyper_beam2_exg, 0 - .equ se_m_hyper_beam2_cmp, 1 - - .section .rodata - .global se_m_hyper_beam2 - .align 2 - -@********************** Track 1 **********************@ - -se_m_hyper_beam2_1: - .byte KEYSH , se_m_hyper_beam2_key+0 - .byte TEMPO , 150*se_m_hyper_beam2_tbs/2 - .byte VOICE , 45 - .byte VOL , 110*se_m_hyper_beam2_mvl/mxv - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N03 , Gn3 , v092 - .byte W01 - .byte BEND , c_v+11 - .byte W01 - .byte c_v+28 - .byte W01 - .byte c_v+0 - .byte N02 , Cs4 - .byte W01 - .byte BEND , c_v+30 - .byte W02 - .byte c_v+0 - .byte N03 , As3 - .byte W01 - .byte BEND , c_v+11 - .byte W01 - .byte c_v+28 - .byte W01 - .byte c_v+0 - .byte N02 , En4 - .byte W01 - .byte BEND , c_v+30 - .byte W02 - .byte PAN , c_v+7 - .byte BEND , c_v+0 - .byte N03 , Gn3 , v040 - .byte W01 - .byte BEND , c_v+11 - .byte W01 - .byte c_v+28 - .byte W01 - .byte c_v+0 - .byte N02 , Cs4 - .byte W01 - .byte BEND , c_v+30 - .byte W02 - .byte PAN , c_v-7 - .byte BEND , c_v+0 - .byte N03 , As3 , v016 - .byte W01 - .byte BEND , c_v+11 - .byte W01 - .byte c_v+28 - .byte W01 - .byte c_v+0 - .byte N02 , En4 - .byte W01 - .byte BEND , c_v+30 - .byte W02 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_hyper_beam2_2: - .byte KEYSH , se_m_hyper_beam2_key+0 - .byte VOICE , 5 - .byte VOL , 110*se_m_hyper_beam2_mvl/mxv - .byte N01 , Cn3 , v032 - .byte W02 - .byte N01 - .byte W04 - .byte N01 - .byte W02 - .byte N01 - .byte W04 -se_m_hyper_beam2_2_000: - .byte N01 , Cn3 , v020 - .byte W02 - .byte N01 - .byte W04 - .byte PEND - .byte PATT - .word se_m_hyper_beam2_2_000 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_hyper_beam2: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_hyper_beam2_pri @ Priority - .byte se_m_hyper_beam2_rev @ Reverb. - - .word se_m_hyper_beam2_grp - - .word se_m_hyper_beam2_1 - .word se_m_hyper_beam2_2 - - .end diff --git a/sound/songs/se_m_icy_wind.s b/sound/songs/se_m_icy_wind.s deleted file mode 100644 index d15350525..000000000 --- a/sound/songs/se_m_icy_wind.s +++ /dev/null @@ -1,72 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_icy_wind_grp, voicegroup128 - .equ se_m_icy_wind_pri, 4 - .equ se_m_icy_wind_rev, reverb_set+50 - .equ se_m_icy_wind_mvl, 127 - .equ se_m_icy_wind_key, 0 - .equ se_m_icy_wind_tbs, 1 - .equ se_m_icy_wind_exg, 0 - .equ se_m_icy_wind_cmp, 1 - - .section .rodata - .global se_m_icy_wind - .align 2 - -@********************** Track 1 **********************@ - -se_m_icy_wind_1: - .byte KEYSH , se_m_icy_wind_key+0 - .byte TEMPO , 150*se_m_icy_wind_tbs/2 - .byte VOICE , 3 - .byte VOL , 100*se_m_icy_wind_mvl/mxv - .byte PAN , c_v+0 - .byte N01 , Ds4 , v112 - .byte W04 - .byte PAN , c_v+6 - .byte N01 , Bn4 , v040 - .byte W04 - .byte PAN , c_v-5 - .byte N01 , Ds4 , v112 - .byte W01 - .byte PAN , c_v+0 - .byte N01 , Bn4 - .byte W03 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_icy_wind_2: - .byte KEYSH , se_m_icy_wind_key+0 - .byte VOICE , 5 - .byte VOL , 100*se_m_icy_wind_mvl/mxv - .byte PAN , c_v+0 - .byte N01 , Dn4 , v040 - .byte W04 - .byte Bn3 - .byte W02 - .byte PAN , c_v-7 - .byte W02 - .byte c_v+9 - .byte W01 - .byte N01 , Dn4 - .byte W01 - .byte PAN , c_v-7 - .byte W02 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_icy_wind: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_icy_wind_pri @ Priority - .byte se_m_icy_wind_rev @ Reverb. - - .word se_m_icy_wind_grp - - .word se_m_icy_wind_1 - .word se_m_icy_wind_2 - - .end diff --git a/sound/songs/se_m_lick.s b/sound/songs/se_m_lick.s deleted file mode 100644 index 1aa0c35a2..000000000 --- a/sound/songs/se_m_lick.s +++ /dev/null @@ -1,129 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_lick_grp, voicegroup128 - .equ se_m_lick_pri, 4 - .equ se_m_lick_rev, reverb_set+50 - .equ se_m_lick_mvl, 127 - .equ se_m_lick_key, 0 - .equ se_m_lick_tbs, 1 - .equ se_m_lick_exg, 0 - .equ se_m_lick_cmp, 1 - - .section .rodata - .global se_m_lick - .align 2 - -@********************** Track 1 **********************@ - -se_m_lick_1: - .byte KEYSH , se_m_lick_key+0 - .byte TEMPO , 150*se_m_lick_tbs/2 - .byte VOICE , 31 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 110*se_m_lick_mvl/mxv - .byte BEND , c_v-5 - .byte N32 , Cn3 , v127 - .byte W01 - .byte PAN , c_v+4 - .byte BEND , c_v-9 - .byte W01 - .byte PAN , c_v+0 - .byte BEND , c_v-13 - .byte W01 - .byte PAN , c_v-4 - .byte BEND , c_v-20 - .byte W01 - .byte PAN , c_v+0 - .byte BEND , c_v-25 - .byte W02 - .byte PAN , c_v+4 - .byte BEND , c_v-39 - .byte W01 - .byte PAN , c_v+0 - .byte BEND , c_v-6 - .byte W01 - .byte PAN , c_v-4 - .byte BEND , c_v-3 - .byte W01 - .byte PAN , c_v+0 - .byte BEND , c_v+6 - .byte W01 - .byte PAN , c_v+4 - .byte BEND , c_v+3 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v+9 - .byte W01 - .byte PAN , c_v-4 - .byte BEND , c_v+6 - .byte W01 - .byte PAN , c_v+0 - .byte BEND , c_v+12 - .byte W01 - .byte PAN , c_v+4 - .byte BEND , c_v+8 - .byte W01 - .byte PAN , c_v+0 - .byte BEND , c_v+16 - .byte W02 - .byte PAN , c_v-4 - .byte VOL , 102*se_m_lick_mvl/mxv - .byte BEND , c_v+12 - .byte W01 - .byte PAN , c_v+0 - .byte BEND , c_v+16 - .byte W01 - .byte PAN , c_v+4 - .byte VOL , 97*se_m_lick_mvl/mxv - .byte BEND , c_v+18 - .byte W01 - .byte PAN , c_v+0 - .byte BEND , c_v+14 - .byte W01 - .byte PAN , c_v-4 - .byte VOL , 92*se_m_lick_mvl/mxv - .byte BEND , c_v+18 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v+20 - .byte W01 - .byte PAN , c_v+4 - .byte VOL , 88*se_m_lick_mvl/mxv - .byte BEND , c_v+17 - .byte W01 - .byte PAN , c_v+0 - .byte BEND , c_v+12 - .byte W01 - .byte PAN , c_v-4 - .byte VOL , 81*se_m_lick_mvl/mxv - .byte BEND , c_v+16 - .byte W01 - .byte PAN , c_v+0 - .byte VOL , 64*se_m_lick_mvl/mxv - .byte BEND , c_v+12 - .byte W02 - .byte PAN , c_v+4 - .byte VOL , 49*se_m_lick_mvl/mxv - .byte BEND , c_v+14 - .byte W01 - .byte PAN , c_v+0 - .byte VOL , 25*se_m_lick_mvl/mxv - .byte BEND , c_v+11 - .byte W05 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_lick: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_lick_pri @ Priority - .byte se_m_lick_rev @ Reverb. - - .word se_m_lick_grp - - .word se_m_lick_1 - - .end diff --git a/sound/songs/se_m_lock_on.s b/sound/songs/se_m_lock_on.s deleted file mode 100644 index d8e1de5b0..000000000 --- a/sound/songs/se_m_lock_on.s +++ /dev/null @@ -1,69 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_lock_on_grp, voicegroup128 - .equ se_m_lock_on_pri, 4 - .equ se_m_lock_on_rev, reverb_set+50 - .equ se_m_lock_on_mvl, 127 - .equ se_m_lock_on_key, 0 - .equ se_m_lock_on_tbs, 1 - .equ se_m_lock_on_exg, 0 - .equ se_m_lock_on_cmp, 1 - - .section .rodata - .global se_m_lock_on - .align 2 - -@********************** Track 1 **********************@ - -se_m_lock_on_1: - .byte KEYSH , se_m_lock_on_key+0 - .byte TEMPO , 150*se_m_lock_on_tbs/2 - .byte VOICE , 40 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 110*se_m_lock_on_mvl/mxv - .byte BEND , c_v+0 - .byte N01 , Cn4 , v100 - .byte W01 - .byte Gn3 , v064 - .byte W01 - .byte N03 , Bn3 , v100 - .byte W01 - .byte PAN , c_v+6 - .byte BEND , c_v+6 - .byte W01 - .byte PAN , c_v-5 - .byte BEND , c_v-6 - .byte W02 - .byte PAN , c_v+6 - .byte BEND , c_v+6 - .byte N01 , Cn4 - .byte W01 - .byte Gn3 , v064 - .byte W02 - .byte PAN , c_v-5 - .byte BEND , c_v-6 - .byte N01 , Bn3 , v100 - .byte W01 - .byte Gn3 , v064 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N06 , Bn3 , v100 - .byte W06 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_lock_on: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_lock_on_pri @ Priority - .byte se_m_lock_on_rev @ Reverb. - - .word se_m_lock_on_grp - - .word se_m_lock_on_1 - - .end diff --git a/sound/songs/se_m_metronome.s b/sound/songs/se_m_metronome.s deleted file mode 100644 index ba0a55d8b..000000000 --- a/sound/songs/se_m_metronome.s +++ /dev/null @@ -1,79 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_metronome_grp, voicegroup128 - .equ se_m_metronome_pri, 4 - .equ se_m_metronome_rev, reverb_set+50 - .equ se_m_metronome_mvl, 127 - .equ se_m_metronome_key, 0 - .equ se_m_metronome_tbs, 1 - .equ se_m_metronome_exg, 0 - .equ se_m_metronome_cmp, 1 - - .section .rodata - .global se_m_metronome - .align 2 - -@********************** Track 1 **********************@ - -se_m_metronome_1: - .byte KEYSH , se_m_metronome_key+0 - .byte TEMPO , 150*se_m_metronome_tbs/2 - .byte VOICE , 37 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 115*se_m_metronome_mvl/mxv - .byte BEND , c_v+0 - .byte N15 , En3 , v127 - .byte W01 - .byte PAN , c_v+4 - .byte BEND , c_v-4 - .byte W01 - .byte PAN , c_v+0 - .byte BEND , c_v-7 - .byte W01 - .byte PAN , c_v-4 - .byte BEND , c_v-11 - .byte W01 - .byte PAN , c_v+0 - .byte BEND , c_v-5 - .byte W02 - .byte PAN , c_v+4 - .byte BEND , c_v+0 - .byte W01 - .byte PAN , c_v+0 - .byte BEND , c_v+3 - .byte W01 - .byte PAN , c_v-4 - .byte BEND , c_v+6 - .byte W01 - .byte PAN , c_v+0 - .byte BEND , c_v+9 - .byte W01 - .byte PAN , c_v+4 - .byte BEND , c_v+14 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v+20 - .byte W01 - .byte PAN , c_v-4 - .byte BEND , c_v+25 - .byte W01 - .byte PAN , c_v+0 - .byte BEND , c_v+46 - .byte W10 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_metronome: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_metronome_pri @ Priority - .byte se_m_metronome_rev @ Reverb. - - .word se_m_metronome_grp - - .word se_m_metronome_1 - - .end diff --git a/sound/songs/se_m_milk_drink.s b/sound/songs/se_m_milk_drink.s deleted file mode 100644 index 30a051540..000000000 --- a/sound/songs/se_m_milk_drink.s +++ /dev/null @@ -1,129 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_milk_drink_grp, voicegroup128 - .equ se_m_milk_drink_pri, 4 - .equ se_m_milk_drink_rev, reverb_set+50 - .equ se_m_milk_drink_mvl, 127 - .equ se_m_milk_drink_key, 0 - .equ se_m_milk_drink_tbs, 1 - .equ se_m_milk_drink_exg, 0 - .equ se_m_milk_drink_cmp, 1 - - .section .rodata - .global se_m_milk_drink - .align 2 - -@********************** Track 1 **********************@ - -se_m_milk_drink_1: - .byte KEYSH , se_m_milk_drink_key+0 - .byte TEMPO , 180*se_m_milk_drink_tbs/2 - .byte VOICE , 16 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 100*se_m_milk_drink_mvl/mxv - .byte BEND , c_v+0 - .byte N06 , An6 , v100 - .byte W01 - .byte BEND , c_v-11 - .byte W01 - .byte PAN , c_v+5 - .byte VOL , 90*se_m_milk_drink_mvl/mxv - .byte BEND , c_v-20 - .byte W01 - .byte PAN , c_v-6 - .byte VOL , 77*se_m_milk_drink_mvl/mxv - .byte BEND , c_v-37 - .byte W01 - .byte PAN , c_v+0 - .byte VOL , 37*se_m_milk_drink_mvl/mxv - .byte BEND , c_v-47 - .byte W02 - .byte N02 , An6 , v056 - .byte W01 - .byte PAN , c_v+5 - .byte W01 - .byte c_v-6 - .byte VOL , 100*se_m_milk_drink_mvl/mxv - .byte BEND , c_v+0 - .byte N06 , An6 , v100 - .byte W01 - .byte PAN , c_v+8 - .byte BEND , c_v-11 - .byte W01 - .byte PAN , c_v-10 - .byte VOL , 90*se_m_milk_drink_mvl/mxv - .byte BEND , c_v-20 - .byte W02 - .byte PAN , c_v+1 - .byte VOL , 77*se_m_milk_drink_mvl/mxv - .byte BEND , c_v-37 - .byte W01 - .byte PAN , c_v+5 - .byte VOL , 37*se_m_milk_drink_mvl/mxv - .byte BEND , c_v-47 - .byte W01 - .byte PAN , c_v-6 - .byte N02 , An6 , v056 - .byte W01 - .byte PAN , c_v+8 - .byte W01 - .byte c_v-10 - .byte VOL , 100*se_m_milk_drink_mvl/mxv - .byte BEND , c_v+0 - .byte N06 , An6 , v072 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v-11 - .byte W01 - .byte PAN , c_v+5 - .byte VOL , 90*se_m_milk_drink_mvl/mxv - .byte BEND , c_v-20 - .byte W01 - .byte PAN , c_v-6 - .byte VOL , 77*se_m_milk_drink_mvl/mxv - .byte BEND , c_v-37 - .byte W01 - .byte PAN , c_v+8 - .byte VOL , 37*se_m_milk_drink_mvl/mxv - .byte BEND , c_v-47 - .byte W01 - .byte PAN , c_v-10 - .byte W02 - .byte W06 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_milk_drink_2: - .byte KEYSH , se_m_milk_drink_key+0 - .byte VOICE , 53 - .byte VOL , 100*se_m_milk_drink_mvl/mxv - .byte W02 - .byte N06 , Fs6 , v040 - .byte W04 - .byte W04 - .byte N06 - .byte W02 - .byte W06 - .byte W01 - .byte Fs6 , v032 - .byte W05 - .byte W06 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_milk_drink: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_milk_drink_pri @ Priority - .byte se_m_milk_drink_rev @ Reverb. - - .word se_m_milk_drink_grp - - .word se_m_milk_drink_1 - .word se_m_milk_drink_2 - - .end diff --git a/sound/songs/se_m_minimize.s b/sound/songs/se_m_minimize.s deleted file mode 100644 index 565450b2b..000000000 --- a/sound/songs/se_m_minimize.s +++ /dev/null @@ -1,165 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_minimize_grp, voicegroup128 - .equ se_m_minimize_pri, 4 - .equ se_m_minimize_rev, reverb_set+50 - .equ se_m_minimize_mvl, 127 - .equ se_m_minimize_key, 0 - .equ se_m_minimize_tbs, 1 - .equ se_m_minimize_exg, 0 - .equ se_m_minimize_cmp, 1 - - .section .rodata - .global se_m_minimize - .align 2 - -@********************** Track 1 **********************@ - -se_m_minimize_1: - .byte KEYSH , se_m_minimize_key+0 - .byte TEMPO , 150*se_m_minimize_tbs/2 - .byte VOICE , 45 - .byte BENDR , 24 - .byte PAN , c_v+0 - .byte VOL , 32*se_m_minimize_mvl/mxv - .byte MOD , 30 - .byte BEND , c_v+39 - .byte N06 , Dn4 , v127 - .byte W01 - .byte BEND , c_v+31 - .byte W01 - .byte VOL , 49*se_m_minimize_mvl/mxv - .byte PAN , c_v+5 - .byte BEND , c_v+23 - .byte W01 - .byte c_v+15 - .byte W01 - .byte VOL , 61*se_m_minimize_mvl/mxv - .byte BEND , c_v+8 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v+35 - .byte N06 , Cn4 , v116 - .byte W01 - .byte VOL , 71*se_m_minimize_mvl/mxv - .byte BEND , c_v+27 - .byte W01 - .byte PAN , c_v-4 - .byte BEND , c_v+19 - .byte W01 - .byte VOL , 81*se_m_minimize_mvl/mxv - .byte BEND , c_v+12 - .byte W01 - .byte c_v+5 - .byte W02 - .byte VOL , 95*se_m_minimize_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+32 - .byte N06 , Bn3 , v112 - .byte W01 - .byte BEND , c_v+24 - .byte W01 - .byte PAN , c_v+6 - .byte BEND , c_v+16 - .byte W01 - .byte c_v+8 - .byte W01 - .byte c_v+1 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v+28 - .byte N06 , An3 - .byte W01 - .byte BEND , c_v+20 - .byte W01 - .byte PAN , c_v-6 - .byte BEND , c_v+12 - .byte W01 - .byte c_v+5 - .byte W01 - .byte c_v-2 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v+24 - .byte N06 , Gn3 , v108 - .byte W01 - .byte BEND , c_v+16 - .byte W01 - .byte PAN , c_v+8 - .byte BEND , c_v+9 - .byte W01 - .byte c_v+1 - .byte W01 - .byte c_v-6 - .byte W02 - .byte VOL , 82*se_m_minimize_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+21 - .byte N06 , Fn3 , v100 - .byte W01 - .byte BEND , c_v+13 - .byte W01 - .byte VOL , 71*se_m_minimize_mvl/mxv - .byte PAN , c_v-8 - .byte BEND , c_v+5 - .byte W01 - .byte c_v-2 - .byte W01 - .byte VOL , 61*se_m_minimize_mvl/mxv - .byte BEND , c_v-10 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v+17 - .byte N06 , En3 , v060 - .byte W01 - .byte BEND , c_v+9 - .byte W01 - .byte PAN , c_v+8 - .byte BEND , c_v+2 - .byte W01 - .byte c_v-6 - .byte W01 - .byte c_v-13 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v+14 - .byte N06 , Dn3 , v040 - .byte W01 - .byte BEND , c_v+6 - .byte W01 - .byte PAN , c_v-8 - .byte BEND , c_v-2 - .byte W01 - .byte c_v-10 - .byte W01 - .byte c_v-17 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v+12 - .byte N06 , Cn3 , v020 - .byte W01 - .byte BEND , c_v+4 - .byte W01 - .byte PAN , c_v+8 - .byte BEND , c_v-4 - .byte W01 - .byte c_v-11 - .byte W01 - .byte c_v-18 - .byte W02 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_minimize: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_minimize_pri @ Priority - .byte se_m_minimize_rev @ Reverb. - - .word se_m_minimize_grp - - .word se_m_minimize_1 - - .end diff --git a/sound/songs/se_m_mist.s b/sound/songs/se_m_mist.s deleted file mode 100644 index f46eb130a..000000000 --- a/sound/songs/se_m_mist.s +++ /dev/null @@ -1,94 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_mist_grp, voicegroup128 - .equ se_m_mist_pri, 4 - .equ se_m_mist_rev, reverb_set+50 - .equ se_m_mist_mvl, 127 - .equ se_m_mist_key, 0 - .equ se_m_mist_tbs, 1 - .equ se_m_mist_exg, 0 - .equ se_m_mist_cmp, 1 - - .section .rodata - .global se_m_mist - .align 2 - -@********************** Track 1 **********************@ - -se_m_mist_1: - .byte KEYSH , se_m_mist_key+0 - .byte TEMPO , 150*se_m_mist_tbs/2 - .byte VOICE , 36 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 7*se_m_mist_mvl/mxv - .byte BEND , c_v+1 - .byte N18 , Cn5 , v052 - .byte W01 - .byte VOL , 20*se_m_mist_mvl/mxv - .byte PAN , c_v+16 - .byte BEND , c_v-8 - .byte W01 - .byte VOL , 41*se_m_mist_mvl/mxv - .byte PAN , c_v-14 - .byte BEND , c_v-16 - .byte W01 - .byte VOL , 70*se_m_mist_mvl/mxv - .byte PAN , c_v+16 - .byte BEND , c_v-8 - .byte W01 - .byte VOL , 93*se_m_mist_mvl/mxv - .byte PAN , c_v-14 - .byte BEND , c_v+0 - .byte W02 - .byte PAN , c_v+0 - .byte VOL , 110*se_m_mist_mvl/mxv - .byte BEND , c_v+8 - .byte W01 - .byte PAN , c_v+16 - .byte BEND , c_v+16 - .byte W01 - .byte PAN , c_v-14 - .byte W01 - .byte VOL , 98*se_m_mist_mvl/mxv - .byte PAN , c_v+16 - .byte BEND , c_v+10 - .byte W01 - .byte VOL , 85*se_m_mist_mvl/mxv - .byte PAN , c_v-14 - .byte BEND , c_v+4 - .byte W02 - .byte VOL , 69*se_m_mist_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v-7 - .byte W01 - .byte VOL , 51*se_m_mist_mvl/mxv - .byte PAN , c_v+16 - .byte BEND , c_v-22 - .byte W01 - .byte PAN , c_v-14 - .byte VOL , 38*se_m_mist_mvl/mxv - .byte BEND , c_v-28 - .byte W01 - .byte VOL , 17*se_m_mist_mvl/mxv - .byte BEND , c_v-32 - .byte W01 - .byte VOL , 4*se_m_mist_mvl/mxv - .byte BEND , c_v-38 - .byte W08 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_mist: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_mist_pri @ Priority - .byte se_m_mist_rev @ Reverb. - - .word se_m_mist_grp - - .word se_m_mist_1 - - .end diff --git a/sound/songs/se_m_moonlight.s b/sound/songs/se_m_moonlight.s deleted file mode 100644 index bd4410b32..000000000 --- a/sound/songs/se_m_moonlight.s +++ /dev/null @@ -1,218 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_moonlight_grp, voicegroup128 - .equ se_m_moonlight_pri, 4 - .equ se_m_moonlight_rev, reverb_set+50 - .equ se_m_moonlight_mvl, 127 - .equ se_m_moonlight_key, 0 - .equ se_m_moonlight_tbs, 1 - .equ se_m_moonlight_exg, 0 - .equ se_m_moonlight_cmp, 1 - - .section .rodata - .global se_m_moonlight - .align 2 - -@********************** Track 1 **********************@ - -se_m_moonlight_1: - .byte KEYSH , se_m_moonlight_key+0 - .byte TEMPO , 150*se_m_moonlight_tbs/2 - .byte VOICE , 46 - .byte VOL , 100*se_m_moonlight_mvl/mxv - .byte BENDR , 4 - .byte PAN , c_v+0 - .byte MOD , 6 - .byte BEND , c_v+3 - .byte N01 , Ds6 , v092 - .byte W01 - .byte Dn6 - .byte W01 - .byte Gn5 - .byte W01 - .byte N20 , Gn6 , v100 - .byte W21 -se_m_moonlight_1_000: - .byte N01 , Ds6 , v056 - .byte W01 - .byte Dn6 - .byte W01 - .byte Gn5 - .byte W01 - .byte N20 , Gn6 , v064 - .byte W03 - .byte PAN , c_v+6 - .byte W04 - .byte c_v-4 - .byte W05 - .byte c_v+6 - .byte W05 - .byte c_v-4 - .byte W04 - .byte PEND -se_m_moonlight_1_001: - .byte PAN , c_v+0 - .byte N01 , Gs5 , v092 - .byte W01 - .byte Gn5 - .byte W01 - .byte Cn5 - .byte W01 - .byte N20 , Cn6 , v100 - .byte W21 - .byte PEND -se_m_moonlight_1_002: - .byte PAN , c_v+16 - .byte N01 , Gs5 , v056 - .byte W01 - .byte Gn5 - .byte W01 - .byte Cn5 - .byte W01 - .byte N20 , Cn6 , v064 - .byte W21 - .byte PEND -se_m_moonlight_1_003: - .byte PAN , c_v-16 - .byte N01 , Gs5 , v040 - .byte W01 - .byte Gn5 - .byte W01 - .byte Cn5 - .byte W01 - .byte N20 , Cn6 - .byte W21 - .byte PEND -se_m_moonlight_1_004: - .byte PAN , c_v+32 - .byte N01 , Gs5 , v020 - .byte W01 - .byte Gn5 - .byte W01 - .byte Cn5 - .byte W01 - .byte PAN , c_v-32 - .byte N20 , Cn6 - .byte W21 - .byte PEND - .byte PAN , c_v+0 - .byte N01 , Ds6 , v092 - .byte W01 - .byte Dn6 - .byte W01 - .byte Gn5 - .byte W01 - .byte N20 , Gn6 , v100 - .byte W21 - .byte PATT - .word se_m_moonlight_1_000 - .byte PATT - .word se_m_moonlight_1_001 - .byte PATT - .word se_m_moonlight_1_002 - .byte PATT - .word se_m_moonlight_1_003 - .byte PATT - .word se_m_moonlight_1_004 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_moonlight_2: - .byte KEYSH , se_m_moonlight_key+0 - .byte VOICE , 55 - .byte PAN , c_v+0 - .byte VOL , 39*se_m_moonlight_mvl/mxv - .byte BEND , c_v-4 - .byte W10 - .byte N01 , Ds6 , v112 - .byte W02 - .byte Dn6 - .byte W01 - .byte Gn5 - .byte W01 - .byte N04 , Gn6 - .byte W05 - .byte Gn6 , v096 - .byte W05 -se_m_moonlight_2_000: - .byte PAN , c_v+50 - .byte N04 , Gn6 , v080 - .byte W04 - .byte PAN , c_v-48 - .byte N04 , Gn6 , v064 - .byte W05 - .byte PAN , c_v+50 - .byte N04 , Gn6 , v048 - .byte W05 - .byte PAN , c_v-49 - .byte N04 , Gn6 , v032 - .byte W10 - .byte PEND -se_m_moonlight_2_001: - .byte PAN , c_v+0 - .byte W10 - .byte N01 , Gs5 , v112 - .byte W02 - .byte Gn5 - .byte W01 - .byte Cn5 - .byte W01 - .byte N04 , Cn6 - .byte W05 - .byte Cn6 , v096 - .byte W05 - .byte PEND -se_m_moonlight_2_002: - .byte PAN , c_v+50 - .byte N04 , Cn6 , v080 - .byte W04 - .byte PAN , c_v-48 - .byte N04 , Cn6 , v064 - .byte W05 - .byte PAN , c_v+50 - .byte N04 , Cn6 , v048 - .byte W05 - .byte PAN , c_v-49 - .byte N04 , Cn6 , v032 - .byte W10 - .byte PEND - .byte W24 - .byte W24 - .byte PAN , c_v+0 - .byte W10 - .byte N01 , Ds6 , v112 - .byte W02 - .byte Dn6 - .byte W01 - .byte Gn5 - .byte W01 - .byte N04 , Gn6 - .byte W05 - .byte Gn6 , v096 - .byte W05 - .byte PATT - .word se_m_moonlight_2_000 - .byte PATT - .word se_m_moonlight_2_001 - .byte PATT - .word se_m_moonlight_2_002 - .byte W24 - .byte W24 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_moonlight: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_moonlight_pri @ Priority - .byte se_m_moonlight_rev @ Reverb. - - .word se_m_moonlight_grp - - .word se_m_moonlight_1 - .word se_m_moonlight_2 - - .end diff --git a/sound/songs/se_m_morning_sun.s b/sound/songs/se_m_morning_sun.s deleted file mode 100644 index ac7667246..000000000 --- a/sound/songs/se_m_morning_sun.s +++ /dev/null @@ -1,135 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_morning_sun_grp, voicegroup128 - .equ se_m_morning_sun_pri, 5 - .equ se_m_morning_sun_rev, reverb_set+50 - .equ se_m_morning_sun_mvl, 127 - .equ se_m_morning_sun_key, 0 - .equ se_m_morning_sun_tbs, 1 - .equ se_m_morning_sun_exg, 0 - .equ se_m_morning_sun_cmp, 1 - - .section .rodata - .global se_m_morning_sun - .align 2 - -@********************** Track 1 **********************@ - -se_m_morning_sun_1: - .byte KEYSH , se_m_morning_sun_key+0 - .byte TEMPO , 150*se_m_morning_sun_tbs/2 - .byte VOICE , 46 - .byte VOL , 95*se_m_morning_sun_mvl/mxv - .byte BENDR , 2 - .byte PAN , c_v+0 - .byte BEND , c_v+15 - .byte W03 - .byte N06 , Ds6 , v112 - .byte W03 - .byte W03 - .byte En5 , v104 - .byte W03 - .byte W03 - .byte Ds6 , v096 - .byte W03 - .byte W03 - .byte En5 , v088 - .byte W03 - .byte W03 - .byte PAN , c_v-4 - .byte N06 , Ds6 , v080 - .byte W03 - .byte W03 - .byte PAN , c_v+0 - .byte N06 , En5 , v072 - .byte W03 - .byte W03 - .byte PAN , c_v+4 - .byte N06 , Ds6 , v064 - .byte W03 - .byte W03 - .byte PAN , c_v+0 - .byte N06 , En5 , v056 - .byte W03 - .byte W03 - .byte PAN , c_v-4 - .byte N06 , Ds6 , v044 - .byte W03 - .byte W03 - .byte PAN , c_v+0 - .byte N06 , En5 , v036 - .byte W03 - .byte W03 - .byte PAN , c_v+4 - .byte N06 , Ds6 , v028 - .byte W03 - .byte W03 - .byte PAN , c_v+0 - .byte N06 , En5 , v020 - .byte W03 - .byte W03 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_morning_sun_2: - .byte KEYSH , se_m_morning_sun_key+0 - .byte VOICE , 53 - .byte BENDR , 2 - .byte VOL , 43*se_m_morning_sun_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+15 - .byte N06 , Gs6 , v108 - .byte W03 - .byte W03 - .byte Bn5 - .byte W03 - .byte W03 - .byte Gs6 , v100 - .byte W03 - .byte W03 - .byte Bn5 , v092 - .byte W03 - .byte W03 - .byte Gs6 , v084 - .byte W03 - .byte W03 - .byte Bn5 , v076 - .byte W03 - .byte W03 - .byte Gs6 , v068 - .byte W03 - .byte W03 - .byte Bn5 , v060 - .byte W03 - .byte W03 - .byte Gs6 , v052 - .byte W03 - .byte W03 - .byte Bn5 , v040 - .byte W03 - .byte W03 - .byte Gs6 , v032 - .byte W03 - .byte W03 - .byte Bn5 , v024 - .byte W03 - .byte W03 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_morning_sun: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_morning_sun_pri @ Priority - .byte se_m_morning_sun_rev @ Reverb. - - .word se_m_morning_sun_grp - - .word se_m_morning_sun_1 - .word se_m_morning_sun_2 - - .end diff --git a/sound/songs/se_m_nightmare.s b/sound/songs/se_m_nightmare.s deleted file mode 100644 index 825bfaea2..000000000 --- a/sound/songs/se_m_nightmare.s +++ /dev/null @@ -1,146 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_nightmare_grp, voicegroup128 - .equ se_m_nightmare_pri, 4 - .equ se_m_nightmare_rev, reverb_set+50 - .equ se_m_nightmare_mvl, 127 - .equ se_m_nightmare_key, 0 - .equ se_m_nightmare_tbs, 1 - .equ se_m_nightmare_exg, 0 - .equ se_m_nightmare_cmp, 1 - - .section .rodata - .global se_m_nightmare - .align 2 - -@********************** Track 1 **********************@ - -se_m_nightmare_1: - .byte KEYSH , se_m_nightmare_key+0 - .byte TEMPO , 220*se_m_nightmare_tbs/2 - .byte VOICE , 3 - .byte VOL , 110*se_m_nightmare_mvl/mxv - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte W06 - .byte N03 , Gn2 , v092 - .byte W06 - .byte PAN , c_v-16 - .byte N03 , Gn2 , v088 - .byte W09 - .byte PAN , c_v-1 - .byte N03 , Fs3 , v104 - .byte W03 - .byte W03 - .byte PAN , c_v+16 - .byte N03 , Fs3 , v088 - .byte W06 - .byte PAN , c_v+0 - .byte N03 , Ds3 - .byte W06 - .byte PAN , c_v-16 - .byte N03 - .byte W09 - .byte PAN , c_v-1 - .byte N03 , An2 , v096 - .byte W06 - .byte PAN , c_v+17 - .byte N03 , An2 , v088 - .byte W09 - .byte PAN , c_v-1 - .byte N03 , Gs3 , v104 - .byte W06 - .byte PAN , c_v-16 - .byte N03 , Gs3 , v088 - .byte W03 - .byte W03 - .byte PAN , c_v-1 - .byte N03 , Fn3 - .byte W06 - .byte PAN , c_v+16 - .byte N03 - .byte W15 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_nightmare_2: - .byte KEYSH , se_m_nightmare_key+0 - .byte VOICE , 20 - .byte XCMD , xIECV , 10 - .byte xIECL , 8 - .byte VOL , 110*se_m_nightmare_mvl/mxv - .byte PAN , c_v-7 - .byte BEND , c_v+55 - .byte N03 , Cn2 , v100 - .byte W06 - .byte PAN , c_v+6 - .byte BEND , c_v+36 - .byte N03 - .byte W06 - .byte PAN , c_v-7 - .byte BEND , c_v+17 - .byte N03 - .byte W06 - .byte PAN , c_v+6 - .byte BEND , c_v+2 - .byte N03 - .byte W06 - .byte PAN , c_v-7 - .byte BEND , c_v-8 - .byte N03 - .byte W06 - .byte PAN , c_v+6 - .byte BEND , c_v+12 - .byte N03 - .byte W06 - .byte PAN , c_v-7 - .byte BEND , c_v+6 - .byte N03 - .byte W06 - .byte PAN , c_v+6 - .byte BEND , c_v+0 - .byte N03 - .byte W06 - .byte PAN , c_v-7 - .byte BEND , c_v-6 - .byte N03 - .byte W06 - .byte PAN , c_v+6 - .byte BEND , c_v-19 - .byte N03 - .byte W06 - .byte PAN , c_v-7 - .byte BEND , c_v-31 - .byte N03 - .byte W06 - .byte PAN , c_v+6 - .byte BEND , c_v-44 - .byte N03 - .byte W06 - .byte PAN , c_v-7 - .byte BEND , c_v-55 - .byte N03 - .byte W06 - .byte PAN , c_v+6 - .byte BEND , c_v-64 - .byte N03 - .byte W18 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_nightmare: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_nightmare_pri @ Priority - .byte se_m_nightmare_rev @ Reverb. - - .word se_m_nightmare_grp - - .word se_m_nightmare_1 - .word se_m_nightmare_2 - - .end diff --git a/sound/songs/se_m_perish_song.s b/sound/songs/se_m_perish_song.s deleted file mode 100644 index af30e2457..000000000 --- a/sound/songs/se_m_perish_song.s +++ /dev/null @@ -1,221 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_perish_song_grp, voicegroup128 - .equ se_m_perish_song_pri, 4 - .equ se_m_perish_song_rev, reverb_set+50 - .equ se_m_perish_song_mvl, 127 - .equ se_m_perish_song_key, 0 - .equ se_m_perish_song_tbs, 1 - .equ se_m_perish_song_exg, 0 - .equ se_m_perish_song_cmp, 1 - - .section .rodata - .global se_m_perish_song - .align 2 - -@********************** Track 1 **********************@ - -se_m_perish_song_1: - .byte KEYSH , se_m_perish_song_key+0 - .byte TEMPO , 100*se_m_perish_song_tbs/2 - .byte VOICE , 73 - .byte BENDR , 12 - .byte LFOS , 40 - .byte PAN , c_v+7 - .byte VOL , 25*se_m_perish_song_mvl/mxv - .byte BEND , c_v+0 - .byte W03 - .byte VOL , 29*se_m_perish_song_mvl/mxv - .byte W03 - .byte 33*se_m_perish_song_mvl/mxv - .byte N48 , An3 , v112 - .byte W03 - .byte VOL , 40*se_m_perish_song_mvl/mxv - .byte W01 - .byte PAN , c_v+4 - .byte W02 -se_m_perish_song_1_000: - .byte VOL , 45*se_m_perish_song_mvl/mxv - .byte MOD , 8 - .byte W03 - .byte VOL , 51*se_m_perish_song_mvl/mxv - .byte W03 - .byte PEND -se_m_perish_song_1_001: - .byte VOL , 56*se_m_perish_song_mvl/mxv - .byte PAN , c_v+0 - .byte W03 - .byte VOL , 62*se_m_perish_song_mvl/mxv - .byte W03 - .byte PEND -se_m_perish_song_1_002: - .byte VOL , 72*se_m_perish_song_mvl/mxv - .byte PAN , c_v-4 - .byte W03 - .byte VOL , 81*se_m_perish_song_mvl/mxv - .byte W03 - .byte PEND -se_m_perish_song_1_003: - .byte VOL , 92*se_m_perish_song_mvl/mxv - .byte PAN , c_v-8 - .byte W03 - .byte VOL , 100*se_m_perish_song_mvl/mxv - .byte W03 - .byte PEND - .byte PAN , c_v-4 - .byte W06 - .byte VOL , 82*se_m_perish_song_mvl/mxv - .byte PAN , c_v+0 - .byte W03 - .byte VOL , 52*se_m_perish_song_mvl/mxv - .byte W03 - .byte 25*se_m_perish_song_mvl/mxv - .byte MOD , 0 - .byte PAN , c_v+4 - .byte W03 - .byte VOL , 29*se_m_perish_song_mvl/mxv - .byte W01 - .byte PAN , c_v+7 - .byte W02 - .byte VOL , 33*se_m_perish_song_mvl/mxv - .byte N72 , Gs3 , v112 - .byte W03 - .byte VOL , 40*se_m_perish_song_mvl/mxv - .byte W01 - .byte PAN , c_v+4 - .byte W02 - .byte PATT - .word se_m_perish_song_1_000 - .byte PATT - .word se_m_perish_song_1_001 - .byte PATT - .word se_m_perish_song_1_002 - .byte PATT - .word se_m_perish_song_1_003 - .byte PAN , c_v-4 - .byte W06 - .byte c_v+0 - .byte W06 - .byte c_v+4 - .byte W03 - .byte VOL , 87*se_m_perish_song_mvl/mxv - .byte W03 - .byte 75*se_m_perish_song_mvl/mxv - .byte PAN , c_v+7 - .byte W03 - .byte VOL , 62*se_m_perish_song_mvl/mxv - .byte W03 - .byte 48*se_m_perish_song_mvl/mxv - .byte PAN , c_v+4 - .byte W03 - .byte VOL , 33*se_m_perish_song_mvl/mxv - .byte W03 - .byte 25*se_m_perish_song_mvl/mxv - .byte W01 - .byte PAN , c_v+0 - .byte W02 - .byte VOL , 10*se_m_perish_song_mvl/mxv - .byte W03 - .byte W01 - .byte PAN , c_v-4 - .byte W05 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_perish_song_2: - .byte KEYSH , se_m_perish_song_key+0 - .byte VOICE , 73 - .byte VOL , 25*se_m_perish_song_mvl/mxv - .byte PAN , c_v-17 - .byte N48 , Cn4 , v100 - .byte W03 - .byte VOL , 29*se_m_perish_song_mvl/mxv - .byte W03 - .byte 33*se_m_perish_song_mvl/mxv - .byte W03 - .byte 40*se_m_perish_song_mvl/mxv - .byte W03 -se_m_perish_song_2_000: - .byte VOL , 45*se_m_perish_song_mvl/mxv - .byte MOD , 8 - .byte W03 - .byte VOL , 51*se_m_perish_song_mvl/mxv - .byte W03 - .byte PEND - .byte 56*se_m_perish_song_mvl/mxv - .byte W03 - .byte 62*se_m_perish_song_mvl/mxv - .byte W03 - .byte 72*se_m_perish_song_mvl/mxv - .byte W03 - .byte 81*se_m_perish_song_mvl/mxv - .byte W03 - .byte 92*se_m_perish_song_mvl/mxv - .byte W03 - .byte 100*se_m_perish_song_mvl/mxv - .byte W03 - .byte W06 - .byte 82*se_m_perish_song_mvl/mxv - .byte W03 - .byte 52*se_m_perish_song_mvl/mxv - .byte W03 - .byte 25*se_m_perish_song_mvl/mxv - .byte MOD , 0 - .byte N72 , Bn3 , v100 - .byte W03 - .byte VOL , 29*se_m_perish_song_mvl/mxv - .byte W03 - .byte 33*se_m_perish_song_mvl/mxv - .byte W03 - .byte 40*se_m_perish_song_mvl/mxv - .byte W03 - .byte PATT - .word se_m_perish_song_2_000 - .byte VOL , 56*se_m_perish_song_mvl/mxv - .byte W03 - .byte 62*se_m_perish_song_mvl/mxv - .byte W03 - .byte 72*se_m_perish_song_mvl/mxv - .byte W03 - .byte 81*se_m_perish_song_mvl/mxv - .byte W03 - .byte 92*se_m_perish_song_mvl/mxv - .byte W03 - .byte 100*se_m_perish_song_mvl/mxv - .byte W03 - .byte W06 - .byte W06 - .byte W03 - .byte 87*se_m_perish_song_mvl/mxv - .byte W03 - .byte 75*se_m_perish_song_mvl/mxv - .byte W03 - .byte 62*se_m_perish_song_mvl/mxv - .byte W03 - .byte 48*se_m_perish_song_mvl/mxv - .byte W03 - .byte 33*se_m_perish_song_mvl/mxv - .byte W03 - .byte 25*se_m_perish_song_mvl/mxv - .byte W03 - .byte 10*se_m_perish_song_mvl/mxv - .byte W03 - .byte W06 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_perish_song: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_perish_song_pri @ Priority - .byte se_m_perish_song_rev @ Reverb. - - .word se_m_perish_song_grp - - .word se_m_perish_song_1 - .word se_m_perish_song_2 - - .end diff --git a/sound/songs/se_m_petal_dance.s b/sound/songs/se_m_petal_dance.s deleted file mode 100644 index c8ad2810d..000000000 --- a/sound/songs/se_m_petal_dance.s +++ /dev/null @@ -1,205 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_petal_dance_grp, voicegroup128 - .equ se_m_petal_dance_pri, 4 - .equ se_m_petal_dance_rev, reverb_set+50 - .equ se_m_petal_dance_mvl, 127 - .equ se_m_petal_dance_key, 0 - .equ se_m_petal_dance_tbs, 1 - .equ se_m_petal_dance_exg, 0 - .equ se_m_petal_dance_cmp, 1 - - .section .rodata - .global se_m_petal_dance - .align 2 - -@********************** Track 1 **********************@ - -se_m_petal_dance_1: - .byte KEYSH , se_m_petal_dance_key+0 - .byte TEMPO , 150*se_m_petal_dance_tbs/2 - .byte VOICE , 46 - .byte VOL , 95*se_m_petal_dance_mvl/mxv - .byte BENDR , 2 - .byte PAN , c_v+0 - .byte BEND , c_v+15 - .byte W03 - .byte N06 , Dn6 , v112 - .byte W03 - .byte W03 - .byte An5 , v104 - .byte W03 - .byte W03 - .byte Dn6 , v100 - .byte W03 - .byte W03 - .byte An5 - .byte W03 - .byte W03 - .byte PAN , c_v-4 - .byte N06 , Dn6 , v096 - .byte W03 - .byte W03 - .byte PAN , c_v+0 - .byte N06 , An5 , v092 - .byte W03 - .byte W03 - .byte PAN , c_v+4 - .byte N06 , Dn6 , v088 - .byte W03 - .byte W03 - .byte PAN , c_v+0 - .byte N06 , An5 , v084 - .byte W03 - .byte W03 - .byte PAN , c_v-4 - .byte N06 , Dn6 , v080 - .byte W03 - .byte W03 - .byte PAN , c_v+0 - .byte N06 , An5 , v076 - .byte W03 - .byte W03 - .byte PAN , c_v+4 - .byte N06 , Dn6 - .byte W03 - .byte W03 - .byte PAN , c_v+0 - .byte N06 , An5 , v072 - .byte W03 - .byte W03 - .byte PAN , c_v-4 - .byte N06 , Dn6 , v068 - .byte W03 - .byte W03 - .byte PAN , c_v+0 - .byte N06 , An5 , v064 - .byte W03 - .byte W03 - .byte PAN , c_v+4 - .byte N06 , Dn6 , v060 - .byte W03 - .byte W03 - .byte PAN , c_v+0 - .byte N06 , An5 , v056 - .byte W03 - .byte W03 - .byte PAN , c_v-8 - .byte N06 , Dn6 , v052 - .byte W03 - .byte W03 - .byte PAN , c_v+0 - .byte N06 , An5 , v048 - .byte W03 - .byte W03 - .byte PAN , c_v+8 - .byte N06 , Dn6 , v044 - .byte W03 - .byte W03 - .byte PAN , c_v+0 - .byte N06 , An5 , v040 - .byte W03 - .byte W03 - .byte PAN , c_v-8 - .byte N06 , Dn6 , v036 - .byte W03 - .byte W03 - .byte PAN , c_v+0 - .byte N06 , An5 , v032 - .byte W03 - .byte W03 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_petal_dance_2: - .byte KEYSH , se_m_petal_dance_key+0 - .byte VOICE , 53 - .byte BENDR , 2 - .byte VOL , 43*se_m_petal_dance_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+15 - .byte N06 , En6 , v108 - .byte W03 - .byte W03 - .byte Bn5 , v104 - .byte W03 - .byte W03 - .byte En6 , v100 - .byte W03 - .byte W03 - .byte Bn5 , v096 - .byte W03 - .byte W03 - .byte En6 , v092 - .byte W03 - .byte W03 - .byte Bn5 , v088 - .byte W03 - .byte W03 - .byte En6 - .byte W03 - .byte W03 - .byte Bn5 , v084 - .byte W03 - .byte W03 - .byte En6 , v080 - .byte W03 - .byte W03 - .byte Bn5 , v076 - .byte W03 - .byte W03 - .byte En6 , v072 - .byte W03 - .byte W03 - .byte Bn5 , v068 - .byte W03 - .byte W03 - .byte En6 , v064 - .byte W03 - .byte W03 - .byte Bn5 - .byte W03 - .byte W03 - .byte En6 , v060 - .byte W03 - .byte W03 - .byte Bn5 , v056 - .byte W03 - .byte W03 - .byte En6 , v052 - .byte W03 - .byte W03 - .byte Bn5 , v048 - .byte W03 - .byte W03 - .byte En6 , v044 - .byte W03 - .byte W03 - .byte Bn5 , v040 - .byte W03 - .byte W03 - .byte En6 , v036 - .byte W03 - .byte W03 - .byte Bn5 , v032 - .byte W03 - .byte W03 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_petal_dance: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_petal_dance_pri @ Priority - .byte se_m_petal_dance_rev @ Reverb. - - .word se_m_petal_dance_grp - - .word se_m_petal_dance_1 - .word se_m_petal_dance_2 - - .end diff --git a/sound/songs/se_m_poison_powder.s b/sound/songs/se_m_poison_powder.s deleted file mode 100644 index f48637385..000000000 --- a/sound/songs/se_m_poison_powder.s +++ /dev/null @@ -1,58 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_poison_powder_grp, voicegroup128 - .equ se_m_poison_powder_pri, 4 - .equ se_m_poison_powder_rev, reverb_set+50 - .equ se_m_poison_powder_mvl, 127 - .equ se_m_poison_powder_key, 0 - .equ se_m_poison_powder_tbs, 1 - .equ se_m_poison_powder_exg, 0 - .equ se_m_poison_powder_cmp, 1 - - .section .rodata - .global se_m_poison_powder - .align 2 - -@********************** Track 1 **********************@ - -se_m_poison_powder_1: - .byte KEYSH , se_m_poison_powder_key+0 - .byte TEMPO , 150*se_m_poison_powder_tbs/2 - .byte VOICE , 18 - .byte BENDR , 12 - .byte VOL , 55*se_m_poison_powder_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+1 - .byte N01 , Cn6 , v100 - .byte W01 - .byte VOL , 110*se_m_poison_powder_mvl/mxv - .byte W01 - .byte VOICE , 36 - .byte VOL , 55*se_m_poison_powder_mvl/mxv - .byte N02 , Gn6 , v080 - .byte W01 - .byte VOL , 110*se_m_poison_powder_mvl/mxv - .byte W04 - .byte PAN , c_v+20 - .byte N01 , Gn6 , v024 - .byte W03 - .byte Gn6 , v016 - .byte W02 - .byte PAN , c_v-21 - .byte W12 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_poison_powder: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_poison_powder_pri @ Priority - .byte se_m_poison_powder_rev @ Reverb. - - .word se_m_poison_powder_grp - - .word se_m_poison_powder_1 - - .end diff --git a/sound/songs/se_m_psybeam.s b/sound/songs/se_m_psybeam.s deleted file mode 100644 index c7f68cffd..000000000 --- a/sound/songs/se_m_psybeam.s +++ /dev/null @@ -1,144 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_psybeam_grp, voicegroup128 - .equ se_m_psybeam_pri, 4 - .equ se_m_psybeam_rev, reverb_set+50 - .equ se_m_psybeam_mvl, 127 - .equ se_m_psybeam_key, 0 - .equ se_m_psybeam_tbs, 1 - .equ se_m_psybeam_exg, 0 - .equ se_m_psybeam_cmp, 1 - - .section .rodata - .global se_m_psybeam - .align 2 - -@********************** Track 1 **********************@ - -se_m_psybeam_1: - .byte KEYSH , se_m_psybeam_key+0 - .byte TEMPO , 190*se_m_psybeam_tbs/2 - .byte VOICE , 45 - .byte BENDR , 8 - .byte PAN , c_v+0 - .byte VOL , 38*se_m_psybeam_mvl/mxv - .byte MOD , 30 - .byte BEND , c_v+1 - .byte N42 , As2 , v120 - .byte W01 - .byte PAN , c_v+3 - .byte W01 - .byte c_v+5 - .byte VOL , 57*se_m_psybeam_mvl/mxv - .byte W01 - .byte PAN , c_v+9 - .byte W01 - .byte VOL , 71*se_m_psybeam_mvl/mxv - .byte W02 - .byte PAN , c_v+5 - .byte W01 - .byte c_v+1 - .byte VOL , 82*se_m_psybeam_mvl/mxv - .byte W01 - .byte PAN , c_v+0 - .byte W01 - .byte c_v-3 - .byte VOL , 94*se_m_psybeam_mvl/mxv - .byte W01 - .byte PAN , c_v-6 - .byte W02 - .byte c_v-10 - .byte VOL , 110*se_m_psybeam_mvl/mxv - .byte W02 - .byte PAN , c_v-6 - .byte W01 - .byte c_v-3 - .byte W01 - .byte c_v+0 - .byte W02 - .byte W06 - .byte c_v+3 - .byte W01 - .byte c_v+5 - .byte W01 - .byte c_v+9 - .byte W02 - .byte c_v+5 - .byte W02 - .byte c_v+1 - .byte VOL , 95*se_m_psybeam_mvl/mxv - .byte W01 - .byte PAN , c_v+0 - .byte W01 - .byte c_v-3 - .byte VOL , 83*se_m_psybeam_mvl/mxv - .byte W01 - .byte PAN , c_v-6 - .byte W01 - .byte c_v-10 - .byte VOL , 71*se_m_psybeam_mvl/mxv - .byte W02 - .byte W01 - .byte PAN , c_v-6 - .byte VOL , 56*se_m_psybeam_mvl/mxv - .byte W01 - .byte PAN , c_v-3 - .byte W01 - .byte VOL , 38*se_m_psybeam_mvl/mxv - .byte W03 - .byte PAN , c_v+0 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_psybeam_2: - .byte KEYSH , se_m_psybeam_key+0 - .byte VOICE , 47 - .byte BENDR , 8 - .byte PAN , c_v+0 - .byte VOL , 38*se_m_psybeam_mvl/mxv - .byte MOD , 30 - .byte BEND , c_v+1 - .byte N42 , As1 , v040 - .byte W02 - .byte VOL , 57*se_m_psybeam_mvl/mxv - .byte W02 - .byte 71*se_m_psybeam_mvl/mxv - .byte W02 - .byte W01 - .byte 82*se_m_psybeam_mvl/mxv - .byte W02 - .byte 94*se_m_psybeam_mvl/mxv - .byte W03 - .byte 110*se_m_psybeam_mvl/mxv - .byte W06 - .byte W06 - .byte W06 - .byte 95*se_m_psybeam_mvl/mxv - .byte W02 - .byte 83*se_m_psybeam_mvl/mxv - .byte W02 - .byte 71*se_m_psybeam_mvl/mxv - .byte W02 - .byte W01 - .byte 56*se_m_psybeam_mvl/mxv - .byte W02 - .byte 38*se_m_psybeam_mvl/mxv - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_psybeam: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_psybeam_pri @ Priority - .byte se_m_psybeam_rev @ Reverb. - - .word se_m_psybeam_grp - - .word se_m_psybeam_1 - .word se_m_psybeam_2 - - .end diff --git a/sound/songs/se_m_psybeam2.s b/sound/songs/se_m_psybeam2.s deleted file mode 100644 index e26a844c9..000000000 --- a/sound/songs/se_m_psybeam2.s +++ /dev/null @@ -1,216 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_psybeam2_grp, voicegroup128 - .equ se_m_psybeam2_pri, 4 - .equ se_m_psybeam2_rev, reverb_set+50 - .equ se_m_psybeam2_mvl, 127 - .equ se_m_psybeam2_key, 0 - .equ se_m_psybeam2_tbs, 1 - .equ se_m_psybeam2_exg, 0 - .equ se_m_psybeam2_cmp, 1 - - .section .rodata - .global se_m_psybeam2 - .align 2 - -@********************** Track 1 **********************@ - -se_m_psybeam2_1: - .byte KEYSH , se_m_psybeam2_key+0 - .byte TEMPO , 190*se_m_psybeam2_tbs/2 - .byte VOICE , 45 - .byte BENDR , 8 - .byte VOL , 36*se_m_psybeam2_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v-44 - .byte N12 , Gs2 , v127 - .byte W01 - .byte VOL , 52*se_m_psybeam2_mvl/mxv - .byte PAN , c_v+6 - .byte BEND , c_v-20 - .byte W01 - .byte VOL , 67*se_m_psybeam2_mvl/mxv - .byte PAN , c_v-6 - .byte BEND , c_v+17 - .byte W01 - .byte VOL , 78*se_m_psybeam2_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+27 - .byte W01 - .byte VOL , 105*se_m_psybeam2_mvl/mxv - .byte PAN , c_v+6 - .byte BEND , c_v+44 - .byte W02 - .byte PAN , c_v-6 - .byte BEND , c_v+63 - .byte W01 - .byte PAN , c_v+0 - .byte BEND , c_v+44 - .byte W01 - .byte VOL , 86*se_m_psybeam2_mvl/mxv - .byte PAN , c_v+6 - .byte BEND , c_v+28 - .byte W01 - .byte VOL , 55*se_m_psybeam2_mvl/mxv - .byte PAN , c_v-6 - .byte BEND , c_v+17 - .byte W01 - .byte VOL , 33*se_m_psybeam2_mvl/mxv - .byte BEND , c_v+5 - .byte W02 - .byte VOICE , 37 - .byte VOL , 105*se_m_psybeam2_mvl/mxv - .byte N02 , Gs3 , v080 - .byte W01 - .byte BEND , c_v+16 - .byte W01 - .byte VOICE , 45 - .byte VOL , 36*se_m_psybeam2_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v-44 - .byte N12 , As2 , v127 - .byte W01 - .byte VOL , 52*se_m_psybeam2_mvl/mxv - .byte PAN , c_v+6 - .byte BEND , c_v-20 - .byte W01 - .byte VOL , 67*se_m_psybeam2_mvl/mxv - .byte PAN , c_v-6 - .byte BEND , c_v+17 - .byte W02 - .byte VOL , 78*se_m_psybeam2_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+27 - .byte W01 - .byte VOL , 105*se_m_psybeam2_mvl/mxv - .byte PAN , c_v+11 - .byte BEND , c_v+44 - .byte W01 - .byte PAN , c_v-11 - .byte BEND , c_v+63 - .byte W01 - .byte PAN , c_v+0 - .byte BEND , c_v+44 - .byte W01 - .byte VOL , 86*se_m_psybeam2_mvl/mxv - .byte PAN , c_v+11 - .byte BEND , c_v+28 - .byte W02 - .byte VOL , 55*se_m_psybeam2_mvl/mxv - .byte PAN , c_v-11 - .byte BEND , c_v+17 - .byte W01 - .byte VOL , 33*se_m_psybeam2_mvl/mxv - .byte BEND , c_v+5 - .byte W01 - .byte VOICE , 37 - .byte VOL , 105*se_m_psybeam2_mvl/mxv - .byte N02 , As3 , v056 - .byte W01 - .byte BEND , c_v+16 - .byte W01 - .byte VOICE , 45 - .byte VOL , 36*se_m_psybeam2_mvl/mxv - .byte BEND , c_v-44 - .byte N12 , Gs2 , v080 - .byte W02 - .byte VOL , 52*se_m_psybeam2_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v-20 - .byte W01 - .byte VOL , 67*se_m_psybeam2_mvl/mxv - .byte PAN , c_v+6 - .byte BEND , c_v+17 - .byte W01 - .byte VOL , 78*se_m_psybeam2_mvl/mxv - .byte PAN , c_v-6 - .byte BEND , c_v+27 - .byte W01 - .byte VOL , 105*se_m_psybeam2_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+44 - .byte W01 - .byte PAN , c_v+6 - .byte BEND , c_v+63 - .byte W02 - .byte PAN , c_v-6 - .byte BEND , c_v+44 - .byte W01 - .byte VOL , 86*se_m_psybeam2_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+28 - .byte W01 - .byte VOL , 55*se_m_psybeam2_mvl/mxv - .byte PAN , c_v+6 - .byte BEND , c_v+17 - .byte W01 - .byte VOL , 33*se_m_psybeam2_mvl/mxv - .byte PAN , c_v-6 - .byte BEND , c_v+5 - .byte W01 - .byte VOICE , 37 - .byte VOL , 105*se_m_psybeam2_mvl/mxv - .byte N02 , Gs3 , v024 - .byte W02 - .byte BEND , c_v+16 - .byte W01 - .byte VOICE , 45 - .byte VOL , 36*se_m_psybeam2_mvl/mxv - .byte BEND , c_v-44 - .byte N12 , As2 , v040 - .byte W01 - .byte VOL , 52*se_m_psybeam2_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v-20 - .byte W01 - .byte VOL , 67*se_m_psybeam2_mvl/mxv - .byte PAN , c_v+6 - .byte BEND , c_v+17 - .byte W01 - .byte VOL , 78*se_m_psybeam2_mvl/mxv - .byte PAN , c_v-6 - .byte BEND , c_v+27 - .byte W02 - .byte VOL , 105*se_m_psybeam2_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+44 - .byte W01 - .byte PAN , c_v+11 - .byte BEND , c_v+63 - .byte W01 - .byte PAN , c_v-11 - .byte BEND , c_v+44 - .byte W01 - .byte VOL , 86*se_m_psybeam2_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+28 - .byte W01 - .byte VOL , 55*se_m_psybeam2_mvl/mxv - .byte PAN , c_v+11 - .byte BEND , c_v+17 - .byte W02 - .byte VOL , 33*se_m_psybeam2_mvl/mxv - .byte BEND , c_v+5 - .byte W01 - .byte VOICE , 37 - .byte VOL , 105*se_m_psybeam2_mvl/mxv - .byte N02 , As3 , v016 - .byte W01 - .byte BEND , c_v+16 - .byte W04 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_psybeam2: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_psybeam2_pri @ Priority - .byte se_m_psybeam2_rev @ Reverb. - - .word se_m_psybeam2_grp - - .word se_m_psybeam2_1 - - .end diff --git a/sound/songs/se_m_rain_dance.s b/sound/songs/se_m_rain_dance.s deleted file mode 100644 index 810be0663..000000000 --- a/sound/songs/se_m_rain_dance.s +++ /dev/null @@ -1,116 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_rain_dance_grp, voicegroup128 - .equ se_m_rain_dance_pri, 4 - .equ se_m_rain_dance_rev, reverb_set+50 - .equ se_m_rain_dance_mvl, 127 - .equ se_m_rain_dance_key, 0 - .equ se_m_rain_dance_tbs, 1 - .equ se_m_rain_dance_exg, 0 - .equ se_m_rain_dance_cmp, 1 - - .section .rodata - .global se_m_rain_dance - .align 2 - -@********************** Track 1 **********************@ - -se_m_rain_dance_1: - .byte KEYSH , se_m_rain_dance_key+0 - .byte TEMPO , 220*se_m_rain_dance_tbs/2 - .byte VOICE , 36 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 20*se_m_rain_dance_mvl/mxv - .byte BEND , c_v+0 - .byte TIE , Gn3 , v064 - .byte W03 - .byte VOL , 37*se_m_rain_dance_mvl/mxv - .byte W03 - .byte 53*se_m_rain_dance_mvl/mxv - .byte W03 - .byte 60*se_m_rain_dance_mvl/mxv - .byte W03 - .byte 71*se_m_rain_dance_mvl/mxv - .byte W03 - .byte 81*se_m_rain_dance_mvl/mxv - .byte W03 - .byte 93*se_m_rain_dance_mvl/mxv - .byte W03 - .byte 110*se_m_rain_dance_mvl/mxv - .byte W03 - .byte PAN , c_v+3 - .byte W06 - .byte c_v+11 - .byte W12 - .byte c_v+20 - .byte W06 - .byte c_v+25 - .byte W12 - .byte c_v+14 - .byte W06 - .byte c_v+8 - .byte W06 - .byte W06 - .byte c_v-3 - .byte W12 - .byte c_v-16 - .byte W06 - .byte W06 - .byte c_v-26 - .byte W12 - .byte c_v-16 - .byte W06 - .byte VOL , 104*se_m_rain_dance_mvl/mxv - .byte PAN , c_v-5 - .byte W03 - .byte VOL , 101*se_m_rain_dance_mvl/mxv - .byte W03 - .byte 98*se_m_rain_dance_mvl/mxv - .byte PAN , c_v+6 - .byte W03 - .byte VOL , 93*se_m_rain_dance_mvl/mxv - .byte W03 - .byte 90*se_m_rain_dance_mvl/mxv - .byte PAN , c_v+14 - .byte W03 - .byte VOL , 86*se_m_rain_dance_mvl/mxv - .byte W03 - .byte 83*se_m_rain_dance_mvl/mxv - .byte W03 - .byte 77*se_m_rain_dance_mvl/mxv - .byte W03 - .byte 73*se_m_rain_dance_mvl/mxv - .byte PAN , c_v+24 - .byte W03 - .byte VOL , 66*se_m_rain_dance_mvl/mxv - .byte W03 - .byte 58*se_m_rain_dance_mvl/mxv - .byte W03 - .byte 44*se_m_rain_dance_mvl/mxv - .byte W03 - .byte 32*se_m_rain_dance_mvl/mxv - .byte PAN , c_v+15 - .byte W03 - .byte VOL , 16*se_m_rain_dance_mvl/mxv - .byte W03 - .byte 1*se_m_rain_dance_mvl/mxv - .byte PAN , c_v+4 - .byte W06 - .byte EOT - .byte FINE - -@******************************************************@ - .align 2 - -se_m_rain_dance: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_rain_dance_pri @ Priority - .byte se_m_rain_dance_rev @ Reverb. - - .word se_m_rain_dance_grp - - .word se_m_rain_dance_1 - - .end diff --git a/sound/songs/se_m_reflect.s b/sound/songs/se_m_reflect.s deleted file mode 100644 index 56699c65e..000000000 --- a/sound/songs/se_m_reflect.s +++ /dev/null @@ -1,267 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_reflect_grp, voicegroup128 - .equ se_m_reflect_pri, 4 - .equ se_m_reflect_rev, reverb_set+50 - .equ se_m_reflect_mvl, 127 - .equ se_m_reflect_key, 0 - .equ se_m_reflect_tbs, 1 - .equ se_m_reflect_exg, 0 - .equ se_m_reflect_cmp, 1 - - .section .rodata - .global se_m_reflect - .align 2 - -@********************** Track 1 **********************@ - -se_m_reflect_1: - .byte KEYSH , se_m_reflect_key+0 - .byte TEMPO , 150*se_m_reflect_tbs/2 - .byte VOICE , 19 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 90*se_m_reflect_mvl/mxv - .byte BEND , c_v+6 - .byte N06 , Gn6 , v080 - .byte W01 - .byte BEND , c_v-4 - .byte W01 - .byte PAN , c_v+5 - .byte VOL , 74*se_m_reflect_mvl/mxv - .byte BEND , c_v-14 - .byte W01 - .byte PAN , c_v-6 - .byte VOL , 60*se_m_reflect_mvl/mxv - .byte BEND , c_v-31 - .byte W01 - .byte PAN , c_v+0 - .byte VOL , 20*se_m_reflect_mvl/mxv - .byte BEND , c_v-41 - .byte W02 - .byte VOL , 90*se_m_reflect_mvl/mxv - .byte BEND , c_v+0 - .byte N06 , Gn6 , v072 - .byte W01 - .byte BEND , c_v-11 - .byte W01 - .byte PAN , c_v+5 - .byte VOL , 74*se_m_reflect_mvl/mxv - .byte BEND , c_v-20 - .byte W01 - .byte PAN , c_v-6 - .byte VOL , 60*se_m_reflect_mvl/mxv - .byte BEND , c_v-37 - .byte W01 - .byte PAN , c_v+0 - .byte VOL , 20*se_m_reflect_mvl/mxv - .byte BEND , c_v-47 - .byte W02 - .byte VOL , 90*se_m_reflect_mvl/mxv - .byte BEND , c_v-1 - .byte N06 , Gn6 , v068 - .byte W01 - .byte BEND , c_v-11 - .byte W01 - .byte PAN , c_v+5 - .byte VOL , 74*se_m_reflect_mvl/mxv - .byte BEND , c_v-21 - .byte W01 - .byte PAN , c_v-6 - .byte VOL , 60*se_m_reflect_mvl/mxv - .byte BEND , c_v-38 - .byte W01 - .byte PAN , c_v+0 - .byte VOL , 20*se_m_reflect_mvl/mxv - .byte BEND , c_v-48 - .byte W02 - .byte VOL , 90*se_m_reflect_mvl/mxv - .byte BEND , c_v-1 - .byte N06 , Gn6 , v060 - .byte W01 - .byte BEND , c_v-11 - .byte W01 - .byte PAN , c_v+5 - .byte VOL , 74*se_m_reflect_mvl/mxv - .byte BEND , c_v-21 - .byte W01 - .byte PAN , c_v-6 - .byte VOL , 60*se_m_reflect_mvl/mxv - .byte BEND , c_v-38 - .byte W01 - .byte PAN , c_v+0 - .byte VOL , 20*se_m_reflect_mvl/mxv - .byte BEND , c_v-48 - .byte W02 - .byte VOL , 90*se_m_reflect_mvl/mxv - .byte BEND , c_v-2 - .byte N06 , Gn6 , v052 - .byte W01 - .byte PAN , c_v+5 - .byte BEND , c_v-12 - .byte W01 - .byte PAN , c_v-6 - .byte VOL , 74*se_m_reflect_mvl/mxv - .byte BEND , c_v-22 - .byte W01 - .byte PAN , c_v+8 - .byte VOL , 60*se_m_reflect_mvl/mxv - .byte BEND , c_v-39 - .byte W01 - .byte PAN , c_v-10 - .byte VOL , 20*se_m_reflect_mvl/mxv - .byte BEND , c_v-49 - .byte W02 - .byte PAN , c_v+0 - .byte VOL , 90*se_m_reflect_mvl/mxv - .byte BEND , c_v-2 - .byte N06 , Gn6 , v048 - .byte W01 - .byte PAN , c_v+5 - .byte BEND , c_v-12 - .byte W01 - .byte PAN , c_v-6 - .byte VOL , 74*se_m_reflect_mvl/mxv - .byte BEND , c_v-22 - .byte W01 - .byte PAN , c_v+8 - .byte VOL , 60*se_m_reflect_mvl/mxv - .byte BEND , c_v-39 - .byte W01 - .byte PAN , c_v-10 - .byte VOL , 20*se_m_reflect_mvl/mxv - .byte BEND , c_v-49 - .byte W02 - .byte VOL , 90*se_m_reflect_mvl/mxv - .byte BEND , c_v-2 - .byte N06 , Gn6 , v040 - .byte W01 - .byte PAN , c_v+5 - .byte BEND , c_v-13 - .byte W01 - .byte PAN , c_v-6 - .byte VOL , 74*se_m_reflect_mvl/mxv - .byte BEND , c_v-22 - .byte W01 - .byte PAN , c_v+8 - .byte VOL , 60*se_m_reflect_mvl/mxv - .byte BEND , c_v-39 - .byte W01 - .byte PAN , c_v-10 - .byte VOL , 20*se_m_reflect_mvl/mxv - .byte BEND , c_v-49 - .byte W02 - .byte PAN , c_v+0 - .byte VOL , 90*se_m_reflect_mvl/mxv - .byte BEND , c_v-2 - .byte N06 , Gn6 , v032 - .byte W01 - .byte PAN , c_v+5 - .byte BEND , c_v-13 - .byte W01 - .byte PAN , c_v-6 - .byte VOL , 74*se_m_reflect_mvl/mxv - .byte BEND , c_v-22 - .byte W01 - .byte PAN , c_v+8 - .byte VOL , 60*se_m_reflect_mvl/mxv - .byte BEND , c_v-39 - .byte W01 - .byte PAN , c_v-10 - .byte VOL , 20*se_m_reflect_mvl/mxv - .byte BEND , c_v-49 - .byte W02 - .byte W06 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_reflect_2: - .byte KEYSH , se_m_reflect_key+0 - .byte VOICE , 53 - .byte PAN , c_v+0 - .byte VOL , 90*se_m_reflect_mvl/mxv - .byte W02 - .byte N06 , En6 , v064 - .byte W02 - .byte VOL , 74*se_m_reflect_mvl/mxv - .byte W02 - .byte 60*se_m_reflect_mvl/mxv - .byte W01 - .byte 20*se_m_reflect_mvl/mxv - .byte W01 - .byte 90*se_m_reflect_mvl/mxv - .byte N06 , En6 , v056 - .byte W02 - .byte VOL , 74*se_m_reflect_mvl/mxv - .byte W02 -se_m_reflect_2_000: - .byte VOL , 60*se_m_reflect_mvl/mxv - .byte W01 - .byte 20*se_m_reflect_mvl/mxv - .byte W01 - .byte 90*se_m_reflect_mvl/mxv - .byte N06 , En6 , v052 - .byte W02 - .byte VOL , 74*se_m_reflect_mvl/mxv - .byte W02 - .byte PEND - .byte PATT - .word se_m_reflect_2_000 - .byte VOL , 60*se_m_reflect_mvl/mxv - .byte W01 - .byte 20*se_m_reflect_mvl/mxv - .byte W01 - .byte 90*se_m_reflect_mvl/mxv - .byte N06 , En6 , v048 - .byte W02 - .byte VOL , 74*se_m_reflect_mvl/mxv - .byte W02 - .byte 60*se_m_reflect_mvl/mxv - .byte W01 - .byte 20*se_m_reflect_mvl/mxv - .byte W01 - .byte 90*se_m_reflect_mvl/mxv - .byte N06 , En6 , v044 - .byte W02 - .byte VOL , 74*se_m_reflect_mvl/mxv - .byte W02 - .byte 60*se_m_reflect_mvl/mxv - .byte W01 - .byte 20*se_m_reflect_mvl/mxv - .byte W01 - .byte 90*se_m_reflect_mvl/mxv - .byte N06 , En6 , v040 - .byte W02 - .byte VOL , 74*se_m_reflect_mvl/mxv - .byte W02 - .byte 60*se_m_reflect_mvl/mxv - .byte W01 - .byte 20*se_m_reflect_mvl/mxv - .byte W01 - .byte 90*se_m_reflect_mvl/mxv - .byte N06 , En6 , v036 - .byte W02 - .byte VOL , 74*se_m_reflect_mvl/mxv - .byte W02 - .byte 60*se_m_reflect_mvl/mxv - .byte W01 - .byte 20*se_m_reflect_mvl/mxv - .byte W05 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_reflect: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_reflect_pri @ Priority - .byte se_m_reflect_rev @ Reverb. - - .word se_m_reflect_grp - - .word se_m_reflect_1 - .word se_m_reflect_2 - - .end diff --git a/sound/songs/se_m_reversal.s b/sound/songs/se_m_reversal.s deleted file mode 100644 index 609c399f5..000000000 --- a/sound/songs/se_m_reversal.s +++ /dev/null @@ -1,336 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_reversal_grp, voicegroup128 - .equ se_m_reversal_pri, 4 - .equ se_m_reversal_rev, reverb_set+50 - .equ se_m_reversal_mvl, 127 - .equ se_m_reversal_key, 0 - .equ se_m_reversal_tbs, 1 - .equ se_m_reversal_exg, 0 - .equ se_m_reversal_cmp, 1 - - .section .rodata - .global se_m_reversal - .align 2 - -@********************** Track 1 **********************@ - -se_m_reversal_1: - .byte KEYSH , se_m_reversal_key+0 - .byte TEMPO , 150*se_m_reversal_tbs/2 - .byte VOICE , 19 - .byte BENDR , 24 - .byte VOL , 100*se_m_reversal_mvl/mxv - .byte PAN , c_v+0 - .byte VOL , 100*se_m_reversal_mvl/mxv - .byte N03 , Cn5 , v092 - .byte W01 - .byte VOL , 72*se_m_reversal_mvl/mxv - .byte W01 - .byte 40*se_m_reversal_mvl/mxv - .byte BEND , c_v+31 - .byte W01 - .byte VOICE , 22 - .byte PAN , c_v-10 - .byte BEND , c_v+0 - .byte N01 , Gn4 , v127 - .byte W01 - .byte VOICE , 19 - .byte VOL , 100*se_m_reversal_mvl/mxv - .byte PAN , c_v-1 - .byte BEND , c_v-33 - .byte N03 , Cs5 , v092 - .byte W02 - .byte VOL , 72*se_m_reversal_mvl/mxv - .byte W01 - .byte 40*se_m_reversal_mvl/mxv - .byte BEND , c_v+31 - .byte W01 - .byte VOICE , 22 - .byte PAN , c_v+10 - .byte BEND , c_v+0 - .byte N01 , Gs4 , v127 - .byte W01 - .byte VOICE , 19 - .byte VOL , 100*se_m_reversal_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v-33 - .byte N03 , Dn5 , v092 - .byte W01 - .byte VOL , 72*se_m_reversal_mvl/mxv - .byte W02 - .byte 40*se_m_reversal_mvl/mxv - .byte BEND , c_v+31 - .byte W01 - .byte VOICE , 22 - .byte PAN , c_v-14 - .byte BEND , c_v+0 - .byte N01 , An4 , v127 - .byte W01 - .byte VOICE , 19 - .byte VOL , 100*se_m_reversal_mvl/mxv - .byte PAN , c_v-1 - .byte BEND , c_v-33 - .byte N03 , Ds5 , v092 - .byte W01 - .byte VOL , 72*se_m_reversal_mvl/mxv - .byte W01 - .byte 40*se_m_reversal_mvl/mxv - .byte BEND , c_v+31 - .byte W02 - .byte VOICE , 22 - .byte PAN , c_v+14 - .byte BEND , c_v+0 - .byte N01 , As4 , v127 - .byte W01 - .byte VOICE , 19 - .byte VOL , 100*se_m_reversal_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v-33 - .byte N03 , En5 , v092 - .byte W01 - .byte VOL , 72*se_m_reversal_mvl/mxv - .byte W01 - .byte 40*se_m_reversal_mvl/mxv - .byte BEND , c_v+31 - .byte W01 - .byte VOICE , 22 - .byte PAN , c_v-18 - .byte BEND , c_v+0 - .byte N01 , Bn4 , v127 - .byte W02 - .byte VOICE , 19 - .byte VOL , 100*se_m_reversal_mvl/mxv - .byte PAN , c_v-1 - .byte BEND , c_v-33 - .byte N03 , Fn5 , v092 - .byte W01 - .byte VOL , 72*se_m_reversal_mvl/mxv - .byte W01 - .byte 40*se_m_reversal_mvl/mxv - .byte BEND , c_v+31 - .byte W01 - .byte VOICE , 22 - .byte PAN , c_v+18 - .byte BEND , c_v+0 - .byte N01 , Cn5 , v127 - .byte W01 - .byte VOICE , 19 - .byte VOL , 100*se_m_reversal_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v-33 - .byte N03 , Fs5 , v092 - .byte W02 - .byte VOL , 72*se_m_reversal_mvl/mxv - .byte W01 - .byte 40*se_m_reversal_mvl/mxv - .byte BEND , c_v+31 - .byte W01 - .byte VOICE , 22 - .byte PAN , c_v-14 - .byte BEND , c_v+0 - .byte N01 , Cs5 , v127 - .byte W01 - .byte VOICE , 19 - .byte VOL , 100*se_m_reversal_mvl/mxv - .byte PAN , c_v-1 - .byte BEND , c_v-33 - .byte N03 , Gn5 , v092 - .byte W01 - .byte VOL , 72*se_m_reversal_mvl/mxv - .byte W02 - .byte 40*se_m_reversal_mvl/mxv - .byte BEND , c_v+31 - .byte W01 - .byte VOICE , 22 - .byte PAN , c_v+14 - .byte BEND , c_v+0 - .byte N01 , Dn5 , v127 - .byte W01 - .byte VOICE , 19 - .byte VOL , 100*se_m_reversal_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v-33 - .byte N03 , Gs5 , v092 - .byte W01 - .byte VOL , 72*se_m_reversal_mvl/mxv - .byte W01 - .byte 40*se_m_reversal_mvl/mxv - .byte BEND , c_v+31 - .byte W02 - .byte VOICE , 22 - .byte PAN , c_v-10 - .byte BEND , c_v+0 - .byte N01 , Ds5 , v127 - .byte W01 - .byte VOICE , 19 - .byte VOL , 100*se_m_reversal_mvl/mxv - .byte PAN , c_v-1 - .byte BEND , c_v-33 - .byte N03 , An5 , v092 - .byte W01 - .byte VOL , 72*se_m_reversal_mvl/mxv - .byte W01 - .byte 40*se_m_reversal_mvl/mxv - .byte BEND , c_v+31 - .byte W01 - .byte VOICE , 22 - .byte PAN , c_v+10 - .byte BEND , c_v+0 - .byte N01 , En5 , v127 - .byte W02 - .byte VOICE , 19 - .byte VOL , 100*se_m_reversal_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v-33 - .byte N03 , As5 , v092 - .byte W01 - .byte VOL , 72*se_m_reversal_mvl/mxv - .byte W01 - .byte 40*se_m_reversal_mvl/mxv - .byte BEND , c_v+31 - .byte W01 - .byte VOICE , 22 - .byte PAN , c_v-10 - .byte BEND , c_v+0 - .byte N01 , Fn5 , v127 - .byte W01 - .byte VOICE , 19 - .byte VOL , 100*se_m_reversal_mvl/mxv - .byte PAN , c_v-1 - .byte BEND , c_v-33 - .byte N03 , Bn5 , v092 - .byte W02 - .byte VOL , 72*se_m_reversal_mvl/mxv - .byte W01 - .byte 40*se_m_reversal_mvl/mxv - .byte BEND , c_v+31 - .byte W01 - .byte VOICE , 22 - .byte PAN , c_v+10 - .byte BEND , c_v+0 - .byte N01 , Fs5 , v127 - .byte W01 - .byte BEND , c_v-33 - .byte W03 - .byte W06 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_reversal_2: - .byte KEYSH , se_m_reversal_key+0 - .byte VOICE , 17 - .byte VOL , 100*se_m_reversal_mvl/mxv - .byte W02 - .byte BEND , c_v+31 - .byte N03 , Cn5 , v040 - .byte W01 - .byte BEND , c_v+0 - .byte W01 - .byte c_v-33 - .byte W02 - .byte W01 - .byte c_v+31 - .byte N03 , Cs5 - .byte W01 - .byte BEND , c_v+0 - .byte W01 - .byte c_v-33 - .byte W03 - .byte c_v+31 - .byte N03 , Dn5 - .byte W01 - .byte BEND , c_v+0 - .byte W01 - .byte c_v-33 - .byte W02 - .byte c_v+31 - .byte N03 , Ds5 - .byte W02 - .byte BEND , c_v+0 - .byte W01 - .byte c_v-33 - .byte W02 - .byte c_v+31 - .byte N03 , En5 - .byte W01 - .byte BEND , c_v+0 - .byte W02 - .byte c_v-33 - .byte W02 - .byte c_v+31 - .byte N03 , Fn5 - .byte W01 - .byte BEND , c_v+0 - .byte W01 - .byte c_v-33 - .byte W02 - .byte W01 - .byte c_v+31 - .byte N03 , Fs5 - .byte W01 - .byte BEND , c_v+0 - .byte W01 - .byte c_v-33 - .byte W03 - .byte c_v+31 - .byte N03 , Gn5 - .byte W01 - .byte BEND , c_v+0 - .byte W01 - .byte c_v-33 - .byte W02 - .byte c_v+31 - .byte N03 , Gs5 - .byte W02 - .byte BEND , c_v+0 - .byte W01 - .byte c_v-33 - .byte W02 - .byte c_v+31 - .byte N03 , An5 - .byte W01 - .byte BEND , c_v+0 - .byte W02 - .byte c_v-33 - .byte W02 - .byte c_v+31 - .byte N03 , As5 - .byte W01 - .byte BEND , c_v+0 - .byte W01 - .byte c_v-33 - .byte W02 - .byte W01 - .byte c_v+31 - .byte N03 , Bn5 - .byte W01 - .byte BEND , c_v+0 - .byte W01 - .byte c_v-33 - .byte W03 - .byte c_v+31 - .byte N03 , Bn5 , v020 - .byte W01 - .byte BEND , c_v+0 - .byte W01 - .byte c_v-33 - .byte W04 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_reversal: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_reversal_pri @ Priority - .byte se_m_reversal_rev @ Reverb. - - .word se_m_reversal_grp - - .word se_m_reversal_1 - .word se_m_reversal_2 - - .end diff --git a/sound/songs/se_m_rock_throw.s b/sound/songs/se_m_rock_throw.s deleted file mode 100644 index 71dddd447..000000000 --- a/sound/songs/se_m_rock_throw.s +++ /dev/null @@ -1,65 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_rock_throw_grp, voicegroup128 - .equ se_m_rock_throw_pri, 4 - .equ se_m_rock_throw_rev, reverb_set+50 - .equ se_m_rock_throw_mvl, 127 - .equ se_m_rock_throw_key, 0 - .equ se_m_rock_throw_tbs, 1 - .equ se_m_rock_throw_exg, 0 - .equ se_m_rock_throw_cmp, 1 - - .section .rodata - .global se_m_rock_throw - .align 2 - -@********************** Track 1 **********************@ - -se_m_rock_throw_1: - .byte KEYSH , se_m_rock_throw_key+0 - .byte TEMPO , 150*se_m_rock_throw_tbs/2 - .byte VOICE , 26 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 105*se_m_rock_throw_mvl/mxv - .byte BEND , c_v+0 - .byte N06 , En3 , v127 - .byte W03 - .byte PAN , c_v-8 - .byte BEND , c_v-34 - .byte W03 - .byte PAN , c_v+7 - .byte N03 , Gn3 , v100 - .byte W03 - .byte PAN , c_v-15 - .byte BEND , c_v+4 - .byte N06 , En3 , v127 - .byte W03 - .byte PAN , c_v+16 - .byte BEND , c_v-13 - .byte W03 - .byte PAN , c_v-1 - .byte BEND , c_v+0 - .byte N06 , Cn3 , v084 - .byte W06 - .byte BEND , c_v-20 - .byte N06 , En3 , v068 - .byte W03 - .byte BEND , c_v-41 - .byte W24 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_rock_throw: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_rock_throw_pri @ Priority - .byte se_m_rock_throw_rev @ Reverb. - - .word se_m_rock_throw_grp - - .word se_m_rock_throw_1 - - .end diff --git a/sound/songs/se_m_sacred_fire.s b/sound/songs/se_m_sacred_fire.s deleted file mode 100644 index 5e6c864e2..000000000 --- a/sound/songs/se_m_sacred_fire.s +++ /dev/null @@ -1,105 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_sacred_fire_grp, voicegroup128 - .equ se_m_sacred_fire_pri, 4 - .equ se_m_sacred_fire_rev, reverb_set+50 - .equ se_m_sacred_fire_mvl, 127 - .equ se_m_sacred_fire_key, 0 - .equ se_m_sacred_fire_tbs, 1 - .equ se_m_sacred_fire_exg, 0 - .equ se_m_sacred_fire_cmp, 1 - - .section .rodata - .global se_m_sacred_fire - .align 2 - -@********************** Track 1 **********************@ - -se_m_sacred_fire_1: - .byte KEYSH , se_m_sacred_fire_key+0 - .byte TEMPO , 150*se_m_sacred_fire_tbs/2 - .byte VOICE , 29 - .byte BENDR , 12 - .byte VOL , 110*se_m_sacred_fire_mvl/mxv - .byte PAN , c_v+5 - .byte BEND , c_v+0 - .byte N04 , Cn3 , v127 - .byte W03 - .byte PAN , c_v+0 - .byte W01 - .byte N18 , Gn4 - .byte W02 - .byte PAN , c_v-5 - .byte W01 - .byte VOL , 98*se_m_sacred_fire_mvl/mxv - .byte BEND , c_v+2 - .byte W02 - .byte PAN , c_v+0 - .byte W01 - .byte VOL , 83*se_m_sacred_fire_mvl/mxv - .byte BEND , c_v+6 - .byte W02 - .byte PAN , c_v+5 - .byte W01 - .byte BEND , c_v+9 - .byte W01 - .byte VOL , 63*se_m_sacred_fire_mvl/mxv - .byte W01 - .byte PAN , c_v+0 - .byte W01 - .byte BEND , c_v+13 - .byte W02 - .byte VOL , 44*se_m_sacred_fire_mvl/mxv - .byte PAN , c_v-5 - .byte W02 - .byte VOL , 28*se_m_sacred_fire_mvl/mxv - .byte BEND , c_v+20 - .byte W01 - .byte PAN , c_v-2 - .byte W01 - .byte VOL , 12*se_m_sacred_fire_mvl/mxv - .byte W02 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_sacred_fire_2: - .byte KEYSH , se_m_sacred_fire_key+0 - .byte VOICE , 27 - .byte PAN , c_v+0 - .byte VOL , 110*se_m_sacred_fire_mvl/mxv - .byte N01 , Gn2 , v032 - .byte W02 - .byte N01 - .byte W02 - .byte N18 - .byte W03 - .byte VOL , 98*se_m_sacred_fire_mvl/mxv - .byte W03 - .byte 83*se_m_sacred_fire_mvl/mxv - .byte W04 - .byte 63*se_m_sacred_fire_mvl/mxv - .byte W04 - .byte 44*se_m_sacred_fire_mvl/mxv - .byte W02 - .byte 28*se_m_sacred_fire_mvl/mxv - .byte W02 - .byte 12*se_m_sacred_fire_mvl/mxv - .byte W02 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_sacred_fire: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_sacred_fire_pri @ Priority - .byte se_m_sacred_fire_rev @ Reverb. - - .word se_m_sacred_fire_grp - - .word se_m_sacred_fire_1 - .word se_m_sacred_fire_2 - - .end diff --git a/sound/songs/se_m_sacred_fire2.s b/sound/songs/se_m_sacred_fire2.s deleted file mode 100644 index f255e712a..000000000 --- a/sound/songs/se_m_sacred_fire2.s +++ /dev/null @@ -1,180 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_sacred_fire2_grp, voicegroup128 - .equ se_m_sacred_fire2_pri, 4 - .equ se_m_sacred_fire2_rev, reverb_set+50 - .equ se_m_sacred_fire2_mvl, 127 - .equ se_m_sacred_fire2_key, 0 - .equ se_m_sacred_fire2_tbs, 1 - .equ se_m_sacred_fire2_exg, 0 - .equ se_m_sacred_fire2_cmp, 1 - - .section .rodata - .global se_m_sacred_fire2 - .align 2 - -@********************** Track 1 **********************@ - -se_m_sacred_fire2_1: - .byte KEYSH , se_m_sacred_fire2_key+0 - .byte TEMPO , 150*se_m_sacred_fire2_tbs/2 - .byte VOICE , 29 - .byte BENDR , 12 - .byte VOL , 22*se_m_sacred_fire2_mvl/mxv - .byte PAN , c_v+5 - .byte BEND , c_v+0 - .byte N96 , Gn3 , v127 - .byte W01 - .byte VOL , 49*se_m_sacred_fire2_mvl/mxv - .byte W01 - .byte 71*se_m_sacred_fire2_mvl/mxv - .byte W01 - .byte PAN , c_v+0 - .byte VOL , 95*se_m_sacred_fire2_mvl/mxv - .byte BEND , c_v+8 - .byte W01 - .byte VOL , 110*se_m_sacred_fire2_mvl/mxv - .byte W02 - .byte PAN , c_v-5 - .byte BEND , c_v+16 - .byte W03 - .byte VOL , 97*se_m_sacred_fire2_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+7 - .byte W03 - .byte PAN , c_v+5 - .byte BEND , c_v+0 - .byte W01 - .byte VOL , 84*se_m_sacred_fire2_mvl/mxv - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v-9 - .byte W03 - .byte VOL , 76*se_m_sacred_fire2_mvl/mxv - .byte PAN , c_v-5 - .byte BEND , c_v-24 - .byte W03 - .byte PAN , c_v-2 - .byte BEND , c_v-46 - .byte W03 - .byte VOL , 84*se_m_sacred_fire2_mvl/mxv - .byte PAN , c_v+5 - .byte W03 - .byte c_v+0 - .byte W01 - .byte VOL , 92*se_m_sacred_fire2_mvl/mxv - .byte W02 - .byte PAN , c_v-5 - .byte W01 - .byte BEND , c_v-32 - .byte W02 - .byte PAN , c_v+0 - .byte W01 - .byte VOL , 86*se_m_sacred_fire2_mvl/mxv - .byte W02 - .byte PAN , c_v+5 - .byte W02 - .byte BEND , c_v-18 - .byte W01 - .byte VOL , 78*se_m_sacred_fire2_mvl/mxv - .byte PAN , c_v+0 - .byte W03 - .byte c_v-5 - .byte W02 - .byte VOL , 71*se_m_sacred_fire2_mvl/mxv - .byte W01 - .byte PAN , c_v-2 - .byte W03 - .byte c_v+5 - .byte W03 - .byte c_v+0 - .byte VOL , 78*se_m_sacred_fire2_mvl/mxv - .byte W03 - .byte PAN , c_v-5 - .byte W02 - .byte VOL , 86*se_m_sacred_fire2_mvl/mxv - .byte W01 - .byte PAN , c_v+0 - .byte W03 - .byte c_v+5 - .byte W02 - .byte VOL , 90*se_m_sacred_fire2_mvl/mxv - .byte W01 - .byte PAN , c_v+0 - .byte W03 - .byte c_v-5 - .byte W03 - .byte c_v-2 - .byte W01 - .byte VOL , 80*se_m_sacred_fire2_mvl/mxv - .byte W02 - .byte PAN , c_v+5 - .byte W03 - .byte c_v+0 - .byte W01 - .byte VOL , 86*se_m_sacred_fire2_mvl/mxv - .byte W02 - .byte PAN , c_v-5 - .byte W03 - .byte c_v+0 - .byte VOL , 83*se_m_sacred_fire2_mvl/mxv - .byte W03 - .byte PAN , c_v+5 - .byte VOL , 63*se_m_sacred_fire2_mvl/mxv - .byte W03 - .byte 37*se_m_sacred_fire2_mvl/mxv - .byte PAN , c_v+0 - .byte W03 - .byte c_v-5 - .byte VOL , 13*se_m_sacred_fire2_mvl/mxv - .byte W03 - .byte PAN , c_v-2 - .byte W03 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_sacred_fire2_2: - .byte KEYSH , se_m_sacred_fire2_key+0 - .byte VOICE , 27 - .byte VOL , 22*se_m_sacred_fire2_mvl/mxv - .byte N96 , Gn2 , v032 - .byte W01 - .byte VOL , 49*se_m_sacred_fire2_mvl/mxv - .byte W01 - .byte 71*se_m_sacred_fire2_mvl/mxv - .byte W01 - .byte 95*se_m_sacred_fire2_mvl/mxv - .byte W01 - .byte 110*se_m_sacred_fire2_mvl/mxv - .byte W05 - .byte 97*se_m_sacred_fire2_mvl/mxv - .byte W15 - .byte W24 - .byte W24 - .byte W09 - .byte 83*se_m_sacred_fire2_mvl/mxv - .byte W03 - .byte 63*se_m_sacred_fire2_mvl/mxv - .byte W03 - .byte 37*se_m_sacred_fire2_mvl/mxv - .byte W03 - .byte 13*se_m_sacred_fire2_mvl/mxv - .byte W06 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_sacred_fire2: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_sacred_fire2_pri @ Priority - .byte se_m_sacred_fire2_rev @ Reverb. - - .word se_m_sacred_fire2_grp - - .word se_m_sacred_fire2_1 - .word se_m_sacred_fire2_2 - - .end diff --git a/sound/songs/se_m_sand_tomb.s b/sound/songs/se_m_sand_tomb.s deleted file mode 100644 index 8edf0abf8..000000000 --- a/sound/songs/se_m_sand_tomb.s +++ /dev/null @@ -1,197 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_sand_tomb_grp, voicegroup128 - .equ se_m_sand_tomb_pri, 4 - .equ se_m_sand_tomb_rev, reverb_set+50 - .equ se_m_sand_tomb_mvl, 127 - .equ se_m_sand_tomb_key, 0 - .equ se_m_sand_tomb_tbs, 1 - .equ se_m_sand_tomb_exg, 0 - .equ se_m_sand_tomb_cmp, 1 - - .section .rodata - .global se_m_sand_tomb - .align 2 - -@********************** Track 1 **********************@ - -se_m_sand_tomb_1: - .byte KEYSH , se_m_sand_tomb_key+0 - .byte TEMPO , 150*se_m_sand_tomb_tbs/2 - .byte VOICE , 22 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 64*se_m_sand_tomb_mvl/mxv - .byte BEND , c_v+0 - .byte N96 , En2 , v127 - .byte W03 - .byte VOL , 79*se_m_sand_tomb_mvl/mxv - .byte BEND , c_v+22 - .byte W02 - .byte c_v+8 - .byte W01 - .byte VOL , 84*se_m_sand_tomb_mvl/mxv - .byte PAN , c_v-4 - .byte W03 - .byte VOL , 91*se_m_sand_tomb_mvl/mxv - .byte BEND , c_v+0 - .byte W03 - .byte VOL , 100*se_m_sand_tomb_mvl/mxv - .byte PAN , c_v-8 - .byte W03 - .byte VOL , 110*se_m_sand_tomb_mvl/mxv - .byte W03 - .byte PAN , c_v-12 - .byte W06 - .byte c_v-17 - .byte BEND , c_v+0 - .byte W03 - .byte c_v-7 - .byte W03 - .byte PAN , c_v-9 - .byte BEND , c_v-12 - .byte W03 - .byte c_v-20 - .byte W03 - .byte PAN , c_v-3 - .byte W03 - .byte c_v+6 - .byte BEND , c_v-13 - .byte W03 - .byte PAN , c_v+10 - .byte W03 - .byte BEND , c_v-6 - .byte W03 - .byte PAN , c_v+16 - .byte W03 - .byte BEND , c_v+6 - .byte W03 - .byte PAN , c_v+13 - .byte BEND , c_v+11 - .byte W03 - .byte c_v+20 - .byte W03 - .byte PAN , c_v+8 - .byte W03 - .byte c_v+0 - .byte BEND , c_v+12 - .byte W03 - .byte PAN , c_v-8 - .byte BEND , c_v+7 - .byte W03 - .byte PAN , c_v-11 - .byte W03 - .byte c_v-17 - .byte VOL , 98*se_m_sand_tomb_mvl/mxv - .byte BEND , c_v+0 - .byte W03 - .byte VOL , 90*se_m_sand_tomb_mvl/mxv - .byte BEND , c_v-7 - .byte W03 - .byte PAN , c_v-9 - .byte BEND , c_v-12 - .byte W01 - .byte VOL , 80*se_m_sand_tomb_mvl/mxv - .byte W02 - .byte BEND , c_v-20 - .byte W01 - .byte VOL , 71*se_m_sand_tomb_mvl/mxv - .byte W02 - .byte PAN , c_v-3 - .byte W02 - .byte VOL , 58*se_m_sand_tomb_mvl/mxv - .byte W01 - .byte PAN , c_v+6 - .byte BEND , c_v-13 - .byte W03 - .byte PAN , c_v+10 - .byte VOL , 45*se_m_sand_tomb_mvl/mxv - .byte W02 - .byte 27*se_m_sand_tomb_mvl/mxv - .byte W01 - .byte BEND , c_v-6 - .byte W01 - .byte VOL , 11*se_m_sand_tomb_mvl/mxv - .byte W02 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_sand_tomb_2: - .byte KEYSH , se_m_sand_tomb_key+0 - .byte VOICE , 57 - .byte PAN , c_v+0 - .byte VOL , 110*se_m_sand_tomb_mvl/mxv - .byte N03 , Cn3 , v100 - .byte W03 - .byte En3 , v080 - .byte W04 - .byte Dn3 - .byte W03 - .byte Cn3 , v100 - .byte W04 - .byte En3 , v080 - .byte W04 - .byte Dn3 - .byte W03 - .byte Cn3 , v100 - .byte W03 - .byte W01 - .byte En3 , v080 - .byte W03 - .byte Dn3 - .byte W04 - .byte Cn3 , v100 - .byte W04 - .byte En3 , v080 - .byte W03 - .byte Dn3 - .byte W04 - .byte Cn3 , v100 - .byte W03 - .byte En3 , v080 - .byte W02 - .byte W02 - .byte Dn3 - .byte W04 - .byte Cn3 , v100 - .byte W03 - .byte En3 , v080 - .byte W04 - .byte Dn3 - .byte W03 - .byte Cn3 , v100 - .byte W04 - .byte En3 , v080 - .byte W04 - .byte Dn3 - .byte W03 - .byte Cn3 , v092 - .byte W04 - .byte En3 , v060 - .byte W03 - .byte Dn3 , v052 - .byte W04 - .byte Cn3 , v060 - .byte W04 - .byte En3 , v032 - .byte W03 - .byte N02 , Dn3 , v020 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_sand_tomb: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_sand_tomb_pri @ Priority - .byte se_m_sand_tomb_rev @ Reverb. - - .word se_m_sand_tomb_grp - - .word se_m_sand_tomb_1 - .word se_m_sand_tomb_2 - - .end diff --git a/sound/songs/se_m_sandstorm.s b/sound/songs/se_m_sandstorm.s deleted file mode 100644 index 9674cd043..000000000 --- a/sound/songs/se_m_sandstorm.s +++ /dev/null @@ -1,290 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_sandstorm_grp, voicegroup128 - .equ se_m_sandstorm_pri, 4 - .equ se_m_sandstorm_rev, reverb_set+50 - .equ se_m_sandstorm_mvl, 127 - .equ se_m_sandstorm_key, 0 - .equ se_m_sandstorm_tbs, 1 - .equ se_m_sandstorm_exg, 0 - .equ se_m_sandstorm_cmp, 1 - - .section .rodata - .global se_m_sandstorm - .align 2 - -@********************** Track 1 **********************@ - -se_m_sandstorm_1: - .byte KEYSH , se_m_sandstorm_key+0 - .byte TEMPO , 200*se_m_sandstorm_tbs/2 - .byte VOICE , 2 - .byte BENDR , 12 - .byte PAN , c_v-48 - .byte VOL , 11*se_m_sandstorm_mvl/mxv - .byte BEND , c_v+0 - .byte TIE , En3 , v127 - .byte W03 - .byte VOL , 17*se_m_sandstorm_mvl/mxv - .byte BEND , c_v+22 - .byte W02 - .byte c_v+8 - .byte W01 - .byte VOL , 24*se_m_sandstorm_mvl/mxv - .byte W03 - .byte 32*se_m_sandstorm_mvl/mxv - .byte BEND , c_v+0 - .byte W03 - .byte VOL , 52*se_m_sandstorm_mvl/mxv - .byte W03 - .byte 65*se_m_sandstorm_mvl/mxv - .byte W03 - .byte 76*se_m_sandstorm_mvl/mxv - .byte W02 - .byte 88*se_m_sandstorm_mvl/mxv - .byte PAN , c_v-43 - .byte W02 - .byte VOL , 98*se_m_sandstorm_mvl/mxv - .byte W02 - .byte BEND , c_v+0 - .byte W02 - .byte VOL , 111*se_m_sandstorm_mvl/mxv - .byte W01 - .byte BEND , c_v-7 - .byte W01 - .byte VOL , 127*se_m_sandstorm_mvl/mxv - .byte W02 - .byte BEND , c_v-12 - .byte W02 - .byte PAN , c_v-38 - .byte W01 - .byte BEND , c_v-20 - .byte W06 - .byte c_v-13 - .byte W05 - .byte PAN , c_v-31 - .byte W01 - .byte BEND , c_v-6 - .byte W03 - .byte W03 - .byte c_v+6 - .byte W03 - .byte c_v+11 - .byte W03 - .byte c_v+20 - .byte W01 - .byte PAN , c_v-21 - .byte W05 - .byte BEND , c_v+12 - .byte W03 - .byte c_v+7 - .byte W06 - .byte PAN , c_v-16 - .byte BEND , c_v+0 - .byte W03 - .byte c_v-7 - .byte W03 - .byte c_v-12 - .byte W03 - .byte c_v-20 - .byte W06 - .byte PAN , c_v-7 - .byte BEND , c_v-13 - .byte W06 - .byte c_v-6 - .byte W03 - .byte c_v+0 - .byte W03 - .byte PAN , c_v+2 - .byte BEND , c_v+22 - .byte W02 - .byte c_v+8 - .byte W04 - .byte c_v+0 - .byte W05 - .byte PAN , c_v+10 - .byte W10 - .byte BEND , c_v+0 - .byte W01 - .byte PAN , c_v+16 - .byte W02 - .byte BEND , c_v-7 - .byte W03 - .byte c_v-12 - .byte W03 - .byte PAN , c_v+24 - .byte BEND , c_v-20 - .byte W06 - .byte c_v-13 - .byte W05 - .byte PAN , c_v+32 - .byte W01 - .byte BEND , c_v-6 - .byte W03 - .byte W03 - .byte c_v+6 - .byte W03 - .byte c_v+11 - .byte W03 - .byte c_v+20 - .byte W01 - .byte PAN , c_v+40 - .byte W05 - .byte BEND , c_v+12 - .byte W03 - .byte c_v+7 - .byte W04 - .byte VOL , 114*se_m_sandstorm_mvl/mxv - .byte W02 - .byte BEND , c_v+0 - .byte W01 - .byte PAN , c_v+48 - .byte W01 - .byte VOL , 104*se_m_sandstorm_mvl/mxv - .byte W01 - .byte BEND , c_v-7 - .byte W03 - .byte VOL , 93*se_m_sandstorm_mvl/mxv - .byte BEND , c_v-12 - .byte W03 - .byte VOL , 82*se_m_sandstorm_mvl/mxv - .byte BEND , c_v-20 - .byte W04 - .byte VOL , 67*se_m_sandstorm_mvl/mxv - .byte W02 - .byte BEND , c_v-13 - .byte W01 - .byte VOL , 52*se_m_sandstorm_mvl/mxv - .byte W03 - .byte 32*se_m_sandstorm_mvl/mxv - .byte W02 - .byte 13*se_m_sandstorm_mvl/mxv - .byte BEND , c_v-6 - .byte W03 - .byte EOT - .byte FINE - -@********************** Track 2 **********************@ - -se_m_sandstorm_2: - .byte KEYSH , se_m_sandstorm_key+0 - .byte VOICE , 57 - .byte PAN , c_v+0 - .byte VOL , 60*se_m_sandstorm_mvl/mxv - .byte N03 , Cn3 , v100 - .byte W03 - .byte En3 , v080 - .byte W04 - .byte Dn3 - .byte W03 - .byte Cn3 , v100 - .byte W04 - .byte En3 , v080 - .byte W04 - .byte Dn3 - .byte W03 - .byte Cn3 , v100 - .byte W03 -se_m_sandstorm_2_000: - .byte W01 - .byte N03 , En3 , v080 - .byte W03 - .byte Dn3 - .byte W04 - .byte Cn3 , v100 - .byte W04 - .byte En3 , v080 - .byte W03 - .byte Dn3 - .byte W04 - .byte Cn3 , v100 - .byte W03 - .byte En3 , v080 - .byte W02 - .byte PEND - .byte W02 - .byte Dn3 - .byte W04 - .byte Cn3 , v100 - .byte W03 - .byte En3 , v080 - .byte W04 - .byte Dn3 - .byte W03 - .byte Cn3 , v100 - .byte W04 - .byte En3 , v080 - .byte W04 - .byte Cn3 , v100 - .byte W03 - .byte En3 , v080 - .byte W04 - .byte Dn3 - .byte W03 - .byte Cn3 , v100 - .byte W04 - .byte En3 , v080 - .byte W04 - .byte Dn3 - .byte W03 - .byte Cn3 , v100 - .byte W03 - .byte PATT - .word se_m_sandstorm_2_000 - .byte W02 - .byte N03 , Cn3 , v076 - .byte W04 - .byte En3 , v064 - .byte W03 - .byte Dn3 , v060 - .byte W04 - .byte Cn3 , v076 - .byte W03 - .byte En3 , v052 - .byte W04 - .byte Dn3 , v048 - .byte W04 - .byte Cn3 , v068 - .byte W03 - .byte En3 , v044 - .byte W04 - .byte Dn3 , v040 - .byte W03 - .byte Cn3 , v056 - .byte W04 - .byte En3 , v032 - .byte W04 - .byte Dn3 - .byte W03 - .byte Cn3 , v048 - .byte W03 - .byte W01 - .byte En3 , v024 - .byte W03 - .byte Dn3 , v020 - .byte W04 - .byte Cn3 , v036 - .byte W04 - .byte En3 , v016 - .byte W03 - .byte Dn3 , v012 - .byte W04 - .byte Cn3 , v028 - .byte W05 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_sandstorm: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_sandstorm_pri @ Priority - .byte se_m_sandstorm_rev @ Reverb. - - .word se_m_sandstorm_grp - - .word se_m_sandstorm_1 - .word se_m_sandstorm_2 - - .end diff --git a/sound/songs/se_m_screech.s b/sound/songs/se_m_screech.s deleted file mode 100644 index 378cf7128..000000000 --- a/sound/songs/se_m_screech.s +++ /dev/null @@ -1,112 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_screech_grp, voicegroup128 - .equ se_m_screech_pri, 4 - .equ se_m_screech_rev, reverb_set+50 - .equ se_m_screech_mvl, 127 - .equ se_m_screech_key, 0 - .equ se_m_screech_tbs, 1 - .equ se_m_screech_exg, 0 - .equ se_m_screech_cmp, 1 - - .section .rodata - .global se_m_screech - .align 2 - -@********************** Track 1 **********************@ - -se_m_screech_1: - .byte VOL , 110*se_m_screech_mvl/mxv - .byte KEYSH , se_m_screech_key+0 - .byte TEMPO , 150*se_m_screech_tbs/2 - .byte VOICE , 44 - .byte BENDR , 2 - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N21 , Fs5 , v112 - .byte W01 - .byte PAN , c_v-5 - .byte W01 - .byte c_v-10 - .byte VOL , 15*se_m_screech_mvl/mxv - .byte W01 - .byte PAN , c_v-4 - .byte VOL , 41*se_m_screech_mvl/mxv - .byte W01 - .byte PAN , c_v+0 - .byte VOL , 69*se_m_screech_mvl/mxv - .byte W02 - .byte PAN , c_v+4 - .byte W01 - .byte c_v+10 - .byte VOL , 84*se_m_screech_mvl/mxv - .byte W01 - .byte PAN , c_v+4 - .byte W01 - .byte VOL , 97*se_m_screech_mvl/mxv - .byte PAN , c_v+0 - .byte W01 - .byte c_v-5 - .byte W02 - .byte VOL , 110*se_m_screech_mvl/mxv - .byte PAN , c_v-10 - .byte W01 - .byte c_v-4 - .byte W01 - .byte c_v+0 - .byte W01 - .byte c_v+4 - .byte W01 - .byte c_v+10 - .byte W02 - .byte VOL , 100*se_m_screech_mvl/mxv - .byte PAN , c_v+4 - .byte W01 - .byte VOL , 84*se_m_screech_mvl/mxv - .byte PAN , c_v+0 - .byte W01 - .byte VOL , 55*se_m_screech_mvl/mxv - .byte W02 - .byte BEND , c_v+0 - .byte W02 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_screech_2: - .byte VOL , 110*se_m_screech_mvl/mxv - .byte KEYSH , se_m_screech_key+0 - .byte VOICE , 42 - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N21 , Fn6 , v064 - .byte W06 - .byte PAN , c_v+0 - .byte W03 - .byte c_v+0 - .byte W03 - .byte W03 - .byte c_v+0 - .byte W03 - .byte W01 - .byte c_v+0 - .byte W03 - .byte BEND , c_v+0 - .byte W02 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_screech: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_screech_pri @ Priority - .byte se_m_screech_rev @ Reverb. - - .word se_m_screech_grp - - .word se_m_screech_1 - .word se_m_screech_2 - - .end diff --git a/sound/songs/se_m_self_destruct.s b/sound/songs/se_m_self_destruct.s deleted file mode 100644 index f2ab617ca..000000000 --- a/sound/songs/se_m_self_destruct.s +++ /dev/null @@ -1,74 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_self_destruct_grp, voicegroup128 - .equ se_m_self_destruct_pri, 4 - .equ se_m_self_destruct_rev, reverb_set+50 - .equ se_m_self_destruct_mvl, 127 - .equ se_m_self_destruct_key, 0 - .equ se_m_self_destruct_tbs, 1 - .equ se_m_self_destruct_exg, 0 - .equ se_m_self_destruct_cmp, 1 - - .section .rodata - .global se_m_self_destruct - .align 2 - -@********************** Track 1 **********************@ - -se_m_self_destruct_1: - .byte KEYSH , se_m_self_destruct_key+0 - .byte TEMPO , 150*se_m_self_destruct_tbs/2 - .byte VOICE , 41 - .byte VOL , 115*se_m_self_destruct_mvl/mxv - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N01 , Gn3 , v127 - .byte W01 - .byte Cn3 - .byte W01 - .byte N24 , An3 - .byte W06 - .byte PAN , c_v+6 - .byte W04 - .byte c_v+0 - .byte W01 - .byte VOL , 102*se_m_self_destruct_mvl/mxv - .byte W02 - .byte PAN , c_v-8 - .byte VOL , 88*se_m_self_destruct_mvl/mxv - .byte W03 - .byte 78*se_m_self_destruct_mvl/mxv - .byte W01 - .byte PAN , c_v+0 - .byte W01 - .byte VOL , 67*se_m_self_destruct_mvl/mxv - .byte W01 - .byte BEND , c_v-2 - .byte W01 - .byte PAN , c_v+7 - .byte VOL , 45*se_m_self_destruct_mvl/mxv - .byte W02 - .byte BEND , c_v-8 - .byte W01 - .byte VOL , 13*se_m_self_destruct_mvl/mxv - .byte W01 - .byte PAN , c_v+0 - .byte BEND , c_v-15 - .byte W22 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_self_destruct: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_self_destruct_pri @ Priority - .byte se_m_self_destruct_rev @ Reverb. - - .word se_m_self_destruct_grp - - .word se_m_self_destruct_1 - - .end diff --git a/sound/songs/se_m_sing.s b/sound/songs/se_m_sing.s deleted file mode 100644 index f12509f56..000000000 --- a/sound/songs/se_m_sing.s +++ /dev/null @@ -1,198 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_sing_grp, voicegroup128 - .equ se_m_sing_pri, 4 - .equ se_m_sing_rev, reverb_set+50 - .equ se_m_sing_mvl, 127 - .equ se_m_sing_key, 0 - .equ se_m_sing_tbs, 1 - .equ se_m_sing_exg, 0 - .equ se_m_sing_cmp, 1 - - .section .rodata - .global se_m_sing - .align 2 - -@********************** Track 1 **********************@ - -se_m_sing_1: - .byte KEYSH , se_m_sing_key+0 - .byte TEMPO , 100*se_m_sing_tbs/2 - .byte VOICE , 73 - .byte BENDR , 12 - .byte LFOS , 40 - .byte PAN , c_v+0 - .byte VOL , 95*se_m_sing_mvl/mxv - .byte BEND , c_v+0 - .byte N44 , Gn4 , v112 - .byte W06 - .byte W06 - .byte W03 - .byte MOD , 7 - .byte W03 - .byte W03 - .byte VOL , 83*se_m_sing_mvl/mxv - .byte W03 - .byte W03 - .byte 69*se_m_sing_mvl/mxv - .byte W03 - .byte W03 - .byte 50*se_m_sing_mvl/mxv - .byte W03 - .byte W03 - .byte 24*se_m_sing_mvl/mxv - .byte W03 - .byte W03 - .byte MOD , 0 - .byte W03 - .byte VOL , 95*se_m_sing_mvl/mxv - .byte N21 , Fn5 - .byte W06 - .byte W06 -se_m_sing_1_000: - .byte VOL , 86*se_m_sing_mvl/mxv - .byte MOD , 7 - .byte W03 - .byte VOL , 75*se_m_sing_mvl/mxv - .byte W03 - .byte PEND -se_m_sing_1_001: - .byte VOL , 55*se_m_sing_mvl/mxv - .byte W03 - .byte 26*se_m_sing_mvl/mxv - .byte MOD , 0 - .byte W03 - .byte PEND - .byte VOL , 95*se_m_sing_mvl/mxv - .byte N21 , Ds5 , v112 - .byte W06 - .byte W06 - .byte PATT - .word se_m_sing_1_000 - .byte PATT - .word se_m_sing_1_001 - .byte VOL , 95*se_m_sing_mvl/mxv - .byte N66 , Gn4 , v112 - .byte W06 - .byte W06 - .byte W06 - .byte W06 - .byte MOD , 7 - .byte W06 - .byte W06 - .byte W06 - .byte VOL , 83*se_m_sing_mvl/mxv - .byte W06 - .byte 69*se_m_sing_mvl/mxv - .byte W06 - .byte 50*se_m_sing_mvl/mxv - .byte W06 - .byte 24*se_m_sing_mvl/mxv - .byte W06 - .byte MOD , 0 - .byte W06 - .byte W06 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_sing_2: - .byte KEYSH , se_m_sing_key+0 - .byte VOICE , 73 - .byte LFOS , 40 - .byte VOL , 95*se_m_sing_mvl/mxv - .byte BEND , c_v+9 - .byte W06 - .byte W06 - .byte PAN , c_v+12 - .byte N44 , Gn4 , v060 - .byte W06 - .byte W06 - .byte W03 - .byte MOD , 7 - .byte W03 - .byte W03 - .byte VOL , 83*se_m_sing_mvl/mxv - .byte W03 - .byte W03 - .byte 69*se_m_sing_mvl/mxv - .byte W03 - .byte W03 - .byte 50*se_m_sing_mvl/mxv - .byte W03 - .byte W03 - .byte 24*se_m_sing_mvl/mxv - .byte W03 - .byte W03 - .byte MOD , 0 - .byte W03 - .byte VOL , 95*se_m_sing_mvl/mxv - .byte PAN , c_v-12 - .byte N21 , Fn5 - .byte W06 - .byte W06 -se_m_sing_2_000: - .byte VOL , 86*se_m_sing_mvl/mxv - .byte MOD , 7 - .byte W03 - .byte VOL , 75*se_m_sing_mvl/mxv - .byte W03 - .byte PEND -se_m_sing_2_001: - .byte VOL , 55*se_m_sing_mvl/mxv - .byte W03 - .byte 26*se_m_sing_mvl/mxv - .byte MOD , 0 - .byte W03 - .byte PEND - .byte VOL , 95*se_m_sing_mvl/mxv - .byte PAN , c_v+12 - .byte N21 , Ds5 , v060 - .byte W06 - .byte W06 - .byte PATT - .word se_m_sing_2_000 - .byte PATT - .word se_m_sing_2_001 - .byte VOL , 95*se_m_sing_mvl/mxv - .byte PAN , c_v-12 - .byte N66 , Gn4 , v060 - .byte W06 - .byte W06 - .byte PAN , c_v-8 - .byte W06 - .byte W06 - .byte MOD , 7 - .byte PAN , c_v+0 - .byte W06 - .byte W06 - .byte c_v+7 - .byte W06 - .byte VOL , 83*se_m_sing_mvl/mxv - .byte W06 - .byte 69*se_m_sing_mvl/mxv - .byte PAN , c_v+15 - .byte W06 - .byte VOL , 50*se_m_sing_mvl/mxv - .byte W06 - .byte 24*se_m_sing_mvl/mxv - .byte PAN , c_v+8 - .byte W06 - .byte MOD , 0 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_sing: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_sing_pri @ Priority - .byte se_m_sing_rev @ Reverb. - - .word se_m_sing_grp - - .word se_m_sing_1 - .word se_m_sing_2 - - .end diff --git a/sound/songs/se_m_sketch.s b/sound/songs/se_m_sketch.s deleted file mode 100644 index 3657d2009..000000000 --- a/sound/songs/se_m_sketch.s +++ /dev/null @@ -1,68 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_sketch_grp, voicegroup128 - .equ se_m_sketch_pri, 4 - .equ se_m_sketch_rev, reverb_set+50 - .equ se_m_sketch_mvl, 127 - .equ se_m_sketch_key, 0 - .equ se_m_sketch_tbs, 1 - .equ se_m_sketch_exg, 0 - .equ se_m_sketch_cmp, 1 - - .section .rodata - .global se_m_sketch - .align 2 - -@********************** Track 1 **********************@ - -se_m_sketch_1: - .byte KEYSH , se_m_sketch_key+0 - .byte TEMPO , 180*se_m_sketch_tbs/2 - .byte VOICE , 38 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 110*se_m_sketch_mvl/mxv - .byte BEND , c_v+0 - .byte N02 , Gn4 , v127 - .byte W01 - .byte VOL , 74*se_m_sketch_mvl/mxv - .byte BEND , c_v-11 - .byte W01 - .byte VOICE , 31 - .byte VOL , 40*se_m_sketch_mvl/mxv - .byte BEND , c_v-1 - .byte N03 , Cs5 - .byte W01 - .byte VOL , 64*se_m_sketch_mvl/mxv - .byte PAN , c_v-6 - .byte BEND , c_v-12 - .byte W01 - .byte VOL , 86*se_m_sketch_mvl/mxv - .byte PAN , c_v+4 - .byte BEND , c_v-16 - .byte W02 - .byte VOL , 110*se_m_sketch_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N02 , As5 - .byte W01 - .byte BEND , c_v+12 - .byte W01 - .byte VOL , 0*se_m_sketch_mvl/mxv - .byte W04 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_sketch: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_sketch_pri @ Priority - .byte se_m_sketch_rev @ Reverb. - - .word se_m_sketch_grp - - .word se_m_sketch_1 - - .end diff --git a/sound/songs/se_m_sky_uppercut.s b/sound/songs/se_m_sky_uppercut.s deleted file mode 100644 index 66a791f96..000000000 --- a/sound/songs/se_m_sky_uppercut.s +++ /dev/null @@ -1,103 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_sky_uppercut_grp, voicegroup128 - .equ se_m_sky_uppercut_pri, 4 - .equ se_m_sky_uppercut_rev, reverb_set+50 - .equ se_m_sky_uppercut_mvl, 127 - .equ se_m_sky_uppercut_key, 0 - .equ se_m_sky_uppercut_tbs, 1 - .equ se_m_sky_uppercut_exg, 0 - .equ se_m_sky_uppercut_cmp, 1 - - .section .rodata - .global se_m_sky_uppercut - .align 2 - -@********************** Track 1 **********************@ - -se_m_sky_uppercut_1: - .byte KEYSH , se_m_sky_uppercut_key+0 - .byte TEMPO , 220*se_m_sky_uppercut_tbs/2 - .byte VOICE , 41 - .byte VOL , 110*se_m_sky_uppercut_mvl/mxv - .byte BENDR , 12 - .byte PAN , c_v+6 - .byte BEND , c_v+0 - .byte N02 , Cn4 , v127 - .byte W03 - .byte VOL , 104*se_m_sky_uppercut_mvl/mxv - .byte W03 - .byte 93*se_m_sky_uppercut_mvl/mxv - .byte PAN , c_v-6 - .byte N02 , Cn5 - .byte W03 - .byte VOL , 110*se_m_sky_uppercut_mvl/mxv - .byte W01 - .byte VOICE , 22 - .byte PAN , c_v+0 - .byte N24 , Cn4 , v060 - .byte W02 - .byte W02 - .byte BEND , c_v+0 - .byte W04 - .byte c_v+1 - .byte W03 - .byte c_v+1 - .byte W01 - .byte VOL , 105*se_m_sky_uppercut_mvl/mxv - .byte W02 - .byte BEND , c_v+0 - .byte W01 - .byte VOL , 103*se_m_sky_uppercut_mvl/mxv - .byte W02 - .byte 91*se_m_sky_uppercut_mvl/mxv - .byte BEND , c_v+0 - .byte W03 - .byte VOL , 77*se_m_sky_uppercut_mvl/mxv - .byte BEND , c_v-1 - .byte W02 - .byte VOL , 61*se_m_sky_uppercut_mvl/mxv - .byte BEND , c_v-2 - .byte W01 - .byte VOL , 38*se_m_sky_uppercut_mvl/mxv - .byte W01 - .byte 15*se_m_sky_uppercut_mvl/mxv - .byte BEND , c_v-3 - .byte W02 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_sky_uppercut_2: - .byte KEYSH , se_m_sky_uppercut_key+0 - .byte VOICE , 4 - .byte VOL , 110*se_m_sky_uppercut_mvl/mxv - .byte N02 , Cn3 , v060 - .byte W03 - .byte Gn2 - .byte W03 - .byte Gs4 - .byte W04 - .byte Gs4 , v020 - .byte W02 - .byte W06 - .byte W06 - .byte W06 - .byte W06 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_sky_uppercut: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_sky_uppercut_pri @ Priority - .byte se_m_sky_uppercut_rev @ Reverb. - - .word se_m_sky_uppercut_grp - - .word se_m_sky_uppercut_1 - .word se_m_sky_uppercut_2 - - .end diff --git a/sound/songs/se_m_snore.s b/sound/songs/se_m_snore.s deleted file mode 100644 index aff9ef5e3..000000000 --- a/sound/songs/se_m_snore.s +++ /dev/null @@ -1,105 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_snore_grp, voicegroup128 - .equ se_m_snore_pri, 4 - .equ se_m_snore_rev, reverb_set+50 - .equ se_m_snore_mvl, 127 - .equ se_m_snore_key, 0 - .equ se_m_snore_tbs, 1 - .equ se_m_snore_exg, 0 - .equ se_m_snore_cmp, 1 - - .section .rodata - .global se_m_snore - .align 2 - -@********************** Track 1 **********************@ - -se_m_snore_1: - .byte KEYSH , se_m_snore_key+0 - .byte TEMPO , 220*se_m_snore_tbs/2 - .byte VOICE , 38 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 27*se_m_snore_mvl/mxv - .byte BEND , c_v+0 - .byte N10 , An1 , v127 - .byte W01 - .byte VOL , 75*se_m_snore_mvl/mxv - .byte W01 - .byte 120*se_m_snore_mvl/mxv - .byte W04 - .byte W02 - .byte 75*se_m_snore_mvl/mxv - .byte W01 - .byte 28*se_m_snore_mvl/mxv - .byte W03 - .byte VOICE , 36 - .byte VOL , 83*se_m_snore_mvl/mxv - .byte N18 , En2 , v112 - .byte W02 - .byte VOL , 87*se_m_snore_mvl/mxv - .byte W02 - .byte 91*se_m_snore_mvl/mxv - .byte W02 - .byte W01 - .byte 97*se_m_snore_mvl/mxv - .byte W02 - .byte 102*se_m_snore_mvl/mxv - .byte W01 - .byte 109*se_m_snore_mvl/mxv - .byte W02 - .byte 113*se_m_snore_mvl/mxv - .byte W01 - .byte 120*se_m_snore_mvl/mxv - .byte W05 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_snore_2: - .byte VOL , 120*se_m_snore_mvl/mxv - .byte KEYSH , se_m_snore_key+0 - .byte VOICE , 27 - .byte N01 , En2 , v052 - .byte W02 - .byte Dn2 - .byte W02 - .byte En2 - .byte W02 - .byte W01 - .byte Dn2 - .byte W02 - .byte En2 - .byte W03 - .byte W01 - .byte En2 , v064 - .byte W02 - .byte Gs2 - .byte W03 - .byte Dn3 - .byte W02 - .byte En2 - .byte W02 - .byte Gs2 - .byte W02 - .byte W01 - .byte Dn3 - .byte W05 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_snore: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_snore_pri @ Priority - .byte se_m_snore_rev @ Reverb. - - .word se_m_snore_grp - - .word se_m_snore_1 - .word se_m_snore_2 - - .end diff --git a/sound/songs/se_m_solar_beam.s b/sound/songs/se_m_solar_beam.s deleted file mode 100644 index c260c332a..000000000 --- a/sound/songs/se_m_solar_beam.s +++ /dev/null @@ -1,164 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_solar_beam_grp, voicegroup128 - .equ se_m_solar_beam_pri, 4 - .equ se_m_solar_beam_rev, reverb_set+50 - .equ se_m_solar_beam_mvl, 127 - .equ se_m_solar_beam_key, 0 - .equ se_m_solar_beam_tbs, 1 - .equ se_m_solar_beam_exg, 0 - .equ se_m_solar_beam_cmp, 1 - - .section .rodata - .global se_m_solar_beam - .align 2 - -@********************** Track 1 **********************@ - -se_m_solar_beam_1: - .byte KEYSH , se_m_solar_beam_key+0 - .byte TEMPO , 150*se_m_solar_beam_tbs/2 - .byte VOICE , 36 - .byte BENDR , 24 - .byte VOL , 25*se_m_solar_beam_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+63 - .byte TIE , Cn4 , v112 - .byte W04 - .byte VOL , 40*se_m_solar_beam_mvl/mxv - .byte W02 - .byte PAN , c_v-4 - .byte BEND , c_v+52 - .byte W03 - .byte VOL , 55*se_m_solar_beam_mvl/mxv - .byte W03 - .byte PAN , c_v-10 - .byte BEND , c_v+41 - .byte W03 - .byte VOL , 80*se_m_solar_beam_mvl/mxv - .byte W03 - .byte PAN , c_v-5 - .byte BEND , c_v+30 - .byte W06 - .byte PAN , c_v+0 - .byte BEND , c_v+22 - .byte W01 - .byte VOL , 100*se_m_solar_beam_mvl/mxv - .byte W05 - .byte PAN , c_v+4 - .byte BEND , c_v+63 - .byte W06 - .byte PAN , c_v+11 - .byte BEND , c_v+52 - .byte W06 - .byte PAN , c_v+4 - .byte BEND , c_v+41 - .byte W04 - .byte c_v+33 - .byte W02 - .byte PAN , c_v+0 - .byte W03 - .byte BEND , c_v+25 - .byte W03 - .byte PAN , c_v-4 - .byte W03 - .byte BEND , c_v+22 - .byte W03 - .byte PAN , c_v-10 - .byte W06 - .byte c_v-5 - .byte BEND , c_v+17 - .byte W06 - .byte PAN , c_v+0 - .byte BEND , c_v+9 - .byte W06 - .byte PAN , c_v+4 - .byte W02 - .byte BEND , c_v+4 - .byte W04 - .byte PAN , c_v+11 - .byte W06 - .byte c_v+4 - .byte BEND , c_v+0 - .byte W06 - .byte PAN , c_v+0 - .byte W06 - .byte c_v-4 - .byte W02 - .byte BEND , c_v-3 - .byte W04 - .byte PAN , c_v-10 - .byte W06 - .byte c_v-5 - .byte W04 - .byte BEND , c_v-5 - .byte W02 - .byte PAN , c_v+0 - .byte W06 - .byte c_v+4 - .byte W02 - .byte BEND , c_v-7 - .byte W04 - .byte PAN , c_v+11 - .byte W06 - .byte c_v+4 - .byte W01 - .byte BEND , c_v-10 - .byte W05 - .byte PAN , c_v+0 - .byte W03 - .byte BEND , c_v-13 - .byte W03 - .byte PAN , c_v-4 - .byte W06 - .byte c_v-10 - .byte BEND , c_v-18 - .byte W03 - .byte VOL , 89*se_m_solar_beam_mvl/mxv - .byte W03 - .byte PAN , c_v-5 - .byte W02 - .byte VOL , 74*se_m_solar_beam_mvl/mxv - .byte BEND , c_v-25 - .byte W04 - .byte PAN , c_v+0 - .byte W02 - .byte VOL , 62*se_m_solar_beam_mvl/mxv - .byte W01 - .byte BEND , c_v-32 - .byte W03 - .byte PAN , c_v+4 - .byte W01 - .byte VOL , 45*se_m_solar_beam_mvl/mxv - .byte W01 - .byte BEND , c_v-40 - .byte W04 - .byte VOL , 28*se_m_solar_beam_mvl/mxv - .byte PAN , c_v+11 - .byte BEND , c_v-49 - .byte W03 - .byte c_v-64 - .byte W01 - .byte VOL , 10*se_m_solar_beam_mvl/mxv - .byte W02 - .byte PAN , c_v+4 - .byte W02 - .byte VOL , 5*se_m_solar_beam_mvl/mxv - .byte W04 - .byte EOT - .byte FINE - -@******************************************************@ - .align 2 - -se_m_solar_beam: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_solar_beam_pri @ Priority - .byte se_m_solar_beam_rev @ Reverb. - - .word se_m_solar_beam_grp - - .word se_m_solar_beam_1 - - .end diff --git a/sound/songs/se_m_spit_up.s b/sound/songs/se_m_spit_up.s deleted file mode 100644 index 5d96c7b86..000000000 --- a/sound/songs/se_m_spit_up.s +++ /dev/null @@ -1,88 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_spit_up_grp, voicegroup128 - .equ se_m_spit_up_pri, 4 - .equ se_m_spit_up_rev, reverb_set+50 - .equ se_m_spit_up_mvl, 127 - .equ se_m_spit_up_key, 0 - .equ se_m_spit_up_tbs, 1 - .equ se_m_spit_up_exg, 0 - .equ se_m_spit_up_cmp, 1 - - .section .rodata - .global se_m_spit_up - .align 2 - -@********************** Track 1 **********************@ - -se_m_spit_up_1: - .byte KEYSH , se_m_spit_up_key+0 - .byte TEMPO , 150*se_m_spit_up_tbs/2 - .byte VOICE , 65 - .byte BENDR , 12 - .byte VOL , 110*se_m_spit_up_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N03 , Gn3 , v112 - .byte W01 - .byte PAN , c_v-7 - .byte BEND , c_v-17 - .byte W01 - .byte PAN , c_v+8 - .byte BEND , c_v-36 - .byte W01 - .byte W01 - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N03 , Gn4 - .byte W02 - .byte PAN , c_v-7 - .byte BEND , c_v+15 - .byte W01 - .byte PAN , c_v+8 - .byte BEND , c_v+28 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N03 , Gn4 , v064 - .byte W01 - .byte PAN , c_v-7 - .byte BEND , c_v+15 - .byte W02 - .byte PAN , c_v+8 - .byte BEND , c_v+28 - .byte W03 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_spit_up_2: - .byte KEYSH , se_m_spit_up_key+0 - .byte VOICE , 57 - .byte VOL , 110*se_m_spit_up_mvl/mxv - .byte N03 , En3 , v052 - .byte W03 - .byte W01 - .byte N03 - .byte W02 - .byte W03 - .byte En3 , v032 - .byte W03 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_spit_up: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_spit_up_pri @ Priority - .byte se_m_spit_up_rev @ Reverb. - - .word se_m_spit_up_grp - - .word se_m_spit_up_1 - .word se_m_spit_up_2 - - .end diff --git a/sound/songs/se_m_stat_decrease.s b/sound/songs/se_m_stat_decrease.s deleted file mode 100644 index 5cdf8ac36..000000000 --- a/sound/songs/se_m_stat_decrease.s +++ /dev/null @@ -1,271 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_stat_decrease_grp, voicegroup128 - .equ se_m_stat_decrease_pri, 4 - .equ se_m_stat_decrease_rev, reverb_set+50 - .equ se_m_stat_decrease_mvl, 127 - .equ se_m_stat_decrease_key, 0 - .equ se_m_stat_decrease_tbs, 1 - .equ se_m_stat_decrease_exg, 0 - .equ se_m_stat_decrease_cmp, 1 - - .section .rodata - .global se_m_stat_decrease - .align 2 - -@********************** Track 1 **********************@ - -se_m_stat_decrease_1: - .byte KEYSH , se_m_stat_decrease_key+0 - .byte TEMPO , 170*se_m_stat_decrease_tbs/2 - .byte VOICE , 67 - .byte VOL , 70*se_m_stat_decrease_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+42 - .byte N02 , Cs6 , v076 - .byte W01 - .byte BEND , c_v+31 - .byte W01 - .byte c_v+24 - .byte W01 - .byte PAN , c_v+6 - .byte BEND , c_v+16 - .byte N02 , Cs5 - .byte W01 - .byte BEND , c_v+12 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v+8 - .byte N02 , Fs5 - .byte W01 - .byte BEND , c_v+5 - .byte W01 - .byte c_v+2 - .byte W01 - .byte PAN , c_v-6 - .byte BEND , c_v+0 - .byte N02 , Fs4 - .byte W03 - .byte PAN , c_v+0 - .byte BEND , c_v+42 - .byte N02 , Cn6 - .byte W01 - .byte BEND , c_v+31 - .byte W01 - .byte c_v+24 - .byte W01 - .byte PAN , c_v+6 - .byte BEND , c_v+16 - .byte N02 , Cn5 - .byte W01 - .byte BEND , c_v+12 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v+8 - .byte N02 , Fn5 - .byte W01 - .byte BEND , c_v+5 - .byte W01 - .byte c_v+2 - .byte W01 - .byte PAN , c_v-6 - .byte BEND , c_v+0 - .byte N02 , Fn4 - .byte W03 - .byte PAN , c_v+0 - .byte BEND , c_v+42 - .byte N02 , Bn5 - .byte W01 - .byte BEND , c_v+31 - .byte W01 - .byte c_v+24 - .byte W01 - .byte PAN , c_v+6 - .byte BEND , c_v+16 - .byte N02 , Bn4 - .byte W01 - .byte BEND , c_v+12 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v+8 - .byte N02 , En5 - .byte W01 - .byte BEND , c_v+5 - .byte W01 - .byte c_v+2 - .byte W01 - .byte PAN , c_v-6 - .byte BEND , c_v+0 - .byte N02 , En4 - .byte W03 - .byte PAN , c_v+0 - .byte BEND , c_v+42 - .byte N02 , As5 - .byte W01 - .byte BEND , c_v+31 - .byte W01 - .byte c_v+24 - .byte W01 - .byte PAN , c_v+6 - .byte BEND , c_v+16 - .byte N02 , As4 - .byte W01 - .byte BEND , c_v+12 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v+8 - .byte N02 , Ds5 - .byte W01 - .byte BEND , c_v+5 - .byte W01 - .byte c_v+2 - .byte W01 - .byte PAN , c_v-6 - .byte BEND , c_v+0 - .byte N02 , Ds4 - .byte W03 - .byte PAN , c_v+0 - .byte BEND , c_v+42 - .byte N02 , An5 - .byte W01 - .byte BEND , c_v+31 - .byte W01 - .byte c_v+24 - .byte W01 - .byte PAN , c_v+6 - .byte BEND , c_v+16 - .byte N02 , An4 - .byte W01 - .byte BEND , c_v+12 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v+8 - .byte N02 , Cs5 , v056 - .byte W01 - .byte BEND , c_v+5 - .byte W01 - .byte c_v+2 - .byte W01 - .byte PAN , c_v-12 - .byte BEND , c_v+0 - .byte N02 , Cs4 - .byte W03 - .byte PAN , c_v+0 - .byte BEND , c_v+42 - .byte N02 , An5 - .byte W01 - .byte BEND , c_v+31 - .byte W01 - .byte c_v+24 - .byte W01 - .byte PAN , c_v+12 - .byte BEND , c_v+16 - .byte N02 , An4 - .byte W01 - .byte BEND , c_v+12 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v+8 - .byte N02 , Cs5 , v032 - .byte W01 - .byte BEND , c_v+5 - .byte W01 - .byte c_v+2 - .byte W01 - .byte PAN , c_v-16 - .byte BEND , c_v+0 - .byte N02 , Cs4 - .byte W03 - .byte PAN , c_v+0 - .byte BEND , c_v+42 - .byte N02 , An5 - .byte W01 - .byte BEND , c_v+31 - .byte W01 - .byte c_v+24 - .byte W01 - .byte PAN , c_v+16 - .byte BEND , c_v+16 - .byte N02 , An4 - .byte W01 - .byte BEND , c_v+12 - .byte W02 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_stat_decrease_2: - .byte KEYSH , se_m_stat_decrease_key+0 - .byte VOICE , 55 - .byte XCMD , xIECV , 10 - .byte xIECL , 8 - .byte VOL , 70*se_m_stat_decrease_mvl/mxv - .byte N02 , As3 , v052 - .byte W03 - .byte N02 - .byte W03 - .byte W01 - .byte An3 - .byte W03 - .byte N02 - .byte W02 - .byte W02 - .byte Gs3 - .byte W04 - .byte N02 - .byte W03 - .byte Gn3 - .byte W03 - .byte W01 - .byte N02 - .byte W03 - .byte Fs3 - .byte W02 - .byte W02 - .byte N02 - .byte W04 - .byte Fn3 - .byte W03 - .byte N02 - .byte W03 - .byte W01 - .byte En3 - .byte W03 - .byte N02 - .byte W02 - .byte W02 - .byte Ds3 - .byte W04 - .byte Ds3 , v032 - .byte W03 - .byte Dn3 - .byte W03 - .byte W01 - .byte N02 - .byte W03 - .byte Cs3 , v020 - .byte W02 - .byte W02 - .byte N02 - .byte W04 - .byte Cn3 , v012 - .byte W03 - .byte N02 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_stat_decrease: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_stat_decrease_pri @ Priority - .byte se_m_stat_decrease_rev @ Reverb. - - .word se_m_stat_decrease_grp - - .word se_m_stat_decrease_1 - .word se_m_stat_decrease_2 - - .end diff --git a/sound/songs/se_m_stat_increase.s b/sound/songs/se_m_stat_increase.s deleted file mode 100644 index e9eea563a..000000000 --- a/sound/songs/se_m_stat_increase.s +++ /dev/null @@ -1,283 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_stat_increase_grp, voicegroup128 - .equ se_m_stat_increase_pri, 4 - .equ se_m_stat_increase_rev, reverb_set+50 - .equ se_m_stat_increase_mvl, 127 - .equ se_m_stat_increase_key, 0 - .equ se_m_stat_increase_tbs, 1 - .equ se_m_stat_increase_exg, 0 - .equ se_m_stat_increase_cmp, 1 - - .section .rodata - .global se_m_stat_increase - .align 2 - -@********************** Track 1 **********************@ - -se_m_stat_increase_1: - .byte KEYSH , se_m_stat_increase_key+0 - .byte TEMPO , 170*se_m_stat_increase_tbs/2 - .byte VOICE , 67 - .byte VOL , 70*se_m_stat_increase_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N02 , An5 , v076 - .byte W01 - .byte BEND , c_v+0 - .byte W01 - .byte c_v+2 - .byte W01 - .byte PAN , c_v+6 - .byte BEND , c_v+5 - .byte N02 , An4 - .byte W01 - .byte BEND , c_v+8 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v+12 - .byte N02 , Dn5 - .byte W01 - .byte BEND , c_v+16 - .byte W01 - .byte c_v+23 - .byte W01 - .byte PAN , c_v-6 - .byte BEND , c_v+32 - .byte N02 , Dn4 - .byte W01 - .byte BEND , c_v+42 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N02 , As5 - .byte W01 - .byte BEND , c_v+0 - .byte W01 - .byte c_v+2 - .byte W01 - .byte PAN , c_v+6 - .byte BEND , c_v+5 - .byte N02 , As4 - .byte W01 - .byte BEND , c_v+8 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v+12 - .byte N02 , Ds5 - .byte W01 - .byte BEND , c_v+16 - .byte W01 - .byte c_v+23 - .byte W01 - .byte PAN , c_v-6 - .byte BEND , c_v+32 - .byte N02 , Ds4 - .byte W01 - .byte BEND , c_v+42 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N02 , Bn5 - .byte W01 - .byte BEND , c_v+0 - .byte W01 - .byte c_v+2 - .byte W01 - .byte PAN , c_v+6 - .byte BEND , c_v+5 - .byte N02 , Bn4 - .byte W01 - .byte BEND , c_v+8 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v+12 - .byte N02 , En5 - .byte W01 - .byte BEND , c_v+16 - .byte W01 - .byte c_v+23 - .byte W01 - .byte PAN , c_v-6 - .byte BEND , c_v+32 - .byte N02 , En4 - .byte W01 - .byte BEND , c_v+42 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N02 , Cn6 - .byte W01 - .byte BEND , c_v+0 - .byte W01 - .byte c_v+2 - .byte W01 - .byte PAN , c_v+6 - .byte BEND , c_v+5 - .byte N02 , Cn5 - .byte W01 - .byte BEND , c_v+8 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v+12 - .byte N02 , Fn5 - .byte W01 - .byte BEND , c_v+16 - .byte W01 - .byte c_v+23 - .byte W01 - .byte PAN , c_v-6 - .byte BEND , c_v+32 - .byte N02 , Fn4 - .byte W01 - .byte BEND , c_v+42 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N02 , Cs6 - .byte W01 - .byte BEND , c_v+0 - .byte W01 - .byte c_v+2 - .byte W01 - .byte PAN , c_v+6 - .byte BEND , c_v+5 - .byte N02 , Cs5 - .byte W01 - .byte BEND , c_v+8 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v+12 - .byte N02 , Fn5 , v056 - .byte W01 - .byte BEND , c_v+16 - .byte W01 - .byte c_v+23 - .byte W01 - .byte PAN , c_v-12 - .byte BEND , c_v+32 - .byte N02 , Fn4 - .byte W01 - .byte BEND , c_v+42 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N02 , Cs6 - .byte W01 - .byte BEND , c_v+0 - .byte W01 - .byte c_v+2 - .byte W01 - .byte PAN , c_v+12 - .byte BEND , c_v+5 - .byte N02 , Cs5 - .byte W01 - .byte BEND , c_v+8 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v+12 - .byte N02 , Fn5 , v032 - .byte W01 - .byte BEND , c_v+16 - .byte W01 - .byte c_v+23 - .byte W01 - .byte PAN , c_v-16 - .byte BEND , c_v+32 - .byte N02 , Fn4 - .byte W01 - .byte BEND , c_v+42 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N02 , Cs6 - .byte W01 - .byte BEND , c_v+0 - .byte W01 - .byte c_v+2 - .byte W01 - .byte PAN , c_v+16 - .byte BEND , c_v+5 - .byte N02 , Cs5 - .byte W01 - .byte BEND , c_v+8 - .byte W02 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_stat_increase_2: - .byte KEYSH , se_m_stat_increase_key+0 - .byte VOICE , 55 - .byte XCMD , xIECV , 10 - .byte xIECL , 8 - .byte VOL , 70*se_m_stat_increase_mvl/mxv - .byte N02 , Cn3 , v052 - .byte W03 - .byte N02 - .byte W03 - .byte W01 - .byte Cs3 - .byte W03 - .byte N02 - .byte W02 - .byte W02 - .byte Dn3 - .byte W04 - .byte N02 - .byte W03 - .byte Ds3 - .byte W03 - .byte W01 - .byte N02 - .byte W03 - .byte En3 - .byte W02 - .byte W02 - .byte N02 - .byte W04 - .byte Fn3 - .byte W03 - .byte N02 - .byte W03 - .byte W01 - .byte Fs3 - .byte W03 - .byte N02 - .byte W02 - .byte W02 - .byte Gn3 - .byte W04 - .byte Gn3 , v032 - .byte W03 - .byte Gs3 - .byte W03 - .byte W01 - .byte N02 - .byte W03 - .byte An3 , v020 - .byte W02 - .byte W02 - .byte N02 - .byte W04 - .byte As3 , v012 - .byte W03 - .byte N02 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_stat_increase: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_stat_increase_pri @ Priority - .byte se_m_stat_increase_rev @ Reverb. - - .word se_m_stat_increase_grp - - .word se_m_stat_increase_1 - .word se_m_stat_increase_2 - - .end diff --git a/sound/songs/se_m_strength.s b/sound/songs/se_m_strength.s deleted file mode 100644 index 0fca48906..000000000 --- a/sound/songs/se_m_strength.s +++ /dev/null @@ -1,84 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_strength_grp, voicegroup128 - .equ se_m_strength_pri, 4 - .equ se_m_strength_rev, reverb_set+50 - .equ se_m_strength_mvl, 127 - .equ se_m_strength_key, 0 - .equ se_m_strength_tbs, 1 - .equ se_m_strength_exg, 0 - .equ se_m_strength_cmp, 1 - - .section .rodata - .global se_m_strength - .align 2 - -@********************** Track 1 **********************@ - -se_m_strength_1: - .byte KEYSH , se_m_strength_key+0 - .byte TEMPO , 150*se_m_strength_tbs/2 - .byte VOICE , 26 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 110*se_m_strength_mvl/mxv - .byte BEND , c_v+0 - .byte N03 , Gn2 , v127 - .byte W03 - .byte PAN , c_v+6 - .byte N03 , Fs2 , v120 - .byte W04 - .byte PAN , c_v-6 - .byte N03 , Fn2 , v116 - .byte W03 - .byte PAN , c_v+11 - .byte N03 , En2 , v112 - .byte W04 - .byte PAN , c_v-11 - .byte N03 , Ds2 , v108 - .byte W04 - .byte PAN , c_v+0 - .byte N03 , Dn2 , v100 - .byte W06 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_strength_2: - .byte KEYSH , se_m_strength_key+0 - .byte VOICE , 5 - .byte PAN , c_v+0 - .byte VOL , 110*se_m_strength_mvl/mxv - .byte N02 , Fn2 , v072 - .byte W02 - .byte N01 - .byte W01 - .byte N02 , Gn2 - .byte W03 - .byte N01 , Gs2 , v060 - .byte W01 - .byte N02 , Cn3 , v040 - .byte W03 - .byte Cn3 , v032 - .byte W04 - .byte N01 , Cn3 , v028 - .byte W04 - .byte Cn3 , v020 - .byte W06 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_strength: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_strength_pri @ Priority - .byte se_m_strength_rev @ Reverb. - - .word se_m_strength_grp - - .word se_m_strength_1 - .word se_m_strength_2 - - .end diff --git a/sound/songs/se_m_string_shot.s b/sound/songs/se_m_string_shot.s deleted file mode 100644 index d750d26b9..000000000 --- a/sound/songs/se_m_string_shot.s +++ /dev/null @@ -1,80 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_string_shot_grp, voicegroup128 - .equ se_m_string_shot_pri, 4 - .equ se_m_string_shot_rev, reverb_set+50 - .equ se_m_string_shot_mvl, 127 - .equ se_m_string_shot_key, 0 - .equ se_m_string_shot_tbs, 1 - .equ se_m_string_shot_exg, 0 - .equ se_m_string_shot_cmp, 1 - - .section .rodata - .global se_m_string_shot - .align 2 - -@********************** Track 1 **********************@ - -se_m_string_shot_1: - .byte KEYSH , se_m_string_shot_key+0 - .byte TEMPO , 250*se_m_string_shot_tbs/2 - .byte VOICE , 22 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 110*se_m_string_shot_mvl/mxv - .byte BEND , c_v+0 - .byte N48 , Fn4 , v108 - .byte W03 - .byte PAN , c_v+5 - .byte BEND , c_v+6 - .byte W03 - .byte PAN , c_v+15 - .byte BEND , c_v+12 - .byte W03 - .byte PAN , c_v+6 - .byte BEND , c_v+21 - .byte W02 - .byte c_v+8 - .byte W01 - .byte PAN , c_v-1 - .byte W03 - .byte c_v-9 - .byte BEND , c_v-8 - .byte W03 - .byte PAN , c_v-15 - .byte BEND , c_v-14 - .byte W03 - .byte PAN , c_v-9 - .byte BEND , c_v-8 - .byte W03 - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte W06 - .byte VOL , 90*se_m_string_shot_mvl/mxv - .byte W03 - .byte 71*se_m_string_shot_mvl/mxv - .byte W03 - .byte 58*se_m_string_shot_mvl/mxv - .byte W03 - .byte 41*se_m_string_shot_mvl/mxv - .byte W03 - .byte 27*se_m_string_shot_mvl/mxv - .byte W03 - .byte 7*se_m_string_shot_mvl/mxv - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_string_shot: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_string_shot_pri @ Priority - .byte se_m_string_shot_rev @ Reverb. - - .word se_m_string_shot_grp - - .word se_m_string_shot_1 - - .end diff --git a/sound/songs/se_m_string_shot2.s b/sound/songs/se_m_string_shot2.s deleted file mode 100644 index 7bd0a7427..000000000 --- a/sound/songs/se_m_string_shot2.s +++ /dev/null @@ -1,134 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_string_shot2_grp, voicegroup128 - .equ se_m_string_shot2_pri, 4 - .equ se_m_string_shot2_rev, reverb_set+50 - .equ se_m_string_shot2_mvl, 127 - .equ se_m_string_shot2_key, 0 - .equ se_m_string_shot2_tbs, 1 - .equ se_m_string_shot2_exg, 0 - .equ se_m_string_shot2_cmp, 1 - - .section .rodata - .global se_m_string_shot2 - .align 2 - -@********************** Track 1 **********************@ - -se_m_string_shot2_1: - .byte KEYSH , se_m_string_shot2_key+0 - .byte TEMPO , 250*se_m_string_shot2_tbs/2 - .byte VOICE , 10 - .byte BENDR , 12 - .byte VOL , 105*se_m_string_shot2_mvl/mxv - .byte PAN , c_v-1 - .byte BEND , c_v+0 - .byte N09 , En4 , v112 - .byte W03 - .byte BEND , c_v+6 - .byte W03 - .byte c_v+12 - .byte W05 - .byte c_v+8 - .byte W01 - .byte PAN , c_v+16 - .byte N09 , Gn4 - .byte W03 - .byte BEND , c_v-8 - .byte W03 - .byte c_v-14 - .byte W06 - .byte PAN , c_v+0 - .byte BEND , c_v-11 - .byte N09 , En4 - .byte W03 - .byte BEND , c_v-5 - .byte W03 - .byte c_v+1 - .byte W05 - .byte c_v-3 - .byte W01 - .byte PAN , c_v-16 - .byte N09 , Gn4 - .byte W03 - .byte BEND , c_v-19 - .byte W03 - .byte c_v-25 - .byte W06 - .byte PAN , c_v+0 - .byte BEND , c_v-19 - .byte N09 , En4 - .byte W03 - .byte BEND , c_v-13 - .byte W03 - .byte c_v-6 - .byte W05 - .byte c_v-10 - .byte W01 - .byte PAN , c_v+16 - .byte N09 , Gn4 , v096 - .byte W03 - .byte BEND , c_v-27 - .byte W03 - .byte c_v-32 - .byte W06 - .byte PAN , c_v+0 - .byte BEND , c_v-32 - .byte N09 , En4 , v084 - .byte W03 - .byte BEND , c_v-26 - .byte W03 - .byte c_v-19 - .byte W05 - .byte c_v-23 - .byte W01 - .byte PAN , c_v-16 - .byte N09 , Gn4 , v060 - .byte W03 - .byte BEND , c_v-40 - .byte W03 - .byte c_v-45 - .byte W06 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_string_shot2_2: - .byte KEYSH , se_m_string_shot2_key+0 - .byte VOICE , 5 - .byte VOL , 105*se_m_string_shot2_mvl/mxv - .byte PAN , c_v+9 - .byte N09 , Cn3 , v052 - .byte W12 - .byte PAN , c_v-7 - .byte N09 , Gn2 - .byte W12 -se_m_string_shot2_2_000: - .byte PAN , c_v+9 - .byte N09 , Cn3 , v052 - .byte W12 - .byte PAN , c_v-6 - .byte N09 , Gn2 - .byte W12 - .byte PEND - .byte PATT - .word se_m_string_shot2_2_000 - .byte PATT - .word se_m_string_shot2_2_000 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_string_shot2: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_string_shot2_pri @ Priority - .byte se_m_string_shot2_rev @ Reverb. - - .word se_m_string_shot2_grp - - .word se_m_string_shot2_1 - .word se_m_string_shot2_2 - - .end diff --git a/sound/songs/se_m_supersonic.s b/sound/songs/se_m_supersonic.s deleted file mode 100644 index f791c9b15..000000000 --- a/sound/songs/se_m_supersonic.s +++ /dev/null @@ -1,161 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_supersonic_grp, voicegroup128 - .equ se_m_supersonic_pri, 4 - .equ se_m_supersonic_rev, reverb_set+50 - .equ se_m_supersonic_mvl, 127 - .equ se_m_supersonic_key, 0 - .equ se_m_supersonic_tbs, 1 - .equ se_m_supersonic_exg, 0 - .equ se_m_supersonic_cmp, 1 - - .section .rodata - .global se_m_supersonic - .align 2 - -@********************** Track 1 **********************@ - -se_m_supersonic_1: - .byte KEYSH , se_m_supersonic_key+0 - .byte TEMPO , 150*se_m_supersonic_tbs/2 - .byte VOICE , 43 - .byte BENDR , 2 - .byte PAN , c_v+0 - .byte VOL , 61*se_m_supersonic_mvl/mxv - .byte BEND , c_v-4 - .byte N07 , Gs4 , v127 - .byte W01 - .byte PAN , c_v+6 - .byte VOL , 75*se_m_supersonic_mvl/mxv - .byte BEND , c_v-1 - .byte W01 - .byte PAN , c_v-7 - .byte VOL , 93*se_m_supersonic_mvl/mxv - .byte BEND , c_v+2 - .byte W01 - .byte PAN , c_v+9 - .byte VOL , 110*se_m_supersonic_mvl/mxv - .byte BEND , c_v+4 - .byte W01 - .byte PAN , c_v-12 - .byte BEND , c_v+7 - .byte W02 - .byte W02 - .byte VOL , 0*se_m_supersonic_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v-4 - .byte N32 - .byte W01 - .byte PAN , c_v+6 - .byte BEND , c_v-1 - .byte W01 - .byte PAN , c_v-7 - .byte VOL , 36*se_m_supersonic_mvl/mxv - .byte BEND , c_v+2 - .byte W02 - .byte PAN , c_v+9 - .byte VOL , 67*se_m_supersonic_mvl/mxv - .byte BEND , c_v-1 - .byte W01 - .byte PAN , c_v-13 - .byte VOL , 84*se_m_supersonic_mvl/mxv - .byte BEND , c_v-4 - .byte W01 - .byte PAN , c_v+6 - .byte BEND , c_v-6 - .byte W01 - .byte PAN , c_v-6 - .byte VOL , 92*se_m_supersonic_mvl/mxv - .byte BEND , c_v-8 - .byte W01 - .byte PAN , c_v+0 - .byte BEND , c_v-7 - .byte W02 - .byte PAN , c_v+6 - .byte VOL , 99*se_m_supersonic_mvl/mxv - .byte BEND , c_v-4 - .byte W01 - .byte PAN , c_v-7 - .byte BEND , c_v-1 - .byte W01 - .byte VOL , 105*se_m_supersonic_mvl/mxv - .byte PAN , c_v+9 - .byte BEND , c_v+2 - .byte W01 - .byte VOL , 110*se_m_supersonic_mvl/mxv - .byte PAN , c_v-13 - .byte BEND , c_v-1 - .byte W01 - .byte PAN , c_v-1 - .byte BEND , c_v-4 - .byte W02 - .byte VOL , 46*se_m_supersonic_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v-1 - .byte W01 - .byte PAN , c_v+6 - .byte BEND , c_v+2 - .byte W01 - .byte VOL , 67*se_m_supersonic_mvl/mxv - .byte PAN , c_v-7 - .byte BEND , c_v-1 - .byte W01 - .byte PAN , c_v+9 - .byte BEND , c_v-4 - .byte W01 - .byte VOL , 84*se_m_supersonic_mvl/mxv - .byte PAN , c_v-13 - .byte BEND , c_v-6 - .byte W02 - .byte VOL , 100*se_m_supersonic_mvl/mxv - .byte PAN , c_v+6 - .byte BEND , c_v-8 - .byte W01 - .byte VOL , 110*se_m_supersonic_mvl/mxv - .byte PAN , c_v-6 - .byte BEND , c_v-7 - .byte W01 - .byte PAN , c_v+0 - .byte BEND , c_v-4 - .byte W01 - .byte PAN , c_v+6 - .byte BEND , c_v-1 - .byte W01 - .byte VOL , 101*se_m_supersonic_mvl/mxv - .byte PAN , c_v-7 - .byte BEND , c_v+2 - .byte W02 - .byte VOL , 85*se_m_supersonic_mvl/mxv - .byte PAN , c_v+9 - .byte BEND , c_v-1 - .byte W01 - .byte VOL , 75*se_m_supersonic_mvl/mxv - .byte PAN , c_v-13 - .byte BEND , c_v-4 - .byte W01 - .byte VOL , 48*se_m_supersonic_mvl/mxv - .byte PAN , c_v-1 - .byte BEND , c_v-6 - .byte W01 - .byte VOL , 24*se_m_supersonic_mvl/mxv - .byte BEND , c_v-8 - .byte W01 - .byte VOL , 6*se_m_supersonic_mvl/mxv - .byte BEND , c_v-7 - .byte W02 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_supersonic: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_supersonic_pri @ Priority - .byte se_m_supersonic_rev @ Reverb. - - .word se_m_supersonic_grp - - .word se_m_supersonic_1 - - .end diff --git a/sound/songs/se_m_surf.s b/sound/songs/se_m_surf.s deleted file mode 100644 index d3e307782..000000000 --- a/sound/songs/se_m_surf.s +++ /dev/null @@ -1,109 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_surf_grp, voicegroup128 - .equ se_m_surf_pri, 4 - .equ se_m_surf_rev, reverb_set+50 - .equ se_m_surf_mvl, 127 - .equ se_m_surf_key, 0 - .equ se_m_surf_tbs, 1 - .equ se_m_surf_exg, 0 - .equ se_m_surf_cmp, 1 - - .section .rodata - .global se_m_surf - .align 2 - -@********************** Track 1 **********************@ - -se_m_surf_1: - .byte KEYSH , se_m_surf_key+0 - .byte TEMPO , 150*se_m_surf_tbs/2 - .byte VOICE , 36 - .byte BENDR , 12 - .byte VOL , 27*se_m_surf_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N96 , Cn3 , v112 - .byte W04 - .byte VOL , 45*se_m_surf_mvl/mxv - .byte W02 - .byte PAN , c_v-4 - .byte W02 - .byte BEND , c_v+4 - .byte W01 - .byte VOL , 60*se_m_surf_mvl/mxv - .byte W03 - .byte PAN , c_v-10 - .byte W02 - .byte BEND , c_v+9 - .byte W01 - .byte VOL , 88*se_m_surf_mvl/mxv - .byte W03 - .byte PAN , c_v-5 - .byte W02 - .byte BEND , c_v+14 - .byte W04 - .byte PAN , c_v+0 - .byte W01 - .byte VOL , 110*se_m_surf_mvl/mxv - .byte W02 - .byte BEND , c_v+19 - .byte W03 - .byte PAN , c_v+4 - .byte W02 - .byte BEND , c_v+24 - .byte W04 - .byte PAN , c_v+11 - .byte W06 - .byte c_v+4 - .byte W06 - .byte c_v+0 - .byte W06 - .byte c_v-4 - .byte W02 - .byte BEND , c_v+19 - .byte W04 - .byte PAN , c_v-10 - .byte W01 - .byte VOL , 98*se_m_surf_mvl/mxv - .byte W05 - .byte 81*se_m_surf_mvl/mxv - .byte PAN , c_v-5 - .byte BEND , c_v+12 - .byte W06 - .byte VOL , 68*se_m_surf_mvl/mxv - .byte PAN , c_v+0 - .byte W03 - .byte BEND , c_v+17 - .byte W01 - .byte VOL , 50*se_m_surf_mvl/mxv - .byte W02 - .byte PAN , c_v+4 - .byte W03 - .byte VOL , 31*se_m_surf_mvl/mxv - .byte W03 - .byte PAN , c_v+11 - .byte BEND , c_v+22 - .byte W02 - .byte VOL , 11*se_m_surf_mvl/mxv - .byte W04 - .byte 6*se_m_surf_mvl/mxv - .byte PAN , c_v+4 - .byte BEND , c_v+30 - .byte W06 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_surf: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_surf_pri @ Priority - .byte se_m_surf_rev @ Reverb. - - .word se_m_surf_grp - - .word se_m_surf_1 - - .end diff --git a/sound/songs/se_m_swagger.s b/sound/songs/se_m_swagger.s deleted file mode 100644 index 9b4b5756b..000000000 --- a/sound/songs/se_m_swagger.s +++ /dev/null @@ -1,77 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_swagger_grp, voicegroup128 - .equ se_m_swagger_pri, 4 - .equ se_m_swagger_rev, reverb_set+50 - .equ se_m_swagger_mvl, 127 - .equ se_m_swagger_key, 0 - .equ se_m_swagger_tbs, 1 - .equ se_m_swagger_exg, 0 - .equ se_m_swagger_cmp, 1 - - .section .rodata - .global se_m_swagger - .align 2 - -@********************** Track 1 **********************@ - -se_m_swagger_1: - .byte KEYSH , se_m_swagger_key+0 - .byte TEMPO , 190*se_m_swagger_tbs/2 - .byte VOICE , 2 - .byte BENDR , 8 - .byte PAN , c_v+0 - .byte VOL , 28*se_m_swagger_mvl/mxv - .byte BEND , c_v+0 - .byte N15 , An1 , v127 - .byte W01 - .byte VOL , 60*se_m_swagger_mvl/mxv - .byte W01 - .byte 111*se_m_swagger_mvl/mxv - .byte W01 - .byte 120*se_m_swagger_mvl/mxv - .byte W01 - .byte BEND , c_v-3 - .byte W02 - .byte PAN , c_v+5 - .byte BEND , c_v-6 - .byte W01 - .byte PAN , c_v-4 - .byte BEND , c_v-8 - .byte W01 - .byte VOL , 109*se_m_swagger_mvl/mxv - .byte PAN , c_v+9 - .byte BEND , c_v-10 - .byte W01 - .byte PAN , c_v-9 - .byte BEND , c_v-14 - .byte W01 - .byte VOL , 95*se_m_swagger_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v-19 - .byte W02 - .byte VOL , 71*se_m_swagger_mvl/mxv - .byte BEND , c_v-29 - .byte W01 - .byte VOL , 41*se_m_swagger_mvl/mxv - .byte BEND , c_v-38 - .byte W01 - .byte VOL , 15*se_m_swagger_mvl/mxv - .byte BEND , c_v-52 - .byte W04 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_swagger: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_swagger_pri @ Priority - .byte se_m_swagger_rev @ Reverb. - - .word se_m_swagger_grp - - .word se_m_swagger_1 - - .end diff --git a/sound/songs/se_m_swagger2.s b/sound/songs/se_m_swagger2.s deleted file mode 100644 index 0a0d76767..000000000 --- a/sound/songs/se_m_swagger2.s +++ /dev/null @@ -1,56 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_swagger2_grp, voicegroup128 - .equ se_m_swagger2_pri, 4 - .equ se_m_swagger2_rev, reverb_set+50 - .equ se_m_swagger2_mvl, 127 - .equ se_m_swagger2_key, 0 - .equ se_m_swagger2_tbs, 1 - .equ se_m_swagger2_exg, 0 - .equ se_m_swagger2_cmp, 1 - - .section .rodata - .global se_m_swagger2 - .align 2 - -@********************** Track 1 **********************@ - -se_m_swagger2_1: - .byte KEYSH , se_m_swagger2_key+0 - .byte TEMPO , 150*se_m_swagger2_tbs/2 - .byte VOICE , 56 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 65*se_m_swagger2_mvl/mxv - .byte BEND , c_v+8 - .byte N01 , Cs6 , v112 - .byte W01 - .byte BEND , c_v+0 - .byte N01 , Dn6 , v100 - .byte W01 - .byte Dn6 , v060 - .byte W04 - .byte BEND , c_v-8 - .byte N01 , Ds6 , v112 - .byte W01 - .byte BEND , c_v+0 - .byte N01 , En6 , v100 - .byte W01 - .byte En6 , v060 - .byte W04 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_swagger2: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_swagger2_pri @ Priority - .byte se_m_swagger2_rev @ Reverb. - - .word se_m_swagger2_grp - - .word se_m_swagger2_1 - - .end diff --git a/sound/songs/se_m_sweet_scent.s b/sound/songs/se_m_sweet_scent.s deleted file mode 100644 index 0abf858d2..000000000 --- a/sound/songs/se_m_sweet_scent.s +++ /dev/null @@ -1,192 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_sweet_scent_grp, voicegroup128 - .equ se_m_sweet_scent_pri, 4 - .equ se_m_sweet_scent_rev, reverb_set+50 - .equ se_m_sweet_scent_mvl, 127 - .equ se_m_sweet_scent_key, 0 - .equ se_m_sweet_scent_tbs, 1 - .equ se_m_sweet_scent_exg, 0 - .equ se_m_sweet_scent_cmp, 1 - - .section .rodata - .global se_m_sweet_scent - .align 2 - -@********************** Track 1 **********************@ - -se_m_sweet_scent_1: - .byte KEYSH , se_m_sweet_scent_key+0 - .byte TEMPO , 150*se_m_sweet_scent_tbs/2 - .byte VOICE , 61 - .byte BENDR , 44 - .byte PAN , c_v+0 - .byte VOL , 110*se_m_sweet_scent_mvl/mxv - .byte BEND , c_v+2 - .byte N36 , En3 , v096 - .byte W12 - .byte PAN , c_v-4 - .byte BEND , c_v+2 - .byte W12 - .byte PAN , c_v-10 - .byte BEND , c_v+4 - .byte W12 - .byte PAN , c_v-4 - .byte BEND , c_v+5 - .byte N36 , Fn3 - .byte W12 - .byte PAN , c_v+0 - .byte BEND , c_v+6 - .byte W12 - .byte PAN , c_v+6 - .byte BEND , c_v+7 - .byte W12 - .byte PAN , c_v+9 - .byte BEND , c_v+8 - .byte N36 , En3 , v088 - .byte W12 - .byte PAN , c_v+5 - .byte BEND , c_v+8 - .byte W12 - .byte PAN , c_v+0 - .byte BEND , c_v+9 - .byte W12 - .byte PAN , c_v-4 - .byte BEND , c_v+10 - .byte N60 , Fs3 , v056 - .byte W12 - .byte PAN , c_v-10 - .byte BEND , c_v+11 - .byte W12 - .byte PAN , c_v-4 - .byte BEND , c_v+12 - .byte W04 - .byte VOL , 103*se_m_sweet_scent_mvl/mxv - .byte W04 - .byte 97*se_m_sweet_scent_mvl/mxv - .byte W04 - .byte PAN , c_v+0 - .byte BEND , c_v+12 - .byte W01 - .byte VOL , 91*se_m_sweet_scent_mvl/mxv - .byte W05 - .byte 81*se_m_sweet_scent_mvl/mxv - .byte W03 - .byte 72*se_m_sweet_scent_mvl/mxv - .byte W03 - .byte PAN , c_v+6 - .byte BEND , c_v+13 - .byte W01 - .byte VOL , 62*se_m_sweet_scent_mvl/mxv - .byte W02 - .byte 51*se_m_sweet_scent_mvl/mxv - .byte W03 - .byte 39*se_m_sweet_scent_mvl/mxv - .byte W02 - .byte 24*se_m_sweet_scent_mvl/mxv - .byte W02 - .byte 12*se_m_sweet_scent_mvl/mxv - .byte W02 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_sweet_scent_2: - .byte KEYSH , se_m_sweet_scent_key+0 - .byte VOICE , 22 - .byte BENDR , 44 - .byte PAN , c_v+1 - .byte VOL , 38*se_m_sweet_scent_mvl/mxv - .byte BEND , c_v+1 - .byte TIE , Gn3 , v100 - .byte W03 - .byte VOL , 50*se_m_sweet_scent_mvl/mxv - .byte W04 - .byte 62*se_m_sweet_scent_mvl/mxv - .byte W02 - .byte BEND , c_v-1 - .byte W01 - .byte VOL , 65*se_m_sweet_scent_mvl/mxv - .byte W04 - .byte 74*se_m_sweet_scent_mvl/mxv - .byte W04 - .byte 78*se_m_sweet_scent_mvl/mxv - .byte BEND , c_v-2 - .byte W03 - .byte VOL , 86*se_m_sweet_scent_mvl/mxv - .byte W03 - .byte 95*se_m_sweet_scent_mvl/mxv - .byte W03 - .byte 105*se_m_sweet_scent_mvl/mxv - .byte W01 - .byte BEND , c_v-4 - .byte W03 - .byte VOL , 110*se_m_sweet_scent_mvl/mxv - .byte W13 - .byte BEND , c_v-2 - .byte W04 - .byte W10 - .byte c_v-1 - .byte W10 - .byte c_v+0 - .byte W04 - .byte W03 - .byte c_v+1 - .byte W10 - .byte c_v+1 - .byte W11 - .byte W02 - .byte c_v+2 - .byte W14 - .byte c_v+3 - .byte W08 - .byte VOL , 105*se_m_sweet_scent_mvl/mxv - .byte W03 - .byte 101*se_m_sweet_scent_mvl/mxv - .byte W05 - .byte 96*se_m_sweet_scent_mvl/mxv - .byte W04 - .byte BEND , c_v+2 - .byte W01 - .byte VOL , 91*se_m_sweet_scent_mvl/mxv - .byte W03 - .byte 86*se_m_sweet_scent_mvl/mxv - .byte W05 - .byte 78*se_m_sweet_scent_mvl/mxv - .byte W03 - .byte W02 - .byte 68*se_m_sweet_scent_mvl/mxv - .byte W01 - .byte BEND , c_v+1 - .byte W04 - .byte VOL , 58*se_m_sweet_scent_mvl/mxv - .byte W03 - .byte 48*se_m_sweet_scent_mvl/mxv - .byte W04 - .byte 37*se_m_sweet_scent_mvl/mxv - .byte BEND , c_v+0 - .byte W04 - .byte VOL , 23*se_m_sweet_scent_mvl/mxv - .byte W01 - .byte BEND , c_v-1 - .byte W02 - .byte VOL , 12*se_m_sweet_scent_mvl/mxv - .byte W03 - .byte EOT - .byte FINE - -@******************************************************@ - .align 2 - -se_m_sweet_scent: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_sweet_scent_pri @ Priority - .byte se_m_sweet_scent_rev @ Reverb. - - .word se_m_sweet_scent_grp - - .word se_m_sweet_scent_1 - .word se_m_sweet_scent_2 - - .end diff --git a/sound/songs/se_m_swift.s b/sound/songs/se_m_swift.s deleted file mode 100644 index 10649a80e..000000000 --- a/sound/songs/se_m_swift.s +++ /dev/null @@ -1,111 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_swift_grp, voicegroup128 - .equ se_m_swift_pri, 4 - .equ se_m_swift_rev, reverb_set+50 - .equ se_m_swift_mvl, 127 - .equ se_m_swift_key, 0 - .equ se_m_swift_tbs, 1 - .equ se_m_swift_exg, 0 - .equ se_m_swift_cmp, 1 - - .section .rodata - .global se_m_swift - .align 2 - -@********************** Track 1 **********************@ - -se_m_swift_1: - .byte KEYSH , se_m_swift_key+0 - .byte TEMPO , 180*se_m_swift_tbs/2 - .byte VOICE , 16 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 100*se_m_swift_mvl/mxv - .byte BEND , c_v+0 - .byte N06 , Ds6 , v100 - .byte W01 - .byte BEND , c_v-11 - .byte W01 - .byte PAN , c_v+5 - .byte VOL , 90*se_m_swift_mvl/mxv - .byte BEND , c_v-20 - .byte W01 - .byte PAN , c_v-6 - .byte VOL , 77*se_m_swift_mvl/mxv - .byte BEND , c_v-37 - .byte W01 - .byte PAN , c_v+0 - .byte VOL , 37*se_m_swift_mvl/mxv - .byte BEND , c_v-47 - .byte W02 - .byte VOL , 100*se_m_swift_mvl/mxv - .byte BEND , c_v+0 - .byte N06 - .byte W01 - .byte PAN , c_v+5 - .byte BEND , c_v-11 - .byte W01 - .byte PAN , c_v-6 - .byte VOL , 90*se_m_swift_mvl/mxv - .byte BEND , c_v-20 - .byte W01 - .byte PAN , c_v+8 - .byte VOL , 77*se_m_swift_mvl/mxv - .byte BEND , c_v-37 - .byte W01 - .byte PAN , c_v-10 - .byte VOL , 37*se_m_swift_mvl/mxv - .byte BEND , c_v-47 - .byte W02 - .byte VOL , 100*se_m_swift_mvl/mxv - .byte BEND , c_v+0 - .byte N06 , Ds6 , v056 - .byte W01 - .byte PAN , c_v+5 - .byte BEND , c_v-11 - .byte W01 - .byte PAN , c_v-6 - .byte VOL , 90*se_m_swift_mvl/mxv - .byte BEND , c_v-20 - .byte W01 - .byte PAN , c_v+8 - .byte VOL , 77*se_m_swift_mvl/mxv - .byte BEND , c_v-37 - .byte W01 - .byte PAN , c_v-10 - .byte VOL , 37*se_m_swift_mvl/mxv - .byte BEND , c_v-47 - .byte W02 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_swift_2: - .byte KEYSH , se_m_swift_key+0 - .byte VOICE , 53 - .byte VOL , 100*se_m_swift_mvl/mxv - .byte W02 - .byte N06 , Cn6 , v040 - .byte W04 - .byte W02 - .byte N04 , Cn6 , v032 - .byte W04 - .byte W06 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_swift: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_swift_pri @ Priority - .byte se_m_swift_rev @ Reverb. - - .word se_m_swift_grp - - .word se_m_swift_1 - .word se_m_swift_2 - - .end diff --git a/sound/songs/se_m_teeter_dance.s b/sound/songs/se_m_teeter_dance.s deleted file mode 100644 index 8238afeb2..000000000 --- a/sound/songs/se_m_teeter_dance.s +++ /dev/null @@ -1,121 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_teeter_dance_grp, voicegroup128 - .equ se_m_teeter_dance_pri, 4 - .equ se_m_teeter_dance_rev, reverb_set+50 - .equ se_m_teeter_dance_mvl, 127 - .equ se_m_teeter_dance_key, 0 - .equ se_m_teeter_dance_tbs, 1 - .equ se_m_teeter_dance_exg, 0 - .equ se_m_teeter_dance_cmp, 1 - - .section .rodata - .global se_m_teeter_dance - .align 2 - -@********************** Track 1 **********************@ - -se_m_teeter_dance_1: - .byte KEYSH , se_m_teeter_dance_key+0 - .byte TEMPO , 170*se_m_teeter_dance_tbs/2 - .byte VOICE , 37 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 110*se_m_teeter_dance_mvl/mxv - .byte BEND , c_v-4 - .byte N03 , Gn4 , v100 - .byte W06 - .byte PAN , c_v+16 - .byte N03 , Gn4 , v056 - .byte W03 - .byte PAN , c_v+0 - .byte N03 , An5 , v100 - .byte W03 - .byte W03 - .byte PAN , c_v-15 - .byte N03 , An5 , v056 - .byte W03 - .byte PAN , c_v+0 - .byte N03 , Cn6 , v100 - .byte W06 - .byte PAN , c_v+16 - .byte N03 , Cn6 , v056 - .byte W03 - .byte PAN , c_v+0 - .byte N03 , Gn4 , v072 - .byte W03 - .byte W03 - .byte PAN , c_v-16 - .byte N03 , Gn4 , v028 - .byte W03 - .byte PAN , c_v+0 - .byte N03 , An5 , v072 - .byte W06 - .byte PAN , c_v+16 - .byte N03 , An5 , v028 - .byte W03 - .byte PAN , c_v+0 - .byte N03 , Cn6 , v072 - .byte W03 - .byte W03 - .byte PAN , c_v-16 - .byte N03 , Cn6 , v028 - .byte W03 - .byte W06 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_teeter_dance_2: - .byte KEYSH , se_m_teeter_dance_key+0 - .byte VOICE , 47 - .byte XCMD , xIECV , 10 - .byte xIECL , 8 - .byte MOD , 20 - .byte VOL , 44*se_m_teeter_dance_mvl/mxv - .byte BEND , c_v-2 - .byte W03 - .byte N03 , Gn3 , v112 - .byte W03 - .byte W03 - .byte Gn3 , v068 - .byte W03 - .byte An4 , v112 - .byte W06 - .byte An4 , v068 - .byte W03 - .byte Cn5 , v112 - .byte W03 - .byte W03 - .byte Cn5 , v068 - .byte W03 - .byte Gn3 , v080 - .byte W06 - .byte Gn3 , v036 - .byte W03 - .byte An4 , v080 - .byte W03 - .byte W03 - .byte An4 , v036 - .byte W03 - .byte Cn5 , v080 - .byte W06 - .byte Cn5 , v036 - .byte W06 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_teeter_dance: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_teeter_dance_pri @ Priority - .byte se_m_teeter_dance_rev @ Reverb. - - .word se_m_teeter_dance_grp - - .word se_m_teeter_dance_1 - .word se_m_teeter_dance_2 - - .end diff --git a/sound/songs/se_m_teleport.s b/sound/songs/se_m_teleport.s deleted file mode 100644 index 2c4ad40e8..000000000 --- a/sound/songs/se_m_teleport.s +++ /dev/null @@ -1,165 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_teleport_grp, voicegroup128 - .equ se_m_teleport_pri, 4 - .equ se_m_teleport_rev, reverb_set+50 - .equ se_m_teleport_mvl, 127 - .equ se_m_teleport_key, 0 - .equ se_m_teleport_tbs, 1 - .equ se_m_teleport_exg, 0 - .equ se_m_teleport_cmp, 1 - - .section .rodata - .global se_m_teleport - .align 2 - -@********************** Track 1 **********************@ - -se_m_teleport_1: - .byte KEYSH , se_m_teleport_key+0 - .byte TEMPO , 150*se_m_teleport_tbs/2 - .byte VOICE , 45 - .byte BENDR , 24 - .byte PAN , c_v+0 - .byte VOL , 32*se_m_teleport_mvl/mxv - .byte MOD , 30 - .byte BEND , c_v+0 - .byte N06 , Cn3 , v127 - .byte W01 - .byte BEND , c_v+4 - .byte W01 - .byte VOL , 49*se_m_teleport_mvl/mxv - .byte PAN , c_v+5 - .byte BEND , c_v+9 - .byte W01 - .byte c_v+16 - .byte W01 - .byte VOL , 61*se_m_teleport_mvl/mxv - .byte BEND , c_v+24 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v+2 - .byte N06 , Dn3 , v116 - .byte W01 - .byte VOL , 71*se_m_teleport_mvl/mxv - .byte BEND , c_v+7 - .byte W01 - .byte PAN , c_v-4 - .byte BEND , c_v+12 - .byte W01 - .byte VOL , 81*se_m_teleport_mvl/mxv - .byte BEND , c_v+18 - .byte W01 - .byte c_v+27 - .byte W02 - .byte VOL , 95*se_m_teleport_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+4 - .byte N06 , En3 , v112 - .byte W01 - .byte BEND , c_v+9 - .byte W01 - .byte PAN , c_v+6 - .byte BEND , c_v+14 - .byte W01 - .byte c_v+20 - .byte W01 - .byte c_v+29 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v+6 - .byte N06 , Fn3 - .byte W01 - .byte BEND , c_v+11 - .byte W01 - .byte PAN , c_v-6 - .byte BEND , c_v+15 - .byte W01 - .byte c_v+22 - .byte W01 - .byte c_v+31 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v+9 - .byte N06 , Gn3 , v108 - .byte W01 - .byte BEND , c_v+14 - .byte W01 - .byte PAN , c_v+8 - .byte BEND , c_v+18 - .byte W01 - .byte c_v+25 - .byte W01 - .byte c_v+34 - .byte W02 - .byte VOL , 82*se_m_teleport_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+14 - .byte N06 , An3 , v100 - .byte W01 - .byte BEND , c_v+18 - .byte W01 - .byte VOL , 71*se_m_teleport_mvl/mxv - .byte PAN , c_v-8 - .byte BEND , c_v+23 - .byte W01 - .byte c_v+30 - .byte W01 - .byte VOL , 61*se_m_teleport_mvl/mxv - .byte BEND , c_v+38 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v+14 - .byte N06 , Bn3 , v060 - .byte W01 - .byte BEND , c_v+18 - .byte W01 - .byte PAN , c_v+8 - .byte BEND , c_v+23 - .byte W01 - .byte c_v+30 - .byte W01 - .byte c_v+38 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v+14 - .byte N06 , Cn4 , v040 - .byte W01 - .byte BEND , c_v+18 - .byte W01 - .byte PAN , c_v-8 - .byte BEND , c_v+23 - .byte W01 - .byte c_v+30 - .byte W01 - .byte c_v+38 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v+14 - .byte N06 , Dn4 , v020 - .byte W01 - .byte BEND , c_v+18 - .byte W01 - .byte PAN , c_v+8 - .byte BEND , c_v+23 - .byte W01 - .byte c_v+30 - .byte W01 - .byte c_v+38 - .byte W02 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_teleport: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_teleport_pri @ Priority - .byte se_m_teleport_rev @ Reverb. - - .word se_m_teleport_grp - - .word se_m_teleport_1 - - .end diff --git a/sound/songs/se_m_thunder_wave.s b/sound/songs/se_m_thunder_wave.s deleted file mode 100644 index c26535500..000000000 --- a/sound/songs/se_m_thunder_wave.s +++ /dev/null @@ -1,106 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_thunder_wave_grp, voicegroup128 - .equ se_m_thunder_wave_pri, 4 - .equ se_m_thunder_wave_rev, reverb_set+50 - .equ se_m_thunder_wave_mvl, 127 - .equ se_m_thunder_wave_key, 0 - .equ se_m_thunder_wave_tbs, 1 - .equ se_m_thunder_wave_exg, 0 - .equ se_m_thunder_wave_cmp, 1 - - .section .rodata - .global se_m_thunder_wave - .align 2 - -@********************** Track 1 **********************@ - -se_m_thunder_wave_1: - .byte KEYSH , se_m_thunder_wave_key+0 - .byte TEMPO , 150*se_m_thunder_wave_tbs/2 - .byte VOICE , 18 - .byte VOL , 110*se_m_thunder_wave_mvl/mxv - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte BEND , c_v+32 - .byte N06 , Gn3 , v127 - .byte W02 - .byte PAN , c_v-8 - .byte W01 - .byte BEND , c_v+0 - .byte W03 - .byte PAN , c_v+0 - .byte BEND , c_v+32 - .byte N04 , Cn3 - .byte W02 - .byte PAN , c_v+9 - .byte W01 - .byte BEND , c_v-12 - .byte W03 - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N01 , Gn3 - .byte W02 - .byte Bn2 - .byte W02 - .byte N13 , Gn3 - .byte W02 - .byte VOL , 96*se_m_thunder_wave_mvl/mxv - .byte W01 - .byte 85*se_m_thunder_wave_mvl/mxv - .byte W01 - .byte BEND , c_v-23 - .byte W01 - .byte VOL , 66*se_m_thunder_wave_mvl/mxv - .byte W01 - .byte BEND , c_v-40 - .byte W01 - .byte VOL , 36*se_m_thunder_wave_mvl/mxv - .byte W01 - .byte BEND , c_v-54 - .byte W02 - .byte VOL , 12*se_m_thunder_wave_mvl/mxv - .byte W01 - .byte BEND , c_v-64 - .byte W21 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_thunder_wave_2: - .byte KEYSH , se_m_thunder_wave_key+0 - .byte VOICE , 5 - .byte VOL , 110*se_m_thunder_wave_mvl/mxv - .byte PAN , c_v-7 - .byte N02 , En3 , v052 - .byte W04 - .byte PAN , c_v+10 - .byte N02 , En3 , v044 - .byte W04 - .byte PAN , c_v-7 - .byte N02 , En3 , v036 - .byte W04 - .byte PAN , c_v+10 - .byte N02 , En3 , v028 - .byte W04 - .byte PAN , c_v-7 - .byte N02 , En3 , v020 - .byte W08 - .byte W24 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_thunder_wave: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_thunder_wave_pri @ Priority - .byte se_m_thunder_wave_rev @ Reverb. - - .word se_m_thunder_wave_grp - - .word se_m_thunder_wave_1 - .word se_m_thunder_wave_2 - - .end diff --git a/sound/songs/se_m_thunderbolt.s b/sound/songs/se_m_thunderbolt.s deleted file mode 100644 index 3b3790313..000000000 --- a/sound/songs/se_m_thunderbolt.s +++ /dev/null @@ -1,117 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_thunderbolt_grp, voicegroup128 - .equ se_m_thunderbolt_pri, 4 - .equ se_m_thunderbolt_rev, reverb_set+50 - .equ se_m_thunderbolt_mvl, 127 - .equ se_m_thunderbolt_key, 0 - .equ se_m_thunderbolt_tbs, 1 - .equ se_m_thunderbolt_exg, 0 - .equ se_m_thunderbolt_cmp, 1 - - .section .rodata - .global se_m_thunderbolt - .align 2 - -@********************** Track 1 **********************@ - -se_m_thunderbolt_1: - .byte KEYSH , se_m_thunderbolt_key+0 - .byte TEMPO , 220*se_m_thunderbolt_tbs/2 - .byte VOICE , 18 - .byte VOL , 120*se_m_thunderbolt_mvl/mxv - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte BEND , c_v+32 - .byte N06 , Dn3 , v127 - .byte W02 - .byte PAN , c_v-8 - .byte W01 - .byte BEND , c_v+0 - .byte W01 - .byte PAN , c_v-16 - .byte W02 - .byte c_v+0 - .byte BEND , c_v+32 - .byte N06 , Dn2 , v104 - .byte W02 - .byte PAN , c_v+9 - .byte W01 - .byte BEND , c_v-12 - .byte W01 - .byte PAN , c_v+16 - .byte W02 - .byte c_v+0 - .byte BEND , c_v+0 - .byte N21 , Dn3 , v127 - .byte W03 - .byte PAN , c_v-8 - .byte W03 - .byte c_v-15 - .byte W01 - .byte BEND , c_v-13 - .byte W02 - .byte PAN , c_v-7 - .byte W01 - .byte BEND , c_v-23 - .byte W02 - .byte VOL , 100*se_m_thunderbolt_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v-40 - .byte W01 - .byte VOL , 86*se_m_thunderbolt_mvl/mxv - .byte W01 - .byte BEND , c_v-54 - .byte W01 - .byte PAN , c_v+10 - .byte VOL , 68*se_m_thunderbolt_mvl/mxv - .byte W02 - .byte 37*se_m_thunderbolt_mvl/mxv - .byte BEND , c_v-64 - .byte W01 - .byte PAN , c_v+16 - .byte W02 - .byte VOL , 17*se_m_thunderbolt_mvl/mxv - .byte W01 - .byte PAN , c_v+10 - .byte W15 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_thunderbolt_2: - .byte KEYSH , se_m_thunderbolt_key+0 - .byte VOICE , 5 - .byte VOL , 120*se_m_thunderbolt_mvl/mxv - .byte PAN , c_v-7 - .byte N02 , En3 , v048 - .byte W05 - .byte PAN , c_v+10 - .byte N02 , En3 , v040 - .byte W06 - .byte PAN , c_v-7 - .byte N02 , En3 , v032 - .byte W07 - .byte PAN , c_v+10 - .byte N02 , En3 , v024 - .byte W06 - .byte PAN , c_v-7 - .byte N02 , En3 , v016 - .byte W24 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_thunderbolt: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_thunderbolt_pri @ Priority - .byte se_m_thunderbolt_rev @ Reverb. - - .word se_m_thunderbolt_grp - - .word se_m_thunderbolt_1 - .word se_m_thunderbolt_2 - - .end diff --git a/sound/songs/se_m_thunderbolt2.s b/sound/songs/se_m_thunderbolt2.s deleted file mode 100644 index 506820395..000000000 --- a/sound/songs/se_m_thunderbolt2.s +++ /dev/null @@ -1,85 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_thunderbolt2_grp, voicegroup128 - .equ se_m_thunderbolt2_pri, 4 - .equ se_m_thunderbolt2_rev, reverb_set+50 - .equ se_m_thunderbolt2_mvl, 127 - .equ se_m_thunderbolt2_key, 0 - .equ se_m_thunderbolt2_tbs, 1 - .equ se_m_thunderbolt2_exg, 0 - .equ se_m_thunderbolt2_cmp, 1 - - .section .rodata - .global se_m_thunderbolt2 - .align 2 - -@********************** Track 1 **********************@ - -se_m_thunderbolt2_1: - .byte KEYSH , se_m_thunderbolt2_key+0 - .byte TEMPO , 220*se_m_thunderbolt2_tbs/2 - .byte VOICE , 18 - .byte VOL , 100*se_m_thunderbolt2_mvl/mxv - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N03 , Cn4 , v088 - .byte W06 - .byte PAN , c_v-9 - .byte N03 , Cn4 , v080 - .byte W06 - .byte PAN , c_v+9 - .byte N03 , Cn4 , v072 - .byte W06 - .byte PAN , c_v-16 - .byte N03 , Cn4 , v064 - .byte W06 - .byte PAN , c_v+16 - .byte N03 , Cn4 , v060 - .byte W06 - .byte PAN , c_v-16 - .byte N03 , Cn4 , v052 - .byte W18 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_thunderbolt2_2: - .byte KEYSH , se_m_thunderbolt2_key+0 - .byte VOICE , 5 - .byte VOL , 100*se_m_thunderbolt2_mvl/mxv - .byte PAN , c_v+9 - .byte N02 , Gn3 , v072 - .byte W06 - .byte PAN , c_v-7 - .byte N02 , Gn3 , v068 - .byte W06 - .byte PAN , c_v+9 - .byte N02 , Gn3 , v064 - .byte W06 - .byte PAN , c_v-7 - .byte N02 , Gn3 , v060 - .byte W06 - .byte PAN , c_v+9 - .byte N02 , Gn3 , v056 - .byte W06 - .byte PAN , c_v-7 - .byte N02 , Gn3 , v048 - .byte W18 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_thunderbolt2: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_thunderbolt2_pri @ Priority - .byte se_m_thunderbolt2_rev @ Reverb. - - .word se_m_thunderbolt2_grp - - .word se_m_thunderbolt2_1 - .word se_m_thunderbolt2_2 - - .end diff --git a/sound/songs/se_m_toxic.s b/sound/songs/se_m_toxic.s deleted file mode 100644 index 0e3ebe220..000000000 --- a/sound/songs/se_m_toxic.s +++ /dev/null @@ -1,87 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_toxic_grp, voicegroup128 - .equ se_m_toxic_pri, 4 - .equ se_m_toxic_rev, reverb_set+50 - .equ se_m_toxic_mvl, 127 - .equ se_m_toxic_key, 0 - .equ se_m_toxic_tbs, 1 - .equ se_m_toxic_exg, 0 - .equ se_m_toxic_cmp, 1 - - .section .rodata - .global se_m_toxic - .align 2 - -@********************** Track 1 **********************@ - -se_m_toxic_1: - .byte KEYSH , se_m_toxic_key+0 - .byte TEMPO , 150*se_m_toxic_tbs/2 - .byte VOICE , 31 - .byte VOL , 110*se_m_toxic_mvl/mxv - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N02 , Dn2 , v127 - .byte W01 - .byte BEND , c_v+32 - .byte W01 - .byte VOICE , 23 - .byte BEND , c_v+0 - .byte N02 , Gn1 , v112 - .byte W01 - .byte PAN , c_v+8 - .byte BEND , c_v+63 - .byte W01 - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N02 , Cn2 - .byte W02 - .byte PAN , c_v-7 - .byte BEND , c_v+16 - .byte W01 - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte W01 - .byte N01 - .byte W01 - .byte PAN , c_v+8 - .byte N01 , Cn3 - .byte W01 - .byte VOICE , 31 - .byte PAN , c_v-16 - .byte N01 , Dn2 - .byte W02 - .byte VOICE , 23 - .byte PAN , c_v+0 - .byte N01 , Cn2 - .byte W01 - .byte VOICE , 31 - .byte PAN , c_v+16 - .byte N01 , Dn2 , v096 - .byte W01 - .byte VOICE , 23 - .byte PAN , c_v-8 - .byte BEND , c_v+16 - .byte N01 , Cn3 - .byte W02 - .byte PAN , c_v+8 - .byte N01 , Cn2 - .byte W08 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_toxic: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_toxic_pri @ Priority - .byte se_m_toxic_rev @ Reverb. - - .word se_m_toxic_grp - - .word se_m_toxic_1 - - .end diff --git a/sound/songs/se_m_tri_attack.s b/sound/songs/se_m_tri_attack.s deleted file mode 100644 index 448998e77..000000000 --- a/sound/songs/se_m_tri_attack.s +++ /dev/null @@ -1,99 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_tri_attack_grp, voicegroup128 - .equ se_m_tri_attack_pri, 4 - .equ se_m_tri_attack_rev, reverb_set+50 - .equ se_m_tri_attack_mvl, 127 - .equ se_m_tri_attack_key, 0 - .equ se_m_tri_attack_tbs, 1 - .equ se_m_tri_attack_exg, 0 - .equ se_m_tri_attack_cmp, 1 - - .section .rodata - .global se_m_tri_attack - .align 2 - -@********************** Track 1 **********************@ - -se_m_tri_attack_1: - .byte KEYSH , se_m_tri_attack_key+0 - .byte TEMPO , 220*se_m_tri_attack_tbs/2 - .byte VOICE , 58 - .byte BENDR , 24 - .byte PAN , c_v+0 - .byte VOL , 19*se_m_tri_attack_mvl/mxv - .byte BEND , c_v-32 - .byte N16 , Gn1 , v127 - .byte W01 - .byte VOL , 43*se_m_tri_attack_mvl/mxv - .byte BEND , c_v-20 - .byte W01 - .byte VOL , 72*se_m_tri_attack_mvl/mxv - .byte BEND , c_v-8 - .byte W01 - .byte VOL , 92*se_m_tri_attack_mvl/mxv - .byte BEND , c_v+7 - .byte W01 - .byte VOL , 109*se_m_tri_attack_mvl/mxv - .byte BEND , c_v+19 - .byte W02 - .byte c_v+28 - .byte W01 - .byte c_v+40 - .byte W01 - .byte c_v+28 - .byte W01 - .byte VOL , 102*se_m_tri_attack_mvl/mxv - .byte BEND , c_v+19 - .byte W01 - .byte VOL , 88*se_m_tri_attack_mvl/mxv - .byte BEND , c_v+5 - .byte W02 - .byte VOL , 69*se_m_tri_attack_mvl/mxv - .byte BEND , c_v-9 - .byte W01 - .byte VOL , 37*se_m_tri_attack_mvl/mxv - .byte BEND , c_v-20 - .byte W01 - .byte VOL , 17*se_m_tri_attack_mvl/mxv - .byte BEND , c_v-34 - .byte W10 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_tri_attack_2: - .byte KEYSH , se_m_tri_attack_key+0 - .byte VOICE , 4 - .byte VOL , 110*se_m_tri_attack_mvl/mxv - .byte N02 , Gs3 , v032 - .byte W02 - .byte Gn3 - .byte W02 - .byte Fn3 - .byte W03 - .byte En3 - .byte W02 - .byte Dn3 - .byte W03 - .byte Cn3 - .byte W02 - .byte Gs2 - .byte W10 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_tri_attack: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_tri_attack_pri @ Priority - .byte se_m_tri_attack_rev @ Reverb. - - .word se_m_tri_attack_grp - - .word se_m_tri_attack_1 - .word se_m_tri_attack_2 - - .end diff --git a/sound/songs/se_m_tri_attack2.s b/sound/songs/se_m_tri_attack2.s deleted file mode 100644 index 0afade13c..000000000 --- a/sound/songs/se_m_tri_attack2.s +++ /dev/null @@ -1,124 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_tri_attack2_grp, voicegroup128 - .equ se_m_tri_attack2_pri, 4 - .equ se_m_tri_attack2_rev, reverb_set+50 - .equ se_m_tri_attack2_mvl, 127 - .equ se_m_tri_attack2_key, 0 - .equ se_m_tri_attack2_tbs, 1 - .equ se_m_tri_attack2_exg, 0 - .equ se_m_tri_attack2_cmp, 1 - - .section .rodata - .global se_m_tri_attack2 - .align 2 - -@********************** Track 1 **********************@ - -se_m_tri_attack2_1: - .byte KEYSH , se_m_tri_attack2_key+0 - .byte TEMPO , 220*se_m_tri_attack2_tbs/2 - .byte VOICE , 18 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 110*se_m_tri_attack2_mvl/mxv - .byte BEND , c_v+0 - .byte N09 , An3 , v127 - .byte W03 - .byte BEND , c_v+21 - .byte W03 - .byte c_v+0 - .byte W03 - .byte c_v+6 - .byte N15 , An3 , v120 - .byte W03 - .byte BEND , c_v+2 - .byte W01 - .byte PAN , c_v+10 - .byte W02 - .byte BEND , c_v-9 - .byte W03 - .byte PAN , c_v-9 - .byte BEND , c_v-29 - .byte W06 - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N09 , Cn3 , v127 - .byte W06 - .byte BEND , c_v-8 - .byte W03 - .byte c_v-15 - .byte N60 , Cs3 , v124 - .byte W03 - .byte BEND , c_v-4 - .byte W03 - .byte PAN , c_v+10 - .byte W06 - .byte c_v+0 - .byte BEND , c_v-8 - .byte W03 - .byte W03 - .byte PAN , c_v-9 - .byte W03 - .byte BEND , c_v-13 - .byte W03 - .byte PAN , c_v+0 - .byte BEND , c_v-22 - .byte W06 - .byte VOL , 103*se_m_tri_attack2_mvl/mxv - .byte PAN , c_v+10 - .byte W03 - .byte BEND , c_v-32 - .byte W03 - .byte PAN , c_v+0 - .byte W03 - .byte VOL , 95*se_m_tri_attack2_mvl/mxv - .byte BEND , c_v-38 - .byte W03 - .byte PAN , c_v-9 - .byte W05 - .byte BEND , c_v-45 - .byte W01 - .byte VOL , 66*se_m_tri_attack2_mvl/mxv - .byte PAN , c_v+0 - .byte W05 - .byte c_v+10 - .byte W01 - .byte BEND , c_v-52 - .byte W03 - .byte VOL , 21*se_m_tri_attack2_mvl/mxv - .byte W02 - .byte PAN , c_v+0 - .byte W04 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_tri_attack2_2: - .byte KEYSH , se_m_tri_attack2_key+0 - .byte VOICE , 4 - .byte VOL , 110*se_m_tri_attack2_mvl/mxv - .byte N06 , Cn3 , v060 - .byte W09 - .byte N15 - .byte W15 - .byte W24 - .byte W24 - .byte W24 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_tri_attack2: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_tri_attack2_pri @ Priority - .byte se_m_tri_attack2_rev @ Reverb. - - .word se_m_tri_attack2_grp - - .word se_m_tri_attack2_1 - .word se_m_tri_attack2_2 - - .end diff --git a/sound/songs/se_m_twister.s b/sound/songs/se_m_twister.s deleted file mode 100644 index e95e9b322..000000000 --- a/sound/songs/se_m_twister.s +++ /dev/null @@ -1,210 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_twister_grp, voicegroup128 - .equ se_m_twister_pri, 4 - .equ se_m_twister_rev, reverb_set+50 - .equ se_m_twister_mvl, 127 - .equ se_m_twister_key, 0 - .equ se_m_twister_tbs, 1 - .equ se_m_twister_exg, 0 - .equ se_m_twister_cmp, 1 - - .section .rodata - .global se_m_twister - .align 2 - -@********************** Track 1 **********************@ - -se_m_twister_1: - .byte KEYSH , se_m_twister_key+0 - .byte TEMPO , 150*se_m_twister_tbs/2 - .byte VOICE , 22 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 67*se_m_twister_mvl/mxv - .byte BEND , c_v+0 - .byte TIE , Dn2 , v127 - .byte W03 - .byte VOL , 83*se_m_twister_mvl/mxv - .byte BEND , c_v+22 - .byte W03 - .byte VOL , 88*se_m_twister_mvl/mxv - .byte PAN , c_v-4 - .byte W03 - .byte VOL , 95*se_m_twister_mvl/mxv - .byte W02 - .byte BEND , c_v+8 - .byte W01 - .byte VOL , 105*se_m_twister_mvl/mxv - .byte PAN , c_v-8 - .byte W03 - .byte VOL , 115*se_m_twister_mvl/mxv - .byte W02 - .byte BEND , c_v+0 - .byte W01 - .byte PAN , c_v-12 - .byte W06 - .byte c_v-17 - .byte BEND , c_v+0 - .byte W03 - .byte c_v-7 - .byte W03 - .byte PAN , c_v-9 - .byte W06 - .byte c_v-3 - .byte W01 - .byte BEND , c_v-12 - .byte W02 - .byte PAN , c_v+6 - .byte W03 - .byte c_v+10 - .byte W06 - .byte c_v+16 - .byte W01 - .byte BEND , c_v-20 - .byte W05 - .byte PAN , c_v+13 - .byte W06 - .byte c_v+8 - .byte W03 - .byte c_v+0 - .byte W01 - .byte BEND , c_v-13 - .byte W02 - .byte PAN , c_v-8 - .byte W03 - .byte c_v-11 - .byte W03 - .byte c_v-17 - .byte W01 - .byte BEND , c_v-6 - .byte W05 - .byte PAN , c_v-9 - .byte W06 - .byte c_v-3 - .byte W03 - .byte c_v+6 - .byte W03 - .byte c_v+10 - .byte W01 - .byte BEND , c_v+6 - .byte W05 - .byte PAN , c_v+16 - .byte W06 - .byte c_v+13 - .byte W06 - .byte c_v+8 - .byte W03 - .byte c_v+0 - .byte BEND , c_v+11 - .byte W03 - .byte PAN , c_v-8 - .byte W03 - .byte c_v-11 - .byte VOL , 103*se_m_twister_mvl/mxv - .byte W03 - .byte PAN , c_v-17 - .byte W01 - .byte BEND , c_v+20 - .byte W05 - .byte PAN , c_v-9 - .byte W01 - .byte VOL , 97*se_m_twister_mvl/mxv - .byte W05 - .byte PAN , c_v-3 - .byte W01 - .byte BEND , c_v+12 - .byte W02 - .byte PAN , c_v+6 - .byte VOL , 88*se_m_twister_mvl/mxv - .byte W03 - .byte PAN , c_v+10 - .byte W02 - .byte BEND , c_v+7 - .byte W02 - .byte VOL , 79*se_m_twister_mvl/mxv - .byte W02 - .byte PAN , c_v+16 - .byte W04 - .byte VOL , 62*se_m_twister_mvl/mxv - .byte BEND , c_v+0 - .byte W02 - .byte PAN , c_v+13 - .byte W04 - .byte VOL , 45*se_m_twister_mvl/mxv - .byte W02 - .byte PAN , c_v+8 - .byte W01 - .byte BEND , c_v-7 - .byte W01 - .byte VOL , 33*se_m_twister_mvl/mxv - .byte W01 - .byte PAN , c_v+0 - .byte W03 - .byte c_v-8 - .byte W01 - .byte VOL , 18*se_m_twister_mvl/mxv - .byte W02 - .byte PAN , c_v-11 - .byte W03 - .byte EOT - .byte FINE - -@********************** Track 2 **********************@ - -se_m_twister_2: - .byte KEYSH , se_m_twister_key+0 - .byte VOICE , 25 - .byte VOL , 67*se_m_twister_mvl/mxv - .byte TIE , Gs4 , v012 - .byte W03 - .byte VOL , 83*se_m_twister_mvl/mxv - .byte W03 - .byte 88*se_m_twister_mvl/mxv - .byte W03 - .byte 95*se_m_twister_mvl/mxv - .byte W03 - .byte 105*se_m_twister_mvl/mxv - .byte W03 - .byte 115*se_m_twister_mvl/mxv - .byte W09 - .byte W24 - .byte W24 - .byte W24 - .byte W21 - .byte 103*se_m_twister_mvl/mxv - .byte W03 - .byte W07 - .byte 97*se_m_twister_mvl/mxv - .byte W08 - .byte 88*se_m_twister_mvl/mxv - .byte W07 - .byte 79*se_m_twister_mvl/mxv - .byte W02 - .byte W04 - .byte 62*se_m_twister_mvl/mxv - .byte W06 - .byte 45*se_m_twister_mvl/mxv - .byte W04 - .byte 33*se_m_twister_mvl/mxv - .byte W05 - .byte 18*se_m_twister_mvl/mxv - .byte W05 - .byte EOT - .byte FINE - -@******************************************************@ - .align 2 - -se_m_twister: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_twister_pri @ Priority - .byte se_m_twister_rev @ Reverb. - - .word se_m_twister_grp - - .word se_m_twister_1 - .word se_m_twister_2 - - .end diff --git a/sound/songs/se_m_uproar.s b/sound/songs/se_m_uproar.s deleted file mode 100644 index c60cccee4..000000000 --- a/sound/songs/se_m_uproar.s +++ /dev/null @@ -1,86 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_uproar_grp, voicegroup128 - .equ se_m_uproar_pri, 4 - .equ se_m_uproar_rev, reverb_set+50 - .equ se_m_uproar_mvl, 127 - .equ se_m_uproar_key, 0 - .equ se_m_uproar_tbs, 1 - .equ se_m_uproar_exg, 0 - .equ se_m_uproar_cmp, 1 - - .section .rodata - .global se_m_uproar - .align 2 - -@********************** Track 1 **********************@ - -se_m_uproar_1: - .byte KEYSH , se_m_uproar_key+0 - .byte TEMPO , 150*se_m_uproar_tbs/2 - .byte VOICE , 60 - .byte BENDR , 12 - .byte VOL , 25*se_m_uproar_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N24 , Gs2 , v127 - .byte W01 - .byte PAN , c_v+2 - .byte VOL , 51*se_m_uproar_mvl/mxv - .byte W01 - .byte PAN , c_v+5 - .byte VOL , 74*se_m_uproar_mvl/mxv - .byte W01 - .byte 89*se_m_uproar_mvl/mxv - .byte BEND , c_v+1 - .byte W01 - .byte PAN , c_v+2 - .byte VOL , 100*se_m_uproar_mvl/mxv - .byte W02 - .byte PAN , c_v+0 - .byte W01 - .byte c_v-2 - .byte BEND , c_v+4 - .byte W01 - .byte PAN , c_v-4 - .byte W02 - .byte c_v-2 - .byte BEND , c_v+5 - .byte W02 - .byte PAN , c_v+0 - .byte W01 - .byte c_v+2 - .byte W01 - .byte c_v+5 - .byte W02 - .byte c_v+2 - .byte W02 - .byte c_v+0 - .byte W01 - .byte VOL , 85*se_m_uproar_mvl/mxv - .byte PAN , c_v-2 - .byte W01 - .byte c_v-4 - .byte VOL , 62*se_m_uproar_mvl/mxv - .byte W01 - .byte 33*se_m_uproar_mvl/mxv - .byte W01 - .byte PAN , c_v-2 - .byte VOL , 11*se_m_uproar_mvl/mxv - .byte W02 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_uproar: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_uproar_pri @ Priority - .byte se_m_uproar_rev @ Reverb. - - .word se_m_uproar_grp - - .word se_m_uproar_1 - - .end diff --git a/sound/songs/se_m_vital_throw.s b/sound/songs/se_m_vital_throw.s deleted file mode 100644 index c89d003b6..000000000 --- a/sound/songs/se_m_vital_throw.s +++ /dev/null @@ -1,75 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_vital_throw_grp, voicegroup128 - .equ se_m_vital_throw_pri, 4 - .equ se_m_vital_throw_rev, reverb_set+50 - .equ se_m_vital_throw_mvl, 127 - .equ se_m_vital_throw_key, 0 - .equ se_m_vital_throw_tbs, 1 - .equ se_m_vital_throw_exg, 0 - .equ se_m_vital_throw_cmp, 1 - - .section .rodata - .global se_m_vital_throw - .align 2 - -@********************** Track 1 **********************@ - -se_m_vital_throw_1: - .byte KEYSH , se_m_vital_throw_key+0 - .byte TEMPO , 220*se_m_vital_throw_tbs/2 - .byte VOICE , 22 - .byte VOL , 110*se_m_vital_throw_mvl/mxv - .byte BENDR , 12 - .byte PAN , c_v+16 - .byte BEND , c_v+46 - .byte N09 , Cn3 , v127 - .byte W03 - .byte VOL , 104*se_m_vital_throw_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+23 - .byte W03 - .byte VOL , 93*se_m_vital_throw_mvl/mxv - .byte PAN , c_v-16 - .byte BEND , c_v-15 - .byte W03 - .byte VOICE , 21 - .byte VOL , 110*se_m_vital_throw_mvl/mxv - .byte BEND , c_v+0 - .byte N03 , Gn4 - .byte W06 - .byte PAN , c_v+16 - .byte N03 , Cn5 - .byte W09 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_vital_throw_2: - .byte KEYSH , se_m_vital_throw_key+0 - .byte VOICE , 4 - .byte VOL , 110*se_m_vital_throw_mvl/mxv - .byte W09 - .byte PAN , c_v+8 - .byte N03 , Cn3 , v052 - .byte W06 - .byte PAN , c_v-7 - .byte N03 - .byte W09 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_vital_throw: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_vital_throw_pri @ Priority - .byte se_m_vital_throw_rev @ Reverb. - - .word se_m_vital_throw_grp - - .word se_m_vital_throw_1 - .word se_m_vital_throw_2 - - .end diff --git a/sound/songs/se_m_vital_throw2.s b/sound/songs/se_m_vital_throw2.s deleted file mode 100644 index 3bffdeb25..000000000 --- a/sound/songs/se_m_vital_throw2.s +++ /dev/null @@ -1,108 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_vital_throw2_grp, voicegroup128 - .equ se_m_vital_throw2_pri, 4 - .equ se_m_vital_throw2_rev, reverb_set+50 - .equ se_m_vital_throw2_mvl, 127 - .equ se_m_vital_throw2_key, 0 - .equ se_m_vital_throw2_tbs, 1 - .equ se_m_vital_throw2_exg, 0 - .equ se_m_vital_throw2_cmp, 1 - - .section .rodata - .global se_m_vital_throw2 - .align 2 - -@********************** Track 1 **********************@ - -se_m_vital_throw2_1: - .byte KEYSH , se_m_vital_throw2_key+0 - .byte TEMPO , 220*se_m_vital_throw2_tbs/2 - .byte VOICE , 6 - .byte VOL , 110*se_m_vital_throw2_mvl/mxv - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N06 , Cn3 , v127 - .byte W01 - .byte BEND , c_v-9 - .byte W01 - .byte c_v-21 - .byte W01 - .byte PAN , c_v-6 - .byte BEND , c_v-40 - .byte W01 - .byte c_v-64 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N06 , En3 - .byte W01 - .byte BEND , c_v-9 - .byte W01 - .byte c_v-21 - .byte W01 - .byte PAN , c_v+7 - .byte BEND , c_v-40 - .byte W01 - .byte c_v-64 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N09 , An2 - .byte W01 - .byte BEND , c_v-9 - .byte W01 - .byte c_v-19 - .byte W01 - .byte c_v-29 - .byte W01 - .byte VOL , 86*se_m_vital_throw2_mvl/mxv - .byte BEND , c_v-39 - .byte W02 - .byte VOL , 69*se_m_vital_throw2_mvl/mxv - .byte BEND , c_v-45 - .byte W01 - .byte VOL , 53*se_m_vital_throw2_mvl/mxv - .byte BEND , c_v-56 - .byte W01 - .byte VOL , 20*se_m_vital_throw2_mvl/mxv - .byte BEND , c_v-64 - .byte W04 - .byte c_v-64 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_vital_throw2_2: - .byte KEYSH , se_m_vital_throw2_key+0 - .byte VOICE , 5 - .byte XCMD , xIECV , 10 - .byte xIECL , 8 - .byte VOL , 110*se_m_vital_throw2_mvl/mxv - .byte PAN , c_v+9 - .byte N03 , Gs2 , v052 - .byte W06 - .byte PAN , c_v-7 - .byte N03 - .byte W06 - .byte PAN , c_v+0 - .byte N03 - .byte W12 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_vital_throw2: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_vital_throw2_pri @ Priority - .byte se_m_vital_throw2_rev @ Reverb. - - .word se_m_vital_throw2_grp - - .word se_m_vital_throw2_1 - .word se_m_vital_throw2_2 - - .end diff --git a/sound/songs/se_m_waterfall.s b/sound/songs/se_m_waterfall.s deleted file mode 100644 index a07e7e971..000000000 --- a/sound/songs/se_m_waterfall.s +++ /dev/null @@ -1,137 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_waterfall_grp, voicegroup128 - .equ se_m_waterfall_pri, 4 - .equ se_m_waterfall_rev, reverb_set+50 - .equ se_m_waterfall_mvl, 127 - .equ se_m_waterfall_key, 0 - .equ se_m_waterfall_tbs, 1 - .equ se_m_waterfall_exg, 0 - .equ se_m_waterfall_cmp, 1 - - .section .rodata - .global se_m_waterfall - .align 2 - -@********************** Track 1 **********************@ - -se_m_waterfall_1: - .byte KEYSH , se_m_waterfall_key+0 - .byte TEMPO , 150*se_m_waterfall_tbs/2 - .byte VOICE , 36 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 115*se_m_waterfall_mvl/mxv - .byte BEND , c_v-18 - .byte N60 , Gn2 , v127 - .byte W03 - .byte PAN , c_v+3 - .byte BEND , c_v-16 - .byte W04 - .byte PAN , c_v+6 - .byte BEND , c_v-14 - .byte W03 - .byte PAN , c_v+3 - .byte BEND , c_v-11 - .byte W02 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v-8 - .byte W04 - .byte PAN , c_v-3 - .byte BEND , c_v-5 - .byte W03 - .byte PAN , c_v-6 - .byte BEND , c_v-2 - .byte W03 - .byte W01 - .byte PAN , c_v-3 - .byte BEND , c_v+1 - .byte W03 - .byte PAN , c_v+0 - .byte BEND , c_v+4 - .byte W04 - .byte PAN , c_v+3 - .byte BEND , c_v+7 - .byte W02 - .byte VOL , 109*se_m_waterfall_mvl/mxv - .byte W02 - .byte PAN , c_v+6 - .byte BEND , c_v+10 - .byte W02 - .byte VOL , 103*se_m_waterfall_mvl/mxv - .byte W01 - .byte PAN , c_v+3 - .byte BEND , c_v+13 - .byte W03 - .byte VOL , 92*se_m_waterfall_mvl/mxv - .byte W01 - .byte PAN , c_v+0 - .byte BEND , c_v+16 - .byte W03 - .byte VOL , 79*se_m_waterfall_mvl/mxv - .byte PAN , c_v-3 - .byte BEND , c_v+18 - .byte W02 - .byte W02 - .byte VOL , 62*se_m_waterfall_mvl/mxv - .byte PAN , c_v-6 - .byte BEND , c_v+21 - .byte W04 - .byte VOL , 40*se_m_waterfall_mvl/mxv - .byte PAN , c_v-3 - .byte BEND , c_v+26 - .byte W02 - .byte VOL , 22*se_m_waterfall_mvl/mxv - .byte BEND , c_v+33 - .byte W01 - .byte PAN , c_v+0 - .byte W01 - .byte VOL , 8*se_m_waterfall_mvl/mxv - .byte BEND , c_v+43 - .byte W02 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_waterfall_2: - .byte KEYSH , se_m_waterfall_key+0 - .byte VOICE , 25 - .byte VOL , 115*se_m_waterfall_mvl/mxv - .byte N06 , Cn3 , v040 - .byte W06 - .byte Gn2 - .byte W06 -se_m_waterfall_2_000: - .byte N06 , Cn3 , v040 - .byte W06 - .byte Gn2 - .byte W06 - .byte PEND - .byte PATT - .word se_m_waterfall_2_000 - .byte N06 , Cn3 , v032 - .byte W06 - .byte Gn2 - .byte W06 - .byte Cn3 , v012 - .byte W06 - .byte Gn2 - .byte W06 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_waterfall: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_waterfall_pri @ Priority - .byte se_m_waterfall_rev @ Reverb. - - .word se_m_waterfall_grp - - .word se_m_waterfall_1 - .word se_m_waterfall_2 - - .end diff --git a/sound/songs/se_m_whirlpool.s b/sound/songs/se_m_whirlpool.s deleted file mode 100644 index bac3fa5bc..000000000 --- a/sound/songs/se_m_whirlpool.s +++ /dev/null @@ -1,125 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_whirlpool_grp, voicegroup128 - .equ se_m_whirlpool_pri, 4 - .equ se_m_whirlpool_rev, reverb_set+50 - .equ se_m_whirlpool_mvl, 127 - .equ se_m_whirlpool_key, 0 - .equ se_m_whirlpool_tbs, 1 - .equ se_m_whirlpool_exg, 0 - .equ se_m_whirlpool_cmp, 1 - - .section .rodata - .global se_m_whirlpool - .align 2 - -@********************** Track 1 **********************@ - -se_m_whirlpool_1: - .byte KEYSH , se_m_whirlpool_key+0 - .byte TEMPO , 150*se_m_whirlpool_tbs/2 - .byte VOICE , 36 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 115*se_m_whirlpool_mvl/mxv - .byte BEND , c_v-18 - .byte TIE , Dn2 , v127 - .byte W03 - .byte BEND , c_v-12 - .byte W03 - .byte PAN , c_v-5 - .byte W02 - .byte BEND , c_v-8 - .byte W04 - .byte PAN , c_v-10 - .byte W01 - .byte BEND , c_v-3 - .byte W03 - .byte c_v+2 - .byte W02 - .byte PAN , c_v-13 - .byte W04 - .byte BEND , c_v+5 - .byte W02 - .byte PAN , c_v-16 - .byte W04 - .byte BEND , c_v+14 - .byte W02 - .byte PAN , c_v-14 - .byte W06 - .byte c_v-9 - .byte BEND , c_v+18 - .byte W06 - .byte PAN , c_v-6 - .byte W01 - .byte BEND , c_v+24 - .byte W05 - .byte PAN , c_v+0 - .byte W06 - .byte c_v+3 - .byte W06 - .byte c_v+7 - .byte W06 - .byte c_v+11 - .byte BEND , c_v+17 - .byte W06 - .byte PAN , c_v+16 - .byte BEND , c_v+10 - .byte W06 - .byte PAN , c_v+11 - .byte W01 - .byte BEND , c_v+5 - .byte W05 - .byte PAN , c_v+6 - .byte W02 - .byte VOL , 103*se_m_whirlpool_mvl/mxv - .byte W01 - .byte BEND , c_v+0 - .byte W03 - .byte PAN , c_v+4 - .byte W01 - .byte VOL , 85*se_m_whirlpool_mvl/mxv - .byte W01 - .byte BEND , c_v-5 - .byte W04 - .byte PAN , c_v+0 - .byte W01 - .byte VOL , 71*se_m_whirlpool_mvl/mxv - .byte W02 - .byte BEND , c_v-8 - .byte W03 - .byte VOL , 52*se_m_whirlpool_mvl/mxv - .byte PAN , c_v-4 - .byte W03 - .byte BEND , c_v-12 - .byte W01 - .byte VOL , 32*se_m_whirlpool_mvl/mxv - .byte W02 - .byte PAN , c_v-10 - .byte W03 - .byte VOL , 11*se_m_whirlpool_mvl/mxv - .byte BEND , c_v-19 - .byte W03 - .byte PAN , c_v-15 - .byte W01 - .byte VOL , 6*se_m_whirlpool_mvl/mxv - .byte W01 - .byte BEND , c_v-28 - .byte W04 - .byte EOT - .byte FINE - -@******************************************************@ - .align 2 - -se_m_whirlpool: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_whirlpool_pri @ Priority - .byte se_m_whirlpool_rev @ Reverb. - - .word se_m_whirlpool_grp - - .word se_m_whirlpool_1 - - .end diff --git a/sound/songs/se_m_yawn.s b/sound/songs/se_m_yawn.s deleted file mode 100644 index c6af1f361..000000000 --- a/sound/songs/se_m_yawn.s +++ /dev/null @@ -1,127 +0,0 @@ - .include "MPlayDef.s" - - .equ se_m_yawn_grp, voicegroup128 - .equ se_m_yawn_pri, 4 - .equ se_m_yawn_rev, reverb_set+50 - .equ se_m_yawn_mvl, 127 - .equ se_m_yawn_key, 0 - .equ se_m_yawn_tbs, 1 - .equ se_m_yawn_exg, 0 - .equ se_m_yawn_cmp, 1 - - .section .rodata - .global se_m_yawn - .align 2 - -@********************** Track 1 **********************@ - -se_m_yawn_1: - .byte VOL , 110*se_m_yawn_mvl/mxv - .byte KEYSH , se_m_yawn_key+0 - .byte TEMPO , 150*se_m_yawn_tbs/2 - .byte VOICE , 61 - .byte BENDR , 44 - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N48 , Cn4 , v108 - .byte W02 - .byte BEND , c_v-1 - .byte W01 - .byte c_v+0 - .byte W03 - .byte c_v+0 - .byte W01 - .byte c_v+0 - .byte W02 - .byte c_v+0 - .byte W01 - .byte c_v+0 - .byte W02 - .byte PAN , c_v-4 - .byte W01 - .byte BEND , c_v+0 - .byte W01 - .byte c_v+1 - .byte W02 - .byte c_v+1 - .byte W02 - .byte c_v+1 - .byte W02 - .byte c_v+1 - .byte W01 - .byte c_v+1 - .byte W03 - .byte PAN , c_v-10 - .byte BEND , c_v+1 - .byte W01 - .byte c_v+2 - .byte W02 - .byte c_v+2 - .byte W03 - .byte c_v+1 - .byte W02 - .byte c_v+2 - .byte W01 - .byte c_v+1 - .byte W03 - .byte PAN , c_v-4 - .byte BEND , c_v+1 - .byte W01 - .byte c_v+1 - .byte W02 - .byte c_v+1 - .byte W01 - .byte c_v+0 - .byte W02 - .byte c_v+0 - .byte W01 - .byte c_v-1 - .byte W01 - .byte c_v-1 - .byte W01 - .byte c_v-3 - .byte W01 - .byte c_v-3 - .byte W02 - .byte FINE - -@********************** Track 2 **********************@ - -se_m_yawn_2: - .byte KEYSH , se_m_yawn_key+0 - .byte VOICE , 66 - .byte BENDR , 44 - .byte PAN , c_v+1 - .byte VOL , 110*se_m_yawn_mvl/mxv - .byte N48 , Dn3 , v020 - .byte W24 - .byte W03 - .byte VOL , 103*se_m_yawn_mvl/mxv - .byte W04 - .byte 96*se_m_yawn_mvl/mxv - .byte W03 - .byte 83*se_m_yawn_mvl/mxv - .byte W04 - .byte 67*se_m_yawn_mvl/mxv - .byte W04 - .byte 49*se_m_yawn_mvl/mxv - .byte W03 - .byte 23*se_m_yawn_mvl/mxv - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_m_yawn: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_m_yawn_pri @ Priority - .byte se_m_yawn_rev @ Reverb. - - .word se_m_yawn_grp - - .word se_m_yawn_1 - .word se_m_yawn_2 - - .end diff --git a/sound/songs/se_wall_hit.s b/sound/songs/se_wall_hit.s deleted file mode 100644 index feeeb03b1..000000000 --- a/sound/songs/se_wall_hit.s +++ /dev/null @@ -1,41 +0,0 @@ - .include "MPlayDef.s" - - .equ se_wall_hit_grp, voicegroup127 - .equ se_wall_hit_pri, 2 - .equ se_wall_hit_rev, reverb_set+50 - .equ se_wall_hit_mvl, 127 - .equ se_wall_hit_key, 0 - .equ se_wall_hit_tbs, 1 - .equ se_wall_hit_exg, 0 - .equ se_wall_hit_cmp, 1 - - .section .rodata - .global se_wall_hit - .align 2 - -@********************** Track 1 **********************@ - -se_wall_hit_1: - .byte KEYSH , se_wall_hit_key+0 - .byte TEMPO , 220*se_wall_hit_tbs/2 - .byte VOICE , 89 - .byte VOL , 80*se_wall_hit_mvl/mxv - .byte BEND , c_v+0 - .byte N18 , Gn1 , v127 - .byte W24 - .byte FINE - -@******************************************************@ - .align 2 - -se_wall_hit: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_wall_hit_pri @ Priority - .byte se_wall_hit_rev @ Reverb. - - .word se_wall_hit_grp - - .word se_wall_hit_1 - - .end diff --git a/sound/songs/se_win_open.s b/sound/songs/se_win_open.s deleted file mode 100644 index 74656e9c0..000000000 --- a/sound/songs/se_win_open.s +++ /dev/null @@ -1,42 +0,0 @@ - .include "MPlayDef.s" - - .equ se_win_open_grp, voicegroup127 - .equ se_win_open_pri, 5 - .equ se_win_open_rev, reverb_set+50 - .equ se_win_open_mvl, 127 - .equ se_win_open_key, 0 - .equ se_win_open_tbs, 1 - .equ se_win_open_exg, 0 - .equ se_win_open_cmp, 1 - - .section .rodata - .global se_win_open - .align 2 - -@********************** Track 1 **********************@ - -se_win_open_1: - .byte KEYSH , se_win_open_key+0 - .byte TEMPO , 220*se_win_open_tbs/2 - .byte VOICE , 127 - .byte VOL , 110*se_win_open_mvl/mxv - .byte N03 , Ds3 , v127 - .byte W03 - .byte N15 , Gn4 - .byte W21 - .byte FINE - -@******************************************************@ - .align 2 - -se_win_open: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_win_open_pri @ Priority - .byte se_win_open_rev @ Reverb. - - .word se_win_open_grp - - .word se_win_open_1 - - .end From 0a861411097682d3c377b5780171d771c821f3dc Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sat, 21 Mar 2026 11:07:20 -0500 Subject: [PATCH 04/14] Convert all of the remaining .s files to .midi --- ld_script.ld | 28 +-- sound/songs/midi/midi.cfg | 14 ++ sound/songs/midi/se_bag_cursor.mid | Bin 0 -> 135 bytes sound/songs/midi/se_bag_pocket.mid | Bin 0 -> 154 bytes sound/songs/midi/se_ball_click.mid | Bin 0 -> 171 bytes sound/songs/midi/se_card_flip.mid | Bin 0 -> 107 bytes sound/songs/midi/se_card_flipping.mid | Bin 0 -> 136 bytes sound/songs/midi/se_card_open.mid | Bin 0 -> 311 bytes sound/songs/midi/se_deoxys_move.mid | Bin 0 -> 542 bytes sound/songs/midi/se_help_close.mid | Bin 0 -> 236 bytes sound/songs/midi/se_help_error.mid | Bin 0 -> 159 bytes sound/songs/midi/se_help_open.mid | Bin 0 -> 236 bytes sound/songs/midi/se_poke_jump_failure.mid | Bin 0 -> 128 bytes sound/songs/midi/se_poke_jump_success.mid | Bin 0 -> 495 bytes sound/songs/midi/se_shop.mid | Bin 0 -> 92 bytes sound/songs/midi/se_ss_anne_horn.mid | Bin 0 -> 379 bytes sound/songs/se_bag_cursor.s | 52 ------ sound/songs/se_bag_pocket.s | 59 ------ sound/songs/se_ball_click.s | 61 ------- sound/songs/se_card_flip.s | 41 ----- sound/songs/se_card_flipping.s | 53 ------ sound/songs/se_card_open.s | 116 ------------ sound/songs/se_deoxys_move.s | 207 ---------------------- sound/songs/se_help_close.s | 95 ---------- sound/songs/se_help_error.s | 64 ------- sound/songs/se_help_open.s | 97 ---------- sound/songs/se_poke_jump_failure.s | 49 ----- sound/songs/se_poke_jump_success.s | 177 ------------------ sound/songs/se_shop.s | 35 ---- sound/songs/se_ss_anne_horn.s | 158 ----------------- 30 files changed, 28 insertions(+), 1278 deletions(-) create mode 100644 sound/songs/midi/se_bag_cursor.mid create mode 100644 sound/songs/midi/se_bag_pocket.mid create mode 100644 sound/songs/midi/se_ball_click.mid create mode 100644 sound/songs/midi/se_card_flip.mid create mode 100644 sound/songs/midi/se_card_flipping.mid create mode 100644 sound/songs/midi/se_card_open.mid create mode 100644 sound/songs/midi/se_deoxys_move.mid create mode 100644 sound/songs/midi/se_help_close.mid create mode 100644 sound/songs/midi/se_help_error.mid create mode 100644 sound/songs/midi/se_help_open.mid create mode 100644 sound/songs/midi/se_poke_jump_failure.mid create mode 100644 sound/songs/midi/se_poke_jump_success.mid create mode 100644 sound/songs/midi/se_shop.mid create mode 100644 sound/songs/midi/se_ss_anne_horn.mid delete mode 100644 sound/songs/se_bag_cursor.s delete mode 100644 sound/songs/se_bag_pocket.s delete mode 100644 sound/songs/se_ball_click.s delete mode 100644 sound/songs/se_card_flip.s delete mode 100644 sound/songs/se_card_flipping.s delete mode 100644 sound/songs/se_card_open.s delete mode 100644 sound/songs/se_deoxys_move.s delete mode 100644 sound/songs/se_help_close.s delete mode 100644 sound/songs/se_help_error.s delete mode 100644 sound/songs/se_help_open.s delete mode 100644 sound/songs/se_poke_jump_failure.s delete mode 100644 sound/songs/se_poke_jump_success.s delete mode 100644 sound/songs/se_shop.s delete mode 100644 sound/songs/se_ss_anne_horn.s diff --git a/ld_script.ld b/ld_script.ld index 60bf68eb1..6e2edf14f 100644 --- a/ld_script.ld +++ b/ld_script.ld @@ -858,20 +858,20 @@ SECTIONS { sound/songs/midi/se_m_haze.o(.rodata); sound/songs/midi/se_m_hyper_beam2.o(.rodata); sound/songs/midi/se_door.o(.rodata); - sound/songs/se_card_flip.o(.rodata); - sound/songs/se_card_flipping.o(.rodata); - sound/songs/se_card_open.o(.rodata); - sound/songs/se_bag_cursor.o(.rodata); - sound/songs/se_bag_pocket.o(.rodata); - sound/songs/se_ball_click.o(.rodata); - sound/songs/se_shop.o(.rodata); - sound/songs/se_ss_anne_horn.o(.rodata); - sound/songs/se_help_open.o(.rodata); - sound/songs/se_help_close.o(.rodata); - sound/songs/se_help_error.o(.rodata); - sound/songs/se_deoxys_move.o(.rodata); - sound/songs/se_poke_jump_success.o(.rodata); - sound/songs/se_poke_jump_failure.o(.rodata); + sound/songs/midi/se_card_flip.o(.rodata); + sound/songs/midi/se_card_flipping.o(.rodata); + sound/songs/midi/se_card_open.o(.rodata); + sound/songs/midi/se_bag_cursor.o(.rodata); + sound/songs/midi/se_bag_pocket.o(.rodata); + sound/songs/midi/se_ball_click.o(.rodata); + sound/songs/midi/se_shop.o(.rodata); + sound/songs/midi/se_ss_anne_horn.o(.rodata); + sound/songs/midi/se_help_open.o(.rodata); + sound/songs/midi/se_help_close.o(.rodata); + sound/songs/midi/se_help_error.o(.rodata); + sound/songs/midi/se_deoxys_move.o(.rodata); + sound/songs/midi/se_poke_jump_success.o(.rodata); + sound/songs/midi/se_poke_jump_failure.o(.rodata); sound/songs/midi/mus_heal.o(.rodata); sound/songs/midi/mus_level_up.o(.rodata); sound/songs/midi/mus_obtain_item.o(.rodata); diff --git a/sound/songs/midi/midi.cfg b/sound/songs/midi/midi.cfg index b2807d863..71a968f7b 100644 --- a/sound/songs/midi/midi.cfg +++ b/sound/songs/midi/midi.cfg @@ -142,10 +142,13 @@ ph_trap_blend.mid: -E -G130 -P4 ph_trap_held.mid: -E -G130 -P4 ph_trap_solo.mid: -E -G130 -P4 se_applause.mid: -E -R50 -G128 -V100 -P5 +se_bag_cursor.mid: -E -R50 -G129 -P5 +se_bag_pocket.mid: -E -R50 -G129 -P5 se_ball_bounce_1.mid: -E -R50 -G128 -V100 -P4 se_ball_bounce_2.mid: -E -R50 -G128 -V100 -P4 se_ball_bounce_3.mid: -E -R50 -G128 -V100 -P4 se_ball_bounce_4.mid: -E -R50 -G128 -V100 -P4 +se_ball_click.mid: -E -R50 -G129 -P5 se_ball_open.mid: -E -R50 -G127 -V100 -P5 se_ball_throw.mid: -E -R50 -G128 -V120 -P5 se_ball_trade.mid: -E -R50 -G127 -V100 -P5 @@ -164,6 +167,9 @@ se_boo.mid: -E -R50 -G127 -V110 -P4 se_breakable_door.mid: -E -R50 -G128 -V110 -P4 se_bridge_walk.mid: -E -R50 -G128 -V095 -P4 se_card.mid: -E -R50 -G127 -V100 -P4 +se_card_flip.mid: -E -R50 -G129 -P5 +se_card_flipping.mid: -E -R50 -G129 -P5 +se_card_open.mid: -E -R50 -G129 -P5 se_click.mid: -E -R50 -G127 -V110 -P4 se_contest_condition_lose.mid: -E -R50 -G127 -V110 -P4 se_contest_curtain_fall.mid: -E -R50 -G128 -V070 -P5 @@ -173,6 +179,7 @@ se_contest_icon_change.mid: -E -R50 -G128 -V110 -P5 se_contest_icon_clear.mid: -E -R50 -G128 -V090 -P5 se_contest_mons_turn.mid: -E -R50 -G128 -V090 -P5 se_contest_place.mid: -E -R50 -G127 -V110 -P4 +se_deoxys_move.mid: -E -R50 -G129 -P5 se_dex_page.mid: -E -R50 -G127 -P5 se_dex_scroll.mid: -E -R50 -G127 -P5 se_dex_search.mid: -E -R50 -G127 -v100 -P5 @@ -194,6 +201,9 @@ se_field_poison.mid: -E -R50 -G127 -V110 -P5 se_flee.mid: -E -R50 -G127 -V090 -P5 se_fu_zaku.mid: -E -R50 -G127 -V120 -P4 se_glass_flute.mid: -E -R50 -G128 -V105 -P5 +se_help_close.mid: -E -R50 -G129 -P5 +se_help_error.mid: -E -R50 -G129 -P5 +se_help_open.mid: -E -R50 -G129 -P5 se_ice_break.mid: -E -R50 -G128 -V100 -P4 se_ice_crack.mid: -E -R50 -G127 -V100 -P4 se_ice_stairs.mid: -E -R50 -G128 -V090 -P4 @@ -348,6 +358,8 @@ se_pc_login.mid: -E -R50 -G127 -V100 -P5 se_pc_off.mid: -E -R50 -G127 -V100 -P5 se_pc_on.mid: -E -R50 -G127 -V100 -P5 se_pin.mid: -E -R50 -G127 -V060 -P4 +se_poke_jump_failure.mid: -E -R50 -G127 -P5 +se_poke_jump_success.mid: -E -R50 -G128 -P5 se_pokenav_off.mid: -E -R50 -G127 -V100 -P5 se_pokenav_on.mid: -E -R50 -G127 -V100 -P5 se_puddle.mid: -E -R50 -G128 -V020 -P4 @@ -363,7 +375,9 @@ se_save.mid: -E -R50 -G128 -V080 -P5 se_select.mid: -E -R50 -G127 -V080 -P5 se_shiny.mid: -E -R50 -G128 -V095 -P5 se_ship.mid: -E -R50 -G127 -V075 -P4 +se_shop.mid: -E -R50 -G129 -P5 se_sliding_door.mid: -E -R50 -G128 -V095 -P4 +se_ss_anne_horn.mid: -E -R50 -G129 -P5 se_success.mid: -E -R50 -G127 -V080 -P4 se_super_effective.mid: -E -R50 -G127 -V110 -P5 se_switch.mid: -E -R50 -G127 -V100 -P4 diff --git a/sound/songs/midi/se_bag_cursor.mid b/sound/songs/midi/se_bag_cursor.mid new file mode 100644 index 0000000000000000000000000000000000000000..f42b707a665281a94626f82442f0189f99932686 GIT binary patch literal 135 zcmeYb$w*;fU|?flWMF2H@C_--2J(a%{s%HMec@sFAHl-HB*DS(U!MUgrO$AHi(!Kt z2g3$=AeQ4~*dPm}+3Oh|FgP(x@bqA8@MK`xP|v^&!U%2h3Y8lHg$Yug?ILQfD|2z_5Yc zf#Csz1H%Nb5T*t%1|U0-VS--(;{yf>rUpL-Muc)Jh679t8{{|`Hpm0994EsDSs=|` f&#-|DYJ@{Q^M-l`#s&ulkkSe6^-K-!3?K^uOhzO{ literal 0 HcmV?d00001 diff --git a/sound/songs/midi/se_ball_click.mid b/sound/songs/midi/se_ball_click.mid new file mode 100644 index 0000000000000000000000000000000000000000..af567057c01edbdbebd16b0b693289df3f217b53 GIT binary patch literal 171 zcmeYb$w*;fU|?flWMF2H@C_--2J(a%{s%HMec@sFAHl-HB*DS(U!MUg<<4+`nPGz* z2g3$=AeQ4~*dPm}*;5!EFgP$waIau$aA#oLP|v^q->>OpMA1|J3{s2E6`8DX3@ a!+|=Gc91aR1cM631_QWuuu_;dpcVjEgexKd literal 0 HcmV?d00001 diff --git a/sound/songs/midi/se_card_flip.mid b/sound/songs/midi/se_card_flip.mid new file mode 100644 index 0000000000000000000000000000000000000000..982cea7c8236c2b3af43b21af4f03b684b4131c1 GIT binary patch literal 107 zcmeYb$w*;fU|?flWME>D@C_--2J(a%{s%I%vL9pkAHl-HB*DS(U!MUgWyNrymSKY& z2g3$=AeQ4~*dPm}xf~cau-7v@U~poX;8D-m;K9IjpoU>Why!Co2!qImdIkxg2>{gN B8FT;u literal 0 HcmV?d00001 diff --git a/sound/songs/midi/se_card_flipping.mid b/sound/songs/midi/se_card_flipping.mid new file mode 100644 index 0000000000000000000000000000000000000000..cd07113f6f1358ad38163f684991eccc150c04bf GIT binary patch literal 136 zcmeYb$w*;fU|?flWME>D@C_--2J(a%{s%I%vL9pkAHl-HB*DS(U!MUg70z&=mSKY& z2g3$=AeQ4~*dPm}xf~caunRCeU~poX5FNn0fn5QJ4S?7Ih(Y`WAT9vndgg{`28Ipw K3=+r~XgmP@vmojK literal 0 HcmV?d00001 diff --git a/sound/songs/midi/se_card_open.mid b/sound/songs/midi/se_card_open.mid new file mode 100644 index 0000000000000000000000000000000000000000..b31ce6ee6bb06d4a9e21f48900d14ac4af7ace85 GIT binary patch literal 311 zcmYk1F%E)25JkT(3K|nhY_<_8t;8b`dlF5yu#lh$g^3NZHjyK6lsy7B@CqKp1pf*M z#pM5a`zNy#scQ;gi~$5>r0zF%3seU&+I>(REo&$pQ~{c&7s?H^=RmJm-UNC{wKM2x z_}4c=6mcf<7-aMbePX=HxhT?1kc*tFYnG9%JI0K*FJyj?an?SQ$sRMgJ(=5MCTG}; nZ2Q|$qz?VC-uHymO?77lC?CxU{H{8QTtO7dH#%?Qt#a%ONxx3q literal 0 HcmV?d00001 diff --git a/sound/songs/midi/se_deoxys_move.mid b/sound/songs/midi/se_deoxys_move.mid new file mode 100644 index 0000000000000000000000000000000000000000..5c0e2ef54ae96d3d10bb9fd4995db2a671169263 GIT binary patch literal 542 zcmZ{h!Ab&A6o&tqxz3D(WRSrGr9v$Xq^ymb2pLTjbR2Osan&LyXcMi3Am= z9lGp7S4cSzeL{OJXs3o00i>}slLl;wmnw--&@1@=@f-Vzbp`sc4qYlRD%wS+yowB} z+t*c!yqRK;9FZzHCl{niZb?M$$pd*JuVhJ9`#yrDNaZ|DclH literal 0 HcmV?d00001 diff --git a/sound/songs/midi/se_help_error.mid b/sound/songs/midi/se_help_error.mid new file mode 100644 index 0000000000000000000000000000000000000000..fbd39323a5aa6d130312a94b571046b1870604ce GIT binary patch literal 159 zcmeYb$w*;fU|?flWME>D@C_--2J(a%{s%HM>2Wgrk6>Y8lHg$Yug?IL%40Yn!LUJ8 zhhc*V55op72Zjyo2@DgwDp(r47??J2F#y>LP_{k81iu8920xH^J&+9)2eJ>uK(*B} gOwcW0Y0zb0+rY@dG(k6l4af$HNr34Mj0_-K0k6g*#Q*>R literal 0 HcmV?d00001 diff --git a/sound/songs/midi/se_help_open.mid b/sound/songs/midi/se_help_open.mid new file mode 100644 index 0000000000000000000000000000000000000000..daf797bbe9695644dd22ceeb153398cf08d45483 GIT binary patch literal 236 zcmYk%F$%&k0EOXa3|fmwL4}MxfT-svwh(B7V+IGo%?sEg$EHa#_6({D@C_--2J(a%{s%HMUzot~KZ1pYNrHpnzdi$0%Aest48sNy o9)=C<6$}p;92h1T)H632FaT*0C|%FIp`HN)!_>g!KzyLF0At4=3jhEB literal 0 HcmV?d00001 diff --git a/sound/songs/midi/se_poke_jump_success.mid b/sound/songs/midi/se_poke_jump_success.mid new file mode 100644 index 0000000000000000000000000000000000000000..dea60f498f2f64f47cf1570a088af50e3f9a46ad GIT binary patch literal 495 zcmYk1L2AN47=_D@C_--2J(a%{s%I%C&@GXk6>Y8lHg$Yug?IL(q=fo!LWfn cfMEld1H%Ib2ZjkY6>J;o8BlP84FgCE0CMdWL;wH) literal 0 HcmV?d00001 diff --git a/sound/songs/midi/se_ss_anne_horn.mid b/sound/songs/midi/se_ss_anne_horn.mid new file mode 100644 index 0000000000000000000000000000000000000000..0eb834225347d4cf8719da79b0fb109fa86552fd GIT binary patch literal 379 zcmZvXF-ikb5QhKVtnaOln1rafScHIri->NK^eIIMCXhlKwXj%75%B`+5z=^%IYMsX zapLz#z{cX^o7q|3KQmp_?~&|&(WtAhSU{IoP`;@!Ur^Q-nX!#uHgk9U<_9< zfDUN)pP!N4cINN#8D@`gfyek3SNIWM<7Yg?b!xuI%=f5QI8Wog=H>p*TWT|B%yUVX pQKfasStVzboK^15;#-Gxi+|`7N!(?OgmZ}Nb>Rqd7vI`P{sRBgTaN$$ literal 0 HcmV?d00001 diff --git a/sound/songs/se_bag_cursor.s b/sound/songs/se_bag_cursor.s deleted file mode 100644 index 36a9b5e76..000000000 --- a/sound/songs/se_bag_cursor.s +++ /dev/null @@ -1,52 +0,0 @@ - .include "MPlayDef.s" - .section .rodata - .global se_bag_cursor - .align 2 - .equ se_bag_cursor_grp, voicegroup129 - .equ se_bag_cursor_pri, 5 - .equ se_bag_cursor_rev, reverb_set+50 - -se_bag_cursor_1: @ 86BC774 - .byte KEYSH, 0x00 - .byte TEMPO, 0x9B - .byte VOICE, 0x0A - .byte XCMD, 0x08 - .byte GsM2 - .byte v009 - .byte GsM2 - .byte VOL, 0x7F - .byte BEND, 0x42 - .byte N01 - .byte Cs4 - .byte v072 - .byte W03 - .byte W03 - .byte W03 - .byte FINE - -se_bag_cursor_2: @ 86BC78A - .byte VOL, 0x7F - .byte KEYSH, 0x00 - .byte VOICE, 0x7C - .byte N01 - .byte Cs5 - .byte v072 - .byte W01 - .byte Ds5 - .byte v104 - .byte W02 - .byte W03 - .byte W03 - .byte FINE - -@ *************************************** - .align 2 -se_bag_cursor: @ 86BC79C - .byte 2 - .byte 0 - .byte se_bag_cursor_pri - .byte se_bag_cursor_rev - .word se_bag_cursor_grp - - .word se_bag_cursor_1 - .word se_bag_cursor_2 diff --git a/sound/songs/se_bag_pocket.s b/sound/songs/se_bag_pocket.s deleted file mode 100644 index 40f00a49b..000000000 --- a/sound/songs/se_bag_pocket.s +++ /dev/null @@ -1,59 +0,0 @@ - .include "MPlayDef.s" - .section .rodata - .global se_bag_pocket - .align 2 - .equ se_bag_pocket_grp, voicegroup129 - .equ se_bag_pocket_pri, 5 - .equ se_bag_pocket_rev, reverb_set+50 - -se_bag_pocket_1: @ 86BC7AC - .byte KEYSH, 0x00 - .byte TEMPO, 0xD3 - .byte VOICE, 0x50 - .byte VOL, 0x40 - .byte BEND, 0x40 - .byte N02 - .byte Dn4 - .byte v084 - .byte W02 - .byte BEND, 0x51 - .byte N03 - .byte Fs4 - .byte v080 - .byte W01 - .byte BEND, 0x18 - .byte W03 - .byte FINE - -se_bag_pocket_2: @ 86BC7C4 - .byte KEYSH, 0x00 - .byte VOICE, 0x02 - .byte XCMD, 0x08 - .byte GsM2 - .byte v009 - .byte GsM2 - .byte VOL, 0x7F - .byte PAN, 0x40 - .byte BEND, 0x40 - .byte N04 - .byte En3 - .byte v127 - .byte W03 - .byte W01 - .byte VOICE, 0x02 - .byte N02 - .byte Bn3 - .byte W02 - .byte FINE - -@ *************************************** - .align 2 -se_bag_pocket: @ 86BC7E0 - .byte 2 - .byte 0 - .byte se_bag_pocket_pri - .byte se_bag_pocket_rev - .word se_bag_pocket_grp - - .word se_bag_pocket_1 - .word se_bag_pocket_2 diff --git a/sound/songs/se_ball_click.s b/sound/songs/se_ball_click.s deleted file mode 100644 index 77543a974..000000000 --- a/sound/songs/se_ball_click.s +++ /dev/null @@ -1,61 +0,0 @@ - .include "MPlayDef.s" - .section .rodata - .global se_ball_click - .align 2 - .equ se_ball_click_grp, voicegroup129 - .equ se_ball_click_pri, 5 - .equ se_ball_click_rev, reverb_set+50 - -se_ball_click_1: @ 86BC7F0 - .byte KEYSH, 0x00 - .byte TEMPO, 0x9B - .byte VOICE, 0x03 - .byte XCMD, 0x08 - .byte GsM2 - .byte v009 - .byte GsM2 - .byte VOL, 0x64 - .byte BEND, 0x40 - .byte N02 - .byte Bn3 - .byte v120 - .byte W03 - .byte W03 - .byte W02 - .byte En4 - .byte v127 - .byte W01 - .byte W03 - .byte W03 - .byte W03 - .byte W03 - .byte FINE - -se_ball_click_2: @ 86BC80D - .byte KEYSH, 0x00 - .byte VOICE, 0x7E - .byte VOL, 0x64 - .byte W03 - .byte W01 - .byte N01 - .byte Cn2 - .byte v120 - .byte W02 - .byte W03 - .byte W03 - .byte W03 - .byte W03 - .byte W03 - .byte FINE - -@ *************************************** - .align 2 -se_ball_click: @ 86BC820 - .byte 2 - .byte 0 - .byte se_ball_click_pri - .byte se_ball_click_rev - .word se_ball_click_grp - - .word se_ball_click_1 - .word se_ball_click_2 diff --git a/sound/songs/se_card_flip.s b/sound/songs/se_card_flip.s deleted file mode 100644 index 4c51aca35..000000000 --- a/sound/songs/se_card_flip.s +++ /dev/null @@ -1,41 +0,0 @@ - .include "MPlayDef.s" - .section .rodata - .global se_card_flip - .align 2 - .equ se_card_flip_grp, voicegroup129 - .equ se_card_flip_pri, 5 - .equ se_card_flip_rev, reverb_set+50 - -se_card_flip_1: @ 86BC680 - .byte KEYSH, 0x00 - .byte TEMPO, 0x5B - .byte VOICE, 0x7D - .byte XCMD, 0x08 - .byte GsM2 - .byte v009 - .byte GsM2 - .byte PAN, 0x40 - .byte VOL, 0x7F - .byte BEND, 0x42 - .byte N01 - .byte Cn4 - .byte v127 - .byte W03 - .byte VOICE, 0x7C - .byte N01 - .byte Cn5 - .byte v064 - .byte W21 - .byte W24 - .byte FINE - -@ *************************************** - .align 2 -se_card_flip: @ 86BC6A0 - .byte 1 - .byte 0 - .byte se_card_flip_pri - .byte se_card_flip_rev - .word se_card_flip_grp - - .word se_card_flip_1 diff --git a/sound/songs/se_card_flipping.s b/sound/songs/se_card_flipping.s deleted file mode 100644 index e73e1b65f..000000000 --- a/sound/songs/se_card_flipping.s +++ /dev/null @@ -1,53 +0,0 @@ - .include "MPlayDef.s" - .section .rodata - .global se_card_flipping - .align 2 - .equ se_card_flipping_grp, voicegroup129 - .equ se_card_flipping_pri, 5 - .equ se_card_flipping_rev, reverb_set+50 - -se_card_flipping_1: @ 86BC6AC - .byte KEYSH, 0x00 - .byte TEMPO, 0x5B - .byte VOICE, 0x7D - .byte XCMD, 0x08 - .byte GsM2 - .byte v009 - .byte GsM2 - .byte PAN, 0x40 - .byte VOL, 0x10 - .byte BEND, 0x42 - .byte N24 - .byte Gn5 - .byte v080 - .byte W03 - .byte VOL, 0x20 - .byte W03 - .byte Cn2 - .byte W03 - .byte En3 - .byte W03 - .byte Gs4 - .byte W03 - .byte Cn6 - .byte W03 - .byte En7 - .byte W03 - .byte Gn8 - .byte W03 - .byte W24 - .byte W24 - .byte W24 - .byte W24 - .byte FINE - -@ *************************************** - .align 2 -se_card_flipping: @ 86BC6D8 - .byte 1 - .byte 0 - .byte se_card_flipping_pri - .byte se_card_flipping_rev - .word se_card_flipping_grp - - .word se_card_flipping_1 diff --git a/sound/songs/se_card_open.s b/sound/songs/se_card_open.s deleted file mode 100644 index 4f453687c..000000000 --- a/sound/songs/se_card_open.s +++ /dev/null @@ -1,116 +0,0 @@ - .include "MPlayDef.s" - .section .rodata - .global se_card_open - .align 2 - .equ se_card_open_grp, voicegroup129 - .equ se_card_open_pri, 5 - .equ se_card_open_rev, reverb_set+50 - -se_card_open_1: @ 86BC6E4 - .byte KEYSH, 0x00 - .byte TEMPO, 0x57 - .byte VOICE, 0x2E - .byte XCMD, 0x08 - .byte GsM2 - .byte v009 - .byte GsM2 - .byte VOL, 0x70 - .byte PAN, 0x40 - .byte VOL, 0x70 - .byte PAN, 0x40 - .byte BEND, 0x40 - .byte N03 - .byte An5 - .byte v112 - .byte W03 - .byte VOL, 0x40 - .byte N03 - .byte Bn5 - .byte W03 - .byte VOL, 0x70 - .byte PAN, 0x10 - .byte N06 - .byte En6 - .byte W03 - .byte VOL, 0x40 - .byte W03 - .byte En7 - .byte PAN, 0x70 - .byte N06 - .byte En6 - .byte v040 - .byte W03 - .byte VOL, 0x40 - .byte W03 - .byte PAN, 0x10 - .byte VOL, 0x61 - .byte N06 - .byte En6 - .byte v032 - .byte W03 - .byte VOL, 0x40 - .byte W03 - .byte PAN, 0x70 - .byte VOL, 0x60 - .byte N06 - .byte En6 - .byte v024 - .byte W03 - .byte VOL, 0x40 - .byte W03 - .byte PAN, 0x10 - .byte VOL, 0x50 - .byte N06 - .byte En6 - .byte v016 - .byte W03 - .byte VOL, 0x40 - .byte W03 - .byte PAN, 0x70 - .byte VOL, 0x50 - .byte N06 - .byte En6 - .byte v012 - .byte W03 - .byte VOL, 0x30 - .byte W03 - .byte N06 - .byte En6 - .byte v008 - .byte W03 - .byte VOL, 0x02 - .byte W03 - .byte W24 - .byte W24 - .byte W24 - .byte FINE - -se_card_open_2: @ 86BC74D - .byte KEYSH, 0x00 - .byte VOICE, 0x7C - .byte PAN, 0x40 - .byte VOL, 0x40 - .byte N03 - .byte Cn5 - .byte v092 - .byte W06 - .byte Cn5 - .byte v032 - .byte W18 - .byte W24 - .byte W24 - .byte W24 - .byte W24 - .byte FINE - -@ *************************************** - .align 2 -se_card_open: @ 86BC764 - .byte 2 - .byte 0 - .byte se_card_open_pri - .byte se_card_open_rev - .word se_card_open_grp - - .word se_card_open_1 - .word se_card_open_2 diff --git a/sound/songs/se_deoxys_move.s b/sound/songs/se_deoxys_move.s deleted file mode 100644 index a9cdd9744..000000000 --- a/sound/songs/se_deoxys_move.s +++ /dev/null @@ -1,207 +0,0 @@ - .include "MPlayDef.s" - .section .rodata - .global se_deoxys_move - .align 2 - .equ se_deoxys_move_grp, voicegroup129 - .equ se_deoxys_move_pri, 5 - .equ se_deoxys_move_rev, reverb_set+50 - -se_deoxys_move_1: @ 86BCA34 - .byte KEYSH, 0x00 - .byte TEMPO, 0x83 - .byte VOICE, 0x7B - .byte XCMD, 0x08 - .byte GsM2 - .byte v009 - .byte GsM2 - .byte PAN, 0x40 - .byte VOL, 0x28 - .byte BEND, 0x42 - .byte N02 - .byte Cn2 - .byte v120 - .byte W08 - .byte N04 - .byte Cn5 - .byte W16 - .byte W24 - .byte W24 - .byte W24 - .byte W24 - .byte W24 - .byte W24 - .byte W24 - .byte FINE - -se_deoxys_move_2: @ 86BCA54 - .byte KEYSH, 0x00 - .byte VOICE, 0x1F - .byte LFOS, 0x2C - .byte BENDR, 0x0C - .byte VOL, 0x50 - .byte PAN, 0x40 - .byte BEND, 0x00 - .byte TIE - .byte En4 - .byte v032 - .byte W24 - .byte W04 - .byte BEND, 0x09 - .byte W02 - .byte DnM1 - .byte W02 - .byte Cs0 - .byte W02 - .byte Gs0 - .byte W02 - .byte Fn1 - .byte W02 - .byte As1 - .byte W02 - .byte Gn2 - .byte W02 - .byte Dn3 - .byte W02 - .byte Gs4 - .byte W02 - .byte Ds5 - .byte W02 - .byte Cn6 - .byte W02 - .byte Gn6 - .byte W02 - .byte En7 - .byte W02 - .byte Cn8 - .byte W02 - .byte Gn8 - .byte W16 - .byte W24 - .byte W24 - .byte VOL, 0x46 - .byte W04 - .byte Fs3 - .byte W06 - .byte Cn3 - .byte W06 - .byte Gn2 - .byte W08 - .byte Cs2 - .byte W06 - .byte Gs1 - .byte W06 - .byte En1 - .byte W06 - .byte Bn0 - .byte W06 - .byte Fs0 - .byte W04 - .byte Cn0 - .byte W02 - .byte GsM1 - .byte W02 - .byte DsM1 - .byte W04 - .byte AsM2 - .byte W06 - .byte CnM2 - .byte W06 - .byte EOT - .byte FINE - -se_deoxys_move_3: @ 86BCAA7 - .byte KEYSH, 0x00 - .byte VOICE, 0x32 - .byte VOL, 0x45 - .byte PAN, 0x00 - .byte W24 - .byte Gn8 - .byte N01 - .byte Fs4 - .byte v064 - .byte W06 - .byte Gs4 - .byte W03 - .byte PAN, 0x00 - .byte W07 - .byte N01 - .byte En5 - .byte W05 - .byte Fs5 - .byte W03 - .byte PAN, 0x7F - .byte W10 - .byte N01 - .byte Dn5 - .byte W03 - .byte Cn5 - .byte W07 - .byte PAN, 0x00 - .byte W04 - .byte N01 - .byte Fs3 - .byte W03 - .byte Gs3 - .byte W09 - .byte PAN, 0x7F - .byte W04 - .byte N01 - .byte Bn4 - .byte W04 - .byte Dn5 - .byte W04 - .byte PAN, 0x00 - .byte W09 - .byte N01 - .byte Fs5 - .byte W09 - .byte Cs5 - .byte W06 - .byte PAN, 0x7F - .byte W02 - .byte N01 - .byte Cs4 - .byte v036 - .byte W02 - .byte As3 - .byte W08 - .byte Fs3 - .byte W03 - .byte Gs3 - .byte W09 - .byte PAN, 0x00 - .byte W03 - .byte N01 - .byte Dn5 - .byte v028 - .byte W03 - .byte Cn5 - .byte W06 - .byte Fs4 - .byte W03 - .byte Cn4 - .byte W04 - .byte Gn3 - .byte W05 - .byte PAN, 0x7F - .byte W06 - .byte N01 - .byte Gn4 - .byte v020 - .byte W02 - .byte An4 - .byte W16 - .byte FINE - -@ *************************************** - .align 2 -se_deoxys_move: @ 86BCB08 - .byte 3 - .byte 0 - .byte se_deoxys_move_pri - .byte se_deoxys_move_rev - .word se_deoxys_move_grp - - .word se_deoxys_move_1 - .word se_deoxys_move_2 - .word se_deoxys_move_3 diff --git a/sound/songs/se_help_close.s b/sound/songs/se_help_close.s deleted file mode 100644 index 81692e622..000000000 --- a/sound/songs/se_help_close.s +++ /dev/null @@ -1,95 +0,0 @@ - .include "MPlayDef.s" - .section .rodata - .global se_help_close - .align 2 - .equ se_help_close_grp, voicegroup129 - .equ se_help_close_pri, 5 - .equ se_help_close_rev, reverb_set+50 - -se_help_close_1: @ 86BC980 - .byte KEYSH, 0x00 - .byte TEMPO, 0xD2 - .byte VOICE, 0x18 - .byte LFOS, 0x2C - .byte BENDR, 0x0C - .byte VOL, 0x5F - .byte PAN, 0x70 - .byte N04 - .byte Dn5 - .byte v092 - .byte W06 - .byte PAN, 0x00 - .byte N04 - .byte Dn5 - .byte v032 - .byte W06 - .byte PAN, 0x60 - .byte N04 - .byte An4 - .byte v096 - .byte W06 - .byte PAN, 0x7F - .byte N04 - .byte An4 - .byte v032 - .byte W06 - .byte PAN, 0x60 - .byte N04 - .byte Fs4 - .byte v092 - .byte W06 - .byte PAN, 0x00 - .byte N04 - .byte Fs4 - .byte v032 - .byte W06 - .byte PAN, 0x50 - .byte N04 - .byte En4 - .byte v092 - .byte W06 - .byte PAN, 0x7F - .byte N04 - .byte En4 - .byte v032 - .byte W06 - .byte PAN, 0x19 - .byte N04 - .byte Dn4 - .byte v096 - .byte W06 - .byte PAN, 0x7F - .byte N04 - .byte Dn4 - .byte v032 - .byte W06 - .byte PAN, 0x00 - .byte N04 - .byte W06 - .byte PAN, 0x7F - .byte N04 - .byte Dn4 - .byte v016 - .byte W06 - .byte PAN, 0x00 - .byte N04 - .byte Dn4 - .byte v012 - .byte W06 - .byte PAN, 0x7F - .byte N04 - .byte Dn4 - .byte v004 - .byte W18 - .byte FINE - -@ *************************************** - .align 2 -se_help_close: @ 86BC9E0 - .byte 1 - .byte 0 - .byte se_help_close_pri - .byte se_help_close_rev - .word se_help_close_grp - - .word se_help_close_1 diff --git a/sound/songs/se_help_error.s b/sound/songs/se_help_error.s deleted file mode 100644 index c3a78dbea..000000000 --- a/sound/songs/se_help_error.s +++ /dev/null @@ -1,64 +0,0 @@ - .include "MPlayDef.s" - .section .rodata - .global se_help_error - .align 2 - .equ se_help_error_grp, voicegroup129 - .equ se_help_error_pri, 5 - .equ se_help_error_rev, reverb_set+50 - -se_help_error_1: @ 86BC9EC - .byte KEYSH, 0x00 - .byte TEMPO, 0xD2 - .byte VOICE, 0x18 - .byte LFOS, 0x2C - .byte BENDR, 0x0C - .byte PAN, 0x40 - .byte VOL, 0x60 - .byte N04 - .byte Dn4 - .byte v120 - .byte W06 - .byte PAN, 0x00 - .byte N04 - .byte Dn4 - .byte v032 - .byte W06 - .byte PAN, 0x3F - .byte N04 - .byte Fs4 - .byte v096 - .byte W06 - .byte PAN, 0x7F - .byte N04 - .byte Fs4 - .byte v032 - .byte W06 - .byte VOICE, 0x5C - .byte PAN, 0x40 - .byte VOL, 0x7D - .byte N04 - .byte An1 - .byte v112 - .byte W10 - .byte MOD, 0x08 - .byte W02 - .byte N06 - .byte An1 - .byte v088 - .byte W06 - .byte An1 - .byte v024 - .byte W06 - .byte MOD, 0x00 - .byte FINE - -@ *************************************** - .align 2 -se_help_error: @ 86BCA28 - .byte 1 - .byte 0 - .byte se_help_error_pri - .byte se_help_error_rev - .word se_help_error_grp - - .word se_help_error_1 diff --git a/sound/songs/se_help_open.s b/sound/songs/se_help_open.s deleted file mode 100644 index a3a6b91af..000000000 --- a/sound/songs/se_help_open.s +++ /dev/null @@ -1,97 +0,0 @@ - .include "MPlayDef.s" - .section .rodata - .global se_help_open - .align 2 - .equ se_help_open_grp, voicegroup129 - .equ se_help_open_pri, 5 - .equ se_help_open_rev, reverb_set+50 - -se_help_open_1: @ 86BC910 - .byte KEYSH, 0x00 - .byte TEMPO, 0xD2 - .byte VOICE, 0x18 - .byte LFOS, 0x2C - .byte BENDR, 0x0C - .byte VOL, 0x60 - .byte PAN, 0x10 - .byte N04 - .byte Dn4 - .byte v096 - .byte W06 - .byte PAN, 0x00 - .byte N04 - .byte Dn4 - .byte v032 - .byte W06 - .byte PAN, 0x20 - .byte N04 - .byte Fs4 - .byte v096 - .byte W06 - .byte PAN, 0x7F - .byte N04 - .byte Fs4 - .byte v032 - .byte W06 - .byte PAN, 0x20 - .byte N04 - .byte An4 - .byte v096 - .byte W06 - .byte PAN, 0x00 - .byte N04 - .byte An4 - .byte v032 - .byte W06 - .byte PAN, 0x30 - .byte N04 - .byte Cs5 - .byte v096 - .byte W06 - .byte PAN, 0x7F - .byte N04 - .byte Cs5 - .byte v032 - .byte W06 - .byte PAN, 0x60 - .byte N04 - .byte Dn5 - .byte v076 - .byte W06 - .byte PAN, 0x00 - .byte N04 - .byte Dn5 - .byte v032 - .byte W06 - .byte PAN, 0x7F - .byte N04 - .byte Dn5 - .byte v024 - .byte W06 - .byte PAN, 0x00 - .byte N04 - .byte Dn5 - .byte v016 - .byte W06 - .byte PAN, 0x7F - .byte N04 - .byte Dn5 - .byte v008 - .byte W06 - .byte PAN, 0x00 - .byte N04 - .byte Dn5 - .byte v004 - .byte W18 - .byte FINE - -@ *************************************** - .align 2 -se_help_open: @ 86BC974 - .byte 1 - .byte 0 - .byte se_help_open_pri - .byte se_help_open_rev - .word se_help_open_grp - - .word se_help_open_1 diff --git a/sound/songs/se_poke_jump_failure.s b/sound/songs/se_poke_jump_failure.s deleted file mode 100644 index 4dc7d109c..000000000 --- a/sound/songs/se_poke_jump_failure.s +++ /dev/null @@ -1,49 +0,0 @@ - .include "MPlayDef.s" - .section .rodata - .global se_poke_jump_failure - .align 2 - .equ se_poke_jump_failure_grp, voicegroup127 - .equ se_poke_jump_failure_pri, 5 - .equ se_poke_jump_failure_rev, reverb_set+50 - -se_poke_jump_failure_1: @ 86BCBD8 - .byte KEYSH, 0x00 - .byte TEMPO, 0x78 - .byte VOICE, 0x5C - .byte BENDR, 0x0C - .byte VOL, 0x78 - .byte BEND, 0x40 - .byte N03 - .byte Cn2 - .byte v127 - .byte W03 - .byte Cn2 - .byte v020 - .byte W03 - .byte N18 - .byte Cn2 - .byte v127 - .byte W03 - .byte W03 - .byte W03 - .byte W03 - .byte W03 - .byte W03 - .byte N09 - .byte Cn2 - .byte v020 - .byte W03 - .byte W03 - .byte W03 - .byte FINE - -@ *************************************** - .align 2 -se_poke_jump_failure: @ 86BCBFC - .byte 1 - .byte 0 - .byte se_poke_jump_failure_pri - .byte se_poke_jump_failure_rev - .word se_poke_jump_failure_grp - - .word se_poke_jump_failure_1 diff --git a/sound/songs/se_poke_jump_success.s b/sound/songs/se_poke_jump_success.s deleted file mode 100644 index edab733e6..000000000 --- a/sound/songs/se_poke_jump_success.s +++ /dev/null @@ -1,177 +0,0 @@ - .include "MPlayDef.s" - .section .rodata - .global se_poke_jump_success - .align 2 - .equ se_poke_jump_success_grp, voicegroup128 - .equ se_poke_jump_success_pri, 5 - .equ se_poke_jump_success_rev, reverb_set+50 - -se_poke_jump_success_1: @ 86BCB1C - .byte KEYSH, 0x00 - .byte TEMPO, 0x4B - .byte VOICE, 0x2E - .byte VOL, 0x6E - .byte BENDR, 0x02 - .byte PAN, 0x40 - .byte BEND, 0x4F - .byte W01 - .byte N02 - .byte Dn6 - .byte v112 - .byte W02 - .byte Cs6 - .byte W03 - .byte PAN, 0x48 - .byte N02 - .byte An5 - .byte W02 - .byte Fs5 - .byte W01 - .byte W01 - .byte Dn5 - .byte W02 - .byte PAN, 0x39 - .byte W01 - .byte N02 - .byte Dn5 - .byte v104 - .byte W02 - .byte Cs5 - .byte v100 - .byte W03 - .byte PAN, 0x40 - .byte N02 - .byte An4 - .byte v096 - .byte W02 - .byte Fs4 - .byte v092 - .byte W01 - .byte W01 - .byte Dn4 - .byte v088 - .byte W02 - .byte PAN, 0x4F - .byte W01 - .byte N02 - .byte Dn6 - .byte W02 - .byte Cs6 - .byte v084 - .byte W03 - .byte An5 - .byte v080 - .byte W02 - .byte Fs5 - .byte v076 - .byte W01 - .byte W01 - .byte Dn5 - .byte v072 - .byte W02 - .byte PAN, 0x30 - .byte W01 - .byte N02 - .byte Dn6 - .byte v068 - .byte W02 - .byte Cs6 - .byte v064 - .byte W03 - .byte An5 - .byte v060 - .byte W02 - .byte Fs5 - .byte v056 - .byte W01 - .byte W01 - .byte Dn5 - .byte v052 - .byte W02 - .byte W03 - .byte FINE - -se_poke_jump_success_2: @ 86BCB7B - .byte KEYSH, 0x00 - .byte VOICE, 0x35 - .byte BENDR, 0x02 - .byte VOL, 0x2B - .byte BEND, 0x4F - .byte N02 - .byte An6 - .byte v112 - .byte W02 - .byte Fs6 - .byte W01 - .byte W01 - .byte Dn6 - .byte W02 - .byte W01 - .byte Cs6 - .byte W02 - .byte An5 - .byte W03 - .byte N02 - .byte W02 - .byte Fs5 - .byte v104 - .byte W01 - .byte W01 - .byte Dn5 - .byte v100 - .byte W02 - .byte W01 - .byte Cs5 - .byte v096 - .byte W02 - .byte An4 - .byte v092 - .byte W03 - .byte An6 - .byte v088 - .byte W02 - .byte Fs6 - .byte v084 - .byte W01 - .byte W01 - .byte Dn6 - .byte v080 - .byte W02 - .byte W01 - .byte Cs6 - .byte v076 - .byte W02 - .byte An5 - .byte v072 - .byte W03 - .byte An6 - .byte v068 - .byte W02 - .byte Fs6 - .byte v064 - .byte W01 - .byte W01 - .byte Dn6 - .byte v060 - .byte W02 - .byte W01 - .byte Cs6 - .byte v056 - .byte W02 - .byte An5 - .byte v052 - .byte W03 - .byte W03 - .byte FINE - -@ *************************************** - .align 2 -se_poke_jump_success: @ 86BCBC8 - .byte 2 - .byte 0 - .byte se_poke_jump_success_pri - .byte se_poke_jump_success_rev - .word se_poke_jump_success_grp - - .word se_poke_jump_success_1 - .word se_poke_jump_success_2 diff --git a/sound/songs/se_shop.s b/sound/songs/se_shop.s deleted file mode 100644 index eeade9bc4..000000000 --- a/sound/songs/se_shop.s +++ /dev/null @@ -1,35 +0,0 @@ - .include "MPlayDef.s" - .section .rodata - .global se_shop - .align 2 - .equ se_shop_grp, voicegroup129 - .equ se_shop_pri, 5 - .equ se_shop_rev, reverb_set+50 - -se_shop_1: @ 86BC830 - .byte KEYSH, 0x00 - .byte TEMPO, 0x3E - .byte VOICE, 0x08 - .byte VOL, 0x50 - .byte PAN, 0x40 - .byte BEND, 0x40 - .byte N30 - .byte Cn3 - .byte v120 - .byte W06 - .byte W06 - .byte W06 - .byte W06 - .byte W06 - .byte FINE - -@ *************************************** - .align 2 -se_shop: @ 86BC848 - .byte 1 - .byte 0 - .byte se_shop_pri - .byte se_shop_rev - .word se_shop_grp - - .word se_shop_1 diff --git a/sound/songs/se_ss_anne_horn.s b/sound/songs/se_ss_anne_horn.s deleted file mode 100644 index c7ab94801..000000000 --- a/sound/songs/se_ss_anne_horn.s +++ /dev/null @@ -1,158 +0,0 @@ - .include "MPlayDef.s" - .section .rodata - .global se_ss_anne_horn - .align 2 - .equ se_ss_anne_horn_grp, voicegroup129 - .equ se_ss_anne_horn_pri, 5 - .equ se_ss_anne_horn_rev, reverb_set+50 - -se_ss_anne_horn_1: @ 86BC854 - .byte KEYSH, 0x00 - .byte TEMPO, 0x52 - .byte VOICE, 0x09 - .byte BENDR, 0x0C - .byte LFOS, 0x2C - .byte PAN, 0x40 - .byte VOL, 0x60 - .byte MOD, 0x01 - .byte N04 - .byte En2 - .byte v127 - .byte W04 - .byte N10 - .byte En2 - .byte v104 - .byte W20 - .byte W10 - .byte PAN, 0x00 - .byte TIE - .byte En2 - .byte v127 - .byte W08 - .byte PAN, 0x10 - .byte W06 - .byte W02 - .byte Gs0 - .byte W08 - .byte Cn2 - .byte W08 - .byte En3 - .byte W06 - .byte Gs4 - .byte W06 - .byte Bn5 - .byte W06 - .byte En7 - .byte W06 - .byte Gn8 - .byte W06 - .byte W18 - .byte Ds7 - .byte W06 - .byte Gs6 - .byte W06 - .byte As5 - .byte W06 - .byte Dn4 - .byte W06 - .byte Fn2 - .byte W06 - .byte Ds1 - .byte W06 - .byte Fs0 - .byte W06 - .byte DnM1 - .byte W06 - .byte CnM2 - .byte W06 - .byte W18 - .byte VOL, 0x50 - .byte PAN, 0x0C - .byte W06 - .byte VOL, 0x48 - .byte PAN, 0x17 - .byte W06 - .byte VOL, 0x40 - .byte PAN, 0x23 - .byte W06 - .byte VOL, 0x35 - .byte PAN, 0x2E - .byte W06 - .byte VOL, 0x30 - .byte PAN, 0x4F - .byte W06 - .byte VOL, 0x2A - .byte PAN, 0x59 - .byte W06 - .byte VOL, 0x20 - .byte PAN, 0x68 - .byte W02 - .byte VOL, 0x18 - .byte W04 - .byte EnM1 - .byte PAN, 0x6F - .byte W04 - .byte VOL, 0x08 - .byte W02 - .byte EOT - .byte VOL, 0x00 - .byte W06 - .byte FINE - -se_ss_anne_horn_2: @ 86BC8CB - .byte KEYSH, 0x00 - .byte VOICE, 0x51 - .byte PAN, 0x40 - .byte MOD, 0x0F - .byte VOL, 0x30 - .byte N04 - .byte En1 - .byte v127 - .byte W04 - .byte N10 - .byte En1 - .byte v104 - .byte W20 - .byte W10 - .byte TIE - .byte En1 - .byte v127 - .byte W14 - .byte W24 - .byte W24 - .byte W24 - .byte W24 - .byte W24 - .byte W18 - .byte VOL, 0x2A - .byte W06 - .byte Cn1 - .byte W06 - .byte Gs0 - .byte W06 - .byte Dn0 - .byte W06 - .byte BnM1 - .byte W06 - .byte DsM1 - .byte W06 - .byte CsM1 - .byte W06 - .byte GsM2 - .byte W06 - .byte EOT - .byte VOL, 0x00 - .byte W06 - .byte FINE - -@ *************************************** - .align 2 -se_ss_anne_horn: @ 86BC900 - .byte 2 - .byte 0 - .byte se_ss_anne_horn_pri - .byte se_ss_anne_horn_rev - .word se_ss_anne_horn_grp - - .word se_ss_anne_horn_1 - .word se_ss_anne_horn_2 From 8f00ac8fe67f7ac4d521b5a5a2dbdd9dd898eb04 Mon Sep 17 00:00:00 2001 From: Rairii <2650838+Wack0@users.noreply.github.com> Date: Sat, 21 Mar 2026 21:12:48 +0000 Subject: [PATCH 05/14] Add revision 10 changes (#722) * revision 10 changes * add rev10 to github actions * add no-intro entry for leafgreen rev10 --- .github/workflows/build.yml | 13 + Makefile | 20 +- README.md | 2 + config.mk | 4 + data/battle_anim_scripts.s | 4 + firered_switch.sha1 | 1 + include/AgbRfu_LinkManager.h | 12 + include/config.h | 9 +- include/constants/union_room.h | 7 +- include/gba/isagbprint.h | 2 +- include/librfu.h | 4 + include/link_rfu.h | 12 + include/overworld.h | 4 + include/sloopsvc.h | 36 + ld_script.ld | 2 + ld_script_rev10.ld | 1062 ++++++++++++++++++++ leafgreen_switch.sha1 | 1 + src/AgbRfu_LinkManager.c | 82 ++ src/battle_controller_player.c | 6 + src/battle_main.c | 8 +- src/battle_message.c | 7 + src/cable_club.c | 10 + src/event_object_movement.c | 8 + src/field_fadetransition.c | 3 + src/fldeff_poison.c | 4 + src/intro.c | 9 + src/isagbprn.c | 3 +- src/librfu_rfu.c | 36 + src/link.c | 100 +- src/link_rfu_2.c | 162 ++- src/link_rfu_3.c | 204 +++- src/load_save.c | 4 + src/main.c | 37 +- src/menu.c | 6 + src/mystery_gift_menu.c | 4 +- src/naming_screen.c | 9 + src/overworld.c | 7 + src/post_battle_event_funcs.c | 16 + src/save.c | 28 + src/scrcmd.c | 25 +- src/script_menu.c | 6 + src/sloopsvc.c | 294 ++++++ src/start_menu.c | 4 + src/string_util.c | 4 + src/task.c | 4 + src/title_screen.c | 4 + src/trade.c | 4 + src/trade_scene.c | 34 + src/union_room.c | 495 ++++++++- src/union_room_battle.c | 16 + src/union_room_chat.c | 7 + src/union_room_player_avatar.c | 9 + src/wireless_communication_status_screen.c | 95 +- sym_bss.txt | 1 + sym_bss_rev10.txt | 38 + sym_common.txt | 1 + sym_common_rev10.txt | 56 ++ sym_ewram_rev10.txt | 137 +++ 58 files changed, 3103 insertions(+), 79 deletions(-) create mode 100644 firered_switch.sha1 create mode 100644 include/sloopsvc.h create mode 100644 ld_script_rev10.ld create mode 100644 leafgreen_switch.sha1 create mode 100644 src/sloopsvc.c create mode 100644 sym_bss_rev10.txt create mode 100644 sym_common_rev10.txt create mode 100644 sym_ewram_rev10.txt diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c834234d5..1c7cc6ad3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -55,6 +55,12 @@ jobs: run: | make -j${nproc} all syms + - name: Compare FireRed rev10 + env: + GAME_REVISION: 10 + run: | + make -j${nproc} all syms + - name: Compare LeafGreen env: GAME_VERSION: LEAFGREEN @@ -68,6 +74,13 @@ jobs: run: | make -j${nproc} all syms + - name: Compare LeafGreen rev10 + env: + GAME_VERSION: LEAFGREEN + GAME_REVISION: 10 + run: | + make -j${nproc} all syms + - name: Build Modern env: MODERN: 1 diff --git a/Makefile b/Makefile index ef6a66de7..eb735f814 100644 --- a/Makefile +++ b/Makefile @@ -129,7 +129,7 @@ MAKEFLAGS += --no-print-directory # Delete files that weren't built properly .DELETE_ON_ERROR: -ALL_BUILDS := firered firered_rev1 leafgreen leafgreen_rev1 +ALL_BUILDS := firered firered_rev1 firered_rev10 leafgreen leafgreen_rev1 leafgreen_rev10 ALL_BUILDS += $(ALL_BUILDS:%=%_modern) RULES_NO_SCAN += clean clean-assets tidy generated clean-generated @@ -224,13 +224,17 @@ tidy: # "friendly" target names for convenience sake firered: ; @$(MAKE) GAME_VERSION=FIRERED firered_rev1: ; @$(MAKE) GAME_VERSION=FIRERED GAME_REVISION=1 +firered_switch: ; @$(MAKE) GAME_VERSION=FIRERED GAME_REVISION=10 leafgreen: ; @$(MAKE) GAME_VERSION=LEAFGREEN leafgreen_rev1: ; @$(MAKE) GAME_VERSION=LEAFGREEN GAME_REVISION=1 +leafgreen_switch: ; @$(MAKE) GAME_VERSION=LEAFGREEN GAME_REVISION=10 compare_firered: ; @$(MAKE) GAME_VERSION=FIRERED COMPARE=1 compare_firered_rev1: ; @$(MAKE) GAME_VERSION=FIRERED GAME_REVISION=1 COMPARE=1 +compare_firered_switch: ; @$(MAKE) GAME_VERSION=FIRERED GAME_REVISION=10 COMPARE=1 compare_leafgreen: ; @$(MAKE) GAME_VERSION=LEAFGREEN COMPARE=1 compare_leafgreen_rev1: ; @$(MAKE) GAME_VERSION=LEAFGREEN GAME_REVISION=1 COMPARE=1 +compare_leafgreen_switch:; @$(MAKE) GAME_VERSION=LEAFGREEN GAME_REVISION=10 COMPARE=1 firered_modern: ; @$(MAKE) GAME_VERSION=FIRERED MODERN=1 firered_rev1_modern: ; @$(MAKE) GAME_VERSION=FIRERED GAME_REVISION=1 MODERN=1 @@ -348,16 +352,30 @@ endif $(OBJ_DIR)/sym_bss.ld: sym_bss.txt $(RAMSCRGEN) .bss $< ENGLISH > $@ +$(OBJ_DIR)/sym_bss_rev10.ld: sym_bss_rev10.txt + $(RAMSCRGEN) .bss $< ENGLISH > $@ + $(OBJ_DIR)/sym_common.ld: sym_common.txt $(C_OBJS) $(wildcard common_syms/*.txt) $(RAMSCRGEN) COMMON $< ENGLISH -c $(C_BUILDDIR),common_syms > $@ +$(OBJ_DIR)/sym_common_rev10.ld: sym_common_rev10.txt $(C_OBJS) $(wildcard common_syms/*.txt) + $(RAMSCRGEN) COMMON $< ENGLISH -c $(C_BUILDDIR),common_syms > $@ + $(OBJ_DIR)/sym_ewram.ld: sym_ewram.txt $(RAMSCRGEN) ewram_data $< ENGLISH > $@ +$(OBJ_DIR)/sym_ewram_rev10.ld: sym_ewram_rev10.txt + $(RAMSCRGEN) ewram_data $< ENGLISH > $@ + # Linker script ifeq ($(MODERN),0) +ifeq ($(GAME_REVISION),10) +LD_SCRIPT := ld_script_rev10.ld +LD_SCRIPT_DEPS := $(OBJ_DIR)/sym_bss_rev10.ld $(OBJ_DIR)/sym_common_rev10.ld $(OBJ_DIR)/sym_ewram_rev10.ld +else LD_SCRIPT := ld_script.ld LD_SCRIPT_DEPS := $(OBJ_DIR)/sym_bss.ld $(OBJ_DIR)/sym_common.ld $(OBJ_DIR)/sym_ewram.ld +endif else LD_SCRIPT := ld_script_modern.ld LD_SCRIPT_DEPS := diff --git a/README.md b/README.md index 0dc5dee72..819422657 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,8 @@ It builds the following ROM images: * [**pokeleafgreen.gba**](https://datomatic.no-intro.org/?page=show_record&s=23&n=1617) `sha1: 574fa542ffebb14be69902d1d36f1ec0a4afd71e` * [**pokefirered_rev1.gba**](https://datomatic.no-intro.org/?page=show_record&s=23&n=1672) `sha1: dd5945db9b930750cb39d00c84da8571feebf417` * [**pokeleafgreen_rev1.gba**](https://datomatic.no-intro.org/index.php?page=show_record&s=23&n=1668) `sha1: 7862c67bdecbe21d1d69ce082ce34327e1c6ed5e` +* [**pokefirered_switch.gba**](https://datomatic.no-intro.org/index.php?page=show_record&s=23&n=x550) `sha1: baa452d0b24629dd7782cfc07a8984085dde1311` +* [**pokeleafgreen_switch.gba**](https://datomatic.no-intro.org/index.php?page=show_record&s=23&n=x551) `sha1: 62b9fc77549dbc67032eb6cbd0ea6ad3b825690f` To set up the repository, see [INSTALL.md](INSTALL.md). diff --git a/config.mk b/config.mk index 48421930c..c07d31fc0 100644 --- a/config.mk +++ b/config.mk @@ -43,6 +43,10 @@ ifeq ($(GAME_REVISION),1) BUILD_NAME := $(BUILD_NAME)_rev1 endif +ifeq ($(GAME_REVISION),10) + BUILD_NAME := $(BUILD_NAME)_switch +endif + # Modern GCC ifeq ($(MODERN),1) BUILD_NAME := $(BUILD_NAME)_modern diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index 3304833c7..9ae0ed9d1 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -1664,7 +1664,11 @@ RisingWaterHitEffect: Move_EXPLOSION: loadspritegfx ANIM_TAG_EXPLOSION +.if REVISION >= 0xA + createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, F_PAL_BG, 8, 9, RGB(26, 8, 8), 8, RGB_BLACK, 5 +.else createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, F_PAL_BG, 8, 9, RGB(26, 8, 8), 8, RGB_BLACK, 8 +.endif createvisualtask AnimTask_ShakeMon2, 5, 4, 8, 0, 40, 1 createvisualtask AnimTask_ShakeMon2, 5, 5, 8, 0, 40, 1 createvisualtask AnimTask_ShakeMon2, 5, 6, 8, 0, 40, 1 diff --git a/firered_switch.sha1 b/firered_switch.sha1 new file mode 100644 index 000000000..715fa7b9c --- /dev/null +++ b/firered_switch.sha1 @@ -0,0 +1 @@ +baa452d0b24629dd7782cfc07a8984085dde1311 pokefirered_switch.gba diff --git a/include/AgbRfu_LinkManager.h b/include/AgbRfu_LinkManager.h index 53c623e5a..6cf18d6c7 100644 --- a/include/AgbRfu_LinkManager.h +++ b/include/AgbRfu_LinkManager.h @@ -23,8 +23,13 @@ #define PCSWITCH_FORCE_SP_START 0x09 // Period for which parent-child switching search specified +#if REVISION >= 0xA +#define PCSWITCH_ALL_PERIOD 180 // Entire cycle 180 frames +#define PCSWITCH_SP_PERIOD 65 // Child period 40 frames +#else #define PCSWITCH_ALL_PERIOD 180 // Entire cycle 180 frames #define PCSWITCH_SP_PERIOD 40 // Child period 40 frames +#endif // Error code returned by Link Manager API (rfu_LMAN_...return value of function) #define LMAN_ERROR_MANAGER_BUSY 1 // Link Manager is already running. @@ -165,6 +170,9 @@ typedef struct linkManagerTag /* 0x014 */ u16 param[2]; /* 0x018 */ u16 NI_failCounter_limit; /* 0x01a */ u16 connect_period; +#if REVISION >= 0xA + /* 0x01c */ u16 connect_period_initial; // pushes next offsets up by 2 +#endif /* 0x01c */ u16 pcswitch_period_bak; /* 0x01e */ u16 work; /* 0x020 */ u16 *acceptable_serialNo_list; @@ -190,6 +198,10 @@ u8 rfu_LMAN_setLinkRecovery(u8 enable_flag, u16 recovery_period); void rfu_LMAN_manager_entity(u32 rand); void rfu_LMAN_syncVBlank(void); u8 rfu_LMAN_initializeManager(void (*LMAN_callback_p)(u8, u8), void (*MSC_callback_p)(u16)); +#if REVISION >= 0xA +void rfu_LMAN_forceChangeSP(bool8 child); +#else void rfu_LMAN_forceChangeSP(void); +#endif #endif //GUARD_LINKMANAGER_H diff --git a/include/config.h b/include/config.h index 956858e2d..db131b271 100644 --- a/include/config.h +++ b/include/config.h @@ -8,12 +8,17 @@ // still has them in the ROM. This is because the developers forgot // to define NDEBUG before release, however this has been changed as // Ruby's actual debug build does not use the AGBPrint features. -// #define NDEBUG + +// Revision 10 disabled asserts in some other way, comment out NDEBUG there to bring them back. +#if REVISION >= 0xA +#define NDEBUG +#endif // Fire Red likely forgot to define NDEBUG/NOAGBPRN before release, leading // to the inclusion of asserts in the retail ROM. +// Revision 10 disabled asserts in some other way, but isagbprint/etc is still present there. -#ifndef NDEBUG +#if !defined(NDEBUG) || REVISION >= 0xA #define PRETTY_PRINT_OFF (0) #define PRETTY_PRINT_MINI_PRINTF (1) #define PRETTY_PRINT_LIBC (2) diff --git a/include/constants/union_room.h b/include/constants/union_room.h index 4016150f0..c3f719dbd 100644 --- a/include/constants/union_room.h +++ b/include/constants/union_room.h @@ -7,9 +7,10 @@ // exceed RFU_CHILD_MAX (4), for a total of 5 including the player. #define MAX_UNION_ROOM_LEADERS 8 -#define UNION_ROOM_SPAWN_NONE 0 -#define UNION_ROOM_SPAWN_IN 1 -#define UNION_ROOM_SPAWN_OUT 2 +#define UNION_ROOM_SPAWN_NONE 0 +#define UNION_ROOM_SPAWN_IN 1 +#define UNION_ROOM_SPAWN_OUT 2 +#define UNION_ROOM_SPAWN_OUT_SOON 3 // Equivalent to SPAWN_OUT in revision 10 - probably SPAWN_OUT means disconnected in a "connection reset" way? #define UNION_ROOM_MAX_LEVEL 30 diff --git a/include/gba/isagbprint.h b/include/gba/isagbprint.h index de14b289e..9c79e03e8 100644 --- a/include/gba/isagbprint.h +++ b/include/gba/isagbprint.h @@ -9,7 +9,7 @@ #define MGBA_LOG_INFO (3) #define MGBA_LOG_DEBUG (4) -#ifdef NDEBUG +#if defined(NDEBUG) && !(REVISION >= 0xA) #define DebugPrintf(pBuf, ...) #define DebugPrintfLevel(level, pBuf, ...) #define MgbaOpen() diff --git a/include/librfu.h b/include/librfu.h index 6981ba2bc..fa57ac4a2 100644 --- a/include/librfu.h +++ b/include/librfu.h @@ -4,7 +4,11 @@ #include "global.h" #include "main.h" +#if REVISION >= 0xA +#define LIBRFU_VERSION 1028 +#else #define LIBRFU_VERSION 1024 +#endif /* TODOs: * - documentation diff --git a/include/link_rfu.h b/include/link_rfu.h index affbebe3d..12412fb97 100644 --- a/include/link_rfu.h +++ b/include/link_rfu.h @@ -294,6 +294,7 @@ bool32 WaitRfuState(bool32 force); bool32 HasTrainerLeftPartnersList(u16 trainerId, const u8 *trainerName); void SendRfuStatusToPartner(u8 status, u16 trainerId, const u8 *name); u32 WaitSendRfuStatusToPartner(u16 trainerId, const u8 *name); +s32 GetJoinGroupStatus(void); void SetHostRfuGameData(u8 activity, u32 partnerInfo, bool32 startedActivity); void InitializeRfuLinkManager_LinkLeader(u32 availSlots); void RequestDisconnectSlotByTrainerNameAndId(const u8 *trainerName, u16 trainerId); @@ -322,6 +323,17 @@ void RfuSetNormalDisconnectMode(void); void SetUnionRoomChatPlayerData(u32 numPlayers); void ClearRecvCommands(void); +void PkmnStrToASCII(u8 *dest, const u8 *src); +void ASCIIToPkmnStr(u8 *dest, const u8 *src); + +#if REVISION >= 0xA +u16 RfuGetErrorInfo(void); +void LinkRfu_ForceChangeSpParent(void); +void DestroyTask_RfuReconnectWithParent(void); +void RfuReloadSave(void); +void RfuSoftReset(void); +#endif + #include "mystery_gift_server.h" extern const struct MysteryGiftServerCmd gServerScript_ClientCanceledCard[]; diff --git a/include/overworld.h b/include/overworld.h index 56e656f07..b4f56bee6 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -180,6 +180,10 @@ void UpdateEscapeWarp(s16 x, s16 y); bool8 SetDiveWarpEmerge(u16 x, u16 y); bool8 SetDiveWarpDive(u16 x, u16 y); +#if REVISION >= 0xA +void ClearFieldCallback(void); +#endif + extern u16 *gBGTilemapBuffers1; extern u16 *gBGTilemapBuffers2; extern u16 *gBGTilemapBuffers3; diff --git a/include/sloopsvc.h b/include/sloopsvc.h new file mode 100644 index 000000000..1ba777853 --- /dev/null +++ b/include/sloopsvc.h @@ -0,0 +1,36 @@ +#ifndef GUARD_SLOOPSVC_H +#define GUARD_SLOOPSVC_H + +#if REVISION >= 0xA + +#define SVC4B_EXIT_EARLY (1 << 0) +#define SVC4B_RESEED_RNG (1 << 1) + +void svc_40(void); +void svc_41(void); + +void svc_47(void); +void svc_42(void); +u32 svc_49(void); +void svc_45_rfu_link_status(void); +u32 svc_4a(void); +void svc_43(u16 pid); +void svc_44(void); +u32 svc_53(void); +u32 svc_51(void); +u32 svc_4b(void); +void svc_WriteSector(u8 sector, u8* data); +void svc_ReplaceSector(u8 sector, u8* data); +void svc_FinishSave(void); +u32 svc_CommsAllowedByParentalControls(void); +u32 svc_BadWordCheck(u8* str); +void svc_4f(u32 arg); +u32 svc_50(void); +void svc_SetSaveBlock2(struct SaveBlock2* saveBlock2); +void svc_stubbed(void); +void svc_SetStarter(u32 species); +void svc_SetActivity(u32 activity); +void svc_IncrementLinkError(void); + +#endif +#endif \ No newline at end of file diff --git a/ld_script.ld b/ld_script.ld index 6e2edf14f..f7e62c922 100644 --- a/ld_script.ld +++ b/ld_script.ld @@ -64,6 +64,7 @@ SECTIONS { src/window_8bpp.o(.text); src/text.o(.text); src/sprite.o(.text); + src/sloopsvc.o(.text); src/string_util.o(.text); src/link.o(.text); src/multiboot.o(.text); @@ -405,6 +406,7 @@ SECTIONS { src/text.o(.rodata); src/sprite.o(.rodata); src/bg_regs.o(.rodata); + src/sloopsvc.o(.rodata); src/string_util.o(.rodata); src/link.o(.rodata); src/main_menu.o(.rodata); diff --git a/ld_script_rev10.ld b/ld_script_rev10.ld new file mode 100644 index 000000000..60b6f4431 --- /dev/null +++ b/ld_script_rev10.ld @@ -0,0 +1,1062 @@ +gNumMusicPlayers = 4; +gMaxLines = 0; + +MEMORY +{ + EWRAM (rwx) : ORIGIN = 0x2000000, LENGTH = 256K + IWRAM (rwx) : ORIGIN = 0x3000000, LENGTH = 32K + ROM (rx) : ORIGIN = 0x8000000, LENGTH = 32M +} + +SECTIONS { + + ewram 0x2000000 (NOLOAD) : + ALIGN(4) + { + gHeap = .; + + . = 0x1C000; + + INCLUDE "sym_ewram_rev10.ld" + src/*.o(ewram_data); + + *libc.a:impure.o(.data); + *libc.a:locale.o(.data); + *libc.a:mallocr.o(.data); + } > EWRAM + + iwram 0x3000000 (NOLOAD) : + ALIGN(4) + { + /* .bss starts at 0x3000000 */ + INCLUDE "sym_bss_rev10.ld" + src/*.o(.bss); + data/*.o(.bss); + + /* .bss.code starts at 0x30028E0 */ + src/m4a.o(.bss.code); + + /* COMMON starts at 0x30030E0 */ + INCLUDE "sym_common_rev10.ld" + src/*.o(COMMON); + + *libc.a:sbrkr.o(COMMON); + end = .; + } > IWRAM + + /* BEGIN ROM DATA */ + . = 0x8000000; + + .text : + ALIGN(4) + { + src/rom_header.o(.text); + src/rom_header_gf.o(.text*); + src/crt0.o(.text); + src/main.o(.text); + src/gpu_regs.o(.text); + src/dma3_manager.o(.text); + src/bg.o(.text); + src/malloc.o(.text); + src/text_printer.o(.text); + src/window.o(.text); + src/blit.o(.text); + src/window_8bpp.o(.text); + src/librfu_stwi.o(.text); + src/librfu_rfu.o(.text); + src/text.o(.text); + src/sprite.o(.text); + src/sloopsvc.o(.text); + src/string_util.o(.text); + src/link.o(.text); + src/multiboot.o(.text); + src/main_menu.o(.text); + src/battle_controllers.o(.text); + src/decompress.o(.text); + src/battle_bg.o(.text); + src/battle_main.o(.text); + src/battle_util.o(.text); + src/battle_script_commands.o(.text); + src/battle_util2.o(.text); + src/battle_controller_player.o(.text); + src/battle_gfx_sfx_util.o(.text); + src/battle_controller_opponent.o(.text); + src/battle_ai_switch_items.o(.text); + src/battle_controller_link_opponent.o(.text); + src/pokemon.o(.text); + src/trig.o(.text); + src/random.o(.text); + src/util.o(.text); + src/blend_palette.o(.text); + src/daycare.o(.text); + src/battle_interface.o(.text); + src/battle_anim_smokescreen.o(.text); + src/pokeball.o(.text); + src/load_save.o(.text); + src/trade.o(.text); + src/trade_scene.o(.text); + src/play_time.o(.text); + src/new_game.o(.text); + src/overworld.o(.text); + src/fieldmap.o(.text); + src/metatile_behavior.o(.text); + src/field_camera.o(.text); + src/field_door.o(.text); + src/field_player_avatar.o(.text); + src/event_object_movement.o(.text); + src/field_message_box.o(.text); + src/event_object_lock.o(.text); + src/text_window_graphics.o(.text); + src/script.o(.text); + src/scrcmd.o(.text); + src/field_control_avatar.o(.text); + src/event_data.o(.text); + src/coord_event_weather.o(.text); + src/field_tasks.o(.text); + src/start_menu.o(.text); + src/tileset_anims.o(.text); + src/palette.o(.text); + src/sound.o(.text); + src/battle_anim.o(.text); + src/battle_anim_mons.o(.text); + src/task.o(.text); + src/reshow_battle_screen.o(.text); + src/battle_anim_status_effects.o(.text); + src/title_screen.o(.text); + src/reset_save_heap.o(.text); + src/field_weather.o(.text); + src/field_weather_util.o(.text); + src/field_weather_effects.o(.text); + src/field_fadetransition.o(.text); + src/field_screen_effect.o(.text); + src/battle_setup.o(.text); + src/cable_club.o(.text); + src/trainer_see.o(.text); + src/wild_encounter.o(.text); + src/field_effect.o(.text); + src/scanline_effect.o(.text); + src/option_menu.o(.text); + src/pokedex.o(.text); + src/trainer_card.o(.text); + src/pokemon_storage_system.o(.text); + src/pokemon_storage_system_menu.o(.text); + src/pokemon_storage_system_tasks.o(.text); + src/pokemon_storage_system_graphics.o(.text); + src/pokemon_storage_system_data.o(.text); + src/pokemon_storage_system_misc.o(.text); + src/pokemon_icon.o(.text); + src/script_movement.o(.text); + src/fldeff_cut.o(.text); + src/mail_data.o(.text); + src/map_name_popup.o(.text); + src/item_menu_icons.o(.text); + src/battle_anim_mon_movement.o(.text); + src/item.o(.text); + src/shop.o(.text); + src/special_field_anim.o(.text); + src/berry.o(.text); + src/script_menu.o(.text); + src/naming_screen.o(.text); + src/money.o(.text); + src/script_pokemon_util.o(.text); + src/field_poison.o(.text); + src/pokemon_size_record.o(.text); + src/pc_screen_effect.o(.text); + src/fldeff_poison.o(.text); + src/fldeff_berrytree.o(.text); + src/field_special_scene.o(.text); + src/safari_zone.o(.text); + src/item_use.o(.text); + src/battle_anim_effects_1.o(.text); + src/battle_anim_effects_2.o(.text); + src/battle_anim_water.o(.text); + src/battle_anim_fire.o(.text); + src/battle_anim_electric.o(.text); + src/battle_anim_ice.o(.text); + src/battle_anim_fight.o(.text); + src/battle_anim_poison.o(.text); + src/battle_anim_flying.o(.text); + src/battle_anim_psychic.o(.text); + src/battle_anim_bug.o(.text); + src/battle_anim_rock.o(.text); + src/battle_anim_ghost.o(.text); + src/battle_anim_dragon.o(.text); + src/battle_anim_dark.o(.text); + src/battle_anim_ground.o(.text); + src/battle_anim_normal.o(.text); + src/battle_anim_utility_funcs.o(.text); + src/battle_intro.o(.text); + src/bike.o(.text); + src/easy_chat.o(.text); + src/mon_markings.o(.text); + src/mail.o(.text); + src/menu_helpers.o(.text); + src/party_menu_specials.o(.text); + src/heal_location.o(.text); + src/region_map.o(.text); + src/image_processing_effects.o(.text); + src/battle_ai_script_commands.o(.text); + src/fldeff_rocksmash.o(.text); + src/fldeff_dig.o(.text); + src/fldeff_flash.o(.text); + src/post_battle_event_funcs.o(.text); + src/prof_pc.o(.text); + src/hof_pc.o(.text); + src/field_specials.o(.text); + src/battle_records.o(.text); + src/evolution_scene.o(.text); + src/coins.o(.text); + src/fldeff_strength.o(.text); + src/battle_transition.o(.text); + src/battle_controller_link_partner.o(.text); + src/battle_message.o(.text); + src/math_util.o(.text); + src/palette_util.o(.text); + src/cable_car_util.o(.text); + src/save.o(.text); + src/mystery_event_script.o(.text); + src/field_effect_helpers.o(.text); + src/battle_anim_sound_tasks.o(.text); + src/battle_controller_safari.o(.text); + src/fldeff_sweetscent.o(.text); + src/battle_anim_effects_3.o(.text); + src/learn_move.o(.text); + src/fldeff_softboiled.o(.text); + src/battle_tower.o(.text); + src/battle_controller_oak_old_man.o(.text); + src/player_pc.o(.text); + src/intro.o(.text); + src/battle_anim_special.o(.text); + src/hall_of_fame.o(.text); + src/credits.o(.text); + src/diploma.o(.text); + src/save_failed_screen.o(.text); + src/clear_save_data_screen.o(.text); + src/evolution_graphics.o(.text); + src/fldeff_teleport.o(.text); + src/new_menu_helpers.o(.text); + src/tilemap_util.o(.text); + src/save_menu_util.o(.text); + src/map_preview_screen.o(.text); + src/link_rfu_2.o(.text); + src/link_rfu_3.o(.text); + src/AgbRfu_LinkManager.o(.text); + src/easy_chat_2.o(.text); + src/easy_chat_3.o(.text); + src/pokedex_screen.o(.text); + src/list_menu.o(.text); + src/item_menu.o(.text); + src/save_location.o(.text); + src/bag.o(.text); + src/trainer_pokemon_sprites.o(.text); + src/vs_seeker.o(.text); + src/item_pc.o(.text); + src/mailbox_pc.o(.text); + src/menu.o(.text); + src/quest_log.o(.text); + src/help_message.o(.text); + src/trainer_fan_club.o(.text); + src/quest_log_events.o(.text); + src/union_room.o(.text); + src/union_room_player_avatar.o(.text); + src/union_room_battle.o(.text); + src/pokemon_special_anim.o(.text); + src/pokemon_special_anim_scene.o(.text); + src/party_menu.o(.text); + src/union_room_chat.o(.text); + src/union_room_chat_display.o(.text); + src/union_room_chat_objects.o(.text); + src/help_system.o(.text); + src/quest_log_battle.o(.text); + src/fame_checker.o(.text); + src/menu2.o(.text); + src/oak_speech.o(.text); + src/tm_case.o(.text); + src/menu_indicators.o(.text); + src/pokedex_area_markers.o(.text); + src/pokemon_summary_screen.o(.text); + src/help_system_util.o(.text); + src/wild_pokemon_area.o(.text); + src/dynamic_placeholder_text_util.o(.text); + src/berry_pouch.o(.text); + src/itemfinder.o(.text); + src/buy_menu_helpers.o(.text); + src/slot_machine.o(.text); + src/roamer.o(.text); + src/mystery_gift_menu.o(.text); + src/ereader_screen.o(.text); + src/mystery_gift.o(.text); + src/mystery_gift_link.o(.text); + src/mystery_gift_client.o(.text); + src/mystery_gift_server.o(.text); + src/mystery_gift_show_card.o(.text); + src/mystery_gift_show_news.o(.text); + src/wonder_news.o(.text); + src/seagallop.o(.text); + src/pokemon_jump.o(.text); + src/berry_crush.o(.text); + src/wireless_communication_status_screen.o(.text); + src/braille_text.o(.text); + src/text_window.o(.text); + src/quest_log_player.o(.text); + src/dodrio_berry_picking.o(.text); + src/battle_controller_pokedude.o(.text); + src/quest_log_objects.o(.text); + src/dodrio_berry_picking_comm.o(.text); + src/teachy_tv.o(.text); + src/ereader_helpers.o(.text); + src/digit_obj_util.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/minigame_countdown.o(.text); + src/berry_fix_program.o(.text); + } > ROM =0 + + script_data : + ALIGN(4) + { + data/event_scripts.o(script_data); + data/battle_anim_scripts.o(script_data); + data/battle_scripts_1.o(script_data); + data/field_effect_scripts.o(script_data); + data/battle_scripts_2.o(script_data); + data/battle_ai_scripts.o(script_data); + data/mystery_event_script_cmd_table.o(script_data); + } > ROM =0 + + lib_text : + ALIGN(4) + { + src/libgcnmultiboot.o(.text); + src/m4a_1.o(.text); + src/m4a.o(.text); + src/agb_flash.o(.text); + src/agb_flash_1m.o(.text); + src/agb_flash_mx.o(.text); + src/agb_flash_le.o(.text); + src/librfu_sio32id.o(.text); + src/librfu_intr.o(.text); + src/isagbprn.o(.text); + src/libagbsyscall.o(.text); + *libgcc.a:_call_via_rX.o(.text); + *libgcc.a:_divdi3.o(.text); + *libgcc.a:_divsi3.o(.text); + *libgcc.a:_dvmd_tls.o(.text); + *libgcc.a:_fixunsdfsi.o(.text); + *libgcc.a:_modsi3.o(.text); + *libgcc.a:_muldi3.o(.text); + *libgcc.a:_udivdi3.o(.text); + *libgcc.a:_udivsi3.o(.text); + *libgcc.a:_umodsi3.o(.text); + *libgcc.a:dp-bit.o(.text); + *libgcc.a:fp-bit.o(.text); + *libgcc.a:_lshrdi3.o(.text); + *libgcc.a:_negdi2.o(.text); + *libc.a:memcpy.o(.text); + *libc.a:memset.o(.text); + *libc.a:strcmp.o(.text); + *libc.a:strcpy.o(.text); + *libc.a:impure.o(.text); + *libc.a:vsprintf.o(.text); + *libc.a:vfprintf.o(.text); + *libc.a:wsetup.o(.text); + *libc.a:dtoa.o(.text); + *libc.a:fflush.o(.text); + *libc.a:findfp.o(.text); + *libc.a:freer.o(.text); + *libc.a:mtrim.o(.text); + *libc.a:fvwrite.o(.text); + *libc.a:fwalk.o(.text); + *libc.a:locale.o(.text); + *libc.a:makebuf.o(.text); + *libc.a:mallocr.o(.text); + *libc.a:mbtowc_r.o(.text); + *libc.a:memchr.o(.text); + *libc.a:memmove.o(.text); + *libc.a:mlock.o(.text); + *libc.a:mprec.o(.text); + *libc.a:s_isinf.o(.text); + *libc.a:s_isnan.o(.text); + *libc.a:sbrkr.o(.text); + *libc.a:stdio.o(.text); + *libc.a:strlen.o(.text); + *libc.a:syscalls.o(.text); + *libc.a:writer.o(.text); + *libc.a:callocr.o(.text); + *libc.a:closer.o(.text); + *libc.a:errno.o(.text); + *libc.a:fstatr.o(.text); + *libc.a:libcfunc.o(.text); + *libc.a:lseekr.o(.text); + *libc.a:readr.o(.text); + } > ROM =0 + + .rodata : + SUBALIGN(4) + { + src/main.o(.rodata); + src/bg.o(.rodata); + src/malloc.o(.rodata); + src/malloc.o(.rodata.str1.4); + src/text_printer.o(.rodata); + src/window.o(.rodata); + src/librfu_rfu.o(.rodata); + src/text.o(.rodata); + src/sprite.o(.rodata); + src/bg_regs.o(.rodata); + src/sloopsvc.o(.rodata); + src/string_util.o(.rodata); + src/link.o(.rodata); + src/main_menu.o(.rodata); + src/data.o(.rodata); + src/battle_bg.o(.rodata); + src/battle_main.o(.rodata); + src/battle_util.o(.rodata); + src/battle_script_commands.o(.rodata); + src/battle_controller_player.o(.rodata); + src/battle_anim_smokescreen.o(.rodata); + src/battle_controller_opponent.o(.rodata); + src/battle_controller_link_opponent.o(.rodata); + src/pokemon.o(.rodata); + src/trig.o(.rodata); + src/util.o(.rodata); + src/daycare.o(.rodata); + src/battle_gfx_sfx_util.o(.rodata); + src/battle_interface.o(.rodata); + src/pokeball.o(.rodata); + src/trade.o(.rodata); + src/trade_scene.o(.rodata); + src/overworld.o(.rodata); + src/tilesets.o(.rodata); + data/maps.o(.rodata); + src/fieldmap.o(.rodata); + src/metatile_behavior.o(.rodata); + src/field_door.o(.rodata); + src/field_player_avatar.o(.rodata); + src/event_object_movement.o(.rodata); + src/scrcmd.o(.rodata); + src/coord_event_weather.o(.rodata); + src/field_tasks.o(.rodata); + src/start_menu.o(.rodata); + src/tileset_anims.o(.rodata); + src/palette.o(.rodata); + src/sound.o(.rodata); + src/battle_anim.o(.rodata); + src/battle_anim_mons.o(.rodata); + data/map_events.o(.rodata); + src/battle_anim_status_effects.o(.rodata); + src/title_screen.o(.rodata); + src/field_weather.o(.rodata); + src/field_weather_util.o(.rodata); + src/field_weather_effects.o(.rodata); + src/field_screen_effect.o(.rodata); + src/battle_setup.o(.rodata); + src/cable_club.o(.rodata); + src/trainer_see.o(.rodata); + src/wild_encounter.o(.rodata); + src/field_effect.o(.rodata); + src/option_menu.o(.rodata); + src/trainer_card.o(.rodata); + src/pokemon_storage_system_menu.o(.rodata); + src/pokemon_storage_system_tasks.o(.rodata); + src/pokemon_storage_system_graphics.o(.rodata); + src/pokemon_storage_system_data.o(.rodata); + src/pokemon_storage_system_misc.o(.rodata); + src/pokemon_icon.o(.rodata); + src/fldeff_cut.o(.rodata); + src/map_name_popup.o(.rodata); + src/item_menu_icons.o(.rodata); + src/battle_anim_mon_movement.o(.rodata); + src/item.o(.rodata); + src/shop.o(.rodata); + src/special_field_anim.o(.rodata); + src/berry.o(.rodata); + src/script_menu.o(.rodata); + src/naming_screen.o(.rodata); + src/pokemon_size_record.o(.rodata); + src/item_use.o(.rodata); + src/battle_anim_effects_1.o(.rodata); + src/battle_anim_effects_2.o(.rodata); + src/battle_anim_water.o(.rodata); + src/battle_anim_fire.o(.rodata); + src/battle_anim_electric.o(.rodata); + src/battle_anim_ice.o(.rodata); + src/battle_anim_fight.o(.rodata); + src/battle_anim_poison.o(.rodata); + src/battle_anim_flying.o(.rodata); + src/battle_anim_psychic.o(.rodata); + src/battle_anim_bug.o(.rodata); + src/battle_anim_rock.o(.rodata); + src/battle_anim_ghost.o(.rodata); + src/battle_anim_dragon.o(.rodata); + src/battle_anim_dark.o(.rodata); + src/battle_anim_ground.o(.rodata); + src/battle_anim_normal.o(.rodata); + src/battle_anim_utility_funcs.o(.rodata); + src/battle_intro.o(.rodata); + src/bike.o(.rodata); + src/easy_chat.o(.rodata); + src/mon_markings.o(.rodata); + src/mail.o(.rodata); + src/heal_location.o(.rodata); + src/region_map.o(.rodata); + src/image_processing_effects.o(.rodata); + src/battle_ai_script_commands.o(.rodata); + src/fldeff_flash.o(.rodata); + src/field_specials.o(.rodata); + src/battle_records.o(.rodata); + src/evolution_scene.o(.rodata); + src/battle_transition.o(.rodata); + src/battle_controller_link_partner.o(.rodata); + src/battle_message.o(.rodata); + src/save.o(.rodata); + src/field_effect_helpers.o(.rodata); + src/battle_controller_safari.o(.rodata); + src/battle_anim_effects_3.o(.rodata); + src/learn_move.o(.rodata); + src/battle_tower.o(.rodata); + src/battle_controller_oak_old_man.o(.rodata); + src/player_pc.o(.rodata); + src/intro.o(.rodata); + src/battle_anim_special.o(.rodata); + src/hall_of_fame.o(.rodata); + src/credits.o(.rodata); + src/diploma.o(.rodata); + src/strings.o(.rodata); + src/save_failed_screen.o(.rodata); + src/clear_save_data_screen.o(.rodata); + src/evolution_graphics.o(.rodata); + src/new_menu_helpers.o(.rodata); + src/tilemap_util.o(.rodata); + src/map_preview_screen.o(.rodata); + src/link_rfu_2.o(.rodata); + src/link_rfu_3.o(.rodata); + src/easy_chat_2.o(.rodata); + src/easy_chat_3.o(.rodata); + src/pokedex_screen.o(.rodata); + src/list_menu.o(.rodata); + src/item_menu.o(.rodata); + src/save_location.o(.rodata); + src/bag.o(.rodata); + src/trainer_pokemon_sprites.o(.rodata); + src/vs_seeker.o(.rodata); + src/item_pc.o(.rodata); + src/mailbox_pc.o(.rodata); + src/decoration.o(.rodata); + src/menu.o(.rodata); + src/quest_log.o(.rodata); + src/help_message.o(.rodata); + src/trainer_fan_club.o(.rodata); + src/quest_log_events.o(.rodata); + src/union_room.o(.rodata); + src/union_room_player_avatar.o(.rodata); + src/union_room_battle.o(.rodata); + src/union_room_message.o(.rodata); + src/pokemon_special_anim.o(.rodata); + src/pokemon_special_anim_scene.o(.rodata); + src/party_menu.o(.rodata); + src/union_room_chat.o(.rodata); + src/union_room_chat_display.o(.rodata); + src/union_room_chat_objects.o(.rodata); + src/help_system.o(.rodata); + src/fame_checker.o(.rodata); + src/menu2.o(.rodata); + src/oak_speech.o(.rodata); + src/tm_case.o(.rodata); + src/menu_indicators.o(.rodata); + src/pokedex_area_markers.o(.rodata); + src/pokemon_summary_screen.o(.rodata); + src/help_system_util.o(.rodata); + src/wild_pokemon_area.o(.rodata); + src/dynamic_placeholder_text_util.o(.rodata); + src/berry_pouch.o(.rodata); + src/itemfinder.o(.rodata); + src/buy_menu_helpers.o(.rodata); + src/slot_machine.o(.rodata); + src/roamer.o(.rodata); + src/mystery_gift_menu.o(.rodata); + src/ereader_screen.o(.rodata); + src/mystery_gift.o(.rodata); + src/mystery_gift_link.o(.rodata); + src/mystery_gift_client.o(.rodata); + src/mystery_gift_server.o(.rodata); + src/mystery_gift_show_card.o(.rodata); + src/mystery_gift_show_news.o(.rodata); + src/mystery_gift_scripts.o(.rodata); + src/wonder_news.o(.rodata); + src/wonder_news.o(.rodata.str1.4); + src/seagallop.o(.rodata); + src/pokemon_jump.o(.rodata); + src/berry_crush.o(.rodata); + src/wireless_communication_status_screen.o(.rodata); + src/braille_text.o(.rodata); + src/text_window_graphics.o(.rodata); + src/quest_log_player.o(.rodata); + src/dodrio_berry_picking.o(.rodata); + src/battle_controller_pokedude.o(.rodata); + src/teachy_tv.o(.rodata); + src/digit_obj_util.o(.rodata); + src/ss_anne.o(.rodata); + src/cereader_tool.o(.rodata); + src/renewable_hidden_items.o(.rodata); + src/trainer_tower.o(.rodata); + src/minigame_countdown.o(.rodata); + src/berry_fix_program.o(.rodata); + src/keyboard_text.o(.rodata); + src/trainer_tower_sets.o(.rodata); + src/move_descriptions.o(.rodata); + + /* 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); + } > ROM =0 + + song_data : + ALIGN(4) + { + sound/songs/midi/mus_dummy.o(.rodata); + sound/songs/midi/se_use_item.o(.rodata); + sound/songs/midi/se_pc_login.o(.rodata); + 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_rs_door.o(.rodata); + sound/songs/midi/se_exit.o(.rodata); + sound/songs/midi/se_ledge.o(.rodata); + sound/songs/midi/se_bike_bell.o(.rodata); + sound/songs/midi/se_not_effective.o(.rodata); + sound/songs/midi/se_effective.o(.rodata); + sound/songs/midi/se_super_effective.o(.rodata); + sound/songs/midi/se_ball_open.o(.rodata); + sound/songs/midi/se_faint.o(.rodata); + sound/songs/midi/se_flee.o(.rodata); + sound/songs/midi/se_sliding_door.o(.rodata); + sound/songs/midi/se_ship.o(.rodata); + sound/songs/midi/se_bang.o(.rodata); + sound/songs/midi/se_pin.o(.rodata); + sound/songs/midi/se_boo.o(.rodata); + sound/songs/midi/se_ball.o(.rodata); + sound/songs/midi/se_contest_place.o(.rodata); + sound/songs/midi/se_success.o(.rodata); + sound/songs/midi/se_failure.o(.rodata); + sound/songs/midi/se_exp.o(.rodata); + sound/songs/midi/se_bike_hop.o(.rodata); + sound/songs/midi/se_switch.o(.rodata); + sound/songs/midi/se_click.o(.rodata); + sound/songs/midi/se_fu_zaku.o(.rodata); + sound/songs/midi/se_contest_condition_lose.o(.rodata); + sound/songs/midi/se_lavaridge_fall_warp.o(.rodata); + sound/songs/midi/se_ice_stairs.o(.rodata); + sound/songs/midi/se_ice_break.o(.rodata); + sound/songs/midi/se_ice_crack.o(.rodata); + sound/songs/midi/se_fall.o(.rodata); + sound/songs/midi/se_unlock.o(.rodata); + sound/songs/midi/se_warp_in.o(.rodata); + sound/songs/midi/se_warp_out.o(.rodata); + sound/songs/midi/se_repel.o(.rodata); + sound/songs/midi/se_rotating_gate.o(.rodata); + sound/songs/midi/se_truck_move.o(.rodata); + sound/songs/midi/se_truck_stop.o(.rodata); + sound/songs/midi/se_truck_unload.o(.rodata); + sound/songs/midi/se_truck_door.o(.rodata); + sound/songs/midi/se_berry_blender.o(.rodata); + sound/songs/midi/se_save.o(.rodata); + sound/songs/midi/se_ball_bounce_1.o(.rodata); + sound/songs/midi/se_ball_bounce_2.o(.rodata); + sound/songs/midi/se_ball_bounce_3.o(.rodata); + sound/songs/midi/se_ball_bounce_4.o(.rodata); + sound/songs/midi/se_ball_trade.o(.rodata); + sound/songs/midi/se_ball_throw.o(.rodata); + sound/songs/midi/se_note_c.o(.rodata); + sound/songs/midi/se_note_d.o(.rodata); + sound/songs/midi/se_note_e.o(.rodata); + sound/songs/midi/se_note_f.o(.rodata); + sound/songs/midi/se_note_g.o(.rodata); + sound/songs/midi/se_note_a.o(.rodata); + sound/songs/midi/se_note_b.o(.rodata); + sound/songs/midi/se_note_c_high.o(.rodata); + sound/songs/midi/se_puddle.o(.rodata); + sound/songs/midi/se_bridge_walk.o(.rodata); + sound/songs/midi/se_itemfinder.o(.rodata); + sound/songs/midi/se_ding_dong.o(.rodata); + sound/songs/midi/se_balloon_red.o(.rodata); + sound/songs/midi/se_balloon_blue.o(.rodata); + sound/songs/midi/se_balloon_yellow.o(.rodata); + sound/songs/midi/se_breakable_door.o(.rodata); + sound/songs/midi/se_mud_ball.o(.rodata); + sound/songs/midi/se_field_poison.o(.rodata); + sound/songs/midi/se_escalator.o(.rodata); + sound/songs/midi/se_thunderstorm.o(.rodata); + sound/songs/midi/se_thunderstorm_stop.o(.rodata); + sound/songs/midi/se_downpour.o(.rodata); + sound/songs/midi/se_downpour_stop.o(.rodata); + sound/songs/midi/se_rain.o(.rodata); + sound/songs/midi/se_rain_stop.o(.rodata); + sound/songs/midi/se_thunder.o(.rodata); + sound/songs/midi/se_thunder2.o(.rodata); + sound/songs/midi/se_elevator.o(.rodata); + sound/songs/midi/se_low_health.o(.rodata); + sound/songs/midi/se_exp_max.o(.rodata); + sound/songs/midi/se_roulette_ball.o(.rodata); + sound/songs/midi/se_roulette_ball2.o(.rodata); + sound/songs/midi/se_taillow_wing_flap.o(.rodata); + sound/songs/midi/se_rs_shop.o(.rodata); + sound/songs/midi/se_contest_heart.o(.rodata); + sound/songs/midi/se_contest_curtain_rise.o(.rodata); + sound/songs/midi/se_contest_curtain_fall.o(.rodata); + sound/songs/midi/se_contest_icon_change.o(.rodata); + sound/songs/midi/se_contest_icon_clear.o(.rodata); + sound/songs/midi/se_contest_mons_turn.o(.rodata); + sound/songs/midi/se_shiny.o(.rodata); + sound/songs/midi/se_intro_blast.o(.rodata); + sound/songs/midi/se_mugshot.o(.rodata); + 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_pokenav_on.o(.rodata); + sound/songs/midi/se_pokenav_off.o(.rodata); + sound/songs/midi/se_dex_search.o(.rodata); + sound/songs/midi/se_egg_hatch.o(.rodata); + sound/songs/midi/se_ball_tray_enter.o(.rodata); + 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_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_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_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_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_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_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_take_down.o(.rodata); + sound/songs/se_m_blizzard.o(.rodata); + sound/songs/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_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_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_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_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_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_door.o(.rodata); + sound/songs/se_card_flip.o(.rodata); + sound/songs/se_card_flipping.o(.rodata); + sound/songs/se_card_open.o(.rodata); + sound/songs/se_bag_cursor.o(.rodata); + sound/songs/se_bag_pocket.o(.rodata); + sound/songs/se_ball_click.o(.rodata); + sound/songs/se_shop.o(.rodata); + sound/songs/se_ss_anne_horn.o(.rodata); + sound/songs/se_help_open.o(.rodata); + sound/songs/se_help_close.o(.rodata); + sound/songs/se_help_error.o(.rodata); + sound/songs/se_deoxys_move.o(.rodata); + sound/songs/se_poke_jump_success.o(.rodata); + sound/songs/se_poke_jump_failure.o(.rodata); + sound/songs/midi/mus_heal.o(.rodata); + sound/songs/midi/mus_level_up.o(.rodata); + sound/songs/midi/mus_obtain_item.o(.rodata); + sound/songs/midi/mus_evolved.o(.rodata); + sound/songs/midi/mus_obtain_badge.o(.rodata); + sound/songs/midi/mus_obtain_tmhm.o(.rodata); + sound/songs/midi/mus_obtain_berry.o(.rodata); + sound/songs/midi/mus_evolution_intro.o(.rodata); + sound/songs/midi/mus_evolution.o(.rodata); + sound/songs/midi/mus_rs_vs_gym_leader.o(.rodata); + sound/songs/midi/mus_rs_vs_trainer.o(.rodata); + sound/songs/midi/mus_school.o(.rodata); + sound/songs/midi/mus_slots_jackpot.o(.rodata); + sound/songs/midi/mus_slots_win.o(.rodata); + sound/songs/midi/mus_move_deleted.o(.rodata); + sound/songs/midi/mus_too_bad.o(.rodata); + sound/songs/midi/mus_follow_me.o(.rodata); + sound/songs/midi/mus_game_corner.o(.rodata); + sound/songs/midi/mus_rocket_hideout.o(.rodata); + sound/songs/midi/mus_gym.o(.rodata); + sound/songs/midi/mus_jigglypuff.o(.rodata); + sound/songs/midi/mus_intro_fight.o(.rodata); + sound/songs/midi/mus_title.o(.rodata); + sound/songs/midi/mus_cinnabar.o(.rodata); + sound/songs/midi/mus_lavender.o(.rodata); + sound/songs/midi/mus_heal_unused.o(.rodata); + sound/songs/midi/mus_cycling.o(.rodata); + sound/songs/midi/mus_encounter_rocket.o(.rodata); + sound/songs/midi/mus_encounter_girl.o(.rodata); + sound/songs/midi/mus_encounter_boy.o(.rodata); + sound/songs/midi/mus_hall_of_fame.o(.rodata); + sound/songs/midi/mus_viridian_forest.o(.rodata); + sound/songs/midi/mus_mt_moon.o(.rodata); + sound/songs/midi/mus_poke_mansion.o(.rodata); + sound/songs/midi/mus_credits.o(.rodata); + sound/songs/midi/mus_route1.o(.rodata); + sound/songs/midi/mus_route24.o(.rodata); + sound/songs/midi/mus_route3.o(.rodata); + sound/songs/midi/mus_route11.o(.rodata); + sound/songs/midi/mus_victory_road.o(.rodata); + sound/songs/midi/mus_vs_gym_leader.o(.rodata); + sound/songs/midi/mus_vs_trainer.o(.rodata); + sound/songs/midi/mus_vs_wild.o(.rodata); + sound/songs/midi/mus_vs_champion.o(.rodata); + sound/songs/midi/mus_pallet.o(.rodata); + sound/songs/midi/mus_oak_lab.o(.rodata); + sound/songs/midi/mus_oak.o(.rodata); + sound/songs/midi/mus_poke_center.o(.rodata); + sound/songs/midi/mus_ss_anne.o(.rodata); + sound/songs/midi/mus_surf.o(.rodata); + sound/songs/midi/mus_poke_tower.o(.rodata); + sound/songs/midi/mus_silph.o(.rodata); + sound/songs/midi/mus_fuchsia.o(.rodata); + sound/songs/midi/mus_celadon.o(.rodata); + sound/songs/midi/mus_victory_trainer.o(.rodata); + sound/songs/midi/mus_victory_wild.o(.rodata); + sound/songs/midi/mus_victory_gym_leader.o(.rodata); + sound/songs/midi/mus_vermillion.o(.rodata); + sound/songs/midi/mus_pewter.o(.rodata); + sound/songs/midi/mus_encounter_rival.o(.rodata); + sound/songs/midi/mus_rival_exit.o(.rodata); + sound/songs/midi/mus_dex_rating.o(.rodata); + sound/songs/midi/mus_obtain_key_item.o(.rodata); + sound/songs/midi/mus_caught_intro.o(.rodata); + sound/songs/midi/mus_photo.o(.rodata); + sound/songs/midi/mus_game_freak.o(.rodata); + sound/songs/midi/mus_caught.o(.rodata); + sound/songs/midi/mus_new_game_instruct.o(.rodata); + sound/songs/midi/mus_new_game_intro.o(.rodata); + sound/songs/midi/mus_new_game_exit.o(.rodata); + sound/songs/midi/mus_poke_jump.o(.rodata); + sound/songs/midi/mus_union_room.o(.rodata); + sound/songs/midi/mus_net_center.o(.rodata); + sound/songs/midi/mus_mystery_gift.o(.rodata); + sound/songs/midi/mus_berry_pick.o(.rodata); + sound/songs/midi/mus_sevii_cave.o(.rodata); + sound/songs/midi/mus_teachy_tv_show.o(.rodata); + sound/songs/midi/mus_sevii_route.o(.rodata); + sound/songs/midi/mus_sevii_dungeon.o(.rodata); + sound/songs/midi/mus_sevii_123.o(.rodata); + sound/songs/midi/mus_sevii_45.o(.rodata); + sound/songs/midi/mus_sevii_67.o(.rodata); + sound/songs/midi/mus_poke_flute.o(.rodata); + sound/songs/midi/mus_vs_deoxys.o(.rodata); + sound/songs/midi/mus_vs_mewtwo.o(.rodata); + sound/songs/midi/mus_vs_legend.o(.rodata); + sound/songs/midi/mus_encounter_gym_leader.o(.rodata); + sound/songs/midi/mus_encounter_deoxys.o(.rodata); + sound/songs/midi/mus_trainer_tower.o(.rodata); + sound/songs/midi/mus_slow_pallet.o(.rodata); + sound/songs/midi/mus_teachy_tv_menu.o(.rodata); + } > ROM =0 + + lib_rodata : + SUBALIGN(4) + { + src/agb_flash.o(.rodata); + src/agb_flash_1m.o(.rodata); + src/agb_flash_mx.o(.rodata); + src/agb_flash_le.o(.rodata); + src/librfu_sio32id.o(.rodata); + src/isagbprn.o(.rodata); + *libgcc.a:_divdi3.o(.rodata); + *libgcc.a:_udivdi3.o(.rodata); + *libc.a:memcpy.o(.rodata); + *libc.a:memset.o(.rodata); + *libc.a:strcmp.o(.rodata); + *libc.a:strcpy.o(.rodata); + *libc.a:impure.o(.rodata); + *libc.a:vsprintf.o(.rodata); + *libc.a:vfprintf.o(.rodata); + *libc.a:wsetup.o(.rodata); + *libc.a:dtoa.o(.rodata); + *libc.a:fflush.o(.rodata); + *libc.a:findfp.o(.rodata); + *libc.a:freer.o(.rodata); + *libc.a:mtrim.o(.rodata); + *libc.a:fvwrite.o(.rodata); + *libc.a:fwalk.o(.rodata); + *libc.a:locale.o(.rodata); + *libc.a:makebuf.o(.rodata); + *libc.a:mallocr.o(.rodata); + *libc.a:mbtowc_r.o(.rodata); + *libc.a:memchr.o(.rodata); + *libc.a:memmove.o(.rodata); + *libc.a:mlock.o(.rodata); + *libc.a:mprec.o(.rodata); + *libc.a:s_isinf.o(.rodata); + *libc.a:s_isnan.o(.rodata); + *libc.a:sbrkr.o(.rodata); + *libc.a:stdio.o(.rodata); + *libc.a:strlen.o(.rodata); + *libc.a:syscalls.o(.rodata); + *libc.a:writer.o(.rodata); + *libc.a:callocr.o(.rodata); + *libc.a:closer.o(.rodata); + *libc.a:errno.o(.rodata); + *libc.a:fstatr.o(.rodata); + *libc.a:libcfunc.o(.rodata); + *libc.a:lseekr.o(.rodata); + *libc.a:readr.o(.rodata); + + . = ALIGN(4); + } > ROM =0 + + multiboot_data : + ALIGN(4) + { + data/multiboot_ereader.o(.rodata); + data/multiboot_berry_glitch_fix.o(.rodata); + data/multiboot_pokemon_colosseum.o(.rodata); + } > ROM =0 + + gfx_data 0x08D00000 : + ALIGN(4) + { + src/graphics.o(.rodata); + } > ROM =0 + + extra : + ALIGN(4) + { + src/*.o(.text); + src/*.o(.rodata); + data/*.o(.rodata); + } > ROM =0 + + + /* DWARF 2 sections */ + .debug_aranges 0 : { *(.debug_aranges) } + .debug_pubnames 0 : { *(.debug_pubnames) } + .debug_info 0 : { *(.debug_info) } + .debug_abbrev 0 : { *(.debug_abbrev) } + .debug_line 0 : { *(.debug_line) } + .debug_frame 0 : { *(.debug_frame) } + .debug_str 0 : { *(.debug_str) } + .debug_loc 0 : { *(.debug_loc) } + .debug_macinfo 0 : { *(.debug_macinfo) } + + /* Discard everything not specifically mentioned above. */ + /DISCARD/ : + { + *(*); + } +} diff --git a/leafgreen_switch.sha1 b/leafgreen_switch.sha1 new file mode 100644 index 000000000..2a857a694 --- /dev/null +++ b/leafgreen_switch.sha1 @@ -0,0 +1 @@ +62b9fc77549dbc67032eb6cbd0ea6ad3b825690f pokeleafgreen_switch.gba diff --git a/src/AgbRfu_LinkManager.c b/src/AgbRfu_LinkManager.c index 0f0501393..35317ab86 100644 --- a/src/AgbRfu_LinkManager.c +++ b/src/AgbRfu_LinkManager.c @@ -1,6 +1,7 @@ #include "global.h" #include "librfu.h" #include "AgbRfu_LinkManager.h" +#include "sloopsvc.h" #define RN_ACCEPT 0x01 #define RN_NAME_TIMER_CLEAR 0x02 @@ -176,6 +177,9 @@ u8 rfu_LMAN_establishConnection(u8 parent_child, u16 connect_period, u16 name_ac } lman.parent_child = parent_child; lman.connect_period = connect_period; +#if REVISION >= 0xA + lman.connect_period_initial = 0; +#endif lman.nameAcceptTimer.count_max = name_accept_period; lman.acceptable_serialNo_list = acceptable_serialNo_list; return 0; @@ -222,6 +226,9 @@ u8 rfu_LMAN_CHILD_connectParent(u16 parentId, u16 connect_period) } lman.work = parentId; lman.connect_period = connect_period; +#if REVISION >= 0xA + lman.connect_period_initial = 0; +#endif if (lman.pcswitch_flag != 0) { lman.pcswitch_flag = PCSWITCH_CP; @@ -560,6 +567,9 @@ static void rfu_LMAN_settingPCSWITCH(u32 rand) lman.parent_child = MODE_PARENT; lman.state = LMAN_STATE_START_SEARCH_CHILD; lman.connect_period = lman.pcswitch_period_bak; +#if REVISION >= 0xA + lman.connect_period_initial = 0; +#endif if (lman.connect_period) { lman.pcswitch_flag = PCSWITCH_3RD_SC; @@ -573,8 +583,14 @@ static void rfu_LMAN_settingPCSWITCH(u32 rand) { lman.parent_child = MODE_PARENT; lman.state = LMAN_STATE_START_SEARCH_CHILD; +#if REVISION >= 0xA + lman.connect_period = rand % 285; + lman.pcswitch_period_bak = 285 - lman.connect_period; + lman.connect_period_initial = 0; +#else lman.connect_period = rand % 140; lman.pcswitch_period_bak = 140 - lman.connect_period; +#endif if (lman.connect_period) { lman.pcswitch_flag = PCSWITCH_1ST_SC; @@ -588,6 +604,9 @@ static void rfu_LMAN_settingPCSWITCH(u32 rand) { lman.parent_child = MODE_CHILD; lman.connect_period = PCSWITCH_SP_PERIOD; +#if REVISION >= 0xA + lman.connect_period_initial = 0; +#endif lman.pcswitch_flag = PCSWITCH_2ND_SP; lman.state = LMAN_STATE_START_SEARCH_PARENT; } @@ -632,11 +651,27 @@ static void rfu_LMAN_REQ_callback(u16 reqCommandId, u16 reqResult) } break; case ID_SC_POLL_REQ: +#if REVISION >= 0xA + if (lman.connect_period) + { + if (svc_49() != 0 && lman.connect_period_initial < 300) + { + if (lman.connect_period > 1) lman.connect_period--; + else lman.connect_period_initial++; + } + else if (--lman.connect_period == 0) + { + lman.state = LMAN_STATE_END_SEARCH_CHILD; + lman.next_state = LMAN_STATE_WAIT_RECV_CHILD_NAME; + } + } +#else if (lman.connect_period && --lman.connect_period == 0) { lman.state = LMAN_STATE_END_SEARCH_CHILD; lman.next_state = LMAN_STATE_WAIT_RECV_CHILD_NAME; } +#endif break; case ID_SC_END_REQ: if (reqResult == 0) @@ -679,11 +714,27 @@ static void rfu_LMAN_REQ_callback(u16 reqCommandId, u16 reqResult) lman.fastSearchParent_flag = FSP_ON; } } +#if REVISION >= 0xA + if (lman.connect_period) + { + if (svc_4a() != 0 && lman.connect_period_initial < 300) + { + if (lman.connect_period > 1) lman.connect_period--; + else lman.connect_period_initial++; + } + else if (--lman.connect_period == 0) + { + lman.state = LMAN_STATE_END_SEARCH_PARENT; + lman.next_state = LMAN_STATE_READY; + } + } +#else if (lman.connect_period && --lman.connect_period == 0) { lman.state = LMAN_STATE_END_SEARCH_PARENT; lman.next_state = LMAN_STATE_READY; } +#endif break; case ID_SP_END_REQ: if (reqResult == 0) @@ -1302,15 +1353,30 @@ static void rfu_LMAN_setLMANCallback(void (*func)(u8, u8)) u8 rfu_LMAN_setLinkRecovery(u8 enable_flag, u16 recovery_period) { +#if REVISION >= 0xA + u16 imeNew = 0; +#endif u16 imeBak; +#if REVISION >= 0xA + + imeBak = REG_IME; + REG_IME = imeNew; + + lman.linkRecovery_enable = FALSE; + lman.linkRecoveryTimer.count_max = recovery_period; +#else + if (lman.linkRecovery_enable && enable_flag == 0 && lman.linkRecoveryTimer.active) { return LMAN_ERROR_NOW_LINK_RECOVERY; } + imeBak = REG_IME; REG_IME = 0; + lman.linkRecovery_enable = enable_flag; lman.linkRecoveryTimer.count_max = recovery_period; +#endif REG_IME = imeBak; return 0; } @@ -1367,7 +1433,11 @@ void rfu_LMAN_requestChangeAgbClockMaster(void) } } +#if REVISION >= 0xA +void rfu_LMAN_forceChangeSP(bool8 child) +#else void rfu_LMAN_forceChangeSP(void) +#endif { if (lman.pcswitch_flag) { @@ -1387,10 +1457,22 @@ void rfu_LMAN_forceChangeSP(void) break; case LMAN_STATE_START_SEARCH_PARENT: case LMAN_STATE_POLL_SEARCH_PARENT: +#if REVISION >= 0xA + if (!child) break; +#endif lman.connect_period = PCSWITCH_SP_PERIOD; +#if REVISION >= 0xA + lman.connect_period_initial = 0; +#endif break; case LMAN_STATE_END_SEARCH_PARENT: +#if REVISION >= 0xA + if (!child) break; +#endif lman.connect_period = PCSWITCH_SP_PERIOD; +#if REVISION >= 0xA + lman.connect_period_initial = 0; +#endif lman.state = LMAN_STATE_POLL_SEARCH_PARENT; break; } diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index 1422fa13b..d8e1fe71e 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -819,10 +819,16 @@ static void SetLinkBattleEndCallbacks(void) void SetBattleEndCallbacks(void) { +#if REVISION >= 0xA +#else if (!gPaletteFade.active) +#endif { if (gBattleTypeFlags & BATTLE_TYPE_LINK) { +#if REVISION >= 0xA + if (!IsLinkTaskFinished() || gPaletteFade.active) return; +#endif if (gWirelessCommType == 0) SetCloseLinkCallback(); else diff --git a/src/battle_main.c b/src/battle_main.c index 4c3e927a0..64c9e59b7 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -1160,7 +1160,11 @@ static void CB2_PreInitMultiBattle(void) } break; case 2: +#if REVISION >= 0xA + if (IsLinkTaskFinished() && !gPaletteFade.active) +#else if (!gPaletteFade.active) +#endif { gBattleCommunication[MULTIUSE_STATE]++; if (gWirelessCommType) @@ -3923,8 +3927,8 @@ static void ReturnFromBattleToOverworld(void) if (gBattleTypeFlags & BATTLE_TYPE_ROAMER) { UpdateRoamerHPStatus(&gEnemyParty[0]); -#ifdef BUGFIX - if ((gBattleOutcome == B_OUTCOME_WON) || gBattleOutcome == B_OUTCOME_CAUGHT) +#if defined(BUGFIX) || REVISION >= 0xA + if ((gBattleOutcome == B_OUTCOME_WON) || gBattleOutcome == B_OUTCOME_CAUGHT || gBattleOutcome == B_OUTCOME_DREW) #else if ((gBattleOutcome & B_OUTCOME_WON) || gBattleOutcome == B_OUTCOME_CAUGHT) // Bug: When Roar is used by roamer, gBattleOutcome is B_OUTCOME_PLAYER_TELEPORTED (5). #endif // & with B_OUTCOME_WON (1) will return TRUE and deactivates the roamer. diff --git a/src/battle_message.c b/src/battle_message.c index 07c136029..aabbbcb9a 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -1789,10 +1789,17 @@ static const u8 *TryGetStatusString(u8 *src) u8 *statusPtr; statusPtr = status; +#if REVISION >= 0xA + for (i = 0; i < 8 && *src != EOS; i++) +#else for (i = 0; i < 8; i++) +#endif { +#if REVISION >= 0xA +#else if (*src == EOS) break; +#endif *statusPtr = *src; src++; statusPtr++; diff --git a/src/cable_club.c b/src/cable_club.c index 23c9b940a..d2f61cdcf 100644 --- a/src/cable_club.c +++ b/src/cable_club.c @@ -718,6 +718,9 @@ static void Task_StartWirelessCableClubBattle(u8 taskId) tState = 5; break; case 5: +#if REVISION >= 0xA + if (!IsLinkTaskFinished()) break; +#endif SetLinkStandbyCallback(); tState = 6; break; @@ -920,6 +923,9 @@ static void Task_StartWirelessTrade(u8 taskId) tState++; break; case 2: +#if REVISION >= 0xA + if (!IsLinkTaskFinished()) break; +#endif gSelectedTradeMonPositions[TRADE_PLAYER] = 0; gSelectedTradeMonPositions[TRADE_PARTNER] = 0; m4aMPlayAllStop(); @@ -996,7 +1002,11 @@ bool32 GetSeeingLinkPlayerCardMsg(u8 linkPlayerIndex) void Task_WaitForLinkPlayerConnection(u8 taskId) { struct Task *task = &gTasks[taskId]; +#if REVISION >= 0xA + if (++task->tTimer > 480) +#else if (++task->tTimer > 300) +#endif { CloseLink(); SetMainCallback2(CB2_LinkError); diff --git a/src/event_object_movement.c b/src/event_object_movement.c index d2bffe5ec..8110c247a 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -1495,10 +1495,18 @@ static bool8 GetAvailableObjectEventId(u16 localId, u8 mapNum, u8 mapGroup, u8 * { u8 i = 0; +#if REVISION >= 0xA + for (i = 0; i < OBJECT_EVENTS_COUNT && gObjectEvents[i].active; i++) +#else for (i = 0; i < OBJECT_EVENTS_COUNT; i++) +#endif { + +#if REVISION >= 0xA +#else if (!gObjectEvents[i].active) break; +#endif if (gObjectEvents[i].localId == localId && gObjectEvents[i].mapNum == mapNum && gObjectEvents[i].mapGroup == mapGroup) return TRUE; } diff --git a/src/field_fadetransition.c b/src/field_fadetransition.c index 4b0b40bcc..f392a06d5 100644 --- a/src/field_fadetransition.c +++ b/src/field_fadetransition.c @@ -207,6 +207,9 @@ static void Task_ReturnToFieldRecordMixing(u8 taskId) switch (task->data[0]) { case 0: +#if REVISION >= 0xA + if (!IsLinkTaskFinished()) break; +#endif SetLinkStandbyCallback(); task->data[0]++; break; diff --git a/src/fldeff_poison.c b/src/fldeff_poison.c index 1e609caf4..f43a9eb77 100644 --- a/src/fldeff_poison.c +++ b/src/fldeff_poison.c @@ -10,7 +10,11 @@ static void Task_FieldPoisonEffect(u8 taskId) switch (data[0]) { case 0: +#if REVISION >= 0xA + data[1] += 2; +#else data[1] += 1; +#endif if (data[1] > 4) data[0]++; break; diff --git a/src/intro.c b/src/intro.c index 3d0caef72..bec0f3144 100644 --- a/src/intro.c +++ b/src/intro.c @@ -922,7 +922,12 @@ static bool8 SetUpCopyrightScreen(void) SetGpuReg(REG_OFFSET_BLDCNT, 0); SetGpuReg(REG_OFFSET_BLDALPHA, 0); SetGpuReg(REG_OFFSET_BLDY, 0); +// "Fade from white" instead is just pure black in Revision 10. +#if REVISION >= 0xA + ((vu16*)PLTT)[0] = RGB_BLACK; +#else ((vu16*)PLTT)[0] = RGB_WHITE; +#endif SetGpuReg(REG_OFFSET_DISPCNT, 0); SetGpuReg(REG_OFFSET_BG0HOFS, 0); SetGpuReg(REG_OFFSET_BG0VOFS, 0); @@ -935,7 +940,11 @@ static bool8 SetUpCopyrightScreen(void) ResetTasks(); ResetSpriteData(); FreeAllSpritePalettes(); +#if REVISION >= 0xA + BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK); +#else BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_WHITEALPHA); +#endif SetGpuReg(REG_OFFSET_BG0CNT, BGCNT_PRIORITY(0) | BGCNT_CHARBASE(0) | BGCNT_16COLOR | BGCNT_SCREENBASE(7)); EnableInterrupts(INTR_FLAG_VBLANK); SetVBlankCallback(VBlankCB_Copyright); diff --git a/src/isagbprn.c b/src/isagbprn.c index a038814e7..5890e764f 100644 --- a/src/isagbprn.c +++ b/src/isagbprn.c @@ -31,7 +31,8 @@ struct AGBPrintStruct typedef void (*LPFN_PRINT_FLUSH)(void); -#ifndef NDEBUG +// Revision 10 still has this code present, despite only the init function ever being used. +#if !defined(NDEBUG) || REVISION >= 0xA // AGBPrint print functions #if (LOG_HANDLER == LOG_HANDLER_AGB_PRINT) diff --git a/src/librfu_rfu.c b/src/librfu_rfu.c index 0bfa13abb..909903eca 100644 --- a/src/librfu_rfu.c +++ b/src/librfu_rfu.c @@ -1,5 +1,6 @@ #include #include "librfu.h" +#include "sloopsvc.h" struct LLSFStruct { @@ -381,6 +382,9 @@ void rfu_REQ_stopMode(void) REG_SIOCNT = SIO_MULTI_MODE; rfu_STC_REQ_callback(ID_STOP_MODE_REQ, 0); } +#if REVISION >= 0xA + svc_44(); +#endif } } @@ -461,6 +465,9 @@ void rfu_REQ_configGameData(u8 mbootFlag, u16 serialNo, const u8 *gname, const u packet[14] = 0; STWI_set_Callback_M(rfu_CB_configGameData); STWI_send_GameConfigREQ(packet, uname); +#if REVISION >= 0xA + svc_47(); +#endif } static void rfu_CB_configGameData(u8 reqCommand, u16 reqResult) @@ -519,6 +526,9 @@ void rfu_REQ_startSearchChild(void) } STWI_set_Callback_M(rfu_CB_startSearchChild); STWI_send_SC_StartREQ(); +#if REVISION >= 0xA + svc_42(); +#endif } static void rfu_CB_startSearchChild(u8 reqCommand, u16 reqResult) @@ -630,7 +640,11 @@ static void rfu_STC_readChildList(void) gRfuStatic->cidBak[bm_slot_id] = gRfuLinkStatus->partner[bm_slot_id].id; } #else +#if REVISION >= 0xA + gRfuStatic->lsFixedCount[bm_slot_id] = 0x3C; +#else gRfuStatic->lsFixedCount[bm_slot_id] = 0xF0; +#endif gRfuLinkStatus->strength[bm_slot_id] = 16; gRfuLinkStatus->connSlotFlag |= 1 << bm_slot_id; ++gRfuLinkStatus->connCount; @@ -649,6 +663,9 @@ void rfu_REQ_startSearchParent(void) { STWI_set_Callback_M(rfu_CB_startSearchParent); STWI_send_SP_StartREQ(); +#if REVISION >= 0xA + svc_45_rfu_link_status(); +#endif } static void rfu_CB_startSearchParent(u8 reqCommand, u16 reqResult) @@ -703,8 +720,13 @@ static void rfu_STC_readParentCandidateList(void) } if (my_check_sum == check_sum) { +#if REVISION >= 0xA + target = &gRfuLinkStatus->partner[gRfuLinkStatus->findParentCount]; + packet_p -= 28; +#else packet_p -= 28; target = &gRfuLinkStatus->partner[gRfuLinkStatus->findParentCount]; +#endif target->id = *(u16 *)packet_p; packet_p += 2; target->slot = *packet_p; @@ -723,6 +745,9 @@ static void rfu_STC_readParentCandidateList(void) ++gRfuLinkStatus->findParentCount; } } +#if REVISION >= 0xA + svc_45_rfu_link_status(); +#endif } void rfu_REQ_startConnectParent(u16 pid) @@ -738,6 +763,9 @@ void rfu_REQ_startConnectParent(u16 pid) gRfuStatic->tryPid = pid; STWI_set_Callback_M(rfu_STC_REQ_callback); STWI_send_CP_StartREQ(pid); +#if REVISION >= 0xA + svc_43(pid); +#endif } else { @@ -756,7 +784,11 @@ static void rfu_CB_pollConnectParent(u8 reqCommand, u16 reqResult) u16 id; u8 slot; u8 bm_slot_flag, i; +#if REVISION >= 0xA + struct RfuTgtData *target_p = NULL; +#else struct RfuTgtData *target_p; +#endif struct RfuTgtData target_local; if (reqResult == 0) @@ -1392,7 +1424,11 @@ static u16 rfu_STC_setSendData_org(u8 ni_or_uni, u8 bmSendSlot, u8 subFrameSize, { u8 bm_slot_id, sendSlotFlag; u8 frameSize; +#if REVISION >= 0xA + u8 *llFrameSize_p = NULL; +#else u8 *llFrameSize_p; +#endif u8 sending; u8 i; u16 imeBak; diff --git a/src/link.c b/src/link.c index 959264a40..84506bf0e 100644 --- a/src/link.c +++ b/src/link.c @@ -24,6 +24,7 @@ #include "reset_save_heap.h" #include "constants/battle.h" #include "constants/songs.h" +#include "sloopsvc.h" extern u16 gHeldKeyCodeToSend; @@ -67,7 +68,10 @@ COMMON_DATA u32 gLinkDebugSeed = 0; COMMON_DATA struct LinkPlayerBlock gLocalLinkPlayerBlock = {0}; COMMON_DATA bool8 gLinkErrorOccurred = 0; COMMON_DATA u32 gLinkDebugFlags = 0; +#if REVISION >= 0xA +#else COMMON_DATA u32 gLinkFiller1 = 0; +#endif COMMON_DATA bool8 gRemoteLinkPlayersNotReceived[MAX_LINK_PLAYERS] = {0}; COMMON_DATA u8 gBlockReceivedStatus[MAX_LINK_PLAYERS] = {0}; COMMON_DATA u32 gLinkFiller2 = 0; @@ -85,14 +89,21 @@ COMMON_DATA u8 gSavedLinkPlayerCount = 0; COMMON_DATA u16 gSendCmd[CMD_LENGTH] = {0}; COMMON_DATA u8 gSavedMultiplayerId = 0; COMMON_DATA bool8 gReceivedRemoteLinkPlayers = 0; +#if REVISION >= 0xA +// all references to this are gone anyway +#else COMMON_DATA struct LinkTestBGInfo gLinkTestBGInfo = {0}; +#endif COMMON_DATA void (*gLinkCallback)(void) = NULL; COMMON_DATA u8 gShouldAdvanceLinkState = 0; COMMON_DATA u16 gLinkTestBlockChecksums[MAX_LINK_PLAYERS] = {0}; COMMON_DATA u8 gBlockRequestType = 0; COMMON_DATA u32 gLinkFiller3 = 0; // file +#if REVISION >= 0xA +#else COMMON_DATA u32 gLinkFiller4 = 0; // boundary COMMON_DATA u32 gLinkFiller5 = 0; // here? +#endif COMMON_DATA u8 gLastSendQueueCount = 0; COMMON_DATA struct Link gLink = {0}; COMMON_DATA u8 gLastRecvQueueCount = 0; @@ -118,6 +129,9 @@ EWRAM_DATA struct { static EWRAM_DATA u16 sReadyCloseLinkAttempts = 0; // never read static EWRAM_DATA void *sLinkErrorBgTilemapBuffer = NULL; +void Task_WirelessCommunicationScreen(u8 taskId); +void Task_MysteryGift(u8 taskId); + static void InitLocalLinkPlayer(void); static void VBlankCB_LinkError(void); static void CB2_LinkTest(void); @@ -131,7 +145,6 @@ static void LinkCB_BlockSendEnd(void); static void SetBerryBlenderLinkCallback(void); static void SetBlockReceivedFlag(u8 id); static u16 LinkTestCalcBlockChecksum(const u16 *src, u16 size); -static void LinkTest_PrintHex(u32 pos, u8 a0, u8 a1, u8 a2); static void LinkCB_RequestPlayerDataExchange(void); static void Task_PrintTestData(u8 taskId); static void LinkCB_ReadyCloseLink(void); @@ -155,11 +168,19 @@ static void DoSend(void); static void StopTimer(void); static void SendRecvDone(void); +#if REVISION >= 0xA +#else +static void LinkTest_PrintHex(u32 pos, u8 a0, u8 a1, u8 a2); +#endif + static const u16 sWirelessLinkDisplayPal[] = INCBIN_U16("graphics/link/wireless_display.gbapal"); static const u16 sWirelessLinkDisplayGfx[] = INCBIN_U16("graphics/link/wireless_display.4bpp.lz"); static const u16 sWirelessLinkDisplayTilemap[] = INCBIN_U16("graphics/link/wireless_display.bin.lz"); +#if REVISION >= 0xA +#else static const u16 sLinkTestFontPal[] = INCBIN_U16("graphics/link/test_font.gbapal"); static const u16 sLinkTestFontGfx[] = INCBIN_U16("graphics/link/test_font.4bpp"); +#endif static const struct BlockRequest sBlockRequests[] = { [BLOCK_REQ_SIZE_NONE] = { gBlockSendBuffer, 200 }, @@ -169,7 +190,11 @@ static const struct BlockRequest sBlockRequests[] = { [BLOCK_REQ_SIZE_40] = { gBlockSendBuffer, 40 } }; static const char sASCIIGameFreakInc[] = "GameFreak inc."; + +#if REVISION >= 0xA +#else static const char sASCIITestPrint[] = "TEST PRINT\nP0\nP1\nP2\nP3"; +#endif static const struct BgTemplate sLinkErrorBgTemplates[] = { { @@ -240,6 +265,9 @@ void Task_DestroySelf(u8 taskId) DestroyTask(taskId); } +#if REVISION >= 0xA +// Gone in this rev. +#else void InitLinkTestBG(u8 paletteNum, u8 bgNum, u8 screenBaseBlock, u8 charBaseBlock, u16 baseChar) { LoadPalette(sLinkTestFontPal, BG_PLTT_ID(paletteNum), PLTT_SIZE_4BPP); @@ -273,6 +301,7 @@ static void LoadLinkTestBgGfx(u8 paletteNum, u8 bgNum, u8 screenBaseBlock, u8 ch gLinkTestBGInfo.baseChar = 0; SetGpuReg(gBGControlRegOffsets[bgNum], BGCNT_SCREENBASE(screenBaseBlock) | BGCNT_CHARBASE(charBaseBlock)); } +#endif // Unused static void LinkTestScreen(void) @@ -290,7 +319,10 @@ static void LinkTestScreen(void) for (i = 0; i < TRAINER_ID_LENGTH; i++) gSaveBlock2Ptr->playerTrainerId[i] = Random() % 256; +#if REVISION >= 0xA +#else InitLinkTestBG(0, 2, 4, 0, 0); +#endif SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG0_ON | DISPCNT_BG2_ON | DISPCNT_OBJ_ON); CreateTask(Task_DestroySelf, 0); RunTasks(); @@ -400,14 +432,20 @@ static void TestBlockTransfer(u8 unused0, u8 unused1, u8 unused2) if (sLinkTestLastBlockSendPos != sBlockSend.pos) { +#if REVISION >= 0xA +#else LinkTest_PrintHex(sBlockSend.pos, 2, 3, 2); +#endif sLinkTestLastBlockSendPos = sBlockSend.pos; } for (i = 0; i < MAX_LINK_PLAYERS; i++) { if (sLinkTestLastBlockRecvPos[i] != sBlockRecv[i].pos) { +#if REVISION >= 0xA +#else LinkTest_PrintHex(sBlockRecv[i].pos, 2, i + 4, 2); +#endif sLinkTestLastBlockRecvPos[i] = sBlockRecv[i].pos; } } @@ -450,8 +488,11 @@ static void LinkTestProcessKeyInput(void) if (JOY_NEW(SELECT_BUTTON)) SetCloseLinkCallback(); +#if REVISION >= 0xA +#else if (sLinkTestDebugValuesEnabled) SetLinkDebugValues(gMain.vblankCounter2, gLinkCallback ? gLinkVSyncDisabled : gLinkVSyncDisabled | 0x10); +#endif } static void CB2_LinkTest(void) @@ -1025,6 +1066,8 @@ static u16 LinkTestCalcBlockChecksum(const u16 *src, u16 size) return checksum; } +#if REVISION >= 0xA +#else static void LinkTest_PrintNumChar(char val, u8 x, u8 y) { u16 *vAddr; @@ -1080,6 +1123,7 @@ static void LinkTest_PrintString(const char *str, u8 x, u8 y) } } } +#endif static void LinkCB_RequestPlayerDataExchange(void) { @@ -1091,6 +1135,9 @@ static void LinkCB_RequestPlayerDataExchange(void) static void Task_PrintTestData(u8 taskId) { +#if REVISION >= 0xA + // This function performs no operation in this revision. +#else char testTitle[32]; int i; @@ -1113,13 +1160,17 @@ static void Task_PrintTestData(u8 taskId) for (i = 0; i < MAX_LINK_PLAYERS; i++) LinkTest_PrintHex(gLinkTestBlockChecksums[i], 10, 4 + i, 4); +#endif } +#if REVISION >= 0xA +#else void SetLinkDebugValues(u32 seed, u32 flags) { gLinkDebugSeed = seed; gLinkDebugFlags = flags; } +#endif u8 GetSavedLinkPlayerCountAsBitFlags(void) { @@ -1374,6 +1425,9 @@ void CB2_LinkError(void) { u8 *tilemapBuffer; +#if REVISION >= 0xA + ClearFieldCallback(); +#endif SetGpuReg(REG_OFFSET_DISPCNT, 0); m4aMPlayStop(&gMPlayInfo_SE1); m4aMPlayStop(&gMPlayInfo_SE2); @@ -1387,8 +1441,11 @@ void CB2_LinkError(void) ScanlineEffect_Stop(); if (gWirelessCommType) { +#if REVISION >= 0xA +#else if (!sLinkErrorBuffer.disconnected) gWirelessCommType = 3; +#endif ResetLinkRfuGFLayer(); } @@ -1457,7 +1514,15 @@ static void CB2_PrintErrorMessage(void) case 0: // Below is only true for the RFU, so the other error // type is inferred to be from a wired connection +#if REVISION >= 0xA + svc_IncrementLinkError(); +#endif + +#if REVISION >= 0xA + if (sLinkErrorBuffer.disconnected || gWirelessCommType != 0) +#else if (sLinkErrorBuffer.disconnected) +#endif ErrorMsg_MoveCloserToPartner(); else ErrorMsg_CheckConnections(); @@ -1472,7 +1537,11 @@ static void CB2_PrintErrorMessage(void) PlaySE(SE_BOO); break; case 130: +#if REVISION >= 0xA + if (gWirelessCommType == 2 || gWirelessCommType == 3) +#else if (gWirelessCommType == 2) +#endif AddTextPrinterParameterized3(0, FONT_NORMAL_COPY_2, 2, 20, sLinkErrorTextColor, 0, gText_ABtnTitleScreen); else if (gWirelessCommType == 1) AddTextPrinterParameterized3(0, FONT_NORMAL_COPY_2, 2, 20, sLinkErrorTextColor, 0, gText_ABtnRegistrationCounter); @@ -1491,7 +1560,11 @@ static void CB2_PrintErrorMessage(void) ReloadSave(); } } +#if REVISION >= 0xA + else if (gWirelessCommType == 2 || gWirelessCommType == 3) +#else else if (gWirelessCommType == 2) +#endif { if (JOY_NEW(A_BUTTON)) { @@ -1576,8 +1649,33 @@ bool8 HandleLinkConnection(void) } else { +#if REVISION >= 0xA + bool32 reloadOrReset = FALSE; + if (svc_51()) + { +// Documentation issue: +// Rfu_IsMaster supposedly returns bool8, but just returns gRfu.ParentChild +// That value has three states, see librfu.h. One of those states is MODE_NEUTRAL (0xFF) which means init. +// So the last condition basically means "rfu link status is connected, not initialising". +// As in, it's true if value is MODE_CHILD or MODE_PARENT but not MODE_NEUTRAL (because unsigned cmp). + if (!FuncIsActiveTask(Task_WirelessCommunicationScreen) && (InUnionRoom() || gReceivedRemoteLinkPlayers != 0 || Rfu_IsMaster() <= MODE_PARENT)) + { + reloadOrReset = TRUE; + } + CloseLink(); + } +#endif main1Failed = RfuMain1(); // Always returns FALSE main2Failed = RfuMain2(); +#if REVISION >= 0xA + if (reloadOrReset) + { + // If active task is mystery gift then soft reset, otherwise reload the save. + if (FuncIsActiveTask(Task_MysteryGift)) RfuSoftReset(); + else RfuReloadSave(); + } + else +#endif if (IsSendingKeysOverCable() == TRUE) { // This will never be reached. diff --git a/src/link_rfu_2.c b/src/link_rfu_2.c index 2a58279c0..78087d76f 100644 --- a/src/link_rfu_2.c +++ b/src/link_rfu_2.c @@ -11,6 +11,12 @@ #include "task.h" #include "constants/union_room.h" +#include "sloopsvc.h" +#include "help_system.h" +#include "reset_save_heap.h" +#include "m4a.h" +#include "gba/m4a_internal.h" + enum { RFUSTATE_INIT, RFUSTATE_INIT_END, @@ -71,14 +77,25 @@ struct RfuDebug static EWRAM_DATA INIT_PARAM sRfuReqConfig = {}; static EWRAM_DATA struct RfuDebug sRfuDebug = {}; +#if REVISION >= 0xA +#else static u32 sRfuAPIBuffer[RFU_API_BUFF_SIZE_RAM / 4]; +#endif static u8 sResendBlock8[CMD_LENGTH * 2]; static u16 sResendBlock16[CMD_LENGTH]; +#if REVISION >= 0xA +COMMON_DATA u32 sRfuAPIBuffer[RFU_API_BUFF_SIZE_RAM / 4] = {0}; +#endif COMMON_DATA struct RfuGameData gHostRfuGameData = {0}; COMMON_DATA struct RfuManager gRfu = {0}; COMMON_DATA u8 gHostRfuUsername[PLAYER_NAME_LENGTH + 1] = {0}; +#if REVISION >= 0xA +u16 ReadU16(const void* ptr); +#else +static u16 ReadU16(const void *ptr); +#endif static void InitChildRecvBuffers(void); static void InitParentSendData(void); static void MscCallback_Child(u16 REQ_commandID); @@ -92,7 +109,6 @@ static void SendNextBlock(void); static void SendLastBlock(void); static void CallRfuFunc(void); static void UpdateChildStatuses(void); -static s32 GetJoinGroupStatus(void); static void Task_PlayerExchange(u8 taskId); static void ClearSelectedLinkPlayerIds(u16 disconnectMask); static void ValidateAndReceivePokemonSioInfo(void *recvBuffer); @@ -118,8 +134,13 @@ static const INIT_PARAM sRfuReqConfigTemplate = { .userName = gHostRfuUsername, .fastSearchParent_flag = TRUE, .linkRecovery_enable = FALSE, +#if REVISION >= 0xA + .linkRecovery_period = 720, + .NI_failCounter_limit = 480 +#else .linkRecovery_period = 600, .NI_failCounter_limit = 300 +#endif }; static const u8 sAvailSlots[] = { @@ -317,7 +338,11 @@ static void Task_ParentSearchForChildren(u8 taskId) case RFUSTATE_INIT_END: break; case RFUSTATE_PARENT_CONNECT: +#if REVISION >= 0xA + rfu_LMAN_establishConnection(gRfu.parentChild, 0, 360, (u16 *)sAcceptedSerialNos); +#else rfu_LMAN_establishConnection(gRfu.parentChild, 0, 240, (u16 *)sAcceptedSerialNos); +#endif gRfu.state = RFUSTATE_PARENT_CONNECT_END; gTasks[taskId].data[1] = 6; break; @@ -404,7 +429,11 @@ static void Task_ChildSearchForParent(u8 taskId) case RFUSTATE_INIT_END: break; case RFUSTATE_CHILD_CONNECT: +#if REVISION >= 0xA + rfu_LMAN_establishConnection(gRfu.parentChild, 0, 360, (u16 *)sAcceptedSerialNos); +#else rfu_LMAN_establishConnection(gRfu.parentChild, 0, 240, (u16 *)sAcceptedSerialNos); +#endif gRfu.state = RFUSTATE_CHILD_CONNECT_END; gTasks[taskId].data[1] = 7; break; @@ -491,7 +520,11 @@ static void Task_UnionRoomListen(u8 taskId) case RFUSTATE_INIT_END: break; case RFUSTATE_UR_CONNECT: +#if REVISION >= 0xA + rfu_LMAN_establishConnection(MODE_P_C_SWITCH, 0, 360, (u16 *)sAcceptedSerialNos); +#else rfu_LMAN_establishConnection(MODE_P_C_SWITCH, 0, 240, (u16 *)sAcceptedSerialNos); +#endif rfu_LMAN_setMSCCallback(MscCallback_Child); gRfu.state = RFUSTATE_UR_CONNECT_END; break; @@ -532,7 +565,11 @@ static void Task_UnionRoomListen(u8 taskId) void LinkRfu_CreateConnectionAsParent(void) { +#if REVISION >= 0xA + rfu_LMAN_establishConnection(MODE_PARENT, 0, 360, (u16 *)sAcceptedSerialNos); +#else rfu_LMAN_establishConnection(MODE_PARENT, 0, 240, (u16 *)sAcceptedSerialNos); +#endif } void LinkRfu_StopManagerBeforeEnteringChat(void) @@ -540,6 +577,14 @@ void LinkRfu_StopManagerBeforeEnteringChat(void) rfu_LMAN_stopManager(FALSE); } +#if REVISION >= 0xA +void LinkRfu_ForceChangeSpParent(void) +{ + if (gRfu.parentId != 0) return; + rfu_LMAN_forceChangeSP(FALSE); +} +#endif + // Argument is provided by the RFU and is unused. static void MscCallback_Child(u16 REQ_commandID) { @@ -576,6 +621,9 @@ void LinkRfu_Shutdown(void) return; rfu_LMAN_powerDownRFU(); +#if REVISION >= 0xA + svc_44(); +#endif if (gRfu.parentChild == MODE_PARENT) { // Stop parent searching for children @@ -629,7 +677,11 @@ static bool8 CanTryReconnectParent(void) static bool32 TryReconnectParent(void) { +#if REVISION >= 0xA + if (gRfu.state == RFUSTATE_CHILD_CONNECT_END && !rfu_LMAN_CHILD_connectParent(gRfuLinkStatus->partner[gRfu.reconnectParentId].id, 360)) +#else if (gRfu.state == RFUSTATE_CHILD_CONNECT_END && !rfu_LMAN_CHILD_connectParent(gRfuLinkStatus->partner[gRfu.reconnectParentId].id, 240)) +#endif { gRfu.state = RFUSTATE_RECONNECTED; return TRUE; @@ -823,14 +875,25 @@ static bool32 RfuMain2_Parent(void) { if (gRfu.childRecvBuffer[i][1]) { +#if REVISION >= 0xA + u8* childRecvBuffer = gRfu.childRecvBuffer[i]; + u8 newChildRecvId = childRecvBuffer[0] / 32; + u8* oldChildRecvId = &gRfu.childRecvIds[i]; + if (*oldChildRecvId != 0xFF && newChildRecvId != ((*oldChildRecvId + 1) & 7)) +#else if (gRfu.childRecvIds[i] != 0xFF && (gRfu.childRecvBuffer[i][0] >> 5) != ((gRfu.childRecvIds[i] + 1) & 7)) +#endif { if (++gRfu.numChildRecvErrors[i] > 4) RfuSetErrorParams(F_RFU_ERROR_8 | F_RFU_ERROR_1); } else { +#if REVISION >= 0xA + gRfu.childRecvIds[i] = newChildRecvId; +#else gRfu.childRecvIds[i] = gRfu.childRecvBuffer[i][0] / 32; +#endif gRfu.numChildRecvErrors[i] = 0; gRfu.childRecvBuffer[i][0] &= 0x1f; r0 = gRfu.linkPlayerIdx[i]; @@ -1386,6 +1449,9 @@ static void TryDisconnectRfu(void) { rfu_LMAN_requestChangeAgbClockMaster(); gRfu.disconnectMode = RFU_DISCONNECT_NORMAL; +#if REVISION >= 0xA + svc_44(); +#endif } else gRfu.callback = DisconnectRfu; @@ -1396,6 +1462,9 @@ void LinkRfu_FatalError(void) rfu_LMAN_requestChangeAgbClockMaster(); gRfu.disconnectMode = RFU_DISCONNECT_ERROR; gRfu.disconnectSlots = gRfuLinkStatus->connSlotFlag | gRfuLinkStatus->linkLossSlotFlag; +#if REVISION >= 0xA + svc_44(); +#endif } // RFU equivalent of LinkCB_WaitCloseLink @@ -1547,7 +1616,11 @@ u8 Rfu_SetLinkRecovery(bool32 enable) { if (!enable) return rfu_LMAN_setLinkRecovery(FALSE, 0); +#if REVISION >= 0xA + rfu_LMAN_setLinkRecovery(TRUE, 720); +#else rfu_LMAN_setLinkRecovery(TRUE, 600); +#endif return 0; } @@ -1586,8 +1659,11 @@ static bool8 CheckForLeavingGroupMembers(void) bool8 memberLeft = FALSE; for (i = 0; i < RFU_CHILD_MAX; i++) { +#if REVISION >= 0xA +#else if (gRfu.partnerSendStatuses[i] < RFU_STATUS_JOIN_GROUP_OK || gRfu.partnerSendStatuses[i] > RFU_STATUS_JOIN_GROUP_NO) +#endif { if (gRfuSlotStatusNI[i]->recv.state == SLOT_STATE_RECV_SUCCESS || gRfuSlotStatusNI[i]->recv.state == SLOT_STATE_RECV_SUCCESS_AND_SENDSIDE_UNKNOWN) @@ -1596,7 +1672,11 @@ static bool8 CheckForLeavingGroupMembers(void) { gRfu.partnerSendStatuses[i] = RFU_STATUS_LEAVE_GROUP; gRfu.partnerRecvStatuses[i] = RFU_STATUS_CHILD_LEAVE_READY; +#if REVISION >= 0xA + rfu_clearSlot(TYPE_NI_SEND | TYPE_NI_RECV, i); +#else rfu_clearSlot(TYPE_NI_RECV, i); +#endif rfu_NI_setSendData(1 << i, 8, &gRfu.partnerSendStatuses[i], 1); memberLeft = TRUE; } @@ -1624,6 +1704,12 @@ bool32 RfuTryDisconnectLeavingChildren(void) childrenLeaving |= (1 << i); gRfu.partnerRecvStatuses[i] = RFU_STATUS_OK; } +#if REVISION >= 0xA + if (((gRfuLinkStatus->connSlotFlag >> i) & 1) == 0) + { + gRfu.partnerRecvStatuses[i] = RFU_STATUS_OK; + } +#endif } // Disconnect any leaving children @@ -1665,6 +1751,9 @@ void SendLeaveGroupNotice(void) { gRfu.sendStatus = RFU_STATUS_LEAVE_GROUP_NOTICE; rfu_clearSlot(TYPE_NI_SEND, gRfu.childSlot); +#if REVISION >= 0xA + gRfuLinkStatus->remainLLFrameSizeChild[gRfu.childSlot] = 16; +#endif rfu_NI_setSendData(1 << gRfu.childSlot, 8, &gRfu.sendStatus, 1); } @@ -1695,7 +1784,7 @@ static void UpdateChildStatuses(void) } } -static s32 GetJoinGroupStatus(void) +s32 GetJoinGroupStatus(void) { s32 status = RFU_STATUS_OK; if (gRfu.sendStatus == RFU_STATUS_LEAVE_GROUP_NOTICE) @@ -1789,7 +1878,11 @@ static void Task_PlayerExchange(u8 taskId) DestroyTask(taskId); gReceivedRemoteLinkPlayers = TRUE; gRfu.playerExchangeActive = FALSE; +#if REVISION >= 0xA + rfu_LMAN_setLinkRecovery(1, 720); +#else rfu_LMAN_setLinkRecovery(1, 600); +#endif if (gRfu.newChildQueue) { for (i = 0; i < RFU_CHILD_MAX; i++) @@ -2017,6 +2110,12 @@ bool32 RfuMain1(void) { bool32 retval = FALSE; gRfu.parentId = 0; +#if REVISION >= 0xA + if ((svc_4b() & SVC4B_RESEED_RNG) != 0) + { + SeedRng(ReadU16( & GetHostRfuGameData()->compatibility.playerTrainerId )); + } +#endif rfu_LMAN_manager_entity(Random()); if (!gRfu.isShuttingDown) { @@ -2510,6 +2609,13 @@ u8 RfuGetStatus(void) return gRfu.status; } +#if REVISION >= 0xA +u16 RfuGetErrorInfo(void) +{ + return gRfu.errorInfo; +} +#endif + bool32 RfuHasErrored(void) { u32 status = RfuGetStatus(); @@ -2627,15 +2733,23 @@ void InitializeRfuLinkManager_EnterUnionRoom(void) rfu_LMAN_initializeManager(LinkManagerCB_UnionRoom, NULL); sRfuReqConfig = sRfuReqConfigTemplate; sRfuReqConfig.linkRecovery_enable = 0; +#if REVISION >= 0xA + sRfuReqConfig.linkRecovery_period = 720; +#else sRfuReqConfig.linkRecovery_period = 600; +#endif gRfu.searchTaskId = CreateTask(Task_UnionRoomListen, 1); } +#if REVISION >= 0xA +// (what used to be) ReadAsU16 from union_room.c is used instead. +#else static u16 ReadU16(const void *ptr) { const u8 *ptr_ = ptr; return (ptr_[1] << 8) | (ptr_[0]); } +#endif /* * ================================================================ @@ -2775,7 +2889,11 @@ static void Task_RfuReconnectWithParent(u8 taskId) tTime++; } +#if REVISION >= 0xA + if (tTime > 360) +#else if (tTime > 240) +#endif { // Timeout error RfuSetStatus(RFU_STATUS_CONNECTION_ERROR, F_RFU_ERROR_5 | F_RFU_ERROR_6 | F_RFU_ERROR_7); @@ -2797,6 +2915,13 @@ void CreateTask_RfuReconnectWithParent(const u8 *name, u16 trainerId) data[8] = trainerId; } +#if REVISION >= 0xA +void DestroyTask_RfuReconnectWithParent(void) +{ + DestroyTask(FindTaskIdByFunc(Task_RfuReconnectWithParent)); +} +#endif + static bool32 IsPartnerActivityIncompatible(s16 activity, struct RfuGameData *partner) { if (GetHostRfuGameData()->activity == (ACTIVITY_CHAT | IN_UNION_ROOM)) @@ -2841,7 +2966,11 @@ static void Task_TryConnectToUnionRoomParent(u8 taskId) if (gRfu.status == RFU_STATUS_NEW_CHILD_DETECTED) DestroyTask(taskId); +#if REVISION >= 0xA + if (++gTasks[taskId].data[0] > 480) +#else if (++gTasks[taskId].data[0] > 300) +#endif { // Timeout error RfuSetStatus(RFU_STATUS_CONNECTION_ERROR, F_RFU_ERROR_5 | F_RFU_ERROR_6 | F_RFU_ERROR_7); @@ -2859,7 +2988,11 @@ static void Task_TryConnectToUnionRoomParent(u8 taskId) // Parent found, try to connect if (!IsPartnerActivityIncompatible(gTasks[taskId].data[1], (struct RfuGameData *)&gRfuLinkStatus->partner[id].gname)) { +#if REVISION >= 0xA + if (gRfuLinkStatus->partner[id].slot != 0xFF && !rfu_LMAN_CHILD_connectParent(gRfuLinkStatus->partner[id].id, 150)) +#else if (gRfuLinkStatus->partner[id].slot != 0xFF && !rfu_LMAN_CHILD_connectParent(gRfuLinkStatus->partner[id].id, 90)) +#endif { // Succesfully connected to parent gRfu.state = RFUSTATE_CONNECTED; @@ -2884,7 +3017,11 @@ void TryConnectToUnionRoomParent(const u8 *name, struct RfuGameData *parent, u8 gRfu.status = RFU_STATUS_OK; StringCopy(gRfu.parent.uname, name); memcpy(gRfu.parent.gname, parent, RFU_GAME_NAME_LENGTH); +#if REVISION >= 0xA + rfu_LMAN_forceChangeSP(TRUE); +#else rfu_LMAN_forceChangeSP(); +#endif taskId = CreateTask(Task_TryConnectToUnionRoomParent, 2); gTasks[taskId].tActivity = activity; listenTaskId = FindTaskIdByFunc(Task_UnionRoomListen); @@ -2999,6 +3136,27 @@ u32 GetRfuRecvQueueLength(void) return gRfu.recvQueue.count; } +#if REVISION >= 0xA +static inline void RfuReloadCommon(void) { + m4aMPlayStop(&gMPlayInfo_SE1); + m4aMPlayStop(&gMPlayInfo_SE2); + m4aMPlayStop(&gMPlayInfo_SE3); + StopMapMusic(); + gMain.callback1 = NULL; + HelpSystem_Enable(); +} + +void RfuReloadSave(void) { + RfuReloadCommon(); + ReloadSave(); +} + +void RfuSoftReset(void) { + RfuReloadCommon(); + DoSoftReset(); +} +#endif + static void Task_Idle(u8 taskId) { diff --git a/src/link_rfu_3.c b/src/link_rfu_3.c index 078a28ff8..f9164070b 100644 --- a/src/link_rfu_3.c +++ b/src/link_rfu_3.c @@ -35,6 +35,204 @@ static const u16 sWirelessLinkIconPalette[] = INCBIN_U16("graphics/link/wireless static const u32 sWirelessLinkIconPic[] = INCBIN_U32("graphics/link/wireless_icon.4bpp.lz"); // Most of the below two tables won't make sense with ASCII encoding. +#if REVISION >= 0xA +// The tables have been changed to overload some control characters onto ASCII characters. +static const u8 sWireless_ASCIItoRSETable[] = { + EOS, + 0x95, 0x96, 0x97, 0x98, 0x99, 0x9a, 0x37, + 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, + 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, + 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f, + [' '] = CHAR_SPACE, + ['!'] = CHAR_EXCL_MARK, + 0xb5, 0xb6, 0xb1, 0xf7, 0xf8, 0xf9, + 0xfa, 0xfb, 0xb2, 0xf1, 0xfc, + ['-'] = 0xfd, + ['.'] = 0xfe, + ['/'] = CHAR_SLASH, + ['0'] = CHAR_0, + ['1'] = CHAR_1, + ['2'] = CHAR_2, + ['3'] = CHAR_3, + ['4'] = CHAR_4, + ['5'] = CHAR_5, + ['6'] = CHAR_6, + ['7'] = CHAR_7, + ['8'] = CHAR_8, + ['9'] = CHAR_9, + CHAR_CURRENCY, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f, CHAR_BLACK_TRIANGLE, + ['A'] = CHAR_A, + ['B'] = CHAR_B, + ['C'] = CHAR_C, + ['D'] = CHAR_D, + ['E'] = CHAR_E, + ['F'] = CHAR_F, + ['G'] = CHAR_G, + ['H'] = CHAR_H, + ['I'] = CHAR_I, + ['J'] = CHAR_J, + ['K'] = CHAR_K, + ['L'] = CHAR_L, + ['M'] = CHAR_M, + ['N'] = CHAR_N, + ['O'] = CHAR_O, + ['P'] = CHAR_P, + ['Q'] = CHAR_Q, + ['R'] = CHAR_R, + ['S'] = CHAR_S, + ['T'] = CHAR_T, + ['U'] = CHAR_U, + ['V'] = CHAR_V, + ['W'] = CHAR_W, + ['X'] = CHAR_X, + ['Y'] = CHAR_Y, + ['Z'] = CHAR_Z, + 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf0, + ['a'] = CHAR_a, + ['b'] = CHAR_b, + ['c'] = CHAR_c, + ['d'] = CHAR_d, + ['e'] = CHAR_e, + ['f'] = CHAR_f, + ['g'] = CHAR_g, + ['h'] = CHAR_h, + ['i'] = CHAR_i, + ['j'] = CHAR_j, + ['k'] = CHAR_k, + ['l'] = CHAR_l, + ['m'] = CHAR_m, + ['n'] = CHAR_n, + ['o'] = CHAR_o, + ['p'] = CHAR_p, + ['q'] = CHAR_q, + ['r'] = CHAR_r, + ['s'] = CHAR_s, + ['t'] = CHAR_t, + ['u'] = CHAR_u, + ['v'] = CHAR_v, + ['w'] = CHAR_w, + ['x'] = CHAR_x, + ['y'] = CHAR_y, + ['z'] = CHAR_z, + 0x2d, 0x2f, 0x30, 0x31, 0x32, + 0x33, 0x34, 0x35, 0x36, 0x50, 0x00, 0x01, 0x02, + 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, + 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, + 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, + 0x1b, 0xad, 0xb3, 0xb4, 0xb8, 0xaf, 0x7d, 0x7f, + 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0xa0, + 0xae, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, + 0x58, 0x59, 0x5a, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f, + 0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, + 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, + 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, + 0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7e, 0xb0, 0xac, + 0x1c, 0x1d, 0x1e, 0x1f, 0x20, 0x21, 0x22, 0x23, + 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b, + 0x2c, 0x2e, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, + 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94 +}; + +static const u8 sWireless_RSEtoASCIITable[] = { + [CHAR_SPACE] = ' ', + 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, + 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94, 0x95, + 0x96, 0x97, 0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, + 0x9e, 0x9f, 0xa0, 0xe0, 0xe1, 0xe2, 0xe3, 0xe4, + 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, 0xeb, 0xec, + 0xed, 0xee, 0xef, 0xf0, 0x7b, 0xf1, 0x7c, 0x7d, + 0x7e, 0x7f, 0x80, 0x81, 0x82, 0x83, 0x07, 0x08, + 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, + 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, + 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x84, + 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7, 0xb8, + 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf, 0xc0, + 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, + 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, + 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, + 0xd9, 0xda, 0xdb, 0xdc, 0xa6, 0xdd, 0xa7, 0xa8, + 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xf2, 0xf3, + 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0xfa, 0xfb, + 0xfc, 0xfd, 0xfe, 0xff, 0x01, 0x02, 0x03, 0x04, + 0x05, 0x06, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, 0xaf, + [CHAR_0] = '0', + [CHAR_1] = '1', + [CHAR_2] = '2', + [CHAR_3] = '3', + [CHAR_4] = '4', + [CHAR_5] = '5', + [CHAR_6] = '6', + [CHAR_7] = '7', + [CHAR_8] = '8', + [CHAR_9] = '9', + [CHAR_EXCL_MARK] = '!', + 0xdf, 0xa1, 0xb0, 0xa5, 0xde, 0x24, 0x2a, + 0xa2, 0xa3, 0x22, 0x23, ':', 0xa4, 0x20, + [CHAR_SLASH] = '/', + [CHAR_A] = 'A', + [CHAR_B] = 'B', + [CHAR_C] = 'C', + [CHAR_D] = 'D', + [CHAR_E] = 'E', + [CHAR_F] = 'F', + [CHAR_G] = 'G', + [CHAR_H] = 'H', + [CHAR_I] = 'I', + [CHAR_J] = 'J', + [CHAR_K] = 'K', + [CHAR_L] = 'L', + [CHAR_M] = 'M', + [CHAR_N] = 'N', + [CHAR_O] = 'O', + [CHAR_P] = 'P', + [CHAR_Q] = 'Q', + [CHAR_R] = 'R', + [CHAR_S] = 'S', + [CHAR_T] = 'T', + [CHAR_U] = 'U', + [CHAR_V] = 'V', + [CHAR_W] = 'W', + [CHAR_X] = 'X', + [CHAR_Y] = 'Y', + [CHAR_Z] = 'Z', + [CHAR_a] = 'a', + [CHAR_b] = 'b', + [CHAR_c] = 'c', + [CHAR_d] = 'd', + [CHAR_e] = 'e', + [CHAR_f] = 'f', + [CHAR_g] = 'g', + [CHAR_h] = 'h', + [CHAR_i] = 'i', + [CHAR_j] = 'j', + [CHAR_k] = 'k', + [CHAR_l] = 'l', + [CHAR_m] = 'm', + [CHAR_n] = 'n', + [CHAR_o] = 'o', + [CHAR_p] = 'p', + [CHAR_q] = 'q', + [CHAR_r] = 'r', + [CHAR_s] = 's', + [CHAR_t] = 't', + [CHAR_u] = 'u', + [CHAR_v] = 'v', + [CHAR_w] = 'w', + [CHAR_x] = 'x', + [CHAR_y] = 'y', + [CHAR_z] = 'z', + 0x40, 0x60, 0x2b, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f, + [CHAR_DYNAMIC] = '%', + [CHAR_KEYPAD_ICON] = '&', + [CHAR_EXTRA_SYMBOL] = '\'', + [CHAR_PROMPT_SCROLL] = '(', + [CHAR_PROMPT_CLEAR] = ')', + [EXT_CTRL_CODE_BEGIN] = ',', + [PLACEHOLDER_BEGIN] = '-', + [CHAR_NEWLINE] = '.', + [EOS] = 0 +}; +#else static const u8 sWireless_ASCIItoRSETable[] = { EOS, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9a, 0x37, @@ -231,6 +429,8 @@ static const u8 sWireless_RSEtoASCIITable[] = { [EOS] = 0 }; +#endif + static const struct OamData sWirelessStatusIndicatorOamData = { .y = 0, @@ -595,7 +795,7 @@ static void PopulateArrayWithSequence(u8 *arr, u8 mode) } } -static void PkmnStrToASCII(u8 *dest, const u8 *src) +void PkmnStrToASCII(u8 *dest, const u8 *src) { s32 i; @@ -604,7 +804,7 @@ static void PkmnStrToASCII(u8 *dest, const u8 *src) dest[i] = 0; } -static void ASCIIToPkmnStr(u8 *dest, const u8 *src) +void ASCIIToPkmnStr(u8 *dest, const u8 *src) { s32 i; diff --git a/src/load_save.c b/src/load_save.c index d71130507..8b723dd04 100644 --- a/src/load_save.c +++ b/src/load_save.c @@ -10,6 +10,7 @@ #include "berry_powder.h" #include "overworld.h" #include "quest_log.h" +#include "sloopsvc.h" #define SAVEBLOCK_MOVE_RANGE 128 @@ -125,6 +126,9 @@ void MoveSaveBlocks_ResetHeap(void) encryptionKey = (Random() << 0x10) + (Random()); ApplyNewEncryptionKeyToAllEncryptedData(encryptionKey); gSaveBlock2Ptr->encryptionKey = encryptionKey; +#if REVISION >= 0xA + svc_SetSaveBlock2(gSaveBlock2Ptr); +#endif } u32 UseContinueGameWarp(void) diff --git a/src/main.c b/src/main.c index f2d77a8c2..542b0f5d1 100644 --- a/src/main.c +++ b/src/main.c @@ -15,6 +15,7 @@ #include "scanline_effect.h" #include "save_failed_screen.h" #include "quest_log.h" +#include "sloopsvc.h" extern u32 intr_main[]; @@ -24,6 +25,14 @@ static void VCountIntr(void); static void SerialIntr(void); static void IntrDummy(void); +#if REVISION >= 0xA && !MODERN +const char OtherBuildDateTime[] = "2025 12 19 16:01"; +#endif + +#if REVISION >= 0xA +// OtherBuildDateTime is probably in some other file? +__attribute__((aligned(4))) +#endif const u8 gGameVersion = GAME_VERSION; const u8 gGameLanguage = GAME_LANGUAGE; @@ -33,8 +42,10 @@ const char BuildDateTime[] = __DATE__ " " __TIME__; #else #if REVISION == 0 const char BuildDateTime[] = "2004 04 26 11:20"; -#else +#elif REVISION == 1 const char BuildDateTime[] = "2004 07 20 09:30"; +#elif REVISION == 0xA +const char BuildDateTime[] = "2025 12 19 15:38 22afedd9"; #endif //REVISION #endif //MODERN @@ -88,6 +99,9 @@ void EnableVCountIntrAtLine150(void); void AgbMain() { +#if REVISION >= 0xA + svc_stubbed(); +#endif #if MODERN // Modern compilers are liberal with the stack on entry to this function, // so RegisterRamReset may crash if it resets IWRAM. @@ -119,7 +133,12 @@ void AgbMain() #else RegisterRamReset(RESET_ALL); #endif //MODERN + +#if REVISION >= 0xA + *(vu16 *)BG_PLTT = RGB_BLACK; +#else *(vu16 *)BG_PLTT = RGB_WHITE; +#endif InitGpuRegManager(); REG_WAITCNT = WAITCNT_PREFETCH_ENABLE | WAITCNT_WS0_S_1 | WAITCNT_WS0_N_3; InitKeys(); @@ -140,7 +159,8 @@ void AgbMain() SetNotInSaveFailedScreen(); -#ifndef NDEBUG + // Revision 10 has no calls into libisagbprn except this one. +#if !defined(NDEBUG) || REVISION >= 0xA #if (LOG_HANDLER == LOG_HANDLER_MGBA_PRINT) (void) MgbaOpen(); #elif (LOG_HANDLER == LOG_HANDLER_AGB_PRINT) @@ -148,7 +168,7 @@ void AgbMain() #endif #endif -#if REVISION == 1 +#if REVISION >= 1 if (gFlashMemoryPresent != TRUE) SetMainCallback2(NULL); #endif @@ -164,7 +184,9 @@ void AgbMain() && (gMain.heldKeysRaw & B_START_SELECT) == B_START_SELECT) { rfu_REQ_stopMode(); +#if REVISION < 0xA rfu_waitREQComplete(); +#endif DoSoftReset(); } @@ -211,6 +233,9 @@ static void InitMainCallbacks(void) gSaveBlock1Ptr = &gSaveBlock1; gSaveBlock2.encryptionKey = 0; gQuestLogPlaybackState = QL_PLAYBACK_STATE_STOPPED; +#if REVISION >= 0xA + svc_SetSaveBlock2(&gSaveBlock2); +#endif } static void CallCallbacks(void) @@ -375,11 +400,11 @@ static void VBlankIntr(void) gPcmDmaCounter = gSoundInfo.pcmDmaCounter; -#ifndef NDEBUG +#if !defined(NDEBUG) || REVISION >= 0xA sVcountBeforeSound = REG_VCOUNT; #endif m4aSoundMain(); -#ifndef NDEBUG +#if !defined(NDEBUG) || REVISION >= 0xA sVcountAfterSound = REG_VCOUNT; #endif @@ -408,7 +433,7 @@ static void HBlankIntr(void) static void VCountIntr(void) { -#ifndef NDEBUG +#if !defined(NDEBUG) || REVISION >= 0xA sVcountAtIntr = REG_VCOUNT; #endif m4aSoundVSync(); diff --git a/src/menu.c b/src/menu.c index 22e0321bc..9ee9968cb 100644 --- a/src/menu.c +++ b/src/menu.c @@ -567,8 +567,14 @@ s8 Menu_ProcessInputNoWrapClearOnChoose(void) void DestroyYesNoMenu(void) { +#if REVISION >= 0xA + if (sYesNoWindowId == 0xFF) return; +#endif ClearStdWindowAndFrameToTransparent(sYesNoWindowId, TRUE); RemoveWindow(sYesNoWindowId); +#if REVISION >= 0xA + sYesNoWindowId = 0xFF; +#endif } void MultichoiceGrid_PrintItems(u8 windowId, u8 fontId, u8 itemWidth, u8 itemHeight, u8 cols, u8 rows, const struct MenuAction *strs) diff --git a/src/mystery_gift_menu.c b/src/mystery_gift_menu.c index 0c9800146..77c032c1b 100644 --- a/src/mystery_gift_menu.c +++ b/src/mystery_gift_menu.c @@ -27,7 +27,7 @@ EWRAM_DATA u8 sDownArrowCounterAndYCoordIdx[8] = {}; EWRAM_DATA bool8 gGiftIsFromEReader = FALSE; static void CreateMysteryGiftTask(void); -static void Task_MysteryGift(u8 taskId); +void Task_MysteryGift(u8 taskId); extern void CreateEReaderTask(void); static const u16 sTextboxBorder_Pal[] = INCBIN_U16("graphics/interface/mystery_gift_textbox_border.gbapal"); @@ -1110,7 +1110,7 @@ static void CreateMysteryGiftTask(void) data->clientMsg = AllocZeroed(CLIENT_MAX_MSG_SIZE); } -static void Task_MysteryGift(u8 taskId) +void Task_MysteryGift(u8 taskId) { struct MysteryGiftTaskData * data = (void *)gTasks[taskId].data; bool32 successMsg, input; diff --git a/src/naming_screen.c b/src/naming_screen.c index c9d003a97..deef7054a 100644 --- a/src/naming_screen.c +++ b/src/naming_screen.c @@ -24,6 +24,7 @@ #include "constants/help_system.h" #include "constants/songs.h" #include "constants/event_objects.h" +#include "sloopsvc.h" enum { INPUT_NONE, @@ -680,7 +681,15 @@ static bool8 MainState_MoveToOKButton(void) static bool8 MainState_PressedOKButton(void) { +#if REVISION >= 0xA + // If the input text matched against the Switch bad words list, do not use it. + if (!svc_BadWordCheck(sNamingScreen->textBuffer)) + { + SaveInputText(); + } +#else SaveInputText(); +#endif SetInputState(INPUT_STATE_DISABLED); SetCursorFlashing(FALSE); TryStartButtonFlash(BUTTON_COUNT, FALSE, TRUE); diff --git a/src/overworld.c b/src/overworld.c index 1b81b360c..ffce6cecc 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -1512,6 +1512,13 @@ static bool8 RunFieldCallback(void) return TRUE; } +#if REVISION >= 0xA +void ClearFieldCallback(void) +{ + gFieldCallback = NULL; +} +#endif + void CB2_NewGame(void) { FieldClearVBlankHBlankCallbacks(); diff --git a/src/post_battle_event_funcs.c b/src/post_battle_event_funcs.c index cab6d3afe..5679375eb 100644 --- a/src/post_battle_event_funcs.c +++ b/src/post_battle_event_funcs.c @@ -5,7 +5,9 @@ #include "overworld.h" #include "hall_of_fame.h" #include "load_save.h" +#include "item.h" #include "constants/heal_locations.h" +#include "constants/items.h" bool8 EnterHallOfFame(void) { @@ -46,6 +48,20 @@ bool8 EnterHallOfFame(void) { IncrementGameStat(GAME_STAT_RECEIVED_RIBBONS); FlagSet(FLAG_SYS_RIBBON_GET); +#if REVISION >= 0xA + // The player has entered the Hall of Fame for the first time. + // (At least, this is probably what was intended, except giving at least one Champion Ribbon does not imply first Hall of Fame entry) + // Give the event tickets, and the flags for obtaining them, if required. + if (!CheckBagHasItem(ITEM_AURORA_TICKET, 1)) + { + AddBagItem(ITEM_AURORA_TICKET, 1); + FlagSet(FLAG_ENABLE_SHIP_BIRTH_ISLAND); + FlagSet(FLAG_RECEIVED_AURORA_TICKET); + AddBagItem(ITEM_MYSTIC_TICKET, 1); + FlagSet(FLAG_ENABLE_SHIP_NAVEL_ROCK); + FlagSet(FLAG_RECEIVED_MYSTIC_TICKET); + } +#endif } SetMainCallback2(CB2_DoHallOfFameScreen); return FALSE; diff --git a/src/save.c b/src/save.c index 7a4808924..36b960f37 100644 --- a/src/save.c +++ b/src/save.c @@ -9,6 +9,7 @@ #include "fieldmap.h" #include "pokemon_storage_system.h" #include "gba/flash_internal.h" +#include "sloopsvc.h" static u8 HandleWriteSector(u16 sectorId, const struct SaveSectorLocation *locations); static u8 TryWriteSector(u8 sectorNum, u8 *data); @@ -212,6 +213,11 @@ static u8 HandleWriteSectorNBytes(u8 sectorId, u8 *data, u16 size) static u8 TryWriteSector(u8 sectorNum, u8 *data) { +#if REVISION >= 0xA + svc_WriteSector(sectorNum, data); + SetDamagedSectorBits(DISABLE, sectorNum); + return SAVE_STATUS_OK; +#else if (ProgramFlashSectorAndVerify(sectorNum, data)) // is damaged? { SetDamagedSectorBits(ENABLE, sectorNum); // set damaged sector bits. @@ -222,6 +228,7 @@ static u8 TryWriteSector(u8 sectorNum, u8 *data) SetDamagedSectorBits(DISABLE, sectorNum); // unset damaged sector bits. it's safe now. return SAVE_STATUS_OK; } +#endif } static u32 RestoreSaveBackupVarsAndIncrement(const struct SaveSectorLocation *locations) @@ -312,6 +319,11 @@ static u8 HandleReplaceSector(u16 sectorId, const struct SaveSectorLocation *loc gSaveDataBufferPtr->checksum = CalculateChecksum(data, size); +#if REVISION >= 0xA + svc_ReplaceSector(sectorNum, (u8*)gSaveDataBufferPtr); + SetDamagedSectorBits(DISABLE, sectorNum); + return SAVE_STATUS_OK; +#else // erase old save data EraseFlashSector(sectorNum); @@ -358,6 +370,7 @@ static u8 HandleReplaceSector(u16 sectorId, const struct SaveSectorLocation *loc return SAVE_STATUS_OK; } } +#endif } static u8 CopySectorSignatureByte(u16 sectorId, const struct SaveSectorLocation *locations) @@ -679,6 +692,9 @@ u8 HandleSavingData(u8 saveType) break; } gMain.vblankCounter1 = backupPtr; +#if REVISION >= 0xA + svc_FinishSave(); +#endif return 0; } @@ -872,6 +888,9 @@ void Task_LinkFullSave(u8 taskId) gTasks[taskId].data[0] = 1; break; case 1: +#if REVISION >= 0xA + if (!IsLinkTaskFinished()) break; +#endif SetLinkStandbyCallback(); gTasks[taskId].data[0] = 2; break; @@ -905,6 +924,9 @@ void Task_LinkFullSave(u8 taskId) gTasks[taskId].data[0] = 7; break; case 7: +#if REVISION >= 0xA + if (!IsLinkTaskFinished()) break; +#endif ClearContinueGameWarpStatus2(); SetLinkStandbyCallback(); gTasks[taskId].data[0] = 8; @@ -913,10 +935,16 @@ void Task_LinkFullSave(u8 taskId) if (IsLinkTaskFinished()) { LinkFullSave_SetLastSectorSignature(); +#if REVISION >= 0xA + svc_FinishSave(); +#endif gTasks[taskId].data[0] = 9; } break; case 9: +#if REVISION >= 0xA + if (!IsLinkTaskFinished()) break; +#endif SetLinkStandbyCallback(); gTasks[taskId].data[0] = 10; break; diff --git a/src/scrcmd.c b/src/scrcmd.c index f7481f862..97b695ee2 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -37,6 +37,7 @@ #include "constants/event_objects.h" #include "constants/maps.h" #include "constants/sound.h" +#include "sloopsvc.h" extern u16 (*const gSpecials[])(void); extern u16 (*const gSpecialsEnd[])(void); @@ -1732,12 +1733,24 @@ bool8 ScrCmd_bufferboxname(struct ScriptContext * ctx) bool8 ScrCmd_givemon(struct ScriptContext * ctx) { - u16 species = VarGet(ScriptReadHalfword(ctx)); - u8 level = ScriptReadByte(ctx); - u16 item = VarGet(ScriptReadHalfword(ctx)); - u32 unkParam1 = ScriptReadWord(ctx); - u32 unkParam2 = ScriptReadWord(ctx); - u8 unkParam3 = ScriptReadByte(ctx); + u16 species; + u8 level; + u16 item; + u32 unkParam1; + u32 unkParam2; + u8 unkParam3; + species = VarGet(ScriptReadHalfword(ctx)); +#if REVISION >= 0xA + // If the player party count is zero, this "must" be giving the starter. + // Notify the emulator of what starter was picked, for telemetry purposes. + if (gSaveBlock1Ptr->playerPartyCount == 0) + svc_SetStarter(species); +#endif + level = ScriptReadByte(ctx); + item = VarGet(ScriptReadHalfword(ctx)); + unkParam1 = ScriptReadWord(ctx); + unkParam2 = ScriptReadWord(ctx); + unkParam3 = ScriptReadByte(ctx); gSpecialVar_Result = ScriptGiveMon(species, level, item, unkParam1, unkParam2, unkParam3); return FALSE; diff --git a/src/script_menu.c b/src/script_menu.c index 25991e775..41eebd86e 100644 --- a/src/script_menu.c +++ b/src/script_menu.c @@ -338,8 +338,14 @@ static const struct MenuAction sMultichoiceList_TradeCenter_Colosseum[] = { }; static const struct MenuAction sMultichoiceList_Link_Wireless[] = { +#if REVISION >= 0xA + // The default is wireless here as it's always emulated by Sloop + { gText_Wireless }, + { gText_GameLinkCable }, +#else { gText_GameLinkCable }, { gText_Wireless }, +#endif { gOtherText_Exit } }; diff --git a/src/sloopsvc.c b/src/sloopsvc.c new file mode 100644 index 000000000..384ed252f --- /dev/null +++ b/src/sloopsvc.c @@ -0,0 +1,294 @@ +#include "global.h" +#include "librfu.h" +#include "link_rfu.h" +#include "link.h" +#include "sloopsvc.h" + +#if REVISION >= 0xA + +typedef struct _SloopSvc47Params { + // BUGBUG: gHostRfuGameData certainly didn't change size, ResetHostRfuGameData still zeroes 13 bytes + u8 HostRfuGameData[0x10]; + u8 HostRfuUsername[RFU_USER_NAME_LENGTH]; +} SloopSvc47Params; + +static u8 sBadWordAsciiString[256]; + +COMMON_DATA SloopSvc47Params gSvc47Params = {0}; +COMMON_DATA struct RfuLinkStatus *gSloopRfuLinkStatus = NULL; + +// Syscall functions for the extra syscalls handled by the Sloop emulator. +#define SLOOP_SVC_CLOBBERS "r0", "r1", "r2", "r3", "memory" + +// Unreferenced. Sets a flag to true (default true) (svc_41 sets it to false) +void svc_40(void) { + asm volatile("swi 0x40"); +} + +// Unreferenced. Sets a flag to false (default true) (svc_40 sets it to true) +void svc_41(void) { + asm volatile("swi 0x41"); +} + +// Called by rfu_REQ_configGameData. +void svc_47(void) { + u8* params = gSvc47Params.HostRfuGameData; + memcpy(params, &gHostRfuGameData, sizeof(gSvc47Params.HostRfuGameData)); + memcpy(¶ms[sizeof(gSvc47Params.HostRfuGameData)], gHostRfuUsername, sizeof(gSvc47Params.HostRfuUsername)); + asm volatile( + "movs r0, %0 \n" + "swi 0x47 \n" + : + : "l"(params) + : SLOOP_SVC_CLOBBERS + ); + gSloopRfuLinkStatus = gRfuLinkStatus; +} + +// Called by rfu_REQ_startSearchChild. +void svc_42(void) { + asm volatile("swi 0x42"); +} + +// Called from rfu_LMAN_manager_entity. +u32 svc_49(void) { + u32 ret; + asm volatile( + "swi 0x49 \n" + "movs %0, r0 \n" + : "=l"(ret) + : + : SLOOP_SVC_CLOBBERS + ); + return ret; +} + +// Called by rfu_REQ_startSearchParent and rfu_STC_readParentCandidateList. +void svc_45_rfu_link_status(void) { + asm volatile( + "movs r0, %0 \n" + "swi 0x45 \n" + : + : "l"(gRfuLinkStatus) + : SLOOP_SVC_CLOBBERS + ); +} + +// Called by rfu_LMAN_REQ_callback +u32 svc_4a(void) { + u32 ret; + asm volatile( + "swi 0x4a \n" + "movs %0, r0 \n" + : "=l"(ret) + : + : SLOOP_SVC_CLOBBERS + ); + return ret; +} + +// Called by rfu_REQ_startConnectParent +void svc_43(u16 pid) { + asm volatile( + "movs r0, %0 \n" + "swi 0x43 \n" + : + : "l"(pid) + : SLOOP_SVC_CLOBBERS + ); +} + +// Called by rfu_REQ_stopMode, ... +void svc_44(void) { + asm volatile("swi 0x44"); +} + +// Called by Task_WirelessCommunicationScreen +u32 svc_53(void) { + u32 ret; + asm volatile( + "swi 0x53 \n" + "movs %0, r0 \n" + : "=l"(ret) + : + : SLOOP_SVC_CLOBBERS + ); + return ret; +} + +// Called by HandleLinkConnection +u32 svc_51(void) { + u32 ret; + asm volatile( + "swi 0x51 \n" + "movs %0, r0 \n" + : "=l"(ret) + : + : SLOOP_SVC_CLOBBERS + ); + return ret; +} + +// Called by RfuMain1 and SpawnGroupLeaderAndMembers. +// SpawnGroupLeaderAndMembers will exit early in the SpawnGroupLeader case if retval has bit 0 unset. +// RfuMain1 will reseed the RNG by gHostRfuGameData->compatibility.playerTrainerId if retval has bit 1 set. +u32 svc_4b(void) { + u32 ret; + asm volatile( + "swi 0x4b \n" + "movs %0, r0 \n" + : "=l"(ret) + : + : SLOOP_SVC_CLOBBERS + ); + return ret; +} + +// Called by TryWriteSector. +void svc_WriteSector(u8 sector, u8* data) { + asm volatile( + "movs r0, %0 \n" + "movs r1, %1 \n" + "swi 0x48 \n" + : + : "l"(sector), "l"(data) + : SLOOP_SVC_CLOBBERS + ); +} + +// Called by HandleReplaceSector. +void svc_ReplaceSector(u8 sector, u8* data) { + asm volatile( + "movs r0, %0 \n" + "movs r1, %1 \n" + "swi 0x56 \n" + : + : "l"(sector), "l"(data) + : SLOOP_SVC_CLOBBERS + ); +} + +// Called by various save-related functions. +// This writes the save out (handler calls a function using fopen/fwrite/fclose) +void svc_FinishSave(void) { + asm volatile("swi 0x4c"); +} + +// Called by Task_RunUnionRoom and ListMenuHandler_AllItemsAvailable. +// This handler calls functions from the parental controls library. +// ListMenuHandler_AllItemsAvailable returns -2 if this returns zero. +// The Task_RunUnionRoom case auto-declines if this returns zero. +// Probably returns zero if "free communication" is denied by parental control settings. +u32 svc_CommsAllowedByParentalControls(void) { + u32 ret; + asm volatile( + "swi 0x54 \n" + "movs %0, r0 \n" + : "=l"(ret) + : + : SLOOP_SVC_CLOBBERS + ); + return ret; +} + +static inline u32 call_svc_BadWordCheck(u8* string, int arg2) { + u32 ret; + asm volatile( + "movs r0, %1\n" + "movs r1, %2\n" + "swi 0x4d\n" + "movs %0, r0\n" + : "=l" (ret) + : "l" (string), "l" (arg2) + : SLOOP_SVC_CLOBBERS + ); + return ret; +} +// Called by naming screen MainState_PressedOKButton, +// ChatEntryRoutine_SendMessage and union room RegisterTextAtRow. +// This does the bad word checks. +// The text buffer passed in is sanitised, and zero returned if sanitisation occured(?)/badwords present(?) +u32 svc_BadWordCheck(u8* str) { + u32 ret; + PkmnStrToASCII((u8*)sBadWordAsciiString, str); + ret = call_svc_BadWordCheck((u8*)sBadWordAsciiString, 0); + ASCIIToPkmnStr(str, (u8*)sBadWordAsciiString); + return ret; +} + +// Called by various cases of Task_TryJoinLinkGroup and Task_TryBecomeLinkLeader. +void svc_4f(u32 arg) { + asm volatile( + "movs r0, %0 \n" + "swi 0x4f \n" + : + : "l"(arg) + : SLOOP_SVC_CLOBBERS + ); +} + +// Called by a wrapper function called by Task_TryBecomeLinkLeader. +// The wrapper function is equivalent to "return !svc_50();" +// Return value is ORed with gReceivedRemoteLinkPlayers. +u32 svc_50(void) { + u32 ret; + asm volatile( + "swi 0x50 \n" + "movs %0, r0 \n" + : "=l"(ret) + : + : SLOOP_SVC_CLOBBERS + ); + return ret; +} + +// Called by InitMainCallbacks and MoveSaveBlocks_ResetHeap. +// Lets the emulator know where SaveBlock2 is located in memory. +// Emulator appears to use this to get saveBlock2->optionsButtonMode to check against L_EQUALS_A. +void svc_SetSaveBlock2(struct SaveBlock2* saveBlock2) { + asm volatile( + "movs r0, %0 \n" + "swi 0x55 \n" + : + : "l"(saveBlock2) + : SLOOP_SVC_CLOBBERS + ); +} + +// Called by AgbMain, as its first action before RegisterRamReset. +void svc_stubbed(void) { + // No operation. +} + +// Called by ScrCmd_givemon when the party is empty. +// This lets the emulator know what starter was picked (saved in play report / telemetry data) +void svc_SetStarter(u32 species) { + asm volatile( + "movs r0, %0 \n" + "swi 0x57 \n" + : + : "l"(species) + : SLOOP_SVC_CLOBBERS + ); +} + +// Called by Task_StartActivity +// This lets the emulator know the current union room activity. +void svc_SetActivity(u32 activity) { + asm volatile( + "movs r0, %0 \n" + "swi 0x61 \n" + : + : "l"(activity) + : SLOOP_SVC_CLOBBERS + ); +} + +// Called by CB2_PrintErrorMessage. +// This causes the emulator to increment some variable (link error counter, probably). +void svc_IncrementLinkError(void) { + asm volatile("swi 0x62"); +} + + +#endif \ No newline at end of file diff --git a/src/start_menu.c b/src/start_menu.c index 8a372e5af..88cc377ce 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -36,6 +36,7 @@ #include "help_system.h" #include "constants/songs.h" #include "constants/field_weather.h" +#include "sloopsvc.h" enum StartMenuOption { @@ -935,6 +936,9 @@ static void task50_after_link_battle_save(u8 taskId) if (WriteSaveBlock1Sector()) { ClearContinueGameWarpStatus2(); +#if REVISION >= 0xA + svc_FinishSave(); +#endif data[0] = 3; } break; diff --git a/src/string_util.c b/src/string_util.c index 4744e231c..5c26d151a 100644 --- a/src/string_util.c +++ b/src/string_util.c @@ -5,7 +5,11 @@ EWRAM_DATA u8 gStringVar1[32] = {}; EWRAM_DATA u8 gStringVar2[20] = {}; EWRAM_DATA u8 gStringVar3[20] = {}; EWRAM_DATA u8 gStringVar4[1000] = {}; +#if REVISION >= 0xA +EWRAM_DATA u8 gUnknownStringVar[12] = {0}; +#else EWRAM_DATA u8 gUnknownStringVar[16] = {0}; +#endif static const u8 sDigits[] = __("0123456789ABCDEF"); diff --git a/src/task.c b/src/task.c index cd9841d06..01503dc7a 100644 --- a/src/task.c +++ b/src/task.c @@ -86,6 +86,10 @@ static void InsertTask(u8 newTaskId) void DestroyTask(u8 taskId) { +#if REVISION >= 0xA + // Bounds check on the task ID. + if (taskId >= NUM_TASKS) return; +#endif if (gTasks[taskId].isActive) { gTasks[taskId].isActive = FALSE; diff --git a/src/title_screen.c b/src/title_screen.c index 334af1f0f..75f0e6743 100644 --- a/src/title_screen.c +++ b/src/title_screen.c @@ -634,12 +634,16 @@ static void SetTitleScreenScene_Run(s16 *data) DestroyTask(FindTaskIdByFunc(Task_TitleScreenMain)); SetMainCallback2(CB2_FadeOutTransitionToSaveClearScreen); } +#if REVISION >= 0xA + // Berry fix trigger has been removed. +#else else if (JOY_HELD(KEYSTROKE_BERRY_FIX) == KEYSTROKE_BERRY_FIX) { DeactivateSlashSprite(tSlashSpriteId); DestroyTask(FindTaskIdByFunc(Task_TitleScreenMain)); SetMainCallback2(CB2_FadeOutTransitionToBerryFix); } +#endif else if (JOY_NEW(A_BUTTON | START_BUTTON)) { SetTitleScreenScene(data, TITLESCREENSCENE_CRY); diff --git a/src/trade.c b/src/trade.c index ea29aedc8..c19360963 100644 --- a/src/trade.c +++ b/src/trade.c @@ -2116,7 +2116,11 @@ static void CB_HandleTradeCanceled(void) static void CB_InitExitCanceledTrade(void) { +#if REVISION >= 0xA + if (IsLinkTaskFinished() && !gPaletteFade.active) +#else if (!gPaletteFade.active) +#endif { if (gWirelessCommType) SetLinkStandbyCallback(); diff --git a/src/trade_scene.c b/src/trade_scene.c index 2c3a0801d..98d129039 100644 --- a/src/trade_scene.c +++ b/src/trade_scene.c @@ -33,6 +33,7 @@ #include "constants/songs.h" #include "constants/region_map_sections.h" #include "constants/moves.h" +#include "sloopsvc.h" // Values for signaling to/from the link partner enum { @@ -2608,25 +2609,37 @@ static void CB2_SaveAndEndTrade(void) MysteryGift_TryIncrementStat(CARD_STAT_NUM_TRADES, gLinkPlayers[GetMultiplayerId() ^ 1].trainerId); SetContinueGameWarpStatusToDynamicWarp(); LinkFullSave_Init(); +#if REVISION >= 0xA + // No need to wait for a save when the emulator does it fast and synchronously + gMain.state = 52; +#else gMain.state++; +#endif sTradeAnim->timer = 0; break; +#if REVISION >= 0xA +#else case 51: if (++sTradeAnim->timer == 5) gMain.state++; break; +#endif case 52: if (LinkFullSave_WriteSector()) { ClearContinueGameWarpStatus2(); gMain.state = 4; } +#if REVISION >= 0xA + // Save delay is gone, just write the next sector if save isn't finished +#else else { // Save isn't finished, delay again sTradeAnim->timer = 0; gMain.state = 51; } +#endif break; case 4: LinkFullSave_ReplaceLastSector(); @@ -2654,6 +2667,26 @@ static void CB2_SaveAndEndTrade(void) sTradeAnim->timer--; } break; +#if REVISION >= 0xA + case 42: + if (IsLinkTaskFinished()) + { + gMain.state = 43; + } + break; + case 43: + SetLinkStandbyCallback(); + gMain.state = 44; + break; + case 44: + if (IsLinkTaskFinished()) + { + LinkFullSave_SetLastSectorSignature(); + svc_FinishSave(); + gMain.state = 5; + } + break; +#else case 42: if (IsLinkTaskFinished()) { @@ -2661,6 +2694,7 @@ static void CB2_SaveAndEndTrade(void) gMain.state = 5; } break; +#endif case 5: if (++sTradeAnim->timer > 60) { diff --git a/src/union_room.c b/src/union_room.c index 282353238..91bd92c99 100644 --- a/src/union_room.c +++ b/src/union_room.c @@ -48,6 +48,7 @@ #include "constants/field_weather.h" #include "constants/trainer_card.h" #include "constants/union_room.h" +#include "sloopsvc.h" // States for Task_RunUnionRoom enum { @@ -143,7 +144,11 @@ enum { LL_STATE_FAILED, LL_STATE_TRY_START_ACTIVITY = 26, LL_STATE_MEMBER_DISCONNECTED = 29, - LL_STATE_CANCEL_WITH_MSG + LL_STATE_CANCEL_WITH_MSG, +#if REVISION >= 0xA + LL_STATE_CONFIRM_MEMBERS_SLOOP, + LL_STATE_DISCONNECT_CHILD_SLOOP +#endif }; // States for Task_TryJoinLinkGroup @@ -205,9 +210,19 @@ EWRAM_DATA u16 gUnionRoomOfferedSpecies = SPECIES_NONE; EWRAM_DATA u8 gUnionRoomRequestedMonType = TYPE_NORMAL; static EWRAM_DATA struct UnionRoomTrade sUnionRoomTrade = {}; +#if REVISION >= 0xA +COMMON_DATA struct WirelessLink_Leader * sLeader = NULL; +COMMON_DATA struct WirelessLink_URoom * sURoom = NULL; +COMMON_DATA struct WirelessLink_Group * sGroup = NULL; +#else static struct WirelessLink_Leader * sLeader; static struct WirelessLink_Group * sGroup; static struct WirelessLink_URoom * sURoom; +#endif + +#if REVISION >= 0xA +static void Leader_DisconnectOnState(struct WirelessLink_Leader * data, u8 state); +#endif static void Task_TryBecomeLinkLeader(u8); static void Leader_DestroyResources(struct WirelessLink_Leader *); @@ -227,7 +242,12 @@ static void Task_SendMysteryGift(u8); static void Task_CardOrNewsWithFriend(u8); static void Task_CardOrNewsOverWireless(u8); static void Task_RunUnionRoom(u8); +#if REVISION >= 0xA +u16 ReadU16(const u8 *); +#define ReadAsU16(x) ReadU16(x) +#else static u16 ReadAsU16(const u8 *); +#endif static void ReceiveUnionRoomActivityPacket(struct WirelessLink_URoom *); static bool32 HandleContactFromOtherPlayer(struct WirelessLink_URoom *); static void Task_InitUnionRoom(u8); @@ -422,6 +442,9 @@ static void Task_TryBecomeLinkLeader(u8 taskId) CopyBgTilemapBufferToVram(0); data->playerCount = 1; data->state = LL_STATE_GET_AWAITING_PLAYERS_TEXT; +#if REVISION >= 0xA + svc_4f(0); +#endif break; case LL_STATE_GET_AWAITING_PLAYERS_TEXT: StringCopy(gStringVar1, sLinkGroupActivityNameTexts[sPlayerCurrActivity]); @@ -439,19 +462,28 @@ static void Task_TryBecomeLinkLeader(u8 taskId) PrintNumPlayersWaitingForMsg(data->nPlayerModeWindowId, sPlayerActivityGroupSize, data->playerCount); data->state = LL_STATE_PRINT_AWAITING_PLAYERS; +#if REVISION >= 0xA + Leader_SetStateIfMemberListChanged(data, LL_STATE_ACCEPT_NEW_MEMBER_PROMPT, LL_STATE_MEMBER_LEFT); +#endif break; case LL_STATE_PRINT_AWAITING_PLAYERS: if (PrintOnTextbox(&data->textState, gStringVar4)) data->state = LL_STATE_AWAIT_PLAYERS; break; case LL_STATE_AWAIT_PLAYERS: +#if REVISION >= 0xA +#else Leader_SetStateIfMemberListChanged(data, LL_STATE_ACCEPT_NEW_MEMBER_PROMPT, LL_STATE_MEMBER_LEFT); +#endif if (JOY_NEW(B_BUTTON)) { if (data->playerCount == 1) data->state = LL_STATE_SHUTDOWN_AND_FAIL; +#if REVISION >= 0xA +#else else if (GROUP_MIN2(sPlayerActivityGroupSize) != 0) data->state = LL_STATE_CANCEL_WITH_MSG; +#endif else data->state = LL_STATE_CANCEL_PROMPT; } @@ -462,30 +494,54 @@ static void Task_TryBecomeLinkLeader(u8 taskId) && JOY_NEW(START_BUTTON)) { data->state = LL_STATE_MEMBERS_OK_PROMPT; +#if REVISION >= 0xA +#else LinkRfu_StopManagerAndFinalizeSlots(); +#endif } +#if REVISION >= 0xA + if (data->state == LL_STATE_AWAIT_PLAYERS) + { + Leader_SetStateIfMemberListChanged(data, LL_STATE_ACCEPT_NEW_MEMBER_PROMPT, LL_STATE_MEMBER_LEFT); + } + Leader_DisconnectOnState(data, LL_STATE_AWAIT_PLAYERS); +#else if (data->state == LL_STATE_AWAIT_PLAYERS && RfuTryDisconnectLeavingChildren()) { // At least 1 group member has left or is trying to leave data->state = LL_STATE_WAIT_DISCONNECT_CHILD; } +#endif break; case LL_STATE_WAIT_DISCONNECT_CHILD: // Resume after ensuring all members trying to leave have left if (!RfuTryDisconnectLeavingChildren()) { data->state = LL_STATE_AWAIT_PLAYERS; +#if REVISION >= 0xA +#else data->playerCount = LeaderPrunePlayerList(data->playerList); +#endif } break; case LL_STATE_MEMBER_LEFT: +#if REVISION >= 0xA + id = (GROUP_MAX(sPlayerActivityGroupSize) != 2) ? 1 : 0; +#else id = (GROUP_MAX(sPlayerCurrActivity) == 2) ? 1 : 0; +#endif if (PrintOnTextbox(&data->textState, gTexts_UR_PlayerUnavailable[id])) { +#if REVISION >= 0xA +#else data->playerCount = LeaderPrunePlayerList(data->playerList); RedrawListMenu(data->listTaskId); +#endif data->state = LL_STATE_GET_AWAITING_PLAYERS_TEXT; } +#if REVISION >= 0xA + Leader_DisconnectOnState(data, LL_STATE_MEMBER_LEFT); +#endif break; case LL_STATE_MEMBER_DISCONNECTED: id = (GROUP_MAX(sPlayerActivityGroupSize) == 2) ? 0 : 1; @@ -495,6 +551,9 @@ static void Task_TryBecomeLinkLeader(u8 taskId) case LL_STATE_ACCEPT_NEW_MEMBER_PROMPT: if (PrintOnTextbox(&data->textState, gStringVar4)) data->state = LL_STATE_ACCEPT_NEW_MEMBER_PROMPT_HANDLE_INPUT; +#if REVISION >= 0xA + Leader_DisconnectOnState(data, LL_STATE_ACCEPT_NEW_MEMBER_PROMPT); +#endif break; case LL_STATE_ACCEPT_NEW_MEMBER_PROMPT_HANDLE_INPUT: switch (UnionRoomHandleYesNo(&data->textState, HasTrainerLeftPartnersList( @@ -518,6 +577,9 @@ static void Task_TryBecomeLinkLeader(u8 taskId) data->state = LL_STATE_WAIT_DISCONNECT_CHILD; break; } +#if REVISION >= 0xA + Leader_DisconnectOnState(data, LL_STATE_ACCEPT_NEW_MEMBER_PROMPT_HANDLE_INPUT); +#endif break; case LL_STATE_UPDATE_AFTER_JOIN_REQUEST: val = WaitSendRfuStatusToPartner(ReadAsU16(data->playerList->players[data->playerCount].rfu.data.compatibility.playerTrainerId), data->playerList->players[data->playerCount].rfu.name); @@ -542,7 +604,10 @@ static void Task_TryBecomeLinkLeader(u8 taskId) data->state = LL_STATE_ACCEPTED_FINAL_MEMBER; } +#if REVISION >= 0xA +#else LinkRfu_StopManagerAndFinalizeSlots(); +#endif PrintNumPlayersWaitingForMsg(data->nPlayerModeWindowId, sPlayerActivityGroupSize, data->playerCount); } else @@ -554,7 +619,11 @@ static void Task_TryBecomeLinkLeader(u8 taskId) { RequestDisconnectSlotByTrainerNameAndId(data->playerList->players[data->playerCount].rfu.name, ReadAsU16(data->playerList->players[data->playerCount].rfu.data.compatibility.playerTrainerId)); data->playerList->players[data->playerCount].groupScheduledAnim = UNION_ROOM_SPAWN_NONE; +#if REVISION >= 0xA + data->playerCount = LeaderPrunePlayerList(data->playerList); +#else LeaderPrunePlayerList(data->playerList); +#endif RedrawListMenu(data->listTaskId); data->state = LL_STATE_GET_AWAITING_PLAYERS_TEXT; } @@ -570,59 +639,159 @@ static void Task_TryBecomeLinkLeader(u8 taskId) break; case LL_STATE_ACCEPTED_FINAL_MEMBER: if (PrintOnTextbox(&data->textState, gStringVar4)) + { +#if REVISION >= 0xA + data->state = LL_STATE_CONFIRM_MEMBERS_SLOOP; + svc_4f(1); + data->delayTimerAfterOk = 0; +#else data->state = LL_STATE_WAIT_AND_CONFIRM_MEMBERS; +#endif + } +#if REVISION >= 0xA + Leader_DisconnectOnState(data, LL_STATE_ACCEPTED_FINAL_MEMBER); +#endif break; +#if REVISION >= 0xA +#else case LL_STATE_WAIT_AND_CONFIRM_MEMBERS: if (++data->delayTimerAfterOk > 120) data->state = LL_STATE_CONFIRMED_MEMBERS; break; +#endif case LL_STATE_MEMBERS_OK_PROMPT: if (PrintOnTextbox(&data->textState, gText_UR_AreTheseMembersOK)) data->state = LL_STATE_MEMBERS_OK_PROMPT_HANDLE_INPUT; +#if REVISION >= 0xA + Leader_DisconnectOnState(data, LL_STATE_MEMBERS_OK_PROMPT); +#endif break; case LL_STATE_MEMBERS_OK_PROMPT_HANDLE_INPUT: switch (UnionRoomHandleYesNo(&data->textState, FALSE)) { case 0: // YES +#if REVISION >= 0xA + data->state = LL_STATE_CONFIRM_MEMBERS_SLOOP; + svc_4f(1); + data->delayTimerAfterOk = 0; +#else data->state = LL_STATE_CONFIRMED_MEMBERS; +#endif break; case 1: // NO case MENU_B_PRESSED: +#if REVISION >= 0xA + data->state = LL_STATE_CANCEL_PROMPT; +#else if (GROUP_MIN2(sPlayerActivityGroupSize) != 0) data->state = LL_STATE_CANCEL_WITH_MSG; else data->state = LL_STATE_CANCEL_PROMPT; +#endif break; } +#if REVISION >= 0xA + Leader_DisconnectOnState(data, LL_STATE_MEMBERS_OK_PROMPT_HANDLE_INPUT); +#endif break; +#if REVISION >= 0xA + case LL_STATE_CONFIRM_MEMBERS_SLOOP: + switch (LeaderUpdateGroupMembership(data->playerList)) + { + case UNION_ROOM_SPAWN_IN: + data->joinRequestAnswer = RFU_STATUS_CONNECTION_ERROR; + SendRfuStatusToPartner(RFU_STATUS_CONNECTION_ERROR, ReadAsU16(data->playerList->players[data->playerCount].rfu.data.compatibility.playerTrainerId), data->playerList->players[data->playerCount].rfu.name); + data->state = LL_STATE_DISCONNECT_CHILD_SLOOP; + return; + case UNION_ROOM_SPAWN_OUT: + RfuSetStatus(RFU_STATUS_OK, 0); + data->playerCount = LeaderPrunePlayerList(data->playerList); + RedrawListMenu(data->listTaskId); + svc_4f(0); + data->state = LL_STATE_MEMBER_LEFT; + return; + case UNION_ROOM_SPAWN_OUT_SOON: + RfuSetStatus(RFU_STATUS_OK, 0); + data->playerCount = LeaderPrunePlayerList(data->playerList); + RedrawListMenu(data->listTaskId); + return; + } + if (++data->delayTimerAfterOk > 40) + { + data->state = LL_STATE_FINAL_MEMBER_CHECK; + LinkRfu_StopManagerAndFinalizeSlots(); + } + Leader_DisconnectOnState(data, LL_STATE_CONFIRM_MEMBERS_SLOOP); + break; + case LL_STATE_DISCONNECT_CHILD_SLOOP: + val = WaitSendRfuStatusToPartner(ReadAsU16(data->playerList->players[data->playerCount].rfu.data.compatibility.playerTrainerId), data->playerList->players[data->playerCount].rfu.name); + if (val == 1) + { + // Send complete + RequestDisconnectSlotByTrainerNameAndId(data->playerList->players[data->playerCount].rfu.name, ReadAsU16(data->playerList->players[data->playerCount].rfu.data.compatibility.playerTrainerId)); + data->playerList->players[data->playerCount].groupScheduledAnim = UNION_ROOM_SPAWN_NONE; + data->playerCount = LeaderPrunePlayerList(data->playerList); + RedrawListMenu(data->listTaskId); + } else if (val == 2) + { + // Disconnect + RfuSetStatus(RFU_STATUS_OK, 0); + } else break; + data->state = LL_STATE_CONFIRM_MEMBERS_SLOOP; + break; +#endif case LL_STATE_CANCEL_PROMPT: if (PrintOnTextbox(&data->textState, gText_UR_CancelModeWithTheseMembers)) data->state = LL_STATE_CANCEL_PROMPT_HANDLE_INPUT; +#if REVISION >= 0xA + Leader_DisconnectOnState(data, LL_STATE_CANCEL_PROMPT); +#endif break; case LL_STATE_CANCEL_PROMPT_HANDLE_INPUT: switch (UnionRoomHandleYesNo(&data->textState, FALSE)) { case 0: // YES +#if REVISION >= 0xA + data->state = LL_STATE_CANCEL_WITH_MSG; +#else data->state = LL_STATE_SHUTDOWN_AND_FAIL; +#endif break; case 1: // NO case MENU_B_PRESSED: +#if REVISION >= 0xA + if (GROUP_MIN2(sPlayerActivityGroupSize) == 0 && data->playerCount == GROUP_MAX(sPlayerActivityGroupSize)) + data->state = LL_STATE_MEMBERS_OK_PROMPT; +#else if (GROUP_MIN2(sPlayerActivityGroupSize) != 0) data->state = LL_STATE_MEMBERS_OK_PROMPT; else if (data->playerCount == GROUP_MAX(sPlayerActivityGroupSize)) data->state = LL_STATE_MEMBERS_OK_PROMPT; +#endif else data->state = LL_STATE_GET_AWAITING_PLAYERS_TEXT; break; } +#if REVISION >= 0xA + Leader_DisconnectOnState(data, LL_STATE_CANCEL_PROMPT_HANDLE_INPUT); +#endif break; +#if REVISION >= 0xA +#else case LL_STATE_CONFIRMED_MEMBERS: if (!Leader_SetStateIfMemberListChanged(data, LL_STATE_ACCEPT_NEW_MEMBER_PROMPT, LL_STATE_SHUTDOWN_AND_FAIL)) data->state = LL_STATE_FINAL_MEMBER_CHECK; break; +#endif case LL_STATE_FINAL_MEMBER_CHECK: if (LmanAcceptSlotFlagIsNotZero()) { +#if REVISION >= 0xA + if (RfuGetStatus() == RFU_STATUS_CONNECTION_ERROR && RfuGetErrorInfo() == LMAN_MSG_LINK_LOSS_DETECTED_AND_DISCONNECTED) + { + RfuSetStatus(RFU_STATUS_OK, 0); + } +#endif if (WaitRfuState(FALSE)) { data->state = LL_STATE_TRY_START_ACTIVITY; @@ -770,6 +939,18 @@ static void GetGroupLeaderSentAnOKMessage(u8 *dst, u8 caseId) } } +#if REVISION >= 0xA +static void Leader_DisconnectOnState(struct WirelessLink_Leader * data, u8 state) +{ + if (data->state != state) return; + if (!RfuTryDisconnectLeavingChildren()) return; + data->state = LL_STATE_WAIT_DISCONNECT_CHILD; + DestroyYesNoMenu(); + svc_4f(0); + data->textState = 0; +} +#endif + static bool8 Leader_SetStateIfMemberListChanged(struct WirelessLink_Leader * data, u32 joinedState, u32 droppedState) { switch (LeaderUpdateGroupMembership(data->playerList)) @@ -780,11 +961,23 @@ static bool8 Leader_SetStateIfMemberListChanged(struct WirelessLink_Leader * dat CopyAndTranslatePlayerName(gStringVar2, data->playerList->players[data->playerCount]); Leader_GetAcceptNewMemberPrompt(gStringVar4, sPlayerCurrActivity); data->state = joinedState; +#if REVISION >= 0xA + svc_4f(0); +#endif break; case UNION_ROOM_SPAWN_OUT: +#if REVISION >= 0xA + case UNION_ROOM_SPAWN_OUT_SOON: +#endif RfuSetStatus(RFU_STATUS_OK, 0); +#if REVISION >= 0xA + data->playerCount = LeaderPrunePlayerList(data->playerList); +#endif RedrawListMenu(data->listTaskId); data->state = droppedState; +#if REVISION >= 0xA + svc_4f(0); +#endif return TRUE; } @@ -813,9 +1006,13 @@ static void ItemPrintFunc_PossibleGroupMembers(u8 windowId, u32 id, u8 y) static u8 LeaderUpdateGroupMembership(struct RfuPlayerList * list) { struct WirelessLink_Leader * data = sWirelessLinkMain.leader; - u8 ret = UNION_ROOM_SPAWN_NONE; - u8 i; +#if REVISION >= 0xA s32 id; +#else + u8 ret = UNION_ROOM_SPAWN_NONE; + s32 id; +#endif + u8 i; for (i = 1; i < MAX_RFU_PLAYERS; i++) { @@ -833,7 +1030,10 @@ static u8 LeaderUpdateGroupMembership(struct RfuPlayerList * list) { // No new incoming player data->playerList->players[i].groupScheduledAnim = UNION_ROOM_SPAWN_OUT; +#if REVISION >= 0xA +#else ret = UNION_ROOM_SPAWN_OUT; +#endif } } } @@ -841,6 +1041,31 @@ static u8 LeaderUpdateGroupMembership(struct RfuPlayerList * list) for (id = 0; id < RFU_CHILD_MAX; id++) TryAddIncomingPlayerToList(data->playerList->players, &data->incomingPlayerList->players[id], MAX_RFU_PLAYERS); +#if REVISION >= 0xA + id = 1; + { + struct RfuPlayerList* playerList = data->playerList; + // spawning out, and countdown = 0 => SPAWN_OUT + for (; id < MAX_RFU_PLAYERS; id++) + { + if (playerList->players[id].groupScheduledAnim == UNION_ROOM_SPAWN_OUT && playerList->players[id].newPlayerCountdown == 0) + return UNION_ROOM_SPAWN_OUT; + } + // spawning out, and countdown != 0 => SPAWN_OUT_SOON + for (id = 1; id < MAX_RFU_PLAYERS; id++) + { + if (playerList->players[id].groupScheduledAnim == UNION_ROOM_SPAWN_OUT && playerList->players[id].newPlayerCountdown != 0) + return UNION_ROOM_SPAWN_OUT_SOON; + } + // spawning in, and countdown != 0 => SPAWN_IN + for (id = 0; id < MAX_RFU_PLAYERS; id++) + { + if (playerList->players[id].groupScheduledAnim == UNION_ROOM_SPAWN_IN && playerList->players[id].newPlayerCountdown != 0) + return UNION_ROOM_SPAWN_IN; + } + } + return UNION_ROOM_SPAWN_NONE; +#else if (ret != UNION_ROOM_SPAWN_OUT) { for (id = 0; id < MAX_RFU_PLAYERS; id++) @@ -851,6 +1076,7 @@ static u8 LeaderUpdateGroupMembership(struct RfuPlayerList * list) } return ret; +#endif } static u8 LeaderPrunePlayerList(struct RfuPlayerList * list) @@ -911,9 +1137,20 @@ void TryJoinLinkGroup(void) gSpecialVar_Result = LINKUP_ONGOING; } +#if REVISION >= 0xA +static u8 svc_50_wrapper() { + return svc_50() == TRUE; +} +#endif + static void Task_TryJoinLinkGroup(u8 taskId) { s32 id; +#if REVISION >= 0xA + u8 RfuStatus; + bool8 RfuStatusIsGroup; + u8 handleYN; +#endif struct WirelessLink_Group * data = sWirelessLinkMain.group; switch (data->state) @@ -1011,7 +1248,10 @@ static void Task_TryJoinLinkGroup(u8 taskId) GetYouAskedToJoinGroupPleaseWaitMessage(gStringVar4, sPlayerCurrActivity); if (PrintOnTextbox(&data->textState, gStringVar4)) { +#if REVISION >= 0xA +#else CopyAndTranslatePlayerName(gStringVar1, data->playerList->players[data->leaderId]); +#endif data->state = LG_STATE_MAIN; } break; @@ -1038,71 +1278,158 @@ static void Task_TryJoinLinkGroup(u8 taskId) break; } } - - switch (RfuGetStatus()) +#if REVISION >= 0xA + else +#endif { - case RFU_STATUS_FATAL_ERROR: - data->state = LG_STATE_RFU_ERROR; - break; - case RFU_STATUS_CONNECTION_ERROR: - case RFU_STATUS_JOIN_GROUP_NO: - case RFU_STATUS_LEAVE_GROUP: - data->state = LG_STATE_DISCONNECTED; - break; - case RFU_STATUS_JOIN_GROUP_OK: - GetGroupLeaderSentAnOKMessage(gStringVar4, sPlayerCurrActivity); - if (PrintOnTextbox(&data->textState, gStringVar4)) - { - RfuSetStatus(RFU_STATUS_WAIT_ACK_JOIN_GROUP, 0); - StringCopy(gStringVar1, sLinkGroupActivityNameTexts[sPlayerCurrActivity]); - StringExpandPlaceholders(gStringVar4, gText_UR_AwaitingOtherMembers); - } - break; - case RFU_STATUS_WAIT_ACK_JOIN_GROUP: - if (data->delayBeforePrint > 240) + + switch (RfuGetStatus()) { + case RFU_STATUS_FATAL_ERROR: + data->state = LG_STATE_RFU_ERROR; + break; + case RFU_STATUS_CONNECTION_ERROR: + case RFU_STATUS_JOIN_GROUP_NO: + case RFU_STATUS_LEAVE_GROUP: + data->state = LG_STATE_DISCONNECTED; + break; + case RFU_STATUS_JOIN_GROUP_OK: +#if REVISION >= 0xA + CopyAndTranslatePlayerName(gStringVar1, data->playerList->players[data->leaderId]); +#endif + GetGroupLeaderSentAnOKMessage(gStringVar4, sPlayerCurrActivity); if (PrintOnTextbox(&data->textState, gStringVar4)) { - RfuSetStatus(RFU_STATUS_ACK_JOIN_GROUP, 0); - data->delayBeforePrint = 0; + RfuSetStatus(RFU_STATUS_WAIT_ACK_JOIN_GROUP, 0); +#if REVISION >= 0xA +#else + StringCopy(gStringVar1, sLinkGroupActivityNameTexts[sPlayerCurrActivity]); + StringExpandPlaceholders(gStringVar4, gText_UR_AwaitingOtherMembers); +#endif + } + break; + case RFU_STATUS_WAIT_ACK_JOIN_GROUP: + if (data->delayBeforePrint > 240) + { +#if REVISION >= 0xA + StringCopy(gStringVar1, sLinkGroupActivityNameTexts[sPlayerCurrActivity]); + StringExpandPlaceholders(gStringVar4, gText_UR_AwaitingOtherMembers); +#endif + if (PrintOnTextbox(&data->textState, gStringVar4)) + { + RfuSetStatus(RFU_STATUS_ACK_JOIN_GROUP, 0); + data->delayBeforePrint = 0; + } + break; } - } - else - { data->delayBeforePrint++; +#if REVISION >= 0xA + // fallthrough, to not duplicate code + case RFU_STATUS_CHILD_LEAVE_READY: + case RFU_STATUS_CHILD_LEAVE: + case RFU_STATUS_ACK_JOIN_GROUP: + default: + if (JOY_NEW(B_BUTTON)) + { + u8 syscallPlayers = svc_50_wrapper(taskId); + bool8 noPlayers = FALSE; + noPlayers = (syscallPlayers | gReceivedRemoteLinkPlayers) == 0; + if (noPlayers) + { + data->state = LG_STATE_ASK_LEAVE_GROUP; + } + } +#endif + break; } - break; } +#if REVISION >= 0xA +#else if (RfuGetStatus() == RFU_STATUS_OK && JOY_NEW(B_BUTTON)) data->state = LG_STATE_ASK_LEAVE_GROUP; +#endif break; case LG_STATE_ASK_LEAVE_GROUP: if (PrintOnTextbox(&data->textState, gText_UR_QuitBeingMember)) data->state = LG_STATE_ASK_LEAVE_GROUP_HANDLE_INPUT; break; case LG_STATE_ASK_LEAVE_GROUP_HANDLE_INPUT: +#if REVISION >= 0xA + RfuStatus = RfuGetStatus(); + RfuStatusIsGroup = (RfuStatus == RFU_STATUS_JOIN_GROUP_OK || RfuStatus == RFU_STATUS_WAIT_ACK_JOIN_GROUP || RfuStatus == RFU_STATUS_ACK_JOIN_GROUP); + handleYN = gReceivedRemoteLinkPlayers | svc_50_wrapper(); + switch (UnionRoomHandleYesNo(&data->textState, handleYN)) +#else switch (UnionRoomHandleYesNo(&data->textState, RfuGetStatus())) +#endif { case 0: // YES - SendLeaveGroupNotice(); - data->state = LG_STATE_WAIT_LEAVE_GROUP; +#if REVISION >= 0xA + if (RfuStatusIsGroup) +#endif + { + SendLeaveGroupNotice(); + data->state = LG_STATE_WAIT_LEAVE_GROUP; +#if REVISION >= 0xA + data->delayBeforePrint = 0; +#endif + } +#if REVISION >= 0xA + else + { + data->state = LG_STATE_CANCEL_CHOOSE_LEADER; + } +#endif RedrawListMenu(data->listTaskId); break; case 1: // NO case MENU_B_PRESSED: - data->state = LG_STATE_ASK_JOIN_GROUP; +#if REVISION >= 0xA + if (RfuStatusIsGroup) + { + data->state = LG_STATE_MAIN; + if (RfuStatus >= RFU_STATUS_WAIT_ACK_JOIN_GROUP) + { + data->delayBeforePrint = -15; + RfuSetStatus(RFU_STATUS_WAIT_ACK_JOIN_GROUP, 0); + } + } + else +#endif + { + data->state = LG_STATE_ASK_JOIN_GROUP; + } RedrawListMenu(data->listTaskId); break; case -3: data->state = LG_STATE_MAIN; +#if REVISION >= 0xA + if (RfuStatus == RFU_STATUS_WAIT_ACK_JOIN_GROUP) + RfuSetStatus(RFU_STATUS_ACK_JOIN_GROUP, 0); +#endif RedrawListMenu(data->listTaskId); break; } break; case LG_STATE_WAIT_LEAVE_GROUP: +#if REVISION >= 0xA + switch (GetJoinGroupStatus()) + { + case RFU_STATUS_LEAVE_GROUP: + data->state = LG_STATE_DISCONNECTED; + break; + case RFU_STATUS_JOIN_GROUP_NO: + data->state = LG_STATE_CANCEL_CHOOSE_LEADER; + break; + } + if (data->delayBeforePrint > 240) + data->state = LG_STATE_CANCEL_CHOOSE_LEADER; + ++data->delayBeforePrint; +#else if (RfuGetStatus()) data->state = LG_STATE_MAIN; +#endif break; case LG_STATE_CANCEL_CHOOSE_LEADER: // next: LG_STATE_CANCELED case LG_STATE_RFU_ERROR: // next: LG_STATE_RFU_ERROR_SHUTDOWN @@ -1155,6 +1482,9 @@ static void Task_TryJoinLinkGroup(u8 taskId) } break; case LG_STATE_SHUTDOWN: +#if REVISION >= 0xA + DestroyTask_RfuReconnectWithParent(); +#endif DestroyTask(taskId); JoinGroup_EnableScriptContexts(); LinkRfu_Shutdown(); @@ -1557,6 +1887,10 @@ static void Task_StartActivity(u8 taskId) break; } +#if REVISION >= 0xA + svc_SetActivity(sPlayerCurrActivity); +#endif + switch (sPlayerCurrActivity) { case ACTIVITY_BATTLE_SINGLE | IN_UNION_ROOM: @@ -1658,7 +1992,11 @@ static void Task_RunScriptAndFadeToActivity(u8 taskId) } break; case 2: +#if REVISION >= 0xA + if (IsLinkTaskFinished() && !gPaletteFade.active) +#else if (!gPaletteFade.active) +#endif { SetLinkStandbyCallback(); data[0]++; @@ -2261,7 +2599,11 @@ void RunUnionRoom(void) ListMenuLoadStdPalAt(BG_PLTT_ID(13), 1); } +#if REVISION >= 0xA +u16 ReadU16(const u8 *ptr) +#else static u16 ReadAsU16(const u8 *ptr) +#endif { return (ptr[1] << 8) | (ptr[0]); } @@ -2281,6 +2623,9 @@ static void ScheduleFieldMessageAndExit(const u8 *src) struct WirelessLink_URoom * uroom = sWirelessLinkMain.uRoom; uroom->state = UR_STATE_PRINT_AND_EXIT; +#if REVISION >= 0xA + uroom->textState = 0; +#endif if (src != gStringVar4) StringExpandPlaceholders(gStringVar4, src); } @@ -2478,21 +2823,37 @@ static void Task_RunUnionRoom(u8 taskId) break; case UR_STATE_TRY_COMMUNICATING: UR_RunTextPrinters(); +#if REVISION >= 0xA + LinkRfu_ForceChangeSpParent(); +#endif switch (RfuGetStatus()) { case RFU_STATUS_NEW_CHILD_DETECTED: HandleCancelActivity(TRUE); uroom->state = UR_STATE_MAIN; +#if REVISION >= 0xA + return; +#else break; +#endif case RFU_STATUS_FATAL_ERROR: case RFU_STATUS_CONNECTION_ERROR: if (IsUnionRoomListenTaskActive() == TRUE) ScheduleFieldMessageAndExit(gText_UR_TrainerAppearsBusy); else + { ScheduleFieldMessageWithFollowupState(UR_STATE_CANCEL_ACTIVITY_LINK_ERROR, gText_UR_TrainerAppearsBusy); +#if REVISION >= 0xA + gReceivedRemoteLinkPlayers = FALSE; +#endif + } sPlayerCurrActivity = IN_UNION_ROOM; +#if REVISION >= 0xA + return; +#else break; +#endif } if (gReceivedRemoteLinkPlayers) @@ -2503,6 +2864,14 @@ static void Task_RunUnionRoom(u8 taskId) } break; case UR_STATE_COMMUNICATING_WAIT_FOR_DATA: +#if REVISION >= 0xA + if (!gReceivedRemoteLinkPlayers || RfuHasErrored()) + { + DestroyTask(FindTaskIdByFunc(Task_ExchangeCards)); + uroom->state = UR_STATE_TRAINER_APPEARS_BUSY; + break; + } +#endif if (!FuncIsActiveTask(Task_ExchangeCards)) { if (sPlayerCurrActivity == (ACTIVITY_TRADE | IN_UNION_ROOM)) @@ -2593,7 +2962,10 @@ static void Task_RunUnionRoom(u8 taskId) case UR_STATE_WAIT_FOR_RESPONSE_TO_REQUEST: if (!gReceivedRemoteLinkPlayers) { +#if REVISION >= 0xA +#else StringCopy(gStringVar4, gText_UR_TrainerBattleBusy); +#endif uroom->state = UR_STATE_TRAINER_APPEARS_BUSY; } else @@ -2625,6 +2997,9 @@ static void Task_RunUnionRoom(u8 taskId) ScheduleFieldMessageWithFollowupState(UR_STATE_HANDLE_DO_SOMETHING_PROMPT_INPUT, gTexts_UR_HiDoSomething[id][playerGender]); break; case UR_STATE_PRINT_CARD_INFO: +#if REVISION >= 0xA + svc_SetActivity(IN_UNION_ROOM | ACTIVITY_CARD); +#endif if (PrintOnTextbox(&uroom->textState, gStringVar4)) { uroom->state = UR_STATE_WAIT_FINISH_READING_CARD; @@ -2653,6 +3028,15 @@ static void Task_RunUnionRoom(u8 taskId) switch (UnionRoomHandleYesNo(&uroom->textState, FALSE)) { case 0: // YES +#if REVISION >= 0xA + // If not allowed by parental controls, act as if user chose No. + if (!svc_CommsAllowedByParentalControls()) + { + playerGender = GetUnionRoomPlayerGender(taskData[1], uroom->playerList); + ScheduleFieldMessageAndExit(gTexts_UR_DeclineChat[playerGender]); + break; + } +#endif CopyBgTilemapBufferToVram(0); sPlayerCurrActivity = ACTIVITY_CHAT | IN_UNION_ROOM; UpdateGameData_SetActivity(ACTIVITY_CHAT | IN_UNION_ROOM, 0, TRUE); @@ -2705,7 +3089,15 @@ static void Task_RunUnionRoom(u8 taskId) if (IsUnionRoomListenTaskActive() == TRUE) ScheduleFieldMessageAndExit(gTexts_UR_ChatDeclined[playerGender]); else + { ScheduleFieldMessageWithFollowupState(UR_STATE_CANCEL_ACTIVITY_LINK_ERROR, gTexts_UR_ChatDeclined[playerGender]); +#if REVISION >= 0xA + gReceivedRemoteLinkPlayers = FALSE; +#endif + } +#if REVISION >= 0xA + break; +#endif } if (gReceivedRemoteLinkPlayers) uroom->state = UR_STATE_START_ACTIVITY_FREE_UROOM; @@ -2760,6 +3152,19 @@ static void Task_RunUnionRoom(u8 taskId) switch (UnionRoomHandleYesNo(&uroom->textState, FALSE)) { case 0: // ACCEPT +#if REVISION >= 0xA + // If this is union room chat: + // Tell the emulator to check if Switch parental controls allow free communication. + // If it is not allowed, then act as if the user selected to deny the request. + if (sPlayerCurrActivity == (IN_UNION_ROOM | ACTIVITY_CHAT) && !svc_CommsAllowedByParentalControls()) + { + uroom->playerSendBuffer[0] = ACTIVITY_DECLINE | IN_UNION_ROOM; + Rfu_SendPacket(uroom->playerSendBuffer); + uroom->state = UR_STATE_DECLINE_ACTIVITY_REQUEST; + GetYouDeclinedTheOfferMessage(gStringVar4, sPlayerCurrActivity); + break; + } +#endif uroom->playerSendBuffer[0] = ACTIVITY_ACCEPT | IN_UNION_ROOM; if (sPlayerCurrActivity == (ACTIVITY_CHAT | IN_UNION_ROOM)) UpdateGameData_SetActivity(sPlayerCurrActivity | IN_UNION_ROOM, GetLinkPlayerInfoFlags(1), FALSE); @@ -3112,6 +3517,9 @@ void InitUnionRoom(void) struct WirelessLink_URoom * data; sUnionRoomPlayerName[0] = EOS; +#if REVISION >= 0xA + // The rest of this function is stubbed out, as if QL_IS_PLAYBACK_STATE is always true. +#else if (QL_IS_PLAYBACK_STATE) return; CreateTask(Task_InitUnionRoom, 0); @@ -3123,6 +3531,7 @@ void InitUnionRoom(void) data->unknown = 0; data->unreadPlayerId = 0; sUnionRoomPlayerName[0] = EOS; +#endif } static void Task_InitUnionRoom(u8 taskId) @@ -3264,9 +3673,13 @@ static u8 HandlePlayerListUpdate(void) } else if (data->playerList->players[j].groupScheduledAnim != UNION_ROOM_SPAWN_OUT) { - // Person may have disconnected. Give them 10 seconds. + // Person may have disconnected. Give them 10 seconds. (15 seconds in rev 10) data->playerList->players[j].timeoutCounter++; +#if REVISION >= 0xA + if (data->playerList->players[j].timeoutCounter >= 900) +#else if (data->playerList->players[j].timeoutCounter >= 600) +#endif { data->playerList->players[j].groupScheduledAnim = UNION_ROOM_SPAWN_OUT; retVal = PLIST_RECENT_UPDATE; @@ -3274,9 +3687,13 @@ static u8 HandlePlayerListUpdate(void) } else if (data->playerList->players[j].groupScheduledAnim == UNION_ROOM_SPAWN_OUT) { - // Person dropped. Wait 15 seconds, then remove them. + // Person dropped. Wait 15 seconds (20 seconds in rev 10), then remove them. data->playerList->players[j].timeoutCounter++; +#if REVISION >= 0xA + if (data->playerList->players[j].timeoutCounter >= 1200) +#else if (data->playerList->players[j].timeoutCounter >= 900) +#endif { ClearRfuPlayerList(&data->playerList->players[j], 1); } @@ -3520,6 +3937,14 @@ static s32 ListMenuHandler_AllItemsAvailable(u8 *state, u8 *windowId, u8 *listMe ClearStdWindowAndFrame(*windowId, TRUE); RemoveWindow(*windowId); *state = 0; +#if REVISION >= 0xA + // If this is the union room chat, and Switch parental controls disallow free communication, + // always act as if Cancel was pressed. + if ((input & 0xFF) == (ACTIVITY_CHAT | IN_UNION_ROOM) && !svc_CommsAllowedByParentalControls()) + { + return LIST_CANCEL; + } +#endif return input; } else if (JOY_NEW(B_BUTTON)) diff --git a/src/union_room_battle.c b/src/union_room_battle.c index 5c31746a9..f680c33ec 100644 --- a/src/union_room_battle.c +++ b/src/union_room_battle.c @@ -179,16 +179,32 @@ void CB2_UnionRoomBattle(void) case 50: if (!UpdatePaletteFade()) { +#if REVISION >= 0xA +#else SetLinkStandbyCallback(); +#endif gMain.state++; } break; case 51: if (IsLinkTaskFinished()) { +#if REVISION >= 0xA + SetLinkStandbyCallback(); + gMain.state++; +#else + SetMainCallback2(SetUpPartiesAndStartBattle); +#endif + } + break; +#if REVISION >= 0xA + case 52: + if (IsLinkTaskFinished()) + { SetMainCallback2(SetUpPartiesAndStartBattle); } break; +#endif case 6: if (!gReceivedRemoteLinkPlayers) { diff --git a/src/union_room_chat.c b/src/union_room_chat.c index aedc57fdc..2a4182a3a 100644 --- a/src/union_room_chat.c +++ b/src/union_room_chat.c @@ -16,6 +16,7 @@ #include "union_room_chat_display.h" #include "keyboard_text.h" #include "constants/songs.h" +#include "sloopsvc.h" #define MESSAGE_BUFFER_NCHAR 15 @@ -806,6 +807,9 @@ static void ChatEntryRoutine_SendMessage(void) switch (sWork->routineState) { case 0: +#if REVISION >= 0xA + svc_BadWordCheck(sWork->messageEntryBuffer); +#endif if (!gReceivedRemoteLinkPlayers) { GoToRoutine(CHATNETRYROUTINE_HANDLE_INPUT); @@ -1162,6 +1166,9 @@ static void RegisterTextAtRow(void) { u8 *src = UnionRoomChat_GetEndOfMessageEntryBuffer(); StringCopy(sWork->registeredTexts[sWork->currentRow], src); +#if REVISION >= 0xA + svc_BadWordCheck(sWork->registeredTexts[sWork->currentRow]); +#endif sWork->changedRegisteredTexts = TRUE; } diff --git a/src/union_room_player_avatar.c b/src/union_room_player_avatar.c index 2cfa38167..9352b8150 100644 --- a/src/union_room_player_avatar.c +++ b/src/union_room_player_avatar.c @@ -9,6 +9,7 @@ #include "constants/event_object_movement.h" #include "constants/union_room.h" #include "constants/event_objects.h" +#include "sloopsvc.h" #define UR_SPRITE_START_ID (MAX_SPRITES - MAX_UNION_ROOM_LEADERS) @@ -513,6 +514,14 @@ static void SpawnGroupLeaderAndMembers(u32 leaderId, struct RfuGameData * gameDa { case ACTIVITY_NONE | IN_UNION_ROOM: case ACTIVITY_PLYRTALK | IN_UNION_ROOM: +#if REVISION >= 0xA + if ((svc_4b() & SVC4B_EXIT_EARLY) != 0) + { + DespawnGroupLeader(leaderId); + AssembleGroup(leaderId, gameData); + break; + } +#endif SpawnGroupLeader(leaderId, gameData->playerGender, gameData->compatibility.playerTrainerId[0]); for (i = 0; i < MAX_RFU_PLAYERS; i++) DespawnGroupMember(leaderId, i); diff --git a/src/wireless_communication_status_screen.c b/src/wireless_communication_status_screen.c index 693e22052..28b0993bc 100644 --- a/src/wireless_communication_status_screen.c +++ b/src/wireless_communication_status_screen.c @@ -13,6 +13,7 @@ #include "union_room.h" #include "constants/songs.h" #include "constants/union_room.h" +#include "sloopsvc.h" enum { COLOR_NONE, @@ -41,8 +42,8 @@ static struct u8 filler[10]; } * sStatusScreen; +void Task_WirelessCommunicationScreen(u8 taskId); static void CB2_InitWirelessCommunicationScreen(void); -static void Task_WirelessCommunicationScreen(u8 taskId); static void WCSS_AddTextPrinterParameterized(u8 windowId, u8 fontId, const u8 * str, u8 x, u8 y, u8 palIdx); static bool32 UpdateCommunicationCounts(u32 * counts, u32 * lastCounts, u32 * activities, u8 taskId); @@ -134,7 +135,7 @@ static const u8 *const sHeaderTexts[NUM_GROUPTYPES + 1] = { // Activity, group type, number of players // 0 players means the number of players can change and should be counted dynamically // GROUPTYPE_TOTAL have no unique group and are simply counted in the total of "people communicating". -// A handful use NUM_GROUPTYPES, which is invalid, and are changed to GROUPTYPE_TOTAL in Emerald. +// A handful use NUM_GROUPTYPES, which is invalid, and are changed to GROUPTYPE_TOTAL in Emerald (and Revision 10) // UB: GROUPTYPE_NONE (-1) can potentially be used as an index into a u8[4] in CountPlayersInGroupAndGetActivity. static const u8 sActivityGroupInfo[][3] = { {ACTIVITY_BATTLE_SINGLE, GROUPTYPE_BATTLE, 2}, @@ -143,13 +144,23 @@ static const u8 sActivityGroupInfo[][3] = { {ACTIVITY_TRADE, GROUPTYPE_TRADE, 2}, {ACTIVITY_WONDER_CARD, GROUPTYPE_TOTAL, 2}, {ACTIVITY_WONDER_NEWS, GROUPTYPE_TOTAL, 2}, +#if REVISION >= 0xA + {ACTIVITY_POKEMON_JUMP, GROUPTYPE_TOTAL, 0}, + {ACTIVITY_BERRY_CRUSH, GROUPTYPE_TOTAL, 0}, + {ACTIVITY_BERRY_PICK, GROUPTYPE_TOTAL, 0}, +#else {ACTIVITY_POKEMON_JUMP, NUM_GROUPTYPES, 0}, {ACTIVITY_BERRY_CRUSH, NUM_GROUPTYPES, 0}, {ACTIVITY_BERRY_PICK, NUM_GROUPTYPES, 0}, +#endif {ACTIVITY_SEARCH, GROUPTYPE_NONE, 0}, {ACTIVITY_SPIN_TRADE, GROUPTYPE_TRADE, 0}, {ACTIVITY_ITEM_TRADE, GROUPTYPE_NONE, 0}, +#if REVISION >= 0xA + {ACTIVITY_RECORD_CORNER, GROUPTYPE_TOTAL, 0}, +#else {ACTIVITY_RECORD_CORNER, NUM_GROUPTYPES, 0}, +#endif {ACTIVITY_BERRY_BLENDER, GROUPTYPE_NONE, 0}, {ACTIVITY_NONE | IN_UNION_ROOM, GROUPTYPE_UNION, 1}, {ACTIVITY_BATTLE_SINGLE | IN_UNION_ROOM, GROUPTYPE_UNION, 2}, @@ -278,7 +289,7 @@ static void PrintHeaderTexts(void) #define tState data[0] -static void Task_WirelessCommunicationScreen(u8 taskId) +void Task_WirelessCommunicationScreen(u8 taskId) { s32 i; switch (gTasks[taskId].tState) @@ -313,7 +324,11 @@ static void Task_WirelessCommunicationScreen(u8 taskId) PutWindowTilemap(2); CopyWindowToVram(2, COPYWIN_FULL); } +#if REVISION >= 0xA + if (JOY_NEW(A_BUTTON) || JOY_NEW(B_BUTTON) || svc_53()) +#else if (JOY_NEW(A_BUTTON) || JOY_NEW(B_BUTTON)) +#endif { PlaySE(SE_SELECT); gTasks[sStatusScreen->rfuTaskId].data[15] = 0xFF; @@ -372,6 +387,40 @@ static void WCSS_AddTextPrinterParameterized(u8 windowId, u8 fontId, const u8 * static u32 CountPlayersInGroupAndGetActivity(struct RfuPlayer * player, u32 * groupCounts) { +#if REVISION >= 0xA + u32 activity = player->rfu.data.activity; + if (player->groupScheduledAnim == UNION_ROOM_SPAWN_IN) + { + + u32 i = 0; + const u8 * group_info = &sActivityGroupInfo[0][0]; + const u8 * group_players = &group_info[2]; + const u8 * group_activity = group_info; + s32 offset = 0; + for (; i < ARRAY_COUNT(sActivityGroupInfo); i++) + { + const u8 * group_type = &group_info[1]; + u8 type = ((u8*)offset)[(u32)group_type]; // needed to match, but nobody would write this??? + if (type < MAX_LINK_PLAYERS && activity == *group_activity) + { + u8 k = *group_players; + if (k == 0) + { + s32 j; + for (j = 0; j < RFU_CHILD_MAX; j++) + if (player->rfu.data.partnerInfo[j] != 0) k++; + k++; + } + groupCounts[type] += k; + break; + } + group_players += sizeof(sActivityGroupInfo[0]); + group_activity += sizeof(sActivityGroupInfo[0]); + offset += (u8)sizeof(sActivityGroupInfo[0]); + } + + } +#else u32 activity = player->rfu.data.activity; s32 i, j, k; @@ -398,11 +447,13 @@ static u32 CountPlayersInGroupAndGetActivity(struct RfuPlayer * player, u32 * gr } } - return activity; - #undef group_activity #undef group_type #undef group_players +#endif + + return activity; + } static bool32 HaveCountsChanged(const u32 * curCounts, const u32 * prevCounts) @@ -435,6 +486,9 @@ static bool32 UpdateCommunicationCounts(u32 * groupCounts, u32 * prevGroupCounts } } +#if REVISION >= 0xA + if (HaveCountsChanged(groupCountBuffer, prevGroupCounts)) +#else if (!HaveCountsChanged(groupCountBuffer, prevGroupCounts)) { if (activitiesUpdated == TRUE) @@ -442,16 +496,27 @@ static bool32 UpdateCommunicationCounts(u32 * groupCounts, u32 * prevGroupCounts else return FALSE; } +#endif + { + memcpy(groupCounts, groupCountBuffer, sizeof(groupCountBuffer)); + memcpy(prevGroupCounts, groupCountBuffer, sizeof(groupCountBuffer)); - memcpy(groupCounts, groupCountBuffer, sizeof(groupCountBuffer)); - memcpy(prevGroupCounts, groupCountBuffer, sizeof(groupCountBuffer)); - - groupCounts[GROUPTYPE_TOTAL] = groupCounts[GROUPTYPE_TRADE] - + groupCounts[GROUPTYPE_BATTLE] - + groupCounts[GROUPTYPE_UNION] - #ifdef BUGFIX - + groupCounts[GROUPTYPE_TOTAL] // Missing count for activities not in above groups - #endif - ; + groupCounts[GROUPTYPE_TOTAL] = groupCounts[GROUPTYPE_TRADE] + + groupCounts[GROUPTYPE_BATTLE] + + groupCounts[GROUPTYPE_UNION] + #if defined(BUGFIX) || REVISION >= 0xA + + groupCounts[GROUPTYPE_TOTAL] // Missing count for activities not in above groups + #endif + ; + +#if REVISION >= 0xA + activitiesUpdated = TRUE; +#endif + } + +#if REVISION >= 0xA + return activitiesUpdated; +#else return TRUE; +#endif } diff --git a/sym_bss.txt b/sym_bss.txt index 00c7b1dc6..81e7e2051 100644 --- a/sym_bss.txt +++ b/sym_bss.txt @@ -4,6 +4,7 @@ .include "src/malloc.o" .include "src/text_printer.o" .include "src/sprite.o" + .include "src/sloopsvc.o" .include "src/link.o" .include "src/multiboot.o" .include "src/daycare.o" diff --git a/sym_bss_rev10.txt b/sym_bss_rev10.txt new file mode 100644 index 000000000..1a90ebb38 --- /dev/null +++ b/sym_bss_rev10.txt @@ -0,0 +1,38 @@ + .include "src/gpu_regs.o" + .include "src/dma3_manager.o" + .include "src/bg.o" + .include "src/malloc.o" + .include "src/text_printer.o" + .include "src/librfu_stwi.o" + .include "src/librfu_rfu.o" + .include "src/sprite.o" + .include "src/sloopsvc.o" + .include "src/link.o" + .include "src/multiboot.o" + .include "src/daycare.o" + .include "src/trade.o" + .include "src/play_time.o" + .include "src/overworld.o" + .include "src/field_camera.o" + .include "src/script.o" + .include "src/start_menu.o" + .include "src/tileset_anims.o" + .include "src/sound.o" + .include "src/field_effect.o" + .include "src/pokemon_storage_system_misc.o" + .include "src/easy_chat.o" + .include "src/link_rfu_2.o" + .include "src/link_rfu_3.o" + .include "src/quest_log.o" + .include "src/union_room.o" + .include "src/pokemon_special_anim_scene.o" + .include "src/wireless_communication_status_screen.o" + .include "src/dodrio_berry_picking.o" + .include "src/ereader_helpers.o" + .include "src/digit_obj_util.o" + .include "src/m4a_1.o" + .include "data/sound_data.o" + .include "src/agb_flash.o" + .include "*libgcc.a:dp-bit.o" + .include "*libgcc.a:fp-bit.o" + .include "*libc.a:syscalls.o" diff --git a/sym_common.txt b/sym_common.txt index 1e57985da..9798689ad 100644 --- a/sym_common.txt +++ b/sym_common.txt @@ -5,6 +5,7 @@ .include "window.o" .include "text.o" .include "sprite.o" + .include "sloopsvc.o" .include "link.o" .align 4 .include "battle_main.o" diff --git a/sym_common_rev10.txt b/sym_common_rev10.txt new file mode 100644 index 000000000..ce4a446c3 --- /dev/null +++ b/sym_common_rev10.txt @@ -0,0 +1,56 @@ + .include "main.o" + .include "bg.o" + .include "text_printer.o" + .align 4 + .include "window.o" + .include "librfu_stwi.o" + .align 4 + .include "librfu_rfu.o" + .include "text.o" + .include "sprite.o" + .align 4 + .include "sloopsvc.o" + .include "link.o" + .align 4 + .include "battle_main.o" + .include "random.o" + .include "load_save.o" + .include "overworld.o" + .align 4 + .include "fieldmap.o" + .align 4 + .include "field_camera.o" + .include "scrcmd.o" + .include "field_control_avatar.o" + .include "event_data.o" + .include "sound.o" + .include "task.o" + .include "cable_club.o" + .include "image_processing_effects.o" + .include "field_specials.o" + .include "evolution_scene.o" + .include "save.o" + .include "battle_anim_special.o" + .include "save_failed_screen.o" + .align 4 + .include "link_rfu_2.o" + .align 4 + .include "AgbRfu_LinkManager.o" + .align 4 + .include "list_menu.o" + .include "quest_log.o" + .include "union_room.o" + .include "party_menu.o" + .include "help_system.o" + .align 4 + .include "fame_checker.o" + .include "help_system_util.o" + .align 4 + .include "ereader_screen.o" + .align 4 + .include "battle_controller_pokedude.o" + .align 4 + .include "berry_fix_program.o" + .include "m4a.o" + .include "agb_flash.o" + .include "librfu_sio32id.o" diff --git a/sym_ewram_rev10.txt b/sym_ewram_rev10.txt new file mode 100644 index 000000000..cee4e8281 --- /dev/null +++ b/sym_ewram_rev10.txt @@ -0,0 +1,137 @@ + .include "src/main.o" + .include "src/malloc.o" + .include "src/text_printer.o" + .include "src/window.o" + .include "src/window_8bpp.o" + .include "src/sprite.o" + .include "src/string_util.o" + .include "src/link.o" + .space 8 + .include "src/battle_controllers.o" + .include "src/battle_main.o" + .include "src/pokemon.o" + .include "src/daycare.o" + .include "src/load_save.o" + .include "src/trade.o" + .include "src/trade_scene.o" + .include "src/new_game.o" + .include "src/overworld.o" + .include "src/fieldmap.o" + .include "src/field_camera.o" + .include "src/field_player_avatar.o" + .include "src/event_object_movement.o" + .include "src/field_message_box.o" + .include "src/script.o" + .include "src/scrcmd.o" + .include "src/event_data.o" + .include "src/start_menu.o" + .include "src/tileset_anims.o" + .include "src/palette.o" + .include "src/sound.o" + .include "src/battle_anim.o" + .include "src/battle_anim_mons.o" + .include "src/title_screen.o" + .include "src/field_weather.o" + .include "src/battle_setup.o" + .include "src/wild_encounter.o" + .include "src/field_effect.o" + .include "src/scanline_effect.o" + .include "src/option_menu.o" + .include "src/trainer_card.o" + .include "src/pokemon_storage_system_menu.o" + .include "src/pokemon_storage_system_tasks.o" + .include "src/pokemon_storage_system_data.o" + .include "src/pokemon_storage_system_misc.o" + .include "src/script_movement.o" + .include "src/fldeff_cut.o" + .include "src/item_menu_icons.o" + .include "src/item.o" + .include "src/shop.o" + .include "src/special_field_anim.o" + .include "src/script_menu.o" + .include "src/naming_screen.o" + .include "src/money.o" + .include "src/safari_zone.o" + .include "src/item_use.o" + .include "src/battle_anim_effects_1.o" + .include "src/battle_anim_dragon.o" + .include "src/battle_anim_utility_funcs.o" + .include "src/battle_intro.o" + .include "src/easy_chat.o" + .include "src/mon_markings.o" + .include "src/mail.o" + .include "src/menu_helpers.o" + .include "src/region_map.o" + .include "src/battle_ai_script_commands.o" + .include "src/fldeff_rocksmash.o" + .include "src/field_specials.o" + .include "src/battle_records.o" + .include "src/evolution_scene.o" + .include "src/coins.o" + .include "src/battle_transition.o" + .include "src/battle_message.o" + .include "src/save.o" + .include "src/mystery_event_script.o" + .include "src/fldeff_sweetscent.o" + .include "src/learn_move.o" + .include "src/battle_tower.o" + .include "src/player_pc.o" + .include "src/intro.o" + .include "src/hall_of_fame.o" + .include "src/credits.o" + .include "src/diploma.o" + .include "src/save_failed_screen.o" + .include "src/clear_save_data_screen.o" + .include "src/new_menu_helpers.o" + .include "src/tilemap_util.o" + .include "src/map_preview_screen.o" + .include "src/link_rfu_2.o" + .include "src/link_rfu_3.o" + .include "src/easy_chat_2.o" + .include "src/easy_chat_3.o" + .include "src/pokedex_screen.o" + .include "src/list_menu.o" + .include "src/item_menu.o" + .include "src/bag.o" + .include "src/trainer_pokemon_sprites.o" + .include "src/vs_seeker.o" + .include "src/item_pc.o" + .include "src/mailbox_pc.o" + .include "src/menu.o" + .include "src/quest_log.o" + .include "src/help_message.o" + .include "src/quest_log_events.o" + .include "src/union_room.o" + .include "src/union_room_player_avatar.o" + .include "src/union_room_battle.o" + .include "src/pokemon_special_anim.o" + .include "src/party_menu.o" + .include "src/union_room_chat.o" + .include "src/union_room_chat_display.o" + .include "src/union_room_chat_objects.o" + .include "src/help_system.o" + .include "src/fame_checker.o" + .include "src/oak_speech.o" + .include "src/tm_case.o" + .include "src/menu_indicators.o" + .include "src/pokemon_summary_screen.o" + .include "src/help_system_util.o" + .include "src/dynamic_placeholder_text_util.o" + .include "src/berry_pouch.o" + .include "src/slot_machine.o" + .include "src/roamer.o" + .include "src/mystery_gift_menu.o" + .include "src/mystery_gift.o" + .include "src/mystery_gift_link.o" + .include "src/mystery_gift_client.o" + .include "src/mystery_gift_server.o" + .include "src/mystery_gift_show_card.o" + .include "src/mystery_gift_show_news.o" + .include "src/seagallop.o" + .include "src/pokemon_jump.o" + .include "src/berry_crush.o" + .include "src/dodrio_berry_picking.o" + .include "src/teachy_tv.o" + .include "src/digit_obj_util.o" + .include "src/trainer_tower.o" + .include "src/berry_powder.o" From 7b745dc2839a4fc443e7dfee8fd150da72c23693 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sat, 21 Mar 2026 16:47:47 -0500 Subject: [PATCH 06/14] Fix rev10's ld_script --- ld_script_rev10.ld | 248 ++++++++++++++++++++++----------------------- 1 file changed, 124 insertions(+), 124 deletions(-) diff --git a/ld_script_rev10.ld b/ld_script_rev10.ld index 60b6f4431..4eb3bc2ee 100644 --- a/ld_script_rev10.ld +++ b/ld_script_rev10.ld @@ -625,8 +625,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_rs_door.o(.rodata); sound/songs/midi/se_exit.o(.rodata); sound/songs/midi/se_ledge.o(.rodata); @@ -720,8 +720,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); @@ -730,151 +730,151 @@ 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_door.o(.rodata); - sound/songs/se_card_flip.o(.rodata); - sound/songs/se_card_flipping.o(.rodata); - sound/songs/se_card_open.o(.rodata); - sound/songs/se_bag_cursor.o(.rodata); - sound/songs/se_bag_pocket.o(.rodata); - sound/songs/se_ball_click.o(.rodata); - sound/songs/se_shop.o(.rodata); - sound/songs/se_ss_anne_horn.o(.rodata); - sound/songs/se_help_open.o(.rodata); - sound/songs/se_help_close.o(.rodata); - sound/songs/se_help_error.o(.rodata); - sound/songs/se_deoxys_move.o(.rodata); - sound/songs/se_poke_jump_success.o(.rodata); - sound/songs/se_poke_jump_failure.o(.rodata); + sound/songs/midi/se_card_flip.o(.rodata); + sound/songs/midi/se_card_flipping.o(.rodata); + sound/songs/midi/se_card_open.o(.rodata); + sound/songs/midi/se_bag_cursor.o(.rodata); + sound/songs/midi/se_bag_pocket.o(.rodata); + sound/songs/midi/se_ball_click.o(.rodata); + sound/songs/midi/se_shop.o(.rodata); + sound/songs/midi/se_ss_anne_horn.o(.rodata); + sound/songs/midi/se_help_open.o(.rodata); + sound/songs/midi/se_help_close.o(.rodata); + sound/songs/midi/se_help_error.o(.rodata); + sound/songs/midi/se_deoxys_move.o(.rodata); + sound/songs/midi/se_poke_jump_success.o(.rodata); + sound/songs/midi/se_poke_jump_failure.o(.rodata); sound/songs/midi/mus_heal.o(.rodata); sound/songs/midi/mus_level_up.o(.rodata); sound/songs/midi/mus_obtain_item.o(.rodata); From 891e203dedd0795aea0d33ae98d6db9a03868efa Mon Sep 17 00:00:00 2001 From: SiliconA-Z Date: Sat, 21 Mar 2026 18:20:00 -0400 Subject: [PATCH 07/14] Simplify DynamicPlaceholderTextUtil_Reset (#719) Replace the pointer-based do/while and intptr_t casts with a simple indexed for-loop that sets each element of sStringPointers to NULL. --- src/dynamic_placeholder_text_util.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/dynamic_placeholder_text_util.c b/src/dynamic_placeholder_text_util.c index e9089c30a..63f49748b 100644 --- a/src/dynamic_placeholder_text_util.c +++ b/src/dynamic_placeholder_text_util.c @@ -89,15 +89,9 @@ static const u8 sTextColorTable[] = void DynamicPlaceholderTextUtil_Reset(void) { - const u8 **ptr = sStringPointers; - u8 *fillval = NULL; - const u8 **ptr2 = ptr + (NELEMS(sStringPointers) - 1); - - do - { - *ptr2-- = fillval; - } - while ((intptr_t)ptr2 >= (intptr_t)ptr); + s32 i; + for (i = 0; i < NELEMS(sStringPointers); i++) + sStringPointers[i] = NULL; } void DynamicPlaceholderTextUtil_SetPlaceholderPtr(u8 idx, const u8 *ptr) From 3eac222192ab42764b1101b6b9e41c6ecae26f2f Mon Sep 17 00:00:00 2001 From: SiliconA-Z Date: Sat, 21 Mar 2026 18:41:02 -0400 Subject: [PATCH 08/14] Fix matching (#734) --- src/dynamic_placeholder_text_util.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/dynamic_placeholder_text_util.c b/src/dynamic_placeholder_text_util.c index 63f49748b..48b40d0cd 100644 --- a/src/dynamic_placeholder_text_util.c +++ b/src/dynamic_placeholder_text_util.c @@ -89,8 +89,8 @@ static const u8 sTextColorTable[] = void DynamicPlaceholderTextUtil_Reset(void) { - s32 i; - for (i = 0; i < NELEMS(sStringPointers); i++) + int i; + for (i = 0; i < (int)NELEMS(sStringPointers); i++) sStringPointers[i] = NULL; } From 590d5a6f7bb16444046c0a719ed9c1e5fa5e96e4 Mon Sep 17 00:00:00 2001 From: SiliconA-Z Date: Sat, 21 Mar 2026 20:05:35 -0400 Subject: [PATCH 09/14] Have GetAvailableObjectEventId match in all versions (#735) agbcc probably was affected by whatever assert was in whatever file in here and generated different code. --- src/event_object_movement.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/src/event_object_movement.c b/src/event_object_movement.c index 8110c247a..52043f9ff 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -1495,30 +1495,19 @@ static bool8 GetAvailableObjectEventId(u16 localId, u8 mapNum, u8 mapGroup, u8 * { u8 i = 0; -#if REVISION >= 0xA for (i = 0; i < OBJECT_EVENTS_COUNT && gObjectEvents[i].active; i++) -#else - for (i = 0; i < OBJECT_EVENTS_COUNT; i++) -#endif { - -#if REVISION >= 0xA -#else - if (!gObjectEvents[i].active) - break; -#endif if (gObjectEvents[i].localId == localId && gObjectEvents[i].mapNum == mapNum && gObjectEvents[i].mapGroup == mapGroup) return TRUE; } if (i >= OBJECT_EVENTS_COUNT) return TRUE; *objectEventId = i; - do + for (; i < OBJECT_EVENTS_COUNT; i++) { if (gObjectEvents[i].active && gObjectEvents[i].localId == localId && gObjectEvents[i].mapNum == mapNum && gObjectEvents[i].mapGroup == mapGroup) return TRUE; - i++; - } while (i < OBJECT_EVENTS_COUNT); + } return FALSE; } From 37d50c4c197457dd72e641eaff3c3767623987cc Mon Sep 17 00:00:00 2001 From: SiliconA-Z Date: Sat, 21 Mar 2026 20:35:01 -0400 Subject: [PATCH 10/14] Fix differences in battle_message.c (#736) --- src/battle_message.c | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/src/battle_message.c b/src/battle_message.c index aabbbcb9a..b3b30edff 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -1785,33 +1785,20 @@ static const u8 *TryGetStatusString(u8 *src) { u32 i; u8 status[] = _("$$$$$$$"); - u32 chars1, chars2; + u32 chars1, chars2, *cmp; u8 *statusPtr; statusPtr = status; -#if REVISION >= 0xA for (i = 0; i < 8 && *src != EOS; i++) -#else - for (i = 0; i < 8; i++) -#endif - { -#if REVISION >= 0xA -#else - if (*src == EOS) - break; -#endif - *statusPtr = *src; - src++; - statusPtr++; - } + *statusPtr++ = *src++; - chars1 = *(u32 *)(&status[0]); - chars2 = *(u32 *)(&status[4]); + chars1 = *(u32 *)status; + chars2 = *((u32 *)status + 1); for (i = 0; i < NELEMS(gStatusConditionStringsTable); i++) { - if (chars1 == *(u32 *)(&gStatusConditionStringsTable[i][0][0]) - && chars2 == *(u32 *)(&gStatusConditionStringsTable[i][0][4])) + cmp = (u32 *)gStatusConditionStringsTable[i][0]; + if (chars1 == cmp[0] && chars2 == cmp[1]) return gStatusConditionStringsTable[i][1]; } return NULL; From 7bf571e26a97e0e1051f7b8ab416c495c2a85b91 Mon Sep 17 00:00:00 2001 From: cawtds <38510667+cawtds@users.noreply.github.com> Date: Sun, 22 Mar 2026 14:11:16 +0100 Subject: [PATCH 11/14] fix ub for forced link movement (#732) --- src/overworld.c | 56 +++++++++++++++++++++++++------------------------ 1 file changed, 29 insertions(+), 27 deletions(-) diff --git a/src/overworld.c b/src/overworld.c index ffce6cecc..339014da4 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -59,15 +59,20 @@ #define PLAYER_LINK_STATE_READY 0x82 #define PLAYER_LINK_STATE_EXITING_ROOM 0x83 -#define FACING_NONE 0 -#define FACING_UP 1 -#define FACING_DOWN 2 -#define FACING_LEFT 3 -#define FACING_RIGHT 4 -#define FACING_FORCED_UP 7 -#define FACING_FORCED_DOWN 8 -#define FACING_FORCED_LEFT 9 -#define FACING_FORCED_RIGHT 10 +enum LinkFacing +{ + FACING_NONE, + FACING_UP, + FACING_DOWN, + FACING_LEFT, + FACING_RIGHT, + FACING_UNUSED1, + FACING_UNUSED2, + FACING_FORCED_UP, + FACING_FORCED_DOWN, + FACING_FORCED_LEFT, + FACING_FORCED_RIGHT, +}; typedef u16 (*KeyInterCB)(u32 key); @@ -1278,7 +1283,7 @@ static const int sUnusedData[] = { 44 }; -const struct Coords32 gDirectionToVectors[] = +const struct Coords32 gDirectionToVectors[] = { [DIR_NONE] = { 0, 0}, [DIR_SOUTH] = { 0, 1}, @@ -2552,21 +2557,17 @@ static u8 (*const sLinkPlayerMovementModes[])(struct LinkPlayerObjectEvent *, st // These handlers return TRUE if the movement was scripted and successful, and FALSE otherwise. static bool8 (*const sLinkPlayerFacingHandlers[])(struct LinkPlayerObjectEvent *, struct ObjectEvent *, u8) = { - [DIR_NONE] = FacingHandler_DoNothing, - [DIR_SOUTH] = FacingHandler_DpadMovement, - [DIR_NORTH] = FacingHandler_DpadMovement, - [DIR_WEST] = FacingHandler_DpadMovement, - [DIR_EAST] = FacingHandler_DpadMovement, -}; - -static bool8 (*const sUnusedLinkPlayerFacingHandlers[])(struct LinkPlayerObjectEvent *, struct ObjectEvent *, u8) = -{ - FacingHandler_DoNothing, - FacingHandler_DoNothing, - FacingHandler_ForcedFacingChange, - FacingHandler_ForcedFacingChange, - FacingHandler_ForcedFacingChange, - FacingHandler_ForcedFacingChange, + [FACING_NONE] = FacingHandler_DoNothing, + [FACING_UP] = FacingHandler_DpadMovement, + [FACING_DOWN] = FacingHandler_DpadMovement, + [FACING_LEFT] = FacingHandler_DpadMovement, + [FACING_RIGHT] = FacingHandler_DpadMovement, + [FACING_UNUSED1] = FacingHandler_DoNothing, + [FACING_UNUSED2] = FacingHandler_DoNothing, + [FACING_FORCED_UP] = FacingHandler_ForcedFacingChange, + [FACING_FORCED_DOWN] = FacingHandler_ForcedFacingChange, + [FACING_FORCED_LEFT] = FacingHandler_ForcedFacingChange, + [FACING_FORCED_RIGHT] = FacingHandler_ForcedFacingChange, }; // These handlers are run after an attempted movement. @@ -3066,7 +3067,8 @@ static bool32 CanCableClubPlayerPressStart(struct CableClubPlayer *player) static const u8 *TryGetTileEventScript(struct CableClubPlayer *player) { if (player->movementMode != MOVEMENT_MODE_SCRIPTED) - return FACING_NONE; + return NULL; + return GetCoordEventScriptAtMapPosition(&player->pos); } @@ -3088,7 +3090,7 @@ static const u8 *TryInteractWithPlayer(struct CableClubPlayer *player) u8 linkPlayerId; if (player->movementMode != MOVEMENT_MODE_FREE && player->movementMode != MOVEMENT_MODE_SCRIPTED) - return FACING_NONE; + return NULL; otherPlayerPos = player->pos; otherPlayerPos.x += gDirectionToVectors[player->facing].x; From cf4f0ce152e488cd96c7963e49d89fdb49adc993 Mon Sep 17 00:00:00 2001 From: Jademalo <386846+Jademalo@users.noreply.github.com> Date: Sun, 22 Mar 2026 13:23:21 +0000 Subject: [PATCH 12/14] Sync DWARF debug sections (#728) --- ld_script.ld | 17 +++++++++++++++-- ld_script_modern.ld | 21 +++++++++++++++++++-- 2 files changed, 34 insertions(+), 4 deletions(-) diff --git a/ld_script.ld b/ld_script.ld index f7e62c922..9a4b45031 100644 --- a/ld_script.ld +++ b/ld_script.ld @@ -1042,11 +1042,24 @@ SECTIONS { data/*.o(.rodata); } > ROM =0 + /* DWARF debug sections. + Symbols in the DWARF debugging sections are relative to the beginning + of the section so we begin them at 0. */ - /* DWARF 2 sections */ + /* DWARF 1 */ + .debug 0 : { *(.debug) } + .line 0 : { *(.line) } + + /* GNU DWARF 1 extensions */ + .debug_srcinfo 0 : { *(.debug_srcinfo) } + .debug_sfnames 0 : { *(.debug_sfnames) } + + /* DWARF 1.1 and DWARF 2 */ .debug_aranges 0 : { *(.debug_aranges) } .debug_pubnames 0 : { *(.debug_pubnames) } - .debug_info 0 : { *(.debug_info) } + + /* DWARF 2 */ + .debug_info 0 : { *(.debug_info .gnu.linkonce.wi.*) } .debug_abbrev 0 : { *(.debug_abbrev) } .debug_line 0 : { *(.debug_line) } .debug_frame 0 : { *(.debug_frame) } diff --git a/ld_script_modern.ld b/ld_script_modern.ld index 2b5eb546d..e93024352 100644 --- a/ld_script_modern.ld +++ b/ld_script_modern.ld @@ -65,10 +65,24 @@ SECTIONS { *(.rodata*); } > ROM =0 - /* DWARF 2 sections */ + /* DWARF debug sections. + Symbols in the DWARF debugging sections are relative to the beginning + of the section so we begin them at 0. */ + + /* DWARF 1 */ + .debug 0 : { *(.debug) } + .line 0 : { *(.line) } + + /* GNU DWARF 1 extensions */ + .debug_srcinfo 0 : { *(.debug_srcinfo) } + .debug_sfnames 0 : { *(.debug_sfnames) } + + /* DWARF 1.1 and DWARF 2 */ .debug_aranges 0 : { *(.debug_aranges) } .debug_pubnames 0 : { *(.debug_pubnames) } - .debug_info 0 : { *(.debug_info) } + + /* DWARF 2 */ + .debug_info 0 : { *(.debug_info .gnu.linkonce.wi.*) } .debug_abbrev 0 : { *(.debug_abbrev) } .debug_line 0 : { *(.debug_line) } .debug_frame 0 : { *(.debug_frame) } @@ -76,6 +90,9 @@ SECTIONS { .debug_loc 0 : { *(.debug_loc) } .debug_macinfo 0 : { *(.debug_macinfo) } + /* DWARF 5*/ + .debug_line_str 0 : { *(.debug_line_str) } + /* Discard everything not specifically mentioned above. */ /DISCARD/ : { From 59bf609685ec57becee28fc9b54c24caa7a5ab90 Mon Sep 17 00:00:00 2001 From: cawtds <38510667+cawtds@users.noreply.github.com> Date: Sun, 22 Mar 2026 14:26:24 +0100 Subject: [PATCH 13/14] combine palettes (#723) --- graphics/cave_transition/enter.pal | 11 ----------- graphics/cave_transition/exit.pal | 11 ----------- src/fldeff_flash.c | 9 ++++----- 3 files changed, 4 insertions(+), 27 deletions(-) delete mode 100644 graphics/cave_transition/enter.pal delete mode 100644 graphics/cave_transition/exit.pal diff --git a/graphics/cave_transition/enter.pal b/graphics/cave_transition/enter.pal deleted file mode 100644 index fea15a176..000000000 --- a/graphics/cave_transition/enter.pal +++ /dev/null @@ -1,11 +0,0 @@ -JASC-PAL -0100 -8 -148 197 172 -16 16 16 -32 32 32 -49 49 49 -65 65 65 -82 82 82 -98 98 98 -115 115 115 diff --git a/graphics/cave_transition/exit.pal b/graphics/cave_transition/exit.pal deleted file mode 100644 index 09eb37624..000000000 --- a/graphics/cave_transition/exit.pal +++ /dev/null @@ -1,11 +0,0 @@ -JASC-PAL -0100 -8 -131 131 131 -148 148 148 -164 164 164 -180 180 180 -197 197 197 -213 213 213 -230 230 230 -255 255 255 diff --git a/src/fldeff_flash.c b/src/fldeff_flash.c index c9918e638..ffc11a28d 100644 --- a/src/fldeff_flash.c +++ b/src/fldeff_flash.c @@ -157,8 +157,7 @@ static const struct FlashStruct sTransitionTypes[] = { static const u16 sCaveTransitionPalette_White[] = INCBIN_U16("graphics/cave_transition/white.gbapal"); static const u16 sCaveTransitionPalette_Black[] = INCBIN_U16("graphics/cave_transition/black.gbapal"); -static const u16 sCaveTransitionPalette_Enter[] = INCBIN_U16("graphics/cave_transition/enter.gbapal"); -static const u16 sCaveTransitionPalette_Exit[] = INCBIN_U16("graphics/cave_transition/exit.gbapal"); +static const u16 sCaveTransitionPalette[] = INCBIN_U16("graphics/cave_transition/tiles.gbapal"); static const u32 sCaveTransitionTilemap[] = INCBIN_U32("graphics/cave_transition/tilemap.bin.lz"); static const u32 sCaveTransitionTiles[] = INCBIN_U32("graphics/cave_transition/tiles.4bpp.lz"); @@ -302,7 +301,7 @@ static void Task_FlashTransition_Exit_1(u8 taskId) LZ77UnCompVram(sCaveTransitionTiles, (void *)BG_CHAR_ADDR(3)); LZ77UnCompVram(sCaveTransitionTilemap, (void *)BG_SCREEN_ADDR(31)); LoadPalette(sCaveTransitionPalette_White, BG_PLTT_ID(14), sizeof(sCaveTransitionPalette_White)); - LoadPalette(sCaveTransitionPalette_Exit, BG_PLTT_ID(14), sizeof(sCaveTransitionPalette_Exit)); + LoadPalette(&sCaveTransitionPalette[8], BG_PLTT_ID(14), PLTT_SIZEOF(8)); SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT1_BG0 | BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_BG1 | BLDCNT_TGT2_BG2 | BLDCNT_TGT2_BG3 | BLDCNT_TGT2_OBJ | BLDCNT_TGT2_BD); SetGpuReg(REG_OFFSET_BLDALPHA, 0); SetGpuReg(REG_OFFSET_BLDY, 0); @@ -336,7 +335,7 @@ static void Task_FlashTransition_Exit_3(u8 taskId) if (count < 8) { gTasks[taskId].data[2]++; - LoadPalette(&sCaveTransitionPalette_Exit[count], BG_PLTT_ID(14), sizeof(sCaveTransitionPalette_Exit) - PLTT_SIZEOF(count)); + LoadPalette(&sCaveTransitionPalette[count + 8], BG_PLTT_ID(14), PLTT_SIZEOF(8) - PLTT_SIZEOF(count)); } else { @@ -389,7 +388,7 @@ static void Task_FlashTransition_Enter_2(u8 taskId) { gTasks[taskId].data[2]++; gTasks[taskId].data[2]++; - LoadPalette(&sCaveTransitionPalette_Enter[15 - count], BG_PLTT_ID(14), PLTT_SIZEOF(count + 1)); + LoadPalette(&sCaveTransitionPalette[15 - count], BG_PLTT_ID(14), PLTT_SIZEOF(count + 1)); } else { From aac6ebbc2749de0c33c7732fc1d5731b367298c4 Mon Sep 17 00:00:00 2001 From: Frank DeBlasio <35279583+fdeblasio@users.noreply.github.com> Date: Sun, 22 Mar 2026 09:28:44 -0400 Subject: [PATCH 14/14] Fix object event graphic names (#731) * Fixed object event graphic names * Updated files and other variable names * Fix from finding and replacing without matching case * spritesheet updates * Update flag name --------- Co-authored-by: Marcus Huderle --- data/event_scripts.s | 6 +- .../maps/CeladonCity_Condominiums_3F/map.json | 2 +- .../map.json | 2 +- data/maps/CinnabarIsland_Gym/map.json | 6 +- .../map.json | 2 +- .../IndigoPlateau_PokemonCenter_1F/map.json | 2 +- data/maps/MtEmber_Exterior/map.json | 2 +- data/maps/OneIsland_KindleRoad/map.json | 12 ++-- .../OneIsland_KindleRoad_EmberSpa/map.json | 2 +- data/maps/OneIsland_PokemonCenter_1F/map.json | 4 +- .../OneIsland_PokemonCenter_1F/scripts.inc | 6 +- data/maps/PokemonMansion_2F/map.json | 2 +- data/maps/PokemonMansion_3F/map.json | 2 +- data/maps/PokemonMansion_B1F/map.json | 2 +- data/maps/RockTunnel_1F/map.json | 2 +- data/maps/RockTunnel_B1F/map.json | 6 +- data/maps/Route10/map.json | 4 +- data/maps/Route15/map.json | 4 +- data/maps/Route4/map.json | 4 +- data/maps/SaffronCity/map.json | 4 +- data/maps/SaffronCity_Dojo/map.json | 10 +-- .../map.json | 8 +-- .../scripts.inc | 18 ++--- data/maps/SevenIsland_SevaultCanyon/map.json | 4 +- data/maps/SixIsland_RuinValley/map.json | 2 +- data/maps/TwoIsland/map.json | 6 +- data/maps/TwoIsland/scripts.inc | 4 +- data/maps/VictoryRoad_2F/map.json | 4 +- data/maps/ViridianCity_Gym/map.json | 6 +- data/scripts/fame_checker.inc | 4 +- .../people/{blackbelt.png => black_belt.png} | Bin .../{battle_girl.png => crush_girl.png} | Bin .../{super_nerd.png => poke_maniac.png} | Bin include/constants/event_objects.h | 6 +- include/constants/flags.h | 4 +- spritesheet_rules.mk | 6 +- .../object_events/object_event_graphics.h | 6 +- .../object_event_graphics_info.h | 12 ++-- .../object_event_graphics_info_pointers.h | 12 ++-- .../object_events/object_event_pic_tables.h | 66 +++++++++--------- src/dynamic_placeholder_text_util.c | 6 +- src/fame_checker.c | 12 ++-- src/trainer_fan_club.c | 2 +- src/trainer_tower.c | 26 +++---- src/union_room_player_avatar.c | 4 +- src/vs_seeker.c | 8 +-- 46 files changed, 156 insertions(+), 156 deletions(-) rename graphics/object_events/pics/people/{blackbelt.png => black_belt.png} (100%) rename graphics/object_events/pics/people/{battle_girl.png => crush_girl.png} (100%) rename graphics/object_events/pics/people/{super_nerd.png => poke_maniac.png} (100%) diff --git a/data/event_scripts.s b/data/event_scripts.s index 96bbd0349..88d75946a 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1030,7 +1030,7 @@ EventScript_ResetAllMapFlags:: setflag FLAG_HIDE_CINNABAR_SEAGALLOP setflag FLAG_HIDE_CINNABAR_POKECENTER_BILL setflag FLAG_HIDE_LORELEI_IN_HER_HOUSE - setflag FLAG_HIDE_SAFFRON_FAN_CLUB_BLACKBELT + setflag FLAG_HIDE_SAFFRON_FAN_CLUB_BLACK_BELT setflag FLAG_HIDE_SAFFRON_FAN_CLUB_ROCKER setflag FLAG_HIDE_SAFFRON_FAN_CLUB_WOMAN setflag FLAG_HIDE_SAFFRON_FAN_CLUB_BEAUTY @@ -1038,7 +1038,7 @@ EventScript_ResetAllMapFlags:: setflag FLAG_HIDE_TWO_ISLAND_GAME_CORNER_BIKER setflag FLAG_HIDE_TWO_ISLAND_WOMAN setflag FLAG_HIDE_TWO_ISLAND_BEAUTY - setflag FLAG_HIDE_TWO_ISLAND_SUPER_NERD + setflag FLAG_HIDE_TWO_ISLAND_POKE_MANIAC setflag FLAG_HIDE_LOSTELLE_IN_HER_HOME setflag FLAG_HIDE_THREE_ISLAND_LONE_BIKER setflag FLAG_HIDE_FOUR_ISLAND_RIVAL @@ -1123,7 +1123,7 @@ EventScript_HandOverItem:: return .include "data/scripts/pokemon_league.inc" - .include "data/scripts/movement.inc" + .include "data/scripts/movement.inc" .include "data/scripts/flavor_text.inc" .include "data/scripts/questionnaire.inc" diff --git a/data/maps/CeladonCity_Condominiums_3F/map.json b/data/maps/CeladonCity_Condominiums_3F/map.json index 7b62fae53..cf128ed84 100644 --- a/data/maps/CeladonCity_Condominiums_3F/map.json +++ b/data/maps/CeladonCity_Condominiums_3F/map.json @@ -45,7 +45,7 @@ }, { "type": "object", - "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD", + "graphics_id": "OBJ_EVENT_GFX_POKE_MANIAC", "x": 4, "y": 10, "elevation": 3, diff --git a/data/maps/CeladonCity_Condominiums_RoofRoom/map.json b/data/maps/CeladonCity_Condominiums_RoofRoom/map.json index 20405357b..f080da01d 100644 --- a/data/maps/CeladonCity_Condominiums_RoofRoom/map.json +++ b/data/maps/CeladonCity_Condominiums_RoofRoom/map.json @@ -17,7 +17,7 @@ "object_events": [ { "type": "object", - "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 3, "y": 5, "elevation": 3, diff --git a/data/maps/CinnabarIsland_Gym/map.json b/data/maps/CinnabarIsland_Gym/map.json index ba4ec7d86..21d6325e3 100644 --- a/data/maps/CinnabarIsland_Gym/map.json +++ b/data/maps/CinnabarIsland_Gym/map.json @@ -18,7 +18,7 @@ { "local_id": "LOCALID_QUINN", "type": "object", - "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD", + "graphics_id": "OBJ_EVENT_GFX_POKE_MANIAC", "x": 25, "y": 11, "elevation": 3, @@ -62,7 +62,7 @@ { "local_id": "LOCALID_RAMON", "type": "object", - "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD", + "graphics_id": "OBJ_EVENT_GFX_POKE_MANIAC", "x": 16, "y": 11, "elevation": 3, @@ -92,7 +92,7 @@ { "local_id": "LOCALID_DUSTY", "type": "object", - "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD", + "graphics_id": "OBJ_EVENT_GFX_POKE_MANIAC", "x": 4, "y": 19, "elevation": 3, diff --git a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json index 415475d3c..462c7c7dd 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json @@ -17,7 +17,7 @@ "object_events": [ { "type": "object", - "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD", + "graphics_id": "OBJ_EVENT_GFX_POKE_MANIAC", "x": 5, "y": 4, "elevation": 3, diff --git a/data/maps/IndigoPlateau_PokemonCenter_1F/map.json b/data/maps/IndigoPlateau_PokemonCenter_1F/map.json index 88f8487a9..de073e140 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_1F/map.json +++ b/data/maps/IndigoPlateau_PokemonCenter_1F/map.json @@ -75,7 +75,7 @@ }, { "type": "object", - "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 23, "y": 13, "elevation": 3, diff --git a/data/maps/MtEmber_Exterior/map.json b/data/maps/MtEmber_Exterior/map.json index e92128251..ddf81679d 100644 --- a/data/maps/MtEmber_Exterior/map.json +++ b/data/maps/MtEmber_Exterior/map.json @@ -61,7 +61,7 @@ }, { "type": "object", - "graphics_id": "OBJ_EVENT_GFX_BATTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_CRUSH_GIRL", "x": 22, "y": 35, "elevation": 3, diff --git a/data/maps/OneIsland_KindleRoad/map.json b/data/maps/OneIsland_KindleRoad/map.json index b23c862a1..88f6f2066 100644 --- a/data/maps/OneIsland_KindleRoad/map.json +++ b/data/maps/OneIsland_KindleRoad/map.json @@ -93,7 +93,7 @@ }, { "type": "object", - "graphics_id": "OBJ_EVENT_GFX_BATTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_CRUSH_GIRL", "x": 9, "y": 53, "elevation": 3, @@ -107,7 +107,7 @@ }, { "type": "object", - "graphics_id": "OBJ_EVENT_GFX_BATTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_CRUSH_GIRL", "x": 18, "y": 105, "elevation": 4, @@ -121,7 +121,7 @@ }, { "type": "object", - "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 16, "y": 64, "elevation": 3, @@ -135,7 +135,7 @@ }, { "type": "object", - "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 11, "y": 64, "elevation": 3, @@ -177,7 +177,7 @@ }, { "type": "object", - "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 8, "y": 68, "elevation": 3, @@ -191,7 +191,7 @@ }, { "type": "object", - "graphics_id": "OBJ_EVENT_GFX_BATTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_CRUSH_GIRL", "x": 9, "y": 68, "elevation": 3, diff --git a/data/maps/OneIsland_KindleRoad_EmberSpa/map.json b/data/maps/OneIsland_KindleRoad_EmberSpa/map.json index ea0c5a2e1..5eee49e52 100644 --- a/data/maps/OneIsland_KindleRoad_EmberSpa/map.json +++ b/data/maps/OneIsland_KindleRoad_EmberSpa/map.json @@ -45,7 +45,7 @@ }, { "type": "object", - "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 6, "y": 8, "elevation": 3, diff --git a/data/maps/OneIsland_PokemonCenter_1F/map.json b/data/maps/OneIsland_PokemonCenter_1F/map.json index d5a27329a..713c9cae1 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/map.json +++ b/data/maps/OneIsland_PokemonCenter_1F/map.json @@ -90,7 +90,7 @@ }, { "type": "object", - "graphics_id": "OBJ_EVENT_GFX_BATTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_CRUSH_GIRL", "x": 7, "y": 4, "elevation": 3, @@ -99,7 +99,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "OneIsland_PokemonCenter_1F_EventScript_BattleGirl", + "script": "OneIsland_PokemonCenter_1F_EventScript_CrushGirl", "flag": "0" } ], diff --git a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc index 7ee71de1a..0907948f5 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc @@ -379,15 +379,15 @@ OneIsland_PokemonCenter_1F_EventScript_Hiker:: msgbox OneIsland_PokemonCenter_1F_Text_EnormousVolcanoOnIsland, MSGBOX_NPC end -OneIsland_PokemonCenter_1F_EventScript_BattleGirl:: +OneIsland_PokemonCenter_1F_EventScript_CrushGirl:: lock faceplayer - goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, OneIsland_PokemonCenter_1F_EventScript_BattleGirlHoennLinked + goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, OneIsland_PokemonCenter_1F_EventScript_CrushGirlHoennLinked msgbox OneIsland_PokemonCenter_1F_Text_WishICouldTradeWithBoyfriend release end -OneIsland_PokemonCenter_1F_EventScript_BattleGirlHoennLinked:: +OneIsland_PokemonCenter_1F_EventScript_CrushGirlHoennLinked:: msgbox OneIsland_PokemonCenter_1F_Text_TradedWithFarAwayBoyfriend release end diff --git a/data/maps/PokemonMansion_2F/map.json b/data/maps/PokemonMansion_2F/map.json index 89220add4..bf95cf290 100644 --- a/data/maps/PokemonMansion_2F/map.json +++ b/data/maps/PokemonMansion_2F/map.json @@ -17,7 +17,7 @@ "object_events": [ { "type": "object", - "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD", + "graphics_id": "OBJ_EVENT_GFX_POKE_MANIAC", "x": 5, "y": 23, "elevation": 3, diff --git a/data/maps/PokemonMansion_3F/map.json b/data/maps/PokemonMansion_3F/map.json index 13c7ea294..259fe7df0 100644 --- a/data/maps/PokemonMansion_3F/map.json +++ b/data/maps/PokemonMansion_3F/map.json @@ -17,7 +17,7 @@ "object_events": [ { "type": "object", - "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD", + "graphics_id": "OBJ_EVENT_GFX_POKE_MANIAC", "x": 7, "y": 13, "elevation": 3, diff --git a/data/maps/PokemonMansion_B1F/map.json b/data/maps/PokemonMansion_B1F/map.json index b68160cf6..57c0154d7 100644 --- a/data/maps/PokemonMansion_B1F/map.json +++ b/data/maps/PokemonMansion_B1F/map.json @@ -31,7 +31,7 @@ }, { "type": "object", - "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD", + "graphics_id": "OBJ_EVENT_GFX_POKE_MANIAC", "x": 20, "y": 25, "elevation": 3, diff --git a/data/maps/RockTunnel_1F/map.json b/data/maps/RockTunnel_1F/map.json index 8c56778c2..02fa844fb 100644 --- a/data/maps/RockTunnel_1F/map.json +++ b/data/maps/RockTunnel_1F/map.json @@ -101,7 +101,7 @@ }, { "type": "object", - "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD", + "graphics_id": "OBJ_EVENT_GFX_POKE_MANIAC", "x": 27, "y": 10, "elevation": 3, diff --git a/data/maps/RockTunnel_B1F/map.json b/data/maps/RockTunnel_B1F/map.json index b5dac6490..7aafaf7c3 100644 --- a/data/maps/RockTunnel_B1F/map.json +++ b/data/maps/RockTunnel_B1F/map.json @@ -17,7 +17,7 @@ "object_events": [ { "type": "object", - "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD", + "graphics_id": "OBJ_EVENT_GFX_POKE_MANIAC", "x": 2, "y": 6, "elevation": 3, @@ -87,7 +87,7 @@ }, { "type": "object", - "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD", + "graphics_id": "OBJ_EVENT_GFX_POKE_MANIAC", "x": 23, "y": 23, "elevation": 3, @@ -115,7 +115,7 @@ }, { "type": "object", - "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD", + "graphics_id": "OBJ_EVENT_GFX_POKE_MANIAC", "x": 29, "y": 35, "elevation": 3, diff --git a/data/maps/Route10/map.json b/data/maps/Route10/map.json index 97d85418f..e15914dfe 100644 --- a/data/maps/Route10/map.json +++ b/data/maps/Route10/map.json @@ -56,7 +56,7 @@ }, { "type": "object", - "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD", + "graphics_id": "OBJ_EVENT_GFX_POKE_MANIAC", "x": 15, "y": 70, "elevation": 3, @@ -84,7 +84,7 @@ }, { "type": "object", - "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD", + "graphics_id": "OBJ_EVENT_GFX_POKE_MANIAC", "x": 13, "y": 44, "elevation": 3, diff --git a/data/maps/Route15/map.json b/data/maps/Route15/map.json index 2b33b5cc6..2380587e6 100644 --- a/data/maps/Route15/map.json +++ b/data/maps/Route15/map.json @@ -182,7 +182,7 @@ }, { "type": "object", - "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 39, "y": 7, "elevation": 3, @@ -196,7 +196,7 @@ }, { "type": "object", - "graphics_id": "OBJ_EVENT_GFX_BATTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_CRUSH_GIRL", "x": 40, "y": 7, "elevation": 3, diff --git a/data/maps/Route4/map.json b/data/maps/Route4/map.json index ba9f45b37..9d00b28b6 100644 --- a/data/maps/Route4/map.json +++ b/data/maps/Route4/map.json @@ -84,7 +84,7 @@ }, { "type": "object", - "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 47, "y": 3, "elevation": 3, @@ -98,7 +98,7 @@ }, { "type": "object", - "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 50, "y": 3, "elevation": 3, diff --git a/data/maps/SaffronCity/map.json b/data/maps/SaffronCity/map.json index 77cba6c6d..97eeb4f22 100644 --- a/data/maps/SaffronCity/map.json +++ b/data/maps/SaffronCity/map.json @@ -236,7 +236,7 @@ }, { "type": "object", - "graphics_id": "OBJ_EVENT_GFX_BATTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_CRUSH_GIRL", "x": 47, "y": 24, "elevation": 3, @@ -245,7 +245,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SaffronCity_EventScript_BattleGirl", + "script": "SaffronCity_EventScript_CrushGirl", "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" } ], diff --git a/data/maps/SaffronCity_Dojo/map.json b/data/maps/SaffronCity_Dojo/map.json index 1575a3c0b..95cd83275 100644 --- a/data/maps/SaffronCity_Dojo/map.json +++ b/data/maps/SaffronCity_Dojo/map.json @@ -17,7 +17,7 @@ "object_events": [ { "type": "object", - "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 11, "y": 10, "elevation": 3, @@ -31,7 +31,7 @@ }, { "type": "object", - "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 1, "y": 10, "elevation": 3, @@ -45,7 +45,7 @@ }, { "type": "object", - "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 11, "y": 8, "elevation": 3, @@ -59,7 +59,7 @@ }, { "type": "object", - "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 1, "y": 8, "elevation": 3, @@ -74,7 +74,7 @@ { "local_id": "LOCALID_KARATE_MASTER", "type": "object", - "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 6, "y": 5, "elevation": 3, diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/map.json b/data/maps/SaffronCity_PokemonTrainerFanClub/map.json index a1f3687f6..16f6334c9 100644 --- a/data/maps/SaffronCity_PokemonTrainerFanClub/map.json +++ b/data/maps/SaffronCity_PokemonTrainerFanClub/map.json @@ -18,7 +18,7 @@ { "local_id": "LOCALID_TRAINER_FAN_CLUB_BATTLE_GIRL", "type": "object", - "graphics_id": "OBJ_EVENT_GFX_BATTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_CRUSH_GIRL", "x": 7, "y": 13, "elevation": 3, @@ -27,7 +27,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirl", + "script": "SaffronCity_PokemonTrainerFanClub_EventScript_CrushGirl", "flag": "0" }, { @@ -123,7 +123,7 @@ { "local_id": "LOCALID_TRAINER_FAN_CLUB_BLACK_BELT", "type": "object", - "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 5, "y": 11, "elevation": 3, @@ -133,7 +133,7 @@ "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SaffronCity_PokemonTrainerFanClub_EventScript_BlackBelt", - "flag": "FLAG_HIDE_SAFFRON_FAN_CLUB_BLACKBELT" + "flag": "FLAG_HIDE_SAFFRON_FAN_CLUB_BLACK_BELT" }, { "type": "object", diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc b/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc index 76b0ace0f..f714cf2c5 100644 --- a/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc +++ b/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc @@ -155,38 +155,38 @@ SaffronCity_PokemonTrainerFanClub_EventScript_SetMemberPosForFirstMeeting:: call SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember8ToFarTable end -SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirl:: +SaffronCity_PokemonTrainerFanClub_EventScript_CrushGirl:: lock faceplayer setvar VAR_0x8004, FANCLUB_MEMBER1 special Script_BufferFanClubTrainerName - goto_if_eq VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0, SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlPlayerNotChampion + goto_if_eq VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0, SaffronCity_PokemonTrainerFanClub_EventScript_CrushGirlPlayerNotChampion specialvar VAR_RESULT, Script_IsFanClubMemberFanOfPlayer - goto_if_eq VAR_RESULT, TRUE, SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlPlayersFan + goto_if_eq VAR_RESULT, TRUE, SaffronCity_PokemonTrainerFanClub_EventScript_CrushGirlPlayersFan specialvar VAR_RESULT, Script_GetNumFansOfPlayerInTrainerFanClub - goto_if_eq VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1), SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlOnlyNonFan + goto_if_eq VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1), SaffronCity_PokemonTrainerFanClub_EventScript_CrushGirlOnlyNonFan msgbox SaffronCity_PokemonTrainerFanClub_Text_WasYourFanNotAnymore release end -SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlPlayersFan:: +SaffronCity_PokemonTrainerFanClub_EventScript_CrushGirlPlayersFan:: specialvar VAR_RESULT, Script_GetNumFansOfPlayerInTrainerFanClub - goto_if_eq VAR_RESULT, 1, SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlOnlyFan + goto_if_eq VAR_RESULT, 1, SaffronCity_PokemonTrainerFanClub_EventScript_CrushGirlOnlyFan msgbox SaffronCity_PokemonTrainerFanClub_Text_AlwaysCheerForYou release end -SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlOnlyFan:: +SaffronCity_PokemonTrainerFanClub_EventScript_CrushGirlOnlyFan:: msgbox SaffronCity_PokemonTrainerFanClub_Text_IllAlwaysBelieveInYou release end -SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlOnlyNonFan:: +SaffronCity_PokemonTrainerFanClub_EventScript_CrushGirlOnlyNonFan:: msgbox SaffronCity_PokemonTrainerFanClub_Text_EveryonesYourFanButICantBe release end -SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlPlayerNotChampion:: +SaffronCity_PokemonTrainerFanClub_EventScript_CrushGirlPlayerNotChampion:: msgbox SaffronCity_PokemonTrainerFanClub_Text_TrainersCoolWhenBattling release end diff --git a/data/maps/SevenIsland_SevaultCanyon/map.json b/data/maps/SevenIsland_SevaultCanyon/map.json index d0d1a0dca..5c4972e09 100644 --- a/data/maps/SevenIsland_SevaultCanyon/map.json +++ b/data/maps/SevenIsland_SevaultCanyon/map.json @@ -28,7 +28,7 @@ "object_events": [ { "type": "object", - "graphics_id": "OBJ_EVENT_GFX_BATTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_CRUSH_GIRL", "x": 13, "y": 43, "elevation": 3, @@ -294,7 +294,7 @@ }, { "type": "object", - "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 8, "y": 26, "elevation": 3, diff --git a/data/maps/SixIsland_RuinValley/map.json b/data/maps/SixIsland_RuinValley/map.json index 0f182a588..0f6c9d9bf 100644 --- a/data/maps/SixIsland_RuinValley/map.json +++ b/data/maps/SixIsland_RuinValley/map.json @@ -94,7 +94,7 @@ }, { "type": "object", - "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD", + "graphics_id": "OBJ_EVENT_GFX_POKE_MANIAC", "x": 21, "y": 29, "elevation": 5, diff --git a/data/maps/TwoIsland/map.json b/data/maps/TwoIsland/map.json index 41ae31f39..2f1f67ff0 100644 --- a/data/maps/TwoIsland/map.json +++ b/data/maps/TwoIsland/map.json @@ -79,7 +79,7 @@ }, { "type": "object", - "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD", + "graphics_id": "OBJ_EVENT_GFX_POKE_MANIAC", "x": 27, "y": 6, "elevation": 3, @@ -88,8 +88,8 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "TwoIsland_EventScript_SuperNerd", - "flag": "FLAG_HIDE_TWO_ISLAND_SUPER_NERD" + "script": "TwoIsland_EventScript_PokeManiac", + "flag": "FLAG_HIDE_TWO_ISLAND_POKE_MANIAC" }, { "type": "object", diff --git a/data/maps/TwoIsland/scripts.inc b/data/maps/TwoIsland/scripts.inc index 5e8a768d7..7d25acfe7 100644 --- a/data/maps/TwoIsland/scripts.inc +++ b/data/maps/TwoIsland/scripts.inc @@ -54,7 +54,7 @@ TwoIsland_EventScript_SetShopExpanded2:: TwoIsland_EventScript_SetShopExpanded3:: setvar VAR_MAP_SCENE_TWO_ISLAND, 4 - clearflag FLAG_HIDE_TWO_ISLAND_SUPER_NERD + clearflag FLAG_HIDE_TWO_ISLAND_POKE_MANIAC return TwoIsland_EventScript_Clerk:: @@ -192,7 +192,7 @@ TwoIsland_EventScript_Beauty:: release end -TwoIsland_EventScript_SuperNerd:: +TwoIsland_EventScript_PokeManiac:: msgbox TwoIsland_Text_BuyRareItemsHere, MSGBOX_NPC end diff --git a/data/maps/VictoryRoad_2F/map.json b/data/maps/VictoryRoad_2F/map.json index 968726ccc..753eb93bb 100644 --- a/data/maps/VictoryRoad_2F/map.json +++ b/data/maps/VictoryRoad_2F/map.json @@ -17,7 +17,7 @@ "object_events": [ { "type": "object", - "graphics_id": "OBJ_EVENT_GFX_SUPER_NERD", + "graphics_id": "OBJ_EVENT_GFX_POKE_MANIAC", "x": 7, "y": 4, "elevation": 3, @@ -31,7 +31,7 @@ }, { "type": "object", - "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 20, "y": 11, "elevation": 4, diff --git a/data/maps/ViridianCity_Gym/map.json b/data/maps/ViridianCity_Gym/map.json index db4002398..916a821a0 100644 --- a/data/maps/ViridianCity_Gym/map.json +++ b/data/maps/ViridianCity_Gym/map.json @@ -17,7 +17,7 @@ "object_events": [ { "type": "object", - "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 10, "y": 2, "elevation": 3, @@ -45,7 +45,7 @@ }, { "type": "object", - "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 11, "y": 14, "elevation": 3, @@ -87,7 +87,7 @@ }, { "type": "object", - "graphics_id": "OBJ_EVENT_GFX_BLACKBELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 3, "y": 11, "elevation": 3, diff --git a/data/scripts/fame_checker.inc b/data/scripts/fame_checker.inc index c15a88101..a84b23091 100644 --- a/data/scripts/fame_checker.inc +++ b/data/scripts/fame_checker.inc @@ -211,7 +211,7 @@ EventScript_LanceUnused:: release end -SaffronCity_EventScript_BattleGirlUnused:: +SaffronCity_EventScript_CrushGirlUnused:: lock faceplayer famechecker FAMECHECKER_LANCE, 1 @@ -219,7 +219,7 @@ SaffronCity_EventScript_BattleGirlUnused:: release end -SaffronCity_EventScript_BattleGirl:: +SaffronCity_EventScript_CrushGirl:: lock faceplayer famechecker FAMECHECKER_LANCE, 2 diff --git a/graphics/object_events/pics/people/blackbelt.png b/graphics/object_events/pics/people/black_belt.png similarity index 100% rename from graphics/object_events/pics/people/blackbelt.png rename to graphics/object_events/pics/people/black_belt.png diff --git a/graphics/object_events/pics/people/battle_girl.png b/graphics/object_events/pics/people/crush_girl.png similarity index 100% rename from graphics/object_events/pics/people/battle_girl.png rename to graphics/object_events/pics/people/crush_girl.png diff --git a/graphics/object_events/pics/people/super_nerd.png b/graphics/object_events/pics/people/poke_maniac.png similarity index 100% rename from graphics/object_events/pics/people/super_nerd.png rename to graphics/object_events/pics/people/poke_maniac.png diff --git a/include/constants/event_objects.h b/include/constants/event_objects.h index 31e2272d6..9d8c514f9 100644 --- a/include/constants/event_objects.h +++ b/include/constants/event_objects.h @@ -27,7 +27,7 @@ #define OBJ_EVENT_GFX_SITTING_BOY 21 #define OBJ_EVENT_GFX_LASS 22 #define OBJ_EVENT_GFX_WOMAN_1 23 -#define OBJ_EVENT_GFX_BATTLE_GIRL 24 +#define OBJ_EVENT_GFX_CRUSH_GIRL 24 #define OBJ_EVENT_GFX_MAN 25 #define OBJ_EVENT_GFX_ROCKER 26 #define OBJ_EVENT_GFX_FAT_MAN 27 @@ -55,9 +55,9 @@ #define OBJ_EVENT_GFX_ROCKET_M 49 #define OBJ_EVENT_GFX_ROCKET_F 50 #define OBJ_EVENT_GFX_GBA_KID 51 -#define OBJ_EVENT_GFX_SUPER_NERD 52 +#define OBJ_EVENT_GFX_POKE_MANIAC 52 #define OBJ_EVENT_GFX_BIKER 53 -#define OBJ_EVENT_GFX_BLACKBELT 54 +#define OBJ_EVENT_GFX_BLACK_BELT 54 #define OBJ_EVENT_GFX_SCIENTIST 55 #define OBJ_EVENT_GFX_HIKER 56 #define OBJ_EVENT_GFX_FISHER 57 diff --git a/include/constants/flags.h b/include/constants/flags.h index 24e44dd9e..d800adf1e 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -121,7 +121,7 @@ #define FLAG_HIDE_UNION_ROOM_PLAYER_7 0x069 #define FLAG_HIDE_UNION_ROOM_PLAYER_8 0x06A #define FLAG_HIDE_CINNABAR_SEAGALLOP 0x06B -#define FLAG_HIDE_SAFFRON_FAN_CLUB_BLACKBELT 0x06C +#define FLAG_HIDE_SAFFRON_FAN_CLUB_BLACK_BELT 0x06C #define FLAG_HIDE_SAFFRON_FAN_CLUB_ROCKER 0x06D #define FLAG_HIDE_SAFFRON_FAN_CLUB_WOMAN 0x06E #define FLAG_HIDE_SAFFRON_FAN_CLUB_BEAUTY 0x06F @@ -138,7 +138,7 @@ #define FLAG_HIDE_LOSTELLE_IN_BERRY_FOREST 0x07A #define FLAG_HIDE_TWO_ISLAND_WOMAN 0x07B #define FLAG_HIDE_TWO_ISLAND_BEAUTY 0x07C -#define FLAG_HIDE_TWO_ISLAND_SUPER_NERD 0x07D +#define FLAG_HIDE_TWO_ISLAND_POKE_MANIAC 0x07D #define FLAG_HIDE_THREE_ISLAND_ANTIBIKERS 0x07E #define FLAG_0x07F 0x07F #define FLAG_HIDE_ROUTE_16_SNORLAX 0x080 diff --git a/spritesheet_rules.mk b/spritesheet_rules.mk index 24c3b1b20..50cfd4979 100644 --- a/spritesheet_rules.mk +++ b/spritesheet_rules.mk @@ -22,7 +22,7 @@ $(OBJEVENTGFXDIR)/people/agatha.4bpp: %.4bpp: %.png $(OBJEVENTGFXDIR)/people/balding_man.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(OBJEVENTGFXDIR)/people/battle_girl.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/crush_girl.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 $(OBJEVENTGFXDIR)/people/beauty.4bpp: %.4bpp: %.png @@ -34,7 +34,7 @@ $(OBJEVENTGFXDIR)/people/biker.4bpp: %.4bpp: %.png $(OBJEVENTGFXDIR)/people/bill.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(OBJEVENTGFXDIR)/people/blackbelt.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/black_belt.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 $(OBJEVENTGFXDIR)/people/blaine.4bpp: %.4bpp: %.png @@ -241,7 +241,7 @@ $(OBJEVENTGFXDIR)/people/scientist.4bpp: %.4bpp: %.png $(OBJEVENTGFXDIR)/people/sitting_boy.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(OBJEVENTGFXDIR)/people/super_nerd.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/poke_maniac.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 $(OBJEVENTGFXDIR)/people/swimmer_f_land.4bpp: %.4bpp: %.png diff --git a/src/data/object_events/object_event_graphics.h b/src/data/object_events/object_event_graphics.h index 85433d0f0..4e229cb14 100644 --- a/src/data/object_events/object_event_graphics.h +++ b/src/data/object_events/object_event_graphics.h @@ -62,7 +62,7 @@ const u16 gObjectEventPic_Boy[] = INCBIN_U16("graphics/object_events/pics/people const u16 gObjectEventPic_Woman1[] = INCBIN_U16("graphics/object_events/pics/people/woman_1.4bpp"); const u16 gObjectEventPic_Woman3[] = INCBIN_U16("graphics/object_events/pics/people/woman_3.4bpp"); const u16 gObjectEventPic_BugCatcher[] = INCBIN_U16("graphics/object_events/pics/people/bug_catcher.4bpp"); -const u16 gObjectEventPic_BattleGirl[] = INCBIN_U16("graphics/object_events/pics/people/battle_girl.4bpp"); +const u16 gObjectEventPic_CrushGirl[] = INCBIN_U16("graphics/object_events/pics/people/crush_girl.4bpp"); const u16 gObjectEventPic_RichBoy[] = INCBIN_U16("graphics/object_events/pics/people/rich_boy.4bpp"); // Unused const u16 gObjectEventPic_FatMan[] = INCBIN_U16("graphics/object_events/pics/people/fat_man.4bpp"); const u16 gObjectEventPic_BaldingMan[] = INCBIN_U16("graphics/object_events/pics/people/balding_man.4bpp"); @@ -80,14 +80,14 @@ const u16 gObjectEventPic_Picnicker[] = INCBIN_U16("graphics/object_events/pics/ const u16 gObjectEventPic_CooltrainerM[] = INCBIN_U16("graphics/object_events/pics/people/cooltrainer_m.4bpp"); const u16 gObjectEventPic_CooltrainerF[] = INCBIN_U16("graphics/object_events/pics/people/cooltrainer_f.4bpp"); const u16 gObjectEventPic_Psyduck[] = INCBIN_U16("graphics/object_events/pics/pokemon/psyduck.4bpp"); -const u16 gObjectEventPic_SuperNerd[] = INCBIN_U16("graphics/object_events/pics/people/super_nerd.4bpp"); +const u16 gObjectEventPic_PokeManiac[] = INCBIN_U16("graphics/object_events/pics/people/poke_maniac.4bpp"); const u16 gObjectEventPic_Channeler[] = INCBIN_U16("graphics/object_events/pics/people/channeler.4bpp"); const u16 gObjectEventPic_RocketF[] = INCBIN_U16("graphics/object_events/pics/people/rocket_f.4bpp"); const u16 gObjectEventPic_SwimmerMWater[] = INCBIN_U16("graphics/object_events/pics/people/swimmer_m_water.4bpp"); const u16 gObjectEventPic_SwimmerFWater[] = INCBIN_U16("graphics/object_events/pics/people/swimmer_f_water.4bpp"); const u16 gObjectEventPic_SwimmerMLand[] = INCBIN_U16("graphics/object_events/pics/people/swimmer_m_land.4bpp"); const u16 gObjectEventPic_SwimmerFLand[] = INCBIN_U16("graphics/object_events/pics/people/swimmer_f_land.4bpp"); -const u16 gObjectEventPic_Blackbelt[] = INCBIN_U16("graphics/object_events/pics/people/blackbelt.4bpp"); +const u16 gObjectEventPic_BlackBelt[] = INCBIN_U16("graphics/object_events/pics/people/black_belt.4bpp"); const u16 gObjectEventPic_Scientist[] = INCBIN_U16("graphics/object_events/pics/people/scientist.4bpp"); const u16 gObjectEventPic_Gentleman[] = INCBIN_U16("graphics/object_events/pics/people/gentleman.4bpp"); const u16 gObjectEventPic_Sailor[] = INCBIN_U16("graphics/object_events/pics/people/sailor.4bpp"); diff --git a/src/data/object_events/object_event_graphics_info.h b/src/data/object_events/object_event_graphics_info.h index b4a6541f6..78ee95a47 100644 --- a/src/data/object_events/object_event_graphics_info.h +++ b/src/data/object_events/object_event_graphics_info.h @@ -283,7 +283,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Boy = { .affineAnims = gDummySpriteAffineAnimTable, }; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BattleGirl = { +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CrushGirl = { .tileTag = TAG_NONE, .paletteTag = OBJ_EVENT_PAL_TAG_NPC_WHITE, .reflectionPaletteTag = OBJ_EVENT_PAL_TAG_NONE, @@ -298,7 +298,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BattleGirl = { .oam = &gObjectEventBaseOam_16x32, .subspriteTables = gObjectEventSpriteOamTables_16x32, .anims = sAnimTable_Standard, - .images = sPicTable_BattleGirl, + .images = sPicTable_CrushGirl, .affineAnims = gDummySpriteAffineAnimTable, }; @@ -587,7 +587,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CooltrainerF = { .affineAnims = gDummySpriteAffineAnimTable, }; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SuperNerd = { +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PokeManiac = { .tileTag = TAG_NONE, .paletteTag = OBJ_EVENT_PAL_TAG_NPC_PINK, .reflectionPaletteTag = OBJ_EVENT_PAL_TAG_NONE, @@ -602,7 +602,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SuperNerd = { .oam = &gObjectEventBaseOam_16x32, .subspriteTables = gObjectEventSpriteOamTables_16x32, .anims = sAnimTable_Standard, - .images = sPicTable_SuperNerd, + .images = sPicTable_PokeManiac, .affineAnims = gDummySpriteAffineAnimTable, }; @@ -720,7 +720,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SwimmerFLand = { .affineAnims = gDummySpriteAffineAnimTable, }; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Blackbelt = { +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BlackBelt = { .tileTag = TAG_NONE, .paletteTag = OBJ_EVENT_PAL_TAG_NPC_WHITE, .reflectionPaletteTag = OBJ_EVENT_PAL_TAG_NONE, @@ -735,7 +735,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Blackbelt = { .oam = &gObjectEventBaseOam_16x32, .subspriteTables = gObjectEventSpriteOamTables_16x32, .anims = sAnimTable_Standard, - .images = sPicTable_Blackbelt, + .images = sPicTable_BlackBelt, .affineAnims = gDummySpriteAffineAnimTable, }; diff --git a/src/data/object_events/object_event_graphics_info_pointers.h b/src/data/object_events/object_event_graphics_info_pointers.h index 82588ba9a..af2f8afb6 100644 --- a/src/data/object_events/object_event_graphics_info_pointers.h +++ b/src/data/object_events/object_event_graphics_info_pointers.h @@ -22,7 +22,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BugCatcher; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SittingBoy; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Lass; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman1; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BattleGirl; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CrushGirl; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Rocker; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_FatMan; @@ -50,9 +50,9 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_WorkerF; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RocketM; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RocketF; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GBAKid; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SuperNerd; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PokeManiac; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Biker; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Blackbelt; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BlackBelt; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Scientist; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Hiker; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Fisher; @@ -177,7 +177,7 @@ const struct ObjectEventGraphicsInfo *const gObjectEventGraphicsInfoPointers[NUM [OBJ_EVENT_GFX_SITTING_BOY] = &gObjectEventGraphicsInfo_SittingBoy, [OBJ_EVENT_GFX_LASS] = &gObjectEventGraphicsInfo_Lass, [OBJ_EVENT_GFX_WOMAN_1] = &gObjectEventGraphicsInfo_Woman1, - [OBJ_EVENT_GFX_BATTLE_GIRL] = &gObjectEventGraphicsInfo_BattleGirl, + [OBJ_EVENT_GFX_CRUSH_GIRL] = &gObjectEventGraphicsInfo_CrushGirl, [OBJ_EVENT_GFX_MAN] = &gObjectEventGraphicsInfo_Man, [OBJ_EVENT_GFX_ROCKER] = &gObjectEventGraphicsInfo_Rocker, [OBJ_EVENT_GFX_FAT_MAN] = &gObjectEventGraphicsInfo_FatMan, @@ -205,9 +205,9 @@ const struct ObjectEventGraphicsInfo *const gObjectEventGraphicsInfoPointers[NUM [OBJ_EVENT_GFX_ROCKET_M] = &gObjectEventGraphicsInfo_RocketM, [OBJ_EVENT_GFX_ROCKET_F] = &gObjectEventGraphicsInfo_RocketF, [OBJ_EVENT_GFX_GBA_KID] = &gObjectEventGraphicsInfo_GBAKid, - [OBJ_EVENT_GFX_SUPER_NERD] = &gObjectEventGraphicsInfo_SuperNerd, + [OBJ_EVENT_GFX_POKE_MANIAC] = &gObjectEventGraphicsInfo_PokeManiac, [OBJ_EVENT_GFX_BIKER] = &gObjectEventGraphicsInfo_Biker, - [OBJ_EVENT_GFX_BLACKBELT] = &gObjectEventGraphicsInfo_Blackbelt, + [OBJ_EVENT_GFX_BLACK_BELT] = &gObjectEventGraphicsInfo_BlackBelt, [OBJ_EVENT_GFX_SCIENTIST] = &gObjectEventGraphicsInfo_Scientist, [OBJ_EVENT_GFX_HIKER] = &gObjectEventGraphicsInfo_Hiker, [OBJ_EVENT_GFX_FISHER] = &gObjectEventGraphicsInfo_Fisher, diff --git a/src/data/object_events/object_event_pic_tables.h b/src/data/object_events/object_event_pic_tables.h index 43c52d6f9..70889d7a2 100644 --- a/src/data/object_events/object_event_pic_tables.h +++ b/src/data/object_events/object_event_pic_tables.h @@ -266,17 +266,17 @@ static const struct SpriteFrameImage sPicTable_Woman3[] = { overworld_frame(gObjectEventPic_Woman3, 2, 4, 8), }; -static const struct SpriteFrameImage sPicTable_BattleGirl[] = { - overworld_frame(gObjectEventPic_BattleGirl, 2, 4, 0), - overworld_frame(gObjectEventPic_BattleGirl, 2, 4, 1), - overworld_frame(gObjectEventPic_BattleGirl, 2, 4, 2), - overworld_frame(gObjectEventPic_BattleGirl, 2, 4, 3), - overworld_frame(gObjectEventPic_BattleGirl, 2, 4, 4), - overworld_frame(gObjectEventPic_BattleGirl, 2, 4, 5), - overworld_frame(gObjectEventPic_BattleGirl, 2, 4, 6), - overworld_frame(gObjectEventPic_BattleGirl, 2, 4, 7), - overworld_frame(gObjectEventPic_BattleGirl, 2, 4, 8), - overworld_frame(gObjectEventPic_BattleGirl, 2, 4, 9), +static const struct SpriteFrameImage sPicTable_CrushGirl[] = { + overworld_frame(gObjectEventPic_CrushGirl, 2, 4, 0), + overworld_frame(gObjectEventPic_CrushGirl, 2, 4, 1), + overworld_frame(gObjectEventPic_CrushGirl, 2, 4, 2), + overworld_frame(gObjectEventPic_CrushGirl, 2, 4, 3), + overworld_frame(gObjectEventPic_CrushGirl, 2, 4, 4), + overworld_frame(gObjectEventPic_CrushGirl, 2, 4, 5), + overworld_frame(gObjectEventPic_CrushGirl, 2, 4, 6), + overworld_frame(gObjectEventPic_CrushGirl, 2, 4, 7), + overworld_frame(gObjectEventPic_CrushGirl, 2, 4, 8), + overworld_frame(gObjectEventPic_CrushGirl, 2, 4, 9), }; static const struct SpriteFrameImage sPicTable_BugCatcher[] = { @@ -494,17 +494,17 @@ static const struct SpriteFrameImage sPicTable_Boy[] = { overworld_frame(gObjectEventPic_Boy, 2, 4, 9), }; -static const struct SpriteFrameImage sPicTable_SuperNerd[] = { - overworld_frame(gObjectEventPic_SuperNerd, 2, 4, 0), - overworld_frame(gObjectEventPic_SuperNerd, 2, 4, 1), - overworld_frame(gObjectEventPic_SuperNerd, 2, 4, 2), - overworld_frame(gObjectEventPic_SuperNerd, 2, 4, 3), - overworld_frame(gObjectEventPic_SuperNerd, 2, 4, 4), - overworld_frame(gObjectEventPic_SuperNerd, 2, 4, 5), - overworld_frame(gObjectEventPic_SuperNerd, 2, 4, 6), - overworld_frame(gObjectEventPic_SuperNerd, 2, 4, 7), - overworld_frame(gObjectEventPic_SuperNerd, 2, 4, 8), - overworld_frame(gObjectEventPic_SuperNerd, 2, 4, 9), +static const struct SpriteFrameImage sPicTable_PokeManiac[] = { + overworld_frame(gObjectEventPic_PokeManiac, 2, 4, 0), + overworld_frame(gObjectEventPic_PokeManiac, 2, 4, 1), + overworld_frame(gObjectEventPic_PokeManiac, 2, 4, 2), + overworld_frame(gObjectEventPic_PokeManiac, 2, 4, 3), + overworld_frame(gObjectEventPic_PokeManiac, 2, 4, 4), + overworld_frame(gObjectEventPic_PokeManiac, 2, 4, 5), + overworld_frame(gObjectEventPic_PokeManiac, 2, 4, 6), + overworld_frame(gObjectEventPic_PokeManiac, 2, 4, 7), + overworld_frame(gObjectEventPic_PokeManiac, 2, 4, 8), + overworld_frame(gObjectEventPic_PokeManiac, 2, 4, 9), }; static const struct SpriteFrameImage sPicTable_Channeler[] = { @@ -584,17 +584,17 @@ static const struct SpriteFrameImage sPicTable_SwimmerFLand[] = { overworld_frame(gObjectEventPic_SwimmerFLand, 2, 4, 9), }; -static const struct SpriteFrameImage sPicTable_Blackbelt[] = { - overworld_frame(gObjectEventPic_Blackbelt, 2, 4, 0), - overworld_frame(gObjectEventPic_Blackbelt, 2, 4, 1), - overworld_frame(gObjectEventPic_Blackbelt, 2, 4, 2), - overworld_frame(gObjectEventPic_Blackbelt, 2, 4, 3), - overworld_frame(gObjectEventPic_Blackbelt, 2, 4, 4), - overworld_frame(gObjectEventPic_Blackbelt, 2, 4, 5), - overworld_frame(gObjectEventPic_Blackbelt, 2, 4, 6), - overworld_frame(gObjectEventPic_Blackbelt, 2, 4, 7), - overworld_frame(gObjectEventPic_Blackbelt, 2, 4, 8), - overworld_frame(gObjectEventPic_Blackbelt, 2, 4, 9), +static const struct SpriteFrameImage sPicTable_BlackBelt[] = { + overworld_frame(gObjectEventPic_BlackBelt, 2, 4, 0), + overworld_frame(gObjectEventPic_BlackBelt, 2, 4, 1), + overworld_frame(gObjectEventPic_BlackBelt, 2, 4, 2), + overworld_frame(gObjectEventPic_BlackBelt, 2, 4, 3), + overworld_frame(gObjectEventPic_BlackBelt, 2, 4, 4), + overworld_frame(gObjectEventPic_BlackBelt, 2, 4, 5), + overworld_frame(gObjectEventPic_BlackBelt, 2, 4, 6), + overworld_frame(gObjectEventPic_BlackBelt, 2, 4, 7), + overworld_frame(gObjectEventPic_BlackBelt, 2, 4, 8), + overworld_frame(gObjectEventPic_BlackBelt, 2, 4, 9), }; static const struct SpriteFrameImage sPicTable_Scientist[] = { diff --git a/src/dynamic_placeholder_text_util.c b/src/dynamic_placeholder_text_util.c index 48b40d0cd..c56b5116c 100644 --- a/src/dynamic_placeholder_text_util.c +++ b/src/dynamic_placeholder_text_util.c @@ -21,7 +21,7 @@ static const u8 sTextColorTable[] = [OBJ_EVENT_GFX_YOUNGSTER / 2] = COLORS(NPC_TEXT_COLOR_MALE, NPC_TEXT_COLOR_MALE), // OBJ_EVENT_GFX_BOY [OBJ_EVENT_GFX_BUG_CATCHER / 2] = COLORS(NPC_TEXT_COLOR_MALE, NPC_TEXT_COLOR_MALE), // OBJ_EVENT_GFX_SITTING_BOY [OBJ_EVENT_GFX_LASS / 2] = COLORS(NPC_TEXT_COLOR_FEMALE, NPC_TEXT_COLOR_FEMALE), // OBJ_EVENT_GFX_WOMAN_1 - [OBJ_EVENT_GFX_BATTLE_GIRL / 2] = COLORS(NPC_TEXT_COLOR_FEMALE, NPC_TEXT_COLOR_MALE), // OBJ_EVENT_GFX_MAN + [OBJ_EVENT_GFX_CRUSH_GIRL / 2] = COLORS(NPC_TEXT_COLOR_FEMALE, NPC_TEXT_COLOR_MALE), // OBJ_EVENT_GFX_MAN [OBJ_EVENT_GFX_ROCKER / 2] = COLORS(NPC_TEXT_COLOR_MALE, NPC_TEXT_COLOR_MALE), // OBJ_EVENT_GFX_FAT_MAN [OBJ_EVENT_GFX_WOMAN_2 / 2] = COLORS(NPC_TEXT_COLOR_FEMALE, NPC_TEXT_COLOR_FEMALE), // OBJ_EVENT_GFX_BEAUTY [OBJ_EVENT_GFX_BALDING_MAN / 2] = COLORS(NPC_TEXT_COLOR_MALE, NPC_TEXT_COLOR_FEMALE), // OBJ_EVENT_GFX_WOMAN_3 @@ -35,8 +35,8 @@ static const u8 sTextColorTable[] = [OBJ_EVENT_GFX_SWIMMER_F_LAND / 2] = COLORS(NPC_TEXT_COLOR_FEMALE, NPC_TEXT_COLOR_MALE), // OBJ_EVENT_GFX_WORKER_M [OBJ_EVENT_GFX_WORKER_F / 2] = COLORS(NPC_TEXT_COLOR_FEMALE, NPC_TEXT_COLOR_MALE), // OBJ_EVENT_GFX_ROCKET_M [OBJ_EVENT_GFX_ROCKET_F / 2] = COLORS(NPC_TEXT_COLOR_FEMALE, NPC_TEXT_COLOR_MALE), // OBJ_EVENT_GFX_GBA_KID - [OBJ_EVENT_GFX_SUPER_NERD / 2] = COLORS(NPC_TEXT_COLOR_MALE, NPC_TEXT_COLOR_MALE), // OBJ_EVENT_GFX_BIKER - [OBJ_EVENT_GFX_BLACKBELT / 2] = COLORS(NPC_TEXT_COLOR_MALE, NPC_TEXT_COLOR_MALE), // OBJ_EVENT_GFX_SCIENTIST + [OBJ_EVENT_GFX_POKE_MANIAC / 2] = COLORS(NPC_TEXT_COLOR_MALE, NPC_TEXT_COLOR_MALE), // OBJ_EVENT_GFX_BIKER + [OBJ_EVENT_GFX_BLACK_BELT / 2] = COLORS(NPC_TEXT_COLOR_MALE, NPC_TEXT_COLOR_MALE), // OBJ_EVENT_GFX_SCIENTIST [OBJ_EVENT_GFX_HIKER / 2] = COLORS(NPC_TEXT_COLOR_MALE, NPC_TEXT_COLOR_MALE), // OBJ_EVENT_GFX_FISHER [OBJ_EVENT_GFX_CHANNELER / 2] = COLORS(NPC_TEXT_COLOR_FEMALE, NPC_TEXT_COLOR_MALE), // OBJ_EVENT_GFX_CHEF [OBJ_EVENT_GFX_POLICEMAN / 2] = COLORS(NPC_TEXT_COLOR_MALE, NPC_TEXT_COLOR_MALE), // OBJ_EVENT_GFX_GENTLEMAN diff --git a/src/fame_checker.c b/src/fame_checker.c index ea1724922..b39771a49 100644 --- a/src/fame_checker.c +++ b/src/fame_checker.c @@ -337,20 +337,20 @@ static const u8 sFameCheckerArrayNpcGraphicsIds[] = { OBJ_EVENT_GFX_BRUNO, OBJ_EVENT_GFX_BRUNO, OBJ_EVENT_GFX_CLIPBOARD, - OBJ_EVENT_GFX_BLACKBELT, + OBJ_EVENT_GFX_BLACK_BELT, OBJ_EVENT_GFX_BEAUTY, - OBJ_EVENT_GFX_BLACKBELT, + OBJ_EVENT_GFX_BLACK_BELT, // AGATHA OBJ_EVENT_GFX_AGATHA, - OBJ_EVENT_GFX_BLACKBELT, - OBJ_EVENT_GFX_BLACKBELT, + OBJ_EVENT_GFX_BLACK_BELT, + OBJ_EVENT_GFX_BLACK_BELT, OBJ_EVENT_GFX_CLIPBOARD, OBJ_EVENT_GFX_AGATHA, OBJ_EVENT_GFX_OLD_WOMAN, // LANCE OBJ_EVENT_GFX_LANCE, OBJ_EVENT_GFX_LANCE, - OBJ_EVENT_GFX_BATTLE_GIRL, + OBJ_EVENT_GFX_CRUSH_GIRL, OBJ_EVENT_GFX_WOMAN_1, OBJ_EVENT_GFX_CLIPBOARD, OBJ_EVENT_GFX_COOLTRAINER_M, @@ -1235,7 +1235,7 @@ void UpdatePickStateFromSpecialVar8005(void) { if (gSpecialVar_0x8005 == FCPICKSTATE_NO_DRAW) return; - if ( gSpecialVar_0x8005 == FCPICKSTATE_SILHOUETTE + if ( gSpecialVar_0x8005 == FCPICKSTATE_SILHOUETTE && gSaveBlock1Ptr->fameChecker[gSpecialVar_0x8004].pickState == FCPICKSTATE_COLORED ) return; diff --git a/src/trainer_fan_club.c b/src/trainer_fan_club.c index 69c860d2b..e6d7c5fef 100644 --- a/src/trainer_fan_club.c +++ b/src/trainer_fan_club.c @@ -63,7 +63,7 @@ static void UpdateTrainerFanClubGameClear(struct TrainerFanClub *fanClub) SetPlayerGotFirstFans(fanClub); SetInitialFansOfPlayer(fanClub); VarSet(VAR_FANCLUB_LOSE_FAN_TIMER, gSaveBlock2Ptr->playTimeHours); - FlagClear(FLAG_HIDE_SAFFRON_FAN_CLUB_BLACKBELT); + FlagClear(FLAG_HIDE_SAFFRON_FAN_CLUB_BLACK_BELT); FlagClear(FLAG_HIDE_SAFFRON_FAN_CLUB_ROCKER); FlagClear(FLAG_HIDE_SAFFRON_FAN_CLUB_WOMAN); FlagClear(FLAG_HIDE_SAFFRON_FAN_CLUB_BEAUTY); diff --git a/src/trainer_tower.c b/src/trainer_tower.c index 5aa48d026..732b3f2ed 100644 --- a/src/trainer_tower.c +++ b/src/trainer_tower.c @@ -109,17 +109,17 @@ static const struct SinglesTrainerInfo sSingleBattleTrainerInfo[] = { {OBJ_EVENT_GFX_TUBER_M_LAND, FACILITY_CLASS_RS_TUBER_M, MALE}, {OBJ_EVENT_GFX_COOLTRAINER_M, FACILITY_CLASS_RS_COOLTRAINER_M, MALE}, {OBJ_EVENT_GFX_COOLTRAINER_F, FACILITY_CLASS_RS_COOLTRAINER_F, FEMALE}, - {OBJ_EVENT_GFX_SUPER_NERD, FACILITY_CLASS_HEX_MANIAC, MALE}, + {OBJ_EVENT_GFX_POKE_MANIAC, FACILITY_CLASS_HEX_MANIAC, MALE}, {OBJ_EVENT_GFX_WOMAN_2, FACILITY_CLASS_RS_LADY, FEMALE}, {OBJ_EVENT_GFX_BEAUTY, FACILITY_CLASS_RS_BEAUTY, FEMALE}, {OBJ_EVENT_GFX_BOY, FACILITY_CLASS_RICH_BOY, MALE}, - {OBJ_EVENT_GFX_SUPER_NERD, FACILITY_CLASS_RS_POKEMANIAC, MALE}, + {OBJ_EVENT_GFX_POKE_MANIAC, FACILITY_CLASS_RS_POKEMANIAC, MALE}, {OBJ_EVENT_GFX_SWIMMER_M_LAND, FACILITY_CLASS_RS_SWIMMER_M, MALE}, - {OBJ_EVENT_GFX_BLACKBELT, FACILITY_CLASS_RS_BLACK_BELT, MALE}, + {OBJ_EVENT_GFX_BLACK_BELT, FACILITY_CLASS_RS_BLACK_BELT, MALE}, {OBJ_EVENT_GFX_ROCKER, FACILITY_CLASS_GUITARIST, MALE}, {OBJ_EVENT_GFX_ROCKER, FACILITY_CLASS_KINDLER, MALE}, {OBJ_EVENT_GFX_CAMPER, FACILITY_CLASS_RS_CAMPER, MALE}, - {OBJ_EVENT_GFX_SUPER_NERD, FACILITY_CLASS_BUG_MANIAC, MALE}, + {OBJ_EVENT_GFX_POKE_MANIAC, FACILITY_CLASS_BUG_MANIAC, MALE}, {OBJ_EVENT_GFX_BOY, FACILITY_CLASS_RS_PSYCHIC_M, MALE}, {OBJ_EVENT_GFX_WOMAN_1, FACILITY_CLASS_RS_PSYCHIC_F, FEMALE}, {OBJ_EVENT_GFX_GENTLEMAN, FACILITY_CLASS_RS_GENTLEMAN, MALE}, @@ -134,7 +134,7 @@ static const struct SinglesTrainerInfo sSingleBattleTrainerInfo[] = { {OBJ_EVENT_GFX_COOLTRAINER_M, FACILITY_CLASS_DRAGON_TAMER, MALE}, {OBJ_EVENT_GFX_ROCKER, FACILITY_CLASS_RS_BIRD_KEEPER, MALE}, {OBJ_EVENT_GFX_LITTLE_BOY, FACILITY_CLASS_NINJA_BOY, MALE}, - {OBJ_EVENT_GFX_BATTLE_GIRL, FACILITY_CLASS_BATTLE_GIRL, FEMALE}, + {OBJ_EVENT_GFX_CRUSH_GIRL, FACILITY_CLASS_BATTLE_GIRL, FEMALE}, {OBJ_EVENT_GFX_BEAUTY, FACILITY_CLASS_PARASOL_LADY, FEMALE}, {OBJ_EVENT_GFX_SWIMMER_F_LAND, FACILITY_CLASS_RS_SWIMMER_F, FEMALE}, {OBJ_EVENT_GFX_PICNICKER, FACILITY_CLASS_RS_PICNICKER, FEMALE}, @@ -153,11 +153,11 @@ static const struct SinglesTrainerInfo sSingleBattleTrainerInfo[] = { {OBJ_EVENT_GFX_SAILOR, FACILITY_CLASS_SAILOR, MALE}, {OBJ_EVENT_GFX_CAMPER, FACILITY_CLASS_CAMPER, MALE}, {OBJ_EVENT_GFX_PICNICKER, FACILITY_CLASS_PICNICKER, FEMALE}, - {OBJ_EVENT_GFX_SUPER_NERD, FACILITY_CLASS_POKEMANIAC, MALE}, - {OBJ_EVENT_GFX_SUPER_NERD, FACILITY_CLASS_SUPER_NERD, MALE}, + {OBJ_EVENT_GFX_POKE_MANIAC, FACILITY_CLASS_POKEMANIAC, MALE}, + {OBJ_EVENT_GFX_POKE_MANIAC, FACILITY_CLASS_SUPER_NERD, MALE}, {OBJ_EVENT_GFX_HIKER, FACILITY_CLASS_HIKER, MALE}, {OBJ_EVENT_GFX_BIKER, FACILITY_CLASS_BIKER, MALE}, - {OBJ_EVENT_GFX_SUPER_NERD, FACILITY_CLASS_BURGLAR, MALE}, + {OBJ_EVENT_GFX_POKE_MANIAC, FACILITY_CLASS_BURGLAR, MALE}, {OBJ_EVENT_GFX_BALDING_MAN, FACILITY_CLASS_ENGINEER, MALE}, {OBJ_EVENT_GFX_FISHER, FACILITY_CLASS_FISHERMAN, MALE}, {OBJ_EVENT_GFX_SWIMMER_M_LAND, FACILITY_CLASS_SWIMMER_M, MALE}, @@ -170,14 +170,14 @@ static const struct SinglesTrainerInfo sSingleBattleTrainerInfo[] = { {OBJ_EVENT_GFX_ROCKER, FACILITY_CLASS_JUGGLER, MALE}, {OBJ_EVENT_GFX_MAN, FACILITY_CLASS_TAMER, MALE}, {OBJ_EVENT_GFX_ROCKER, FACILITY_CLASS_BIRD_KEEPER, MALE}, - {OBJ_EVENT_GFX_BLACKBELT, FACILITY_CLASS_BLACK_BELT, MALE}, + {OBJ_EVENT_GFX_BLACK_BELT, FACILITY_CLASS_BLACK_BELT, MALE}, {OBJ_EVENT_GFX_SCIENTIST, FACILITY_CLASS_SCIENTIST, MALE}, {OBJ_EVENT_GFX_COOLTRAINER_M, FACILITY_CLASS_COOLTRAINER_M, MALE}, {OBJ_EVENT_GFX_COOLTRAINER_F, FACILITY_CLASS_COOLTRAINER_F, FEMALE}, {OBJ_EVENT_GFX_GENTLEMAN, FACILITY_CLASS_GENTLEMAN, MALE}, {OBJ_EVENT_GFX_CHANNELER, FACILITY_CLASS_CHANNELER, FEMALE}, {OBJ_EVENT_GFX_WOMAN_1, FACILITY_CLASS_PSYCHIC_F, FEMALE}, - {OBJ_EVENT_GFX_BATTLE_GIRL, FACILITY_CLASS_CRUSH_GIRL, FEMALE}, + {OBJ_EVENT_GFX_CRUSH_GIRL, FACILITY_CLASS_CRUSH_GIRL, FEMALE}, {OBJ_EVENT_GFX_TUBER_F, FACILITY_CLASS_TUBER, FEMALE}, {OBJ_EVENT_GFX_WOMAN_2, FACILITY_CLASS_PKMN_BREEDER, FEMALE}, {OBJ_EVENT_GFX_CAMPER, FACILITY_CLASS_PKMN_RANGER_M, MALE}, @@ -197,7 +197,7 @@ static const struct DoublesTrainerInfo sDoubleBattleTrainerInfo[] = { {OBJ_EVENT_GFX_LITTLE_GIRL, OBJ_EVENT_GFX_LITTLE_GIRL, FACILITY_CLASS_TWINS, FEMALE, FEMALE}, {OBJ_EVENT_GFX_COOLTRAINER_M, OBJ_EVENT_GFX_COOLTRAINER_F, FACILITY_CLASS_COOL_COUPLE, MALE, FEMALE}, {OBJ_EVENT_GFX_BEAUTY, OBJ_EVENT_GFX_MAN, FACILITY_CLASS_YOUNG_COUPLE, FEMALE, MALE}, - {OBJ_EVENT_GFX_BATTLE_GIRL, OBJ_EVENT_GFX_BLACKBELT, FACILITY_CLASS_CRUSH_KIN, FEMALE, MALE}, + {OBJ_EVENT_GFX_CRUSH_GIRL, OBJ_EVENT_GFX_BLACK_BELT, FACILITY_CLASS_CRUSH_KIN, FEMALE, MALE}, {OBJ_EVENT_GFX_SWIMMER_F_LAND, OBJ_EVENT_GFX_TUBER_M_LAND, FACILITY_CLASS_SIS_AND_BRO, FEMALE, MALE} }; @@ -653,7 +653,7 @@ static void BufferTowerOpponentSpeech(void) u16 trainerId = gSpecialVar_0x8006; u8 facilityClass; u8 challengeType = CURR_FLOOR.challengeType; - + if (challengeType != CHALLENGE_TYPE_DOUBLE) facilityClass = CURR_FLOOR.trainers[trainerId].facilityClass; else @@ -759,7 +759,7 @@ static void TrainerTowerAddFloorCleared(void) static void GetFloorAlreadyCleared(void) { u16 mapLayoutId = gMapHeader.mapLayoutId; - if (mapLayoutId - LAYOUT_TRAINER_TOWER_1F == TRAINER_TOWER.floorsCleared + if (mapLayoutId - LAYOUT_TRAINER_TOWER_1F == TRAINER_TOWER.floorsCleared && mapLayoutId - LAYOUT_TRAINER_TOWER_LOBBY <= CURR_FLOOR.floorIdx) gSpecialVar_Result = FALSE; else diff --git a/src/union_room_player_avatar.c b/src/union_room_player_avatar.c index 9352b8150..3eaa34570 100644 --- a/src/union_room_player_avatar.c +++ b/src/union_room_player_avatar.c @@ -33,7 +33,7 @@ static void SetUnionRoomObjectFacingDirection(s32 member, s32 leaderId, u8 direc static const u8 sUnionRoomObjGfxIds[GENDER_COUNT][NUM_UNION_ROOM_CLASSES + 2] = { [MALE] = { OBJ_EVENT_GFX_COOLTRAINER_M, - OBJ_EVENT_GFX_BLACKBELT, + OBJ_EVENT_GFX_BLACK_BELT, OBJ_EVENT_GFX_CAMPER, OBJ_EVENT_GFX_YOUNGSTER, OBJ_EVENT_GFX_BOY, @@ -47,7 +47,7 @@ static const u8 sUnionRoomObjGfxIds[GENDER_COUNT][NUM_UNION_ROOM_CLASSES + 2] = OBJ_EVENT_GFX_PICNICKER, OBJ_EVENT_GFX_LASS, OBJ_EVENT_GFX_WOMAN_1, - OBJ_EVENT_GFX_BATTLE_GIRL, + OBJ_EVENT_GFX_CRUSH_GIRL, OBJ_EVENT_GFX_WOMAN_2, OBJ_EVENT_GFX_BEAUTY } diff --git a/src/vs_seeker.c b/src/vs_seeker.c index 71b7b1ece..772e5516b 100644 --- a/src/vs_seeker.c +++ b/src/vs_seeker.c @@ -644,7 +644,7 @@ void VsSeekerResetObjectMovementAfterChargeComplete(void) for (i = 0; i < gMapHeader.events->objectEventCount; i++) { if ((templates[i].objUnion.normal.trainerType == TRAINER_TYPE_NORMAL - || templates[i].objUnion.normal.trainerType == TRAINER_TYPE_BURIED) + || templates[i].objUnion.normal.trainerType == TRAINER_TYPE_BURIED) && (templates[i].objUnion.normal.movementType == MOVEMENT_TYPE_RAISE_HAND_AND_STOP || templates[i].objUnion.normal.movementType == MOVEMENT_TYPE_RAISE_HAND_AND_JUMP || templates[i].objUnion.normal.movementType == MOVEMENT_TYPE_RAISE_HAND_AND_SWIM)) @@ -946,7 +946,7 @@ void ClearRematchStateByTrainerId(void) for (i = 0; i < gMapHeader.events->objectEventCount; i++) { - if ((objectEventTemplates[i].objUnion.normal.trainerType == TRAINER_TYPE_NORMAL + if ((objectEventTemplates[i].objUnion.normal.trainerType == TRAINER_TYPE_NORMAL || objectEventTemplates[i].objUnion.normal.trainerType == TRAINER_TYPE_BURIED) && vsSeekerDataIdx == LookupVsSeekerOpponentInArray(sRematches, GetTrainerFlagFromScript(objectEventTemplates[i].script))) { @@ -1139,7 +1139,7 @@ static u8 GetRunningBehaviorFromGraphicsId(u8 graphicsId) case OBJ_EVENT_GFX_BUG_CATCHER: case OBJ_EVENT_GFX_LASS: case OBJ_EVENT_GFX_WOMAN_1: - case OBJ_EVENT_GFX_BATTLE_GIRL: + case OBJ_EVENT_GFX_CRUSH_GIRL: case OBJ_EVENT_GFX_MAN: case OBJ_EVENT_GFX_ROCKER: case OBJ_EVENT_GFX_WOMAN_2: @@ -1152,7 +1152,7 @@ static u8 GetRunningBehaviorFromGraphicsId(u8 graphicsId) case OBJ_EVENT_GFX_COOLTRAINER_F: case OBJ_EVENT_GFX_SWIMMER_M_LAND: case OBJ_EVENT_GFX_SWIMMER_F_LAND: - case OBJ_EVENT_GFX_BLACKBELT: + case OBJ_EVENT_GFX_BLACK_BELT: case OBJ_EVENT_GFX_HIKER: case OBJ_EVENT_GFX_SAILOR: return MOVEMENT_TYPE_RAISE_HAND_AND_JUMP;