Skip to content

Fix UB in battle_anim_ground #2273

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
SiliconA-Z wants to merge 1 commit into
base: master
Choose a base branch
from
+17 −10
Open

Fix UB in battle_anim_ground #2273

Show file tree
Hide file tree
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
6 changes: 6 additions & 0 deletions data/battle_anim_scripts.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3318,8 +3318,14 @@ Move_MILK_DRINK:
Move_MAGNITUDE:
createvisualtask AnimTask_IsPowerOver99, 2
waitforvisualfinish
.ifdef UBFIX
jumpreteq FALSE, MagnitudeRegular
jumpreteq TRUE, MagnitudeIntense
.else
jumpargeq 15, FALSE, MagnitudeRegular
jumpargeq 15, TRUE, MagnitudeIntense
.endif

MagnitudeEnd:
end
MagnitudeRegular:
Expand Down
21 changes: 11 additions & 10 deletions src/battle_anim_ground.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,6 @@ void AnimTask_DigDownMovement(u8 taskId)

static void AnimTask_DigBounceMovement(u8 taskId)
{
u8 y;
struct Task *task = &gTasks[taskId];

switch (task->data[0])
Expand All @@ -318,9 +317,8 @@ static void AnimTask_DigBounceMovement(u8 taskId)
task->data[13] = gBattle_BG2_Y;
}

y = GetBattlerYCoordWithElevation(gBattleAnimAttacker);
task->data[14] = y - 32;
task->data[15] = y + 32;
task->data[14] = GetBattlerYCoordWithElevation(gBattleAnimAttacker) - 32;
task->data[15] = task->data[14] + 64;
if (task->data[14] < 0)
task->data[14] = 0;

Expand Down Expand Up @@ -428,9 +426,8 @@ static void AnimTask_DigRiseUpFromHole(u8 taskId)
else
task->data[12] = gBattle_BG2_X;

var0 = GetBattlerYCoordWithElevation(gBattleAnimAttacker);
task->data[14] = var0 - 32;
task->data[15] = var0 + 32;
task->data[14] = GetBattlerYCoordWithElevation(gBattleAnimAttacker) - 32;
task->data[15] = task->data[14] + 64;
task->data[0]++;
break;
case 1:
Expand Down Expand Up @@ -503,7 +500,7 @@ static void SetDigScanlineEffect(u8 useBG1, s16 y, s16 endY)
// arg 5: duration
void AnimDirtPlumeParticle(struct Sprite *sprite)
{
s8 battler;
u16 battler; // Should be u8.
s16 xOffset;

if (gBattleAnimArgs[0] == 0)
Expand Down Expand Up @@ -542,7 +539,7 @@ static void AnimDirtPlumeParticle_Step(struct Sprite *sprite)
// arg 2: duration
static void AnimDigDirtMound(struct Sprite *sprite)
{
s8 battler;
u8 battler;

if (gBattleAnimArgs[0] == 0)
battler = gBattleAnimAttacker;
Expand Down Expand Up @@ -708,7 +705,7 @@ static void AnimTask_ShakeBattlers(u8 taskId)
static void SetBattlersXOffsetForShake(struct Task *task)
{
u16 i;
u16 xOffset;
s16 xOffset;

if ((task->tTimer & 1) == 0)
xOffset = (task->tHorizOffset / 2) + (task->tHorizOffset & 1);
Expand All @@ -733,7 +730,11 @@ static void SetBattlersXOffsetForShake(struct Task *task)

void AnimTask_IsPowerOver99(u8 taskId)
{
#ifdef UBFIX
gBattleAnimArgs[7] = gAnimMovePower > 99;
#else
gBattleAnimArgs[15] = gAnimMovePower > 99;
#endif
DestroyAnimVisualTask(taskId);
}

Expand Down