atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update wring out with trace, remove AGBPrintf

Browse source
This commit is contained in:
Karathan 2019-07-03 14:10:29 +02:00
parent e9884154a9
commit 8126662cfb
2 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
data/battle_anim_scripts.s
View file

@ -1237,7 +1237,22 @@ Move_HEAL_BLOCK:
Move_WRING_OUT:
loadspritegfx ANIM_TAG_WRING_OUT
createsprite gWringOutHandSpriteTemplate, ANIM_TARGET, 40, 0, 0, 48, 3, 32
monbg ANIM_TARGET
setalpha 12, 8
createsprite gWringOutHandSpriteTemplate, ANIM_TARGET, 40, 0, 0, 48, 3, 32, FALSE
delay 3
createsprite gWringOutHandSpriteTemplate, ANIM_TARGET, 40, 0, 0, 48, 3, 32, TRUE
delay 3
createsprite gWringOutHandSpriteTemplate, ANIM_TARGET, 40, 0, 0, 48, 3, 32, TRUE
delay 3
createsprite gWringOutHandSpriteTemplate, ANIM_TARGET, 40, 0, 0, 48, 3, 32, TRUE
delay 3
createsprite gWringOutHandSpriteTemplate, ANIM_TARGET, 40, 0, 0, 48, 3, 32, TRUE
delay 3
createsprite gWringOutHandSpriteTemplate, ANIM_TARGET, 40, 0, 0, 48, 3, 32, TRUE
waitforvisualfinish
clearmonbg ANIM_TARGET
blendoff
waitforvisualfinish
end

7
src/battle_anim_effects_1.c
View file

@ -3053,14 +3053,11 @@ static void AnimMoveWringOutCircle(struct Sprite* sprite)
{
if(sprite->data[3] + sprite->data[0] >= 256)
{
AGBPrintf("Hit the crit section: step: %d, angle: %d", sprite->data[0], sprite->data[3]);
sprite->data[3] = (sprite->data[0] + sprite->data[3]) % 256;
sprite->data[1]--;
AGBPrintf("Crit New angle: %d", sprite->data[3]);
}
else
{
AGBPrintf("New angle: %d", sprite->data[3]);
sprite->data[3] += sprite->data[0];
}
@ -3079,6 +3076,10 @@ static void AnimMoveWringOutCircle(struct Sprite* sprite)
static void AnimMoveWringOut(struct Sprite* sprite)
{
InitSpritePosToAnimTarget(sprite, TRUE);
if(gBattleAnimArgs[5] == TRUE)
{
sprite->oam.objMode = ST_OAM_OBJ_BLEND;
}
sprite->data[0] = 256 / gBattleAnimArgs[2]; //step size
sprite->data[1] = gBattleAnimArgs[3]; //Number of circle spins
sprite->data[2] = gBattleAnimArgs[4]; //radius