diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-08-29 01:47:36 -0400 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-08-29 01:47:36 -0400 |
| commit | 038abf80ba30a277420e0381312c0cfc2296811e (patch) | |
| tree | ab951530e74209c0da170bc74ddd8b5a456bab9a /data | |
| parent | d7ec1d234b260df869213e195055dd75bcbe5cf3 (diff) | |
Give songs meaningful english names
Diffstat (limited to 'data')
458 files changed, 1609 insertions, 1609 deletions
diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index cb478ad7d..0dc199a6e 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -427,7 +427,7 @@ Move_POUND: @ 81C7794 loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BATTLER_TARGET setalpha 12, 8 - playsewithpan SE_W003, SOUND_PAN_TARGET + playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 3, 0, 6, 1 waitforvisualfinish @@ -442,7 +442,7 @@ Move_DOUBLE_SLAP: @ 81C77C5 choosetwoturnanim Move_DOUBLE_SLAP_FirstHit, Move_DOUBLE_SLAP_SecondHit Move_DOUBLE_SLAP_End: createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 3, 0, 6, 1 - playsewithpan SE_W003, SOUND_PAN_TARGET + playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_BATTLER_TARGET blendoff @@ -457,7 +457,7 @@ Move_DOUBLE_SLAP_SecondHit: Move_POISON_POWDER: @ 81C7818 loadspritegfx ANIM_TAG_POISON_POWDER loadspritegfx ANIM_TAG_POISON_BUBBLE - loopsewithpan SE_W077, SOUND_PAN_TARGET, 10, 6 + loopsewithpan SE_M_POISON_POWDER, SOUND_PAN_TARGET, 10, 6 createsprite gPoisonPowderParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, -30, -22, 117, 80, 5, 1 createsprite gPoisonPowderParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, 10, -22, 117, 80, -5, 1 createsprite gPoisonPowderParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, -25, -22, 117, 112, 5, 3 @@ -481,7 +481,7 @@ Move_POISON_POWDER: @ 81C7818 Move_STUN_SPORE: @ 81C7949 loadspritegfx ANIM_TAG_STUN_SPORE - loopsewithpan SE_W077, SOUND_PAN_TARGET, 10, 6 + loopsewithpan SE_M_POISON_POWDER, SOUND_PAN_TARGET, 10, 6 createsprite gStunSporeParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, -30, -22, 117, 80, 5, 1 createsprite gStunSporeParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, 10, -22, 117, 80, -5, 1 createsprite gStunSporeParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, -25, -22, 117, 112, 5, 3 @@ -505,7 +505,7 @@ Move_STUN_SPORE: @ 81C7949 Move_SLEEP_POWDER: @ 81C7A77 loadspritegfx ANIM_TAG_SLEEP_POWDER - loopsewithpan SE_W077, SOUND_PAN_TARGET, 10, 6 + loopsewithpan SE_M_POISON_POWDER, SOUND_PAN_TARGET, 10, 6 createsprite gSleepPowderParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, -30, -22, 117, 80, 5, 1 createsprite gSleepPowderParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, 10, -22, 117, 80, -5, 1 createsprite gSleepPowderParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, -25, -22, 117, 112, 5, 3 @@ -532,21 +532,21 @@ Move_SWIFT: @ 81C7BA5 loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BATTLER_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W129, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWIFT, SOUND_PAN_ATTACKER createsprite gSwiftStarSpriteTemplate, ANIM_BATTLER_TARGET, 3, 20, -10, 20, 0, 22, 20, 1 delay 5 - playsewithpan SE_W129, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWIFT, SOUND_PAN_ATTACKER createsprite gSwiftStarSpriteTemplate, ANIM_BATTLER_TARGET, 3, 20, -10, 20, 5, 22, -18, 1 delay 5 - playsewithpan SE_W129, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWIFT, SOUND_PAN_ATTACKER createsprite gSwiftStarSpriteTemplate, ANIM_BATTLER_TARGET, 3, 20, -10, 20, -10, 22, 15, 1 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 18, 1 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_DEF_PARTNER, 2, 0, 18, 1 delay 5 - playsewithpan SE_W129, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWIFT, SOUND_PAN_ATTACKER createsprite gSwiftStarSpriteTemplate, ANIM_BATTLER_TARGET, 3, 20, -10, 20, 0, 22, -20, 1 delay 5 - playsewithpan SE_W129, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWIFT, SOUND_PAN_ATTACKER createsprite gSwiftStarSpriteTemplate, ANIM_BATTLER_TARGET, 3, 20, -10, 20, 0, 22, 12, 1 delay 5 waitforvisualfinish @@ -558,20 +558,20 @@ Move_STRENGTH: @ 81C7C5E loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BATTLER_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W036, SOUND_PAN_ATTACKER + playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER createvisualtask AnimTask_ShakeAndSinkMon, 5, ANIM_BATTLER_ATTACKER, 2, 0, 96, 30 waitforvisualfinish delay 10 createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 4 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_BATTLER_TARGET, 18, 6, 2, 4 delay 4 - playsewithpan SE_W025B, SOUND_PAN_TARGET + playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 16, 12, 1, 1 delay 4 - playsewithpan SE_W025B, SOUND_PAN_TARGET + playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, -16, -12, 1, 1 delay 4 - playsewithpan SE_W025B, SOUND_PAN_TARGET + playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 3, 4, 1, 1 waitforvisualfinish createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 8, 1 @@ -588,7 +588,7 @@ Move_TACKLE: @ 81C7CF2 delay 6 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 3, 0, 6, 1 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_BATTLER_TARGET blendoff @@ -598,14 +598,14 @@ Move_BODY_SLAM: @ 81C7D30 loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BATTLER_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W036, SOUND_PAN_ATTACKER + playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER createsprite gVerticalDipSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 6, 1, ANIM_BATTLER_ATTACKER waitforvisualfinish delay 11 createsprite gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 26, 0, 0, 5 delay 6 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 4, -10, 0, 1, 0 - loopsewithpan SE_W025B, SOUND_PAN_TARGET, 10, 2 + loopsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET, 10, 2 delay 1 createsprite gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, -28, 0, 0, 3 waitforvisualfinish @@ -637,7 +637,7 @@ Move_SUPERSONIC: @ 81C7DBD blendoff end Move_SUPERSONIC_CreateWaveSprite: - playsewithpan SE_W048, SOUND_PAN_ATTACKER + playsewithpan SE_M_SUPERSONIC, SOUND_PAN_ATTACKER createsprite gSupersonicWaveSpriteTemplate, ANIM_BATTLER_TARGET, 2, 16, 0, 0, 0, 30, 0 delay 2 return @@ -652,7 +652,7 @@ Move_SCREECH: @ 81C7E15 waitforvisualfinish end Move_SCREECH_CreateWaveSprite: - playsewithpan SE_W103, SOUND_PAN_ATTACKER + playsewithpan SE_M_SCREECH, SOUND_PAN_ATTACKER createsprite gScreechWaveSpriteTemplate, ANIM_BATTLER_TARGET, 2, 16, 0, 0, 0, 30, 0 delay 2 return @@ -662,31 +662,31 @@ Move_FLAME_WHEEL: @ 81C7E62 monbg ANIM_BATTLER_DEF_PARTNER monbgprio_2A ANIM_BATTLER_TARGET createsprite gBattleAnimSpriteTemplate_83D9694, ANIM_BATTLER_ATTACKER, 3, 0, 0, 56, 0 - playsewithpan SE_W172, SOUND_PAN_ATTACKER + playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER delay 2 createsprite gBattleAnimSpriteTemplate_83D9694, ANIM_BATTLER_ATTACKER, 3, 0, 0, 56, 4 - playsewithpan SE_W172, SOUND_PAN_ATTACKER + playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER delay 2 createsprite gBattleAnimSpriteTemplate_83D9694, ANIM_BATTLER_ATTACKER, 3, 0, 0, 56, 8 - playsewithpan SE_W172, SOUND_PAN_ATTACKER + playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER delay 2 createsprite gBattleAnimSpriteTemplate_83D9694, ANIM_BATTLER_ATTACKER, 3, 0, 0, 56, 12 - playsewithpan SE_W172, SOUND_PAN_ATTACKER + playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER delay 2 createsprite gBattleAnimSpriteTemplate_83D9694, ANIM_BATTLER_ATTACKER, 3, 0, 0, 56, 16 - playsewithpan SE_W172, SOUND_PAN_ATTACKER + playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER delay 2 createsprite gBattleAnimSpriteTemplate_83D9694, ANIM_BATTLER_ATTACKER, 3, 0, 0, 56, 20 - playsewithpan SE_W172, SOUND_PAN_ATTACKER + playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER delay 2 createsprite gBattleAnimSpriteTemplate_83D9694, ANIM_BATTLER_ATTACKER, 3, 0, 0, 56, 24 - playsewithpan SE_W172, SOUND_PAN_ATTACKER + playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER waitforvisualfinish createsprite gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 24, 0, 0, 6 delay 4 createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 5, 0, 8, 1 createvisualtask AnimTask_BlendMonInAndOut, 3, ANIM_BATTLER_TARGET, 31, 12, 1, 1 - playsewithpan SE_W172B, SOUND_PAN_TARGET + playsewithpan SE_M_FLAME_WHEEL2, SOUND_PAN_TARGET call _81D11A2 delay 7 createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 9 @@ -705,22 +705,22 @@ Move_PIN_MISSILE: @ 81C7F5C monbg ANIM_BATTLER_TARGET monbgprio_28 1 setalpha 12, 8 - playsewithpan SE_W026, SOUND_PAN_ATTACKER + playsewithpan SE_M_JUMP_KICK, SOUND_PAN_ATTACKER createsprite gPinMissileSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 20, -8, -8, -8, 20, -32 delay 15 createsprite gPinMissileSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 20, -8, 8, 8, 20, -40 delay 4 - playsewithpan SE_W030, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, -8, -8, 1, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 3, 0, 2, 1 delay 9 createsprite gPinMissileSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 20, -8, 0, 0, 20, -32 delay 4 - playsewithpan SE_W030, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 8, 8, 1, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 3, 0, 2, 1 delay 14 - playsewithpan SE_W030, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 3, 0, 2, 1 waitforvisualfinish @@ -734,22 +734,22 @@ Move_ICICLE_SPEAR: @ 81C8021 monbg ANIM_BATTLER_TARGET monbgprio_28 1 setalpha 12, 8 - playsewithpan SE_W196, SOUND_PAN_ATTACKER + playsewithpan SE_M_ICY_WIND, SOUND_PAN_ATTACKER createsprite gIcicleSpearSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 20, -8, -8, -8, 20, -32 delay 15 createsprite gIcicleSpearSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 20, -8, 8, 8, 20, -40 delay 4 - playsewithpan SE_W030, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, -8, -8, 1, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 3, 0, 2, 1 delay 9 createsprite gIcicleSpearSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 20, -8, 0, 0, 20, -32 delay 4 - playsewithpan SE_W030, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 8, 8, 1, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 3, 0, 2, 1 delay 14 - playsewithpan SE_W030, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 3, 0, 2, 1 waitforvisualfinish @@ -761,12 +761,12 @@ Move_TAKE_DOWN: @ 81C80E6 loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BATTLER_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W036, SOUND_PAN_ATTACKER + playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER createvisualtask AnimTask_WindUpLunge, 5, ANIM_BATTLER_ATTACKER, -24, 8, 23, 10, 40, 10 delay 35 createsprite gBattleAnimSpriteTemplate_83DB3DC, ANIM_BATTLER_ATTACKER, 2, 31, 3, 1, 0, 10, 0, 0 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 4, -10, 0, 1, 0 - playsewithpan SE_W025B, SOUND_PAN_TARGET + playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET delay 1 createsprite gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, -16, 0, 0, 4 waitforvisualfinish @@ -783,19 +783,19 @@ Move_TAKE_DOWN: @ 81C80E6 Move_DOUBLE_EDGE: @ 81C817A loadspritegfx ANIM_TAG_IMPACT - playsewithpan SE_W129, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWIFT, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83DB3DC, ANIM_BATTLER_ATTACKER, 2, 2, 4, 2, 32767, 10, 0, 0 waitforvisualfinish delay 10 - playsewithpan SE_W207, SOUND_PAN_ATTACKER - waitplaysewithpan SE_W207, SOUND_PAN_ATTACKER, 8 + playsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER + waitplaysewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER, 8 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_BATTLER_ATTACKER, 18, 6, 2, 4 waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 0, 16, 16, rgb(31, 31, 31) createsprite gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 20, 0, 0, 4 delay 3 waitforvisualfinish - playsewithpan SE_W025B, SOUND_PAN_TARGET + playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 4, -10, 0, 1, 0 createsprite gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, -32, 0, 0, 3 waitforvisualfinish @@ -821,12 +821,12 @@ Move_POISON_STING: @ 81C828D monbg ANIM_BATTLER_TARGET monbgprio_28 1 setalpha 12, 8 - playsewithpan SE_W013B, SOUND_PAN_ATTACKER + playsewithpan SE_M_RAZOR_WIND2, SOUND_PAN_ATTACKER createsprite gLinearStingerSpriteTemplate, ANIM_BATTLER_TARGET, 2, 20, 0, -8, 0, 20 waitforvisualfinish createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 5, 1 - playsewithpan SE_W030, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET waitforvisualfinish call PoisonBubblesAnim waitforvisualfinish @@ -840,13 +840,13 @@ Move_TWINEEDLE: @ 81C82E2 monbg ANIM_BATTLER_TARGET monbgprio_28 1 setalpha 12, 8 - loopsewithpan SE_W013B, SOUND_PAN_ATTACKER, 6, 2 + loopsewithpan SE_M_RAZOR_WIND2, SOUND_PAN_ATTACKER, 6, 2 createsprite gLinearStingerSpriteTemplate, ANIM_BATTLER_TARGET, 2, 10, -4, 0, -4, 20 createsprite gLinearStingerSpriteTemplate, ANIM_BATTLER_TARGET, 2, 20, 12, 10, 12, 20 delay 20 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 5, 1 createsprite gBattleAnimSpriteTemplate_83DB4C0, ANIM_BATTLER_ATTACKER, 3, 0, -4, 1, 3 - loopsewithpan SE_W030, SOUND_PAN_TARGET, 5, 2 + loopsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET, 5, 2 delay 1 createsprite gBattleAnimSpriteTemplate_83DB4C0, ANIM_BATTLER_ATTACKER, 3, 10, 12, 1, 3 waitforvisualfinish @@ -904,29 +904,29 @@ Move_FIRE_BLAST_CreateFireCross: Move_LEECH_SEED: @ 81C8483 loadspritegfx ANIM_TAG_SEED - playsewithpan SE_W077, SOUND_PAN_ATTACKER + playsewithpan SE_M_POISON_POWDER, SOUND_PAN_ATTACKER createsprite gLeechSeedSpriteTemplate, ANIM_BATTLER_TARGET, 2, 15, 0, 0, 24, 35, -32 delay 8 - playsewithpan SE_W077, SOUND_PAN_ATTACKER + playsewithpan SE_M_POISON_POWDER, SOUND_PAN_ATTACKER createsprite gLeechSeedSpriteTemplate, ANIM_BATTLER_TARGET, 2, 15, 0, -16, 24, 35, -40 delay 8 - playsewithpan SE_W077, SOUND_PAN_ATTACKER + playsewithpan SE_M_POISON_POWDER, SOUND_PAN_ATTACKER createsprite gLeechSeedSpriteTemplate, ANIM_BATTLER_TARGET, 2, 15, 0, 16, 24, 35, -37 delay 12 - loopsewithpan SE_W039, SOUND_PAN_TARGET, 10, 8 + loopsewithpan SE_M_TAIL_WHIP, SOUND_PAN_TARGET, 10, 8 waitforvisualfinish end Move_EMBER: @ 81C84D9 loadspritegfx ANIM_TAG_SMALL_EMBER - loopsewithpan SE_W052, SOUND_PAN_ATTACKER, 5, 2 + loopsewithpan SE_M_EMBER, SOUND_PAN_ATTACKER, 5, 2 createsprite gEmberSpriteTemplate, ANIM_BATTLER_TARGET, 2, 20, 0, -16, 24, 20, 1 delay 4 createsprite gEmberSpriteTemplate, ANIM_BATTLER_TARGET, 2, 20, 0, 0, 24, 20, 1 delay 4 createsprite gEmberSpriteTemplate, ANIM_BATTLER_TARGET, 2, 20, 0, 16, 24, 20, 1 delay 16 - playsewithpan SE_W172, SOUND_PAN_TARGET + playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_TARGET call Move_EMBER_CreateFlare call Move_EMBER_CreateFlare call Move_EMBER_CreateFlare @@ -943,7 +943,7 @@ Move_MEGA_PUNCH: @ 81C854D delay 2 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 0, 0, 16, rgb(0, 0, 0) setalpha 12, 8 - playsewithpan SE_W025, SOUND_PAN_TARGET + playsewithpan SE_M_MEGA_KICK, SOUND_PAN_TARGET createsprite gMegaPunchKickSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 0, 0, 0, 50 createvisualtask sub_80E2A38, 10, 4, 2, 0, 7, 32767 delay 50 @@ -952,7 +952,7 @@ Move_MEGA_PUNCH: @ 81C854D createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 4, 0, 22, 1 createvisualtask sub_80E2A38, 10, 4, 2, 0, 0, 32767 createsprite gBattleAnimSpriteTemplate_83DB3DC, ANIM_BATTLER_ATTACKER, 2, 31, 3, 1, 0, 8, 0, 0 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_BATTLER_TARGET blendoff @@ -986,11 +986,11 @@ Move_MEGA_KICK: @ 81C8627 delay 2 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 0, 0, 16, rgb(0, 0, 0) setalpha 12, 8 - playsewithpan SE_W025, SOUND_PAN_TARGET + playsewithpan SE_M_MEGA_KICK, SOUND_PAN_TARGET createsprite gMegaPunchKickSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 50 createvisualtask sub_80E2A38, 10, 4, 2, 0, 7, 32767 delay 50 - playsewithpan SE_W025B, SOUND_PAN_TARGET + playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET call _81C85E9 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 0 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 4, 0, 22, 1 @@ -1012,7 +1012,7 @@ Move_COMET_PUNCH: @ 81C86C3 choosetwoturnanim Move_COMET_PUNCH_Even, Move_COMET_PUNCH_Odd Move_COMET_PUNCH_End: createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 3, 0, 6, 1 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_BATTLER_TARGET blendoff @@ -1042,7 +1042,7 @@ Move_SONIC_BOOM: @ 81C873B blendoff end Move_SONIC_BOOM_CreateBlast: - playsewithpan SE_W013B, SOUND_PAN_ATTACKER + playsewithpan SE_M_RAZOR_WIND2, SOUND_PAN_ATTACKER createsprite gSonicBoomSpriteTemplate, ANIM_BATTLER_TARGET, 2, 16, 0, 0, 0, 15 delay 4 return @@ -1058,7 +1058,7 @@ Move_THUNDER_SHOCK: @ 81C879C waitforvisualfinish delay 10 createvisualtask sub_80D681C, 5, 0, -44, 0 - playsewithpan SE_W085, SOUND_PAN_TARGET + playsewithpan SE_M_THUNDERBOLT, SOUND_PAN_TARGET delay 9 createvisualtask sub_80E2A38, 10, 4, 0, 0, 13, 0 waitforvisualfinish @@ -1080,13 +1080,13 @@ Move_THUNDERBOLT: @ 81C880A waitforvisualfinish delay 10 createvisualtask sub_80D681C, 5, 24, -52, 0 - playsewithpan SE_W085, SOUND_PAN_TARGET + playsewithpan SE_M_THUNDERBOLT, SOUND_PAN_TARGET delay 7 createvisualtask sub_80D681C, 5, -24, -52, 0 - playsewithpan SE_W085, SOUND_PAN_TARGET + playsewithpan SE_M_THUNDERBOLT, SOUND_PAN_TARGET delay 7 createvisualtask sub_80D681C, 5, 0, -60, 1 - playsewithpan SE_W085, SOUND_PAN_TARGET + playsewithpan SE_M_THUNDERBOLT, SOUND_PAN_TARGET delay 9 createvisualtask sub_80E2A38, 10, 4, 0, 0, 13, 0 waitforvisualfinish @@ -1102,7 +1102,7 @@ Move_THUNDERBOLT: @ 81C880A createsprite gBattleAnimSpriteTemplate_83D9908, ANIM_BATTLER_TARGET, 4, 0, 0, 16, 44, 96, 40, 1, -32765 createsprite gBattleAnimSpriteTemplate_83D9908, ANIM_BATTLER_TARGET, 4, 0, 0, 16, 44, 160, 40, 0, -32765 createsprite gBattleAnimSpriteTemplate_83D9908, ANIM_BATTLER_TARGET, 4, 0, 0, 16, 44, 224, 40, 2, -32765 - playsewithpan SE_W063, SOUND_PAN_TARGET + playsewithpan SE_M_HYPER_BEAM, SOUND_PAN_TARGET delay 0 createvisualtask sub_80E2A38, 10, 1, 0, 2, 2, 0 delay 6 @@ -1113,7 +1113,7 @@ Move_THUNDERBOLT: @ 81C880A createvisualtask sub_80E2A38, 10, 1, 0, 6, 6, 0 waitforvisualfinish delay 20 - waitplaysewithpan SE_W085B, SOUND_PAN_TARGET, 19 + waitplaysewithpan SE_M_THUNDERBOLT2, SOUND_PAN_TARGET, 19 call ElectricityEffect waitforvisualfinish delay 20 @@ -1129,9 +1129,9 @@ Move_THUNDER_WAVE: @ 81C89C0 waitforvisualfinish delay 10 createvisualtask sub_80D681C, 5, 0, -48, 0 - playsewithpan SE_W086, SOUND_PAN_TARGET + playsewithpan SE_M_THUNDER_WAVE, SOUND_PAN_TARGET delay 20 - loopsewithpan SE_W085B, SOUND_PAN_TARGET, 10, 4 + loopsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_TARGET, 10, 4 createsprite gBattleAnimSpriteTemplate_83D9950, ANIM_BATTLER_TARGET, 2, -16, -16 delay 4 createsprite gBattleAnimSpriteTemplate_83D9950, ANIM_BATTLER_TARGET, 2, -16, 0 @@ -1157,23 +1157,23 @@ Move_BEAT_UP_Even: createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 2, -20, -20, 1, 2 createsprite gFistFootSpriteTemplate, ANIM_BATTLER_TARGET, 3, -20, -12, 8, 1, 0 createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 3, 0, 6, 1 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET delay 8 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 2, 8, 0, 1, 2 createsprite gFistFootSpriteTemplate, ANIM_BATTLER_TARGET, 3, 8, 8, 8, 1, 0 createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 3, 0, 6, 1 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET goto Move_BEAT_UP_End Move_BEAT_UP_Odd: createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 2, 12, -20, 1, 2 createsprite gFistFootSpriteTemplate, ANIM_BATTLER_TARGET, 3, 12, -12, 8, 1, 0 createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 3, 0, 6, 1 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET delay 8 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 2, -12, 0, 1, 2 createsprite gFistFootSpriteTemplate, ANIM_BATTLER_TARGET, 3, -12, 8, 8, 1, 0 createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 3, 0, 6, 1 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET goto Move_BEAT_UP_End Move_STOMP: @ 81C8B2A @@ -1181,19 +1181,19 @@ Move_STOMP: @ 81C8B2A loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BATTLER_TARGET setalpha 12, 8 - playsewithpan SE_W104, SOUND_PAN_TARGET + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_TARGET createsprite gStompFootSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 0, -32, 15 delay 19 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, -8, 1, 1 createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 0, 4, 9, 1 - playsewithpan SE_W025B, SOUND_PAN_TARGET + playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_BATTLER_TARGET blendoff end Move_TAIL_WHIP: @ 81C8B71 - loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 24, 3 + loopsewithpan SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER, 24, 3 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_BATTLER_ATTACKER, 12, 4, 2, 3 waitforvisualfinish end @@ -1202,7 +1202,7 @@ Move_CUT: @ 81C8B8A loadspritegfx ANIM_TAG_CUT monbg ANIM_BATTLER_TARGET setalpha 12, 8 - playsewithpan SE_W015, SOUND_PAN_TARGET + playsewithpan SE_M_CUT, SOUND_PAN_TARGET createsprite gCuttingSliceSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 40, -32, 0 delay 5 createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 0, 3, 10, 1 @@ -1214,14 +1214,14 @@ Move_CUT: @ 81C8B8A Move_HIDDEN_POWER: @ 81C8BBC loadspritegfx ANIM_TAG_RED_ORB - playsewithpan SE_W036, SOUND_PAN_ATTACKER + playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 11, ANIM_BATTLER_ATTACKER, 0 waitforvisualfinish delay 30 createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_BATTLER_ATTACKER, 20479, 12, 5, 1 delay 4 createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 11, ANIM_BATTLER_ATTACKER, 0 - playsewithpan SE_W179, SOUND_PAN_ATTACKER + playsewithpan SE_M_REVERSAL, SOUND_PAN_ATTACKER createsprite gHiddenPowerOrbSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 26, 0 createsprite gHiddenPowerOrbSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 26, 42 createsprite gHiddenPowerOrbSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 26, 84 @@ -1230,7 +1230,7 @@ Move_HIDDEN_POWER: @ 81C8BBC createsprite gHiddenPowerOrbSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 26, 210 delay 52 setarg ARG_RET_ID, -1 - playsewithpan SE_W115, SOUND_PAN_ATTACKER + playsewithpan SE_M_REFLECT, SOUND_PAN_ATTACKER createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 11, ANIM_BATTLER_ATTACKER, 0 createsprite gHiddenPowerOrbScatterSpriteTemplate, ANIM_BATTLER_TARGET, 2, 0 createsprite gHiddenPowerOrbScatterSpriteTemplate, ANIM_BATTLER_TARGET, 2, 32 @@ -1246,13 +1246,13 @@ Move_REVERSAL: @ 81C8CA5 loadspritegfx ANIM_TAG_BLUE_ORB loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_IMPACT - playsewithpan SE_W197, SOUND_PAN_ATTACKER + playsewithpan SE_M_DETECT, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83DB3DC, ANIM_BATTLER_ATTACKER, 2, 31, 3, 3, 32767, 8, 0, 0 waitforvisualfinish delay 30 createvisualtask sub_80E1F8C, 2, 31, 3, 2, 0, 10, 32767 delay 10 - playsewithpan SE_W179, SOUND_PAN_ATTACKER + playsewithpan SE_M_REVERSAL, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_8402738, ANIM_BATTLER_ATTACKER, 2, 26, 0 createsprite gBattleAnimSpriteTemplate_8402738, ANIM_BATTLER_ATTACKER, 2, 26, 42 createsprite gBattleAnimSpriteTemplate_8402738, ANIM_BATTLER_ATTACKER, 2, 26, 84 @@ -1263,7 +1263,7 @@ Move_REVERSAL: @ 81C8CA5 delay 20 createsprite gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 6, 4 delay 8 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DB3DC, ANIM_BATTLER_ATTACKER, 2, 31, 3, 1, 32767, 8, 0, 0 createsprite gFistFootSpriteTemplate, ANIM_BATTLER_TARGET, 4, 0, 0, 10, 1, 0 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 3, 0, 0, 1, 1 @@ -1287,12 +1287,12 @@ _81C8D96: waitbgfadein end _81C8D9F: - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 2 createvisualtask sub_80A9058, 5, 0, 1, 6, 1, 0 goto _81C8D96 _81C8DC8: - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 1 createvisualtask sub_80A9058, 5, 0, 1, 6, 1, 0 goto _81C8D96 @@ -1305,7 +1305,7 @@ Move_SPIKE_CANNON: @ 81C8DF1 setalpha 12, 8 createvisualtask AnimTask_WindUpLunge, 5, ANIM_BATTLER_ATTACKER, -4, 0, 4, 6, 8, 4 waitforvisualfinish - loopsewithpan SE_W013B, SOUND_PAN_ATTACKER, 5, 3 + loopsewithpan SE_M_RAZOR_WIND2, SOUND_PAN_ATTACKER, 5, 3 createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 5 createsprite gLinearStingerSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 10, -8, -8, -8, 20 createsprite gLinearStingerSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 18, 0, 0, 0, 20 @@ -1315,7 +1315,7 @@ Move_SPIKE_CANNON: @ 81C8DF1 createsprite gBattleAnimSpriteTemplate_83DB4C0, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 2 createsprite gBattleAnimSpriteTemplate_83DB4C0, ANIM_BATTLER_ATTACKER, 3, 8, 8, 1, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 3, 0, 7, 1 - loopsewithpan SE_W030, SOUND_PAN_TARGET, 5, 3 + loopsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET, 5, 3 waitforvisualfinish clearmonbg ANIM_BATTLER_TARGET blendoff @@ -1325,7 +1325,7 @@ Move_SWORDS_DANCE: @ 81C8EA4 loadspritegfx ANIM_TAG_SWORD monbg ANIM_BATTLER_ATTACKER setalpha 12, 8 - playsewithpan SE_W014, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWORDS_DANCE, SOUND_PAN_ATTACKER createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_BATTLER_ATTACKER, 16, 6, 1, 4 createsprite gBattleAnimSpriteTemplate_83D748C, ANIM_BATTLER_ATTACKER, 2, 0, 0 delay 22 @@ -1341,12 +1341,12 @@ Move_PSYCH_UP: @ 81C8EEA monbg ANIM_BATTLER_ATK_PARTNER createvisualtask sub_80E1F8C, 2, 25, 2, 6, 1, 11, 0 setalpha 12, 8 - loopsewithpan SE_W060B, SOUND_PAN_ATTACKER, 5, 10 + loopsewithpan SE_M_PSYBEAM2, SOUND_PAN_ATTACKER, 5, 10 createsprite gBattleAnimSpriteTemplate_83DA690, ANIM_BATTLER_ATTACKER, 2, 0, 0, 0, 0 createvisualtask AnimTask_SwayMon, 5, 0, 5, 2560, 8, 0 delay 127 delay 4 - playsewithpan SE_W060, SOUND_PAN_ATTACKER + playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER createvisualtask AnimTask_ScaleMonAndRestore, 5, -5, -5, 10, ANIM_BATTLER_ATTACKER, 1 createvisualtask sub_80E2A38, 9, 2, 2, 10, 0, 1023 delay 30 @@ -1364,7 +1364,7 @@ Move_DIZZY_PUNCH: @ 81C8F5C call _81C9077 createsprite gFistFootSpriteTemplate, ANIM_BATTLER_TARGET, 5, 16, 8, 20, 1, 0 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 4, 16, 0, 1, 1 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DA088, ANIM_BATTLER_TARGET, 3, 16, 8, 160, -32 createsprite gBattleAnimSpriteTemplate_83DA088, ANIM_BATTLER_TARGET, 3, 16, 8, -256, -40 createsprite gBattleAnimSpriteTemplate_83DA088, ANIM_BATTLER_TARGET, 3, 16, 8, 128, -16 @@ -1375,7 +1375,7 @@ Move_DIZZY_PUNCH: @ 81C8F5C call _81C9077 createsprite gFistFootSpriteTemplate, ANIM_BATTLER_TARGET, 5, -16, -8, 20, 1, 0 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 4, -16, -16, 1, 1 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DA088, ANIM_BATTLER_TARGET, 3, -16, -8, 160, -32 createsprite gBattleAnimSpriteTemplate_83DA088, ANIM_BATTLER_TARGET, 3, -16, -8, -256, -40 createsprite gBattleAnimSpriteTemplate_83DA088, ANIM_BATTLER_TARGET, 3, -16, -8, 128, -16 @@ -1394,7 +1394,7 @@ _81C9077: Move_FIRE_SPIN: @ 81C9096 loadspritegfx ANIM_TAG_SMALL_EMBER - playsewithpan SE_W221B, SOUND_PAN_TARGET + playsewithpan SE_M_SACRED_FIRE2, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 5, 1, 0, 2, 47, 1 call _81C90BF call _81C90BF @@ -1420,7 +1420,7 @@ Move_FURY_CUTTER: @ 81C914A loadspritegfx ANIM_TAG_CUT monbg ANIM_BATTLER_TARGET setalpha 12, 8 - playsewithpan SE_W013, SOUND_PAN_TARGET + playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET createvisualtask UpdateFuryCutterAnimDirection, 2 jumpargeq 7, 0, _81C91A7 goto _81C91B9 @@ -1468,19 +1468,19 @@ Move_SELF_DESTRUCT: @ 81C9219 createvisualtask sub_80E2A38, 10, 2, 1, 9, 0, 31 end _81C929F: - playsewithpan SE_W120, SOUND_PAN_ATTACKER + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D7828, ANIM_BATTLER_ATTACKER, 3, 0, 0, 0, 1 delay 6 - playsewithpan SE_W120, SOUND_PAN_ATTACKER + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D7828, ANIM_BATTLER_ATTACKER, 3, 24, -24, 0, 1 delay 6 - playsewithpan SE_W120, SOUND_PAN_ATTACKER + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D7828, ANIM_BATTLER_ATTACKER, 3, -16, 16, 0, 1 delay 6 - playsewithpan SE_W120, SOUND_PAN_ATTACKER + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D7828, ANIM_BATTLER_ATTACKER, 3, -24, -12, 0, 1 delay 6 - playsewithpan SE_W120, SOUND_PAN_ATTACKER + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D7828, ANIM_BATTLER_ATTACKER, 3, 16, 16, 0, 1 delay 6 return @@ -1490,12 +1490,12 @@ Move_SLAM: @ 81C9309 loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BATTLER_TARGET setalpha 12, 8 - playsewithpan SE_W004, SOUND_PAN_ATTACKER + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_ATTACKER createsprite gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 20, 3, 0, 4 delay 1 createsprite gBattleAnimSpriteTemplate_83D69DC, ANIM_BATTLER_ATTACKER, 2, 0, 0 delay 3 - playsewithpan SE_W025B, SOUND_PAN_TARGET + playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 1 createsprite gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, -12, 10, 0, 3 createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 5 @@ -1511,10 +1511,10 @@ Move_SLAM: @ 81C9309 Move_VINE_WHIP: @ 81C9391 loadspritegfx ANIM_TAG_WHIP_HIT - playsewithpan SE_W026, SOUND_PAN_ATTACKER + playsewithpan SE_M_JUMP_KICK, SOUND_PAN_ATTACKER createsprite gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 4, 6 delay 6 - playsewithpan SE_W010, SOUND_PAN_TARGET + playsewithpan SE_M_SCRATCH, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D69F4, ANIM_BATTLER_TARGET, 2, 0, 0 delay 6 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 6, 1 @@ -1524,12 +1524,12 @@ Move_DRILL_PECK: @ 81C93C8 loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_WHIRLWIND_LINES createsprite gBattleAnimSpriteTemplate_83D6DE4, ANIM_BATTLER_ATTACKER, 2, 0 - playsewithpan SE_W029, SOUND_PAN_ATTACKER + playsewithpan SE_M_HEADBUTT, SOUND_PAN_ATTACKER waitforvisualfinish delay 2 createsprite gBattleAnimSpriteTemplate_83D6DE4, ANIM_BATTLER_ATTACKER, 2, 1 delay 2 - loopsewithpan SE_W030, SOUND_PAN_TARGET, 4, 8 + loopsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET, 4, 8 createvisualtask sub_80DB0E8, 5 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 4, 0, 18, 1 waitforvisualfinish @@ -1547,28 +1547,28 @@ Move_WATERFALL: @ 81C9421 setalpha 12, 8 createvisualtask AnimTask_ShakeMon, 5, 0, 0, 2, 23, 1 delay 5 - playsewithpan SE_W152, SOUND_PAN_ATTACKER + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D9348, ANIM_BATTLER_ATTACKER, 2, 10, 10, 25, 0 delay 4 - playsewithpan SE_W152, SOUND_PAN_ATTACKER + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D9348, ANIM_BATTLER_ATTACKER, 2, -15, 0, 25, 0 delay 4 - playsewithpan SE_W152, SOUND_PAN_ATTACKER + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D9348, ANIM_BATTLER_ATTACKER, 2, 20, 10, 25, 0 delay 4 - playsewithpan SE_W152, SOUND_PAN_ATTACKER + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D9348, ANIM_BATTLER_ATTACKER, 2, 0, -10, 25, 0 delay 4 - playsewithpan SE_W152, SOUND_PAN_ATTACKER + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D9348, ANIM_BATTLER_ATTACKER, 2, -10, 15, 25, 0 delay 4 - playsewithpan SE_W152, SOUND_PAN_ATTACKER + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D9348, ANIM_BATTLER_ATTACKER, 2, 25, 20, 25, 0 delay 4 - playsewithpan SE_W152, SOUND_PAN_ATTACKER + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D9348, ANIM_BATTLER_ATTACKER, 2, -20, 20, 25, 0 delay 4 - playsewithpan SE_W152, SOUND_PAN_ATTACKER + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D9348, ANIM_BATTLER_ATTACKER, 2, 12, 0, 25, 0 waitforvisualfinish delay 10 @@ -1580,7 +1580,7 @@ Move_WATERFALL: @ 81C9421 blendoff end _81C9502: - playsewithpan SE_W127, SOUND_PAN_TARGET + playsewithpan SE_M_WATERFALL, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon2, 5, 1, 4, 0, 17, 1 createsprite gBattleAnimSpriteTemplate_83DB4D8, ANIM_BATTLER_ATTACKER, 3, 0, 20, 1, 1 createsprite gBattleAnimSpriteTemplate_83D9360, ANIM_BATTLER_ATTACKER, 4, 0, 20 @@ -1635,26 +1635,26 @@ Move_EXPLOSION: @ 81C9675 createvisualtask sub_80E2A38, 10, 1, 3, 16, 0, 32767 end _81C9712: - playsewithpan SE_W153, SOUND_PAN_ATTACKER + playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D7828, ANIM_BATTLER_ATTACKER, 3, 0, 0, 0, 1 delay 6 - playsewithpan SE_W153, SOUND_PAN_ATTACKER + playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D7828, ANIM_BATTLER_ATTACKER, 3, 24, -24, 0, 1 delay 6 - playsewithpan SE_W153, SOUND_PAN_ATTACKER + playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D7828, ANIM_BATTLER_ATTACKER, 3, -16, 16, 0, 1 delay 6 - playsewithpan SE_W153, SOUND_PAN_ATTACKER + playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D7828, ANIM_BATTLER_ATTACKER, 3, -24, -12, 0, 1 delay 6 - playsewithpan SE_W153, SOUND_PAN_ATTACKER + playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D7828, ANIM_BATTLER_ATTACKER, 3, 16, 16, 0, 1 delay 6 return Move_DEFENSE_CURL: @ 81C977C loadspritegfx ANIM_TAG_ECLIPSING_ORB - loopsewithpan SE_W161, SOUND_PAN_ATTACKER, 18, 3 + loopsewithpan SE_M_TRI_ATTACK, SOUND_PAN_ATTACKER, 18, 3 createvisualtask sub_80E0E24, 5, 0, 0 createvisualtask sub_812D350, 5 waitforvisualfinish @@ -1668,7 +1668,7 @@ Move_PROTECT: @ 81C97B5 loadspritegfx ANIM_TAG_PROTECT monbg ANIM_BATTLER_ATK_PARTNER monbgprio_28 0 - waitplaysewithpan SE_W115, SOUND_PAN_ATTACKER, 16 + waitplaysewithpan SE_M_REFLECT, SOUND_PAN_ATTACKER, 16 createsprite gBattleAnimSpriteTemplate_83D6BE8, ANIM_BATTLER_ATTACKER, 2, 24, 0, 90 waitforvisualfinish clearmonbg ANIM_BATTLER_ATK_PARTNER @@ -1680,7 +1680,7 @@ Move_DETECT: @ 81C97D2 waitforvisualfinish createvisualtask sub_80E2A38, 10, 2, 1, 0, 9, 32767 delay 18 - playsewithpan SE_W197, SOUND_PAN_ATTACKER + playsewithpan SE_M_DETECT, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83930F4, ANIM_BATTLER_ATTACKER, 13, 20, -20 waitforvisualfinish delay 10 @@ -1705,15 +1705,15 @@ _81C985F: blendoff end _81C9864: - playsewithpan SE_W082, SOUND_PAN_ATTACKER + playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER createvisualtask AnimTask_ShakeMon2, 5, 0, 1, 0, 15, 1 createvisualtask sub_80E2A38, 10, 2, 3, 0, 9, 31 waitforvisualfinish delay 20 - playsewithpan SE_W207B, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWAGGER2, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D7798, ANIM_BATTLER_ATTACKER, 2, 0, 20, -28 waitforvisualfinish - playsewithpan SE_W207B, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWAGGER2, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D7798, ANIM_BATTLER_ATTACKER, 2, 0, 20, -28 waitforvisualfinish delay 10 @@ -1721,65 +1721,65 @@ _81C9864: delay 5 createvisualtask AnimTask_ShakeMon2, 5, 1, 4, 0, 30, 1 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 0 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET delay 5 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 24, 8, 1, 0 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET delay 5 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, -24, -16, 1, 0 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET delay 5 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 8, 4, 1, 0 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET delay 5 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, -16, 19, 1, 0 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET delay 5 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 18, -18, 1, 0 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET waitforvisualfinish createvisualtask sub_80E2A38, 10, 2, 3, 9, 0, 31 goto _81C985F _81C996A: - playsewithpan SE_W082, SOUND_PAN_ATTACKER + playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER createvisualtask AnimTask_ShakeMon2, 5, 0, 1, 0, 15, 1 createvisualtask sub_80E2A38, 10, 2, 3, 0, 9, 31 waitforvisualfinish delay 20 - playsewithpan SE_W207B, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWAGGER2, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D7798, ANIM_BATTLER_ATTACKER, 2, 0, 20, -28 waitforvisualfinish delay 5 createvisualtask sub_812E498, 5 delay 7 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 0, 8, 1, 1 createvisualtask AnimTask_ShakeMon2, 5, 1, 4, 0, 6, 1 delay 14 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 12, -6, 1, 1 createvisualtask AnimTask_ShakeMon2, 5, 1, 4, 0, 6, 1 delay 14 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, -12, -6, 1, 1 createvisualtask AnimTask_ShakeMon2, 5, 1, 4, 0, 6, 1 waitforvisualfinish createvisualtask sub_80E2A38, 10, 2, 3, 9, 0, 31 goto _81C985F _81C9A37: - playsewithpan SE_W207B, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWAGGER2, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D7798, ANIM_BATTLER_ATTACKER, 2, 0, 20, -28 waitforvisualfinish delay 5 createsprite gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 4, 4 delay 6 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 10, 4, 1, 1 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 3, 0, 6, 1 waitforvisualfinish createsprite gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 4, 4 delay 6 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -10, -4, 1, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 3, 0, 6, 1 goto _81C985F @@ -1789,7 +1789,7 @@ _81C9AB3: delay 10 createsprite gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 10, 2 delay 12 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 1, 0, 6, 1 goto _81C985F @@ -1798,14 +1798,14 @@ Move_SAFEGUARD: @ 81C9AF7 loadspritegfx ANIM_TAG_GUARD_RING monbg ANIM_BATTLER_ATK_PARTNER setalpha 8, 8 - playsewithpan SE_W208, SOUND_PAN_ATTACKER + playsewithpan SE_M_MILK_DRINK, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D7D74, ANIM_BATTLER_ATTACKER, 2 delay 4 createsprite gBattleAnimSpriteTemplate_83D7D74, ANIM_BATTLER_ATTACKER, 2 delay 4 createsprite gBattleAnimSpriteTemplate_83D7D74, ANIM_BATTLER_ATTACKER, 2 waitforvisualfinish - playsewithpan SE_REAPOKE, SOUND_PAN_ATTACKER + playsewithpan SE_SHINY, SOUND_PAN_ATTACKER createvisualtask sub_80E1F8C, 2, 10, 0, 2, 0, 10, 32767 waitforvisualfinish clearmonbg ANIM_BATTLER_ATK_PARTNER @@ -1817,21 +1817,21 @@ Move_PAIN_SPLIT: @ 81C9B39 createsprite gBattleAnimSpriteTemplate_84026F0, ANIM_BATTLER_ATTACKER, 2, -8, -42, 0 createsprite gBattleAnimSpriteTemplate_84026F0, ANIM_BATTLER_TARGET, 2, -8, -42, 1 delay 10 - playsewithpan SE_W207B, 0 + playsewithpan SE_M_SWAGGER2, 0 createvisualtask sub_812EB10, 2, 0, 0 createvisualtask sub_812EB10, 2, 1, 0 waitforvisualfinish createsprite gBattleAnimSpriteTemplate_84026F0, ANIM_BATTLER_ATTACKER, 2, -24, -42, 0 createsprite gBattleAnimSpriteTemplate_84026F0, ANIM_BATTLER_TARGET, 2, -24, -42, 1 delay 10 - playsewithpan SE_W207B, 0 + playsewithpan SE_M_SWAGGER2, 0 createvisualtask sub_812EB10, 2, 0, 1 createvisualtask sub_812EB10, 2, 1, 1 waitforvisualfinish createsprite gBattleAnimSpriteTemplate_84026F0, ANIM_BATTLER_ATTACKER, 2, 8, -42, 0 createsprite gBattleAnimSpriteTemplate_84026F0, ANIM_BATTLER_TARGET, 2, 8, -42, 1 delay 10 - playsewithpan SE_W207B, 0 + playsewithpan SE_M_SWAGGER2, 0 createvisualtask sub_812EB10, 2, 0, 2 createvisualtask sub_812EB10, 2, 1, 2 end @@ -1841,7 +1841,7 @@ Move_VICE_GRIP: @ 81C9BE1 loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BATTLER_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W011, SOUND_PAN_TARGET + playsewithpan SE_M_VICEGRIP, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D769C, ANIM_BATTLER_ATTACKER, 2, 0 createsprite gBattleAnimSpriteTemplate_83D769C, ANIM_BATTLER_ATTACKER, 2, 1 delay 9 @@ -1859,7 +1859,7 @@ Move_GUILLOTINE: @ 81C9C29 setalpha 12, 8 fadetobgfromset BG_GUILLOTINE_OPPONENT, BG_GUILLOTINE_PLAYER, BG_GUILLOTINE_CONTESTS waitbgfadein - playsewithpan SE_W011, SOUND_PAN_TARGET + playsewithpan SE_M_VICEGRIP, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D76DC, ANIM_BATTLER_ATTACKER, 2, 0 createsprite gBattleAnimSpriteTemplate_83D76DC, ANIM_BATTLER_ATTACKER, 2, 1 createvisualtask sub_80E2A38, 10, 4, 2, 0, 16, 0 @@ -1869,7 +1869,7 @@ Move_GUILLOTINE: @ 81C9C29 createvisualtask AnimTask_ShakeMon2, 5, 1, 4, 0, 8, 1 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 0 createsprite gBattleAnimSpriteTemplate_83DB3DC, ANIM_BATTLER_ATTACKER, 2, 31, 3, 1, 0, 8, 0, 0 - playsewithpan SE_W013, SOUND_PAN_TARGET + playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_BATTLER_DEF_PARTNER blendoff @@ -1883,10 +1883,10 @@ Move_PAY_DAY: @ 81C9CB5 monbg ANIM_BATTLER_TARGET monbgprio_28 1 setalpha 12, 8 - playsewithpan SE_W013B, SOUND_PAN_ATTACKER + playsewithpan SE_M_RAZOR_WIND2, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D75E4, ANIM_BATTLER_ATTACKER, 2, 20, 0, 0, 0, 1152 waitforvisualfinish - playsewithpan SE_W006, SOUND_PAN_TARGET + playsewithpan SE_M_PAY_DAY, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 1, 0, 0, 1, 2 createsprite gBattleAnimSpriteTemplate_83D75FC, ANIM_BATTLER_ATTACKER, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 1, 0, 6, 1 @@ -1897,7 +1897,7 @@ Move_PAY_DAY: @ 81C9CB5 Move_OUTRAGE: @ 81C9D08 loadspritegfx ANIM_TAG_SMALL_EMBER - loopsewithpan SE_W082, SOUND_PAN_ATTACKER, 8, 3 + loopsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER, 8, 3 createvisualtask sub_80E1F8C, 2, 7, 2, 5, 3, 8, 430 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_BATTLER_ATTACKER, 12, 6, 5, 4 delay 0 @@ -1945,7 +1945,7 @@ Move_SPARK: @ 81C9EA3 loadspritegfx ANIM_TAG_SPARK_2 delay 0 createvisualtask sub_80E1F8C, 2, 3, -31, 1, 5, 5, 23551 - playsewithpan SE_W085B, SOUND_PAN_ATTACKER + playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D985C, ANIM_BATTLER_ATTACKER, 0, 32, 24, 190, 12, 0, 1, 0 delay 0 createsprite gBattleAnimSpriteTemplate_83D985C, ANIM_BATTLER_ATTACKER, 0, 80, 24, 22, 12, 0, 1, 0 @@ -1954,7 +1954,7 @@ Move_SPARK: @ 81C9EA3 createvisualtask sub_80E1F8C, 2, 3, -31, 1, 0, 0, 23551 delay 10 createvisualtask sub_80E1F8C, 2, 3, -31, 1, 5, 5, 23551 - playsewithpan SE_W085B, SOUND_PAN_ATTACKER + playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D985C, ANIM_BATTLER_ATTACKER, 0, 100, 24, 60, 10, 0, 1, 0 createsprite gBattleAnimSpriteTemplate_83D985C, ANIM_BATTLER_ATTACKER, 0, 170, 24, 42, 11, 0, 1, 1 delay 0 @@ -1963,7 +1963,7 @@ Move_SPARK: @ 81C9EA3 createvisualtask sub_80E1F8C, 2, 3, -31, 1, 0, 0, 23551 delay 20 createvisualtask sub_80E1F8C, 2, 3, -31, 1, 7, 7, 23551 - playsewithpan SE_W085B, SOUND_PAN_ATTACKER + playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D9908, ANIM_BATTLER_ATTACKER, 4, 0, 0, 32, 12, 0, 20, 0, 0 createsprite gBattleAnimSpriteTemplate_83D9908, ANIM_BATTLER_ATTACKER, 4, 0, 0, 32, 12, 64, 20, 1, 0 createsprite gBattleAnimSpriteTemplate_83D9908, ANIM_BATTLER_ATTACKER, 4, 0, 0, 32, 12, 128, 20, 0, 0 @@ -1977,7 +1977,7 @@ Move_SPARK: @ 81C9EA3 createvisualtask sub_80E1F8C, 2, 3, -31, 1, 0, 0, 23551 createsprite gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 4, 4 delay 4 - playsewithpan SE_W063, SOUND_PAN_TARGET + playsewithpan SE_M_HYPER_BEAM, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 2, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 3, 0, 6, 1 waitforvisualfinish @@ -1988,12 +1988,12 @@ Move_SPARK: @ 81C9EA3 Move_ATTRACT: @ 81CA0BA loadspritegfx ANIM_TAG_RED_HEART - loopsewithpan SE_W204, SOUND_PAN_ATTACKER, 12, 3 + loopsewithpan SE_M_CHARM, SOUND_PAN_ATTACKER, 12, 3 createvisualtask AnimTask_SwayMon, 5, 0, 12, 4096, 4, 0 delay 15 createsprite gBattleAnimSpriteTemplate_83D7AB0, ANIM_BATTLER_TARGET, 3, 20, -8 waitforvisualfinish - playsewithpan SE_W213, SOUND_PAN_TARGET + playsewithpan SE_M_ATTRACT, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D7AC8, ANIM_BATTLER_TARGET, 3, 160, -32 createsprite gBattleAnimSpriteTemplate_83D7AC8, ANIM_BATTLER_TARGET, 3, -256, -40 createsprite gBattleAnimSpriteTemplate_83D7AC8, ANIM_BATTLER_TARGET, 3, 128, -16 @@ -2001,7 +2001,7 @@ Move_ATTRACT: @ 81CA0BA createsprite gBattleAnimSpriteTemplate_83D7AC8, ANIM_BATTLER_TARGET, 3, -128, -22 createsprite gBattleAnimSpriteTemplate_83D7AC8, ANIM_BATTLER_TARGET, 3, -384, -31 waitforvisualfinish - waitplaysewithpan SE_W213B, 0, 15 + waitplaysewithpan SE_M_ATTRACT2, 0, 15 createvisualtask sub_80D2100, 5 createsprite gBattleAnimSpriteTemplate_83D7AE0, ANIM_BATTLER_ATTACKER, 40, 16, 256, 0 createsprite gBattleAnimSpriteTemplate_83D7AE0, ANIM_BATTLER_ATTACKER, 40, 224, 240, 15 @@ -2023,7 +2023,7 @@ Move_GROWTH: @ 81CA1B3 end _81CA1C0: createvisualtask sub_80E1F8C, 2, 2, 0, 2, 0, 8, 32767 - playsewithpan SE_W036, SOUND_PAN_ATTACKER + playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER createvisualtask AnimTask_ScaleMonAndRestore, 5, -3, -3, 16, ANIM_BATTLER_ATTACKER, 0 return @@ -2036,12 +2036,12 @@ Move_WHIRLWIND: @ 81CA1E9 createsprite gBattleAnimSpriteTemplate_83DA51C, ANIM_BATTLER_ATTACKER, 2, 0, 24, 1, 60, 4 createsprite gBattleAnimSpriteTemplate_83DA51C, ANIM_BATTLER_ATTACKER, 2, 0, 32, 1, 60, 0 delay 5 - loopsewithpan SE_W104, SOUND_PAN_TARGET, 10, 4 + loopsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_TARGET, 10, 4 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 4, 0, 15, 1 delay 29 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_BATTLER_TARGET, 12, 6, 1, 5 delay 7 - playsewithpan SE_W081, SOUND_PAN_TARGET + playsewithpan SE_M_STRING_SHOT, SOUND_PAN_TARGET createvisualtask sub_80A8A80, 5, 1, 8 waitforvisualfinish end @@ -2056,7 +2056,7 @@ Move_CONFUSE_RAY: @ 81CA291 createsprite gBattleAnimSpriteTemplate_83DAE64, ANIM_BATTLER_TARGET, 2, 28, 0, 288 waitforvisualfinish setalpha 8, 8 - playsewithpan SE_W081B, SOUND_PAN_TARGET + playsewithpan SE_M_STRING_SHOT2, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DAE7C, ANIM_BATTLER_TARGET, 2, 0, -16 waitforvisualfinish delay 0 @@ -2081,10 +2081,10 @@ Move_LOCK_ON: @ 81CA2E4 Move_MEAN_LOOK: @ 81CA31A loadspritegfx ANIM_TAG_EYE monbg ANIM_BATTLER_DEF_PARTNER - playsewithpan SE_W060, SOUND_PAN_ATTACKER + playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 1, 0, 16, rgb(0, 0, 0) - loopsewithpan SE_W109, SOUND_PAN_TARGET, 15, 4 - waitplaysewithpan SE_W043, SOUND_PAN_TARGET, 85 + loopsewithpan SE_M_CONFUSE_RAY, SOUND_PAN_TARGET, 15, 4 + waitplaysewithpan SE_M_LEER, SOUND_PAN_TARGET, 85 createsprite gBattleAnimSpriteTemplate_8402264, ANIM_BATTLER_ATTACKER, 2 delay 120 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 2, 16, 0, rgb(0, 0, 0) @@ -2097,20 +2097,20 @@ Move_ROCK_THROW: @ 81CA35F loadspritegfx ANIM_TAG_ROCKS createsprite gBattleAnimSpriteTemplate_83DB428, ANIM_BATTLER_TARGET, 2, 6, 1, 15, 1 createsprite gBattleAnimSpriteTemplate_83DAC4C, ANIM_BATTLER_TARGET, 2, 0, 1, 0, 0 - playsewithpan SE_W088, SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET delay 6 createsprite gBattleAnimSpriteTemplate_83DAC4C, ANIM_BATTLER_TARGET, 2, 19, 1, 10, 0 - playsewithpan SE_W088, SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET delay 6 createsprite gBattleAnimSpriteTemplate_83DAC4C, ANIM_BATTLER_TARGET, 2, -23, 2, -10, 0 - playsewithpan SE_W088, SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 0, 5, 20, 1 delay 6 createsprite gBattleAnimSpriteTemplate_83DAC4C, ANIM_BATTLER_TARGET, 2, -15, 1, -10, 0 - playsewithpan SE_W088, SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET delay 6 createsprite gBattleAnimSpriteTemplate_83DAC4C, ANIM_BATTLER_TARGET, 2, 23, 2, 10, 0 - playsewithpan SE_W088, SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET waitforvisualfinish end @@ -2119,16 +2119,16 @@ Move_ROCK_SLIDE: @ 81CA3EB monbg ANIM_BATTLER_DEF_PARTNER createsprite gBattleAnimSpriteTemplate_83DB428, ANIM_BATTLER_ATTACKER, 2, 7, 1, 11, 1 createsprite gBattleAnimSpriteTemplate_83DAC4C, ANIM_BATTLER_TARGET, 2, -5, 1, -5, 1 - playsewithpan SE_W088, SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET delay 2 createsprite gBattleAnimSpriteTemplate_83DAC4C, ANIM_BATTLER_TARGET, 2, 5, 0, 6, 1 - playsewithpan SE_W088, SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET delay 2 createsprite gBattleAnimSpriteTemplate_83DAC4C, ANIM_BATTLER_TARGET, 2, 19, 1, 10, 1 - playsewithpan SE_W088, SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET delay 2 createsprite gBattleAnimSpriteTemplate_83DAC4C, ANIM_BATTLER_TARGET, 2, -23, 2, -10, 1 - playsewithpan SE_W088, SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 0, 5, 50, 1 createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_DEF_PARTNER, 0, 5, 50, 1 delay 2 @@ -2139,28 +2139,28 @@ Move_ROCK_SLIDE: @ 81CA3EB end _81CA483: createsprite gBattleAnimSpriteTemplate_83DAC4C, ANIM_BATTLER_TARGET, 2, -20, 0, -10, 1 - playsewithpan SE_W088, SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET delay 2 createsprite gBattleAnimSpriteTemplate_83DAC4C, ANIM_BATTLER_TARGET, 2, 28, 1, 10, 1 - playsewithpan SE_W088, SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET delay 2 createsprite gBattleAnimSpriteTemplate_83DAC4C, ANIM_BATTLER_TARGET, 2, -10, 1, -5, 1 - playsewithpan SE_W088, SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET delay 2 createsprite gBattleAnimSpriteTemplate_83DAC4C, ANIM_BATTLER_TARGET, 2, 10, 0, 6, 1 - playsewithpan SE_W088, SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET delay 2 createsprite gBattleAnimSpriteTemplate_83DAC4C, ANIM_BATTLER_TARGET, 2, 24, 1, 10, 1 - playsewithpan SE_W088, SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET delay 2 createsprite gBattleAnimSpriteTemplate_83DAC4C, ANIM_BATTLER_TARGET, 2, -32, 2, -10, 1 - playsewithpan SE_W088, SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET delay 2 createsprite gBattleAnimSpriteTemplate_83DAC4C, ANIM_BATTLER_TARGET, 2, -20, 0, -10, 1 - playsewithpan SE_W088, SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET delay 2 createsprite gBattleAnimSpriteTemplate_83DAC4C, ANIM_BATTLER_TARGET, 2, 30, 2, 10, 1 - playsewithpan SE_W088, SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET delay 2 return @@ -2173,7 +2173,7 @@ Move_THIEF: @ 81CA52C setalpha 12, 8 createsprite gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 6, 4 delay 6 - playsewithpan SE_W233, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 1, 0, 8, 1 waitforvisualfinish @@ -2203,22 +2203,22 @@ Move_BUBBLE_BEAM: @ 81CA573 end _81CA5AD: createsprite gBattleAnimSpriteTemplate_83D9178, ANIM_BATTLER_ATTACKER, 2, 18, 0, 35, 70, 0, 256, 50 - playsewithpan SE_W145, SOUND_PAN_ATTACKER + playsewithpan SE_M_BUBBLE, SOUND_PAN_ATTACKER delay 3 createsprite gBattleAnimSpriteTemplate_83D9178, ANIM_BATTLER_ATTACKER, 2, 18, 0, 20, 40, -10, 256, 50 - playsewithpan SE_W145, SOUND_PAN_ATTACKER + playsewithpan SE_M_BUBBLE, SOUND_PAN_ATTACKER delay 3 createsprite gBattleAnimSpriteTemplate_83D9178, ANIM_BATTLER_ATTACKER, 2, 18, 0, 10, -60, 0, 256, 50 - playsewithpan SE_W145, SOUND_PAN_ATTACKER + playsewithpan SE_M_BUBBLE, SOUND_PAN_ATTACKER delay 3 createsprite gBattleAnimSpriteTemplate_83D9178, ANIM_BATTLER_ATTACKER, 2, 18, 0, 15, -15, 10, 256, 50 - playsewithpan SE_W145, SOUND_PAN_ATTACKER + playsewithpan SE_M_BUBBLE, SOUND_PAN_ATTACKER delay 3 createsprite gBattleAnimSpriteTemplate_83D9178, ANIM_BATTLER_ATTACKER, 2, 18, 0, 30, 10, -10, 256, 50 - playsewithpan SE_W145, SOUND_PAN_ATTACKER + playsewithpan SE_M_BUBBLE, SOUND_PAN_ATTACKER delay 3 createsprite gBattleAnimSpriteTemplate_83D9178, ANIM_BATTLER_ATTACKER, 2, 18, 0, 25, -30, 10, 256, 50 - playsewithpan SE_W145, SOUND_PAN_ATTACKER + playsewithpan SE_M_BUBBLE, SOUND_PAN_ATTACKER delay 3 return @@ -2229,14 +2229,14 @@ Move_ICY_WIND: @ 81CA650 createvisualtask sub_80E2A38, 10, 11, 4, 0, 4, 0 fadetobg BG_ICE waitbgfadeout - playsewithpan SE_W196, 0 + playsewithpan SE_M_ICY_WIND, 0 waitbgfadein waitforvisualfinish - panse_1B SE_W016, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0 + panse_1B SE_M_GUST, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0 call _81CA6A8 delay 5 call _81CA6A8 - playsewithpan SE_W016B, SOUND_PAN_TARGET + playsewithpan SE_M_GUST2, SOUND_PAN_TARGET delay 55 call Unknown_81D5E0E waitforvisualfinish @@ -2261,12 +2261,12 @@ _81CA6A8: Move_SMOKESCREEN: @ 81CA710 loadspritegfx ANIM_TAG_BLACK_SMOKE loadspritegfx ANIM_TAG_BLACK_BALL - playsewithpan SE_W104, SOUND_PAN_ATTACKER + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_84021B0, ANIM_BATTLER_TARGET, 2, 20, 0, 0, 0, 35, -25 waitforvisualfinish createvisualtask sub_812C1D0, 2 delay 2 - playsewithpan SE_W028, SOUND_PAN_TARGET + playsewithpan SE_M_SAND_ATTACK, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_8402198, ANIM_BATTLER_TARGET, 4, 0, -12, 104, 0, 75 createsprite gBattleAnimSpriteTemplate_8402198, ANIM_BATTLER_TARGET, 4, 0, -12, 72, 1, 75 createsprite gBattleAnimSpriteTemplate_8402198, ANIM_BATTLER_TARGET, 4, 0, -6, 56, 1, 75 @@ -2288,7 +2288,7 @@ Move_CONVERSION: @ 81CA809 monbgprio_28 0 setalpha 16, 0 delay 0 - playsewithpan SE_W129, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWIFT, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D6F80, ANIM_BATTLER_ATTACKER, 2, -24, -24 delay 3 createsprite gBattleAnimSpriteTemplate_83D6F80, ANIM_BATTLER_ATTACKER, 2, -8, -24 @@ -2297,7 +2297,7 @@ Move_CONVERSION: @ 81CA809 delay 3 createsprite gBattleAnimSpriteTemplate_83D6F80, ANIM_BATTLER_ATTACKER, 2, 24, -24 delay 3 - playsewithpan SE_W129, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWIFT, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D6F80, ANIM_BATTLER_ATTACKER, 2, -24, -8 delay 3 createsprite gBattleAnimSpriteTemplate_83D6F80, ANIM_BATTLER_ATTACKER, 2, -8, -8 @@ -2306,7 +2306,7 @@ Move_CONVERSION: @ 81CA809 delay 3 createsprite gBattleAnimSpriteTemplate_83D6F80, ANIM_BATTLER_ATTACKER, 2, 24, -8 delay 3 - playsewithpan SE_W129, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWIFT, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D6F80, ANIM_BATTLER_ATTACKER, 2, -24, 8 delay 3 createsprite gBattleAnimSpriteTemplate_83D6F80, ANIM_BATTLER_ATTACKER, 2, -8, 8 @@ -2315,7 +2315,7 @@ Move_CONVERSION: @ 81CA809 delay 3 createsprite gBattleAnimSpriteTemplate_83D6F80, ANIM_BATTLER_ATTACKER, 2, 24, 8 delay 3 - playsewithpan SE_W129, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWIFT, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D6F80, ANIM_BATTLER_ATTACKER, 2, -24, 24 delay 3 createsprite gBattleAnimSpriteTemplate_83D6F80, ANIM_BATTLER_ATTACKER, 2, -8, 24 @@ -2324,7 +2324,7 @@ Move_CONVERSION: @ 81CA809 delay 3 createsprite gBattleAnimSpriteTemplate_83D6F80, ANIM_BATTLER_ATTACKER, 2, 24, 24 delay 20 - playsewithpan SE_W112, SOUND_PAN_ATTACKER + playsewithpan SE_M_BARRIER, SOUND_PAN_ATTACKER createvisualtask sub_80E21A8, 2, 10018, 1, 1, 14335, 12, 0, 0 delay 6 createvisualtask sub_80CE108, 5 @@ -2340,7 +2340,7 @@ Move_CONVERSION_2: @ 81CA91E monbgprio_2A ANIM_BATTLER_TARGET setalpha 0, 16 delay 0 - playsewithpan SE_W112, SOUND_PAN_TARGET + playsewithpan SE_M_BARRIER, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D6FB0, ANIM_BATTLER_ATTACKER, 2, -24, -24, 60 createsprite gBattleAnimSpriteTemplate_83D6FB0, ANIM_BATTLER_ATTACKER, 2, -8, -24, 65 createsprite gBattleAnimSpriteTemplate_83D6FB0, ANIM_BATTLER_ATTACKER, 2, 8, -24, 70 @@ -2359,21 +2359,21 @@ Move_CONVERSION_2: @ 81CA91E createsprite gBattleAnimSpriteTemplate_83D6FB0, ANIM_BATTLER_ATTACKER, 2, 24, 24, 135 createvisualtask sub_80CE210, 5 delay 60 - playsewithpan SE_W129, SOUND_PAN_TARGET + playsewithpan SE_M_SWIFT, SOUND_PAN_TARGET delay 10 - playsewithpan SE_W129, SOUND_PAN_TARGET + playsewithpan SE_M_SWIFT, SOUND_PAN_TARGET delay 10 - playsewithpan SE_W129, SOUND_PAN_TARGET + playsewithpan SE_M_SWIFT, SOUND_PAN_TARGET delay 10 - playsewithpan SE_W129, SOUND_PAN_TARGET + playsewithpan SE_M_SWIFT, SOUND_PAN_TARGET delay 10 - playsewithpan SE_W129, SOUND_PAN_TARGET + playsewithpan SE_M_SWIFT, SOUND_PAN_TARGET delay 10 - playsewithpan SE_W129, SOUND_PAN_TARGET + playsewithpan SE_M_SWIFT, SOUND_PAN_TARGET delay 10 - playsewithpan SE_W129, SOUND_PAN_TARGET + playsewithpan SE_M_SWIFT, SOUND_PAN_TARGET delay 10 - playsewithpan SE_W129, SOUND_PAN_TARGET + playsewithpan SE_M_SWIFT, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_BATTLER_DEF_PARTNER blendoff @@ -2385,14 +2385,14 @@ Move_ROLLING_KICK: @ 81CAA3A monbg ANIM_BATTLER_TARGET setalpha 12, 8 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_BATTLER_ATTACKER, 18, 6, 1, 4 - playsewithpan SE_W104, SOUND_PAN_ATTACKER + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER delay 6 - playsewithpan SE_W104, SOUND_PAN_ATTACKER + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER waitforvisualfinish createsprite gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 20, 0, 0, 4 createsprite gBattleAnimSpriteTemplate_83D9FF0, ANIM_BATTLER_ATTACKER, 2, -24, 0, 48, 10, 160, 0 delay 5 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -8, 0, 1, 2 createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 5, 0, 6, 1 waitforvisualfinish @@ -2404,7 +2404,7 @@ Move_ROLLING_KICK: @ 81CAA3A Move_HEADBUTT: @ 81CAABD loadspritegfx ANIM_TAG_IMPACT createsprite gBattleAnimSpriteTemplate_83D6DE4, ANIM_BATTLER_ATTACKER, 2, 0 - playsewithpan SE_W029, SOUND_PAN_ATTACKER + playsewithpan SE_M_HEADBUTT, SOUND_PAN_ATTACKER waitforvisualfinish delay 2 createsprite gBattleAnimSpriteTemplate_83D6DE4, ANIM_BATTLER_ATTACKER, 2, 1 @@ -2413,7 +2413,7 @@ Move_HEADBUTT: @ 81CAABD createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 5, 0, 6, 1 createsprite gBattleAnimSpriteTemplate_83D6DE4, ANIM_BATTLER_ATTACKER, 2, 2 createsprite gBattleAnimSpriteTemplate_83DB538, ANIM_BATTLER_TARGET, 3, 0, 0, 1, 1 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET waitforvisualfinish end @@ -2421,7 +2421,7 @@ Move_HORN_ATTACK: @ 81CAB1A loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HORN_HIT createsprite gBattleAnimSpriteTemplate_83D6DE4, ANIM_BATTLER_ATTACKER, 2, 0 - playsewithpan SE_W029, SOUND_PAN_ATTACKER + playsewithpan SE_M_HEADBUTT, SOUND_PAN_ATTACKER waitforvisualfinish delay 2 createsprite gBattleAnimSpriteTemplate_83D6DE4, ANIM_BATTLER_ATTACKER, 2, 1 @@ -2431,7 +2431,7 @@ Move_HORN_ATTACK: @ 81CAB1A createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 5, 0, 6, 1 createsprite gBattleAnimSpriteTemplate_83D6DE4, ANIM_BATTLER_ATTACKER, 2, 2 createsprite gBattleAnimSpriteTemplate_83DB538, ANIM_BATTLER_TARGET, 3, 0, 0, 1, 1 - playsewithpan SE_W030, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET waitforvisualfinish end @@ -2448,13 +2448,13 @@ _81CABB8: createsprite gBattleAnimSpriteTemplate_83D7050, ANIM_BATTLER_TARGET, 4, 8, 8, 10 waitforvisualfinish createsprite gBattleAnimSpriteTemplate_83DB538, ANIM_BATTLER_TARGET, 3, 0, 0, 1, 1 - playsewithpan SE_W030, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET goto _81CABA5 _81CABDE: createsprite gBattleAnimSpriteTemplate_83D7050, ANIM_BATTLER_TARGET, 4, -8, -8, 10 waitforvisualfinish createsprite gBattleAnimSpriteTemplate_83DB538, ANIM_BATTLER_TARGET, 3, 0, 0, 1, 1 - playsewithpan SE_W030, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET goto _81CABA5 Move_HORN_DRILL: @ 81CAC04 @@ -2468,47 +2468,47 @@ _81CAC21: waitbgfadein setalpha 12, 8 createsprite gBattleAnimSpriteTemplate_83D6DE4, ANIM_BATTLER_ATTACKER, 2, 0 - playsewithpan SE_W029, SOUND_PAN_ATTACKER + playsewithpan SE_M_HEADBUTT, SOUND_PAN_ATTACKER waitforvisualfinish delay 2 createsprite gBattleAnimSpriteTemplate_83D6DE4, ANIM_BATTLER_ATTACKER, 2, 1 createsprite gBattleAnimSpriteTemplate_83D7050, ANIM_BATTLER_TARGET, 4, 0, 0, 12 waitforvisualfinish - playse SE_BAN + playse SE_BANG createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BATTLER_ATTACKER, 2, 0, 40, 1 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BATTLER_TARGET, 10, 0, 40, 1 createsprite gBattleAnimSpriteTemplate_83DB538, ANIM_BATTLER_TARGET, 3, 0, 0, 1, 3 - playsewithpan SE_W030, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET delay 4 createsprite gBattleAnimSpriteTemplate_83DB538, ANIM_BATTLER_TARGET, 3, 0, 2, 1, 3 - playsewithpan SE_W030, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET delay 4 createsprite gBattleAnimSpriteTemplate_83DB538, ANIM_BATTLER_TARGET, 3, -4, 3, 1, 3 - playsewithpan SE_W030, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET delay 4 createsprite gBattleAnimSpriteTemplate_83DB538, ANIM_BATTLER_TARGET, 3, -8, -5, 1, 3 - playsewithpan SE_W030, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET delay 4 createsprite gBattleAnimSpriteTemplate_83DB538, ANIM_BATTLER_TARGET, 3, 4, -12, 1, 3 - playsewithpan SE_W030, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET delay 4 createsprite gBattleAnimSpriteTemplate_83DB538, ANIM_BATTLER_TARGET, 3, 16, 0, 1, 3 - playsewithpan SE_W030, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET delay 4 createsprite gBattleAnimSpriteTemplate_83DB538, ANIM_BATTLER_TARGET, 3, 5, 18, 1, 3 - playsewithpan SE_W030, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET delay 4 createsprite gBattleAnimSpriteTemplate_83DB538, ANIM_BATTLER_TARGET, 3, -17, 12, 1, 2 - playsewithpan SE_W030, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET delay 4 createsprite gBattleAnimSpriteTemplate_83DB538, ANIM_BATTLER_TARGET, 3, -21, -15, 1, 2 - playsewithpan SE_W030, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET delay 4 createsprite gBattleAnimSpriteTemplate_83DB538, ANIM_BATTLER_TARGET, 3, 8, -27, 1, 2 - playsewithpan SE_W030, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET delay 4 createsprite gBattleAnimSpriteTemplate_83DB538, ANIM_BATTLER_TARGET, 3, 32, 0, 1, 2 - playsewithpan SE_W030, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET delay 4 createsprite gBattleAnimSpriteTemplate_83D6DE4, ANIM_BATTLER_ATTACKER, 2, 2 waitforvisualfinish @@ -2530,15 +2530,15 @@ Move_THRASH: @ 81CAD81 createvisualtask sub_80D0AB8, 2 createsprite gBattleAnimSpriteTemplate_83D9FC0, ANIM_BATTLER_TARGET, 3, 1, 10, 0 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BATTLER_TARGET, 4, 0, 7, 1 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET delay 28 createsprite gBattleAnimSpriteTemplate_83D9FC0, ANIM_BATTLER_TARGET, 3, 1, 10, 1 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BATTLER_TARGET, 4, 0, 7, 1 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET delay 28 createsprite gBattleAnimSpriteTemplate_83D9FC0, ANIM_BATTLER_TARGET, 3, 1, 10, 3 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BATTLER_TARGET, 8, 0, 16, 1 - playsewithpan SE_W025B, SOUND_PAN_TARGET + playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET end Move_SING: @ 81CAE00 @@ -2546,7 +2546,7 @@ Move_SING: @ 81CAE00 monbg ANIM_BATTLER_DEF_PARTNER createvisualtask sub_80CEA20, 2 waitforvisualfinish - panse_1B SE_W047, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0 + panse_1B SE_M_SING, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0 createsprite gBattleAnimSpriteTemplate_83D7114, ANIM_BATTLER_TARGET, 2, 7, 0, 12 delay 5 createsprite gBattleAnimSpriteTemplate_83D7114, ANIM_BATTLER_TARGET, 2, 6, 1, 12 @@ -2585,7 +2585,7 @@ Move_LOW_KICK: @ 81CAED4 delay 4 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 2, -8, 8, 1, 2 createvisualtask sub_80A8E04, 2, 6, 384, 1, 2 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET waitforvisualfinish createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 1, 4 end @@ -2593,7 +2593,7 @@ Move_LOW_KICK: @ 81CAED4 Move_EARTHQUAKE: @ 81CAF31 createvisualtask sub_80E1864, 5, 5, 10, 50 createvisualtask sub_80E1864, 5, 4, 10, 50 - playsewithpan SE_W089, 0 + playsewithpan SE_M_EARTHQUAKE, 0 delay 10 createsprite gBattleAnimSpriteTemplate_83DB3DC, ANIM_BATTLER_ATTACKER, 2, 1, 3, 1, 0, 14, 32767, 14 delay 16 @@ -2604,7 +2604,7 @@ Move_FISSURE: @ 81CAF7E loadspritegfx ANIM_TAG_MUD_SAND createvisualtask sub_80E1864, 3, 5, 10, 50 createvisualtask sub_80E1864, 3, 1, 10, 50 - playsewithpan SE_W089, SOUND_PAN_TARGET + playsewithpan SE_M_EARTHQUAKE, SOUND_PAN_TARGET delay 8 call _81CAFFF delay 15 @@ -2631,14 +2631,14 @@ _81CAFFF: createsprite gDirtPlumeSpriteTemplate, ANIM_BATTLER_TARGET, 2, 1, 0, 16, -16, -10, 24 createsprite gDirtPlumeSpriteTemplate, ANIM_BATTLER_TARGET, 2, 1, 1, 14, -52, -18, 24 createsprite gDirtPlumeSpriteTemplate, ANIM_BATTLER_TARGET, 2, 1, 1, 12, -32, -16, 24 - playsewithpan SE_W091, SOUND_PAN_TARGET + playsewithpan SE_M_DIG, SOUND_PAN_TARGET return _81CB050: createsprite gDirtPlumeSpriteTemplate, ANIM_BATTLER_TARGET, 2, 1, 0, 12, -24, -16, 24 createsprite gDirtPlumeSpriteTemplate, ANIM_BATTLER_TARGET, 2, 1, 0, 16, -38, -10, 24 createsprite gDirtPlumeSpriteTemplate, ANIM_BATTLER_TARGET, 2, 1, 1, 14, -20, -18, 24 createsprite gDirtPlumeSpriteTemplate, ANIM_BATTLER_TARGET, 2, 1, 1, 12, -36, -16, 24 - playsewithpan SE_W091, SOUND_PAN_TARGET + playsewithpan SE_M_DIG, SOUND_PAN_TARGET return Move_DIG: @ 81CB0A1 @@ -2677,7 +2677,7 @@ _81CB106: delay 16 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -8, 0, 1, 2 createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 5, 0, 6, 1 - playsewithpan SE_W025B, SOUND_PAN_ATTACKER + playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_ATTACKER clearmonbg ANIM_BATTLER_ATTACKER goto _81CB0AA _81CB16A: @@ -2685,16 +2685,16 @@ _81CB16A: createsprite gDirtPlumeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 16, 4, -10, 18 createsprite gDirtPlumeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 1, 14, 4, -18, 18 createsprite gDirtPlumeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 1, 12, 4, -16, 18 - playsewithpan SE_W091, SOUND_PAN_ATTACKER + playsewithpan SE_M_DIG, SOUND_PAN_ATTACKER delay 32 return Move_MEDITATE: @ 81CB1BD call SetPsychicBackground createvisualtask sub_80DBC94, 2 - playsewithpan SE_W029, SOUND_PAN_ATTACKER + playsewithpan SE_M_HEADBUTT, SOUND_PAN_ATTACKER delay 16 - playsewithpan SE_W036, SOUND_PAN_ATTACKER + playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER waitforvisualfinish call BackgroundRestore end @@ -2704,15 +2704,15 @@ Move_AGILITY: @ 81CB1DA setalpha 12, 8 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_BATTLER_ATTACKER, 24, 6, 4, 4 createvisualtask sub_80E2DD8, 2, 0, 4, 7, 10 - playsewithpan SE_W104, SOUND_PAN_ATTACKER + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER delay 12 - playsewithpan SE_W104, SOUND_PAN_ATTACKER + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER delay 12 - playsewithpan SE_W104, SOUND_PAN_ATTACKER + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER delay 12 - playsewithpan SE_W104, SOUND_PAN_ATTACKER + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER delay 12 - playsewithpan SE_W104, SOUND_PAN_ATTACKER + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER delay 12 waitforvisualfinish clearmonbg ANIM_BATTLER_ATK_PARTNER @@ -2726,11 +2726,11 @@ Move_QUICK_ATTACK: @ 81CB224 setalpha 12, 8 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_BATTLER_ATTACKER, 24, 6, 1, 5 createvisualtask sub_80E2DD8, 2, 0, 4, 7, 3 - playsewithpan SE_W026, SOUND_PAN_ATTACKER + playsewithpan SE_M_JUMP_KICK, SOUND_PAN_ATTACKER delay 4 createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 5, 0, 6, 1 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 4, 0, 0, 1, 1 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_BATTLER_ATK_PARTNER blendoff @@ -2744,16 +2744,16 @@ Move_RAGE: @ 81CB27C setalpha 12, 8 createvisualtask AnimTask_BlendMonInAndOut, 3, ANIM_BATTLER_ATTACKER, 31, 10, 0, 2 createsprite gBattleAnimSpriteTemplate_83D7798, ANIM_BATTLER_ATTACKER, 2, 0, -20, -28 - playsewithpan SE_W207B, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWAGGER2, SOUND_PAN_ATTACKER delay 20 createsprite gBattleAnimSpriteTemplate_83D7798, ANIM_BATTLER_ATTACKER, 2, 0, 20, -28 - playsewithpan SE_W207B, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWAGGER2, SOUND_PAN_ATTACKER waitforvisualfinish createsprite gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 4, 6 delay 4 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 2 createvisualtask sub_80A9058, 2, 1, 1, 10, 1, 0 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_BATTLER_TARGET end @@ -2761,7 +2761,7 @@ Move_RAGE: @ 81CB27C Move_TELEPORT: @ 81CB2F2 call SetPsychicBackground createvisualtask sub_80DBCFC, 2 - playsewithpan SE_W100, SOUND_PAN_ATTACKER + playsewithpan SE_M_TELEPORT, SOUND_PAN_ATTACKER delay 15 call BackgroundRestore waitforvisualfinish @@ -2771,23 +2771,23 @@ Move_DOUBLE_TEAM: @ 81CB30B monbg ANIM_BATTLER_ATK_PARTNER setalpha 12, 8 createvisualtask sub_80CE7E0, 2 - playsewithpan SE_W104, SOUND_PAN_ATTACKER + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER delay 32 - playsewithpan SE_W104, SOUND_PAN_ATTACKER + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER delay 24 - playsewithpan SE_W104, SOUND_PAN_ATTACKER + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER delay 16 - playsewithpan SE_W104, SOUND_PAN_ATTACKER + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER delay 8 - playsewithpan SE_W104, SOUND_PAN_ATTACKER + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER delay 8 - playsewithpan SE_W104, SOUND_PAN_ATTACKER + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER delay 8 - playsewithpan SE_W104, SOUND_PAN_ATTACKER + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER delay 8 - playsewithpan SE_W104, SOUND_PAN_ATTACKER + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER delay 8 - playsewithpan SE_W104, SOUND_PAN_ATTACKER + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER waitforvisualfinish clearmonbg ANIM_BATTLER_ATK_PARTNER blendoff @@ -2797,7 +2797,7 @@ Move_DOUBLE_TEAM: @ 81CB30B Move_MINIMIZE: @ 81CB352 setalpha 10, 8 createvisualtask AnimTask_Minimize, 2 - loopsewithpan SE_W107, SOUND_PAN_ATTACKER, 34, 3 + loopsewithpan SE_M_MINIMIZE, SOUND_PAN_ATTACKER, 34, 3 waitforvisualfinish blendoff end @@ -2806,11 +2806,11 @@ Move_METRONOME: @ 81CB365 loadspritegfx ANIM_TAG_FINGER loadspritegfx ANIM_TAG_THOUGHT_BUBBLE createsprite gBattleAnimSpriteTemplate_83D7220, ANIM_BATTLER_ATTACKER, 11, 0, 100 - playsewithpan SE_W118, SOUND_PAN_ATTACKER + playsewithpan SE_M_METRONOME, SOUND_PAN_ATTACKER delay 6 createsprite gBattleAnimSpriteTemplate_83D72C8, ANIM_BATTLER_ATTACKER, 12, 0 delay 24 - loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 22, 3 + loopsewithpan SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER, 22, 3 waitforvisualfinish end @@ -2825,7 +2825,7 @@ _81CB399: goto _81CB398 _81CB3A9: createsprite gBattleAnimSpriteTemplate_83C2010, ANIM_BATTLER_ATTACKER, 2, 0, -24, 0, 0, 10, 0 - playsewithpan SE_W036, SOUND_PAN_ATTACKER + playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER waitforvisualfinish createvisualtask sub_80A8E04, 2, 16, 96, 0, 2 waitforvisualfinish @@ -2835,14 +2835,14 @@ _81CB3A9: _81CB3E6: loadspritegfx ANIM_TAG_IMPACT createvisualtask sub_80CDAC8, 2, 0 - playsewithpan SE_W036, SOUND_PAN_ATTACKER + playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER waitforvisualfinish - playse SE_BAN + playse SE_BANG createsprite gBattleAnimSpriteTemplate_83DB3DC, ANIM_BATTLER_ATTACKER, 2, 1, 3, 1, 0, 14, 32767, 14 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BATTLER_ATTACKER, 2, 0, 40, 1 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BATTLER_TARGET, 10, 0, 40, 1 createsprite gBattleAnimSpriteTemplate_83DB538, ANIM_BATTLER_TARGET, 4, 0, 0, 1, 0 - loopsewithpan SE_W025B, SOUND_PAN_TARGET, 8, 3 + loopsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET, 8, 3 waitforvisualfinish createvisualtask sub_80CDAC8, 2, 1 goto _81CB398 @@ -2852,9 +2852,9 @@ Move_AMNESIA: @ 81CB455 call SetPsychicBackground delay 8 createsprite gBattleAnimSpriteTemplate_83DA88C, ANIM_BATTLER_ATTACKER, 20 - playsewithpan SE_W118, SOUND_PAN_ATTACKER + playsewithpan SE_M_METRONOME, SOUND_PAN_ATTACKER delay 54 - loopsewithpan SE_W118, SOUND_PAN_ATTACKER, 16, 3 + loopsewithpan SE_M_METRONOME, SOUND_PAN_ATTACKER, 16, 3 waitforvisualfinish call BackgroundRestore end @@ -2862,18 +2862,18 @@ Move_AMNESIA: @ 81CB455 Move_KINESIS: @ 81CB479 loadspritegfx ANIM_TAG_ALERT loadspritegfx ANIM_TAG_BENT_SPOON - playsewithpan SE_W060, SOUND_PAN_ATTACKER + playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER call SetPsychicBackground createsprite gBattleAnimSpriteTemplate_83DA824, ANIM_BATTLER_ATTACKER, 20 createsprite gBattleAnimSpriteTemplate_83D7450, ANIM_BATTLER_ATTACKER, 19, 32, -8, 0 createsprite gBattleAnimSpriteTemplate_83D7450, ANIM_BATTLER_ATTACKER, 19, 32, 16, 1 - loopsewithpan SE_W109, SOUND_PAN_ATTACKER, 21, 2 + loopsewithpan SE_M_CONFUSE_RAY, SOUND_PAN_ATTACKER, 21, 2 delay 60 - playsewithpan SE_W146, SOUND_PAN_ATTACKER + playsewithpan SE_M_DIZZY_PUNCH, SOUND_PAN_ATTACKER delay 30 - loopsewithpan SE_W146, SOUND_PAN_ATTACKER, 20, 2 + loopsewithpan SE_M_DIZZY_PUNCH, SOUND_PAN_ATTACKER, 20, 2 delay 70 - playsewithpan SE_W207B, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWAGGER2, SOUND_PAN_ATTACKER waitforvisualfinish call BackgroundRestore end @@ -2882,14 +2882,14 @@ Move_GLARE: @ 81CB4CA loadspritegfx ANIM_TAG_SMALL_RED_EYE loadspritegfx ANIM_TAG_EYE_SPARKLE createvisualtask sub_81301EC, 5, 0 - playsewithpan SE_W060B, SOUND_PAN_ATTACKER + playsewithpan SE_M_PSYBEAM2, SOUND_PAN_ATTACKER waitforvisualfinish createvisualtask sub_80E2A38, 5, 1, 0, 0, 16, 0 waitforvisualfinish createsprite gBattleAnimSpriteTemplate_83D7B94, ANIM_BATTLER_ATTACKER, 0, -16, -8 createsprite gBattleAnimSpriteTemplate_83D7B94, ANIM_BATTLER_ATTACKER, 0, 16, -8 createvisualtask sub_80D23B4, 5 - playsewithpan SE_W043, SOUND_PAN_ATTACKER + playsewithpan SE_M_LEER, SOUND_PAN_ATTACKER delay 2 createvisualtask sub_80D60B4, 3, 20, 1, 0 waitforvisualfinish @@ -2899,12 +2899,12 @@ Move_GLARE: @ 81CB4CA Move_BARRAGE: @ 81CB533 loadspritegfx ANIM_TAG_RED_BALL createvisualtask sub_8130554, 3 - playsewithpan SE_W207, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER delay 24 createsprite gBattleAnimSpriteTemplate_83DB428, ANIM_BATTLER_ATTACKER, 2, 8, 1, 40, 1 createvisualtask AnimTask_ShakeMon, 3, 1, 0, 4, 20, 1 createvisualtask AnimTask_ShakeMon, 3, 3, 0, 4, 20, 1 - loopsewithpan SE_W070, SOUND_PAN_TARGET, 8, 2 + loopsewithpan SE_M_STRENGTH, SOUND_PAN_TARGET, 8, 2 end Move_SKY_ATTACK: @ 81CB57B @@ -2923,7 +2923,7 @@ _81CB5A0: delay 12 createvisualtask sub_80E2A38, 10, 2, 1, 8, 0, 0 createvisualtask sub_80E1864, 5, 0, 2, 16 - loopsewithpan SE_W287, SOUND_PAN_ATTACKER, 4, 8 + loopsewithpan SE_M_STAT_INCREASE, SOUND_PAN_ATTACKER, 4, 8 createvisualtask sub_80E2A38, 10, 2, 1, 0, 15, 32767 delay 20 createvisualtask sub_80E2A38, 10, 2, 1, 15, 0, 32767 @@ -2939,7 +2939,7 @@ _81CB617: delay 12 createvisualtask sub_80E2A38, 10, 2, 1, 8, 0, 0 createvisualtask sub_80E1864, 5, 0, 2, 16 - playsewithpan SE_W287, SOUND_PAN_ATTACKER + playsewithpan SE_M_STAT_INCREASE, SOUND_PAN_ATTACKER delay 8 createvisualtask sub_80E2A38, 10, 2, 1, 0, 15, 32767 delay 20 @@ -2974,7 +2974,7 @@ _81CB68E: goto _81CB584 Move_FLASH: @ 81CB713 - playsewithpan SE_W043, SOUND_PAN_ATTACKER + playsewithpan SE_M_LEER, SOUND_PAN_ATTACKER createvisualtask sub_80E388C, 2 waitforvisualfinish end @@ -2982,7 +2982,7 @@ Move_FLASH: @ 81CB713 Move_SPLASH: @ 81CB720 createvisualtask AnimTask_Splash, 2, 0, 3 delay 8 - loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 38, 3 + loopsewithpan SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER, 38, 3 waitforvisualfinish end @@ -2990,7 +2990,7 @@ Move_ACID_ARMOR: @ 81CB735 monbg ANIM_BATTLER_ATTACKER setalpha 15, 0 createvisualtask sub_812F314, 2, 0 - playsewithpan SE_W151, SOUND_PAN_ATTACKER + playsewithpan SE_M_ACID_ARMOR, SOUND_PAN_ATTACKER waitforvisualfinish blendoff clearmonbg ANIM_BATTLER_ATTACKER @@ -3006,7 +3006,7 @@ Move_SHARPEN: @ 81CB74E Move_SUPER_FANG: @ 81CB75A loadspritegfx ANIM_TAG_FANG_ATTACK createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BATTLER_ATTACKER, 1, 0, 20, 1 - playsewithpan SE_W082, SOUND_PAN_ATTACKER + playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER waitforvisualfinish createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BATTLER_ATTACKER, 3, 0, 48, 1 createvisualtask AnimTask_BlendMonInAndOut, 2, ANIM_BATTLER_ATTACKER, 1247, 12, 4, 1 @@ -3015,7 +3015,7 @@ Move_SUPER_FANG: @ 81CB75A createsprite gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 4, 4 delay 4 createsprite gBattleAnimSpriteTemplate_83D7080, ANIM_BATTLER_TARGET, 2 - playsewithpan SE_W044, SOUND_PAN_TARGET + playsewithpan SE_M_BITE, SOUND_PAN_TARGET delay 8 createsprite gBattleAnimSpriteTemplate_83DB3DC, ANIM_BATTLER_ATTACKER, 2, 1, 3, 1, 2143, 14, 32767, 14 createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 0, 7, 12, 1 @@ -3026,11 +3026,11 @@ Move_SUPER_FANG: @ 81CB75A Move_SLASH: @ 81CB7DB loadspritegfx ANIM_TAG_SLASH createsprite gBattleAnimSpriteTemplate_83D6E38, ANIM_BATTLER_TARGET, 2, 1, -8, 0 - playsewithpan SE_W013, SOUND_PAN_TARGET + playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET delay 4 createsprite gBattleAnimSpriteTemplate_83D6E38, ANIM_BATTLER_TARGET, 2, 1, 8, 0 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 4, 0, 18, 1 - playsewithpan SE_W013, SOUND_PAN_TARGET + playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET waitforvisualfinish end @@ -3042,11 +3042,11 @@ Move_STRUGGLE: @ 81CB815 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BATTLER_ATTACKER, 3, 0, 12, 4 createsprite gBattleAnimSpriteTemplate_83D7C90, ANIM_BATTLER_ATTACKER, 2, 0, 0, 2 createsprite gBattleAnimSpriteTemplate_83D7C90, ANIM_BATTLER_ATTACKER, 2, 0, 1, 2 - loopsewithpan SE_W029, SOUND_PAN_ATTACKER, 12, 4 + loopsewithpan SE_M_HEADBUTT, SOUND_PAN_ATTACKER, 12, 4 waitforvisualfinish createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BATTLER_TARGET, 3, 0, 6, 1 - playsewithpan SE_W025B, SOUND_PAN_TARGET + playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_BATTLER_TARGET blendoff @@ -3060,7 +3060,7 @@ Move_SKETCH: @ 81CB87B waitforvisualfinish clearmonbg ANIM_BATTLER_TARGET createvisualtask AnimTask_Splash, 2, 0, 2 - loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 38, 2 + loopsewithpan SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER, 38, 2 end Move_NIGHTMARE: @ 81CB8A3 @@ -3070,7 +3070,7 @@ Move_NIGHTMARE: @ 81CB8A3 monbg ANIM_BATTLER_DEF_PARTNER createvisualtask sub_80DE1B0, 2 createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 3, 0, 40, 1 - playsewithpan SE_W171, SOUND_PAN_TARGET + playsewithpan SE_M_NIGHTMARE, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_BATTLER_DEF_PARTNER restorebg @@ -3079,7 +3079,7 @@ Move_NIGHTMARE: @ 81CB8A3 _81CB8CF: createvisualtask AnimTask_BlendMonInAndOut, 2, ANIM_BATTLER_ATTACKER, 32767, 10, 2, 1 createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_ATTACKER, 3, 0, 32, 1 - playsewithpan SE_W171, SOUND_PAN_TARGET + playsewithpan SE_M_NIGHTMARE, SOUND_PAN_TARGET waitforvisualfinish restorebg waitbgfadein @@ -3090,11 +3090,11 @@ Move_FLAIL: @ 81CB8F9 monbg ANIM_BATTLER_TARGET setalpha 12, 8 createvisualtask sub_812E860, 2, 0 - loopsewithpan SE_W029, SOUND_PAN_ATTACKER, 8, 2 + loopsewithpan SE_M_HEADBUTT, SOUND_PAN_ATTACKER, 8, 2 waitforvisualfinish createsprite gBattleAnimSpriteTemplate_83DB4F0, ANIM_BATTLER_TARGET, 3, 1, 3 createvisualtask sub_80A9058, 2, 0, 1, 30, 1, 0 - playsewithpan SE_W025B, SOUND_PAN_TARGET + playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_BATTLER_TARGET blendoff @@ -3102,12 +3102,12 @@ Move_FLAIL: @ 81CB8F9 Move_SPITE: @ 81CB936 fadetobg BG_GHOST - playsewithpan SE_W060, SOUND_PAN_ATTACKER + playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER waitbgfadein monbg ANIM_BATTLER_DEF_PARTNER createvisualtask sub_80E1F8C, 2, 2, 2, 6, 0, 8, 32767 createvisualtask sub_80DE3AC, 2 - loopsewithpan SE_W060, SOUND_PAN_TARGET, 20, 3 + loopsewithpan SE_M_PSYBEAM, SOUND_PAN_TARGET, 20, 3 waitforvisualfinish restorebg waitbgfadein @@ -3128,11 +3128,11 @@ _81CB97E: delay 0 setalpha 9, 8 createvisualtask sub_807A69C, 2, 28968, 10 - playsewithpan SE_W026, SOUND_PAN_ATTACKER + playsewithpan SE_M_JUMP_KICK, SOUND_PAN_ATTACKER delay 6 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 3, 0, 0, 1, 1 createsprite gFistFootSpriteTemplate, ANIM_BATTLER_TARGET, 4, 0, 0, 8, 1, 0 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 3, 0, 6, 1 waitforvisualfinish clearmonbg ANIM_BATTLER_ATK_PARTNER @@ -3153,13 +3153,13 @@ Move_FORESIGHT: @ 81CB9ED setalpha 16, 0 createsprite gBattleAnimSpriteTemplate_8402A24, ANIM_BATTLER_TARGET, 2, 1 delay 17 - loopsewithpan SE_W166, SOUND_PAN_TARGET, 16, 4 + loopsewithpan SE_M_SKETCH, SOUND_PAN_TARGET, 16, 4 delay 48 delay 24 - playsewithpan SE_W166, SOUND_PAN_TARGET + playsewithpan SE_M_SKETCH, SOUND_PAN_TARGET delay 10 createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_BATTLER_TARGET, 32767, 12, 2, 1 - playsewithpan SE_W197, SOUND_PAN_TARGET + playsewithpan SE_M_DETECT, SOUND_PAN_TARGET waitforvisualfinish blendoff clearmonbg ANIM_BATTLER_DEF_PARTNER @@ -3168,16 +3168,16 @@ Move_FORESIGHT: @ 81CB9ED Move_DESTINY_BOND: @ 81CBA2C loadspritegfx ANIM_TAG_WHITE_SHADOW fadetobg BG_GHOST - playsewithpan SE_W060, SOUND_PAN_ATTACKER + playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER waitbgfadein createvisualtask sub_80DE918, 5, 0, 48 - playsewithpan SE_W109, SOUND_PAN_ATTACKER + playsewithpan SE_M_CONFUSE_RAY, SOUND_PAN_ATTACKER delay 48 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BATTLER_ATTACKER, 2, 0, 24, 1 createvisualtask sub_80E2A7C, 2, 6, 1, 0, 12, 30653 delay 24 createvisualtask sub_80E2A7C, 2, 6, 1, 12, 0, 30653 - playsewithpan SE_W171, SOUND_PAN_TARGET + playsewithpan SE_M_NIGHTMARE, SOUND_PAN_TARGET waitforvisualfinish restorebg waitbgfadein @@ -3187,7 +3187,7 @@ Move_DESTINY_BOND: @ 81CBA2C Move_ENDURE: @ 81CBA87 loadspritegfx ANIM_TAG_FOCUS_ENERGY - playsewithpan SE_W082, SOUND_PAN_ATTACKER + playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER call EndureFlamesAnim delay 8 createvisualtask sub_80E1F8C, 2, 2, 2, 2, 0, 11, 31 @@ -3214,13 +3214,13 @@ Move_CHARM: @ 81CBB1B loadspritegfx ANIM_TAG_MAGENTA_HEART createvisualtask sub_812E568, 5, 0, 2, 0 createsprite gBattleAnimSpriteTemplate_83D7A80, ANIM_BATTLER_ATTACKER, 3, 0, 20 - playsewithpan SE_W204, SOUND_PAN_ATTACKER + playsewithpan SE_M_CHARM, SOUND_PAN_ATTACKER delay 15 createsprite gBattleAnimSpriteTemplate_83D7A80, ANIM_BATTLER_ATTACKER, 3, -20, 20 - playsewithpan SE_W204, SOUND_PAN_ATTACKER + playsewithpan SE_M_CHARM, SOUND_PAN_ATTACKER delay 15 createsprite gBattleAnimSpriteTemplate_83D7A80, ANIM_BATTLER_ATTACKER, 3, 20, 20 - playsewithpan SE_W204, SOUND_PAN_ATTACKER + playsewithpan SE_M_CHARM, SOUND_PAN_ATTACKER waitforvisualfinish end @@ -3235,7 +3235,7 @@ Move_ROLLOUT: @ 81CBB5E waitforvisualfinish createvisualtask sub_80A9058, 2, 0, 1, 30, 1, 0 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 4, 0, 0, 1, 2 - playsewithpan SE_W025B, SOUND_PAN_TARGET + playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_BATTLER_DEF_PARTNER blendoff @@ -3245,44 +3245,44 @@ Move_FALSE_SWIPE: @ 81CBB9F loadspritegfx ANIM_TAG_SLASH_2 loadspritegfx ANIM_TAG_IMPACT createsprite gBattleAnimSpriteTemplate_83D6E50, ANIM_BATTLER_TARGET, 2 - playsewithpan SE_W233, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW, SOUND_PAN_TARGET delay 16 createsprite gBattleAnimSpriteTemplate_83D6E68, ANIM_BATTLER_TARGET, 2, 0 - playsewithpan SE_W104, SOUND_PAN_TARGET + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_TARGET delay 2 createsprite gBattleAnimSpriteTemplate_83D6E68, ANIM_BATTLER_TARGET, 2, 16 delay 2 createsprite gBattleAnimSpriteTemplate_83D6E68, ANIM_BATTLER_TARGET, 2, 32 - playsewithpan SE_W104, SOUND_PAN_TARGET + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_TARGET delay 2 createsprite gBattleAnimSpriteTemplate_83D6E68, ANIM_BATTLER_TARGET, 2, 48 delay 2 createsprite gBattleAnimSpriteTemplate_83D6E68, ANIM_BATTLER_TARGET, 2, 64 - playsewithpan SE_W104, SOUND_PAN_TARGET + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_TARGET delay 2 createsprite gBattleAnimSpriteTemplate_83D6E68, ANIM_BATTLER_TARGET, 2, 80 delay 2 waitforvisualfinish createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 5, 0, 6, 1 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 4, 0, 0, 1, 3 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET end Move_SWAGGER: @ 81CBC26 loadspritegfx ANIM_TAG_BREATH loadspritegfx ANIM_TAG_ANGER createvisualtask sub_80D08C8, 2 - playsewithpan SE_W207, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER waitforvisualfinish createsprite gBattleAnimSpriteTemplate_83D7764, ANIM_BATTLER_ATTACKER, 2 - loopsewithpan SE_W207, SOUND_PAN_ATTACKER, 4, 2 + loopsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER, 4, 2 waitforvisualfinish delay 24 createsprite gBattleAnimSpriteTemplate_83D7798, ANIM_BATTLER_TARGET, 2, 1, -20, -28 - playsewithpan SE_W207B, SOUND_PAN_TARGET + playsewithpan SE_M_SWAGGER2, SOUND_PAN_TARGET delay 12 createsprite gBattleAnimSpriteTemplate_83D7798, ANIM_BATTLER_TARGET, 2, 1, 20, -28 - playsewithpan SE_W207B, SOUND_PAN_TARGET + playsewithpan SE_M_SWAGGER2, SOUND_PAN_TARGET waitforvisualfinish end @@ -3293,14 +3293,14 @@ Move_MILK_DRINK: @ 81CBC6E monbg ANIM_BATTLER_TARGET createsprite gBattleAnimSpriteTemplate_83D6C48, ANIM_BATTLER_ATTACKER, 2 delay 40 - playsewithpan SE_W152, SOUND_PAN_ATTACKER + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_ATTACKER delay 12 - playsewithpan SE_W152, SOUND_PAN_ATTACKER + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_ATTACKER delay 20 - playsewithpan SE_W152, SOUND_PAN_ATTACKER + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_ATTACKER waitforvisualfinish createsprite gBattleAnimSpriteTemplate_83D7928, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 0 - playsewithpan SE_W208, SOUND_PAN_ATTACKER + playsewithpan SE_M_MILK_DRINK, SOUND_PAN_ATTACKER waitforvisualfinish clearmonbg ANIM_BATTLER_TARGET call Unknown_81D5F3E @@ -3317,12 +3317,12 @@ _81CBCC8: _81CBCC9: createvisualtask sub_80E1864, 5, 5, 0, 50 createvisualtask sub_80E1864, 5, 4, 0, 50 - loopsewithpan SE_W070, SOUND_PAN_TARGET, 8, 10 + loopsewithpan SE_M_STRENGTH, SOUND_PAN_TARGET, 8, 10 goto _81CBCC8 _81CBCEE: createvisualtask sub_80E1864, 5, 5, 0, 50 createvisualtask sub_80E1864, 5, 4, 0, 50 - loopsewithpan SE_W070, SOUND_PAN_TARGET, 8, 10 + loopsewithpan SE_M_STRENGTH, SOUND_PAN_TARGET, 8, 10 delay 10 createsprite gBattleAnimSpriteTemplate_83DB3DC, ANIM_BATTLER_ATTACKER, 2, 1, 3, 1, 0, 14, 32767, 14 delay 16 @@ -3335,15 +3335,15 @@ Move_RAPID_SPIN: @ 81CBD41 monbg ANIM_BATTLER_ATTACKER createsprite gBattleAnimSpriteTemplate_84023E8, ANIM_BATTLER_ATTACKER, 2, 0, 0, 32, -32, 40, -2 createvisualtask sub_812CDC8, 2, 0, 2, 0 - loopsewithpan SE_W013B, SOUND_PAN_ATTACKER, 8, 4 + loopsewithpan SE_M_RAZOR_WIND2, SOUND_PAN_ATTACKER, 8, 4 waitforvisualfinish createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 2, 0, 0, 1, 2 createvisualtask sub_80A9058, 2, 0, 1, 10, 1, 0 - playsewithpan SE_W003, SOUND_PAN_TARGET + playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET waitforvisualfinish delay 8 createvisualtask sub_812CDC8, 2, 0, 2, 1 - loopsewithpan SE_W013B, SOUND_PAN_ATTACKER, 8, 4 + loopsewithpan SE_M_RAZOR_WIND2, SOUND_PAN_ATTACKER, 8, 4 waitforvisualfinish clearmonbg ANIM_BATTLER_ATTACKER end @@ -3357,7 +3357,7 @@ Move_MOONLIGHT: @ 81CBDAE waitforvisualfinish createsprite gBattleAnimSpriteTemplate_83D6FC8, ANIM_BATTLER_ATTACKER, 2, 120, 56 createvisualtask sub_8079670, 3, 0, 16, 16, 0, 1 - playsewithpan SE_W236, 0 + playsewithpan SE_M_MOONLIGHT, 0 delay 30 createsprite gBattleAnimSpriteTemplate_83D6FF8, ANIM_BATTLER_ATTACKER, 40, -12, 0 delay 30 @@ -3386,7 +3386,7 @@ _81CBE55: createvisualtask sub_80E3A58, 5, -2304, 0, 1, -1 waitbgfadein createvisualtask sub_80D15A4, 2 - loopsewithpan SE_W013B, SOUND_PAN_ATTACKER, 8, 3 + loopsewithpan SE_M_RAZOR_WIND2, SOUND_PAN_ATTACKER, 8, 3 waitforvisualfinish delay 1 createvisualtask sub_80E4300, 2 @@ -3395,19 +3395,19 @@ _81CBE55: delay 18 createvisualtask sub_80D1638, 2 delay 2 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DB508, ANIM_BATTLER_TARGET, 2, 1, 0, -12, 3 delay 10 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DB508, ANIM_BATTLER_TARGET, 2, 1, 0, 12, 3 delay 10 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DB508, ANIM_BATTLER_TARGET, 2, 1, 0, 0, 3 waitforvisualfinish createvisualtask sub_80D18D4, 2 delay 10 createvisualtask sub_80D17C4, 2 - loopsewithpan SE_W104, SOUND_PAN_ATTACKER, 8, 4 + loopsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER, 8, 4 waitforvisualfinish restorebg waitbgfadeout @@ -3429,19 +3429,19 @@ Move_UPROAR: @ 81CBEFC monbg ANIM_BATTLER_DEF_PARTNER createvisualtask sub_80D2CF8, 2, 0 createsprite gBattleAnimSpriteTemplate_83D79A4, ANIM_BATTLER_ATTACKER, 3, 0, 0, 0, 0, 31, 8 - playsewithpan SE_W253, SOUND_PAN_ATTACKER + playsewithpan SE_M_UPROAR, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D7CC8, ANIM_BATTLER_ATTACKER, 2, 0, 29, -12, 0 createsprite gBattleAnimSpriteTemplate_83D7CC8, ANIM_BATTLER_ATTACKER, 2, 0, -12, -29, 1 delay 16 createvisualtask sub_80D2CF8, 2, 0 createsprite gBattleAnimSpriteTemplate_83D79A4, ANIM_BATTLER_ATTACKER, 3, 0, 0, 0, 0, 31, 8 - playsewithpan SE_W253, SOUND_PAN_ATTACKER + playsewithpan SE_M_UPROAR, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D7CC8, ANIM_BATTLER_ATTACKER, 2, 0, 12, -29, 1 createsprite gBattleAnimSpriteTemplate_83D7CC8, ANIM_BATTLER_ATTACKER, 2, 0, -29, -12, 0 delay 16 createvisualtask sub_80D2CF8, 2, 0 createsprite gBattleAnimSpriteTemplate_83D79A4, ANIM_BATTLER_ATTACKER, 3, 0, 0, 0, 0, 31, 8 - playsewithpan SE_W253, SOUND_PAN_ATTACKER + playsewithpan SE_M_UPROAR, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D7CC8, ANIM_BATTLER_ATTACKER, 2, 0, 24, -24, 1 createsprite gBattleAnimSpriteTemplate_83D7CC8, ANIM_BATTLER_ATTACKER, 2, 0, -24, -24, 0 waitforvisualfinish @@ -3453,7 +3453,7 @@ Move_HEAT_WAVE: @ 81CBFC6 createvisualtask AnimTask_BlendSpriteColor, 5, 10261, 0, 6, 6, rgb(31, 0, 0) createvisualtask do_boulder_dust, 5, 1 createvisualtask AnimTask_BlendInterfaceColor, 6, 6, 31 - panse_1B SE_W257, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0 + panse_1B SE_M_HEAT_WAVE, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0 delay 4 createvisualtask sub_80D5DDC, 5 delay 12 @@ -3478,7 +3478,7 @@ Move_HAIL: @ 81CC076 createvisualtask sub_80E2A38, 10, 1, 3, 0, 6, 0 waitforvisualfinish createvisualtask AnimTask_Hail1, 5 - loopsewithpan SE_W258, 0, 8, 10 + loopsewithpan SE_M_HAIL, 0, 8, 10 waitforvisualfinish createvisualtask sub_80E2A38, 10, 1, 3, 6, 0, 0 end @@ -3490,10 +3490,10 @@ Move_TORMENT: @ 81CC0AE waitforvisualfinish createvisualtask AnimTask_BlendMonInAndOut, 2, ANIM_BATTLER_TARGET, 31, 10, 1, 1 createsprite gBattleAnimSpriteTemplate_83D7798, ANIM_BATTLER_TARGET, 2, 1, -20, -28 - playsewithpan SE_W207B, SOUND_PAN_TARGET + playsewithpan SE_M_SWAGGER2, SOUND_PAN_TARGET delay 20 createsprite gBattleAnimSpriteTemplate_83D7798, ANIM_BATTLER_TARGET, 2, 1, 20, -28 - playsewithpan SE_W207B, SOUND_PAN_TARGET + playsewithpan SE_M_SWAGGER2, SOUND_PAN_TARGET end Move_MEMENTO: @ 81CC0F2 @@ -3502,9 +3502,9 @@ Move_MEMENTO: @ 81CC0F2 createvisualtask sub_80E0918, 2 delay 1 createvisualtask sub_80E00EC, 5 - playsewithpan SE_W060, SOUND_PAN_ATTACKER + playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER delay 48 - playsewithpan SE_W060B, SOUND_PAN_ATTACKER + playsewithpan SE_M_PSYBEAM2, SOUND_PAN_ATTACKER waitforvisualfinish createvisualtask sub_80E09C4, 2 delay 12 @@ -3512,7 +3512,7 @@ Move_MEMENTO: @ 81CC0F2 delay 1 monbg_22 ANIM_BATTLER_TARGET createvisualtask sub_80E03BC, 5 - playsewithpan SE_W060, SOUND_PAN_TARGET + playsewithpan SE_M_PSYBEAM, SOUND_PAN_TARGET waitforvisualfinish clearmonbg_23 ANIM_BATTLER_TARGET delay 1 @@ -3524,7 +3524,7 @@ Move_FACADE: @ 81CC136 loadspritegfx ANIM_TAG_SWEAT_DROP createvisualtask sub_812FD7C, 2, 0, 3 createvisualtask sub_812FFE4, 2, 0, 72 - loopsewithpan SE_W207, SOUND_PAN_ATTACKER, 24, 3 + loopsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER, 24, 3 end Move_SMELLING_SALT: @ 81CC156 @@ -3534,22 +3534,22 @@ Move_SMELLING_SALT: @ 81CC156 createsprite gBattleAnimSpriteTemplate_84029C4, ANIM_BATTLER_TARGET, 2, 1, 1, 2 delay 32 createvisualtask sub_8130918, 3, 1, 2 - loopsewithpan SE_W003, SOUND_PAN_TARGET, 12, 2 + loopsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET, 12, 2 waitforvisualfinish delay 4 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 6, 2 createsprite gBattleAnimSpriteTemplate_84029F4, ANIM_BATTLER_TARGET, 2, 1, 8, 3 - loopsewithpan SE_W207B, SOUND_PAN_TARGET, 16, 3 + loopsewithpan SE_M_SWAGGER2, SOUND_PAN_TARGET, 16, 3 end Move_FOLLOW_ME: @ 81CC1B1 loadspritegfx ANIM_TAG_FINGER createsprite gBattleAnimSpriteTemplate_83D72E0, ANIM_BATTLER_ATTACKER, 2, 0 - playsewithpan SE_W039, SOUND_PAN_ATTACKER + playsewithpan SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER delay 18 - playsewithpan SE_W213, SOUND_PAN_ATTACKER + playsewithpan SE_M_ATTRACT, SOUND_PAN_ATTACKER delay 71 - loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 22, 3 + loopsewithpan SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER, 22, 3 end Move_CHARGE: @ 81CC1D0 @@ -3561,26 +3561,26 @@ Move_CHARGE: @ 81CC1D0 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 2, 0, 4, rgb(0, 0, 0) waitforvisualfinish createvisualtask sub_80D6B3C, 2, 0, 60, 2, 12 - playsewithpan SE_W268, SOUND_PAN_ATTACKER + playsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER delay 30 - playsewithpan SE_W268, SOUND_PAN_ATTACKER + playsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER delay 30 - playsewithpan SE_W268, SOUND_PAN_ATTACKER + playsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D9A6C, ANIM_BATTLER_ATTACKER, 2, 0 delay 25 - playsewithpan SE_W268, SOUND_PAN_ATTACKER + playsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER delay 20 - playsewithpan SE_W268, SOUND_PAN_ATTACKER + playsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER delay 15 - playsewithpan SE_W268, SOUND_PAN_ATTACKER + playsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER delay 10 delay 6 - loopsewithpan SE_W268, SOUND_PAN_ATTACKER, 6, 5 + loopsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER, 6, 5 waitforvisualfinish createsprite gBattleAnimSpriteTemplate_83D9A9C, ANIM_BATTLER_ATTACKER, 2, 0, 16, 16 delay 2 createsprite gBattleAnimSpriteTemplate_83D9A9C, ANIM_BATTLER_ATTACKER, 2, 0, -16, -16 - playsewithpan SE_W085B, SOUND_PAN_ATTACKER + playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_ATTACKER waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 4, 4, 0, rgb(0, 0, 0) clearmonbg ANIM_BATTLER_ATTACKER @@ -3592,19 +3592,19 @@ Move_TAUNT: @ 81CC26B loadspritegfx ANIM_TAG_THOUGHT_BUBBLE loadspritegfx ANIM_TAG_ANGER createsprite gBattleAnimSpriteTemplate_83D7220, ANIM_BATTLER_ATTACKER, 11, 0, 45 - playsewithpan SE_W118, SOUND_PAN_ATTACKER + playsewithpan SE_M_METRONOME, SOUND_PAN_ATTACKER delay 6 createsprite gBattleAnimSpriteTemplate_83D7358, ANIM_BATTLER_ATTACKER, 12, 0 delay 4 - loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 16, 2 + loopsewithpan SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER, 16, 2 waitforvisualfinish delay 8 createsprite gBattleAnimSpriteTemplate_83D7798, ANIM_BATTLER_TARGET, 2, 1, -20, -28 - playsewithpan SE_W207B, SOUND_PAN_TARGET + playsewithpan SE_M_SWAGGER2, SOUND_PAN_TARGET waitforvisualfinish delay 12 createsprite gBattleAnimSpriteTemplate_83D7798, ANIM_BATTLER_TARGET, 2, 1, 20, -28 - playsewithpan SE_W207B, SOUND_PAN_TARGET + playsewithpan SE_M_SWAGGER2, SOUND_PAN_TARGET end Move_HELPING_HAND: @ 81CC2BF @@ -3613,13 +3613,13 @@ Move_HELPING_HAND: @ 81CC2BF createsprite gBattleAnimSpriteTemplate_8402A0C, ANIM_BATTLER_ATTACKER, 40, 0 createsprite gBattleAnimSpriteTemplate_8402A0C, ANIM_BATTLER_ATTACKER, 40, 1 delay 19 - playsewithpan SE_W227, 0 + playsewithpan SE_M_ENCORE, 0 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_ATK_PARTNER, 2, 0, 5, 1 delay 14 - playsewithpan SE_W227, 0 + playsewithpan SE_M_ENCORE, 0 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_ATK_PARTNER, 2, 0, 5, 1 delay 20 - playsewithpan SE_W227, 0 + playsewithpan SE_M_ENCORE, 0 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_ATK_PARTNER, 3, 0, 10, 1 createvisualtask AnimTask_BlendMonInAndOut, 2, ANIM_BATTLER_ATK_PARTNER, 1023, 12, 1, 1 end @@ -3629,16 +3629,16 @@ Move_ASSIST: @ 81CC332 createsprite gBattleAnimSpriteTemplate_8402964, ANIM_BATTLER_ATTACKER, 50, 112, -16, 140, 128, 36 delay 2 createsprite gBattleAnimSpriteTemplate_8402964, ANIM_BATTLER_ATTACKER, 50, 208, 128, -16, 48, 36 - playsewithpan SE_W010, 0 + playsewithpan SE_M_SCRATCH, 0 delay 2 createsprite gBattleAnimSpriteTemplate_8402964, ANIM_BATTLER_ATTACKER, 50, -16, 112, 256, -16, 36 - playsewithpan SE_W010, 0 + playsewithpan SE_M_SCRATCH, 0 delay 2 createsprite gBattleAnimSpriteTemplate_8402964, ANIM_BATTLER_ATTACKER, 50, 108, 128, 84, -16, 36 - playsewithpan SE_W010, 0 + playsewithpan SE_M_SCRATCH, 0 delay 2 createsprite gBattleAnimSpriteTemplate_8402964, ANIM_BATTLER_ATTACKER, 50, -16, 56, 256, 56, 36 - playsewithpan SE_W010, 0 + playsewithpan SE_M_SCRATCH, 0 end Move_SUPERPOWER: @ 81CC3A3 @@ -3649,7 +3649,7 @@ Move_SUPERPOWER: @ 81CC3A3 monbgprio_28 0 setalpha 12, 8 createsprite gBattleAnimSpriteTemplate_83DA0FC, ANIM_BATTLER_TARGET, 2, 0 - playsewithpan SE_W025, SOUND_PAN_ATTACKER + playsewithpan SE_M_MEGA_KICK, SOUND_PAN_ATTACKER delay 20 createsprite gBattleAnimSpriteTemplate_83DB428, ANIM_BATTLER_ATTACKER, 2, 4, 1, 180, 1 createvisualtask sub_812B340, 5, 234, 0 @@ -3665,10 +3665,10 @@ Move_SUPERPOWER: @ 81CC3A3 createsprite gBattleAnimSpriteTemplate_83DA114, ANIM_BATTLER_ATTACKER, 41, 60, 288, 3, 88 delay 74 createsprite gBattleAnimSpriteTemplate_83DA12C, ANIM_BATTLER_TARGET, 3, 0 - playsewithpan SE_W207, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER delay 16 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 8, 0, 16, 1 - playsewithpan SE_W025B, SOUND_PAN_TARGET + playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_BATTLER_ATK_PARTNER blendoff @@ -3681,10 +3681,10 @@ Move_RECYCLE: @ 81CC45E setalpha 0, 16 delay 1 createsprite gBattleAnimSpriteTemplate_8402B10, ANIM_BATTLER_ATTACKER, 2 - loopsewithpan SE_W036, SOUND_PAN_ATTACKER, 24, 3 + loopsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER, 24, 3 waitforvisualfinish createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_BATTLER_ATTACKER, 32767, 12, 2, 1 - playsewithpan SE_W036, SOUND_PAN_ATTACKER + playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER waitforvisualfinish blendoff clearmonbg ANIM_BATTLER_ATTACKER @@ -3705,20 +3705,20 @@ _81CC4A7: delay 1 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, -18, -18, 1, 1 createsprite gFistFootSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -18, -18, 10, 1, 0 - playsewithpan SE_W233, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW, SOUND_PAN_TARGET delay 20 createsprite gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 3, 8 delay 5 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 18, 18, 1, 1 createsprite gFistFootSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 18, 18, 10, 1, 0 - playsewithpan SE_W233, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW, SOUND_PAN_TARGET delay 20 createvisualtask AnimTask_WindUpLunge, 2, ANIM_BATTLER_ATTACKER, -24, 0, 24, 10, 24, 3 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 2, 0, 6, rgb(0, 0, 0) delay 37 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 1 createsprite gFistFootSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 10, 1, 0 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 2, 6, 0, rgb(0, 0, 0) waitforvisualfinish @@ -3733,26 +3733,26 @@ _81CC576: delay 1 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, -18, -18, 1, 1 createsprite gFistFootSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -18, -18, 10, 1, 0 - playsewithpan SE_W233, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW, SOUND_PAN_TARGET delay 20 createsprite gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 3, 8 delay 5 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 18, 18, 1, 1 createsprite gFistFootSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 18, 18, 10, 1, 0 - playsewithpan SE_W233, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW, SOUND_PAN_TARGET delay 20 createvisualtask AnimTask_WindUpLunge, 2, ANIM_BATTLER_ATTACKER, -24, 0, 24, 10, 24, 3 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 2, 0, 6, rgb(0, 0, 0) delay 37 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 1 createsprite gFistFootSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 10, 1, 0 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET waitforvisualfinish createsprite gBattleAnimSpriteTemplate_83DA0B8, ANIM_BATTLER_ATTACKER, 2, 1, 0, -8, -12 createsprite gBattleAnimSpriteTemplate_83DA0B8, ANIM_BATTLER_ATTACKER, 2, 1, 1, 8, -12 createsprite gBattleAnimSpriteTemplate_83DA0B8, ANIM_BATTLER_ATTACKER, 2, 1, 2, -8, 12 createsprite gBattleAnimSpriteTemplate_83DA0B8, ANIM_BATTLER_ATTACKER, 2, 1, 3, 8, 12 - playsewithpan SE_W280, SOUND_PAN_TARGET + playsewithpan SE_M_BRICK_BREAK, SOUND_PAN_TARGET waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 2, 6, 0, rgb(0, 0, 0) waitforvisualfinish @@ -3762,33 +3762,33 @@ _81CC576: Move_YAWN: @ 81CC697 loadspritegfx ANIM_TAG_PINK_CLOUD createvisualtask sub_812F724, 2, 0 - playsewithpan SE_W281, SOUND_PAN_ATTACKER + playsewithpan SE_M_YAWN, SOUND_PAN_ATTACKER waitforvisualfinish createsprite gBattleAnimSpriteTemplate_84027EC, ANIM_BATTLER_TARGET, 5, 2 - playsewithpan SE_W255, SOUND_PAN_ATTACKER + playsewithpan SE_M_SPIT_UP, SOUND_PAN_ATTACKER delay 4 createsprite gBattleAnimSpriteTemplate_84027EC, ANIM_BATTLER_TARGET, 5, 1 delay 4 createsprite gBattleAnimSpriteTemplate_84027EC, ANIM_BATTLER_TARGET, 5, 0 waitforvisualfinish createvisualtask sub_812F724, 2, 1 - playsewithpan SE_W281, SOUND_PAN_TARGET + playsewithpan SE_M_YAWN, SOUND_PAN_TARGET end Move_ENDEAVOR: @ 81CC6DA loadspritegfx ANIM_TAG_SWEAT_DROP loadspritegfx ANIM_TAG_IMPACT createvisualtask sub_812FD7C, 2, 0, 2 - loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 24, 2 + loopsewithpan SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER, 24, 2 createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_BATTLER_ATTACKER, 703, 12, 1, 2 delay 6 createvisualtask sub_80A9058, 5, 0, 1, 8, 1, 0 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 2, 12, -12, 1, 2 - playsewithpan SE_W003, SOUND_PAN_TARGET + playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET delay 24 createvisualtask sub_80A9058, 5, 0, 1, 8, 1, 0 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 2, -12, 12, 1, 2 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET end Move_ERUPTION: @ 81CC74F @@ -3796,10 +3796,10 @@ Move_ERUPTION: @ 81CC74F createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 31, 2, 0, 4, rgb(31, 0, 0) waitforvisualfinish createvisualtask sub_80D5470, 2 - waitplaysewithpan SE_W153, SOUND_PAN_ATTACKER, 60 + waitplaysewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER, 60 waitforvisualfinish createvisualtask sub_80D5470, 2 - waitplaysewithpan SE_W153, SOUND_PAN_ATTACKER, 60 + waitplaysewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER, 60 waitforvisualfinish delay 30 createsprite gBattleAnimSpriteTemplate_83D96F8, ANIM_BATTLER_ATTACKER, 40, 200, -32, 0, 100, 0 @@ -3811,7 +3811,7 @@ Move_ERUPTION: @ 81CC74F delay 22 createvisualtask sub_80E1864, 5, 5, 8, 60 createvisualtask sub_80E1864, 5, 4, 8, 60 - loopsewithpan SE_W088, SOUND_PAN_TARGET, 16, 12 + loopsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET, 16, 12 delay 80 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 40, 31, 4, 4, 0, rgb(31, 0, 0) end @@ -3821,7 +3821,7 @@ Move_SKILL_SWAP: @ 81CC81C call SetPsychicBackground createvisualtask sub_80DC0B0, 3, 1 createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_BATTLER_TARGET, 32767, 12, 3, 1 - loopsewithpan SE_W179, SOUND_PAN_ATTACKER, 24, 3 + loopsewithpan SE_M_REVERSAL, SOUND_PAN_ATTACKER, 24, 3 delay 16 createvisualtask sub_80DC0B0, 3, 0 createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_BATTLER_ATTACKER, 32767, 12, 3, 1 @@ -3836,12 +3836,12 @@ Move_IMPRISON: @ 81CC867 monbg ANIM_BATTLER_DEF_PARTNER createvisualtask sub_80DBE00, 5 delay 8 - loopsewithpan SE_W030, SOUND_PAN_ATTACKER, 8, 5 + loopsewithpan SE_M_HORN_ATTACK, SOUND_PAN_ATTACKER, 8, 5 waitforvisualfinish delay 4 createsprite gBattleAnimSpriteTemplate_83DA8F4, ANIM_BATTLER_ATTACKER, 5, 0, 40 createvisualtask sub_80E1864, 5, 4, 1, 10 - playsewithpan SE_W063, SOUND_PAN_ATTACKER + playsewithpan SE_M_HYPER_BEAM, SOUND_PAN_ATTACKER clearmonbg ANIM_BATTLER_DEF_PARTNER call BackgroundRestore end @@ -3851,13 +3851,13 @@ Move_GRUDGE: @ 81CC8AA monbg ANIM_BATTLER_ATTACKER monbgprio_29 fadetobg BG_GHOST - playsewithpan SE_W060, SOUND_PAN_ATTACKER + playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER waitbgfadein createvisualtask sub_80DF1A4, 3 - loopsewithpan SE_W052, SOUND_PAN_ATTACKER, 16, 4 + loopsewithpan SE_M_EMBER, SOUND_PAN_ATTACKER, 16, 4 delay 10 delay 80 - playsewithpan SE_W171, SOUND_PAN_TARGET + playsewithpan SE_M_NIGHTMARE, SOUND_PAN_TARGET waitforvisualfinish restorebg waitbgfadein @@ -3871,7 +3871,7 @@ Move_CAMOUFLAGE: @ 81CC8D2 createvisualtask sub_80E2B74, 5, 2, 3, 0, 14 delay 16 createvisualtask sub_80DFC24, 2, 4 - playsewithpan SE_W185, SOUND_PAN_ATTACKER + playsewithpan SE_M_FAINT_ATTACK, SOUND_PAN_ATTACKER waitforvisualfinish delay 8 createvisualtask sub_80E2B74, 5, 2, 0, 0, 0 @@ -3890,7 +3890,7 @@ Move_TAIL_GLOW: @ 81CC918 waitforvisualfinish createsprite gBattleAnimSpriteTemplate_83DAC10, ANIM_BATTLER_ATTACKER, 66, 0 delay 18 - loopsewithpan SE_W234, SOUND_PAN_ATTACKER, 16, 6 + loopsewithpan SE_M_MORNING_SUN, SOUND_PAN_ATTACKER, 16, 6 waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 4, 4, 0, rgb(0, 0, 0) clearmonbg ANIM_BATTLER_ATTACKER @@ -3907,7 +3907,7 @@ Move_LUSTER_PURGE: @ 81CC95B waitbgfadein monbg ANIM_BATTLER_ATTACKER setalpha 12, 8 - playsewithpan SE_W076, SOUND_PAN_ATTACKER + playsewithpan SE_M_SOLAR_BEAM, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83DA9E0, ANIM_BATTLER_ATTACKER, 41, 0, 0, 0, 0 delay 20 createvisualtask sub_80E2A7C, 5, 5, 2, 0, 16, -1 @@ -3945,14 +3945,14 @@ Move_MIST_BALL: @ 81CCA72 loadspritegfx ANIM_TAG_SMALL_BUBBLES loadspritegfx ANIM_TAG_WHITE_FEATHER delay 0 - playsewithpan SE_W081, SOUND_PAN_ATTACKER + playsewithpan SE_M_STRING_SHOT, SOUND_PAN_ATTACKER createsprite gMistBallSpriteTemplate, ANIM_BATTLER_TARGET, 0, 0, 0, 0, 0, 30, 0 waitforvisualfinish - playsewithpan SE_W028, SOUND_PAN_TARGET + playsewithpan SE_M_SAND_ATTACK, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 5, 0, 10, 0 createsprite gBattleAnimSpriteTemplate_83DB3DC, ANIM_BATTLER_ATTACKER, 0, 1, 1, 1, 32279, 16, 32767, 16 delay 0 - playsewithpan SE_W114, 0 + playsewithpan SE_M_HAZE, 0 createvisualtask AnimTask_LoadMistTiles, 5 createvisualtask sub_80E2A38, 10, 4, 3, 0, 16, 32767 delay 8 @@ -3965,7 +3965,7 @@ Move_FEATHER_DANCE: @ 81CCB01 loadspritegfx ANIM_TAG_WHITE_FEATHER monbg ANIM_BATTLER_DEF_PARTNER monbgprio_29 - playsewithpan SE_W080, SOUND_PAN_TARGET + playsewithpan SE_M_PETAL_DANCE, SOUND_PAN_TARGET delay 0 createsprite gBattleAnimSpriteTemplate_83DA498, ANIM_BATTLER_TARGET, 0, 0, -16, 64, 2, 104, 11304, 32, 1 delay 6 @@ -3988,19 +3988,19 @@ Move_TEETER_DANCE: @ 81CCBD1 loadspritegfx ANIM_TAG_DUCK createvisualtask AnimTask_TeeterDanceMovement, 5 createsprite gBattleAnimSpriteTemplate_83D715C, ANIM_BATTLER_ATTACKER, 2, 0, 16, -2 - playsewithpan SE_W298, SOUND_PAN_ATTACKER + playsewithpan SE_M_TEETER_DANCE, SOUND_PAN_ATTACKER delay 24 createsprite gBattleAnimSpriteTemplate_83D715C, ANIM_BATTLER_ATTACKER, 2, 0, 0, -2 - playsewithpan SE_W298, SOUND_PAN_ATTACKER + playsewithpan SE_M_TEETER_DANCE, SOUND_PAN_ATTACKER delay 24 createsprite gBattleAnimSpriteTemplate_83D715C, ANIM_BATTLER_ATTACKER, 2, 0, -16, -2 - playsewithpan SE_W298, SOUND_PAN_ATTACKER + playsewithpan SE_M_TEETER_DANCE, SOUND_PAN_ATTACKER delay 24 createsprite gBattleAnimSpriteTemplate_83D715C, ANIM_BATTLER_ATTACKER, 2, 1, -8, -2 - playsewithpan SE_W298, SOUND_PAN_ATTACKER + playsewithpan SE_M_TEETER_DANCE, SOUND_PAN_ATTACKER delay 24 createsprite gBattleAnimSpriteTemplate_83D715C, ANIM_BATTLER_ATTACKER, 2, 2, 8, -2 - playsewithpan SE_W298, SOUND_PAN_ATTACKER + playsewithpan SE_M_TEETER_DANCE, SOUND_PAN_ATTACKER end Move_MUD_SPORT: @ 81CCC3C @@ -4009,52 +4009,52 @@ Move_MUD_SPORT: @ 81CCC3C delay 24 createsprite gMudSportDirtSpriteTemplate, ANIM_BATTLER_TARGET, 2, 0, -4, -16 createsprite gMudSportDirtSpriteTemplate, ANIM_BATTLER_TARGET, 2, 0, 4, -12 - playsewithpan SE_W091, SOUND_PAN_ATTACKER + playsewithpan SE_M_DIG, SOUND_PAN_ATTACKER delay 32 createsprite gMudSportDirtSpriteTemplate, ANIM_BATTLER_TARGET, 2, 0, -3, -12 createsprite gMudSportDirtSpriteTemplate, ANIM_BATTLER_TARGET, 2, 0, 5, -14 - playsewithpan SE_W091, SOUND_PAN_ATTACKER + playsewithpan SE_M_DIG, SOUND_PAN_ATTACKER delay 32 createsprite gMudSportDirtSpriteTemplate, ANIM_BATTLER_TARGET, 2, 0, -5, -18 createsprite gMudSportDirtSpriteTemplate, ANIM_BATTLER_TARGET, 2, 0, 3, -14 - playsewithpan SE_W091, SOUND_PAN_ATTACKER + playsewithpan SE_M_DIG, SOUND_PAN_ATTACKER delay 16 createsprite gMudSportDirtSpriteTemplate, ANIM_BATTLER_TARGET, 2, 1, 220, 60 - waitplaysewithpan SE_W145B, 0, 15 + waitplaysewithpan SE_M_BUBBLE2, 0, 15 delay 2 createsprite gMudSportDirtSpriteTemplate, ANIM_BATTLER_TARGET, 2, 1, 60, 100 - waitplaysewithpan SE_W145B, 0, 25 + waitplaysewithpan SE_M_BUBBLE2, 0, 25 delay 2 createsprite gMudSportDirtSpriteTemplate, ANIM_BATTLER_TARGET, 2, 1, 140, 55 - waitplaysewithpan SE_W145B, 0, 14 + waitplaysewithpan SE_M_BUBBLE2, 0, 14 delay 2 createsprite gMudSportDirtSpriteTemplate, ANIM_BATTLER_TARGET, 2, 1, 180, 50 - waitplaysewithpan SE_W145B, 0, 10 + waitplaysewithpan SE_M_BUBBLE2, 0, 10 delay 2 createsprite gMudSportDirtSpriteTemplate, ANIM_BATTLER_TARGET, 2, 1, 20, 90 - waitplaysewithpan SE_W145B, 0, 22 + waitplaysewithpan SE_M_BUBBLE2, 0, 22 delay 2 createsprite gMudSportDirtSpriteTemplate, ANIM_BATTLER_TARGET, 2, 1, 90, 90 - waitplaysewithpan SE_W145B, 0, 22 + waitplaysewithpan SE_M_BUBBLE2, 0, 22 delay 2 createsprite gMudSportDirtSpriteTemplate, ANIM_BATTLER_TARGET, 2, 1, 160, 60 - waitplaysewithpan SE_W145B, 0, 15 + waitplaysewithpan SE_M_BUBBLE2, 0, 15 delay 2 createsprite gMudSportDirtSpriteTemplate, ANIM_BATTLER_TARGET, 2, 1, 30, 90 - waitplaysewithpan SE_W145B, 0, 22 + waitplaysewithpan SE_M_BUBBLE2, 0, 22 delay 2 createsprite gMudSportDirtSpriteTemplate, ANIM_BATTLER_TARGET, 2, 1, 120, 60 - waitplaysewithpan SE_W145B, 0, 15 + waitplaysewithpan SE_M_BUBBLE2, 0, 15 delay 2 createsprite gMudSportDirtSpriteTemplate, ANIM_BATTLER_TARGET, 2, 1, 200, 40 - waitplaysewithpan SE_W145B, 0, 10 + waitplaysewithpan SE_M_BUBBLE2, 0, 10 end Move_NEEDLE_ARM: @ 81CCD73 loadspritegfx ANIM_TAG_GREEN_SPIKE loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HANDS_AND_FEET - loopsewithpan SE_W030, SOUND_PAN_TARGET, 2, 16 + loopsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET, 2, 16 createsprite gBattleAnimSpriteTemplate_83D6994, ANIM_BATTLER_TARGET, 2, 1, 0, 0, -32, 16 delay 2 createsprite gBattleAnimSpriteTemplate_83D6994, ANIM_BATTLER_TARGET, 2, 1, 0, 22, -22, 16 @@ -4082,7 +4082,7 @@ Move_NEEDLE_ARM: @ 81CCD73 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 4, 0, 18, 1 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 3, 0, 0, 1, 1 createsprite gFistFootSpriteTemplate, ANIM_BATTLER_TARGET, 4, 0, 0, 8, 1, 0 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D6994, ANIM_BATTLER_TARGET, 2, 1, 1, 0, -24, 10 createsprite gBattleAnimSpriteTemplate_83D6994, ANIM_BATTLER_TARGET, 2, 1, 1, 17, -17, 10 createsprite gBattleAnimSpriteTemplate_83D6994, ANIM_BATTLER_TARGET, 2, 1, 1, 24, 0, 10 @@ -4096,7 +4096,7 @@ Move_NEEDLE_ARM: @ 81CCD73 Move_SLACK_OFF: @ 81CCF23 loadspritegfx ANIM_TAG_BLUE_STAR createvisualtask AnimTask_SlackOffSquish, 2, 0 - playsewithpan SE_W281, SOUND_PAN_ATTACKER + playsewithpan SE_M_YAWN, SOUND_PAN_ATTACKER waitforvisualfinish call Unknown_81D5EF5 waitforvisualfinish @@ -4113,11 +4113,11 @@ Move_CRUSH_CLAW: @ 81CCF3B createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 18, 1 createsprite gBattleAnimSpriteTemplate_83DB288, ANIM_BATTLER_TARGET, 2, -10, -10, 0 createsprite gBattleAnimSpriteTemplate_83DB288, ANIM_BATTLER_TARGET, 2, -10, 10, 0 - playsewithpan SE_W013, SOUND_PAN_TARGET + playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET delay 12 createsprite gBattleAnimSpriteTemplate_83DB288, ANIM_BATTLER_TARGET, 2, 10, -10, 1 createsprite gBattleAnimSpriteTemplate_83DB288, ANIM_BATTLER_TARGET, 2, 10, 10, 1 - playsewithpan SE_W013, SOUND_PAN_TARGET + playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET waitforvisualfinish waitforvisualfinish blendoff @@ -4125,7 +4125,7 @@ Move_CRUSH_CLAW: @ 81CCF3B end Move_AROMATHERAPY: @ 81CCFAB - playsewithpan SE_W080, 0 + playsewithpan SE_M_PETAL_DANCE, 0 loadspritegfx ANIM_TAG_FLOWER loadspritegfx ANIM_TAG_THIN_RING loadspritegfx ANIM_TAG_SPARKLE_2 @@ -4149,15 +4149,15 @@ Move_AROMATHERAPY: @ 81CCFAB delay 1 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 0, 1, 0, 7, 0, rgb(13, 31, 12) delay 1 - playsewithpan SE_W287, SOUND_PAN_ATTACKER + playsewithpan SE_M_STAT_INCREASE, SOUND_PAN_ATTACKER createvisualtask sub_81300A4, 2, 1 waitforvisualfinish - playsewithpan SE_W234, SOUND_PAN_ATTACKER + playsewithpan SE_M_MORNING_SUN, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D6CA0, ANIM_BATTLER_ATTACKER, 16, -15, 0, 0, 0, 32, 60, 1 delay 8 createsprite gBattleAnimSpriteTemplate_83D6CA0, ANIM_BATTLER_ATTACKER, 16, 12, -5, 0, 0, 32, 60, 1 waitforvisualfinish - playsewithpan SE_REAPOKE, SOUND_PAN_ATTACKER + playsewithpan SE_SHINY, SOUND_PAN_ATTACKER createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 0, 43, 3, 10, 0, rgb(13, 31, 12) createsprite gBattleAnimSpriteTemplate_83D7974, ANIM_BATTLER_ATTACKER, 16, 0, 0, 0, 1 waitforvisualfinish @@ -4170,7 +4170,7 @@ Move_FAKE_TEARS: @ 81CD10D createvisualtask AnimTask_BlendSpriteColor, 5, 10155, 0, 4, 4, rgb(12, 11, 31) waitforvisualfinish createvisualtask sub_812E568, 5, 0, 2, 1 - loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 12, 4 + loopsewithpan SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER, 12, 4 delay 8 createsprite gBattleAnimSpriteTemplate_83DB238, ANIM_BATTLER_ATTACKER, 2, 0, 0 createsprite gBattleAnimSpriteTemplate_83DB238, ANIM_BATTLER_ATTACKER, 2, 0, 1 @@ -4196,7 +4196,7 @@ Move_AIR_CUTTER: @ 81CD19D delay 0 createvisualtask sub_80CFB04, 2, 32, -24, 1536, 2, 128 waitforvisualfinish - playsewithpan SE_W015, SOUND_PAN_TARGET + playsewithpan SE_M_CUT, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D6B40, ANIM_BATTLER_ATTACKER, 2, 40, -32, 0, 2 delay 5 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 8, 1 @@ -4212,15 +4212,15 @@ Move_ODOR_SLEUTH: @ 81CD1FF createvisualtask sub_81316F8, 5 delay 24 createsprite gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 3, 4 - playsewithpan SE_W207, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER delay 6 createsprite gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 3, 4 - playsewithpan SE_W207, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER waitforvisualfinish clearmonbg ANIM_BATTLER_TARGET delay 1 createsprite gBattleAnimSpriteTemplate_83DB3DC, ANIM_BATTLER_ATTACKER, 2, 1, 3, 1, -1, 16, -1, 0 - playsewithpan SE_W043, SOUND_PAN_ATTACKER + playsewithpan SE_M_LEER, SOUND_PAN_ATTACKER end Move_GRASS_WHISTLE: @ 81CD249 @@ -4229,7 +4229,7 @@ Move_GRASS_WHISTLE: @ 81CD249 waitforvisualfinish createvisualtask sub_80CEA20, 2 waitforvisualfinish - panse_1B SE_W320, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0 + panse_1B SE_M_GRASSWHISTLE, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0 createsprite gBattleAnimSpriteTemplate_83D7114, ANIM_BATTLER_TARGET, 2, 7, 1, 0 delay 5 createsprite gBattleAnimSpriteTemplate_83D7114, ANIM_BATTLER_TARGET, 2, 6, 1, 0 @@ -4266,7 +4266,7 @@ Move_TICKLE: @ 81CD33C waitforvisualfinish createsprite gBattleAnimSpriteTemplate_83D7B94, ANIM_BATTLER_ATTACKER, 0, -16, -8 createsprite gBattleAnimSpriteTemplate_83D7B94, ANIM_BATTLER_ATTACKER, 0, 16, -8 - playsewithpan SE_W197, SOUND_PAN_ATTACKER + playsewithpan SE_M_DETECT, SOUND_PAN_ATTACKER waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 2, 0, 16, 0, rgb(0, 0, 0) waitforvisualfinish @@ -4274,7 +4274,7 @@ Move_TICKLE: @ 81CD33C createvisualtask AnimTask_SwayMon, 3, 0, 6, 1280, 3, 0 delay 12 createvisualtask sub_812E568, 3, 1, 6, 2 - loopsewithpan SE_W039, SOUND_PAN_TARGET, 8, 8 + loopsewithpan SE_M_TAIL_WHIP, SOUND_PAN_TARGET, 8, 8 waitforvisualfinish end @@ -4284,13 +4284,13 @@ Move_WATER_SPOUT: @ 81CD3A8 monbg ANIM_BATTLER_DEF_PARTNER setalpha 12, 8 createvisualtask sub_80D40F4, 5 - playsewithpan SE_W029, SOUND_PAN_ATTACKER + playsewithpan SE_M_HEADBUTT, SOUND_PAN_ATTACKER delay 44 - playsewithpan SE_W291, SOUND_PAN_ATTACKER + playsewithpan SE_M_DIVE, SOUND_PAN_ATTACKER waitforvisualfinish delay 16 createvisualtask sub_80D45D8, 5 - playsewithpan SE_W057, SOUND_PAN_TARGET + playsewithpan SE_M_SURF, SOUND_PAN_TARGET clearmonbg ANIM_BATTLER_DEF_PARTNER blendoff end @@ -4303,11 +4303,11 @@ Move_SHADOW_PUNCH: @ 81CD3D6 monbg ANIM_BATTLER_ATK_PARTNER setalpha 9, 8 createvisualtask sub_807A69C, 2, 0, 13 - playsewithpan SE_W026, SOUND_PAN_ATTACKER + playsewithpan SE_M_JUMP_KICK, SOUND_PAN_ATTACKER delay 6 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 3, 0, 0, 1, 1 createsprite gFistFootSpriteTemplate, ANIM_BATTLER_TARGET, 4, 0, 0, 8, 1, 0 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 3, 0, 6, 1 waitforvisualfinish clearmonbg ANIM_BATTLER_ATK_PARTNER @@ -4322,15 +4322,15 @@ Move_EXTRASENSORY: @ 81CD431 setalpha 12, 8 createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_BATTLER_ATTACKER, 891, 12, 1, 1 createvisualtask sub_80DC2D4, 5, 0 - playsewithpan SE_W020, SOUND_PAN_TARGET + playsewithpan SE_M_BIND, SOUND_PAN_TARGET waitforvisualfinish createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_BATTLER_ATTACKER, 891, 12, 1, 1 createvisualtask sub_80DC2D4, 5, 1 - playsewithpan SE_W020, SOUND_PAN_TARGET + playsewithpan SE_M_BIND, SOUND_PAN_TARGET waitforvisualfinish createvisualtask sub_80DC4F4, 5, 0 createvisualtask sub_80DC2D4, 5, 2 - playsewithpan SE_W043, SOUND_PAN_ATTACKER + playsewithpan SE_M_LEER, SOUND_PAN_ATTACKER waitforvisualfinish blendoff clearmonbg ANIM_BATTLER_DEF_PARTNER @@ -4344,18 +4344,18 @@ Move_AERIAL_ACE: @ 81CD499 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_BATTLER_ATTACKER, 24, 6, 1, 5 createvisualtask sub_80E2DD8, 2, 0, 4, 7, 3 createsprite gCuttingSliceSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 40, -32, 0 - playsewithpan SE_W013B, SOUND_PAN_ATTACKER + playsewithpan SE_M_RAZOR_WIND2, SOUND_PAN_ATTACKER delay 5 createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 0, 3, 10, 1 createsprite gBattleAnimSpriteTemplate_83DB3DC, ANIM_BATTLER_ATTACKER, 2, 31, 3, 1, 0, 10, 0, 0 - playsewithpan SE_W013, SOUND_PAN_TARGET + playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_BATTLER_TARGET blendoff end Move_IRON_DEFENSE: @ 81CD503 - loopsewithpan SE_REAPOKE, SOUND_PAN_ATTACKER, 28, 2 + loopsewithpan SE_SHINY, SOUND_PAN_ATTACKER, 28, 2 createvisualtask sub_80E0A4C, 5, 0, 0, 0 createsprite gBattleAnimSpriteTemplate_83DB3DC, ANIM_BATTLER_ATTACKER, 2, 1, 8, 2, -1, 14, -1, 0 waitforvisualfinish @@ -4364,7 +4364,7 @@ Move_IRON_DEFENSE: @ 81CD503 Move_BLOCK: @ 81CD52D loadspritegfx ANIM_TAG_X_SIGN createsprite gBattleAnimSpriteTemplate_8402A6C, ANIM_BATTLER_TARGET, 66 - playsewithpan SE_W207, SOUND_PAN_TARGET + playsewithpan SE_M_SWAGGER, SOUND_PAN_TARGET end Move_HOWL: @ 81CD53C @@ -4380,10 +4380,10 @@ Move_HOWL: @ 81CD53C Move_BULK_UP: @ 81CD55E loadspritegfx ANIM_TAG_BREATH createvisualtask sub_80D08C8, 2 - playsewithpan SE_W207, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER waitforvisualfinish createsprite gBattleAnimSpriteTemplate_83D7764, ANIM_BATTLER_ATTACKER, 2 - loopsewithpan SE_W207, SOUND_PAN_ATTACKER, 4, 2 + loopsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER, 4, 2 waitforvisualfinish end @@ -4392,16 +4392,16 @@ Move_COVET: @ 81CD57C loadspritegfx ANIM_TAG_ITEM_BAG createvisualtask sub_812E568, 5, 0, 2, 0 createsprite gBattleAnimSpriteTemplate_83D7A80, ANIM_BATTLER_ATTACKER, 3, 0, 20 - playsewithpan SE_W204, SOUND_PAN_ATTACKER + playsewithpan SE_M_CHARM, SOUND_PAN_ATTACKER delay 15 createsprite gBattleAnimSpriteTemplate_83D7A80, ANIM_BATTLER_ATTACKER, 3, -20, 20 - playsewithpan SE_W204, SOUND_PAN_ATTACKER + playsewithpan SE_M_CHARM, SOUND_PAN_ATTACKER delay 15 createsprite gBattleAnimSpriteTemplate_83D7A80, ANIM_BATTLER_ATTACKER, 3, 20, 20 - playsewithpan SE_W204, SOUND_PAN_ATTACKER + playsewithpan SE_M_CHARM, SOUND_PAN_ATTACKER waitforvisualfinish createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 8, 1 - loopsewithpan SE_W146, SOUND_PAN_TARGET, 4, 3 + loopsewithpan SE_M_DIZZY_PUNCH, SOUND_PAN_TARGET, 4, 3 end Move_VOLT_TACKLE: @ 81CD5D9 @@ -4413,28 +4413,28 @@ Move_VOLT_TACKLE: @ 81CD5D9 createvisualtask sub_80E2A38, 10, 1, 0, 0, 8, 0 waitforvisualfinish createsprite gBattleAnimSpriteTemplate_83D9AB4, ANIM_BATTLER_ATTACKER, 1 - playsewithpan SE_W268, SOUND_PAN_ATTACKER + playsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER waitforvisualfinish clearmonbg ANIM_BATTLER_ATTACKER blendoff delay 8 createvisualtask sub_80D700C, 5, 0 - playsewithpan SE_W085, SOUND_PAN_ATTACKER + playsewithpan SE_M_THUNDERBOLT, SOUND_PAN_ATTACKER waitforvisualfinish createvisualtask sub_80D700C, 5, 1 - playsewithpan SE_W085, SOUND_PAN_TARGET + playsewithpan SE_M_THUNDERBOLT, SOUND_PAN_TARGET waitforvisualfinish createvisualtask sub_80D700C, 5, 2 - playsewithpan SE_W085, SOUND_PAN_ATTACKER + playsewithpan SE_M_THUNDERBOLT, SOUND_PAN_ATTACKER waitforvisualfinish createvisualtask sub_80D700C, 5, 3 - playsewithpan SE_W085, SOUND_PAN_TARGET + playsewithpan SE_M_THUNDERBOLT, SOUND_PAN_TARGET waitforvisualfinish createvisualtask sub_80D700C, 5, 4 - playsewithpan SE_W085, SOUND_PAN_ATTACKER + playsewithpan SE_M_THUNDERBOLT, SOUND_PAN_ATTACKER delay 8 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 10, 0, 18, 1 - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D9A9C, ANIM_BATTLER_ATTACKER, 2, 1, 16, 16 delay 2 createsprite gBattleAnimSpriteTemplate_83D9A9C, ANIM_BATTLER_ATTACKER, 2, 1, -16, -16 @@ -4442,7 +4442,7 @@ Move_VOLT_TACKLE: @ 81CD5D9 createvisualtask sub_80D6E9C, 5 waitforvisualfinish createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_ATTACKER, 3, 0, 9, 1 - playsewithpan SE_W085B, SOUND_PAN_ATTACKER + playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D9A9C, ANIM_BATTLER_ATTACKER, 2, 0, 16, 16 delay 2 createsprite gBattleAnimSpriteTemplate_83D9A9C, ANIM_BATTLER_ATTACKER, 2, 0, -16, -16 @@ -4455,13 +4455,13 @@ Move_WATER_SPORT: @ 81CD6D1 loadspritegfx ANIM_TAG_GLOWY_BLUE_ORB createvisualtask sub_80D48F4, 5 delay 8 - playsewithpan SE_W057, SOUND_PAN_ATTACKER + playsewithpan SE_M_SURF, SOUND_PAN_ATTACKER delay 44 - playsewithpan SE_W057, SOUND_PAN_ATTACKER + playsewithpan SE_M_SURF, SOUND_PAN_ATTACKER delay 44 - playsewithpan SE_W057, SOUND_PAN_ATTACKER + playsewithpan SE_M_SURF, SOUND_PAN_ATTACKER delay 44 - panse_1B SE_W057, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0 + panse_1B SE_M_SURF, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0 end Move_CALM_MIND: @ 81CD6F7 @@ -4472,13 +4472,13 @@ Move_CALM_MIND: @ 81CD6F7 createvisualtask sub_80E3BDC, 5, 1 waitforvisualfinish createsprite gBattleAnimSpriteTemplate_83D795C, ANIM_BATTLER_ATTACKER, 40, 0, 0, 0, 0 - playsewithpan SE_W048, SOUND_PAN_ATTACKER + playsewithpan SE_M_SUPERSONIC, SOUND_PAN_ATTACKER delay 14 createsprite gBattleAnimSpriteTemplate_83D795C, ANIM_BATTLER_ATTACKER, 40, 0, 0, 0, 0 - playsewithpan SE_W048, SOUND_PAN_ATTACKER + playsewithpan SE_M_SUPERSONIC, SOUND_PAN_ATTACKER delay 14 createsprite gBattleAnimSpriteTemplate_83D795C, ANIM_BATTLER_ATTACKER, 40, 0, 0, 0, 0 - playsewithpan SE_W048, SOUND_PAN_ATTACKER + playsewithpan SE_M_SUPERSONIC, SOUND_PAN_ATTACKER waitforvisualfinish createvisualtask sub_80E3BDC, 5, 0 waitforvisualfinish @@ -4493,20 +4493,20 @@ Move_LEAF_BLADE: @ 81CD775 createvisualtask sub_80CBDF4, 5 delay 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 8, 1 - playsewithpan SE_W015, SOUND_PAN_TARGET + playsewithpan SE_M_CUT, SOUND_PAN_TARGET delay 50 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 8, 1 - playsewithpan SE_W015, SOUND_PAN_TARGET + playsewithpan SE_M_CUT, SOUND_PAN_TARGET delay 50 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 8, 1 - playsewithpan SE_W015, SOUND_PAN_TARGET + playsewithpan SE_M_CUT, SOUND_PAN_TARGET waitforvisualfinish monbg ANIM_BATTLER_TARGET setalpha 12, 8 delay 12 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 8, 0, 18, 1 createsprite gBattleAnimSpriteTemplate_83DB520, ANIM_BATTLER_TARGET, 2, 0, 0, 1, 36 - playsewithpan SE_W043, SOUND_PAN_TARGET + playsewithpan SE_M_LEER, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_BATTLER_TARGET blendoff @@ -4518,7 +4518,7 @@ Move_DRAGON_DANCE: @ 81CD7F8 monbgprio_28 0 delay 1 createvisualtask sub_80DF924, 5 - playsewithpan SE_W100, SOUND_PAN_ATTACKER + playsewithpan SE_M_TELEPORT, SOUND_PAN_ATTACKER delay 8 createvisualtask sub_80798AC, 5, 10249, 19456, 14, 0, 3 createsprite gBattleAnimSpriteTemplate_83DB0E8, ANIM_BATTLER_ATTACKER, 2, 0 @@ -4528,9 +4528,9 @@ Move_DRAGON_DANCE: @ 81CD7F8 createsprite gBattleAnimSpriteTemplate_83DB0E8, ANIM_BATTLER_ATTACKER, 2, 170 createsprite gBattleAnimSpriteTemplate_83DB0E8, ANIM_BATTLER_ATTACKER, 2, 213 delay 30 - playsewithpan SE_W100, SOUND_PAN_ATTACKER + playsewithpan SE_M_TELEPORT, SOUND_PAN_ATTACKER delay 30 - playsewithpan SE_W100, SOUND_PAN_ATTACKER + playsewithpan SE_M_TELEPORT, SOUND_PAN_ATTACKER waitforvisualfinish clearmonbg ANIM_BATTLER_ATTACKER delay 1 @@ -4546,7 +4546,7 @@ Move_SHOCK_WAVE: @ 81CD867 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 2, 0, 4, rgb(0, 0, 0) waitforvisualfinish createvisualtask sub_80D6B3C, 2, 0, 20, 0, 2 - playsewithpan SE_W268, SOUND_PAN_ATTACKER + playsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER delay 12 createsprite gBattleAnimSpriteTemplate_83D9B28, ANIM_BATTLER_ATTACKER, 2 delay 30 @@ -4554,7 +4554,7 @@ Move_SHOCK_WAVE: @ 81CD867 delay 12 waitforvisualfinish createvisualtask sub_80D759C, 5 - playsewithpan SE_W161B, SOUND_PAN_TARGET + playsewithpan SE_M_TRI_ATTACK2, SOUND_PAN_TARGET waitforvisualfinish createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 0, 6, 18, 1 createvisualtask sub_80E2A38, 5, 1, 3, 16, 0, 32767 @@ -4567,7 +4567,7 @@ Move_SHOCK_WAVE: @ 81CD867 end Move_HARDEN: @ 81CD909 - loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 28, 2 + loopsewithpan SE_M_HARDEN, SOUND_PAN_ATTACKER, 28, 2 createvisualtask sub_80E0A4C, 5, 0, 0, 0 waitforvisualfinish end @@ -4579,27 +4579,27 @@ Move_BELLY_DRUM: @ 81CD91E waitforvisualfinish call _81CD9EB createsprite gBattleAnimSpriteTemplate_83D71A8, ANIM_BATTLER_ATTACKER, 2, 0, 0, 0, 0 - playsewithpan SE_W187, SOUND_PAN_ATTACKER + playsewithpan SE_M_BELLY_DRUM, SOUND_PAN_ATTACKER delay 15 call _81CD9D0 createsprite gBattleAnimSpriteTemplate_83D71A8, ANIM_BATTLER_ATTACKER, 2, 1, 1, 1, 0 - playsewithpan SE_W187, SOUND_PAN_ATTACKER + playsewithpan SE_M_BELLY_DRUM, SOUND_PAN_ATTACKER delay 15 call _81CD9EB createsprite gBattleAnimSpriteTemplate_83D71A8, ANIM_BATTLER_ATTACKER, 2, 0, 3, 3, 128 - playsewithpan SE_W187, SOUND_PAN_ATTACKER + playsewithpan SE_M_BELLY_DRUM, SOUND_PAN_ATTACKER delay 7 call _81CD9D0 createsprite gBattleAnimSpriteTemplate_83D71A8, ANIM_BATTLER_ATTACKER, 2, 1, 2, 0, 128 - playsewithpan SE_W187, SOUND_PAN_ATTACKER + playsewithpan SE_M_BELLY_DRUM, SOUND_PAN_ATTACKER delay 7 call _81CD9EB createsprite gBattleAnimSpriteTemplate_83D71A8, ANIM_BATTLER_ATTACKER, 2, 0, 1, 1, 0 - playsewithpan SE_W187, SOUND_PAN_ATTACKER + playsewithpan SE_M_BELLY_DRUM, SOUND_PAN_ATTACKER delay 7 call _81CD9D0 createsprite gBattleAnimSpriteTemplate_83D71A8, ANIM_BATTLER_ATTACKER, 2, 1, 0, 3, 0 - playsewithpan SE_W187, SOUND_PAN_ATTACKER + playsewithpan SE_M_BELLY_DRUM, SOUND_PAN_ATTACKER waitforvisualfinish createvisualtask sub_80CEAD8, 2 waitforvisualfinish @@ -4618,11 +4618,11 @@ Move_MIND_READER: @ 81CDA06 loadspritegfx ANIM_TAG_OPENING_EYE loadspritegfx ANIM_TAG_ROUND_WHITE_HALO monbg 4 - playsewithpan SE_W109, SOUND_PAN_TARGET + playsewithpan SE_M_CONFUSE_RAY, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_84021DC, ANIM_BATTLER_ATTACKER, 5, 0, 0, 1, 0 createsprite gBattleAnimSpriteTemplate_84021F4, ANIM_BATTLER_ATTACKER, 5 delay 40 - playsewithpan SE_W043, SOUND_PAN_TARGET + playsewithpan SE_M_LEER, SOUND_PAN_TARGET createvisualtask sub_80E1F8C, 2, 1, 1, 2, 0, 10, 0 call _81CDA4D waitforvisualfinish @@ -4661,7 +4661,7 @@ Move_ICE_PUNCH: @ 81CDB3E createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 1, 0, 7, rgb(0, 0, 0) createvisualtask sub_80E2A38, 10, 4, 2, 0, 9, 32588 delay 20 - playsewithpan SE_W081, SOUND_PAN_TARGET + playsewithpan SE_M_STRING_SHOT, SOUND_PAN_TARGET createsprite gSmallIcePunchCrystalSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0 createsprite gSmallIcePunchCrystalSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 64 createsprite gSmallIcePunchCrystalSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 128 @@ -4674,7 +4674,7 @@ Move_ICE_PUNCH: @ 81CDB3E delay 17 createsprite gFistFootSpriteTemplate, ANIM_BATTLER_ATTACKER, 4, 0, -10, 8, 1, 0 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 0, -10, 1, 1 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET delay 2 createvisualtask AnimTask_ShakeMon, 5, 1, 0, 5, 3, 1 waitforvisualfinish @@ -4690,7 +4690,7 @@ Move_ICE_PUNCH: @ 81CDB3E end Move_REST: @ 81CDC29 - playsewithpan SE_W173, SOUND_PAN_ATTACKER + playsewithpan SE_M_SNORE, SOUND_PAN_ATTACKER loadspritegfx ANIM_TAG_LETTER_Z createsprite gBattleAnimSpriteTemplate_83D6D94, ANIM_BATTLER_ATTACKER, 2, 4, -10, 16, 0, 0 delay 20 @@ -4707,7 +4707,7 @@ Move_CONFUSION: @ 81CDC69 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_ATTACKER, 1, 0, 10, 1 createvisualtask sub_80E1F8C, 2, 2, 0, 2, 0, 8, 32767 waitforvisualfinish - playsewithpan SE_W048, SOUND_PAN_TARGET + playsewithpan SE_M_SUPERSONIC, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 3, 0, 15, 1 createvisualtask AnimTask_ScaleMonAndRestore, 5, -4, -4, 15, ANIM_BATTLER_TARGET, 1 waitforvisualfinish @@ -4724,7 +4724,7 @@ Move_PSYCHIC: @ 81CDCCA createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_ATTACKER, 1, 0, 10, 1 createvisualtask sub_80E1F8C, 2, 2, 0, 2, 0, 8, 767 waitforvisualfinish - loopsewithpan SE_W048, SOUND_PAN_TARGET, 10, 3 + loopsewithpan SE_M_SUPERSONIC, SOUND_PAN_TARGET, 10, 3 createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 5, 0, 15, 1 createvisualtask AnimTask_ScaleMonAndRestore, 5, -6, -6, 15, ANIM_BATTLER_TARGET, 1 waitforvisualfinish @@ -4743,10 +4743,10 @@ _81CDD32: end _81CDD3B: monbg ANIM_BATTLER_ATK_PARTNER - playsewithpan SE_W060, SOUND_PAN_ATTACKER + playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER call SetPsychicBackground setalpha 8, 8 - playsewithpan SE_W048, SOUND_PAN_ATTACKER + playsewithpan SE_M_SUPERSONIC, SOUND_PAN_ATTACKER createvisualtask sub_80E1F8C, 2, 2, 0, 2, 0, 8, 32767 createvisualtask AnimTask_ScaleMonAndRestore, 5, -4, -4, 15, ANIM_BATTLER_ATTACKER, 1 waitforvisualfinish @@ -4756,11 +4756,11 @@ _81CDD3B: Unknown_81CDD7A: @ 81CDD7A monbg ANIM_BATTLER_DEF_PARTNER - playsewithpan SE_W060, SOUND_PAN_ATTACKER + playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER call SetPsychicBackground setalpha 8, 8 - playsewithpan SE_W048, SOUND_PAN_TARGET - waitplaysewithpan SE_W048, SOUND_PAN_TARGET, 8 + playsewithpan SE_M_SUPERSONIC, SOUND_PAN_TARGET + waitplaysewithpan SE_M_SUPERSONIC, SOUND_PAN_TARGET, 8 createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 4, 0, 15, 1 createvisualtask AnimTask_ScaleMonAndRestore, 5, -5, -5, 15, ANIM_BATTLER_TARGET, 1 waitforvisualfinish @@ -4779,7 +4779,7 @@ Move_THUNDER: @ 81CDDCE createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 2, 0, 16, rgb(0, 0, 0) delay 16 createvisualtask sub_80E2324, 2, 257, 257, 257 - playsewithpan SE_W086, SOUND_PAN_TARGET + playsewithpan SE_M_THUNDER_WAVE, SOUND_PAN_TARGET delay 1 createsprite gBattleAnimSpriteTemplate_83D97D0, ANIM_BATTLER_TARGET, 2, 16, -36 delay 1 @@ -4788,12 +4788,12 @@ Move_THUNDER: @ 81CDDCE createsprite gBattleAnimSpriteTemplate_83D97D0, ANIM_BATTLER_TARGET, 2, 16, 12 delay 20 createsprite gBattleAnimSpriteTemplate_83D97D0, ANIM_BATTLER_TARGET, 6, -16, -32 - playsewithpan SE_W086, SOUND_PAN_TARGET + playsewithpan SE_M_THUNDER_WAVE, SOUND_PAN_TARGET delay 1 createsprite gBattleAnimSpriteTemplate_83D97D0, ANIM_BATTLER_TARGET, 6, -16, -16 delay 1 createsprite gBattleAnimSpriteTemplate_83D97D0, ANIM_BATTLER_TARGET, 6, -16, 16 - playsewithpan SE_W086, SOUND_PAN_TARGET + playsewithpan SE_M_THUNDER_WAVE, SOUND_PAN_TARGET delay 5 createvisualtask sub_80E2324, 2, 257, 257, 257 delay 1 @@ -4808,7 +4808,7 @@ Move_THUNDER: @ 81CDDCE createvisualtask sub_80E2324, 2, 257, 257, 257 delay 1 createsprite gBattleAnimSpriteTemplate_83D97D0, ANIM_BATTLER_TARGET, 2, 0, -32 - playsewithpan SE_W161B, SOUND_PAN_TARGET + playsewithpan SE_M_TRI_ATTACK2, SOUND_PAN_TARGET delay 1 createsprite gBattleAnimSpriteTemplate_83D97D0, ANIM_BATTLER_TARGET, 2, 0, -16 delay 1 @@ -4836,7 +4836,7 @@ Move_THUNDER_PUNCH: @ 81CDF28 setalpha 12, 8 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 2, 0, 16, rgb(0, 0, 0) waitforvisualfinish - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET createsprite gFistFootSpriteTemplate, ANIM_BATTLER_TARGET, 4, 0, 0, 8, 1, 0 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 3, 0, 0, 1, 1 delay 1 @@ -4848,7 +4848,7 @@ Move_THUNDER_PUNCH: @ 81CDF28 delay 1 createsprite gBattleAnimSpriteTemplate_83D97D0, ANIM_BATTLER_ATTACKER, 2, 0, 16 delay 1 - playsewithpan SE_W161B, SOUND_PAN_TARGET + playsewithpan SE_M_TRI_ATTACK2, SOUND_PAN_TARGET createvisualtask sub_80E2324, 2, 257, 257, 257 delay 2 createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 0, 3, 15, 1 @@ -4864,7 +4864,7 @@ Move_THUNDER_PUNCH: @ 81CDF28 Move_SACRED_FIRE: @ 81CDFF1 loadspritegfx ANIM_TAG_FIRE loadspritegfx ANIM_TAG_FIRE_PLUME - loopsewithpan SE_W221, SOUND_PAN_ATTACKER, 7, 5 + loopsewithpan SE_M_SACRED_FIRE, SOUND_PAN_ATTACKER, 7, 5 createsprite gBattleAnimSpriteTemplate_83D9538, ANIM_BATTLER_ATTACKER, 2, -32, 0, 50, 5, -2, 0 delay 1 createsprite gBattleAnimSpriteTemplate_83D9538, ANIM_BATTLER_ATTACKER, 66, -20, -10, 50, 5, -1, -1 @@ -4885,13 +4885,13 @@ Move_SACRED_FIRE: @ 81CDFF1 createvisualtask sub_80E2324, 2, 257, 257, 257 delay 1 waitforvisualfinish - playsewithpan SE_W221B, SOUND_PAN_TARGET + playsewithpan SE_M_SACRED_FIRE2, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D9508, ANIM_BATTLER_TARGET, 2, -16, 0, 70, 16, 0, 1 delay 10 - playsewithpan SE_W221B, SOUND_PAN_TARGET + playsewithpan SE_M_SACRED_FIRE2, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D9508, ANIM_BATTLER_TARGET, 2, 0, 0, 70, 16, 0, 1 delay 10 - playsewithpan SE_W221B, SOUND_PAN_TARGET + playsewithpan SE_M_SACRED_FIRE2, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D9508, ANIM_BATTLER_TARGET, 2, 16, 0, 80, 16, 0, 1 delay 1 createvisualtask sub_80E2324, 2, 257, 257, 257 @@ -4899,7 +4899,7 @@ Move_SACRED_FIRE: @ 81CDFF1 waitforvisualfinish createvisualtask sub_80E2324, 2, 257, 257, 257 delay 1 - playsewithpan SE_W172B, SOUND_PAN_TARGET + playsewithpan SE_M_FLAME_WHEEL2, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D9520, ANIM_BATTLER_TARGET, 2, 0, 0, 30, 30, -1, 0 delay 1 createsprite gBattleAnimSpriteTemplate_83D9520, ANIM_BATTLER_TARGET, 2, 0, 0, 30, 30, 0, 1 @@ -4922,7 +4922,7 @@ Move_SCRATCH: @ 81CE1D8 loadspritegfx ANIM_TAG_SCRATCH monbg ANIM_BATTLER_TARGET setalpha 12, 8 - playsewithpan SE_W010, SOUND_PAN_TARGET + playsewithpan SE_M_SCRATCH, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_8402180, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 0 createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 3, 0, 6, 1 waitforvisualfinish @@ -4935,7 +4935,7 @@ Move_DRAGON_BREATH: @ 81CE20A loadspritegfx ANIM_TAG_SMALL_EMBER monbg ANIM_BATTLER_DEF_PARTNER monbgprio_28 1 - loopsewithpan SE_W172, SOUND_PAN_ATTACKER, 7, 7 + loopsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER, 7, 7 createsprite gBattleAnimSpriteTemplate_83DB044, ANIM_BATTLER_TARGET, 2, 0, 0, 0, 0, 20 delay 2 createsprite gBattleAnimSpriteTemplate_83DB044, ANIM_BATTLER_TARGET, 2, 0, 0, 0, 0, 20 @@ -5014,7 +5014,7 @@ Move_SNORE: @ 81CE3EA blendoff end _81CE403: - playsewithpan SE_W173, SOUND_PAN_ATTACKER + playsewithpan SE_M_SNORE, SOUND_PAN_ATTACKER createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 7, ANIM_BATTLER_ATTACKER, 1 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 4, 0, 7, 1 createsprite gBattleAnimSpriteTemplate_83DB428, ANIM_BATTLER_ATTACKER, 2, 6, 1, 14, 0, 0 @@ -5027,7 +5027,7 @@ Move_LIGHT_SCREEN: @ 81CE47A loadspritegfx ANIM_TAG_SPARKLE_3 loadspritegfx ANIM_TAG_GREEN_LIGHT_WALL setalpha 0, 16 - waitplaysewithpan SE_W115, SOUND_PAN_ATTACKER, 15 + waitplaysewithpan SE_M_REFLECT, SOUND_PAN_ATTACKER, 15 createsprite gBattleAnimSpriteTemplate_83DA6A8, ANIM_BATTLER_ATTACKER, 1, 40, 0, 10166 delay 10 call _81CE4A1 @@ -5055,7 +5055,7 @@ Move_MIRROR_COAT: @ 81CE506 setalpha 0, 16 createsprite gBattleAnimSpriteTemplate_83DA6D8, ANIM_BATTLER_ATTACKER, 1, 40, 0, 10168 delay 10 - playsewithpan SE_W115, SOUND_PAN_ATTACKER + playsewithpan SE_M_REFLECT, SOUND_PAN_ATTACKER call _81CE4A1 waitforvisualfinish delay 1 @@ -5066,7 +5066,7 @@ Move_REFLECT: @ 81CE52C loadspritegfx ANIM_TAG_SPARKLE_4 loadspritegfx ANIM_TAG_BLUE_LIGHT_WALL setalpha 0, 16 - waitplaysewithpan SE_W115, SOUND_PAN_ATTACKER, 15 + waitplaysewithpan SE_M_REFLECT, SOUND_PAN_ATTACKER, 15 createsprite gBattleAnimSpriteTemplate_83DA6C0, ANIM_BATTLER_ATTACKER, 1, 40, 0, 10167 delay 20 createsprite gBattleAnimSpriteTemplate_83DA73C, ANIM_BATTLER_ATTACKER, 2, 30, 0, 0, 1 @@ -5082,7 +5082,7 @@ Move_REFLECT: @ 81CE52C Move_BARRIER: @ 81CE57F loadspritegfx ANIM_TAG_GRAY_LIGHT_WALL setalpha 0, 16 - waitplaysewithpan SE_W112, SOUND_PAN_ATTACKER, 15 + waitplaysewithpan SE_M_BARRIER, SOUND_PAN_ATTACKER, 15 createsprite gBattleAnimSpriteTemplate_83DA6F0, ANIM_BATTLER_ATTACKER, 3, 40, 0, 10169 waitforvisualfinish delay 1 @@ -5096,28 +5096,28 @@ Move_BUBBLE: @ 81CE59C setalpha 12, 8 delay 1 createsprite gBattleAnimSpriteTemplate_83D9178, ANIM_BATTLER_ATTACKER, 2, 18, 0, 15, -15, 10, 128, 100 - playsewithpan SE_W145, SOUND_PAN_ATTACKER - waitplaysewithpan SE_W145B, SOUND_PAN_TARGET, 100 + playsewithpan SE_M_BUBBLE, SOUND_PAN_ATTACKER + waitplaysewithpan SE_M_BUBBLE2, SOUND_PAN_TARGET, 100 delay 6 createsprite gBattleAnimSpriteTemplate_83D9178, ANIM_BATTLER_ATTACKER, 2, 18, 0, 35, 37, 40, 128, 100 - playsewithpan SE_W145, SOUND_PAN_ATTACKER - waitplaysewithpan SE_W145B, SOUND_PAN_TARGET, 100 + playsewithpan SE_M_BUBBLE, SOUND_PAN_ATTACKER + waitplaysewithpan SE_M_BUBBLE2, SOUND_PAN_TARGET, 100 delay 6 createsprite gBattleAnimSpriteTemplate_83D9178, ANIM_BATTLER_ATTACKER, 2, 18, 0, 10, -37, 30, 128, 100 - playsewithpan SE_W145, SOUND_PAN_ATTACKER - waitplaysewithpan SE_W145B, SOUND_PAN_TARGET, 100 + playsewithpan SE_M_BUBBLE, SOUND_PAN_ATTACKER + waitplaysewithpan SE_M_BUBBLE2, SOUND_PAN_TARGET, 100 delay 6 createsprite gBattleAnimSpriteTemplate_83D9178, ANIM_BATTLER_ATTACKER, 2, 18, 0, 30, 10, 15, 128, 100 - playsewithpan SE_W145, SOUND_PAN_ATTACKER - waitplaysewithpan SE_W145B, SOUND_PAN_TARGET, 100 + playsewithpan SE_M_BUBBLE, SOUND_PAN_ATTACKER + waitplaysewithpan SE_M_BUBBLE2, SOUND_PAN_TARGET, 100 delay 6 createsprite gBattleAnimSpriteTemplate_83D9178, ANIM_BATTLER_ATTACKER, 2, 18, 0, 20, 33, 20, 128, 100 - playsewithpan SE_W145, SOUND_PAN_ATTACKER - waitplaysewithpan SE_W145B, SOUND_PAN_TARGET, 100 + playsewithpan SE_M_BUBBLE, SOUND_PAN_ATTACKER + waitplaysewithpan SE_M_BUBBLE2, SOUND_PAN_TARGET, 100 delay 6 createsprite gBattleAnimSpriteTemplate_83D9178, ANIM_BATTLER_ATTACKER, 2, 18, 0, 25, -30, 10, 128, 100 - playsewithpan SE_W145, SOUND_PAN_ATTACKER - waitplaysewithpan SE_W145B, SOUND_PAN_TARGET, 100 + playsewithpan SE_M_BUBBLE, SOUND_PAN_ATTACKER + waitplaysewithpan SE_M_BUBBLE2, SOUND_PAN_TARGET, 100 waitforvisualfinish call WaterBubbleEffect2 waitforvisualfinish @@ -5130,7 +5130,7 @@ Move_SMOG: @ 81CE672 monbg ANIM_BATTLER_DEF_PARTNER monbgprio_29 setalpha 12, 8 - loopsewithpan SE_W054, SOUND_PAN_TARGET, 17, 10 + loopsewithpan SE_M_MIST, SOUND_PAN_TARGET, 17, 10 call _81CE6D7 call _81CE6D7 call _81CE6D7 @@ -5139,7 +5139,7 @@ Move_SMOG: @ 81CE672 call _81CE6D7 call _81CE6D7 delay 120 - loopsewithpan SE_W092, SOUND_PAN_TARGET, 18, 2 + loopsewithpan SE_M_TOXIC, SOUND_PAN_TARGET, 18, 2 createvisualtask sub_80E1F8C, 2, 4, 2, 2, 0, 12, 26650 delay 10 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 15, 1 @@ -5158,7 +5158,7 @@ Move_FAINT_ATTACK: @ 81CE6ED fadetobg BG_DARK waitbgfadein delay 0 - playsewithpan SE_W185, SOUND_PAN_ATTACKER + playsewithpan SE_M_FAINT_ATTACK, SOUND_PAN_ATTACKER createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_BATTLER_ATTACKER, 18, 6, 1, 3 createvisualtask sub_80DFC24, 2, 1 waitforvisualfinish @@ -5169,7 +5169,7 @@ Move_FAINT_ATTACK: @ 81CE6ED monbg ANIM_BATTLER_TARGET setalpha 12, 8 delay 1 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 1 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 9, 1 waitforvisualfinish @@ -5193,7 +5193,7 @@ Move_SAND_ATTACK: @ 81CE774 monbg ANIM_BATTLER_ATK_PARTNER monbgprio_28 0 setalpha 12, 8 - playsewithpan SE_W028, SOUND_PAN_ATTACKER + playsewithpan SE_M_SAND_ATTACK, SOUND_PAN_ATTACKER createsprite gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, -10, 0, 0, 3 waitforvisualfinish createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 2 @@ -5218,7 +5218,7 @@ Move_SAND_ATTACK_CreateDirtSpray: Move_MUD_SLAP: @ 81CE81C loadspritegfx ANIM_TAG_MUD_SAND - playsewithpan SE_W028, SOUND_PAN_ATTACKER + playsewithpan SE_M_SAND_ATTACK, SOUND_PAN_ATTACKER createsprite gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, -10, 0, 0, 3 waitforvisualfinish createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 2 @@ -5242,14 +5242,14 @@ Move_MUD_SLAP_CreateMudSpray: Move_DRAGON_RAGE: @ 81CE8BA loadspritegfx ANIM_TAG_SMALL_EMBER loadspritegfx ANIM_TAG_FIRE_PLUME - playsewithpan SE_W082, SOUND_PAN_ATTACKER + playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER createvisualtask AnimTask_ShakeMon, 5, 0, 0, 2, 40, 1 waitforvisualfinish createsprite gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_TARGET, 2, 0, 15, 0, 0, 4 waitforvisualfinish createsprite gBattleAnimSpriteTemplate_83DB0D0, ANIM_BATTLER_TARGET, 2, 30, 15, 0, 10, 10 waitforvisualfinish - loopsewithpan SE_W172B, SOUND_PAN_TARGET, 11, 3 + loopsewithpan SE_M_FLAME_WHEEL2, SOUND_PAN_TARGET, 11, 3 createvisualtask AnimTask_ShakeMon, 5, 1, 0, 3, 25, 1 createsprite gBattleAnimSpriteTemplate_83DB078, ANIM_BATTLER_TARGET, 66, 1, 5, 0 delay 1 @@ -5273,7 +5273,7 @@ Move_DRAGON_RAGE: @ 81CE8BA Move_RAIN_DANCE: @ 81CE997 loadspritegfx ANIM_TAG_RAIN_DROPS - playsewithpan SE_W240, SOUND_PAN_ATTACKER + playsewithpan SE_M_RAIN_DANCE, SOUND_PAN_ATTACKER createvisualtask sub_80E2A38, 10, 1921, 2, 0, 4, 0 waitforvisualfinish createvisualtask CreateAnimRaindrops, 2, 0, 3, 120 @@ -5290,7 +5290,7 @@ Move_BITE: @ 81CE9E2 loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BATTLER_TARGET setalpha 12, 8 - playsewithpan SE_W044, SOUND_PAN_TARGET + playsewithpan SE_M_BITE, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DB1D0, ANIM_BATTLER_ATTACKER, 2, 0, -32, 0, 0, 819, 10 createsprite gBattleAnimSpriteTemplate_83DB1D0, ANIM_BATTLER_ATTACKER, 2, 0, 32, 4, 0, -819, 10 delay 10 @@ -5309,14 +5309,14 @@ Move_CRUNCH: @ 81CEA40 fadetobg BG_DARK waitbgfadein setalpha 12, 8 - playsewithpan SE_W044, SOUND_PAN_TARGET + playsewithpan SE_M_BITE, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DB1D0, ANIM_BATTLER_ATTACKER, 2, -32, -32, 1, 819, 819, 10 createsprite gBattleAnimSpriteTemplate_83DB1D0, ANIM_BATTLER_ATTACKER, 2, 32, 32, 5, -819, -819, 10 delay 10 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -8, 0, 1, 1 createvisualtask AnimTask_ShakeMon, 5, 1, 0, 7, 5, 2 waitforvisualfinish - playsewithpan SE_W044, SOUND_PAN_TARGET + playsewithpan SE_M_BITE, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DB1D0, ANIM_BATTLER_ATTACKER, 2, 32, -32, 7, -819, 819, 10 createsprite gBattleAnimSpriteTemplate_83DB1D0, ANIM_BATTLER_ATTACKER, 2, -32, 32, 3, 819, -819, 10 delay 10 @@ -5335,7 +5335,7 @@ Move_CLAMP: @ 81CEAF0 loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BATTLER_TARGET setalpha 12, 8 - playsewithpan SE_W011, SOUND_PAN_TARGET + playsewithpan SE_M_VICEGRIP, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DB1E8, ANIM_BATTLER_ATTACKER, 2, -32, 0, 2, 819, 0, 10 createsprite gBattleAnimSpriteTemplate_83DB1E8, ANIM_BATTLER_ATTACKER, 2, 32, 0, 6, -819, 0, 10 delay 10 @@ -5392,7 +5392,7 @@ _81CEC4E: return Move_WITHDRAW: @ 81CEC84 - playsewithpan SE_W029, SOUND_PAN_ATTACKER + playsewithpan SE_M_HEADBUTT, SOUND_PAN_ATTACKER createvisualtask sub_80CF4D8, 5 waitforvisualfinish end @@ -5401,7 +5401,7 @@ Move_AURORA_BEAM: @ 81CEC91 loadspritegfx ANIM_TAG_RAINBOW_RINGS fadetobg BG_AURORABEAM waitbgfadein - playsewithpan SE_W062, SOUND_PAN_ATTACKER + playsewithpan SE_M_BUBBLE_BEAM, SOUND_PAN_ATTACKER setarg ARG_RET_ID, 0 createvisualtask AnimTask_RotateMonPalette1, 10, 130 call _81CED18 @@ -5443,7 +5443,7 @@ _81CED73: monbg ANIM_BATTLER_ATK_PARTNER setalpha 12, 8 createvisualtask sub_80E1F8C, 2, 2, 1, 4, 0, 11, 12287 - playsewithpan SE_W025, SOUND_PAN_ATTACKER + playsewithpan SE_M_MEGA_KICK, SOUND_PAN_ATTACKER call _81CED9D waitforvisualfinish clearmonbg ANIM_BATTLER_ATK_PARTNER @@ -5481,7 +5481,7 @@ _81CED9D: return _81CEE70: call Unknown_81D6233 - panse_1B SE_W076, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0 + panse_1B SE_M_SOLAR_BEAM, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0 createvisualtask sub_80CA928, 5 createsprite gBattleAnimSpriteTemplate_83D6304, ANIM_BATTLER_TARGET, 3, 15, 0, 20, 0 delay 4 @@ -5533,10 +5533,10 @@ _81CEFD0: createvisualtask sub_80E3A58, 5, -2304, 0, 1, -1 waitbgfadein waitforvisualfinish - panse_1B SE_W059, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0 + panse_1B SE_M_BLIZZARD, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0 call _81CF00A call _81CF00A - playsewithpan SE_W059B, SOUND_PAN_TARGET + playsewithpan SE_M_BLIZZARD2, SOUND_PAN_TARGET waitforvisualfinish call Effect_HeavyIceDamage waitforvisualfinish @@ -5579,10 +5579,10 @@ Move_POWDER_SNOW: @ 81CF146 monbg ANIM_BATTLER_DEF_PARTNER createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 31, 1, 0, 3, rgb(0, 0, 0) waitforvisualfinish - panse_1B SE_W016, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0 + panse_1B SE_M_GUST, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0 call _81CF190 call _81CF190 - playsewithpan SE_W016B, SOUND_PAN_TARGET + playsewithpan SE_M_GUST2, SOUND_PAN_TARGET waitforvisualfinish waitsound call Effect_HeavyIceDamage @@ -5616,7 +5616,7 @@ Move_HYDRO_PUMP: @ 81CF240 setalpha 12, 8 createvisualtask AnimTask_ShakeMon, 5, 0, 0, 2, 40, 1 delay 6 - panse_1B SE_W056, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0 + panse_1B SE_M_HYDRO_PUMP, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0 createvisualtask sub_80D3630, 5, 100 call _81CF2DF call _81CF2DF @@ -5661,7 +5661,7 @@ Move_SIGNAL_BEAM: @ 81CF33F loadspritegfx ANIM_TAG_DUCK createvisualtask AnimTask_ShakeMon, 5, 0, 0, 2, 25, 1 delay 6 - panse_1B SE_W062, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 1, 0 + panse_1B SE_M_BUBBLE_BEAM, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 1, 0 createvisualtask sub_80D3630, 5, 100 call _81CF406 call _81CF406 @@ -5705,7 +5705,7 @@ Move_ABSORB: @ 81CF427 setalpha 12, 8 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 1, 0, 4, rgb(13, 31, 12) waitforvisualfinish - playsewithpan SE_W071, SOUND_PAN_TARGET + playsewithpan SE_M_ABSORB, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 2 delay 2 createvisualtask AnimTask_ShakeMon, 5, 1, 0, 5, 5, 1 @@ -5722,28 +5722,28 @@ Move_ABSORB: @ 81CF427 blendoff end _81CF496: - playsewithpan SE_W152, SOUND_PAN_TARGET + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 0, 5, 8, 26 delay 4 - playsewithpan SE_W152, SOUND_PAN_TARGET + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 10, -5, -8, 26 delay 4 - playsewithpan SE_W152, SOUND_PAN_TARGET + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, -5, 15, 16, 33 delay 4 - playsewithpan SE_W152, SOUND_PAN_TARGET + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 0, -15, -16, 36 delay 4 - playsewithpan SE_W152, SOUND_PAN_TARGET + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 0, 5, 8, 26 delay 4 - playsewithpan SE_W152, SOUND_PAN_TARGET + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 10, -5, -8, 26 delay 4 - playsewithpan SE_W152, SOUND_PAN_TARGET + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, -10, 20, 20, 39 delay 4 - playsewithpan SE_W152, SOUND_PAN_TARGET + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 5, -18, -20, 35 delay 4 return @@ -5757,7 +5757,7 @@ Move_MEGA_DRAIN: @ 81CF53F setalpha 12, 8 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 1, 0, 8, rgb(13, 31, 12) waitforvisualfinish - playsewithpan SE_W071, SOUND_PAN_TARGET + playsewithpan SE_M_ABSORB, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 1 delay 2 createvisualtask AnimTask_ShakeMon, 5, 1, 0, 5, 5, 1 @@ -5774,35 +5774,35 @@ Move_MEGA_DRAIN: @ 81CF53F blendoff end _81CF5AE: - playsewithpan SE_W145C, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 0, 5, 8, 26 createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 5, -18, -20, 35 delay 4 - playsewithpan SE_W145C, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 10, -5, -8, 26 createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, -10, 20, 20, 39 delay 4 - playsewithpan SE_W145C, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, -5, 15, 16, 33 createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 10, -5, -8, 26 delay 4 - playsewithpan SE_W145C, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 0, -15, -16, 36 createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 0, 5, 8, 26 delay 4 - playsewithpan SE_W145C, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 0, 5, 8, 26 createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 0, -15, -16, 36 delay 4 - playsewithpan SE_W145C, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 10, -5, -8, 26 createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, -5, 15, 16, 33 delay 4 - playsewithpan SE_W145C, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, -10, 20, 20, 39 createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 10, -5, -8, 26 delay 4 - playsewithpan SE_W145C, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 0, 5, 8, 26 createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 5, -18, -20, 35 delay 4 @@ -5817,7 +5817,7 @@ Move_GIGA_DRAIN: @ 81CF6CF setalpha 12, 8 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 1, 0, 12, rgb(13, 31, 12) waitforvisualfinish - playsewithpan SE_W071, SOUND_PAN_TARGET + playsewithpan SE_M_ABSORB, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 0 delay 2 createvisualtask AnimTask_ShakeMon, 5, 1, 0, 5, 5, 1 @@ -5834,42 +5834,42 @@ Move_GIGA_DRAIN: @ 81CF6CF blendoff end _81CF73E: - playsewithpan SE_W202, SOUND_PAN_TARGET + playsewithpan SE_M_GIGA_DRAIN, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 0, 5, 8, 26 createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 5, -18, -40, 35 createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, -10, 20, 20, 39 delay 4 - playsewithpan SE_W202, SOUND_PAN_TARGET + playsewithpan SE_M_GIGA_DRAIN, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 0, 5, 28, 26 createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 10, -5, -8, 26 createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, -10, 20, 40, 39 delay 4 - playsewithpan SE_W202, SOUND_PAN_TARGET + playsewithpan SE_M_GIGA_DRAIN, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 10, -5, -8, 26 createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, -5, 15, 16, 33 createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 10, -5, -32, 26 delay 4 - playsewithpan SE_W202, SOUND_PAN_TARGET + playsewithpan SE_M_GIGA_DRAIN, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 0, -15, -16, 36 createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 0, 5, 8, 26 createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 10, -5, -8, 26 delay 4 - playsewithpan SE_W202, SOUND_PAN_TARGET + playsewithpan SE_M_GIGA_DRAIN, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, -5, 15, 16, 33 createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 0, -15, -16, 36 createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 0, 5, 8, 26 delay 4 - playsewithpan SE_W202, SOUND_PAN_TARGET + playsewithpan SE_M_GIGA_DRAIN, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 0, 5, 8, 26 createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, -5, 15, 16, 33 createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 10, -5, -40, 26 delay 4 - playsewithpan SE_W202, SOUND_PAN_TARGET + playsewithpan SE_M_GIGA_DRAIN, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, -5, 15, 36, 33 createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 10, -5, -8, 26 createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, -10, 20, 20, 39 delay 4 - playsewithpan SE_W202, SOUND_PAN_TARGET + playsewithpan SE_M_GIGA_DRAIN, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 0, 5, 8, 26 createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 0, 5, 8, 26 createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 5, -18, -20, 35 @@ -5889,7 +5889,7 @@ Move_LEECH_LIFE: @ 81CF8D7 createsprite gBattleAnimSpriteTemplate_83DAB10, ANIM_BATTLER_ATTACKER, 2, -20, 15, 12 waitforvisualfinish createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 2 - playsewithpan SE_W071, SOUND_PAN_TARGET + playsewithpan SE_M_ABSORB, SOUND_PAN_TARGET delay 2 createvisualtask AnimTask_ShakeMon, 5, 1, 0, 5, 5, 1 waitforvisualfinish @@ -5910,7 +5910,7 @@ Move_SYNTHESIS: @ 81CF959 loadspritegfx ANIM_TAG_BLUE_STAR loadspritegfx ANIM_TAG_SPARKLE_2 createvisualtask sub_80E1F8C, 2, 2, 2, 2, 0, 16, 19451 - playsewithpan SE_W025, SOUND_PAN_ATTACKER + playsewithpan SE_M_MEGA_KICK, SOUND_PAN_ATTACKER call Unknown_81D5ECA waitforvisualfinish call Unknown_81D5EF5 @@ -5929,22 +5929,22 @@ Move_TOXIC: @ 81CF983 end _81CF99D: createsprite gBattleAnimSpriteTemplate_83DA244, ANIM_BATTLER_TARGET, 2, -24, 16, 1, 1 - playsewithpan SE_W092, SOUND_PAN_TARGET + playsewithpan SE_M_TOXIC, SOUND_PAN_TARGET delay 15 createsprite gBattleAnimSpriteTemplate_83DA244, ANIM_BATTLER_TARGET, 2, 8, 16, 1, 1 - playsewithpan SE_W092, SOUND_PAN_TARGET + playsewithpan SE_M_TOXIC, SOUND_PAN_TARGET delay 15 createsprite gBattleAnimSpriteTemplate_83DA244, ANIM_BATTLER_TARGET, 2, -8, 16, 1, 1 - playsewithpan SE_W092, SOUND_PAN_TARGET + playsewithpan SE_M_TOXIC, SOUND_PAN_TARGET delay 15 createsprite gBattleAnimSpriteTemplate_83DA244, ANIM_BATTLER_TARGET, 2, 24, 16, 1, 1 - playsewithpan SE_W092, SOUND_PAN_TARGET + playsewithpan SE_M_TOXIC, SOUND_PAN_TARGET delay 15 return Move_SLUDGE: @ 81CF9F2 loadspritegfx ANIM_TAG_POISON_BUBBLE - playsewithpan SE_W145C, SOUND_PAN_ATTACKER + playsewithpan SE_M_BUBBLE3, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83DA2B8, ANIM_BATTLER_TARGET, 2, 20, 0, 40, 0 waitforvisualfinish createvisualtask AnimTask_ShakeMon, 5, 1, 3, 0, 5, 1 @@ -5971,19 +5971,19 @@ Move_SLUDGE_BOMB: @ 81CFA34 createsprite gBattleAnimSpriteTemplate_83DA2E8, ANIM_BATTLER_TARGET, 2, -27, 44, 20 createsprite gBattleAnimSpriteTemplate_83DA2E8, ANIM_BATTLER_TARGET, 2, 39, -28, 20 createsprite gBattleAnimSpriteTemplate_83DA2E8, ANIM_BATTLER_TARGET, 2, -42, -42, 20 - playsewithpan SE_W091, SOUND_PAN_TARGET + playsewithpan SE_M_DIG, SOUND_PAN_TARGET delay 5 createsprite gBattleAnimSpriteTemplate_83DA2E8, ANIM_BATTLER_TARGET, 2, 0, 40, 20 createsprite gBattleAnimSpriteTemplate_83DA2E8, ANIM_BATTLER_TARGET, 2, -8, -44, 20 createsprite gBattleAnimSpriteTemplate_83DA2E8, ANIM_BATTLER_TARGET, 2, -46, -28, 20 createsprite gBattleAnimSpriteTemplate_83DA2E8, ANIM_BATTLER_TARGET, 2, 46, 9, 20 - playsewithpan SE_W091, SOUND_PAN_TARGET + playsewithpan SE_M_DIG, SOUND_PAN_TARGET delay 5 createsprite gBattleAnimSpriteTemplate_83DA2E8, ANIM_BATTLER_TARGET, 2, 42, 0, 20 createsprite gBattleAnimSpriteTemplate_83DA2E8, ANIM_BATTLER_TARGET, 2, -43, -12, 20 createsprite gBattleAnimSpriteTemplate_83DA2E8, ANIM_BATTLER_TARGET, 2, 16, -46, 20 createsprite gBattleAnimSpriteTemplate_83DA2E8, ANIM_BATTLER_TARGET, 2, -16, 44, 20 - playsewithpan SE_W091, SOUND_PAN_TARGET + playsewithpan SE_M_DIG, SOUND_PAN_TARGET delay 0 waitsound waitforvisualfinish @@ -5991,7 +5991,7 @@ Move_SLUDGE_BOMB: @ 81CFA34 waitforvisualfinish end _81CFB44: - playsewithpan SE_W145C, SOUND_PAN_ATTACKER + playsewithpan SE_M_BUBBLE3, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83DA2B8, ANIM_BATTLER_TARGET, 2, 20, 0, 40, 0 delay 3 return @@ -6000,31 +6000,31 @@ Move_ACID: @ 81CFB5A loadspritegfx ANIM_TAG_POISON_BUBBLE monbg ANIM_BATTLER_DEF_PARTNER createsprite gBattleAnimSpriteTemplate_83DA2D0, ANIM_BATTLER_TARGET, 2, 20, 0, 40, 1, 0, 0 - playsewithpan SE_W145C, SOUND_PAN_ATTACKER + playsewithpan SE_M_BUBBLE3, SOUND_PAN_ATTACKER delay 5 createsprite gBattleAnimSpriteTemplate_83DA2D0, ANIM_BATTLER_TARGET, 2, 20, 0, 40, 1, 24, 0 - playsewithpan SE_W145C, SOUND_PAN_ATTACKER + playsewithpan SE_M_BUBBLE3, SOUND_PAN_ATTACKER delay 5 createsprite gBattleAnimSpriteTemplate_83DA2D0, ANIM_BATTLER_TARGET, 2, 20, 0, 40, 1, -24, 0 - playsewithpan SE_W145C, SOUND_PAN_ATTACKER + playsewithpan SE_M_BUBBLE3, SOUND_PAN_ATTACKER delay 15 createvisualtask AnimTask_ShakeMon2, 5, 1, 2, 0, 10, 1 createvisualtask AnimTask_ShakeMon2, 5, 3, 2, 0, 10, 1 createvisualtask sub_80E1F8C, 2, 20, 2, 2, 0, 12, 31774 createsprite gBattleAnimSpriteTemplate_83DA31C, ANIM_BATTLER_TARGET, 2, 0, -22, 0, 15, 55 - playsewithpan SE_W145, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE, SOUND_PAN_TARGET delay 10 createsprite gBattleAnimSpriteTemplate_83DA31C, ANIM_BATTLER_TARGET, 2, -26, -24, 0, 15, 55 - playsewithpan SE_W145, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE, SOUND_PAN_TARGET delay 10 createsprite gBattleAnimSpriteTemplate_83DA31C, ANIM_BATTLER_TARGET, 2, 15, -27, 0, 15, 50 - playsewithpan SE_W145, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE, SOUND_PAN_TARGET delay 10 createsprite gBattleAnimSpriteTemplate_83DA31C, ANIM_BATTLER_TARGET, 2, -15, -17, 0, 10, 45 - playsewithpan SE_W145, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE, SOUND_PAN_TARGET delay 10 createsprite gBattleAnimSpriteTemplate_83DA31C, ANIM_BATTLER_TARGET, 2, 27, -22, 0, 15, 50 - playsewithpan SE_W145, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_BATTLER_DEF_PARTNER end @@ -6035,14 +6035,14 @@ Move_BONEMERANG: @ 81CFC54 monbg ANIM_BATTLER_DEF_PARTNER monbgprio_28 1 setalpha 12, 8 - playsewithpan SE_W155, SOUND_PAN_ATTACKER + playsewithpan SE_M_BONEMERANG, SOUND_PAN_ATTACKER createsprite gBonemerangSpriteTemplate, ANIM_BATTLER_ATTACKER, 2 delay 20 - playsewithpan SE_W030, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 1 createvisualtask AnimTask_ShakeMon, 5, 1, 5, 0, 5, 1 delay 17 - playsewithpan SE_W233, SOUND_PAN_ATTACKER + playsewithpan SE_M_VITAL_THROW, SOUND_PAN_ATTACKER createsprite gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 6, -4 waitforvisualfinish clearmonbg ANIM_BATTLER_DEF_PARTNER @@ -6055,13 +6055,13 @@ Move_BONE_CLUB: @ 81CFCA8 monbg ANIM_BATTLER_DEF_PARTNER monbgprio_28 1 setalpha 12, 8 - playsewithpan SE_W155, SOUND_PAN_TARGET + playsewithpan SE_M_BONEMERANG, SOUND_PAN_TARGET createsprite gBoneHitSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -42, -25, 0, 0, 15 delay 12 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 1 createvisualtask AnimTask_ShakeMon, 5, 1, 0, 5, 5, 1 createsprite gBattleAnimSpriteTemplate_83DB3DC, ANIM_BATTLER_ATTACKER, 2, 7, 5, 1, 0, 10, 0, 0 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_BATTLER_DEF_PARTNER blendoff @@ -6072,12 +6072,12 @@ Move_BONE_RUSH: @ 81CFD0A loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BATTLER_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W155, SOUND_PAN_TARGET + playsewithpan SE_M_BONEMERANG, SOUND_PAN_TARGET createsprite gBoneHitSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -42, -25, 0, 0, 15 delay 12 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon, 5, 1, 0, 3, 5, 1 - playsewithpan SE_W030, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_BATTLER_DEF_PARTNER blendoff @@ -6086,15 +6086,15 @@ Move_BONE_RUSH: @ 81CFD0A Move_SPIKES: @ 81CFD55 loadspritegfx ANIM_TAG_SPIKES monbg ANIM_BATTLER_DEF_PARTNER - playsewithpan SE_W026, SOUND_PAN_ATTACKER - waitplaysewithpan SE_W030, SOUND_PAN_TARGET, 28 + playsewithpan SE_M_JUMP_KICK, SOUND_PAN_ATTACKER + waitplaysewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET, 28 createsprite gBattleAnimSpriteTemplate_840227C, ANIM_BATTLER_TARGET, 2, 20, 0, 0, 24, 30 delay 10 - playsewithpan SE_W026, SOUND_PAN_ATTACKER - waitplaysewithpan SE_W030, SOUND_PAN_TARGET, 28 + playsewithpan SE_M_JUMP_KICK, SOUND_PAN_ATTACKER + waitplaysewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET, 28 createsprite gBattleAnimSpriteTemplate_840227C, ANIM_BATTLER_TARGET, 2, 20, 0, -24, 24, 30 delay 10 - waitplaysewithpan SE_W030, SOUND_PAN_TARGET, 28 + waitplaysewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET, 28 createsprite gBattleAnimSpriteTemplate_840227C, ANIM_BATTLER_TARGET, 2, 20, 0, 24, 24, 30 waitforvisualfinish clearmonbg ANIM_BATTLER_DEF_PARTNER @@ -6104,7 +6104,7 @@ Move_MEGAHORN: @ 81CFDAC loadspritegfx ANIM_TAG_HORN_HIT_2 loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BATTLER_DEF_PARTNER - playsewithpan SE_W082, SOUND_PAN_ATTACKER + playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER jumpifcontest _81CFE83 fadetobg BG_DRILL waitbgfadeout @@ -6119,7 +6119,7 @@ _81CFDCF: delay 3 createsprite gBattleAnimSpriteTemplate_83DAABC, ANIM_BATTLER_ATTACKER, 3, -42, 25, 0, 0, 6 delay 4 - playsewithpan SE_W011, SOUND_PAN_TARGET + playsewithpan SE_M_VICEGRIP, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 0 createsprite gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, -16, 4, 1, 4 waitforvisualfinish @@ -6150,13 +6150,13 @@ Move_GUST: @ 81CFE9A monbg ANIM_BATTLER_DEF_PARTNER monbgprio_28 1 setalpha 12, 8 - playsewithpan SE_W016, SOUND_PAN_TARGET + playsewithpan SE_M_GUST, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DA380, ANIM_BATTLER_ATTACKER, 2, 0, -16 createvisualtask sub_80DA09C, 5, 1, 70 waitforvisualfinish createvisualtask AnimTask_ShakeMon2, 5, 1, 1, 0, 7, 1 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 2 - playsewithpan SE_W016B, SOUND_PAN_TARGET + playsewithpan SE_M_GUST2, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_BATTLER_DEF_PARTNER blendoff @@ -6168,7 +6168,7 @@ Move_WING_ATTACK: @ 81CFEEB monbg ANIM_BATTLER_DEF_PARTNER monbgprio_28 1 setalpha 12, 8 - loopsewithpan SE_W017, SOUND_PAN_ATTACKER, 20, 2 + loopsewithpan SE_M_WING_ATTACK, SOUND_PAN_ATTACKER, 20, 2 createvisualtask AnimTask_TranslateMonElliptical, 2, ANIM_BATTLER_ATTACKER, 12, 4, 1, 4 createvisualtask sub_80DA09C, 5, 1, 70 createsprite gBattleAnimSpriteTemplate_83DA3B4, ANIM_BATTLER_ATTACKER, 2, -25, 0, 0, 0, 20 @@ -6178,7 +6178,7 @@ Move_WING_ATTACK: @ 81CFEEB delay 17 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 16, 0, 1, 1 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -16, 0, 1, 1 - loopsewithpan SE_W003, SOUND_PAN_TARGET, 5, 2 + loopsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET, 5, 2 waitforvisualfinish createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 11 waitforvisualfinish @@ -6188,7 +6188,7 @@ Move_WING_ATTACK: @ 81CFEEB Move_PECK: @ 81CFF88 loadspritegfx ANIM_TAG_IMPACT - playsewithpan SE_W030, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET createvisualtask sub_80A8EFC, 2, 3, -768, 1, 2 createsprite gBattleAnimSpriteTemplate_83DB538, ANIM_BATTLER_TARGET, 3, -12, 0, 1, 3 waitforvisualfinish @@ -6209,7 +6209,7 @@ Move_AEROBLAST: @ 81CFFAF call _81D000B waitforvisualfinish createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 0 - playsewithpan SE_W013, SOUND_PAN_TARGET + playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_BATTLER_DEF_PARTNER blendoff @@ -6217,19 +6217,19 @@ Move_AEROBLAST: @ 81CFFAF call Unknown_81D622B end _81D000B: - playsewithpan SE_W026, SOUND_PAN_ATTACKER + playsewithpan SE_M_JUMP_KICK, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83DA3E4, ANIM_BATTLER_ATTACKER, 2, 14, -12, 0, -12, 15, 0, 0 createsprite gBattleAnimSpriteTemplate_83DA3E4, ANIM_BATTLER_ATTACKER, 2, 26, 8, 12, 8, 15, 0, 0 delay 3 - playsewithpan SE_W026, SOUND_PAN_ATTACKER + playsewithpan SE_M_JUMP_KICK, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83DA3E4, ANIM_BATTLER_ATTACKER, 2, 14, -12, 0, -12, 15, 1, 0 createsprite gBattleAnimSpriteTemplate_83DA3E4, ANIM_BATTLER_ATTACKER, 2, 26, 8, 12, 8, 15, 1, 0 delay 3 - playsewithpan SE_W026, SOUND_PAN_ATTACKER + playsewithpan SE_M_JUMP_KICK, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83DA3E4, ANIM_BATTLER_ATTACKER, 2, 14, -12, 0, -12, 15, 2, 0 createsprite gBattleAnimSpriteTemplate_83DA3E4, ANIM_BATTLER_ATTACKER, 2, 26, 8, 12, 8, 15, 2, 0 delay 3 - playsewithpan SE_W026, SOUND_PAN_ATTACKER + playsewithpan SE_M_JUMP_KICK, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83DA3E4, ANIM_BATTLER_ATTACKER, 2, 14, -12, 0, -12, 15, 3, 0 createsprite gBattleAnimSpriteTemplate_83DA3E4, ANIM_BATTLER_ATTACKER, 2, 26, 8, 12, 8, 15, 3, 0 delay 3 @@ -6242,18 +6242,18 @@ Move_WATER_GUN: @ 81D00CC monbgprio_28 1 setalpha 12, 8 createsprite gBattleAnimSpriteTemplate_83D9318, ANIM_BATTLER_ATTACKER, 2, 20, 0, 0, 0, 40, -25 - playsewithpan SE_W145, SOUND_PAN_ATTACKER + playsewithpan SE_M_BUBBLE, SOUND_PAN_ATTACKER waitforvisualfinish createvisualtask AnimTask_ShakeMon2, 5, 1, 1, 0, 8, 1 createsprite gBattleAnimSpriteTemplate_83DB4D8, ANIM_BATTLER_ATTACKER, 4, 0, 0, 1, 2 createsprite gBattleAnimSpriteTemplate_83D9330, ANIM_BATTLER_ATTACKER, 2, 0, -15, 0, 15, 55 - playsewithpan SE_W152, SOUND_PAN_TARGET + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_TARGET delay 10 createsprite gBattleAnimSpriteTemplate_83D9330, ANIM_BATTLER_ATTACKER, 2, 15, -20, 0, 15, 50 - playsewithpan SE_W152, SOUND_PAN_TARGET + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_TARGET delay 10 createsprite gBattleAnimSpriteTemplate_83D9330, ANIM_BATTLER_ATTACKER, 2, -15, -10, 0, 10, 45 - playsewithpan SE_W152, SOUND_PAN_TARGET + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_BATTLER_DEF_PARTNER blendoff @@ -6265,7 +6265,7 @@ Move_CRABHAMMER: @ 81D0159 monbg ANIM_BATTLER_DEF_PARTNER setalpha 12, 8 createsprite gBattleAnimSpriteTemplate_83DB4D8, ANIM_BATTLER_ATTACKER, 4, 0, 0, 1, 0 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET delay 1 createsprite gBattleAnimSpriteTemplate_83DB3DC, ANIM_BATTLER_ATTACKER, 2, 31, 3, 1, 32429, 10, 0, 0 createsprite gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, -24, 0, 0, 4 @@ -6274,7 +6274,7 @@ Move_CRABHAMMER: @ 81D0159 waitforvisualfinish createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 0, 4 waitforvisualfinish - loopsewithpan SE_W152, SOUND_PAN_TARGET, 20, 3 + loopsewithpan SE_M_CRABHAMMER, SOUND_PAN_TARGET, 20, 3 createvisualtask AnimTask_ShakeMon, 5, 1, 0, 4, 8, 1 createsprite gBattleAnimSpriteTemplate_83D9348, ANIM_BATTLER_ATTACKER, 2, 10, 10, 20, 1 delay 4 @@ -6299,7 +6299,7 @@ Move_CRABHAMMER: @ 81D0159 Move_SURF: @ 81D0253 createvisualtask AnimTask_CreateSurfWave, 2, 0 delay 24 - panse_1B SE_W057, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0 + panse_1B SE_M_SURF, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0 waitforvisualfinish end @@ -6311,7 +6311,7 @@ Move_FLAMETHROWER: @ 81D0267 createvisualtask AnimTask_ShakeMon, 5, 0, 0, 2, 46, 1 delay 6 createvisualtask sub_80D3630, 5, 100 - panse_1B SE_W053, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0 + panse_1B SE_M_FLAMETHROWER, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0 call _81D02E1 call _81D02E1 call _81D02E1 @@ -6337,7 +6337,7 @@ _81D02E1: Move_SANDSTORM: @ 81D0304 loadspritegfx ANIM_TAG_FLYING_DIRT - playsewithpan SE_W201, 0 + playsewithpan SE_M_SANDSTORM, 0 createvisualtask do_boulder_dust, 5, 0 delay 16 createsprite gFlyingDirtSpriteTemplate, ANIM_BATTLER_ATTACKER, 40, 10, 2304, 96, 0 @@ -6362,7 +6362,7 @@ Move_WHIRLPOOL: @ 81D038C setalpha 12, 8 delay 0 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 0, 4, 2, 0, 7, rgb(0, 13, 23) - playsewithpan SE_W250, SOUND_PAN_TARGET + playsewithpan SE_M_WHIRLPOOL, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 5, 1, 0, 2, 50, 1 call _81D03E4 call _81D03E4 @@ -6395,18 +6395,18 @@ _81D047E: waitforvisualfinish end _81D0480: - playsewithpan SE_W019, SOUND_PAN_ATTACKER + playsewithpan SE_M_FLY, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83DA450, ANIM_BATTLER_ATTACKER, 2, 0, 0, 13, 336 goto _81D047E _81D0498: monbg ANIM_BATTLER_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W104, SOUND_PAN_ATTACKER + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83DA468, ANIM_BATTLER_ATTACKER, 2, 20 delay 20 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 0 createvisualtask AnimTask_ShakeMon, 5, 1, 6, 0, 8, 1 - playsewithpan SE_W013, SOUND_PAN_TARGET + playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_BATTLER_DEF_PARTNER blendoff @@ -6419,16 +6419,16 @@ Move_BOUNCE: @ 81D04D9 _81D04E8: end _81D04E9: - playsewithpan SE_W100, SOUND_PAN_ATTACKER + playsewithpan SE_M_TELEPORT, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83DA568, ANIM_BATTLER_ATTACKER, 2, 0, 0 goto _81D04E8 _81D04FD: monbg ANIM_BATTLER_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W207, SOUND_PAN_TARGET + playsewithpan SE_M_SWAGGER, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DA594, ANIM_BATTLER_TARGET, 3 delay 7 - playsewithpan SE_W025B, SOUND_PAN_TARGET + playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 2, 0, 0, 1, 0 createvisualtask AnimTask_ShakeMon, 5, 1, 0, 5, 11, 1 waitforvisualfinish @@ -6442,10 +6442,10 @@ Move_KARATE_CHOP: @ 81D053C monbg ANIM_BATTLER_DEF_PARTNER monbgprio_28 1 setalpha 12, 8 - playsewithpan SE_W104, SOUND_PAN_TARGET + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D9F78, ANIM_BATTLER_ATTACKER, 2, -16, 0, 0, 0, 10, 1, 3, 0 waitforvisualfinish - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon, 5, 1, 4, 0, 6, 1 waitforvisualfinish @@ -6458,11 +6458,11 @@ Move_CROSS_CHOP: @ 81D058E loadspritegfx ANIM_TAG_CROSS_IMPACT monbg ANIM_BATTLER_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W025, SOUND_PAN_TARGET + playsewithpan SE_M_MEGA_KICK, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D9FD8, ANIM_BATTLER_ATTACKER, 2, 0, 0, 0 createsprite gBattleAnimSpriteTemplate_83D9FD8, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1 delay 40 - playsewithpan SE_W013, SOUND_PAN_TARGET + playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DB3DC, ANIM_BATTLER_ATTACKER, 2, 31, 3, 1, 32767, 10, 0, 10 createsprite gBattleAnimSpriteTemplate_83DB520, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 20 createvisualtask AnimTask_ShakeMon, 5, 1, 7, 0, 9, 1 @@ -6479,11 +6479,11 @@ Move_JUMP_KICK: @ 81D05F7 createsprite gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 4, 4 delay 3 createsprite gBattleAnimSpriteTemplate_83D9F90, ANIM_BATTLER_ATTACKER, 2, -16, 8, 0, 0, 10, 1, 1, 1 - playsewithpan SE_W026, SOUND_PAN_TARGET + playsewithpan SE_M_JUMP_KICK, SOUND_PAN_TARGET waitforvisualfinish createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 1, 0, 0, 1, 1 createvisualtask AnimTask_ShakeMon, 5, 1, 5, 0, 7, 1 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_BATTLER_DEF_PARTNER blendoff @@ -6500,10 +6500,10 @@ Move_HI_JUMP_KICK: @ 81D0654 createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 3 delay 2 createsprite gBattleAnimSpriteTemplate_83D9F90, ANIM_BATTLER_ATTACKER, 2, -16, 8, 0, 0, 10, 1, 1, 1 - playsewithpan SE_W026, SOUND_PAN_TARGET + playsewithpan SE_M_JUMP_KICK, SOUND_PAN_TARGET waitforvisualfinish createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 1 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET createsprite gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, -28, 0, 0, 3 delay 3 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BATTLER_TARGET, 3, 0, 11, 1 @@ -6522,7 +6522,7 @@ Move_DOUBLE_KICK: @ 81D06EA setalpha 12, 8 createsprite gBattleAnimSpriteTemplate_83D9FC0, ANIM_BATTLER_ATTACKER, 3, 1, 20, 1 createvisualtask AnimTask_ShakeMon, 5, 1, 4, 0, 6, 1 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET waitforvisualfinish waitforvisualfinish clearmonbg ANIM_BATTLER_DEF_PARTNER @@ -6534,7 +6534,7 @@ Move_TRIPLE_KICK: @ 81D071D loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BATTLER_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET jumpifmoveturn 0, _81D0742 jumpifmoveturn 1, _81D0778 goto _81D07AE @@ -6567,26 +6567,26 @@ Move_DYNAMIC_PUNCH: @ 81D07E4 delay 1 monbg ANIM_BATTLER_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET createsprite gFistFootSpriteTemplate, ANIM_BATTLER_TARGET, 3, 0, 0, 20, 1, 0 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 2, 0, 0, 1, 0 createvisualtask AnimTask_ShakeMon, 5, 1, 5, 0, 7, 1 delay 1 waitsound - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon2, 5, 1, 5, 0, 28, 1 createsprite gBattleAnimSpriteTemplate_83D7828, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 1 delay 6 - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D7828, ANIM_BATTLER_ATTACKER, 3, 24, -24, 1, 1 delay 6 - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D7828, ANIM_BATTLER_ATTACKER, 3, -16, 16, 1, 1 delay 6 - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D7828, ANIM_BATTLER_ATTACKER, 3, -24, -12, 1, 1 delay 6 - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D7828, ANIM_BATTLER_ATTACKER, 3, 16, 16, 1, 1 waitforvisualfinish clearmonbg ANIM_BATTLER_DEF_PARTNER @@ -6599,23 +6599,23 @@ Move_COUNTER: @ 81D08AC monbg ANIM_BATTLER_DEF_PARTNER setalpha 12, 8 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_BATTLER_ATTACKER, 18, 6, 1, 4 - playsewithpan SE_W233, SOUND_PAN_ATTACKER + playsewithpan SE_M_VITAL_THROW, SOUND_PAN_ATTACKER waitforvisualfinish createsprite gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 20, 0, 0, 4 delay 4 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -15, 18, 1, 0 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET delay 1 createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 5, 0, 25, 1 createsprite gFistFootSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, -15, 18, 8, 1, 0 delay 3 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, -4, 1, 0 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET delay 1 createsprite gFistFootSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 0, -4, 8, 1, 0 delay 3 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 15, 9, 1, 0 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET delay 1 createsprite gFistFootSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 15, 9, 8, 1, 0 delay 5 @@ -6629,13 +6629,13 @@ Move_VITAL_THROW: @ 81D097B loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BATTLER_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W233, SOUND_PAN_ATTACKER + playsewithpan SE_M_VITAL_THROW, SOUND_PAN_ATTACKER createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_BATTLER_ATTACKER, 12, 4, 1, 2 waitforvisualfinish createsprite gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 20, 0, 0, 4 delay 2 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 1 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET delay 1 createsprite gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, -24, 0, 0, 4 waitforvisualfinish @@ -6657,10 +6657,10 @@ Move_ROCK_SMASH: @ 81D09F6 delay 1 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 1 createsprite gFistFootSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 8, 1, 0 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 3, 0, 5, 1 waitforvisualfinish - playsewithpan SE_W088, SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DAC64, ANIM_BATTLER_ATTACKER, 2, 0, 0, 20, 24, 14, 2 createsprite gBattleAnimSpriteTemplate_83DAC64, ANIM_BATTLER_ATTACKER, 2, 5, 0, -20, 24, 14, 1 createsprite gBattleAnimSpriteTemplate_83DAC64, ANIM_BATTLER_ATTACKER, 2, 0, 5, 20, -24, 14, 2 @@ -6679,16 +6679,16 @@ Move_SUBMISSION: @ 81D0AEE loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BATTLER_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W104, SOUND_PAN_ATTACKER - waitplaysewithpan SE_W004, SOUND_PAN_TARGET, 10 - waitplaysewithpan SE_W104, SOUND_PAN_ATTACKER, 20 - waitplaysewithpan SE_W004, SOUND_PAN_TARGET, 30 - waitplaysewithpan SE_W104, SOUND_PAN_ATTACKER, 40 - waitplaysewithpan SE_W004, SOUND_PAN_TARGET, 50 - waitplaysewithpan SE_W104, SOUND_PAN_ATTACKER, 60 - waitplaysewithpan SE_W004, SOUND_PAN_TARGET, 70 - waitplaysewithpan SE_W104, SOUND_PAN_ATTACKER, 80 - waitplaysewithpan SE_W004, SOUND_PAN_TARGET, 90 + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER + waitplaysewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET, 10 + waitplaysewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER, 20 + waitplaysewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET, 30 + waitplaysewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER, 40 + waitplaysewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET, 50 + waitplaysewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER, 60 + waitplaysewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET, 70 + waitplaysewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER, 80 + waitplaysewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET, 90 createvisualtask AnimTask_TranslateMonElliptical, 2, ANIM_BATTLER_ATTACKER, -18, 6, 6, 4 createvisualtask AnimTask_TranslateMonElliptical, 2, ANIM_BATTLER_TARGET, 18, 6, 6, 4 call _81D0B5D @@ -6713,7 +6713,7 @@ Move_SUNNY_DAY: @ 81D0B91 setalpha 13, 3 createvisualtask sub_80E2A38, 10, 1921, 1, 0, 6, 32767 waitforvisualfinish - panse_26 SE_W080, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 1, 0 + panse_26 SE_M_PETAL_DANCE, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 1, 0 call _81D0BDD call _81D0BDD call _81D0BDD @@ -6733,7 +6733,7 @@ Move_COTTON_SPORE: @ 81D0BE7 loadspritegfx ANIM_TAG_SPORE monbg ANIM_BATTLER_DEF_PARTNER monbgprio_28 1 - loopsewithpan SE_W077, SOUND_PAN_TARGET, 18, 10 + loopsewithpan SE_M_POISON_POWDER, SOUND_PAN_TARGET, 18, 10 call _81D0C07 call _81D0C07 call _81D0C07 @@ -6754,7 +6754,7 @@ Move_SPORE: @ 81D0C41 monbg ANIM_BATTLER_DEF_PARTNER setalpha 12, 8 createvisualtask sub_80CACEC, 2 - loopsewithpan SE_W077, SOUND_PAN_TARGET, 16, 11 + loopsewithpan SE_M_POISON_POWDER, SOUND_PAN_TARGET, 16, 11 call _81D0C6C call _81D0C6C call _81D0C6C @@ -6777,7 +6777,7 @@ Move_PETAL_DANCE: @ 81D0CA6 loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BATTLER_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W080, SOUND_PAN_ATTACKER + playsewithpan SE_M_PETAL_DANCE, SOUND_PAN_ATTACKER createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_BATTLER_ATTACKER, 12, 6, 6, 3 createsprite gBattleAnimSpriteTemplate_83D6428, ANIM_BATTLER_ATTACKER, 2, 0, -24, 8, 140 createsprite gBattleAnimSpriteTemplate_83D6440, ANIM_BATTLER_ATTACKER, 2, 16, -24, 8, 100 @@ -6799,7 +6799,7 @@ Move_PETAL_DANCE: @ 81D0CA6 waitforvisualfinish createsprite gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 24, 0, 0, 5 delay 3 - playsewithpan SE_W025B, SOUND_PAN_TARGET + playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 0 createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 6, 0, 8, 1 waitforvisualfinish @@ -6817,7 +6817,7 @@ Move_RAZOR_LEAF: @ 81D0DDE monbg ANIM_BATTLER_DEF_PARTNER setalpha 12, 8 delay 1 - loopsewithpan SE_W077, SOUND_PAN_ATTACKER, 10, 5 + loopsewithpan SE_M_POISON_POWDER, SOUND_PAN_ATTACKER, 10, 5 createsprite gBattleAnimSpriteTemplate_83D649C, ANIM_BATTLER_ATTACKER, 2, -3, -2, 10 delay 2 createsprite gBattleAnimSpriteTemplate_83D649C, ANIM_BATTLER_ATTACKER, 2, -1, -1, 15 @@ -6838,11 +6838,11 @@ Move_RAZOR_LEAF: @ 81D0DDE delay 2 createsprite gBattleAnimSpriteTemplate_83D649C, ANIM_BATTLER_ATTACKER, 2, -3, -5, 8 delay 60 - playsewithpan SE_W013B, SOUND_PAN_ATTACKER + playsewithpan SE_M_RAZOR_WIND2, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D64E4, ANIM_BATTLER_TARGET, 3, 20, -10, 20, 0, 22, 20, 1 createsprite gBattleAnimSpriteTemplate_83D64E4, ANIM_BATTLER_TARGET, 3, 20, -10, 20, 0, 22, -20, 1 delay 20 - playsewithpan SE_W013, SOUND_PAN_TARGET + playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 8, 1 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_DEF_PARTNER, 2, 0, 8, 1 waitforvisualfinish @@ -6863,7 +6863,7 @@ Move_ANCIENT_POWER: @ 81D0EE5 createsprite gAncientPowerRockSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 20, 32, -28, 60, 1 createsprite gAncientPowerRockSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 32, -28, 30, 4 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_ATTACKER, 1, 0, 30, 1 - playsewithpan SE_W082, SOUND_PAN_ATTACKER + playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER delay 10 createsprite gAncientPowerRockSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 15, 32, -48, 25, 5 createsprite gAncientPowerRockSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -10, 32, -42, 30, 4 @@ -6873,7 +6873,7 @@ Move_ANCIENT_POWER: @ 81D0EE5 waitforvisualfinish createsprite gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 16, 0, 0, 4 delay 3 - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 1 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 3, 0, 6, 1 waitforvisualfinish @@ -6886,10 +6886,10 @@ Move_ANCIENT_POWER: @ 81D0EE5 Move_OCTAZOOKA: @ 81D100D loadspritegfx ANIM_TAG_GRAY_SMOKE loadspritegfx ANIM_TAG_BLACK_BALL - playsewithpan SE_W025B, SOUND_PAN_ATTACKER + playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D6F08, ANIM_BATTLER_TARGET, 2, 20, 0, 0, 0, 20, 0 waitforvisualfinish - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D6F3C, ANIM_BATTLER_TARGET, 2, 8, 8, 1, 0 delay 2 createsprite gBattleAnimSpriteTemplate_83D6F3C, ANIM_BATTLER_TARGET, 2, -8, -8, 1, 0 @@ -6904,7 +6904,7 @@ Move_MIST: @ 81D1073 loadspritegfx ANIM_TAG_MIST_CLOUD monbg ANIM_BATTLER_ATK_PARTNER setalpha 12, 8 - loopsewithpan SE_W054, SOUND_PAN_ATTACKER, 20, 15 + loopsewithpan SE_M_MIST, SOUND_PAN_ATTACKER, 20, 15 call _81D10BE call _81D10BE call _81D10BE @@ -6925,7 +6925,7 @@ _81D10BE: Move_HAZE: @ 81D10D4 waitforvisualfinish - playsewithpan SE_W114, 0 + playsewithpan SE_M_HAZE, 0 createvisualtask AnimTask_Haze1, 5 delay 30 createvisualtask sub_80E2A38, 10, 1920, 2, 0, 16, 0 @@ -6944,14 +6944,14 @@ Move_FIRE_PUNCH: @ 81D1107 createsprite gBattleAnimSpriteTemplate_83D9478, ANIM_BATTLER_TARGET, 1, 64 createsprite gBattleAnimSpriteTemplate_83D9478, ANIM_BATTLER_TARGET, 1, 128 createsprite gBattleAnimSpriteTemplate_83D9478, ANIM_BATTLER_TARGET, 1, 196 - playsewithpan SE_W172, SOUND_PAN_TARGET + playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_TARGET waitforvisualfinish createsprite gFistFootSpriteTemplate, ANIM_BATTLER_TARGET, 3, 0, 0, 8, 1, 0 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 2, 0, 0, 1, 1 createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 0, 3, 15, 1 call _81D11A2 delay 4 - playsewithpan SE_W007, SOUND_PAN_TARGET + playsewithpan SE_M_FIRE_PUNCH, SOUND_PAN_TARGET waitforvisualfinish createvisualtask sub_80E2A38, 10, 4, 0, 9, 0, 31 waitforvisualfinish @@ -6973,7 +6973,7 @@ Move_LEER: @ 81D121A monbg ANIM_BATTLER_ATTACKER monbgprio_28 0 setalpha 8, 8 - playsewithpan SE_W043, SOUND_PAN_ATTACKER + playsewithpan SE_M_LEER, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_84022B0, ANIM_BATTLER_ATTACKER, 2, 24, -12 createvisualtask AnimTask_ScaleMonAndRestore, 5, -5, -5, 10, ANIM_BATTLER_ATTACKER, 1 waitforvisualfinish @@ -6992,10 +6992,10 @@ Move_DREAM_EATER: @ 81D1271 loadspritegfx ANIM_TAG_BLUE_STAR monbg ANIM_BATTLER_DEF_PARTNER monbgprio_2A ANIM_BATTLER_TARGET - playsewithpan SE_W060, SOUND_PAN_ATTACKER + playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER call SetPsychicBackground setalpha 8, 8 - playsewithpan SE_W107, SOUND_PAN_TARGET + playsewithpan SE_M_MINIMIZE, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 5, 0, 15, 1 createvisualtask AnimTask_ScaleMonAndRestore, 5, -6, -6, 15, ANIM_BATTLER_TARGET, 1 waitforvisualfinish @@ -7012,42 +7012,42 @@ Move_DREAM_EATER: @ 81D1271 call BackgroundRestore end _81D12DB: - playsewithpan SE_W207, SOUND_PAN_TARGET + playsewithpan SE_M_SWAGGER, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 0, 5, 8, 26 createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 5, -18, -40, 35 createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, -10, 20, 20, 39 delay 4 - playsewithpan SE_W207, SOUND_PAN_TARGET + playsewithpan SE_M_SWAGGER, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 0, 5, 28, 26 createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 10, -5, -8, 26 createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, -10, 20, 40, 39 delay 4 - playsewithpan SE_W207, SOUND_PAN_TARGET + playsewithpan SE_M_SWAGGER, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 10, -5, -8, 26 createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, -5, 15, 16, 33 createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 10, -5, -32, 26 delay 4 - playsewithpan SE_W207, SOUND_PAN_TARGET + playsewithpan SE_M_SWAGGER, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 0, -15, -16, 36 createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 0, 5, 8, 26 createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 10, -5, -8, 26 delay 4 - playsewithpan SE_W207, SOUND_PAN_TARGET + playsewithpan SE_M_SWAGGER, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, -5, 15, 16, 33 createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 0, -15, -16, 36 createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 0, 5, 8, 26 delay 4 - playsewithpan SE_W207, SOUND_PAN_TARGET + playsewithpan SE_M_SWAGGER, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 0, 5, 8, 26 createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, -5, 15, 16, 33 createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 10, -5, -40, 26 delay 4 - playsewithpan SE_W207, SOUND_PAN_TARGET + playsewithpan SE_M_SWAGGER, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, -5, 15, 36, 33 createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 10, -5, -8, 26 createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, -10, 20, 20, 39 delay 4 - playsewithpan SE_W207, SOUND_PAN_TARGET + playsewithpan SE_M_SWAGGER, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 0, 5, 8, 26 createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 0, 5, 8, 26 createsprite gBattleAnimSpriteTemplate_83D637C, ANIM_BATTLER_ATTACKER, 3, 5, -18, -20, 35 @@ -7062,25 +7062,25 @@ Move_POISON_GAS: @ 81D1474 monbgprio_29 setalpha 12, 8 delay 0 - playsewithpan SE_W054, SOUND_PAN_ATTACKER + playsewithpan SE_M_MIST, SOUND_PAN_ATTACKER createsprite gPoisonGasCloudSpriteTemplate, ANIM_BATTLER_TARGET, 0, 64, 0, 0, -32, -6, 4192, 1072, 0 delay 4 - playsewithpan SE_W054, SOUND_PAN_ATTACKER + playsewithpan SE_M_MIST, SOUND_PAN_ATTACKER createsprite gPoisonGasCloudSpriteTemplate, ANIM_BATTLER_TARGET, 0, 64, 0, 0, -32, -6, 4192, 1072, 0 delay 4 - playsewithpan SE_W054, SOUND_PAN_ATTACKER + playsewithpan SE_M_MIST, SOUND_PAN_ATTACKER createsprite gPoisonGasCloudSpriteTemplate, ANIM_BATTLER_TARGET, 0, 64, 0, 0, -32, -6, 4192, 1072, 0 delay 4 - playsewithpan SE_W054, SOUND_PAN_ATTACKER + playsewithpan SE_M_MIST, SOUND_PAN_ATTACKER createsprite gPoisonGasCloudSpriteTemplate, ANIM_BATTLER_TARGET, 0, 64, 0, 0, -32, -6, 4192, 1072, 0 delay 4 - playsewithpan SE_W054, SOUND_PAN_ATTACKER + playsewithpan SE_M_MIST, SOUND_PAN_ATTACKER createsprite gPoisonGasCloudSpriteTemplate, ANIM_BATTLER_TARGET, 0, 64, 0, 0, -32, -6, 4192, 1072, 0 delay 4 - playsewithpan SE_W054, SOUND_PAN_ATTACKER + playsewithpan SE_M_MIST, SOUND_PAN_ATTACKER createsprite gPoisonGasCloudSpriteTemplate, ANIM_BATTLER_TARGET, 0, 64, 0, 0, -32, -6, 4192, 1072, 0 delay 40 - loopsewithpan SE_W054, SOUND_PAN_TARGET, 28, 6 + loopsewithpan SE_M_MIST, SOUND_PAN_TARGET, 28, 6 createvisualtask sub_80E1F8C, 2, 4, 6, 2, 0, 12, 26650 waitforvisualfinish blendoff @@ -7092,7 +7092,7 @@ Move_BIND: @ 81D1552 createvisualtask AnimTask_SwayMon, 5, 0, 6, 3328, 4, 0 goto _81D1568 _81D1568: - playsewithpan SE_W020, SOUND_PAN_TARGET + playsewithpan SE_M_BIND, SOUND_PAN_TARGET call _81D1578 call _81D1578 waitforvisualfinish @@ -7108,7 +7108,7 @@ Move_WRAP: @ 81D158C Move_PSYBEAM: @ 81D15A2 loadspritegfx ANIM_TAG_GOLD_RING - playsewithpan SE_W060, SOUND_PAN_ATTACKER + playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER call SetPsychicBackground createsoundtask sub_812B058, 200, -64, 63, 3, 4, 0, 15 call _81D1626 @@ -7145,7 +7145,7 @@ Move_HYPNOSIS: @ 81D163C call BackgroundRestore end _81D166F: - playsewithpan SE_W048, SOUND_PAN_ATTACKER + playsewithpan SE_M_SUPERSONIC, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83DA784, ANIM_BATTLER_TARGET, 2, 0, 8, 0, 8, 27, 0 createsprite gBattleAnimSpriteTemplate_83DA784, ANIM_BATTLER_TARGET, 2, 16, -8, 0, -8, 27, 0 delay 6 @@ -7153,7 +7153,7 @@ _81D166F: Move_PSYWAVE: @ 81D169C loadspritegfx ANIM_TAG_BLUE_RING - playsewithpan SE_W060, SOUND_PAN_ATTACKER + playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER call SetPsychicBackground createvisualtask sub_80D3630, 5, 100 createsoundtask sub_812B058, 203, -64, 63, 2, 9, 0, 10 @@ -7178,7 +7178,7 @@ _81D16FF: Move_ZAP_CANNON: @ 81D1722 loadspritegfx ANIM_TAG_BLACK_BALL_2 loadspritegfx ANIM_TAG_SPARK_2 - playsewithpan SE_W086, SOUND_PAN_ATTACKER + playsewithpan SE_M_THUNDER_WAVE, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D9874, ANIM_BATTLER_TARGET, 3, 10, 0, 0, 0, 30, 0 createsprite gBattleAnimSpriteTemplate_83D98A0, ANIM_BATTLER_TARGET, 4, 10, 0, 16, 30, 0, 40, 0 createsprite gBattleAnimSpriteTemplate_83D98A0, ANIM_BATTLER_TARGET, 4, 10, 0, 16, 30, 64, 40, 1 @@ -7191,7 +7191,7 @@ Move_ZAP_CANNON: @ 81D1722 waitforvisualfinish createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 4, 0, 5, 1 delay 15 - waitplaysewithpan SE_W085B, SOUND_PAN_TARGET, 19 + waitplaysewithpan SE_M_THUNDERBOLT2, SOUND_PAN_TARGET, 19 call ElectricityEffect waitforvisualfinish end @@ -7199,13 +7199,13 @@ Move_ZAP_CANNON: @ 81D1722 Move_STEEL_WING: @ 81D1807 loadspritegfx ANIM_TAG_GUST loadspritegfx ANIM_TAG_IMPACT - loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 28, 2 + loopsewithpan SE_M_HARDEN, SOUND_PAN_ATTACKER, 28, 2 createvisualtask sub_80E0A4C, 5, 0, 0, 0 waitforvisualfinish monbg ANIM_BATTLER_DEF_PARTNER monbgprio_28 1 setalpha 12, 8 - loopsewithpan SE_W017, SOUND_PAN_ATTACKER, 20, 2 + loopsewithpan SE_M_WING_ATTACK, SOUND_PAN_ATTACKER, 20, 2 createvisualtask AnimTask_TranslateMonElliptical, 2, ANIM_BATTLER_ATTACKER, 12, 4, 1, 4 createvisualtask sub_80DA09C, 5, 1, 70 createsprite gBattleAnimSpriteTemplate_83DA3B4, ANIM_BATTLER_ATTACKER, 2, -25, 0, 0, 0, 20 @@ -7215,7 +7215,7 @@ Move_STEEL_WING: @ 81D1807 delay 17 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 16, 0, 1, 1 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -16, 0, 1, 1 - playsewithpan SE_W013, SOUND_PAN_TARGET + playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET waitforvisualfinish createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 11 waitforvisualfinish @@ -7225,7 +7225,7 @@ Move_STEEL_WING: @ 81D1807 Move_IRON_TAIL: @ 81D18B6 loadspritegfx ANIM_TAG_IMPACT - loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 28, 2 + loopsewithpan SE_M_HARDEN, SOUND_PAN_ATTACKER, 28, 2 createvisualtask sub_80E0A4C, 5, 1, 0, 0 waitforvisualfinish monbg ANIM_BATTLER_TARGET @@ -7234,7 +7234,7 @@ Move_IRON_TAIL: @ 81D18B6 delay 6 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 2, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 3, 0, 6, 1 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET waitforvisualfinish createvisualtask sub_80E0E24, 5, 0, 1 clearmonbg ANIM_BATTLER_TARGET @@ -7245,7 +7245,7 @@ Move_IRON_TAIL: @ 81D18B6 Move_POISON_TAIL: @ 81D1914 loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_POISON_BUBBLE - loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 28, 2 + loopsewithpan SE_M_HARDEN, SOUND_PAN_ATTACKER, 28, 2 createvisualtask sub_80E0A4C, 5, 1, 1, 23768 waitforvisualfinish monbg ANIM_BATTLER_TARGET @@ -7254,7 +7254,7 @@ Move_POISON_TAIL: @ 81D1914 delay 6 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 2, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 3, 0, 6, 1 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET waitforvisualfinish createvisualtask sub_80E0E24, 5, 0, 1 clearmonbg ANIM_BATTLER_TARGET @@ -7265,19 +7265,19 @@ Move_POISON_TAIL: @ 81D1914 Move_METAL_CLAW: @ 81D197A loadspritegfx ANIM_TAG_CLAW_SLASH - loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 28, 2 + loopsewithpan SE_M_HARDEN, SOUND_PAN_ATTACKER, 28, 2 createvisualtask sub_80E0A4C, 5, 0, 0, 0 waitforvisualfinish createsprite gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 6, 4 delay 2 - playsewithpan SE_W013, SOUND_PAN_TARGET + playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DB288, ANIM_BATTLER_TARGET, 2, -10, -10, 0 createsprite gBattleAnimSpriteTemplate_83DB288, ANIM_BATTLER_TARGET, 2, -10, 10, 0 createsprite gBattleAnimSpriteTemplate_83DB428, ANIM_BATTLER_ATTACKER, 2, -4, 1, 10, 3, 1 delay 8 createsprite gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 6, 4 delay 2 - playsewithpan SE_W013, SOUND_PAN_TARGET + playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DB288, ANIM_BATTLER_TARGET, 2, 10, -10, 1 createsprite gBattleAnimSpriteTemplate_83DB288, ANIM_BATTLER_TARGET, 2, 10, 10, 1 createsprite gBattleAnimSpriteTemplate_83DB428, ANIM_BATTLER_ATTACKER, 2, -4, 1, 10, 3, 1 @@ -7287,11 +7287,11 @@ Move_METAL_CLAW: @ 81D197A Move_NIGHT_SHADE: @ 81D1A0D monbg ANIM_BATTLER_ATTACKER monbgprio_28 0 - playsewithpan SE_W060, SOUND_PAN_ATTACKER + playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER fadetobg BG_GHOST waitbgfadein delay 10 - playsewithpan SE_W043, SOUND_PAN_ATTACKER + playsewithpan SE_M_LEER, SOUND_PAN_ATTACKER createvisualtask sub_80DDDF0, 5, 85 delay 70 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 12, 1 @@ -7306,24 +7306,24 @@ Move_NIGHT_SHADE: @ 81D1A0D Move_EGG_BOMB: @ 81D1A55 loadspritegfx ANIM_TAG_EXPLOSION loadspritegfx ANIM_TAG_LARGE_FRESH_EGG - playsewithpan SE_W039, SOUND_PAN_ATTACKER + playsewithpan SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D7594, ANIM_BATTLER_TARGET, 2, 10, 0, 0, 0, 25, -32 waitforvisualfinish createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 4, 0, 16, 1 createsprite gBattleAnimSpriteTemplate_83D7828, ANIM_BATTLER_TARGET, 4, 6, 5, 1, 0 - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET delay 3 createsprite gBattleAnimSpriteTemplate_83D7828, ANIM_BATTLER_TARGET, 4, -16, -15, 1, 0 - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET delay 3 createsprite gBattleAnimSpriteTemplate_83D7828, ANIM_BATTLER_TARGET, 4, 16, -5, 1, 0 - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET delay 3 createsprite gBattleAnimSpriteTemplate_83D7828, ANIM_BATTLER_TARGET, 4, -12, 18, 1, 0 - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET delay 3 createsprite gBattleAnimSpriteTemplate_83D7828, ANIM_BATTLER_TARGET, 4, 0, 5, 1, 0 - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET delay 3 waitforvisualfinish end @@ -7336,7 +7336,7 @@ Move_SHADOW_BALL: @ 81D1AEF createsoundtask sub_812B058, 168, -64, 63, 5, 5, 0, 5 createsprite gShadowBallSpriteTemplate, ANIM_BATTLER_TARGET, 2, 16, 16, 8 waitforvisualfinish - playsewithpan SE_W028, SOUND_PAN_TARGET + playsewithpan SE_M_SAND_ATTACK, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 4, 0, 8, 1 waitforvisualfinish restorebg @@ -7346,7 +7346,7 @@ Move_SHADOW_BALL: @ 81D1AEF Move_LICK: @ 81D1B32 loadspritegfx ANIM_TAG_LICK delay 15 - playsewithpan SE_W122, SOUND_PAN_TARGET + playsewithpan SE_M_LICK, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DAEDC, ANIM_BATTLER_TARGET, 2, 0, 0 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 1, 0, 16, 1 waitforvisualfinish @@ -7354,7 +7354,7 @@ Move_LICK: @ 81D1B32 Move_FOCUS_ENERGY: @ 81D1B59 loadspritegfx ANIM_TAG_FOCUS_ENERGY - playsewithpan SE_W082, SOUND_PAN_ATTACKER + playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER call EndureFlamesAnim delay 8 createvisualtask sub_80E1F8C, 2, 2, 2, 2, 0, 11, 32767 @@ -7369,7 +7369,7 @@ Move_BIDE: @ 81D1B99 choosetwoturnanim _81D1BA3, _81D1BCF end _81D1BA3: - loopsewithpan SE_W036, SOUND_PAN_ATTACKER, 9, 2 + loopsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER, 9, 2 createvisualtask sub_80E1F8C, 2, 2, 2, 2, 0, 11, 31 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_ATTACKER, 1, 0, 32, 1 waitforvisualfinish @@ -7378,7 +7378,7 @@ _81D1BCF: loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BATTLER_DEF_PARTNER setalpha 12, 8 - loopsewithpan SE_W036, SOUND_PAN_ATTACKER, 9, 2 + loopsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER, 9, 2 createvisualtask sub_80E2A38, 10, 2, 2, 0, 11, 31 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_ATTACKER, 1, 0, 32, 1 waitforvisualfinish @@ -7386,13 +7386,13 @@ _81D1BCF: waitforvisualfinish createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BATTLER_ATTACKER, 2, 0, 12, 1 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 3, 0, 16, 1 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 1, 18, -8, 1, 1 delay 5 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 1, -18, 8, 1, 1 delay 5 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 1, -8, -5, 1, 1 waitforvisualfinish delay 5 @@ -7411,7 +7411,7 @@ Move_STRING_SHOT: @ 81D1C98 delay 0 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 5, 1, 2, 0, 9, rgb(0, 0, 0) waitforvisualfinish - loopsewithpan SE_W081, SOUND_PAN_ATTACKER, 9, 6 + loopsewithpan SE_M_STRING_SHOT, SOUND_PAN_ATTACKER, 9, 6 call _81D1D56 call _81D1D56 call _81D1D56 @@ -7431,7 +7431,7 @@ Move_STRING_SHOT: @ 81D1C98 call _81D1D56 call _81D1D56 waitforvisualfinish - playsewithpan SE_W081B, SOUND_PAN_TARGET + playsewithpan SE_M_STRING_SHOT2, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DAB40, ANIM_BATTLER_TARGET, 2, 0, 10 delay 4 createsprite gBattleAnimSpriteTemplate_83DAB40, ANIM_BATTLER_TARGET, 2, 0, -2 @@ -7456,7 +7456,7 @@ Move_SPIDER_WEB: @ 81D1D6A createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 5, 1, 2, 0, 9, rgb(0, 0, 0) waitforvisualfinish monbgprio_28 1 - loopsewithpan SE_W081, SOUND_PAN_ATTACKER, 9, 6 + loopsewithpan SE_M_STRING_SHOT, SOUND_PAN_ATTACKER, 9, 6 call _81D1DF7 call _81D1DF7 call _81D1DF7 @@ -7472,7 +7472,7 @@ Move_SPIDER_WEB: @ 81D1D6A call _81D1DF7 call _81D1DF7 waitforvisualfinish - playsewithpan SE_W081B, SOUND_PAN_TARGET + playsewithpan SE_M_STRING_SHOT2, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DAB74, ANIM_BATTLER_ATTACKER, 2 waitforvisualfinish clearmonbg ANIM_BATTLER_DEF_PARTNER @@ -7491,28 +7491,28 @@ _81D1E14: end _81D1E16: loadspritegfx ANIM_TAG_GUST - playsewithpan SE_W016, SOUND_PAN_ATTACKER + playsewithpan SE_M_GUST, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D765C, ANIM_BATTLER_ATTACKER, 2, 32, 0, 16, 16, 0, 7, 40 createsprite gBattleAnimSpriteTemplate_83D765C, ANIM_BATTLER_ATTACKER, 2, 32, 0, 16, 16, 85, 7, 40 createsprite gBattleAnimSpriteTemplate_83D765C, ANIM_BATTLER_ATTACKER, 2, 32, 0, 16, 16, 170, 7, 40 waitforvisualfinish - playsewithpan SE_W016B, SOUND_PAN_ATTACKER + playsewithpan SE_M_GUST2, SOUND_PAN_ATTACKER goto _81D1E14 _81D1E66: loadspritegfx ANIM_TAG_AIR_WAVE_2 loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BATTLER_TARGET setalpha 12, 8 - playsewithpan SE_W013B, SOUND_PAN_ATTACKER + playsewithpan SE_M_RAZOR_WIND2, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83DA3E4, ANIM_BATTLER_ATTACKER, 2, 14, 8, 0, 0, 22, 2, 1 delay 2 - playsewithpan SE_W013B, SOUND_PAN_ATTACKER + playsewithpan SE_M_RAZOR_WIND2, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83DA3E4, ANIM_BATTLER_ATTACKER, 2, 14, -8, 16, 14, 22, 1, 1 delay 2 - playsewithpan SE_W013B, SOUND_PAN_ATTACKER + playsewithpan SE_M_RAZOR_WIND2, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83DA3E4, ANIM_BATTLER_ATTACKER, 2, 14, 12, -16, -14, 22, 0, 1 delay 17 - playsewithpan SE_W013, SOUND_PAN_TARGET + playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 10, 1 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_DEF_PARTNER, 2, 0, 10, 1 waitforvisualfinish @@ -7525,11 +7525,11 @@ Move_DISABLE: @ 81D1EF1 monbg ANIM_BATTLER_TARGET monbgprio_28 1 setalpha 8, 8 - playsewithpan SE_W197, SOUND_PAN_ATTACKER + playsewithpan SE_M_DETECT, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83930F4, ANIM_BATTLER_ATTACKER, 13, 24, -16 waitforvisualfinish createvisualtask sub_80D03C4, 5 - loopsewithpan SE_W020, SOUND_PAN_TARGET, 15, 4 + loopsewithpan SE_M_BIND, SOUND_PAN_TARGET, 15, 4 waitforvisualfinish delay 1 clearmonbg ANIM_BATTLER_TARGET @@ -7541,7 +7541,7 @@ Move_RECOVER: @ 81D1F1F loadspritegfx ANIM_TAG_BLUE_STAR monbg ANIM_BATTLER_ATK_PARTNER setalpha 12, 8 - loopsewithpan SE_W025, SOUND_PAN_ATTACKER, 13, 3 + loopsewithpan SE_M_MEGA_KICK, SOUND_PAN_ATTACKER, 13, 3 createvisualtask sub_80E1F8C, 2, 2, 0, 6, 0, 11, 12287 call _81D1F5F call _81D1F5F @@ -7574,14 +7574,14 @@ Move_MIMIC: @ 81D1FC9 loadspritegfx ANIM_TAG_ORBS monbg_22 ANIM_BATTLER_DEF_PARTNER setalpha 11, 5 - panse_1B SE_W107, SOUND_PAN_TARGET, SOUND_PAN_ATTACKER, 253, 0 + panse_1B SE_M_MINIMIZE, SOUND_PAN_TARGET, SOUND_PAN_ATTACKER, 253, 0 createvisualtask sub_80CB340, 5, 128, 24 delay 15 createsprite gBattleAnimSpriteTemplate_83D65E8, ANIM_BATTLER_TARGET, 2, -12, 24 delay 10 setarg ARG_RET_ID, -1 waitforvisualfinish - playsewithpan SE_W036, SOUND_PAN_ATTACKER + playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER createvisualtask sub_80E1F8C, 2, 2, 0, 2, 0, 11, 32767 waitforvisualfinish clearmonbg_23 ANIM_BATTLER_DEF_PARTNER @@ -7590,7 +7590,7 @@ Move_MIMIC: @ 81D1FC9 Move_CONSTRICT: @ 81D2013 loadspritegfx ANIM_TAG_TENDRILS - loopsewithpan SE_W010, SOUND_PAN_TARGET, 6, 4 + loopsewithpan SE_M_SCRATCH, SOUND_PAN_TARGET, 6, 4 createsprite gBattleAnimSpriteTemplate_83D65A0, ANIM_BATTLER_TARGET, 4, 0, 16, 0, 2 delay 7 createsprite gBattleAnimSpriteTemplate_83D65A0, ANIM_BATTLER_TARGET, 3, 0, 0, 0, 2 @@ -7600,7 +7600,7 @@ Move_CONSTRICT: @ 81D2013 delay 8 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 3, 0, 6, 1 delay 20 - playsewithpan SE_W020, SOUND_PAN_TARGET + playsewithpan SE_M_BIND, SOUND_PAN_TARGET setarg ARG_RET_ID, -1 waitforvisualfinish end @@ -7625,7 +7625,7 @@ _81D2084: clearmonbg ANIM_BATTLER_ATK_PARTNER delay 1 monbg ANIM_BATTLER_DEF_PARTNER - playsewithpan SE_W171, SOUND_PAN_TARGET + playsewithpan SE_M_NIGHTMARE, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DAF38, ANIM_BATTLER_TARGET, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 14, 1 waitforvisualfinish @@ -7635,7 +7635,7 @@ _81D2084: end _81D20EB: createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_ATTACKER, 4, 0, 10, 0 - playsewithpan SE_W020, SOUND_PAN_ATTACKER + playsewithpan SE_M_BIND, SOUND_PAN_ATTACKER return _81D2101: createvisualtask AnimTask_SwayMon, 5, 0, 10, 1536, 3, 0 @@ -7645,7 +7645,7 @@ _81D2101: waitforvisualfinish end _81D211C: - playsewithpan SE_W082, SOUND_PAN_ATTACKER + playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER createvisualtask sub_80E2F2C, 5 createvisualtask sub_80E1F8C, 5, 2, 4, 2, 0, 10, 31 return @@ -7655,13 +7655,13 @@ Move_SOFT_BOILED: @ 81D213B loadspritegfx ANIM_TAG_THIN_RING loadspritegfx ANIM_TAG_BLUE_STAR monbg ANIM_BATTLER_ATK_PARTNER - playsewithpan SE_W039, SOUND_PAN_ATTACKER + playsewithpan SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_ATTACKER, 0, 2, 6, 1 createsprite gBattleAnimSpriteTemplate_83D78BC, ANIM_BATTLER_ATTACKER, 4, 0, 16, 0 createsprite gBattleAnimSpriteTemplate_83D78BC, ANIM_BATTLER_ATTACKER, 4, 0, 16, 1 delay 120 delay 7 - playsewithpan SE_W030, SOUND_PAN_ATTACKER + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_ATTACKER createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 31, 3, 10, 0, rgb(12, 24, 30) createsprite gBattleAnimSpriteTemplate_83D7928, ANIM_BATTLER_ATTACKER, 3, 31, 16, 0, 1 delay 8 @@ -7703,12 +7703,12 @@ Move_HEAL_BELL: @ 81D21BD waitforvisualfinish createvisualtask sub_80D1B80, 5 waitforvisualfinish - playsewithpan SE_W234, SOUND_PAN_ATTACKER + playsewithpan SE_M_MORNING_SUN, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D6CA0, ANIM_BATTLER_ATTACKER, 16, -15, 0, 0, 0, 32, 60, 1 delay 8 createsprite gBattleAnimSpriteTemplate_83D6CA0, ANIM_BATTLER_ATTACKER, 16, 12, -5, 0, 0, 32, 60, 1 waitforvisualfinish - playsewithpan SE_REAPOKE, SOUND_PAN_ATTACKER + playsewithpan SE_SHINY, SOUND_PAN_ATTACKER createvisualtask sub_80E2A7C, 10, 4, 3, 10, 0, 31500 createvisualtask sub_80E2A38, 10, 10, 3, 10, 0, 32767 createsprite gBattleAnimSpriteTemplate_83D7974, ANIM_BATTLER_ATTACKER, 16, 0, 0, 0, 1 @@ -7717,14 +7717,14 @@ _81D2372: createvisualtask sub_80E2A7C, 10, 4, 3, 8, 0, 31500 createvisualtask sub_80E2A38, 10, 10, 3, 2, 10, 32767 createsprite gBattleAnimSpriteTemplate_83D7928, ANIM_BATTLER_ATTACKER, 40, 0, -24, 0, 1 - playsewithpan SE_W215, SOUND_PAN_ATTACKER + playsewithpan SE_M_HEAL_BELL, SOUND_PAN_ATTACKER return Move_FAKE_OUT: @ 81D23A8 - playsewithpan SE_W260, 0 + playsewithpan SE_M_FLATTER, 0 createvisualtask sub_80D1CD0, 5 waitforvisualfinish - playsewithpan SE_W166, SOUND_PAN_TARGET + playsewithpan SE_M_SKETCH, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 4, 0, 5, 1 createvisualtask sub_80D1E38, 3 waitforvisualfinish @@ -7734,17 +7734,17 @@ Move_FAKE_OUT: @ 81D23A8 Move_SCARY_FACE: @ 81D23E3 loadspritegfx ANIM_TAG_EYE_SPARKLE createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 27, 3, 0, 16, rgb(0, 0, 0) - playsewithpan SE_W060, SOUND_PAN_ATTACKER + playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER waitforvisualfinish delay 10 - playsewithpan SE_W043, SOUND_PAN_ATTACKER + playsewithpan SE_M_LEER, SOUND_PAN_ATTACKER createvisualtask sub_80D23B4, 5 delay 13 createsprite gBattleAnimSpriteTemplate_83D7B94, ANIM_BATTLER_ATTACKER, 0, -16, -8 createsprite gBattleAnimSpriteTemplate_83D7B94, ANIM_BATTLER_ATTACKER, 0, 16, -8 waitforvisualfinish createvisualtask sub_80D60B4, 3, 20, 1, 0 - playsewithpan SE_W081B, SOUND_PAN_TARGET + playsewithpan SE_M_STRING_SHOT2, SOUND_PAN_TARGET createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 27, 3, 16, 0, rgb(0, 0, 0) waitforvisualfinish end @@ -7753,14 +7753,14 @@ Move_SWEET_KISS: @ 81D2446 loadspritegfx ANIM_TAG_RED_HEART loadspritegfx ANIM_TAG_ANGEL createsprite gBattleAnimSpriteTemplate_83D7BB8, ANIM_BATTLER_TARGET, 2, 16, -48 - playsewithpan SE_W215, SOUND_PAN_TARGET + playsewithpan SE_M_HEAL_BELL, SOUND_PAN_TARGET delay 23 - playsewithpan SE_W215, SOUND_PAN_TARGET + playsewithpan SE_M_HEAL_BELL, SOUND_PAN_TARGET delay 23 - playsewithpan SE_W215, SOUND_PAN_TARGET + playsewithpan SE_M_HEAL_BELL, SOUND_PAN_TARGET waitforvisualfinish createsprite gBattleAnimSpriteTemplate_83D7AC8, ANIM_BATTLER_TARGET, 3, 160, -30 - playsewithpan SE_W213, SOUND_PAN_TARGET + playsewithpan SE_M_ATTRACT, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D7AC8, ANIM_BATTLER_TARGET, 3, -256, -42 createsprite gBattleAnimSpriteTemplate_83D7AC8, ANIM_BATTLER_TARGET, 3, 128, -14 createsprite gBattleAnimSpriteTemplate_83D7AC8, ANIM_BATTLER_TARGET, 3, 416, -38 @@ -7772,9 +7772,9 @@ Move_LOVELY_KISS: @ 81D24AF loadspritegfx ANIM_TAG_PINK_HEART loadspritegfx ANIM_TAG_DEVIL createsprite gBattleAnimSpriteTemplate_83D7C00, ANIM_BATTLER_TARGET, 2, 0, -24 - playsewithpan SE_W060B, SOUND_PAN_TARGET + playsewithpan SE_M_PSYBEAM2, SOUND_PAN_TARGET waitforvisualfinish - playsewithpan SE_W213, SOUND_PAN_TARGET + playsewithpan SE_M_ATTRACT, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D7BD0, ANIM_BATTLER_TARGET, 3, -256, -42 createsprite gBattleAnimSpriteTemplate_83D7BD0, ANIM_BATTLER_TARGET, 3, 128, -14 createsprite gBattleAnimSpriteTemplate_83D7BD0, ANIM_BATTLER_TARGET, 3, 416, -38 @@ -7785,13 +7785,13 @@ Move_FURY_SWIPES: @ 81D24F6 loadspritegfx ANIM_TAG_SWIPE createsprite gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 5, 5 delay 4 - playsewithpan SE_W010, SOUND_PAN_TARGET + playsewithpan SE_M_SCRATCH, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D7C48, ANIM_BATTLER_TARGET, 2, 16, 0, 1 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 3, 0, 5, 1 delay 10 createsprite gHorizontalLungeSpriteTemplate, ANIM_BATTLER_TARGET, 2, 5, 5 delay 4 - playsewithpan SE_W010, SOUND_PAN_TARGET + playsewithpan SE_M_SCRATCH, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D7C48, ANIM_BATTLER_TARGET, 2, -16, 0, 0 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 4, 0, 7, 1 end @@ -7800,28 +7800,28 @@ Move_INGRAIN: @ 81D255A loadspritegfx ANIM_TAG_ROOTS loadspritegfx ANIM_TAG_ORBS createsprite gBattleAnimSpriteTemplate_83D6658, ANIM_BATTLER_ATTACKER, 2, 16, 26, -1, 2, 150 - playsewithpan SE_W010, SOUND_PAN_ATTACKER + playsewithpan SE_M_SCRATCH, SOUND_PAN_ATTACKER delay 10 createsprite gBattleAnimSpriteTemplate_83D6658, ANIM_BATTLER_ATTACKER, 2, -32, 20, 1, 1, 140 - playsewithpan SE_W010, SOUND_PAN_ATTACKER + playsewithpan SE_M_SCRATCH, SOUND_PAN_ATTACKER delay 10 createsprite gBattleAnimSpriteTemplate_83D6658, ANIM_BATTLER_ATTACKER, 2, 32, 22, 1, 0, 130 - playsewithpan SE_W010, SOUND_PAN_ATTACKER + playsewithpan SE_M_SCRATCH, SOUND_PAN_ATTACKER delay 10 createsprite gBattleAnimSpriteTemplate_83D6658, ANIM_BATTLER_ATTACKER, 2, -16, 25, -1, 3, 120 - playsewithpan SE_W010, SOUND_PAN_ATTACKER + playsewithpan SE_M_SCRATCH, SOUND_PAN_ATTACKER delay 40 createsprite gBattleAnimSpriteTemplate_83D6698, ANIM_BATTLER_ATTACKER, 3, 32, 26, -1, 3, 30 delay 5 - playsewithpan SE_W145C, SOUND_PAN_ATTACKER + playsewithpan SE_M_BUBBLE3, SOUND_PAN_ATTACKER delay 5 createsprite gBattleAnimSpriteTemplate_83D6698, ANIM_BATTLER_ATTACKER, 3, -48, 20, 1, 2, 30 - playsewithpan SE_W145C, SOUND_PAN_ATTACKER + playsewithpan SE_M_BUBBLE3, SOUND_PAN_ATTACKER delay 5 - playsewithpan SE_W145C, SOUND_PAN_ATTACKER + playsewithpan SE_M_BUBBLE3, SOUND_PAN_ATTACKER delay 5 createsprite gBattleAnimSpriteTemplate_83D6698, ANIM_BATTLER_ATTACKER, 3, 48, 26, -2, 3, 18 - playsewithpan SE_W145C, SOUND_PAN_ATTACKER + playsewithpan SE_M_BUBBLE3, SOUND_PAN_ATTACKER delay 10 waitforvisualfinish end @@ -7830,38 +7830,38 @@ Move_PRESENT: @ 81D260B loadspritegfx ANIM_TAG_ITEM_BAG createvisualtask sub_812C960, 2 createsprite gBattleAnimSpriteTemplate_83D671C, ANIM_BATTLER_TARGET, 2, 0, -5, 10, 2, -1 - playsewithpan SE_W039, SOUND_PAN_ATTACKER + playsewithpan SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER delay 14 - playsewithpan SE_W145B, SOUND_PAN_ATTACKER + playsewithpan SE_M_BUBBLE2, SOUND_PAN_ATTACKER delay 14 - playsewithpan SE_W145B, 0 + playsewithpan SE_M_BUBBLE2, 0 delay 20 - playsewithpan SE_W145B, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE2, SOUND_PAN_TARGET waitforvisualfinish jumpargeq 7, 0, _81D264E jumpargeq 7, 1, _81D26B9 end _81D264E: loadspritegfx ANIM_TAG_EXPLOSION - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D7828, ANIM_BATTLER_TARGET, 3, 0, 0, 1, 1 delay 6 - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D7828, ANIM_BATTLER_TARGET, 3, 24, -24, 1, 1 delay 6 - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D7828, ANIM_BATTLER_TARGET, 3, -16, 16, 1, 1 delay 6 - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D7828, ANIM_BATTLER_TARGET, 3, -24, -12, 1, 1 delay 6 - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D7828, ANIM_BATTLER_TARGET, 3, 16, 16, 1, 1 end _81D26B9: loadspritegfx ANIM_TAG_SPARKLE_5 loadspritegfx ANIM_TAG_BLUE_STAR - playsewithpan SE_W234, SOUND_PAN_TARGET + playsewithpan SE_M_MORNING_SUN, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D6764, ANIM_BATTLER_TARGET, 4, -16, 32, -3, 1 delay 3 createsprite gBattleAnimSpriteTemplate_83D6764, ANIM_BATTLER_TARGET, 4, 16, 32, -3, -1 @@ -7886,7 +7886,7 @@ _81D26B9: Move_BATON_PASS: @ 81D2762 loadspritegfx ANIM_TAG_POKEBALL - playsewithpan SE_W226, SOUND_PAN_ATTACKER + playsewithpan SE_M_BATON_PASS, SOUND_PAN_ATTACKER createvisualtask sub_80E1F8C, 2, 31, 1, 2, 0, 11, 31455 createsprite gBattleAnimSpriteTemplate_84024D0, ANIM_BATTLER_ATTACKER, 2 end @@ -7911,7 +7911,7 @@ Move_PERISH_SONG: @ 81D2784 createsprite gBattleAnimSpriteTemplate_83D7D1C, ANIM_BATTLER_ATTACKER, 4, 15, 0, 240 createsprite gBattleAnimSpriteTemplate_83D7D34, ANIM_BATTLER_ATTACKER, 4, 15, 0, 0 delay 20 - panse_1B SE_W195, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0 + panse_1B SE_M_PERISH_SONG, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0 delay 80 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 3, 0, 16, rgb(0, 0, 0) createvisualtask sub_80E0E24, 5, 4, 0 @@ -7932,21 +7932,21 @@ Move_SLEEP_TALK: @ 81D28ED createvisualtask AnimTask_SwayMon, 5, 0, 4, 4096, 2, 0 delay 20 createsprite gBattleAnimSpriteTemplate_84022F0, ANIM_BATTLER_TARGET, 2, 0, 20, 5, -1 - playsewithpan SE_W173, SOUND_PAN_ATTACKER + playsewithpan SE_M_SNORE, SOUND_PAN_ATTACKER delay 6 createsprite gBattleAnimSpriteTemplate_84022F0, ANIM_BATTLER_TARGET, 2, 0, 20, 5, -1 delay 6 createsprite gBattleAnimSpriteTemplate_84022F0, ANIM_BATTLER_TARGET, 2, 0, 20, 5, -1 delay 20 createsprite gBattleAnimSpriteTemplate_84022F0, ANIM_BATTLER_TARGET, 2, 0, 20, 5, -5 - playsewithpan SE_W173, SOUND_PAN_ATTACKER + playsewithpan SE_M_SNORE, SOUND_PAN_ATTACKER delay 6 createsprite gBattleAnimSpriteTemplate_84022F0, ANIM_BATTLER_TARGET, 2, 0, 20, 5, -5 delay 6 createsprite gBattleAnimSpriteTemplate_84022F0, ANIM_BATTLER_TARGET, 2, 0, 20, 5, -5 delay 20 createsprite gBattleAnimSpriteTemplate_84022F0, ANIM_BATTLER_TARGET, 2, 0, 20, 5, -3 - playsewithpan SE_W173, SOUND_PAN_ATTACKER + playsewithpan SE_M_SNORE, SOUND_PAN_ATTACKER delay 6 createsprite gBattleAnimSpriteTemplate_84022F0, ANIM_BATTLER_TARGET, 2, 0, 20, 5, -3 delay 6 @@ -7956,7 +7956,7 @@ Move_SLEEP_TALK: @ 81D28ED Move_HYPER_FANG: @ 81D29A8 loadspritegfx ANIM_TAG_FANG_ATTACK - playsewithpan SE_W044, SOUND_PAN_TARGET + playsewithpan SE_M_BITE, SOUND_PAN_TARGET delay 1 delay 2 createvisualtask sub_80E4200, 2 @@ -7969,7 +7969,7 @@ _81D29D6: createsprite gBattleAnimSpriteTemplate_840233C, ANIM_BATTLER_TARGET, 2 waitbgfadein createvisualtask AnimTask_ShakeMon, 3, 1, 0, 10, 10, 1 - playsewithpan SE_W043, SOUND_PAN_TARGET + playsewithpan SE_M_LEER, SOUND_PAN_TARGET delay 20 restorebg waitbgfadein @@ -7988,9 +7988,9 @@ _81D2A08: Move_TRI_ATTACK: @ 81D2A0F loadspritegfx ANIM_TAG_TRI_FORCE_TRIANGLE createsprite gBattleAnimSpriteTemplate_8402458, ANIM_BATTLER_TARGET, 2, 16, 0 - playsewithpan SE_W161, SOUND_PAN_ATTACKER + playsewithpan SE_M_TRI_ATTACK, SOUND_PAN_ATTACKER delay 20 - playsewithpan SE_W161, SOUND_PAN_ATTACKER + playsewithpan SE_M_TRI_ATTACK, SOUND_PAN_ATTACKER delay 20 createsoundtask sub_812B058, 220, -64, 63, 5, 6, 0, 7 waitforvisualfinish @@ -7998,7 +7998,7 @@ Move_TRI_ATTACK: @ 81D2A0F delay 16 loadspritegfx ANIM_TAG_FIRE createsprite gBattleAnimSpriteTemplate_83D9520, ANIM_BATTLER_TARGET, 2, 0, 0, 30, 30, -1, 0 - playsewithpan SE_W172B, SOUND_PAN_TARGET + playsewithpan SE_M_FLAME_WHEEL2, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D9520, ANIM_BATTLER_TARGET, 2, 0, 0, 30, 30, 0, 1 delay 1 createsprite gBattleAnimSpriteTemplate_83D9520, ANIM_BATTLER_TARGET, 2, 0, 0, 30, 30, -1, -1 @@ -8017,7 +8017,7 @@ Move_TRI_ATTACK: @ 81D2A0F waitforvisualfinish loadspritegfx ANIM_TAG_LIGHTNING createvisualtask sub_80E2324, 2, 257, 257, 257 - playsewithpan SE_W161B, SOUND_PAN_TARGET + playsewithpan SE_M_TRI_ATTACK2, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D97D0, ANIM_BATTLER_TARGET, 2, 0, -48 delay 1 createsprite gBattleAnimSpriteTemplate_83D97D0, ANIM_BATTLER_TARGET, 2, 0, -16 @@ -8039,8 +8039,8 @@ Move_WILL_O_WISP: @ 81D2B83 loadspritegfx ANIM_TAG_WISP_ORB monbg ANIM_BATTLER_DEF_PARTNER monbgprio_2A ANIM_BATTLER_TARGET - playsewithpan SE_W052, SOUND_PAN_ATTACKER - waitplaysewithpan SE_W052, SOUND_PAN_ATTACKER, 10 + playsewithpan SE_M_EMBER, SOUND_PAN_ATTACKER + waitplaysewithpan SE_M_EMBER, SOUND_PAN_ATTACKER, 10 createvisualtask sub_812B374, 2, -64, -64, 1, 0 createsprite gBattleAnimSpriteTemplate_83D974C, ANIM_BATTLER_ATTACKER, 2, 0, 0, 0 delay 3 @@ -8053,7 +8053,7 @@ Move_WILL_O_WISP: @ 81D2B83 createvisualtask sub_812B374, 2, -64, 63, 2, 0 waitforvisualfinish monbgprio_29 - playsewithpan SE_W172B, SOUND_PAN_TARGET + playsewithpan SE_M_FLAME_WHEEL2, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 4, 0, 13, 1 createsprite gBattleAnimSpriteTemplate_83D977C, ANIM_BATTLER_ATTACKER, 2, 0 createsprite gBattleAnimSpriteTemplate_83D977C, ANIM_BATTLER_ATTACKER, 2, 42 @@ -8091,23 +8091,23 @@ Move_TRICK: @ 81D2CE8 createsprite gBattleAnimSpriteTemplate_83D67F4, ANIM_BATTLER_ATTACKER, 2, -40, 80 createsprite gBattleAnimSpriteTemplate_83D67F4, ANIM_BATTLER_ATTACKER, 2, -40, 208 delay 16 - playsewithpan SE_W166, 0 + playsewithpan SE_M_SKETCH, 0 createvisualtask sub_80D1E38, 3 createvisualtask sub_80D1EC8, 3 delay 30 - playsewithpan SE_W104, 0 + playsewithpan SE_M_DOUBLE_TEAM, 0 delay 24 - playsewithpan SE_W104, 0 + playsewithpan SE_M_DOUBLE_TEAM, 0 delay 16 - playsewithpan SE_W104, 0 + playsewithpan SE_M_DOUBLE_TEAM, 0 delay 16 - playsewithpan SE_W104, 0 + playsewithpan SE_M_DOUBLE_TEAM, 0 delay 16 - playsewithpan SE_W104, 0 + playsewithpan SE_M_DOUBLE_TEAM, 0 delay 16 - playsewithpan SE_W104, 0 + playsewithpan SE_M_DOUBLE_TEAM, 0 delay 16 - playsewithpan SE_W213, 0 + playsewithpan SE_M_ATTRACT, 0 createvisualtask AnimTask_ShakeMon, 3, 0, 5, 0, 7, 2 createvisualtask AnimTask_ShakeMon, 3, 1, 5, 0, 7, 2 waitforvisualfinish @@ -8118,11 +8118,11 @@ Move_WISH: @ 81D2D66 loadspritegfx ANIM_TAG_SPARKLE_2 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 3, 0, 10, rgb(0, 0, 0) waitforvisualfinish - panse_27 SE_W115, SOUND_PAN_TARGET, SOUND_PAN_ATTACKER, 253, 0 + panse_27 SE_M_REFLECT, SOUND_PAN_TARGET, SOUND_PAN_ATTACKER, 253, 0 createsprite gBattleAnimSpriteTemplate_84024E8, ANIM_BATTLER_ATTACKER, 40 waitforvisualfinish delay 60 - loopsewithpan SE_W215, SOUND_PAN_ATTACKER, 16, 3 + loopsewithpan SE_M_HEAL_BELL, SOUND_PAN_ATTACKER, 16, 3 call Unknown_81D5ECA waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 3, 10, 0, rgb(0, 0, 0) @@ -8131,7 +8131,7 @@ Move_WISH: @ 81D2D66 Move_STOCKPILE: @ 81D2DAE loadspritegfx ANIM_TAG_GRAY_ORB - playsewithpan SE_W025, SOUND_PAN_ATTACKER + playsewithpan SE_M_MEGA_KICK, SOUND_PAN_ATTACKER createvisualtask sub_80E1F8C, 2, 2, 8, 1, 0, 12, 32767 createvisualtask sub_812D674, 5 call _81D2DEC @@ -8161,11 +8161,11 @@ _81D2DEC: Move_SPIT_UP: @ 81D2E65 loadspritegfx ANIM_TAG_RED_ORB_2 loadspritegfx ANIM_TAG_IMPACT - playsewithpan SE_W036, SOUND_PAN_ATTACKER + playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER createvisualtask sub_812D6CC, 5 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_ATTACKER, 1, 0, 8, 2 delay 45 - playsewithpan SE_W255, SOUND_PAN_ATTACKER + playsewithpan SE_M_SPIT_UP, SOUND_PAN_ATTACKER delay 3 createsprite gBattleAnimSpriteTemplate_83D7B60, ANIM_BATTLER_ATTACKER, 2, 0, 12 createsprite gBattleAnimSpriteTemplate_83D7B60, ANIM_BATTLER_ATTACKER, 2, 32, 12 @@ -8181,10 +8181,10 @@ Move_SPIT_UP: @ 81D2E65 _81D2EF5: delay 5 createvisualtask sub_80A9058, 2, 0, 1, 8, 1, 0 - playsewithpan SE_W003, SOUND_PAN_TARGET + playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DB538, ANIM_BATTLER_TARGET, 3, -12, 10, 1, 1 delay 5 - playsewithpan SE_W003, SOUND_PAN_TARGET + playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DB538, ANIM_BATTLER_TARGET, 3, 12, -10, 1, 1 waitforvisualfinish end @@ -8208,11 +8208,11 @@ _81D2F5B: Move_SWALLOW: @ 81D2FA8 loadspritegfx ANIM_TAG_BLUE_ORB loadspritegfx ANIM_TAG_BLUE_STAR - playsewithpan SE_W036, SOUND_PAN_ATTACKER + playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER createvisualtask sub_812D790, 5 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_ATTACKER, 1, 0, 8, 2 delay 38 - playsewithpan SE_W255, SOUND_PAN_ATTACKER + playsewithpan SE_M_SPIT_UP, SOUND_PAN_ATTACKER createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_ATTACKER, 2, 0, 12, 1 call _81D2FF9 jumpifmoveturn 2, _81D303B @@ -8243,8 +8243,8 @@ _81D3045: Move_TRANSFORM: @ 81D3054 monbg ANIM_BATTLER_ATTACKER - playsewithpan SE_W100, SOUND_PAN_ATTACKER - waitplaysewithpan SE_W107, SOUND_PAN_ATTACKER, 48 + playsewithpan SE_M_TELEPORT, SOUND_PAN_ATTACKER + waitplaysewithpan SE_M_MINIMIZE, SOUND_PAN_ATTACKER, 48 createvisualtask sub_812D7E8, 2, 0 waitforvisualfinish clearmonbg ANIM_BATTLER_ATTACKER @@ -8284,7 +8284,7 @@ _81D30F2: Move_SWEET_SCENT: @ 81D3100 loadspritegfx ANIM_TAG_PINK_PETAL - playsewithpan SE_W230, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWEET_SCENT, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_84026A4, ANIM_BATTLER_ATTACKER, 2, 100, 0, 100 delay 25 setpan 0 @@ -8325,7 +8325,7 @@ Move_HYPER_BEAM: @ 81D31EA createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 4, 0, 16, rgb(0, 0, 0) waitforvisualfinish delay 10 - playsewithpan SE_W063, SOUND_PAN_ATTACKER + playsewithpan SE_M_HYPER_BEAM, SOUND_PAN_ATTACKER createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_ATTACKER, 1, 0, 4, 1 waitforvisualfinish delay 30 @@ -8420,8 +8420,8 @@ Move_ROLE_PLAY: @ 81D3428 createvisualtask sub_80E2A38, 10, 4, 2, 0, 16, 32767 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 2, 0, 10, rgb(0, 0, 0) waitforvisualfinish - playsewithpan SE_W161, SOUND_PAN_ATTACKER - waitplaysewithpan SE_W197, SOUND_PAN_ATTACKER, 30 + playsewithpan SE_M_TRI_ATTACK, SOUND_PAN_ATTACKER + waitplaysewithpan SE_M_DETECT, SOUND_PAN_ATTACKER, 30 createvisualtask AnimTask_RolePlaySilhouette, 2 waitforvisualfinish clearmonbg ANIM_BATTLER_ATK_PARTNER @@ -8433,13 +8433,13 @@ Move_ROLE_PLAY: @ 81D3428 Move_REFRESH: @ 81D3485 loadspritegfx ANIM_TAG_THIN_RING loadspritegfx ANIM_TAG_SPARKLE_2 - playsewithpan SE_W287, SOUND_PAN_ATTACKER + playsewithpan SE_M_STAT_INCREASE, SOUND_PAN_ATTACKER createvisualtask sub_81300A4, 2, 0 waitforvisualfinish - playsewithpan SE_W234, SOUND_PAN_ATTACKER + playsewithpan SE_M_MORNING_SUN, SOUND_PAN_ATTACKER call Unknown_81D5ECA waitforvisualfinish - playsewithpan SE_REAPOKE, SOUND_PAN_ATTACKER + playsewithpan SE_SHINY, SOUND_PAN_ATTACKER createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 31, 3, 10, 0, rgb(12, 24, 30) createsprite gBattleAnimSpriteTemplate_83D7928, ANIM_BATTLER_ATTACKER, 3, 0, 0, 0, 0 end @@ -8450,11 +8450,11 @@ Move_BLAZE_KICK: @ 81D34C8 loadspritegfx ANIM_TAG_SMALL_EMBER monbg ANIM_BATTLER_TARGET setalpha 12, 8 - playsewithpan SE_W172, SOUND_PAN_TARGET + playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DA024, ANIM_BATTLER_TARGET, 3, 0, 0, 1, 30 createvisualtask sub_80E2A38, 10, 4, 2, 0, 7, 32767 delay 30 - playsewithpan SE_W007, SOUND_PAN_TARGET + playsewithpan SE_M_FIRE_PUNCH, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 2, 0, 0, 1, 0 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 3, 0, 14, 1 createvisualtask sub_80E2A38, 10, 4, 2, 0, 0, 32767 @@ -8487,7 +8487,7 @@ Move_SAND_TOMB: @ 81D35D2 loadspritegfx ANIM_TAG_MUD_SAND createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 0, 4, 2, 0, 7, rgb(19, 17, 0) createvisualtask AnimTask_ShakeMon, 5, 1, 0, 2, 43, 1 - playsewithpan SE_W328, SOUND_PAN_TARGET + playsewithpan SE_M_SAND_TOMB, SOUND_PAN_TARGET call _81D361F call _81D361F call _81D361F @@ -8513,14 +8513,14 @@ _81D361F: Move_SHEER_COLD: @ 81D36AA fadetobg BG_ICE waitbgfadeout - playsewithpan SE_W196, 0 + playsewithpan SE_M_ICY_WIND, 0 waitbgfadein loadspritegfx ANIM_TAG_ICE_CUBE monbg ANIM_BATTLER_DEF_PARTNER monbgprio_28 1 setalpha 12, 8 createvisualtask sub_807B920, 2 - waitplaysewithpan SE_W258, SOUND_PAN_TARGET, 17 + waitplaysewithpan SE_M_HAIL, SOUND_PAN_TARGET, 17 waitforvisualfinish clearmonbg ANIM_BATTLER_DEF_PARTNER blendoff @@ -8537,11 +8537,11 @@ Move_ARM_THRUST: @ 81D36CF delay 6 createsprite gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 4, 3 delay 4 - playsewithpan SE_W207, SOUND_PAN_TARGET + playsewithpan SE_M_SWAGGER, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DA144, ANIM_BATTLER_TARGET, 2, 10, -8, 14, 3 waitforvisualfinish createvisualtask sub_80A8E04, 5, 8, 5, 0, 1 - playsewithpan SE_W003, SOUND_PAN_TARGET + playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET choosetwoturnanim _81D373C, _81D3750 _81D3728: createvisualtask AnimTask_ShakeMon, 5, 1, 4, 0, 6, 1 @@ -8556,7 +8556,7 @@ _81D3750: goto _81D3728 Move_MUDDY_WATER: @ 81D3764 - panse_1B SE_W250, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0 + panse_1B SE_M_WHIRLPOOL, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0 createvisualtask AnimTask_CreateSurfWave, 2, 1 waitforvisualfinish end @@ -8589,7 +8589,7 @@ Move_BULLET_SEED: @ 81D3776 Move_DRAGON_CLAW: @ 81D380C loadspritegfx ANIM_TAG_SMALL_EMBER loadspritegfx ANIM_TAG_CLAW_SLASH - playsewithpan SE_W221B, SOUND_PAN_ATTACKER + playsewithpan SE_M_SACRED_FIRE2, SOUND_PAN_ATTACKER createvisualtask sub_80E2A38, 10, 2, 4, 0, 8, 639 createvisualtask AnimTask_ShakeMon, 5, 0, 0, 2, 15, 1 call _81D39E9 @@ -8656,7 +8656,7 @@ Move_MUD_SHOT: @ 81D3A75 createvisualtask AnimTask_ShakeMon, 5, 0, 0, 2, 46, 1 delay 6 createvisualtask sub_80D3630, 5, 100 - panse_1B SE_W250, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 1, 0 + panse_1B SE_M_WHIRLPOOL, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 1, 0 call _81D3AEF call _81D3AEF call _81D3AEF @@ -8684,7 +8684,7 @@ Move_METEOR_MASH: @ 81D3B12 loadspritegfx ANIM_TAG_GOLD_STARS loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HANDS_AND_FEET - panse_1B SE_W112, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 3, 0 + panse_1B SE_M_BARRIER, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 3, 0 fadetobg BG_COSMIC waitbgfadein waitforvisualfinish @@ -8695,7 +8695,7 @@ Move_METEOR_MASH: @ 81D3B12 createsprite gBattleAnimSpriteTemplate_83DA024, ANIM_BATTLER_TARGET, 3, 0, 0, 0, 30 createsprite gBattleAnimSpriteTemplate_8402A3C, ANIM_BATTLER_TARGET, 3, -80, -64, 40, 32, 30 delay 20 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 3, 0, 0, 1, 1 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 5, 0, 20, 1 waitforvisualfinish @@ -8709,7 +8709,7 @@ Move_REVENGE: @ 81D3B99 loadspritegfx ANIM_TAG_PURPLE_SCRATCH monbg ANIM_BATTLER_TARGET setalpha 12, 8 - playsewithpan SE_W036, SOUND_PAN_ATTACKER + playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83DA198, ANIM_BATTLER_ATTACKER, 2, 10, -10 waitforvisualfinish createvisualtask sub_80E1F8C, 2, 2, 0, 4, 2, 8, 31 @@ -8718,17 +8718,17 @@ Move_REVENGE: @ 81D3B99 loadspritegfx ANIM_TAG_PURPLE_SWIPE createsprite gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 6, 4 delay 4 - playsewithpan SE_W207, SOUND_PAN_TARGET + playsewithpan SE_M_SWAGGER, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DA1E0, ANIM_BATTLER_TARGET, 2, 10, -10 waitforvisualfinish unloadspritegfx ANIM_TAG_PURPLE_SWIPE loadspritegfx ANIM_TAG_IMPACT createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 3, 0, 10, 1 createsprite gBattleAnimSpriteTemplate_83DB550, ANIM_BATTLER_TARGET, 3, -10, -8, 1, 1, 8 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET delay 8 createsprite gBattleAnimSpriteTemplate_83DB550, ANIM_BATTLER_TARGET, 3, 10, 8, 1, 1, 8 - playsewithpan SE_W025B, SOUND_PAN_TARGET + playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_BATTLER_TARGET blendoff @@ -8737,7 +8737,7 @@ Move_REVENGE: @ 81D3B99 Move_POISON_FANG: @ 81D3C30 loadspritegfx ANIM_TAG_FANG_ATTACK loadspritegfx ANIM_TAG_POISON_BUBBLE - playsewithpan SE_W044, SOUND_PAN_TARGET + playsewithpan SE_M_BITE, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_840233C, ANIM_BATTLER_TARGET, 2 delay 10 createvisualtask AnimTask_ShakeMon, 3, 1, 3, 0, 10, 1 @@ -8748,7 +8748,7 @@ Move_POISON_FANG: @ 81D3C30 end Move_SUBSTITUTE: @ 81D3C6F - playsewithpan SE_W213, SOUND_PAN_ATTACKER + playsewithpan SE_M_ATTRACT, SOUND_PAN_ATTACKER createvisualtask sub_81312E4, 2 end @@ -8761,50 +8761,50 @@ Move_FRENZY_PLANT: @ 81D3C7B createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 0, 1, 2, 0, 5, rgb(0, 0, 0) waitforvisualfinish createsprite gBattleAnimSpriteTemplate_83D6670, ANIM_BATTLER_ATTACKER, 2, 10, 8, 2, 0, 0, 100 - playsewithpan SE_W010, SOUND_PAN_ATTACKER + playsewithpan SE_M_SCRATCH, SOUND_PAN_ATTACKER delay 5 createsprite gBattleAnimSpriteTemplate_83D6670, ANIM_BATTLER_ATTACKER, 2, 20, -8, -2, 0, 1, 95 - playsewithpan SE_W010, 213 + playsewithpan SE_M_SCRATCH, 213 delay 5 createsprite gBattleAnimSpriteTemplate_83D6670, ANIM_BATTLER_ATTACKER, 2, 30, 8, -4, 0, 0, 90 - playsewithpan SE_W010, 234 + playsewithpan SE_M_SCRATCH, 234 delay 5 createsprite gBattleAnimSpriteTemplate_83D6670, ANIM_BATTLER_ATTACKER, 2, 40, -8, 4, 0, 1, 85 - playsewithpan SE_W010, 0 + playsewithpan SE_M_SCRATCH, 0 delay 5 createsprite gBattleAnimSpriteTemplate_83D6670, ANIM_BATTLER_ATTACKER, 2, 50, 8, 0, 0, 0, 85 - playsewithpan SE_W010, 21 + playsewithpan SE_M_SCRATCH, 21 delay 5 createsprite gBattleAnimSpriteTemplate_83D6670, ANIM_BATTLER_ATTACKER, 2, 60, -8, -2, 0, 1, 85 - playsewithpan SE_W010, 42 + playsewithpan SE_M_SCRATCH, 42 delay 5 createsprite gBattleAnimSpriteTemplate_83D6670, ANIM_BATTLER_ATTACKER, 2, 75, 8, 0, 0, 0, 85 - playsewithpan SE_W010, SOUND_PAN_TARGET + playsewithpan SE_M_SCRATCH, SOUND_PAN_TARGET delay 5 createsprite gBattleAnimSpriteTemplate_83D6670, ANIM_BATTLER_ATTACKER, 2, 85, 16, 6, 0, 3, 80 - playsewithpan SE_W010, SOUND_PAN_TARGET + playsewithpan SE_M_SCRATCH, SOUND_PAN_TARGET delay 5 createsprite gBattleAnimSpriteTemplate_83D6670, ANIM_BATTLER_ATTACKER, 2, 85, -16, -6, 0, 2, 75 - playsewithpan SE_W010, SOUND_PAN_TARGET + playsewithpan SE_M_SCRATCH, SOUND_PAN_TARGET delay 5 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -10, -10, 1, 3 - playsewithpan SE_W003, SOUND_PAN_TARGET + playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 3, 1, 8, 0, 20, 1 delay 3 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 10, 8, 1, 3 - playsewithpan SE_W003, SOUND_PAN_TARGET + playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET delay 3 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 10, -3, 1, 2 - playsewithpan SE_W003, SOUND_PAN_TARGET + playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET delay 3 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -3, 1, 1, 2 - playsewithpan SE_W003, SOUND_PAN_TARGET + playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET delay 2 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -10, 1, 1, 1 - playsewithpan SE_W003, SOUND_PAN_TARGET + playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET delay 2 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 10, 1, 1 - playsewithpan SE_W003, SOUND_PAN_TARGET + playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 0, 1, 2, 5, 0, rgb(0, 0, 0) waitforvisualfinish @@ -8827,7 +8827,7 @@ Move_METAL_SOUND: @ 81D3E1F waitforvisualfinish end _81D3E52: - panse_1B SE_W103, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0 + panse_1B SE_M_SCREECH, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0 createsprite gBattleAnimSpriteTemplate_83D7564, ANIM_BATTLER_TARGET, 2, 16, 0, 0, 0, 30, 0 delay 2 return @@ -8850,20 +8850,20 @@ _81D3EA4: waitbgfadein monbg ANIM_BATTLER_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W207, SOUND_PAN_TARGET + playsewithpan SE_M_SWAGGER, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DA214, ANIM_BATTLER_TARGET, 2 delay 10 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -10, -8, 1, 0 createvisualtask AnimTask_ShakeMon, 5, 1, 8, 0, 24, 1 delay 8 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 10, 2, 1, 0 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET delay 8 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 10, -6, 1, 0 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET delay 8 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 8, 1, 0 - playsewithpan SE_W025B, SOUND_PAN_TARGET + playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET waitforvisualfinish restorebg waitbgfadein @@ -9020,7 +9020,7 @@ _81D4371: Move_COSMIC_POWER: @ 81D43C5 loadspritegfx ANIM_TAG_SPARKLE_2 createvisualtask sub_812B340, 5, 243, 0 - playsewithpan SE_W322, 0 + playsewithpan SE_M_COSMIC_POWER, 0 createvisualtask sub_80E3A08, 2, 0, 0, 15, 0 waitforvisualfinish fadetobg BG_COSMIC @@ -9047,7 +9047,7 @@ Move_BLAST_BURN: @ 81D444A loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BATTLER_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W221, SOUND_PAN_ATTACKER + playsewithpan SE_M_SACRED_FIRE, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D9538, ANIM_BATTLER_ATTACKER, 2, -32, 0, 24, 0, 0, 0 createsprite gBattleAnimSpriteTemplate_83D9538, ANIM_BATTLER_ATTACKER, 2, -20, -10, 24, 0, 0, 0 createsprite gBattleAnimSpriteTemplate_83D9538, ANIM_BATTLER_ATTACKER, 66, 0, -16, 24, 0, 0, 0 @@ -9057,7 +9057,7 @@ Move_BLAST_BURN: @ 81D444A createsprite gBattleAnimSpriteTemplate_83D9538, ANIM_BATTLER_ATTACKER, 2, 0, 16, 24, 0, 0, 0 createsprite gBattleAnimSpriteTemplate_83D9538, ANIM_BATTLER_ATTACKER, 2, -20, 10, 24, 0, 0, 0 delay 25 - playsewithpan SE_W172B, SOUND_PAN_ATTACKER + playsewithpan SE_M_FLAME_WHEEL2, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D9538, ANIM_BATTLER_ATTACKER, 2, -64, 0, 24, 0, 0, 0 createsprite gBattleAnimSpriteTemplate_83D9538, ANIM_BATTLER_ATTACKER, 6, -40, -20, 24, 0, 0, 0 createsprite gBattleAnimSpriteTemplate_83D9538, ANIM_BATTLER_ATTACKER, 70, 0, -32, 24, 0, 0, 0 @@ -9069,7 +9069,7 @@ Move_BLAST_BURN: @ 81D444A createsprite gBattleAnimSpriteTemplate_83D9538, ANIM_BATTLER_ATTACKER, 2, -40, 20, 24, 0, 0, 0 createvisualtask sub_80E2324, 2, 257, 257, 257 delay 25 - playsewithpan SE_W172B, SOUND_PAN_ATTACKER + playsewithpan SE_M_FLAME_WHEEL2, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D9538, ANIM_BATTLER_ATTACKER, 2, -96, 0, 24, 0, 0, 0 createsprite gBattleAnimSpriteTemplate_83D9538, ANIM_BATTLER_ATTACKER, 6, -60, -30, 24, 0, 0, 0 createsprite gBattleAnimSpriteTemplate_83D9538, ANIM_BATTLER_ATTACKER, 70, 0, -48, 24, 0, 0, 0 @@ -9095,24 +9095,24 @@ Move_ROCK_TOMB: @ 81D468C createsprite gBattleAnimSpriteTemplate_83DADA8, ANIM_BATTLER_TARGET, 2, 20, 12, 64, 114, 0 delay 8 createvisualtask sub_80E26BC, 2, 0, 2, 3, 1 - playsewithpan SE_W070, SOUND_PAN_TARGET + playsewithpan SE_M_STRENGTH, SOUND_PAN_TARGET delay 8 createsprite gBattleAnimSpriteTemplate_83DADA8, ANIM_BATTLER_TARGET, 2, -20, 12, 64, 98, 0 delay 8 createvisualtask sub_80E26BC, 2, 0, 2, 3, 1 - playsewithpan SE_W070, SOUND_PAN_TARGET + playsewithpan SE_M_STRENGTH, SOUND_PAN_TARGET delay 8 createsprite gBattleAnimSpriteTemplate_83DADA8, ANIM_BATTLER_TARGET, 66, 3, 6, 64, 82, 0 delay 8 createvisualtask sub_80E26BC, 2, 0, 2, 3, 1 - playsewithpan SE_W070, SOUND_PAN_TARGET + playsewithpan SE_M_STRENGTH, SOUND_PAN_TARGET delay 8 createsprite gBattleAnimSpriteTemplate_83DADA8, ANIM_BATTLER_TARGET, 2, -3, 13, 64, 66, 0 delay 8 createvisualtask sub_80E26BC, 2, 0, 2, 3, 1 - playsewithpan SE_W070, SOUND_PAN_TARGET + playsewithpan SE_M_STRENGTH, SOUND_PAN_TARGET delay 24 - playsewithpan SE_W063, SOUND_PAN_TARGET + playsewithpan SE_M_HYPER_BEAM, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DA8F4, ANIM_BATTLER_TARGET, 5, 1, 50 createvisualtask AnimTask_ShakeMon, 5, 1, 3, 0, 20, 1 createvisualtask sub_80E26BC, 2, 2, 0, 10, 1 @@ -9121,8 +9121,8 @@ Move_ROCK_TOMB: @ 81D468C Move_SILVER_WIND: @ 81D4773 loadspritegfx ANIM_TAG_SPARKLE_6 - panse_1B SE_W016, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0 - playsewithpan SE_W234, 0 + panse_1B SE_M_GUST, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0 + playsewithpan SE_M_MORNING_SUN, 0 delay 0 monbg ANIM_BATTLER_DEF_PARTNER monbgprio_29 @@ -9161,7 +9161,7 @@ _81D47BA: createsprite gBattleAnimSpriteTemplate_83D696C, ANIM_BATTLER_TARGET, 66, -4, 16, 0, 6, 1, 2, 1 createsprite gBattleAnimSpriteTemplate_83D696C, ANIM_BATTLER_TARGET, 66, -16, 12, 192, 5, 2, 3, 1 waitforvisualfinish - playsewithpan SE_W016B, SOUND_PAN_TARGET + playsewithpan SE_M_GUST2, SOUND_PAN_TARGET clearmonbg ANIM_BATTLER_DEF_PARTNER delay 0 restorebg @@ -9177,7 +9177,7 @@ _81D4974: goto _81D47BA Move_SNATCH: @ 81D498B - playsewithpan SE_W036, SOUND_PAN_ATTACKER + playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER createvisualtask AnimTask_WindUpLunge, 5, ANIM_BATTLER_ATTACKER, -12, 4, 10, 10, 12, 6 end @@ -9187,10 +9187,10 @@ Move_DIVE: @ 81D49A5 choosetwoturnanim _81D49B4, _81D4A09 _81D49B4: loadspritegfx ANIM_TAG_ROUND_SHADOW - playsewithpan SE_W029, SOUND_PAN_ATTACKER + playsewithpan SE_M_HEADBUTT, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83DA5D8, ANIM_BATTLER_ATTACKER, 2, 0, 0, 13, 336 waitforvisualfinish - playsewithpan SE_W291, SOUND_PAN_ATTACKER + playsewithpan SE_M_DIVE, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83DA614, ANIM_BATTLER_ATTACKER, 3, 0 call _81D49F2 call _81D49F2 @@ -9207,7 +9207,7 @@ _81D4A09: loadspritegfx ANIM_TAG_SMALL_BUBBLES monbg ANIM_BATTLER_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W153, SOUND_PAN_TARGET + playsewithpan SE_M_EXPLOSION, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DA614, ANIM_BATTLER_TARGET, 3, 1 call _81D4A48 call _81D4A48 @@ -9231,11 +9231,11 @@ Move_ROCK_BLAST: @ 81D4A5F loadspritegfx ANIM_TAG_IMPACT createsprite gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 4, 6 delay 3 - playsewithpan SE_W207, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83DADE8, ANIM_BATTLER_TARGET, 2, 16, 0, 0, 0, 25, 257 waitforvisualfinish createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 3, 0, 0, 1, 1 - playsewithpan SE_W088, SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DAC64, ANIM_BATTLER_TARGET, 2, 0, 0, 20, 24, 14, 2 createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 3, 0, 5, 1 createsprite gBattleAnimSpriteTemplate_83DAC64, ANIM_BATTLER_TARGET, 2, 5, 0, -20, 24, 14, 1 @@ -9255,13 +9255,13 @@ Move_OVERHEAT: @ 81D4AFC delay 1 createvisualtask sub_80E4178, 5, 0 delay 1 - playsewithpan SE_W082, SOUND_PAN_ATTACKER + playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER createvisualtask sub_80E4028, 5, 1, 0 delay 1 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 2, 1, 0, 13, rgb(28, 0, 0) createvisualtask AnimTask_ShakeMon, 5, 0, 2, 0, 15, 1 waitforvisualfinish - playsewithpan SE_W172B, SOUND_PAN_ATTACKER + playsewithpan SE_M_FLAME_WHEEL2, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83DB100, ANIM_BATTLER_ATTACKER, 2, 1, 0, 30, 25, -20 createsprite gBattleAnimSpriteTemplate_83DB100, ANIM_BATTLER_ATTACKER, 2, 1, 32, 30, 25, -20 createsprite gBattleAnimSpriteTemplate_83DB100, ANIM_BATTLER_ATTACKER, 2, 1, 64, 30, 25, -20 @@ -9291,17 +9291,17 @@ Move_OVERHEAT: @ 81D4AFC delay 5 waitforvisualfinish createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 3, -5, 3, 1, 0 - playsewithpan SE_W007, SOUND_PAN_TARGET + playsewithpan SE_M_FIRE_PUNCH, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 10, 0, 25, 1 delay 6 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 3, 8, -5, 1, 0 - playsewithpan SE_W007, SOUND_PAN_TARGET + playsewithpan SE_M_FIRE_PUNCH, SOUND_PAN_TARGET delay 8 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 3, 10, 10, 1, 0 - playsewithpan SE_W007, SOUND_PAN_TARGET + playsewithpan SE_M_FIRE_PUNCH, SOUND_PAN_TARGET delay 8 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 3, 0, 0, 1, 0 - playsewithpan SE_W007, SOUND_PAN_TARGET + playsewithpan SE_M_FIRE_PUNCH, SOUND_PAN_TARGET createvisualtask sub_80E4178, 5, 1 delay 1 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 2, -1, 0, 13, rgb(18, 18, 18) @@ -9326,12 +9326,12 @@ Move_HYDRO_CANNON: @ 81D4DDE loadspritegfx ANIM_TAG_WATER_IMPACT monbg ANIM_BATTLER_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W057, SOUND_PAN_ATTACKER + playsewithpan SE_M_SURF, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D92D0, ANIM_BATTLER_TARGET, 2 delay 10 createvisualtask sub_80E2324, 2, 257, 257, 257 delay 30 - panse_1B SE_W056, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0 + panse_1B SE_M_HYDRO_PUMP, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0 call _81D4EA8 createvisualtask AnimTask_ShakeMon, 5, 1, 10, 0, 40, 1 createsprite gBattleAnimSpriteTemplate_83DB4D8, ANIM_BATTLER_TARGET, 2, 0, 0, 1, 0 @@ -9365,11 +9365,11 @@ _81D4EA8: Move_ASTONISH: @ 81D4F10 loadspritegfx ANIM_TAG_SWEAT_BEAD - playsewithpan SE_W227, SOUND_PAN_ATTACKER + playsewithpan SE_M_ENCORE, SOUND_PAN_ATTACKER createsprite gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 4, 6 delay 25 createsprite gBattleAnimSpriteTemplate_83DA62C, ANIM_BATTLER_TARGET, 5, 0, 1 - playsewithpan SE_W166, SOUND_PAN_TARGET + playsewithpan SE_M_SKETCH, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DA62C, ANIM_BATTLER_TARGET, 5, 1, 1 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 4, 0, 5, 1 createvisualtask sub_80D1E38, 3 @@ -9388,7 +9388,7 @@ Move_SEISMIC_TOSS: @ 81D4F58 fadetobg BG_SEISMICTOSS_SKUUPPERCUT waitbgfadeout createvisualtask sub_80DDA8C, 3 - playsewithpan SE_W327, 0 + playsewithpan SE_M_SKY_UPPERCUT, 0 waitbgfadein waitforvisualfinish createvisualtask sub_80DDAF0, 3 @@ -9426,7 +9426,7 @@ _81D4FD4: goto _81D4FA0 _81D4FF3: createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 3, -10, -8, 1, 1 - playsewithpan SE_W070, SOUND_PAN_TARGET + playsewithpan SE_M_STRENGTH, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 0, 3, 5, 1 createsprite gBattleAnimSpriteTemplate_83DAE00, ANIM_BATTLER_TARGET, 2, -12, 27, 2, 3 createsprite gBattleAnimSpriteTemplate_83DAE00, ANIM_BATTLER_TARGET, 2, 8, 28, 3, 4 @@ -9435,7 +9435,7 @@ _81D4FF3: return _81D5054: createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 3, 10, -8, 1, 1 - playsewithpan SE_W088, SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 0, 3, 5, 1 createsprite gBattleAnimSpriteTemplate_83DAE00, ANIM_BATTLER_TARGET, 2, -12, 32, 3, 4 createsprite gBattleAnimSpriteTemplate_83DAE00, ANIM_BATTLER_TARGET, 2, 8, 31, 2, 2 @@ -9446,7 +9446,7 @@ _81D5054: Move_MAGIC_COAT: @ 81D50B5 loadspritegfx ANIM_TAG_ORANGE_LIGHT_WALL setalpha 0, 16 - waitplaysewithpan SE_W112, SOUND_PAN_ATTACKER, 15 + waitplaysewithpan SE_M_BARRIER, SOUND_PAN_ATTACKER, 15 createsprite gBattleAnimSpriteTemplate_83DA708, ANIM_BATTLER_ATTACKER, 3, 40, 0, 10170 waitforvisualfinish delay 1 @@ -9458,7 +9458,7 @@ Move_WATER_PULSE: @ 81D50D2 loadspritegfx ANIM_TAG_BLUE_RING_2 monbg ANIM_BATTLER_TARGET monbgprio_28 1 - playsewithpan SE_W145C, SOUND_PAN_ATTACKER + playsewithpan SE_M_BUBBLE3, SOUND_PAN_ATTACKER createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 0, 0, 7, rgb(0, 25, 28) delay 10 createsprite gBattleAnimSpriteTemplate_83D9408, ANIM_BATTLER_ATTACKER, 66, 100, 100, 8, 1, 20, 40, 0 @@ -9466,15 +9466,15 @@ Move_WATER_PULSE: @ 81D50D2 createsprite gBattleAnimSpriteTemplate_83D9408, ANIM_BATTLER_ATTACKER, 66, 200, 80, 8, 1, 40, 20, 0 createsprite gBattleAnimSpriteTemplate_83D9408, ANIM_BATTLER_ATTACKER, 66, 80, 60, 10, 3, 20, 50, 0 createsprite gBattleAnimSpriteTemplate_83D9408, ANIM_BATTLER_ATTACKER, 66, 140, 100, 16, 1, 20, 30, 1 - playsewithpan SE_W145C, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET waitforvisualfinish - playsewithpan SE_W202, SOUND_PAN_ATTACKER + playsewithpan SE_M_GIGA_DRAIN, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D757C, ANIM_BATTLER_TARGET, 2, 0, 0, 40, 15 delay 5 - playsewithpan SE_W202, SOUND_PAN_ATTACKER + playsewithpan SE_M_GIGA_DRAIN, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D757C, ANIM_BATTLER_TARGET, 2, 0, 0, 40, 15 delay 5 - playsewithpan SE_W202, SOUND_PAN_ATTACKER + playsewithpan SE_M_GIGA_DRAIN, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D757C, ANIM_BATTLER_TARGET, 2, 0, 0, 40, 15 delay 13 createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 0, 8, 18, 1 @@ -9498,13 +9498,13 @@ Move_PSYCHO_BOOST: @ 81D51C7 setalpha 8, 8 delay 10 createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_ATTACKER, 3, 0, 240, 0 - loopsewithpan SE_W060B, SOUND_PAN_ATTACKER, 14, 10 + loopsewithpan SE_M_PSYBEAM2, SOUND_PAN_ATTACKER, 14, 10 createsprite gBattleAnimSpriteTemplate_83DAA68, ANIM_BATTLER_ATTACKER, 2 delay 110 - loopsewithpan SE_W060B, SOUND_PAN_ATTACKER, 7, 10 + loopsewithpan SE_M_PSYBEAM2, SOUND_PAN_ATTACKER, 7, 10 waitforvisualfinish createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, -8, 1, 24, 1 - playsewithpan SE_W043, SOUND_PAN_TARGET + playsewithpan SE_M_LEER, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_BATTLER_ATK_PARTNER blendoff @@ -9516,12 +9516,12 @@ Move_KNOCK_OFF: @ 81D523B loadspritegfx ANIM_TAG_IMPACT createsprite gHorizontalLungeSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 4, 6 delay 4 - playsewithpan SE_W233, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_8402AE4, ANIM_BATTLER_TARGET, 2, -16, -16 delay 8 createsprite gBattleAnimSpriteTemplate_83DB3DC, ANIM_BATTLER_ATTACKER, 2, 31, 5, 1, 32767, 10, 0, 0 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 3, 0, 0, 1, 2 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET createsprite gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, -12, 10, 0, 3 createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 5 delay 3 @@ -9540,7 +9540,7 @@ Move_DOOM_DESIRE: @ 81D52CB createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 1, 0, 4, rgb(0, 0, 0) waitforvisualfinish setalpha 8, 8 - playsewithpan SE_W060, SOUND_PAN_ATTACKER + playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER createvisualtask AnimTask_ScaleMonAndRestore, 5, -4, -4, 15, ANIM_BATTLER_ATTACKER, 1 waitforvisualfinish delay 20 @@ -9558,26 +9558,26 @@ Move_DOOM_DESIRE_Activate: @ 81D532F delay 10 createvisualtask sub_812E14C, 5 delay 5 - playsewithpan SE_W109, SOUND_PAN_ATTACKER + playsewithpan SE_M_CONFUSE_RAY, SOUND_PAN_ATTACKER delay 10 - playsewithpan SE_W109, 0 + playsewithpan SE_M_CONFUSE_RAY, 0 delay 10 - playsewithpan SE_W109, SOUND_PAN_TARGET + playsewithpan SE_M_CONFUSE_RAY, SOUND_PAN_TARGET delay 23 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BATTLER_TARGET, 10, 0, 20, 1 - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D7828, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 1 delay 6 - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D7828, ANIM_BATTLER_ATTACKER, 3, 24, -24, 1, 1 delay 6 - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D7828, ANIM_BATTLER_ATTACKER, 3, -16, 16, 1, 1 delay 6 - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D7828, ANIM_BATTLER_ATTACKER, 3, -24, -12, 1, 1 delay 6 - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D7828, ANIM_BATTLER_ATTACKER, 3, 16, 16, 1, 1 waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 3, 16, 0, rgb(31, 31, 31) @@ -9590,7 +9590,7 @@ Move_SKY_UPPERCUT: @ 81D53ED monbgprio_28 1 fadetobg BG_SEISMICTOSS_SKUUPPERCUT waitbgfadeout - playsewithpan SE_W327, SOUND_PAN_ATTACKER + playsewithpan SE_M_SKY_UPPERCUT, SOUND_PAN_ATTACKER createvisualtask sub_80D9C80, 5, 55 waitbgfadein setalpha 12, 8 @@ -9598,20 +9598,20 @@ Move_SKY_UPPERCUT: @ 81D53ED createsprite gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 28, 0, 0, 5 delay 4 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 4, 0, 6, 1 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 3, -28, 28, 1, 1 delay 1 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 3, -15, 8, 1, 1 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET delay 1 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 3, -5, -12, 1, 1 delay 1 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 3, 0, -32, 1, 1 delay 1 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 3, 5, -52, 1, 1 createsprite gSlideMonToOffsetSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, -26, 16, 1, 4 delay 4 @@ -9647,7 +9647,7 @@ Move_TWISTER: @ 81D553A loadspritegfx ANIM_TAG_ROCKS monbg ANIM_BATTLER_DEF_PARTNER monbgprio_28 1 - playsewithpan SE_W239, SOUND_PAN_TARGET + playsewithpan SE_M_TWISTER, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D64B4, ANIM_BATTLER_TARGET, 2, 120, 70, 5, 70, 30 delay 1 createsprite gBattleAnimSpriteTemplate_83D64B4, ANIM_BATTLER_TARGET, 2, 115, 55, 6, 60, 25 @@ -9670,18 +9670,18 @@ Move_TWISTER: @ 81D553A createsprite gBattleAnimSpriteTemplate_83D64B4, ANIM_BATTLER_TARGET, 2, 110, 10, 8, 32, 20 waitforvisualfinish createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 3, -32, -16, 1, 3 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BATTLER_TARGET, 3, 0, 12, 1 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BATTLER_DEF_PARTNER, 3, 0, 12, 1 delay 4 createsprite gBattleAnimSpriteTemplate_83DB4F0, ANIM_BATTLER_TARGET, 3, 1, 3 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET delay 4 createsprite gBattleAnimSpriteTemplate_83DB4F0, ANIM_BATTLER_TARGET, 3, 1, 3 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET delay 4 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 3, 32, 20, 1, 3 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_BATTLER_DEF_PARTNER blendoff @@ -9694,7 +9694,7 @@ Move_MAGICAL_LEAF: @ 81D5699 monbg ANIM_BATTLER_DEF_PARTNER setalpha 12, 8 delay 1 - loopsewithpan SE_W077, SOUND_PAN_ATTACKER, 10, 5 + loopsewithpan SE_M_POISON_POWDER, SOUND_PAN_ATTACKER, 10, 5 createvisualtask sub_80CC5F8, 5 createsprite gBattleAnimSpriteTemplate_83D649C, ANIM_BATTLER_ATTACKER, 2, -3, -2, 10 delay 2 @@ -9716,11 +9716,11 @@ Move_MAGICAL_LEAF: @ 81D5699 delay 2 createsprite gBattleAnimSpriteTemplate_83D649C, ANIM_BATTLER_ATTACKER, 2, -3, -5, 8 delay 60 - playsewithpan SE_W013B, SOUND_PAN_ATTACKER + playsewithpan SE_M_RAZOR_WIND2, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D64E4, ANIM_BATTLER_TARGET, 3, 20, -10, 20, 0, 32, 20, 0 createsprite gBattleAnimSpriteTemplate_83D64E4, ANIM_BATTLER_TARGET, 3, 20, -10, 20, 0, 32, -20, 0 delay 30 - playsewithpan SE_W013, SOUND_PAN_TARGET + playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 4, -10, -4, 1, 2 createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 4, 10, 4, 1, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 8, 1 @@ -9737,10 +9737,10 @@ Move_ICE_BALL: @ 81D57BA createvisualtask AnimTask_CountIceBallThrows, 5, 0 jumpargeq 0, 4, _81D5831 _81D57D1: - playsewithpan SE_W196, SOUND_PAN_ATTACKER + playsewithpan SE_M_ICY_WIND, SOUND_PAN_ATTACKER createsprite gIceBallSpriteTemplate, ANIM_BATTLER_TARGET, 2, 15, 0, -12, -16, 30, -40 delay 28 - playsewithpan SE_W280, SOUND_PAN_TARGET + playsewithpan SE_M_BRICK_BREAK, SOUND_PAN_TARGET createvisualtask AnimTask_CountIceBallThrows, 5, 0 jumpargeq 0, 0, _81D5842 jumpargeq 0, 1, _81D5871 @@ -9825,11 +9825,11 @@ Move_WEATHER_BALL: @ 81D5989 loadspritegfx ANIM_TAG_WEATHER_BALL createsprite gVerticalDipSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 8, 1, ANIM_BATTLER_ATTACKER delay 8 - playsewithpan SE_W207, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83930A8, ANIM_BATTLER_ATTACKER, 2 waitforvisualfinish delay 15 - playsewithpan SE_W197, 0 + playsewithpan SE_M_DETECT, 0 createsprite gBattleAnimSpriteTemplate_83DB3DC, ANIM_BATTLER_ATTACKER, 2, 31, 5, 1, 32767, 10, 0, 0 waitforvisualfinish createvisualtask AnimTask_GetWeather, 2 @@ -9843,7 +9843,7 @@ _81D59F4: loadspritegfx ANIM_TAG_IMPACT createsprite gBattleAnimSpriteTemplate_83930C0, ANIM_BATTLER_TARGET, 2, -30, -100, 25, 1, 0, 0 waitforvisualfinish - playsewithpan SE_W025B, SOUND_PAN_TARGET + playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 4, -10, 0, 1, 2 createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 0, 3, 8, 1 waitforvisualfinish @@ -9851,45 +9851,45 @@ _81D59F4: _81D5A31: loadspritegfx ANIM_TAG_SMALL_EMBER createsprite gBattleAnimSpriteTemplate_83D96AC, ANIM_BATTLER_TARGET, 2, -30, -100, 25, 1, 40, 10 - playsewithpan SE_W172, SOUND_PAN_TARGET + playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_TARGET delay 10 createsprite gBattleAnimSpriteTemplate_83D96AC, ANIM_BATTLER_TARGET, 2, -30, -100, 25, 1, -40, 20 - playsewithpan SE_W172, SOUND_PAN_TARGET + playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_TARGET delay 10 createsprite gBattleAnimSpriteTemplate_83D96AC, ANIM_BATTLER_TARGET, 2, -30, -100, 25, 1, 0, 0 - playsewithpan SE_W172, SOUND_PAN_TARGET + playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_TARGET waitforvisualfinish - playsewithpan SE_W172B, SOUND_PAN_TARGET + playsewithpan SE_M_FLAME_WHEEL2, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 0, 3, 8, 1 waitforvisualfinish end _81D5A95: loadspritegfx ANIM_TAG_SMALL_BUBBLES createsprite gBattleAnimSpriteTemplate_83D9438, ANIM_BATTLER_TARGET, 2, -30, -100, 25, 1, 50, 10 - playsewithpan SE_W152, SOUND_PAN_TARGET + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_TARGET delay 8 createsprite gBattleAnimSpriteTemplate_83D9438, ANIM_BATTLER_TARGET, 2, -30, -100, 25, 1, -20, 20 - playsewithpan SE_W152, SOUND_PAN_TARGET + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_TARGET delay 13 createsprite gBattleAnimSpriteTemplate_83D9438, ANIM_BATTLER_TARGET, 2, -30, -100, 25, 1, 0, 0 - playsewithpan SE_W152, SOUND_PAN_TARGET + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_TARGET waitforvisualfinish createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 0, 3, 8, 1 - playsewithpan SE_W202, SOUND_PAN_TARGET + playsewithpan SE_M_GIGA_DRAIN, SOUND_PAN_TARGET waitforvisualfinish end _81D5AF9: loadspritegfx ANIM_TAG_ROCKS createsprite gBattleAnimSpriteTemplate_83DAE30, ANIM_BATTLER_TARGET, 2, -30, -100, 25, 1, 30, 0 - playsewithpan SE_W088, SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET delay 5 createsprite gBattleAnimSpriteTemplate_83DAE30, ANIM_BATTLER_TARGET, 2, -30, -100, 25, 1, -40, 20 - playsewithpan SE_W088, SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET delay 14 createsprite gBattleAnimSpriteTemplate_83DAE30, ANIM_BATTLER_TARGET, 2, -30, -100, 25, 1, 0, 0 - playsewithpan SE_W088, SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET waitforvisualfinish - playsewithpan SE_W070, SOUND_PAN_TARGET + playsewithpan SE_M_STRENGTH, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DAE00, ANIM_BATTLER_TARGET, 2, -12, 27, 2, 3 createsprite gBattleAnimSpriteTemplate_83DAE00, ANIM_BATTLER_TARGET, 2, 8, 28, 3, 4 createsprite gBattleAnimSpriteTemplate_83DAE00, ANIM_BATTLER_TARGET, 2, -4, 30, 2, 3 @@ -9901,16 +9901,16 @@ _81D5B99: loadspritegfx ANIM_TAG_HAIL loadspritegfx ANIM_TAG_ICE_CRYSTALS createsprite gWeatherBallHailSpriteTemplate, ANIM_BATTLER_TARGET, 2, -30, -100, 25, 25, -40, 20 - playsewithpan SE_W258, SOUND_PAN_TARGET + playsewithpan SE_M_HAIL, SOUND_PAN_TARGET delay 10 createsprite gWeatherBallHailSpriteTemplate, ANIM_BATTLER_TARGET, 2, -30, -100, 25, 25, 40, 0 - playsewithpan SE_W258, SOUND_PAN_TARGET + playsewithpan SE_M_HAIL, SOUND_PAN_TARGET delay 10 createsprite gWeatherBallHailSpriteTemplate, ANIM_BATTLER_TARGET, 2, -30, -100, 25, 25, 0, 0 - playsewithpan SE_W258, SOUND_PAN_TARGET + playsewithpan SE_M_HAIL, SOUND_PAN_TARGET waitforvisualfinish createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 8, 1 - playsewithpan SE_W196, SOUND_PAN_TARGET + playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET call Effect_LightIceDamage waitforvisualfinish end @@ -9919,7 +9919,7 @@ PoundCopy: @ 81D5C05 loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BATTLER_TARGET setalpha 12, 8 - playsewithpan SE_W003, SOUND_PAN_TARGET + playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 3, 0, 6, 1 waitforvisualfinish @@ -9929,64 +9929,64 @@ PoundCopy: @ 81D5C05 Effect_LightIceDamage: @ 81D5C36 createsprite gLargeIceEffectParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, -10, -10, 0 - playsewithpan SE_W196, SOUND_PAN_TARGET + playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET delay 4 createsprite gSmallIceEffectParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, 10, 20, 0 - playsewithpan SE_W196, SOUND_PAN_TARGET + playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET delay 4 createsprite gLargeIceEffectParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, -5, 10, 0 - playsewithpan SE_W196, SOUND_PAN_TARGET + playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET delay 4 createsprite gSmallIceEffectParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, 17, -12, 0 - playsewithpan SE_W196, SOUND_PAN_TARGET + playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET delay 4 createsprite gSmallIceEffectParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, -15, 15, 0 - playsewithpan SE_W196, SOUND_PAN_TARGET + playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET delay 4 createsprite gSmallIceEffectParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, 0, 0, 0 - playsewithpan SE_W196, SOUND_PAN_TARGET + playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET delay 4 createsprite gLargeIceEffectParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, 20, 2, 0 - playsewithpan SE_W196, SOUND_PAN_TARGET + playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET return Effect_HeavyIceDamage: @ 81D5CBA createsprite gLargeIceEffectParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, -10, -10, 1 - playsewithpan SE_W196, SOUND_PAN_TARGET + playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET delay 4 createsprite gSmallIceEffectParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, 10, 20, 1 - playsewithpan SE_W196, SOUND_PAN_TARGET + playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET delay 4 createsprite gLargeIceEffectParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, -29, 0, 1 - playsewithpan SE_W196, SOUND_PAN_TARGET + playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET delay 4 createsprite gSmallIceEffectParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, 29, -20, 1 - playsewithpan SE_W196, SOUND_PAN_TARGET + playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET delay 4 createsprite gLargeIceEffectParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, -5, 10, 1 - playsewithpan SE_W196, SOUND_PAN_TARGET + playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET delay 4 createsprite gSmallIceEffectParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, 17, -12, 1 - playsewithpan SE_W196, SOUND_PAN_TARGET + playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET delay 4 createsprite gLargeIceEffectParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, -20, 0, 1 - playsewithpan SE_W196, SOUND_PAN_TARGET + playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET delay 4 createsprite gSmallIceEffectParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, -15, 15, 1 - playsewithpan SE_W196, SOUND_PAN_TARGET + playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET delay 4 createsprite gSmallIceEffectParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, 26, -5, 1 - playsewithpan SE_W196, SOUND_PAN_TARGET + playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET delay 4 createsprite gSmallIceEffectParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, 0, 0, 1 - playsewithpan SE_W196, SOUND_PAN_TARGET + playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET delay 4 createsprite gLargeIceEffectParticleSpriteTemplate, ANIM_BATTLER_TARGET, 2, 20, 2, 1 - playsewithpan SE_W196, SOUND_PAN_TARGET + playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET return Unknown_81D5D8A: @ 81D5D8A - loopsewithpan SE_W196, SOUND_PAN_TARGET, 6, 4 + loopsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET, 6, 4 createsprite gIceSpikeSpriteTemplate, ANIM_BATTLER_TARGET, 2, 0, 24, 0 delay 4 createsprite gIceSpikeSpriteTemplate, ANIM_BATTLER_TARGET, 2, 8, 24, 0 @@ -10003,7 +10003,7 @@ Unknown_81D5D8A: @ 81D5D8A return Unknown_81D5E0E: @ 81D5E0E Icy Wind animates end bit with the wavy shiz - loopsewithpan SE_W196, SOUND_PAN_TARGET, 6, 4 + loopsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET, 6, 4 createsprite gIceSpikeSpriteTemplate, ANIM_BATTLER_TARGET, 2, 0, 24, 1 delay 4 createsprite gIceSpikeSpriteTemplate, ANIM_BATTLER_TARGET, 2, 8, 24, 1 @@ -10033,7 +10033,7 @@ Unknown_81D5ECA: @ 81D5ECA return Unknown_81D5EF5: @ 81D5EF5 - playsewithpan SE_W071B, SOUND_PAN_ATTACKER + playsewithpan SE_M_ABSORB_2, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D7038, ANIM_BATTLER_ATTACKER, 2, 0, -5, 0, 0 delay 7 createsprite gBattleAnimSpriteTemplate_83D7038, ANIM_BATTLER_ATTACKER, 2, -15, 10, 0, 0 @@ -10045,7 +10045,7 @@ Unknown_81D5EF5: @ 81D5EF5 return Unknown_81D5F3E: @ 81D5F3E - playsewithpan SE_W071B, SOUND_PAN_TARGET + playsewithpan SE_M_ABSORB_2, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D7038, ANIM_BATTLER_TARGET, 2, 0, -5, 1, 0 delay 7 createsprite gBattleAnimSpriteTemplate_83D7038, ANIM_BATTLER_TARGET, 2, -15, 10, 1, 0 @@ -10058,72 +10058,72 @@ Unknown_81D5F3E: @ 81D5F3E PoisonBubblesAnim: @ 81D5F87 createsprite gPoisonBubbleSpriteTemplate, ANIM_BATTLER_TARGET, 2, 10, 10, 0 - playsewithpan SE_W092, SOUND_PAN_TARGET + playsewithpan SE_M_TOXIC, SOUND_PAN_TARGET delay 6 createsprite gPoisonBubbleSpriteTemplate, ANIM_BATTLER_TARGET, 2, 20, -20, 0 - playsewithpan SE_W092, SOUND_PAN_TARGET + playsewithpan SE_M_TOXIC, SOUND_PAN_TARGET delay 6 createsprite gPoisonBubbleSpriteTemplate, ANIM_BATTLER_TARGET, 2, -20, 15, 0 - playsewithpan SE_W092, SOUND_PAN_TARGET + playsewithpan SE_M_TOXIC, SOUND_PAN_TARGET delay 6 createsprite gPoisonBubbleSpriteTemplate, ANIM_BATTLER_TARGET, 2, 0, 0, 0 - playsewithpan SE_W092, SOUND_PAN_TARGET + playsewithpan SE_M_TOXIC, SOUND_PAN_TARGET delay 6 createsprite gPoisonBubbleSpriteTemplate, ANIM_BATTLER_TARGET, 2, -20, -20, 0 - playsewithpan SE_W092, SOUND_PAN_TARGET + playsewithpan SE_M_TOXIC, SOUND_PAN_TARGET delay 6 createsprite gPoisonBubbleSpriteTemplate, ANIM_BATTLER_TARGET, 2, 16, -8, 0 - playsewithpan SE_W092, SOUND_PAN_TARGET + playsewithpan SE_M_TOXIC, SOUND_PAN_TARGET return WaterBubbleEffect: @ 81D5FF8 createsprite gWaterBubbleSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 10, 10, 0 - playsewithpan SE_W145C, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET delay 6 createsprite gWaterBubbleSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 20, -20, 0 - playsewithpan SE_W145C, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET delay 6 createsprite gWaterBubbleSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -20, 15, 0 - playsewithpan SE_W145C, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET delay 6 createsprite gWaterBubbleSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 0 - playsewithpan SE_W145C, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET delay 6 createsprite gWaterBubbleSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -20, -20, 0 - playsewithpan SE_W145C, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET delay 6 createsprite gWaterBubbleSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 16, -8, 0 - playsewithpan SE_W145C, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET return WaterBubbleEffect2: @ 81D6069 createsprite gWaterBubbleSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 10, 10, 1 - playsewithpan SE_W145C, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET delay 6 createsprite gWaterBubbleSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -28, -10, 1 - playsewithpan SE_W145C, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET delay 6 createsprite gWaterBubbleSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 20, -20, 1 - playsewithpan SE_W145C, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET delay 6 createsprite gWaterBubbleSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -20, 15, 1 - playsewithpan SE_W145C, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET delay 6 createsprite gWaterBubbleSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1 - playsewithpan SE_W145C, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET delay 6 createsprite gWaterBubbleSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 27, 8, 1 - playsewithpan SE_W145C, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET delay 6 createsprite gWaterBubbleSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, -20, -20, 1 - playsewithpan SE_W145C, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET delay 6 createsprite gWaterBubbleSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 16, -8, 1 - playsewithpan SE_W145C, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET return ElectricityEffect: @ 81D6100 - playsewithpan SE_W085B, SOUND_PAN_TARGET + playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_TARGET createsprite gElectricitySpriteTemplate, ANIM_BATTLER_TARGET, 2, 5, 0, 5, 0 delay 2 createsprite gElectricitySpriteTemplate, ANIM_BATTLER_TARGET, 2, -5, 10, 5, 1 @@ -10142,7 +10142,7 @@ ElectricityEffect: @ 81D6100 return ConfusionEffect: @ 81D618B - loopsewithpan SE_W146, SOUND_PAN_TARGET, 13, 6 + loopsewithpan SE_M_DIZZY_PUNCH, SOUND_PAN_TARGET, 13, 6 createsprite gConfusionDuckSpriteTemplate, ANIM_BATTLER_TARGET, 2, 0, -15, 0, 3, 90 createsprite gConfusionDuckSpriteTemplate, ANIM_BATTLER_TARGET, 2, 0, -15, 51, 3, 90 createsprite gConfusionDuckSpriteTemplate, ANIM_BATTLER_TARGET, 2, 0, -15, 102, 3, 90 @@ -10214,7 +10214,7 @@ Unknown_81D626D: @ 81D626D return StatusCondition_Poison: @ 81D6270 - loopsewithpan SE_W092, SOUND_PAN_TARGET, 13, 6 + loopsewithpan SE_M_TOXIC, SOUND_PAN_TARGET, 13, 6 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_ATTACKER, 1, 0, 18, 2 createvisualtask sub_80E1F8C, 2, 2, 2, 2, 0, 12, 31774 end @@ -10226,7 +10226,7 @@ StatusCondition_Confusion: @ 81D629B StatusCondition_Burn: @ 81D62A4 loadspritegfx ANIM_TAG_SMALL_EMBER - playsewithpan SE_W172, SOUND_PAN_TARGET + playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_TARGET call ConditionBurnFire call ConditionBurnFire call ConditionBurnFire @@ -10239,19 +10239,19 @@ ConditionBurnFire: StatusCondition_Love: @ 81D62D4 loadspritegfx ANIM_TAG_MAGENTA_HEART - playsewithpan SE_W204, SOUND_PAN_ATTACKER + playsewithpan SE_M_CHARM, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D7A80, ANIM_BATTLER_ATTACKER, 3, 0, 20 delay 15 - playsewithpan SE_W204, SOUND_PAN_ATTACKER + playsewithpan SE_M_CHARM, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D7A80, ANIM_BATTLER_ATTACKER, 3, -20, 20 delay 15 - playsewithpan SE_W204, SOUND_PAN_ATTACKER + playsewithpan SE_M_CHARM, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D7A80, ANIM_BATTLER_ATTACKER, 3, 20, 20 end StatusCondition_Sleep: @ 81D6309 loadspritegfx ANIM_TAG_LETTER_Z - playsewithpan SE_W173, SOUND_PAN_ATTACKER + playsewithpan SE_M_SNORE, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D6D94, ANIM_BATTLER_ATTACKER, 2, 4, -10, 16, 0, 0 delay 30 createsprite gBattleAnimSpriteTemplate_83D6D94, ANIM_BATTLER_ATTACKER, 2, 4, -10, 16, 0, 0 @@ -10264,11 +10264,11 @@ StatusCondition_Paralysis: @ 81D6335 end StatusCondition_Ice: @ 81D634F - playsewithpan SE_W196, 0 + playsewithpan SE_M_ICY_WIND, 0 loadspritegfx ANIM_TAG_ICE_CUBE monbg ANIM_BATTLER_DEF_PARTNER monbgprio_28 1 - waitplaysewithpan SE_W258, SOUND_PAN_TARGET, 17 + waitplaysewithpan SE_M_HAIL, SOUND_PAN_TARGET, 17 createvisualtask sub_807B920, 2 waitforvisualfinish clearmonbg ANIM_BATTLER_DEF_PARTNER @@ -10277,7 +10277,7 @@ StatusCondition_Ice: @ 81D634F StatusCondition_Curse: @ 81D636A loadspritegfx ANIM_TAG_GHOSTLY_SPIRIT monbg ANIM_BATTLER_DEF_PARTNER - playsewithpan SE_W171, SOUND_PAN_TARGET + playsewithpan SE_M_NIGHTMARE, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DAF38, ANIM_BATTLER_TARGET, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 14, 1 waitforvisualfinish @@ -10287,7 +10287,7 @@ StatusCondition_Curse: @ 81D636A StatusCondition_Nightmare: @ 81D638F loadspritegfx ANIM_TAG_DEVIL monbg ANIM_BATTLER_DEF_PARTNER - playsewithpan SE_W171, SOUND_PAN_TARGET + playsewithpan SE_M_NIGHTMARE, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DAF50, ANIM_BATTLER_TARGET, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 14, 1 waitforvisualfinish @@ -10300,8 +10300,8 @@ General_CastformChange: @ 81D63B4 goto _81D63C8 _81D63C8: monbg ANIM_BATTLER_ATTACKER - playsewithpan SE_W100, SOUND_PAN_ATTACKER - waitplaysewithpan SE_W107, SOUND_PAN_ATTACKER, 48 + playsewithpan SE_M_TELEPORT, SOUND_PAN_ATTACKER + waitplaysewithpan SE_M_MINIMIZE, SOUND_PAN_ATTACKER, 48 createvisualtask sub_812D7E8, 2, 1 waitforvisualfinish clearmonbg ANIM_BATTLER_ATTACKER @@ -10336,10 +10336,10 @@ General_PokeblockThrow: @ 81D6438 createvisualtask sub_8141D7C, 2 createvisualtask sub_8141BD4, 2 delay 0 - waitplaysewithpan SE_W026, SOUND_PAN_ATTACKER, 22 + waitplaysewithpan SE_M_JUMP_KICK, SOUND_PAN_ATTACKER, 22 createsprite gBattleAnimSpriteTemplate_840B4FC, ANIM_BATTLER_TARGET, 3, -16, 7, 0, 32 delay 50 - loopsewithpan SE_W039, SOUND_PAN_TARGET, 19, 2 + loopsewithpan SE_M_TAIL_WHIP, SOUND_PAN_TARGET, 19, 2 createvisualtask AnimTask_SwayMon, 5, 1, 8, 1536, 2, 1 waitforvisualfinish createvisualtask sub_8141C08, 2 @@ -10359,7 +10359,7 @@ General_TurnTrap: @ 81D6489 goto WrapHit WrapHit: loadspritegfx ANIM_TAG_TENDRILS - loopsewithpan SE_W010, SOUND_PAN_TARGET, 6, 2 + loopsewithpan SE_M_SCRATCH, SOUND_PAN_TARGET, 6, 2 createsprite gBattleAnimSpriteTemplate_83D65A0, ANIM_BATTLER_TARGET, 4, 0, 16, 0, 1 delay 7 createsprite gBattleAnimSpriteTemplate_83D65A0, ANIM_BATTLER_TARGET, 2, 0, 8, 1, 1 @@ -10367,12 +10367,12 @@ WrapHit: createvisualtask AnimTask_ShakeMon2, 2, ANIM_BATTLER_TARGET, 2, 0, 8, 1 delay 20 setarg ARG_RET_ID, -1 - playsewithpan SE_W020, SOUND_PAN_TARGET + playsewithpan SE_M_BIND, SOUND_PAN_TARGET waitforvisualfinish end FireSpinHit: loadspritegfx ANIM_TAG_SMALL_EMBER - playsewithpan SE_W221B, SOUND_PAN_TARGET + playsewithpan SE_M_SACRED_FIRE2, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 5, 1, 0, 2, 30, 1 call _81C90BF call _81C90BF @@ -10386,7 +10386,7 @@ WhirlpoolHit: setalpha 12, 8 delay 0 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 0, 4, 2, 0, 7, rgb(0, 13, 23) - playsewithpan SE_W250, SOUND_PAN_TARGET + playsewithpan SE_M_WHIRLPOOL, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 5, 1, 0, 2, 30, 1 call _81D03E4 call _81D03E4 @@ -10401,7 +10401,7 @@ ClampHit: loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BATTLER_TARGET setalpha 12, 8 - playsewithpan SE_W011, SOUND_PAN_TARGET + playsewithpan SE_M_VICEGRIP, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DB1E8, ANIM_BATTLER_ATTACKER, 2, -32, 0, 2, 819, 0, 10 createsprite gBattleAnimSpriteTemplate_83DB1E8, ANIM_BATTLER_ATTACKER, 2, 32, 0, 6, -819, 0, 10 delay 10 @@ -10416,7 +10416,7 @@ SandTombHit: loadspritegfx ANIM_TAG_MUD_SAND createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 0, 4, 2, 0, 7, rgb(19, 17, 0) createvisualtask AnimTask_ShakeMon, 5, 1, 0, 2, 30, 1 - playsewithpan SE_W328, SOUND_PAN_TARGET + playsewithpan SE_M_SAND_TOMB, SOUND_PAN_TARGET call _81D361F call _81D361F delay 22 @@ -10429,19 +10429,19 @@ General_ItemEffect: @ 81D661C loadspritegfx ANIM_TAG_THIN_RING loadspritegfx ANIM_TAG_SPARKLE_2 delay 0 - playsewithpan SE_W036, SOUND_PAN_ATTACKER + playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER createvisualtask sub_80A8EFC, 2, 16, 128, 0, 2 waitforvisualfinish - playsewithpan SE_W036, SOUND_PAN_ATTACKER + playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER createvisualtask sub_80A8EFC, 2, 16, 128, 0, 2 waitforvisualfinish - playsewithpan SE_W036, SOUND_PAN_ATTACKER + playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER createvisualtask sub_80A8EFC, 2, 16, 128, 0, 2 waitforvisualfinish - playsewithpan SE_W234, SOUND_PAN_ATTACKER + playsewithpan SE_M_MORNING_SUN, SOUND_PAN_ATTACKER call Unknown_81D5ECA waitforvisualfinish - playsewithpan SE_REAPOKE, SOUND_PAN_ATTACKER + playsewithpan SE_SHINY, SOUND_PAN_ATTACKER createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 2, 3, 7, 0, rgb(17, 31, 25) createsprite gBattleAnimSpriteTemplate_83D7928, ANIM_BATTLER_ATTACKER, 3, 0, 0, 0, 0 waitforvisualfinish @@ -10452,24 +10452,24 @@ General_SmokeballEscape: @ 81D6690 monbg ANIM_BATTLER_ATTACKER setalpha 12, 4 delay 0 - playsewithpan SE_BOWA2, SOUND_PAN_TARGET + playsewithpan SE_BALL_OPEN, SOUND_PAN_TARGET createsprite gPinkSmokeTemplate, ANIM_BATTLER_TARGET, 0, 0, 32, 28, 30 delay 4 - playsewithpan SE_BOWA2, SOUND_PAN_TARGET + playsewithpan SE_BALL_OPEN, SOUND_PAN_TARGET createsprite gPinkSmokeTemplate, ANIM_BATTLER_ATTACKER, 127, 2, 12, 20, 30 delay 12 - playsewithpan SE_BOWA2, SOUND_PAN_TARGET + playsewithpan SE_BALL_OPEN, SOUND_PAN_TARGET createsprite gPinkSmokeTemplate, ANIM_BATTLER_ATTACKER, 126, 2, -28, 4, 30 delay 4 delay 8 - playsewithpan SE_BOWA2, SOUND_PAN_TARGET + playsewithpan SE_BALL_OPEN, SOUND_PAN_TARGET createsprite gPinkSmokeTemplate, ANIM_BATTLER_ATTACKER, 124, 2, 14, -20, 30 delay 4 - playsewithpan SE_BOWA2, SOUND_PAN_TARGET + playsewithpan SE_BALL_OPEN, SOUND_PAN_TARGET createvisualtask sub_80DFC24, 2, 2 createsprite gPinkSmokeTemplate, ANIM_BATTLER_ATTACKER, 123, 3, 4, 4, 30 delay 14 - playsewithpan SE_BOWA2, SOUND_PAN_TARGET + playsewithpan SE_BALL_OPEN, SOUND_PAN_TARGET createsprite gPinkSmokeTemplate, ANIM_BATTLER_ATTACKER, 122, 3, -14, 18, 46 delay 0 createsprite gPinkSmokeTemplate, ANIM_BATTLER_ATTACKER, 121, 3, 14, -14, 46 @@ -10488,7 +10488,7 @@ General_SmokeballEscape: @ 81D6690 General_HangedOn: @ 81D676E createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 0, 2, 7, 0, 9, rgb(31, 0, 0) - playsewithpan SE_W082, SOUND_PAN_ATTACKER + playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER createvisualtask sub_812FC68, 5, 30, 128, 0, 1, 2, 0, 1 waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 0, 2, 4, 9, 0, rgb(31, 0, 0) @@ -10499,7 +10499,7 @@ General_HangedOn: @ 81D676E General_Rain: @ 81D67BB loadspritegfx ANIM_TAG_RAIN_DROPS - playsewithpan SE_W240, SOUND_PAN_ATTACKER + playsewithpan SE_M_RAIN_DANCE, SOUND_PAN_ATTACKER createvisualtask sub_80E2A38, 10, 1921, 2, 0, 4, 0 waitforvisualfinish createvisualtask CreateAnimRaindrops, 2, 0, 3, 60 @@ -10528,7 +10528,7 @@ General_MonHit: @ 81D6821 loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BATTLER_TARGET setalpha 12, 8 - playsewithpan SE_W003, SOUND_PAN_TARGET + playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 3, 0, 6, 1 waitforvisualfinish @@ -10559,22 +10559,22 @@ _81D68AE: call Unknown_81D6AD6 end _81D68B5: - playsewithpan SE_W104, SOUND_PAN_ATTACKER + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER createvisualtask AnimTask_SnatchOpposingMonMove, 2 goto _81D68AE _81D68C5: - playsewithpan SE_W104, SOUND_PAN_ATTACKER + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER createvisualtask AnimTask_SnatchPartnerMove, 2 goto _81D68AE General_FutureSightHit: @ 81D68D5 createvisualtask sub_80E42B0, 2 monbg ANIM_BATTLER_DEF_PARTNER - playsewithpan SE_W060, SOUND_PAN_ATTACKER + playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER call SetPsychicBackground setalpha 8, 8 - playsewithpan SE_W048, SOUND_PAN_TARGET - waitplaysewithpan SE_W048, SOUND_PAN_TARGET, 8 + playsewithpan SE_M_SUPERSONIC, SOUND_PAN_TARGET + waitplaysewithpan SE_M_SUPERSONIC, SOUND_PAN_TARGET, 8 createvisualtask AnimTask_ShakeMon, 2, ANIM_BATTLER_TARGET, 4, 0, 15, 1 createvisualtask AnimTask_ScaleMonAndRestore, 5, -5, -5, 15, ANIM_BATTLER_TARGET, 1 waitforvisualfinish @@ -10595,26 +10595,26 @@ General_DoomDesireHit: @ 81D6934 delay 10 createvisualtask sub_812E14C, 5 delay 9 - playsewithpan SE_W109, SOUND_PAN_ATTACKER + playsewithpan SE_M_CONFUSE_RAY, SOUND_PAN_ATTACKER delay 9 - playsewithpan SE_W109, 0 + playsewithpan SE_M_CONFUSE_RAY, 0 delay 9 - playsewithpan SE_W109, SOUND_PAN_TARGET + playsewithpan SE_M_CONFUSE_RAY, SOUND_PAN_TARGET delay 25 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BATTLER_TARGET, 10, 0, 20, 1 - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D7828, ANIM_BATTLER_ATTACKER, 3, 0, 0, 1, 1 delay 6 - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D7828, ANIM_BATTLER_ATTACKER, 3, 24, -24, 1, 1 delay 6 - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D7828, ANIM_BATTLER_ATTACKER, 3, -16, 16, 1, 1 delay 6 - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D7828, ANIM_BATTLER_ATTACKER, 3, -24, -12, 1, 1 delay 6 - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D7828, ANIM_BATTLER_ATTACKER, 3, 16, 16, 1, 1 waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 3, 16, 0, rgb(31, 31, 31) @@ -10623,7 +10623,7 @@ General_DoomDesireHit: @ 81D6934 General_FocusPunchSetUp: @ 81D69F9 loadspritegfx ANIM_TAG_FOCUS_ENERGY - playsewithpan SE_W082, SOUND_PAN_ATTACKER + playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER call EndureFlamesAnim delay 8 createvisualtask sub_80E1F8C, 2, 2, 2, 2, 0, 11, 31 @@ -10658,7 +10658,7 @@ General_WishHeal: @ 81D6A7C loadspritegfx ANIM_TAG_SPARKLE_2 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_BATTLER_ATTACKER, 2, 1, 3, 0, 10, rgb(0, 0, 0) waitforvisualfinish - playsewithpan SE_W025, SOUND_PAN_ATTACKER + playsewithpan SE_M_MEGA_KICK, SOUND_PAN_ATTACKER call Unknown_81D5ECA waitforvisualfinish call Unknown_81D5EF5 @@ -10689,7 +10689,7 @@ _81D6AE7: goto _81D6AE5 Special_LevelUp: @ 81D6AF6 - playsewithpan SE_EXPMAX, 0 + playsewithpan SE_EXP_MAX, 0 createvisualtask sub_813F4EC, 2 delay 0 createvisualtask sub_813F6A0, 5, 0, 0 @@ -10712,7 +10712,7 @@ Special_SwitchOutOpponentMon: @ 81D6B28 Special_BallThrow: @ 81D6B39 createvisualtask sub_813F990, 2 delay 0 - playsewithpan SE_NAGERU, 0 + playsewithpan SE_BALL_THROW, 0 createvisualtask sub_813FA94, 2 createvisualtask sub_813F9E0, 2 jumpargeq 7, -1, _81D6B65 @@ -10726,7 +10726,7 @@ _81D6B65: monbg ANIM_BATTLER_DEF_PARTNER setalpha 12, 8 delay 0 - playsewithpan SE_W003, SOUND_PAN_TARGET + playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_BATTLER_TARGET, 2, -4, -20, 1, 2 waitforvisualfinish clearmonbg ANIM_BATTLER_DEF_PARTNER diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index a62b74fe5..ecc01d41d 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -3193,7 +3193,7 @@ BattleScript_Pausex20:: @ 81D8EEF return BattleScript_LevelUp:: @ 81D8EF3 - fanfare MUS_FANFA1 + fanfare MUS_LEVEL_UP printstring BATTLE_TEXT_GrewLevel setbyte sLVLBOX_STATE, 0 drawlvlupbox @@ -3225,7 +3225,7 @@ BattleScript_ForgotAndLearnedNewMove: @ 81D8F46 BattleScript_LearnedNewMove: @ 81D8F4F buffermovetolearn - fanfare MUS_FANFA1 + fanfare MUS_LEVEL_UP printstring BATTLE_TEXT_LearnedMove waitmessage 64 updatechoicemoveonlvlup USER diff --git a/data/battle_scripts_2.s b/data/battle_scripts_2.s index cc7a58d1c..a707bfa2f 100644 --- a/data/battle_scripts_2.s +++ b/data/battle_scripts_2.s @@ -112,7 +112,7 @@ BattleScript_PlayerUsesItem: @ 81D9F45 BattleScript_OpponentUsesHealItem: @ 81D9F4F pause 48 - playse SE_KAIFUKU + playse SE_USE_ITEM printstring BATTLE_TEXT_Used2 waitmessage 64 useitemonopponent @@ -128,7 +128,7 @@ BattleScript_OpponentUsesHealItem: @ 81D9F4F BattleScript_OpponentUsesStatusCureItem: @ 81D9F7B pause 48 - playse SE_KAIFUKU + playse SE_USE_ITEM printstring BATTLE_TEXT_Used2 waitmessage 64 useitemonopponent @@ -141,7 +141,7 @@ BattleScript_OpponentUsesStatusCureItem: @ 81D9F7B BattleScript_OpponentUsesXItem: @ 81D9F9C pause 48 - playse SE_KAIFUKU + playse SE_USE_ITEM printstring BATTLE_TEXT_Used2 waitmessage 64 useitemonopponent @@ -153,7 +153,7 @@ BattleScript_OpponentUsesXItem: @ 81D9F9C BattleScript_OpponentUsesGuardSpecs: @ 81D9FBB pause 48 - playse SE_KAIFUKU + playse SE_USE_ITEM printstring BATTLE_TEXT_Used2 waitmessage 64 useitemonopponent @@ -164,7 +164,7 @@ BattleScript_OpponentUsesGuardSpecs: @ 81D9FBB finishaction BattleScript_RunByUsingItem: @ 81D9FDA - playse SE_NIGERU + playse SE_FLEE setbyte gBattleOutcome, B_OUTCOME_RAN finishturn diff --git a/data/event_scripts.s b/data/event_scripts.s index 83e558714..f6b62b32c 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -867,13 +867,13 @@ Common_EventScript_SetLegendaryWeather:: @ 81A02C1 return Common_EventScript_PlayGymBadgeFanfare:: @ 81A02C5 - playfanfare MUS_ME_BACHI + playfanfare MUS_OBTAIN_BADGE waitfanfare return Common_EventScript_OutOfCenterPartyHeal:: @ 81A02CA fadescreen FADE_TO_BLACK - playfanfare MUS_ME_ASA + playfanfare MUS_HEAL waitfanfare special ScrSpecial_HealPlayerParty fadescreen FADE_FROM_BLACK @@ -890,7 +890,7 @@ EventScript_RegionMap:: @ 81A02D6 Common_EventScript_PlayBrineysBoatMusic:: @ 81A02E7 setflag FLAG_DONT_TRANSITION_MUSIC - playbgm MUS_M_BOAT, FALSE + playbgm MUS_SAILING, FALSE return Common_EventScript_StopBrineysBoatMusic:: @ 81A02EF @@ -973,7 +973,7 @@ Common_EventScript_NameReceivedPartyMon:: @ 81A0678 Common_EventScript_PlayerHandedOverTheItem:: @ 81A067F bufferitemname 0, VAR_0x8004 - playfanfare MUS_ME_WAZA + playfanfare MUS_OBTAIN_TMHM message FallarborTown_House1_Text_1A1498 waitmessage waitfanfare diff --git a/data/maps/AbandonedShip_CaptainsOffice/map.json b/data/maps/AbandonedShip_CaptainsOffice/map.json index 9a504ae6d..a2aa1c82a 100644 --- a/data/maps/AbandonedShip_CaptainsOffice/map.json +++ b/data/maps/AbandonedShip_CaptainsOffice/map.json @@ -2,7 +2,7 @@ "id": "MAP_ABANDONED_SHIP_CAPTAINS_OFFICE", "name": "AbandonedShip_CaptainsOffice", "layout": "LAYOUT_ABANDONED_SHIP_CAPTAINS_OFFICE", - "music": "MUS_DAN02", + "music": "MUS_ABANDONED_SHIP", "region_map_section": "MAPSEC_ABANDONED_SHIP", "requires_flash": false, "weather": "WEATHER_SHADE", diff --git a/data/maps/AbandonedShip_Corridors_1F/map.json b/data/maps/AbandonedShip_Corridors_1F/map.json index 637081cd8..837d70cd8 100644 --- a/data/maps/AbandonedShip_Corridors_1F/map.json +++ b/data/maps/AbandonedShip_Corridors_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ABANDONED_SHIP_CORRIDORS_1F", "name": "AbandonedShip_Corridors_1F", "layout": "LAYOUT_ABANDONED_SHIP_CORRIDORS_1F", - "music": "MUS_DAN02", + "music": "MUS_ABANDONED_SHIP", "region_map_section": "MAPSEC_ABANDONED_SHIP", "requires_flash": false, "weather": "WEATHER_SHADE", diff --git a/data/maps/AbandonedShip_Corridors_B1F/map.json b/data/maps/AbandonedShip_Corridors_B1F/map.json index edc74fe01..18ef1f87c 100644 --- a/data/maps/AbandonedShip_Corridors_B1F/map.json +++ b/data/maps/AbandonedShip_Corridors_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ABANDONED_SHIP_CORRIDORS_B1F", "name": "AbandonedShip_Corridors_B1F", "layout": "LAYOUT_ABANDONED_SHIP_CORRIDORS_B1F", - "music": "MUS_DAN02", + "music": "MUS_ABANDONED_SHIP", "region_map_section": "MAPSEC_ABANDONED_SHIP", "requires_flash": false, "weather": "WEATHER_SHADE", diff --git a/data/maps/AbandonedShip_Deck/map.json b/data/maps/AbandonedShip_Deck/map.json index 73c3a0e96..876a1e724 100644 --- a/data/maps/AbandonedShip_Deck/map.json +++ b/data/maps/AbandonedShip_Deck/map.json @@ -2,7 +2,7 @@ "id": "MAP_ABANDONED_SHIP_DECK", "name": "AbandonedShip_Deck", "layout": "LAYOUT_ABANDONED_SHIP_DECK", - "music": "MUS_DAN02", + "music": "MUS_ABANDONED_SHIP", "region_map_section": "MAPSEC_ABANDONED_SHIP", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/map.json b/data/maps/AbandonedShip_HiddenFloorCorridors/map.json index 78abf1e20..b8372f9fb 100644 --- a/data/maps/AbandonedShip_HiddenFloorCorridors/map.json +++ b/data/maps/AbandonedShip_HiddenFloorCorridors/map.json @@ -2,7 +2,7 @@ "id": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS", "name": "AbandonedShip_HiddenFloorCorridors", "layout": "LAYOUT_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS", - "music": "MUS_DAN02", + "music": "MUS_ABANDONED_SHIP", "region_map_section": "MAPSEC_ABANDONED_SHIP", "requires_flash": false, "weather": "WEATHER_SHADE", diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/map.json b/data/maps/AbandonedShip_HiddenFloorRooms/map.json index 3c4865d81..7a057a488 100644 --- a/data/maps/AbandonedShip_HiddenFloorRooms/map.json +++ b/data/maps/AbandonedShip_HiddenFloorRooms/map.json @@ -2,7 +2,7 @@ "id": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS", "name": "AbandonedShip_HiddenFloorRooms", "layout": "LAYOUT_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS", - "music": "MUS_DAN02", + "music": "MUS_ABANDONED_SHIP", "region_map_section": "MAPSEC_ABANDONED_SHIP", "requires_flash": false, "weather": "WEATHER_SHADE", diff --git a/data/maps/AbandonedShip_Room_B1F/map.json b/data/maps/AbandonedShip_Room_B1F/map.json index 1b8dd19f1..f360a8faa 100644 --- a/data/maps/AbandonedShip_Room_B1F/map.json +++ b/data/maps/AbandonedShip_Room_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ABANDONED_SHIP_ROOM_B1F", "name": "AbandonedShip_Room_B1F", "layout": "LAYOUT_ABANDONED_SHIP_ROOM_B1F", - "music": "MUS_DAN02", + "music": "MUS_ABANDONED_SHIP", "region_map_section": "MAPSEC_ABANDONED_SHIP", "requires_flash": false, "weather": "WEATHER_SHADE", diff --git a/data/maps/AbandonedShip_Rooms2_1F/map.json b/data/maps/AbandonedShip_Rooms2_1F/map.json index e861d2c04..9ecc1d333 100644 --- a/data/maps/AbandonedShip_Rooms2_1F/map.json +++ b/data/maps/AbandonedShip_Rooms2_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ABANDONED_SHIP_ROOMS2_1F", "name": "AbandonedShip_Rooms2_1F", "layout": "LAYOUT_ABANDONED_SHIP_ROOMS2_1F", - "music": "MUS_DAN02", + "music": "MUS_ABANDONED_SHIP", "region_map_section": "MAPSEC_ABANDONED_SHIP", "requires_flash": false, "weather": "WEATHER_SHADE", diff --git a/data/maps/AbandonedShip_Rooms2_B1F/map.json b/data/maps/AbandonedShip_Rooms2_B1F/map.json index c6429948f..73022386f 100644 --- a/data/maps/AbandonedShip_Rooms2_B1F/map.json +++ b/data/maps/AbandonedShip_Rooms2_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ABANDONED_SHIP_ROOMS2_B1F", "name": "AbandonedShip_Rooms2_B1F", "layout": "LAYOUT_ABANDONED_SHIP_ROOMS2_B1F", - "music": "MUS_DAN02", + "music": "MUS_ABANDONED_SHIP", "region_map_section": "MAPSEC_ABANDONED_SHIP", "requires_flash": false, "weather": "WEATHER_SHADE", diff --git a/data/maps/AbandonedShip_Rooms_1F/map.json b/data/maps/AbandonedShip_Rooms_1F/map.json index 45c54b174..44b8109d0 100644 --- a/data/maps/AbandonedShip_Rooms_1F/map.json +++ b/data/maps/AbandonedShip_Rooms_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ABANDONED_SHIP_ROOMS_1F", "name": "AbandonedShip_Rooms_1F", "layout": "LAYOUT_ABANDONED_SHIP_ROOMS_1F", - "music": "MUS_DAN02", + "music": "MUS_ABANDONED_SHIP", "region_map_section": "MAPSEC_ABANDONED_SHIP", "requires_flash": false, "weather": "WEATHER_SHADE", diff --git a/data/maps/AbandonedShip_Rooms_B1F/map.json b/data/maps/AbandonedShip_Rooms_B1F/map.json index 6955c5c91..9f1e39d2e 100644 --- a/data/maps/AbandonedShip_Rooms_B1F/map.json +++ b/data/maps/AbandonedShip_Rooms_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ABANDONED_SHIP_ROOMS_B1F", "name": "AbandonedShip_Rooms_B1F", "layout": "LAYOUT_ABANDONED_SHIP_ROOMS_B1F", - "music": "MUS_DAN02", + "music": "MUS_ABANDONED_SHIP", "region_map_section": "MAPSEC_ABANDONED_SHIP", "requires_flash": false, "weather": "WEATHER_SHADE", diff --git a/data/maps/AbandonedShip_Underwater1/map.json b/data/maps/AbandonedShip_Underwater1/map.json index 8e891b65d..4b7b9619d 100644 --- a/data/maps/AbandonedShip_Underwater1/map.json +++ b/data/maps/AbandonedShip_Underwater1/map.json @@ -2,7 +2,7 @@ "id": "MAP_ABANDONED_SHIP_UNDERWATER1", "name": "AbandonedShip_Underwater1", "layout": "LAYOUT_ABANDONED_SHIP_UNDERWATER1", - "music": "MUS_DEEPDEEP", + "music": "MUS_UNDERWATER", "region_map_section": "MAPSEC_ABANDONED_SHIP", "requires_flash": false, "weather": "WEATHER_BUBBLES", diff --git a/data/maps/AbandonedShip_Underwater2/map.json b/data/maps/AbandonedShip_Underwater2/map.json index 72b161120..821273e1a 100644 --- a/data/maps/AbandonedShip_Underwater2/map.json +++ b/data/maps/AbandonedShip_Underwater2/map.json @@ -2,7 +2,7 @@ "id": "MAP_ABANDONED_SHIP_UNDERWATER2", "name": "AbandonedShip_Underwater2", "layout": "LAYOUT_ABANDONED_SHIP_UNDERWATER2", - "music": "MUS_DEEPDEEP", + "music": "MUS_UNDERWATER", "region_map_section": "MAPSEC_ABANDONED_SHIP", "requires_flash": false, "weather": "WEATHER_BUBBLES", diff --git a/data/maps/AncientTomb/map.json b/data/maps/AncientTomb/map.json index 387c32246..fc378e98a 100644 --- a/data/maps/AncientTomb/map.json +++ b/data/maps/AncientTomb/map.json @@ -2,7 +2,7 @@ "id": "MAP_ANCIENT_TOMB", "name": "AncientTomb", "layout": "LAYOUT_ANCIENT_TOMB", - "music": "MUS_MABOROSI", + "music": "MUS_SEALED_CHAMBER", "region_map_section": "MAPSEC_ANCIENT_TOMB", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/AquaHideout_1F/map.json b/data/maps/AquaHideout_1F/map.json index 4077c76c8..7bf28f768 100644 --- a/data/maps/AquaHideout_1F/map.json +++ b/data/maps/AquaHideout_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_AQUA_HIDEOUT_1F", "name": "AquaHideout_1F", "layout": "LAYOUT_AQUA_HIDEOUT_1F", - "music": "MUS_AJITO", + "music": "MUS_AQUA_MAGMA_HIDEOUT", "region_map_section": "MAPSEC_EVIL_TEAM_HIDEOUT", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/AquaHideout_B1F/map.json b/data/maps/AquaHideout_B1F/map.json index e0e661b7a..408fe9a61 100644 --- a/data/maps/AquaHideout_B1F/map.json +++ b/data/maps/AquaHideout_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_AQUA_HIDEOUT_B1F", "name": "AquaHideout_B1F", "layout": "LAYOUT_AQUA_HIDEOUT_B1F", - "music": "MUS_AJITO", + "music": "MUS_AQUA_MAGMA_HIDEOUT", "region_map_section": "MAPSEC_EVIL_TEAM_HIDEOUT", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/AquaHideout_B2F/map.json b/data/maps/AquaHideout_B2F/map.json index c6f99621b..0ffe08dd9 100644 --- a/data/maps/AquaHideout_B2F/map.json +++ b/data/maps/AquaHideout_B2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_AQUA_HIDEOUT_B2F", "name": "AquaHideout_B2F", "layout": "LAYOUT_AQUA_HIDEOUT_B2F", - "music": "MUS_AJITO", + "music": "MUS_AQUA_MAGMA_HIDEOUT", "region_map_section": "MAPSEC_EVIL_TEAM_HIDEOUT", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattleTower_BattleRoom/scripts.inc b/data/maps/BattleTower_BattleRoom/scripts.inc index 99cbf517d..a16f876fe 100644 --- a/data/maps/BattleTower_BattleRoom/scripts.inc +++ b/data/maps/BattleTower_BattleRoom/scripts.inc @@ -54,7 +54,7 @@ BattleTower_BattleRoom_EventScript_160961:: @ 8160961 special LoadPlayerParty special SavePlayerParty special SetBattleTowerParty - playfanfare MUS_ME_ASA + playfanfare MUS_HEAL waitfanfare special ScrSpecial_HealPlayerParty diff --git a/data/maps/BattleTower_Lobby/scripts.inc b/data/maps/BattleTower_Lobby/scripts.inc index e30502fb6..a3c2e7974 100644 --- a/data/maps/BattleTower_Lobby/scripts.inc +++ b/data/maps/BattleTower_Lobby/scripts.inc @@ -82,7 +82,7 @@ BattleTower_Lobby_EventScript_160342:: @ 8160342 goto_if_eq BattleTower_Lobby_EventScript_16037D message BattleTower_Lobby_Text_19A6BE waitmessage - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM waitfanfare msgbox BattleTower_Lobby_Text_19A719, MSGBOX_DEFAULT @@ -112,7 +112,7 @@ BattleTower_Lobby_EventScript_1603AD:: @ 81603AD case 0, BattleTower_Lobby_EventScript_160408 message BattleTower_Lobby_Text_19A506 waitmessage - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM waitfanfare setvar VAR_0x8004, 9 special BattleTowerUtil diff --git a/data/maps/CaveOfOrigin_1F/map.json b/data/maps/CaveOfOrigin_1F/map.json index a111c1a10..f6599e285 100644 --- a/data/maps/CaveOfOrigin_1F/map.json +++ b/data/maps/CaveOfOrigin_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_CAVE_OF_ORIGIN_1F", "name": "CaveOfOrigin_1F", "layout": "LAYOUT_CAVE_OF_ORIGIN_1F", - "music": "MUS_DAN03", + "music": "MUS_CAVE_OF_ORIGIN", "region_map_section": "MAPSEC_CAVE_OF_ORIGIN", "requires_flash": true, "weather": "WEATHER_NONE", diff --git a/data/maps/CaveOfOrigin_B1F/map.json b/data/maps/CaveOfOrigin_B1F/map.json index 71220abe6..79ff6564c 100644 --- a/data/maps/CaveOfOrigin_B1F/map.json +++ b/data/maps/CaveOfOrigin_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_CAVE_OF_ORIGIN_B1F", "name": "CaveOfOrigin_B1F", "layout": "LAYOUT_CAVE_OF_ORIGIN_B1F", - "music": "MUS_DAN03", + "music": "MUS_CAVE_OF_ORIGIN", "region_map_section": "MAPSEC_CAVE_OF_ORIGIN", "requires_flash": true, "weather": "WEATHER_NONE", diff --git a/data/maps/CaveOfOrigin_B2F/map.json b/data/maps/CaveOfOrigin_B2F/map.json index 0a2f03ae2..9fa080629 100644 --- a/data/maps/CaveOfOrigin_B2F/map.json +++ b/data/maps/CaveOfOrigin_B2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_CAVE_OF_ORIGIN_B2F", "name": "CaveOfOrigin_B2F", "layout": "LAYOUT_CAVE_OF_ORIGIN_B2F", - "music": "MUS_DAN03", + "music": "MUS_CAVE_OF_ORIGIN", "region_map_section": "MAPSEC_CAVE_OF_ORIGIN", "requires_flash": true, "weather": "WEATHER_FOG_1", diff --git a/data/maps/CaveOfOrigin_B3F/map.json b/data/maps/CaveOfOrigin_B3F/map.json index 4546d50f8..5f28936d9 100644 --- a/data/maps/CaveOfOrigin_B3F/map.json +++ b/data/maps/CaveOfOrigin_B3F/map.json @@ -2,7 +2,7 @@ "id": "MAP_CAVE_OF_ORIGIN_B3F", "name": "CaveOfOrigin_B3F", "layout": "LAYOUT_CAVE_OF_ORIGIN_B3F", - "music": "MUS_DAN03", + "music": "MUS_CAVE_OF_ORIGIN", "region_map_section": "MAPSEC_CAVE_OF_ORIGIN", "requires_flash": true, "weather": "WEATHER_FOG_1", diff --git a/data/maps/CaveOfOrigin_B4F/map.json b/data/maps/CaveOfOrigin_B4F/map.json index 5270d384b..729d68639 100644 --- a/data/maps/CaveOfOrigin_B4F/map.json +++ b/data/maps/CaveOfOrigin_B4F/map.json @@ -2,7 +2,7 @@ "id": "MAP_CAVE_OF_ORIGIN_B4F", "name": "CaveOfOrigin_B4F", "layout": "LAYOUT_CAVE_OF_ORIGIN_B4F", - "music": "SE_STOP", + "music": "MUS_DUMMY", "region_map_section": "MAPSEC_CAVE_OF_ORIGIN", "requires_flash": false, "weather": "WEATHER_FOG_1", diff --git a/data/maps/CaveOfOrigin_B4F/scripts.inc b/data/maps/CaveOfOrigin_B4F/scripts.inc index 96cf8610d..5134e8f5a 100644 --- a/data/maps/CaveOfOrigin_B4F/scripts.inc +++ b/data/maps/CaveOfOrigin_B4F/scripts.inc @@ -35,7 +35,7 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7 doweather special WaitWeather waitstate - playse SE_W197 + playse SE_M_DETECT setfieldeffectargument 0, 9 setfieldeffectargument 1, 13 setfieldeffectargument 2, 0 @@ -46,7 +46,7 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7 .else setvar VAR_RESULT, 2 .endif - playse SE_TAMA + playse SE_ORB special sub_80818A4 waitstate special sub_80818FC diff --git a/data/maps/CaveOfOrigin_Entrance/map.json b/data/maps/CaveOfOrigin_Entrance/map.json index 12df1094b..74ea88d7f 100644 --- a/data/maps/CaveOfOrigin_Entrance/map.json +++ b/data/maps/CaveOfOrigin_Entrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_CAVE_OF_ORIGIN_ENTRANCE", "name": "CaveOfOrigin_Entrance", "layout": "LAYOUT_CAVE_OF_ORIGIN_ENTRANCE", - "music": "MUS_DAN03", + "music": "MUS_CAVE_OF_ORIGIN", "region_map_section": "MAPSEC_CAVE_OF_ORIGIN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/DesertRuins/map.json b/data/maps/DesertRuins/map.json index d545443f8..271eabd9c 100644 --- a/data/maps/DesertRuins/map.json +++ b/data/maps/DesertRuins/map.json @@ -2,7 +2,7 @@ "id": "MAP_DESERT_RUINS", "name": "DesertRuins", "layout": "LAYOUT_DESERT_RUINS", - "music": "MUS_MABOROSI", + "music": "MUS_SEALED_CHAMBER", "region_map_section": "MAPSEC_DESERT_RUINS", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/DewfordTown/map.json b/data/maps/DewfordTown/map.json index 4e130a9df..4e70621ab 100644 --- a/data/maps/DewfordTown/map.json +++ b/data/maps/DewfordTown/map.json @@ -2,7 +2,7 @@ "id": "MAP_DEWFORD_TOWN", "name": "DewfordTown", "layout": "LAYOUT_DEWFORD_TOWN", - "music": "MUS_HIGHTOWN", + "music": "MUS_DEWFORD", "region_map_section": "MAPSEC_DEWFORD_TOWN", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/DewfordTown_Gym/map.json b/data/maps/DewfordTown_Gym/map.json index f440d1a5c..076828af7 100644 --- a/data/maps/DewfordTown_Gym/map.json +++ b/data/maps/DewfordTown_Gym/map.json @@ -2,7 +2,7 @@ "id": "MAP_DEWFORD_TOWN_GYM", "name": "DewfordTown_Gym", "layout": "LAYOUT_DEWFORD_TOWN_GYM", - "music": "MUS_GIM", + "music": "MUS_GYM", "region_map_section": "MAPSEC_DEWFORD_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/DewfordTown_Gym/scripts.inc b/data/maps/DewfordTown_Gym/scripts.inc index 30f7b2b6d..d4a5372dd 100644 --- a/data/maps/DewfordTown_Gym/scripts.inc +++ b/data/maps/DewfordTown_Gym/scripts.inc @@ -55,25 +55,25 @@ DewfordTown_Gym_EventScript_1530F5:: @ 81530F5 return DewfordTown_Gym_EventScript_1530F6:: @ 81530F6 - playse SE_MU_PACHI + playse SE_SWITCH animateflash 3 call DewfordTown_Gym_EventScript_153071 return DewfordTown_Gym_EventScript_153101:: @ 8153101 - playse SE_MU_PACHI + playse SE_SWITCH animateflash 2 call DewfordTown_Gym_EventScript_153071 return DewfordTown_Gym_EventScript_15310C:: @ 815310C - playse SE_MU_PACHI + playse SE_SWITCH animateflash 1 call DewfordTown_Gym_EventScript_153071 return DewfordTown_Gym_EventScript_153117:: @ 8153117 - playse SE_MU_PACHI + playse SE_SWITCH animateflash 0 call DewfordTown_Gym_EventScript_153071 return diff --git a/data/maps/DewfordTown_Hall/map.json b/data/maps/DewfordTown_Hall/map.json index ee688c9c3..5fb5ebf63 100644 --- a/data/maps/DewfordTown_Hall/map.json +++ b/data/maps/DewfordTown_Hall/map.json @@ -2,7 +2,7 @@ "id": "MAP_DEWFORD_TOWN_HALL", "name": "DewfordTown_Hall", "layout": "LAYOUT_DEWFORD_TOWN_HALL", - "music": "MUS_HIGHTOWN", + "music": "MUS_DEWFORD", "region_map_section": "MAPSEC_DEWFORD_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/DewfordTown_House1/map.json b/data/maps/DewfordTown_House1/map.json index 48d1a10dd..53f16b6fa 100644 --- a/data/maps/DewfordTown_House1/map.json +++ b/data/maps/DewfordTown_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_DEWFORD_TOWN_HOUSE1", "name": "DewfordTown_House1", "layout": "LAYOUT_HOUSE3", - "music": "MUS_HIGHTOWN", + "music": "MUS_DEWFORD", "region_map_section": "MAPSEC_DEWFORD_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/DewfordTown_House2/map.json b/data/maps/DewfordTown_House2/map.json index ec2145201..7cf7a90b2 100644 --- a/data/maps/DewfordTown_House2/map.json +++ b/data/maps/DewfordTown_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_DEWFORD_TOWN_HOUSE2", "name": "DewfordTown_House2", "layout": "LAYOUT_HOUSE4", - "music": "MUS_HIGHTOWN", + "music": "MUS_DEWFORD", "region_map_section": "MAPSEC_DEWFORD_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/DewfordTown_PokemonCenter_1F/map.json b/data/maps/DewfordTown_PokemonCenter_1F/map.json index e1cacefb1..be7c8d24d 100644 --- a/data/maps/DewfordTown_PokemonCenter_1F/map.json +++ b/data/maps/DewfordTown_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_DEWFORD_TOWN_POKEMON_CENTER_1F", "name": "DewfordTown_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_DEWFORD_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/DewfordTown_PokemonCenter_2F/map.json b/data/maps/DewfordTown_PokemonCenter_2F/map.json index 061d5228e..03ee1c40d 100644 --- a/data/maps/DewfordTown_PokemonCenter_2F/map.json +++ b/data/maps/DewfordTown_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_DEWFORD_TOWN_POKEMON_CENTER_2F", "name": "DewfordTown_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_DEWFORD_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/DoubleBattleColosseum/map.json b/data/maps/DoubleBattleColosseum/map.json index 3ce7e8570..f963c8154 100644 --- a/data/maps/DoubleBattleColosseum/map.json +++ b/data/maps/DoubleBattleColosseum/map.json @@ -2,7 +2,7 @@ "id": "MAP_DOUBLE_BATTLE_COLOSSEUM", "name": "DoubleBattleColosseum", "layout": "LAYOUT_DOUBLE_BATTLE_COLOSSEUM", - "music": "MUS_RAINBOW", + "music": "MUS_EVER_GRANDE", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/EverGrandeCity/map.json b/data/maps/EverGrandeCity/map.json index 06fb9c275..96c441cca 100644 --- a/data/maps/EverGrandeCity/map.json +++ b/data/maps/EverGrandeCity/map.json @@ -2,7 +2,7 @@ "id": "MAP_EVER_GRANDE_CITY", "name": "EverGrandeCity", "layout": "LAYOUT_EVER_GRANDE_CITY", - "music": "MUS_RAINBOW", + "music": "MUS_EVER_GRANDE", "region_map_section": "MAPSEC_EVER_GRANDE_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/EverGrandeCity_ChampionsRoom/map.json b/data/maps/EverGrandeCity_ChampionsRoom/map.json index fb425c537..8f73c582d 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/map.json +++ b/data/maps/EverGrandeCity_ChampionsRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_EVER_GRANDE_CITY_CHAMPIONS_ROOM", "name": "EverGrandeCity_ChampionsRoom", "layout": "LAYOUT_EVER_GRANDE_CITY_CHAMPIONS_ROOM", - "music": "MUS_C_ROAD", + "music": "MUS_VICTORY_ROAD", "region_map_section": "MAPSEC_EVER_GRANDE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc index 5fdb9e18d..c53b2821e 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc +++ b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc @@ -38,7 +38,7 @@ EverGrandeCity_ChampionsRoom_Movement_15B802:: @ 815B802 step_end EverGrandeCity_ChampionsRoom_EventScript_15B805:: @ 815B805 - playbgm MUS_DAIGO, FALSE + playbgm MUS_ENCOUNTER_CHAMPION, FALSE msgbox EverGrandeCity_ChampionsRoom_Text_190F9C, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_STEVEN, EverGrandeCity_ChampionsRoom_Text_1910A0 goto EverGrandeCity_ChampionsRoom_EventScript_15B821 @@ -67,11 +67,11 @@ EverGrandeCity_ChampionsRoom_EventScript_15B821:: @ 815B821 end EverGrandeCity_ChampionsRoom_EventScript_15B87C:: @ 815B87C - playbgm MUS_GIRL_SUP, FALSE + playbgm MUS_ENCOUNTER_MAY, FALSE return EverGrandeCity_ChampionsRoom_EventScript_15B881:: @ 815B881 - playbgm MUS_BOY_SUP, FALSE + playbgm MUS_ENCOUNTER_BRENDAN, FALSE return EverGrandeCity_ChampionsRoom_EventScript_15B886:: @ 815B886 diff --git a/data/maps/EverGrandeCity_Corridor1/map.json b/data/maps/EverGrandeCity_Corridor1/map.json index 86723c0f2..8a498bc69 100644 --- a/data/maps/EverGrandeCity_Corridor1/map.json +++ b/data/maps/EverGrandeCity_Corridor1/map.json @@ -2,7 +2,7 @@ "id": "MAP_EVER_GRANDE_CITY_CORRIDOR1", "name": "EverGrandeCity_Corridor1", "layout": "LAYOUT_EVER_GRANDE_CITY_SHORT_CORRIDOR", - "music": "MUS_C_ROAD", + "music": "MUS_VICTORY_ROAD", "region_map_section": "MAPSEC_EVER_GRANDE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/EverGrandeCity_Corridor2/map.json b/data/maps/EverGrandeCity_Corridor2/map.json index 692e6daa7..5107218c8 100644 --- a/data/maps/EverGrandeCity_Corridor2/map.json +++ b/data/maps/EverGrandeCity_Corridor2/map.json @@ -2,7 +2,7 @@ "id": "MAP_EVER_GRANDE_CITY_CORRIDOR2", "name": "EverGrandeCity_Corridor2", "layout": "LAYOUT_EVER_GRANDE_CITY_SHORT_CORRIDOR", - "music": "MUS_C_ROAD", + "music": "MUS_VICTORY_ROAD", "region_map_section": "MAPSEC_EVER_GRANDE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/EverGrandeCity_Corridor3/map.json b/data/maps/EverGrandeCity_Corridor3/map.json index aa5544f4d..9d74e674d 100644 --- a/data/maps/EverGrandeCity_Corridor3/map.json +++ b/data/maps/EverGrandeCity_Corridor3/map.json @@ -2,7 +2,7 @@ "id": "MAP_EVER_GRANDE_CITY_CORRIDOR3", "name": "EverGrandeCity_Corridor3", "layout": "LAYOUT_EVER_GRANDE_CITY_SHORT_CORRIDOR", - "music": "MUS_C_ROAD", + "music": "MUS_VICTORY_ROAD", "region_map_section": "MAPSEC_EVER_GRANDE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/EverGrandeCity_Corridor4/map.json b/data/maps/EverGrandeCity_Corridor4/map.json index 9c0daf82f..6657a887d 100644 --- a/data/maps/EverGrandeCity_Corridor4/map.json +++ b/data/maps/EverGrandeCity_Corridor4/map.json @@ -2,7 +2,7 @@ "id": "MAP_EVER_GRANDE_CITY_CORRIDOR4", "name": "EverGrandeCity_Corridor4", "layout": "LAYOUT_EVER_GRANDE_CITY_CORRIDOR4", - "music": "MUS_C_ROAD", + "music": "MUS_VICTORY_ROAD", "region_map_section": "MAPSEC_EVER_GRANDE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/EverGrandeCity_Corridor5/map.json b/data/maps/EverGrandeCity_Corridor5/map.json index c310da938..ddc78db25 100644 --- a/data/maps/EverGrandeCity_Corridor5/map.json +++ b/data/maps/EverGrandeCity_Corridor5/map.json @@ -2,7 +2,7 @@ "id": "MAP_EVER_GRANDE_CITY_CORRIDOR5", "name": "EverGrandeCity_Corridor5", "layout": "LAYOUT_EVER_GRANDE_CITY_SHORT_CORRIDOR", - "music": "MUS_C_ROAD", + "music": "MUS_VICTORY_ROAD", "region_map_section": "MAPSEC_EVER_GRANDE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/EverGrandeCity_DrakesRoom/map.json b/data/maps/EverGrandeCity_DrakesRoom/map.json index 719451beb..33e700a39 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/map.json +++ b/data/maps/EverGrandeCity_DrakesRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_EVER_GRANDE_CITY_DRAKES_ROOM", "name": "EverGrandeCity_DrakesRoom", "layout": "LAYOUT_EVER_GRANDE_CITY_DRAKES_ROOM", - "music": "MUS_C_ROAD", + "music": "MUS_VICTORY_ROAD", "region_map_section": "MAPSEC_EVER_GRANDE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/EverGrandeCity_DrakesRoom/scripts.inc b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc index fcf09914b..e1550a32a 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/scripts.inc +++ b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc @@ -41,7 +41,7 @@ EverGrandeCity_DrakesRoom_EventScript_15B764:: @ 815B764 lock faceplayer goto_if_set FLAG_DEFEATED_ELITE_4_DRAKE, EverGrandeCity_DrakesRoom_EventScript_15B78B - playbgm MUS_SITENNOU, FALSE + playbgm MUS_ENCOUNTER_ELITE_FOUR, FALSE msgbox EverGrandeCity_DrakesRoom_Text_190CEB, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_DRAKE, EverGrandeCity_DrakesRoom_Text_190E42 goto EverGrandeCity_DrakesRoom_EventScript_15B795 diff --git a/data/maps/EverGrandeCity_GlaciasRoom/map.json b/data/maps/EverGrandeCity_GlaciasRoom/map.json index 7938c77d2..b87ef8dd8 100644 --- a/data/maps/EverGrandeCity_GlaciasRoom/map.json +++ b/data/maps/EverGrandeCity_GlaciasRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_EVER_GRANDE_CITY_GLACIAS_ROOM", "name": "EverGrandeCity_GlaciasRoom", "layout": "LAYOUT_EVER_GRANDE_CITY_GLACIAS_ROOM", - "music": "MUS_C_ROAD", + "music": "MUS_VICTORY_ROAD", "region_map_section": "MAPSEC_EVER_GRANDE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc index d4b5c8582..25eab43a1 100644 --- a/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc +++ b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc @@ -41,7 +41,7 @@ EverGrandeCity_GlaciasRoom_EventScript_15B6CA:: @ 815B6CA lock faceplayer goto_if_set FLAG_DEFEATED_ELITE_4_GLACIA, EverGrandeCity_GlaciasRoom_EventScript_15B6F1 - playbgm MUS_SITENNOU, FALSE + playbgm MUS_ENCOUNTER_ELITE_FOUR, FALSE msgbox EverGrandeCity_GlaciasRoom_Text_190AF9, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_GLACIA, EverGrandeCity_GlaciasRoom_Text_190C01 goto EverGrandeCity_GlaciasRoom_EventScript_15B6FB diff --git a/data/maps/EverGrandeCity_HallOfFame/map.json b/data/maps/EverGrandeCity_HallOfFame/map.json index d35d5c2d9..05ef799ec 100644 --- a/data/maps/EverGrandeCity_HallOfFame/map.json +++ b/data/maps/EverGrandeCity_HallOfFame/map.json @@ -2,7 +2,7 @@ "id": "MAP_EVER_GRANDE_CITY_HALL_OF_FAME", "name": "EverGrandeCity_HallOfFame", "layout": "LAYOUT_EVER_GRANDE_CITY_HALL_OF_FAME", - "music": "MUS_EIKOU_R", + "music": "MUS_HALL_OF_FAME_ROOM", "region_map_section": "MAPSEC_EVER_GRANDE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/EverGrandeCity_PhoebesRoom/map.json b/data/maps/EverGrandeCity_PhoebesRoom/map.json index c65c87385..149cc1cba 100644 --- a/data/maps/EverGrandeCity_PhoebesRoom/map.json +++ b/data/maps/EverGrandeCity_PhoebesRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_EVER_GRANDE_CITY_PHOEBES_ROOM", "name": "EverGrandeCity_PhoebesRoom", "layout": "LAYOUT_EVER_GRANDE_CITY_PHOEBES_ROOM", - "music": "MUS_C_ROAD", + "music": "MUS_VICTORY_ROAD", "region_map_section": "MAPSEC_EVER_GRANDE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc index c5394ecb0..9c075efe9 100644 --- a/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc +++ b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc @@ -41,7 +41,7 @@ EverGrandeCity_PhoebesRoom_EventScript_15B630:: @ 815B630 lock faceplayer goto_if_set FLAG_DEFEATED_ELITE_4_PHOEBE, EverGrandeCity_PhoebesRoom_EventScript_15B657 - playbgm MUS_SITENNOU, FALSE + playbgm MUS_ENCOUNTER_ELITE_FOUR, FALSE msgbox EverGrandeCity_PhoebesRoom_Text_1908F5, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_PHOEBE, EverGrandeCity_PhoebesRoom_Text_190A0C goto EverGrandeCity_PhoebesRoom_EventScript_15B661 diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/map.json b/data/maps/EverGrandeCity_PokemonCenter_1F/map.json index 2ac4d15b9..14a28f31b 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/map.json +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F", "name": "EverGrandeCity_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_EVER_GRANDE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/EverGrandeCity_PokemonCenter_2F/map.json b/data/maps/EverGrandeCity_PokemonCenter_2F/map.json index 7266578b8..31c4ee85c 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_2F/map.json +++ b/data/maps/EverGrandeCity_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_EVER_GRANDE_CITY_POKEMON_CENTER_2F", "name": "EverGrandeCity_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_EVER_GRANDE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/EverGrandeCity_PokemonLeague/map.json b/data/maps/EverGrandeCity_PokemonLeague/map.json index 7583323bc..fe6b3aa3a 100644 --- a/data/maps/EverGrandeCity_PokemonLeague/map.json +++ b/data/maps/EverGrandeCity_PokemonLeague/map.json @@ -2,7 +2,7 @@ "id": "MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE", "name": "EverGrandeCity_PokemonLeague", "layout": "LAYOUT_EVER_GRANDE_CITY_POKEMON_LEAGUE", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_EVER_GRANDE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/EverGrandeCity_PokemonLeague/scripts.inc b/data/maps/EverGrandeCity_PokemonLeague/scripts.inc index d13f20f1d..dfa6e2657 100644 --- a/data/maps/EverGrandeCity_PokemonLeague/scripts.inc +++ b/data/maps/EverGrandeCity_PokemonLeague/scripts.inc @@ -61,7 +61,7 @@ EverGrandeCity_PokemonLeague_EventScript_15BAD2:: @ 815BAD2 applymovement 4, EverGrandeCity_PokemonLeague_Movement_15BB81 waitmovement 0 delay 10 - playfanfare MUS_ME_BACHI + playfanfare MUS_OBTAIN_BADGE message EverGrandeCity_PokemonLeague_Text_191804 waitmessage waitfanfare @@ -83,7 +83,7 @@ EverGrandeCity_PokemonLeague_EventScript_15BB3F:: @ 815BB3F return EverGrandeCity_PokemonLeague_EventScript_15BB4A:: @ 815BB4A - playse SE_HAZURE + playse SE_FAILURE msgbox EverGrandeCity_PokemonLeague_Text_19179C, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/EverGrandeCity_SidneysRoom/map.json b/data/maps/EverGrandeCity_SidneysRoom/map.json index 733266cfa..1f039f73f 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/map.json +++ b/data/maps/EverGrandeCity_SidneysRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM", "name": "EverGrandeCity_SidneysRoom", "layout": "LAYOUT_EVER_GRANDE_CITY_SIDNEYS_ROOM", - "music": "MUS_C_ROAD", + "music": "MUS_VICTORY_ROAD", "region_map_section": "MAPSEC_EVER_GRANDE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/EverGrandeCity_SidneysRoom/scripts.inc b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc index 7bd896364..42b91a9c8 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/scripts.inc +++ b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc @@ -42,7 +42,7 @@ EverGrandeCity_SidneysRoom_EventScript_15B596:: @ 815B596 lock faceplayer goto_if_set FLAG_DEFEATED_ELITE_4_SYDNEY, EverGrandeCity_SidneysRoom_EventScript_15B5BD - playbgm MUS_SITENNOU, FALSE + playbgm MUS_ENCOUNTER_ELITE_FOUR, FALSE msgbox EverGrandeCity_SidneysRoom_Text_190728, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_SIDNEY, EverGrandeCity_SidneysRoom_Text_190823 goto EverGrandeCity_SidneysRoom_EventScript_15B5C7 diff --git a/data/maps/FallarborTown/map.json b/data/maps/FallarborTown/map.json index 71e07b7c3..003305be1 100644 --- a/data/maps/FallarborTown/map.json +++ b/data/maps/FallarborTown/map.json @@ -2,7 +2,7 @@ "id": "MAP_FALLARBOR_TOWN", "name": "FallarborTown", "layout": "LAYOUT_FALLARBOR_TOWN", - "music": "MUS_TONEKUSA", + "music": "MUS_FALLARBOR", "region_map_section": "MAPSEC_FALLARBOR_TOWN", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/FallarborTown_ContestHall/map.json b/data/maps/FallarborTown_ContestHall/map.json index b87d95542..cc915bf9b 100644 --- a/data/maps/FallarborTown_ContestHall/map.json +++ b/data/maps/FallarborTown_ContestHall/map.json @@ -2,7 +2,7 @@ "id": "MAP_FALLARBOR_TOWN_CONTEST_HALL", "name": "FallarborTown_ContestHall", "layout": "LAYOUT_CONTEST_HALL", - "music": "MUS_CONLOBBY", + "music": "MUS_CONTEST_LOBBY", "region_map_section": "MAPSEC_FALLARBOR_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FallarborTown_ContestLobby/map.json b/data/maps/FallarborTown_ContestLobby/map.json index 770a14a65..bdb84d24b 100644 --- a/data/maps/FallarborTown_ContestLobby/map.json +++ b/data/maps/FallarborTown_ContestLobby/map.json @@ -2,7 +2,7 @@ "id": "MAP_FALLARBOR_TOWN_CONTEST_LOBBY", "name": "FallarborTown_ContestLobby", "layout": "LAYOUT_CONTEST_LOBBY", - "music": "MUS_CONLOBBY", + "music": "MUS_CONTEST_LOBBY", "region_map_section": "MAPSEC_FALLARBOR_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FallarborTown_ContestLobby/scripts.inc b/data/maps/FallarborTown_ContestLobby/scripts.inc index f9a2cccce..ac38ff349 100644 --- a/data/maps/FallarborTown_ContestLobby/scripts.inc +++ b/data/maps/FallarborTown_ContestLobby/scripts.inc @@ -22,13 +22,13 @@ FallarborTown_ContestLobby_EventScript_1539F8:: @ 81539F8 lockall applymovement 1, FallarborTown_ContestLobby_Movement_153A7C waitmovement 0 - playse SE_HASHI + playse SE_BRIDGE_WALK setmetatile 4, 2, METATILE_Contest_WallShadow, 1 setmetatile 4, 3, METATILE_Contest_FloorShadow, 1 special DrawWholeMapView applymovement 1, FallarborTown_ContestLobby_Movement_153A7F waitmovement 0 - playse SE_HASHI + playse SE_BRIDGE_WALK setmetatile 4, 2, METATILE_Contest_CounterFlap_Top, 1 setmetatile 4, 3, METATILE_Contest_CounterFlap_Bottom, 1 special DrawWholeMapView diff --git a/data/maps/FallarborTown_House1/map.json b/data/maps/FallarborTown_House1/map.json index e809610c8..8447b9a40 100644 --- a/data/maps/FallarborTown_House1/map.json +++ b/data/maps/FallarborTown_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_FALLARBOR_TOWN_HOUSE1", "name": "FallarborTown_House1", "layout": "LAYOUT_HOUSE1", - "music": "MUS_TONEKUSA", + "music": "MUS_FALLARBOR", "region_map_section": "MAPSEC_FALLARBOR_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FallarborTown_House2/map.json b/data/maps/FallarborTown_House2/map.json index bd522be27..16a5a997e 100644 --- a/data/maps/FallarborTown_House2/map.json +++ b/data/maps/FallarborTown_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_FALLARBOR_TOWN_HOUSE2", "name": "FallarborTown_House2", "layout": "LAYOUT_HOUSE2", - "music": "MUS_TONEKUSA", + "music": "MUS_FALLARBOR", "region_map_section": "MAPSEC_FALLARBOR_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FallarborTown_Mart/map.json b/data/maps/FallarborTown_Mart/map.json index e325134c4..78ddc53c9 100644 --- a/data/maps/FallarborTown_Mart/map.json +++ b/data/maps/FallarborTown_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_FALLARBOR_TOWN_MART", "name": "FallarborTown_Mart", "layout": "LAYOUT_POKE_MART", - "music": "MUS_FRIENDLY", + "music": "MUS_POKE_MART", "region_map_section": "MAPSEC_FALLARBOR_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FallarborTown_PokemonCenter_1F/map.json b/data/maps/FallarborTown_PokemonCenter_1F/map.json index ee1a96ba7..a8bc85cc8 100644 --- a/data/maps/FallarborTown_PokemonCenter_1F/map.json +++ b/data/maps/FallarborTown_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F", "name": "FallarborTown_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_FALLARBOR_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc index 133b4626a..93b87791d 100644 --- a/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc @@ -46,7 +46,7 @@ FallarborTown_PokemonCenter_1F_EventScript_153B59:: @ 8153B59 end FallarborTown_PokemonCenter_1F_EventScript_153B69:: @ 8153B69 - playse SE_JIDO_DOA + playse SE_SLIDING_DOOR removeobject 4 clearflag FLAG_HIDE_LANETTE release diff --git a/data/maps/FallarborTown_PokemonCenter_2F/map.json b/data/maps/FallarborTown_PokemonCenter_2F/map.json index 4dec245fe..b49f288e8 100644 --- a/data/maps/FallarborTown_PokemonCenter_2F/map.json +++ b/data/maps/FallarborTown_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_FALLARBOR_TOWN_POKEMON_CENTER_2F", "name": "FallarborTown_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_FALLARBOR_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FieryPath/map.json b/data/maps/FieryPath/map.json index c02965a1d..f21b4d1f3 100644 --- a/data/maps/FieryPath/map.json +++ b/data/maps/FieryPath/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIERY_PATH", "name": "FieryPath", "layout": "LAYOUT_FIERY_PATH", - "music": "MUS_DAN01", + "music": "MUS_PETALBURG_WOODS", "region_map_section": "MAPSEC_FIERY_PATH", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FortreeCity/map.json b/data/maps/FortreeCity/map.json index a3e85f687..17797b153 100644 --- a/data/maps/FortreeCity/map.json +++ b/data/maps/FortreeCity/map.json @@ -2,7 +2,7 @@ "id": "MAP_FORTREE_CITY", "name": "FortreeCity", "layout": "LAYOUT_FORTREE_CITY", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_FORTREE_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/FortreeCity_DecorationShop/map.json b/data/maps/FortreeCity_DecorationShop/map.json index 896aa737e..0b2ab9859 100644 --- a/data/maps/FortreeCity_DecorationShop/map.json +++ b/data/maps/FortreeCity_DecorationShop/map.json @@ -2,7 +2,7 @@ "id": "MAP_FORTREE_CITY_DECORATION_SHOP", "name": "FortreeCity_DecorationShop", "layout": "LAYOUT_FORTREE_CITY_DECORATION_SHOP", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_FORTREE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FortreeCity_Gym/map.json b/data/maps/FortreeCity_Gym/map.json index c967fd6c8..bd9c03ddd 100644 --- a/data/maps/FortreeCity_Gym/map.json +++ b/data/maps/FortreeCity_Gym/map.json @@ -2,7 +2,7 @@ "id": "MAP_FORTREE_CITY_GYM", "name": "FortreeCity_Gym", "layout": "LAYOUT_FORTREE_CITY_GYM", - "music": "MUS_GIM", + "music": "MUS_GYM", "region_map_section": "MAPSEC_FORTREE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FortreeCity_House1/map.json b/data/maps/FortreeCity_House1/map.json index 1043bec20..8c0e4eb13 100644 --- a/data/maps/FortreeCity_House1/map.json +++ b/data/maps/FortreeCity_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_FORTREE_CITY_HOUSE1", "name": "FortreeCity_House1", "layout": "LAYOUT_FORTREE_CITY_HOUSE1", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_FORTREE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FortreeCity_House2/map.json b/data/maps/FortreeCity_House2/map.json index 47ccdfbb3..576d3ac19 100644 --- a/data/maps/FortreeCity_House2/map.json +++ b/data/maps/FortreeCity_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_FORTREE_CITY_HOUSE2", "name": "FortreeCity_House2", "layout": "LAYOUT_FORTREE_CITY_HOUSE2", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_FORTREE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FortreeCity_House3/map.json b/data/maps/FortreeCity_House3/map.json index 85509eed4..ff1476700 100644 --- a/data/maps/FortreeCity_House3/map.json +++ b/data/maps/FortreeCity_House3/map.json @@ -2,7 +2,7 @@ "id": "MAP_FORTREE_CITY_HOUSE3", "name": "FortreeCity_House3", "layout": "LAYOUT_FORTREE_CITY_HOUSE1", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_FORTREE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FortreeCity_House4/map.json b/data/maps/FortreeCity_House4/map.json index c0256d8a4..737366a2c 100644 --- a/data/maps/FortreeCity_House4/map.json +++ b/data/maps/FortreeCity_House4/map.json @@ -2,7 +2,7 @@ "id": "MAP_FORTREE_CITY_HOUSE4", "name": "FortreeCity_House4", "layout": "LAYOUT_FORTREE_CITY_HOUSE2", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_FORTREE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FortreeCity_House5/map.json b/data/maps/FortreeCity_House5/map.json index 5324d59f2..b47d16a59 100644 --- a/data/maps/FortreeCity_House5/map.json +++ b/data/maps/FortreeCity_House5/map.json @@ -2,7 +2,7 @@ "id": "MAP_FORTREE_CITY_HOUSE5", "name": "FortreeCity_House5", "layout": "LAYOUT_FORTREE_CITY_HOUSE1", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_FORTREE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FortreeCity_Mart/map.json b/data/maps/FortreeCity_Mart/map.json index ebf83b274..26085efe2 100644 --- a/data/maps/FortreeCity_Mart/map.json +++ b/data/maps/FortreeCity_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_FORTREE_CITY_MART", "name": "FortreeCity_Mart", "layout": "LAYOUT_POKE_MART", - "music": "MUS_FRIENDLY", + "music": "MUS_POKE_MART", "region_map_section": "MAPSEC_FORTREE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FortreeCity_PokemonCenter_1F/map.json b/data/maps/FortreeCity_PokemonCenter_1F/map.json index e5ab2916d..2f197c811 100644 --- a/data/maps/FortreeCity_PokemonCenter_1F/map.json +++ b/data/maps/FortreeCity_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_FORTREE_CITY_POKEMON_CENTER_1F", "name": "FortreeCity_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_FORTREE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FortreeCity_PokemonCenter_2F/map.json b/data/maps/FortreeCity_PokemonCenter_2F/map.json index 169f5ac1c..411643cdd 100644 --- a/data/maps/FortreeCity_PokemonCenter_2F/map.json +++ b/data/maps/FortreeCity_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_FORTREE_CITY_POKEMON_CENTER_2F", "name": "FortreeCity_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_FORTREE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/GraniteCave_1F/map.json b/data/maps/GraniteCave_1F/map.json index c19b0e793..f5c8f32b3 100644 --- a/data/maps/GraniteCave_1F/map.json +++ b/data/maps/GraniteCave_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_GRANITE_CAVE_1F", "name": "GraniteCave_1F", "layout": "LAYOUT_GRANITE_CAVE_1F", - "music": "MUS_DAN01", + "music": "MUS_PETALBURG_WOODS", "region_map_section": "MAPSEC_GRANITE_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/GraniteCave_B1F/map.json b/data/maps/GraniteCave_B1F/map.json index 0d8e71457..e89e54af4 100644 --- a/data/maps/GraniteCave_B1F/map.json +++ b/data/maps/GraniteCave_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_GRANITE_CAVE_B1F", "name": "GraniteCave_B1F", "layout": "LAYOUT_GRANITE_CAVE_B1F", - "music": "MUS_DAN01", + "music": "MUS_PETALBURG_WOODS", "region_map_section": "MAPSEC_GRANITE_CAVE", "requires_flash": true, "weather": "WEATHER_NONE", diff --git a/data/maps/GraniteCave_B2F/map.json b/data/maps/GraniteCave_B2F/map.json index fc4993edc..1e3715ff3 100644 --- a/data/maps/GraniteCave_B2F/map.json +++ b/data/maps/GraniteCave_B2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_GRANITE_CAVE_B2F", "name": "GraniteCave_B2F", "layout": "LAYOUT_GRANITE_CAVE_B2F", - "music": "MUS_DAN01", + "music": "MUS_PETALBURG_WOODS", "region_map_section": "MAPSEC_GRANITE_CAVE", "requires_flash": true, "weather": "WEATHER_NONE", diff --git a/data/maps/GraniteCave_StevensRoom/map.json b/data/maps/GraniteCave_StevensRoom/map.json index 18ddac4b3..f906ecc71 100644 --- a/data/maps/GraniteCave_StevensRoom/map.json +++ b/data/maps/GraniteCave_StevensRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_GRANITE_CAVE_STEVENS_ROOM", "name": "GraniteCave_StevensRoom", "layout": "LAYOUT_GRANITE_CAVE_STEVENS_ROOM", - "music": "MUS_DAN01", + "music": "MUS_PETALBURG_WOODS", "region_map_section": "MAPSEC_GRANITE_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/GraniteCave_StevensRoom/scripts.inc b/data/maps/GraniteCave_StevensRoom/scripts.inc index 861b0eccb..584f64818 100644 --- a/data/maps/GraniteCave_StevensRoom/scripts.inc +++ b/data/maps/GraniteCave_StevensRoom/scripts.inc @@ -22,7 +22,7 @@ GraniteCave_StevensRoom_EventScript_15CBFA:: @ 815CBFA call_if_eq GraniteCave_StevensRoom_EventScript_15CC6D compare VAR_FACING, 4 call_if_eq GraniteCave_StevensRoom_EventScript_15CC6D - playse SE_KAIDAN + playse SE_EXIT removeobject 1 release end diff --git a/data/maps/InsideOfTruck/map.json b/data/maps/InsideOfTruck/map.json index 2847ebb9c..799e03a18 100644 --- a/data/maps/InsideOfTruck/map.json +++ b/data/maps/InsideOfTruck/map.json @@ -2,7 +2,7 @@ "id": "MAP_INSIDE_OF_TRUCK", "name": "InsideOfTruck", "layout": "LAYOUT_INSIDE_OF_TRUCK", - "music": "SE_STOP", + "music": "MUS_DUMMY", "region_map_section": "MAPSEC_INSIDE_OF_TRUCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/IslandCave/map.json b/data/maps/IslandCave/map.json index 405f2699c..e596171d1 100644 --- a/data/maps/IslandCave/map.json +++ b/data/maps/IslandCave/map.json @@ -2,7 +2,7 @@ "id": "MAP_ISLAND_CAVE", "name": "IslandCave", "layout": "LAYOUT_ISLAND_CAVE", - "music": "MUS_MABOROSI", + "music": "MUS_SEALED_CHAMBER", "region_map_section": "MAPSEC_ISLAND_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/IslandCave/scripts.inc b/data/maps/IslandCave/scripts.inc index 1b5d84086..ad7895bf8 100644 --- a/data/maps/IslandCave/scripts.inc +++ b/data/maps/IslandCave/scripts.inc @@ -37,7 +37,7 @@ S_OpenRegiceChamber:: @ 815EF19 setmetatile 8, 20, METATILE_Cave_SealedChamberEntrance_BottomMid, 0 setmetatile 9, 20, METATILE_Cave_SealedChamberEntrance_BottomRight, 1 special DrawWholeMapView - playse SE_BAN + playse SE_BANG setflag FLAG_SYS_BRAILLE_WAIT end diff --git a/data/maps/JaggedPass/map.json b/data/maps/JaggedPass/map.json index 6076e813d..c9249944e 100644 --- a/data/maps/JaggedPass/map.json +++ b/data/maps/JaggedPass/map.json @@ -2,7 +2,7 @@ "id": "MAP_JAGGED_PASS", "name": "JaggedPass", "layout": "LAYOUT_JAGGED_PASS", - "music": "MUS_DAN01", + "music": "MUS_PETALBURG_WOODS", "region_map_section": "MAPSEC_JAGGED_PASS", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LavaridgeTown/map.json b/data/maps/LavaridgeTown/map.json index dffded86a..891d6f5f6 100644 --- a/data/maps/LavaridgeTown/map.json +++ b/data/maps/LavaridgeTown/map.json @@ -2,7 +2,7 @@ "id": "MAP_LAVARIDGE_TOWN", "name": "LavaridgeTown", "layout": "LAYOUT_LAVARIDGE_TOWN", - "music": "MUS_MACHI_S4", + "music": "MUS_OLDALE", "region_map_section": "MAPSEC_LAVARIDGE_TOWN", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/LavaridgeTown/scripts.inc b/data/maps/LavaridgeTown/scripts.inc index 7a868e72e..6d1038f86 100644 --- a/data/maps/LavaridgeTown/scripts.inc +++ b/data/maps/LavaridgeTown/scripts.inc @@ -57,11 +57,11 @@ LavaridgeTown_EventScript_14E4ED:: @ 814E4ED end LavaridgeTown_EventScript_14E56B:: @ 814E56B - playbgm MUS_GIRL_SUP, TRUE + playbgm MUS_ENCOUNTER_MAY, TRUE return LavaridgeTown_EventScript_14E570:: @ 814E570 - playbgm MUS_BOY_SUP, TRUE + playbgm MUS_ENCOUNTER_BRENDAN, TRUE return LavaridgeTown_EventScript_14E575:: @ 814E575 @@ -280,7 +280,7 @@ LavaridgeTown_EventScript_14E75A:: @ 814E75A goto_if_eq LavaridgeTown_EventScript_14E7A8 msgbox LavaridgeTown_Text_16C2B6, MSGBOX_DEFAULT setflag FLAG_RECEIVED_LAVARIDGE_EGG - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM message LavaridgeTown_Text_16C2EA waitfanfare waitmessage diff --git a/data/maps/LavaridgeTown_Gym_1F/map.json b/data/maps/LavaridgeTown_Gym_1F/map.json index 7d1979893..dce2f6a9c 100644 --- a/data/maps/LavaridgeTown_Gym_1F/map.json +++ b/data/maps/LavaridgeTown_Gym_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LAVARIDGE_TOWN_GYM_1F", "name": "LavaridgeTown_Gym_1F", "layout": "LAYOUT_LAVARIDGE_TOWN_GYM_1F", - "music": "MUS_GIM", + "music": "MUS_GYM", "region_map_section": "MAPSEC_LAVARIDGE_TOWN", "requires_flash": false, "weather": "WEATHER_FOG_1", diff --git a/data/maps/LavaridgeTown_Gym_B1F/map.json b/data/maps/LavaridgeTown_Gym_B1F/map.json index 4f11e429f..2f71b1ab9 100644 --- a/data/maps/LavaridgeTown_Gym_B1F/map.json +++ b/data/maps/LavaridgeTown_Gym_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LAVARIDGE_TOWN_GYM_B1F", "name": "LavaridgeTown_Gym_B1F", "layout": "LAYOUT_LAVARIDGE_TOWN_GYM_B1F", - "music": "MUS_GIM", + "music": "MUS_GYM", "region_map_section": "MAPSEC_LAVARIDGE_TOWN", "requires_flash": false, "weather": "WEATHER_FOG_1", diff --git a/data/maps/LavaridgeTown_HerbShop/map.json b/data/maps/LavaridgeTown_HerbShop/map.json index 385573370..19844ca33 100644 --- a/data/maps/LavaridgeTown_HerbShop/map.json +++ b/data/maps/LavaridgeTown_HerbShop/map.json @@ -2,7 +2,7 @@ "id": "MAP_LAVARIDGE_TOWN_HERB_SHOP", "name": "LavaridgeTown_HerbShop", "layout": "LAYOUT_LAVARIDGE_TOWN_HERB_SHOP", - "music": "MUS_MACHI_S4", + "music": "MUS_OLDALE", "region_map_section": "MAPSEC_LAVARIDGE_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LavaridgeTown_House/map.json b/data/maps/LavaridgeTown_House/map.json index 119f2f10f..e26429d11 100644 --- a/data/maps/LavaridgeTown_House/map.json +++ b/data/maps/LavaridgeTown_House/map.json @@ -2,7 +2,7 @@ "id": "MAP_LAVARIDGE_TOWN_HOUSE", "name": "LavaridgeTown_House", "layout": "LAYOUT_HOUSE3", - "music": "MUS_MACHI_S4", + "music": "MUS_OLDALE", "region_map_section": "MAPSEC_LAVARIDGE_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LavaridgeTown_Mart/map.json b/data/maps/LavaridgeTown_Mart/map.json index a19b8bf95..aa7c903af 100644 --- a/data/maps/LavaridgeTown_Mart/map.json +++ b/data/maps/LavaridgeTown_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_LAVARIDGE_TOWN_MART", "name": "LavaridgeTown_Mart", "layout": "LAYOUT_POKE_MART", - "music": "MUS_FRIENDLY", + "music": "MUS_POKE_MART", "region_map_section": "MAPSEC_LAVARIDGE_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/map.json b/data/maps/LavaridgeTown_PokemonCenter_1F/map.json index 6f722df89..3bdeb893d 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_1F/map.json +++ b/data/maps/LavaridgeTown_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F", "name": "LavaridgeTown_PokemonCenter_1F", "layout": "LAYOUT_LAVARIDGE_TOWN_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_LAVARIDGE_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LavaridgeTown_PokemonCenter_2F/map.json b/data/maps/LavaridgeTown_PokemonCenter_2F/map.json index b6dbb1b47..9757ba74b 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_2F/map.json +++ b/data/maps/LavaridgeTown_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LAVARIDGE_TOWN_POKEMON_CENTER_2F", "name": "LavaridgeTown_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_LAVARIDGE_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity/map.json b/data/maps/LilycoveCity/map.json index 7da6b4d91..12acd197c 100644 --- a/data/maps/LilycoveCity/map.json +++ b/data/maps/LilycoveCity/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY", "name": "LilycoveCity", "layout": "LAYOUT_LILYCOVE_CITY", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/LilycoveCity/scripts.inc b/data/maps/LilycoveCity/scripts.inc index 38fbd3472..22f980016 100644 --- a/data/maps/LilycoveCity/scripts.inc +++ b/data/maps/LilycoveCity/scripts.inc @@ -245,7 +245,7 @@ LilycoveCity_EventScript_14CD46:: @ 814CD46 end LilycoveCity_EventScript_14CD60:: @ 814CD60 - playbgm MUS_GIRL_SUP, TRUE + playbgm MUS_ENCOUNTER_MAY, TRUE call_if_set FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_14CDB0 call_if_unset FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_14CDB9 compare VAR_RESULT, NO @@ -274,7 +274,7 @@ LilycoveCity_EventScript_14CDC2:: @ 814CDC2 end LilycoveCity_EventScript_14CDD3:: @ 814CDD3 - playbgm MUS_BOY_SUP, TRUE + playbgm MUS_ENCOUNTER_BRENDAN, TRUE call_if_set FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_14CE23 call_if_unset FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_14CE2C compare VAR_RESULT, NO diff --git a/data/maps/LilycoveCity_ContestHall/map.json b/data/maps/LilycoveCity_ContestHall/map.json index d0f411d54..50c564c38 100644 --- a/data/maps/LilycoveCity_ContestHall/map.json +++ b/data/maps/LilycoveCity_ContestHall/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_CONTEST_HALL", "name": "LilycoveCity_ContestHall", "layout": "LAYOUT_LILYCOVE_CITY_CONTEST_HALL", - "music": "MUS_CONLOBBY", + "music": "MUS_CONTEST_LOBBY", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_ContestLobby/map.json b/data/maps/LilycoveCity_ContestLobby/map.json index 83697d1e8..e02316d09 100644 --- a/data/maps/LilycoveCity_ContestLobby/map.json +++ b/data/maps/LilycoveCity_ContestLobby/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_CONTEST_LOBBY", "name": "LilycoveCity_ContestLobby", "layout": "LAYOUT_LILYCOVE_CITY_CONTEST_LOBBY", - "music": "MUS_CONLOBBY", + "music": "MUS_CONTEST_LOBBY", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_ContestLobby/scripts.inc b/data/maps/LilycoveCity_ContestLobby/scripts.inc index dc3031bda..5dabc84a3 100644 --- a/data/maps/LilycoveCity_ContestLobby/scripts.inc +++ b/data/maps/LilycoveCity_ContestLobby/scripts.inc @@ -77,7 +77,7 @@ LilycoveCity_ContestLobby_EventScript_158948:: @ 8158948 applymovement 4, LilycoveCity_ContestLobby_Movement_158A52 waitmovement 0 msgbox LilycoveCity_ContestLobby_Text_188BB5, MSGBOX_DEFAULT - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM msgbox LilycoveCity_ContestLobby_Text_188C03, MSGBOX_DEFAULT waitfanfare msgbox LilycoveCity_ContestLobby_Text_188C19, MSGBOX_DEFAULT @@ -249,7 +249,7 @@ LilycoveCity_ContestLobby_EventScript_158B18:: @ 8158B18 applymovement 11, LilycoveCity_ContestLobby_Movement_158B7C waitmovement 0 msgbox LilycoveCity_ContestLobby_Text_188BB5, MSGBOX_DEFAULT - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM msgbox LilycoveCity_ContestLobby_Text_188C03, MSGBOX_DEFAULT waitfanfare msgbox LilycoveCity_ContestLobby_Text_188C19, MSGBOX_DEFAULT @@ -492,13 +492,13 @@ LilycoveCity_ContestLobby_EventScript_158E0B:: @ 8158E0B closemessage applymovement 2, LilycoveCity_ContestLobby_Movement_158E9C waitmovement 0 - playse SE_HASHI + playse SE_BRIDGE_WALK setmetatile 9, 2, METATILE_Contest_WallShadow, 1 setmetatile 9, 3, METATILE_Contest_FloorShadow, 1 special DrawWholeMapView applymovement 2, LilycoveCity_ContestLobby_Movement_158EA0 waitmovement 0 - playse SE_HASHI + playse SE_BRIDGE_WALK setmetatile 9, 2, METATILE_Contest_CounterFlap_Top, 1 setmetatile 9, 3, METATILE_Contest_CounterFlap_Bottom, 1 special DrawWholeMapView @@ -631,13 +631,13 @@ LilycoveCity_ContestLobby_EventScript_158F86:: @ 8158F86 lockall applymovement 1, LilycoveCity_ContestLobby_Movement_15900B waitmovement 0 - playse SE_HASHI + playse SE_BRIDGE_WALK setmetatile 4, 2, METATILE_Contest_WallShadow, 1 setmetatile 4, 3, METATILE_Contest_FloorShadow, 1 special DrawWholeMapView applymovement 1, LilycoveCity_ContestLobby_Movement_15900F waitmovement 0 - playse SE_HASHI + playse SE_BRIDGE_WALK setmetatile 4, 2, METATILE_Contest_CounterFlap_Top, 1 setmetatile 4, 3, METATILE_Contest_CounterFlap_Bottom, 1 special DrawWholeMapView diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json b/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json index 4bcb4ab57..7b8e0fc18 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json +++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F", "name": "LilycoveCity_CoveLilyMotel_1F", "layout": "LAYOUT_LILYCOVE_CITY_COVE_LILY_MOTEL_1F", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json b/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json index 954635fbd..b64205eb1 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json +++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_2F", "name": "LilycoveCity_CoveLilyMotel_2F", "layout": "LAYOUT_LILYCOVE_CITY_COVE_LILY_MOTEL_2F", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc index 1b48e4b4d..c6fa2f6c0 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc @@ -18,7 +18,7 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_1583C7:: @ 81583C7 LilycoveCity_CoveLilyMotel_2F_EventScript_1583D0:: @ 81583D0 setflag FLAG_TEMP_2 - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM waitfanfare goto LilycoveCity_CoveLilyMotel_2F_EventScript_1583DD end diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/map.json b/data/maps/LilycoveCity_DepartmentStoreElevator/map.json index 4f3fd5189..5b5479ac3 100644 --- a/data/maps/LilycoveCity_DepartmentStoreElevator/map.json +++ b/data/maps/LilycoveCity_DepartmentStoreElevator/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR", "name": "LilycoveCity_DepartmentStoreElevator", "layout": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json b/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json index 83412d697..c27ac3f66 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP", "name": "LilycoveCity_DepartmentStoreRooftop", "layout": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc index 5b7fafb87..4578313b5 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc @@ -147,7 +147,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 updatemoneybox 0, 0 nop bufferitemname 0, VAR_TEMP_0 - playse SE_JIHANKI + playse SE_VEND msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C75F, MSGBOX_DEFAULT additem VAR_TEMP_0 bufferitemname 1, VAR_TEMP_0 @@ -159,7 +159,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 checkitemspace VAR_TEMP_0, 1 compare VAR_RESULT, 0 goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A388 - playse SE_JIHANKI + playse SE_VEND msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C780, MSGBOX_DEFAULT additem VAR_TEMP_0 bufferitemname 1, VAR_TEMP_0 @@ -171,7 +171,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 checkitemspace VAR_TEMP_0, 1 compare VAR_RESULT, 0 goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A388 - playse SE_JIHANKI + playse SE_VEND msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C780, MSGBOX_DEFAULT additem VAR_TEMP_0 bufferitemname 1, VAR_TEMP_0 diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/map.json b/data/maps/LilycoveCity_DepartmentStore_1F/map.json index 77d3eb262..461c299a4 100644 --- a/data/maps/LilycoveCity_DepartmentStore_1F/map.json +++ b/data/maps/LilycoveCity_DepartmentStore_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F", "name": "LilycoveCity_DepartmentStore_1F", "layout": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_1F", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/map.json b/data/maps/LilycoveCity_DepartmentStore_2F/map.json index 503dc35c5..3d0ec8c37 100644 --- a/data/maps/LilycoveCity_DepartmentStore_2F/map.json +++ b/data/maps/LilycoveCity_DepartmentStore_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F", "name": "LilycoveCity_DepartmentStore_2F", "layout": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_2F", - "music": "MUS_FRIENDLY", + "music": "MUS_POKE_MART", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/map.json b/data/maps/LilycoveCity_DepartmentStore_3F/map.json index 49b978443..a09224702 100644 --- a/data/maps/LilycoveCity_DepartmentStore_3F/map.json +++ b/data/maps/LilycoveCity_DepartmentStore_3F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F", "name": "LilycoveCity_DepartmentStore_3F", "layout": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_3F", - "music": "MUS_FRIENDLY", + "music": "MUS_POKE_MART", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/map.json b/data/maps/LilycoveCity_DepartmentStore_4F/map.json index f6d7ea584..8e39d129c 100644 --- a/data/maps/LilycoveCity_DepartmentStore_4F/map.json +++ b/data/maps/LilycoveCity_DepartmentStore_4F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F", "name": "LilycoveCity_DepartmentStore_4F", "layout": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_4F", - "music": "MUS_FRIENDLY", + "music": "MUS_POKE_MART", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/map.json b/data/maps/LilycoveCity_DepartmentStore_5F/map.json index 951ccadab..141fea32b 100644 --- a/data/maps/LilycoveCity_DepartmentStore_5F/map.json +++ b/data/maps/LilycoveCity_DepartmentStore_5F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F", "name": "LilycoveCity_DepartmentStore_5F", "layout": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_5F", - "music": "MUS_FRIENDLY", + "music": "MUS_POKE_MART", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_EmptyMap/map.json b/data/maps/LilycoveCity_EmptyMap/map.json index 555c36be7..56d65fb07 100644 --- a/data/maps/LilycoveCity_EmptyMap/map.json +++ b/data/maps/LilycoveCity_EmptyMap/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_EMPTY_MAP", "name": "LilycoveCity_EmptyMap", "layout": "LAYOUT_LILYCOVE_CITY_EMPTY_MAP", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_Harbor/map.json b/data/maps/LilycoveCity_Harbor/map.json index 5b31c8129..e4fc39663 100644 --- a/data/maps/LilycoveCity_Harbor/map.json +++ b/data/maps/LilycoveCity_Harbor/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_HARBOR", "name": "LilycoveCity_Harbor", "layout": "LAYOUT_HARBOR", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_House1/map.json b/data/maps/LilycoveCity_House1/map.json index f3e5f9062..21cd211ef 100644 --- a/data/maps/LilycoveCity_House1/map.json +++ b/data/maps/LilycoveCity_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_HOUSE1", "name": "LilycoveCity_House1", "layout": "LAYOUT_HOUSE1", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_House2/map.json b/data/maps/LilycoveCity_House2/map.json index 37c25007d..2f13f9c2a 100644 --- a/data/maps/LilycoveCity_House2/map.json +++ b/data/maps/LilycoveCity_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_HOUSE2", "name": "LilycoveCity_House2", "layout": "LAYOUT_LILYCOVE_CITY_HOUSE2", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_House3/map.json b/data/maps/LilycoveCity_House3/map.json index 4c8b928e4..c7e9c3a21 100644 --- a/data/maps/LilycoveCity_House3/map.json +++ b/data/maps/LilycoveCity_House3/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_HOUSE3", "name": "LilycoveCity_House3", "layout": "LAYOUT_HOUSE2", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_House4/map.json b/data/maps/LilycoveCity_House4/map.json index 874f8f6df..0fc561101 100644 --- a/data/maps/LilycoveCity_House4/map.json +++ b/data/maps/LilycoveCity_House4/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_HOUSE4", "name": "LilycoveCity_House4", "layout": "LAYOUT_HOUSE1", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json b/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json index 4fd29b047..b980a1cec 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json +++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F", "name": "LilycoveCity_LilycoveMuseum_1F", "layout": "LAYOUT_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F", - "music": "MUS_BIJYUTU", + "music": "MUS_LILYCOVE_MUSEUM", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json b/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json index fc1a594d4..a8b1b0ec2 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F", "name": "LilycoveCity_LilycoveMuseum_2F", "layout": "LAYOUT_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F", - "music": "MUS_BIJYUTU", + "music": "MUS_LILYCOVE_MUSEUM", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/map.json b/data/maps/LilycoveCity_MoveDeletersHouse/map.json index 1893cbd0d..142157ed7 100644 --- a/data/maps/LilycoveCity_MoveDeletersHouse/map.json +++ b/data/maps/LilycoveCity_MoveDeletersHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_MOVE_DELETERS_HOUSE", "name": "LilycoveCity_MoveDeletersHouse", "layout": "LAYOUT_HOUSE2", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc b/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc index 39ab9984a..0c2b38dcf 100644 --- a/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc +++ b/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc @@ -40,7 +40,7 @@ LilycoveCity_MoveDeletersHouse_EventScript_159ADE:: @ 8159ADE LilycoveCity_MoveDeletersHouse_EventScript_159B53:: @ 8159B53 special DeleteMonMove - playfanfare MUS_ME_WASURE + playfanfare MUS_MOVE_DELETED waitfanfare msgbox LilycoveCity_MoveDeletersHouse_Text_18B71E, MSGBOX_DEFAULT releaseall diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/map.json b/data/maps/LilycoveCity_PokemonCenter_1F/map.json index 96bebc00d..131b59dbc 100644 --- a/data/maps/LilycoveCity_PokemonCenter_1F/map.json +++ b/data/maps/LilycoveCity_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_POKEMON_CENTER_1F", "name": "LilycoveCity_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_PokemonCenter_2F/map.json b/data/maps/LilycoveCity_PokemonCenter_2F/map.json index 8d6ec1169..16d807a00 100644 --- a/data/maps/LilycoveCity_PokemonCenter_2F/map.json +++ b/data/maps/LilycoveCity_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_POKEMON_CENTER_2F", "name": "LilycoveCity_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/map.json b/data/maps/LilycoveCity_PokemonTrainerFanClub/map.json index 9d58bfc29..9e68c0a00 100644 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/map.json +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB", "name": "LilycoveCity_PokemonTrainerFanClub", "layout": "LAYOUT_LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_UnusedMart/map.json b/data/maps/LilycoveCity_UnusedMart/map.json index f66009546..fa9b85c24 100644 --- a/data/maps/LilycoveCity_UnusedMart/map.json +++ b/data/maps/LilycoveCity_UnusedMart/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_UNUSED_MART", "name": "LilycoveCity_UnusedMart", "layout": "LAYOUT_POKE_MART", - "music": "MUS_FRIENDLY", + "music": "MUS_POKE_MART", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LinkContestRoom1/map.json b/data/maps/LinkContestRoom1/map.json index 35a00a498..65df32217 100644 --- a/data/maps/LinkContestRoom1/map.json +++ b/data/maps/LinkContestRoom1/map.json @@ -2,7 +2,7 @@ "id": "MAP_LINK_CONTEST_ROOM1", "name": "LinkContestRoom1", "layout": "LAYOUT_LINK_CONTEST_ROOM1", - "music": "MUS_CONTEST0", + "music": "MUS_CONTEST", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LinkContestRoom1/scripts.inc b/data/maps/LinkContestRoom1/scripts.inc index df95d1e41..2acb2a444 100644 --- a/data/maps/LinkContestRoom1/scripts.inc +++ b/data/maps/LinkContestRoom1/scripts.inc @@ -26,23 +26,23 @@ LinkContestRoom1_EventScript_15F5A5:: @ 815F5A5 return LinkContestRoom1_EventScript_15F5E0:: @ 815F5E0 - savebgm MUS_TEST1 + savebgm MUS_LINK_CONTEST_P1 return LinkContestRoom1_EventScript_15F5E4:: @ 815F5E4 - savebgm MUS_TEST2 + savebgm MUS_LINK_CONTEST_P2 return LinkContestRoom1_EventScript_15F5E8:: @ 815F5E8 - savebgm MUS_TEST3 + savebgm MUS_LINK_CONTEST_P3 return LinkContestRoom1_EventScript_15F5EC:: @ 815F5EC - savebgm MUS_TEST4 + savebgm MUS_LINK_CONTEST_P4 return LinkContestRoom1_EventScript_15F5F0:: @ 815F5F0 - savebgm MUS_CONTEST0 + savebgm MUS_CONTEST return LinkContestRoom1_MapScript1_15F5F4:: @ 815F5F4 diff --git a/data/maps/LinkContestRoom2/map.json b/data/maps/LinkContestRoom2/map.json index c018394a4..535623613 100644 --- a/data/maps/LinkContestRoom2/map.json +++ b/data/maps/LinkContestRoom2/map.json @@ -2,7 +2,7 @@ "id": "MAP_LINK_CONTEST_ROOM2", "name": "LinkContestRoom2", "layout": "LAYOUT_LINK_CONTEST_ROOM2", - "music": "MUS_CONTEST0", + "music": "MUS_CONTEST", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LinkContestRoom3/map.json b/data/maps/LinkContestRoom3/map.json index 2cd4ac89e..5e8910662 100644 --- a/data/maps/LinkContestRoom3/map.json +++ b/data/maps/LinkContestRoom3/map.json @@ -2,7 +2,7 @@ "id": "MAP_LINK_CONTEST_ROOM3", "name": "LinkContestRoom3", "layout": "LAYOUT_LINK_CONTEST_ROOM3", - "music": "MUS_CONTEST0", + "music": "MUS_CONTEST", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LinkContestRoom4/map.json b/data/maps/LinkContestRoom4/map.json index 0c1bd764f..5540b6c4b 100644 --- a/data/maps/LinkContestRoom4/map.json +++ b/data/maps/LinkContestRoom4/map.json @@ -2,7 +2,7 @@ "id": "MAP_LINK_CONTEST_ROOM4", "name": "LinkContestRoom4", "layout": "LAYOUT_LINK_CONTEST_ROOM4", - "music": "MUS_CONTEST0", + "music": "MUS_CONTEST", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LinkContestRoom5/map.json b/data/maps/LinkContestRoom5/map.json index c2360ee23..27506a462 100644 --- a/data/maps/LinkContestRoom5/map.json +++ b/data/maps/LinkContestRoom5/map.json @@ -2,7 +2,7 @@ "id": "MAP_LINK_CONTEST_ROOM5", "name": "LinkContestRoom5", "layout": "LAYOUT_LINK_CONTEST_ROOM5", - "music": "MUS_CONTEST0", + "music": "MUS_CONTEST", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LinkContestRoom6/map.json b/data/maps/LinkContestRoom6/map.json index cc556b5ca..9b8bed134 100644 --- a/data/maps/LinkContestRoom6/map.json +++ b/data/maps/LinkContestRoom6/map.json @@ -2,7 +2,7 @@ "id": "MAP_LINK_CONTEST_ROOM6", "name": "LinkContestRoom6", "layout": "LAYOUT_LINK_CONTEST_ROOM6", - "music": "MUS_CONTEST0", + "music": "MUS_CONTEST", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LittlerootTown/map.json b/data/maps/LittlerootTown/map.json index 2ce0ea4a1..25a27a528 100644 --- a/data/maps/LittlerootTown/map.json +++ b/data/maps/LittlerootTown/map.json @@ -2,7 +2,7 @@ "id": "MAP_LITTLEROOT_TOWN", "name": "LittlerootTown", "layout": "LAYOUT_LITTLEROOT_TOWN", - "music": "MUS_MISHIRO", + "music": "MUS_LITTLEROOT", "region_map_section": "MAPSEC_LITTLEROOT_TOWN", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/LittlerootTown/scripts.inc b/data/maps/LittlerootTown/scripts.inc index 7b45aa651..dcdf452dd 100644 --- a/data/maps/LittlerootTown/scripts.inc +++ b/data/maps/LittlerootTown/scripts.inc @@ -98,7 +98,7 @@ LittlerootTown_EventScript_14D60D:: @ 814D60D LittlerootTown_EventScript_14D62B:: @ 814D62B delay 15 - playse SE_DANSA + playse SE_LEDGE applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_Movement_14D6C0 waitmovement 0 opendoor VAR_0x8004, VAR_0x8005 @@ -865,7 +865,7 @@ LittlerootTown_EventScript_14DD2B:: @ 814DD2B LittlerootTown_EventScript_14DD38:: @ 814DD38 msgbox LittlerootTown_Text_16A8FD, MSGBOX_DEFAULT - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM message LittlerootTown_Text_16AA32 waitfanfare waitmessage diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/map.json b/data/maps/LittlerootTown_BrendansHouse_1F/map.json index 5c8d5c2e0..f375cc602 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/map.json +++ b/data/maps/LittlerootTown_BrendansHouse_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F", "name": "LittlerootTown_BrendansHouse_1F", "layout": "LAYOUT_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F", - "music": "MUS_MISHIRO", + "music": "MUS_LITTLEROOT", "region_map_section": "MAPSEC_LITTLEROOT_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/map.json b/data/maps/LittlerootTown_BrendansHouse_2F/map.json index 2d0a0f901..c3e94b4e5 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/map.json +++ b/data/maps/LittlerootTown_BrendansHouse_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F", "name": "LittlerootTown_BrendansHouse_2F", "layout": "LAYOUT_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F", - "music": "MUS_MISHIRO", + "music": "MUS_LITTLEROOT", "region_map_section": "MAPSEC_LITTLEROOT_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LittlerootTown_MaysHouse_1F/map.json b/data/maps/LittlerootTown_MaysHouse_1F/map.json index ac2048fbf..8cc646d22 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/map.json +++ b/data/maps/LittlerootTown_MaysHouse_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F", "name": "LittlerootTown_MaysHouse_1F", "layout": "LAYOUT_LITTLEROOT_TOWN_MAYS_HOUSE_1F", - "music": "MUS_MISHIRO", + "music": "MUS_LITTLEROOT", "region_map_section": "MAPSEC_LITTLEROOT_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LittlerootTown_MaysHouse_2F/map.json b/data/maps/LittlerootTown_MaysHouse_2F/map.json index 877166683..1e76f4d25 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/map.json +++ b/data/maps/LittlerootTown_MaysHouse_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LITTLEROOT_TOWN_MAYS_HOUSE_2F", "name": "LittlerootTown_MaysHouse_2F", "layout": "LAYOUT_LITTLEROOT_TOWN_MAYS_HOUSE_2F", - "music": "MUS_MISHIRO", + "music": "MUS_LITTLEROOT", "region_map_section": "MAPSEC_LITTLEROOT_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc index 660f68e5e..c97ac979e 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc +++ b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc @@ -35,7 +35,7 @@ LittlerootTown_MaysHouse_2F_EventScript_152A9D:: @ 8152A9D call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152AD4 compare VAR_RESULT, 1 call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152B4A - playse SE_KAIDAN + playse SE_EXIT removeobject VAR_LAST_TALKED setvar VAR_LITTLEROOT_RIVAL_STATE, 3 setvar VAR_LITTLEROOT_STATE, 1 @@ -46,7 +46,7 @@ LittlerootTown_MaysHouse_2F_EventScript_152A9D:: @ 8152A9D LittlerootTown_BrendansHouse_2F_EventScript_152AD4:: @ 8152AD4 msgbox LittlerootTown_BrendansHouse_2F_Text_17337E, MSGBOX_DEFAULT - playbgm MUS_GIRL_SUP, TRUE + playbgm MUS_ENCOUNTER_MAY, TRUE applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer waitmovement 0 applymovement VAR_LAST_TALKED, Common_Movement_ExclamationMark @@ -80,7 +80,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_152B3F:: @ 8152B3F LittlerootTown_BrendansHouse_2F_EventScript_152B4A:: @ 8152B4A msgbox LittlerootTown_BrendansHouse_2F_Text_1735C9, MSGBOX_DEFAULT - playbgm MUS_BOY_SUP, TRUE + playbgm MUS_ENCOUNTER_BRENDAN, TRUE applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer waitmovement 0 applymovement VAR_LAST_TALKED, Common_Movement_ExclamationMark diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/map.json b/data/maps/LittlerootTown_ProfessorBirchsLab/map.json index 214bc4654..0632dae2c 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/map.json +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/map.json @@ -2,7 +2,7 @@ "id": "MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB", "name": "LittlerootTown_ProfessorBirchsLab", "layout": "LAYOUT_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB", - "music": "MUS_ODAMAKI", + "music": "MUS_BIRCH_LAB", "region_map_section": "MAPSEC_LITTLEROOT_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc index 15267ec8a..f72178096 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc @@ -27,7 +27,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152CBE:: @ 8152CBE bufferleadmonspeciesname 0 message LittlerootTown_ProfessorBirchsLab_Text_173D94 waitmessage - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM waitfanfare msgbox LittlerootTown_ProfessorBirchsLab_Text_173EF8, MSGBOX_YESNO compare VAR_RESULT, YES @@ -153,7 +153,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152E40:: @ 8152E40 return LittlerootTown_ProfessorBirchsLab_EventScript_152E6D:: @ 8152E6D - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM message LittlerootTown_ProfessorBirchsLab_Text_17422F waitfanfare waitmessage diff --git a/data/maps/MagmaHideout_1F/map.json b/data/maps/MagmaHideout_1F/map.json index dba9b43bc..fb816c036 100644 --- a/data/maps/MagmaHideout_1F/map.json +++ b/data/maps/MagmaHideout_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MAGMA_HIDEOUT_1F", "name": "MagmaHideout_1F", "layout": "LAYOUT_MAGMA_HIDEOUT_1F", - "music": "MUS_AJITO", + "music": "MUS_AQUA_MAGMA_HIDEOUT", "region_map_section": "MAPSEC_EVIL_TEAM_HIDEOUT", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MagmaHideout_B1F/map.json b/data/maps/MagmaHideout_B1F/map.json index 6219a75db..1d70b7868 100644 --- a/data/maps/MagmaHideout_B1F/map.json +++ b/data/maps/MagmaHideout_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MAGMA_HIDEOUT_B1F", "name": "MagmaHideout_B1F", "layout": "LAYOUT_MAGMA_HIDEOUT_B1F", - "music": "MUS_AJITO", + "music": "MUS_AQUA_MAGMA_HIDEOUT", "region_map_section": "MAPSEC_EVIL_TEAM_HIDEOUT", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MagmaHideout_B2F/map.json b/data/maps/MagmaHideout_B2F/map.json index 8562e15d6..4aefc7977 100644 --- a/data/maps/MagmaHideout_B2F/map.json +++ b/data/maps/MagmaHideout_B2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MAGMA_HIDEOUT_B2F", "name": "MagmaHideout_B2F", "layout": "LAYOUT_MAGMA_HIDEOUT_B2F", - "music": "MUS_AJITO", + "music": "MUS_AQUA_MAGMA_HIDEOUT", "region_map_section": "MAPSEC_EVIL_TEAM_HIDEOUT", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MauvilleCity/map.json b/data/maps/MauvilleCity/map.json index fa745647e..77b21d296 100644 --- a/data/maps/MauvilleCity/map.json +++ b/data/maps/MauvilleCity/map.json @@ -2,7 +2,7 @@ "id": "MAP_MAUVILLE_CITY", "name": "MauvilleCity", "layout": "LAYOUT_MAUVILLE_CITY", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_MAUVILLE_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/MauvilleCity_BikeShop/map.json b/data/maps/MauvilleCity_BikeShop/map.json index 50ad62df9..fe61fb6e1 100644 --- a/data/maps/MauvilleCity_BikeShop/map.json +++ b/data/maps/MauvilleCity_BikeShop/map.json @@ -2,7 +2,7 @@ "id": "MAP_MAUVILLE_CITY_BIKE_SHOP", "name": "MauvilleCity_BikeShop", "layout": "LAYOUT_MAUVILLE_CITY_BIKE_SHOP", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_MAUVILLE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MauvilleCity_GameCorner/map.json b/data/maps/MauvilleCity_GameCorner/map.json index f8e2ed505..6ef698b65 100644 --- a/data/maps/MauvilleCity_GameCorner/map.json +++ b/data/maps/MauvilleCity_GameCorner/map.json @@ -2,7 +2,7 @@ "id": "MAP_MAUVILLE_CITY_GAME_CORNER", "name": "MauvilleCity_GameCorner", "layout": "LAYOUT_MAUVILLE_CITY_GAME_CORNER", - "music": "MUS_CASINO", + "music": "MUS_GAME_CORNER", "region_map_section": "MAPSEC_MAUVILLE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MauvilleCity_GameCorner/scripts.inc b/data/maps/MauvilleCity_GameCorner/scripts.inc index 3e439332f..d852ef406 100644 --- a/data/maps/MauvilleCity_GameCorner/scripts.inc +++ b/data/maps/MauvilleCity_GameCorner/scripts.inc @@ -43,7 +43,7 @@ MauvilleCity_GameCorner_EventScript_156AAE:: @ 8156AAE updatemoneybox 0, 0 nop updatecoinsbox 0, 5 - playse SE_REGI + playse SE_SHOP msgbox MauvilleCity_GameCorner_Text_181CFE, MSGBOX_DEFAULT hidemoneybox 0, 0 hidecoinsbox 0, 5 @@ -62,7 +62,7 @@ MauvilleCity_GameCorner_EventScript_156AF0:: @ 8156AF0 updatemoneybox 0, 0 nop updatecoinsbox 0, 5 - playse SE_REGI + playse SE_SHOP msgbox MauvilleCity_GameCorner_Text_181CFE, MSGBOX_DEFAULT hidemoneybox 0, 0 hidecoinsbox 0, 5 @@ -163,7 +163,7 @@ MauvilleCity_GameCorner_EventScript_156C46:: @ 8156C46 removecoins 1000 adddecoration DECOR_TREECKO_DOLL updatecoinsbox 0, 0 - playse SE_REGI + playse SE_SHOP msgbox MauvilleCity_GameCorner_Text_181E49, MSGBOX_DEFAULT goto MauvilleCity_GameCorner_EventScript_156B9B end @@ -179,7 +179,7 @@ MauvilleCity_GameCorner_EventScript_156C80:: @ 8156C80 removecoins 1000 adddecoration DECOR_TORCHIC_DOLL updatecoinsbox 0, 0 - playse SE_REGI + playse SE_SHOP msgbox MauvilleCity_GameCorner_Text_181E49, MSGBOX_DEFAULT goto MauvilleCity_GameCorner_EventScript_156B9B end @@ -195,7 +195,7 @@ MauvilleCity_GameCorner_EventScript_156CBA:: @ 8156CBA removecoins 1000 adddecoration DECOR_MUDKIP_DOLL updatecoinsbox 0, 0 - playse SE_REGI + playse SE_SHOP msgbox MauvilleCity_GameCorner_Text_181E49, MSGBOX_DEFAULT goto MauvilleCity_GameCorner_EventScript_156B9B end @@ -297,7 +297,7 @@ MauvilleCity_GameCorner_EventScript_156E3C:: @ 8156E3C removecoins 1500 additem ITEM_TM32_DOUBLE_TEAM updatecoinsbox 0, 0 - playse SE_REGI + playse SE_SHOP msgbox MauvilleCity_GameCorner_Text_181F08, MSGBOX_DEFAULT goto MauvilleCity_GameCorner_EventScript_156D49 end @@ -312,7 +312,7 @@ MauvilleCity_GameCorner_EventScript_156E76:: @ 8156E76 removecoins 3500 additem ITEM_TM29_PSYCHIC updatecoinsbox 0, 0 - playse SE_REGI + playse SE_SHOP msgbox MauvilleCity_GameCorner_Text_181F08, MSGBOX_DEFAULT goto MauvilleCity_GameCorner_EventScript_156D49 end @@ -327,7 +327,7 @@ MauvilleCity_GameCorner_EventScript_156EB0:: @ 8156EB0 removecoins 4000 additem ITEM_TM35_FLAMETHROWER updatecoinsbox 0, 0 - playse SE_REGI + playse SE_SHOP msgbox MauvilleCity_GameCorner_Text_181F08, MSGBOX_DEFAULT goto MauvilleCity_GameCorner_EventScript_156D49 end @@ -342,7 +342,7 @@ MauvilleCity_GameCorner_EventScript_156EEA:: @ 8156EEA removecoins 4000 additem ITEM_TM24_THUNDERBOLT updatecoinsbox 0, 0 - playse SE_REGI + playse SE_SHOP msgbox MauvilleCity_GameCorner_Text_181F08, MSGBOX_DEFAULT goto MauvilleCity_GameCorner_EventScript_156D49 end @@ -357,7 +357,7 @@ MauvilleCity_GameCorner_EventScript_156F24:: @ 8156F24 removecoins 4000 additem ITEM_TM13_ICE_BEAM updatecoinsbox 0, 0 - playse SE_REGI + playse SE_SHOP msgbox MauvilleCity_GameCorner_Text_181F08, MSGBOX_DEFAULT goto MauvilleCity_GameCorner_EventScript_156D49 end @@ -466,7 +466,7 @@ MauvilleCity_GameCorner_EventScript_15709C:: @ 815709C setflag FLAG_RECEIVED_20_COINS addcoins 20 msgbox MauvilleCity_GameCorner_Text_18208E, MSGBOX_DEFAULT - playse SE_REGI + playse SE_SHOP goto MauvilleCity_GameCorner_EventScript_1570CA end diff --git a/data/maps/MauvilleCity_Gym/map.json b/data/maps/MauvilleCity_Gym/map.json index 0ad9f27d4..cf4d2e0e3 100644 --- a/data/maps/MauvilleCity_Gym/map.json +++ b/data/maps/MauvilleCity_Gym/map.json @@ -2,7 +2,7 @@ "id": "MAP_MAUVILLE_CITY_GYM", "name": "MauvilleCity_Gym", "layout": "LAYOUT_MAUVILLE_CITY_GYM", - "music": "MUS_GIM", + "music": "MUS_GYM", "region_map_section": "MAPSEC_MAUVILLE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MauvilleCity_Gym/scripts.inc b/data/maps/MauvilleCity_Gym/scripts.inc index f7af8e1d0..7afaafceb 100644 --- a/data/maps/MauvilleCity_Gym/scripts.inc +++ b/data/maps/MauvilleCity_Gym/scripts.inc @@ -88,7 +88,7 @@ MauvilleCity_Gym_EventScript_1565DB:: @ 81565DB call Common_EventScript_SetGymTrainers special MauvilleGymSpecial3 special DrawWholeMapView - playse SE_KI_GASYAN + playse SE_UNLOCK goto MauvilleCity_Gym_EventScript_15661D end @@ -140,7 +140,7 @@ MauvilleCity_Gym_EventScript_1566BA:: @ 81566BA special MauvilleGymSpecial2 special MauvilleGymSpecial1 special DrawWholeMapView - playse SE_KI_GASYAN + playse SE_UNLOCK goto_if_set FLAG_MAUVILLE_GYM_BARRIERS_STATE, MauvilleCity_Gym_EventScript_1566E1 goto_if_unset FLAG_MAUVILLE_GYM_BARRIERS_STATE, MauvilleCity_Gym_EventScript_1566DC releaseall diff --git a/data/maps/MauvilleCity_House1/map.json b/data/maps/MauvilleCity_House1/map.json index 30ef32dcd..f9fd5c248 100644 --- a/data/maps/MauvilleCity_House1/map.json +++ b/data/maps/MauvilleCity_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_MAUVILLE_CITY_HOUSE1", "name": "MauvilleCity_House1", "layout": "LAYOUT_HOUSE2", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_MAUVILLE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MauvilleCity_House2/map.json b/data/maps/MauvilleCity_House2/map.json index 83d979d2c..0e603641b 100644 --- a/data/maps/MauvilleCity_House2/map.json +++ b/data/maps/MauvilleCity_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_MAUVILLE_CITY_HOUSE2", "name": "MauvilleCity_House2", "layout": "LAYOUT_HOUSE1", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_MAUVILLE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MauvilleCity_Mart/map.json b/data/maps/MauvilleCity_Mart/map.json index 48b2dc552..dfa55a4fe 100644 --- a/data/maps/MauvilleCity_Mart/map.json +++ b/data/maps/MauvilleCity_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_MAUVILLE_CITY_MART", "name": "MauvilleCity_Mart", "layout": "LAYOUT_POKE_MART", - "music": "MUS_FRIENDLY", + "music": "MUS_POKE_MART", "region_map_section": "MAPSEC_MAUVILLE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/map.json b/data/maps/MauvilleCity_PokemonCenter_1F/map.json index 3964d626a..861ea6697 100644 --- a/data/maps/MauvilleCity_PokemonCenter_1F/map.json +++ b/data/maps/MauvilleCity_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MAUVILLE_CITY_POKEMON_CENTER_1F", "name": "MauvilleCity_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_MAUVILLE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/map.json b/data/maps/MauvilleCity_PokemonCenter_2F/map.json index 163d79fb4..6dcfb8737 100644 --- a/data/maps/MauvilleCity_PokemonCenter_2F/map.json +++ b/data/maps/MauvilleCity_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MAUVILLE_CITY_POKEMON_CENTER_2F", "name": "MauvilleCity_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_MAUVILLE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MeteorFalls_1F_1R/map.json b/data/maps/MeteorFalls_1F_1R/map.json index 221538cf2..12a963d13 100644 --- a/data/maps/MeteorFalls_1F_1R/map.json +++ b/data/maps/MeteorFalls_1F_1R/map.json @@ -2,7 +2,7 @@ "id": "MAP_METEOR_FALLS_1F_1R", "name": "MeteorFalls_1F_1R", "layout": "LAYOUT_METEOR_FALLS_1F_1R", - "music": "MUS_DAN03", + "music": "MUS_CAVE_OF_ORIGIN", "region_map_section": "MAPSEC_METEOR_FALLS", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MeteorFalls_1F_2R/map.json b/data/maps/MeteorFalls_1F_2R/map.json index 91a12d462..3a1c797b9 100644 --- a/data/maps/MeteorFalls_1F_2R/map.json +++ b/data/maps/MeteorFalls_1F_2R/map.json @@ -2,7 +2,7 @@ "id": "MAP_METEOR_FALLS_1F_2R", "name": "MeteorFalls_1F_2R", "layout": "LAYOUT_METEOR_FALLS_1F_2R", - "music": "MUS_DAN03", + "music": "MUS_CAVE_OF_ORIGIN", "region_map_section": "MAPSEC_METEOR_FALLS", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MeteorFalls_B1F_1R/map.json b/data/maps/MeteorFalls_B1F_1R/map.json index 293d0da4f..c51b96dc5 100644 --- a/data/maps/MeteorFalls_B1F_1R/map.json +++ b/data/maps/MeteorFalls_B1F_1R/map.json @@ -2,7 +2,7 @@ "id": "MAP_METEOR_FALLS_B1F_1R", "name": "MeteorFalls_B1F_1R", "layout": "LAYOUT_METEOR_FALLS_B1F_1R", - "music": "MUS_DAN03", + "music": "MUS_CAVE_OF_ORIGIN", "region_map_section": "MAPSEC_METEOR_FALLS", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MeteorFalls_B1F_2R/map.json b/data/maps/MeteorFalls_B1F_2R/map.json index cfc99f8a7..c1f05e0f5 100644 --- a/data/maps/MeteorFalls_B1F_2R/map.json +++ b/data/maps/MeteorFalls_B1F_2R/map.json @@ -2,7 +2,7 @@ "id": "MAP_METEOR_FALLS_B1F_2R", "name": "MeteorFalls_B1F_2R", "layout": "LAYOUT_METEOR_FALLS_B1F_2R", - "music": "MUS_DAN03", + "music": "MUS_CAVE_OF_ORIGIN", "region_map_section": "MAPSEC_METEOR_FALLS", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MossdeepCity/map.json b/data/maps/MossdeepCity/map.json index 4c6f537c6..0f26395c9 100644 --- a/data/maps/MossdeepCity/map.json +++ b/data/maps/MossdeepCity/map.json @@ -2,7 +2,7 @@ "id": "MAP_MOSSDEEP_CITY", "name": "MossdeepCity", "layout": "LAYOUT_MOSSDEEP_CITY", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_MOSSDEEP_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/MossdeepCity_GameCorner_1F/map.json b/data/maps/MossdeepCity_GameCorner_1F/map.json index c2cc37d06..fc0efe1db 100644 --- a/data/maps/MossdeepCity_GameCorner_1F/map.json +++ b/data/maps/MossdeepCity_GameCorner_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MOSSDEEP_CITY_GAME_CORNER_1F", "name": "MossdeepCity_GameCorner_1F", "layout": "LAYOUT_MOSSDEEP_CITY_GAME_CORNER_1F", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_MOSSDEEP_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MossdeepCity_GameCorner_B1F/map.json b/data/maps/MossdeepCity_GameCorner_B1F/map.json index 6c2c8f4da..15720578d 100644 --- a/data/maps/MossdeepCity_GameCorner_B1F/map.json +++ b/data/maps/MossdeepCity_GameCorner_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MOSSDEEP_CITY_GAME_CORNER_B1F", "name": "MossdeepCity_GameCorner_B1F", "layout": "LAYOUT_MOSSDEEP_CITY_GAME_CORNER_B1F", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_MOSSDEEP_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MossdeepCity_Gym/map.json b/data/maps/MossdeepCity_Gym/map.json index a054a3a8b..6e154966d 100644 --- a/data/maps/MossdeepCity_Gym/map.json +++ b/data/maps/MossdeepCity_Gym/map.json @@ -2,7 +2,7 @@ "id": "MAP_MOSSDEEP_CITY_GYM", "name": "MossdeepCity_Gym", "layout": "LAYOUT_MOSSDEEP_CITY_GYM", - "music": "MUS_GIM", + "music": "MUS_GYM", "region_map_section": "MAPSEC_MOSSDEEP_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MossdeepCity_Gym/scripts.inc b/data/maps/MossdeepCity_Gym/scripts.inc index bc86b3ead..3bf33b344 100644 --- a/data/maps/MossdeepCity_Gym/scripts.inc +++ b/data/maps/MossdeepCity_Gym/scripts.inc @@ -88,7 +88,7 @@ MossdeepCity_Gym_EventScript_15A5EA:: @ 815A5EA MossdeepCity_Gym_EventScript_15A619:: @ 815A619 special DrawWholeMapView - playse SE_TK_KASYA + playse SE_CLICK releaseall end diff --git a/data/maps/MossdeepCity_House1/map.json b/data/maps/MossdeepCity_House1/map.json index f8fb6e396..775528b73 100644 --- a/data/maps/MossdeepCity_House1/map.json +++ b/data/maps/MossdeepCity_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_MOSSDEEP_CITY_HOUSE1", "name": "MossdeepCity_House1", "layout": "LAYOUT_HOUSE2", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_MOSSDEEP_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MossdeepCity_House2/map.json b/data/maps/MossdeepCity_House2/map.json index 597fac8ff..e77f14b2c 100644 --- a/data/maps/MossdeepCity_House2/map.json +++ b/data/maps/MossdeepCity_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_MOSSDEEP_CITY_HOUSE2", "name": "MossdeepCity_House2", "layout": "LAYOUT_HOUSE1", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_MOSSDEEP_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MossdeepCity_House3/map.json b/data/maps/MossdeepCity_House3/map.json index 335ce50e7..8a28a7138 100644 --- a/data/maps/MossdeepCity_House3/map.json +++ b/data/maps/MossdeepCity_House3/map.json @@ -2,7 +2,7 @@ "id": "MAP_MOSSDEEP_CITY_HOUSE3", "name": "MossdeepCity_House3", "layout": "LAYOUT_HOUSE2", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_MOSSDEEP_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MossdeepCity_House4/map.json b/data/maps/MossdeepCity_House4/map.json index f23896831..f400dca3e 100644 --- a/data/maps/MossdeepCity_House4/map.json +++ b/data/maps/MossdeepCity_House4/map.json @@ -2,7 +2,7 @@ "id": "MAP_MOSSDEEP_CITY_HOUSE4", "name": "MossdeepCity_House4", "layout": "LAYOUT_HOUSE_WITH_BED", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_MOSSDEEP_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MossdeepCity_Mart/map.json b/data/maps/MossdeepCity_Mart/map.json index 8c985ab2b..8ec308187 100644 --- a/data/maps/MossdeepCity_Mart/map.json +++ b/data/maps/MossdeepCity_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_MOSSDEEP_CITY_MART", "name": "MossdeepCity_Mart", "layout": "LAYOUT_POKE_MART", - "music": "MUS_FRIENDLY", + "music": "MUS_POKE_MART", "region_map_section": "MAPSEC_MOSSDEEP_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/map.json b/data/maps/MossdeepCity_PokemonCenter_1F/map.json index 16d1152da..bb07b222b 100644 --- a/data/maps/MossdeepCity_PokemonCenter_1F/map.json +++ b/data/maps/MossdeepCity_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MOSSDEEP_CITY_POKEMON_CENTER_1F", "name": "MossdeepCity_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_MOSSDEEP_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/map.json b/data/maps/MossdeepCity_PokemonCenter_2F/map.json index ed4ab3c74..e60666508 100644 --- a/data/maps/MossdeepCity_PokemonCenter_2F/map.json +++ b/data/maps/MossdeepCity_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MOSSDEEP_CITY_POKEMON_CENTER_2F", "name": "MossdeepCity_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_MOSSDEEP_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/map.json b/data/maps/MossdeepCity_SpaceCenter_1F/map.json index b250b5382..1591bb73f 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/map.json +++ b/data/maps/MossdeepCity_SpaceCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MOSSDEEP_CITY_SPACE_CENTER_1F", "name": "MossdeepCity_SpaceCenter_1F", "layout": "LAYOUT_MOSSDEEP_CITY_SPACE_CENTER_1F", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_MOSSDEEP_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/map.json b/data/maps/MossdeepCity_SpaceCenter_2F/map.json index 8537f7291..466db08fa 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/map.json +++ b/data/maps/MossdeepCity_SpaceCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MOSSDEEP_CITY_SPACE_CENTER_2F", "name": "MossdeepCity_SpaceCenter_2F", "layout": "LAYOUT_MOSSDEEP_CITY_SPACE_CENTER_2F", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_MOSSDEEP_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MossdeepCity_StevensHouse/map.json b/data/maps/MossdeepCity_StevensHouse/map.json index df63c5ca8..25a1f38a5 100644 --- a/data/maps/MossdeepCity_StevensHouse/map.json +++ b/data/maps/MossdeepCity_StevensHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_MOSSDEEP_CITY_STEVENS_HOUSE", "name": "MossdeepCity_StevensHouse", "layout": "LAYOUT_MOSSDEEP_CITY_STEVENS_HOUSE", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_MOSSDEEP_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MossdeepCity_StevensHouse/scripts.inc b/data/maps/MossdeepCity_StevensHouse/scripts.inc index 07fe1b296..bc3c6b2f9 100644 --- a/data/maps/MossdeepCity_StevensHouse/scripts.inc +++ b/data/maps/MossdeepCity_StevensHouse/scripts.inc @@ -78,7 +78,7 @@ MossdeepCity_StevensHouse_EventScript_15AA7C:: @ 815AA7C goto_if_eq MossdeepCity_StevensHouse_EventScript_15AADC copyvar VAR_0x8004, VAR_RESULT removeobject 2 - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM message MossdeepCity_StevensHouse_Text_18DD61 waitfanfare waitmessage diff --git a/data/maps/MtChimney/map.json b/data/maps/MtChimney/map.json index fada71876..0befcf8a2 100644 --- a/data/maps/MtChimney/map.json +++ b/data/maps/MtChimney/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_CHIMNEY", "name": "MtChimney", "layout": "LAYOUT_MT_CHIMNEY", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_MT_CHIMNEY", "requires_flash": false, "weather": "WEATHER_ASH", diff --git a/data/maps/MtChimney_CableCarStation/map.json b/data/maps/MtChimney_CableCarStation/map.json index 761d074de..c44257d94 100644 --- a/data/maps/MtChimney_CableCarStation/map.json +++ b/data/maps/MtChimney_CableCarStation/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_CHIMNEY_CABLE_CAR_STATION", "name": "MtChimney_CableCarStation", "layout": "LAYOUT_CABLE_CAR_STATION", - "music": "MUS_DOORO_X1", + "music": "MUS_ROUTE110", "region_map_section": "MAPSEC_MT_CHIMNEY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtPyre_1F/map.json b/data/maps/MtPyre_1F/map.json index 1c02bd68f..b78524b9a 100644 --- a/data/maps/MtPyre_1F/map.json +++ b/data/maps/MtPyre_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_PYRE_1F", "name": "MtPyre_1F", "layout": "LAYOUT_MT_PYRE_1F", - "music": "MUS_M_DUNGON", + "music": "MUS_MT_PYRE", "region_map_section": "MAPSEC_MT_PYRE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtPyre_2F/map.json b/data/maps/MtPyre_2F/map.json index d49dcb1e9..9e740aaad 100644 --- a/data/maps/MtPyre_2F/map.json +++ b/data/maps/MtPyre_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_PYRE_2F", "name": "MtPyre_2F", "layout": "LAYOUT_MT_PYRE_2F", - "music": "MUS_M_DUNGON", + "music": "MUS_MT_PYRE", "region_map_section": "MAPSEC_MT_PYRE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtPyre_3F/map.json b/data/maps/MtPyre_3F/map.json index a2f36446f..40dfbf151 100644 --- a/data/maps/MtPyre_3F/map.json +++ b/data/maps/MtPyre_3F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_PYRE_3F", "name": "MtPyre_3F", "layout": "LAYOUT_MT_PYRE_3F", - "music": "MUS_M_DUNGON", + "music": "MUS_MT_PYRE", "region_map_section": "MAPSEC_MT_PYRE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtPyre_4F/map.json b/data/maps/MtPyre_4F/map.json index 6469f0b8c..81b432e10 100644 --- a/data/maps/MtPyre_4F/map.json +++ b/data/maps/MtPyre_4F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_PYRE_4F", "name": "MtPyre_4F", "layout": "LAYOUT_MT_PYRE_4F", - "music": "MUS_M_DUNGON", + "music": "MUS_MT_PYRE", "region_map_section": "MAPSEC_MT_PYRE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtPyre_5F/map.json b/data/maps/MtPyre_5F/map.json index 11ffc89db..611e41954 100644 --- a/data/maps/MtPyre_5F/map.json +++ b/data/maps/MtPyre_5F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_PYRE_5F", "name": "MtPyre_5F", "layout": "LAYOUT_MT_PYRE_5F", - "music": "MUS_M_DUNGON", + "music": "MUS_MT_PYRE", "region_map_section": "MAPSEC_MT_PYRE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtPyre_6F/map.json b/data/maps/MtPyre_6F/map.json index 5dad923b4..3ec42a9b1 100644 --- a/data/maps/MtPyre_6F/map.json +++ b/data/maps/MtPyre_6F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_PYRE_6F", "name": "MtPyre_6F", "layout": "LAYOUT_MT_PYRE_6F", - "music": "MUS_M_DUNGON", + "music": "MUS_MT_PYRE", "region_map_section": "MAPSEC_MT_PYRE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtPyre_Exterior/map.json b/data/maps/MtPyre_Exterior/map.json index 3cb7c7815..dd9ce29ff 100644 --- a/data/maps/MtPyre_Exterior/map.json +++ b/data/maps/MtPyre_Exterior/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_PYRE_EXTERIOR", "name": "MtPyre_Exterior", "layout": "LAYOUT_MT_PYRE_EXTERIOR", - "music": "MUS_MACHUPI", + "music": "MUS_MT_PYRE_EXTERIOR", "region_map_section": "MAPSEC_MT_PYRE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtPyre_Summit/map.json b/data/maps/MtPyre_Summit/map.json index cb7c8db49..ae6c856a1 100644 --- a/data/maps/MtPyre_Summit/map.json +++ b/data/maps/MtPyre_Summit/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_PYRE_SUMMIT", "name": "MtPyre_Summit", "layout": "LAYOUT_MT_PYRE_SUMMIT", - "music": "MUS_MACHUPI", + "music": "MUS_MT_PYRE_EXTERIOR", "region_map_section": "MAPSEC_MT_PYRE", "requires_flash": false, "weather": "WEATHER_FOG_1", diff --git a/data/maps/NewMauville_Entrance/map.json b/data/maps/NewMauville_Entrance/map.json index 4162f2bfb..44adf56b9 100644 --- a/data/maps/NewMauville_Entrance/map.json +++ b/data/maps/NewMauville_Entrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_NEW_MAUVILLE_ENTRANCE", "name": "NewMauville_Entrance", "layout": "LAYOUT_NEW_MAUVILLE_ENTRANCE", - "music": "MUS_M_DUNGON", + "music": "MUS_MT_PYRE", "region_map_section": "MAPSEC_NEW_MAUVILLE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NewMauville_Entrance/scripts.inc b/data/maps/NewMauville_Entrance/scripts.inc index ecc52cfa0..5595b1720 100644 --- a/data/maps/NewMauville_Entrance/scripts.inc +++ b/data/maps/NewMauville_Entrance/scripts.inc @@ -40,7 +40,7 @@ NewMauville_Entrance_EventScript_15E4DC:: @ 815E4DC setmetatile 4, 1, METATILE_Facility_NewMauvilleDoor_Open_Tile4, 0 setmetatile 5, 1, METATILE_Facility_NewMauvilleDoor_Open_Tile5, 1 special DrawWholeMapView - playse SE_BAN + playse SE_BANG setvar VAR_NEW_MAUVILLE_STATE, 1 releaseall end diff --git a/data/maps/NewMauville_Inside/map.json b/data/maps/NewMauville_Inside/map.json index 0aef219af..0ee17aaa5 100644 --- a/data/maps/NewMauville_Inside/map.json +++ b/data/maps/NewMauville_Inside/map.json @@ -2,7 +2,7 @@ "id": "MAP_NEW_MAUVILLE_INSIDE", "name": "NewMauville_Inside", "layout": "LAYOUT_NEW_MAUVILLE_INSIDE", - "music": "MUS_M_DUNGON", + "music": "MUS_MT_PYRE", "region_map_section": "MAPSEC_NEW_MAUVILLE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/OldaleTown/map.json b/data/maps/OldaleTown/map.json index 45b3ce38a..37df7aa62 100644 --- a/data/maps/OldaleTown/map.json +++ b/data/maps/OldaleTown/map.json @@ -2,7 +2,7 @@ "id": "MAP_OLDALE_TOWN", "name": "OldaleTown", "layout": "LAYOUT_OLDALE_TOWN", - "music": "MUS_MACHI_S4", + "music": "MUS_OLDALE", "region_map_section": "MAPSEC_OLDALE_TOWN", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/OldaleTown/scripts.inc b/data/maps/OldaleTown/scripts.inc index ba3a1868e..fdad86c1c 100644 --- a/data/maps/OldaleTown/scripts.inc +++ b/data/maps/OldaleTown/scripts.inc @@ -38,7 +38,7 @@ OldaleTown_EventScript_14DDBC:: @ 814DDBC goto_if_set FLAG_RECEIVED_POTION_OLDALE, OldaleTown_EventScript_14DE79 goto_if_set FLAG_TEMP_1, OldaleTown_EventScript_14DE79 setflag FLAG_TEMP_1 - playbgm MUS_TSURETEK, FALSE + playbgm MUS_FOLLOW_ME, FALSE msgbox OldaleTown_Text_16AEF2, MSGBOX_DEFAULT closemessage switch VAR_FACING diff --git a/data/maps/OldaleTown_House1/map.json b/data/maps/OldaleTown_House1/map.json index 568b9187b..484e9d919 100644 --- a/data/maps/OldaleTown_House1/map.json +++ b/data/maps/OldaleTown_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_OLDALE_TOWN_HOUSE1", "name": "OldaleTown_House1", "layout": "LAYOUT_HOUSE1", - "music": "MUS_MACHI_S4", + "music": "MUS_OLDALE", "region_map_section": "MAPSEC_OLDALE_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/OldaleTown_House2/map.json b/data/maps/OldaleTown_House2/map.json index b863c6f72..e14f7d6de 100644 --- a/data/maps/OldaleTown_House2/map.json +++ b/data/maps/OldaleTown_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_OLDALE_TOWN_HOUSE2", "name": "OldaleTown_House2", "layout": "LAYOUT_HOUSE2", - "music": "MUS_MACHI_S4", + "music": "MUS_OLDALE", "region_map_section": "MAPSEC_OLDALE_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/OldaleTown_Mart/map.json b/data/maps/OldaleTown_Mart/map.json index 960be303b..3491333f3 100644 --- a/data/maps/OldaleTown_Mart/map.json +++ b/data/maps/OldaleTown_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_OLDALE_TOWN_MART", "name": "OldaleTown_Mart", "layout": "LAYOUT_POKE_MART", - "music": "MUS_FRIENDLY", + "music": "MUS_POKE_MART", "region_map_section": "MAPSEC_OLDALE_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/OldaleTown_PokemonCenter_1F/map.json b/data/maps/OldaleTown_PokemonCenter_1F/map.json index 007924f75..22526e475 100644 --- a/data/maps/OldaleTown_PokemonCenter_1F/map.json +++ b/data/maps/OldaleTown_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_OLDALE_TOWN_POKEMON_CENTER_1F", "name": "OldaleTown_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_OLDALE_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/OldaleTown_PokemonCenter_2F/map.json b/data/maps/OldaleTown_PokemonCenter_2F/map.json index 2bd8eff9c..0b857a04c 100644 --- a/data/maps/OldaleTown_PokemonCenter_2F/map.json +++ b/data/maps/OldaleTown_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_OLDALE_TOWN_POKEMON_CENTER_2F", "name": "OldaleTown_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_OLDALE_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PacifidlogTown/map.json b/data/maps/PacifidlogTown/map.json index 50e30456b..a929d586b 100644 --- a/data/maps/PacifidlogTown/map.json +++ b/data/maps/PacifidlogTown/map.json @@ -2,7 +2,7 @@ "id": "MAP_PACIFIDLOG_TOWN", "name": "PacifidlogTown", "layout": "LAYOUT_PACIFIDLOG_TOWN", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_PACIFIDLOG_TOWN", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/PacifidlogTown_House1/map.json b/data/maps/PacifidlogTown_House1/map.json index 4e8810514..0b20e0a18 100644 --- a/data/maps/PacifidlogTown_House1/map.json +++ b/data/maps/PacifidlogTown_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_PACIFIDLOG_TOWN_HOUSE1", "name": "PacifidlogTown_House1", "layout": "LAYOUT_PACIFIDLOG_TOWN_HOUSE1", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_PACIFIDLOG_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PacifidlogTown_House2/map.json b/data/maps/PacifidlogTown_House2/map.json index 702277046..599b6c094 100644 --- a/data/maps/PacifidlogTown_House2/map.json +++ b/data/maps/PacifidlogTown_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_PACIFIDLOG_TOWN_HOUSE2", "name": "PacifidlogTown_House2", "layout": "LAYOUT_PACIFIDLOG_TOWN_HOUSE2", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_PACIFIDLOG_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PacifidlogTown_House3/map.json b/data/maps/PacifidlogTown_House3/map.json index c4cdcb362..65491d51d 100644 --- a/data/maps/PacifidlogTown_House3/map.json +++ b/data/maps/PacifidlogTown_House3/map.json @@ -2,7 +2,7 @@ "id": "MAP_PACIFIDLOG_TOWN_HOUSE3", "name": "PacifidlogTown_House3", "layout": "LAYOUT_PACIFIDLOG_TOWN_HOUSE1", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_PACIFIDLOG_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PacifidlogTown_House4/map.json b/data/maps/PacifidlogTown_House4/map.json index 4f5fd22b1..f2a66cb9d 100644 --- a/data/maps/PacifidlogTown_House4/map.json +++ b/data/maps/PacifidlogTown_House4/map.json @@ -2,7 +2,7 @@ "id": "MAP_PACIFIDLOG_TOWN_HOUSE4", "name": "PacifidlogTown_House4", "layout": "LAYOUT_PACIFIDLOG_TOWN_HOUSE2", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_PACIFIDLOG_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PacifidlogTown_House5/map.json b/data/maps/PacifidlogTown_House5/map.json index cda98d9db..5b80ab704 100644 --- a/data/maps/PacifidlogTown_House5/map.json +++ b/data/maps/PacifidlogTown_House5/map.json @@ -2,7 +2,7 @@ "id": "MAP_PACIFIDLOG_TOWN_HOUSE5", "name": "PacifidlogTown_House5", "layout": "LAYOUT_PACIFIDLOG_TOWN_HOUSE1", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_PACIFIDLOG_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/map.json b/data/maps/PacifidlogTown_PokemonCenter_1F/map.json index 744594889..d74698bee 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_1F/map.json +++ b/data/maps/PacifidlogTown_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F", "name": "PacifidlogTown_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_PACIFIDLOG_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PacifidlogTown_PokemonCenter_2F/map.json b/data/maps/PacifidlogTown_PokemonCenter_2F/map.json index ac2849775..a81efcaf0 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_2F/map.json +++ b/data/maps/PacifidlogTown_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_2F", "name": "PacifidlogTown_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_PACIFIDLOG_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PetalburgCity/map.json b/data/maps/PetalburgCity/map.json index aaddb65cb..53627f989 100644 --- a/data/maps/PetalburgCity/map.json +++ b/data/maps/PetalburgCity/map.json @@ -2,7 +2,7 @@ "id": "MAP_PETALBURG_CITY", "name": "PetalburgCity", "layout": "LAYOUT_PETALBURG_CITY", - "music": "MUS_MACHI_S2", + "music": "MUS_PETALBURG", "region_map_section": "MAPSEC_PETALBURG_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/PetalburgCity/scripts.inc b/data/maps/PetalburgCity/scripts.inc index 7c02a67f7..6eac0b301 100644 --- a/data/maps/PetalburgCity/scripts.inc +++ b/data/maps/PetalburgCity/scripts.inc @@ -16,7 +16,7 @@ PetalburgCity_EventScript_14B731:: @ 814B731 return PetalburgCity_EventScript_14B739:: @ 814B739 - savebgm MUS_TSURETEK + savebgm MUS_FOLLOW_ME return PetalburgCity_MapScript2_14B73D:: @ 814B73D @@ -182,7 +182,7 @@ PetalburgCity_EventScript_14B85A:: @ 814B85A PetalburgCity_EventScript_14B866:: @ 814B866 applymovement 9, Common_Movement_FacePlayer waitmovement 0 - playbgm MUS_TSURETEK, FALSE + playbgm MUS_FOLLOW_ME, FALSE playse SE_PIN applymovement 9, Common_Movement_ExclamationMark waitmovement 0 diff --git a/data/maps/PetalburgCity_Gym/map.json b/data/maps/PetalburgCity_Gym/map.json index 0e96f6731..724914a04 100644 --- a/data/maps/PetalburgCity_Gym/map.json +++ b/data/maps/PetalburgCity_Gym/map.json @@ -2,7 +2,7 @@ "id": "MAP_PETALBURG_CITY_GYM", "name": "PetalburgCity_Gym", "layout": "LAYOUT_PETALBURG_CITY_GYM", - "music": "MUS_GIM", + "music": "MUS_GYM", "region_map_section": "MAPSEC_PETALBURG_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PetalburgCity_Gym/scripts.inc b/data/maps/PetalburgCity_Gym/scripts.inc index 07e1394a7..90add0107 100644 --- a/data/maps/PetalburgCity_Gym/scripts.inc +++ b/data/maps/PetalburgCity_Gym/scripts.inc @@ -76,7 +76,7 @@ PetalburgCity_Gym_EventScript_15456C:: @ 815456C applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown applymovement 10, PetalburgCity_Gym_Movement_1545B4 waitmovement 0 - playse SE_KAIDAN + playse SE_EXIT removeobject 10 setflag FLAG_HIDE_WALLY_PETALBURG delay 30 @@ -187,7 +187,7 @@ PetalburgCity_Gym_EventScript_154669:: @ 8154669 msgbox PetalburgCity_Gym_Text_17A171, MSGBOX_DEFAULT closemessage setflag FLAG_DONT_TRANSITION_MUSIC - playbgm MUS_TSURETEK, FALSE + playbgm MUS_FOLLOW_ME, FALSE compare VAR_0x8008, 0 call_if_eq PetalburgCity_Gym_EventScript_154835 compare VAR_0x8008, 1 diff --git a/data/maps/PetalburgCity_House1/map.json b/data/maps/PetalburgCity_House1/map.json index ca5dfb729..77b80eb1a 100644 --- a/data/maps/PetalburgCity_House1/map.json +++ b/data/maps/PetalburgCity_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_PETALBURG_CITY_HOUSE1", "name": "PetalburgCity_House1", "layout": "LAYOUT_HOUSE1", - "music": "MUS_MACHI_S2", + "music": "MUS_PETALBURG", "region_map_section": "MAPSEC_PETALBURG_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PetalburgCity_House2/map.json b/data/maps/PetalburgCity_House2/map.json index 943c9b1f9..f840d202c 100644 --- a/data/maps/PetalburgCity_House2/map.json +++ b/data/maps/PetalburgCity_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_PETALBURG_CITY_HOUSE2", "name": "PetalburgCity_House2", "layout": "LAYOUT_HOUSE_WITH_BED", - "music": "MUS_MACHI_S2", + "music": "MUS_PETALBURG", "region_map_section": "MAPSEC_PETALBURG_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PetalburgCity_Mart/map.json b/data/maps/PetalburgCity_Mart/map.json index db1e4a94d..0ff957f5f 100644 --- a/data/maps/PetalburgCity_Mart/map.json +++ b/data/maps/PetalburgCity_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_PETALBURG_CITY_MART", "name": "PetalburgCity_Mart", "layout": "LAYOUT_POKE_MART", - "music": "MUS_FRIENDLY", + "music": "MUS_POKE_MART", "region_map_section": "MAPSEC_PETALBURG_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/map.json b/data/maps/PetalburgCity_PokemonCenter_1F/map.json index bf15fd1cc..ed161a3ca 100644 --- a/data/maps/PetalburgCity_PokemonCenter_1F/map.json +++ b/data/maps/PetalburgCity_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_PETALBURG_CITY_POKEMON_CENTER_1F", "name": "PetalburgCity_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_PETALBURG_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PetalburgCity_PokemonCenter_2F/map.json b/data/maps/PetalburgCity_PokemonCenter_2F/map.json index df425c8f5..eb3e89650 100644 --- a/data/maps/PetalburgCity_PokemonCenter_2F/map.json +++ b/data/maps/PetalburgCity_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_PETALBURG_CITY_POKEMON_CENTER_2F", "name": "PetalburgCity_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_PETALBURG_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PetalburgCity_WallysHouse/map.json b/data/maps/PetalburgCity_WallysHouse/map.json index c5e040de6..c97e8c328 100644 --- a/data/maps/PetalburgCity_WallysHouse/map.json +++ b/data/maps/PetalburgCity_WallysHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_PETALBURG_CITY_WALLYS_HOUSE", "name": "PetalburgCity_WallysHouse", "layout": "LAYOUT_HOUSE2", - "music": "MUS_MACHI_S2", + "music": "MUS_PETALBURG", "region_map_section": "MAPSEC_PETALBURG_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PetalburgWoods/map.json b/data/maps/PetalburgWoods/map.json index 36c312bbe..036ec469f 100644 --- a/data/maps/PetalburgWoods/map.json +++ b/data/maps/PetalburgWoods/map.json @@ -2,7 +2,7 @@ "id": "MAP_PETALBURG_WOODS", "name": "PetalburgWoods", "layout": "LAYOUT_PETALBURG_WOODS", - "music": "MUS_DAN01", + "music": "MUS_PETALBURG_WOODS", "region_map_section": "MAPSEC_PETALBURG_WOODS", "requires_flash": false, "weather": "WEATHER_SHADE", diff --git a/data/maps/RecordCorner/map.json b/data/maps/RecordCorner/map.json index 804987129..2f8b276ce 100644 --- a/data/maps/RecordCorner/map.json +++ b/data/maps/RecordCorner/map.json @@ -2,7 +2,7 @@ "id": "MAP_RECORD_CORNER", "name": "RecordCorner", "layout": "LAYOUT_RECORD_CORNER", - "music": "MUS_RAINBOW", + "music": "MUS_EVER_GRANDE", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route101/map.json b/data/maps/Route101/map.json index 24d4c2360..b567044d2 100644 --- a/data/maps/Route101/map.json +++ b/data/maps/Route101/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE101", "name": "Route101", "layout": "LAYOUT_ROUTE101", - "music": "MUS_DOORO1", + "music": "MUS_ROUTE101", "region_map_section": "MAPSEC_ROUTE_101", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route101/scripts.inc b/data/maps/Route101/scripts.inc index 60e67565d..b042ab903 100644 --- a/data/maps/Route101/scripts.inc +++ b/data/maps/Route101/scripts.inc @@ -18,7 +18,7 @@ Route101_EventScript_14E93F:: @ 814E93F Route101_EventScript_14E948:: @ 814E948 lockall - playbgm MUS_EVENT0, TRUE + playbgm MUS_HELP, TRUE msgbox Route101_Text_16D10E, MSGBOX_DEFAULT closemessage setobjectxy 2, 0, 15 diff --git a/data/maps/Route102/map.json b/data/maps/Route102/map.json index 54262a239..cba038763 100644 --- a/data/maps/Route102/map.json +++ b/data/maps/Route102/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE102", "name": "Route102", "layout": "LAYOUT_ROUTE102", - "music": "MUS_DOORO1", + "music": "MUS_ROUTE101", "region_map_section": "MAPSEC_ROUTE_102", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route103/map.json b/data/maps/Route103/map.json index 691cc719a..cb2a70a6b 100644 --- a/data/maps/Route103/map.json +++ b/data/maps/Route103/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE103", "name": "Route103", "layout": "LAYOUT_ROUTE103", - "music": "MUS_DOORO1", + "music": "MUS_ROUTE101", "region_map_section": "MAPSEC_ROUTE_103", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route103/scripts.inc b/data/maps/Route103/scripts.inc index 637a2a85a..ea9dc841d 100644 --- a/data/maps/Route103/scripts.inc +++ b/data/maps/Route103/scripts.inc @@ -18,7 +18,7 @@ Route103_EventScript_14EB92:: @ 814EB92 Route103_EventScript_14EBAB:: @ 814EBAB msgbox Route103_Text_16D57A, MSGBOX_DEFAULT - playbgm MUS_GIRL_SUP, TRUE + playbgm MUS_ENCOUNTER_MAY, TRUE applymovement 2, Common_Movement_FacePlayer waitmovement 0 applymovement 2, Common_Movement_ExclamationMark @@ -34,7 +34,7 @@ Route103_EventScript_14EBAB:: @ 814EBAB Route103_EventScript_14EC04:: @ 814EC04 msgbox Route103_Text_16D762, MSGBOX_DEFAULT - playbgm MUS_BOY_SUP, TRUE + playbgm MUS_ENCOUNTER_BRENDAN, TRUE applymovement 2, Common_Movement_FacePlayer waitmovement 0 applymovement 2, Common_Movement_ExclamationMark @@ -100,7 +100,7 @@ Route103_EventScript_14ECD9:: @ 814ECD9 Route103_EventScript_14ED0C:: @ 814ED0C applymovement 2, Route103_Movement_14ED67 waitmovement 0 - playse SE_DANSA + playse SE_LEDGE applymovement 2, Route103_Movement_14ED6B waitmovement 0 goto Route103_EventScript_14ED46 @@ -109,7 +109,7 @@ Route103_EventScript_14ED0C:: @ 814ED0C Route103_EventScript_14ED29:: @ 814ED29 applymovement 2, Route103_Movement_14ED71 waitmovement 0 - playse SE_DANSA + playse SE_LEDGE applymovement 2, Route103_Movement_14ED74 waitmovement 0 goto Route103_EventScript_14ED46 diff --git a/data/maps/Route104/map.json b/data/maps/Route104/map.json index fd90b70e5..3a5fef615 100644 --- a/data/maps/Route104/map.json +++ b/data/maps/Route104/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE104", "name": "Route104", "layout": "LAYOUT_ROUTE104", - "music": "MUS_NEXTROAD", + "music": "MUS_ROUTE104", "region_map_section": "MAPSEC_ROUTE_104", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route104_MrBrineysHouse/map.json b/data/maps/Route104_MrBrineysHouse/map.json index 6dcc22109..7322b2066 100644 --- a/data/maps/Route104_MrBrineysHouse/map.json +++ b/data/maps/Route104_MrBrineysHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE104_MR_BRINEYS_HOUSE", "name": "Route104_MrBrineysHouse", "layout": "LAYOUT_ROUTE104_MR_BRINEYS_HOUSE", - "music": "MUS_MACHI_S2", + "music": "MUS_PETALBURG", "region_map_section": "MAPSEC_ROUTE_104", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route104_PrettyPetalFlowerShop/map.json b/data/maps/Route104_PrettyPetalFlowerShop/map.json index b949583ed..fd3e7cb0a 100644 --- a/data/maps/Route104_PrettyPetalFlowerShop/map.json +++ b/data/maps/Route104_PrettyPetalFlowerShop/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE104_PRETTY_PETAL_FLOWER_SHOP", "name": "Route104_PrettyPetalFlowerShop", "layout": "LAYOUT_ROUTE104_PRETTY_PETAL_FLOWER_SHOP", - "music": "MUS_MACHI_S2", + "music": "MUS_PETALBURG", "region_map_section": "MAPSEC_ROUTE_104", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route104_Prototype/map.json b/data/maps/Route104_Prototype/map.json index 286dbaaa2..b769374f9 100644 --- a/data/maps/Route104_Prototype/map.json +++ b/data/maps/Route104_Prototype/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE104_PROTOTYPE", "name": "Route104_Prototype", "layout": "LAYOUT_ROUTE104_PROTOTYPE", - "music": "MUS_NEXTROAD", + "music": "MUS_ROUTE104", "region_map_section": "MAPSEC_ROUTE_104", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route104_PrototypePrettyPetalFlowerShop/map.json b/data/maps/Route104_PrototypePrettyPetalFlowerShop/map.json index 8e532a031..479a2384d 100644 --- a/data/maps/Route104_PrototypePrettyPetalFlowerShop/map.json +++ b/data/maps/Route104_PrototypePrettyPetalFlowerShop/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE104_PROTOTYPE_PRETTY_PETAL_FLOWER_SHOP", "name": "Route104_PrototypePrettyPetalFlowerShop", "layout": "LAYOUT_ROUTE104_PRETTY_PETAL_FLOWER_SHOP", - "music": "MUS_NEXTROAD", + "music": "MUS_ROUTE104", "region_map_section": "MAPSEC_ROUTE_104", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route105/map.json b/data/maps/Route105/map.json index 378acb257..497fd19f3 100644 --- a/data/maps/Route105/map.json +++ b/data/maps/Route105/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE105", "name": "Route105", "layout": "LAYOUT_ROUTE105", - "music": "MUS_NEXTROAD", + "music": "MUS_ROUTE104", "region_map_section": "MAPSEC_ROUTE_105", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route106/map.json b/data/maps/Route106/map.json index 6fba97556..f1df4be1a 100644 --- a/data/maps/Route106/map.json +++ b/data/maps/Route106/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE106", "name": "Route106", "layout": "LAYOUT_ROUTE106", - "music": "MUS_NEXTROAD", + "music": "MUS_ROUTE104", "region_map_section": "MAPSEC_ROUTE_106", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route107/map.json b/data/maps/Route107/map.json index 369697c74..51ef3a9c0 100644 --- a/data/maps/Route107/map.json +++ b/data/maps/Route107/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE107", "name": "Route107", "layout": "LAYOUT_ROUTE107", - "music": "MUS_NEXTROAD", + "music": "MUS_ROUTE104", "region_map_section": "MAPSEC_ROUTE_107", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route108/map.json b/data/maps/Route108/map.json index 0763b7dfc..2092e0f4a 100644 --- a/data/maps/Route108/map.json +++ b/data/maps/Route108/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE108", "name": "Route108", "layout": "LAYOUT_ROUTE108", - "music": "MUS_NEXTROAD", + "music": "MUS_ROUTE104", "region_map_section": "MAPSEC_ROUTE_108", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route109/map.json b/data/maps/Route109/map.json index 8345481c4..bcdaaf259 100644 --- a/data/maps/Route109/map.json +++ b/data/maps/Route109/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE109", "name": "Route109", "layout": "LAYOUT_ROUTE109", - "music": "MUS_NEXTROAD", + "music": "MUS_ROUTE104", "region_map_section": "MAPSEC_ROUTE_109", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route109_SeashoreHouse/map.json b/data/maps/Route109_SeashoreHouse/map.json index 49e8a7751..ccb50b680 100644 --- a/data/maps/Route109_SeashoreHouse/map.json +++ b/data/maps/Route109_SeashoreHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE109_SEASHORE_HOUSE", "name": "Route109_SeashoreHouse", "layout": "LAYOUT_ROUTE109_SEASHORE_HOUSE", - "music": "MUS_HIGHTOWN", + "music": "MUS_DEWFORD", "region_map_section": "MAPSEC_ROUTE_109", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route110/map.json b/data/maps/Route110/map.json index 93fb927dc..7aef1715f 100644 --- a/data/maps/Route110/map.json +++ b/data/maps/Route110/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE110", "name": "Route110", "layout": "LAYOUT_ROUTE110", - "music": "MUS_DOORO_X1", + "music": "MUS_ROUTE110", "region_map_section": "MAPSEC_ROUTE_110", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route110/scripts.inc b/data/maps/Route110/scripts.inc index 80605c132..75341ea2c 100644 --- a/data/maps/Route110/scripts.inc +++ b/data/maps/Route110/scripts.inc @@ -352,11 +352,11 @@ Route110_EventScript_14FD34:: @ 814FD34 end Route110_EventScript_14FDA7:: @ 814FDA7 - playbgm MUS_GIRL_SUP, TRUE + playbgm MUS_ENCOUNTER_MAY, TRUE return Route110_EventScript_14FDAC:: @ 814FDAC - playbgm MUS_BOY_SUP, TRUE + playbgm MUS_ENCOUNTER_BRENDAN, TRUE return Route110_EventScript_14FDB1:: @ 814FDB1 diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json index dc7060d9b..f073d60c7 100644 --- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json +++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE", "name": "Route110_SeasideCyclingRoadNorthEntrance", "layout": "LAYOUT_ROUTE110_SEASIDE_CYCLING_ROAD_ENTRACE", - "music": "MUS_FINECITY", + "music": "MUS_SLATEPORT", "region_map_section": "MAPSEC_ROUTE_110", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json index 2d17f1f79..91e54f251 100644 --- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json +++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE", "name": "Route110_SeasideCyclingRoadSouthEntrance", "layout": "LAYOUT_ROUTE110_SEASIDE_CYCLING_ROAD_ENTRACE", - "music": "MUS_FINECITY", + "music": "MUS_SLATEPORT", "region_map_section": "MAPSEC_ROUTE_110", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route110_TrickHouseCorridor/map.json b/data/maps/Route110_TrickHouseCorridor/map.json index 116e0994d..ece6984cb 100644 --- a/data/maps/Route110_TrickHouseCorridor/map.json +++ b/data/maps/Route110_TrickHouseCorridor/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE110_TRICK_HOUSE_CORRIDOR", "name": "Route110_TrickHouseCorridor", "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_CORRIDOR", - "music": "MUS_KARAKURI", + "music": "MUS_TRICK_HOUSE", "region_map_section": "MAPSEC_ROUTE_110", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route110_TrickHouseEnd/map.json b/data/maps/Route110_TrickHouseEnd/map.json index bf413874d..a992e138d 100644 --- a/data/maps/Route110_TrickHouseEnd/map.json +++ b/data/maps/Route110_TrickHouseEnd/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE110_TRICK_HOUSE_END", "name": "Route110_TrickHouseEnd", "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_END", - "music": "MUS_KARAKURI", + "music": "MUS_TRICK_HOUSE", "region_map_section": "MAPSEC_ROUTE_110", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route110_TrickHouseEnd/scripts.inc b/data/maps/Route110_TrickHouseEnd/scripts.inc index 683637648..167f9bf58 100644 --- a/data/maps/Route110_TrickHouseEnd/scripts.inc +++ b/data/maps/Route110_TrickHouseEnd/scripts.inc @@ -182,7 +182,7 @@ Route110_TrickHouseEnd_EventScript_161BAF:: @ 8161BAF Route110_TrickHouseEnd_EventScript_161C2E:: @ 8161C2E applymovement 1, Route110_TrickHouseEnd_Movement_161315 waitmovement 0 - playse SE_W153 + playse SE_M_EXPLOSION applymovement 1, Route110_TrickHouseEnd_Movement_16131E waitmovement 0 removeobject 1 @@ -230,7 +230,7 @@ Route110_TrickHouseEnd_EventScript_161CA0:: @ 8161CA0 delay 20 applymovement 1, Route110_TrickHouseEnd_Movement_161CEA waitmovement 0 - playse SE_W153 + playse SE_M_EXPLOSION applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 msgbox Route110_TrickHouseEnd_Text_19CA8B, MSGBOX_DEFAULT diff --git a/data/maps/Route110_TrickHouseEntrance/map.json b/data/maps/Route110_TrickHouseEntrance/map.json index ca869dcdc..79cef3649 100644 --- a/data/maps/Route110_TrickHouseEntrance/map.json +++ b/data/maps/Route110_TrickHouseEntrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE110_TRICK_HOUSE_ENTRANCE", "name": "Route110_TrickHouseEntrance", "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_ENTRANCE", - "music": "MUS_KARAKURI", + "music": "MUS_TRICK_HOUSE", "region_map_section": "MAPSEC_ROUTE_110", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route110_TrickHouseEntrance/scripts.inc b/data/maps/Route110_TrickHouseEntrance/scripts.inc index 794237957..59797f90f 100644 --- a/data/maps/Route110_TrickHouseEntrance/scripts.inc +++ b/data/maps/Route110_TrickHouseEntrance/scripts.inc @@ -213,7 +213,7 @@ Route110_TrickHouseEntrance_EventScript_1611D7:: @ 81611D7 delay 20 applymovement 1, Route110_TrickHouseEntrance_Movement_161315 waitmovement 0 - playse SE_W153 + playse SE_M_EXPLOSION applymovement 1, Route110_TrickHouseEntrance_Movement_16131E waitmovement 0 removeobject 1 @@ -462,7 +462,7 @@ Route110_TrickHouseEntrance_EventScript_161551:: @ 8161551 waitmovement 0 applymovement 1, Route110_TrickHouseEntrance_Movement_161315 waitmovement 0 - playse SE_W153 + playse SE_M_EXPLOSION applymovement 1, Route110_TrickHouseEntrance_Movement_16131E waitmovement 0 removeobject 1 @@ -707,7 +707,7 @@ Route110_TrickHousePuzzle5_EventScript_16189C:: @ 816189C Route110_TrickHousePuzzle6_EventScript_16189C:: @ 816189C Route110_TrickHousePuzzle7_EventScript_16189C:: @ 816189C Route110_TrickHousePuzzle8_EventScript_16189C:: @ 816189C - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM message Route110_TrickHousePuzzle1_Text_19C1B8 waitfanfare waitmessage diff --git a/data/maps/Route110_TrickHousePuzzle1/map.json b/data/maps/Route110_TrickHousePuzzle1/map.json index e9d7922ae..1d059f3df 100644 --- a/data/maps/Route110_TrickHousePuzzle1/map.json +++ b/data/maps/Route110_TrickHousePuzzle1/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE1", "name": "Route110_TrickHousePuzzle1", "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE1", - "music": "MUS_KARAKURI", + "music": "MUS_TRICK_HOUSE", "region_map_section": "MAPSEC_ROUTE_110", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route110_TrickHousePuzzle2/map.json b/data/maps/Route110_TrickHousePuzzle2/map.json index c006dcebc..6755424a5 100644 --- a/data/maps/Route110_TrickHousePuzzle2/map.json +++ b/data/maps/Route110_TrickHousePuzzle2/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE2", "name": "Route110_TrickHousePuzzle2", "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE2", - "music": "MUS_KARAKURI", + "music": "MUS_TRICK_HOUSE", "region_map_section": "MAPSEC_ROUTE_110", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route110_TrickHousePuzzle3/map.json b/data/maps/Route110_TrickHousePuzzle3/map.json index 6ff77999b..11249d223 100644 --- a/data/maps/Route110_TrickHousePuzzle3/map.json +++ b/data/maps/Route110_TrickHousePuzzle3/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE3", "name": "Route110_TrickHousePuzzle3", "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE3", - "music": "MUS_KARAKURI", + "music": "MUS_TRICK_HOUSE", "region_map_section": "MAPSEC_ROUTE_110", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route110_TrickHousePuzzle4/map.json b/data/maps/Route110_TrickHousePuzzle4/map.json index 020c1442f..8b2b3025d 100644 --- a/data/maps/Route110_TrickHousePuzzle4/map.json +++ b/data/maps/Route110_TrickHousePuzzle4/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE4", "name": "Route110_TrickHousePuzzle4", "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE4", - "music": "MUS_KARAKURI", + "music": "MUS_TRICK_HOUSE", "region_map_section": "MAPSEC_ROUTE_110", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route110_TrickHousePuzzle5/map.json b/data/maps/Route110_TrickHousePuzzle5/map.json index f3fc7de40..6cb94cae7 100644 --- a/data/maps/Route110_TrickHousePuzzle5/map.json +++ b/data/maps/Route110_TrickHousePuzzle5/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE5", "name": "Route110_TrickHousePuzzle5", "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE5", - "music": "MUS_KARAKURI", + "music": "MUS_TRICK_HOUSE", "region_map_section": "MAPSEC_ROUTE_110", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route110_TrickHousePuzzle5/scripts.inc b/data/maps/Route110_TrickHousePuzzle5/scripts.inc index 6836211bd..903ccc999 100644 --- a/data/maps/Route110_TrickHousePuzzle5/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle5/scripts.inc @@ -389,7 +389,7 @@ Route110_TrickHousePuzzle5_EventScript_162D6D:: @ 8162D6D Route110_TrickHousePuzzle5_EventScript_162D90:: @ 8162D90 waitse - playse SE_HAZURE + playse SE_FAILURE msgbox Route110_TrickHousePuzzle5_Text_19D5CF, MSGBOX_DEFAULT applymovement 1, Route110_TrickHousePuzzle5_Movement_16309F applymovement 2, Route110_TrickHousePuzzle5_Movement_16309F @@ -408,7 +408,7 @@ Route110_TrickHousePuzzle5_EventScript_162D90:: @ 8162D90 Route110_TrickHousePuzzle5_EventScript_162DDF:: @ 8162DDF waitse - playse SE_SEIKAI + playse SE_SUCCESS goto Route110_TrickHousePuzzle5_EventScript_162DE9 end diff --git a/data/maps/Route110_TrickHousePuzzle6/map.json b/data/maps/Route110_TrickHousePuzzle6/map.json index d6c9966f4..b0a39b700 100644 --- a/data/maps/Route110_TrickHousePuzzle6/map.json +++ b/data/maps/Route110_TrickHousePuzzle6/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE6", "name": "Route110_TrickHousePuzzle6", "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE6", - "music": "MUS_KARAKURI", + "music": "MUS_TRICK_HOUSE", "region_map_section": "MAPSEC_ROUTE_110", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route110_TrickHousePuzzle7/map.json b/data/maps/Route110_TrickHousePuzzle7/map.json index 508cc6d1f..df9c47be5 100644 --- a/data/maps/Route110_TrickHousePuzzle7/map.json +++ b/data/maps/Route110_TrickHousePuzzle7/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE7", "name": "Route110_TrickHousePuzzle7", "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE7", - "music": "MUS_KARAKURI", + "music": "MUS_TRICK_HOUSE", "region_map_section": "MAPSEC_ROUTE_110", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route110_TrickHousePuzzle7/scripts.inc b/data/maps/Route110_TrickHousePuzzle7/scripts.inc index 589e77983..8491b5220 100644 --- a/data/maps/Route110_TrickHousePuzzle7/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle7/scripts.inc @@ -119,7 +119,7 @@ Route110_TrickHousePuzzle7_EventScript_1632B9:: @ 81632B9 call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_163195 call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_1631F4 special DrawWholeMapView - playse SE_TK_KASYA + playse SE_CLICK goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_1633A4 goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_1633A9 end @@ -130,7 +130,7 @@ Route110_TrickHousePuzzle7_EventScript_1632E8:: @ 81632E8 call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_1631A8 call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_163207 special DrawWholeMapView - playse SE_TK_KASYA + playse SE_CLICK goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_1633AE goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_1633B3 end @@ -141,7 +141,7 @@ Route110_TrickHousePuzzle7_EventScript_163317:: @ 8163317 call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_1631BB call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_16321A special DrawWholeMapView - playse SE_TK_KASYA + playse SE_CLICK goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_1633B8 goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_1633BD end @@ -152,7 +152,7 @@ Route110_TrickHousePuzzle7_EventScript_163346:: @ 8163346 call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_1631CE call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_16322D special DrawWholeMapView - playse SE_TK_KASYA + playse SE_CLICK goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_1633C2 goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_1633C7 end @@ -163,7 +163,7 @@ Route110_TrickHousePuzzle7_EventScript_163375:: @ 8163375 call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_1631E1 call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_163240 special DrawWholeMapView - playse SE_TK_KASYA + playse SE_CLICK goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_1633CC goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_1633D1 end diff --git a/data/maps/Route110_TrickHousePuzzle8/map.json b/data/maps/Route110_TrickHousePuzzle8/map.json index 19d7a006f..0b6b06cf5 100644 --- a/data/maps/Route110_TrickHousePuzzle8/map.json +++ b/data/maps/Route110_TrickHousePuzzle8/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE8", "name": "Route110_TrickHousePuzzle8", "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE8", - "music": "MUS_KARAKURI", + "music": "MUS_TRICK_HOUSE", "region_map_section": "MAPSEC_ROUTE_110", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route111/map.json b/data/maps/Route111/map.json index 5f3dba03f..d5cd385d8 100644 --- a/data/maps/Route111/map.json +++ b/data/maps/Route111/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE111", "name": "Route111", "layout": "LAYOUT_ROUTE111", - "music": "MUS_DOORO_X1", + "music": "MUS_ROUTE110", "region_map_section": "MAPSEC_ROUTE_111", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route111/scripts.inc b/data/maps/Route111/scripts.inc index 163fe11da..295cab713 100644 --- a/data/maps/Route111/scripts.inc +++ b/data/maps/Route111/scripts.inc @@ -219,14 +219,14 @@ Route111_Movement_1501BA:: @ 81501BA Route111_EventScript_1501BC:: @ 81501BC setweather WEATHER_SUNNY - fadenewbgm MUS_DOORO_X1 + fadenewbgm MUS_ROUTE110 doweather setvar VAR_TEMP_3, 0 end Route111_EventScript_1501C9:: @ 81501C9 setweather WEATHER_SANDSTORM - fadenewbgm MUS_ASHROAD + fadenewbgm MUS_ROUTE111 doweather end diff --git a/data/maps/Route111_OldLadysRestStop/map.json b/data/maps/Route111_OldLadysRestStop/map.json index a617e7307..d89409184 100644 --- a/data/maps/Route111_OldLadysRestStop/map.json +++ b/data/maps/Route111_OldLadysRestStop/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE111_OLD_LADYS_REST_STOP", "name": "Route111_OldLadysRestStop", "layout": "LAYOUT_HOUSE3", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_ROUTE_111", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route111_WinstrateFamilysHouse/map.json b/data/maps/Route111_WinstrateFamilysHouse/map.json index 2ee5c83de..5fe9e1a9c 100644 --- a/data/maps/Route111_WinstrateFamilysHouse/map.json +++ b/data/maps/Route111_WinstrateFamilysHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE111_WINSTRATE_FAMILYS_HOUSE", "name": "Route111_WinstrateFamilysHouse", "layout": "LAYOUT_HOUSE2", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_ROUTE_111", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route112/map.json b/data/maps/Route112/map.json index 88cf1c2b3..b5651711c 100644 --- a/data/maps/Route112/map.json +++ b/data/maps/Route112/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE112", "name": "Route112", "layout": "LAYOUT_ROUTE112", - "music": "MUS_DOORO_X1", + "music": "MUS_ROUTE110", "region_map_section": "MAPSEC_ROUTE_112", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route112_CableCarStation/map.json b/data/maps/Route112_CableCarStation/map.json index b3b8c0ea1..27940bc66 100644 --- a/data/maps/Route112_CableCarStation/map.json +++ b/data/maps/Route112_CableCarStation/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE112_CABLE_CAR_STATION", "name": "Route112_CableCarStation", "layout": "LAYOUT_CABLE_CAR_STATION", - "music": "MUS_DOORO_X1", + "music": "MUS_ROUTE110", "region_map_section": "MAPSEC_ROUTE_112", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route113/map.json b/data/maps/Route113/map.json index 88311edd7..f8fb82631 100644 --- a/data/maps/Route113/map.json +++ b/data/maps/Route113/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE113", "name": "Route113", "layout": "LAYOUT_ROUTE113", - "music": "MUS_KAZANBAI", + "music": "MUS_ROUTE113", "region_map_section": "MAPSEC_ROUTE_113", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route113_GlassWorkshop/map.json b/data/maps/Route113_GlassWorkshop/map.json index 14982c2d4..3d6687d35 100644 --- a/data/maps/Route113_GlassWorkshop/map.json +++ b/data/maps/Route113_GlassWorkshop/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE113_GLASS_WORKSHOP", "name": "Route113_GlassWorkshop", "layout": "LAYOUT_HOUSE4", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_ROUTE_113", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route114/map.json b/data/maps/Route114/map.json index d237ccf16..72afb8330 100644 --- a/data/maps/Route114/map.json +++ b/data/maps/Route114/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE114", "name": "Route114", "layout": "LAYOUT_ROUTE114", - "music": "MUS_DOORO_X1", + "music": "MUS_ROUTE110", "region_map_section": "MAPSEC_ROUTE_114", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route114_FossilManiacsHouse/map.json b/data/maps/Route114_FossilManiacsHouse/map.json index 0cc1cebc5..2ac163837 100644 --- a/data/maps/Route114_FossilManiacsHouse/map.json +++ b/data/maps/Route114_FossilManiacsHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE114_FOSSIL_MANIACS_HOUSE", "name": "Route114_FossilManiacsHouse", "layout": "LAYOUT_ROUTE114_FOSSIL_MANIACS_HOUSE", - "music": "MUS_TONEKUSA", + "music": "MUS_FALLARBOR", "region_map_section": "MAPSEC_ROUTE_114", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route114_FossilManiacsTunnel/map.json b/data/maps/Route114_FossilManiacsTunnel/map.json index dd42dd934..62563a426 100644 --- a/data/maps/Route114_FossilManiacsTunnel/map.json +++ b/data/maps/Route114_FossilManiacsTunnel/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE114_FOSSIL_MANIACS_TUNNEL", "name": "Route114_FossilManiacsTunnel", "layout": "LAYOUT_ROUTE114_FOSSIL_MANIACS_TUNNEL", - "music": "MUS_TONEKUSA", + "music": "MUS_FALLARBOR", "region_map_section": "MAPSEC_ROUTE_114", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route114_LanettesHouse/map.json b/data/maps/Route114_LanettesHouse/map.json index af62dac96..e1182536c 100644 --- a/data/maps/Route114_LanettesHouse/map.json +++ b/data/maps/Route114_LanettesHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE114_LANETTES_HOUSE", "name": "Route114_LanettesHouse", "layout": "LAYOUT_ROUTE114_LANETTES_HOUSE", - "music": "MUS_TONEKUSA", + "music": "MUS_FALLARBOR", "region_map_section": "MAPSEC_ROUTE_114", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route115/map.json b/data/maps/Route115/map.json index 2e6fb8545..764945bde 100644 --- a/data/maps/Route115/map.json +++ b/data/maps/Route115/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE115", "name": "Route115", "layout": "LAYOUT_ROUTE115", - "music": "MUS_NEXTROAD", + "music": "MUS_ROUTE104", "region_map_section": "MAPSEC_ROUTE_115", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route116/map.json b/data/maps/Route116/map.json index 2ec98302e..741309055 100644 --- a/data/maps/Route116/map.json +++ b/data/maps/Route116/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE116", "name": "Route116", "layout": "LAYOUT_ROUTE116", - "music": "MUS_NEXTROAD", + "music": "MUS_ROUTE104", "region_map_section": "MAPSEC_ROUTE_116", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route116_TunnelersRestHouse/map.json b/data/maps/Route116_TunnelersRestHouse/map.json index 9b07d84e3..653074880 100644 --- a/data/maps/Route116_TunnelersRestHouse/map.json +++ b/data/maps/Route116_TunnelersRestHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE116_TUNNELERS_REST_HOUSE", "name": "Route116_TunnelersRestHouse", "layout": "LAYOUT_ROUTE116_TUNNELERS_REST_HOUSE", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_ROUTE_116", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route117/map.json b/data/maps/Route117/map.json index 368fa9d6e..eff08e1ee 100644 --- a/data/maps/Route117/map.json +++ b/data/maps/Route117/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE117", "name": "Route117", "layout": "LAYOUT_ROUTE117", - "music": "MUS_DOORO_X1", + "music": "MUS_ROUTE110", "region_map_section": "MAPSEC_ROUTE_117", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route117_PokemonDayCare/map.json b/data/maps/Route117_PokemonDayCare/map.json index ebb732d35..7ba6120b2 100644 --- a/data/maps/Route117_PokemonDayCare/map.json +++ b/data/maps/Route117_PokemonDayCare/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE117_POKEMON_DAY_CARE", "name": "Route117_PokemonDayCare", "layout": "LAYOUT_ROUTE117_POKEMON_DAY_CARE", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_ROUTE_117", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route118/scripts.inc b/data/maps/Route118/scripts.inc index be767e166..9dfc95194 100644 --- a/data/maps/Route118/scripts.inc +++ b/data/maps/Route118/scripts.inc @@ -76,7 +76,7 @@ Route118_EventScript_150FE4:: @ 8150FE4 end Route118_EventScript_151004:: @ 8151004 - playse SE_DANSA + playse SE_LEDGE applymovement 19, Route118_Movement_15106D waitmovement 0 delay 30 diff --git a/data/maps/Route119/map.json b/data/maps/Route119/map.json index 0cdba1552..e275d0b10 100644 --- a/data/maps/Route119/map.json +++ b/data/maps/Route119/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE119", "name": "Route119", "layout": "LAYOUT_ROUTE119", - "music": "MUS_GRANROAD", + "music": "MUS_ROUTE119", "region_map_section": "MAPSEC_ROUTE_119", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route119/scripts.inc b/data/maps/Route119/scripts.inc index 3b4e9c51f..b1307f0e4 100644 --- a/data/maps/Route119/scripts.inc +++ b/data/maps/Route119/scripts.inc @@ -79,11 +79,11 @@ Route119_EventScript_1511DB:: @ 81511DB end Route119_EventScript_151254:: @ 8151254 - playbgm MUS_GIRL_SUP, TRUE + playbgm MUS_ENCOUNTER_MAY, TRUE return Route119_EventScript_151259:: @ 8151259 - playbgm MUS_BOY_SUP, TRUE + playbgm MUS_ENCOUNTER_BRENDAN, TRUE return Route119_EventScript_15125E:: @ 815125E diff --git a/data/maps/Route119_House/map.json b/data/maps/Route119_House/map.json index cb41137b0..9c9468d59 100644 --- a/data/maps/Route119_House/map.json +++ b/data/maps/Route119_House/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE119_HOUSE", "name": "Route119_House", "layout": "LAYOUT_HOUSE1", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_ROUTE_119", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route119_WeatherInstitute_1F/map.json b/data/maps/Route119_WeatherInstitute_1F/map.json index 3ca2fd306..7dc0223fd 100644 --- a/data/maps/Route119_WeatherInstitute_1F/map.json +++ b/data/maps/Route119_WeatherInstitute_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE119_WEATHER_INSTITUTE_1F", "name": "Route119_WeatherInstitute_1F", "layout": "LAYOUT_ROUTE119_WEATHER_INSTITUTE_1F", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_ROUTE_119", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route119_WeatherInstitute_2F/map.json b/data/maps/Route119_WeatherInstitute_2F/map.json index 13f9009c8..4d951a18e 100644 --- a/data/maps/Route119_WeatherInstitute_2F/map.json +++ b/data/maps/Route119_WeatherInstitute_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE119_WEATHER_INSTITUTE_2F", "name": "Route119_WeatherInstitute_2F", "layout": "LAYOUT_ROUTE119_WEATHER_INSTITUTE_2F", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_ROUTE_119", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route119_WeatherInstitute_2F/scripts.inc b/data/maps/Route119_WeatherInstitute_2F/scripts.inc index 18aba2003..6a14b2c60 100644 --- a/data/maps/Route119_WeatherInstitute_2F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_2F/scripts.inc @@ -58,7 +58,7 @@ Route119_WeatherInstitute_2F_EventScript_163D7A:: @ 8163D7A getpartysize compare VAR_RESULT, 6 goto_if_eq Route119_WeatherInstitute_2F_EventScript_163DB4 - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM message Route119_WeatherInstitute_2F_Text_19F267 waitfanfare waitmessage diff --git a/data/maps/Route120/map.json b/data/maps/Route120/map.json index bc3473476..19c9f8846 100644 --- a/data/maps/Route120/map.json +++ b/data/maps/Route120/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE120", "name": "Route120", "layout": "LAYOUT_ROUTE120", - "music": "MUS_DOORO_X3", + "music": "MUS_ROUTE120", "region_map_section": "MAPSEC_ROUTE_120", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route121/map.json b/data/maps/Route121/map.json index 92fc5b59f..7b610e9dd 100644 --- a/data/maps/Route121/map.json +++ b/data/maps/Route121/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE121", "name": "Route121", "layout": "LAYOUT_ROUTE121", - "music": "MUS_DOORO_X3", + "music": "MUS_ROUTE120", "region_map_section": "MAPSEC_ROUTE_121", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route121_SafariZoneEntrance/map.json b/data/maps/Route121_SafariZoneEntrance/map.json index 3c1220c49..993cdd403 100644 --- a/data/maps/Route121_SafariZoneEntrance/map.json +++ b/data/maps/Route121_SafariZoneEntrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE121_SAFARI_ZONE_ENTRANCE", "name": "Route121_SafariZoneEntrance", "layout": "LAYOUT_ROUTE121_SAFARI_ZONE_ENTRANCE", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_ROUTE_121", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route121_SafariZoneEntrance/scripts.inc b/data/maps/Route121_SafariZoneEntrance/scripts.inc index 6fa9c8d81..481f243fc 100644 --- a/data/maps/Route121_SafariZoneEntrance/scripts.inc +++ b/data/maps/Route121_SafariZoneEntrance/scripts.inc @@ -71,7 +71,7 @@ Route121_SafariZoneEntrance_EventScript_15C3B3:: @ 815C3B3 updatemoneybox 0, 0 nop msgbox Route121_SafariZoneEntrance_Text_1C38F4, MSGBOX_DEFAULT - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM message Route121_SafariZoneEntrance_Text_1C3910 waitfanfare waitmessage diff --git a/data/maps/Route122/map.json b/data/maps/Route122/map.json index 1037df207..e1aabb090 100644 --- a/data/maps/Route122/map.json +++ b/data/maps/Route122/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE122", "name": "Route122", "layout": "LAYOUT_ROUTE122", - "music": "MUS_DOORO_X4", + "music": "MUS_ROUTE122", "region_map_section": "MAPSEC_ROUTE_122", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route123/map.json b/data/maps/Route123/map.json index 4cb877538..7dc367d1a 100644 --- a/data/maps/Route123/map.json +++ b/data/maps/Route123/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE123", "name": "Route123", "layout": "LAYOUT_ROUTE123", - "music": "MUS_DOORO_X4", + "music": "MUS_ROUTE122", "region_map_section": "MAPSEC_ROUTE_123", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route123_BerryMastersHouse/map.json b/data/maps/Route123_BerryMastersHouse/map.json index 9cdf9620e..ff3252a88 100644 --- a/data/maps/Route123_BerryMastersHouse/map.json +++ b/data/maps/Route123_BerryMastersHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE123_BERRY_MASTERS_HOUSE", "name": "Route123_BerryMastersHouse", "layout": "LAYOUT_HOUSE2", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_ROUTE_123", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route124/map.json b/data/maps/Route124/map.json index 717381caf..1eda0bd74 100644 --- a/data/maps/Route124/map.json +++ b/data/maps/Route124/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE124", "name": "Route124", "layout": "LAYOUT_ROUTE124", - "music": "MUS_DOORO_X3", + "music": "MUS_ROUTE120", "region_map_section": "MAPSEC_ROUTE_124", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/map.json b/data/maps/Route124_DivingTreasureHuntersHouse/map.json index 775508c2d..ef800009b 100644 --- a/data/maps/Route124_DivingTreasureHuntersHouse/map.json +++ b/data/maps/Route124_DivingTreasureHuntersHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE", "name": "Route124_DivingTreasureHuntersHouse", "layout": "LAYOUT_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_ROUTE_124", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route125/map.json b/data/maps/Route125/map.json index 51e39ac41..418afc5f9 100644 --- a/data/maps/Route125/map.json +++ b/data/maps/Route125/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE125", "name": "Route125", "layout": "LAYOUT_ROUTE125", - "music": "MUS_DOORO_X3", + "music": "MUS_ROUTE120", "region_map_section": "MAPSEC_ROUTE_125", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route126/map.json b/data/maps/Route126/map.json index a6ab407ff..e9cf0075c 100644 --- a/data/maps/Route126/map.json +++ b/data/maps/Route126/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE126", "name": "Route126", "layout": "LAYOUT_ROUTE126", - "music": "MUS_DOORO_X3", + "music": "MUS_ROUTE120", "region_map_section": "MAPSEC_ROUTE_126", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route127/map.json b/data/maps/Route127/map.json index 6b471e370..6c3a53f12 100644 --- a/data/maps/Route127/map.json +++ b/data/maps/Route127/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE127", "name": "Route127", "layout": "LAYOUT_ROUTE127", - "music": "MUS_DOORO_X3", + "music": "MUS_ROUTE120", "region_map_section": "MAPSEC_ROUTE_127", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route128/map.json b/data/maps/Route128/map.json index da4ed9c21..a5c329c86 100644 --- a/data/maps/Route128/map.json +++ b/data/maps/Route128/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE128", "name": "Route128", "layout": "LAYOUT_ROUTE128", - "music": "MUS_DOORO_X3", + "music": "MUS_ROUTE120", "region_map_section": "MAPSEC_ROUTE_128", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route129/map.json b/data/maps/Route129/map.json index 7e7ae0d8b..3236a422c 100644 --- a/data/maps/Route129/map.json +++ b/data/maps/Route129/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE129", "name": "Route129", "layout": "LAYOUT_ROUTE129", - "music": "MUS_GRANROAD", + "music": "MUS_ROUTE119", "region_map_section": "MAPSEC_ROUTE_129", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route130/map.json b/data/maps/Route130/map.json index 073549cd4..f6628e888 100644 --- a/data/maps/Route130/map.json +++ b/data/maps/Route130/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE130", "name": "Route130", "layout": "LAYOUT_ROUTE130", - "music": "MUS_GRANROAD", + "music": "MUS_ROUTE119", "region_map_section": "MAPSEC_ROUTE_130", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route131/map.json b/data/maps/Route131/map.json index 5e166047a..4b367e9be 100644 --- a/data/maps/Route131/map.json +++ b/data/maps/Route131/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE131", "name": "Route131", "layout": "LAYOUT_ROUTE131", - "music": "MUS_GRANROAD", + "music": "MUS_ROUTE119", "region_map_section": "MAPSEC_ROUTE_131", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route132/map.json b/data/maps/Route132/map.json index e778a1341..5ded1cd04 100644 --- a/data/maps/Route132/map.json +++ b/data/maps/Route132/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE132", "name": "Route132", "layout": "LAYOUT_ROUTE132", - "music": "MUS_GRANROAD", + "music": "MUS_ROUTE119", "region_map_section": "MAPSEC_ROUTE_132", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route133/map.json b/data/maps/Route133/map.json index cf61d83d2..41808fd13 100644 --- a/data/maps/Route133/map.json +++ b/data/maps/Route133/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE133", "name": "Route133", "layout": "LAYOUT_ROUTE133", - "music": "MUS_GRANROAD", + "music": "MUS_ROUTE119", "region_map_section": "MAPSEC_ROUTE_133", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route134/map.json b/data/maps/Route134/map.json index 566507ec6..ac41a0486 100644 --- a/data/maps/Route134/map.json +++ b/data/maps/Route134/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE134", "name": "Route134", "layout": "LAYOUT_ROUTE134", - "music": "MUS_GRANROAD", + "music": "MUS_ROUTE119", "region_map_section": "MAPSEC_ROUTE_134", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/RustboroCity/map.json b/data/maps/RustboroCity/map.json index c186a4149..10032c0f9 100644 --- a/data/maps/RustboroCity/map.json +++ b/data/maps/RustboroCity/map.json @@ -2,7 +2,7 @@ "id": "MAP_RUSTBORO_CITY", "name": "RustboroCity", "layout": "LAYOUT_RUSTBORO_CITY", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_RUSTBORO_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/RustboroCity_CuttersHouse/map.json b/data/maps/RustboroCity_CuttersHouse/map.json index e03fbb322..e8df00e87 100644 --- a/data/maps/RustboroCity_CuttersHouse/map.json +++ b/data/maps/RustboroCity_CuttersHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_RUSTBORO_CITY_CUTTERS_HOUSE", "name": "RustboroCity_CuttersHouse", "layout": "LAYOUT_RUSTBORO_CITY_CUTTERS_HOUSE", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_RUSTBORO_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RustboroCity_DevonCorp_1F/map.json b/data/maps/RustboroCity_DevonCorp_1F/map.json index 4ecd68663..dfbea534c 100644 --- a/data/maps/RustboroCity_DevonCorp_1F/map.json +++ b/data/maps/RustboroCity_DevonCorp_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_RUSTBORO_CITY_DEVON_CORP_1F", "name": "RustboroCity_DevonCorp_1F", "layout": "LAYOUT_RUSTBORO_CITY_DEVON_CORP_1F", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_RUSTBORO_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RustboroCity_DevonCorp_2F/map.json b/data/maps/RustboroCity_DevonCorp_2F/map.json index 09798add6..148acbfff 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/map.json +++ b/data/maps/RustboroCity_DevonCorp_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_RUSTBORO_CITY_DEVON_CORP_2F", "name": "RustboroCity_DevonCorp_2F", "layout": "LAYOUT_RUSTBORO_CITY_DEVON_CORP_2F", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_RUSTBORO_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc index ae04f9779..5974adb69 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc @@ -138,7 +138,7 @@ RustboroCity_DevonCorp_2F_EventScript_157661:: @ 8157661 copyvar VAR_0x8004, VAR_RESULT setvar VAR_FOSSIL_RESURRECTION_STATE, 0 setflag FLAG_RECEIVED_FOSSIL_MON - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM message RustboroCity_DevonCorp_2F_Text_18319E waitfanfare waitmessage @@ -158,7 +158,7 @@ RustboroCity_DevonCorp_2F_EventScript_1576B4:: @ 81576B4 copyvar VAR_0x8004, VAR_RESULT setvar VAR_FOSSIL_RESURRECTION_STATE, 0 setflag FLAG_RECEIVED_FOSSIL_MON - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM message RustboroCity_DevonCorp_2F_Text_18319E waitfanfare waitmessage diff --git a/data/maps/RustboroCity_DevonCorp_3F/map.json b/data/maps/RustboroCity_DevonCorp_3F/map.json index 3f6033db7..0854a32e6 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/map.json +++ b/data/maps/RustboroCity_DevonCorp_3F/map.json @@ -2,7 +2,7 @@ "id": "MAP_RUSTBORO_CITY_DEVON_CORP_3F", "name": "RustboroCity_DevonCorp_3F", "layout": "LAYOUT_RUSTBORO_CITY_DEVON_CORP_3F", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_RUSTBORO_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc index 0a2cd2117..ce25c82ac 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc @@ -37,7 +37,7 @@ RustboroCity_DevonCorp_3F_EventScript_157752:: @ 8157752 waitmovement 0 msgbox RustboroCity_DevonCorp_3F_Text_183903, MSGBOX_DEFAULT closemessage - playbgm MUS_TSURETEK, FALSE + playbgm MUS_FOLLOW_ME, FALSE applymovement 2, RustboroCity_DevonCorp_3F_Movement_157803 applymovement OBJ_EVENT_ID_PLAYER, RustboroCity_DevonCorp_3F_Movement_157827 waitmovement 0 @@ -50,7 +50,7 @@ RustboroCity_DevonCorp_3F_EventScript_157752:: @ 8157752 msgbox RustboroCity_DevonCorp_3F_Text_18320B, MSGBOX_DEFAULT giveitem ITEM_LETTER msgbox RustboroCity_DevonCorp_3F_Text_18337E, MSGBOX_DEFAULT - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM message RustboroCity_DevonCorp_3F_Text_183422 waitfanfare waitmessage diff --git a/data/maps/RustboroCity_Flat1_1F/map.json b/data/maps/RustboroCity_Flat1_1F/map.json index 71ca8ec5b..fdb6596b9 100644 --- a/data/maps/RustboroCity_Flat1_1F/map.json +++ b/data/maps/RustboroCity_Flat1_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_RUSTBORO_CITY_FLAT1_1F", "name": "RustboroCity_Flat1_1F", "layout": "LAYOUT_RUSTBORO_CITY_FLAT1_1F", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_RUSTBORO_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RustboroCity_Flat1_2F/map.json b/data/maps/RustboroCity_Flat1_2F/map.json index 63d3aa2b2..fccd06dc3 100644 --- a/data/maps/RustboroCity_Flat1_2F/map.json +++ b/data/maps/RustboroCity_Flat1_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_RUSTBORO_CITY_FLAT1_2F", "name": "RustboroCity_Flat1_2F", "layout": "LAYOUT_RUSTBORO_CITY_FLAT1_2F", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_RUSTBORO_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RustboroCity_Flat2_1F/map.json b/data/maps/RustboroCity_Flat2_1F/map.json index 01f55b7cd..8a2161620 100644 --- a/data/maps/RustboroCity_Flat2_1F/map.json +++ b/data/maps/RustboroCity_Flat2_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_RUSTBORO_CITY_FLAT2_1F", "name": "RustboroCity_Flat2_1F", "layout": "LAYOUT_RUSTBORO_CITY_FLAT2_1F", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_RUSTBORO_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RustboroCity_Flat2_2F/map.json b/data/maps/RustboroCity_Flat2_2F/map.json index 8bd868bcd..68edab82b 100644 --- a/data/maps/RustboroCity_Flat2_2F/map.json +++ b/data/maps/RustboroCity_Flat2_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_RUSTBORO_CITY_FLAT2_2F", "name": "RustboroCity_Flat2_2F", "layout": "LAYOUT_RUSTBORO_CITY_FLAT2_2F", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_RUSTBORO_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RustboroCity_Flat2_3F/map.json b/data/maps/RustboroCity_Flat2_3F/map.json index 462f90bbe..975d37739 100644 --- a/data/maps/RustboroCity_Flat2_3F/map.json +++ b/data/maps/RustboroCity_Flat2_3F/map.json @@ -2,7 +2,7 @@ "id": "MAP_RUSTBORO_CITY_FLAT2_3F", "name": "RustboroCity_Flat2_3F", "layout": "LAYOUT_RUSTBORO_CITY_FLAT2_3F", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_RUSTBORO_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RustboroCity_Gym/map.json b/data/maps/RustboroCity_Gym/map.json index 95a9cca8b..82866f8a3 100644 --- a/data/maps/RustboroCity_Gym/map.json +++ b/data/maps/RustboroCity_Gym/map.json @@ -2,7 +2,7 @@ "id": "MAP_RUSTBORO_CITY_GYM", "name": "RustboroCity_Gym", "layout": "LAYOUT_RUSTBORO_CITY_GYM", - "music": "MUS_GIM", + "music": "MUS_GYM", "region_map_section": "MAPSEC_RUSTBORO_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RustboroCity_House1/map.json b/data/maps/RustboroCity_House1/map.json index 5100c2d83..5ded523a8 100644 --- a/data/maps/RustboroCity_House1/map.json +++ b/data/maps/RustboroCity_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_RUSTBORO_CITY_HOUSE1", "name": "RustboroCity_House1", "layout": "LAYOUT_RUSTBORO_CITY_HOUSE1", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_RUSTBORO_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RustboroCity_House2/map.json b/data/maps/RustboroCity_House2/map.json index 282740365..7c02d3ad5 100644 --- a/data/maps/RustboroCity_House2/map.json +++ b/data/maps/RustboroCity_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_RUSTBORO_CITY_HOUSE2", "name": "RustboroCity_House2", "layout": "LAYOUT_RUSTBORO_CITY_HOUSE", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_RUSTBORO_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RustboroCity_House3/map.json b/data/maps/RustboroCity_House3/map.json index f3ee9bfcf..b2e22ae1e 100644 --- a/data/maps/RustboroCity_House3/map.json +++ b/data/maps/RustboroCity_House3/map.json @@ -2,7 +2,7 @@ "id": "MAP_RUSTBORO_CITY_HOUSE3", "name": "RustboroCity_House3", "layout": "LAYOUT_RUSTBORO_CITY_HOUSE", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_RUSTBORO_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RustboroCity_Mart/map.json b/data/maps/RustboroCity_Mart/map.json index 389da78f2..abf13aea7 100644 --- a/data/maps/RustboroCity_Mart/map.json +++ b/data/maps/RustboroCity_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_RUSTBORO_CITY_MART", "name": "RustboroCity_Mart", "layout": "LAYOUT_POKE_MART", - "music": "MUS_FRIENDLY", + "music": "MUS_POKE_MART", "region_map_section": "MAPSEC_RUSTBORO_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RustboroCity_PokemonCenter_1F/map.json b/data/maps/RustboroCity_PokemonCenter_1F/map.json index 86fcd070c..71093bbe1 100644 --- a/data/maps/RustboroCity_PokemonCenter_1F/map.json +++ b/data/maps/RustboroCity_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_RUSTBORO_CITY_POKEMON_CENTER_1F", "name": "RustboroCity_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_RUSTBORO_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RustboroCity_PokemonCenter_2F/map.json b/data/maps/RustboroCity_PokemonCenter_2F/map.json index 5d4209a8f..ed06cae95 100644 --- a/data/maps/RustboroCity_PokemonCenter_2F/map.json +++ b/data/maps/RustboroCity_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_RUSTBORO_CITY_POKEMON_CENTER_2F", "name": "RustboroCity_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_RUSTBORO_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RustboroCity_PokemonSchool/map.json b/data/maps/RustboroCity_PokemonSchool/map.json index cc34e9c93..6de9ec101 100644 --- a/data/maps/RustboroCity_PokemonSchool/map.json +++ b/data/maps/RustboroCity_PokemonSchool/map.json @@ -2,7 +2,7 @@ "id": "MAP_RUSTBORO_CITY_POKEMON_SCHOOL", "name": "RustboroCity_PokemonSchool", "layout": "LAYOUT_RUSTBORO_CITY_POKEMON_SCHOOL", - "music": "MUS_P_SCHOOL", + "music": "MUS_SCHOOL", "region_map_section": "MAPSEC_RUSTBORO_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RusturfTunnel/map.json b/data/maps/RusturfTunnel/map.json index 919abbd25..9e84d1689 100644 --- a/data/maps/RusturfTunnel/map.json +++ b/data/maps/RusturfTunnel/map.json @@ -2,7 +2,7 @@ "id": "MAP_RUSTURF_TUNNEL", "name": "RusturfTunnel", "layout": "LAYOUT_RUSTURF_TUNNEL", - "music": "MUS_DAN01", + "music": "MUS_PETALBURG_WOODS", "region_map_section": "MAPSEC_RUSTURF_TUNNEL", "requires_flash": false, "weather": "WEATHER_FOG_1", diff --git a/data/maps/SSTidalCorridor/map.json b/data/maps/SSTidalCorridor/map.json index 74813ed10..af7f6e177 100644 --- a/data/maps/SSTidalCorridor/map.json +++ b/data/maps/SSTidalCorridor/map.json @@ -2,7 +2,7 @@ "id": "MAP_SS_TIDAL_CORRIDOR", "name": "SSTidalCorridor", "layout": "LAYOUT_SS_TIDAL_CORRIDOR", - "music": "MUS_M_BOAT", + "music": "MUS_SAILING", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSTidalCorridor/scripts.inc b/data/maps/SSTidalCorridor/scripts.inc index 18d42f009..77ec961cb 100644 --- a/data/maps/SSTidalCorridor/scripts.inc +++ b/data/maps/SSTidalCorridor/scripts.inc @@ -13,7 +13,7 @@ SSTidalCorridor_EventScript_15FCBC:: @ 815FCBC special SetSSTidalFlag setvar VAR_PORTHOLE_STATE, 2 lockall - playse SE_PINPON + playse SE_DING_DONG msgbox SSTidalCorridor_Text_199007, MSGBOX_DEFAULT releaseall end @@ -21,7 +21,7 @@ SSTidalCorridor_EventScript_15FCBC:: @ 815FCBC SSTidalCorridor_EventScript_15FCD2:: @ 815FCD2 setvar VAR_PORTHOLE_STATE, 6 lockall - playse SE_PINPON + playse SE_DING_DONG msgbox SSTidalCorridor_Text_199088, MSGBOX_DEFAULT releaseall end @@ -29,14 +29,14 @@ SSTidalCorridor_EventScript_15FCD2:: @ 815FCD2 SSTidalRooms_EventScript_15FCE5:: @ 815FCE5 special SetSSTidalFlag setvar VAR_PORTHOLE_STATE, 7 - playse SE_PINPON + playse SE_DING_DONG msgbox SSTidalRooms_Text_199007, MSGBOX_DEFAULT return SSTidalRooms_EventScript_15FCF9:: @ 815FCF9 special ResetSSTidalFlag setvar VAR_PORTHOLE_STATE, 4 - playse SE_PINPON + playse SE_DING_DONG msgbox SSTidalRooms_Text_1990F8, MSGBOX_DEFAULT return @@ -51,7 +51,7 @@ SSTidalCorridor_EventScript_15FD24:: @ 815FD24 special ResetSSTidalFlag setvar VAR_PORTHOLE_STATE, 3 lockall - playse SE_PINPON + playse SE_DING_DONG msgbox SSTidalCorridor_Text_199088, MSGBOX_DEFAULT releaseall end @@ -60,7 +60,7 @@ SSTidalCorridor_EventScript_15FD3A:: @ 815FD3A special ResetSSTidalFlag setvar VAR_PORTHOLE_STATE, 8 lockall - playse SE_PINPON + playse SE_DING_DONG msgbox SSTidalCorridor_Text_1990B4, MSGBOX_DEFAULT releaseall end @@ -68,7 +68,7 @@ SSTidalCorridor_EventScript_15FD3A:: @ 815FD3A SSTidalRooms_EventScript_15FD50:: @ 815FD50 special ResetSSTidalFlag setvar VAR_PORTHOLE_STATE, 8 - playse SE_PINPON + playse SE_DING_DONG msgbox SSTidalRooms_Text_1990B4, MSGBOX_DEFAULT return diff --git a/data/maps/SSTidalLowerDeck/map.json b/data/maps/SSTidalLowerDeck/map.json index dabe9dbbb..a80ec4a89 100644 --- a/data/maps/SSTidalLowerDeck/map.json +++ b/data/maps/SSTidalLowerDeck/map.json @@ -2,7 +2,7 @@ "id": "MAP_SS_TIDAL_LOWER_DECK", "name": "SSTidalLowerDeck", "layout": "LAYOUT_SS_TIDAL_LOWER_DECK", - "music": "MUS_M_BOAT", + "music": "MUS_SAILING", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSTidalRooms/map.json b/data/maps/SSTidalRooms/map.json index 6cdac8246..858848c1b 100644 --- a/data/maps/SSTidalRooms/map.json +++ b/data/maps/SSTidalRooms/map.json @@ -2,7 +2,7 @@ "id": "MAP_SS_TIDAL_ROOMS", "name": "SSTidalRooms", "layout": "LAYOUT_SS_TIDAL_ROOMS", - "music": "MUS_M_BOAT", + "music": "MUS_SAILING", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SafariZone_Northeast/map.json b/data/maps/SafariZone_Northeast/map.json index 0207c6917..41964581a 100644 --- a/data/maps/SafariZone_Northeast/map.json +++ b/data/maps/SafariZone_Northeast/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFARI_ZONE_NORTHEAST", "name": "SafariZone_Northeast", "layout": "LAYOUT_SAFARI_ZONE_NORTHEAST", - "music": "MUS_SAFARI", + "music": "MUS_SAFARI_ZONE", "region_map_section": "MAPSEC_SAFARI_ZONE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SafariZone_Northwest/map.json b/data/maps/SafariZone_Northwest/map.json index fa22ddef0..8c85b5414 100644 --- a/data/maps/SafariZone_Northwest/map.json +++ b/data/maps/SafariZone_Northwest/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFARI_ZONE_NORTHWEST", "name": "SafariZone_Northwest", "layout": "LAYOUT_SAFARI_ZONE_NORTHWEST", - "music": "MUS_SAFARI", + "music": "MUS_SAFARI_ZONE", "region_map_section": "MAPSEC_SAFARI_ZONE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SafariZone_RestHouse/map.json b/data/maps/SafariZone_RestHouse/map.json index dc62a87e4..06c169254 100644 --- a/data/maps/SafariZone_RestHouse/map.json +++ b/data/maps/SafariZone_RestHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFARI_ZONE_REST_HOUSE", "name": "SafariZone_RestHouse", "layout": "LAYOUT_SAFARI_ZONE_REST_HOUSE", - "music": "MUS_SAFARI", + "music": "MUS_SAFARI_ZONE", "region_map_section": "MAPSEC_SAFARI_ZONE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SafariZone_Southeast/map.json b/data/maps/SafariZone_Southeast/map.json index c99a370e5..d90635ce3 100644 --- a/data/maps/SafariZone_Southeast/map.json +++ b/data/maps/SafariZone_Southeast/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFARI_ZONE_SOUTHEAST", "name": "SafariZone_Southeast", "layout": "LAYOUT_SAFARI_ZONE_SOUTHEAST", - "music": "MUS_SAFARI", + "music": "MUS_SAFARI_ZONE", "region_map_section": "MAPSEC_SAFARI_ZONE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SafariZone_Southwest/map.json b/data/maps/SafariZone_Southwest/map.json index fd2d06f24..cd6b5853b 100644 --- a/data/maps/SafariZone_Southwest/map.json +++ b/data/maps/SafariZone_Southwest/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFARI_ZONE_SOUTHWEST", "name": "SafariZone_Southwest", "layout": "LAYOUT_SAFARI_ZONE_SOUTHWEST", - "music": "MUS_SAFARI", + "music": "MUS_SAFARI_ZONE", "region_map_section": "MAPSEC_SAFARI_ZONE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ScorchedSlab/map.json b/data/maps/ScorchedSlab/map.json index 1bb82eea2..4d61d53f2 100644 --- a/data/maps/ScorchedSlab/map.json +++ b/data/maps/ScorchedSlab/map.json @@ -2,7 +2,7 @@ "id": "MAP_SCORCHED_SLAB", "name": "ScorchedSlab", "layout": "LAYOUT_SCORCHED_SLAB", - "music": "MUS_DAN01", + "music": "MUS_PETALBURG_WOODS", "region_map_section": "MAPSEC_SCORCHED_SLAB", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SeafloorCavern_Entrance/map.json b/data/maps/SeafloorCavern_Entrance/map.json index 36b4b7c67..7051d58f3 100644 --- a/data/maps/SeafloorCavern_Entrance/map.json +++ b/data/maps/SeafloorCavern_Entrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEAFLOOR_CAVERN_ENTRANCE", "name": "SeafloorCavern_Entrance", "layout": "LAYOUT_SEAFLOOR_CAVERN_ENTRANCE", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_SEAFLOOR_CAVERN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SeafloorCavern_Room1/map.json b/data/maps/SeafloorCavern_Room1/map.json index d37a2ce20..e0ebb348c 100644 --- a/data/maps/SeafloorCavern_Room1/map.json +++ b/data/maps/SeafloorCavern_Room1/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEAFLOOR_CAVERN_ROOM1", "name": "SeafloorCavern_Room1", "layout": "LAYOUT_SEAFLOOR_CAVERN_ROOM1", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_SEAFLOOR_CAVERN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SeafloorCavern_Room2/map.json b/data/maps/SeafloorCavern_Room2/map.json index ce9722c5a..9a9c7d681 100644 --- a/data/maps/SeafloorCavern_Room2/map.json +++ b/data/maps/SeafloorCavern_Room2/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEAFLOOR_CAVERN_ROOM2", "name": "SeafloorCavern_Room2", "layout": "LAYOUT_SEAFLOOR_CAVERN_ROOM2", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_SEAFLOOR_CAVERN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SeafloorCavern_Room3/map.json b/data/maps/SeafloorCavern_Room3/map.json index 06c6e6d7e..328250525 100644 --- a/data/maps/SeafloorCavern_Room3/map.json +++ b/data/maps/SeafloorCavern_Room3/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEAFLOOR_CAVERN_ROOM3", "name": "SeafloorCavern_Room3", "layout": "LAYOUT_SEAFLOOR_CAVERN_ROOM3", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_SEAFLOOR_CAVERN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SeafloorCavern_Room4/map.json b/data/maps/SeafloorCavern_Room4/map.json index 2150f0cda..1f01baced 100644 --- a/data/maps/SeafloorCavern_Room4/map.json +++ b/data/maps/SeafloorCavern_Room4/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEAFLOOR_CAVERN_ROOM4", "name": "SeafloorCavern_Room4", "layout": "LAYOUT_SEAFLOOR_CAVERN_ROOM4", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_SEAFLOOR_CAVERN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SeafloorCavern_Room5/map.json b/data/maps/SeafloorCavern_Room5/map.json index 73c9b2979..84c74c344 100644 --- a/data/maps/SeafloorCavern_Room5/map.json +++ b/data/maps/SeafloorCavern_Room5/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEAFLOOR_CAVERN_ROOM5", "name": "SeafloorCavern_Room5", "layout": "LAYOUT_SEAFLOOR_CAVERN_ROOM5", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_SEAFLOOR_CAVERN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SeafloorCavern_Room6/map.json b/data/maps/SeafloorCavern_Room6/map.json index a554c7531..2b22d66b5 100644 --- a/data/maps/SeafloorCavern_Room6/map.json +++ b/data/maps/SeafloorCavern_Room6/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEAFLOOR_CAVERN_ROOM6", "name": "SeafloorCavern_Room6", "layout": "LAYOUT_SEAFLOOR_CAVERN_ROOM6", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_SEAFLOOR_CAVERN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SeafloorCavern_Room7/map.json b/data/maps/SeafloorCavern_Room7/map.json index 700c3107f..db9cabf64 100644 --- a/data/maps/SeafloorCavern_Room7/map.json +++ b/data/maps/SeafloorCavern_Room7/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEAFLOOR_CAVERN_ROOM7", "name": "SeafloorCavern_Room7", "layout": "LAYOUT_SEAFLOOR_CAVERN_ROOM7", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_SEAFLOOR_CAVERN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SeafloorCavern_Room8/map.json b/data/maps/SeafloorCavern_Room8/map.json index caa853d21..82f4fe3ca 100644 --- a/data/maps/SeafloorCavern_Room8/map.json +++ b/data/maps/SeafloorCavern_Room8/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEAFLOOR_CAVERN_ROOM8", "name": "SeafloorCavern_Room8", "layout": "LAYOUT_SEAFLOOR_CAVERN_ROOM8", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_SEAFLOOR_CAVERN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SeafloorCavern_Room9/map.json b/data/maps/SeafloorCavern_Room9/map.json index c9cbc6d22..406b5804d 100644 --- a/data/maps/SeafloorCavern_Room9/map.json +++ b/data/maps/SeafloorCavern_Room9/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEAFLOOR_CAVERN_ROOM9", "name": "SeafloorCavern_Room9", "layout": "LAYOUT_SEAFLOOR_CAVERN_ROOM9", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_SEAFLOOR_CAVERN", "requires_flash": false, "weather": "WEATHER_FOG_1", diff --git a/data/maps/SeafloorCavern_Room9/scripts.inc b/data/maps/SeafloorCavern_Room9/scripts.inc index 82011cbf7..3f865d5fc 100644 --- a/data/maps/SeafloorCavern_Room9/scripts.inc +++ b/data/maps/SeafloorCavern_Room9/scripts.inc @@ -78,7 +78,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA .else setvar VAR_RESULT, 0 .endif - playse SE_W197 + playse SE_M_DETECT setfieldeffectargument 0, 16 setfieldeffectargument 1, 42 setfieldeffectargument 2, 0 @@ -89,8 +89,8 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA .else setvar VAR_RESULT, 1 .endif - playfanfare MUS_ME_TAMA - playse SE_TAMA + playfanfare MUS_AWAKEN_LEGEND + playse SE_ORB special sub_80818A4 applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestUp applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp @@ -126,7 +126,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA .else msgbox SeafloorCavern_Room9_Text_1B4A89, MSGBOX_DEFAULT .endif - playse SE_PC_LOGON + playse SE_PC_LOGIN applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 .ifdef SAPPHIRE diff --git a/data/maps/SealedChamber_InnerRoom/map.json b/data/maps/SealedChamber_InnerRoom/map.json index 585bb90d0..e49ab2067 100644 --- a/data/maps/SealedChamber_InnerRoom/map.json +++ b/data/maps/SealedChamber_InnerRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEALED_CHAMBER_INNER_ROOM", "name": "SealedChamber_InnerRoom", "layout": "LAYOUT_SEALED_CHAMBER_INNER_ROOM", - "music": "MUS_MABOROSI", + "music": "MUS_SEALED_CHAMBER", "region_map_section": "MAPSEC_SEALED_CHAMBER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SealedChamber_InnerRoom/scripts.inc b/data/maps/SealedChamber_InnerRoom/scripts.inc index d0f098566..a5355b77a 100644 --- a/data/maps/SealedChamber_InnerRoom/scripts.inc +++ b/data/maps/SealedChamber_InnerRoom/scripts.inc @@ -11,7 +11,7 @@ SealedChamber_InnerRoom_EventScript_15F1E8:: @ 815F1E8 compare VAR_RESULT, 0 goto_if_eq SealedChamber_InnerRoom_EventScript_15F247 fadeoutbgm 0 - playse SE_TRACK_MOVE + playse SE_TRUCK_MOVE special DoSealedChamberShakingEffect1 waitstate delay 40 diff --git a/data/maps/SealedChamber_OuterRoom/map.json b/data/maps/SealedChamber_OuterRoom/map.json index c2c74b930..91f541a57 100644 --- a/data/maps/SealedChamber_OuterRoom/map.json +++ b/data/maps/SealedChamber_OuterRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEALED_CHAMBER_OUTER_ROOM", "name": "SealedChamber_OuterRoom", "layout": "LAYOUT_SEALED_CHAMBER_OUTER_ROOM", - "music": "MUS_MABOROSI", + "music": "MUS_SEALED_CHAMBER", "region_map_section": "MAPSEC_SEALED_CHAMBER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_BlueCave1/map.json b/data/maps/SecretBase_BlueCave1/map.json index 48c4ec49c..f9c796e6d 100644 --- a/data/maps/SecretBase_BlueCave1/map.json +++ b/data/maps/SecretBase_BlueCave1/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_BlueCave1", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_BLUE_CAVE1", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_BlueCave2/map.json b/data/maps/SecretBase_BlueCave2/map.json index 075ccbbfa..0d80cd4e3 100644 --- a/data/maps/SecretBase_BlueCave2/map.json +++ b/data/maps/SecretBase_BlueCave2/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_BlueCave2", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_BLUE_CAVE2", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_BlueCave3/map.json b/data/maps/SecretBase_BlueCave3/map.json index 482b3d4a3..22c577034 100644 --- a/data/maps/SecretBase_BlueCave3/map.json +++ b/data/maps/SecretBase_BlueCave3/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_BlueCave3", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_BLUE_CAVE3", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_BlueCave4/map.json b/data/maps/SecretBase_BlueCave4/map.json index b3d6a37d4..0591aa9e2 100644 --- a/data/maps/SecretBase_BlueCave4/map.json +++ b/data/maps/SecretBase_BlueCave4/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_BlueCave4", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_BLUE_CAVE4", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_BrownCave1/map.json b/data/maps/SecretBase_BrownCave1/map.json index 1ffa76d99..edad638c9 100644 --- a/data/maps/SecretBase_BrownCave1/map.json +++ b/data/maps/SecretBase_BrownCave1/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_BrownCave1", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_BROWN_CAVE1", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_BrownCave2/map.json b/data/maps/SecretBase_BrownCave2/map.json index f0c455fc1..189967535 100644 --- a/data/maps/SecretBase_BrownCave2/map.json +++ b/data/maps/SecretBase_BrownCave2/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_BrownCave2", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_BROWN_CAVE2", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_BrownCave3/map.json b/data/maps/SecretBase_BrownCave3/map.json index f7ec74fed..3fdbaeedc 100644 --- a/data/maps/SecretBase_BrownCave3/map.json +++ b/data/maps/SecretBase_BrownCave3/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_BrownCave3", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_BROWN_CAVE3", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_BrownCave4/map.json b/data/maps/SecretBase_BrownCave4/map.json index d1ae09924..4e6239506 100644 --- a/data/maps/SecretBase_BrownCave4/map.json +++ b/data/maps/SecretBase_BrownCave4/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_BrownCave4", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_BROWN_CAVE4", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_RedCave1/map.json b/data/maps/SecretBase_RedCave1/map.json index c9dd337ae..cea0365cf 100644 --- a/data/maps/SecretBase_RedCave1/map.json +++ b/data/maps/SecretBase_RedCave1/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_RedCave1", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_RED_CAVE1", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_RedCave2/map.json b/data/maps/SecretBase_RedCave2/map.json index ecc21b523..a3c36c9fd 100644 --- a/data/maps/SecretBase_RedCave2/map.json +++ b/data/maps/SecretBase_RedCave2/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_RedCave2", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_RED_CAVE2", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_RedCave3/map.json b/data/maps/SecretBase_RedCave3/map.json index f038f3449..eb728dac3 100644 --- a/data/maps/SecretBase_RedCave3/map.json +++ b/data/maps/SecretBase_RedCave3/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_RedCave3", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_RED_CAVE3", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_RedCave4/map.json b/data/maps/SecretBase_RedCave4/map.json index 537622c45..ea16b6dcc 100644 --- a/data/maps/SecretBase_RedCave4/map.json +++ b/data/maps/SecretBase_RedCave4/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_RedCave4", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_RED_CAVE4", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_Shrub1/map.json b/data/maps/SecretBase_Shrub1/map.json index f4980476d..862606f22 100644 --- a/data/maps/SecretBase_Shrub1/map.json +++ b/data/maps/SecretBase_Shrub1/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_Shrub1", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_SHRUB1", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_Shrub2/map.json b/data/maps/SecretBase_Shrub2/map.json index 61a53af44..ac377ddbc 100644 --- a/data/maps/SecretBase_Shrub2/map.json +++ b/data/maps/SecretBase_Shrub2/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_Shrub2", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_SHRUB2", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_Shrub3/map.json b/data/maps/SecretBase_Shrub3/map.json index 5d92fe6ee..83844bcd6 100644 --- a/data/maps/SecretBase_Shrub3/map.json +++ b/data/maps/SecretBase_Shrub3/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_Shrub3", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_SHRUB3", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_Shrub4/map.json b/data/maps/SecretBase_Shrub4/map.json index 296e63958..13b678f46 100644 --- a/data/maps/SecretBase_Shrub4/map.json +++ b/data/maps/SecretBase_Shrub4/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_Shrub4", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_SHRUB4", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_Tree1/map.json b/data/maps/SecretBase_Tree1/map.json index 0e9366a6a..feccc5a26 100644 --- a/data/maps/SecretBase_Tree1/map.json +++ b/data/maps/SecretBase_Tree1/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_Tree1", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_TREE1", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_Tree2/map.json b/data/maps/SecretBase_Tree2/map.json index 92a4c9240..35c10dd5b 100644 --- a/data/maps/SecretBase_Tree2/map.json +++ b/data/maps/SecretBase_Tree2/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_Tree2", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_TREE2", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_Tree3/map.json b/data/maps/SecretBase_Tree3/map.json index a27353ec0..7a022a1a0 100644 --- a/data/maps/SecretBase_Tree3/map.json +++ b/data/maps/SecretBase_Tree3/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_Tree3", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_TREE3", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_Tree4/map.json b/data/maps/SecretBase_Tree4/map.json index e2de6d6c1..3a37090d9 100644 --- a/data/maps/SecretBase_Tree4/map.json +++ b/data/maps/SecretBase_Tree4/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_Tree4", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_TREE4", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_YellowCave1/map.json b/data/maps/SecretBase_YellowCave1/map.json index 0dbf8134b..3ff452fb6 100644 --- a/data/maps/SecretBase_YellowCave1/map.json +++ b/data/maps/SecretBase_YellowCave1/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_YellowCave1", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_YELLOW_CAVE1", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_YellowCave2/map.json b/data/maps/SecretBase_YellowCave2/map.json index 25bcd3ea4..8181fd4dd 100644 --- a/data/maps/SecretBase_YellowCave2/map.json +++ b/data/maps/SecretBase_YellowCave2/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_YellowCave2", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_YELLOW_CAVE2", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_YellowCave3/map.json b/data/maps/SecretBase_YellowCave3/map.json index e9a9bb038..10e9e53a0 100644 --- a/data/maps/SecretBase_YellowCave3/map.json +++ b/data/maps/SecretBase_YellowCave3/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_YellowCave3", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_YELLOW_CAVE3", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_YellowCave4/map.json b/data/maps/SecretBase_YellowCave4/map.json index 0c7699125..acd1151f7 100644 --- a/data/maps/SecretBase_YellowCave4/map.json +++ b/data/maps/SecretBase_YellowCave4/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_YellowCave4", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_YELLOW_CAVE4", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ShoalCave_HighTideEntranceRoom/map.json b/data/maps/ShoalCave_HighTideEntranceRoom/map.json index 3ae268fa1..c6ad65f54 100644 --- a/data/maps/ShoalCave_HighTideEntranceRoom/map.json +++ b/data/maps/ShoalCave_HighTideEntranceRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_SHOAL_CAVE_HIGH_TIDE_ENTRANCE_ROOM", "name": "ShoalCave_HighTideEntranceRoom", "layout": "LAYOUT_SHOAL_CAVE_HIGH_TIDE_ENTRANCE_ROOM", - "music": "MUS_M_DUNGON", + "music": "MUS_MT_PYRE", "region_map_section": "MAPSEC_SHOAL_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ShoalCave_HighTideInnerRoom/map.json b/data/maps/ShoalCave_HighTideInnerRoom/map.json index ef1f1487c..0946b1155 100644 --- a/data/maps/ShoalCave_HighTideInnerRoom/map.json +++ b/data/maps/ShoalCave_HighTideInnerRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_SHOAL_CAVE_HIGH_TIDE_INNER_ROOM", "name": "ShoalCave_HighTideInnerRoom", "layout": "LAYOUT_SHOAL_CAVE_HIGH_TIDE_INNER_ROOM", - "music": "MUS_M_DUNGON", + "music": "MUS_MT_PYRE", "region_map_section": "MAPSEC_SHOAL_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/map.json b/data/maps/ShoalCave_LowTideEntranceRoom/map.json index 5db783bc3..e4feb3c84 100644 --- a/data/maps/ShoalCave_LowTideEntranceRoom/map.json +++ b/data/maps/ShoalCave_LowTideEntranceRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM", "name": "ShoalCave_LowTideEntranceRoom", "layout": "LAYOUT_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM", - "music": "MUS_M_DUNGON", + "music": "MUS_MT_PYRE", "region_map_section": "MAPSEC_SHOAL_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ShoalCave_LowTideIceRoom/map.json b/data/maps/ShoalCave_LowTideIceRoom/map.json index 3e00c17bd..5e658aab9 100644 --- a/data/maps/ShoalCave_LowTideIceRoom/map.json +++ b/data/maps/ShoalCave_LowTideIceRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_SHOAL_CAVE_LOW_TIDE_ICE_ROOM", "name": "ShoalCave_LowTideIceRoom", "layout": "LAYOUT_SHOAL_CAVE_LOW_TIDE_ICE_ROOM", - "music": "MUS_M_DUNGON", + "music": "MUS_MT_PYRE", "region_map_section": "MAPSEC_SHOAL_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ShoalCave_LowTideInnerRoom/map.json b/data/maps/ShoalCave_LowTideInnerRoom/map.json index 53ebe6eb6..543b38a2b 100644 --- a/data/maps/ShoalCave_LowTideInnerRoom/map.json +++ b/data/maps/ShoalCave_LowTideInnerRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM", "name": "ShoalCave_LowTideInnerRoom", "layout": "LAYOUT_SHOAL_CAVE_LOW_TIDE_INNER_ROOM", - "music": "MUS_M_DUNGON", + "music": "MUS_MT_PYRE", "region_map_section": "MAPSEC_SHOAL_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ShoalCave_LowTideLowerRoom/map.json b/data/maps/ShoalCave_LowTideLowerRoom/map.json index 3604ee850..159f96417 100644 --- a/data/maps/ShoalCave_LowTideLowerRoom/map.json +++ b/data/maps/ShoalCave_LowTideLowerRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM", "name": "ShoalCave_LowTideLowerRoom", "layout": "LAYOUT_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM", - "music": "MUS_M_DUNGON", + "music": "MUS_MT_PYRE", "region_map_section": "MAPSEC_SHOAL_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ShoalCave_LowTideStairsRoom/map.json b/data/maps/ShoalCave_LowTideStairsRoom/map.json index b5c200b45..4650d533e 100644 --- a/data/maps/ShoalCave_LowTideStairsRoom/map.json +++ b/data/maps/ShoalCave_LowTideStairsRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM", "name": "ShoalCave_LowTideStairsRoom", "layout": "LAYOUT_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM", - "music": "MUS_M_DUNGON", + "music": "MUS_MT_PYRE", "region_map_section": "MAPSEC_SHOAL_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SingleBattleColosseum/map.json b/data/maps/SingleBattleColosseum/map.json index 47703ae02..89ae1c28e 100644 --- a/data/maps/SingleBattleColosseum/map.json +++ b/data/maps/SingleBattleColosseum/map.json @@ -2,7 +2,7 @@ "id": "MAP_SINGLE_BATTLE_COLOSSEUM", "name": "SingleBattleColosseum", "layout": "LAYOUT_SINGLE_BATTLE_COLOSSEUM", - "music": "MUS_RAINBOW", + "music": "MUS_EVER_GRANDE", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SkyPillar_1F/map.json b/data/maps/SkyPillar_1F/map.json index dc120c3b6..fae9ac22f 100644 --- a/data/maps/SkyPillar_1F/map.json +++ b/data/maps/SkyPillar_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SKY_PILLAR_1F", "name": "SkyPillar_1F", "layout": "LAYOUT_SKY_PILLAR_1F", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_SKY_PILLAR", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SkyPillar_2F/map.json b/data/maps/SkyPillar_2F/map.json index 9dc7b05de..c69f7018a 100644 --- a/data/maps/SkyPillar_2F/map.json +++ b/data/maps/SkyPillar_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SKY_PILLAR_2F", "name": "SkyPillar_2F", "layout": "LAYOUT_SKY_PILLAR_2F", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_SKY_PILLAR", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SkyPillar_3F/map.json b/data/maps/SkyPillar_3F/map.json index 712c1c490..c363754e4 100644 --- a/data/maps/SkyPillar_3F/map.json +++ b/data/maps/SkyPillar_3F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SKY_PILLAR_3F", "name": "SkyPillar_3F", "layout": "LAYOUT_SKY_PILLAR_3F", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_SKY_PILLAR", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SkyPillar_4F/map.json b/data/maps/SkyPillar_4F/map.json index 7d25f8c81..9371a5d0e 100644 --- a/data/maps/SkyPillar_4F/map.json +++ b/data/maps/SkyPillar_4F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SKY_PILLAR_4F", "name": "SkyPillar_4F", "layout": "LAYOUT_SKY_PILLAR_4F", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_SKY_PILLAR", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SkyPillar_5F/map.json b/data/maps/SkyPillar_5F/map.json index 007456bfc..78cf86a7f 100644 --- a/data/maps/SkyPillar_5F/map.json +++ b/data/maps/SkyPillar_5F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SKY_PILLAR_5F", "name": "SkyPillar_5F", "layout": "LAYOUT_SKY_PILLAR_5F", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_SKY_PILLAR", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SkyPillar_Entrance/map.json b/data/maps/SkyPillar_Entrance/map.json index d0d984329..538fb07c2 100644 --- a/data/maps/SkyPillar_Entrance/map.json +++ b/data/maps/SkyPillar_Entrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_SKY_PILLAR_ENTRANCE", "name": "SkyPillar_Entrance", "layout": "LAYOUT_SKY_PILLAR_ENTRANCE", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_SKY_PILLAR", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SkyPillar_Outside/map.json b/data/maps/SkyPillar_Outside/map.json index 1d5b0d633..2867510c2 100644 --- a/data/maps/SkyPillar_Outside/map.json +++ b/data/maps/SkyPillar_Outside/map.json @@ -2,7 +2,7 @@ "id": "MAP_SKY_PILLAR_OUTSIDE", "name": "SkyPillar_Outside", "layout": "LAYOUT_SKY_PILLAR_OUTSIDE", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_SKY_PILLAR", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SkyPillar_Top/map.json b/data/maps/SkyPillar_Top/map.json index 44854fc28..edbf2369f 100644 --- a/data/maps/SkyPillar_Top/map.json +++ b/data/maps/SkyPillar_Top/map.json @@ -2,7 +2,7 @@ "id": "MAP_SKY_PILLAR_TOP", "name": "SkyPillar_Top", "layout": "LAYOUT_SKY_PILLAR_TOP", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_SKY_PILLAR", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SlateportCity/map.json b/data/maps/SlateportCity/map.json index 9df1b3229..f1bdbac44 100644 --- a/data/maps/SlateportCity/map.json +++ b/data/maps/SlateportCity/map.json @@ -2,7 +2,7 @@ "id": "MAP_SLATEPORT_CITY", "name": "SlateportCity", "layout": "LAYOUT_SLATEPORT_CITY", - "music": "MUS_FINECITY", + "music": "MUS_SLATEPORT", "region_map_section": "MAPSEC_SLATEPORT_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/SlateportCity/scripts.inc b/data/maps/SlateportCity/scripts.inc index 854462533..a3908f6f9 100644 --- a/data/maps/SlateportCity/scripts.inc +++ b/data/maps/SlateportCity/scripts.inc @@ -73,7 +73,7 @@ SlateportCity_EventScript_14BAE0:: @ 814BAE0 compare VAR_RESULT, 0 call_if_eq SlateportCity_EventScript_14BB2B msgbox SlateportCity_Text_164691, MSGBOX_DEFAULT - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM message SlateportCity_Text_1646DD waitfanfare waitmessage diff --git a/data/maps/SlateportCity_ContestHall/map.json b/data/maps/SlateportCity_ContestHall/map.json index 803b35db0..40a592f97 100644 --- a/data/maps/SlateportCity_ContestHall/map.json +++ b/data/maps/SlateportCity_ContestHall/map.json @@ -2,7 +2,7 @@ "id": "MAP_SLATEPORT_CITY_CONTEST_HALL", "name": "SlateportCity_ContestHall", "layout": "LAYOUT_CONTEST_HALL", - "music": "MUS_CONLOBBY", + "music": "MUS_CONTEST_LOBBY", "region_map_section": "MAPSEC_SLATEPORT_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SlateportCity_ContestLobby/map.json b/data/maps/SlateportCity_ContestLobby/map.json index 44a98ea06..2814471d0 100644 --- a/data/maps/SlateportCity_ContestLobby/map.json +++ b/data/maps/SlateportCity_ContestLobby/map.json @@ -2,7 +2,7 @@ "id": "MAP_SLATEPORT_CITY_CONTEST_LOBBY", "name": "SlateportCity_ContestLobby", "layout": "LAYOUT_CONTEST_LOBBY", - "music": "MUS_CONLOBBY", + "music": "MUS_CONTEST_LOBBY", "region_map_section": "MAPSEC_SLATEPORT_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SlateportCity_ContestLobby/scripts.inc b/data/maps/SlateportCity_ContestLobby/scripts.inc index f484e8a57..adc0c13cf 100644 --- a/data/maps/SlateportCity_ContestLobby/scripts.inc +++ b/data/maps/SlateportCity_ContestLobby/scripts.inc @@ -22,13 +22,13 @@ SlateportCity_ContestLobby_EventScript_155448:: @ 8155448 lockall applymovement 1, SlateportCity_ContestLobby_Movement_1554CC waitmovement 0 - playse SE_HASHI + playse SE_BRIDGE_WALK setmetatile 4, 2, METATILE_Contest_WallShadow, 1 setmetatile 4, 3, METATILE_Contest_FloorShadow, 1 special DrawWholeMapView applymovement 1, SlateportCity_ContestLobby_Movement_1554CF waitmovement 0 - playse SE_HASHI + playse SE_BRIDGE_WALK setmetatile 4, 2, METATILE_Contest_CounterFlap_Top, 1 setmetatile 4, 3, METATILE_Contest_CounterFlap_Bottom, 1 special DrawWholeMapView diff --git a/data/maps/SlateportCity_Harbor/map.json b/data/maps/SlateportCity_Harbor/map.json index 6a7bf3969..b189da606 100644 --- a/data/maps/SlateportCity_Harbor/map.json +++ b/data/maps/SlateportCity_Harbor/map.json @@ -2,7 +2,7 @@ "id": "MAP_SLATEPORT_CITY_HARBOR", "name": "SlateportCity_Harbor", "layout": "LAYOUT_HARBOR", - "music": "MUS_FINECITY", + "music": "MUS_SLATEPORT", "region_map_section": "MAPSEC_SLATEPORT_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SlateportCity_House1/map.json b/data/maps/SlateportCity_House1/map.json index a9b24dab5..8102fca9b 100644 --- a/data/maps/SlateportCity_House1/map.json +++ b/data/maps/SlateportCity_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_SLATEPORT_CITY_HOUSE1", "name": "SlateportCity_House1", "layout": "LAYOUT_HOUSE_WITH_BED", - "music": "MUS_FINECITY", + "music": "MUS_SLATEPORT", "region_map_section": "MAPSEC_SLATEPORT_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SlateportCity_House2/map.json b/data/maps/SlateportCity_House2/map.json index b27168eca..2766431e4 100644 --- a/data/maps/SlateportCity_House2/map.json +++ b/data/maps/SlateportCity_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_SLATEPORT_CITY_HOUSE2", "name": "SlateportCity_House2", "layout": "LAYOUT_HOUSE2", - "music": "MUS_FINECITY", + "music": "MUS_SLATEPORT", "region_map_section": "MAPSEC_SLATEPORT_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SlateportCity_Mart/map.json b/data/maps/SlateportCity_Mart/map.json index 69e227101..bdc412416 100644 --- a/data/maps/SlateportCity_Mart/map.json +++ b/data/maps/SlateportCity_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_SLATEPORT_CITY_MART", "name": "SlateportCity_Mart", "layout": "LAYOUT_POKE_MART", - "music": "MUS_FRIENDLY", + "music": "MUS_POKE_MART", "region_map_section": "MAPSEC_SLATEPORT_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/map.json b/data/maps/SlateportCity_OceanicMuseum_1F/map.json index db9aaec0f..40ce94acc 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/map.json +++ b/data/maps/SlateportCity_OceanicMuseum_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F", "name": "SlateportCity_OceanicMuseum_1F", "layout": "LAYOUT_SLATEPORT_CITY_OCEANIC_MUSEUM_1F", - "music": "MUS_FUNE_KAN", + "music": "MUS_OCEANIC_MUSEUM", "region_map_section": "MAPSEC_SLATEPORT_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc index 575a42e33..ae9a0086d 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc +++ b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc @@ -179,7 +179,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155C98:: @ 8155C98 applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_155CD3 waitmovement 0 setflag FLAG_HIDE_SCARED_GRUNT_OCEANIC_MUSEUM - playse SE_KAIDAN + playse SE_EXIT removeobject 13 release end @@ -188,7 +188,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155CAD:: @ 8155CAD applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_155CCC waitmovement 0 setflag FLAG_HIDE_SCARED_GRUNT_OCEANIC_MUSEUM - playse SE_KAIDAN + playse SE_EXIT removeobject 13 release end diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/map.json b/data/maps/SlateportCity_OceanicMuseum_2F/map.json index e00f2ade1..aa9183e21 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/map.json +++ b/data/maps/SlateportCity_OceanicMuseum_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_2F", "name": "SlateportCity_OceanicMuseum_2F", "layout": "LAYOUT_SLATEPORT_CITY_OCEANIC_MUSEUM_2F", - "music": "MUS_FUNE_KAN", + "music": "MUS_OCEANIC_MUSEUM", "region_map_section": "MAPSEC_SLATEPORT_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc index 0450d51f1..5e14d0cd2 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc +++ b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc @@ -84,7 +84,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 closemessage applymovement 1, SlateportCity_OceanicMuseum_2F_Movement_155E98 waitmovement 0 - playse SE_KAIDAN + playse SE_EXIT removeobject 1 setflag FLAG_HIDE_EVIL_TEAM_ROUTE110 setflag FLAG_DELIVERED_DEVON_GOODS diff --git a/data/maps/SlateportCity_PokemonCenter_1F/map.json b/data/maps/SlateportCity_PokemonCenter_1F/map.json index de1a16a27..8da2981e2 100644 --- a/data/maps/SlateportCity_PokemonCenter_1F/map.json +++ b/data/maps/SlateportCity_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SLATEPORT_CITY_POKEMON_CENTER_1F", "name": "SlateportCity_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_SLATEPORT_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SlateportCity_PokemonCenter_2F/map.json b/data/maps/SlateportCity_PokemonCenter_2F/map.json index b7d8799fe..f135fe7e5 100644 --- a/data/maps/SlateportCity_PokemonCenter_2F/map.json +++ b/data/maps/SlateportCity_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SLATEPORT_CITY_POKEMON_CENTER_2F", "name": "SlateportCity_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_SLATEPORT_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SlateportCity_PokemonFanClub/map.json b/data/maps/SlateportCity_PokemonFanClub/map.json index d5a39eb54..4292187fd 100644 --- a/data/maps/SlateportCity_PokemonFanClub/map.json +++ b/data/maps/SlateportCity_PokemonFanClub/map.json @@ -2,7 +2,7 @@ "id": "MAP_SLATEPORT_CITY_POKEMON_FAN_CLUB", "name": "SlateportCity_PokemonFanClub", "layout": "LAYOUT_SLATEPORT_CITY_POKEMON_FAN_CLUB", - "music": "MUS_FINECITY", + "music": "MUS_SLATEPORT", "region_map_section": "MAPSEC_SLATEPORT_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SlateportCity_SternsShipyard_1F/map.json b/data/maps/SlateportCity_SternsShipyard_1F/map.json index b916af9ea..4c5bd47ed 100644 --- a/data/maps/SlateportCity_SternsShipyard_1F/map.json +++ b/data/maps/SlateportCity_SternsShipyard_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SLATEPORT_CITY_STERNS_SHIPYARD_1F", "name": "SlateportCity_SternsShipyard_1F", "layout": "LAYOUT_SLATEPORT_CITY_STERNS_SHIPYARD_1F", - "music": "MUS_FINECITY", + "music": "MUS_SLATEPORT", "region_map_section": "MAPSEC_SLATEPORT_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SlateportCity_SternsShipyard_2F/map.json b/data/maps/SlateportCity_SternsShipyard_2F/map.json index d2a35e317..bf5d31907 100644 --- a/data/maps/SlateportCity_SternsShipyard_2F/map.json +++ b/data/maps/SlateportCity_SternsShipyard_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SLATEPORT_CITY_STERNS_SHIPYARD_2F", "name": "SlateportCity_SternsShipyard_2F", "layout": "LAYOUT_SLATEPORT_CITY_STERNS_SHIPYARD_2F", - "music": "MUS_FINECITY", + "music": "MUS_SLATEPORT", "region_map_section": "MAPSEC_SLATEPORT_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SootopolisCity/map.json b/data/maps/SootopolisCity/map.json index e4c2d7710..4dd94cadf 100644 --- a/data/maps/SootopolisCity/map.json +++ b/data/maps/SootopolisCity/map.json @@ -2,7 +2,7 @@ "id": "MAP_SOOTOPOLIS_CITY", "name": "SootopolisCity", "layout": "LAYOUT_SOOTOPOLIS_CITY", - "music": "MUS_RUNECITY", + "music": "MUS_SOOTOPOLIS", "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/SootopolisCity_Gym_1F/map.json b/data/maps/SootopolisCity_Gym_1F/map.json index e28450cd1..0416e99a4 100644 --- a/data/maps/SootopolisCity_Gym_1F/map.json +++ b/data/maps/SootopolisCity_Gym_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SOOTOPOLIS_CITY_GYM_1F", "name": "SootopolisCity_Gym_1F", "layout": "LAYOUT_SOOTOPOLIS_CITY_GYM_1F", - "music": "MUS_GIM", + "music": "MUS_GYM", "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SootopolisCity_Gym_1F/scripts.inc b/data/maps/SootopolisCity_Gym_1F/scripts.inc index 7013df88d..38f97a3b0 100644 --- a/data/maps/SootopolisCity_Gym_1F/scripts.inc +++ b/data/maps/SootopolisCity_Gym_1F/scripts.inc @@ -49,7 +49,7 @@ SootopolisCity_Gym_1F_MapScript2_15AF86:: @ 815AF86 SootopolisCity_Gym_1F_EventScript_15AFA8:: @ 815AFA8 addvar VAR_ICE_STEP_COUNT, 1 delay 40 - playse SE_RU_GASHIN + playse SE_ICE_STAIRS call SootopolisCity_Gym_1F_EventScript_15AF2E special DrawWholeMapView end @@ -57,7 +57,7 @@ SootopolisCity_Gym_1F_EventScript_15AFA8:: @ 815AFA8 SootopolisCity_Gym_1F_EventScript_15AFBC:: @ 815AFBC addvar VAR_ICE_STEP_COUNT, 1 delay 40 - playse SE_RU_GASHIN + playse SE_ICE_STAIRS call SootopolisCity_Gym_1F_EventScript_15AF2E special DrawWholeMapView end @@ -65,7 +65,7 @@ SootopolisCity_Gym_1F_EventScript_15AFBC:: @ 815AFBC SootopolisCity_Gym_1F_EventScript_15AFD0:: @ 815AFD0 addvar VAR_ICE_STEP_COUNT, 1 delay 40 - playse SE_RU_GASHIN + playse SE_ICE_STAIRS call SootopolisCity_Gym_1F_EventScript_15AF2E special DrawWholeMapView end @@ -75,7 +75,7 @@ SootopolisCity_Gym_1F_EventScript_15AFE4:: @ 815AFE4 delay 20 applymovement OBJ_EVENT_ID_PLAYER, SootopolisCity_Gym_1F_Movement_15AFFD waitmovement 0 - playse SE_RU_HYUU + playse SE_FALL delay 60 warphole MAP_SOOTOPOLIS_CITY_GYM_B1F waitstate diff --git a/data/maps/SootopolisCity_Gym_B1F/map.json b/data/maps/SootopolisCity_Gym_B1F/map.json index 9a0619421..50cc08af3 100644 --- a/data/maps/SootopolisCity_Gym_B1F/map.json +++ b/data/maps/SootopolisCity_Gym_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SOOTOPOLIS_CITY_GYM_B1F", "name": "SootopolisCity_Gym_B1F", "layout": "LAYOUT_SOOTOPOLIS_CITY_GYM_B1F", - "music": "MUS_GIM", + "music": "MUS_GYM", "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SootopolisCity_House1/map.json b/data/maps/SootopolisCity_House1/map.json index 8c024eca8..f4ce05680 100644 --- a/data/maps/SootopolisCity_House1/map.json +++ b/data/maps/SootopolisCity_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_SOOTOPOLIS_CITY_HOUSE1", "name": "SootopolisCity_House1", "layout": "LAYOUT_SOOTOPOLIS_CITY_HOUSE1", - "music": "MUS_RUNECITY", + "music": "MUS_SOOTOPOLIS", "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SootopolisCity_House2/map.json b/data/maps/SootopolisCity_House2/map.json index 09ec1c06f..81aa1184c 100644 --- a/data/maps/SootopolisCity_House2/map.json +++ b/data/maps/SootopolisCity_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_SOOTOPOLIS_CITY_HOUSE2", "name": "SootopolisCity_House2", "layout": "LAYOUT_SOOTOPOLIS_CITY_HOUSE2", - "music": "MUS_RUNECITY", + "music": "MUS_SOOTOPOLIS", "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SootopolisCity_House3/map.json b/data/maps/SootopolisCity_House3/map.json index 282e50bc4..454ab19f8 100644 --- a/data/maps/SootopolisCity_House3/map.json +++ b/data/maps/SootopolisCity_House3/map.json @@ -2,7 +2,7 @@ "id": "MAP_SOOTOPOLIS_CITY_HOUSE3", "name": "SootopolisCity_House3", "layout": "LAYOUT_SOOTOPOLIS_CITY_HOUSE3", - "music": "MUS_RUNECITY", + "music": "MUS_SOOTOPOLIS", "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SootopolisCity_House4/map.json b/data/maps/SootopolisCity_House4/map.json index 61bbfa10b..754fe6a15 100644 --- a/data/maps/SootopolisCity_House4/map.json +++ b/data/maps/SootopolisCity_House4/map.json @@ -2,7 +2,7 @@ "id": "MAP_SOOTOPOLIS_CITY_HOUSE4", "name": "SootopolisCity_House4", "layout": "LAYOUT_SOOTOPOLIS_CITY_HOUSE1", - "music": "MUS_RUNECITY", + "music": "MUS_SOOTOPOLIS", "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SootopolisCity_House5/map.json b/data/maps/SootopolisCity_House5/map.json index 89becb6c6..1691b2165 100644 --- a/data/maps/SootopolisCity_House5/map.json +++ b/data/maps/SootopolisCity_House5/map.json @@ -2,7 +2,7 @@ "id": "MAP_SOOTOPOLIS_CITY_HOUSE5", "name": "SootopolisCity_House5", "layout": "LAYOUT_SOOTOPOLIS_CITY_HOUSE2", - "music": "MUS_RUNECITY", + "music": "MUS_SOOTOPOLIS", "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SootopolisCity_House6/map.json b/data/maps/SootopolisCity_House6/map.json index 19df640ce..4b3913f3d 100644 --- a/data/maps/SootopolisCity_House6/map.json +++ b/data/maps/SootopolisCity_House6/map.json @@ -2,7 +2,7 @@ "id": "MAP_SOOTOPOLIS_CITY_HOUSE6", "name": "SootopolisCity_House6", "layout": "LAYOUT_SOOTOPOLIS_CITY_HOUSE3", - "music": "MUS_RUNECITY", + "music": "MUS_SOOTOPOLIS", "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SootopolisCity_House7/map.json b/data/maps/SootopolisCity_House7/map.json index 9ccef3f2b..b83876db7 100644 --- a/data/maps/SootopolisCity_House7/map.json +++ b/data/maps/SootopolisCity_House7/map.json @@ -2,7 +2,7 @@ "id": "MAP_SOOTOPOLIS_CITY_HOUSE7", "name": "SootopolisCity_House7", "layout": "LAYOUT_SOOTOPOLIS_CITY_HOUSE1", - "music": "MUS_RUNECITY", + "music": "MUS_SOOTOPOLIS", "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SootopolisCity_House8/map.json b/data/maps/SootopolisCity_House8/map.json index 07ea5c5a0..c47219f7e 100644 --- a/data/maps/SootopolisCity_House8/map.json +++ b/data/maps/SootopolisCity_House8/map.json @@ -2,7 +2,7 @@ "id": "MAP_SOOTOPOLIS_CITY_HOUSE8", "name": "SootopolisCity_House8", "layout": "LAYOUT_SOOTOPOLIS_CITY_HOUSE8", - "music": "MUS_RUNECITY", + "music": "MUS_SOOTOPOLIS", "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SootopolisCity_Mart/map.json b/data/maps/SootopolisCity_Mart/map.json index 43ae2ca93..debe89e79 100644 --- a/data/maps/SootopolisCity_Mart/map.json +++ b/data/maps/SootopolisCity_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_SOOTOPOLIS_CITY_MART", "name": "SootopolisCity_Mart", "layout": "LAYOUT_POKE_MART", - "music": "MUS_FRIENDLY", + "music": "MUS_POKE_MART", "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/map.json b/data/maps/SootopolisCity_PokemonCenter_1F/map.json index 795e69cd6..91f14a7e2 100644 --- a/data/maps/SootopolisCity_PokemonCenter_1F/map.json +++ b/data/maps/SootopolisCity_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F", "name": "SootopolisCity_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SootopolisCity_PokemonCenter_2F/map.json b/data/maps/SootopolisCity_PokemonCenter_2F/map.json index ff92662bb..afa78b9ca 100644 --- a/data/maps/SootopolisCity_PokemonCenter_2F/map.json +++ b/data/maps/SootopolisCity_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_2F", "name": "SootopolisCity_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SouthernIsland_Exterior/map.json b/data/maps/SouthernIsland_Exterior/map.json index 2a8bfd397..7749a4a27 100644 --- a/data/maps/SouthernIsland_Exterior/map.json +++ b/data/maps/SouthernIsland_Exterior/map.json @@ -2,7 +2,7 @@ "id": "MAP_SOUTHERN_ISLAND_EXTERIOR", "name": "SouthernIsland_Exterior", "layout": "LAYOUT_SOUTHERN_ISLAND_EXTERIOR", - "music": "MUS_DAN02", + "music": "MUS_ABANDONED_SHIP", "region_map_section": "MAPSEC_SOUTHERN_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SouthernIsland_Interior/map.json b/data/maps/SouthernIsland_Interior/map.json index c93edfe2f..7743f9ad6 100644 --- a/data/maps/SouthernIsland_Interior/map.json +++ b/data/maps/SouthernIsland_Interior/map.json @@ -2,7 +2,7 @@ "id": "MAP_SOUTHERN_ISLAND_INTERIOR", "name": "SouthernIsland_Interior", "layout": "LAYOUT_SOUTHERN_ISLAND_INTERIOR", - "music": "MUS_DAN02", + "music": "MUS_ABANDONED_SHIP", "region_map_section": "MAPSEC_SOUTHERN_ISLAND", "requires_flash": false, "weather": "WEATHER_SHADE", diff --git a/data/maps/TradeCenter/map.json b/data/maps/TradeCenter/map.json index f31bfc8c6..7ffa58cb4 100644 --- a/data/maps/TradeCenter/map.json +++ b/data/maps/TradeCenter/map.json @@ -2,7 +2,7 @@ "id": "MAP_TRADE_CENTER", "name": "TradeCenter", "layout": "LAYOUT_TRADE_CENTER", - "music": "MUS_RAINBOW", + "music": "MUS_EVER_GRANDE", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Underwater1/map.json b/data/maps/Underwater1/map.json index b5da6e8f3..38b125dec 100644 --- a/data/maps/Underwater1/map.json +++ b/data/maps/Underwater1/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNDERWATER1", "name": "Underwater1", "layout": "LAYOUT_UNDERWATER1", - "music": "MUS_DEEPDEEP", + "music": "MUS_UNDERWATER", "region_map_section": "MAPSEC_UNDERWATER_124", "requires_flash": false, "weather": "WEATHER_BUBBLES", diff --git a/data/maps/Underwater2/map.json b/data/maps/Underwater2/map.json index 19bb67c63..e743f8989 100644 --- a/data/maps/Underwater2/map.json +++ b/data/maps/Underwater2/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNDERWATER2", "name": "Underwater2", "layout": "LAYOUT_UNDERWATER2", - "music": "MUS_DEEPDEEP", + "music": "MUS_UNDERWATER", "region_map_section": "MAPSEC_UNDERWATER_125", "requires_flash": false, "weather": "WEATHER_BUBBLES", diff --git a/data/maps/Underwater3/map.json b/data/maps/Underwater3/map.json index 5166a403c..e5f75aa4f 100644 --- a/data/maps/Underwater3/map.json +++ b/data/maps/Underwater3/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNDERWATER3", "name": "Underwater3", "layout": "LAYOUT_UNDERWATER3", - "music": "MUS_DEEPDEEP", + "music": "MUS_UNDERWATER", "region_map_section": "MAPSEC_UNDERWATER_126", "requires_flash": false, "weather": "WEATHER_BUBBLES", diff --git a/data/maps/Underwater4/map.json b/data/maps/Underwater4/map.json index a963da647..ee97a911d 100644 --- a/data/maps/Underwater4/map.json +++ b/data/maps/Underwater4/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNDERWATER4", "name": "Underwater4", "layout": "LAYOUT_UNDERWATER4", - "music": "MUS_DEEPDEEP", + "music": "MUS_UNDERWATER", "region_map_section": "MAPSEC_UNDERWATER_127", "requires_flash": false, "weather": "WEATHER_BUBBLES", diff --git a/data/maps/Underwater_Route134/map.json b/data/maps/Underwater_Route134/map.json index d435556ee..5a3b00bbc 100644 --- a/data/maps/Underwater_Route134/map.json +++ b/data/maps/Underwater_Route134/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNDERWATER_ROUTE134", "name": "Underwater_Route134", "layout": "LAYOUT_UNDERWATER_ROUTE134", - "music": "MUS_DEEPDEEP", + "music": "MUS_UNDERWATER", "region_map_section": "MAPSEC_UNDERWATER_SEALED_CHAMBER", "requires_flash": false, "weather": "WEATHER_BUBBLES", diff --git a/data/maps/Underwater_SeafloorCavern/map.json b/data/maps/Underwater_SeafloorCavern/map.json index 6ec900a6f..59bafbac5 100644 --- a/data/maps/Underwater_SeafloorCavern/map.json +++ b/data/maps/Underwater_SeafloorCavern/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNDERWATER_SEAFLOOR_CAVERN", "name": "Underwater_SeafloorCavern", "layout": "LAYOUT_UNDERWATER_SEAFLOOR_CAVERN", - "music": "MUS_DEEPDEEP", + "music": "MUS_UNDERWATER", "region_map_section": "MAPSEC_UNDERWATER_128", "requires_flash": false, "weather": "WEATHER_BUBBLES", diff --git a/data/maps/Underwater_SealedChamber/map.json b/data/maps/Underwater_SealedChamber/map.json index 4a31edb43..4cc83422f 100644 --- a/data/maps/Underwater_SealedChamber/map.json +++ b/data/maps/Underwater_SealedChamber/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNDERWATER_SEALED_CHAMBER", "name": "Underwater_SealedChamber", "layout": "LAYOUT_UNDERWATER_SEALED_CHAMBER", - "music": "MUS_DEEPDEEP", + "music": "MUS_UNDERWATER", "region_map_section": "MAPSEC_UNDERWATER_SEALED_CHAMBER", "requires_flash": false, "weather": "WEATHER_BUBBLES", diff --git a/data/maps/Underwater_SootopolisCity/map.json b/data/maps/Underwater_SootopolisCity/map.json index 8250b2a32..fe5211040 100644 --- a/data/maps/Underwater_SootopolisCity/map.json +++ b/data/maps/Underwater_SootopolisCity/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNDERWATER_SOOTOPOLIS_CITY", "name": "Underwater_SootopolisCity", "layout": "LAYOUT_UNDERWATER_SOOTOPOLIS_CITY", - "music": "MUS_DEEPDEEP", + "music": "MUS_UNDERWATER", "region_map_section": "MAPSEC_UNDERWATER_SOOTOPOLIS", "requires_flash": false, "weather": "WEATHER_BUBBLES", diff --git a/data/maps/UnknownMap_25_29/map.json b/data/maps/UnknownMap_25_29/map.json index eba4d0b48..82a084b1b 100644 --- a/data/maps/UnknownMap_25_29/map.json +++ b/data/maps/UnknownMap_25_29/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNKNOWN_MAP_25_29", "name": "UnknownMap_25_29", "layout": "LAYOUT_UNKNOWN_MAP_25_29", - "music": "MUS_NIBI", + "music": "MUS_GSC_PEWTER", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/UnknownMap_25_30/map.json b/data/maps/UnknownMap_25_30/map.json index 4a8343163..5a22fae5e 100644 --- a/data/maps/UnknownMap_25_30/map.json +++ b/data/maps/UnknownMap_25_30/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNKNOWN_MAP_25_30", "name": "UnknownMap_25_30", "layout": "LAYOUT_UNKNOWN_MAP_25_30", - "music": "MUS_NIBI", + "music": "MUS_GSC_PEWTER", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/UnknownMap_25_31/map.json b/data/maps/UnknownMap_25_31/map.json index 932a48899..b73602e9f 100644 --- a/data/maps/UnknownMap_25_31/map.json +++ b/data/maps/UnknownMap_25_31/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNKNOWN_MAP_25_31", "name": "UnknownMap_25_31", "layout": "LAYOUT_UNKNOWN_MAP_25_31", - "music": "MUS_NIBI", + "music": "MUS_GSC_PEWTER", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/UnknownMap_25_32/map.json b/data/maps/UnknownMap_25_32/map.json index 32d15dbdc..3266a2c9d 100644 --- a/data/maps/UnknownMap_25_32/map.json +++ b/data/maps/UnknownMap_25_32/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNKNOWN_MAP_25_32", "name": "UnknownMap_25_32", "layout": "LAYOUT_UNKNOWN_MAP_25_32", - "music": "MUS_NIBI", + "music": "MUS_GSC_PEWTER", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/UnknownMap_25_33/map.json b/data/maps/UnknownMap_25_33/map.json index 14d6589b6..3a6d79404 100644 --- a/data/maps/UnknownMap_25_33/map.json +++ b/data/maps/UnknownMap_25_33/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNKNOWN_MAP_25_33", "name": "UnknownMap_25_33", "layout": "LAYOUT_UNKNOWN_MAP_25_33", - "music": "MUS_NIBI", + "music": "MUS_GSC_PEWTER", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/UnknownMap_25_34/map.json b/data/maps/UnknownMap_25_34/map.json index b4d5c7bab..aec7f40a1 100644 --- a/data/maps/UnknownMap_25_34/map.json +++ b/data/maps/UnknownMap_25_34/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNKNOWN_MAP_25_34", "name": "UnknownMap_25_34", "layout": "LAYOUT_UNKNOWN_MAP_25_34", - "music": "MUS_NIBI", + "music": "MUS_GSC_PEWTER", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VerdanturfTown/map.json b/data/maps/VerdanturfTown/map.json index 71f176e2b..20e6b88bf 100644 --- a/data/maps/VerdanturfTown/map.json +++ b/data/maps/VerdanturfTown/map.json @@ -2,7 +2,7 @@ "id": "MAP_VERDANTURF_TOWN", "name": "VerdanturfTown", "layout": "LAYOUT_VERDANTURF_TOWN", - "music": "MUS_GOMACHI0", + "music": "MUS_VERDANTURF", "region_map_section": "MAPSEC_VERDANTURF_TOWN", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/VerdanturfTown_ContestHall/map.json b/data/maps/VerdanturfTown_ContestHall/map.json index 90215698b..5ef4101f6 100644 --- a/data/maps/VerdanturfTown_ContestHall/map.json +++ b/data/maps/VerdanturfTown_ContestHall/map.json @@ -2,7 +2,7 @@ "id": "MAP_VERDANTURF_TOWN_CONTEST_HALL", "name": "VerdanturfTown_ContestHall", "layout": "LAYOUT_CONTEST_HALL", - "music": "MUS_CONLOBBY", + "music": "MUS_CONTEST_LOBBY", "region_map_section": "MAPSEC_VERDANTURF_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VerdanturfTown_ContestLobby/map.json b/data/maps/VerdanturfTown_ContestLobby/map.json index acd5caa8c..8907f866c 100644 --- a/data/maps/VerdanturfTown_ContestLobby/map.json +++ b/data/maps/VerdanturfTown_ContestLobby/map.json @@ -2,7 +2,7 @@ "id": "MAP_VERDANTURF_TOWN_CONTEST_LOBBY", "name": "VerdanturfTown_ContestLobby", "layout": "LAYOUT_CONTEST_LOBBY", - "music": "MUS_CONLOBBY", + "music": "MUS_CONTEST_LOBBY", "region_map_section": "MAPSEC_VERDANTURF_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VerdanturfTown_ContestLobby/scripts.inc b/data/maps/VerdanturfTown_ContestLobby/scripts.inc index 8eb1c0bcd..df4139dbe 100644 --- a/data/maps/VerdanturfTown_ContestLobby/scripts.inc +++ b/data/maps/VerdanturfTown_ContestLobby/scripts.inc @@ -22,13 +22,13 @@ VerdanturfTown_ContestLobby_EventScript_153DA1:: @ 8153DA1 lockall applymovement 1, VerdanturfTown_ContestLobby_Movement_153E25 waitmovement 0 - playse SE_HASHI + playse SE_BRIDGE_WALK setmetatile 4, 2, METATILE_Contest_WallShadow, 1 setmetatile 4, 3, METATILE_Contest_FloorShadow, 1 special DrawWholeMapView applymovement 1, VerdanturfTown_ContestLobby_Movement_153E28 waitmovement 0 - playse SE_HASHI + playse SE_BRIDGE_WALK setmetatile 4, 2, METATILE_Contest_CounterFlap_Top, 1 setmetatile 4, 3, METATILE_Contest_CounterFlap_Bottom, 1 special DrawWholeMapView diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json b/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json index 0d9e9113a..785a4df91 100644 --- a/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json +++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_VERDANTURF_TOWN_FRIENDSHIP_RATERS_HOUSE", "name": "VerdanturfTown_FriendshipRatersHouse", "layout": "LAYOUT_HOUSE2", - "music": "MUS_GOMACHI0", + "music": "MUS_VERDANTURF", "region_map_section": "MAPSEC_VERDANTURF_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VerdanturfTown_House/map.json b/data/maps/VerdanturfTown_House/map.json index b09e47a12..d302bb710 100644 --- a/data/maps/VerdanturfTown_House/map.json +++ b/data/maps/VerdanturfTown_House/map.json @@ -2,7 +2,7 @@ "id": "MAP_VERDANTURF_TOWN_HOUSE", "name": "VerdanturfTown_House", "layout": "LAYOUT_HOUSE1", - "music": "MUS_GOMACHI0", + "music": "MUS_VERDANTURF", "region_map_section": "MAPSEC_VERDANTURF_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VerdanturfTown_Mart/map.json b/data/maps/VerdanturfTown_Mart/map.json index 445ea2e1e..eadc8033b 100644 --- a/data/maps/VerdanturfTown_Mart/map.json +++ b/data/maps/VerdanturfTown_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_VERDANTURF_TOWN_MART", "name": "VerdanturfTown_Mart", "layout": "LAYOUT_POKE_MART", - "music": "MUS_FRIENDLY", + "music": "MUS_POKE_MART", "region_map_section": "MAPSEC_VERDANTURF_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/map.json b/data/maps/VerdanturfTown_PokemonCenter_1F/map.json index 220aceaec..0a343727b 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_1F/map.json +++ b/data/maps/VerdanturfTown_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_VERDANTURF_TOWN_POKEMON_CENTER_1F", "name": "VerdanturfTown_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_VERDANTURF_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VerdanturfTown_PokemonCenter_2F/map.json b/data/maps/VerdanturfTown_PokemonCenter_2F/map.json index b5b8c9fef..f2657afe6 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_2F/map.json +++ b/data/maps/VerdanturfTown_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_VERDANTURF_TOWN_POKEMON_CENTER_2F", "name": "VerdanturfTown_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_VERDANTURF_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VerdanturfTown_WandasHouse/map.json b/data/maps/VerdanturfTown_WandasHouse/map.json index 3986443e2..7c4f130e0 100644 --- a/data/maps/VerdanturfTown_WandasHouse/map.json +++ b/data/maps/VerdanturfTown_WandasHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_VERDANTURF_TOWN_WANDAS_HOUSE", "name": "VerdanturfTown_WandasHouse", "layout": "LAYOUT_VERDANTURF_TOWN_WANDAS_HOUSE", - "music": "MUS_GOMACHI0", + "music": "MUS_VERDANTURF", "region_map_section": "MAPSEC_VERDANTURF_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VictoryRoad_1F/map.json b/data/maps/VictoryRoad_1F/map.json index 8c4dfb9ae..9931edd3d 100644 --- a/data/maps/VictoryRoad_1F/map.json +++ b/data/maps/VictoryRoad_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_VICTORY_ROAD_1F", "name": "VictoryRoad_1F", "layout": "LAYOUT_VICTORY_ROAD_1F", - "music": "MUS_C_ROAD", + "music": "MUS_VICTORY_ROAD", "region_map_section": "MAPSEC_VICTORY_ROAD", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VictoryRoad_B1F/map.json b/data/maps/VictoryRoad_B1F/map.json index 2473a819f..ee15b4ffa 100644 --- a/data/maps/VictoryRoad_B1F/map.json +++ b/data/maps/VictoryRoad_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_VICTORY_ROAD_B1F", "name": "VictoryRoad_B1F", "layout": "LAYOUT_VICTORY_ROAD_B1F", - "music": "MUS_C_ROAD", + "music": "MUS_VICTORY_ROAD", "region_map_section": "MAPSEC_VICTORY_ROAD", "requires_flash": true, "weather": "WEATHER_NONE", diff --git a/data/maps/VictoryRoad_B2F/map.json b/data/maps/VictoryRoad_B2F/map.json index 0a0ee1a57..87a8359bc 100644 --- a/data/maps/VictoryRoad_B2F/map.json +++ b/data/maps/VictoryRoad_B2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_VICTORY_ROAD_B2F", "name": "VictoryRoad_B2F", "layout": "LAYOUT_VICTORY_ROAD_B2F", - "music": "MUS_C_ROAD", + "music": "MUS_VICTORY_ROAD", "region_map_section": "MAPSEC_VICTORY_ROAD", "requires_flash": true, "weather": "WEATHER_NONE", diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc index f7952540c..cf17f759d 100644 --- a/data/scripts/berry_tree.inc +++ b/data/scripts/berry_tree.inc @@ -112,7 +112,7 @@ BerryTree_EventScript_1A161D:: @ 81A161D goto_if_eq BerryTree_EventScript_1A1642 special ObjectEventInteractionRemoveBerryTree message Route102_Text_1A17FD - playfanfare MUS_ME_KINOMI + playfanfare MUS_OBTAIN_BERRY waitmessage waitfanfare waitbuttonpress diff --git a/data/scripts/cave_hole.inc b/data/scripts/cave_hole.inc index 0bc876575..59b53d40d 100644 --- a/data/scripts/cave_hole.inc +++ b/data/scripts/cave_hole.inc @@ -11,7 +11,7 @@ EventScript_FallDownHole:: @ 81C6BC5 delay 20 applymovement OBJ_EVENT_ID_PLAYER, Movement_SetInvisible waitmovement 0 - playse SE_RU_HYUU + playse SE_FALL delay 60 warphole MAP_UNDEFINED waitstate @@ -22,7 +22,7 @@ EventScript_FallDownHoleMtPyre:: @ 81C6BDE delay 20 applymovement OBJ_EVENT_ID_PLAYER, Movement_SetInvisible waitmovement 0 - playse SE_RU_HYUU + playse SE_FALL delay 60 special DoFallWarp waitstate diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc index a99c33492..465b0bfe8 100644 --- a/data/scripts/contest_hall.inc +++ b/data/scripts/contest_hall.inc @@ -343,13 +343,13 @@ LinkContestRoom1_EventScript_1A5323:: @ 81A5323 waitmovement 0 releaseall addobject 13 - playse SE_DANSA + playse SE_LEDGE lockall applymovement VAR_0x800B, LinkContestRoom1_Movement_1A5D9C waitmovement 0 releaseall addvar VAR_0x8006, -1 - playse SE_BOWA2 + playse SE_BALL_OPEN special ShowContestEntryMonPic call LinkContestRoom1_EventScript_1A535E return @@ -369,7 +369,7 @@ LinkContestRoom1_EventScript_1A5370:: @ 81A5370 LinkContestRoom1_EventScript_1A5377:: @ 81A5377 call LinkContestRoom1_EventScript_1A53B3 call LinkContestRoom1_EventScript_1A53CE - playse SE_W227B + playse SE_M_ENCORE2 waitmessage call LinkContestRoom1_EventScript_1A5A90 applymovement 1, LinkContestRoom1_Movement_1A5D9F @@ -406,7 +406,7 @@ LinkContestRoom1_EventScript_1A53DF:: @ 81A53DF LinkContestRoom1_EventScript_1A53E5:: @ 81A53E5 applymovement 1, LinkContestRoom1_Movement_1A5DAF waitmovement 0 - playse SE_W227B + playse SE_M_ENCORE2 call LinkContestRoom1_EventScript_1A5AE4 applymovement 9, LinkContestRoom1_Movement_1A5DB7 applymovement 12, LinkContestRoom1_Movement_1A5DBB @@ -803,7 +803,7 @@ LinkContestRoom1_EventScript_1A594A:: @ 81A594A setvar VAR_TEMP_9, 1 showcontestresults setvar VAR_TEMP_9, 0 - playbgm MUS_CON_FAN, FALSE + playbgm MUS_CONTEST_WINNER, FALSE return LinkContestRoom1_EventScript_1A5984:: @ 81A5984 @@ -888,7 +888,7 @@ LinkContestRoom1_EventScript_1A5A49:: @ 81A5A49 call LinkContestRoom1_EventScript_1A5A75 applymovement VAR_TEMP_3, LinkContestRoom1_Movement_1A5D99 waitmovement 0 - playse SE_W227B + playse SE_M_ENCORE2 setvar VAR_TEMP_1, 0 return @@ -999,7 +999,7 @@ LinkContestRoom1_EventScript_1A5BAB:: @ 81A5BAB waitmessage call LinkContestRoom1_EventScript_1A5C7F call LinkContestRoom1_EventScript_1A5CE5 - playse SE_W227B + playse SE_M_ENCORE2 setvar VAR_TEMP_1, 0 call LinkContestRoom1_EventScript_1A5A90 delay 30 @@ -1143,7 +1143,7 @@ LinkContestRoom1_EventScript_1A5D5B:: @ 81A5D5B setflag FLAG_SYS_RIBBON_GET lockall msgbox LinkContestRoom1_Text_1A6D6A, MSGBOX_DEFAULT - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM msgbox LinkContestRoom1_Text_1A6D96, MSGBOX_DEFAULT waitfanfare special ScrSpecial_GetContestWinnerNick diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc index 2eb32cc71..9acd544d9 100644 --- a/data/scripts/day_care.inc +++ b/data/scripts/day_care.inc @@ -36,7 +36,7 @@ Route117_EventScript_1B2298:: @ 81B2298 Route117_EventScript_1B22B2:: @ 81B22B2 message Route117_Text_1B27A2 - playfanfare MUS_FANFA1 + playfanfare MUS_LEVEL_UP waitfanfare waitmessage waitbuttonpress @@ -208,7 +208,7 @@ Route117_PokemonDayCare_EventScript_1B24DE:: @ 81B24DE waitmovement 0 specialvar VAR_RESULT, TakePokemonFromDaycare special PayMoneyFor - playse SE_REGI + playse SE_SHOP msgbox Route117_PokemonDayCare_Text_1B2B75, MSGBOX_DEFAULT waitse playmoncry VAR_RESULT, 0 diff --git a/data/scripts/elite_four.inc b/data/scripts/elite_four.inc index 39d52825e..af2a747e9 100644 --- a/data/scripts/elite_four.inc +++ b/data/scripts/elite_four.inc @@ -20,7 +20,7 @@ PokemonLeague_EliteFour_SetAdvanceToNextRoomMetatiles:: @ 81A0693 PokemonLeague_EliteFour_EventScript_WalkInCloseDoor:: @ 81A0710 applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkUp6 waitmovement 0 - playse SE_TRACK_DOOR + playse SE_TRUCK_DOOR setmetatile 5, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1 setmetatile 6, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1 setmetatile 7, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1 diff --git a/data/scripts/obtain_item.inc b/data/scripts/obtain_item.inc index 2be28646e..37e8a3788 100644 --- a/data/scripts/obtain_item.inc +++ b/data/scripts/obtain_item.inc @@ -66,11 +66,11 @@ EventScript_NoRoomForItem: @ 819FECC return EventScript_PlayFanfareObtainedItem: - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM return EventScript_PlayFanfareObtainedTMHM: - playfanfare MUS_ME_WAZA + playfanfare MUS_OBTAIN_TMHM return Std_ObtainDecoration: @ 819FEDA @@ -88,7 +88,7 @@ EventScript_ObtainDecorationMessage: @ 819FEE8 return EventScript_ObtainedDecor: @ 819FF03 - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM message Text_ObtainedTheDecor waitfanfare waitmessage diff --git a/data/scripts/pc.inc b/data/scripts/pc.inc index 91b47004d..a8c1cff90 100644 --- a/data/scripts/pc.inc +++ b/data/scripts/pc.inc @@ -25,7 +25,7 @@ EventScript_AccessPC: end EventScript_AccessPlayersPC: - playse SE_PC_LOGON + playse SE_PC_LOGIN msgbox Text_AccessedPlayersPC, MSGBOX_DEFAULT special PlayerPC waitstate @@ -33,7 +33,7 @@ EventScript_AccessPlayersPC: end EventScript_AccessPokemonStorage: - playse SE_PC_LOGON + playse SE_PC_LOGIN call_if_unset FLAG_SYS_PC_LANETTE, EventScript_AccessSomeonesPC call_if_set FLAG_SYS_PC_LANETTE, EventScript_AccessLanettesPC msgbox Text_StorageSystemOpened, MSGBOX_DEFAULT @@ -59,7 +59,7 @@ EventScript_TurnOffPC: EventScript_AccessHallOfFame: goto_if_unset FLAG_SYS_GAME_CLEAR, EventScript_TurnOffPC - playse SE_PC_LOGON + playse SE_PC_LOGIN special AccessHallOfFamePC waitstate goto EventScript_AccessPC diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index 2b746dbe0..68aef1b37 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -72,7 +72,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1B69EB:: @ 81B69EB call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1B6A31 compare VAR_RESULT, 1 call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1B6A61 - playse SE_KAIDAN + playse SE_EXIT removeobject VAR_0x8008 releaseall end @@ -159,7 +159,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B6ABF:: @ 81B6ABF call LittlerootTown_BrendansHouse_1F_EventScript_1B6B9D applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_1B6CCC waitmovement 0 - playbgm MUS_INTER_V, FALSE + playbgm MUS_ENCOUNTER_INTERVIEWER, FALSE msgbox LittlerootTown_BrendansHouse_1F_Text_1725C9, MSGBOX_DEFAULT closemessage applymovement VAR_0x8005, LittlerootTown_BrendansHouse_1F_Movement_1B6BDB @@ -184,7 +184,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6B2E:: @ 81B6B2E call LittlerootTown_MaysHouse_1F_EventScript_1B6B9D applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_1B6CD4 waitmovement 0 - playbgm MUS_INTER_V, FALSE + playbgm MUS_ENCOUNTER_INTERVIEWER, FALSE msgbox LittlerootTown_MaysHouse_1F_Text_1725C9, MSGBOX_DEFAULT closemessage applymovement VAR_0x8005, LittlerootTown_MaysHouse_1F_Movement_1B6BDE diff --git a/data/scripts/safari_zone.inc b/data/scripts/safari_zone.inc index 68efec328..07ae88aa6 100644 --- a/data/scripts/safari_zone.inc +++ b/data/scripts/safari_zone.inc @@ -24,7 +24,7 @@ EventScript_1C3443: gUnknown_081C3448:: @ 81C3448 lockall - playse SE_PINPON + playse SE_DING_DONG message UnknownString_81C34E4 waitmessage waitbuttonpress @@ -33,7 +33,7 @@ gUnknown_081C3448:: @ 81C3448 gUnknown_081C3459:: @ 81C3459 lockall - playse SE_PINPON + playse SE_DING_DONG message UnknownString_81C3514 waitmessage waitbuttonpress diff --git a/data/scripts/secret_base.inc b/data/scripts/secret_base.inc index 8a82583b2..ae361ac7e 100644 --- a/data/scripts/secret_base.inc +++ b/data/scripts/secret_base.inc @@ -115,7 +115,7 @@ EventScript_1A2DAA: EventScript_1A2DB8: closemessage - playse SE_KAIDAN + playse SE_EXIT setvar VAR_INIT_SECRET_BASE, 0 setflag FLAG_DECORATION_1 special sub_80BB8CC @@ -135,7 +135,7 @@ SecretBase_EventScript_FirstEntrance:: @ 81A2DDE compare VAR_RESULT, YES goto_if_eq SecretBase_RedCave1_EventScript_1A2E08 closemessage - playse SE_KAIDAN + playse SE_EXIT special sub_80BC440 end @@ -154,7 +154,7 @@ SecretBase_RedCave1_Movement_1A2E11:: @ 81A2E11 gUnknown_081A2E14:: @ 81A2E14 lockall setvar VAR_INIT_SECRET_BASE, 1 - playse SE_KAIDAN + playse SE_EXIT special sub_80BC114 compare VAR_RESULT, 0 goto_if_eq EventScript_1A2E38 diff --git a/data/scripts/shared_secret_base.inc b/data/scripts/shared_secret_base.inc index e3b87f1ea..b466a8409 100644 --- a/data/scripts/shared_secret_base.inc +++ b/data/scripts/shared_secret_base.inc @@ -24,7 +24,7 @@ SecretBase_OnFrame:: @ 815F362 SecretBase_EventScript_PC:: @ 815F36C lockall - playse SE_PC_LOGON + playse SE_PC_LOGIN message SecretBase_Text_BootUpPC dofieldeffect FLDEFF_SECRET_BASE_PC_TURN_ON waitstate @@ -85,7 +85,7 @@ SecretBase_EventScript_PCRegistryMenu: SecretBase_EventScript_RecordMixingPC:: @ 815F43A lockall message SecretBase_Text_BootUpPC - playse SE_PC_LOGON + playse SE_PC_LOGIN dofieldeffect FLDEFF_SECRET_BASE_PC_TURN_ON waitstate waitmessage |