summaryrefslogtreecommitdiff
path: root/src/field_effect.c
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2020-07-02 00:17:14 -0400
committerGriffinR <griffin.g.richards@gmail.com>2020-07-02 00:17:14 -0400
commit8589e138a82b74bbfdaec6008cb389e5d5e8cce8 (patch)
tree97b33c5fcdbb90a08a26ea9ec0f24a389dafcf56 /src/field_effect.c
parentc84f98a7ff229ab8b09053fae8d66506764ce099 (diff)
Eliminate METATILE_ID() macro
Diffstat (limited to 'src/field_effect.c')
-rw-r--r--src/field_effect.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/field_effect.c b/src/field_effect.c
index b681fc70e..c2302eed9 100644
--- a/src/field_effect.c
+++ b/src/field_effect.c
@@ -3816,7 +3816,7 @@ static void SpriteCB_DeoxysRockFragment(struct Sprite* sprite)
sprite->pos1.y += 12;
break;
}
- if ((u16)(sprite->pos1.x + 4) > 248 || sprite->pos1.y < -4 || sprite->pos1.y > 164)
+ if ((u16)(sprite->pos1.x + 4) > DISPLAY_WIDTH + 8 || sprite->pos1.y < -4 || sprite->pos1.y > DISPLAY_HEIGHT + 4)
DestroySprite(sprite);
}
@@ -3834,7 +3834,7 @@ bool8 FldEff_MoveDeoxysRock(struct Sprite* sprite)
xPos = (gFieldEffectArguments[3] - xPos) * 16;
yPos = (gFieldEffectArguments[4] - yPos) * 16;
ShiftObjectEventCoords(object, gFieldEffectArguments[3] + 7, gFieldEffectArguments[4] + 7);
- taskId = CreateTask(Task_MoveDeoxysRock, 0x50);
+ taskId = CreateTask(Task_MoveDeoxysRock, 80);
gTasks[taskId].data[1] = object->spriteId;
gTasks[taskId].data[2] = gSprites[object->spriteId].pos1.x + xPos;
gTasks[taskId].data[3] = gSprites[object->spriteId].pos1.y + yPos;