diff options
Diffstat (limited to 'data')
514 files changed, 1706 insertions, 1706 deletions
diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index c8b37d1cc..8884e9853 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -459,7 +459,7 @@ Move_MIRROR_MOVE:: @ 81C6F34 loadspritegfx ANIM_TAG_IMPACT monbg 1 setalpha 12, 8 - playsewithpan SE_W003, 63 + playsewithpan SE_M_DOUBLE_SLAP, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon, 2, 1, 3, 0, 6, 1 waitforvisualfinish @@ -474,7 +474,7 @@ Move_DOUBLE_SLAP:: @ 81C6F65 choosetwoturnanim DoubleSlapLeft, DoubleSlapRight DoubleSlapContinue:: @ 81C6F76 createvisualtask AnimTask_ShakeMon, 2, 1, 3, 0, 6, 1 - playsewithpan SE_W003, 63 + playsewithpan SE_M_DOUBLE_SLAP, 63 waitforvisualfinish clearmonbg 1 blendoff @@ -491,7 +491,7 @@ DoubleSlapRight:: @ 81C6FA4 Move_POISON_POWDER:: @ 81C6FB8 loadspritegfx ANIM_TAG_POISON_POWDER loadspritegfx ANIM_TAG_POISON_BUBBLE - loopsewithpan SE_W077, 63, 10, 6 + loopsewithpan SE_M_POISON_POWDER, 63, 10, 6 createsprite gPoisonPowderParticleSpriteTemplate, ANIM_TARGET, 2, -30, -22, 117, 80, 5, 1 createsprite gPoisonPowderParticleSpriteTemplate, ANIM_TARGET, 2, 10, -22, 117, 80, -5, 1 createsprite gPoisonPowderParticleSpriteTemplate, ANIM_TARGET, 2, -25, -22, 117, 112, 5, 3 @@ -515,7 +515,7 @@ Move_POISON_POWDER:: @ 81C6FB8 Move_STUN_SPORE:: @ 81C70E9 loadspritegfx ANIM_TAG_STUN_SPORE - loopsewithpan SE_W077, 63, 10, 6 + loopsewithpan SE_M_POISON_POWDER, 63, 10, 6 createsprite gStunSporeParticleSpriteTemplate, ANIM_TARGET, 2, -30, -22, 117, 80, 5, 1 createsprite gStunSporeParticleSpriteTemplate, ANIM_TARGET, 2, 10, -22, 117, 80, -5, 1 createsprite gStunSporeParticleSpriteTemplate, ANIM_TARGET, 2, -25, -22, 117, 112, 5, 3 @@ -539,7 +539,7 @@ Move_STUN_SPORE:: @ 81C70E9 Move_SLEEP_POWDER:: @ 81C7217 loadspritegfx ANIM_TAG_SLEEP_POWDER - loopsewithpan SE_W077, 63, 10, 6 + loopsewithpan SE_M_POISON_POWDER, 63, 10, 6 createsprite gSleepPowderParticleSpriteTemplate, ANIM_TARGET, 2, -30, -22, 117, 80, 5, 1 createsprite gSleepPowderParticleSpriteTemplate, ANIM_TARGET, 2, 10, -22, 117, 80, -5, 1 createsprite gSleepPowderParticleSpriteTemplate, ANIM_TARGET, 2, -25, -22, 117, 112, 5, 3 @@ -566,21 +566,21 @@ Move_SWIFT:: @ 81C7345 loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W129, 192 + playsewithpan SE_M_SWIFT, 192 createsprite gSwiftStarSpriteTemplate, ANIM_TARGET, 3, 20, -10, 20, 0, 22, 20, 1 delay 5 - playsewithpan SE_W129, 192 + playsewithpan SE_M_SWIFT, 192 createsprite gSwiftStarSpriteTemplate, ANIM_TARGET, 3, 20, -10, 20, 5, 22, -18, 1 delay 5 - playsewithpan SE_W129, 192 + playsewithpan SE_M_SWIFT, 192 createsprite gSwiftStarSpriteTemplate, ANIM_TARGET, 3, 20, -10, 20, -10, 22, 15, 1 createvisualtask AnimTask_ShakeMon2, 2, 1, 2, 0, 18, 1 createvisualtask AnimTask_ShakeMon2, 2, 3, 2, 0, 18, 1 delay 5 - playsewithpan SE_W129, 192 + playsewithpan SE_M_SWIFT, 192 createsprite gSwiftStarSpriteTemplate, ANIM_TARGET, 3, 20, -10, 20, 0, 22, -20, 1 delay 5 - playsewithpan SE_W129, 192 + playsewithpan SE_M_SWIFT, 192 createsprite gSwiftStarSpriteTemplate, ANIM_TARGET, 3, 20, -10, 20, 0, 22, 12, 1 delay 5 waitforvisualfinish @@ -592,20 +592,20 @@ Move_STRENGTH:: @ 81C73FE loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W036, 192 + playsewithpan SE_M_TAKE_DOWN, 192 createvisualtask AnimTask_ShakeAndSinkMon, 5, 0, 2, 0, 96, 30 waitforvisualfinish delay 10 createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 4 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, 1, 18, 6, 2, 4 delay 4 - playsewithpan SE_W025B, 63 + playsewithpan SE_M_MEGA_KICK2, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 16, 12, 1, 1 delay 4 - playsewithpan SE_W025B, 63 + playsewithpan SE_M_MEGA_KICK2, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, -16, -12, 1, 1 delay 4 - playsewithpan SE_W025B, 63 + playsewithpan SE_M_MEGA_KICK2, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 3, 4, 1, 1 waitforvisualfinish createvisualtask AnimTask_ShakeMon2, 2, 1, 2, 0, 8, 1 @@ -622,7 +622,7 @@ Move_TACKLE:: @ 81C7492 delay 6 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon, 2, 1, 3, 0, 6, 1 - playsewithpan SE_W004, 63 + playsewithpan SE_M_COMET_PUNCH, 63 waitforvisualfinish clearmonbg 1 blendoff @@ -632,14 +632,14 @@ Move_BODY_SLAM:: @ 81C74D0 loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W036, 192 + playsewithpan SE_M_TAKE_DOWN, 192 createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 6, 1, 0 waitforvisualfinish delay 11 createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 26, 0, 0, 5 delay 6 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 4, -10, 0, 1, 0 - loopsewithpan SE_W025B, 63, 10, 2 + loopsewithpan SE_M_MEGA_KICK2, 63, 10, 2 delay 1 createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 1, -28, 0, 0, 3 waitforvisualfinish @@ -672,7 +672,7 @@ Move_SUPERSONIC:: @ 81C755D end SupersonicRing:: @ 81C759B - playsewithpan SE_W048, 192 + playsewithpan SE_M_SUPERSONIC, 192 createsprite gSupersonicWaveSpriteTemplate, ANIM_TARGET, 2, 16, 0, 0, 0, 30, 0 delay 2 return @@ -688,7 +688,7 @@ Move_SCREECH:: @ 81C75B5 end ScreechRing:: @ 81C75E8 - playsewithpan SE_W103, 192 + playsewithpan SE_M_SCREECH, 192 createsprite gScreechWaveSpriteTemplate, ANIM_TARGET, 2, 16, 0, 0, 0, 30, 0 delay 2 return @@ -698,31 +698,31 @@ Move_FLAME_WHEEL:: @ 81C7602 monbg ANIM_DEF_PARTNER monbgprio_2A 1 createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 0 - playsewithpan SE_W172, 192 + playsewithpan SE_M_FLAME_WHEEL, 192 delay 2 createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 4 - playsewithpan SE_W172, 192 + playsewithpan SE_M_FLAME_WHEEL, 192 delay 2 createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 8 - playsewithpan SE_W172, 192 + playsewithpan SE_M_FLAME_WHEEL, 192 delay 2 createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 12 - playsewithpan SE_W172, 192 + playsewithpan SE_M_FLAME_WHEEL, 192 delay 2 createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 16 - playsewithpan SE_W172, 192 + playsewithpan SE_M_FLAME_WHEEL, 192 delay 2 createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 20 - playsewithpan SE_W172, 192 + playsewithpan SE_M_FLAME_WHEEL, 192 delay 2 createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 24 - playsewithpan SE_W172, 192 + playsewithpan SE_M_FLAME_WHEEL, 192 waitforvisualfinish createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 24, 0, 0, 6 delay 4 createvisualtask AnimTask_ShakeMon, 2, 1, 5, 0, 8, 1 createvisualtask AnimTask_BlendMonInAndOut, 3, 1, 31, 12, 1, 1 - playsewithpan SE_W172B, 63 + playsewithpan SE_M_FLAME_WHEEL2, 63 call FireSpreadEffect delay 7 createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 9 @@ -739,22 +739,22 @@ Move_PIN_MISSILE:: @ 81C76FC monbg 1 monbgprio_28 1 setalpha 12, 8 - playsewithpan SE_W026, 192 + playsewithpan SE_M_JUMP_KICK, 192 createsprite gPinMissileSpriteTemplate, ANIM_ATTACKER, 2, 20, -8, -8, -8, 20, -32 delay 15 createsprite gPinMissileSpriteTemplate, ANIM_ATTACKER, 2, 20, -8, 8, 8, 20, -40 delay 4 - playsewithpan SE_W030, 63 + playsewithpan SE_M_HORN_ATTACK, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, -8, -8, 1, 2 createvisualtask AnimTask_ShakeMon2, 2, 1, 3, 0, 2, 1 delay 9 createsprite gPinMissileSpriteTemplate, ANIM_ATTACKER, 2, 20, -8, 0, 0, 20, -32 delay 4 - playsewithpan SE_W030, 63 + playsewithpan SE_M_HORN_ATTACK, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 8, 8, 1, 2 createvisualtask AnimTask_ShakeMon2, 2, 1, 3, 0, 2, 1 delay 14 - playsewithpan SE_W030, 63 + playsewithpan SE_M_HORN_ATTACK, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon2, 2, 1, 3, 0, 2, 1 waitforvisualfinish @@ -768,22 +768,22 @@ Move_ICICLE_SPEAR:: @ 81C77C1 monbg 1 monbgprio_28 1 setalpha 12, 8 - playsewithpan SE_W196, 192 + playsewithpan SE_M_ICY_WIND, 192 createsprite gIcicleSpearSpriteTemplate, ANIM_ATTACKER, 2, 20, -8, -8, -8, 20, -32 delay 15 createsprite gIcicleSpearSpriteTemplate, ANIM_ATTACKER, 2, 20, -8, 8, 8, 20, -40 delay 4 - playsewithpan SE_W030, 63 + playsewithpan SE_M_HORN_ATTACK, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, -8, -8, 1, 2 createvisualtask AnimTask_ShakeMon2, 2, 1, 3, 0, 2, 1 delay 9 createsprite gIcicleSpearSpriteTemplate, ANIM_ATTACKER, 2, 20, -8, 0, 0, 20, -32 delay 4 - playsewithpan SE_W030, 63 + playsewithpan SE_M_HORN_ATTACK, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 8, 8, 1, 2 createvisualtask AnimTask_ShakeMon2, 2, 1, 3, 0, 2, 1 delay 14 - playsewithpan SE_W030, 63 + playsewithpan SE_M_HORN_ATTACK, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon2, 2, 1, 3, 0, 2, 1 waitforvisualfinish @@ -795,12 +795,12 @@ Move_TAKE_DOWN:: @ 81C7886 loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W036, 192 + playsewithpan SE_M_TAKE_DOWN, 192 createvisualtask AnimTask_WindUpLunge, 5, 0, -24, 8, 23, 10, 40, 10 delay 35 createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 1, 0, 10, 0, 0 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 4, -10, 0, 1, 0 - playsewithpan SE_W025B, 63 + playsewithpan SE_M_MEGA_KICK2, 63 delay 1 createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 1, -16, 0, 0, 4 waitforvisualfinish @@ -817,19 +817,19 @@ Move_TAKE_DOWN:: @ 81C7886 Move_DOUBLE_EDGE:: @ 81C791A loadspritegfx ANIM_TAG_IMPACT - playsewithpan SE_W129, 192 + playsewithpan SE_M_SWIFT, 192 createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 2, 4, 2, RGB_WHITE, 10, 0, 0 waitforvisualfinish delay 10 - playsewithpan SE_W207, 192 - waitplaysewithpan SE_W207, 192, 8 + playsewithpan SE_M_SWAGGER, 192 + waitplaysewithpan SE_M_SWAGGER, 192, 8 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, 0, 18, 6, 2, 4 waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 16, 16, RGB_WHITE createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, 0, 0, 4 delay 3 waitforvisualfinish - playsewithpan SE_W025B, 63 + playsewithpan SE_M_MEGA_KICK2, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 4, -10, 0, 1, 0 createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 1, -32, 0, 0, 3 waitforvisualfinish @@ -855,12 +855,12 @@ Move_POISON_STING:: @ 81C7A2D monbg 1 monbgprio_28 1 setalpha 12, 8 - playsewithpan SE_W013B, 192 + playsewithpan SE_M_RAZOR_WIND2, 192 createsprite gLinearStingerSpriteTemplate, ANIM_TARGET, 2, 20, 0, -8, 0, 20 waitforvisualfinish createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon2, 2, 1, 2, 0, 5, 1 - playsewithpan SE_W030, 63 + playsewithpan SE_M_HORN_ATTACK, 63 waitforvisualfinish call PoisonBubblesEffect waitforvisualfinish @@ -874,13 +874,13 @@ Move_TWINEEDLE:: @ 81C7A82 monbg 1 monbgprio_28 1 setalpha 12, 8 - loopsewithpan SE_W013B, 192, 6, 2 + loopsewithpan SE_M_RAZOR_WIND2, 192, 6, 2 createsprite gLinearStingerSpriteTemplate, ANIM_TARGET, 2, 10, -4, 0, -4, 20 createsprite gLinearStingerSpriteTemplate, ANIM_TARGET, 2, 20, 12, 10, 12, 20 delay 20 createvisualtask AnimTask_ShakeMon2, 2, 1, 2, 0, 5, 1 createsprite gHandleInvertHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, -4, 1, 3 - loopsewithpan SE_W030, 63, 5, 2 + loopsewithpan SE_M_HORN_ATTACK, 63, 5, 2 delay 1 createsprite gHandleInvertHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 10, 12, 1, 3 waitforvisualfinish @@ -940,29 +940,29 @@ FireBlastCross:: @ 81C7BCD Move_LEECH_SEED:: @ 81C7C23 loadspritegfx ANIM_TAG_SEED - playsewithpan SE_W077, 192 + playsewithpan SE_M_POISON_POWDER, 192 createsprite gLeechSeedSpriteTemplate, ANIM_TARGET, 2, 15, 0, 0, 24, 35, -32 delay 8 - playsewithpan SE_W077, 192 + playsewithpan SE_M_POISON_POWDER, 192 createsprite gLeechSeedSpriteTemplate, ANIM_TARGET, 2, 15, 0, -16, 24, 35, -40 delay 8 - playsewithpan SE_W077, 192 + playsewithpan SE_M_POISON_POWDER, 192 createsprite gLeechSeedSpriteTemplate, ANIM_TARGET, 2, 15, 0, 16, 24, 35, -37 delay 12 - loopsewithpan SE_W039, 63, 10, 8 + loopsewithpan SE_M_TAIL_WHIP, 63, 10, 8 waitforvisualfinish end Move_EMBER:: @ 81C7C79 loadspritegfx ANIM_TAG_SMALL_EMBER - loopsewithpan SE_W052, 192, 5, 2 + loopsewithpan SE_M_EMBER, 192, 5, 2 createsprite gEmberSpriteTemplate, ANIM_TARGET, 2, 20, 0, -16, 24, 20, 1 delay 4 createsprite gEmberSpriteTemplate, ANIM_TARGET, 2, 20, 0, 0, 24, 20, 1 delay 4 createsprite gEmberSpriteTemplate, ANIM_TARGET, 2, 20, 0, 16, 24, 20, 1 delay 16 - playsewithpan SE_W172, 63 + playsewithpan SE_M_FLAME_WHEEL, 63 call EmberFireHit call EmberFireHit call EmberFireHit @@ -980,7 +980,7 @@ Move_MEGA_PUNCH:: @ 81C7CED delay 2 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 0, 16, 0 setalpha 12, 8 - playsewithpan SE_W025, 63 + playsewithpan SE_M_MEGA_KICK, 63 createsprite gMegaPunchKickSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 50 createvisualtask AnimTask_BlendSelected, 10, 4, 2, 0, 7, RGB_WHITE delay 50 @@ -989,7 +989,7 @@ Move_MEGA_PUNCH:: @ 81C7CED createvisualtask AnimTask_ShakeMon2, 2, 1, 4, 0, 22, 1 createvisualtask AnimTask_BlendSelected, 10, 4, 2, 0, 0, RGB_WHITE createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 1, 0, 8, 0, 0 - playsewithpan SE_W233B, 63 + playsewithpan SE_M_VITAL_THROW2, 63 waitforvisualfinish clearmonbg 1 blendoff @@ -1027,11 +1027,11 @@ Move_MEGA_KICK:: @ 81C7DC7 delay 2 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 0, 16, 0 setalpha 12, 8 - playsewithpan SE_W025, 63 + playsewithpan SE_M_MEGA_KICK, 63 createsprite gMegaPunchKickSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 50 createvisualtask AnimTask_BlendSelected, 10, 4, 2, 0, 7, RGB_WHITE delay 50 - playsewithpan SE_W025B, 63 + playsewithpan SE_M_MEGA_KICK2, 63 call SetImpactBackground createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 0 createvisualtask AnimTask_ShakeMon2, 2, 1, 4, 0, 22, 1 @@ -1054,7 +1054,7 @@ Move_COMET_PUNCH:: @ 81C7E63 CometPunchContinue:: @ 81C7E77 createvisualtask AnimTask_ShakeMon, 2, 1, 3, 0, 6, 1 - playsewithpan SE_W004, 63 + playsewithpan SE_M_COMET_PUNCH, 63 waitforvisualfinish clearmonbg 1 blendoff @@ -1087,7 +1087,7 @@ Move_SONIC_BOOM:: @ 81C7EDB end SonicBoomProjectile:: @ 81C7F12 - playsewithpan SE_W013B, 192 + playsewithpan SE_M_RAZOR_WIND2, 192 createsprite gSonicBoomSpriteTemplate, ANIM_TARGET, 2, 16, 0, 0, 0, 15 delay 4 return @@ -1104,7 +1104,7 @@ Move_THUNDER_SHOCK:: @ 81C7F3C waitforvisualfinish delay 10 createvisualtask AnimTask_ElectricBolt, 5, 0, -44, 0 - playsewithpan SE_W085, 63 + playsewithpan SE_M_THUNDERBOLT, 63 delay 9 createvisualtask AnimTask_BlendSelected, 10, 4, 0, 0, 13, RGB_BLACK waitforvisualfinish @@ -1126,13 +1126,13 @@ Move_THUNDERBOLT:: @ 81C7FAA waitforvisualfinish delay 10 createvisualtask AnimTask_ElectricBolt, 5, 24, -52, 0 - playsewithpan SE_W085, 63 + playsewithpan SE_M_THUNDERBOLT, 63 delay 7 createvisualtask AnimTask_ElectricBolt, 5, -24, -52, 0 - playsewithpan SE_W085, 63 + playsewithpan SE_M_THUNDERBOLT, 63 delay 7 createvisualtask AnimTask_ElectricBolt, 5, 0, -60, 1 - playsewithpan SE_W085, 63 + playsewithpan SE_M_THUNDERBOLT, 63 delay 9 createvisualtask AnimTask_BlendSelected, 10, 4, 0, 0, 13, RGB_BLACK waitforvisualfinish @@ -1148,7 +1148,7 @@ Move_THUNDERBOLT:: @ 81C7FAA createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0, 0, 16, 44, 96, 40, 1, -32765 createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0, 0, 16, 44, 160, 40, 0, -32765 createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0, 0, 16, 44, 224, 40, 2, -32765 - playsewithpan SE_W063, 63 + playsewithpan SE_M_HYPER_BEAM, 63 delay 0 createvisualtask AnimTask_BlendSelected, 10, 1, 0, 2, 2, RGB_BLACK delay 6 @@ -1159,7 +1159,7 @@ Move_THUNDERBOLT:: @ 81C7FAA createvisualtask AnimTask_BlendSelected, 10, 1, 0, 6, 6, RGB_BLACK waitforvisualfinish delay 20 - waitplaysewithpan SE_W085B, 63, 19 + waitplaysewithpan SE_M_THUNDERBOLT2, 63, 19 call ElectricityEffect waitforvisualfinish delay 20 @@ -1175,9 +1175,9 @@ Move_THUNDER_WAVE:: @ 81C8160 waitforvisualfinish delay 10 createvisualtask AnimTask_ElectricBolt, 5, 0, -48, 0 - playsewithpan SE_W086, 63 + playsewithpan SE_M_THUNDER_WAVE, 63 delay 20 - loopsewithpan SE_W085B, 63, 10, 4 + loopsewithpan SE_M_THUNDERBOLT2, 63, 10, 4 createsprite gThunderWaveSpriteTemplate, ANIM_TARGET, 2, -16, -16 delay 4 createsprite gThunderWaveSpriteTemplate, ANIM_TARGET, 2, -16, 0 @@ -1204,24 +1204,24 @@ BeatUpLeft:: @ 81C81E8 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, -20, -20, 1, 2 createsprite gFistFootSpriteTemplate, ANIM_TARGET, 3, -20, -12, 8, 1, 0 createvisualtask AnimTask_ShakeMon, 2, 1, 3, 0, 6, 1 - playsewithpan SE_W233B, 63 + playsewithpan SE_M_VITAL_THROW2, 63 delay 8 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 8, 0, 1, 2 createsprite gFistFootSpriteTemplate, ANIM_TARGET, 3, 8, 8, 8, 1, 0 createvisualtask AnimTask_ShakeMon, 2, 1, 3, 0, 6, 1 - playsewithpan SE_W233B, 63 + playsewithpan SE_M_VITAL_THROW2, 63 goto BeatUpContinue BeatUpRight:: @ 81C8259 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 12, -20, 1, 2 createsprite gFistFootSpriteTemplate, ANIM_TARGET, 3, 12, -12, 8, 1, 0 createvisualtask AnimTask_ShakeMon, 2, 1, 3, 0, 6, 1 - playsewithpan SE_W233B, 63 + playsewithpan SE_M_VITAL_THROW2, 63 delay 8 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, -12, 0, 1, 2 createsprite gFistFootSpriteTemplate, ANIM_TARGET, 3, -12, 8, 8, 1, 0 createvisualtask AnimTask_ShakeMon, 2, 1, 3, 0, 6, 1 - playsewithpan SE_W233B, 63 + playsewithpan SE_M_VITAL_THROW2, 63 goto BeatUpContinue Move_STOMP:: @ 81C82CA @@ -1229,19 +1229,19 @@ Move_STOMP:: @ 81C82CA loadspritegfx ANIM_TAG_IMPACT monbg 1 setalpha 12, 8 - playsewithpan SE_W104, 63 + playsewithpan SE_M_DOUBLE_TEAM, 63 createsprite gStompFootSpriteTemplate, ANIM_ATTACKER, 3, 0, -32, 15 delay 19 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, -8, 1, 1 createvisualtask AnimTask_ShakeMon, 2, 1, 0, 4, 9, 1 - playsewithpan SE_W025B, 63 + playsewithpan SE_M_MEGA_KICK2, 63 waitforvisualfinish clearmonbg 1 blendoff end Move_TAIL_WHIP:: @ 81C8311 - loopsewithpan SE_W039, 192, 24, 3 + loopsewithpan SE_M_TAIL_WHIP, 192, 24, 3 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, 0, 12, 4, 2, 3 waitforvisualfinish end @@ -1250,7 +1250,7 @@ Move_CUT:: @ 81C832A loadspritegfx ANIM_TAG_CUT monbg 1 setalpha 12, 8 - playsewithpan SE_W015, 63 + playsewithpan SE_M_CUT, 63 createsprite gCuttingSliceSpriteTemplate, ANIM_ATTACKER, 2, 40, -32, 0 delay 5 createvisualtask AnimTask_ShakeMon, 2, 1, 0, 3, 10, 1 @@ -1262,14 +1262,14 @@ Move_CUT:: @ 81C832A Move_HIDDEN_POWER:: @ 81C835C loadspritegfx ANIM_TAG_RED_ORB - playsewithpan SE_W036, 192 + playsewithpan SE_M_TAKE_DOWN, 192 createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 11, 0, 0 waitforvisualfinish delay 30 createvisualtask AnimTask_BlendMonInAndOut, 5, 0, 20479, 12, 5, 1 delay 4 createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 11, 0, 0 - playsewithpan SE_W179, 192 + playsewithpan SE_M_REVERSAL, 192 createsprite gHiddenPowerOrbSpriteTemplate, ANIM_ATTACKER, 2, 26, 0 createsprite gHiddenPowerOrbSpriteTemplate, ANIM_ATTACKER, 2, 26, 42 createsprite gHiddenPowerOrbSpriteTemplate, ANIM_ATTACKER, 2, 26, 84 @@ -1278,7 +1278,7 @@ Move_HIDDEN_POWER:: @ 81C835C createsprite gHiddenPowerOrbSpriteTemplate, ANIM_ATTACKER, 2, 26, 210 delay 52 setarg 7, 65535 - playsewithpan SE_W115, 192 + playsewithpan SE_M_REFLECT, 192 createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 11, 0, 0 createsprite gHiddenPowerOrbScatterSpriteTemplate, ANIM_TARGET, 2, 0 createsprite gHiddenPowerOrbScatterSpriteTemplate, ANIM_TARGET, 2, 32 @@ -1294,13 +1294,13 @@ Move_REVERSAL:: @ 81C8445 loadspritegfx ANIM_TAG_BLUE_ORB loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_IMPACT - playsewithpan SE_W197, 192 + playsewithpan SE_M_DETECT, 192 createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 3, RGB_WHITE, 8, 0, 0 waitforvisualfinish delay 30 createvisualtask AnimTask_CurseBlendEffect, 2, 31, 3, 2, 0, 10, RGB_WHITE delay 10 - playsewithpan SE_W179, 192 + playsewithpan SE_M_REVERSAL, 192 createsprite gReversalOrbSpriteTemplate, ANIM_ATTACKER, 2, 26, 0 createsprite gReversalOrbSpriteTemplate, ANIM_ATTACKER, 2, 26, 42 createsprite gReversalOrbSpriteTemplate, ANIM_ATTACKER, 2, 26, 84 @@ -1311,7 +1311,7 @@ Move_REVERSAL:: @ 81C8445 delay 20 createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 6, 4 delay 8 - playsewithpan SE_W233B, 63 + playsewithpan SE_M_VITAL_THROW2, 63 createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 1, RGB_WHITE, 8, 0, 0 createsprite gFistFootSpriteTemplate, ANIM_TARGET, 4, 0, 0, 10, 1, 0 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 1 @@ -1336,13 +1336,13 @@ PursuitContinue:: @ 81C8536 end PursuitNormal:: @ 81C853F - playsewithpan SE_W004, 63 + playsewithpan SE_M_COMET_PUNCH, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 2 createvisualtask AnimTask_ShakeTargetBasedOnMovePowerOrDmg, 5, 0, 1, 6, 1, 0 goto PursuitContinue PursuitOnSwitchout:: @ 81C8568 - playsewithpan SE_W004, 63 + playsewithpan SE_M_COMET_PUNCH, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 1 createvisualtask AnimTask_ShakeTargetBasedOnMovePowerOrDmg, 5, 0, 1, 6, 1, 0 goto PursuitContinue @@ -1355,7 +1355,7 @@ Move_SPIKE_CANNON:: @ 81C8591 setalpha 12, 8 createvisualtask AnimTask_WindUpLunge, 5, 0, -4, 0, 4, 6, 8, 4 waitforvisualfinish - loopsewithpan SE_W013B, 192, 5, 3 + loopsewithpan SE_M_RAZOR_WIND2, 192, 5, 3 createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 5 createsprite gLinearStingerSpriteTemplate, ANIM_ATTACKER, 2, 10, -8, -8, -8, 20 createsprite gLinearStingerSpriteTemplate, ANIM_ATTACKER, 2, 18, 0, 0, 0, 20 @@ -1365,7 +1365,7 @@ Move_SPIKE_CANNON:: @ 81C8591 createsprite gHandleInvertHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 2 createsprite gHandleInvertHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 8, 8, 1, 2 createvisualtask AnimTask_ShakeMon2, 2, 1, 3, 0, 7, 1 - loopsewithpan SE_W030, 63, 5, 3 + loopsewithpan SE_M_HORN_ATTACK, 63, 5, 3 waitforvisualfinish clearmonbg 1 blendoff @@ -1375,7 +1375,7 @@ Move_SWORDS_DANCE:: @ 81C8644 loadspritegfx ANIM_TAG_SWORD monbg ANIM_ATTACKER setalpha 12, 8 - playsewithpan SE_W014, 192 + playsewithpan SE_M_SWORDS_DANCE, 192 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, 0, 16, 6, 1, 4 createsprite gSwordsDanceBladeSpriteTemplate, ANIM_ATTACKER, 2, 0, 0 delay 22 @@ -1391,12 +1391,12 @@ Move_PSYCH_UP:: @ 81C868A monbg ANIM_ATK_PARTNER createvisualtask AnimTask_BlendColorCycleExclude, 2, 1, 2, 6, 1, 11, 0 setalpha 12, 8 - loopsewithpan SE_W060B, 192, 5, 10 + loopsewithpan SE_M_PSYBEAM2, 192, 5, 10 createsprite gPsychUpSpiralSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 0, 0 createvisualtask AnimTask_SwayMon, 5, 0, 5, 2560, 8, 0 delay 127 delay 4 - playsewithpan SE_W060, 192 + playsewithpan SE_M_PSYBEAM, 192 createvisualtask AnimTask_ScaleMonAndRestore, 5, -5, -5, 10, 0, 1 createvisualtask AnimTask_BlendSelected, 9, 2, 2, 10, 0, RGB(31, 31, 0) delay 30 @@ -1414,7 +1414,7 @@ Move_DIZZY_PUNCH:: @ 81C86FC call DizzyPunchLunge createsprite gFistFootSpriteTemplate, ANIM_TARGET, 5, 16, 8, 20, 1, 0 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 4, 16, 0, 1, 1 - playsewithpan SE_W004, 63 + playsewithpan SE_M_COMET_PUNCH, 63 createsprite gDizzyPunchDuckSpriteTemplate, ANIM_TARGET, 3, 16, 8, 160, -32 createsprite gDizzyPunchDuckSpriteTemplate, ANIM_TARGET, 3, 16, 8, -256, -40 createsprite gDizzyPunchDuckSpriteTemplate, ANIM_TARGET, 3, 16, 8, 128, -16 @@ -1425,7 +1425,7 @@ Move_DIZZY_PUNCH:: @ 81C86FC call DizzyPunchLunge createsprite gFistFootSpriteTemplate, ANIM_TARGET, 5, -16, -8, 20, 1, 0 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 4, -16, -16, 1, 1 - playsewithpan SE_W233B, 63 + playsewithpan SE_M_VITAL_THROW2, 63 createsprite gDizzyPunchDuckSpriteTemplate, ANIM_TARGET, 3, -16, -8, 160, -32 createsprite gDizzyPunchDuckSpriteTemplate, ANIM_TARGET, 3, -16, -8, -256, -40 createsprite gDizzyPunchDuckSpriteTemplate, ANIM_TARGET, 3, -16, -8, 128, -16 @@ -1445,7 +1445,7 @@ DizzyPunchLunge:: @ 81C8817 Move_FIRE_SPIN:: @ 81C8836 loadspritegfx ANIM_TAG_SMALL_EMBER - playsewithpan SE_W221B, 63 + playsewithpan SE_M_SACRED_FIRE2, 63 createvisualtask AnimTask_ShakeMon, 5, 1, 0, 2, 47, 1 call FireSpinEffect call FireSpinEffect @@ -1472,7 +1472,7 @@ Move_FURY_CUTTER:: @ 81C88EA loadspritegfx ANIM_TAG_CUT monbg 1 setalpha 12, 8 - playsewithpan SE_W013, 63 + playsewithpan SE_M_RAZOR_WIND, 63 createvisualtask AnimTask_IsFuryCutterHitRight, 2, jumpargeq 7, 0, FuryCutterLeft goto FuryCutterRight @@ -1528,19 +1528,19 @@ Move_SELF_DESTRUCT:: @ 81C89B9 end SelfDestructExplode:: @ 81C8A3F - playsewithpan SE_W120, 192 + playsewithpan SE_M_SELF_DESTRUCT, 192 createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 1 delay 6 - playsewithpan SE_W120, 192 + playsewithpan SE_M_SELF_DESTRUCT, 192 createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 24, -24, 0, 1 delay 6 - playsewithpan SE_W120, 192 + playsewithpan SE_M_SELF_DESTRUCT, 192 createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, -16, 16, 0, 1 delay 6 - playsewithpan SE_W120, 192 + playsewithpan SE_M_SELF_DESTRUCT, 192 createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, -24, -12, 0, 1 delay 6 - playsewithpan SE_W120, 192 + playsewithpan SE_M_SELF_DESTRUCT, 192 createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 16, 16, 0, 1 delay 6 return @@ -1550,12 +1550,12 @@ Move_SLAM:: @ 81C8AA9 loadspritegfx ANIM_TAG_IMPACT monbg 1 setalpha 12, 8 - playsewithpan SE_W004, 192 + playsewithpan SE_M_COMET_PUNCH, 192 createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, 3, 0, 4 delay 1 createsprite gSlamHitSpriteTemplate, ANIM_ATTACKER, 2, 0, 0 delay 3 - playsewithpan SE_W025B, 63 + playsewithpan SE_M_MEGA_KICK2, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 1 createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 1, -12, 10, 0, 3 createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 5 @@ -1571,10 +1571,10 @@ Move_SLAM:: @ 81C8AA9 Move_VINE_WHIP:: @ 81C8B31 loadspritegfx ANIM_TAG_WHIP_HIT - playsewithpan SE_W026, 192 + playsewithpan SE_M_JUMP_KICK, 192 createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 6 delay 6 - playsewithpan SE_W010, 63 + playsewithpan SE_M_SCRATCH, 63 createsprite gVineWhipSpriteTemplate, ANIM_TARGET, 2, 0, 0 delay 6 createvisualtask AnimTask_ShakeMon2, 2, 1, 2, 0, 6, 1 @@ -1584,12 +1584,12 @@ Move_DRILL_PECK:: @ 81C8B68 loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_WHIRLWIND_LINES createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 0 - playsewithpan SE_W029, 192 + playsewithpan SE_M_HEADBUTT, 192 waitforvisualfinish delay 2 createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 1 delay 2 - loopsewithpan SE_W030, 63, 4, 8 + loopsewithpan SE_M_HORN_ATTACK, 63, 4, 8 createvisualtask AnimTask_DrillPeckHitSplats, 5 createvisualtask AnimTask_ShakeMon2, 2, 1, 4, 0, 18, 1 waitforvisualfinish @@ -1607,28 +1607,28 @@ Move_WATERFALL:: @ 81C8BC1 setalpha 12, 8 createvisualtask AnimTask_ShakeMon, 5, 0, 0, 2, 23, 1 delay 5 - playsewithpan SE_W152, 192 + playsewithpan SE_M_CRABHAMMER, 192 createsprite gSmallBubblePairSpriteTemplate, ANIM_ATTACKER, 2, 10, 10, 25, 0 delay 4 - playsewithpan SE_W152, 192 + playsewithpan SE_M_CRABHAMMER, 192 createsprite gSmallBubblePairSpriteTemplate, ANIM_ATTACKER, 2, -15, 0, 25, 0 delay 4 - playsewithpan SE_W152, 192 + playsewithpan SE_M_CRABHAMMER, 192 createsprite gSmallBubblePairSpriteTemplate, ANIM_ATTACKER, 2, 20, 10, 25, 0 delay 4 - playsewithpan SE_W152, 192 + playsewithpan SE_M_CRABHAMMER, 192 createsprite gSmallBubblePairSpriteTemplate, ANIM_ATTACKER, 2, 0, -10, 25, 0 delay 4 - playsewithpan SE_W152, 192 + playsewithpan SE_M_CRABHAMMER, 192 createsprite gSmallBubblePairSpriteTemplate, ANIM_ATTACKER, 2, -10, 15, 25, 0 delay 4 - playsewithpan SE_W152, 192 + playsewithpan SE_M_CRABHAMMER, 192 createsprite gSmallBubblePairSpriteTemplate, ANIM_ATTACKER, 2, 25, 20, 25, 0 delay 4 - playsewithpan SE_W152, 192 + playsewithpan SE_M_CRABHAMMER, 192 createsprite gSmallBubblePairSpriteTemplate, ANIM_ATTACKER, 2, -20, 20, 25, 0 delay 4 - playsewithpan SE_W152, 192 + playsewithpan SE_M_CRABHAMMER, 192 createsprite gSmallBubblePairSpriteTemplate, ANIM_ATTACKER, 2, 12, 0, 25, 0 waitforvisualfinish delay 10 @@ -1641,7 +1641,7 @@ Move_WATERFALL:: @ 81C8BC1 end RisingWaterHitEffect:: @ 81C8CA2 - playsewithpan SE_W127, 63 + playsewithpan SE_M_WATERFALL, 63 createvisualtask AnimTask_ShakeMon2, 5, 1, 4, 0, 17, 1 createsprite gWaterHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 20, 1, 1 createsprite gSmallDriftingBubblesSpriteTemplate, ANIM_ATTACKER, 4, 0, 20 @@ -1697,26 +1697,26 @@ Move_EXPLOSION:: @ 81C8E15 end Explosion1:: @ 81C8EB2 - playsewithpan SE_W153, 192 + playsewithpan SE_M_EXPLOSION, 192 createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 1 delay 6 - playsewithpan SE_W153, 192 + playsewithpan SE_M_EXPLOSION, 192 createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 24, -24, 0, 1 delay 6 - playsewithpan SE_W153, 192 + playsewithpan SE_M_EXPLOSION, 192 createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, -16, 16, 0, 1 delay 6 - playsewithpan SE_W153, 192 + playsewithpan SE_M_EXPLOSION, 192 createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, -24, -12, 0, 1 delay 6 - playsewithpan SE_W153, 192 + playsewithpan SE_M_EXPLOSION, 192 createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 16, 16, 0, 1 delay 6 return Move_DEFENSE_CURL:: @ 81C8F1C loadspritegfx ANIM_TAG_ECLIPSING_ORB - loopsewithpan SE_W161, 192, 18, 3 + loopsewithpan SE_M_TRI_ATTACK, 192, 18, 3 createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, 0, 0 createvisualtask AnimTask_DefenseCurlDeformMon, 5, waitforvisualfinish @@ -1730,7 +1730,7 @@ Move_PROTECT:: @ 81C8F55 loadspritegfx ANIM_TAG_PROTECT monbg ANIM_ATK_PARTNER monbgprio_28 0 - waitplaysewithpan SE_W115, 192, 16 + waitplaysewithpan SE_M_REFLECT, 192, 16 createsprite gProtectWallSpriteTemplate, ANIM_ATTACKER, 2, 24, 0, 90 waitforvisualfinish clearmonbg ANIM_ATK_PARTNER @@ -1742,7 +1742,7 @@ Move_DETECT:: @ 81C8F72 waitforvisualfinish createvisualtask AnimTask_BlendSelected, 10, 2, 1, 0, 9, RGB_WHITE delay 18 - playsewithpan SE_W197, 192 + playsewithpan SE_M_DETECT, 192 createsprite gSpriteTemplate_83BF480, ANIM_ATTACKER, 13, 20, -20 waitforvisualfinish delay 10 @@ -1768,15 +1768,15 @@ Frustration_Continue:: @ 81C8FFF end Frustration_Strongest:: @ 81C9004 - playsewithpan SE_W082, 192 + playsewithpan SE_M_DRAGON_RAGE, 192 createvisualtask AnimTask_ShakeMon2, 5, 0, 1, 0, 15, 1 createvisualtask AnimTask_BlendSelected, 10, 2, 3, 0, 9, RGB(31, 0, 0) waitforvisualfinish delay 20 - playsewithpan SE_W207B, 192 + playsewithpan SE_M_SWAGGER2, 192 createsprite gAngerMarkSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, -28 waitforvisualfinish - playsewithpan SE_W207B, 192 + playsewithpan SE_M_SWAGGER2, 192 createsprite gAngerMarkSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, -28 waitforvisualfinish delay 10 @@ -1784,47 +1784,47 @@ Frustration_Strongest:: @ 81C9004 delay 5 createvisualtask AnimTask_ShakeMon2, 5, 1, 4, 0, 30, 1 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 0 - playsewithpan SE_W004, 63 + playsewithpan SE_M_COMET_PUNCH, 63 delay 5 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 24, 8, 1, 0 - playsewithpan SE_W004, 63 + playsewithpan SE_M_COMET_PUNCH, 63 delay 5 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, -24, -16, 1, 0 - playsewithpan SE_W004, 63 + playsewithpan SE_M_COMET_PUNCH, 63 delay 5 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 8, 4, 1, 0 - playsewithpan SE_W004, 63 + playsewithpan SE_M_COMET_PUNCH, 63 delay 5 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, -16, 19, 1, 0 - playsewithpan SE_W004, 63 + playsewithpan SE_M_COMET_PUNCH, 63 delay 5 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 18, -18, 1, 0 - playsewithpan SE_W004, 63 + playsewithpan SE_M_COMET_PUNCH, 63 waitforvisualfinish createvisualtask AnimTask_BlendSelected, 10, 2, 3, 9, 0, RGB(31, 0, 0) goto Frustration_Continue Frustration_Strong:: @ 81C910A - playsewithpan SE_W082, 192 + playsewithpan SE_M_DRAGON_RAGE, 192 createvisualtask AnimTask_ShakeMon2, 5, 0, 1, 0, 15, 1 createvisualtask AnimTask_BlendSelected, 10, 2, 3, 0, 9, RGB(31, 0, 0) waitforvisualfinish delay 20 - playsewithpan SE_W207B, 192 + playsewithpan SE_M_SWAGGER2, 192 createsprite gAngerMarkSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, -28 waitforvisualfinish delay 5 createvisualtask AnimTask_StrongFrustrationGrowAndShrink, 5, delay 7 - playsewithpan SE_W004, 63 + playsewithpan SE_M_COMET_PUNCH, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 8, 1, 1 createvisualtask AnimTask_ShakeMon2, 5, 1, 4, 0, 6, 1 delay 14 - playsewithpan SE_W004, 63 + playsewithpan SE_M_COMET_PUNCH, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 12, -6, 1, 1 createvisualtask AnimTask_ShakeMon2, 5, 1, 4, 0, 6, 1 delay 14 - playsewithpan SE_W004, 63 + playsewithpan SE_M_COMET_PUNCH, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, -12, -6, 1, 1 createvisualtask AnimTask_ShakeMon2, 5, 1, 4, 0, 6, 1 waitforvisualfinish @@ -1832,19 +1832,19 @@ Frustration_Strong:: @ 81C910A goto Frustration_Continue Frustration_Medium:: @ 81C91D7 - playsewithpan SE_W207B, 192 + playsewithpan SE_M_SWAGGER2, 192 createsprite gAngerMarkSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, -28 waitforvisualfinish delay 5 createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 4 delay 6 - playsewithpan SE_W004, 63 + playsewithpan SE_M_COMET_PUNCH, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 10, 4, 1, 1 createvisualtask AnimTask_ShakeMon2, 2, 1, 3, 0, 6, 1 waitforvisualfinish createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 4 delay 6 - playsewithpan SE_W004, 63 + playsewithpan SE_M_COMET_PUNCH, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -10, -4, 1, 2 createvisualtask AnimTask_ShakeMon2, 2, 1, 3, 0, 6, 1 goto Frustration_Continue @@ -1855,7 +1855,7 @@ Frustration_Weak:: @ 81C9253 delay 10 createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 10, 2 delay 12 - playsewithpan SE_W004, 63 + playsewithpan SE_M_COMET_PUNCH, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon2, 2, 1, 1, 0, 6, 1 goto Frustration_Continue @@ -1864,14 +1864,14 @@ Move_SAFEGUARD:: @ 81C9297 loadspritegfx ANIM_TAG_GUARD_RING monbg ANIM_ATK_PARTNER setalpha 8, 8 - playsewithpan SE_W208, 192 + playsewithpan SE_M_MILK_DRINK, 192 createsprite gGuardRingSpriteTemplate, ANIM_ATTACKER, 2, delay 4 createsprite gGuardRingSpriteTemplate, ANIM_ATTACKER, 2, delay 4 createsprite gGuardRingSpriteTemplate, ANIM_ATTACKER, 2, waitforvisualfinish - playsewithpan SE_REAPOKE, 192 + playsewithpan SE_SHINY, 192 createvisualtask AnimTask_CurseBlendEffect, 2, 10, 0, 2, 0, 10, RGB_WHITE waitforvisualfinish clearmonbg ANIM_ATK_PARTNER @@ -1883,21 +1883,21 @@ Move_PAIN_SPLIT:: @ 81C92D9 createsprite gPainSplitProjectileSpriteTemplate, ANIM_ATTACKER, 2, -8, -42, 0 createsprite gPainSplitProjectileSpriteTemplate, ANIM_TARGET, 2, -8, -42, 1 delay 10 - playsewithpan SE_W207B, 0 + playsewithpan SE_M_SWAGGER2, 0 createvisualtask AnimTask_PainSplitMovement, 2, 0, 0 createvisualtask AnimTask_PainSplitMovement, 2, 1, 0 waitforvisualfinish createsprite gPainSplitProjectileSpriteTemplate, ANIM_ATTACKER, 2, -24, -42, 0 createsprite gPainSplitProjectileSpriteTemplate, ANIM_TARGET, 2, -24, -42, 1 delay 10 - playsewithpan SE_W207B, 0 + playsewithpan SE_M_SWAGGER2, 0 createvisualtask AnimTask_PainSplitMovement, 2, 0, 1 createvisualtask AnimTask_PainSplitMovement, 2, 1, 1 waitforvisualfinish createsprite gPainSplitProjectileSpriteTemplate, ANIM_ATTACKER, 2, 8, -42, 0 createsprite gPainSplitProjectileSpriteTemplate, ANIM_TARGET, 2, 8, -42, 1 delay 10 - playsewithpan SE_W207B, 0 + playsewithpan SE_M_SWAGGER2, 0 createvisualtask AnimTask_PainSplitMovement, 2, 0, 2 createvisualtask AnimTask_PainSplitMovement, 2, 1, 2 end @@ -1907,7 +1907,7 @@ Move_VICE_GRIP:: @ 81C9381 loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W011, 63 + playsewithpan SE_M_VICEGRIP, 63 createsprite gViceGripSpriteTemplate, ANIM_ATTACKER, 2, 0 createsprite gViceGripSpriteTemplate, ANIM_ATTACKER, 2, 1 delay 9 @@ -1925,7 +1925,7 @@ Move_GUILLOTINE:: @ 81C93C9 setalpha 12, 8 fadetobgfromset 12, 13, 14 waitbgfadein - playsewithpan SE_W011, 63 + playsewithpan SE_M_VICEGRIP, 63 createsprite gGuillotineSpriteTemplate, ANIM_ATTACKER, 2, 0 createsprite gGuillotineSpriteTemplate, ANIM_ATTACKER, 2, 1 createvisualtask AnimTask_BlendSelected, 10, 4, 2, 0, 16, RGB_BLACK @@ -1935,7 +1935,7 @@ Move_GUILLOTINE:: @ 81C93C9 createvisualtask AnimTask_ShakeMon2, 5, 1, 4, 0, 8, 1 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 0 createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 1, 0, 8, 0, 0 - playsewithpan SE_W013, 63 + playsewithpan SE_M_RAZOR_WIND, 63 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -1949,10 +1949,10 @@ Move_PAY_DAY:: @ 81C9455 monbg 1 monbgprio_28 1 setalpha 12, 8 - playsewithpan SE_W013B, 192 + playsewithpan SE_M_RAZOR_WIND2, 192 createsprite gCoinThrowSpriteTemplate, ANIM_ATTACKER, 2, 20, 0, 0, 0, 1152 waitforvisualfinish - playsewithpan SE_W006, 63 + playsewithpan SE_M_PAY_DAY, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 1, 0, 0, 1, 2 createsprite gFallingCoinSpriteTemplate, ANIM_ATTACKER, 2, createvisualtask AnimTask_ShakeMon2, 2, 1, 1, 0, 6, 1 @@ -1963,7 +1963,7 @@ Move_PAY_DAY:: @ 81C9455 Move_OUTRAGE:: @ 81C94A8 loadspritegfx ANIM_TAG_SMALL_EMBER - loopsewithpan SE_W082, 192, 8, 3 + loopsewithpan SE_M_DRAGON_RAGE, 192, 8, 3 createvisualtask AnimTask_CurseBlendEffect, 2, 7, 2, 5, 3, 8, 430 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, 0, 12, 6, 5, 4 delay 0 @@ -2012,7 +2012,7 @@ Move_SPARK:: @ 81C9643 loadspritegfx ANIM_TAG_SPARK_2 delay 0 createvisualtask AnimTask_CurseBlendEffect, 2, 3, -31, 1, 5, 5, 23551 - playsewithpan SE_W085B, 192 + playsewithpan SE_M_THUNDERBOLT2, 192 createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 32, 24, 190, 12, 0, 1, 0 delay 0 createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 80, 24, 22, 12, 0, 1, 0 @@ -2021,7 +2021,7 @@ Move_SPARK:: @ 81C9643 createvisualtask AnimTask_CurseBlendEffect, 2, 3, -31, 1, 0, 0, 23551 delay 10 createvisualtask AnimTask_CurseBlendEffect, 2, 3, -31, 1, 5, 5, 23551 - playsewithpan SE_W085B, 192 + playsewithpan SE_M_THUNDERBOLT2, 192 createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 100, 24, 60, 10, 0, 1, 0 createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 170, 24, 42, 11, 0, 1, 1 delay 0 @@ -2030,7 +2030,7 @@ Move_SPARK:: @ 81C9643 createvisualtask AnimTask_CurseBlendEffect, 2, 3, -31, 1, 0, 0, 23551 delay 20 createvisualtask AnimTask_CurseBlendEffect, 2, 3, -31, 1, 7, 7, 23551 - playsewithpan SE_W085B, 192 + playsewithpan SE_M_THUNDERBOLT2, 192 createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 4, 0, 0, 32, 12, 0, 20, 0, 0 createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 4, 0, 0, 32, 12, 64, 20, 1, 0 createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 4, 0, 0, 32, 12, 128, 20, 0, 0 @@ -2044,7 +2044,7 @@ Move_SPARK:: @ 81C9643 createvisualtask AnimTask_CurseBlendEffect, 2, 3, -31, 1, 0, 0, 23551 createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 4 delay 4 - playsewithpan SE_W063, 63 + playsewithpan SE_M_HYPER_BEAM, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon, 2, 1, 3, 0, 6, 1 waitforvisualfinish @@ -2055,12 +2055,12 @@ Move_SPARK:: @ 81C9643 Move_ATTRACT:: @ 81C985A loadspritegfx ANIM_TAG_RED_HEART - loopsewithpan SE_W204, 192, 12, 3 + loopsewithpan SE_M_CHARM, 192, 12, 3 createvisualtask AnimTask_SwayMon, 5, 0, 12, 4096, 4, 0 delay 15 createsprite gRedHeartProjectileSpriteTemplate, ANIM_TARGET, 3, 20, -8 waitforvisualfinish - playsewithpan SE_W213, 63 + playsewithpan SE_M_ATTRACT, 63 createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, 160, -32 createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, -256, -40 createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, 128, -16 @@ -2068,7 +2068,7 @@ Move_ATTRACT:: @ 81C985A createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, -128, -22 createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, -384, -31 waitforvisualfinish - waitplaysewithpan SE_W213B, 0, 15 + waitplaysewithpan SE_M_ATTRACT2, 0, 15 createvisualtask AnimTask_HeartsBackground, 5, createsprite gRedHeartRisingSpriteTemplate, ANIM_ATTACKER, 40, 16, 256, 0 createsprite gRedHeartRisingSpriteTemplate, ANIM_ATTACKER, 40, 224, 240, 15 @@ -2091,7 +2091,7 @@ Move_GROWTH:: @ 81C9953 GrowthEffect:: @ 81C9960 createvisualtask AnimTask_CurseBlendEffect, 2, 2, 0, 2, 0, 8, RGB_WHITE - playsewithpan SE_W036, 192 + playsewithpan SE_M_TAKE_DOWN, 192 createvisualtask AnimTask_ScaleMonAndRestore, 5, -3, -3, 16, 0, 0 return @@ -2104,12 +2104,12 @@ Move_WHIRLWIND:: @ 81C9989 createsprite gWhirlwindLineSpriteTemplate, ANIM_ATTACKER, 2, 0, 24, 1, 60, 4 createsprite gWhirlwindLineSpriteTemplate, ANIM_ATTACKER, 2, 0, 32, 1, 60, 0 delay 5 - loopsewithpan SE_W104, 63, 10, 4 + loopsewithpan SE_M_DOUBLE_TEAM, 63, 10, 4 createvisualtask AnimTask_ShakeMon2, 2, 1, 4, 0, 15, 1 delay 29 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, 1, 12, 6, 1, 5 delay 7 - playsewithpan SE_W081, 63 + playsewithpan SE_M_STRING_SHOT, 63 createvisualtask AnimTask_SlideOffScreen, 5, 1, 8 waitforvisualfinish end @@ -2124,7 +2124,7 @@ Move_CONFUSE_RAY:: @ 81C9A31 createsprite gConfuseRayBallBounceSpriteTemplate, ANIM_TARGET, 2, 28, 0, 288 waitforvisualfinish setalpha 8, 8 - playsewithpan SE_W081B, 63 + playsewithpan SE_M_STRING_SHOT2, 63 createsprite gConfuseRayBallSpiralSpriteTemplate, ANIM_TARGET, 2, 0, -16 waitforvisualfinish delay 0 @@ -2149,10 +2149,10 @@ Move_LOCK_ON:: @ 81C9A84 Move_MEAN_LOOK:: @ 81C9ABA loadspritegfx ANIM_TAG_EYE monbg ANIM_DEF_PARTNER - playsewithpan SE_W060, 192 + playsewithpan SE_M_PSYBEAM, 192 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 0, 16, 0 - loopsewithpan SE_W109, 63, 15, 4 - waitplaysewithpan SE_W043, 63, 85 + loopsewithpan SE_M_CONFUSE_RAY, 63, 15, 4 + waitplaysewithpan SE_M_LEER, 63, 85 createsprite gMeanLookEyeSpriteTemplate, ANIM_ATTACKER, 2, delay 120 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 16, 0, 0 @@ -2165,20 +2165,20 @@ Move_ROCK_THROW:: @ 81C9AFF loadspritegfx ANIM_TAG_ROCKS createsprite gShakeMonOrTerrainSpriteTemplate, ANIM_TARGET, 2, 6, 1, 15, 1 createsprite gFallingRockSpriteTemplate, ANIM_TARGET, 2, 0, 1, 0, 0 - playsewithpan SE_W088, 63 + playsewithpan SE_M_ROCK_THROW, 63 delay 6 createsprite gFallingRockSpriteTemplate, ANIM_TARGET, 2, 19, 1, 10, 0 - playsewithpan SE_W088, 63 + playsewithpan SE_M_ROCK_THROW, 63 delay 6 createsprite gFallingRockSpriteTemplate, ANIM_TARGET, 2, -23, 2, -10, 0 - playsewithpan SE_W088, 63 + playsewithpan SE_M_ROCK_THROW, 63 createvisualtask AnimTask_ShakeMon, 2, 1, 0, 5, 20, 1 delay 6 createsprite gFallingRockSpriteTemplate, ANIM_TARGET, 2, -15, 1, -10, 0 - playsewithpan SE_W088, 63 + playsewithpan SE_M_ROCK_THROW, 63 delay 6 createsprite gFallingRockSpriteTemplate, ANIM_TARGET, 2, 23, 2, 10, 0 - playsewithpan SE_W088, 63 + playsewithpan SE_M_ROCK_THROW, 63 waitforvisualfinish end @@ -2187,16 +2187,16 @@ Move_ROCK_SLIDE:: @ 81C9B8B monbg ANIM_DEF_PARTNER createsprite gShakeMonOrTerrainSpriteTemplate, ANIM_ATTACKER, 2, 7, 1, 11, 1 createsprite gFallingRockSpriteTemplate, ANIM_TARGET, 2, -5, 1, -5, 1 - playsewithpan SE_W088, 63 + playsewithpan SE_M_ROCK_THROW, 63 delay 2 createsprite gFallingRockSpriteTemplate, ANIM_TARGET, 2, 5, 0, 6, 1 - playsewithpan SE_W088, 63 + playsewithpan SE_M_ROCK_THROW, 63 delay 2 createsprite gFallingRockSpriteTemplate, ANIM_TARGET, 2, 19, 1, 10, 1 - playsewithpan SE_W088, 63 + playsewithpan SE_M_ROCK_THROW, 63 delay 2 createsprite gFallingRockSpriteTemplate, ANIM_TARGET, 2, -23, 2, -10, 1 - playsewithpan SE_W088, 63 + playsewithpan SE_M_ROCK_THROW, 63 createvisualtask AnimTask_ShakeMon, 2, 1, 0, 5, 50, 1 createvisualtask AnimTask_ShakeMon, 2, 3, 0, 5, 50, 1 delay 2 @@ -2208,28 +2208,28 @@ Move_ROCK_SLIDE:: @ 81C9B8B RockSlideRocks:: @ 81C9C23 createsprite gFallingRockSpriteTemplate, ANIM_TARGET, 2, -20, 0, -10, 1 - playsewithpan SE_W088, 63 + playsewithpan SE_M_ROCK_THROW, 63 delay 2 createsprite gFallingRockSpriteTemplate, ANIM_TARGET, 2, 28, 1, 10, 1 - playsewithpan SE_W088, 63 + playsewithpan SE_M_ROCK_THROW, 63 delay 2 createsprite gFallingRockSpriteTemplate, ANIM_TARGET, 2, -10, 1, -5, 1 - playsewithpan SE_W088, 63 + playsewithpan SE_M_ROCK_THROW, 63 delay 2 createsprite gFallingRockSpriteTemplate, ANIM_TARGET, 2, 10, 0, 6, 1 - playsewithpan SE_W088, 63 + playsewithpan SE_M_ROCK_THROW, 63 delay 2 createsprite gFallingRockSpriteTemplate, ANIM_TARGET, 2, 24, 1, 10, 1 - playsewithpan SE_W088, 63 + playsewithpan SE_M_ROCK_THROW, 63 delay 2 createsprite gFallingRockSpriteTemplate, ANIM_TARGET, 2, -32, 2, -10, 1 - playsewithpan SE_W088, 63 + playsewithpan SE_M_ROCK_THROW, 63 delay 2 createsprite gFallingRockSpriteTemplate, ANIM_TARGET, 2, -20, 0, -10, 1 - playsewithpan SE_W088, 63 + playsewithpan SE_M_ROCK_THROW, 63 delay 2 createsprite gFallingRockSpriteTemplate, ANIM_TARGET, 2, 30, 2, 10, 1 - playsewithpan SE_W088, 63 + playsewithpan SE_M_ROCK_THROW, 63 delay 2 return @@ -2242,7 +2242,7 @@ Move_THIEF:: @ 81C9CCC setalpha 12, 8 createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 6, 4 delay 6 - playsewithpan SE_W233, 63 + playsewithpan SE_M_VITAL_THROW, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon2, 2, 1, 1, 0, 8, 1 waitforvisualfinish @@ -2273,22 +2273,22 @@ Move_BUBBLE_BEAM:: @ 81C9D13 BulbblebeamCreateBubbles:: @ 81C9D4D createsprite gWaterBubbleProjectileSpriteTemplate, ANIM_ATTACKER, 2, 18, 0, 35, 70, 0, 256, 50 - playsewithpan SE_W145, 192 + playsewithpan SE_M_BUBBLE, 192 delay 3 createsprite gWaterBubbleProjectileSpriteTemplate, ANIM_ATTACKER, 2, 18, 0, 20, 40, -10, 256, 50 - playsewithpan SE_W145, 192 + playsewithpan SE_M_BUBBLE, 192 delay 3 createsprite gWaterBubbleProjectileSpriteTemplate, ANIM_ATTACKER, 2, 18, 0, 10, -60, 0, 256, 50 - playsewithpan SE_W145, 192 + playsewithpan SE_M_BUBBLE, 192 delay 3 createsprite gWaterBubbleProjectileSpriteTemplate, ANIM_ATTACKER, 2, 18, 0, 15, -15, 10, 256, 50 - playsewithpan SE_W145, 192 + playsewithpan SE_M_BUBBLE, 192 delay 3 createsprite gWaterBubbleProjectileSpriteTemplate, ANIM_ATTACKER, 2, 18, 0, 30, 10, -10, 256, 50 - playsewithpan SE_W145, 192 + playsewithpan SE_M_BUBBLE, 192 delay 3 createsprite gWaterBubbleProjectileSpriteTemplate, ANIM_ATTACKER, 2, 18, 0, 25, -30, 10, 256, 50 - playsewithpan SE_W145, 192 + playsewithpan SE_M_BUBBLE, 192 delay 3 return @@ -2299,14 +2299,14 @@ Move_ICY_WIND:: @ 81C9DF0 createvisualtask AnimTask_BlendSelected, 10, 11, 4, 0, 4, RGB_BLACK fadetobg 15 waitbgfadeout - playsewithpan SE_W196, 0 + playsewithpan SE_M_ICY_WIND, 0 waitbgfadein waitforvisualfinish - panse_1B SE_W016, 192, 63, 2, 0 + panse_1B SE_M_GUST, 192, 63, 2, 0 call IcyWindSwirlingSnowballs delay 5 call IcyWindSwirlingSnowballs - playsewithpan SE_W016B, 63 + playsewithpan SE_M_GUST2, 63 delay 55 call IceSpikesEffectLong waitforvisualfinish @@ -2332,12 +2332,12 @@ IcyWindSwirlingSnowballs:: @ 81C9E48 Move_SMOKESCREEN:: @ 81C9EB0 loadspritegfx ANIM_TAG_BLACK_SMOKE loadspritegfx ANIM_TAG_BLACK_BALL - playsewithpan SE_W104, 192 + playsewithpan SE_M_DOUBLE_TEAM, 192 createsprite gBlackBallSpriteTemplate, ANIM_TARGET, 2, 20, 0, 0, 0, 35, -25 waitforvisualfinish createvisualtask AnimTask_SmokescreenImpact, 2, delay 2 - playsewithpan SE_W028, 63 + playsewithpan SE_M_SAND_ATTACK, 63 createsprite gBlackSmokeSpriteTemplate, ANIM_TARGET, 4, 0, -12, 104, 0, 75 createsprite gBlackSmokeSpriteTemplate, ANIM_TARGET, 4, 0, -12, 72, 1, 75 createsprite gBlackSmokeSpriteTemplate, ANIM_TARGET, 4, 0, -6, 56, 1, 75 @@ -2359,7 +2359,7 @@ Move_CONVERSION:: @ 81C9FA9 monbgprio_28 0 setalpha 16, 0 delay 0 - playsewithpan SE_W129, 192 + playsewithpan SE_M_SWIFT, 192 createsprite gConversionSpriteTemplate, ANIM_ATTACKER, 2, -24, -24 delay 3 createsprite gConversionSpriteTemplate, ANIM_ATTACKER, 2, -8, -24 @@ -2368,7 +2368,7 @@ Move_CONVERSION:: @ 81C9FA9 delay 3 createsprite gConversionSpriteTemplate, ANIM_ATTACKER, 2, 24, -24 delay 3 - playsewithpan SE_W129, 192 + playsewithpan SE_M_SWIFT, 192 createsprite gConversionSpriteTemplate, ANIM_ATTACKER, 2, -24, -8 delay 3 createsprite gConversionSpriteTemplate, ANIM_ATTACKER, 2, -8, -8 @@ -2377,7 +2377,7 @@ Move_CONVERSION:: @ 81C9FA9 delay 3 createsprite gConversionSpriteTemplate, ANIM_ATTACKER, 2, 24, -8 delay 3 - playsewithpan SE_W129, 192 + playsewithpan SE_M_SWIFT, 192 createsprite gConversionSpriteTemplate, ANIM_ATTACKER, 2, -24, 8 delay 3 createsprite gConversionSpriteTemplate, ANIM_ATTACKER, 2, -8, 8 @@ -2386,7 +2386,7 @@ Move_CONVERSION:: @ 81C9FA9 delay 3 createsprite gConversionSpriteTemplate, ANIM_ATTACKER, 2, 24, 8 delay 3 - playsewithpan SE_W129, 192 + playsewithpan SE_M_SWIFT, 192 createsprite gConversionSpriteTemplate, ANIM_ATTACKER, 2, -24, 24 delay 3 createsprite gConversionSpriteTemplate, ANIM_ATTACKER, 2, -8, 24 @@ -2395,7 +2395,7 @@ Move_CONVERSION:: @ 81C9FA9 delay 3 createsprite gConversionSpriteTemplate, ANIM_ATTACKER, 2, 24, 24 delay 20 - playsewithpan SE_W112, 192 + playsewithpan SE_M_BARRIER, 192 createvisualtask AnimTask_FlashAnimTagWithColor, 2, 10018, 1, 1, 14335, 12, 0, 0 delay 6 createvisualtask AnimTask_ConversionAlphaBlend, 5, @@ -2411,7 +2411,7 @@ Move_CONVERSION_2:: @ 81CA0BE monbgprio_2A 1 setalpha 0, 16 delay 0 - playsewithpan SE_W112, 63 + playsewithpan SE_M_BARRIER, 63 createsprite gConversion2SpriteTemplate, ANIM_ATTACKER, 2, -24, -24, 60 createsprite gConversion2SpriteTemplate, ANIM_ATTACKER, 2, -8, -24, 65 createsprite gConversion2SpriteTemplate, ANIM_ATTACKER, 2, 8, -24, 70 @@ -2430,21 +2430,21 @@ Move_CONVERSION_2:: @ 81CA0BE createsprite gConversion2SpriteTemplate, ANIM_ATTACKER, 2, 24, 24, 135 createvisualtask AnimTask_Conversion2AlphaBlend, 5, delay 60 - playsewithpan SE_W129, 63 + playsewithpan SE_M_SWIFT, 63 delay 10 - playsewithpan SE_W129, 63 + playsewithpan SE_M_SWIFT, 63 delay 10 - playsewithpan SE_W129, 63 + playsewithpan SE_M_SWIFT, 63 delay 10 - playsewithpan SE_W129, 63 + playsewithpan SE_M_SWIFT, 63 delay 10 - playsewithpan SE_W129, 63 + playsewithpan SE_M_SWIFT, 63 delay 10 - playsewithpan SE_W129, 63 + playsewithpan SE_M_SWIFT, 63 delay 10 - playsewithpan SE_W129, 63 + playsewithpan SE_M_SWIFT, 63 delay 10 - playsewithpan SE_W129, 63 + playsewithpan SE_M_SWIFT, 63 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -2456,14 +2456,14 @@ Move_ROLLING_KICK:: @ 81CA1DA monbg 1 setalpha 12, 8 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, 0, 18, 6, 1, 4 - playsewithpan SE_W104, 192 + playsewithpan SE_M_DOUBLE_TEAM, 192 delay 6 - playsewithpan SE_W104, 192 + playsewithpan SE_M_DOUBLE_TEAM, 192 waitforvisualfinish createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, 0, 0, 4 createsprite gSlidingKickSpriteTemplate, ANIM_ATTACKER, 2, -24, 0, 48, 10, 160, 0 delay 5 - playsewithpan SE_W233B, 63 + playsewithpan SE_M_VITAL_THROW2, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -8, 0, 1, 2 createvisualtask AnimTask_ShakeMon, 2, 1, 5, 0, 6, 1 waitforvisualfinish @@ -2475,7 +2475,7 @@ Move_ROLLING_KICK:: @ 81CA1DA Move_HEADBUTT:: @ 81CA25D loadspritegfx ANIM_TAG_IMPACT createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 0 - playsewithpan SE_W029, 192 + playsewithpan SE_M_HEADBUTT, 192 waitforvisualfinish delay 2 createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 1 @@ -2484,7 +2484,7 @@ Move_HEADBUTT:: @ 81CA25D createvisualtask AnimTask_ShakeMon, 2, 1, 5, 0, 6, 1 createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 2 createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 1 - playsewithpan SE_W233B, 63 + playsewithpan SE_M_VITAL_THROW2, 63 waitforvisualfinish end @@ -2492,7 +2492,7 @@ Move_HORN_ATTACK:: @ 81CA2BA loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HORN_HIT createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 0 - playsewithpan SE_W029, 192 + playsewithpan SE_M_HEADBUTT, 192 waitforvisualfinish delay 2 createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 1 @@ -2502,7 +2502,7 @@ Move_HORN_ATTACK:: @ 81CA2BA createvisualtask AnimTask_ShakeMon, 2, 1, 5, 0, 6, 1 createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 2 createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 1 - playsewithpan SE_W030, 63 + playsewithpan SE_M_HORN_ATTACK, 63 waitforvisualfinish end @@ -2520,14 +2520,14 @@ FuryAttackRight:: @ 81CA358 createsprite gHornHitSpriteTemplate, ANIM_TARGET, 4, 8, 8, 10 waitforvisualfinish createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 1 - playsewithpan SE_W030, 63 + playsewithpan SE_M_HORN_ATTACK, 63 goto FuryAttackContinue FuryAttackLeft:: @ 81CA37E createsprite gHornHitSpriteTemplate, ANIM_TARGET, 4, -8, -8, 10 waitforvisualfinish createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 1 - playsewithpan SE_W030, 63 + playsewithpan SE_M_HORN_ATTACK, 63 goto FuryAttackContinue Move_HORN_DRILL:: @ 81CA3A4 @@ -2541,47 +2541,47 @@ HornDrillContinue:: @ 81CA3C1 waitbgfadein setalpha 12, 8 createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 0 - playsewithpan SE_W029, 192 + playsewithpan SE_M_HEADBUTT, 192 waitforvisualfinish delay 2 createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 1 createsprite gHornHitSpriteTemplate, ANIM_TARGET, 4, 0, 0, 12 waitforvisualfinish - playse SE_BAN + playse SE_BANG createvisualtask AnimTask_ShakeMonInPlace, 2, 0, 2, 0, 40, 1 createvisualtask AnimTask_ShakeMonInPlace, 2, 1, 10, 0, 40, 1 createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 3 - playsewithpan SE_W030, 63 + playsewithpan SE_M_HORN_ATTACK, 63 delay 4 createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 2, 1, 3 - playsewithpan SE_W030, 63 + playsewithpan SE_M_HORN_ATTACK, 63 delay 4 createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, -4, 3, 1, 3 - playsewithpan SE_W030, 63 + playsewithpan SE_M_HORN_ATTACK, 63 delay 4 createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, -8, -5, 1, 3 - playsewithpan SE_W030, 63 + playsewithpan SE_M_HORN_ATTACK, 63 delay 4 createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, 4, -12, 1, 3 - playsewithpan SE_W030, 63 + playsewithpan SE_M_HORN_ATTACK, 63 delay 4 createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, 16, 0, 1, 3 - playsewithpan SE_W030, 63 + playsewithpan SE_M_HORN_ATTACK, 63 delay 4 createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, 5, 18, 1, 3 - playsewithpan SE_W030, 63 + playsewithpan SE_M_HORN_ATTACK, 63 delay 4 createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, -17, 12, 1, 2 - playsewithpan SE_W030, 63 + playsewithpan SE_M_HORN_ATTACK, 63 delay 4 createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, -21, -15, 1, 2 - playsewithpan SE_W030, 63 + playsewithpan SE_M_HORN_ATTACK, 63 delay 4 createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, 8, -27, 1, 2 - playsewithpan SE_W030, 63 + playsewithpan SE_M_HORN_ATTACK, 63 delay 4 createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, 32, 0, 1, 2 - playsewithpan SE_W030, 63 + playsewithpan SE_M_HORN_ATTACK, 63 delay 4 createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 2 waitforvisualfinish @@ -2604,15 +2604,15 @@ Move_THRASH:: @ 81CA521 createvisualtask AnimTask_ThrashMoveMonVertical, 2, createsprite gFistFootRandomPosSpriteTemplate, ANIM_TARGET, 3, 1, 10, 0 createvisualtask AnimTask_ShakeMonInPlace, 2, 1, 4, 0, 7, 1 - playsewithpan SE_W004, 63 + playsewithpan SE_M_COMET_PUNCH, 63 delay 28 createsprite gFistFootRandomPosSpriteTemplate, ANIM_TARGET, 3, 1, 10, 1 createvisualtask AnimTask_ShakeMonInPlace, 2, 1, 4, 0, 7, 1 - playsewithpan SE_W233B, 63 + playsewithpan SE_M_VITAL_THROW2, 63 delay 28 createsprite gFistFootRandomPosSpriteTemplate, ANIM_TARGET, 3, 1, 10, 3 createvisualtask AnimTask_ShakeMonInPlace, 2, 1, 8, 0, 16, 1 - playsewithpan SE_W025B, 63 + playsewithpan SE_M_MEGA_KICK2, 63 end Move_SING:: @ 81CA5A0 @@ -2620,7 +2620,7 @@ Move_SING:: @ 81CA5A0 monbg ANIM_DEF_PARTNER createvisualtask AnimTask_MusicNotesRainbowBlend, 2, waitforvisualfinish - panse_1B SE_W047, 192, 63, 2, 0 + panse_1B SE_M_SING, 192, 63, 2, 0 createsprite gWavyMusicNotesSpriteTemplate, ANIM_TARGET, 2, 7, 0, 12 delay 5 createsprite gWavyMusicNotesSpriteTemplate, ANIM_TARGET, 2, 6, 1, 12 @@ -2659,7 +2659,7 @@ Move_LOW_KICK:: @ 81CA674 delay 4 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, -8, 8, 1, 2 createvisualtask AnimTask_RotateMonSpriteToSide, 2, 6, 384, 1, 2 - playsewithpan SE_W233B, 63 + playsewithpan SE_M_VITAL_THROW2, 63 waitforvisualfinish createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 1, 4 end @@ -2667,7 +2667,7 @@ Move_LOW_KICK:: @ 81CA674 Move_EARTHQUAKE:: @ 81CA6D1 createvisualtask AnimTask_HorizontalShake, 5, 5, 10, 50 createvisualtask AnimTask_HorizontalShake, 5, 4, 10, 50 - playsewithpan SE_W089, 0 + playsewithpan SE_M_EARTHQUAKE, 0 delay 10 createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 1, 0, 14, RGB_WHITE, 14 delay 16 @@ -2678,7 +2678,7 @@ Move_FISSURE:: @ 81CA71E loadspritegfx ANIM_TAG_MUD_SAND createvisualtask AnimTask_HorizontalShake, 3, 5, 10, 50 createvisualtask AnimTask_HorizontalShake, 3, 1, 10, 50 - playsewithpan SE_W089, 63 + playsewithpan SE_M_EARTHQUAKE, 63 delay 8 call FissureDirtPlumeFar delay 15 @@ -2706,7 +2706,7 @@ FissureDirtPlumeFar:: @ 81CA79F createsprite gDirtPlumeSpriteTemplate, ANIM_TARGET, 2, 1, 0, 16, -16, -10, 24 createsprite gDirtPlumeSpriteTemplate, ANIM_TARGET, 2, 1, 1, 14, -52, -18, 24 createsprite gDirtPlumeSpriteTemplate, ANIM_TARGET, 2, 1, 1, 12, -32, -16, 24 - playsewithpan SE_W091, 63 + playsewithpan SE_M_DIG, 63 return FissureDirtPlumeClose:: @ 81CA7F0 @@ -2714,7 +2714,7 @@ FissureDirtPlumeClose:: @ 81CA7F0 createsprite gDirtPlumeSpriteTemplate, ANIM_TARGET, 2, 1, 0, 16, -38, -10, 24 createsprite gDirtPlumeSpriteTemplate, ANIM_TARGET, 2, 1, 1, 14, -20, -18, 24 createsprite gDirtPlumeSpriteTemplate, ANIM_TARGET, 2, 1, 1, 12, -36, -16, 24 - playsewithpan SE_W091, 63 + playsewithpan SE_M_DIG, 63 return Move_DIG:: @ 81CA841 @@ -2755,7 +2755,7 @@ DigUnleash:: @ 81CA8A6 delay 16 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -8, 0, 1, 2 createvisualtask AnimTask_ShakeMon, 2, 1, 5, 0, 6, 1 - playsewithpan SE_W025B, 192 + playsewithpan SE_M_MEGA_KICK2, 192 clearmonbg ANIM_ATTACKER goto DigEnd @@ -2764,16 +2764,16 @@ DigThrowDirt:: @ 81CA90A createsprite gDirtPlumeSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 16, 4, -10, 18 createsprite gDirtPlumeSpriteTemplate, ANIM_ATTACKER, 2, 0, 1, 14, 4, -18, 18 createsprite gDirtPlumeSpriteTemplate, ANIM_ATTACKER, 2, 0, 1, 12, 4, -16, 18 - playsewithpan SE_W091, 192 + playsewithpan SE_M_DIG, 192 delay 32 return Move_MEDITATE:: @ 81CA95D call SetPsychicBackground createvisualtask AnimTask_MeditateStretchAttacker, 2 - playsewithpan SE_W029, 192 + playsewithpan SE_M_HEADBUTT, 192 delay 16 - playsewithpan SE_W036, 192 + playsewithpan SE_M_TAKE_DOWN, 192 waitforvisualfinish call UnsetPsychicBg end @@ -2783,15 +2783,15 @@ Move_AGILITY:: @ 81CA97A setalpha 12, 8 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, 0, 24, 6, 4, 4 createvisualtask AnimTask_CloneBattlerSpriteWithBlend, 2, 0, 4, 7, 10 - playsewithpan SE_W104, 192 + playsewithpan SE_M_DOUBLE_TEAM, 192 delay 12 - playsewithpan SE_W104, 192 + playsewithpan SE_M_DOUBLE_TEAM, 192 delay 12 - playsewithpan SE_W104, 192 + playsewithpan SE_M_DOUBLE_TEAM, 192 delay 12 - playsewithpan SE_W104, 192 + playsewithpan SE_M_DOUBLE_TEAM, 192 delay 12 - playsewithpan SE_W104, 192 + playsewithpan SE_M_DOUBLE_TEAM, 192 delay 12 waitforvisualfinish clearmonbg ANIM_ATK_PARTNER @@ -2805,11 +2805,11 @@ Move_QUICK_ATTACK:: @ 81CA9C4 setalpha 12, 8 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, 0, 24, 6, 1, 5 createvisualtask AnimTask_CloneBattlerSpriteWithBlend, 2, 0, 4, 7, 3 - playsewithpan SE_W026, 192 + playsewithpan SE_M_JUMP_KICK, 192 delay 4 createvisualtask AnimTask_ShakeMon, 2, 1, 5, 0, 6, 1 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 4, 0, 0, 1, 1 - playsewithpan SE_W233B, 63 + playsewithpan SE_M_VITAL_THROW2, 63 waitforvisualfinish clearmonbg ANIM_ATK_PARTNER blendoff @@ -2823,16 +2823,16 @@ Move_RAGE:: @ 81CAA1C setalpha 12, 8 createvisualtask AnimTask_BlendMonInAndOut, 3, 0, 31, 10, 0, 2 createsprite gAngerMarkSpriteTemplate, ANIM_ATTACKER, 2, 0, -20, -28 - playsewithpan SE_W207B, 192 + playsewithpan SE_M_SWAGGER2, 192 delay 20 createsprite gAngerMarkSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, -28 - playsewithpan SE_W207B, 192 + playsewithpan SE_M_SWAGGER2, 192 waitforvisualfinish createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 6 delay 4 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 2 createvisualtask AnimTask_ShakeTargetBasedOnMovePowerOrDmg, 2, 1, 1, 10, 1, 0 - playsewithpan SE_W233B, 63 + playsewithpan SE_M_VITAL_THROW2, 63 waitforvisualfinish clearmonbg 1 end @@ -2840,7 +2840,7 @@ Move_RAGE:: @ 81CAA1C Move_TELEPORT:: @ 81CAA92 call SetPsychicBackground createvisualtask AnimTask_Teleport, 2 - playsewithpan SE_W100, 192 + playsewithpan SE_M_TELEPORT, 192 delay 15 call UnsetPsychicBg waitforvisualfinish @@ -2850,23 +2850,23 @@ Move_DOUBLE_TEAM:: @ 81CAAAB monbg ANIM_ATK_PARTNER setalpha 12, 8 createvisualtask AnimTask_DoubleTeam, 2, - playsewithpan SE_W104, 192 + playsewithpan SE_M_DOUBLE_TEAM, 192 delay 32 - playsewithpan SE_W104, 192 + playsewithpan SE_M_DOUBLE_TEAM, 192 delay 24 - playsewithpan SE_W104, 192 + playsewithpan SE_M_DOUBLE_TEAM, 192 delay 16 - playsewithpan SE_W104, 192 + playsewithpan SE_M_DOUBLE_TEAM, 192 delay 8 - playsewithpan SE_W104, 192 + playsewithpan SE_M_DOUBLE_TEAM, 192 delay 8 - playsewithpan SE_W104, 192 + playsewithpan SE_M_DOUBLE_TEAM, 192 delay 8 - playsewithpan SE_W104, 192 + playsewithpan SE_M_DOUBLE_TEAM, 192 delay 8 - playsewithpan SE_W104, 192 + playsewithpan SE_M_DOUBLE_TEAM, 192 delay 8 - playsewithpan SE_W104, 192 + playsewithpan SE_M_DOUBLE_TEAM, 192 waitforvisualfinish clearmonbg ANIM_ATK_PARTNER blendoff @@ -2876,7 +2876,7 @@ Move_DOUBLE_TEAM:: @ 81CAAAB Move_MINIMIZE:: @ 81CAAF2 setalpha 10, 8 createvisualtask AnimTask_Minimize, 2, - loopsewithpan SE_W107, 192, 34, 3 + loopsewithpan SE_M_MINIMIZE, 192, 34, 3 waitforvisualfinish blendoff end @@ -2885,11 +2885,11 @@ Move_METRONOME:: @ 81CAB05 loadspritegfx ANIM_TAG_FINGER loadspritegfx ANIM_TAG_THOUGHT_BUBBLE createsprite gThoughtBubbleSpriteTemplate, ANIM_ATTACKER, 11, 0, 100 - playsewithpan SE_W118, 192 + playsewithpan SE_M_METRONOME, 192 delay 6 createsprite gMetronomeFingerSpriteTemplate, ANIM_ATTACKER, 12, 0 delay 24 - loopsewithpan SE_W039, 192, 22, 3 + loopsewithpan SE_M_TAIL_WHIP, 192, 22, 3 waitforvisualfinish end @@ -2906,7 +2906,7 @@ SkullBashSetUp:: @ 81CAB39 SkullBashSetUpHeadDown:: @ 81CAB49 createsprite gSlideMonToOffsetAndBackSpriteTemplate, ANIM_ATTACKER, 2, 0, -24, 0, 0, 10, 0 - playsewithpan SE_W036, 192 + playsewithpan SE_M_TAKE_DOWN, 192 waitforvisualfinish createvisualtask AnimTask_RotateMonSpriteToSide, 2, 16, 96, 0, 2 waitforvisualfinish @@ -2917,14 +2917,14 @@ SkullBashSetUpHeadDown:: @ 81CAB49 SkullBashAttack:: @ 81CAB86 loadspritegfx ANIM_TAG_IMPACT createvisualtask AnimTask_SkullBashPosition, 2, 0 - playsewithpan SE_W036, 192 + playsewithpan SE_M_TAKE_DOWN, 192 waitforvisualfinish - playse SE_BAN + playse SE_BANG createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 1, 0, 14, RGB_WHITE, 14 createvisualtask AnimTask_ShakeMonInPlace, 2, 0, 2, 0, 40, 1 createvisualtask AnimTask_ShakeMonInPlace, 2, 1, 10, 0, 40, 1 createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 4, 0, 0, 1, 0 - loopsewithpan SE_W025B, 63, 8, 3 + loopsewithpan SE_M_MEGA_KICK2, 63, 8, 3 waitforvisualfinish createvisualtask AnimTask_SkullBashPosition, 2, 1 goto SkullBashEnd @@ -2934,9 +2934,9 @@ Move_AMNESIA:: @ 81CABF5 call SetPsychicBackground delay 8 createsprite gQuestionMarkSpriteTemplate, ANIM_ATTACKER, 20 - playsewithpan SE_W118, 192 + playsewithpan SE_M_METRONOME, 192 delay 54 - loopsewithpan SE_W118, 192, 16, 3 + loopsewithpan SE_M_METRONOME, 192, 16, 3 waitforvisualfinish call UnsetPsychicBg end @@ -2944,18 +2944,18 @@ Move_AMNESIA:: @ 81CABF5 Move_KINESIS:: @ 81CAC19 loadspritegfx ANIM_TAG_ALERT loadspritegfx ANIM_TAG_BENT_SPOON - playsewithpan SE_W060, 192 + playsewithpan SE_M_PSYBEAM, 192 call SetPsychicBackground createsprite gBentSpoonSpriteTemplate, ANIM_ATTACKER, 20 createsprite gKinesisZapEnergySpriteTemplate, ANIM_ATTACKER, 19, 32, -8, 0 createsprite gKinesisZapEnergySpriteTemplate, ANIM_ATTACKER, 19, 32, 16, 1 - loopsewithpan SE_W109, 192, 21, 2 + loopsewithpan SE_M_CONFUSE_RAY, 192, 21, 2 delay 60 - playsewithpan SE_W146, 192 + playsewithpan SE_M_DIZZY_PUNCH, 192 delay 30 - loopsewithpan SE_W146, 192, 20, 2 + loopsewithpan SE_M_DIZZY_PUNCH, 192, 20, 2 delay 70 - playsewithpan SE_W207B, 192 + playsewithpan SE_M_SWAGGER2, 192 waitforvisualfinish call UnsetPsychicBg end @@ -2964,14 +2964,14 @@ Move_GLARE:: @ 81CAC6A loadspritegfx ANIM_TAG_SMALL_RED_EYE loadspritegfx ANIM_TAG_EYE_SPARKLE createvisualtask AnimTask_GlareEyeDots, 5, 0 - playsewithpan SE_W060B, 192 + playsewithpan SE_M_PSYBEAM2, 192 waitforvisualfinish createvisualtask AnimTask_BlendSelected, 5, 1, 0, 0, 16, RGB_BLACK waitforvisualfinish createsprite gEyeSparkleSpriteTemplate, ANIM_ATTACKER, 0, -16, -8 createsprite gEyeSparkleSpriteTemplate, ANIM_ATTACKER, 0, 16, -8 createvisualtask AnimTask_ScaryFace, 5, - playsewithpan SE_W043, 192 + playsewithpan SE_M_LEER, 192 delay 2 createvisualtask AnimTask_ShakeTargetInPattern, 3, 20, 1, 0 waitforvisualfinish @@ -2981,12 +2981,12 @@ Move_GLARE:: @ 81CAC6A Move_BARRAGE:: @ 81CACD3 loadspritegfx ANIM_TAG_RED_BALL createvisualtask AnimTask_BarrageBall, 3, - playsewithpan SE_W207, 192 + playsewithpan SE_M_SWAGGER, 192 delay 24 createsprite gShakeMonOrTerrainSpriteTemplate, ANIM_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, 63, 8, 2 + loopsewithpan SE_M_STRENGTH, 63, 8, 2 end Move_SKY_ATTACK:: @ 81CAD1B @@ -3007,7 +3007,7 @@ SkyAttackSetUpAgainstOpponent:: @ 81CAD40 delay 12 createvisualtask AnimTask_BlendSelected, 10, 2, 1, 8, 0, RGB_BLACK createvisualtask AnimTask_HorizontalShake, 5, 0, 2, 16 - loopsewithpan SE_W287, 192, 4, 8 + loopsewithpan SE_M_STAT_INCREASE, 192, 4, 8 createvisualtask AnimTask_BlendSelected, 10, 2, 1, 0, 15, RGB_WHITE delay 20 createvisualtask AnimTask_BlendSelected, 10, 2, 1, 15, 0, RGB_WHITE @@ -3024,7 +3024,7 @@ SkyAttackSetUpAgainstPartner:: @ 81CADB7 delay 12 createvisualtask AnimTask_BlendSelected, 10, 2, 1, 8, 0, RGB_BLACK createvisualtask AnimTask_HorizontalShake, 5, 0, 2, 16 - playsewithpan SE_W287, 192 + playsewithpan SE_M_STAT_INCREASE, 192 delay 8 createvisualtask AnimTask_BlendSelected, 10, 2, 1, 0, 15, RGB_WHITE delay 20 @@ -3060,7 +3060,7 @@ SkyAttackUnleash:: @ 81CAE2E goto SkyAttackEnd Move_FLASH:: @ 81CAEB3 - playsewithpan SE_W043, 192 + playsewithpan SE_M_LEER, 192 createvisualtask AnimTask_Flash, 2 waitforvisualfinish end @@ -3068,7 +3068,7 @@ Move_FLASH:: @ 81CAEB3 Move_SPLASH:: @ 81CAEC0 createvisualtask AnimTask_Splash, 2, 0, 3 delay 8 - loopsewithpan SE_W039, 192, 38, 3 + loopsewithpan SE_M_TAIL_WHIP, 192, 38, 3 waitforvisualfinish end @@ -3076,7 +3076,7 @@ Move_ACID_ARMOR:: @ 81CAED5 monbg ANIM_ATTACKER setalpha 15, 0 createvisualtask AnimTask_AcidArmor, 2, 0 - playsewithpan SE_W151, 192 + playsewithpan SE_M_ACID_ARMOR, 192 waitforvisualfinish blendoff clearmonbg ANIM_ATTACKER @@ -3092,7 +3092,7 @@ Move_SHARPEN:: @ 81CAEEE Move_SUPER_FANG:: @ 81CAEFA loadspritegfx ANIM_TAG_FANG_ATTACK createvisualtask AnimTask_ShakeMonInPlace, 2, 0, 1, 0, 20, 1 - playsewithpan SE_W082, 192 + playsewithpan SE_M_DRAGON_RAGE, 192 waitforvisualfinish createvisualtask AnimTask_ShakeMonInPlace, 2, 0, 3, 0, 48, 1 createvisualtask AnimTask_BlendMonInAndOut, 2, 0, 1247, 12, 4, 1 @@ -3101,7 +3101,7 @@ Move_SUPER_FANG:: @ 81CAEFA createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 4 delay 4 createsprite gSuperFangSpriteTemplate, ANIM_TARGET, 2, - playsewithpan SE_W044, 63 + playsewithpan SE_M_BITE, 63 delay 8 createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 1, 2143, 14, RGB_WHITE, 14 createvisualtask AnimTask_ShakeMon, 2, 1, 0, 7, 12, 1 @@ -3112,11 +3112,11 @@ Move_SUPER_FANG:: @ 81CAEFA Move_SLASH:: @ 81CAF7B loadspritegfx ANIM_TAG_SLASH createsprite gSlashSliceSpriteTemplate, ANIM_TARGET, 2, 1, -8, 0 - playsewithpan SE_W013, 63 + playsewithpan SE_M_RAZOR_WIND, 63 delay 4 createsprite gSlashSliceSpriteTemplate, ANIM_TARGET, 2, 1, 8, 0 createvisualtask AnimTask_ShakeMon2, 2, 1, 4, 0, 18, 1 - playsewithpan SE_W013, 63 + playsewithpan SE_M_RAZOR_WIND, 63 waitforvisualfinish end @@ -3128,11 +3128,11 @@ Move_STRUGGLE:: @ 81CAFB5 createvisualtask AnimTask_ShakeMonInPlace, 2, 0, 3, 0, 12, 4 createsprite gMovementWavesSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 2 createsprite gMovementWavesSpriteTemplate, ANIM_ATTACKER, 2, 0, 1, 2 - loopsewithpan SE_W029, 192, 12, 4 + loopsewithpan SE_M_HEADBUTT, 192, 12, 4 waitforvisualfinish createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMonInPlace, 2, 1, 3, 0, 6, 1 - playsewithpan SE_W025B, 63 + playsewithpan SE_M_MEGA_KICK2, 63 waitforvisualfinish clearmonbg 1 blendoff @@ -3146,7 +3146,7 @@ Move_SKETCH:: @ 81CB01B waitforvisualfinish clearmonbg 1 createvisualtask AnimTask_Splash, 2, 0, 2 - loopsewithpan SE_W039, 192, 38, 2 + loopsewithpan SE_M_TAIL_WHIP, 192, 38, 2 end Move_NIGHTMARE:: @ 81CB043 @@ -3156,7 +3156,7 @@ Move_NIGHTMARE:: @ 81CB043 monbg ANIM_DEF_PARTNER createvisualtask AnimTask_NightmareClone, 2 createvisualtask AnimTask_ShakeMon, 2, 1, 3, 0, 40, 1 - playsewithpan SE_W171, 63 + playsewithpan SE_M_NIGHTMARE, 63 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER restorebg @@ -3166,7 +3166,7 @@ Move_NIGHTMARE:: @ 81CB043 NightmareInContest:: @ 81CB06F createvisualtask AnimTask_BlendMonInAndOut, 2, 0, RGB_WHITE, 10, 2, 1 createvisualtask AnimTask_ShakeMon, 2, 0, 3, 0, 32, 1 - playsewithpan SE_W171, 63 + playsewithpan SE_M_NIGHTMARE, 63 waitforvisualfinish restorebg waitbgfadein @@ -3177,11 +3177,11 @@ Move_FLAIL:: @ 81CB099 monbg 1 setalpha 12, 8 createvisualtask AnimTask_FlailMovement, 2, 0 - loopsewithpan SE_W029, 192, 8, 2 + loopsewithpan SE_M_HEADBUTT, 192, 8, 2 waitforvisualfinish createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, 1, 3 createvisualtask AnimTask_ShakeTargetBasedOnMovePowerOrDmg, 2, 0, 1, 30, 1, 0 - playsewithpan SE_W025B, 63 + playsewithpan SE_M_MEGA_KICK2, 63 waitforvisualfinish clearmonbg 1 blendoff @@ -3189,12 +3189,12 @@ Move_FLAIL:: @ 81CB099 Move_SPITE:: @ 81CB0D6 fadetobg 2 - playsewithpan SE_W060, 192 + playsewithpan SE_M_PSYBEAM, 192 waitbgfadein monbg ANIM_DEF_PARTNER createvisualtask AnimTask_CurseBlendEffect, 2, 2, 2, 6, 0, 8, RGB_WHITE createvisualtask AnimTask_SpiteTargetShadow, 2 - loopsewithpan SE_W060, 63, 20, 3 + loopsewithpan SE_M_PSYBEAM, 63, 20, 3 waitforvisualfinish restorebg waitbgfadein @@ -3216,11 +3216,11 @@ MachPunchContinue:: @ 81CB11E delay 0 setalpha 9, 8 createvisualtask AnimTask_AttackerPunchWithTrace, 2, 28968, 10 - playsewithpan SE_W026, 192 + playsewithpan SE_M_JUMP_KICK, 192 delay 6 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 1 createsprite gFistFootSpriteTemplate, ANIM_TARGET, 4, 0, 0, 8, 1, 0 - playsewithpan SE_W004, 63 + playsewithpan SE_M_COMET_PUNCH, 63 createvisualtask AnimTask_ShakeMon, 2, 1, 3, 0, 6, 1 waitforvisualfinish clearmonbg ANIM_ATK_PARTNER @@ -3242,13 +3242,13 @@ Move_FORESIGHT:: @ 81CB18D setalpha 16, 0 createsprite gForesightMagnifyingGlassSpriteTemplate, ANIM_TARGET, 2, 1 delay 17 - loopsewithpan SE_W166, 63, 16, 4 + loopsewithpan SE_M_SKETCH, 63, 16, 4 delay 48 delay 24 - playsewithpan SE_W166, 63 + playsewithpan SE_M_SKETCH, 63 delay 10 createvisualtask AnimTask_BlendMonInAndOut, 5, 1, RGB_WHITE, 12, 2, 1 - playsewithpan SE_W197, 63 + playsewithpan SE_M_DETECT, 63 waitforvisualfinish blendoff clearmonbg ANIM_DEF_PARTNER @@ -3257,16 +3257,16 @@ Move_FORESIGHT:: @ 81CB18D Move_DESTINY_BOND:: @ 81CB1CC loadspritegfx ANIM_TAG_WHITE_SHADOW fadetobg 2 - playsewithpan SE_W060, 192 + playsewithpan SE_M_PSYBEAM, 192 waitbgfadein createvisualtask AnimTask_DestinyBondWhiteShadow, 5, 0, 48 - playsewithpan SE_W109, 192 + playsewithpan SE_M_CONFUSE_RAY, 192 delay 48 createvisualtask AnimTask_ShakeMonInPlace, 2, 0, 2, 0, 24, 1 createvisualtask AnimTask_BlendExcept, 2, 6, 1, 0, 12, 30653 delay 24 createvisualtask AnimTask_BlendExcept, 2, 6, 1, 12, 0, 30653 - playsewithpan SE_W171, 63 + playsewithpan SE_M_NIGHTMARE, 63 waitforvisualfinish restorebg waitbgfadein @@ -3276,7 +3276,7 @@ Move_DESTINY_BOND:: @ 81CB1CC Move_ENDURE:: @ 81CB227 loadspritegfx ANIM_TAG_FOCUS_ENERGY - playsewithpan SE_W082, 192 + playsewithpan SE_M_DRAGON_RAGE, 192 call EndureEffect delay 8 createvisualtask AnimTask_CurseBlendEffect, 2, 2, 2, 2, 0, 11, 31 @@ -3303,13 +3303,13 @@ Move_CHARM:: @ 81CB2BB loadspritegfx ANIM_TAG_MAGENTA_HEART createvisualtask AnimTask_RockMonBackAndForth, 5, 0, 2, 0 createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, 0, 20 - playsewithpan SE_W204, 192 + playsewithpan SE_M_CHARM, 192 delay 15 createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, -20, 20 - playsewithpan SE_W204, 192 + playsewithpan SE_M_CHARM, 192 delay 15 createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, 20, 20 - playsewithpan SE_W204, 192 + playsewithpan SE_M_CHARM, 192 waitforvisualfinish end @@ -3324,7 +3324,7 @@ Move_ROLLOUT:: @ 81CB2FE waitforvisualfinish createvisualtask AnimTask_ShakeTargetBasedOnMovePowerOrDmg, 2, 0, 1, 30, 1, 0 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 4, 0, 0, 1, 2 - playsewithpan SE_W025B, 63 + playsewithpan SE_M_MEGA_KICK2, 63 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -3334,44 +3334,44 @@ Move_FALSE_SWIPE:: @ 81CB33F loadspritegfx ANIM_TAG_SLASH_2 loadspritegfx ANIM_TAG_IMPACT createsprite gFalseSwipeSliceSpriteTemplate, ANIM_TARGET, 2, - playsewithpan SE_W233, 63 + playsewithpan SE_M_VITAL_THROW, 63 delay 16 createsprite gFalseSwipePositionedSliceSpriteTemplate, ANIM_TARGET, 2, 0 - playsewithpan SE_W104, 63 + playsewithpan SE_M_DOUBLE_TEAM, 63 delay 2 createsprite gFalseSwipePositionedSliceSpriteTemplate, ANIM_TARGET, 2, 16 delay 2 createsprite gFalseSwipePositionedSliceSpriteTemplate, ANIM_TARGET, 2, 32 - playsewithpan SE_W104, 63 + playsewithpan SE_M_DOUBLE_TEAM, 63 delay 2 createsprite gFalseSwipePositionedSliceSpriteTemplate, ANIM_TARGET, 2, 48 delay 2 createsprite gFalseSwipePositionedSliceSpriteTemplate, ANIM_TARGET, 2, 64 - playsewithpan SE_W104, 63 + playsewithpan SE_M_DOUBLE_TEAM, 63 delay 2 createsprite gFalseSwipePositionedSliceSpriteTemplate, ANIM_TARGET, 2, 80 delay 2 waitforvisualfinish createvisualtask AnimTask_ShakeMon, 2, 1, 5, 0, 6, 1 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 4, 0, 0, 1, 3 - playsewithpan SE_W004, 63 + playsewithpan SE_M_COMET_PUNCH, 63 end Move_SWAGGER:: @ 81CB3C6 loadspritegfx ANIM_TAG_BREATH loadspritegfx ANIM_TAG_ANGER createvisualtask AnimTask_GrowAndShrink, 2, - playsewithpan SE_W207, 192 + playsewithpan SE_M_SWAGGER, 192 waitforvisualfinish createsprite gBreathPuffSpriteTemplate, ANIM_ATTACKER, 2, - loopsewithpan SE_W207, 192, 4, 2 + loopsewithpan SE_M_SWAGGER, 192, 4, 2 waitforvisualfinish delay 24 createsprite gAngerMarkSpriteTemplate, ANIM_TARGET, 2, 1, -20, -28 - playsewithpan SE_W207B, 63 + playsewithpan SE_M_SWAGGER2, 63 delay 12 createsprite gAngerMarkSpriteTemplate, ANIM_TARGET, 2, 1, 20, -28 - playsewithpan SE_W207B, 63 + playsewithpan SE_M_SWAGGER2, 63 waitforvisualfinish end @@ -3382,14 +3382,14 @@ Move_MILK_DRINK:: @ 81CB40E monbg 1 createsprite gMilkBottleSpriteTemplate, ANIM_ATTACKER, 2, delay 40 - playsewithpan SE_W152, 192 + playsewithpan SE_M_CRABHAMMER, 192 delay 12 - playsewithpan SE_W152, 192 + playsewithpan SE_M_CRABHAMMER, 192 delay 20 - playsewithpan SE_W152, 192 + playsewithpan SE_M_CRABHAMMER, 192 waitforvisualfinish createsprite gThinRingExpandingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 0 - playsewithpan SE_W208, 192 + playsewithpan SE_M_MILK_DRINK, 192 waitforvisualfinish clearmonbg 1 call HealingEffect2 @@ -3407,13 +3407,13 @@ MagnitudeEnd:: @ 81CB468 MagnitudeRegular:: @ 81CB469 createvisualtask AnimTask_HorizontalShake, 5, 5, 0, 50 createvisualtask AnimTask_HorizontalShake, 5, 4, 0, 50 - loopsewithpan SE_W070, 63, 8, 10 + loopsewithpan SE_M_STRENGTH, 63, 8, 10 goto MagnitudeEnd MagnitudeIntense:: @ 81CB48E createvisualtask AnimTask_HorizontalShake, 5, 5, 0, 50 createvisualtask AnimTask_HorizontalShake, 5, 4, 0, 50 - loopsewithpan SE_W070, 63, 8, 10 + loopsewithpan SE_M_STRENGTH, 63, 8, 10 delay 10 createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 1, 0, 14, RGB_WHITE, 14 delay 16 @@ -3426,15 +3426,15 @@ Move_RAPID_SPIN:: @ 81CB4E1 monbg ANIM_ATTACKER createsprite gRapidSpinSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 32, -32, 40, -2 createvisualtask AnimTask_RapinSpinMonElevation, 2, 0, 2, 0 - loopsewithpan SE_W013B, 192, 8, 4 + loopsewithpan SE_M_RAZOR_WIND2, 192, 8, 4 waitforvisualfinish createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 0, 0, 1, 2 createvisualtask AnimTask_ShakeTargetBasedOnMovePowerOrDmg, 2, 0, 1, 10, 1, 0 - playsewithpan SE_W003, 63 + playsewithpan SE_M_DOUBLE_SLAP, 63 waitforvisualfinish delay 8 createvisualtask AnimTask_RapinSpinMonElevation, 2, 0, 2, 1 - loopsewithpan SE_W013B, 192, 8, 4 + loopsewithpan SE_M_RAZOR_WIND2, 192, 8, 4 waitforvisualfinish clearmonbg ANIM_ATTACKER end @@ -3448,7 +3448,7 @@ Move_MOONLIGHT:: @ 81CB54E waitforvisualfinish createsprite gMoonSpriteTemplate, ANIM_ATTACKER, 2, 120, 56 createvisualtask AnimTask_AlphaFadeIn, 3, 0, 16, 16, 0, 1 - playsewithpan SE_W236, 0 + playsewithpan SE_M_MOONLIGHT, 0 delay 30 createsprite gMoonlightSparkleSpriteTemplate, ANIM_ATTACKER, 40, -12, 0 delay 30 @@ -3478,7 +3478,7 @@ ExtremeSpeedContinue:: @ 81CB5F5 createvisualtask AnimTask_StartSlidingBg, 5, -2304, 0, 1, -1 waitbgfadein createvisualtask AnimTask_StretchAttacker, 2 - loopsewithpan SE_W013B, 192, 8, 3 + loopsewithpan SE_M_RAZOR_WIND2, 192, 8, 3 waitforvisualfinish delay 1 createvisualtask AnimTask_SetAttackerInvisibleWaitForSignal, 2 @@ -3487,19 +3487,19 @@ ExtremeSpeedContinue:: @ 81CB5F5 delay 18 createvisualtask AnimTask_ExtremeSpeedImpact, 2, delay 2 - playsewithpan SE_W004, 63 + playsewithpan SE_M_COMET_PUNCH, 63 createsprite gMonEdgeHitSplatSpriteTemplate, ANIM_TARGET, 2, 1, 0, -12, 3 delay 10 - playsewithpan SE_W004, 63 + playsewithpan SE_M_COMET_PUNCH, 63 createsprite gMonEdgeHitSplatSpriteTemplate, ANIM_TARGET, 2, 1, 0, 12, 3 delay 10 - playsewithpan SE_W233B, 63 + playsewithpan SE_M_VITAL_THROW2, 63 createsprite gMonEdgeHitSplatSpriteTemplate, ANIM_TARGET, 2, 1, 0, 0, 3 waitforvisualfinish createvisualtask AnimTask_SpeedDust, 2, delay 10 createvisualtask AnimTask_ExtremeSpeedMonReappear, 2, - loopsewithpan SE_W104, 192, 8, 4 + loopsewithpan SE_M_DOUBLE_TEAM, 192, 8, 4 waitforvisualfinish restorebg waitbgfadeout @@ -3522,19 +3522,19 @@ Move_UPROAR:: @ 81CB69C monbg ANIM_DEF_PARTNER createvisualtask AnimTask_UproarDistortion, 2, 0 createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0, 31, 8 - playsewithpan SE_W253, 192 + playsewithpan SE_M_UPROAR, 192 createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0, 29, -12, 0 createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0, -12, -29, 1 delay 16 createvisualtask AnimTask_UproarDistortion, 2, 0 createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0, 31, 8 - playsewithpan SE_W253, 192 + playsewithpan SE_M_UPROAR, 192 createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0, 12, -29, 1 createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0, -29, -12, 0 delay 16 createvisualtask AnimTask_UproarDistortion, 2, 0 createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0, 31, 8 - playsewithpan SE_W253, 192 + playsewithpan SE_M_UPROAR, 192 createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0, 24, -24, 1 createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0, -24, -24, 0 waitforvisualfinish @@ -3546,7 +3546,7 @@ Move_HEAT_WAVE:: @ 81CB766 createvisualtask AnimTask_BlendParticle, 5, 10261, 0, 6, 6, 31 createvisualtask AnimTask_LoadSandstormBackground, 5, 1 createvisualtask AnimTask_BlendBackground, 6, 6, 31 - panse_1B SE_W257, 192, 63, 2, 0 + panse_1B SE_M_HEAT_WAVE, 192, 63, 2, 0 delay 4 createvisualtask AnimTask_MoveHeatWaveTargets, 5 delay 12 @@ -3571,7 +3571,7 @@ Move_HAIL:: @ 81CB816 createvisualtask AnimTask_BlendSelected, 10, 1, 3, 0, 6, RGB_BLACK waitforvisualfinish createvisualtask AnimTask_Hail1, 5, - loopsewithpan SE_W258, 0, 8, 10 + loopsewithpan SE_M_HAIL, 0, 8, 10 waitforvisualfinish createvisualtask AnimTask_BlendSelected, 10, 1, 3, 6, 0, RGB_BLACK end @@ -3583,10 +3583,10 @@ Move_TORMENT:: @ 81CB84E waitforvisualfinish createvisualtask AnimTask_BlendMonInAndOut, 2, 1, 31, 10, 1, 1 createsprite gAngerMarkSpriteTemplate, ANIM_TARGET, 2, 1, -20, -28 - playsewithpan SE_W207B, 63 + playsewithpan SE_M_SWAGGER2, 63 delay 20 createsprite gAngerMarkSpriteTemplate, ANIM_TARGET, 2, 1, 20, -28 - playsewithpan SE_W207B, 63 + playsewithpan SE_M_SWAGGER2, 63 end Move_MEMENTO:: @ 81CB892 @@ -3595,9 +3595,9 @@ Move_MEMENTO:: @ 81CB892 createvisualtask AnimTask_InitMementoShadow, 2 delay 1 createvisualtask AnimTask_MoveAttackerMementoShadow, 5 - playsewithpan SE_W060, 192 + playsewithpan SE_M_PSYBEAM, 192 delay 48 - playsewithpan SE_W060B, 192 + playsewithpan SE_M_PSYBEAM2, 192 waitforvisualfinish createvisualtask sub_80B8664, 2, delay 12 @@ -3605,7 +3605,7 @@ Move_MEMENTO:: @ 81CB892 delay 1 monbg_22 1 createvisualtask AnimTask_MoveTargetMementoShadow, 5 - playsewithpan SE_W060, 63 + playsewithpan SE_M_PSYBEAM, 63 waitforvisualfinish clearmonbg_23 1 delay 1 @@ -3617,7 +3617,7 @@ Move_FACADE:: @ 81CB8D6 loadspritegfx ANIM_TAG_SWEAT_DROP createvisualtask AnimTask_SquishAndSweatDroplets, 2, 0, 3 createvisualtask AnimTask_FacadeColorBlend, 2, 0, 72 - loopsewithpan SE_W207, 192, 24, 3 + loopsewithpan SE_M_SWAGGER, 192, 24, 3 end Move_SMELLING_SALT:: @ 81CB8F6 @@ -3627,22 +3627,22 @@ Move_SMELLING_SALT:: @ 81CB8F6 createsprite gSmellingSaltsHandSpriteTemplate, ANIM_TARGET, 2, 1, 1, 2 delay 32 createvisualtask AnimTask_SmellingSaltsSquish, 3, 1, 2 - loopsewithpan SE_W003, 63, 12, 2 + loopsewithpan SE_M_DOUBLE_SLAP, 63, 12, 2 waitforvisualfinish delay 4 createvisualtask AnimTask_ShakeMon2, 2, 1, 2, 0, 6, 2 createsprite gSmellingSaltExclamationSpriteTemplate, ANIM_TARGET, 2, 1, 8, 3 - loopsewithpan SE_W207B, 63, 16, 3 + loopsewithpan SE_M_SWAGGER2, 63, 16, 3 end Move_FOLLOW_ME:: @ 81CB951 loadspritegfx ANIM_TAG_FINGER createsprite gFollowMeFingerSpriteTemplate, ANIM_ATTACKER, 2, 0 - playsewithpan SE_W039, 192 + playsewithpan SE_M_TAIL_WHIP, 192 delay 18 - playsewithpan SE_W213, 192 + playsewithpan SE_M_ATTRACT, 192 delay 71 - loopsewithpan SE_W039, 192, 22, 3 + loopsewithpan SE_M_TAIL_WHIP, 192, 22, 3 end Move_CHARGE:: @ 81CB970 @@ -3654,26 +3654,26 @@ Move_CHARGE:: @ 81CB970 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 4, 0 waitforvisualfinish createvisualtask AnimTask_ElectricChargingParticles, 2, 0, 60, 2, 12 - playsewithpan SE_W268, 192 + playsewithpan SE_M_CHARGE, 192 delay 30 - playsewithpan SE_W268, 192 + playsewithpan SE_M_CHARGE, 192 delay 30 - playsewithpan SE_W268, 192 + playsewithpan SE_M_CHARGE, 192 createsprite gGrowingChargeOrbSpriteTemplate, ANIM_ATTACKER, 2, 0 delay 25 - playsewithpan SE_W268, 192 + playsewithpan SE_M_CHARGE, 192 delay 20 - playsewithpan SE_W268, 192 + playsewithpan SE_M_CHARGE, 192 delay 15 - playsewithpan SE_W268, 192 + playsewithpan SE_M_CHARGE, 192 delay 10 delay 6 - loopsewithpan SE_W268, 192, 6, 5 + loopsewithpan SE_M_CHARGE, 192, 6, 5 waitforvisualfinish createsprite gElectricPuffSpriteTemplate, ANIM_ATTACKER, 2, 0, 16, 16 delay 2 createsprite gElectricPuffSpriteTemplate, ANIM_ATTACKER, 2, 0, -16, -16 - playsewithpan SE_W085B, 192 + playsewithpan SE_M_THUNDERBOLT2, 192 waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 4, 4, 0, 0 clearmonbg ANIM_ATTACKER @@ -3685,19 +3685,19 @@ Move_TAUNT:: @ 81CBA0B loadspritegfx ANIM_TAG_THOUGHT_BUBBLE loadspritegfx ANIM_TAG_ANGER createsprite gThoughtBubbleSpriteTemplate, ANIM_ATTACKER, 11, 0, 45 - playsewithpan SE_W118, 192 + playsewithpan SE_M_METRONOME, 192 delay 6 createsprite gTauntFingerSpriteTemplate, ANIM_ATTACKER, 12, 0 delay 4 - loopsewithpan SE_W039, 192, 16, 2 + loopsewithpan SE_M_TAIL_WHIP, 192, 16, 2 waitforvisualfinish delay 8 createsprite gAngerMarkSpriteTemplate, ANIM_TARGET, 2, 1, -20, -28 - playsewithpan SE_W207B, 63 + playsewithpan SE_M_SWAGGER2, 63 waitforvisualfinish delay 12 createsprite gAngerMarkSpriteTemplate, ANIM_TARGET, 2, 1, 20, -28 - playsewithpan SE_W207B, 63 + playsewithpan SE_M_SWAGGER2, 63 end Move_HELPING_HAND:: @ 81CBA5F @@ -3706,13 +3706,13 @@ Move_HELPING_HAND:: @ 81CBA5F createsprite gHelpingHandClapSpriteTemplate, ANIM_ATTACKER, 40, 0 createsprite gHelpingHandClapSpriteTemplate, ANIM_ATTACKER, 40, 1 delay 19 - playsewithpan SE_W227, 0 + playsewithpan SE_M_ENCORE, 0 createvisualtask AnimTask_ShakeMon2, 2, 2, 2, 0, 5, 1 delay 14 - playsewithpan SE_W227, 0 + playsewithpan SE_M_ENCORE, 0 createvisualtask AnimTask_ShakeMon2, 2, 2, 2, 0, 5, 1 delay 20 - playsewithpan SE_W227, 0 + playsewithpan SE_M_ENCORE, 0 createvisualtask AnimTask_ShakeMon2, 2, 2, 3, 0, 10, 1 createvisualtask AnimTask_BlendMonInAndOut, 2, 2, 1023, 12, 1, 1 end @@ -3722,16 +3722,16 @@ Move_ASSIST:: @ 81CBAD2 createsprite gAssistPawprintSpriteTemplate, ANIM_ATTACKER, 50, 112, -16, 140, 128, 36 delay 2 createsprite gAssistPawprintSpriteTemplate, ANIM_ATTACKER, 50, 208, 128, -16, 48, 36 - playsewithpan SE_W010, 0 + playsewithpan SE_M_SCRATCH, 0 delay 2 createsprite gAssistPawprintSpriteTemplate, ANIM_ATTACKER, 50, -16, 112, 256, -16, 36 - playsewithpan SE_W010, 0 + playsewithpan SE_M_SCRATCH, 0 delay 2 createsprite gAssistPawprintSpriteTemplate, ANIM_ATTACKER, 50, 108, 128, 84, -16, 36 - playsewithpan SE_W010, 0 + playsewithpan SE_M_SCRATCH, 0 delay 2 createsprite gAssistPawprintSpriteTemplate, ANIM_ATTACKER, 50, -16, 56, 256, 56, 36 - playsewithpan SE_W010, 0 + playsewithpan SE_M_SCRATCH, 0 end Move_SUPERPOWER:: @ 81CBB43 @@ -3742,7 +3742,7 @@ Move_SUPERPOWER:: @ 81CBB43 monbgprio_28 0 setalpha 12, 8 createsprite gSuperpowerOrbSpriteTemplate, ANIM_TARGET, 2, 0 - playsewithpan SE_W025, 192 + playsewithpan SE_M_MEGA_KICK, 192 delay 20 createsprite gShakeMonOrTerrainSpriteTemplate, ANIM_ATTACKER, 2, 4, 1, 180, 1 createvisualtask SoundTask_PlaySE2WithPanning, 5, 227, 0 @@ -3758,10 +3758,10 @@ Move_SUPERPOWER:: @ 81CBB43 createsprite gSuperpowerRockSpriteTemplate, ANIM_ATTACKER, 41, 60, 288, 3, 88 delay 74 createsprite gSuperpowerFireballSpriteTemplate, ANIM_TARGET, 3, 0 - playsewithpan SE_W207, 192 + playsewithpan SE_M_SWAGGER, 192 delay 16 createvisualtask AnimTask_ShakeMon2, 2, 1, 8, 0, 16, 1 - playsewithpan SE_W025B, 63 + playsewithpan SE_M_MEGA_KICK2, 63 waitforvisualfinish clearmonbg ANIM_ATK_PARTNER blendoff @@ -3774,10 +3774,10 @@ Move_RECYCLE:: @ 81CBBFE setalpha 0, 16 delay 1 createsprite gRecycleSpriteTemplate, ANIM_ATTACKER, 2, - loopsewithpan SE_W036, 192, 24, 3 + loopsewithpan SE_M_TAKE_DOWN, 192, 24, 3 waitforvisualfinish createvisualtask AnimTask_BlendMonInAndOut, 5, 0, RGB_WHITE, 12, 2, 1 - playsewithpan SE_W036, 192 + playsewithpan SE_M_TAKE_DOWN, 192 waitforvisualfinish blendoff clearmonbg ANIM_ATTACKER @@ -3799,20 +3799,20 @@ BrickBreakNormal:: @ 81CBC47 delay 1 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, -18, -18, 1, 1 createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 2, -18, -18, 10, 1, 0 - playsewithpan SE_W233, 63 + playsewithpan SE_M_VITAL_THROW, 63 delay 20 createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 3, 8 delay 5 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 18, 18, 1, 1 createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 2, 18, 18, 10, 1, 0 - playsewithpan SE_W233, 63 + playsewithpan SE_M_VITAL_THROW, 63 delay 20 createvisualtask AnimTask_WindUpLunge, 2, 0, -24, 0, 24, 10, 24, 3 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 6, 0 delay 37 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 1 createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 10, 1, 0 - playsewithpan SE_W233B, 63 + playsewithpan SE_M_VITAL_THROW2, 63 waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 6, 0, 0 waitforvisualfinish @@ -3828,26 +3828,26 @@ BrickBreakShatteredWall:: @ 81CBD16 delay 1 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, -18, -18, 1, 1 createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 2, -18, -18, 10, 1, 0 - playsewithpan SE_W233, 63 + playsewithpan SE_M_VITAL_THROW, 63 delay 20 createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 3, 8 delay 5 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 18, 18, 1, 1 createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 2, 18, 18, 10, 1, 0 - playsewithpan SE_W233, 63 + playsewithpan SE_M_VITAL_THROW, 63 delay 20 createvisualtask AnimTask_WindUpLunge, 2, 0, -24, 0, 24, 10, 24, 3 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 6, 0 delay 37 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 1 createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 10, 1, 0 - playsewithpan SE_W233B, 63 + playsewithpan SE_M_VITAL_THROW2, 63 waitforvisualfinish createsprite gBrickBreakWallShardSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, -8, -12 createsprite gBrickBreakWallShardSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 8, -12 createsprite gBrickBreakWallShardSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, -8, 12 createsprite gBrickBreakWallShardSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 8, 12 - playsewithpan SE_W280, 63 + playsewithpan SE_M_BRICK_BREAK, 63 waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 6, 0, 0 waitforvisualfinish @@ -3857,33 +3857,33 @@ BrickBreakShatteredWall:: @ 81CBD16 Move_YAWN:: @ 81CBE37 loadspritegfx ANIM_TAG_PINK_CLOUD createvisualtask AnimTask_DeepInhale, 2, 0 - playsewithpan SE_W281, 192 + playsewithpan SE_M_YAWN, 192 waitforvisualfinish createsprite gYawnCloudSpriteTemplate, ANIM_TARGET, 5, 2 - playsewithpan SE_W255, 192 + playsewithpan SE_M_SPIT_UP, 192 delay 4 createsprite gYawnCloudSpriteTemplate, ANIM_TARGET, 5, 1 delay 4 createsprite gYawnCloudSpriteTemplate, ANIM_TARGET, 5, 0 waitforvisualfinish createvisualtask AnimTask_DeepInhale, 2, 1 - playsewithpan SE_W281, 63 + playsewithpan SE_M_YAWN, 63 end Move_ENDEAVOR:: @ 81CBE7A loadspritegfx ANIM_TAG_SWEAT_DROP loadspritegfx ANIM_TAG_IMPACT createvisualtask AnimTask_SquishAndSweatDroplets, 2, 0, 2 - loopsewithpan SE_W039, 192, 24, 2 + loopsewithpan SE_M_TAIL_WHIP, 192, 24, 2 createvisualtask AnimTask_BlendMonInAndOut, 5, 0, 703, 12, 1, 2 delay 6 createvisualtask AnimTask_ShakeTargetBasedOnMovePowerOrDmg, 5, 0, 1, 8, 1, 0 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 12, -12, 1, 2 - playsewithpan SE_W003, 63 + playsewithpan SE_M_DOUBLE_SLAP, 63 delay 24 createvisualtask AnimTask_ShakeTargetBasedOnMovePowerOrDmg, 5, 0, 1, 8, 1, 0 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, -12, 12, 1, 2 - playsewithpan SE_W004, 63 + playsewithpan SE_M_COMET_PUNCH, 63 end Move_ERUPTION:: @ 81CBEEF @@ -3891,10 +3891,10 @@ Move_ERUPTION:: @ 81CBEEF createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 2, 0, 4, 31 waitforvisualfinish createvisualtask AnimTask_EruptionLaunchRocks, 2 - waitplaysewithpan SE_W153, 192, 60 + waitplaysewithpan SE_M_EXPLOSION, 192, 60 waitforvisualfinish createvisualtask AnimTask_EruptionLaunchRocks, 2 - waitplaysewithpan SE_W153, 192, 60 + waitplaysewithpan SE_M_EXPLOSION, 192, 60 waitforvisualfinish delay 30 createsprite gEruptionFallingRockSpriteTemplate, ANIM_ATTACKER, 40, 200, -32, 0, 100, 0 @@ -3906,7 +3906,7 @@ Move_ERUPTION:: @ 81CBEEF delay 22 createvisualtask AnimTask_HorizontalShake, 5, 5, 8, 60 createvisualtask AnimTask_HorizontalShake, 5, 4, 8, 60 - loopsewithpan SE_W088, 63, 16, 12 + loopsewithpan SE_M_ROCK_THROW, 63, 16, 12 delay 80 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 40, 31, 4, 4, 0, 31 end @@ -3916,7 +3916,7 @@ Move_SKILL_SWAP:: @ 81CBFBC call SetPsychicBackground createvisualtask AnimTask_SkillSwap, 3, 1 createvisualtask AnimTask_BlendMonInAndOut, 5, 1, RGB_WHITE, 12, 3, 1 - loopsewithpan SE_W179, 192, 24, 3 + loopsewithpan SE_M_REVERSAL, 192, 24, 3 delay 16 createvisualtask AnimTask_SkillSwap, 3, 0 createvisualtask AnimTask_BlendMonInAndOut, 5, 0, RGB_WHITE, 12, 3, 1 @@ -3931,12 +3931,12 @@ Move_IMPRISON:: @ 81CC007 monbg ANIM_DEF_PARTNER createvisualtask AnimTask_ImprisonOrbs, 5 delay 8 - loopsewithpan SE_W030, 192, 8, 5 + loopsewithpan SE_M_HORN_ATTACK, 192, 8, 5 waitforvisualfinish delay 4 createsprite gRedXSpriteTemplate, ANIM_ATTACKER, 5, 0, 40 createvisualtask AnimTask_HorizontalShake, 5, 4, 1, 10 - playsewithpan SE_W063, 192 + playsewithpan SE_M_HYPER_BEAM, 192 clearmonbg ANIM_DEF_PARTNER call UnsetPsychicBg end @@ -3946,13 +3946,13 @@ Move_GRUDGE:: @ 81CC04A monbg ANIM_ATTACKER monbgprio_29 fadetobg 2 - playsewithpan SE_W060, 192 + playsewithpan SE_M_PSYBEAM, 192 waitbgfadein createvisualtask AnimTask_GrudgeFlames, 3 - loopsewithpan SE_W052, 192, 16, 4 + loopsewithpan SE_M_EMBER, 192, 16, 4 delay 10 delay 80 - playsewithpan SE_W171, 63 + playsewithpan SE_M_NIGHTMARE, 63 waitforvisualfinish restorebg waitbgfadein @@ -3966,7 +3966,7 @@ Move_CAMOUFLAGE:: @ 81CC072 createvisualtask AnimTask_SetCamouflageBlend, 5, 2, 3, 0, 14 delay 16 createvisualtask AnimTask_AttackerFadeToInvisible, 2, 4 - playsewithpan SE_W185, 192 + playsewithpan SE_M_FAINT_ATTACK, 192 waitforvisualfinish delay 8 createvisualtask AnimTask_SetCamouflageBlend, 5, 2, 0, 0, 0 @@ -3985,7 +3985,7 @@ Move_TAIL_GLOW:: @ 81CC0B8 waitforvisualfinish createsprite gTailGlowOrbSpriteTemplate, ANIM_ATTACKER, 66, 0 delay 18 - loopsewithpan SE_W234, 192, 16, 6 + loopsewithpan SE_M_MORNING_SUN, 192, 16, 6 waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 4, 4, 0, 0 clearmonbg ANIM_ATTACKER @@ -4002,7 +4002,7 @@ Move_LUSTER_PURGE:: @ 81CC0FB waitbgfadein monbg ANIM_ATTACKER setalpha 12, 8 - playsewithpan SE_W076, 192 + playsewithpan SE_M_SOLAR_BEAM, 192 createsprite gLusterPurgeCircleSpriteTemplate, ANIM_ATTACKER, 41, 0, 0, 0, 0 delay 20 createvisualtask AnimTask_BlendExcept, 5, 5, 2, 0, 16, -1 @@ -4040,14 +4040,14 @@ Move_MIST_BALL:: @ 81CC212 loadspritegfx ANIM_TAG_SMALL_BUBBLES loadspritegfx ANIM_TAG_WHITE_FEATHER delay 0 - playsewithpan SE_W081, 192 + playsewithpan SE_M_STRING_SHOT, 192 createsprite gMistBallSpriteTemplate, ANIM_TARGET, 0, 0, 0, 0, 0, 30, 0 waitforvisualfinish - playsewithpan SE_W028, 63 + playsewithpan SE_M_SAND_ATTACK, 63 createvisualtask AnimTask_ShakeMon, 2, 1, 5, 0, 10, 0 createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 1, 1, 1, 32279, 16, RGB_WHITE, 16 delay 0 - playsewithpan SE_W114, 0 + playsewithpan SE_M_HAZE, 0 createvisualtask AnimTask_LoadMistTiles, 5, createvisualtask AnimTask_BlendSelected, 10, 4, 3, 0, 16, RGB_WHITE delay 8 @@ -4060,7 +4060,7 @@ Move_FEATHER_DANCE:: @ 81CC2A1 loadspritegfx ANIM_TAG_WHITE_FEATHER monbg ANIM_DEF_PARTNER monbgprio_29 - playsewithpan SE_W080, 63 + playsewithpan SE_M_PETAL_DANCE, 63 delay 0 createsprite gFallingFeatherSpriteTemplate, ANIM_TARGET, 0, 0, -16, 64, 2, 104, 11304, 32, 1 delay 6 @@ -4083,19 +4083,19 @@ Move_TEETER_DANCE:: @ 81CC371 loadspritegfx ANIM_TAG_DUCK createvisualtask AnimTask_TeeterDanceMovement, 5, createsprite gFastFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 0, 16, -2 - playsewithpan SE_W298, 192 + playsewithpan SE_M_TEETER_DANCE, 192 delay 24 createsprite gFastFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, -2 - playsewithpan SE_W298, 192 + playsewithpan SE_M_TEETER_DANCE, 192 delay 24 createsprite gFastFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 0, -16, -2 - playsewithpan SE_W298, 192 + playsewithpan SE_M_TEETER_DANCE, 192 delay 24 createsprite gFastFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 1, -8, -2 - playsewithpan SE_W298, 192 + playsewithpan SE_M_TEETER_DANCE, 192 delay 24 createsprite gFastFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 2, 8, -2 - playsewithpan SE_W298, 192 + playsewithpan SE_M_TEETER_DANCE, 192 end Move_MUD_SPORT:: @ 81CC3DC @@ -4104,52 +4104,52 @@ Move_MUD_SPORT:: @ 81CC3DC delay 24 createsprite gMudsportMudSpriteTemplate, ANIM_TARGET, 2, 0, -4, -16 createsprite gMudsportMudSpriteTemplate, ANIM_TARGET, 2, 0, 4, -12 - playsewithpan SE_W091, 192 + playsewithpan SE_M_DIG, 192 delay 32 createsprite gMudsportMudSpriteTemplate, ANIM_TARGET, 2, 0, -3, -12 createsprite gMudsportMudSpriteTemplate, ANIM_TARGET, 2, 0, 5, -14 - playsewithpan SE_W091, 192 + playsewithpan SE_M_DIG, 192 delay 32 createsprite gMudsportMudSpriteTemplate, ANIM_TARGET, 2, 0, -5, -18 createsprite gMudsportMudSpriteTemplate, ANIM_TARGET, 2, 0, 3, -14 - playsewithpan SE_W091, 192 + playsewithpan SE_M_DIG, 192 delay 16 createsprite gMudsportMudSpriteTemplate, ANIM_TARGET, 2, 1, 220, 60 - waitplaysewithpan SE_W145B, 0, 15 + waitplaysewithpan SE_M_BUBBLE2, 0, 15 delay 2 createsprite gMudsportMudSpriteTemplate, ANIM_TARGET, 2, 1, 60, 100 - waitplaysewithpan SE_W145B, 0, 25 + waitplaysewithpan SE_M_BUBBLE2, 0, 25 delay 2 createsprite gMudsportMudSpriteTemplate, ANIM_TARGET, 2, 1, 140, 55 - waitplaysewithpan SE_W145B, 0, 14 + waitplaysewithpan SE_M_BUBBLE2, 0, 14 delay 2 createsprite gMudsportMudSpriteTemplate, ANIM_TARGET, 2, 1, 180, 50 - waitplaysewithpan SE_W145B, 0, 10 + waitplaysewithpan SE_M_BUBBLE2, 0, 10 delay 2 createsprite gMudsportMudSpriteTemplate, ANIM_TARGET, 2, 1, 20, 90 - waitplaysewithpan SE_W145B, 0, 22 + waitplaysewithpan SE_M_BUBBLE2, 0, 22 delay 2 createsprite gMudsportMudSpriteTemplate, ANIM_TARGET, 2, 1, 90, 90 - waitplaysewithpan SE_W145B, 0, 22 + waitplaysewithpan SE_M_BUBBLE2, 0, 22 delay 2 createsprite gMudsportMudSpriteTemplate, ANIM_TARGET, 2, 1, 160, 60 - waitplaysewithpan SE_W145B, 0, 15 + waitplaysewithpan SE_M_BUBBLE2, 0, 15 delay 2 createsprite gMudsportMudSpriteTemplate, ANIM_TARGET, 2, 1, 30, 90 - waitplaysewithpan SE_W145B, 0, 22 + waitplaysewithpan SE_M_BUBBLE2, 0, 22 delay 2 createsprite gMudsportMudSpriteTemplate, ANIM_TARGET, 2, 1, 120, 60 - waitplaysewithpan SE_W145B, 0, 15 + waitplaysewithpan SE_M_BUBBLE2, 0, 15 delay 2 createsprite gMudsportMudSpriteTemplate, ANIM_TARGET, 2, 1, 200, 40 - waitplaysewithpan SE_W145B, 0, 10 + waitplaysewithpan SE_M_BUBBLE2, 0, 10 end Move_NEEDLE_ARM:: @ 81CC513 loadspritegfx ANIM_TAG_GREEN_SPIKE loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HANDS_AND_FEET - loopsewithpan SE_W030, 63, 2, 16 + loopsewithpan SE_M_HORN_ATTACK, 63, 2, 16 createsprite gNeedleArmSpikeSpriteTemplate, ANIM_TARGET, 2, 1, 0, 0, -32, 16 delay 2 createsprite gNeedleArmSpikeSpriteTemplate, ANIM_TARGET, 2, 1, 0, 22, -22, 16 @@ -4177,7 +4177,7 @@ Move_NEEDLE_ARM:: @ 81CC513 createvisualtask AnimTask_ShakeMon2, 2, 1, 4, 0, 18, 1 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 1 createsprite gFistFootSpriteTemplate, ANIM_TARGET, 4, 0, 0, 8, 1, 0 - playsewithpan SE_W233B, 63 + playsewithpan SE_M_VITAL_THROW2, 63 createsprite gNeedleArmSpikeSpriteTemplate, ANIM_TARGET, 2, 1, 1, 0, -24, 10 createsprite gNeedleArmSpikeSpriteTemplate, ANIM_TARGET, 2, 1, 1, 17, -17, 10 createsprite gNeedleArmSpikeSpriteTemplate, ANIM_TARGET, 2, 1, 1, 24, 0, 10 @@ -4191,7 +4191,7 @@ Move_NEEDLE_ARM:: @ 81CC513 Move_SLACK_OFF:: @ 81CC6C3 loadspritegfx ANIM_TAG_BLUE_STAR createvisualtask AnimTask_SlackOffSquish, 2, 0 - playsewithpan SE_W281, 192 + playsewithpan SE_M_YAWN, 192 waitforvisualfinish call HealingEffect waitforvisualfinish @@ -4208,11 +4208,11 @@ Move_CRUSH_CLAW:: @ 81CC6DB createvisualtask AnimTask_ShakeMon2, 2, 1, 2, 0, 18, 1 createsprite gClawSlashSpriteTemplate, ANIM_TARGET, 2, -10, -10, 0 createsprite gClawSlashSpriteTemplate, ANIM_TARGET, 2, -10, 10, 0 - playsewithpan SE_W013, 63 + playsewithpan SE_M_RAZOR_WIND, 63 delay 12 createsprite gClawSlashSpriteTemplate, ANIM_TARGET, 2, 10, -10, 1 createsprite gClawSlashSpriteTemplate, ANIM_TARGET, 2, 10, 10, 1 - playsewithpan SE_W013, 63 + playsewithpan SE_M_RAZOR_WIND, 63 waitforvisualfinish waitforvisualfinish blendoff @@ -4220,7 +4220,7 @@ Move_CRUSH_CLAW:: @ 81CC6DB end Move_AROMATHERAPY:: @ 81CC74B - playsewithpan SE_W080, 0 + playsewithpan SE_M_PETAL_DANCE, 0 loadspritegfx ANIM_TAG_FLOWER loadspritegfx ANIM_TAG_THIN_RING loadspritegfx ANIM_TAG_SPARKLE_2 @@ -4244,15 +4244,15 @@ Move_AROMATHERAPY:: @ 81CC74B delay 1 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 1, 0, 7, 0, 13293 delay 1 - playsewithpan SE_W287, 192 + playsewithpan SE_M_STAT_INCREASE, 192 createvisualtask AnimTask_StatusClearedEffect, 2, 1 waitforvisualfinish - playsewithpan SE_W234, 192 + playsewithpan SE_M_MORNING_SUN, 192 createsprite gSparklingStarsSpriteTemplate, ANIM_ATTACKER, 16, -15, 0, 0, 0, 32, 60, 1 delay 8 createsprite gSparklingStarsSpriteTemplate, ANIM_ATTACKER, 16, 12, -5, 0, 0, 32, 60, 1 waitforvisualfinish - playsewithpan SE_REAPOKE, 192 + playsewithpan SE_SHINY, 192 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 43, 3, 10, 0, 13293 createsprite gBlendThinRingExpandingSpriteTemplate, ANIM_ATTACKER, 16, 0, 0, 0, 1 waitforvisualfinish @@ -4265,7 +4265,7 @@ Move_FAKE_TEARS:: @ 81CC8AD createvisualtask AnimTask_BlendParticle, 5, 10155, 0, 4, 4, 32108 waitforvisualfinish createvisualtask AnimTask_RockMonBackAndForth, 5, 0, 2, 1 - loopsewithpan SE_W039, 192, 12, 4 + loopsewithpan SE_M_TAIL_WHIP, 192, 12, 4 delay 8 createsprite gTearDropSpriteTemplate, ANIM_ATTACKER, 2, 0, 0 createsprite gTearDropSpriteTemplate, ANIM_ATTACKER, 2, 0, 1 @@ -4291,7 +4291,7 @@ Move_AIR_CUTTER:: @ 81CC93D delay 0 createvisualtask AnimTask_AirCutterProjectile, 2, 32, -24, 1536, 2, 128 waitforvisualfinish - playsewithpan SE_W015, 63 + playsewithpan SE_M_CUT, 63 createsprite gAirCutterSliceSpriteTemplate, ANIM_ATTACKER, 2, 40, -32, 0, 2 delay 5 createvisualtask AnimTask_ShakeMon2, 2, 1, 2, 0, 8, 1 @@ -4307,15 +4307,15 @@ Move_ODOR_SLEUTH:: @ 81CC99F createvisualtask AnimTask_OdorSleuthMovement, 5, delay 24 createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 3, 4 - playsewithpan SE_W207, 192 + playsewithpan SE_M_SWAGGER, 192 delay 6 createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 3, 4 - playsewithpan SE_W207, 192 + playsewithpan SE_M_SWAGGER, 192 waitforvisualfinish clearmonbg 1 delay 1 createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 1, -1, 16, -1, 0 - playsewithpan SE_W043, 192 + playsewithpan SE_M_LEER, 192 end Move_GRASS_WHISTLE:: @ 81CC9E9 @@ -4324,7 +4324,7 @@ Move_GRASS_WHISTLE:: @ 81CC9E9 waitforvisualfinish createvisualtask AnimTask_MusicNotesRainbowBlend, 2, waitforvisualfinish - panse_1B SE_W320, 192, 63, 2, 0 + panse_1B SE_M_GRASSWHISTLE, 192, 63, 2, 0 createsprite gWavyMusicNotesSpriteTemplate, ANIM_TARGET, 2, 7, 1, 0 delay 5 createsprite gWavyMusicNotesSpriteTemplate, ANIM_TARGET, 2, 6, 1, 0 @@ -4361,7 +4361,7 @@ Move_TICKLE:: @ 81CCADC waitforvisualfinish createsprite gEyeSparkleSpriteTemplate, ANIM_ATTACKER, 0, -16, -8 createsprite gEyeSparkleSpriteTemplate, ANIM_ATTACKER, 0, 16, -8 - playsewithpan SE_W197, 192 + playsewithpan SE_M_DETECT, 192 waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 2, 0, 16, 0, 0 waitforvisualfinish @@ -4369,7 +4369,7 @@ Move_TICKLE:: @ 81CCADC createvisualtask AnimTask_SwayMon, 3, 0, 6, 1280, 3, 0 delay 12 createvisualtask AnimTask_RockMonBackAndForth, 3, 1, 6, 2 - loopsewithpan SE_W039, 63, 8, 8 + loopsewithpan SE_M_TAIL_WHIP, 63, 8, 8 waitforvisualfinish end @@ -4379,13 +4379,13 @@ Move_WATER_SPOUT:: @ 81CCB48 monbg ANIM_DEF_PARTNER setalpha 12, 8 createvisualtask AnimTask_WaterSpoutLaunch, 5, - playsewithpan SE_W029, 192 + playsewithpan SE_M_HEADBUTT, 192 delay 44 - playsewithpan SE_W291, 192 + playsewithpan SE_M_DIVE, 192 waitforvisualfinish delay 16 createvisualtask AnimTask_WaterSpoutRain, 5, - playsewithpan SE_W057, 63 + playsewithpan SE_M_SURF, 63 clearmonbg ANIM_DEF_PARTNER blendoff end @@ -4398,11 +4398,11 @@ Move_SHADOW_PUNCH:: @ 81CCB76 monbg ANIM_ATK_PARTNER setalpha 9, 8 createvisualtask AnimTask_AttackerPunchWithTrace, 2, 0, 13 - playsewithpan SE_W026, 192 + playsewithpan SE_M_JUMP_KICK, 192 delay 6 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 1 createsprite gFistFootSpriteTemplate, ANIM_TARGET, 4, 0, 0, 8, 1, 0 - playsewithpan SE_W004, 63 + playsewithpan SE_M_COMET_PUNCH, 63 createvisualtask AnimTask_ShakeMon, 2, 1, 3, 0, 6, 1 waitforvisualfinish clearmonbg ANIM_ATK_PARTNER @@ -4417,15 +4417,15 @@ Move_EXTRASENSORY:: @ 81CCBD1 setalpha 12, 8 createvisualtask AnimTask_BlendMonInAndOut, 5, 0, 891, 12, 1, 1 createvisualtask AnimTask_ExtrasensoryDistortion, 5, 0 - playsewithpan SE_W020, 63 + playsewithpan SE_M_BIND, 63 waitforvisualfinish createvisualtask AnimTask_BlendMonInAndOut, 5, 0, 891, 12, 1, 1 createvisualtask AnimTask_ExtrasensoryDistortion, 5, 1 - playsewithpan SE_W020, 63 + playsewithpan SE_M_BIND, 63 waitforvisualfinish createvisualtask AnimTask_TransparentCloneGrowAndShrink, 5, ANIM_ATTACKER createvisualtask AnimTask_ExtrasensoryDistortion, 5, 2 - playsewithpan SE_W043, 192 + playsewithpan SE_M_LEER, 192 waitforvisualfinish blendoff clearmonbg ANIM_DEF_PARTNER @@ -4439,18 +4439,18 @@ Move_AERIAL_ACE:: @ 81CCC39 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, 0, 24, 6, 1, 5 createvisualtask AnimTask_CloneBattlerSpriteWithBlend, 2, 0, 4, 7, 3 createsprite gCuttingSliceSpriteTemplate, ANIM_ATTACKER, 2, 40, -32, 0 - playsewithpan SE_W013B, 192 + playsewithpan SE_M_RAZOR_WIND2, 192 delay 5 createvisualtask AnimTask_ShakeMon, 2, 1, 0, 3, 10, 1 createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 1, 0, 10, 0, 0 - playsewithpan SE_W013, 63 + playsewithpan SE_M_RAZOR_WIND, 63 waitforvisualfinish clearmonbg 1 blendoff end Move_IRON_DEFENSE:: @ 81CCCA3 - loopsewithpan SE_REAPOKE, 192, 28, 2 + loopsewithpan SE_SHINY, 192, 28, 2 createvisualtask AnimTask_MetallicShine, 5, 0, 0, 0 createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 8, 2, -1, 14, -1, 0 waitforvisualfinish @@ -4459,7 +4459,7 @@ Move_IRON_DEFENSE:: @ 81CCCA3 Move_BLOCK:: @ 81CCCCD loadspritegfx ANIM_TAG_X_SIGN createsprite gBlockXSpriteTemplate, ANIM_TARGET, 66, - playsewithpan SE_W207, 63 + playsewithpan SE_M_SWAGGER, 63 end Move_HOWL:: @ 81CCCDC @@ -4475,10 +4475,10 @@ Move_HOWL:: @ 81CCCDC Move_BULK_UP:: @ 81CCCFE loadspritegfx ANIM_TAG_BREATH createvisualtask AnimTask_GrowAndShrink, 2, - playsewithpan SE_W207, 192 + playsewithpan SE_M_SWAGGER, 192 waitforvisualfinish createsprite gBreathPuffSpriteTemplate, ANIM_ATTACKER, 2, - loopsewithpan SE_W207, 192, 4, 2 + loopsewithpan SE_M_SWAGGER, 192, 4, 2 waitforvisualfinish end @@ -4487,16 +4487,16 @@ Move_COVET:: @ 81CCD1C loadspritegfx ANIM_TAG_ITEM_BAG createvisualtask AnimTask_RockMonBackAndForth, 5, 0, 2, 0 createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, 0, 20 - playsewithpan SE_W204, 192 + playsewithpan SE_M_CHARM, 192 delay 15 createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, -20, 20 - playsewithpan SE_W204, 192 + playsewithpan SE_M_CHARM, 192 delay 15 createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, 20, 20 - playsewithpan SE_W204, 192 + playsewithpan SE_M_CHARM, 192 waitforvisualfinish createvisualtask AnimTask_ShakeMon2, 2, 1, 2, 0, 8, 1 - loopsewithpan SE_W146, 63, 4, 3 + loopsewithpan SE_M_DIZZY_PUNCH, 63, 4, 3 end Move_VOLT_TACKLE:: @ 81CCD79 @@ -4508,28 +4508,28 @@ Move_VOLT_TACKLE:: @ 81CCD79 createvisualtask AnimTask_BlendSelected, 10, 1, 0, 0, 8, RGB_BLACK waitforvisualfinish createsprite gVoltTackleOrbSlideSpriteTemplate, ANIM_ATTACKER, 1 - playsewithpan SE_W268, 192 + playsewithpan SE_M_CHARGE, 192 waitforvisualfinish clearmonbg ANIM_ATTACKER blendoff delay 8 createvisualtask AnimTask_VoltTackleBolt, 5, 0 - playsewithpan SE_W085, 192 + playsewithpan SE_M_THUNDERBOLT, 192 waitforvisualfinish createvisualtask AnimTask_VoltTackleBolt, 5, 1 - playsewithpan SE_W085, 63 + playsewithpan SE_M_THUNDERBOLT, 63 waitforvisualfinish createvisualtask AnimTask_VoltTackleBolt, 5, 2 - playsewithpan SE_W085, 192 + playsewithpan SE_M_THUNDERBOLT, 192 waitforvisualfinish createvisualtask AnimTask_VoltTackleBolt, 5, 3 - playsewithpan SE_W085, 63 + playsewithpan SE_M_THUNDERBOLT, 63 waitforvisualfinish createvisualtask AnimTask_VoltTackleBolt, 5, 4 - playsewithpan SE_W085, 192 + playsewithpan SE_M_THUNDERBOLT, 192 delay 8 createvisualtask AnimTask_ShakeMon2, 2, 1, 10, 0, 18, 1 - playsewithpan SE_W120, 63 + playsewithpan SE_M_SELF_DESTRUCT, 63 createsprite gElectricPuffSpriteTemplate, ANIM_ATTACKER, 2, 1, 16, 16 delay 2 createsprite gElectricPuffSpriteTemplate, ANIM_ATTACKER, 2, 1, -16, -16 @@ -4537,7 +4537,7 @@ Move_VOLT_TACKLE:: @ 81CCD79 createvisualtask AnimTask_VoltTackleAttackerReappear, 5 waitforvisualfinish createvisualtask AnimTask_ShakeMon2, 2, 0, 3, 0, 9, 1 - playsewithpan SE_W085B, 192 + playsewithpan SE_M_THUNDERBOLT2, 192 createsprite gElectricPuffSpriteTemplate, ANIM_ATTACKER, 2, 0, 16, 16 delay 2 createsprite gElectricPuffSpriteTemplate, ANIM_ATTACKER, 2, 0, -16, -16 @@ -4550,13 +4550,13 @@ Move_WATER_SPORT:: @ 81CCE71 loadspritegfx ANIM_TAG_GLOWY_BLUE_ORB createvisualtask AnimTask_WaterSport, 5, delay 8 - playsewithpan SE_W057, 192 + playsewithpan SE_M_SURF, 192 delay 44 - playsewithpan SE_W057, 192 + playsewithpan SE_M_SURF, 192 delay 44 - playsewithpan SE_W057, 192 + playsewithpan SE_M_SURF, 192 delay 44 - panse_1B SE_W057, 192, 63, 2, 0 + panse_1B SE_M_SURF, 192, 63, 2, 0 end Move_CALM_MIND:: @ 81CCE97 @@ -4567,13 +4567,13 @@ Move_CALM_MIND:: @ 81CCE97 createvisualtask AnimTask_SetAllNonAttackersInvisiblity, 5, 1 waitforvisualfinish createsprite gThinRingShrinkingSpriteTemplate, ANIM_ATTACKER, 40, 0, 0, 0, 0 - playsewithpan SE_W048, 192 + playsewithpan SE_M_SUPERSONIC, 192 delay 14 createsprite gThinRingShrinkingSpriteTemplate, ANIM_ATTACKER, 40, 0, 0, 0, 0 - playsewithpan SE_W048, 192 + playsewithpan SE_M_SUPERSONIC, 192 delay 14 createsprite gThinRingShrinkingSpriteTemplate, ANIM_ATTACKER, 40, 0, 0, 0, 0 - playsewithpan SE_W048, 192 + playsewithpan SE_M_SUPERSONIC, 192 waitforvisualfinish createvisualtask AnimTask_SetAllNonAttackersInvisiblity, 5, 0 visible 0 @@ -4589,20 +4589,20 @@ Move_LEAF_BLADE:: @ 81CCF17 createvisualtask AnimTask_LeafBlade, 5, delay 2 createvisualtask AnimTask_ShakeMon2, 2, 1, 2, 0, 8, 1 - playsewithpan SE_W015, 63 + playsewithpan SE_M_CUT, 63 delay 50 createvisualtask AnimTask_ShakeMon2, 2, 1, 2, 0, 8, 1 - playsewithpan SE_W015, 63 + playsewithpan SE_M_CUT, 63 delay 50 createvisualtask AnimTask_ShakeMon2, 2, 1, 2, 0, 8, 1 - playsewithpan SE_W015, 63 + playsewithpan SE_M_CUT, 63 waitforvisualfinish monbg 1 setalpha 12, 8 delay 12 createvisualtask AnimTask_ShakeMon2, 2, 1, 8, 0, 18, 1 createsprite gCrossImpactSpriteTemplate, ANIM_TARGET, 2, 0, 0, 1, 36 - playsewithpan SE_W043, 63 + playsewithpan SE_M_LEER, 63 waitforvisualfinish clearmonbg 1 blendoff @@ -4614,7 +4614,7 @@ Move_DRAGON_DANCE:: @ 81CCF9A monbgprio_28 0 delay 1 createvisualtask AnimTask_DragonDanceWaver, 5 - playsewithpan SE_W100, 192 + playsewithpan SE_M_TELEPORT, 192 delay 8 createvisualtask AnimTask_BlendPalInAndOutByTag, 5, 10249, 19456, 14, 0, 3 createsprite gDragonDanceOrbSpriteTemplate, ANIM_ATTACKER, 2, 0 @@ -4624,9 +4624,9 @@ Move_DRAGON_DANCE:: @ 81CCF9A createsprite gDragonDanceOrbSpriteTemplate, ANIM_ATTACKER, 2, 170 createsprite gDragonDanceOrbSpriteTemplate, ANIM_ATTACKER, 2, 213 delay 30 - playsewithpan SE_W100, 192 + playsewithpan SE_M_TELEPORT, 192 delay 30 - playsewithpan SE_W100, 192 + playsewithpan SE_M_TELEPORT, 192 waitforvisualfinish clearmonbg ANIM_ATTACKER delay 1 @@ -4642,7 +4642,7 @@ Move_SHOCK_WAVE:: @ 81CD009 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 4, 0 waitforvisualfinish createvisualtask AnimTask_ElectricChargingParticles, 2, 0, 20, 0, 2 - playsewithpan SE_W268, 192 + playsewithpan SE_M_CHARGE, 192 delay 12 createsprite gGrowingShockWaveOrbSpriteTemplate, ANIM_ATTACKER, 2 delay 30 @@ -4650,7 +4650,7 @@ Move_SHOCK_WAVE:: @ 81CD009 delay 12 waitforvisualfinish createvisualtask AnimTask_ShockWaveLightning, 5, - playsewithpan SE_W161B, 63 + playsewithpan SE_M_TRI_ATTACK2, 63 waitforvisualfinish createvisualtask AnimTask_ShakeMon, 2, 1, 0, 6, 18, 1 createvisualtask AnimTask_BlendSelected, 5, 1, 3, 16, 0, RGB_WHITE @@ -4663,7 +4663,7 @@ Move_SHOCK_WAVE:: @ 81CD009 end Move_HARDEN:: @ 81CD0AB - loopsewithpan SE_W231, 192, 28, 2 + loopsewithpan SE_M_HARDEN, 192, 28, 2 createvisualtask AnimTask_MetallicShine, 5, 0, 0, 0 waitforvisualfinish end @@ -4675,27 +4675,27 @@ Move_BELLY_DRUM:: @ 81CD0C0 waitforvisualfinish call BellyDrumRight createsprite gSlowFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 0, 0 - playsewithpan SE_W187, 192 + playsewithpan SE_M_BELLY_DRUM, 192 delay 15 call BellyDrumLeft createsprite gSlowFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 1, 0 - playsewithpan SE_W187, 192 + playsewithpan SE_M_BELLY_DRUM, 192 delay 15 call BellyDrumRight createsprite gSlowFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 0, 3, 3, 128 - playsewithpan SE_W187, 192 + playsewithpan SE_M_BELLY_DRUM, 192 delay 7 call BellyDrumLeft createsprite gSlowFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 128 - playsewithpan SE_W187, 192 + playsewithpan SE_M_BELLY_DRUM, 192 delay 7 call BellyDrumRight createsprite gSlowFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 0, 1, 1, 0 - playsewithpan SE_W187, 192 + playsewithpan SE_M_BELLY_DRUM, 192 delay 7 call BellyDrumLeft createsprite gSlowFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 3, 0 - playsewithpan SE_W187, 192 + playsewithpan SE_M_BELLY_DRUM, 192 waitforvisualfinish createvisualtask AnimTask_MusicNotesClearRainbowBlend, 2, waitforvisualfinish @@ -4716,11 +4716,11 @@ Move_MIND_READER:: @ 81CD1A8 loadspritegfx ANIM_TAG_OPENING_EYE loadspritegfx ANIM_TAG_ROUND_WHITE_HALO monbg 4 - playsewithpan SE_W109, 63 + playsewithpan SE_M_CONFUSE_RAY, 63 createsprite gOpeningEyeSpriteTemplate, ANIM_ATTACKER, 5, 0, 0, 1, 0 createsprite gWhiteHaloSpriteTemplate, ANIM_ATTACKER, 5, delay 40 - playsewithpan SE_W043, 63 + playsewithpan SE_M_LEER, 63 createvisualtask AnimTask_CurseBlendEffect, 2, 1, 1, 2, 0, 10, 0 call MindReaderEyeSpikeEffect waitforvisualfinish @@ -4760,7 +4760,7 @@ Move_ICE_PUNCH:: @ 81CD2E0 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 0, 7, 0 createvisualtask AnimTask_BlendSelected, 10, 4, 2, 0, 9, RGB(12, 26, 31) delay 20 - playsewithpan SE_W081, 63 + playsewithpan SE_M_STRING_SHOT, 63 createsprite gIceCrystalSpiralInwardSmall, ANIM_ATTACKER, 2, 0 createsprite gIceCrystalSpiralInwardSmall, ANIM_ATTACKER, 2, 64 createsprite gIceCrystalSpiralInwardSmall, ANIM_ATTACKER, 2, 128 @@ -4773,7 +4773,7 @@ Move_ICE_PUNCH:: @ 81CD2E0 delay 17 createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 4, 0, -10, 8, 1, 0 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, -10, 1, 1 - playsewithpan SE_W004, 63 + playsewithpan SE_M_COMET_PUNCH, 63 delay 2 createvisualtask AnimTask_ShakeMon, 5, 1, 0, 5, 3, 1 waitforvisualfinish @@ -4789,7 +4789,7 @@ Move_ICE_PUNCH:: @ 81CD2E0 end Move_REST:: @ 81CD3CB - playsewithpan SE_W173, 192 + playsewithpan SE_M_SNORE, 192 loadspritegfx ANIM_TAG_LETTER_Z createsprite gSleepLetterZSpriteTemplate, ANIM_ATTACKER, 2, 4, -10, 16, 0, 0 delay 20 @@ -4806,7 +4806,7 @@ Move_CONFUSION:: @ 81CD40B createvisualtask AnimTask_ShakeMon2, 2, 0, 1, 0, 10, 1 createvisualtask AnimTask_CurseBlendEffect, 2, 2, 0, 2, 0, 8, RGB_WHITE waitforvisualfinish - playsewithpan SE_W048, 63 + playsewithpan SE_M_SUPERSONIC, 63 createvisualtask AnimTask_ShakeMon, 2, 1, 3, 0, 15, 1 createvisualtask AnimTask_ScaleMonAndRestore, 5, -4, -4, 15, 1, 1 waitforvisualfinish @@ -4823,7 +4823,7 @@ Move_PSYCHIC:: @ 81CD46C createvisualtask AnimTask_ShakeMon2, 2, 0, 1, 0, 10, 1 createvisualtask AnimTask_CurseBlendEffect, 2, 2, 0, 2, 0, 8, 767 waitforvisualfinish - loopsewithpan SE_W048, 63, 10, 3 + loopsewithpan SE_M_SUPERSONIC, 63, 10, 3 createvisualtask AnimTask_ShakeMon, 2, 1, 5, 0, 15, 1 createvisualtask AnimTask_ScaleMonAndRestore, 5, -6, -6, 15, 1, 1 waitforvisualfinish @@ -4843,10 +4843,10 @@ FutureSightContinue:: @ 81CD4D4 FutureSight:: @ 81CD4DD monbg ANIM_ATK_PARTNER - playsewithpan SE_W060, 192 + playsewithpan SE_M_PSYBEAM, 192 call SetPsychicBackground setalpha 8, 8 - playsewithpan SE_W048, 192 + playsewithpan SE_M_SUPERSONIC, 192 createvisualtask AnimTask_CurseBlendEffect, 2, 2, 0, 2, 0, 8, RGB_WHITE createvisualtask AnimTask_ScaleMonAndRestore, 5, -4, -4, 15, 0, 1 waitforvisualfinish @@ -4854,11 +4854,11 @@ FutureSight:: @ 81CD4DD blendoff goto FutureSightContinue monbg ANIM_DEF_PARTNER - playsewithpan SE_W060, 192 + playsewithpan SE_M_PSYBEAM, 192 call SetPsychicBackground setalpha 8, 8 - playsewithpan SE_W048, 63 - waitplaysewithpan SE_W048, 63, 8 + playsewithpan SE_M_SUPERSONIC, 63 + waitplaysewithpan SE_M_SUPERSONIC, 63, 8 createvisualtask AnimTask_ShakeMon, 2, 1, 4, 0, 15, 1 createvisualtask AnimTask_ScaleMonAndRestore, 5, -5, -5, 15, 1, 1 waitforvisualfinish @@ -4877,7 +4877,7 @@ Move_THUNDER:: @ 81CD570 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 16, 0 delay 16 createvisualtask AnimTask_InvertScreenColor, 2, 257, 257, 257 - playsewithpan SE_W086, 63 + playsewithpan SE_M_THUNDER_WAVE, 63 delay 1 createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, 16, -36 delay 1 @@ -4886,12 +4886,12 @@ Move_THUNDER:: @ 81CD570 createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, 16, 12 delay 20 createsprite gLightningSpriteTemplate, ANIM_TARGET, 6, -16, -32 - playsewithpan SE_W086, 63 + playsewithpan SE_M_THUNDER_WAVE, 63 delay 1 createsprite gLightningSpriteTemplate, ANIM_TARGET, 6, -16, -16 delay 1 createsprite gLightningSpriteTemplate, ANIM_TARGET, 6, -16, 16 - playsewithpan SE_W086, 63 + playsewithpan SE_M_THUNDER_WAVE, 63 delay 5 createvisualtask AnimTask_InvertScreenColor, 2, 257, 257, 257 delay 1 @@ -4906,7 +4906,7 @@ Move_THUNDER:: @ 81CD570 createvisualtask AnimTask_InvertScreenColor, 2, 257, 257, 257 delay 1 createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, 0, -32 - playsewithpan SE_W161B, 63 + playsewithpan SE_M_TRI_ATTACK2, 63 delay 1 createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, 0, -16 delay 1 @@ -4934,7 +4934,7 @@ Move_THUNDER_PUNCH:: @ 81CD6CA setalpha 12, 8 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 16, 0 waitforvisualfinish - playsewithpan SE_W004, 63 + playsewithpan SE_M_COMET_PUNCH, 63 createsprite gFistFootSpriteTemplate, ANIM_TARGET, 4, 0, 0, 8, 1, 0 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 1 delay 1 @@ -4946,7 +4946,7 @@ Move_THUNDER_PUNCH:: @ 81CD6CA delay 1 createsprite gLightningSpriteTemplate, ANIM_ATTACKER, 2, 0, 16 delay 1 - playsewithpan SE_W161B, 63 + playsewithpan SE_M_TRI_ATTACK2, 63 createvisualtask AnimTask_InvertScreenColor, 2, 257, 257, 257 delay 2 createvisualtask AnimTask_ShakeMon, 2, 1, 0, 3, 15, 1 @@ -4962,7 +4962,7 @@ Move_THUNDER_PUNCH:: @ 81CD6CA Move_SACRED_FIRE:: @ 81CD793 loadspritegfx ANIM_TAG_FIRE loadspritegfx ANIM_TAG_FIRE_PLUME - loopsewithpan SE_W221, 192, 7, 5 + loopsewithpan SE_M_SACRED_FIRE, 192, 7, 5 createsprite gFirePlumeSpriteTemplate, ANIM_ATTACKER, 2, -32, 0, 50, 5, -2, 0 delay 1 createsprite gFirePlumeSpriteTemplate, ANIM_ATTACKER, 66, -20, -10, 50, 5, -1, -1 @@ -4983,13 +4983,13 @@ Move_SACRED_FIRE:: @ 81CD793 createvisualtask AnimTask_InvertScreenColor, 2, 257, 257, 257 delay 1 waitforvisualfinish - playsewithpan SE_W221B, 63 + playsewithpan SE_M_SACRED_FIRE2, 63 createsprite gLargeFlameSpriteTemplate, ANIM_TARGET, 2, -16, 0, 70, 16, 0, 1 delay 10 - playsewithpan SE_W221B, 63 + playsewithpan SE_M_SACRED_FIRE2, 63 createsprite gLargeFlameSpriteTemplate, ANIM_TARGET, 2, 0, 0, 70, 16, 0, 1 delay 10 - playsewithpan SE_W221B, 63 + playsewithpan SE_M_SACRED_FIRE2, 63 createsprite gLargeFlameSpriteTemplate, ANIM_TARGET, 2, 16, 0, 80, 16, 0, 1 delay 1 createvisualtask AnimTask_InvertScreenColor, 2, 257, 257, 257 @@ -4997,7 +4997,7 @@ Move_SACRED_FIRE:: @ 81CD793 waitforvisualfinish createvisualtask AnimTask_InvertScreenColor, 2, 257, 257, 257 delay 1 - playsewithpan SE_W172B, 63 + playsewithpan SE_M_FLAME_WHEEL2, 63 createsprite gLargeFlameScatterSpriteTemplate, ANIM_TARGET, 2, 0, 0, 30, 30, -1, 0 delay 1 createsprite gLargeFlameScatterSpriteTemplate, ANIM_TARGET, 2, 0, 0, 30, 30, 0, 1 @@ -5020,7 +5020,7 @@ Move_SCRATCH:: @ 81CD97A loadspritegfx ANIM_TAG_SCRATCH monbg 1 setalpha 12, 8 - playsewithpan SE_W010, 63 + playsewithpan SE_M_SCRATCH, 63 createsprite gScratchSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 0 createvisualtask AnimTask_ShakeMon, 2, 1, 3, 0, 6, 1 waitforvisualfinish @@ -5033,7 +5033,7 @@ Move_DRAGON_BREATH:: @ 81CD9AC loadspritegfx ANIM_TAG_SMALL_EMBER monbg ANIM_DEF_PARTNER monbgprio_28 1 - loopsewithpan SE_W172, 192, 7, 7 + loopsewithpan SE_M_FLAME_WHEEL, 192, 7, 7 createsprite gDragonBreathFireSpriteTemplate, ANIM_TARGET, 2, 0, 0, 0, 0, 20 delay 2 createsprite gDragonBreathFireSpriteTemplate, ANIM_TARGET, 2, 0, 0, 0, 0, 20 @@ -5116,7 +5116,7 @@ Move_SNORE:: @ 81CDB98 end SnoreEffect:: @ 81CDBB1 - playsewithpan SE_W173, 192 + playsewithpan SE_M_SNORE, 192 createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 7, 0, 1 createvisualtask AnimTask_ShakeMon2, 2, 1, 4, 0, 7, 1 createsprite gShakeMonOrTerrainSpriteTemplate, ANIM_ATTACKER, 2, 6, 1, 14, 0, 0 @@ -5129,7 +5129,7 @@ Move_LIGHT_SCREEN:: @ 81CDC28 loadspritegfx ANIM_TAG_SPARKLE_3 loadspritegfx ANIM_TAG_GREEN_LIGHT_WALL setalpha 0, 16 - waitplaysewithpan SE_W115, 192, 15 + waitplaysewithpan SE_M_REFLECT, 192, 15 createsprite gLightScreenWallSpriteTemplate, ANIM_ATTACKER, 1, 40, 0, 10166 delay 10 call SpecialScreenSparkle @@ -5158,7 +5158,7 @@ Move_MIRROR_COAT:: @ 81CDCB4 setalpha 0, 16 createsprite gMirrorCoatWallSpriteTemplate, ANIM_ATTACKER, 1, 40, 0, 10168 delay 10 - playsewithpan SE_W115, 192 + playsewithpan SE_M_REFLECT, 192 call SpecialScreenSparkle waitforvisualfinish delay 1 @@ -5169,7 +5169,7 @@ Move_REFLECT:: @ 81CDCDA loadspritegfx ANIM_TAG_SPARKLE_4 loadspritegfx ANIM_TAG_BLUE_LIGHT_WALL setalpha 0, 16 - waitplaysewithpan SE_W115, 192, 15 + waitplaysewithpan SE_M_REFLECT, 192, 15 createsprite gReflectWallSpriteTemplate, ANIM_ATTACKER, 1, 40, 0, 10167 delay 20 createsprite gReflectSparkleSpriteTemplate, ANIM_ATTACKER, 2, 30, 0, 0, 1 @@ -5185,7 +5185,7 @@ Move_REFLECT:: @ 81CDCDA Move_BARRIER:: @ 81CDD2D loadspritegfx ANIM_TAG_GRAY_LIGHT_WALL setalpha 0, 16 - waitplaysewithpan SE_W112, 192, 15 + waitplaysewithpan SE_M_BARRIER, 192, 15 createsprite gBarrierWallSpriteTemplate, ANIM_ATTACKER, 3, 40, 0, 10169 waitforvisualfinish delay 1 @@ -5199,28 +5199,28 @@ Move_BUBBLE:: @ 81CDD4A setalpha 12, 8 delay 1 createsprite gWaterBubbleProjectileSpriteTemplate, ANIM_ATTACKER, 2, 18, 0, 15, -15, 10, 128, 100 - playsewithpan SE_W145, 192 - waitplaysewithpan SE_W145B, 63, 100 + playsewithpan SE_M_BUBBLE, 192 + waitplaysewithpan SE_M_BUBBLE2, 63, 100 delay 6 createsprite gWaterBubbleProjectileSpriteTemplate, ANIM_ATTACKER, 2, 18, 0, 35, 37, 40, 128, 100 - playsewithpan SE_W145, 192 - waitplaysewithpan SE_W145B, 63, 100 + playsewithpan SE_M_BUBBLE, 192 + waitplaysewithpan SE_M_BUBBLE2, 63, 100 delay 6 createsprite gWaterBubbleProjectileSpriteTemplate, ANIM_ATTACKER, 2, 18, 0, 10, -37, 30, 128, 100 - playsewithpan SE_W145, 192 - waitplaysewithpan SE_W145B, 63, 100 + playsewithpan SE_M_BUBBLE, 192 + waitplaysewithpan SE_M_BUBBLE2, 63, 100 delay 6 createsprite gWaterBubbleProjectileSpriteTemplate, ANIM_ATTACKER, 2, 18, 0, 30, 10, 15, 128, 100 - playsewithpan SE_W145, 192 - waitplaysewithpan SE_W145B, 63, 100 + playsewithpan SE_M_BUBBLE, 192 + waitplaysewithpan SE_M_BUBBLE2, 63, 100 delay 6 createsprite gWaterBubbleProjectileSpriteTemplate, ANIM_ATTACKER, 2, 18, 0, 20, 33, 20, 128, 100 - playsewithpan SE_W145, 192 - waitplaysewithpan SE_W145B, 63, 100 + playsewithpan SE_M_BUBBLE, 192 + waitplaysewithpan SE_M_BUBBLE2, 63, 100 delay 6 createsprite gWaterBubbleProjectileSpriteTemplate, ANIM_ATTACKER, 2, 18, 0, 25, -30, 10, 128, 100 - playsewithpan SE_W145, 192 - waitplaysewithpan SE_W145B, 63, 100 + playsewithpan SE_M_BUBBLE, 192 + waitplaysewithpan SE_M_BUBBLE2, 63, 100 waitforvisualfinish call WaterBubblesEffectLong waitforvisualfinish @@ -5233,7 +5233,7 @@ Move_SMOG:: @ 81CDE20 monbg ANIM_DEF_PARTNER monbgprio_29 setalpha 12, 8 - loopsewithpan SE_W054, 63, 17, 10 + loopsewithpan SE_M_MIST, 63, 17, 10 call SmogCloud call SmogCloud call SmogCloud @@ -5242,7 +5242,7 @@ Move_SMOG:: @ 81CDE20 call SmogCloud call SmogCloud delay 120 - loopsewithpan SE_W092, 63, 18, 2 + loopsewithpan SE_M_TOXIC, 63, 18, 2 createvisualtask AnimTask_CurseBlendEffect, 2, 4, 2, 2, 0, 12, 26650 delay 10 createvisualtask AnimTask_ShakeMon2, 2, 1, 2, 0, 15, 1 @@ -5262,7 +5262,7 @@ Move_FAINT_ATTACK:: @ 81CDE9B fadetobg 1 waitbgfadein delay 0 - playsewithpan SE_W185, 192 + playsewithpan SE_M_FAINT_ATTACK, 192 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, 0, 18, 6, 1, 3 createvisualtask AnimTask_AttackerFadeToInvisible, 2, 1 waitforvisualfinish @@ -5273,7 +5273,7 @@ Move_FAINT_ATTACK:: @ 81CDE9B monbg 1 setalpha 12, 8 delay 1 - playsewithpan SE_W233B, 63 + playsewithpan SE_M_VITAL_THROW2, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 1 createvisualtask AnimTask_ShakeMon2, 2, 1, 2, 0, 9, 1 waitforvisualfinish @@ -5297,7 +5297,7 @@ Move_SAND_ATTACK:: @ 81CDF22 monbg ANIM_ATK_PARTNER monbgprio_28 0 setalpha 12, 8 - playsewithpan SE_W028, 192 + playsewithpan SE_M_SAND_ATTACK, 192 createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, -10, 0, 0, 3 waitforvisualfinish createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 2 @@ -5323,7 +5323,7 @@ SandAttackDirt:: @ 81CDF72 Move_MUD_SLAP:: @ 81CDFCA loadspritegfx ANIM_TAG_MUD_SAND - playsewithpan SE_W028, 192 + playsewithpan SE_M_SAND_ATTACK, 192 createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, -10, 0, 0, 3 waitforvisualfinish createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 2 @@ -5348,14 +5348,14 @@ MudSlapMud:: @ 81CE010 Move_DRAGON_RAGE:: @ 81CE068 loadspritegfx ANIM_TAG_SMALL_EMBER loadspritegfx ANIM_TAG_FIRE_PLUME - playsewithpan SE_W082, 192 + playsewithpan SE_M_DRAGON_RAGE, 192 createvisualtask AnimTask_ShakeMon, 5, 0, 0, 2, 40, 1 waitforvisualfinish createsprite gSlideMonToOffsetSpriteTemplate, ANIM_TARGET, 2, 0, 15, 0, 0, 4 waitforvisualfinish createsprite gDragonRageFireSpitSpriteTemplate, ANIM_TARGET, 2, 30, 15, 0, 10, 10 waitforvisualfinish - loopsewithpan SE_W172B, 63, 11, 3 + loopsewithpan SE_M_FLAME_WHEEL2, 63, 11, 3 createvisualtask AnimTask_ShakeMon, 5, 1, 0, 3, 25, 1 createsprite gDragonRageFirePlumeSpriteTemplate, ANIM_TARGET, 66, 1, 5, 0 delay 1 @@ -5379,7 +5379,7 @@ Move_DRAGON_RAGE:: @ 81CE068 Move_RAIN_DANCE:: @ 81CE145 loadspritegfx ANIM_TAG_RAIN_DROPS - playsewithpan SE_W240, 192 + playsewithpan SE_M_RAIN_DANCE, 192 createvisualtask AnimTask_BlendSelected, 10, 1 | (0xF << 7), 2, 0, 4, RGB_BLACK waitforvisualfinish createvisualtask AnimTask_CreateRaindrops, 2, 0, 3, 120 @@ -5396,7 +5396,7 @@ Move_BITE:: @ 81CE190 loadspritegfx ANIM_TAG_IMPACT monbg 1 setalpha 12, 8 - playsewithpan SE_W044, 63 + playsewithpan SE_M_BITE, 63 createsprite gSharpTeethSpriteTemplate, ANIM_ATTACKER, 2, 0, -32, 0, 0, 819, 10 createsprite gSharpTeethSpriteTemplate, ANIM_ATTACKER, 2, 0, 32, 4, 0, -819, 10 delay 10 @@ -5415,14 +5415,14 @@ Move_CRUNCH:: @ 81CE1EE fadetobg 1 waitbgfadein setalpha 12, 8 - playsewithpan SE_W044, 63 + playsewithpan SE_M_BITE, 63 createsprite gSharpTeethSpriteTemplate, ANIM_ATTACKER, 2, -32, -32, 1, 819, 819, 10 createsprite gSharpTeethSpriteTemplate, ANIM_ATTACKER, 2, 32, 32, 5, -819, -819, 10 delay 10 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -8, 0, 1, 1 createvisualtask AnimTask_ShakeMon, 5, 1, 0, 7, 5, 2 waitforvisualfinish - playsewithpan SE_W044, 63 + playsewithpan SE_M_BITE, 63 createsprite gSharpTeethSpriteTemplate, ANIM_ATTACKER, 2, 32, -32, 7, -819, 819, 10 createsprite gSharpTeethSpriteTemplate, ANIM_ATTACKER, 2, -32, 32, 3, 819, -819, 10 delay 10 @@ -5441,7 +5441,7 @@ Move_CLAMP:: @ 81CE29E loadspritegfx ANIM_TAG_IMPACT monbg 1 setalpha 12, 8 - playsewithpan SE_W011, 63 + playsewithpan SE_M_VICEGRIP, 63 createsprite gClampJawSpriteTemplate, ANIM_ATTACKER, 2, -32, 0, 2, 819, 0, 10 createsprite gClampJawSpriteTemplate, ANIM_ATTACKER, 2, 32, 0, 6, -819, 0, 10 delay 10 @@ -5499,7 +5499,7 @@ IceBeamCreateCrystals:: @ 81CE3FC return Move_WITHDRAW:: @ 81CE432 - playsewithpan SE_W029, 192 + playsewithpan SE_M_HEADBUTT, 192 createvisualtask AnimTask_Withdraw, 5, waitforvisualfinish end @@ -5508,7 +5508,7 @@ Move_AURORA_BEAM:: @ 81CE43F loadspritegfx ANIM_TAG_RAINBOW_RINGS fadetobg 20 waitbgfadein - playsewithpan SE_W062, 192 + playsewithpan SE_M_BUBBLE_BEAM, 192 setarg 7, 0 createvisualtask AnimTask_RotateAuroraRingColors, 10, 130 call AuroraBeamCreateRings @@ -5552,7 +5552,7 @@ SolarBeamSetUp:: @ 81CE521 monbg ANIM_ATK_PARTNER setalpha 12, 8 createvisualtask AnimTask_CurseBlendEffect, 2, 2, 1, 4, 0, 11, 12287 - playsewithpan SE_W025, 192 + playsewithpan SE_M_MEGA_KICK, 192 call SolarBeamAbsorbEffect waitforvisualfinish clearmonbg ANIM_ATK_PARTNER @@ -5592,7 +5592,7 @@ SolarBeamAbsorbEffect:: @ 81CE54B SolarBeamUnleash:: @ 81CE61E call SetSolarbeamBg - panse_1B SE_W076, 192, 63, 2, 0 + panse_1B SE_M_SOLAR_BEAM, 192, 63, 2, 0 createvisualtask AnimTask_CreateSmallSolarbeamOrbs, 5, createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 0 delay 4 @@ -5646,10 +5646,10 @@ BlizzardContinue:: @ 81CE77E createvisualtask AnimTask_StartSlidingBg, 5, -2304, 0, 1, -1 waitbgfadein waitforvisualfinish - panse_1B SE_W059, 192, 63, 2, 0 + panse_1B SE_M_BLIZZARD, 192, 63, 2, 0 call BlizzardIceCrystals call BlizzardIceCrystals - playsewithpan SE_W059B, 63 + playsewithpan SE_M_BLIZZARD2, 63 waitforvisualfinish call IceCrystalEffectLong waitforvisualfinish @@ -5694,10 +5694,10 @@ Move_POWDER_SNOW:: @ 81CE8F4 monbg ANIM_DEF_PARTNER createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 1, 0, 3, 0 waitforvisualfinish - panse_1B SE_W016, 192, 63, 2, 0 + panse_1B SE_M_GUST, 192, 63, 2, 0 call PowderSnowSnowballs call PowderSnowSnowballs - playsewithpan SE_W016B, 63 + playsewithpan SE_M_GUST2, 63 waitforvisualfinish waitsound call IceCrystalEffectLong @@ -5732,7 +5732,7 @@ Move_HYDRO_PUMP:: @ 81CE9EE setalpha 12, 8 createvisualtask AnimTask_ShakeMon, 5, 0, 0, 2, 40, 1 delay 6 - panse_1B SE_W056, 192, 63, 2, 0 + panse_1B SE_M_HYDRO_PUMP, 192, 63, 2, 0 createvisualtask AnimTask_StartSinAnimTimer, 5, 100 call HydroPumpBeams call HydroPumpBeams @@ -5779,7 +5779,7 @@ Move_SIGNAL_BEAM:: @ 81CEAED loadspritegfx ANIM_TAG_DUCK createvisualtask AnimTask_ShakeMon, 5, 0, 0, 2, 25, 1 delay 6 - panse_1B SE_W062, 192, 63, 1, 0 + panse_1B SE_M_BUBBLE_BEAM, 192, 63, 1, 0 createvisualtask AnimTask_StartSinAnimTimer, 5, 100 call SignalBeamOrbs call SignalBeamOrbs @@ -5824,7 +5824,7 @@ Move_ABSORB:: @ 81CEBD5 setalpha 12, 8 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 0, 4, 13293 waitforvisualfinish - playsewithpan SE_W071, 63 + playsewithpan SE_M_ABSORB, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 2 delay 2 createvisualtask AnimTask_ShakeMon, 5, 1, 0, 5, 5, 1 @@ -5842,28 +5842,28 @@ Move_ABSORB:: @ 81CEBD5 end AbsorbEffect:: @ 81CEC44 - playsewithpan SE_W152, 63 + playsewithpan SE_M_CRABHAMMER, 63 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 delay 4 - playsewithpan SE_W152, 63 + playsewithpan SE_M_CRABHAMMER, 63 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26 delay 4 - playsewithpan SE_W152, 63 + playsewithpan SE_M_CRABHAMMER, 63 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 16, 33 delay 4 - playsewithpan SE_W152, 63 + playsewithpan SE_M_CRABHAMMER, 63 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, -15, -16, 36 delay 4 - playsewithpan SE_W152, 63 + playsewithpan SE_M_CRABHAMMER, 63 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 delay 4 - playsewithpan SE_W152, 63 + playsewithpan SE_M_CRABHAMMER, 63 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26 delay 4 - playsewithpan SE_W152, 63 + playsewithpan SE_M_CRABHAMMER, 63 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -10, 20, 20, 39 delay 4 - playsewithpan SE_W152, 63 + playsewithpan SE_M_CRABHAMMER, 63 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 5, -18, -20, 35 delay 4 return @@ -5877,7 +5877,7 @@ Move_MEGA_DRAIN:: @ 81CECED setalpha 12, 8 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 0, 8, 13293 waitforvisualfinish - playsewithpan SE_W071, 63 + playsewithpan SE_M_ABSORB, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 1 delay 2 createvisualtask AnimTask_ShakeMon, 5, 1, 0, 5, 5, 1 @@ -5895,35 +5895,35 @@ Move_MEGA_DRAIN:: @ 81CECED end MegaDrainAbsorbEffect:: @ 81CED5C - playsewithpan SE_W145C, 63 + playsewithpan SE_M_BUBBLE3, 63 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 5, -18, -20, 35 delay 4 - playsewithpan SE_W145C, 63 + playsewithpan SE_M_BUBBLE3, 63 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -10, 20, 20, 39 delay 4 - playsewithpan SE_W145C, 63 + playsewithpan SE_M_BUBBLE3, 63 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 16, 33 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26 delay 4 - playsewithpan SE_W145C, 63 + playsewithpan SE_M_BUBBLE3, 63 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, -15, -16, 36 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 delay 4 - playsewithpan SE_W145C, 63 + playsewithpan SE_M_BUBBLE3, 63 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, -15, -16, 36 delay 4 - playsewithpan SE_W145C, 63 + playsewithpan SE_M_BUBBLE3, 63 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 16, 33 delay 4 - playsewithpan SE_W145C, 63 + playsewithpan SE_M_BUBBLE3, 63 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -10, 20, 20, 39 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26 delay 4 - playsewithpan SE_W145C, 63 + playsewithpan SE_M_BUBBLE3, 63 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 5, -18, -20, 35 delay 4 @@ -5938,7 +5938,7 @@ Move_GIGA_DRAIN:: @ 81CEE7D setalpha 12, 8 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 0, 12, 13293 waitforvisualfinish - playsewithpan SE_W071, 63 + playsewithpan SE_M_ABSORB, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 0 delay 2 createvisualtask AnimTask_ShakeMon, 5, 1, 0, 5, 5, 1 @@ -5956,42 +5956,42 @@ Move_GIGA_DRAIN:: @ 81CEE7D end GigaDrainAbsorbEffect:: @ 81CEEEC - playsewithpan SE_W202, 63 + playsewithpan SE_M_GIGA_DRAIN, 63 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 5, -18, -40, 35 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -10, 20, 20, 39 delay 4 - playsewithpan SE_W202, 63 + playsewithpan SE_M_GIGA_DRAIN, 63 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 28, 26 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -10, 20, 40, 39 delay 4 - playsewithpan SE_W202, 63 + playsewithpan SE_M_GIGA_DRAIN, 63 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 16, 33 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -32, 26 delay 4 - playsewithpan SE_W202, 63 + playsewithpan SE_M_GIGA_DRAIN, 63 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, -15, -16, 36 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26 delay 4 - playsewithpan SE_W202, 63 + playsewithpan SE_M_GIGA_DRAIN, 63 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 16, 33 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, -15, -16, 36 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 delay 4 - playsewithpan SE_W202, 63 + playsewithpan SE_M_GIGA_DRAIN, 63 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 16, 33 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -40, 26 delay 4 - playsewithpan SE_W202, 63 + playsewithpan SE_M_GIGA_DRAIN, 63 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 36, 33 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -10, 20, 20, 39 delay 4 - playsewithpan SE_W202, 63 + playsewithpan SE_M_GIGA_DRAIN, 63 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 5, -18, -20, 35 @@ -6011,7 +6011,7 @@ Move_LEECH_LIFE:: @ 81CF085 createsprite gLeechLifeNeedleSpriteTemplate, ANIM_ATTACKER, 2, -20, 15, 12 waitforvisualfinish createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 2 - playsewithpan SE_W071, 63 + playsewithpan SE_M_ABSORB, 63 delay 2 createvisualtask AnimTask_ShakeMon, 5, 1, 0, 5, 5, 1 waitforvisualfinish @@ -6032,7 +6032,7 @@ Move_SYNTHESIS:: @ 81CF107 loadspritegfx ANIM_TAG_BLUE_STAR loadspritegfx ANIM_TAG_SPARKLE_2 createvisualtask AnimTask_CurseBlendEffect, 2, 2, 2, 2, 0, 16, 19451 - playsewithpan SE_W025, 192 + playsewithpan SE_M_MEGA_KICK, 192 call GrantingStarsEffect waitforvisualfinish call HealingEffect @@ -6052,22 +6052,22 @@ Move_TOXIC:: @ 81CF131 ToxicBubbles:: @ 81CF14B createsprite gToxicBubbleSpriteTemplate, ANIM_TARGET, 2, -24, 16, 1, 1 - playsewithpan SE_W092, 63 + playsewithpan SE_M_TOXIC, 63 delay 15 createsprite gToxicBubbleSpriteTemplate, ANIM_TARGET, 2, 8, 16, 1, 1 - playsewithpan SE_W092, 63 + playsewithpan SE_M_TOXIC, 63 delay 15 createsprite gToxicBubbleSpriteTemplate, ANIM_TARGET, 2, -8, 16, 1, 1 - playsewithpan SE_W092, 63 + playsewithpan SE_M_TOXIC, 63 delay 15 createsprite gToxicBubbleSpriteTemplate, ANIM_TARGET, 2, 24, 16, 1, 1 - playsewithpan SE_W092, 63 + playsewithpan SE_M_TOXIC, 63 delay 15 return Move_SLUDGE:: @ 81CF1A0 loadspritegfx ANIM_TAG_POISON_BUBBLE - playsewithpan SE_W145C, 192 + playsewithpan SE_M_BUBBLE3, 192 createsprite gSludgeProjectileSpriteTemplate, ANIM_TARGET, 2, 20, 0, 40, 0 waitforvisualfinish createvisualtask AnimTask_ShakeMon, 5, 1, 3, 0, 5, 1 @@ -6094,19 +6094,19 @@ Move_SLUDGE_BOMB:: @ 81CF1E2 createsprite gSludgeBombHitParticleSpriteTemplate, ANIM_TARGET, 2, -27, 44, 20 createsprite gSludgeBombHitParticleSpriteTemplate, ANIM_TARGET, 2, 39, -28, 20 createsprite gSludgeBombHitParticleSpriteTemplate, ANIM_TARGET, 2, -42, -42, 20 - playsewithpan SE_W091, 63 + playsewithpan SE_M_DIG, 63 delay 5 createsprite gSludgeBombHitParticleSpriteTemplate, ANIM_TARGET, 2, 0, 40, 20 createsprite gSludgeBombHitParticleSpriteTemplate, ANIM_TARGET, 2, -8, -44, 20 createsprite gSludgeBombHitParticleSpriteTemplate, ANIM_TARGET, 2, -46, -28, 20 createsprite gSludgeBombHitParticleSpriteTemplate, ANIM_TARGET, 2, 46, 9, 20 - playsewithpan SE_W091, 63 + playsewithpan SE_M_DIG, 63 delay 5 createsprite gSludgeBombHitParticleSpriteTemplate, ANIM_TARGET, 2, 42, 0, 20 createsprite gSludgeBombHitParticleSpriteTemplate, ANIM_TARGET, 2, -43, -12, 20 createsprite gSludgeBombHitParticleSpriteTemplate, ANIM_TARGET, 2, 16, -46, 20 createsprite gSludgeBombHitParticleSpriteTemplate, ANIM_TARGET, 2, -16, 44, 20 - playsewithpan SE_W091, 63 + playsewithpan SE_M_DIG, 63 delay 0 waitsound waitforvisualfinish @@ -6115,7 +6115,7 @@ Move_SLUDGE_BOMB:: @ 81CF1E2 end SludgeBombProjectile:: @ 81CF2F2 - playsewithpan SE_W145C, 192 + playsewithpan SE_M_BUBBLE3, 192 createsprite gSludgeProjectileSpriteTemplate, ANIM_TARGET, 2, 20, 0, 40, 0 delay 3 return @@ -6124,31 +6124,31 @@ Move_ACID:: @ 81CF308 loadspritegfx ANIM_TAG_POISON_BUBBLE monbg ANIM_DEF_PARTNER createsprite gAcidPoisonBubbleSpriteTemplate, ANIM_TARGET, 2, 20, 0, 40, 1, 0, 0 - playsewithpan SE_W145C, 192 + playsewithpan SE_M_BUBBLE3, 192 delay 5 createsprite gAcidPoisonBubbleSpriteTemplate, ANIM_TARGET, 2, 20, 0, 40, 1, 24, 0 - playsewithpan SE_W145C, 192 + playsewithpan SE_M_BUBBLE3, 192 delay 5 createsprite gAcidPoisonBubbleSpriteTemplate, ANIM_TARGET, 2, 20, 0, 40, 1, -24, 0 - playsewithpan SE_W145C, 192 + playsewithpan SE_M_BUBBLE3, 192 delay 15 createvisualtask AnimTask_ShakeMon2, 5, 1, 2, 0, 10, 1 createvisualtask AnimTask_ShakeMon2, 5, 3, 2, 0, 10, 1 createvisualtask AnimTask_CurseBlendEffect, 2, 20, 2, 2, 0, 12, 31774 createsprite gAcidPoisonDropletSpriteTemplate, ANIM_TARGET, 2, 0, -22, 0, 15, 55 - playsewithpan SE_W145, 63 + playsewithpan SE_M_BUBBLE, 63 delay 10 createsprite gAcidPoisonDropletSpriteTemplate, ANIM_TARGET, 2, -26, -24, 0, 15, 55 - playsewithpan SE_W145, 63 + playsewithpan SE_M_BUBBLE, 63 delay 10 createsprite gAcidPoisonDropletSpriteTemplate, ANIM_TARGET, 2, 15, -27, 0, 15, 50 - playsewithpan SE_W145, 63 + playsewithpan SE_M_BUBBLE, 63 delay 10 createsprite gAcidPoisonDropletSpriteTemplate, ANIM_TARGET, 2, -15, -17, 0, 10, 45 - playsewithpan SE_W145, 63 + playsewithpan SE_M_BUBBLE, 63 delay 10 createsprite gAcidPoisonDropletSpriteTemplate, ANIM_TARGET, 2, 27, -22, 0, 15, 50 - playsewithpan SE_W145, 63 + playsewithpan SE_M_BUBBLE, 63 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER end @@ -6159,14 +6159,14 @@ Move_BONEMERANG:: @ 81CF402 monbg ANIM_DEF_PARTNER monbgprio_28 1 setalpha 12, 8 - playsewithpan SE_W155, 192 + playsewithpan SE_M_BONEMERANG, 192 createsprite gBonemerangSpriteTemplate, ANIM_ATTACKER, 2 delay 20 - playsewithpan SE_W030, 63 + playsewithpan SE_M_HORN_ATTACK, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 1 createvisualtask AnimTask_ShakeMon, 5, 1, 5, 0, 5, 1 delay 17 - playsewithpan SE_W233, 192 + playsewithpan SE_M_VITAL_THROW, 192 createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 6, -4 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER @@ -6179,13 +6179,13 @@ Move_BONE_CLUB:: @ 81CF456 monbg ANIM_DEF_PARTNER monbgprio_28 1 setalpha 12, 8 - playsewithpan SE_W155, 63 + playsewithpan SE_M_BONEMERANG, 63 createsprite gSpinningBoneSpriteTemplate, ANIM_ATTACKER, 2, -42, -25, 0, 0, 15 delay 12 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 1 createvisualtask AnimTask_ShakeMon, 5, 1, 0, 5, 5, 1 createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 7, 5, 1, 0, 10, 0, 0 - playsewithpan SE_W233B, 63 + playsewithpan SE_M_VITAL_THROW2, 63 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -6196,12 +6196,12 @@ Move_BONE_RUSH:: @ 81CF4B8 loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W155, 63 + playsewithpan SE_M_BONEMERANG, 63 createsprite gSpinningBoneSpriteTemplate, ANIM_ATTACKER, 2, -42, -25, 0, 0, 15 delay 12 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon, 5, 1, 0, 3, 5, 1 - playsewithpan SE_W030, 63 + playsewithpan SE_M_HORN_ATTACK, 63 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -6210,15 +6210,15 @@ Move_BONE_RUSH:: @ 81CF4B8 Move_SPIKES:: @ 81CF503 loadspritegfx ANIM_TAG_SPIKES monbg ANIM_DEF_PARTNER - playsewithpan SE_W026, 192 - waitplaysewithpan SE_W030, 63, 28 + playsewithpan SE_M_JUMP_KICK, 192 + waitplaysewithpan SE_M_HORN_ATTACK, 63, 28 createsprite gSpikesSpriteTemplate, ANIM_TARGET, 2, 20, 0, 0, 24, 30 delay 10 - playsewithpan SE_W026, 192 - waitplaysewithpan SE_W030, 63, 28 + playsewithpan SE_M_JUMP_KICK, 192 + waitplaysewithpan SE_M_HORN_ATTACK, 63, 28 createsprite gSpikesSpriteTemplate, ANIM_TARGET, 2, 20, 0, -24, 24, 30 delay 10 - waitplaysewithpan SE_W030, 63, 28 + waitplaysewithpan SE_M_HORN_ATTACK, 63, 28 createsprite gSpikesSpriteTemplate, ANIM_TARGET, 2, 20, 0, 24, 24, 30 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER @@ -6228,7 +6228,7 @@ Move_MEGAHORN:: @ 81CF55A loadspritegfx ANIM_TAG_HORN_HIT_2 loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER - playsewithpan SE_W082, 192 + playsewithpan SE_M_DRAGON_RAGE, 192 jumpifcontest MegahornInContest fadetobg 7 waitbgfadeout @@ -6243,7 +6243,7 @@ MegahornContinue:: @ 81CF57D delay 3 createsprite gMegahornHornSpriteTemplate, ANIM_ATTACKER, 3, -42, 25, 0, 0, 6 delay 4 - playsewithpan SE_W011, 63 + playsewithpan SE_M_VICEGRIP, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 0 createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 1, -16, 4, 1, 4 waitforvisualfinish @@ -6275,13 +6275,13 @@ Move_GUST:: @ 81CF648 monbg ANIM_DEF_PARTNER monbgprio_28 1 setalpha 12, 8 - playsewithpan SE_W016, 63 + playsewithpan SE_M_GUST, 63 createsprite gEllipticalGustSpriteTemplate, ANIM_ATTACKER, 2, 0, -16 createvisualtask AnimTask_AnimateGustTornadoPalette, 5, 1, 70 waitforvisualfinish createvisualtask AnimTask_ShakeMon2, 5, 1, 1, 0, 7, 1 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 2 - playsewithpan SE_W016B, 63 + playsewithpan SE_M_GUST2, 63 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -6293,7 +6293,7 @@ Move_WING_ATTACK:: @ 81CF699 monbg ANIM_DEF_PARTNER monbgprio_28 1 setalpha 12, 8 - loopsewithpan SE_W017, 192, 20, 2 + loopsewithpan SE_M_WING_ATTACK, 192, 20, 2 createvisualtask AnimTask_TranslateMonElliptical, 2, 0, 12, 4, 1, 4 createvisualtask AnimTask_AnimateGustTornadoPalette, 5, 1, 70 createsprite gGustToTargetSpriteTemplate, ANIM_ATTACKER, 2, -25, 0, 0, 0, 20 @@ -6303,7 +6303,7 @@ Move_WING_ATTACK:: @ 81CF699 delay 17 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 16, 0, 1, 1 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -16, 0, 1, 1 - loopsewithpan SE_W003, 63, 5, 2 + loopsewithpan SE_M_DOUBLE_SLAP, 63, 5, 2 waitforvisualfinish createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 11 waitforvisualfinish @@ -6313,7 +6313,7 @@ Move_WING_ATTACK:: @ 81CF699 Move_PECK:: @ 81CF736 loadspritegfx ANIM_TAG_IMPACT - playsewithpan SE_W030, 63 + playsewithpan SE_M_HORN_ATTACK, 63 createvisualtask AnimTask_RotateMonToSideAndRestore, 2, 3, -768, 1, 2 createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, -12, 0, 1, 3 waitforvisualfinish @@ -6334,7 +6334,7 @@ Move_AEROBLAST:: @ 81CF75D call AeroblastBeam waitforvisualfinish createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 0 - playsewithpan SE_W013, 63 + playsewithpan SE_M_RAZOR_WIND, 63 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -6343,19 +6343,19 @@ Move_AEROBLAST:: @ 81CF75D end AeroblastBeam:: @ 81CF7B9 - playsewithpan SE_W026, 192 + playsewithpan SE_M_JUMP_KICK, 192 createsprite gAirWaveCrescentSpriteTemplate, ANIM_ATTACKER, 2, 14, -12, 0, -12, 15, 0, 0 createsprite gAirWaveCrescentSpriteTemplate, ANIM_ATTACKER, 2, 26, 8, 12, 8, 15, 0, 0 delay 3 - playsewithpan SE_W026, 192 + playsewithpan SE_M_JUMP_KICK, 192 createsprite gAirWaveCrescentSpriteTemplate, ANIM_ATTACKER, 2, 14, -12, 0, -12, 15, 1, 0 createsprite gAirWaveCrescentSpriteTemplate, ANIM_ATTACKER, 2, 26, 8, 12, 8, 15, 1, 0 delay 3 - playsewithpan SE_W026, 192 + playsewithpan SE_M_JUMP_KICK, 192 createsprite gAirWaveCrescentSpriteTemplate, ANIM_ATTACKER, 2, 14, -12, 0, -12, 15, 2, 0 createsprite gAirWaveCrescentSpriteTemplate, ANIM_ATTACKER, 2, 26, 8, 12, 8, 15, 2, 0 delay 3 - playsewithpan SE_W026, 192 + playsewithpan SE_M_JUMP_KICK, 192 createsprite gAirWaveCrescentSpriteTemplate, ANIM_ATTACKER, 2, 14, -12, 0, -12, 15, 3, 0 createsprite gAirWaveCrescentSpriteTemplate, ANIM_ATTACKER, 2, 26, 8, 12, 8, 15, 3, 0 delay 3 @@ -6368,18 +6368,18 @@ Move_WATER_GUN:: @ 81CF87A monbgprio_28 1 setalpha 12, 8 createsprite gWaterGunProjectileSpriteTemplate, ANIM_ATTACKER, 2, 20, 0, 0, 0, 40, -25 - playsewithpan SE_W145, 192 + playsewithpan SE_M_BUBBLE, 192 waitforvisualfinish createvisualtask AnimTask_ShakeMon2, 5, 1, 1, 0, 8, 1 createsprite gWaterHitSplatSpriteTemplate, ANIM_ATTACKER, 4, 0, 0, 1, 2 createsprite gWaterGunDropletSpriteTemplate, ANIM_ATTACKER, 2, 0, -15, 0, 15, 55 - playsewithpan SE_W152, 63 + playsewithpan SE_M_CRABHAMMER, 63 delay 10 createsprite gWaterGunDropletSpriteTemplate, ANIM_ATTACKER, 2, 15, -20, 0, 15, 50 - playsewithpan SE_W152, 63 + playsewithpan SE_M_CRABHAMMER, 63 delay 10 createsprite gWaterGunDropletSpriteTemplate, ANIM_ATTACKER, 2, -15, -10, 0, 10, 45 - playsewithpan SE_W152, 63 + playsewithpan SE_M_CRABHAMMER, 63 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -6391,7 +6391,7 @@ Move_CRABHAMMER:: @ 81CF907 monbg ANIM_DEF_PARTNER setalpha 12, 8 createsprite gWaterHitSplatSpriteTemplate, ANIM_ATTACKER, 4, 0, 0, 1, 0 - playsewithpan SE_W233B, 63 + playsewithpan SE_M_VITAL_THROW2, 63 delay 1 createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 1, 32429, 10, 0, 0 createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 1, -24, 0, 0, 4 @@ -6400,7 +6400,7 @@ Move_CRABHAMMER:: @ 81CF907 waitforvisualfinish createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 4 waitforvisualfinish - loopsewithpan SE_W152, 63, 20, 3 + loopsewithpan SE_M_CRABHAMMER, 63, 20, 3 createvisualtask AnimTask_ShakeMon, 5, 1, 0, 4, 8, 1 createsprite gSmallBubblePairSpriteTemplate, ANIM_ATTACKER, 2, 10, 10, 20, 1 delay 4 @@ -6425,7 +6425,7 @@ Move_CRABHAMMER:: @ 81CF907 Move_SURF:: @ 81CFA01 createvisualtask AnimTask_CreateSurfWave, 2, 0 delay 24 - panse_1B SE_W057, 192, 63, 2, 0 + panse_1B SE_M_SURF, 192, 63, 2, 0 waitforvisualfinish end @@ -6437,7 +6437,7 @@ Move_FLAMETHROWER:: @ 81CFA15 createvisualtask AnimTask_ShakeMon, 5, 0, 0, 2, 46, 1 delay 6 createvisualtask AnimTask_StartSinAnimTimer, 5, 100 - panse_1B SE_W053, 192, 63, 2, 0 + panse_1B SE_M_FLAMETHROWER, 192, 63, 2, 0 call FlamethrowerCreateFlames call FlamethrowerCreateFlames call FlamethrowerCreateFlames @@ -6464,7 +6464,7 @@ FlamethrowerCreateFlames:: @ 81CFA8F Move_SANDSTORM:: @ 81CFAB2 loadspritegfx ANIM_TAG_FLYING_DIRT - playsewithpan SE_W201, 0 + playsewithpan SE_M_SANDSTORM, 0 createvisualtask AnimTask_LoadSandstormBackground, 5, 0 delay 16 createsprite gFlyingSandCrescentSpriteTemplate, ANIM_ATTACKER, 40, 10, 2304, 96, 0 @@ -6489,7 +6489,7 @@ Move_WHIRLPOOL:: @ 81CFB3A setalpha 12, 8 delay 0 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 4, 2, 0, 7, 23968 - playsewithpan SE_W250, 63 + playsewithpan SE_M_WHIRLPOOL, 63 createvisualtask AnimTask_ShakeMon, 5, 1, 0, 2, 50, 1 call WhirlpoolEffect call WhirlpoolEffect @@ -6524,19 +6524,19 @@ FlyEnd:: @ 81CFC2C end FlySetUp:: @ 81CFC2E - playsewithpan SE_W019, 192 + playsewithpan SE_M_FLY, 192 createsprite gFlyBallUpSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 13, 336 goto FlyEnd FlyUnleash:: @ 81CFC46 monbg ANIM_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W104, 192 + playsewithpan SE_M_DOUBLE_TEAM, 192 createsprite gFlyBallAttackSpriteTemplate, ANIM_ATTACKER, 2, 20 delay 20 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 0 createvisualtask AnimTask_ShakeMon, 5, 1, 6, 0, 8, 1 - playsewithpan SE_W013, 63 + playsewithpan SE_M_RAZOR_WIND, 63 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -6550,17 +6550,17 @@ BounceEnd:: @ 81CFC96 end BounceSetUp:: @ 81CFC97 - playsewithpan SE_W100, 192 + playsewithpan SE_M_TELEPORT, 192 createsprite gBounceBallShrinkSpriteTemplate, ANIM_ATTACKER, 2, 0, 0 goto BounceEnd BounceUnleash:: @ 81CFCAB monbg ANIM_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W207, 63 + playsewithpan SE_M_SWAGGER, 63 createsprite gBounceBallLandSpriteTemplate, ANIM_TARGET, 3 delay 7 - playsewithpan SE_W025B, 63 + playsewithpan SE_M_MEGA_KICK2, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 0, 0, 1, 0 createvisualtask AnimTask_ShakeMon, 5, 1, 0, 5, 11, 1 waitforvisualfinish @@ -6574,10 +6574,10 @@ Move_KARATE_CHOP:: @ 81CFCEA monbg ANIM_DEF_PARTNER monbgprio_28 1 setalpha 12, 8 - playsewithpan SE_W104, 63 + playsewithpan SE_M_DOUBLE_TEAM, 63 createsprite gKarateChopSpriteTemplate, ANIM_ATTACKER, 2, -16, 0, 0, 0, 10, 1, 3, 0 waitforvisualfinish - playsewithpan SE_W004, 63 + playsewithpan SE_M_COMET_PUNCH, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon, 5, 1, 4, 0, 6, 1 waitforvisualfinish @@ -6590,11 +6590,11 @@ Move_CROSS_CHOP:: @ 81CFD3C loadspritegfx ANIM_TAG_CROSS_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W025, 63 + playsewithpan SE_M_MEGA_KICK, 63 createsprite gCrossChopHandSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 0 createsprite gCrossChopHandSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1 delay 40 - playsewithpan SE_W013, 63 + playsewithpan SE_M_RAZOR_WIND, 63 createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 1, RGB_WHITE, 10, 0, 10 createsprite gCrossImpactSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 20 createvisualtask AnimTask_ShakeMon, 5, 1, 7, 0, 9, 1 @@ -6611,11 +6611,11 @@ Move_JUMP_KICK:: @ 81CFDA5 createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 4 delay 3 createsprite gJumpKickSpriteTemplate, ANIM_ATTACKER, 2, -16, 8, 0, 0, 10, 1, 1, 1 - playsewithpan SE_W026, 63 + playsewithpan SE_M_JUMP_KICK, 63 waitforvisualfinish createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 1, 0, 0, 1, 1 createvisualtask AnimTask_ShakeMon, 5, 1, 5, 0, 7, 1 - playsewithpan SE_W004, 63 + playsewithpan SE_M_COMET_PUNCH, 63 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -6632,10 +6632,10 @@ Move_HI_JUMP_KICK:: @ 81CFE02 createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 3 delay 2 createsprite gJumpKickSpriteTemplate, ANIM_ATTACKER, 2, -16, 8, 0, 0, 10, 1, 1, 1 - playsewithpan SE_W026, 63 + playsewithpan SE_M_JUMP_KICK, 63 waitforvisualfinish createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 1 - playsewithpan SE_W233B, 63 + playsewithpan SE_M_VITAL_THROW2, 63 createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 1, -28, 0, 0, 3 delay 3 createvisualtask AnimTask_ShakeMonInPlace, 2, 1, 3, 0, 11, 1 @@ -6654,7 +6654,7 @@ Move_DOUBLE_KICK:: @ 81CFE98 setalpha 12, 8 createsprite gFistFootRandomPosSpriteTemplate, ANIM_ATTACKER, 3, 1, 20, 1 createvisualtask AnimTask_ShakeMon, 5, 1, 4, 0, 6, 1 - playsewithpan SE_W233B, 63 + playsewithpan SE_M_VITAL_THROW2, 63 waitforvisualfinish waitforvisualfinish clearmonbg ANIM_DEF_PARTNER @@ -6666,7 +6666,7 @@ Move_TRIPLE_KICK:: @ 81CFECB loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W233B, 63 + playsewithpan SE_M_VITAL_THROW2, 63 jumpifmoveturn 0, TripleKickLeft jumpifmoveturn 1, TripleKickRight goto TripleKickCenter @@ -6702,26 +6702,26 @@ Move_DYNAMIC_PUNCH:: @ 81CFF92 delay 1 monbg ANIM_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W233B, 63 + playsewithpan SE_M_VITAL_THROW2, 63 createsprite gFistFootSpriteTemplate, ANIM_TARGET, 3, 0, 0, 20, 1, 0 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 0, 0, 1, 0 createvisualtask AnimTask_ShakeMon, 5, 1, 5, 0, 7, 1 delay 1 waitsound - playsewithpan SE_W120, 63 + playsewithpan SE_M_SELF_DESTRUCT, 63 createvisualtask AnimTask_ShakeMon2, 5, 1, 5, 0, 28, 1 createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 1 delay 6 - playsewithpan SE_W120, 63 + playsewithpan SE_M_SELF_DESTRUCT, 63 createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 24, -24, 1, 1 delay 6 - playsewithpan SE_W120, 63 + playsewithpan SE_M_SELF_DESTRUCT, 63 createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, -16, 16, 1, 1 delay 6 - playsewithpan SE_W120, 63 + playsewithpan SE_M_SELF_DESTRUCT, 63 createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, -24, -12, 1, 1 delay 6 - playsewithpan SE_W120, 63 + playsewithpan SE_M_SELF_DESTRUCT, 63 createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 16, 16, 1, 1 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER @@ -6734,23 +6734,23 @@ Move_COUNTER:: @ 81D005A monbg ANIM_DEF_PARTNER setalpha 12, 8 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, 0, 18, 6, 1, 4 - playsewithpan SE_W233, 192 + playsewithpan SE_M_VITAL_THROW, 192 waitforvisualfinish createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, 0, 0, 4 delay 4 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -15, 18, 1, 0 - playsewithpan SE_W233B, 63 + playsewithpan SE_M_VITAL_THROW2, 63 delay 1 createvisualtask AnimTask_ShakeMon, 2, 1, 5, 0, 25, 1 createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 3, -15, 18, 8, 1, 0 delay 3 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, -4, 1, 0 - playsewithpan SE_W233B, 63 + playsewithpan SE_M_VITAL_THROW2, 63 delay 1 createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 3, 0, -4, 8, 1, 0 delay 3 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 15, 9, 1, 0 - playsewithpan SE_W233B, 63 + playsewithpan SE_M_VITAL_THROW2, 63 delay 1 createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 3, 15, 9, 8, 1, 0 delay 5 @@ -6764,13 +6764,13 @@ Move_VITAL_THROW:: @ 81D0129 loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W233, 192 + playsewithpan SE_M_VITAL_THROW, 192 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, 0, 12, 4, 1, 2 waitforvisualfinish createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, 0, 0, 4 delay 2 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 1 - playsewithpan SE_W233B, 63 + playsewithpan SE_M_VITAL_THROW2, 63 delay 1 createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 1, -24, 0, 0, 4 waitforvisualfinish @@ -6792,10 +6792,10 @@ Move_ROCK_SMASH:: @ 81D01A4 delay 1 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 1 createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 8, 1, 0 - playsewithpan SE_W233B, 63 + playsewithpan SE_M_VITAL_THROW2, 63 createvisualtask AnimTask_ShakeMon, 2, 1, 3, 0, 5, 1 waitforvisualfinish - playsewithpan SE_W088, 63 + playsewithpan SE_M_ROCK_THROW, 63 createsprite gRockFragmentSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 20, 24, 14, 2 createsprite gRockFragmentSpriteTemplate, ANIM_ATTACKER, 2, 5, 0, -20, 24, 14, 1 createsprite gRockFragmentSpriteTemplate, ANIM_ATTACKER, 2, 0, 5, 20, -24, 14, 2 @@ -6814,16 +6814,16 @@ Move_SUBMISSION:: @ 81D029C loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W104, 192 - waitplaysewithpan SE_W004, 63, 10 - waitplaysewithpan SE_W104, 192, 20 - waitplaysewithpan SE_W004, 63, 30 - waitplaysewithpan SE_W104, 192, 40 - waitplaysewithpan SE_W004, 63, 50 - waitplaysewithpan SE_W104, 192, 60 - waitplaysewithpan SE_W004, 63, 70 - waitplaysewithpan SE_W104, 192, 80 - waitplaysewithpan SE_W004, 63, 90 + playsewithpan SE_M_DOUBLE_TEAM, 192 + waitplaysewithpan SE_M_COMET_PUNCH, 63, 10 + waitplaysewithpan SE_M_DOUBLE_TEAM, 192, 20 + waitplaysewithpan SE_M_COMET_PUNCH, 63, 30 + waitplaysewithpan SE_M_DOUBLE_TEAM, 192, 40 + waitplaysewithpan SE_M_COMET_PUNCH, 63, 50 + waitplaysewithpan SE_M_DOUBLE_TEAM, 192, 60 + waitplaysewithpan SE_M_COMET_PUNCH, 63, 70 + waitplaysewithpan SE_M_DOUBLE_TEAM, 192, 80 + waitplaysewithpan SE_M_COMET_PUNCH, 63, 90 createvisualtask AnimTask_TranslateMonElliptical, 2, 0, -18, 6, 6, 4 createvisualtask AnimTask_TranslateMonElliptical, 2, 1, 18, 6, 6, 4 call SubmissionHit @@ -6849,7 +6849,7 @@ Move_SUNNY_DAY:: @ 81D033F setalpha 13, 3 createvisualtask AnimTask_BlendSelected, 10, 1 | (0xF << 7), 1, 0, 6, RGB_WHITE waitforvisualfinish - panse_26 SE_W080, 192, 63, 1, 0 + panse_26 SE_M_PETAL_DANCE, 192, 63, 1, 0 call SunnyDayLightRay call SunnyDayLightRay call SunnyDayLightRay @@ -6870,7 +6870,7 @@ Move_COTTON_SPORE:: @ 81D0395 loadspritegfx ANIM_TAG_SPORE monbg ANIM_DEF_PARTNER monbgprio_28 1 - loopsewithpan SE_W077, 63, 18, 10 + loopsewithpan SE_M_POISON_POWDER, 63, 18, 10 call CreateCottonSpores call CreateCottonSpores call CreateCottonSpores @@ -6892,7 +6892,7 @@ Move_SPORE:: @ 81D03EF monbg ANIM_DEF_PARTNER setalpha 12, 8 createvisualtask AnimTask_SporeDoubleBattle, 2, - loopsewithpan SE_W077, 63, 16, 11 + loopsewithpan SE_M_POISON_POWDER, 63, 16, 11 call CreateSpore call CreateSpore call CreateSpore @@ -6916,7 +6916,7 @@ Move_PETAL_DANCE:: @ 81D0454 loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W080, 192 + playsewithpan SE_M_PETAL_DANCE, 192 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, 0, 12, 6, 6, 3 createsprite gPetalDanceBigFlowerSpriteTemplate, ANIM_ATTACKER, 2, 0, -24, 8, 140 createsprite gPetalDanceSmallFlowerSpriteTemplate, ANIM_ATTACKER, 2, 16, -24, 8, 100 @@ -6938,7 +6938,7 @@ Move_PETAL_DANCE:: @ 81D0454 waitforvisualfinish createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 24, 0, 0, 5 delay 3 - playsewithpan SE_W025B, 63 + playsewithpan SE_M_MEGA_KICK2, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 0 createvisualtask AnimTask_ShakeMon, 2, 1, 6, 0, 8, 1 waitforvisualfinish @@ -6956,7 +6956,7 @@ Move_RAZOR_LEAF:: @ 81D058C monbg ANIM_DEF_PARTNER setalpha 12, 8 delay 1 - loopsewithpan SE_W077, 192, 10, 5 + loopsewithpan SE_M_POISON_POWDER, 192, 10, 5 createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, -3, -2, 10 delay 2 createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, -1, -1, 15 @@ -6977,11 +6977,11 @@ Move_RAZOR_LEAF:: @ 81D058C delay 2 createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, -3, -5, 8 delay 60 - playsewithpan SE_W013B, 192 + playsewithpan SE_M_RAZOR_WIND2, 192 createsprite gRazorLeafCutterSpriteTemplate, ANIM_TARGET, 3, 20, -10, 20, 0, 22, 20, 1 createsprite gRazorLeafCutterSpriteTemplate, ANIM_TARGET, 3, 20, -10, 20, 0, 22, -20, 1 delay 20 - playsewithpan SE_W013, 63 + playsewithpan SE_M_RAZOR_WIND, 63 createvisualtask AnimTask_ShakeMon2, 2, 1, 2, 0, 8, 1 createvisualtask AnimTask_ShakeMon2, 2, 3, 2, 0, 8, 1 waitforvisualfinish @@ -7002,7 +7002,7 @@ Move_ANCIENT_POWER:: @ 81D0693 createsprite gAncientPowerRockSpriteTemplate, ANIM_ATTACKER, 2, 20, 32, -28, 60, 1 createsprite gAncientPowerRockSpriteTemplate, ANIM_ATTACKER, 2, 0, 32, -28, 30, 4 createvisualtask AnimTask_ShakeMon2, 2, 0, 1, 0, 30, 1 - playsewithpan SE_W082, 192 + playsewithpan SE_M_DRAGON_RAGE, 192 delay 10 createsprite gAncientPowerRockSpriteTemplate, ANIM_ATTACKER, 2, 15, 32, -48, 25, 5 createsprite gAncientPowerRockSpriteTemplate, ANIM_ATTACKER, 2, -10, 32, -42, 30, 4 @@ -7012,7 +7012,7 @@ Move_ANCIENT_POWER:: @ 81D0693 waitforvisualfinish createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 16, 0, 0, 4 delay 3 - playsewithpan SE_W120, 63 + playsewithpan SE_M_SELF_DESTRUCT, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 1 createvisualtask AnimTask_ShakeMon2, 2, 1, 3, 0, 6, 1 waitforvisualfinish @@ -7025,10 +7025,10 @@ Move_ANCIENT_POWER:: @ 81D0693 Move_OCTAZOOKA:: @ 81D07BB loadspritegfx ANIM_TAG_GRAY_SMOKE loadspritegfx ANIM_TAG_BLACK_BALL - playsewithpan SE_W025B, 192 + playsewithpan SE_M_MEGA_KICK2, 192 createsprite gOctazookaBallSpriteTemplate, ANIM_TARGET, 2, 20, 0, 0, 0, 20, 0 waitforvisualfinish - playsewithpan SE_W120, 63 + playsewithpan SE_M_SELF_DESTRUCT, 63 createsprite gOctazookaSmokeSpriteTemplate, ANIM_TARGET, 2, 8, 8, 1, 0 delay 2 createsprite gOctazookaSmokeSpriteTemplate, ANIM_TARGET, 2, -8, -8, 1, 0 @@ -7043,7 +7043,7 @@ Move_MIST:: @ 81D0821 loadspritegfx ANIM_TAG_MIST_CLOUD monbg ANIM_ATK_PARTNER setalpha 12, 8 - loopsewithpan SE_W054, 192, 20, 15 + loopsewithpan SE_M_MIST, 192, 20, 15 call MistCloud call MistCloud call MistCloud @@ -7065,7 +7065,7 @@ MistCloud:: @ 81D086C Move_HAZE:: @ 81D0882 waitforvisualfinish - playsewithpan SE_W114, 0 + playsewithpan SE_M_HAZE, 0 createvisualtask AnimTask_Haze1, 5, delay 30 createvisualtask AnimTask_BlendSelected, 10, 0 | (0xF << 7), 2, 0, 16, RGB_BLACK @@ -7084,14 +7084,14 @@ Move_FIRE_PUNCH:: @ 81D08B5 createsprite gFireSpiralInwardSpriteTemplate, ANIM_TARGET, 1, 64 createsprite gFireSpiralInwardSpriteTemplate, ANIM_TARGET, 1, 128 createsprite gFireSpiralInwardSpriteTemplate, ANIM_TARGET, 1, 196 - playsewithpan SE_W172, 63 + playsewithpan SE_M_FLAME_WHEEL, 63 waitforvisualfinish createsprite gFistFootSpriteTemplate, ANIM_TARGET, 3, 0, 0, 8, 1, 0 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 0, 0, 1, 1 createvisualtask AnimTask_ShakeMon, 2, 1, 0, 3, 15, 1 call FireSpreadEffect delay 4 - playsewithpan SE_W007, 63 + playsewithpan SE_M_FIRE_PUNCH, 63 waitforvisualfinish createvisualtask AnimTask_BlendSelected, 10, 4, 0, 9, 0, RGB(31, 0, 0) waitforvisualfinish @@ -7114,7 +7114,7 @@ Move_LEER:: @ 81D09C8 monbg ANIM_ATTACKER monbgprio_28 0 setalpha 8, 8 - playsewithpan SE_W043, 192 + playsewithpan SE_M_LEER, 192 createsprite gLeerSpriteTemplate, ANIM_ATTACKER, 2, 24, -12 createvisualtask AnimTask_ScaleMonAndRestore, 5, -5, -5, 10, 0, 1 waitforvisualfinish @@ -7133,10 +7133,10 @@ Move_DREAM_EATER:: @ 81D0A1F loadspritegfx ANIM_TAG_BLUE_STAR monbg ANIM_DEF_PARTNER monbgprio_2A 1 - playsewithpan SE_W060, 192 + playsewithpan SE_M_PSYBEAM, 192 call SetPsychicBackground setalpha 8, 8 - playsewithpan SE_W107, 63 + playsewithpan SE_M_MINIMIZE, 63 createvisualtask AnimTask_ShakeMon, 2, 1, 5, 0, 15, 1 createvisualtask AnimTask_ScaleMonAndRestore, 5, -6, -6, 15, 1, 1 waitforvisualfinish @@ -7154,42 +7154,42 @@ Move_DREAM_EATER:: @ 81D0A1F end DreamEaterAbsorb:: @ 81D0A89 - playsewithpan SE_W207, 63 + playsewithpan SE_M_SWAGGER, 63 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 5, -18, -40, 35 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -10, 20, 20, 39 delay 4 - playsewithpan SE_W207, 63 + playsewithpan SE_M_SWAGGER, 63 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 28, 26 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -10, 20, 40, 39 delay 4 - playsewithpan SE_W207, 63 + playsewithpan SE_M_SWAGGER, 63 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 16, 33 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -32, 26 delay 4 - playsewithpan SE_W207, 63 + playsewithpan SE_M_SWAGGER, 63 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, -15, -16, 36 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26 delay 4 - playsewithpan SE_W207, 63 + playsewithpan SE_M_SWAGGER, 63 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 16, 33 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, -15, -16, 36 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 delay 4 - playsewithpan SE_W207, 63 + playsewithpan SE_M_SWAGGER, 63 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 16, 33 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -40, 26 delay 4 - playsewithpan SE_W207, 63 + playsewithpan SE_M_SWAGGER, 63 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 36, 33 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -10, 20, 20, 39 delay 4 - playsewithpan SE_W207, 63 + playsewithpan SE_M_SWAGGER, 63 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 5, -18, -20, 35 @@ -7204,25 +7204,25 @@ Move_POISON_GAS:: @ 81D0C22 monbgprio_29 setalpha 12, 8 delay 0 - playsewithpan SE_W054, 192 + playsewithpan SE_M_MIST, 192 createsprite gPoisonGasCloudSpriteTemplate, ANIM_TARGET, 0, 64, 0, 0, -32, -6, 4192, 1072, 0 delay 4 - playsewithpan SE_W054, 192 + playsewithpan SE_M_MIST, 192 createsprite gPoisonGasCloudSpriteTemplate, ANIM_TARGET, 0, 64, 0, 0, -32, -6, 4192, 1072, 0 delay 4 - playsewithpan SE_W054, 192 + playsewithpan SE_M_MIST, 192 createsprite gPoisonGasCloudSpriteTemplate, ANIM_TARGET, 0, 64, 0, 0, -32, -6, 4192, 1072, 0 delay 4 - playsewithpan SE_W054, 192 + playsewithpan SE_M_MIST, 192 createsprite gPoisonGasCloudSpriteTemplate, ANIM_TARGET, 0, 64, 0, 0, -32, -6, 4192, 1072, 0 delay 4 - playsewithpan SE_W054, 192 + playsewithpan SE_M_MIST, 192 createsprite gPoisonGasCloudSpriteTemplate, ANIM_TARGET, 0, 64, 0, 0, -32, -6, 4192, 1072, 0 delay 4 - playsewithpan SE_W054, 192 + playsewithpan SE_M_MIST, 192 createsprite gPoisonGasCloudSpriteTemplate, ANIM_TARGET, 0, 64, 0, 0, -32, -6, 4192, 1072, 0 delay 40 - loopsewithpan SE_W054, 63, 28, 6 + loopsewithpan SE_M_MIST, 63, 28, 6 createvisualtask AnimTask_CurseBlendEffect, 2, 4, 6, 2, 0, 12, 26650 waitforvisualfinish blendoff @@ -7235,7 +7235,7 @@ Move_BIND:: @ 81D0D00 goto BindWrap BindWrap:: @ 81D0D16 - playsewithpan SE_W020, 63 + playsewithpan SE_M_BIND, 63 call BindWrapSqueezeTarget call BindWrapSqueezeTarget waitforvisualfinish @@ -7252,7 +7252,7 @@ Move_WRAP:: @ 81D0D3A Move_PSYBEAM:: @ 81D0D50 loadspritegfx ANIM_TAG_GOLD_RING - playsewithpan SE_W060, 192 + playsewithpan SE_M_PSYBEAM, 192 call SetPsychicBackground createsoundtask SoundTask_LoopSEAdjustPanning, 193, -64, 63, 3, 4, 0, 15 call PsybeamRings @@ -7291,7 +7291,7 @@ Move_HYPNOSIS:: @ 81D0DEA end HypnosisRings:: @ 81D0E1D - playsewithpan SE_W048, 192 + playsewithpan SE_M_SUPERSONIC, 192 createsprite gGoldRingSpriteTemplate, ANIM_TARGET, 2, 0, 8, 0, 8, 27, 0 createsprite gGoldRingSpriteTemplate, ANIM_TARGET, 2, 16, -8, 0, -8, 27, 0 delay 6 @@ -7299,7 +7299,7 @@ HypnosisRings:: @ 81D0E1D Move_PSYWAVE:: @ 81D0E4A loadspritegfx ANIM_TAG_BLUE_RING - playsewithpan SE_W060, 192 + playsewithpan SE_M_PSYBEAM, 192 call SetPsychicBackground createvisualtask AnimTask_StartSinAnimTimer, 5, 100 createsoundtask SoundTask_LoopSEAdjustPanning, 196, -64, 63, 2, 9, 0, 10 @@ -7325,7 +7325,7 @@ PsywaveRings:: @ 81D0EAD Move_ZAP_CANNON:: @ 81D0ED0 loadspritegfx ANIM_TAG_BLACK_BALL_2 loadspritegfx ANIM_TAG_SPARK_2 - playsewithpan SE_W086, 192 + playsewithpan SE_M_THUNDER_WAVE, 192 createsprite gZapCannonBallSpriteTemplate, ANIM_TARGET, 3, 10, 0, 0, 0, 30, 0 createsprite gZapCannonSparkSpriteTemplate, ANIM_TARGET, 4, 10, 0, 16, 30, 0, 40, 0 createsprite gZapCannonSparkSpriteTemplate, ANIM_TARGET, 4, 10, 0, 16, 30, 64, 40, 1 @@ -7338,7 +7338,7 @@ Move_ZAP_CANNON:: @ 81D0ED0 waitforvisualfinish createvisualtask AnimTask_ShakeMon2, 2, 1, 4, 0, 5, 1 delay 15 - waitplaysewithpan SE_W085B, 63, 19 + waitplaysewithpan SE_M_THUNDERBOLT2, 63, 19 call ElectricityEffect waitforvisualfinish end @@ -7346,13 +7346,13 @@ Move_ZAP_CANNON:: @ 81D0ED0 Move_STEEL_WING:: @ 81D0FB5 loadspritegfx ANIM_TAG_GUST loadspritegfx ANIM_TAG_IMPACT - loopsewithpan SE_W231, 192, 28, 2 + loopsewithpan SE_M_HARDEN, 192, 28, 2 createvisualtask AnimTask_MetallicShine, 5, 0, 0, 0 waitforvisualfinish monbg ANIM_DEF_PARTNER monbgprio_28 1 setalpha 12, 8 - loopsewithpan SE_W017, 192, 20, 2 + loopsewithpan SE_M_WING_ATTACK, 192, 20, 2 createvisualtask AnimTask_TranslateMonElliptical, 2, 0, 12, 4, 1, 4 createvisualtask AnimTask_AnimateGustTornadoPalette, 5, 1, 70 createsprite gGustToTargetSpriteTemplate, ANIM_ATTACKER, 2, -25, 0, 0, 0, 20 @@ -7362,7 +7362,7 @@ Move_STEEL_WING:: @ 81D0FB5 delay 17 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 16, 0, 1, 1 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -16, 0, 1, 1 - playsewithpan SE_W013, 63 + playsewithpan SE_M_RAZOR_WIND, 63 waitforvisualfinish createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 11 waitforvisualfinish @@ -7372,7 +7372,7 @@ Move_STEEL_WING:: @ 81D0FB5 Move_IRON_TAIL:: @ 81D1064 loadspritegfx ANIM_TAG_IMPACT - loopsewithpan SE_W231, 192, 28, 2 + loopsewithpan SE_M_HARDEN, 192, 28, 2 createvisualtask AnimTask_MetallicShine, 5, 1, 0, 0 waitforvisualfinish monbg 1 @@ -7381,7 +7381,7 @@ Move_IRON_TAIL:: @ 81D1064 delay 6 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon, 2, 1, 3, 0, 6, 1 - playsewithpan SE_W233B, 63 + playsewithpan SE_M_VITAL_THROW2, 63 waitforvisualfinish createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, 0, 1 clearmonbg 1 @@ -7392,7 +7392,7 @@ Move_IRON_TAIL:: @ 81D1064 Move_POISON_TAIL:: @ 81D10C2 loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_POISON_BUBBLE - loopsewithpan SE_W231, 192, 28, 2 + loopsewithpan SE_M_HARDEN, 192, 28, 2 createvisualtask AnimTask_MetallicShine, 5, 1, 1, 23768 waitforvisualfinish monbg 1 @@ -7401,7 +7401,7 @@ Move_POISON_TAIL:: @ 81D10C2 delay 6 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon, 2, 1, 3, 0, 6, 1 - playsewithpan SE_W233B, 63 + playsewithpan SE_M_VITAL_THROW2, 63 waitforvisualfinish createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, 0, 1 clearmonbg 1 @@ -7412,19 +7412,19 @@ Move_POISON_TAIL:: @ 81D10C2 Move_METAL_CLAW:: @ 81D1128 loadspritegfx ANIM_TAG_CLAW_SLASH - loopsewithpan SE_W231, 192, 28, 2 + loopsewithpan SE_M_HARDEN, 192, 28, 2 createvisualtask AnimTask_MetallicShine, 5, 0, 0, 0 waitforvisualfinish createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 6, 4 delay 2 - playsewithpan SE_W013, 63 + playsewithpan SE_M_RAZOR_WIND, 63 createsprite gClawSlashSpriteTemplate, ANIM_TARGET, 2, -10, -10, 0 createsprite gClawSlashSpriteTemplate, ANIM_TARGET, 2, -10, 10, 0 createsprite gShakeMonOrTerrainSpriteTemplate, ANIM_ATTACKER, 2, -4, 1, 10, 3, 1 delay 8 createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 6, 4 delay 2 - playsewithpan SE_W013, 63 + playsewithpan SE_M_RAZOR_WIND, 63 createsprite gClawSlashSpriteTemplate, ANIM_TARGET, 2, 10, -10, 1 createsprite gClawSlashSpriteTemplate, ANIM_TARGET, 2, 10, 10, 1 createsprite gShakeMonOrTerrainSpriteTemplate, ANIM_ATTACKER, 2, -4, 1, 10, 3, 1 @@ -7434,11 +7434,11 @@ Move_METAL_CLAW:: @ 81D1128 Move_NIGHT_SHADE:: @ 81D11BB monbg ANIM_ATTACKER monbgprio_28 0 - playsewithpan SE_W060, 192 + playsewithpan SE_M_PSYBEAM, 192 fadetobg 2 waitbgfadein delay 10 - playsewithpan SE_W043, 192 + playsewithpan SE_M_LEER, 192 createvisualtask AnimTask_NightShadeClone, 5, 85 delay 70 createvisualtask AnimTask_ShakeMon2, 2, 1, 2, 0, 12, 1 @@ -7453,24 +7453,24 @@ Move_NIGHT_SHADE:: @ 81D11BB Move_EGG_BOMB:: @ 81D1203 loadspritegfx ANIM_TAG_EXPLOSION loadspritegfx ANIM_TAG_LARGE_FRESH_EGG - playsewithpan SE_W039, 192 + playsewithpan SE_M_TAIL_WHIP, 192 createsprite gEggThrowSpriteTemplate, ANIM_TARGET, 2, 10, 0, 0, 0, 25, -32 waitforvisualfinish createvisualtask AnimTask_ShakeMon2, 2, 1, 4, 0, 16, 1 createsprite gExplosionSpriteTemplate, ANIM_TARGET, 4, 6, 5, 1, 0 - playsewithpan SE_W120, 63 + playsewithpan SE_M_SELF_DESTRUCT, 63 delay 3 createsprite gExplosionSpriteTemplate, ANIM_TARGET, 4, -16, -15, 1, 0 - playsewithpan SE_W120, 63 + playsewithpan SE_M_SELF_DESTRUCT, 63 delay 3 createsprite gExplosionSpriteTemplate, ANIM_TARGET, 4, 16, -5, 1, 0 - playsewithpan SE_W120, 63 + playsewithpan SE_M_SELF_DESTRUCT, 63 delay 3 createsprite gExplosionSpriteTemplate, ANIM_TARGET, 4, -12, 18, 1, 0 - playsewithpan SE_W120, 63 + playsewithpan SE_M_SELF_DESTRUCT, 63 delay 3 createsprite gExplosionSpriteTemplate, ANIM_TARGET, 4, 0, 5, 1, 0 - playsewithpan SE_W120, 63 + playsewithpan SE_M_SELF_DESTRUCT, 63 delay 3 waitforvisualfinish end @@ -7483,7 +7483,7 @@ Move_SHADOW_BALL:: @ 81D129D createsoundtask SoundTask_LoopSEAdjustPanning, 161, -64, 63, 5, 5, 0, 5 createsprite gShadowBallSpriteTemplate, ANIM_TARGET, 2, 16, 16, 8 waitforvisualfinish - playsewithpan SE_W028, 63 + playsewithpan SE_M_SAND_ATTACK, 63 createvisualtask AnimTask_ShakeMon2, 2, 1, 4, 0, 8, 1 waitforvisualfinish restorebg @@ -7493,7 +7493,7 @@ Move_SHADOW_BALL:: @ 81D129D Move_LICK:: @ 81D12E0 loadspritegfx ANIM_TAG_LICK delay 15 - playsewithpan SE_W122, 63 + playsewithpan SE_M_LICK, 63 createsprite gLickSpriteTemplate, ANIM_TARGET, 2, 0, 0 createvisualtask AnimTask_ShakeMon2, 2, 1, 1, 0, 16, 1 waitforvisualfinish @@ -7501,7 +7501,7 @@ Move_LICK:: @ 81D12E0 Move_FOCUS_ENERGY:: @ 81D1307 loadspritegfx ANIM_TAG_FOCUS_ENERGY - playsewithpan SE_W082, 192 + playsewithpan SE_M_DRAGON_RAGE, 192 call EndureEffect delay 8 createvisualtask AnimTask_CurseBlendEffect, 2, 2, 2, 2, 0, 11, RGB_WHITE @@ -7517,7 +7517,7 @@ Move_BIDE:: @ 81D1347 end BattleAnimScript_Bide_Setup:: @ 81D1351 - loopsewithpan SE_W036, 192, 9, 2 + loopsewithpan SE_M_TAKE_DOWN, 192, 9, 2 createvisualtask AnimTask_CurseBlendEffect, 2, 2, 2, 2, 0, 11, 31 createvisualtask AnimTask_ShakeMon2, 2, 0, 1, 0, 32, 1 waitforvisualfinish @@ -7527,7 +7527,7 @@ BattleAnimScript_Bide_Release:: @ 81D137D loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 - loopsewithpan SE_W036, 192, 9, 2 + loopsewithpan SE_M_TAKE_DOWN, 192, 9, 2 createvisualtask AnimTask_BlendSelected, 10, 2, 2, 0, 11, RGB(31, 0, 0) createvisualtask AnimTask_ShakeMon2, 2, 0, 1, 0, 32, 1 waitforvisualfinish @@ -7535,13 +7535,13 @@ BattleAnimScript_Bide_Release:: @ 81D137D waitforvisualfinish createvisualtask AnimTask_ShakeMonInPlace, 2, 0, 2, 0, 12, 1 createvisualtask AnimTask_ShakeMon2, 2, 1, 3, 0, 16, 1 - playsewithpan SE_W004, 63 + playsewithpan SE_M_COMET_PUNCH, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 1, 18, -8, 1, 1 delay 5 - playsewithpan SE_W004, 63 + playsewithpan SE_M_COMET_PUNCH, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 1, -18, 8, 1, 1 delay 5 - playsewithpan SE_W004, 63 + playsewithpan SE_M_COMET_PUNCH, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 1, -8, -5, 1, 1 waitforvisualfinish delay 5 @@ -7560,7 +7560,7 @@ Move_STRING_SHOT:: @ 81D1446 delay 0 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 5, 1, 2, 0, 9, 0 waitforvisualfinish - loopsewithpan SE_W081, 192, 9, 6 + loopsewithpan SE_M_STRING_SHOT, 192, 9, 6 call StringShotThread call StringShotThread call StringShotThread @@ -7580,7 +7580,7 @@ Move_STRING_SHOT:: @ 81D1446 call StringShotThread call StringShotThread waitforvisualfinish - playsewithpan SE_W081B, 63 + playsewithpan SE_M_STRING_SHOT2, 63 createsprite gStringWrapSpriteTemplate, ANIM_TARGET, 2, 0, 10 delay 4 createsprite gStringWrapSpriteTemplate, ANIM_TARGET, 2, 0, -2 @@ -7606,7 +7606,7 @@ Move_SPIDER_WEB:: @ 81D1518 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 5, 1, 2, 0, 9, 0 waitforvisualfinish monbgprio_28 1 - loopsewithpan SE_W081, 192, 9, 6 + loopsewithpan SE_M_STRING_SHOT, 192, 9, 6 call SpiderWebThread call SpiderWebThread call SpiderWebThread @@ -7622,7 +7622,7 @@ Move_SPIDER_WEB:: @ 81D1518 call SpiderWebThread call SpiderWebThread waitforvisualfinish - playsewithpan SE_W081B, 63 + playsewithpan SE_M_STRING_SHOT2, 63 createsprite gSpiderWebSpriteTemplate, ANIM_ATTACKER, 2, waitforvisualfinish clearmonbg ANIM_DEF_PARTNER @@ -7644,12 +7644,12 @@ RazorWindEnd:: @ 81D15C2 RazorWindSetUp:: @ 81D15C4 loadspritegfx ANIM_TAG_GUST - playsewithpan SE_W016, 192 + playsewithpan SE_M_GUST, 192 createsprite gRazorWindTornadoSpriteTemplate, ANIM_ATTACKER, 2, 32, 0, 16, 16, 0, 7, 40 createsprite gRazorWindTornadoSpriteTemplate, ANIM_ATTACKER, 2, 32, 0, 16, 16, 85, 7, 40 createsprite gRazorWindTornadoSpriteTemplate, ANIM_ATTACKER, 2, 32, 0, 16, 16, 170, 7, 40 waitforvisualfinish - playsewithpan SE_W016B, 192 + playsewithpan SE_M_GUST2, 192 goto RazorWindEnd RazorWindUnleash:: @ 81D1614 @@ -7657,16 +7657,16 @@ RazorWindUnleash:: @ 81D1614 loadspritegfx ANIM_TAG_IMPACT monbg 1 setalpha 12, 8 - playsewithpan SE_W013B, 192 + playsewithpan SE_M_RAZOR_WIND2, 192 createsprite gAirWaveCrescentSpriteTemplate, ANIM_ATTACKER, 2, 14, 8, 0, 0, 22, 2, 1 delay 2 - playsewithpan SE_W013B, 192 + playsewithpan SE_M_RAZOR_WIND2, 192 createsprite gAirWaveCrescentSpriteTemplate, ANIM_ATTACKER, 2, 14, -8, 16, 14, 22, 1, 1 delay 2 - playsewithpan SE_W013B, 192 + playsewithpan SE_M_RAZOR_WIND2, 192 createsprite gAirWaveCrescentSpriteTemplate, ANIM_ATTACKER, 2, 14, 12, -16, -14, 22, 0, 1 delay 17 - playsewithpan SE_W013, 63 + playsewithpan SE_M_RAZOR_WIND, 63 createvisualtask AnimTask_ShakeMon2, 2, 1, 2, 0, 10, 1 createvisualtask AnimTask_ShakeMon2, 2, 3, 2, 0, 10, 1 waitforvisualfinish @@ -7679,11 +7679,11 @@ Move_DISABLE:: @ 81D169F monbg 1 monbgprio_28 1 setalpha 8, 8 - playsewithpan SE_W197, 192 + playsewithpan SE_M_DETECT, 192 createsprite gSpriteTemplate_83BF480, ANIM_ATTACKER, 13, 24, -16 waitforvisualfinish createvisualtask AnimTask_GrowAndGreyscale, 5, - loopsewithpan SE_W020, 63, 15, 4 + loopsewithpan SE_M_BIND, 63, 15, 4 waitforvisualfinish delay 1 clearmonbg 1 @@ -7695,7 +7695,7 @@ Move_RECOVER:: @ 81D16CD loadspritegfx ANIM_TAG_BLUE_STAR monbg ANIM_ATK_PARTNER setalpha 12, 8 - loopsewithpan SE_W025, 192, 13, 3 + loopsewithpan SE_M_MEGA_KICK, 192, 13, 3 createvisualtask AnimTask_CurseBlendEffect, 2, 2, 0, 6, 0, 11, 12287 call RecoverAbsorbEffect call RecoverAbsorbEffect @@ -7729,14 +7729,14 @@ Move_MIMIC:: @ 81D1777 loadspritegfx ANIM_TAG_ORBS monbg_22 3 setalpha 11, 5 - panse_1B SE_W107, 63, 192, 253, 0 + panse_1B SE_M_MINIMIZE, 63, 192, 253, 0 createvisualtask AnimTask_ShrinkTargetCopy, 5, 128, 24 delay 15 createsprite gMimicOrbSpriteTemplate, ANIM_TARGET, 2, -12, 24 delay 10 setarg 7, 65535 waitforvisualfinish - playsewithpan SE_W036, 192 + playsewithpan SE_M_TAKE_DOWN, 192 createvisualtask AnimTask_CurseBlendEffect, 2, 2, 0, 2, 0, 11, RGB_WHITE waitforvisualfinish clearmonbg_23 3 @@ -7745,7 +7745,7 @@ Move_MIMIC:: @ 81D1777 Move_CONSTRICT:: @ 81D17C1 loadspritegfx ANIM_TAG_TENDRILS - loopsewithpan SE_W010, 63, 6, 4 + loopsewithpan SE_M_SCRATCH, 63, 6, 4 createsprite gConstrictBindingSpriteTemplate, ANIM_TARGET, 4, 0, 16, 0, 2 delay 7 createsprite gConstrictBindingSpriteTemplate, ANIM_TARGET, 3, 0, 0, 0, 2 @@ -7755,7 +7755,7 @@ Move_CONSTRICT:: @ 81D17C1 delay 8 createvisualtask AnimTask_ShakeMon2, 2, 1, 3, 0, 6, 1 delay 20 - playsewithpan SE_W020, 63 + playsewithpan SE_M_BIND, 63 setarg 7, 65535 waitforvisualfinish end @@ -7781,7 +7781,7 @@ CurseGhost:: @ 81D1832 clearmonbg ANIM_ATK_PARTNER delay 1 monbg ANIM_DEF_PARTNER - playsewithpan SE_W171, 63 + playsewithpan SE_M_NIGHTMARE, 63 createsprite gCurseGhostSpriteTemplate, ANIM_TARGET, 2 createvisualtask AnimTask_ShakeMon2, 2, 1, 2, 0, 14, 1 waitforvisualfinish @@ -7792,7 +7792,7 @@ CurseGhost:: @ 81D1832 CurseGhostShakeFromNail:: @ 81D1899 createvisualtask AnimTask_ShakeMon2, 2, 0, 4, 0, 10, 0 - playsewithpan SE_W020, 192 + playsewithpan SE_M_BIND, 192 return CurseStats:: @ 81D18AF @@ -7804,7 +7804,7 @@ CurseStats:: @ 81D18AF end CurseStats1:: @ 81D18CA - playsewithpan SE_W082, 192 + playsewithpan SE_M_DRAGON_RAGE, 192 createvisualtask AnimTask_SetUpCurseBackground, 5, createvisualtask AnimTask_CurseBlendEffect, 5, 2, 4, 2, 0, 10, 31 return @@ -7814,13 +7814,13 @@ Move_SOFT_BOILED:: @ 81D18E9 loadspritegfx ANIM_TAG_THIN_RING loadspritegfx ANIM_TAG_BLUE_STAR monbg ANIM_ATK_PARTNER - playsewithpan SE_W039, 192 + playsewithpan SE_M_TAIL_WHIP, 192 createvisualtask AnimTask_ShakeMon, 2, 0, 0, 2, 6, 1 createsprite gSoftBoiledEggSpriteTemplate, ANIM_ATTACKER, 4, 0, 16, 0 createsprite gSoftBoiledEggSpriteTemplate, ANIM_ATTACKER, 4, 0, 16, 1 delay 120 delay 7 - playsewithpan SE_W030, 192 + playsewithpan SE_M_HORN_ATTACK, 192 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 10, 0, 31500 createsprite gThinRingExpandingSpriteTemplate, ANIM_ATTACKER, 3, 31, 16, 0, 1 delay 8 @@ -7865,14 +7865,14 @@ Move_HEAL_BELL:: @ 81D196B unloadspritegfx ANIM_TAG_MUSIC_NOTES_2 unloadspritegfx ANIM_TAG_THIN_RING loadspritegfx ANIM_TAG_SPARKLE_2 - playsewithpan SE_W234, 192 + playsewithpan SE_M_MORNING_SUN, 192 createsprite gSparklingStarsSpriteTemplate, ANIM_ATTACKER, 16, -15, 0, 0, 0, 32, 60, 1 delay 8 createsprite gSparklingStarsSpriteTemplate, ANIM_ATTACKER, 16, 12, -5, 0, 0, 32, 60, 1 waitforvisualfinish unloadspritegfx ANIM_TAG_SPARKLE_2 loadspritegfx ANIM_TAG_THIN_RING - playsewithpan SE_REAPOKE, 192 + playsewithpan SE_SHINY, 192 createvisualtask AnimTask_BlendExcept, 10, 4, 3, 10, 0, 31500 createvisualtask AnimTask_BlendSelected, 10, 10, 3, 10, 0, RGB_WHITE createsprite gBlendThinRingExpandingSpriteTemplate, ANIM_ATTACKER, 16, 0, 0, 0, 1 @@ -7882,14 +7882,14 @@ HealBellRing:: @ 81D1B2F createvisualtask AnimTask_BlendExcept, 10, 4, 3, 8, 0, 31500 createvisualtask AnimTask_BlendSelected, 10, 10, 3, 2, 10, RGB_WHITE createsprite gThinRingExpandingSpriteTemplate, ANIM_ATTACKER, 40, 0, -24, 0, 1 - playsewithpan SE_W215, 192 + playsewithpan SE_M_HEAL_BELL, 192 return Move_FAKE_OUT:: @ 81D1B65 - playsewithpan SE_W260, 0 + playsewithpan SE_M_FLATTER, 0 createvisualtask AnimTask_FakeOut, 5, waitforvisualfinish - playsewithpan SE_W166, 63 + playsewithpan SE_M_SKETCH, 63 createvisualtask AnimTask_ShakeMon2, 2, 1, 4, 0, 5, 1 createvisualtask AnimTask_StretchTargetUp, 3 waitforvisualfinish @@ -7899,17 +7899,17 @@ Move_FAKE_OUT:: @ 81D1B65 Move_SCARY_FACE:: @ 81D1BA0 loadspritegfx ANIM_TAG_EYE_SPARKLE createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 27, 3, 0, 16, 0 - playsewithpan SE_W060, 192 + playsewithpan SE_M_PSYBEAM, 192 waitforvisualfinish delay 10 - playsewithpan SE_W043, 192 + playsewithpan SE_M_LEER, 192 createvisualtask AnimTask_ScaryFace, 5, delay 13 createsprite gEyeSparkleSpriteTemplate, ANIM_ATTACKER, 0, -16, -8 createsprite gEyeSparkleSpriteTemplate, ANIM_ATTACKER, 0, 16, -8 waitforvisualfinish createvisualtask AnimTask_ShakeTargetInPattern, 3, 20, 1, 0 - playsewithpan SE_W081B, 63 + playsewithpan SE_M_STRING_SHOT2, 63 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 27, 3, 16, 0, 0 waitforvisualfinish end @@ -7918,14 +7918,14 @@ Move_SWEET_KISS:: @ 81D1C03 loadspritegfx ANIM_TAG_RED_HEART loadspritegfx ANIM_TAG_ANGEL createsprite gAngelSpriteTemplate, ANIM_TARGET, 2, 16, -48 - playsewithpan SE_W215, 63 + playsewithpan SE_M_HEAL_BELL, 63 delay 23 - playsewithpan SE_W215, 63 + playsewithpan SE_M_HEAL_BELL, 63 delay 23 - playsewithpan SE_W215, 63 + playsewithpan SE_M_HEAL_BELL, 63 waitforvisualfinish createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, 160, -30 - playsewithpan SE_W213, 63 + playsewithpan SE_M_ATTRACT, 63 createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, -256, -42 createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, 128, -14 createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, 416, -38 @@ -7937,9 +7937,9 @@ Move_LOVELY_KISS:: @ 81D1C6C loadspritegfx ANIM_TAG_PINK_HEART loadspritegfx ANIM_TAG_DEVIL createsprite gDevilSpriteTemplate, ANIM_TARGET, 2, 0, -24 - playsewithpan SE_W060B, 63 + playsewithpan SE_M_PSYBEAM2, 63 waitforvisualfinish - playsewithpan SE_W213, 63 + playsewithpan SE_M_ATTRACT, 63 createsprite gPinkHeartSpriteTemplate, ANIM_TARGET, 3, -256, -42 createsprite gPinkHeartSpriteTemplate, ANIM_TARGET, 3, 128, -14 createsprite gPinkHeartSpriteTemplate, ANIM_TARGET, 3, 416, -38 @@ -7950,13 +7950,13 @@ Move_FURY_SWIPES:: @ 81D1CB3 loadspritegfx ANIM_TAG_SWIPE createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 5, 5 delay 4 - playsewithpan SE_W010, 63 + playsewithpan SE_M_SCRATCH, 63 createsprite gFurySwipesSpriteTemplate, ANIM_TARGET, 2, 16, 0, 1 createvisualtask AnimTask_ShakeMon2, 2, 1, 3, 0, 5, 1 delay 10 createsprite gHorizontalLungeSpriteTemplate, ANIM_TARGET, 2, 5, 5 delay 4 - playsewithpan SE_W010, 63 + playsewithpan SE_M_SCRATCH, 63 createsprite gFurySwipesSpriteTemplate, ANIM_TARGET, 2, -16, 0, 0 createvisualtask AnimTask_ShakeMon2, 2, 1, 4, 0, 7, 1 end @@ -7965,28 +7965,28 @@ Move_INGRAIN:: @ 81D1D17 loadspritegfx ANIM_TAG_ROOTS loadspritegfx ANIM_TAG_ORBS createsprite gIngrainRootSpriteTemplate, ANIM_ATTACKER, 2, 16, 26, -1, 2, 150 - playsewithpan SE_W010, 192 + playsewithpan SE_M_SCRATCH, 192 delay 10 createsprite gIngrainRootSpriteTemplate, ANIM_ATTACKER, 2, -32, 20, 1, 1, 140 - playsewithpan SE_W010, 192 + playsewithpan SE_M_SCRATCH, 192 delay 10 createsprite gIngrainRootSpriteTemplate, ANIM_ATTACKER, 2, 32, 22, 1, 0, 130 - playsewithpan SE_W010, 192 + playsewithpan SE_M_SCRATCH, 192 delay 10 createsprite gIngrainRootSpriteTemplate, ANIM_ATTACKER, 2, -16, 25, -1, 3, 120 - playsewithpan SE_W010, 192 + playsewithpan SE_M_SCRATCH, 192 delay 40 createsprite gIngrainOrbSpriteTemplate, ANIM_ATTACKER, 3, 32, 26, -1, 3, 30 delay 5 - playsewithpan SE_W145C, 192 + playsewithpan SE_M_BUBBLE3, 192 delay 5 createsprite gIngrainOrbSpriteTemplate, ANIM_ATTACKER, 3, -48, 20, 1, 2, 30 - playsewithpan SE_W145C, 192 + playsewithpan SE_M_BUBBLE3, 192 delay 5 - playsewithpan SE_W145C, 192 + playsewithpan SE_M_BUBBLE3, 192 delay 5 createsprite gIngrainOrbSpriteTemplate, ANIM_ATTACKER, 3, 48, 26, -2, 3, 18 - playsewithpan SE_W145C, 192 + playsewithpan SE_M_BUBBLE3, 192 delay 10 waitforvisualfinish end @@ -7995,13 +7995,13 @@ Move_PRESENT:: @ 81D1DC8 loadspritegfx ANIM_TAG_ITEM_BAG createvisualtask AnimTask_IsHealingMove, 2, createsprite gPresentSpriteTemplate, ANIM_TARGET, 2, 0, -5, 10, 2, -1 - playsewithpan SE_W039, 192 + playsewithpan SE_M_TAIL_WHIP, 192 delay 14 - playsewithpan SE_W145B, 192 + playsewithpan SE_M_BUBBLE2, 192 delay 14 - playsewithpan SE_W145B, 0 + playsewithpan SE_M_BUBBLE2, 0 delay 20 - playsewithpan SE_W145B, 63 + playsewithpan SE_M_BUBBLE2, 63 waitforvisualfinish jumpargeq 7, 0, PresentDamage jumpargeq 7, 1, PresentHeal @@ -8009,26 +8009,26 @@ Move_PRESENT:: @ 81D1DC8 PresentDamage:: @ 81D1E0B loadspritegfx ANIM_TAG_EXPLOSION - playsewithpan SE_W120, 63 + playsewithpan SE_M_SELF_DESTRUCT, 63 createsprite gExplosionSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 1 delay 6 - playsewithpan SE_W120, 63 + playsewithpan SE_M_SELF_DESTRUCT, 63 createsprite gExplosionSpriteTemplate, ANIM_TARGET, 3, 24, -24, 1, 1 delay 6 - playsewithpan SE_W120, 63 + playsewithpan SE_M_SELF_DESTRUCT, 63 createsprite gExplosionSpriteTemplate, ANIM_TARGET, 3, -16, 16, 1, 1 delay 6 - playsewithpan SE_W120, 63 + playsewithpan SE_M_SELF_DESTRUCT, 63 createsprite gExplosionSpriteTemplate, ANIM_TARGET, 3, -24, -12, 1, 1 delay 6 - playsewithpan SE_W120, 63 + playsewithpan SE_M_SELF_DESTRUCT, 63 createsprite gExplosionSpriteTemplate, ANIM_TARGET, 3, 16, 16, 1, 1 end PresentHeal:: @ 81D1E76 loadspritegfx ANIM_TAG_GREEN_SPARKLE loadspritegfx ANIM_TAG_BLUE_STAR - playsewithpan SE_W234, 63 + playsewithpan SE_M_MORNING_SUN, 63 createsprite gPresentHealParticleSpriteTemplate, ANIM_TARGET, 4, -16, 32, -3, 1 delay 3 createsprite gPresentHealParticleSpriteTemplate, ANIM_TARGET, 4, 16, 32, -3, -1 @@ -8053,7 +8053,7 @@ PresentHeal:: @ 81D1E76 Move_BATON_PASS:: @ 81D1F1F loadspritegfx ANIM_TAG_POKEBALL - playsewithpan SE_W226, 192 + playsewithpan SE_M_BATON_PASS, 192 createvisualtask AnimTask_CurseBlendEffect, 2, 31, 1, 2, 0, 11, 31455 createsprite gBatonPassPokeballSpriteTemplate, ANIM_ATTACKER, 2, end @@ -8078,7 +8078,7 @@ Move_PERISH_SONG:: @ 81D1F41 createsprite gPerishSongMusicNoteSpriteTemplate, ANIM_ATTACKER, 4, 15, 0, 240 createsprite gPerishSongMusicNote2SpriteTemplate, ANIM_ATTACKER, 4, 15, 0, 0 delay 20 - panse_1B SE_W195, 192, 63, 2, 0 + panse_1B SE_M_PERISH_SONG, 192, 63, 2, 0 delay 80 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 0, 16, 0 createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, 4, 0 @@ -8099,21 +8099,21 @@ Move_SLEEP_TALK:: @ 81D20AA createvisualtask AnimTask_SwayMon, 5, 0, 4, 4096, 2, 0 delay 20 createsprite gLetterZSpriteTemplate, ANIM_TARGET, 2, 0, 20, 5, -1 - playsewithpan SE_W173, 192 + playsewithpan SE_M_SNORE, 192 delay 6 createsprite gLetterZSpriteTemplate, ANIM_TARGET, 2, 0, 20, 5, -1 delay 6 createsprite gLetterZSpriteTemplate, ANIM_TARGET, 2, 0, 20, 5, -1 delay 20 createsprite gLetterZSpriteTemplate, ANIM_TARGET, 2, 0, 20, 5, -5 - playsewithpan SE_W173, 192 + playsewithpan SE_M_SNORE, 192 delay 6 createsprite gLetterZSpriteTemplate, ANIM_TARGET, 2, 0, 20, 5, -5 delay 6 createsprite gLetterZSpriteTemplate, ANIM_TARGET, 2, 0, 20, 5, -5 delay 20 createsprite gLetterZSpriteTemplate, ANIM_TARGET, 2, 0, 20, 5, -3 - playsewithpan SE_W173, 192 + playsewithpan SE_M_SNORE, 192 delay 6 createsprite gLetterZSpriteTemplate, ANIM_TARGET, 2, 0, 20, 5, -3 delay 6 @@ -8123,7 +8123,7 @@ Move_SLEEP_TALK:: @ 81D20AA Move_HYPER_FANG:: @ 81D2165 loadspritegfx ANIM_TAG_FANG_ATTACK - playsewithpan SE_W044, 63 + playsewithpan SE_M_BITE, 63 delay 1 delay 2 createvisualtask AnimTask_IsContest, 2, @@ -8136,7 +8136,7 @@ HyperFangContinue:: @ 81D2193 createsprite gFangSpriteTemplate, ANIM_TARGET, 2, waitbgfadein createvisualtask AnimTask_ShakeMon, 3, 1, 0, 10, 10, 1 - playsewithpan SE_W043, 63 + playsewithpan SE_M_LEER, 63 delay 20 restorebg waitbgfadein @@ -8158,9 +8158,9 @@ HyperFangInContest:: @ 81D21C5 Move_TRI_ATTACK:: @ 81D21CC loadspritegfx ANIM_TAG_TRI_FORCE_TRIANGLE createsprite gTriAttackTriangleSpriteTemplate, ANIM_TARGET, 2, 16, 0 - playsewithpan SE_W161, 192 + playsewithpan SE_M_TRI_ATTACK, 192 delay 20 - playsewithpan SE_W161, 192 + playsewithpan SE_M_TRI_ATTACK, 192 delay 20 createsoundtask SoundTask_LoopSEAdjustPanning, 213, -64, 63, 5, 6, 0, 7 waitforvisualfinish @@ -8168,7 +8168,7 @@ Move_TRI_ATTACK:: @ 81D21CC delay 16 loadspritegfx ANIM_TAG_FIRE createsprite gLargeFlameScatterSpriteTemplate, ANIM_TARGET, 2, 0, 0, 30, 30, -1, 0 - playsewithpan SE_W172B, 63 + playsewithpan SE_M_FLAME_WHEEL2, 63 createsprite gLargeFlameScatterSpriteTemplate, ANIM_TARGET, 2, 0, 0, 30, 30, 0, 1 delay 1 createsprite gLargeFlameScatterSpriteTemplate, ANIM_TARGET, 2, 0, 0, 30, 30, -1, -1 @@ -8187,7 +8187,7 @@ Move_TRI_ATTACK:: @ 81D21CC waitforvisualfinish loadspritegfx ANIM_TAG_LIGHTNING createvisualtask AnimTask_InvertScreenColor, 2, 257, 257, 257 - playsewithpan SE_W161B, 63 + playsewithpan SE_M_TRI_ATTACK2, 63 createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, 0, -48 delay 1 createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, 0, -16 @@ -8209,8 +8209,8 @@ Move_WILL_O_WISP:: @ 81D2340 loadspritegfx ANIM_TAG_WISP_ORB monbg ANIM_DEF_PARTNER monbgprio_2A 1 - playsewithpan SE_W052, 192 - waitplaysewithpan SE_W052, 192, 10 + playsewithpan SE_M_EMBER, 192 + waitplaysewithpan SE_M_EMBER, 192, 10 createvisualtask SoundTask_AdjustPanningVar, 2, -64, -64, 1, 0 createsprite gWillOWispOrbSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 0 delay 3 @@ -8223,7 +8223,7 @@ Move_WILL_O_WISP:: @ 81D2340 createvisualtask SoundTask_AdjustPanningVar, 2, -64, 63, 2, 0 waitforvisualfinish monbgprio_29 - playsewithpan SE_W172B, 63 + playsewithpan SE_M_FLAME_WHEEL2, 63 createvisualtask AnimTask_ShakeMon2, 2, 1, 4, 0, 13, 1 createsprite gWillOWispFireSpriteTemplate, ANIM_ATTACKER, 2, 0 createsprite gWillOWispFireSpriteTemplate, ANIM_ATTACKER, 2, 42 @@ -8261,23 +8261,23 @@ Move_TRICK:: @ 81D24A5 createsprite gTrickBagSpriteTemplate, ANIM_ATTACKER, 2, -40, 80 createsprite gTrickBagSpriteTemplate, ANIM_ATTACKER, 2, -40, 208 delay 16 - playsewithpan SE_W166, 0 + playsewithpan SE_M_SKETCH, 0 createvisualtask AnimTask_StretchTargetUp, 3, createvisualtask AnimTask_StretchAttackerUp, 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 @@ -8288,11 +8288,11 @@ Move_WISH:: @ 81D2523 loadspritegfx ANIM_TAG_SPARKLE_2 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 0, 10, 0 waitforvisualfinish - panse_27 SE_W115, 63, 192, 253, 0 + panse_27 SE_M_REFLECT, 63, 192, 253, 0 createsprite gWishStarSpriteTemplate, ANIM_ATTACKER, 40, waitforvisualfinish delay 60 - loopsewithpan SE_W215, 192, 16, 3 + loopsewithpan SE_M_HEAL_BELL, 192, 16, 3 call GrantingStarsEffect waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 10, 0, 0 @@ -8301,7 +8301,7 @@ Move_WISH:: @ 81D2523 Move_STOCKPILE:: @ 81D256B loadspritegfx ANIM_TAG_GRAY_ORB - playsewithpan SE_W025, 192 + playsewithpan SE_M_MEGA_KICK, 192 createvisualtask AnimTask_CurseBlendEffect, 2, 2, 8, 1, 0, 12, RGB_WHITE createvisualtask AnimTask_StockpileDeformMon, 5, call StockpileAbsorb @@ -8332,11 +8332,11 @@ StockpileAbsorb:: @ 81D25A9 Move_SPIT_UP:: @ 81D2622 loadspritegfx ANIM_TAG_RED_ORB_2 loadspritegfx ANIM_TAG_IMPACT - playsewithpan SE_W036, 192 + playsewithpan SE_M_TAKE_DOWN, 192 createvisualtask AnimTask_SpitUpDeformMon, 5, createvisualtask AnimTask_ShakeMon2, 2, 0, 1, 0, 8, 2 delay 45 - playsewithpan SE_W255, 192 + playsewithpan SE_M_SPIT_UP, 192 delay 3 createsprite gSpitUpOrbSpriteTemplate, ANIM_ATTACKER, 2, 0, 12 createsprite gSpitUpOrbSpriteTemplate, ANIM_ATTACKER, 2, 32, 12 @@ -8352,10 +8352,10 @@ Move_SPIT_UP:: @ 81D2622 SpitUpContinue:: @ 81D26B2 delay 5 createvisualtask AnimTask_ShakeTargetBasedOnMovePowerOrDmg, 2, 0, 1, 8, 1, 0 - playsewithpan SE_W003, 63 + playsewithpan SE_M_DOUBLE_SLAP, 63 createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, -12, 10, 1, 1 delay 5 - playsewithpan SE_W003, 63 + playsewithpan SE_M_DOUBLE_SLAP, 63 createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, 12, -10, 1, 1 waitforvisualfinish end @@ -8381,11 +8381,11 @@ SpitUpStrongest:: @ 81D2718 Move_SWALLOW:: @ 81D2765 loadspritegfx ANIM_TAG_BLUE_ORB loadspritegfx ANIM_TAG_BLUE_STAR - playsewithpan SE_W036, 192 + playsewithpan SE_M_TAKE_DOWN, 192 createvisualtask AnimTask_SwallowDeformMon, 5, createvisualtask AnimTask_ShakeMon2, 2, 0, 1, 0, 8, 2 delay 38 - playsewithpan SE_W255, 192 + playsewithpan SE_M_SPIT_UP, 192 createvisualtask AnimTask_ShakeMon2, 2, 0, 2, 0, 12, 1 call SwallowEffect jumpifmoveturn 2, SwallowGood @@ -8419,8 +8419,8 @@ SwallowBest:: @ 81D2802 Move_TRANSFORM:: @ 81D2811 monbg ANIM_ATTACKER - playsewithpan SE_W100, 192 - waitplaysewithpan SE_W107, 192, 48 + playsewithpan SE_M_TELEPORT, 192 + waitplaysewithpan SE_M_MINIMIZE, 192, 48 createvisualtask AnimTask_TransformMon, 2, 0 waitforvisualfinish clearmonbg ANIM_ATTACKER @@ -8461,7 +8461,7 @@ MorningSunStar:: @ 81D28AF Move_SWEET_SCENT:: @ 81D28BD loadspritegfx ANIM_TAG_PINK_PETAL - playsewithpan SE_W230, 192 + playsewithpan SE_M_SWEET_SCENT, 192 createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 100, 0, 100 delay 25 setpan 0 @@ -8503,7 +8503,7 @@ Move_HYPER_BEAM:: @ 81D29A7 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 4, 0, 16, 0 waitforvisualfinish delay 10 - playsewithpan SE_W063, 192 + playsewithpan SE_M_HYPER_BEAM, 192 createvisualtask AnimTask_ShakeMon2, 2, 0, 1, 0, 4, 1 waitforvisualfinish delay 30 @@ -8600,8 +8600,8 @@ Move_ROLE_PLAY:: @ 81D2BE5 createvisualtask AnimTask_BlendSelected, 10, 4, 2, 0, 16, RGB_WHITE createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 10, 0 waitforvisualfinish - playsewithpan SE_W161, 192 - waitplaysewithpan SE_W197, 192, 30 + playsewithpan SE_M_TRI_ATTACK, 192 + waitplaysewithpan SE_M_DETECT, 192, 30 createvisualtask AnimTask_RolePlaySilhouette, 2, waitforvisualfinish clearmonbg ANIM_ATK_PARTNER @@ -8613,13 +8613,13 @@ Move_ROLE_PLAY:: @ 81D2BE5 Move_REFRESH:: @ 81D2C42 loadspritegfx ANIM_TAG_THIN_RING loadspritegfx ANIM_TAG_SPARKLE_2 - playsewithpan SE_W287, 192 + playsewithpan SE_M_STAT_INCREASE, 192 createvisualtask AnimTask_StatusClearedEffect, 2, 0 waitforvisualfinish - playsewithpan SE_W234, 192 + playsewithpan SE_M_MORNING_SUN, 192 call GrantingStarsEffect waitforvisualfinish - playsewithpan SE_REAPOKE, 192 + playsewithpan SE_SHINY, 192 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 10, 0, 31500 createsprite gThinRingExpandingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0 end @@ -8630,11 +8630,11 @@ Move_BLAZE_KICK:: @ 81D2C85 loadspritegfx ANIM_TAG_SMALL_EMBER monbg 1 setalpha 12, 8 - playsewithpan SE_W172, 63 + playsewithpan SE_M_FLAME_WHEEL, 63 createsprite gSpinningHandOrFootSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 30 createvisualtask AnimTask_BlendSelected, 10, 4, 2, 0, 7, RGB_WHITE delay 30 - playsewithpan SE_W007, 63 + playsewithpan SE_M_FIRE_PUNCH, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 0, 0, 1, 0 createvisualtask AnimTask_ShakeMon2, 2, 1, 3, 0, 14, 1 createvisualtask AnimTask_BlendSelected, 10, 4, 2, 0, 0, RGB_WHITE @@ -8669,7 +8669,7 @@ Move_SAND_TOMB:: @ 81D2D96 loadspritegfx ANIM_TAG_MUD_SAND createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 4, 2, 0, 7, 563 createvisualtask AnimTask_ShakeMon, 5, 1, 0, 2, 43, 1 - playsewithpan SE_W328, 63 + playsewithpan SE_M_SAND_TOMB, 63 call SandTombSwirlingDirt call SandTombSwirlingDirt call SandTombSwirlingDirt @@ -8696,14 +8696,14 @@ SandTombSwirlingDirt:: @ 81D2DE3 Move_SHEER_COLD:: @ 81D2E6E fadetobg 15 waitbgfadeout - playsewithpan SE_W196, 0 + playsewithpan SE_M_ICY_WIND, 0 waitbgfadein loadspritegfx ANIM_TAG_ICE_CUBE monbg ANIM_DEF_PARTNER monbgprio_28 1 setalpha 12, 8 createvisualtask AnimTask_FrozenIceCube, 2 - waitplaysewithpan SE_W258, 63, 17 + waitplaysewithpan SE_M_HAIL, 63, 17 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -8720,11 +8720,11 @@ Move_ARM_THRUST:: @ 81D2E93 delay 6 createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 3 delay 4 - playsewithpan SE_W207, 63 + playsewithpan SE_M_SWAGGER, 63 createsprite gArmThrustHandSpriteTemplate, ANIM_TARGET, 2, 10, -8, 14, 3 waitforvisualfinish createvisualtask AnimTask_RotateMonSpriteToSide, 5, 8, 5, 0, 1 - playsewithpan SE_W003, 63 + playsewithpan SE_M_DOUBLE_SLAP, 63 choosetwoturnanim ArmThrustRight, ArmThrustLeft ArmThrustContinue:: @ 81D2EEC createvisualtask AnimTask_ShakeMon, 5, 1, 4, 0, 6, 1 @@ -8741,7 +8741,7 @@ ArmThrustLeft:: @ 81D2F14 goto ArmThrustContinue Move_MUDDY_WATER:: @ 81D2F28 - panse_1B SE_W250, 192, 63, 2, 0 + panse_1B SE_M_WHIRLPOOL, 192, 63, 2, 0 createvisualtask AnimTask_CreateSurfWave, 2, 1 waitforvisualfinish end @@ -8774,7 +8774,7 @@ Move_BULLET_SEED:: @ 81D2F3A Move_DRAGON_CLAW:: @ 81D2FD0 loadspritegfx ANIM_TAG_SMALL_EMBER loadspritegfx ANIM_TAG_CLAW_SLASH - playsewithpan SE_W221B, 192 + playsewithpan SE_M_SACRED_FIRE2, 192 createvisualtask AnimTask_BlendSelected, 10, 2, 4, 0, 8, RGB(31, 19, 0) createvisualtask AnimTask_ShakeMon, 5, 0, 0, 2, 15, 1 call DragonClawFireSpiral @@ -8840,7 +8840,7 @@ Move_MUD_SHOT:: @ 81D3239 createvisualtask AnimTask_ShakeMon, 5, 0, 0, 2, 46, 1 delay 6 createvisualtask AnimTask_StartSinAnimTimer, 5, 100 - panse_1B SE_W250, 192, 63, 1, 0 + panse_1B SE_M_WHIRLPOOL, 192, 63, 1, 0 call MudShotOrbs call MudShotOrbs call MudShotOrbs @@ -8869,7 +8869,7 @@ Move_METEOR_MASH:: @ 81D32D6 loadspritegfx ANIM_TAG_GOLD_STARS loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HANDS_AND_FEET - panse_1B SE_W112, 192, 63, 3, 0 + panse_1B SE_M_BARRIER, 192, 63, 3, 0 fadetobg 16 waitbgfadein waitforvisualfinish @@ -8880,7 +8880,7 @@ Move_METEOR_MASH:: @ 81D32D6 createsprite gSpinningHandOrFootSpriteTemplate, ANIM_TARGET, 3, 0, 0, 0, 30 createsprite gMeteorMashStarSpriteTemplate, ANIM_TARGET, 3, -80, -64, 40, 32, 30 delay 20 - playsewithpan SE_W233B, 63 + playsewithpan SE_M_VITAL_THROW2, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 1 createvisualtask AnimTask_ShakeMon2, 2, 1, 5, 0, 20, 1 waitforvisualfinish @@ -8894,7 +8894,7 @@ Move_REVENGE:: @ 81D335D loadspritegfx ANIM_TAG_PURPLE_SCRATCH monbg 1 setalpha 12, 8 - playsewithpan SE_W036, 192 + playsewithpan SE_M_TAKE_DOWN, 192 createsprite gRevengeSmallScratchSpriteTemplate, ANIM_ATTACKER, 2, 10, -10 waitforvisualfinish createvisualtask AnimTask_CurseBlendEffect, 2, 2, 0, 4, 2, 8, 31 @@ -8903,17 +8903,17 @@ Move_REVENGE:: @ 81D335D loadspritegfx ANIM_TAG_PURPLE_SWIPE createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 6, 4 delay 4 - playsewithpan SE_W207, 63 + playsewithpan SE_M_SWAGGER, 63 createsprite gRevengeBigScratchSpriteTemplate, ANIM_TARGET, 2, 10, -10 waitforvisualfinish unloadspritegfx ANIM_TAG_PURPLE_SWIPE loadspritegfx ANIM_TAG_IMPACT createvisualtask AnimTask_ShakeMon2, 2, 1, 3, 0, 10, 1 createsprite gPersistHitSplatSpriteTemplate, ANIM_TARGET, 3, -10, -8, 1, 1, 8 - playsewithpan SE_W233B, 63 + playsewithpan SE_M_VITAL_THROW2, 63 delay 8 createsprite gPersistHitSplatSpriteTemplate, ANIM_TARGET, 3, 10, 8, 1, 1, 8 - playsewithpan SE_W025B, 63 + playsewithpan SE_M_MEGA_KICK2, 63 waitforvisualfinish clearmonbg 1 blendoff @@ -8922,7 +8922,7 @@ Move_REVENGE:: @ 81D335D Move_POISON_FANG:: @ 81D33F4 loadspritegfx ANIM_TAG_FANG_ATTACK loadspritegfx ANIM_TAG_POISON_BUBBLE - playsewithpan SE_W044, 63 + playsewithpan SE_M_BITE, 63 createsprite gFangSpriteTemplate, ANIM_TARGET, 2, delay 10 createvisualtask AnimTask_ShakeMon, 3, 1, 3, 0, 10, 1 @@ -8933,7 +8933,7 @@ Move_POISON_FANG:: @ 81D33F4 end Move_SUBSTITUTE:: @ 81D3433 - playsewithpan SE_W213, 192 + playsewithpan SE_M_ATTRACT, 192 createvisualtask AnimTask_MonToSubstitute, 2, end @@ -8946,50 +8946,50 @@ Move_FRENZY_PLANT:: @ 81D343F createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 1, 2, 0, 5, 0 waitforvisualfinish createsprite gFrenzyPlantRootSpriteTemplate, ANIM_ATTACKER, 2, 10, 8, 2, 0, 0, 100 - playsewithpan SE_W010, 192 + playsewithpan SE_M_SCRATCH, 192 delay 5 createsprite gFrenzyPlantRootSpriteTemplate, ANIM_ATTACKER, 2, 20, -8, -2, 0, 1, 95 - playsewithpan SE_W010, 213 + playsewithpan SE_M_SCRATCH, 213 delay 5 createsprite gFrenzyPlantRootSpriteTemplate, ANIM_ATTACKER, 2, 30, 8, -4, 0, 0, 90 - playsewithpan SE_W010, 234 + playsewithpan SE_M_SCRATCH, 234 delay 5 createsprite gFrenzyPlantRootSpriteTemplate, ANIM_ATTACKER, 2, 40, -8, 4, 0, 1, 85 - playsewithpan SE_W010, 0 + playsewithpan SE_M_SCRATCH, 0 delay 5 createsprite gFrenzyPlantRootSpriteTemplate, ANIM_ATTACKER, 2, 50, 8, 0, 0, 0, 85 - playsewithpan SE_W010, 21 + playsewithpan SE_M_SCRATCH, 21 delay 5 createsprite gFrenzyPlantRootSpriteTemplate, ANIM_ATTACKER, 2, 60, -8, -2, 0, 1, 85 - playsewithpan SE_W010, 42 + playsewithpan SE_M_SCRATCH, 42 delay 5 createsprite gFrenzyPlantRootSpriteTemplate, ANIM_ATTACKER, 2, 75, 8, 0, 0, 0, 85 - playsewithpan SE_W010, 63 + playsewithpan SE_M_SCRATCH, 63 delay 5 createsprite gFrenzyPlantRootSpriteTemplate, ANIM_ATTACKER, 2, 85, 16, 6, 0, 3, 80 - playsewithpan SE_W010, 63 + playsewithpan SE_M_SCRATCH, 63 delay 5 createsprite gFrenzyPlantRootSpriteTemplate, ANIM_ATTACKER, 2, 85, -16, -6, 0, 2, 75 - playsewithpan SE_W010, 63 + playsewithpan SE_M_SCRATCH, 63 delay 5 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -10, -10, 1, 3 - playsewithpan SE_W003, 63 + playsewithpan SE_M_DOUBLE_SLAP, 63 createvisualtask AnimTask_ShakeMon, 3, 1, 8, 0, 20, 1 delay 3 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 10, 8, 1, 3 - playsewithpan SE_W003, 63 + playsewithpan SE_M_DOUBLE_SLAP, 63 delay 3 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 10, -3, 1, 2 - playsewithpan SE_W003, 63 + playsewithpan SE_M_DOUBLE_SLAP, 63 delay 3 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -3, 1, 1, 2 - playsewithpan SE_W003, 63 + playsewithpan SE_M_DOUBLE_SLAP, 63 delay 2 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -10, 1, 1, 1 - playsewithpan SE_W003, 63 + playsewithpan SE_M_DOUBLE_SLAP, 63 delay 2 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 10, 1, 1 - playsewithpan SE_W003, 63 + playsewithpan SE_M_DOUBLE_SLAP, 63 waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 1, 2, 5, 0, 0 waitforvisualfinish @@ -9013,7 +9013,7 @@ Move_METAL_SOUND:: @ 81D35E3 end MetalSoundRings:: @ 81D3616 - panse_1B SE_W103, 192, 63, 2, 0 + panse_1B SE_M_SCREECH, 192, 63, 2, 0 createsprite gMetalSoundSpriteTemplate, ANIM_TARGET, 2, 16, 0, 0, 0, 30, 0 delay 2 return @@ -9037,20 +9037,20 @@ FocusPunchContinue:: @ 81D3668 waitbgfadein monbg ANIM_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W207, 63 + playsewithpan SE_M_SWAGGER, 63 createsprite gFocusPunchFistSpriteTemplate, ANIM_TARGET, 2 delay 10 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -10, -8, 1, 0 createvisualtask AnimTask_ShakeMon, 5, 1, 8, 0, 24, 1 delay 8 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 10, 2, 1, 0 - playsewithpan SE_W233B, 63 + playsewithpan SE_M_VITAL_THROW2, 63 delay 8 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 10, -6, 1, 0 - playsewithpan SE_W233B, 63 + playsewithpan SE_M_VITAL_THROW2, 63 delay 8 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 8, 1, 0 - playsewithpan SE_W025B, 63 + playsewithpan SE_M_MEGA_KICK2, 63 waitforvisualfinish restorebg waitbgfadein @@ -9215,7 +9215,7 @@ ReturnStrongestHit:: @ 81D3B35 Move_COSMIC_POWER:: @ 81D3B89 loadspritegfx ANIM_TAG_SPARKLE_2 createvisualtask SoundTask_PlaySE2WithPanning, 5, 236, 0 - playsewithpan SE_W322, 0 + playsewithpan SE_M_COSMIC_POWER, 0 createvisualtask AnimTask_BlendNonAttackerPalettes, 2, 0, 0, 15, 0 waitforvisualfinish fadetobg 16 @@ -9242,7 +9242,7 @@ Move_BLAST_BURN:: @ 81D3C0E loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W221, 192 + playsewithpan SE_M_SACRED_FIRE, 192 createsprite gFirePlumeSpriteTemplate, ANIM_ATTACKER, 2, -32, 0, 24, 0, 0, 0 createsprite gFirePlumeSpriteTemplate, ANIM_ATTACKER, 2, -20, -10, 24, 0, 0, 0 createsprite gFirePlumeSpriteTemplate, ANIM_ATTACKER, 66, 0, -16, 24, 0, 0, 0 @@ -9252,7 +9252,7 @@ Move_BLAST_BURN:: @ 81D3C0E createsprite gFirePlumeSpriteTemplate, ANIM_ATTACKER, 2, 0, 16, 24, 0, 0, 0 createsprite gFirePlumeSpriteTemplate, ANIM_ATTACKER, 2, -20, 10, 24, 0, 0, 0 delay 25 - playsewithpan SE_W172B, 192 + playsewithpan SE_M_FLAME_WHEEL2, 192 createsprite gFirePlumeSpriteTemplate, ANIM_ATTACKER, 2, -64, 0, 24, 0, 0, 0 createsprite gFirePlumeSpriteTemplate, ANIM_ATTACKER, 6, -40, -20, 24, 0, 0, 0 createsprite gFirePlumeSpriteTemplate, ANIM_ATTACKER, 70, 0, -32, 24, 0, 0, 0 @@ -9264,7 +9264,7 @@ Move_BLAST_BURN:: @ 81D3C0E createsprite gFirePlumeSpriteTemplate, ANIM_ATTACKER, 2, -40, 20, 24, 0, 0, 0 createvisualtask AnimTask_InvertScreenColor, 2, 257, 257, 257 delay 25 - playsewithpan SE_W172B, 192 + playsewithpan SE_M_FLAME_WHEEL2, 192 createsprite gFirePlumeSpriteTemplate, ANIM_ATTACKER, 2, -96, 0, 24, 0, 0, 0 createsprite gFirePlumeSpriteTemplate, ANIM_ATTACKER, 6, -60, -30, 24, 0, 0, 0 createsprite gFirePlumeSpriteTemplate, ANIM_ATTACKER, 70, 0, -48, 24, 0, 0, 0 @@ -9290,24 +9290,24 @@ Move_ROCK_TOMB:: @ 81D3E50 createsprite gRockTombRockSpriteTemplate, ANIM_TARGET, 2, 20, 12, 64, 114, 0 delay 8 createvisualtask AnimTask_ShakeBattleTerrain, 2, 0, 2, 3, 1 - playsewithpan SE_W070, 63 + playsewithpan SE_M_STRENGTH, 63 delay 8 createsprite gRockTombRockSpriteTemplate, ANIM_TARGET, 2, -20, 12, 64, 98, 0 delay 8 createvisualtask AnimTask_ShakeBattleTerrain, 2, 0, 2, 3, 1 - playsewithpan SE_W070, 63 + playsewithpan SE_M_STRENGTH, 63 delay 8 createsprite gRockTombRockSpriteTemplate, ANIM_TARGET, 66, 3, 6, 64, 82, 0 delay 8 createvisualtask AnimTask_ShakeBattleTerrain, 2, 0, 2, 3, 1 - playsewithpan SE_W070, 63 + playsewithpan SE_M_STRENGTH, 63 delay 8 createsprite gRockTombRockSpriteTemplate, ANIM_TARGET, 2, -3, 13, 64, 66, 0 delay 8 createvisualtask AnimTask_ShakeBattleTerrain, 2, 0, 2, 3, 1 - playsewithpan SE_W070, 63 + playsewithpan SE_M_STRENGTH, 63 delay 24 - playsewithpan SE_W063, 63 + playsewithpan SE_M_HYPER_BEAM, 63 createsprite gRedXSpriteTemplate, ANIM_TARGET, 5, 1, 50 createvisualtask AnimTask_ShakeMon, 5, 1, 3, 0, 20, 1 createvisualtask AnimTask_ShakeBattleTerrain, 2, 2, 0, 10, 1 @@ -9316,8 +9316,8 @@ Move_ROCK_TOMB:: @ 81D3E50 Move_SILVER_WIND:: @ 81D3F37 loadspritegfx ANIM_TAG_SPARKLE_6 - panse_1B SE_W016, 192, 63, 2, 0 - playsewithpan SE_W234, 0 + panse_1B SE_M_GUST, 192, 63, 2, 0 + playsewithpan SE_M_MORNING_SUN, 0 delay 0 monbg ANIM_DEF_PARTNER monbgprio_29 @@ -9356,7 +9356,7 @@ SilverWindContinue:: @ 81D3F7E createsprite gSilverWindSmallSparkSpriteTemplate, ANIM_TARGET, 66, -4, 16, 0, 6, 1, 2, 1 createsprite gSilverWindSmallSparkSpriteTemplate, ANIM_TARGET, 66, -16, 12, 192, 5, 2, 3, 1 waitforvisualfinish - playsewithpan SE_W016B, 63 + playsewithpan SE_M_GUST2, 63 clearmonbg ANIM_DEF_PARTNER delay 0 restorebg @@ -9373,7 +9373,7 @@ SilverWindOnPlayer:: @ 81D4138 goto SilverWindContinue Move_SNATCH:: @ 81D414F - playsewithpan SE_W036, 192 + playsewithpan SE_M_TAKE_DOWN, 192 createvisualtask AnimTask_WindUpLunge, 5, 0, -12, 4, 10, 10, 12, 6 end @@ -9384,10 +9384,10 @@ Move_DIVE:: @ 81D4169 DiveSetUp:: @ 81D4178 loadspritegfx ANIM_TAG_ROUND_SHADOW - playsewithpan SE_W029, 192 + playsewithpan SE_M_HEADBUTT, 192 createsprite gDiveBallSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 13, 336 waitforvisualfinish - playsewithpan SE_W291, 192 + playsewithpan SE_M_DIVE, 192 createsprite gDiveWaterSplashSpriteTemplate, ANIM_ATTACKER, 3, 0 call DiveSetUpWaterDroplets call DiveSetUpWaterDroplets @@ -9406,7 +9406,7 @@ DiveAttack:: @ 81D41CD loadspritegfx ANIM_TAG_SMALL_BUBBLES monbg ANIM_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W153, 63 + playsewithpan SE_M_EXPLOSION, 63 createsprite gDiveWaterSplashSpriteTemplate, ANIM_TARGET, 3, 1 call DiveAttackWaterDroplets call DiveAttackWaterDroplets @@ -9431,11 +9431,11 @@ Move_ROCK_BLAST:: @ 81D4223 loadspritegfx ANIM_TAG_IMPACT createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 6 delay 3 - playsewithpan SE_W207, 192 + playsewithpan SE_M_SWAGGER, 192 createsprite gRockBlastRockSpriteTemplate, ANIM_TARGET, 2, 16, 0, 0, 0, 25, 257 waitforvisualfinish createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 1 - playsewithpan SE_W088, 63 + playsewithpan SE_M_ROCK_THROW, 63 createsprite gRockFragmentSpriteTemplate, ANIM_TARGET, 2, 0, 0, 20, 24, 14, 2 createvisualtask AnimTask_ShakeMon, 2, 1, 3, 0, 5, 1 createsprite gRockFragmentSpriteTemplate, ANIM_TARGET, 2, 5, 0, -20, 24, 14, 1 @@ -9457,13 +9457,13 @@ Move_OVERHEAT:: @ 81D42C0 delay 1 createvisualtask AnimTask_CopyPalFadedToUnfaded, 5, 0 delay 1 - playsewithpan SE_W082, 192 + playsewithpan SE_M_DRAGON_RAGE, 192 createvisualtask AnimTask_CopyPalUnfadedToBackup, 5, 1, 0 delay 1 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 2, 1, 0, 13, 28 createvisualtask AnimTask_ShakeMon, 5, 0, 2, 0, 15, 1 waitforvisualfinish - playsewithpan SE_W172B, 192 + playsewithpan SE_M_FLAME_WHEEL2, 192 createsprite gOverheatFlameSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 30, 25, -20 createsprite gOverheatFlameSpriteTemplate, ANIM_ATTACKER, 2, 1, 32, 30, 25, -20 createsprite gOverheatFlameSpriteTemplate, ANIM_ATTACKER, 2, 1, 64, 30, 25, -20 @@ -9493,17 +9493,17 @@ Move_OVERHEAT:: @ 81D42C0 delay 5 waitforvisualfinish createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, -5, 3, 1, 0 - playsewithpan SE_W007, 63 + playsewithpan SE_M_FIRE_PUNCH, 63 createvisualtask AnimTask_ShakeMon, 2, 1, 10, 0, 25, 1 delay 6 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 8, -5, 1, 0 - playsewithpan SE_W007, 63 + playsewithpan SE_M_FIRE_PUNCH, 63 delay 8 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 10, 10, 1, 0 - playsewithpan SE_W007, 63 + playsewithpan SE_M_FIRE_PUNCH, 63 delay 8 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 0 - playsewithpan SE_W007, 63 + playsewithpan SE_M_FIRE_PUNCH, 63 createvisualtask AnimTask_CopyPalFadedToUnfaded, 5, 1 delay 1 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 2, -1, 0, 13, 19026 @@ -9530,12 +9530,12 @@ Move_HYDRO_CANNON:: @ 81D45B2 loadspritegfx ANIM_TAG_WATER_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W057, 192 + playsewithpan SE_M_SURF, 192 createsprite gHydroCannonChargeSpriteTemplate, ANIM_TARGET, 2, delay 10 createvisualtask AnimTask_InvertScreenColor, 2, 257, 257, 257 delay 30 - panse_1B SE_W056, 192, 63, 2, 0 + panse_1B SE_M_HYDRO_PUMP, 192, 63, 2, 0 call HydroCannonBeam createvisualtask AnimTask_ShakeMon, 5, 1, 10, 0, 40, 1 createsprite gWaterHitSplatSpriteTemplate, ANIM_TARGET, 2, 0, 0, 1, 0 @@ -9570,11 +9570,11 @@ HydroCannonBeam:: @ 81D467C Move_ASTONISH:: @ 81D46E4 loadspritegfx ANIM_TAG_SWEAT_BEAD - playsewithpan SE_W227, 192 + playsewithpan SE_M_ENCORE, 192 createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 6 delay 25 createsprite gSprayWaterDropletSpriteTemplate, ANIM_TARGET, 5, 0, 1 - playsewithpan SE_W166, 63 + playsewithpan SE_M_SKETCH, 63 createsprite gSprayWaterDropletSpriteTemplate, ANIM_TARGET, 5, 1, 1 createvisualtask AnimTask_ShakeMon2, 2, 1, 4, 0, 5, 1 createvisualtask AnimTask_StretchTargetUp, 3, @@ -9593,7 +9593,7 @@ Move_SEISMIC_TOSS:: @ 81D472C fadetobg 17 waitbgfadeout createvisualtask AnimTask_MoveSeismicTossBg, 3 - playsewithpan SE_W327, 0 + playsewithpan SE_M_SKY_UPPERCUT, 0 waitbgfadein waitforvisualfinish createvisualtask AnimTask_SeismicTossBgAccelerateDownAtEnd, 3 @@ -9635,7 +9635,7 @@ SeismicTossStrong:: @ 81D47A8 SeismicTossRockScatter1:: @ 81D47C7 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, -10, -8, 1, 1 - playsewithpan SE_W070, 63 + playsewithpan SE_M_STRENGTH, 63 createvisualtask AnimTask_ShakeMon, 2, 1, 0, 3, 5, 1 createsprite gRockScatterSpriteTemplate, ANIM_TARGET, 2, -12, 27, 2, 3 createsprite gRockScatterSpriteTemplate, ANIM_TARGET, 2, 8, 28, 3, 4 @@ -9645,7 +9645,7 @@ SeismicTossRockScatter1:: @ 81D47C7 SeismicTossRockScatter2:: @ 81D4828 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 10, -8, 1, 1 - playsewithpan SE_W088, 63 + playsewithpan SE_M_ROCK_THROW, 63 createvisualtask AnimTask_ShakeMon, 2, 1, 0, 3, 5, 1 createsprite gRockScatterSpriteTemplate, ANIM_TARGET, 2, -12, 32, 3, 4 createsprite gRockScatterSpriteTemplate, ANIM_TARGET, 2, 8, 31, 2, 2 @@ -9656,7 +9656,7 @@ SeismicTossRockScatter2:: @ 81D4828 Move_MAGIC_COAT:: @ 81D4889 loadspritegfx ANIM_TAG_ORANGE_LIGHT_WALL setalpha 0, 16 - waitplaysewithpan SE_W112, 192, 15 + waitplaysewithpan SE_M_BARRIER, 192, 15 createsprite gMagicCoatWallSpriteTemplate, ANIM_ATTACKER, 3, 40, 0, 10170 waitforvisualfinish delay 1 @@ -9668,7 +9668,7 @@ Move_WATER_PULSE:: @ 81D48A6 loadspritegfx ANIM_TAG_BLUE_RING_2 monbg 1 monbgprio_28 1 - playsewithpan SE_W145C, 192 + playsewithpan SE_M_BUBBLE3, 192 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 0, 7, 29472 delay 10 createsprite gWaterPulseBubbleSpriteTemplate, ANIM_ATTACKER, 66, 100, 100, 8, 1, 20, 40, 0 @@ -9676,15 +9676,15 @@ Move_WATER_PULSE:: @ 81D48A6 createsprite gWaterPulseBubbleSpriteTemplate, ANIM_ATTACKER, 66, 200, 80, 8, 1, 40, 20, 0 createsprite gWaterPulseBubbleSpriteTemplate, ANIM_ATTACKER, 66, 80, 60, 10, 3, 20, 50, 0 createsprite gWaterPulseBubbleSpriteTemplate, ANIM_ATTACKER, 66, 140, 100, 16, 1, 20, 30, 1 - playsewithpan SE_W145C, 63 + playsewithpan SE_M_BUBBLE3, 63 waitforvisualfinish - playsewithpan SE_W202, 192 + playsewithpan SE_M_GIGA_DRAIN, 192 createsprite gWaterPulseRingSpriteTemplate, ANIM_TARGET, 2, 0, 0, 40, 15 delay 5 - playsewithpan SE_W202, 192 + playsewithpan SE_M_GIGA_DRAIN, 192 createsprite gWaterPulseRingSpriteTemplate, ANIM_TARGET, 2, 0, 0, 40, 15 delay 5 - playsewithpan SE_W202, 192 + playsewithpan SE_M_GIGA_DRAIN, 192 createsprite gWaterPulseRingSpriteTemplate, ANIM_TARGET, 2, 0, 0, 40, 15 delay 13 createvisualtask AnimTask_ShakeMon, 2, 1, 0, 8, 18, 1 @@ -9708,13 +9708,13 @@ Move_PSYCHO_BOOST:: @ 81D499B setalpha 8, 8 delay 10 createvisualtask AnimTask_ShakeMon, 2, 0, 3, 0, 240, 0 - loopsewithpan SE_W060B, 192, 14, 10 + loopsewithpan SE_M_PSYBEAM2, 192, 14, 10 createsprite gPsychoBoostOrbSpriteTemplate, ANIM_ATTACKER, 2 delay 110 - loopsewithpan SE_W060B, 192, 7, 10 + loopsewithpan SE_M_PSYBEAM2, 192, 7, 10 waitforvisualfinish createvisualtask AnimTask_ShakeMon2, 2, 1, -8, 1, 24, 1 - playsewithpan SE_W043, 63 + playsewithpan SE_M_LEER, 63 waitforvisualfinish clearmonbg ANIM_ATK_PARTNER blendoff @@ -9726,12 +9726,12 @@ Move_KNOCK_OFF:: @ 81D4A0F loadspritegfx ANIM_TAG_IMPACT createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 6 delay 4 - playsewithpan SE_W233, 63 + playsewithpan SE_M_VITAL_THROW, 63 createsprite gKnockOffStrikeSpriteTemplate, ANIM_TARGET, 2, -16, -16 delay 8 createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 5, 1, RGB_WHITE, 10, 0, 0 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 2 - playsewithpan SE_W004, 63 + playsewithpan SE_M_COMET_PUNCH, 63 createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 1, -12, 10, 0, 3 createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 5 delay 3 @@ -9750,7 +9750,7 @@ Move_DOOM_DESIRE:: @ 81D4A9F createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 0, 4, 0 waitforvisualfinish setalpha 8, 8 - playsewithpan SE_W060, 192 + playsewithpan SE_M_PSYBEAM, 192 createvisualtask AnimTask_ScaleMonAndRestore, 5, -4, -4, 15, 0, 1 waitforvisualfinish delay 20 @@ -9766,26 +9766,26 @@ Move_DOOM_DESIRE:: @ 81D4A9F delay 10 createvisualtask AnimTask_DoomDesireLightBeam, 5, delay 5 - playsewithpan SE_W109, 192 + playsewithpan SE_M_CONFUSE_RAY, 192 delay 10 - playsewithpan SE_W109, 0 + playsewithpan SE_M_CONFUSE_RAY, 0 delay 10 - playsewithpan SE_W109, 63 + playsewithpan SE_M_CONFUSE_RAY, 63 delay 23 createvisualtask AnimTask_ShakeMonInPlace, 2, 1, 10, 0, 20, 1 - playsewithpan SE_W120, 63 + playsewithpan SE_M_SELF_DESTRUCT, 63 createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 1 delay 6 - playsewithpan SE_W120, 63 + playsewithpan SE_M_SELF_DESTRUCT, 63 createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 24, -24, 1, 1 delay 6 - playsewithpan SE_W120, 63 + playsewithpan SE_M_SELF_DESTRUCT, 63 createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, -16, 16, 1, 1 delay 6 - playsewithpan SE_W120, 63 + playsewithpan SE_M_SELF_DESTRUCT, 63 createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, -24, -12, 1, 1 delay 6 - playsewithpan SE_W120, 63 + playsewithpan SE_M_SELF_DESTRUCT, 63 createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 16, 16, 1, 1 waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 16, 0, RGB_WHITE @@ -9798,7 +9798,7 @@ Move_SKY_UPPERCUT:: @ 81D4BC1 monbgprio_28 1 fadetobg 17 waitbgfadeout - playsewithpan SE_W327, 192 + playsewithpan SE_M_SKY_UPPERCUT, 192 createvisualtask AnimTask_MoveSkyUppercutBg, 5, 55 waitbgfadein setalpha 12, 8 @@ -9806,20 +9806,20 @@ Move_SKY_UPPERCUT:: @ 81D4BC1 createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 28, 0, 0, 5 delay 4 createvisualtask AnimTask_ShakeMon2, 2, 1, 4, 0, 6, 1 - playsewithpan SE_W233B, 63 + playsewithpan SE_M_VITAL_THROW2, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, -28, 28, 1, 1 delay 1 - playsewithpan SE_W233B, 63 + playsewithpan SE_M_VITAL_THROW2, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, -15, 8, 1, 1 - playsewithpan SE_W233B, 63 + playsewithpan SE_M_VITAL_THROW2, 63 delay 1 - playsewithpan SE_W233B, 63 + playsewithpan SE_M_VITAL_THROW2, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, -5, -12, 1, 1 delay 1 - playsewithpan SE_W233B, 63 + playsewithpan SE_M_VITAL_THROW2, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, -32, 1, 1 delay 1 - playsewithpan SE_W233B, 63 + playsewithpan SE_M_VITAL_THROW2, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 5, -52, 1, 1 createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 1, -26, 16, 1, 4 delay 4 @@ -9855,7 +9855,7 @@ Move_TWISTER:: @ 81D4D0E loadspritegfx ANIM_TAG_ROCKS monbg ANIM_DEF_PARTNER monbgprio_28 1 - playsewithpan SE_W239, 63 + playsewithpan SE_M_TWISTER, 63 createsprite gTwisterLeafParticleSpriteTemplate, ANIM_TARGET, 2, 120, 70, 5, 70, 30 delay 1 createsprite gTwisterLeafParticleSpriteTemplate, ANIM_TARGET, 2, 115, 55, 6, 60, 25 @@ -9878,18 +9878,18 @@ Move_TWISTER:: @ 81D4D0E createsprite gTwisterLeafParticleSpriteTemplate, ANIM_TARGET, 2, 110, 10, 8, 32, 20 waitforvisualfinish createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, -32, -16, 1, 3 - playsewithpan SE_W004, 63 + playsewithpan SE_M_COMET_PUNCH, 63 createvisualtask AnimTask_ShakeMonInPlace, 2, 1, 3, 0, 12, 1 createvisualtask AnimTask_ShakeMonInPlace, 2, 3, 3, 0, 12, 1 delay 4 createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, 1, 3 - playsewithpan SE_W004, 63 + playsewithpan SE_M_COMET_PUNCH, 63 delay 4 createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, 1, 3 - playsewithpan SE_W004, 63 + playsewithpan SE_M_COMET_PUNCH, 63 delay 4 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 32, 20, 1, 3 - playsewithpan SE_W004, 63 + playsewithpan SE_M_COMET_PUNCH, 63 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -9902,7 +9902,7 @@ Move_MAGICAL_LEAF:: @ 81D4E6D monbg ANIM_DEF_PARTNER setalpha 12, 8 delay 1 - loopsewithpan SE_W077, 192, 10, 5 + loopsewithpan SE_M_POISON_POWDER, 192, 10, 5 createvisualtask AnimTask_CycleMagicalLeafPal, 5 createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, -3, -2, 10 delay 2 @@ -9924,11 +9924,11 @@ Move_MAGICAL_LEAF:: @ 81D4E6D delay 2 createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, -3, -5, 8 delay 60 - playsewithpan SE_W013B, 192 + playsewithpan SE_M_RAZOR_WIND2, 192 createsprite gRazorLeafCutterSpriteTemplate, ANIM_TARGET, 3, 20, -10, 20, 0, 32, 20, 0 createsprite gRazorLeafCutterSpriteTemplate, ANIM_TARGET, 3, 20, -10, 20, 0, 32, -20, 0 delay 30 - playsewithpan SE_W013, 63 + playsewithpan SE_M_RAZOR_WIND, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 4, -10, -4, 1, 2 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 4, 10, 4, 1, 2 createvisualtask AnimTask_ShakeMon2, 2, 1, 2, 0, 8, 1 @@ -9945,10 +9945,10 @@ Move_ICE_BALL:: @ 81D4F8E createvisualtask AnimTask_GetRolloutCounter, 5, 0 jumpargeq 0, 4, IceBallSetIceBg IceBallContinue:: @ 81D4FA5 - playsewithpan SE_W196, 192 + playsewithpan SE_M_ICY_WIND, 192 createsprite gIceBallChunkSpriteTemplate, ANIM_TARGET, 2, 15, 0, -12, -16, 30, -40 delay 28 - playsewithpan SE_W280, 63 + playsewithpan SE_M_BRICK_BREAK, 63 createvisualtask AnimTask_GetRolloutCounter, 5, 0 jumpargeq 0, 0, IceBallWeakest jumpargeq 0, 1, IceBallWeak @@ -10041,11 +10041,11 @@ Move_WEATHER_BALL:: @ 81D515D loadspritegfx ANIM_TAG_WEATHER_BALL createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 8, 1, 0 delay 8 - playsewithpan SE_W207, 192 + playsewithpan SE_M_SWAGGER, 192 createsprite gWeatherBallUpSpriteTemplate, ANIM_ATTACKER, 2 waitforvisualfinish delay 15 - playsewithpan SE_W197, 0 + playsewithpan SE_M_DETECT, 0 createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 5, 1, RGB_WHITE, 10, 0, 0 waitforvisualfinish createvisualtask AnimTask_GetWeather, 2, @@ -10060,7 +10060,7 @@ WeatherBallNormal:: @ 81D51C8 loadspritegfx ANIM_TAG_IMPACT createsprite gWeatherBallNormalDownSpriteTemplate, ANIM_TARGET, 2, -30, -100, 25, 1, 0, 0 waitforvisualfinish - playsewithpan SE_W025B, 63 + playsewithpan SE_M_MEGA_KICK2, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 4, -10, 0, 1, 2 createvisualtask AnimTask_ShakeMon, 2, 1, 0, 3, 8, 1 waitforvisualfinish @@ -10069,15 +10069,15 @@ WeatherBallNormal:: @ 81D51C8 WeatherBallFire:: @ 81D5205 loadspritegfx ANIM_TAG_SMALL_EMBER createsprite gWeatherBallFireDownSpriteTemplate, ANIM_TARGET, 2, -30, -100, 25, 1, 40, 10 - playsewithpan SE_W172, 63 + playsewithpan SE_M_FLAME_WHEEL, 63 delay 10 createsprite gWeatherBallFireDownSpriteTemplate, ANIM_TARGET, 2, -30, -100, 25, 1, -40, 20 - playsewithpan SE_W172, 63 + playsewithpan SE_M_FLAME_WHEEL, 63 delay 10 createsprite gWeatherBallFireDownSpriteTemplate, ANIM_TARGET, 2, -30, -100, 25, 1, 0, 0 - playsewithpan SE_W172, 63 + playsewithpan SE_M_FLAME_WHEEL, 63 waitforvisualfinish - playsewithpan SE_W172B, 63 + playsewithpan SE_M_FLAME_WHEEL2, 63 createvisualtask AnimTask_ShakeMon, 2, 1, 0, 3, 8, 1 waitforvisualfinish end @@ -10085,31 +10085,31 @@ WeatherBallFire:: @ 81D5205 WeatherBallWater:: @ 81D5269 loadspritegfx ANIM_TAG_SMALL_BUBBLES createsprite gWeatherBallWaterDownSpriteTemplate, ANIM_TARGET, 2, -30, -100, 25, 1, 50, 10 - playsewithpan SE_W152, 63 + playsewithpan SE_M_CRABHAMMER, 63 delay 8 createsprite gWeatherBallWaterDownSpriteTemplate, ANIM_TARGET, 2, -30, -100, 25, 1, -20, 20 - playsewithpan SE_W152, 63 + playsewithpan SE_M_CRABHAMMER, 63 delay 13 createsprite gWeatherBallWaterDownSpriteTemplate, ANIM_TARGET, 2, -30, -100, 25, 1, 0, 0 - playsewithpan SE_W152, 63 + playsewithpan SE_M_CRABHAMMER, 63 waitforvisualfinish createvisualtask AnimTask_ShakeMon, 2, 1, 0, 3, 8, 1 - playsewithpan SE_W202, 63 + playsewithpan SE_M_GIGA_DRAIN, 63 waitforvisualfinish end WeatherBallSandstorm:: @ 81D52CD loadspritegfx ANIM_TAG_ROCKS createsprite gWeatherBallRockDownSpriteTemplate, ANIM_TARGET, 2, -30, -100, 25, 1, 30, 0 - playsewithpan SE_W088, 63 + playsewithpan SE_M_ROCK_THROW, 63 delay 5 createsprite gWeatherBallRockDownSpriteTemplate, ANIM_TARGET, 2, -30, -100, 25, 1, -40, 20 - playsewithpan SE_W088, 63 + playsewithpan SE_M_ROCK_THROW, 63 delay 14 createsprite gWeatherBallRockDownSpriteTemplate, ANIM_TARGET, 2, -30, -100, 25, 1, 0, 0 - playsewithpan SE_W088, 63 + playsewithpan SE_M_ROCK_THROW, 63 waitforvisualfinish - playsewithpan SE_W070, 63 + playsewithpan SE_M_STRENGTH, 63 createsprite gRockScatterSpriteTemplate, ANIM_TARGET, 2, -12, 27, 2, 3 createsprite gRockScatterSpriteTemplate, ANIM_TARGET, 2, 8, 28, 3, 4 createsprite gRockScatterSpriteTemplate, ANIM_TARGET, 2, -4, 30, 2, 3 @@ -10122,16 +10122,16 @@ WeatherBallIce:: @ 81D536D loadspritegfx ANIM_TAG_HAIL loadspritegfx ANIM_TAG_ICE_CRYSTALS createsprite gWeatherBallIceDownSpriteTemplate, ANIM_TARGET, 2, -30, -100, 25, 25, -40, 20 - playsewithpan SE_W258, 63 + playsewithpan SE_M_HAIL, 63 delay 10 createsprite gWeatherBallIceDownSpriteTemplate, ANIM_TARGET, 2, -30, -100, 25, 25, 40, 0 - playsewithpan SE_W258, 63 + playsewithpan SE_M_HAIL, 63 delay 10 createsprite gWeatherBallIceDownSpriteTemplate, ANIM_TARGET, 2, -30, -100, 25, 25, 0, 0 - playsewithpan SE_W258, 63 + playsewithpan SE_M_HAIL, 63 waitforvisualfinish createvisualtask AnimTask_ShakeMon2, 2, 1, 2, 0, 8, 1 - playsewithpan SE_W196, 63 + playsewithpan SE_M_ICY_WIND, 63 call IceCrystalEffectShort waitforvisualfinish end @@ -10140,7 +10140,7 @@ Move_COUNT:: @ 81D53D9 loadspritegfx ANIM_TAG_IMPACT monbg 1 setalpha 12, 8 - playsewithpan SE_W003, 63 + playsewithpan SE_M_DOUBLE_SLAP, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon, 2, 1, 3, 0, 6, 1 waitforvisualfinish @@ -10150,64 +10150,64 @@ Move_COUNT:: @ 81D53D9 IceCrystalEffectShort:: @ 81D540A createsprite gIceCrystalHitLargeSpriteTemplate, ANIM_TARGET, 2, -10, -10, 0 - playsewithpan SE_W196, 63 + playsewithpan SE_M_ICY_WIND, 63 delay 4 createsprite gIceCrystalHitSmallSpriteTemplate, ANIM_TARGET, 2, 10, 20, 0 - playsewithpan SE_W196, 63 + playsewithpan SE_M_ICY_WIND, 63 delay 4 createsprite gIceCrystalHitLargeSpriteTemplate, ANIM_TARGET, 2, -5, 10, 0 - playsewithpan SE_W196, 63 + playsewithpan SE_M_ICY_WIND, 63 delay 4 createsprite gIceCrystalHitSmallSpriteTemplate, ANIM_TARGET, 2, 17, -12, 0 - playsewithpan SE_W196, 63 + playsewithpan SE_M_ICY_WIND, 63 delay 4 createsprite gIceCrystalHitSmallSpriteTemplate, ANIM_TARGET, 2, -15, 15, 0 - playsewithpan SE_W196, 63 + playsewithpan SE_M_ICY_WIND, 63 delay 4 createsprite gIceCrystalHitSmallSpriteTemplate, ANIM_TARGET, 2, 0, 0, 0 - playsewithpan SE_W196, 63 + playsewithpan SE_M_ICY_WIND, 63 delay 4 createsprite gIceCrystalHitLargeSpriteTemplate, ANIM_TARGET, 2, 20, 2, 0 - playsewithpan SE_W196, 63 + playsewithpan SE_M_ICY_WIND, 63 return IceCrystalEffectLong:: @ 81D548E createsprite gIceCrystalHitLargeSpriteTemplate, ANIM_TARGET, 2, -10, -10, 1 - playsewithpan SE_W196, 63 + playsewithpan SE_M_ICY_WIND, 63 delay 4 createsprite gIceCrystalHitSmallSpriteTemplate, ANIM_TARGET, 2, 10, 20, 1 - playsewithpan SE_W196, 63 + playsewithpan SE_M_ICY_WIND, 63 delay 4 createsprite gIceCrystalHitLargeSpriteTemplate, ANIM_TARGET, 2, -29, 0, 1 - playsewithpan SE_W196, 63 + playsewithpan SE_M_ICY_WIND, 63 delay 4 createsprite gIceCrystalHitSmallSpriteTemplate, ANIM_TARGET, 2, 29, -20, 1 - playsewithpan SE_W196, 63 + playsewithpan SE_M_ICY_WIND, 63 delay 4 createsprite gIceCrystalHitLargeSpriteTemplate, ANIM_TARGET, 2, -5, 10, 1 - playsewithpan SE_W196, 63 + playsewithpan SE_M_ICY_WIND, 63 delay 4 createsprite gIceCrystalHitSmallSpriteTemplate, ANIM_TARGET, 2, 17, -12, 1 - playsewithpan SE_W196, 63 + playsewithpan SE_M_ICY_WIND, 63 delay 4 createsprite gIceCrystalHitLargeSpriteTemplate, ANIM_TARGET, 2, -20, 0, 1 - playsewithpan SE_W196, 63 + playsewithpan SE_M_ICY_WIND, 63 delay 4 createsprite gIceCrystalHitSmallSpriteTemplate, ANIM_TARGET, 2, -15, 15, 1 - playsewithpan SE_W196, 63 + playsewithpan SE_M_ICY_WIND, 63 delay 4 createsprite gIceCrystalHitSmallSpriteTemplate, ANIM_TARGET, 2, 26, -5, 1 - playsewithpan SE_W196, 63 + playsewithpan SE_M_ICY_WIND, 63 delay 4 createsprite gIceCrystalHitSmallSpriteTemplate, ANIM_TARGET, 2, 0, 0, 1 - playsewithpan SE_W196, 63 + playsewithpan SE_M_ICY_WIND, 63 delay 4 createsprite gIceCrystalHitLargeSpriteTemplate, ANIM_TARGET, 2, 20, 2, 1 - playsewithpan SE_W196, 63 + playsewithpan SE_M_ICY_WIND, 63 return IceSpikesEffectShort: @ Unused - loopsewithpan SE_W196, 63, 6, 4 + loopsewithpan SE_M_ICY_WIND, 63, 6, 4 createsprite gIceGroundSpikeSpriteTemplate, ANIM_TARGET, 2, 0, 24, 0 delay 4 createsprite gIceGroundSpikeSpriteTemplate, ANIM_TARGET, 2, 8, 24, 0 @@ -10224,7 +10224,7 @@ IceSpikesEffectShort: @ Unused return IceSpikesEffectLong:: @ 81D55E2 - loopsewithpan SE_W196, 63, 6, 4 + loopsewithpan SE_M_ICY_WIND, 63, 6, 4 createsprite gIceGroundSpikeSpriteTemplate, ANIM_TARGET, 2, 0, 24, 1 delay 4 createsprite gIceGroundSpikeSpriteTemplate, ANIM_TARGET, 2, 8, 24, 1 @@ -10254,7 +10254,7 @@ GrantingStarsEffect:: @ 81D569E return HealingEffect:: @ 81D56C9 - playsewithpan SE_W071B, 192 + playsewithpan SE_M_ABSORB_2, 192 createsprite gHealingBlueStarSpriteTemplate, ANIM_ATTACKER, 2, 0, -5, 0, 0 delay 7 createsprite gHealingBlueStarSpriteTemplate, ANIM_ATTACKER, 2, -15, 10, 0, 0 @@ -10266,7 +10266,7 @@ HealingEffect:: @ 81D56C9 return HealingEffect2:: @ 81D5712 - playsewithpan SE_W071B, 63 + playsewithpan SE_M_ABSORB_2, 63 createsprite gHealingBlueStarSpriteTemplate, ANIM_TARGET, 2, 0, -5, 1, 0 delay 7 createsprite gHealingBlueStarSpriteTemplate, ANIM_TARGET, 2, -15, 10, 1, 0 @@ -10279,72 +10279,72 @@ HealingEffect2:: @ 81D5712 PoisonBubblesEffect:: @ 81D575B createsprite gPoisonBubbleSpriteTemplate, ANIM_TARGET, 2, 10, 10, 0 - playsewithpan SE_W092, 63 + playsewithpan SE_M_TOXIC, 63 delay 6 createsprite gPoisonBubbleSpriteTemplate, ANIM_TARGET, 2, 20, -20, 0 - playsewithpan SE_W092, 63 + playsewithpan SE_M_TOXIC, 63 delay 6 createsprite gPoisonBubbleSpriteTemplate, ANIM_TARGET, 2, -20, 15, 0 - playsewithpan SE_W092, 63 + playsewithpan SE_M_TOXIC, 63 delay 6 createsprite gPoisonBubbleSpriteTemplate, ANIM_TARGET, 2, 0, 0, 0 - playsewithpan SE_W092, 63 + playsewithpan SE_M_TOXIC, 63 delay 6 createsprite gPoisonBubbleSpriteTemplate, ANIM_TARGET, 2, -20, -20, 0 - playsewithpan SE_W092, 63 + playsewithpan SE_M_TOXIC, 63 delay 6 createsprite gPoisonBubbleSpriteTemplate, ANIM_TARGET, 2, 16, -8, 0 - playsewithpan SE_W092, 63 + playsewithpan SE_M_TOXIC, 63 return WaterBubblesEffectShort:: @ 81D57CC createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, 10, 10, 0 - playsewithpan SE_W145C, 63 + playsewithpan SE_M_BUBBLE3, 63 delay 6 createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, 20, -20, 0 - playsewithpan SE_W145C, 63 + playsewithpan SE_M_BUBBLE3, 63 delay 6 createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, -20, 15, 0 - playsewithpan SE_W145C, 63 + playsewithpan SE_M_BUBBLE3, 63 delay 6 createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 0 - playsewithpan SE_W145C, 63 + playsewithpan SE_M_BUBBLE3, 63 delay 6 createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, -20, -20, 0 - playsewithpan SE_W145C, 63 + playsewithpan SE_M_BUBBLE3, 63 delay 6 createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, 16, -8, 0 - playsewithpan SE_W145C, 63 + playsewithpan SE_M_BUBBLE3, 63 return WaterBubblesEffectLong:: @ 81D583D createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, 10, 10, 1 - playsewithpan SE_W145C, 63 + playsewithpan SE_M_BUBBLE3, 63 delay 6 createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, -28, -10, 1 - playsewithpan SE_W145C, 63 + playsewithpan SE_M_BUBBLE3, 63 delay 6 createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, 20, -20, 1 - playsewithpan SE_W145C, 63 + playsewithpan SE_M_BUBBLE3, 63 delay 6 createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, -20, 15, 1 - playsewithpan SE_W145C, 63 + playsewithpan SE_M_BUBBLE3, 63 delay 6 createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1 - playsewithpan SE_W145C, 63 + playsewithpan SE_M_BUBBLE3, 63 delay 6 createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, 27, 8, 1 - playsewithpan SE_W145C, 63 + playsewithpan SE_M_BUBBLE3, 63 delay 6 createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, -20, -20, 1 - playsewithpan SE_W145C, 63 + playsewithpan SE_M_BUBBLE3, 63 delay 6 createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, 16, -8, 1 - playsewithpan SE_W145C, 63 + playsewithpan SE_M_BUBBLE3, 63 return ElectricityEffect:: @ 81D58D4 - playsewithpan SE_W085B, 63 + playsewithpan SE_M_THUNDERBOLT2, 63 createsprite gElectricitySpriteTemplate, ANIM_TARGET, 2, 5, 0, 5, 0 delay 2 createsprite gElectricitySpriteTemplate, ANIM_TARGET, 2, -5, 10, 5, 1 @@ -10363,7 +10363,7 @@ ElectricityEffect:: @ 81D58D4 return ConfusionEffect:: @ 81D595F - loopsewithpan SE_W146, 63, 13, 6 + loopsewithpan SE_M_DIZZY_PUNCH, 63, 13, 6 createsprite gConfusionDuckSpriteTemplate, ANIM_TARGET, 2, 0, -15, 0, 3, 90 createsprite gConfusionDuckSpriteTemplate, ANIM_TARGET, 2, 0, -15, 51, 3, 90 createsprite gConfusionDuckSpriteTemplate, ANIM_TARGET, 2, 0, -15, 102, 3, 90 @@ -10435,7 +10435,7 @@ UnsetSolarbeamBg:: @ 81D5A41 return Status_Poison:: @ 81D5A44 - loopsewithpan SE_W092, 63, 13, 6 + loopsewithpan SE_M_TOXIC, 63, 13, 6 createvisualtask AnimTask_ShakeMon2, 2, 0, 1, 0, 18, 2 createvisualtask AnimTask_CurseBlendEffect, 2, 2, 2, 2, 0, 12, 31774 end @@ -10447,7 +10447,7 @@ Status_Confusion:: @ 81D5A6F Status_Burn:: @ 81D5A78 loadspritegfx ANIM_TAG_SMALL_EMBER - playsewithpan SE_W172, 63 + playsewithpan SE_M_FLAME_WHEEL, 63 call BurnFlame call BurnFlame call BurnFlame @@ -10461,19 +10461,19 @@ BurnFlame:: @ 81D5A90 Status_Infatuation:: @ 81D5AA8 loadspritegfx ANIM_TAG_MAGENTA_HEART - playsewithpan SE_W204, 192 + playsewithpan SE_M_CHARM, 192 createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, 0, 20 delay 15 - playsewithpan SE_W204, 192 + playsewithpan SE_M_CHARM, 192 createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, -20, 20 delay 15 - playsewithpan SE_W204, 192 + playsewithpan SE_M_CHARM, 192 createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, 20, 20 end Status_Sleep:: @ 81D5ADD loadspritegfx ANIM_TAG_LETTER_Z - playsewithpan SE_W173, 192 + playsewithpan SE_M_SNORE, 192 createsprite gSleepLetterZSpriteTemplate, ANIM_ATTACKER, 2, 4, -10, 16, 0, 0 delay 30 createsprite gSleepLetterZSpriteTemplate, ANIM_ATTACKER, 2, 4, -10, 16, 0, 0 @@ -10486,11 +10486,11 @@ Status_Paralysis:: @ 81D5B09 end Status_Freeze:: @ 81D5B23 - playsewithpan SE_W196, 0 + playsewithpan SE_M_ICY_WIND, 0 loadspritegfx ANIM_TAG_ICE_CUBE monbg ANIM_DEF_PARTNER monbgprio_28 1 - waitplaysewithpan SE_W258, 63, 17 + waitplaysewithpan SE_M_HAIL, 63, 17 createvisualtask AnimTask_FrozenIceCube, 2, waitforvisualfinish clearmonbg ANIM_DEF_PARTNER @@ -10499,7 +10499,7 @@ Status_Freeze:: @ 81D5B23 Status_Curse:: @ 81D5B3E loadspritegfx ANIM_TAG_GHOSTLY_SPIRIT monbg ANIM_DEF_PARTNER - playsewithpan SE_W171, 63 + playsewithpan SE_M_NIGHTMARE, 63 createsprite gCurseGhostSpriteTemplate, ANIM_TARGET, 2, createvisualtask AnimTask_ShakeMon2, 2, 1, 2, 0, 14, 1 waitforvisualfinish @@ -10509,7 +10509,7 @@ Status_Curse:: @ 81D5B3E Status_Nightmare:: @ 81D5B63 loadspritegfx ANIM_TAG_DEVIL monbg ANIM_DEF_PARTNER - playsewithpan SE_W171, 63 + playsewithpan SE_M_NIGHTMARE, 63 createsprite gNightmareDevilSpriteTemplate, ANIM_TARGET, 2 createvisualtask AnimTask_ShakeMon2, 2, 1, 2, 0, 14, 1 waitforvisualfinish @@ -10523,8 +10523,8 @@ General_CastformChange:: @ 81D5B88 CastformChangeContinue:: @ 81D5B9C monbg ANIM_ATTACKER - playsewithpan SE_W100, 192 - waitplaysewithpan SE_W107, 192, 48 + playsewithpan SE_M_TELEPORT, 192 + waitplaysewithpan SE_M_MINIMIZE, 192, 48 createvisualtask AnimTask_TransformMon, 2, 1 waitforvisualfinish clearmonbg ANIM_ATTACKER @@ -10560,10 +10560,10 @@ General_BaitThrow:: @ 81D5C0C createvisualtask sub_80F1C8C, 2, 0 createvisualtask AnimTask_LoadBaitGfx, 2, delay 0 - waitplaysewithpan SE_W026, 192, 22 + waitplaysewithpan SE_M_JUMP_KICK, 192, 22 createsprite gSafariBaitSpriteTemplate, ANIM_TARGET, 3, -18, 12, 0, 32 delay 50 - loopsewithpan SE_W039, 63, 19, 2 + loopsewithpan SE_M_TAIL_WHIP, 63, 19, 2 createvisualtask AnimTask_SwayMon, 5, 1, 8, 1536, 2, 1 waitforvisualfinish createvisualtask AnimTask_FreeBaitGfx, 2, @@ -10584,7 +10584,7 @@ General_TurnTrap:: @ 81D5C5F Status_BindWrap:: @ 81D5C8B loadspritegfx ANIM_TAG_TENDRILS - loopsewithpan SE_W010, 63, 6, 2 + loopsewithpan SE_M_SCRATCH, 63, 6, 2 createsprite gConstrictBindingSpriteTemplate, ANIM_TARGET, 4, 0, 16, 0, 1 delay 7 createsprite gConstrictBindingSpriteTemplate, ANIM_TARGET, 2, 0, 8, 1, 1 @@ -10592,13 +10592,13 @@ Status_BindWrap:: @ 81D5C8B createvisualtask AnimTask_ShakeMon2, 2, 1, 2, 0, 8, 1 delay 20 setarg 7, 65535 - playsewithpan SE_W020, 63 + playsewithpan SE_M_BIND, 63 waitforvisualfinish end Status_FireSpin:: @ 81D5CD3 loadspritegfx ANIM_TAG_SMALL_EMBER - playsewithpan SE_W221B, 63 + playsewithpan SE_M_SACRED_FIRE2, 63 createvisualtask AnimTask_ShakeMon, 5, 1, 0, 2, 30, 1 call FireSpinEffect call FireSpinEffect @@ -10613,7 +10613,7 @@ Status_Whirlpool:: @ 81D5CF8 setalpha 12, 8 delay 0 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 4, 2, 0, 7, 23968 - playsewithpan SE_W250, 63 + playsewithpan SE_M_WHIRLPOOL, 63 createvisualtask AnimTask_ShakeMon, 5, 1, 0, 2, 30, 1 call WhirlpoolEffect call WhirlpoolEffect @@ -10629,7 +10629,7 @@ Status_Clamp:: @ 81D5D4C loadspritegfx ANIM_TAG_IMPACT monbg 1 setalpha 12, 8 - playsewithpan SE_W011, 63 + playsewithpan SE_M_VICEGRIP, 63 createsprite gClampJawSpriteTemplate, ANIM_ATTACKER, 2, -32, 0, 2, 819, 0, 10 createsprite gClampJawSpriteTemplate, ANIM_ATTACKER, 2, 32, 0, 6, -819, 0, 10 delay 10 @@ -10645,7 +10645,7 @@ Status_SandTomb:: @ 81D5DA9 loadspritegfx ANIM_TAG_MUD_SAND createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 4, 2, 0, 7, 563 createvisualtask AnimTask_ShakeMon, 5, 1, 0, 2, 30, 1 - playsewithpan SE_W328, 63 + playsewithpan SE_M_SAND_TOMB, 63 call SandTombSwirlingDirt call SandTombSwirlingDirt delay 22 @@ -10658,19 +10658,19 @@ General_ItemEffect:: @ 81D5DF2 loadspritegfx ANIM_TAG_THIN_RING loadspritegfx ANIM_TAG_SPARKLE_2 delay 0 - playsewithpan SE_W036, 192 + playsewithpan SE_M_TAKE_DOWN, 192 createvisualtask AnimTask_RotateMonToSideAndRestore, 2, 16, 128, 0, 2 waitforvisualfinish - playsewithpan SE_W036, 192 + playsewithpan SE_M_TAKE_DOWN, 192 createvisualtask AnimTask_RotateMonToSideAndRestore, 2, 16, 128, 0, 2 waitforvisualfinish - playsewithpan SE_W036, 192 + playsewithpan SE_M_TAKE_DOWN, 192 createvisualtask AnimTask_RotateMonToSideAndRestore, 2, 16, 128, 0, 2 waitforvisualfinish - playsewithpan SE_W234, 192 + playsewithpan SE_M_MORNING_SUN, 192 call GrantingStarsEffect waitforvisualfinish - playsewithpan SE_REAPOKE, 192 + playsewithpan SE_SHINY, 192 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 2, 3, 7, 0, 26609 createsprite gThinRingExpandingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0 waitforvisualfinish @@ -10681,23 +10681,23 @@ General_SmokeballEscape:: @ 81D5E66 monbg ANIM_ATTACKER setalpha 12, 4 delay 0 - playsewithpan SE_BOWA2, 63 + playsewithpan SE_BALL_OPEN, 63 createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_TARGET, 0, 0, 32, 28, 30 delay 4 - playsewithpan SE_BOWA2, 63 + playsewithpan SE_BALL_OPEN, 63 createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 127, 2, 12, 20, 30 delay 12 - playsewithpan SE_BOWA2, 63 + playsewithpan SE_BALL_OPEN, 63 createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 126, 2, -28, 4, 30 delay 12 - playsewithpan SE_BOWA2, 63 + playsewithpan SE_BALL_OPEN, 63 createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 124, 2, 14, -20, 30 delay 4 - playsewithpan SE_BOWA2, 63 + playsewithpan SE_BALL_OPEN, 63 createvisualtask AnimTask_AttackerFadeToInvisible, 2, 2 createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 123, 3, 4, 4, 30 delay 14 - playsewithpan SE_BOWA2, 63 + playsewithpan SE_BALL_OPEN, 63 createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 122, 3, -14, 18, 46 delay 0 createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 121, 3, 14, -14, 46 @@ -10716,7 +10716,7 @@ General_SmokeballEscape:: @ 81D5E66 General_HangedOn:: @ 81D5F42 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 2, 7, 0, 9, 31 - playsewithpan SE_W082, 192 + playsewithpan SE_M_DRAGON_RAGE, 192 createvisualtask AnimTask_SlideMonForFocusBand, 5, 30, 128, 0, 1, 2, 0, 1 waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 2, 4, 9, 0, 31 @@ -10727,7 +10727,7 @@ General_HangedOn:: @ 81D5F42 General_Rain:: @ 81D5F8F loadspritegfx ANIM_TAG_RAIN_DROPS - playsewithpan SE_W240, 192 + playsewithpan SE_M_RAIN_DANCE, 192 createvisualtask AnimTask_BlendSelected, 10, 1 | (0xF << 7), 2, 0, 4, RGB_BLACK waitforvisualfinish createvisualtask AnimTask_CreateRaindrops, 2, 0, 3, 60 @@ -10756,7 +10756,7 @@ General_MonHit:: @ 81D5FF5 loadspritegfx ANIM_TAG_IMPACT monbg 1 setalpha 12, 8 - playsewithpan SE_W003, 63 + playsewithpan SE_M_DOUBLE_SLAP, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon, 2, 1, 3, 0, 6, 1 waitforvisualfinish @@ -10789,23 +10789,23 @@ SnatchMoveContinue:: @ 81D6082 end SnatchOpposingMonMove:: @ 81D6089 - playsewithpan SE_W104, 192 + playsewithpan SE_M_DOUBLE_TEAM, 192 createvisualtask AnimTask_SnatchOpposingMonMove, 2, goto SnatchMoveContinue SnatchPartnerMonMove:: @ 81D6099 - playsewithpan SE_W104, 192 + playsewithpan SE_M_DOUBLE_TEAM, 192 createvisualtask AnimTask_SnatchPartnerMove, 2, goto SnatchMoveContinue General_FutureSightHit:: @ 81D60A9 createvisualtask AnimTask_SetAnimTargetToBattlerTarget, 2 monbg ANIM_DEF_PARTNER - playsewithpan SE_W060, 192 + playsewithpan SE_M_PSYBEAM, 192 call SetPsychicBackground setalpha 8, 8 - playsewithpan SE_W048, 63 - waitplaysewithpan SE_W048, 63, 8 + playsewithpan SE_M_SUPERSONIC, 63 + waitplaysewithpan SE_M_SUPERSONIC, 63, 8 createvisualtask AnimTask_ShakeMon, 2, 1, 4, 0, 15, 1 createvisualtask AnimTask_ScaleMonAndRestore, 5, -5, -5, 15, 1, 1 waitforvisualfinish @@ -10826,26 +10826,26 @@ General_DoomDesireHit:: @ 81D6108 delay 10 createvisualtask AnimTask_DoomDesireLightBeam, 5, delay 9 - playsewithpan SE_W109, 192 + playsewithpan SE_M_CONFUSE_RAY, 192 delay 9 - playsewithpan SE_W109, 0 + playsewithpan SE_M_CONFUSE_RAY, 0 delay 9 - playsewithpan SE_W109, 63 + playsewithpan SE_M_CONFUSE_RAY, 63 delay 25 createvisualtask AnimTask_ShakeMonInPlace, 2, 1, 10, 0, 20, 1 - playsewithpan SE_W120, 63 + playsewithpan SE_M_SELF_DESTRUCT, 63 createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 1 delay 6 - playsewithpan SE_W120, 63 + playsewithpan SE_M_SELF_DESTRUCT, 63 createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 24, -24, 1, 1 delay 6 - playsewithpan SE_W120, 63 + playsewithpan SE_M_SELF_DESTRUCT, 63 createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, -16, 16, 1, 1 delay 6 - playsewithpan SE_W120, 63 + playsewithpan SE_M_SELF_DESTRUCT, 63 createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, -24, -12, 1, 1 delay 6 - playsewithpan SE_W120, 63 + playsewithpan SE_M_SELF_DESTRUCT, 63 createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 16, 16, 1, 1 waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 16, 0, RGB_WHITE @@ -10854,7 +10854,7 @@ General_DoomDesireHit:: @ 81D6108 General_FocusPunchSetUp:: @ 81D61CD loadspritegfx ANIM_TAG_FOCUS_ENERGY - playsewithpan SE_W082, 192 + playsewithpan SE_M_DRAGON_RAGE, 192 call EndureEffect delay 8 createvisualtask AnimTask_CurseBlendEffect, 2, 2, 2, 2, 0, 11, 31 @@ -10889,7 +10889,7 @@ General_WishHeal:: @ 81D6250 loadspritegfx ANIM_TAG_SPARKLE_2 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 0, 10, 0 waitforvisualfinish - playsewithpan SE_W025, 192 + playsewithpan SE_M_MEGA_KICK, 192 call GrantingStarsEffect waitforvisualfinish call HealingEffect @@ -10905,7 +10905,7 @@ General_MonScared:: @ 81D628A createvisualtask AnimTask_ShakeMon2, 2, 1, 2, 0, 10, 1 delay 20 createsprite gSprayWaterDropletSpriteTemplate, ANIM_TARGET, 5, 0, 1 - playsewithpan SE_W166, 63 + playsewithpan SE_M_SKETCH, 63 createsprite gSprayWaterDropletSpriteTemplate, ANIM_TARGET, 5, 1, 1 createvisualtask AnimTask_ShakeMon2, 2, 1, 4, 0, 5, 1 createvisualtask AnimTask_StretchTargetUp, 3, @@ -10922,7 +10922,7 @@ General_GhostGetOut:: @ 81D6301 monbg_22 0 createvisualtask sub_80B6BBC, 2, waitbgfadein - loopsewithpan SE_W060, 63, 20, 3 + loopsewithpan SE_M_PSYBEAM, 63, 20, 3 waitforvisualfinish clearmonbg_23 0 delay 1 @@ -10941,8 +10941,8 @@ General_GhostGetOut:: @ 81D6301 General_SilphScoped:: @ 81D637B monbg ANIM_ATTACKER - playsewithpan SE_W100, 192 - waitplaysewithpan SE_W107, 192, 48 + playsewithpan SE_M_TELEPORT, 192 + waitplaysewithpan SE_M_MINIMIZE, 192, 48 createvisualtask AnimTask_TransformMon, 2, 255 waitsound waitforvisualfinish @@ -10955,13 +10955,13 @@ General_SafariRockThrow:: @ 81D6394 loadspritegfx ANIM_TAG_ROCKS loadspritegfx ANIM_TAG_IMPACT delay 0 - waitplaysewithpan SE_W026, 192, 22 + waitplaysewithpan SE_M_JUMP_KICK, 192, 22 createsprite gSafariRockTemplate, ANIM_TARGET, 3, -17, 14, 8, 0 delay 50 monbg ANIM_DEF_PARTNER setalpha 12, 8 delay 0 - playsewithpan SE_W003, 63 + playsewithpan SE_M_DOUBLE_SLAP, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, -4, -20, 1, 2 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER @@ -10978,28 +10978,28 @@ General_SafariReaction:: @ 81D63DC end gUnknown_81D63FD:: @ 81D63FD - playsewithpan SE_W036, 63 + playsewithpan SE_M_TAKE_DOWN, 63 createvisualtask AnimTask_RotateMonToSideAndRestore, 2, 16, 96, 0, 2 waitforvisualfinish - playsewithpan SE_W036, 63 + playsewithpan SE_M_TAKE_DOWN, 63 createvisualtask AnimTask_RotateMonToSideAndRestore, 2, 16, -96, 0, 2 end gUnknown_81D6425:: @ 81D6425 loadspritegfx ANIM_TAG_ANGER createsprite gAngerMarkSpriteTemplate, ANIM_TARGET, 2, 1, 20, -20 - playsewithpan SE_W207B, 63 + playsewithpan SE_M_SWAGGER2, 63 waitforvisualfinish delay 12 createsprite gAngerMarkSpriteTemplate, ANIM_TARGET, 2, 1, -20, -20 - playsewithpan SE_W207B, 63 + playsewithpan SE_M_SWAGGER2, 63 end gUnknown_81D644E:: @ 81D644E - playsewithpan SE_W036, 63 + playsewithpan SE_M_TAKE_DOWN, 63 createvisualtask AnimTask_RotateMonToSideAndRestore, 2, 8, 136, 0, 2 waitforvisualfinish - playsewithpan SE_W036, 63 + playsewithpan SE_M_TAKE_DOWN, 63 createvisualtask AnimTask_RotateMonToSideAndRestore, 2, 8, 136, 0, 2 end @@ -11030,7 +11030,7 @@ SnatchMoveSwapMonForSubstitute:: @ 81D64A7 goto SnatchMoveTrySwapToSubstituteEnd Special_LevelUp:: @ 81D64B6 - playsewithpan SE_EXPMAX, 0 + playsewithpan SE_EXP_MAX, 0 createvisualtask AnimTask_LoadHealthboxPalsForLevelUp, 2 delay 0 createvisualtask AnimTask_FlashHealthboxOnLevelUp, 5, 0, 0 @@ -11053,7 +11053,7 @@ Special_SwitchOutOpponentMon:: @ 81D64E8 Special_BallThrow:: @ 81D64F9 createvisualtask AnimTask_LoadBallGfx, 2 delay 0 - playsewithpan SE_NAGERU, 0 + playsewithpan SE_BALL_THROW, 0 createvisualtask AnimTask_ThrowBall, 2 createvisualtask AnimTask_IsBallBlockedByTrainerOrDodged, 2, jumpargeq 7, -1, BallThrowTrainerBlock @@ -11069,7 +11069,7 @@ BallThrowTrainerBlock:: @ 81D652D monbg ANIM_DEF_PARTNER setalpha 12, 8 delay 0 - playsewithpan SE_W003, 63 + playsewithpan SE_M_DOUBLE_SLAP, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, -4, -20, 1, 2 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER @@ -11079,8 +11079,8 @@ BallThrowTrainerBlock:: @ 81D652D BallThrowGhostDodged:: @ 81D6555 delay 16 createvisualtask AnimTask_WindUpLunge, 2, 1, 48, 6, 16, 48, -48, 16 - playsewithpan SE_W036, 63 - waitplaysewithpan SE_W036, 63, 48 + playsewithpan SE_M_TAKE_DOWN, 63 + waitplaysewithpan SE_M_TAKE_DOWN, 63, 48 waitforvisualfinish goto BallThrowEnd diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 2ac9f7f6d..79b5dffc1 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -3119,7 +3119,7 @@ BattleScript_Pausex20:: return BattleScript_LevelUp:: - fanfare MUS_FANFA1 + fanfare MUS_LEVEL_UP printstring STRINGID_PKMNGREWTOLV setbyte sLVLBOX_STATE, 0 drawlvlupbox @@ -3149,7 +3149,7 @@ BattleScript_ForgotAndLearnedNewMove:: printstring STRINGID_ANDELLIPSIS BattleScript_LearnedNewMove:: buffermovetolearn - fanfare MUS_FANFA1 + fanfare MUS_LEVEL_UP printstring STRINGID_PKMNLEARNEDMOVE waitmessage 0x40 updatechoicemoveonlvlup BS_ATTACKER diff --git a/data/battle_scripts_2.s b/data/battle_scripts_2.s index 288b0438d..eab0bd225 100644 --- a/data/battle_scripts_2.s +++ b/data/battle_scripts_2.s @@ -134,7 +134,7 @@ BattleScript_PlayerUseItem:: BattleScript_AIUseFullRestoreOrHpHeal:: printstring STRINGID_EMPTYSTRING3 pause 48 - playse SE_KAIFUKU + playse SE_USE_ITEM printstring STRINGID_TRAINER1USEDITEM waitmessage 64 useitemonopponent @@ -150,7 +150,7 @@ BattleScript_AIUseFullRestoreOrHpHeal:: BattleScript_AIUseStatRestore:: printstring STRINGID_EMPTYSTRING3 pause 48 - playse SE_KAIFUKU + playse SE_USE_ITEM printstring STRINGID_TRAINER1USEDITEM waitmessage 64 useitemonopponent @@ -163,7 +163,7 @@ BattleScript_AIUseStatRestore:: BattleScript_AIUseXstat:: printstring STRINGID_EMPTYSTRING3 pause 48 - playse SE_KAIFUKU + playse SE_USE_ITEM printstring STRINGID_TRAINER1USEDITEM waitmessage 64 useitemonopponent @@ -175,7 +175,7 @@ BattleScript_AIUseXstat:: BattleScript_AIUseGuardSpec:: printstring STRINGID_EMPTYSTRING3 pause 48 - playse SE_KAIFUKU + playse SE_USE_ITEM printstring STRINGID_TRAINER1USEDITEM waitmessage 64 useitemonopponent @@ -185,7 +185,7 @@ BattleScript_AIUseGuardSpec:: finishaction BattleScript_UseFluffyTail:: - playse SE_NIGERU + playse SE_FLEE setbyte gBattleOutcome, B_OUTCOME_RAN finishturn @@ -199,7 +199,7 @@ BattleScript_UsePokeFlute:: BattleScript_PokeFluteWakeUp:: printstring STRINGID_POKEFLUTE waitmessage 64 - fanfare MUS_POKEFUE + fanfare MUS_POKE_FLUTE waitfanfare BS_ATTACKER printstring STRINGID_MONHEARINGFLUTEAWOKE waitmessage 64 diff --git a/data/event_scripts.s b/data/event_scripts.s index ec9409782..e9d49cc15 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1078,13 +1078,13 @@ Common_ShowEasyChatScreen:: @ 81A6AC0 @ Unused EventScript_GymBadgeFanfare:: @ 81A6C21 - playfanfare MUS_ME_BACHI + playfanfare MUS_OBTAIN_BADGE waitfanfare return EventScript_OutOfCenterPartyHeal:: @ 81A6C26 fadescreen FADE_TO_BLACK - playfanfare MUS_ME_ASA + playfanfare MUS_HEAL waitfanfare special HealPlayerParty fadescreen FADE_FROM_BLACK @@ -1113,7 +1113,7 @@ EventScript_ChangePokemonNickname:: @ 81A74EB @ Unused EventScript_HandOverItem:: @ 81A74F2 getitemname 0, VAR_0x8004 - playfanfare MUS_ME_WAZA + playfanfare MUS_OBTAIN_TMHM message Text_HandedOverItem waitmessage waitfanfare diff --git a/data/maps/BattleColosseum_2P/map.json b/data/maps/BattleColosseum_2P/map.json index 9f113352e..84c7b2a8c 100644 --- a/data/maps/BattleColosseum_2P/map.json +++ b/data/maps/BattleColosseum_2P/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_COLOSSEUM_2P", "name": "BattleColosseum_2P", "layout": "LAYOUT_BATTLE_COLOSSEUM_2P", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_SPECIAL_AREA", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattleColosseum_4P/map.json b/data/maps/BattleColosseum_4P/map.json index 600a7a2c9..3a1be5e7d 100644 --- a/data/maps/BattleColosseum_4P/map.json +++ b/data/maps/BattleColosseum_4P/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_COLOSSEUM_4P", "name": "BattleColosseum_4P", "layout": "LAYOUT_BATTLE_COLOSSEUM_4P", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_SPECIAL_AREA", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc index 30f3b3891..c20e19129 100644 --- a/data/maps/BirthIsland_Exterior/scripts.inc +++ b/data/maps/BirthIsland_Exterior/scripts.inc @@ -72,7 +72,7 @@ BirthIsland_Exterior_EventScript_Deoxys:: @ 81652C0 setfieldeffectarg 1, 56 setfieldeffectarg 2, 2 dofieldeffect 68 - playbgm MUS_DEOEYE, 0 + playbgm MUS_ENCOUNTER_DEOXYS, 0 waitfieldeffect 68 applymovement 2, Movement_DeoxysApproach waitmovement 0 diff --git a/data/maps/CeladonCity/map.json b/data/maps/CeladonCity/map.json index 78e63ac74..6aa1807d3 100644 --- a/data/maps/CeladonCity/map.json +++ b/data/maps/CeladonCity/map.json @@ -2,7 +2,7 @@ "id": "MAP_CELADON_CITY", "name": "CeladonCity", "layout": "LAYOUT_CELADON_CITY", - "music": "MUS_TAMAMUSI", + "music": "MUS_CELADON", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/CeladonCity_Condominiums_1F/map.json b/data/maps/CeladonCity_Condominiums_1F/map.json index 1aa8501be..aeac5b626 100644 --- a/data/maps/CeladonCity_Condominiums_1F/map.json +++ b/data/maps/CeladonCity_Condominiums_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_CELADON_CITY_CONDOMINIUMS_1F", "name": "CeladonCity_Condominiums_1F", "layout": "LAYOUT_CELADON_CITY_CONDOMINIUMS_1F", - "music": "MUS_TAMAMUSI", + "music": "MUS_CELADON", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeladonCity_Condominiums_2F/map.json b/data/maps/CeladonCity_Condominiums_2F/map.json index 300be7ee9..756f74fb3 100644 --- a/data/maps/CeladonCity_Condominiums_2F/map.json +++ b/data/maps/CeladonCity_Condominiums_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_CELADON_CITY_CONDOMINIUMS_2F", "name": "CeladonCity_Condominiums_2F", "layout": "LAYOUT_CELADON_CITY_CONDOMINIUMS_2F", - "music": "MUS_TAMAMUSI", + "music": "MUS_CELADON", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeladonCity_Condominiums_3F/map.json b/data/maps/CeladonCity_Condominiums_3F/map.json index 3f816ba07..cf2d74454 100644 --- a/data/maps/CeladonCity_Condominiums_3F/map.json +++ b/data/maps/CeladonCity_Condominiums_3F/map.json @@ -2,7 +2,7 @@ "id": "MAP_CELADON_CITY_CONDOMINIUMS_3F", "name": "CeladonCity_Condominiums_3F", "layout": "LAYOUT_CELADON_CITY_CONDOMINIUMS_3F", - "music": "MUS_TAMAMUSI", + "music": "MUS_CELADON", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeladonCity_Condominiums_Roof/map.json b/data/maps/CeladonCity_Condominiums_Roof/map.json index c5d43e4ef..7492b8718 100644 --- a/data/maps/CeladonCity_Condominiums_Roof/map.json +++ b/data/maps/CeladonCity_Condominiums_Roof/map.json @@ -2,7 +2,7 @@ "id": "MAP_CELADON_CITY_CONDOMINIUMS_ROOF", "name": "CeladonCity_Condominiums_Roof", "layout": "LAYOUT_CELADON_CITY_CONDOMINIUMS_ROOF", - "music": "MUS_TAMAMUSI", + "music": "MUS_CELADON", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeladonCity_Condominiums_RoofRoom/map.json b/data/maps/CeladonCity_Condominiums_RoofRoom/map.json index 90cb8d3d9..999f32e1f 100644 --- a/data/maps/CeladonCity_Condominiums_RoofRoom/map.json +++ b/data/maps/CeladonCity_Condominiums_RoofRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_CELADON_CITY_CONDOMINIUMS_ROOF_ROOM", "name": "CeladonCity_Condominiums_RoofRoom", "layout": "LAYOUT_CELADON_CITY_CONDOMINIUMS_ROOF_ROOM", - "music": "MUS_TAMAMUSI", + "music": "MUS_CELADON", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc b/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc index 3f3363674..96a1a69a4 100644 --- a/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc +++ b/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc @@ -21,7 +21,7 @@ CeladonCity_Condominiums_RoofRoom_EventScript_EeveeBall:: @ 816C46D CeladonCity_Condominiums_RoofRoom_EventScript_GetEeeveeParty:: @ 816C4A6 removeobject 2 - playfanfare MUS_FANFA1 + playfanfare MUS_LEVEL_UP message CeladonCity_Condominiums_RoofRoom_Text_ObtainedAnEevee waitmessage waitfanfare @@ -36,7 +36,7 @@ CeladonCity_Condominiums_RoofRoom_EventScript_GetEeeveeParty:: @ 816C4A6 CeladonCity_Condominiums_RoofRoom_EventScript_GetEeeveePC:: @ 816C4DA removeobject 2 - playfanfare MUS_FANFA1 + playfanfare MUS_LEVEL_UP message CeladonCity_Condominiums_RoofRoom_Text_ObtainedAnEevee waitmessage waitfanfare diff --git a/data/maps/CeladonCity_DepartmentStore_1F/map.json b/data/maps/CeladonCity_DepartmentStore_1F/map.json index 424719a0a..0a33592cc 100644 --- a/data/maps/CeladonCity_DepartmentStore_1F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_CELADON_CITY_DEPARTMENT_STORE_1F", "name": "CeladonCity_DepartmentStore_1F", "layout": "LAYOUT_CELADON_CITY_DEPARTMENT_STORE_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeladonCity_DepartmentStore_2F/map.json b/data/maps/CeladonCity_DepartmentStore_2F/map.json index ca64f92a7..0ebc6977e 100644 --- a/data/maps/CeladonCity_DepartmentStore_2F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_CELADON_CITY_DEPARTMENT_STORE_2F", "name": "CeladonCity_DepartmentStore_2F", "layout": "LAYOUT_CELADON_CITY_DEPARTMENT_STORE_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeladonCity_DepartmentStore_3F/map.json b/data/maps/CeladonCity_DepartmentStore_3F/map.json index c4d3d8c3f..d59f34f42 100644 --- a/data/maps/CeladonCity_DepartmentStore_3F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_3F/map.json @@ -2,7 +2,7 @@ "id": "MAP_CELADON_CITY_DEPARTMENT_STORE_3F", "name": "CeladonCity_DepartmentStore_3F", "layout": "LAYOUT_CELADON_CITY_DEPARTMENT_STORE_3F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeladonCity_DepartmentStore_4F/map.json b/data/maps/CeladonCity_DepartmentStore_4F/map.json index 48062a10e..225a88043 100644 --- a/data/maps/CeladonCity_DepartmentStore_4F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_4F/map.json @@ -2,7 +2,7 @@ "id": "MAP_CELADON_CITY_DEPARTMENT_STORE_4F", "name": "CeladonCity_DepartmentStore_4F", "layout": "LAYOUT_CELADON_CITY_DEPARTMENT_STORE_4F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeladonCity_DepartmentStore_5F/map.json b/data/maps/CeladonCity_DepartmentStore_5F/map.json index 5f56ecbd2..09c967ec2 100644 --- a/data/maps/CeladonCity_DepartmentStore_5F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_5F/map.json @@ -2,7 +2,7 @@ "id": "MAP_CELADON_CITY_DEPARTMENT_STORE_5F", "name": "CeladonCity_DepartmentStore_5F", "layout": "LAYOUT_CELADON_CITY_DEPARTMENT_STORE_5F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeladonCity_DepartmentStore_Elevator/map.json b/data/maps/CeladonCity_DepartmentStore_Elevator/map.json index d2ad4fa76..a863045a7 100644 --- a/data/maps/CeladonCity_DepartmentStore_Elevator/map.json +++ b/data/maps/CeladonCity_DepartmentStore_Elevator/map.json @@ -2,7 +2,7 @@ "id": "MAP_CELADON_CITY_DEPARTMENT_STORE_ELEVATOR", "name": "CeladonCity_DepartmentStore_Elevator", "layout": "LAYOUT_CELADON_CITY_DEPARTMENT_STORE_ELEVATOR", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/map.json b/data/maps/CeladonCity_DepartmentStore_Roof/map.json index 8b1c534c7..e13de4ef8 100644 --- a/data/maps/CeladonCity_DepartmentStore_Roof/map.json +++ b/data/maps/CeladonCity_DepartmentStore_Roof/map.json @@ -2,7 +2,7 @@ "id": "MAP_CELADON_CITY_DEPARTMENT_STORE_ROOF", "name": "CeladonCity_DepartmentStore_Roof", "layout": "LAYOUT_CELADON_CITY_DEPARTMENT_STORE_ROOF", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc b/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc index dfd19d51f..32aed768c 100644 --- a/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc @@ -149,7 +149,7 @@ CeladonCity_DepartmentStore_Roof_EventScript_GiveDrink:: @ 816BF7C goto_if_eq CeladonCity_DepartmentStore_Roof_EventScript_NoRoomForReward additem VAR_0x8009 textcolor 3 - playfanfare MUS_FANFA1 + playfanfare MUS_LEVEL_UP message Text_ReceivedItemFromLittleGirl waitmessage waitfanfare @@ -269,7 +269,7 @@ CeladonCity_DepartmentStore_Roof_EventScript_TryBuyDrink:: @ 816C0CB call_if_eq CeladonCity_DepartmentStore_Roof_EventScript_RemoveMoneyLemonade updatemoneybox 0, 0, 0 getitemname 0, VAR_TEMP_0 - playse SE_JIHANKI + playse SE_VEND msgbox CeladonCity_DepartmentStore_Roof_Text_DrinkCanPoppedOut additem VAR_TEMP_0 goto CeladonCity_DepartmentStore_Roof_EventScript_ChooseNewDrink diff --git a/data/maps/CeladonCity_GameCorner/map.json b/data/maps/CeladonCity_GameCorner/map.json index 8f27be39a..b352a3967 100644 --- a/data/maps/CeladonCity_GameCorner/map.json +++ b/data/maps/CeladonCity_GameCorner/map.json @@ -2,7 +2,7 @@ "id": "MAP_CELADON_CITY_GAME_CORNER", "name": "CeladonCity_GameCorner", "layout": "LAYOUT_CELADON_CITY_GAME_CORNER", - "music": "MUS_SLOT", + "music": "MUS_GAME_CORNER", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeladonCity_GameCorner/scripts.inc b/data/maps/CeladonCity_GameCorner/scripts.inc index 4e1ddae41..f0c865ef5 100644 --- a/data/maps/CeladonCity_GameCorner/scripts.inc +++ b/data/maps/CeladonCity_GameCorner/scripts.inc @@ -403,7 +403,7 @@ CeladonCity_GameCorner_EventScript_Poster:: @ 816CAAA end CeladonCity_GameCorner_EventScript_OpenRocketHideout:: @ 816CABE - playse SE_KI_GASYAN + playse SE_UNLOCK setmetatile 15, 2, METATILE_GameCorner_Floor_StairsTop, 0 setmetatile 16, 2, METATILE_GameCorner_StairsTop, 1 setmetatile 17, 2, METATILE_GameCorner_StairsBottom, 1 diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json b/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json index 7bf6091b1..60063cd08 100644 --- a/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json +++ b/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_CELADON_CITY_GAME_CORNER_PRIZE_ROOM", "name": "CeladonCity_GameCorner_PrizeRoom", "layout": "LAYOUT_CELADON_CITY_GAME_CORNER_PRIZE_ROOM", - "music": "MUS_TAMAMUSI", + "music": "MUS_CELADON", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc b/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc index ca8119594..09fcd2da5 100644 --- a/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc +++ b/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc @@ -214,7 +214,7 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_ReceivedMonParty:: @ 816CDB3 removecoins VAR_TEMP_2 updatecoinsbox 0, 5 getspeciesname 0, VAR_TEMP_1 - playfanfare MUS_FANFA1 + playfanfare MUS_LEVEL_UP message Text_PlayerObtainedTheMon waitmessage waitfanfare @@ -228,7 +228,7 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_ReceivedMonPC:: @ 816CDE0 removecoins VAR_TEMP_2 updatecoinsbox 0, 5 getspeciesname 0, VAR_TEMP_1 - playfanfare MUS_FANFA1 + playfanfare MUS_LEVEL_UP message Text_PlayerObtainedTheMon waitmessage waitfanfare diff --git a/data/maps/CeladonCity_Gym/text.inc b/data/maps/CeladonCity_Gym/text.inc index 9e372584e..4cd29a4e9 100644 --- a/data/maps/CeladonCity_Gym/text.inc +++ b/data/maps/CeladonCity_Gym/text.inc @@ -12,7 +12,7 @@ CeladonCity_Gym_Text_ErikaIntro:: @ 8197114 .string "GRASS type.\p" .string "…Oh, I'm sorry, I had no idea that\n" .string "you wished to challenge me.\p" - .string "Very well, but I shall not lose.{PLAY_BGM MUS_EXEYE}$" + .string "Very well, but I shall not lose.{PLAY_BGM MUS_ENCOUNTER_GYM_LEADER}$" CeladonCity_Gym_Text_ErikaDefeat:: @ 8197260 .string "Oh!\n" diff --git a/data/maps/CeladonCity_Hotel/map.json b/data/maps/CeladonCity_Hotel/map.json index e323330ba..02d7c416b 100644 --- a/data/maps/CeladonCity_Hotel/map.json +++ b/data/maps/CeladonCity_Hotel/map.json @@ -2,7 +2,7 @@ "id": "MAP_CELADON_CITY_HOTEL", "name": "CeladonCity_Hotel", "layout": "LAYOUT_CELADON_CITY_HOTEL", - "music": "MUS_TAMAMUSI", + "music": "MUS_CELADON", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeladonCity_House1/map.json b/data/maps/CeladonCity_House1/map.json index f4855dcd9..acf95fde5 100644 --- a/data/maps/CeladonCity_House1/map.json +++ b/data/maps/CeladonCity_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_CELADON_CITY_HOUSE1", "name": "CeladonCity_House1", "layout": "LAYOUT_HOUSE5", - "music": "MUS_TAMAMUSI", + "music": "MUS_CELADON", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeladonCity_PokemonCenter_1F/map.json b/data/maps/CeladonCity_PokemonCenter_1F/map.json index 391a7daf9..5c2ca4f02 100644 --- a/data/maps/CeladonCity_PokemonCenter_1F/map.json +++ b/data/maps/CeladonCity_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_CELADON_CITY_POKEMON_CENTER_1F", "name": "CeladonCity_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeladonCity_PokemonCenter_2F/map.json b/data/maps/CeladonCity_PokemonCenter_2F/map.json index b83e53cca..9431c273d 100644 --- a/data/maps/CeladonCity_PokemonCenter_2F/map.json +++ b/data/maps/CeladonCity_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_CELADON_CITY_POKEMON_CENTER_2F", "name": "CeladonCity_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeladonCity_Restaurant/map.json b/data/maps/CeladonCity_Restaurant/map.json index 5d66e4f26..71f2e4f30 100644 --- a/data/maps/CeladonCity_Restaurant/map.json +++ b/data/maps/CeladonCity_Restaurant/map.json @@ -2,7 +2,7 @@ "id": "MAP_CELADON_CITY_RESTAURANT", "name": "CeladonCity_Restaurant", "layout": "LAYOUT_CELADON_CITY_RESTAURANT", - "music": "MUS_TAMAMUSI", + "music": "MUS_CELADON", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeruleanCave_1F/map.json b/data/maps/CeruleanCave_1F/map.json index 6cf50ea13..abc495f92 100644 --- a/data/maps/CeruleanCave_1F/map.json +++ b/data/maps/CeruleanCave_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_CERULEAN_CAVE_1F", "name": "CeruleanCave_1F", "layout": "LAYOUT_CERULEAN_CAVE_1F", - "music": "MUS_AJITO", + "music": "MUS_ROCKET_HIDEOUT", "region_map_section": "MAPSEC_CERULEAN_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeruleanCave_2F/map.json b/data/maps/CeruleanCave_2F/map.json index a75ea2017..45e4fc963 100644 --- a/data/maps/CeruleanCave_2F/map.json +++ b/data/maps/CeruleanCave_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_CERULEAN_CAVE_2F", "name": "CeruleanCave_2F", "layout": "LAYOUT_CERULEAN_CAVE_2F", - "music": "MUS_AJITO", + "music": "MUS_ROCKET_HIDEOUT", "region_map_section": "MAPSEC_CERULEAN_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeruleanCave_B1F/map.json b/data/maps/CeruleanCave_B1F/map.json index b8ad317b6..478ddf111 100644 --- a/data/maps/CeruleanCave_B1F/map.json +++ b/data/maps/CeruleanCave_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_CERULEAN_CAVE_B1F", "name": "CeruleanCave_B1F", "layout": "LAYOUT_CERULEAN_CAVE_B1F", - "music": "MUS_AJITO", + "music": "MUS_ROCKET_HIDEOUT", "region_map_section": "MAPSEC_CERULEAN_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeruleanCave_B1F/scripts.inc b/data/maps/CeruleanCave_B1F/scripts.inc index 0cd5f2628..5dd7aabf0 100644 --- a/data/maps/CeruleanCave_B1F/scripts.inc +++ b/data/maps/CeruleanCave_B1F/scripts.inc @@ -33,7 +33,7 @@ CeruleanCave_B1F_EventScript_Mewtwo:: @ 81624F5 waitmessage waitmoncry delay 20 - playbgm MUS_EXEYE, 0 + playbgm MUS_ENCOUNTER_GYM_LEADER, 0 waitbuttonpress setwildbattle SPECIES_MEWTWO, 70, ITEM_NONE setflag FLAG_SYS_SPECIAL_WILD_BATTLE diff --git a/data/maps/CeruleanCity/map.json b/data/maps/CeruleanCity/map.json index 9ffcce5d5..282eaf4cc 100644 --- a/data/maps/CeruleanCity/map.json +++ b/data/maps/CeruleanCity/map.json @@ -2,7 +2,7 @@ "id": "MAP_CERULEAN_CITY", "name": "CeruleanCity", "layout": "LAYOUT_CERULEAN_CITY", - "music": "MUS_HANADA", + "music": "MUS_FUCHSIA", "region_map_section": "MAPSEC_CERULEAN_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/CeruleanCity/scripts.inc b/data/maps/CeruleanCity/scripts.inc index 7d1f455a4..b1fc63b5e 100644 --- a/data/maps/CeruleanCity/scripts.inc +++ b/data/maps/CeruleanCity/scripts.inc @@ -42,7 +42,7 @@ CeruleanCity_EventScript_RivalTriggerRight:: @ 81664B9 CeruleanCity_EventScript_Rival:: @ 81664CC textcolor 0 setvar VAR_MAP_SCENE_ROUTE22, 2 - playbgm MUS_RIVAL1, 0 + playbgm MUS_ENCOUNTER_RIVAL, 0 addobject LOCALID_RIVAL applymovement LOCALID_RIVAL, CeruleanCity_Movement_RivalEnter waitmovement 0 @@ -57,7 +57,7 @@ CeruleanCity_EventScript_Rival:: @ 81664CC famechecker FAMECHECKER_BILL, 0 msgbox CeruleanCity_Text_RivalPostBattle closemessage - playbgm MUS_RIVAL2, 0 + playbgm MUS_RIVAL_EXIT, 0 compare VAR_TEMP_1, 0 call_if_eq CeruleanCity_EventScript_RivalStartExit compare VAR_TEMP_1, 1 @@ -179,7 +179,7 @@ CeruleanCity_EventScript_Grunt:: @ 8166603 goto_if_defeated TRAINER_TEAM_ROCKET_GRUNT_5, CeruleanCity_EventScript_GruntDefeated message CeruleanCity_Text_GruntIntro waitmessage - playbgm MUS_ROCKET, 0 + playbgm MUS_ENCOUNTER_ROCKET, 0 waitbuttonpress trainerbattle_no_intro TRAINER_TEAM_ROCKET_GRUNT_5, CeruleanCity_Text_GruntDefeat setvar VAR_MAP_SCENE_CERULEAN_CITY_ROCKET, 1 diff --git a/data/maps/CeruleanCity/text.inc b/data/maps/CeruleanCity/text.inc index 7a940032d..0ae618008 100644 --- a/data/maps/CeruleanCity/text.inc +++ b/data/maps/CeruleanCity/text.inc @@ -53,7 +53,7 @@ CeruleanCity_Text_GruntIntro:: @ 817EE0E .string "…Huh?\n" .string "Me?\p" .string "I'm an innocent bystander!\n" - .string "Don't you believe me?{PLAY_BGM}{MUS_ROCKET}$" + .string "Don't you believe me?{PLAY_BGM}{MUS_ENCOUNTER_ROCKET}$" CeruleanCity_Text_GruntDefeat:: @ 817EE70 .string "GRUNT: Stop! I give up!\n" diff --git a/data/maps/CeruleanCity_BikeShop/map.json b/data/maps/CeruleanCity_BikeShop/map.json index f7d3b573b..d7c0ea6d2 100644 --- a/data/maps/CeruleanCity_BikeShop/map.json +++ b/data/maps/CeruleanCity_BikeShop/map.json @@ -2,7 +2,7 @@ "id": "MAP_CERULEAN_CITY_BIKE_SHOP", "name": "CeruleanCity_BikeShop", "layout": "LAYOUT_CERULEAN_CITY_BIKE_SHOP", - "music": "MUS_HANADA", + "music": "MUS_FUCHSIA", "region_map_section": "MAPSEC_CERULEAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeruleanCity_BikeShop/scripts.inc b/data/maps/CeruleanCity_BikeShop/scripts.inc index 48077084f..45a1c2a6a 100644 --- a/data/maps/CeruleanCity_BikeShop/scripts.inc +++ b/data/maps/CeruleanCity_BikeShop/scripts.inc @@ -30,7 +30,7 @@ CeruleanCity_BikeShop_EventScript_ClerkGoodbye:: @ 816AC15 CeruleanCity_BikeShop_EventScript_ExchangeBikeVoucher:: @ 816AC22 msgbox CeruleanCity_BikeShop_Text_OhBikeVoucherHereYouGo - msgreceiveditem CeruleanCity_BikeShop_Text_ExchangedVoucherForBicycle, ITEM_BICYCLE, 1, MUS_FAN5 + msgreceiveditem CeruleanCity_BikeShop_Text_ExchangedVoucherForBicycle, ITEM_BICYCLE, 1, MUS_OBTAIN_KEY_ITEM setflag FLAG_GOT_BICYCLE additem ITEM_BICYCLE removeitem ITEM_BIKE_VOUCHER diff --git a/data/maps/CeruleanCity_Gym/text.inc b/data/maps/CeruleanCity_Gym/text.inc index 19e8357bb..231f33c94 100644 --- a/data/maps/CeruleanCity_Gym/text.inc +++ b/data/maps/CeruleanCity_Gym/text.inc @@ -5,7 +5,7 @@ CeruleanCity_Gym_Text_MistyIntro:: @ 81921EF .string "What is your approach when you\n" .string "catch and train POKéMON?\p" .string "My policy is an all-out offensive\n" - .string "with WATER-type POKéMON!{PLAY_BGM}{MUS_EXEYE}$" + .string "with WATER-type POKéMON!{PLAY_BGM}{MUS_ENCOUNTER_GYM_LEADER}$" CeruleanCity_Gym_Text_ExplainTM03:: @ 81922BF .string "TM03 teaches WATER PULSE.\p" diff --git a/data/maps/CeruleanCity_House1/map.json b/data/maps/CeruleanCity_House1/map.json index c26ec9435..006be49fa 100644 --- a/data/maps/CeruleanCity_House1/map.json +++ b/data/maps/CeruleanCity_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_CERULEAN_CITY_HOUSE1", "name": "CeruleanCity_House1", "layout": "LAYOUT_CERULEAN_CITY_HOUSE1", - "music": "MUS_HANADA", + "music": "MUS_FUCHSIA", "region_map_section": "MAPSEC_CERULEAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeruleanCity_House2/map.json b/data/maps/CeruleanCity_House2/map.json index f70b0922f..4cc6cd713 100644 --- a/data/maps/CeruleanCity_House2/map.json +++ b/data/maps/CeruleanCity_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_CERULEAN_CITY_HOUSE2", "name": "CeruleanCity_House2", "layout": "LAYOUT_CERULEAN_CITY_HOUSE2", - "music": "MUS_HANADA", + "music": "MUS_FUCHSIA", "region_map_section": "MAPSEC_CERULEAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeruleanCity_House3/map.json b/data/maps/CeruleanCity_House3/map.json index db0bc7f94..0c0bb10c4 100644 --- a/data/maps/CeruleanCity_House3/map.json +++ b/data/maps/CeruleanCity_House3/map.json @@ -2,7 +2,7 @@ "id": "MAP_CERULEAN_CITY_HOUSE3", "name": "CeruleanCity_House3", "layout": "LAYOUT_HOUSE1", - "music": "MUS_HANADA", + "music": "MUS_FUCHSIA", "region_map_section": "MAPSEC_CERULEAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeruleanCity_House4/map.json b/data/maps/CeruleanCity_House4/map.json index cb7c7fe0e..a2b792ede 100644 --- a/data/maps/CeruleanCity_House4/map.json +++ b/data/maps/CeruleanCity_House4/map.json @@ -2,7 +2,7 @@ "id": "MAP_CERULEAN_CITY_HOUSE4", "name": "CeruleanCity_House4", "layout": "LAYOUT_HOUSE1", - "music": "MUS_HANADA", + "music": "MUS_FUCHSIA", "region_map_section": "MAPSEC_CERULEAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeruleanCity_House5/map.json b/data/maps/CeruleanCity_House5/map.json index 331d7ff54..a54a593b6 100644 --- a/data/maps/CeruleanCity_House5/map.json +++ b/data/maps/CeruleanCity_House5/map.json @@ -2,7 +2,7 @@ "id": "MAP_CERULEAN_CITY_HOUSE5", "name": "CeruleanCity_House5", "layout": "LAYOUT_CERULEAN_CITY_HOUSE5", - "music": "MUS_HANADA", + "music": "MUS_FUCHSIA", "region_map_section": "MAPSEC_CERULEAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeruleanCity_Mart/map.json b/data/maps/CeruleanCity_Mart/map.json index f5dfc959f..69dfbd2c0 100644 --- a/data/maps/CeruleanCity_Mart/map.json +++ b/data/maps/CeruleanCity_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_CERULEAN_CITY_MART", "name": "CeruleanCity_Mart", "layout": "LAYOUT_MART", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_CERULEAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeruleanCity_PokemonCenter_1F/map.json b/data/maps/CeruleanCity_PokemonCenter_1F/map.json index 91dcfd544..7c797a653 100644 --- a/data/maps/CeruleanCity_PokemonCenter_1F/map.json +++ b/data/maps/CeruleanCity_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_CERULEAN_CITY_POKEMON_CENTER_1F", "name": "CeruleanCity_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_CERULEAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeruleanCity_PokemonCenter_2F/map.json b/data/maps/CeruleanCity_PokemonCenter_2F/map.json index 929d46d1e..a706e5b4d 100644 --- a/data/maps/CeruleanCity_PokemonCenter_2F/map.json +++ b/data/maps/CeruleanCity_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_CERULEAN_CITY_POKEMON_CENTER_2F", "name": "CeruleanCity_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_CERULEAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CinnabarIsland/map.json b/data/maps/CinnabarIsland/map.json index c738cff3b..9798a6be3 100644 --- a/data/maps/CinnabarIsland/map.json +++ b/data/maps/CinnabarIsland/map.json @@ -2,7 +2,7 @@ "id": "MAP_CINNABAR_ISLAND", "name": "CinnabarIsland", "layout": "LAYOUT_CINNABAR_ISLAND", - "music": "MUS_GUREN", + "music": "MUS_CINNABAR", "region_map_section": "MAPSEC_CINNABAR_ISLAND", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/CinnabarIsland/scripts.inc b/data/maps/CinnabarIsland/scripts.inc index 40e8288cd..179c06a51 100644 --- a/data/maps/CinnabarIsland/scripts.inc +++ b/data/maps/CinnabarIsland/scripts.inc @@ -18,7 +18,7 @@ CinnabarIsland_OnTransition:: @ 8166EE1 end CinnabarIsland_EventScript_ReadyObjectsSailToOneIslandFromPokeCenter:: @ 8166F0B - savebgm MUS_ANNAI + savebgm MUS_FOLLOW_ME setflag FLAG_TEMP_2 setobjectxyperm LOCALID_BILL, 15, 12 setobjectmovementtype LOCALID_BILL, MOVEMENT_TYPE_FACE_LEFT diff --git a/data/maps/CinnabarIsland_Gym/scripts.inc b/data/maps/CinnabarIsland_Gym/scripts.inc index f31d6f7bb..c2d95a706 100644 --- a/data/maps/CinnabarIsland_Gym/scripts.inc +++ b/data/maps/CinnabarIsland_Gym/scripts.inc @@ -217,7 +217,7 @@ CinnabarIsland_Gym_EventScript_Quiz1:: @ 816DC00 end CinnabarIsland_Gym_EventScript_CorrectAnswer:: @ 816DC27 - playfanfare MUS_FANFA1 + playfanfare MUS_LEVEL_UP waitfanfare msgbox CinnabarIsland_Gym_Text_CorrectGoOnThrough return @@ -238,7 +238,7 @@ CinnabarIsland_Gym_EventScript_Quiz1Correct:: @ 816DC43 end CinnabarIsland_Gym_EventScript_Quiz1Complete:: @ 816DC58 - playse SE_KI_GASYAN + playse SE_UNLOCK waitse call CinnabarIsland_Gym_EventScript_OpenDoor1 special DrawWholeMapView @@ -318,7 +318,7 @@ CinnabarIsland_Gym_EventScript_Quiz2Correct:: @ 816DD1C end CinnabarIsland_Gym_EventScript_Quiz2Complete:: @ 816DD31 - playse SE_KI_GASYAN + playse SE_UNLOCK waitse call CinnabarIsland_Gym_EventScript_OpenDoor2 special DrawWholeMapView @@ -403,7 +403,7 @@ CinnabarIsland_Gym_EventScript_Quiz3Correct:: @ 816DDFA end CinnabarIsland_Gym_EventScript_Quiz3Complete:: @ 816DE0F - playse SE_KI_GASYAN + playse SE_UNLOCK waitse call CinnabarIsland_Gym_EventScript_OpenDoor3 special DrawWholeMapView @@ -479,7 +479,7 @@ CinnabarIsland_Gym_EventScript_Quiz4Correct:: @ 816DED1 end CinnabarIsland_Gym_EventScript_Quiz4Complete:: @ 816DEE6 - playse SE_KI_GASYAN + playse SE_UNLOCK waitse call CinnabarIsland_Gym_EventScript_OpenDoor4 special DrawWholeMapView @@ -555,7 +555,7 @@ CinnabarIsland_Gym_EventScript_Quiz5Correct:: @ 816DFA8 end CinnabarIsland_Gym_EventScript_Quiz5Complete:: @ 816DFBD - playse SE_KI_GASYAN + playse SE_UNLOCK waitse call CinnabarIsland_Gym_EventScript_OpenDoor5 special DrawWholeMapView @@ -631,7 +631,7 @@ CinnabarIsland_Gym_EventScript_Quiz6Correct:: @ 816E07F end CinnabarIsland_Gym_EventScript_Quiz6Complete:: @ 816E094 - playse SE_KI_GASYAN + playse SE_UNLOCK waitse call CinnabarIsland_Gym_EventScript_OpenDoor6 special DrawWholeMapView diff --git a/data/maps/CinnabarIsland_Gym/text.inc b/data/maps/CinnabarIsland_Gym/text.inc index 4543ffcc8..781238ccb 100644 --- a/data/maps/CinnabarIsland_Gym/text.inc +++ b/data/maps/CinnabarIsland_Gym/text.inc @@ -6,7 +6,7 @@ CinnabarIsland_Gym_Text_BlaineIntro:: @ 8199543 .string "and ready with intense heat!\p" .string "They incinerate all challengers!\p" .string "Hah!\n" - .string "You better have BURN HEAL!{PLAY_BGM}{MUS_EXEYE}$" + .string "You better have BURN HEAL!{PLAY_BGM}{MUS_ENCOUNTER_GYM_LEADER}$" CinnabarIsland_Gym_Text_BlaineDefeat:: @ 81995FA .string "I have burned down to nothing!\n" diff --git a/data/maps/CinnabarIsland_Mart/map.json b/data/maps/CinnabarIsland_Mart/map.json index e1d02595a..0d5c16415 100644 --- a/data/maps/CinnabarIsland_Mart/map.json +++ b/data/maps/CinnabarIsland_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_CINNABAR_ISLAND_MART", "name": "CinnabarIsland_Mart", "layout": "LAYOUT_MART", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_CINNABAR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CinnabarIsland_PokemonCenter_1F/map.json b/data/maps/CinnabarIsland_PokemonCenter_1F/map.json index 9a4182fe9..83b962c02 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_1F/map.json +++ b/data/maps/CinnabarIsland_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_CINNABAR_ISLAND_POKEMON_CENTER_1F", "name": "CinnabarIsland_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_CINNABAR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc index 844c38997..40ede6c6e 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc @@ -34,8 +34,8 @@ CinnabarIsland_PokemonCenter_1F_EventScript_Bill:: @ 816E90A goto_if_eq CinnabarIsland_PokemonCenter_1F_EventScript_NotReadyToSail msgbox CinnabarIsland_PokemonCenter_1F_Text_LetsGo closemessage - playbgm MUS_ANNAI, 1 - savebgm MUS_ANNAI + playbgm MUS_FOLLOW_ME, 1 + savebgm MUS_FOLLOW_ME setflag FLAG_DONT_TRANSITION_MUSIC setflag FLAG_HIDE_CINNABAR_POKECENTER_BILL delay 20 diff --git a/data/maps/CinnabarIsland_PokemonCenter_2F/map.json b/data/maps/CinnabarIsland_PokemonCenter_2F/map.json index 948e9850e..32fcb549f 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_2F/map.json +++ b/data/maps/CinnabarIsland_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_CINNABAR_ISLAND_POKEMON_CENTER_2F", "name": "CinnabarIsland_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_CINNABAR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json b/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json index 775ad23c0..8d3b7c92b 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_CINNABAR_ISLAND_POKEMON_LAB_ENTRANCE", "name": "CinnabarIsland_PokemonLab_Entrance", "layout": "LAYOUT_CINNABAR_ISLAND_POKEMON_LAB_ENTRANCE", - "music": "MUS_GUREN", + "music": "MUS_CINNABAR", "region_map_section": "MAPSEC_CINNABAR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json index 25d094aa2..d6856c1f1 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM", "name": "CinnabarIsland_PokemonLab_ExperimentRoom", "layout": "LAYOUT_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM", - "music": "MUS_GUREN", + "music": "MUS_CINNABAR", "region_map_section": "MAPSEC_CINNABAR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc index 08fe9acb8..3232c824a 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc @@ -255,7 +255,7 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_GiveAerodactyl:: @ 816E7E2 CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_NicknameMonParty:: @ 816E827 textcolor 3 - playfanfare MUS_FANFA1 + playfanfare MUS_LEVEL_UP message CinnabarIsland_PokemonLab_ExperimentRoom_Text_ReceivedMonFromDoctor waitmessage waitfanfare @@ -270,7 +270,7 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_NicknameMonParty:: @ 816E82 CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_NicknameMonPC:: @ 816E85B textcolor 3 - playfanfare MUS_FANFA1 + playfanfare MUS_LEVEL_UP message CinnabarIsland_PokemonLab_ExperimentRoom_Text_ReceivedMonFromDoctor waitmessage waitfanfare diff --git a/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json b/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json index 354bcfc2f..f51aa1fa8 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json @@ -2,7 +2,7 @@ "id": "MAP_CINNABAR_ISLAND_POKEMON_LAB_LOUNGE", "name": "CinnabarIsland_PokemonLab_Lounge", "layout": "LAYOUT_CINNABAR_ISLAND_POKEMON_LAB_LOUNGE", - "music": "MUS_GUREN", + "music": "MUS_CINNABAR", "region_map_section": "MAPSEC_CINNABAR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json index df02316d7..a615b6830 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_CINNABAR_ISLAND_POKEMON_LAB_RESEARCH_ROOM", "name": "CinnabarIsland_PokemonLab_ResearchRoom", "layout": "LAYOUT_CINNABAR_ISLAND_POKEMON_LAB_RESEARCH_ROOM", - "music": "MUS_GUREN", + "music": "MUS_CINNABAR", "region_map_section": "MAPSEC_CINNABAR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/DiglettsCave_B1F/map.json b/data/maps/DiglettsCave_B1F/map.json index 13cdfac0a..a95991fad 100644 --- a/data/maps/DiglettsCave_B1F/map.json +++ b/data/maps/DiglettsCave_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_DIGLETTS_CAVE_B1F", "name": "DiglettsCave_B1F", "layout": "LAYOUT_DIGLETTS_CAVE_B1F", - "music": "MUS_T_MORI", + "music": "MUS_VIRIDIAN_FOREST", "region_map_section": "MAPSEC_DIGLETTS_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/DiglettsCave_NorthEntrance/map.json b/data/maps/DiglettsCave_NorthEntrance/map.json index f3bf00f42..5135b3e28 100644 --- a/data/maps/DiglettsCave_NorthEntrance/map.json +++ b/data/maps/DiglettsCave_NorthEntrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_DIGLETTS_CAVE_NORTH_ENTRANCE", "name": "DiglettsCave_NorthEntrance", "layout": "LAYOUT_DIGLETTS_CAVE_NORTH_ENTRANCE", - "music": "MUS_T_MORI", + "music": "MUS_VIRIDIAN_FOREST", "region_map_section": "MAPSEC_DIGLETTS_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/DiglettsCave_SouthEntrance/map.json b/data/maps/DiglettsCave_SouthEntrance/map.json index 0c6fb74e9..493f30be7 100644 --- a/data/maps/DiglettsCave_SouthEntrance/map.json +++ b/data/maps/DiglettsCave_SouthEntrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_DIGLETTS_CAVE_SOUTH_ENTRANCE", "name": "DiglettsCave_SouthEntrance", "layout": "LAYOUT_DIGLETTS_CAVE_SOUTH_ENTRANCE", - "music": "MUS_T_MORI", + "music": "MUS_VIRIDIAN_FOREST", "region_map_section": "MAPSEC_DIGLETTS_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FiveIsland/map.json b/data/maps/FiveIsland/map.json index 413782a68..29e667d27 100644 --- a/data/maps/FiveIsland/map.json +++ b/data/maps/FiveIsland/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND", "name": "FiveIsland", "layout": "LAYOUT_FIVE_ISLAND", - "music": "MUS_NANA45", + "music": "MUS_SEVII_45", "region_map_section": "MAPSEC_FIVE_ISLAND", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/FiveIsland_Harbor/map.json b/data/maps/FiveIsland_Harbor/map.json index 04b5b134b..e86f2333a 100644 --- a/data/maps/FiveIsland_Harbor/map.json +++ b/data/maps/FiveIsland_Harbor/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_HARBOR", "name": "FiveIsland_Harbor", "layout": "LAYOUT_ISLAND_HARBOR", - "music": "MUS_NANA45", + "music": "MUS_SEVII_45", "region_map_section": "MAPSEC_FIVE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FiveIsland_House1/map.json b/data/maps/FiveIsland_House1/map.json index 63c4e9c84..c4a14839d 100644 --- a/data/maps/FiveIsland_House1/map.json +++ b/data/maps/FiveIsland_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_HOUSE1", "name": "FiveIsland_House1", "layout": "LAYOUT_HOUSE3", - "music": "MUS_NANA45", + "music": "MUS_SEVII_45", "region_map_section": "MAPSEC_FIVE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FiveIsland_House2/map.json b/data/maps/FiveIsland_House2/map.json index 872818a50..bd75ab0c3 100644 --- a/data/maps/FiveIsland_House2/map.json +++ b/data/maps/FiveIsland_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_HOUSE2", "name": "FiveIsland_House2", "layout": "LAYOUT_HOUSE3", - "music": "MUS_NANA45", + "music": "MUS_SEVII_45", "region_map_section": "MAPSEC_FIVE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FiveIsland_LostCave_Entrance/map.json b/data/maps/FiveIsland_LostCave_Entrance/map.json index b257237bd..d91c86b79 100644 --- a/data/maps/FiveIsland_LostCave_Entrance/map.json +++ b/data/maps/FiveIsland_LostCave_Entrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_LOST_CAVE_ENTRANCE", "name": "FiveIsland_LostCave_Entrance", "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ENTRANCE", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FiveIsland_LostCave_Room1/map.json b/data/maps/FiveIsland_LostCave_Room1/map.json index be0c1a618..9d6e27c73 100644 --- a/data/maps/FiveIsland_LostCave_Room1/map.json +++ b/data/maps/FiveIsland_LostCave_Room1/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1", "name": "FiveIsland_LostCave_Room1", "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM1", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", diff --git a/data/maps/FiveIsland_LostCave_Room10/map.json b/data/maps/FiveIsland_LostCave_Room10/map.json index 1ad0c8d76..20835f0bc 100644 --- a/data/maps/FiveIsland_LostCave_Room10/map.json +++ b/data/maps/FiveIsland_LostCave_Room10/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM10", "name": "FiveIsland_LostCave_Room10", "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM10", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", diff --git a/data/maps/FiveIsland_LostCave_Room11/map.json b/data/maps/FiveIsland_LostCave_Room11/map.json index d8b4dbb62..ab63d2ea3 100644 --- a/data/maps/FiveIsland_LostCave_Room11/map.json +++ b/data/maps/FiveIsland_LostCave_Room11/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM11", "name": "FiveIsland_LostCave_Room11", "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM11", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", diff --git a/data/maps/FiveIsland_LostCave_Room12/map.json b/data/maps/FiveIsland_LostCave_Room12/map.json index cfe11f2c0..c14996b6f 100644 --- a/data/maps/FiveIsland_LostCave_Room12/map.json +++ b/data/maps/FiveIsland_LostCave_Room12/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM12", "name": "FiveIsland_LostCave_Room12", "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM12", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", diff --git a/data/maps/FiveIsland_LostCave_Room13/map.json b/data/maps/FiveIsland_LostCave_Room13/map.json index 877ebe89a..84a0f34ea 100644 --- a/data/maps/FiveIsland_LostCave_Room13/map.json +++ b/data/maps/FiveIsland_LostCave_Room13/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM13", "name": "FiveIsland_LostCave_Room13", "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM13", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", diff --git a/data/maps/FiveIsland_LostCave_Room14/map.json b/data/maps/FiveIsland_LostCave_Room14/map.json index 20c960ff2..2d24d97c8 100644 --- a/data/maps/FiveIsland_LostCave_Room14/map.json +++ b/data/maps/FiveIsland_LostCave_Room14/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM14", "name": "FiveIsland_LostCave_Room14", "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM14", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", diff --git a/data/maps/FiveIsland_LostCave_Room2/map.json b/data/maps/FiveIsland_LostCave_Room2/map.json index eaeabf81b..d1a5ff27d 100644 --- a/data/maps/FiveIsland_LostCave_Room2/map.json +++ b/data/maps/FiveIsland_LostCave_Room2/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM2", "name": "FiveIsland_LostCave_Room2", "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM2", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", diff --git a/data/maps/FiveIsland_LostCave_Room3/map.json b/data/maps/FiveIsland_LostCave_Room3/map.json index bcd56fec5..97c46a1dd 100644 --- a/data/maps/FiveIsland_LostCave_Room3/map.json +++ b/data/maps/FiveIsland_LostCave_Room3/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM3", "name": "FiveIsland_LostCave_Room3", "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM3", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", diff --git a/data/maps/FiveIsland_LostCave_Room4/map.json b/data/maps/FiveIsland_LostCave_Room4/map.json index 9789e22ac..93de2af9a 100644 --- a/data/maps/FiveIsland_LostCave_Room4/map.json +++ b/data/maps/FiveIsland_LostCave_Room4/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM4", "name": "FiveIsland_LostCave_Room4", "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM4", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", diff --git a/data/maps/FiveIsland_LostCave_Room5/map.json b/data/maps/FiveIsland_LostCave_Room5/map.json index 94a33e0be..099d76722 100644 --- a/data/maps/FiveIsland_LostCave_Room5/map.json +++ b/data/maps/FiveIsland_LostCave_Room5/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM5", "name": "FiveIsland_LostCave_Room5", "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM5", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", diff --git a/data/maps/FiveIsland_LostCave_Room6/map.json b/data/maps/FiveIsland_LostCave_Room6/map.json index 1941530d6..c96ab57f7 100644 --- a/data/maps/FiveIsland_LostCave_Room6/map.json +++ b/data/maps/FiveIsland_LostCave_Room6/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM6", "name": "FiveIsland_LostCave_Room6", "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM6", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", diff --git a/data/maps/FiveIsland_LostCave_Room7/map.json b/data/maps/FiveIsland_LostCave_Room7/map.json index 459c54736..91f787589 100644 --- a/data/maps/FiveIsland_LostCave_Room7/map.json +++ b/data/maps/FiveIsland_LostCave_Room7/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM7", "name": "FiveIsland_LostCave_Room7", "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM7", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", diff --git a/data/maps/FiveIsland_LostCave_Room8/map.json b/data/maps/FiveIsland_LostCave_Room8/map.json index d0c0c0d87..243b3fed6 100644 --- a/data/maps/FiveIsland_LostCave_Room8/map.json +++ b/data/maps/FiveIsland_LostCave_Room8/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM8", "name": "FiveIsland_LostCave_Room8", "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM8", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", diff --git a/data/maps/FiveIsland_LostCave_Room9/map.json b/data/maps/FiveIsland_LostCave_Room9/map.json index 1669d671e..b2bb357d8 100644 --- a/data/maps/FiveIsland_LostCave_Room9/map.json +++ b/data/maps/FiveIsland_LostCave_Room9/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM9", "name": "FiveIsland_LostCave_Room9", "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM9", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", diff --git a/data/maps/FiveIsland_Meadow/map.json b/data/maps/FiveIsland_Meadow/map.json index f88dfed92..16c52f2af 100644 --- a/data/maps/FiveIsland_Meadow/map.json +++ b/data/maps/FiveIsland_Meadow/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_MEADOW", "name": "FiveIsland_Meadow", "layout": "LAYOUT_FIVE_ISLAND_MEADOW", - "music": "MUS_NANASHIMA", + "music": "MUS_SEVII_ROUTE", "region_map_section": "MAPSEC_FIVE_ISLE_MEADOW", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/FiveIsland_MemorialPillar/map.json b/data/maps/FiveIsland_MemorialPillar/map.json index 21e92146d..489f63372 100644 --- a/data/maps/FiveIsland_MemorialPillar/map.json +++ b/data/maps/FiveIsland_MemorialPillar/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_MEMORIAL_PILLAR", "name": "FiveIsland_MemorialPillar", "layout": "LAYOUT_FIVE_ISLAND_MEMORIAL_PILLAR", - "music": "MUS_NANASHIMA", + "music": "MUS_SEVII_ROUTE", "region_map_section": "MAPSEC_MEMORIAL_PILLAR", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/FiveIsland_PokemonCenter_1F/map.json b/data/maps/FiveIsland_PokemonCenter_1F/map.json index edc012fb7..24c72dd7e 100644 --- a/data/maps/FiveIsland_PokemonCenter_1F/map.json +++ b/data/maps/FiveIsland_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_POKEMON_CENTER_1F", "name": "FiveIsland_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_FIVE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FiveIsland_PokemonCenter_2F/map.json b/data/maps/FiveIsland_PokemonCenter_2F/map.json index 7564186ad..bb3bdd1eb 100644 --- a/data/maps/FiveIsland_PokemonCenter_2F/map.json +++ b/data/maps/FiveIsland_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_POKEMON_CENTER_2F", "name": "FiveIsland_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_FIVE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FiveIsland_ResortGorgeous/map.json b/data/maps/FiveIsland_ResortGorgeous/map.json index 77bb5125c..5c596b3bc 100644 --- a/data/maps/FiveIsland_ResortGorgeous/map.json +++ b/data/maps/FiveIsland_ResortGorgeous/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_RESORT_GORGEOUS", "name": "FiveIsland_ResortGorgeous", "layout": "LAYOUT_FIVE_ISLAND_RESORT_GORGEOUS", - "music": "MUS_NANASHIMA", + "music": "MUS_SEVII_ROUTE", "region_map_section": "MAPSEC_RESORT_GORGEOUS", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/FiveIsland_ResortGorgeous_House/map.json b/data/maps/FiveIsland_ResortGorgeous_House/map.json index 05178a289..d361589b7 100644 --- a/data/maps/FiveIsland_ResortGorgeous_House/map.json +++ b/data/maps/FiveIsland_ResortGorgeous_House/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_RESORT_GORGEOUS_HOUSE", "name": "FiveIsland_ResortGorgeous_House", "layout": "LAYOUT_FIVE_ISLAND_RESORT_GORGEOUS_HOUSE", - "music": "MUS_NANA45", + "music": "MUS_SEVII_45", "region_map_section": "MAPSEC_RESORT_GORGEOUS", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FiveIsland_RocketWarehouse/map.json b/data/maps/FiveIsland_RocketWarehouse/map.json index c5863a524..e14361861 100644 --- a/data/maps/FiveIsland_RocketWarehouse/map.json +++ b/data/maps/FiveIsland_RocketWarehouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_ROCKET_WAREHOUSE", "name": "FiveIsland_RocketWarehouse", "layout": "LAYOUT_FIVE_ISLAND_ROCKET_WAREHOUSE", - "music": "MUS_AJITO", + "music": "MUS_ROCKET_HIDEOUT", "region_map_section": "MAPSEC_ROCKET_WAREHOUSE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FiveIsland_WaterLabyrinth/map.json b/data/maps/FiveIsland_WaterLabyrinth/map.json index 33c06d199..002a02f36 100644 --- a/data/maps/FiveIsland_WaterLabyrinth/map.json +++ b/data/maps/FiveIsland_WaterLabyrinth/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_WATER_LABYRINTH", "name": "FiveIsland_WaterLabyrinth", "layout": "LAYOUT_FIVE_ISLAND_WATER_LABYRINTH", - "music": "MUS_NANASHIMA", + "music": "MUS_SEVII_ROUTE", "region_map_section": "MAPSEC_WATER_LABYRINTH", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/FiveIsland_WaterLabyrinth/scripts.inc b/data/maps/FiveIsland_WaterLabyrinth/scripts.inc index b07235406..d7815af0c 100644 --- a/data/maps/FiveIsland_WaterLabyrinth/scripts.inc +++ b/data/maps/FiveIsland_WaterLabyrinth/scripts.inc @@ -34,7 +34,7 @@ FiveIsland_WaterLabyrinth_EventScript_TryGiveEgg:: @ 81688BA setflag FLAG_GOT_TOGEPI_EGG giveegg SPECIES_TOGEPI textcolor 3 - playfanfare MUS_FANFA1 + playfanfare MUS_LEVEL_UP message FiveIsland_WaterLabyrinth_Text_ReceivedEggFromMan waitfanfare waitmessage diff --git a/data/maps/FourIsland/map.json b/data/maps/FourIsland/map.json index 1c0b06c83..33abf1091 100644 --- a/data/maps/FourIsland/map.json +++ b/data/maps/FourIsland/map.json @@ -2,7 +2,7 @@ "id": "MAP_FOUR_ISLAND", "name": "FourIsland", "layout": "LAYOUT_FOUR_ISLAND", - "music": "MUS_NANA45", + "music": "MUS_SEVII_45", "region_map_section": "MAPSEC_FOUR_ISLAND", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/FourIsland/scripts.inc b/data/maps/FourIsland/scripts.inc index ac670db55..8fbf028fc 100644 --- a/data/maps/FourIsland/scripts.inc +++ b/data/maps/FourIsland/scripts.inc @@ -32,7 +32,7 @@ FourIsland_EventScript_RivalScene:: @ 8167CEC textcolor 0 applymovement LOCALID_RIVAL, Movement_WalkInPlaceFastestDown waitmovement 0 - playbgm MUS_RIVAL1, 0 + playbgm MUS_ENCOUNTER_RIVAL, 0 applymovement LOCALID_RIVAL, Movement_ExclamationMark waitmovement 0 applymovement LOCALID_RIVAL, Movement_Delay48 @@ -46,7 +46,7 @@ FourIsland_EventScript_RivalScene:: @ 8167CEC applymovement LOCALID_RIVAL, FourIsland_Movement_RivalExit waitmovement 0 fadedefaultbgm - playse SE_KAIDAN + playse SE_EXIT delay 35 removeobject LOCALID_RIVAL setvar VAR_MAP_SCENE_FOUR_ISLAND, 1 @@ -113,7 +113,7 @@ FourIsland_EventScript_DaycareReceivedEgg:: @ 8167DEB textcolor 3 message DayCare_Text_ReceivedEgg call EventScript_RestorePrevTextColor - playfanfare MUS_FANFA1 + playfanfare MUS_LEVEL_UP waitfanfare waitbuttonpress msgbox DayCare_Text_TakeGoodCareOfIt diff --git a/data/maps/FourIsland_Harbor/map.json b/data/maps/FourIsland_Harbor/map.json index c324696cc..afa0aca6c 100644 --- a/data/maps/FourIsland_Harbor/map.json +++ b/data/maps/FourIsland_Harbor/map.json @@ -2,7 +2,7 @@ "id": "MAP_FOUR_ISLAND_HARBOR", "name": "FourIsland_Harbor", "layout": "LAYOUT_ISLAND_HARBOR", - "music": "MUS_NANA45", + "music": "MUS_SEVII_45", "region_map_section": "MAPSEC_FOUR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FourIsland_House1/map.json b/data/maps/FourIsland_House1/map.json index 7016ab9ab..44bf35f30 100644 --- a/data/maps/FourIsland_House1/map.json +++ b/data/maps/FourIsland_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_FOUR_ISLAND_HOUSE1", "name": "FourIsland_House1", "layout": "LAYOUT_HOUSE3", - "music": "MUS_NANA45", + "music": "MUS_SEVII_45", "region_map_section": "MAPSEC_FOUR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FourIsland_House2/map.json b/data/maps/FourIsland_House2/map.json index af7a3322d..d31d74e77 100644 --- a/data/maps/FourIsland_House2/map.json +++ b/data/maps/FourIsland_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_FOUR_ISLAND_HOUSE2", "name": "FourIsland_House2", "layout": "LAYOUT_HOUSE3", - "music": "MUS_NANA45", + "music": "MUS_SEVII_45", "region_map_section": "MAPSEC_FOUR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FourIsland_IcefallCave_1F/map.json b/data/maps/FourIsland_IcefallCave_1F/map.json index 8e7f52c9e..d8ddd44d1 100644 --- a/data/maps/FourIsland_IcefallCave_1F/map.json +++ b/data/maps/FourIsland_IcefallCave_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_FOUR_ISLAND_ICEFALL_CAVE_1F", "name": "FourIsland_IcefallCave_1F", "layout": "LAYOUT_FOUR_ISLAND_ICEFALL_CAVE_1F", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_ICEFALL_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FourIsland_IcefallCave_1F/scripts.inc b/data/maps/FourIsland_IcefallCave_1F/scripts.inc index be73f02fc..797c05d6b 100644 --- a/data/maps/FourIsland_IcefallCave_1F/scripts.inc +++ b/data/maps/FourIsland_IcefallCave_1F/scripts.inc @@ -21,7 +21,7 @@ FourIsland_IcefallCave_1F_EventScript_FallDownHole:: @ 8163D65 delay 20 applymovement OBJ_EVENT_ID_PLAYER, FourIsland_IcefallCave_1F_Movement_SetInvisible waitmovement 0 - playse SE_RU_HYUU + playse SE_FALL delay 60 warphole MAP_FOUR_ISLAND_ICEFALL_CAVE_B1F waitstate diff --git a/data/maps/FourIsland_IcefallCave_B1F/map.json b/data/maps/FourIsland_IcefallCave_B1F/map.json index 02db224cb..8e5bdb8bf 100644 --- a/data/maps/FourIsland_IcefallCave_B1F/map.json +++ b/data/maps/FourIsland_IcefallCave_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_FOUR_ISLAND_ICEFALL_CAVE_B1F", "name": "FourIsland_IcefallCave_B1F", "layout": "LAYOUT_FOUR_ISLAND_ICEFALL_CAVE_B1F", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_ICEFALL_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FourIsland_IcefallCave_Back/map.json b/data/maps/FourIsland_IcefallCave_Back/map.json index a9d838841..bbb4afb7c 100644 --- a/data/maps/FourIsland_IcefallCave_Back/map.json +++ b/data/maps/FourIsland_IcefallCave_Back/map.json @@ -2,7 +2,7 @@ "id": "MAP_FOUR_ISLAND_ICEFALL_CAVE_BACK", "name": "FourIsland_IcefallCave_Back", "layout": "LAYOUT_FOUR_ISLAND_ICEFALL_CAVE_BACK", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_ICEFALL_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FourIsland_IcefallCave_Back/scripts.inc b/data/maps/FourIsland_IcefallCave_Back/scripts.inc index a0a94d4be..3edbc3886 100644 --- a/data/maps/FourIsland_IcefallCave_Back/scripts.inc +++ b/data/maps/FourIsland_IcefallCave_Back/scripts.inc @@ -47,7 +47,7 @@ FourIsland_IcefallCave_Back_EventScript_LoreleiRocketsScene:: @ 8163D98 waitmovement 0 applymovement LOCALID_ROCKET2, FourIsland_IcefallCave_Back_Movement_WalkInPlaceDown waitmovement 0 - playbgm MUS_ROCKET, 0 + playbgm MUS_ENCOUNTER_ROCKET, 0 textcolor 0 msgbox FourIsland_IcefallCave_Back_Text_GruntIntro setvar VAR_LAST_TALKED, LOCALID_ROCKET3 diff --git a/data/maps/FourIsland_IcefallCave_Entrance/map.json b/data/maps/FourIsland_IcefallCave_Entrance/map.json index 0dfe89452..aa97ac246 100644 --- a/data/maps/FourIsland_IcefallCave_Entrance/map.json +++ b/data/maps/FourIsland_IcefallCave_Entrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_FOUR_ISLAND_ICEFALL_CAVE_ENTRANCE", "name": "FourIsland_IcefallCave_Entrance", "layout": "LAYOUT_FOUR_ISLAND_ICEFALL_CAVE_ENTRANCE", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_ICEFALL_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FourIsland_LoreleisHouse/map.json b/data/maps/FourIsland_LoreleisHouse/map.json index 77eb60ff2..72070ccbf 100644 --- a/data/maps/FourIsland_LoreleisHouse/map.json +++ b/data/maps/FourIsland_LoreleisHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_FOUR_ISLAND_LORELEIS_HOUSE", "name": "FourIsland_LoreleisHouse", "layout": "LAYOUT_FOUR_ISLAND_LORELEIS_HOUSE", - "music": "MUS_NANA45", + "music": "MUS_SEVII_45", "region_map_section": "MAPSEC_FOUR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FourIsland_Mart/map.json b/data/maps/FourIsland_Mart/map.json index 178b8b4bf..ab36dfb24 100644 --- a/data/maps/FourIsland_Mart/map.json +++ b/data/maps/FourIsland_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_FOUR_ISLAND_MART", "name": "FourIsland_Mart", "layout": "LAYOUT_MART", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_FOUR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FourIsland_PokemonCenter_1F/map.json b/data/maps/FourIsland_PokemonCenter_1F/map.json index e87c2955b..89ddda178 100644 --- a/data/maps/FourIsland_PokemonCenter_1F/map.json +++ b/data/maps/FourIsland_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_FOUR_ISLAND_POKEMON_CENTER_1F", "name": "FourIsland_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_FOUR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FourIsland_PokemonCenter_2F/map.json b/data/maps/FourIsland_PokemonCenter_2F/map.json index 5191528a8..7d6092bea 100644 --- a/data/maps/FourIsland_PokemonCenter_2F/map.json +++ b/data/maps/FourIsland_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_FOUR_ISLAND_POKEMON_CENTER_2F", "name": "FourIsland_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_FOUR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FourIsland_PokemonDayCare/map.json b/data/maps/FourIsland_PokemonDayCare/map.json index 3cfb9dc54..81c7c0d9d 100644 --- a/data/maps/FourIsland_PokemonDayCare/map.json +++ b/data/maps/FourIsland_PokemonDayCare/map.json @@ -2,7 +2,7 @@ "id": "MAP_FOUR_ISLAND_POKEMON_DAY_CARE", "name": "FourIsland_PokemonDayCare", "layout": "LAYOUT_FOUR_ISLAND_POKEMON_DAY_CARE", - "music": "MUS_NANA45", + "music": "MUS_SEVII_45", "region_map_section": "MAPSEC_FOUR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FourIsland_PokemonDayCare/scripts.inc b/data/maps/FourIsland_PokemonDayCare/scripts.inc index dc04c477f..d09dc5369 100644 --- a/data/maps/FourIsland_PokemonDayCare/scripts.inc +++ b/data/maps/FourIsland_PokemonDayCare/scripts.inc @@ -132,7 +132,7 @@ FourIsland_PokemonDayCare_RetrieveMon:: @ 8171B05 waitmovement 0 specialvar VAR_RESULT, TakePokemonFromDaycare special SubtractMoneyFromVar0x8005 - playse SE_REGI + playse SE_RS_SHOP msgbox DayCare_Text_HeresYourMon waitse playmoncry VAR_RESULT, 0 diff --git a/data/maps/FuchsiaCity/map.json b/data/maps/FuchsiaCity/map.json index aab3609d4..4fbe92321 100644 --- a/data/maps/FuchsiaCity/map.json +++ b/data/maps/FuchsiaCity/map.json @@ -2,7 +2,7 @@ "id": "MAP_FUCHSIA_CITY", "name": "FuchsiaCity", "layout": "LAYOUT_FUCHSIA_CITY", - "music": "MUS_HANADA", + "music": "MUS_FUCHSIA", "region_map_section": "MAPSEC_FUCHSIA_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/FuchsiaCity_Gym/text.inc b/data/maps/FuchsiaCity_Gym/text.inc index 2bfe9e53f..4b3314e0e 100644 --- a/data/maps/FuchsiaCity_Gym/text.inc +++ b/data/maps/FuchsiaCity_Gym/text.inc @@ -9,7 +9,7 @@ FuchsiaCity_Gym_Text_KogaIntro:: @ 819832E .string "Poison brings steady doom.\n" .string "Sleep renders foes helpless.\p" .string "Despair to the creeping horror of\n" - .string "POISON-type POKéMON!{PLAY_BGM}{MUS_EXEYE}$" + .string "POISON-type POKéMON!{PLAY_BGM}{MUS_ENCOUNTER_GYM_LEADER}$" FuchsiaCity_Gym_Text_KogaDefeat:: @ 8198444 .string "Humph!\n" diff --git a/data/maps/FuchsiaCity_House1/map.json b/data/maps/FuchsiaCity_House1/map.json index 68f802b88..ac9fbd673 100644 --- a/data/maps/FuchsiaCity_House1/map.json +++ b/data/maps/FuchsiaCity_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_FUCHSIA_CITY_HOUSE1", "name": "FuchsiaCity_House1", "layout": "LAYOUT_HOUSE1", - "music": "MUS_HANADA", + "music": "MUS_FUCHSIA", "region_map_section": "MAPSEC_FUCHSIA_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FuchsiaCity_House2/map.json b/data/maps/FuchsiaCity_House2/map.json index 25361a07d..9d66853a4 100644 --- a/data/maps/FuchsiaCity_House2/map.json +++ b/data/maps/FuchsiaCity_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_FUCHSIA_CITY_HOUSE2", "name": "FuchsiaCity_House2", "layout": "LAYOUT_FUCHSIA_CITY_HOUSE2", - "music": "MUS_HANADA", + "music": "MUS_FUCHSIA", "region_map_section": "MAPSEC_FUCHSIA_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FuchsiaCity_House3/map.json b/data/maps/FuchsiaCity_House3/map.json index fde85e8f9..b6916bec8 100644 --- a/data/maps/FuchsiaCity_House3/map.json +++ b/data/maps/FuchsiaCity_House3/map.json @@ -2,7 +2,7 @@ "id": "MAP_FUCHSIA_CITY_HOUSE3", "name": "FuchsiaCity_House3", "layout": "LAYOUT_HOUSE1", - "music": "MUS_HANADA", + "music": "MUS_FUCHSIA", "region_map_section": "MAPSEC_FUCHSIA_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FuchsiaCity_House3/scripts.inc b/data/maps/FuchsiaCity_House3/scripts.inc index d392f0aaf..d3d027c2c 100644 --- a/data/maps/FuchsiaCity_House3/scripts.inc +++ b/data/maps/FuchsiaCity_House3/scripts.inc @@ -37,7 +37,7 @@ FuchsiaCity_House3_EventScript_ChooseMonForMoveDeleter:: @ 816D8B0 FuchsiaCity_House3_EventScript_ForgetMove:: @ 816D919 special MoveDeleterForgetMove - playfanfare MUS_ME_WASURE + playfanfare MUS_MOVE_DELETED waitfanfare msgbox FuchsiaCity_House3_Text_MonHasForgottenMoveCompletely release diff --git a/data/maps/FuchsiaCity_Mart/map.json b/data/maps/FuchsiaCity_Mart/map.json index d7ac2c49d..10e7deb5a 100644 --- a/data/maps/FuchsiaCity_Mart/map.json +++ b/data/maps/FuchsiaCity_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_FUCHSIA_CITY_MART", "name": "FuchsiaCity_Mart", "layout": "LAYOUT_MART", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_FUCHSIA_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FuchsiaCity_PokemonCenter_1F/map.json b/data/maps/FuchsiaCity_PokemonCenter_1F/map.json index b97fbb232..04e1112cd 100644 --- a/data/maps/FuchsiaCity_PokemonCenter_1F/map.json +++ b/data/maps/FuchsiaCity_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_FUCHSIA_CITY_POKEMON_CENTER_1F", "name": "FuchsiaCity_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_FUCHSIA_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FuchsiaCity_PokemonCenter_2F/map.json b/data/maps/FuchsiaCity_PokemonCenter_2F/map.json index 588d1a3eb..16e7f5606 100644 --- a/data/maps/FuchsiaCity_PokemonCenter_2F/map.json +++ b/data/maps/FuchsiaCity_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_FUCHSIA_CITY_POKEMON_CENTER_2F", "name": "FuchsiaCity_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_FUCHSIA_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FuchsiaCity_SafariZone_Entrance/map.json b/data/maps/FuchsiaCity_SafariZone_Entrance/map.json index 85b2d38e7..62161f69f 100644 --- a/data/maps/FuchsiaCity_SafariZone_Entrance/map.json +++ b/data/maps/FuchsiaCity_SafariZone_Entrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE", "name": "FuchsiaCity_SafariZone_Entrance", "layout": "LAYOUT_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE", - "music": "MUS_HANADA", + "music": "MUS_FUCHSIA", "region_map_section": "MAPSEC_FUCHSIA_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc b/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc index 5b0f06b08..459c9c76b 100644 --- a/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc +++ b/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc @@ -120,7 +120,7 @@ FuchsiaCity_SafariZone_Entrance_EventScript_TryEnterSafariZone:: @ 816D3CA updatemoneybox 0, 0, 0 msgbox FuchsiaCity_SafariZone_Entrance_Text_ThatllBe500WeOnlyUseSpecialBalls textcolor 3 - playfanfare MUS_FANFA1 + playfanfare MUS_LEVEL_UP message FuchsiaCity_SafariZone_Entrance_Text_PlayerReceived30SafariBalls waitfanfare call EventScript_RestorePrevTextColor diff --git a/data/maps/FuchsiaCity_SafariZone_Office/map.json b/data/maps/FuchsiaCity_SafariZone_Office/map.json index 77704acae..89bf9cffc 100644 --- a/data/maps/FuchsiaCity_SafariZone_Office/map.json +++ b/data/maps/FuchsiaCity_SafariZone_Office/map.json @@ -2,7 +2,7 @@ "id": "MAP_FUCHSIA_CITY_SAFARI_ZONE_OFFICE", "name": "FuchsiaCity_SafariZone_Office", "layout": "LAYOUT_FUCHSIA_CITY_SAFARI_ZONE_OFFICE", - "music": "MUS_HANADA", + "music": "MUS_FUCHSIA", "region_map_section": "MAPSEC_FUCHSIA_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FuchsiaCity_WardensHouse/map.json b/data/maps/FuchsiaCity_WardensHouse/map.json index ceb1d7398..73a8ee885 100644 --- a/data/maps/FuchsiaCity_WardensHouse/map.json +++ b/data/maps/FuchsiaCity_WardensHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_FUCHSIA_CITY_WARDENS_HOUSE", "name": "FuchsiaCity_WardensHouse", "layout": "LAYOUT_FUCHSIA_CITY_WARDENS_HOUSE", - "music": "MUS_HANADA", + "music": "MUS_FUCHSIA", "region_map_section": "MAPSEC_FUCHSIA_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FuchsiaCity_WardensHouse/scripts.inc b/data/maps/FuchsiaCity_WardensHouse/scripts.inc index 1f0c891d6..7f1df4e44 100644 --- a/data/maps/FuchsiaCity_WardensHouse/scripts.inc +++ b/data/maps/FuchsiaCity_WardensHouse/scripts.inc @@ -16,7 +16,7 @@ FuchsiaCity_WardensHouse_EventScript_Warden:: @ 816D74C FuchsiaCity_WardensHouse_EventScript_GiveGoldTeeth:: @ 816D780 textcolor 3 - playfanfare MUS_ME_WAZA + playfanfare MUS_OBTAIN_TMHM message FuchsiaCity_WardensHouse_Text_GaveGoldTeethToWarden waitmessage waitfanfare diff --git a/data/maps/IndigoPlateau_Exterior/map.json b/data/maps/IndigoPlateau_Exterior/map.json index be976f4ae..31461c51f 100644 --- a/data/maps/IndigoPlateau_Exterior/map.json +++ b/data/maps/IndigoPlateau_Exterior/map.json @@ -2,7 +2,7 @@ "id": "MAP_INDIGO_PLATEAU_EXTERIOR", "name": "IndigoPlateau_Exterior", "layout": "LAYOUT_INDIGO_PLATEAU_EXTERIOR", - "music": "MUS_CHAMP_R", + "music": "MUS_VICTORY_ROAD", "region_map_section": "MAPSEC_INDIGO_PLATEAU", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/IndigoPlateau_Exterior/scripts.inc b/data/maps/IndigoPlateau_Exterior/scripts.inc index ecea7899a..e54d60e0d 100644 --- a/data/maps/IndigoPlateau_Exterior/scripts.inc +++ b/data/maps/IndigoPlateau_Exterior/scripts.inc @@ -13,7 +13,7 @@ IndigoPlateau_Exterior_OnTransition:: @ 8167246 end IndigoPlateau_Exterior_EventScript_PlayCreditsMusic:: @ 8167255 - playbgm MUS_ENDING, 0 + playbgm MUS_CREDITS, 0 return IndigoPlateau_Exterior_OnFrame:: @ 816725A diff --git a/data/maps/IndigoPlateau_PokemonCenter_2F/map.json b/data/maps/IndigoPlateau_PokemonCenter_2F/map.json index 8181715b0..bdb442d7a 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_2F/map.json +++ b/data/maps/IndigoPlateau_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_INDIGO_PLATEAU_POKEMON_CENTER_2F", "name": "IndigoPlateau_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_INDIGO_PLATEAU", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LavenderTown/map.json b/data/maps/LavenderTown/map.json index 6f9bd7a0b..07fe80598 100644 --- a/data/maps/LavenderTown/map.json +++ b/data/maps/LavenderTown/map.json @@ -2,7 +2,7 @@ "id": "MAP_LAVENDER_TOWN", "name": "LavenderTown", "layout": "LAYOUT_LAVENDER_TOWN", - "music": "MUS_SHION", + "music": "MUS_LAVENDER", "region_map_section": "MAPSEC_LAVENDER_TOWN", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/LavenderTown_House1/map.json b/data/maps/LavenderTown_House1/map.json index ae6263789..2920d0f11 100644 --- a/data/maps/LavenderTown_House1/map.json +++ b/data/maps/LavenderTown_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_LAVENDER_TOWN_HOUSE1", "name": "LavenderTown_House1", "layout": "LAYOUT_HOUSE5", - "music": "MUS_SHION", + "music": "MUS_LAVENDER", "region_map_section": "MAPSEC_LAVENDER_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LavenderTown_House2/map.json b/data/maps/LavenderTown_House2/map.json index 565db668d..51f227c93 100644 --- a/data/maps/LavenderTown_House2/map.json +++ b/data/maps/LavenderTown_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_LAVENDER_TOWN_HOUSE2", "name": "LavenderTown_House2", "layout": "LAYOUT_HOUSE5", - "music": "MUS_HANADA", + "music": "MUS_FUCHSIA", "region_map_section": "MAPSEC_LAVENDER_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LavenderTown_Mart/map.json b/data/maps/LavenderTown_Mart/map.json index 5cb531347..c855026dc 100644 --- a/data/maps/LavenderTown_Mart/map.json +++ b/data/maps/LavenderTown_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_LAVENDER_TOWN_MART", "name": "LavenderTown_Mart", "layout": "LAYOUT_MART", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_LAVENDER_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LavenderTown_PokemonCenter_1F/map.json b/data/maps/LavenderTown_PokemonCenter_1F/map.json index 4af67cd2a..f418ed011 100644 --- a/data/maps/LavenderTown_PokemonCenter_1F/map.json +++ b/data/maps/LavenderTown_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LAVENDER_TOWN_POKEMON_CENTER_1F", "name": "LavenderTown_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_LAVENDER_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LavenderTown_PokemonCenter_2F/map.json b/data/maps/LavenderTown_PokemonCenter_2F/map.json index da2a5786a..108d34364 100644 --- a/data/maps/LavenderTown_PokemonCenter_2F/map.json +++ b/data/maps/LavenderTown_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LAVENDER_TOWN_POKEMON_CENTER_2F", "name": "LavenderTown_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_LAVENDER_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LavenderTown_VolunteerPokemonHouse/map.json b/data/maps/LavenderTown_VolunteerPokemonHouse/map.json index 07ac2badd..02b70d9ef 100644 --- a/data/maps/LavenderTown_VolunteerPokemonHouse/map.json +++ b/data/maps/LavenderTown_VolunteerPokemonHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_LAVENDER_TOWN_VOLUNTEER_POKEMON_HOUSE", "name": "LavenderTown_VolunteerPokemonHouse", "layout": "LAYOUT_LAVENDER_TOWN_VOLUNTEER_POKEMON_HOUSE", - "music": "MUS_SHION", + "music": "MUS_LAVENDER", "region_map_section": "MAPSEC_LAVENDER_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc b/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc index 703a71296..29972d993 100644 --- a/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc +++ b/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc @@ -10,7 +10,7 @@ LavenderTown_VolunteerPokemonHouse_EventScript_MrFuji:: @ 816B14A compare VAR_RESULT, FALSE goto_if_eq LavenderTown_VolunteerPokemonHouse_EventScript_NoRoomForPokeFlute setflag FLAG_GOT_POKE_FLUTE - giveitem_msg LavenderTown_VolunteerPokemonHouse_Text_ReceivedPokeFluteFromMrFuji, ITEM_POKE_FLUTE, 1, MUS_FAN5 + giveitem_msg LavenderTown_VolunteerPokemonHouse_Text_ReceivedPokeFluteFromMrFuji, ITEM_POKE_FLUTE, 1, MUS_OBTAIN_KEY_ITEM msgbox LavenderTown_VolunteerPokemonHouse_Text_ExplainPokeFlute release end diff --git a/data/maps/MtEmber_Exterior/map.json b/data/maps/MtEmber_Exterior/map.json index 6b0c1a8fb..42e1ea87f 100644 --- a/data/maps/MtEmber_Exterior/map.json +++ b/data/maps/MtEmber_Exterior/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_EMBER_EXTERIOR", "name": "MtEmber_Exterior", "layout": "LAYOUT_MT_EMBER_EXTERIOR", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtEmber_Exterior/scripts.inc b/data/maps/MtEmber_Exterior/scripts.inc index 7d67eea09..36d82ca18 100644 --- a/data/maps/MtEmber_Exterior/scripts.inc +++ b/data/maps/MtEmber_Exterior/scripts.inc @@ -40,7 +40,7 @@ MtEmber_Exterior_EventScript_Grunt1Defeated:: @ 816399E MtEmber_Exterior_EventScript_BattleGrunt1:: @ 81639A8 applymovement 2, Movement_FacePlayer waitmovement 0 - playbgm MUS_ROCKET, 0 + playbgm MUS_ENCOUNTER_ROCKET, 0 msgbox MtEmber_Exterior_Text_Grunt1Intro trainerbattle_no_intro TRAINER_TEAM_ROCKET_GRUNT_43, MtEmber_Exterior_Text_Grunt1Defeat msgbox MtEmber_Exterior_Text_Grunt1PostBattle @@ -77,7 +77,7 @@ MtEmber_Exterior_EventScript_DefeatedGrunt2:: @ 8163A1B end MtEmber_Exterior_EventScript_BattleGrunt2:: @ 8163A25 - playbgm MUS_ROCKET, 0 + playbgm MUS_ENCOUNTER_ROCKET, 0 msgbox MtEmber_Exterior_Text_Grunt2Intro trainerbattle_no_intro TRAINER_TEAM_ROCKET_GRUNT_44, MtEmber_Exterior_Text_Grunt2Defeat msgbox MtEmber_Exterior_Text_Grunt2PostBattle diff --git a/data/maps/MtEmber_RubyPath_1F/map.json b/data/maps/MtEmber_RubyPath_1F/map.json index 46da66957..3a3d01a84 100644 --- a/data/maps/MtEmber_RubyPath_1F/map.json +++ b/data/maps/MtEmber_RubyPath_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_EMBER_RUBY_PATH_1F", "name": "MtEmber_RubyPath_1F", "layout": "LAYOUT_MT_EMBER_RUBY_PATH_1F", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtEmber_RubyPath_B1F/map.json b/data/maps/MtEmber_RubyPath_B1F/map.json index af102d21a..131ba8fd6 100644 --- a/data/maps/MtEmber_RubyPath_B1F/map.json +++ b/data/maps/MtEmber_RubyPath_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_EMBER_RUBY_PATH_B1F", "name": "MtEmber_RubyPath_B1F", "layout": "LAYOUT_MT_EMBER_RUBY_PATH_B1F", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json b/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json index 426dfd840..ea9fa2586 100644 --- a/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json +++ b/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_EMBER_RUBY_PATH_B1F_STAIRS", "name": "MtEmber_RubyPath_B1F_Stairs", "layout": "LAYOUT_MT_EMBER_RUBY_PATH_B1F_STAIRS", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtEmber_RubyPath_B2F/map.json b/data/maps/MtEmber_RubyPath_B2F/map.json index ae9032e1a..aaf1b8dc3 100644 --- a/data/maps/MtEmber_RubyPath_B2F/map.json +++ b/data/maps/MtEmber_RubyPath_B2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_EMBER_RUBY_PATH_B2F", "name": "MtEmber_RubyPath_B2F", "layout": "LAYOUT_MT_EMBER_RUBY_PATH_B2F", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json b/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json index 5aff19b08..b9c4074f9 100644 --- a/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json +++ b/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_EMBER_RUBY_PATH_B2F_STAIRS", "name": "MtEmber_RubyPath_B2F_Stairs", "layout": "LAYOUT_MT_EMBER_RUBY_PATH_B2F_STAIRS", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtEmber_RubyPath_B3F/map.json b/data/maps/MtEmber_RubyPath_B3F/map.json index 80a475e31..7ee35c5ef 100644 --- a/data/maps/MtEmber_RubyPath_B3F/map.json +++ b/data/maps/MtEmber_RubyPath_B3F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_EMBER_RUBY_PATH_B3F", "name": "MtEmber_RubyPath_B3F", "layout": "LAYOUT_MT_EMBER_RUBY_PATH_B3F", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtEmber_RubyPath_B3F/scripts.inc b/data/maps/MtEmber_RubyPath_B3F/scripts.inc index 3c6852535..a031e598b 100644 --- a/data/maps/MtEmber_RubyPath_B3F/scripts.inc +++ b/data/maps/MtEmber_RubyPath_B3F/scripts.inc @@ -7,6 +7,6 @@ MtEmber_RubyPath_B5F_EventScript_Ruby:: @ 8163C49 faceplayer setflag FLAG_GOT_RUBY removeobject 1 - giveitem_msg MtEmber_RubyPath_B3F_Text_FoundARuby, ITEM_RUBY, 1, MUS_FAN5 + giveitem_msg MtEmber_RubyPath_B3F_Text_FoundARuby, ITEM_RUBY, 1, MUS_OBTAIN_KEY_ITEM release end diff --git a/data/maps/MtEmber_RubyPath_B4F/map.json b/data/maps/MtEmber_RubyPath_B4F/map.json index 5d4da8a7a..d4ed67e9c 100644 --- a/data/maps/MtEmber_RubyPath_B4F/map.json +++ b/data/maps/MtEmber_RubyPath_B4F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_EMBER_RUBY_PATH_B4F", "name": "MtEmber_RubyPath_B4F", "layout": "LAYOUT_MT_EMBER_RUBY_PATH_B4F", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtEmber_RubyPath_B5F/map.json b/data/maps/MtEmber_RubyPath_B5F/map.json index 8ca8f26f7..267cedd37 100644 --- a/data/maps/MtEmber_RubyPath_B5F/map.json +++ b/data/maps/MtEmber_RubyPath_B5F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_EMBER_RUBY_PATH_B5F", "name": "MtEmber_RubyPath_B5F", "layout": "LAYOUT_MT_EMBER_RUBY_PATH_B5F", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtEmber_Summit/map.json b/data/maps/MtEmber_Summit/map.json index 521adf657..e750d9d65 100644 --- a/data/maps/MtEmber_Summit/map.json +++ b/data/maps/MtEmber_Summit/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_EMBER_SUMMIT", "name": "MtEmber_Summit", "layout": "LAYOUT_MT_EMBER_SUMMIT", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtEmber_Summit/scripts.inc b/data/maps/MtEmber_Summit/scripts.inc index f34e9ff6f..f0dc178bb 100644 --- a/data/maps/MtEmber_Summit/scripts.inc +++ b/data/maps/MtEmber_Summit/scripts.inc @@ -34,7 +34,7 @@ MtEmber_Summit_EventScript_Moltres:: @ 8163B33 waitmessage waitmoncry delay 10 - playbgm MUS_EXEYE, 0 + playbgm MUS_ENCOUNTER_GYM_LEADER, 0 waitbuttonpress setflag FLAG_SYS_SPECIAL_WILD_BATTLE special StartLegendaryBattle diff --git a/data/maps/MtEmber_SummitPath_1F/map.json b/data/maps/MtEmber_SummitPath_1F/map.json index 77c89d7f2..2f577dc02 100644 --- a/data/maps/MtEmber_SummitPath_1F/map.json +++ b/data/maps/MtEmber_SummitPath_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_EMBER_SUMMIT_PATH_1F", "name": "MtEmber_SummitPath_1F", "layout": "LAYOUT_MT_EMBER_SUMMIT_PATH_1F", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtEmber_SummitPath_2F/map.json b/data/maps/MtEmber_SummitPath_2F/map.json index ee43d3bce..0cc16016d 100644 --- a/data/maps/MtEmber_SummitPath_2F/map.json +++ b/data/maps/MtEmber_SummitPath_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_EMBER_SUMMIT_PATH_2F", "name": "MtEmber_SummitPath_2F", "layout": "LAYOUT_MT_EMBER_SUMMIT_PATH_2F", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtEmber_SummitPath_3F/map.json b/data/maps/MtEmber_SummitPath_3F/map.json index 330bc6fe5..19dd584bc 100644 --- a/data/maps/MtEmber_SummitPath_3F/map.json +++ b/data/maps/MtEmber_SummitPath_3F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_EMBER_SUMMIT_PATH_3F", "name": "MtEmber_SummitPath_3F", "layout": "LAYOUT_MT_EMBER_SUMMIT_PATH_3F", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtMoon_1F/map.json b/data/maps/MtMoon_1F/map.json index 7a53c094a..4e91905de 100644 --- a/data/maps/MtMoon_1F/map.json +++ b/data/maps/MtMoon_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_MOON_1F", "name": "MtMoon_1F", "layout": "LAYOUT_MT_MOON_1F", - "music": "MUS_OTSUKIMI", + "music": "MUS_MT_MOON", "region_map_section": "MAPSEC_MT_MOON", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtMoon_B1F/map.json b/data/maps/MtMoon_B1F/map.json index e330d5510..68723ddee 100644 --- a/data/maps/MtMoon_B1F/map.json +++ b/data/maps/MtMoon_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_MOON_B1F", "name": "MtMoon_B1F", "layout": "LAYOUT_MT_MOON_B1F", - "music": "MUS_OTSUKIMI", + "music": "MUS_MT_MOON", "region_map_section": "MAPSEC_MT_MOON", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtMoon_B2F/map.json b/data/maps/MtMoon_B2F/map.json index 172a1be21..358d791b8 100644 --- a/data/maps/MtMoon_B2F/map.json +++ b/data/maps/MtMoon_B2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_MOON_B2F", "name": "MtMoon_B2F", "layout": "LAYOUT_MT_MOON_B2F", - "music": "MUS_OTSUKIMI", + "music": "MUS_MT_MOON", "region_map_section": "MAPSEC_MT_MOON", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtMoon_B2F/scripts.inc b/data/maps/MtMoon_B2F/scripts.inc index 9bfe16f79..4ea99eb24 100644 --- a/data/maps/MtMoon_B2F/scripts.inc +++ b/data/maps/MtMoon_B2F/scripts.inc @@ -36,7 +36,7 @@ MtMoon_B2F_EventScript_BattleMiguel:: @ 81606DD textcolor 0 message MtMoon_B2F_Text_MiguelIntro waitmessage - playbgm MUS_EXEYE, 0 + playbgm MUS_ENCOUNTER_GYM_LEADER, 0 waitbuttonpress setvar VAR_LAST_TALKED, LOCALID_MIGUEL trainerbattle_no_intro TRAINER_SUPER_NERD_MIGUEL, MtMoon_B2F_Text_MiguelDefeat @@ -61,7 +61,7 @@ MtMoon_B2F_EventScript_DomeFossil:: @ 816071B compare VAR_RESULT, NO goto_if_eq MtMoon_B2F_EventScript_DontTakeFossil removeobject LOCALID_DOME_FOSSIL - giveitem_msg MtMoon_B2F_Text_ObtainedDomeFossil, ITEM_DOME_FOSSIL, 1, MUS_FAN5 + giveitem_msg MtMoon_B2F_Text_ObtainedDomeFossil, ITEM_DOME_FOSSIL, 1, MUS_OBTAIN_KEY_ITEM closemessage special QuestLog_CutRecording delay 10 @@ -69,7 +69,7 @@ MtMoon_B2F_EventScript_DomeFossil:: @ 816071B waitmovement 0 moveobjectoffscreen LOCALID_MIGUEL textcolor 0 - playfanfare MUS_FAN5 + playfanfare MUS_OBTAIN_KEY_ITEM message MtMoon_B2F_Text_ThenThisFossilIsMine waitmessage waitfanfare @@ -93,7 +93,7 @@ MtMoon_B2F_EventScript_HelixFossil:: @ 816077F compare VAR_RESULT, NO goto_if_eq MtMoon_B2F_EventScript_DontTakeFossil removeobject LOCALID_HELIX_FOSSIL - giveitem_msg MtMoon_B2F_Text_ObtainedHelixFossil, ITEM_HELIX_FOSSIL, 1, MUS_FAN5 + giveitem_msg MtMoon_B2F_Text_ObtainedHelixFossil, ITEM_HELIX_FOSSIL, 1, MUS_OBTAIN_KEY_ITEM closemessage special QuestLog_CutRecording delay 10 @@ -101,7 +101,7 @@ MtMoon_B2F_EventScript_HelixFossil:: @ 816077F waitmovement 0 moveobjectoffscreen LOCALID_MIGUEL textcolor 0 - playfanfare MUS_FAN5 + playfanfare MUS_OBTAIN_KEY_ITEM message MtMoon_B2F_Text_ThenThisFossilIsMine waitmessage waitfanfare diff --git a/data/maps/NavelRock_1F/map.json b/data/maps/NavelRock_1F/map.json index 703240141..1cee54ae8 100644 --- a/data/maps/NavelRock_1F/map.json +++ b/data/maps/NavelRock_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_1F", "name": "NavelRock_1F", "layout": "LAYOUT_NAVEL_ROCK_1F", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_B1F/map.json b/data/maps/NavelRock_B1F/map.json index b1a6deada..8ebd55017 100644 --- a/data/maps/NavelRock_B1F/map.json +++ b/data/maps/NavelRock_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_B1F", "name": "NavelRock_B1F", "layout": "LAYOUT_NAVEL_ROCK_B1F", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_Base/map.json b/data/maps/NavelRock_Base/map.json index 8c00f2a75..6350185f9 100644 --- a/data/maps/NavelRock_Base/map.json +++ b/data/maps/NavelRock_Base/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_BASE", "name": "NavelRock_Base", "layout": "LAYOUT_NAVEL_ROCK_BASE", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_Base/scripts.inc b/data/maps/NavelRock_Base/scripts.inc index 9308f1ee1..09cea7949 100644 --- a/data/maps/NavelRock_Base/scripts.inc +++ b/data/maps/NavelRock_Base/scripts.inc @@ -35,14 +35,14 @@ NavelRock_Base_EventScript_Lugia:: @ 8165134 faceplayer waitse delay 20 - playse SE_T_AME_E + playse SE_THUNDERSTORM_STOP setvar VAR_0x8004, 0 @ Vertical pan setvar VAR_0x8005, 3 @ Horizontal pan setvar VAR_0x8006, 4 @ Num shakes setvar VAR_0x8007, 2 @ Shake delay special ShakeScreen delay 30 - playse SE_T_AME_E + playse SE_THUNDERSTORM_STOP setvar VAR_0x8004, 0 @ Vertical pan setvar VAR_0x8005, 3 @ Horizontal pan setvar VAR_0x8006, 4 @ Num shakes diff --git a/data/maps/NavelRock_BasePath_B10F/map.json b/data/maps/NavelRock_BasePath_B10F/map.json index 716ae04db..c579af031 100644 --- a/data/maps/NavelRock_BasePath_B10F/map.json +++ b/data/maps/NavelRock_BasePath_B10F/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_BASE_PATH_B10F", "name": "NavelRock_BasePath_B10F", "layout": "LAYOUT_NAVEL_ROCK_BASE_PATH_B10F", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_BasePath_B11F/map.json b/data/maps/NavelRock_BasePath_B11F/map.json index 1b92ca1fc..579b13577 100644 --- a/data/maps/NavelRock_BasePath_B11F/map.json +++ b/data/maps/NavelRock_BasePath_B11F/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_BASE_PATH_B11F", "name": "NavelRock_BasePath_B11F", "layout": "LAYOUT_NAVEL_ROCK_BASE_PATH_B11F", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_BasePath_B1F/map.json b/data/maps/NavelRock_BasePath_B1F/map.json index 624f800ee..f0289d880 100644 --- a/data/maps/NavelRock_BasePath_B1F/map.json +++ b/data/maps/NavelRock_BasePath_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_BASE_PATH_B1F", "name": "NavelRock_BasePath_B1F", "layout": "LAYOUT_NAVEL_ROCK_BASE_PATH_B1F", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_BasePath_B2F/map.json b/data/maps/NavelRock_BasePath_B2F/map.json index b6af50439..5cd175db3 100644 --- a/data/maps/NavelRock_BasePath_B2F/map.json +++ b/data/maps/NavelRock_BasePath_B2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_BASE_PATH_B2F", "name": "NavelRock_BasePath_B2F", "layout": "LAYOUT_NAVEL_ROCK_BASE_PATH_B2F", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_BasePath_B3F/map.json b/data/maps/NavelRock_BasePath_B3F/map.json index 22cc90c60..fdbe8f4e3 100644 --- a/data/maps/NavelRock_BasePath_B3F/map.json +++ b/data/maps/NavelRock_BasePath_B3F/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_BASE_PATH_B3F", "name": "NavelRock_BasePath_B3F", "layout": "LAYOUT_NAVEL_ROCK_BASE_PATH_B3F", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_BasePath_B4F/map.json b/data/maps/NavelRock_BasePath_B4F/map.json index 33c4d41be..e90cabc93 100644 --- a/data/maps/NavelRock_BasePath_B4F/map.json +++ b/data/maps/NavelRock_BasePath_B4F/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_BASE_PATH_B4F", "name": "NavelRock_BasePath_B4F", "layout": "LAYOUT_NAVEL_ROCK_BASE_PATH_B4F", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_BasePath_B5F/map.json b/data/maps/NavelRock_BasePath_B5F/map.json index 26cf212c6..61737e2e6 100644 --- a/data/maps/NavelRock_BasePath_B5F/map.json +++ b/data/maps/NavelRock_BasePath_B5F/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_BASE_PATH_B5F", "name": "NavelRock_BasePath_B5F", "layout": "LAYOUT_NAVEL_ROCK_BASE_PATH_B5F", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_BasePath_B6F/map.json b/data/maps/NavelRock_BasePath_B6F/map.json index 0d3ffdf8f..54801807e 100644 --- a/data/maps/NavelRock_BasePath_B6F/map.json +++ b/data/maps/NavelRock_BasePath_B6F/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_BASE_PATH_B6F", "name": "NavelRock_BasePath_B6F", "layout": "LAYOUT_NAVEL_ROCK_BASE_PATH_B6F", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_BasePath_B7F/map.json b/data/maps/NavelRock_BasePath_B7F/map.json index acfc1da43..b64c7ae1c 100644 --- a/data/maps/NavelRock_BasePath_B7F/map.json +++ b/data/maps/NavelRock_BasePath_B7F/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_BASE_PATH_B7F", "name": "NavelRock_BasePath_B7F", "layout": "LAYOUT_NAVEL_ROCK_BASE_PATH_B7F", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_BasePath_B8F/map.json b/data/maps/NavelRock_BasePath_B8F/map.json index 4756a0655..5a50563b7 100644 --- a/data/maps/NavelRock_BasePath_B8F/map.json +++ b/data/maps/NavelRock_BasePath_B8F/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_BASE_PATH_B8F", "name": "NavelRock_BasePath_B8F", "layout": "LAYOUT_NAVEL_ROCK_BASE_PATH_B8F", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_BasePath_B9F/map.json b/data/maps/NavelRock_BasePath_B9F/map.json index d033dd887..a14c35048 100644 --- a/data/maps/NavelRock_BasePath_B9F/map.json +++ b/data/maps/NavelRock_BasePath_B9F/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_BASE_PATH_B9F", "name": "NavelRock_BasePath_B9F", "layout": "LAYOUT_NAVEL_ROCK_BASE_PATH_B9F", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_Exterior/map.json b/data/maps/NavelRock_Exterior/map.json index 9b10f6d8c..e7578b073 100644 --- a/data/maps/NavelRock_Exterior/map.json +++ b/data/maps/NavelRock_Exterior/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_EXTERIOR", "name": "NavelRock_Exterior", "layout": "LAYOUT_NAVEL_ROCK_EXTERIOR", - "music": "MUS_NANASHIMA", + "music": "MUS_SEVII_ROUTE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_Fork/map.json b/data/maps/NavelRock_Fork/map.json index ec9fec5df..25e7ecf40 100644 --- a/data/maps/NavelRock_Fork/map.json +++ b/data/maps/NavelRock_Fork/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_FORK", "name": "NavelRock_Fork", "layout": "LAYOUT_NAVEL_ROCK_FORK", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_Harbor/map.json b/data/maps/NavelRock_Harbor/map.json index 3b859459e..a94603087 100644 --- a/data/maps/NavelRock_Harbor/map.json +++ b/data/maps/NavelRock_Harbor/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_HARBOR", "name": "NavelRock_Harbor", "layout": "LAYOUT_ISLAND_HARBOR", - "music": "MUS_NANASHIMA", + "music": "MUS_SEVII_ROUTE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_Summit/map.json b/data/maps/NavelRock_Summit/map.json index a7bacb9f5..2718158b2 100644 --- a/data/maps/NavelRock_Summit/map.json +++ b/data/maps/NavelRock_Summit/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_SUMMIT", "name": "NavelRock_Summit", "layout": "LAYOUT_NAVEL_ROCK_SUMMIT", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_SHADE", diff --git a/data/maps/NavelRock_SummitPath_2F/map.json b/data/maps/NavelRock_SummitPath_2F/map.json index d103d5f70..9a61e4b79 100644 --- a/data/maps/NavelRock_SummitPath_2F/map.json +++ b/data/maps/NavelRock_SummitPath_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_SUMMIT_PATH_2F", "name": "NavelRock_SummitPath_2F", "layout": "LAYOUT_NAVEL_ROCK_SUMMIT_PATH_2F", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_SummitPath_3F/map.json b/data/maps/NavelRock_SummitPath_3F/map.json index 3a122a2d2..e61f23fb8 100644 --- a/data/maps/NavelRock_SummitPath_3F/map.json +++ b/data/maps/NavelRock_SummitPath_3F/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_SUMMIT_PATH_3F", "name": "NavelRock_SummitPath_3F", "layout": "LAYOUT_NAVEL_ROCK_SUMMIT_PATH_3F", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_SummitPath_4F/map.json b/data/maps/NavelRock_SummitPath_4F/map.json index fa74a2c92..3d55fb5d7 100644 --- a/data/maps/NavelRock_SummitPath_4F/map.json +++ b/data/maps/NavelRock_SummitPath_4F/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_SUMMIT_PATH_4F", "name": "NavelRock_SummitPath_4F", "layout": "LAYOUT_NAVEL_ROCK_SUMMIT_PATH_4F", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_SummitPath_5F/map.json b/data/maps/NavelRock_SummitPath_5F/map.json index 25d3ba773..0182b2eec 100644 --- a/data/maps/NavelRock_SummitPath_5F/map.json +++ b/data/maps/NavelRock_SummitPath_5F/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_SUMMIT_PATH_5F", "name": "NavelRock_SummitPath_5F", "layout": "LAYOUT_NAVEL_ROCK_SUMMIT_PATH_5F", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/OneIsland/map.json b/data/maps/OneIsland/map.json index 394af5a6d..e49ef37ef 100644 --- a/data/maps/OneIsland/map.json +++ b/data/maps/OneIsland/map.json @@ -2,7 +2,7 @@ "id": "MAP_ONE_ISLAND", "name": "OneIsland", "layout": "LAYOUT_ONE_ISLAND", - "music": "MUS_NANA123", + "music": "MUS_SEVII_123", "region_map_section": "MAPSEC_ONE_ISLAND", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/OneIsland_Harbor/map.json b/data/maps/OneIsland_Harbor/map.json index f44aaa144..0ca6c7b3f 100644 --- a/data/maps/OneIsland_Harbor/map.json +++ b/data/maps/OneIsland_Harbor/map.json @@ -2,7 +2,7 @@ "id": "MAP_ONE_ISLAND_HARBOR", "name": "OneIsland_Harbor", "layout": "LAYOUT_ISLAND_HARBOR", - "music": "MUS_NANA123", + "music": "MUS_SEVII_123", "region_map_section": "MAPSEC_ONE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/OneIsland_House1/map.json b/data/maps/OneIsland_House1/map.json index c6fa1d06f..5823a4c3c 100644 --- a/data/maps/OneIsland_House1/map.json +++ b/data/maps/OneIsland_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_ONE_ISLAND_HOUSE1", "name": "OneIsland_House1", "layout": "LAYOUT_HOUSE3", - "music": "MUS_NANA123", + "music": "MUS_SEVII_123", "region_map_section": "MAPSEC_ONE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/OneIsland_House2/map.json b/data/maps/OneIsland_House2/map.json index da306f19e..3f51fb461 100644 --- a/data/maps/OneIsland_House2/map.json +++ b/data/maps/OneIsland_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_ONE_ISLAND_HOUSE2", "name": "OneIsland_House2", "layout": "LAYOUT_HOUSE3", - "music": "MUS_NANA123", + "music": "MUS_SEVII_123", "region_map_section": "MAPSEC_ONE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/OneIsland_KindleRoad/map.json b/data/maps/OneIsland_KindleRoad/map.json index c22c95e05..963d70acc 100644 --- a/data/maps/OneIsland_KindleRoad/map.json +++ b/data/maps/OneIsland_KindleRoad/map.json @@ -2,7 +2,7 @@ "id": "MAP_ONE_ISLAND_KINDLE_ROAD", "name": "OneIsland_KindleRoad", "layout": "LAYOUT_ONE_ISLAND_KINDLE_ROAD", - "music": "MUS_LOAD02", + "music": "MUS_ROUTE3", "region_map_section": "MAPSEC_KINDLE_ROAD", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/OneIsland_KindleRoad_EmberSpa/map.json b/data/maps/OneIsland_KindleRoad_EmberSpa/map.json index d7fa5d88f..f31b4b26f 100644 --- a/data/maps/OneIsland_KindleRoad_EmberSpa/map.json +++ b/data/maps/OneIsland_KindleRoad_EmberSpa/map.json @@ -2,7 +2,7 @@ "id": "MAP_ONE_ISLAND_KINDLE_ROAD_EMBER_SPA", "name": "OneIsland_KindleRoad_EmberSpa", "layout": "LAYOUT_ONE_ISLAND_KINDLE_ROAD_EMBER_SPA", - "music": "MUS_HANADA", + "music": "MUS_FUCHSIA", "region_map_section": "MAPSEC_EMBER_SPA", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/OneIsland_PokemonCenter_1F/map.json b/data/maps/OneIsland_PokemonCenter_1F/map.json index e3d94753a..1223e5a2d 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/map.json +++ b/data/maps/OneIsland_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ONE_ISLAND_POKEMON_CENTER_1F", "name": "OneIsland_PokemonCenter_1F", "layout": "LAYOUT_ONE_ISLAND_POKEMON_CENTER_1F", - "music": "MUS_NETWORK", + "music": "MUS_NET_CENTER", "region_map_section": "MAPSEC_ONE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc index 524c99272..1d46a2bf8 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc @@ -104,12 +104,12 @@ OneIsland_PokemonCenter_1F_EventScript_MeetCelioScene:: @ 8170CB1 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 msgbox OneIsland_PokemonCenter_1F_Text_CanYouDeliverThisMeteoritePlayer - msgreceiveditem OneIsland_PokemonCenter_1F_Text_AcceptedMeteoriteFromBill, ITEM_METEORITE, 1, MUS_FAN5 + msgreceiveditem OneIsland_PokemonCenter_1F_Text_AcceptedMeteoriteFromBill, ITEM_METEORITE, 1, MUS_OBTAIN_KEY_ITEM additem ITEM_METEORITE applymovement LOCALID_CELIO, Movement_WalkInPlaceFastestDown waitmovement 0 msgbox OneIsland_PokemonCenter_1F_Text_CelioPleaseTakeThis - giveitem_msg OneIsland_PokemonCenter_1F_Text_ObtainedTriPass, ITEM_TRI_PASS, 1, MUS_FAN5 + giveitem_msg OneIsland_PokemonCenter_1F_Text_ObtainedTriPass, ITEM_TRI_PASS, 1, MUS_OBTAIN_KEY_ITEM msgbox OneIsland_PokemonCenter_1F_Text_PassLetsYouTravelBetweenIslands compare VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 call_if_ge OneIsland_PokemonCenter_1F_EventScript_ReceiveTownMapPage @@ -137,7 +137,7 @@ OneIsland_PokemonCenter_1F_EventScript_IntroducePlayerNotChamp:: @ 8170E3D OneIsland_PokemonCenter_1F_EventScript_ReceiveTownMapPage:: @ 8170E46 textcolor 3 - playfanfare MUS_FAN5 + playfanfare MUS_OBTAIN_KEY_ITEM message OneIsland_PokemonCenter_1F_Text_ReceivedExtraPageForTownMap waitmessage waitfanfare @@ -147,7 +147,7 @@ OneIsland_PokemonCenter_1F_EventScript_ReceiveTownMapPage:: @ 8170E46 OneIsland_PokemonCenter_1F_EventScript_ReceiveTownMap:: @ 8170E58 setflag FLAG_HIDE_TOWN_MAP setvar VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 - giveitem_msg OneIsland_PokemonCenter_1F_Text_ReceivedTownMap, ITEM_TOWN_MAP, 1, MUS_FAN5 + giveitem_msg OneIsland_PokemonCenter_1F_Text_ReceivedTownMap, ITEM_TOWN_MAP, 1, MUS_OBTAIN_KEY_ITEM return OneIsland_PokemonCenter_1F_Movement_PlayerWalkToCelio:: @ 8170E7D @@ -260,7 +260,7 @@ OneIsland_PokemonCenter_1F_EventScript_CelioJustGivenSapphire:: @ 8170F9B OneIsland_PokemonCenter_1F_EventScript_GiveCelioSapphire:: @ 8170FA5 textcolor 3 - playfanfare MUS_ME_WAZA + playfanfare MUS_OBTAIN_TMHM message OneIsland_PokemonCenter_1F_Text_HandedSapphireToCelio waitmessage waitfanfare @@ -270,7 +270,7 @@ OneIsland_PokemonCenter_1F_EventScript_GiveCelioSapphire:: @ 8170FA5 closemessage applymovement LOCALID_CELIO, OneIsland_PokemonCenter_1F_Movement_CelioPutGemInMachine waitmovement 0 - playse SE_TK_KASYA + playse SE_CLICK call OneIsland_PokemonCenter_1F_EventScript_SetSapphireMetatile special DrawWholeMapView msgbox OneIsland_PokemonCenter_1F_Text_OkayThisIsGood @@ -306,7 +306,7 @@ OneIsland_PokemonCenter_1F_EventScript_ExplainRainbowPass:: @ 817103A OneIsland_PokemonCenter_1F_EventScript_GiveCelioRuby:: @ 8171044 msgbox OneIsland_PokemonCenter_1F_Text_OhThats textcolor 3 - playfanfare MUS_ME_WAZA + playfanfare MUS_OBTAIN_TMHM message OneIsland_PokemonCenter_1F_Text_HandedRubyToCelio waitmessage waitfanfare @@ -314,7 +314,7 @@ OneIsland_PokemonCenter_1F_EventScript_GiveCelioRuby:: @ 8171044 closemessage applymovement LOCALID_CELIO, OneIsland_PokemonCenter_1F_Movement_CelioPutGemInMachine waitmovement 0 - playse SE_TK_KASYA + playse SE_CLICK call OneIsland_PokemonCenter_1F_EventScript_SetRubyMetatile special DrawWholeMapView delay 30 @@ -341,11 +341,11 @@ OneIsland_PokemonCenter_1F_EventScript_GiveRainbowPass:: @ 81710B2 additem ITEM_RAINBOW_PASS setflag FLAG_SYS_SEVII_MAP_4567 textcolor 3 - playfanfare MUS_FAN5 + playfanfare MUS_OBTAIN_KEY_ITEM message OneIsland_PokemonCenter_1F_Text_ReturnedTriPassForRainbowPass waitmessage waitfanfare - playfanfare MUS_FAN5 + playfanfare MUS_OBTAIN_KEY_ITEM message OneIsland_PokemonCenter_1F_Text_ObtainedExtraMapPage waitmessage waitfanfare @@ -501,7 +501,7 @@ OneIsland_PokemonCenter_1F_EventScript_LeaveOneIslandScene:: @ 81711DA applymovement OBJ_EVENT_ID_PLAYER, OneIsland_PokemonCenter_1F_Movement_PlayerExit applymovement LOCALID_BILL, OneIsland_PokemonCenter_1F_Movement_BillExit waitmovement 0 - playse SE_KAIDAN + playse SE_EXIT setflag FLAG_HIDE_ONE_ISLAND_POKECENTER_BILL setvar VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 3 clearflag FLAG_HIDE_CINNABAR_BILL diff --git a/data/maps/OneIsland_PokemonCenter_2F/map.json b/data/maps/OneIsland_PokemonCenter_2F/map.json index 13d3d1d02..f7fd1a1bb 100644 --- a/data/maps/OneIsland_PokemonCenter_2F/map.json +++ b/data/maps/OneIsland_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ONE_ISLAND_POKEMON_CENTER_2F", "name": "OneIsland_PokemonCenter_2F", "layout": "LAYOUT_ONE_ISLAND_POKEMON_CENTER_2F", - "music": "MUS_NETWORK", + "music": "MUS_NET_CENTER", "region_map_section": "MAPSEC_ONE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/OneIsland_TreasureBeach/map.json b/data/maps/OneIsland_TreasureBeach/map.json index 2f96d4b26..1eaf448bc 100644 --- a/data/maps/OneIsland_TreasureBeach/map.json +++ b/data/maps/OneIsland_TreasureBeach/map.json @@ -2,7 +2,7 @@ "id": "MAP_ONE_ISLAND_TREASURE_BEACH", "name": "OneIsland_TreasureBeach", "layout": "LAYOUT_ONE_ISLAND_TREASURE_BEACH", - "music": "MUS_LOAD02", + "music": "MUS_ROUTE3", "region_map_section": "MAPSEC_TREASURE_BEACH", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/PalletTown/map.json b/data/maps/PalletTown/map.json index 8ebfb8bcc..91819b8b1 100644 --- a/data/maps/PalletTown/map.json +++ b/data/maps/PalletTown/map.json @@ -2,7 +2,7 @@ "id": "MAP_PALLET_TOWN", "name": "PalletTown", "layout": "LAYOUT_PALLET_TOWN", - "music": "MUS_MASARA", + "music": "MUS_PALLET", "region_map_section": "MAPSEC_PALLET_TOWN", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/PalletTown/scripts.inc b/data/maps/PalletTown/scripts.inc index 62e9d8a01..bed477a5c 100644 --- a/data/maps/PalletTown/scripts.inc +++ b/data/maps/PalletTown/scripts.inc @@ -65,7 +65,7 @@ PalletTown_EventScript_OakRatingScene:: @ 81654D8 goto_if_lt PalletTown_EventScript_NotEnoughMonsForNationalDex msgbox PalletTown_Text_CaughtXImpressiveFollowMe closemessage - playbgm MUS_ANNAI, 0 + playbgm MUS_FOLLOW_ME, 0 applymovement OBJ_EVENT_ID_PLAYER, PalletTown_Movement_PlayerWalkToLabFromHouse applymovement LOCALID_PROF_OAK, PalletTown_Movement_OakWalkToLabFromHouse waitmovement 0 @@ -189,7 +189,7 @@ PalletTown_EventScript_OakTrigger:: @ 8165605 famechecker FAMECHECKER_OAK, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 textcolor 0 delay 30 - playbgm MUS_OHKIDO, 0 + playbgm MUS_OAK, 0 message PalletTown_Text_OakDontGoOut waitmessage delay 85 diff --git a/data/maps/PalletTown_GarysHouse/map.json b/data/maps/PalletTown_GarysHouse/map.json index 0808e9534..b59a5fc0f 100644 --- a/data/maps/PalletTown_GarysHouse/map.json +++ b/data/maps/PalletTown_GarysHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_PALLET_TOWN_GARYS_HOUSE", "name": "PalletTown_GarysHouse", "layout": "LAYOUT_PALLET_TOWN_GARYS_HOUSE", - "music": "MUS_MASARA", + "music": "MUS_PALLET", "region_map_section": "MAPSEC_PALLET_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PalletTown_GarysHouse/scripts.inc b/data/maps/PalletTown_GarysHouse/scripts.inc index b9ce39e52..e61904c71 100644 --- a/data/maps/PalletTown_GarysHouse/scripts.inc +++ b/data/maps/PalletTown_GarysHouse/scripts.inc @@ -69,7 +69,7 @@ PalletTown_GarysHouse_EventScript_GroomMon:: @ 8168DB9 msgbox PalletTown_GarysHouse_Text_LookingNiceInNoTime closemessage fadescreen FADE_TO_BLACK - playfanfare MUS_ME_ASA + playfanfare MUS_HEAL waitfanfare special DaisyMassageServices fadescreen FADE_FROM_BLACK @@ -155,7 +155,7 @@ PalletTown_GarysHouse_EventScript_GiveTownMap:: @ 8168EF6 applymovement LOCALID_DAISY, Movement_FacePlayer waitmovement 0 delay 12 - giveitem_msg PalletTown_GarysHouse_Text_ReceivedTownMapFromDaisy, ITEM_TOWN_MAP, 1, MUS_FAN5 + giveitem_msg PalletTown_GarysHouse_Text_ReceivedTownMapFromDaisy, ITEM_TOWN_MAP, 1, MUS_OBTAIN_KEY_ITEM release end diff --git a/data/maps/PalletTown_PlayersHouse_1F/map.json b/data/maps/PalletTown_PlayersHouse_1F/map.json index 60d0d1960..f40f63125 100644 --- a/data/maps/PalletTown_PlayersHouse_1F/map.json +++ b/data/maps/PalletTown_PlayersHouse_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_PALLET_TOWN_PLAYERS_HOUSE_1F", "name": "PalletTown_PlayersHouse_1F", "layout": "LAYOUT_PALLET_TOWN_PLAYERS_HOUSE_1F", - "music": "MUS_MASARA", + "music": "MUS_PALLET", "region_map_section": "MAPSEC_PALLET_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PalletTown_PlayersHouse_2F/map.json b/data/maps/PalletTown_PlayersHouse_2F/map.json index bd2aec42f..9d38997a1 100644 --- a/data/maps/PalletTown_PlayersHouse_2F/map.json +++ b/data/maps/PalletTown_PlayersHouse_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_PALLET_TOWN_PLAYERS_HOUSE_2F", "name": "PalletTown_PlayersHouse_2F", "layout": "LAYOUT_PALLET_TOWN_PLAYERS_HOUSE_2F", - "music": "MUS_MASARA", + "music": "MUS_PALLET", "region_map_section": "MAPSEC_PALLET_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PalletTown_ProfessorOaksLab/map.json b/data/maps/PalletTown_ProfessorOaksLab/map.json index ad076b0c6..4ba6d636b 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/map.json +++ b/data/maps/PalletTown_ProfessorOaksLab/map.json @@ -2,7 +2,7 @@ "id": "MAP_PALLET_TOWN_PROFESSOR_OAKS_LAB", "name": "PalletTown_ProfessorOaksLab", "layout": "LAYOUT_PALLET_TOWN_PROFESSOR_OAKS_LAB", - "music": "MUS_KENKYU", + "music": "MUS_OAK_LAB", "region_map_section": "MAPSEC_PALLET_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc index c21a0e184..43000bc34 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc +++ b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc @@ -41,7 +41,7 @@ PalletTown_ProfessorOaksLab_EventScript_SetNationalDexSceneFinished:: @ 8168FC0 PalletTown_ProfessorOaksLab_EventScript_ReadyOakForStarterScene:: @ 8168FC6 setobjectxyperm LOCALID_PROF_OAK, 6, 11 setobjectmovementtype LOCALID_PROF_OAK, MOVEMENT_TYPE_FACE_UP - savebgm MUS_OHKIDO + savebgm MUS_OAK return PalletTown_ProfessorOaksLab_EventScript_ReadyOakForNationalDexScene:: @ 8168FD5 @@ -124,7 +124,7 @@ PalletTown_ProfessorOaksLab_EventScript_NationalDexScene:: @ 8169035 compare VAR_FACING, DIR_WEST call_if_eq PalletTown_ProfessorOaksLab_EventScript_OakBringDexesOverWest textcolor 3 - playfanfare MUS_FAN5 + playfanfare MUS_OBTAIN_KEY_ITEM message PalletTown_ProfessorOaksLab_Text_PlayersPokedexWasUpgraded waitmessage waitfanfare @@ -133,7 +133,7 @@ PalletTown_ProfessorOaksLab_EventScript_NationalDexScene:: @ 8169035 msgbox PalletTown_ProfessorOaksLab_Text_OakMustReallyWorkToFillPokedex msgbox PalletTown_ProfessorOaksLab_Text_RivalIllCompleteThePokedex closemessage - playbgm MUS_RIVAL2, 0 + playbgm MUS_RIVAL_EXIT, 0 compare VAR_FACING, DIR_NORTH call_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalExitNorth compare VAR_FACING, DIR_SOUTH @@ -151,7 +151,7 @@ PalletTown_ProfessorOaksLab_EventScript_NationalDexScene:: @ 8169035 PalletTown_ProfessorOaksLab_EventScript_NationalDexSceneRivalEnterNorth:: @ 8169174 setobjectxyperm LOCALID_RIVAL, 5, 10 addobject LOCALID_RIVAL - playbgm MUS_RIVAL1, 0 + playbgm MUS_ENCOUNTER_RIVAL, 0 applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchRivalEnterNorth applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalEnter waitmovement 0 @@ -160,7 +160,7 @@ PalletTown_ProfessorOaksLab_EventScript_NationalDexSceneRivalEnterNorth:: @ 8169 PalletTown_ProfessorOaksLab_EventScript_NationalDexSceneRivalEnterEastWest:: @ 8169194 setobjectxyperm LOCALID_RIVAL, 6, 10 addobject LOCALID_RIVAL - playbgm MUS_RIVAL1, 0 + playbgm MUS_ENCOUNTER_RIVAL, 0 applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFastestDown applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchRivalEnterEastWest applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalEnter @@ -170,7 +170,7 @@ PalletTown_ProfessorOaksLab_EventScript_NationalDexSceneRivalEnterEastWest:: @ 8 PalletTown_ProfessorOaksLab_EventScript_NationalDexSceneRivalEnterSouth:: @ 81691BB setobjectxyperm LOCALID_RIVAL, 6, 10 addobject LOCALID_RIVAL - playbgm MUS_RIVAL1, 0 + playbgm MUS_ENCOUNTER_RIVAL, 0 applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFastestDown applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalEnter waitmovement 0 @@ -239,7 +239,7 @@ PalletTown_ProfessorOaksLab_ChooseStarterScene:: @ 816923E applymovement LOCALID_RIVAL, Movement_WalkInPlaceFastestUp waitmovement 0 clearflag FLAG_DONT_TRANSITION_MUSIC - savebgm SE_STOP + savebgm MUS_DUMMY fadedefaultbgm msgbox PalletTown_ProfessorOaksLab_Text_RivalFedUpWithWaiting closemessage @@ -316,7 +316,7 @@ PalletTown_ProfessorOaksLab_EventScript_RivalBattleTriggerRight:: @ 81692FF PalletTown_ProfessorOaksLab_EventScript_RivalBattle:: @ 816930B textcolor 0 - playbgm MUS_RIVAL1, 0 + playbgm MUS_ENCOUNTER_RIVAL, 0 applymovement LOCALID_RIVAL, Movement_WalkInPlaceFastestDown waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp @@ -509,7 +509,7 @@ PalletTown_ProfessorOaksLab_EventScript_EndRivalBattle:: @ 81694C2 special HealPlayerParty msgbox PalletTown_ProfessorOaksLab_Text_RivalGoToughenMyMon closemessage - playbgm MUS_RIVAL2, 0 + playbgm MUS_RIVAL_EXIT, 0 compare VAR_TEMP_2, 1 call_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalExitAfterBattleLeft compare VAR_TEMP_2, 2 @@ -517,7 +517,7 @@ PalletTown_ProfessorOaksLab_EventScript_EndRivalBattle:: @ 81694C2 compare VAR_TEMP_2, 3 call_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalExitAfterBattleRight removeobject LOCALID_RIVAL - playse SE_KAIDAN + playse SE_EXIT fadedefaultbgm setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 4 setflag FLAG_BEAT_RIVAL_IN_OAKS_LAB @@ -651,14 +651,14 @@ PalletTown_ProfessorOaksLab_EventScript_OakBattleMonForItToGrow:: @ 8169614 PalletTown_ProfessorOaksLab_EventScript_ReceiveDexScene:: @ 816961E msgbox PalletTown_ProfessorOaksLab_Text_OakHaveSomethingForMe textcolor 3 - playfanfare MUS_ME_WAZA + playfanfare MUS_OBTAIN_TMHM message PalletTown_ProfessorOaksLab_Text_DeliveredOaksParcel waitmessage waitfanfare call EventScript_RestorePrevTextColor removeitem ITEM_OAKS_PARCEL, 1 msgbox PalletTown_ProfessorOaksLab_Text_OakCustomBallIOrdered - playbgm MUS_RIVAL1, 0 + playbgm MUS_ENCOUNTER_RIVAL, 0 msgbox PalletTown_ProfessorOaksLab_Text_RivalGramps closemessage compare VAR_FACING, DIR_NORTH @@ -717,7 +717,7 @@ PalletTown_ProfessorOaksLab_EventScript_ReceiveDexScene:: @ 816961E call_if_eq PalletTown_ProfessorOaksLab_EventScript_OakBringDexesOverWest delay 10 textcolor 3 - playfanfare MUS_FAN5 + playfanfare MUS_OBTAIN_KEY_ITEM message PalletTown_ProfessorOaksLab_Text_ReceivedPokedexFromOak waitmessage waitfanfare @@ -741,7 +741,7 @@ PalletTown_ProfessorOaksLab_EventScript_ReceiveDexScene:: @ 816961E call_if_eq PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalFacePlayerEastWest msgbox PalletTown_ProfessorOaksLab_Text_RivalTellSisNotToGiveYouMap closemessage - playbgm MUS_RIVAL2, 0 + playbgm MUS_RIVAL_EXIT, 0 compare VAR_FACING, DIR_NORTH call_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalExitNorth compare VAR_FACING, DIR_SOUTH @@ -1220,7 +1220,7 @@ PalletTown_ProfessorOaksLab_EventScript_ChoseStarter:: @ 8169C74 getspeciesname 0, PLAYER_STARTER_SPECIES message PalletTown_ProfessorOaksLab_Text_ReceivedMonFromOak waitmessage - playfanfare MUS_FAN5 + playfanfare MUS_OBTAIN_KEY_ITEM waitfanfare msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO compare VAR_RESULT, YES @@ -1271,7 +1271,7 @@ PalletTown_ProfessorOaksLab_EventScript_RivalTakesStarter:: @ 8169D2F getspeciesname 0, RIVAL_STARTER_SPECIES message PalletTown_ProfessorOaksLab_Text_RivalReceivedMonFromOak waitmessage - playfanfare MUS_FAN5 + playfanfare MUS_OBTAIN_KEY_ITEM waitfanfare setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 call_if_set FLAG_OPENED_START_MENU, PalletTown_ProfessorOaksLab_EventScript_ReadyEndSignLadyScene diff --git a/data/maps/PewterCity/map.json b/data/maps/PewterCity/map.json index 6d6fc0396..eca9af0b8 100644 --- a/data/maps/PewterCity/map.json +++ b/data/maps/PewterCity/map.json @@ -2,7 +2,7 @@ "id": "MAP_PEWTER_CITY", "name": "PewterCity", "layout": "LAYOUT_PEWTER_CITY", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_PEWTER_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/PewterCity/scripts.inc b/data/maps/PewterCity/scripts.inc index 5bb795169..2d0320b10 100644 --- a/data/maps/PewterCity/scripts.inc +++ b/data/maps/PewterCity/scripts.inc @@ -18,7 +18,7 @@ PewterCity_EventScript_GymGuide:: @ 8165B9D faceplayer msgbox PewterCity_Text_BrocksLookingForChallengersFollowMe closemessage - playbgm MUS_ANNAI, 0 + playbgm MUS_FOLLOW_ME, 0 compare VAR_FACING, DIR_EAST call_if_eq PewterCity_EventScript_WalkToGymEast msgbox PewterCity_Text_GoTakeOnBrock @@ -287,7 +287,7 @@ PewterCity_EventScript_GymGuideTrigger:: @ 8165DBE textcolor 0 msgbox PewterCity_Text_BrocksLookingForChallengersFollowMe closemessage - playbgm MUS_ANNAI, 0 + playbgm MUS_FOLLOW_ME, 0 compare VAR_TEMP_1, 0 call_if_eq PewterCity_EventScript_WalkToGymTop compare VAR_TEMP_1, 1 @@ -445,7 +445,7 @@ PewterCity_EventScript_MuseumGuide:: @ 816607E msgbox PewterCity_Text_ReallyYouHaveToGo closemessage delay 10 - playbgm MUS_ANNAI, 0 + playbgm MUS_FOLLOW_ME, 0 compare VAR_FACING, DIR_NORTH call_if_eq PewterCity_EventScript_LeadToMuseumNorth compare VAR_FACING, DIR_SOUTH @@ -719,7 +719,7 @@ PewterCity_EventScript_AideGiveRunningShoes:: @ 81662DE call_if_eq PewterCity_EventScript_AideApproachPlayer3 msgbox PewterCity_Text_AskedToDeliverThis textcolor 3 - playfanfare MUS_FAN5 + playfanfare MUS_OBTAIN_KEY_ITEM message PewterCity_Text_ReceivedRunningShoesFromAide waitmessage waitfanfare diff --git a/data/maps/PewterCity_Gym/text.inc b/data/maps/PewterCity_Gym/text.inc index c47a60b05..b6a1d87ee 100644 --- a/data/maps/PewterCity_Gym/text.inc +++ b/data/maps/PewterCity_Gym/text.inc @@ -12,7 +12,7 @@ PewterCity_Gym_Text_BrockIntro:: @ 8190CD4 .string "That's the TRAINER's honor that\n" .string "compels you to challenge me.\p" .string "Fine, then!\n" - .string "Show me your best!{PLAY_BGM}{MUS_EXEYE}$" + .string "Show me your best!{PLAY_BGM}{MUS_ENCOUNTER_GYM_LEADER}$" PewterCity_Gym_Text_BrockDefeat:: @ 8190E4F .string "I took you for granted, and so\n" @@ -21,7 +21,7 @@ PewterCity_Gym_Text_BrockDefeat:: @ 8190E4F .string "on you this…the official POKéMON\l" .string "LEAGUE BOULDERBADGE.\p" .string "{SIZE}Á{PLAYER} received the BOULDERBADGE\n" - .string "from BROCK!{PAUSE_MUSIC}{PLAY_BGM}{MUS_ME_BACHI}{PAUSE 0xFE}{PAUSE 0x56}{RESUME_MUSIC}\p" + .string "from BROCK!{PAUSE_MUSIC}{PLAY_BGM}{MUS_OBTAIN_BADGE}{PAUSE 0xFE}{PAUSE 0x56}{RESUME_MUSIC}\p" .string "{SIZE}ÇJust having the BOULDERBADGE makes\n" .string "your POKéMON more powerful.\p" .string "It also enables the use of the\n" diff --git a/data/maps/PewterCity_House1/map.json b/data/maps/PewterCity_House1/map.json index 1c45b8da0..70b274917 100644 --- a/data/maps/PewterCity_House1/map.json +++ b/data/maps/PewterCity_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_PEWTER_CITY_HOUSE1", "name": "PewterCity_House1", "layout": "LAYOUT_HOUSE2", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_PEWTER_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PewterCity_House2/map.json b/data/maps/PewterCity_House2/map.json index cb65aa873..224bf438e 100644 --- a/data/maps/PewterCity_House2/map.json +++ b/data/maps/PewterCity_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_PEWTER_CITY_HOUSE2", "name": "PewterCity_House2", "layout": "LAYOUT_HOUSE2", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_PEWTER_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PewterCity_Mart/map.json b/data/maps/PewterCity_Mart/map.json index ec45af3a6..df4620ff7 100644 --- a/data/maps/PewterCity_Mart/map.json +++ b/data/maps/PewterCity_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_PEWTER_CITY_MART", "name": "PewterCity_Mart", "layout": "LAYOUT_MART", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_PEWTER_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PewterCity_Museum_1F/map.json b/data/maps/PewterCity_Museum_1F/map.json index 26cdfbdcd..a96ec184e 100644 --- a/data/maps/PewterCity_Museum_1F/map.json +++ b/data/maps/PewterCity_Museum_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_PEWTER_CITY_MUSEUM_1F", "name": "PewterCity_Museum_1F", "layout": "LAYOUT_PEWTER_CITY_MUSEUM_1F", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_PEWTER_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PewterCity_Museum_1F/scripts.inc b/data/maps/PewterCity_Museum_1F/scripts.inc index 6a3601717..1b481d392 100644 --- a/data/maps/PewterCity_Museum_1F/scripts.inc +++ b/data/maps/PewterCity_Museum_1F/scripts.inc @@ -159,7 +159,7 @@ PewterCity_Museum_1F_EventScript_OldAmberScientist:: @ 816A4AE goto_if_eq PewterCity_Museum_1F_EventScript_NoRoomForOldAmber setflag FLAG_GOT_OLD_AMBER removeobject 4 - giveitem_msg PewterCity_Museum_1F_Text_ReceivedOldAmberFromMan, ITEM_OLD_AMBER, 1, MUS_FAN5 + giveitem_msg PewterCity_Museum_1F_Text_ReceivedOldAmberFromMan, ITEM_OLD_AMBER, 1, MUS_OBTAIN_KEY_ITEM release end diff --git a/data/maps/PewterCity_Museum_2F/map.json b/data/maps/PewterCity_Museum_2F/map.json index 2e3c40177..95c1b6aa4 100644 --- a/data/maps/PewterCity_Museum_2F/map.json +++ b/data/maps/PewterCity_Museum_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_PEWTER_CITY_MUSEUM_2F", "name": "PewterCity_Museum_2F", "layout": "LAYOUT_PEWTER_CITY_MUSEUM_2F", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_PEWTER_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PewterCity_PokemonCenter_1F/map.json b/data/maps/PewterCity_PokemonCenter_1F/map.json index 6918c6df2..ebc6c532b 100644 --- a/data/maps/PewterCity_PokemonCenter_1F/map.json +++ b/data/maps/PewterCity_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_PEWTER_CITY_POKEMON_CENTER_1F", "name": "PewterCity_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_PEWTER_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PewterCity_PokemonCenter_1F/scripts.inc b/data/maps/PewterCity_PokemonCenter_1F/scripts.inc index 5ec0e0cd9..8cd8c3415 100644 --- a/data/maps/PewterCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/PewterCity_PokemonCenter_1F/scripts.inc @@ -22,11 +22,11 @@ PewterCity_PokemonCenter_1F_EventScript_Jigglypuff:: @ 816A781 lock faceplayer fadeoutbgm 0 - playbgm MUS_PURIN, 0 + playbgm MUS_JIGGLYPUFF, 0 message PewterCity_Museum_1F_Text_Jigglypuff waitmessage delay 455 - playbgm MUS_POKECEN, 1 + playbgm MUS_POKE_CENTER, 1 release end diff --git a/data/maps/PewterCity_PokemonCenter_2F/map.json b/data/maps/PewterCity_PokemonCenter_2F/map.json index d080b6965..45d753045 100644 --- a/data/maps/PewterCity_PokemonCenter_2F/map.json +++ b/data/maps/PewterCity_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_PEWTER_CITY_POKEMON_CENTER_2F", "name": "PewterCity_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_PEWTER_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PokemonLeague_AgathasRoom/map.json b/data/maps/PokemonLeague_AgathasRoom/map.json index 87f9eb0a7..86fda6a3e 100644 --- a/data/maps/PokemonLeague_AgathasRoom/map.json +++ b/data/maps/PokemonLeague_AgathasRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_POKEMON_LEAGUE_AGATHAS_ROOM", "name": "PokemonLeague_AgathasRoom", "layout": "LAYOUT_POKEMON_LEAGUE_AGATHAS_ROOM", - "music": "MUS_P_TOWER", + "music": "MUS_POKE_TOWER", "region_map_section": "MAPSEC_POKEMON_LEAGUE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PokemonLeague_AgathasRoom/text.inc b/data/maps/PokemonLeague_AgathasRoom/text.inc index 06a8af142..dc1923238 100644 --- a/data/maps/PokemonLeague_AgathasRoom/text.inc +++ b/data/maps/PokemonLeague_AgathasRoom/text.inc @@ -11,7 +11,7 @@ PokemonLeague_AgathasRoom_Text_Intro:: @ 817844D .string "He's wrong.\n" .string "POKéMON are for battling!\p" .string "{PLAYER}! I'll show you how a real\n" - .string "TRAINER battles!{PLAY_BGM}{MUS_EXEYE}$" + .string "TRAINER battles!{PLAY_BGM}{MUS_ENCOUNTER_GYM_LEADER}$" PokemonLeague_AgathasRoom_Text_RematchIntro:: @ 817858D .string "I am AGATHA of the ELITE FOUR.\p" @@ -26,7 +26,7 @@ PokemonLeague_AgathasRoom_Text_RematchIntro:: @ 817858D .string "He's wrong.\n" .string "POKéMON are for battling!\p" .string "{PLAYER}! I'll show you how a real\n" - .string "TRAINER battles!{PLAY_BGM}{MUS_EXEYE}$" + .string "TRAINER battles!{PLAY_BGM}{MUS_ENCOUNTER_GYM_LEADER}$" PokemonLeague_AgathasRoom_Text_Defeat:: @ 81786D7 .string "Oh, my!\n" diff --git a/data/maps/PokemonLeague_BrunosRoom/map.json b/data/maps/PokemonLeague_BrunosRoom/map.json index bcc6a1155..cf1448886 100644 --- a/data/maps/PokemonLeague_BrunosRoom/map.json +++ b/data/maps/PokemonLeague_BrunosRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_POKEMON_LEAGUE_BRUNOS_ROOM", "name": "PokemonLeague_BrunosRoom", "layout": "LAYOUT_POKEMON_LEAGUE_BRUNOS_ROOM", - "music": "MUS_AJITO", + "music": "MUS_ROCKET_HIDEOUT", "region_map_section": "MAPSEC_POKEMON_LEAGUE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PokemonLeague_BrunosRoom/text.inc b/data/maps/PokemonLeague_BrunosRoom/text.inc index 4c6cb4561..a9a7ef5e1 100644 --- a/data/maps/PokemonLeague_BrunosRoom/text.inc +++ b/data/maps/PokemonLeague_BrunosRoom/text.inc @@ -9,7 +9,7 @@ PokemonLeague_BrunosRoom_Text_Intro:: @ 817820F .string "{PLAYER}!\p" .string "We will grind you down with our\n" .string "superior power!\p" - .string "Hoo hah!{PLAY_BGM}{MUS_EXEYE}$" + .string "Hoo hah!{PLAY_BGM}{MUS_ENCOUNTER_GYM_LEADER}$" PokemonLeague_BrunosRoom_Text_RematchIntro:: @ 817830C .string "I am BRUNO of the ELITE FOUR!\p" @@ -22,7 +22,7 @@ PokemonLeague_BrunosRoom_Text_RematchIntro:: @ 817830C .string "{PLAYER}!\p" .string "We will grind you down with our\n" .string "superior power!\p" - .string "Hoo hah!{PLAY_BGM}{MUS_EXEYE}$" + .string "Hoo hah!{PLAY_BGM}{MUS_ENCOUNTER_GYM_LEADER}$" PokemonLeague_BrunosRoom_Text_Defeat:: @ 8178409 .string "Why?\n" diff --git a/data/maps/PokemonLeague_ChampionsRoom/map.json b/data/maps/PokemonLeague_ChampionsRoom/map.json index a0480dbd5..a4c1da00f 100644 --- a/data/maps/PokemonLeague_ChampionsRoom/map.json +++ b/data/maps/PokemonLeague_ChampionsRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_POKEMON_LEAGUE_CHAMPIONS_ROOM", "name": "PokemonLeague_ChampionsRoom", "layout": "LAYOUT_POKEMON_LEAGUE_CHAMPIONS_ROOM", - "music": "MUS_CHAMP_R", + "music": "MUS_VICTORY_ROAD", "region_map_section": "MAPSEC_POKEMON_LEAGUE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc index 817991d5a..84879db66 100644 --- a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc +++ b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc @@ -61,7 +61,7 @@ PokemonLeague_ChampionsRoom_EventScript_EnterRoom:: @ 8162B76 goto_if_questlog PokemonLeague_ChampionsRoom_EventScript_QuestLogEnd setflag FLAG_TEMP_3 setflag FLAG_TEMP_5 - savebgm MUS_WIN_GYM + savebgm MUS_VICTORY_GYM_LEADER call_if_unset FLAG_SYS_CAN_LINK_WITH_RS, PokemonLeague_ChampionsRoom_EventScript_Battle call_if_set FLAG_SYS_CAN_LINK_WITH_RS, PokemonLeague_ChampionsRoom_EventScript_Rematch setflag FLAG_TEMP_4 @@ -69,7 +69,7 @@ PokemonLeague_ChampionsRoom_EventScript_EnterRoom:: @ 8162B76 setflag FLAG_DEFEATED_CHAMP setflag FLAG_TEMP_4 msgbox PokemonLeague_ChampionsRoom_Text_PostBattle - playbgm MUS_SLOWMASARA, 0 + playbgm MUS_SLOW_PALLET, 0 addobject LOCALID_PROF_OAK msgbox PokemonLeague_ChampionsRoom_Text_OakPlayer closemessage diff --git a/data/maps/PokemonLeague_HallOfFame/map.json b/data/maps/PokemonLeague_HallOfFame/map.json index 1b694e4fb..bbe302813 100644 --- a/data/maps/PokemonLeague_HallOfFame/map.json +++ b/data/maps/PokemonLeague_HallOfFame/map.json @@ -2,7 +2,7 @@ "id": "MAP_POKEMON_LEAGUE_HALL_OF_FAME", "name": "PokemonLeague_HallOfFame", "layout": "LAYOUT_POKEMON_LEAGUE_HALL_OF_FAME", - "music": "MUS_SLOWMASARA", + "music": "MUS_SLOW_PALLET", "region_map_section": "MAPSEC_POKEMON_LEAGUE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PokemonLeague_LancesRoom/map.json b/data/maps/PokemonLeague_LancesRoom/map.json index c112adb23..05c1daa01 100644 --- a/data/maps/PokemonLeague_LancesRoom/map.json +++ b/data/maps/PokemonLeague_LancesRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_POKEMON_LEAGUE_LANCES_ROOM", "name": "PokemonLeague_LancesRoom", "layout": "LAYOUT_POKEMON_LEAGUE_LANCES_ROOM", - "music": "MUS_CHAMP_R", + "music": "MUS_VICTORY_ROAD", "region_map_section": "MAPSEC_POKEMON_LEAGUE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PokemonLeague_LancesRoom/scripts.inc b/data/maps/PokemonLeague_LancesRoom/scripts.inc index 190e52d33..65afbdcb4 100644 --- a/data/maps/PokemonLeague_LancesRoom/scripts.inc +++ b/data/maps/PokemonLeague_LancesRoom/scripts.inc @@ -42,7 +42,7 @@ PokemonLeague_LancesRoom_EventScript_EnterRoom:: @ 8162987 waitmovement 0 setflag FLAG_TEMP_2 call PokemonLeague_LancesRoom_EventScript_SetEntryClosed - playse SE_KI_GASYAN + playse SE_UNLOCK special DrawWholeMapView waitse setvar VAR_MAP_SCENE_POKEMON_LEAGUE, 4 diff --git a/data/maps/PokemonLeague_LancesRoom/text.inc b/data/maps/PokemonLeague_LancesRoom/text.inc index 8c726875a..cef8c7712 100644 --- a/data/maps/PokemonLeague_LancesRoom/text.inc +++ b/data/maps/PokemonLeague_LancesRoom/text.inc @@ -12,7 +12,7 @@ PokemonLeague_LancesRoom_Text_Intro:: @ 8178764 .string "There's no being clever with them.\p" .string "Well, are you ready to lose?\p" .string "Your LEAGUE challenge ends with\n" - .string "me, {PLAYER}!{PLAY_BGM}{MUS_EXEYE}$" + .string "me, {PLAYER}!{PLAY_BGM}{MUS_ENCOUNTER_GYM_LEADER}$" PokemonLeague_LancesRoom_Text_RematchIntro:: @ 81788BD .string "Ah!\n" @@ -28,7 +28,7 @@ PokemonLeague_LancesRoom_Text_RematchIntro:: @ 81788BD .string "There's no being clever with them.\p" .string "Well, are you ready to lose?\p" .string "Your LEAGUE challenge ends with\n" - .string "me, {PLAYER}!{PLAY_BGM}{MUS_EXEYE}$" + .string "me, {PLAYER}!{PLAY_BGM}{MUS_ENCOUNTER_GYM_LEADER}$" PokemonLeague_LancesRoom_Text_Defeat:: @ 8178A15 .string "That's it!\p" diff --git a/data/maps/PokemonLeague_LoreleisRoom/text.inc b/data/maps/PokemonLeague_LoreleisRoom/text.inc index 55e67d764..be9ff69e2 100644 --- a/data/maps/PokemonLeague_LoreleisRoom/text.inc +++ b/data/maps/PokemonLeague_LoreleisRoom/text.inc @@ -7,7 +7,7 @@ PokemonLeague_LoreleisRoom_Text_Intro:: @ 8177FA4 .string "Your POKéMON will be at my mercy\n" .string "when they are frozen solid.\p" .string "Hahaha!\n" - .string "Are you ready?{PLAY_BGM}{MUS_EXEYE}$" + .string "Are you ready?{PLAY_BGM}{MUS_ENCOUNTER_GYM_LEADER}$" PokemonLeague_LoreleisRoom_Text_RematchIntro:: @ 8178089 .string "Welcome to the POKéMON LEAGUE.\p" @@ -20,7 +20,7 @@ PokemonLeague_LoreleisRoom_Text_RematchIntro:: @ 8178089 .string "Your POKéMON will be at my mercy\n" .string "when they are frozen solid.\p" .string "Hahaha!\n" - .string "Are you ready?{PLAY_BGM}{MUS_EXEYE}$" + .string "Are you ready?{PLAY_BGM}{MUS_ENCOUNTER_GYM_LEADER}$" PokemonLeague_LoreleisRoom_Text_Defeat:: @ 8178191 .string "…Things shouldn't be this way!$" diff --git a/data/maps/PokemonMansion_1F/map.json b/data/maps/PokemonMansion_1F/map.json index 1cbf97e80..d8ff775b8 100644 --- a/data/maps/PokemonMansion_1F/map.json +++ b/data/maps/PokemonMansion_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_POKEMON_MANSION_1F", "name": "PokemonMansion_1F", "layout": "LAYOUT_POKEMON_MANSION_1F", - "music": "MUS_POKEYASHI", + "music": "MUS_POKE_MANSION", "region_map_section": "MAPSEC_POKEMON_MANSION", "requires_flash": false, "weather": "WEATHER_SHADE", diff --git a/data/maps/PokemonMansion_1F/scripts.inc b/data/maps/PokemonMansion_1F/scripts.inc index cc071a6ac..38b41d545 100644 --- a/data/maps/PokemonMansion_1F/scripts.inc +++ b/data/maps/PokemonMansion_1F/scripts.inc @@ -15,7 +15,7 @@ PokemonMansion_1F_EventScript_Statue:: @ 8162212 lockall setvar VAR_0x8004, 0 call PokemonMansion_EventScript_SecretSwitch - playse SE_KI_GASYAN + playse SE_UNLOCK special DrawWholeMapView waitse releaseall diff --git a/data/maps/PokemonMansion_2F/map.json b/data/maps/PokemonMansion_2F/map.json index 2591840bc..6fb09a8e7 100644 --- a/data/maps/PokemonMansion_2F/map.json +++ b/data/maps/PokemonMansion_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_POKEMON_MANSION_2F", "name": "PokemonMansion_2F", "layout": "LAYOUT_POKEMON_MANSION_2F", - "music": "MUS_POKEYASHI", + "music": "MUS_POKE_MANSION", "region_map_section": "MAPSEC_POKEMON_MANSION", "requires_flash": false, "weather": "WEATHER_SHADE", diff --git a/data/maps/PokemonMansion_2F/scripts.inc b/data/maps/PokemonMansion_2F/scripts.inc index a6dd709a7..9a33853b4 100644 --- a/data/maps/PokemonMansion_2F/scripts.inc +++ b/data/maps/PokemonMansion_2F/scripts.inc @@ -10,7 +10,7 @@ PokemonMansion_2F_EventScript_Statue:: @ 8162264 lockall setvar VAR_0x8004, 1 call PokemonMansion_EventScript_SecretSwitch - playse SE_KI_GASYAN + playse SE_UNLOCK special DrawWholeMapView waitse releaseall diff --git a/data/maps/PokemonMansion_3F/map.json b/data/maps/PokemonMansion_3F/map.json index 6437b86b2..6ca394a7d 100644 --- a/data/maps/PokemonMansion_3F/map.json +++ b/data/maps/PokemonMansion_3F/map.json @@ -2,7 +2,7 @@ "id": "MAP_POKEMON_MANSION_3F", "name": "PokemonMansion_3F", "layout": "LAYOUT_POKEMON_MANSION_3F", - "music": "MUS_POKEYASHI", + "music": "MUS_POKE_MANSION", "region_map_section": "MAPSEC_POKEMON_MANSION", "requires_flash": false, "weather": "WEATHER_SHADE", diff --git a/data/maps/PokemonMansion_3F/scripts.inc b/data/maps/PokemonMansion_3F/scripts.inc index dd7667161..71ba27874 100644 --- a/data/maps/PokemonMansion_3F/scripts.inc +++ b/data/maps/PokemonMansion_3F/scripts.inc @@ -10,7 +10,7 @@ PokemonMansion_3F_EventScript_Statue:: @ 81622B1 lockall setvar VAR_0x8004, 2 call PokemonMansion_EventScript_SecretSwitch - playse SE_KI_GASYAN + playse SE_UNLOCK special DrawWholeMapView waitse releaseall diff --git a/data/maps/PokemonMansion_B1F/map.json b/data/maps/PokemonMansion_B1F/map.json index 32595b885..4f4ad6ea1 100644 --- a/data/maps/PokemonMansion_B1F/map.json +++ b/data/maps/PokemonMansion_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_POKEMON_MANSION_B1F", "name": "PokemonMansion_B1F", "layout": "LAYOUT_POKEMON_MANSION_B1F", - "music": "MUS_POKEYASHI", + "music": "MUS_POKE_MANSION", "region_map_section": "MAPSEC_POKEMON_MANSION", "requires_flash": false, "weather": "WEATHER_SHADE", diff --git a/data/maps/PokemonMansion_B1F/scripts.inc b/data/maps/PokemonMansion_B1F/scripts.inc index 5f749fc24..c522096e1 100644 --- a/data/maps/PokemonMansion_B1F/scripts.inc +++ b/data/maps/PokemonMansion_B1F/scripts.inc @@ -10,7 +10,7 @@ PokemonMansion_B1F_EventScript_Statue:: @ 816230C lockall setvar VAR_0x8004, 3 call PokemonMansion_EventScript_SecretSwitch - playse SE_KI_GASYAN + playse SE_UNLOCK special DrawWholeMapView waitse releaseall diff --git a/data/maps/PokemonTower_1F/map.json b/data/maps/PokemonTower_1F/map.json index fd5d75c8b..b0d8cafa2 100644 --- a/data/maps/PokemonTower_1F/map.json +++ b/data/maps/PokemonTower_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_POKEMON_TOWER_1F", "name": "PokemonTower_1F", "layout": "LAYOUT_POKEMON_TOWER_1F", - "music": "MUS_P_TOWER", + "music": "MUS_POKE_TOWER", "region_map_section": "MAPSEC_POKEMON_TOWER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PokemonTower_2F/map.json b/data/maps/PokemonTower_2F/map.json index 527af409c..36281aa79 100644 --- a/data/maps/PokemonTower_2F/map.json +++ b/data/maps/PokemonTower_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_POKEMON_TOWER_2F", "name": "PokemonTower_2F", "layout": "LAYOUT_POKEMON_TOWER_2F", - "music": "MUS_P_TOWER", + "music": "MUS_POKE_TOWER", "region_map_section": "MAPSEC_POKEMON_TOWER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PokemonTower_2F/scripts.inc b/data/maps/PokemonTower_2F/scripts.inc index 0042290c1..20cbe6090 100644 --- a/data/maps/PokemonTower_2F/scripts.inc +++ b/data/maps/PokemonTower_2F/scripts.inc @@ -19,7 +19,7 @@ PokemonTower_2F_EventScript_RivalTriggerDown:: @ 816329B PokemonTower_2F_EventScript_Rival:: @ 81632A7 textcolor 0 - playbgm MUS_RIVAL1, 0 + playbgm MUS_ENCOUNTER_RIVAL, 0 compare VAR_TEMP_1, 0 call_if_eq PokemonTower_2F_EventScript_RivalFacePlayerRight compare VAR_TEMP_1, 1 @@ -38,12 +38,12 @@ PokemonTower_2F_EventScript_Rival:: @ 81632A7 call_if_eq PokemonTower_2F_EventScript_RivalCharmander msgbox PokemonTower_2F_Text_RivalPostBattle closemessage - playbgm MUS_RIVAL2, 0 + playbgm MUS_RIVAL_EXIT, 0 compare VAR_TEMP_1, 0 call_if_eq PokemonTower_2F_EventScript_RivalExitRight compare VAR_TEMP_1, 1 call_if_eq PokemonTower_2F_EventScript_RivalExitDown - playse SE_KAIDAN + playse SE_EXIT delay 25 fadedefaultbgm removeobject 1 diff --git a/data/maps/PokemonTower_3F/map.json b/data/maps/PokemonTower_3F/map.json index af3480839..ee15b4a68 100644 --- a/data/maps/PokemonTower_3F/map.json +++ b/data/maps/PokemonTower_3F/map.json @@ -2,7 +2,7 @@ "id": "MAP_POKEMON_TOWER_3F", "name": "PokemonTower_3F", "layout": "LAYOUT_POKEMON_TOWER_3F", - "music": "MUS_P_TOWER", + "music": "MUS_POKE_TOWER", "region_map_section": "MAPSEC_POKEMON_TOWER", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", diff --git a/data/maps/PokemonTower_4F/map.json b/data/maps/PokemonTower_4F/map.json index d7104bc15..7924b4f3c 100644 --- a/data/maps/PokemonTower_4F/map.json +++ b/data/maps/PokemonTower_4F/map.json @@ -2,7 +2,7 @@ "id": "MAP_POKEMON_TOWER_4F", "name": "PokemonTower_4F", "layout": "LAYOUT_POKEMON_TOWER_4F", - "music": "MUS_P_TOWER", + "music": "MUS_POKE_TOWER", "region_map_section": "MAPSEC_POKEMON_TOWER", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", diff --git a/data/maps/PokemonTower_5F/map.json b/data/maps/PokemonTower_5F/map.json index bd22d3bff..9f74a6aab 100644 --- a/data/maps/PokemonTower_5F/map.json +++ b/data/maps/PokemonTower_5F/map.json @@ -2,7 +2,7 @@ "id": "MAP_POKEMON_TOWER_5F", "name": "PokemonTower_5F", "layout": "LAYOUT_POKEMON_TOWER_5F", - "music": "MUS_P_TOWER", + "music": "MUS_POKE_TOWER", "region_map_section": "MAPSEC_POKEMON_TOWER", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", diff --git a/data/maps/PokemonTower_6F/map.json b/data/maps/PokemonTower_6F/map.json index a9bd74228..ae72e35e6 100644 --- a/data/maps/PokemonTower_6F/map.json +++ b/data/maps/PokemonTower_6F/map.json @@ -2,7 +2,7 @@ "id": "MAP_POKEMON_TOWER_6F", "name": "PokemonTower_6F", "layout": "LAYOUT_POKEMON_TOWER_6F", - "music": "MUS_P_TOWER", + "music": "MUS_POKE_TOWER", "region_map_section": "MAPSEC_POKEMON_TOWER", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", diff --git a/data/maps/PokemonTower_7F/map.json b/data/maps/PokemonTower_7F/map.json index deaaab14d..327b9311b 100644 --- a/data/maps/PokemonTower_7F/map.json +++ b/data/maps/PokemonTower_7F/map.json @@ -2,7 +2,7 @@ "id": "MAP_POKEMON_TOWER_7F", "name": "PokemonTower_7F", "layout": "LAYOUT_POKEMON_TOWER_7F", - "music": "MUS_P_TOWER", + "music": "MUS_POKE_TOWER", "region_map_section": "MAPSEC_POKEMON_TOWER", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", diff --git a/data/maps/PokemonTower_7F/scripts.inc b/data/maps/PokemonTower_7F/scripts.inc index 7b0d5f37a..12f69cedf 100644 --- a/data/maps/PokemonTower_7F/scripts.inc +++ b/data/maps/PokemonTower_7F/scripts.inc @@ -50,7 +50,7 @@ PokemonTower_7F_EventScript_Grunt1ExitRight:: @ 81635F0 PokemonTower_7F_EventScript_Grunt1ExitLeft:: @ 8163600 applymovement 2, PokemonTower_7F_Movement_Grunt1ExitLeft waitmovement 0 - playse SE_KAIDAN + playse SE_EXIT delay 25 goto PokemonTower_7F_EventScript_RemoveGrunt1 end diff --git a/data/maps/PowerPlant/map.json b/data/maps/PowerPlant/map.json index 3e92c9ebc..f019d6320 100644 --- a/data/maps/PowerPlant/map.json +++ b/data/maps/PowerPlant/map.json @@ -2,7 +2,7 @@ "id": "MAP_POWER_PLANT", "name": "PowerPlant", "layout": "LAYOUT_POWER_PLANT", - "music": "MUS_POKEYASHI", + "music": "MUS_POKE_MANSION", "region_map_section": "MAPSEC_POWER_PLANT", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PowerPlant/scripts.inc b/data/maps/PowerPlant/scripts.inc index ad6d3fe6a..1cbd06d48 100644 --- a/data/maps/PowerPlant/scripts.inc +++ b/data/maps/PowerPlant/scripts.inc @@ -45,7 +45,7 @@ PowerPlant_EventScript_Zapdos:: @ 81637B8 waitmessage waitmoncry delay 10 - playbgm MUS_EXEYE, 0 + playbgm MUS_ENCOUNTER_GYM_LEADER, 0 waitbuttonpress setflag FLAG_SYS_SPECIAL_WILD_BATTLE special StartLegendaryBattle diff --git a/data/maps/Prototype_SeviiIsle_6/map.json b/data/maps/Prototype_SeviiIsle_6/map.json index 761c204ce..8f83fc5da 100644 --- a/data/maps/Prototype_SeviiIsle_6/map.json +++ b/data/maps/Prototype_SeviiIsle_6/map.json @@ -2,7 +2,7 @@ "id": "MAP_PROTOTYPE_SEVII_ISLE_6", "name": "Prototype_SeviiIsle_6", "layout": "LAYOUT_PROTOTYPE_SEVII_ISLE_6", - "music": "MUS_NANASHIMA", + "music": "MUS_SEVII_ROUTE", "region_map_section": "MAPSEC_SEVII_ISLE_6", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Prototype_SeviiIsle_7/map.json b/data/maps/Prototype_SeviiIsle_7/map.json index 856883c02..d7260198e 100644 --- a/data/maps/Prototype_SeviiIsle_7/map.json +++ b/data/maps/Prototype_SeviiIsle_7/map.json @@ -2,7 +2,7 @@ "id": "MAP_PROTOTYPE_SEVII_ISLE_7", "name": "Prototype_SeviiIsle_7", "layout": "LAYOUT_PROTOTYPE_SEVII_ISLE_7", - "music": "MUS_NANASHIMA", + "music": "MUS_SEVII_ROUTE", "region_map_section": "MAPSEC_SEVII_ISLE_7", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Prototype_SeviiIsle_8/map.json b/data/maps/Prototype_SeviiIsle_8/map.json index dd05d6d35..758aaf8d8 100644 --- a/data/maps/Prototype_SeviiIsle_8/map.json +++ b/data/maps/Prototype_SeviiIsle_8/map.json @@ -2,7 +2,7 @@ "id": "MAP_PROTOTYPE_SEVII_ISLE_8", "name": "Prototype_SeviiIsle_8", "layout": "LAYOUT_PROTOTYPE_SEVII_ISLE_8", - "music": "MUS_NANASHIMA", + "music": "MUS_SEVII_ROUTE", "region_map_section": "MAPSEC_SEVII_ISLE_8", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Prototype_SeviiIsle_9/map.json b/data/maps/Prototype_SeviiIsle_9/map.json index b03f3866c..22ab85069 100644 --- a/data/maps/Prototype_SeviiIsle_9/map.json +++ b/data/maps/Prototype_SeviiIsle_9/map.json @@ -2,7 +2,7 @@ "id": "MAP_PROTOTYPE_SEVII_ISLE_9", "name": "Prototype_SeviiIsle_9", "layout": "LAYOUT_PROTOTYPE_SEVII_ISLE_9", - "music": "MUS_NANASHIMA", + "music": "MUS_SEVII_ROUTE", "region_map_section": "MAPSEC_SEVII_ISLE_9", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/RecordCenter/map.json b/data/maps/RecordCenter/map.json index ad4308513..710a91832 100644 --- a/data/maps/RecordCenter/map.json +++ b/data/maps/RecordCenter/map.json @@ -2,7 +2,7 @@ "id": "MAP_RECORD_CENTER", "name": "RecordCenter", "layout": "LAYOUT_RECORD_CENTER", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_SPECIAL_AREA", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RockTunnel_1F/map.json b/data/maps/RockTunnel_1F/map.json index b248fccdb..2c0ae4315 100644 --- a/data/maps/RockTunnel_1F/map.json +++ b/data/maps/RockTunnel_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROCK_TUNNEL_1F", "name": "RockTunnel_1F", "layout": "LAYOUT_ROCK_TUNNEL_1F", - "music": "MUS_OTSUKIMI", + "music": "MUS_MT_MOON", "region_map_section": "MAPSEC_ROCK_TUNNEL", "requires_flash": true, "weather": "WEATHER_NONE", diff --git a/data/maps/RockTunnel_B1F/map.json b/data/maps/RockTunnel_B1F/map.json index c1b86c78f..186cd6336 100644 --- a/data/maps/RockTunnel_B1F/map.json +++ b/data/maps/RockTunnel_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROCK_TUNNEL_B1F", "name": "RockTunnel_B1F", "layout": "LAYOUT_ROCK_TUNNEL_B1F", - "music": "MUS_OTSUKIMI", + "music": "MUS_MT_MOON", "region_map_section": "MAPSEC_ROCK_TUNNEL", "requires_flash": true, "weather": "WEATHER_NONE", diff --git a/data/maps/RocketHideout_B1F/map.json b/data/maps/RocketHideout_B1F/map.json index 47c8f7b08..54cf4bdef 100644 --- a/data/maps/RocketHideout_B1F/map.json +++ b/data/maps/RocketHideout_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROCKET_HIDEOUT_B1F", "name": "RocketHideout_B1F", "layout": "LAYOUT_ROCKET_HIDEOUT_B1F", - "music": "MUS_AJITO", + "music": "MUS_ROCKET_HIDEOUT", "region_map_section": "MAPSEC_ROCKET_HIDEOUT", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RocketHideout_B1F/scripts.inc b/data/maps/RocketHideout_B1F/scripts.inc index 6149ac0c2..efc2c17a2 100644 --- a/data/maps/RocketHideout_B1F/scripts.inc +++ b/data/maps/RocketHideout_B1F/scripts.inc @@ -38,7 +38,7 @@ RocketHideout_B1F_EventScript_Grunt5:: @ 816120A RocketHideout_B1F_EventScript_DefeatedGrunt5:: @ 8161225 call RocketHideout_B1F_EventScript_RemoveBarrier - playse SE_KI_GASYAN + playse SE_UNLOCK special DrawWholeMapView waitse release diff --git a/data/maps/RocketHideout_B2F/map.json b/data/maps/RocketHideout_B2F/map.json index 88d13e88a..9cdb75e2a 100644 --- a/data/maps/RocketHideout_B2F/map.json +++ b/data/maps/RocketHideout_B2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROCKET_HIDEOUT_B2F", "name": "RocketHideout_B2F", "layout": "LAYOUT_ROCKET_HIDEOUT_B2F", - "music": "MUS_AJITO", + "music": "MUS_ROCKET_HIDEOUT", "region_map_section": "MAPSEC_ROCKET_HIDEOUT", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RocketHideout_B3F/map.json b/data/maps/RocketHideout_B3F/map.json index 0127e1f5d..5ab261edf 100644 --- a/data/maps/RocketHideout_B3F/map.json +++ b/data/maps/RocketHideout_B3F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROCKET_HIDEOUT_B3F", "name": "RocketHideout_B3F", "layout": "LAYOUT_ROCKET_HIDEOUT_B3F", - "music": "MUS_AJITO", + "music": "MUS_ROCKET_HIDEOUT", "region_map_section": "MAPSEC_ROCKET_HIDEOUT", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RocketHideout_B4F/map.json b/data/maps/RocketHideout_B4F/map.json index cce2d5ebf..0e55fb111 100644 --- a/data/maps/RocketHideout_B4F/map.json +++ b/data/maps/RocketHideout_B4F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROCKET_HIDEOUT_B4F", "name": "RocketHideout_B4F", "layout": "LAYOUT_ROCKET_HIDEOUT_B4F", - "music": "MUS_AJITO", + "music": "MUS_ROCKET_HIDEOUT", "region_map_section": "MAPSEC_ROCKET_HIDEOUT", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RocketHideout_B4F/scripts.inc b/data/maps/RocketHideout_B4F/scripts.inc index 5919b342f..820325485 100644 --- a/data/maps/RocketHideout_B4F/scripts.inc +++ b/data/maps/RocketHideout_B4F/scripts.inc @@ -26,7 +26,7 @@ RocketHideout_B4F_EventScript_Giovanni:: @ 8161317 famechecker FAMECHECKER_GIOVANNI, 0 message RocketHideout_B4F_Text_GiovanniIntro waitmessage - playbgm MUS_ROCKET, 0 + playbgm MUS_ENCOUNTER_ROCKET, 0 waitbuttonpress trainerbattle_no_intro TRAINER_BOSS_GIOVANNI, RocketHideout_B4F_Text_GiovanniDefeat msgbox RocketHideout_B4F_Text_GiovanniPostBattle @@ -108,7 +108,7 @@ RocketHideout_B4F_EventScript_DefeatedGrunt3:: @ 8161433 end RocketHideout_B4F_EventScript_DrawMapForBarrierRemoval:: @ 8161462 - playse SE_KI_GASYAN + playse SE_UNLOCK special DrawWholeMapView waitse return diff --git a/data/maps/RocketHideout_Elevator/map.json b/data/maps/RocketHideout_Elevator/map.json index 746d61db2..71a762a19 100644 --- a/data/maps/RocketHideout_Elevator/map.json +++ b/data/maps/RocketHideout_Elevator/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROCKET_HIDEOUT_ELEVATOR", "name": "RocketHideout_Elevator", "layout": "LAYOUT_ROCKET_HIDEOUT_ELEVATOR", - "music": "MUS_AJITO", + "music": "MUS_ROCKET_HIDEOUT", "region_map_section": "MAPSEC_ROCKET_HIDEOUT", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route1/map.json b/data/maps/Route1/map.json index e0d5f8b73..96878b73b 100644 --- a/data/maps/Route1/map.json +++ b/data/maps/Route1/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE1", "name": "Route1", "layout": "LAYOUT_ROUTE1", - "music": "MUS_LOAD01", + "music": "MUS_ROUTE1", "region_map_section": "MAPSEC_ROUTE_1", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route1/scripts.inc b/data/maps/Route1/scripts.inc index aaea71eaf..8004f3626 100644 --- a/data/maps/Route1/scripts.inc +++ b/data/maps/Route1/scripts.inc @@ -11,7 +11,7 @@ Route1_EventScript_MartClerk:: @ 8167EFE compare VAR_RESULT, FALSE goto_if_eq EventScript_BagIsFull getitemname 1, ITEM_POTION - playfanfare MUS_FANFA1 + playfanfare MUS_LEVEL_UP message Text_ObtainedTheX waitmessage waitfanfare diff --git a/data/maps/Route10/map.json b/data/maps/Route10/map.json index 748ec3d2a..9c82434fb 100644 --- a/data/maps/Route10/map.json +++ b/data/maps/Route10/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE10", "name": "Route10", "layout": "LAYOUT_ROUTE10", - "music": "MUS_LOAD02", + "music": "MUS_ROUTE3", "region_map_section": "MAPSEC_ROUTE_10", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route10_PokemonCenter_1F/map.json b/data/maps/Route10_PokemonCenter_1F/map.json index dc4978cc6..b8c0aa7ed 100644 --- a/data/maps/Route10_PokemonCenter_1F/map.json +++ b/data/maps/Route10_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE10_POKEMON_CENTER_1F", "name": "Route10_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_ROUTE_10", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route10_PokemonCenter_2F/map.json b/data/maps/Route10_PokemonCenter_2F/map.json index 33dcdb91b..665f25678 100644 --- a/data/maps/Route10_PokemonCenter_2F/map.json +++ b/data/maps/Route10_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE10_POKEMON_CENTER_2F", "name": "Route10_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_ROUTE_10", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route11/map.json b/data/maps/Route11/map.json index 37d3efa5d..c948dcfc4 100644 --- a/data/maps/Route11/map.json +++ b/data/maps/Route11/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE11", "name": "Route11", "layout": "LAYOUT_ROUTE11", - "music": "MUS_LOAD03", + "music": "MUS_ROUTE11", "region_map_section": "MAPSEC_ROUTE_11", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route11_EastEntrance_1F/map.json b/data/maps/Route11_EastEntrance_1F/map.json index e404237d0..4063642d2 100644 --- a/data/maps/Route11_EastEntrance_1F/map.json +++ b/data/maps/Route11_EastEntrance_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE11_EAST_ENTRANCE_1F", "name": "Route11_EastEntrance_1F", "layout": "LAYOUT_ENTRANCE_1F", - "music": "MUS_KUCHIBA", + "music": "MUS_VERMILLION", "region_map_section": "MAPSEC_ROUTE_11", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route11_EastEntrance_2F/map.json b/data/maps/Route11_EastEntrance_2F/map.json index e085ea030..ae37f03ea 100644 --- a/data/maps/Route11_EastEntrance_2F/map.json +++ b/data/maps/Route11_EastEntrance_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE11_EAST_ENTRANCE_2F", "name": "Route11_EastEntrance_2F", "layout": "LAYOUT_ENTRANCE_2F", - "music": "MUS_KUCHIBA", + "music": "MUS_VERMILLION", "region_map_section": "MAPSEC_ROUTE_11", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route12/map.json b/data/maps/Route12/map.json index fefbe4f9c..49f08179c 100644 --- a/data/maps/Route12/map.json +++ b/data/maps/Route12/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE12", "name": "Route12", "layout": "LAYOUT_ROUTE12", - "music": "MUS_LOAD03", + "music": "MUS_ROUTE11", "region_map_section": "MAPSEC_ROUTE_12", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route12_FishingHouse/map.json b/data/maps/Route12_FishingHouse/map.json index a2546ccc6..1ae854e05 100644 --- a/data/maps/Route12_FishingHouse/map.json +++ b/data/maps/Route12_FishingHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE12_FISHING_HOUSE", "name": "Route12_FishingHouse", "layout": "LAYOUT_HOUSE4", - "music": "MUS_TAMAMUSI", + "music": "MUS_CELADON", "region_map_section": "MAPSEC_ROUTE_12", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route12_NorthEntrance_1F/map.json b/data/maps/Route12_NorthEntrance_1F/map.json index a5314bb34..552880a86 100644 --- a/data/maps/Route12_NorthEntrance_1F/map.json +++ b/data/maps/Route12_NorthEntrance_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE12_NORTH_ENTRANCE_1F", "name": "Route12_NorthEntrance_1F", "layout": "LAYOUT_ROUTE12_NORTH_ENTRANCE_1F", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_ROUTE_12", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route12_NorthEntrance_2F/map.json b/data/maps/Route12_NorthEntrance_2F/map.json index 95dc0469c..192b2f407 100644 --- a/data/maps/Route12_NorthEntrance_2F/map.json +++ b/data/maps/Route12_NorthEntrance_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE12_NORTH_ENTRANCE_2F", "name": "Route12_NorthEntrance_2F", "layout": "LAYOUT_ENTRANCE_2F", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_ROUTE_12", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route13/map.json b/data/maps/Route13/map.json index 01c83ca04..d22b8fe8b 100644 --- a/data/maps/Route13/map.json +++ b/data/maps/Route13/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE13", "name": "Route13", "layout": "LAYOUT_ROUTE13", - "music": "MUS_LOAD03", + "music": "MUS_ROUTE11", "region_map_section": "MAPSEC_ROUTE_13", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route14/map.json b/data/maps/Route14/map.json index 2f6d7cd79..212b190b0 100644 --- a/data/maps/Route14/map.json +++ b/data/maps/Route14/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE14", "name": "Route14", "layout": "LAYOUT_ROUTE14", - "music": "MUS_LOAD03", + "music": "MUS_ROUTE11", "region_map_section": "MAPSEC_ROUTE_14", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route15/map.json b/data/maps/Route15/map.json index fee9bd531..df6d62329 100644 --- a/data/maps/Route15/map.json +++ b/data/maps/Route15/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE15", "name": "Route15", "layout": "LAYOUT_ROUTE15", - "music": "MUS_LOAD03", + "music": "MUS_ROUTE11", "region_map_section": "MAPSEC_ROUTE_15", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route15_WestEntrance_1F/map.json b/data/maps/Route15_WestEntrance_1F/map.json index a48784931..1317b92f8 100644 --- a/data/maps/Route15_WestEntrance_1F/map.json +++ b/data/maps/Route15_WestEntrance_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE15_WEST_ENTRANCE_1F", "name": "Route15_WestEntrance_1F", "layout": "LAYOUT_ENTRANCE_1F", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_ROUTE_15", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route15_WestEntrance_2F/map.json b/data/maps/Route15_WestEntrance_2F/map.json index f91635160..1bba0494e 100644 --- a/data/maps/Route15_WestEntrance_2F/map.json +++ b/data/maps/Route15_WestEntrance_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE15_WEST_ENTRANCE_2F", "name": "Route15_WestEntrance_2F", "layout": "LAYOUT_ENTRANCE_2F", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_ROUTE_15", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route16/map.json b/data/maps/Route16/map.json index 8cc2f36e2..3b63483b2 100644 --- a/data/maps/Route16/map.json +++ b/data/maps/Route16/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE16", "name": "Route16", "layout": "LAYOUT_ROUTE16", - "music": "MUS_LOAD02", + "music": "MUS_ROUTE3", "region_map_section": "MAPSEC_ROUTE_16", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route16_House/map.json b/data/maps/Route16_House/map.json index 875a14cef..f8bd335b3 100644 --- a/data/maps/Route16_House/map.json +++ b/data/maps/Route16_House/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE16_HOUSE", "name": "Route16_House", "layout": "LAYOUT_HOUSE1", - "music": "MUS_TAMAMUSI", + "music": "MUS_CELADON", "region_map_section": "MAPSEC_ROUTE_16", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route16_NorthEntrance_1F/map.json b/data/maps/Route16_NorthEntrance_1F/map.json index 2eb8919d0..d79f1d50b 100644 --- a/data/maps/Route16_NorthEntrance_1F/map.json +++ b/data/maps/Route16_NorthEntrance_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE16_NORTH_ENTRANCE_1F", "name": "Route16_NorthEntrance_1F", "layout": "LAYOUT_ROUTE16_NORTH_ENTRANCE_1F", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_ROUTE_16", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route16_NorthEntrance_2F/map.json b/data/maps/Route16_NorthEntrance_2F/map.json index 00562e86d..bf37d4ab4 100644 --- a/data/maps/Route16_NorthEntrance_2F/map.json +++ b/data/maps/Route16_NorthEntrance_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE16_NORTH_ENTRANCE_2F", "name": "Route16_NorthEntrance_2F", "layout": "LAYOUT_ENTRANCE_2F", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_ROUTE_16", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route17/map.json b/data/maps/Route17/map.json index 3af5c7379..7218a151b 100644 --- a/data/maps/Route17/map.json +++ b/data/maps/Route17/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE17", "name": "Route17", "layout": "LAYOUT_ROUTE17", - "music": "MUS_LOAD02", + "music": "MUS_ROUTE3", "region_map_section": "MAPSEC_ROUTE_17", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route18/map.json b/data/maps/Route18/map.json index 339e931b5..28e35b7a3 100644 --- a/data/maps/Route18/map.json +++ b/data/maps/Route18/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE18", "name": "Route18", "layout": "LAYOUT_ROUTE18", - "music": "MUS_LOAD02", + "music": "MUS_ROUTE3", "region_map_section": "MAPSEC_ROUTE_18", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route18_EastEntrance_1F/map.json b/data/maps/Route18_EastEntrance_1F/map.json index 370a52737..0cd6eaa19 100644 --- a/data/maps/Route18_EastEntrance_1F/map.json +++ b/data/maps/Route18_EastEntrance_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE18_EAST_ENTRANCE_1F", "name": "Route18_EastEntrance_1F", "layout": "LAYOUT_ENTRANCE_1F", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_ROUTE_18", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route18_EastEntrance_2F/map.json b/data/maps/Route18_EastEntrance_2F/map.json index 04642eddf..80b9973f6 100644 --- a/data/maps/Route18_EastEntrance_2F/map.json +++ b/data/maps/Route18_EastEntrance_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE18_EAST_ENTRANCE_2F", "name": "Route18_EastEntrance_2F", "layout": "LAYOUT_ENTRANCE_2F", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_ROUTE_18", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route19/map.json b/data/maps/Route19/map.json index fbd12ad37..5fc1f6821 100644 --- a/data/maps/Route19/map.json +++ b/data/maps/Route19/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE19", "name": "Route19", "layout": "LAYOUT_ROUTE19", - "music": "MUS_LOAD02", + "music": "MUS_ROUTE3", "region_map_section": "MAPSEC_ROUTE_19", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route2/map.json b/data/maps/Route2/map.json index 6f9ae1327..6ad6a8e57 100644 --- a/data/maps/Route2/map.json +++ b/data/maps/Route2/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE2", "name": "Route2", "layout": "LAYOUT_ROUTE2", - "music": "MUS_LOAD01", + "music": "MUS_ROUTE1", "region_map_section": "MAPSEC_ROUTE_2", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route20/map.json b/data/maps/Route20/map.json index cb92a2361..0f606647d 100644 --- a/data/maps/Route20/map.json +++ b/data/maps/Route20/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE20", "name": "Route20", "layout": "LAYOUT_ROUTE20", - "music": "MUS_LOAD02", + "music": "MUS_ROUTE3", "region_map_section": "MAPSEC_ROUTE_20", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route21_North/map.json b/data/maps/Route21_North/map.json index b651f0c16..33d256f6e 100644 --- a/data/maps/Route21_North/map.json +++ b/data/maps/Route21_North/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE21_NORTH", "name": "Route21_North", "layout": "LAYOUT_ROUTE21_NORTH", - "music": "MUS_LOAD02", + "music": "MUS_ROUTE3", "region_map_section": "MAPSEC_ROUTE_21", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route21_South/map.json b/data/maps/Route21_South/map.json index 21cf0b51b..f5e648729 100644 --- a/data/maps/Route21_South/map.json +++ b/data/maps/Route21_South/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE21_SOUTH", "name": "Route21_South", "layout": "LAYOUT_ROUTE21_SOUTH", - "music": "MUS_LOAD02", + "music": "MUS_ROUTE3", "region_map_section": "MAPSEC_ROUTE_21", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route22/map.json b/data/maps/Route22/map.json index 00ac3625a..a00677beb 100644 --- a/data/maps/Route22/map.json +++ b/data/maps/Route22/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE22", "name": "Route22", "layout": "LAYOUT_ROUTE22", - "music": "MUS_LOAD02", + "music": "MUS_ROUTE3", "region_map_section": "MAPSEC_ROUTE_22", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route22/scripts.inc b/data/maps/Route22/scripts.inc index dbc10e129..177269724 100644 --- a/data/maps/Route22/scripts.inc +++ b/data/maps/Route22/scripts.inc @@ -23,7 +23,7 @@ Route22_EventScript_EarlyRivalTriggerBottom:: @ 81682AB Route22_EventScript_EarlyRival:: @ 81682BE textcolor 0 - playbgm MUS_RIVAL1, 0 + playbgm MUS_ENCOUNTER_RIVAL, 0 addobject 1 compare VAR_TEMP_1, 0 call_if_eq Route22_EventScript_EarlyRivalApproach @@ -42,7 +42,7 @@ Route22_EventScript_EarlyRival:: @ 81682BE msgbox Route22_Text_EarlyRivalPostBattle closemessage delay 10 - playbgm MUS_RIVAL2, 0 + playbgm MUS_RIVAL_EXIT, 0 compare VAR_TEMP_1, 0 call_if_eq Route22_EventScript_EarlyRivalExit compare VAR_TEMP_1, 1 @@ -183,7 +183,7 @@ Route22_EventScript_LateRivalTriggerBottom:: @ 816840C Route22_EventScript_LateRival:: @ 816841F textcolor 0 - playbgm MUS_RIVAL1, 0 + playbgm MUS_ENCOUNTER_RIVAL, 0 addobject 1 compare VAR_TEMP_1, 0 call_if_eq Route22_EventScript_LateRivalApproach @@ -202,7 +202,7 @@ Route22_EventScript_LateRival:: @ 816841F msgbox Route22_Text_LateRivalPostBattle closemessage delay 10 - playbgm MUS_RIVAL2, 0 + playbgm MUS_RIVAL_EXIT, 0 applymovement 1, Route22_Movement_LateRivalExit waitmovement 0 fadedefaultbgm diff --git a/data/maps/Route22_NorthEntrance/map.json b/data/maps/Route22_NorthEntrance/map.json index 23de05134..7367db717 100644 --- a/data/maps/Route22_NorthEntrance/map.json +++ b/data/maps/Route22_NorthEntrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE22_NORTH_ENTRANCE", "name": "Route22_NorthEntrance", "layout": "LAYOUT_ROUTE22_NORTH_ENTRANCE", - "music": "MUS_T_MORI", + "music": "MUS_VIRIDIAN_FOREST", "region_map_section": "MAPSEC_ROUTE_22", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route23/map.json b/data/maps/Route23/map.json index 3f2de59e9..01889aff9 100644 --- a/data/maps/Route23/map.json +++ b/data/maps/Route23/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE23", "name": "Route23", "layout": "LAYOUT_ROUTE23", - "music": "MUS_CHAMP_R", + "music": "MUS_VICTORY_ROAD", "region_map_section": "MAPSEC_ROUTE_23", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route24/map.json b/data/maps/Route24/map.json index 0cd897e8c..d3e00bab0 100644 --- a/data/maps/Route24/map.json +++ b/data/maps/Route24/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE24", "name": "Route24", "layout": "LAYOUT_ROUTE24", - "music": "MUS_OPENING", + "music": "MUS_ROUTE24", "region_map_section": "MAPSEC_ROUTE_24", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route24/scripts.inc b/data/maps/Route24/scripts.inc index 7a22f64e8..abaa43b47 100644 --- a/data/maps/Route24/scripts.inc +++ b/data/maps/Route24/scripts.inc @@ -58,7 +58,7 @@ Route24_EventScript_BattleRocket:: @ 81686B9 giveitem_msg Route24_Text_ReceivedNuggetFromMysteryTrainer, ITEM_NUGGET message Route24_Text_JoinTeamRocket waitmessage - playbgm MUS_ROCKET, 0 + playbgm MUS_ENCOUNTER_ROCKET, 0 waitbuttonpress setvar VAR_LAST_TALKED, LOCALID_ROCKET trainerbattle_no_intro TRAINER_TEAM_ROCKET_GRUNT_6, Route24_Text_RocketDefeat diff --git a/data/maps/Route25/map.json b/data/maps/Route25/map.json index c716acec5..8f93b33a7 100644 --- a/data/maps/Route25/map.json +++ b/data/maps/Route25/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE25", "name": "Route25", "layout": "LAYOUT_ROUTE25", - "music": "MUS_OPENING", + "music": "MUS_ROUTE24", "region_map_section": "MAPSEC_ROUTE_25", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route25_SeaCottage/map.json b/data/maps/Route25_SeaCottage/map.json index 6a10da883..60a490867 100644 --- a/data/maps/Route25_SeaCottage/map.json +++ b/data/maps/Route25_SeaCottage/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE25_SEA_COTTAGE", "name": "Route25_SeaCottage", "layout": "LAYOUT_ROUTE25_SEA_COTTAGE", - "music": "MUS_HANADA", + "music": "MUS_FUCHSIA", "region_map_section": "MAPSEC_ROUTE_25", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route25_SeaCottage/scripts.inc b/data/maps/Route25_SeaCottage/scripts.inc index 688cdc41d..517195dfb 100644 --- a/data/maps/Route25_SeaCottage/scripts.inc +++ b/data/maps/Route25_SeaCottage/scripts.inc @@ -64,7 +64,7 @@ Route25_SeaCottage_EventScript_BillAskForHelp:: @ 817059C applymovement LOCALID_BILL_CLEFAIRY, Route25_SeaCottage_Movement_BillEnterTeleporter waitmovement 0 removeobject LOCALID_BILL_CLEFAIRY - playse SE_C_MAKU_D + playse SE_CONTEST_CURTAIN_FALL closedoor 10, 3 waitdooranim setflag BILL_IN_TELEPORTER @@ -113,7 +113,7 @@ Route25_SeaCottage_EventScript_BillGiveSSTicket:: @ 817064A checkitemspace ITEM_SS_TICKET, 1 compare VAR_RESULT, FALSE goto_if_eq Route25_SeaCottage_EventScript_NoRoomForSSTicket - giveitem_msg Route25_SeaCottage_Text_ReceivedSSTicketFromBill, ITEM_SS_TICKET, 1, MUS_FAN5 + giveitem_msg Route25_SeaCottage_Text_ReceivedSSTicketFromBill, ITEM_SS_TICKET, 1, MUS_OBTAIN_KEY_ITEM setflag FLAG_GOT_SS_TICKET_DUP setflag FLAG_HIDE_NUGGET_BRIDGE_ROCKET setflag FLAG_GOT_SS_TICKET @@ -188,7 +188,7 @@ Route25_SeaCottage_EventScript_RunCellSeparator:: @ 81706FA call Route25_SeaCottage_EventScript_PlayTeleporterBeepSE setvar VAR_0x8004, 1 special AnimateTeleporterHousing - playse SE_TK_WARPIN + playse SE_WARP_IN special AnimateTeleporterCable waitse call Route25_SeaCottage_EventScript_PlayTeleporterBeepSE @@ -202,13 +202,13 @@ Route25_SeaCottage_EventScript_RunCellSeparator:: @ 81706FA addobject LOCALID_BILL_HUMAN clearflag FLAG_HIDE_BILL_HUMAN_SEA_COTTAGE delay 50 - playfanfare MUS_FANFA1 + playfanfare MUS_LEVEL_UP applymovement LOCALID_BILL_HUMAN, Route25_SeaCottage_Movement_BillExitTeleporter waitmovement 0 waitfanfare applymovement OBJ_EVENT_ID_CAMERA, Route25_SeaCottage_Movement_CameraPanBackFromTeleporters waitmovement 0 - playse SE_C_MAKU_D + playse SE_CONTEST_CURTAIN_FALL closedoor 3, 3 waitdooranim applymovement LOCALID_BILL_HUMAN, Route25_SeaCottage_Movement_BillWalkToMiddleOfRoom @@ -218,7 +218,7 @@ Route25_SeaCottage_EventScript_RunCellSeparator:: @ 81706FA end Route25_SeaCottage_EventScript_PlayTeleporterBeepSE:: @ 81707B6 - playse SE_BOWA + playse SE_BALL waitse delay 20 return diff --git a/data/maps/Route2_EastBuilding/map.json b/data/maps/Route2_EastBuilding/map.json index 20be5345d..f7997cb0b 100644 --- a/data/maps/Route2_EastBuilding/map.json +++ b/data/maps/Route2_EastBuilding/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE2_EAST_BUILDING", "name": "Route2_EastBuilding", "layout": "LAYOUT_ROUTE2_ENTRANCE", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_ROUTE_2", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route2_House/map.json b/data/maps/Route2_House/map.json index 900ad5ba1..39c841dd3 100644 --- a/data/maps/Route2_House/map.json +++ b/data/maps/Route2_House/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE2_HOUSE", "name": "Route2_House", "layout": "LAYOUT_HOUSE2", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_ROUTE_2", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route2_ViridianForest_NorthEntrance/map.json b/data/maps/Route2_ViridianForest_NorthEntrance/map.json index dbd7c734a..c6cc23713 100644 --- a/data/maps/Route2_ViridianForest_NorthEntrance/map.json +++ b/data/maps/Route2_ViridianForest_NorthEntrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE2_VIRIDIAN_FOREST_NORTH_ENTRANCE", "name": "Route2_ViridianForest_NorthEntrance", "layout": "LAYOUT_ROUTE2_ENTRANCE", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_ROUTE_2", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route2_ViridianForest_SouthEntrance/map.json b/data/maps/Route2_ViridianForest_SouthEntrance/map.json index 2590d03f2..fbe4c75e0 100644 --- a/data/maps/Route2_ViridianForest_SouthEntrance/map.json +++ b/data/maps/Route2_ViridianForest_SouthEntrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE2_VIRIDIAN_FOREST_SOUTH_ENTRANCE", "name": "Route2_ViridianForest_SouthEntrance", "layout": "LAYOUT_ROUTE2_ENTRANCE", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_ROUTE_2", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route3/map.json b/data/maps/Route3/map.json index 1051a4794..f310180b7 100644 --- a/data/maps/Route3/map.json +++ b/data/maps/Route3/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE3", "name": "Route3", "layout": "LAYOUT_ROUTE3", - "music": "MUS_LOAD02", + "music": "MUS_ROUTE3", "region_map_section": "MAPSEC_ROUTE_3", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route4/map.json b/data/maps/Route4/map.json index 2fa4ea4df..a588a2cd1 100644 --- a/data/maps/Route4/map.json +++ b/data/maps/Route4/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE4", "name": "Route4", "layout": "LAYOUT_ROUTE4", - "music": "MUS_LOAD02", + "music": "MUS_ROUTE3", "region_map_section": "MAPSEC_ROUTE_4", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route4_PokemonCenter_1F/map.json b/data/maps/Route4_PokemonCenter_1F/map.json index 7b2f02a45..b62ee3fbe 100644 --- a/data/maps/Route4_PokemonCenter_1F/map.json +++ b/data/maps/Route4_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE4_POKEMON_CENTER_1F", "name": "Route4_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_ROUTE_4", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route4_PokemonCenter_1F/scripts.inc b/data/maps/Route4_PokemonCenter_1F/scripts.inc index 420e18d1a..d09fd1b3b 100644 --- a/data/maps/Route4_PokemonCenter_1F/scripts.inc +++ b/data/maps/Route4_PokemonCenter_1F/scripts.inc @@ -109,7 +109,7 @@ Route4_PokemonCenter_1F_EventScript_BoughtMagikarp:: @ 816F86A Route4_PokemonCenter_1F_EventScript_PayForMagikarp:: @ 816F86F removemoney MAGIKARP_PRICE, 0 updatemoneybox 0, 0, 0 - playfanfare MUS_FANFA1 + playfanfare MUS_LEVEL_UP message Route4_PokemonCenter_1F_Text_PaidOutrageouslyForMagikarp waitmessage waitfanfare diff --git a/data/maps/Route4_PokemonCenter_2F/map.json b/data/maps/Route4_PokemonCenter_2F/map.json index b83288910..b70232abd 100644 --- a/data/maps/Route4_PokemonCenter_2F/map.json +++ b/data/maps/Route4_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE4_POKEMON_CENTER_2F", "name": "Route4_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_ROUTE_4", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route5/map.json b/data/maps/Route5/map.json index a178efdc2..85b0e75a2 100644 --- a/data/maps/Route5/map.json +++ b/data/maps/Route5/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE5", "name": "Route5", "layout": "LAYOUT_ROUTE5", - "music": "MUS_LOAD02", + "music": "MUS_ROUTE3", "region_map_section": "MAPSEC_ROUTE_5", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route5_PokemonDayCare/map.json b/data/maps/Route5_PokemonDayCare/map.json index 321f24a10..fa866f235 100644 --- a/data/maps/Route5_PokemonDayCare/map.json +++ b/data/maps/Route5_PokemonDayCare/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE5_POKEMON_DAY_CARE", "name": "Route5_PokemonDayCare", "layout": "LAYOUT_ROUTE5_POKEMON_DAY_CARE", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_ROUTE_5", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route5_SouthEntrance/map.json b/data/maps/Route5_SouthEntrance/map.json index 6562e44d3..9d40775e8 100644 --- a/data/maps/Route5_SouthEntrance/map.json +++ b/data/maps/Route5_SouthEntrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE5_SOUTH_ENTRANCE", "name": "Route5_SouthEntrance", "layout": "LAYOUT_SAFFRON_CITY_NORTH_SOUTH_ENTRANCE", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_ROUTE_5", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route6/map.json b/data/maps/Route6/map.json index 0b044b364..47c69f5c5 100644 --- a/data/maps/Route6/map.json +++ b/data/maps/Route6/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE6", "name": "Route6", "layout": "LAYOUT_ROUTE6", - "music": "MUS_LOAD02", + "music": "MUS_ROUTE3", "region_map_section": "MAPSEC_ROUTE_6", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route6_NorthEntrance/map.json b/data/maps/Route6_NorthEntrance/map.json index 3082859ec..287d13d1c 100644 --- a/data/maps/Route6_NorthEntrance/map.json +++ b/data/maps/Route6_NorthEntrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE6_NORTH_ENTRANCE", "name": "Route6_NorthEntrance", "layout": "LAYOUT_SAFFRON_CITY_NORTH_SOUTH_ENTRANCE", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_ROUTE_6", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route7/map.json b/data/maps/Route7/map.json index 5a18cd689..922a44476 100644 --- a/data/maps/Route7/map.json +++ b/data/maps/Route7/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE7", "name": "Route7", "layout": "LAYOUT_ROUTE7", - "music": "MUS_LOAD02", + "music": "MUS_ROUTE3", "region_map_section": "MAPSEC_ROUTE_7", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route7_EastEntrance/map.json b/data/maps/Route7_EastEntrance/map.json index 2c990925b..b05ab81e7 100644 --- a/data/maps/Route7_EastEntrance/map.json +++ b/data/maps/Route7_EastEntrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE7_EAST_ENTRANCE", "name": "Route7_EastEntrance", "layout": "LAYOUT_SAFFRON_CITY_EAST_WEST_ENTRANCE", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_ROUTE_7", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route8/map.json b/data/maps/Route8/map.json index e99df258f..7f0b2e8c4 100644 --- a/data/maps/Route8/map.json +++ b/data/maps/Route8/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE8", "name": "Route8", "layout": "LAYOUT_ROUTE8", - "music": "MUS_LOAD02", + "music": "MUS_ROUTE3", "region_map_section": "MAPSEC_ROUTE_8", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route8_WestEntrance/map.json b/data/maps/Route8_WestEntrance/map.json index 043b603c2..d759be75e 100644 --- a/data/maps/Route8_WestEntrance/map.json +++ b/data/maps/Route8_WestEntrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE8_WEST_ENTRANCE", "name": "Route8_WestEntrance", "layout": "LAYOUT_SAFFRON_CITY_EAST_WEST_ENTRANCE", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_ROUTE_8", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route9/map.json b/data/maps/Route9/map.json index 27e91cab7..b733f7a21 100644 --- a/data/maps/Route9/map.json +++ b/data/maps/Route9/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE9", "name": "Route9", "layout": "LAYOUT_ROUTE9", - "music": "MUS_LOAD02", + "music": "MUS_ROUTE3", "region_map_section": "MAPSEC_ROUTE_9", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/SSAnne_1F_Corridor/map.json b/data/maps/SSAnne_1F_Corridor/map.json index 5d4049473..fe30bc49f 100644 --- a/data/maps/SSAnne_1F_Corridor/map.json +++ b/data/maps/SSAnne_1F_Corridor/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_1F_CORRIDOR", "name": "SSAnne_1F_Corridor", "layout": "LAYOUT_SSANNE_1F_CORRIDOR", - "music": "MUS_SANTOAN", + "music": "MUS_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_1F_Room1/map.json b/data/maps/SSAnne_1F_Room1/map.json index a2e30ae70..47fa01a0c 100644 --- a/data/maps/SSAnne_1F_Room1/map.json +++ b/data/maps/SSAnne_1F_Room1/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_1F_ROOM1", "name": "SSAnne_1F_Room1", "layout": "LAYOUT_SSANNE_ROOM1", - "music": "MUS_SANTOAN", + "music": "MUS_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_1F_Room2/map.json b/data/maps/SSAnne_1F_Room2/map.json index 89b501da4..0f93495b2 100644 --- a/data/maps/SSAnne_1F_Room2/map.json +++ b/data/maps/SSAnne_1F_Room2/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_1F_ROOM2", "name": "SSAnne_1F_Room2", "layout": "LAYOUT_SSANNE_ROOM1", - "music": "MUS_SANTOAN", + "music": "MUS_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_1F_Room3/map.json b/data/maps/SSAnne_1F_Room3/map.json index 639bbcd72..7eec1735f 100644 --- a/data/maps/SSAnne_1F_Room3/map.json +++ b/data/maps/SSAnne_1F_Room3/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_1F_ROOM3", "name": "SSAnne_1F_Room3", "layout": "LAYOUT_SSANNE_ROOM1", - "music": "MUS_SANTOAN", + "music": "MUS_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_1F_Room4/map.json b/data/maps/SSAnne_1F_Room4/map.json index abdde83cd..8a932c9c9 100644 --- a/data/maps/SSAnne_1F_Room4/map.json +++ b/data/maps/SSAnne_1F_Room4/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_1F_ROOM4", "name": "SSAnne_1F_Room4", "layout": "LAYOUT_SSANNE_ROOM1", - "music": "MUS_SANTOAN", + "music": "MUS_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_1F_Room5/map.json b/data/maps/SSAnne_1F_Room5/map.json index 7b6c778c4..6a3a6e6b0 100644 --- a/data/maps/SSAnne_1F_Room5/map.json +++ b/data/maps/SSAnne_1F_Room5/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_1F_ROOM5", "name": "SSAnne_1F_Room5", "layout": "LAYOUT_SSANNE_ROOM1", - "music": "MUS_SANTOAN", + "music": "MUS_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_1F_Room6/map.json b/data/maps/SSAnne_1F_Room6/map.json index 2db3bf143..2a504adce 100644 --- a/data/maps/SSAnne_1F_Room6/map.json +++ b/data/maps/SSAnne_1F_Room6/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_1F_ROOM6", "name": "SSAnne_1F_Room6", "layout": "LAYOUT_SSANNE_ROOM1", - "music": "MUS_SANTOAN", + "music": "MUS_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_1F_Room7/map.json b/data/maps/SSAnne_1F_Room7/map.json index ca483216c..91746ee78 100644 --- a/data/maps/SSAnne_1F_Room7/map.json +++ b/data/maps/SSAnne_1F_Room7/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_1F_ROOM7", "name": "SSAnne_1F_Room7", "layout": "LAYOUT_SSANNE_ROOM1", - "music": "MUS_SANTOAN", + "music": "MUS_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_2F_Corridor/map.json b/data/maps/SSAnne_2F_Corridor/map.json index 36afea939..f23f839ee 100644 --- a/data/maps/SSAnne_2F_Corridor/map.json +++ b/data/maps/SSAnne_2F_Corridor/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_2F_CORRIDOR", "name": "SSAnne_2F_Corridor", "layout": "LAYOUT_SSANNE_2F_CORRIDOR", - "music": "MUS_SANTOAN", + "music": "MUS_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_2F_Corridor/scripts.inc b/data/maps/SSAnne_2F_Corridor/scripts.inc index ed0ddd056..be6042ea9 100644 --- a/data/maps/SSAnne_2F_Corridor/scripts.inc +++ b/data/maps/SSAnne_2F_Corridor/scripts.inc @@ -21,9 +21,9 @@ SSAnne_2F_Corridor_EventScript_RivalTriggerRight:: @ 81608F7 SSAnne_2F_Corridor_EventScript_RivalTrigger:: @ 8160903 textcolor 0 - playse SE_KAIDAN + playse SE_EXIT delay 5 - playbgm MUS_RIVAL1, 0 + playbgm MUS_ENCOUNTER_RIVAL, 0 addobject 1 delay 10 applymovement 1, Movement_WalkInPlaceFastestDown @@ -46,7 +46,7 @@ SSAnne_2F_Corridor_EventScript_RivalTrigger:: @ 8160903 msgbox SSAnne_2F_Corridor_Text_RivalPostBattle closemessage delay 10 - playbgm MUS_RIVAL2, 0 + playbgm MUS_RIVAL_EXIT, 0 compare VAR_TEMP_1, 0 call_if_eq SSAnne_2F_Corridor_EventScript_RivalExitLeft compare VAR_TEMP_1, 1 diff --git a/data/maps/SSAnne_2F_Room1/map.json b/data/maps/SSAnne_2F_Room1/map.json index 62636dfde..cfd1b60be 100644 --- a/data/maps/SSAnne_2F_Room1/map.json +++ b/data/maps/SSAnne_2F_Room1/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_2F_ROOM1", "name": "SSAnne_2F_Room1", "layout": "LAYOUT_SSANNE_ROOM2", - "music": "MUS_SANTOAN", + "music": "MUS_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_2F_Room2/map.json b/data/maps/SSAnne_2F_Room2/map.json index c6cd86baa..2e12441b4 100644 --- a/data/maps/SSAnne_2F_Room2/map.json +++ b/data/maps/SSAnne_2F_Room2/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_2F_ROOM2", "name": "SSAnne_2F_Room2", "layout": "LAYOUT_SSANNE_ROOM2", - "music": "MUS_SANTOAN", + "music": "MUS_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_2F_Room3/map.json b/data/maps/SSAnne_2F_Room3/map.json index 0132db9eb..5d8ff0753 100644 --- a/data/maps/SSAnne_2F_Room3/map.json +++ b/data/maps/SSAnne_2F_Room3/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_2F_ROOM3", "name": "SSAnne_2F_Room3", "layout": "LAYOUT_SSANNE_ROOM2", - "music": "MUS_SANTOAN", + "music": "MUS_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_2F_Room4/map.json b/data/maps/SSAnne_2F_Room4/map.json index a84f46733..157f29bf3 100644 --- a/data/maps/SSAnne_2F_Room4/map.json +++ b/data/maps/SSAnne_2F_Room4/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_2F_ROOM4", "name": "SSAnne_2F_Room4", "layout": "LAYOUT_SSANNE_ROOM2", - "music": "MUS_SANTOAN", + "music": "MUS_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_2F_Room5/map.json b/data/maps/SSAnne_2F_Room5/map.json index f6dde1406..7c3e77e1e 100644 --- a/data/maps/SSAnne_2F_Room5/map.json +++ b/data/maps/SSAnne_2F_Room5/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_2F_ROOM5", "name": "SSAnne_2F_Room5", "layout": "LAYOUT_SSANNE_ROOM2", - "music": "MUS_SANTOAN", + "music": "MUS_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_2F_Room6/map.json b/data/maps/SSAnne_2F_Room6/map.json index 9b90147aa..a57b2e30d 100644 --- a/data/maps/SSAnne_2F_Room6/map.json +++ b/data/maps/SSAnne_2F_Room6/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_2F_ROOM6", "name": "SSAnne_2F_Room6", "layout": "LAYOUT_SSANNE_ROOM2", - "music": "MUS_SANTOAN", + "music": "MUS_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_3F_Corridor/map.json b/data/maps/SSAnne_3F_Corridor/map.json index ce7578a4f..9c2079431 100644 --- a/data/maps/SSAnne_3F_Corridor/map.json +++ b/data/maps/SSAnne_3F_Corridor/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_3F_CORRIDOR", "name": "SSAnne_3F_Corridor", "layout": "LAYOUT_SSANNE_3F_CORRIDOR", - "music": "MUS_SANTOAN", + "music": "MUS_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_B1F_Corridor/map.json b/data/maps/SSAnne_B1F_Corridor/map.json index 86fe58592..4e0ad1134 100644 --- a/data/maps/SSAnne_B1F_Corridor/map.json +++ b/data/maps/SSAnne_B1F_Corridor/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_B1F_CORRIDOR", "name": "SSAnne_B1F_Corridor", "layout": "LAYOUT_SSANNE_B1F_CORRIDOR", - "music": "MUS_SANTOAN", + "music": "MUS_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_B1F_Room1/map.json b/data/maps/SSAnne_B1F_Room1/map.json index ca979f0dd..cf7bf15ec 100644 --- a/data/maps/SSAnne_B1F_Room1/map.json +++ b/data/maps/SSAnne_B1F_Room1/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_B1F_ROOM1", "name": "SSAnne_B1F_Room1", "layout": "LAYOUT_SSANNE_ROOM2", - "music": "MUS_SANTOAN", + "music": "MUS_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_B1F_Room2/map.json b/data/maps/SSAnne_B1F_Room2/map.json index d2236e480..cd01d82b8 100644 --- a/data/maps/SSAnne_B1F_Room2/map.json +++ b/data/maps/SSAnne_B1F_Room2/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_B1F_ROOM2", "name": "SSAnne_B1F_Room2", "layout": "LAYOUT_SSANNE_ROOM2", - "music": "MUS_SANTOAN", + "music": "MUS_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_B1F_Room3/map.json b/data/maps/SSAnne_B1F_Room3/map.json index 6aed9ce58..2dbef096c 100644 --- a/data/maps/SSAnne_B1F_Room3/map.json +++ b/data/maps/SSAnne_B1F_Room3/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_B1F_ROOM3", "name": "SSAnne_B1F_Room3", "layout": "LAYOUT_SSANNE_ROOM2", - "music": "MUS_SANTOAN", + "music": "MUS_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_B1F_Room4/map.json b/data/maps/SSAnne_B1F_Room4/map.json index ba41cb495..68a1ecf65 100644 --- a/data/maps/SSAnne_B1F_Room4/map.json +++ b/data/maps/SSAnne_B1F_Room4/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_B1F_ROOM4", "name": "SSAnne_B1F_Room4", "layout": "LAYOUT_SSANNE_ROOM2", - "music": "MUS_SANTOAN", + "music": "MUS_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_B1F_Room5/map.json b/data/maps/SSAnne_B1F_Room5/map.json index bb54b7090..ee81b03b4 100644 --- a/data/maps/SSAnne_B1F_Room5/map.json +++ b/data/maps/SSAnne_B1F_Room5/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_B1F_ROOM5", "name": "SSAnne_B1F_Room5", "layout": "LAYOUT_SSANNE_ROOM2", - "music": "MUS_SANTOAN", + "music": "MUS_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_CaptainsOffice/map.json b/data/maps/SSAnne_CaptainsOffice/map.json index d0af547d9..ffd6cc1ec 100644 --- a/data/maps/SSAnne_CaptainsOffice/map.json +++ b/data/maps/SSAnne_CaptainsOffice/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_CAPTAINS_OFFICE", "name": "SSAnne_CaptainsOffice", "layout": "LAYOUT_SSANNE_CAPTAINS_OFFICE", - "music": "MUS_SANTOAN", + "music": "MUS_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_CaptainsOffice/scripts.inc b/data/maps/SSAnne_CaptainsOffice/scripts.inc index 3ccd4fa51..8b89783e9 100644 --- a/data/maps/SSAnne_CaptainsOffice/scripts.inc +++ b/data/maps/SSAnne_CaptainsOffice/scripts.inc @@ -8,14 +8,14 @@ SSAnne_CaptainsOffice_EventScript_Captain:: @ 8160B3A textcolor 3 message SSAnne_CaptainsOffice_Text_RubbedCaptainsBack waitmessage - playfanfare MUS_ME_ASA + playfanfare MUS_HEAL waitfanfare call EventScript_RestorePrevTextColor delay 50 applymovement 1, Movement_FacePlayer waitmovement 0 msgbox SSAnne_CaptainsOffice_Text_ThankYouHaveHMForCut - giveitem_msg SSAnne_CaptainsOffice_Text_ObtainedHM01FromCaptain, ITEM_HM01, 1, MUS_FAN5 + giveitem_msg SSAnne_CaptainsOffice_Text_ObtainedHM01FromCaptain, ITEM_HM01, 1, MUS_OBTAIN_KEY_ITEM msgbox SSAnne_CaptainsOffice_Text_ExplainCut setflag FLAG_GOT_HM01 setvar VAR_MAP_SCENE_VERMILION_CITY, 1 diff --git a/data/maps/SSAnne_Deck/map.json b/data/maps/SSAnne_Deck/map.json index b121ed6b1..2f74b00ec 100644 --- a/data/maps/SSAnne_Deck/map.json +++ b/data/maps/SSAnne_Deck/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_DECK", "name": "SSAnne_Deck", "layout": "LAYOUT_SSANNE_DECK", - "music": "MUS_SANTOAN", + "music": "MUS_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_Exterior/map.json b/data/maps/SSAnne_Exterior/map.json index c125abd59..000138ce8 100644 --- a/data/maps/SSAnne_Exterior/map.json +++ b/data/maps/SSAnne_Exterior/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_EXTERIOR", "name": "SSAnne_Exterior", "layout": "LAYOUT_SSANNE_EXTERIOR", - "music": "MUS_SANTOAN", + "music": "MUS_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_Exterior/scripts.inc b/data/maps/SSAnne_Exterior/scripts.inc index 84a267ac8..3596ab81d 100644 --- a/data/maps/SSAnne_Exterior/scripts.inc +++ b/data/maps/SSAnne_Exterior/scripts.inc @@ -18,7 +18,7 @@ SSAnne_Exterior_ExitSSAnne:: @ 8160859 call_if_le SSAnne_Exterior_WalkDown compare VAR_0x8005, 7 call_if_ge SSAnne_Exterior_WalkInPlaceDown - fadenewbgm MUS_NAMINORI + fadenewbgm MUS_SURF delay 50 special DoSSAnneDepartureCutscene waitstate diff --git a/data/maps/SSAnne_Kitchen/map.json b/data/maps/SSAnne_Kitchen/map.json index 951ab2b00..2470b482a 100644 --- a/data/maps/SSAnne_Kitchen/map.json +++ b/data/maps/SSAnne_Kitchen/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_KITCHEN", "name": "SSAnne_Kitchen", "layout": "LAYOUT_SSANNE_KITCHEN", - "music": "MUS_SANTOAN", + "music": "MUS_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SafariZone_Center/map.json b/data/maps/SafariZone_Center/map.json index 7192fd254..19231b544 100644 --- a/data/maps/SafariZone_Center/map.json +++ b/data/maps/SafariZone_Center/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFARI_ZONE_CENTER", "name": "SafariZone_Center", "layout": "LAYOUT_SAFARI_ZONE_CENTER", - "music": "MUS_SHINKA", + "music": "MUS_EVOLUTION", "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SafariZone_Center_RestHouse/map.json b/data/maps/SafariZone_Center_RestHouse/map.json index 0d5a1430a..9a6211cd5 100644 --- a/data/maps/SafariZone_Center_RestHouse/map.json +++ b/data/maps/SafariZone_Center_RestHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFARI_ZONE_CENTER_REST_HOUSE", "name": "SafariZone_Center_RestHouse", "layout": "LAYOUT_SAFARI_ZONE_REST_HOUSE", - "music": "MUS_SHINKA", + "music": "MUS_EVOLUTION", "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SafariZone_East/map.json b/data/maps/SafariZone_East/map.json index c9a1120e6..aabf6edc8 100644 --- a/data/maps/SafariZone_East/map.json +++ b/data/maps/SafariZone_East/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFARI_ZONE_EAST", "name": "SafariZone_East", "layout": "LAYOUT_SAFARI_ZONE_EAST", - "music": "MUS_SHINKA", + "music": "MUS_EVOLUTION", "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SafariZone_East_RestHouse/map.json b/data/maps/SafariZone_East_RestHouse/map.json index 20b7a79c4..136eeb85d 100644 --- a/data/maps/SafariZone_East_RestHouse/map.json +++ b/data/maps/SafariZone_East_RestHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFARI_ZONE_EAST_REST_HOUSE", "name": "SafariZone_East_RestHouse", "layout": "LAYOUT_SAFARI_ZONE_REST_HOUSE", - "music": "MUS_SHINKA", + "music": "MUS_EVOLUTION", "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SafariZone_North/map.json b/data/maps/SafariZone_North/map.json index 9df7f64b0..9611e34fa 100644 --- a/data/maps/SafariZone_North/map.json +++ b/data/maps/SafariZone_North/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFARI_ZONE_NORTH", "name": "SafariZone_North", "layout": "LAYOUT_SAFARI_ZONE_NORTH", - "music": "MUS_SHINKA", + "music": "MUS_EVOLUTION", "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SafariZone_North_RestHouse/map.json b/data/maps/SafariZone_North_RestHouse/map.json index 04e70e66f..7e2f211cd 100644 --- a/data/maps/SafariZone_North_RestHouse/map.json +++ b/data/maps/SafariZone_North_RestHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFARI_ZONE_NORTH_REST_HOUSE", "name": "SafariZone_North_RestHouse", "layout": "LAYOUT_SAFARI_ZONE_REST_HOUSE", - "music": "MUS_SHINKA", + "music": "MUS_EVOLUTION", "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SafariZone_SecretHouse/map.json b/data/maps/SafariZone_SecretHouse/map.json index cc0eea7df..87cd7742d 100644 --- a/data/maps/SafariZone_SecretHouse/map.json +++ b/data/maps/SafariZone_SecretHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFARI_ZONE_SECRET_HOUSE", "name": "SafariZone_SecretHouse", "layout": "LAYOUT_SAFARI_ZONE_SECRET_HOUSE", - "music": "MUS_SHINKA", + "music": "MUS_EVOLUTION", "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SafariZone_West/map.json b/data/maps/SafariZone_West/map.json index 5ccffac5d..239f7caef 100644 --- a/data/maps/SafariZone_West/map.json +++ b/data/maps/SafariZone_West/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFARI_ZONE_WEST", "name": "SafariZone_West", "layout": "LAYOUT_SAFARI_ZONE_WEST", - "music": "MUS_SHINKA", + "music": "MUS_EVOLUTION", "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SafariZone_West_RestHouse/map.json b/data/maps/SafariZone_West_RestHouse/map.json index 57a43a1a2..0716b11b6 100644 --- a/data/maps/SafariZone_West_RestHouse/map.json +++ b/data/maps/SafariZone_West_RestHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFARI_ZONE_WEST_REST_HOUSE", "name": "SafariZone_West_RestHouse", "layout": "LAYOUT_SAFARI_ZONE_REST_HOUSE", - "music": "MUS_SHINKA", + "music": "MUS_EVOLUTION", "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SaffronCity/map.json b/data/maps/SaffronCity/map.json index 352f9aca5..d2a1b424e 100644 --- a/data/maps/SaffronCity/map.json +++ b/data/maps/SaffronCity/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFFRON_CITY", "name": "SaffronCity", "layout": "LAYOUT_SAFFRON_CITY", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_SAFFRON_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/SaffronCity_Connection/map.json b/data/maps/SaffronCity_Connection/map.json index 30bcffa06..fe14ef88f 100644 --- a/data/maps/SaffronCity_Connection/map.json +++ b/data/maps/SaffronCity_Connection/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFFRON_CITY_CONNECTION", "name": "SaffronCity_Connection", "layout": "LAYOUT_SAFFRON_CITY_CONNECTION", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_SAFFRON_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/SaffronCity_CopycatsHouse_1F/map.json b/data/maps/SaffronCity_CopycatsHouse_1F/map.json index 0dc8af3e4..a53910775 100644 --- a/data/maps/SaffronCity_CopycatsHouse_1F/map.json +++ b/data/maps/SaffronCity_CopycatsHouse_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFFRON_CITY_COPYCATS_HOUSE_1F", "name": "SaffronCity_CopycatsHouse_1F", "layout": "LAYOUT_SAFFRON_CITY_COPYCATS_HOUSE_1F", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_SAFFRON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SaffronCity_CopycatsHouse_2F/map.json b/data/maps/SaffronCity_CopycatsHouse_2F/map.json index a9a3cdd59..d281922d1 100644 --- a/data/maps/SaffronCity_CopycatsHouse_2F/map.json +++ b/data/maps/SaffronCity_CopycatsHouse_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFFRON_CITY_COPYCATS_HOUSE_2F", "name": "SaffronCity_CopycatsHouse_2F", "layout": "LAYOUT_SAFFRON_CITY_COPYCATS_HOUSE_2F", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_SAFFRON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SaffronCity_Dojo/map.json b/data/maps/SaffronCity_Dojo/map.json index bac95d5bc..34a64c7c4 100644 --- a/data/maps/SaffronCity_Dojo/map.json +++ b/data/maps/SaffronCity_Dojo/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFFRON_CITY_DOJO", "name": "SaffronCity_Dojo", "layout": "LAYOUT_SAFFRON_CITY_DOJO", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_SAFFRON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SaffronCity_Dojo/scripts.inc b/data/maps/SaffronCity_Dojo/scripts.inc index 1dd8b31e1..7e08d5684 100644 --- a/data/maps/SaffronCity_Dojo/scripts.inc +++ b/data/maps/SaffronCity_Dojo/scripts.inc @@ -73,7 +73,7 @@ SaffronCity_Dojo_EventScript_GiveHitmon:: @ 816EC82 SaffronCity_Dojo_EventScript_ReceivedHitmonParty:: @ 816ECB5 removeobject VAR_LAST_TALKED getspeciesname 0, VAR_TEMP_1 - playfanfare MUS_FANFA1 + playfanfare MUS_LEVEL_UP message SaffronCity_Dojo_Text_ReceivedMonFromKarateMaster waitmessage waitfanfare @@ -89,7 +89,7 @@ SaffronCity_Dojo_EventScript_ReceivedHitmonParty:: @ 816ECB5 SaffronCity_Dojo_EventScript_ReceivedHitmonPC:: @ 816ECEC removeobject VAR_LAST_TALKED getspeciesname 0, VAR_TEMP_1 - playfanfare MUS_FANFA1 + playfanfare MUS_LEVEL_UP message SaffronCity_Dojo_Text_ReceivedMonFromKarateMaster waitmessage waitfanfare diff --git a/data/maps/SaffronCity_Gym/text.inc b/data/maps/SaffronCity_Gym/text.inc index 827d4bbd5..349c86423 100644 --- a/data/maps/SaffronCity_Gym/text.inc +++ b/data/maps/SaffronCity_Gym/text.inc @@ -5,7 +5,7 @@ SaffronCity_Gym_Text_SabrinaIntro:: @ 819B53C .string "It started when a spoon I\n" .string "carelessly tossed, bent.\p" .string "I dislike battling, but if you wish,\n" - .string "I will show you my powers!{PLAY_BGM}{MUS_EXEYE}$" + .string "I will show you my powers!{PLAY_BGM}{MUS_ENCOUNTER_GYM_LEADER}$" SaffronCity_Gym_Text_SabrinaDefeat:: @ 819B602 .string "This loss shocks me!\n" diff --git a/data/maps/SaffronCity_House/map.json b/data/maps/SaffronCity_House/map.json index 32b191884..d1232cadb 100644 --- a/data/maps/SaffronCity_House/map.json +++ b/data/maps/SaffronCity_House/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFFRON_CITY_HOUSE", "name": "SaffronCity_House", "layout": "LAYOUT_HOUSE5", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_SAFFRON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SaffronCity_Mart/map.json b/data/maps/SaffronCity_Mart/map.json index 7b1b3b527..451ee31d9 100644 --- a/data/maps/SaffronCity_Mart/map.json +++ b/data/maps/SaffronCity_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFFRON_CITY_MART", "name": "SaffronCity_Mart", "layout": "LAYOUT_MART", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_SAFFRON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SaffronCity_MrPsychicsHouse/map.json b/data/maps/SaffronCity_MrPsychicsHouse/map.json index 29460d55e..6e9a5508d 100644 --- a/data/maps/SaffronCity_MrPsychicsHouse/map.json +++ b/data/maps/SaffronCity_MrPsychicsHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFFRON_CITY_MR_PSYCHICS_HOUSE", "name": "SaffronCity_MrPsychicsHouse", "layout": "LAYOUT_HOUSE5", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_SAFFRON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SaffronCity_PokemonCenter_1F/map.json b/data/maps/SaffronCity_PokemonCenter_1F/map.json index f4861adb1..3bf36c736 100644 --- a/data/maps/SaffronCity_PokemonCenter_1F/map.json +++ b/data/maps/SaffronCity_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFFRON_CITY_POKEMON_CENTER_1F", "name": "SaffronCity_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_SAFFRON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SaffronCity_PokemonCenter_2F/map.json b/data/maps/SaffronCity_PokemonCenter_2F/map.json index 7ed2f6050..71c05de46 100644 --- a/data/maps/SaffronCity_PokemonCenter_2F/map.json +++ b/data/maps/SaffronCity_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFFRON_CITY_POKEMON_CENTER_2F", "name": "SaffronCity_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_SAFFRON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/map.json b/data/maps/SaffronCity_PokemonTrainerFanClub/map.json index 92c3b8437..dc9f24d6d 100644 --- a/data/maps/SaffronCity_PokemonTrainerFanClub/map.json +++ b/data/maps/SaffronCity_PokemonTrainerFanClub/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB", "name": "SaffronCity_PokemonTrainerFanClub", "layout": "LAYOUT_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_SAFFRON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SeafoamIslands_1F/map.json b/data/maps/SeafoamIslands_1F/map.json index bffaf7eca..b85000671 100644 --- a/data/maps/SeafoamIslands_1F/map.json +++ b/data/maps/SeafoamIslands_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEAFOAM_ISLANDS_1F", "name": "SeafoamIslands_1F", "layout": "LAYOUT_SEAFOAM_ISLANDS_1F", - "music": "MUS_T_MORI", + "music": "MUS_VIRIDIAN_FOREST", "region_map_section": "MAPSEC_SEAFOAM_ISLANDS", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SeafoamIslands_B1F/map.json b/data/maps/SeafoamIslands_B1F/map.json index 1170cd572..014da39a1 100644 --- a/data/maps/SeafoamIslands_B1F/map.json +++ b/data/maps/SeafoamIslands_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEAFOAM_ISLANDS_B1F", "name": "SeafoamIslands_B1F", "layout": "LAYOUT_SEAFOAM_ISLANDS_B1F", - "music": "MUS_T_MORI", + "music": "MUS_VIRIDIAN_FOREST", "region_map_section": "MAPSEC_SEAFOAM_ISLANDS", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SeafoamIslands_B2F/map.json b/data/maps/SeafoamIslands_B2F/map.json index 0e76f6b7e..5d770655f 100644 --- a/data/maps/SeafoamIslands_B2F/map.json +++ b/data/maps/SeafoamIslands_B2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEAFOAM_ISLANDS_B2F", "name": "SeafoamIslands_B2F", "layout": "LAYOUT_SEAFOAM_ISLANDS_B2F", - "music": "MUS_T_MORI", + "music": "MUS_VIRIDIAN_FOREST", "region_map_section": "MAPSEC_SEAFOAM_ISLANDS", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SeafoamIslands_B3F/map.json b/data/maps/SeafoamIslands_B3F/map.json index 1cb129adb..21f25cfba 100644 --- a/data/maps/SeafoamIslands_B3F/map.json +++ b/data/maps/SeafoamIslands_B3F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEAFOAM_ISLANDS_B3F", "name": "SeafoamIslands_B3F", "layout": "LAYOUT_SEAFOAM_ISLANDS_B3F", - "music": "MUS_T_MORI", + "music": "MUS_VIRIDIAN_FOREST", "region_map_section": "MAPSEC_SEAFOAM_ISLANDS", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SeafoamIslands_B4F/map.json b/data/maps/SeafoamIslands_B4F/map.json index 1ce555258..44c4268c8 100644 --- a/data/maps/SeafoamIslands_B4F/map.json +++ b/data/maps/SeafoamIslands_B4F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEAFOAM_ISLANDS_B4F", "name": "SeafoamIslands_B4F", "layout": "LAYOUT_SEAFOAM_ISLANDS_B4F", - "music": "MUS_T_MORI", + "music": "MUS_VIRIDIAN_FOREST", "region_map_section": "MAPSEC_SEAFOAM_ISLANDS", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SeafoamIslands_B4F/scripts.inc b/data/maps/SeafoamIslands_B4F/scripts.inc index 306a70562..9970bde9c 100644 --- a/data/maps/SeafoamIslands_B4F/scripts.inc +++ b/data/maps/SeafoamIslands_B4F/scripts.inc @@ -169,7 +169,7 @@ SeafoamIslands_B4F_EventScript_Articuno:: @ 81631AC waitmessage waitmoncry delay 10 - playbgm MUS_EXEYE, 0 + playbgm MUS_ENCOUNTER_GYM_LEADER, 0 waitbuttonpress setflag FLAG_SYS_SPECIAL_WILD_BATTLE special StartLegendaryBattle diff --git a/data/maps/SevenIsland/map.json b/data/maps/SevenIsland/map.json index 7b0b3a72d..08494194a 100644 --- a/data/maps/SevenIsland/map.json +++ b/data/maps/SevenIsland/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEVEN_ISLAND", "name": "SevenIsland", "layout": "LAYOUT_SEVEN_ISLAND", - "music": "MUS_NANA67", + "music": "MUS_SEVII_67", "region_map_section": "MAPSEC_SEVEN_ISLAND", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/SevenIsland_Harbor/map.json b/data/maps/SevenIsland_Harbor/map.json index b71cf72bd..3e11a65ca 100644 --- a/data/maps/SevenIsland_Harbor/map.json +++ b/data/maps/SevenIsland_Harbor/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEVEN_ISLAND_HARBOR", "name": "SevenIsland_Harbor", "layout": "LAYOUT_ISLAND_HARBOR", - "music": "MUS_NANA67", + "music": "MUS_SEVII_67", "region_map_section": "MAPSEC_SEVEN_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SevenIsland_House_Room1/map.json b/data/maps/SevenIsland_House_Room1/map.json index 09550738c..d1dc104c8 100644 --- a/data/maps/SevenIsland_House_Room1/map.json +++ b/data/maps/SevenIsland_House_Room1/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEVEN_ISLAND_HOUSE_ROOM1", "name": "SevenIsland_House_Room1", "layout": "LAYOUT_SEVEN_ISLAND_HOUSE_ROOM1", - "music": "MUS_NANA67", + "music": "MUS_SEVII_67", "region_map_section": "MAPSEC_SEVEN_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SevenIsland_House_Room2/map.json b/data/maps/SevenIsland_House_Room2/map.json index 4fc512e42..93b0a3a6e 100644 --- a/data/maps/SevenIsland_House_Room2/map.json +++ b/data/maps/SevenIsland_House_Room2/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEVEN_ISLAND_HOUSE_ROOM2", "name": "SevenIsland_House_Room2", "layout": "LAYOUT_SEVEN_ISLAND_HOUSE_ROOM2", - "music": "MUS_NANA67", + "music": "MUS_SEVII_67", "region_map_section": "MAPSEC_SEVEN_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SevenIsland_Mart/map.json b/data/maps/SevenIsland_Mart/map.json index cf1f24cfe..a74ef6c45 100644 --- a/data/maps/SevenIsland_Mart/map.json +++ b/data/maps/SevenIsland_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEVEN_ISLAND_MART", "name": "SevenIsland_Mart", "layout": "LAYOUT_MART", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_SEVEN_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SevenIsland_PokemonCenter_1F/map.json b/data/maps/SevenIsland_PokemonCenter_1F/map.json index e3f534260..a73cb405b 100644 --- a/data/maps/SevenIsland_PokemonCenter_1F/map.json +++ b/data/maps/SevenIsland_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEVEN_ISLAND_POKEMON_CENTER_1F", "name": "SevenIsland_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_SEVEN_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SevenIsland_PokemonCenter_2F/map.json b/data/maps/SevenIsland_PokemonCenter_2F/map.json index 65166b9ac..f7d97b3ca 100644 --- a/data/maps/SevenIsland_PokemonCenter_2F/map.json +++ b/data/maps/SevenIsland_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEVEN_ISLAND_POKEMON_CENTER_2F", "name": "SevenIsland_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_SEVEN_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SevenIsland_SevaultCanyon/map.json b/data/maps/SevenIsland_SevaultCanyon/map.json index 4b3f98695..824d75723 100644 --- a/data/maps/SevenIsland_SevaultCanyon/map.json +++ b/data/maps/SevenIsland_SevaultCanyon/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEVEN_ISLAND_SEVAULT_CANYON", "name": "SevenIsland_SevaultCanyon", "layout": "LAYOUT_SEVEN_ISLAND_SEVAULT_CANYON", - "music": "MUS_NANASHIMA", + "music": "MUS_SEVII_ROUTE", "region_map_section": "MAPSEC_SEVAULT_CANYON", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json b/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json index b0185700e..58c07698e 100644 --- a/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json +++ b/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEVEN_ISLAND_SEVAULT_CANYON_ENTRANCE", "name": "SevenIsland_SevaultCanyon_Entrance", "layout": "LAYOUT_SEVEN_ISLAND_SEVAULT_CANYON_ENTRANCE", - "music": "MUS_NANASHIMA", + "music": "MUS_SEVII_ROUTE", "region_map_section": "MAPSEC_CANYON_ENTRANCE", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/SevenIsland_SevaultCanyon_House/map.json b/data/maps/SevenIsland_SevaultCanyon_House/map.json index f0c537add..f697cb790 100644 --- a/data/maps/SevenIsland_SevaultCanyon_House/map.json +++ b/data/maps/SevenIsland_SevaultCanyon_House/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEVEN_ISLAND_SEVAULT_CANYON_HOUSE", "name": "SevenIsland_SevaultCanyon_House", "layout": "LAYOUT_HOUSE3", - "music": "MUS_NANA67", + "music": "MUS_SEVII_67", "region_map_section": "MAPSEC_SEVAULT_CANYON", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc b/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc index 0c12e9362..eff2b5c82 100644 --- a/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc +++ b/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc @@ -4,7 +4,7 @@ SevenIsland_SevaultCanyon_House_MapScripts:: @ 8172182 SevenIsland_SevaultCanyon_House_EventScript_BaldingMan:: @ 8172183 lock goto_if_set FLAG_TEMP_2, SevenIsland_SevaultCanyon_House_EventScript_AlreadyDanced - playbgm MUS_P_SCHOOL, 0 + playbgm MUS_SCHOOL, 0 applymovement 1, SevenIsland_SevaultCanyon_House_Movement_ChanseyDance waitmovement 0 fadedefaultbgm @@ -22,7 +22,7 @@ SevenIsland_SevaultCanyon_House_EventScript_BaldingMan:: @ 8172183 compare VAR_FACING, DIR_SOUTH call_if_ne SevenIsland_SevaultCanyon_House_EventScript_PlayerFaceDown delay 30 - playbgm MUS_P_SCHOOL, 0 + playbgm MUS_SCHOOL, 0 applymovement OBJ_EVENT_ID_PLAYER, SevenIsland_SevaultCanyon_House_Movement_ChanseyDance waitmovement 0 fadedefaultbgm diff --git a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json index 183af5fb2..e8f0d9181 100644 --- a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json +++ b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEVEN_ISLAND_SEVAULT_CANYON_TANOBY_KEY", "name": "SevenIsland_SevaultCanyon_TanobyKey", "layout": "LAYOUT_SEVEN_ISLAND_SEVAULT_CANYON_TANOBY_KEY", - "music": "MUS_NANAISEKI", + "music": "MUS_SEVII_DUNGEON", "region_map_section": "MAPSEC_TANOBY_KEY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc index 54efea505..6f973074b 100644 --- a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc +++ b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc @@ -106,7 +106,7 @@ SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch7:: @ 8164F0B SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchPressed:: @ 8164F2E addvar NUM_SWITCHES_PRESSED, 1 - playse SE_TRACK_MOVE + playse SE_TRUCK_MOVE setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 setvar VAR_0x8006, 8 @@ -128,7 +128,7 @@ SevenIsland_SevaultCanyon_TanobyKey_EventScript_PuzzleSolvedShakeScreen:: @ 8164 setvar VAR_0x8007, 2 special ShakeScreen delay 60 - playse SE_FU_ZUZUZU + playse SE_LAVARIDGE_FALL_WARP waitse return diff --git a/data/maps/SevenIsland_TanobyRuins/map.json b/data/maps/SevenIsland_TanobyRuins/map.json index b9493d2c5..31455ac19 100644 --- a/data/maps/SevenIsland_TanobyRuins/map.json +++ b/data/maps/SevenIsland_TanobyRuins/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEVEN_ISLAND_TANOBY_RUINS", "name": "SevenIsland_TanobyRuins", "layout": "LAYOUT_SEVEN_ISLAND_TANOBY_RUINS", - "music": "MUS_NANASHIMA", + "music": "MUS_SEVII_ROUTE", "region_map_section": "MAPSEC_TANOBY_RUINS", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/SevenIsland_TanobyRuins_DilfordChamber/map.json b/data/maps/SevenIsland_TanobyRuins_DilfordChamber/map.json index 6e8b55f18..f51307ed0 100644 --- a/data/maps/SevenIsland_TanobyRuins_DilfordChamber/map.json +++ b/data/maps/SevenIsland_TanobyRuins_DilfordChamber/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEVEN_ISLAND_TANOBY_RUINS_DILFORD_CHAMBER", "name": "SevenIsland_TanobyRuins_DilfordChamber", "layout": "LAYOUT_SEVEN_ISLAND_TANOBY_RUINS_DILFORD_CHAMBER", - "music": "MUS_NANAISEKI", + "music": "MUS_SEVII_DUNGEON", "region_map_section": "MAPSEC_DILFORD_CHAMBER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SevenIsland_TanobyRuins_LiptooChamber/map.json b/data/maps/SevenIsland_TanobyRuins_LiptooChamber/map.json index 36ae546ee..5786a9f73 100644 --- a/data/maps/SevenIsland_TanobyRuins_LiptooChamber/map.json +++ b/data/maps/SevenIsland_TanobyRuins_LiptooChamber/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEVEN_ISLAND_TANOBY_RUINS_LIPTOO_CHAMBER", "name": "SevenIsland_TanobyRuins_LiptooChamber", "layout": "LAYOUT_SEVEN_ISLAND_TANOBY_RUINS_LIPTOO_CHAMBER", - "music": "MUS_NANAISEKI", + "music": "MUS_SEVII_DUNGEON", "region_map_section": "MAPSEC_LIPTOO_CHAMBER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SevenIsland_TanobyRuins_MoneanChamber/map.json b/data/maps/SevenIsland_TanobyRuins_MoneanChamber/map.json index e7fc05f59..efb2dc13c 100644 --- a/data/maps/SevenIsland_TanobyRuins_MoneanChamber/map.json +++ b/data/maps/SevenIsland_TanobyRuins_MoneanChamber/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEVEN_ISLAND_TANOBY_RUINS_MONEAN_CHAMBER", "name": "SevenIsland_TanobyRuins_MoneanChamber", "layout": "LAYOUT_SEVEN_ISLAND_TANOBY_RUINS_MONEAN_CHAMBER", - "music": "MUS_NANAISEKI", + "music": "MUS_SEVII_DUNGEON", "region_map_section": "MAPSEC_MONEAN_CHAMBER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SevenIsland_TanobyRuins_RixyChamber/map.json b/data/maps/SevenIsland_TanobyRuins_RixyChamber/map.json index c974e67a5..e0a656acf 100644 --- a/data/maps/SevenIsland_TanobyRuins_RixyChamber/map.json +++ b/data/maps/SevenIsland_TanobyRuins_RixyChamber/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEVEN_ISLAND_TANOBY_RUINS_RIXY_CHAMBER", "name": "SevenIsland_TanobyRuins_RixyChamber", "layout": "LAYOUT_SEVEN_ISLAND_TANOBY_RUINS_RIXY_CHAMBER", - "music": "MUS_NANAISEKI", + "music": "MUS_SEVII_DUNGEON", "region_map_section": "MAPSEC_RIXY_CHAMBER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SevenIsland_TanobyRuins_ScufibChamber/map.json b/data/maps/SevenIsland_TanobyRuins_ScufibChamber/map.json index 0a604bfdd..266b18579 100644 --- a/data/maps/SevenIsland_TanobyRuins_ScufibChamber/map.json +++ b/data/maps/SevenIsland_TanobyRuins_ScufibChamber/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEVEN_ISLAND_TANOBY_RUINS_SCUFIB_CHAMBER", "name": "SevenIsland_TanobyRuins_ScufibChamber", "layout": "LAYOUT_SEVEN_ISLAND_TANOBY_RUINS_SCUFIB_CHAMBER", - "music": "MUS_NANAISEKI", + "music": "MUS_SEVII_DUNGEON", "region_map_section": "MAPSEC_SCUFIB_CHAMBER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/map.json b/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/map.json index c201caaf8..a1cd61249 100644 --- a/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/map.json +++ b/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEVEN_ISLAND_TANOBY_RUINS_VIAPOIS_CHAMBER", "name": "SevenIsland_TanobyRuins_ViapoisChamber", "layout": "LAYOUT_SEVEN_ISLAND_TANOBY_RUINS_VIAPOIS_CHAMBER", - "music": "MUS_NANAISEKI", + "music": "MUS_SEVII_DUNGEON", "region_map_section": "MAPSEC_VIAPOIS_CHAMBER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SevenIsland_TanobyRuins_WeepthChamber/map.json b/data/maps/SevenIsland_TanobyRuins_WeepthChamber/map.json index e85de29ad..b9e11db9b 100644 --- a/data/maps/SevenIsland_TanobyRuins_WeepthChamber/map.json +++ b/data/maps/SevenIsland_TanobyRuins_WeepthChamber/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEVEN_ISLAND_TANOBY_RUINS_WEEPTH_CHAMBER", "name": "SevenIsland_TanobyRuins_WeepthChamber", "layout": "LAYOUT_SEVEN_ISLAND_TANOBY_RUINS_WEEPTH_CHAMBER", - "music": "MUS_NANAISEKI", + "music": "MUS_SEVII_DUNGEON", "region_map_section": "MAPSEC_WEEPTH_CHAMBER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SevenIsland_TrainerTower/map.json b/data/maps/SevenIsland_TrainerTower/map.json index ded18057f..d6be87d75 100644 --- a/data/maps/SevenIsland_TrainerTower/map.json +++ b/data/maps/SevenIsland_TrainerTower/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER", "name": "SevenIsland_TrainerTower", "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER", - "music": "MUS_NANASHIMA", + "music": "MUS_SEVII_ROUTE", "region_map_section": "MAPSEC_TRAINER_TOWER", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/SilphCo_10F/map.json b/data/maps/SilphCo_10F/map.json index ac20284fc..b867283ab 100644 --- a/data/maps/SilphCo_10F/map.json +++ b/data/maps/SilphCo_10F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SILPH_CO_10F", "name": "SilphCo_10F", "layout": "LAYOUT_SILPH_CO_10F", - "music": "MUS_SHIRUHU", + "music": "MUS_SILPH", "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SilphCo_11F/map.json b/data/maps/SilphCo_11F/map.json index 33c454f88..07479d1d8 100644 --- a/data/maps/SilphCo_11F/map.json +++ b/data/maps/SilphCo_11F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SILPH_CO_11F", "name": "SilphCo_11F", "layout": "LAYOUT_SILPH_CO_11F", - "music": "MUS_SHIRUHU", + "music": "MUS_SILPH", "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SilphCo_11F/scripts.inc b/data/maps/SilphCo_11F/scripts.inc index 38de05842..eceaad4be 100644 --- a/data/maps/SilphCo_11F/scripts.inc +++ b/data/maps/SilphCo_11F/scripts.inc @@ -18,7 +18,7 @@ SilphCo_11F_EventScript_President:: @ 8161DFE checkitemspace ITEM_MASTER_BALL, 1 compare VAR_RESULT, FALSE goto_if_eq SilphCo_11F_EventScript_NoRoomForMasterBall - giveitem_msg SilphCo_11F_Text_ObtainedMasterBallFromPresident, ITEM_MASTER_BALL, 1, MUS_FAN5 + giveitem_msg SilphCo_11F_Text_ObtainedMasterBallFromPresident, ITEM_MASTER_BALL, 1, MUS_OBTAIN_KEY_ITEM msgbox SilphCo_11F_Text_ThatsOurSecretPrototype setflag FLAG_GOT_MASTER_BALL_FROM_SILPH release diff --git a/data/maps/SilphCo_1F/map.json b/data/maps/SilphCo_1F/map.json index c2a26235a..aba93eb0a 100644 --- a/data/maps/SilphCo_1F/map.json +++ b/data/maps/SilphCo_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SILPH_CO_1F", "name": "SilphCo_1F", "layout": "LAYOUT_SILPH_CO_1F", - "music": "MUS_SHIRUHU", + "music": "MUS_SILPH", "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SilphCo_2F/map.json b/data/maps/SilphCo_2F/map.json index f5aab3042..55b2da754 100644 --- a/data/maps/SilphCo_2F/map.json +++ b/data/maps/SilphCo_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SILPH_CO_2F", "name": "SilphCo_2F", "layout": "LAYOUT_SILPH_CO_2F", - "music": "MUS_SHIRUHU", + "music": "MUS_SILPH", "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SilphCo_3F/map.json b/data/maps/SilphCo_3F/map.json index 46b1381c8..b8617c70b 100644 --- a/data/maps/SilphCo_3F/map.json +++ b/data/maps/SilphCo_3F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SILPH_CO_3F", "name": "SilphCo_3F", "layout": "LAYOUT_SILPH_CO_3F", - "music": "MUS_SHIRUHU", + "music": "MUS_SILPH", "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SilphCo_4F/map.json b/data/maps/SilphCo_4F/map.json index bb1db0507..e02b30912 100644 --- a/data/maps/SilphCo_4F/map.json +++ b/data/maps/SilphCo_4F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SILPH_CO_4F", "name": "SilphCo_4F", "layout": "LAYOUT_SILPH_CO_4F", - "music": "MUS_SHIRUHU", + "music": "MUS_SILPH", "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SilphCo_5F/map.json b/data/maps/SilphCo_5F/map.json index 960fe8ef6..6fcc56f08 100644 --- a/data/maps/SilphCo_5F/map.json +++ b/data/maps/SilphCo_5F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SILPH_CO_5F", "name": "SilphCo_5F", "layout": "LAYOUT_SILPH_CO_5F", - "music": "MUS_SHIRUHU", + "music": "MUS_SILPH", "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SilphCo_6F/map.json b/data/maps/SilphCo_6F/map.json index 35ec915ad..ca17ad516 100644 --- a/data/maps/SilphCo_6F/map.json +++ b/data/maps/SilphCo_6F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SILPH_CO_6F", "name": "SilphCo_6F", "layout": "LAYOUT_SILPH_CO_6F", - "music": "MUS_SHIRUHU", + "music": "MUS_SILPH", "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SilphCo_7F/map.json b/data/maps/SilphCo_7F/map.json index 2857c0a7a..2257544b7 100644 --- a/data/maps/SilphCo_7F/map.json +++ b/data/maps/SilphCo_7F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SILPH_CO_7F", "name": "SilphCo_7F", "layout": "LAYOUT_SILPH_CO_7F", - "music": "MUS_SHIRUHU", + "music": "MUS_SILPH", "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SilphCo_7F/scripts.inc b/data/maps/SilphCo_7F/scripts.inc index 0bfac0151..c43c8bad1 100644 --- a/data/maps/SilphCo_7F/scripts.inc +++ b/data/maps/SilphCo_7F/scripts.inc @@ -32,7 +32,7 @@ SilphCo_7F_EventScript_RivalTriggerBottom:: @ 81619C8 SilphCo_7F_EventScript_RivalScene:: @ 81619D4 textcolor 0 - playbgm MUS_RIVAL1, 0 + playbgm MUS_ENCOUNTER_RIVAL, 0 applymovement 1, Movement_ExclamationMark waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown @@ -53,12 +53,12 @@ SilphCo_7F_EventScript_RivalScene:: @ 81619D4 call_if_eq SilphCo_7F_EventScript_RivalCharmander msgbox SilphCo_7F_Text_RivalPostBattle closemessage - playbgm MUS_RIVAL2, 0 + playbgm MUS_RIVAL_EXIT, 0 compare VAR_TEMP_1, 0 call_if_eq SilphCo_7F_EventScript_RivalExitTop compare VAR_TEMP_1, 1 call_if_eq SilphCo_7F_EventScript_RivalExitBottom - playse SE_TK_WARPIN + playse SE_WARP_IN fadedefaultbgm removeobject 1 waitse @@ -138,7 +138,7 @@ SilphCo_7F_EventScript_LaprasGuy:: @ 8161AC8 SilphCo_7F_EventScript_ReceiveLaprasParty:: @ 8161B12 textcolor 3 - playfanfare MUS_FANFA1 + playfanfare MUS_LEVEL_UP message SilphCo_7F_Text_ObtainedLaprasFromEmployee waitmessage waitfanfare @@ -153,7 +153,7 @@ SilphCo_7F_EventScript_ReceiveLaprasParty:: @ 8161B12 SilphCo_7F_EventScript_ReceiveLaprasPC:: @ 8161B45 textcolor 3 - playfanfare MUS_FANFA1 + playfanfare MUS_LEVEL_UP message SilphCo_7F_Text_ObtainedLaprasFromEmployee waitmessage waitfanfare diff --git a/data/maps/SilphCo_8F/map.json b/data/maps/SilphCo_8F/map.json index 7f83591ca..ed2d8dd32 100644 --- a/data/maps/SilphCo_8F/map.json +++ b/data/maps/SilphCo_8F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SILPH_CO_8F", "name": "SilphCo_8F", "layout": "LAYOUT_SILPH_CO_8F", - "music": "MUS_SHIRUHU", + "music": "MUS_SILPH", "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SilphCo_9F/map.json b/data/maps/SilphCo_9F/map.json index e164a4596..a5cb18329 100644 --- a/data/maps/SilphCo_9F/map.json +++ b/data/maps/SilphCo_9F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SILPH_CO_9F", "name": "SilphCo_9F", "layout": "LAYOUT_SILPH_CO_9F", - "music": "MUS_SHIRUHU", + "music": "MUS_SILPH", "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SilphCo_Elevator/map.json b/data/maps/SilphCo_Elevator/map.json index 491ca323c..95e2bdfcd 100644 --- a/data/maps/SilphCo_Elevator/map.json +++ b/data/maps/SilphCo_Elevator/map.json @@ -2,7 +2,7 @@ "id": "MAP_SILPH_CO_ELEVATOR", "name": "SilphCo_Elevator", "layout": "LAYOUT_SILPH_CO_ELEVATOR", - "music": "MUS_SHIRUHU", + "music": "MUS_SILPH", "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SixIsland/map.json b/data/maps/SixIsland/map.json index 6156df736..89d0c6eff 100644 --- a/data/maps/SixIsland/map.json +++ b/data/maps/SixIsland/map.json @@ -2,7 +2,7 @@ "id": "MAP_SIX_ISLAND", "name": "SixIsland", "layout": "LAYOUT_SIX_ISLAND", - "music": "MUS_NANA67", + "music": "MUS_SEVII_67", "region_map_section": "MAPSEC_SIX_ISLAND", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/SixIsland_AlteringCave/map.json b/data/maps/SixIsland_AlteringCave/map.json index 124496895..b6447b1b2 100644 --- a/data/maps/SixIsland_AlteringCave/map.json +++ b/data/maps/SixIsland_AlteringCave/map.json @@ -2,7 +2,7 @@ "id": "MAP_SIX_ISLAND_ALTERING_CAVE", "name": "SixIsland_AlteringCave", "layout": "LAYOUT_SIX_ISLAND_ALTERING_CAVE", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_ALTERING_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SixIsland_DottedHole_1F/map.json b/data/maps/SixIsland_DottedHole_1F/map.json index f581ee319..802d67e26 100644 --- a/data/maps/SixIsland_DottedHole_1F/map.json +++ b/data/maps/SixIsland_DottedHole_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SIX_ISLAND_DOTTED_HOLE_1F", "name": "SixIsland_DottedHole_1F", "layout": "LAYOUT_SIX_ISLAND_DOTTED_HOLE_1F", - "music": "MUS_NANAISEKI", + "music": "MUS_SEVII_DUNGEON", "region_map_section": "MAPSEC_DOTTED_HOLE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SixIsland_DottedHole_B1F/map.json b/data/maps/SixIsland_DottedHole_B1F/map.json index 1fcfc933d..7522ff81c 100644 --- a/data/maps/SixIsland_DottedHole_B1F/map.json +++ b/data/maps/SixIsland_DottedHole_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SIX_ISLAND_DOTTED_HOLE_B1F", "name": "SixIsland_DottedHole_B1F", "layout": "LAYOUT_SIX_ISLAND_DOTTED_HOLE_B1F", - "music": "MUS_NANAISEKI", + "music": "MUS_SEVII_DUNGEON", "region_map_section": "MAPSEC_DOTTED_HOLE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SixIsland_DottedHole_B2F/map.json b/data/maps/SixIsland_DottedHole_B2F/map.json index 8458d04be..e45898a49 100644 --- a/data/maps/SixIsland_DottedHole_B2F/map.json +++ b/data/maps/SixIsland_DottedHole_B2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SIX_ISLAND_DOTTED_HOLE_B2F", "name": "SixIsland_DottedHole_B2F", "layout": "LAYOUT_SIX_ISLAND_DOTTED_HOLE_B2F", - "music": "MUS_NANAISEKI", + "music": "MUS_SEVII_DUNGEON", "region_map_section": "MAPSEC_DOTTED_HOLE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SixIsland_DottedHole_B3F/map.json b/data/maps/SixIsland_DottedHole_B3F/map.json index 154c12c9e..5c871db50 100644 --- a/data/maps/SixIsland_DottedHole_B3F/map.json +++ b/data/maps/SixIsland_DottedHole_B3F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SIX_ISLAND_DOTTED_HOLE_B3F", "name": "SixIsland_DottedHole_B3F", "layout": "LAYOUT_SIX_ISLAND_DOTTED_HOLE_B3F", - "music": "MUS_NANAISEKI", + "music": "MUS_SEVII_DUNGEON", "region_map_section": "MAPSEC_DOTTED_HOLE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SixIsland_DottedHole_B4F/map.json b/data/maps/SixIsland_DottedHole_B4F/map.json index 92633086e..108aa3cce 100644 --- a/data/maps/SixIsland_DottedHole_B4F/map.json +++ b/data/maps/SixIsland_DottedHole_B4F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SIX_ISLAND_DOTTED_HOLE_B4F", "name": "SixIsland_DottedHole_B4F", "layout": "LAYOUT_SIX_ISLAND_DOTTED_HOLE_B4F", - "music": "MUS_NANAISEKI", + "music": "MUS_SEVII_DUNGEON", "region_map_section": "MAPSEC_DOTTED_HOLE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SixIsland_DottedHole_SapphireRoom/map.json b/data/maps/SixIsland_DottedHole_SapphireRoom/map.json index a6b91e4d6..9909f8a4a 100644 --- a/data/maps/SixIsland_DottedHole_SapphireRoom/map.json +++ b/data/maps/SixIsland_DottedHole_SapphireRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_SIX_ISLAND_DOTTED_HOLE_SAPPHIRE_ROOM", "name": "SixIsland_DottedHole_SapphireRoom", "layout": "LAYOUT_SIX_ISLAND_DOTTED_HOLE_SAPPHIRE_ROOM", - "music": "MUS_NANAISEKI", + "music": "MUS_SEVII_DUNGEON", "region_map_section": "MAPSEC_DOTTED_HOLE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc b/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc index e0d558ae0..4792179ec 100644 --- a/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc +++ b/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc @@ -8,17 +8,17 @@ SixIsland_DottedHole_SapphireRoom_EventScript_Sapphire:: @ 81641B5 lock faceplayer textcolor 3 - playfanfare MUS_FAN5 + playfanfare MUS_OBTAIN_KEY_ITEM message SixIsland_DottedHole_SapphireRoom_Text_FoundSapphire waitmessage waitfanfare closemessage setobjectxyperm LOCALID_THIEF, 5, 0 addobject LOCALID_THIEF - playse SE_RU_HYUU + playse SE_FALL applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefFallIn waitmovement 0 - playse SE_W070 + playse SE_M_STRENGTH compare VAR_FACING, DIR_NORTH call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefLeft compare VAR_FACING, DIR_SOUTH @@ -71,7 +71,7 @@ SixIsland_DottedHole_SapphireRoom_EventScript_Sapphire:: @ 81641B5 call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_ThiefExitEast compare VAR_FACING, DIR_WEST call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_ThiefExitWest - playse SE_KAIDAN + playse SE_EXIT delay 35 removeobject LOCALID_THIEF setflag FLAG_LEARNED_YES_NAH_CHANSEY diff --git a/data/maps/SixIsland_GreenPath/map.json b/data/maps/SixIsland_GreenPath/map.json index 6a8499ab0..30ca97e51 100644 --- a/data/maps/SixIsland_GreenPath/map.json +++ b/data/maps/SixIsland_GreenPath/map.json @@ -2,7 +2,7 @@ "id": "MAP_SIX_ISLAND_GREEN_PATH", "name": "SixIsland_GreenPath", "layout": "LAYOUT_SIX_ISLAND_GREEN_PATH", - "music": "MUS_NANASHIMA", + "music": "MUS_SEVII_ROUTE", "region_map_section": "MAPSEC_GREEN_PATH", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/SixIsland_Harbor/map.json b/data/maps/SixIsland_Harbor/map.json index 598de86e0..ce3ba9b04 100644 --- a/data/maps/SixIsland_Harbor/map.json +++ b/data/maps/SixIsland_Harbor/map.json @@ -2,7 +2,7 @@ "id": "MAP_SIX_ISLAND_HARBOR", "name": "SixIsland_Harbor", "layout": "LAYOUT_ISLAND_HARBOR", - "music": "MUS_NANA67", + "music": "MUS_SEVII_67", "region_map_section": "MAPSEC_SIX_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SixIsland_House/map.json b/data/maps/SixIsland_House/map.json index ddb6de1c9..682351b4c 100644 --- a/data/maps/SixIsland_House/map.json +++ b/data/maps/SixIsland_House/map.json @@ -2,7 +2,7 @@ "id": "MAP_SIX_ISLAND_HOUSE", "name": "SixIsland_House", "layout": "LAYOUT_HOUSE3", - "music": "MUS_NANA67", + "music": "MUS_SEVII_67", "region_map_section": "MAPSEC_SIX_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SixIsland_Mart/map.json b/data/maps/SixIsland_Mart/map.json index 015822d63..7201f0851 100644 --- a/data/maps/SixIsland_Mart/map.json +++ b/data/maps/SixIsland_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_SIX_ISLAND_MART", "name": "SixIsland_Mart", "layout": "LAYOUT_MART", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_SIX_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SixIsland_OutcastIsland/map.json b/data/maps/SixIsland_OutcastIsland/map.json index c81781c12..1c353c29b 100644 --- a/data/maps/SixIsland_OutcastIsland/map.json +++ b/data/maps/SixIsland_OutcastIsland/map.json @@ -2,7 +2,7 @@ "id": "MAP_SIX_ISLAND_OUTCAST_ISLAND", "name": "SixIsland_OutcastIsland", "layout": "LAYOUT_SIX_ISLAND_OUTCAST_ISLAND", - "music": "MUS_NANASHIMA", + "music": "MUS_SEVII_ROUTE", "region_map_section": "MAPSEC_OUTCAST_ISLAND", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/SixIsland_PatternBush/map.json b/data/maps/SixIsland_PatternBush/map.json index 1546d370e..37c0cca48 100644 --- a/data/maps/SixIsland_PatternBush/map.json +++ b/data/maps/SixIsland_PatternBush/map.json @@ -2,7 +2,7 @@ "id": "MAP_SIX_ISLAND_PATTERN_BUSH", "name": "SixIsland_PatternBush", "layout": "LAYOUT_SIX_ISLAND_PATTERN_BUSH", - "music": "MUS_T_MORI", + "music": "MUS_VIRIDIAN_FOREST", "region_map_section": "MAPSEC_PATTERN_BUSH", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SixIsland_PokemonCenter_1F/map.json b/data/maps/SixIsland_PokemonCenter_1F/map.json index 24e873369..4ddf8f3b5 100644 --- a/data/maps/SixIsland_PokemonCenter_1F/map.json +++ b/data/maps/SixIsland_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SIX_ISLAND_POKEMON_CENTER_1F", "name": "SixIsland_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_SIX_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SixIsland_PokemonCenter_1F/scripts.inc b/data/maps/SixIsland_PokemonCenter_1F/scripts.inc index 72134595e..ff8f2c4e7 100644 --- a/data/maps/SixIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/SixIsland_PokemonCenter_1F/scripts.inc @@ -25,7 +25,7 @@ SixIsland_PokemonCenter_1F_EventScript_RivalScene:: @ 8171D97 textcolor 0 applymovement LOCALID_RIVAL, Movement_WalkInPlaceFastestDown waitmovement 0 - playbgm MUS_RIVAL1, 0 + playbgm MUS_ENCOUNTER_RIVAL, 0 applymovement LOCALID_RIVAL, Movement_ExclamationMark waitmovement 0 applymovement LOCALID_RIVAL, Movement_Delay48 @@ -39,7 +39,7 @@ SixIsland_PokemonCenter_1F_EventScript_RivalScene:: @ 8171D97 applymovement LOCALID_RIVAL, SixIsland_PokemonCenter_1F_Movement_RivalExit waitmovement 0 fadedefaultbgm - playse SE_KAIDAN + playse SE_EXIT delay 35 removeobject LOCALID_RIVAL setvar VAR_MAP_SCENE_SIX_ISLAND_POKEMON_CENTER_1F, 1 diff --git a/data/maps/SixIsland_PokemonCenter_2F/map.json b/data/maps/SixIsland_PokemonCenter_2F/map.json index 8db84cb02..6fa988e71 100644 --- a/data/maps/SixIsland_PokemonCenter_2F/map.json +++ b/data/maps/SixIsland_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SIX_ISLAND_POKEMON_CENTER_2F", "name": "SixIsland_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_SIX_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SixIsland_RuinValley/map.json b/data/maps/SixIsland_RuinValley/map.json index e24853081..1233ea32a 100644 --- a/data/maps/SixIsland_RuinValley/map.json +++ b/data/maps/SixIsland_RuinValley/map.json @@ -2,7 +2,7 @@ "id": "MAP_SIX_ISLAND_RUIN_VALLEY", "name": "SixIsland_RuinValley", "layout": "LAYOUT_SIX_ISLAND_RUIN_VALLEY", - "music": "MUS_NANASHIMA", + "music": "MUS_SEVII_ROUTE", "region_map_section": "MAPSEC_RUIN_VALLEY", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/SixIsland_WaterPath/map.json b/data/maps/SixIsland_WaterPath/map.json index acacd4d97..952fd541e 100644 --- a/data/maps/SixIsland_WaterPath/map.json +++ b/data/maps/SixIsland_WaterPath/map.json @@ -2,7 +2,7 @@ "id": "MAP_SIX_ISLAND_WATER_PATH", "name": "SixIsland_WaterPath", "layout": "LAYOUT_SIX_ISLAND_WATER_PATH", - "music": "MUS_NANASHIMA", + "music": "MUS_SEVII_ROUTE", "region_map_section": "MAPSEC_WATER_PATH", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/SixIsland_WaterPath_House1/map.json b/data/maps/SixIsland_WaterPath_House1/map.json index 32fd57521..88e50542f 100644 --- a/data/maps/SixIsland_WaterPath_House1/map.json +++ b/data/maps/SixIsland_WaterPath_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_SIX_ISLAND_WATER_PATH_HOUSE1", "name": "SixIsland_WaterPath_House1", "layout": "LAYOUT_HOUSE4", - "music": "MUS_HANADA", + "music": "MUS_FUCHSIA", "region_map_section": "MAPSEC_WATER_PATH", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SixIsland_WaterPath_House2/map.json b/data/maps/SixIsland_WaterPath_House2/map.json index b853b622e..fe1e53c65 100644 --- a/data/maps/SixIsland_WaterPath_House2/map.json +++ b/data/maps/SixIsland_WaterPath_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_SIX_ISLAND_WATER_PATH_HOUSE2", "name": "SixIsland_WaterPath_House2", "layout": "LAYOUT_HOUSE3", - "music": "MUS_HANADA", + "music": "MUS_FUCHSIA", "region_map_section": "MAPSEC_WATER_PATH", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ThreeIsland/map.json b/data/maps/ThreeIsland/map.json index db9fe9ef4..b760e50b2 100644 --- a/data/maps/ThreeIsland/map.json +++ b/data/maps/ThreeIsland/map.json @@ -2,7 +2,7 @@ "id": "MAP_THREE_ISLAND", "name": "ThreeIsland", "layout": "LAYOUT_THREE_ISLAND", - "music": "MUS_NANA123", + "music": "MUS_SEVII_123", "region_map_section": "MAPSEC_THREE_ISLAND", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/ThreeIsland/scripts.inc b/data/maps/ThreeIsland/scripts.inc index 484d8dba0..303fd046e 100644 --- a/data/maps/ThreeIsland/scripts.inc +++ b/data/maps/ThreeIsland/scripts.inc @@ -230,7 +230,7 @@ ThreeIsland_EventScript_BattleBikersScene:: @ 8167A59 waitmovement 0 applymovement LOCALID_BIKER1, ThreeIsland_Movement_BikerApproach waitmovement 0 - playbgm MUS_SHOUNEN, 0 + playbgm MUS_ENCOUNTER_BOY, 0 msgbox ThreeIsland_Text_WannaMakeSomethingOfYourStaring, MSGBOX_YESNO compare VAR_RESULT, NO goto_if_eq ThreeIsland_EventScript_LeaveBikersAlone @@ -243,7 +243,7 @@ ThreeIsland_EventScript_BattleBikersScene:: @ 8167A59 closemessage applymovement LOCALID_BIKER2, ThreeIsland_Movement_BikerApproach waitmovement 0 - playbgm MUS_SHOUNEN, 0 + playbgm MUS_ENCOUNTER_BOY, 0 msgbox ThreeIsland_Text_Biker2Intro setvar VAR_LAST_TALKED, LOCALID_BIKER2 trainerbattle_no_intro TRAINER_BIKER_GOON_2, ThreeIsland_Text_Biker2Defeat @@ -253,7 +253,7 @@ ThreeIsland_EventScript_BattleBikersScene:: @ 8167A59 closemessage applymovement LOCALID_BIKER3, ThreeIsland_Movement_BikerApproach waitmovement 0 - playbgm MUS_SHOUNEN, 0 + playbgm MUS_ENCOUNTER_BOY, 0 msgbox ThreeIsland_Text_Biker3Intro setvar VAR_LAST_TALKED, LOCALID_BIKER3 trainerbattle_no_intro TRAINER_BIKER_GOON_3, ThreeIsland_Text_Biker3Defeat @@ -275,7 +275,7 @@ ThreeIsland_EventScript_BattleBikersScene:: @ 8167A59 call_if_eq ThreeIsland_EventScript_PaxtonApproachMidRight compare VAR_TEMP_1, 4 call_if_eq ThreeIsland_EventScript_PaxtonApproachRight - playbgm MUS_SHOUNEN, 0 + playbgm MUS_ENCOUNTER_BOY, 0 msgbox ThreeIsland_Text_PaxtonIntro setvar VAR_LAST_TALKED, LOCALID_PAXTON trainerbattle_no_intro TRAINER_CUE_BALL_PAXTON, ThreeIsland_Text_PaxtonDefeat diff --git a/data/maps/ThreeIsland_BerryForest/map.json b/data/maps/ThreeIsland_BerryForest/map.json index 0845889ad..874b9f089 100644 --- a/data/maps/ThreeIsland_BerryForest/map.json +++ b/data/maps/ThreeIsland_BerryForest/map.json @@ -2,7 +2,7 @@ "id": "MAP_THREE_ISLAND_BERRY_FOREST", "name": "ThreeIsland_BerryForest", "layout": "LAYOUT_THREE_ISLAND_BERRY_FOREST", - "music": "MUS_T_MORI", + "music": "MUS_VIRIDIAN_FOREST", "region_map_section": "MAPSEC_BERRY_FOREST", "requires_flash": false, "weather": "WEATHER_SHADE", diff --git a/data/maps/ThreeIsland_BondBridge/map.json b/data/maps/ThreeIsland_BondBridge/map.json index 6ffa25cc4..80f8c79ed 100644 --- a/data/maps/ThreeIsland_BondBridge/map.json +++ b/data/maps/ThreeIsland_BondBridge/map.json @@ -2,7 +2,7 @@ "id": "MAP_THREE_ISLAND_BOND_BRIDGE", "name": "ThreeIsland_BondBridge", "layout": "LAYOUT_THREE_ISLAND_BOND_BRIDGE", - "music": "MUS_LOAD02", + "music": "MUS_ROUTE3", "region_map_section": "MAPSEC_BOND_BRIDGE", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/ThreeIsland_DunsparceTunnel/map.json b/data/maps/ThreeIsland_DunsparceTunnel/map.json index a256b5ae7..f5c957505 100644 --- a/data/maps/ThreeIsland_DunsparceTunnel/map.json +++ b/data/maps/ThreeIsland_DunsparceTunnel/map.json @@ -2,7 +2,7 @@ "id": "MAP_THREE_ISLAND_DUNSPARCE_TUNNEL", "name": "ThreeIsland_DunsparceTunnel", "layout": "LAYOUT_THREE_ISLAND_DUNSPARCE_TUNNEL", - "music": "MUS_T_MORI", + "music": "MUS_VIRIDIAN_FOREST", "region_map_section": "MAPSEC_THREE_ISLE_PATH", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ThreeIsland_Harbor/map.json b/data/maps/ThreeIsland_Harbor/map.json index d42861413..f9219d5c2 100644 --- a/data/maps/ThreeIsland_Harbor/map.json +++ b/data/maps/ThreeIsland_Harbor/map.json @@ -2,7 +2,7 @@ "id": "MAP_THREE_ISLAND_HARBOR", "name": "ThreeIsland_Harbor", "layout": "LAYOUT_ISLAND_HARBOR", - "music": "MUS_NANA123", + "music": "MUS_SEVII_123", "region_map_section": "MAPSEC_THREE_ISLE_PORT", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ThreeIsland_House1/map.json b/data/maps/ThreeIsland_House1/map.json index 049581de7..aa356997b 100644 --- a/data/maps/ThreeIsland_House1/map.json +++ b/data/maps/ThreeIsland_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_THREE_ISLAND_HOUSE1", "name": "ThreeIsland_House1", "layout": "LAYOUT_THREE_ISLAND_HOUSE1", - "music": "MUS_NANA123", + "music": "MUS_SEVII_123", "region_map_section": "MAPSEC_THREE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ThreeIsland_House2/map.json b/data/maps/ThreeIsland_House2/map.json index 3e32d7a0b..01fd8fe58 100644 --- a/data/maps/ThreeIsland_House2/map.json +++ b/data/maps/ThreeIsland_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_THREE_ISLAND_HOUSE2", "name": "ThreeIsland_House2", "layout": "LAYOUT_HOUSE3", - "music": "MUS_NANA123", + "music": "MUS_SEVII_123", "region_map_section": "MAPSEC_THREE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ThreeIsland_House3/map.json b/data/maps/ThreeIsland_House3/map.json index 7fad7b0fe..e3c4c467c 100644 --- a/data/maps/ThreeIsland_House3/map.json +++ b/data/maps/ThreeIsland_House3/map.json @@ -2,7 +2,7 @@ "id": "MAP_THREE_ISLAND_HOUSE3", "name": "ThreeIsland_House3", "layout": "LAYOUT_HOUSE3", - "music": "MUS_NANA123", + "music": "MUS_SEVII_123", "region_map_section": "MAPSEC_THREE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ThreeIsland_House4/map.json b/data/maps/ThreeIsland_House4/map.json index 8daa12557..25e2193a0 100644 --- a/data/maps/ThreeIsland_House4/map.json +++ b/data/maps/ThreeIsland_House4/map.json @@ -2,7 +2,7 @@ "id": "MAP_THREE_ISLAND_HOUSE4", "name": "ThreeIsland_House4", "layout": "LAYOUT_HOUSE3", - "music": "MUS_NANA123", + "music": "MUS_SEVII_123", "region_map_section": "MAPSEC_THREE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ThreeIsland_House5/map.json b/data/maps/ThreeIsland_House5/map.json index ba7f2a4de..19f808a4a 100644 --- a/data/maps/ThreeIsland_House5/map.json +++ b/data/maps/ThreeIsland_House5/map.json @@ -2,7 +2,7 @@ "id": "MAP_THREE_ISLAND_HOUSE5", "name": "ThreeIsland_House5", "layout": "LAYOUT_HOUSE3", - "music": "MUS_NANA123", + "music": "MUS_SEVII_123", "region_map_section": "MAPSEC_THREE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ThreeIsland_Mart/map.json b/data/maps/ThreeIsland_Mart/map.json index d83d1f533..c1e596005 100644 --- a/data/maps/ThreeIsland_Mart/map.json +++ b/data/maps/ThreeIsland_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_THREE_ISLAND_MART", "name": "ThreeIsland_Mart", "layout": "LAYOUT_MART", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_THREE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ThreeIsland_PokemonCenter_1F/map.json b/data/maps/ThreeIsland_PokemonCenter_1F/map.json index 6d0f0391b..532c0766c 100644 --- a/data/maps/ThreeIsland_PokemonCenter_1F/map.json +++ b/data/maps/ThreeIsland_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_THREE_ISLAND_POKEMON_CENTER_1F", "name": "ThreeIsland_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_THREE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ThreeIsland_PokemonCenter_2F/map.json b/data/maps/ThreeIsland_PokemonCenter_2F/map.json index 2911dc268..265d66974 100644 --- a/data/maps/ThreeIsland_PokemonCenter_2F/map.json +++ b/data/maps/ThreeIsland_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_THREE_ISLAND_POKEMON_CENTER_2F", "name": "ThreeIsland_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_THREE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ThreeIsland_Port/map.json b/data/maps/ThreeIsland_Port/map.json index 4858e3645..794b27b4e 100644 --- a/data/maps/ThreeIsland_Port/map.json +++ b/data/maps/ThreeIsland_Port/map.json @@ -2,7 +2,7 @@ "id": "MAP_THREE_ISLAND_PORT", "name": "ThreeIsland_Port", "layout": "LAYOUT_THREE_ISLAND_PORT", - "music": "MUS_LOAD02", + "music": "MUS_ROUTE3", "region_map_section": "MAPSEC_THREE_ISLE_PORT", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/TradeCenter/map.json b/data/maps/TradeCenter/map.json index c5f0322f2..4c35a5942 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_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_SPECIAL_AREA", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/TrainerTower_1F/map.json b/data/maps/TrainerTower_1F/map.json index e5f8fc029..4b12dc8a0 100644 --- a/data/maps/TrainerTower_1F/map.json +++ b/data/maps/TrainerTower_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_TRAINER_TOWER_1F", "name": "TrainerTower_1F", "layout": "LAYOUT_TRAINER_TOWER_1F", - "music": "MUS_T_TOWER", + "music": "MUS_TRAINER_TOWER", "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/TrainerTower_2F/map.json b/data/maps/TrainerTower_2F/map.json index b574b16c6..5972e45b4 100644 --- a/data/maps/TrainerTower_2F/map.json +++ b/data/maps/TrainerTower_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_TRAINER_TOWER_2F", "name": "TrainerTower_2F", "layout": "LAYOUT_TRAINER_TOWER_2F", - "music": "MUS_T_TOWER", + "music": "MUS_TRAINER_TOWER", "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/TrainerTower_3F/map.json b/data/maps/TrainerTower_3F/map.json index 6a3080531..10becb1c8 100644 --- a/data/maps/TrainerTower_3F/map.json +++ b/data/maps/TrainerTower_3F/map.json @@ -2,7 +2,7 @@ "id": "MAP_TRAINER_TOWER_3F", "name": "TrainerTower_3F", "layout": "LAYOUT_TRAINER_TOWER_3F", - "music": "MUS_T_TOWER", + "music": "MUS_TRAINER_TOWER", "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/TrainerTower_4F/map.json b/data/maps/TrainerTower_4F/map.json index 4dd210f5b..07c1183f3 100644 --- a/data/maps/TrainerTower_4F/map.json +++ b/data/maps/TrainerTower_4F/map.json @@ -2,7 +2,7 @@ "id": "MAP_TRAINER_TOWER_4F", "name": "TrainerTower_4F", "layout": "LAYOUT_TRAINER_TOWER_4F", - "music": "MUS_T_TOWER", + "music": "MUS_TRAINER_TOWER", "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/TrainerTower_5F/map.json b/data/maps/TrainerTower_5F/map.json index 0e0783e70..5f7d41602 100644 --- a/data/maps/TrainerTower_5F/map.json +++ b/data/maps/TrainerTower_5F/map.json @@ -2,7 +2,7 @@ "id": "MAP_TRAINER_TOWER_5F", "name": "TrainerTower_5F", "layout": "LAYOUT_TRAINER_TOWER_5F", - "music": "MUS_T_TOWER", + "music": "MUS_TRAINER_TOWER", "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/TrainerTower_6F/map.json b/data/maps/TrainerTower_6F/map.json index bbece23e5..8a30e713c 100644 --- a/data/maps/TrainerTower_6F/map.json +++ b/data/maps/TrainerTower_6F/map.json @@ -2,7 +2,7 @@ "id": "MAP_TRAINER_TOWER_6F", "name": "TrainerTower_6F", "layout": "LAYOUT_TRAINER_TOWER_6F", - "music": "MUS_T_TOWER", + "music": "MUS_TRAINER_TOWER", "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/TrainerTower_7F/map.json b/data/maps/TrainerTower_7F/map.json index 404078579..bfdd31391 100644 --- a/data/maps/TrainerTower_7F/map.json +++ b/data/maps/TrainerTower_7F/map.json @@ -2,7 +2,7 @@ "id": "MAP_TRAINER_TOWER_7F", "name": "TrainerTower_7F", "layout": "LAYOUT_TRAINER_TOWER_7F", - "music": "MUS_T_TOWER", + "music": "MUS_TRAINER_TOWER", "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/TrainerTower_8F/map.json b/data/maps/TrainerTower_8F/map.json index 7f4a70deb..2b3358855 100644 --- a/data/maps/TrainerTower_8F/map.json +++ b/data/maps/TrainerTower_8F/map.json @@ -2,7 +2,7 @@ "id": "MAP_TRAINER_TOWER_8F", "name": "TrainerTower_8F", "layout": "LAYOUT_TRAINER_TOWER_8F", - "music": "MUS_T_TOWER", + "music": "MUS_TRAINER_TOWER", "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/TrainerTower_Elevator/map.json b/data/maps/TrainerTower_Elevator/map.json index 869b50f82..c0a71f79e 100644 --- a/data/maps/TrainerTower_Elevator/map.json +++ b/data/maps/TrainerTower_Elevator/map.json @@ -2,7 +2,7 @@ "id": "MAP_TRAINER_TOWER_ELEVATOR", "name": "TrainerTower_Elevator", "layout": "LAYOUT_TRAINER_TOWER_ELEVATOR", - "music": "MUS_T_TOWER", + "music": "MUS_TRAINER_TOWER", "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/TrainerTower_Lobby/map.json b/data/maps/TrainerTower_Lobby/map.json index 25da318a3..1fa9f1869 100644 --- a/data/maps/TrainerTower_Lobby/map.json +++ b/data/maps/TrainerTower_Lobby/map.json @@ -2,7 +2,7 @@ "id": "MAP_TRAINER_TOWER_LOBBY", "name": "TrainerTower_Lobby", "layout": "LAYOUT_TRAINER_TOWER_LOBBY", - "music": "MUS_T_TOWER", + "music": "MUS_TRAINER_TOWER", "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/TrainerTower_Lobby/scripts.inc b/data/maps/TrainerTower_Lobby/scripts.inc index bdda45de8..016cc9e3d 100644 --- a/data/maps/TrainerTower_Lobby/scripts.inc +++ b/data/maps/TrainerTower_Lobby/scripts.inc @@ -52,7 +52,7 @@ TrainerTower_Lobby_EventScript_ExitElevator:: @ 81648C8 waitmovement 0 setmetatile 17, 10, METATILE_TrainerTower_CounterBarrier, 1 special DrawWholeMapView - playse SE_TK_KASYA + playse SE_CLICK waitse setvar VAR_TEMP_D, 0 releaseall diff --git a/data/maps/TrainerTower_Roof/map.json b/data/maps/TrainerTower_Roof/map.json index 2e7907af8..ee528571e 100644 --- a/data/maps/TrainerTower_Roof/map.json +++ b/data/maps/TrainerTower_Roof/map.json @@ -2,7 +2,7 @@ "id": "MAP_TRAINER_TOWER_ROOF", "name": "TrainerTower_Roof", "layout": "LAYOUT_TRAINER_TOWER_ROOF", - "music": "MUS_T_TOWER", + "music": "MUS_TRAINER_TOWER", "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/TwoIsland/map.json b/data/maps/TwoIsland/map.json index b3e7746c8..bb680ce77 100644 --- a/data/maps/TwoIsland/map.json +++ b/data/maps/TwoIsland/map.json @@ -2,7 +2,7 @@ "id": "MAP_TWO_ISLAND", "name": "TwoIsland", "layout": "LAYOUT_TWO_ISLAND", - "music": "MUS_NANA123", + "music": "MUS_SEVII_123", "region_map_section": "MAPSEC_TWO_ISLAND", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/TwoIsland_CapeBrink/map.json b/data/maps/TwoIsland_CapeBrink/map.json index 34a6766de..f4fbfe4e4 100644 --- a/data/maps/TwoIsland_CapeBrink/map.json +++ b/data/maps/TwoIsland_CapeBrink/map.json @@ -2,7 +2,7 @@ "id": "MAP_TWO_ISLAND_CAPE_BRINK", "name": "TwoIsland_CapeBrink", "layout": "LAYOUT_TWO_ISLAND_CAPE_BRINK", - "music": "MUS_LOAD02", + "music": "MUS_ROUTE3", "region_map_section": "MAPSEC_CAPE_BRINK", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/TwoIsland_CapeBrink_House/map.json b/data/maps/TwoIsland_CapeBrink_House/map.json index 277991b06..5ffda9b54 100644 --- a/data/maps/TwoIsland_CapeBrink_House/map.json +++ b/data/maps/TwoIsland_CapeBrink_House/map.json @@ -2,7 +2,7 @@ "id": "MAP_TWO_ISLAND_CAPE_BRINK_HOUSE", "name": "TwoIsland_CapeBrink_House", "layout": "LAYOUT_HOUSE3", - "music": "MUS_NANA123", + "music": "MUS_SEVII_123", "region_map_section": "MAPSEC_CAPE_BRINK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/TwoIsland_Harbor/map.json b/data/maps/TwoIsland_Harbor/map.json index d434c3e6a..be3073e86 100644 --- a/data/maps/TwoIsland_Harbor/map.json +++ b/data/maps/TwoIsland_Harbor/map.json @@ -2,7 +2,7 @@ "id": "MAP_TWO_ISLAND_HARBOR", "name": "TwoIsland_Harbor", "layout": "LAYOUT_ISLAND_HARBOR", - "music": "MUS_NANA123", + "music": "MUS_SEVII_123", "region_map_section": "MAPSEC_TWO_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/TwoIsland_House/map.json b/data/maps/TwoIsland_House/map.json index 798957582..acb50d880 100644 --- a/data/maps/TwoIsland_House/map.json +++ b/data/maps/TwoIsland_House/map.json @@ -2,7 +2,7 @@ "id": "MAP_TWO_ISLAND_HOUSE", "name": "TwoIsland_House", "layout": "LAYOUT_HOUSE3", - "music": "MUS_NANA123", + "music": "MUS_SEVII_123", "region_map_section": "MAPSEC_TWO_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/TwoIsland_JoyfulGameCorner/map.json b/data/maps/TwoIsland_JoyfulGameCorner/map.json index 4d99f4be4..213e7ea20 100644 --- a/data/maps/TwoIsland_JoyfulGameCorner/map.json +++ b/data/maps/TwoIsland_JoyfulGameCorner/map.json @@ -2,7 +2,7 @@ "id": "MAP_TWO_ISLAND_JOYFUL_GAME_CORNER", "name": "TwoIsland_JoyfulGameCorner", "layout": "LAYOUT_TWO_ISLAND_JOYFUL_GAME_CORNER", - "music": "MUS_SLOT", + "music": "MUS_GAME_CORNER", "region_map_section": "MAPSEC_TWO_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc index 2edfe5801..2e7290eb7 100644 --- a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc +++ b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc @@ -69,11 +69,11 @@ TwoIsland_JoyfulGameCorner_EventScript_HelpFindLostelleScene:: @ 817145F waitmovement 0 msgbox TwoIsland_JoyfulGameCorner_Text_PleaseHelpFindLostelle closemessage - playse SE_DOOR + playse SE_RS_DOOR waitse applymovement OBJ_EVENT_ID_PLAYER, Movement_17152C waitmovement 0 - playbgm MUS_SHOUNEN, 0 + playbgm MUS_ENCOUNTER_BOY, 0 addobject LOCALID_BIKER applymovement LOCALID_BIKER, TwoIsland_JoyfulGameCorner_Movement_BikerLookAround waitmovement 0 @@ -85,7 +85,7 @@ TwoIsland_JoyfulGameCorner_EventScript_HelpFindLostelleScene:: @ 817145F closemessage applymovement LOCALID_BIKER, Movement_WalkInPlaceFastestDown waitmovement 0 - playse SE_KAIDAN + playse SE_EXIT removeobject LOCALID_BIKER fadedefaultbgm delay 60 @@ -158,7 +158,7 @@ TwoIsland_JoyfulGameCorner_EventScript_GiveDaddyMeteorite:: @ 817158A msgbox TwoIsland_JoyfulGameCorner_Text_ThisIsForMe setvar VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 2 textcolor 3 - playfanfare MUS_ME_WAZA + playfanfare MUS_OBTAIN_TMHM message TwoIsland_JoyfulGameCorner_Text_HandedMeteoriteToLostellesDaddy waitmessage waitfanfare diff --git a/data/maps/TwoIsland_PokemonCenter_1F/map.json b/data/maps/TwoIsland_PokemonCenter_1F/map.json index 517821717..ad6c90d96 100644 --- a/data/maps/TwoIsland_PokemonCenter_1F/map.json +++ b/data/maps/TwoIsland_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_TWO_ISLAND_POKEMON_CENTER_1F", "name": "TwoIsland_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_TWO_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/TwoIsland_PokemonCenter_2F/map.json b/data/maps/TwoIsland_PokemonCenter_2F/map.json index bb7b1116f..d6c52f551 100644 --- a/data/maps/TwoIsland_PokemonCenter_2F/map.json +++ b/data/maps/TwoIsland_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_TWO_ISLAND_POKEMON_CENTER_2F", "name": "TwoIsland_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_TWO_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/UndergroundPath_EastEntrance/map.json b/data/maps/UndergroundPath_EastEntrance/map.json index fbbc056af..fdd6613a0 100644 --- a/data/maps/UndergroundPath_EastEntrance/map.json +++ b/data/maps/UndergroundPath_EastEntrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNDERGROUND_PATH_EAST_ENTRANCE", "name": "UndergroundPath_EastEntrance", "layout": "LAYOUT_UNDERGROUND_PATH_ENTRANCE", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_UNDERGROUND_PATH_2", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/UndergroundPath_EastWestTunnel/map.json b/data/maps/UndergroundPath_EastWestTunnel/map.json index 7f53b384e..9648812ad 100644 --- a/data/maps/UndergroundPath_EastWestTunnel/map.json +++ b/data/maps/UndergroundPath_EastWestTunnel/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNDERGROUND_PATH_EAST_WEST_TUNNEL", "name": "UndergroundPath_EastWestTunnel", "layout": "LAYOUT_UNDERGROUND_PATH_EAST_WEST_TUNNEL", - "music": "MUS_LOAD01", + "music": "MUS_ROUTE1", "region_map_section": "MAPSEC_UNDERGROUND_PATH_2", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/UndergroundPath_NorthEntrance/map.json b/data/maps/UndergroundPath_NorthEntrance/map.json index 3f7f48f68..9dda62055 100644 --- a/data/maps/UndergroundPath_NorthEntrance/map.json +++ b/data/maps/UndergroundPath_NorthEntrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNDERGROUND_PATH_NORTH_ENTRANCE", "name": "UndergroundPath_NorthEntrance", "layout": "LAYOUT_UNDERGROUND_PATH_ENTRANCE", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_UNDERGROUND_PATH", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/UndergroundPath_NorthSouthTunnel/map.json b/data/maps/UndergroundPath_NorthSouthTunnel/map.json index 35b7477b5..5358160b7 100644 --- a/data/maps/UndergroundPath_NorthSouthTunnel/map.json +++ b/data/maps/UndergroundPath_NorthSouthTunnel/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL", "name": "UndergroundPath_NorthSouthTunnel", "layout": "LAYOUT_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL", - "music": "MUS_LOAD01", + "music": "MUS_ROUTE1", "region_map_section": "MAPSEC_UNDERGROUND_PATH", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/UndergroundPath_SouthEntrance/map.json b/data/maps/UndergroundPath_SouthEntrance/map.json index e6153a7f7..9109d7035 100644 --- a/data/maps/UndergroundPath_SouthEntrance/map.json +++ b/data/maps/UndergroundPath_SouthEntrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNDERGROUND_PATH_SOUTH_ENTRANCE", "name": "UndergroundPath_SouthEntrance", "layout": "LAYOUT_UNDERGROUND_PATH_ENTRANCE", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_UNDERGROUND_PATH", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/UndergroundPath_WestEntrance/map.json b/data/maps/UndergroundPath_WestEntrance/map.json index efb5e86cd..9fbfb4cd6 100644 --- a/data/maps/UndergroundPath_WestEntrance/map.json +++ b/data/maps/UndergroundPath_WestEntrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNDERGROUND_PATH_WEST_ENTRANCE", "name": "UndergroundPath_WestEntrance", "layout": "LAYOUT_UNDERGROUND_PATH_ENTRANCE", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_UNDERGROUND_PATH_2", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/UnionRoom/map.json b/data/maps/UnionRoom/map.json index d1342af5a..ec4ea7e21 100644 --- a/data/maps/UnionRoom/map.json +++ b/data/maps/UnionRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNION_ROOM", "name": "UnionRoom", "layout": "LAYOUT_UNION_ROOM", - "music": "MUS_UNION", + "music": "MUS_UNION_ROOM", "region_map_section": "MAPSEC_SPECIAL_AREA", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/UnknownMap_18_01/map.json b/data/maps/UnknownMap_18_01/map.json index a00f28f90..603f2bc97 100644 --- a/data/maps/UnknownMap_18_01/map.json +++ b/data/maps/UnknownMap_18_01/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNKNOWN_MAP_18_01", "name": "UnknownMap_18_01", "layout": "LAYOUT_HOUSE2", - "music": "MUS_LOAD02", + "music": "MUS_ROUTE3", "region_map_section": "MAPSEC_ROUTE_6", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/UnusedHouse_27_00/map.json b/data/maps/UnusedHouse_27_00/map.json index 6d93604e4..0d5b626e3 100644 --- a/data/maps/UnusedHouse_27_00/map.json +++ b/data/maps/UnusedHouse_27_00/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNUSED_HOUSE_27_00", "name": "UnusedHouse_27_00", "layout": "LAYOUT_HOUSE2", - "music": "MUS_LOAD02", + "music": "MUS_ROUTE3", "region_map_section": "MAPSEC_ROUTE_19", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/UnusedHouse_29_00/map.json b/data/maps/UnusedHouse_29_00/map.json index 50dfe3d62..f5563c4cb 100644 --- a/data/maps/UnusedHouse_29_00/map.json +++ b/data/maps/UnusedHouse_29_00/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNUSED_HOUSE_29_00", "name": "UnusedHouse_29_00", "layout": "LAYOUT_HOUSE2", - "music": "MUS_CHAMP_R", + "music": "MUS_VICTORY_ROAD", "region_map_section": "MAPSEC_ROUTE_23", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/UnusedHouse_31_05/map.json b/data/maps/UnusedHouse_31_05/map.json index 21ec7325d..9e850ee52 100644 --- a/data/maps/UnusedHouse_31_05/map.json +++ b/data/maps/UnusedHouse_31_05/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNUSED_HOUSE_31_05", "name": "UnusedHouse_31_05", "layout": "LAYOUT_HOUSE4", - "music": "MUS_NANA67", + "music": "MUS_SEVII_67", "region_map_section": "MAPSEC_SEVEN_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VermilionCity/map.json b/data/maps/VermilionCity/map.json index c03df3c58..9c3a5e558 100644 --- a/data/maps/VermilionCity/map.json +++ b/data/maps/VermilionCity/map.json @@ -2,7 +2,7 @@ "id": "MAP_VERMILION_CITY", "name": "VermilionCity", "layout": "LAYOUT_VERMILION_CITY", - "music": "MUS_KUCHIBA", + "music": "MUS_VERMILLION", "region_map_section": "MAPSEC_VERMILION_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/VermilionCity_Gym/scripts.inc b/data/maps/VermilionCity_Gym/scripts.inc index 2ac39f40e..17dae87dd 100644 --- a/data/maps/VermilionCity_Gym/scripts.inc +++ b/data/maps/VermilionCity_Gym/scripts.inc @@ -181,7 +181,7 @@ VermilionCity_Gym_EventScript_FoundSwitchTwo:: @ 816B8CB closemessage call VermilionCity_Gym_EventScript_SetBeamsOff special DrawWholeMapView - playse SE_KI_GASYAN + playse SE_UNLOCK waitse setflag FLAG_FOUND_BOTH_VERMILION_GYM_SWITCHES releaseall diff --git a/data/maps/VermilionCity_Gym/text.inc b/data/maps/VermilionCity_Gym/text.inc index e364f8d10..e640a2c7c 100644 --- a/data/maps/VermilionCity_Gym/text.inc +++ b/data/maps/VermilionCity_Gym/text.inc @@ -7,7 +7,7 @@ VermilionCity_Gym_Text_LtSurgeIntro:: @ 8194BA4 .string "saved me during the war!\p" .string "They zapped my enemies into\n" .string "paralysis!\p" - .string "The same as I'll do to you!{PLAY_BGM}{MUS_EXEYE}$" + .string "The same as I'll do to you!{PLAY_BGM}{MUS_ENCOUNTER_GYM_LEADER}$" VermilionCity_Gym_Text_LtSurgePostBattle:: @ 8194C8E .string "A little word of advice, kid!\p" diff --git a/data/maps/VermilionCity_House1/map.json b/data/maps/VermilionCity_House1/map.json index 541974a38..5ddb668e4 100644 --- a/data/maps/VermilionCity_House1/map.json +++ b/data/maps/VermilionCity_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_VERMILION_CITY_HOUSE1", "name": "VermilionCity_House1", "layout": "LAYOUT_HOUSE1", - "music": "MUS_HANADA", + "music": "MUS_FUCHSIA", "region_map_section": "MAPSEC_VERMILION_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VermilionCity_House2/map.json b/data/maps/VermilionCity_House2/map.json index 30a081607..c91403a4e 100644 --- a/data/maps/VermilionCity_House2/map.json +++ b/data/maps/VermilionCity_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_VERMILION_CITY_HOUSE2", "name": "VermilionCity_House2", "layout": "LAYOUT_HOUSE1", - "music": "MUS_KUCHIBA", + "music": "MUS_VERMILLION", "region_map_section": "MAPSEC_VERMILION_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VermilionCity_House3/map.json b/data/maps/VermilionCity_House3/map.json index d5afa8458..00228071a 100644 --- a/data/maps/VermilionCity_House3/map.json +++ b/data/maps/VermilionCity_House3/map.json @@ -2,7 +2,7 @@ "id": "MAP_VERMILION_CITY_HOUSE3", "name": "VermilionCity_House3", "layout": "LAYOUT_HOUSE1", - "music": "MUS_KUCHIBA", + "music": "MUS_VERMILLION", "region_map_section": "MAPSEC_VERMILION_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VermilionCity_Mart/map.json b/data/maps/VermilionCity_Mart/map.json index ba26357da..472cfd606 100644 --- a/data/maps/VermilionCity_Mart/map.json +++ b/data/maps/VermilionCity_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_VERMILION_CITY_MART", "name": "VermilionCity_Mart", "layout": "LAYOUT_MART", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_VERMILION_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VermilionCity_PokemonCenter_1F/map.json b/data/maps/VermilionCity_PokemonCenter_1F/map.json index b14fc3fb5..d08b85b28 100644 --- a/data/maps/VermilionCity_PokemonCenter_1F/map.json +++ b/data/maps/VermilionCity_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_VERMILION_CITY_POKEMON_CENTER_1F", "name": "VermilionCity_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_VERMILION_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VermilionCity_PokemonCenter_2F/map.json b/data/maps/VermilionCity_PokemonCenter_2F/map.json index 1e233913e..8866e68b4 100644 --- a/data/maps/VermilionCity_PokemonCenter_2F/map.json +++ b/data/maps/VermilionCity_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_VERMILION_CITY_POKEMON_CENTER_2F", "name": "VermilionCity_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_VERMILION_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VermilionCity_PokemonFanClub/map.json b/data/maps/VermilionCity_PokemonFanClub/map.json index dfa50ca79..b5df8639c 100644 --- a/data/maps/VermilionCity_PokemonFanClub/map.json +++ b/data/maps/VermilionCity_PokemonFanClub/map.json @@ -2,7 +2,7 @@ "id": "MAP_VERMILION_CITY_POKEMON_FAN_CLUB", "name": "VermilionCity_PokemonFanClub", "layout": "LAYOUT_VERMILION_CITY_POKEMON_FAN_CLUB", - "music": "MUS_KUCHIBA", + "music": "MUS_VERMILLION", "region_map_section": "MAPSEC_VERMILION_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VermilionCity_PokemonFanClub/scripts.inc b/data/maps/VermilionCity_PokemonFanClub/scripts.inc index 09f8d1d8b..a7ba114e1 100644 --- a/data/maps/VermilionCity_PokemonFanClub/scripts.inc +++ b/data/maps/VermilionCity_PokemonFanClub/scripts.inc @@ -26,7 +26,7 @@ VermilionCity_PokemonFanClub_EventScript_ChairmanStory:: @ 816B4B1 compare VAR_RESULT, FALSE goto_if_eq VermilionCity_PokemonFanClub_EventScript_NoRoomForBikeVoucher setflag FLAG_GOT_BIKE_VOUCHER - giveitem_msg VermilionCity_PokemonFanClub_Text_ReceivedBikeVoucherFromChairman, ITEM_BIKE_VOUCHER, 1, MUS_FAN5 + giveitem_msg VermilionCity_PokemonFanClub_Text_ReceivedBikeVoucherFromChairman, ITEM_BIKE_VOUCHER, 1, MUS_OBTAIN_KEY_ITEM msgbox VermilionCity_PokemonFanClub_Text_ExplainBikeVoucher release end diff --git a/data/maps/VictoryRoad_1F/map.json b/data/maps/VictoryRoad_1F/map.json index 4593b178c..45801a27c 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_OTSUKIMI", + "music": "MUS_MT_MOON", "region_map_section": "MAPSEC_KANTO_VICTORY_ROAD", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VictoryRoad_1F/scripts.inc b/data/maps/VictoryRoad_1F/scripts.inc index 5bdc91202..4c300e6e2 100644 --- a/data/maps/VictoryRoad_1F/scripts.inc +++ b/data/maps/VictoryRoad_1F/scripts.inc @@ -23,7 +23,7 @@ VictoryRoad_1F_EventScript_FloorSwitch:: @ 8160F33 goto_if_eq VictoryRoad_1F_EventScript_FloorSwitchAlreadyPressed setmetatile 12, 14, METATILE_Cave_Floor_Ledge_Top, 0 setmetatile 12, 15, METATILE_Cave_Floor_Ledge_Bottom, 0 - playse SE_RU_GASYAN + playse SE_ICE_BREAK special DrawWholeMapView waitse moveobjectoffscreen 5 diff --git a/data/maps/VictoryRoad_2F/map.json b/data/maps/VictoryRoad_2F/map.json index 1b3c43ef6..0c389ff08 100644 --- a/data/maps/VictoryRoad_2F/map.json +++ b/data/maps/VictoryRoad_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_VICTORY_ROAD_2F", "name": "VictoryRoad_2F", "layout": "LAYOUT_VICTORY_ROAD_2F", - "music": "MUS_OTSUKIMI", + "music": "MUS_MT_MOON", "region_map_section": "MAPSEC_KANTO_VICTORY_ROAD", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VictoryRoad_2F/scripts.inc b/data/maps/VictoryRoad_2F/scripts.inc index 1dfd658ae..b9436a11b 100644 --- a/data/maps/VictoryRoad_2F/scripts.inc +++ b/data/maps/VictoryRoad_2F/scripts.inc @@ -25,7 +25,7 @@ VictoryRoad_2F_EventScript_FloorSwitch1:: @ 8160FD5 goto_if_eq VictoryRoad_2F_EventScript_FloorSwitch1AlreadyPressed setmetatile 13, 10, METATILE_Cave_Floor_Ledge_Top, 0 setmetatile 13, 11, METATILE_Cave_Floor_Ledge_Bottom, 0 - playse SE_RU_GASYAN + playse SE_ICE_BREAK special DrawWholeMapView waitse moveobjectoffscreen 11 @@ -43,7 +43,7 @@ VictoryRoad_2F_EventScript_FloorSwitch2:: @ 8161006 goto_if_eq VictoryRoad_2F_EventScript_FloorSwitch2AlreadyPressed setmetatile 33, 16, METATILE_Cave_Floor_Ledge_Top, 0 setmetatile 33, 17, METATILE_Cave_Floor_Ledge_Bottom, 0 - playse SE_RU_GASYAN + playse SE_ICE_BREAK special DrawWholeMapView waitse moveobjectoffscreen 12 diff --git a/data/maps/VictoryRoad_3F/map.json b/data/maps/VictoryRoad_3F/map.json index 58870f921..c53d1d2cc 100644 --- a/data/maps/VictoryRoad_3F/map.json +++ b/data/maps/VictoryRoad_3F/map.json @@ -2,7 +2,7 @@ "id": "MAP_VICTORY_ROAD_3F", "name": "VictoryRoad_3F", "layout": "LAYOUT_VICTORY_ROAD_3F", - "music": "MUS_OTSUKIMI", + "music": "MUS_MT_MOON", "region_map_section": "MAPSEC_KANTO_VICTORY_ROAD", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VictoryRoad_3F/scripts.inc b/data/maps/VictoryRoad_3F/scripts.inc index f601d83be..6af6eb0bc 100644 --- a/data/maps/VictoryRoad_3F/scripts.inc +++ b/data/maps/VictoryRoad_3F/scripts.inc @@ -18,7 +18,7 @@ VictoryRoad_3F_EventScript_FloorSwitch:: @ 81610CF goto_if_eq VictoryRoad_3F_EventScript_FloorSwitchAlreadyPressed setmetatile 12, 12, METATILE_Cave_Floor_Ledge_Top, 0 setmetatile 12, 13, METATILE_Cave_Floor_Ledge_Bottom, 0 - playse SE_RU_GASYAN + playse SE_ICE_BREAK special DrawWholeMapView waitse moveobjectoffscreen 7 diff --git a/data/maps/ViridianCity/map.json b/data/maps/ViridianCity/map.json index 0c3a19925..ea6a6794a 100644 --- a/data/maps/ViridianCity/map.json +++ b/data/maps/ViridianCity/map.json @@ -2,7 +2,7 @@ "id": "MAP_VIRIDIAN_CITY", "name": "ViridianCity", "layout": "LAYOUT_VIRIDIAN_CITY", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_VIRIDIAN_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/ViridianCity_Gym/text.inc b/data/maps/ViridianCity_Gym/text.inc index 38561c011..44ee4d9bb 100644 --- a/data/maps/ViridianCity_Gym/text.inc +++ b/data/maps/ViridianCity_Gym/text.inc @@ -7,14 +7,14 @@ ViridianCity_Gym_Text_GiovanniIntro:: @ 818F352 .string "So be it.\l" .string "This time, I'm not holding back!\p" .string "Once more, you shall face\n" - .string "GIOVANNI, the greatest TRAINER!{PLAY_BGM}{MUS_ROCKET}$" + .string "GIOVANNI, the greatest TRAINER!{PLAY_BGM}{MUS_ENCOUNTER_ROCKET}$" ViridianCity_Gym_Text_GiovanniDefeat:: @ 818F43F .string "Ha!\n" .string "That was a truly intense fight.\l" .string "You have won!\p" .string "As proof, here is the EARTHBADGE!\n" - .string "{PAUSE_MUSIC}{PLAY_BGM}{MUS_ME_BACHI}{PAUSE 0xFE}{PAUSE 0x56}{RESUME_MUSIC}$" + .string "{PAUSE_MUSIC}{PLAY_BGM}{MUS_OBTAIN_BADGE}{PAUSE 0xFE}{PAUSE 0x56}{RESUME_MUSIC}$" ViridianCity_Gym_Text_GiovanniPostBattle:: @ 818F4A2 .string "Having lost in this fashion, \n" diff --git a/data/maps/ViridianCity_House1/map.json b/data/maps/ViridianCity_House1/map.json index e46f3be00..eb5780daa 100644 --- a/data/maps/ViridianCity_House1/map.json +++ b/data/maps/ViridianCity_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_VIRIDIAN_CITY_HOUSE1", "name": "ViridianCity_House1", "layout": "LAYOUT_VIRIDIAN_CITY_HOUSE1", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_VIRIDIAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ViridianCity_House2/map.json b/data/maps/ViridianCity_House2/map.json index e8c66213a..3b2b1cbbf 100644 --- a/data/maps/ViridianCity_House2/map.json +++ b/data/maps/ViridianCity_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_VIRIDIAN_CITY_HOUSE2", "name": "ViridianCity_House2", "layout": "LAYOUT_VIRIDIAN_CITY_HOUSE2", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_VIRIDIAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ViridianCity_Mart/map.json b/data/maps/ViridianCity_Mart/map.json index 26fc5e46f..0428205d0 100644 --- a/data/maps/ViridianCity_Mart/map.json +++ b/data/maps/ViridianCity_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_VIRIDIAN_CITY_MART", "name": "ViridianCity_Mart", "layout": "LAYOUT_MART", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_VIRIDIAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ViridianCity_Mart/scripts.inc b/data/maps/ViridianCity_Mart/scripts.inc index cb458b682..31d99c12c 100644 --- a/data/maps/ViridianCity_Mart/scripts.inc +++ b/data/maps/ViridianCity_Mart/scripts.inc @@ -28,7 +28,7 @@ ViridianCity_Mart_EventScript_ParcelScene:: @ 816A205 waitmovement 0 msgbox ViridianCity_Mart_Text_TakeThisToProfOak setvar VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 1 - giveitem_msg ViridianCity_Mart_Text_ReceivedOaksParcelFromClerk, ITEM_OAKS_PARCEL, 1, MUS_FAN5 + giveitem_msg ViridianCity_Mart_Text_ReceivedOaksParcelFromClerk, ITEM_OAKS_PARCEL, 1, MUS_OBTAIN_KEY_ITEM setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 5 releaseall end diff --git a/data/maps/ViridianCity_PokemonCenter_1F/map.json b/data/maps/ViridianCity_PokemonCenter_1F/map.json index e70f09c9f..935bcd10b 100644 --- a/data/maps/ViridianCity_PokemonCenter_1F/map.json +++ b/data/maps/ViridianCity_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_VIRIDIAN_CITY_POKEMON_CENTER_1F", "name": "ViridianCity_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_VIRIDIAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ViridianCity_PokemonCenter_2F/map.json b/data/maps/ViridianCity_PokemonCenter_2F/map.json index bdeac2c5c..d34ec1462 100644 --- a/data/maps/ViridianCity_PokemonCenter_2F/map.json +++ b/data/maps/ViridianCity_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_VIRIDIAN_CITY_POKEMON_CENTER_2F", "name": "ViridianCity_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_VIRIDIAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ViridianForest/map.json b/data/maps/ViridianForest/map.json index 0c6125d6e..f8d799501 100644 --- a/data/maps/ViridianForest/map.json +++ b/data/maps/ViridianForest/map.json @@ -2,7 +2,7 @@ "id": "MAP_VIRIDIAN_FOREST", "name": "ViridianForest", "layout": "LAYOUT_VIRIDIAN_FOREST", - "music": "MUS_T_MORI", + "music": "MUS_VIRIDIAN_FOREST", "region_map_section": "MAPSEC_VIRIDIAN_FOREST", "requires_flash": false, "weather": "WEATHER_SHADE", diff --git a/data/mystery_event_msg.s b/data/mystery_event_msg.s index 0e929220c..c9c7430ab 100644 --- a/data/mystery_event_msg.s +++ b/data/mystery_event_msg.s @@ -52,7 +52,7 @@ SurfPichu_GiveIfPossible: @ 8488EC4 vmessage sText_MysteryGiftEgg waitmessage waitbuttonpress - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM waitfanfare release end diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 52720d0cc..c581ba332 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -93,7 +93,7 @@ CableClub_EventScript_ExitLinkRoom:: @ 81BB2E5 call CableClub_EventScript_CloseLinkAndExitLinkRoom call CableClub_EventScript_CloseDirectCornerBarrier special DrawWholeMapView - playse SE_TK_KASYA + playse SE_CLICK erasebox 0, 0, 29, 19 releaseall end @@ -103,7 +103,7 @@ CableClub_EventScript_ExitMinigameRoom:: @ 81BB2FD call CableClub_EventScript_CloseLinkAndExitLinkRoom call CableClub_EventScript_CloseGameCornerBarrier special DrawWholeMapView - playse SE_TK_KASYA + playse SE_CLICK erasebox 0, 0, 29, 19 releaseall end @@ -129,7 +129,7 @@ CableClub_EventScript_ExitTradeCenter:: @ 81BB34F call CableClub_EventScript_PlayerExitTradeCenter call CableClub_EventScript_CloseDirectCornerBarrier special DrawWholeMapView - playse SE_TK_KASYA + playse SE_CLICK erasebox 0, 0, 29, 19 releaseall end @@ -154,7 +154,7 @@ CableClub_EventScript_ExitUnionRoom:: @ 81BB39C call CableClub_EventScript_PlayerExitUnionRoom call CableClub_EventScript_CloseUnionRoomBarrier special DrawWholeMapView - playse SE_TK_KASYA + playse SE_CLICK erasebox 0, 0, 29, 19 releaseall end @@ -312,7 +312,7 @@ CableClub_EventScript_EnterColosseum:: @ 81BB5B3 waitmessage call CableClub_EventScript_OpenDirectCornerBarrier special DrawWholeMapView - playse SE_TK_KASYA + playse SE_CLICK delay 60 applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft waitmovement 0 @@ -421,7 +421,7 @@ CableClub_EventScript_EnterTradeCenter:: @ 81BB73D waitmessage call CableClub_EventScript_OpenDirectCornerBarrier special DrawWholeMapView - playse SE_TK_KASYA + playse SE_CLICK delay 60 applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft waitmovement 0 @@ -821,7 +821,7 @@ CableClub_EventScript_EnterUnionRoom:: @ 81BBA94 special HelpSystem_Disable call CableClub_EventScript_OpenUnionRoomBarrier special DrawWholeMapView - playse SE_TK_KASYA + playse SE_CLICK delay 60 applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft waitmovement 0 @@ -1126,7 +1126,7 @@ CableClub_EventScript_EnterWirelessLinkRoom:: @ 81BBF88 copyvar VAR_0x8007, VAR_LAST_TALKED call CableClub_EventScript_OpenDirectCornerBarrier special DrawWholeMapView - playse SE_TK_KASYA + playse SE_CLICK delay 60 applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft waitmovement 0 @@ -1324,7 +1324,7 @@ CableClub_EventScript_EnterMinigame:: @ 81BC262 copyvar VAR_0x8007, VAR_LAST_TALKED call CableClub_EventScript_OpenGameCornerBarrier special DrawWholeMapView - playse SE_TK_KASYA + playse SE_CLICK delay 60 applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft waitmovement 0 diff --git a/data/scripts/hole.inc b/data/scripts/hole.inc index 98900f04a..fddd574ad 100644 --- a/data/scripts/hole.inc +++ b/data/scripts/hole.inc @@ -13,7 +13,7 @@ EventScript_FallDownHole:: @ 81C1348 delay 20 applymovement OBJ_EVENT_ID_PLAYER, Movement_SetInvisible waitmovement 0 - playse SE_RU_HYUU + playse SE_FALL delay 60 warphole 0xFFFF waitstate @@ -25,7 +25,7 @@ EventScript_1C1361:: @ 81C1361 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/obtain_item.inc b/data/scripts/obtain_item.inc index e89aabfba..6c74df5bd 100644 --- a/data/scripts/obtain_item.inc +++ b/data/scripts/obtain_item.inc @@ -78,11 +78,11 @@ EventScript_NoRoomForItem:: @ 81A675E return EventScript_PlayFanfareObtainedItem:: @ 81A6764 - playfanfare MUS_FANFA1 + playfanfare MUS_LEVEL_UP return EventScript_PlayFanfareObtainedTMHM:: @ 81A6768 - playfanfare MUS_FANFA1 + playfanfare MUS_LEVEL_UP return Std_ObtainDecoration:: @ 81A676C @@ -100,7 +100,7 @@ EventScript_ObtainDecorMessage:: @ 81A677A return EventScript_ObtainedDecor:: @ 81A6795 - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM message Text_ObtainedTheDecor waitfanfare waitmessage diff --git a/data/scripts/pokedex_rating.inc b/data/scripts/pokedex_rating.inc index 05d27ffa9..64955bb8a 100644 --- a/data/scripts/pokedex_rating.inc +++ b/data/scripts/pokedex_rating.inc @@ -27,11 +27,11 @@ PokedexRating_EventScript_ShowRatingMsg:: @ 81A73B6 return PokedexRating_EventScript_NormalFanfare:: @ 81A73D8 - playfanfare MUS_FAN2 + playfanfare MUS_DEX_RATING return PokedexRating_EventScript_DexCompleteFanfare:: @ 81A73DC - playfanfare MUS_FANFA5 + playfanfare MUS_EVOLVED return PokedexRating_EventScript_Rate:: @ 81A73E0 diff --git a/data/scripts/pokemon_league.inc b/data/scripts/pokemon_league.inc index 65baba59a..ad39c4528 100644 --- a/data/scripts/pokemon_league.inc +++ b/data/scripts/pokemon_league.inc @@ -1,7 +1,7 @@ PokemonLeague_EventScript_OpenDoor:: @ 81A7506 applymovement OBJ_EVENT_ID_PLAYER, Movement_Delay32 waitmovement 0 - playse SE_DOOR + playse SE_RS_DOOR call PokemonLeague_EventScript_SetDoorOpen special DrawWholeMapView setflag FLAG_TEMP_4 @@ -11,7 +11,7 @@ PokemonLeague_EventScript_EnterRoom:: @ 81A751F applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkUp5 waitmovement 0 setflag FLAG_TEMP_2 - playse SE_KI_GASYAN + playse SE_UNLOCK call PokemonLeague_EventScript_CloseEntry special DrawWholeMapView return @@ -34,7 +34,7 @@ PokemonLeague_EventScript_PreventExit:: @ 81A754B PokemonLeague_EventScript_OpenDoorLance:: @ 81A7563 applymovement OBJ_EVENT_ID_PLAYER, Movement_Delay32 waitmovement 0 - playse SE_DOOR + playse SE_RS_DOOR setmetatile 6, 4, METATILE_PokemonLeague_Door_Top_Open, 1 setmetatile 6, 5, METATILE_PokemonLeague_Door_Mid_Open, 0 special DrawWholeMapView diff --git a/data/scripts/route23.inc b/data/scripts/route23.inc index cfdfe53a7..c59080c6c 100644 --- a/data/scripts/route23.inc +++ b/data/scripts/route23.inc @@ -18,7 +18,7 @@ Route23_EventScript_MissingBadge:: @ 81A77DE Route23_EventScript_AlreadyRecognizedBoulderBadge:: @ 81A77EC message Text_OhThatsBadgeGoRightAhead waitmessage - playfanfare MUS_FANFA1 + playfanfare MUS_LEVEL_UP waitfanfare waitbuttonpress release @@ -101,7 +101,7 @@ Route23_EventScript_CheckEarthBadge:: @ 81A793E Route23_EventScript_RecognizeBoulderBadge:: @ 81A794D message Text_OhThatsBadgeGoRightAhead waitmessage - playfanfare MUS_FANFA1 + playfanfare MUS_LEVEL_UP waitfanfare waitbuttonpress copyvar VAR_MAP_SCENE_ROUTE23, VAR_TEMP_1 @@ -196,7 +196,7 @@ Route23_EventScript_MissingBadgeTrigger:: @ 81A7A77 Route23_EventScript_RecognizeBoulderBadgeTrigger:: @ 81A7A96 message Text_OhThatsBadgeGoRightAhead waitmessage - playfanfare MUS_FANFA1 + playfanfare MUS_LEVEL_UP waitfanfare waitbuttonpress copyvar VAR_MAP_SCENE_ROUTE23, VAR_TEMP_1 diff --git a/data/scripts/safari_zone.inc b/data/scripts/safari_zone.inc index 15c735821..65ddd4996 100644 --- a/data/scripts/safari_zone.inc +++ b/data/scripts/safari_zone.inc @@ -24,14 +24,14 @@ SafariZone_EventScript_Retire:: @ 81BFBC0 SafariZone_EventScript_TimesUp:: @ 81BFBC5 lockall - playse SE_PINPON + playse SE_DING_DONG msgbox SafariZone_Text_TimesUp goto SafariZone_EventScript_Exit end SafariZone_EventScript_OutOfBalls:: @ 81BFBD7 lockall - playse SE_PINPON + playse SE_DING_DONG msgbox SafariZone_Text_OutOfBalls goto SafariZone_EventScript_Exit end diff --git a/data/scripts/silphco_doors.inc b/data/scripts/silphco_doors.inc index df619b345..e648301ff 100644 --- a/data/scripts/silphco_doors.inc +++ b/data/scripts/silphco_doors.inc @@ -512,7 +512,7 @@ EventScript_TryUnlockDoor:: @ 81A8B23 end EventScript_OpenDoor:: @ 81A8B32 - playfanfare MUS_FANFA1 + playfanfare MUS_LEVEL_UP msgbox Text_CardKeyOpenedDoor waitfanfare compare VAR_TEMP_1, 1 @@ -556,7 +556,7 @@ EventScript_OpenDoor:: @ 81A8B32 compare VAR_TEMP_1, 20 call_if_eq EventScript_Open11FDoor waitse - playse SE_KI_GASYAN + playse SE_UNLOCK special DrawWholeMapView waitse special SetHiddenItemFlag diff --git a/data/scripts/static_pokemon.inc b/data/scripts/static_pokemon.inc index 5334688a3..906097666 100644 --- a/data/scripts/static_pokemon.inc +++ b/data/scripts/static_pokemon.inc @@ -17,7 +17,7 @@ EventScript_MonFlewAway:: @ 81A9236 EventScript_AwakenSnorlax:: @ 81A924B message Text_PlayedPokeFlute waitmessage - playfanfare MUS_POKEFUE + playfanfare MUS_POKE_FLUTE waitfanfare msgbox Text_SnorlaxWokeUp return diff --git a/data/scripts/std_msgbox.inc b/data/scripts/std_msgbox.inc index da53a3cc1..9e542e6e7 100644 --- a/data/scripts/std_msgbox.inc +++ b/data/scripts/std_msgbox.inc @@ -29,25 +29,25 @@ Std_MsgboxYesNo:: @ 81A4E5C Std_ReceivedItem:: @ 81A4E66 textcolor 3 - compare VAR_0x8002, MUS_FANFA1 + compare VAR_0x8002, MUS_LEVEL_UP call_if_eq EventScript_ReceivedItemFanfare1 - compare VAR_0x8002, MUS_FAN5 + compare VAR_0x8002, MUS_OBTAIN_KEY_ITEM call_if_eq EventScript_ReceivedItemFanfare2 message 0x0 waitmessage waitfanfare - compare VAR_0x8002, MUS_FANFA1 + compare VAR_0x8002, MUS_LEVEL_UP call_if_eq EventScript_ReceivedItemWaitFanfare putitemaway VAR_0x8000, VAR_0x8001 call EventScript_RestorePrevTextColor return EventScript_ReceivedItemFanfare1:: @ 81A4EA2 - playfanfare MUS_FANFA1 + playfanfare MUS_LEVEL_UP return EventScript_ReceivedItemFanfare2:: @ 81A4EA6 - playfanfare MUS_FAN5 + playfanfare MUS_OBTAIN_KEY_ITEM return EventScript_ReceivedItemWaitFanfare:: @ 81A4EAA diff --git a/data/scripts/trainer_card.inc b/data/scripts/trainer_card.inc index 589d84a64..253e2837a 100644 --- a/data/scripts/trainer_card.inc +++ b/data/scripts/trainer_card.inc @@ -44,7 +44,7 @@ CeladonCity_GameCorner_EventScript_PrintTypeSepia:: @ 81B28FC CeladonCity_GameCorner_EventScript_PrintPhoto:: @ 81B2907 message CeladonCity_GameCorner_Text_BigSmileForPhoto waitmessage - playse MUS_ME_PHOTO + playse MUS_PHOTO dofieldeffect FLDEFF_UNK_45 delay 60 special UpdateTrainerCardPhotoIcons @@ -237,7 +237,7 @@ FourIsland_House2_EventScript_AlreadyBraggedHoFMax:: @ 81B2C47 FourIsland_House2_EventScript_BraggedHoF:: @ 81B2C51 textcolor 3 - playfanfare MUS_FANFA1 + playfanfare MUS_LEVEL_UP message FourIsland_House2_Text_HoFStickerApplied waitmessage waitfanfare @@ -300,7 +300,7 @@ FourIsland_House2_EventScript_AlreadyBraggedEggsMax:: @ 81B2D11 FourIsland_House2_EventScript_BraggedEggs:: @ 81B2D1B textcolor 3 - playfanfare MUS_FANFA1 + playfanfare MUS_LEVEL_UP message FourIsland_House2_Text_EggStickerApplied waitmessage waitfanfare @@ -363,7 +363,7 @@ FourIsland_House2_EventScript_AlreadyBraggedLinkWinsMax:: @ 81B2DDB FourIsland_House2_EventScript_BraggedLinkWins:: @ 81B2DE5 textcolor 3 - playfanfare MUS_FANFA1 + playfanfare MUS_LEVEL_UP message FourIsland_House2_Text_VictoryStickerApplied waitmessage waitfanfare diff --git a/data/scripts/trainer_tower.inc b/data/scripts/trainer_tower.inc index 3b21c0844..94f1c7263 100644 --- a/data/scripts/trainer_tower.inc +++ b/data/scripts/trainer_tower.inc @@ -293,7 +293,7 @@ TrainerTower_Roof_EventScript_GivePrize: TrainerTower_Roof_EventScript_ReceivePrize: msgbox TrainerTower_Roof_Text_ThisIsForYou textcolor 3 - playfanfare MUS_FANFA1 + playfanfare MUS_LEVEL_UP message Text_ObtainedTheX waitfanfare waitmessage @@ -365,7 +365,7 @@ TrainerTower_EventScript_TriggerDoubleBattle: TrainerTower_EventScript_IneligibleForDoubleBattle:: @ 81C5528 lockall - playse SE_PINPON + playse SE_DING_DONG msgbox TrainerTower_Lobby_Text_NeedTwoMonsForDouble closemessage applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Movement_PushPlayerBack diff --git a/data/text/route23.inc b/data/text/route23.inc index 9fe5cd426..d46313e46 100644 --- a/data/text/route23.inc +++ b/data/text/route23.inc @@ -23,6 +23,6 @@ Text_OnlyPassWithBadgeDontHaveYet:: @ 81A57C1 Text_OnlyPassWithBadgeOhGoAhead:: @ 81A5839 .string "You can pass here only if you have\n" .string "the {STR_VAR_1}.\p" - .string "Oh! That is the {STR_VAR_1}!{PAUSE_MUSIC}{PLAY_BGM}{MUS_FANFA1}{PAUSE 0x60}{RESUME_MUSIC}\p" + .string "Oh! That is the {STR_VAR_1}!{PAUSE_MUSIC}{PLAY_BGM}{MUS_LEVEL_UP}{PAUSE 0x60}{RESUME_MUSIC}\p" .string "Okay, then.\n" .string "Please, go right ahead.$" |