diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/pokeblock.c | 2 | ||||
| -rw-r--r-- | src/pokeblock_feed.c | 10 | ||||
| -rw-r--r-- | src/pokemon_3.c | 8 |
3 files changed, 10 insertions, 10 deletions
diff --git a/src/pokeblock.c b/src/pokeblock.c index 945b3680d..8716e827f 100644 --- a/src/pokeblock.c +++ b/src/pokeblock.c @@ -800,7 +800,7 @@ static void sub_8136344(void) u8 i; for (i = 0; - i < sSavedPokeblockData.lastItemPos - 4 && sSavedPokeblockData.lastItemPage + sPokeblockMenu->maxShowed != sPokeblockMenu->itemsNo; + (i < sSavedPokeblockData.lastItemPos - 4) && (sSavedPokeblockData.lastItemPage + sPokeblockMenu->maxShowed != sPokeblockMenu->itemsNo); sSavedPokeblockData.lastItemPos--, sSavedPokeblockData.lastItemPage++, i++); } } 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]; diff --git a/src/pokemon_3.c b/src/pokemon_3.c index e3b340698..1a44a4410 100644 --- a/src/pokemon_3.c +++ b/src/pokemon_3.c @@ -1298,16 +1298,16 @@ bool8 IsPokeSpriteNotFlipped(u16 species) return gBaseStats[species].noFlip; } -s8 GetMonFlavorRelation(struct Pokemon *mon, u8 flavour) +s8 GetMonFlavorRelation(struct Pokemon *mon, u8 flavor) { u8 nature = GetNature(mon); - return gPokeblockFlavorCompatibilityTable[nature * 5 + flavour]; + return gPokeblockFlavorCompatibilityTable[nature * 5 + flavor]; } -s8 GetFlavorRelationByPersonality(u32 personality, u8 flavour) +s8 GetFlavorRelationByPersonality(u32 personality, u8 flavor) { u8 nature = GetNatureFromPersonality(personality); - return gPokeblockFlavorCompatibilityTable[nature * 5 + flavour]; + return gPokeblockFlavorCompatibilityTable[nature * 5 + flavor]; } bool8 IsTradedMon(struct Pokemon *mon) |