Skip to content

Fix the modulo fakematchings #758

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AZero13 wants to merge 1 commit into
base: master
Choose a base branch
from
+7 −16
Open

Fix the modulo fakematchings #758

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 7 additions & 16 deletions src/battle_anim_effects_1.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3226,9 +3226,6 @@ static void AnimItemSteal_Step3(struct Sprite* sprite)
// arg 1: initial wave offset
static void AnimTrickBag(struct Sprite* sprite)
{
int a;
int b;

if (!sprite->data[0])
{
if (!IsContest())
Expand All @@ -3238,13 +3235,7 @@ static void AnimTrickBag(struct Sprite* sprite)
}
else
{
a = gBattleAnimArgs[1] - 32;
if (a < 0)
b = gBattleAnimArgs[1] + 0xDF;
else
b = a;

sprite->data[1] = a - ((b >> 8) << 8);
sprite->data[1] = (gBattleAnimArgs[1] - 32) % 256;
sprite->x = 70;
}

Expand Down Expand Up @@ -4419,18 +4410,18 @@ static void AnimLockOnTarget_Step6(struct Sprite* sprite)
static void AnimLockOnMoveTarget(struct Sprite* sprite)
{
sprite->oam.affineParam = gBattleAnimArgs[0];
if ((s16)sprite->oam.affineParam == 1)
if (gBattleAnimArgs[0] == 1)
{
sprite->x -= 0x18;
sprite->y -= 0x18;
}
else if ((s16)sprite->oam.affineParam == 2)
else if (gBattleAnimArgs[0] == 2)
{
sprite->x -= 0x18;
sprite->y += 0x18;
sprite->oam.matrixNum = ST_OAM_VFLIP;
}
else if ((s16)sprite->oam.affineParam == 3)
else if (gBattleAnimArgs[0] == 3)
{
sprite->x += 0x18;
sprite->y -= 0x18;
Expand All @@ -4443,7 +4434,7 @@ static void AnimLockOnMoveTarget(struct Sprite* sprite)
sprite->oam.matrixNum = ST_OAM_HFLIP | ST_OAM_VFLIP;
}

sprite->oam.tileNum = (sprite->oam.tileNum + 16);
sprite->oam.tileNum += 16;
sprite->callback = AnimLockOnTarget;
sprite->callback(sprite);
}
Expand Down Expand Up @@ -4485,7 +4476,7 @@ static void AnimBowMon_Step1_Callback(struct Sprite* sprite)
{
sprite->data[3] = gBattlerSpriteIds[gBattleAnimAttacker];
PrepareBattlerSpriteForRotScale(sprite->data[3], ST_OAM_OBJ_NORMAL);
sprite->data[4] = (sprite->data[6] = GetBattlerSide(gBattleAnimAttacker)) ? 0x300 : 0xFFFFFD00;
sprite->data[4] = (sprite->data[6] = GetBattlerSide(gBattleAnimAttacker)) ? 0x300 : -0x300;
sprite->data[5] = 0;
}

Expand Down Expand Up @@ -5384,7 +5375,7 @@ static void AnimWavyMusicNotes_Step(struct Sprite* sprite)
u8 index;

sprite->sMoveTimer++;
trigIdx = sprite->sMoveTimer * 5 - ((sprite->sMoveTimer * 5 / 256) << 8);
trigIdx = (sprite->sMoveTimer * 5) % 256;
sprite->sX += sprite->sVelocX;
sprite->sY += sprite->sVelocY;
sprite->x = sprite->sX >> 4;
Expand Down