ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-02-04 10:20:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Document remaining status/general/special anims

Browse Source
This commit is contained in:
GriffinR 2020-02-19 23:13:54 -05:00 committed by huderlem
parent 208057d7ae
commit e633b57593
12 changed files with 120 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

130
data/battle_anim_scripts.s
View File

@ -395,9 +395,9 @@ gBattleAnims_General::
.4byte General_PokeblockThrow .4byte General_PokeblockThrow
.4byte General_ItemKnockoff .4byte General_ItemKnockoff
.4byte General_TurnTrap .4byte General_TurnTrap
.4byte General_ItemEffect .4byte General_HeldItemEffect
.4byte General_SmokeballEscape .4byte General_SmokeballEscape
.4byte General_HangedOn .4byte General_FocusBand
.4byte General_Rain .4byte General_Rain
.4byte General_Sun .4byte General_Sun
.4byte General_Sandstorm .4byte General_Sandstorm
@ -414,13 +414,13 @@ gBattleAnims_General::
.align 2 .align 2
gBattleAnims_Special:: gBattleAnims_Special::
.4byte Special_LevelUp .4byte Special_LevelUp @ B_ANIM_LVL_UP
.4byte Special_SwitchOutPlayerMon .4byte Special_SwitchOutPlayerMon @ B_ANIM_SWITCH_OUT_PLAYER_MON
.4byte Special_SwitchOutOpponentMon .4byte Special_SwitchOutOpponentMon @ B_ANIM_SWITCH_OUT_OPPONENT_MON
.4byte Special_BallThrow .4byte Special_BallThrow @ B_ANIM_BALL_THROW
.4byte Special_SafariBallThrow .4byte Special_SafariBallThrow @ B_ANIM_SAFARI_BALL_THROW
.4byte Special_SubstituteToMon .4byte Special_SubstituteToMon @ B_ANIM_SUBSTITUTE_TO_MON
.4byte Special_MonToSubstitute .4byte Special_MonToSubstitute @ B_ANIM_MON_TO_SUBSTITUTE
Move_NONE: Move_NONE:
Move_MIRROR_MOVE: Move_MIRROR_MOVE:
@ -3481,12 +3481,13 @@ Move_HEAT_WAVE:
createsprite gFlyingSandCrescentSpriteTemplate, ANIM_ATTACKER, 40, 60, 2560, 96, 1 createsprite gFlyingSandCrescentSpriteTemplate, ANIM_ATTACKER, 40, 60, 2560, 96, 1
end end
@ Also used by Hail weather
Move_HAIL: Move_HAIL:
loadspritegfx ANIM_TAG_HAIL loadspritegfx ANIM_TAG_HAIL
loadspritegfx ANIM_TAG_ICE_CRYSTALS loadspritegfx ANIM_TAG_ICE_CRYSTALS
createvisualtask AnimTask_BlendBattleAnimPal, 10, 1, 3, 0, 6, RGB_BLACK createvisualtask AnimTask_BlendBattleAnimPal, 10, 1, 3, 0, 6, RGB_BLACK
waitforvisualfinish waitforvisualfinish
createvisualtask AnimTask_HailStart, 5 createvisualtask AnimTask_Hail, 5
loopsewithpan SE_W258, 0, 8, 10 loopsewithpan SE_W258, 0, 8, 10
waitforvisualfinish waitforvisualfinish
createvisualtask AnimTask_BlendBattleAnimPal, 10, 1, 3, 6, 0, RGB_BLACK createvisualtask AnimTask_BlendBattleAnimPal, 10, 1, 3, 6, 0, RGB_BLACK
@ -6188,7 +6189,7 @@ Move_WING_ATTACK:
Move_PECK: Move_PECK:
loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_IMPACT
playsewithpan SE_W030, SOUND_PAN_TARGET playsewithpan SE_W030, SOUND_PAN_TARGET
createvisualtask sub_80D622C, 2, 3, -768, 1, 2 createvisualtask AnimTask_RotateMonToSideAndRestore, 2, 3, -768, ANIM_TARGET, 2
createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, -12, 0, ANIM_TARGET, 3 createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, -12, 0, ANIM_TARGET, 3
waitforvisualfinish waitforvisualfinish
end end
@ -6335,6 +6336,7 @@ FlamethrowerCreateFlames:
delay 2 delay 2
return return
@ Also used by Sandstorm weather
Move_SANDSTORM: Move_SANDSTORM:
loadspritegfx ANIM_TAG_FLYING_DIRT loadspritegfx ANIM_TAG_FLYING_DIRT
playsewithpan SE_W201, 0 playsewithpan SE_W201, 0
@ -6715,6 +6717,7 @@ SubmissionHit:
delay 8 delay 8
return return
@ Also used by Sunny weather
Move_SUNNY_DAY: Move_SUNNY_DAY:
loadspritegfx ANIM_TAG_SUNLIGHT loadspritegfx ANIM_TAG_SUNLIGHT
monbg ANIM_ATK_PARTNER monbg ANIM_ATK_PARTNER
@ -6734,7 +6737,7 @@ Move_SUNNY_DAY:
end end
SunnyDayLightRay: SunnyDayLightRay:
createsprite gSunnyDayLightRaySpriteTemplate, ANIM_ATTACKER, 40 createsprite gSunlightRaySpriteTemplate, ANIM_ATTACKER, 40
delay 6 delay 6
return return
@ -10226,13 +10229,13 @@ Status_Confusion:
Status_Burn: Status_Burn:
loadspritegfx ANIM_TAG_SMALL_EMBER loadspritegfx ANIM_TAG_SMALL_EMBER
playsewithpan SE_W172, SOUND_PAN_TARGET playsewithpan SE_W172, SOUND_PAN_TARGET
call Burn1 call BurnFlame
call Burn1 call BurnFlame
call Burn1 call BurnFlame
waitforvisualfinish waitforvisualfinish
end end
Burn1: BurnFlame:
createsprite gUnknown_08595504, ANIM_TARGET, 2, -24, 24, 24, 24, 20, 1, 1 createsprite gBurnFlameSpriteTemplate, ANIM_TARGET, 2, -24, 24, 24, 24, 20, 1, 1
delay 4 delay 4
return return
@ -10295,9 +10298,9 @@ Status_Nightmare:
General_CastformChange: General_CastformChange:
createvisualtask AnimTask_IsMonInvisible, 2 createvisualtask AnimTask_IsMonInvisible, 2
jumpreteq 1, AnimScript_82D7ECA jumpreteq 1, CastformChangeSkipAnim
goto AnimScript_82D7EB2 goto CastformChangeContinue
AnimScript_82D7EB2: CastformChangeContinue:
monbg ANIM_ATTACKER monbg ANIM_ATTACKER
playsewithpan SE_W100, SOUND_PAN_ATTACKER playsewithpan SE_W100, SOUND_PAN_ATTACKER
waitplaysewithpan SE_W107, SOUND_PAN_ATTACKER, 48 waitplaysewithpan SE_W107, SOUND_PAN_ATTACKER, 48
@ -10305,8 +10308,8 @@ AnimScript_82D7EB2:
waitforvisualfinish waitforvisualfinish
clearmonbg ANIM_ATTACKER clearmonbg ANIM_ATTACKER
end end
AnimScript_82D7ECA: CastformChangeSkipAnim:
createvisualtask AnimTask_CastformGfxChange, 2, 1 createvisualtask AnimTask_CastformGfxDataChange, 2, 1
end end
General_StatsChange: General_StatsChange:
@ -10316,7 +10319,7 @@ General_StatsChange:
General_SubstituteFade: General_SubstituteFade:
monbg ANIM_ATTACKER monbg ANIM_ATTACKER
createvisualtask sub_8172D98, 5 createvisualtask AnimTask_SubstituteFadeToInvisible, 5
createvisualtask AnimTask_BlendBattleAnimPal, 10, 2, 0, 0, 16, RGB_WHITE createvisualtask AnimTask_BlendBattleAnimPal, 10, 2, 0, 0, 16, RGB_WHITE
waitforvisualfinish waitforvisualfinish
delay 1 delay 1
@ -10324,7 +10327,7 @@ General_SubstituteFade:
delay 2 delay 2
blendoff blendoff
createvisualtask AnimTask_BlendBattleAnimPal, 10, 2, 0, 0, 0, RGB_WHITE createvisualtask AnimTask_BlendBattleAnimPal, 10, 2, 0, 0, 0, RGB_WHITE
createvisualtask sub_8172BF0, 2, 1 createvisualtask AnimTask_SwapMonSpriteToFromSubstitute, 2, TRUE
end end
General_SubstituteAppear: General_SubstituteAppear:
@ -10332,7 +10335,7 @@ General_SubstituteAppear:
end end
General_PokeblockThrow: General_PokeblockThrow:
createvisualtask sub_817345C, 2, 0 createvisualtask AnimTask_SetAttackerTargetLeftPos, 2, 0
createvisualtask AnimTask_LoadPokeblockGfx, 2 createvisualtask AnimTask_LoadPokeblockGfx, 2
delay 0 delay 0
waitplaysewithpan SE_W026, SOUND_PAN_ATTACKER, 22 waitplaysewithpan SE_W026, SOUND_PAN_ATTACKER, 22
@ -10352,8 +10355,8 @@ General_ItemKnockoff:
General_TurnTrap: General_TurnTrap:
createvisualtask AnimTask_GetTrappedMoveAnimId, 5 createvisualtask AnimTask_GetTrappedMoveAnimId, 5
jumpargeq 0, TRAP_ANIM_FIRE_SPIN, Status_FireSpin jumpargeq 0, TRAP_ANIM_FIRE_SPIN, Status_FireSpin
jumpargeq 0, TRAP_ANIM_WHIRLPOOL, Status_Whrilpool jumpargeq 0, TRAP_ANIM_WHIRLPOOL, Status_Whirlpool
jumpargeq 0, TRAP_ANIM_CLAMP, Status_Clamp jumpargeq 0, TRAP_ANIM_CLAMP, Status_Clamp
jumpargeq 0, TRAP_ANIM_SAND_TOMB, Status_SandTomb jumpargeq 0, TRAP_ANIM_SAND_TOMB, Status_SandTomb
goto Status_BindWrap goto Status_BindWrap
Status_BindWrap: Status_BindWrap:
@ -10380,7 +10383,7 @@ Status_FireSpin:
stopsound stopsound
end end
Status_Whrilpool: Status_Whirlpool:
loadspritegfx ANIM_TAG_WATER_ORB loadspritegfx ANIM_TAG_WATER_ORB
monbg ANIM_DEF_PARTNER monbg ANIM_DEF_PARTNER
monbgprio_28 ANIM_TARGET monbgprio_28 ANIM_TARGET
@ -10428,18 +10431,18 @@ Status_SandTomb:
stopsound stopsound
end end
General_ItemEffect: General_HeldItemEffect:
loadspritegfx ANIM_TAG_THIN_RING loadspritegfx ANIM_TAG_THIN_RING
loadspritegfx ANIM_TAG_SPARKLE_2 loadspritegfx ANIM_TAG_SPARKLE_2
delay 0 delay 0
playsewithpan SE_W036, SOUND_PAN_ATTACKER playsewithpan SE_W036, SOUND_PAN_ATTACKER
createvisualtask sub_80D622C, 2, 16, 128, 0, 2 createvisualtask AnimTask_RotateMonToSideAndRestore, 2, 16, 128, ANIM_ATTACKER, 2
waitforvisualfinish waitforvisualfinish
playsewithpan SE_W036, SOUND_PAN_ATTACKER playsewithpan SE_W036, SOUND_PAN_ATTACKER
createvisualtask sub_80D622C, 2, 16, 128, 0, 2 createvisualtask AnimTask_RotateMonToSideAndRestore, 2, 16, 128, ANIM_ATTACKER, 2
waitforvisualfinish waitforvisualfinish
playsewithpan SE_W036, SOUND_PAN_ATTACKER playsewithpan SE_W036, SOUND_PAN_ATTACKER
createvisualtask sub_80D622C, 2, 16, 128, 0, 2 createvisualtask AnimTask_RotateMonToSideAndRestore, 2, 16, 128, ANIM_ATTACKER, 2
waitforvisualfinish waitforvisualfinish
playsewithpan SE_W234, SOUND_PAN_ATTACKER playsewithpan SE_W234, SOUND_PAN_ATTACKER
call GrantingStarsEffect call GrantingStarsEffect
@ -10488,10 +10491,10 @@ General_SmokeballEscape:
blendoff blendoff
end end
General_HangedOn: General_FocusBand:
createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 2, 7, 0, 9, RGB_RED createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 2, 7, 0, 9, RGB_RED
playsewithpan SE_W082, SOUND_PAN_ATTACKER playsewithpan SE_W082, SOUND_PAN_ATTACKER
createvisualtask sub_815DB90, 5, 30, 128, 0, 1, 2, 0, 1 createvisualtask AnimTask_SlideMonForFocusBand, 5, 30, 128, 0, 1, 2, 0, 1
waitforvisualfinish waitforvisualfinish
createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 2, 4, 9, 0, RGB_RED createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 2, 4, 9, 0, RGB_RED
waitforvisualfinish waitforvisualfinish
@ -10549,7 +10552,7 @@ General_ItemSteal:
General_SnatchMove: General_SnatchMove:
loadspritegfx ANIM_TAG_ITEM_BAG loadspritegfx ANIM_TAG_ITEM_BAG
createvisualtask sub_8117E94, 2 createvisualtask sub_8117E94, 2
call AnimScript_82D85A3 call SnatchMoveTrySwapFromSubstitute
delay 1 delay 1
createvisualtask AnimTask_SwayMon, 2, 0, 5, 5120, 4, ANIM_TARGET createvisualtask AnimTask_SwayMon, 2, 0, 5, 5120, 4, ANIM_TARGET
waitforvisualfinish waitforvisualfinish
@ -10558,7 +10561,7 @@ General_SnatchMove:
goto SnatchPartnerMonMove goto SnatchPartnerMonMove
SnatchMoveContinue: SnatchMoveContinue:
waitforvisualfinish waitforvisualfinish
call AnimScript_82D85C3 call SnatchMoveTrySwapToSubstitute
end end
SnatchOpposingMonMove: SnatchOpposingMonMove:
playsewithpan SE_W104, SOUND_PAN_ATTACKER playsewithpan SE_W104, SOUND_PAN_ATTACKER
@ -10669,59 +10672,60 @@ General_WishHeal:
createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 10, 0, RGB_BLACK createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 10, 0, RGB_BLACK
end end
AnimScript_82D85A3: SnatchMoveTrySwapFromSubstitute:
createvisualtask AnimTask_IsAttackerBehindSubstitute, 2 createvisualtask AnimTask_IsAttackerBehindSubstitute, 2
jumprettrue AnimScript_82D85B4 jumprettrue SnatchMoveSwapSubstituteForMon
AnimScript_82D85B2: SnatchMoveTrySwapFromSubstituteEnd:
waitforvisualfinish waitforvisualfinish
return return
AnimScript_82D85B4: SnatchMoveSwapSubstituteForMon:
createvisualtask sub_8172BF0, 2, 1 createvisualtask AnimTask_SwapMonSpriteToFromSubstitute, 2, TRUE
waitforvisualfinish waitforvisualfinish
goto AnimScript_82D85B2 goto SnatchMoveTrySwapFromSubstituteEnd
AnimScript_82D85C3: SnatchMoveTrySwapToSubstitute:
createvisualtask AnimTask_IsAttackerBehindSubstitute, 2 createvisualtask AnimTask_IsAttackerBehindSubstitute, 2
jumprettrue AnimScript_82D85D4 jumprettrue SnatchMoveSwapMonForSubstitute
AnimScript_82D85D2: SnatchMoveTrySwapToSubstituteEnd:
waitforvisualfinish waitforvisualfinish
return return
AnimScript_82D85D4: SnatchMoveSwapMonForSubstitute:
createvisualtask sub_8172BF0, 2, 0 createvisualtask AnimTask_SwapMonSpriteToFromSubstitute, 2, FALSE
waitforvisualfinish waitforvisualfinish
goto AnimScript_82D85D2 goto SnatchMoveTrySwapToSubstituteEnd
@ Healthbox blue flash effect on level up
Special_LevelUp: Special_LevelUp:
playsewithpan SE_EXPMAX, 0 playsewithpan SE_EXPMAX, 0
createvisualtask sub_8170920, 2 createvisualtask AnimTask_LoadHealthboxPalsForLevelUp, 2
delay 0 delay 0
createvisualtask sub_8170A0C, 5, 0, 0 createvisualtask AnimTask_FlashHealthboxOnLevelUp, 5, 0, 0
waitforvisualfinish waitforvisualfinish
createvisualtask sub_81709EC, 2 createvisualtask AnimTask_FreeHealthboxPalsForLevelUp, 2
end end
Special_SwitchOutPlayerMon: Special_SwitchOutPlayerMon:
createvisualtask sub_8170BB0, 2 createvisualtask AnimTask_SwitchOutBallEffect, 2
delay 10 delay 10
createvisualtask sub_8170B04, 2 createvisualtask AnimTask_SwitchOutShrinkMon, 2
end end
Special_SwitchOutOpponentMon: Special_SwitchOutOpponentMon:
createvisualtask sub_8170BB0, 2 createvisualtask AnimTask_SwitchOutBallEffect, 2
delay 10 delay 10
createvisualtask sub_8170B04, 2 createvisualtask AnimTask_SwitchOutShrinkMon, 2
end end
Special_BallThrow: Special_BallThrow:
createvisualtask sub_8170CFC, 2 createvisualtask AnimTask_LoadBallGfx, 2
delay 0 delay 0
playsewithpan SE_NAGERU, 0 playsewithpan SE_NAGERU, 0
createvisualtask sub_8170E04, 2 createvisualtask AnimTask_ThrowBall, 2
createvisualtask AnimTask_IsBallBlockedByTrainer, 2 createvisualtask AnimTask_IsBallBlockedByTrainer, 2
jumpreteq -1, BallThrowTrainerBlock jumpreteq -1, BallThrowTrainerBlock
BallThrowEnd: BallThrowEnd:
waitforvisualfinish waitforvisualfinish
createvisualtask sub_8170D24, 2 createvisualtask AnimTask_FreeBallGfx, 2
end end
BallThrowTrainerBlock: BallThrowTrainerBlock:
loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_IMPACT
@ -10737,17 +10741,17 @@ BallThrowTrainerBlock:
goto BallThrowEnd goto BallThrowEnd
Special_SafariBallThrow: Special_SafariBallThrow:
createvisualtask sub_8170CFC, 2 createvisualtask AnimTask_LoadBallGfx, 2
delay 0 delay 0
createvisualtask sub_8170F2C, 2 createvisualtask AnimTask_ThrowBallSpecial, 2
waitforvisualfinish waitforvisualfinish
createvisualtask sub_8170D24, 2 createvisualtask AnimTask_FreeBallGfx, 2
end end
Special_SubstituteToMon: Special_SubstituteToMon:
createvisualtask sub_8172BF0, 2, 1 createvisualtask AnimTask_SwapMonSpriteToFromSubstitute, 2, TRUE
end end
Special_MonToSubstitute: Special_MonToSubstitute:
createvisualtask sub_8172BF0, 2, 0 createvisualtask AnimTask_SwapMonSpriteToFromSubstitute, 2, FALSE
end end

