diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-03-18 15:25:46 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-18 15:25:46 -0400 |
| commit | ed16a7409ae9c808a110975dec1930f9f949a6d6 (patch) | |
| tree | 662be8b474b9c50264fc49262cbaf21769479516 /data | |
| parent | 5075067ecd8718ab96a063946662c71fe3ef5369 (diff) | |
| parent | c5aa5d37229e5692355e4b3979b6cafbcad7caee (diff) | |
Merge pull request #403 from PikalaxALT/battle_multi_buffer
Battle documentation (14032021)
Diffstat (limited to 'data')
| -rw-r--r-- | data/battle_anim_scripts.s | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index 8884e9853..b285a148a 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -10557,7 +10557,7 @@ General_SubstituteAppear:: @ 81D5C04 end General_BaitThrow:: @ 81D5C0C - createvisualtask sub_80F1C8C, 2, 0 + createvisualtask AnimTask_SafariOrGhost_DecideAnimSides, 2, 0 createvisualtask AnimTask_LoadBaitGfx, 2, delay 0 waitplaysewithpan SE_M_JUMP_KICK, 192, 22 @@ -10898,7 +10898,7 @@ General_WishHeal:: @ 81D6250 end General_MonScared:: @ 81D628A - createvisualtask sub_80F1C8C, 2, 1 + createvisualtask AnimTask_SafariOrGhost_DecideAnimSides, 2, 1 waitforvisualfinish loadspritegfx ANIM_TAG_SWEAT_BEAD createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 4, 2, 0, 10, 26336 @@ -10915,7 +10915,7 @@ General_MonScared:: @ 81D628A end General_GhostGetOut:: @ 81D6301 - createvisualtask sub_80F1C8C, 2, 1 + createvisualtask AnimTask_SafariOrGhost_DecideAnimSides, 2, 1 waitforvisualfinish fadetobg 2 waitbgfadeout @@ -10950,7 +10950,7 @@ General_SilphScoped:: @ 81D637B end General_SafariRockThrow:: @ 81D6394 - createvisualtask sub_80F1C8C, 2, 0 + createvisualtask AnimTask_SafariOrGhost_DecideAnimSides, 2, 0 waitforvisualfinish loadspritegfx ANIM_TAG_ROCKS loadspritegfx ANIM_TAG_IMPACT @@ -10970,14 +10970,14 @@ General_SafariRockThrow:: @ 81D6394 end General_SafariReaction:: @ 81D63DC - createvisualtask sub_80F1CE4, 2, + createvisualtask AnimTask_SafariGetReaction, 2, waitforvisualfinish - jumpargeq 7, 0, gUnknown_81D63FD - jumpargeq 7, 1, gUnknown_81D6425 - jumpargeq 7, 2, gUnknown_81D644E + jumpargeq 7, 0, SafariReaction_WatchingCarefully + jumpargeq 7, 1, SafariReaction_Angry + jumpargeq 7, 2, SafariReaction_Eating end -gUnknown_81D63FD:: @ 81D63FD +SafariReaction_WatchingCarefully:: @ 81D63FD playsewithpan SE_M_TAKE_DOWN, 63 createvisualtask AnimTask_RotateMonToSideAndRestore, 2, 16, 96, 0, 2 waitforvisualfinish @@ -10985,7 +10985,7 @@ gUnknown_81D63FD:: @ 81D63FD createvisualtask AnimTask_RotateMonToSideAndRestore, 2, 16, -96, 0, 2 end -gUnknown_81D6425:: @ 81D6425 +SafariReaction_Angry:: @ 81D6425 loadspritegfx ANIM_TAG_ANGER createsprite gAngerMarkSpriteTemplate, ANIM_TARGET, 2, 1, 20, -20 playsewithpan SE_M_SWAGGER2, 63 @@ -10995,7 +10995,7 @@ gUnknown_81D6425:: @ 81D6425 playsewithpan SE_M_SWAGGER2, 63 end -gUnknown_81D644E:: @ 81D644E +SafariReaction_Eating:: @ 81D644E playsewithpan SE_M_TAKE_DOWN, 63 createvisualtask AnimTask_RotateMonToSideAndRestore, 2, 8, 136, 0, 2 waitforvisualfinish |