diff options
Diffstat (limited to 'src/pokemon_storage_system_8.c')
| -rw-r--r-- | src/pokemon_storage_system_8.c | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/src/pokemon_storage_system_8.c b/src/pokemon_storage_system_8.c index 3e9c27555..27594e6ff 100644 --- a/src/pokemon_storage_system_8.c +++ b/src/pokemon_storage_system_8.c @@ -447,20 +447,20 @@ static void sub_80962F0(u8 id, u8 cursorArea, u8 cursorPos) case CURSOR_AREA_IN_BOX: row = cursorPos % IN_BOX_ROWS; column = cursorPos / IN_BOX_ROWS; - gPSSData->itemIconSprites[id].sprite->pos1.x = (24 * row) + 112; - gPSSData->itemIconSprites[id].sprite->pos1.y = (24 * column) + 56; + gPSSData->itemIconSprites[id].sprite->x = (24 * row) + 112; + gPSSData->itemIconSprites[id].sprite->y = (24 * column) + 56; gPSSData->itemIconSprites[id].sprite->oam.priority = 2; break; case CURSOR_AREA_IN_PARTY: if (cursorPos == 0) { - gPSSData->itemIconSprites[id].sprite->pos1.x = 116; - gPSSData->itemIconSprites[id].sprite->pos1.y = 76; + gPSSData->itemIconSprites[id].sprite->x = 116; + gPSSData->itemIconSprites[id].sprite->y = 76; } else { - gPSSData->itemIconSprites[id].sprite->pos1.x = 164; - gPSSData->itemIconSprites[id].sprite->pos1.y = 24 * (cursorPos - 1) + 28; + gPSSData->itemIconSprites[id].sprite->x = 164; + gPSSData->itemIconSprites[id].sprite->y = 24 * (cursorPos - 1) + 28; } gPSSData->itemIconSprites[id].sprite->oam.priority = 1; break; @@ -641,8 +641,8 @@ static void sub_8096958(struct Sprite *sprite) switch (sprite->data[0]) { case 0: - sprite->data[1] = sprite->pos1.x << 4; - sprite->data[2] = sprite->pos1.y << 4; + sprite->data[1] = sprite->x << 4; + sprite->data[2] = sprite->y << 4; sprite->data[3] = 10; sprite->data[4] = 21; sprite->data[5] = 0; @@ -650,8 +650,8 @@ static void sub_8096958(struct Sprite *sprite) case 1: sprite->data[1] -= sprite->data[3]; sprite->data[2] -= sprite->data[4]; - sprite->pos1.x = sprite->data[1] >> 4; - sprite->pos1.y = sprite->data[2] >> 4; + sprite->x = sprite->data[1] >> 4; + sprite->y = sprite->data[2] >> 4; if (++sprite->data[5] > 11) sprite->callback = sub_80969BC; break; @@ -660,8 +660,8 @@ static void sub_8096958(struct Sprite *sprite) static void sub_80969BC(struct Sprite *sprite) { - sprite->pos1.x = gPSSData->field_CB4->pos1.x + 4; - sprite->pos1.y = gPSSData->field_CB4->pos1.y + gPSSData->field_CB4->pos2.y + 8; + sprite->x = gPSSData->field_CB4->x + 4; + sprite->y = gPSSData->field_CB4->y + gPSSData->field_CB4->y2 + 8; sprite->oam.priority = gPSSData->field_CB4->oam.priority; } @@ -670,8 +670,8 @@ static void sub_80969F4(struct Sprite *sprite) switch (sprite->data[0]) { case 0: - sprite->data[1] = sprite->pos1.x << 4; - sprite->data[2] = sprite->pos1.y << 4; + sprite->data[1] = sprite->x << 4; + sprite->data[2] = sprite->y << 4; sprite->data[3] = 10; sprite->data[4] = 21; sprite->data[5] = 0; @@ -679,8 +679,8 @@ static void sub_80969F4(struct Sprite *sprite) case 1: sprite->data[1] += sprite->data[3]; sprite->data[2] += sprite->data[4]; - sprite->pos1.x = sprite->data[1] >> 4; - sprite->pos1.y = sprite->data[2] >> 4; + sprite->x = sprite->data[1] >> 4; + sprite->y = sprite->data[2] >> 4; if (++sprite->data[5] > 11) { sub_80962F0(sub_80962A8(sprite), sprite->data[6], sprite->data[7]); @@ -695,8 +695,8 @@ static void sub_8096A74(struct Sprite *sprite) switch (sprite->data[0]) { case 0: - sprite->data[1] = sprite->pos1.x << 4; - sprite->data[2] = sprite->pos1.y << 4; + sprite->data[1] = sprite->x << 4; + sprite->data[2] = sprite->y << 4; sprite->data[3] = 10; sprite->data[4] = 21; sprite->data[5] = 0; @@ -704,13 +704,13 @@ static void sub_8096A74(struct Sprite *sprite) case 1: sprite->data[1] -= sprite->data[3]; sprite->data[2] -= sprite->data[4]; - sprite->pos1.x = sprite->data[1] >> 4; - sprite->pos1.y = sprite->data[2] >> 4; - sprite->pos2.x = gSineTable[sprite->data[5] * 8] >> 4; + sprite->x = sprite->data[1] >> 4; + sprite->y = sprite->data[2] >> 4; + sprite->x2 = gSineTable[sprite->data[5] * 8] >> 4; if (++sprite->data[5] > 11) { sub_80962F0(sub_80962A8(sprite), sprite->data[6], sprite->data[7]); - sprite->pos2.x = 0; + sprite->x2 = 0; sprite->callback = sub_80969BC; } break; @@ -722,8 +722,8 @@ static void sub_8096B10(struct Sprite *sprite) switch (sprite->data[0]) { case 0: - sprite->data[1] = sprite->pos1.x << 4; - sprite->data[2] = sprite->pos1.y << 4; + sprite->data[1] = sprite->x << 4; + sprite->data[2] = sprite->y << 4; sprite->data[3] = 10; sprite->data[4] = 21; sprite->data[5] = 0; @@ -731,14 +731,14 @@ static void sub_8096B10(struct Sprite *sprite) case 1: sprite->data[1] += sprite->data[3]; sprite->data[2] += sprite->data[4]; - sprite->pos1.x = sprite->data[1] >> 4; - sprite->pos1.y = sprite->data[2] >> 4; - sprite->pos2.x = -(gSineTable[sprite->data[5] * 8] >> 4); + sprite->x = sprite->data[1] >> 4; + sprite->y = sprite->data[2] >> 4; + sprite->x2 = -(gSineTable[sprite->data[5] * 8] >> 4); if (++sprite->data[5] > 11) { sub_80962F0(sub_80962A8(sprite), sprite->data[6], sprite->data[7]); sprite->callback = SpriteCallbackDummy; - sprite->pos2.x = 0; + sprite->x2 = 0; } break; } @@ -746,8 +746,8 @@ static void sub_8096B10(struct Sprite *sprite) static void sub_8096BAC(struct Sprite *sprite) { - sprite->pos1.y -= 8; - if (sprite->pos1.y + sprite->pos2.y < -16) + sprite->y -= 8; + if (sprite->y + sprite->y2 < -16) { sprite->callback = SpriteCallbackDummy; sub_8096624(sub_80962A8(sprite), FALSE); |