summaryrefslogtreecommitdiff
path: root/src/pokeblock_feed.c
diff options
context:
space:
mode:
authorDizzyEggg <jajkodizzy@wp.pl>2017-12-20 17:20:41 +0100
committerDizzyEggg <jajkodizzy@wp.pl>2017-12-20 17:20:41 +0100
commitdf479661ffd0c270e4a8c35f37285d5d3988f592 (patch)
treed169db86c5cc9d30d294462d2920b4c88f3e724f /src/pokeblock_feed.c
parentb615af4184108b83227a24aac1eff7ec0a0cc749 (diff)
pokeblock review changes
Diffstat (limited to 'src/pokeblock_feed.c')
-rw-r--r--src/pokeblock_feed.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/pokeblock_feed.c b/src/pokeblock_feed.c
index ec5f3074f..1bf40bbe5 100644
--- a/src/pokeblock_feed.c
+++ b/src/pokeblock_feed.c
@@ -802,7 +802,7 @@ static void Task_ReturnAfterPaletteFade(u8 taskId)
{
ResetSpriteData();
FreeAllSpritePalettes();
- m4aMPlayVolumeControl(&gMPlay_BGM, -1, 256);
+ m4aMPlayVolumeControl(&gMPlay_BGM, -1, 0x100);
SetMainCallback2(gMain.savedCallback);
DestroyTask(taskId);
FreeAllWindowBuffers();
@@ -1092,13 +1092,13 @@ static void sub_817AB68(void)
if (!var_24)
{
- pokeblockFeed->field_850[r4] = Sin(pokeblockFeed->field_1060[0], pokeblockFeed->field_1060[2] + r5 / 256) + r8;
- pokeblockFeed->field_C50[r4] = Cos(pokeblockFeed->field_1060[0], pokeblockFeed->field_1060[3] + r5 / 256) + r7;
+ pokeblockFeed->field_850[r4] = Sin(pokeblockFeed->field_1060[0], pokeblockFeed->field_1060[2] + r5 / 0x100) + r8;
+ pokeblockFeed->field_C50[r4] = Cos(pokeblockFeed->field_1060[0], pokeblockFeed->field_1060[3] + r5 / 0x100) + r7;
}
else
{
- pokeblockFeed->field_850[r4] = Sin(pokeblockFeed->field_1060[0], pokeblockFeed->field_1060[2] - r5 / 256) + r8;
- pokeblockFeed->field_C50[r4] = Cos(pokeblockFeed->field_1060[0], pokeblockFeed->field_1060[3] - r5 / 256) + r7;
+ pokeblockFeed->field_850[r4] = Sin(pokeblockFeed->field_1060[0], pokeblockFeed->field_1060[2] - r5 / 0x100) + r8;
+ pokeblockFeed->field_C50[r4] = Cos(pokeblockFeed->field_1060[0], pokeblockFeed->field_1060[3] - r5 / 0x100) + r7;
}
pokeblockFeed->field_1060[0] += pokeblockFeed->field_1060[1];