dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Flatten pos fields in struct Sprite

Browse Source
This commit is contained in:
PikalaxALT
2021-07-07 09:05:48 -04:00
parent 1a43cdc81f
commit aec808ac0d
92 changed files with 2891 additions and 2891 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/trade_scene.c
+72 -72
View File
@@ -631,7 +631,7 @@ static void SpriteCB_TradeGlowCore(struct Sprite * sprite)
static void SpriteCB_GameLinkCableEnd_Outbound(struct Sprite * sprite)
{
sprite->data[0]++;
sprite->pos2.y++;
sprite->y2++;
if (sprite->data[0] == 10)
DestroySprite(sprite);
}
@@ -640,7 +640,7 @@ static void SpriteCB_GameLinkCableEnd_Outbound(struct Sprite * sprite)
static void SpriteCB_GameLinkCableEnd_Inbound(struct Sprite * sprite)
{
sprite->data[0]++;
sprite->pos2.y--;
sprite->y2--;
if (sprite->data[0] == 10)
DestroySprite(sprite);
}
@@ -1269,8 +1269,8 @@ static bool8 DoTradeAnim_Cable(void)
{
case 0:
gSprites[sTradeData->pokePicSpriteIdxs[0]].invisible = FALSE;
gSprites[sTradeData->pokePicSpriteIdxs[0]].pos2.x = -180;
gSprites[sTradeData->pokePicSpriteIdxs[0]].pos2.y = gMonFrontPicCoords[sTradeData->tradeSpecies[0]].y_offset;
gSprites[sTradeData->pokePicSpriteIdxs[0]].x2 = -180;
gSprites[sTradeData->pokePicSpriteIdxs[0]].y2 = gMonFrontPicCoords[sTradeData->tradeSpecies[0]].y_offset;
sTradeData->state++;
sTradeData->cachedMapMusic = GetCurrentMapMusic();
PlayNewMapMusic(MUS_EVOLUTION);
@@ -1278,12 +1278,12 @@ static bool8 DoTradeAnim_Cable(void)
case 1:
if (sTradeData->bg2hofs > 0)
{
gSprites[sTradeData->pokePicSpriteIdxs[0]].pos2.x += 3;
gSprites[sTradeData->pokePicSpriteIdxs[0]].x2 += 3;
sTradeData->bg2hofs -= 3;
}
else
{
gSprites[sTradeData->pokePicSpriteIdxs[0]].pos2.x = 0;
gSprites[sTradeData->pokePicSpriteIdxs[0]].x2 = 0;
sTradeData->bg2hofs = 0;
sTradeData->state = 10;
}
@@ -1404,9 +1404,9 @@ static bool8 DoTradeAnim_Cable(void)
DISPCNT_OBJ_ON);
break;
case 200:
gSprites[sTradeData->tradeGlow1SpriteId].pos1.y -= 2;
gSprites[sTradeData->gbaScreenSpriteId].pos1.y -= 2;
if (gSprites[sTradeData->tradeGlow1SpriteId].pos1.y < -8)
gSprites[sTradeData->tradeGlow1SpriteId].y -= 2;
gSprites[sTradeData->gbaScreenSpriteId].y -= 2;
if (gSprites[sTradeData->tradeGlow1SpriteId].y < -8)
{
sTradeData->state = 29;
}
@@ -1436,13 +1436,13 @@ static bool8 DoTradeAnim_Cable(void)
PlaySE(SE_WARP_OUT);
sTradeData->state++;
}
gSprites[sTradeData->tradeGlow1SpriteId].pos2.y -= 3;
gSprites[sTradeData->gbaScreenSpriteId].pos2.y += 3;
gSprites[sTradeData->tradeGlow1SpriteId].y2 -= 3;
gSprites[sTradeData->gbaScreenSpriteId].y2 += 3;
break;
case 33:
gSprites[sTradeData->tradeGlow1SpriteId].pos2.y -= 3;
gSprites[sTradeData->gbaScreenSpriteId].pos2.y += 3;
if (gSprites[sTradeData->tradeGlow1SpriteId].pos2.y <= -90)
gSprites[sTradeData->tradeGlow1SpriteId].y2 -= 3;
gSprites[sTradeData->gbaScreenSpriteId].y2 += 3;
if (gSprites[sTradeData->tradeGlow1SpriteId].y2 <= -90)
{
gSprites[sTradeData->tradeGlow1SpriteId].data[1] = 1;
gSprites[sTradeData->gbaScreenSpriteId].data[1] = 1;
@@ -1474,22 +1474,22 @@ static bool8 DoTradeAnim_Cable(void)
StartSpriteAffineAnim(&gSprites[sTradeData->pokePicSpriteIdxs[0]], 0);
}
StartSpriteAffineAnim(&gSprites[sTradeData->pokePicSpriteIdxs[1]], 0);
gSprites[sTradeData->pokePicSpriteIdxs[0]].pos1.x = 60;
gSprites[sTradeData->pokePicSpriteIdxs[1]].pos1.x = 180;
gSprites[sTradeData->pokePicSpriteIdxs[0]].pos1.y = 192;
gSprites[sTradeData->pokePicSpriteIdxs[1]].pos1.y = -32;
gSprites[sTradeData->pokePicSpriteIdxs[0]].x = 60;
gSprites[sTradeData->pokePicSpriteIdxs[1]].x = 180;
gSprites[sTradeData->pokePicSpriteIdxs[0]].y = 192;
gSprites[sTradeData->pokePicSpriteIdxs[1]].y = -32;
gSprites[sTradeData->pokePicSpriteIdxs[0]].invisible = FALSE;
gSprites[sTradeData->pokePicSpriteIdxs[1]].invisible = FALSE;
sTradeData->state++;
break;
case 38:
gSprites[sTradeData->pokePicSpriteIdxs[0]].pos2.y -= 3;
gSprites[sTradeData->pokePicSpriteIdxs[1]].pos2.y += 3;
if (gSprites[sTradeData->pokePicSpriteIdxs[0]].pos2.y < -160 && gSprites[sTradeData->pokePicSpriteIdxs[0]].pos2.y >= -163)
gSprites[sTradeData->pokePicSpriteIdxs[0]].y2 -= 3;
gSprites[sTradeData->pokePicSpriteIdxs[1]].y2 += 3;
if (gSprites[sTradeData->pokePicSpriteIdxs[0]].y2 < -160 && gSprites[sTradeData->pokePicSpriteIdxs[0]].y2 >= -163)
{
PlaySE(SE_WARP_IN);
}
if (gSprites[sTradeData->pokePicSpriteIdxs[0]].pos2.y < -222)
if (gSprites[sTradeData->pokePicSpriteIdxs[0]].y2 < -222)
{
gSprites[sTradeData->tradeGlow1SpriteId].data[1] = 0;
gSprites[sTradeData->gbaScreenSpriteId].data[1] = 0;
@@ -1500,9 +1500,9 @@ static bool8 DoTradeAnim_Cable(void)
}
break;
case 39:
gSprites[sTradeData->tradeGlow1SpriteId].pos2.y -= 3;
gSprites[sTradeData->gbaScreenSpriteId].pos2.y += 3;
if (gSprites[sTradeData->tradeGlow1SpriteId].pos2.y <= -222)
gSprites[sTradeData->tradeGlow1SpriteId].y2 -= 3;
gSprites[sTradeData->gbaScreenSpriteId].y2 += 3;
if (gSprites[sTradeData->tradeGlow1SpriteId].y2 <= -222)
{
BeginNormalPaletteFade(0xFFFFFFFF, -1, 0, 16, RGB_BLACK);
sTradeData->state++;
@@ -1536,9 +1536,9 @@ static bool8 DoTradeAnim_Cable(void)
}
break;
case 43:
gSprites[sTradeData->tradeGlow1SpriteId].pos2.y += 3;
gSprites[sTradeData->gbaScreenSpriteId].pos2.y += 3;
if (gSprites[sTradeData->tradeGlow1SpriteId].pos2.y + gSprites[sTradeData->tradeGlow1SpriteId].pos1.y == 64)
gSprites[sTradeData->tradeGlow1SpriteId].y2 += 3;
gSprites[sTradeData->gbaScreenSpriteId].y2 += 3;
if (gSprites[sTradeData->tradeGlow1SpriteId].y2 + gSprites[sTradeData->tradeGlow1SpriteId].y == 64)
{
sTradeData->state++;
}
@@ -1650,10 +1650,10 @@ static bool8 DoTradeAnim_Cable(void)
}
break;
case 66:
gSprites[sTradeData->pokePicSpriteIdxs[1]].pos1.x = 120;
gSprites[sTradeData->pokePicSpriteIdxs[1]].pos1.y = gMonFrontPicCoords[sTradeData->tradeSpecies[1]].y_offset + 60;
gSprites[sTradeData->pokePicSpriteIdxs[1]].pos2.x = 0;
gSprites[sTradeData->pokePicSpriteIdxs[1]].pos2.y = 0;
gSprites[sTradeData->pokePicSpriteIdxs[1]].x = 120;
gSprites[sTradeData->pokePicSpriteIdxs[1]].y = gMonFrontPicCoords[sTradeData->tradeSpecies[1]].y_offset + 60;
gSprites[sTradeData->pokePicSpriteIdxs[1]].x2 = 0;
gSprites[sTradeData->pokePicSpriteIdxs[1]].y2 = 0;
StartSpriteAnim(&gSprites[sTradeData->pokePicSpriteIdxs[1]], 0);
CreatePokeballSpriteToReleaseMon(sTradeData->pokePicSpriteIdxs[1], gSprites[sTradeData->pokePicSpriteIdxs[1]].oam.paletteNum, 120, 84, 2, 1, 20, 0xFFFFF);
FreeSpriteOamMatrix(&gSprites[sTradeData->pokeballSpriteId2]);
@@ -1766,8 +1766,8 @@ static bool8 DoTradeAnim_Wireless(void)
{
case 0:
gSprites[sTradeData->pokePicSpriteIdxs[0]].invisible = FALSE;
gSprites[sTradeData->pokePicSpriteIdxs[0]].pos2.x = -180;
gSprites[sTradeData->pokePicSpriteIdxs[0]].pos2.y = gMonFrontPicCoords[sTradeData->tradeSpecies[0]].y_offset;
gSprites[sTradeData->pokePicSpriteIdxs[0]].x2 = -180;
gSprites[sTradeData->pokePicSpriteIdxs[0]].y2 = gMonFrontPicCoords[sTradeData->tradeSpecies[0]].y_offset;
sTradeData->state++;
sTradeData->cachedMapMusic = GetCurrentMapMusic();
PlayNewMapMusic(MUS_EVOLUTION);
@@ -1775,12 +1775,12 @@ static bool8 DoTradeAnim_Wireless(void)
case 1:
if (sTradeData->bg2hofs > 0)
{
gSprites[sTradeData->pokePicSpriteIdxs[0]].pos2.x += 3;
gSprites[sTradeData->pokePicSpriteIdxs[0]].x2 += 3;
sTradeData->bg2hofs -= 3;
}
else
{
gSprites[sTradeData->pokePicSpriteIdxs[0]].pos2.x = 0;
gSprites[sTradeData->pokePicSpriteIdxs[0]].x2 = 0;
sTradeData->bg2hofs = 0;
sTradeData->state = 10;
}
@@ -1906,9 +1906,9 @@ static bool8 DoTradeAnim_Wireless(void)
DISPCNT_OBJ_ON);
break;
case 200:
gSprites[sTradeData->tradeGlow1SpriteId].pos1.y -= 2;
gSprites[sTradeData->gbaScreenSpriteId].pos1.y -= 2;
if (gSprites[sTradeData->tradeGlow1SpriteId].pos1.y < -8)
gSprites[sTradeData->tradeGlow1SpriteId].y -= 2;
gSprites[sTradeData->gbaScreenSpriteId].y -= 2;
if (gSprites[sTradeData->tradeGlow1SpriteId].y < -8)
{
sTradeData->state = 29;
}
@@ -1938,13 +1938,13 @@ static bool8 DoTradeAnim_Wireless(void)
PlaySE(SE_WARP_OUT);
sTradeData->state++;
}
gSprites[sTradeData->tradeGlow1SpriteId].pos2.y -= 3;
gSprites[sTradeData->gbaScreenSpriteId].pos2.y += 3;
gSprites[sTradeData->tradeGlow1SpriteId].y2 -= 3;
gSprites[sTradeData->gbaScreenSpriteId].y2 += 3;
break;
case 33:
gSprites[sTradeData->tradeGlow1SpriteId].pos2.y -= 3;
gSprites[sTradeData->gbaScreenSpriteId].pos2.y += 3;
if (gSprites[sTradeData->tradeGlow1SpriteId].pos2.y <= -90)
gSprites[sTradeData->tradeGlow1SpriteId].y2 -= 3;
gSprites[sTradeData->gbaScreenSpriteId].y2 += 3;
if (gSprites[sTradeData->tradeGlow1SpriteId].y2 <= -90)
{
gSprites[sTradeData->tradeGlow1SpriteId].data[1] = 1;
gSprites[sTradeData->gbaScreenSpriteId].data[1] = 1;
@@ -1977,22 +1977,22 @@ static bool8 DoTradeAnim_Wireless(void)
StartSpriteAffineAnim(&gSprites[sTradeData->pokePicSpriteIdxs[0]], 0);
}
StartSpriteAffineAnim(&gSprites[sTradeData->pokePicSpriteIdxs[1]], 0);
gSprites[sTradeData->pokePicSpriteIdxs[0]].pos1.x = 40;
gSprites[sTradeData->pokePicSpriteIdxs[1]].pos1.x = 200;
gSprites[sTradeData->pokePicSpriteIdxs[0]].pos1.y = 192;
gSprites[sTradeData->pokePicSpriteIdxs[1]].pos1.y = -32;
gSprites[sTradeData->pokePicSpriteIdxs[0]].x = 40;
gSprites[sTradeData->pokePicSpriteIdxs[1]].x = 200;
gSprites[sTradeData->pokePicSpriteIdxs[0]].y = 192;
gSprites[sTradeData->pokePicSpriteIdxs[1]].y = -32;
gSprites[sTradeData->pokePicSpriteIdxs[0]].invisible = FALSE;
gSprites[sTradeData->pokePicSpriteIdxs[1]].invisible = FALSE;
sTradeData->state++;
break;
case 38:
gSprites[sTradeData->pokePicSpriteIdxs[0]].pos2.y -= 3;
gSprites[sTradeData->pokePicSpriteIdxs[1]].pos2.y += 3;
if (gSprites[sTradeData->pokePicSpriteIdxs[0]].pos2.y < -160 && gSprites[sTradeData->pokePicSpriteIdxs[0]].pos2.y >= -163)
gSprites[sTradeData->pokePicSpriteIdxs[0]].y2 -= 3;
gSprites[sTradeData->pokePicSpriteIdxs[1]].y2 += 3;
if (gSprites[sTradeData->pokePicSpriteIdxs[0]].y2 < -160 && gSprites[sTradeData->pokePicSpriteIdxs[0]].y2 >= -163)
{
PlaySE(SE_WARP_IN);
}
if (gSprites[sTradeData->pokePicSpriteIdxs[0]].pos2.y < -222)
if (gSprites[sTradeData->pokePicSpriteIdxs[0]].y2 < -222)
{
gSprites[sTradeData->tradeGlow1SpriteId].data[1] = 0;
gSprites[sTradeData->gbaScreenSpriteId].data[1] = 0;
@@ -2003,9 +2003,9 @@ static bool8 DoTradeAnim_Wireless(void)
}
break;
case 39:
gSprites[sTradeData->tradeGlow1SpriteId].pos2.y -= 3;
gSprites[sTradeData->gbaScreenSpriteId].pos2.y += 3;
if (gSprites[sTradeData->tradeGlow1SpriteId].pos2.y <= -222)
gSprites[sTradeData->tradeGlow1SpriteId].y2 -= 3;
gSprites[sTradeData->gbaScreenSpriteId].y2 += 3;
if (gSprites[sTradeData->tradeGlow1SpriteId].y2 <= -222)
{
BeginNormalPaletteFade(0xFFFFFFFF, -1, 0, 16, RGB_BLACK);
sTradeData->state++;
@@ -2042,9 +2042,9 @@ static bool8 DoTradeAnim_Wireless(void)
}
break;
case 43:
gSprites[sTradeData->tradeGlow1SpriteId].pos2.y += 4;
gSprites[sTradeData->gbaScreenSpriteId].pos2.y += 4;
if (gSprites[sTradeData->tradeGlow1SpriteId].pos2.y + gSprites[sTradeData->tradeGlow1SpriteId].pos1.y == 64)
gSprites[sTradeData->tradeGlow1SpriteId].y2 += 4;
gSprites[sTradeData->gbaScreenSpriteId].y2 += 4;
if (gSprites[sTradeData->tradeGlow1SpriteId].y2 + gSprites[sTradeData->tradeGlow1SpriteId].y == 64)
{
sTradeData->state = 144;
sTradeData->timer = 0;
@@ -2171,10 +2171,10 @@ static bool8 DoTradeAnim_Wireless(void)
}
break;
case 66:
gSprites[sTradeData->pokePicSpriteIdxs[1]].pos1.x = 120;
gSprites[sTradeData->pokePicSpriteIdxs[1]].pos1.y = gMonFrontPicCoords[sTradeData->tradeSpecies[1]].y_offset + 60;
gSprites[sTradeData->pokePicSpriteIdxs[1]].pos2.x = 0;
gSprites[sTradeData->pokePicSpriteIdxs[1]].pos2.y = 0;
gSprites[sTradeData->pokePicSpriteIdxs[1]].x = 120;
gSprites[sTradeData->pokePicSpriteIdxs[1]].y = gMonFrontPicCoords[sTradeData->tradeSpecies[1]].y_offset + 60;
gSprites[sTradeData->pokePicSpriteIdxs[1]].x2 = 0;
gSprites[sTradeData->pokePicSpriteIdxs[1]].y2 = 0;
StartSpriteAnim(&gSprites[sTradeData->pokePicSpriteIdxs[1]], 0);
CreatePokeballSpriteToReleaseMon(sTradeData->pokePicSpriteIdxs[1], gSprites[sTradeData->pokePicSpriteIdxs[1]].oam.paletteNum, 120, 84, 2, 1, 20, 0xFFFFF);
FreeSpriteOamMatrix(&gSprites[sTradeData->pokeballSpriteId2]);
@@ -2328,16 +2328,16 @@ static void HandleLinkDataReceive(void)
static void SpriteCB_TradePokeball_Default(struct Sprite * sprite)
{
sprite->pos1.y += sprite->data[0] / 10;
sprite->y += sprite->data[0] / 10;
sprite->data[5] += sprite->data[1];
sprite->pos1.x = sprite->data[5] / 10;
if (sprite->pos1.y > 76)
sprite->x = sprite->data[5] / 10;
if (sprite->y > 76)
{
sprite->pos1.y = 76;
sprite->y = 76;
sprite->data[0] = -(sprite->data[0] * sprite->data[2]) / 100;
sprite->data[3]++;
}
if (sprite->pos1.x == 120)
if (sprite->x == 120)
sprite->data[1] = 0;
sprite->data[0] += sprite->data[4];
if (sprite->data[3] == 4)
@@ -2349,7 +2349,7 @@ static void SpriteCB_TradePokeball_Default(struct Sprite * sprite)
static void SpriteCB_TradePokeball_Outbound(struct Sprite * sprite)
{
sprite->pos2.y += sTradeBallVerticalVelocityTable[sprite->data[0]];
sprite->y2 += sTradeBallVerticalVelocityTable[sprite->data[0]];
if (sprite->data[0] == 22)
PlaySE(SE_BALL_BOUNCE_1);
sprite->data[0]++;
@@ -2369,7 +2369,7 @@ static void SpriteCB_TradePokeball_Outbound2(struct Sprite * sprite)
sprite->data[1]++;
if (sprite->data[1] > 20)
{
sprite->pos2.y -= sTradeBallVerticalVelocityTable[sprite->data[0]];
sprite->y2 -= sTradeBallVerticalVelocityTable[sprite->data[0]];
sprite->data[0]++;
if (sprite->data[0] == 23)
{
@@ -2383,8 +2383,8 @@ static void SpriteCB_TradePokeball_Inbound(struct Sprite * sprite)
{
if (sprite->data[2] == 0)
{
sprite->pos1.y += 4;
if (sprite->pos1.y > sprite->data[3])
sprite->y += 4;
if (sprite->y > sprite->data[3])
{
sprite->data[2]++;
sprite->data[0] = 22;
@@ -2399,7 +2399,7 @@ static void SpriteCB_TradePokeball_Inbound(struct Sprite * sprite)
PlaySE(SE_BALL_BOUNCE_3);
if (sprite->data[0] == 107)
PlaySE(SE_BALL_BOUNCE_4);
sprite->pos2.y += sTradeBallVerticalVelocityTable[sprite->data[0]];
sprite->y2 += sTradeBallVerticalVelocityTable[sprite->data[0]];
sprite->data[0]++;
if (sprite->data[0] == 108)
sprite->callback = SpriteCallbackDummy;