diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-09-23 21:49:49 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-23 21:49:49 -0400 |
| commit | 9d0f9042febd46d506110778a3beeec90c8c9c1e (patch) | |
| tree | c3bf2f4b0b3183de111bfcc89fac3316f562c937 /src/pokeblock_feed.c | |
| parent | 0c2e9a5b4c1c0c0f2a62be6165e826760dd572cb (diff) | |
| parent | a6ab2eb883b4cef727a6caee993745cfeff1274b (diff) | |
Merge pull request #1498 from LOuroboros/trailingSpaces
Removed trailing spaces in the most relevant files
Diffstat (limited to 'src/pokeblock_feed.c')
| -rw-r--r-- | src/pokeblock_feed.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/pokeblock_feed.c b/src/pokeblock_feed.c index 748d988a4..b123e6031 100644 --- a/src/pokeblock_feed.c +++ b/src/pokeblock_feed.c @@ -1003,7 +1003,7 @@ static void CalculateMonAnimLength(void) pokeblockFeed = sPokeblockFeed; pokeblockFeed->monAnimLength = 1; animId = sNatureToMonPokeblockAnim[pokeblockFeed->nature][0]; - + // Add up the time each stage of the animation will take for (i = 0; i < 8; i++, animId++) { @@ -1177,16 +1177,16 @@ static void CalculateMonAnimMovement(void) if (!negative) { - pokeblockFeed->monAnimX[time] = Sin(pokeblockFeed->animData[ANIMDATA_ROT_IDX], + pokeblockFeed->monAnimX[time] = Sin(pokeblockFeed->animData[ANIMDATA_ROT_IDX], pokeblockFeed->animData[ANIMDATA_SIN_AMPLITUDE] + amplitude / 0x100) + x; - pokeblockFeed->monAnimY[time] = Cos(pokeblockFeed->animData[ANIMDATA_ROT_IDX], + pokeblockFeed->monAnimY[time] = Cos(pokeblockFeed->animData[ANIMDATA_ROT_IDX], pokeblockFeed->animData[ANIMDATA_COS_AMPLITUDE] + amplitude / 0x100) + y; } else { - pokeblockFeed->monAnimX[time] = Sin(pokeblockFeed->animData[ANIMDATA_ROT_IDX], + pokeblockFeed->monAnimX[time] = Sin(pokeblockFeed->animData[ANIMDATA_ROT_IDX], pokeblockFeed->animData[ANIMDATA_SIN_AMPLITUDE] - amplitude / 0x100) + x; - pokeblockFeed->monAnimY[time] = Cos(pokeblockFeed->animData[ANIMDATA_ROT_IDX], + pokeblockFeed->monAnimY[time] = Cos(pokeblockFeed->animData[ANIMDATA_ROT_IDX], pokeblockFeed->animData[ANIMDATA_COS_AMPLITUDE] - amplitude / 0x100) + y; } |