32
data/battle_scripts_1.s
View File

@ -4275,7 +4275,7 @@ BattleScript_BerryCurePrlzEnd2::
end2 end2
BattleScript_BerryCureParRet:: BattleScript_BerryCureParRet::
playanimation BS_SCRIPTING, B_ANIM_ITEM_EFFECT, NULL playanimation BS_SCRIPTING, B_ANIM_HELD_ITEM_EFFECT, NULL
printstring STRINGID_PKMNSITEMCUREDPARALYSIS printstring STRINGID_PKMNSITEMCUREDPARALYSIS
waitmessage 0x40 waitmessage 0x40
updatestatusicon BS_SCRIPTING updatestatusicon BS_SCRIPTING
@ -4287,7 +4287,7 @@ BattleScript_BerryCurePsnEnd2::
end2 end2
BattleScript_BerryCurePsnRet:: BattleScript_BerryCurePsnRet::
playanimation BS_SCRIPTING, B_ANIM_ITEM_EFFECT, NULL playanimation BS_SCRIPTING, B_ANIM_HELD_ITEM_EFFECT, NULL
printstring STRINGID_PKMNSITEMCUREDPOISON printstring STRINGID_PKMNSITEMCUREDPOISON
waitmessage 0x40 waitmessage 0x40
updatestatusicon BS_SCRIPTING updatestatusicon BS_SCRIPTING
@ -4299,7 +4299,7 @@ BattleScript_BerryCureBrnEnd2::
end2 end2
BattleScript_BerryCureBrnRet:: BattleScript_BerryCureBrnRet::
playanimation BS_SCRIPTING, B_ANIM_ITEM_EFFECT, NULL playanimation BS_SCRIPTING, B_ANIM_HELD_ITEM_EFFECT, NULL
printstring STRINGID_PKMNSITEMHEALEDBURN printstring STRINGID_PKMNSITEMHEALEDBURN
waitmessage 0x40 waitmessage 0x40
updatestatusicon BS_SCRIPTING updatestatusicon BS_SCRIPTING
@ -4311,7 +4311,7 @@ BattleScript_BerryCureFrzEnd2::
end2 end2
BattleScript_BerryCureFrzRet:: BattleScript_BerryCureFrzRet::
playanimation BS_SCRIPTING, B_ANIM_ITEM_EFFECT, NULL playanimation BS_SCRIPTING, B_ANIM_HELD_ITEM_EFFECT, NULL
printstring STRINGID_PKMNSITEMDEFROSTEDIT printstring STRINGID_PKMNSITEMDEFROSTEDIT
waitmessage 0x40 waitmessage 0x40
updatestatusicon BS_SCRIPTING updatestatusicon BS_SCRIPTING
@ -4323,7 +4323,7 @@ BattleScript_BerryCureSlpEnd2::
end2 end2
BattleScript_BerryCureSlpRet:: BattleScript_BerryCureSlpRet::
playanimation BS_SCRIPTING, B_ANIM_ITEM_EFFECT, NULL playanimation BS_SCRIPTING, B_ANIM_HELD_ITEM_EFFECT, NULL
printstring STRINGID_PKMNSITEMWOKEIT printstring STRINGID_PKMNSITEMWOKEIT
waitmessage 0x40 waitmessage 0x40
updatestatusicon BS_SCRIPTING updatestatusicon BS_SCRIPTING
@ -4335,7 +4335,7 @@ BattleScript_BerryCureConfusionEnd2::
end2 end2
BattleScript_BerryCureConfusionRet:: BattleScript_BerryCureConfusionRet::
playanimation BS_SCRIPTING, B_ANIM_ITEM_EFFECT, NULL playanimation BS_SCRIPTING, B_ANIM_HELD_ITEM_EFFECT, NULL
printstring STRINGID_PKMNSITEMSNAPPEDOUT printstring STRINGID_PKMNSITEMSNAPPEDOUT
waitmessage 0x40 waitmessage 0x40
removeitem BS_SCRIPTING removeitem BS_SCRIPTING
@ -4346,7 +4346,7 @@ BattleScript_BerryCureChosenStatusEnd2::
end2 end2
BattleScript_BerryCureChosenStatusRet:: BattleScript_BerryCureChosenStatusRet::
playanimation BS_SCRIPTING, B_ANIM_ITEM_EFFECT, NULL playanimation BS_SCRIPTING, B_ANIM_HELD_ITEM_EFFECT, NULL
printfromtable gBerryEffectStringIds printfromtable gBerryEffectStringIds
waitmessage 0x40 waitmessage 0x40
updatestatusicon BS_SCRIPTING updatestatusicon BS_SCRIPTING
@ -4358,14 +4358,14 @@ BattleScript_WhiteHerbEnd2::
end2 end2
BattleScript_WhiteHerbRet:: BattleScript_WhiteHerbRet::
playanimation BS_SCRIPTING, B_ANIM_ITEM_EFFECT, NULL playanimation BS_SCRIPTING, B_ANIM_HELD_ITEM_EFFECT, NULL
printstring STRINGID_PKMNSITEMRESTOREDSTATUS printstring STRINGID_PKMNSITEMRESTOREDSTATUS
waitmessage 0x40 waitmessage 0x40
removeitem BS_SCRIPTING removeitem BS_SCRIPTING
return return
BattleScript_ItemHealHP_RemoveItem:: BattleScript_ItemHealHP_RemoveItem::
playanimation BS_ATTACKER, B_ANIM_ITEM_EFFECT, NULL playanimation BS_ATTACKER, B_ANIM_HELD_ITEM_EFFECT, NULL
printstring STRINGID_PKMNSITEMRESTOREDHEALTH printstring STRINGID_PKMNSITEMRESTOREDHEALTH
waitmessage 0x40 waitmessage 0x40
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE
@ -4375,7 +4375,7 @@ BattleScript_ItemHealHP_RemoveItem::
end2 end2
BattleScript_BerryPPHealEnd2:: BattleScript_BerryPPHealEnd2::
playanimation BS_ATTACKER, B_ANIM_ITEM_EFFECT, NULL playanimation BS_ATTACKER, B_ANIM_HELD_ITEM_EFFECT, NULL
printstring STRINGID_PKMNSITEMRESTOREDPP printstring STRINGID_PKMNSITEMRESTOREDPP
waitmessage 0x40 waitmessage 0x40
removeitem BS_ATTACKER removeitem BS_ATTACKER
@ -4386,7 +4386,7 @@ BattleScript_ItemHealHP_End2::
end2 end2
BattleScript_ItemHealHP_Ret:: BattleScript_ItemHealHP_Ret::
playanimation BS_ATTACKER, B_ANIM_ITEM_EFFECT, NULL playanimation BS_ATTACKER, B_ANIM_HELD_ITEM_EFFECT, NULL
printstring STRINGID_PKMNSITEMRESTOREDHPALITTLE printstring STRINGID_PKMNSITEMRESTOREDHPALITTLE
waitmessage 0x40 waitmessage 0x40
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE
@ -4398,14 +4398,14 @@ BattleScript_SelectingNotAllowedMoveChoiceItem::
printselectionstring STRINGID_ITEMALLOWSONLYYMOVE printselectionstring STRINGID_ITEMALLOWSONLYYMOVE
endselectionscript endselectionscript
BattleScript_HangedOnMsg:: BattleScript_FocusBandActivates::
playanimation BS_TARGET, B_ANIM_HANGED_ON, NULL playanimation BS_TARGET, B_ANIM_FOCUS_BAND, NULL
printstring STRINGID_PKMNHUNGONWITHX printstring STRINGID_PKMNHUNGONWITHX
waitmessage 0x40 waitmessage 0x40
return return
BattleScript_BerryConfuseHealEnd2:: BattleScript_BerryConfuseHealEnd2::
playanimation BS_ATTACKER, B_ANIM_ITEM_EFFECT, NULL playanimation BS_ATTACKER, B_ANIM_HELD_ITEM_EFFECT, NULL
printstring STRINGID_PKMNSITEMRESTOREDHEALTH printstring STRINGID_PKMNSITEMRESTOREDHEALTH
waitmessage 0x40 waitmessage 0x40
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE
@ -4419,7 +4419,7 @@ BattleScript_BerryConfuseHealEnd2::
end2 end2
BattleScript_BerryStatRaiseEnd2:: BattleScript_BerryStatRaiseEnd2::
playanimation BS_ATTACKER, B_ANIM_ITEM_EFFECT, NULL playanimation BS_ATTACKER, B_ANIM_HELD_ITEM_EFFECT, NULL
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_82DB85B statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_82DB85B
BattleScript_82DB85B:: BattleScript_82DB85B::
setbyte cMULTISTRING_CHOOSER, 0x4 setbyte cMULTISTRING_CHOOSER, 0x4
@ -4428,7 +4428,7 @@ BattleScript_82DB85B::
end2 end2
BattleScript_BerryFocusEnergyEnd2:: BattleScript_BerryFocusEnergyEnd2::
playanimation BS_ATTACKER, B_ANIM_ITEM_EFFECT, NULL playanimation BS_ATTACKER, B_ANIM_HELD_ITEM_EFFECT, NULL
printstring STRINGID_PKMNUSEDXTOGETPUMPED printstring STRINGID_PKMNUSEDXTOGETPUMPED
waitmessage 0x40 waitmessage 0x40
removeitem BS_ATTACKER removeitem BS_ATTACKER

