diff options
Diffstat (limited to 'src/battle_dome.c')
-rw-r--r-- | src/battle_dome.c | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/src/battle_dome.c b/src/battle_dome.c index 59e418a06..f6b4efa95 100644 --- a/src/battle_dome.c +++ b/src/battle_dome.c @@ -3102,17 +3102,17 @@ static void Task_ShowTourneyInfoCard(u8 taskId) // That means that the sprite needs to move with the moving card in the opposite scrolling direction. static void SpriteCb_TrainerIconCardScrollUp(struct Sprite *sprite) { - sprite->pos1.y += 4; + sprite->y += 4; if (sprite->data[0] != 0) { - if (sprite->pos1.y >= -32) + if (sprite->y >= -32) sprite->invisible = FALSE; if (++sprite->data[1] == 40) sprite->callback = SpriteCallbackDummy; } else { - if (sprite->pos1.y >= 192) + if (sprite->y >= 192) { sInfoCard->spriteIds[sprite->data[2]] = SPRITE_NONE; FreeAndDestroyTrainerPicSprite(sprite->data[3]); @@ -3122,17 +3122,17 @@ static void SpriteCb_TrainerIconCardScrollUp(struct Sprite *sprite) static void SpriteCb_TrainerIconCardScrollDown(struct Sprite *sprite) { - sprite->pos1.y -= 4; + sprite->y -= 4; if (sprite->data[0] != 0) { - if (sprite->pos1.y <= 192) + if (sprite->y <= 192) sprite->invisible = FALSE; if (++sprite->data[1] == 40) sprite->callback = SpriteCallbackDummy; } else { - if (sprite->pos1.y <= -32) + if (sprite->y <= -32) { sInfoCard->spriteIds[sprite->data[2]] = SPRITE_NONE; FreeAndDestroyTrainerPicSprite(sprite->data[3]); @@ -3142,17 +3142,17 @@ static void SpriteCb_TrainerIconCardScrollDown(struct Sprite *sprite) static void SpriteCb_TrainerIconCardScrollLeft(struct Sprite *sprite) { - sprite->pos1.x += 4; + sprite->x += 4; if (sprite->data[0] != 0) { - if (sprite->pos1.x >= -32) + if (sprite->x >= -32) sprite->invisible = FALSE; if (++sprite->data[1] == 64) sprite->callback = SpriteCallbackDummy; } else { - if (sprite->pos1.x >= DISPLAY_WIDTH + 32) + if (sprite->x >= DISPLAY_WIDTH + 32) { sInfoCard->spriteIds[sprite->data[2]] = SPRITE_NONE; FreeAndDestroyTrainerPicSprite(sprite->data[3]); @@ -3162,17 +3162,17 @@ static void SpriteCb_TrainerIconCardScrollLeft(struct Sprite *sprite) static void SpriteCb_TrainerIconCardScrollRight(struct Sprite *sprite) { - sprite->pos1.x -= 4; + sprite->x -= 4; if (sprite->data[0] != 0) { - if (sprite->pos1.x <= DISPLAY_WIDTH + 32) + if (sprite->x <= DISPLAY_WIDTH + 32) sprite->invisible = FALSE; if (++sprite->data[1] == 64) sprite->callback = SpriteCallbackDummy; } else { - if (sprite->pos1.x <= -32) + if (sprite->x <= -32) { sInfoCard->spriteIds[sprite->data[2]] = SPRITE_NONE; FreeAndDestroyTrainerPicSprite(sprite->data[3]); @@ -3192,17 +3192,17 @@ static void SpriteCb_MonIconCardScrollUp(struct Sprite *sprite) { if (!sprite->sMonIconStill) UpdateMonIconFrame(sprite); - sprite->pos1.y += 4; + sprite->y += 4; if (sprite->data[0] != 0) { - if (sprite->pos1.y >= -16) + if (sprite->y >= -16) sprite->invisible = FALSE; if (++sprite->data[1] == 40) sprite->callback = SpriteCb_MonIcon; } else { - if (sprite->pos1.y >= 176) + if (sprite->y >= 176) { sInfoCard->spriteIds[sprite->data[2]] = SPRITE_NONE; FreeAndDestroyMonIconSprite(sprite); @@ -3214,17 +3214,17 @@ static void SpriteCb_MonIconCardScrollDown(struct Sprite *sprite) { if (!sprite->sMonIconStill) UpdateMonIconFrame(sprite); - sprite->pos1.y -= 4; + sprite->y -= 4; if (sprite->data[0] != 0) { - if (sprite->pos1.y <= 176) + if (sprite->y <= 176) sprite->invisible = FALSE; if (++sprite->data[1] == 40) sprite->callback = SpriteCb_MonIcon; } else { - if (sprite->pos1.y <= -16) + if (sprite->y <= -16) { sInfoCard->spriteIds[sprite->data[2]] = SPRITE_NONE; FreeAndDestroyMonIconSprite(sprite); @@ -3236,17 +3236,17 @@ static void SpriteCb_MonIconCardScrollLeft(struct Sprite *sprite) { if (!sprite->sMonIconStill) UpdateMonIconFrame(sprite); - sprite->pos1.x += 4; + sprite->x += 4; if (sprite->data[0] != 0) { - if (sprite->pos1.x >= -16) + if (sprite->x >= -16) sprite->invisible = FALSE; if (++sprite->data[1] == 64) sprite->callback = SpriteCb_MonIcon; } else { - if (sprite->pos1.x >= DISPLAY_WIDTH + 16) + if (sprite->x >= DISPLAY_WIDTH + 16) { sInfoCard->spriteIds[sprite->data[2]] = SPRITE_NONE; FreeAndDestroyMonIconSprite(sprite); @@ -3258,17 +3258,17 @@ static void SpriteCb_MonIconCardScrollRight(struct Sprite *sprite) { if (!sprite->sMonIconStill) UpdateMonIconFrame(sprite); - sprite->pos1.x -= 4; + sprite->x -= 4; if (sprite->data[0] != 0) { - if (sprite->pos1.x <= DISPLAY_WIDTH + 16) + if (sprite->x <= DISPLAY_WIDTH + 16) sprite->invisible = FALSE; if (++sprite->data[1] == 64) sprite->callback = SpriteCb_MonIcon; } else { - if (sprite->pos1.x <= -16) + if (sprite->x <= -16) { sInfoCard->spriteIds[sprite->data[2]] = SPRITE_NONE; FreeAndDestroyMonIconSprite(sprite); |