ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-27 05:43:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix Terrain moves animations

Browse Source
This commit is contained in:
DizzyEggg 2020-06-25 11:44:05 +02:00
parent f19ba68cb9
commit f252cd8003
1 changed files with 120 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

211
data/battle_anim_scripts.s
View File

@ -8412,59 +8412,75 @@ Move_GRASSY_TERRAIN::
loadspritegfx ANIM_TAG_ORBS @Recover Ball loadspritegfx ANIM_TAG_ORBS @Recover Ball
loadspritegfx ANIM_TAG_GREEN_SPARKLE @Green Star loadspritegfx ANIM_TAG_GREEN_SPARKLE @Green Star
playsewithpan SE_W036, SOUND_PAN_ATTACKER playsewithpan SE_W036, SOUND_PAN_ATTACKER
launchtemplate gGrassyTerrainOrbsTemplate 0x2 0x2 0x1a 0x0 createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 11, ANIM_ATTACKER, 0
launchtemplate gGrassyTerrainOrbsTemplate 0x2 0x2 0x1a 0x2a waitforvisualfinish
launchtemplate gGrassyTerrainOrbsTemplate 0x2 0x2 0x1a 0x54 delay 30
launchtemplate gGrassyTerrainOrbsTemplate 0x2 0x2 0x1a 0x7e createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_ATTACKER, RGB(11, 26, 11), 12, 5, 1
launchtemplate gGrassyTerrainOrbsTemplate 0x2 0x2 0x1a 0xa8 delay 4
launchtemplate gGrassyTerrainOrbsTemplate 0x2 0x2 0x1a 0xd2 createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 11, ANIM_ATTACKER, 0
delay 0x34 playsewithpan SE_W179, SOUND_PAN_ATTACKER
setarg 0x7 0xffff createsprite gGrassyTerrainOrbsTemplate, ANIM_ATTACKER, 2, 26, 0
playsewithpan SE_W215, SOUND_PAN_ATTACKER createsprite gGrassyTerrainOrbsTemplate, ANIM_ATTACKER, 2, 26, 42
launchtask AnimTask_ScaleMonAndRestore 0x5 0x5 0xfff9 0xfff9 0xb 0x0 0x0 createsprite gGrassyTerrainOrbsTemplate, ANIM_ATTACKER, 2, 26, 84
launchtemplate gGrassyTerrainStarTemplate 0x82 0x1 0x0 createsprite gGrassyTerrainOrbsTemplate, ANIM_ATTACKER, 2, 26, 126
launchtemplate gGrassyTerrainStarTemplate 0x82 0x1 0x20 createsprite gGrassyTerrainOrbsTemplate, ANIM_ATTACKER, 2, 26, 168
launchtemplate gGrassyTerrainStarTemplate 0x82 0x1 0x40 createsprite gGrassyTerrainOrbsTemplate, ANIM_ATTACKER, 2, 26, 210
launchtemplate gGrassyTerrainStarTemplate 0x82 0x1 0x60 createvisualtask AnimTask_BlendBattleAnimPal, 10, ANIM_PAL_BG, 3, 0, 4, RGB(11, 26, 11)
launchtemplate gGrassyTerrainStarTemplate 0x82 0x1 0x80 delay 52
launchtemplate gGrassyTerrainStarTemplate 0x82 0x1 0xa0 setarg 7, 0xFFFF
launchtemplate gGrassyTerrainStarTemplate 0x82 0x1 SOUND_PAN_ATTACKER playsewithpan SE_W215, SOUND_PAN_ATTACKER
launchtemplate gGrassyTerrainStarTemplate 0x82 0x1 0xe0 createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 11, ANIM_ATTACKER, 0
createsprite gGrassyTerrainStarTemplate, ANIM_TARGET, 2, 0
createsprite gGrassyTerrainStarTemplate, ANIM_TARGET, 2, 32
createsprite gGrassyTerrainStarTemplate, ANIM_TARGET, 2, 64
createsprite gGrassyTerrainStarTemplate, ANIM_TARGET, 2, 96
createsprite gGrassyTerrainStarTemplate, ANIM_TARGET, 2, 128
createsprite gGrassyTerrainStarTemplate, ANIM_TARGET, 2, 160
createsprite gGrassyTerrainStarTemplate, ANIM_TARGET, 2, 192
createsprite gGrassyTerrainStarTemplate, ANIM_TARGET, 2, 224
panse_26 SE_W080, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +1, 0x0
waitforvisualfinish
delay 4
createvisualtask AnimTask_BlendBattleAnimPal, 10, ANIM_PAL_BG, 3, 4, 0, RGB(31, 24, 31)
waitforvisualfinish waitforvisualfinish
restorebg
waitbgfadein
panse_26 SE_W080, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 0x1, 0x0
waitsound
end end
Move_MISTY_TERRAIN:: Move_MISTY_TERRAIN::
loadspritegfx ANIM_TAG_ORBS @Recover Ball loadspritegfx ANIM_TAG_ORBS @Recover Ball
loadspritegfx ANIM_TAG_GREEN_SPARKLE @Green Star
loadspritegfx ANIM_TAG_WATER_GUN @Light Blue Colour loadspritegfx ANIM_TAG_WATER_GUN @Light Blue Colour
loadspritegfx ANIM_TAG_GREEN_SPARKLE
playsewithpan SE_W215, SOUND_PAN_ATTACKER playsewithpan SE_W215, SOUND_PAN_ATTACKER
launchtemplate gMistyTerrainOrbsTemplate 0x2 0x2 0x1a 0x0 createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 11, ANIM_ATTACKER, 0
launchtemplate gMistyTerrainOrbsTemplate 0x2 0x2 0x1a 0x2a waitforvisualfinish
launchtemplate gMistyTerrainOrbsTemplate 0x2 0x2 0x1a 0x54 delay 30
launchtemplate gMistyTerrainOrbsTemplate 0x2 0x2 0x1a 0x7e createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_ATTACKER, RGB(31, 24, 31), 12, 5, 1
launchtemplate gMistyTerrainOrbsTemplate 0x2 0x2 0x1a 0xa8 delay 4
launchtemplate gMistyTerrainOrbsTemplate 0x2 0x2 0x1a 0xd2 createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 11, ANIM_ATTACKER, 0
delay 0x34 playsewithpan SE_W179, SOUND_PAN_ATTACKER
setarg 0x7 0xffff createsprite gMistyTerrainOrbsTemplate, ANIM_ATTACKER, 2, 26, 0
playsewithpan SE_W213, SOUND_PAN_ATTACKER createsprite gMistyTerrainOrbsTemplate, ANIM_ATTACKER, 2, 26, 42
launchtask AnimTask_ScaleMonAndRestore 0x5 0x5 0xfff9 0xfff9 0xb 0x0 0x0 createsprite gMistyTerrainOrbsTemplate, ANIM_ATTACKER, 2, 26, 84
launchtemplate gMistyTerrainStarTemplate 0x82 0x1 0x0 createsprite gMistyTerrainOrbsTemplate, ANIM_ATTACKER, 2, 26, 126
launchtemplate gMistyTerrainStarTemplate 0x82 0x1 0x20 createsprite gMistyTerrainOrbsTemplate, ANIM_ATTACKER, 2, 26, 168
launchtemplate gMistyTerrainStarTemplate 0x82 0x1 0x40 createsprite gMistyTerrainOrbsTemplate, ANIM_ATTACKER, 2, 26, 210
launchtemplate gMistyTerrainStarTemplate 0x82 0x1 0x60 createvisualtask AnimTask_BlendBattleAnimPal, 10, ANIM_PAL_BG, 3, 0, 7, RGB(31, 24, 31)
launchtemplate gMistyTerrainStarTemplate 0x82 0x1 0x80 delay 52
launchtemplate gMistyTerrainStarTemplate 0x82 0x1 0xa0 setarg 7, 0xFFFF
launchtemplate gMistyTerrainStarTemplate 0x82 0x1 SOUND_PAN_ATTACKER playsewithpan SE_W213, SOUND_PAN_ATTACKER
launchtemplate gMistyTerrainStarTemplate 0x82 0x1 0xe0 createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 11, ANIM_ATTACKER, 0
createsprite gMistyTerrainStarTemplate, ANIM_TARGET, 2, 0
createsprite gMistyTerrainStarTemplate, ANIM_TARGET, 2, 32
createsprite gMistyTerrainStarTemplate, ANIM_TARGET, 2, 64
playse SE_W322
createsprite gMistyTerrainStarTemplate, ANIM_TARGET, 2, 96
createsprite gMistyTerrainStarTemplate, ANIM_TARGET, 2, 128
createsprite gMistyTerrainStarTemplate, ANIM_TARGET, 2, 160
createsprite gMistyTerrainStarTemplate, ANIM_TARGET, 2, 192
createsprite gMistyTerrainStarTemplate, ANIM_TARGET, 2, 224
waitforvisualfinish
delay 4
createvisualtask AnimTask_BlendBattleAnimPal, 10, ANIM_PAL_BG, 3, 7, 0, RGB(31, 24, 31)
waitforvisualfinish waitforvisualfinish
restorebg
waitbgfadein
playsewithpan SE_W322, SOUND_PAN_ATTACKER
delay 0x40
end end
@ -9315,31 +9331,37 @@ CoinShower:
Move_ELECTRIC_TERRAIN:: Move_ELECTRIC_TERRAIN::
loadspritegfx ANIM_TAG_ELECTRIC_ORBS loadspritegfx ANIM_TAG_ELECTRIC_ORBS
playsewithpan SE_W268, SOUND_PAN_ATTACKER playsewithpan SE_W268, SOUND_PAN_ATTACKER
launchtemplate gElectricTerrainOrbsTemplate 0x2 0x2 0x1a 0x0 createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 11, ANIM_ATTACKER, 0
launchtemplate gElectricTerrainOrbsTemplate 0x2 0x2 0x1a 0x2a waitforvisualfinish
launchtemplate gElectricTerrainOrbsTemplate 0x2 0x2 0x1a 0x54 delay 30
launchtemplate gElectricTerrainOrbsTemplate 0x2 0x2 0x1a 0x7e createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_ATTACKER, RGB(27, 27, 0), 12, 5, 1
launchtemplate gElectricTerrainOrbsTemplate 0x2 0x2 0x1a 0xa8 delay 4
launchtemplate gElectricTerrainOrbsTemplate 0x2 0x2 0x1a 0xd2 createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 11, ANIM_ATTACKER, 0
delay 0x34 playsewithpan SE_W179, SOUND_PAN_ATTACKER
setarg 0x7 0xffff createsprite gElectricTerrainOrbsTemplate, ANIM_ATTACKER, 2, 26, 0
playsewithpan SE_W213, SOUND_PAN_ATTACKER createsprite gElectricTerrainOrbsTemplate, ANIM_ATTACKER, 2, 26, 42
launchtask AnimTask_ScaleMonAndRestore 0x5 0x5 0xfff9 0xfff9 0xb 0x0 0x0 createsprite gElectricTerrainOrbsTemplate, ANIM_ATTACKER, 2, 26, 84
launchtemplate gElectricTerrainFlyingBallTemplate 0x82 0x1 0x0 createsprite gElectricTerrainOrbsTemplate, ANIM_ATTACKER, 2, 26, 126
launchtemplate gElectricTerrainFlyingBallTemplate 0x82 0x1 0x20 createsprite gElectricTerrainOrbsTemplate, ANIM_ATTACKER, 2, 26, 168
launchtemplate gElectricTerrainFlyingBallTemplate 0x82 0x1 0x40 createsprite gElectricTerrainOrbsTemplate, ANIM_ATTACKER, 2, 26, 210
launchtemplate gElectricTerrainFlyingBallTemplate 0x82 0x1 0x60 createvisualtask AnimTask_BlendBattleAnimPal, 10, ANIM_PAL_BG, 3, 0, 4, RGB(28, 28, 0)
launchtemplate gElectricTerrainFlyingBallTemplate 0x82 0x1 0x80 delay 52
launchtemplate gElectricTerrainFlyingBallTemplate 0x82 0x1 0xa0 setarg 7, 0xFFFF
launchtemplate gElectricTerrainFlyingBallTemplate 0x82 0x1 SOUND_PAN_ATTACKER playsewithpan SE_W115, SOUND_PAN_ATTACKER
launchtemplate gElectricTerrainFlyingBallTemplate 0x82 0x1 0xe0 createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 11, ANIM_ATTACKER, 0
createsprite gElectricTerrainFlyingBallTemplate, ANIM_TARGET, 2, 0
createsprite gElectricTerrainFlyingBallTemplate, ANIM_TARGET, 2, 32
createsprite gElectricTerrainFlyingBallTemplate, ANIM_TARGET, 2, 64
createsprite gElectricTerrainFlyingBallTemplate, ANIM_TARGET, 2, 96
createsprite gElectricTerrainFlyingBallTemplate, ANIM_TARGET, 2, 128
createsprite gElectricTerrainFlyingBallTemplate, ANIM_TARGET, 2, 160
createsprite gElectricTerrainFlyingBallTemplate, ANIM_TARGET, 2, 192
createsprite gElectricTerrainFlyingBallTemplate, ANIM_TARGET, 2, 224
loopsewithpan SE_W085B, SOUND_PAN_TARGET, 0x16, 0x3
waitforvisualfinish
delay 2
createvisualtask AnimTask_BlendBattleAnimPal, 10, ANIM_PAL_BG, 3, 4, 0, RGB(28, 28, 0)
waitforvisualfinish waitforvisualfinish
restorebg
waitbgfadein
playsewithpan SE_W085B, SOUND_PAN_TARGET
delay 0x40
playsewithpan SE_W085B, SOUND_PAN_TARGET
delay 0x40
end end
@ -10998,31 +11020,38 @@ Move_PSYCHIC_TERRAIN::
loadspritegfx ANIM_TAG_GREEN_SPARKLE @Green Star loadspritegfx ANIM_TAG_GREEN_SPARKLE @Green Star
loadspritegfx ANIM_TAG_POISON_BUBBLE @Purple Colour loadspritegfx ANIM_TAG_POISON_BUBBLE @Purple Colour
playsewithpan SE_W215, SOUND_PAN_ATTACKER playsewithpan SE_W215, SOUND_PAN_ATTACKER
launchtemplate gPsychicTerrainOrbsTemplate 0x2 0x2 0x1a 0x0 createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 11, ANIM_ATTACKER, 0
launchtemplate gPsychicTerrainOrbsTemplate 0x2 0x2 0x1a 0x2a
launchtemplate gPsychicTerrainOrbsTemplate 0x2 0x2 0x1a 0x54
launchtemplate gPsychicTerrainOrbsTemplate 0x2 0x2 0x1a 0x7e
launchtemplate gPsychicTerrainOrbsTemplate 0x2 0x2 0x1a 0xa8
launchtemplate gPsychicTerrainOrbsTemplate 0x2 0x2 0x1a 0xd2
delay 0x34
setarg 0x7 0xffff
playsewithpan SE_W213, SOUND_PAN_ATTACKER
launchtask AnimTask_ScaleMonAndRestore 0x5 0x5 0xfff9 0xfff9 0xb 0x0 0x0
launchtemplate gPsychicTerrainStarTemplate 0x82 0x1 0x0
launchtemplate gPsychicTerrainStarTemplate 0x82 0x1 0x20
launchtemplate gPsychicTerrainStarTemplate 0x82 0x1 0x40
launchtemplate gPsychicTerrainStarTemplate 0x82 0x1 0x60
launchtemplate gPsychicTerrainStarTemplate 0x82 0x1 0x80
launchtemplate gPsychicTerrainStarTemplate 0x82 0x1 0xa0
launchtemplate gPsychicTerrainStarTemplate 0x82 0x1 SOUND_PAN_ATTACKER
launchtemplate gPsychicTerrainStarTemplate 0x82 0x1 0xe0
waitforvisualfinish waitforvisualfinish
restorebg delay 30
waitbgfadein createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_ATTACKER, RGB(27, 0, 13), 12, 5, 1
delay 4
createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 11, ANIM_ATTACKER, 0
playsewithpan SE_W179, SOUND_PAN_ATTACKER
createsprite gPsychicTerrainOrbsTemplate, ANIM_ATTACKER, 2, 26, 0
createsprite gPsychicTerrainOrbsTemplate, ANIM_ATTACKER, 2, 26, 42
createsprite gPsychicTerrainOrbsTemplate, ANIM_ATTACKER, 2, 26, 84
createsprite gPsychicTerrainOrbsTemplate, ANIM_ATTACKER, 2, 26, 126
createsprite gPsychicTerrainOrbsTemplate, ANIM_ATTACKER, 2, 26, 168
createsprite gPsychicTerrainOrbsTemplate, ANIM_ATTACKER, 2, 26, 210
createvisualtask AnimTask_BlendBattleAnimPal, 10, ANIM_PAL_BG, 3, 0, 4, RGB(27, 0, 13)
delay 52
setarg 7, 0xFFFF
playsewithpan SE_W213, SOUND_PAN_ATTACKER
createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 11, ANIM_ATTACKER, 0
createsprite gPsychicTerrainStarTemplate, ANIM_TARGET, 2, 0
createsprite gPsychicTerrainStarTemplate, ANIM_TARGET, 2, 32
createsprite gPsychicTerrainStarTemplate, ANIM_TARGET, 2, 64
createsprite gPsychicTerrainStarTemplate, ANIM_TARGET, 2, 96
createsprite gPsychicTerrainStarTemplate, ANIM_TARGET, 2, 128
createsprite gPsychicTerrainStarTemplate, ANIM_TARGET, 2, 160
createsprite gPsychicTerrainStarTemplate, ANIM_TARGET, 2, 192
createsprite gPsychicTerrainStarTemplate, ANIM_TARGET, 2, 224
loopsewithpan SE_W048, SOUND_PAN_TARGET, 0xa, 0x3 loopsewithpan SE_W048, SOUND_PAN_TARGET, 0xa, 0x3
waitsound waitforvisualfinish
delay 4
createvisualtask AnimTask_BlendBattleAnimPal, 10, ANIM_PAL_BG, 3, 4, 0, RGB(27, 0, 13)
waitforvisualfinish
end end
Move_LUNGE:: Move_LUNGE::
loadspritegfx ANIM_TAG_IMPACT @hit loadspritegfx ANIM_TAG_IMPACT @hit