diff options
| author | hondew <pokehondew@gmail.com> | 2020-08-30 14:14:38 -0400 |
|---|---|---|
| committer | hondew <pokehondew@gmail.com> | 2020-08-30 14:14:38 -0400 |
| commit | e46b35455d1e2af8c8c2d291ce1cc28e682d9095 (patch) | |
| tree | 76855f3dedad94ba34a8f8b40811a1005107b5ae /data | |
| parent | 328aecc96e690c437e52663a1445417e8aa78df6 (diff) | |
| parent | a9719c92bfa4c6b6dcf57e9516f184721152ad80 (diff) | |
Merge branch 'master' into pokeball-doc
Diffstat (limited to 'data')
613 files changed, 2889 insertions, 2878 deletions
diff --git a/data/battle_ai_scripts.s b/data/battle_ai_scripts.s index e33ba431d..1c7bff51c 100644 --- a/data/battle_ai_scripts.s +++ b/data/battle_ai_scripts.s @@ -249,64 +249,64 @@ AI_CBM_BellyDrum: @ 82DC341 if_hp_less_than AI_USER, 51, Score_Minus10 AI_CBM_AttackUp: @ 82DC348 - if_stat_level_equal AI_USER, STAT_ATK, 12, Score_Minus10 + if_stat_level_equal AI_USER, STAT_ATK, MAX_STAT_STAGE, Score_Minus10 end AI_CBM_DefenseUp: @ 82DC351 - if_stat_level_equal AI_USER, STAT_DEF, 12, Score_Minus10 + if_stat_level_equal AI_USER, STAT_DEF, MAX_STAT_STAGE, Score_Minus10 end AI_CBM_SpeedUp: @ 82DC35A - if_stat_level_equal AI_USER, STAT_SPEED, 12, Score_Minus10 + if_stat_level_equal AI_USER, STAT_SPEED, MAX_STAT_STAGE, Score_Minus10 end AI_CBM_SpAtkUp: @ 82DC363 - if_stat_level_equal AI_USER, STAT_SPATK, 12, Score_Minus10 + if_stat_level_equal AI_USER, STAT_SPATK, MAX_STAT_STAGE, Score_Minus10 end AI_CBM_SpDefUp: @ 82DC36C - if_stat_level_equal AI_USER, STAT_SPDEF, 12, Score_Minus10 + if_stat_level_equal AI_USER, STAT_SPDEF, MAX_STAT_STAGE, Score_Minus10 end AI_CBM_AccUp: @ 82DC375 - if_stat_level_equal AI_USER, STAT_ACC, 12, Score_Minus10 + if_stat_level_equal AI_USER, STAT_ACC, MAX_STAT_STAGE, Score_Minus10 end AI_CBM_EvasionUp: @ 82DC37E - if_stat_level_equal AI_USER, STAT_EVASION, 12, Score_Minus10 + if_stat_level_equal AI_USER, STAT_EVASION, MAX_STAT_STAGE, Score_Minus10 end AI_CBM_AttackDown: @ 82DC387 - if_stat_level_equal AI_TARGET, STAT_ATK, 0, Score_Minus10 + if_stat_level_equal AI_TARGET, STAT_ATK, MIN_STAT_STAGE, Score_Minus10 get_ability AI_TARGET if_equal ABILITY_HYPER_CUTTER, Score_Minus10 goto CheckIfAbilityBlocksStatChange AI_CBM_DefenseDown: @ 82DC39C - if_stat_level_equal AI_TARGET, STAT_DEF, 0, Score_Minus10 + if_stat_level_equal AI_TARGET, STAT_DEF, MIN_STAT_STAGE, Score_Minus10 goto CheckIfAbilityBlocksStatChange AI_CBM_SpeedDown: @ 82DC3A9 - if_stat_level_equal AI_TARGET, STAT_SPEED, 0, Score_Minus10 + if_stat_level_equal AI_TARGET, STAT_SPEED, MIN_STAT_STAGE, Score_Minus10 if_ability AI_TARGET, ABILITY_SPEED_BOOST, Score_Minus10 goto CheckIfAbilityBlocksStatChange AI_CBM_SpAtkDown: @ 82DC3BF - if_stat_level_equal AI_TARGET, STAT_SPATK, 0, Score_Minus10 + if_stat_level_equal AI_TARGET, STAT_SPATK, MIN_STAT_STAGE, Score_Minus10 goto CheckIfAbilityBlocksStatChange AI_CBM_SpDefDown: @ 82DC3CC - if_stat_level_equal AI_TARGET, STAT_SPDEF, 0, Score_Minus10 + if_stat_level_equal AI_TARGET, STAT_SPDEF, MIN_STAT_STAGE, Score_Minus10 goto CheckIfAbilityBlocksStatChange AI_CBM_AccDown: @ 82DC3D9 - if_stat_level_equal AI_TARGET, STAT_ACC, 0, Score_Minus10 + if_stat_level_equal AI_TARGET, STAT_ACC, MIN_STAT_STAGE, Score_Minus10 get_ability AI_TARGET if_equal ABILITY_KEEN_EYE, Score_Minus10 goto CheckIfAbilityBlocksStatChange AI_CBM_EvasionDown: @ 82DC3EE - if_stat_level_equal AI_TARGET, STAT_EVASION, 0, Score_Minus10 + if_stat_level_equal AI_TARGET, STAT_EVASION, MIN_STAT_STAGE, Score_Minus10 CheckIfAbilityBlocksStatChange: @ 82DC3F6 get_ability AI_TARGET @@ -315,20 +315,20 @@ CheckIfAbilityBlocksStatChange: @ 82DC3F6 end AI_CBM_Haze: @ 82DC405 - if_stat_level_less_than AI_USER, STAT_ATK, 6, AI_CBM_Haze_End - if_stat_level_less_than AI_USER, STAT_DEF, 6, AI_CBM_Haze_End - if_stat_level_less_than AI_USER, STAT_SPEED, 6, AI_CBM_Haze_End - if_stat_level_less_than AI_USER, STAT_SPATK, 6, AI_CBM_Haze_End - if_stat_level_less_than AI_USER, STAT_SPDEF, 6, AI_CBM_Haze_End - if_stat_level_less_than AI_USER, STAT_ACC, 6, AI_CBM_Haze_End - if_stat_level_less_than AI_USER, STAT_EVASION, 6, AI_CBM_Haze_End - if_stat_level_more_than AI_TARGET, STAT_ATK, 6, AI_CBM_Haze_End - if_stat_level_more_than AI_TARGET, STAT_DEF, 6, AI_CBM_Haze_End - if_stat_level_more_than AI_TARGET, STAT_SPEED, 6, AI_CBM_Haze_End - if_stat_level_more_than AI_TARGET, STAT_SPATK, 6, AI_CBM_Haze_End - if_stat_level_more_than AI_TARGET, STAT_SPDEF, 6, AI_CBM_Haze_End - if_stat_level_more_than AI_TARGET, STAT_ACC, 6, AI_CBM_Haze_End - if_stat_level_more_than AI_TARGET, STAT_EVASION, 6, AI_CBM_Haze_End + if_stat_level_less_than AI_USER, STAT_ATK, DEFAULT_STAT_STAGE, AI_CBM_Haze_End + if_stat_level_less_than AI_USER, STAT_DEF, DEFAULT_STAT_STAGE, AI_CBM_Haze_End + if_stat_level_less_than AI_USER, STAT_SPEED, DEFAULT_STAT_STAGE, AI_CBM_Haze_End + if_stat_level_less_than AI_USER, STAT_SPATK, DEFAULT_STAT_STAGE, AI_CBM_Haze_End + if_stat_level_less_than AI_USER, STAT_SPDEF, DEFAULT_STAT_STAGE, AI_CBM_Haze_End + if_stat_level_less_than AI_USER, STAT_ACC, DEFAULT_STAT_STAGE, AI_CBM_Haze_End + if_stat_level_less_than AI_USER, STAT_EVASION, DEFAULT_STAT_STAGE, AI_CBM_Haze_End + if_stat_level_more_than AI_TARGET, STAT_ATK, DEFAULT_STAT_STAGE, AI_CBM_Haze_End + if_stat_level_more_than AI_TARGET, STAT_DEF, DEFAULT_STAT_STAGE, AI_CBM_Haze_End + if_stat_level_more_than AI_TARGET, STAT_SPEED, DEFAULT_STAT_STAGE, AI_CBM_Haze_End + if_stat_level_more_than AI_TARGET, STAT_SPATK, DEFAULT_STAT_STAGE, AI_CBM_Haze_End + if_stat_level_more_than AI_TARGET, STAT_SPDEF, DEFAULT_STAT_STAGE, AI_CBM_Haze_End + if_stat_level_more_than AI_TARGET, STAT_ACC, DEFAULT_STAT_STAGE, AI_CBM_Haze_End + if_stat_level_more_than AI_TARGET, STAT_EVASION, DEFAULT_STAT_STAGE, AI_CBM_Haze_End goto Score_Minus10 AI_CBM_Haze_End: @ 82DC47A @@ -436,8 +436,8 @@ AI_CBM_CantEscape: @ 82DC5B0 end AI_CBM_Curse: @ 82DC5BB - if_stat_level_equal AI_USER, STAT_ATK, 12, Score_Minus10 - if_stat_level_equal AI_USER, STAT_DEF, 12, Score_Minus8 + if_stat_level_equal AI_USER, STAT_ATK, MAX_STAT_STAGE, Score_Minus10 + if_stat_level_equal AI_USER, STAT_DEF, MAX_STAT_STAGE, Score_Minus8 end AI_CBM_Spikes: @ 82DC5CC @@ -484,8 +484,8 @@ AI_CBM_Safeguard: @ 82DC635 end AI_CBM_Memento: @ 82DC640 - if_stat_level_equal AI_TARGET, STAT_ATK, 0, Score_Minus10 - if_stat_level_equal AI_TARGET, STAT_SPATK, 0, Score_Minus8 + if_stat_level_equal AI_TARGET, STAT_ATK, MIN_STAT_STAGE, Score_Minus10 + if_stat_level_equal AI_TARGET, STAT_SPATK, MIN_STAT_STAGE, Score_Minus8 AI_CBM_BatonPass: @ 82DC650 count_usable_party_mons AI_USER @@ -574,18 +574,18 @@ AI_CBM_MudSport: @ 82DC71E end AI_CBM_Tickle: @ 82DC729 - if_stat_level_equal AI_TARGET, STAT_ATK, 0, Score_Minus10 - if_stat_level_equal AI_TARGET, STAT_DEF, 0, Score_Minus8 + if_stat_level_equal AI_TARGET, STAT_ATK, MIN_STAT_STAGE, Score_Minus10 + if_stat_level_equal AI_TARGET, STAT_DEF, MIN_STAT_STAGE, Score_Minus8 end AI_CBM_CosmicPower: @ 82DC73A - if_stat_level_equal AI_USER, STAT_DEF, 12, Score_Minus10 - if_stat_level_equal AI_USER, STAT_SPDEF, 12, Score_Minus8 + if_stat_level_equal AI_USER, STAT_DEF, MAX_STAT_STAGE, Score_Minus10 + if_stat_level_equal AI_USER, STAT_SPDEF, MAX_STAT_STAGE, Score_Minus8 end AI_CBM_BulkUp: @ 82DC74B - if_stat_level_equal AI_USER, STAT_ATK, 12, Score_Minus10 - if_stat_level_equal AI_USER, STAT_DEF, 12, Score_Minus8 + if_stat_level_equal AI_USER, STAT_ATK, MAX_STAT_STAGE, Score_Minus10 + if_stat_level_equal AI_USER, STAT_DEF, MAX_STAT_STAGE, Score_Minus8 end AI_CBM_WaterSport: @ 82DC75C @@ -593,13 +593,13 @@ AI_CBM_WaterSport: @ 82DC75C end AI_CBM_CalmMind: @ 82DC767 - if_stat_level_equal AI_USER, STAT_SPATK, 12, Score_Minus10 - if_stat_level_equal AI_USER, STAT_SPDEF, 12, Score_Minus8 + if_stat_level_equal AI_USER, STAT_SPATK, MAX_STAT_STAGE, Score_Minus10 + if_stat_level_equal AI_USER, STAT_SPDEF, MAX_STAT_STAGE, Score_Minus8 end AI_CBM_DragonDance: @ 82DC778 - if_stat_level_equal AI_USER, STAT_ATK, 12, Score_Minus10 - if_stat_level_equal AI_USER, STAT_SPEED, 12, Score_Minus8 + if_stat_level_equal AI_USER, STAT_ATK, MAX_STAT_STAGE, Score_Minus10 + if_stat_level_equal AI_USER, STAT_SPEED, MAX_STAT_STAGE, Score_Minus8 end Score_Minus1: @@ -1101,7 +1101,7 @@ AI_CV_EvasionUp7: AI_CV_EvasionUp8: if_hp_more_than AI_USER, 70, AI_CV_EvasionUp_End - if_stat_level_equal AI_USER, STAT_EVASION, 6, AI_CV_EvasionUp_End + if_stat_level_equal AI_USER, STAT_EVASION, DEFAULT_STAT_STAGE, AI_CV_EvasionUp_End if_hp_less_than AI_USER, 40, AI_CV_EvasionUp_ScoreDown2 if_hp_less_than AI_TARGET, 40, AI_CV_EvasionUp_ScoreDown2 if_random_less_than 70, AI_CV_EvasionUp_End @@ -1130,7 +1130,7 @@ AI_CV_AlwaysHit_End: end AI_CV_AttackDown: @ 82DCDF8 - if_stat_level_equal AI_TARGET, STAT_ATK, 6, AI_CV_AttackDown3 + if_stat_level_equal AI_TARGET, STAT_ATK, DEFAULT_STAT_STAGE, AI_CV_AttackDown3 score -1 if_hp_more_than AI_USER, 90, AI_CV_AttackDown2 score -1 @@ -1198,7 +1198,7 @@ AI_CV_SpeedDown_End: @ 82DCE96 end AI_CV_SpAtkDown: - if_stat_level_equal AI_TARGET, STAT_ATK, 6, AI_CV_SpAtkDown3 + if_stat_level_equal AI_TARGET, STAT_ATK, DEFAULT_STAT_STAGE, AI_CV_SpAtkDown3 score -1 if_hp_more_than AI_USER, 90, AI_CV_SpAtkDown2 score -1 @@ -1284,7 +1284,7 @@ AI_CV_AccuracyDown7: AI_CV_AccuracyDown8: if_hp_more_than AI_USER, 70, AI_CV_AccuracyDown_End - if_stat_level_equal AI_TARGET, STAT_ACC, 6, AI_CV_AccuracyDown_End + if_stat_level_equal AI_TARGET, STAT_ACC, DEFAULT_STAT_STAGE, AI_CV_AccuracyDown_End if_hp_less_than AI_USER, 40, AI_CV_AccuracyDown_ScoreDown2 if_hp_less_than AI_TARGET, 40, AI_CV_AccuracyDown_ScoreDown2 if_random_less_than 70, AI_CV_AccuracyDown_End @@ -1997,7 +1997,7 @@ AI_CV_Curse2: score +1 AI_CV_Curse3: - if_stat_level_more_than AI_USER, STAT_DEF, 6, AI_CV_Curse_End + if_stat_level_more_than AI_USER, STAT_DEF, DEFAULT_STAT_STAGE, AI_CV_Curse_End if_random_less_than 128, AI_CV_Curse_End score +1 goto AI_CV_Curse_End @@ -2518,7 +2518,7 @@ AI_CV_ChangeSelfAbility_AbilitiesToEncourage: AI_CV_Superpower: if_type_effectiveness AI_EFFECTIVENESS_x0_25, AI_CV_Superpower_ScoreDown1 if_type_effectiveness AI_EFFECTIVENESS_x0_5, AI_CV_Superpower_ScoreDown1 - if_stat_level_less_than AI_USER, STAT_ATK, 6, AI_CV_Superpower_ScoreDown1 + if_stat_level_less_than AI_USER, STAT_ATK, DEFAULT_STAT_STAGE, AI_CV_Superpower_ScoreDown1 if_target_faster AI_CV_Superpower2 if_hp_more_than AI_USER, 40, AI_CV_Superpower_ScoreDown1 goto AI_CV_Superpower_End @@ -2933,12 +2933,12 @@ sMovesTable_ProtectMoves: AI_PreferBatonPass_EncourageIfHighStats: get_turn_count if_equal 0, Score_Minus2 - if_stat_level_more_than AI_USER, STAT_ATK, 8, Score_Plus3 - if_stat_level_more_than AI_USER, STAT_ATK, 7, Score_Plus2 - if_stat_level_more_than AI_USER, STAT_ATK, 6, Score_Plus1 - if_stat_level_more_than AI_USER, STAT_SPATK, 8, Score_Plus3 - if_stat_level_more_than AI_USER, STAT_SPATK, 7, Score_Plus2 - if_stat_level_more_than AI_USER, STAT_SPATK, 6, Score_Plus1 + if_stat_level_more_than AI_USER, STAT_ATK, DEFAULT_STAT_STAGE + 2, Score_Plus3 + if_stat_level_more_than AI_USER, STAT_ATK, DEFAULT_STAT_STAGE + 1, Score_Plus2 + if_stat_level_more_than AI_USER, STAT_ATK, DEFAULT_STAT_STAGE, Score_Plus1 + if_stat_level_more_than AI_USER, STAT_SPATK, DEFAULT_STAT_STAGE + 2, Score_Plus3 + if_stat_level_more_than AI_USER, STAT_SPATK, DEFAULT_STAT_STAGE + 1, Score_Plus2 + if_stat_level_more_than AI_USER, STAT_SPATK, DEFAULT_STAT_STAGE, Score_Plus1 end AI_PreferBatonPassEnd: diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index a1d059a94..f7aac71e8 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -426,7 +426,7 @@ Move_POUND: loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET setalpha 12, 8 - playsewithpan SE_W003, SOUND_PAN_TARGET + playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_TARGET, 2 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 waitforvisualfinish @@ -441,7 +441,7 @@ Move_DOUBLE_SLAP: choosetwoturnanim DoubleSlapLeft, DoubleSlapRight DoubleSlapContinue: createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 - playsewithpan SE_W003, SOUND_PAN_TARGET + playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_TARGET blendoff @@ -456,7 +456,7 @@ DoubleSlapRight: Move_POISON_POWDER: loadspritegfx ANIM_TAG_POISON_POWDER loadspritegfx ANIM_TAG_POISON_BUBBLE - loopsewithpan SE_W077, SOUND_PAN_TARGET, 10, 6 + loopsewithpan SE_M_POISON_POWDER, SOUND_PAN_TARGET, 10, 6 createsprite gPoisonPowderParticleSpriteTemplate, ANIM_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 @@ -480,7 +480,7 @@ Move_POISON_POWDER: Move_STUN_SPORE: loadspritegfx ANIM_TAG_STUN_SPORE - loopsewithpan SE_W077, SOUND_PAN_TARGET, 10, 6 + loopsewithpan SE_M_POISON_POWDER, SOUND_PAN_TARGET, 10, 6 createsprite gStunSporeParticleSpriteTemplate, ANIM_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 @@ -504,7 +504,7 @@ Move_STUN_SPORE: Move_SLEEP_POWDER: loadspritegfx ANIM_TAG_SLEEP_POWDER - loopsewithpan SE_W077, SOUND_PAN_TARGET, 10, 6 + loopsewithpan SE_M_POISON_POWDER, SOUND_PAN_TARGET, 10, 6 createsprite gSleepPowderParticleSpriteTemplate, ANIM_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 @@ -531,21 +531,21 @@ Move_SWIFT: loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W129, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWIFT, SOUND_PAN_ATTACKER createsprite gSwiftStarSpriteTemplate, ANIM_TARGET, 3, 20, -10, 20, 0, 22, 20, 1 delay 5 - playsewithpan SE_W129, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWIFT, SOUND_PAN_ATTACKER createsprite gSwiftStarSpriteTemplate, ANIM_TARGET, 3, 20, -10, 20, 5, 22, -18, 1 delay 5 - playsewithpan SE_W129, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWIFT, SOUND_PAN_ATTACKER createsprite gSwiftStarSpriteTemplate, ANIM_TARGET, 3, 20, -10, 20, -10, 22, 15, 1 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 18, 1 createvisualtask AnimTask_ShakeMon2, 2, ANIM_DEF_PARTNER, 2, 0, 18, 1 delay 5 - playsewithpan SE_W129, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWIFT, SOUND_PAN_ATTACKER createsprite gSwiftStarSpriteTemplate, ANIM_TARGET, 3, 20, -10, 20, 0, 22, -20, 1 delay 5 - playsewithpan SE_W129, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWIFT, SOUND_PAN_ATTACKER createsprite gSwiftStarSpriteTemplate, ANIM_TARGET, 3, 20, -10, 20, 0, 22, 12, 1 delay 5 waitforvisualfinish @@ -557,20 +557,20 @@ Move_STRENGTH: loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W036, SOUND_PAN_ATTACKER + playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER createvisualtask AnimTask_ShakeAndSinkMon, 5, ANIM_ATTACKER, 2, 0, 96, 30 waitforvisualfinish delay 10 createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 4 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_TARGET, 18, 6, 2, 4 delay 4 - playsewithpan SE_W025B, SOUND_PAN_TARGET + playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 16, 12, ANIM_TARGET, 1 delay 4 - playsewithpan SE_W025B, SOUND_PAN_TARGET + playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, -16, -12, ANIM_TARGET, 1 delay 4 - playsewithpan SE_W025B, SOUND_PAN_TARGET + playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 3, 4, ANIM_TARGET, 1 waitforvisualfinish createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 @@ -587,7 +587,7 @@ Move_TACKLE: delay 6 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_TARGET, 2 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_TARGET blendoff @@ -597,14 +597,14 @@ Move_BODY_SLAM: loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W036, SOUND_PAN_ATTACKER + playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 6, 1, ANIM_ATTACKER waitforvisualfinish delay 11 createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 26, 0, 0, 5 delay 6 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 4, -10, 0, ANIM_TARGET, 0 - loopsewithpan SE_W025B, SOUND_PAN_TARGET, 10, 2 + loopsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET, 10, 2 delay 1 createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 1, -28, 0, 0, 3 waitforvisualfinish @@ -636,7 +636,7 @@ Move_SUPERSONIC: blendoff end SupersonicRing: - playsewithpan SE_W048, SOUND_PAN_ATTACKER + playsewithpan SE_M_SUPERSONIC, SOUND_PAN_ATTACKER createsprite gSupersonicRingSpriteTemplate, ANIM_TARGET, 2, 16, 0, 0, 0, 30, 0 delay 2 return @@ -651,7 +651,7 @@ Move_SCREECH: waitforvisualfinish end ScreechRing: - playsewithpan SE_W103, SOUND_PAN_ATTACKER + playsewithpan SE_M_SCREECH, SOUND_PAN_ATTACKER createsprite gScreechRingSpriteTemplate, ANIM_TARGET, 2, 16, 0, 0, 0, 30, 0 delay 2 return @@ -661,31 +661,31 @@ Move_FLAME_WHEEL: monbg ANIM_DEF_PARTNER monbgprio_2A ANIM_TARGET createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 0 - playsewithpan SE_W172, SOUND_PAN_ATTACKER + playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER delay 2 createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 4 - playsewithpan SE_W172, SOUND_PAN_ATTACKER + playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER delay 2 createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 8 - playsewithpan SE_W172, SOUND_PAN_ATTACKER + playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER delay 2 createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 12 - playsewithpan SE_W172, SOUND_PAN_ATTACKER + playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER delay 2 createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 16 - playsewithpan SE_W172, SOUND_PAN_ATTACKER + playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER delay 2 createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 20 - playsewithpan SE_W172, SOUND_PAN_ATTACKER + playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER delay 2 createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 24 - playsewithpan SE_W172, SOUND_PAN_ATTACKER + playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER waitforvisualfinish createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 24, 0, 0, 6 delay 4 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 8, 1 createvisualtask AnimTask_BlendMonInAndOut, 3, ANIM_TARGET, RGB_RED, 12, 1, 1 - playsewithpan SE_W172B, SOUND_PAN_TARGET + playsewithpan SE_M_FLAME_WHEEL2, SOUND_PAN_TARGET call FireSpreadEffect delay 7 createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 9 @@ -704,22 +704,22 @@ Move_PIN_MISSILE: monbg ANIM_TARGET monbgprio_28 ANIM_TARGET setalpha 12, 8 - playsewithpan SE_W026, SOUND_PAN_ATTACKER + playsewithpan SE_M_JUMP_KICK, SOUND_PAN_ATTACKER 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, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, -8, -8, ANIM_TARGET, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 2, 1 delay 9 createsprite gPinMissileSpriteTemplate, ANIM_ATTACKER, 2, 20, -8, 0, 0, 20, -32 delay 4 - playsewithpan SE_W030, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 8, 8, ANIM_TARGET, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 2, 1 delay 14 - playsewithpan SE_W030, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, ANIM_TARGET, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 2, 1 waitforvisualfinish @@ -733,22 +733,22 @@ Move_ICICLE_SPEAR: monbg ANIM_TARGET monbgprio_28 ANIM_TARGET setalpha 12, 8 - playsewithpan SE_W196, SOUND_PAN_ATTACKER + playsewithpan SE_M_ICY_WIND, SOUND_PAN_ATTACKER 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, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, -8, -8, ANIM_TARGET, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 2, 1 delay 9 createsprite gIcicleSpearSpriteTemplate, ANIM_ATTACKER, 2, 20, -8, 0, 0, 20, -32 delay 4 - playsewithpan SE_W030, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 8, 8, ANIM_TARGET, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 2, 1 delay 14 - playsewithpan SE_W030, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, ANIM_TARGET, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 2, 1 waitforvisualfinish @@ -764,7 +764,7 @@ Move_TAKE_DOWN: delay 35 createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 1, RGB_BLACK, 10, 0, 0 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 4, -10, 0, ANIM_TARGET, 0 - playsewithpan SE_W025B, SOUND_PAN_TARGET + playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET delay 1 createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 1, -16, 0, 0, 4 waitforvisualfinish @@ -781,19 +781,19 @@ Move_TAKE_DOWN: Move_DOUBLE_EDGE: loadspritegfx ANIM_TAG_IMPACT - playsewithpan SE_W129, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWIFT, SOUND_PAN_ATTACKER createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 2, 4, 2, RGB_WHITE, 10, 0, 0 waitforvisualfinish delay 10 - playsewithpan SE_W207, SOUND_PAN_ATTACKER - waitplaysewithpan SE_W207, SOUND_PAN_ATTACKER, 8 + playsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER + waitplaysewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER, 8 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 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, SOUND_PAN_TARGET + playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 4, -10, 0, ANIM_TARGET, 0 createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 1, -32, 0, 0, 3 waitforvisualfinish @@ -819,12 +819,12 @@ Move_POISON_STING: monbg ANIM_TARGET monbgprio_28 ANIM_TARGET setalpha 12, 8 - playsewithpan SE_W013B, SOUND_PAN_ATTACKER + playsewithpan SE_M_RAZOR_WIND2, SOUND_PAN_ATTACKER createsprite gLinearStingerSpriteTemplate, ANIM_TARGET, 2, 20, 0, -8, 0, 20 waitforvisualfinish createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, ANIM_TARGET, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 5, 1 - playsewithpan SE_W030, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET waitforvisualfinish call PoisonBubblesEffect waitforvisualfinish @@ -838,13 +838,13 @@ Move_TWINEEDLE: monbg ANIM_TARGET monbgprio_28 ANIM_TARGET setalpha 12, 8 - loopsewithpan SE_W013B, SOUND_PAN_ATTACKER, 6, 2 + loopsewithpan SE_M_RAZOR_WIND2, SOUND_PAN_ATTACKER, 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, ANIM_TARGET, 2, 0, 5, 1 createsprite gHandleInvertHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, -4, 1, 3 - loopsewithpan SE_W030, SOUND_PAN_TARGET, 5, 2 + loopsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET, 5, 2 delay 1 createsprite gHandleInvertHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 10, 12, 1, 3 waitforvisualfinish @@ -854,7 +854,7 @@ Move_TWINEEDLE: Move_FIRE_BLAST: loadspritegfx ANIM_TAG_SMALL_EMBER - createsoundtask sub_8158B30, SE_W172, SE_W172B + createsoundtask sub_8158B30, SE_M_FLAME_WHEEL, SE_M_FLAME_WHEEL2 call FireBlastRing call FireBlastRing call FireBlastRing @@ -902,29 +902,29 @@ FireBlastCross: Move_LEECH_SEED: loadspritegfx ANIM_TAG_SEED - playsewithpan SE_W077, SOUND_PAN_ATTACKER + playsewithpan SE_M_POISON_POWDER, SOUND_PAN_ATTACKER createsprite gLeechSeedSpriteTemplate, ANIM_TARGET, 2, 15, 0, 0, 24, 35, -32 delay 8 - playsewithpan SE_W077, SOUND_PAN_ATTACKER + playsewithpan SE_M_POISON_POWDER, SOUND_PAN_ATTACKER createsprite gLeechSeedSpriteTemplate, ANIM_TARGET, 2, 15, 0, -16, 24, 35, -40 delay 8 - playsewithpan SE_W077, SOUND_PAN_ATTACKER + playsewithpan SE_M_POISON_POWDER, SOUND_PAN_ATTACKER createsprite gLeechSeedSpriteTemplate, ANIM_TARGET, 2, 15, 0, 16, 24, 35, -37 delay 12 - loopsewithpan SE_W039, SOUND_PAN_TARGET, 10, 8 + loopsewithpan SE_M_TAIL_WHIP, SOUND_PAN_TARGET, 10, 8 waitforvisualfinish end Move_EMBER: loadspritegfx ANIM_TAG_SMALL_EMBER - loopsewithpan SE_W052, SOUND_PAN_ATTACKER, 5, 2 + loopsewithpan SE_M_EMBER, SOUND_PAN_ATTACKER, 5, 2 createsprite gEmberSpriteTemplate, ANIM_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, SOUND_PAN_TARGET + playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_TARGET call EmberFireHit call EmberFireHit call EmberFireHit @@ -942,7 +942,7 @@ Move_MEGA_PUNCH: delay 2 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 0, 16, RGB_BLACK setalpha 12, 8 - playsewithpan SE_W025, SOUND_PAN_TARGET + playsewithpan SE_M_MEGA_KICK, SOUND_PAN_TARGET createsprite gMegaPunchKickSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 50 createvisualtask AnimTask_BlendBattleAnimPal, 10, 4, 2, 0, 7, RGB_WHITE delay 50 @@ -951,7 +951,7 @@ Move_MEGA_PUNCH: createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 22, 1 createvisualtask AnimTask_BlendBattleAnimPal, 10, 4, 2, 0, 0, RGB_WHITE createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 1, RGB_BLACK, 8, 0, 0 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_TARGET blendoff @@ -985,11 +985,11 @@ Move_MEGA_KICK: delay 2 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 0, 16, RGB_BLACK setalpha 12, 8 - playsewithpan SE_W025, SOUND_PAN_TARGET + playsewithpan SE_M_MEGA_KICK, SOUND_PAN_TARGET createsprite gMegaPunchKickSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 50 createvisualtask AnimTask_BlendBattleAnimPal, 10, 4, 2, 0, 7, RGB_WHITE delay 50 - playsewithpan SE_W025B, SOUND_PAN_TARGET + playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET call SetImpactBackground createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_TARGET, 0 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 22, 1 @@ -1011,7 +1011,7 @@ Move_COMET_PUNCH: choosetwoturnanim CometPunchLeft, CometPunchRight CometPunchContinue: createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_TARGET blendoff @@ -1041,7 +1041,7 @@ Move_SONIC_BOOM: blendoff end SonicBoomProjectile: - playsewithpan SE_W013B, SOUND_PAN_ATTACKER + playsewithpan SE_M_RAZOR_WIND2, SOUND_PAN_ATTACKER createsprite gSonicBoomSpriteTemplate, ANIM_TARGET, 2, 16, 0, 0, 0, 15 delay 4 return @@ -1057,7 +1057,7 @@ Move_THUNDER_SHOCK: waitforvisualfinish delay 10 createvisualtask AnimTask_ElectricBolt, 5, 0, -44, 0 - playsewithpan SE_W085, SOUND_PAN_TARGET + playsewithpan SE_M_THUNDERBOLT, SOUND_PAN_TARGET delay 9 createvisualtask AnimTask_BlendBattleAnimPal, 10, 4, 0, 0, 13, RGB_BLACK waitforvisualfinish @@ -1079,13 +1079,13 @@ Move_THUNDERBOLT: waitforvisualfinish delay 10 createvisualtask AnimTask_ElectricBolt, 5, 24, -52, 0 - playsewithpan SE_W085, SOUND_PAN_TARGET + playsewithpan SE_M_THUNDERBOLT, SOUND_PAN_TARGET delay 7 createvisualtask AnimTask_ElectricBolt, 5, -24, -52, 0 - playsewithpan SE_W085, SOUND_PAN_TARGET + playsewithpan SE_M_THUNDERBOLT, SOUND_PAN_TARGET delay 7 createvisualtask AnimTask_ElectricBolt, 5, 0, -60, 1 - playsewithpan SE_W085, SOUND_PAN_TARGET + playsewithpan SE_M_THUNDERBOLT, SOUND_PAN_TARGET delay 9 createvisualtask AnimTask_BlendBattleAnimPal, 10, 4, 0, 0, 13, RGB_BLACK waitforvisualfinish @@ -1101,7 +1101,7 @@ Move_THUNDERBOLT: 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, SOUND_PAN_TARGET + playsewithpan SE_M_HYPER_BEAM, SOUND_PAN_TARGET delay 0 createvisualtask AnimTask_BlendBattleAnimPal, 10, 1, 0, 2, 2, RGB_BLACK delay 6 @@ -1112,7 +1112,7 @@ Move_THUNDERBOLT: createvisualtask AnimTask_BlendBattleAnimPal, 10, 1, 0, 6, 6, RGB_BLACK waitforvisualfinish delay 20 - waitplaysewithpan SE_W085B, SOUND_PAN_TARGET, 19 + waitplaysewithpan SE_M_THUNDERBOLT2, SOUND_PAN_TARGET, 19 call ElectricityEffect waitforvisualfinish delay 20 @@ -1128,9 +1128,9 @@ Move_THUNDER_WAVE: waitforvisualfinish delay 10 createvisualtask AnimTask_ElectricBolt, 5, 0, -48, 0 - playsewithpan SE_W086, SOUND_PAN_TARGET + playsewithpan SE_M_THUNDER_WAVE, SOUND_PAN_TARGET delay 20 - loopsewithpan SE_W085B, SOUND_PAN_TARGET, 10, 4 + loopsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_TARGET, 10, 4 createsprite gThunderWaveSpriteTemplate, ANIM_TARGET, 2, -16, -16 delay 4 createsprite gThunderWaveSpriteTemplate, ANIM_TARGET, 2, -16, 0 @@ -1156,23 +1156,23 @@ BeatUpLeft: createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, -20, -20, ANIM_TARGET, 2 createsprite gFistFootSpriteTemplate, ANIM_TARGET, 3, -20, -12, 8, 1, 0 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET delay 8 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 8, 0, ANIM_TARGET, 2 createsprite gFistFootSpriteTemplate, ANIM_TARGET, 3, 8, 8, 8, 1, 0 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET goto BeatUpContinue BeatUpRight: createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 12, -20, ANIM_TARGET, 2 createsprite gFistFootSpriteTemplate, ANIM_TARGET, 3, 12, -12, 8, 1, 0 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET delay 8 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, -12, 0, ANIM_TARGET, 2 createsprite gFistFootSpriteTemplate, ANIM_TARGET, 3, -12, 8, 8, 1, 0 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET goto BeatUpContinue Move_STOMP: @@ -1180,19 +1180,19 @@ Move_STOMP: loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET setalpha 12, 8 - playsewithpan SE_W104, SOUND_PAN_TARGET + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_TARGET createsprite gStompFootSpriteTemplate, ANIM_ATTACKER, 3, 0, -32, 15 delay 19 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, -8, ANIM_TARGET, 1 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 4, 9, 1 - playsewithpan SE_W025B, SOUND_PAN_TARGET + playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_TARGET blendoff end Move_TAIL_WHIP: - loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 24, 3 + loopsewithpan SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER, 24, 3 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 12, 4, 2, 3 waitforvisualfinish end @@ -1201,7 +1201,7 @@ Move_CUT: loadspritegfx ANIM_TAG_CUT monbg ANIM_TARGET setalpha 12, 8 - playsewithpan SE_W015, SOUND_PAN_TARGET + playsewithpan SE_M_CUT, SOUND_PAN_TARGET createsprite gCuttingSliceSpriteTemplate, ANIM_ATTACKER, 2, 40, -32, 0 delay 5 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 10, 1 @@ -1213,14 +1213,14 @@ Move_CUT: Move_HIDDEN_POWER: loadspritegfx ANIM_TAG_RED_ORB - playsewithpan SE_W036, SOUND_PAN_ATTACKER + playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 11, ANIM_ATTACKER, 0 waitforvisualfinish delay 30 createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_ATTACKER, RGB(31, 31, 19), 12, 5, 1 delay 4 createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 11, ANIM_ATTACKER, 0 - playsewithpan SE_W179, SOUND_PAN_ATTACKER + playsewithpan SE_M_REVERSAL, SOUND_PAN_ATTACKER createsprite gHiddenPowerOrbSpriteTemplate, ANIM_ATTACKER, 2, 26, 0 createsprite gHiddenPowerOrbSpriteTemplate, ANIM_ATTACKER, 2, 26, 42 createsprite gHiddenPowerOrbSpriteTemplate, ANIM_ATTACKER, 2, 26, 84 @@ -1229,7 +1229,7 @@ Move_HIDDEN_POWER: createsprite gHiddenPowerOrbSpriteTemplate, ANIM_ATTACKER, 2, 26, 210 delay 52 setarg 7, 0xFFFF - playsewithpan SE_W115, SOUND_PAN_ATTACKER + playsewithpan SE_M_REFLECT, SOUND_PAN_ATTACKER createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 11, ANIM_ATTACKER, 0 createsprite gHiddenPowerOrbScatterSpriteTemplate, ANIM_TARGET, 2, 0 createsprite gHiddenPowerOrbScatterSpriteTemplate, ANIM_TARGET, 2, 32 @@ -1245,13 +1245,13 @@ Move_REVERSAL: loadspritegfx ANIM_TAG_BLUE_ORB loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_IMPACT - playsewithpan SE_W197, SOUND_PAN_ATTACKER + playsewithpan SE_M_DETECT, SOUND_PAN_ATTACKER createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 3, RGB_WHITE, 8, 0, 0 waitforvisualfinish delay 30 createvisualtask AnimTask_BlendColorCycle, 2, 31, 3, 2, 0, 10, RGB_WHITE delay 10 - playsewithpan SE_W179, SOUND_PAN_ATTACKER + playsewithpan SE_M_REVERSAL, SOUND_PAN_ATTACKER createsprite gReversalOrbSpriteTemplate, ANIM_ATTACKER, 2, 26, 0 createsprite gReversalOrbSpriteTemplate, ANIM_ATTACKER, 2, 26, 42 createsprite gReversalOrbSpriteTemplate, ANIM_ATTACKER, 2, 26, 84 @@ -1262,7 +1262,7 @@ Move_REVERSAL: delay 20 createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 6, 4 delay 8 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET 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, ANIM_TARGET, 1 @@ -1286,12 +1286,12 @@ PursuitContinue: waitbgfadein end PursuitNormal: - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, ANIM_TARGET, 2 createvisualtask AnimTask_ShakeTargetBasedOnMovePowerOrDmg, 5, FALSE, 1, 6, 1, 0 goto PursuitContinue PursuitOnSwitchout: - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, ANIM_TARGET, 1 createvisualtask AnimTask_ShakeTargetBasedOnMovePowerOrDmg, 5, FALSE, 1, 6, 1, 0 goto PursuitContinue @@ -1304,7 +1304,7 @@ Move_SPIKE_CANNON: setalpha 12, 8 createvisualtask AnimTask_WindUpLunge, 5, ANIM_ATTACKER, -4, 0, 4, 6, 8, 4 waitforvisualfinish - loopsewithpan SE_W013B, SOUND_PAN_ATTACKER, 5, 3 + loopsewithpan SE_M_RAZOR_WIND2, SOUND_PAN_ATTACKER, 5, 3 createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_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 @@ -1314,7 +1314,7 @@ Move_SPIKE_CANNON: createsprite gHandleInvertHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 2 createsprite gHandleInvertHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 8, 8, 1, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 7, 1 - loopsewithpan SE_W030, SOUND_PAN_TARGET, 5, 3 + loopsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET, 5, 3 waitforvisualfinish clearmonbg ANIM_TARGET blendoff @@ -1324,7 +1324,7 @@ Move_SWORDS_DANCE: loadspritegfx ANIM_TAG_SWORD monbg ANIM_ATTACKER setalpha 12, 8 - playsewithpan SE_W014, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWORDS_DANCE, SOUND_PAN_ATTACKER createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 16, 6, 1, 4 createsprite gSwordsDanceBladeSpriteTemplate, ANIM_ATTACKER, 2, 0, 0 delay 22 @@ -1340,12 +1340,12 @@ Move_PSYCH_UP: monbg ANIM_ATK_PARTNER createvisualtask AnimTask_BlendColorCycleExclude, 2, 1, 2, 6, 1, 11, RGB_BLACK setalpha 12, 8 - loopsewithpan SE_W060B, SOUND_PAN_ATTACKER, 5, 10 + loopsewithpan SE_M_PSYBEAM2, SOUND_PAN_ATTACKER, 5, 10 createsprite gPsychUpSpiralSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 0, 0 createvisualtask AnimTask_SwayMon, 5, 0, 5, 2560, 8, ANIM_ATTACKER delay 127 delay 4 - playsewithpan SE_W060, SOUND_PAN_ATTACKER + playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER createvisualtask AnimTask_ScaleMonAndRestore, 5, -5, -5, 10, ANIM_ATTACKER, 1 createvisualtask AnimTask_BlendBattleAnimPal, 9, 2, 2, 10, 0, RGB_YELLOW delay 30 @@ -1363,7 +1363,7 @@ Move_DIZZY_PUNCH: call DizzyPunchLunge createsprite gFistFootSpriteTemplate, ANIM_TARGET, 5, 16, 8, 20, 1, 0 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 4, 16, 0, ANIM_TARGET, 1 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET 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 @@ -1374,7 +1374,7 @@ Move_DIZZY_PUNCH: call DizzyPunchLunge createsprite gFistFootSpriteTemplate, ANIM_TARGET, 5, -16, -8, 20, 1, 0 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 4, -16, -16, ANIM_TARGET, 1 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET 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 @@ -1393,7 +1393,7 @@ DizzyPunchLunge: Move_FIRE_SPIN: loadspritegfx ANIM_TAG_SMALL_EMBER - playsewithpan SE_W221B, SOUND_PAN_TARGET + playsewithpan SE_M_SACRED_FIRE2, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 2, 47, 1 call FireSpinEffect call FireSpinEffect @@ -1420,7 +1420,7 @@ Move_FURY_CUTTER: loadspritegfx ANIM_TAG_CUT monbg ANIM_TARGET setalpha 12, 8 - playsewithpan SE_W013, SOUND_PAN_TARGET + playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET createvisualtask AnimTask_IsFuryCutterHitRight, 2 jumpretfalse FuryCutterLeft goto FuryCutterRight @@ -1468,19 +1468,19 @@ Move_SELF_DESTRUCT: createvisualtask AnimTask_BlendBattleAnimPal, 10, 2, 1, 9, 0, RGB_RED end SelfDestructExplode: - playsewithpan SE_W120, SOUND_PAN_ATTACKER + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_ATTACKER createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 1 delay 6 - playsewithpan SE_W120, SOUND_PAN_ATTACKER + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_ATTACKER createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 24, -24, 0, 1 delay 6 - playsewithpan SE_W120, SOUND_PAN_ATTACKER + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_ATTACKER createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, -16, 16, 0, 1 delay 6 - playsewithpan SE_W120, SOUND_PAN_ATTACKER + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_ATTACKER createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, -24, -12, 0, 1 delay 6 - playsewithpan SE_W120, SOUND_PAN_ATTACKER + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_ATTACKER createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 16, 16, 0, 1 delay 6 return @@ -1490,12 +1490,12 @@ Move_SLAM: loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET setalpha 12, 8 - playsewithpan SE_W004, SOUND_PAN_ATTACKER + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_ATTACKER createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, 3, 0, 4 delay 1 createsprite gSlamHitSpriteTemplate, ANIM_ATTACKER, 2, 0, 0 delay 3 - playsewithpan SE_W025B, SOUND_PAN_TARGET + playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, ANIM_TARGET, 1 createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 1, -12, 10, 0, 3 createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 5 @@ -1511,10 +1511,10 @@ Move_SLAM: Move_VINE_WHIP: loadspritegfx ANIM_TAG_WHIP_HIT - playsewithpan SE_W026, SOUND_PAN_ATTACKER + playsewithpan SE_M_JUMP_KICK, SOUND_PAN_ATTACKER createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 6 delay 6 - playsewithpan SE_W010, SOUND_PAN_TARGET + playsewithpan SE_M_SCRATCH, SOUND_PAN_TARGET createsprite gVineWhipSpriteTemplate, ANIM_TARGET, 2, 0, 0 delay 6 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 6, 1 @@ -1524,12 +1524,12 @@ Move_DRILL_PECK: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_WHIRLWIND_LINES createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 0 - playsewithpan SE_W029, SOUND_PAN_ATTACKER + playsewithpan SE_M_HEADBUTT, SOUND_PAN_ATTACKER waitforvisualfinish delay 2 createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 1 delay 2 - loopsewithpan SE_W030, SOUND_PAN_TARGET, 4, 8 + loopsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET, 4, 8 createvisualtask AnimTask_DrillPeckHitSplats, 5 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 18, 1 waitforvisualfinish @@ -1547,28 +1547,28 @@ Move_WATERFALL: setalpha 12, 8 createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 23, 1 delay 5 - playsewithpan SE_W152, SOUND_PAN_ATTACKER + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_ATTACKER createsprite gSmallBubblePairSpriteTemplate, ANIM_ATTACKER, 2, 10, 10, 25, ANIM_ATTACKER delay 4 - playsewithpan SE_W152, SOUND_PAN_ATTACKER + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_ATTACKER createsprite gSmallBubblePairSpriteTemplate, ANIM_ATTACKER, 2, -15, 0, 25, ANIM_ATTACKER delay 4 - playsewithpan SE_W152, SOUND_PAN_ATTACKER + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_ATTACKER createsprite gSmallBubblePairSpriteTemplate, ANIM_ATTACKER, 2, 20, 10, 25, ANIM_ATTACKER delay 4 - playsewithpan SE_W152, SOUND_PAN_ATTACKER + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_ATTACKER createsprite gSmallBubblePairSpriteTemplate, ANIM_ATTACKER, 2, 0, -10, 25, ANIM_ATTACKER delay 4 - playsewithpan SE_W152, SOUND_PAN_ATTACKER + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_ATTACKER createsprite gSmallBubblePairSpriteTemplate, ANIM_ATTACKER, 2, -10, 15, 25, ANIM_ATTACKER delay 4 - playsewithpan SE_W152, SOUND_PAN_ATTACKER + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_ATTACKER createsprite gSmallBubblePairSpriteTemplate, ANIM_ATTACKER, 2, 25, 20, 25, ANIM_ATTACKER delay 4 - playsewithpan SE_W152, SOUND_PAN_ATTACKER + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_ATTACKER createsprite gSmallBubblePairSpriteTemplate, ANIM_ATTACKER, 2, -20, 20, 25, ANIM_ATTACKER delay 4 - playsewithpan SE_W152, SOUND_PAN_ATTACKER + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_ATTACKER createsprite gSmallBubblePairSpriteTemplate, ANIM_ATTACKER, 2, 12, 0, 25, ANIM_ATTACKER waitforvisualfinish delay 10 @@ -1581,7 +1581,7 @@ Move_WATERFALL: end RisingWaterHitEffect: - playsewithpan SE_W127, SOUND_PAN_TARGET + playsewithpan SE_M_WATERFALL, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 4, 0, 17, 1 createsprite gWaterHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 20, ANIM_TARGET, 1 createsprite gSmallDriftingBubblesSpriteTemplate, ANIM_ATTACKER, 4, 0, 20 @@ -1636,26 +1636,26 @@ Move_EXPLOSION: createvisualtask AnimTask_BlendBattleAnimPal, 10, 1, 3, 16, 0, RGB_WHITE end Explosion1: - playsewithpan SE_W153, SOUND_PAN_ATTACKER + playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 1 delay 6 - playsewithpan SE_W153, SOUND_PAN_ATTACKER + playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 24, -24, 0, 1 delay 6 - playsewithpan SE_W153, SOUND_PAN_ATTACKER + playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, -16, 16, 0, 1 delay 6 - playsewithpan SE_W153, SOUND_PAN_ATTACKER + playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, -24, -12, 0, 1 delay 6 - playsewithpan SE_W153, SOUND_PAN_ATTACKER + playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 16, 16, 0, 1 delay 6 return Move_DEFENSE_CURL: loadspritegfx ANIM_TAG_ECLIPSING_ORB - loopsewithpan SE_W161, SOUND_PAN_ATTACKER, 18, 3 + loopsewithpan SE_M_TRI_ATTACK, SOUND_PAN_ATTACKER, 18, 3 createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, ANIM_ATTACKER, 0 createvisualtask AnimTask_DefenseCurlDeformMon, 5 waitforvisualfinish @@ -1669,7 +1669,7 @@ Move_PROTECT: loadspritegfx ANIM_TAG_PROTECT monbg ANIM_ATK_PARTNER monbgprio_28 ANIM_ATTACKER - waitplaysewithpan SE_W115, SOUND_PAN_ATTACKER, 16 + waitplaysewithpan SE_M_REFLECT, SOUND_PAN_ATTACKER, 16 createsprite gProtectSpriteTemplate, ANIM_ATTACKER, 2, 24, 0, 90 waitforvisualfinish clearmonbg ANIM_ATK_PARTNER @@ -1681,7 +1681,7 @@ Move_DETECT: waitforvisualfinish createvisualtask AnimTask_BlendBattleAnimPal, 10, 2, 1, 0, 9, RGB_WHITE delay 18 - playsewithpan SE_W197, SOUND_PAN_ATTACKER + playsewithpan SE_M_DETECT, SOUND_PAN_ATTACKER createsprite gSpinningSparkleSpriteTemplate, ANIM_ATTACKER, 13, 20, -20 waitforvisualfinish delay 10 @@ -1706,15 +1706,15 @@ Frustration_Continue: blendoff end Frustration_Strongest: - playsewithpan SE_W082, SOUND_PAN_ATTACKER + playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER createvisualtask AnimTask_ShakeMon2, 5, ANIM_ATTACKER, 1, 0, 15, 1 createvisualtask AnimTask_BlendBattleAnimPal, 10, 2, 3, 0, 9, 31 waitforvisualfinish delay 20 - playsewithpan SE_W207B, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWAGGER2, SOUND_PAN_ATTACKER createsprite gAngerMarkSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, -28 waitforvisualfinish - playsewithpan SE_W207B, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWAGGER2, SOUND_PAN_ATTACKER createsprite gAngerMarkSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, -28 waitforvisualfinish delay 10 @@ -1722,65 +1722,65 @@ Frustration_Strongest: delay 5 createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 4, 0, 30, 1 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, ANIM_TARGET, 0 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET delay 5 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 24, 8, ANIM_TARGET, 0 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET delay 5 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, -24, -16, ANIM_TARGET, 0 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET delay 5 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 8, 4, ANIM_TARGET, 0 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET delay 5 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, -16, 19, ANIM_TARGET, 0 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET delay 5 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 18, -18, ANIM_TARGET, 0 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET waitforvisualfinish createvisualtask AnimTask_BlendBattleAnimPal, 10, 2, 3, 9, 0, 31 goto Frustration_Continue Frustration_Strong: - playsewithpan SE_W082, SOUND_PAN_ATTACKER + playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER createvisualtask AnimTask_ShakeMon2, 5, ANIM_ATTACKER, 1, 0, 15, 1 createvisualtask AnimTask_BlendBattleAnimPal, 10, 2, 3, 0, 9, 31 waitforvisualfinish delay 20 - playsewithpan SE_W207B, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWAGGER2, SOUND_PAN_ATTACKER createsprite gAngerMarkSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, -28 waitforvisualfinish delay 5 createvisualtask AnimTask_StrongFrustrationGrowAndShrink, 5 delay 7 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 8, ANIM_TARGET, 1 createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 4, 0, 6, 1 delay 14 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 12, -6, ANIM_TARGET, 1 createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 4, 0, 6, 1 delay 14 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, -12, -6, ANIM_TARGET, 1 createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 4, 0, 6, 1 waitforvisualfinish createvisualtask AnimTask_BlendBattleAnimPal, 10, 2, 3, 9, 0, 31 goto Frustration_Continue Frustration_Medium: - playsewithpan SE_W207B, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWAGGER2, SOUND_PAN_ATTACKER createsprite gAngerMarkSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, -28 waitforvisualfinish delay 5 createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 4 delay 6 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 10, 4, ANIM_TARGET, 1 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 6, 1 waitforvisualfinish createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 4 delay 6 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -10, -4, ANIM_TARGET, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 6, 1 goto Frustration_Continue @@ -1790,7 +1790,7 @@ Frustration_Weak: delay 10 createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 10, 2 delay 12 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_TARGET, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 1, 0, 6, 1 goto Frustration_Continue @@ -1799,14 +1799,14 @@ Move_SAFEGUARD: loadspritegfx ANIM_TAG_GUARD_RING monbg ANIM_ATK_PARTNER setalpha 8, 8 - playsewithpan SE_W208, SOUND_PAN_ATTACKER + playsewithpan SE_M_MILK_DRINK, SOUND_PAN_ATTACKER createsprite gGuardRingSpriteTemplate, ANIM_ATTACKER, 2 delay 4 createsprite gGuardRingSpriteTemplate, ANIM_ATTACKER, 2 delay 4 createsprite gGuardRingSpriteTemplate, ANIM_ATTACKER, 2 waitforvisualfinish - playsewithpan SE_REAPOKE, SOUND_PAN_ATTACKER + playsewithpan SE_SHINY, SOUND_PAN_ATTACKER createvisualtask AnimTask_BlendColorCycle, 2, 10, 0, 2, 0, 10, RGB_WHITE waitforvisualfinish clearmonbg ANIM_ATK_PARTNER @@ -1818,21 +1818,21 @@ Move_PAIN_SPLIT: createsprite gPainSplitProjectileSpriteTemplate, ANIM_ATTACKER, 2, -8, -42, ANIM_ATTACKER createsprite gPainSplitProjectileSpriteTemplate, ANIM_TARGET, 2, -8, -42, ANIM_TARGET delay 10 - playsewithpan SE_W207B, 0 + playsewithpan SE_M_SWAGGER2, 0 createvisualtask AnimTask_PainSplitMovement, 2, ANIM_ATTACKER, 0 createvisualtask AnimTask_PainSplitMovement, 2, ANIM_TARGET, 0 waitforvisualfinish createsprite gPainSplitProjectileSpriteTemplate, ANIM_ATTACKER, 2, -24, -42, ANIM_ATTACKER createsprite gPainSplitProjectileSpriteTemplate, ANIM_TARGET, 2, -24, -42, ANIM_TARGET delay 10 - playsewithpan SE_W207B, 0 + playsewithpan SE_M_SWAGGER2, 0 createvisualtask AnimTask_PainSplitMovement, 2, ANIM_ATTACKER, 1 createvisualtask AnimTask_PainSplitMovement, 2, ANIM_TARGET, 1 waitforvisualfinish createsprite gPainSplitProjectileSpriteTemplate, ANIM_ATTACKER, 2, 8, -42, ANIM_ATTACKER createsprite gPainSplitProjectileSpriteTemplate, ANIM_TARGET, 2, 8, -42, ANIM_TARGET delay 10 - playsewithpan SE_W207B, 0 + playsewithpan SE_M_SWAGGER2, 0 createvisualtask AnimTask_PainSplitMovement, 2, ANIM_ATTACKER, 2 createvisualtask AnimTask_PainSplitMovement, 2, ANIM_TARGET, 2 end @@ -1842,7 +1842,7 @@ Move_VICE_GRIP: loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W011, SOUND_PAN_TARGET + playsewithpan SE_M_VICEGRIP, SOUND_PAN_TARGET createsprite gViceGripSpriteTemplate, ANIM_ATTACKER, 2, 0 createsprite gViceGripSpriteTemplate, ANIM_ATTACKER, 2, 1 delay 9 @@ -1860,7 +1860,7 @@ Move_GUILLOTINE: setalpha 12, 8 fadetobgfromset BG_GUILLOTINE_OPPONENT, BG_GUILLOTINE_PLAYER, BG_GUILLOTINE_CONTESTS waitbgfadein - playsewithpan SE_W011, SOUND_PAN_TARGET + playsewithpan SE_M_VICEGRIP, SOUND_PAN_TARGET createsprite gGuillotineSpriteTemplate, ANIM_ATTACKER, 2, 0 createsprite gGuillotineSpriteTemplate, ANIM_ATTACKER, 2, 1 createvisualtask AnimTask_BlendBattleAnimPal, 10, 4, 2, 0, 16, RGB_BLACK @@ -1870,7 +1870,7 @@ Move_GUILLOTINE: createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 4, 0, 8, 1 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, ANIM_TARGET, 0 createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 1, RGB_BLACK, 8, 0, 0 - playsewithpan SE_W013, SOUND_PAN_TARGET + playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -1884,10 +1884,10 @@ Move_PAY_DAY: monbg ANIM_TARGET monbgprio_28 ANIM_TARGET setalpha 12, 8 - playsewithpan SE_W013B, SOUND_PAN_ATTACKER + playsewithpan SE_M_RAZOR_WIND2, SOUND_PAN_ATTACKER createsprite gCoinThrowSpriteTemplate, ANIM_ATTACKER, 2, 20, 0, 0, 0, 1152 waitforvisualfinish - playsewithpan SE_W006, SOUND_PAN_TARGET + playsewithpan SE_M_PAY_DAY, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 1, 0, 0, ANIM_TARGET, 2 createsprite gFallingCoinSpriteTemplate, ANIM_ATTACKER, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 1, 0, 6, 1 @@ -1898,7 +1898,7 @@ Move_PAY_DAY: Move_OUTRAGE: loadspritegfx ANIM_TAG_SMALL_EMBER - loopsewithpan SE_W082, SOUND_PAN_ATTACKER, 8, 3 + loopsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER, 8, 3 createvisualtask AnimTask_BlendColorCycle, 2, 7, 2, 5, 3, 8, RGB(14, 13, 0) createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 12, 6, 5, 4 delay 0 @@ -1946,7 +1946,7 @@ Move_SPARK: loadspritegfx ANIM_TAG_SPARK_2 delay 0 createvisualtask AnimTask_BlendColorCycle, 2, 3, -31, 1, 5, 5, RGB(31, 31, 22) - playsewithpan SE_W085B, SOUND_PAN_ATTACKER + playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_ATTACKER createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 32, 24, 190, 12, ANIM_ATTACKER, 1, 0 delay 0 createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 80, 24, 22, 12, ANIM_ATTACKER, 1, 0 @@ -1955,7 +1955,7 @@ Move_SPARK: createvisualtask AnimTask_BlendColorCycle, 2, 3, -31, 1, 0, 0, RGB(31, 31, 22) delay 10 createvisualtask AnimTask_BlendColorCycle, 2, 3, -31, 1, 5, 5, RGB(31, 31, 22) - playsewithpan SE_W085B, SOUND_PAN_ATTACKER + playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_ATTACKER createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 100, 24, 60, 10, ANIM_ATTACKER, 1, 0 createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 170, 24, 42, 11, ANIM_ATTACKER, 1, 1 delay 0 @@ -1964,7 +1964,7 @@ Move_SPARK: createvisualtask AnimTask_BlendColorCycle, 2, 3, -31, 1, 0, 0, RGB(31, 31, 22) delay 20 createvisualtask AnimTask_BlendColorCycle, 2, 3, -31, 1, 7, 7, RGB(31, 31, 22) - playsewithpan SE_W085B, SOUND_PAN_ATTACKER + playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_ATTACKER 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 @@ -1978,7 +1978,7 @@ Move_SPARK: createvisualtask AnimTask_BlendColorCycle, 2, 3, -31, 1, 0, 0, RGB(31, 31, 22) createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 4 delay 4 - playsewithpan SE_W063, SOUND_PAN_TARGET + playsewithpan SE_M_HYPER_BEAM, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 0, 0, ANIM_TARGET, 2 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 waitforvisualfinish @@ -1989,12 +1989,12 @@ Move_SPARK: Move_ATTRACT: loadspritegfx ANIM_TAG_RED_HEART - loopsewithpan SE_W204, SOUND_PAN_ATTACKER, 12, 3 + loopsewithpan SE_M_CHARM, SOUND_PAN_ATTACKER, 12, 3 createvisualtask AnimTask_SwayMon, 5, 0, 12, 4096, 4, ANIM_ATTACKER delay 15 createsprite gRedHeartProjectileSpriteTemplate, ANIM_TARGET, 3, 20, -8 waitforvisualfinish - playsewithpan SE_W213, SOUND_PAN_TARGET + playsewithpan SE_M_ATTRACT, SOUND_PAN_TARGET createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, 160, -32 createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, -256, -40 createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, 128, -16 @@ -2002,7 +2002,7 @@ Move_ATTRACT: 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 @@ -2024,7 +2024,7 @@ Move_GROWTH: end GrowthEffect: createvisualtask AnimTask_BlendColorCycle, 2, 2, 0, 2, 0, 8, RGB_WHITE - playsewithpan SE_W036, SOUND_PAN_ATTACKER + playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER createvisualtask AnimTask_ScaleMonAndRestore, 5, -3, -3, 16, ANIM_ATTACKER, 0 return @@ -2037,12 +2037,12 @@ Move_WHIRLWIND: createsprite gWhirlwindLineSpriteTemplate, ANIM_ATTACKER, 2, 0, 24, ANIM_TARGET, 60, 4 createsprite gWhirlwindLineSpriteTemplate, ANIM_ATTACKER, 2, 0, 32, ANIM_TARGET, 60, 0 delay 5 - loopsewithpan SE_W104, SOUND_PAN_TARGET, 10, 4 + loopsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_TARGET, 10, 4 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 15, 1 delay 29 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_TARGET, 12, 6, 1, 5 delay 7 - playsewithpan SE_W081, SOUND_PAN_TARGET + playsewithpan SE_M_STRING_SHOT, SOUND_PAN_TARGET createvisualtask AnimTask_SlideOffScreen, 5, ANIM_TARGET, 8 waitforvisualfinish end @@ -2057,7 +2057,7 @@ Move_CONFUSE_RAY: createsprite gConfuseRayBallBounceSpriteTemplate, ANIM_TARGET, 2, 28, 0, 288 waitforvisualfinish setalpha 8, 8 - playsewithpan SE_W081B, SOUND_PAN_TARGET + playsewithpan SE_M_STRING_SHOT2, SOUND_PAN_TARGET createsprite gConfuseRayBallSpiralSpriteTemplate, ANIM_TARGET, 2, 0, -16 waitforvisualfinish delay 0 @@ -2082,10 +2082,10 @@ Move_LOCK_ON: Move_MEAN_LOOK: loadspritegfx ANIM_TAG_EYE monbg ANIM_DEF_PARTNER - playsewithpan SE_W060, SOUND_PAN_ATTACKER + playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 0, 16, RGB_BLACK - loopsewithpan SE_W109, SOUND_PAN_TARGET, 15, 4 - waitplaysewithpan SE_W043, SOUND_PAN_TARGET, 85 + loopsewithpan SE_M_CONFUSE_RAY, SOUND_PAN_TARGET, 15, 4 + waitplaysewithpan SE_M_LEER, SOUND_PAN_TARGET, 85 createsprite gMeanLookEyeSpriteTemplate, ANIM_ATTACKER, 2 delay 120 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 16, 0, RGB_BLACK @@ -2098,20 +2098,20 @@ Move_ROCK_THROW: 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, SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET delay 6 createsprite gFallingRockSpriteTemplate, ANIM_TARGET, 2, 19, 1, 10, 0 - playsewithpan SE_W088, SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET delay 6 createsprite gFallingRockSpriteTemplate, ANIM_TARGET, 2, -23, 2, -10, 0 - playsewithpan SE_W088, SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 5, 20, 1 delay 6 createsprite gFallingRockSpriteTemplate, ANIM_TARGET, 2, -15, 1, -10, 0 - playsewithpan SE_W088, SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET delay 6 createsprite gFallingRockSpriteTemplate, ANIM_TARGET, 2, 23, 2, 10, 0 - playsewithpan SE_W088, SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET waitforvisualfinish end @@ -2120,16 +2120,16 @@ Move_ROCK_SLIDE: 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, SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET delay 2 createsprite gFallingRockSpriteTemplate, ANIM_TARGET, 2, 5, 0, 6, 1 - playsewithpan SE_W088, SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET delay 2 createsprite gFallingRockSpriteTemplate, ANIM_TARGET, 2, 19, 1, 10, 1 - playsewithpan SE_W088, SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET delay 2 createsprite gFallingRockSpriteTemplate, ANIM_TARGET, 2, -23, 2, -10, 1 - playsewithpan SE_W088, SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 5, 50, 1 createvisualtask AnimTask_ShakeMon, 2, ANIM_DEF_PARTNER, 0, 5, 50, 1 delay 2 @@ -2141,28 +2141,28 @@ Move_ROCK_SLIDE: RockSlideRocks: createsprite gFallingRockSpriteTemplate, ANIM_TARGET, 2, -20, 0, -10, 1 - playsewithpan SE_W088, SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET delay 2 createsprite gFallingRockSpriteTemplate, ANIM_TARGET, 2, 28, 1, 10, 1 - playsewithpan SE_W088, SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET delay 2 createsprite gFallingRockSpriteTemplate, ANIM_TARGET, 2, -10, 1, -5, 1 - playsewithpan SE_W088, SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET delay 2 createsprite gFallingRockSpriteTemplate, ANIM_TARGET, 2, 10, 0, 6, 1 - playsewithpan SE_W088, SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET delay 2 createsprite gFallingRockSpriteTemplate, ANIM_TARGET, 2, 24, 1, 10, 1 - playsewithpan SE_W088, SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET delay 2 createsprite gFallingRockSpriteTemplate, ANIM_TARGET, 2, -32, 2, -10, 1 - playsewithpan SE_W088, SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET delay 2 createsprite gFallingRockSpriteTemplate, ANIM_TARGET, 2, -20, 0, -10, 1 - playsewithpan SE_W088, SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET delay 2 createsprite gFallingRockSpriteTemplate, ANIM_TARGET, 2, 30, 2, 10, 1 - playsewithpan SE_W088, SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET delay 2 return @@ -2175,7 +2175,7 @@ Move_THIEF: setalpha 12, 8 createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 6, 4 delay 6 - playsewithpan SE_W233, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_TARGET, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 1, 0, 8, 1 waitforvisualfinish @@ -2205,22 +2205,22 @@ Move_BUBBLE_BEAM: end BulbblebeamCreateBubbles: createsprite gWaterBubbleProjectileSpriteTemplate, ANIM_ATTACKER, 2, 18, 0, 35, 70, 0, 256, 50 - playsewithpan SE_W145, SOUND_PAN_ATTACKER + playsewithpan SE_M_BUBBLE, SOUND_PAN_ATTACKER delay 3 createsprite gWaterBubbleProjectileSpriteTemplate, ANIM_ATTACKER, 2, 18, 0, 20, 40, -10, 256, 50 - playsewithpan SE_W145, SOUND_PAN_ATTACKER + playsewithpan SE_M_BUBBLE, SOUND_PAN_ATTACKER delay 3 createsprite gWaterBubbleProjectileSpriteTemplate, ANIM_ATTACKER, 2, 18, 0, 10, -60, 0, 256, 50 - playsewithpan SE_W145, SOUND_PAN_ATTACKER + playsewithpan SE_M_BUBBLE, SOUND_PAN_ATTACKER delay 3 createsprite gWaterBubbleProjectileSpriteTemplate, ANIM_ATTACKER, 2, 18, 0, 15, -15, 10, 256, 50 - playsewithpan SE_W145, SOUND_PAN_ATTACKER + playsewithpan SE_M_BUBBLE, SOUND_PAN_ATTACKER delay 3 createsprite gWaterBubbleProjectileSpriteTemplate, ANIM_ATTACKER, 2, 18, 0, 30, 10, -10, 256, 50 - playsewithpan SE_W145, SOUND_PAN_ATTACKER + playsewithpan SE_M_BUBBLE, SOUND_PAN_ATTACKER delay 3 createsprite gWaterBubbleProjectileSpriteTemplate, ANIM_ATTACKER, 2, 18, 0, 25, -30, 10, 256, 50 - playsewithpan SE_W145, SOUND_PAN_ATTACKER + playsewithpan SE_M_BUBBLE, SOUND_PAN_ATTACKER delay 3 return @@ -2231,14 +2231,14 @@ Move_ICY_WIND: createvisualtask AnimTask_BlendBattleAnimPal, 10, 11, 4, 0, 4, RGB_BLACK fadetobg BG_ICE waitbgfadeout - playsewithpan SE_W196, 0 + playsewithpan SE_M_ICY_WIND, 0 waitbgfadein waitforvisualfinish - panse_1B SE_W016, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 + panse_1B SE_M_GUST, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 call IcyWindSwirlingSnowballs delay 5 call IcyWindSwirlingSnowballs - playsewithpan SE_W016B, SOUND_PAN_TARGET + playsewithpan SE_M_GUST2, SOUND_PAN_TARGET delay 55 call IceSpikesEffectLong waitforvisualfinish @@ -2263,12 +2263,12 @@ IcyWindSwirlingSnowballs: Move_SMOKESCREEN: loadspritegfx ANIM_TAG_BLACK_SMOKE loadspritegfx ANIM_TAG_BLACK_BALL - playsewithpan SE_W104, SOUND_PAN_ATTACKER + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER createsprite gBlackBallSpriteTemplate, ANIM_TARGET, 2, 20, 0, 0, 0, 35, -25 waitforvisualfinish createvisualtask AnimTask_SmokescreenImpact, 2 delay 2 - playsewithpan SE_W028, SOUND_PAN_TARGET + playsewithpan SE_M_SAND_ATTACK, SOUND_PAN_TARGET 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 @@ -2290,7 +2290,7 @@ Move_CONVERSION: monbgprio_28 ANIM_ATTACKER setalpha 16, 0 delay 0 - playsewithpan SE_W129, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWIFT, SOUND_PAN_ATTACKER createsprite gConversionSpriteTemplate, ANIM_ATTACKER, 2, -24, -24 delay 3 createsprite gConversionSpriteTemplate, ANIM_ATTACKER, 2, -8, -24 @@ -2299,7 +2299,7 @@ Move_CONVERSION: delay 3 createsprite gConversionSpriteTemplate, ANIM_ATTACKER, 2, 24, -24 delay 3 - playsewithpan SE_W129, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWIFT, SOUND_PAN_ATTACKER createsprite gConversionSpriteTemplate, ANIM_ATTACKER, 2, -24, -8 delay 3 createsprite gConversionSpriteTemplate, ANIM_ATTACKER, 2, -8, -8 @@ -2308,7 +2308,7 @@ Move_CONVERSION: delay 3 createsprite gConversionSpriteTemplate, ANIM_ATTACKER, 2, 24, -8 delay 3 - playsewithpan SE_W129, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWIFT, SOUND_PAN_ATTACKER createsprite gConversionSpriteTemplate, ANIM_ATTACKER, 2, -24, 8 delay 3 createsprite gConversionSpriteTemplate, ANIM_ATTACKER, 2, -8, 8 @@ -2317,7 +2317,7 @@ Move_CONVERSION: delay 3 createsprite gConversionSpriteTemplate, ANIM_ATTACKER, 2, 24, 8 delay 3 - playsewithpan SE_W129, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWIFT, SOUND_PAN_ATTACKER createsprite gConversionSpriteTemplate, ANIM_ATTACKER, 2, -24, 24 delay 3 createsprite gConversionSpriteTemplate, ANIM_ATTACKER, 2, -8, 24 @@ -2326,7 +2326,7 @@ Move_CONVERSION: delay 3 createsprite gConversionSpriteTemplate, ANIM_ATTACKER, 2, 24, 24 delay 20 - playsewithpan SE_W112, SOUND_PAN_ATTACKER + playsewithpan SE_M_BARRIER, SOUND_PAN_ATTACKER createvisualtask AnimTask_FlashAnimTagWithColor, 2, ANIM_TAG_CONVERSION, 1, 1, RGB(31, 31, 13), 12, 0, 0 delay 6 createvisualtask AnimTask_ConversionAlphaBlend, 5 @@ -2342,7 +2342,7 @@ Move_CONVERSION_2: monbgprio_2A ANIM_TARGET setalpha 0, 16 delay 0 - playsewithpan SE_W112, SOUND_PAN_TARGET + playsewithpan SE_M_BARRIER, SOUND_PAN_TARGET createsprite gConversion2SpriteTemplate, ANIM_ATTACKER, 2, -24, -24, 60 createsprite gConversion2SpriteTemplate, ANIM_ATTACKER, 2, -8, -24, 65 createsprite gConversion2SpriteTemplate, ANIM_ATTACKER, 2, 8, -24, 70 @@ -2361,21 +2361,21 @@ Move_CONVERSION_2: createsprite gConversion2SpriteTemplate, ANIM_ATTACKER, 2, 24, 24, 135 createvisualtask AnimTask_Conversion2AlphaBlend, 5 delay 60 - playsewithpan SE_W129, SOUND_PAN_TARGET + playsewithpan SE_M_SWIFT, SOUND_PAN_TARGET delay 10 - playsewithpan SE_W129, SOUND_PAN_TARGET + playsewithpan SE_M_SWIFT, SOUND_PAN_TARGET delay 10 - playsewithpan SE_W129, SOUND_PAN_TARGET + playsewithpan SE_M_SWIFT, SOUND_PAN_TARGET delay 10 - playsewithpan SE_W129, SOUND_PAN_TARGET + playsewithpan SE_M_SWIFT, SOUND_PAN_TARGET delay 10 - playsewithpan SE_W129, SOUND_PAN_TARGET + playsewithpan SE_M_SWIFT, SOUND_PAN_TARGET delay 10 - playsewithpan SE_W129, SOUND_PAN_TARGET + playsewithpan SE_M_SWIFT, SOUND_PAN_TARGET delay 10 - playsewithpan SE_W129, SOUND_PAN_TARGET + playsewithpan SE_M_SWIFT, SOUND_PAN_TARGET delay 10 - playsewithpan SE_W129, SOUND_PAN_TARGET + playsewithpan SE_M_SWIFT, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -2387,14 +2387,14 @@ Move_ROLLING_KICK: monbg ANIM_TARGET setalpha 12, 8 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 18, 6, 1, 4 - playsewithpan SE_W104, SOUND_PAN_ATTACKER + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER delay 6 - playsewithpan SE_W104, SOUND_PAN_ATTACKER + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER waitforvisualfinish createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, 0, 0, 4 createsprite gSlidingKickSpriteTemplate, ANIM_ATTACKER, 2, -24, 0, 48, 10, 160, 0 delay 5 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -8, 0, ANIM_TARGET, 2 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 6, 1 waitforvisualfinish @@ -2406,7 +2406,7 @@ Move_ROLLING_KICK: Move_HEADBUTT: loadspritegfx ANIM_TAG_IMPACT createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 0 - playsewithpan SE_W029, SOUND_PAN_ATTACKER + playsewithpan SE_M_HEADBUTT, SOUND_PAN_ATTACKER waitforvisualfinish delay 2 createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 1 @@ -2415,7 +2415,7 @@ Move_HEADBUTT: createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 6, 1 createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 2 createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, ANIM_TARGET, 1 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET waitforvisualfinish end @@ -2423,7 +2423,7 @@ Move_HORN_ATTACK: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HORN_HIT createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 0 - playsewithpan SE_W029, SOUND_PAN_ATTACKER + playsewithpan SE_M_HEADBUTT, SOUND_PAN_ATTACKER waitforvisualfinish delay 2 createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 1 @@ -2433,7 +2433,7 @@ Move_HORN_ATTACK: createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 6, 1 createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 2 createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, ANIM_TARGET, 1 - playsewithpan SE_W030, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET waitforvisualfinish end @@ -2451,14 +2451,14 @@ FuryAttackRight: createsprite gHornHitSpriteTemplate, ANIM_TARGET, 4, 8, 8, 10 waitforvisualfinish createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, ANIM_TARGET, 1 - playsewithpan SE_W030, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET goto FuryAttackContinue FuryAttackLeft: createsprite gHornHitSpriteTemplate, ANIM_TARGET, 4, -8, -8, 10 waitforvisualfinish createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, ANIM_TARGET, 1 - playsewithpan SE_W030, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET goto FuryAttackContinue Move_HORN_DRILL: @@ -2472,47 +2472,47 @@ HornDrillContinue: waitbgfadein setalpha 12, 8 createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 0 - playsewithpan SE_W029, SOUND_PAN_ATTACKER + playsewithpan SE_M_HEADBUTT, SOUND_PAN_ATTACKER 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, ANIM_ATTACKER, 2, 0, 40, 1 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 10, 0, 40, 1 createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, ANIM_TARGET, 3 - playsewithpan SE_W030, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET delay 4 createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 2, ANIM_TARGET, 3 - playsewithpan SE_W030, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET delay 4 createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, -4, 3, ANIM_TARGET, 3 - playsewithpan SE_W030, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET delay 4 createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, -8, -5, ANIM_TARGET, 3 - playsewithpan SE_W030, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET delay 4 createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, 4, -12, ANIM_TARGET, 3 - playsewithpan SE_W030, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET delay 4 createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, 16, 0, ANIM_TARGET, 3 - playsewithpan SE_W030, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET delay 4 createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, 5, 18, ANIM_TARGET, 3 - playsewithpan SE_W030, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET delay 4 createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, -17, 12, ANIM_TARGET, 2 - playsewithpan SE_W030, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET delay 4 createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, -21, -15, ANIM_TARGET, 2 - playsewithpan SE_W030, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET delay 4 createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, 8, -27, ANIM_TARGET, 2 - playsewithpan SE_W030, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET delay 4 createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, 32, 0, ANIM_TARGET, 2 - playsewithpan SE_W030, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET delay 4 createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 2 waitforvisualfinish @@ -2535,15 +2535,15 @@ Move_THRASH: createvisualtask AnimTask_ThrashMoveMonVertical, 2 createsprite gFistFootRandomPosSpriteTemplate, ANIM_TARGET, 3, 1, 10, 0 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 4, 0, 7, 1 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET delay 28 createsprite gFistFootRandomPosSpriteTemplate, ANIM_TARGET, 3, 1, 10, 1 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 4, 0, 7, 1 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET delay 28 createsprite gFistFootRandomPosSpriteTemplate, ANIM_TARGET, 3, 1, 10, 3 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 8, 0, 16, 1 - playsewithpan SE_W025B, SOUND_PAN_TARGET + playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET end Move_SING: @@ -2551,7 +2551,7 @@ Move_SING: monbg ANIM_DEF_PARTNER createvisualtask AnimTask_MusicNotesRainbowBlend, 2 waitforvisualfinish - panse_1B SE_W047, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 + panse_1B SE_M_SING, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 createsprite gWavyMusicNotesSpriteTemplate, ANIM_TARGET, 2, 7, 0, 12 delay 5 createsprite gWavyMusicNotesSpriteTemplate, ANIM_TARGET, 2, 6, 1, 12 @@ -2590,7 +2590,7 @@ Move_LOW_KICK: delay 4 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, -8, 8, ANIM_TARGET, 2 createvisualtask AnimTask_RotateMonSpriteToSide, 2, 6, 384, 1, 2 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET waitforvisualfinish createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 1, 4 end @@ -2598,7 +2598,7 @@ Move_LOW_KICK: Move_EARTHQUAKE: createvisualtask AnimTask_HorizontalShake, 5, (MAX_BATTLERS_COUNT + 1), 10, 50 createvisualtask AnimTask_HorizontalShake, 5, MAX_BATTLERS_COUNT, 10, 50 - playsewithpan SE_W089, 0 + playsewithpan SE_M_EARTHQUAKE, 0 delay 10 createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 1, RGB_BLACK, 14, 0x7FFF, 14 delay 16 @@ -2609,7 +2609,7 @@ Move_FISSURE: loadspritegfx ANIM_TAG_MUD_SAND createvisualtask AnimTask_HorizontalShake, 3, (MAX_BATTLERS_COUNT + 1), 10, 50 createvisualtask AnimTask_HorizontalShake, 3, ANIM_TARGET, 10, 50 - playsewithpan SE_W089, SOUND_PAN_TARGET + playsewithpan SE_M_EARTHQUAKE, SOUND_PAN_TARGET delay 8 call FissureDirtPlumeFar delay 15 @@ -2637,7 +2637,7 @@ FissureDirtPlumeFar: 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, SOUND_PAN_TARGET + playsewithpan SE_M_DIG, SOUND_PAN_TARGET return FissureDirtPlumeClose: @@ -2645,7 +2645,7 @@ FissureDirtPlumeClose: 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, SOUND_PAN_TARGET + playsewithpan SE_M_DIG, SOUND_PAN_TARGET return Move_DIG: @@ -2684,7 +2684,7 @@ DigUnleash: delay 16 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -8, 0, ANIM_TARGET, 2 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 6, 1 - playsewithpan SE_W025B, SOUND_PAN_ATTACKER + playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_ATTACKER clearmonbg ANIM_ATTACKER goto DigEnd DigThrowDirt: @@ -2692,16 +2692,16 @@ DigThrowDirt: 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, SOUND_PAN_ATTACKER + playsewithpan SE_M_DIG, SOUND_PAN_ATTACKER delay 32 return Move_MEDITATE: call SetPsychicBackground createvisualtask AnimTask_MeditateStretchAttacker, 2 - playsewithpan SE_W029, SOUND_PAN_ATTACKER + playsewithpan SE_M_HEADBUTT, SOUND_PAN_ATTACKER delay 16 - playsewithpan SE_W036, SOUND_PAN_ATTACKER + playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER waitforvisualfinish call UnsetPsychicBackground end @@ -2711,15 +2711,15 @@ Move_AGILITY: setalpha 12, 8 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 24, 6, 4, 4 createvisualtask AnimTask_TraceMonBlended, 2, 0, 4, 7, 10 - playsewithpan SE_W104, SOUND_PAN_ATTACKER + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER delay 12 - playsewithpan SE_W104, SOUND_PAN_ATTACKER + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER delay 12 - playsewithpan SE_W104, SOUND_PAN_ATTACKER + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER delay 12 - playsewithpan SE_W104, SOUND_PAN_ATTACKER + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER delay 12 - playsewithpan SE_W104, SOUND_PAN_ATTACKER + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER delay 12 waitforvisualfinish clearmonbg ANIM_ATK_PARTNER @@ -2733,11 +2733,11 @@ Move_QUICK_ATTACK: setalpha 12, 8 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 24, 6, 1, 5 createvisualtask AnimTask_TraceMonBlended, 2, 0, 4, 7, 3 - playsewithpan SE_W026, SOUND_PAN_ATTACKER + playsewithpan SE_M_JUMP_KICK, SOUND_PAN_ATTACKER delay 4 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 6, 1 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 4, 0, 0, ANIM_TARGET, 1 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_ATK_PARTNER blendoff @@ -2751,16 +2751,16 @@ Move_RAGE: setalpha 12, 8 createvisualtask AnimTask_BlendMonInAndOut, 3, ANIM_ATTACKER, RGB_RED, 10, 0, 2 createsprite gAngerMarkSpriteTemplate, ANIM_ATTACKER, 2, 0, -20, -28 - playsewithpan SE_W207B, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWAGGER2, SOUND_PAN_ATTACKER delay 20 createsprite gAngerMarkSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, -28 - playsewithpan SE_W207B, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWAGGER2, SOUND_PAN_ATTACKER waitforvisualfinish createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 6 delay 4 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_TARGET, 2 createvisualtask AnimTask_ShakeTargetBasedOnMovePowerOrDmg, 2, TRUE, 1, 10, 1, 0 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_TARGET end @@ -2768,7 +2768,7 @@ Move_RAGE: Move_TELEPORT: call SetPsychicBackground createvisualtask AnimTask_Teleport, 2 - playsewithpan SE_W100, SOUND_PAN_ATTACKER + playsewithpan SE_M_TELEPORT, SOUND_PAN_ATTACKER delay 15 call UnsetPsychicBackground waitforvisualfinish @@ -2778,23 +2778,23 @@ Move_DOUBLE_TEAM: createvisualtask AnimTask_DoubleTeam, 2 setalpha 12, 8 monbg ANIM_ATK_PARTNER - playsewithpan SE_W104, SOUND_PAN_ATTACKER + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER delay 32 - playsewithpan SE_W104, SOUND_PAN_ATTACKER + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER delay 24 - playsewithpan SE_W104, SOUND_PAN_ATTACKER + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER delay 16 - playsewithpan SE_W104, SOUND_PAN_ATTACKER + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER delay 8 - playsewithpan SE_W104, SOUND_PAN_ATTACKER + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER delay 8 - playsewithpan SE_W104, SOUND_PAN_ATTACKER + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER delay 8 - playsewithpan SE_W104, SOUND_PAN_ATTACKER + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER delay 8 - playsewithpan SE_W104, SOUND_PAN_ATTACKER + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER delay 8 - playsewithpan SE_W104, SOUND_PAN_ATTACKER + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER waitforvisualfinish clearmonbg ANIM_ATK_PARTNER blendoff @@ -2804,7 +2804,7 @@ Move_DOUBLE_TEAM: Move_MINIMIZE: setalpha 10, 8 createvisualtask AnimTask_Minimize, 2 - loopsewithpan SE_W107, SOUND_PAN_ATTACKER, 34, 3 + loopsewithpan SE_M_MINIMIZE, SOUND_PAN_ATTACKER, 34, 3 waitforvisualfinish blendoff end @@ -2813,11 +2813,11 @@ Move_METRONOME: loadspritegfx ANIM_TAG_FINGER loadspritegfx ANIM_TAG_THOUGHT_BUBBLE createsprite gThoughtBubbleSpriteTemplate, ANIM_ATTACKER, 11, 0, 100 - playsewithpan SE_W118, SOUND_PAN_ATTACKER + playsewithpan SE_M_METRONOME, SOUND_PAN_ATTACKER delay 6 createsprite gMetronomeFingerSpriteTemplate, ANIM_ATTACKER, 12, 0 delay 24 - loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 22, 3 + loopsewithpan SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER, 22, 3 waitforvisualfinish end @@ -2832,7 +2832,7 @@ SkullBashSetUp: goto SkullBashEnd SkullBashSetUpHeadDown: createsprite gSlideMonToOffsetAndBackSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, -24, 0, 0, 10, 0 - playsewithpan SE_W036, SOUND_PAN_ATTACKER + playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER waitforvisualfinish createvisualtask AnimTask_RotateMonSpriteToSide, 2, 16, 96, 0, 2 waitforvisualfinish @@ -2842,14 +2842,14 @@ SkullBashSetUpHeadDown: SkullBashAttack: loadspritegfx ANIM_TAG_IMPACT createvisualtask AnimTask_SkullBashPosition, 2, 0 - playsewithpan SE_W036, SOUND_PAN_ATTACKER + playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER waitforvisualfinish - playse SE_BAN + playse SE_BANG createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 1, RGB_BLACK, 14, 0x7FFF, 14 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 2, 0, 40, 1 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 10, 0, 40, 1 createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 4, 0, 0, ANIM_TARGET, 0 - loopsewithpan SE_W025B, SOUND_PAN_TARGET, 8, 3 + loopsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET, 8, 3 waitforvisualfinish createvisualtask AnimTask_SkullBashPosition, 2, 1 goto SkullBashEnd @@ -2859,9 +2859,9 @@ Move_AMNESIA: call SetPsychicBackground delay 8 createsprite gQuestionMarkSpriteTemplate, ANIM_ATTACKER, 20 - playsewithpan SE_W118, SOUND_PAN_ATTACKER + playsewithpan SE_M_METRONOME, SOUND_PAN_ATTACKER delay 54 - loopsewithpan SE_W118, SOUND_PAN_ATTACKER, 16, 3 + loopsewithpan SE_M_METRONOME, SOUND_PAN_ATTACKER, 16, 3 waitforvisualfinish call UnsetPsychicBackground end @@ -2869,18 +2869,18 @@ Move_AMNESIA: Move_KINESIS: loadspritegfx ANIM_TAG_ALERT loadspritegfx ANIM_TAG_BENT_SPOON - playsewithpan SE_W060, SOUND_PAN_ATTACKER + playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER call SetPsychicBackground createsprite gBentSpoonSpriteTemplate, ANIM_ATTACKER, 20 createsprite gKinesisZapEnergySpriteTemplate, ANIM_ATTACKER, 19, 32, -8, 0 createsprite gKinesisZapEnergySpriteTemplate, ANIM_ATTACKER, 19, 32, 16, 1 - loopsewithpan SE_W109, SOUND_PAN_ATTACKER, 21, 2 + loopsewithpan SE_M_CONFUSE_RAY, SOUND_PAN_ATTACKER, 21, 2 delay 60 - playsewithpan SE_W146, SOUND_PAN_ATTACKER + playsewithpan SE_M_DIZZY_PUNCH, SOUND_PAN_ATTACKER delay 30 - loopsewithpan SE_W146, SOUND_PAN_ATTACKER, 20, 2 + loopsewithpan SE_M_DIZZY_PUNCH, SOUND_PAN_ATTACKER, 20, 2 delay 70 - playsewithpan SE_W207B, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWAGGER2, SOUND_PAN_ATTACKER waitforvisualfinish call UnsetPsychicBackground end @@ -2889,14 +2889,14 @@ Move_GLARE: loadspritegfx ANIM_TAG_SMALL_RED_EYE loadspritegfx ANIM_TAG_EYE_SPARKLE createvisualtask AnimTask_GlareEyeDots, 5, 0 - playsewithpan SE_W060B, SOUND_PAN_ATTACKER + playsewithpan SE_M_PSYBEAM2, SOUND_PAN_ATTACKER waitforvisualfinish createvisualtask AnimTask_BlendBattleAnimPal, 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, SOUND_PAN_ATTACKER + playsewithpan SE_M_LEER, SOUND_PAN_ATTACKER delay 2 createvisualtask AnimTask_ShakeTargetInPattern, 3, 20, 1, FALSE waitforvisualfinish @@ -2906,12 +2906,12 @@ Move_GLARE: Move_BARRAGE: loadspritegfx ANIM_TAG_RED_BALL createvisualtask AnimTask_BarrageBall, 3 - playsewithpan SE_W207, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER delay 24 createsprite gShakeMonOrTerrainSpriteTemplate, ANIM_ATTACKER, 2, 8, 1, 40, 1 createvisualtask AnimTask_ShakeMon, 3, ANIM_TARGET, 0, 4, 20, 1 createvisualtask AnimTask_ShakeMon, 3, ANIM_DEF_PARTNER, 0, 4, 20, 1 - loopsewithpan SE_W070, SOUND_PAN_TARGET, 8, 2 + loopsewithpan SE_M_STRENGTH, SOUND_PAN_TARGET, 8, 2 end Move_SKY_ATTACK: @@ -2930,7 +2930,7 @@ SkyAttackSetUpAgainstOpponent: delay 12 createvisualtask AnimTask_BlendBattleAnimPal, 10, 2, 1, 8, 0, RGB_BLACK createvisualtask AnimTask_HorizontalShake, 5, ANIM_ATTACKER, 2, 16 - loopsewithpan SE_W287, SOUND_PAN_ATTACKER, 4, 8 + loopsewithpan SE_M_STAT_INCREASE, SOUND_PAN_ATTACKER, 4, 8 createvisualtask AnimTask_BlendBattleAnimPal, 10, 2, 1, 0, 15, RGB_WHITE delay 20 createvisualtask AnimTask_BlendBattleAnimPal, 10, 2, 1, 15, 0, RGB_WHITE @@ -2946,7 +2946,7 @@ SkyAttackSetUpAgainstPartner: delay 12 createvisualtask AnimTask_BlendBattleAnimPal, 10, 2, 1, 8, 0, RGB_BLACK createvisualtask AnimTask_HorizontalShake, 5, ANIM_ATTACKER, 2, 16 - playsewithpan SE_W287, SOUND_PAN_ATTACKER + playsewithpan SE_M_STAT_INCREASE, SOUND_PAN_ATTACKER delay 8 createvisualtask AnimTask_BlendBattleAnimPal, 10, 2, 1, 0, 15, RGB_WHITE delay 20 @@ -2966,11 +2966,11 @@ SkyAttackUnleash: delay 4 createvisualtask AnimTask_AttackerFadeToInvisible, 5, 0 waitforvisualfinish - createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_W327, SOUND_PAN_ATTACKER + createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_M_SKY_UPPERCUT, SOUND_PAN_ATTACKER createsprite gSkyAttackBirdSpriteTemplate, ANIM_TARGET, 2 delay 14 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 10, 0, 18, 1 - createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_W025B, SOUND_PAN_TARGET + createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_MEGA_KICK2, SOUND_PAN_TARGET delay 20 createvisualtask AnimTask_AttackerFadeFromInvisible, 5, 1 delay 2 @@ -2981,7 +2981,7 @@ SkyAttackUnleash: goto SkyAttackEnd Move_FLASH: - playsewithpan SE_W043, SOUND_PAN_ATTACKER + playsewithpan SE_M_LEER, SOUND_PAN_ATTACKER createvisualtask AnimTask_Flash, 2 waitforvisualfinish end @@ -2989,7 +2989,7 @@ Move_FLASH: Move_SPLASH: createvisualtask AnimTask_Splash, 2, 0, 3 delay 8 - loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 38, 3 + loopsewithpan SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER, 38, 3 waitforvisualfinish end @@ -2997,7 +2997,7 @@ Move_ACID_ARMOR: monbg ANIM_ATTACKER setalpha 15, 0 createvisualtask AnimTask_AcidArmor, 2, ANIM_ATTACKER - playsewithpan SE_W151, SOUND_PAN_ATTACKER + playsewithpan SE_M_ACID_ARMOR, SOUND_PAN_ATTACKER waitforvisualfinish blendoff clearmonbg ANIM_ATTACKER @@ -3013,7 +3013,7 @@ Move_SHARPEN: Move_SUPER_FANG: loadspritegfx ANIM_TAG_FANG_ATTACK createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 1, 0, 20, 1 - playsewithpan SE_W082, SOUND_PAN_ATTACKER + playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER waitforvisualfinish createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 3, 0, 48, 1 createvisualtask AnimTask_BlendMonInAndOut, 2, ANIM_ATTACKER, RGB(31, 6, 1), 12, 4, 1 @@ -3022,7 +3022,7 @@ Move_SUPER_FANG: createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 4 delay 4 createsprite gSuperFangSpriteTemplate, ANIM_TARGET, 2 - playsewithpan SE_W044, SOUND_PAN_TARGET + playsewithpan SE_M_BITE, SOUND_PAN_TARGET delay 8 createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 1, RGB(31, 2, 2), 14, 0x7FFF, 14 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 7, 12, 1 @@ -3033,11 +3033,11 @@ Move_SUPER_FANG: Move_SLASH: loadspritegfx ANIM_TAG_SLASH createsprite gSlashSliceSpriteTemplate, ANIM_TARGET, 2, 1, -8, 0 - playsewithpan SE_W013, SOUND_PAN_TARGET + playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET delay 4 createsprite gSlashSliceSpriteTemplate, ANIM_TARGET, 2, 1, 8, 0 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 18, 1 - playsewithpan SE_W013, SOUND_PAN_TARGET + playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET waitforvisualfinish end @@ -3049,11 +3049,11 @@ Move_STRUGGLE: createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 3, 0, 12, 4 createsprite gMovementWavesSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 2 createsprite gMovementWavesSpriteTemplate, ANIM_ATTACKER, 2, 0, 1, 2 - loopsewithpan SE_W029, SOUND_PAN_ATTACKER, 12, 4 + loopsewithpan SE_M_HEADBUTT, SOUND_PAN_ATTACKER, 12, 4 waitforvisualfinish createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, ANIM_TARGET, 2 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 3, 0, 6, 1 - playsewithpan SE_W025B, SOUND_PAN_TARGET + playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_TARGET blendoff @@ -3067,7 +3067,7 @@ Move_SKETCH: waitforvisualfinish clearmonbg ANIM_TARGET createvisualtask AnimTask_Splash, 2, 0, 2 - loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 38, 2 + loopsewithpan SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER, 38, 2 end Move_NIGHTMARE: @@ -3077,7 +3077,7 @@ Move_NIGHTMARE: monbg ANIM_DEF_PARTNER createvisualtask AnimTask_NightmareClone, 2 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 40, 1 - playsewithpan SE_W171, SOUND_PAN_TARGET + playsewithpan SE_M_NIGHTMARE, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_DEF_PARTNER restorebg @@ -3086,7 +3086,7 @@ Move_NIGHTMARE: NightmareInContest: createvisualtask AnimTask_BlendMonInAndOut, 2, ANIM_ATTACKER, RGB_WHITE, 10, 2, 1 createvisualtask AnimTask_ShakeMon, 2, ANIM_ATTACKER, 3, 0, 32, 1 - playsewithpan SE_W171, SOUND_PAN_TARGET + playsewithpan SE_M_NIGHTMARE, SOUND_PAN_TARGET waitforvisualfinish restorebg waitbgfadein @@ -3097,11 +3097,11 @@ Move_FLAIL: monbg ANIM_TARGET setalpha 12, 8 createvisualtask AnimTask_FlailMovement, 2, ANIM_ATTACKER - loopsewithpan SE_W029, SOUND_PAN_ATTACKER, 8, 2 + loopsewithpan SE_M_HEADBUTT, SOUND_PAN_ATTACKER, 8, 2 waitforvisualfinish createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, ANIM_TARGET, 3 createvisualtask AnimTask_ShakeTargetBasedOnMovePowerOrDmg, 2, FALSE, 1, 30, 1, 0 - playsewithpan SE_W025B, SOUND_PAN_TARGET + playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_TARGET blendoff @@ -3109,12 +3109,12 @@ Move_FLAIL: Move_SPITE: fadetobg BG_GHOST - playsewithpan SE_W060, SOUND_PAN_ATTACKER + playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER waitbgfadein monbg ANIM_DEF_PARTNER createvisualtask AnimTask_BlendColorCycle, 2, 2, 2, 6, 0, 8, RGB_WHITE createvisualtask AnimTask_SpiteTargetShadow, 2 - loopsewithpan SE_W060, SOUND_PAN_TARGET, 20, 3 + loopsewithpan SE_M_PSYBEAM, SOUND_PAN_TARGET, 20, 3 waitforvisualfinish restorebg waitbgfadein @@ -3135,11 +3135,11 @@ MachPunchContinue: delay 0 setalpha 9, 8 createvisualtask AnimTask_AttackerPunchWithTrace, 2, RGB(8, 9, 28), 10 - playsewithpan SE_W026, SOUND_PAN_ATTACKER + playsewithpan SE_M_JUMP_KICK, SOUND_PAN_ATTACKER delay 6 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, ANIM_TARGET, 1 createsprite gFistFootSpriteTemplate, ANIM_TARGET, 4, 0, 0, 8, 1, 0 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 waitforvisualfinish clearmonbg ANIM_ATK_PARTNER @@ -3160,13 +3160,13 @@ Move_FORESIGHT: setalpha 16, 0 createsprite gForesightMagnifyingGlassSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET delay 17 - loopsewithpan SE_W166, SOUND_PAN_TARGET, 16, 4 + loopsewithpan SE_M_SKETCH, SOUND_PAN_TARGET, 16, 4 delay 48 delay 24 - playsewithpan SE_W166, SOUND_PAN_TARGET + playsewithpan SE_M_SKETCH, SOUND_PAN_TARGET delay 10 createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_TARGET, RGB_WHITE, 12, 2, 1 - playsewithpan SE_W197, SOUND_PAN_TARGET + playsewithpan SE_M_DETECT, SOUND_PAN_TARGET waitforvisualfinish blendoff clearmonbg ANIM_DEF_PARTNER @@ -3175,16 +3175,16 @@ Move_FORESIGHT: Move_DESTINY_BOND: loadspritegfx ANIM_TAG_WHITE_SHADOW fadetobg BG_GHOST - playsewithpan SE_W060, SOUND_PAN_ATTACKER + playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER waitbgfadein createvisualtask AnimTask_DestinyBondWhiteShadow, 5, 0, 48 - playsewithpan SE_W109, SOUND_PAN_ATTACKER + playsewithpan SE_M_CONFUSE_RAY, SOUND_PAN_ATTACKER delay 48 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 2, 0, 24, 1 createvisualtask AnimTask_BlendBattleAnimPalExclude, 2, 6, 1, 0, 12, RGB(29, 29, 29) delay 24 createvisualtask AnimTask_BlendBattleAnimPalExclude, 2, 6, 1, 12, 0, RGB(29, 29, 29) - playsewithpan SE_W171, SOUND_PAN_TARGET + playsewithpan SE_M_NIGHTMARE, SOUND_PAN_TARGET waitforvisualfinish restorebg waitbgfadein @@ -3194,7 +3194,7 @@ Move_DESTINY_BOND: Move_ENDURE: loadspritegfx ANIM_TAG_FOCUS_ENERGY - playsewithpan SE_W082, SOUND_PAN_ATTACKER + playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER call EndureEffect delay 8 createvisualtask AnimTask_BlendColorCycle, 2, 2, 2, 2, 0, 11, RGB_RED @@ -3221,13 +3221,13 @@ Move_CHARM: loadspritegfx ANIM_TAG_MAGENTA_HEART createvisualtask AnimTask_RockMonBackAndForth, 5, ANIM_ATTACKER, 2, 0 createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, 0, 20 - playsewithpan SE_W204, SOUND_PAN_ATTACKER + playsewithpan SE_M_CHARM, SOUND_PAN_ATTACKER delay 15 createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, -20, 20 - playsewithpan SE_W204, SOUND_PAN_ATTACKER + playsewithpan SE_M_CHARM, SOUND_PAN_ATTACKER delay 15 createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, 20, 20 - playsewithpan SE_W204, SOUND_PAN_ATTACKER + playsewithpan SE_M_CHARM, SOUND_PAN_ATTACKER waitforvisualfinish end @@ -3242,7 +3242,7 @@ Move_ROLLOUT: waitforvisualfinish createvisualtask AnimTask_ShakeTargetBasedOnMovePowerOrDmg, 2, FALSE, 1, 30, 1, 0 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 4, 0, 0, ANIM_TARGET, 2 - playsewithpan SE_W025B, SOUND_PAN_TARGET + playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -3252,44 +3252,44 @@ Move_FALSE_SWIPE: loadspritegfx ANIM_TAG_SLASH_2 loadspritegfx ANIM_TAG_IMPACT createsprite gFalseSwipeSliceSpriteTemplate, ANIM_TARGET, 2 - playsewithpan SE_W233, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW, SOUND_PAN_TARGET delay 16 createsprite gFalseSwipePositionedSliceSpriteTemplate, ANIM_TARGET, 2, 0 - playsewithpan SE_W104, SOUND_PAN_TARGET + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_TARGET delay 2 createsprite gFalseSwipePositionedSliceSpriteTemplate, ANIM_TARGET, 2, 16 delay 2 createsprite gFalseSwipePositionedSliceSpriteTemplate, ANIM_TARGET, 2, 32 - playsewithpan SE_W104, SOUND_PAN_TARGET + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_TARGET delay 2 createsprite gFalseSwipePositionedSliceSpriteTemplate, ANIM_TARGET, 2, 48 delay 2 createsprite gFalseSwipePositionedSliceSpriteTemplate, ANIM_TARGET, 2, 64 - playsewithpan SE_W104, SOUND_PAN_TARGET + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_TARGET delay 2 createsprite gFalseSwipePositionedSliceSpriteTemplate, ANIM_TARGET, 2, 80 delay 2 waitforvisualfinish createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 6, 1 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 4, 0, 0, ANIM_TARGET, 3 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET end Move_SWAGGER: loadspritegfx ANIM_TAG_BREATH loadspritegfx ANIM_TAG_ANGER createvisualtask AnimTask_GrowAndShrink, 2 - playsewithpan SE_W207, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER waitforvisualfinish createsprite gBreathPuffSpriteTemplate, ANIM_ATTACKER, 2 - loopsewithpan SE_W207, SOUND_PAN_ATTACKER, 4, 2 + loopsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER, 4, 2 waitforvisualfinish delay 24 createsprite gAngerMarkSpriteTemplate, ANIM_TARGET, 2, 1, -20, -28 - playsewithpan SE_W207B, SOUND_PAN_TARGET + playsewithpan SE_M_SWAGGER2, SOUND_PAN_TARGET delay 12 createsprite gAngerMarkSpriteTemplate, ANIM_TARGET, 2, 1, 20, -28 - playsewithpan SE_W207B, SOUND_PAN_TARGET + playsewithpan SE_M_SWAGGER2, SOUND_PAN_TARGET waitforvisualfinish end @@ -3300,14 +3300,14 @@ Move_MILK_DRINK: monbg ANIM_TARGET createsprite gMilkBottleSpriteTemplate, ANIM_ATTACKER, 2 delay 40 - playsewithpan SE_W152, SOUND_PAN_ATTACKER + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_ATTACKER delay 12 - playsewithpan SE_W152, SOUND_PAN_ATTACKER + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_ATTACKER delay 20 - playsewithpan SE_W152, SOUND_PAN_ATTACKER + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_ATTACKER waitforvisualfinish createsprite gThinRingExpandingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 0 - playsewithpan SE_W208, SOUND_PAN_ATTACKER + playsewithpan SE_M_MILK_DRINK, SOUND_PAN_ATTACKER waitforvisualfinish clearmonbg ANIM_TARGET call HealingEffect2 @@ -3324,12 +3324,12 @@ MagnitudeEnd: MagnitudeRegular: createvisualtask AnimTask_HorizontalShake, 5, (MAX_BATTLERS_COUNT + 1), 0, 50 createvisualtask AnimTask_HorizontalShake, 5, MAX_BATTLERS_COUNT, 0, 50 - loopsewithpan SE_W070, SOUND_PAN_TARGET, 8, 10 + loopsewithpan SE_M_STRENGTH, SOUND_PAN_TARGET, 8, 10 goto MagnitudeEnd MagnitudeIntense: createvisualtask AnimTask_HorizontalShake, 5, (MAX_BATTLERS_COUNT + 1), 0, 50 createvisualtask AnimTask_HorizontalShake, 5, MAX_BATTLERS_COUNT, 0, 50 - loopsewithpan SE_W070, SOUND_PAN_TARGET, 8, 10 + loopsewithpan SE_M_STRENGTH, SOUND_PAN_TARGET, 8, 10 delay 10 createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 1, RGB_BLACK, 14, 0x7FFF, 14 delay 16 @@ -3342,15 +3342,15 @@ Move_RAPID_SPIN: monbg ANIM_ATTACKER createsprite gRapidSpinSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 32, -32, 40, -2 createvisualtask AnimTask_RapinSpinMonElevation, 2, 0, 2, 0 - loopsewithpan SE_W013B, SOUND_PAN_ATTACKER, 8, 4 + loopsewithpan SE_M_RAZOR_WIND2, SOUND_PAN_ATTACKER, 8, 4 waitforvisualfinish createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 0, 0, ANIM_TARGET, 2 createvisualtask AnimTask_ShakeTargetBasedOnMovePowerOrDmg, 2, FALSE, 1, 10, 1, 0 - playsewithpan SE_W003, SOUND_PAN_TARGET + playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET waitforvisualfinish delay 8 createvisualtask AnimTask_RapinSpinMonElevation, 2, 0, 2, 1 - loopsewithpan SE_W013B, SOUND_PAN_ATTACKER, 8, 4 + loopsewithpan SE_M_RAZOR_WIND2, SOUND_PAN_ATTACKER, 8, 4 waitforvisualfinish clearmonbg ANIM_ATTACKER end @@ -3364,7 +3364,7 @@ Move_MOONLIGHT: 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 @@ -3393,7 +3393,7 @@ ExtremeSpeedContinue: createvisualtask AnimTask_StartSlidingBg, 5, -2304, 0, 1, -1 waitbgfadein createvisualtask AnimTask_AttackerStretchAndDisappear, 2 - loopsewithpan SE_W013B, SOUND_PAN_ATTACKER, 8, 3 + loopsewithpan SE_M_RAZOR_WIND2, SOUND_PAN_ATTACKER, 8, 3 waitforvisualfinish delay 1 createvisualtask AnimTask_SetAttackerInvisibleWaitForSignal, 2 @@ -3402,19 +3402,19 @@ ExtremeSpeedContinue: delay 18 createvisualtask AnimTask_ExtremeSpeedImpact, 2 delay 2 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET createsprite gMonEdgeHitSplatSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 0, -12, 3 delay 10 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET createsprite gMonEdgeHitSplatSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 0, 12, 3 delay 10 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET createsprite gMonEdgeHitSplatSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 0, 0, 3 waitforvisualfinish createvisualtask AnimTask_SpeedDust, 2 delay 10 createvisualtask AnimTask_ExtremeSpeedMonReappear, 2 - loopsewithpan SE_W104, SOUND_PAN_ATTACKER, 8, 4 + loopsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER, 8, 4 waitforvisualfinish restorebg waitbgfadeout @@ -3436,19 +3436,19 @@ Move_UPROAR: monbg ANIM_DEF_PARTNER createvisualtask AnimTask_UproarDistortion, 2, 0 createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0, 31, 8 - playsewithpan SE_W253, SOUND_PAN_ATTACKER + playsewithpan SE_M_UPROAR, SOUND_PAN_ATTACKER 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, SOUND_PAN_ATTACKER + playsewithpan SE_M_UPROAR, SOUND_PAN_ATTACKER 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, SOUND_PAN_ATTACKER + playsewithpan SE_M_UPROAR, SOUND_PAN_ATTACKER createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0, 24, -24, 1 createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0, -24, -24, 0 waitforvisualfinish @@ -3460,7 +3460,7 @@ Move_HEAT_WAVE: createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_FLYING_DIRT, 0, 6, 6, RGB_RED createvisualtask AnimTask_LoadSandstormBackground, 5, TRUE createvisualtask AnimTask_BlendBackground, 6, 6, RGB_RED - panse_1B SE_W257, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 + panse_1B SE_M_HEAT_WAVE, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 delay 4 createvisualtask AnimTask_MoveHeatWaveTargets, 5 delay 12 @@ -3486,7 +3486,7 @@ Move_HAIL: createvisualtask AnimTask_BlendBattleAnimPal, 10, 1, 3, 0, 6, RGB_BLACK waitforvisualfinish createvisualtask AnimTask_Hail, 5 - loopsewithpan SE_W258, 0, 8, 10 + loopsewithpan SE_M_HAIL, 0, 8, 10 waitforvisualfinish createvisualtask AnimTask_BlendBattleAnimPal, 10, 1, 3, 6, 0, RGB_BLACK end @@ -3498,10 +3498,10 @@ Move_TORMENT: waitforvisualfinish createvisualtask AnimTask_BlendMonInAndOut, 2, ANIM_TARGET, RGB_RED, 10, 1, 1 createsprite gAngerMarkSpriteTemplate, ANIM_TARGET, 2, 1, -20, -28 - playsewithpan SE_W207B, SOUND_PAN_TARGET + playsewithpan SE_M_SWAGGER2, SOUND_PAN_TARGET delay 20 createsprite gAngerMarkSpriteTemplate, ANIM_TARGET, 2, 1, 20, -28 - playsewithpan SE_W207B, SOUND_PAN_TARGET + playsewithpan SE_M_SWAGGER2, SOUND_PAN_TARGET end Move_MEMENTO: @@ -3510,9 +3510,9 @@ Move_MEMENTO: createvisualtask AnimTask_InitMementoShadow, 2 delay 1 createvisualtask AnimTask_MoveAttackerMementoShadow, 5 - playsewithpan SE_W060, SOUND_PAN_ATTACKER + playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER delay 48 - playsewithpan SE_W060B, SOUND_PAN_ATTACKER + playsewithpan SE_M_PSYBEAM2, SOUND_PAN_ATTACKER waitforvisualfinish createvisualtask sub_8114470, 2 delay 12 @@ -3520,7 +3520,7 @@ Move_MEMENTO: delay 1 monbg_22 ANIM_TARGET createvisualtask AnimTask_MoveTargetMementoShadow, 5 - playsewithpan SE_W060, SOUND_PAN_TARGET + playsewithpan SE_M_PSYBEAM, SOUND_PAN_TARGET waitforvisualfinish clearmonbg_23 ANIM_TARGET delay 1 @@ -3532,7 +3532,7 @@ Move_FACADE: loadspritegfx ANIM_TAG_SWEAT_DROP createvisualtask AnimTask_SquishAndSweatDroplets, 2, ANIM_ATTACKER, 3 createvisualtask AnimTask_FacadeColorBlend, 2, ANIM_ATTACKER, 72 - loopsewithpan SE_W207, SOUND_PAN_ATTACKER, 24, 3 + loopsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER, 24, 3 end Move_SMELLING_SALT: @@ -3542,22 +3542,22 @@ Move_SMELLING_SALT: createsprite gSmellingSaltsHandSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 1, 2 delay 32 createvisualtask AnimTask_SmellingSaltsSquish, 3, ANIM_TARGET, 2 - loopsewithpan SE_W003, SOUND_PAN_TARGET, 12, 2 + loopsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET, 12, 2 waitforvisualfinish delay 4 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 6, 2 createsprite gSmellingSaltExclamationSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 8, 3 - loopsewithpan SE_W207B, SOUND_PAN_TARGET, 16, 3 + loopsewithpan SE_M_SWAGGER2, SOUND_PAN_TARGET, 16, 3 end Move_FOLLOW_ME: loadspritegfx ANIM_TAG_FINGER createsprite gFollowMeFingerSpriteTemplate, ANIM_ATTACKER, 2, 0 - playsewithpan SE_W039, SOUND_PAN_ATTACKER + playsewithpan SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER delay 18 - playsewithpan SE_W213, SOUND_PAN_ATTACKER + playsewithpan SE_M_ATTRACT, SOUND_PAN_ATTACKER delay 71 - loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 22, 3 + loopsewithpan SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER, 22, 3 end Move_CHARGE: @@ -3569,26 +3569,26 @@ Move_CHARGE: createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 4, RGB_BLACK waitforvisualfinish createvisualtask AnimTask_ElectricChargingParticles, 2, ANIM_ATTACKER, 60, 2, 12 - playsewithpan SE_W268, SOUND_PAN_ATTACKER + playsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER delay 30 - playsewithpan SE_W268, SOUND_PAN_ATTACKER + playsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER delay 30 - playsewithpan SE_W268, SOUND_PAN_ATTACKER + playsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER createsprite gGrowingChargeOrbSpriteTemplate, ANIM_ATTACKER, 2, 0 delay 25 - playsewithpan SE_W268, SOUND_PAN_ATTACKER + playsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER delay 20 - playsewithpan SE_W268, SOUND_PAN_ATTACKER + playsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER delay 15 - playsewithpan SE_W268, SOUND_PAN_ATTACKER + playsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER delay 10 delay 6 - loopsewithpan SE_W268, SOUND_PAN_ATTACKER, 6, 5 + loopsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER, 6, 5 waitforvisualfinish createsprite gElectricPuffSpriteTemplate, ANIM_ATTACKER, 2, 0, 16, 16 delay 2 createsprite gElectricPuffSpriteTemplate, ANIM_ATTACKER, 2, 0, -16, -16 - playsewithpan SE_W085B, SOUND_PAN_ATTACKER + playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_ATTACKER waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 4, 4, 0, RGB_BLACK clearmonbg ANIM_ATTACKER @@ -3600,19 +3600,19 @@ Move_TAUNT: loadspritegfx ANIM_TAG_THOUGHT_BUBBLE loadspritegfx ANIM_TAG_ANGER createsprite gThoughtBubbleSpriteTemplate, ANIM_ATTACKER, 11, 0, 45 - playsewithpan SE_W118, SOUND_PAN_ATTACKER + playsewithpan SE_M_METRONOME, SOUND_PAN_ATTACKER delay 6 createsprite gTauntFingerSpriteTemplate, ANIM_ATTACKER, 12, 0 delay 4 - loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 16, 2 + loopsewithpan SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER, 16, 2 waitforvisualfinish delay 8 createsprite gAngerMarkSpriteTemplate, ANIM_TARGET, 2, 1, -20, -28 - playsewithpan SE_W207B, SOUND_PAN_TARGET + playsewithpan SE_M_SWAGGER2, SOUND_PAN_TARGET waitforvisualfinish delay 12 createsprite gAngerMarkSpriteTemplate, ANIM_TARGET, 2, 1, 20, -28 - playsewithpan SE_W207B, SOUND_PAN_TARGET + playsewithpan SE_M_SWAGGER2, SOUND_PAN_TARGET end Move_HELPING_HAND: @@ -3621,13 +3621,13 @@ Move_HELPING_HAND: 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, ANIM_ATK_PARTNER, 2, 0, 5, 1 delay 14 - playsewithpan SE_W227, 0 + playsewithpan SE_M_ENCORE, 0 createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATK_PARTNER, 2, 0, 5, 1 delay 20 - playsewithpan SE_W227, 0 + playsewithpan SE_M_ENCORE, 0 createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATK_PARTNER, 3, 0, 10, 1 createvisualtask AnimTask_BlendMonInAndOut, 2, ANIM_ATK_PARTNER, RGB_YELLOW, 12, 1, 1 end @@ -3637,16 +3637,16 @@ Move_ASSIST: 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: @@ -3657,10 +3657,10 @@ Move_SUPERPOWER: monbgprio_28 ANIM_ATTACKER setalpha 12, 8 createsprite gSuperpowerOrbSpriteTemplate, ANIM_TARGET, 2, ANIM_ATTACKER - playsewithpan SE_W025, SOUND_PAN_ATTACKER + playsewithpan SE_M_MEGA_KICK, SOUND_PAN_ATTACKER delay 20 createsprite gShakeMonOrTerrainSpriteTemplate, ANIM_ATTACKER, 2, 4, 1, 180, 1 - createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_W089, 0 + createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_M_EARTHQUAKE, 0 delay 40 createsprite gSuperpowerRockSpriteTemplate, ANIM_ATTACKER, 41, 200, 96, 1, 120 delay 8 @@ -3673,10 +3673,10 @@ Move_SUPERPOWER: createsprite gSuperpowerRockSpriteTemplate, ANIM_ATTACKER, 41, 60, 288, 3, 88 delay 74 createsprite gSuperpowerFireballSpriteTemplate, ANIM_TARGET, 3, ANIM_ATTACKER - playsewithpan SE_W207, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER delay 16 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 8, 0, 16, 1 - playsewithpan SE_W025B, SOUND_PAN_TARGET + playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_ATK_PARTNER blendoff @@ -3689,10 +3689,10 @@ Move_RECYCLE: setalpha 0, 16 delay 1 createsprite gRecycleSpriteTemplate, ANIM_ATTACKER, 2 - loopsewithpan SE_W036, SOUND_PAN_ATTACKER, 24, 3 + loopsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER, 24, 3 waitforvisualfinish createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_ATTACKER, RGB_WHITE, 12, 2, 1 - playsewithpan SE_W036, SOUND_PAN_ATTACKER + playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER waitforvisualfinish blendoff clearmonbg ANIM_ATTACKER @@ -3712,19 +3712,19 @@ BrickBreakNormal: delay 4 delay 1 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, -18, -18, ANIM_TARGET, 1 - playsewithpan SE_W233, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW, SOUND_PAN_TARGET delay 20 createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 3, 8 delay 5 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 18, 18, ANIM_TARGET, 1 - playsewithpan SE_W233, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW, SOUND_PAN_TARGET delay 20 createvisualtask AnimTask_WindUpLunge, 2, ANIM_ATTACKER, -24, 0, 24, 10, 24, 3 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 6, RGB_BLACK delay 37 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, ANIM_TARGET, 1 createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 4, 0, 0, 10, 1, 0 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 6, 0, RGB_BLACK waitforvisualfinish @@ -3738,25 +3738,25 @@ BrickBreakShatteredWall: createsprite gBrickBreakWallSpriteTemplate, ANIM_ATTACKER, 3, ANIM_TARGET, 0, 0, 90, 10 delay 1 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, -18, -18, ANIM_TARGET, 1 - playsewithpan SE_W233, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW, SOUND_PAN_TARGET delay 20 createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 3, 8 delay 5 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 18, 18, ANIM_TARGET, 1 - playsewithpan SE_W233, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW, SOUND_PAN_TARGET delay 20 createvisualtask AnimTask_WindUpLunge, 2, ANIM_ATTACKER, -24, 0, 24, 10, 24, 3 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 6, RGB_BLACK delay 37 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, ANIM_TARGET, 1 createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 4, 0, 0, 10, 1, 0 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET waitforvisualfinish createsprite gBrickBreakWallShardSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0, -8, -12 createsprite gBrickBreakWallShardSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 1, 8, -12 createsprite gBrickBreakWallShardSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 2, -8, 12 createsprite gBrickBreakWallShardSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 3, 8, 12 - playsewithpan SE_W280, SOUND_PAN_TARGET + playsewithpan SE_M_BRICK_BREAK, SOUND_PAN_TARGET waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 6, 0, RGB_BLACK waitforvisualfinish @@ -3766,33 +3766,33 @@ BrickBreakShatteredWall: Move_YAWN: loadspritegfx ANIM_TAG_PINK_CLOUD createvisualtask AnimTask_DeepInhale, 2, ANIM_ATTACKER - playsewithpan SE_W281, SOUND_PAN_ATTACKER + playsewithpan SE_M_YAWN, SOUND_PAN_ATTACKER waitforvisualfinish createsprite gYawnCloudSpriteTemplate, ANIM_TARGET, 5, 2 - playsewithpan SE_W255, SOUND_PAN_ATTACKER + playsewithpan SE_M_SPIT_UP, SOUND_PAN_ATTACKER delay 4 createsprite gYawnCloudSpriteTemplate, ANIM_TARGET, 5, 1 delay 4 createsprite gYawnCloudSpriteTemplate, ANIM_TARGET, 5, 0 waitforvisualfinish createvisualtask AnimTask_DeepInhale, 2, ANIM_TARGET - playsewithpan SE_W281, SOUND_PAN_TARGET + playsewithpan SE_M_YAWN, SOUND_PAN_TARGET end Move_ENDEAVOR: loadspritegfx ANIM_TAG_SWEAT_DROP loadspritegfx ANIM_TAG_IMPACT createvisualtask AnimTask_SquishAndSweatDroplets, 2, ANIM_ATTACKER, 2 - loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 24, 2 + loopsewithpan SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER, 24, 2 createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_ATTACKER, RGB(31, 21, 0), 12, 1, 2 delay 6 createvisualtask AnimTask_ShakeTargetBasedOnMovePowerOrDmg, 5, FALSE, 1, 8, 1, 0 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 12, -12, ANIM_TARGET, 2 - playsewithpan SE_W003, SOUND_PAN_TARGET + playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET delay 24 createvisualtask AnimTask_ShakeTargetBasedOnMovePowerOrDmg, 5, FALSE, 1, 8, 1, 0 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, -12, 12, ANIM_TARGET, 2 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET end Move_ERUPTION: @@ -3800,10 +3800,10 @@ Move_ERUPTION: createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 2, 0, 4, RGB_RED waitforvisualfinish createvisualtask AnimTask_EruptionLaunchRocks, 2 - waitplaysewithpan SE_W153, SOUND_PAN_ATTACKER, 60 + waitplaysewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER, 60 waitforvisualfinish createvisualtask AnimTask_EruptionLaunchRocks, 2 - waitplaysewithpan SE_W153, SOUND_PAN_ATTACKER, 60 + waitplaysewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER, 60 waitforvisualfinish delay 30 createsprite gEruptionFallingRockSpriteTemplate, ANIM_ATTACKER, 40, 200, -32, 0, 100, 0 @@ -3815,7 +3815,7 @@ Move_ERUPTION: delay 22 createvisualtask AnimTask_HorizontalShake, 5, (MAX_BATTLERS_COUNT + 1), 8, 60 createvisualtask AnimTask_HorizontalShake, 5, MAX_BATTLERS_COUNT, 8, 60 - loopsewithpan SE_W088, SOUND_PAN_TARGET, 16, 12 + loopsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET, 16, 12 delay 80 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 40, 31, 4, 4, 0, RGB_RED end @@ -3825,7 +3825,7 @@ Move_SKILL_SWAP: call SetPsychicBackground createvisualtask AnimTask_SkillSwap, 3, ANIM_TARGET createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_TARGET, RGB_WHITE, 12, 3, 1 - loopsewithpan SE_W179, SOUND_PAN_ATTACKER, 24, 3 + loopsewithpan SE_M_REVERSAL, SOUND_PAN_ATTACKER, 24, 3 delay 16 createvisualtask AnimTask_SkillSwap, 3, ANIM_ATTACKER createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_ATTACKER, RGB_WHITE, 12, 3, 1 @@ -3840,12 +3840,12 @@ Move_IMPRISON: monbg ANIM_DEF_PARTNER createvisualtask AnimTask_ImprisonOrbs, 5 delay 8 - loopsewithpan SE_W030, SOUND_PAN_ATTACKER, 8, 5 + loopsewithpan SE_M_HORN_ATTACK, SOUND_PAN_ATTACKER, 8, 5 waitforvisualfinish delay 4 createsprite gRedXSpriteTemplate, ANIM_ATTACKER, 5, ANIM_ATTACKER, 40 createvisualtask AnimTask_HorizontalShake, 5, MAX_BATTLERS_COUNT, 1, 10 - playsewithpan SE_W063, SOUND_PAN_ATTACKER + playsewithpan SE_M_HYPER_BEAM, SOUND_PAN_ATTACKER clearmonbg ANIM_DEF_PARTNER call UnsetPsychicBackground end @@ -3855,13 +3855,13 @@ Move_GRUDGE: monbg ANIM_ATTACKER monbgprio_29 fadetobg BG_GHOST - playsewithpan SE_W060, SOUND_PAN_ATTACKER + playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER waitbgfadein createvisualtask AnimTask_GrudgeFlames, 3 - loopsewithpan SE_W052, SOUND_PAN_ATTACKER, 16, 4 + loopsewithpan SE_M_EMBER, SOUND_PAN_ATTACKER, 16, 4 delay 10 delay 80 - playsewithpan SE_W171, SOUND_PAN_TARGET + playsewithpan SE_M_NIGHTMARE, SOUND_PAN_TARGET waitforvisualfinish restorebg waitbgfadein @@ -3875,7 +3875,7 @@ Move_CAMOUFLAGE: createvisualtask AnimTask_SetCamouflageBlend, 5, 2, 3, 0, 14 delay 16 createvisualtask AnimTask_AttackerFadeToInvisible, 2, 4 - playsewithpan SE_W185, SOUND_PAN_ATTACKER + playsewithpan SE_M_FAINT_ATTACK, SOUND_PAN_ATTACKER waitforvisualfinish delay 8 createvisualtask AnimTask_SetCamouflageBlend, 5, 2, 0, 0, 0 @@ -3894,7 +3894,7 @@ Move_TAIL_GLOW: waitforvisualfinish createsprite gTailGlowOrbSpriteTemplate, ANIM_ATTACKER, 66, ANIM_ATTACKER delay 18 - loopsewithpan SE_W234, SOUND_PAN_ATTACKER, 16, 6 + loopsewithpan SE_M_MORNING_SUN, SOUND_PAN_ATTACKER, 16, 6 waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 4, 4, 0, RGB_BLACK clearmonbg ANIM_ATTACKER @@ -3911,7 +3911,7 @@ Move_LUSTER_PURGE: waitbgfadein monbg ANIM_ATTACKER setalpha 12, 8 - playsewithpan SE_W076, SOUND_PAN_ATTACKER + playsewithpan SE_M_SOLAR_BEAM, SOUND_PAN_ATTACKER createsprite gLusterPurgeCircleSpriteTemplate, ANIM_ATTACKER, 41, 0, 0, 0, 0 delay 20 createvisualtask AnimTask_BlendBattleAnimPalExclude, 5, 5, 2, 0, 16, RGB_WHITEALPHA @@ -3920,22 +3920,22 @@ Move_LUSTER_PURGE: createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_IMPACT, 0, 12, 12, RGB(0, 0, 23) waitforvisualfinish createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, 1, 2 - createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_W063, SOUND_PAN_TARGET + createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_HYPER_BEAM, SOUND_PAN_TARGET delay 3 createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, 1, 2 - createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_W063, SOUND_PAN_TARGET + createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_HYPER_BEAM, SOUND_PAN_TARGET delay 3 createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, 1, 2 - createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_W063, SOUND_PAN_TARGET + createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_HYPER_BEAM, SOUND_PAN_TARGET delay 3 createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, 1, 2 - createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_W063, SOUND_PAN_TARGET + createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_HYPER_BEAM, SOUND_PAN_TARGET delay 3 createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, 1, 2 - createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_W063, SOUND_PAN_TARGET + createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_HYPER_BEAM, SOUND_PAN_TARGET delay 3 createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, 1, 2 - createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_W063, SOUND_PAN_TARGET + createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_HYPER_BEAM, SOUND_PAN_TARGET waitforvisualfinish createvisualtask AnimTask_BlendBattleAnimPalExclude, 5, 5, 2, 16, 0, RGB_WHITEALPHA createvisualtask AnimTask_HorizontalShake, 5, ANIM_TARGET, 5, 14 @@ -3949,14 +3949,14 @@ Move_MIST_BALL: loadspritegfx ANIM_TAG_SMALL_BUBBLES loadspritegfx ANIM_TAG_WHITE_FEATHER delay 0 - playsewithpan SE_W081, SOUND_PAN_ATTACKER + playsewithpan SE_M_STRING_SHOT, SOUND_PAN_ATTACKER createsprite gMistBallSpriteTemplate, ANIM_TARGET, 0, 0, 0, 0, 0, 30, 0 waitforvisualfinish - playsewithpan SE_W028, SOUND_PAN_TARGET + playsewithpan SE_M_SAND_ATTACK, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 10, 0 createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 1, 1, 1, RGB(23, 16, 31), 16, 0x7FFF, 16 delay 0 - playsewithpan SE_W114, 0 + playsewithpan SE_M_HAZE, 0 createvisualtask AnimTask_LoadMistTiles, 5 createvisualtask AnimTask_BlendBattleAnimPal, 10, 4, 3, 0, 16, RGB_WHITE delay 8 @@ -3969,7 +3969,7 @@ Move_FEATHER_DANCE: loadspritegfx ANIM_TAG_WHITE_FEATHER monbg ANIM_DEF_PARTNER monbgprio_29 - playsewithpan SE_W080, SOUND_PAN_TARGET + playsewithpan SE_M_PETAL_DANCE, SOUND_PAN_TARGET delay 0 createsprite gFallingFeatherSpriteTemplate, ANIM_TARGET, 0, 0, -16, 64, 2, 104, 11304, 32, 1 delay 6 @@ -3992,19 +3992,19 @@ Move_TEETER_DANCE: loadspritegfx ANIM_TAG_DUCK createvisualtask AnimTask_TeeterDanceMovement, 5 createsprite gFastFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 0, 16, -2 - playsewithpan SE_W298, SOUND_PAN_ATTACKER + playsewithpan SE_M_TEETER_DANCE, SOUND_PAN_ATTACKER delay 24 createsprite gFastFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, -2 - playsewithpan SE_W298, SOUND_PAN_ATTACKER + playsewithpan SE_M_TEETER_DANCE, SOUND_PAN_ATTACKER delay 24 createsprite gFastFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 0, -16, -2 - playsewithpan SE_W298, SOUND_PAN_ATTACKER + playsewithpan SE_M_TEETER_DANCE, SOUND_PAN_ATTACKER delay 24 createsprite gFastFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 1, -8, -2 - playsewithpan SE_W298, SOUND_PAN_ATTACKER + playsewithpan SE_M_TEETER_DANCE, SOUND_PAN_ATTACKER delay 24 createsprite gFastFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 2, 8, -2 - playsewithpan SE_W298, SOUND_PAN_ATTACKER + playsewithpan SE_M_TEETER_DANCE, SOUND_PAN_ATTACKER end Move_MUD_SPORT: @@ -4013,52 +4013,52 @@ Move_MUD_SPORT: delay 24 createsprite gMudsportMudSpriteTemplate, ANIM_TARGET, 2, 0, -4, -16 createsprite gMudsportMudSpriteTemplate, ANIM_TARGET, 2, 0, 4, -12 - playsewithpan SE_W091, SOUND_PAN_ATTACKER + playsewithpan SE_M_DIG, SOUND_PAN_ATTACKER delay 32 createsprite gMudsportMudSpriteTemplate, ANIM_TARGET, 2, 0, -3, -12 createsprite gMudsportMudSpriteTemplate, ANIM_TARGET, 2, 0, 5, -14 - playsewithpan SE_W091, SOUND_PAN_ATTACKER + playsewithpan SE_M_DIG, SOUND_PAN_ATTACKER delay 32 createsprite gMudsportMudSpriteTemplate, ANIM_TARGET, 2, 0, -5, -18 createsprite gMudsportMudSpriteTemplate, ANIM_TARGET, 2, 0, 3, -14 - playsewithpan SE_W091, SOUND_PAN_ATTACKER + playsewithpan SE_M_DIG, SOUND_PAN_ATTACKER 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: loadspritegfx ANIM_TAG_GREEN_SPIKE loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HANDS_AND_FEET - loopsewithpan SE_W030, SOUND_PAN_TARGET, 2, 16 + loopsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET, 2, 16 createsprite gNeedleArmSpikeSpriteTemplate, ANIM_TARGET, 2, 1, 0, 0, -32, 16 delay 2 createsprite gNeedleArmSpikeSpriteTemplate, ANIM_TARGET, 2, 1, 0, 22, -22, 16 @@ -4086,7 +4086,7 @@ Move_NEEDLE_ARM: createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 18, 1 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, ANIM_TARGET, 1 createsprite gFistFootSpriteTemplate, ANIM_TARGET, 4, 0, 0, 8, 1, 0 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET 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 @@ -4100,7 +4100,7 @@ Move_NEEDLE_ARM: Move_SLACK_OFF: loadspritegfx ANIM_TAG_BLUE_STAR createvisualtask AnimTask_SlackOffSquish, 2, ANIM_ATTACKER - playsewithpan SE_W281, SOUND_PAN_ATTACKER + playsewithpan SE_M_YAWN, SOUND_PAN_ATTACKER waitforvisualfinish call HealingEffect waitforvisualfinish @@ -4117,18 +4117,18 @@ Move_CRUSH_CLAW: createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 18, 1 createsprite gClawSlashSpriteTemplate, ANIM_TARGET, 2, -10, -10, 0 createsprite gClawSlashSpriteTemplate, ANIM_TARGET, 2, -10, 10, 0 - playsewithpan SE_W013, SOUND_PAN_TARGET + playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET delay 12 createsprite gClawSlashSpriteTemplate, ANIM_TARGET, 2, 10, -10, 1 createsprite gClawSlashSpriteTemplate, ANIM_TARGET, 2, 10, 10, 1 - playsewithpan SE_W013, SOUND_PAN_TARGET + playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET waitforvisualfinish blendoff clearmonbg ANIM_TARGET end Move_AROMATHERAPY: - playsewithpan SE_W080, 0 + playsewithpan SE_M_PETAL_DANCE, 0 loadspritegfx ANIM_TAG_FLOWER loadspritegfx ANIM_TAG_THIN_RING loadspritegfx ANIM_TAG_SPARKLE_2 @@ -4152,15 +4152,15 @@ Move_AROMATHERAPY: delay 1 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 1, 0, 7, 0, RGB(13, 31, 12) delay 1 - playsewithpan SE_W287, SOUND_PAN_ATTACKER + playsewithpan SE_M_STAT_INCREASE, SOUND_PAN_ATTACKER createvisualtask AnimTask_StatusClearedEffect, 2, 1 waitforvisualfinish - playsewithpan SE_W234, SOUND_PAN_ATTACKER + playsewithpan SE_M_MORNING_SUN, SOUND_PAN_ATTACKER 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, SOUND_PAN_ATTACKER + playsewithpan SE_SHINY, SOUND_PAN_ATTACKER createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 43, 3, 10, 0, RGB(13, 31, 12) createsprite gBlendThinRingExpandingSpriteTemplate, ANIM_ATTACKER, 16, 0, 0, 0, 1 waitforvisualfinish @@ -4173,7 +4173,7 @@ Move_FAKE_TEARS: createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_SMALL_BUBBLES, 0, 4, 4, RGB(12, 11, 31) waitforvisualfinish createvisualtask AnimTask_RockMonBackAndForth, 5, ANIM_ATTACKER, 2, 1 - loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 12, 4 + loopsewithpan SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER, 12, 4 delay 8 createsprite gTearDropSpriteTemplate, ANIM_ATTACKER, 2, 0, 0 createsprite gTearDropSpriteTemplate, ANIM_ATTACKER, 2, 0, 1 @@ -4199,7 +4199,7 @@ Move_AIR_CUTTER: delay 0 createvisualtask AnimTask_AirCutterProjectile, 2, 32, -24, 6 * 256, 2, 128 @ 6 * 256 == Q_8_8(6) waitforvisualfinish - playsewithpan SE_W015, SOUND_PAN_TARGET + playsewithpan SE_M_CUT, SOUND_PAN_TARGET createsprite gAirCutterSliceSpriteTemplate, ANIM_ATTACKER, 2, 40, -32, 0, 2 delay 5 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 @@ -4215,15 +4215,15 @@ Move_ODOR_SLEUTH: createvisualtask AnimTask_OdorSleuthMovement, 5 delay 24 createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 3, 4 - playsewithpan SE_W207, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER delay 6 createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 3, 4 - playsewithpan SE_W207, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER waitforvisualfinish clearmonbg ANIM_TARGET delay 1 createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 1, RGB_WHITEALPHA, 16, -1, 0 - playsewithpan SE_W043, SOUND_PAN_ATTACKER + playsewithpan SE_M_LEER, SOUND_PAN_ATTACKER end Move_GRASS_WHISTLE: @@ -4232,7 +4232,7 @@ Move_GRASS_WHISTLE: waitforvisualfinish createvisualtask AnimTask_MusicNotesRainbowBlend, 2 waitforvisualfinish - panse_1B SE_W320, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 + panse_1B SE_M_GRASSWHISTLE, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 createsprite gWavyMusicNotesSpriteTemplate, ANIM_TARGET, 2, 7, 1, 0 delay 5 createsprite gWavyMusicNotesSpriteTemplate, ANIM_TARGET, 2, 6, 1, 0 @@ -4269,7 +4269,7 @@ Move_TICKLE: waitforvisualfinish createsprite gEyeSparkleSpriteTemplate, ANIM_ATTACKER, 0, -16, -8 createsprite gEyeSparkleSpriteTemplate, ANIM_ATTACKER, 0, 16, -8 - playsewithpan SE_W197, SOUND_PAN_ATTACKER + playsewithpan SE_M_DETECT, SOUND_PAN_ATTACKER waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 2, 0, 16, 0, RGB_BLACK waitforvisualfinish @@ -4277,7 +4277,7 @@ Move_TICKLE: createvisualtask AnimTask_SwayMon, 3, 0, 6, 1280, 3, ANIM_ATTACKER delay 12 createvisualtask AnimTask_RockMonBackAndForth, 3, ANIM_TARGET, 6, 2 - loopsewithpan SE_W039, SOUND_PAN_TARGET, 8, 8 + loopsewithpan SE_M_TAIL_WHIP, SOUND_PAN_TARGET, 8, 8 waitforvisualfinish end @@ -4287,13 +4287,13 @@ Move_WATER_SPOUT: monbg ANIM_DEF_PARTNER setalpha 12, 8 createvisualtask AnimTask_WaterSpoutLaunch, 5 - playsewithpan SE_W029, SOUND_PAN_ATTACKER + playsewithpan SE_M_HEADBUTT, SOUND_PAN_ATTACKER delay 44 - playsewithpan SE_W291, SOUND_PAN_ATTACKER + playsewithpan SE_M_DIVE, SOUND_PAN_ATTACKER waitforvisualfinish delay 16 createvisualtask AnimTask_WaterSpoutRain, 5 - playsewithpan SE_W057, SOUND_PAN_TARGET + playsewithpan SE_M_SURF, SOUND_PAN_TARGET clearmonbg ANIM_DEF_PARTNER blendoff end @@ -4306,11 +4306,11 @@ Move_SHADOW_PUNCH: monbg ANIM_ATK_PARTNER setalpha 9, 8 createvisualtask AnimTask_AttackerPunchWithTrace, 2, RGB_BLACK, 13 - playsewithpan SE_W026, SOUND_PAN_ATTACKER + playsewithpan SE_M_JUMP_KICK, SOUND_PAN_ATTACKER delay 6 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, ANIM_TARGET, 1 createsprite gFistFootSpriteTemplate, ANIM_TARGET, 4, 0, 0, 8, 1, 0 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 waitforvisualfinish clearmonbg ANIM_ATK_PARTNER @@ -4325,15 +4325,15 @@ Move_EXTRASENSORY: setalpha 12, 8 createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_ATTACKER, RGB(27, 27, 0), 12, 1, 1 createvisualtask AnimTask_ExtrasensoryDistortion, 5, 0 - playsewithpan SE_W020, SOUND_PAN_TARGET + playsewithpan SE_M_BIND, SOUND_PAN_TARGET waitforvisualfinish createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_ATTACKER, RGB(27, 27, 0), 12, 1, 1 createvisualtask AnimTask_ExtrasensoryDistortion, 5, 1 - playsewithpan SE_W020, SOUND_PAN_TARGET + playsewithpan SE_M_BIND, SOUND_PAN_TARGET waitforvisualfinish createvisualtask AnimTask_TransparentCloneGrowAndShrink, 5, ANIM_ATTACKER createvisualtask AnimTask_ExtrasensoryDistortion, 5, 2 - playsewithpan SE_W043, SOUND_PAN_ATTACKER + playsewithpan SE_M_LEER, SOUND_PAN_ATTACKER waitforvisualfinish blendoff clearmonbg ANIM_DEF_PARTNER @@ -4347,18 +4347,18 @@ Move_AERIAL_ACE: createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 24, 6, 1, 5 createvisualtask AnimTask_TraceMonBlended, 2, 0, 4, 7, 3 createsprite gCuttingSliceSpriteTemplate, ANIM_ATTACKER, 2, 40, -32, 0 - playsewithpan SE_W013B, SOUND_PAN_ATTACKER + playsewithpan SE_M_RAZOR_WIND2, SOUND_PAN_ATTACKER delay 5 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 10, 1 createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 1, RGB_BLACK, 10, 0, 0 - playsewithpan SE_W013, SOUND_PAN_TARGET + playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_TARGET blendoff end Move_IRON_DEFENSE: - loopsewithpan SE_REAPOKE, SOUND_PAN_ATTACKER, 28, 2 + loopsewithpan SE_SHINY, SOUND_PAN_ATTACKER, 28, 2 createvisualtask AnimTask_MetallicShine, 5, 0, 0, 0 createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 8, 2, RGB_WHITEALPHA, 14, -1, 0 waitforvisualfinish @@ -4367,7 +4367,7 @@ Move_IRON_DEFENSE: Move_BLOCK: loadspritegfx ANIM_TAG_X_SIGN createsprite gBlockXSpriteTemplate, ANIM_TARGET, 66 - playsewithpan SE_W207, SOUND_PAN_TARGET + playsewithpan SE_M_SWAGGER, SOUND_PAN_TARGET end Move_HOWL: @@ -4383,10 +4383,10 @@ Move_HOWL: Move_BULK_UP: loadspritegfx ANIM_TAG_BREATH createvisualtask AnimTask_GrowAndShrink, 2 - playsewithpan SE_W207, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER waitforvisualfinish createsprite gBreathPuffSpriteTemplate, ANIM_ATTACKER, 2 - loopsewithpan SE_W207, SOUND_PAN_ATTACKER, 4, 2 + loopsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER, 4, 2 waitforvisualfinish end @@ -4395,16 +4395,16 @@ Move_COVET: loadspritegfx ANIM_TAG_ITEM_BAG createvisualtask AnimTask_RockMonBackAndForth, 5, ANIM_ATTACKER, 2, 0 createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, 0, 20 - playsewithpan SE_W204, SOUND_PAN_ATTACKER + playsewithpan SE_M_CHARM, SOUND_PAN_ATTACKER delay 15 createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, -20, 20 - playsewithpan SE_W204, SOUND_PAN_ATTACKER + playsewithpan SE_M_CHARM, SOUND_PAN_ATTACKER delay 15 createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, 20, 20 - playsewithpan SE_W204, SOUND_PAN_ATTACKER + playsewithpan SE_M_CHARM, SOUND_PAN_ATTACKER waitforvisualfinish createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 - loopsewithpan SE_W146, SOUND_PAN_TARGET, 4, 3 + loopsewithpan SE_M_DIZZY_PUNCH, SOUND_PAN_TARGET, 4, 3 end Move_VOLT_TACKLE: @@ -4416,28 +4416,28 @@ Move_VOLT_TACKLE: createvisualtask AnimTask_BlendBattleAnimPal, 10, 1, 0, 0, 8, RGB_BLACK waitforvisualfinish createsprite gVoltTackleOrbSlideSpriteTemplate, ANIM_ATTACKER, 1 - playsewithpan SE_W268, SOUND_PAN_ATTACKER + playsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER waitforvisualfinish clearmonbg ANIM_ATTACKER blendoff delay 8 createvisualtask AnimTask_VoltTackleBolt, 5, 0 - playsewithpan SE_W085, SOUND_PAN_ATTACKER + playsewithpan SE_M_THUNDERBOLT, SOUND_PAN_ATTACKER waitforvisualfinish createvisualtask AnimTask_VoltTackleBolt, 5, 1 - playsewithpan SE_W085, SOUND_PAN_TARGET + playsewithpan SE_M_THUNDERBOLT, SOUND_PAN_TARGET waitforvisualfinish createvisualtask AnimTask_VoltTackleBolt, 5, 2 - playsewithpan SE_W085, SOUND_PAN_ATTACKER + playsewithpan SE_M_THUNDERBOLT, SOUND_PAN_ATTACKER waitforvisualfinish createvisualtask AnimTask_VoltTackleBolt, 5, 3 - playsewithpan SE_W085, SOUND_PAN_TARGET + playsewithpan SE_M_THUNDERBOLT, SOUND_PAN_TARGET waitforvisualfinish createvisualtask AnimTask_VoltTackleBolt, 5, 4 - playsewithpan SE_W085, SOUND_PAN_ATTACKER + playsewithpan SE_M_THUNDERBOLT, SOUND_PAN_ATTACKER delay 8 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 10, 0, 18, 1 - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET createsprite gElectricPuffSpriteTemplate, ANIM_ATTACKER, 2, 1, 16, 16 delay 2 createsprite gElectricPuffSpriteTemplate, ANIM_ATTACKER, 2, 1, -16, -16 @@ -4445,7 +4445,7 @@ Move_VOLT_TACKLE: createvisualtask AnimTask_VoltTackleAttackerReappear, 5 waitforvisualfinish createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 3, 0, 9, 1 - playsewithpan SE_W085B, SOUND_PAN_ATTACKER + playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_ATTACKER createsprite gElectricPuffSpriteTemplate, ANIM_ATTACKER, 2, 0, 16, 16 delay 2 createsprite gElectricPuffSpriteTemplate, ANIM_ATTACKER, 2, 0, -16, -16 @@ -4458,13 +4458,13 @@ Move_WATER_SPORT: loadspritegfx ANIM_TAG_GLOWY_BLUE_ORB createvisualtask AnimTask_WaterSport, 5 delay 8 - playsewithpan SE_W057, SOUND_PAN_ATTACKER + playsewithpan SE_M_SURF, SOUND_PAN_ATTACKER delay 44 - playsewithpan SE_W057, SOUND_PAN_ATTACKER + playsewithpan SE_M_SURF, SOUND_PAN_ATTACKER delay 44 - playsewithpan SE_W057, SOUND_PAN_ATTACKER + playsewithpan SE_M_SURF, SOUND_PAN_ATTACKER delay 44 - panse_1B SE_W057, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 + panse_1B SE_M_SURF, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 end Move_CALM_MIND: @@ -4475,13 +4475,13 @@ Move_CALM_MIND: createvisualtask AnimTask_SetAllNonAttackersInvisiblity, 5, TRUE waitforvisualfinish createsprite gThinRingShrinkingSpriteTemplate, ANIM_ATTACKER, 40, 0, 0, 0, 0 - playsewithpan SE_W048, SOUND_PAN_ATTACKER + playsewithpan SE_M_SUPERSONIC, SOUND_PAN_ATTACKER delay 14 createsprite gThinRingShrinkingSpriteTemplate, ANIM_ATTACKER, 40, 0, 0, 0, 0 - playsewithpan SE_W048, SOUND_PAN_ATTACKER + playsewithpan SE_M_SUPERSONIC, SOUND_PAN_ATTACKER delay 14 createsprite gThinRingShrinkingSpriteTemplate, ANIM_ATTACKER, 40, 0, 0, 0, 0 - playsewithpan SE_W048, SOUND_PAN_ATTACKER + playsewithpan SE_M_SUPERSONIC, SOUND_PAN_ATTACKER waitforvisualfinish createvisualtask AnimTask_SetAllNonAttackersInvisiblity, 5, FALSE waitforvisualfinish @@ -4496,20 +4496,20 @@ Move_LEAF_BLADE: createvisualtask AnimTask_LeafBlade, 5 delay 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 - playsewithpan SE_W015, SOUND_PAN_TARGET + playsewithpan SE_M_CUT, SOUND_PAN_TARGET delay 50 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 - playsewithpan SE_W015, SOUND_PAN_TARGET + playsewithpan SE_M_CUT, SOUND_PAN_TARGET delay 50 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 - playsewithpan SE_W015, SOUND_PAN_TARGET + playsewithpan SE_M_CUT, SOUND_PAN_TARGET waitforvisualfinish monbg ANIM_TARGET setalpha 12, 8 delay 12 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 8, 0, 18, 1 createsprite gCrossImpactSpriteTemplate, ANIM_TARGET, 2, 0, 0, 1, 36 - playsewithpan SE_W043, SOUND_PAN_TARGET + playsewithpan SE_M_LEER, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_TARGET blendoff @@ -4521,7 +4521,7 @@ Move_DRAGON_DANCE: monbgprio_28 ANIM_ATTACKER delay 1 createvisualtask AnimTask_DragonDanceWaver, 5 - playsewithpan SE_W100, SOUND_PAN_ATTACKER + playsewithpan SE_M_TELEPORT, SOUND_PAN_ATTACKER delay 8 createvisualtask AnimTask_BlendPalInAndOutByTag, 5, ANIM_TAG_HOLLOW_ORB, RGB(0, 0, 19), 14, 0, 3 createsprite gDragonDanceOrbSpriteTemplate, ANIM_ATTACKER, 2, 0 @@ -4531,9 +4531,9 @@ Move_DRAGON_DANCE: createsprite gDragonDanceOrbSpriteTemplate, ANIM_ATTACKER, 2, 170 createsprite gDragonDanceOrbSpriteTemplate, ANIM_ATTACKER, 2, 213 delay 30 - playsewithpan SE_W100, SOUND_PAN_ATTACKER + playsewithpan SE_M_TELEPORT, SOUND_PAN_ATTACKER delay 30 - playsewithpan SE_W100, SOUND_PAN_ATTACKER + playsewithpan SE_M_TELEPORT, SOUND_PAN_ATTACKER waitforvisualfinish clearmonbg ANIM_ATTACKER delay 1 @@ -4549,7 +4549,7 @@ Move_SHOCK_WAVE: createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 4, RGB_BLACK waitforvisualfinish createvisualtask AnimTask_ElectricChargingParticles, 2, ANIM_ATTACKER, 20, 0, 2 - playsewithpan SE_W268, SOUND_PAN_ATTACKER + playsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER delay 12 createsprite gGrowingShockWaveOrbSpriteTemplate, ANIM_ATTACKER, 2 delay 30 @@ -4557,7 +4557,7 @@ Move_SHOCK_WAVE: delay 12 waitforvisualfinish createvisualtask AnimTask_ShockWaveLightning, 5 - playsewithpan SE_W161B, SOUND_PAN_TARGET + playsewithpan SE_M_TRI_ATTACK2, SOUND_PAN_TARGET waitforvisualfinish createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 6, 18, 1 createvisualtask AnimTask_BlendBattleAnimPal, 5, 1, 3, 16, 0, RGB_WHITE @@ -4570,7 +4570,7 @@ Move_SHOCK_WAVE: end Move_HARDEN: - loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 28, 2 + loopsewithpan SE_M_HARDEN, SOUND_PAN_ATTACKER, 28, 2 createvisualtask AnimTask_MetallicShine, 5, 0, 0, 0 waitforvisualfinish end @@ -4582,27 +4582,27 @@ Move_BELLY_DRUM: waitforvisualfinish call BellyDrumRight createsprite gSlowFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 0, 0 - playsewithpan SE_W187, SOUND_PAN_ATTACKER + playsewithpan SE_M_BELLY_DRUM, SOUND_PAN_ATTACKER delay 15 call BellyDrumLeft createsprite gSlowFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 1, 0 - playsewithpan SE_W187, SOUND_PAN_ATTACKER + playsewithpan SE_M_BELLY_DRUM, SOUND_PAN_ATTACKER delay 15 call BellyDrumRight createsprite gSlowFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 0, 3, 3, 128 - playsewithpan SE_W187, SOUND_PAN_ATTACKER + playsewithpan SE_M_BELLY_DRUM, SOUND_PAN_ATTACKER delay 7 call BellyDrumLeft createsprite gSlowFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 128 - playsewithpan SE_W187, SOUND_PAN_ATTACKER + playsewithpan SE_M_BELLY_DRUM, SOUND_PAN_ATTACKER delay 7 call BellyDrumRight createsprite gSlowFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 0, 1, 1, 0 - playsewithpan SE_W187, SOUND_PAN_ATTACKER + playsewithpan SE_M_BELLY_DRUM, SOUND_PAN_ATTACKER delay 7 call BellyDrumLeft createsprite gSlowFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 3, 0 - playsewithpan SE_W187, SOUND_PAN_ATTACKER + playsewithpan SE_M_BELLY_DRUM, SOUND_PAN_ATTACKER waitforvisualfinish createvisualtask AnimTask_MusicNotesClearRainbowBlend, 2 waitforvisualfinish @@ -4623,11 +4623,11 @@ Move_MIND_READER: loadspritegfx ANIM_TAG_OPENING_EYE loadspritegfx ANIM_TAG_ROUND_WHITE_HALO monbg ANIM_DEF_PARTNER - playsewithpan SE_W109, SOUND_PAN_TARGET + playsewithpan SE_M_CONFUSE_RAY, SOUND_PAN_TARGET createsprite gOpeningEyeSpriteTemplate, ANIM_ATTACKER, 5, 0, 0, 1, 0 createsprite gWhiteHaloSpriteTemplate, ANIM_ATTACKER, 5 delay 40 - playsewithpan SE_W043, SOUND_PAN_TARGET + playsewithpan SE_M_LEER, SOUND_PAN_TARGET createvisualtask AnimTask_BlendColorCycle, 2, 1, 1, 2, 0, 10, RGB_BLACK call MindReaderEyeSpikeEffect waitforvisualfinish @@ -4667,7 +4667,7 @@ Move_ICE_PUNCH: createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 0, 7, RGB_BLACK createvisualtask AnimTask_BlendBattleAnimPal, 10, 4, 2, 0, 9, RGB(12, 26, 31) delay 20 - playsewithpan SE_W081, SOUND_PAN_TARGET + playsewithpan SE_M_STRING_SHOT, SOUND_PAN_TARGET createsprite gIceCrystalSpiralInwardSmall, ANIM_ATTACKER, 2, 0 createsprite gIceCrystalSpiralInwardSmall, ANIM_ATTACKER, 2, 64 createsprite gIceCrystalSpiralInwardSmall, ANIM_ATTACKER, 2, 128 @@ -4680,7 +4680,7 @@ Move_ICE_PUNCH: delay 17 createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 4, 0, -10, 8, 1, 0 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, -10, ANIM_TARGET, 1 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET delay 2 createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 5, 3, 1 waitforvisualfinish @@ -4696,7 +4696,7 @@ Move_ICE_PUNCH: end Move_REST: - playsewithpan SE_W173, SOUND_PAN_ATTACKER + playsewithpan SE_M_SNORE, SOUND_PAN_ATTACKER loadspritegfx ANIM_TAG_LETTER_Z createsprite gSleepLetterZSpriteTemplate, ANIM_ATTACKER, 2, 4, -10, 16, 0, 0 delay 20 @@ -4713,7 +4713,7 @@ Move_CONFUSION: createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 10, 1 createvisualtask AnimTask_BlendColorCycle, 2, 2, 0, 2, 0, 8, RGB_WHITE waitforvisualfinish - playsewithpan SE_W048, SOUND_PAN_TARGET + playsewithpan SE_M_SUPERSONIC, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 15, 1 createvisualtask AnimTask_ScaleMonAndRestore, 5, -4, -4, 15, ANIM_TARGET, 1 waitforvisualfinish @@ -4730,7 +4730,7 @@ Move_PSYCHIC: createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 10, 1 createvisualtask AnimTask_BlendColorCycle, 2, 2, 0, 2, 0, 8, RGB(31, 23, 0) waitforvisualfinish - loopsewithpan SE_W048, SOUND_PAN_TARGET, 10, 3 + loopsewithpan SE_M_SUPERSONIC, SOUND_PAN_TARGET, 10, 3 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 15, 1 createvisualtask AnimTask_ScaleMonAndRestore, 5, -6, -6, 15, ANIM_TARGET, 1 waitforvisualfinish @@ -4749,10 +4749,10 @@ FutureSightContinue: end FutureSight: monbg ANIM_ATK_PARTNER - playsewithpan SE_W060, SOUND_PAN_ATTACKER + playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER call SetPsychicBackground setalpha 8, 8 - playsewithpan SE_W048, SOUND_PAN_ATTACKER + playsewithpan SE_M_SUPERSONIC, SOUND_PAN_ATTACKER createvisualtask AnimTask_BlendColorCycle, 2, 2, 0, 2, 0, 8, RGB_WHITE createvisualtask AnimTask_ScaleMonAndRestore, 5, -4, -4, 15, ANIM_ATTACKER, 1 waitforvisualfinish @@ -4769,7 +4769,7 @@ Move_THUNDER: createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 16, RGB_BLACK delay 16 createvisualtask AnimTask_InvertScreenColor, 2, 257, 257, 257 - playsewithpan SE_W086, SOUND_PAN_TARGET + playsewithpan SE_M_THUNDER_WAVE, SOUND_PAN_TARGET delay 1 createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, 16, -36 delay 1 @@ -4778,12 +4778,12 @@ Move_THUNDER: createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, 16, 12 delay 20 createsprite gLightningSpriteTemplate, ANIM_TARGET, 6, -16, -32 - playsewithpan SE_W086, SOUND_PAN_TARGET + playsewithpan SE_M_THUNDER_WAVE, SOUND_PAN_TARGET delay 1 createsprite gLightningSpriteTemplate, ANIM_TARGET, 6, -16, -16 delay 1 createsprite gLightningSpriteTemplate, ANIM_TARGET, 6, -16, 16 - playsewithpan SE_W086, SOUND_PAN_TARGET + playsewithpan SE_M_THUNDER_WAVE, SOUND_PAN_TARGET delay 5 createvisualtask AnimTask_InvertScreenColor, 2, 257, 257, 257 delay 1 @@ -4798,7 +4798,7 @@ Move_THUNDER: createvisualtask AnimTask_InvertScreenColor, 2, 257, 257, 257 delay 1 createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, 0, -32 - playsewithpan SE_W161B, SOUND_PAN_TARGET + playsewithpan SE_M_TRI_ATTACK2, SOUND_PAN_TARGET delay 1 createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, 0, -16 delay 1 @@ -4826,7 +4826,7 @@ Move_THUNDER_PUNCH: setalpha 12, 8 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 16, RGB_BLACK waitforvisualfinish - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET createsprite gFistFootSpriteTemplate, ANIM_TARGET, 4, 0, 0, 8, 1, 0 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, ANIM_TARGET, 1 delay 1 @@ -4838,7 +4838,7 @@ Move_THUNDER_PUNCH: delay 1 createsprite gLightningSpriteTemplate, ANIM_ATTACKER, 2, 0, 16 delay 1 - playsewithpan SE_W161B, SOUND_PAN_TARGET + playsewithpan SE_M_TRI_ATTACK2, SOUND_PAN_TARGET createvisualtask AnimTask_InvertScreenColor, 2, 257, 257, 257 delay 2 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 15, 1 @@ -4854,7 +4854,7 @@ Move_THUNDER_PUNCH: Move_SACRED_FIRE: loadspritegfx ANIM_TAG_FIRE loadspritegfx ANIM_TAG_FIRE_PLUME - loopsewithpan SE_W221, SOUND_PAN_ATTACKER, 7, 5 + loopsewithpan SE_M_SACRED_FIRE, SOUND_PAN_ATTACKER, 7, 5 createsprite gFirePlumeSpriteTemplate, ANIM_ATTACKER, 2, -32, 0, 50, 5, -2, 0 delay 1 createsprite gFirePlumeSpriteTemplate, ANIM_ATTACKER, 66, -20, -10, 50, 5, -1, -1 @@ -4875,13 +4875,13 @@ Move_SACRED_FIRE: createvisualtask AnimTask_InvertScreenColor, 2, 257, 257, 257 delay 1 waitforvisualfinish - playsewithpan SE_W221B, SOUND_PAN_TARGET + playsewithpan SE_M_SACRED_FIRE2, SOUND_PAN_TARGET createsprite gLargeFlameSpriteTemplate, ANIM_TARGET, 2, -16, 0, 70, 16, 0, 1 delay 10 - playsewithpan SE_W221B, SOUND_PAN_TARGET + playsewithpan SE_M_SACRED_FIRE2, SOUND_PAN_TARGET createsprite gLargeFlameSpriteTemplate, ANIM_TARGET, 2, 0, 0, 70, 16, 0, 1 delay 10 - playsewithpan SE_W221B, SOUND_PAN_TARGET + playsewithpan SE_M_SACRED_FIRE2, SOUND_PAN_TARGET createsprite gLargeFlameSpriteTemplate, ANIM_TARGET, 2, 16, 0, 80, 16, 0, 1 delay 1 createvisualtask AnimTask_InvertScreenColor, 2, 257, 257, 257 @@ -4889,7 +4889,7 @@ Move_SACRED_FIRE: waitforvisualfinish createvisualtask AnimTask_InvertScreenColor, 2, 257, 257, 257 delay 1 - playsewithpan SE_W172B, SOUND_PAN_TARGET + playsewithpan SE_M_FLAME_WHEEL2, SOUND_PAN_TARGET createsprite gLargeFlameScatterSpriteTemplate, ANIM_TARGET, 2, 0, 0, 30, 30, -1, 0 delay 1 createsprite gLargeFlameScatterSpriteTemplate, ANIM_TARGET, 2, 0, 0, 30, 30, 0, 1 @@ -4912,7 +4912,7 @@ Move_SCRATCH: loadspritegfx ANIM_TAG_SCRATCH monbg ANIM_TARGET setalpha 12, 8 - playsewithpan SE_W010, SOUND_PAN_TARGET + playsewithpan SE_M_SCRATCH, SOUND_PAN_TARGET createsprite gScratchSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 0 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 waitforvisualfinish @@ -4925,7 +4925,7 @@ Move_DRAGON_BREATH: loadspritegfx ANIM_TAG_SMALL_EMBER monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET - loopsewithpan SE_W172, SOUND_PAN_ATTACKER, 7, 7 + loopsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER, 7, 7 createsprite gDragonBreathFireSpriteTemplate, ANIM_TARGET, 2, 0, 0, 0, 0, 20 delay 2 createsprite gDragonBreathFireSpriteTemplate, ANIM_TARGET, 2, 0, 0, 0, 0, 20 @@ -5007,7 +5007,7 @@ Move_SNORE: blendoff end SnoreEffect: - playsewithpan SE_W173, SOUND_PAN_ATTACKER + playsewithpan SE_M_SNORE, SOUND_PAN_ATTACKER createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 7, ANIM_ATTACKER, 1 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 7, 1 createsprite gShakeMonOrTerrainSpriteTemplate, ANIM_ATTACKER, 2, 6, 1, 14, 0, 0 @@ -5020,7 +5020,7 @@ Move_LIGHT_SCREEN: loadspritegfx ANIM_TAG_SPARKLE_3 loadspritegfx ANIM_TAG_GREEN_LIGHT_WALL setalpha 0, 16 - waitplaysewithpan SE_W115, SOUND_PAN_ATTACKER, 15 + waitplaysewithpan SE_M_REFLECT, SOUND_PAN_ATTACKER, 15 createsprite gLightScreenWallSpriteTemplate, ANIM_ATTACKER, 1, 40, 0, ANIM_TAG_GREEN_LIGHT_WALL delay 10 call SpecialScreenSparkle @@ -5049,7 +5049,7 @@ Move_MIRROR_COAT: setalpha 0, 16 createsprite gMirrorCoatWallSpriteTemplate, ANIM_ATTACKER, 1, 40, 0, ANIM_TAG_RED_LIGHT_WALL delay 10 - playsewithpan SE_W115, SOUND_PAN_ATTACKER + playsewithpan SE_M_REFLECT, SOUND_PAN_ATTACKER call SpecialScreenSparkle waitforvisualfinish delay 1 @@ -5060,7 +5060,7 @@ Move_REFLECT: loadspritegfx ANIM_TAG_SPARKLE_4 loadspritegfx ANIM_TAG_BLUE_LIGHT_WALL setalpha 0, 16 - waitplaysewithpan SE_W115, SOUND_PAN_ATTACKER, 15 + waitplaysewithpan SE_M_REFLECT, SOUND_PAN_ATTACKER, 15 createsprite gReflectWallSpriteTemplate, ANIM_ATTACKER, 1, 40, 0, ANIM_TAG_BLUE_LIGHT_WALL delay 20 createsprite gReflectSparkleSpriteTemplate, ANIM_ATTACKER, 2, 30, 0, ANIM_ATTACKER, 1 @@ -5076,7 +5076,7 @@ Move_REFLECT: Move_BARRIER: loadspritegfx ANIM_TAG_GRAY_LIGHT_WALL setalpha 0, 16 - waitplaysewithpan SE_W112, SOUND_PAN_ATTACKER, 15 + waitplaysewithpan SE_M_BARRIER, SOUND_PAN_ATTACKER, 15 createsprite gBarrierWallSpriteTemplate, ANIM_ATTACKER, 3, 40, 0, ANIM_TAG_GRAY_LIGHT_WALL waitforvisualfinish delay 1 @@ -5090,28 +5090,28 @@ Move_BUBBLE: setalpha 12, 8 delay 1 createsprite gWaterBubbleProjectileSpriteTemplate, ANIM_ATTACKER, 2, 18, 0, 15, -15, 10, 128, 100 - playsewithpan SE_W145, SOUND_PAN_ATTACKER - waitplaysewithpan SE_W145B, SOUND_PAN_TARGET, 100 + playsewithpan SE_M_BUBBLE, SOUND_PAN_ATTACKER + waitplaysewithpan SE_M_BUBBLE2, SOUND_PAN_TARGET, 100 delay 6 createsprite gWaterBubbleProjectileSpriteTemplate, ANIM_ATTACKER, 2, 18, 0, 35, 37, 40, 128, 100 - playsewithpan SE_W145, SOUND_PAN_ATTACKER - waitplaysewithpan SE_W145B, SOUND_PAN_TARGET, 100 + playsewithpan SE_M_BUBBLE, SOUND_PAN_ATTACKER + waitplaysewithpan SE_M_BUBBLE2, SOUND_PAN_TARGET, 100 delay 6 createsprite gWaterBubbleProjectileSpriteTemplate, ANIM_ATTACKER, 2, 18, 0, 10, -37, 30, 128, 100 - playsewithpan SE_W145, SOUND_PAN_ATTACKER - waitplaysewithpan SE_W145B, SOUND_PAN_TARGET, 100 + playsewithpan SE_M_BUBBLE, SOUND_PAN_ATTACKER + waitplaysewithpan SE_M_BUBBLE2, SOUND_PAN_TARGET, 100 delay 6 createsprite gWaterBubbleProjectileSpriteTemplate, ANIM_ATTACKER, 2, 18, 0, 30, 10, 15, 128, 100 - playsewithpan SE_W145, SOUND_PAN_ATTACKER - waitplaysewithpan SE_W145B, SOUND_PAN_TARGET, 100 + playsewithpan SE_M_BUBBLE, SOUND_PAN_ATTACKER + waitplaysewithpan SE_M_BUBBLE2, SOUND_PAN_TARGET, 100 delay 6 createsprite gWaterBubbleProjectileSpriteTemplate, ANIM_ATTACKER, 2, 18, 0, 20, 33, 20, 128, 100 - playsewithpan SE_W145, SOUND_PAN_ATTACKER - waitplaysewithpan SE_W145B, SOUND_PAN_TARGET, 100 + playsewithpan SE_M_BUBBLE, SOUND_PAN_ATTACKER + waitplaysewithpan SE_M_BUBBLE2, SOUND_PAN_TARGET, 100 delay 6 createsprite gWaterBubbleProjectileSpriteTemplate, ANIM_ATTACKER, 2, 18, 0, 25, -30, 10, 128, 100 - playsewithpan SE_W145, SOUND_PAN_ATTACKER - waitplaysewithpan SE_W145B, SOUND_PAN_TARGET, 100 + playsewithpan SE_M_BUBBLE, SOUND_PAN_ATTACKER + waitplaysewithpan SE_M_BUBBLE2, SOUND_PAN_TARGET, 100 waitforvisualfinish call WaterBubblesEffectLong waitforvisualfinish @@ -5124,7 +5124,7 @@ Move_SMOG: monbg ANIM_DEF_PARTNER monbgprio_29 setalpha 12, 8 - loopsewithpan SE_W054, SOUND_PAN_TARGET, 17, 10 + loopsewithpan SE_M_MIST, SOUND_PAN_TARGET, 17, 10 call SmogCloud call SmogCloud call SmogCloud @@ -5133,7 +5133,7 @@ Move_SMOG: call SmogCloud call SmogCloud delay 120 - loopsewithpan SE_W092, SOUND_PAN_TARGET, 18, 2 + loopsewithpan SE_M_TOXIC, SOUND_PAN_TARGET, 18, 2 createvisualtask AnimTask_BlendColorCycle, 2, 4, 2, 2, 0, 12, RGB(26, 0, 26) delay 10 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 15, 1 @@ -5152,7 +5152,7 @@ Move_FAINT_ATTACK: fadetobg BG_DARK waitbgfadein delay 0 - playsewithpan SE_W185, SOUND_PAN_ATTACKER + playsewithpan SE_M_FAINT_ATTACK, SOUND_PAN_ATTACKER createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 18, 6, 1, 3 createvisualtask AnimTask_AttackerFadeToInvisible, 2, 1 waitforvisualfinish @@ -5163,7 +5163,7 @@ Move_FAINT_ATTACK: setalpha 12, 8 monbg ANIM_TARGET delay 1 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_TARGET, 1 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 9, 1 waitforvisualfinish @@ -5187,7 +5187,7 @@ Move_SAND_ATTACK: monbg ANIM_ATK_PARTNER monbgprio_28 ANIM_ATTACKER setalpha 12, 8 - playsewithpan SE_W028, SOUND_PAN_ATTACKER + playsewithpan SE_M_SAND_ATTACK, SOUND_PAN_ATTACKER createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, -10, 0, 0, 3 waitforvisualfinish createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 2 @@ -5212,7 +5212,7 @@ SandAttackDirt: Move_MUD_SLAP: loadspritegfx ANIM_TAG_MUD_SAND - playsewithpan SE_W028, SOUND_PAN_ATTACKER + playsewithpan SE_M_SAND_ATTACK, SOUND_PAN_ATTACKER createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, -10, 0, 0, 3 waitforvisualfinish createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 2 @@ -5236,14 +5236,14 @@ MudSlapMud: Move_DRAGON_RAGE: loadspritegfx ANIM_TAG_SMALL_EMBER loadspritegfx ANIM_TAG_FIRE_PLUME - playsewithpan SE_W082, SOUND_PAN_ATTACKER + playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 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, SOUND_PAN_TARGET, 11, 3 + loopsewithpan SE_M_FLAME_WHEEL2, SOUND_PAN_TARGET, 11, 3 createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 3, 25, 1 createsprite gDragonRageFirePlumeSpriteTemplate, ANIM_TARGET, 66, 1, 5, 0 delay 1 @@ -5267,7 +5267,7 @@ Move_DRAGON_RAGE: Move_RAIN_DANCE: loadspritegfx ANIM_TAG_RAIN_DROPS - playsewithpan SE_W240, SOUND_PAN_ATTACKER + playsewithpan SE_M_RAIN_DANCE, SOUND_PAN_ATTACKER createvisualtask AnimTask_BlendBattleAnimPal, 10, 0x781, 2, 0, 4, RGB_BLACK waitforvisualfinish createvisualtask AnimTask_CreateRaindrops, 2, 0, 3, 120 @@ -5284,7 +5284,7 @@ Move_BITE: loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET setalpha 12, 8 - playsewithpan SE_W044, SOUND_PAN_TARGET + playsewithpan SE_M_BITE, SOUND_PAN_TARGET createsprite gSharpTeethSpriteTemplate, ANIM_ATTACKER, 2, 0, -32, 0, 0, 819, 10 createsprite gSharpTeethSpriteTemplate, ANIM_ATTACKER, 2, 0, 32, 4, 0, -819, 10 delay 10 @@ -5303,14 +5303,14 @@ Move_CRUNCH: fadetobg BG_DARK waitbgfadein setalpha 12, 8 - playsewithpan SE_W044, SOUND_PAN_TARGET + playsewithpan SE_M_BITE, SOUND_PAN_TARGET 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, ANIM_TARGET, 1 createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 7, 5, 2 waitforvisualfinish - playsewithpan SE_W044, SOUND_PAN_TARGET + playsewithpan SE_M_BITE, SOUND_PAN_TARGET createsprite gSharpTeethSpriteTemplate, ANIM_ATTACKER, 2, 32, -32, 7, -819, 819, 10 createsprite gSharpTeethSpriteTemplate, ANIM_ATTACKER, 2, -32, 32, 3, 819, -819, 10 delay 10 @@ -5329,7 +5329,7 @@ Move_CLAMP: loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET setalpha 12, 8 - playsewithpan SE_W011, SOUND_PAN_TARGET + playsewithpan SE_M_VICEGRIP, SOUND_PAN_TARGET createsprite gClampJawSpriteTemplate, ANIM_ATTACKER, 2, -32, 0, 2, 819, 0, 10 createsprite gClampJawSpriteTemplate, ANIM_ATTACKER, 2, 32, 0, 6, -819, 0, 10 delay 10 @@ -5348,7 +5348,7 @@ Move_ICE_BEAM: loadspritegfx ANIM_TAG_ICE_CRYSTALS createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 0, 7, RGB_BLACK waitforvisualfinish - createsoundtask SoundTask_LoopSEAdjustPanning, SE_W062B, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 4, 4, 0, 10 + createsoundtask SoundTask_LoopSEAdjustPanning, SE_M_BUBBLE_BEAM2, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 4, 4, 0, 10 createsprite gIceBeamOuterCrystalSpriteTemplate, ANIM_ATTACKER, 2, 20, 12, 0, 12, 20 createsprite gIceBeamOuterCrystalSpriteTemplate, ANIM_ATTACKER, 2, 20, -12, 0, -12, 20 delay 1 @@ -5386,7 +5386,7 @@ IceBeamCreateCrystals: return Move_WITHDRAW: - playsewithpan SE_W029, SOUND_PAN_ATTACKER + playsewithpan SE_M_HEADBUTT, SOUND_PAN_ATTACKER createvisualtask AnimTask_Withdraw, 5 waitforvisualfinish end @@ -5395,7 +5395,7 @@ Move_AURORA_BEAM: loadspritegfx ANIM_TAG_RAINBOW_RINGS fadetobg BG_AURORA waitbgfadein - playsewithpan SE_W062, SOUND_PAN_ATTACKER + playsewithpan SE_M_BUBBLE_BEAM, SOUND_PAN_ATTACKER setarg 7, 0 createvisualtask AnimTask_RotateAuroraRingColors, 10, 130 call AuroraBeamCreateRings @@ -5404,7 +5404,7 @@ Move_AURORA_BEAM: call AuroraBeamCreateRings call AuroraBeamCreateRings setarg 7, 0xFFFF - createsoundtask SoundTask_LoopSEAdjustPanning, SE_W062B, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 3, 6, 0, 10 + createsoundtask SoundTask_LoopSEAdjustPanning, SE_M_BUBBLE_BEAM2, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 3, 6, 0, 10 createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 2, 0, 40, 1 call AuroraBeamCreateRings call AuroraBeamCreateRings @@ -5437,7 +5437,7 @@ SolarBeamSetUp: monbg ANIM_ATK_PARTNER setalpha 12, 8 createvisualtask AnimTask_BlendColorCycle, 2, 2, 1, 4, 0, 11, RGB(31, 31, 11) - playsewithpan SE_W025, SOUND_PAN_ATTACKER + playsewithpan SE_M_MEGA_KICK, SOUND_PAN_ATTACKER call SolarBeamAbsorbEffect waitforvisualfinish clearmonbg ANIM_ATK_PARTNER @@ -5475,7 +5475,7 @@ SolarBeamAbsorbEffect: return SolarBeamUnleash: call SetSolarbeamBg - panse_1B SE_W076, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 + panse_1B SE_M_SOLAR_BEAM, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 createvisualtask AnimTask_CreateSmallSolarbeamOrbs, 5 createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 0 delay 4 @@ -5527,10 +5527,10 @@ BlizzardContinue: createvisualtask AnimTask_StartSlidingBg, 5, -2304, 0, 1, -1 waitbgfadein waitforvisualfinish - panse_1B SE_W059, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 + panse_1B SE_M_BLIZZARD, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 call BlizzardIceCrystals call BlizzardIceCrystals - playsewithpan SE_W059B, SOUND_PAN_TARGET + playsewithpan SE_M_BLIZZARD2, SOUND_PAN_TARGET waitforvisualfinish call IceCrystalEffectLong waitforvisualfinish @@ -5573,10 +5573,10 @@ Move_POWDER_SNOW: monbg ANIM_DEF_PARTNER createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 1, 0, 3, RGB_BLACK waitforvisualfinish - panse_1B SE_W016, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 + panse_1B SE_M_GUST, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 call PowderSnowSnowballs call PowderSnowSnowballs - playsewithpan SE_W016B, SOUND_PAN_TARGET + playsewithpan SE_M_GUST2, SOUND_PAN_TARGET waitforvisualfinish waitsound call IceCrystalEffectLong @@ -5610,7 +5610,7 @@ Move_HYDRO_PUMP: setalpha 12, 8 createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 40, 1 delay 6 - panse_1B SE_W056, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 + panse_1B SE_M_HYDRO_PUMP, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 createvisualtask AnimTask_StartSinAnimTimer, 5, 100 call HydroPumpBeams call HydroPumpBeams @@ -5655,7 +5655,7 @@ Move_SIGNAL_BEAM: loadspritegfx ANIM_TAG_DUCK createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 25, 1 delay 6 - panse_1B SE_W062, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +1, 0 + panse_1B SE_M_BUBBLE_BEAM, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +1, 0 createvisualtask AnimTask_StartSinAnimTimer, 5, 100 call SignalBeamOrbs call SignalBeamOrbs @@ -5699,7 +5699,7 @@ Move_ABSORB: setalpha 12, 8 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 0, 4, RGB(13, 31, 12) waitforvisualfinish - playsewithpan SE_W071, SOUND_PAN_TARGET + playsewithpan SE_M_ABSORB, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_TARGET, 2 delay 2 createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 5, 5, 1 @@ -5717,28 +5717,28 @@ Move_ABSORB: end AbsorbEffect: - playsewithpan SE_W152, SOUND_PAN_TARGET + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_TARGET createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 delay 4 - playsewithpan SE_W152, SOUND_PAN_TARGET + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_TARGET createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26 delay 4 - playsewithpan SE_W152, SOUND_PAN_TARGET + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_TARGET createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 16, 33 delay 4 - playsewithpan SE_W152, SOUND_PAN_TARGET + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_TARGET createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, -15, -16, 36 delay 4 - playsewithpan SE_W152, SOUND_PAN_TARGET + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_TARGET createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 delay 4 - playsewithpan SE_W152, SOUND_PAN_TARGET + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_TARGET createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26 delay 4 - playsewithpan SE_W152, SOUND_PAN_TARGET + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_TARGET createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -10, 20, 20, 39 delay 4 - playsewithpan SE_W152, SOUND_PAN_TARGET + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_TARGET createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 5, -18, -20, 35 delay 4 return @@ -5752,7 +5752,7 @@ Move_MEGA_DRAIN: setalpha 12, 8 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 0, 8, RGB(13, 31, 12) waitforvisualfinish - playsewithpan SE_W071, SOUND_PAN_TARGET + playsewithpan SE_M_ABSORB, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_TARGET, 1 delay 2 createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 5, 5, 1 @@ -5770,35 +5770,35 @@ Move_MEGA_DRAIN: end MegaDrainAbsorbEffect: - playsewithpan SE_W145C, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 5, -18, -20, 35 delay 4 - playsewithpan SE_W145C, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -10, 20, 20, 39 delay 4 - playsewithpan SE_W145C, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 16, 33 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26 delay 4 - playsewithpan SE_W145C, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, -15, -16, 36 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 delay 4 - playsewithpan SE_W145C, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, -15, -16, 36 delay 4 - playsewithpan SE_W145C, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 16, 33 delay 4 - playsewithpan SE_W145C, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -10, 20, 20, 39 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26 delay 4 - playsewithpan SE_W145C, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 5, -18, -20, 35 delay 4 @@ -5813,7 +5813,7 @@ Move_GIGA_DRAIN: setalpha 12, 8 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 0, 12, RGB(13, 31, 12) waitforvisualfinish - playsewithpan SE_W071, SOUND_PAN_TARGET + playsewithpan SE_M_ABSORB, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_TARGET, 0 delay 2 createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 5, 5, 1 @@ -5831,42 +5831,42 @@ Move_GIGA_DRAIN: end GigaDrainAbsorbEffect: - playsewithpan SE_W202, SOUND_PAN_TARGET + playsewithpan SE_M_GIGA_DRAIN, SOUND_PAN_TARGET 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, SOUND_PAN_TARGET + playsewithpan SE_M_GIGA_DRAIN, SOUND_PAN_TARGET 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, SOUND_PAN_TARGET + playsewithpan SE_M_GIGA_DRAIN, SOUND_PAN_TARGET 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, SOUND_PAN_TARGET + playsewithpan SE_M_GIGA_DRAIN, SOUND_PAN_TARGET 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, SOUND_PAN_TARGET + playsewithpan SE_M_GIGA_DRAIN, SOUND_PAN_TARGET 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, SOUND_PAN_TARGET + playsewithpan SE_M_GIGA_DRAIN, SOUND_PAN_TARGET 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, SOUND_PAN_TARGET + playsewithpan SE_M_GIGA_DRAIN, SOUND_PAN_TARGET 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, SOUND_PAN_TARGET + playsewithpan SE_M_GIGA_DRAIN, SOUND_PAN_TARGET 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 @@ -5886,7 +5886,7 @@ Move_LEECH_LIFE: createsprite gLeechLifeNeedleSpriteTemplate, ANIM_ATTACKER, 2, -20, 15, 12 waitforvisualfinish createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_TARGET, 2 - playsewithpan SE_W071, SOUND_PAN_TARGET + playsewithpan SE_M_ABSORB, SOUND_PAN_TARGET delay 2 createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 5, 5, 1 waitforvisualfinish @@ -5906,7 +5906,7 @@ Move_LEECH_LIFE: Move_SYNTHESIS: loadspritegfx ANIM_TAG_SPARKLE_2 createvisualtask AnimTask_BlendColorCycle, 2, 2, 2, 2, 0, 16, RGB(27, 31, 18) - playsewithpan SE_W025, SOUND_PAN_ATTACKER + playsewithpan SE_M_MEGA_KICK, SOUND_PAN_ATTACKER call GrantingStarsEffect waitforvisualfinish unloadspritegfx ANIM_TAG_SPARKLE_2 @@ -5928,22 +5928,22 @@ Move_TOXIC: end ToxicBubbles: createsprite gToxicBubbleSpriteTemplate, ANIM_TARGET, 2, -24, 16, 1, 1 - playsewithpan SE_W092, SOUND_PAN_TARGET + playsewithpan SE_M_TOXIC, SOUND_PAN_TARGET delay 15 createsprite gToxicBubbleSpriteTemplate, ANIM_TARGET, 2, 8, 16, 1, 1 - playsewithpan SE_W092, SOUND_PAN_TARGET + playsewithpan SE_M_TOXIC, SOUND_PAN_TARGET delay 15 createsprite gToxicBubbleSpriteTemplate, ANIM_TARGET, 2, -8, 16, 1, 1 - playsewithpan SE_W092, SOUND_PAN_TARGET + playsewithpan SE_M_TOXIC, SOUND_PAN_TARGET delay 15 createsprite gToxicBubbleSpriteTemplate, ANIM_TARGET, 2, 24, 16, 1, 1 - playsewithpan SE_W092, SOUND_PAN_TARGET + playsewithpan SE_M_TOXIC, SOUND_PAN_TARGET delay 15 return Move_SLUDGE: loadspritegfx ANIM_TAG_POISON_BUBBLE - playsewithpan SE_W145C, SOUND_PAN_ATTACKER + playsewithpan SE_M_BUBBLE3, SOUND_PAN_ATTACKER createsprite gSludgeProjectileSpriteTemplate, ANIM_TARGET, 2, 20, 0, 40, 0 waitforvisualfinish createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 3, 0, 5, 1 @@ -5970,19 +5970,19 @@ Move_SLUDGE_BOMB: 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, SOUND_PAN_TARGET + playsewithpan SE_M_DIG, SOUND_PAN_TARGET 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, SOUND_PAN_TARGET + playsewithpan SE_M_DIG, SOUND_PAN_TARGET 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, SOUND_PAN_TARGET + playsewithpan SE_M_DIG, SOUND_PAN_TARGET delay 0 waitsound waitforvisualfinish @@ -5990,7 +5990,7 @@ Move_SLUDGE_BOMB: waitforvisualfinish end SludgeBombProjectile: - playsewithpan SE_W145C, SOUND_PAN_ATTACKER + playsewithpan SE_M_BUBBLE3, SOUND_PAN_ATTACKER createsprite gSludgeProjectileSpriteTemplate, ANIM_TARGET, 2, 20, 0, 40, 0 delay 3 return @@ -5999,31 +5999,31 @@ Move_ACID: loadspritegfx ANIM_TAG_POISON_BUBBLE monbg ANIM_DEF_PARTNER createsprite gAcidPoisonBubbleSpriteTemplate, ANIM_TARGET, 2, 20, 0, 40, 1, 0, 0 - playsewithpan SE_W145C, SOUND_PAN_ATTACKER + playsewithpan SE_M_BUBBLE3, SOUND_PAN_ATTACKER delay 5 createsprite gAcidPoisonBubbleSpriteTemplate, ANIM_TARGET, 2, 20, 0, 40, 1, 24, 0 - playsewithpan SE_W145C, SOUND_PAN_ATTACKER + playsewithpan SE_M_BUBBLE3, SOUND_PAN_ATTACKER delay 5 createsprite gAcidPoisonBubbleSpriteTemplate, ANIM_TARGET, 2, 20, 0, 40, 1, -24, 0 - playsewithpan SE_W145C, SOUND_PAN_ATTACKER + playsewithpan SE_M_BUBBLE3, SOUND_PAN_ATTACKER delay 15 createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 2, 0, 10, 1 createvisualtask AnimTask_ShakeMon2, 5, ANIM_DEF_PARTNER, 2, 0, 10, 1 createvisualtask AnimTask_BlendColorCycle, 2, 20, 2, 2, 0, 12, RGB(30, 0, 31) createsprite gAcidPoisonDropletSpriteTemplate, ANIM_TARGET, 2, 0, -22, 0, 15, 55 - playsewithpan SE_W145, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE, SOUND_PAN_TARGET delay 10 createsprite gAcidPoisonDropletSpriteTemplate, ANIM_TARGET, 2, -26, -24, 0, 15, 55 - playsewithpan SE_W145, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE, SOUND_PAN_TARGET delay 10 createsprite gAcidPoisonDropletSpriteTemplate, ANIM_TARGET, 2, 15, -27, 0, 15, 50 - playsewithpan SE_W145, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE, SOUND_PAN_TARGET delay 10 createsprite gAcidPoisonDropletSpriteTemplate, ANIM_TARGET, 2, -15, -17, 0, 10, 45 - playsewithpan SE_W145, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE, SOUND_PAN_TARGET delay 10 createsprite gAcidPoisonDropletSpriteTemplate, ANIM_TARGET, 2, 27, -22, 0, 15, 50 - playsewithpan SE_W145, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_DEF_PARTNER end @@ -6034,14 +6034,14 @@ Move_BONEMERANG: monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET setalpha 12, 8 - playsewithpan SE_W155, SOUND_PAN_ATTACKER + playsewithpan SE_M_BONEMERANG, SOUND_PAN_ATTACKER createsprite gBonemerangSpriteTemplate, ANIM_ATTACKER, 2 delay 20 - playsewithpan SE_W030, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_TARGET, 1 createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 5, 0, 5, 1 delay 17 - playsewithpan SE_W233, SOUND_PAN_ATTACKER + playsewithpan SE_M_VITAL_THROW, SOUND_PAN_ATTACKER createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 6, -4 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER @@ -6054,13 +6054,13 @@ Move_BONE_CLUB: monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET setalpha 12, 8 - playsewithpan SE_W155, SOUND_PAN_TARGET + playsewithpan SE_M_BONEMERANG, SOUND_PAN_TARGET createsprite gSpinningBoneSpriteTemplate, ANIM_ATTACKER, 2, -42, -25, 0, 0, 15 delay 12 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_TARGET, 1 createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 5, 5, 1 createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 7, 5, 1, RGB_BLACK, 10, 0, 0 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -6071,12 +6071,12 @@ Move_BONE_RUSH: loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W155, SOUND_PAN_TARGET + playsewithpan SE_M_BONEMERANG, SOUND_PAN_TARGET createsprite gSpinningBoneSpriteTemplate, ANIM_ATTACKER, 2, -42, -25, 0, 0, 15 delay 12 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_TARGET, 2 createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 3, 5, 1 - playsewithpan SE_W030, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -6085,15 +6085,15 @@ Move_BONE_RUSH: Move_SPIKES: loadspritegfx ANIM_TAG_SPIKES monbg ANIM_DEF_PARTNER - playsewithpan SE_W026, SOUND_PAN_ATTACKER - waitplaysewithpan SE_W030, SOUND_PAN_TARGET, 28 + playsewithpan SE_M_JUMP_KICK, SOUND_PAN_ATTACKER + waitplaysewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET, 28 createsprite gSpikesSpriteTemplate, ANIM_TARGET, 2, 20, 0, 0, 24, 30 delay 10 - playsewithpan SE_W026, SOUND_PAN_ATTACKER - waitplaysewithpan SE_W030, SOUND_PAN_TARGET, 28 + playsewithpan SE_M_JUMP_KICK, SOUND_PAN_ATTACKER + waitplaysewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET, 28 createsprite gSpikesSpriteTemplate, ANIM_TARGET, 2, 20, 0, -24, 24, 30 delay 10 - waitplaysewithpan SE_W030, SOUND_PAN_TARGET, 28 + waitplaysewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET, 28 createsprite gSpikesSpriteTemplate, ANIM_TARGET, 2, 20, 0, 24, 24, 30 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER @@ -6103,7 +6103,7 @@ Move_MEGAHORN: loadspritegfx ANIM_TAG_HORN_HIT_2 loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER - playsewithpan SE_W082, SOUND_PAN_ATTACKER + playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER jumpifcontest MegahornInContest fadetobg BG_DRILL waitbgfadeout @@ -6118,7 +6118,7 @@ MegahornContinue: delay 3 createsprite gMegahornHornSpriteTemplate, ANIM_ATTACKER, 3, -42, 25, 0, 0, 6 delay 4 - playsewithpan SE_W011, SOUND_PAN_TARGET + playsewithpan SE_M_VICEGRIP, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_TARGET, 0 createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 1, -16, 4, 1, 4 waitforvisualfinish @@ -6148,13 +6148,13 @@ Move_GUST: monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET setalpha 12, 8 - playsewithpan SE_W016, SOUND_PAN_TARGET + playsewithpan SE_M_GUST, SOUND_PAN_TARGET createsprite gEllipticalGustSpriteTemplate, ANIM_ATTACKER, 2, 0, -16 createvisualtask AnimTask_AnimateGustTornadoPalette, 5, 1, 70 waitforvisualfinish createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 1, 0, 7, 1 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_TARGET, 2 - playsewithpan SE_W016B, SOUND_PAN_TARGET + playsewithpan SE_M_GUST2, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -6166,7 +6166,7 @@ Move_WING_ATTACK: monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET setalpha 12, 8 - loopsewithpan SE_W017, SOUND_PAN_ATTACKER, 20, 2 + loopsewithpan SE_M_WING_ATTACK, SOUND_PAN_ATTACKER, 20, 2 createvisualtask AnimTask_TranslateMonElliptical, 2, 0, 12, 4, 1, 4 createvisualtask AnimTask_AnimateGustTornadoPalette, 5, 1, 70 createsprite gGustToTargetSpriteTemplate, ANIM_ATTACKER, 2, -25, 0, 0, 0, 20 @@ -6176,7 +6176,7 @@ Move_WING_ATTACK: delay 17 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 16, 0, ANIM_TARGET, 1 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -16, 0, ANIM_TARGET, 1 - loopsewithpan SE_W003, SOUND_PAN_TARGET, 5, 2 + loopsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET, 5, 2 waitforvisualfinish createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 11 waitforvisualfinish @@ -6186,7 +6186,7 @@ Move_WING_ATTACK: Move_PECK: loadspritegfx ANIM_TAG_IMPACT - playsewithpan SE_W030, SOUND_PAN_TARGET + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET createvisualtask AnimTask_RotateMonToSideAndRestore, 2, 3, -768, ANIM_TARGET, 2 createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, -12, 0, ANIM_TARGET, 3 waitforvisualfinish @@ -6207,7 +6207,7 @@ Move_AEROBLAST: call AeroblastBeam waitforvisualfinish createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_TARGET, 0 - playsewithpan SE_W013, SOUND_PAN_TARGET + playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -6215,19 +6215,19 @@ Move_AEROBLAST: call UnsetSkyBg end AeroblastBeam: - playsewithpan SE_W026, SOUND_PAN_ATTACKER + playsewithpan SE_M_JUMP_KICK, SOUND_PAN_ATTACKER 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, SOUND_PAN_ATTACKER + playsewithpan SE_M_JUMP_KICK, SOUND_PAN_ATTACKER 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, SOUND_PAN_ATTACKER + playsewithpan SE_M_JUMP_KICK, SOUND_PAN_ATTACKER 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, SOUND_PAN_ATTACKER + playsewithpan SE_M_JUMP_KICK, SOUND_PAN_ATTACKER 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 @@ -6240,18 +6240,18 @@ Move_WATER_GUN: monbgprio_28 ANIM_TARGET setalpha 12, 8 createsprite gWaterGunProjectileSpriteTemplate, ANIM_ATTACKER, 2, 20, 0, 0, 0, 40, -25 - playsewithpan SE_W145, SOUND_PAN_ATTACKER + playsewithpan SE_M_BUBBLE, SOUND_PAN_ATTACKER waitforvisualfinish createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 1, 0, 8, 1 createsprite gWaterHitSplatSpriteTemplate, ANIM_ATTACKER, 4, 0, 0, ANIM_TARGET, 2 createsprite gWaterGunDropletSpriteTemplate, ANIM_ATTACKER, 2, 0, -15, 0, 15, 55 - playsewithpan SE_W152, SOUND_PAN_TARGET + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_TARGET delay 10 createsprite gWaterGunDropletSpriteTemplate, ANIM_ATTACKER, 2, 15, -20, 0, 15, 50 - playsewithpan SE_W152, SOUND_PAN_TARGET + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_TARGET delay 10 createsprite gWaterGunDropletSpriteTemplate, ANIM_ATTACKER, 2, -15, -10, 0, 10, 45 - playsewithpan SE_W152, SOUND_PAN_TARGET + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -6263,7 +6263,7 @@ Move_CRABHAMMER: monbg ANIM_DEF_PARTNER setalpha 12, 8 createsprite gWaterHitSplatSpriteTemplate, ANIM_ATTACKER, 4, 0, 0, ANIM_TARGET, 0 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET delay 1 createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 1, RGB(13, 21, 31), 10, 0, 0 createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 1, -24, 0, 0, 4 @@ -6272,7 +6272,7 @@ Move_CRABHAMMER: waitforvisualfinish createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 4 waitforvisualfinish - loopsewithpan SE_W152, SOUND_PAN_TARGET, 20, 3 + loopsewithpan SE_M_CRABHAMMER, SOUND_PAN_TARGET, 20, 3 createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 4, 8, 1 createsprite gSmallBubblePairSpriteTemplate, ANIM_ATTACKER, 2, 10, 10, 20, ANIM_TARGET delay 4 @@ -6297,7 +6297,7 @@ Move_CRABHAMMER: Move_SURF: createvisualtask AnimTask_CreateSurfWave, 2, FALSE delay 24 - panse_1B SE_W057, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 + panse_1B SE_M_SURF, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 waitforvisualfinish end @@ -6309,7 +6309,7 @@ Move_FLAMETHROWER: createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 46, 1 delay 6 createvisualtask AnimTask_StartSinAnimTimer, 5, 100 - panse_1B SE_W053, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 + panse_1B SE_M_FLAMETHROWER, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 call FlamethrowerCreateFlames call FlamethrowerCreateFlames call FlamethrowerCreateFlames @@ -6337,7 +6337,7 @@ FlamethrowerCreateFlames: @ Also used by Sandstorm weather Move_SANDSTORM: loadspritegfx ANIM_TAG_FLYING_DIRT - playsewithpan SE_W201, 0 + playsewithpan SE_M_SANDSTORM, 0 createvisualtask AnimTask_LoadSandstormBackground, 5, FALSE delay 16 createsprite gFlyingSandCrescentSpriteTemplate, ANIM_ATTACKER, 40, 10, 2304, 96, 0 @@ -6362,7 +6362,7 @@ Move_WHIRLPOOL: setalpha 12, 8 delay 0 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 4, 2, 0, 7, RGB(0, 13, 23) - playsewithpan SE_W250, SOUND_PAN_TARGET + playsewithpan SE_M_WHIRLPOOL, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 2, 50, 1 call WhirlpoolEffect call WhirlpoolEffect @@ -6397,19 +6397,19 @@ FlyEnd: end FlySetUp: - playsewithpan SE_W019, SOUND_PAN_ATTACKER + playsewithpan SE_M_FLY, SOUND_PAN_ATTACKER createsprite gFlyBallUpSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 13, 336 goto FlyEnd FlyUnleash: monbg ANIM_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W104, SOUND_PAN_ATTACKER + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER createsprite gFlyBallAttackSpriteTemplate, ANIM_ATTACKER, 2, 20 delay 20 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_TARGET, 0 createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1 - playsewithpan SE_W013, SOUND_PAN_TARGET + playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -6423,17 +6423,17 @@ BounceEnd: end BounceSetUp: - playsewithpan SE_W100, SOUND_PAN_ATTACKER + playsewithpan SE_M_TELEPORT, SOUND_PAN_ATTACKER createsprite gBounceBallShrinkSpriteTemplate, ANIM_ATTACKER, 2, 0, 0 goto BounceEnd BounceUnleash: monbg ANIM_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W207, SOUND_PAN_TARGET + playsewithpan SE_M_SWAGGER, SOUND_PAN_TARGET createsprite gBounceBallLandSpriteTemplate, ANIM_TARGET, 3 delay 7 - playsewithpan SE_W025B, SOUND_PAN_TARGET + playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 0, 0, ANIM_TARGET, 0 createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 5, 11, 1 waitforvisualfinish @@ -6447,10 +6447,10 @@ Move_KARATE_CHOP: monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET setalpha 12, 8 - playsewithpan SE_W104, SOUND_PAN_TARGET + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_TARGET createsprite gKarateChopSpriteTemplate, ANIM_ATTACKER, 2, -16, 0, 0, 0, 10, 1, 3, 0 waitforvisualfinish - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, ANIM_TARGET, 2 createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 4, 0, 6, 1 waitforvisualfinish @@ -6463,11 +6463,11 @@ Move_CROSS_CHOP: loadspritegfx ANIM_TAG_CROSS_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W025, SOUND_PAN_TARGET + playsewithpan SE_M_MEGA_KICK, SOUND_PAN_TARGET createsprite gCrossChopHandSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 0 createsprite gCrossChopHandSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1 delay 40 - playsewithpan SE_W013, SOUND_PAN_TARGET + playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET 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, ANIM_TARGET, 7, 0, 9, 1 @@ -6484,11 +6484,11 @@ Move_JUMP_KICK: createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 4 delay 3 createsprite gJumpKickSpriteTemplate, ANIM_ATTACKER, 2, -16, 8, 0, 0, 10, ANIM_TARGET, 1, 1 - playsewithpan SE_W026, SOUND_PAN_TARGET + playsewithpan SE_M_JUMP_KICK, SOUND_PAN_TARGET waitforvisualfinish createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 1, 0, 0, ANIM_TARGET, 1 createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 5, 0, 7, 1 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -6505,10 +6505,10 @@ Move_HI_JUMP_KICK: createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 3 delay 2 createsprite gJumpKickSpriteTemplate, ANIM_ATTACKER, 2, -16, 8, 0, 0, 10, ANIM_TARGET, 1, 1 - playsewithpan SE_W026, SOUND_PAN_TARGET + playsewithpan SE_M_JUMP_KICK, SOUND_PAN_TARGET waitforvisualfinish createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_TARGET, 1 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 1, -28, 0, 0, 3 delay 3 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 3, 0, 11, 1 @@ -6527,7 +6527,7 @@ Move_DOUBLE_KICK: setalpha 12, 8 createsprite gFistFootRandomPosSpriteTemplate, ANIM_ATTACKER, 3, 1, 20, 1 createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 4, 0, 6, 1 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -6538,7 +6538,7 @@ Move_TRIPLE_KICK: loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET jumpifmoveturn 0, TripleKickLeft jumpifmoveturn 1, TripleKickRight goto TripleKickCenter @@ -6574,26 +6574,26 @@ Move_DYNAMIC_PUNCH: delay 1 monbg ANIM_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET createsprite gFistFootSpriteTemplate, ANIM_TARGET, 3, 0, 0, 20, 1, 0 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 0, 0, ANIM_TARGET, 0 createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 5, 0, 7, 1 delay 1 waitsound - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 5, 0, 28, 1 createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 1 delay 6 - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 24, -24, 1, 1 delay 6 - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, -16, 16, 1, 1 delay 6 - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, -24, -12, 1, 1 delay 6 - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 16, 16, 1, 1 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER @@ -6606,23 +6606,23 @@ Move_COUNTER: monbg ANIM_DEF_PARTNER setalpha 12, 8 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 18, 6, 1, 4 - playsewithpan SE_W233, SOUND_PAN_ATTACKER + playsewithpan SE_M_VITAL_THROW, SOUND_PAN_ATTACKER waitforvisualfinish createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, 0, 0, 4 delay 4 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -15, 18, ANIM_TARGET, 0 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET delay 1 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 25, 1 createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 3, -15, 18, 8, 1, 0 delay 3 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, -4, ANIM_TARGET, 0 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET delay 1 createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 3, 0, -4, 8, 1, 0 delay 3 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 15, 9, ANIM_TARGET, 0 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET delay 1 createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 3, 15, 9, 8, 1, 0 delay 5 @@ -6636,13 +6636,13 @@ Move_VITAL_THROW: loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W233, SOUND_PAN_ATTACKER + playsewithpan SE_M_VITAL_THROW, SOUND_PAN_ATTACKER createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 12, 4, 1, 2 waitforvisualfinish createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, 0, 0, 4 delay 2 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, ANIM_TARGET, 1 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET delay 1 createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 1, -24, 0, 0, 4 waitforvisualfinish @@ -6664,10 +6664,10 @@ Move_ROCK_SMASH: delay 1 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, ANIM_TARGET, 1 createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 8, 1, 0 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 5, 1 waitforvisualfinish - playsewithpan SE_W088, SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET 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 @@ -6686,16 +6686,16 @@ Move_SUBMISSION: loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W104, SOUND_PAN_ATTACKER - waitplaysewithpan SE_W004, SOUND_PAN_TARGET, 10 - waitplaysewithpan SE_W104, SOUND_PAN_ATTACKER, 20 - waitplaysewithpan SE_W004, SOUND_PAN_TARGET, 30 - waitplaysewithpan SE_W104, SOUND_PAN_ATTACKER, 40 - waitplaysewithpan SE_W004, SOUND_PAN_TARGET, 50 - waitplaysewithpan SE_W104, SOUND_PAN_ATTACKER, 60 - waitplaysewithpan SE_W004, SOUND_PAN_TARGET, 70 - waitplaysewithpan SE_W104, SOUND_PAN_ATTACKER, 80 - waitplaysewithpan SE_W004, SOUND_PAN_TARGET, 90 + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER + waitplaysewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET, 10 + waitplaysewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER, 20 + waitplaysewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET, 30 + waitplaysewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER, 40 + waitplaysewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET, 50 + waitplaysewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER, 60 + waitplaysewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET, 70 + waitplaysewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER, 80 + waitplaysewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET, 90 createvisualtask AnimTask_TranslateMonElliptical, 2, 0, -18, 6, 6, 4 createvisualtask AnimTask_TranslateMonElliptical, 2, 1, 18, 6, 6, 4 call SubmissionHit @@ -6722,7 +6722,7 @@ Move_SUNNY_DAY: setalpha 13, 3 createvisualtask AnimTask_BlendBattleAnimPal, 10, 0x781, 1, 0, 6, RGB_WHITE waitforvisualfinish - panse_26 SE_W080, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +1, 0 + panse_26 SE_M_PETAL_DANCE, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +1, 0 call SunnyDayLightRay call SunnyDayLightRay call SunnyDayLightRay @@ -6743,7 +6743,7 @@ Move_COTTON_SPORE: loadspritegfx ANIM_TAG_SPORE monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET - loopsewithpan SE_W077, SOUND_PAN_TARGET, 18, 10 + loopsewithpan SE_M_POISON_POWDER, SOUND_PAN_TARGET, 18, 10 call CreateCottonSpores call CreateCottonSpores call CreateCottonSpores @@ -6765,7 +6765,7 @@ Move_SPORE: monbg ANIM_DEF_PARTNER setalpha 12, 8 createvisualtask AnimTask_SporeDoubleBattle, 2 - loopsewithpan SE_W077, SOUND_PAN_TARGET, 16, 11 + loopsewithpan SE_M_POISON_POWDER, SOUND_PAN_TARGET, 16, 11 call CreateSpore call CreateSpore call CreateSpore @@ -6789,7 +6789,7 @@ Move_PETAL_DANCE: loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W080, SOUND_PAN_ATTACKER + playsewithpan SE_M_PETAL_DANCE, SOUND_PAN_ATTACKER createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 12, 6, 6, 3 createsprite gPetalDanceBigFlowerSpriteTemplate, ANIM_ATTACKER, 2, 0, -24, 8, 140 createsprite gPetalDanceSmallFlowerSpriteTemplate, ANIM_ATTACKER, 2, 16, -24, 8, 100 @@ -6811,7 +6811,7 @@ Move_PETAL_DANCE: waitforvisualfinish createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 24, 0, 0, 5 delay 3 - playsewithpan SE_W025B, SOUND_PAN_TARGET + playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, ANIM_TARGET, 0 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 6, 0, 8, 1 waitforvisualfinish @@ -6829,7 +6829,7 @@ Move_RAZOR_LEAF: monbg ANIM_DEF_PARTNER setalpha 12, 8 delay 1 - loopsewithpan SE_W077, SOUND_PAN_ATTACKER, 10, 5 + loopsewithpan SE_M_POISON_POWDER, SOUND_PAN_ATTACKER, 10, 5 createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, -3, -2, 10 delay 2 createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, -1, -1, 15 @@ -6850,11 +6850,11 @@ Move_RAZOR_LEAF: delay 2 createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, -3, -5, 8 delay 60 - playsewithpan SE_W013B, SOUND_PAN_ATTACKER + playsewithpan SE_M_RAZOR_WIND2, SOUND_PAN_ATTACKER 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, SOUND_PAN_TARGET + playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 createvisualtask AnimTask_ShakeMon2, 2, ANIM_DEF_PARTNER, 2, 0, 8, 1 waitforvisualfinish @@ -6878,7 +6878,7 @@ Move_ANCIENT_POWER: createsprite gAncientPowerRockSpriteTemplate, ANIM_ATTACKER, 2, 20, 32, -28, 60, 1 createsprite gAncientPowerRockSpriteTemplate, ANIM_ATTACKER, 2, 0, 32, -28, 30, 4 createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 30, 1 - playsewithpan SE_W082, SOUND_PAN_ATTACKER + playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER delay 10 createsprite gAncientPowerRockSpriteTemplate, ANIM_ATTACKER, 2, 15, 32, -48, 25, 5 createsprite gAncientPowerRockSpriteTemplate, ANIM_ATTACKER, 2, -10, 32, -42, 30, 4 @@ -6888,7 +6888,7 @@ Move_ANCIENT_POWER: waitforvisualfinish createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 16, 0, 0, 4 delay 3 - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, ANIM_TARGET, 1 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 6, 1 waitforvisualfinish @@ -6901,10 +6901,10 @@ Move_ANCIENT_POWER: Move_OCTAZOOKA: loadspritegfx ANIM_TAG_GRAY_SMOKE loadspritegfx ANIM_TAG_BLACK_BALL - playsewithpan SE_W025B, SOUND_PAN_ATTACKER + playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_ATTACKER createsprite gOctazookaBallSpriteTemplate, ANIM_TARGET, 2, 20, 0, 0, 0, 20, 0 waitforvisualfinish - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET createsprite gOctazookaSmokeSpriteTemplate, ANIM_TARGET, 2, 8, 8, 1, 0 delay 2 createsprite gOctazookaSmokeSpriteTemplate, ANIM_TARGET, 2, -8, -8, 1, 0 @@ -6919,7 +6919,7 @@ Move_MIST: loadspritegfx ANIM_TAG_MIST_CLOUD monbg ANIM_ATK_PARTNER setalpha 12, 8 - loopsewithpan SE_W054, SOUND_PAN_ATTACKER, 20, 15 + loopsewithpan SE_M_MIST, SOUND_PAN_ATTACKER, 20, 15 call MistCloud call MistCloud call MistCloud @@ -6941,7 +6941,7 @@ MistCloud: Move_HAZE: waitforvisualfinish - playsewithpan SE_W114, 0 + playsewithpan SE_M_HAZE, 0 createvisualtask AnimTask_HazeScrollingFog, 5 delay 30 createvisualtask AnimTask_BlendBattleAnimPal, 10, 0x780, 2, 0, 16, RGB_BLACK @@ -6960,14 +6960,14 @@ Move_FIRE_PUNCH: createsprite gFireSpiralInwardSpriteTemplate, ANIM_TARGET, 1, 64 createsprite gFireSpiralInwardSpriteTemplate, ANIM_TARGET, 1, 128 createsprite gFireSpiralInwardSpriteTemplate, ANIM_TARGET, 1, 196 - playsewithpan SE_W172, SOUND_PAN_TARGET + playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_TARGET waitforvisualfinish createsprite gFistFootSpriteTemplate, ANIM_TARGET, 3, 0, 0, 8, 1, 0 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 0, 0, ANIM_TARGET, 1 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 15, 1 call FireSpreadEffect delay 4 - playsewithpan SE_W007, SOUND_PAN_TARGET + playsewithpan SE_M_FIRE_PUNCH, SOUND_PAN_TARGET waitforvisualfinish createvisualtask AnimTask_BlendBattleAnimPal, 10, 4, 0, 9, 0, RGB_RED waitforvisualfinish @@ -6990,7 +6990,7 @@ Move_LEER: monbg ANIM_ATTACKER monbgprio_28 ANIM_ATTACKER setalpha 8, 8 - playsewithpan SE_W043, SOUND_PAN_ATTACKER + playsewithpan SE_M_LEER, SOUND_PAN_ATTACKER createsprite gLeerSpriteTemplate, ANIM_ATTACKER, 2, 24, -12 createvisualtask AnimTask_ScaleMonAndRestore, 5, -5, -5, 10, ANIM_ATTACKER, 1 waitforvisualfinish @@ -7009,10 +7009,10 @@ Move_DREAM_EATER: loadspritegfx ANIM_TAG_BLUE_STAR monbg ANIM_DEF_PARTNER monbgprio_2A ANIM_TARGET - playsewithpan SE_W060, SOUND_PAN_ATTACKER + playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER call SetPsychicBackground setalpha 8, 8 - playsewithpan SE_W107, SOUND_PAN_TARGET + playsewithpan SE_M_MINIMIZE, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 15, 1 createvisualtask AnimTask_ScaleMonAndRestore, 5, -6, -6, 15, ANIM_TARGET, 1 waitforvisualfinish @@ -7029,42 +7029,42 @@ Move_DREAM_EATER: call UnsetPsychicBackground end DreamEaterAbsorb: - playsewithpan SE_W207, SOUND_PAN_TARGET + playsewithpan SE_M_SWAGGER, SOUND_PAN_TARGET 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, SOUND_PAN_TARGET + playsewithpan SE_M_SWAGGER, SOUND_PAN_TARGET 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, SOUND_PAN_TARGET + playsewithpan SE_M_SWAGGER, SOUND_PAN_TARGET 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, SOUND_PAN_TARGET + playsewithpan SE_M_SWAGGER, SOUND_PAN_TARGET 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, SOUND_PAN_TARGET + playsewithpan SE_M_SWAGGER, SOUND_PAN_TARGET 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, SOUND_PAN_TARGET + playsewithpan SE_M_SWAGGER, SOUND_PAN_TARGET 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, SOUND_PAN_TARGET + playsewithpan SE_M_SWAGGER, SOUND_PAN_TARGET 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, SOUND_PAN_TARGET + playsewithpan SE_M_SWAGGER, SOUND_PAN_TARGET 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 @@ -7079,25 +7079,25 @@ Move_POISON_GAS: monbgprio_29 setalpha 12, 8 delay 0 - playsewithpan SE_W054, SOUND_PAN_ATTACKER + playsewithpan SE_M_MIST, SOUND_PAN_ATTACKER createsprite gPoisonGasCloudSpriteTemplate, ANIM_TARGET, 0, 64, 0, 0, -32, -6, 4192, 1072, 0 delay 4 - playsewithpan SE_W054, SOUND_PAN_ATTACKER + playsewithpan SE_M_MIST, SOUND_PAN_ATTACKER createsprite gPoisonGasCloudSpriteTemplate, ANIM_TARGET, 0, 64, 0, 0, -32, -6, 4192, 1072, 0 delay 4 - playsewithpan SE_W054, SOUND_PAN_ATTACKER + playsewithpan SE_M_MIST, SOUND_PAN_ATTACKER createsprite gPoisonGasCloudSpriteTemplate, ANIM_TARGET, 0, 64, 0, 0, -32, -6, 4192, 1072, 0 delay 4 - playsewithpan SE_W054, SOUND_PAN_ATTACKER + playsewithpan SE_M_MIST, SOUND_PAN_ATTACKER createsprite gPoisonGasCloudSpriteTemplate, ANIM_TARGET, 0, 64, 0, 0, -32, -6, 4192, 1072, 0 delay 4 - playsewithpan SE_W054, SOUND_PAN_ATTACKER + playsewithpan SE_M_MIST, SOUND_PAN_ATTACKER createsprite gPoisonGasCloudSpriteTemplate, ANIM_TARGET, 0, 64, 0, 0, -32, -6, 4192, 1072, 0 delay 4 - playsewithpan SE_W054, SOUND_PAN_ATTACKER + playsewithpan SE_M_MIST, SOUND_PAN_ATTACKER createsprite gPoisonGasCloudSpriteTemplate, ANIM_TARGET, 0, 64, 0, 0, -32, -6, 4192, 1072, 0 delay 40 - loopsewithpan SE_W054, SOUND_PAN_TARGET, 28, 6 + loopsewithpan SE_M_MIST, SOUND_PAN_TARGET, 28, 6 createvisualtask AnimTask_BlendColorCycle, 2, 4, 6, 2, 0, 12, RGB(26, 0, 26) waitforvisualfinish blendoff @@ -7110,7 +7110,7 @@ Move_BIND: goto BindWrap BindWrap: - playsewithpan SE_W020, SOUND_PAN_TARGET + playsewithpan SE_M_BIND, SOUND_PAN_TARGET call BindWrapSqueezeTarget call BindWrapSqueezeTarget waitforvisualfinish @@ -7126,9 +7126,9 @@ Move_WRAP: Move_PSYBEAM: loadspritegfx ANIM_TAG_GOLD_RING - playsewithpan SE_W060, SOUND_PAN_ATTACKER + playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER call SetPsychicBackground - createsoundtask SoundTask_LoopSEAdjustPanning, SE_W060B, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 3, 4, 0, 15 + createsoundtask SoundTask_LoopSEAdjustPanning, SE_M_PSYBEAM2, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 3, 4, 0, 15 call PsybeamRings call PsybeamRings createvisualtask AnimTask_SwayMon, 5, 0, 6, 2048, 4, ANIM_TARGET @@ -7163,7 +7163,7 @@ Move_HYPNOSIS: call UnsetPsychicBackground end HypnosisRings: - playsewithpan SE_W048, SOUND_PAN_ATTACKER + playsewithpan SE_M_SUPERSONIC, SOUND_PAN_ATTACKER createsprite gGoldRingSpriteTemplate, ANIM_TARGET, 2, 0, 8, 0, 8, 27, 0 createsprite gGoldRingSpriteTemplate, ANIM_TARGET, 2, 16, -8, 0, -8, 27, 0 delay 6 @@ -7171,10 +7171,10 @@ HypnosisRings: Move_PSYWAVE: loadspritegfx ANIM_TAG_BLUE_RING - playsewithpan SE_W060, SOUND_PAN_ATTACKER + playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER call SetPsychicBackground createvisualtask AnimTask_StartSinAnimTimer, 5, 100 - createsoundtask SoundTask_LoopSEAdjustPanning, SE_W100, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 9, 0, 10 + createsoundtask SoundTask_LoopSEAdjustPanning, SE_M_TELEPORT, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 9, 0, 10 call PsywaveRings call PsywaveRings createvisualtask AnimTask_BlendColorCycle, 2, 4, 1, 4, 0, 12, RGB(31, 18, 31) @@ -7196,7 +7196,7 @@ PsywaveRings: Move_ZAP_CANNON: loadspritegfx ANIM_TAG_BLACK_BALL_2 loadspritegfx ANIM_TAG_SPARK_2 - playsewithpan SE_W086, SOUND_PAN_ATTACKER + playsewithpan SE_M_THUNDER_WAVE, SOUND_PAN_ATTACKER createsprite 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 @@ -7209,7 +7209,7 @@ Move_ZAP_CANNON: waitforvisualfinish createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 5, 1 delay 15 - waitplaysewithpan SE_W085B, SOUND_PAN_TARGET, 19 + waitplaysewithpan SE_M_THUNDERBOLT2, SOUND_PAN_TARGET, 19 call ElectricityEffect waitforvisualfinish end @@ -7217,13 +7217,13 @@ Move_ZAP_CANNON: Move_STEEL_WING: loadspritegfx ANIM_TAG_GUST loadspritegfx ANIM_TAG_IMPACT - loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 28, 2 + loopsewithpan SE_M_HARDEN, SOUND_PAN_ATTACKER, 28, 2 createvisualtask AnimTask_MetallicShine, 5, 0, 0, 0 waitforvisualfinish monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET setalpha 12, 8 - loopsewithpan SE_W017, SOUND_PAN_ATTACKER, 20, 2 + loopsewithpan SE_M_WING_ATTACK, SOUND_PAN_ATTACKER, 20, 2 createvisualtask AnimTask_TranslateMonElliptical, 2, 0, 12, 4, 1, 4 createvisualtask AnimTask_AnimateGustTornadoPalette, 5, 1, 70 createsprite gGustToTargetSpriteTemplate, ANIM_ATTACKER, 2, -25, 0, 0, 0, 20 @@ -7233,7 +7233,7 @@ Move_STEEL_WING: delay 17 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 16, 0, ANIM_TARGET, 1 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -16, 0, ANIM_TARGET, 1 - playsewithpan SE_W013, SOUND_PAN_TARGET + playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET waitforvisualfinish createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 11 waitforvisualfinish @@ -7243,7 +7243,7 @@ Move_STEEL_WING: Move_IRON_TAIL: loadspritegfx ANIM_TAG_IMPACT - loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 28, 2 + loopsewithpan SE_M_HARDEN, SOUND_PAN_ATTACKER, 28, 2 createvisualtask AnimTask_MetallicShine, 5, 1, 0, 0 waitforvisualfinish monbg ANIM_TARGET @@ -7252,7 +7252,7 @@ Move_IRON_TAIL: delay 6 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 0, 0, ANIM_TARGET, 2 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET waitforvisualfinish createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, ANIM_ATTACKER, 1 clearmonbg ANIM_TARGET @@ -7263,7 +7263,7 @@ Move_IRON_TAIL: Move_POISON_TAIL: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_POISON_BUBBLE - loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 28, 2 + loopsewithpan SE_M_HARDEN, SOUND_PAN_ATTACKER, 28, 2 createvisualtask AnimTask_MetallicShine, 5, 1, 1, RGB(24, 6, 23) waitforvisualfinish monbg ANIM_TARGET @@ -7272,7 +7272,7 @@ Move_POISON_TAIL: delay 6 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 0, 0, ANIM_TARGET, 2 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET waitforvisualfinish createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, ANIM_ATTACKER, 1 clearmonbg ANIM_TARGET @@ -7283,19 +7283,19 @@ Move_POISON_TAIL: Move_METAL_CLAW: loadspritegfx ANIM_TAG_CLAW_SLASH - loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 28, 2 + loopsewithpan SE_M_HARDEN, SOUND_PAN_ATTACKER, 28, 2 createvisualtask AnimTask_MetallicShine, 5, 0, 0, 0 waitforvisualfinish createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 6, 4 delay 2 - playsewithpan SE_W013, SOUND_PAN_TARGET + playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET 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, SOUND_PAN_TARGET + playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET 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 @@ -7305,11 +7305,11 @@ Move_METAL_CLAW: Move_NIGHT_SHADE: monbg ANIM_ATTACKER monbgprio_28 ANIM_ATTACKER - playsewithpan SE_W060, SOUND_PAN_ATTACKER + playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER fadetobg BG_GHOST waitbgfadein delay 10 - playsewithpan SE_W043, SOUND_PAN_ATTACKER + playsewithpan SE_M_LEER, SOUND_PAN_ATTACKER createvisualtask AnimTask_NightShadeClone, 5, 85 delay 70 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 12, 1 @@ -7324,24 +7324,24 @@ Move_NIGHT_SHADE: Move_EGG_BOMB: loadspritegfx ANIM_TAG_EXPLOSION loadspritegfx ANIM_TAG_LARGE_FRESH_EGG - playsewithpan SE_W039, SOUND_PAN_ATTACKER + playsewithpan SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER createsprite gEggThrowSpriteTemplate, ANIM_TARGET, 2, 10, 0, 0, 0, 25, -32 waitforvisualfinish createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 16, 1 createsprite gExplosionSpriteTemplate, ANIM_TARGET, 4, 6, 5, 1, 0 - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET delay 3 createsprite gExplosionSpriteTemplate, ANIM_TARGET, 4, -16, -15, 1, 0 - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET delay 3 createsprite gExplosionSpriteTemplate, ANIM_TARGET, 4, 16, -5, 1, 0 - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET delay 3 createsprite gExplosionSpriteTemplate, ANIM_TARGET, 4, -12, 18, 1, 0 - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET delay 3 createsprite gExplosionSpriteTemplate, ANIM_TARGET, 4, 0, 5, 1, 0 - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET delay 3 waitforvisualfinish end @@ -7351,10 +7351,10 @@ Move_SHADOW_BALL: fadetobg BG_GHOST waitbgfadein delay 15 - createsoundtask SoundTask_LoopSEAdjustPanning, SE_W054, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 5, 5, 0, 5 + createsoundtask SoundTask_LoopSEAdjustPanning, SE_M_MIST, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 5, 5, 0, 5 createsprite gShadowBallSpriteTemplate, ANIM_TARGET, 2, 16, 16, 8 waitforvisualfinish - playsewithpan SE_W028, SOUND_PAN_TARGET + playsewithpan SE_M_SAND_ATTACK, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 8, 1 waitforvisualfinish restorebg @@ -7364,7 +7364,7 @@ Move_SHADOW_BALL: Move_LICK: loadspritegfx ANIM_TAG_LICK delay 15 - playsewithpan SE_W122, SOUND_PAN_TARGET + playsewithpan SE_M_LICK, SOUND_PAN_TARGET createsprite gLickSpriteTemplate, ANIM_TARGET, 2, 0, 0 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 1, 0, 16, 1 waitforvisualfinish @@ -7372,7 +7372,7 @@ Move_LICK: Move_FOCUS_ENERGY: loadspritegfx ANIM_TAG_FOCUS_ENERGY - playsewithpan SE_W082, SOUND_PAN_ATTACKER + playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER call EndureEffect delay 8 createvisualtask AnimTask_BlendColorCycle, 2, 2, 2, 2, 0, 11, RGB_WHITE @@ -7387,7 +7387,7 @@ Move_BIDE: choosetwoturnanim BideSetUp, BideUnleash end BideSetUp: - loopsewithpan SE_W036, SOUND_PAN_ATTACKER, 9, 2 + loopsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER, 9, 2 createvisualtask AnimTask_BlendColorCycle, 2, 2, 2, 2, 0, 11, RGB_RED createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 32, 1 waitforvisualfinish @@ -7397,7 +7397,7 @@ BideUnleash: loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 - loopsewithpan SE_W036, SOUND_PAN_ATTACKER, 9, 2 + loopsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER, 9, 2 createvisualtask AnimTask_BlendBattleAnimPal, 10, 2, 2, 0, 11, RGB_RED createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 32, 1 waitforvisualfinish @@ -7405,13 +7405,13 @@ BideUnleash: waitforvisualfinish createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 2, 0, 12, 1 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 16, 1 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 1, 18, -8, ANIM_TARGET, 1 delay 5 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 1, -18, 8, ANIM_TARGET, 1 delay 5 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 1, -8, -5, ANIM_TARGET, 1 waitforvisualfinish delay 5 @@ -7430,7 +7430,7 @@ Move_STRING_SHOT: delay 0 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 5, 1, 2, 0, 9, RGB_BLACK waitforvisualfinish - loopsewithpan SE_W081, SOUND_PAN_ATTACKER, 9, 6 + loopsewithpan SE_M_STRING_SHOT, SOUND_PAN_ATTACKER, 9, 6 call StringShotThread call StringShotThread call StringShotThread @@ -7450,7 +7450,7 @@ Move_STRING_SHOT: call StringShotThread call StringShotThread waitforvisualfinish - playsewithpan SE_W081B, SOUND_PAN_TARGET + playsewithpan SE_M_STRING_SHOT2, SOUND_PAN_TARGET createsprite gStringWrapSpriteTemplate, ANIM_TARGET, 2, 0, 10 delay 4 createsprite gStringWrapSpriteTemplate, ANIM_TARGET, 2, 0, -2 @@ -7476,7 +7476,7 @@ Move_SPIDER_WEB: createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 5, 1, 2, 0, 9, RGB_BLACK waitforvisualfinish monbgprio_28 ANIM_TARGET - loopsewithpan SE_W081, SOUND_PAN_ATTACKER, 9, 6 + loopsewithpan SE_M_STRING_SHOT, SOUND_PAN_ATTACKER, 9, 6 call SpiderWebThread call SpiderWebThread call SpiderWebThread @@ -7492,7 +7492,7 @@ Move_SPIDER_WEB: call SpiderWebThread call SpiderWebThread waitforvisualfinish - playsewithpan SE_W081B, SOUND_PAN_TARGET + playsewithpan SE_M_STRING_SHOT2, SOUND_PAN_TARGET createsprite gSpiderWebSpriteTemplate, ANIM_ATTACKER, 2 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER @@ -7513,12 +7513,12 @@ RazorWindEnd: RazorWindSetUp: loadspritegfx ANIM_TAG_GUST - playsewithpan SE_W016, SOUND_PAN_ATTACKER + playsewithpan SE_M_GUST, SOUND_PAN_ATTACKER 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, SOUND_PAN_ATTACKER + playsewithpan SE_M_GUST2, SOUND_PAN_ATTACKER goto RazorWindEnd RazorWindUnleash: @@ -7526,16 +7526,16 @@ RazorWindUnleash: loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET setalpha 12, 8 - playsewithpan SE_W013B, SOUND_PAN_ATTACKER + playsewithpan SE_M_RAZOR_WIND2, SOUND_PAN_ATTACKER createsprite gAirWaveCrescentSpriteTemplate, ANIM_ATTACKER, 2, 14, 8, 0, 0, 22, 2, 1 delay 2 - playsewithpan SE_W013B, SOUND_PAN_ATTACKER + playsewithpan SE_M_RAZOR_WIND2, SOUND_PAN_ATTACKER createsprite gAirWaveCrescentSpriteTemplate, ANIM_ATTACKER, 2, 14, -8, 16, 14, 22, 1, 1 delay 2 - playsewithpan SE_W013B, SOUND_PAN_ATTACKER + playsewithpan SE_M_RAZOR_WIND2, SOUND_PAN_ATTACKER createsprite gAirWaveCrescentSpriteTemplate, ANIM_ATTACKER, 2, 14, 12, -16, -14, 22, 0, 1 delay 17 - playsewithpan SE_W013, SOUND_PAN_TARGET + playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 10, 1 createvisualtask AnimTask_ShakeMon2, 2, ANIM_DEF_PARTNER, 2, 0, 10, 1 waitforvisualfinish @@ -7548,11 +7548,11 @@ Move_DISABLE: monbg ANIM_TARGET monbgprio_28 ANIM_TARGET setalpha 8, 8 - playsewithpan SE_W197, SOUND_PAN_ATTACKER + playsewithpan SE_M_DETECT, SOUND_PAN_ATTACKER createsprite gSpinningSparkleSpriteTemplate, ANIM_ATTACKER, 13, 24, -16 waitforvisualfinish createvisualtask AnimTask_GrowAndGreyscale, 5 - loopsewithpan SE_W020, SOUND_PAN_TARGET, 15, 4 + loopsewithpan SE_M_BIND, SOUND_PAN_TARGET, 15, 4 waitforvisualfinish delay 1 clearmonbg ANIM_TARGET @@ -7564,7 +7564,7 @@ Move_RECOVER: loadspritegfx ANIM_TAG_BLUE_STAR monbg ANIM_ATK_PARTNER setalpha 12, 8 - loopsewithpan SE_W025, SOUND_PAN_ATTACKER, 13, 3 + loopsewithpan SE_M_MEGA_KICK, SOUND_PAN_ATTACKER, 13, 3 createvisualtask AnimTask_BlendColorCycle, 2, 2, 0, 6, 0, 11, RGB(31, 31, 11) call RecoverAbsorbEffect call RecoverAbsorbEffect @@ -7599,14 +7599,14 @@ Move_MIMIC: setalpha 11, 5 monbg_22 ANIM_DEF_PARTNER monbgprio_29 - panse_1B SE_W107, SOUND_PAN_TARGET, SOUND_PAN_ATTACKER, -3, 0 + panse_1B SE_M_MINIMIZE, SOUND_PAN_TARGET, SOUND_PAN_ATTACKER, -3, 0 createvisualtask AnimTask_ShrinkTargetCopy, 5, 128, 24 delay 15 createsprite gMimicOrbSpriteTemplate, ANIM_TARGET, 2, -12, 24 delay 10 setarg 7, 0xFFFF waitforvisualfinish - playsewithpan SE_W036, SOUND_PAN_ATTACKER + playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER createvisualtask AnimTask_BlendColorCycle, 2, 2, 0, 2, 0, 11, RGB_WHITE waitforvisualfinish clearmonbg_23 ANIM_DEF_PARTNER @@ -7615,7 +7615,7 @@ Move_MIMIC: Move_CONSTRICT: loadspritegfx ANIM_TAG_TENDRILS - loopsewithpan SE_W010, SOUND_PAN_TARGET, 6, 4 + loopsewithpan SE_M_SCRATCH, SOUND_PAN_TARGET, 6, 4 createsprite gConstrictBindingSpriteTemplate, ANIM_TARGET, 4, 0, 16, 0, 2 delay 7 createsprite gConstrictBindingSpriteTemplate, ANIM_TARGET, 3, 0, 0, 0, 2 @@ -7625,7 +7625,7 @@ Move_CONSTRICT: delay 8 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 6, 1 delay 20 - playsewithpan SE_W020, SOUND_PAN_TARGET + playsewithpan SE_M_BIND, SOUND_PAN_TARGET setarg 7, 0xFFFF waitforvisualfinish end @@ -7650,7 +7650,7 @@ CurseGhost: clearmonbg ANIM_ATK_PARTNER delay 1 monbg ANIM_DEF_PARTNER - playsewithpan SE_W171, SOUND_PAN_TARGET + playsewithpan SE_M_NIGHTMARE, SOUND_PAN_TARGET createsprite gCurseGhostSpriteTemplate, ANIM_TARGET, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 14, 1 waitforvisualfinish @@ -7660,7 +7660,7 @@ CurseGhost: end CurseGhostShakeFromNail: createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 4, 0, 10, 0 - playsewithpan SE_W020, SOUND_PAN_ATTACKER + playsewithpan SE_M_BIND, SOUND_PAN_ATTACKER return CurseStats: createvisualtask AnimTask_SwayMon, 5, 0, 10, 1536, 3, ANIM_ATTACKER @@ -7670,7 +7670,7 @@ CurseStats: waitforvisualfinish end CurseStats1: - playsewithpan SE_W082, SOUND_PAN_ATTACKER + playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER createvisualtask AnimTask_DrawFallingWhiteLinesOnAttacker, 5 createvisualtask AnimTask_BlendColorCycle, 5, 2, 4, 2, 0, 10, RGB_RED return @@ -7680,13 +7680,13 @@ Move_SOFT_BOILED: loadspritegfx ANIM_TAG_THIN_RING loadspritegfx ANIM_TAG_BLUE_STAR monbg ANIM_ATK_PARTNER - playsewithpan SE_W039, SOUND_PAN_ATTACKER + playsewithpan SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER createvisualtask AnimTask_ShakeMon, 2, ANIM_ATTACKER, 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, SOUND_PAN_ATTACKER + playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_ATTACKER createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 10, 0, RGB(12, 24, 30) createsprite gThinRingExpandingSpriteTemplate, ANIM_ATTACKER, 3, 31, 16, 0, 1 delay 8 @@ -7731,14 +7731,14 @@ Move_HEAL_BELL: unloadspritegfx ANIM_TAG_MUSIC_NOTES_2 unloadspritegfx ANIM_TAG_THIN_RING loadspritegfx ANIM_TAG_SPARKLE_2 - playsewithpan SE_W234, SOUND_PAN_ATTACKER + playsewithpan SE_M_MORNING_SUN, SOUND_PAN_ATTACKER 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, SOUND_PAN_ATTACKER + playsewithpan SE_SHINY, SOUND_PAN_ATTACKER createvisualtask AnimTask_BlendBattleAnimPalExclude, 10, 4, 3, 10, 0, RGB(12, 24, 30) createvisualtask AnimTask_BlendBattleAnimPal, 10, 10, 3, 10, 0, RGB_WHITE createsprite gBlendThinRingExpandingSpriteTemplate, ANIM_ATTACKER, 16, 0, 0, 0, 1 @@ -7747,14 +7747,14 @@ HealBellRing: createvisualtask AnimTask_BlendBattleAnimPalExclude, 10, 4, 3, 8, 0, RGB(12, 24, 30) createvisualtask AnimTask_BlendBattleAnimPal, 10, 10, 3, 2, 10, RGB_WHITE createsprite gThinRingExpandingSpriteTemplate, ANIM_ATTACKER, 40, 0, -24, 0, 1 - playsewithpan SE_W215, SOUND_PAN_ATTACKER + playsewithpan SE_M_HEAL_BELL, SOUND_PAN_ATTACKER return Move_FAKE_OUT: - playsewithpan SE_W260, 0 + playsewithpan SE_M_FLATTER, 0 createvisualtask AnimTask_FakeOut, 5 waitforvisualfinish - playsewithpan SE_W166, SOUND_PAN_TARGET + playsewithpan SE_M_SKETCH, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 5, 1 createvisualtask AnimTask_StretchTargetUp, 3 waitforvisualfinish @@ -7764,17 +7764,17 @@ Move_FAKE_OUT: Move_SCARY_FACE: loadspritegfx ANIM_TAG_EYE_SPARKLE createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 27, 3, 0, 16, RGB_BLACK - playsewithpan SE_W060, SOUND_PAN_ATTACKER + playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER waitforvisualfinish delay 10 - playsewithpan SE_W043, SOUND_PAN_ATTACKER + playsewithpan SE_M_LEER, SOUND_PAN_ATTACKER createvisualtask 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, FALSE - playsewithpan SE_W081B, SOUND_PAN_TARGET + playsewithpan SE_M_STRING_SHOT2, SOUND_PAN_TARGET createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 27, 3, 16, 0, RGB_BLACK waitforvisualfinish end @@ -7783,14 +7783,14 @@ Move_SWEET_KISS: loadspritegfx ANIM_TAG_RED_HEART loadspritegfx ANIM_TAG_ANGEL createsprite gAngelSpriteTemplate, ANIM_TARGET, 2, 16, -48 - playsewithpan SE_W215, SOUND_PAN_TARGET + playsewithpan SE_M_HEAL_BELL, SOUND_PAN_TARGET delay 23 - playsewithpan SE_W215, SOUND_PAN_TARGET + playsewithpan SE_M_HEAL_BELL, SOUND_PAN_TARGET delay 23 - playsewithpan SE_W215, SOUND_PAN_TARGET + playsewithpan SE_M_HEAL_BELL, SOUND_PAN_TARGET waitforvisualfinish createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, 160, -30 - playsewithpan SE_W213, SOUND_PAN_TARGET + playsewithpan SE_M_ATTRACT, SOUND_PAN_TARGET createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, -256, -42 createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, 128, -14 createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, 416, -38 @@ -7802,9 +7802,9 @@ Move_LOVELY_KISS: loadspritegfx ANIM_TAG_PINK_HEART loadspritegfx ANIM_TAG_DEVIL createsprite gDevilSpriteTemplate, ANIM_TARGET, 2, 0, -24 - playsewithpan SE_W060B, SOUND_PAN_TARGET + playsewithpan SE_M_PSYBEAM2, SOUND_PAN_TARGET waitforvisualfinish - playsewithpan SE_W213, SOUND_PAN_TARGET + playsewithpan SE_M_ATTRACT, SOUND_PAN_TARGET createsprite gPinkHeartSpriteTemplate, ANIM_TARGET, 3, -256, -42 createsprite gPinkHeartSpriteTemplate, ANIM_TARGET, 3, 128, -14 createsprite gPinkHeartSpriteTemplate, ANIM_TARGET, 3, 416, -38 @@ -7815,13 +7815,13 @@ Move_FURY_SWIPES: loadspritegfx ANIM_TAG_SWIPE createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 5, 5 delay 4 - playsewithpan SE_W010, SOUND_PAN_TARGET + playsewithpan SE_M_SCRATCH, SOUND_PAN_TARGET createsprite gFurySwipesSpriteTemplate, ANIM_TARGET, 2, 16, 0, 1 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 5, 1 delay 10 createsprite gHorizontalLungeSpriteTemplate, ANIM_TARGET, 2, 5, 5 delay 4 - playsewithpan SE_W010, SOUND_PAN_TARGET + playsewithpan SE_M_SCRATCH, SOUND_PAN_TARGET createsprite gFurySwipesSpriteTemplate, ANIM_TARGET, 2, -16, 0, 0 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 7, 1 end @@ -7830,28 +7830,28 @@ Move_INGRAIN: loadspritegfx ANIM_TAG_ROOTS loadspritegfx ANIM_TAG_ORBS createsprite gIngrainRootSpriteTemplate, ANIM_ATTACKER, 2, 16, 26, -1, 2, 150 - playsewithpan SE_W010, SOUND_PAN_ATTACKER + playsewithpan SE_M_SCRATCH, SOUND_PAN_ATTACKER delay 10 createsprite gIngrainRootSpriteTemplate, ANIM_ATTACKER, 2, -32, 20, 1, 1, 140 - playsewithpan SE_W010, SOUND_PAN_ATTACKER + playsewithpan SE_M_SCRATCH, SOUND_PAN_ATTACKER delay 10 createsprite gIngrainRootSpriteTemplate, ANIM_ATTACKER, 2, 32, 22, 1, 0, 130 - playsewithpan SE_W010, SOUND_PAN_ATTACKER + playsewithpan SE_M_SCRATCH, SOUND_PAN_ATTACKER delay 10 createsprite gIngrainRootSpriteTemplate, ANIM_ATTACKER, 2, -16, 25, -1, 3, 120 - playsewithpan SE_W010, SOUND_PAN_ATTACKER + playsewithpan SE_M_SCRATCH, SOUND_PAN_ATTACKER delay 40 createsprite gIngrainOrbSpriteTemplate, ANIM_ATTACKER, 3, 32, 26, -1, 3, 30 delay 5 - playsewithpan SE_W145C, SOUND_PAN_ATTACKER + playsewithpan SE_M_BUBBLE3, SOUND_PAN_ATTACKER delay 5 createsprite gIngrainOrbSpriteTemplate, ANIM_ATTACKER, 3, -48, 20, 1, 2, 30 - playsewithpan SE_W145C, SOUND_PAN_ATTACKER + playsewithpan SE_M_BUBBLE3, SOUND_PAN_ATTACKER delay 5 - playsewithpan SE_W145C, SOUND_PAN_ATTACKER + playsewithpan SE_M_BUBBLE3, SOUND_PAN_ATTACKER delay 5 createsprite gIngrainOrbSpriteTemplate, ANIM_ATTACKER, 3, 48, 26, -2, 3, 18 - playsewithpan SE_W145C, SOUND_PAN_ATTACKER + playsewithpan SE_M_BUBBLE3, SOUND_PAN_ATTACKER delay 10 waitforvisualfinish end @@ -7860,13 +7860,13 @@ Move_PRESENT: loadspritegfx ANIM_TAG_ITEM_BAG createvisualtask AnimTask_IsHealingMove, 2 createsprite gPresentSpriteTemplate, ANIM_TARGET, 2, 0, -5, 10, 2, -1 - playsewithpan SE_W039, SOUND_PAN_ATTACKER + playsewithpan SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER delay 14 - playsewithpan SE_W145B, SOUND_PAN_ATTACKER + playsewithpan SE_M_BUBBLE2, SOUND_PAN_ATTACKER delay 14 - playsewithpan SE_W145B, 0 + playsewithpan SE_M_BUBBLE2, 0 delay 20 - playsewithpan SE_W145B, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE2, SOUND_PAN_TARGET waitforvisualfinish jumpretfalse PresentDamage jumprettrue PresentHeal @@ -7874,26 +7874,26 @@ Move_PRESENT: PresentDamage: loadspritegfx ANIM_TAG_EXPLOSION - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET createsprite gExplosionSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 1 delay 6 - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET createsprite gExplosionSpriteTemplate, ANIM_TARGET, 3, 24, -24, 1, 1 delay 6 - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET createsprite gExplosionSpriteTemplate, ANIM_TARGET, 3, -16, 16, 1, 1 delay 6 - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET createsprite gExplosionSpriteTemplate, ANIM_TARGET, 3, -24, -12, 1, 1 delay 6 - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET createsprite gExplosionSpriteTemplate, ANIM_TARGET, 3, 16, 16, 1, 1 end PresentHeal: loadspritegfx ANIM_TAG_GREEN_SPARKLE loadspritegfx ANIM_TAG_BLUE_STAR - playsewithpan SE_W234, SOUND_PAN_TARGET + playsewithpan SE_M_MORNING_SUN, SOUND_PAN_TARGET createsprite gPresentHealParticleSpriteTemplate, ANIM_TARGET, 4, -16, 32, -3, 1 delay 3 createsprite gPresentHealParticleSpriteTemplate, ANIM_TARGET, 4, 16, 32, -3, -1 @@ -7918,7 +7918,7 @@ PresentHeal: Move_BATON_PASS: loadspritegfx ANIM_TAG_POKEBALL - playsewithpan SE_W226, SOUND_PAN_ATTACKER + playsewithpan SE_M_BATON_PASS, SOUND_PAN_ATTACKER createvisualtask AnimTask_BlendColorCycle, 2, 31, 1, 2, 0, 11, RGB(31, 22, 30) createsprite gBatonPassPokeballSpriteTemplate, ANIM_ATTACKER, 2 end @@ -7943,7 +7943,7 @@ Move_PERISH_SONG: createsprite gPerishSongMusicNoteSpriteTemplate, ANIM_ATTACKER, 4, 15, 0, 240 createsprite gPerishSongMusicNote2SpriteTemplate, ANIM_ATTACKER, 4, 15, 0, 0 delay 20 - panse_1B SE_W195, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 + panse_1B SE_M_PERISH_SONG, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 delay 80 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 0, 16, RGB_BLACK createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, 4, 0 @@ -7964,21 +7964,21 @@ Move_SLEEP_TALK: createvisualtask AnimTask_SwayMon, 5, 0, 4, 4096, 2, ANIM_ATTACKER delay 20 createsprite gLetterZSpriteTemplate, ANIM_TARGET, 2, 0, 20, 5, -1 - playsewithpan SE_W173, SOUND_PAN_ATTACKER + playsewithpan SE_M_SNORE, SOUND_PAN_ATTACKER 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, SOUND_PAN_ATTACKER + playsewithpan SE_M_SNORE, SOUND_PAN_ATTACKER 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, SOUND_PAN_ATTACKER + playsewithpan SE_M_SNORE, SOUND_PAN_ATTACKER delay 6 createsprite gLetterZSpriteTemplate, ANIM_TARGET, 2, 0, 20, 5, -3 delay 6 @@ -7988,7 +7988,7 @@ Move_SLEEP_TALK: Move_HYPER_FANG: loadspritegfx ANIM_TAG_FANG_ATTACK - playsewithpan SE_W044, SOUND_PAN_TARGET + playsewithpan SE_M_BITE, SOUND_PAN_TARGET delay 1 delay 2 createvisualtask AnimTask_IsContest, 2 @@ -8001,7 +8001,7 @@ HyperFangContinue: createsprite gFangSpriteTemplate, ANIM_TARGET, 2 waitbgfadein createvisualtask AnimTask_ShakeMon, 3, ANIM_TARGET, 0, 10, 10, 1 - playsewithpan SE_W043, SOUND_PAN_TARGET + playsewithpan SE_M_LEER, SOUND_PAN_TARGET delay 20 restorebg waitbgfadein @@ -8020,17 +8020,17 @@ HyperFangInContest: Move_TRI_ATTACK: loadspritegfx ANIM_TAG_TRI_ATTACK_TRIANGLE createsprite gTriAttackTriangleSpriteTemplate, ANIM_TARGET, 2, 16, 0 - playsewithpan SE_W161, SOUND_PAN_ATTACKER + playsewithpan SE_M_TRI_ATTACK, SOUND_PAN_ATTACKER delay 20 - playsewithpan SE_W161, SOUND_PAN_ATTACKER + playsewithpan SE_M_TRI_ATTACK, SOUND_PAN_ATTACKER delay 20 - createsoundtask SoundTask_LoopSEAdjustPanning, SE_W161, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 5, 6, 0, 7 + createsoundtask SoundTask_LoopSEAdjustPanning, SE_M_TRI_ATTACK, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 5, 6, 0, 7 waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 16, RGB_BLACK delay 16 loadspritegfx ANIM_TAG_FIRE createsprite gLargeFlameScatterSpriteTemplate, ANIM_TARGET, 2, 0, 0, 30, 30, -1, 0 - playsewithpan SE_W172B, SOUND_PAN_TARGET + playsewithpan SE_M_FLAME_WHEEL2, SOUND_PAN_TARGET createsprite gLargeFlameScatterSpriteTemplate, ANIM_TARGET, 2, 0, 0, 30, 30, 0, 1 delay 1 createsprite gLargeFlameScatterSpriteTemplate, ANIM_TARGET, 2, 0, 0, 30, 30, -1, -1 @@ -8049,7 +8049,7 @@ Move_TRI_ATTACK: waitforvisualfinish loadspritegfx ANIM_TAG_LIGHTNING createvisualtask AnimTask_InvertScreenColor, 2, 257, 257, 257 - playsewithpan SE_W161B, SOUND_PAN_TARGET + playsewithpan SE_M_TRI_ATTACK2, SOUND_PAN_TARGET createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, 0, -48 delay 1 createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, 0, -16 @@ -8071,8 +8071,8 @@ Move_WILL_O_WISP: loadspritegfx ANIM_TAG_WISP_ORB monbg ANIM_DEF_PARTNER monbgprio_2A ANIM_TARGET - playsewithpan SE_W052, SOUND_PAN_ATTACKER - waitplaysewithpan SE_W052, SOUND_PAN_ATTACKER, 10 + playsewithpan SE_M_EMBER, SOUND_PAN_ATTACKER + waitplaysewithpan SE_M_EMBER, SOUND_PAN_ATTACKER, 10 createvisualtask SoundTask_AdjustPanningVar, 2, SOUND_PAN_ATTACKER, SOUND_PAN_ATTACKER, 1, 0 createsprite gWillOWispOrbSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 0 delay 3 @@ -8085,7 +8085,7 @@ Move_WILL_O_WISP: createvisualtask SoundTask_AdjustPanningVar, 2, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0 waitforvisualfinish monbgprio_29 - playsewithpan SE_W172B, SOUND_PAN_TARGET + playsewithpan SE_M_FLAME_WHEEL2, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 13, 1 createsprite gWillOWispFireSpriteTemplate, ANIM_ATTACKER, 2, 0 createsprite gWillOWispFireSpriteTemplate, ANIM_ATTACKER, 2, 42 @@ -8109,7 +8109,7 @@ Move_ENCORE: createsprite gClappingHand2SpriteTemplate, ANIM_ATTACKER, 3, -2, 0, 0, 0, 9 createsprite gClappingHand2SpriteTemplate, ANIM_ATTACKER, 3, 2, 0, 1, 0, 9 delay 16 - createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_W227B, SOUND_PAN_TARGET + createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_M_ENCORE2, SOUND_PAN_TARGET createvisualtask AnimTask_SwayMon, 5, 1, 8, 1536, 5, ANIM_TARGET waitforvisualfinish createvisualtask AnimTask_HardwarePaletteFade, 2, 248, 3, 10, 0, 1 @@ -8123,23 +8123,23 @@ Move_TRICK: 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, ANIM_ATTACKER, 5, 0, 7, 2 createvisualtask AnimTask_ShakeMon, 3, ANIM_TARGET, 5, 0, 7, 2 waitforvisualfinish @@ -8150,11 +8150,11 @@ Move_WISH: loadspritegfx ANIM_TAG_SPARKLE_2 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 0, 10, RGB_BLACK waitforvisualfinish - panse_27 SE_W115, SOUND_PAN_TARGET, SOUND_PAN_ATTACKER, -3, 0 + panse_27 SE_M_REFLECT, SOUND_PAN_TARGET, SOUND_PAN_ATTACKER, -3, 0 createsprite gWishStarSpriteTemplate, ANIM_ATTACKER, 40 waitforvisualfinish delay 60 - loopsewithpan SE_W215, SOUND_PAN_ATTACKER, 16, 3 + loopsewithpan SE_M_HEAL_BELL, SOUND_PAN_ATTACKER, 16, 3 call GrantingStarsEffect waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 10, 0, RGB_BLACK @@ -8163,7 +8163,7 @@ Move_WISH: Move_STOCKPILE: loadspritegfx ANIM_TAG_GRAY_ORB - playsewithpan SE_W025, SOUND_PAN_ATTACKER + playsewithpan SE_M_MEGA_KICK, SOUND_PAN_ATTACKER createvisualtask AnimTask_BlendColorCycle, 2, 2, 8, 1, 0, 12, RGB_WHITE createvisualtask AnimTask_StockpileDeformMon, 5 call StockpileAbsorb @@ -8193,11 +8193,11 @@ StockpileAbsorb: Move_SPIT_UP: loadspritegfx ANIM_TAG_RED_ORB_2 loadspritegfx ANIM_TAG_IMPACT - playsewithpan SE_W036, SOUND_PAN_ATTACKER + playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER createvisualtask AnimTask_SpitUpDeformMon, 5 createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 8, 2 delay 45 - playsewithpan SE_W255, SOUND_PAN_ATTACKER + playsewithpan SE_M_SPIT_UP, SOUND_PAN_ATTACKER delay 3 createsprite gSpitUpOrbSpriteTemplate, ANIM_ATTACKER, 2, 0, 12 createsprite gSpitUpOrbSpriteTemplate, ANIM_ATTACKER, 2, 32, 12 @@ -8213,10 +8213,10 @@ Move_SPIT_UP: SpitUpContinue: delay 5 createvisualtask AnimTask_ShakeTargetBasedOnMovePowerOrDmg, 2, FALSE, 1, 8, 1, 0 - playsewithpan SE_W003, SOUND_PAN_TARGET + playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, -12, 10, ANIM_TARGET, 1 delay 5 - playsewithpan SE_W003, SOUND_PAN_TARGET + playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, 12, -10, ANIM_TARGET, 1 waitforvisualfinish end @@ -8240,11 +8240,11 @@ SpitUpStrongest: Move_SWALLOW: loadspritegfx ANIM_TAG_BLUE_ORB loadspritegfx ANIM_TAG_BLUE_STAR - playsewithpan SE_W036, SOUND_PAN_ATTACKER + playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER createvisualtask AnimTask_SwallowDeformMon, 5 createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 8, 2 delay 38 - playsewithpan SE_W255, SOUND_PAN_ATTACKER + playsewithpan SE_M_SPIT_UP, SOUND_PAN_ATTACKER createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 2, 0, 12, 1 call SwallowEffect jumpifmoveturn 2, SwallowGood @@ -8275,8 +8275,8 @@ SwallowBest: Move_TRANSFORM: monbg ANIM_ATTACKER - playsewithpan SE_W100, SOUND_PAN_ATTACKER - waitplaysewithpan SE_W107, SOUND_PAN_ATTACKER, 48 + playsewithpan SE_M_TELEPORT, SOUND_PAN_ATTACKER + waitplaysewithpan SE_M_MINIMIZE, SOUND_PAN_ATTACKER, 48 createvisualtask AnimTask_TransformMon, 2, 0 waitforvisualfinish clearmonbg ANIM_ATTACKER @@ -8316,7 +8316,7 @@ MorningSunStar: Move_SWEET_SCENT: loadspritegfx ANIM_TAG_PINK_PETAL - playsewithpan SE_W230, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWEET_SCENT, SOUND_PAN_ATTACKER createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 100, 0, 100 delay 25 setpan 0 @@ -8357,11 +8357,11 @@ Move_HYPER_BEAM: createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 4, 0, 16, RGB_BLACK waitforvisualfinish delay 10 - playsewithpan SE_W063, SOUND_PAN_ATTACKER + playsewithpan SE_M_HYPER_BEAM, SOUND_PAN_ATTACKER createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 4, 1 waitforvisualfinish delay 30 - createsoundtask SoundTask_LoopSEAdjustPanning, SE_W063B, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 1, 15, 0, 5 + createsoundtask SoundTask_LoopSEAdjustPanning, SE_M_HYPER_BEAM2, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 1, 15, 0, 5 createvisualtask AnimTask_ShakeMon, 2, ANIM_ATTACKER, 0, 4, 50, 1 createvisualtask AnimTask_FlashAnimTagWithColor, 2, ANIM_TAG_ORBS, 1, 12, RGB(31, 0, 0), 16, 0, 0 call HyperBeamOrbs @@ -8405,7 +8405,7 @@ HyperBeamOrbs: Move_FLATTER: loadspritegfx ANIM_TAG_SPOTLIGHT loadspritegfx ANIM_TAG_CONFETTI - createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_W227B, SOUND_PAN_TARGET + createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_M_ENCORE2, SOUND_PAN_TARGET createvisualtask AnimTask_CreateSpotlight, 2 createvisualtask AnimTask_HardwarePaletteFade, 2, 248, 3, 0, 10, 0 waitforvisualfinish @@ -8415,7 +8415,7 @@ Move_FLATTER: delay 10 createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 5, 2, ANIM_TARGET delay 0 - createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_W260, SOUND_PAN_ATTACKER + createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_FLATTER, SOUND_PAN_ATTACKER call CreateFlatterConfetti call CreateFlatterConfetti call CreateFlatterConfetti @@ -8436,7 +8436,7 @@ Move_FLATTER: call CreateFlatterConfetti call CreateFlatterConfetti delay 5 - createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_W260, SOUND_PAN_TARGET + createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_FLATTER, SOUND_PAN_TARGET waitforvisualfinish createvisualtask AnimTask_HardwarePaletteFade, 2, 248, 3, 10, 0, 1 waitforvisualfinish @@ -8452,8 +8452,8 @@ Move_ROLE_PLAY: createvisualtask AnimTask_BlendBattleAnimPal, 10, 4, 2, 0, 16, RGB_WHITE createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 10, RGB_BLACK waitforvisualfinish - playsewithpan SE_W161, SOUND_PAN_ATTACKER - waitplaysewithpan SE_W197, SOUND_PAN_ATTACKER, 30 + playsewithpan SE_M_TRI_ATTACK, SOUND_PAN_ATTACKER + waitplaysewithpan SE_M_DETECT, SOUND_PAN_ATTACKER, 30 createvisualtask AnimTask_RolePlaySilhouette, 2 waitforvisualfinish clearmonbg ANIM_ATK_PARTNER @@ -8465,13 +8465,13 @@ Move_ROLE_PLAY: Move_REFRESH: loadspritegfx ANIM_TAG_THIN_RING loadspritegfx ANIM_TAG_SPARKLE_2 - playsewithpan SE_W287, SOUND_PAN_ATTACKER + playsewithpan SE_M_STAT_INCREASE, SOUND_PAN_ATTACKER createvisualtask AnimTask_StatusClearedEffect, 2, 0 waitforvisualfinish - playsewithpan SE_W234, SOUND_PAN_ATTACKER + playsewithpan SE_M_MORNING_SUN, SOUND_PAN_ATTACKER call GrantingStarsEffect waitforvisualfinish - playsewithpan SE_REAPOKE, SOUND_PAN_ATTACKER + playsewithpan SE_SHINY, SOUND_PAN_ATTACKER createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 10, 0, RGB(12, 24, 30) createsprite gThinRingExpandingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0 end @@ -8482,11 +8482,11 @@ Move_BLAZE_KICK: loadspritegfx ANIM_TAG_SMALL_EMBER monbg ANIM_TARGET setalpha 12, 8 - playsewithpan SE_W172, SOUND_PAN_TARGET + playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_TARGET createsprite gSpinningHandOrFootSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 30 createvisualtask AnimTask_BlendBattleAnimPal, 10, 4, 2, 0, 7, RGB_WHITE delay 30 - playsewithpan SE_W007, SOUND_PAN_TARGET + playsewithpan SE_M_FIRE_PUNCH, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 0, 0, ANIM_TARGET, 0 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 14, 1 createvisualtask AnimTask_BlendBattleAnimPal, 10, 4, 2, 0, 0, RGB_WHITE @@ -8521,7 +8521,7 @@ Move_SAND_TOMB: loadspritegfx ANIM_TAG_MUD_SAND createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 4, 2, 0, 7, RGB(19, 17, 0) createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 2, 43, 1 - playsewithpan SE_W328, SOUND_PAN_TARGET + playsewithpan SE_M_SAND_TOMB, SOUND_PAN_TARGET call SandTombSwirlingDirt call SandTombSwirlingDirt call SandTombSwirlingDirt @@ -8548,14 +8548,14 @@ SandTombSwirlingDirt: Move_SHEER_COLD: fadetobg BG_ICE waitbgfadeout - playsewithpan SE_W196, 0 + playsewithpan SE_M_ICY_WIND, 0 waitbgfadein loadspritegfx ANIM_TAG_ICE_CUBE monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET setalpha 12, 8 createvisualtask AnimTask_FrozenIceCube, 2 - waitplaysewithpan SE_W258, SOUND_PAN_TARGET, 17 + waitplaysewithpan SE_M_HAIL, SOUND_PAN_TARGET, 17 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -8572,11 +8572,11 @@ Move_ARM_THRUST: delay 6 createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 3 delay 4 - playsewithpan SE_W207, SOUND_PAN_TARGET + playsewithpan SE_M_SWAGGER, SOUND_PAN_TARGET createsprite gArmThrustHandSpriteTemplate, ANIM_TARGET, 2, 10, -8, 14, 3 waitforvisualfinish createvisualtask AnimTask_RotateMonSpriteToSide, 5, 8, 5, 0, 1 - playsewithpan SE_W003, SOUND_PAN_TARGET + playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET choosetwoturnanim ArmThrustRight, ArmThrustLeft ArmThrustContinue: createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 4, 0, 6, 1 @@ -8591,7 +8591,7 @@ ArmThrustLeft: goto ArmThrustContinue Move_MUDDY_WATER: - panse_1B SE_W250, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 + panse_1B SE_M_WHIRLPOOL, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 createvisualtask AnimTask_CreateSurfWave, 2, TRUE waitforvisualfinish end @@ -8624,7 +8624,7 @@ Move_BULLET_SEED: Move_DRAGON_CLAW: loadspritegfx ANIM_TAG_SMALL_EMBER loadspritegfx ANIM_TAG_CLAW_SLASH - playsewithpan SE_W221B, SOUND_PAN_ATTACKER + playsewithpan SE_M_SACRED_FIRE2, SOUND_PAN_ATTACKER createvisualtask AnimTask_BlendBattleAnimPal, 10, 2, 4, 0, 8, RGB(31, 19, 0) createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 15, 1 call DragonClawFireSpiral @@ -8632,7 +8632,7 @@ Move_DRAGON_CLAW: createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 6, 4 createsprite gFireSpinSpriteTemplate, ANIM_ATTACKER, 2, 0, 28, 528, 30, 13, 50, ANIM_ATTACKER delay 2 - createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_W013, SOUND_PAN_TARGET + createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_RAZOR_WIND, SOUND_PAN_TARGET 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 @@ -8645,7 +8645,7 @@ Move_DRAGON_CLAW: createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 6, 4 createsprite gFireSpinSpriteTemplate, ANIM_ATTACKER, 2, 0, 28, 512, 25, 16, 46, ANIM_ATTACKER delay 2 - createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_W013, SOUND_PAN_TARGET + createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_RAZOR_WIND, SOUND_PAN_TARGET 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 @@ -8689,7 +8689,7 @@ Move_MUD_SHOT: createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 46, 1 delay 6 createvisualtask AnimTask_StartSinAnimTimer, 5, 100 - panse_1B SE_W250, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +1, 0 + panse_1B SE_M_WHIRLPOOL, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +1, 0 call MudShotOrbs call MudShotOrbs call MudShotOrbs @@ -8717,7 +8717,7 @@ Move_METEOR_MASH: loadspritegfx ANIM_TAG_GOLD_STARS loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HANDS_AND_FEET - panse_1B SE_W112, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +3, 0 + panse_1B SE_M_BARRIER, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +3, 0 fadetobg BG_COSMIC waitbgfadein waitforvisualfinish @@ -8728,7 +8728,7 @@ Move_METEOR_MASH: createsprite gSpinningHandOrFootSpriteTemplate, ANIM_TARGET, 3, 0, 0, 0, 30 createsprite gMeteorMashStarSpriteTemplate, ANIM_TARGET, 3, -80, -64, 40, 32, 30 delay 20 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, ANIM_TARGET, 1 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 5, 0, 20, 1 waitforvisualfinish @@ -8742,7 +8742,7 @@ Move_REVENGE: loadspritegfx ANIM_TAG_PURPLE_SCRATCH monbg ANIM_TARGET setalpha 12, 8 - playsewithpan SE_W036, SOUND_PAN_ATTACKER + playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER createsprite gRevengeSmallScratchSpriteTemplate, ANIM_ATTACKER, 2, 10, -10 waitforvisualfinish createvisualtask AnimTask_BlendColorCycle, 2, 2, 0, 4, 2, 8, RGB_RED @@ -8751,17 +8751,17 @@ Move_REVENGE: loadspritegfx ANIM_TAG_PURPLE_SWIPE createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 6, 4 delay 4 - playsewithpan SE_W207, SOUND_PAN_TARGET + playsewithpan SE_M_SWAGGER, SOUND_PAN_TARGET createsprite gRevengeBigScratchSpriteTemplate, ANIM_TARGET, 2, 10, -10 waitforvisualfinish unloadspritegfx ANIM_TAG_PURPLE_SWIPE loadspritegfx ANIM_TAG_IMPACT createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 10, 1 createsprite gPersistHitSplatSpriteTemplate, ANIM_TARGET, 3, -10, -8, ANIM_TARGET, 1, 8 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET delay 8 createsprite gPersistHitSplatSpriteTemplate, ANIM_TARGET, 3, 10, 8, ANIM_TARGET, 1, 8 - playsewithpan SE_W025B, SOUND_PAN_TARGET + playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_TARGET blendoff @@ -8770,7 +8770,7 @@ Move_REVENGE: Move_POISON_FANG: loadspritegfx ANIM_TAG_FANG_ATTACK loadspritegfx ANIM_TAG_POISON_BUBBLE - playsewithpan SE_W044, SOUND_PAN_TARGET + playsewithpan SE_M_BITE, SOUND_PAN_TARGET createsprite gFangSpriteTemplate, ANIM_TARGET, 2 delay 10 createvisualtask AnimTask_ShakeMon, 3, ANIM_TARGET, 3, 0, 10, 1 @@ -8781,7 +8781,7 @@ Move_POISON_FANG: end Move_SUBSTITUTE: - playsewithpan SE_W213, SOUND_PAN_ATTACKER + playsewithpan SE_M_ATTRACT, SOUND_PAN_ATTACKER createvisualtask AnimTask_MonToSubstitute, 2 end @@ -8794,50 +8794,50 @@ Move_FRENZY_PLANT: createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 1, 2, 0, 5, RGB_BLACK waitforvisualfinish createsprite gFrenzyPlantRootSpriteTemplate, ANIM_ATTACKER, 2, 10, 8, 2, 0, 0, 100 - playsewithpan SE_W010, SOUND_PAN_ATTACKER + playsewithpan SE_M_SCRATCH, SOUND_PAN_ATTACKER delay 5 createsprite gFrenzyPlantRootSpriteTemplate, ANIM_ATTACKER, 2, 20, -8, -2, 0, 1, 95 - playsewithpan SE_W010, -43 + playsewithpan SE_M_SCRATCH, -43 delay 5 createsprite gFrenzyPlantRootSpriteTemplate, ANIM_ATTACKER, 2, 30, 8, -4, 0, 0, 90 - playsewithpan SE_W010, -22 + playsewithpan SE_M_SCRATCH, -22 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, SOUND_PAN_TARGET + playsewithpan SE_M_SCRATCH, SOUND_PAN_TARGET delay 5 createsprite gFrenzyPlantRootSpriteTemplate, ANIM_ATTACKER, 2, 85, 16, 6, 0, 3, 80 - playsewithpan SE_W010, SOUND_PAN_TARGET + playsewithpan SE_M_SCRATCH, SOUND_PAN_TARGET delay 5 createsprite gFrenzyPlantRootSpriteTemplate, ANIM_ATTACKER, 2, 85, -16, -6, 0, 2, 75 - playsewithpan SE_W010, SOUND_PAN_TARGET + playsewithpan SE_M_SCRATCH, SOUND_PAN_TARGET delay 5 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -10, -10, ANIM_TARGET, 3 - playsewithpan SE_W003, SOUND_PAN_TARGET + playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 3, ANIM_TARGET, 8, 0, 20, 1 delay 3 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 10, 8, ANIM_TARGET, 3 - playsewithpan SE_W003, SOUND_PAN_TARGET + playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET delay 3 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 10, -3, ANIM_TARGET, 2 - playsewithpan SE_W003, SOUND_PAN_TARGET + playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET delay 3 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -3, 1, ANIM_TARGET, 2 - playsewithpan SE_W003, SOUND_PAN_TARGET + playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET delay 2 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -10, 1, ANIM_TARGET, 1 - playsewithpan SE_W003, SOUND_PAN_TARGET + playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET delay 2 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 10, ANIM_TARGET, 1 - playsewithpan SE_W003, SOUND_PAN_TARGET + playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 1, 2, 5, 0, RGB_BLACK waitforvisualfinish @@ -8860,7 +8860,7 @@ Move_METAL_SOUND: waitforvisualfinish end MetalSoundRings: - panse_1B SE_W103, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 + panse_1B SE_M_SCREECH, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 createsprite gMetalSoundSpriteTemplate, ANIM_TARGET, 2, 16, 0, 0, 0, 30, 0 delay 2 return @@ -8883,20 +8883,20 @@ FocusPunchContinue: waitbgfadein monbg ANIM_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W207, SOUND_PAN_TARGET + playsewithpan SE_M_SWAGGER, SOUND_PAN_TARGET createsprite gFocusPunchFistSpriteTemplate, ANIM_TARGET, 2 delay 10 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -10, -8, ANIM_TARGET, 0 createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 8, 0, 24, 1 delay 8 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 10, 2, ANIM_TARGET, 0 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET delay 8 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 10, -6, ANIM_TARGET, 0 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET delay 8 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 8, ANIM_TARGET, 0 - playsewithpan SE_W025B, SOUND_PAN_TARGET + playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET waitforvisualfinish restorebg waitbgfadein @@ -8930,94 +8930,94 @@ ReturnContinue: end ReturnWeak: createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 16, 1, ANIM_ATTACKER - createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_W039, SOUND_PAN_ATTACKER + createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER waitforvisualfinish createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 16, 1, ANIM_ATTACKER - createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_W039, SOUND_PAN_ATTACKER + createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER delay 5 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -10, -8, ANIM_TARGET, 2 - createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_W004, SOUND_PAN_TARGET + createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_COMET_PUNCH, SOUND_PAN_TARGET goto ReturnContinue ReturnMedium: createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 6, 1, ANIM_ATTACKER - createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_W039, SOUND_PAN_ATTACKER + createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER waitforvisualfinish createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 6, 1, ANIM_ATTACKER - createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_W039, SOUND_PAN_ATTACKER + createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER waitforvisualfinish delay 11 createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 5, 4 delay 6 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, ANIM_TARGET, 2 - createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_W025B, SOUND_PAN_TARGET + createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_MEGA_KICK2, SOUND_PAN_TARGET goto ReturnContinue ReturnStrong: createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 6, 1, ANIM_ATTACKER - createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_W039, SOUND_PAN_ATTACKER + createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER waitforvisualfinish createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 6, 1, ANIM_ATTACKER - createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_W039, SOUND_PAN_ATTACKER + createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER waitforvisualfinish createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 6, 1, ANIM_ATTACKER - createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_W039, SOUND_PAN_ATTACKER + createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER waitforvisualfinish createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 6, 1, ANIM_ATTACKER - createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_W039, SOUND_PAN_ATTACKER + createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER waitforvisualfinish createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -10, -8, ANIM_TARGET, 2 - createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_W233B, SOUND_PAN_TARGET + createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_VITAL_THROW2, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1 delay 8 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 10, 10, ANIM_TARGET, 2 - createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_W233B, SOUND_PAN_TARGET + createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_VITAL_THROW2, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1 delay 8 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 3, -5, ANIM_TARGET, 2 - createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_W233B, SOUND_PAN_TARGET + createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_VITAL_THROW2, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1 delay 8 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -5, 3, ANIM_TARGET, 2 - createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_W233B, SOUND_PAN_TARGET + createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_VITAL_THROW2, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1 goto ReturnContinue ReturnStrongest: createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 0, 6, RGB_BLACK waitforvisualfinish createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 16, 1, ANIM_ATTACKER - createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_W039, SOUND_PAN_ATTACKER + createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER delay 8 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 3, -5, ANIM_TARGET, 2 - createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_W233B, SOUND_PAN_TARGET + createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_VITAL_THROW2, SOUND_PAN_TARGET waitforvisualfinish createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 12, 1, ANIM_ATTACKER - createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_W039, SOUND_PAN_ATTACKER + createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER delay 5 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -10, -8, ANIM_TARGET, 2 - createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_W233B, SOUND_PAN_TARGET + createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_VITAL_THROW2, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1 waitforvisualfinish delay 4 createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 8, 1, ANIM_ATTACKER - createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_W039, SOUND_PAN_ATTACKER + createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER delay 5 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -10, -8, ANIM_TARGET, 2 - createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_W233B, SOUND_PAN_TARGET + createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_VITAL_THROW2, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1 waitforvisualfinish delay 2 createvisualtask AnimTask_TraceMonBlended, 2, 0, 4, 5, 1 createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 4, 1, ANIM_ATTACKER - createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_W039, SOUND_PAN_ATTACKER + createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -10, -8, ANIM_TARGET, 2 - createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_W233B, SOUND_PAN_TARGET + createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_VITAL_THROW2, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1 createvisualtask AnimTask_TraceMonBlended, 2, 0, 4, 5, 1 waitforvisualfinish createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 4, 2, ANIM_ATTACKER - createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_W039, SOUND_PAN_ATTACKER + createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER delay 5 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -10, -8, ANIM_TARGET, 2 - createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_W233B, SOUND_PAN_TARGET + createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_VITAL_THROW2, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1 createvisualtask AnimTask_TraceMonBlended, 2, 0, 4, 5, 1 waitforvisualfinish @@ -9026,25 +9026,25 @@ ReturnStrongest: call ReturnStrongestHit call ReturnStrongestHit createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -10, -8, ANIM_TARGET, 0 - createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_W025B, SOUND_PAN_TARGET + createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_MEGA_KICK2, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 8, 0, 24, 1 delay 6 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 10, 10, ANIM_TARGET, 0 - createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_W025B, SOUND_PAN_TARGET + createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_MEGA_KICK2, SOUND_PAN_TARGET delay 6 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 3, -5, ANIM_TARGET, 0 - createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_W025B, SOUND_PAN_TARGET + createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_MEGA_KICK2, SOUND_PAN_TARGET delay 6 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -5, 3, ANIM_TARGET, 0 - createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_W025B, SOUND_PAN_TARGET + createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_MEGA_KICK2, SOUND_PAN_TARGET waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 6, 0, RGB_BLACK goto ReturnContinue ReturnStrongestHit: createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 4, 3, ANIM_ATTACKER - createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_W039, SOUND_PAN_ATTACKER + createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_TARGET, 2 - createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_W233B, SOUND_PAN_TARGET + createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_VITAL_THROW2, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1 createvisualtask AnimTask_TraceMonBlended, 2, 0, 4, 5, 1 waitforvisualfinish @@ -9052,8 +9052,8 @@ ReturnStrongestHit: Move_COSMIC_POWER: loadspritegfx ANIM_TAG_SPARKLE_2 - createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_W322, 0 - playsewithpan SE_W322, 0 + createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_M_COSMIC_POWER, 0 + playsewithpan SE_M_COSMIC_POWER, 0 createvisualtask AnimTask_BlendNonAttackerPalettes, 2, 0, 0, 15, RGB_BLACK waitforvisualfinish fadetobg BG_COSMIC @@ -9061,7 +9061,7 @@ Move_COSMIC_POWER: createvisualtask AnimTask_StartSlidingBg, 2, 0, 128, 0, -1 waitbgfadein delay 70 - createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_W234, SOUND_PAN_ATTACKER + createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_MORNING_SUN, SOUND_PAN_ATTACKER createsprite gGrantingStarsSpriteTemplate, ANIM_ATTACKER, 2, -15, 0, 0, 0, 32, 60 delay 8 createsprite gGrantingStarsSpriteTemplate, ANIM_ATTACKER, 2, 12, -5, 0, 0, 32, 60 @@ -9080,7 +9080,7 @@ Move_BLAST_BURN: loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W221, SOUND_PAN_ATTACKER + playsewithpan SE_M_SACRED_FIRE, SOUND_PAN_ATTACKER 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 @@ -9090,7 +9090,7 @@ Move_BLAST_BURN: 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, SOUND_PAN_ATTACKER + playsewithpan SE_M_FLAME_WHEEL2, SOUND_PAN_ATTACKER 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 @@ -9102,7 +9102,7 @@ Move_BLAST_BURN: createsprite gFirePlumeSpriteTemplate, ANIM_ATTACKER, 2, -40, 20, 24, 0, 0, 0 createvisualtask AnimTask_InvertScreenColor, 2, 257, 257, 257 delay 25 - playsewithpan SE_W172B, SOUND_PAN_ATTACKER + playsewithpan SE_M_FLAME_WHEEL2, SOUND_PAN_ATTACKER 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 @@ -9128,24 +9128,24 @@ Move_ROCK_TOMB: createsprite gRockTombRockSpriteTemplate, ANIM_TARGET, 2, 20, 12, 64, 114, 0 delay 8 createvisualtask AnimTask_ShakeBattleTerrain, 2, 0, 2, 3, 1 - playsewithpan SE_W070, SOUND_PAN_TARGET + playsewithpan SE_M_STRENGTH, SOUND_PAN_TARGET 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, SOUND_PAN_TARGET + playsewithpan SE_M_STRENGTH, SOUND_PAN_TARGET 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, SOUND_PAN_TARGET + playsewithpan SE_M_STRENGTH, SOUND_PAN_TARGET 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, SOUND_PAN_TARGET + playsewithpan SE_M_STRENGTH, SOUND_PAN_TARGET delay 24 - playsewithpan SE_W063, SOUND_PAN_TARGET + playsewithpan SE_M_HYPER_BEAM, SOUND_PAN_TARGET createsprite gRedXSpriteTemplate, ANIM_TARGET, 5, ANIM_TARGET, 50 createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 3, 0, 20, 1 createvisualtask AnimTask_ShakeBattleTerrain, 2, 2, 0, 10, 1 @@ -9154,8 +9154,8 @@ Move_ROCK_TOMB: Move_SILVER_WIND: loadspritegfx ANIM_TAG_SPARKLE_6 - panse_1B SE_W016, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 - playsewithpan SE_W234, 0 + panse_1B SE_M_GUST, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 + playsewithpan SE_M_MORNING_SUN, 0 delay 0 monbg ANIM_DEF_PARTNER monbgprio_29 @@ -9194,7 +9194,7 @@ SilverWindContinue: 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, SOUND_PAN_TARGET + playsewithpan SE_M_GUST2, SOUND_PAN_TARGET clearmonbg ANIM_DEF_PARTNER delay 0 restorebg @@ -9210,7 +9210,7 @@ SilverWindOnPlayer: goto SilverWindContinue Move_SNATCH: - playsewithpan SE_W036, SOUND_PAN_ATTACKER + playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER createvisualtask AnimTask_WindUpLunge, 5, ANIM_ATTACKER, -12, 4, 10, 10, 12, 6 end @@ -9220,10 +9220,10 @@ Move_DIVE: choosetwoturnanim DiveSetUp, DiveAttack DiveSetUp: loadspritegfx ANIM_TAG_ROUND_SHADOW - playsewithpan SE_W029, SOUND_PAN_ATTACKER + playsewithpan SE_M_HEADBUTT, SOUND_PAN_ATTACKER createsprite gDiveBallSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 13, 336 waitforvisualfinish - playsewithpan SE_W291, SOUND_PAN_ATTACKER + playsewithpan SE_M_DIVE, SOUND_PAN_ATTACKER createsprite gDiveWaterSplashSpriteTemplate, ANIM_ATTACKER, 3, 0 call DiveSetUpWaterDroplets call DiveSetUpWaterDroplets @@ -9240,7 +9240,7 @@ DiveAttack: loadspritegfx ANIM_TAG_SMALL_BUBBLES monbg ANIM_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W153, SOUND_PAN_TARGET + playsewithpan SE_M_EXPLOSION, SOUND_PAN_TARGET createsprite gDiveWaterSplashSpriteTemplate, ANIM_TARGET, 3, 1 call DiveAttackWaterDroplets call DiveAttackWaterDroplets @@ -9264,11 +9264,11 @@ Move_ROCK_BLAST: loadspritegfx ANIM_TAG_IMPACT createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 6 delay 3 - playsewithpan SE_W207, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER createsprite gRockBlastRockSpriteTemplate, ANIM_TARGET, 2, 16, 0, 0, 0, 25, 257 waitforvisualfinish createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, ANIM_TARGET, 1 - playsewithpan SE_W088, SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET createsprite gRockFragmentSpriteTemplate, ANIM_TARGET, 2, 0, 0, 20, 24, 14, 2 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 5, 1 createsprite gRockFragmentSpriteTemplate, ANIM_TARGET, 2, 5, 0, -20, 24, 14, 1 @@ -9290,13 +9290,13 @@ Move_OVERHEAT: delay 1 createvisualtask AnimTask_CopyPalFadedToUnfaded, 5, 0 delay 1 - playsewithpan SE_W082, SOUND_PAN_ATTACKER + playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER createvisualtask AnimTask_CopyPalUnfadedToBackup, 5, 1, 0 delay 1 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 2, 1, 0, 13, RGB(28, 0, 0) createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 2, 0, 15, 1 waitforvisualfinish - playsewithpan SE_W172B, SOUND_PAN_ATTACKER + playsewithpan SE_M_FLAME_WHEEL2, SOUND_PAN_ATTACKER 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 @@ -9326,17 +9326,17 @@ Move_OVERHEAT: delay 5 waitforvisualfinish createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, -5, 3, ANIM_TARGET, 0 - playsewithpan SE_W007, SOUND_PAN_TARGET + playsewithpan SE_M_FIRE_PUNCH, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 10, 0, 25, 1 delay 6 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 8, -5, ANIM_TARGET, 0 - playsewithpan SE_W007, SOUND_PAN_TARGET + playsewithpan SE_M_FIRE_PUNCH, SOUND_PAN_TARGET delay 8 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 10, 10, ANIM_TARGET, 0 - playsewithpan SE_W007, SOUND_PAN_TARGET + playsewithpan SE_M_FIRE_PUNCH, SOUND_PAN_TARGET delay 8 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, ANIM_TARGET, 0 - playsewithpan SE_W007, SOUND_PAN_TARGET + playsewithpan SE_M_FIRE_PUNCH, SOUND_PAN_TARGET createvisualtask AnimTask_CopyPalFadedToUnfaded, 5, 1 delay 1 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 2, -1, 0, 13, RGB(18, 18, 18) @@ -9363,12 +9363,12 @@ Move_HYDRO_CANNON: loadspritegfx ANIM_TAG_WATER_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W057, SOUND_PAN_ATTACKER + playsewithpan SE_M_SURF, SOUND_PAN_ATTACKER createsprite gHydroCannonChargeSpriteTemplate, ANIM_TARGET, 2 delay 10 createvisualtask AnimTask_InvertScreenColor, 2, 257, 257, 257 delay 30 - panse_1B SE_W056, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 + panse_1B SE_M_HYDRO_PUMP, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 call HydroCannonBeam createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 10, 0, 40, 1 createsprite gWaterHitSplatSpriteTemplate, ANIM_TARGET, 2, 0, 0, ANIM_TARGET, 0 @@ -9402,11 +9402,11 @@ HydroCannonBeam: Move_ASTONISH: loadspritegfx ANIM_TAG_SWEAT_BEAD - playsewithpan SE_W227, SOUND_PAN_ATTACKER + playsewithpan SE_M_ENCORE, SOUND_PAN_ATTACKER createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 6 delay 25 createsprite gSprayWaterDropletSpriteTemplate, ANIM_TARGET, 5, 0, 1 - playsewithpan SE_W166, SOUND_PAN_TARGET + playsewithpan SE_M_SKETCH, SOUND_PAN_TARGET createsprite gSprayWaterDropletSpriteTemplate, ANIM_TARGET, 5, 1, 1 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 5, 1 createvisualtask AnimTask_StretchTargetUp, 3 @@ -9425,7 +9425,7 @@ Move_SEISMIC_TOSS: fadetobg BG_IN_AIR waitbgfadeout createvisualtask AnimTask_MoveSeismicTossBg, 3 - playsewithpan SE_W327, 0 + playsewithpan SE_M_SKY_UPPERCUT, 0 waitbgfadein waitforvisualfinish createvisualtask AnimTask_SeismicTossBgAccelerateDownAtEnd, 3 @@ -9463,7 +9463,7 @@ SeismicTossStrong: goto SeismicTossContinue SeismicTossRockScatter1: createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, -10, -8, ANIM_TARGET, 1 - playsewithpan SE_W070, SOUND_PAN_TARGET + playsewithpan SE_M_STRENGTH, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 5, 1 createsprite gRockScatterSpriteTemplate, ANIM_TARGET, 2, -12, 27, 2, 3 createsprite gRockScatterSpriteTemplate, ANIM_TARGET, 2, 8, 28, 3, 4 @@ -9472,7 +9472,7 @@ SeismicTossRockScatter1: return SeismicTossRockScatter2: createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 10, -8, ANIM_TARGET, 1 - playsewithpan SE_W088, SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 5, 1 createsprite gRockScatterSpriteTemplate, ANIM_TARGET, 2, -12, 32, 3, 4 createsprite gRockScatterSpriteTemplate, ANIM_TARGET, 2, 8, 31, 2, 2 @@ -9483,7 +9483,7 @@ SeismicTossRockScatter2: Move_MAGIC_COAT: loadspritegfx ANIM_TAG_ORANGE_LIGHT_WALL setalpha 0, 16 - waitplaysewithpan SE_W112, SOUND_PAN_ATTACKER, 15 + waitplaysewithpan SE_M_BARRIER, SOUND_PAN_ATTACKER, 15 createsprite gMagicCoatWallSpriteTemplate, ANIM_ATTACKER, 3, 40, 0, ANIM_TAG_ORANGE_LIGHT_WALL waitforvisualfinish delay 1 @@ -9495,7 +9495,7 @@ Move_WATER_PULSE: loadspritegfx ANIM_TAG_BLUE_RING_2 monbg ANIM_TARGET monbgprio_28 ANIM_TARGET - playsewithpan SE_W145C, SOUND_PAN_ATTACKER + playsewithpan SE_M_BUBBLE3, SOUND_PAN_ATTACKER createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 0, 7, RGB(0, 25, 28) delay 10 createsprite gWaterPulseBubbleSpriteTemplate, ANIM_ATTACKER, 66, 100, 100, 8, 1, 20, 40, 0 @@ -9503,15 +9503,15 @@ Move_WATER_PULSE: 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, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET waitforvisualfinish - playsewithpan SE_W202, SOUND_PAN_ATTACKER + playsewithpan SE_M_GIGA_DRAIN, SOUND_PAN_ATTACKER createsprite gWaterPulseRingSpriteTemplate, ANIM_TARGET, 2, 0, 0, 40, 15 delay 5 - playsewithpan SE_W202, SOUND_PAN_ATTACKER + playsewithpan SE_M_GIGA_DRAIN, SOUND_PAN_ATTACKER createsprite gWaterPulseRingSpriteTemplate, ANIM_TARGET, 2, 0, 0, 40, 15 delay 5 - playsewithpan SE_W202, SOUND_PAN_ATTACKER + playsewithpan SE_M_GIGA_DRAIN, SOUND_PAN_ATTACKER createsprite gWaterPulseRingSpriteTemplate, ANIM_TARGET, 2, 0, 0, 40, 15 delay 13 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 8, 18, 1 @@ -9535,13 +9535,13 @@ Move_PSYCHO_BOOST: setalpha 8, 8 delay 10 createvisualtask AnimTask_ShakeMon, 2, ANIM_ATTACKER, 3, 0, 240, 0 - loopsewithpan SE_W060B, SOUND_PAN_ATTACKER, 14, 10 + loopsewithpan SE_M_PSYBEAM2, SOUND_PAN_ATTACKER, 14, 10 createsprite gPsychoBoostOrbSpriteTemplate, ANIM_ATTACKER, 2 delay 110 - loopsewithpan SE_W060B, SOUND_PAN_ATTACKER, 7, 10 + loopsewithpan SE_M_PSYBEAM2, SOUND_PAN_ATTACKER, 7, 10 waitforvisualfinish createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, -8, 1, 24, 1 - playsewithpan SE_W043, SOUND_PAN_TARGET + playsewithpan SE_M_LEER, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_ATK_PARTNER blendoff @@ -9553,12 +9553,12 @@ Move_KNOCK_OFF: loadspritegfx ANIM_TAG_IMPACT createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 6 delay 4 - playsewithpan SE_W233, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW, SOUND_PAN_TARGET 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, ANIM_TARGET, 2 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 1, -12, 10, 0, 3 createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 5 delay 3 @@ -9577,7 +9577,7 @@ Move_DOOM_DESIRE: createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 0, 4, RGB_BLACK waitforvisualfinish setalpha 8, 8 - playsewithpan SE_W060, SOUND_PAN_ATTACKER + playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER createvisualtask AnimTask_ScaleMonAndRestore, 5, -4, -4, 15, ANIM_ATTACKER, 1 waitforvisualfinish delay 20 @@ -9594,7 +9594,7 @@ Move_SKY_UPPERCUT: monbgprio_28 ANIM_TARGET fadetobg BG_IN_AIR waitbgfadeout - playsewithpan SE_W327, SOUND_PAN_ATTACKER + playsewithpan SE_M_SKY_UPPERCUT, SOUND_PAN_ATTACKER createvisualtask AnimTask_MoveSkyUppercutBg, 5, 55 waitbgfadein setalpha 12, 8 @@ -9602,20 +9602,20 @@ Move_SKY_UPPERCUT: createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 28, 0, 0, 5 delay 4 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 6, 1 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, -28, 28, ANIM_TARGET, 1 delay 1 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, -15, 8, ANIM_TARGET, 1 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET delay 1 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, -5, -12, ANIM_TARGET, 1 delay 1 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, -32, ANIM_TARGET, 1 delay 1 - playsewithpan SE_W233B, SOUND_PAN_TARGET + playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 5, -52, ANIM_TARGET, 1 createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 1, -26, 16, 1, 4 delay 4 @@ -9651,7 +9651,7 @@ Move_TWISTER: loadspritegfx ANIM_TAG_ROCKS monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET - playsewithpan SE_W239, SOUND_PAN_TARGET + playsewithpan SE_M_TWISTER, SOUND_PAN_TARGET createsprite gTwisterLeafSpriteTemplate, ANIM_TARGET, 2, 120, 70, 5, 70, 30 delay 1 createsprite gTwisterLeafSpriteTemplate, ANIM_TARGET, 2, 115, 55, 6, 60, 25 @@ -9674,18 +9674,18 @@ Move_TWISTER: createsprite gTwisterLeafSpriteTemplate, ANIM_TARGET, 2, 110, 10, 8, 32, 20 waitforvisualfinish createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, -32, -16, ANIM_TARGET, 3 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 3, 0, 12, 1 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_DEF_PARTNER, 3, 0, 12, 1 delay 4 createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, 1, 3 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET delay 4 createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, 1, 3 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET delay 4 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 32, 20, ANIM_TARGET, 3 - playsewithpan SE_W004, SOUND_PAN_TARGET + playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -9698,7 +9698,7 @@ Move_MAGICAL_LEAF: monbg ANIM_DEF_PARTNER setalpha 12, 8 delay 1 - loopsewithpan SE_W077, SOUND_PAN_ATTACKER, 10, 5 + loopsewithpan SE_M_POISON_POWDER, SOUND_PAN_ATTACKER, 10, 5 createvisualtask AnimTask_CycleMagicalLeafPal, 5 createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, -3, -2, 10 delay 2 @@ -9720,11 +9720,11 @@ Move_MAGICAL_LEAF: delay 2 createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, -3, -5, 8 delay 60 - playsewithpan SE_W013B, SOUND_PAN_ATTACKER + playsewithpan SE_M_RAZOR_WIND2, SOUND_PAN_ATTACKER 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, SOUND_PAN_TARGET + playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 4, -10, -4, ANIM_TARGET, 2 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 4, 10, 4, ANIM_TARGET, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 @@ -9741,10 +9741,10 @@ Move_ICE_BALL: createvisualtask AnimTask_GetIceBallCounter, 5, 0 jumpargeq 0, 4, IceBallSetIceBg IceBallContinue: - playsewithpan SE_W196, SOUND_PAN_ATTACKER + playsewithpan SE_M_ICY_WIND, SOUND_PAN_ATTACKER createsprite gIceBallChunkSpriteTemplate, ANIM_TARGET, 2, 15, 0, -12, -16, 30, -40 delay 28 - playsewithpan SE_W280, SOUND_PAN_TARGET + playsewithpan SE_M_BRICK_BREAK, SOUND_PAN_TARGET createvisualtask AnimTask_GetIceBallCounter, 5, 0 jumpargeq 0, 0, IceBallWeakest jumpargeq 0, 1, IceBallWeak @@ -9829,11 +9829,11 @@ Move_WEATHER_BALL: loadspritegfx ANIM_TAG_WEATHER_BALL createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 8, 1, ANIM_ATTACKER delay 8 - playsewithpan SE_W207, SOUND_PAN_ATTACKER + playsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER 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 @@ -9847,7 +9847,7 @@ WeatherBallNormal: loadspritegfx ANIM_TAG_IMPACT createsprite gWeatherBallNormalDownSpriteTemplate, ANIM_TARGET, 2, -30, -100, 25, 1, 0, 0 waitforvisualfinish - playsewithpan SE_W025B, SOUND_PAN_TARGET + playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 4, -10, 0, ANIM_TARGET, 2 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 8, 1 waitforvisualfinish @@ -9855,45 +9855,45 @@ WeatherBallNormal: WeatherBallFire: loadspritegfx ANIM_TAG_SMALL_EMBER createsprite gWeatherBallFireDownSpriteTemplate, ANIM_TARGET, 2, -30, -100, 25, 1, 40, 10 - playsewithpan SE_W172, SOUND_PAN_TARGET + playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_TARGET delay 10 createsprite gWeatherBallFireDownSpriteTemplate, ANIM_TARGET, 2, -30, -100, 25, 1, -40, 20 - playsewithpan SE_W172, SOUND_PAN_TARGET + playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_TARGET delay 10 createsprite gWeatherBallFireDownSpriteTemplate, ANIM_TARGET, 2, -30, -100, 25, 1, 0, 0 - playsewithpan SE_W172, SOUND_PAN_TARGET + playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_TARGET waitforvisualfinish - playsewithpan SE_W172B, SOUND_PAN_TARGET + playsewithpan SE_M_FLAME_WHEEL2, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 8, 1 waitforvisualfinish end WeatherBallWater: loadspritegfx ANIM_TAG_SMALL_BUBBLES createsprite gWeatherBallWaterDownSpriteTemplate, ANIM_TARGET, 2, -30, -100, 25, 1, 50, 10 - playsewithpan SE_W152, SOUND_PAN_TARGET + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_TARGET delay 8 createsprite gWeatherBallWaterDownSpriteTemplate, ANIM_TARGET, 2, -30, -100, 25, 1, -20, 20 - playsewithpan SE_W152, SOUND_PAN_TARGET + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_TARGET delay 13 createsprite gWeatherBallWaterDownSpriteTemplate, ANIM_TARGET, 2, -30, -100, 25, 1, 0, 0 - playsewithpan SE_W152, SOUND_PAN_TARGET + playsewithpan SE_M_CRABHAMMER, SOUND_PAN_TARGET waitforvisualfinish createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 8, 1 - playsewithpan SE_W202, SOUND_PAN_TARGET + playsewithpan SE_M_GIGA_DRAIN, SOUND_PAN_TARGET waitforvisualfinish end WeatherBallSandstorm: loadspritegfx ANIM_TAG_ROCKS createsprite gWeatherBallRockDownSpriteTemplate, ANIM_TARGET, 2, -30, -100, 25, 1, 30, 0 - playsewithpan SE_W088, SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET delay 5 createsprite gWeatherBallRockDownSpriteTemplate, ANIM_TARGET, 2, -30, -100, 25, 1, -40, 20 - playsewithpan SE_W088, SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET delay 14 createsprite gWeatherBallRockDownSpriteTemplate, ANIM_TARGET, 2, -30, -100, 25, 1, 0, 0 - playsewithpan SE_W088, SOUND_PAN_TARGET + playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET waitforvisualfinish - playsewithpan SE_W070, SOUND_PAN_TARGET + playsewithpan SE_M_STRENGTH, SOUND_PAN_TARGET createsprite 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 @@ -9905,16 +9905,16 @@ WeatherBallIce: loadspritegfx ANIM_TAG_HAIL loadspritegfx ANIM_TAG_ICE_CRYSTALS createsprite gWeatherBallIceDownSpriteTemplate, ANIM_TARGET, 2, -30, -100, 25, 25, -40, 20 - playsewithpan SE_W258, SOUND_PAN_TARGET + playsewithpan SE_M_HAIL, SOUND_PAN_TARGET delay 10 createsprite gWeatherBallIceDownSpriteTemplate, ANIM_TARGET, 2, -30, -100, 25, 25, 40, 0 - playsewithpan SE_W258, SOUND_PAN_TARGET + playsewithpan SE_M_HAIL, SOUND_PAN_TARGET delay 10 createsprite gWeatherBallIceDownSpriteTemplate, ANIM_TARGET, 2, -30, -100, 25, 25, 0, 0 - playsewithpan SE_W258, SOUND_PAN_TARGET + playsewithpan SE_M_HAIL, SOUND_PAN_TARGET waitforvisualfinish createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 - playsewithpan SE_W196, SOUND_PAN_TARGET + playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET call IceCrystalEffectShort waitforvisualfinish end @@ -9923,7 +9923,7 @@ Move_COUNT: loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET setalpha 12, 8 - playsewithpan SE_W003, SOUND_PAN_TARGET + playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_TARGET, 2 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 waitforvisualfinish @@ -9933,64 +9933,64 @@ Move_COUNT: IceCrystalEffectShort: createsprite gIceCrystalHitLargeSpriteTemplate, ANIM_TARGET, 2, -10, -10, 0 - playsewithpan SE_W196, SOUND_PAN_TARGET + playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET delay 4 createsprite gIceCrystalHitSmallSpriteTemplate, ANIM_TARGET, 2, 10, 20, 0 - playsewithpan SE_W196, SOUND_PAN_TARGET + playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET delay 4 createsprite gIceCrystalHitLargeSpriteTemplate, ANIM_TARGET, 2, -5, 10, 0 - playsewithpan SE_W196, SOUND_PAN_TARGET + playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET delay 4 createsprite gIceCrystalHitSmallSpriteTemplate, ANIM_TARGET, 2, 17, -12, 0 - playsewithpan SE_W196, SOUND_PAN_TARGET + playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET delay 4 createsprite gIceCrystalHitSmallSpriteTemplate, ANIM_TARGET, 2, -15, 15, 0 - playsewithpan SE_W196, SOUND_PAN_TARGET + playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET delay 4 createsprite gIceCrystalHitSmallSpriteTemplate, ANIM_TARGET, 2, 0, 0, 0 - playsewithpan SE_W196, SOUND_PAN_TARGET + playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET delay 4 createsprite gIceCrystalHitLargeSpriteTemplate, ANIM_TARGET, 2, 20, 2, 0 - playsewithpan SE_W196, SOUND_PAN_TARGET + playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET return IceCrystalEffectLong: createsprite gIceCrystalHitLargeSpriteTemplate, ANIM_TARGET, 2, -10, -10, 1 - playsewithpan SE_W196, SOUND_PAN_TARGET + playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET delay 4 createsprite gIceCrystalHitSmallSpriteTemplate, ANIM_TARGET, 2, 10, 20, 1 - playsewithpan SE_W196, SOUND_PAN_TARGET + playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET delay 4 createsprite gIceCrystalHitLargeSpriteTemplate, ANIM_TARGET, 2, -29, 0, 1 - playsewithpan SE_W196, SOUND_PAN_TARGET + playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET delay 4 createsprite gIceCrystalHitSmallSpriteTemplate, ANIM_TARGET, 2, 29, -20, 1 - playsewithpan SE_W196, SOUND_PAN_TARGET + playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET delay 4 createsprite gIceCrystalHitLargeSpriteTemplate, ANIM_TARGET, 2, -5, 10, 1 - playsewithpan SE_W196, SOUND_PAN_TARGET + playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET delay 4 createsprite gIceCrystalHitSmallSpriteTemplate, ANIM_TARGET, 2, 17, -12, 1 - playsewithpan SE_W196, SOUND_PAN_TARGET + playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET delay 4 createsprite gIceCrystalHitLargeSpriteTemplate, ANIM_TARGET, 2, -20, 0, 1 - playsewithpan SE_W196, SOUND_PAN_TARGET + playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET delay 4 createsprite gIceCrystalHitSmallSpriteTemplate, ANIM_TARGET, 2, -15, 15, 1 - playsewithpan SE_W196, SOUND_PAN_TARGET + playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET delay 4 createsprite gIceCrystalHitSmallSpriteTemplate, ANIM_TARGET, 2, 26, -5, 1 - playsewithpan SE_W196, SOUND_PAN_TARGET + playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET delay 4 createsprite gIceCrystalHitSmallSpriteTemplate, ANIM_TARGET, 2, 0, 0, 1 - playsewithpan SE_W196, SOUND_PAN_TARGET + playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET delay 4 createsprite gIceCrystalHitLargeSpriteTemplate, ANIM_TARGET, 2, 20, 2, 1 - playsewithpan SE_W196, SOUND_PAN_TARGET + playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET return IceSpikesEffectShort: @ Unused - loopsewithpan SE_W196, SOUND_PAN_TARGET, 6, 4 + loopsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET, 6, 4 createsprite gIceGroundSpikeSpriteTemplate, ANIM_TARGET, 2, 0, 24, 0 delay 4 createsprite gIceGroundSpikeSpriteTemplate, ANIM_TARGET, 2, 8, 24, 0 @@ -10007,7 +10007,7 @@ IceSpikesEffectShort: @ Unused return IceSpikesEffectLong: - loopsewithpan SE_W196, SOUND_PAN_TARGET, 6, 4 + loopsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET, 6, 4 createsprite gIceGroundSpikeSpriteTemplate, ANIM_TARGET, 2, 0, 24, 1 delay 4 createsprite gIceGroundSpikeSpriteTemplate, ANIM_TARGET, 2, 8, 24, 1 @@ -10037,7 +10037,7 @@ GrantingStarsEffect: return HealingEffect: - playsewithpan SE_W071B, SOUND_PAN_ATTACKER + playsewithpan SE_M_ABSORB_2, SOUND_PAN_ATTACKER createsprite gHealingBlueStarSpriteTemplate, ANIM_ATTACKER, 2, 0, -5, 0, 0 delay 7 createsprite gHealingBlueStarSpriteTemplate, ANIM_ATTACKER, 2, -15, 10, 0, 0 @@ -10049,7 +10049,7 @@ HealingEffect: return HealingEffect2: - playsewithpan SE_W071B, SOUND_PAN_TARGET + playsewithpan SE_M_ABSORB_2, SOUND_PAN_TARGET createsprite gHealingBlueStarSpriteTemplate, ANIM_TARGET, 2, 0, -5, 1, 0 delay 7 createsprite gHealingBlueStarSpriteTemplate, ANIM_TARGET, 2, -15, 10, 1, 0 @@ -10062,72 +10062,72 @@ HealingEffect2: PoisonBubblesEffect: createsprite gPoisonBubbleSpriteTemplate, ANIM_TARGET, 2, 10, 10, 0 - playsewithpan SE_W092, SOUND_PAN_TARGET + playsewithpan SE_M_TOXIC, SOUND_PAN_TARGET delay 6 createsprite gPoisonBubbleSpriteTemplate, ANIM_TARGET, 2, 20, -20, 0 - playsewithpan SE_W092, SOUND_PAN_TARGET + playsewithpan SE_M_TOXIC, SOUND_PAN_TARGET delay 6 createsprite gPoisonBubbleSpriteTemplate, ANIM_TARGET, 2, -20, 15, 0 - playsewithpan SE_W092, SOUND_PAN_TARGET + playsewithpan SE_M_TOXIC, SOUND_PAN_TARGET delay 6 createsprite gPoisonBubbleSpriteTemplate, ANIM_TARGET, 2, 0, 0, 0 - playsewithpan SE_W092, SOUND_PAN_TARGET + playsewithpan SE_M_TOXIC, SOUND_PAN_TARGET delay 6 createsprite gPoisonBubbleSpriteTemplate, ANIM_TARGET, 2, -20, -20, 0 - playsewithpan SE_W092, SOUND_PAN_TARGET + playsewithpan SE_M_TOXIC, SOUND_PAN_TARGET delay 6 createsprite gPoisonBubbleSpriteTemplate, ANIM_TARGET, 2, 16, -8, 0 - playsewithpan SE_W092, SOUND_PAN_TARGET + playsewithpan SE_M_TOXIC, SOUND_PAN_TARGET return WaterBubblesEffectShort: createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, 10, 10, 0 - playsewithpan SE_W145C, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET delay 6 createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, 20, -20, 0 - playsewithpan SE_W145C, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET delay 6 createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, -20, 15, 0 - playsewithpan SE_W145C, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET delay 6 createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 0 - playsewithpan SE_W145C, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET delay 6 createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, -20, -20, 0 - playsewithpan SE_W145C, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET delay 6 createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, 16, -8, 0 - playsewithpan SE_W145C, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET return WaterBubblesEffectLong: createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, 10, 10, 1 - playsewithpan SE_W145C, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET delay 6 createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, -28, -10, 1 - playsewithpan SE_W145C, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET delay 6 createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, 20, -20, 1 - playsewithpan SE_W145C, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET delay 6 createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, -20, 15, 1 - playsewithpan SE_W145C, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET delay 6 createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1 - playsewithpan SE_W145C, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET delay 6 createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, 27, 8, 1 - playsewithpan SE_W145C, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET delay 6 createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, -20, -20, 1 - playsewithpan SE_W145C, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET delay 6 createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, 16, -8, 1 - playsewithpan SE_W145C, SOUND_PAN_TARGET + playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET return ElectricityEffect: - playsewithpan SE_W085B, SOUND_PAN_TARGET + playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_TARGET createsprite gElectricitySpriteTemplate, ANIM_TARGET, 2, 5, 0, 5, 0 delay 2 createsprite gElectricitySpriteTemplate, ANIM_TARGET, 2, -5, 10, 5, 1 @@ -10146,7 +10146,7 @@ ElectricityEffect: return ConfusionEffect: - loopsewithpan SE_W146, SOUND_PAN_TARGET, 13, 6 + loopsewithpan SE_M_DIZZY_PUNCH, SOUND_PAN_TARGET, 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 @@ -10214,7 +10214,7 @@ UnsetSolarbeamBg: return Status_Poison: - loopsewithpan SE_W092, SOUND_PAN_TARGET, 13, 6 + loopsewithpan SE_M_TOXIC, SOUND_PAN_TARGET, 13, 6 createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 18, 2 createvisualtask AnimTask_BlendColorCycle, 2, 2, 2, 2, 0, 12, RGB(30, 0, 31) end @@ -10226,7 +10226,7 @@ Status_Confusion: Status_Burn: loadspritegfx ANIM_TAG_SMALL_EMBER - playsewithpan SE_W172, SOUND_PAN_TARGET + playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_TARGET call BurnFlame call BurnFlame call BurnFlame @@ -10239,19 +10239,19 @@ BurnFlame: Status_Infatuation: loadspritegfx ANIM_TAG_MAGENTA_HEART - playsewithpan SE_W204, SOUND_PAN_ATTACKER + playsewithpan SE_M_CHARM, SOUND_PAN_ATTACKER createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, 0, 20 delay 15 - playsewithpan SE_W204, SOUND_PAN_ATTACKER + playsewithpan SE_M_CHARM, SOUND_PAN_ATTACKER createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, -20, 20 delay 15 - playsewithpan SE_W204, SOUND_PAN_ATTACKER + playsewithpan SE_M_CHARM, SOUND_PAN_ATTACKER createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, 20, 20 end Status_Sleep: loadspritegfx ANIM_TAG_LETTER_Z - playsewithpan SE_W173, SOUND_PAN_ATTACKER + playsewithpan SE_M_SNORE, SOUND_PAN_ATTACKER createsprite gSleepLetterZSpriteTemplate, ANIM_ATTACKER, 2, 4, -10, 16, 0, 0 delay 30 createsprite gSleepLetterZSpriteTemplate, ANIM_ATTACKER, 2, 4, -10, 16, 0, 0 @@ -10264,11 +10264,11 @@ Status_Paralysis: end Status_Freeze: - playsewithpan SE_W196, 0 + playsewithpan SE_M_ICY_WIND, 0 loadspritegfx ANIM_TAG_ICE_CUBE monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET - waitplaysewithpan SE_W258, SOUND_PAN_TARGET, 17 + waitplaysewithpan SE_M_HAIL, SOUND_PAN_TARGET, 17 createvisualtask AnimTask_FrozenIceCube, 2 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER @@ -10277,7 +10277,7 @@ Status_Freeze: Status_Curse: loadspritegfx ANIM_TAG_GHOSTLY_SPIRIT monbg ANIM_DEF_PARTNER - playsewithpan SE_W171, SOUND_PAN_TARGET + playsewithpan SE_M_NIGHTMARE, SOUND_PAN_TARGET createsprite gCurseGhostSpriteTemplate, ANIM_TARGET, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 14, 1 waitforvisualfinish @@ -10287,7 +10287,7 @@ Status_Curse: Status_Nightmare: loadspritegfx ANIM_TAG_DEVIL monbg ANIM_DEF_PARTNER - playsewithpan SE_W171, SOUND_PAN_TARGET + playsewithpan SE_M_NIGHTMARE, SOUND_PAN_TARGET createsprite gNightmareDevilSpriteTemplate, ANIM_TARGET, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 14, 1 waitforvisualfinish @@ -10300,8 +10300,8 @@ General_CastformChange: goto CastformChangeContinue CastformChangeContinue: monbg ANIM_ATTACKER - playsewithpan SE_W100, SOUND_PAN_ATTACKER - waitplaysewithpan SE_W107, SOUND_PAN_ATTACKER, 48 + playsewithpan SE_M_TELEPORT, SOUND_PAN_ATTACKER + waitplaysewithpan SE_M_MINIMIZE, SOUND_PAN_ATTACKER, 48 createvisualtask AnimTask_TransformMon, 2, 1 waitforvisualfinish clearmonbg ANIM_ATTACKER @@ -10336,10 +10336,10 @@ General_PokeblockThrow: createvisualtask AnimTask_SetAttackerTargetLeftPos, 2, 0 createvisualtask AnimTask_LoadPokeblockGfx, 2 delay 0 - waitplaysewithpan SE_W026, SOUND_PAN_ATTACKER, 22 + waitplaysewithpan SE_M_JUMP_KICK, SOUND_PAN_ATTACKER, 22 createsprite gPokeblockSpriteTemplate, ANIM_TARGET, 3, -18, 12, 0, 32 delay 50 - loopsewithpan SE_W039, SOUND_PAN_TARGET, 19, 2 + loopsewithpan SE_M_TAIL_WHIP, SOUND_PAN_TARGET, 19, 2 createvisualtask AnimTask_SwayMon, 5, 1, 8, 1536, 2, ANIM_TARGET waitforvisualfinish createvisualtask AnimTask_FreePokeblockGfx, 2 @@ -10359,7 +10359,7 @@ General_TurnTrap: goto Status_BindWrap Status_BindWrap: loadspritegfx ANIM_TAG_TENDRILS - loopsewithpan SE_W010, SOUND_PAN_TARGET, 6, 2 + loopsewithpan SE_M_SCRATCH, SOUND_PAN_TARGET, 6, 2 createsprite gConstrictBindingSpriteTemplate, ANIM_TARGET, 4, 0, 16, 0, 1 delay 7 createsprite gConstrictBindingSpriteTemplate, ANIM_TARGET, 2, 0, 8, 1, 1 @@ -10367,13 +10367,13 @@ Status_BindWrap: createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 delay 20 setarg 7, 0xFFFF - playsewithpan SE_W020, SOUND_PAN_TARGET + playsewithpan SE_M_BIND, SOUND_PAN_TARGET waitforvisualfinish end Status_FireSpin: loadspritegfx ANIM_TAG_SMALL_EMBER - playsewithpan SE_W221B, SOUND_PAN_TARGET + playsewithpan SE_M_SACRED_FIRE2, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 2, 30, 1 call FireSpinEffect call FireSpinEffect @@ -10388,7 +10388,7 @@ Status_Whirlpool: setalpha 12, 8 delay 0 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 4, 2, 0, 7, RGB(0, 13, 23) - playsewithpan SE_W250, SOUND_PAN_TARGET + playsewithpan SE_M_WHIRLPOOL, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 2, 30, 1 call WhirlpoolEffect call WhirlpoolEffect @@ -10404,7 +10404,7 @@ Status_Clamp: loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET setalpha 12, 8 - playsewithpan SE_W011, SOUND_PAN_TARGET + playsewithpan SE_M_VICEGRIP, SOUND_PAN_TARGET createsprite gClampJawSpriteTemplate, ANIM_ATTACKER, 2, -32, 0, 2, 819, 0, 10 createsprite gClampJawSpriteTemplate, ANIM_ATTACKER, 2, 32, 0, 6, -819, 0, 10 delay 10 @@ -10420,7 +10420,7 @@ Status_SandTomb: loadspritegfx ANIM_TAG_MUD_SAND createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 4, 2, 0, 7, RGB(19, 17, 0) createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 2, 30, 1 - playsewithpan SE_W328, SOUND_PAN_TARGET + playsewithpan SE_M_SAND_TOMB, SOUND_PAN_TARGET call SandTombSwirlingDirt call SandTombSwirlingDirt delay 22 @@ -10433,19 +10433,19 @@ General_HeldItemEffect: loadspritegfx ANIM_TAG_THIN_RING loadspritegfx ANIM_TAG_SPARKLE_2 delay 0 - playsewithpan SE_W036, SOUND_PAN_ATTACKER + playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER createvisualtask AnimTask_RotateMonToSideAndRestore, 2, 16, 128, ANIM_ATTACKER, 2 waitforvisualfinish - playsewithpan SE_W036, SOUND_PAN_ATTACKER + playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER createvisualtask AnimTask_RotateMonToSideAndRestore, 2, 16, 128, ANIM_ATTACKER, 2 waitforvisualfinish - playsewithpan SE_W036, SOUND_PAN_ATTACKER + playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER createvisualtask AnimTask_RotateMonToSideAndRestore, 2, 16, 128, ANIM_ATTACKER, 2 waitforvisualfinish - playsewithpan SE_W234, SOUND_PAN_ATTACKER + playsewithpan SE_M_MORNING_SUN, SOUND_PAN_ATTACKER call GrantingStarsEffect waitforvisualfinish - playsewithpan SE_REAPOKE, SOUND_PAN_ATTACKER + playsewithpan SE_SHINY, SOUND_PAN_ATTACKER createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 2, 3, 7, 0, RGB(17, 31, 25) createsprite gThinRingExpandingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0 waitforvisualfinish @@ -10456,23 +10456,23 @@ General_SmokeballEscape: monbg ANIM_ATTACKER setalpha 12, 4 delay 0 - playsewithpan SE_BOWA2, SOUND_PAN_TARGET + playsewithpan SE_BALL_OPEN, SOUND_PAN_TARGET createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_TARGET, 0, 0, 32, 28, 30 delay 4 - playsewithpan SE_BOWA2, SOUND_PAN_TARGET + playsewithpan SE_BALL_OPEN, SOUND_PAN_TARGET createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 127, 2, 12, 20, 30 delay 12 - playsewithpan SE_BOWA2, SOUND_PAN_TARGET + playsewithpan SE_BALL_OPEN, SOUND_PAN_TARGET createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 126, 2, -28, 4, 30 delay 12 - playsewithpan SE_BOWA2, SOUND_PAN_TARGET + playsewithpan SE_BALL_OPEN, SOUND_PAN_TARGET createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 124, 2, 14, -20, 30 delay 4 - playsewithpan SE_BOWA2, SOUND_PAN_TARGET + playsewithpan SE_BALL_OPEN, SOUND_PAN_TARGET createvisualtask AnimTask_AttackerFadeToInvisible, 2, 2 createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 123, 3, 4, 4, 30 delay 14 - playsewithpan SE_BOWA2, SOUND_PAN_TARGET + playsewithpan SE_BALL_OPEN, SOUND_PAN_TARGET createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 122, 3, -14, 18, 46 delay 0 createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 121, 3, 14, -14, 46 @@ -10491,7 +10491,7 @@ General_SmokeballEscape: General_FocusBand: createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 2, 7, 0, 9, RGB_RED - playsewithpan SE_W082, SOUND_PAN_ATTACKER + playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER createvisualtask AnimTask_SlideMonForFocusBand, 5, 30, 128, 0, 1, 2, 0, 1 waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 2, 4, 9, 0, RGB_RED @@ -10502,7 +10502,7 @@ General_FocusBand: General_Rain: loadspritegfx ANIM_TAG_RAIN_DROPS - playsewithpan SE_W240, SOUND_PAN_ATTACKER + playsewithpan SE_M_RAIN_DANCE, SOUND_PAN_ATTACKER createvisualtask AnimTask_BlendBattleAnimPal, 10, 0x781, 2, 0, 4, RGB_BLACK waitforvisualfinish createvisualtask AnimTask_CreateRaindrops, 2, 0, 3, 60 @@ -10531,7 +10531,7 @@ General_MonHit: loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET setalpha 12, 8 - playsewithpan SE_W003, SOUND_PAN_TARGET + playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_TARGET, 2 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 waitforvisualfinish @@ -10562,22 +10562,22 @@ SnatchMoveContinue: call SnatchMoveTrySwapToSubstitute end SnatchOpposingMonMove: - playsewithpan SE_W104, SOUND_PAN_ATTACKER + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER createvisualtask AnimTask_SnatchOpposingMonMove, 2 goto SnatchMoveContinue SnatchPartnerMonMove: - playsewithpan SE_W104, SOUND_PAN_ATTACKER + playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER createvisualtask AnimTask_SnatchPartnerMove, 2 goto SnatchMoveContinue General_FutureSightHit: createvisualtask AnimTask_SetAnimTargetToBattlerTarget, 2 monbg ANIM_DEF_PARTNER - playsewithpan SE_W060, SOUND_PAN_ATTACKER + playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER call SetPsychicBackground setalpha 8, 8 - playsewithpan SE_W048, SOUND_PAN_TARGET - waitplaysewithpan SE_W048, SOUND_PAN_TARGET, 8 + playsewithpan SE_M_SUPERSONIC, SOUND_PAN_TARGET + waitplaysewithpan SE_M_SUPERSONIC, SOUND_PAN_TARGET, 8 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 4, 0, 15, 1 createvisualtask AnimTask_ScaleMonAndRestore, 5, -5, -5, 15, ANIM_TARGET, 1 waitforvisualfinish @@ -10598,26 +10598,26 @@ General_DoomDesireHit: delay 10 createvisualtask AnimTask_DoomDesireLightBeam, 5 delay 9 - playsewithpan SE_W109, SOUND_PAN_ATTACKER + playsewithpan SE_M_CONFUSE_RAY, SOUND_PAN_ATTACKER delay 9 - playsewithpan SE_W109, 0 + playsewithpan SE_M_CONFUSE_RAY, 0 delay 9 - playsewithpan SE_W109, SOUND_PAN_TARGET + playsewithpan SE_M_CONFUSE_RAY, SOUND_PAN_TARGET delay 25 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 10, 0, 20, 1 - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 1 delay 6 - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 24, -24, 1, 1 delay 6 - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, -16, 16, 1, 1 delay 6 - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, -24, -12, 1, 1 delay 6 - playsewithpan SE_W120, SOUND_PAN_TARGET + playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 16, 16, 1, 1 waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 16, 0, RGB_WHITE @@ -10626,7 +10626,7 @@ General_DoomDesireHit: General_FocusPunchSetUp: loadspritegfx ANIM_TAG_FOCUS_ENERGY - playsewithpan SE_W082, SOUND_PAN_ATTACKER + playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER call EndureEffect delay 8 createvisualtask AnimTask_BlendColorCycle, 2, 2, 2, 2, 0, 11, RGB_RED @@ -10660,7 +10660,7 @@ General_WishHeal: loadspritegfx ANIM_TAG_SPARKLE_2 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 0, 10, RGB_BLACK waitforvisualfinish - playsewithpan SE_W025, SOUND_PAN_ATTACKER + playsewithpan SE_M_MEGA_KICK, SOUND_PAN_ATTACKER call GrantingStarsEffect waitforvisualfinish unloadspritegfx ANIM_TAG_SPARKLE_2 @@ -10694,7 +10694,7 @@ SnatchMoveSwapMonForSubstitute: @ Healthbox blue flash effect on level up Special_LevelUp: - playsewithpan SE_EXPMAX, 0 + playsewithpan SE_EXP_MAX, 0 createvisualtask AnimTask_LoadHealthboxPalsForLevelUp, 2 delay 0 createvisualtask AnimTask_FlashHealthboxOnLevelUp, 5, 0, 0 @@ -10717,7 +10717,7 @@ Special_SwitchOutOpponentMon: Special_BallThrow: createvisualtask AnimTask_LoadBallGfx, 2 delay 0 - playsewithpan SE_NAGERU, 0 + playsewithpan SE_BALL_THROW, 0 createvisualtask AnimTask_ThrowBall, 2 createvisualtask AnimTask_IsBallBlockedByTrainer, 2 jumpreteq -1, BallThrowTrainerBlock @@ -10731,7 +10731,7 @@ BallThrowTrainerBlock: monbg ANIM_DEF_PARTNER setalpha 12, 8 delay 0 - playsewithpan SE_W003, SOUND_PAN_TARGET + playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, -4, -20, ANIM_TARGET, 2 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 3db9f28ff..873425c63 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -798,7 +798,7 @@ BattleScript_KOFail:: BattleScript_EffectRazorWind:: jumpifstatus2 BS_ATTACKER, STATUS2_MULTIPLETURNS, BattleScript_TwoTurnMovesSecondTurn jumpifword CMP_COMMON_BITS, gHitMarker, HITMARKER_NO_ATTACKSTRING, BattleScript_TwoTurnMovesSecondTurn - setbyte sTWOTURN_STRINGID, 0x0 + setbyte sTWOTURN_STRINGID, 0 call BattleScriptFirstChargingTurn goto BattleScript_MoveEnd @@ -1084,7 +1084,7 @@ BattleScript_EffectAccuracyDownHit:: BattleScript_EffectSkyAttack:: jumpifstatus2 BS_ATTACKER, STATUS2_MULTIPLETURNS, BattleScript_TwoTurnMovesSecondTurn jumpifword CMP_COMMON_BITS, gHitMarker, HITMARKER_NO_ATTACKSTRING, BattleScript_TwoTurnMovesSecondTurn - setbyte sTWOTURN_STRINGID, 0x3 + setbyte sTWOTURN_STRINGID, 3 call BattleScriptFirstChargingTurn goto BattleScript_MoveEnd @@ -1504,9 +1504,9 @@ BattleScript_EffectCurse:: attackcanceler attackstring ppreduce - jumpifstat BS_ATTACKER, CMP_GREATER_THAN, STAT_SPEED, 0x0, BattleScript_CurseTrySpeed - jumpifstat BS_ATTACKER, CMP_NOT_EQUAL, STAT_ATK, 0xC, BattleScript_CurseTrySpeed - jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_DEF, 0xC, BattleScript_ButItFailed + jumpifstat BS_ATTACKER, CMP_GREATER_THAN, STAT_SPEED, MIN_STAT_STAGE, BattleScript_CurseTrySpeed + jumpifstat BS_ATTACKER, CMP_NOT_EQUAL, STAT_ATK, MAX_STAT_STAGE, BattleScript_CurseTrySpeed + jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_DEF, MAX_STAT_STAGE, BattleScript_ButItFailed BattleScript_CurseTrySpeed:: copybyte gBattlerTarget, gBattlerAttacker setbyte sB_ANIM_TURN, 0x1 @@ -1831,7 +1831,7 @@ BattleScript_EffectMirrorCoat:: BattleScript_EffectSkullBash:: jumpifstatus2 BS_ATTACKER, STATUS2_MULTIPLETURNS, BattleScript_TwoTurnMovesSecondTurn jumpifword CMP_COMMON_BITS, gHitMarker, HITMARKER_NO_ATTACKSTRING, BattleScript_TwoTurnMovesSecondTurn - setbyte sTWOTURN_STRINGID, 0x2 + setbyte sTWOTURN_STRINGID, 2 call BattleScriptFirstChargingTurn setstatchanger STAT_DEF, 1, FALSE statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_SkullBashEnd @@ -1927,7 +1927,7 @@ BattleScript_EffectSolarbeam:: BattleScript_SolarbeamDecideTurn:: jumpifstatus2 BS_ATTACKER, STATUS2_MULTIPLETURNS, BattleScript_TwoTurnMovesSecondTurn jumpifword CMP_COMMON_BITS, gHitMarker, HITMARKER_NO_ATTACKSTRING, BattleScript_TwoTurnMovesSecondTurn - setbyte sTWOTURN_STRINGID, 0x1 + setbyte sTWOTURN_STRINGID, 1 call BattleScriptFirstChargingTurn goto BattleScript_MoveEnd BattleScript_SolarbeamOnFirstTurn:: @@ -1996,19 +1996,19 @@ BattleScript_EffectSemiInvulnerable:: jumpifmove MOVE_FLY, BattleScript_FirstTurnFly jumpifmove MOVE_DIVE, BattleScript_FirstTurnDive jumpifmove MOVE_BOUNCE, BattleScript_FirstTurnBounce - setbyte sTWOTURN_STRINGID, 0x5 + setbyte sTWOTURN_STRINGID, 5 goto BattleScript_FirstTurnSemiInvulnerable BattleScript_FirstTurnBounce:: - setbyte sTWOTURN_STRINGID, 0x7 + setbyte sTWOTURN_STRINGID, 7 goto BattleScript_FirstTurnSemiInvulnerable BattleScript_FirstTurnDive:: - setbyte sTWOTURN_STRINGID, 0x6 + setbyte sTWOTURN_STRINGID, 6 goto BattleScript_FirstTurnSemiInvulnerable BattleScript_FirstTurnFly:: - setbyte sTWOTURN_STRINGID, 0x4 + setbyte sTWOTURN_STRINGID, 4 BattleScript_FirstTurnSemiInvulnerable:: call BattleScriptFirstChargingTurn setsemiinvulnerablebit @@ -2670,8 +2670,8 @@ BattleScript_EffectTickle:: attackcanceler attackstring ppreduce - jumpifstat BS_TARGET, CMP_GREATER_THAN, STAT_ATK, 0x0, BattleScript_TickleDoMoveAnim - jumpifstat BS_TARGET, CMP_EQUAL, STAT_DEF, 0x0, BattleScript_CantLowerMultipleStats + jumpifstat BS_TARGET, CMP_GREATER_THAN, STAT_ATK, MIN_STAT_STAGE, BattleScript_TickleDoMoveAnim + jumpifstat BS_TARGET, CMP_EQUAL, STAT_DEF, MIN_STAT_STAGE, BattleScript_CantLowerMultipleStats BattleScript_TickleDoMoveAnim:: accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE attackanimation @@ -2705,8 +2705,8 @@ BattleScript_EffectCosmicPower:: attackcanceler attackstring ppreduce - jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_DEF, 0xC, BattleScript_CosmicPowerDoMoveAnim - jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_SPDEF, 0xC, BattleScript_CantRaiseMultipleStats + jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_DEF, MAX_STAT_STAGE, BattleScript_CosmicPowerDoMoveAnim + jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_SPDEF, MAX_STAT_STAGE, BattleScript_CantRaiseMultipleStats BattleScript_CosmicPowerDoMoveAnim:: attackanimation waitanimation @@ -2734,8 +2734,8 @@ BattleScript_EffectBulkUp:: attackcanceler attackstring ppreduce - jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_ATK, 0xC, BattleScript_BulkUpDoMoveAnim - jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_DEF, 0xC, BattleScript_CantRaiseMultipleStats + jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_ATK, MAX_STAT_STAGE, BattleScript_BulkUpDoMoveAnim + jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_DEF, MAX_STAT_STAGE, BattleScript_CantRaiseMultipleStats BattleScript_BulkUpDoMoveAnim:: attackanimation waitanimation @@ -2759,8 +2759,8 @@ BattleScript_EffectCalmMind:: attackcanceler attackstring ppreduce - jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_SPATK, 0xC, BattleScript_CalmMindDoMoveAnim - jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_SPDEF, 0xC, BattleScript_CantRaiseMultipleStats + jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_SPATK, MAX_STAT_STAGE, BattleScript_CalmMindDoMoveAnim + jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_SPDEF, MAX_STAT_STAGE, BattleScript_CantRaiseMultipleStats BattleScript_CalmMindDoMoveAnim:: attackanimation waitanimation @@ -2791,8 +2791,8 @@ BattleScript_EffectDragonDance:: attackcanceler attackstring ppreduce - jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_ATK, 0xC, BattleScript_DragonDanceDoMoveAnim - jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_SPEED, 0xC, BattleScript_CantRaiseMultipleStats + jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_ATK, MAX_STAT_STAGE, BattleScript_DragonDanceDoMoveAnim + jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_SPEED, MAX_STAT_STAGE, BattleScript_CantRaiseMultipleStats BattleScript_DragonDanceDoMoveAnim:: attackanimation waitanimation @@ -3047,13 +3047,13 @@ BattleScript_FrontierTrainerBattleWon_LoseTexts: trainerslidein BS_ATTACKER waitstate printstring STRINGID_TRAINER1LOSETEXT - jumpifnotbattletype BATTLE_TYPE_TWO_OPPONENTS, BattleScript_82DAACB + jumpifnotbattletype BATTLE_TYPE_TWO_OPPONENTS, BattleScript_TryPickUpItems trainerslideout B_POSITION_OPPONENT_LEFT waitstate trainerslidein BS_FAINTED waitstate printstring STRINGID_TRAINER2LOSETEXT -BattleScript_82DAACB: +BattleScript_TryPickUpItems: jumpifnotbattletype BATTLE_TYPE_PYRAMID, BattleScript_FrontierTrainerBattleWon_End pickup BattleScript_FrontierTrainerBattleWon_End: @@ -3165,7 +3165,7 @@ BattleScript_Pausex20:: return BattleScript_LevelUp:: - fanfare MUS_FANFA1 + fanfare MUS_LEVEL_UP printstring STRINGID_PKMNGREWTOLV setbyte sLVLBOX_STATE, 0x0 drawlvlupbox @@ -3193,7 +3193,7 @@ BattleScript_ForgotAndLearnedNewMove:: printstring STRINGID_ANDELLIPSIS BattleScript_LearnedNewMove:: buffermovetolearn - fanfare MUS_FANFA1 + fanfare MUS_LEVEL_UP printstring STRINGID_PKMNLEARNEDMOVE waitmessage 0x40 updatechoicemoveonlvlup BS_ATTACKER @@ -3252,7 +3252,7 @@ BattleScript_SunlightFaded:: end2 BattleScript_OverworldWeatherStarts:: - printfromtable gWeatherContinuesStringIds + printfromtable gWeatherStartsStringIds waitmessage 0x40 playanimation2 BS_ATTACKER, sB_ANIM_ARG1, NULL end3 @@ -3462,11 +3462,11 @@ BattleScript_PerishSongCountGoesDown:: end2 BattleScript_AllStatsUp:: - jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_ATK, 0xC, BattleScript_AllStatsUpAtk - jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_DEF, 0xC, BattleScript_AllStatsUpAtk - jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_SPEED, 0xC, BattleScript_AllStatsUpAtk - jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_SPATK, 0xC, BattleScript_AllStatsUpAtk - jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_SPDEF, 0xC, BattleScript_AllStatsUpRet + jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_ATK, MAX_STAT_STAGE, BattleScript_AllStatsUpAtk + jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_DEF, MAX_STAT_STAGE, BattleScript_AllStatsUpAtk + jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_SPEED, MAX_STAT_STAGE, BattleScript_AllStatsUpAtk + jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_SPATK, MAX_STAT_STAGE, BattleScript_AllStatsUpAtk + jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_SPDEF, MAX_STAT_STAGE, BattleScript_AllStatsUpRet BattleScript_AllStatsUpAtk:: setbyte sSTAT_ANIM_PLAYED, FALSE playstatchangeanimation BS_ATTACKER, BIT_ATK | BIT_DEF | BIT_SPEED | BIT_SPATK | BIT_SPDEF, 0x0 @@ -3638,18 +3638,18 @@ BattleScript_AtkDefDown:: playstatchangeanimation BS_ATTACKER, BIT_DEF | BIT_ATK, STAT_CHANGE_CANT_PREVENT | STAT_CHANGE_NEGATIVE | STAT_CHANGE_MULTIPLE_STATS playstatchangeanimation BS_ATTACKER, BIT_ATK, STAT_CHANGE_CANT_PREVENT | STAT_CHANGE_NEGATIVE setstatchanger STAT_ATK, 1, TRUE - statbuffchange MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN | STAT_BUFF_ALLOW_PTR, BattleScript_82DB144 - jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_82DB144 + statbuffchange MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN | STAT_BUFF_ALLOW_PTR, BattleScript_AtkDefDown_TryDef + jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_AtkDefDown_TryDef printfromtable gStatDownStringIds waitmessage 0x40 -BattleScript_82DB144:: +BattleScript_AtkDefDown_TryDef:: playstatchangeanimation BS_ATTACKER, BIT_DEF, STAT_CHANGE_CANT_PREVENT | STAT_CHANGE_NEGATIVE setstatchanger STAT_DEF, 1, TRUE - statbuffchange MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN | STAT_BUFF_ALLOW_PTR, BattleScript_82DB167 - jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_82DB167 + statbuffchange MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN | STAT_BUFF_ALLOW_PTR, BattleScript_AtkDefDown_End + jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_AtkDefDown_End printfromtable gStatDownStringIds waitmessage 0x40 -BattleScript_82DB167:: +BattleScript_AtkDefDown_End:: return BattleScript_KnockedOff:: @@ -4017,10 +4017,10 @@ BattleScript_WeatherFormChangesLoop:: return BattleScript_CastformChange:: - call BattleScript_82DB4AF + call BattleScript_DoCastformChange end3 -BattleScript_82DB4AF:: +BattleScript_DoCastformChange:: docastformchangeanimation waitstate printstring STRINGID_PKMNTRANSFORMED @@ -4459,9 +4459,9 @@ BattleScript_PalaceEndFlavorText:: BattleScript_ArenaTurnBeginning:: waitcry BS_ATTACKER volumedown - playse SE_HANTEI1 + playse SE_ARENA_TIMEUP1 pause 0x8 - playse SE_HANTEI1 + playse SE_ARENA_TIMEUP1 various14 BS_ATTACKER arenajudmengtstring 8 arenawaitmessage 8 @@ -4471,7 +4471,7 @@ BattleScript_ArenaTurnBeginning:: end2 BattleScript_82DB8E0:: @ Unused battlescript - playse SE_PINPON + playse SE_DING_DONG various14 BS_ATTACKER arenajudmengtstring BS_TARGET arenawaitmessage BS_TARGET @@ -4485,9 +4485,9 @@ BattleScript_ArenaDoJudgment:: makevisible BS_OPPONENT1 waitstate volumedown - playse SE_HANTEI1 + playse SE_ARENA_TIMEUP1 pause 0x8 - playse SE_HANTEI1 + playse SE_ARENA_TIMEUP1 pause 0x40 various14 BS_ATTACKER arenajudmengtstring 1 diff --git a/data/battle_scripts_2.s b/data/battle_scripts_2.s index b74f557a7..caa6cddac 100644 --- a/data/battle_scripts_2.s +++ b/data/battle_scripts_2.s @@ -13,28 +13,28 @@ .align 2 gBattlescriptsForBallThrow:: @ 82DBD08 - .4byte BattleScript_BallThrow - .4byte BattleScript_BallThrow - .4byte BattleScript_BallThrow - .4byte BattleScript_BallThrow - .4byte BattleScript_BallThrow - .4byte BattleScript_SafariBallThrow - .4byte BattleScript_BallThrow - .4byte BattleScript_BallThrow - .4byte BattleScript_BallThrow - .4byte BattleScript_BallThrow - .4byte BattleScript_BallThrow - .4byte BattleScript_BallThrow - .4byte BattleScript_BallThrow + .4byte BattleScript_BallThrow @ ITEM_NONE + .4byte BattleScript_BallThrow @ ITEM_MASTER_BALL + .4byte BattleScript_BallThrow @ ITEM_ULTRA_BALL + .4byte BattleScript_BallThrow @ ITEM_GREAT_BALL + .4byte BattleScript_BallThrow @ ITEM_POKE_BALL + .4byte BattleScript_SafariBallThrow @ ITEM_SAFARI_BALL + .4byte BattleScript_BallThrow @ ITEM_NET_BALL + .4byte BattleScript_BallThrow @ ITEM_DIVE_BALL + .4byte BattleScript_BallThrow @ ITEM_NEST_BALL + .4byte BattleScript_BallThrow @ ITEM_REPEAT_BALL + .4byte BattleScript_BallThrow @ ITEM_TIMER_BALL + .4byte BattleScript_BallThrow @ ITEM_LUXURY_BALL + .4byte BattleScript_BallThrow @ ITEM_PREMIER_BALL .align 2 gBattlescriptsForUsingItem:: @ 82DBD3C .4byte BattleScript_PlayerUsesItem - .4byte BattleScript_OpponentUsesHealItem - .4byte BattleScript_OpponentUsesHealItem - .4byte BattleScript_OpponentUsesStatusCureItem - .4byte BattleScript_OpponentUsesXItem - .4byte BattleScript_OpponentUsesGuardSpecs + .4byte BattleScript_OpponentUsesHealItem @ AI_ITEM_FULL_RESTORE + .4byte BattleScript_OpponentUsesHealItem @ AI_ITEM_HEAL_HP + .4byte BattleScript_OpponentUsesStatusCureItem @ AI_ITEM_CURE_CONDITION + .4byte BattleScript_OpponentUsesXItem @ AI_ITEM_X_STAT + .4byte BattleScript_OpponentUsesGuardSpecs @ AI_ITEM_GUARD_SPECS .align 2 gBattlescriptsForRunningByItem:: @ 82DBD54 @@ -118,7 +118,7 @@ BattleScript_PlayerUsesItem:: BattleScript_OpponentUsesHealItem:: printstring STRINGID_EMPTYSTRING3 pause 0x30 - playse SE_KAIFUKU + playse SE_USE_ITEM printstring STRINGID_TRAINER1USEDITEM waitmessage 0x40 useitemonopponent @@ -135,7 +135,7 @@ BattleScript_OpponentUsesHealItem:: BattleScript_OpponentUsesStatusCureItem:: printstring STRINGID_EMPTYSTRING3 pause 0x30 - playse SE_KAIFUKU + playse SE_USE_ITEM printstring STRINGID_TRAINER1USEDITEM waitmessage 0x40 useitemonopponent @@ -149,7 +149,7 @@ BattleScript_OpponentUsesStatusCureItem:: BattleScript_OpponentUsesXItem:: printstring STRINGID_EMPTYSTRING3 pause 0x30 - playse SE_KAIFUKU + playse SE_USE_ITEM printstring STRINGID_TRAINER1USEDITEM waitmessage 0x40 useitemonopponent @@ -162,7 +162,7 @@ BattleScript_OpponentUsesXItem:: BattleScript_OpponentUsesGuardSpecs:: printstring STRINGID_EMPTYSTRING3 pause 0x30 - playse SE_KAIFUKU + playse SE_USE_ITEM printstring STRINGID_TRAINER1USEDITEM waitmessage 0x40 useitemonopponent @@ -173,7 +173,7 @@ BattleScript_OpponentUsesGuardSpecs:: finishaction BattleScript_RunByUsingItem:: - playse SE_NIGERU + playse SE_FLEE setbyte gBattleOutcome, B_OUTCOME_RAN finishturn diff --git a/data/contest_ai_scripts.s b/data/contest_ai_scripts.s index 7346876d7..e47ccb4c8 100644 --- a/data/contest_ai_scripts.s +++ b/data/contest_ai_scripts.s @@ -1,3 +1,5 @@ +#include "constants/global.h" +#include "constants/contest.h" .include "asm/macros.inc" .include "asm/macros/contest_ai_script.inc" .include "constants/constants.inc" @@ -11,847 +13,889 @@ enum MON_4 .align 2 -gContestAIChecks:: @ 82DE350 - .4byte AI_CheckForBadMove // 0x00000001 - .4byte AI_CheckForCombo // 0x00000002 - .4byte AI_CheckBoring // 0x00000004 - .4byte AI_CheckExcitement // 0x00000008 - .4byte AI_CheckOrder // 0x00000010 - .4byte AI_CheckForGoodMove // 0x00000020 - .4byte AI_Erratic // 0x00000040 - .4byte AI_Nothing // 0x00000080 - .4byte AI_Nothing // 0x00000100 - .4byte AI_Nothing // 0x00000200 - .4byte AI_Nothing // 0x00000400 - .4byte AI_Nothing // 0x00000800 - .4byte AI_Nothing // 0x00001000 - .4byte AI_Nothing // 0x00002000 - .4byte AI_Nothing // 0x00004000 - .4byte AI_Nothing // 0x00008000 - .4byte AI_Nothing // 0x00010000 - .4byte AI_Nothing // 0x00020000 - .4byte AI_Nothing // 0x00040000 - .4byte AI_Nothing // 0x00080000 - .4byte AI_Nothing // 0x00100000 - .4byte AI_Nothing // 0x00200000 - .4byte AI_Nothing // 0x00400000 - .4byte AI_Nothing // 0x00800000 - .4byte AI_Nothing // 0x01000000 - .4byte AI_Nothing // 0x02000000 - .4byte AI_Nothing // 0x04000000 - .4byte AI_Nothing // 0x08000000 - .4byte AI_Nothing // 0x10000000 - .4byte AI_Nothing // 0x20000000 - .4byte AI_Nothing // 0x40000000 - .4byte AI_Nothing // 0x80000000 - - -@ Unreferenced AI routine to encourage moves that improve condition on the first -@ turn. Additionally, it checks the appeal order of the user and the effect -@ type, but the code is buggy and doesn't affect the score. - if_turn_not_eq 0, ContestUnreferenced_80 - if_effect_not_eq CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, ContestUnreferenced_80 +gContestAI_ScriptsTable:: @ 82DE350 + .4byte AI_CheckBadMove @ CONTEST_AI_CHECK_BAD_MOVE + .4byte AI_CheckCombo @ CONTEST_AI_CHECK_COMBO + .4byte AI_CheckBoring @ CONTEST_AI_CHECK_BORING + .4byte AI_CheckExcitement @ CONTEST_AI_CHECK_EXCITEMENT + .4byte AI_CheckOrder @ CONTEST_AI_CHECK_ORDER + .4byte AI_CheckGoodMove @ CONTEST_AI_CHECK_GOOD_MOVE + .4byte AI_Erratic @ CONTEST_AI_ERRATIC + .4byte AI_Nothing @ CONTEST_AI_DUMMY_1 + .4byte AI_Nothing @ CONTEST_AI_DUMMY_2 + .4byte AI_Nothing @ CONTEST_AI_DUMMY_3 + .4byte AI_Nothing @ CONTEST_AI_DUMMY_4 + .4byte AI_Nothing @ CONTEST_AI_DUMMY_5 + .4byte AI_Nothing @ CONTEST_AI_DUMMY_6 + .4byte AI_Nothing @ CONTEST_AI_DUMMY_7 + .4byte AI_Nothing @ CONTEST_AI_DUMMY_8 + .4byte AI_Nothing @ CONTEST_AI_DUMMY_9 + .4byte AI_Nothing @ CONTEST_AI_DUMMY_10 + .4byte AI_Nothing @ CONTEST_AI_DUMMY_11 + .4byte AI_Nothing @ CONTEST_AI_DUMMY_12 + .4byte AI_Nothing @ CONTEST_AI_DUMMY_13 + .4byte AI_Nothing @ CONTEST_AI_DUMMY_14 + .4byte AI_Nothing @ CONTEST_AI_DUMMY_15 + .4byte AI_Nothing @ CONTEST_AI_DUMMY_16 + .4byte AI_Nothing @ CONTEST_AI_DUMMY_17 + .4byte AI_Nothing @ CONTEST_AI_DUMMY_18 + .4byte AI_Nothing @ CONTEST_AI_DUMMY_19 + .4byte AI_Nothing @ CONTEST_AI_DUMMY_20 + .4byte AI_Nothing @ CONTEST_AI_DUMMY_21 + .4byte AI_Nothing @ CONTEST_AI_DUMMY_22 + .4byte AI_Nothing @ CONTEST_AI_DUMMY_23 + .4byte AI_Nothing @ CONTEST_AI_DUMMY_24 + .4byte AI_Nothing @ CONTEST_AI_DUMMY_25 + + +@ Unused. Encourages improving condition on the 1st appeal, or startling mons if the users turn is later +AI_CheckTiming: + if_appeal_num_not_eq 0, AI_CheckTiming_SkipCondition + if_effect_not_eq CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, AI_CheckTiming_SkipCondition score +10 -ContestUnreferenced_80: - call ContestUnreferenced_0D - end -ContestUnreferenced_0D: - if_user_order_more_than MON_2, ContestUnreferenced_end - if_effect_type_not_eq 2, ContestUnreferenced_end - if_effect_type_not_eq 3, ContestUnreferenced_end - score +10 @ unreachable -ContestUnreferenced_end: - end - -@ Unreferenced AI routine that doesn't make much sense. - if_turn_eq 0, ContestUnreferenced_0F_1 - if_turn_eq 1, ContestUnreferenced_0F_2 - if_turn_eq 2, ContestUnreferenced_0F_3 - if_turn_eq 3, ContestUnreferenced_0F_4 - if_turn_eq 4, ContestUnreferenced_0F_5 - end -ContestUnreferenced_0F_1: - if_user_order_not_eq MON_1, ContestUnreferenced_2B_1 - if_user_order_not_eq MON_2, ContestUnreferenced_2B_2 - if_user_order_not_eq MON_3, ContestUnreferenced_2B_1 - if_user_order_not_eq MON_4, ContestUnreferenced_2B_1 - end -ContestUnreferenced_2B_1: - if_effect_type_eq 1, ContestUnreferenced_score - end -ContestUnreferenced_2B_2: - if_effect_type_eq 1, ContestUnreferenced_score - end - if_effect_type_eq 1, ContestUnreferenced_score - end -ContestUnreferenced_0F_2: - if_user_order_not_eq MON_1, ContestUnreferenced_2B_1 - if_user_order_not_eq MON_2, ContestUnreferenced_2B_1 - if_user_order_not_eq MON_3, ContestUnreferenced_2B_1 - if_user_order_not_eq MON_4, ContestUnreferenced_2B_1 - end -ContestUnreferenced_0F_3: - if_user_order_not_eq MON_1, ContestUnreferenced_2B_1 - if_user_order_not_eq MON_2, ContestUnreferenced_2B_1 - if_user_order_not_eq MON_3, ContestUnreferenced_2B_1 - if_user_order_not_eq MON_4, ContestUnreferenced_2B_1 - end -ContestUnreferenced_0F_4: - if_user_order_not_eq MON_1, ContestUnreferenced_2B_1 - if_user_order_not_eq MON_2, ContestUnreferenced_2B_1 - if_user_order_not_eq MON_3, ContestUnreferenced_2B_1 - if_user_order_not_eq MON_4, ContestUnreferenced_2B_1 - end -ContestUnreferenced_0F_5: - if_user_order_not_eq MON_1, ContestUnreferenced_2B_1 - if_user_order_not_eq MON_2, ContestUnreferenced_2B_1 - if_user_order_not_eq MON_3, ContestUnreferenced_2B_1 - if_user_order_not_eq MON_4, ContestUnreferenced_2B_1 - end -ContestUnreferenced_score: +AI_CheckTiming_SkipCondition: + call AI_CheckTiming_TryStartle + end +AI_CheckTiming_TryStartle: + if_user_order_more_than MON_2, AI_CheckTiming_End + if_effect_type_not_eq CONTEST_EFFECT_TYPE_STARTLE_MON, AI_CheckTiming_End + if_effect_type_not_eq CONTEST_EFFECT_TYPE_STARTLE_MONS, AI_CheckTiming_End + score +10 +AI_CheckTiming_End: + end + +@ Unused, doesnt make much sense +@ Encourages using an avoid being startled move +@ The various appeal and turn checks are pointless, it will always encourage these moves +AI_AvoidStartle: + if_appeal_num_eq 0, AI_AvoidStartle_1stAppeal + if_appeal_num_eq 1, AI_AvoidStartle_2ndAppeal + if_appeal_num_eq 2, AI_AvoidStartle_3rdAppeal + if_appeal_num_eq 3, AI_AvoidStartle_4thAppeal + if_last_appeal AI_AvoidStartle_LastAppeal + end +AI_AvoidStartle_1stAppeal: + if_user_order_not_eq MON_1, AI_AvoidStartle_EncourageIfAvoidMove + if_user_order_not_eq MON_2, AI_AvoidStartle_EncourageIfAvoidMove2 + if_user_order_not_eq MON_3, AI_AvoidStartle_EncourageIfAvoidMove + if_user_order_not_eq MON_4, AI_AvoidStartle_EncourageIfAvoidMove + end +AI_AvoidStartle_EncourageIfAvoidMove: + if_effect_type_eq CONTEST_EFFECT_TYPE_AVOID_STARTLE, AI_AvoidStartle_Encourage + end +AI_AvoidStartle_EncourageIfAvoidMove2: + if_effect_type_eq CONTEST_EFFECT_TYPE_AVOID_STARTLE, AI_AvoidStartle_Encourage + end +AI_AvoidStartle_EncourageIfAvoidMove3: + if_effect_type_eq CONTEST_EFFECT_TYPE_AVOID_STARTLE, AI_AvoidStartle_Encourage + end +AI_AvoidStartle_2ndAppeal: + if_user_order_not_eq MON_1, AI_AvoidStartle_EncourageIfAvoidMove + if_user_order_not_eq MON_2, AI_AvoidStartle_EncourageIfAvoidMove + if_user_order_not_eq MON_3, AI_AvoidStartle_EncourageIfAvoidMove + if_user_order_not_eq MON_4, AI_AvoidStartle_EncourageIfAvoidMove + end +AI_AvoidStartle_3rdAppeal: + if_user_order_not_eq MON_1, AI_AvoidStartle_EncourageIfAvoidMove + if_user_order_not_eq MON_2, AI_AvoidStartle_EncourageIfAvoidMove + if_user_order_not_eq MON_3, AI_AvoidStartle_EncourageIfAvoidMove + if_user_order_not_eq MON_4, AI_AvoidStartle_EncourageIfAvoidMove + end +AI_AvoidStartle_4thAppeal: + if_user_order_not_eq MON_1, AI_AvoidStartle_EncourageIfAvoidMove + if_user_order_not_eq MON_2, AI_AvoidStartle_EncourageIfAvoidMove + if_user_order_not_eq MON_3, AI_AvoidStartle_EncourageIfAvoidMove + if_user_order_not_eq MON_4, AI_AvoidStartle_EncourageIfAvoidMove + end +AI_AvoidStartle_LastAppeal: + if_user_order_not_eq MON_1, AI_AvoidStartle_EncourageIfAvoidMove + if_user_order_not_eq MON_2, AI_AvoidStartle_EncourageIfAvoidMove + if_user_order_not_eq MON_3, AI_AvoidStartle_EncourageIfAvoidMove + if_user_order_not_eq MON_4, AI_AvoidStartle_EncourageIfAvoidMove + end +AI_AvoidStartle_Encourage: score +10 end - +AI_AvoidStartle_End: end -@ Unreferenced AI routine to encourage the most appealing move. - if_most_appealing_move ContestUnreferenced_score2 +@ Unused +AI_PreferMostAppealingMove: + if_most_appealing_move AI_PreferMostAppealingMove_Encourage end -ContestUnreferenced_score2: +AI_PreferMostAppealingMove_Encourage: score +10 end +@ Discourages using the same move multiple times if it would get boring AI_CheckBoring: - if_effect_eq CONTEST_EFFECT_REPETITION_NOT_BORING, AI_end_081DC27F - if_move_used_count_eq 1, AI_score1_081DC27F - if_move_used_count_eq 2, AI_score2_081DC27F - if_move_used_count_eq 3, AI_score3_081DC27F - if_move_used_count_eq 4, AI_score4_081DC27F - end -AI_score1_081DC27F: + if_effect_eq CONTEST_EFFECT_REPETITION_NOT_BORING, AI_CheckBoring_NotBoring + if_move_used_count_eq 1, AI_CheckBoring_1stRepeat + if_move_used_count_eq 2, AI_CheckBoring_2ndRepeat + if_move_used_count_eq 3, AI_CheckBoring_3rdRepeat + if_move_used_count_eq 4, AI_CheckBoring_4thRepeat + @ No repeats + end +AI_CheckBoring_1stRepeat: score -5 end -AI_score2_081DC27F: +AI_CheckBoring_2ndRepeat: score -15 end -AI_score3_081DC27F: +AI_CheckBoring_3rdRepeat: score -20 end -AI_score4_081DC27F: +AI_CheckBoring_4thRepeat: score -25 end -AI_end_081DC27F: +AI_CheckBoring_NotBoring: end +@ Strongly encourages using an exciting move if user is in a position to receive the max excitement bonus +@ Encourages using exciting moves in general +@ If the user doesnt have a good exciting move to use, then encourage lowering excitement to prevent +@ opponents from benefitting from the excitement AI_CheckExcitement: - if_move_excitement_less_than 0, AI_contest09_081DC2AB - if_move_excitement_eq 0, AI_contest7D_4_081DC2AB - if_move_excitement_eq 1, AI_contest3D_081DC2AB - end -AI_contest09_081DC2AB: - if_excitement_eq 4, AI_contest0F_1_081DC2AB - if_excitement_eq 3, AI_contest0F_2_081DC2AB - if_user_has_exciting_move AI_end_081DC2AB + if_move_excitement_less_than 0, AI_CheckExcitement_Negative + if_move_excitement_eq 0, AI_CheckExcitement_Neutral + if_move_excitement_eq 1, AI_CheckExcitement_Positive + end +AI_CheckExcitement_Negative: + if_excitement_eq 4, AI_CheckExcitement_Negative_1AwayFromMax + if_excitement_eq 3, AI_CheckExcitement_Negative_2AwayFromMax + if_user_has_exciting_move AI_CheckExcitement_End score +15 end -AI_contest0F_1_081DC2AB: - if_user_order_not_eq MON_1, AI_contest7D_1_081DC2AB - if_random 51, AI_end_081DC2AB +AI_CheckExcitement_Negative_1AwayFromMax: + if_user_order_not_eq MON_1, AI_CheckExcitement_Negative_1AwayFromMax_Not1stUp + if_random_less_than 51, AI_CheckExcitement_End score +20 end -AI_contest7D_1_081DC2AB: - if_random 127, AI_end_081DC2AB +AI_CheckExcitement_Negative_1AwayFromMax_Not1stUp: + if_random_less_than 127, AI_CheckExcitement_End score -10 end -AI_contest0F_2_081DC2AB: - if_user_order_not_eq MON_1, AI_contest7D_3_081DC2AB - if_turn_eq 4, AI_score_081DC2AB -AI_contest7D_2_081DC2AB: - if_random 51, AI_end_081DC2AB +AI_CheckExcitement_Negative_2AwayFromMax: + if_user_order_not_eq MON_1, AI_CheckExcitement_Negative_2AwayFromMax_Not1stUp + if_last_appeal AI_CheckExcitement_Negative_2AwayFromMax_LastAppeal + if_random_less_than 51, AI_CheckExcitement_End score +10 end -AI_score_081DC2AB: +AI_CheckExcitement_Negative_2AwayFromMax_LastAppeal: score +15 end -AI_contest7D_3_081DC2AB: - if_random 127, AI_end_081DC2AB +AI_CheckExcitement_Negative_2AwayFromMax_Not1stUp: + if_random_less_than 127, AI_CheckExcitement_End score +10 end -AI_contest7D_4_081DC2AB: - if_random 127, AI_end_081DC2AB +AI_CheckExcitement_Neutral: + if_random_less_than 127, AI_CheckExcitement_End score +10 end -AI_contest3D_081DC2AB: - if_move_used_count_more_than 0, AI_contest29_081DC2AB - if_user_order_not_eq MON_1, AI_contest7D_5_081DC2AB - if_excitement_not_eq 4, AI_contest7D_5_081DC2AB +AI_CheckExcitement_Positive: + if_move_used_count_more_than 0, AI_CheckExcitement_Positive_Repeat + if_user_order_not_eq MON_1, AI_CheckExcitement_Positive_Not1stUpForMax + if_excitement_not_eq 4, AI_CheckExcitement_Positive_Not1stUpForMax score +30 end -AI_contest7D_5_081DC2AB: - if_random 100, AI_end_081DC2AB +AI_CheckExcitement_Positive_Not1stUpForMax: + if_random_less_than 100, AI_CheckExcitement_End score +10 end -AI_contest29_081DC2AB: - if_effect_not_eq CONTEST_EFFECT_REPETITION_NOT_BORING, AI_end_081DC2AB - if_user_order_not_eq MON_1, AI_contest7D_5_081DC2AB - if_excitement_not_eq 4, AI_contest7D_5_081DC2AB +AI_CheckExcitement_Positive_Repeat: + if_effect_not_eq CONTEST_EFFECT_REPETITION_NOT_BORING, AI_CheckExcitement_End + if_user_order_not_eq MON_1, AI_CheckExcitement_Positive_Not1stUpForMax + if_excitement_not_eq 4, AI_CheckExcitement_Positive_Not1stUpForMax score +30 end -AI_end_081DC2AB: +AI_CheckExcitement_End: end -AI_CheckForCombo: - if_would_finish_combo AI_score_081DC348 - call AI_contest3F_081DC348 - call AI_contest45_081DC348 +@ Strongly encourages using a move if it would finish a combo +@ Encourages using a move if it would start a combo, esp if the user goes earlier +@ Discourages starting a combo in the last round +@ Discourages using a combo finisher when its combo starter hasnt been used yet +AI_CheckCombo: + if_would_finish_combo AI_CheckCombo_WouldFinish + call AI_CheckCombo_CheckStarter + call AI_CheckCombo_CheckFinisherWithoutStarter end -AI_contest3F_081DC348: - if_move_used_count_not_eq 0, AI_end_081DC348 - if_not_combo_starter AI_end_081DC348 - if_user_order_eq MON_1, AI_contest04_1_081DC348 - if_user_order_eq MON_2, AI_contest04_2_081DC348 - if_user_order_eq MON_3, AI_contest04_3_081DC348 - if_user_order_eq MON_4, AI_contest04_4_081DC348 +AI_CheckCombo_CheckStarter: + if_move_used_count_not_eq 0, AI_CheckCombo_End + if_not_combo_starter AI_CheckCombo_End + if_user_order_eq MON_1, AI_CheckCombo_Starter1stUp + if_user_order_eq MON_2, AI_CheckCombo_Starter2ndUp + if_user_order_eq MON_3, AI_CheckCombo_Starter3rdUp + if_user_order_eq MON_4, AI_CheckCombo_StarterLast end -AI_contest45_081DC348: - if_not_combo_finisher AI_end_081DC348 +AI_CheckCombo_CheckFinisherWithoutStarter: + if_not_combo_finisher AI_CheckCombo_End score -10 end -AI_score_081DC348: +AI_CheckCombo_WouldFinish: score +25 end -AI_contest04_1_081DC348: - if_turn_eq 4, AI_contest7D_081DC348 - if_random 150, AI_end_081DC348 +AI_CheckCombo_Starter1stUp: + if_last_appeal AI_CheckCombo_StarterOnLastAppeal + if_random_less_than 150, AI_CheckCombo_End score +10 end -AI_contest04_2_081DC348: - if_turn_eq 4, AI_contest7D_081DC348 - if_random 125, AI_end_081DC348 +AI_CheckCombo_Starter2ndUp: + if_last_appeal AI_CheckCombo_StarterOnLastAppeal + if_random_less_than 125, AI_CheckCombo_End score +10 end -AI_contest04_3_081DC348: - if_turn_eq 4, AI_contest7D_081DC348 - if_random 50, AI_end_081DC348 +AI_CheckCombo_Starter3rdUp: + if_last_appeal AI_CheckCombo_StarterOnLastAppeal + if_random_less_than 50, AI_CheckCombo_End score +10 end -AI_contest04_4_081DC348: - if_turn_eq 4, AI_contest7D_081DC348 +AI_CheckCombo_StarterLast: + if_last_appeal AI_CheckCombo_StarterOnLastAppeal score +10 end -AI_contest7D_081DC348: - if_random 125, AI_end_081DC348 +AI_CheckCombo_StarterOnLastAppeal: + if_random_less_than 125, AI_CheckCombo_End score -15 end -AI_end_081DC348: - end - -AI_CheckForGoodMove: - if_effect_eq CONTEST_EFFECT_BETTER_WITH_GOOD_CONDITION, ContestEffect39 - if_effect_eq CONTEST_EFFECT_NEXT_APPEAL_EARLIER, ContestEffect40 - if_effect_eq CONTEST_EFFECT_NEXT_APPEAL_LATER, ContestEffect41 - if_effect_eq CONTEST_EFFECT_REPETITION_NOT_BORING, ContestEffect3 - if_effect_eq CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, ContestEffect38 - if_effect_eq CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, ContestEffect47 - if_effect_eq CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES, ContestEffect31 - if_effect_eq CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONE, ContestEffect32 - if_effect_eq CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED, ContestEffect46 - if_effect_eq CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, ContestEffect27 - if_effect_eq CONTEST_EFFECT_SHIFT_JUDGE_ATTENTION, ContestEffect16or17 - if_effect_eq CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, ContestEffect16or17 - if_effect_eq CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, ContestEffect_FollowingMonsNervous - if_effect_eq CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, ContestEffect18 - end - -ContestEffect39: - if_user_condition_eq 3, ContestEffect39_score1 - if_user_condition_eq 2, ContestEffect39_score2 - if_user_condition_eq 1, ContestEffect39_score3 - if_user_condition_eq 0, ContestEffect39_score4 - end -ContestEffect39_score1: +AI_CheckCombo_End: + end + +@ Checks if move should be encouraged based on its effect +AI_CheckGoodMove: + if_effect_eq CONTEST_EFFECT_BETTER_WITH_GOOD_CONDITION, AI_CGM_BetterWithGoodCondition + if_effect_eq CONTEST_EFFECT_NEXT_APPEAL_EARLIER, AI_CGM_NextAppealEarlier + if_effect_eq CONTEST_EFFECT_NEXT_APPEAL_LATER, AI_CGM_NextAppealLater + if_effect_eq CONTEST_EFFECT_REPETITION_NOT_BORING, AI_CGM_RepetitionNotBoring + if_effect_eq CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, AI_CGM_ImproveCondition + if_effect_eq CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, AI_CGM_DontExciteAudience + if_effect_eq CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES, AI_CGM_AppealAsGoodAsPrevOnes + if_effect_eq CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONE, AI_CGM_AppealAsGoodAsPrevOne + if_effect_eq CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED, AI_CGM_BetterWhenAudienceExcited + if_effect_eq CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, AI_CGM_WorsenConditionOfPrevMons + if_effect_eq CONTEST_EFFECT_SHIFT_JUDGE_ATTENTION, AI_CGM_TargetMonWithJudgesAttention + if_effect_eq CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, AI_CGM_TargetMonWithJudgesAttention + if_effect_eq CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, AI_CGM_MakeFollowingMonsNervous + if_effect_eq CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, AI_CGM_JamsOthersButMissOneTurn + end + +AI_CGM_BetterWithGoodCondition: + if_user_condition_eq 3, AI_CGM_BetterWithGoodCondition_3 + if_user_condition_eq 2, AI_CGM_BetterWithGoodCondition_2 + if_user_condition_eq 1, AI_CGM_BetterWithGoodCondition_1 + if_user_condition_eq 0, AI_CGM_BetterWithGoodCondition_0 + end +AI_CGM_BetterWithGoodCondition_3: score +20 end -ContestEffect39_score2: - if_random 125, ContestEffectEnd +AI_CGM_BetterWithGoodCondition_2: + if_random_less_than 125, AI_CGM_End score +15 end -ContestEffect39_score3: - if_random 125, ContestEffectEnd +AI_CGM_BetterWithGoodCondition_1: + if_random_less_than 125, AI_CGM_End score +5 end -ContestEffect39_score4: +AI_CGM_BetterWithGoodCondition_0: score -20 end -ContestEffect40: - if_effect_in_user_moveset CONTEST_EFFECT_BETTER_IF_FIRST, ContestEffectEnd - if_random 50, ContestEffectEnd +AI_CGM_NextAppealEarlier: + if_user_doesnt_have_move CONTEST_EFFECT_BETTER_IF_FIRST, AI_CGM_End + if_random_less_than 50, AI_CGM_End score +20 end -ContestEffect41: - if_effect_in_user_moveset CONTEST_EFFECT_BETTER_IF_LAST, ContestEffectEnd - if_random 50, ContestEffectEnd +AI_CGM_NextAppealLater: + if_user_doesnt_have_move CONTEST_EFFECT_BETTER_IF_LAST, AI_CGM_End + if_random_less_than 50, AI_CGM_End score +20 end -ContestEffect3: - if_user_order_not_eq MON_4, ContestEffectEnd - if_random 50, ContestEffectEnd +AI_CGM_RepetitionNotBoring: + if_user_order_not_eq MON_4, AI_CGM_End + if_random_less_than 50, AI_CGM_End score +15 end - if_turn_eq 4, ContestEffect3_7D - if_random 220, ContestEffect3_score + +AI_CGM_Unused: + if_last_appeal AI_CGM_Unused_LastAppeal + if_random_less_than 220, AI_CGM_Unused_Discourage score +10 end -ContestEffect3_7D: - if_random 20, ContestEffectEnd +AI_CGM_Unused_LastAppeal: + if_random_less_than 20, AI_CGM_End score +15 end -ContestEffect3_score: +AI_CGM_Unused_Discourage: score -20 end -ContestEffect38: - if_effect_in_user_moveset CONTEST_EFFECT_BETTER_WITH_GOOD_CONDITION, ContestEffect38_contest04 - if_user_condition_eq 3, ContestEffect38_score1 - if_random 50, ContestEffectEnd +@ Enourages improving condition, esp if user has moves better with good condition or on 1st appeal +@ Discourages improving condition if at max condition, or if last appeal +AI_CGM_ImproveCondition: + if_user_doesnt_have_move CONTEST_EFFECT_BETTER_WITH_GOOD_CONDITION, AI_CGM_ImproveCondition_CheckAppealNum + if_user_condition_eq 3, AI_CGM_ImproveCondition_AtMax + if_random_less_than 50, AI_CGM_End score +15 end -ContestEffect38_score1: +AI_CGM_ImproveCondition_AtMax: score -10 end -ContestEffect38_contest04: - if_turn_eq 4, ContestEffect38_score2 - if_turn_eq 0, ContestEffect38_random - if_move_used_count_eq 1, ContestEffectEnd - if_random 125, ContestEffectEnd +AI_CGM_ImproveCondition_CheckAppealNum: + if_last_appeal AI_CGM_ImproveCondition_LastAppeal + if_appeal_num_eq 0, AI_CGM_ImproveCondition_FirstAppeal + if_move_used_count_eq 1, AI_CGM_End + if_random_less_than 125, AI_CGM_End score +10 end -ContestEffect38_random: - if_random 100, ContestEffectEnd +AI_CGM_ImproveCondition_FirstAppeal: + if_random_less_than 100, AI_CGM_End score +10 end -ContestEffect38_score2: +AI_CGM_ImproveCondition_LastAppeal: score -10 end -ContestEffect47: - if_move_used_count_eq 1, ContestEffectEnd - if_user_order_eq MON_1, ContestEffect47_random - if_user_order_eq MON_2, ContestEffect47_random - if_turn_not_eq 4, ContestEffectEnd - if_user_has_exciting_move ContestEffectEnd - if_excitement_less_than 1, ContestEffectEnd +@ Encourage stopping audience excitement early in the appeal, or last appeal if no better options +AI_CGM_DontExciteAudience: + if_move_used_count_eq 1, AI_CGM_End + if_user_order_eq MON_1, AI_CGM_DontExciteAudience_EarlyTurn + if_user_order_eq MON_2, AI_CGM_DontExciteAudience_EarlyTurn + if_not_last_appeal AI_CGM_End + if_user_has_exciting_move AI_CGM_End + if_excitement_less_than 1, AI_CGM_End score +10 end -ContestEffect47_random: - if_random 127, ContestEffectEnd +AI_CGM_DontExciteAudience_EarlyTurn: + if_random_less_than 127, AI_CGM_End score +10 end -ContestEffect31: - if_user_order_eq MON_2, ContestEffect31_score1 - if_user_order_eq MON_3, ContestEffect31_score2 - if_user_order_eq MON_4, ContestEffect31_score3 +@ Encourages move the later the user goes +AI_CGM_AppealAsGoodAsPrevOnes: + if_user_order_eq MON_2, AI_CGM_AppealAsGoodAsPrevOnes_2ndUp + if_user_order_eq MON_3, AI_CGM_AppealAsGoodAsPrevOnes_3rdUp + if_user_order_eq MON_4, AI_CGM_AppealAsGoodAsPrevOnes_Last end -ContestEffect31_score1: +AI_CGM_AppealAsGoodAsPrevOnes_2ndUp: score +5 end -ContestEffect31_score2: +AI_CGM_AppealAsGoodAsPrevOnes_3rdUp: score +15 end -ContestEffect31_score3: +AI_CGM_AppealAsGoodAsPrevOnes_Last: score +20 end -ContestEffect32: - if_user_order_eq MON_1, ContestEffect32_score1 - if_user_order_eq MON_2, ContestEffect32_score2 - if_user_order_eq MON_3, ContestEffect32_score3 - if_user_order_eq MON_4, ContestEffect32_score5 +@ Encourages move more for each opponent who will have a turn before the user +AI_CGM_AppealAsGoodAsPrevOne: + if_user_order_eq MON_1, AI_CGM_AppealAsGoodAsPrevOne_1stUp + if_user_order_eq MON_2, AI_CGM_AppealAsGoodAsPrevOne_2ndUp + if_user_order_eq MON_3, AI_CGM_AppealAsGoodAsPrevOne_3rdUp + if_user_order_eq MON_4, AI_CGM_AppealAsGoodAsPrevOne_Last end -ContestEffect32_score1: +AI_CGM_AppealAsGoodAsPrevOne_1stUp: score -10 end -ContestEffect32_score2: - if_cannot_participate MON_1, ContestEffectEnd +AI_CGM_AppealAsGoodAsPrevOne_2ndUp: + if_cannot_participate MON_1, AI_CGM_End score +5 end -ContestEffect32_score3: - if_cannot_participate MON_1, ContestEffect32_score4 +AI_CGM_AppealAsGoodAsPrevOne_3rdUp: + if_cannot_participate MON_1, AI_CGM_AppealAsGoodAsPrevOne_3rdUp_CheckMon2 score +5 - jump ContestEffect32_score4 + goto AI_CGM_AppealAsGoodAsPrevOne_3rdUp_CheckMon2 end -ContestEffect32_score4: - if_cannot_participate MON_2, ContestEffectEnd +AI_CGM_AppealAsGoodAsPrevOne_3rdUp_CheckMon2: + if_cannot_participate MON_2, AI_CGM_End score +5 end -ContestEffect32_score5: - if_cannot_participate MON_1, ContestEffect32_score6 +AI_CGM_AppealAsGoodAsPrevOne_Last: + if_cannot_participate MON_1, AI_CGM_AppealAsGoodAsPrevOne_Last_CheckMon2 score +5 - jump ContestEffect32_score6 + goto AI_CGM_AppealAsGoodAsPrevOne_Last_CheckMon2 end -ContestEffect32_score6: - if_cannot_participate MON_2, ContestEffect32_score7 +AI_CGM_AppealAsGoodAsPrevOne_Last_CheckMon2: + if_cannot_participate MON_2, AI_CGM_AppealAsGoodAsPrevOne_Last_CheckMon3 score +5 - jump ContestEffect32_score7 + goto AI_CGM_AppealAsGoodAsPrevOne_Last_CheckMon3 end -ContestEffect32_score7: - if_cannot_participate MON_3, ContestEffectEnd +AI_CGM_AppealAsGoodAsPrevOne_Last_CheckMon3: + if_cannot_participate MON_3, AI_CGM_End score +5 end -ContestEffect46: - if_user_order_eq MON_1, ContestEffect46_05 - if_user_order_more_than MON_1, ContestEffect46_score4 +@ Encourage move if audience is close to full exictement and user goes first +@ See bug note, only does this on 1st appeal (when it will never happen) +AI_CGM_BetterWhenAudienceExcited: + if_user_order_eq MON_1, AI_CGM_BetterWhenAudienceExcited_1stUp + if_user_order_more_than MON_1, AI_CGM_BetterWhenAudienceExcited_Not1stUp end -ContestEffect46_05: - if_turn_not_eq 0, ContestEffect46_score1 - if_excitement_eq 4, ContestEffect46_score2 - if_excitement_eq 3, ContestEffect46_score3 +AI_CGM_BetterWhenAudienceExcited_1stUp: + @ BUG: Should be if_appeal_num_eq 0 + @ 1st up on 1st appeal excitement will always be 0 + if_appeal_num_not_eq 0, AI_CGM_BetterWhenAudienceExcited_Not1stAppeal + if_excitement_eq 4, AI_CGM_BetterWhenAudienceExcited_1AwayFromMax + if_excitement_eq 3, AI_CGM_BetterWhenAudienceExcited_2AwayFromMax end -ContestEffect46_score1: - if_random 125, ContestEffectEnd +AI_CGM_BetterWhenAudienceExcited_Not1stAppeal: + if_random_less_than 125, AI_CGM_End score -15 end -ContestEffect46_score2: - if_random 125, ContestEffectEnd +AI_CGM_BetterWhenAudienceExcited_1AwayFromMax: + if_random_less_than 125, AI_CGM_End score +20 end -ContestEffect46_score3: - if_random 125, ContestEffectEnd +AI_CGM_BetterWhenAudienceExcited_2AwayFromMax: + if_random_less_than 125, AI_CGM_End score +15 end -ContestEffect46_score4: - if_random 178, ContestEffectEnd +AI_CGM_BetterWhenAudienceExcited_Not1stUp: + if_random_less_than 178, AI_CGM_End score +10 end -ContestEffect27: - if_user_order_eq MON_1, ContestEffectEnd - jump ContestEffect27_55_1 +@ Encourage move more for each condition star the prev mons have +AI_CGM_WorsenConditionOfPrevMons: + if_user_order_eq MON_1, AI_CGM_End + goto AI_CGM_WorsenConditionOfPrevMons_CheckMon1 end -ContestEffect27_55_1: - if_cannot_participate MON_1, ContestEffect27_noscore - if_condition_eq MON_1, 0, ContestEffect27_noscore - if_condition_eq MON_1, 1, ContestEffect27_score1 - if_condition_eq MON_1, 2, ContestEffect27_score2 - if_condition_eq MON_1, 3, ContestEffect27_score3 +AI_CGM_WorsenConditionOfPrevMons_CheckMon1: + if_cannot_participate MON_1, AI_CGM_WorsenConditionOfPrevMons_TryCheckMon2 + if_condition_eq MON_1, 0, AI_CGM_WorsenConditionOfPrevMons_TryCheckMon2 + if_condition_eq MON_1, 1, AI_CGM_WorsenConditionOfPrevMons_Mon1Has1Star + if_condition_eq MON_1, 2, AI_CGM_WorsenConditionOfPrevMons_Mon1Has2Stars + if_condition_eq MON_1, 3, AI_CGM_WorsenConditionOfPrevMons_Mon1Has3Stars end -ContestEffect27_score1: - if_random 125, ContestEffect27_55_2 +AI_CGM_WorsenConditionOfPrevMons_Mon1Has1Star: + if_random_less_than 125, AI_CGM_WorsenConditionOfPrevMons_CheckMon2 score +5 - if_user_order_more_than MON_2, ContestEffect27_55_2 + if_user_order_more_than MON_2, AI_CGM_WorsenConditionOfPrevMons_CheckMon2 end -ContestEffect27_score2: - if_random 125, ContestEffect27_55_2 +AI_CGM_WorsenConditionOfPrevMons_Mon1Has2Stars: + if_random_less_than 125, AI_CGM_WorsenConditionOfPrevMons_CheckMon2 score +10 - if_user_order_more_than MON_2, ContestEffect27_55_2 + if_user_order_more_than MON_2, AI_CGM_WorsenConditionOfPrevMons_CheckMon2 end -ContestEffect27_score3: - if_random 125, ContestEffect27_55_2 +AI_CGM_WorsenConditionOfPrevMons_Mon1Has3Stars: + if_random_less_than 125, AI_CGM_WorsenConditionOfPrevMons_CheckMon2 score +15 - if_user_order_more_than MON_2, ContestEffect27_55_2 + if_user_order_more_than MON_2, AI_CGM_WorsenConditionOfPrevMons_CheckMon2 end -ContestEffect27_noscore: - if_user_order_more_than MON_2, ContestEffect27_55_2 +AI_CGM_WorsenConditionOfPrevMons_TryCheckMon2: + if_user_order_more_than MON_2, AI_CGM_WorsenConditionOfPrevMons_CheckMon2 end -ContestEffect27_55_2: - if_cannot_participate MON_2, ContestEffect27_noscore2 - if_condition_eq MON_2, 0, ContestEffect27_noscore2 - if_condition_eq MON_2, 1, ContestEffect27_score4 - if_condition_eq MON_2, 2, ContestEffect27_score5 - if_condition_eq MON_2, 3, ContestEffect27_score6 +AI_CGM_WorsenConditionOfPrevMons_CheckMon2: + if_cannot_participate MON_2, AI_CGM_WorsenConditionOfPrevMons_TryCheckMon3 + if_condition_eq MON_2, 0, AI_CGM_WorsenConditionOfPrevMons_TryCheckMon3 + if_condition_eq MON_2, 1, AI_CGM_WorsenConditionOfPrevMons_Mon2Has1Star + if_condition_eq MON_2, 2, AI_CGM_WorsenConditionOfPrevMons_Mon2Has2Stars + if_condition_eq MON_2, 3, AI_CGM_WorsenConditionOfPrevMons_Mon2Has3Stars end -ContestEffect27_score4: - if_random 125, ContestEffect27_55_3 +AI_CGM_WorsenConditionOfPrevMons_Mon2Has1Star: + if_random_less_than 125, AI_CGM_WorsenConditionOfPrevMons_CheckMon3 score +5 - if_user_order_more_than MON_3, ContestEffect27_55_3 + if_user_order_more_than MON_3, AI_CGM_WorsenConditionOfPrevMons_CheckMon3 end -ContestEffect27_score5: - if_random 125, ContestEffect27_55_3 +AI_CGM_WorsenConditionOfPrevMons_Mon2Has2Stars: + if_random_less_than 125, AI_CGM_WorsenConditionOfPrevMons_CheckMon3 score +10 - if_user_order_more_than MON_3, ContestEffect27_55_3 + if_user_order_more_than MON_3, AI_CGM_WorsenConditionOfPrevMons_CheckMon3 end -ContestEffect27_score6: - if_random 125, ContestEffect27_55_3 +AI_CGM_WorsenConditionOfPrevMons_Mon2Has3Stars: + if_random_less_than 125, AI_CGM_WorsenConditionOfPrevMons_CheckMon3 score +15 - if_user_order_more_than MON_3, ContestEffect27_55_3 + if_user_order_more_than MON_3, AI_CGM_WorsenConditionOfPrevMons_CheckMon3 end -ContestEffect27_noscore2: - if_user_order_more_than MON_3, ContestEffect27_55_3 +AI_CGM_WorsenConditionOfPrevMons_TryCheckMon3: + if_user_order_more_than MON_3, AI_CGM_WorsenConditionOfPrevMons_CheckMon3 end -ContestEffect27_55_3: - if_cannot_participate MON_3, ContestEffect27_end - if_condition_eq MON_3, 0, ContestEffect27_end - if_condition_eq MON_3, 1, ContestEffect27_score7 - if_condition_eq MON_3, 2, ContestEffect27_score8 - if_condition_eq MON_3, 3, ContestEffect27_score9 +AI_CGM_WorsenConditionOfPrevMons_CheckMon3: + if_cannot_participate MON_3, AI_CGM_WorsenConditionOfPrevMons_end + if_condition_eq MON_3, 0, AI_CGM_WorsenConditionOfPrevMons_end + if_condition_eq MON_3, 1, AI_CGM_WorsenConditionOfPrevMons_Mon3Has1Star + if_condition_eq MON_3, 2, AI_CGM_WorsenConditionOfPrevMons_Mon3Has2Stars + if_condition_eq MON_3, 3, AI_CGM_WorsenConditionOfPrevMons_Mon3Has3Stars end -ContestEffect27_score7: - if_random 125, ContestEffectEnd +AI_CGM_WorsenConditionOfPrevMons_Mon3Has1Star: + if_random_less_than 125, AI_CGM_End score +5 end -ContestEffect27_score8: - if_random 125, ContestEffectEnd +AI_CGM_WorsenConditionOfPrevMons_Mon3Has2Stars: + if_random_less_than 125, AI_CGM_End score +10 end -ContestEffect27_score9: - if_random 125, ContestEffectEnd +AI_CGM_WorsenConditionOfPrevMons_Mon3Has3Stars: + if_random_less_than 125, AI_CGM_End score +15 end -ContestEffect27_end: +AI_CGM_WorsenConditionOfPrevMons_end: end -ContestEffect16or17: - if_user_order_eq MON_1, ContestEffectEnd - jump ContestEffect16or17_55 +@ Encourage if a prev mon has started a combo, esp if they havent completed it yet +@ BUG: Incorrectly uses if_used_combo_starter below, instead of if_not_used_combo_starter +@ As a result it encourages move if a prev mon has not begun a combo +AI_CGM_TargetMonWithJudgesAttention: + if_user_order_eq MON_1, AI_CGM_End + goto AI_CGM_TargetMonWithJudgesAttention_CheckMon1 end -ContestEffect16or17_55: - if_cannot_participate MON_1, ContestEffect16or17_0E_1 - if_used_combo_starter_eq MON_1, TRUE, ContestEffect16or17_0E_1 - if_random 125, ContestEffect16or17_0E_1 +AI_CGM_TargetMonWithJudgesAttention_CheckMon1: + if_cannot_participate MON_1, AI_CGM_TargetMonWithJudgesAttention_CheckMon2 + if_used_combo_starter MON_1, AI_CGM_TargetMonWithJudgesAttention_CheckMon2 + if_random_less_than 125, AI_CGM_TargetMonWithJudgesAttention_CheckMon2 score +2 - contest_58 MON_1, ContestEffect16or17_0E_1 + if_not_completed_combo MON_1, AI_CGM_TargetMonWithJudgesAttention_CheckMon2 score +8 end -ContestEffect16or17_0E_1: - if_user_order_eq MON_2, ContestEffectEnd - if_cannot_participate MON_2, ContestEffect16or17_0E_2 - if_used_combo_starter_eq MON_2, TRUE, ContestEffect16or17_0E_2 - if_random 125, ContestEffect16or17_0E_2 +AI_CGM_TargetMonWithJudgesAttention_CheckMon2: + if_user_order_eq MON_2, AI_CGM_End + if_cannot_participate MON_2, AI_CGM_TargetMonWithJudgesAttention_CheckMon3 + if_used_combo_starter MON_2, AI_CGM_TargetMonWithJudgesAttention_CheckMon3 + if_random_less_than 125, AI_CGM_TargetMonWithJudgesAttention_CheckMon3 score +2 - contest_58 MON_2, ContestEffect16or17_0E_2 + if_not_completed_combo MON_2, AI_CGM_TargetMonWithJudgesAttention_CheckMon3 score +8 end -ContestEffect16or17_0E_2: - if_user_order_eq MON_3, ContestEffectEnd - if_cannot_participate MON_3, ContestEffectEnd - if_used_combo_starter_eq MON_3, TRUE, ContestEffectEnd - if_random 125, ContestEffectEnd +AI_CGM_TargetMonWithJudgesAttention_CheckMon3: + if_user_order_eq MON_3, AI_CGM_End + if_cannot_participate MON_3, AI_CGM_End + if_used_combo_starter MON_3, AI_CGM_End + if_random_less_than 125, AI_CGM_End score +2 - contest_58 MON_3, ContestEffectEnd + if_not_completed_combo MON_3, AI_CGM_End score +8 end -ContestEffect_FollowingMonsNervous: - if_user_order_eq MON_4, ContestEffectEnd - jump ContestEffect_FollowingMonsNervous_CheckMon4 +@ Encourage making mons nervous that have started a combo and can appeal after the user +AI_CGM_MakeFollowingMonsNervous: + if_user_order_eq MON_4, AI_CGM_End + goto AI_CGM_MakeFollowingMonsNervous_CheckMon4 end -ContestEffect_FollowingMonsNervous_CheckMon4: - if_cannot_participate MON_4, ContestEffect_FollowingMonsNervous_CheckMon3 - if_used_combo_starter_eq MON_4, FALSE, ContestEffect_FollowingMonsNervous_CheckMon3 +AI_CGM_MakeFollowingMonsNervous_CheckMon4: + if_cannot_participate MON_4, AI_CGM_MakeFollowingMonsNervous_CheckMon3 + if_not_used_combo_starter MON_4, AI_CGM_MakeFollowingMonsNervous_CheckMon3 score +5 - if_random 125, ContestEffect16or17_0E_1 + if_random_less_than 125, AI_CGM_TargetMonWithJudgesAttention_CheckMon2 score +5 end -ContestEffect_FollowingMonsNervous_CheckMon3: - if_user_order_eq MON_3, ContestEffectEnd - if_cannot_participate MON_3, ContestEffect_FollowingMonsNervous_CheckMon2 - if_used_combo_starter_eq MON_3, FALSE, ContestEffect_FollowingMonsNervous_CheckMon2 +AI_CGM_MakeFollowingMonsNervous_CheckMon3: + if_user_order_eq MON_3, AI_CGM_End + if_cannot_participate MON_3, AI_CGM_MakeFollowingMonsNervous_CheckMon2 + if_not_used_combo_starter MON_3, AI_CGM_MakeFollowingMonsNervous_CheckMon2 score +5 - if_random 125, ContestEffect16or17_0E_2 + if_random_less_than 125, AI_CGM_TargetMonWithJudgesAttention_CheckMon3 score +5 end -ContestEffect_FollowingMonsNervous_CheckMon2: - if_user_order_eq MON_2, ContestEffectEnd - if_cannot_participate MON_2, ContestEffectEnd - if_used_combo_starter_eq MON_2, FALSE, ContestEffectEnd +AI_CGM_MakeFollowingMonsNervous_CheckMon2: + if_user_order_eq MON_2, AI_CGM_End + if_cannot_participate MON_2, AI_CGM_End + if_not_used_combo_starter MON_2, AI_CGM_End score +5 - if_random 125, ContestEffectEnd + if_random_less_than 125, AI_CGM_End score +5 end -ContestEffect18: - if_turn_eq 4, ContestEffect18_score1 - jump ContestEffect18_0E +@ Encourages move if users turn is later, or if its the last appeal +AI_CGM_JamsOthersButMissOneTurn: + if_last_appeal AI_CGM_JamsOthersButMissOneTurn_LastAppeal + goto AI_CGM_JamsOthersButMissOneTurn_TurnOrder end -ContestEffect18_score1: +AI_CGM_JamsOthersButMissOneTurn_LastAppeal: score +5 - jump ContestEffect18_0E + goto AI_CGM_JamsOthersButMissOneTurn_TurnOrder end -ContestEffect18_0E: - if_user_order_eq MON_1, ContestEffect18_score2 - if_user_order_eq MON_2, ContestEffect18_random1 - if_user_order_eq MON_3, ContestEffect18_random2 - if_user_order_eq MON_4, ContestEffect18_random3 +AI_CGM_JamsOthersButMissOneTurn_TurnOrder: + if_user_order_eq MON_1, AI_CGM_JamsOthersButMissOneTurn_1stUp + if_user_order_eq MON_2, AI_CGM_JamsOthersButMissOneTurn_2ndUp + if_user_order_eq MON_3, AI_CGM_JamsOthersButMissOneTurn_3rdUp + if_user_order_eq MON_4, AI_CGM_JamsOthersButMissOneTurn_Last end -ContestEffect18_score2: +AI_CGM_JamsOthersButMissOneTurn_1stUp: score -15 end -ContestEffect18_random1: - if_random 125, ContestEffectEnd +AI_CGM_JamsOthersButMissOneTurn_2ndUp: + if_random_less_than 125, AI_CGM_End score -10 end -ContestEffect18_random2: - if_random 125, ContestEffectEnd +AI_CGM_JamsOthersButMissOneTurn_3rdUp: + if_random_less_than 125, AI_CGM_End score +5 end -ContestEffect18_random3: - if_random 125, ContestEffectEnd +AI_CGM_JamsOthersButMissOneTurn_Last: + if_random_less_than 125, AI_CGM_End score +15 end -ContestEffectEnd: +AI_CGM_End: end @ Randomly encourage moves in Cute, Smart, and Tough contests. AI_Erratic: - if_contest_type_eq CONTEST_CUTE, Erratic_CuteSmartTough - if_contest_type_eq CONTEST_SMART, Erratic_CuteSmartTough - if_contest_type_eq CONTEST_TOUGH, Erratic_CuteSmartTough + if_contest_type_eq CONTEST_CATEGORY_CUTE, AI_Erratic_CuteSmartTough + if_contest_type_eq CONTEST_CATEGORY_SMART, AI_Erratic_CuteSmartTough + if_contest_type_eq CONTEST_CATEGORY_TOUGH, AI_Erratic_CuteSmartTough end -Erratic_CuteSmartTough: - if_random 125, Erratic_NoScoreIncrease +AI_Erratic_CuteSmartTough: + if_random_less_than 125, AI_Erratic_End score +10 end -Erratic_NoScoreIncrease: - end - -AI_CheckForBadMove: - if_effect_eq CONTEST_EFFECT_STARTLE_FRONT_MON, ContestEffect2_8 - if_effect_eq CONTEST_EFFECT_STARTLE_PREV_MON, ContestEffect2_8 - if_effect_eq CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, ContestEffect2_8 - if_effect_eq CONTEST_EFFECT_STARTLE_PREV_MON_2, ContestEffect2_8 - if_effect_eq CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONE, ContestEffect2_8 - if_effect_eq CONTEST_EFFECT_BETTER_IF_SAME_TYPE, ContestEffect2_8 - if_effect_eq CONTEST_EFFECT_BETTER_IF_DIFF_TYPE, ContestEffect2_8 - if_effect_eq CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, ContestEffect2_8 - if_effect_eq CONTEST_EFFECT_SLIGHTLY_STARTLE_PREV_MONS, ContestEffect2_9 - if_effect_eq CONTEST_EFFECT_STARTLE_PREV_MONS, ContestEffect2_9 - if_effect_eq CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, ContestEffect2_9 - if_effect_eq CONTEST_EFFECT_STARTLE_PREV_MONS_2, ContestEffect2_9 - if_effect_eq CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, ContestEffect2_9 - if_effect_eq CONTEST_EFFECT_SHIFT_JUDGE_ATTENTION, ContestEffect2_9 - if_effect_eq CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, ContestEffect2_9 - if_effect_eq CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, ContestEffect2_9 - if_effect_eq CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, ContestEffect2_9 - if_effect_eq CONTEST_EFFECT_STARTLE_MONS_COOL_APPEAL, ContestEffect2_9 - if_effect_eq CONTEST_EFFECT_STARTLE_MONS_BEAUTY_APPEAL, ContestEffect2_9 - if_effect_eq CONTEST_EFFECT_STARTLE_MONS_CUTE_APPEAL, ContestEffect2_9 - if_effect_eq CONTEST_EFFECT_STARTLE_MONS_SMART_APPEAL, ContestEffect2_9 - if_effect_eq CONTEST_EFFECT_STARTLE_MONS_TOUGH_APPEAL, ContestEffect2_9 - if_effect_eq CONTEST_EFFECT_BADLY_STARTLES_MONS_IN_GOOD_CONDITION, ContestEffect2_9 - if_effect_eq CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, ContestEffect2_9 - if_effect_eq CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES, ContestEffect2_9 - if_effect_eq CONTEST_EFFECT_MAKE_FOLLOWING_MON_NERVOUS, ContestEffect2_25 - if_effect_eq CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, ContestEffect2_26 - if_effect_eq CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, ContestEffect2_26 - if_effect_eq CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, ContestEffect2_38 - if_effect_eq CONTEST_EFFECT_AVOID_STARTLE_ONCE, ContestEffect2_4 - if_effect_eq CONTEST_EFFECT_AVOID_STARTLE, ContestEffect2_4 - if_effect_eq CONTEST_EFFECT_AVOID_STARTLE_SLIGHTLY, ContestEffect2_4 - if_effect_eq CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES, ContestEffect2_2 - end - -ContestEffect2_8: - if_user_order_eq MON_1, ContestEffect2_8_score1 - if_user_order_eq MON_2, ContestEffect2_8_score2 - if_user_order_eq MON_3, ContestEffect2_8_score3 - if_user_order_eq MON_4, ContestEffect2_8_score4 - end -ContestEffect2_8_score1: +AI_Erratic_End: + end + +@ Checks if move should be discouraged based on its effect +AI_CheckBadMove: + if_effect_eq CONTEST_EFFECT_STARTLE_FRONT_MON, AI_CBM_DependsOnPrevMon + if_effect_eq CONTEST_EFFECT_STARTLE_PREV_MON, AI_CBM_DependsOnPrevMon + if_effect_eq CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON, AI_CBM_DependsOnPrevMon + if_effect_eq CONTEST_EFFECT_STARTLE_PREV_MON_2, AI_CBM_DependsOnPrevMon + if_effect_eq CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONE, AI_CBM_DependsOnPrevMon + if_effect_eq CONTEST_EFFECT_BETTER_IF_SAME_TYPE, AI_CBM_DependsOnPrevMon + if_effect_eq CONTEST_EFFECT_BETTER_IF_DIFF_TYPE, AI_CBM_DependsOnPrevMon + if_effect_eq CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL, AI_CBM_DependsOnPrevMon + if_effect_eq CONTEST_EFFECT_SLIGHTLY_STARTLE_PREV_MONS, AI_CBM_DependsOnPrevMons + if_effect_eq CONTEST_EFFECT_STARTLE_PREV_MONS, AI_CBM_DependsOnPrevMons + if_effect_eq CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS, AI_CBM_DependsOnPrevMons + if_effect_eq CONTEST_EFFECT_STARTLE_PREV_MONS_2, AI_CBM_DependsOnPrevMons + if_effect_eq CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION, AI_CBM_DependsOnPrevMons + if_effect_eq CONTEST_EFFECT_SHIFT_JUDGE_ATTENTION, AI_CBM_DependsOnPrevMons + if_effect_eq CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, AI_CBM_DependsOnPrevMons + if_effect_eq CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL, AI_CBM_DependsOnPrevMons + if_effect_eq CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS, AI_CBM_DependsOnPrevMons + if_effect_eq CONTEST_EFFECT_STARTLE_MONS_COOL_APPEAL, AI_CBM_DependsOnPrevMons + if_effect_eq CONTEST_EFFECT_STARTLE_MONS_BEAUTY_APPEAL, AI_CBM_DependsOnPrevMons + if_effect_eq CONTEST_EFFECT_STARTLE_MONS_CUTE_APPEAL, AI_CBM_DependsOnPrevMons + if_effect_eq CONTEST_EFFECT_STARTLE_MONS_SMART_APPEAL, AI_CBM_DependsOnPrevMons + if_effect_eq CONTEST_EFFECT_STARTLE_MONS_TOUGH_APPEAL, AI_CBM_DependsOnPrevMons + if_effect_eq CONTEST_EFFECT_BADLY_STARTLES_MONS_IN_GOOD_CONDITION, AI_CBM_DependsOnPrevMons + if_effect_eq CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS, AI_CBM_DependsOnPrevMons + if_effect_eq CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES, AI_CBM_DependsOnPrevMons + if_effect_eq CONTEST_EFFECT_MAKE_FOLLOWING_MON_NERVOUS, AI_CBM_DependsOnNextMon + if_effect_eq CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS, AI_CBM_DependsOnNextMons + if_effect_eq CONTEST_EFFECT_DONT_EXCITE_AUDIENCE, AI_CBM_DependsOnNextMons + if_effect_eq CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, AI_CBM_ImproveCondition + if_effect_eq CONTEST_EFFECT_AVOID_STARTLE_ONCE, AI_CBM_AvoidStartle + if_effect_eq CONTEST_EFFECT_AVOID_STARTLE, AI_CBM_AvoidStartle + if_effect_eq CONTEST_EFFECT_AVOID_STARTLE_SLIGHTLY, AI_CBM_AvoidStartle + if_effect_eq CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES, AI_CBM_NoMoreMoves + end + +@ If previous mon is skipping turn (or user is first), discourage move +AI_CBM_DependsOnPrevMon: + if_user_order_eq MON_1, AI_CBM_DependsOnPrevMon_1stUp + if_user_order_eq MON_2, AI_CBM_DependsOnPrevMon_2ndUp + if_user_order_eq MON_3, AI_CBM_DependsOnPrevMon_3rdUp + if_user_order_eq MON_4, AI_CBM_DependsOnPrevMon_Last + end +AI_CBM_DependsOnPrevMon_1stUp: score -10 end -ContestEffect2_8_score2: - if_can_participate MON_1, ContestEffectEnd2 +AI_CBM_DependsOnPrevMon_2ndUp: + if_can_participate MON_1, AI_CBM_End score -10 end -ContestEffect2_8_score3: - if_can_participate MON_2, ContestEffectEnd2 +AI_CBM_DependsOnPrevMon_3rdUp: + if_can_participate MON_2, AI_CBM_End score -10 end -ContestEffect2_8_score4: - if_can_participate MON_3, ContestEffectEnd2 +AI_CBM_DependsOnPrevMon_Last: + if_can_participate MON_3, AI_CBM_End score -10 end -ContestEffect2_9: - if_user_order_eq MON_1, ContestEffect2_9_score1 - if_user_order_eq MON_2, ContestEffect2_9_score2 - if_user_order_eq MON_3, ContestEffect2_9_score3 - if_user_order_eq MON_4, ContestEffect2_9_score4 +@ If previous mons are all skipping turns (or user is first), discourage move +AI_CBM_DependsOnPrevMons: + if_user_order_eq MON_1, AI_CBM_DependsOnPrevMons_1stUp + if_user_order_eq MON_2, AI_CBM_DependsOnPrevMons_2ndUp + if_user_order_eq MON_3, AI_CBM_DependsOnPrevMons_3rdUp + if_user_order_eq MON_4, AI_CBM_DependsOnPrevMons_Last end -ContestEffect2_9_score1: +AI_CBM_DependsOnPrevMons_1stUp: score -20 end -ContestEffect2_9_score2: - if_can_participate MON_1, ContestEffectEnd2 +AI_CBM_DependsOnPrevMons_2ndUp: + if_can_participate MON_1, AI_CBM_End score -15 end -ContestEffect2_9_score3: - if_can_participate MON_1, ContestEffectEnd2 - if_can_participate MON_2, ContestEffectEnd2 +AI_CBM_DependsOnPrevMons_3rdUp: + if_can_participate MON_1, AI_CBM_End + if_can_participate MON_2, AI_CBM_End score -15 end -ContestEffect2_9_score4: - if_can_participate MON_1, ContestEffectEnd2 - if_can_participate MON_2, ContestEffectEnd2 - if_can_participate MON_3, ContestEffectEnd2 +AI_CBM_DependsOnPrevMons_Last: + if_can_participate MON_1, AI_CBM_End + if_can_participate MON_2, AI_CBM_End + if_can_participate MON_3, AI_CBM_End score -15 end -ContestEffect2_25: - if_user_order_eq MON_1, ContestEffect2_25_score1 - if_user_order_eq MON_2, ContestEffect2_25_score2 - if_user_order_eq MON_3, ContestEffect2_25_score3 +@ If next mon is skipping turn (or user is last), discourage move +AI_CBM_DependsOnNextMon: + if_user_order_eq MON_1, AI_CBM_DependsOnNextMon_1stUp + if_user_order_eq MON_2, AI_CBM_DependsOnNextMon_2ndUp + if_user_order_eq MON_3, AI_CBM_DependsOnNextMon_3rdUp score -10 end -ContestEffect2_25_score1: - if_can_participate MON_2, ContestEffectEnd2 +AI_CBM_DependsOnNextMon_1stUp: + if_can_participate MON_2, AI_CBM_End score -10 end -ContestEffect2_25_score2: - if_can_participate MON_3, ContestEffectEnd2 +AI_CBM_DependsOnNextMon_2ndUp: + if_can_participate MON_3, AI_CBM_End score -10 end -ContestEffect2_25_score3: - if_can_participate MON_4, ContestEffectEnd2 +AI_CBM_DependsOnNextMon_3rdUp: + if_can_participate MON_4, AI_CBM_End score -10 end -ContestEffect2_26: - if_user_order_eq MON_1, ContestEffect2_26_score1 - if_user_order_eq MON_2, ContestEffect2_26_score2 - if_user_order_eq MON_3, ContestEffect2_26_score3 +@ If next mons are all skipping turns (or user is last), discourage move +AI_CBM_DependsOnNextMons: + if_user_order_eq MON_1, AI_CBM_DependsOnNextMons_1stUp + if_user_order_eq MON_2, AI_CBM_DependsOnNextMons_2ndUp + if_user_order_eq MON_3, AI_CBM_DependsOnNextMons_3rdUp score -10 end -ContestEffect2_26_score1: - if_can_participate MON_2, ContestEffectEnd2 - if_can_participate MON_3, ContestEffectEnd2 - if_can_participate MON_4, ContestEffectEnd2 +AI_CBM_DependsOnNextMons_1stUp: + if_can_participate MON_2, AI_CBM_End + if_can_participate MON_3, AI_CBM_End + if_can_participate MON_4, AI_CBM_End score -10 end -ContestEffect2_26_score2: - if_can_participate MON_3, ContestEffectEnd2 - if_can_participate MON_4, ContestEffectEnd2 +AI_CBM_DependsOnNextMons_2ndUp: + if_can_participate MON_3, AI_CBM_End + if_can_participate MON_4, AI_CBM_End score -10 end -ContestEffect2_26_score3: - if_can_participate MON_4, ContestEffectEnd2 +AI_CBM_DependsOnNextMons_3rdUp: + if_can_participate MON_4, AI_CBM_End score -10 end -ContestEffect2_38: - if_user_condition_less_than 3, ContestEffectEnd2 +@ If at max condition, discourage move +AI_CBM_ImproveCondition: + if_user_condition_less_than 3, AI_CBM_End score -20 end -ContestEffect2_4: - if_user_order_eq MON_1, ContestEffect2_4_score1 - if_user_order_eq MON_2, ContestEffect2_4_score2 - if_user_order_eq MON_3, ContestEffect2_4_score3 +@ If there are no upcoming mons who can make an appeal (or if user is last), discourage move +@ Identical to AI_CBM_DependsOnNextMons +AI_CBM_AvoidStartle: + if_user_order_eq MON_1, AI_CBM_AvoidStartle_1stUp + if_user_order_eq MON_2, AI_CBM_AvoidStartle_2ndUp + if_user_order_eq MON_3, AI_CBM_AvoidStartle_3rdUp score -10 end -ContestEffect2_4_score1: - if_can_participate MON_2, ContestEffectEnd2 - if_can_participate MON_3, ContestEffectEnd2 - if_can_participate MON_4, ContestEffectEnd2 +AI_CBM_AvoidStartle_1stUp: + if_can_participate MON_2, AI_CBM_End + if_can_participate MON_3, AI_CBM_End + if_can_participate MON_4, AI_CBM_End score -10 end -ContestEffect2_4_score2: - if_can_participate MON_3, ContestEffectEnd2 - if_can_participate MON_4, ContestEffectEnd2 +AI_CBM_AvoidStartle_2ndUp: + if_can_participate MON_3, AI_CBM_End + if_can_participate MON_4, AI_CBM_End score -10 end -ContestEffect2_4_score3: - if_can_participate MON_4, ContestEffectEnd2 +AI_CBM_AvoidStartle_3rdUp: + if_can_participate MON_4, AI_CBM_End score -10 end -ContestEffect2_2: - if_turn_eq 0, ContestEffect2_2_score1 - if_turn_eq 1, ContestEffect2_2_score2 - if_turn_eq 2, ContestEffect2_2_score3 - if_turn_eq 3, ContestEffect2_2_score4 - if_turn_eq 4, ContestEffect2_2_score5 +@ Very good if its the last appeal, otherwise discourage move +AI_CBM_NoMoreMoves: + if_appeal_num_eq 0, AI_CBM_NoMoreMoves_1stAppeal + if_appeal_num_eq 1, AI_CBM_NoMoreMoves_2ndAppeal + if_appeal_num_eq 2, AI_CBM_NoMoreMoves_3rdAppeal + if_appeal_num_eq 3, AI_CBM_NoMoreMoves_4thAppeal + if_last_appeal AI_CBM_NoMoreMoves_LastAppeal end -ContestEffect2_2_score1: - if_random 20, ContestEffectEnd2 +AI_CBM_NoMoreMoves_1stAppeal: + if_random_less_than 20, AI_CBM_End score -15 end -ContestEffect2_2_score2: - if_random 40, ContestEffectEnd2 +AI_CBM_NoMoreMoves_2ndAppeal: + if_random_less_than 40, AI_CBM_End score -15 end -ContestEffect2_2_score3: - if_random 60, ContestEffectEnd2 +AI_CBM_NoMoreMoves_3rdAppeal: + if_random_less_than 60, AI_CBM_End score -15 end -ContestEffect2_2_score4: - if_random 80, ContestEffectEnd2 +AI_CBM_NoMoreMoves_4thAppeal: + if_random_less_than 80, AI_CBM_End score -15 end -ContestEffect2_2_score5: - if_random 20, ContestEffectEnd2 +AI_CBM_NoMoreMoves_LastAppeal: + if_random_less_than 20, AI_CBM_End score +20 end -ContestEffectEnd2: +AI_CBM_End: end +@ Encourages/discourages move affected by the move order +@ e.g. use BETTER_IF_FIRST moves if user is first, dont use AVOID_STARTLE moves if last AI_CheckOrder: - if_user_order_eq MON_1, AI_effectcheck1_081DCA4C - if_user_order_eq MON_2, AI_effectcheck2_081DCA4C - if_user_order_eq MON_3, AI_effectcheck3_081DCA4C - if_user_order_eq MON_4, AI_effectcheck4_081DCA4C + if_user_order_eq MON_1, AI_CheckOrder_1stUp + if_user_order_eq MON_2, AI_CheckOrder_2ndUp + if_user_order_eq MON_3, AI_CheckOrder_3rdUp + if_user_order_eq MON_4, AI_CheckOrder_Last end -AI_effectcheck1_081DCA4C: - if_effect_eq CONTEST_EFFECT_BETTER_IF_FIRST, AI_score1_081DCA4C - if_effect_eq CONTEST_EFFECT_BETTER_WHEN_LATER, AI_score2_081DCA4C - if_effect_type_eq 1, AI_random1_081DCA4C +AI_CheckOrder_1stUp: + if_effect_eq CONTEST_EFFECT_BETTER_IF_FIRST, AI_CheckOrder_1stUp_Encourage + if_effect_eq CONTEST_EFFECT_BETTER_WHEN_LATER, AI_CheckOrder_1stUp_Discourage + if_effect_type_eq CONTEST_EFFECT_TYPE_AVOID_STARTLE, AI_CheckOrder_1stUp_RandomEncourage end -AI_score1_081DCA4C: +AI_CheckOrder_1stUp_Encourage: score +15 end -AI_score2_081DCA4C: +AI_CheckOrder_1stUp_Discourage: score -15 end -AI_random1_081DCA4C: - if_random 100, ContestEffectEnd2 +AI_CheckOrder_1stUp_RandomEncourage: + if_random_less_than 100, AI_CBM_End score +10 end -AI_effectcheck2_081DCA4C: - if_effect_eq CONTEST_EFFECT_BETTER_WHEN_LATER, AI_score3_081DCA4C - if_effect_type_eq 1, AI_random2_081DCA4C +AI_CheckOrder_2ndUp: + if_effect_eq CONTEST_EFFECT_BETTER_WHEN_LATER, AI_CheckOrder_2ndUp_Discourage + if_effect_type_eq CONTEST_EFFECT_TYPE_AVOID_STARTLE, AI_CheckOrder_2ndUp_RandomEncourage end -AI_score3_081DCA4C: +AI_CheckOrder_2ndUp_Discourage: score -5 end -AI_random2_081DCA4C: - if_random 125, ContestEffectEnd2 +AI_CheckOrder_2ndUp_RandomEncourage: + if_random_less_than 125, AI_CBM_End score +10 end -AI_effectcheck3_081DCA4C: - if_effect_eq CONTEST_EFFECT_BETTER_WHEN_LATER, AI_score4_081DCA4C - if_effect_eq CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES, AI_score4_081DCA4C - if_effect_eq CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, AI_score4_081DCA4C +AI_CheckOrder_3rdUp: + if_effect_eq CONTEST_EFFECT_BETTER_WHEN_LATER, AI_CheckOrder_3rdUp_Encourage + if_effect_eq CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES, AI_CheckOrder_3rdUp_Encourage + if_effect_eq CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, AI_CheckOrder_3rdUp_Encourage end -AI_score4_081DCA4C: +AI_CheckOrder_3rdUp_Encourage: score +5 end -AI_effectcheck4_081DCA4C: - if_effect_eq CONTEST_EFFECT_BETTER_WHEN_LATER, AI_score5_081DCA4C - if_effect_eq CONTEST_EFFECT_BETTER_IF_LAST, AI_score5_081DCA4C - if_effect_eq CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES, AI_score5_081DCA4C - if_effect_eq CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, AI_score5_081DCA4C - if_effect_eq CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, AI_score7_081DCA4C - if_effect_type_eq 1, AI_score6_081DCA4C - if_effect_type_eq 3, AI_random3_081DCA4C +AI_CheckOrder_Last: + if_effect_eq CONTEST_EFFECT_BETTER_WHEN_LATER, AI_CheckOrder_Last_StronglyEncourage + if_effect_eq CONTEST_EFFECT_BETTER_IF_LAST, AI_CheckOrder_Last_StronglyEncourage + if_effect_eq CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES, AI_CheckOrder_Last_StronglyEncourage + if_effect_eq CONTEST_EFFECT_USER_MORE_EASILY_STARTLED, AI_CheckOrder_Last_StronglyEncourage + if_effect_eq CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN, AI_CheckOrder_Last_Encourage + if_effect_type_eq CONTEST_EFFECT_TYPE_AVOID_STARTLE, AI_CheckOrder_Last_Discourage + if_effect_type_eq CONTEST_EFFECT_TYPE_STARTLE_MONS, AI_CheckOrder_Last_RandomEncourage end -AI_score5_081DCA4C: +AI_CheckOrder_Last_StronglyEncourage: score +15 end -AI_score6_081DCA4C: +AI_CheckOrder_Last_Discourage: score -10 end -AI_random3_081DCA4C: - if_random 125, ContestEffectEnd2 +AI_CheckOrder_Last_RandomEncourage: + if_random_less_than 125, AI_CBM_End score +10 end -AI_score7_081DCA4C: +AI_CheckOrder_Last_Encourage: score +5 end diff --git a/data/event_scripts.s b/data/event_scripts.s index 7cc5960d4..f8348d0b0 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -40,6 +40,7 @@ #include "constants/moves.h" #include "constants/party_menu.h" #include "constants/pokemon.h" +#include "constants/roulette.h" #include "constants/script_menu.h" #include "constants/secret_bases.h" #include "constants/songs.h" @@ -712,13 +713,13 @@ Common_EventScript_SetAbnormalWeather:: @ 827207A return Common_EventScript_PlayGymBadgeFanfare:: @ 827207E - playfanfare MUS_ME_BACHI + playfanfare MUS_OBTAIN_BADGE waitfanfare return Common_EventScript_OutOfCenterPartyHeal:: @ 8272083 fadescreen FADE_TO_BLACK - playfanfare MUS_ME_ASA + playfanfare MUS_HEAL waitfanfare special HealPlayerParty fadescreen FADE_FROM_BLACK @@ -735,7 +736,7 @@ EventScript_RegionMap:: @ 827208F Common_EventScript_PlayBrineysBoatMusic:: @ 82720A0 setflag FLAG_DONT_TRANSITION_MUSIC - playbgm MUS_M_BOAT, 0 + playbgm MUS_SAILING, 0 return Common_EventScript_StopBrineysBoatMusic:: @ 82720A8 @@ -819,7 +820,7 @@ Common_EventScript_NameReceivedPartyMon:: @ 82723DD Common_EventScript_PlayerHandedOverTheItem:: @ 82723E4 bufferitemname 0, VAR_0x8004 - playfanfare MUS_ME_WAZA + playfanfare MUS_OBTAIN_TMHM message gText_PlayerHandedOverTheItem waitmessage waitfanfare diff --git a/data/field_effect_scripts.s b/data/field_effect_scripts.s index 4aef859d8..c57f19a04 100644 --- a/data/field_effect_scripts.s +++ b/data/field_effect_scripts.s @@ -5,73 +5,73 @@ .align 2 gFieldEffectScriptPointers:: @ 82DB9D4 - .4byte gFieldEffectScript_ExclamationMarkIcon1 - .4byte gFieldEffectScript_UseCutOnTallGrass - .4byte gFieldEffectScript_UseCutOnTree - .4byte gFieldEffectScript_Shadow - .4byte gFieldEffectScript_TallGrass - .4byte gFieldEffectScript_Ripple - .4byte gFieldEffectScript_FieldMoveShowMon - .4byte gFieldEffectScript_Ash - .4byte gFieldEffectScript_SurfBlob - .4byte gFieldEffectScript_UseSurf - .4byte gFieldEffectScript_GroundImpactDust - .4byte gFieldEffectScript_UseSecretPowerCave - .4byte gFieldEffectScript_BikeHopTallGrass - .4byte gFieldEffectScript_SandFootprints - .4byte gFieldEffectScript_BikeHopBigSplash - .4byte gFieldEffectScript_Splash - .4byte gFieldEffectScript_BikeHopSmallSplash - .4byte gFieldEffectScript_LongGrass - .4byte gFieldEffectScript_JumpLongGrass - .4byte gFieldEffectScript_Unknown19 - .4byte gFieldEffectScript_Unknown20 - .4byte gFieldEffectScript_Unknown21 - .4byte gFieldEffectScript_Unknown22 - .4byte gFieldEffectScript_BerryTreeGrowthSparkle - .4byte gFieldEffectScript_DeepSandFootprints - .4byte gFieldEffectScript_PokeCenterHeal - .4byte gFieldEffectScript_UseSecretPowerTree - .4byte gFieldEffectScript_UseSecretPowerShrub - .4byte gFieldEffectScript_TreeDisguise - .4byte gFieldEffectScript_MountainDisguise - .4byte gFieldEffectScript_NPCUseFly - .4byte gFieldEffectScript_UseFly - .4byte gFieldEffectScript_FlyIn - .4byte gFieldEffectScript_QuestionMarkIcon - .4byte gFieldEffectScript_FeetInFlowingWater - .4byte gFieldEffectScript_BikeTireTracks - .4byte gFieldEffectScript_SandDisguisePlaceholder - .4byte gFieldEffectScript_UseRockSmash - .4byte gFieldEffectScript_UseDig - .4byte gFieldEffectScript_SandPile - .4byte gFieldEffectScript_UseStrength - .4byte gFieldEffectScript_ShortGrass - .4byte gFieldEffectScript_HotSpringsWater - .4byte gFieldEffectScript_UseWaterfall - .4byte gFieldEffectScript_UseDive - .4byte gFieldEffectScript_Pokeball - .4byte gFieldEffectScript_HeartIcon - .4byte gFieldEffectScript_Unknown47 - .4byte gFieldEffectScript_Unknown48 - .4byte gFieldEffectScript_JumpOutOfAsh - .4byte gFieldEffectScript_LavaridgeGymWarp - .4byte gFieldEffectScript_SweetScent - .4byte gFieldEffectScript_SandPillar - .4byte gFieldEffectScript_Bubbles - .4byte gFieldEffectScript_Sparkle - .4byte gFieldEffectScript_ShowSecretPowerCave - .4byte gFieldEffectScript_ShowSecretPowerTree - .4byte gFieldEffectScript_ShowSecretPowerShrub - .4byte gFieldEffectScript_ShowCutGrass - .4byte gFieldEffectScript_FieldMoveShowMonInit - .4byte gFieldEffectScript_UsePuzzleEffect - .4byte gFieldEffectScript_SecretBaseBootPC - .4byte gFieldEffectScript_HallOfFameRecord - .4byte gFieldEffectScript_UseTeleport - .4byte gFieldEffectScript_Rayquaza - .4byte gFieldEffectScript_Unknown65 - .4byte gFieldEffectScript_MoveDeoxysRock + .4byte gFieldEffectScript_ExclamationMarkIcon1 @ FLDEFF_EXCLAMATION_MARK_ICON + .4byte gFieldEffectScript_UseCutOnTallGrass @ FLDEFF_USE_CUT_ON_GRASS + .4byte gFieldEffectScript_UseCutOnTree @ FLDEFF_USE_CUT_ON_TREE + .4byte gFieldEffectScript_Shadow @ FLDEFF_SHADOW + .4byte gFieldEffectScript_TallGrass @ FLDEFF_TALL_GRASS + .4byte gFieldEffectScript_Ripple @ FLDEFF_RIPPLE + .4byte gFieldEffectScript_FieldMoveShowMon @ FLDEFF_FIELD_MOVE_SHOW_MON + .4byte gFieldEffectScript_Ash @ FLDEFF_ASH + .4byte gFieldEffectScript_SurfBlob @ FLDEFF_SURF_BLOB + .4byte gFieldEffectScript_UseSurf @ FLDEFF_USE_SURF + .4byte gFieldEffectScript_GroundImpactDust @ FLDEFF_DUST + .4byte gFieldEffectScript_UseSecretPowerCave @ FLDEFF_USE_SECRET_POWER_CAVE + .4byte gFieldEffectScript_JumpTallGrass @ FLDEFF_JUMP_TALL_GRASS + .4byte gFieldEffectScript_SandFootprints @ FLDEFF_SAND_FOOTPRINTS + .4byte gFieldEffectScript_JumpBigSplash @ FLDEFF_JUMP_BIG_SPLASH + .4byte gFieldEffectScript_Splash @ FLDEFF_SPLASH + .4byte gFieldEffectScript_JumpSmallSplash @ FLDEFF_JUMP_SMALL_SPLASH + .4byte gFieldEffectScript_LongGrass @ FLDEFF_LONG_GRASS + .4byte gFieldEffectScript_JumpLongGrass @ FLDEFF_JUMP_LONG_GRASS + .4byte gFieldEffectScript_UnusedGrass @ FLDEFF_UNUSED_GRASS + .4byte gFieldEffectScript_UnusedGrass2 @ FLDEFF_UNUSED_GRASS_2 + .4byte gFieldEffectScript_UnusedSand @ FLDEFF_UNUSED_SAND + .4byte gFieldEffectScript_WaterSurfacing @ FLDEFF_WATER_SURFACING + .4byte gFieldEffectScript_BerryTreeGrowthSparkle @ FLDEFF_BERRY_TREE_GROWTH_SPARKLE + .4byte gFieldEffectScript_DeepSandFootprints @ FLDEFF_DEEP_SAND_FOOTPRINTS + .4byte gFieldEffectScript_PokeCenterHeal @ FLDEFF_POKECENTER_HEAL + .4byte gFieldEffectScript_UseSecretPowerTree @ FLDEFF_USE_SECRET_POWER_TREE + .4byte gFieldEffectScript_UseSecretPowerShrub @ FLDEFF_USE_SECRET_POWER_SHRUB + .4byte gFieldEffectScript_TreeDisguise @ FLDEFF_TREE_DISGUISE + .4byte gFieldEffectScript_MountainDisguise @ FLDEFF_MOUNTAIN_DISGUISE + .4byte gFieldEffectScript_NPCUseFly @ FLDEFF_NPCFLY_OUT + .4byte gFieldEffectScript_UseFly @ FLDEFF_USE_FLY + .4byte gFieldEffectScript_FlyIn @ FLDEFF_FLY_IN + .4byte gFieldEffectScript_QuestionMarkIcon @ FLDEFF_QUESTION_MARK_ICON + .4byte gFieldEffectScript_FeetInFlowingWater @ FLDEFF_FEET_IN_FLOWING_WATER + .4byte gFieldEffectScript_BikeTireTracks @ FLDEFF_BIKE_TIRE_TRACKS + .4byte gFieldEffectScript_SandDisguisePlaceholder @ FLDEFF_SAND_DISGUISE + .4byte gFieldEffectScript_UseRockSmash @ FLDEFF_USE_ROCK_SMASH + .4byte gFieldEffectScript_UseDig @ FLDEFF_USE_DIG + .4byte gFieldEffectScript_SandPile @ FLDEFF_SAND_PILE + .4byte gFieldEffectScript_UseStrength @ FLDEFF_USE_STRENGTH + .4byte gFieldEffectScript_ShortGrass @ FLDEFF_SHORT_GRASS + .4byte gFieldEffectScript_HotSpringsWater @ FLDEFF_HOT_SPRINGS_WATER + .4byte gFieldEffectScript_UseWaterfall @ FLDEFF_USE_WATERFALL + .4byte gFieldEffectScript_UseDive @ FLDEFF_USE_DIVE + .4byte gFieldEffectScript_Pokeball @ FLDEFF_POKEBALL + .4byte gFieldEffectScript_HeartIcon @ FLDEFF_HEART_ICON + .4byte gFieldEffectScript_Nop47 @ FLDEFF_NOP_47 + .4byte gFieldEffectScript_Nop48 @ FLDEFF_NOP_48 + .4byte gFieldEffectScript_AshPuff @ FLDEFF_ASH_PUFF + .4byte gFieldEffectScript_AshLaunch @ FLDEFF_ASH_LAUNCH + .4byte gFieldEffectScript_SweetScent @ FLDEFF_SWEET_SCENT + .4byte gFieldEffectScript_SandPillar @ FLDEFF_SAND_PILLAR + .4byte gFieldEffectScript_Bubbles @ FLDEFF_BUBBLES + .4byte gFieldEffectScript_Sparkle @ FLDEFF_SPARKLE + .4byte gFieldEffectScript_ShowSecretPowerCave @ FLDEFF_SECRET_POWER_CAVE + .4byte gFieldEffectScript_ShowSecretPowerTree @ FLDEFF_SECRET_POWER_TREE + .4byte gFieldEffectScript_ShowSecretPowerShrub @ FLDEFF_SECRET_POWER_SHRUB + .4byte gFieldEffectScript_ShowCutGrass @ FLDEFF_CUT_GRASS + .4byte gFieldEffectScript_FieldMoveShowMonInit @ FLDEFF_FIELD_MOVE_SHOW_MON_INIT + .4byte gFieldEffectScript_UsePuzzleEffect @ FLDEFF_USE_TOMB_PUZZLE_EFFECT + .4byte gFieldEffectScript_SecretBaseBootPC @ FLDEFF_PCTURN_ON + .4byte gFieldEffectScript_HallOfFameRecord @ FLDEFF_HALL_OF_FAME_RECORD + .4byte gFieldEffectScript_UseTeleport @ FLDEFF_USE_TELEPORT + .4byte gFieldEffectScript_RayquazaSpotlight @ FLDEFF_RAYQUAZA_SPOTLIGHT + .4byte gFieldEffectScript_DestroyDeoxysRock @ FLDEFF_DESTROY_DEOXYS_ROCK + .4byte gFieldEffectScript_MoveDeoxysRock @ FLDEFF_MOVE_DEOXYS_ROCK gFieldEffectScript_ExclamationMarkIcon1:: @ 82DBAE0 field_eff_callnative FldEff_ExclamationMarkIcon @@ -90,11 +90,11 @@ gFieldEffectScript_Shadow:: @ 82DBAF2 field_eff_end gFieldEffectScript_TallGrass:: @ 82DBAF8 - field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, FldEff_TallGrass + field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_TallGrass field_eff_end gFieldEffectScript_Ripple:: @ 82DBB02 - field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, FldEff_Ripple + field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_Ripple field_eff_end gFieldEffectScript_FieldMoveShowMon:: @ 82DBB0C @@ -102,7 +102,7 @@ gFieldEffectScript_FieldMoveShowMon:: @ 82DBB0C field_eff_end gFieldEffectScript_Ash:: @ 82DBB12 - field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, FldEff_Ash + field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_Ash field_eff_end gFieldEffectScript_SurfBlob:: @ 82DBB1C @@ -114,55 +114,55 @@ gFieldEffectScript_UseSurf:: @ 82DBB22 field_eff_end gFieldEffectScript_GroundImpactDust:: @ 82DBB28 - field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_Dust + field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_Dust field_eff_end gFieldEffectScript_UseSecretPowerCave:: @ 82DBB32 field_eff_callnative FldEff_UseSecretPowerCave field_eff_end -gFieldEffectScript_BikeHopTallGrass:: @ 82DBB38 - field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, FldEff_JumpTallGrass +gFieldEffectScript_JumpTallGrass:: @ 82DBB38 + field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_JumpTallGrass field_eff_end gFieldEffectScript_SandFootprints:: @ 82DBB42 - field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_SandFootprints + field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_SandFootprints field_eff_end -gFieldEffectScript_BikeHopBigSplash:: @ 82DBB4C - field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_JumpBigSplash +gFieldEffectScript_JumpBigSplash:: @ 82DBB4C + field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_JumpBigSplash field_eff_end gFieldEffectScript_Splash:: @ 82DBB56 - field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_Splash + field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_Splash field_eff_end -gFieldEffectScript_BikeHopSmallSplash:: @ 82DBB60 - field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_JumpSmallSplash +gFieldEffectScript_JumpSmallSplash:: @ 82DBB60 + field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_JumpSmallSplash field_eff_end gFieldEffectScript_LongGrass:: @ 82DBB6A - field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, FldEff_LongGrass + field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_LongGrass field_eff_end gFieldEffectScript_JumpLongGrass:: @ 82DBB74 - field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, FldEff_JumpLongGrass + field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_JumpLongGrass field_eff_end -gFieldEffectScript_Unknown19:: @ 82DBB7E - field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, FldEff_Unknown19 +gFieldEffectScript_UnusedGrass:: @ 82DBB7E + field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_UnusedGrass field_eff_end -gFieldEffectScript_Unknown20:: @ 82DBB88 - field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, FldEff_Unknown20 +gFieldEffectScript_UnusedGrass2:: @ 82DBB88 + field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_UnusedGrass2 field_eff_end -gFieldEffectScript_Unknown21:: @ 82DBB92 - field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_Unknown21 +gFieldEffectScript_UnusedSand:: @ 82DBB92 + field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_UnusedSand field_eff_end -gFieldEffectScript_Unknown22:: @ 82DBB9C - field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_Unknown22 +gFieldEffectScript_WaterSurfacing:: @ 82DBB9C + field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_WaterSurfacing field_eff_end gFieldEffectScript_BerryTreeGrowthSparkle:: @ 82DBBA6 @@ -170,12 +170,12 @@ gFieldEffectScript_BerryTreeGrowthSparkle:: @ 82DBBA6 field_eff_end gFieldEffectScript_DeepSandFootprints:: @ 82DBBAC - field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_DeepSandFootprints + field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_DeepSandFootprints field_eff_end gFieldEffectScript_PokeCenterHeal:: @ 82DBBB6 - field_eff_loadfadedpal gFieldEffectObjectPaletteInfo4 - field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_PokecenterHeal + field_eff_loadfadedpal gSpritePalette_PokeballGlow + field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_PokecenterHeal field_eff_end gFieldEffectScript_UseSecretPowerTree:: @ 82DBBC5 @@ -211,11 +211,11 @@ gFieldEffectScript_QuestionMarkIcon:: @ 82DBBEF field_eff_end gFieldEffectScript_FeetInFlowingWater:: @ 82DBBF5 - field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_FeetInFlowingWater + field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_FeetInFlowingWater field_eff_end gFieldEffectScript_BikeTireTracks:: @ 82DBBFF - field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_BikeTireTracks + field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_BikeTireTracks field_eff_end gFieldEffectScript_SandDisguisePlaceholder:: @ 82DBC09 @@ -227,7 +227,7 @@ gFieldEffectScript_UseRockSmash:: @ 82DBC0F field_eff_end gFieldEffectScript_UseStrength:: @ 82DBC15 - field_eff_callnative sub_8145E2C + field_eff_callnative FldEff_UseStrength field_eff_end gFieldEffectScript_UseDig:: @ 82DBC1B @@ -235,15 +235,15 @@ gFieldEffectScript_UseDig:: @ 82DBC1B field_eff_end gFieldEffectScript_SandPile:: @ 82DBC21 - field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_SandPile + field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_SandPile field_eff_end gFieldEffectScript_ShortGrass:: @ 82DBC2B - field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, FldEff_ShortGrass + field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_ShortGrass field_eff_end gFieldEffectScript_HotSpringsWater:: @ 82DBC35 - field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, FldEff_HotSpringsWater + field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_HotSpringsWater field_eff_end gFieldEffectScript_UseWaterfall:: @ 82DBC3F @@ -255,28 +255,28 @@ gFieldEffectScript_UseDive:: @ 82DBC45 field_eff_end gFieldEffectScript_Pokeball:: @ 82DBC4B - field_eff_loadpal gFieldEffectObjectPaletteInfo10 + field_eff_loadpal gSpritePalette_Pokeball field_eff_callnative FldEff_Pokeball field_eff_end gFieldEffectScript_HeartIcon:: @ 82DBC56 - field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_HeartIcon + field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_HeartIcon field_eff_end -gFieldEffectScript_Unknown47:: @ 82DBC60 - field_eff_callnative FldEff_NopA6FC +gFieldEffectScript_Nop47:: @ 82DBC60 + field_eff_callnative FldEff_Nop47 field_eff_end -gFieldEffectScript_Unknown48:: @ 82DBC66 - field_eff_callnative FldEff_NopA700 +gFieldEffectScript_Nop48:: @ 82DBC66 + field_eff_callnative FldEff_Nop48 field_eff_end -gFieldEffectScript_JumpOutOfAsh:: @ 82DBC6C - field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo2, FldEff_PopOutOfAsh +gFieldEffectScript_AshPuff:: @ 82DBC6C + field_eff_loadfadedpal_callnative gSpritePalette_Ash, FldEff_AshPuff field_eff_end -gFieldEffectScript_LavaridgeGymWarp:: @ 82DBC76 - field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo2, FldEff_LavaridgeGymWarp +gFieldEffectScript_AshLaunch:: @ 82DBC76 + field_eff_loadfadedpal_callnative gSpritePalette_Ash, FldEff_AshLaunch field_eff_end gFieldEffectScript_SweetScent:: @ 82DBC80 @@ -284,31 +284,31 @@ gFieldEffectScript_SweetScent:: @ 82DBC80 field_eff_end gFieldEffectScript_SandPillar:: @ 82DBC86 - field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo9, FldEff_SandPillar + field_eff_loadfadedpal_callnative gSpritePalette_SandPillar, FldEff_SandPillar field_eff_end gFieldEffectScript_Bubbles:: @ 82DBC90 - field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_Bubbles + field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_Bubbles field_eff_end gFieldEffectScript_Sparkle:: @ 82DBC9A - field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo3, FldEff_Sparkle + field_eff_loadfadedpal_callnative gSpritePalette_SmallSparkle, FldEff_Sparkle field_eff_end gFieldEffectScript_ShowSecretPowerCave:: @ 82DBCA4 - field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo7, FldEff_SecretPowerCave + field_eff_loadfadedpal_callnative gSpritePalette_SecretPower_Cave, FldEff_SecretPowerCave field_eff_end gFieldEffectScript_ShowSecretPowerTree:: @ 82DBCAE - field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo8, FldEff_SecretPowerTree + field_eff_loadfadedpal_callnative gSpritePalette_SecretPower_Plant, FldEff_SecretPowerTree field_eff_end gFieldEffectScript_ShowSecretPowerShrub:: @ 82DBCB8 - field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo8, FldEff_SecretPowerShrub + field_eff_loadfadedpal_callnative gSpritePalette_SecretPower_Plant, FldEff_SecretPowerShrub field_eff_end gFieldEffectScript_ShowCutGrass:: @ 82DBCC2 - field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo6, FldEff_CutGrass + field_eff_loadfadedpal_callnative gSpritePalette_CutGrass, FldEff_CutGrass field_eff_end gFieldEffectScript_FieldMoveShowMonInit:: @ 82DBCCC @@ -324,22 +324,22 @@ gFieldEffectScript_SecretBaseBootPC:: @ 82DBCD8 field_eff_end gFieldEffectScript_HallOfFameRecord:: @ 82DBCDE - field_eff_loadfadedpal gFieldEffectObjectPaletteInfo4 - field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo5, FldEff_HallOfFameRecord + field_eff_loadfadedpal gSpritePalette_PokeballGlow + field_eff_loadfadedpal_callnative gSpritePalette_HofMonitor, FldEff_HallOfFameRecord field_eff_end gFieldEffectScript_UseTeleport:: @ 82DBCED field_eff_callnative FldEff_UseTeleport field_eff_end -gFieldEffectScript_Rayquaza:: @ 82DBCF3 - field_eff_callnative sub_80B8F98 +gFieldEffectScript_RayquazaSpotlight:: @ 82DBCF3 + field_eff_callnative FldEff_RayquazaSpotlight field_eff_end -gFieldEffectScript_Unknown65:: @ 82DBCF9 - field_eff_callnative sub_80B9ADC +gFieldEffectScript_DestroyDeoxysRock:: @ 82DBCF9 + field_eff_callnative FldEff_DestroyDeoxysRock field_eff_end gFieldEffectScript_MoveDeoxysRock:: @ 82DBCFF - field_eff_callnative Fldeff_MoveDeoxysRock + field_eff_callnative FldEff_MoveDeoxysRock field_eff_end diff --git a/data/io_reg.s b/data/io_reg.s deleted file mode 100644 index 0941b4345..000000000 --- a/data/io_reg.s +++ /dev/null @@ -1,37 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - - -.align 2 -gUnref_82EC784:: @ 82EC784 - .4byte 0x00000000 - .4byte 0x00000000 - .4byte 0x04000008 - .4byte 0x0400000A - .4byte 0x0400000C - .4byte 0x0400000E - .4byte 0x04000010 - .4byte 0x04000014 - .4byte 0x04000018 - .4byte 0x0400001C - .4byte 0x04000012 - .4byte 0x04000016 - .4byte 0x0400001A - .4byte 0x0400001E - .4byte 0x02000100 - .4byte 0x08000400 - -gOverworldBackgroundLayerFlags:: @ 82EC7C4 - .2byte BLDCNT_TGT2_BG0 - .2byte BLDCNT_TGT2_BG1 - .2byte BLDCNT_TGT2_BG2 - .2byte BLDCNT_TGT2_BG3 - -gOrbEffectBackgroundLayerFlags:: @ 82EC7CC - .2byte BLDCNT_TGT1_BG0 - .2byte BLDCNT_TGT1_BG1 - .2byte BLDCNT_TGT1_BG2 - .2byte BLDCNT_TGT1_BG3 diff --git a/data/maps/AbandonedShip_CaptainsOffice/map.json b/data/maps/AbandonedShip_CaptainsOffice/map.json index 320bbb0d1..e4522dfca 100644 --- a/data/maps/AbandonedShip_CaptainsOffice/map.json +++ b/data/maps/AbandonedShip_CaptainsOffice/map.json @@ -2,7 +2,7 @@ "id": "MAP_ABANDONED_SHIP_CAPTAINS_OFFICE", "name": "AbandonedShip_CaptainsOffice", "layout": "LAYOUT_ABANDONED_SHIP_CAPTAINS_OFFICE", - "music": "MUS_DAN02", + "music": "MUS_ABANDONED_SHIP", "region_map_section": "MAPSEC_ABANDONED_SHIP", "requires_flash": false, "weather": "WEATHER_SHADE", diff --git a/data/maps/AbandonedShip_Corridors_1F/map.json b/data/maps/AbandonedShip_Corridors_1F/map.json index 13ccd41cd..94f42d654 100644 --- a/data/maps/AbandonedShip_Corridors_1F/map.json +++ b/data/maps/AbandonedShip_Corridors_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ABANDONED_SHIP_CORRIDORS_1F", "name": "AbandonedShip_Corridors_1F", "layout": "LAYOUT_ABANDONED_SHIP_CORRIDORS_1F", - "music": "MUS_DAN02", + "music": "MUS_ABANDONED_SHIP", "region_map_section": "MAPSEC_ABANDONED_SHIP", "requires_flash": false, "weather": "WEATHER_SHADE", diff --git a/data/maps/AbandonedShip_Corridors_B1F/map.json b/data/maps/AbandonedShip_Corridors_B1F/map.json index d024bb953..c65e58ca5 100644 --- a/data/maps/AbandonedShip_Corridors_B1F/map.json +++ b/data/maps/AbandonedShip_Corridors_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ABANDONED_SHIP_CORRIDORS_B1F", "name": "AbandonedShip_Corridors_B1F", "layout": "LAYOUT_ABANDONED_SHIP_CORRIDORS_B1F", - "music": "MUS_DAN02", + "music": "MUS_ABANDONED_SHIP", "region_map_section": "MAPSEC_ABANDONED_SHIP", "requires_flash": false, "weather": "WEATHER_SHADE", diff --git a/data/maps/AbandonedShip_Deck/map.json b/data/maps/AbandonedShip_Deck/map.json index 781dfa193..d50e015f3 100644 --- a/data/maps/AbandonedShip_Deck/map.json +++ b/data/maps/AbandonedShip_Deck/map.json @@ -2,7 +2,7 @@ "id": "MAP_ABANDONED_SHIP_DECK", "name": "AbandonedShip_Deck", "layout": "LAYOUT_ABANDONED_SHIP_DECK", - "music": "MUS_DAN02", + "music": "MUS_ABANDONED_SHIP", "region_map_section": "MAPSEC_ABANDONED_SHIP", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/map.json b/data/maps/AbandonedShip_HiddenFloorCorridors/map.json index 22c63c092..e0cba2d6a 100644 --- a/data/maps/AbandonedShip_HiddenFloorCorridors/map.json +++ b/data/maps/AbandonedShip_HiddenFloorCorridors/map.json @@ -2,7 +2,7 @@ "id": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS", "name": "AbandonedShip_HiddenFloorCorridors", "layout": "LAYOUT_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS", - "music": "MUS_DAN02", + "music": "MUS_ABANDONED_SHIP", "region_map_section": "MAPSEC_ABANDONED_SHIP", "requires_flash": false, "weather": "WEATHER_SHADE", diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/map.json b/data/maps/AbandonedShip_HiddenFloorRooms/map.json index c41f9a7c7..b81c33c84 100644 --- a/data/maps/AbandonedShip_HiddenFloorRooms/map.json +++ b/data/maps/AbandonedShip_HiddenFloorRooms/map.json @@ -2,7 +2,7 @@ "id": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS", "name": "AbandonedShip_HiddenFloorRooms", "layout": "LAYOUT_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS", - "music": "MUS_DAN02", + "music": "MUS_ABANDONED_SHIP", "region_map_section": "MAPSEC_ABANDONED_SHIP", "requires_flash": false, "weather": "WEATHER_SHADE", diff --git a/data/maps/AbandonedShip_Room_B1F/map.json b/data/maps/AbandonedShip_Room_B1F/map.json index aa0800faa..f5d14ac59 100644 --- a/data/maps/AbandonedShip_Room_B1F/map.json +++ b/data/maps/AbandonedShip_Room_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ABANDONED_SHIP_ROOM_B1F", "name": "AbandonedShip_Room_B1F", "layout": "LAYOUT_ABANDONED_SHIP_ROOM_B1F", - "music": "MUS_DAN02", + "music": "MUS_ABANDONED_SHIP", "region_map_section": "MAPSEC_ABANDONED_SHIP", "requires_flash": false, "weather": "WEATHER_SHADE", diff --git a/data/maps/AbandonedShip_Rooms2_1F/map.json b/data/maps/AbandonedShip_Rooms2_1F/map.json index b4f923500..b85422096 100644 --- a/data/maps/AbandonedShip_Rooms2_1F/map.json +++ b/data/maps/AbandonedShip_Rooms2_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ABANDONED_SHIP_ROOMS2_1F", "name": "AbandonedShip_Rooms2_1F", "layout": "LAYOUT_ABANDONED_SHIP_ROOMS2_1F", - "music": "MUS_DAN02", + "music": "MUS_ABANDONED_SHIP", "region_map_section": "MAPSEC_ABANDONED_SHIP", "requires_flash": false, "weather": "WEATHER_SHADE", diff --git a/data/maps/AbandonedShip_Rooms2_B1F/map.json b/data/maps/AbandonedShip_Rooms2_B1F/map.json index 16abfbdc2..5768a9a95 100644 --- a/data/maps/AbandonedShip_Rooms2_B1F/map.json +++ b/data/maps/AbandonedShip_Rooms2_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ABANDONED_SHIP_ROOMS2_B1F", "name": "AbandonedShip_Rooms2_B1F", "layout": "LAYOUT_ABANDONED_SHIP_ROOMS2_B1F", - "music": "MUS_DAN02", + "music": "MUS_ABANDONED_SHIP", "region_map_section": "MAPSEC_ABANDONED_SHIP", "requires_flash": false, "weather": "WEATHER_SHADE", diff --git a/data/maps/AbandonedShip_Rooms_1F/map.json b/data/maps/AbandonedShip_Rooms_1F/map.json index 9655f75ce..3fae6f96e 100644 --- a/data/maps/AbandonedShip_Rooms_1F/map.json +++ b/data/maps/AbandonedShip_Rooms_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ABANDONED_SHIP_ROOMS_1F", "name": "AbandonedShip_Rooms_1F", "layout": "LAYOUT_ABANDONED_SHIP_ROOMS_1F", - "music": "MUS_DAN02", + "music": "MUS_ABANDONED_SHIP", "region_map_section": "MAPSEC_ABANDONED_SHIP", "requires_flash": false, "weather": "WEATHER_SHADE", diff --git a/data/maps/AbandonedShip_Rooms_B1F/map.json b/data/maps/AbandonedShip_Rooms_B1F/map.json index eacd70a10..d69b43157 100644 --- a/data/maps/AbandonedShip_Rooms_B1F/map.json +++ b/data/maps/AbandonedShip_Rooms_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ABANDONED_SHIP_ROOMS_B1F", "name": "AbandonedShip_Rooms_B1F", "layout": "LAYOUT_ABANDONED_SHIP_ROOMS_B1F", - "music": "MUS_DAN02", + "music": "MUS_ABANDONED_SHIP", "region_map_section": "MAPSEC_ABANDONED_SHIP", "requires_flash": false, "weather": "WEATHER_SHADE", diff --git a/data/maps/AbandonedShip_Underwater1/map.json b/data/maps/AbandonedShip_Underwater1/map.json index 5b2273528..7a2f9cd15 100644 --- a/data/maps/AbandonedShip_Underwater1/map.json +++ b/data/maps/AbandonedShip_Underwater1/map.json @@ -2,7 +2,7 @@ "id": "MAP_ABANDONED_SHIP_UNDERWATER1", "name": "AbandonedShip_Underwater1", "layout": "LAYOUT_ABANDONED_SHIP_UNDERWATER1", - "music": "MUS_DEEPDEEP", + "music": "MUS_UNDERWATER", "region_map_section": "MAPSEC_ABANDONED_SHIP", "requires_flash": false, "weather": "WEATHER_UNDERWATER_BUBBLES", diff --git a/data/maps/AbandonedShip_Underwater2/map.json b/data/maps/AbandonedShip_Underwater2/map.json index 5032eb4fc..072ec34f4 100644 --- a/data/maps/AbandonedShip_Underwater2/map.json +++ b/data/maps/AbandonedShip_Underwater2/map.json @@ -2,7 +2,7 @@ "id": "MAP_ABANDONED_SHIP_UNDERWATER2", "name": "AbandonedShip_Underwater2", "layout": "LAYOUT_ABANDONED_SHIP_UNDERWATER2", - "music": "MUS_DEEPDEEP", + "music": "MUS_UNDERWATER", "region_map_section": "MAPSEC_ABANDONED_SHIP", "requires_flash": false, "weather": "WEATHER_UNDERWATER_BUBBLES", diff --git a/data/maps/AlteringCave/map.json b/data/maps/AlteringCave/map.json index df36f588d..f6b0acc10 100644 --- a/data/maps/AlteringCave/map.json +++ b/data/maps/AlteringCave/map.json @@ -2,7 +2,7 @@ "id": "MAP_ALTERING_CAVE", "name": "AlteringCave", "layout": "LAYOUT_ALTERING_CAVE", - "music": "MUS_RG_NANADUNGEON", + "music": "MUS_RG_SEVII_CAVE", "region_map_section": "MAPSEC_ALTERING_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/AncientTomb/map.json b/data/maps/AncientTomb/map.json index da955f23a..06254e1f9 100644 --- a/data/maps/AncientTomb/map.json +++ b/data/maps/AncientTomb/map.json @@ -2,7 +2,7 @@ "id": "MAP_ANCIENT_TOMB", "name": "AncientTomb", "layout": "LAYOUT_ANCIENT_TOMB", - "music": "MUS_MABOROSI", + "music": "MUS_SEALED_CHAMBER", "region_map_section": "MAPSEC_ANCIENT_TOMB", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/AquaHideout_1F/map.json b/data/maps/AquaHideout_1F/map.json index 2f440bec6..6b9145add 100644 --- a/data/maps/AquaHideout_1F/map.json +++ b/data/maps/AquaHideout_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_AQUA_HIDEOUT_1F", "name": "AquaHideout_1F", "layout": "LAYOUT_AQUA_HIDEOUT_1F", - "music": "MUS_AJITO", + "music": "MUS_AQUA_MAGMA_HIDEOUT", "region_map_section": "MAPSEC_AQUA_HIDEOUT", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/AquaHideout_B1F/map.json b/data/maps/AquaHideout_B1F/map.json index 80b5c1d27..0b4cb8317 100644 --- a/data/maps/AquaHideout_B1F/map.json +++ b/data/maps/AquaHideout_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_AQUA_HIDEOUT_B1F", "name": "AquaHideout_B1F", "layout": "LAYOUT_AQUA_HIDEOUT_B1F", - "music": "MUS_AJITO", + "music": "MUS_AQUA_MAGMA_HIDEOUT", "region_map_section": "MAPSEC_AQUA_HIDEOUT", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/AquaHideout_B2F/map.json b/data/maps/AquaHideout_B2F/map.json index e33af3c9a..d5697bfcd 100644 --- a/data/maps/AquaHideout_B2F/map.json +++ b/data/maps/AquaHideout_B2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_AQUA_HIDEOUT_B2F", "name": "AquaHideout_B2F", "layout": "LAYOUT_AQUA_HIDEOUT_B2F", - "music": "MUS_AJITO", + "music": "MUS_AQUA_MAGMA_HIDEOUT", "region_map_section": "MAPSEC_AQUA_HIDEOUT", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/AquaHideout_UnusedRubyMap1/map.json b/data/maps/AquaHideout_UnusedRubyMap1/map.json index b641e80d1..a2aefc63b 100644 --- a/data/maps/AquaHideout_UnusedRubyMap1/map.json +++ b/data/maps/AquaHideout_UnusedRubyMap1/map.json @@ -2,7 +2,7 @@ "id": "MAP_AQUA_HIDEOUT_UNUSED_RUBY_MAP1", "name": "AquaHideout_UnusedRubyMap1", "layout": "LAYOUT_AQUA_HIDEOUT_UNUSED_RUBY_MAP1", - "music": "MUS_AJITO", + "music": "MUS_AQUA_MAGMA_HIDEOUT", "region_map_section": "MAPSEC_AQUA_HIDEOUT", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/AquaHideout_UnusedRubyMap2/map.json b/data/maps/AquaHideout_UnusedRubyMap2/map.json index 6690e5259..50175b5d5 100644 --- a/data/maps/AquaHideout_UnusedRubyMap2/map.json +++ b/data/maps/AquaHideout_UnusedRubyMap2/map.json @@ -2,7 +2,7 @@ "id": "MAP_AQUA_HIDEOUT_UNUSED_RUBY_MAP2", "name": "AquaHideout_UnusedRubyMap2", "layout": "LAYOUT_AQUA_HIDEOUT_UNUSED_RUBY_MAP2", - "music": "MUS_AJITO", + "music": "MUS_AQUA_MAGMA_HIDEOUT", "region_map_section": "MAPSEC_AQUA_HIDEOUT", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/AquaHideout_UnusedRubyMap3/map.json b/data/maps/AquaHideout_UnusedRubyMap3/map.json index d1a9d6843..b26c4c1ae 100644 --- a/data/maps/AquaHideout_UnusedRubyMap3/map.json +++ b/data/maps/AquaHideout_UnusedRubyMap3/map.json @@ -2,7 +2,7 @@ "id": "MAP_AQUA_HIDEOUT_UNUSED_RUBY_MAP3", "name": "AquaHideout_UnusedRubyMap3", "layout": "LAYOUT_AQUA_HIDEOUT_UNUSED_RUBY_MAP3", - "music": "MUS_AJITO", + "music": "MUS_AQUA_MAGMA_HIDEOUT", "region_map_section": "MAPSEC_AQUA_HIDEOUT", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ArtisanCave_1F/map.json b/data/maps/ArtisanCave_1F/map.json index f9bd9bc65..0d315b8ee 100644 --- a/data/maps/ArtisanCave_1F/map.json +++ b/data/maps/ArtisanCave_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ARTISAN_CAVE_1F", "name": "ArtisanCave_1F", "layout": "LAYOUT_ARTISAN_CAVE_1F", - "music": "MUS_DAN01", + "music": "MUS_PETALBURG_WOODS", "region_map_section": "MAPSEC_ARTISAN_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ArtisanCave_B1F/map.json b/data/maps/ArtisanCave_B1F/map.json index debe5b307..07a897bb9 100644 --- a/data/maps/ArtisanCave_B1F/map.json +++ b/data/maps/ArtisanCave_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ARTISAN_CAVE_B1F", "name": "ArtisanCave_B1F", "layout": "LAYOUT_ARTISAN_CAVE_B1F", - "music": "MUS_DAN01", + "music": "MUS_PETALBURG_WOODS", "region_map_section": "MAPSEC_ARTISAN_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattleColosseum_2P/map.json b/data/maps/BattleColosseum_2P/map.json index c0d8036a7..3c9887a65 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_RAINBOW", + "music": "MUS_EVER_GRANDE", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattleColosseum_4P/map.json b/data/maps/BattleColosseum_4P/map.json index 4a7e250be..a6eddc9a8 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_RAINBOW", + "music": "MUS_EVER_GRANDE", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc index c3b4154ba..5badc62d0 100644 --- a/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc @@ -66,7 +66,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_AnnounceTrainers:: @ 825752E applymovement LOCALID_OPPONENT, BattleFrontier_BattleArenaBattleRoom_Movement_OpponentEnter waitmovement 0 applymovement LOCALID_ANNOUNCER, BattleFrontier_BattleArenaBattleRoom_Movement_JumpInPlaceDown - playse SE_W187 + playse SE_M_BELLY_DRUM waitse waitmovement 0 msgbox BattleFrontier_BattleArenaBattleRoom_Text_PlayerStepForward, MSGBOX_DEFAULT @@ -74,7 +74,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_AnnounceTrainers:: @ 825752E applymovement LOCALID_PLAYER, BattleFrontier_BattleArenaBattleRoom_Movement_PlayerStepForward waitmovement 0 applymovement LOCALID_ANNOUNCER, BattleFrontier_BattleArenaBattleRoom_Movement_JumpInPlaceDown - playse SE_W187 + playse SE_M_BELLY_DRUM waitse waitmovement 0 arena_gettrainername @@ -83,7 +83,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_AnnounceTrainers:: @ 825752E applymovement LOCALID_OPPONENT, BattleFrontier_BattleArenaBattleRoom_Movement_OpponentStepForward waitmovement 0 applymovement LOCALID_ANNOUNCER, BattleFrontier_BattleArenaBattleRoom_Movement_JumpInPlaceDown - playse SE_W187 + playse SE_M_BELLY_DRUM waitse waitmovement 0 msgbox BattleFrontier_BattleArenaBattleRoom_Text_SetKOTourneyBegin, MSGBOX_DEFAULT @@ -103,7 +103,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_DeclareOpponentWinner:: @ 82575 applymovement LOCALID_BLACK_BELT_2, BattleFrontier_BattleArenaBattleRoom_Movement_JumpInPlaceDown applymovement LOCALID_BLACK_BELT_3, BattleFrontier_BattleArenaBattleRoom_Movement_JumpInPlaceUp applymovement LOCALID_BLACK_BELT_4, BattleFrontier_BattleArenaBattleRoom_Movement_JumpInPlaceUp - playse SE_W173 + playse SE_M_SNORE waitse waitmovement 0 arena_gettrainername @@ -131,7 +131,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_DefeatedOpponent:: @ 8257630 special LoadPlayerParty special SavePlayerParty frontier_setpartyorder FRONTIER_PARTY_SIZE - playfanfare MUS_ME_ASA + playfanfare MUS_HEAL waitfanfare special HealPlayerParty BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForOpponent:: @ 82576B0 @@ -286,7 +286,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_BattleGreta:: @ 8257961 applymovement LOCALID_ATTENDANT, BattleFrontier_BattleArenaBattleRoom_Movement_WalkInPlaceRight waitmovement 0 applymovement LOCALID_ANNOUNCER, BattleFrontier_BattleArenaBattleRoom_Movement_JumpInPlaceDown - playse SE_W187 + playse SE_M_BELLY_DRUM waitse waitmovement 0 msgbox BattleFrontier_BattleArenaBattleRoom_Text_PlayerStepForward, MSGBOX_DEFAULT @@ -294,7 +294,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_BattleGreta:: @ 8257961 applymovement LOCALID_PLAYER, BattleFrontier_BattleArenaBattleRoom_Movement_PlayerStepForwardLong waitmovement 0 applymovement LOCALID_ANNOUNCER, BattleFrontier_BattleArenaBattleRoom_Movement_JumpInPlaceDown - playse SE_W187 + playse SE_M_BELLY_DRUM waitse waitmovement 0 msgbox BattleFrontier_BattleArenaBattleRoom_Text_MakeWayForGreta, MSGBOX_DEFAULT @@ -336,7 +336,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_DefeatedGretaSilver:: @ 8257A5C applymovement LOCALID_OPPONENT, BattleFrontier_BattleArenaBattleRoom_Movement_OpponentStepForwardLong waitmovement 0 msgbox BattleFrontier_BattleArenaBattleRoom_Text_GretaYoureToughAfterAll, MSGBOX_DEFAULT - playfanfare MUS_ME_SYMBOLGET + playfanfare MUS_OBTAIN_SYMBOL message BattleFrontier_BattleArenaBattleRoom_Text_ReceivedGutsSymbol waitmessage waitfanfare @@ -373,7 +373,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_DefeatedGretaGold:: @ 8257B15 applymovement LOCALID_OPPONENT, BattleFrontier_BattleArenaBattleRoom_Movement_OpponentStepForwardLong waitmovement 0 msgbox BattleFrontier_BattleArenaBattleRoom_Text_GretaBlownAway, MSGBOX_DEFAULT - playfanfare MUS_ME_SYMBOLGET + playfanfare MUS_OBTAIN_SYMBOL message BattleFrontier_BattleArenaBattleRoom_Text_GutsSymbolTookGoldenShine waitmessage waitfanfare @@ -406,7 +406,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_DeclarePlayerWinner:: @ 8257BA9 applymovement LOCALID_BLACK_BELT_2, BattleFrontier_BattleArenaBattleRoom_Movement_JumpInPlaceDown applymovement LOCALID_BLACK_BELT_3, BattleFrontier_BattleArenaBattleRoom_Movement_JumpInPlaceUp applymovement LOCALID_BLACK_BELT_4, BattleFrontier_BattleArenaBattleRoom_Movement_JumpInPlaceUp - playse SE_BAN + playse SE_BANG waitse waitmovement 0 msgbox BattleFrontier_BattleArenaBattleRoom_Text_WinnerIsPlayer, MSGBOX_DEFAULT diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc index 78665edc1..b01d5314b 100644 --- a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc @@ -67,7 +67,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_PlayerEnter:: @ 824BD4E BattleFrontier_BattleDomeBattleRoom_EventScript_PlayerEnterForTucker:: @ 824BD5A applymovement LOCALID_PLAYER, BattleFrontier_BattleDomeBattleRoom_Movement_PlayerEnterForTucker BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceReactToPlayer:: @ 824BD61 - playse SE_W227B + playse SE_M_ENCORE2 call BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceLookAround waitmovement 0 compare VAR_TEMP_F, DOME_FINAL @@ -95,7 +95,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_BattleOpponent:: @ 824BD82 BattleFrontier_BattleDomeBattleRoom_EventScript_Draw:: @ 824BDF7 msgbox BattleFrontier_BattleDomeBattleRoom_Text_RefereeDecisionPleaseWait, MSGBOX_DEFAULT closemessage - playse SE_W227B + playse SE_M_ENCORE2 call BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceLookAround delay 60 applymovement LOCALID_REFEREE, BattleFrontier_BattleDomeBattleRoom_Movement_RefereeEnter @@ -120,7 +120,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_LostToOpponent:: @ 824BE4F call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_OpponentWonDraw compare VAR_TEMP_2, DRAW_TUCKER call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_TuckerWonDraw - playse SE_W227B + playse SE_M_ENCORE2 call BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceLookAround delay 60 BattleFrontier_BattleDomeBattleRoom_EventScript_LostTourney:: @ 824BE8D @@ -153,7 +153,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_DefeatedOpponent:: @ 824BEE0 call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_PlayerWon compare VAR_TEMP_2, DRAW_TRAINER call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_PlayerWonDraw - playse SE_W227B + playse SE_M_ENCORE2 call BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceLookAround delay 60 dome_getroundtext @@ -180,7 +180,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_WonLvOpenTourney:: @ 824BF96 msgbox BattleFrontier_BattleDomeBattleRoom_Text_PlayerIsLvOpenChamp, MSGBOX_DEFAULT BattleFrontier_BattleDomeBattleRoom_EventScript_CelebrateWin:: @ 824BF9E special DoDomeConfetti - playse SE_W227B + playse SE_M_ENCORE2 call BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceLookAround delay 60 frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_WON @@ -361,25 +361,25 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_TuckerEnter:: @ 824C211 applymovement LOCALID_AUDIENCE_TWIN, BattleFrontier_BattleDomeBattleRoom_Movement_AudienceTwinJump applymovement LOCALID_ANNOUNCER, BattleFrontier_BattleDomeBattleRoom_Movement_AnnouncerMoveForTuckerEntrance applymovement LOCALID_OPPONENT, BattleFrontier_BattleDomeBattleRoom_Movement_TuckerEnterAndDance - playse SE_W227B + playse SE_M_ENCORE2 call BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceLookAround waitse - playse SE_W227B + playse SE_M_ENCORE2 call BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceLookAround waitse - playse SE_W227B + playse SE_M_ENCORE2 call BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceLookAround waitse - playse SE_W227B + playse SE_M_ENCORE2 call BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceLookAround waitse - playse SE_W227B + playse SE_M_ENCORE2 call BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceLookAround waitse waitmovement 0 message BattleFrontier_BattleDomeBattleRoom_Text_SpectatorTuckerChant waitmessage - playse SE_W227B + playse SE_M_ENCORE2 call BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceLookAround waitse switch VAR_TEMP_E @@ -407,7 +407,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_BattleTuckerSilver:: @ 824C2B9 applymovement LOCALID_OPPONENT, BattleFrontier_BattleDomeBattleRoom_Movement_TuckerApproachPlayer waitmovement 0 msgbox BattleFrontier_BattleDomeBattleRoom_Text_SeeYourFrontierPass, MSGBOX_DEFAULT - playfanfare MUS_ME_SYMBOLGET + playfanfare MUS_OBTAIN_SYMBOL message BattleFrontier_BattleDomeBattleRoom_Text_ReceivedTacticsSymbol waitmessage waitfanfare @@ -437,7 +437,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_BattleTuckerGold:: @ 824C373 applymovement LOCALID_OPPONENT, BattleFrontier_BattleDomeBattleRoom_Movement_TuckerApproachPlayer waitmovement 0 msgbox BattleFrontier_BattleDomeBattleRoom_Text_NeverLostWhenPowerUnleashed, MSGBOX_DEFAULT - playfanfare MUS_ME_SYMBOLGET + playfanfare MUS_OBTAIN_SYMBOL message BattleFrontier_BattleDomeBattleRoom_Text_TacticsSymbolTookGoldenShine waitmessage waitfanfare @@ -456,7 +456,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_DoTuckerBattle:: @ 824C400 BattleFrontier_BattleDomeBattleRoom_EventScript_LostToTucker:: @ 824C420 msgbox BattleFrontier_BattleDomeBattleRoom_Text_WinnerIsTucker, MSGBOX_DEFAULT - playse SE_W227B + playse SE_M_ENCORE2 call BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceLookAround waitse goto BattleFrontier_BattleDomeBattleRoom_EventScript_LostTourney diff --git a/data/maps/BattleFrontier_BattleDomeCorridor/map.json b/data/maps/BattleFrontier_BattleDomeCorridor/map.json index 5b661ce6a..89fc022c5 100644 --- a/data/maps/BattleFrontier_BattleDomeCorridor/map.json +++ b/data/maps/BattleFrontier_BattleDomeCorridor/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_FRONTIER_BATTLE_DOME_CORRIDOR", "name": "BattleFrontier_BattleDomeCorridor", "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_DOME_CORRIDOR", - "music": "MUS_B_DOME1", + "music": "MUS_B_DOME_LOBBY", "region_map_section": "MAPSEC_BATTLE_FRONTIER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattleFrontier_BattleDomeLobby/map.json b/data/maps/BattleFrontier_BattleDomeLobby/map.json index 35caadbc0..e550bbaf5 100644 --- a/data/maps/BattleFrontier_BattleDomeLobby/map.json +++ b/data/maps/BattleFrontier_BattleDomeLobby/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_FRONTIER_BATTLE_DOME_LOBBY", "name": "BattleFrontier_BattleDomeLobby", "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_DOME_LOBBY", - "music": "MUS_B_DOME1", + "music": "MUS_B_DOME_LOBBY", "region_map_section": "MAPSEC_BATTLE_FRONTIER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc index 0d67792b9..977a0bcae 100644 --- a/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc @@ -224,7 +224,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_ReturnFromBattle:: @ 824B5C7 msgbox BattleFrontier_BattleDomePreBattleRoom_Text_RestoreMonsToFullHealth, MSGBOX_DEFAULT special LoadPlayerParty frontier_setpartyorder FRONTIER_PARTY_SIZE - playfanfare MUS_ME_ASA + playfanfare MUS_HEAL waitfanfare special HealPlayerParty call BattleFrontier_BattleDomePreBattleRoom_EventScript_RoundCompleteMessage diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc index ee7a724d1..f15f6542e 100644 --- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc @@ -150,7 +150,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_DefeatedNolandSilver:: @ 825B closemessage applymovement LOCALID_PLAYER, BattleFrontier_BattleFactoryBattleRoom_Movement_PlayerApproachNoland waitmovement 0 - playfanfare MUS_ME_SYMBOLGET + playfanfare MUS_OBTAIN_SYMBOL message BattleFrontier_BattleFactoryBattleRoom_Text_ReceivedKnowledgeSymbol waitmessage waitfanfare @@ -179,7 +179,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_DefeatedNolandGold:: @ 825B09 waitmessage applymovement LOCALID_PLAYER, BattleFrontier_BattleFactoryBattleRoom_Movement_PlayerApproachNoland waitmovement 0 - playfanfare MUS_ME_SYMBOLGET + playfanfare MUS_OBTAIN_SYMBOL message BattleFrontier_BattleFactoryBattleRoom_Text_KnowledgeSymbolTookGoldenShine waitmessage waitfanfare diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc index 0491c925a..48d2bcc3a 100644 --- a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc @@ -62,13 +62,13 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ReturnToRoomFromBattle:: @ factory_setopponentmons factory_resethelditems msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_LetUsRestoreMons, MSGBOX_DEFAULT - playfanfare MUS_ME_ASA + playfanfare MUS_HEAL waitfanfare special HealPlayerParty frontier_getbrainstatus compare VAR_RESULT, FRONTIER_BRAIN_NOT_READY goto_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForRegularOpponent - playse SE_TOREEYE + playse SE_POKENAV_CALL waitse msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_WaitFewMoments, MSGBOX_DEFAULT closemessage diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc index f1ea064d6..43db81321 100644 --- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc @@ -89,7 +89,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_DefeatedOpponent:: @ 824F911 special LoadPlayerParty special SavePlayerParty frontier_setpartyorder FRONTIER_PARTY_SIZE - playfanfare MUS_ME_ASA + playfanfare MUS_HEAL waitfanfare special HealPlayerParty BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForOpponent:: @ 824F98A @@ -245,7 +245,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_DefeatedSpenserSilver:: @ 824F applymovement LOCALID_PLAYER, BattleFrontier_BattlePalaceBattleRoom_Movement_FaceUp applymovement LOCALID_ATTENDANT, BattleFrontier_BattlePalaceBattleRoom_Movement_FaceDown msgbox BattleFrontier_BattlePalaceBattleRoom_Text_LetsSeeFrontierPass, MSGBOX_DEFAULT - playfanfare MUS_ME_SYMBOLGET + playfanfare MUS_OBTAIN_SYMBOL message BattleFrontier_BattlePalaceBattleRoom_Text_ReceivedSpiritsSymbol waitmessage waitfanfare @@ -280,7 +280,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_DefeatedSpenserGold:: @ 824FD8 applymovement LOCALID_PLAYER, BattleFrontier_BattlePalaceBattleRoom_Movement_FaceUp applymovement LOCALID_ATTENDANT, BattleFrontier_BattlePalaceBattleRoom_Movement_FaceDown msgbox BattleFrontier_BattlePalaceBattleRoom_Text_HurryWithFrontierPass, MSGBOX_DEFAULT - playfanfare MUS_ME_SYMBOLGET + playfanfare MUS_OBTAIN_SYMBOL message BattleFrontier_BattlePalaceBattleRoom_Text_SpiritsSymbolTookGoldenShine waitmessage waitfanfare diff --git a/data/maps/BattleFrontier_BattlePikeCorridor/map.json b/data/maps/BattleFrontier_BattlePikeCorridor/map.json index 8780bb0d3..1a5faadea 100644 --- a/data/maps/BattleFrontier_BattlePikeCorridor/map.json +++ b/data/maps/BattleFrontier_BattlePikeCorridor/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_FRONTIER_BATTLE_PIKE_CORRIDOR", "name": "BattleFrontier_BattlePikeCorridor", "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_CORRIDOR", - "music": "MUS_B_TUBE", + "music": "MUS_B_PIKE", "region_map_section": "MAPSEC_BATTLE_FRONTIER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattleFrontier_BattlePikeLobby/map.json b/data/maps/BattleFrontier_BattlePikeLobby/map.json index 3ce985ebc..2ca2ce485 100644 --- a/data/maps/BattleFrontier_BattlePikeLobby/map.json +++ b/data/maps/BattleFrontier_BattlePikeLobby/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY", "name": "BattleFrontier_BattlePikeLobby", "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY", - "music": "MUS_B_TUBE", + "music": "MUS_B_PIKE", "region_map_section": "MAPSEC_BATTLE_FRONTIER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc index c1d3fc974..3e6111f42 100644 --- a/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc @@ -265,7 +265,7 @@ BattleFrontier_BattlePikeLobby_EventScript_ExitRules:: @ 825BB47 end BattleFrontier_BattlePike_EventScript_CloseCurtain:: @ 825BB49 - playse SE_CURTAIN + playse SE_PIKE_CURTAIN_CLOSE special CloseBattlePikeCurtain waitstate waitse diff --git a/data/maps/BattleFrontier_BattlePikeRoomFinal/map.json b/data/maps/BattleFrontier_BattlePikeRoomFinal/map.json index 5d8067edc..5a53ad19c 100644 --- a/data/maps/BattleFrontier_BattlePikeRoomFinal/map.json +++ b/data/maps/BattleFrontier_BattlePikeRoomFinal/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_FINAL", "name": "BattleFrontier_BattlePikeRoomFinal", "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_FINAL", - "music": "MUS_B_TUBE", + "music": "MUS_B_PIKE", "region_map_section": "MAPSEC_BATTLE_FRONTIER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattleFrontier_BattlePikeRoomNormal/map.json b/data/maps/BattleFrontier_BattlePikeRoomNormal/map.json index fcaac560e..82414ac6a 100644 --- a/data/maps/BattleFrontier_BattlePikeRoomNormal/map.json +++ b/data/maps/BattleFrontier_BattlePikeRoomNormal/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_NORMAL", "name": "BattleFrontier_BattlePikeRoomNormal", "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_NORMAL", - "music": "MUS_B_TUBE", + "music": "MUS_B_PIKE", "region_map_section": "MAPSEC_BATTLE_FRONTIER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattleFrontier_BattlePikeRoomNormal/scripts.inc b/data/maps/BattleFrontier_BattlePikeRoomNormal/scripts.inc index 327b6463c..4238dd3f3 100644 --- a/data/maps/BattleFrontier_BattlePikeRoomNormal/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeRoomNormal/scripts.inc @@ -83,7 +83,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_WonHardBattle:: @ 825D285 lock faceplayer msgbox BattleFrontier_BattlePikeRoomNormal_Text_RestoreToFullHealth, MSGBOX_DEFAULT - playfanfare MUS_ME_ASA + playfanfare MUS_HEAL waitfanfare special HealPlayerParty msgbox BattleFrontier_BattlePikeRoomNormal_Text_EnjoyRestOfChallenge2, MSGBOX_DEFAULT @@ -111,7 +111,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_LucyEnter:: @ 825D2FB applymovement OBJ_EVENT_ID_CAMERA, BattleFrontier_BattlePikeRoomNormal_Movement_CameraPanUp applymovement LOCALID_OBJ_1, BattleFrontier_BattlePikeRoomNormal_Movement_HealNPCExitForLucy waitmovement 0 - playse SE_CURTAIN + playse SE_PIKE_CURTAIN_CLOSE call BattleFrontier_BattlePikeRoomNormal_EventScript_SetCurtainTilesLittleClosed delay 4 call BattleFrontier_BattlePikeRoomNormal_EventScript_SetCurtainTilesMostlyClosed @@ -120,7 +120,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_LucyEnter:: @ 825D2FB delay 4 waitse delay 60 - playse SE_CURTAIN1 + playse SE_PIKE_CURTAIN_OPEN delay 65 call BattleFrontier_BattlePikeRoomNormal_EventScript_SetCurtainTilesMostlyClosed showobjectat LOCALID_OBJ_0, MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_NORMAL @@ -154,7 +154,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_DefeatedLucySilver:: @ 825D3DA goto_if_ne BattleFrontier_BattlePikeRoomNormal_EventScript_DefeatedLucy msgbox BattleFrontier_BattlePikeRoomNormal_Text_LucyShowMeFrontierPass, MSGBOX_DEFAULT waitmessage - playfanfare MUS_ME_SYMBOLGET + playfanfare MUS_OBTAIN_SYMBOL message BattleFrontier_BattlePikeRoomNormal_Text_ReceivedLuckSymbol waitmessage waitfanfare @@ -182,7 +182,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_DefeatedLucyGold:: @ 825D460 goto_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_DefeatedLucy msgbox BattleFrontier_BattlePikeRoomNormal_Text_LucyFrontierPass, MSGBOX_DEFAULT waitmessage - playfanfare MUS_ME_SYMBOLGET + playfanfare MUS_OBTAIN_SYMBOL message BattleFrontier_BattlePikeRoomNormal_Text_LuckSymbolTookGoldenShine waitmessage waitfanfare @@ -211,14 +211,14 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_PreQueenNoHeal:: @ 825D4DC BattleFrontier_BattlePikeRoomNormal_EventScript_PreQueenHealOneMon:: @ 825D4EA msgbox BattleFrontier_BattlePikeRoomNormal_Text_ChoseRoomHealOne, MSGBOX_DEFAULT - playfanfare MUS_ME_ASA + playfanfare MUS_HEAL waitfanfare goto BattleFrontier_BattlePikeRoomNormal_EventScript_LucyEnter end BattleFrontier_BattlePikeRoomNormal_EventScript_PreQueenHealTwoMons:: @ 825D4FC msgbox BattleFrontier_BattlePikeRoomNormal_Text_ChoseRoomHealTwo, MSGBOX_DEFAULT - playfanfare MUS_ME_ASA + playfanfare MUS_HEAL waitfanfare goto BattleFrontier_BattlePikeRoomNormal_EventScript_LucyEnter end @@ -230,7 +230,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_EnterFullHealRoom:: @ 825D50E waitmovement 0 message BattleFrontier_BattlePikeRoomNormal_Text_WillRestoreToFullHealth waitmessage - playfanfare MUS_ME_ASA + playfanfare MUS_HEAL waitfanfare special HealPlayerParty msgbox BattleFrontier_BattlePikeRoomNormal_Text_EnjoyRestOfChallenge, MSGBOX_DEFAULT @@ -573,7 +573,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_HealNPC:: @ 825D83E call_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_WillRestoreTwoMons compare VAR_RESULT, 1 call_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_WillRestoreOneMon - playfanfare MUS_ME_ASA + playfanfare MUS_HEAL waitfanfare msgbox BattleFrontier_BattlePikeRoomNormal_Text_BestOfLuckFarewell, MSGBOX_DEFAULT closemessage diff --git a/data/maps/BattleFrontier_BattlePikeRoomWildMons/map.json b/data/maps/BattleFrontier_BattlePikeRoomWildMons/map.json index 433bff630..f74d54887 100644 --- a/data/maps/BattleFrontier_BattlePikeRoomWildMons/map.json +++ b/data/maps/BattleFrontier_BattlePikeRoomWildMons/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_WILD_MONS", "name": "BattleFrontier_BattlePikeRoomWildMons", "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_WILD_MONS", - "music": "MUS_B_TUBE", + "music": "MUS_B_PIKE", "region_map_section": "MAPSEC_BATTLE_FRONTIER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json b/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json index 005e285d4..536e02a89 100644 --- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json +++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM", "name": "BattleFrontier_BattlePikeThreePathRoom", "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM", - "music": "MUS_B_TUBE", + "music": "MUS_B_PIKE", "region_map_section": "MAPSEC_BATTLE_FRONTIER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattleFrontier_BattlePyramidFloor/scripts.inc b/data/maps/BattleFrontier_BattlePyramidFloor/scripts.inc index f590ff890..4f378c4e5 100644 --- a/data/maps/BattleFrontier_BattlePyramidFloor/scripts.inc +++ b/data/maps/BattleFrontier_BattlePyramidFloor/scripts.inc @@ -33,7 +33,7 @@ BattleFrontier_BattlePyramidFloor_EventScript_ShowMapName:: @ 8252A8F end BattleFrontier_BattlePyramidFloor_EventScript_PlayPyramidMusic:: @ 8252A98 - playbgm MUS_PYRAMID, 0 + playbgm MUS_B_PYRAMID, 0 setvar VAR_TEMP_E, 1 end diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/map.json b/data/maps/BattleFrontier_BattlePyramidLobby/map.json index 98b62f580..56736628f 100644 --- a/data/maps/BattleFrontier_BattlePyramidLobby/map.json +++ b/data/maps/BattleFrontier_BattlePyramidLobby/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY", "name": "BattleFrontier_BattlePyramidLobby", "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY", - "music": "MUS_PYRAMID", + "music": "MUS_B_PYRAMID", "region_map_section": "MAPSEC_BATTLE_FRONTIER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc index 6c17ca02a..fc33a8c91 100644 --- a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc @@ -32,7 +32,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_QuitWithoutSaving:: @ 8250768 lockall message BattleFrontier_BattlePyramidLobby_Text_DidntSaveBeforeQuittingTakeBag waitmessage - playse SE_EXPMAX + playse SE_EXP_MAX waitse closemessage pyramid_set PYRAMID_DATA_WIN_STREAK, 0 @@ -63,7 +63,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_GiveBattlePoints:: @ 82507DA special HealPlayerParty message BattleFrontier_BattlePyramidLobby_Text_UsedBattleBagWillBeKept waitmessage - playse SE_EXPMAX + playse SE_EXP_MAX waitse msgbox BattleFrontier_BattlePyramidLobby_Text_GiveYouTheseBattlePoints, MSGBOX_DEFAULT frontier_givepoints @@ -88,7 +88,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_LostChallenge:: @ 8250852 lockall message BattleFrontier_BattlePyramidLobby_Text_DisappointingHereIsBag waitmessage - playse SE_EXPMAX + playse SE_EXP_MAX waitse message BattleFrontier_BattlePyramidLobby_Text_RecordResultsWait waitmessage @@ -388,7 +388,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_ReceiveNewBattleBag:: @ 8250D94 BattleFrontier_BattlePyramidLobby_EventScript_ReceiveBattleBag:: @ 8250D9C message BattleFrontier_BattlePyramidLobby_Text_ExchangedBagForBattleBag waitmessage - playse SE_EXPMAX + playse SE_EXP_MAX waitse msgbox BattleFrontier_BattlePyramidLobby_Text_StepOnFloorPanel, MSGBOX_DEFAULT closemessage diff --git a/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc b/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc index 7aee4512d..076fae158 100644 --- a/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc +++ b/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc @@ -53,7 +53,7 @@ BattleFrontier_BattlePyramidTop_OnFrame: @ 825516E .2byte 0 BattleFrontier_BattlePyramidTop_EventScript_PlayPyramidMusic:: @ 8255180 - playbgm MUS_PYRAMID_TOP, 0 + playbgm MUS_B_PYRAMID_TOP, 0 setvar VAR_TEMP_E, 1 end @@ -88,7 +88,7 @@ BattleFrontier_BattlePyramidTop_EventScript_Attendant:: @ 82551D0 waitmovement 0 message BattleFrontier_BattlePyramidTop_Text_PlayerConqueredPyramid waitmessage - playfanfare MUS_ME_POINTGET + playfanfare MUS_OBTAIN_B_POINTS waitfanfare closemessage BattleFrontier_BattlePyramidTop_EventScript_WarpToLobbyWon:: @ 825521A @@ -136,7 +136,7 @@ BattleFrontier_BattlePyramidTop_EventScript_BrandonHeardSilverSpeech:: @ 82552D0 BattleFrontier_BattlePyramidTop_EventScript_BattleBrandonSilver:: @ 82552DA msgbox BattleFrontier_BattlePyramidTop_Text_BringCourageToOurBattle, MSGBOX_DEFAULT call BattleFrontier_BattlePyramidTop_EventScript_DoBrandonBattle - playbgm MUS_PYRAMID_TOP, 0 + playbgm MUS_B_PYRAMID_TOP, 0 compare VAR_RESULT, 1 goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_DefeatedBrandonSilver goto BattleFrontier_BattlePyramid_EventScript_WarpToLobbyLost @@ -146,7 +146,7 @@ BattleFrontier_BattlePyramidTop_EventScript_DefeatedBrandonSilver:: @ 82552FB compare VAR_RESULT, 0 goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_WarpToLobbyWon msgbox BattleFrontier_BattlePyramidTop_Text_BrandonFrontierPassPlease, MSGBOX_DEFAULT - playfanfare MUS_ME_SYMBOLGET + playfanfare MUS_OBTAIN_SYMBOL message BattleFrontier_BattlePyramidTop_Text_ReceivedBraveSymbol waitmessage waitfanfare @@ -176,7 +176,7 @@ BattleFrontier_BattlePyramidTop_EventScript_BrandonHeardGoldSpeech:: @ 8255388 BattleFrontier_BattlePyramidTop_EventScript_BattleBrandonGold:: @ 8255392 msgbox BattleFrontier_BattlePyramidTop_Text_EverythingYouHave, MSGBOX_DEFAULT call BattleFrontier_BattlePyramidTop_EventScript_DoBrandonBattle - playbgm MUS_PYRAMID_TOP, 0 + playbgm MUS_B_PYRAMID_TOP, 0 compare VAR_RESULT, 1 goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_DefeatedBrandonGold goto BattleFrontier_BattlePyramid_EventScript_WarpToLobbyLost @@ -186,7 +186,7 @@ BattleFrontier_BattlePyramidTop_EventScript_DefeatedBrandonGold:: @ 82553B3 compare VAR_RESULT, 2 goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_WarpToLobbyWon msgbox BattleFrontier_BattlePyramidTop_Text_BrandonRemarkableHaveThis, MSGBOX_DEFAULT - playfanfare MUS_ME_SYMBOLGET + playfanfare MUS_OBTAIN_SYMBOL message BattleFrontier_BattlePyramidTop_Text_BraveSymbolTookGoldenShine waitmessage waitfanfare diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/map.json b/data/maps/BattleFrontier_BattleTowerBattleRoom/map.json index 157c9c83f..7cb154d8d 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom/map.json +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM", "name": "BattleFrontier_BattleTowerBattleRoom", "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM", - "music": "MUS_SATTOWER", + "music": "MUS_B_TOWER", "region_map_section": "MAPSEC_BATTLE_FRONTIER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc index bc12c14f4..493588b4d 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc @@ -69,7 +69,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_DefeatedOpponent:: @ 8241C2F applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_PlayerFaceAttendant waitmovement 0 msgbox BattleFrontier_BattleTowerBattleRoom_Text_RestoreMonsToFullHealth, MSGBOX_DEFAULT - playfanfare MUS_ME_ASA + playfanfare MUS_HEAL waitfanfare special HealPlayerParty BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForOpponent:: @ 8241C8F @@ -272,7 +272,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_DefeatedAnabelSilver:: @ 824204 compare VAR_RESULT, 0 goto_if_ne BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyWon msgbox BattleFrontier_BattleTowerBattleRoom_Text_AnabelTalentShallBeRecognized, MSGBOX_DEFAULT - playfanfare MUS_ME_SYMBOLGET + playfanfare MUS_OBTAIN_SYMBOL message BattleFrontier_BattleTowerBattleRoom_Text_ReceivedAbilitySymbol waitmessage waitfanfare @@ -299,7 +299,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_DefeatedAnabelGold:: @ 82420CF compare VAR_RESULT, 2 goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyWon msgbox BattleFrontier_BattleTowerBattleRoom_Text_AnabelCongratsYourPassPlease, MSGBOX_DEFAULT - playfanfare MUS_ME_SYMBOLGET + playfanfare MUS_OBTAIN_SYMBOL message BattleFrontier_BattleTowerBattleRoom_Text_AbilitySymbolTookGoldenShine waitmessage waitfanfare diff --git a/data/maps/BattleFrontier_BattleTowerCorridor/map.json b/data/maps/BattleFrontier_BattleTowerCorridor/map.json index fad132034..10d5ca7f7 100644 --- a/data/maps/BattleFrontier_BattleTowerCorridor/map.json +++ b/data/maps/BattleFrontier_BattleTowerCorridor/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR", "name": "BattleFrontier_BattleTowerCorridor", "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR", - "music": "MUS_SATTOWER", + "music": "MUS_B_TOWER", "region_map_section": "MAPSEC_BATTLE_FRONTIER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattleFrontier_BattleTowerElevator/map.json b/data/maps/BattleFrontier_BattleTowerElevator/map.json index 3538a0469..f74dce233 100644 --- a/data/maps/BattleFrontier_BattleTowerElevator/map.json +++ b/data/maps/BattleFrontier_BattleTowerElevator/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_ELEVATOR", "name": "BattleFrontier_BattleTowerElevator", "layout": "LAYOUT_BATTLE_ELEVATOR", - "music": "MUS_SATTOWER", + "music": "MUS_B_TOWER", "region_map_section": "MAPSEC_BATTLE_FRONTIER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattleFrontier_BattleTowerLobby/map.json b/data/maps/BattleFrontier_BattleTowerLobby/map.json index 516a90038..3135c48fe 100644 --- a/data/maps/BattleFrontier_BattleTowerLobby/map.json +++ b/data/maps/BattleFrontier_BattleTowerLobby/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY", "name": "BattleFrontier_BattleTowerLobby", "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY", - "music": "MUS_SATTOWER", + "music": "MUS_B_TOWER", "region_map_section": "MAPSEC_BATTLE_FRONTIER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc index 4b1f196e3..c1174cf06 100644 --- a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc @@ -81,7 +81,7 @@ BattleFrontier_BattleTowerLobby_EventScript_GiveRibbons:: @ 823E780 goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_GiveBattlePoints message BattleFrontier_BattleTowerLobby_Text_HereAreSomeRibbons waitmessage - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM waitfanfare msgbox BattleFrontier_BattleTowerLobby_Text_PutRibbonOnMons, MSGBOX_DEFAULT BattleFrontier_BattleTowerLobby_EventScript_GiveBattlePoints:: @ 823E7A5 diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/map.json b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/map.json index 0faeed92c..e48bcefd1 100644 --- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/map.json +++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM", "name": "BattleFrontier_BattleTowerMultiBattleRoom", "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM", - "music": "MUS_SATTOWER", + "music": "MUS_B_TOWER", "region_map_section": "MAPSEC_BATTLE_FRONTIER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc index d764419fd..f4de37232 100644 --- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc @@ -144,7 +144,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_RestoreParty:: @ 8249121 frontier_setpartyorder FRONTIER_MULTI_PARTY_SIZE compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS call_if_eq BattleFrontier_BattleTowerMultiBattleRoom_EventScript_249514 - playfanfare MUS_ME_ASA + playfanfare MUS_HEAL waitfanfare special HealPlayerParty BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponents:: @ 8249143 diff --git a/data/maps/BattleFrontier_BattleTowerMultiCorridor/map.json b/data/maps/BattleFrontier_BattleTowerMultiCorridor/map.json index 3bb2a04b4..36b4ecd46 100644 --- a/data/maps/BattleFrontier_BattleTowerMultiCorridor/map.json +++ b/data/maps/BattleFrontier_BattleTowerMultiCorridor/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR", "name": "BattleFrontier_BattleTowerMultiCorridor", "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR", - "music": "MUS_SATTOWER", + "music": "MUS_B_TOWER", "region_map_section": "MAPSEC_BATTLE_FRONTIER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattleFrontier_BattleTowerMultiPartnerRoom/map.json b/data/maps/BattleFrontier_BattleTowerMultiPartnerRoom/map.json index 610c99713..c48458344 100644 --- a/data/maps/BattleFrontier_BattleTowerMultiPartnerRoom/map.json +++ b/data/maps/BattleFrontier_BattleTowerMultiPartnerRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_PARTNER_ROOM", "name": "BattleFrontier_BattleTowerMultiPartnerRoom", "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_PARTNER_ROOM", - "music": "MUS_SATTOWER", + "music": "MUS_B_TOWER", "region_map_section": "MAPSEC_BATTLE_FRONTIER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattleFrontier_ExchangeServiceCorner/map.json b/data/maps/BattleFrontier_ExchangeServiceCorner/map.json index 77742a116..50c6a90a9 100644 --- a/data/maps/BattleFrontier_ExchangeServiceCorner/map.json +++ b/data/maps/BattleFrontier_ExchangeServiceCorner/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_FRONTIER_EXCHANGE_SERVICE_CORNER", "name": "BattleFrontier_ExchangeServiceCorner", "layout": "LAYOUT_BATTLE_FRONTIER_EXCHANGE_SERVICE_CORNER", - "music": "MUS_B_TOWER", + "music": "MUS_B_TOWER_RS", "region_map_section": "MAPSEC_BATTLE_FRONTIER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattleFrontier_ExchangeServiceCorner/scripts.inc b/data/maps/BattleFrontier_ExchangeServiceCorner/scripts.inc index f0fb42bb4..b7dfe19fa 100644 --- a/data/maps/BattleFrontier_ExchangeServiceCorner/scripts.inc +++ b/data/maps/BattleFrontier_ExchangeServiceCorner/scripts.inc @@ -42,7 +42,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_TryGiveDecor:: @ 825F0E5 special TakeFrontierBattlePoints adddecoration VAR_0x8009 special UpdateBattlePointsWindow - playse SE_REGI + playse SE_SHOP msgbox BattleFrontier_ExchangeServiceCorner_Text_WellSendItToPC, MSGBOX_DEFAULT compare VAR_TEMP_2, EXCHANGE_CORNER_DECOR1_CLERK goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor1 @@ -63,7 +63,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_TryGiveItem:: @ 825F12A special TakeFrontierBattlePoints additem VAR_0x8009 special UpdateBattlePointsWindow - playse SE_REGI + playse SE_SHOP msgbox BattleFrontier_ExchangeServiceCorner_Text_HereIsYourPrize, MSGBOX_DEFAULT compare VAR_TEMP_2, EXCHANGE_CORNER_VITAMIN_CLERK goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseVitamin diff --git a/data/maps/BattleFrontier_Lounge1/map.json b/data/maps/BattleFrontier_Lounge1/map.json index 2086ce78e..a650e3ce7 100644 --- a/data/maps/BattleFrontier_Lounge1/map.json +++ b/data/maps/BattleFrontier_Lounge1/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_FRONTIER_LOUNGE1", "name": "BattleFrontier_Lounge1", "layout": "LAYOUT_BATTLE_FRONTIER_LOUNGE2", - "music": "MUS_B_TOWER", + "music": "MUS_B_TOWER_RS", "region_map_section": "MAPSEC_BATTLE_FRONTIER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattleFrontier_Lounge2/map.json b/data/maps/BattleFrontier_Lounge2/map.json index 11a5498af..856e2d395 100644 --- a/data/maps/BattleFrontier_Lounge2/map.json +++ b/data/maps/BattleFrontier_Lounge2/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_FRONTIER_LOUNGE2", "name": "BattleFrontier_Lounge2", "layout": "LAYOUT_BATTLE_FRONTIER_LOUNGE1", - "music": "MUS_B_TOWER", + "music": "MUS_B_TOWER_RS", "region_map_section": "MAPSEC_BATTLE_FRONTIER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattleFrontier_Lounge3/map.json b/data/maps/BattleFrontier_Lounge3/map.json index 68d60c70e..58aee4d41 100644 --- a/data/maps/BattleFrontier_Lounge3/map.json +++ b/data/maps/BattleFrontier_Lounge3/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_FRONTIER_LOUNGE3", "name": "BattleFrontier_Lounge3", "layout": "LAYOUT_BATTLE_FRONTIER_LOUNGE2", - "music": "MUS_B_TOWER", + "music": "MUS_B_TOWER_RS", "region_map_section": "MAPSEC_BATTLE_FRONTIER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattleFrontier_Lounge3/scripts.inc b/data/maps/BattleFrontier_Lounge3/scripts.inc index e892ad3ea..bc85d92d0 100644 --- a/data/maps/BattleFrontier_Lounge3/scripts.inc +++ b/data/maps/BattleFrontier_Lounge3/scripts.inc @@ -74,7 +74,7 @@ BattleFrontier_Lounge3_EventScript_PlaceBet:: @ 8261E75 special TakeFrontierBattlePoints setvar VAR_FRONTIER_GAMBLER_STATE, FRONTIER_GAMBLER_PLACED_BET special UpdateBattlePointsWindow - playse SE_REGI + playse SE_SHOP msgbox BattleFrontier_Lounge3_Text_ThanksOffYouGo, MSGBOX_DEFAULT goto BattleFrontier_Lounge3_EventScript_FinishBet end diff --git a/data/maps/BattleFrontier_Lounge4/map.json b/data/maps/BattleFrontier_Lounge4/map.json index 9ac2466be..c82c51dce 100644 --- a/data/maps/BattleFrontier_Lounge4/map.json +++ b/data/maps/BattleFrontier_Lounge4/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_FRONTIER_LOUNGE4", "name": "BattleFrontier_Lounge4", "layout": "LAYOUT_BATTLE_FRONTIER_LOUNGE2", - "music": "MUS_B_TOWER", + "music": "MUS_B_TOWER_RS", "region_map_section": "MAPSEC_BATTLE_FRONTIER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattleFrontier_Lounge5/map.json b/data/maps/BattleFrontier_Lounge5/map.json index e0c2ff747..a8650cfd6 100644 --- a/data/maps/BattleFrontier_Lounge5/map.json +++ b/data/maps/BattleFrontier_Lounge5/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_FRONTIER_LOUNGE5", "name": "BattleFrontier_Lounge5", "layout": "LAYOUT_BATTLE_FRONTIER_LOUNGE1", - "music": "MUS_B_TOWER", + "music": "MUS_B_TOWER_RS", "region_map_section": "MAPSEC_BATTLE_FRONTIER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattleFrontier_Lounge6/map.json b/data/maps/BattleFrontier_Lounge6/map.json index 85b9bd615..36027a47e 100644 --- a/data/maps/BattleFrontier_Lounge6/map.json +++ b/data/maps/BattleFrontier_Lounge6/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_FRONTIER_LOUNGE6", "name": "BattleFrontier_Lounge6", "layout": "LAYOUT_BATTLE_FRONTIER_LOUNGE2", - "music": "MUS_B_TOWER", + "music": "MUS_B_TOWER_RS", "region_map_section": "MAPSEC_BATTLE_FRONTIER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattleFrontier_Lounge7/map.json b/data/maps/BattleFrontier_Lounge7/map.json index a2e795ae8..36cf3a882 100644 --- a/data/maps/BattleFrontier_Lounge7/map.json +++ b/data/maps/BattleFrontier_Lounge7/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_FRONTIER_LOUNGE7", "name": "BattleFrontier_Lounge7", "layout": "LAYOUT_BATTLE_FRONTIER_LOUNGE2", - "music": "MUS_B_TOWER", + "music": "MUS_B_TOWER_RS", "region_map_section": "MAPSEC_BATTLE_FRONTIER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattleFrontier_Lounge8/map.json b/data/maps/BattleFrontier_Lounge8/map.json index 794a83014..0736d3b5c 100644 --- a/data/maps/BattleFrontier_Lounge8/map.json +++ b/data/maps/BattleFrontier_Lounge8/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_FRONTIER_LOUNGE8", "name": "BattleFrontier_Lounge8", "layout": "LAYOUT_BATTLE_FRONTIER_LOUNGE2", - "music": "MUS_B_TOWER", + "music": "MUS_B_TOWER_RS", "region_map_section": "MAPSEC_BATTLE_FRONTIER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattleFrontier_Lounge9/map.json b/data/maps/BattleFrontier_Lounge9/map.json index 0be08a1d5..d73ad0e92 100644 --- a/data/maps/BattleFrontier_Lounge9/map.json +++ b/data/maps/BattleFrontier_Lounge9/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_FRONTIER_LOUNGE9", "name": "BattleFrontier_Lounge9", "layout": "LAYOUT_BATTLE_FRONTIER_LOUNGE2", - "music": "MUS_B_TOWER", + "music": "MUS_B_TOWER_RS", "region_map_section": "MAPSEC_BATTLE_FRONTIER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattleFrontier_Mart/map.json b/data/maps/BattleFrontier_Mart/map.json index 01f3352d6..10dc2cb1b 100644 --- a/data/maps/BattleFrontier_Mart/map.json +++ b/data/maps/BattleFrontier_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_FRONTIER_MART", "name": "BattleFrontier_Mart", "layout": "LAYOUT_MART", - "music": "MUS_FRIENDLY", + "music": "MUS_POKE_MART", "region_map_section": "MAPSEC_BATTLE_FRONTIER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattleFrontier_OutsideEast/scripts.inc b/data/maps/BattleFrontier_OutsideEast/scripts.inc index 6995e405e..8e891dd32 100644 --- a/data/maps/BattleFrontier_OutsideEast/scripts.inc +++ b/data/maps/BattleFrontier_OutsideEast/scripts.inc @@ -108,7 +108,7 @@ BattleFrontier_OutsideEast_EventScript_Sudowoodo:: @ 8242CEA lock faceplayer waitse - playse SE_USSOKI + playse SE_SUDOWOODO_SHAKE applymovement LOCALID_SUDOWOODO, BattleFrontier_OutsideEast_Movement_SudowoodoShake waitmovement 0 release @@ -120,7 +120,7 @@ BattleFrontier_OutsideEast_EventScript_WaterSudowoodo:: @ 8242CFC special DoWateringBerryTreeAnim waitstate waitse - playse SE_USSOKI + playse SE_SUDOWOODO_SHAKE applymovement LOCALID_SUDOWOODO, BattleFrontier_OutsideEast_Movement_SudowoodoShake waitmovement 0 msgbox gText_Sudowoodo_Attacked, MSGBOX_DEFAULT diff --git a/data/maps/BattleFrontier_PokemonCenter_1F/map.json b/data/maps/BattleFrontier_PokemonCenter_1F/map.json index 28a50f8af..b4b16ba94 100644 --- a/data/maps/BattleFrontier_PokemonCenter_1F/map.json +++ b/data/maps/BattleFrontier_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F", "name": "BattleFrontier_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_BATTLE_FRONTIER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattleFrontier_PokemonCenter_2F/map.json b/data/maps/BattleFrontier_PokemonCenter_2F/map.json index 98aa2be35..cb3191649 100644 --- a/data/maps/BattleFrontier_PokemonCenter_2F/map.json +++ b/data/maps/BattleFrontier_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_FRONTIER_POKEMON_CENTER_2F", "name": "BattleFrontier_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_BATTLE_FRONTIER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattleFrontier_RankingHall/map.json b/data/maps/BattleFrontier_RankingHall/map.json index 8e179efda..5ac9f6699 100644 --- a/data/maps/BattleFrontier_RankingHall/map.json +++ b/data/maps/BattleFrontier_RankingHall/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_FRONTIER_RANKING_HALL", "name": "BattleFrontier_RankingHall", "layout": "LAYOUT_BATTLE_FRONTIER_RANKING_HALL", - "music": "MUS_BIJYUTU", + "music": "MUS_LILYCOVE_MUSEUM", "region_map_section": "MAPSEC_BATTLE_FRONTIER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattleFrontier_ReceptionGate/map.json b/data/maps/BattleFrontier_ReceptionGate/map.json index 59f7862dc..44c71ccd1 100644 --- a/data/maps/BattleFrontier_ReceptionGate/map.json +++ b/data/maps/BattleFrontier_ReceptionGate/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_FRONTIER_RECEPTION_GATE", "name": "BattleFrontier_ReceptionGate", "layout": "LAYOUT_BATTLE_FRONTIER_RECEPTION_GATE", - "music": "MUS_B_TOWER", + "music": "MUS_B_TOWER_RS", "region_map_section": "MAPSEC_BATTLE_FRONTIER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattleFrontier_ReceptionGate/scripts.inc b/data/maps/BattleFrontier_ReceptionGate/scripts.inc index 495ad165f..28f53de08 100644 --- a/data/maps/BattleFrontier_ReceptionGate/scripts.inc +++ b/data/maps/BattleFrontier_ReceptionGate/scripts.inc @@ -33,7 +33,7 @@ BattleFrontier_ReceptionGate_EventScript_FirstTimeEntering:: @ 82661F3 BattleFrontier_ReceptionGate_EventScript_ScottScene:: @ 8266229 msgbox BattleFrontier_ReceptionGate_Text_WelcomeToBattleFrontier, MSGBOX_DEFAULT msgbox BattleFrontier_ReceptionGate_Text_IssueFrontierPass, MSGBOX_DEFAULT - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM message BattleFrontier_ReceptionGate_Text_ObtainedFrontierPass waitfanfare waitmessage diff --git a/data/maps/BattleFrontier_ScottsHouse/map.json b/data/maps/BattleFrontier_ScottsHouse/map.json index a22711749..74393db0b 100644 --- a/data/maps/BattleFrontier_ScottsHouse/map.json +++ b/data/maps/BattleFrontier_ScottsHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_FRONTIER_SCOTTS_HOUSE", "name": "BattleFrontier_ScottsHouse", "layout": "LAYOUT_BATTLE_FRONTIER_SCOTTS_HOUSE", - "music": "MUS_B_TOWER", + "music": "MUS_B_TOWER_RS", "region_map_section": "MAPSEC_BATTLE_FRONTIER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc index 6bc902426..16a1c7488 100644 --- a/data/maps/BirthIsland_Exterior/scripts.inc +++ b/data/maps/BirthIsland_Exterior/scripts.inc @@ -71,9 +71,9 @@ BirthIsland_Exterior_EventScript_Deoxys:: @ 8267FC1 setfieldeffectargument 0, LOCALID_DEOXYS_ROCK setfieldeffectargument 1, 58 setfieldeffectargument 2, 26 - dofieldeffect FLDEFF_65 - playbgm MUS_RG_DEOEYE, 0 - waitfieldeffect FLDEFF_65 + dofieldeffect FLDEFF_DESTROY_DEOXYS_ROCK + playbgm MUS_RG_ENCOUNTER_DEOXYS, 0 + waitfieldeffect FLDEFF_DESTROY_DEOXYS_ROCK addobject LOCALID_DEOXYS applymovement LOCALID_DEOXYS, BirthIsland_Exterior_Movement_DeoxysApproach waitmovement 0 diff --git a/data/maps/CaveOfOrigin_1F/map.json b/data/maps/CaveOfOrigin_1F/map.json index 36af5ca31..17da43907 100644 --- a/data/maps/CaveOfOrigin_1F/map.json +++ b/data/maps/CaveOfOrigin_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_CAVE_OF_ORIGIN_1F", "name": "CaveOfOrigin_1F", "layout": "LAYOUT_CAVE_OF_ORIGIN_1F", - "music": "MUS_DAN03", + "music": "MUS_CAVE_OF_ORIGIN", "region_map_section": "MAPSEC_CAVE_OF_ORIGIN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CaveOfOrigin_B1F/scripts.inc b/data/maps/CaveOfOrigin_B1F/scripts.inc index ea8d6cec8..db267aaaa 100644 --- a/data/maps/CaveOfOrigin_B1F/scripts.inc +++ b/data/maps/CaveOfOrigin_B1F/scripts.inc @@ -51,7 +51,7 @@ CaveOfOrigin_B1F_EventScript_DontRemember:: @ 8235842 CaveOfOrigin_B1F_EventScript_AtSkyPillar:: @ 823584D msgbox CaveOfOrigin_B1F_Text_WellHeadToSkyPillar, MSGBOX_DEFAULT closemessage - playse SE_KAIDAN + playse SE_EXIT fadescreenspeed FADE_TO_BLACK, 4 setflag FLAG_WALLACE_GOES_TO_SKY_PILLAR setvar VAR_SOOTOPOLIS_CITY_STATE, 3 diff --git a/data/maps/CaveOfOrigin_Entrance/map.json b/data/maps/CaveOfOrigin_Entrance/map.json index 78a8e58e0..f45f47f99 100644 --- a/data/maps/CaveOfOrigin_Entrance/map.json +++ b/data/maps/CaveOfOrigin_Entrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_CAVE_OF_ORIGIN_ENTRANCE", "name": "CaveOfOrigin_Entrance", "layout": "LAYOUT_CAVE_OF_ORIGIN_ENTRANCE", - "music": "MUS_DAN03", + "music": "MUS_CAVE_OF_ORIGIN", "region_map_section": "MAPSEC_CAVE_OF_ORIGIN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/map.json b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/map.json index f27b15b85..8b05ac536 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/map.json +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/map.json @@ -2,7 +2,7 @@ "id": "MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP1", "name": "CaveOfOrigin_UnusedRubySapphireMap1", "layout": "LAYOUT_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP1", - "music": "MUS_DAN03", + "music": "MUS_CAVE_OF_ORIGIN", "region_map_section": "MAPSEC_CAVE_OF_ORIGIN", "requires_flash": true, "weather": "WEATHER_NONE", diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/map.json b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/map.json index 5a377947c..9a3d09810 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/map.json +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/map.json @@ -2,7 +2,7 @@ "id": "MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2", "name": "CaveOfOrigin_UnusedRubySapphireMap2", "layout": "LAYOUT_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2", - "music": "MUS_DAN03", + "music": "MUS_CAVE_OF_ORIGIN", "region_map_section": "MAPSEC_CAVE_OF_ORIGIN", "requires_flash": true, "weather": "WEATHER_FOG_HORIZONTAL", diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/map.json b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/map.json index 85f82b886..9456f4012 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/map.json +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/map.json @@ -2,7 +2,7 @@ "id": "MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3", "name": "CaveOfOrigin_UnusedRubySapphireMap3", "layout": "LAYOUT_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3", - "music": "MUS_DAN03", + "music": "MUS_CAVE_OF_ORIGIN", "region_map_section": "MAPSEC_CAVE_OF_ORIGIN", "requires_flash": true, "weather": "WEATHER_FOG_HORIZONTAL", diff --git a/data/maps/ContestHall/map.json b/data/maps/ContestHall/map.json index 4f8254662..842c57968 100644 --- a/data/maps/ContestHall/map.json +++ b/data/maps/ContestHall/map.json @@ -2,7 +2,7 @@ "id": "MAP_CONTEST_HALL", "name": "ContestHall", "layout": "LAYOUT_CONTEST_HALL", - "music": "MUS_CONTEST0", + "music": "MUS_CONTEST", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ContestHall/scripts.inc b/data/maps/ContestHall/scripts.inc index 33e074e8a..abde00cc2 100644 --- a/data/maps/ContestHall/scripts.inc +++ b/data/maps/ContestHall/scripts.inc @@ -18,7 +18,7 @@ ContestHall_OnTransition: @ 823B79F ContestHall_EventScript_ReadyContestMusic:: @ 823B7AF call ContestHall_EventScript_TryWaitForLink - special ScriptGetMultiplayerId + special GetContestMultiplayerId compare VAR_RESULT, 0 call_if_eq ContestHall_EventScript_SaveContestMusicPlayer1 compare VAR_RESULT, 1 @@ -32,23 +32,23 @@ ContestHall_EventScript_ReadyContestMusic:: @ 823B7AF return ContestHall_EventScript_SaveContestMusicPlayer1:: @ 823B7EF - savebgm MUS_TEST1 + savebgm MUS_LINK_CONTEST_P1 return ContestHall_EventScript_SaveContestMusicPlayer2:: @ 823B7F3 - savebgm MUS_TEST2 + savebgm MUS_LINK_CONTEST_P2 return ContestHall_EventScript_SaveContestMusicPlayer3:: @ 823B7F7 - savebgm MUS_TEST3 + savebgm MUS_LINK_CONTEST_P3 return ContestHall_EventScript_SaveContestMusicPlayer4:: @ 823B7FB - savebgm MUS_TEST4 + savebgm MUS_LINK_CONTEST_P4 return ContestHall_EventScript_SaveContestMusic:: @ 823B7FF - savebgm MUS_CONTEST0 + savebgm MUS_CONTEST return ContestHall_OnResume: @ 823B803 @@ -136,7 +136,7 @@ ContestHall_EventScript_SetRandomAudience7:: @ 823B8ED ContestHall_EventScript_GetRandomAudienceGfxId:: @ 823B8F8 setvar VAR_RESULT, 32 - special ScriptRandom + special GenerateContestRand addvar VAR_RESULT, 1 switch VAR_RESULT case 1, ContestHall_EventScript_RandomAudienceNinjaBoy diff --git a/data/maps/ContestHallBeauty/map.json b/data/maps/ContestHallBeauty/map.json index f0cb9168f..c0ba03bd3 100644 --- a/data/maps/ContestHallBeauty/map.json +++ b/data/maps/ContestHallBeauty/map.json @@ -2,7 +2,7 @@ "id": "MAP_CONTEST_HALL_BEAUTY", "name": "ContestHallBeauty", "layout": "LAYOUT_CONTEST_HALL_BEAUTY", - "music": "MUS_CONTEST0", + "music": "MUS_CONTEST", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ContestHallCool/map.json b/data/maps/ContestHallCool/map.json index 4d1aa639e..0cd6e1e2a 100644 --- a/data/maps/ContestHallCool/map.json +++ b/data/maps/ContestHallCool/map.json @@ -2,7 +2,7 @@ "id": "MAP_CONTEST_HALL_COOL", "name": "ContestHallCool", "layout": "LAYOUT_CONTEST_HALL_COOL", - "music": "MUS_CONTEST0", + "music": "MUS_CONTEST", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ContestHallCute/map.json b/data/maps/ContestHallCute/map.json index 4b81a3192..e52539070 100644 --- a/data/maps/ContestHallCute/map.json +++ b/data/maps/ContestHallCute/map.json @@ -2,7 +2,7 @@ "id": "MAP_CONTEST_HALL_CUTE", "name": "ContestHallCute", "layout": "LAYOUT_CONTEST_HALL_CUTE", - "music": "MUS_CONTEST0", + "music": "MUS_CONTEST", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ContestHallSmart/map.json b/data/maps/ContestHallSmart/map.json index 42d16f911..2cbc841bd 100644 --- a/data/maps/ContestHallSmart/map.json +++ b/data/maps/ContestHallSmart/map.json @@ -2,7 +2,7 @@ "id": "MAP_CONTEST_HALL_SMART", "name": "ContestHallSmart", "layout": "LAYOUT_CONTEST_HALL_SMART", - "music": "MUS_CONTEST0", + "music": "MUS_CONTEST", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ContestHallTough/map.json b/data/maps/ContestHallTough/map.json index 4e460cd98..15dbb27b2 100644 --- a/data/maps/ContestHallTough/map.json +++ b/data/maps/ContestHallTough/map.json @@ -2,7 +2,7 @@ "id": "MAP_CONTEST_HALL_TOUGH", "name": "ContestHallTough", "layout": "LAYOUT_CONTEST_HALL_TOUGH", - "music": "MUS_CONTEST0", + "music": "MUS_CONTEST", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/DesertRuins/map.json b/data/maps/DesertRuins/map.json index 7e59053b7..c87df0dee 100644 --- a/data/maps/DesertRuins/map.json +++ b/data/maps/DesertRuins/map.json @@ -2,7 +2,7 @@ "id": "MAP_DESERT_RUINS", "name": "DesertRuins", "layout": "LAYOUT_DESERT_RUINS", - "music": "MUS_MABOROSI", + "music": "MUS_SEALED_CHAMBER", "region_map_section": "MAPSEC_DESERT_RUINS", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/DesertUnderpass/map.json b/data/maps/DesertUnderpass/map.json index 56d293411..20db73381 100644 --- a/data/maps/DesertUnderpass/map.json +++ b/data/maps/DesertUnderpass/map.json @@ -2,7 +2,7 @@ "id": "MAP_DESERT_UNDERPASS", "name": "DesertUnderpass", "layout": "LAYOUT_DESERT_UNDERPASS", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_DESERT_UNDERPASS", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/DewfordTown/map.json b/data/maps/DewfordTown/map.json index 501e68523..8beb5add7 100644 --- a/data/maps/DewfordTown/map.json +++ b/data/maps/DewfordTown/map.json @@ -2,7 +2,7 @@ "id": "MAP_DEWFORD_TOWN", "name": "DewfordTown", "layout": "LAYOUT_DEWFORD_TOWN", - "music": "MUS_HIGHTOWN", + "music": "MUS_DEWFORD", "region_map_section": "MAPSEC_DEWFORD_TOWN", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/DewfordTown_Gym/map.json b/data/maps/DewfordTown_Gym/map.json index 41e7112a0..f28550f6e 100644 --- a/data/maps/DewfordTown_Gym/map.json +++ b/data/maps/DewfordTown_Gym/map.json @@ -2,7 +2,7 @@ "id": "MAP_DEWFORD_TOWN_GYM", "name": "DewfordTown_Gym", "layout": "LAYOUT_DEWFORD_TOWN_GYM", - "music": "MUS_GIM", + "music": "MUS_GYM", "region_map_section": "MAPSEC_DEWFORD_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/DewfordTown_Gym/scripts.inc b/data/maps/DewfordTown_Gym/scripts.inc index 98acc97dc..f67184045 100644 --- a/data/maps/DewfordTown_Gym/scripts.inc +++ b/data/maps/DewfordTown_Gym/scripts.inc @@ -80,43 +80,43 @@ DewfordTown_Gym_EventScript_NoLightChange:: @ 81FC71A @ NOTE: A little confusingly, a larger animateflash param value is a smaller flash radius DewfordTown_Gym_EventScript_AnimateFlash1Trainer:: @ 81FC71B - playse SE_MU_PACHI + playse SE_SWITCH animateflash 6 call DewfordTown_Gym_EventScript_SetFlashRadius return DewfordTown_Gym_EventScript_AnimateFlash2Trainers:: @ 81FC726 - playse SE_MU_PACHI + playse SE_SWITCH animateflash 5 call DewfordTown_Gym_EventScript_SetFlashRadius return DewfordTown_Gym_EventScript_AnimateFlash3Trainers:: @ 81FC731 - playse SE_MU_PACHI + playse SE_SWITCH animateflash 4 call DewfordTown_Gym_EventScript_SetFlashRadius return DewfordTown_Gym_EventScript_AnimateFlash4Trainers:: @ 81FC73C - playse SE_MU_PACHI + playse SE_SWITCH animateflash 3 call DewfordTown_Gym_EventScript_SetFlashRadius return DewfordTown_Gym_EventScript_AnimateFlash5Trainers:: @ 81FC747 - playse SE_MU_PACHI + playse SE_SWITCH animateflash 2 call DewfordTown_Gym_EventScript_SetFlashRadius return DewfordTown_Gym_EventScript_AnimateFlash6Trainers:: @ 81FC752 - playse SE_MU_PACHI + playse SE_SWITCH animateflash 1 call DewfordTown_Gym_EventScript_SetFlashRadius return DewfordTown_Gym_EventScript_AnimateFlashFullBrightness:: @ 81FC75D - playse SE_MU_PACHI + playse SE_SWITCH animateflash 0 call DewfordTown_Gym_EventScript_SetFlashRadius return @@ -169,7 +169,7 @@ DewfordTown_Gym_EventScript_BrawlyDefeated:: @ 81FC7F7 call DewfordTown_Gym_EventScript_GiveBulkUp closemessage delay 30 - playfanfare MUS_ME_TORE_EYE + playfanfare MUS_REGISTER_MATCH_CALL msgbox DewfordTown_Gym_Text_RegisteredBrawly, MSGBOX_DEFAULT waitfanfare closemessage diff --git a/data/maps/DewfordTown_Hall/map.json b/data/maps/DewfordTown_Hall/map.json index 6612db14b..24cde4ea1 100644 --- a/data/maps/DewfordTown_Hall/map.json +++ b/data/maps/DewfordTown_Hall/map.json @@ -2,7 +2,7 @@ "id": "MAP_DEWFORD_TOWN_HALL", "name": "DewfordTown_Hall", "layout": "LAYOUT_DEWFORD_TOWN_HALL", - "music": "MUS_HIGHTOWN", + "music": "MUS_DEWFORD", "region_map_section": "MAPSEC_DEWFORD_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/DewfordTown_House1/map.json b/data/maps/DewfordTown_House1/map.json index 7877a984f..fd53469b9 100644 --- a/data/maps/DewfordTown_House1/map.json +++ b/data/maps/DewfordTown_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_DEWFORD_TOWN_HOUSE1", "name": "DewfordTown_House1", "layout": "LAYOUT_HOUSE3", - "music": "MUS_HIGHTOWN", + "music": "MUS_DEWFORD", "region_map_section": "MAPSEC_DEWFORD_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/DewfordTown_House2/map.json b/data/maps/DewfordTown_House2/map.json index 319bbed72..4384f3767 100644 --- a/data/maps/DewfordTown_House2/map.json +++ b/data/maps/DewfordTown_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_DEWFORD_TOWN_HOUSE2", "name": "DewfordTown_House2", "layout": "LAYOUT_HOUSE4", - "music": "MUS_HIGHTOWN", + "music": "MUS_DEWFORD", "region_map_section": "MAPSEC_DEWFORD_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/DewfordTown_PokemonCenter_1F/map.json b/data/maps/DewfordTown_PokemonCenter_1F/map.json index 480bc5556..131c93092 100644 --- a/data/maps/DewfordTown_PokemonCenter_1F/map.json +++ b/data/maps/DewfordTown_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_DEWFORD_TOWN_POKEMON_CENTER_1F", "name": "DewfordTown_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_DEWFORD_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/DewfordTown_PokemonCenter_2F/map.json b/data/maps/DewfordTown_PokemonCenter_2F/map.json index 8de59b2a3..56add5053 100644 --- a/data/maps/DewfordTown_PokemonCenter_2F/map.json +++ b/data/maps/DewfordTown_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_DEWFORD_TOWN_POKEMON_CENTER_2F", "name": "DewfordTown_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_DEWFORD_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/EverGrandeCity/map.json b/data/maps/EverGrandeCity/map.json index 5f67720e6..9db9c8feb 100644 --- a/data/maps/EverGrandeCity/map.json +++ b/data/maps/EverGrandeCity/map.json @@ -2,7 +2,7 @@ "id": "MAP_EVER_GRANDE_CITY", "name": "EverGrandeCity", "layout": "LAYOUT_EVER_GRANDE_CITY", - "music": "MUS_RAINBOW", + "music": "MUS_EVER_GRANDE", "region_map_section": "MAPSEC_EVER_GRANDE_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/EverGrandeCity_ChampionsRoom/map.json b/data/maps/EverGrandeCity_ChampionsRoom/map.json index ded3a305f..34fb96e46 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/map.json +++ b/data/maps/EverGrandeCity_ChampionsRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_EVER_GRANDE_CITY_CHAMPIONS_ROOM", "name": "EverGrandeCity_ChampionsRoom", "layout": "LAYOUT_EVER_GRANDE_CITY_CHAMPIONS_ROOM", - "music": "MUS_C_ROAD", + "music": "MUS_VICTORY_ROAD", "region_map_section": "MAPSEC_EVER_GRANDE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc index 5ef3a946e..d41c10d0a 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc +++ b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc @@ -42,7 +42,7 @@ EverGrandeCity_ChampionsRoom_Movement_PlayerApproachWallace: @ 8228A42 step_end EverGrandeCity_ChampionsRoom_EventScript_Wallace:: @ 8228A45 - playbgm MUS_DAIGO, 0 + playbgm MUS_ENCOUNTER_CHAMPION, 0 msgbox EverGrandeCity_ChampionsRoom_Text_IntroSpeech, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_WALLACE, EverGrandeCity_ChampionsRoom_Text_Defeat goto EverGrandeCity_ChampionsRoom_EventScript_Defeated @@ -71,11 +71,11 @@ EverGrandeCity_ChampionsRoom_EventScript_Defeated:: @ 8228A61 end EverGrandeCity_ChampionsRoom_EventScript_PlayMayMusic:: @ 8228ABC - playbgm MUS_GIRL_SUP, 0 + playbgm MUS_ENCOUNTER_MAY, 0 return EverGrandeCity_ChampionsRoom_EventScript_PlayBrendanMusic:: @ 8228AC1 - playbgm MUS_BOY_SUP, 0 + playbgm MUS_ENCOUNTER_BRENDAN, 0 return EverGrandeCity_ChampionsRoom_EventScript_MayAdvice:: @ 8228AC6 diff --git a/data/maps/EverGrandeCity_DrakesRoom/map.json b/data/maps/EverGrandeCity_DrakesRoom/map.json index 9b54a5e5b..b7bcd4966 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/map.json +++ b/data/maps/EverGrandeCity_DrakesRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_EVER_GRANDE_CITY_DRAKES_ROOM", "name": "EverGrandeCity_DrakesRoom", "layout": "LAYOUT_EVER_GRANDE_CITY_DRAKES_ROOM", - "music": "MUS_C_ROAD", + "music": "MUS_VICTORY_ROAD", "region_map_section": "MAPSEC_EVER_GRANDE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/EverGrandeCity_DrakesRoom/scripts.inc b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc index b9debf676..feb65d149 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/scripts.inc +++ b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc @@ -42,7 +42,7 @@ EverGrandeCity_DrakesRoom_EventScript_Drake:: @ 82286F3 lock faceplayer goto_if_set FLAG_DEFEATED_ELITE_4_DRAKE, EverGrandeCity_DrakesRoom_EventScript_PostBattleSpeech - playbgm MUS_SITENNOU, 0 + playbgm MUS_ENCOUNTER_ELITE_FOUR, 0 msgbox EverGrandeCity_DrakesRoom_Text_IntroSpeech, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_DRAKE, EverGrandeCity_DrakesRoom_Text_Defeat goto EverGrandeCity_DrakesRoom_EventScript_Defeated diff --git a/data/maps/EverGrandeCity_GlaciasRoom/map.json b/data/maps/EverGrandeCity_GlaciasRoom/map.json index 21c50192b..86a840d13 100644 --- a/data/maps/EverGrandeCity_GlaciasRoom/map.json +++ b/data/maps/EverGrandeCity_GlaciasRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_EVER_GRANDE_CITY_GLACIAS_ROOM", "name": "EverGrandeCity_GlaciasRoom", "layout": "LAYOUT_EVER_GRANDE_CITY_GLACIAS_ROOM", - "music": "MUS_C_ROAD", + "music": "MUS_VICTORY_ROAD", "region_map_section": "MAPSEC_EVER_GRANDE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc index 6e6254faa..ff04a752a 100644 --- a/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc +++ b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc @@ -41,7 +41,7 @@ EverGrandeCity_GlaciasRoom_EventScript_Glacia:: @ 8228469 lock faceplayer goto_if_set FLAG_DEFEATED_ELITE_4_GLACIA, EverGrandeCity_GlaciasRoom_EventScript_PostBattleSpeech - playbgm MUS_SITENNOU, 0 + playbgm MUS_ENCOUNTER_ELITE_FOUR, 0 msgbox EverGrandeCity_GlaciasRoom_Text_IntroSpeech, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_GLACIA, EverGrandeCity_GlaciasRoom_Text_Defeat goto EverGrandeCity_GlaciasRoom_EventScript_Defeated diff --git a/data/maps/EverGrandeCity_Hall1/map.json b/data/maps/EverGrandeCity_Hall1/map.json index 692e7ff7c..426b9f6e4 100644 --- a/data/maps/EverGrandeCity_Hall1/map.json +++ b/data/maps/EverGrandeCity_Hall1/map.json @@ -2,7 +2,7 @@ "id": "MAP_EVER_GRANDE_CITY_HALL1", "name": "EverGrandeCity_Hall1", "layout": "LAYOUT_EVER_GRANDE_CITY_SHORT_HALL", - "music": "MUS_C_ROAD", + "music": "MUS_VICTORY_ROAD", "region_map_section": "MAPSEC_EVER_GRANDE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/EverGrandeCity_Hall2/map.json b/data/maps/EverGrandeCity_Hall2/map.json index ea1203725..3535734e9 100644 --- a/data/maps/EverGrandeCity_Hall2/map.json +++ b/data/maps/EverGrandeCity_Hall2/map.json @@ -2,7 +2,7 @@ "id": "MAP_EVER_GRANDE_CITY_HALL2", "name": "EverGrandeCity_Hall2", "layout": "LAYOUT_EVER_GRANDE_CITY_SHORT_HALL", - "music": "MUS_C_ROAD", + "music": "MUS_VICTORY_ROAD", "region_map_section": "MAPSEC_EVER_GRANDE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/EverGrandeCity_Hall3/map.json b/data/maps/EverGrandeCity_Hall3/map.json index 327b28399..b7fe8f4ec 100644 --- a/data/maps/EverGrandeCity_Hall3/map.json +++ b/data/maps/EverGrandeCity_Hall3/map.json @@ -2,7 +2,7 @@ "id": "MAP_EVER_GRANDE_CITY_HALL3", "name": "EverGrandeCity_Hall3", "layout": "LAYOUT_EVER_GRANDE_CITY_SHORT_HALL", - "music": "MUS_C_ROAD", + "music": "MUS_VICTORY_ROAD", "region_map_section": "MAPSEC_EVER_GRANDE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/EverGrandeCity_Hall4/map.json b/data/maps/EverGrandeCity_Hall4/map.json index ff91999e0..b0501cd38 100644 --- a/data/maps/EverGrandeCity_Hall4/map.json +++ b/data/maps/EverGrandeCity_Hall4/map.json @@ -2,7 +2,7 @@ "id": "MAP_EVER_GRANDE_CITY_HALL4", "name": "EverGrandeCity_Hall4", "layout": "LAYOUT_EVER_GRANDE_CITY_HALL4", - "music": "MUS_C_ROAD", + "music": "MUS_VICTORY_ROAD", "region_map_section": "MAPSEC_EVER_GRANDE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/EverGrandeCity_Hall5/map.json b/data/maps/EverGrandeCity_Hall5/map.json index 562e11565..1f6705f3a 100644 --- a/data/maps/EverGrandeCity_Hall5/map.json +++ b/data/maps/EverGrandeCity_Hall5/map.json @@ -2,7 +2,7 @@ "id": "MAP_EVER_GRANDE_CITY_HALL5", "name": "EverGrandeCity_Hall5", "layout": "LAYOUT_EVER_GRANDE_CITY_SHORT_HALL", - "music": "MUS_C_ROAD", + "music": "MUS_VICTORY_ROAD", "region_map_section": "MAPSEC_EVER_GRANDE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/EverGrandeCity_HallOfFame/map.json b/data/maps/EverGrandeCity_HallOfFame/map.json index 04b68237d..e09190eb9 100644 --- a/data/maps/EverGrandeCity_HallOfFame/map.json +++ b/data/maps/EverGrandeCity_HallOfFame/map.json @@ -2,7 +2,7 @@ "id": "MAP_EVER_GRANDE_CITY_HALL_OF_FAME", "name": "EverGrandeCity_HallOfFame", "layout": "LAYOUT_EVER_GRANDE_CITY_HALL_OF_FAME", - "music": "MUS_EIKOU_R", + "music": "MUS_HALL_OF_FAME_ROOM", "region_map_section": "MAPSEC_EVER_GRANDE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/EverGrandeCity_PhoebesRoom/map.json b/data/maps/EverGrandeCity_PhoebesRoom/map.json index 5716b3ef1..09c6dd40e 100644 --- a/data/maps/EverGrandeCity_PhoebesRoom/map.json +++ b/data/maps/EverGrandeCity_PhoebesRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_EVER_GRANDE_CITY_PHOEBES_ROOM", "name": "EverGrandeCity_PhoebesRoom", "layout": "LAYOUT_EVER_GRANDE_CITY_PHOEBES_ROOM", - "music": "MUS_C_ROAD", + "music": "MUS_VICTORY_ROAD", "region_map_section": "MAPSEC_EVER_GRANDE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc index 891b3c56e..e98bf4eb3 100644 --- a/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc +++ b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc @@ -41,7 +41,7 @@ EverGrandeCity_PhoebesRoom_EventScript_Phoebe:: @ 82281CB lock faceplayer goto_if_set FLAG_DEFEATED_ELITE_4_PHOEBE, EverGrandeCity_PhoebesRoom_EventScript_PostBattleSpeech - playbgm MUS_SITENNOU, 0 + playbgm MUS_ENCOUNTER_ELITE_FOUR, 0 msgbox EverGrandeCity_PhoebesRoom_Text_IntroSpeech, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_PHOEBE, EverGrandeCity_PhoebesRoom_Text_Defeat goto EverGrandeCity_PhoebesRoom_EventScript_Defeated diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/map.json b/data/maps/EverGrandeCity_PokemonCenter_1F/map.json index 85a2c677b..196ebd0f2 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/map.json +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F", "name": "EverGrandeCity_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_EVER_GRANDE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc index 3b6d94249..a6cf1b74e 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc @@ -45,7 +45,7 @@ EverGrandeCity_PokemonCenter_1F_EventScript_Scott:: @ 8229A79 call_if_eq EverGrandeCity_PokemonCenter_1F_EventScript_ScottExit addvar VAR_SCOTT_STATE, 1 setflag FLAG_MET_SCOTT_IN_EVERGRANDE - playse SE_KAIDAN + playse SE_EXIT waitse removeobject LOCALID_SCOTT release diff --git a/data/maps/EverGrandeCity_PokemonCenter_2F/map.json b/data/maps/EverGrandeCity_PokemonCenter_2F/map.json index 7dfa712a6..b734f9ad5 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_2F/map.json +++ b/data/maps/EverGrandeCity_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_EVER_GRANDE_CITY_POKEMON_CENTER_2F", "name": "EverGrandeCity_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_EVER_GRANDE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/map.json b/data/maps/EverGrandeCity_PokemonLeague_1F/map.json index 6b0c0be80..f76febc01 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_1F/map.json +++ b/data/maps/EverGrandeCity_PokemonLeague_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F", "name": "EverGrandeCity_PokemonLeague_1F", "layout": "LAYOUT_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_EVER_GRANDE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc b/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc index cf824b8e8..5eed4faa6 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc +++ b/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc @@ -68,7 +68,7 @@ EverGrandeCity_PokemonLeague_1F_EventScript_DoorGuard:: @ 8229636 applymovement LOCALID_GUARD_2, EverGrandeCity_PokemonLeague_1F_Movement_RightGuardOutOfWay waitmovement 0 delay 10 - playfanfare MUS_ME_BACHI + playfanfare MUS_OBTAIN_BADGE message EverGrandeCity_PokemonLeague_1F_Text_GoForth waitmessage waitfanfare @@ -90,7 +90,7 @@ EverGrandeCity_PokemonLeague_1F_EventScript_PlayerMoveToFrontFromLeft:: @ 82296A return EverGrandeCity_PokemonLeague_1F_EventScript_NotAllBadges:: @ 82296AE - playse SE_HAZURE + playse SE_FAILURE msgbox EverGrandeCity_PokemonLeague_1F_Text_HaventObtainedAllBadges, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/EverGrandeCity_PokemonLeague_2F/map.json b/data/maps/EverGrandeCity_PokemonLeague_2F/map.json index 8289458b0..a4b5cb1f2 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_2F/map.json +++ b/data/maps/EverGrandeCity_PokemonLeague_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_2F", "name": "EverGrandeCity_PokemonLeague_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_EVER_GRANDE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/EverGrandeCity_SidneysRoom/map.json b/data/maps/EverGrandeCity_SidneysRoom/map.json index 39cdea6ce..dc84d36d6 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/map.json +++ b/data/maps/EverGrandeCity_SidneysRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM", "name": "EverGrandeCity_SidneysRoom", "layout": "LAYOUT_EVER_GRANDE_CITY_SIDNEYS_ROOM", - "music": "MUS_C_ROAD", + "music": "MUS_VICTORY_ROAD", "region_map_section": "MAPSEC_EVER_GRANDE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/EverGrandeCity_SidneysRoom/scripts.inc b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc index 9bc975789..717651b26 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/scripts.inc +++ b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc @@ -47,7 +47,7 @@ EverGrandeCity_SidneysRoom_EventScript_Sidney:: @ 8227F64 lock faceplayer goto_if_set FLAG_DEFEATED_ELITE_4_SIDNEY, EverGrandeCity_SidneysRoom_EventScript_PostBattleSpeech - playbgm MUS_SITENNOU, 0 + playbgm MUS_ENCOUNTER_ELITE_FOUR, 0 msgbox EverGrandeCity_SidneysRoom_Text_IntroSpeech, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_SIDNEY, EverGrandeCity_SidneysRoom_Text_Defeat goto EverGrandeCity_SidneysRoom_EventScript_Defeated diff --git a/data/maps/FallarborTown/map.json b/data/maps/FallarborTown/map.json index 54809f977..74355a870 100644 --- a/data/maps/FallarborTown/map.json +++ b/data/maps/FallarborTown/map.json @@ -2,7 +2,7 @@ "id": "MAP_FALLARBOR_TOWN", "name": "FallarborTown", "layout": "LAYOUT_FALLARBOR_TOWN", - "music": "MUS_TONEKUSA", + "music": "MUS_FALLARBOR", "region_map_section": "MAPSEC_FALLARBOR_TOWN", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/map.json b/data/maps/FallarborTown_BattleTentBattleRoom/map.json index adf6dfd94..7b702dc0e 100644 --- a/data/maps/FallarborTown_BattleTentBattleRoom/map.json +++ b/data/maps/FallarborTown_BattleTentBattleRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM", "name": "FallarborTown_BattleTentBattleRoom", "layout": "LAYOUT_BATTLE_TENT_BATTLE_ROOM", - "music": "MUS_B_TOWER", + "music": "MUS_B_TOWER_RS", "region_map_section": "MAPSEC_FALLARBOR_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc b/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc index feb8f49e1..fd1f27860 100644 --- a/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc +++ b/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc @@ -52,7 +52,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_NextOpponentEnter:: @ 820090F applymovement LOCALID_OPPONENT, FallarborTown_BattleTentBattleRoom_Movement_OpponentEnter waitmovement 0 applymovement LOCALID_ATTENDANT, FallarborTown_BattleTentBattleRoom_Movement_AttendantJump - playse SE_W187 + playse SE_M_BELLY_DRUM waitse waitmovement 0 msgbox BattleFrontier_BattleArenaBattleRoom_Text_SetKOTourneyBegin, MSGBOX_DEFAULT @@ -63,7 +63,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_NextOpponentEnter:: @ 820090F switch VAR_RESULT case 1, FallarborTown_BattleTentBattleRoom_EventScript_DefeatedOpponent applymovement LOCALID_ATTENDANT, FallarborTown_BattleTentBattleRoom_Movement_AttendantJump - playse SE_W173 + playse SE_M_SNORE waitse waitmovement 0 fallarbortent_getopponentname @@ -76,7 +76,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_WarpToLobbyLost:: @ 820097E FallarborTown_BattleTentBattleRoom_EventScript_DefeatedOpponent:: @ 820099C applymovement LOCALID_ATTENDANT, FallarborTown_BattleTentBattleRoom_Movement_AttendantJump - playse SE_BAN + playse SE_BANG waitse waitmovement 0 msgbox BattleFrontier_BattleArenaBattleRoom_Text_WinnerIsPlayer, MSGBOX_DEFAULT @@ -98,7 +98,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_IncrementBattleNum:: @ 82009B3 special LoadPlayerParty special SavePlayerParty frontier_setpartyorder FRONTIER_PARTY_SIZE - playfanfare MUS_ME_ASA + playfanfare MUS_HEAL waitfanfare special HealPlayerParty FallarborTown_BattleTentBattleRoom_EventScript_AskContinueChallenge:: @ 8200A2A diff --git a/data/maps/FallarborTown_BattleTentCorridor/map.json b/data/maps/FallarborTown_BattleTentCorridor/map.json index 3bda44484..c086a3288 100644 --- a/data/maps/FallarborTown_BattleTentCorridor/map.json +++ b/data/maps/FallarborTown_BattleTentCorridor/map.json @@ -2,7 +2,7 @@ "id": "MAP_FALLARBOR_TOWN_BATTLE_TENT_CORRIDOR", "name": "FallarborTown_BattleTentCorridor", "layout": "LAYOUT_BATTLE_TENT_CORRIDOR", - "music": "MUS_B_TOWER", + "music": "MUS_B_TOWER_RS", "region_map_section": "MAPSEC_FALLARBOR_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FallarborTown_BattleTentLobby/map.json b/data/maps/FallarborTown_BattleTentLobby/map.json index 58a1463e9..a796a3f10 100644 --- a/data/maps/FallarborTown_BattleTentLobby/map.json +++ b/data/maps/FallarborTown_BattleTentLobby/map.json @@ -2,7 +2,7 @@ "id": "MAP_FALLARBOR_TOWN_BATTLE_TENT_LOBBY", "name": "FallarborTown_BattleTentLobby", "layout": "LAYOUT_BATTLE_TENT_LOBBY", - "music": "MUS_B_TOWER", + "music": "MUS_B_TOWER_RS", "region_map_section": "MAPSEC_FALLARBOR_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FallarborTown_BattleTentLobby/scripts.inc b/data/maps/FallarborTown_BattleTentLobby/scripts.inc index 54248e402..0a6a4f16c 100644 --- a/data/maps/FallarborTown_BattleTentLobby/scripts.inc +++ b/data/maps/FallarborTown_BattleTentLobby/scripts.inc @@ -55,7 +55,7 @@ FallarborTown_BattleTentLobby_EventScript_GivePrize:: @ 81FFF27 frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0 message FallarborTown_BattleTentLobby_Text_ReceivedPrize waitmessage - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM waitfanfare msgbox FallarborTown_BattleTentLobby_Text_AwaitAnotherChallenge2, MSGBOX_DEFAULT closemessage diff --git a/data/maps/FallarborTown_CozmosHouse/map.json b/data/maps/FallarborTown_CozmosHouse/map.json index a1ed47885..a7ae1f90d 100644 --- a/data/maps/FallarborTown_CozmosHouse/map.json +++ b/data/maps/FallarborTown_CozmosHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_FALLARBOR_TOWN_COZMOS_HOUSE", "name": "FallarborTown_CozmosHouse", "layout": "LAYOUT_HOUSE1", - "music": "MUS_TONEKUSA", + "music": "MUS_FALLARBOR", "region_map_section": "MAPSEC_FALLARBOR_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FallarborTown_Mart/map.json b/data/maps/FallarborTown_Mart/map.json index 29040bcd7..77c5df976 100644 --- a/data/maps/FallarborTown_Mart/map.json +++ b/data/maps/FallarborTown_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_FALLARBOR_TOWN_MART", "name": "FallarborTown_Mart", "layout": "LAYOUT_MART", - "music": "MUS_FRIENDLY", + "music": "MUS_POKE_MART", "region_map_section": "MAPSEC_FALLARBOR_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FallarborTown_MoveRelearnersHouse/map.json b/data/maps/FallarborTown_MoveRelearnersHouse/map.json index 220b6cb8e..ce3f3a3dd 100644 --- a/data/maps/FallarborTown_MoveRelearnersHouse/map.json +++ b/data/maps/FallarborTown_MoveRelearnersHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_FALLARBOR_TOWN_MOVE_RELEARNERS_HOUSE", "name": "FallarborTown_MoveRelearnersHouse", "layout": "LAYOUT_HOUSE2", - "music": "MUS_TONEKUSA", + "music": "MUS_FALLARBOR", "region_map_section": "MAPSEC_FALLARBOR_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FallarborTown_PokemonCenter_1F/map.json b/data/maps/FallarborTown_PokemonCenter_1F/map.json index 5f85478dc..cb0690829 100644 --- a/data/maps/FallarborTown_PokemonCenter_1F/map.json +++ b/data/maps/FallarborTown_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F", "name": "FallarborTown_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_FALLARBOR_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc index c65cf5d4e..e7967046d 100644 --- a/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc @@ -50,7 +50,7 @@ FallarborTown_PokemonCenter_1F_EventScript_LanetteExitWest:: @ 8200C38 end FallarborTown_PokemonCenter_1F_EventScript_LanetteExited:: @ 8200C48 - playse SE_JIDO_DOA + playse SE_SLIDING_DOOR removeobject LOCALID_LANETTE clearflag FLAG_HIDE_LANETTES_HOUSE_LANETTE release diff --git a/data/maps/FallarborTown_PokemonCenter_2F/map.json b/data/maps/FallarborTown_PokemonCenter_2F/map.json index 202485ea0..ada498a42 100644 --- a/data/maps/FallarborTown_PokemonCenter_2F/map.json +++ b/data/maps/FallarborTown_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_FALLARBOR_TOWN_POKEMON_CENTER_2F", "name": "FallarborTown_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_FALLARBOR_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FarawayIsland_Entrance/map.json b/data/maps/FarawayIsland_Entrance/map.json index 6898f5b24..d3c6056a0 100644 --- a/data/maps/FarawayIsland_Entrance/map.json +++ b/data/maps/FarawayIsland_Entrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_FARAWAY_ISLAND_ENTRANCE", "name": "FarawayIsland_Entrance", "layout": "LAYOUT_FARAWAY_ISLAND_ENTRANCE", - "music": "MUS_DAN02", + "music": "MUS_ABANDONED_SHIP", "region_map_section": "MAPSEC_FARAWAY_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FarawayIsland_Interior/map.json b/data/maps/FarawayIsland_Interior/map.json index 4f427e8a4..1ec092fbe 100644 --- a/data/maps/FarawayIsland_Interior/map.json +++ b/data/maps/FarawayIsland_Interior/map.json @@ -2,7 +2,7 @@ "id": "MAP_FARAWAY_ISLAND_INTERIOR", "name": "FarawayIsland_Interior", "layout": "LAYOUT_FARAWAY_ISLAND_INTERIOR", - "music": "MUS_DAN02", + "music": "MUS_ABANDONED_SHIP", "region_map_section": "MAPSEC_FARAWAY_ISLAND", "requires_flash": false, "weather": "WEATHER_SHADE", diff --git a/data/maps/FieryPath/map.json b/data/maps/FieryPath/map.json index 424596c0c..ef11990d8 100644 --- a/data/maps/FieryPath/map.json +++ b/data/maps/FieryPath/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIERY_PATH", "name": "FieryPath", "layout": "LAYOUT_FIERY_PATH", - "music": "MUS_DAN01", + "music": "MUS_PETALBURG_WOODS", "region_map_section": "MAPSEC_FIERY_PATH", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FortreeCity/map.json b/data/maps/FortreeCity/map.json index 062d0808a..86d43693a 100644 --- a/data/maps/FortreeCity/map.json +++ b/data/maps/FortreeCity/map.json @@ -2,7 +2,7 @@ "id": "MAP_FORTREE_CITY", "name": "FortreeCity", "layout": "LAYOUT_FORTREE_CITY", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_FORTREE_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/FortreeCity_DecorationShop/map.json b/data/maps/FortreeCity_DecorationShop/map.json index f5af152af..59b707a95 100644 --- a/data/maps/FortreeCity_DecorationShop/map.json +++ b/data/maps/FortreeCity_DecorationShop/map.json @@ -2,7 +2,7 @@ "id": "MAP_FORTREE_CITY_DECORATION_SHOP", "name": "FortreeCity_DecorationShop", "layout": "LAYOUT_FORTREE_CITY_DECORATION_SHOP", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_FORTREE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FortreeCity_Gym/map.json b/data/maps/FortreeCity_Gym/map.json index fcaf1a036..0db326d07 100644 --- a/data/maps/FortreeCity_Gym/map.json +++ b/data/maps/FortreeCity_Gym/map.json @@ -2,7 +2,7 @@ "id": "MAP_FORTREE_CITY_GYM", "name": "FortreeCity_Gym", "layout": "LAYOUT_FORTREE_CITY_GYM", - "music": "MUS_GIM", + "music": "MUS_GYM", "region_map_section": "MAPSEC_FORTREE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FortreeCity_Gym/scripts.inc b/data/maps/FortreeCity_Gym/scripts.inc index f209ceefa..688c11645 100644 --- a/data/maps/FortreeCity_Gym/scripts.inc +++ b/data/maps/FortreeCity_Gym/scripts.inc @@ -37,7 +37,7 @@ FortreeCity_Gym_EventScript_WinonaDefeated:: @ 82165FD call FortreeCity_Gym_EventScript_GiveAerialAce closemessage delay 30 - playfanfare MUS_ME_TORE_EYE + playfanfare MUS_REGISTER_MATCH_CALL msgbox FortreeCity_Gym_Text_RegisteredWinona, MSGBOX_DEFAULT waitfanfare closemessage diff --git a/data/maps/FortreeCity_House1/map.json b/data/maps/FortreeCity_House1/map.json index ae35cf601..cef203093 100644 --- a/data/maps/FortreeCity_House1/map.json +++ b/data/maps/FortreeCity_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_FORTREE_CITY_HOUSE1", "name": "FortreeCity_House1", "layout": "LAYOUT_FORTREE_CITY_HOUSE1", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_FORTREE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FortreeCity_House2/map.json b/data/maps/FortreeCity_House2/map.json index dcd8f30cd..fed6a9f65 100644 --- a/data/maps/FortreeCity_House2/map.json +++ b/data/maps/FortreeCity_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_FORTREE_CITY_HOUSE2", "name": "FortreeCity_House2", "layout": "LAYOUT_FORTREE_CITY_HOUSE2", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_FORTREE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FortreeCity_House3/map.json b/data/maps/FortreeCity_House3/map.json index e96be4174..f7c47ede1 100644 --- a/data/maps/FortreeCity_House3/map.json +++ b/data/maps/FortreeCity_House3/map.json @@ -2,7 +2,7 @@ "id": "MAP_FORTREE_CITY_HOUSE3", "name": "FortreeCity_House3", "layout": "LAYOUT_FORTREE_CITY_HOUSE1", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_FORTREE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FortreeCity_House4/map.json b/data/maps/FortreeCity_House4/map.json index 699660056..a01772eea 100644 --- a/data/maps/FortreeCity_House4/map.json +++ b/data/maps/FortreeCity_House4/map.json @@ -2,7 +2,7 @@ "id": "MAP_FORTREE_CITY_HOUSE4", "name": "FortreeCity_House4", "layout": "LAYOUT_FORTREE_CITY_HOUSE2", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_FORTREE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FortreeCity_House5/map.json b/data/maps/FortreeCity_House5/map.json index 32fcefe2b..b1577e648 100644 --- a/data/maps/FortreeCity_House5/map.json +++ b/data/maps/FortreeCity_House5/map.json @@ -2,7 +2,7 @@ "id": "MAP_FORTREE_CITY_HOUSE5", "name": "FortreeCity_House5", "layout": "LAYOUT_FORTREE_CITY_HOUSE1", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_FORTREE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FortreeCity_Mart/map.json b/data/maps/FortreeCity_Mart/map.json index a52ece8b2..61ab4cefd 100644 --- a/data/maps/FortreeCity_Mart/map.json +++ b/data/maps/FortreeCity_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_FORTREE_CITY_MART", "name": "FortreeCity_Mart", "layout": "LAYOUT_MART", - "music": "MUS_FRIENDLY", + "music": "MUS_POKE_MART", "region_map_section": "MAPSEC_FORTREE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FortreeCity_PokemonCenter_1F/map.json b/data/maps/FortreeCity_PokemonCenter_1F/map.json index 16c5fe8b6..d59349033 100644 --- a/data/maps/FortreeCity_PokemonCenter_1F/map.json +++ b/data/maps/FortreeCity_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_FORTREE_CITY_POKEMON_CENTER_1F", "name": "FortreeCity_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_FORTREE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FortreeCity_PokemonCenter_2F/map.json b/data/maps/FortreeCity_PokemonCenter_2F/map.json index fdd9ee79d..1859bf131 100644 --- a/data/maps/FortreeCity_PokemonCenter_2F/map.json +++ b/data/maps/FortreeCity_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_FORTREE_CITY_POKEMON_CENTER_2F", "name": "FortreeCity_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_FORTREE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/GraniteCave_1F/map.json b/data/maps/GraniteCave_1F/map.json index a4c2bf0ff..ff60d726b 100644 --- a/data/maps/GraniteCave_1F/map.json +++ b/data/maps/GraniteCave_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_GRANITE_CAVE_1F", "name": "GraniteCave_1F", "layout": "LAYOUT_GRANITE_CAVE_1F", - "music": "MUS_DAN01", + "music": "MUS_PETALBURG_WOODS", "region_map_section": "MAPSEC_GRANITE_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/GraniteCave_B1F/map.json b/data/maps/GraniteCave_B1F/map.json index 103220612..be2f5ae01 100644 --- a/data/maps/GraniteCave_B1F/map.json +++ b/data/maps/GraniteCave_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_GRANITE_CAVE_B1F", "name": "GraniteCave_B1F", "layout": "LAYOUT_GRANITE_CAVE_B1F", - "music": "MUS_DAN01", + "music": "MUS_PETALBURG_WOODS", "region_map_section": "MAPSEC_GRANITE_CAVE", "requires_flash": true, "weather": "WEATHER_NONE", diff --git a/data/maps/GraniteCave_B2F/map.json b/data/maps/GraniteCave_B2F/map.json index c3f6fbf9a..bf58a40e3 100644 --- a/data/maps/GraniteCave_B2F/map.json +++ b/data/maps/GraniteCave_B2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_GRANITE_CAVE_B2F", "name": "GraniteCave_B2F", "layout": "LAYOUT_GRANITE_CAVE_B2F", - "music": "MUS_DAN01", + "music": "MUS_PETALBURG_WOODS", "region_map_section": "MAPSEC_GRANITE_CAVE", "requires_flash": true, "weather": "WEATHER_NONE", diff --git a/data/maps/GraniteCave_StevensRoom/map.json b/data/maps/GraniteCave_StevensRoom/map.json index 934a8320e..070530378 100644 --- a/data/maps/GraniteCave_StevensRoom/map.json +++ b/data/maps/GraniteCave_StevensRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_GRANITE_CAVE_STEVENS_ROOM", "name": "GraniteCave_StevensRoom", "layout": "LAYOUT_GRANITE_CAVE_STEVENS_ROOM", - "music": "MUS_DAN01", + "music": "MUS_PETALBURG_WOODS", "region_map_section": "MAPSEC_GRANITE_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/GraniteCave_StevensRoom/scripts.inc b/data/maps/GraniteCave_StevensRoom/scripts.inc index 7d0b275a5..650177b95 100644 --- a/data/maps/GraniteCave_StevensRoom/scripts.inc +++ b/data/maps/GraniteCave_StevensRoom/scripts.inc @@ -17,7 +17,7 @@ GraniteCave_StevensRoom_EventScript_Steven:: @ 822DC7B msgbox GraniteCave_StevensRoom_Text_CouldBecomeChampionLetsRegister, MSGBOX_DEFAULT closemessage delay 30 - playfanfare MUS_ME_TORE_EYE + playfanfare MUS_REGISTER_MATCH_CALL msgbox GraniteCave_StevensRoom_Text_RegisteredSteven, MSGBOX_DEFAULT waitfanfare closemessage @@ -33,7 +33,7 @@ GraniteCave_StevensRoom_EventScript_Steven:: @ 822DC7B call_if_eq GraniteCave_StevensRoom_EventScript_StevenExitWestEast compare VAR_FACING, DIR_EAST call_if_eq GraniteCave_StevensRoom_EventScript_StevenExitWestEast - playse SE_KAIDAN + playse SE_EXIT removeobject LOCALID_STEVEN release end diff --git a/data/maps/IslandCave/map.json b/data/maps/IslandCave/map.json index 0cb71092d..7c540411f 100644 --- a/data/maps/IslandCave/map.json +++ b/data/maps/IslandCave/map.json @@ -2,7 +2,7 @@ "id": "MAP_ISLAND_CAVE", "name": "IslandCave", "layout": "LAYOUT_ISLAND_CAVE", - "music": "MUS_MABOROSI", + "music": "MUS_SEALED_CHAMBER", "region_map_section": "MAPSEC_ISLAND_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/IslandCave/scripts.inc b/data/maps/IslandCave/scripts.inc index 8587e62c2..56643a504 100644 --- a/data/maps/IslandCave/scripts.inc +++ b/data/maps/IslandCave/scripts.inc @@ -46,7 +46,7 @@ IslandCave_EventScript_OpenRegiEntrance:: @ 8238EAF setmetatile 8, 20, METATILE_Cave_SealedChamberEntrance_BottomMid, 0 setmetatile 9, 20, METATILE_Cave_SealedChamberEntrance_BottomRight, 1 special DrawWholeMapView - playse SE_BAN + playse SE_BANG setflag FLAG_SYS_BRAILLE_REGICE_COMPLETED end diff --git a/data/maps/JaggedPass/map.json b/data/maps/JaggedPass/map.json index eeac79e15..d7e7d5e2e 100644 --- a/data/maps/JaggedPass/map.json +++ b/data/maps/JaggedPass/map.json @@ -2,7 +2,7 @@ "id": "MAP_JAGGED_PASS", "name": "JaggedPass", "layout": "LAYOUT_JAGGED_PASS", - "music": "MUS_DAN01", + "music": "MUS_PETALBURG_WOODS", "region_map_section": "MAPSEC_JAGGED_PASS", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/JaggedPass/scripts.inc b/data/maps/JaggedPass/scripts.inc index eacc7835e..c7fc95676 100644 --- a/data/maps/JaggedPass/scripts.inc +++ b/data/maps/JaggedPass/scripts.inc @@ -58,7 +58,7 @@ JaggedPass_EventScript_OpenMagmaHideout:: @ 82306BB setvar VAR_0x8007, 3 @ shake delay special ShakeCamera waitstate - playse SE_KOUKA_M + playse SE_EFFECTIVE setmetatile 16, 17, METATILE_Lavaridge_CaveEntrance_Top, 1 setmetatile 16, 18, METATILE_Lavaridge_CaveEntrance_Bottom, 0 special DrawWholeMapView diff --git a/data/maps/LavaridgeTown/map.json b/data/maps/LavaridgeTown/map.json index 1ab9f60cf..54bda6ca3 100644 --- a/data/maps/LavaridgeTown/map.json +++ b/data/maps/LavaridgeTown/map.json @@ -2,7 +2,7 @@ "id": "MAP_LAVARIDGE_TOWN", "name": "LavaridgeTown", "layout": "LAYOUT_LAVARIDGE_TOWN", - "music": "MUS_MACHI_S4", + "music": "MUS_OLDALE", "region_map_section": "MAPSEC_LAVARIDGE_TOWN", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/LavaridgeTown/scripts.inc b/data/maps/LavaridgeTown/scripts.inc index 47c5482a6..1f9fe421d 100644 --- a/data/maps/LavaridgeTown/scripts.inc +++ b/data/maps/LavaridgeTown/scripts.inc @@ -105,11 +105,11 @@ LavaridgeTown_EventScript_RivalExit:: @ 81EA5FF end LavaridgeTown_EventScript_PlayMayMusic:: @ 81EA630 - playbgm MUS_GIRL_SUP, 1 + playbgm MUS_ENCOUNTER_MAY, 1 return LavaridgeTown_EventScript_PlayBrendanMusic:: @ 81EA635 - playbgm MUS_BOY_SUP, 1 + playbgm MUS_ENCOUNTER_BRENDAN, 1 return LavaridgeTown_EventScript_RivalNoticePlayer:: @ 81EA63A @@ -258,7 +258,7 @@ LavaridgeTown_EventScript_EggWoman:: @ 81EA744 goto_if_eq LavaridgeTown_EventScript_NoRoomForEgg msgbox LavaridgeTown_Text_HopeYoullWalkPlentyWithEgg, MSGBOX_DEFAULT setflag FLAG_RECEIVED_LAVARIDGE_EGG - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM message LavaridgeTown_Text_ReceivedTheEgg waitfanfare giveegg SPECIES_WYNAUT diff --git a/data/maps/LavaridgeTown_Gym_1F/map.json b/data/maps/LavaridgeTown_Gym_1F/map.json index 49b4ef2fd..2f624a2f9 100644 --- a/data/maps/LavaridgeTown_Gym_1F/map.json +++ b/data/maps/LavaridgeTown_Gym_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LAVARIDGE_TOWN_GYM_1F", "name": "LavaridgeTown_Gym_1F", "layout": "LAYOUT_LAVARIDGE_TOWN_GYM_1F", - "music": "MUS_GIM", + "music": "MUS_GYM", "region_map_section": "MAPSEC_LAVARIDGE_TOWN", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", diff --git a/data/maps/LavaridgeTown_Gym_1F/scripts.inc b/data/maps/LavaridgeTown_Gym_1F/scripts.inc index 3747d854d..df95a0b4b 100644 --- a/data/maps/LavaridgeTown_Gym_1F/scripts.inc +++ b/data/maps/LavaridgeTown_Gym_1F/scripts.inc @@ -76,7 +76,7 @@ LavaridgeTown_Gym_1F_EventScript_FlanneryDefeated:: @ 81FE7C1 call LavaridgeTown_Gym_1F_EventScript_GiveOverheat closemessage delay 30 - playfanfare MUS_ME_TORE_EYE + playfanfare MUS_REGISTER_MATCH_CALL msgbox LavaridgeTown_Gym_1F_Text_RegisteredFlannery, MSGBOX_DEFAULT waitfanfare closemessage diff --git a/data/maps/LavaridgeTown_Gym_B1F/map.json b/data/maps/LavaridgeTown_Gym_B1F/map.json index 0b1e81445..bbcdbcbe1 100644 --- a/data/maps/LavaridgeTown_Gym_B1F/map.json +++ b/data/maps/LavaridgeTown_Gym_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LAVARIDGE_TOWN_GYM_B1F", "name": "LavaridgeTown_Gym_B1F", "layout": "LAYOUT_LAVARIDGE_TOWN_GYM_B1F", - "music": "MUS_GIM", + "music": "MUS_GYM", "region_map_section": "MAPSEC_LAVARIDGE_TOWN", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", diff --git a/data/maps/LavaridgeTown_HerbShop/map.json b/data/maps/LavaridgeTown_HerbShop/map.json index e76a98f64..6be35b729 100644 --- a/data/maps/LavaridgeTown_HerbShop/map.json +++ b/data/maps/LavaridgeTown_HerbShop/map.json @@ -2,7 +2,7 @@ "id": "MAP_LAVARIDGE_TOWN_HERB_SHOP", "name": "LavaridgeTown_HerbShop", "layout": "LAYOUT_LAVARIDGE_TOWN_HERB_SHOP", - "music": "MUS_MACHI_S4", + "music": "MUS_OLDALE", "region_map_section": "MAPSEC_LAVARIDGE_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LavaridgeTown_House/map.json b/data/maps/LavaridgeTown_House/map.json index 5827399bd..2a8d5362c 100644 --- a/data/maps/LavaridgeTown_House/map.json +++ b/data/maps/LavaridgeTown_House/map.json @@ -2,7 +2,7 @@ "id": "MAP_LAVARIDGE_TOWN_HOUSE", "name": "LavaridgeTown_House", "layout": "LAYOUT_HOUSE3", - "music": "MUS_MACHI_S4", + "music": "MUS_OLDALE", "region_map_section": "MAPSEC_LAVARIDGE_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LavaridgeTown_Mart/map.json b/data/maps/LavaridgeTown_Mart/map.json index 8099a5463..5c871785d 100644 --- a/data/maps/LavaridgeTown_Mart/map.json +++ b/data/maps/LavaridgeTown_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_LAVARIDGE_TOWN_MART", "name": "LavaridgeTown_Mart", "layout": "LAYOUT_MART", - "music": "MUS_FRIENDLY", + "music": "MUS_POKE_MART", "region_map_section": "MAPSEC_LAVARIDGE_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/map.json b/data/maps/LavaridgeTown_PokemonCenter_1F/map.json index 1542b7b50..42cf11aed 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_1F/map.json +++ b/data/maps/LavaridgeTown_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F", "name": "LavaridgeTown_PokemonCenter_1F", "layout": "LAYOUT_LAVARIDGE_TOWN_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_LAVARIDGE_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LavaridgeTown_PokemonCenter_2F/map.json b/data/maps/LavaridgeTown_PokemonCenter_2F/map.json index eb68b0bb5..72a5f688b 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_2F/map.json +++ b/data/maps/LavaridgeTown_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LAVARIDGE_TOWN_POKEMON_CENTER_2F", "name": "LavaridgeTown_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_LAVARIDGE_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity/map.json b/data/maps/LilycoveCity/map.json index 8d35fc0c6..a13904ca9 100644 --- a/data/maps/LilycoveCity/map.json +++ b/data/maps/LilycoveCity/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY", "name": "LilycoveCity", "layout": "LAYOUT_LILYCOVE_CITY", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/LilycoveCity/scripts.inc b/data/maps/LilycoveCity/scripts.inc index b8f0cd566..0c94bce62 100644 --- a/data/maps/LilycoveCity/scripts.inc +++ b/data/maps/LilycoveCity/scripts.inc @@ -241,7 +241,7 @@ LilycoveCity_EventScript_Rival:: @ 81E2DDE end LilycoveCity_EventScript_May:: @ 81E2DF8 - playbgm MUS_GIRL_SUP, 1 + playbgm MUS_ENCOUNTER_MAY, 1 call_if_set FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_MayAskToBattleAgain call_if_unset FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_MayAskToBattle compare VAR_RESULT, NO @@ -270,7 +270,7 @@ LilycoveCity_EventScript_DeclineMayBattle:: @ 81E2E5A end LilycoveCity_EventScript_Brendan:: @ 81E2E6B - playbgm MUS_BOY_SUP, 1 + playbgm MUS_ENCOUNTER_BRENDAN, 1 call_if_set FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_BrendanAskToBattleAgain call_if_unset FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_BrendanAskToBattle compare VAR_RESULT, NO diff --git a/data/maps/LilycoveCity_ContestHall/map.json b/data/maps/LilycoveCity_ContestHall/map.json index bddb6d7c1..e8151c832 100644 --- a/data/maps/LilycoveCity_ContestHall/map.json +++ b/data/maps/LilycoveCity_ContestHall/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_CONTEST_HALL", "name": "LilycoveCity_ContestHall", "layout": "LAYOUT_LILYCOVE_CITY_CONTEST_HALL", - "music": "MUS_CONLOBBY", + "music": "MUS_CONTEST_LOBBY", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_ContestLobby/map.json b/data/maps/LilycoveCity_ContestLobby/map.json index eb7ebf907..ac5346dc4 100644 --- a/data/maps/LilycoveCity_ContestLobby/map.json +++ b/data/maps/LilycoveCity_ContestLobby/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_CONTEST_LOBBY", "name": "LilycoveCity_ContestLobby", "layout": "LAYOUT_LILYCOVE_CITY_CONTEST_LOBBY", - "music": "MUS_CONLOBBY", + "music": "MUS_CONTEST_LOBBY", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_ContestLobby/scripts.inc b/data/maps/LilycoveCity_ContestLobby/scripts.inc index 6b71c5125..51c38e3f4 100644 --- a/data/maps/LilycoveCity_ContestLobby/scripts.inc +++ b/data/maps/LilycoveCity_ContestLobby/scripts.inc @@ -99,7 +99,7 @@ LilycoveCity_ContestLobby_EventScript_ReceivedArtistRibbon:: @ 821A314 applymovement LOCALID_ARTIST, LilycoveCity_ContestLobby_Movement_ArtistReturnToPlayer waitmovement 0 msgbox LilycoveCity_ContestLobby_Text_TakeMementoOfPainting, MSGBOX_DEFAULT - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM msgbox LilycoveCity_ContestLobby_Text_ReceivedARibbon, MSGBOX_DEFAULT waitfanfare msgbox LilycoveCity_ContestLobby_Text_PutTheRibbonOnMon, MSGBOX_DEFAULT @@ -272,7 +272,7 @@ LilycoveCity_ContestLobby_EventScript_ReceivedLinkArtistRibbon:: @ 821A4E4 applymovement LOCALID_ARTIST_LINK, LilycoveCity_ContestLobby_Movement_LinkArtistReturnToPlayer waitmovement 0 msgbox LilycoveCity_ContestLobby_Text_TakeMementoOfPainting, MSGBOX_DEFAULT - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM msgbox LilycoveCity_ContestLobby_Text_ReceivedARibbon, MSGBOX_DEFAULT waitfanfare msgbox LilycoveCity_ContestLobby_Text_PutTheRibbonOnMon, MSGBOX_DEFAULT @@ -417,13 +417,13 @@ LilycoveCity_ContestLobby_EventScript_LeadToContestHall:: @ 821A670 lockall applymovement LOCALID_RECEPTIONIST, LilycoveCity_ContestLobby_Movement_ReceptionistApproachCounter waitmovement 0 - playse SE_HASHI + playse SE_BRIDGE_WALK setmetatile 12, 2, METATILE_Contest_WallShadow, 1 setmetatile 12, 3, METATILE_Contest_FloorShadow, 1 special DrawWholeMapView applymovement LOCALID_RECEPTIONIST, LilycoveCity_ContestLobby_Movement_ReceptionistExitCounter waitmovement 0 - playse SE_HASHI + playse SE_BRIDGE_WALK setmetatile 12, 2, METATILE_Contest_CounterFlap_Top, 1 setmetatile 12, 3, METATILE_Contest_CounterFlap_Bottom, 1 special DrawWholeMapView @@ -938,13 +938,13 @@ LilycoveCity_ContestLobby_EventScript_LeadToLinkContestHall:: @ 821AC49 closemessage applymovement LOCALID_LINK_RECEPTIONIST, LilycoveCity_ContestLobby_Movement_LinkReceptionistApproachCounter waitmovement 0 - playse SE_HASHI + playse SE_BRIDGE_WALK setmetatile 17, 2, METATILE_Contest_WallShadow, 1 setmetatile 17, 3, METATILE_Contest_FloorShadow, 1 special DrawWholeMapView applymovement LOCALID_LINK_RECEPTIONIST, LilycoveCity_ContestLobby_Movement_LinkReceptionistExitCounter waitmovement 0 - playse SE_HASHI + playse SE_BRIDGE_WALK setmetatile 17, 2, METATILE_Contest_CounterFlap_Top, 1 setmetatile 17, 3, METATILE_Contest_CounterFlap_Bottom, 1 special DrawWholeMapView diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json b/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json index ba6563877..4b18e22c1 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json +++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F", "name": "LilycoveCity_CoveLilyMotel_1F", "layout": "LAYOUT_LILYCOVE_CITY_COVE_LILY_MOTEL_1F", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json b/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json index ff84a3bf7..f55770b88 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json +++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_2F", "name": "LilycoveCity_CoveLilyMotel_2F", "layout": "LAYOUT_LILYCOVE_CITY_COVE_LILY_MOTEL_2F", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc index 7878e791a..9d3520be5 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc @@ -18,7 +18,7 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_ShowMeCompletedDex:: @ 82186F9 LilycoveCity_CoveLilyMotel_2F_EventScript_AllHoennMonsFanfare:: @ 8218702 setflag FLAG_TEMP_2 - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM waitfanfare goto LilycoveCity_CoveLilyMotel_2F_EventScript_ShowDiploma end diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/map.json b/data/maps/LilycoveCity_DepartmentStoreElevator/map.json index 989cf65ef..9a3c43308 100644 --- a/data/maps/LilycoveCity_DepartmentStoreElevator/map.json +++ b/data/maps/LilycoveCity_DepartmentStoreElevator/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR", "name": "LilycoveCity_DepartmentStoreElevator", "layout": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json b/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json index 856c06bd4..deb7ad044 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP", "name": "LilycoveCity_DepartmentStoreRooftop", "layout": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc index 12cb4727c..8d7459b3c 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc @@ -145,7 +145,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_TryBuyDrink:: @ 822032F call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_RemoveMoneyLemonade updatemoneybox 0, 0 bufferitemname 0, VAR_TEMP_0 - playse SE_JIHANKI + playse SE_VEND msgbox LilycoveCity_DepartmentStoreRooftop_Text_CanOfDrinkDroppedDown, MSGBOX_DEFAULT additem VAR_TEMP_0 bufferitemname 1, VAR_TEMP_0 @@ -157,7 +157,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_TryBuyDrink:: @ 822032F checkitemspace VAR_TEMP_0, 1 compare VAR_RESULT, FALSE goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_NoRoomForDrink - playse SE_JIHANKI + playse SE_VEND msgbox LilycoveCity_DepartmentStoreRooftop_Text_ExtraCanOfDrinkDroppedDown, MSGBOX_DEFAULT additem VAR_TEMP_0 bufferitemname 1, VAR_TEMP_0 @@ -169,7 +169,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_TryBuyDrink:: @ 822032F checkitemspace VAR_TEMP_0, 1 compare VAR_RESULT, 0 goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_NoRoomForDrink - playse SE_JIHANKI + playse SE_VEND msgbox LilycoveCity_DepartmentStoreRooftop_Text_ExtraCanOfDrinkDroppedDown, MSGBOX_DEFAULT additem VAR_TEMP_0 bufferitemname 1, VAR_TEMP_0 diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/map.json b/data/maps/LilycoveCity_DepartmentStore_1F/map.json index 9efcdb13a..758e063f6 100644 --- a/data/maps/LilycoveCity_DepartmentStore_1F/map.json +++ b/data/maps/LilycoveCity_DepartmentStore_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F", "name": "LilycoveCity_DepartmentStore_1F", "layout": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_1F", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/map.json b/data/maps/LilycoveCity_DepartmentStore_2F/map.json index 7a1e8bf04..ebef46ae5 100644 --- a/data/maps/LilycoveCity_DepartmentStore_2F/map.json +++ b/data/maps/LilycoveCity_DepartmentStore_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F", "name": "LilycoveCity_DepartmentStore_2F", "layout": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_2F", - "music": "MUS_FRIENDLY", + "music": "MUS_POKE_MART", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/map.json b/data/maps/LilycoveCity_DepartmentStore_3F/map.json index e95c8173f..c911b9d26 100644 --- a/data/maps/LilycoveCity_DepartmentStore_3F/map.json +++ b/data/maps/LilycoveCity_DepartmentStore_3F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F", "name": "LilycoveCity_DepartmentStore_3F", "layout": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_3F", - "music": "MUS_FRIENDLY", + "music": "MUS_POKE_MART", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/map.json b/data/maps/LilycoveCity_DepartmentStore_4F/map.json index d57963ac7..c6291ec2c 100644 --- a/data/maps/LilycoveCity_DepartmentStore_4F/map.json +++ b/data/maps/LilycoveCity_DepartmentStore_4F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F", "name": "LilycoveCity_DepartmentStore_4F", "layout": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_4F", - "music": "MUS_FRIENDLY", + "music": "MUS_POKE_MART", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/map.json b/data/maps/LilycoveCity_DepartmentStore_5F/map.json index d92404b98..6123c1c78 100644 --- a/data/maps/LilycoveCity_DepartmentStore_5F/map.json +++ b/data/maps/LilycoveCity_DepartmentStore_5F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F", "name": "LilycoveCity_DepartmentStore_5F", "layout": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_5F", - "music": "MUS_FRIENDLY", + "music": "MUS_POKE_MART", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_Harbor/map.json b/data/maps/LilycoveCity_Harbor/map.json index b5238ac20..491d42624 100644 --- a/data/maps/LilycoveCity_Harbor/map.json +++ b/data/maps/LilycoveCity_Harbor/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_HARBOR", "name": "LilycoveCity_Harbor", "layout": "LAYOUT_HARBOR", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_House1/map.json b/data/maps/LilycoveCity_House1/map.json index 85ea994c5..bd6850f5a 100644 --- a/data/maps/LilycoveCity_House1/map.json +++ b/data/maps/LilycoveCity_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_HOUSE1", "name": "LilycoveCity_House1", "layout": "LAYOUT_HOUSE1", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_House2/map.json b/data/maps/LilycoveCity_House2/map.json index 719a63067..5c208c852 100644 --- a/data/maps/LilycoveCity_House2/map.json +++ b/data/maps/LilycoveCity_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_HOUSE2", "name": "LilycoveCity_House2", "layout": "LAYOUT_LILYCOVE_CITY_HOUSE2", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_House3/map.json b/data/maps/LilycoveCity_House3/map.json index 3b4212c1a..0331372c9 100644 --- a/data/maps/LilycoveCity_House3/map.json +++ b/data/maps/LilycoveCity_House3/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_HOUSE3", "name": "LilycoveCity_House3", "layout": "LAYOUT_HOUSE2", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_House4/map.json b/data/maps/LilycoveCity_House4/map.json index e086b2d45..7a1571abf 100644 --- a/data/maps/LilycoveCity_House4/map.json +++ b/data/maps/LilycoveCity_House4/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_HOUSE4", "name": "LilycoveCity_House4", "layout": "LAYOUT_HOUSE1", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json b/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json index 8e5605821..09875fddc 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json +++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F", "name": "LilycoveCity_LilycoveMuseum_1F", "layout": "LAYOUT_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F", - "music": "MUS_BIJYUTU", + "music": "MUS_LILYCOVE_MUSEUM", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json b/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json index 7c3c144c8..76d30eb68 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F", "name": "LilycoveCity_LilycoveMuseum_2F", "layout": "LAYOUT_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F", - "music": "MUS_BIJYUTU", + "music": "MUS_LILYCOVE_MUSEUM", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/map.json b/data/maps/LilycoveCity_MoveDeletersHouse/map.json index caed79705..814719a9c 100644 --- a/data/maps/LilycoveCity_MoveDeletersHouse/map.json +++ b/data/maps/LilycoveCity_MoveDeletersHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_MOVE_DELETERS_HOUSE", "name": "LilycoveCity_MoveDeletersHouse", "layout": "LAYOUT_HOUSE2", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc b/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc index 6e7f9c580..1a27e3b8f 100644 --- a/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc +++ b/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc @@ -45,7 +45,7 @@ LilycoveCity_MoveDeletersHouse_EventScript_TryForgetMove:: @ 821EAB0 compare VAR_RESULT, TRUE goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_LastMonWithSurf special MoveDeleterForgetMove - playfanfare MUS_ME_WASURE + playfanfare MUS_MOVE_DELETED waitfanfare msgbox LilycoveCity_MoveDeletersHouse_Text_MonHasForgottenMove, MSGBOX_DEFAULT releaseall diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/map.json b/data/maps/LilycoveCity_PokemonCenter_1F/map.json index 625904e41..daaec1191 100644 --- a/data/maps/LilycoveCity_PokemonCenter_1F/map.json +++ b/data/maps/LilycoveCity_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_POKEMON_CENTER_1F", "name": "LilycoveCity_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_PokemonCenter_2F/map.json b/data/maps/LilycoveCity_PokemonCenter_2F/map.json index a82cc515a..b9c8e1302 100644 --- a/data/maps/LilycoveCity_PokemonCenter_2F/map.json +++ b/data/maps/LilycoveCity_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_POKEMON_CENTER_2F", "name": "LilycoveCity_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/map.json b/data/maps/LilycoveCity_PokemonTrainerFanClub/map.json index 820bf34c4..7d5c42034 100644 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/map.json +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB", "name": "LilycoveCity_PokemonTrainerFanClub", "layout": "LAYOUT_LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LilycoveCity_UnusedMart/map.json b/data/maps/LilycoveCity_UnusedMart/map.json index 65c9b2295..696674bf1 100644 --- a/data/maps/LilycoveCity_UnusedMart/map.json +++ b/data/maps/LilycoveCity_UnusedMart/map.json @@ -2,7 +2,7 @@ "id": "MAP_LILYCOVE_CITY_UNUSED_MART", "name": "LilycoveCity_UnusedMart", "layout": "LAYOUT_MART", - "music": "MUS_FRIENDLY", + "music": "MUS_POKE_MART", "region_map_section": "MAPSEC_LILYCOVE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LittlerootTown/map.json b/data/maps/LittlerootTown/map.json index f0c5694d8..5335dd66e 100644 --- a/data/maps/LittlerootTown/map.json +++ b/data/maps/LittlerootTown/map.json @@ -2,7 +2,7 @@ "id": "MAP_LITTLEROOT_TOWN", "name": "LittlerootTown", "layout": "LAYOUT_LITTLEROOT_TOWN", - "music": "MUS_MISHIRO", + "music": "MUS_LITTLEROOT", "region_map_section": "MAPSEC_LITTLEROOT_TOWN", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/LittlerootTown/scripts.inc b/data/maps/LittlerootTown/scripts.inc index 347a805e8..ba5832309 100644 --- a/data/maps/LittlerootTown/scripts.inc +++ b/data/maps/LittlerootTown/scripts.inc @@ -147,7 +147,7 @@ LittlerootTown_EventScript_StepOffTruckFemale:: @ 81E7EF9 LittlerootTown_EventScript_GoInsideWithMom:: @ 81E7F17 delay 15 - playse SE_DANSA + playse SE_LEDGE applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_Movement_PlayerStepOffTruck waitmovement 0 opendoor VAR_0x8004, VAR_0x8005 @@ -950,7 +950,7 @@ LittlerootTown_EventScript_SetReceivedRunningShoes:: @ 81E8686 LittlerootTown_EventScript_GiveRunningShoes:: @ 81E8693 msgbox LittlerootTown_Text_WearTheseRunningShoes, MSGBOX_DEFAULT - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM message LittlerootTown_Text_SwitchShoesWithRunningShoes waitfanfare setflag FLAG_RECEIVED_RUNNING_SHOES diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/map.json b/data/maps/LittlerootTown_BrendansHouse_1F/map.json index 9911e293a..3929b2e0c 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/map.json +++ b/data/maps/LittlerootTown_BrendansHouse_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F", "name": "LittlerootTown_BrendansHouse_1F", "layout": "LAYOUT_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F", - "music": "MUS_MISHIRO", + "music": "MUS_LITTLEROOT", "region_map_section": "MAPSEC_LITTLEROOT_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc index 65ff3ab98..ee677fbff 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc +++ b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc @@ -147,7 +147,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_MeetRival2:: @ 81F78D6 end LittlerootTown_BrendansHouse_1F_EventScript_MeetRival:: @ 81F78E2 - playse SE_KAIDAN + playse SE_EXIT delay 10 addobject LOCALID_RIVAL delay 30 @@ -158,7 +158,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_MeetRival:: @ 81F78E2 waitmovement 0 compare VAR_0x8008, 1 call_if_ne LittlerootTown_BrendansHouse_1F_EventScript_PlayerFaceBrendan - playbgm MUS_BOY_SUP, 1 + playbgm MUS_ENCOUNTER_BRENDAN, 1 compare VAR_0x8008, 0 call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_BrendanApproachPlayer0 compare VAR_0x8008, 1 @@ -173,7 +173,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_MeetRival:: @ 81F78E2 call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_BrendanGoUpstairs1 compare VAR_0x8008, 2 call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_BrendanGoUpstairs2 - playse SE_KAIDAN + playse SE_EXIT removeobject LOCALID_RIVAL setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_BRENDAN setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_POKE_BALL diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/map.json b/data/maps/LittlerootTown_BrendansHouse_2F/map.json index 9cfdec8fe..03e2dcd82 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/map.json +++ b/data/maps/LittlerootTown_BrendansHouse_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F", "name": "LittlerootTown_BrendansHouse_2F", "layout": "LAYOUT_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F", - "music": "MUS_MISHIRO", + "music": "MUS_LITTLEROOT", "region_map_section": "MAPSEC_LITTLEROOT_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc index 7af4580c3..ab6f55af5 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc +++ b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc @@ -74,7 +74,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendan:: @ 81F8497 applymovement LOCALID_RIVAL, Common_Movement_Delay48 waitmovement 0 delay 10 - playbgm MUS_BOY_SUP, 1 + playbgm MUS_ENCOUNTER_BRENDAN, 1 compare VAR_FACING, DIR_NORTH call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendanNorth compare VAR_FACING, DIR_SOUTH diff --git a/data/maps/LittlerootTown_MaysHouse_1F/map.json b/data/maps/LittlerootTown_MaysHouse_1F/map.json index 5e3a5aecd..739665181 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/map.json +++ b/data/maps/LittlerootTown_MaysHouse_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F", "name": "LittlerootTown_MaysHouse_1F", "layout": "LAYOUT_LITTLEROOT_TOWN_MAYS_HOUSE_1F", - "music": "MUS_MISHIRO", + "music": "MUS_LITTLEROOT", "region_map_section": "MAPSEC_LITTLEROOT_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc index 958951dc9..1e1bb0e11 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc +++ b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc @@ -181,7 +181,7 @@ LittlerootTown_MaysHouse_1F_EventScript_MeetRival2:: @ 81F8A7F end LittlerootTown_MaysHouse_1F_EventScript_MeetRival:: @ 81F8A8B - playse SE_KAIDAN + playse SE_EXIT delay 10 addobject LOCALID_RIVAL delay 30 @@ -192,7 +192,7 @@ LittlerootTown_MaysHouse_1F_EventScript_MeetRival:: @ 81F8A8B waitmovement 0 compare VAR_0x8008, 1 call_if_ne LittlerootTown_MaysHouse_1F_EventScript_PlayerFaceMay - playbgm MUS_GIRL_SUP, 1 + playbgm MUS_ENCOUNTER_MAY, 1 compare VAR_0x8008, 0 call_if_eq LittlerootTown_MaysHouse_1F_EventScript_MayApproachPlayer0 compare VAR_0x8008, 1 @@ -207,7 +207,7 @@ LittlerootTown_MaysHouse_1F_EventScript_MeetRival:: @ 81F8A8B call_if_eq LittlerootTown_MaysHouse_1F_EventScript_MayGoUpstairs1 compare VAR_0x8008, 2 call_if_eq LittlerootTown_MaysHouse_1F_EventScript_MayGoUpstairs2 - playse SE_KAIDAN + playse SE_EXIT removeobject LOCALID_RIVAL setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_MAY setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_POKE_BALL diff --git a/data/maps/LittlerootTown_MaysHouse_2F/map.json b/data/maps/LittlerootTown_MaysHouse_2F/map.json index 54b4e7c7e..1fa2ff01d 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/map.json +++ b/data/maps/LittlerootTown_MaysHouse_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LITTLEROOT_TOWN_MAYS_HOUSE_2F", "name": "LittlerootTown_MaysHouse_2F", "layout": "LAYOUT_LITTLEROOT_TOWN_MAYS_HOUSE_2F", - "music": "MUS_MISHIRO", + "music": "MUS_LITTLEROOT", "region_map_section": "MAPSEC_LITTLEROOT_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc index 7c943e0e2..dd22ed670 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc +++ b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc @@ -74,7 +74,7 @@ LittlerootTown_MaysHouse_2F_EventScript_MeetMay:: @ 81F934A applymovement LOCALID_RIVAL, Common_Movement_Delay48 waitmovement 0 delay 10 - playbgm MUS_GIRL_SUP, 1 + playbgm MUS_ENCOUNTER_MAY, 1 compare VAR_FACING, DIR_NORTH call_if_eq LittlerootTown_MaysHouse_2F_EventScript_MeetMayNorth compare VAR_FACING, DIR_SOUTH diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/map.json b/data/maps/LittlerootTown_ProfessorBirchsLab/map.json index 629516c25..deee3e264 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/map.json +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/map.json @@ -2,7 +2,7 @@ "id": "MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB", "name": "LittlerootTown_ProfessorBirchsLab", "layout": "LAYOUT_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB", - "music": "MUS_ODAMAKI", + "music": "MUS_BIRCH_LAB", "region_map_section": "MAPSEC_LITTLEROOT_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc index 7886bda18..bc03be7b2 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc @@ -120,7 +120,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_GiveStarterEvent:: @ 81F9DDB bufferleadmonspeciesname 0 message LittlerootTown_ProfessorBirchsLab_Text_LikeYouToHavePokemon waitmessage - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM waitfanfare msgbox LittlerootTown_ProfessorBirchsLab_Text_WhyNotGiveNicknameToMon, MSGBOX_YESNO compare VAR_RESULT, YES @@ -183,13 +183,13 @@ LittlerootTown_ProfessorBirchsLab_EventScript_UpgradeToNationalDex:: @ 81F9E80 applymovement LOCALID_BIRCH, LittlerootTown_ProfessorBirchsLab_Movement_BirchRetrievePokedexes waitmovement 0 delay 20 - playse SE_TK_KASYA + playse SE_CLICK delay 10 - playse SE_TK_KASYA + playse SE_CLICK delay 10 - playse SE_TK_KASYA + playse SE_CLICK delay 10 - playse SE_TK_KASYA + playse SE_CLICK delay 20 applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFastestRight applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft @@ -208,7 +208,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_UpgradeToNationalDex:: @ 81F9E80 applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 msgbox LittlerootTown_ProfessorBirchsLab_Text_OkayAllDone, MSGBOX_DEFAULT - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM message LittlerootTown_ProfessorBirchsLab_Text_PokedexUpgradedToNational waitmessage waitfanfare @@ -492,7 +492,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedChikorita:: @ 81FA23F end LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedJohtoStarter:: @ 81FA24F - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM message LittlerootTown_ProfessorBirchsLab_Text_ReceivedJohtoStarter waitmessage waitfanfare @@ -536,7 +536,7 @@ EventScript_RegisterProfBirch:: @ 81FA2D2 msgbox MatchCall_Text_BirchRegisterCall, MSGBOX_DEFAULT closemessage delay 30 - playfanfare MUS_ME_TORE_EYE + playfanfare MUS_REGISTER_MATCH_CALL msgbox MatchCall_Text_RegisteredBirch, MSGBOX_DEFAULT waitfanfare closemessage @@ -587,7 +587,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_BrendanGivePokeBalls:: @ 81FA37F return LittlerootTown_ProfessorBirchsLab_EventScript_ReceivePokedex:: @ 81FA3AC - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM message LittlerootTown_ProfessorBirchsLab_Text_ReceivedPokedex waitfanfare setflag FLAG_SYS_POKEDEX_GET diff --git a/data/maps/MagmaHideout_1F/map.json b/data/maps/MagmaHideout_1F/map.json index 8865cff2f..fe5513e3f 100644 --- a/data/maps/MagmaHideout_1F/map.json +++ b/data/maps/MagmaHideout_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MAGMA_HIDEOUT_1F", "name": "MagmaHideout_1F", "layout": "LAYOUT_MAGMA_HIDEOUT_1F", - "music": "MUS_AJITO", + "music": "MUS_AQUA_MAGMA_HIDEOUT", "region_map_section": "MAPSEC_MAGMA_HIDEOUT", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MagmaHideout_2F_1R/map.json b/data/maps/MagmaHideout_2F_1R/map.json index 1d7d2958d..a5c52683c 100644 --- a/data/maps/MagmaHideout_2F_1R/map.json +++ b/data/maps/MagmaHideout_2F_1R/map.json @@ -2,7 +2,7 @@ "id": "MAP_MAGMA_HIDEOUT_2F_1R", "name": "MagmaHideout_2F_1R", "layout": "LAYOUT_MAGMA_HIDEOUT_2F_1R", - "music": "MUS_AJITO", + "music": "MUS_AQUA_MAGMA_HIDEOUT", "region_map_section": "MAPSEC_MAGMA_HIDEOUT", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MagmaHideout_2F_2R/map.json b/data/maps/MagmaHideout_2F_2R/map.json index 38f492421..4aa6896f6 100644 --- a/data/maps/MagmaHideout_2F_2R/map.json +++ b/data/maps/MagmaHideout_2F_2R/map.json @@ -2,7 +2,7 @@ "id": "MAP_MAGMA_HIDEOUT_2F_2R", "name": "MagmaHideout_2F_2R", "layout": "LAYOUT_MAGMA_HIDEOUT_2F_2R", - "music": "MUS_AJITO", + "music": "MUS_AQUA_MAGMA_HIDEOUT", "region_map_section": "MAPSEC_MAGMA_HIDEOUT", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MagmaHideout_2F_3R/map.json b/data/maps/MagmaHideout_2F_3R/map.json index fbed23781..51a4daf26 100644 --- a/data/maps/MagmaHideout_2F_3R/map.json +++ b/data/maps/MagmaHideout_2F_3R/map.json @@ -2,7 +2,7 @@ "id": "MAP_MAGMA_HIDEOUT_2F_3R", "name": "MagmaHideout_2F_3R", "layout": "LAYOUT_MAGMA_HIDEOUT_2F_3R", - "music": "MUS_AJITO", + "music": "MUS_AQUA_MAGMA_HIDEOUT", "region_map_section": "MAPSEC_MAGMA_HIDEOUT", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MagmaHideout_3F_1R/map.json b/data/maps/MagmaHideout_3F_1R/map.json index 082b1d4c6..edf4cfa21 100644 --- a/data/maps/MagmaHideout_3F_1R/map.json +++ b/data/maps/MagmaHideout_3F_1R/map.json @@ -2,7 +2,7 @@ "id": "MAP_MAGMA_HIDEOUT_3F_1R", "name": "MagmaHideout_3F_1R", "layout": "LAYOUT_MAGMA_HIDEOUT_3F_1R", - "music": "MUS_AJITO", + "music": "MUS_AQUA_MAGMA_HIDEOUT", "region_map_section": "MAPSEC_MAGMA_HIDEOUT", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MagmaHideout_3F_2R/map.json b/data/maps/MagmaHideout_3F_2R/map.json index 3bf22b2e0..70c6bfb97 100644 --- a/data/maps/MagmaHideout_3F_2R/map.json +++ b/data/maps/MagmaHideout_3F_2R/map.json @@ -2,7 +2,7 @@ "id": "MAP_MAGMA_HIDEOUT_3F_2R", "name": "MagmaHideout_3F_2R", "layout": "LAYOUT_MAGMA_HIDEOUT_3F_2R", - "music": "MUS_AJITO", + "music": "MUS_AQUA_MAGMA_HIDEOUT", "region_map_section": "MAPSEC_MAGMA_HIDEOUT", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MagmaHideout_3F_3R/map.json b/data/maps/MagmaHideout_3F_3R/map.json index 38a5342c3..824f5cb74 100644 --- a/data/maps/MagmaHideout_3F_3R/map.json +++ b/data/maps/MagmaHideout_3F_3R/map.json @@ -2,7 +2,7 @@ "id": "MAP_MAGMA_HIDEOUT_3F_3R", "name": "MagmaHideout_3F_3R", "layout": "LAYOUT_MAGMA_HIDEOUT_3F_3R", - "music": "MUS_AJITO", + "music": "MUS_AQUA_MAGMA_HIDEOUT", "region_map_section": "MAPSEC_MAGMA_HIDEOUT", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MagmaHideout_4F/map.json b/data/maps/MagmaHideout_4F/map.json index 0dec87a13..d38e85fdf 100644 --- a/data/maps/MagmaHideout_4F/map.json +++ b/data/maps/MagmaHideout_4F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MAGMA_HIDEOUT_4F", "name": "MagmaHideout_4F", "layout": "LAYOUT_MAGMA_HIDEOUT_4F", - "music": "MUS_AJITO", + "music": "MUS_AQUA_MAGMA_HIDEOUT", "region_map_section": "MAPSEC_MAGMA_HIDEOUT", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MagmaHideout_4F/scripts.inc b/data/maps/MagmaHideout_4F/scripts.inc index ffca9c75f..50382f44e 100644 --- a/data/maps/MagmaHideout_4F/scripts.inc +++ b/data/maps/MagmaHideout_4F/scripts.inc @@ -11,17 +11,17 @@ MagmaHideout_4F_MapScripts:: @ 823A55F MagmaHideout_4F_EventScript_Maxie:: @ 823A560 lockall - playbgm MUS_MGM0, 0 + playbgm MUS_ENCOUNTER_MAGMA, 0 msgbox MagmaHideout_4F_Text_MaxieAwakenGroudon, MSGBOX_DEFAULT closemessage delay 20 setvar VAR_RESULT, 1 - playse SE_W197 + playse SE_M_DETECT dofieldeffectsparkle 18, 42, 0 waitfieldeffect FLDEFF_SPARKLE setvar VAR_RESULT, 1 - playfanfare MUS_ME_TAMA - playse SE_TAMA + playfanfare MUS_AWAKEN_LEGEND + playse SE_ORB special DoOrbEffect applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 diff --git a/data/maps/MarineCave_End/map.json b/data/maps/MarineCave_End/map.json index 7f382b088..d2e506a14 100644 --- a/data/maps/MarineCave_End/map.json +++ b/data/maps/MarineCave_End/map.json @@ -2,7 +2,7 @@ "id": "MAP_MARINE_CAVE_END", "name": "MarineCave_End", "layout": "LAYOUT_MARINE_CAVE_END", - "music": "MUS_DAN01", + "music": "MUS_PETALBURG_WOODS", "region_map_section": "MAPSEC_MARINE_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", diff --git a/data/maps/MarineCave_Entrance/map.json b/data/maps/MarineCave_Entrance/map.json index 541ccddc6..f815ca069 100644 --- a/data/maps/MarineCave_Entrance/map.json +++ b/data/maps/MarineCave_Entrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_MARINE_CAVE_ENTRANCE", "name": "MarineCave_Entrance", "layout": "LAYOUT_MARINE_CAVE_ENTRANCE", - "music": "MUS_DAN01", + "music": "MUS_PETALBURG_WOODS", "region_map_section": "MAPSEC_MARINE_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MauvilleCity/map.json b/data/maps/MauvilleCity/map.json index 096edafe3..cf3d5f8a1 100644 --- a/data/maps/MauvilleCity/map.json +++ b/data/maps/MauvilleCity/map.json @@ -2,7 +2,7 @@ "id": "MAP_MAUVILLE_CITY", "name": "MauvilleCity", "layout": "LAYOUT_MAUVILLE_CITY", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_MAUVILLE_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/MauvilleCity/scripts.inc b/data/maps/MauvilleCity/scripts.inc index 701c36159..7107f4754 100644 --- a/data/maps/MauvilleCity/scripts.inc +++ b/data/maps/MauvilleCity/scripts.inc @@ -460,7 +460,7 @@ MauvilleCity_EventScript_RegisterWallyCall:: @ 81DF7BA pokenavcall MauvilleCity_Text_WallyPokenavCall waitmessage delay 30 - playfanfare MUS_ME_TORE_EYE + playfanfare MUS_REGISTER_MATCH_CALL msgbox MauvilleCity_Text_RegisteredWally, MSGBOX_DEFAULT waitfanfare closemessage diff --git a/data/maps/MauvilleCity_BikeShop/map.json b/data/maps/MauvilleCity_BikeShop/map.json index 44d09d883..217d3be26 100644 --- a/data/maps/MauvilleCity_BikeShop/map.json +++ b/data/maps/MauvilleCity_BikeShop/map.json @@ -2,7 +2,7 @@ "id": "MAP_MAUVILLE_CITY_BIKE_SHOP", "name": "MauvilleCity_BikeShop", "layout": "LAYOUT_MAUVILLE_CITY_BIKE_SHOP", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_MAUVILLE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MauvilleCity_GameCorner/map.json b/data/maps/MauvilleCity_GameCorner/map.json index 1493cda23..2564596ba 100644 --- a/data/maps/MauvilleCity_GameCorner/map.json +++ b/data/maps/MauvilleCity_GameCorner/map.json @@ -2,7 +2,7 @@ "id": "MAP_MAUVILLE_CITY_GAME_CORNER", "name": "MauvilleCity_GameCorner", "layout": "LAYOUT_MAUVILLE_CITY_GAME_CORNER", - "music": "MUS_CASINO", + "music": "MUS_GAME_CORNER", "region_map_section": "MAPSEC_MAUVILLE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MauvilleCity_GameCorner/scripts.inc b/data/maps/MauvilleCity_GameCorner/scripts.inc index 46c61a017..ad3f7a407 100644 --- a/data/maps/MauvilleCity_GameCorner/scripts.inc +++ b/data/maps/MauvilleCity_GameCorner/scripts.inc @@ -53,7 +53,7 @@ MauvilleCity_GameCorner_EventScript_Buy50Coins:: @ 820FC33 removemoney COINS_PRICE_50, 0 updatemoneybox 0, 0 updatecoinsbox 1, 6 - playse SE_REGI + playse SE_SHOP msgbox MauvilleCity_GameCorner_Text_ThankYouHereAreYourCoins, MSGBOX_DEFAULT hidemoneybox hidecoinsbox 0, 5 @@ -71,7 +71,7 @@ MauvilleCity_GameCorner_EventScript_Buy500Coins:: @ 820FC75 removemoney COINS_PRICE_500, 0 updatemoneybox 0, 0 updatecoinsbox 1, 6 - playse SE_REGI + playse SE_SHOP msgbox MauvilleCity_GameCorner_Text_ThankYouHereAreYourCoins, MSGBOX_DEFAULT hidemoneybox hidecoinsbox 0, 5 @@ -172,7 +172,7 @@ MauvilleCity_GameCorner_EventScript_BuyTreeckoDoll:: @ 820FDCB removecoins DOLL_COINS adddecoration DECOR_TREECKO_DOLL updatecoinsbox 1, 1 - playse SE_REGI + playse SE_SHOP msgbox MauvilleCity_GameCorner_Text_SendToYourHomePC, MSGBOX_DEFAULT goto MauvilleCity_GameCorner_EventScript_ReturnToChooseDollPrize end @@ -188,7 +188,7 @@ MauvilleCity_GameCorner_EventScript_BuyTorchicDoll:: @ 820FE05 removecoins DOLL_COINS adddecoration DECOR_TORCHIC_DOLL updatecoinsbox 1, 1 - playse SE_REGI + playse SE_SHOP msgbox MauvilleCity_GameCorner_Text_SendToYourHomePC, MSGBOX_DEFAULT goto MauvilleCity_GameCorner_EventScript_ReturnToChooseDollPrize end @@ -204,7 +204,7 @@ MauvilleCity_GameCorner_EventScript_BuyMudkipDoll:: @ 820FE3F removecoins DOLL_COINS adddecoration DECOR_MUDKIP_DOLL updatecoinsbox 1, 1 - playse SE_REGI + playse SE_SHOP msgbox MauvilleCity_GameCorner_Text_SendToYourHomePC, MSGBOX_DEFAULT goto MauvilleCity_GameCorner_EventScript_ReturnToChooseDollPrize end @@ -312,7 +312,7 @@ MauvilleCity_GameCorner_EventScript_BuyTM32:: @ 820FFDD removecoins TM32_COINS additem ITEM_TM32 updatecoinsbox 1, 1 - playse SE_REGI + playse SE_SHOP msgbox MauvilleCity_GameCorner_Text_HereYouGo, MSGBOX_DEFAULT goto MauvilleCity_GameCorner_EventScript_ReturnToChooseTMPrize end @@ -327,7 +327,7 @@ MauvilleCity_GameCorner_EventScript_BuyTM29:: @ 8210017 removecoins TM29_COINS additem ITEM_TM29 updatecoinsbox 1, 1 - playse SE_REGI + playse SE_SHOP msgbox MauvilleCity_GameCorner_Text_HereYouGo, MSGBOX_DEFAULT goto MauvilleCity_GameCorner_EventScript_ReturnToChooseTMPrize end @@ -342,7 +342,7 @@ MauvilleCity_GameCorner_EventScript_BuyTM35:: @ 8210051 removecoins TM35_COINS additem ITEM_TM35 updatecoinsbox 1, 1 - playse SE_REGI + playse SE_SHOP msgbox MauvilleCity_GameCorner_Text_HereYouGo, MSGBOX_DEFAULT goto MauvilleCity_GameCorner_EventScript_ReturnToChooseTMPrize end @@ -357,7 +357,7 @@ MauvilleCity_GameCorner_EventScript_BuyTM24:: @ 821008B removecoins TM24_COINS additem ITEM_TM24 updatecoinsbox 1, 1 - playse SE_REGI + playse SE_SHOP msgbox MauvilleCity_GameCorner_Text_HereYouGo, MSGBOX_DEFAULT goto MauvilleCity_GameCorner_EventScript_ReturnToChooseTMPrize end @@ -372,7 +372,7 @@ MauvilleCity_GameCorner_EventScript_BuyTM13:: @ 82100C5 removecoins TM13_COINS additem ITEM_TM13 updatecoinsbox 1, 1 - playse SE_REGI + playse SE_SHOP msgbox MauvilleCity_GameCorner_Text_HereYouGo, MSGBOX_DEFAULT goto MauvilleCity_GameCorner_EventScript_ReturnToChooseTMPrize end @@ -481,7 +481,7 @@ MauvilleCity_GameCorner_EventScript_TryGive20Coins:: @ 821023D setflag FLAG_RECEIVED_20_COINS addcoins 20 msgbox MauvilleCity_GameCorner_Text_LuckOnlyLastSoLongTakeCoins, MSGBOX_DEFAULT - playse SE_REGI + playse SE_SHOP goto MauvilleCity_GameCorner_EventScript_PokefanMNormal end diff --git a/data/maps/MauvilleCity_Gym/map.json b/data/maps/MauvilleCity_Gym/map.json index 50122e216..2451c6cd6 100644 --- a/data/maps/MauvilleCity_Gym/map.json +++ b/data/maps/MauvilleCity_Gym/map.json @@ -2,7 +2,7 @@ "id": "MAP_MAUVILLE_CITY_GYM", "name": "MauvilleCity_Gym", "layout": "LAYOUT_MAUVILLE_CITY_GYM", - "music": "MUS_GIM", + "music": "MUS_GYM", "region_map_section": "MAPSEC_MAUVILLE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MauvilleCity_Gym/scripts.inc b/data/maps/MauvilleCity_Gym/scripts.inc index edf0a3129..3fa7dc8c9 100644 --- a/data/maps/MauvilleCity_Gym/scripts.inc +++ b/data/maps/MauvilleCity_Gym/scripts.inc @@ -101,11 +101,11 @@ MauvilleCity_Gym_EventScript_WattsonDefeated:: @ 820DF2B call Common_EventScript_SetGymTrainers special MauvilleGymDeactivatePuzzle special DrawWholeMapView - playse SE_KI_GASYAN + playse SE_UNLOCK call MauvilleCity_Gym_EventScript_GiveShockWave closemessage delay 30 - playfanfare MUS_ME_TORE_EYE + playfanfare MUS_REGISTER_MATCH_CALL msgbox MauvilleCity_Gym_Text_RegisteredWattson, MSGBOX_DEFAULT waitfanfare closemessage @@ -185,7 +185,7 @@ MauvilleCity_Gym_EventScript_PressFloorSwitch:: @ 820E08D special MauvilleGymSetDefaultBarriers special MauvilleGymPressSwitch special DrawWholeMapView - playse SE_KI_GASYAN + playse SE_UNLOCK goto_if_set FLAG_MAUVILLE_GYM_BARRIERS_STATE, MauvilleCity_Gym_EventScript_ClearBarriersAltState goto_if_unset FLAG_MAUVILLE_GYM_BARRIERS_STATE, MauvilleCity_Gym_EventScript_SetBarriersAltState releaseall diff --git a/data/maps/MauvilleCity_House1/map.json b/data/maps/MauvilleCity_House1/map.json index 4f203bce6..019ae6f09 100644 --- a/data/maps/MauvilleCity_House1/map.json +++ b/data/maps/MauvilleCity_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_MAUVILLE_CITY_HOUSE1", "name": "MauvilleCity_House1", "layout": "LAYOUT_HOUSE2", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_MAUVILLE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MauvilleCity_House2/map.json b/data/maps/MauvilleCity_House2/map.json index 5c092f1c7..009befbab 100644 --- a/data/maps/MauvilleCity_House2/map.json +++ b/data/maps/MauvilleCity_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_MAUVILLE_CITY_HOUSE2", "name": "MauvilleCity_House2", "layout": "LAYOUT_HOUSE1", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_MAUVILLE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MauvilleCity_Mart/map.json b/data/maps/MauvilleCity_Mart/map.json index 2dcdd906e..ee4091ee1 100644 --- a/data/maps/MauvilleCity_Mart/map.json +++ b/data/maps/MauvilleCity_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_MAUVILLE_CITY_MART", "name": "MauvilleCity_Mart", "layout": "LAYOUT_MART", - "music": "MUS_FRIENDLY", + "music": "MUS_POKE_MART", "region_map_section": "MAPSEC_MAUVILLE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/map.json b/data/maps/MauvilleCity_PokemonCenter_1F/map.json index 50e5d3c9f..9feb04be9 100644 --- a/data/maps/MauvilleCity_PokemonCenter_1F/map.json +++ b/data/maps/MauvilleCity_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MAUVILLE_CITY_POKEMON_CENTER_1F", "name": "MauvilleCity_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_MAUVILLE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/map.json b/data/maps/MauvilleCity_PokemonCenter_2F/map.json index da8f19255..3f616938b 100644 --- a/data/maps/MauvilleCity_PokemonCenter_2F/map.json +++ b/data/maps/MauvilleCity_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MAUVILLE_CITY_POKEMON_CENTER_2F", "name": "MauvilleCity_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_MAUVILLE_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MeteorFalls_1F_1R/map.json b/data/maps/MeteorFalls_1F_1R/map.json index 45cf5803e..f177410e2 100644 --- a/data/maps/MeteorFalls_1F_1R/map.json +++ b/data/maps/MeteorFalls_1F_1R/map.json @@ -2,7 +2,7 @@ "id": "MAP_METEOR_FALLS_1F_1R", "name": "MeteorFalls_1F_1R", "layout": "LAYOUT_METEOR_FALLS_1F_1R", - "music": "MUS_DAN03", + "music": "MUS_CAVE_OF_ORIGIN", "region_map_section": "MAPSEC_METEOR_FALLS", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MeteorFalls_1F_1R/scripts.inc b/data/maps/MeteorFalls_1F_1R/scripts.inc index 56deaa353..c942e230e 100644 --- a/data/maps/MeteorFalls_1F_1R/scripts.inc +++ b/data/maps/MeteorFalls_1F_1R/scripts.inc @@ -21,7 +21,7 @@ MeteorFalls_1F_1R_EventScript_OpenStevensCave:: @ 822BD3A MeteorFalls_1F_1R_EventScript_MagmaStealsMeteoriteScene:: @ 822BD5F lockall - playbgm MUS_MGM0, 0 + playbgm MUS_ENCOUNTER_MAGMA, 0 applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_FaceDown waitmovement 0 delay 30 @@ -50,7 +50,7 @@ MeteorFalls_1F_1R_EventScript_MagmaStealsMeteoriteScene:: @ 822BD5F addobject LOCALID_ARCHIE addobject LOCALID_AQUA_GRUNT_1 addobject LOCALID_AQUA_GRUNT_2 - playbgm MUS_AQA_0, 0 + playbgm MUS_ENCOUNTER_AQUA, 0 applymovement LOCALID_ARCHIE, MeteorFalls_1F_1R_Movement_ArchieArrive applymovement LOCALID_AQUA_GRUNT_1, MeteorFalls_1F_1R_Movement_AquaGrunt1Arrive applymovement LOCALID_AQUA_GRUNT_2, MeteorFalls_1F_1R_Movement_AquaGrunt2Arrive diff --git a/data/maps/MeteorFalls_1F_2R/map.json b/data/maps/MeteorFalls_1F_2R/map.json index ea585829f..49e001c88 100644 --- a/data/maps/MeteorFalls_1F_2R/map.json +++ b/data/maps/MeteorFalls_1F_2R/map.json @@ -2,7 +2,7 @@ "id": "MAP_METEOR_FALLS_1F_2R", "name": "MeteorFalls_1F_2R", "layout": "LAYOUT_METEOR_FALLS_1F_2R", - "music": "MUS_DAN03", + "music": "MUS_CAVE_OF_ORIGIN", "region_map_section": "MAPSEC_METEOR_FALLS", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MeteorFalls_B1F_1R/map.json b/data/maps/MeteorFalls_B1F_1R/map.json index 2db212dfa..6cba2ec48 100644 --- a/data/maps/MeteorFalls_B1F_1R/map.json +++ b/data/maps/MeteorFalls_B1F_1R/map.json @@ -2,7 +2,7 @@ "id": "MAP_METEOR_FALLS_B1F_1R", "name": "MeteorFalls_B1F_1R", "layout": "LAYOUT_METEOR_FALLS_B1F_1R", - "music": "MUS_DAN03", + "music": "MUS_CAVE_OF_ORIGIN", "region_map_section": "MAPSEC_METEOR_FALLS", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MeteorFalls_B1F_2R/map.json b/data/maps/MeteorFalls_B1F_2R/map.json index e318acfbc..57276d86d 100644 --- a/data/maps/MeteorFalls_B1F_2R/map.json +++ b/data/maps/MeteorFalls_B1F_2R/map.json @@ -2,7 +2,7 @@ "id": "MAP_METEOR_FALLS_B1F_2R", "name": "MeteorFalls_B1F_2R", "layout": "LAYOUT_METEOR_FALLS_B1F_2R", - "music": "MUS_DAN03", + "music": "MUS_CAVE_OF_ORIGIN", "region_map_section": "MAPSEC_METEOR_FALLS", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MeteorFalls_StevensCave/map.json b/data/maps/MeteorFalls_StevensCave/map.json index 7b1f7439e..01b05d308 100644 --- a/data/maps/MeteorFalls_StevensCave/map.json +++ b/data/maps/MeteorFalls_StevensCave/map.json @@ -2,7 +2,7 @@ "id": "MAP_METEOR_FALLS_STEVENS_CAVE", "name": "MeteorFalls_StevensCave", "layout": "LAYOUT_METEOR_FALLS_STEVENS_CAVE", - "music": "MUS_DAN03", + "music": "MUS_CAVE_OF_ORIGIN", "region_map_section": "MAPSEC_METEOR_FALLS", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MirageTower_1F/map.json b/data/maps/MirageTower_1F/map.json index 91e15cc39..bb7930006 100644 --- a/data/maps/MirageTower_1F/map.json +++ b/data/maps/MirageTower_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MIRAGE_TOWER_1F", "name": "MirageTower_1F", "layout": "LAYOUT_MIRAGE_TOWER_1F", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_MIRAGE_TOWER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MirageTower_2F/map.json b/data/maps/MirageTower_2F/map.json index 5e9769db6..bf4561675 100644 --- a/data/maps/MirageTower_2F/map.json +++ b/data/maps/MirageTower_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MIRAGE_TOWER_2F", "name": "MirageTower_2F", "layout": "LAYOUT_MIRAGE_TOWER_2F", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_MIRAGE_TOWER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MirageTower_3F/map.json b/data/maps/MirageTower_3F/map.json index 2692de62a..6ccbf4678 100644 --- a/data/maps/MirageTower_3F/map.json +++ b/data/maps/MirageTower_3F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MIRAGE_TOWER_3F", "name": "MirageTower_3F", "layout": "LAYOUT_MIRAGE_TOWER_3F", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_MIRAGE_TOWER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MirageTower_4F/map.json b/data/maps/MirageTower_4F/map.json index 03ecc0647..a153fbb2a 100644 --- a/data/maps/MirageTower_4F/map.json +++ b/data/maps/MirageTower_4F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MIRAGE_TOWER_4F", "name": "MirageTower_4F", "layout": "LAYOUT_MIRAGE_TOWER_4F", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_MIRAGE_TOWER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MossdeepCity/map.json b/data/maps/MossdeepCity/map.json index d360959a1..ff8ae1b61 100644 --- a/data/maps/MossdeepCity/map.json +++ b/data/maps/MossdeepCity/map.json @@ -2,7 +2,7 @@ "id": "MAP_MOSSDEEP_CITY", "name": "MossdeepCity", "layout": "LAYOUT_MOSSDEEP_CITY", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_MOSSDEEP_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/MossdeepCity_GameCorner_1F/map.json b/data/maps/MossdeepCity_GameCorner_1F/map.json index 6188b4f37..14b89fe42 100644 --- a/data/maps/MossdeepCity_GameCorner_1F/map.json +++ b/data/maps/MossdeepCity_GameCorner_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MOSSDEEP_CITY_GAME_CORNER_1F", "name": "MossdeepCity_GameCorner_1F", "layout": "LAYOUT_MOSSDEEP_CITY_GAME_CORNER_1F", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_MOSSDEEP_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MossdeepCity_GameCorner_B1F/map.json b/data/maps/MossdeepCity_GameCorner_B1F/map.json index 7ea92448c..180bd703a 100644 --- a/data/maps/MossdeepCity_GameCorner_B1F/map.json +++ b/data/maps/MossdeepCity_GameCorner_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MOSSDEEP_CITY_GAME_CORNER_B1F", "name": "MossdeepCity_GameCorner_B1F", "layout": "LAYOUT_MOSSDEEP_CITY_GAME_CORNER_B1F", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_MOSSDEEP_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MossdeepCity_Gym/map.json b/data/maps/MossdeepCity_Gym/map.json index fa4099565..9b63a0c08 100644 --- a/data/maps/MossdeepCity_Gym/map.json +++ b/data/maps/MossdeepCity_Gym/map.json @@ -2,7 +2,7 @@ "id": "MAP_MOSSDEEP_CITY_GYM", "name": "MossdeepCity_Gym", "layout": "LAYOUT_MOSSDEEP_CITY_GYM", - "music": "MUS_GIM", + "music": "MUS_GYM", "region_map_section": "MAPSEC_MOSSDEEP_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MossdeepCity_Gym/scripts.inc b/data/maps/MossdeepCity_Gym/scripts.inc index d8bff6dd1..0e6487e16 100644 --- a/data/maps/MossdeepCity_Gym/scripts.inc +++ b/data/maps/MossdeepCity_Gym/scripts.inc @@ -81,7 +81,7 @@ MossdeepCity_Gym_EventScript_TateAndLizaDefeated:: @ 82208D1 call MossdeepCity_Gym_EventScript_GiveCalmMind closemessage delay 30 - playfanfare MUS_ME_TORE_EYE + playfanfare MUS_REGISTER_MATCH_CALL msgbox MossdeepCity_Gym_Text_RegisteredTateAndLiza, MSGBOX_DEFAULT waitfanfare closemessage @@ -126,7 +126,7 @@ MossdeepCity_Gym_EventScript_Switch1:: @ 8220999 MossdeepCity_Gym_EventScript_DrawMapAfterSwitchUsed:: @ 82209C8 special DrawWholeMapView - playse SE_TK_KASYA + playse SE_CLICK releaseall end @@ -308,9 +308,9 @@ MossdeepCity_Gym_EventScript_GymStatue:: @ 8220C5D end MossdeepCity_Gym_EventScript_YellowFloorSwitch:: @ 8220C67 - playse SE_MU_PACHI + playse SE_SWITCH waitse - playse SE_TU_SAA + playse SE_REPEL initrotatingtilepuzzle FALSE moverotatingtileobjects 0 waitmovement 0 @@ -320,9 +320,9 @@ MossdeepCity_Gym_EventScript_YellowFloorSwitch:: @ 8220C67 end MossdeepCity_Gym_EventScript_BlueFloorSwitch:: @ 8220C7D - playse SE_MU_PACHI + playse SE_SWITCH waitse - playse SE_TU_SAA + playse SE_REPEL initrotatingtilepuzzle FALSE moverotatingtileobjects 1 waitmovement 0 @@ -332,9 +332,9 @@ MossdeepCity_Gym_EventScript_BlueFloorSwitch:: @ 8220C7D end MossdeepCity_Gym_EventScript_GreenFloorSwitch:: @ 8220C93 - playse SE_MU_PACHI + playse SE_SWITCH waitse - playse SE_TU_SAA + playse SE_REPEL initrotatingtilepuzzle FALSE moverotatingtileobjects 2 waitmovement 0 @@ -344,9 +344,9 @@ MossdeepCity_Gym_EventScript_GreenFloorSwitch:: @ 8220C93 end MossdeepCity_Gym_EventScript_PurpleFloorSwitch:: @ 8220CA9 - playse SE_MU_PACHI + playse SE_SWITCH waitse - playse SE_TU_SAA + playse SE_REPEL initrotatingtilepuzzle FALSE moverotatingtileobjects 3 waitmovement 0 @@ -356,9 +356,9 @@ MossdeepCity_Gym_EventScript_PurpleFloorSwitch:: @ 8220CA9 end MossdeepCity_Gym_EventScript_RedFloorSwitch:: @ 8220CBF - playse SE_MU_PACHI + playse SE_SWITCH waitse - playse SE_TU_SAA + playse SE_REPEL initrotatingtilepuzzle FALSE moverotatingtileobjects 4 waitmovement 0 diff --git a/data/maps/MossdeepCity_House1/map.json b/data/maps/MossdeepCity_House1/map.json index f57f4df18..f4338078e 100644 --- a/data/maps/MossdeepCity_House1/map.json +++ b/data/maps/MossdeepCity_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_MOSSDEEP_CITY_HOUSE1", "name": "MossdeepCity_House1", "layout": "LAYOUT_HOUSE2", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_MOSSDEEP_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MossdeepCity_House2/map.json b/data/maps/MossdeepCity_House2/map.json index 9a9a08173..e7990bad9 100644 --- a/data/maps/MossdeepCity_House2/map.json +++ b/data/maps/MossdeepCity_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_MOSSDEEP_CITY_HOUSE2", "name": "MossdeepCity_House2", "layout": "LAYOUT_HOUSE1", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_MOSSDEEP_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MossdeepCity_House3/map.json b/data/maps/MossdeepCity_House3/map.json index c6cfaf097..a0587ca0a 100644 --- a/data/maps/MossdeepCity_House3/map.json +++ b/data/maps/MossdeepCity_House3/map.json @@ -2,7 +2,7 @@ "id": "MAP_MOSSDEEP_CITY_HOUSE3", "name": "MossdeepCity_House3", "layout": "LAYOUT_HOUSE2", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_MOSSDEEP_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MossdeepCity_House4/map.json b/data/maps/MossdeepCity_House4/map.json index b4b77372d..0c7e0a112 100644 --- a/data/maps/MossdeepCity_House4/map.json +++ b/data/maps/MossdeepCity_House4/map.json @@ -2,7 +2,7 @@ "id": "MAP_MOSSDEEP_CITY_HOUSE4", "name": "MossdeepCity_House4", "layout": "LAYOUT_HOUSE_WITH_BED", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_MOSSDEEP_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MossdeepCity_Mart/map.json b/data/maps/MossdeepCity_Mart/map.json index 83218e7e1..37885b752 100644 --- a/data/maps/MossdeepCity_Mart/map.json +++ b/data/maps/MossdeepCity_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_MOSSDEEP_CITY_MART", "name": "MossdeepCity_Mart", "layout": "LAYOUT_MART", - "music": "MUS_FRIENDLY", + "music": "MUS_POKE_MART", "region_map_section": "MAPSEC_MOSSDEEP_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/map.json b/data/maps/MossdeepCity_PokemonCenter_1F/map.json index 751632462..ac3b51e8f 100644 --- a/data/maps/MossdeepCity_PokemonCenter_1F/map.json +++ b/data/maps/MossdeepCity_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MOSSDEEP_CITY_POKEMON_CENTER_1F", "name": "MossdeepCity_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_MOSSDEEP_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/map.json b/data/maps/MossdeepCity_PokemonCenter_2F/map.json index 9206cf844..7fa656697 100644 --- a/data/maps/MossdeepCity_PokemonCenter_2F/map.json +++ b/data/maps/MossdeepCity_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MOSSDEEP_CITY_POKEMON_CENTER_2F", "name": "MossdeepCity_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_MOSSDEEP_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/map.json b/data/maps/MossdeepCity_SpaceCenter_1F/map.json index 32b5ff489..0f5069665 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/map.json +++ b/data/maps/MossdeepCity_SpaceCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MOSSDEEP_CITY_SPACE_CENTER_1F", "name": "MossdeepCity_SpaceCenter_1F", "layout": "LAYOUT_MOSSDEEP_CITY_SPACE_CENTER_1F", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_MOSSDEEP_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/map.json b/data/maps/MossdeepCity_SpaceCenter_2F/map.json index 7e01d7f1a..8990aa075 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/map.json +++ b/data/maps/MossdeepCity_SpaceCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MOSSDEEP_CITY_SPACE_CENTER_2F", "name": "MossdeepCity_SpaceCenter_2F", "layout": "LAYOUT_MOSSDEEP_CITY_SPACE_CENTER_2F", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_MOSSDEEP_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc index 6c9d4a905..62550d7c6 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc +++ b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc @@ -204,7 +204,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_Steven:: @ 8223F7A msgbox MossdeepCity_SpaceCenter_2F_Text_MaxieUseFuelToEruptVolcano, MSGBOX_DEFAULT closemessage delay 30 - playse SE_KOUKA_L + playse SE_NOT_EFFECTIVE switch VAR_FACING case DIR_SOUTH, MossdeepCity_SpaceCenter_2F_EventScript_StevenFightMovementSouth applymovement LOCALID_STEVEN, MossdeepCity_SpaceCenter_2F_Movement_StevenFight diff --git a/data/maps/MossdeepCity_StevensHouse/map.json b/data/maps/MossdeepCity_StevensHouse/map.json index 81eefbd94..cad7609d3 100644 --- a/data/maps/MossdeepCity_StevensHouse/map.json +++ b/data/maps/MossdeepCity_StevensHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_MOSSDEEP_CITY_STEVENS_HOUSE", "name": "MossdeepCity_StevensHouse", "layout": "LAYOUT_MOSSDEEP_CITY_STEVENS_HOUSE", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_MOSSDEEP_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MossdeepCity_StevensHouse/scripts.inc b/data/maps/MossdeepCity_StevensHouse/scripts.inc index 0017f553d..1d384efe1 100644 --- a/data/maps/MossdeepCity_StevensHouse/scripts.inc +++ b/data/maps/MossdeepCity_StevensHouse/scripts.inc @@ -123,7 +123,7 @@ MossdeepCity_StevensHouse_EventScript_BeldumTransferredToPC:: @ 82228E0 MossdeepCity_StevensHouse_EventScript_ReceivedBeldumFanfare:: @ 82228EB bufferspeciesname 1, SPECIES_BELDUM removeobject LOCALID_BELDUM_BALL - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM message MossdeepCity_StevensHouse_Text_ObtainedBeldum waitmessage waitfanfare diff --git a/data/maps/MtChimney/map.json b/data/maps/MtChimney/map.json index 7e95b291c..7083ff7de 100644 --- a/data/maps/MtChimney/map.json +++ b/data/maps/MtChimney/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_CHIMNEY", "name": "MtChimney", "layout": "LAYOUT_MT_CHIMNEY", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_MT_CHIMNEY", "requires_flash": false, "weather": "WEATHER_VOLCANIC_ASH", diff --git a/data/maps/MtChimney/scripts.inc b/data/maps/MtChimney/scripts.inc index 42ebce0f9..c633d9313 100644 --- a/data/maps/MtChimney/scripts.inc +++ b/data/maps/MtChimney/scripts.inc @@ -40,7 +40,7 @@ MtChimney_EventScript_ArchieBusyFighting:: @ 822EE02 MtChimney_EventScript_Maxie:: @ 822EE0B lockall - playbgm MUS_MGM0, 0 + playbgm MUS_ENCOUNTER_MAGMA, 0 msgbox MtChimney_Text_MeteoriteWillActivateVolcano, MSGBOX_DEFAULT applymovement LOCALID_MAXIE, Common_Movement_FacePlayer waitmovement 0 diff --git a/data/maps/MtChimney_CableCarStation/map.json b/data/maps/MtChimney_CableCarStation/map.json index 3926f2444..410bc0c2e 100644 --- a/data/maps/MtChimney_CableCarStation/map.json +++ b/data/maps/MtChimney_CableCarStation/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_CHIMNEY_CABLE_CAR_STATION", "name": "MtChimney_CableCarStation", "layout": "LAYOUT_CABLE_CAR_STATION", - "music": "MUS_DOORO_X1", + "music": "MUS_ROUTE110", "region_map_section": "MAPSEC_MT_CHIMNEY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtPyre_1F/map.json b/data/maps/MtPyre_1F/map.json index 153a14a92..248bd6530 100644 --- a/data/maps/MtPyre_1F/map.json +++ b/data/maps/MtPyre_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_PYRE_1F", "name": "MtPyre_1F", "layout": "LAYOUT_MT_PYRE_1F", - "music": "MUS_M_DUNGON", + "music": "MUS_MT_PYRE", "region_map_section": "MAPSEC_MT_PYRE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtPyre_2F/map.json b/data/maps/MtPyre_2F/map.json index 69e7b1e18..0668bcf78 100644 --- a/data/maps/MtPyre_2F/map.json +++ b/data/maps/MtPyre_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_PYRE_2F", "name": "MtPyre_2F", "layout": "LAYOUT_MT_PYRE_2F", - "music": "MUS_M_DUNGON", + "music": "MUS_MT_PYRE", "region_map_section": "MAPSEC_MT_PYRE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtPyre_3F/map.json b/data/maps/MtPyre_3F/map.json index 08c594514..35c6c1b04 100644 --- a/data/maps/MtPyre_3F/map.json +++ b/data/maps/MtPyre_3F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_PYRE_3F", "name": "MtPyre_3F", "layout": "LAYOUT_MT_PYRE_3F", - "music": "MUS_M_DUNGON", + "music": "MUS_MT_PYRE", "region_map_section": "MAPSEC_MT_PYRE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtPyre_4F/map.json b/data/maps/MtPyre_4F/map.json index f9658c6cf..d326bff72 100644 --- a/data/maps/MtPyre_4F/map.json +++ b/data/maps/MtPyre_4F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_PYRE_4F", "name": "MtPyre_4F", "layout": "LAYOUT_MT_PYRE_4F", - "music": "MUS_M_DUNGON", + "music": "MUS_MT_PYRE", "region_map_section": "MAPSEC_MT_PYRE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtPyre_5F/map.json b/data/maps/MtPyre_5F/map.json index 93cc0013e..fb7c3f2f8 100644 --- a/data/maps/MtPyre_5F/map.json +++ b/data/maps/MtPyre_5F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_PYRE_5F", "name": "MtPyre_5F", "layout": "LAYOUT_MT_PYRE_5F", - "music": "MUS_M_DUNGON", + "music": "MUS_MT_PYRE", "region_map_section": "MAPSEC_MT_PYRE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtPyre_6F/map.json b/data/maps/MtPyre_6F/map.json index 1291d6356..dc2e7f9b0 100644 --- a/data/maps/MtPyre_6F/map.json +++ b/data/maps/MtPyre_6F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_PYRE_6F", "name": "MtPyre_6F", "layout": "LAYOUT_MT_PYRE_6F", - "music": "MUS_M_DUNGON", + "music": "MUS_MT_PYRE", "region_map_section": "MAPSEC_MT_PYRE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtPyre_Exterior/map.json b/data/maps/MtPyre_Exterior/map.json index 67a0dac6e..58c865305 100644 --- a/data/maps/MtPyre_Exterior/map.json +++ b/data/maps/MtPyre_Exterior/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_PYRE_EXTERIOR", "name": "MtPyre_Exterior", "layout": "LAYOUT_MT_PYRE_EXTERIOR", - "music": "MUS_MACHUPI", + "music": "MUS_MT_PYRE_EXTERIOR", "region_map_section": "MAPSEC_MT_PYRE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtPyre_Summit/map.json b/data/maps/MtPyre_Summit/map.json index 87a1ad977..aa3341f8a 100644 --- a/data/maps/MtPyre_Summit/map.json +++ b/data/maps/MtPyre_Summit/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_PYRE_SUMMIT", "name": "MtPyre_Summit", "layout": "LAYOUT_MT_PYRE_SUMMIT", - "music": "MUS_MACHUPI", + "music": "MUS_MT_PYRE_EXTERIOR", "region_map_section": "MAPSEC_MT_PYRE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", diff --git a/data/maps/MtPyre_Summit/scripts.inc b/data/maps/MtPyre_Summit/scripts.inc index 9daf02f5b..c2692ff20 100644 --- a/data/maps/MtPyre_Summit/scripts.inc +++ b/data/maps/MtPyre_Summit/scripts.inc @@ -39,7 +39,7 @@ MtPyre_Summit_EventScript_TeamAquaTrigger2:: @ 8232030 end MtPyre_Summit_EventScript_TeamAquaExits:: @ 823203C - playbgm MUS_AQA_0, 0 + playbgm MUS_ENCOUNTER_AQUA, 0 applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_FaceUp waitmovement 0 applymovement LOCALID_ARCHIE, Common_Movement_WalkInPlaceFastestDown diff --git a/data/maps/NavelRock_B1F/map.json b/data/maps/NavelRock_B1F/map.json index f7d969e21..8e366fc16 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_RG_NANADUNGEON", + "music": "MUS_RG_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_Bottom/map.json b/data/maps/NavelRock_Bottom/map.json index 1db5649bc..13d676200 100644 --- a/data/maps/NavelRock_Bottom/map.json +++ b/data/maps/NavelRock_Bottom/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_BOTTOM", "name": "NavelRock_Bottom", "layout": "LAYOUT_NAVEL_ROCK_BOTTOM", - "music": "MUS_RG_NANADUNGEON", + "music": "MUS_RG_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_Bottom/scripts.inc b/data/maps/NavelRock_Bottom/scripts.inc index f0c73b1f8..9c438fc5c 100644 --- a/data/maps/NavelRock_Bottom/scripts.inc +++ b/data/maps/NavelRock_Bottom/scripts.inc @@ -35,14 +35,14 @@ NavelRock_Bottom_EventScript_Lugia:: @ 82692A2 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 ShakeCamera 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_Down01/map.json b/data/maps/NavelRock_Down01/map.json index 1c47e450e..674996920 100644 --- a/data/maps/NavelRock_Down01/map.json +++ b/data/maps/NavelRock_Down01/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_DOWN01", "name": "NavelRock_Down01", "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM1", - "music": "MUS_RG_NANADUNGEON", + "music": "MUS_RG_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_Down02/map.json b/data/maps/NavelRock_Down02/map.json index aaae333c3..7c75a1b03 100644 --- a/data/maps/NavelRock_Down02/map.json +++ b/data/maps/NavelRock_Down02/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_DOWN02", "name": "NavelRock_Down02", "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM2", - "music": "MUS_RG_NANADUNGEON", + "music": "MUS_RG_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_Down03/map.json b/data/maps/NavelRock_Down03/map.json index 60acdc668..936ebab77 100644 --- a/data/maps/NavelRock_Down03/map.json +++ b/data/maps/NavelRock_Down03/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_DOWN03", "name": "NavelRock_Down03", "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM1", - "music": "MUS_RG_NANADUNGEON", + "music": "MUS_RG_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_Down04/map.json b/data/maps/NavelRock_Down04/map.json index edfc400e7..585ee7538 100644 --- a/data/maps/NavelRock_Down04/map.json +++ b/data/maps/NavelRock_Down04/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_DOWN04", "name": "NavelRock_Down04", "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM2", - "music": "MUS_RG_NANADUNGEON", + "music": "MUS_RG_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_Down05/map.json b/data/maps/NavelRock_Down05/map.json index f4d31fdff..1099d9caa 100644 --- a/data/maps/NavelRock_Down05/map.json +++ b/data/maps/NavelRock_Down05/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_DOWN05", "name": "NavelRock_Down05", "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM1", - "music": "MUS_RG_NANADUNGEON", + "music": "MUS_RG_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_Down06/map.json b/data/maps/NavelRock_Down06/map.json index ef20800f3..7fb26f293 100644 --- a/data/maps/NavelRock_Down06/map.json +++ b/data/maps/NavelRock_Down06/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_DOWN06", "name": "NavelRock_Down06", "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM2", - "music": "MUS_RG_NANADUNGEON", + "music": "MUS_RG_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_Down07/map.json b/data/maps/NavelRock_Down07/map.json index 0019d726f..36896f306 100644 --- a/data/maps/NavelRock_Down07/map.json +++ b/data/maps/NavelRock_Down07/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_DOWN07", "name": "NavelRock_Down07", "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM1", - "music": "MUS_RG_NANADUNGEON", + "music": "MUS_RG_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_Down08/map.json b/data/maps/NavelRock_Down08/map.json index 17d50c0ed..f9945f49f 100644 --- a/data/maps/NavelRock_Down08/map.json +++ b/data/maps/NavelRock_Down08/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_DOWN08", "name": "NavelRock_Down08", "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM2", - "music": "MUS_RG_NANADUNGEON", + "music": "MUS_RG_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_Down09/map.json b/data/maps/NavelRock_Down09/map.json index 49713ffc3..38b2fdae8 100644 --- a/data/maps/NavelRock_Down09/map.json +++ b/data/maps/NavelRock_Down09/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_DOWN09", "name": "NavelRock_Down09", "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM1", - "music": "MUS_RG_NANADUNGEON", + "music": "MUS_RG_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_Down10/map.json b/data/maps/NavelRock_Down10/map.json index d736db5d9..7ea3bfa3b 100644 --- a/data/maps/NavelRock_Down10/map.json +++ b/data/maps/NavelRock_Down10/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_DOWN10", "name": "NavelRock_Down10", "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM2", - "music": "MUS_RG_NANADUNGEON", + "music": "MUS_RG_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_Down11/map.json b/data/maps/NavelRock_Down11/map.json index ac45da8a2..da05c7e6b 100644 --- a/data/maps/NavelRock_Down11/map.json +++ b/data/maps/NavelRock_Down11/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_DOWN11", "name": "NavelRock_Down11", "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM1", - "music": "MUS_RG_NANADUNGEON", + "music": "MUS_RG_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_Entrance/map.json b/data/maps/NavelRock_Entrance/map.json index 66d462f5f..ab14b2da1 100644 --- a/data/maps/NavelRock_Entrance/map.json +++ b/data/maps/NavelRock_Entrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_ENTRANCE", "name": "NavelRock_Entrance", "layout": "LAYOUT_NAVEL_ROCK_ENTRANCE", - "music": "MUS_RG_NANADUNGEON", + "music": "MUS_RG_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 8527705c1..13927b6b6 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_RG_NANASHIMA", + "music": "MUS_RG_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 a5301bd6b..a8929208f 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_RG_NANADUNGEON", + "music": "MUS_RG_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 62308d149..34e139108 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_RG_NANASHIMA", + "music": "MUS_RG_SEVII_ROUTE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_Top/map.json b/data/maps/NavelRock_Top/map.json index 8669e746f..c06202726 100644 --- a/data/maps/NavelRock_Top/map.json +++ b/data/maps/NavelRock_Top/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_TOP", "name": "NavelRock_Top", "layout": "LAYOUT_NAVEL_ROCK_TOP", - "music": "MUS_RG_NANADUNGEON", + "music": "MUS_RG_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_SHADE", diff --git a/data/maps/NavelRock_Up1/map.json b/data/maps/NavelRock_Up1/map.json index 01dfcaffa..ee744ff4b 100644 --- a/data/maps/NavelRock_Up1/map.json +++ b/data/maps/NavelRock_Up1/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_UP1", "name": "NavelRock_Up1", "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM1", - "music": "MUS_RG_NANADUNGEON", + "music": "MUS_RG_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_Up2/map.json b/data/maps/NavelRock_Up2/map.json index 0233edb78..aa2470329 100644 --- a/data/maps/NavelRock_Up2/map.json +++ b/data/maps/NavelRock_Up2/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_UP2", "name": "NavelRock_Up2", "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM2", - "music": "MUS_RG_NANADUNGEON", + "music": "MUS_RG_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_Up3/map.json b/data/maps/NavelRock_Up3/map.json index c12438fc9..2629eafb1 100644 --- a/data/maps/NavelRock_Up3/map.json +++ b/data/maps/NavelRock_Up3/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_UP3", "name": "NavelRock_Up3", "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM1", - "music": "MUS_RG_NANADUNGEON", + "music": "MUS_RG_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_Up4/map.json b/data/maps/NavelRock_Up4/map.json index 4cdcba842..4060a52a7 100644 --- a/data/maps/NavelRock_Up4/map.json +++ b/data/maps/NavelRock_Up4/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_UP4", "name": "NavelRock_Up4", "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM2", - "music": "MUS_RG_NANADUNGEON", + "music": "MUS_RG_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NewMauville_Entrance/map.json b/data/maps/NewMauville_Entrance/map.json index 71650200b..d66c5b13b 100644 --- a/data/maps/NewMauville_Entrance/map.json +++ b/data/maps/NewMauville_Entrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_NEW_MAUVILLE_ENTRANCE", "name": "NewMauville_Entrance", "layout": "LAYOUT_NEW_MAUVILLE_ENTRANCE", - "music": "MUS_M_DUNGON", + "music": "MUS_MT_PYRE", "region_map_section": "MAPSEC_NEW_MAUVILLE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NewMauville_Entrance/scripts.inc b/data/maps/NewMauville_Entrance/scripts.inc index 6d7d731de..d398a03ea 100644 --- a/data/maps/NewMauville_Entrance/scripts.inc +++ b/data/maps/NewMauville_Entrance/scripts.inc @@ -40,7 +40,7 @@ NewMauville_Entrance_EventScript_Door:: @ 82372FF setmetatile 4, 1, METATILE_Facility_NewMauvilleDoor_Open_Tile4, 0 setmetatile 5, 1, METATILE_Facility_NewMauvilleDoor_Open_Tile5, 1 special DrawWholeMapView - playse SE_BAN + playse SE_BANG setvar VAR_NEW_MAUVILLE_STATE, 1 releaseall end diff --git a/data/maps/NewMauville_Inside/map.json b/data/maps/NewMauville_Inside/map.json index 16127d699..eea119068 100644 --- a/data/maps/NewMauville_Inside/map.json +++ b/data/maps/NewMauville_Inside/map.json @@ -2,7 +2,7 @@ "id": "MAP_NEW_MAUVILLE_INSIDE", "name": "NewMauville_Inside", "layout": "LAYOUT_NEW_MAUVILLE_INSIDE", - "music": "MUS_M_DUNGON", + "music": "MUS_MT_PYRE", "region_map_section": "MAPSEC_NEW_MAUVILLE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/OldaleTown/map.json b/data/maps/OldaleTown/map.json index b16fb4044..ee6101ff6 100644 --- a/data/maps/OldaleTown/map.json +++ b/data/maps/OldaleTown/map.json @@ -2,7 +2,7 @@ "id": "MAP_OLDALE_TOWN", "name": "OldaleTown", "layout": "LAYOUT_OLDALE_TOWN", - "music": "MUS_MACHI_S4", + "music": "MUS_OLDALE", "region_map_section": "MAPSEC_OLDALE_TOWN", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/OldaleTown/scripts.inc b/data/maps/OldaleTown/scripts.inc index aeb0c3dbd..f99c65d2c 100644 --- a/data/maps/OldaleTown/scripts.inc +++ b/data/maps/OldaleTown/scripts.inc @@ -43,7 +43,7 @@ OldaleTown_EventScript_MartEmployee:: @ 81E8EFC goto_if_set FLAG_RECEIVED_POTION_OLDALE, OldaleTown_EventScript_ExplainPotion goto_if_set FLAG_TEMP_1, OldaleTown_EventScript_ExplainPotion setflag FLAG_TEMP_1 - playbgm MUS_TSURETEK, 0 + playbgm MUS_FOLLOW_ME, 0 msgbox OldaleTown_Text_IWorkAtPokemonMart, MSGBOX_DEFAULT closemessage switch VAR_FACING diff --git a/data/maps/OldaleTown_House1/map.json b/data/maps/OldaleTown_House1/map.json index 970294926..cd64357dc 100644 --- a/data/maps/OldaleTown_House1/map.json +++ b/data/maps/OldaleTown_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_OLDALE_TOWN_HOUSE1", "name": "OldaleTown_House1", "layout": "LAYOUT_HOUSE1", - "music": "MUS_MACHI_S4", + "music": "MUS_OLDALE", "region_map_section": "MAPSEC_OLDALE_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/OldaleTown_House2/map.json b/data/maps/OldaleTown_House2/map.json index 52c775f15..2347fc29a 100644 --- a/data/maps/OldaleTown_House2/map.json +++ b/data/maps/OldaleTown_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_OLDALE_TOWN_HOUSE2", "name": "OldaleTown_House2", "layout": "LAYOUT_HOUSE2", - "music": "MUS_MACHI_S4", + "music": "MUS_OLDALE", "region_map_section": "MAPSEC_OLDALE_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/OldaleTown_Mart/map.json b/data/maps/OldaleTown_Mart/map.json index cba6b012c..692223541 100644 --- a/data/maps/OldaleTown_Mart/map.json +++ b/data/maps/OldaleTown_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_OLDALE_TOWN_MART", "name": "OldaleTown_Mart", "layout": "LAYOUT_MART", - "music": "MUS_FRIENDLY", + "music": "MUS_POKE_MART", "region_map_section": "MAPSEC_OLDALE_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/OldaleTown_PokemonCenter_1F/map.json b/data/maps/OldaleTown_PokemonCenter_1F/map.json index 1c979098e..46ee3f9bd 100644 --- a/data/maps/OldaleTown_PokemonCenter_1F/map.json +++ b/data/maps/OldaleTown_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_OLDALE_TOWN_POKEMON_CENTER_1F", "name": "OldaleTown_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_OLDALE_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/OldaleTown_PokemonCenter_2F/map.json b/data/maps/OldaleTown_PokemonCenter_2F/map.json index de1b0a771..fdeb28c06 100644 --- a/data/maps/OldaleTown_PokemonCenter_2F/map.json +++ b/data/maps/OldaleTown_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_OLDALE_TOWN_POKEMON_CENTER_2F", "name": "OldaleTown_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_OLDALE_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PacifidlogTown/map.json b/data/maps/PacifidlogTown/map.json index fdf43d1ac..51fc772a9 100644 --- a/data/maps/PacifidlogTown/map.json +++ b/data/maps/PacifidlogTown/map.json @@ -2,7 +2,7 @@ "id": "MAP_PACIFIDLOG_TOWN", "name": "PacifidlogTown", "layout": "LAYOUT_PACIFIDLOG_TOWN", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_PACIFIDLOG_TOWN", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/PacifidlogTown_House1/map.json b/data/maps/PacifidlogTown_House1/map.json index b6db1c923..a494819a5 100644 --- a/data/maps/PacifidlogTown_House1/map.json +++ b/data/maps/PacifidlogTown_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_PACIFIDLOG_TOWN_HOUSE1", "name": "PacifidlogTown_House1", "layout": "LAYOUT_PACIFIDLOG_TOWN_HOUSE1", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_PACIFIDLOG_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PacifidlogTown_House2/map.json b/data/maps/PacifidlogTown_House2/map.json index ceeadd9a6..027442b4b 100644 --- a/data/maps/PacifidlogTown_House2/map.json +++ b/data/maps/PacifidlogTown_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_PACIFIDLOG_TOWN_HOUSE2", "name": "PacifidlogTown_House2", "layout": "LAYOUT_PACIFIDLOG_TOWN_HOUSE2", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_PACIFIDLOG_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PacifidlogTown_House3/map.json b/data/maps/PacifidlogTown_House3/map.json index 34d9ddad2..17f99cea1 100644 --- a/data/maps/PacifidlogTown_House3/map.json +++ b/data/maps/PacifidlogTown_House3/map.json @@ -2,7 +2,7 @@ "id": "MAP_PACIFIDLOG_TOWN_HOUSE3", "name": "PacifidlogTown_House3", "layout": "LAYOUT_PACIFIDLOG_TOWN_HOUSE1", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_PACIFIDLOG_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PacifidlogTown_House4/map.json b/data/maps/PacifidlogTown_House4/map.json index cd8dfc52f..4c4cdb15b 100644 --- a/data/maps/PacifidlogTown_House4/map.json +++ b/data/maps/PacifidlogTown_House4/map.json @@ -2,7 +2,7 @@ "id": "MAP_PACIFIDLOG_TOWN_HOUSE4", "name": "PacifidlogTown_House4", "layout": "LAYOUT_PACIFIDLOG_TOWN_HOUSE2", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_PACIFIDLOG_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PacifidlogTown_House5/map.json b/data/maps/PacifidlogTown_House5/map.json index e1d6f4289..ac9384502 100644 --- a/data/maps/PacifidlogTown_House5/map.json +++ b/data/maps/PacifidlogTown_House5/map.json @@ -2,7 +2,7 @@ "id": "MAP_PACIFIDLOG_TOWN_HOUSE5", "name": "PacifidlogTown_House5", "layout": "LAYOUT_PACIFIDLOG_TOWN_HOUSE1", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_PACIFIDLOG_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/map.json b/data/maps/PacifidlogTown_PokemonCenter_1F/map.json index 20d00fecb..50baa2b7c 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_1F/map.json +++ b/data/maps/PacifidlogTown_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F", "name": "PacifidlogTown_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_PACIFIDLOG_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PacifidlogTown_PokemonCenter_2F/map.json b/data/maps/PacifidlogTown_PokemonCenter_2F/map.json index 97b48ef2e..1837ab55c 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_2F/map.json +++ b/data/maps/PacifidlogTown_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_2F", "name": "PacifidlogTown_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_PACIFIDLOG_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PetalburgCity/map.json b/data/maps/PetalburgCity/map.json index 03c0950ca..d9587cdbb 100644 --- a/data/maps/PetalburgCity/map.json +++ b/data/maps/PetalburgCity/map.json @@ -2,7 +2,7 @@ "id": "MAP_PETALBURG_CITY", "name": "PetalburgCity", "layout": "LAYOUT_PETALBURG_CITY", - "music": "MUS_MACHI_S2", + "music": "MUS_PETALBURG", "region_map_section": "MAPSEC_PETALBURG_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", @@ -35,8 +35,8 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgCity_EventScript_WallyAunt", - "flag": "FLAG_HIDE_PETALBURG_CITY_WALLYS_AUNT" + "script": "PetalburgCity_EventScript_WallysMom", + "flag": "FLAG_HIDE_PETALBURG_CITY_WALLYS_MOM" }, { "graphics_id": "OBJ_EVENT_GFX_WALLY", @@ -88,7 +88,7 @@ "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", - "flag": "FLAG_HIDE_PETALBURG_CITY_WALLYS_UNCLE" + "flag": "FLAG_HIDE_PETALBURG_CITY_WALLYS_DAD" }, { "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", diff --git a/data/maps/PetalburgCity/scripts.inc b/data/maps/PetalburgCity/scripts.inc index b7df04857..ab77e18e0 100644 --- a/data/maps/PetalburgCity/scripts.inc +++ b/data/maps/PetalburgCity/scripts.inc @@ -1,6 +1,6 @@ .set LOCALID_WALLY, 2 .set LOCALID_BOY, 3 -.set LOCALID_WALLYS_UNCLE, 5 +.set LOCALID_WALLYS_DAD, 5 .set LOCALID_GYM_BOY, 8 .set LOCALID_SCOTT, 9 @@ -27,7 +27,7 @@ PetalburgCity_EventScript_MoveGymBoyToWestEntrance:: @ 81DC307 PetalburgCity_EventScript_DisableMapNameAndMusic:: @ 81DC30F setflag FLAG_HIDE_MAP_NAME_POPUP - savebgm MUS_TSURETEK + savebgm MUS_FOLLOW_ME return PetalburgCity_EventScript_SetGymDoorsUnlocked:: @ 81DC316 @@ -68,17 +68,17 @@ PetalburgCity_EventScript_WallyTutorial:: @ 81DC32E PetalburgCity_EventScript_WalkToWallyHouse:: @ 81DC390 lockall setflag FLAG_HIDE_MAP_NAME_POPUP - applymovement LOCALID_WALLYS_UNCLE, PetalburgCity_Movement_WalkToWallyHouseUncle + applymovement LOCALID_WALLYS_DAD, PetalburgCity_Movement_WalkToWallyHouseWallysDad applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Movement_WalkToWallyHousePlayer waitmovement 0 setvar VAR_0x8004, 7 setvar VAR_0x8005, 5 opendoor VAR_0x8004, VAR_0x8005 waitdooranim - applymovement LOCALID_WALLYS_UNCLE, PetalburgCity_Movement_WalkInsideHouseUncle + applymovement LOCALID_WALLYS_DAD, PetalburgCity_Movement_WalkInsideHouseWallysDad applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Movement_WalkInsideHousePlayer waitmovement 0 - setflag FLAG_HIDE_PETALBURG_CITY_WALLYS_UNCLE + setflag FLAG_HIDE_PETALBURG_CITY_WALLYS_DAD hideobjectat OBJ_EVENT_ID_PLAYER, MAP_PETALBURG_CITY closedoor VAR_0x8004, VAR_0x8005 waitdooranim @@ -100,7 +100,7 @@ PetalburgCity_EventScript_Boy:: @ 81DC3E6 release end -PetalburgCity_EventScript_WallyAunt:: @ 81DC3FD +PetalburgCity_EventScript_WallysMom:: @ 81DC3FD msgbox PetalburgCity_Text_WhereIsWally, MSGBOX_NPC end @@ -129,7 +129,7 @@ PetalburgCity_Movement_WalkInsideHousePlayer: @ 81DC418 walk_up step_end -PetalburgCity_Movement_WalkToWallyHouseUncle: @ 81DC41B +PetalburgCity_Movement_WalkToWallyHouseWallysDad: @ 81DC41B delay_8 walk_down walk_down @@ -149,7 +149,7 @@ PetalburgCity_Movement_WalkToWallyHouseUncle: @ 81DC41B walk_up step_end -PetalburgCity_Movement_WalkInsideHouseUncle: @ 81DC42D +PetalburgCity_Movement_WalkInsideHouseWallysDad: @ 81DC42D walk_up set_invisible step_end @@ -271,7 +271,7 @@ PetalburgCity_EventScript_ShowGymToPlayer3:: @ 81DC4BE PetalburgCity_EventScript_ShowGymToPlayer:: @ 81DC4CA applymovement LOCALID_GYM_BOY, Common_Movement_FacePlayer waitmovement 0 - playbgm MUS_TSURETEK, 0 + playbgm MUS_FOLLOW_ME, 0 playse SE_PIN applymovement LOCALID_GYM_BOY, Common_Movement_ExclamationMark waitmovement 0 diff --git a/data/maps/PetalburgCity_Gym/map.json b/data/maps/PetalburgCity_Gym/map.json index ca074547f..307708fc1 100644 --- a/data/maps/PetalburgCity_Gym/map.json +++ b/data/maps/PetalburgCity_Gym/map.json @@ -2,7 +2,7 @@ "id": "MAP_PETALBURG_CITY_GYM", "name": "PetalburgCity_Gym", "layout": "LAYOUT_PETALBURG_CITY_GYM", - "music": "MUS_GIM", + "music": "MUS_GYM", "region_map_section": "MAPSEC_PETALBURG_CITY", "requires_flash": false, "weather": "WEATHER_NONE", @@ -155,7 +155,7 @@ "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", - "flag": "FLAG_HIDE_PETALBURG_GYM_WALLYS_UNCLE" + "flag": "FLAG_HIDE_PETALBURG_GYM_WALLYS_DAD" } ], "warp_events": [ diff --git a/data/maps/PetalburgCity_Gym/scripts.inc b/data/maps/PetalburgCity_Gym/scripts.inc index 5df31917f..2bdd5320f 100644 --- a/data/maps/PetalburgCity_Gym/scripts.inc +++ b/data/maps/PetalburgCity_Gym/scripts.inc @@ -1,6 +1,6 @@ .set LOCALID_NORMAN, 1 .set LOCALID_WALLY, 10 -.set LOCALID_WALLYS_UNCLE, 11 +.set LOCALID_WALLYS_DAD, 11 PetalburgCity_Gym_MapScripts:: @ 8204889 map_script MAP_SCRIPT_ON_LOAD, PetalburgCity_Gym_OnLoad @@ -91,7 +91,7 @@ PetalburgCity_Gym_EventScript_ReturnFromWallyTutorial:: @ 82049A4 applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown applymovement LOCALID_WALLY, PetalburgCity_Gym_Movement_WallyExitGym waitmovement 0 - playse SE_KAIDAN + playse SE_EXIT removeobject LOCALID_WALLY setflag FLAG_HIDE_PETALBURG_CITY_WALLY delay 30 @@ -203,7 +203,7 @@ PetalburgCity_Gym_EventScript_BeginWallyTutorial:: @ 8204AAC msgbox PetalburgCity_Gym_Text_WouldYouReallyComeWithMe, MSGBOX_DEFAULT closemessage setflag FLAG_DONT_TRANSITION_MUSIC - playbgm MUS_TSURETEK, 0 + playbgm MUS_FOLLOW_ME, 0 compare VAR_0x8008, 0 call_if_eq PetalburgCity_Gym_EventScript_ExitGymWithWallySouth compare VAR_0x8008, 1 @@ -213,7 +213,7 @@ PetalburgCity_Gym_EventScript_BeginWallyTutorial:: @ 8204AAC compare VAR_0x8008, 3 call_if_eq PetalburgCity_Gym_EventScript_ExitGymWithWallyEast removeobject LOCALID_WALLY - setflag FLAG_HIDE_PETALBURG_CITY_WALLYS_AUNT + setflag FLAG_HIDE_PETALBURG_CITY_WALLYS_MOM setvar VAR_PETALBURG_GYM_STATE, 1 setvar VAR_PETALBURG_CITY_STATE, 2 clearflag FLAG_HIDE_PETALBURG_CITY_WALLY @@ -433,11 +433,11 @@ PetalburgCity_Gym_EventScript_NormanBattle:: @ 8204E3B delay 40 playse SE_DOOR delay 10 - addobject LOCALID_WALLYS_UNCLE + addobject LOCALID_WALLYS_DAD switch VAR_FACING - case DIR_NORTH, PetalburgCity_Gym_EventScript_WallysUncleArrivesNorth - case DIR_WEST, PetalburgCity_Gym_EventScript_WallysUncleArrivesWest - case DIR_EAST, PetalburgCity_Gym_EventScript_WallysUncleArrivesEast + case DIR_NORTH, PetalburgCity_Gym_EventScript_WallysDadArrivesNorth + case DIR_WEST, PetalburgCity_Gym_EventScript_WallysDadArrivesWest + case DIR_EAST, PetalburgCity_Gym_EventScript_WallysDadArrivesEast end PetalburgCity_Gym_EventScript_GiveFacade:: @ 8204ED2 @@ -448,119 +448,119 @@ PetalburgCity_Gym_EventScript_GiveFacade:: @ 8204ED2 msgbox PetalburgCity_Gym_Text_ExplainFacade, MSGBOX_DEFAULT return -PetalburgCity_Gym_EventScript_WallysUncleArrivesNorth:: @ 8204EF5 +PetalburgCity_Gym_EventScript_WallysDadArrivesNorth:: @ 8204EF5 setvar VAR_0x8008, 1 - goto PetalburgCity_Gym_EventScript_WallysUncleArrives + goto PetalburgCity_Gym_EventScript_WallysDadArrives -PetalburgCity_Gym_EventScript_WallysUncleArrivesEast:: @ 8204EFF +PetalburgCity_Gym_EventScript_WallysDadArrivesEast:: @ 8204EFF setvar VAR_0x8008, 2 - goto PetalburgCity_Gym_EventScript_WallysUncleArrives + goto PetalburgCity_Gym_EventScript_WallysDadArrives -PetalburgCity_Gym_EventScript_WallysUncleArrivesWest:: @ 8204F09 +PetalburgCity_Gym_EventScript_WallysDadArrivesWest:: @ 8204F09 setvar VAR_0x8008, 3 - goto PetalburgCity_Gym_EventScript_WallysUncleArrives + goto PetalburgCity_Gym_EventScript_WallysDadArrives -PetalburgCity_Gym_EventScript_WallysUncleArrives:: @ 8204F13 - applymovement LOCALID_WALLYS_UNCLE, PetalburgCity_Gym_Movement_WallysUncleEnterGym +PetalburgCity_Gym_EventScript_WallysDadArrives:: @ 8204F13 + applymovement LOCALID_WALLYS_DAD, PetalburgCity_Gym_Movement_WallysDadEnterGym waitmovement 0 playse SE_PIN - applymovement LOCALID_WALLYS_UNCLE, Common_Movement_ExclamationMark + applymovement LOCALID_WALLYS_DAD, Common_Movement_ExclamationMark waitmovement 0 - applymovement LOCALID_WALLYS_UNCLE, Common_Movement_Delay48 + applymovement LOCALID_WALLYS_DAD, Common_Movement_Delay48 waitmovement 0 delay 10 compare VAR_0x8008, 1 - call_if_eq PetalburgCity_Gym_EventScript_WallysUncleApproachPlayerNorth + call_if_eq PetalburgCity_Gym_EventScript_WallysDadApproachPlayerNorth compare VAR_0x8008, 2 - call_if_eq PetalburgCity_Gym_EventScript_WallysUncleApproachPlayerEast + call_if_eq PetalburgCity_Gym_EventScript_WallysDadApproachPlayerEast compare VAR_0x8008, 3 - call_if_eq PetalburgCity_Gym_EventScript_WallysUncleApproachPlayerWest + call_if_eq PetalburgCity_Gym_EventScript_WallysDadApproachPlayerWest msgbox PetalburgCity_Gym_Text_PleaseComeWithMe, MSGBOX_DEFAULT closemessage delay 20 compare VAR_0x8008, 1 - call_if_eq PetalburgCity_Gym_EventScript_WallysUncleFaceNormanNorth + call_if_eq PetalburgCity_Gym_EventScript_WallysDadFaceNormanNorth compare VAR_0x8008, 2 - call_if_eq PetalburgCity_Gym_EventScript_WallysUncleFaceNormanEast + call_if_eq PetalburgCity_Gym_EventScript_WallysDadFaceNormanEast compare VAR_0x8008, 3 - call_if_eq PetalburgCity_Gym_EventScript_WallysUncleFaceNormanWest + call_if_eq PetalburgCity_Gym_EventScript_WallysDadFaceNormanWest msgbox PetalburgCity_Gym_Text_LetMeBorrowPlayer, MSGBOX_DEFAULT closemessage setflag FLAG_DONT_TRANSITION_MUSIC - playbgm MUS_TSURETEK, 0 + playbgm MUS_FOLLOW_ME, 0 compare VAR_0x8008, 1 - call_if_eq PetalburgCity_Gym_EventScript_ExitGymWithWallysUncleNorth + call_if_eq PetalburgCity_Gym_EventScript_ExitGymWithWallysDadNorth compare VAR_0x8008, 2 - call_if_eq PetalburgCity_Gym_EventScript_ExitGymWithWallysUncleEast + call_if_eq PetalburgCity_Gym_EventScript_ExitGymWithWallysDadEast compare VAR_0x8008, 3 - call_if_eq PetalburgCity_Gym_EventScript_ExitGymWithWallysUncleWest - removeobject LOCALID_WALLYS_UNCLE + call_if_eq PetalburgCity_Gym_EventScript_ExitGymWithWallysDadWest + removeobject LOCALID_WALLYS_DAD setvar VAR_PETALBURG_CITY_STATE, 4 - clearflag FLAG_HIDE_PETALBURG_CITY_WALLYS_UNCLE + clearflag FLAG_HIDE_PETALBURG_CITY_WALLYS_DAD warp MAP_PETALBURG_CITY, 255, 15, 8 waitstate release end -PetalburgCity_Gym_EventScript_WallysUncleFaceNormanNorth:: @ 8204FCC - applymovement LOCALID_WALLYS_UNCLE, Common_Movement_WalkInPlaceFastestUp +PetalburgCity_Gym_EventScript_WallysDadFaceNormanNorth:: @ 8204FCC + applymovement LOCALID_WALLYS_DAD, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return -PetalburgCity_Gym_EventScript_WallysUncleFaceNormanEast:: @ 8204FD7 - applymovement LOCALID_WALLYS_UNCLE, Common_Movement_WalkInPlaceFastestRight +PetalburgCity_Gym_EventScript_WallysDadFaceNormanEast:: @ 8204FD7 + applymovement LOCALID_WALLYS_DAD, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return -PetalburgCity_Gym_EventScript_WallysUncleFaceNormanWest:: @ 8204FE2 - applymovement LOCALID_WALLYS_UNCLE, Common_Movement_WalkInPlaceFastestLeft +PetalburgCity_Gym_EventScript_WallysDadFaceNormanWest:: @ 8204FE2 + applymovement LOCALID_WALLYS_DAD, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return -PetalburgCity_Gym_EventScript_WallysUncleApproachPlayerNorth:: @ 8204FED - applymovement LOCALID_WALLYS_UNCLE, PetalburgCity_Gym_Movement_WallysUncleApproachPlayerNorth +PetalburgCity_Gym_EventScript_WallysDadApproachPlayerNorth:: @ 8204FED + applymovement LOCALID_WALLYS_DAD, PetalburgCity_Gym_Movement_WallysDadApproachPlayerNorth waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return -PetalburgCity_Gym_EventScript_WallysUncleApproachPlayerEast:: @ 8205009 - applymovement LOCALID_WALLYS_UNCLE, PetalburgCity_Gym_Movement_WallysUncleApproachPlayerEast +PetalburgCity_Gym_EventScript_WallysDadApproachPlayerEast:: @ 8205009 + applymovement LOCALID_WALLYS_DAD, PetalburgCity_Gym_Movement_WallysDadApproachPlayerEast waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return -PetalburgCity_Gym_EventScript_WallysUncleApproachPlayerWest:: @ 8205025 - applymovement LOCALID_WALLYS_UNCLE, PetalburgCity_Gym_Movement_WallysUncleApproachPlayerWest +PetalburgCity_Gym_EventScript_WallysDadApproachPlayerWest:: @ 8205025 + applymovement LOCALID_WALLYS_DAD, PetalburgCity_Gym_Movement_WallysDadApproachPlayerWest waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return -PetalburgCity_Gym_EventScript_ExitGymWithWallysUncleNorth:: @ 8205041 - applymovement LOCALID_WALLYS_UNCLE, PetalburgCity_Gym_Movement_WallysUncleExitNorth +PetalburgCity_Gym_EventScript_ExitGymWithWallysDadNorth:: @ 8205041 + applymovement LOCALID_WALLYS_DAD, PetalburgCity_Gym_Movement_WallysDadExitNorth applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFastestDown - applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallysUncleNorth + applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallysDadNorth waitmovement 0 return -PetalburgCity_Gym_EventScript_ExitGymWithWallysUncleEast:: @ 820505A - applymovement LOCALID_WALLYS_UNCLE, PetalburgCity_Gym_Movement_WallysUncleExitEast - applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallysUncleEast +PetalburgCity_Gym_EventScript_ExitGymWithWallysDadEast:: @ 820505A + applymovement LOCALID_WALLYS_DAD, PetalburgCity_Gym_Movement_WallysDadExitEast + applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallysDadEast waitmovement 0 return -PetalburgCity_Gym_EventScript_ExitGymWithWallysUncleWest:: @ 820506C - applymovement LOCALID_WALLYS_UNCLE, PetalburgCity_Gym_Movement_WallysUncleExitWest - applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallysUncleWest +PetalburgCity_Gym_EventScript_ExitGymWithWallysDadWest:: @ 820506C + applymovement LOCALID_WALLYS_DAD, PetalburgCity_Gym_Movement_WallysDadExitWest + applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallysDadWest waitmovement 0 return -PetalburgCity_Gym_Movement_WallysUncleExitNorth: @ 820507E +PetalburgCity_Gym_Movement_WallysDadExitNorth: @ 820507E walk_down walk_down walk_left @@ -573,7 +573,7 @@ PetalburgCity_Gym_Movement_WallysUncleExitNorth: @ 820507E set_invisible step_end -PetalburgCity_Gym_Movement_WallysUncleExitEast: @ 8205089 +PetalburgCity_Gym_Movement_WallysDadExitEast: @ 8205089 walk_down walk_down walk_left @@ -586,7 +586,7 @@ PetalburgCity_Gym_Movement_WallysUncleExitEast: @ 8205089 set_invisible step_end -PetalburgCity_Gym_Movement_WallysUncleExitWest: @ 8205094 +PetalburgCity_Gym_Movement_WallysDadExitWest: @ 8205094 walk_down walk_down walk_left @@ -601,7 +601,7 @@ PetalburgCity_Gym_Movement_WallysUncleExitWest: @ 8205094 set_invisible step_end -PetalburgCity_Gym_Movement_PlayerExitWithWallysUncleNorth: @ 82050A1 +PetalburgCity_Gym_Movement_PlayerExitWithWallysDadNorth: @ 82050A1 delay_16 walk_down walk_down @@ -611,7 +611,7 @@ PetalburgCity_Gym_Movement_PlayerExitWithWallysUncleNorth: @ 82050A1 walk_down step_end -PetalburgCity_Gym_Movement_PlayerExitWithWallysUncleEast: @ 82050A9 +PetalburgCity_Gym_Movement_PlayerExitWithWallysDadEast: @ 82050A9 delay_16 walk_down walk_down @@ -621,7 +621,7 @@ PetalburgCity_Gym_Movement_PlayerExitWithWallysUncleEast: @ 82050A9 walk_down step_end -PetalburgCity_Gym_Movement_PlayerExitWithWallysUncleWest: @ 82050B1 +PetalburgCity_Gym_Movement_PlayerExitWithWallysDadWest: @ 82050B1 delay_16 walk_down walk_down @@ -633,7 +633,7 @@ PetalburgCity_Gym_Movement_PlayerExitWithWallysUncleWest: @ 82050B1 walk_down step_end -PetalburgCity_Gym_Movement_WallysUncleEnterGym: @ 82050BB +PetalburgCity_Gym_Movement_WallysDadEnterGym: @ 82050BB walk_up delay_8 walk_in_place_fastest_right @@ -643,7 +643,7 @@ PetalburgCity_Gym_Movement_WallysUncleEnterGym: @ 82050BB walk_in_place_fastest_up step_end -PetalburgCity_Gym_Movement_WallysUncleApproachPlayerNorth: @ 82050C3 +PetalburgCity_Gym_Movement_WallysDadApproachPlayerNorth: @ 82050C3 walk_right walk_right walk_up @@ -652,7 +652,7 @@ PetalburgCity_Gym_Movement_WallysUncleApproachPlayerNorth: @ 82050C3 walk_in_place_fastest_right step_end -PetalburgCity_Gym_Movement_WallysUncleApproachPlayerEast: @ 82050CA +PetalburgCity_Gym_Movement_WallysDadApproachPlayerEast: @ 82050CA walk_right walk_right walk_up @@ -660,7 +660,7 @@ PetalburgCity_Gym_Movement_WallysUncleApproachPlayerEast: @ 82050CA walk_up step_end -PetalburgCity_Gym_Movement_WallysUncleApproachPlayerWest: @ 82050D0 +PetalburgCity_Gym_Movement_WallysDadApproachPlayerWest: @ 82050D0 walk_right walk_right walk_up diff --git a/data/maps/PetalburgCity_House1/map.json b/data/maps/PetalburgCity_House1/map.json index 46121f67c..54bd3303f 100644 --- a/data/maps/PetalburgCity_House1/map.json +++ b/data/maps/PetalburgCity_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_PETALBURG_CITY_HOUSE1", "name": "PetalburgCity_House1", "layout": "LAYOUT_HOUSE1", - "music": "MUS_MACHI_S2", + "music": "MUS_PETALBURG", "region_map_section": "MAPSEC_PETALBURG_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PetalburgCity_House2/map.json b/data/maps/PetalburgCity_House2/map.json index 8f40ec3e4..4a5436b97 100644 --- a/data/maps/PetalburgCity_House2/map.json +++ b/data/maps/PetalburgCity_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_PETALBURG_CITY_HOUSE2", "name": "PetalburgCity_House2", "layout": "LAYOUT_HOUSE_WITH_BED", - "music": "MUS_MACHI_S2", + "music": "MUS_PETALBURG", "region_map_section": "MAPSEC_PETALBURG_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PetalburgCity_Mart/map.json b/data/maps/PetalburgCity_Mart/map.json index a263e3036..a55e27293 100644 --- a/data/maps/PetalburgCity_Mart/map.json +++ b/data/maps/PetalburgCity_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_PETALBURG_CITY_MART", "name": "PetalburgCity_Mart", "layout": "LAYOUT_MART", - "music": "MUS_FRIENDLY", + "music": "MUS_POKE_MART", "region_map_section": "MAPSEC_PETALBURG_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/map.json b/data/maps/PetalburgCity_PokemonCenter_1F/map.json index 29ba086f2..1fd6e972b 100644 --- a/data/maps/PetalburgCity_PokemonCenter_1F/map.json +++ b/data/maps/PetalburgCity_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_PETALBURG_CITY_POKEMON_CENTER_1F", "name": "PetalburgCity_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_PETALBURG_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PetalburgCity_PokemonCenter_2F/map.json b/data/maps/PetalburgCity_PokemonCenter_2F/map.json index 2fd4bf21a..8eb89d208 100644 --- a/data/maps/PetalburgCity_PokemonCenter_2F/map.json +++ b/data/maps/PetalburgCity_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_PETALBURG_CITY_POKEMON_CENTER_2F", "name": "PetalburgCity_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_PETALBURG_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PetalburgCity_WallysHouse/map.json b/data/maps/PetalburgCity_WallysHouse/map.json index 172cf3e2e..0b8007a91 100644 --- a/data/maps/PetalburgCity_WallysHouse/map.json +++ b/data/maps/PetalburgCity_WallysHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_PETALBURG_CITY_WALLYS_HOUSE", "name": "PetalburgCity_WallysHouse", "layout": "LAYOUT_HOUSE2", - "music": "MUS_MACHI_S2", + "music": "MUS_PETALBURG", "region_map_section": "MAPSEC_PETALBURG_CITY", "requires_flash": false, "weather": "WEATHER_NONE", @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgCity_WallysHouse_EventScript_WallyUncle", + "script": "PetalburgCity_WallysHouse_EventScript_WallysDad", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgCity_WallysHouse_EventScript_WallyAunt", + "script": "PetalburgCity_WallysHouse_EventScript_WallysMom", "flag": "0" } ], diff --git a/data/maps/PetalburgCity_WallysHouse/scripts.inc b/data/maps/PetalburgCity_WallysHouse/scripts.inc index a46f5d78d..1e4e75987 100644 --- a/data/maps/PetalburgCity_WallysHouse/scripts.inc +++ b/data/maps/PetalburgCity_WallysHouse/scripts.inc @@ -1,4 +1,4 @@ -.set LOCALID_WALLYS_UNCLE, 1 +.set LOCALID_WALLYS_DAD, 1 PetalburgCity_WallysHouse_MapScripts:: @ 8204229 map_script MAP_SCRIPT_ON_FRAME_TABLE, PetalburgCity_WallysHouse_OnFrame @@ -6,12 +6,12 @@ PetalburgCity_WallysHouse_MapScripts:: @ 8204229 .byte 0 PetalburgCity_WallysHouse_OnWarp: @ 8204234 - map_script_2 VAR_PETALBURG_CITY_STATE, 4, PetalburgCity_WallysHouse_EventScript_PlayerUncleFaceEachOther + map_script_2 VAR_PETALBURG_CITY_STATE, 4, PetalburgCity_WallysHouse_EventScript_PlayerWallysDadFaceEachOther .2byte 0 -PetalburgCity_WallysHouse_EventScript_PlayerUncleFaceEachOther:: @ 820423E +PetalburgCity_WallysHouse_EventScript_PlayerWallysDadFaceEachOther:: @ 820423E turnobject OBJ_EVENT_ID_PLAYER, DIR_EAST - turnobject LOCALID_WALLYS_UNCLE, DIR_WEST + turnobject LOCALID_WALLYS_DAD, DIR_WEST end PetalburgCity_WallysHouse_OnFrame: @ 8204247 @@ -28,7 +28,7 @@ PetalburgCity_WallysHouse_EventScript_GiveHM03Surf:: @ 8204251 releaseall end -PetalburgCity_WallysHouse_EventScript_WallyUncle:: @ 8204278 +PetalburgCity_WallysHouse_EventScript_WallysDad:: @ 8204278 lock faceplayer goto_if_set FLAG_DEFEATED_WALLY_VICTORY_ROAD, PetalburgCity_WallysHouse_EventScript_DefeatedWallyInVictoryRoad @@ -54,7 +54,7 @@ PetalburgCity_WallysHouse_EventScript_PlayedWithWally:: @ 82042B6 release end -PetalburgCity_WallysHouse_EventScript_WallyAunt:: @ 82042C0 +PetalburgCity_WallysHouse_EventScript_WallysMom:: @ 82042C0 lock faceplayer goto_if_set FLAG_RECEIVED_HM03, PetalburgCity_WallysHouse_EventScript_ReceivedHM03Surf diff --git a/data/maps/PetalburgWoods/map.json b/data/maps/PetalburgWoods/map.json index cc9004737..fa97b5dd1 100644 --- a/data/maps/PetalburgWoods/map.json +++ b/data/maps/PetalburgWoods/map.json @@ -2,7 +2,7 @@ "id": "MAP_PETALBURG_WOODS", "name": "PetalburgWoods", "layout": "LAYOUT_PETALBURG_WOODS", - "music": "MUS_DAN01", + "music": "MUS_PETALBURG_WOODS", "region_map_section": "MAPSEC_PETALBURG_WOODS", "requires_flash": false, "weather": "WEATHER_SHADE", diff --git a/data/maps/PetalburgWoods/scripts.inc b/data/maps/PetalburgWoods/scripts.inc index 292c2dfac..dbdb66b0b 100644 --- a/data/maps/PetalburgWoods/scripts.inc +++ b/data/maps/PetalburgWoods/scripts.inc @@ -11,7 +11,7 @@ PetalburgWoods_EventScript_DevonResearcherLeft:: @ 822DFD7 waitmovement 0 msgbox PetalburgWoods_Text_HaveYouSeenShroomish, MSGBOX_DEFAULT closemessage - playbgm MUS_AQA_0, 0 + playbgm MUS_ENCOUNTER_AQUA, 0 applymovement LOCALID_GRUNT, PetalburgWoods_Movement_AquaEntrance waitmovement 0 msgbox PetalburgWoods_Text_IWasGoingToAmbushYou, MSGBOX_DEFAULT @@ -48,7 +48,7 @@ PetalburgWoods_EventScript_DevonResearcherRight:: @ 822E079 waitmovement 0 msgbox PetalburgWoods_Text_HaveYouSeenShroomish, MSGBOX_DEFAULT closemessage - playbgm MUS_AQA_0, 0 + playbgm MUS_ENCOUNTER_AQUA, 0 applymovement LOCALID_GRUNT, PetalburgWoods_Movement_AquaEntrance waitmovement 0 msgbox PetalburgWoods_Text_IWasGoingToAmbushYou, MSGBOX_DEFAULT diff --git a/data/maps/RecordCorner/map.json b/data/maps/RecordCorner/map.json index f3466eea8..083f44445 100644 --- a/data/maps/RecordCorner/map.json +++ b/data/maps/RecordCorner/map.json @@ -2,7 +2,7 @@ "id": "MAP_RECORD_CORNER", "name": "RecordCorner", "layout": "LAYOUT_RECORD_CORNER", - "music": "MUS_RAINBOW", + "music": "MUS_EVER_GRANDE", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route101/map.json b/data/maps/Route101/map.json index e08c4fe5a..34dc92841 100644 --- a/data/maps/Route101/map.json +++ b/data/maps/Route101/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE101", "name": "Route101", "layout": "LAYOUT_ROUTE101", - "music": "MUS_DOORO1", + "music": "MUS_ROUTE101", "region_map_section": "MAPSEC_ROUTE_101", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route101/scripts.inc b/data/maps/Route101/scripts.inc index 647c9ee16..66ce4abc8 100644 --- a/data/maps/Route101/scripts.inc +++ b/data/maps/Route101/scripts.inc @@ -21,7 +21,7 @@ Route101_EventScript_HideMapNamePopup:: @ 81EBCD5 Route101_EventScript_StartBirchRescue:: @ 81EBCDE lockall - playbgm MUS_EVENT0, 1 + playbgm MUS_HELP, 1 msgbox Route101_Text_HelpMe, MSGBOX_DEFAULT closemessage setobjectxy LOCALID_BIRCH, 0, 15 diff --git a/data/maps/Route102/map.json b/data/maps/Route102/map.json index 43e327d01..fc9adee3b 100644 --- a/data/maps/Route102/map.json +++ b/data/maps/Route102/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE102", "name": "Route102", "layout": "LAYOUT_ROUTE102", - "music": "MUS_DOORO1", + "music": "MUS_ROUTE101", "region_map_section": "MAPSEC_ROUTE_102", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route103/map.json b/data/maps/Route103/map.json index 599d0447f..4b91f913b 100644 --- a/data/maps/Route103/map.json +++ b/data/maps/Route103/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE103", "name": "Route103", "layout": "LAYOUT_ROUTE103", - "music": "MUS_DOORO1", + "music": "MUS_ROUTE101", "region_map_section": "MAPSEC_ROUTE_103", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route103/scripts.inc b/data/maps/Route103/scripts.inc index df8c3b628..965b5ff5c 100644 --- a/data/maps/Route103/scripts.inc +++ b/data/maps/Route103/scripts.inc @@ -31,7 +31,7 @@ Route103_EventScript_Rival:: @ 81EC3C1 Route103_EventScript_RivalMay:: @ 81EC3DA msgbox Route103_Text_MayRoute103Pokemon, MSGBOX_DEFAULT closemessage - playbgm MUS_GIRL_SUP, 1 + playbgm MUS_ENCOUNTER_MAY, 1 applymovement LOCALID_RIVAL, Common_Movement_FacePlayer waitmovement 0 applymovement LOCALID_RIVAL, Common_Movement_ExclamationMark @@ -48,7 +48,7 @@ Route103_EventScript_RivalMay:: @ 81EC3DA Route103_EventScript_RivalBrendan:: @ 81EC434 msgbox Route103_Text_BrendanRoute103Pokemon, MSGBOX_DEFAULT closemessage - playbgm MUS_BOY_SUP, 1 + playbgm MUS_ENCOUNTER_BRENDAN, 1 applymovement LOCALID_RIVAL, Common_Movement_FacePlayer waitmovement 0 applymovement LOCALID_RIVAL, Common_Movement_ExclamationMark @@ -115,7 +115,7 @@ Route103_EventScript_RivalExitFacingNorth:: @ 81EC53D applymovement OBJ_EVENT_ID_PLAYER, Route103_Movement_WatchRivalExitFacingNorth applymovement LOCALID_RIVAL, Route103_Movement_RivalExitFacingNorth1 waitmovement 0 - playse SE_DANSA + playse SE_LEDGE applymovement LOCALID_RIVAL, Route103_EventScript_RivalExitFacingNorth2 waitmovement 0 goto Route103_EventScript_RivalEnd @@ -125,7 +125,7 @@ Route103_EventScript_RivalExitFacingEastOrWest:: @ 81EC561 applymovement OBJ_EVENT_ID_PLAYER, Route103_Movement_WatchRivalExitFacingEastOrWest applymovement LOCALID_RIVAL, Route103_Movement_RivalExit1 waitmovement 0 - playse SE_DANSA + playse SE_LEDGE applymovement LOCALID_RIVAL, Route103_Movement_RivalExit2 waitmovement 0 goto Route103_EventScript_RivalEnd @@ -134,7 +134,7 @@ Route103_EventScript_RivalExitFacingEastOrWest:: @ 81EC561 Route103_EventScript_RivalExitFacingSouth:: @ 81EC585 applymovement LOCALID_RIVAL, Route103_Movement_RivalExit1 waitmovement 0 - playse SE_DANSA + playse SE_LEDGE applymovement LOCALID_RIVAL, Route103_Movement_RivalExit2 waitmovement 0 goto Route103_EventScript_RivalEnd diff --git a/data/maps/Route104/map.json b/data/maps/Route104/map.json index 99b8ffeb3..69e5faf27 100644 --- a/data/maps/Route104/map.json +++ b/data/maps/Route104/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE104", "name": "Route104", "layout": "LAYOUT_ROUTE104", - "music": "MUS_NEXTROAD", + "music": "MUS_ROUTE104", "region_map_section": "MAPSEC_ROUTE_104", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route104/scripts.inc b/data/maps/Route104/scripts.inc index ff9003887..d1faca53a 100644 --- a/data/maps/Route104/scripts.inc +++ b/data/maps/Route104/scripts.inc @@ -84,11 +84,11 @@ Route104_EventScript_PlayRivalMusic:: @ 81ECD11 return Route104_EventScript_PlayMayMusic:: @ 81ECD29 - playbgm MUS_GIRL_SUP, 1 + playbgm MUS_ENCOUNTER_MAY, 1 return Route104_EventScript_PlayBrendanMusic:: @ 81ECD2E - playbgm MUS_BOY_SUP, 1 + playbgm MUS_ENCOUNTER_BRENDAN, 1 return Route104_EventScript_RivalEncounter:: @ 81ECD33 @@ -106,7 +106,7 @@ Route104_EventScript_MayEncounter:: @ 81ECD4B msgbox Route104_Text_MayWeShouldRegister, MSGBOX_DEFAULT closemessage delay 30 - playfanfare MUS_ME_TORE_EYE + playfanfare MUS_REGISTER_MATCH_CALL msgbox Route104_Text_RegisteredMay, MSGBOX_DEFAULT waitfanfare closemessage @@ -195,7 +195,7 @@ Route104_EventScript_BrendanEncounter:: @ 81ECE6F msgbox Route104_Text_BrendanWeShouldRegister, MSGBOX_DEFAULT closemessage delay 30 - playfanfare MUS_ME_TORE_EYE + playfanfare MUS_REGISTER_MATCH_CALL msgbox Route104_Text_RegisteredBrendan, MSGBOX_DEFAULT waitfanfare closemessage @@ -387,7 +387,7 @@ Route104_EventScript_SailToDewfordDadCalls:: @ 81ED0EF pokenavcall Route104_Text_DadPokenavCall waitmessage delay 30 - playfanfare MUS_ME_TORE_EYE + playfanfare MUS_REGISTER_MATCH_CALL msgbox Route104_Text_RegisteredDadInPokenav, MSGBOX_DEFAULT waitfanfare closemessage diff --git a/data/maps/Route104_MrBrineysHouse/map.json b/data/maps/Route104_MrBrineysHouse/map.json index e027c520e..ae4ffc791 100644 --- a/data/maps/Route104_MrBrineysHouse/map.json +++ b/data/maps/Route104_MrBrineysHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE104_MR_BRINEYS_HOUSE", "name": "Route104_MrBrineysHouse", "layout": "LAYOUT_ROUTE104_MR_BRINEYS_HOUSE", - "music": "MUS_MACHI_S2", + "music": "MUS_PETALBURG", "region_map_section": "MAPSEC_ROUTE_104", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route104_PrettyPetalFlowerShop/map.json b/data/maps/Route104_PrettyPetalFlowerShop/map.json index 511f1cf7c..ec18b1ded 100644 --- a/data/maps/Route104_PrettyPetalFlowerShop/map.json +++ b/data/maps/Route104_PrettyPetalFlowerShop/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE104_PRETTY_PETAL_FLOWER_SHOP", "name": "Route104_PrettyPetalFlowerShop", "layout": "LAYOUT_ROUTE104_PRETTY_PETAL_FLOWER_SHOP", - "music": "MUS_MACHI_S2", + "music": "MUS_PETALBURG", "region_map_section": "MAPSEC_ROUTE_104", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route104_Prototype/map.json b/data/maps/Route104_Prototype/map.json index d1210f4f1..a15458bf6 100644 --- a/data/maps/Route104_Prototype/map.json +++ b/data/maps/Route104_Prototype/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE104_PROTOTYPE", "name": "Route104_Prototype", "layout": "LAYOUT_ROUTE104_PROTOTYPE", - "music": "MUS_NEXTROAD", + "music": "MUS_ROUTE104", "region_map_section": "MAPSEC_ROUTE_104", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route104_PrototypePrettyPetalFlowerShop/map.json b/data/maps/Route104_PrototypePrettyPetalFlowerShop/map.json index e65913f30..7abd76e3d 100644 --- a/data/maps/Route104_PrototypePrettyPetalFlowerShop/map.json +++ b/data/maps/Route104_PrototypePrettyPetalFlowerShop/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE104_PROTOTYPE_PRETTY_PETAL_FLOWER_SHOP", "name": "Route104_PrototypePrettyPetalFlowerShop", "layout": "LAYOUT_ROUTE104_PRETTY_PETAL_FLOWER_SHOP", - "music": "MUS_NEXTROAD", + "music": "MUS_ROUTE104", "region_map_section": "MAPSEC_ROUTE_104", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route105/map.json b/data/maps/Route105/map.json index 76f11b3bd..bb6c7a653 100644 --- a/data/maps/Route105/map.json +++ b/data/maps/Route105/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE105", "name": "Route105", "layout": "LAYOUT_ROUTE105", - "music": "MUS_NEXTROAD", + "music": "MUS_ROUTE104", "region_map_section": "MAPSEC_ROUTE_105", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route106/map.json b/data/maps/Route106/map.json index 307608812..c28d593a7 100644 --- a/data/maps/Route106/map.json +++ b/data/maps/Route106/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE106", "name": "Route106", "layout": "LAYOUT_ROUTE106", - "music": "MUS_NEXTROAD", + "music": "MUS_ROUTE104", "region_map_section": "MAPSEC_ROUTE_106", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route107/map.json b/data/maps/Route107/map.json index 3768551a3..ddc0f1459 100644 --- a/data/maps/Route107/map.json +++ b/data/maps/Route107/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE107", "name": "Route107", "layout": "LAYOUT_ROUTE107", - "music": "MUS_NEXTROAD", + "music": "MUS_ROUTE104", "region_map_section": "MAPSEC_ROUTE_107", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route108/map.json b/data/maps/Route108/map.json index 36b200964..21acfd6ca 100644 --- a/data/maps/Route108/map.json +++ b/data/maps/Route108/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE108", "name": "Route108", "layout": "LAYOUT_ROUTE108", - "music": "MUS_NEXTROAD", + "music": "MUS_ROUTE104", "region_map_section": "MAPSEC_ROUTE_108", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route109/map.json b/data/maps/Route109/map.json index f6b1a46cd..2ddcc4530 100644 --- a/data/maps/Route109/map.json +++ b/data/maps/Route109/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE109", "name": "Route109", "layout": "LAYOUT_ROUTE109", - "music": "MUS_NEXTROAD", + "music": "MUS_ROUTE104", "region_map_section": "MAPSEC_ROUTE_109", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route109_SeashoreHouse/map.json b/data/maps/Route109_SeashoreHouse/map.json index 6a86e8c24..0a8164ba7 100644 --- a/data/maps/Route109_SeashoreHouse/map.json +++ b/data/maps/Route109_SeashoreHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE109_SEASHORE_HOUSE", "name": "Route109_SeashoreHouse", "layout": "LAYOUT_ROUTE109_SEASHORE_HOUSE", - "music": "MUS_HIGHTOWN", + "music": "MUS_DEWFORD", "region_map_section": "MAPSEC_ROUTE_109", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route110/map.json b/data/maps/Route110/map.json index 5e15be18c..bb5df5eb4 100644 --- a/data/maps/Route110/map.json +++ b/data/maps/Route110/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE110", "name": "Route110", "layout": "LAYOUT_ROUTE110", - "music": "MUS_DOORO_X1", + "music": "MUS_ROUTE110", "region_map_section": "MAPSEC_ROUTE_110", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route110/scripts.inc b/data/maps/Route110/scripts.inc index 02c13f4d9..50f3d1f48 100644 --- a/data/maps/Route110/scripts.inc +++ b/data/maps/Route110/scripts.inc @@ -410,11 +410,11 @@ Route110_EventScript_RivalScene:: @ 81EF76E end Route110_EventScript_PlayMayMusic:: @ 81EF7E1 - playbgm MUS_GIRL_SUP, 1 + playbgm MUS_ENCOUNTER_MAY, 1 return Route110_EventScript_PlayBrendanMusic:: @ 81EF7E6 - playbgm MUS_BOY_SUP, 1 + playbgm MUS_ENCOUNTER_BRENDAN, 1 return Route110_EventScript_MayBattle:: @ 81EF7EB @@ -448,7 +448,7 @@ Route110_EventScript_MayDefeated:: @ 81EF84A end Route110_EventScript_BrendanBattle:: @ 81EF865 - msgbox Route110_Text_BrendayLetsBattle, MSGBOX_DEFAULT + msgbox Route110_Text_BrendanLetsBattle, MSGBOX_DEFAULT switch VAR_STARTER_MON case 0, Route110_EventScript_BrendanBattleTreecko case 1, Route110_EventScript_BrendanBattleTorchic @@ -648,7 +648,7 @@ Route110_EventScript_BirchScene:: @ 81EF9F7 msgbox Route110_Text_HeardYouInstallMatchCall, MSGBOX_DEFAULT closemessage delay 30 - playfanfare MUS_ME_TORE_EYE + playfanfare MUS_REGISTER_MATCH_CALL msgbox Route110_Text_RegisteredBirchInPokenav, MSGBOX_DEFAULT waitfanfare closemessage @@ -814,7 +814,7 @@ Route110_Text_MayExplainItemfinder: @ 81EFD58 .string "me, but I think you should train a lot\l" .string "harder for the next time.$" -Route110_Text_BrendayLetsBattle: @ 81EFE3F +Route110_Text_BrendanLetsBattle: @ 81EFE3F .string "BRENDAN: Hey, {PLAYER}.\n" .string "So this is where you were.\l" .string "How's it going?\p" diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json index cd9fd8060..0d382f275 100644 --- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json +++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE", "name": "Route110_SeasideCyclingRoadNorthEntrance", "layout": "LAYOUT_ROUTE110_SEASIDE_CYCLING_ROAD_ENTRANCE", - "music": "MUS_FINECITY", + "music": "MUS_SLATEPORT", "region_map_section": "MAPSEC_ROUTE_110", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json index 01c200b02..12cd26ada 100644 --- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json +++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE", "name": "Route110_SeasideCyclingRoadSouthEntrance", "layout": "LAYOUT_ROUTE110_SEASIDE_CYCLING_ROAD_ENTRANCE", - "music": "MUS_FINECITY", + "music": "MUS_SLATEPORT", "region_map_section": "MAPSEC_ROUTE_110", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route110_TrickHouseCorridor/map.json b/data/maps/Route110_TrickHouseCorridor/map.json index fb9c25c08..5d6ddb556 100644 --- a/data/maps/Route110_TrickHouseCorridor/map.json +++ b/data/maps/Route110_TrickHouseCorridor/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE110_TRICK_HOUSE_CORRIDOR", "name": "Route110_TrickHouseCorridor", "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_CORRIDOR", - "music": "MUS_KARAKURI", + "music": "MUS_TRICK_HOUSE", "region_map_section": "MAPSEC_ROUTE_110", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route110_TrickHouseEnd/map.json b/data/maps/Route110_TrickHouseEnd/map.json index 6f6f3fcc7..c82d871fb 100644 --- a/data/maps/Route110_TrickHouseEnd/map.json +++ b/data/maps/Route110_TrickHouseEnd/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE110_TRICK_HOUSE_END", "name": "Route110_TrickHouseEnd", "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_END", - "music": "MUS_KARAKURI", + "music": "MUS_TRICK_HOUSE", "region_map_section": "MAPSEC_ROUTE_110", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route110_TrickHouseEnd/scripts.inc b/data/maps/Route110_TrickHouseEnd/scripts.inc index 7e6f6a5bf..0852b4e33 100644 --- a/data/maps/Route110_TrickHouseEnd/scripts.inc +++ b/data/maps/Route110_TrickHouseEnd/scripts.inc @@ -194,7 +194,7 @@ Route110_TrickHouseEnd_EventScript_GiveBlueTent:: @ 826AFC7 Route110_TrickHouseEnd_EventScript_TrickMasterExit:: @ 826AFCF applymovement LOCALID_TRICK_MASTER, Route110_TrickHouse_Movement_TrickMasterSpin waitmovement 0 - playse SE_W153 + playse SE_M_EXPLOSION applymovement LOCALID_TRICK_MASTER, Route110_TrickHouse_Movement_TrickMasterJumpAway waitmovement 0 removeobject LOCALID_TRICK_MASTER @@ -242,7 +242,7 @@ Route110_TrickHouseEnd_EventScript_TrickMasterExitTrigger:: @ 826B041 delay 20 applymovement LOCALID_TRICK_MASTER, Route110_TrickHouseEnd_Movement_TrickMasterSurprise waitmovement 0 - playse SE_W153 + playse SE_M_EXPLOSION applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 msgbox Route110_TrickHouseEnd_Text_YoureIgnoringMe, MSGBOX_DEFAULT diff --git a/data/maps/Route110_TrickHouseEntrance/map.json b/data/maps/Route110_TrickHouseEntrance/map.json index 499cf26e0..5895ae788 100644 --- a/data/maps/Route110_TrickHouseEntrance/map.json +++ b/data/maps/Route110_TrickHouseEntrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE110_TRICK_HOUSE_ENTRANCE", "name": "Route110_TrickHouseEntrance", "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_ENTRANCE", - "music": "MUS_KARAKURI", + "music": "MUS_TRICK_HOUSE", "region_map_section": "MAPSEC_ROUTE_110", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route110_TrickHouseEntrance/scripts.inc b/data/maps/Route110_TrickHouseEntrance/scripts.inc index 98b06a94f..adfcf6bbc 100644 --- a/data/maps/Route110_TrickHouseEntrance/scripts.inc +++ b/data/maps/Route110_TrickHouseEntrance/scripts.inc @@ -223,7 +223,7 @@ Route110_TrickHouseEntrance_EventScript_BeginChallenge:: @ 8269CF8 delay 20 applymovement LOCALID_TRICK_MASTER, Route110_TrickHouse_Movement_TrickMasterSpin waitmovement 0 - playse SE_W153 + playse SE_M_EXPLOSION applymovement LOCALID_TRICK_MASTER, Route110_TrickHouse_Movement_TrickMasterJumpAway waitmovement 0 removeobject LOCALID_TRICK_MASTER @@ -480,7 +480,7 @@ Route110_TrickHouseEntrance_EventScript_ReceivedTent:: @ 826A09A waitmovement 0 applymovement LOCALID_TRICK_MASTER, Route110_TrickHouse_Movement_TrickMasterSpin waitmovement 0 - playse SE_W153 + playse SE_M_EXPLOSION applymovement LOCALID_TRICK_MASTER, Route110_TrickHouse_Movement_TrickMasterJumpAway waitmovement 0 removeobject LOCALID_TRICK_MASTER @@ -711,7 +711,7 @@ Route110_TrickHousePuzzle_EventScript_ReadScrollAgain:: @ 826A3DB end Route110_TrickHousePuzzle_EventScript_FoundScroll:: @ 826A3E5 - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM message Route110_TrickHousePuzzle_Text_FoundAScroll waitfanfare msgbox Route110_TrickHousePuzzle_Text_MemorizedSecretCode, MSGBOX_DEFAULT diff --git a/data/maps/Route110_TrickHousePuzzle1/map.json b/data/maps/Route110_TrickHousePuzzle1/map.json index 087057163..42a416b51 100644 --- a/data/maps/Route110_TrickHousePuzzle1/map.json +++ b/data/maps/Route110_TrickHousePuzzle1/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE1", "name": "Route110_TrickHousePuzzle1", "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE1", - "music": "MUS_KARAKURI", + "music": "MUS_TRICK_HOUSE", "region_map_section": "MAPSEC_ROUTE_110", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route110_TrickHousePuzzle2/map.json b/data/maps/Route110_TrickHousePuzzle2/map.json index f2c96756b..2b3ca9b2e 100644 --- a/data/maps/Route110_TrickHousePuzzle2/map.json +++ b/data/maps/Route110_TrickHousePuzzle2/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE2", "name": "Route110_TrickHousePuzzle2", "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE2", - "music": "MUS_KARAKURI", + "music": "MUS_TRICK_HOUSE", "region_map_section": "MAPSEC_ROUTE_110", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route110_TrickHousePuzzle3/map.json b/data/maps/Route110_TrickHousePuzzle3/map.json index 389391b87..ba01c6b33 100644 --- a/data/maps/Route110_TrickHousePuzzle3/map.json +++ b/data/maps/Route110_TrickHousePuzzle3/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE3", "name": "Route110_TrickHousePuzzle3", "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE3", - "music": "MUS_KARAKURI", + "music": "MUS_TRICK_HOUSE", "region_map_section": "MAPSEC_ROUTE_110", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route110_TrickHousePuzzle4/map.json b/data/maps/Route110_TrickHousePuzzle4/map.json index ad00f12ac..8e8348c95 100644 --- a/data/maps/Route110_TrickHousePuzzle4/map.json +++ b/data/maps/Route110_TrickHousePuzzle4/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE4", "name": "Route110_TrickHousePuzzle4", "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE4", - "music": "MUS_KARAKURI", + "music": "MUS_TRICK_HOUSE", "region_map_section": "MAPSEC_ROUTE_110", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route110_TrickHousePuzzle5/map.json b/data/maps/Route110_TrickHousePuzzle5/map.json index ee074b37d..9eba5d7f8 100644 --- a/data/maps/Route110_TrickHousePuzzle5/map.json +++ b/data/maps/Route110_TrickHousePuzzle5/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE5", "name": "Route110_TrickHousePuzzle5", "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE5", - "music": "MUS_KARAKURI", + "music": "MUS_TRICK_HOUSE", "region_map_section": "MAPSEC_ROUTE_110", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route110_TrickHousePuzzle5/scripts.inc b/data/maps/Route110_TrickHousePuzzle5/scripts.inc index 419fa2831..36162f42f 100644 --- a/data/maps/Route110_TrickHousePuzzle5/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle5/scripts.inc @@ -454,7 +454,7 @@ Route110_TrickHousePuzzle5_EventScript_Mechadoll5Quiz3:: @ 826D12F Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer:: @ 826D152 waitse - playse SE_HAZURE + playse SE_FAILURE msgbox Route110_TrickHousePuzzle5_Text_DisappointmentError, MSGBOX_DEFAULT applymovement LOCALID_MECHADOLL_1, Route110_TrickHousePuzzle5_Movement_MechadollShake applymovement LOCALID_MECHADOLL_2, Route110_TrickHousePuzzle5_Movement_MechadollShake @@ -472,7 +472,7 @@ Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer:: @ 826D152 Route110_TrickHousePuzzle5_EventScript_CorrectAnswer:: @ 826D1A0 waitse - playse SE_SEIKAI + playse SE_SUCCESS goto Route110_TrickHousePuzzle5_EventScript_CorrectGoThrough end diff --git a/data/maps/Route110_TrickHousePuzzle6/map.json b/data/maps/Route110_TrickHousePuzzle6/map.json index bec9d12b3..ff6e3e7f3 100644 --- a/data/maps/Route110_TrickHousePuzzle6/map.json +++ b/data/maps/Route110_TrickHousePuzzle6/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE6", "name": "Route110_TrickHousePuzzle6", "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE6", - "music": "MUS_KARAKURI", + "music": "MUS_TRICK_HOUSE", "region_map_section": "MAPSEC_ROUTE_110", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route110_TrickHousePuzzle7/map.json b/data/maps/Route110_TrickHousePuzzle7/map.json index 12afd07ec..f5976bdef 100644 --- a/data/maps/Route110_TrickHousePuzzle7/map.json +++ b/data/maps/Route110_TrickHousePuzzle7/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE7", "name": "Route110_TrickHousePuzzle7", "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE7", - "music": "MUS_KARAKURI", + "music": "MUS_TRICK_HOUSE", "region_map_section": "MAPSEC_ROUTE_110", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route110_TrickHousePuzzle7/scripts.inc b/data/maps/Route110_TrickHousePuzzle7/scripts.inc index 6b7559389..b0cbd3813 100644 --- a/data/maps/Route110_TrickHousePuzzle7/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle7/scripts.inc @@ -125,7 +125,7 @@ Route110_TrickHousePuzzle7_EventScript_Switch1:: @ 826E1FE call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_SetSwitch1MetatilesOn call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_SetSwitch1MetatilesOff special DrawWholeMapView - playse SE_TK_KASYA + playse SE_CLICK goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_SetSwitch1On goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_SetSwitch1Off end @@ -136,7 +136,7 @@ Route110_TrickHousePuzzle7_EventScript_Switch2:: @ 826E22D call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_SetSwitch2MetatilesOn call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_SetSwitch2MetatilesOff special DrawWholeMapView - playse SE_TK_KASYA + playse SE_CLICK goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_SetSwitch2On goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_SetSwitch2Off end @@ -147,7 +147,7 @@ Route110_TrickHousePuzzle7_EventScript_Switch3:: @ 826E25C call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_SetSwitch3MetatilesOn call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_SetSwitch3MetatilesOff special DrawWholeMapView - playse SE_TK_KASYA + playse SE_CLICK goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_SetSwitch3On goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_SetSwitch3Off end @@ -158,7 +158,7 @@ Route110_TrickHousePuzzle7_EventScript_Switch4:: @ 826E28B call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_SetSwitch4MetatilesOn call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_SetSwitch4MetatilesOff special DrawWholeMapView - playse SE_TK_KASYA + playse SE_CLICK goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_SetSwitch4On goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_SetSwitch4Off end @@ -169,7 +169,7 @@ Route110_TrickHousePuzzle7_EventScript_Switch5:: @ 826E2BA call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_SetSwitch5MetatilesOn call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_SetSwitch5MetatilesOff special DrawWholeMapView - playse SE_TK_KASYA + playse SE_CLICK goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_SetSwitch5On goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_SetSwitch5Off end @@ -227,9 +227,9 @@ Route110_TrickHousePuzzle7_EventScript_SetSwitch5Off:: @ 826E316 @ From here is where the new, actually used puzzle scripts begin Route110_TrickHousePuzzle7_EventScript_YellowButton:: @ 826E31B - playse SE_MU_PACHI + playse SE_SWITCH waitse - playse SE_TU_SAA + playse SE_REPEL initrotatingtilepuzzle TRUE moverotatingtileobjects 0 waitmovement 0 @@ -239,9 +239,9 @@ Route110_TrickHousePuzzle7_EventScript_YellowButton:: @ 826E31B end Route110_TrickHousePuzzle7_EventScript_BlueButton:: @ 826E331 - playse SE_MU_PACHI + playse SE_SWITCH waitse - playse SE_TU_SAA + playse SE_REPEL initrotatingtilepuzzle TRUE moverotatingtileobjects 1 waitmovement 0 @@ -251,9 +251,9 @@ Route110_TrickHousePuzzle7_EventScript_BlueButton:: @ 826E331 end Route110_TrickHousePuzzle7_EventScript_GreenButton:: @ 826E347 - playse SE_MU_PACHI + playse SE_SWITCH waitse - playse SE_TU_SAA + playse SE_REPEL initrotatingtilepuzzle TRUE moverotatingtileobjects 2 waitmovement 0 @@ -263,9 +263,9 @@ Route110_TrickHousePuzzle7_EventScript_GreenButton:: @ 826E347 end Route110_TrickHousePuzzle7_EventScript_PurpleButton:: @ 826E35D - playse SE_MU_PACHI + playse SE_SWITCH waitse - playse SE_TU_SAA + playse SE_REPEL initrotatingtilepuzzle TRUE moverotatingtileobjects 3 waitmovement 0 @@ -276,9 +276,9 @@ Route110_TrickHousePuzzle7_EventScript_PurpleButton:: @ 826E35D @ Unused Route110_TrickHousePuzzle7_EventScript_RedButton:: @ 826E373 - playse SE_MU_PACHI + playse SE_SWITCH waitse - playse SE_TU_SAA + playse SE_REPEL initrotatingtilepuzzle TRUE moverotatingtileobjects 4 waitmovement 0 diff --git a/data/maps/Route110_TrickHousePuzzle8/map.json b/data/maps/Route110_TrickHousePuzzle8/map.json index 3a1bc8caf..bfb106eb6 100644 --- a/data/maps/Route110_TrickHousePuzzle8/map.json +++ b/data/maps/Route110_TrickHousePuzzle8/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE8", "name": "Route110_TrickHousePuzzle8", "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE8", - "music": "MUS_KARAKURI", + "music": "MUS_TRICK_HOUSE", "region_map_section": "MAPSEC_ROUTE_110", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route111/map.json b/data/maps/Route111/map.json index 938dbcff1..014ac084c 100644 --- a/data/maps/Route111/map.json +++ b/data/maps/Route111/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE111", "name": "Route111", "layout": "LAYOUT_ROUTE111", - "music": "MUS_DOORO_X1", + "music": "MUS_ROUTE110", "region_map_section": "MAPSEC_ROUTE_111", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route111/scripts.inc b/data/maps/Route111/scripts.inc index 281dddf0c..322c9a2b7 100644 --- a/data/maps/Route111/scripts.inc +++ b/data/maps/Route111/scripts.inc @@ -126,7 +126,7 @@ Route111_EventScript_MirageTowerDisappear:: @ 81F0E60 special StartMirageTowerShake waitstate delay 24 - playse SE_RU_HYUU + playse SE_FALL addobject LOCALID_PLAYER_FALLING special StartPlayerDescendMirageTower waitstate @@ -268,14 +268,14 @@ Route111_Movement_PushRightFromRoute: @ 81F0FAE Route111_EventScript_SunTrigger:: @ 81F0FB0 setweather WEATHER_SUNNY - fadenewbgm MUS_DOORO_X1 + fadenewbgm MUS_ROUTE110 doweather setvar VAR_TEMP_3, 0 end Route111_EventScript_SandstormTrigger:: @ 81F0FBD setweather WEATHER_SANDSTORM - fadenewbgm MUS_ASHROAD + fadenewbgm MUS_ROUTE111 doweather end diff --git a/data/maps/Route111_OldLadysRestStop/map.json b/data/maps/Route111_OldLadysRestStop/map.json index 679b53522..419e4c2ee 100644 --- a/data/maps/Route111_OldLadysRestStop/map.json +++ b/data/maps/Route111_OldLadysRestStop/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE111_OLD_LADYS_REST_STOP", "name": "Route111_OldLadysRestStop", "layout": "LAYOUT_HOUSE3", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_ROUTE_111", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route111_WinstrateFamilysHouse/map.json b/data/maps/Route111_WinstrateFamilysHouse/map.json index ec5afd93a..f88935971 100644 --- a/data/maps/Route111_WinstrateFamilysHouse/map.json +++ b/data/maps/Route111_WinstrateFamilysHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE111_WINSTRATE_FAMILYS_HOUSE", "name": "Route111_WinstrateFamilysHouse", "layout": "LAYOUT_HOUSE2", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_ROUTE_111", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route112/map.json b/data/maps/Route112/map.json index 37f0a38df..d4d650857 100644 --- a/data/maps/Route112/map.json +++ b/data/maps/Route112/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE112", "name": "Route112", "layout": "LAYOUT_ROUTE112", - "music": "MUS_DOORO_X1", + "music": "MUS_ROUTE110", "region_map_section": "MAPSEC_ROUTE_112", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route112_CableCarStation/map.json b/data/maps/Route112_CableCarStation/map.json index a59df37cb..7adae98f7 100644 --- a/data/maps/Route112_CableCarStation/map.json +++ b/data/maps/Route112_CableCarStation/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE112_CABLE_CAR_STATION", "name": "Route112_CableCarStation", "layout": "LAYOUT_CABLE_CAR_STATION", - "music": "MUS_DOORO_X1", + "music": "MUS_ROUTE110", "region_map_section": "MAPSEC_ROUTE_112", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route113/map.json b/data/maps/Route113/map.json index df1b35223..8d9d74028 100644 --- a/data/maps/Route113/map.json +++ b/data/maps/Route113/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE113", "name": "Route113", "layout": "LAYOUT_ROUTE113", - "music": "MUS_KAZANBAI", + "music": "MUS_ROUTE113", "region_map_section": "MAPSEC_ROUTE_113", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route113_GlassWorkshop/map.json b/data/maps/Route113_GlassWorkshop/map.json index 1d5deabd0..924fbd85d 100644 --- a/data/maps/Route113_GlassWorkshop/map.json +++ b/data/maps/Route113_GlassWorkshop/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE113_GLASS_WORKSHOP", "name": "Route113_GlassWorkshop", "layout": "LAYOUT_HOUSE4", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_ROUTE_113", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route114/map.json b/data/maps/Route114/map.json index 48bafee08..37edf509d 100644 --- a/data/maps/Route114/map.json +++ b/data/maps/Route114/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE114", "name": "Route114", "layout": "LAYOUT_ROUTE114", - "music": "MUS_DOORO_X1", + "music": "MUS_ROUTE110", "region_map_section": "MAPSEC_ROUTE_114", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route114_FossilManiacsHouse/map.json b/data/maps/Route114_FossilManiacsHouse/map.json index 19d87c353..dd21ff77f 100644 --- a/data/maps/Route114_FossilManiacsHouse/map.json +++ b/data/maps/Route114_FossilManiacsHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE114_FOSSIL_MANIACS_HOUSE", "name": "Route114_FossilManiacsHouse", "layout": "LAYOUT_ROUTE114_FOSSIL_MANIACS_HOUSE", - "music": "MUS_TONEKUSA", + "music": "MUS_FALLARBOR", "region_map_section": "MAPSEC_ROUTE_114", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route114_FossilManiacsTunnel/map.json b/data/maps/Route114_FossilManiacsTunnel/map.json index 3384df523..9a8ac70c9 100644 --- a/data/maps/Route114_FossilManiacsTunnel/map.json +++ b/data/maps/Route114_FossilManiacsTunnel/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE114_FOSSIL_MANIACS_TUNNEL", "name": "Route114_FossilManiacsTunnel", "layout": "LAYOUT_ROUTE114_FOSSIL_MANIACS_TUNNEL", - "music": "MUS_TONEKUSA", + "music": "MUS_FALLARBOR", "region_map_section": "MAPSEC_ROUTE_114", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route114_LanettesHouse/map.json b/data/maps/Route114_LanettesHouse/map.json index 2a444d06a..fcb8edfc9 100644 --- a/data/maps/Route114_LanettesHouse/map.json +++ b/data/maps/Route114_LanettesHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE114_LANETTES_HOUSE", "name": "Route114_LanettesHouse", "layout": "LAYOUT_ROUTE114_LANETTES_HOUSE", - "music": "MUS_TONEKUSA", + "music": "MUS_FALLARBOR", "region_map_section": "MAPSEC_ROUTE_114", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route115/map.json b/data/maps/Route115/map.json index 0be264375..2d0dbdbaa 100644 --- a/data/maps/Route115/map.json +++ b/data/maps/Route115/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE115", "name": "Route115", "layout": "LAYOUT_ROUTE115", - "music": "MUS_NEXTROAD", + "music": "MUS_ROUTE104", "region_map_section": "MAPSEC_ROUTE_115", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route116/map.json b/data/maps/Route116/map.json index 6c2be7980..247a4b7b1 100644 --- a/data/maps/Route116/map.json +++ b/data/maps/Route116/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE116", "name": "Route116", "layout": "LAYOUT_ROUTE116", - "music": "MUS_NEXTROAD", + "music": "MUS_ROUTE104", "region_map_section": "MAPSEC_ROUTE_116", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route116_TunnelersRestHouse/map.json b/data/maps/Route116_TunnelersRestHouse/map.json index 8ced24aa7..b83971532 100644 --- a/data/maps/Route116_TunnelersRestHouse/map.json +++ b/data/maps/Route116_TunnelersRestHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE116_TUNNELERS_REST_HOUSE", "name": "Route116_TunnelersRestHouse", "layout": "LAYOUT_ROUTE116_TUNNELERS_REST_HOUSE", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_ROUTE_116", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route117/map.json b/data/maps/Route117/map.json index 655c43048..d2f45e256 100644 --- a/data/maps/Route117/map.json +++ b/data/maps/Route117/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE117", "name": "Route117", "layout": "LAYOUT_ROUTE117", - "music": "MUS_DOORO_X1", + "music": "MUS_ROUTE110", "region_map_section": "MAPSEC_ROUTE_117", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route117_PokemonDayCare/map.json b/data/maps/Route117_PokemonDayCare/map.json index 141dd44ca..5b51aa958 100644 --- a/data/maps/Route117_PokemonDayCare/map.json +++ b/data/maps/Route117_PokemonDayCare/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE117_POKEMON_DAY_CARE", "name": "Route117_PokemonDayCare", "layout": "LAYOUT_ROUTE117_POKEMON_DAY_CARE", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_ROUTE_117", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route118/map.json b/data/maps/Route118/map.json index 09df9a05a..7b541e629 100644 --- a/data/maps/Route118/map.json +++ b/data/maps/Route118/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE118", "name": "Route118", "layout": "LAYOUT_ROUTE118", - "music": "MUS_ROUTE_118", + "music": "MUS_ROUTE118", "region_map_section": "MAPSEC_ROUTE_118", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route118/scripts.inc b/data/maps/Route118/scripts.inc index 1a34ad96c..0197508bb 100644 --- a/data/maps/Route118/scripts.inc +++ b/data/maps/Route118/scripts.inc @@ -97,7 +97,7 @@ Route118_EventScript_StevenTrigger2:: @ 81F3EC4 end Route118_EventScript_StevenTrigger:: @ 81F3EE4 - playse SE_DANSA + playse SE_LEDGE applymovement LOCALID_STEVEN, Route118_Movement_StevenJumpLedge waitmovement 0 delay 30 diff --git a/data/maps/Route119/map.json b/data/maps/Route119/map.json index 1ad1ca45a..fa6391a34 100644 --- a/data/maps/Route119/map.json +++ b/data/maps/Route119/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE119", "name": "Route119", "layout": "LAYOUT_ROUTE119", - "music": "MUS_GRANROAD", + "music": "MUS_ROUTE119", "region_map_section": "MAPSEC_ROUTE_119", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route119/scripts.inc b/data/maps/Route119/scripts.inc index 2800126f6..734934d17 100644 --- a/data/maps/Route119/scripts.inc +++ b/data/maps/Route119/scripts.inc @@ -74,11 +74,11 @@ Route119_EventScript_RivalEncounter:: @ 81F4488 end Route119_EventScript_PlayMayMusic:: @ 81F4501 - playbgm MUS_GIRL_SUP, 1 + playbgm MUS_ENCOUNTER_MAY, 1 return Route119_EventScript_PlayBrendanMusic:: @ 81F4506 - playbgm MUS_BOY_SUP, 1 + playbgm MUS_ENCOUNTER_BRENDAN, 1 return Route119_EventScript_BattleMay:: @ 81F450B diff --git a/data/maps/Route119_House/map.json b/data/maps/Route119_House/map.json index 6478404e2..0225f1cd3 100644 --- a/data/maps/Route119_House/map.json +++ b/data/maps/Route119_House/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE119_HOUSE", "name": "Route119_House", "layout": "LAYOUT_HOUSE1", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_ROUTE_119", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route119_WeatherInstitute_1F/map.json b/data/maps/Route119_WeatherInstitute_1F/map.json index f1a3b0f99..9a9e23882 100644 --- a/data/maps/Route119_WeatherInstitute_1F/map.json +++ b/data/maps/Route119_WeatherInstitute_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE119_WEATHER_INSTITUTE_1F", "name": "Route119_WeatherInstitute_1F", "layout": "LAYOUT_ROUTE119_WEATHER_INSTITUTE_1F", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_ROUTE_119", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route119_WeatherInstitute_2F/map.json b/data/maps/Route119_WeatherInstitute_2F/map.json index a6dc3dfee..e2e5ebb8a 100644 --- a/data/maps/Route119_WeatherInstitute_2F/map.json +++ b/data/maps/Route119_WeatherInstitute_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE119_WEATHER_INSTITUTE_2F", "name": "Route119_WeatherInstitute_2F", "layout": "LAYOUT_ROUTE119_WEATHER_INSTITUTE_2F", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_ROUTE_119", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route119_WeatherInstitute_2F/scripts.inc b/data/maps/Route119_WeatherInstitute_2F/scripts.inc index 7e2c15606..85d9d928f 100644 --- a/data/maps/Route119_WeatherInstitute_2F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_2F/scripts.inc @@ -124,7 +124,7 @@ Route119_WeatherInstitute_2F_EventScript_SendCastformToPC:: @ 82700D0 end Route119_WeatherInstitute_2F_EventScript_ReceivedCastformFanfare:: @ 82700DB - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM message Route119_WeatherInstitute_2F_Text_PlayerReceivedCastform waitmessage waitfanfare diff --git a/data/maps/Route120/map.json b/data/maps/Route120/map.json index 2f0f736a2..8a7e56ddc 100644 --- a/data/maps/Route120/map.json +++ b/data/maps/Route120/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE120", "name": "Route120", "layout": "LAYOUT_ROUTE120", - "music": "MUS_DOORO_X3", + "music": "MUS_ROUTE120", "region_map_section": "MAPSEC_ROUTE_120", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route121/map.json b/data/maps/Route121/map.json index f4b4f5e84..e956f6251 100644 --- a/data/maps/Route121/map.json +++ b/data/maps/Route121/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE121", "name": "Route121", "layout": "LAYOUT_ROUTE121", - "music": "MUS_DOORO_X3", + "music": "MUS_ROUTE120", "region_map_section": "MAPSEC_ROUTE_121", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route121/scripts.inc b/data/maps/Route121/scripts.inc index 1a7591a93..fdc191ea8 100644 --- a/data/maps/Route121/scripts.inc +++ b/data/maps/Route121/scripts.inc @@ -19,7 +19,7 @@ Route121_EventScript_SafariZoneSign:: @ 81F5E0F Route121_EventScript_AquaGruntsMoveOut:: @ 81F5E18 lockall - playbgm MUS_AQA_0, 0 + playbgm MUS_ENCOUNTER_AQUA, 0 applymovement LOCALID_GRUNT_2, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox Route121_Text_OkayMoveOutToMtPyre, MSGBOX_DEFAULT diff --git a/data/maps/Route121_SafariZoneEntrance/map.json b/data/maps/Route121_SafariZoneEntrance/map.json index 35516142e..231d3b4a7 100644 --- a/data/maps/Route121_SafariZoneEntrance/map.json +++ b/data/maps/Route121_SafariZoneEntrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE121_SAFARI_ZONE_ENTRANCE", "name": "Route121_SafariZoneEntrance", "layout": "LAYOUT_ROUTE121_SAFARI_ZONE_ENTRANCE", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_ROUTE_121", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route121_SafariZoneEntrance/scripts.inc b/data/maps/Route121_SafariZoneEntrance/scripts.inc index 549f22772..a87a374d2 100644 --- a/data/maps/Route121_SafariZoneEntrance/scripts.inc +++ b/data/maps/Route121_SafariZoneEntrance/scripts.inc @@ -64,12 +64,12 @@ Route121_SafariZoneEntrance_EventScript_TryEnterSafariZone:: @ 822BC48 checkmoney 500, 0 compare VAR_RESULT, 0 goto_if_eq Route121_SafariZoneEntrance_EventScript_NotEnoughMoney - playse SE_REGI + playse SE_SHOP msgbox Route121_SafariZoneEntrance_Text_ThatWillBe500Please, MSGBOX_DEFAULT removemoney 500, 0 updatemoneybox 0, 0 msgbox Route121_SafariZoneEntrance_Text_HereAreYourSafariBalls, MSGBOX_DEFAULT - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM message Route121_SafariZoneEntrance_Text_Received30SafariBalls waitfanfare msgbox Route121_SafariZoneEntrance_Text_PleaseEnjoyYourself, MSGBOX_DEFAULT diff --git a/data/maps/Route122/map.json b/data/maps/Route122/map.json index 39481f9d7..8c9213347 100644 --- a/data/maps/Route122/map.json +++ b/data/maps/Route122/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE122", "name": "Route122", "layout": "LAYOUT_ROUTE122", - "music": "MUS_DOORO_X4", + "music": "MUS_ROUTE122", "region_map_section": "MAPSEC_ROUTE_122", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route123/map.json b/data/maps/Route123/map.json index 4a1863532..1bd25310a 100644 --- a/data/maps/Route123/map.json +++ b/data/maps/Route123/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE123", "name": "Route123", "layout": "LAYOUT_ROUTE123", - "music": "MUS_DOORO_X4", + "music": "MUS_ROUTE122", "region_map_section": "MAPSEC_ROUTE_123", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route123_BerryMastersHouse/map.json b/data/maps/Route123_BerryMastersHouse/map.json index ef72c04ab..488ee97b5 100644 --- a/data/maps/Route123_BerryMastersHouse/map.json +++ b/data/maps/Route123_BerryMastersHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE123_BERRY_MASTERS_HOUSE", "name": "Route123_BerryMastersHouse", "layout": "LAYOUT_HOUSE2", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_ROUTE_123", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route124/map.json b/data/maps/Route124/map.json index 80d44f155..cb075d29a 100644 --- a/data/maps/Route124/map.json +++ b/data/maps/Route124/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE124", "name": "Route124", "layout": "LAYOUT_ROUTE124", - "music": "MUS_DOORO_X3", + "music": "MUS_ROUTE120", "region_map_section": "MAPSEC_ROUTE_124", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/map.json b/data/maps/Route124_DivingTreasureHuntersHouse/map.json index fc6890729..a9c16cd22 100644 --- a/data/maps/Route124_DivingTreasureHuntersHouse/map.json +++ b/data/maps/Route124_DivingTreasureHuntersHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE", "name": "Route124_DivingTreasureHuntersHouse", "layout": "LAYOUT_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE", - "music": "MUS_MINAMO", + "music": "MUS_LILYCOVE", "region_map_section": "MAPSEC_ROUTE_124", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route125/map.json b/data/maps/Route125/map.json index c83abccd2..984a554e4 100644 --- a/data/maps/Route125/map.json +++ b/data/maps/Route125/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE125", "name": "Route125", "layout": "LAYOUT_ROUTE125", - "music": "MUS_DOORO_X3", + "music": "MUS_ROUTE120", "region_map_section": "MAPSEC_ROUTE_125", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route126/map.json b/data/maps/Route126/map.json index 3f1aa7dc7..60b439066 100644 --- a/data/maps/Route126/map.json +++ b/data/maps/Route126/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE126", "name": "Route126", "layout": "LAYOUT_ROUTE126", - "music": "MUS_DOORO_X3", + "music": "MUS_ROUTE120", "region_map_section": "MAPSEC_ROUTE_126", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route127/map.json b/data/maps/Route127/map.json index 7908f94b0..0e6d78da7 100644 --- a/data/maps/Route127/map.json +++ b/data/maps/Route127/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE127", "name": "Route127", "layout": "LAYOUT_ROUTE127", - "music": "MUS_DOORO_X3", + "music": "MUS_ROUTE120", "region_map_section": "MAPSEC_ROUTE_127", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route128/map.json b/data/maps/Route128/map.json index 9d9b003ba..d8fbb249a 100644 --- a/data/maps/Route128/map.json +++ b/data/maps/Route128/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE128", "name": "Route128", "layout": "LAYOUT_ROUTE128", - "music": "MUS_DOORO_X3", + "music": "MUS_ROUTE120", "region_map_section": "MAPSEC_ROUTE_128", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route129/map.json b/data/maps/Route129/map.json index 0c47261cf..ca814b465 100644 --- a/data/maps/Route129/map.json +++ b/data/maps/Route129/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE129", "name": "Route129", "layout": "LAYOUT_ROUTE129", - "music": "MUS_GRANROAD", + "music": "MUS_ROUTE119", "region_map_section": "MAPSEC_ROUTE_129", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route130/map.json b/data/maps/Route130/map.json index 91fcc7755..7b4cf047c 100644 --- a/data/maps/Route130/map.json +++ b/data/maps/Route130/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE130", "name": "Route130", "layout": "LAYOUT_ROUTE130", - "music": "MUS_GRANROAD", + "music": "MUS_ROUTE119", "region_map_section": "MAPSEC_ROUTE_130", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route131/map.json b/data/maps/Route131/map.json index 03922e25e..3599ae556 100644 --- a/data/maps/Route131/map.json +++ b/data/maps/Route131/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE131", "name": "Route131", "layout": "LAYOUT_ROUTE131", - "music": "MUS_GRANROAD", + "music": "MUS_ROUTE119", "region_map_section": "MAPSEC_ROUTE_131", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route132/map.json b/data/maps/Route132/map.json index 0f2d76d10..1d3d9efd0 100644 --- a/data/maps/Route132/map.json +++ b/data/maps/Route132/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE132", "name": "Route132", "layout": "LAYOUT_ROUTE132", - "music": "MUS_GRANROAD", + "music": "MUS_ROUTE119", "region_map_section": "MAPSEC_ROUTE_132", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route133/map.json b/data/maps/Route133/map.json index 66047152c..80e64638b 100644 --- a/data/maps/Route133/map.json +++ b/data/maps/Route133/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE133", "name": "Route133", "layout": "LAYOUT_ROUTE133", - "music": "MUS_GRANROAD", + "music": "MUS_ROUTE119", "region_map_section": "MAPSEC_ROUTE_133", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route134/map.json b/data/maps/Route134/map.json index 9960b3c14..dd642a8e1 100644 --- a/data/maps/Route134/map.json +++ b/data/maps/Route134/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE134", "name": "Route134", "layout": "LAYOUT_ROUTE134", - "music": "MUS_GRANROAD", + "music": "MUS_ROUTE119", "region_map_section": "MAPSEC_ROUTE_134", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/RustboroCity/map.json b/data/maps/RustboroCity/map.json index 3d2232b9a..445bc5189 100644 --- a/data/maps/RustboroCity/map.json +++ b/data/maps/RustboroCity/map.json @@ -2,7 +2,7 @@ "id": "MAP_RUSTBORO_CITY", "name": "RustboroCity", "layout": "LAYOUT_RUSTBORO_CITY", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_RUSTBORO_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/RustboroCity/scripts.inc b/data/maps/RustboroCity/scripts.inc index 477b0d658..7b1f4a3d8 100644 --- a/data/maps/RustboroCity/scripts.inc +++ b/data/maps/RustboroCity/scripts.inc @@ -43,7 +43,7 @@ RustboroCity_EventScript_ScientistAddMatchCall:: @ 81E0715 setvar VAR_ROUTE104_STATE, 1 applymovement OBJ_EVENT_ID_PLAYER, RustboroCity_Movement_PlayerWalkDown waitmovement 0 - playse SE_KAIDAN + playse SE_EXIT delay 10 addobject LOCALID_SCIENTIST applymovement LOCALID_SCIENTIST, RustboroCity_Movement_ScientistApproachPlayer @@ -62,13 +62,13 @@ RustboroCity_EventScript_ScientistAddMatchCall:: @ 81E0715 setflag FLAG_HAS_MATCH_CALL applymovement LOCALID_SCIENTIST, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 - playse SE_TK_KASYA + playse SE_CLICK delay 10 - playse SE_TK_KASYA + playse SE_CLICK delay 10 - playse SE_TK_KASYA + playse SE_CLICK delay 10 - playse SE_TK_KASYA + playse SE_CLICK delay 20 applymovement LOCALID_SCIENTIST, Common_Movement_WalkInPlaceFastestDown waitmovement 0 @@ -103,7 +103,7 @@ RustboroCity_EventScript_MatchCallTutorial:: @ 81E07BD closemessage applymovement LOCALID_SCIENTIST, RustboroCity_Movement_ScientistLeave waitmovement 0 - playse SE_KAIDAN + playse SE_EXIT removeobject LOCALID_SCIENTIST setflag FLAG_HIDE_RUSTBORO_CITY_SCIENTIST setvar VAR_RUSTBORO_CITY_STATE, 7 @@ -294,7 +294,7 @@ RustboroCity_EventScript_StolenGoodsTrigger4:: @ 81E09B6 RustboroCity_EventScript_StolenGoodsScene:: @ 81E09CD msgbox RustboroCity_Text_OutOfTheWay, MSGBOX_DEFAULT closemessage - playbgm MUS_AQA_0, 0 + playbgm MUS_ENCOUNTER_AQUA, 0 addobject LOCALID_GRUNT addobject LOCALID_DEVON_EMPLOYEE applymovement LOCALID_GRUNT, RustboroCity_Movement_GruntEscape @@ -706,11 +706,11 @@ RustboroCity_EventScript_PlayRivalMusic:: @ 81E0DD1 return RustboroCity_EventScript_PlayMayMusic:: @ 81E0DE9 - playbgm MUS_GIRL_SUP, 1 + playbgm MUS_ENCOUNTER_MAY, 1 return RustboroCity_EventScript_PlayBrendanMusic:: @ 81E0DEE - playbgm MUS_BOY_SUP, 1 + playbgm MUS_ENCOUNTER_BRENDAN, 1 return RustboroCity_EventScript_RivalTrigger0:: @ 81E0DF3 @@ -856,7 +856,7 @@ RustboroCity_EventScript_MayEncounter:: @ 81E100B msgbox RustboroCity_Text_MayHiLetsRegister, MSGBOX_DEFAULT closemessage delay 30 - playfanfare MUS_ME_TORE_EYE + playfanfare MUS_REGISTER_MATCH_CALL msgbox RustboroCity_Text_RegisteredMay, MSGBOX_DEFAULT waitfanfare closemessage @@ -927,7 +927,7 @@ RustboroCity_EventScript_BrendanEncounter:: @ 81E1114 msgbox RustboroCity_Text_BrendanHiLetsRegister, MSGBOX_DEFAULT closemessage delay 30 - playfanfare MUS_ME_TORE_EYE + playfanfare MUS_REGISTER_MATCH_CALL msgbox RustboroCity_Text_RegisteredBrendan, MSGBOX_DEFAULT waitfanfare closemessage diff --git a/data/maps/RustboroCity_CuttersHouse/map.json b/data/maps/RustboroCity_CuttersHouse/map.json index cc19403ea..081799cd1 100644 --- a/data/maps/RustboroCity_CuttersHouse/map.json +++ b/data/maps/RustboroCity_CuttersHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_RUSTBORO_CITY_CUTTERS_HOUSE", "name": "RustboroCity_CuttersHouse", "layout": "LAYOUT_RUSTBORO_CITY_CUTTERS_HOUSE", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_RUSTBORO_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RustboroCity_DevonCorp_1F/map.json b/data/maps/RustboroCity_DevonCorp_1F/map.json index 3cf7152c9..714f15506 100644 --- a/data/maps/RustboroCity_DevonCorp_1F/map.json +++ b/data/maps/RustboroCity_DevonCorp_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_RUSTBORO_CITY_DEVON_CORP_1F", "name": "RustboroCity_DevonCorp_1F", "layout": "LAYOUT_RUSTBORO_CITY_DEVON_CORP_1F", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_RUSTBORO_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RustboroCity_DevonCorp_2F/map.json b/data/maps/RustboroCity_DevonCorp_2F/map.json index 9bc987949..95a931e94 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/map.json +++ b/data/maps/RustboroCity_DevonCorp_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_RUSTBORO_CITY_DEVON_CORP_2F", "name": "RustboroCity_DevonCorp_2F", "layout": "LAYOUT_RUSTBORO_CITY_DEVON_CORP_2F", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_RUSTBORO_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc index e33fb2d0f..eb22fcc43 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc @@ -194,7 +194,7 @@ RustboroCity_DevonCorp_2F_EventScript_TransferLileepToPC:: @ 8211AB9 RustboroCity_DevonCorp_2F_EventScript_ReceivedLileepFanfare:: @ 8211AC4 bufferspeciesname 1, SPECIES_LILEEP - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM message RustboroCity_DevonCorp_2F_Text_ReceivedMonFromResearcher waitmessage waitfanfare @@ -243,7 +243,7 @@ RustboroCity_DevonCorp_2F_EventScript_TransferAnorithToPC:: @ 8211B5C RustboroCity_DevonCorp_2F_EventScript_ReceivedAnorithFanfare:: @ 8211B67 bufferspeciesname 1, SPECIES_ANORITH - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM message RustboroCity_DevonCorp_2F_Text_ReceivedMonFromResearcher waitmessage waitfanfare diff --git a/data/maps/RustboroCity_DevonCorp_3F/map.json b/data/maps/RustboroCity_DevonCorp_3F/map.json index d92e4272e..a31a49dd3 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/map.json +++ b/data/maps/RustboroCity_DevonCorp_3F/map.json @@ -2,7 +2,7 @@ "id": "MAP_RUSTBORO_CITY_DEVON_CORP_3F", "name": "RustboroCity_DevonCorp_3F", "layout": "LAYOUT_RUSTBORO_CITY_DEVON_CORP_3F", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_RUSTBORO_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc index d24b4e902..34a31c692 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc @@ -39,7 +39,7 @@ RustboroCity_DevonCorp_3F_EventScript_MeetPresident:: @ 821246E waitmovement 0 msgbox RustboroCity_DevonCorp_3F_Text_WordWithPresidentComeWithMe, MSGBOX_DEFAULT closemessage - playbgm MUS_TSURETEK, 0 + playbgm MUS_FOLLOW_ME, 0 applymovement LOCALID_DEVON_EMPLOYEE, RustboroCity_DevonCorp_3F_Movement_LeadPlayerToPresident applymovement OBJ_EVENT_ID_PLAYER, RustboroCity_DevonCorp_3F_Movement_PlayerFollowToPresident waitmovement 0 @@ -52,7 +52,7 @@ RustboroCity_DevonCorp_3F_EventScript_MeetPresident:: @ 821246E msgbox RustboroCity_DevonCorp_3F_Text_MrStoneIHaveFavor, MSGBOX_DEFAULT giveitem ITEM_LETTER msgbox RustboroCity_DevonCorp_3F_Text_MrStoneWantYouToHaveThis, MSGBOX_DEFAULT - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM message RustboroCity_DevonCorp_3F_Text_ReceivedPokenav waitfanfare setflag FLAG_SYS_POKENAV_GET diff --git a/data/maps/RustboroCity_Flat1_1F/map.json b/data/maps/RustboroCity_Flat1_1F/map.json index 31341e0b7..d4ddfb2f6 100644 --- a/data/maps/RustboroCity_Flat1_1F/map.json +++ b/data/maps/RustboroCity_Flat1_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_RUSTBORO_CITY_FLAT1_1F", "name": "RustboroCity_Flat1_1F", "layout": "LAYOUT_RUSTBORO_CITY_FLAT1_1F", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_RUSTBORO_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RustboroCity_Flat1_2F/map.json b/data/maps/RustboroCity_Flat1_2F/map.json index 454a0f1b5..3756411d7 100644 --- a/data/maps/RustboroCity_Flat1_2F/map.json +++ b/data/maps/RustboroCity_Flat1_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_RUSTBORO_CITY_FLAT1_2F", "name": "RustboroCity_Flat1_2F", "layout": "LAYOUT_RUSTBORO_CITY_FLAT1_2F", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_RUSTBORO_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RustboroCity_Flat2_1F/map.json b/data/maps/RustboroCity_Flat2_1F/map.json index 29494765c..5379567ff 100644 --- a/data/maps/RustboroCity_Flat2_1F/map.json +++ b/data/maps/RustboroCity_Flat2_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_RUSTBORO_CITY_FLAT2_1F", "name": "RustboroCity_Flat2_1F", "layout": "LAYOUT_RUSTBORO_CITY_FLAT2_1F", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_RUSTBORO_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RustboroCity_Flat2_2F/map.json b/data/maps/RustboroCity_Flat2_2F/map.json index 8f3e659cd..1ba0bbbba 100644 --- a/data/maps/RustboroCity_Flat2_2F/map.json +++ b/data/maps/RustboroCity_Flat2_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_RUSTBORO_CITY_FLAT2_2F", "name": "RustboroCity_Flat2_2F", "layout": "LAYOUT_RUSTBORO_CITY_FLAT2_2F", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_RUSTBORO_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RustboroCity_Flat2_3F/map.json b/data/maps/RustboroCity_Flat2_3F/map.json index 927ff6c34..da911f004 100644 --- a/data/maps/RustboroCity_Flat2_3F/map.json +++ b/data/maps/RustboroCity_Flat2_3F/map.json @@ -2,7 +2,7 @@ "id": "MAP_RUSTBORO_CITY_FLAT2_3F", "name": "RustboroCity_Flat2_3F", "layout": "LAYOUT_RUSTBORO_CITY_FLAT2_3F", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_RUSTBORO_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RustboroCity_Gym/map.json b/data/maps/RustboroCity_Gym/map.json index e473c3e1b..36ae306ab 100644 --- a/data/maps/RustboroCity_Gym/map.json +++ b/data/maps/RustboroCity_Gym/map.json @@ -2,7 +2,7 @@ "id": "MAP_RUSTBORO_CITY_GYM", "name": "RustboroCity_Gym", "layout": "LAYOUT_RUSTBORO_CITY_GYM", - "music": "MUS_GIM", + "music": "MUS_GYM", "region_map_section": "MAPSEC_RUSTBORO_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RustboroCity_Gym/scripts.inc b/data/maps/RustboroCity_Gym/scripts.inc index ce6fdb127..6d9895fe5 100644 --- a/data/maps/RustboroCity_Gym/scripts.inc +++ b/data/maps/RustboroCity_Gym/scripts.inc @@ -96,7 +96,7 @@ RustboroCity_Gym_EventScript_RegisterRoxanne:: @ 821307B pokenavcall RustboroCity_Gym_Text_RoxanneRegisterCall waitmessage delay 30 - playfanfare MUS_ME_TORE_EYE + playfanfare MUS_REGISTER_MATCH_CALL msgbox RustboroCity_Gym_Text_RegisteredRoxanne, MSGBOX_DEFAULT waitfanfare closemessage diff --git a/data/maps/RustboroCity_House1/map.json b/data/maps/RustboroCity_House1/map.json index 85b4ee2b1..a57b1a693 100644 --- a/data/maps/RustboroCity_House1/map.json +++ b/data/maps/RustboroCity_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_RUSTBORO_CITY_HOUSE1", "name": "RustboroCity_House1", "layout": "LAYOUT_RUSTBORO_CITY_HOUSE1", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_RUSTBORO_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RustboroCity_House2/map.json b/data/maps/RustboroCity_House2/map.json index dd30ff71c..fdaed84fc 100644 --- a/data/maps/RustboroCity_House2/map.json +++ b/data/maps/RustboroCity_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_RUSTBORO_CITY_HOUSE2", "name": "RustboroCity_House2", "layout": "LAYOUT_RUSTBORO_CITY_HOUSE", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_RUSTBORO_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RustboroCity_House3/map.json b/data/maps/RustboroCity_House3/map.json index 3a757de8b..491550a2c 100644 --- a/data/maps/RustboroCity_House3/map.json +++ b/data/maps/RustboroCity_House3/map.json @@ -2,7 +2,7 @@ "id": "MAP_RUSTBORO_CITY_HOUSE3", "name": "RustboroCity_House3", "layout": "LAYOUT_RUSTBORO_CITY_HOUSE", - "music": "MUS_GOTOWN", + "music": "MUS_RUSTBORO", "region_map_section": "MAPSEC_RUSTBORO_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RustboroCity_Mart/map.json b/data/maps/RustboroCity_Mart/map.json index 423fbb4e7..1a5b4549f 100644 --- a/data/maps/RustboroCity_Mart/map.json +++ b/data/maps/RustboroCity_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_RUSTBORO_CITY_MART", "name": "RustboroCity_Mart", "layout": "LAYOUT_MART", - "music": "MUS_FRIENDLY", + "music": "MUS_POKE_MART", "region_map_section": "MAPSEC_RUSTBORO_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RustboroCity_PokemonCenter_1F/map.json b/data/maps/RustboroCity_PokemonCenter_1F/map.json index e6c332678..633626c4c 100644 --- a/data/maps/RustboroCity_PokemonCenter_1F/map.json +++ b/data/maps/RustboroCity_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_RUSTBORO_CITY_POKEMON_CENTER_1F", "name": "RustboroCity_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_RUSTBORO_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RustboroCity_PokemonCenter_2F/map.json b/data/maps/RustboroCity_PokemonCenter_2F/map.json index dbdaddfc6..912e4b263 100644 --- a/data/maps/RustboroCity_PokemonCenter_2F/map.json +++ b/data/maps/RustboroCity_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_RUSTBORO_CITY_POKEMON_CENTER_2F", "name": "RustboroCity_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_RUSTBORO_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RustboroCity_PokemonSchool/map.json b/data/maps/RustboroCity_PokemonSchool/map.json index af9b02d98..e299248a0 100644 --- a/data/maps/RustboroCity_PokemonSchool/map.json +++ b/data/maps/RustboroCity_PokemonSchool/map.json @@ -2,7 +2,7 @@ "id": "MAP_RUSTBORO_CITY_POKEMON_SCHOOL", "name": "RustboroCity_PokemonSchool", "layout": "LAYOUT_RUSTBORO_CITY_POKEMON_SCHOOL", - "music": "MUS_P_SCHOOL", + "music": "MUS_SCHOOL", "region_map_section": "MAPSEC_RUSTBORO_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RusturfTunnel/map.json b/data/maps/RusturfTunnel/map.json index 0d6ae7d9b..d8531c879 100644 --- a/data/maps/RusturfTunnel/map.json +++ b/data/maps/RusturfTunnel/map.json @@ -2,7 +2,7 @@ "id": "MAP_RUSTURF_TUNNEL", "name": "RusturfTunnel", "layout": "LAYOUT_RUSTURF_TUNNEL", - "music": "MUS_DAN01", + "music": "MUS_PETALBURG_WOODS", "region_map_section": "MAPSEC_RUSTURF_TUNNEL", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", diff --git a/data/maps/RusturfTunnel/scripts.inc b/data/maps/RusturfTunnel/scripts.inc index a342135bf..17a229ab5 100644 --- a/data/maps/RusturfTunnel/scripts.inc +++ b/data/maps/RusturfTunnel/scripts.inc @@ -316,7 +316,7 @@ RusturfTunnel_EventScript_Peeko:: @ 822D0AF RusturfTunnel_EventScript_Grunt:: @ 822D0C2 lock faceplayer - playbgm MUS_AQA_0, 0 + playbgm MUS_ENCOUNTER_AQUA, 0 msgbox RusturfTunnel_Text_GruntIntro, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_GRUNT_RUSTURF_TUNNEL, RusturfTunnel_Text_GruntDefeat msgbox RusturfTunnel_Text_GruntTakePackage, MSGBOX_DEFAULT diff --git a/data/maps/SSTidalCorridor/map.json b/data/maps/SSTidalCorridor/map.json index dc65b2443..7356e1fe0 100644 --- a/data/maps/SSTidalCorridor/map.json +++ b/data/maps/SSTidalCorridor/map.json @@ -2,7 +2,7 @@ "id": "MAP_SS_TIDAL_CORRIDOR", "name": "SSTidalCorridor", "layout": "LAYOUT_SS_TIDAL_CORRIDOR", - "music": "MUS_M_BOAT", + "music": "MUS_SAILING", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSTidalCorridor/scripts.inc b/data/maps/SSTidalCorridor/scripts.inc index a055c6548..b6fa7428e 100644 --- a/data/maps/SSTidalCorridor/scripts.inc +++ b/data/maps/SSTidalCorridor/scripts.inc @@ -17,7 +17,7 @@ SSTidalCorridor_EventScript_DepartSlateportForLilycove:: @ 823BFFF special SetSSTidalFlag setvar VAR_SS_TIDAL_STATE, SS_TIDAL_DEPART_SLATEPORT lockall - playse SE_PINPON + playse SE_DING_DONG msgbox SSTidal_Text_FastCurrentsHopeYouEnjoyVoyage, MSGBOX_DEFAULT releaseall end @@ -25,7 +25,7 @@ SSTidalCorridor_EventScript_DepartSlateportForLilycove:: @ 823BFFF SSTidalCorridor_EventScript_DepartLilycoveForSlateport:: @ 823C015 setvar VAR_SS_TIDAL_STATE, SS_TIDAL_DEPART_LILYCOVE lockall - playse SE_PINPON + playse SE_DING_DONG msgbox SSTidal_Text_HopeYouEnjoyVoyage, MSGBOX_DEFAULT releaseall end @@ -33,14 +33,14 @@ SSTidalCorridor_EventScript_DepartLilycoveForSlateport:: @ 823C015 SSTidalRooms_EventScript_HalfwayToSlateport:: @ 823C028 special SetSSTidalFlag setvar VAR_SS_TIDAL_STATE, SS_TIDAL_HALFWAY_SLATEPORT - playse SE_PINPON + playse SE_DING_DONG msgbox SSTidal_Text_FastCurrentsHopeYouEnjoyVoyage, MSGBOX_DEFAULT return SSTidalRooms_EventScript_ArrivedInLilycove:: @ 823C03C special ResetSSTidalFlag setvar VAR_SS_TIDAL_STATE, SS_TIDAL_LAND_LILYCOVE - playse SE_PINPON + playse SE_DING_DONG msgbox SSTidal_Text_MadeLandInLilycove, MSGBOX_DEFAULT return @@ -55,7 +55,7 @@ SSTidalCorridor_EventScript_HalfwayToLilycove:: @ 823C067 special ResetSSTidalFlag setvar VAR_SS_TIDAL_STATE, SS_TIDAL_HALFWAY_LILYCOVE lockall - playse SE_PINPON + playse SE_DING_DONG msgbox SSTidal_Text_HopeYouEnjoyVoyage, MSGBOX_DEFAULT releaseall end @@ -64,7 +64,7 @@ SSTidalCorridor_EventScript_ArrivedInSlateport:: @ 823C07D special ResetSSTidalFlag setvar VAR_SS_TIDAL_STATE, SS_TIDAL_LAND_SLATEPORT lockall - playse SE_PINPON + playse SE_DING_DONG msgbox SSTidal_Text_MadeLandInSlateport, MSGBOX_DEFAULT releaseall end @@ -72,7 +72,7 @@ SSTidalCorridor_EventScript_ArrivedInSlateport:: @ 823C07D SSTidalRooms_EventScript_ArrivedInSlateport:: @ 823C093 special ResetSSTidalFlag setvar VAR_SS_TIDAL_STATE, SS_TIDAL_LAND_SLATEPORT - playse SE_PINPON + playse SE_DING_DONG msgbox SSTidal_Text_MadeLandInSlateport, MSGBOX_DEFAULT return @@ -204,7 +204,7 @@ SSTidalCorridor_EventScript_ScottScene:: @ 823C219 applymovement LOCALID_SAILOR, SSTidalCorridor_Movement_SailorMoveForScott applymovement LOCALID_SCOTT, SSTidalCorridor_Movement_ScottExit waitmovement 0 - playse SE_KAIDAN + playse SE_EXIT waitse removeobject LOCALID_SCOTT applymovement LOCALID_SAILOR, SSTidalCorridor_Movement_SailorReturn diff --git a/data/maps/SSTidalLowerDeck/map.json b/data/maps/SSTidalLowerDeck/map.json index 25a24c1b9..79331001a 100644 --- a/data/maps/SSTidalLowerDeck/map.json +++ b/data/maps/SSTidalLowerDeck/map.json @@ -2,7 +2,7 @@ "id": "MAP_SS_TIDAL_LOWER_DECK", "name": "SSTidalLowerDeck", "layout": "LAYOUT_SS_TIDAL_LOWER_DECK", - "music": "MUS_M_BOAT", + "music": "MUS_SAILING", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSTidalRooms/map.json b/data/maps/SSTidalRooms/map.json index 32fe40245..fd65d5ce2 100644 --- a/data/maps/SSTidalRooms/map.json +++ b/data/maps/SSTidalRooms/map.json @@ -2,7 +2,7 @@ "id": "MAP_SS_TIDAL_ROOMS", "name": "SSTidalRooms", "layout": "LAYOUT_SS_TIDAL_ROOMS", - "music": "MUS_M_BOAT", + "music": "MUS_SAILING", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SafariZone_North/map.json b/data/maps/SafariZone_North/map.json index baccf0465..2419587d8 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_SAFARI", + "music": "MUS_SAFARI_ZONE", "region_map_section": "MAPSEC_SAFARI_ZONE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SafariZone_Northeast/map.json b/data/maps/SafariZone_Northeast/map.json index 7855417f1..910403107 100644 --- a/data/maps/SafariZone_Northeast/map.json +++ b/data/maps/SafariZone_Northeast/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFARI_ZONE_NORTHEAST", "name": "SafariZone_Northeast", "layout": "LAYOUT_SAFARI_ZONE_NORTHEAST", - "music": "MUS_SAFARI", + "music": "MUS_SAFARI_ZONE", "region_map_section": "MAPSEC_SAFARI_ZONE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SafariZone_Northwest/map.json b/data/maps/SafariZone_Northwest/map.json index 3974f00de..1e27def2c 100644 --- a/data/maps/SafariZone_Northwest/map.json +++ b/data/maps/SafariZone_Northwest/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFARI_ZONE_NORTHWEST", "name": "SafariZone_Northwest", "layout": "LAYOUT_SAFARI_ZONE_NORTHWEST", - "music": "MUS_SAFARI", + "music": "MUS_SAFARI_ZONE", "region_map_section": "MAPSEC_SAFARI_ZONE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SafariZone_RestHouse/map.json b/data/maps/SafariZone_RestHouse/map.json index cae90c79d..e03b024ae 100644 --- a/data/maps/SafariZone_RestHouse/map.json +++ b/data/maps/SafariZone_RestHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFARI_ZONE_REST_HOUSE", "name": "SafariZone_RestHouse", "layout": "LAYOUT_SAFARI_ZONE_REST_HOUSE", - "music": "MUS_SAFARI", + "music": "MUS_SAFARI_ZONE", "region_map_section": "MAPSEC_SAFARI_ZONE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SafariZone_South/map.json b/data/maps/SafariZone_South/map.json index 78ab47f72..562b85b9e 100644 --- a/data/maps/SafariZone_South/map.json +++ b/data/maps/SafariZone_South/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFARI_ZONE_SOUTH", "name": "SafariZone_South", "layout": "LAYOUT_SAFARI_ZONE_SOUTH", - "music": "MUS_SAFARI", + "music": "MUS_SAFARI_ZONE", "region_map_section": "MAPSEC_SAFARI_ZONE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SafariZone_Southeast/map.json b/data/maps/SafariZone_Southeast/map.json index 174014f3e..723e874cc 100644 --- a/data/maps/SafariZone_Southeast/map.json +++ b/data/maps/SafariZone_Southeast/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFARI_ZONE_SOUTHEAST", "name": "SafariZone_Southeast", "layout": "LAYOUT_SAFARI_ZONE_SOUTHEAST", - "music": "MUS_SAFARI", + "music": "MUS_SAFARI_ZONE", "region_map_section": "MAPSEC_SAFARI_ZONE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SafariZone_Southwest/map.json b/data/maps/SafariZone_Southwest/map.json index 95017668e..42faf1f50 100644 --- a/data/maps/SafariZone_Southwest/map.json +++ b/data/maps/SafariZone_Southwest/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFARI_ZONE_SOUTHWEST", "name": "SafariZone_Southwest", "layout": "LAYOUT_SAFARI_ZONE_SOUTHWEST", - "music": "MUS_SAFARI", + "music": "MUS_SAFARI_ZONE", "region_map_section": "MAPSEC_SAFARI_ZONE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ScorchedSlab/map.json b/data/maps/ScorchedSlab/map.json index 86e06c268..e90f1f5c1 100644 --- a/data/maps/ScorchedSlab/map.json +++ b/data/maps/ScorchedSlab/map.json @@ -2,7 +2,7 @@ "id": "MAP_SCORCHED_SLAB", "name": "ScorchedSlab", "layout": "LAYOUT_SCORCHED_SLAB", - "music": "MUS_DAN01", + "music": "MUS_PETALBURG_WOODS", "region_map_section": "MAPSEC_SCORCHED_SLAB", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SeafloorCavern_Entrance/map.json b/data/maps/SeafloorCavern_Entrance/map.json index bc79a5f01..a80fce6c1 100644 --- a/data/maps/SeafloorCavern_Entrance/map.json +++ b/data/maps/SeafloorCavern_Entrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEAFLOOR_CAVERN_ENTRANCE", "name": "SeafloorCavern_Entrance", "layout": "LAYOUT_SEAFLOOR_CAVERN_ENTRANCE", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_SEAFLOOR_CAVERN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SeafloorCavern_Room1/map.json b/data/maps/SeafloorCavern_Room1/map.json index 0e6bd1bad..2caa79414 100644 --- a/data/maps/SeafloorCavern_Room1/map.json +++ b/data/maps/SeafloorCavern_Room1/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEAFLOOR_CAVERN_ROOM1", "name": "SeafloorCavern_Room1", "layout": "LAYOUT_SEAFLOOR_CAVERN_ROOM1", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_SEAFLOOR_CAVERN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SeafloorCavern_Room2/map.json b/data/maps/SeafloorCavern_Room2/map.json index 1391cc395..bfdd30499 100644 --- a/data/maps/SeafloorCavern_Room2/map.json +++ b/data/maps/SeafloorCavern_Room2/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEAFLOOR_CAVERN_ROOM2", "name": "SeafloorCavern_Room2", "layout": "LAYOUT_SEAFLOOR_CAVERN_ROOM2", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_SEAFLOOR_CAVERN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SeafloorCavern_Room3/map.json b/data/maps/SeafloorCavern_Room3/map.json index e40bcbcf5..478e108be 100644 --- a/data/maps/SeafloorCavern_Room3/map.json +++ b/data/maps/SeafloorCavern_Room3/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEAFLOOR_CAVERN_ROOM3", "name": "SeafloorCavern_Room3", "layout": "LAYOUT_SEAFLOOR_CAVERN_ROOM3", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_SEAFLOOR_CAVERN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SeafloorCavern_Room4/map.json b/data/maps/SeafloorCavern_Room4/map.json index 80de38537..9ea3528a3 100644 --- a/data/maps/SeafloorCavern_Room4/map.json +++ b/data/maps/SeafloorCavern_Room4/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEAFLOOR_CAVERN_ROOM4", "name": "SeafloorCavern_Room4", "layout": "LAYOUT_SEAFLOOR_CAVERN_ROOM4", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_SEAFLOOR_CAVERN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SeafloorCavern_Room5/map.json b/data/maps/SeafloorCavern_Room5/map.json index 9d6ca9e6a..415e2a718 100644 --- a/data/maps/SeafloorCavern_Room5/map.json +++ b/data/maps/SeafloorCavern_Room5/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEAFLOOR_CAVERN_ROOM5", "name": "SeafloorCavern_Room5", "layout": "LAYOUT_SEAFLOOR_CAVERN_ROOM5", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_SEAFLOOR_CAVERN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SeafloorCavern_Room6/map.json b/data/maps/SeafloorCavern_Room6/map.json index eb4c7f9d9..598f4a042 100644 --- a/data/maps/SeafloorCavern_Room6/map.json +++ b/data/maps/SeafloorCavern_Room6/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEAFLOOR_CAVERN_ROOM6", "name": "SeafloorCavern_Room6", "layout": "LAYOUT_SEAFLOOR_CAVERN_ROOM6", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_SEAFLOOR_CAVERN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SeafloorCavern_Room7/map.json b/data/maps/SeafloorCavern_Room7/map.json index 0f135d36a..243a1f9d1 100644 --- a/data/maps/SeafloorCavern_Room7/map.json +++ b/data/maps/SeafloorCavern_Room7/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEAFLOOR_CAVERN_ROOM7", "name": "SeafloorCavern_Room7", "layout": "LAYOUT_SEAFLOOR_CAVERN_ROOM7", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_SEAFLOOR_CAVERN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SeafloorCavern_Room8/map.json b/data/maps/SeafloorCavern_Room8/map.json index 90cd3ae7a..7c5d5c820 100644 --- a/data/maps/SeafloorCavern_Room8/map.json +++ b/data/maps/SeafloorCavern_Room8/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEAFLOOR_CAVERN_ROOM8", "name": "SeafloorCavern_Room8", "layout": "LAYOUT_SEAFLOOR_CAVERN_ROOM8", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_SEAFLOOR_CAVERN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SeafloorCavern_Room9/map.json b/data/maps/SeafloorCavern_Room9/map.json index cd5263488..94ef88e84 100644 --- a/data/maps/SeafloorCavern_Room9/map.json +++ b/data/maps/SeafloorCavern_Room9/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEAFLOOR_CAVERN_ROOM9", "name": "SeafloorCavern_Room9", "layout": "LAYOUT_SEAFLOOR_CAVERN_ROOM9", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_SEAFLOOR_CAVERN", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", diff --git a/data/maps/SeafloorCavern_Room9/scripts.inc b/data/maps/SeafloorCavern_Room9/scripts.inc index 667251936..63c5853c3 100644 --- a/data/maps/SeafloorCavern_Room9/scripts.inc +++ b/data/maps/SeafloorCavern_Room9/scripts.inc @@ -18,7 +18,7 @@ SeafloorCavern_Room9_EventScript_ArchieAwakenKyogre:: @ 8234DC9 waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, SeafloorCavern_Room9_Movement_Delay32 waitmovement 0 - playbgm MUS_AQA_0, 0 + playbgm MUS_ENCOUNTER_AQUA, 0 msgbox SeafloorCavern_Room9_Text_ArchieHoldItRightThere, MSGBOX_DEFAULT closemessage addobject VAR_0x8004 @@ -43,13 +43,13 @@ SeafloorCavern_Room9_EventScript_ArchieAwakenKyogre:: @ 8234DC9 special WaitWeather waitstate setvar VAR_RESULT, 1 - playse SE_W197 + playse SE_M_DETECT dofieldeffectsparkle 16, 42, 0 waitfieldeffect FLDEFF_SPARKLE closemessage setvar VAR_RESULT, 0 - playfanfare MUS_ME_TAMA - playse SE_TAMA + playfanfare MUS_AWAKEN_LEGEND + playse SE_ORB special DoOrbEffect applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestUp applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp diff --git a/data/maps/SealedChamber_InnerRoom/map.json b/data/maps/SealedChamber_InnerRoom/map.json index febf5defa..1f8e741d8 100644 --- a/data/maps/SealedChamber_InnerRoom/map.json +++ b/data/maps/SealedChamber_InnerRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEALED_CHAMBER_INNER_ROOM", "name": "SealedChamber_InnerRoom", "layout": "LAYOUT_SEALED_CHAMBER_INNER_ROOM", - "music": "MUS_MABOROSI", + "music": "MUS_SEALED_CHAMBER", "region_map_section": "MAPSEC_SEALED_CHAMBER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SealedChamber_InnerRoom/scripts.inc b/data/maps/SealedChamber_InnerRoom/scripts.inc index 15c98e57e..c31bb7efc 100644 --- a/data/maps/SealedChamber_InnerRoom/scripts.inc +++ b/data/maps/SealedChamber_InnerRoom/scripts.inc @@ -11,7 +11,7 @@ SealedChamber_InnerRoom_EventScript_BrailleBackWall:: @ 82391F8 compare VAR_RESULT, FALSE goto_if_eq SealedChamber_InnerRoom_EventScript_NoEffect fadeoutbgm 0 - playse SE_TRACK_MOVE + playse SE_TRUCK_MOVE special DoSealedChamberShakingEffect1 waitstate delay 40 diff --git a/data/maps/SealedChamber_OuterRoom/map.json b/data/maps/SealedChamber_OuterRoom/map.json index 88694940b..e16350d7e 100644 --- a/data/maps/SealedChamber_OuterRoom/map.json +++ b/data/maps/SealedChamber_OuterRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEALED_CHAMBER_OUTER_ROOM", "name": "SealedChamber_OuterRoom", "layout": "LAYOUT_SEALED_CHAMBER_OUTER_ROOM", - "music": "MUS_MABOROSI", + "music": "MUS_SEALED_CHAMBER", "region_map_section": "MAPSEC_SEALED_CHAMBER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_BlueCave1/map.json b/data/maps/SecretBase_BlueCave1/map.json index 8690a8aad..3fb6157cc 100644 --- a/data/maps/SecretBase_BlueCave1/map.json +++ b/data/maps/SecretBase_BlueCave1/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_BlueCave1", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_BLUE_CAVE1", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_BlueCave2/map.json b/data/maps/SecretBase_BlueCave2/map.json index feee5c585..ca15e39f1 100644 --- a/data/maps/SecretBase_BlueCave2/map.json +++ b/data/maps/SecretBase_BlueCave2/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_BlueCave2", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_BLUE_CAVE2", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_BlueCave3/map.json b/data/maps/SecretBase_BlueCave3/map.json index c26af7cba..356b4894d 100644 --- a/data/maps/SecretBase_BlueCave3/map.json +++ b/data/maps/SecretBase_BlueCave3/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_BlueCave3", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_BLUE_CAVE3", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_BlueCave4/map.json b/data/maps/SecretBase_BlueCave4/map.json index 3dc34e188..078bada8e 100644 --- a/data/maps/SecretBase_BlueCave4/map.json +++ b/data/maps/SecretBase_BlueCave4/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_BlueCave4", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_BLUE_CAVE4", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_BrownCave1/map.json b/data/maps/SecretBase_BrownCave1/map.json index 0671d40a3..6f2dc92f2 100644 --- a/data/maps/SecretBase_BrownCave1/map.json +++ b/data/maps/SecretBase_BrownCave1/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_BrownCave1", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_BROWN_CAVE1", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_BrownCave2/map.json b/data/maps/SecretBase_BrownCave2/map.json index 5fc3df0e5..11559c12f 100644 --- a/data/maps/SecretBase_BrownCave2/map.json +++ b/data/maps/SecretBase_BrownCave2/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_BrownCave2", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_BROWN_CAVE2", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_BrownCave3/map.json b/data/maps/SecretBase_BrownCave3/map.json index 29a27ad39..c2dbb7fc4 100644 --- a/data/maps/SecretBase_BrownCave3/map.json +++ b/data/maps/SecretBase_BrownCave3/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_BrownCave3", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_BROWN_CAVE3", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_BrownCave4/map.json b/data/maps/SecretBase_BrownCave4/map.json index 05d9fff3e..e7147ae85 100644 --- a/data/maps/SecretBase_BrownCave4/map.json +++ b/data/maps/SecretBase_BrownCave4/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_BrownCave4", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_BROWN_CAVE4", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_RedCave1/map.json b/data/maps/SecretBase_RedCave1/map.json index 8a3be38be..fd264fc6c 100644 --- a/data/maps/SecretBase_RedCave1/map.json +++ b/data/maps/SecretBase_RedCave1/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_RedCave1", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_RED_CAVE1", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_RedCave2/map.json b/data/maps/SecretBase_RedCave2/map.json index 71c64bb77..b60b3bbff 100644 --- a/data/maps/SecretBase_RedCave2/map.json +++ b/data/maps/SecretBase_RedCave2/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_RedCave2", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_RED_CAVE2", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_RedCave3/map.json b/data/maps/SecretBase_RedCave3/map.json index e30c50b46..079837a62 100644 --- a/data/maps/SecretBase_RedCave3/map.json +++ b/data/maps/SecretBase_RedCave3/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_RedCave3", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_RED_CAVE3", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_RedCave4/map.json b/data/maps/SecretBase_RedCave4/map.json index d1abb1a74..10fbbfeb0 100644 --- a/data/maps/SecretBase_RedCave4/map.json +++ b/data/maps/SecretBase_RedCave4/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_RedCave4", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_RED_CAVE4", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_Shrub1/map.json b/data/maps/SecretBase_Shrub1/map.json index 5dba2b143..e0d1015cb 100644 --- a/data/maps/SecretBase_Shrub1/map.json +++ b/data/maps/SecretBase_Shrub1/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_Shrub1", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_SHRUB1", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_Shrub2/map.json b/data/maps/SecretBase_Shrub2/map.json index cdd5b1e00..879b7464e 100644 --- a/data/maps/SecretBase_Shrub2/map.json +++ b/data/maps/SecretBase_Shrub2/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_Shrub2", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_SHRUB2", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_Shrub3/map.json b/data/maps/SecretBase_Shrub3/map.json index cbdb08664..6751a7414 100644 --- a/data/maps/SecretBase_Shrub3/map.json +++ b/data/maps/SecretBase_Shrub3/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_Shrub3", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_SHRUB3", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_Shrub4/map.json b/data/maps/SecretBase_Shrub4/map.json index 3a7caee6b..c193b8348 100644 --- a/data/maps/SecretBase_Shrub4/map.json +++ b/data/maps/SecretBase_Shrub4/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_Shrub4", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_SHRUB4", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_Tree1/map.json b/data/maps/SecretBase_Tree1/map.json index f9430cf0d..cd0cad5f0 100644 --- a/data/maps/SecretBase_Tree1/map.json +++ b/data/maps/SecretBase_Tree1/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_Tree1", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_TREE1", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_Tree2/map.json b/data/maps/SecretBase_Tree2/map.json index 79b1928b1..1ac393a15 100644 --- a/data/maps/SecretBase_Tree2/map.json +++ b/data/maps/SecretBase_Tree2/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_Tree2", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_TREE2", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_Tree3/map.json b/data/maps/SecretBase_Tree3/map.json index 9454cea0b..b7eec2244 100644 --- a/data/maps/SecretBase_Tree3/map.json +++ b/data/maps/SecretBase_Tree3/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_Tree3", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_TREE3", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_Tree4/map.json b/data/maps/SecretBase_Tree4/map.json index 8f9b0ebf7..0e068ec94 100644 --- a/data/maps/SecretBase_Tree4/map.json +++ b/data/maps/SecretBase_Tree4/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_Tree4", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_TREE4", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_YellowCave1/map.json b/data/maps/SecretBase_YellowCave1/map.json index 2bdf097c9..1d873bfe2 100644 --- a/data/maps/SecretBase_YellowCave1/map.json +++ b/data/maps/SecretBase_YellowCave1/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_YellowCave1", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_YELLOW_CAVE1", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_YellowCave2/map.json b/data/maps/SecretBase_YellowCave2/map.json index 79d4e6950..af2e957bc 100644 --- a/data/maps/SecretBase_YellowCave2/map.json +++ b/data/maps/SecretBase_YellowCave2/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_YellowCave2", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_YELLOW_CAVE2", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_YellowCave3/map.json b/data/maps/SecretBase_YellowCave3/map.json index 29ea865ca..d78aa2862 100644 --- a/data/maps/SecretBase_YellowCave3/map.json +++ b/data/maps/SecretBase_YellowCave3/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_YellowCave3", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_YELLOW_CAVE3", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SecretBase_YellowCave4/map.json b/data/maps/SecretBase_YellowCave4/map.json index df2db85bd..0ca4bc4d3 100644 --- a/data/maps/SecretBase_YellowCave4/map.json +++ b/data/maps/SecretBase_YellowCave4/map.json @@ -3,7 +3,7 @@ "name": "SecretBase_YellowCave4", "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_YELLOW_CAVE4", - "music": "MUS_MACHI_S3", + "music": "MUS_FORTREE", "region_map_section": "MAPSEC_SECRET_BASE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ShoalCave_HighTideEntranceRoom/map.json b/data/maps/ShoalCave_HighTideEntranceRoom/map.json index 8dec3b1e2..9d3c5156b 100644 --- a/data/maps/ShoalCave_HighTideEntranceRoom/map.json +++ b/data/maps/ShoalCave_HighTideEntranceRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_SHOAL_CAVE_HIGH_TIDE_ENTRANCE_ROOM", "name": "ShoalCave_HighTideEntranceRoom", "layout": "LAYOUT_SHOAL_CAVE_HIGH_TIDE_ENTRANCE_ROOM", - "music": "MUS_M_DUNGON", + "music": "MUS_MT_PYRE", "region_map_section": "MAPSEC_SHOAL_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ShoalCave_HighTideInnerRoom/map.json b/data/maps/ShoalCave_HighTideInnerRoom/map.json index 280397a93..2f183d3ae 100644 --- a/data/maps/ShoalCave_HighTideInnerRoom/map.json +++ b/data/maps/ShoalCave_HighTideInnerRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_SHOAL_CAVE_HIGH_TIDE_INNER_ROOM", "name": "ShoalCave_HighTideInnerRoom", "layout": "LAYOUT_SHOAL_CAVE_HIGH_TIDE_INNER_ROOM", - "music": "MUS_M_DUNGON", + "music": "MUS_MT_PYRE", "region_map_section": "MAPSEC_SHOAL_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/map.json b/data/maps/ShoalCave_LowTideEntranceRoom/map.json index c357ad5d7..ba71e1085 100644 --- a/data/maps/ShoalCave_LowTideEntranceRoom/map.json +++ b/data/maps/ShoalCave_LowTideEntranceRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM", "name": "ShoalCave_LowTideEntranceRoom", "layout": "LAYOUT_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM", - "music": "MUS_M_DUNGON", + "music": "MUS_MT_PYRE", "region_map_section": "MAPSEC_SHOAL_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ShoalCave_LowTideIceRoom/map.json b/data/maps/ShoalCave_LowTideIceRoom/map.json index d8ecab059..ea4f0cedf 100644 --- a/data/maps/ShoalCave_LowTideIceRoom/map.json +++ b/data/maps/ShoalCave_LowTideIceRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_SHOAL_CAVE_LOW_TIDE_ICE_ROOM", "name": "ShoalCave_LowTideIceRoom", "layout": "LAYOUT_SHOAL_CAVE_LOW_TIDE_ICE_ROOM", - "music": "MUS_M_DUNGON", + "music": "MUS_MT_PYRE", "region_map_section": "MAPSEC_SHOAL_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ShoalCave_LowTideInnerRoom/map.json b/data/maps/ShoalCave_LowTideInnerRoom/map.json index 1d0f44e0e..bf172e8b4 100644 --- a/data/maps/ShoalCave_LowTideInnerRoom/map.json +++ b/data/maps/ShoalCave_LowTideInnerRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM", "name": "ShoalCave_LowTideInnerRoom", "layout": "LAYOUT_SHOAL_CAVE_LOW_TIDE_INNER_ROOM", - "music": "MUS_M_DUNGON", + "music": "MUS_MT_PYRE", "region_map_section": "MAPSEC_SHOAL_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ShoalCave_LowTideLowerRoom/map.json b/data/maps/ShoalCave_LowTideLowerRoom/map.json index 40adf38cc..719841ec0 100644 --- a/data/maps/ShoalCave_LowTideLowerRoom/map.json +++ b/data/maps/ShoalCave_LowTideLowerRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM", "name": "ShoalCave_LowTideLowerRoom", "layout": "LAYOUT_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM", - "music": "MUS_M_DUNGON", + "music": "MUS_MT_PYRE", "region_map_section": "MAPSEC_SHOAL_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ShoalCave_LowTideStairsRoom/map.json b/data/maps/ShoalCave_LowTideStairsRoom/map.json index a2ea91b5b..4207c9584 100644 --- a/data/maps/ShoalCave_LowTideStairsRoom/map.json +++ b/data/maps/ShoalCave_LowTideStairsRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM", "name": "ShoalCave_LowTideStairsRoom", "layout": "LAYOUT_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM", - "music": "MUS_M_DUNGON", + "music": "MUS_MT_PYRE", "region_map_section": "MAPSEC_SHOAL_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SkyPillar_1F/map.json b/data/maps/SkyPillar_1F/map.json index 17528b619..6ce499be2 100644 --- a/data/maps/SkyPillar_1F/map.json +++ b/data/maps/SkyPillar_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SKY_PILLAR_1F", "name": "SkyPillar_1F", "layout": "LAYOUT_SKY_PILLAR_1F", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_SKY_PILLAR", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SkyPillar_2F/map.json b/data/maps/SkyPillar_2F/map.json index 1430f9dc7..7b534c2f7 100644 --- a/data/maps/SkyPillar_2F/map.json +++ b/data/maps/SkyPillar_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SKY_PILLAR_2F", "name": "SkyPillar_2F", "layout": "LAYOUT_SKY_PILLAR_2F", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_SKY_PILLAR", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SkyPillar_3F/map.json b/data/maps/SkyPillar_3F/map.json index ddec299b5..c05324f10 100644 --- a/data/maps/SkyPillar_3F/map.json +++ b/data/maps/SkyPillar_3F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SKY_PILLAR_3F", "name": "SkyPillar_3F", "layout": "LAYOUT_SKY_PILLAR_3F", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_SKY_PILLAR", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SkyPillar_4F/map.json b/data/maps/SkyPillar_4F/map.json index 9c12a2071..7b5ad062e 100644 --- a/data/maps/SkyPillar_4F/map.json +++ b/data/maps/SkyPillar_4F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SKY_PILLAR_4F", "name": "SkyPillar_4F", "layout": "LAYOUT_SKY_PILLAR_4F", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_SKY_PILLAR", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SkyPillar_5F/map.json b/data/maps/SkyPillar_5F/map.json index 2638cb92c..5be104fb0 100644 --- a/data/maps/SkyPillar_5F/map.json +++ b/data/maps/SkyPillar_5F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SKY_PILLAR_5F", "name": "SkyPillar_5F", "layout": "LAYOUT_SKY_PILLAR_5F", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_SKY_PILLAR", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SkyPillar_Entrance/map.json b/data/maps/SkyPillar_Entrance/map.json index 709f0af8d..c880da6ea 100644 --- a/data/maps/SkyPillar_Entrance/map.json +++ b/data/maps/SkyPillar_Entrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_SKY_PILLAR_ENTRANCE", "name": "SkyPillar_Entrance", "layout": "LAYOUT_SKY_PILLAR_ENTRANCE", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_SKY_PILLAR", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SkyPillar_Outside/map.json b/data/maps/SkyPillar_Outside/map.json index 35721fd41..b0d4e198b 100644 --- a/data/maps/SkyPillar_Outside/map.json +++ b/data/maps/SkyPillar_Outside/map.json @@ -2,7 +2,7 @@ "id": "MAP_SKY_PILLAR_OUTSIDE", "name": "SkyPillar_Outside", "layout": "LAYOUT_SKY_PILLAR_OUTSIDE", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_SKY_PILLAR", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SkyPillar_Outside/scripts.inc b/data/maps/SkyPillar_Outside/scripts.inc index 60a1702ab..2e0495bca 100644 --- a/data/maps/SkyPillar_Outside/scripts.inc +++ b/data/maps/SkyPillar_Outside/scripts.inc @@ -81,7 +81,7 @@ SkyPillar_Outside_EventScript_WallaceScene:: @ 8239304 delay 30 msgbox SkyPillar_Outside_Text_GotToGoBackForSootopolis, MSGBOX_DEFAULT closemessage - playse SE_KAIDAN + playse SE_EXIT fadescreenswapbuffers FADE_TO_BLACK clearflag FLAG_HIDE_MAP_NAME_POPUP setvar VAR_SOOTOPOLIS_CITY_STATE, 4 diff --git a/data/maps/SkyPillar_Top/map.json b/data/maps/SkyPillar_Top/map.json index 8da3ca525..90301c53b 100644 --- a/data/maps/SkyPillar_Top/map.json +++ b/data/maps/SkyPillar_Top/map.json @@ -2,7 +2,7 @@ "id": "MAP_SKY_PILLAR_TOP", "name": "SkyPillar_Top", "layout": "LAYOUT_SKY_PILLAR_TOP", - "music": "MUS_TOZAN", + "music": "MUS_MT_CHIMNEY", "region_map_section": "MAPSEC_SKY_PILLAR", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SlateportCity/map.json b/data/maps/SlateportCity/map.json index 40ebfbc11..6ffed4b45 100644 --- a/data/maps/SlateportCity/map.json +++ b/data/maps/SlateportCity/map.json @@ -2,7 +2,7 @@ "id": "MAP_SLATEPORT_CITY", "name": "SlateportCity", "layout": "LAYOUT_SLATEPORT_CITY", - "music": "MUS_FINECITY", + "music": "MUS_SLATEPORT", "region_map_section": "MAPSEC_SLATEPORT_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/SlateportCity/scripts.inc b/data/maps/SlateportCity/scripts.inc index 055e13565..983ce9796 100644 --- a/data/maps/SlateportCity/scripts.inc +++ b/data/maps/SlateportCity/scripts.inc @@ -91,7 +91,7 @@ SlateportCity_EventScript_ScottScene:: @ 81DCD1C msgbox SlateportCity_Text_LetsRegisterEachOther, MSGBOX_DEFAULT closemessage delay 30 - playfanfare MUS_ME_TORE_EYE + playfanfare MUS_REGISTER_MATCH_CALL msgbox SlateportCity_Text_RegisteredScott, MSGBOX_DEFAULT waitfanfare closemessage @@ -170,7 +170,7 @@ SlateportCity_EventScript_EffortRibbonWoman:: @ 81DCDE4 compare VAR_RESULT, FALSE call_if_eq SlateportCity_EventScript_MonEVsNotMaxed msgbox SlateportCity_Text_PleaseGiveItThisEffortRibbon, MSGBOX_DEFAULT - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM message SlateportCity_Text_ReceivedEffortRibbon waitfanfare msgbox SlateportCity_Text_PutEffortRibbonOnMon, MSGBOX_DEFAULT @@ -603,7 +603,7 @@ SlateportCity_EventScript_CaptStern:: @ 81DD1F8 applymovement LOCALID_CAPT_STERN, Common_Movement_WalkInPlaceFastestUp waitmovement 0 msgbox SlateportCity_Text_OhPlayerWeMadeDiscovery, MSGBOX_DEFAULT - playbgm MUS_AQA_0, 0 + playbgm MUS_ENCOUNTER_AQUA, 0 msgbox SlateportCity_Text_AquaWillAssumeControlOfSubmarine, MSGBOX_DEFAULT applymovement LOCALID_COOK, Common_Movement_WalkInPlaceFastestLeft applymovement LOCALID_FAT_MAN, Common_Movement_WalkInPlaceFastestLeft diff --git a/data/maps/SlateportCity_BattleTentBattleRoom/map.json b/data/maps/SlateportCity_BattleTentBattleRoom/map.json index 4bc1ea9f1..27cce84b4 100644 --- a/data/maps/SlateportCity_BattleTentBattleRoom/map.json +++ b/data/maps/SlateportCity_BattleTentBattleRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_SLATEPORT_CITY_BATTLE_TENT_BATTLE_ROOM", "name": "SlateportCity_BattleTentBattleRoom", "layout": "LAYOUT_BATTLE_TENT_BATTLE_ROOM", - "music": "MUS_B_TOWER", + "music": "MUS_B_TOWER_RS", "region_map_section": "MAPSEC_SLATEPORT_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SlateportCity_BattleTentCorridor/map.json b/data/maps/SlateportCity_BattleTentCorridor/map.json index e285ccdb1..c9cd4b1a7 100644 --- a/data/maps/SlateportCity_BattleTentCorridor/map.json +++ b/data/maps/SlateportCity_BattleTentCorridor/map.json @@ -2,7 +2,7 @@ "id": "MAP_SLATEPORT_CITY_BATTLE_TENT_CORRIDOR", "name": "SlateportCity_BattleTentCorridor", "layout": "LAYOUT_BATTLE_TENT_CORRIDOR", - "music": "MUS_B_TOWER", + "music": "MUS_B_TOWER_RS", "region_map_section": "MAPSEC_SLATEPORT_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SlateportCity_BattleTentCorridor/scripts.inc b/data/maps/SlateportCity_BattleTentCorridor/scripts.inc index 85a95ded8..c018f54b9 100644 --- a/data/maps/SlateportCity_BattleTentCorridor/scripts.inc +++ b/data/maps/SlateportCity_BattleTentCorridor/scripts.inc @@ -60,7 +60,7 @@ SlateportCity_BattleTentCorridor_EventScript_ReturnToRoomFromBattle:: @ 8208EEE factory_setopponentmons factory_resethelditems msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_LetUsRestoreMons, MSGBOX_DEFAULT - playfanfare MUS_ME_ASA + playfanfare MUS_HEAL waitfanfare special HealPlayerParty SlateportCity_BattleTentCorridor_EventScript_AskReadyForOpponent:: @ 8208F0D diff --git a/data/maps/SlateportCity_BattleTentLobby/map.json b/data/maps/SlateportCity_BattleTentLobby/map.json index e2c439591..efd03e1e2 100644 --- a/data/maps/SlateportCity_BattleTentLobby/map.json +++ b/data/maps/SlateportCity_BattleTentLobby/map.json @@ -2,7 +2,7 @@ "id": "MAP_SLATEPORT_CITY_BATTLE_TENT_LOBBY", "name": "SlateportCity_BattleTentLobby", "layout": "LAYOUT_BATTLE_TENT_LOBBY", - "music": "MUS_B_TOWER", + "music": "MUS_B_TOWER_RS", "region_map_section": "MAPSEC_SLATEPORT_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SlateportCity_BattleTentLobby/scripts.inc b/data/maps/SlateportCity_BattleTentLobby/scripts.inc index 20f3c3e07..bdc8eb05f 100644 --- a/data/maps/SlateportCity_BattleTentLobby/scripts.inc +++ b/data/maps/SlateportCity_BattleTentLobby/scripts.inc @@ -53,7 +53,7 @@ SlateportCity_BattleTentLobby_EventScript_GivePrize:: @ 82087E9 frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0 message BattleFrontier_BattleTowerLobby_Text_ReceivedPrize @ Odd that it uses Tower's instead of Factory's or its own waitmessage - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM waitfanfare goto SlateportCity_BattleTentLobby_EventScript_EndGivePrize diff --git a/data/maps/SlateportCity_Harbor/map.json b/data/maps/SlateportCity_Harbor/map.json index 19bb83a06..17d3c8940 100644 --- a/data/maps/SlateportCity_Harbor/map.json +++ b/data/maps/SlateportCity_Harbor/map.json @@ -2,7 +2,7 @@ "id": "MAP_SLATEPORT_CITY_HARBOR", "name": "SlateportCity_Harbor", "layout": "LAYOUT_HARBOR", - "music": "MUS_FINECITY", + "music": "MUS_SLATEPORT", "region_map_section": "MAPSEC_SLATEPORT_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SlateportCity_Harbor/scripts.inc b/data/maps/SlateportCity_Harbor/scripts.inc index 5d8dad1db..644911ea6 100644 --- a/data/maps/SlateportCity_Harbor/scripts.inc +++ b/data/maps/SlateportCity_Harbor/scripts.inc @@ -21,7 +21,7 @@ SlateportCity_Harbor_EventScript_ShowSSTidal:: @ 820C9A5 return SlateportCity_Harbor_EventScript_ReadyAquaEscapeScene:: @ 820C9A9 - savebgm MUS_AQA_0 + savebgm MUS_ENCOUNTER_AQUA setobjectxyperm LOCALID_CAPT_STERN, 12, 13 setobjectmovementtype LOCALID_CAPT_STERN, MOVEMENT_TYPE_FACE_LEFT setflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS diff --git a/data/maps/SlateportCity_House/map.json b/data/maps/SlateportCity_House/map.json index d1bdfa1e3..5ccc92566 100644 --- a/data/maps/SlateportCity_House/map.json +++ b/data/maps/SlateportCity_House/map.json @@ -2,7 +2,7 @@ "id": "MAP_SLATEPORT_CITY_HOUSE", "name": "SlateportCity_House", "layout": "LAYOUT_HOUSE2", - "music": "MUS_FINECITY", + "music": "MUS_SLATEPORT", "region_map_section": "MAPSEC_SLATEPORT_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SlateportCity_Mart/map.json b/data/maps/SlateportCity_Mart/map.json index 8c5924ce8..45d322555 100644 --- a/data/maps/SlateportCity_Mart/map.json +++ b/data/maps/SlateportCity_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_SLATEPORT_CITY_MART", "name": "SlateportCity_Mart", "layout": "LAYOUT_MART", - "music": "MUS_FRIENDLY", + "music": "MUS_POKE_MART", "region_map_section": "MAPSEC_SLATEPORT_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SlateportCity_NameRatersHouse/map.json b/data/maps/SlateportCity_NameRatersHouse/map.json index a1728f78a..c0a94fd69 100644 --- a/data/maps/SlateportCity_NameRatersHouse/map.json +++ b/data/maps/SlateportCity_NameRatersHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_SLATEPORT_CITY_NAME_RATERS_HOUSE", "name": "SlateportCity_NameRatersHouse", "layout": "LAYOUT_HOUSE_WITH_BED", - "music": "MUS_FINECITY", + "music": "MUS_SLATEPORT", "region_map_section": "MAPSEC_SLATEPORT_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/map.json b/data/maps/SlateportCity_OceanicMuseum_1F/map.json index 00b2e8912..7748f5438 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/map.json +++ b/data/maps/SlateportCity_OceanicMuseum_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F", "name": "SlateportCity_OceanicMuseum_1F", "layout": "LAYOUT_SLATEPORT_CITY_OCEANIC_MUSEUM_1F", - "music": "MUS_FUNE_KAN", + "music": "MUS_OCEANIC_MUSEUM", "region_map_section": "MAPSEC_SLATEPORT_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc index 8af4af40c..90c9b93b7 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc +++ b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc @@ -37,7 +37,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_CheckMoneyForFee:: @ 820ADE8 checkmoney 50, 0 compare VAR_RESULT, FALSE goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_NotEnoughMoney - playse SE_REGI + playse SE_SHOP removemoney 50, 0 updatemoneybox 0, 0 msgbox SlateportCity_OceanicMuseum_1F_Text_PleaseEnjoyYourself, MSGBOX_DEFAULT @@ -191,7 +191,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGruntExitWestEast:: @ 820AF93 SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGruntExited:: @ 820AFAA setflag FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_FAMILIAR_AQUA_GRUNT - playse SE_KAIDAN + playse SE_EXIT removeobject LOCALID_FAMILIAR_GRUNT release end diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/map.json b/data/maps/SlateportCity_OceanicMuseum_2F/map.json index af23dffef..7b78802e3 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/map.json +++ b/data/maps/SlateportCity_OceanicMuseum_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_2F", "name": "SlateportCity_OceanicMuseum_2F", "layout": "LAYOUT_SLATEPORT_CITY_OCEANIC_MUSEUM_2F", - "music": "MUS_FUNE_KAN", + "music": "MUS_OCEANIC_MUSEUM", "region_map_section": "MAPSEC_SLATEPORT_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc index 8efd464c4..bba75dbd1 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc +++ b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc @@ -11,7 +11,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_CaptStern:: @ 820BB00 faceplayer msgbox SlateportCity_OceanicMuseum_2F_Text_ThankYouForTheParts, MSGBOX_DEFAULT closemessage - playbgm MUS_AQA_0, 1 + playbgm MUS_ENCOUNTER_AQUA, 1 addobject LOCALID_GRUNT_1 applymovement LOCALID_GRUNT_1, SlateportCity_OceanicMuseum_2F_Movement_FirstGruntEnter waitmovement 0 @@ -81,7 +81,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_CaptStern:: @ 820BB00 msgbox SlateportCity_OceanicMuseum_2F_Text_SternIveGotToGo, MSGBOX_DEFAULT closemessage fadescreen FADE_TO_BLACK - playfanfare MUS_ME_ASA + playfanfare MUS_HEAL waitfanfare special HealPlayerParty removeobject LOCALID_CAPT_STERN diff --git a/data/maps/SlateportCity_PokemonCenter_1F/map.json b/data/maps/SlateportCity_PokemonCenter_1F/map.json index fe730efd7..91132909a 100644 --- a/data/maps/SlateportCity_PokemonCenter_1F/map.json +++ b/data/maps/SlateportCity_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SLATEPORT_CITY_POKEMON_CENTER_1F", "name": "SlateportCity_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_SLATEPORT_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SlateportCity_PokemonCenter_2F/map.json b/data/maps/SlateportCity_PokemonCenter_2F/map.json index d2204dabc..74b5ee63c 100644 --- a/data/maps/SlateportCity_PokemonCenter_2F/map.json +++ b/data/maps/SlateportCity_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SLATEPORT_CITY_POKEMON_CENTER_2F", "name": "SlateportCity_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_SLATEPORT_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SlateportCity_PokemonFanClub/map.json b/data/maps/SlateportCity_PokemonFanClub/map.json index ae27c318b..b1e4b0f8b 100644 --- a/data/maps/SlateportCity_PokemonFanClub/map.json +++ b/data/maps/SlateportCity_PokemonFanClub/map.json @@ -2,7 +2,7 @@ "id": "MAP_SLATEPORT_CITY_POKEMON_FAN_CLUB", "name": "SlateportCity_PokemonFanClub", "layout": "LAYOUT_SLATEPORT_CITY_POKEMON_FAN_CLUB", - "music": "MUS_FINECITY", + "music": "MUS_SLATEPORT", "region_map_section": "MAPSEC_SLATEPORT_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SlateportCity_SternsShipyard_1F/map.json b/data/maps/SlateportCity_SternsShipyard_1F/map.json index 45e5f5734..66cdd6a1d 100644 --- a/data/maps/SlateportCity_SternsShipyard_1F/map.json +++ b/data/maps/SlateportCity_SternsShipyard_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SLATEPORT_CITY_STERNS_SHIPYARD_1F", "name": "SlateportCity_SternsShipyard_1F", "layout": "LAYOUT_SLATEPORT_CITY_STERNS_SHIPYARD_1F", - "music": "MUS_FINECITY", + "music": "MUS_SLATEPORT", "region_map_section": "MAPSEC_SLATEPORT_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SlateportCity_SternsShipyard_2F/map.json b/data/maps/SlateportCity_SternsShipyard_2F/map.json index 452c3f47a..1b89b2bfa 100644 --- a/data/maps/SlateportCity_SternsShipyard_2F/map.json +++ b/data/maps/SlateportCity_SternsShipyard_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SLATEPORT_CITY_STERNS_SHIPYARD_2F", "name": "SlateportCity_SternsShipyard_2F", "layout": "LAYOUT_SLATEPORT_CITY_STERNS_SHIPYARD_2F", - "music": "MUS_FINECITY", + "music": "MUS_SLATEPORT", "region_map_section": "MAPSEC_SLATEPORT_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SootopolisCity/map.json b/data/maps/SootopolisCity/map.json index 41e5cf61a..d4c71db61 100644 --- a/data/maps/SootopolisCity/map.json +++ b/data/maps/SootopolisCity/map.json @@ -2,7 +2,7 @@ "id": "MAP_SOOTOPOLIS_CITY", "name": "SootopolisCity", "layout": "LAYOUT_SOOTOPOLIS_CITY", - "music": "MUS_RUNECITY", + "music": "MUS_SOOTOPOLIS", "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/SootopolisCity/scripts.inc b/data/maps/SootopolisCity/scripts.inc index 2979f104d..6ef9c3d57 100644 --- a/data/maps/SootopolisCity/scripts.inc +++ b/data/maps/SootopolisCity/scripts.inc @@ -531,7 +531,7 @@ SootopolisCity_EventScript_RayquazaSceneFromPokeCenter:: @ 81E5C1E setvar VAR_0x8004, 1 special Script_DoRayquazaScene waitstate - playse SE_T_KAMI + playse SE_THUNDER special SpawnCameraObject applymovement OBJ_EVENT_ID_CAMERA, SootopolisCity_Movement_PanUp waitmovement 0 @@ -562,7 +562,7 @@ SootopolisCity_EventScript_RayquazaSceneFromPokeCenter:: @ 81E5C1E clearflag FLAG_SYS_WEATHER_CTRL setvar VAR_SKY_PILLAR_STATE, 3 clearflag FLAG_LEGENDARIES_IN_SOOTOPOLIS - fadenewbgm MUS_RUNECITY + fadenewbgm MUS_SOOTOPOLIS delay 120 clearflag FLAG_HIDE_MAP_NAME_POPUP warpsootopolislegend MAP_SOOTOPOLIS_CITY, 255, 43, 32 @@ -615,7 +615,7 @@ SootopolisCity_EventScript_RayquazaSceneFromDive:: @ 81E5CCE clearflag FLAG_SYS_WEATHER_CTRL setvar VAR_SKY_PILLAR_STATE, 2 clearflag FLAG_LEGENDARIES_IN_SOOTOPOLIS - fadenewbgm MUS_NAMINORI + fadenewbgm MUS_SURF delay 120 clearflag FLAG_HIDE_MAP_NAME_POPUP warpsootopolislegend MAP_SOOTOPOLIS_CITY, 255, 29, 53 diff --git a/data/maps/SootopolisCity_Gym_1F/map.json b/data/maps/SootopolisCity_Gym_1F/map.json index 72d7c2d2b..46baea29d 100644 --- a/data/maps/SootopolisCity_Gym_1F/map.json +++ b/data/maps/SootopolisCity_Gym_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SOOTOPOLIS_CITY_GYM_1F", "name": "SootopolisCity_Gym_1F", "layout": "LAYOUT_SOOTOPOLIS_CITY_GYM_1F", - "music": "MUS_GIM", + "music": "MUS_GYM", "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SootopolisCity_Gym_1F/scripts.inc b/data/maps/SootopolisCity_Gym_1F/scripts.inc index 66588ba08..ae5bfd108 100644 --- a/data/maps/SootopolisCity_Gym_1F/scripts.inc +++ b/data/maps/SootopolisCity_Gym_1F/scripts.inc @@ -46,7 +46,7 @@ SootopolisCity_Gym_1F_OnFrame: @ 8224ECB SootopolisCity_Gym_1F_EventScript_UnlockFirstStairs:: @ 8224EED addvar VAR_ICE_STEP_COUNT, 1 delay 40 - playse SE_RU_GASHIN + playse SE_ICE_STAIRS call SootopolisCity_Gym_1F_EventScript_CheckSetStairMetatiles special DrawWholeMapView end @@ -54,7 +54,7 @@ SootopolisCity_Gym_1F_EventScript_UnlockFirstStairs:: @ 8224EED SootopolisCity_Gym_1F_EventScript_UnlockSecondStairs:: @ 8224F01 addvar VAR_ICE_STEP_COUNT, 1 delay 40 - playse SE_RU_GASHIN + playse SE_ICE_STAIRS call SootopolisCity_Gym_1F_EventScript_CheckSetStairMetatiles special DrawWholeMapView end @@ -62,7 +62,7 @@ SootopolisCity_Gym_1F_EventScript_UnlockSecondStairs:: @ 8224F01 SootopolisCity_Gym_1F_EventScript_UnlockThirdStairs:: @ 8224F15 addvar VAR_ICE_STEP_COUNT, 1 delay 40 - playse SE_RU_GASHIN + playse SE_ICE_STAIRS call SootopolisCity_Gym_1F_EventScript_CheckSetStairMetatiles special DrawWholeMapView end @@ -72,7 +72,7 @@ SootopolisCity_Gym_1F_EventScript_FallThroughIce:: @ 8224F29 delay 20 applymovement OBJ_EVENT_ID_PLAYER, SootopolisCity_Gym_1F_Movement_FallThroughIce waitmovement 0 - playse SE_RU_HYUU + playse SE_FALL delay 60 warphole MAP_SOOTOPOLIS_CITY_GYM_B1F waitstate @@ -110,7 +110,7 @@ SootopolisCity_Gym_1F_EventScript_JuanDefeated:: @ 8224F82 call SootopolisCity_Gym_1F_EventScript_GiveWaterPulse closemessage delay 30 - playfanfare MUS_ME_TORE_EYE + playfanfare MUS_REGISTER_MATCH_CALL msgbox SootopolisCity_Gym_1F_Text_RegisteredJuan, MSGBOX_DEFAULT waitfanfare closemessage diff --git a/data/maps/SootopolisCity_Gym_B1F/map.json b/data/maps/SootopolisCity_Gym_B1F/map.json index 5706139f2..3badb1c52 100644 --- a/data/maps/SootopolisCity_Gym_B1F/map.json +++ b/data/maps/SootopolisCity_Gym_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SOOTOPOLIS_CITY_GYM_B1F", "name": "SootopolisCity_Gym_B1F", "layout": "LAYOUT_SOOTOPOLIS_CITY_GYM_B1F", - "music": "MUS_GIM", + "music": "MUS_GYM", "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SootopolisCity_House1/map.json b/data/maps/SootopolisCity_House1/map.json index 9db373ced..26c47c432 100644 --- a/data/maps/SootopolisCity_House1/map.json +++ b/data/maps/SootopolisCity_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_SOOTOPOLIS_CITY_HOUSE1", "name": "SootopolisCity_House1", "layout": "LAYOUT_SOOTOPOLIS_CITY_HOUSE1", - "music": "MUS_RUNECITY", + "music": "MUS_SOOTOPOLIS", "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SootopolisCity_House2/map.json b/data/maps/SootopolisCity_House2/map.json index 6ffeb11f8..3fe0baf48 100644 --- a/data/maps/SootopolisCity_House2/map.json +++ b/data/maps/SootopolisCity_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_SOOTOPOLIS_CITY_HOUSE2", "name": "SootopolisCity_House2", "layout": "LAYOUT_SOOTOPOLIS_CITY_HOUSE2", - "music": "MUS_RUNECITY", + "music": "MUS_SOOTOPOLIS", "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SootopolisCity_House3/map.json b/data/maps/SootopolisCity_House3/map.json index d6cb1f09b..00d82637e 100644 --- a/data/maps/SootopolisCity_House3/map.json +++ b/data/maps/SootopolisCity_House3/map.json @@ -2,7 +2,7 @@ "id": "MAP_SOOTOPOLIS_CITY_HOUSE3", "name": "SootopolisCity_House3", "layout": "LAYOUT_SOOTOPOLIS_CITY_HOUSE3", - "music": "MUS_RUNECITY", + "music": "MUS_SOOTOPOLIS", "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SootopolisCity_House4/map.json b/data/maps/SootopolisCity_House4/map.json index 7ff8d9182..e811785d0 100644 --- a/data/maps/SootopolisCity_House4/map.json +++ b/data/maps/SootopolisCity_House4/map.json @@ -2,7 +2,7 @@ "id": "MAP_SOOTOPOLIS_CITY_HOUSE4", "name": "SootopolisCity_House4", "layout": "LAYOUT_SOOTOPOLIS_CITY_HOUSE1", - "music": "MUS_RUNECITY", + "music": "MUS_SOOTOPOLIS", "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SootopolisCity_House5/map.json b/data/maps/SootopolisCity_House5/map.json index 2a335e4bb..6b25c5af6 100644 --- a/data/maps/SootopolisCity_House5/map.json +++ b/data/maps/SootopolisCity_House5/map.json @@ -2,7 +2,7 @@ "id": "MAP_SOOTOPOLIS_CITY_HOUSE5", "name": "SootopolisCity_House5", "layout": "LAYOUT_SOOTOPOLIS_CITY_HOUSE2", - "music": "MUS_RUNECITY", + "music": "MUS_SOOTOPOLIS", "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SootopolisCity_House6/map.json b/data/maps/SootopolisCity_House6/map.json index e6b37ca19..365503e8f 100644 --- a/data/maps/SootopolisCity_House6/map.json +++ b/data/maps/SootopolisCity_House6/map.json @@ -2,7 +2,7 @@ "id": "MAP_SOOTOPOLIS_CITY_HOUSE6", "name": "SootopolisCity_House6", "layout": "LAYOUT_SOOTOPOLIS_CITY_HOUSE3", - "music": "MUS_RUNECITY", + "music": "MUS_SOOTOPOLIS", "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SootopolisCity_House7/map.json b/data/maps/SootopolisCity_House7/map.json index 5f66d082a..47d98c914 100644 --- a/data/maps/SootopolisCity_House7/map.json +++ b/data/maps/SootopolisCity_House7/map.json @@ -2,7 +2,7 @@ "id": "MAP_SOOTOPOLIS_CITY_HOUSE7", "name": "SootopolisCity_House7", "layout": "LAYOUT_SOOTOPOLIS_CITY_HOUSE1", - "music": "MUS_RUNECITY", + "music": "MUS_SOOTOPOLIS", "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SootopolisCity_LotadAndSeedotHouse/map.json b/data/maps/SootopolisCity_LotadAndSeedotHouse/map.json index d02aec2bb..143fdf9f2 100644 --- a/data/maps/SootopolisCity_LotadAndSeedotHouse/map.json +++ b/data/maps/SootopolisCity_LotadAndSeedotHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_SOOTOPOLIS_CITY_LOTAD_AND_SEEDOT_HOUSE", "name": "SootopolisCity_LotadAndSeedotHouse", "layout": "LAYOUT_SOOTOPOLIS_CITY_LOTAD_AND_SEEDOT_HOUSE", - "music": "MUS_RUNECITY", + "music": "MUS_SOOTOPOLIS", "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SootopolisCity_Mart/map.json b/data/maps/SootopolisCity_Mart/map.json index e7433e717..55686a14f 100644 --- a/data/maps/SootopolisCity_Mart/map.json +++ b/data/maps/SootopolisCity_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_SOOTOPOLIS_CITY_MART", "name": "SootopolisCity_Mart", "layout": "LAYOUT_MART", - "music": "MUS_FRIENDLY", + "music": "MUS_POKE_MART", "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/map.json b/data/maps/SootopolisCity_MysteryEventsHouse_1F/map.json index 9ccd91d9b..a7fa18760 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/map.json +++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F", "name": "SootopolisCity_MysteryEventsHouse_1F", "layout": "LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F", - "music": "MUS_RUNECITY", + "music": "MUS_SOOTOPOLIS", "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/map.json b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/map.json index 3911f3e2b..82885ebcc 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/map.json +++ b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F", "name": "SootopolisCity_MysteryEventsHouse_B1F", "layout": "LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F", - "music": "MUS_RUNECITY", + "music": "MUS_SOOTOPOLIS", "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/map.json b/data/maps/SootopolisCity_PokemonCenter_1F/map.json index 2330f08ea..8dac70dea 100644 --- a/data/maps/SootopolisCity_PokemonCenter_1F/map.json +++ b/data/maps/SootopolisCity_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F", "name": "SootopolisCity_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SootopolisCity_PokemonCenter_2F/map.json b/data/maps/SootopolisCity_PokemonCenter_2F/map.json index ca779dd4b..fd85b236b 100644 --- a/data/maps/SootopolisCity_PokemonCenter_2F/map.json +++ b/data/maps/SootopolisCity_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_2F", "name": "SootopolisCity_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SouthernIsland_Exterior/map.json b/data/maps/SouthernIsland_Exterior/map.json index 67ee0fd3c..8fe4bcf29 100644 --- a/data/maps/SouthernIsland_Exterior/map.json +++ b/data/maps/SouthernIsland_Exterior/map.json @@ -2,7 +2,7 @@ "id": "MAP_SOUTHERN_ISLAND_EXTERIOR", "name": "SouthernIsland_Exterior", "layout": "LAYOUT_SOUTHERN_ISLAND_EXTERIOR", - "music": "MUS_DAN02", + "music": "MUS_ABANDONED_SHIP", "region_map_section": "MAPSEC_SOUTHERN_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SouthernIsland_Interior/map.json b/data/maps/SouthernIsland_Interior/map.json index 14530c995..179ab1997 100644 --- a/data/maps/SouthernIsland_Interior/map.json +++ b/data/maps/SouthernIsland_Interior/map.json @@ -2,7 +2,7 @@ "id": "MAP_SOUTHERN_ISLAND_INTERIOR", "name": "SouthernIsland_Interior", "layout": "LAYOUT_SOUTHERN_ISLAND_INTERIOR", - "music": "MUS_DAN02", + "music": "MUS_ABANDONED_SHIP", "region_map_section": "MAPSEC_SOUTHERN_ISLAND", "requires_flash": false, "weather": "WEATHER_SHADE", diff --git a/data/maps/TerraCave_End/map.json b/data/maps/TerraCave_End/map.json index c7dfeeb3d..b186bddb2 100644 --- a/data/maps/TerraCave_End/map.json +++ b/data/maps/TerraCave_End/map.json @@ -2,7 +2,7 @@ "id": "MAP_TERRA_CAVE_END", "name": "TerraCave_End", "layout": "LAYOUT_TERRA_CAVE_END", - "music": "MUS_DAN01", + "music": "MUS_PETALBURG_WOODS", "region_map_section": "MAPSEC_TERRA_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", diff --git a/data/maps/TerraCave_Entrance/map.json b/data/maps/TerraCave_Entrance/map.json index 9a9650487..1ddc768e2 100644 --- a/data/maps/TerraCave_Entrance/map.json +++ b/data/maps/TerraCave_Entrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_TERRA_CAVE_ENTRANCE", "name": "TerraCave_Entrance", "layout": "LAYOUT_TERRA_CAVE_ENTRANCE", - "music": "MUS_DAN01", + "music": "MUS_PETALBURG_WOODS", "region_map_section": "MAPSEC_TERRA_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/TradeCenter/map.json b/data/maps/TradeCenter/map.json index d0ed8e524..0d3dd5477 100644 --- a/data/maps/TradeCenter/map.json +++ b/data/maps/TradeCenter/map.json @@ -2,7 +2,7 @@ "id": "MAP_TRADE_CENTER", "name": "TradeCenter", "layout": "LAYOUT_TRADE_CENTER", - "music": "MUS_RAINBOW", + "music": "MUS_EVER_GRANDE", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/TrainerHill_1F/map.json b/data/maps/TrainerHill_1F/map.json index 30f80b810..d14bbb293 100644 --- a/data/maps/TrainerHill_1F/map.json +++ b/data/maps/TrainerHill_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_TRAINER_HILL_1F", "name": "TrainerHill_1F", "layout": "LAYOUT_TRAINER_HILL_1F", - "music": "MUS_B_TOWER", + "music": "MUS_B_TOWER_RS", "region_map_section": "MAPSEC_TRAINER_HILL", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/TrainerHill_2F/map.json b/data/maps/TrainerHill_2F/map.json index e94948c33..a4c9bca7d 100644 --- a/data/maps/TrainerHill_2F/map.json +++ b/data/maps/TrainerHill_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_TRAINER_HILL_2F", "name": "TrainerHill_2F", "layout": "LAYOUT_TRAINER_HILL_2F", - "music": "MUS_B_TOWER", + "music": "MUS_B_TOWER_RS", "region_map_section": "MAPSEC_TRAINER_HILL", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/TrainerHill_3F/map.json b/data/maps/TrainerHill_3F/map.json index 6e3ef9c51..069ca83ac 100644 --- a/data/maps/TrainerHill_3F/map.json +++ b/data/maps/TrainerHill_3F/map.json @@ -2,7 +2,7 @@ "id": "MAP_TRAINER_HILL_3F", "name": "TrainerHill_3F", "layout": "LAYOUT_TRAINER_HILL_3F", - "music": "MUS_B_TOWER", + "music": "MUS_B_TOWER_RS", "region_map_section": "MAPSEC_TRAINER_HILL", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/TrainerHill_4F/map.json b/data/maps/TrainerHill_4F/map.json index 2b62322e9..f195d9e93 100644 --- a/data/maps/TrainerHill_4F/map.json +++ b/data/maps/TrainerHill_4F/map.json @@ -2,7 +2,7 @@ "id": "MAP_TRAINER_HILL_4F", "name": "TrainerHill_4F", "layout": "LAYOUT_TRAINER_HILL_4F", - "music": "MUS_B_TOWER", + "music": "MUS_B_TOWER_RS", "region_map_section": "MAPSEC_TRAINER_HILL", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/TrainerHill_Elevator/map.json b/data/maps/TrainerHill_Elevator/map.json index dc259fde0..3d56ff476 100644 --- a/data/maps/TrainerHill_Elevator/map.json +++ b/data/maps/TrainerHill_Elevator/map.json @@ -2,7 +2,7 @@ "id": "MAP_TRAINER_HILL_ELEVATOR", "name": "TrainerHill_Elevator", "layout": "LAYOUT_BATTLE_ELEVATOR", - "music": "MUS_B_TOWER", + "music": "MUS_B_TOWER_RS", "region_map_section": "MAPSEC_TRAINER_HILL", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/TrainerHill_Entrance/map.json b/data/maps/TrainerHill_Entrance/map.json index ed85405c1..b2c20d050 100644 --- a/data/maps/TrainerHill_Entrance/map.json +++ b/data/maps/TrainerHill_Entrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_TRAINER_HILL_ENTRANCE", "name": "TrainerHill_Entrance", "layout": "LAYOUT_TRAINER_HILL_ENTRANCE", - "music": "MUS_B_TOWER", + "music": "MUS_B_TOWER_RS", "region_map_section": "MAPSEC_TRAINER_HILL", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/TrainerHill_Entrance/scripts.inc b/data/maps/TrainerHill_Entrance/scripts.inc index 9cf3be806..b5b0f716c 100644 --- a/data/maps/TrainerHill_Entrance/scripts.inc +++ b/data/maps/TrainerHill_Entrance/scripts.inc @@ -23,8 +23,8 @@ TrainerHill_Entrance_OnWarp: @ 82680CF TrainerHill_Entrance_OnResume: @ 82680D0 trainerhill_resumetimer setvar VAR_TEMP_0, 0 - trainerhill_clearresult - compare VAR_RESULT, 0 @ VAR_RESULT always 0 here + trainerhill_getusingereader + compare VAR_RESULT, FALSE @ VAR_RESULT always FALSE here goto_if_eq TrainerHill_Entrance_EventScript_TryFaceAttendant setobjectxy OBJ_EVENT_ID_PLAYER, 9, 6 applymovement OBJ_EVENT_ID_PLAYER, TrainerHill_Entrance_Movement_PlayerFaceAttendant @@ -69,7 +69,7 @@ TrainerHill_Entrance_EventScript_ExitElevator:: @ 8268160 waitmovement 0 setmetatile 17, 10, METATILE_TrainerHill_CounterDoor, 1 special DrawWholeMapView - playse SE_TK_KASYA + playse SE_CLICK waitse setvar VAR_TEMP_D, 0 releaseall diff --git a/data/maps/TrainerHill_Roof/map.json b/data/maps/TrainerHill_Roof/map.json index 244214ad3..16020a762 100644 --- a/data/maps/TrainerHill_Roof/map.json +++ b/data/maps/TrainerHill_Roof/map.json @@ -2,7 +2,7 @@ "id": "MAP_TRAINER_HILL_ROOF", "name": "TrainerHill_Roof", "layout": "LAYOUT_TRAINER_HILL_ROOF", - "music": "MUS_B_TOWER", + "music": "MUS_B_TOWER_RS", "region_map_section": "MAPSEC_TRAINER_HILL", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/TrainerHill_Roof/scripts.inc b/data/maps/TrainerHill_Roof/scripts.inc index e4e2cbb49..e239ed010 100644 --- a/data/maps/TrainerHill_Roof/scripts.inc +++ b/data/maps/TrainerHill_Roof/scripts.inc @@ -22,7 +22,7 @@ TrainerHill_Roof_EventScript_GivePrize:: @ 8268FF2 case 2, TrainerHill_Roof_EventScript_CheckFinalTime TrainerHill_Roof_EventScript_ReceivePrize:: @ 8269020 msgbox TrainerHill_Roof_Text_HaveTheMostMarvelousGift, MSGBOX_DEFAULT - playfanfare MUS_FANFA1 + playfanfare MUS_LEVEL_UP message gText_ObtainedTheItem waitfanfare waitmessage diff --git a/data/maps/Underwater1/map.json b/data/maps/Underwater1/map.json index cc77e951d..71752745d 100644 --- a/data/maps/Underwater1/map.json +++ b/data/maps/Underwater1/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNDERWATER1", "name": "Underwater1", "layout": "LAYOUT_UNDERWATER1", - "music": "MUS_DEEPDEEP", + "music": "MUS_UNDERWATER", "region_map_section": "MAPSEC_UNDERWATER_124", "requires_flash": false, "weather": "WEATHER_UNDERWATER_BUBBLES", diff --git a/data/maps/Underwater2/map.json b/data/maps/Underwater2/map.json index f402f8ea8..5ecdc402a 100644 --- a/data/maps/Underwater2/map.json +++ b/data/maps/Underwater2/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNDERWATER2", "name": "Underwater2", "layout": "LAYOUT_UNDERWATER2", - "music": "MUS_DEEPDEEP", + "music": "MUS_UNDERWATER", "region_map_section": "MAPSEC_UNDERWATER_125", "requires_flash": false, "weather": "WEATHER_UNDERWATER_BUBBLES", diff --git a/data/maps/Underwater3/map.json b/data/maps/Underwater3/map.json index 69af7637f..43df933a0 100644 --- a/data/maps/Underwater3/map.json +++ b/data/maps/Underwater3/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNDERWATER3", "name": "Underwater3", "layout": "LAYOUT_UNDERWATER3", - "music": "MUS_DEEPDEEP", + "music": "MUS_UNDERWATER", "region_map_section": "MAPSEC_UNDERWATER_126", "requires_flash": false, "weather": "WEATHER_UNDERWATER_BUBBLES", diff --git a/data/maps/Underwater4/map.json b/data/maps/Underwater4/map.json index 156923302..4b0fc6d3b 100644 --- a/data/maps/Underwater4/map.json +++ b/data/maps/Underwater4/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNDERWATER4", "name": "Underwater4", "layout": "LAYOUT_UNDERWATER4", - "music": "MUS_DEEPDEEP", + "music": "MUS_UNDERWATER", "region_map_section": "MAPSEC_UNDERWATER_127", "requires_flash": false, "weather": "WEATHER_UNDERWATER_BUBBLES", diff --git a/data/maps/Underwater5/map.json b/data/maps/Underwater5/map.json index c50b8be53..909591f11 100644 --- a/data/maps/Underwater5/map.json +++ b/data/maps/Underwater5/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNDERWATER5", "name": "Underwater5", "layout": "LAYOUT_UNDERWATER5", - "music": "MUS_DEEPDEEP", + "music": "MUS_UNDERWATER", "region_map_section": "MAPSEC_UNDERWATER_129", "requires_flash": false, "weather": "WEATHER_UNDERWATER_BUBBLES", diff --git a/data/maps/Underwater6/map.json b/data/maps/Underwater6/map.json index 971f2755c..2a021f77f 100644 --- a/data/maps/Underwater6/map.json +++ b/data/maps/Underwater6/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNDERWATER6", "name": "Underwater6", "layout": "LAYOUT_UNDERWATER6", - "music": "MUS_DEEPDEEP", + "music": "MUS_UNDERWATER", "region_map_section": "MAPSEC_UNDERWATER_TERRA_CAVE", "requires_flash": false, "weather": "WEATHER_UNDERWATER_BUBBLES", diff --git a/data/maps/Underwater7/map.json b/data/maps/Underwater7/map.json index cf33280fe..5155fc6ba 100644 --- a/data/maps/Underwater7/map.json +++ b/data/maps/Underwater7/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNDERWATER7", "name": "Underwater7", "layout": "LAYOUT_UNDERWATER7", - "music": "MUS_DEEPDEEP", + "music": "MUS_UNDERWATER", "region_map_section": "MAPSEC_UNDERWATER_UNK1", "requires_flash": false, "weather": "WEATHER_UNDERWATER_BUBBLES", diff --git a/data/maps/Underwater_MarineCave/map.json b/data/maps/Underwater_MarineCave/map.json index c12531e48..c053fb121 100644 --- a/data/maps/Underwater_MarineCave/map.json +++ b/data/maps/Underwater_MarineCave/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNDERWATER_MARINE_CAVE", "name": "Underwater_MarineCave", "layout": "LAYOUT_UNDERWATER_MARINE_CAVE", - "music": "MUS_DAN01", + "music": "MUS_PETALBURG_WOODS", "region_map_section": "MAPSEC_UNDERWATER_MARINE_CAVE", "requires_flash": false, "weather": "WEATHER_UNDERWATER_BUBBLES", diff --git a/data/maps/Underwater_Route134/map.json b/data/maps/Underwater_Route134/map.json index dd5117aa4..74526bc4d 100644 --- a/data/maps/Underwater_Route134/map.json +++ b/data/maps/Underwater_Route134/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNDERWATER_ROUTE134", "name": "Underwater_Route134", "layout": "LAYOUT_UNDERWATER_ROUTE134", - "music": "MUS_DEEPDEEP", + "music": "MUS_UNDERWATER", "region_map_section": "MAPSEC_UNDERWATER_SEALED_CHAMBER", "requires_flash": false, "weather": "WEATHER_UNDERWATER_BUBBLES", diff --git a/data/maps/Underwater_SeafloorCavern/map.json b/data/maps/Underwater_SeafloorCavern/map.json index 90201d3b7..efcb3c291 100644 --- a/data/maps/Underwater_SeafloorCavern/map.json +++ b/data/maps/Underwater_SeafloorCavern/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNDERWATER_SEAFLOOR_CAVERN", "name": "Underwater_SeafloorCavern", "layout": "LAYOUT_UNDERWATER_SEAFLOOR_CAVERN", - "music": "MUS_DEEPDEEP", + "music": "MUS_UNDERWATER", "region_map_section": "MAPSEC_UNDERWATER_128", "requires_flash": false, "weather": "WEATHER_UNDERWATER_BUBBLES", diff --git a/data/maps/Underwater_SealedChamber/map.json b/data/maps/Underwater_SealedChamber/map.json index 98bbcc850..5f3b99055 100644 --- a/data/maps/Underwater_SealedChamber/map.json +++ b/data/maps/Underwater_SealedChamber/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNDERWATER_SEALED_CHAMBER", "name": "Underwater_SealedChamber", "layout": "LAYOUT_UNDERWATER_SEALED_CHAMBER", - "music": "MUS_DEEPDEEP", + "music": "MUS_UNDERWATER", "region_map_section": "MAPSEC_UNDERWATER_SEALED_CHAMBER", "requires_flash": false, "weather": "WEATHER_UNDERWATER_BUBBLES", diff --git a/data/maps/Underwater_SootopolisCity/map.json b/data/maps/Underwater_SootopolisCity/map.json index cc2d66ff2..90e5e97fc 100644 --- a/data/maps/Underwater_SootopolisCity/map.json +++ b/data/maps/Underwater_SootopolisCity/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNDERWATER_SOOTOPOLIS_CITY", "name": "Underwater_SootopolisCity", "layout": "LAYOUT_UNDERWATER_SOOTOPOLIS_CITY", - "music": "MUS_DEEPDEEP", + "music": "MUS_UNDERWATER", "region_map_section": "MAPSEC_UNDERWATER_SOOTOPOLIS", "requires_flash": false, "weather": "WEATHER_UNDERWATER_BUBBLES", diff --git a/data/maps/UnionRoom/map.json b/data/maps/UnionRoom/map.json index 1ee204137..3d19cd55f 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_RAINBOW", + "music": "MUS_EVER_GRANDE", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/UnknownLinkContestRoom_25_29/map.json b/data/maps/UnknownLinkContestRoom_25_29/map.json index cf6077259..72ed407ee 100644 --- a/data/maps/UnknownLinkContestRoom_25_29/map.json +++ b/data/maps/UnknownLinkContestRoom_25_29/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNKNOWN_LINK_CONTEST_ROOM_25_29", "name": "UnknownLinkContestRoom_25_29", "layout": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_29", - "music": "MUS_NIBI", + "music": "MUS_GSC_PEWTER", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/UnknownLinkContestRoom_25_30/map.json b/data/maps/UnknownLinkContestRoom_25_30/map.json index c51109ee9..cd4d6fddd 100644 --- a/data/maps/UnknownLinkContestRoom_25_30/map.json +++ b/data/maps/UnknownLinkContestRoom_25_30/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNKNOWN_LINK_CONTEST_ROOM_25_30", "name": "UnknownLinkContestRoom_25_30", "layout": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_30", - "music": "MUS_NIBI", + "music": "MUS_GSC_PEWTER", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/UnknownLinkContestRoom_25_31/map.json b/data/maps/UnknownLinkContestRoom_25_31/map.json index 27b550382..975ec382d 100644 --- a/data/maps/UnknownLinkContestRoom_25_31/map.json +++ b/data/maps/UnknownLinkContestRoom_25_31/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNKNOWN_LINK_CONTEST_ROOM_25_31", "name": "UnknownLinkContestRoom_25_31", "layout": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_31", - "music": "MUS_NIBI", + "music": "MUS_GSC_PEWTER", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/UnknownLinkContestRoom_25_32/map.json b/data/maps/UnknownLinkContestRoom_25_32/map.json index 0c20ee1f8..d2d673adc 100644 --- a/data/maps/UnknownLinkContestRoom_25_32/map.json +++ b/data/maps/UnknownLinkContestRoom_25_32/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNKNOWN_LINK_CONTEST_ROOM_25_32", "name": "UnknownLinkContestRoom_25_32", "layout": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_32", - "music": "MUS_NIBI", + "music": "MUS_GSC_PEWTER", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/UnknownLinkContestRoom_25_33/map.json b/data/maps/UnknownLinkContestRoom_25_33/map.json index aee753f22..f73ffe22e 100644 --- a/data/maps/UnknownLinkContestRoom_25_33/map.json +++ b/data/maps/UnknownLinkContestRoom_25_33/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNKNOWN_LINK_CONTEST_ROOM_25_33", "name": "UnknownLinkContestRoom_25_33", "layout": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_33", - "music": "MUS_NIBI", + "music": "MUS_GSC_PEWTER", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/UnknownLinkContestRoom_25_34/map.json b/data/maps/UnknownLinkContestRoom_25_34/map.json index ebd07e9fa..f5ddbbe5a 100644 --- a/data/maps/UnknownLinkContestRoom_25_34/map.json +++ b/data/maps/UnknownLinkContestRoom_25_34/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNKNOWN_LINK_CONTEST_ROOM_25_34", "name": "UnknownLinkContestRoom_25_34", "layout": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_34", - "music": "MUS_NIBI", + "music": "MUS_GSC_PEWTER", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VerdanturfTown/map.json b/data/maps/VerdanturfTown/map.json index c4b736f80..94d140c05 100644 --- a/data/maps/VerdanturfTown/map.json +++ b/data/maps/VerdanturfTown/map.json @@ -2,7 +2,7 @@ "id": "MAP_VERDANTURF_TOWN", "name": "VerdanturfTown", "layout": "LAYOUT_VERDANTURF_TOWN", - "music": "MUS_GOMACHI0", + "music": "MUS_VERDANTURF", "region_map_section": "MAPSEC_VERDANTURF_TOWN", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/map.json b/data/maps/VerdanturfTown_BattleTentBattleRoom/map.json index 9ed2441dd..72eca1d95 100644 --- a/data/maps/VerdanturfTown_BattleTentBattleRoom/map.json +++ b/data/maps/VerdanturfTown_BattleTentBattleRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM", "name": "VerdanturfTown_BattleTentBattleRoom", "layout": "LAYOUT_VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM", - "music": "MUS_B_TOWER", + "music": "MUS_B_TOWER_RS", "region_map_section": "MAPSEC_VERDANTURF_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc b/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc index 86b5f3ec1..ad77cdf5f 100644 --- a/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc +++ b/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc @@ -78,7 +78,7 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_DefeatedOpponent:: @ 82023C8 special LoadPlayerParty special SavePlayerParty frontier_setpartyorder FRONTIER_PARTY_SIZE - playfanfare MUS_ME_ASA + playfanfare MUS_HEAL waitfanfare special HealPlayerParty diff --git a/data/maps/VerdanturfTown_BattleTentCorridor/map.json b/data/maps/VerdanturfTown_BattleTentCorridor/map.json index 0209c02d9..2b875b900 100644 --- a/data/maps/VerdanturfTown_BattleTentCorridor/map.json +++ b/data/maps/VerdanturfTown_BattleTentCorridor/map.json @@ -2,7 +2,7 @@ "id": "MAP_VERDANTURF_TOWN_BATTLE_TENT_CORRIDOR", "name": "VerdanturfTown_BattleTentCorridor", "layout": "LAYOUT_BATTLE_TENT_CORRIDOR", - "music": "MUS_B_TOWER", + "music": "MUS_B_TOWER_RS", "region_map_section": "MAPSEC_VERDANTURF_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VerdanturfTown_BattleTentLobby/map.json b/data/maps/VerdanturfTown_BattleTentLobby/map.json index cc294e47d..d4a8ccfa5 100644 --- a/data/maps/VerdanturfTown_BattleTentLobby/map.json +++ b/data/maps/VerdanturfTown_BattleTentLobby/map.json @@ -2,7 +2,7 @@ "id": "MAP_VERDANTURF_TOWN_BATTLE_TENT_LOBBY", "name": "VerdanturfTown_BattleTentLobby", "layout": "LAYOUT_BATTLE_TENT_LOBBY", - "music": "MUS_B_TOWER", + "music": "MUS_B_TOWER_RS", "region_map_section": "MAPSEC_VERDANTURF_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc b/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc index 7a3aa605c..f7a03b1ec 100644 --- a/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc +++ b/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc @@ -55,7 +55,7 @@ VerdanturfTown_BattleTentLobby_EventScript_GivePrize:: @ 8201791 frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0 message BattleFrontier_BattleDomeLobby_Text_ReceivedPrize @ Odd that it used Dome's copy instead of Palace's waitmessage - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM waitfanfare msgbox VerdanturfTown_BattleTentLobby_Text_ReturnFortified, MSGBOX_DEFAULT closemessage diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json b/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json index 7aaedcd23..7fa310426 100644 --- a/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json +++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_VERDANTURF_TOWN_FRIENDSHIP_RATERS_HOUSE", "name": "VerdanturfTown_FriendshipRatersHouse", "layout": "LAYOUT_HOUSE2", - "music": "MUS_GOMACHI0", + "music": "MUS_VERDANTURF", "region_map_section": "MAPSEC_VERDANTURF_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VerdanturfTown_House/map.json b/data/maps/VerdanturfTown_House/map.json index bcc51079f..d552e914a 100644 --- a/data/maps/VerdanturfTown_House/map.json +++ b/data/maps/VerdanturfTown_House/map.json @@ -2,7 +2,7 @@ "id": "MAP_VERDANTURF_TOWN_HOUSE", "name": "VerdanturfTown_House", "layout": "LAYOUT_HOUSE1", - "music": "MUS_GOMACHI0", + "music": "MUS_VERDANTURF", "region_map_section": "MAPSEC_VERDANTURF_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VerdanturfTown_Mart/map.json b/data/maps/VerdanturfTown_Mart/map.json index 96fa21366..b8183646c 100644 --- a/data/maps/VerdanturfTown_Mart/map.json +++ b/data/maps/VerdanturfTown_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_VERDANTURF_TOWN_MART", "name": "VerdanturfTown_Mart", "layout": "LAYOUT_MART", - "music": "MUS_FRIENDLY", + "music": "MUS_POKE_MART", "region_map_section": "MAPSEC_VERDANTURF_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/map.json b/data/maps/VerdanturfTown_PokemonCenter_1F/map.json index 74f3e342b..8e3fc3e28 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_1F/map.json +++ b/data/maps/VerdanturfTown_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_VERDANTURF_TOWN_POKEMON_CENTER_1F", "name": "VerdanturfTown_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_VERDANTURF_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VerdanturfTown_PokemonCenter_2F/map.json b/data/maps/VerdanturfTown_PokemonCenter_2F/map.json index d7a51eba7..2edb6602d 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_2F/map.json +++ b/data/maps/VerdanturfTown_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_VERDANTURF_TOWN_POKEMON_CENTER_2F", "name": "VerdanturfTown_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_VERDANTURF_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VerdanturfTown_WandasHouse/map.json b/data/maps/VerdanturfTown_WandasHouse/map.json index 08b5348c7..43a5b9c44 100644 --- a/data/maps/VerdanturfTown_WandasHouse/map.json +++ b/data/maps/VerdanturfTown_WandasHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_VERDANTURF_TOWN_WANDAS_HOUSE", "name": "VerdanturfTown_WandasHouse", "layout": "LAYOUT_VERDANTURF_TOWN_WANDAS_HOUSE", - "music": "MUS_GOMACHI0", + "music": "MUS_VERDANTURF", "region_map_section": "MAPSEC_VERDANTURF_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VictoryRoad_1F/map.json b/data/maps/VictoryRoad_1F/map.json index d0ff9e440..5f3271c89 100644 --- a/data/maps/VictoryRoad_1F/map.json +++ b/data/maps/VictoryRoad_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_VICTORY_ROAD_1F", "name": "VictoryRoad_1F", "layout": "LAYOUT_VICTORY_ROAD_1F", - "music": "MUS_C_ROAD", + "music": "MUS_VICTORY_ROAD", "region_map_section": "MAPSEC_VICTORY_ROAD", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VictoryRoad_B1F/map.json b/data/maps/VictoryRoad_B1F/map.json index 9a387aa52..6e290ce6d 100644 --- a/data/maps/VictoryRoad_B1F/map.json +++ b/data/maps/VictoryRoad_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_VICTORY_ROAD_B1F", "name": "VictoryRoad_B1F", "layout": "LAYOUT_VICTORY_ROAD_B1F", - "music": "MUS_C_ROAD", + "music": "MUS_VICTORY_ROAD", "region_map_section": "MAPSEC_VICTORY_ROAD", "requires_flash": true, "weather": "WEATHER_NONE", diff --git a/data/maps/VictoryRoad_B2F/map.json b/data/maps/VictoryRoad_B2F/map.json index 7e59f9f27..6ee56389f 100644 --- a/data/maps/VictoryRoad_B2F/map.json +++ b/data/maps/VictoryRoad_B2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_VICTORY_ROAD_B2F", "name": "VictoryRoad_B2F", "layout": "LAYOUT_VICTORY_ROAD_B2F", - "music": "MUS_C_ROAD", + "music": "MUS_VICTORY_ROAD", "region_map_section": "MAPSEC_VICTORY_ROAD", "requires_flash": true, "weather": "WEATHER_NONE", diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc index 1e121678e..fe10af4b3 100644 --- a/data/scripts/berry_tree.inc +++ b/data/scripts/berry_tree.inc @@ -122,7 +122,7 @@ BerryTree_EventScript_PickBerry:: @ 8274448 special IncrementDailyPickedBerries special ObjectEventInteractionRemoveBerryTree message BerryTree_Text_PickedTheBerry - playfanfare MUS_ME_KINOMI + playfanfare MUS_OBTAIN_BERRY waitmessage waitfanfare waitbuttonpress diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 66cf74f0a..b81fbb4d5 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -132,7 +132,7 @@ CableClub_EventScript_ExitLinkRoom:: @ 8276C85 call CableClub_EventScript_CloseLinkAndExitLinkRoom call CableClub_EventScript_CloseDirectCornerBarrier special DrawWholeMapView - playse SE_TK_KASYA + playse SE_CLICK erasebox 0, 0, 29, 19 releaseall end @@ -142,7 +142,7 @@ CableClub_EventScript_ExitMinigameRoom:: @ 8276C9D call CableClub_EventScript_CloseLinkAndExitLinkRoom call EventScript_CloseMossdeepGameCornerBarrier special DrawWholeMapView - playse SE_TK_KASYA + playse SE_CLICK erasebox 0, 0, 29, 19 releaseall end @@ -165,7 +165,7 @@ CableClub_EventScript_ExitTradeCenter:: @ 8276CE7 call CableClub_EventScript_PlayerExitTradeCenter call CableClub_EventScript_CloseDirectCornerBarrier special DrawWholeMapView - playse SE_TK_KASYA + playse SE_CLICK erasebox 0, 0, 29, 19 releaseall end @@ -187,7 +187,7 @@ CableClub_EventScript_ExitRecordCorner:: @ 8276D2C call CableClub_EventScript_PlayerExitRecordCorner call CableClub_EventScript_CloseDirectCornerBarrier special DrawWholeMapView - playse SE_TK_KASYA + playse SE_CLICK erasebox 0, 0, 29, 19 releaseall end @@ -209,7 +209,7 @@ CableClub_EventScript_ExitUnionRoom:: @ 8276D6C call CableClub_EventScript_PlayerExitUnionRoom call CableClub_EventScript_CloseUnionRoomBarrier special DrawWholeMapView - playse SE_TK_KASYA + playse SE_CLICK erasebox 0, 0, 29, 19 releaseall end @@ -372,7 +372,7 @@ CableClub_EventScript_EnterColosseum:: @ 8276FBD waitmessage call CableClub_EventScript_OpenDirectCornerBarrier special DrawWholeMapView - playse SE_TK_KASYA + playse SE_CLICK delay 60 applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft waitmovement 0 @@ -477,7 +477,7 @@ CableClub_EventScript_EnterTradeCenter:: @ 827713A waitmessage call CableClub_EventScript_OpenDirectCornerBarrier special DrawWholeMapView - playse SE_TK_KASYA + playse SE_CLICK delay 60 applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft waitmovement 0 @@ -552,7 +552,7 @@ CableClub_EventScript_EnterRecordCorner:: @ 827724C waitmessage call CableClub_EventScript_OpenDirectCornerBarrier special DrawWholeMapView - playse SE_TK_KASYA + playse SE_CLICK delay 60 applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft waitmovement 0 @@ -955,7 +955,7 @@ CableClub_EventScript_EnterUnionRoom:: @ 827759F copyvar VAR_CABLE_CLUB_STATE, VAR_0x8004 call CableClub_EventScript_OpenUnionRoomBarrier special DrawWholeMapView - playse SE_TK_KASYA + playse SE_CLICK delay 60 applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft waitmovement 0 @@ -1285,7 +1285,7 @@ CableClub_EventScript_EnterWirelessLinkRoom:: @ 8277B3A 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 @@ -1481,7 +1481,7 @@ MossdeepCity_GameCorner_1F_EventScript_EnterMinigameRoom:: @ 8277E0E copyvar VAR_0x8007, VAR_LAST_TALKED call EventScript_OpenMossdeepGameCornerBarrier special DrawWholeMapView - playse SE_TK_KASYA + playse SE_CLICK delay 60 applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft waitmovement 0 diff --git a/data/scripts/cave_hole.inc b/data/scripts/cave_hole.inc index b55c932ee..1cc334004 100644 --- a/data/scripts/cave_hole.inc +++ b/data/scripts/cave_hole.inc @@ -11,7 +11,7 @@ EventScript_FallDownHole:: @ 82A8337 delay 20 applymovement OBJ_EVENT_ID_PLAYER, Movement_SetInvisible waitmovement 0 - playse SE_RU_HYUU + playse SE_FALL delay 60 warphole MAP_UNDEFINED waitstate @@ -22,7 +22,7 @@ EventScript_FallDownHoleMtPyre:: @ 82A8350 delay 20 applymovement OBJ_EVENT_ID_PLAYER, Movement_SetInvisible waitmovement 0 - playse SE_RU_HYUU + playse SE_FALL delay 60 special DoFallWarp waitstate diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc index c21488502..1ef723c37 100644 --- a/data/scripts/contest_hall.inc +++ b/data/scripts/contest_hall.inc @@ -401,13 +401,13 @@ ContestHall_EventScript_ShowContestMonPic:: @ 827A1D2 call ContestHall_EventScript_TryWaitForLink call ContestHall_EventScript_CheckIfContestWithRSPlayer addobject LOCALID_POKEBALL - playse SE_DANSA + playse SE_LEDGE lockall applymovement VAR_0x800B, ContestHall_Movement_ContestantDelay32 waitmovement 0 releaseall addvar VAR_0x8006, -1 - playse SE_BOWA2 + playse SE_BALL_OPEN special ShowContestEntryMonPic call ContestHall_EventScript_EntryXTrainersMon return @@ -427,7 +427,7 @@ ContestHall_EventScript_EntryXTrainersMonLink:: @ 827A229 ContestHall_EventScript_AudienceVote:: @ 827A230 call ContestHall_EventScript_AudienceWillVote call ContestHall_EventScript_VotingUnderWay - playse SE_W227B + playse SE_M_ENCORE2 waitmessage call ContestHall_EventScript_AudienceLookAround applymovement LOCALID_MC, ContestHall_Movement_MCFaceJudge2 @@ -481,7 +481,7 @@ ContestHall_EventScript_AudienceReactToContestant:: @ 827A2D5 call ContestHall_EventScript_TryWaitForLink applymovement LOCALID_MC, ContestHall_Movement_AudienceMemberLookLeft waitmovement 0 - playse SE_W227B + playse SE_M_ENCORE2 call ContestHall_EventScript_VObjectAudienceLookAround applymovement LOCALID_AUDIENCE_5, ContestHall_Movement_AudienceMemberLookRight applymovement LOCALID_AUDIENCE_2, ContestHall_Movement_AudienceMemberLookDown @@ -542,7 +542,7 @@ ContestHall_EventScript_AudienceHeartEmotes:: @ 827A34F ContestHall_EventScript_DisplayHearts:: @ 827A3E5 setvar VAR_RESULT, 8 - special ScriptRandom + special GenerateContestRand compare VAR_RESULT, 0 call_if_eq ContestHall_EventScript_TryDisplayHeartAudienceMember1 compare VAR_RESULT, 1 @@ -916,7 +916,7 @@ ContestHall_EventScript_ContestResults:: @ 827A8A5 setvar VAR_TEMP_9, 1 showcontestresults setvar VAR_TEMP_9, 0 - playbgm MUS_CON_FAN, 0 + playbgm MUS_CONTEST_WINNER, 0 return ContestHall_EventScript_ThatsItForJudging:: @ 827A8FB @@ -1005,7 +1005,7 @@ ContestHall_EventScript_CongratulateWinner:: @ 827A9D4 call ContestHall_EventScript_CongratsWinner applymovement VAR_TEMP_3, ContestHall_Movement_WinningPlayerWalkUp waitmovement 0 - playse SE_W227B + playse SE_M_ENCORE2 setvar VAR_TEMP_1, 0 return @@ -1117,7 +1117,7 @@ ContestHall_EventScript_GiveWinnerPrize:: @ 827AB36 releaseall call ContestHall_EventScript_WinnerApproachForPrize call ContestHall_EventScript_GivePrizeIfWinner - playse SE_W227B + playse SE_M_ENCORE2 setvar VAR_TEMP_1, 0 call ContestHall_EventScript_AudienceLookAround delay 30 @@ -1266,7 +1266,7 @@ ContestHall_EventScript_ReceiveContestRibbon:: @ 827ACDF setflag FLAG_SYS_RIBBON_GET lockall msgbox ContestHall_Text_ConferRibbonAsPrize, MSGBOX_DEFAULT - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM msgbox ContestHall_Text_ReceivedRibbon, MSGBOX_DEFAULT waitfanfare special BufferContestWinnerMonName diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc index 87995581f..ea8552510 100644 --- a/data/scripts/day_care.inc +++ b/data/scripts/day_care.inc @@ -38,7 +38,7 @@ Route117_EventScript_DaycareAcceptEgg:: @ 8291C83 Route117_EventScript_DaycareReceiveEgg:: @ 8291C9D message Route117_Text_ReceivedEgg - playfanfare MUS_FANFA1 + playfanfare MUS_LEVEL_UP waitfanfare waitbuttonpress msgbox Route117_Text_TakeGoodCareOfIt, MSGBOX_DEFAULT @@ -217,7 +217,7 @@ Route117_PokemonDayCare_EventScript_RetrieveMon:: @ 8291EE2 waitmovement 0 specialvar VAR_RESULT, TakePokemonFromDaycare special SubtractMoneyFromVar0x8005 - playse SE_REGI + playse SE_SHOP msgbox Route117_PokemonDayCare_Text_HeresYourMon, MSGBOX_DEFAULT waitse playmoncry VAR_RESULT, 0 diff --git a/data/scripts/elite_four.inc b/data/scripts/elite_four.inc index 3b395de21..f4eb6393b 100644 --- a/data/scripts/elite_four.inc +++ b/data/scripts/elite_four.inc @@ -20,7 +20,7 @@ PokemonLeague_EliteFour_SetAdvanceToNextRoomMetatiles:: @ 82723F8 PokemonLeague_EliteFour_EventScript_WalkInCloseDoor:: @ 8272475 applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkUp6 waitmovement 0 - playse SE_TRACK_DOOR + playse SE_TRUCK_DOOR setmetatile 5, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1 setmetatile 6, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1 setmetatile 7, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1 diff --git a/data/scripts/field_move_scripts.inc b/data/scripts/field_move_scripts.inc index 56e3297b6..2d689348b 100644 --- a/data/scripts/field_move_scripts.inc +++ b/data/scripts/field_move_scripts.inc @@ -1,4 +1,4 @@ - +@ Interact with cuttable tree EventScript_CutTree:: @ 82906BB lockall goto_if_unset FLAG_BADGE01_GET, EventScript_CheckTreeCantCut @@ -18,7 +18,8 @@ EventScript_CutTree:: @ 82906BB goto EventScript_CutTreeDown end -EventScript_FldEffCut:: @ 8290705 +@ Use cut from party menu +EventScript_UseCut:: @ 8290705 lockall dofieldeffect FLDEFF_USE_CUT_ON_TREE waitstate @@ -58,6 +59,7 @@ Text_CantCut: @ 829077D .string "This tree looks like it can be\n" .string "CUT down!$" +@ Interact with smashable rock EventScript_RockSmash:: @ 82907A6 lockall goto_if_unset FLAG_BADGE03_GET, EventScript_CantSmashRock @@ -77,7 +79,8 @@ EventScript_RockSmash:: @ 82907A6 goto EventScript_SmashRock end -EventScript_FldEffRockSmash:: @ 82907F0 +@ Use rock smash from party menu +EventScript_UseRockSmash:: @ 82907F0 lockall dofieldeffect FLDEFF_USE_ROCK_SMASH waitstate @@ -89,10 +92,10 @@ EventScript_SmashRock:: @ 82907FB waitmovement 0 removeobject VAR_LAST_TALKED specialvar VAR_RESULT, TryUpdateRusturfTunnelState - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq EventScript_EndSmash special RockSmashWildEncounter - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq EventScript_EndSmash waitstate releaseall @@ -141,7 +144,7 @@ EventScript_StrengthBoulder:: @ 82908BA goto EventScript_ActivateStrength end -EventScript_FldEffStrength:: @ 82908FD +EventScript_UseStrength:: @ 82908FD lockall dofieldeffect FLDEFF_USE_STRENGTH waitstate diff --git a/data/scripts/flash.inc b/data/scripts/flash.inc index 916b50719..bb4ae84eb 100644 --- a/data/scripts/flash.inc +++ b/data/scripts/flash.inc @@ -1,4 +1,4 @@ -EventScript_FldEffFlash:: @ 82926F8 +EventScript_UseFlash:: @ 82926F8 animateflash 1 setflashradius 1 end diff --git a/data/scripts/lilycove_lady.inc b/data/scripts/lilycove_lady.inc index 7f629e5db..40ead8e58 100644 --- a/data/scripts/lilycove_lady.inc +++ b/data/scripts/lilycove_lady.inc @@ -259,9 +259,9 @@ LilycoveCity_PokemonCenter_1F_EventScript_SubmitQuizResponse:: @ 82A8689 end LilycoveCity_PokemonCenter_1F_EventScript_CorrectResponse:: @ 82A86B0 - playse SE_SEIKAI + playse SE_SUCCESS delay 10 - playse SE_SEIKAI + playse SE_SUCCESS msgbox LilycoveCity_PokemonCenter_1F_Text_YouGotItRight, MSGBOX_DEFAULT goto LilycoveCity_PokemonCenter_1F_EventScript_ReadyGivePrize end @@ -269,9 +269,9 @@ LilycoveCity_PokemonCenter_1F_EventScript_CorrectResponse:: @ 82A86B0 LilycoveCity_PokemonCenter_1F_EventScript_IncorrectResponse:: @ 82A86C7 special BufferQuizCorrectAnswer special BufferQuizPrizeName - playse SE_HAZURE + playse SE_FAILURE delay 10 - playse SE_HAZURE + playse SE_FAILURE msgbox LilycoveCity_PokemonCenter_1F_Text_WrongTheCorrectAnswerIs, MSGBOX_DEFAULT msgbox LilycoveCity_PokemonCenter_1F_Text_IGetToKeepPrize, MSGBOX_DEFAULT goto LilycoveCity_PokemonCenter_1F_EventScript_AskMakeQuiz diff --git a/data/scripts/mevent_pichu.inc b/data/scripts/mevent_pichu.inc index cc947e396..c51558e9e 100644 --- a/data/scripts/mevent_pichu.inc +++ b/data/scripts/mevent_pichu.inc @@ -14,7 +14,7 @@ SurfPichu_GiveIfPossible: @ 8674D4C vmessage sText_MysteryGiftEgg waitmessage waitbuttonpress - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM waitfanfare release end diff --git a/data/scripts/new_game.inc b/data/scripts/new_game.inc index 3c68dfa13..f72337972 100644 --- a/data/scripts/new_game.inc +++ b/data/scripts/new_game.inc @@ -115,7 +115,7 @@ EventScript_ResetAllMapFlags:: @ 82715DE setflag FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_4 setflag FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS setflag FLAG_HIDE_PETALBURG_GYM_GREETER - setflag FLAG_HIDE_PETALBURG_GYM_WALLYS_UNCLE + setflag FLAG_HIDE_PETALBURG_GYM_WALLYS_DAD setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_BRENDAN setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_MAY setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM @@ -142,7 +142,7 @@ EventScript_ResetAllMapFlags:: @ 82715DE setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLYS_UNCLE setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WANDA setflag FLAG_HIDE_VERDANTURF_TOWN_SCOTT - setflag FLAG_HIDE_PETALBURG_CITY_WALLYS_UNCLE + setflag FLAG_HIDE_PETALBURG_CITY_WALLYS_DAD setflag FLAG_HIDE_PETALBURG_GYM_WALLY setflag FLAG_HIDE_SLATEPORT_CITY_STERNS_SHIPYARD_MR_BRINEY setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_ARCHIE diff --git a/data/scripts/obtain_item.inc b/data/scripts/obtain_item.inc index 3afd92588..19f57d9d5 100644 --- a/data/scripts/obtain_item.inc +++ b/data/scripts/obtain_item.inc @@ -65,11 +65,11 @@ EventScript_NoRoomForItem:: @ 8271BA9 return EventScript_PlayFanfareObtainedItem:: @ 8271BAF - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM return EventScript_PlayFanfareObtainedTMHM:: @ 8271BB3 - playfanfare MUS_ME_WAZA + playfanfare MUS_OBTAIN_TMHM return Std_ObtainDecoration:: @ 8271BB7 @@ -87,7 +87,7 @@ EventScript_ObtainDecorationMessage:: @ 8271BC5 return EventScript_ObtainedDecor:: @ 8271BE0 - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM message gText_ObtainedTheDecor waitfanfare msgbox gText_TheDecorWasTransferredToThePC, MSGBOX_DEFAULT diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index 440f47a6a..684b27e71 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -73,7 +73,7 @@ PlayersHouse_2F_EventScript_WallClock:: @ 8292799 call_if_eq PlayersHouse_2F_EventScript_MomComesUpstairsMale compare VAR_RESULT, FEMALE call_if_eq PlayersHouse_2F_EventScript_MomComesUpstairsFemale - playse SE_KAIDAN + playse SE_EXIT removeobject VAR_0x8008 releaseall end @@ -159,7 +159,7 @@ PlayersHouse_1F_EventScript_PetalburgGymReportMale:: @ 829286D call PlayersHouse_1F_EventScript_MomNoticeGymBroadcast applymovement OBJ_EVENT_ID_PLAYER, PlayersHouse_1F_Movement_PlayerApproachTVForGymMale waitmovement 0 - playbgm MUS_INTER_V, 0 + playbgm MUS_ENCOUNTER_INTERVIEWER, 0 msgbox PlayersHouse_1F_Text_MaybeDadWillBeOn, MSGBOX_DEFAULT closemessage applymovement VAR_0x8005, PlayersHouse_1F_Movement_MomMakeRoomToSeeTVMale @@ -184,7 +184,7 @@ PlayersHouse_1F_EventScript_PetalburgGymReportFemale:: @ 82928DC call PlayersHouse_1F_EventScript_MomNoticeGymBroadcast applymovement OBJ_EVENT_ID_PLAYER, PlayersHouse_1F_Movement_PlayerApproachTVForGymFemale waitmovement 0 - playbgm MUS_INTER_V, 0 + playbgm MUS_ENCOUNTER_INTERVIEWER, 0 msgbox PlayersHouse_1F_Text_MaybeDadWillBeOn, MSGBOX_DEFAULT closemessage applymovement VAR_0x8005, PlayersHouse_1F_Movement_MomMakeRoomToSeeTVFemale @@ -334,7 +334,7 @@ PlayersHouse_1F_EventScript_TryRegisterMom:: @ 8292A19 msgbox PlayersHouse_1F_Text_IsThatAPokenav, MSGBOX_DEFAULT closemessage delay 30 - playfanfare MUS_ME_TORE_EYE + playfanfare MUS_REGISTER_MATCH_CALL msgbox PlayersHouse_1F_Text_RegisteredMom, MSGBOX_DEFAULT waitfanfare closemessage diff --git a/data/scripts/roulette.inc b/data/scripts/roulette.inc index 9aea65054..f590ca358 100644 --- a/data/scripts/roulette.inc +++ b/data/scripts/roulette.inc @@ -6,7 +6,7 @@ Roulette_EventScript_Table1:: @ 82A5AB1 getpricereduction POKENEWS_GAME_CORNER compare VAR_RESULT, FALSE goto_if_eq Roulette_EventScript_Play - addvar VAR_0x8004, 128 + addvar VAR_0x8004, ROULETTE_SPECIAL_RATE goto Roulette_EventScript_Play end @@ -18,7 +18,7 @@ Roulette_EventScript_Table2:: @ 82A5ADF getpricereduction POKENEWS_GAME_CORNER compare VAR_RESULT, FALSE goto_if_eq Roulette_EventScript_Play - addvar VAR_0x8004, 128 + addvar VAR_0x8004, ROULETTE_SPECIAL_RATE goto Roulette_EventScript_Play end diff --git a/data/scripts/safari_zone.inc b/data/scripts/safari_zone.inc index 6a811d935..d04a16b58 100644 --- a/data/scripts/safari_zone.inc +++ b/data/scripts/safari_zone.inc @@ -24,7 +24,7 @@ SafariZone_EventScript_Retire:: @ 82A4B85 SafariZone_EventScript_TimesUp:: @ 82A4B8A lockall - playse SE_PINPON + playse SE_DING_DONG message SafariZone_Text_TimesUp waitmessage waitbuttonpress @@ -33,7 +33,7 @@ SafariZone_EventScript_TimesUp:: @ 82A4B8A SafariZone_EventScript_OutOfBalls:: @ 82A4B9B lockall - playse SE_PINPON + playse SE_DING_DONG message SafariZone_Text_OutOfBalls waitmessage waitbuttonpress diff --git a/data/scripts/secret_base.inc b/data/scripts/secret_base.inc index 0de890aa6..132bdd19c 100644 --- a/data/scripts/secret_base.inc +++ b/data/scripts/secret_base.inc @@ -144,7 +144,7 @@ SecretBase_EventScript_ShrubEnter:: @ 8275B4D SecretBase_EventScript_InitSecretBase:: @ 8275B5B closemessage - playse SE_KAIDAN + playse SE_EXIT setvar VAR_INIT_SECRET_BASE, 0 setflag FLAG_DECORATION_0 special SetPlayerSecretBase @@ -164,7 +164,7 @@ SecretBase_EventScript_FirstEntrance:: @ 8275B81 compare VAR_RESULT, YES goto_if_eq SecretBase_EventScript_SetAsBase closemessage - playse SE_KAIDAN + playse SE_EXIT special ClearAndLeaveSecretBase end @@ -183,7 +183,7 @@ SecretBase_Movement_275BB4: @ 8275BB4 SecretBase_EventScript_Enter:: @ 8275BB7 lockall setvar VAR_INIT_SECRET_BASE, 1 - playse SE_KAIDAN + playse SE_EXIT special IsCurSecretBaseOwnedByAnotherPlayer compare VAR_RESULT, FALSE goto_if_eq SecretBase_EventScript_EnterPlayersBase diff --git a/data/scripts/std_msgbox.inc b/data/scripts/std_msgbox.inc index 1d82bb381..10b46700e 100644 --- a/data/scripts/std_msgbox.inc +++ b/data/scripts/std_msgbox.inc @@ -29,7 +29,7 @@ Std_MsgboxYesNo: @ 8271332 Std_MsgboxGetPoints: @ 827133C message 0x0 - playfanfare MUS_ME_POINTGET + playfanfare MUS_OBTAIN_B_POINTS waitfanfare waitmessage return diff --git a/data/scripts/trainer_hill.inc b/data/scripts/trainer_hill.inc index ca692e1ef..34d0462bb 100644 --- a/data/scripts/trainer_hill.inc +++ b/data/scripts/trainer_hill.inc @@ -32,8 +32,8 @@ EventScript_TrainerHillTimer:: @ 82C8393 TrainerHill_1F_EventScript_DummyWarpToEntranceCounter:: @ 82C83A6 setvar VAR_TEMP_2, 1 - trainerhill_clearresult - compare VAR_RESULT, 1 @ VAR_RESULT always 0 here + trainerhill_getusingereader + compare VAR_RESULT, TRUE @ VAR_RESULT always FALSE here goto_if_eq TrainerHill_1F_EventScript_WarpSilentToEntranceCounter end diff --git a/data/scripts/trainer_script.inc b/data/scripts/trainer_script.inc index 59577e8a8..c77e628ee 100644 --- a/data/scripts/trainer_script.inc +++ b/data/scripts/trainer_script.inc @@ -3,7 +3,7 @@ Std_RegisteredInMatchCall:: @ 82742C9 buffertrainername 1, VAR_0x8000 closemessage delay 30 - playfanfare MUS_ME_TORE_EYE + playfanfare MUS_REGISTER_MATCH_CALL msgbox gText_RegisteredTrainerinPokeNav, MSGBOX_DEFAULT waitfanfare closemessage diff --git a/data/specials.inc b/data/specials.inc index d7d1897d8..77e7d5c0a 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -149,7 +149,7 @@ gSpecials:: @ 81DBA64 def_special SaveMuseumContestPainting def_special DoesContestCategoryHaveWinner def_special CountPlayerContestPaintings - def_special ShowContestWinner + def_special ShowContestWinnerPainting def_special MauvilleGymSetDefaultBarriers def_special MauvilleGymPressSwitch def_special ShowFieldMessageStringVar4 @@ -336,7 +336,7 @@ gSpecials:: @ 81DBA64 def_special BattleSetup_StartLatiBattle def_special SetRoute119Weather def_special SetRoute123Weather - def_special ScriptGetMultiplayerId + def_special GetContestMultiplayerId def_special ScriptGetPartyMonSpecies def_special IsSelectedMonEgg def_special TryInitBattleTowerAwardManObjectEvent @@ -350,7 +350,7 @@ gSpecials:: @ 81DBA64 def_special BufferLottoTicketNumber def_special TryHideBattleTowerReporter def_special DoesPartyHaveEnigmaBerry - def_special ScriptRandom + def_special GenerateContestRand def_special SetChampionSaveWarp def_special TryPutTreasureInvestigatorsOnAir def_special TryPutLotteryWinnerReportOnAir diff --git a/data/text/tv.inc b/data/text/tv.inc index 63a1eff65..6f678d824 100644 --- a/data/text/tv.inc +++ b/data/text/tv.inc @@ -2436,7 +2436,7 @@ gTVSafariFanClubText10:: @ 08289D33 .string "and make the challenge yourself!\p" .string "Until next time, cheerio!$" -gTVContestLiveUpdatesText00:: @ 08289DD6 +ContestLiveUpdates_Text_Intro:: @ 08289DD6 .string "“POKéMON CONTEST LIVE UPDATES!”\p" .string "MC: Thanks for joining us!\p" .string "We're live from the just-ended\n" @@ -2455,117 +2455,117 @@ gTVContestLiveUpdatesText00:: @ 08289DD6 .string "MC: Let's hear what the fans have\n" .string "to say about this CONTEST.$" -gTVContestLiveUpdatesText01:: @ 08289F53 +ContestLiveUpdates_Text_WonBothRounds:: @ 08289F53 .string "Spectator: The {STR_VAR_2} was tops in\n" .string "both primary and secondary judging!\p" .string "That {STR_VAR_2} will keep winning!$" -gTVContestLiveUpdatesText02:: @ 08289FB0 +ContestLiveUpdates_Text_BetterRound2:: @ 08289FB0 .string "Spectator: The {STR_VAR_2} didn't do\n" .string "well in the primary judging, but it\l" .string "cleaned up in the secondary judging!\p" .string "It was a miraculous comeback\n" .string "for that {STR_VAR_2}. Yippee!$" -gTVContestLiveUpdatesText03:: @ 0828A047 +ContestLiveUpdates_Text_EqualRounds:: @ 0828A047 .string "Spectator: The {STR_VAR_2} remained\n" .string "consistent throughout both primary\l" .string "and secondary judging.\p" .string "{STR_VAR_3} and the {STR_VAR_2},\n" .string "they're no ordinary combo!$" -gTVContestLiveUpdatesText04:: @ 0828A0C6 +ContestLiveUpdates_Text_BetterRound1:: @ 0828A0C6 .string "Spectator: In terms of being {STR_VAR_1},\n" .string "that {STR_VAR_2} was outstanding.\p" .string "I hope it makes better appeals\n" .string "next time, though.$" -gTVContestLiveUpdatesText05:: @ 0828A132 +ContestLiveUpdates_Text_GotNervous:: @ 0828A132 .string "Spectator: When the {STR_VAR_2} got\n" .string "nervous, I couldn't stop myself from\l" .string "shouting encouragement.\p" .string "I'd like to say this to that\n" .string "{STR_VAR_2}, “Congratulations!”$" -gTVContestLiveUpdatesText06:: @ 0828A1BE +ContestLiveUpdates_Text_StartledFoes:: @ 0828A1BE .string "Spectator: That {STR_VAR_2}'s appeal\n" .string "startled even me!\p" .string "{STR_VAR_2}, you were awesome!$" -gTVContestLiveUpdatesText07:: @ 0828A202 +ContestLiveUpdates_Text_UsedCombo:: @ 0828A202 .string "Spectator: That {STR_VAR_2}'s combo\n" .string "appeal was stunning!\p" .string "It's shaken me to the core!$" -gTVContestLiveUpdatesText08:: @ 0828A24E +ContestLiveUpdates_Text_ExcitingAppeal:: @ 0828A24E .string "Spectator: The winning {STR_VAR_2}'s\n" .string "appeal got my heart pounding!$" -gTVContestLiveUpdatesText09:: @ 0828A288 +ContestLiveUpdates_Text_WasCool:: @ 0828A288 .string "{STR_VAR_2}!\n" .string "You were cool!$" -gTVContestLiveUpdatesText10:: @ 0828A29B +ContestLiveUpdates_Text_WasBeautiful:: @ 0828A29B .string "{STR_VAR_2}!\n" .string "You were beautiful!$" -gTVContestLiveUpdatesText11:: @ 0828A2B3 +ContestLiveUpdates_Text_WasCute:: @ 0828A2B3 .string "{STR_VAR_2}!\n" .string "You were cute!$" -gTVContestLiveUpdatesText12:: @ 0828A2C6 +ContestLiveUpdates_Text_WasSmart:: @ 0828A2C6 .string "{STR_VAR_2}!\n" .string "You were smart!$" -gTVContestLiveUpdatesText13:: @ 0828A2DA +ContestLiveUpdates_Text_WasTough:: @ 0828A2DA .string "{STR_VAR_2}!\n" .string "You were tough!$" -gTVContestLiveUpdatesText14:: @ 0828A2EE +ContestLiveUpdates_Text_VeryExcitingAppeal:: @ 0828A2EE .string "Spectator: The winning {STR_VAR_2}'s\n" .string "appeal still has my heart pounding!$" -gTVContestLiveUpdatesText15:: @ 0828A32E +ContestLiveUpdates_Text_VeryCool:: @ 0828A32E .string "{STR_VAR_2}!\n" .string "You're the last word in cool!$" -gTVContestLiveUpdatesText16:: @ 0828A350 +ContestLiveUpdates_Text_VeryBeautiful:: @ 0828A350 .string "{STR_VAR_2}!\n" .string "You're the most beautiful!$" -gTVContestLiveUpdatesText17:: @ 0828A36F +ContestLiveUpdates_Text_VeryCute:: @ 0828A36F .string "{STR_VAR_2}!\n" .string "You're simply the cutest!$" -gTVContestLiveUpdatesText18:: @ 0828A38D +ContestLiveUpdates_Text_VerySmart:: @ 0828A38D .string "{STR_VAR_2}!\n" .string "You're the smartest among the smart!$" -gTVContestLiveUpdatesText19:: @ 0828A3B6 +ContestLiveUpdates_Text_VeryTough:: @ 0828A3B6 .string "{STR_VAR_2}!\n" .string "You're the toughest of the tough!$" -gTVContestLiveUpdatesText20:: @ 0828A3DC +ContestLiveUpdates_Text_TookBreak:: @ 0828A3DC .string "Spectator: Even when the {STR_VAR_2}\n" .string "took a break from making appeals,\l" .string "I couldn't take my eyes off it.\p" .string "I'm captivated by that {STR_VAR_2}.$" -gTVContestLiveUpdatesText21:: @ 0828A455 +ContestLiveUpdates_Text_GotStartled:: @ 0828A455 .string "Spectator: When the {STR_VAR_2} was\n" .string "startled by another POKéMON's appeal,\l" .string "I was close to tears.\p" .string "{STR_VAR_2}, you were resilient!\n" .string "Way to go!$" -gTVContestLiveUpdatesText22:: @ 0828A4CF +ContestLiveUpdates_Text_MoveWonderful:: @ 0828A4CF .string "Spectator: Oh…\n" .string "That {STR_VAR_2}'s {STR_VAR_3}!\l" .string "{STR_VAR_2}'s {STR_VAR_3}!\l" .string "{STR_VAR_2}'s {STR_VAR_3}!\l" .string "How could it be so wonderful?$" -gTVContestLiveUpdatesText23:: @ 0828A51C +ContestLiveUpdates_Text_TalkAboutAnotherMon:: @ 0828A51C .string "MC: Well, there you have it. This place\n" .string "is full of the {STR_VAR_1}'s fans!\p" .string "I should also mention that another\n" @@ -2573,20 +2573,20 @@ gTVContestLiveUpdatesText23:: @ 0828A51C .string "caught my eye.\p" .string "{STR_VAR_2}'s {STR_VAR_3}…$" -gTVContestLiveUpdatesText24:: @ 0828A5AC +ContestLiveUpdates_Text_FailedToAppeal:: @ 0828A5AC .string "It failed to make a single appeal during\n" .string "secondary judging out of nervousness.\p" .string "Next time, I would like to see this\n" .string "{STR_VAR_1} make even one appeal.$" -gTVContestLiveUpdatesText25:: @ 0828A638 +ContestLiveUpdates_Text_LastInBothRounds:: @ 0828A638 .string "It came dead last in both primary\n" .string "and secondary judging.\p" .string "I hope that {STR_VAR_1} will retrain this\n" .string "{STR_VAR_2} and erase the shame of\l" .string "this undisputed last-place finish.$" -gTVContestLiveUpdatesText26:: @ 0828A6CF +ContestLiveUpdates_Text_NotExcitingEnough:: @ 0828A6CF .string "It failed to take advantage of\n" .string "the audience's excitement and make\l" .string "an appropriate appeal.\p" @@ -2594,7 +2594,7 @@ gTVContestLiveUpdatesText26:: @ 0828A6CF .string "a feel for the audience and whip their\l" .string "excitement to a fever pitch next time.$" -gTVContestLiveUpdatesText27:: @ 0828A797 +ContestLiveUpdates_Text_LostAfterWinningRound1:: @ 0828A797 .string "While finishing first in the primary\n" .string "judging, its appeals in the secondary\l" .string "judging failed to click.\p" @@ -2603,14 +2603,14 @@ gTVContestLiveUpdatesText27:: @ 0828A797 .string "I'm sure {STR_VAR_1} is studying how to\n" .string "make more effective appeals now.$" -gTVContestLiveUpdatesText28:: @ 0828A86D +ContestLiveUpdates_Text_NeverExciting:: @ 0828A86D .string "The audience never got excited by its\n" .string "appeals during the secondary judging.\p" .string "We hope it will stop worrying about\n" .string "other POKéMON and learn to pitch\l" .string "its appeals to the audience more.$" -gTVContestLiveUpdatesText29:: @ 0828A920 +ContestLiveUpdates_Text_LostBySmallMargin:: @ 0828A920 .string "It lost to {STR_VAR_1}'s {STR_VAR_2}\n" .string "by only a small margin.\p" .string "It must be heartbreaking to come\n" @@ -2618,7 +2618,7 @@ gTVContestLiveUpdatesText29:: @ 0828A920 .string "I wouldn't be surprised if {STR_VAR_3}\n" .string "were weeping over this outcome.$" -gTVContestLiveUpdatesText30:: @ 0828A9CC +ContestLiveUpdates_Text_RepeatedAppeals:: @ 0828A9CC .string "It disappointed the JUDGE by\n" .string "repeating the same appeals.\p" .string "It's an unforgivable error in any\n" @@ -2626,14 +2626,14 @@ gTVContestLiveUpdatesText30:: @ 0828A9CC .string "{STR_VAR_1} should feel guilty for\n" .string "this sorry showing.$" -gTVContestLiveUpdatesText31:: @ 0828AA74 +ContestLiveUpdates_Text_ValiantEffortButLost:: @ 0828AA74 .string "{STR_VAR_1} turned in a valiant effort,\n" .string "but…\p" .string "It was all for naught, finishing last.\p" .string "{STR_VAR_1} should learn from this loss\n" .string "and put the knowledge to good use.$" -gTVContestLiveUpdatesText32:: @ 0828AB01 +ContestLiveUpdates_Text_Outro:: @ 0828AB01 .string "I'd like to end this program with our\n" .string "usual farewell to the winners.\p" .string "This time, it's {STR_VAR_1} and\n" |