From fc4b936fb71f9ffa993aa0778a166e0c2a23fd30 Mon Sep 17 00:00:00 2001 From: Sewef Date: Mon, 12 Nov 2018 13:48:15 +0100 Subject: General_TurnTrap --- data/battle_anim_scripts.s | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index 0c14c22f5..4213b8761 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -10352,12 +10352,12 @@ General_ItemKnockoff: @ 81D647E General_TurnTrap: @ 81D6489 createvisualtask sub_8141DAC, 5 - jumpargeq 0, 1, _81D64FD - jumpargeq 0, 2, _81D6522 - jumpargeq 0, 3, _81D6576 - jumpargeq 0, 4, _81D65D3 - goto _81D64B5 -_81D64B5: + jumpargeq 0, 1, FireSpinHit + jumpargeq 0, 2, WhirlpoolHit + jumpargeq 0, 3, ClampHit + jumpargeq 0, 4, SandTombHit + goto WrapHit +WrapHit: loadspritegfx ANIM_TAG_TENDRILS loopsewithpan SE_W010, SOUND_PAN_TARGET, 6, 2 createsprite gBattleAnimSpriteTemplate_83D65A0, 132, 0, 16, 0, 1 @@ -10370,7 +10370,7 @@ _81D64B5: playsewithpan SE_W020, SOUND_PAN_TARGET waitforvisualfinish end -_81D64FD: +FireSpinHit: loadspritegfx ANIM_TAG_SMALL_EMBER playsewithpan SE_W221B, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 5, 1, 0, 2, 30, 1 @@ -10379,7 +10379,7 @@ _81D64FD: waitforvisualfinish stopsound end -_81D6522: +WhirlpoolHit: loadspritegfx ANIM_TAG_WATER_ORB monbg ANIM_BANK_DEF_PARTNER monbgprio_28 1 @@ -10396,7 +10396,7 @@ _81D6522: stopsound clearmonbg ANIM_BANK_DEF_PARTNER end -_81D6576: +ClampHit: loadspritegfx ANIM_TAG_CLAMP loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_TARGET @@ -10412,7 +10412,7 @@ _81D6576: blendoff waitforvisualfinish end -_81D65D3: +SandTombHit: loadspritegfx ANIM_TAG_MUD_SAND createsprite gSimplePaletteBlendSpriteTemplate, 0, 4, 2, 0, 7, rgb(19, 17, 0) createvisualtask AnimTask_ShakeMon, 5, 1, 0, 2, 30, 1 -- cgit v1.2.3 From c7bed16a7508b92d373ed2109e7f879e1181d2d8 Mon Sep 17 00:00:00 2001 From: Sewef Date: Mon, 12 Nov 2018 13:51:43 +0100 Subject: Label gBattleAnimSpriteTemplate_8402894 --- src/battle/battle_anim_812C144.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/battle/battle_anim_812C144.c b/src/battle/battle_anim_812C144.c index acf8f7749..8799428c9 100644 --- a/src/battle/battle_anim_812C144.c +++ b/src/battle/battle_anim_812C144.c @@ -888,7 +888,7 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_8402884[] = gSpriteAffineAnim_8402864, }; -const struct SpriteTemplate gBattleAnimSpriteTemplate_8402894 = +const struct SpriteTemplate gPinkSmokeTemplate = { .tileTag = ANIM_TAG_PINK_CLOUD, .paletteTag = ANIM_TAG_PINK_CLOUD, -- cgit v1.2.3 From a3bffcb7ac1a51400c2aa764da80ce0e40124452 Mon Sep 17 00:00:00 2001 From: Sewef Date: Mon, 12 Nov 2018 13:51:53 +0100 Subject: gBattleAnimSpriteTemplate_8402894 --- data/battle_anim_scripts.s | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index 4213b8761..11e80b5f2 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -10352,12 +10352,12 @@ General_ItemKnockoff: @ 81D647E General_TurnTrap: @ 81D6489 createvisualtask sub_8141DAC, 5 - jumpargeq 0, 1, FireSpinHit - jumpargeq 0, 2, WhirlpoolHit - jumpargeq 0, 3, ClampHit - jumpargeq 0, 4, SandTombHit - goto WrapHit -WrapHit: + jumpargeq 0, 1, _81D64FD + jumpargeq 0, 2, _81D6522 + jumpargeq 0, 3, _81D6576 + jumpargeq 0, 4, _81D65D3 + goto _81D64B5 +_81D64B5: loadspritegfx ANIM_TAG_TENDRILS loopsewithpan SE_W010, SOUND_PAN_TARGET, 6, 2 createsprite gBattleAnimSpriteTemplate_83D65A0, 132, 0, 16, 0, 1 @@ -10370,7 +10370,7 @@ WrapHit: playsewithpan SE_W020, SOUND_PAN_TARGET waitforvisualfinish end -FireSpinHit: +_81D64FD: loadspritegfx ANIM_TAG_SMALL_EMBER playsewithpan SE_W221B, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 5, 1, 0, 2, 30, 1 @@ -10379,7 +10379,7 @@ FireSpinHit: waitforvisualfinish stopsound end -WhirlpoolHit: +_81D6522: loadspritegfx ANIM_TAG_WATER_ORB monbg ANIM_BANK_DEF_PARTNER monbgprio_28 1 @@ -10396,7 +10396,7 @@ WhirlpoolHit: stopsound clearmonbg ANIM_BANK_DEF_PARTNER end -ClampHit: +_81D6576: loadspritegfx ANIM_TAG_CLAMP loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_TARGET @@ -10412,7 +10412,7 @@ ClampHit: blendoff waitforvisualfinish end -SandTombHit: +_81D65D3: loadspritegfx ANIM_TAG_MUD_SAND createsprite gSimplePaletteBlendSpriteTemplate, 0, 4, 2, 0, 7, rgb(19, 17, 0) createvisualtask AnimTask_ShakeMon, 5, 1, 0, 2, 30, 1 @@ -10453,32 +10453,32 @@ General_SmokeballEscape: @ 81D6690 setalpha 12, 4 delay 0 playsewithpan SE_BOWA2, SOUND_PAN_TARGET - createsprite gBattleAnimSpriteTemplate_8402894, 128, 0, 32, 28, 30 + createsprite gPinkSmokeTemplate, 128, 0, 32, 28, 30 delay 4 playsewithpan SE_BOWA2, SOUND_PAN_TARGET - createsprite gBattleAnimSpriteTemplate_8402894, 127, 2, 12, 20, 30 + createsprite gPinkSmokeTemplate, 127, 2, 12, 20, 30 delay 12 playsewithpan SE_BOWA2, SOUND_PAN_TARGET - createsprite gBattleAnimSpriteTemplate_8402894, 126, 2, -28, 4, 30 + createsprite gPinkSmokeTemplate, 126, 2, -28, 4, 30 delay 4 delay 8 playsewithpan SE_BOWA2, SOUND_PAN_TARGET - createsprite gBattleAnimSpriteTemplate_8402894, 124, 2, 14, -20, 30 + createsprite gPinkSmokeTemplate, 124, 2, 14, -20, 30 delay 4 playsewithpan SE_BOWA2, SOUND_PAN_TARGET createvisualtask sub_80DFC24, 2, 2 - createsprite gBattleAnimSpriteTemplate_8402894, 123, 3, 4, 4, 30 + createsprite gPinkSmokeTemplate, 123, 3, 4, 4, 30 delay 14 playsewithpan SE_BOWA2, SOUND_PAN_TARGET - createsprite gBattleAnimSpriteTemplate_8402894, 122, 3, -14, 18, 46 + createsprite gPinkSmokeTemplate, 122, 3, -14, 18, 46 delay 0 - createsprite gBattleAnimSpriteTemplate_8402894, 121, 3, 14, -14, 46 + createsprite gPinkSmokeTemplate, 121, 3, 14, -14, 46 delay 0 - createsprite gBattleAnimSpriteTemplate_8402894, 120, 3, -12, -10, 46 + createsprite gPinkSmokeTemplate, 120, 3, -12, -10, 46 delay 0 - createsprite gBattleAnimSpriteTemplate_8402894, 119, 3, 14, 14, 46 + createsprite gPinkSmokeTemplate, 119, 3, 14, 14, 46 delay 0 - createsprite gBattleAnimSpriteTemplate_8402894, 118, 3, 0, 0, 46 + createsprite gPinkSmokeTemplate, 118, 3, 0, 0, 46 waitforvisualfinish clearmonbg ANIM_BANK_ATTACKER invisible ANIM_BANK_ATTACKER -- cgit v1.2.3 From 9d3c0af90178628b7f66ec11bf539b94b3443e52 Mon Sep 17 00:00:00 2001 From: Sewef Date: Mon, 12 Nov 2018 13:52:35 +0100 Subject: comments --- src/battle/battle_anim_812C144.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/battle/battle_anim_812C144.c b/src/battle/battle_anim_812C144.c index 8799428c9..bf2406c9e 100644 --- a/src/battle/battle_anim_812C144.c +++ b/src/battle/battle_anim_812C144.c @@ -888,6 +888,10 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_8402884[] = gSpriteAffineAnim_8402864, }; +//arg[0]: frame (0-3) +//arg[1]: x +//arg[2]: y +//arg[3]: ??? (time on screen?) const struct SpriteTemplate gPinkSmokeTemplate = { .tileTag = ANIM_TAG_PINK_CLOUD, -- cgit v1.2.3 From 0582a478743e58d71814e1119b42b74f72ec7002 Mon Sep 17 00:00:00 2001 From: Sewef Date: Mon, 12 Nov 2018 13:54:46 +0100 Subject: sub_80E4008 --- src/battle/anim/normal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/battle/anim/normal.c b/src/battle/anim/normal.c index 9f0007e97..8d234ecb7 100644 --- a/src/battle/anim/normal.c +++ b/src/battle/anim/normal.c @@ -1772,7 +1772,7 @@ static void sub_80E3E64(u8 taskId) } } -void sub_80E4008(u8 taskId) +void AnimTask_GetBattleTerrain(u8 taskId) { gBattleAnimArgs[0] = gBattleTerrain; DestroyAnimVisualTask(taskId); -- cgit v1.2.3 From 7688791704f800b113b895f95ea50af612ad925b Mon Sep 17 00:00:00 2001 From: Sewef Date: Mon, 12 Nov 2018 13:55:51 +0100 Subject: sub_80E4008 --- data/battle_anim_scripts.s | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index 11e80b5f2..d759825b1 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -9629,7 +9629,7 @@ Move_SKY_UPPERCUT: @ 81D53ED end Move_SECRET_POWER: @ 81D54E6 - createvisualtask sub_80E4008, 5 + createvisualtask AnimTask_GetBattleTerrain, 5 jumpargeq 0, 0, Move_NEEDLE_ARM jumpargeq 0, 1, Move_MAGICAL_LEAF jumpargeq 0, 2, Move_MUD_SHOT -- cgit v1.2.3 From 4794d7efcde989eabf5398dc14b7c4e5c13466e8 Mon Sep 17 00:00:00 2001 From: Sewef Date: Mon, 12 Nov 2018 14:00:33 +0100 Subject: gBattleAnimSpriteTemplate_83D6734 --- data/battle_anim_scripts.s | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index d759825b1..5d789dd6e 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -10347,7 +10347,7 @@ General_PokeblockThrow: @ 81D6438 General_ItemKnockoff: @ 81D647E loadspritegfx ANIM_TAG_ITEM_BAG - createsprite gBattleAnimSpriteTemplate_83D6734, 130 + createsprite gFallingItemBagTemplate, 130 end General_TurnTrap: @ 81D6489 -- cgit v1.2.3 From 3e98b529ae856b4d6f35e365e093af76d8f1e02c Mon Sep 17 00:00:00 2001 From: Sewef Date: Mon, 12 Nov 2018 14:00:35 +0100 Subject: gBattleAnimSpriteTemplate_83D6734 --- src/battle/anim/hop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/battle/anim/hop.c b/src/battle/anim/hop.c index dcf8ed702..a40ee2a43 100644 --- a/src/battle/anim/hop.c +++ b/src/battle/anim/hop.c @@ -57,7 +57,7 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D671C = .callback = sub_80CB94C, }; -const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6734 = +const struct SpriteTemplate gFallingItemBagTemplate = { .tileTag = ANIM_TAG_ITEM_BAG, .paletteTag = ANIM_TAG_ITEM_BAG, -- cgit v1.2.3 From 26ebfd95216c2d9618f59704003b282e25651691 Mon Sep 17 00:00:00 2001 From: Sewef Date: Mon, 12 Nov 2018 14:17:33 +0100 Subject: ANIM_TAG_SWORD label --- data/battle_anim_scripts.s | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index 5d789dd6e..be43c01d7 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -1329,7 +1329,7 @@ Move_SWORDS_DANCE: @ 81C8EA4 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_BANK_ATTACKER, 16, 6, 1, 4 createsprite gBattleAnimSpriteTemplate_83D748C, 2, 0, 0 delay 22 - createvisualtask sub_80E21A8, 2, 10005, 2, 2, 32754, 16, 0, 0 + createvisualtask sub_80E21A8, 2, ANIM_TAG_SWORD, 2, 2, 32754, 16, 0, 0 waitforvisualfinish clearmonbg ANIM_BANK_ATTACKER blendoff -- cgit v1.2.3 From 5f2578ed5664a733cbaff3d7bad8a578e226e176 Mon Sep 17 00:00:00 2001 From: Sewef Date: Mon, 12 Nov 2018 14:25:21 +0100 Subject: More. --- data/battle_anim_scripts.s | 62 +++++++++++++++++++++++----------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index be43c01d7..0e6ec3597 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -2690,7 +2690,7 @@ _81CB16A: return Move_MEDITATE: @ 81CB1BD - call Unknown_81D61E7 + call SetPsychicBackground createvisualtask sub_80DBC94, 2 playsewithpan SE_W029, SOUND_PAN_ATTACKER delay 16 @@ -2759,7 +2759,7 @@ Move_RAGE: @ 81CB27C end Move_TELEPORT: @ 81CB2F2 - call Unknown_81D61E7 + call SetPsychicBackground createvisualtask sub_80DBCFC, 2 playsewithpan SE_W100, SOUND_PAN_ATTACKER delay 15 @@ -2849,7 +2849,7 @@ _81CB3E6: Move_AMNESIA: @ 81CB455 loadspritegfx ANIM_TAG_AMNESIA - call Unknown_81D61E7 + call SetPsychicBackground delay 8 createsprite gBattleAnimSpriteTemplate_83DA88C, 20 playsewithpan SE_W118, SOUND_PAN_ATTACKER @@ -2863,7 +2863,7 @@ Move_KINESIS: @ 81CB479 loadspritegfx ANIM_TAG_ALERT loadspritegfx ANIM_TAG_BENT_SPOON playsewithpan SE_W060, SOUND_PAN_ATTACKER - call Unknown_81D61E7 + call SetPsychicBackground createsprite gBattleAnimSpriteTemplate_83DA824, 20 createsprite gBattleAnimSpriteTemplate_83D7450, 19, 32, -8, 0 createsprite gBattleAnimSpriteTemplate_83D7450, 19, 32, 16, 1 @@ -3818,7 +3818,7 @@ Move_ERUPTION: @ 81CC74F Move_SKILL_SWAP: @ 81CC81C loadspritegfx ANIM_TAG_BLUEGREEN_ORB - call Unknown_81D61E7 + call SetPsychicBackground createvisualtask sub_80DC0B0, 3, 1 createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_BANK_TARGET, 32767, 12, 3, 1 loopsewithpan SE_W179, SOUND_PAN_ATTACKER, 24, 3 @@ -3832,7 +3832,7 @@ Move_SKILL_SWAP: @ 81CC81C Move_IMPRISON: @ 81CC867 loadspritegfx ANIM_TAG_HOLLOW_ORB loadspritegfx ANIM_TAG_X_SIGN - call Unknown_81D61E7 + call SetPsychicBackground monbg ANIM_BANK_DEF_PARTNER createvisualtask sub_80DBE00, 5 delay 8 @@ -4317,7 +4317,7 @@ Move_SHADOW_PUNCH: @ 81CD3D6 end Move_EXTRASENSORY: @ 81CD431 - call Unknown_81D61E7 + call SetPsychicBackground monbg ANIM_BANK_DEF_PARTNER setalpha 12, 8 createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_BANK_ATTACKER, 891, 12, 1, 1 @@ -4702,7 +4702,7 @@ Move_REST: @ 81CDC29 Move_CONFUSION: @ 81CDC69 monbg ANIM_BANK_DEF_PARTNER - call Unknown_81D61E7 + call SetPsychicBackground setalpha 8, 8 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_ATTACKER, 1, 0, 10, 1 createvisualtask sub_80E1F8C, 2, 2, 0, 2, 0, 8, 32767 @@ -4719,7 +4719,7 @@ Move_CONFUSION: @ 81CDC69 Move_PSYCHIC: @ 81CDCCA monbg ANIM_BANK_DEF_PARTNER - call Unknown_81D61E7 + call SetPsychicBackground setalpha 8, 8 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_ATTACKER, 1, 0, 10, 1 createvisualtask sub_80E1F8C, 2, 2, 0, 2, 0, 8, 767 @@ -4744,7 +4744,7 @@ _81CDD32: _81CDD3B: monbg ANIM_BANK_ATK_PARTNER playsewithpan SE_W060, SOUND_PAN_ATTACKER - call Unknown_81D61E7 + call SetPsychicBackground setalpha 8, 8 playsewithpan SE_W048, SOUND_PAN_ATTACKER createvisualtask sub_80E1F8C, 2, 2, 0, 2, 0, 8, 32767 @@ -4757,7 +4757,7 @@ _81CDD3B: Unknown_81CDD7A: @ 81CDD7A monbg ANIM_BANK_DEF_PARTNER playsewithpan SE_W060, SOUND_PAN_ATTACKER - call Unknown_81D61E7 + call SetPsychicBackground setalpha 8, 8 playsewithpan SE_W048, SOUND_PAN_TARGET waitplaysewithpan SE_W048, SOUND_PAN_TARGET, 8 @@ -6993,7 +6993,7 @@ Move_DREAM_EATER: @ 81D1271 monbg ANIM_BANK_DEF_PARTNER monbgprio_2A ANIM_BANK_TARGET playsewithpan SE_W060, SOUND_PAN_ATTACKER - call Unknown_81D61E7 + call SetPsychicBackground setalpha 8, 8 playsewithpan SE_W107, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 5, 0, 15, 1 @@ -7109,7 +7109,7 @@ Move_WRAP: @ 81D158C Move_PSYBEAM: @ 81D15A2 loadspritegfx ANIM_TAG_GOLD_RING playsewithpan SE_W060, SOUND_PAN_ATTACKER - call Unknown_81D61E7 + call SetPsychicBackground createsoundtask sub_812B058, 200, -64, 63, 3, 4, 0, 15 call _81D1626 call _81D1626 @@ -7135,7 +7135,7 @@ _81D1626: Move_HYPNOSIS: @ 81D163C loadspritegfx ANIM_TAG_GOLD_RING - call Unknown_81D61E7 + call SetPsychicBackground call _81D166F call _81D166F call _81D166F @@ -7154,7 +7154,7 @@ _81D166F: Move_PSYWAVE: @ 81D169C loadspritegfx ANIM_TAG_BLUE_RING playsewithpan SE_W060, SOUND_PAN_ATTACKER - call Unknown_81D61E7 + call SetPsychicBackground createvisualtask sub_80D3630, 5, 100 createsoundtask sub_812B058, 203, -64, 63, 2, 9, 0, 10 call _81D16FF @@ -10150,7 +10150,7 @@ ConfusionEffect: @ 81D618B createsprite gConfusionDuckSpriteTemplate, 130, 0, -15, 204, 3, 90 return -Unknown_81D61E7: @ 81D61E7 +SetPsychicBackground: @ 81D61E7 fadetobg BG_PSYCHIC waitbgfadeout createvisualtask sub_812C560, 5 @@ -10227,12 +10227,12 @@ StatusCondition_Confusion: @ 81D629B StatusCondition_Burn: @ 81D62A4 loadspritegfx ANIM_TAG_SMALL_EMBER playsewithpan SE_W172, SOUND_PAN_TARGET - call _81D62BC - call _81D62BC - call _81D62BC + call ConditionBurnFire + call ConditionBurnFire + call ConditionBurnFire waitforvisualfinish end -_81D62BC: +ConditionBurnFire: createsprite gBattleAnimSpriteTemplate_83D9614, 130, -24, 24, 24, 24, 20, 1, 1 delay 4 return @@ -10352,12 +10352,12 @@ General_ItemKnockoff: @ 81D647E General_TurnTrap: @ 81D6489 createvisualtask sub_8141DAC, 5 - jumpargeq 0, 1, _81D64FD - jumpargeq 0, 2, _81D6522 - jumpargeq 0, 3, _81D6576 - jumpargeq 0, 4, _81D65D3 - goto _81D64B5 -_81D64B5: + jumpargeq 0, 1, FireSpinHit + jumpargeq 0, 2, WhirlpoolHit + jumpargeq 0, 3, ClampHit + jumpargeq 0, 4, SandTombHit + goto WrapHit +WrapHit: loadspritegfx ANIM_TAG_TENDRILS loopsewithpan SE_W010, SOUND_PAN_TARGET, 6, 2 createsprite gBattleAnimSpriteTemplate_83D65A0, 132, 0, 16, 0, 1 @@ -10370,7 +10370,7 @@ _81D64B5: playsewithpan SE_W020, SOUND_PAN_TARGET waitforvisualfinish end -_81D64FD: +FireSpinHit: loadspritegfx ANIM_TAG_SMALL_EMBER playsewithpan SE_W221B, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 5, 1, 0, 2, 30, 1 @@ -10379,7 +10379,7 @@ _81D64FD: waitforvisualfinish stopsound end -_81D6522: +WhirlpoolHit: loadspritegfx ANIM_TAG_WATER_ORB monbg ANIM_BANK_DEF_PARTNER monbgprio_28 1 @@ -10396,7 +10396,7 @@ _81D6522: stopsound clearmonbg ANIM_BANK_DEF_PARTNER end -_81D6576: +ClampHit: loadspritegfx ANIM_TAG_CLAMP loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_TARGET @@ -10412,7 +10412,7 @@ _81D6576: blendoff waitforvisualfinish end -_81D65D3: +SandTombHit: loadspritegfx ANIM_TAG_MUD_SAND createsprite gSimplePaletteBlendSpriteTemplate, 0, 4, 2, 0, 7, rgb(19, 17, 0) createvisualtask AnimTask_ShakeMon, 5, 1, 0, 2, 30, 1 @@ -10571,7 +10571,7 @@ General_FutureSightHit: @ 81D68D5 createvisualtask sub_80E42B0, 2 monbg ANIM_BANK_DEF_PARTNER playsewithpan SE_W060, SOUND_PAN_ATTACKER - call Unknown_81D61E7 + call SetPsychicBackground setalpha 8, 8 playsewithpan SE_W048, SOUND_PAN_TARGET waitplaysewithpan SE_W048, SOUND_PAN_TARGET, 8 -- cgit v1.2.3 From 386a20842e5587af34f71c57dfe1ddce1eb9d7eb Mon Sep 17 00:00:00 2001 From: Sewef Date: Tue, 13 Nov 2018 08:56:52 +0100 Subject: Unknown_81D61F3 => BackgroundRestore --- data/battle_anim_scripts.s | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index 0e6ec3597..0acb7dbd9 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -2696,7 +2696,7 @@ Move_MEDITATE: @ 81CB1BD delay 16 playsewithpan SE_W036, SOUND_PAN_ATTACKER waitforvisualfinish - call Unknown_81D61F3 + call BackgroundRestore end Move_AGILITY: @ 81CB1DA @@ -2763,7 +2763,7 @@ Move_TELEPORT: @ 81CB2F2 createvisualtask sub_80DBCFC, 2 playsewithpan SE_W100, SOUND_PAN_ATTACKER delay 15 - call Unknown_81D61F3 + call BackgroundRestore waitforvisualfinish end @@ -2856,7 +2856,7 @@ Move_AMNESIA: @ 81CB455 delay 54 loopsewithpan SE_W118, SOUND_PAN_ATTACKER, 16, 3 waitforvisualfinish - call Unknown_81D61F3 + call BackgroundRestore end Move_KINESIS: @ 81CB479 @@ -2875,7 +2875,7 @@ Move_KINESIS: @ 81CB479 delay 70 playsewithpan SE_W207B, SOUND_PAN_ATTACKER waitforvisualfinish - call Unknown_81D61F3 + call BackgroundRestore end Move_GLARE: @ 81CB4CA @@ -3826,7 +3826,7 @@ Move_SKILL_SWAP: @ 81CC81C createvisualtask sub_80DC0B0, 3, 0 createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_BANK_ATTACKER, 32767, 12, 3, 1 waitforvisualfinish - call Unknown_81D61F3 + call BackgroundRestore end Move_IMPRISON: @ 81CC867 @@ -3843,7 +3843,7 @@ Move_IMPRISON: @ 81CC867 createvisualtask sub_80E1864, 5, 4, 1, 10 playsewithpan SE_W063, SOUND_PAN_ATTACKER clearmonbg ANIM_BANK_DEF_PARTNER - call Unknown_81D61F3 + call BackgroundRestore end Move_GRUDGE: @ 81CC8AA @@ -3938,7 +3938,7 @@ Move_LUSTER_PURGE: @ 81CC95B waitforvisualfinish clearmonbg ANIM_BANK_ATTACKER blendoff - call Unknown_81D61F3 + call BackgroundRestore end Move_MIST_BALL: @ 81CCA72 @@ -4334,7 +4334,7 @@ Move_EXTRASENSORY: @ 81CD431 waitforvisualfinish blendoff clearmonbg ANIM_BANK_DEF_PARTNER - call Unknown_81D61F3 + call BackgroundRestore end Move_AERIAL_ACE: @ 81CD499 @@ -4714,7 +4714,7 @@ Move_CONFUSION: @ 81CDC69 clearmonbg ANIM_BANK_DEF_PARTNER blendoff delay 1 - call Unknown_81D61F3 + call BackgroundRestore end Move_PSYCHIC: @ 81CDCCA @@ -4731,7 +4731,7 @@ Move_PSYCHIC: @ 81CDCCA clearmonbg ANIM_BANK_DEF_PARTNER blendoff delay 1 - call Unknown_81D61F3 + call BackgroundRestore end Move_FUTURE_SIGHT: @ 81CDD2D @@ -4739,7 +4739,7 @@ Move_FUTURE_SIGHT: @ 81CDD2D _81CDD32: waitforvisualfinish delay 1 - call Unknown_81D61F3 + call BackgroundRestore end _81CDD3B: monbg ANIM_BANK_ATK_PARTNER @@ -7009,7 +7009,7 @@ Move_DREAM_EATER: @ 81D1271 clearmonbg ANIM_BANK_DEF_PARTNER blendoff delay 1 - call Unknown_81D61F3 + call BackgroundRestore end _81D12DB: playsewithpan SE_W207, SOUND_PAN_TARGET @@ -7126,7 +7126,7 @@ Move_PSYBEAM: @ 81D15A2 call _81D1626 waitforvisualfinish delay 1 - call Unknown_81D61F3 + call BackgroundRestore end _81D1626: createsprite gBattleAnimSpriteTemplate_83DA784, 130, 16, 0, 0, 0, 13, 0 @@ -7142,7 +7142,7 @@ Move_HYPNOSIS: @ 81D163C createvisualtask sub_80E1F8C, 2, 4, 2, 2, 0, 12, 32351 waitforvisualfinish delay 1 - call Unknown_81D61F3 + call BackgroundRestore end _81D166F: playsewithpan SE_W048, SOUND_PAN_ATTACKER @@ -7166,7 +7166,7 @@ Move_PSYWAVE: @ 81D169C call _81D16FF waitforvisualfinish delay 1 - call Unknown_81D61F3 + call BackgroundRestore end _81D16FF: createsprite gBattleAnimSpriteTemplate_83D9280, 131, 10, 10, 0, 16 @@ -9508,7 +9508,7 @@ Move_PSYCHO_BOOST: @ 81D51C7 waitforvisualfinish clearmonbg ANIM_BANK_ATK_PARTNER blendoff - call Unknown_81D61F3 + call BackgroundRestore end Move_KNOCK_OFF: @ 81D523B @@ -10157,7 +10157,7 @@ SetPsychicBackground: @ 81D61E7 waitbgfadein return -Unknown_81D61F3: @ 81D61F3 +BackgroundRestore: @ 81D61F3 restorebg waitbgfadeout setarg ARG_RET_ID, -1 @@ -10584,7 +10584,7 @@ General_FutureSightHit: @ 81D68D5 blendoff waitforvisualfinish delay 1 - call Unknown_81D61F3 + call BackgroundRestore end General_DoomDesireHit: @ 81D6934 -- cgit v1.2.3