2
include/battle_scripts.h
View File

@ -199,7 +199,7 @@ extern const u8 BattleScript_BerryPPHealEnd2[];
extern const u8 BattleScript_ItemHealHP_End2[]; extern const u8 BattleScript_ItemHealHP_End2[];
extern const u8 BattleScript_ItemHealHP_Ret[]; extern const u8 BattleScript_ItemHealHP_Ret[];
extern const u8 BattleScript_SelectingNotAllowedMoveChoiceItem[]; extern const u8 BattleScript_SelectingNotAllowedMoveChoiceItem[];
extern const u8 BattleScript_HangedOnMsg[]; extern const u8 BattleScript_FocusBandActivates[];
extern const u8 BattleScript_BerryConfuseHealEnd2[]; extern const u8 BattleScript_BerryConfuseHealEnd2[];
extern const u8 BattleScript_BerryStatRaiseEnd2[]; extern const u8 BattleScript_BerryStatRaiseEnd2[];
extern const u8 BattleScript_BerryFocusEnergyEnd2[]; extern const u8 BattleScript_BerryFocusEnergyEnd2[];

4
include/constants/battle_anim.h
View File

@ -354,9 +354,9 @@
#define B_ANIM_POKEBLOCK_THROW 0x4 #define B_ANIM_POKEBLOCK_THROW 0x4
#define B_ANIM_ITEM_KNOCKOFF 0x5 #define B_ANIM_ITEM_KNOCKOFF 0x5
#define B_ANIM_TURN_TRAP 0x6 #define B_ANIM_TURN_TRAP 0x6
#define B_ANIM_ITEM_EFFECT 0x7 #define B_ANIM_HELD_ITEM_EFFECT 0x7
#define B_ANIM_SMOKEBALL_ESCAPE 0x8 #define B_ANIM_SMOKEBALL_ESCAPE 0x8
#define B_ANIM_HANGED_ON 0x9 #define B_ANIM_FOCUS_BAND 0x9
#define B_ANIM_RAIN_CONTINUES 0xA #define B_ANIM_RAIN_CONTINUES 0xA
#define B_ANIM_SUN_CONTINUES 0xB #define B_ANIM_SUN_CONTINUES 0xB
#define B_ANIM_SANDSTORM_CONTINUES 0xC #define B_ANIM_SANDSTORM_CONTINUES 0xC

