ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-27 20:24:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Sync arg descriptions from FireRed

Browse Source 
https://github.com/pret/pokefirered/pull/501
This commit is contained in:
PikalaxALT 2022-04-28 13:46:23 -04:00
parent 3f7b6ca357
commit ff936c15e1
3 changed files with 82 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

144
data/battle_anim_scripts.s
View File

@ -1458,11 +1458,11 @@ FuryCutterStrongest:
Move_SELF_DESTRUCT: Move_SELF_DESTRUCT:
loadspritegfx ANIM_TAG_EXPLOSION loadspritegfx ANIM_TAG_EXPLOSION
createvisualtask AnimTask_BlendBattleAnimPal, 10, 2, 1, 0, 9, RGB_RED createvisualtask AnimTask_BlendBattleAnimPal, 10, 2, 1, 0, 9, RGB_RED
createvisualtask AnimTask_ShakeMon2, 5, 4, 6, 0, 38, 1 createvisualtask AnimTask_ShakeMon2, 5, ANIM_PLAYER_LEFT, 6, 0, 38, 1
createvisualtask AnimTask_ShakeMon2, 5, 5, 6, 0, 38, 1 createvisualtask AnimTask_ShakeMon2, 5, ANIM_PLAYER_RIGHT, 6, 0, 38, 1
createvisualtask AnimTask_ShakeMon2, 5, 6, 6, 0, 38, 1 createvisualtask AnimTask_ShakeMon2, 5, ANIM_OPPONENT_LEFT, 6, 0, 38, 1
createvisualtask AnimTask_ShakeMon2, 5, 7, 6, 0, 38, 1 createvisualtask AnimTask_ShakeMon2, 5, ANIM_OPPONENT_RIGHT, 6, 0, 38, 1
createvisualtask AnimTask_ShakeMon2, 5, 8, 6, 0, 38, 1 createvisualtask AnimTask_ShakeMon2, 5, ANIM_ATTACKER_FORCE, 6, 0, 38, 1
call SelfDestructExplode call SelfDestructExplode
call SelfDestructExplode call SelfDestructExplode
waitforvisualfinish waitforvisualfinish
@ -1624,11 +1624,11 @@ RisingWaterHitEffect:
Move_EXPLOSION: Move_EXPLOSION:
loadspritegfx ANIM_TAG_EXPLOSION loadspritegfx ANIM_TAG_EXPLOSION
createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 8, 9, RGB(26, 8, 8), 8, RGB_BLACK, 8 createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 8, 9, RGB(26, 8, 8), 8, RGB_BLACK, 8
createvisualtask AnimTask_ShakeMon2, 5, 4, 8, 0, 40, 1 createvisualtask AnimTask_ShakeMon2, 5, ANIM_PLAYER_LEFT, 8, 0, 40, 1
createvisualtask AnimTask_ShakeMon2, 5, 5, 8, 0, 40, 1 createvisualtask AnimTask_ShakeMon2, 5, ANIM_PLAYER_RIGHT, 8, 0, 40, 1
createvisualtask AnimTask_ShakeMon2, 5, 6, 8, 0, 40, 1 createvisualtask AnimTask_ShakeMon2, 5, ANIM_OPPONENT_LEFT, 8, 0, 40, 1
createvisualtask AnimTask_ShakeMon2, 5, 7, 8, 0, 40, 1 createvisualtask AnimTask_ShakeMon2, 5, ANIM_OPPONENT_RIGHT, 8, 0, 40, 1
createvisualtask AnimTask_ShakeMon2, 5, 8, 8, 0, 40, 1 createvisualtask AnimTask_ShakeMon2, 5, ANIM_ATTACKER_FORCE, 8, 0, 40, 1
call Explosion1 call Explosion1
call Explosion1 call Explosion1
waitforvisualfinish waitforvisualfinish
@ -1657,12 +1657,12 @@ Explosion1:
Move_DEFENSE_CURL: Move_DEFENSE_CURL:
loadspritegfx ANIM_TAG_ECLIPSING_ORB loadspritegfx ANIM_TAG_ECLIPSING_ORB
loopsewithpan SE_M_TRI_ATTACK, SOUND_PAN_ATTACKER, 18, 3 loopsewithpan SE_M_TRI_ATTACK, SOUND_PAN_ATTACKER, 18, 3
createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_ATTACKER, 0 createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_ATTACKER, FALSE
createvisualtask AnimTask_DefenseCurlDeformMon, 5 createvisualtask AnimTask_DefenseCurlDeformMon, 5
waitforvisualfinish waitforvisualfinish
createsprite gEclipsingOrbSpriteTemplate, ANIM_ATTACKER, 2, 0, 6, 0, 1 createsprite gEclipsingOrbSpriteTemplate, ANIM_ATTACKER, 2, 0, 6, 0, 1
waitforvisualfinish waitforvisualfinish
createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_ATTACKER, 1 createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_ATTACKER, TRUE
waitforvisualfinish waitforvisualfinish
end end
@ -1709,7 +1709,7 @@ Frustration_Continue:
Frustration_Strongest: Frustration_Strongest:
playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER
createvisualtask AnimTask_ShakeMon2, 5, ANIM_ATTACKER, 1, 0, 15, 1 createvisualtask AnimTask_ShakeMon2, 5, ANIM_ATTACKER, 1, 0, 15, 1
createvisualtask AnimTask_BlendBattleAnimPal, 10, 2, 3, 0, 9, 31 createvisualtask AnimTask_BlendBattleAnimPal, 10, 2, 3, 0, 9, RGB_RED
waitforvisualfinish waitforvisualfinish
delay 20 delay 20
playsewithpan SE_M_SWAGGER2, SOUND_PAN_ATTACKER playsewithpan SE_M_SWAGGER2, SOUND_PAN_ATTACKER
@ -1740,12 +1740,12 @@ Frustration_Strongest:
createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 18, -18, ANIM_TARGET, 0 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 18, -18, ANIM_TARGET, 0
playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET
waitforvisualfinish waitforvisualfinish
createvisualtask AnimTask_BlendBattleAnimPal, 10, 2, 3, 9, 0, 31 createvisualtask AnimTask_BlendBattleAnimPal, 10, 2, 3, 9, 0, RGB_RED
goto Frustration_Continue goto Frustration_Continue
Frustration_Strong: Frustration_Strong:
playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER
createvisualtask AnimTask_ShakeMon2, 5, ANIM_ATTACKER, 1, 0, 15, 1 createvisualtask AnimTask_ShakeMon2, 5, ANIM_ATTACKER, 1, 0, 15, 1
createvisualtask AnimTask_BlendBattleAnimPal, 10, 2, 3, 0, 9, 31 createvisualtask AnimTask_BlendBattleAnimPal, 10, 2, 3, 0, 9, RGB_RED
waitforvisualfinish waitforvisualfinish
delay 20 delay 20
playsewithpan SE_M_SWAGGER2, SOUND_PAN_ATTACKER playsewithpan SE_M_SWAGGER2, SOUND_PAN_ATTACKER
@ -1766,7 +1766,7 @@ Frustration_Strong:
createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, -12, -6, ANIM_TARGET, 1 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, -12, -6, ANIM_TARGET, 1
createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 4, 0, 6, 1 createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 4, 0, 6, 1
waitforvisualfinish waitforvisualfinish
createvisualtask AnimTask_BlendBattleAnimPal, 10, 2, 3, 9, 0, 31 createvisualtask AnimTask_BlendBattleAnimPal, 10, 2, 3, 9, 0, RGB_RED
goto Frustration_Continue goto Frustration_Continue
Frustration_Medium: Frustration_Medium:
playsewithpan SE_M_SWAGGER2, SOUND_PAN_ATTACKER playsewithpan SE_M_SWAGGER2, SOUND_PAN_ATTACKER
@ -2597,8 +2597,8 @@ Move_LOW_KICK:
end end
Move_EARTHQUAKE: Move_EARTHQUAKE:
createvisualtask AnimTask_HorizontalShake, 5, (MAX_BATTLERS_COUNT + 1), 10, 50 createvisualtask AnimTask_HorizontalShake, 5, ANIM_PLAYER_RIGHT, 10, 50
createvisualtask AnimTask_HorizontalShake, 5, MAX_BATTLERS_COUNT, 10, 50 createvisualtask AnimTask_HorizontalShake, 5, ANIM_PLAYER_LEFT, 10, 50
playsewithpan SE_M_EARTHQUAKE, 0 playsewithpan SE_M_EARTHQUAKE, 0
delay 10 delay 10
createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 1, RGB_BLACK, 14, RGB_WHITE, 14 createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 1, RGB_BLACK, 14, RGB_WHITE, 14
@ -2608,7 +2608,7 @@ Move_EARTHQUAKE:
Move_FISSURE: Move_FISSURE:
loadspritegfx ANIM_TAG_MUD_SAND loadspritegfx ANIM_TAG_MUD_SAND
createvisualtask AnimTask_HorizontalShake, 3, (MAX_BATTLERS_COUNT + 1), 10, 50 createvisualtask AnimTask_HorizontalShake, 3, ANIM_PLAYER_RIGHT, 10, 50
createvisualtask AnimTask_HorizontalShake, 3, ANIM_TARGET, 10, 50 createvisualtask AnimTask_HorizontalShake, 3, ANIM_TARGET, 10, 50
playsewithpan SE_M_EARTHQUAKE, SOUND_PAN_TARGET playsewithpan SE_M_EARTHQUAKE, SOUND_PAN_TARGET
delay 8 delay 8
@ -2953,7 +2953,7 @@ SkyAttackSetUpAgainstPartner:
delay 20 delay 20
createvisualtask AnimTask_BlendBattleAnimPal, 10, 2, 1, 15, 0, RGB_WHITE createvisualtask AnimTask_BlendBattleAnimPal, 10, 2, 1, 15, 0, RGB_WHITE
waitforvisualfinish waitforvisualfinish
createvisualtask AnimTask_BlendBattleAnimPalExclude, 10, 4, 1, 8, 0, RGB_BLACK createvisualtask AnimTask_BlendBattleAnimPalExclude, 10, ANIM_PLAYER_LEFT, 1, 8, 0, RGB_BLACK
waitforvisualfinish waitforvisualfinish
clearmonbg ANIM_DEF_PARTNER clearmonbg ANIM_DEF_PARTNER
blendoff blendoff
@ -3182,15 +3182,15 @@ Move_DESTINY_BOND:
playsewithpan SE_M_CONFUSE_RAY, SOUND_PAN_ATTACKER playsewithpan SE_M_CONFUSE_RAY, SOUND_PAN_ATTACKER
delay 48 delay 48
createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 2, 0, 24, 1 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 2, 0, 24, 1
createvisualtask AnimTask_BlendBattleAnimPalExclude, 2, 6, 1, 0, 12, RGB(29, 29, 29) createvisualtask AnimTask_BlendBattleAnimPalExclude, 2, ANIM_OPPONENT_LEFT, 1, 0, 12, RGB(29, 29, 29)
delay 24 delay 24
createvisualtask AnimTask_BlendBattleAnimPalExclude, 2, 6, 1, 12, 0, RGB(29, 29, 29) createvisualtask AnimTask_BlendBattleAnimPalExclude, 2, ANIM_OPPONENT_LEFT, 1, 12, 0, RGB(29, 29, 29)
playsewithpan SE_M_NIGHTMARE, SOUND_PAN_TARGET playsewithpan SE_M_NIGHTMARE, SOUND_PAN_TARGET
waitforvisualfinish waitforvisualfinish
restorebg restorebg
waitbgfadein waitbgfadein
blendoff blendoff
clearmonbg 5 clearmonbg ANIM_PLAYER_RIGHT
end end
Move_ENDURE: Move_ENDURE:
@ -3323,13 +3323,13 @@ Move_MAGNITUDE:
MagnitudeEnd: MagnitudeEnd:
end end
MagnitudeRegular: MagnitudeRegular:
createvisualtask AnimTask_HorizontalShake, 5, (MAX_BATTLERS_COUNT + 1), 0, 50 createvisualtask AnimTask_HorizontalShake, 5, ANIM_PLAYER_RIGHT, 0, 50
createvisualtask AnimTask_HorizontalShake, 5, MAX_BATTLERS_COUNT, 0, 50 createvisualtask AnimTask_HorizontalShake, 5, ANIM_PLAYER_LEFT, 0, 50
loopsewithpan SE_M_STRENGTH, SOUND_PAN_TARGET, 8, 10 loopsewithpan SE_M_STRENGTH, SOUND_PAN_TARGET, 8, 10
goto MagnitudeEnd goto MagnitudeEnd
MagnitudeIntense: MagnitudeIntense:
createvisualtask AnimTask_HorizontalShake, 5, (MAX_BATTLERS_COUNT + 1), 0, 50 createvisualtask AnimTask_HorizontalShake, 5, ANIM_PLAYER_RIGHT, 0, 50
createvisualtask AnimTask_HorizontalShake, 5, MAX_BATTLERS_COUNT, 0, 50 createvisualtask AnimTask_HorizontalShake, 5, ANIM_PLAYER_LEFT, 0, 50
loopsewithpan SE_M_STRENGTH, SOUND_PAN_TARGET, 8, 10 loopsewithpan SE_M_STRENGTH, SOUND_PAN_TARGET, 8, 10
delay 10 delay 10
createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 1, RGB_BLACK, 14, RGB_WHITE, 14 createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 1, RGB_BLACK, 14, RGB_WHITE, 14
@ -3814,8 +3814,8 @@ Move_ERUPTION:
createsprite gEruptionFallingRockSpriteTemplate, ANIM_ATTACKER, 40, 110, -32, 64, 50, 0 createsprite gEruptionFallingRockSpriteTemplate, ANIM_ATTACKER, 40, 110, -32, 64, 50, 0
createsprite gEruptionFallingRockSpriteTemplate, ANIM_ATTACKER, 40, 60, -32, 80, 70, 1 createsprite gEruptionFallingRockSpriteTemplate, ANIM_ATTACKER, 40, 60, -32, 80, 70, 1
delay 22 delay 22
createvisualtask AnimTask_HorizontalShake, 5, (MAX_BATTLERS_COUNT + 1), 8, 60 createvisualtask AnimTask_HorizontalShake, 5, ANIM_PLAYER_RIGHT, 8, 60
createvisualtask AnimTask_HorizontalShake, 5, MAX_BATTLERS_COUNT, 8, 60 createvisualtask AnimTask_HorizontalShake, 5, ANIM_PLAYER_LEFT, 8, 60
loopsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET, 16, 12 loopsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET, 16, 12
delay 80 delay 80
createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 40, 31, 4, 4, 0, RGB_RED createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 40, 31, 4, 4, 0, RGB_RED
@ -3845,7 +3845,7 @@ Move_IMPRISON:
waitforvisualfinish waitforvisualfinish
delay 4 delay 4
createsprite gRedXSpriteTemplate, ANIM_ATTACKER, 5, ANIM_ATTACKER, 40 createsprite gRedXSpriteTemplate, ANIM_ATTACKER, 5, ANIM_ATTACKER, 40
createvisualtask AnimTask_HorizontalShake, 5, MAX_BATTLERS_COUNT, 1, 10 createvisualtask AnimTask_HorizontalShake, 5, ANIM_PLAYER_LEFT, 1, 10
playsewithpan SE_M_HYPER_BEAM, SOUND_PAN_ATTACKER playsewithpan SE_M_HYPER_BEAM, SOUND_PAN_ATTACKER
clearmonbg ANIM_DEF_PARTNER clearmonbg ANIM_DEF_PARTNER
call UnsetPsychicBackground call UnsetPsychicBackground
@ -3915,27 +3915,27 @@ Move_LUSTER_PURGE:
playsewithpan SE_M_SOLAR_BEAM, SOUND_PAN_ATTACKER playsewithpan SE_M_SOLAR_BEAM, SOUND_PAN_ATTACKER
createsprite gLusterPurgeCircleSpriteTemplate, ANIM_ATTACKER, 41, 0, 0, 0, 0 createsprite gLusterPurgeCircleSpriteTemplate, ANIM_ATTACKER, 41, 0, 0, 0, 0
delay 20 delay 20
createvisualtask AnimTask_BlendBattleAnimPalExclude, 5, 5, 2, 0, 16, RGB_WHITEALPHA createvisualtask AnimTask_BlendBattleAnimPalExclude, 5, ANIM_PLAYER_RIGHT, 2, 0, 16, RGB_WHITEALPHA
createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_WHITE_CIRCLE_OF_LIGHT, 2, 0, 16, RGB_WHITEALPHA createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_WHITE_CIRCLE_OF_LIGHT, 2, 0, 16, RGB_WHITEALPHA
waitforvisualfinish waitforvisualfinish
createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_IMPACT, 0, 12, 12, RGB(0, 0, 23) createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_IMPACT, 0, 12, 12, RGB(0, 0, 23)
waitforvisualfinish waitforvisualfinish
createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, 1, 2 createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, ANIM_TARGET, 2
createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_HYPER_BEAM, SOUND_PAN_TARGET createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_HYPER_BEAM, SOUND_PAN_TARGET
delay 3 delay 3
createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, 1, 2 createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, ANIM_TARGET, 2
createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_HYPER_BEAM, SOUND_PAN_TARGET createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_HYPER_BEAM, SOUND_PAN_TARGET
delay 3 delay 3
createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, 1, 2 createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, ANIM_TARGET, 2
createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_HYPER_BEAM, SOUND_PAN_TARGET createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_HYPER_BEAM, SOUND_PAN_TARGET
delay 3 delay 3
createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, 1, 2 createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, ANIM_TARGET, 2
createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_HYPER_BEAM, SOUND_PAN_TARGET createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_HYPER_BEAM, SOUND_PAN_TARGET
delay 3 delay 3
createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, 1, 2 createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, ANIM_TARGET, 2
createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_HYPER_BEAM, SOUND_PAN_TARGET createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_HYPER_BEAM, SOUND_PAN_TARGET
delay 3 delay 3
createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, 1, 2 createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, ANIM_TARGET, 2
createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_HYPER_BEAM, SOUND_PAN_TARGET createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_HYPER_BEAM, SOUND_PAN_TARGET
waitforvisualfinish waitforvisualfinish
createvisualtask AnimTask_BlendBattleAnimPalExclude, 5, 5, 2, 16, 0, RGB_WHITEALPHA createvisualtask AnimTask_BlendBattleAnimPalExclude, 5, 5, 2, 16, 0, RGB_WHITEALPHA
@ -4360,7 +4360,7 @@ Move_AERIAL_ACE:
Move_IRON_DEFENSE: Move_IRON_DEFENSE:
loopsewithpan SE_SHINY, SOUND_PAN_ATTACKER, 28, 2 loopsewithpan SE_SHINY, SOUND_PAN_ATTACKER, 28, 2
createvisualtask AnimTask_MetallicShine, 5, 0, 0, 0 createvisualtask AnimTask_MetallicShine, 5, 0, 0, RGB_BLACK
createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 8, 2, RGB_WHITEALPHA, 14, RGB_WHITEALPHA, 0 createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 8, 2, RGB_WHITEALPHA, 14, RGB_WHITEALPHA, 0
waitforvisualfinish waitforvisualfinish
end end
@ -4373,7 +4373,7 @@ Move_BLOCK:
Move_HOWL: Move_HOWL:
loadspritegfx ANIM_TAG_NOISE_LINE loadspritegfx ANIM_TAG_NOISE_LINE
createvisualtask AnimTask_DeepInhale, 2, 0 createvisualtask AnimTask_DeepInhale, 2, ANIM_ATTACKER
delay 12 delay 12
call RoarEffect call RoarEffect
createvisualtask SoundTask_PlayCryHighPitch, 2, ANIM_ATTACKER, 3 createvisualtask SoundTask_PlayCryHighPitch, 2, ANIM_ATTACKER, 3
@ -4572,7 +4572,7 @@ Move_SHOCK_WAVE:
Move_HARDEN: Move_HARDEN:
loopsewithpan SE_M_HARDEN, SOUND_PAN_ATTACKER, 28, 2 loopsewithpan SE_M_HARDEN, SOUND_PAN_ATTACKER, 28, 2
createvisualtask AnimTask_MetallicShine, 5, 0, 0, 0 createvisualtask AnimTask_MetallicShine, 5, 0, 0, RGB_BLACK
waitforvisualfinish waitforvisualfinish
end end
@ -5269,14 +5269,14 @@ Move_DRAGON_RAGE:
Move_RAIN_DANCE: Move_RAIN_DANCE:
loadspritegfx ANIM_TAG_RAIN_DROPS loadspritegfx ANIM_TAG_RAIN_DROPS
playsewithpan SE_M_RAIN_DANCE, SOUND_PAN_ATTACKER playsewithpan SE_M_RAIN_DANCE, SOUND_PAN_ATTACKER
createvisualtask AnimTask_BlendBattleAnimPal, 10, 0x781, 2, 0, 4, RGB_BLACK createvisualtask AnimTask_BlendBattleAnimPal, 10, 1 | (0xF << 7), 2, 0, 4, RGB_BLACK
waitforvisualfinish waitforvisualfinish
createvisualtask AnimTask_CreateRaindrops, 2, 0, 3, 120 createvisualtask AnimTask_CreateRaindrops, 2, 0, 3, 120
createvisualtask AnimTask_CreateRaindrops, 2, 0, 3, 120 createvisualtask AnimTask_CreateRaindrops, 2, 0, 3, 120
delay 120 delay 120
delay 30 delay 30
waitforvisualfinish waitforvisualfinish
createvisualtask AnimTask_BlendBattleAnimPal, 10, 0x781, 2, 4, 0, RGB_BLACK createvisualtask AnimTask_BlendBattleAnimPal, 10, 1 | (0xF << 7), 2, 4, 0, RGB_BLACK
waitforvisualfinish waitforvisualfinish
end end
@ -6721,7 +6721,7 @@ Move_SUNNY_DAY:
loadspritegfx ANIM_TAG_SUNLIGHT loadspritegfx ANIM_TAG_SUNLIGHT
monbg ANIM_ATK_PARTNER monbg ANIM_ATK_PARTNER
setalpha 13, 3 setalpha 13, 3
createvisualtask AnimTask_BlendBattleAnimPal, 10, 0x781, 1, 0, 6, RGB_WHITE createvisualtask AnimTask_BlendBattleAnimPal, 10, 1 | (0xF << 7), 1, 0, 6, RGB_WHITE
waitforvisualfinish waitforvisualfinish
panse_adjustnone SE_M_PETAL_DANCE, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +1, 0 panse_adjustnone SE_M_PETAL_DANCE, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +1, 0
call SunnyDayLightRay call SunnyDayLightRay
@ -6729,7 +6729,7 @@ Move_SUNNY_DAY:
call SunnyDayLightRay call SunnyDayLightRay
call SunnyDayLightRay call SunnyDayLightRay
waitforvisualfinish waitforvisualfinish
createvisualtask AnimTask_BlendBattleAnimPal, 10, 0x781, 1, 6, 0, RGB_WHITE createvisualtask AnimTask_BlendBattleAnimPal, 10, 1 | (0xF << 7), 1, 6, 0, RGB_WHITE
waitforvisualfinish waitforvisualfinish
clearmonbg ANIM_ATK_PARTNER clearmonbg ANIM_ATK_PARTNER
blendoff blendoff
@ -6945,9 +6945,9 @@ Move_HAZE:
playsewithpan SE_M_HAZE, 0 playsewithpan SE_M_HAZE, 0
createvisualtask AnimTask_HazeScrollingFog, 5 createvisualtask AnimTask_HazeScrollingFog, 5
delay 30 delay 30
createvisualtask AnimTask_BlendBattleAnimPal, 10, 0x780, 2, 0, 16, RGB_BLACK createvisualtask AnimTask_BlendBattleAnimPal, 10, 0 | (0xF << 7), 2, 0, 16, RGB_BLACK
delay 90 delay 90
createvisualtask AnimTask_BlendBattleAnimPal, 10, 0x780, 1, 16, 0, RGB_BLACK createvisualtask AnimTask_BlendBattleAnimPal, 10, 0 | (0xF << 7), 1, 16, 0, RGB_BLACK
end end
Move_FIRE_PUNCH: Move_FIRE_PUNCH:
@ -7219,7 +7219,7 @@ Move_STEEL_WING:
loadspritegfx ANIM_TAG_GUST loadspritegfx ANIM_TAG_GUST
loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_IMPACT
loopsewithpan SE_M_HARDEN, SOUND_PAN_ATTACKER, 28, 2 loopsewithpan SE_M_HARDEN, SOUND_PAN_ATTACKER, 28, 2
createvisualtask AnimTask_MetallicShine, 5, 0, 0, 0 createvisualtask AnimTask_MetallicShine, 5, 0, 0, RGB_BLACK
waitforvisualfinish waitforvisualfinish
monbg ANIM_DEF_PARTNER monbg ANIM_DEF_PARTNER
splitbgprio ANIM_TARGET splitbgprio ANIM_TARGET
@ -7245,7 +7245,7 @@ Move_STEEL_WING:
Move_IRON_TAIL: Move_IRON_TAIL:
loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_IMPACT
loopsewithpan SE_M_HARDEN, SOUND_PAN_ATTACKER, 28, 2 loopsewithpan SE_M_HARDEN, SOUND_PAN_ATTACKER, 28, 2
createvisualtask AnimTask_MetallicShine, 5, 1, 0, 0 createvisualtask AnimTask_MetallicShine, 5, 1, 0, RGB_BLACK
waitforvisualfinish waitforvisualfinish
monbg ANIM_TARGET monbg ANIM_TARGET
setalpha 12, 8 setalpha 12, 8
@ -7255,7 +7255,7 @@ Move_IRON_TAIL:
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET
waitforvisualfinish waitforvisualfinish
createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_ATTACKER, 1 createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_ATTACKER, TRUE
clearmonbg ANIM_TARGET clearmonbg ANIM_TARGET
blendoff blendoff
waitforvisualfinish waitforvisualfinish
@ -7275,7 +7275,7 @@ Move_POISON_TAIL:
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET
waitforvisualfinish waitforvisualfinish
createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_ATTACKER, 1 createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_ATTACKER, TRUE
clearmonbg ANIM_TARGET clearmonbg ANIM_TARGET
blendoff blendoff
call PoisonBubblesEffect call PoisonBubblesEffect
@ -7285,7 +7285,7 @@ Move_POISON_TAIL:
Move_METAL_CLAW: Move_METAL_CLAW:
loadspritegfx ANIM_TAG_CLAW_SLASH loadspritegfx ANIM_TAG_CLAW_SLASH
loopsewithpan SE_M_HARDEN, SOUND_PAN_ATTACKER, 28, 2 loopsewithpan SE_M_HARDEN, SOUND_PAN_ATTACKER, 28, 2
createvisualtask AnimTask_MetallicShine, 5, 0, 0, 0 createvisualtask AnimTask_MetallicShine, 5, 0, 0, RGB_BLACK
waitforvisualfinish waitforvisualfinish
createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 6, 4 createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 6, 4
delay 2 delay 2
@ -7740,12 +7740,12 @@ Move_HEAL_BELL:
unloadspritegfx ANIM_TAG_SPARKLE_2 unloadspritegfx ANIM_TAG_SPARKLE_2
loadspritegfx ANIM_TAG_THIN_RING loadspritegfx ANIM_TAG_THIN_RING
playsewithpan SE_SHINY, SOUND_PAN_ATTACKER playsewithpan SE_SHINY, SOUND_PAN_ATTACKER
createvisualtask AnimTask_BlendBattleAnimPalExclude, 10, 4, 3, 10, 0, RGB(12, 24, 30) createvisualtask AnimTask_BlendBattleAnimPalExclude, 10, ANIM_PLAYER_LEFT, 3, 10, 0, RGB(12, 24, 30)
createvisualtask AnimTask_BlendBattleAnimPal, 10, 10, 3, 10, 0, RGB_WHITE createvisualtask AnimTask_BlendBattleAnimPal, 10, 10, 3, 10, 0, RGB_WHITE
createsprite gBlendThinRingExpandingSpriteTemplate, ANIM_ATTACKER, 16, 0, 0, 0, 1 createsprite gBlendThinRingExpandingSpriteTemplate, ANIM_ATTACKER, 16, 0, 0, 0, 1
end end
HealBellRing: HealBellRing:
createvisualtask AnimTask_BlendBattleAnimPalExclude, 10, 4, 3, 8, 0, RGB(12, 24, 30) createvisualtask AnimTask_BlendBattleAnimPalExclude, 10, ANIM_PLAYER_LEFT, 3, 8, 0, RGB(12, 24, 30)
createvisualtask AnimTask_BlendBattleAnimPal, 10, 10, 3, 2, 10, RGB_WHITE createvisualtask AnimTask_BlendBattleAnimPal, 10, 10, 3, 2, 10, RGB_WHITE
createsprite gThinRingExpandingSpriteTemplate, ANIM_ATTACKER, 40, 0, -24, 0, 1 createsprite gThinRingExpandingSpriteTemplate, ANIM_ATTACKER, 40, 0, -24, 0, 1
playsewithpan SE_M_HEAL_BELL, SOUND_PAN_ATTACKER playsewithpan SE_M_HEAL_BELL, SOUND_PAN_ATTACKER
@ -7947,16 +7947,16 @@ Move_PERISH_SONG:
panse SE_M_PERISH_SONG, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 panse SE_M_PERISH_SONG, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0
delay 80 delay 80
createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 0, 16, RGB_BLACK createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 0, 16, RGB_BLACK
createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, 4, 0 createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_PLAYER_LEFT, FALSE
createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, 5, 0 createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_PLAYER_RIGHT, FALSE
createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, 6, 0 createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_OPPONENT_LEFT, FALSE
createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, 7, 0 createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_OPPONENT_RIGHT, FALSE
delay 100 delay 100
createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 16, 0, RGB_BLACK createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 16, 0, RGB_BLACK
createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, 4, 1 createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_PLAYER_LEFT, TRUE
createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, 5, 1 createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_PLAYER_RIGHT, TRUE
createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, 6, 1 createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_OPPONENT_LEFT, TRUE
createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, 7, 1 createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_OPPONENT_RIGHT, TRUE
waitforvisualfinish waitforvisualfinish
end end
@ -8102,7 +8102,7 @@ Move_ENCORE:
loadspritegfx ANIM_TAG_SPOTLIGHT loadspritegfx ANIM_TAG_SPOTLIGHT
loadspritegfx ANIM_TAG_TAG_HAND loadspritegfx ANIM_TAG_TAG_HAND
createvisualtask AnimTask_CreateSpotlight, 2 createvisualtask AnimTask_CreateSpotlight, 2
createvisualtask AnimTask_HardwarePaletteFade, 2, 248, 3, 0, 10, 0 createvisualtask AnimTask_HardwarePaletteFade, 2, BLDCNT_TGT1_BG3 | BLDCNT_TGT1_OBJ | BLDCNT_TGT1_BD | BLDCNT_EFFECT_DARKEN, 3, 0, 10, FALSE
waitforvisualfinish waitforvisualfinish
createsprite gSpotlightSpriteTemplate, ANIM_TARGET, 2, 0, -8 createsprite gSpotlightSpriteTemplate, ANIM_TARGET, 2, 0, -8
createsprite gClappingHandSpriteTemplate, ANIM_ATTACKER, 2, -2, 0, 0, 0, 9 createsprite gClappingHandSpriteTemplate, ANIM_ATTACKER, 2, -2, 0, 0, 0, 9
@ -8113,7 +8113,7 @@ Move_ENCORE:
createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_M_ENCORE2, SOUND_PAN_TARGET createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_M_ENCORE2, SOUND_PAN_TARGET
createvisualtask AnimTask_SwayMon, 5, 1, 8, 1536, 5, ANIM_TARGET createvisualtask AnimTask_SwayMon, 5, 1, 8, 1536, 5, ANIM_TARGET
waitforvisualfinish waitforvisualfinish
createvisualtask AnimTask_HardwarePaletteFade, 2, 248, 3, 10, 0, 1 createvisualtask AnimTask_HardwarePaletteFade, 2, BLDCNT_TGT1_BG3 | BLDCNT_TGT1_OBJ | BLDCNT_TGT1_BD | BLDCNT_EFFECT_DARKEN, 3, 10, 0, TRUE
waitforvisualfinish waitforvisualfinish
createvisualtask AnimTask_RemoveSpotlight, 2 createvisualtask AnimTask_RemoveSpotlight, 2
end end
@ -8288,7 +8288,7 @@ Move_MORNING_SUN:
loadspritegfx ANIM_TAG_BLUE_STAR loadspritegfx ANIM_TAG_BLUE_STAR
createvisualtask AnimTask_MorningSunLightBeam, 5 createvisualtask AnimTask_MorningSunLightBeam, 5
delay 8 delay 8
createvisualtask AnimTask_BlendBattleAnimPal, 10, 0x781, 8, 0, 12, RGB_WHITE createvisualtask AnimTask_BlendBattleAnimPal, 10, 1 | (0xF << 7), 8, 0, 12, RGB_WHITE
delay 14 delay 14
call MorningSunStar call MorningSunStar
call MorningSunStar call MorningSunStar
@ -8305,7 +8305,7 @@ Move_MORNING_SUN:
call MorningSunStar call MorningSunStar
call MorningSunStar call MorningSunStar
call MorningSunStar call MorningSunStar
createvisualtask AnimTask_BlendBattleAnimPal, 10, 0x781, 3, 12, 0, RGB_WHITE createvisualtask AnimTask_BlendBattleAnimPal, 10, 1 | (0xF << 7), 3, 12, 0, RGB_WHITE
waitforvisualfinish waitforvisualfinish
waitsound waitsound
call HealingEffect call HealingEffect
@ -8364,7 +8364,7 @@ Move_HYPER_BEAM:
delay 30 delay 30
createsoundtask SoundTask_LoopSEAdjustPanning, SE_M_HYPER_BEAM2, 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_ShakeMon, 2, ANIM_ATTACKER, 0, 4, 50, 1
createvisualtask AnimTask_FlashAnimTagWithColor, 2, ANIM_TAG_ORBS, 1, 12, RGB(31, 0, 0), 16, 0, 0 createvisualtask AnimTask_FlashAnimTagWithColor, 2, ANIM_TAG_ORBS, 1, 12, RGB_RED, 16, 0, 0
call HyperBeamOrbs call HyperBeamOrbs
call HyperBeamOrbs call HyperBeamOrbs
call HyperBeamOrbs call HyperBeamOrbs
@ -8408,7 +8408,7 @@ Move_FLATTER:
loadspritegfx ANIM_TAG_CONFETTI loadspritegfx ANIM_TAG_CONFETTI
createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_M_ENCORE2, SOUND_PAN_TARGET createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_M_ENCORE2, SOUND_PAN_TARGET
createvisualtask AnimTask_CreateSpotlight, 2 createvisualtask AnimTask_CreateSpotlight, 2
createvisualtask AnimTask_HardwarePaletteFade, 2, 248, 3, 0, 10, 0 createvisualtask AnimTask_HardwarePaletteFade, 2, BLDCNT_TGT1_BG3 | BLDCNT_TGT1_OBJ | BLDCNT_TGT1_BD | BLDCNT_EFFECT_DARKEN, 3, 0, 10, FALSE
waitforvisualfinish waitforvisualfinish
createsprite gFlatterSpotlightSpriteTemplate, ANIM_TARGET, 2, 0, -8, 80 createsprite gFlatterSpotlightSpriteTemplate, ANIM_TARGET, 2, 0, -8, 80
delay 0 delay 0
@ -8439,7 +8439,7 @@ Move_FLATTER:
delay 5 delay 5
createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_FLATTER, SOUND_PAN_TARGET createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_FLATTER, SOUND_PAN_TARGET
waitforvisualfinish waitforvisualfinish
createvisualtask AnimTask_HardwarePaletteFade, 2, 248, 3, 10, 0, 1 createvisualtask AnimTask_HardwarePaletteFade, 2, BLDCNT_TGT1_BG3 | BLDCNT_TGT1_OBJ | BLDCNT_TGT1_BD | BLDCNT_EFFECT_DARKEN, 3, 10, 0, TRUE
waitforvisualfinish waitforvisualfinish
createvisualtask AnimTask_RemoveSpotlight, 2 createvisualtask AnimTask_RemoveSpotlight, 2
end end
@ -9680,10 +9680,10 @@ Move_TWISTER:
createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 3, 0, 12, 1 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 3, 0, 12, 1
createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_DEF_PARTNER, 3, 0, 12, 1 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_DEF_PARTNER, 3, 0, 12, 1
delay 4 delay 4
createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, 1, 3 createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, ANIM_TARGET, 3
playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET
delay 4 delay 4
createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, 1, 3 createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, ANIM_TARGET, 3
playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET
delay 4 delay 4
createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 32, 20, ANIM_TARGET, 3 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 32, 20, ANIM_TARGET, 3
@ -10505,13 +10505,13 @@ General_FocusBand:
General_Rain: General_Rain:
loadspritegfx ANIM_TAG_RAIN_DROPS loadspritegfx ANIM_TAG_RAIN_DROPS
playsewithpan SE_M_RAIN_DANCE, SOUND_PAN_ATTACKER playsewithpan SE_M_RAIN_DANCE, SOUND_PAN_ATTACKER
createvisualtask AnimTask_BlendBattleAnimPal, 10, 0x781, 2, 0, 4, RGB_BLACK createvisualtask AnimTask_BlendBattleAnimPal, 10, 1 | (0xF << 7), 2, 0, 4, RGB_BLACK
waitforvisualfinish waitforvisualfinish
createvisualtask AnimTask_CreateRaindrops, 2, 0, 3, 60 createvisualtask AnimTask_CreateRaindrops, 2, 0, 3, 60
createvisualtask AnimTask_CreateRaindrops, 2, 0, 3, 60 createvisualtask AnimTask_CreateRaindrops, 2, 0, 3, 60
delay 50 delay 50
waitforvisualfinish waitforvisualfinish
createvisualtask AnimTask_BlendBattleAnimPal, 10, 0x781, 2, 4, 0, RGB_BLACK createvisualtask AnimTask_BlendBattleAnimPal, 10, 1 | (0xF << 7), 2, 4, 0, RGB_BLACK
waitforvisualfinish waitforvisualfinish
end end

5
include/constants/battle_anim.h
View File

@ -302,6 +302,11 @@
#define ANIM_TARGET 1 #define ANIM_TARGET 1
#define ANIM_ATK_PARTNER 2 #define ANIM_ATK_PARTNER 2
#define ANIM_DEF_PARTNER 3 #define ANIM_DEF_PARTNER 3
#define ANIM_PLAYER_LEFT 4
#define ANIM_PLAYER_RIGHT 5
#define ANIM_OPPONENT_LEFT 6
#define ANIM_OPPONENT_RIGHT 7
#define ANIM_ATTACKER_FORCE 8
// stereo panning constants [0-255] // stereo panning constants [0-255]
// //

1
ld_script_modern.txt
View File

@ -49,6 +49,7 @@ SECTIONS {
ALIGN(4) ALIGN(4)
{ {
src/rom_header.o(.text*); src/rom_header.o(.text*);
src/rom_header_gf.o(.text*);
src/*.o(.text*); src/*.o(.text*);
gflib/*.o(.text*); gflib/*.o(.text*);
asm/*.o(.text*); asm/*.o(.text*);