4
src/battle_anim_effects_3.c
View File

@ -2367,7 +2367,7 @@ void AnimTask_IsMonInvisible(u8 taskId)
DestroyAnimVisualTask(taskId); DestroyAnimVisualTask(taskId);
} }
void AnimTask_CastformGfxChange(u8 taskId) void AnimTask_CastformGfxDataChange(u8 taskId)
{ {
HandleSpeciesGfxDataChange(gBattleAnimAttacker, gBattleAnimTarget, TRUE); HandleSpeciesGfxDataChange(gBattleAnimAttacker, gBattleAnimTarget, TRUE);
DestroyAnimVisualTask(taskId); DestroyAnimVisualTask(taskId);
@ -3683,7 +3683,7 @@ static void sub_815DA20(u8 taskId)
} }
} }
void sub_815DB90(u8 taskId) void AnimTask_SlideMonForFocusBand(u8 taskId)
{ {
gTasks[taskId].data[15] = gBattlerSpriteIds[gBattleAnimAttacker]; gTasks[taskId].data[15] = gBattlerSpriteIds[gBattleAnimAttacker];
gTasks[taskId].data[14] = gBattleAnimArgs[0]; gTasks[taskId].data[14] = gBattleAnimArgs[0];

5
src/battle_anim_mon_movement.c
View File

@ -915,14 +915,15 @@ void AminTask_DipMonSpriteToSide(u8 taskId)
gTasks[taskId].func = sub_80D6308; gTasks[taskId].func = sub_80D6308;
} }
void sub_80D622C(u8 taskId) // Rotates mon to side and back to original position. For Peck and when a held item activates
void AnimTask_RotateMonToSideAndRestore(u8 taskId)
{ {
u8 spriteId; u8 spriteId;
spriteId = GetAnimBattlerSpriteId(gBattleAnimArgs[2]); spriteId = GetAnimBattlerSpriteId(gBattleAnimArgs[2]);
PrepareBattlerSpriteForRotScale(spriteId, ST_OAM_OBJ_NORMAL); PrepareBattlerSpriteForRotScale(spriteId, ST_OAM_OBJ_NORMAL);
gTasks[taskId].data[1] = 0; gTasks[taskId].data[1] = 0;
gTasks[taskId].data[2] = gBattleAnimArgs[0]; gTasks[taskId].data[2] = gBattleAnimArgs[0];
if (gBattleAnimArgs[2] == 0) if (gBattleAnimArgs[2] == ANIM_ATTACKER)
{ {
if (GetBattlerSide(gBattleAnimAttacker)) if (GetBattlerSide(gBattleAnimAttacker))
{ {

34
src/battle_anim_special.c
View File

@ -514,7 +514,7 @@ static void sub_8170660(u8 taskId)
} }
} }
static void sub_8170834(u8 *paletteId1, u8 *paletteId2, u8 battler) static void LoadHealthboxPalsForLevelUp(u8 *paletteId1, u8 *paletteId2, u8 battler)
{ {
u8 healthBoxSpriteId; u8 healthBoxSpriteId;
u8 spriteId1, spriteId2; u8 spriteId1, spriteId2;
@ -536,14 +536,14 @@ static void sub_8170834(u8 *paletteId1, u8 *paletteId2, u8 battler)
gSprites[spriteId2].oam.paletteNum = *paletteId2; gSprites[spriteId2].oam.paletteNum = *paletteId2;
} }
void sub_8170920(u8 taskId) void AnimTask_LoadHealthboxPalsForLevelUp(u8 taskId)
{ {
u8 paletteId1, paletteId2; u8 paletteId1, paletteId2;
sub_8170834(&paletteId1, &paletteId2, gBattleAnimAttacker); LoadHealthboxPalsForLevelUp(&paletteId1, &paletteId2, gBattleAnimAttacker);
DestroyAnimVisualTask(taskId); DestroyAnimVisualTask(taskId);
} }
static void sub_817094C(u8 battler) static void FreeHealthboxPalsForLevelUp(u8 battler)
{ {
u8 healthBoxSpriteId; u8 healthBoxSpriteId;
u8 spriteId1, spriteId2; u8 spriteId1, spriteId2;
@ -562,13 +562,13 @@ static void sub_817094C(u8 battler)
gSprites[spriteId2].oam.paletteNum = paletteId2; gSprites[spriteId2].oam.paletteNum = paletteId2;
} }
void sub_81709EC(u8 taskId) void AnimTask_FreeHealthboxPalsForLevelUp(u8 taskId)
{ {
sub_817094C(gBattleAnimAttacker); FreeHealthboxPalsForLevelUp(gBattleAnimAttacker);
DestroyAnimVisualTask(taskId); DestroyAnimVisualTask(taskId);
} }
void sub_8170A0C(u8 taskId) void AnimTask_FlashHealthboxOnLevelUp(u8 taskId)
{ {
gTasks[taskId].data[10] = gBattleAnimArgs[0]; gTasks[taskId].data[10] = gBattleAnimArgs[0];
gTasks[taskId].data[11] = gBattleAnimArgs[1]; gTasks[taskId].data[11] = gBattleAnimArgs[1];
@ -612,7 +612,7 @@ static void sub_8170A38(u8 taskId)
} }
} }
void sub_8170B04(u8 taskId) void AnimTask_SwitchOutShrinkMon(u8 taskId)
{ {
u8 spriteId; u8 spriteId;
@ -639,7 +639,7 @@ void sub_8170B04(u8 taskId)
} }
} }
void sub_8170BB0(u8 taskId) void AnimTask_SwitchOutBallEffect(u8 taskId)
{ {
u8 spriteId; u8 spriteId;
u16 ball; u16 ball;
@ -674,14 +674,14 @@ void sub_8170BB0(u8 taskId)
} }
} }
void sub_8170CFC(u8 taskId) void AnimTask_LoadBallGfx(u8 taskId)
{ {
u8 ballId = ItemIdToBallId(gLastUsedItem); u8 ballId = ItemIdToBallId(gLastUsedItem);
LoadBallGfx(ballId); LoadBallGfx(ballId);
DestroyAnimVisualTask(taskId); DestroyAnimVisualTask(taskId);
} }
void sub_8170D24(u8 taskId) void AnimTask_FreeBallGfx(u8 taskId)
{ {
u8 ballId = ItemIdToBallId(gLastUsedItem); u8 ballId = ItemIdToBallId(gLastUsedItem);
FreeBallGfx(ballId); FreeBallGfx(ballId);
@ -730,7 +730,7 @@ u8 ItemIdToBallId(u16 ballItem)
} }
} }
void sub_8170E04(u8 taskId) void AnimTask_ThrowBall(u8 taskId)
{ {
u8 ballId; u8 ballId;
u8 spriteId; u8 spriteId;
@ -753,7 +753,8 @@ static void sub_8170EF0(u8 taskId)
DestroyAnimVisualTask(taskId); DestroyAnimVisualTask(taskId);
} }
void sub_8170F2C(u8 taskId) // Safari Ball / Wally's ball throw
void AnimTask_ThrowBallSpecial(u8 taskId)
{ {
int x, y; int x, y;
u8 ballId; u8 ballId;
@ -1910,7 +1911,8 @@ static void sub_8172B90(u8 taskId)
} }
} }
void sub_8172BF0(u8 taskId) // arg0: TRUE to swap to mon, FALSE to swap to substitute
void AnimTask_SwapMonSpriteToFromSubstitute(u8 taskId)
{ {
u8 spriteId; u8 spriteId;
u32 x; u32 x;
@ -1968,7 +1970,7 @@ void sub_8172BF0(u8 taskId)
} }
} }
void sub_8172D98(u8 taskId) void AnimTask_SubstituteFadeToInvisible(u8 taskId)
{ {
u8 spriteId; u8 spriteId;
@ -2230,7 +2232,7 @@ static void sub_8173400(struct Sprite *sprite)
} }
} }
void sub_817345C(u8 taskId) void AnimTask_SetAttackerTargetLeftPos(u8 taskId)
{ {
switch (gBattleAnimArgs[0]) switch (gBattleAnimArgs[0])
{ {

4
src/battle_script_commands.c
View File

@ -2064,7 +2064,7 @@ static void Cmd_resultmessage(void)
gPotentialItemEffectBattler = gBattlerTarget; gPotentialItemEffectBattler = gBattlerTarget;
gMoveResultFlags &= ~(MOVE_RESULT_FOE_ENDURED | MOVE_RESULT_FOE_HUNG_ON); gMoveResultFlags &= ~(MOVE_RESULT_FOE_ENDURED | MOVE_RESULT_FOE_HUNG_ON);
BattleScriptPushCursor(); BattleScriptPushCursor();
gBattlescriptCurrInstr = BattleScript_HangedOnMsg; gBattlescriptCurrInstr = BattleScript_FocusBandActivates;
return; return;
default: default:
if (gMoveResultFlags & MOVE_RESULT_DOESNT_AFFECT_FOE) if (gMoveResultFlags & MOVE_RESULT_DOESNT_AFFECT_FOE)
@ -2093,7 +2093,7 @@ static void Cmd_resultmessage(void)
gPotentialItemEffectBattler = gBattlerTarget; gPotentialItemEffectBattler = gBattlerTarget;
gMoveResultFlags &= ~(MOVE_RESULT_FOE_ENDURED | MOVE_RESULT_FOE_HUNG_ON); gMoveResultFlags &= ~(MOVE_RESULT_FOE_ENDURED | MOVE_RESULT_FOE_HUNG_ON);
BattleScriptPushCursor(); BattleScriptPushCursor();
gBattlescriptCurrInstr = BattleScript_HangedOnMsg; gBattlescriptCurrInstr = BattleScript_FocusBandActivates;
return; return;
} }
else if (gMoveResultFlags & MOVE_RESULT_FAILED) else if (gMoveResultFlags & MOVE_RESULT_FAILED)

2
src/electric.c
View File

@ -922,7 +922,7 @@ static void AnimElectricPuff(struct Sprite *sprite)
sprite->callback = RunStoredCallbackWhenAnimEnds; sprite->callback = RunStoredCallbackWhenAnimEnds;
} }
// Creates an orb of electricity that grwos then slides off-screen. The attacker slides with it // Creates an orb of electricity that grows then slides off-screen. The attacker slides with it
static void AnimVoltTackleOrbSlide(struct Sprite *sprite) static void AnimVoltTackleOrbSlide(struct Sprite *sprite)
{ {
StartSpriteAffineAnim(sprite, 1); StartSpriteAffineAnim(sprite, 1);

12
src/fire.c
View File

@ -16,7 +16,7 @@ static void sub_8109064(struct Sprite *);
static void sub_81090D8(struct Sprite *); static void sub_81090D8(struct Sprite *);
static void AnimSunlight(struct Sprite *); static void AnimSunlight(struct Sprite *);
static void AnimEmberFlare(struct Sprite *); static void AnimEmberFlare(struct Sprite *);
static void sub_8109200(struct Sprite *); static void AnimBurnFlame(struct Sprite *);
static void AnimFireRing(struct Sprite *); static void AnimFireRing(struct Sprite *);
static void AnimFireRingStep1(struct Sprite *); static void AnimFireRingStep1(struct Sprite *);
static void AnimFireRingStep2(struct Sprite *); static void AnimFireRingStep2(struct Sprite *);
@ -208,7 +208,7 @@ const union AffineAnimCmd *const gUnknown_0859549C[] =
gUnknown_08595484, gUnknown_08595484,
}; };
const struct SpriteTemplate gSunnyDayLightRaySpriteTemplate = const struct SpriteTemplate gSunlightRaySpriteTemplate =
{ {
.tileTag = ANIM_TAG_SUNLIGHT, .tileTag = ANIM_TAG_SUNLIGHT,
.paletteTag = ANIM_TAG_SUNLIGHT, .paletteTag = ANIM_TAG_SUNLIGHT,
@ -256,7 +256,7 @@ const struct SpriteTemplate gEmberFlareSpriteTemplate =
.callback = AnimEmberFlare, .callback = AnimEmberFlare,
}; };
const struct SpriteTemplate gUnknown_08595504 = const struct SpriteTemplate gBurnFlameSpriteTemplate =
{ {
.tileTag = ANIM_TAG_SMALL_EMBER, .tileTag = ANIM_TAG_SMALL_EMBER,
.paletteTag = ANIM_TAG_SMALL_EMBER, .paletteTag = ANIM_TAG_SMALL_EMBER,
@ -264,7 +264,7 @@ const struct SpriteTemplate gUnknown_08595504 =
.anims = gUnknown_085954D0, .anims = gUnknown_085954D0,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_8109200, .callback = AnimBurnFlame,
}; };
const struct SpriteTemplate gFireBlastRingSpriteTemplate = const struct SpriteTemplate gFireBlastRingSpriteTemplate =
@ -594,7 +594,7 @@ static void sub_81090D8(struct Sprite *sprite)
} }
} }
// Sunlight from Sunny Day // Sunlight from Sunny Day / sunny weather
static void AnimSunlight(struct Sprite *sprite) static void AnimSunlight(struct Sprite *sprite)
{ {
sprite->pos1.x = 0; sprite->pos1.x = 0;
@ -628,7 +628,7 @@ static void AnimEmberFlare(struct Sprite *sprite)
sprite->callback(sprite); sprite->callback(sprite);
} }
static void sub_8109200(struct Sprite *sprite) static void AnimBurnFlame(struct Sprite *sprite)
{ {
gBattleAnimArgs[0] = -gBattleAnimArgs[0]; gBattleAnimArgs[0] = -gBattleAnimArgs[0];
gBattleAnimArgs[2] = -gBattleAnimArgs[2]; gBattleAnimArgs[2] = -gBattleAnimArgs[2];

3
src/ice.c
View File

@ -1329,8 +1329,7 @@ void MovePoisonGasCloud(struct Sprite *sprite)
} }
} }
// Creates Hail. void AnimTask_Hail(u8 taskId)
void AnimTask_HailStart(u8 taskId)
{ {
struct Task *task = &gTasks[taskId]; struct Task *task = &gTasks[taskId];

2
src/normal.c
View File

@ -626,7 +626,7 @@ static void sub_8115D2C(u8 taskId)
} }
} }
// Flashes the specified anim tag with given color. Used e.g. to flash the particles in Hyper Beam red // Flashes the specified anim tag with given color. Used e.g. to flash the particles red in Hyper Beam
void AnimTask_FlashAnimTagWithColor(u8 taskId) void AnimTask_FlashAnimTagWithColor(u8 taskId)
{ {
u8 paletteIndex; u8 paletteIndex;