diff options
| -rw-r--r-- | asm/rom6.s | 14 | ||||
| -rwxr-xr-x | asm/use_pokeblock.s | 2 | ||||
| -rw-r--r-- | include/battle_message.h | 2 | ||||
| -rw-r--r-- | include/berry.h | 12 | ||||
| -rw-r--r-- | include/pokeblock.h | 4 | ||||
| -rw-r--r-- | include/pokemon.h | 4 | ||||
| -rw-r--r-- | src/battle_message.c | 2 | ||||
| -rw-r--r-- | src/battle_util.c | 10 | ||||
| -rw-r--r-- | src/berry_blender.c | 94 | ||||
| -rw-r--r-- | src/pokemon_3.c | 4 |
10 files changed, 74 insertions, 74 deletions
diff --git a/asm/rom6.s b/asm/rom6.s index 58dd57ff1..430ed7ee9 100644 --- a/asm/rom6.s +++ b/asm/rom6.s @@ -1223,7 +1223,7 @@ sub_8135F04: @ 8135F04 adds r4, 0x1 ldr r6, =gStringVar1 adds r0, r5, 0 - bl GetHighestPokeblocksFlavourLevel + bl GetHighestPokeblocksFlavorLevel adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -2995,8 +2995,8 @@ _08136E8C: bx r0 thumb_func_end ClearPokeblocks - thumb_func_start GetHighestPokeblocksFlavourLevel -GetHighestPokeblocksFlavourLevel: @ 8136EA4 + thumb_func_start GetHighestPokeblocksFlavorLevel +GetHighestPokeblocksFlavorLevel: @ 8136EA4 push {r4-r6,lr} adds r6, r0, 0 movs r1, 0x1 @@ -3024,7 +3024,7 @@ _08136ECC: pop {r4-r6} pop {r1} bx r1 - thumb_func_end GetHighestPokeblocksFlavourLevel + thumb_func_end GetHighestPokeblocksFlavorLevel thumb_func_start GetPokeblocksFeel GetPokeblocksFeel: @ 8136EDC @@ -3287,8 +3287,8 @@ _081370AC: bx r1 thumb_func_end sub_8137068 - thumb_func_start GetPokeblocksFlavour -GetPokeblocksFlavour: @ 81370B4 + thumb_func_start GetPokeblocksFlavor +GetPokeblocksFlavor: @ 81370B4 push {r4-r7,lr} adds r5, r0, 0 movs r7, 0 @@ -3324,7 +3324,7 @@ _081370E2: pop {r4-r7} pop {r1} bx r1 - thumb_func_end GetPokeblocksFlavour + thumb_func_end GetPokeblocksFlavor thumb_func_start sub_81370FC sub_81370FC: @ 81370FC diff --git a/asm/use_pokeblock.s b/asm/use_pokeblock.s index 3a8b76ab1..3c580654c 100755 --- a/asm/use_pokeblock.s +++ b/asm/use_pokeblock.s @@ -1769,7 +1769,7 @@ _0816721C: adds r0, r6, r0 ldrb r1, [r0] mov r0, r10 - bl GetMonFlavourRelation + bl GetMonFlavorRelation lsls r0, 24 asrs r2, r0, 24 cmp r0, r9 diff --git a/include/battle_message.h b/include/battle_message.h index 3f9b38cad..c1ee8baa2 100644 --- a/include/battle_message.h +++ b/include/battle_message.h @@ -67,7 +67,7 @@ #define B_BUFF_STAT 5 #define B_BUFF_SPECIES 6 #define B_BUFF_MON_NICK 7 -#define B_BUFF_NEGATIVE_FLAVOUR 8 +#define B_BUFF_NEGATIVE_FLAVOR 8 #define B_BUFF_ABILITY 9 #define B_BUFF_ITEM 10 diff --git a/include/berry.h b/include/berry.h index f1f3a8afb..425a664c9 100644 --- a/include/berry.h +++ b/include/berry.h @@ -13,12 +13,12 @@ enum enum { - FLAVOUR_SPICY, - FLAVOUR_DRY, - FLAVOUR_SWEET, - FLAVOUR_BITTER, - FLAVOUR_SOUR, - FLAVOUR_COUNT + FLAVOR_SPICY, + FLAVOR_DRY, + FLAVOR_SWEET, + FLAVOR_BITTER, + FLAVOR_SOUR, + FLAVOR_COUNT }; #define NUM_BERRIES 44 diff --git a/include/pokeblock.h b/include/pokeblock.h index 00fbd1e45..a145cbada 100644 --- a/include/pokeblock.h +++ b/include/pokeblock.h @@ -25,9 +25,9 @@ enum void ClearPokeblocks(void); s8 GetFirstFreePokeblockSlot(void); bool32 AddPokeblock(struct Pokeblock *pokeblock); -u8 GetHighestPokeblocksFlavourLevel(const struct Pokeblock *pokeblock); +u8 GetHighestPokeblocksFlavorLevel(const struct Pokeblock *pokeblock); u8 GetPokeblocksFeel(const struct Pokeblock *pokeblock); -u8 GetPokeblocksFlavour(const struct Pokeblock *pokeblock); +u8 GetPokeblocksFlavor(const struct Pokeblock *pokeblock); s16 PokeblockGetGain(u8, const struct Pokeblock *); #endif // GUARD_POKEBLOCK_H diff --git a/include/pokemon.h b/include/pokemon.h index 1eb052f4e..480c8d9b9 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -642,8 +642,8 @@ u8 CheckPartyPokerus(struct Pokemon *party, u8 selection); u8 CheckPartyHasHadPokerus(struct Pokemon *party, u8 selection); void UpdatePartyPokerusTime(u16 days); void PartySpreadPokerus(struct Pokemon *party); -s8 GetMonFlavourRelation(struct Pokemon *mon, u8 a2); -s8 GetFlavourRelationByPersonality(u32 personality, u8 a2); +s8 GetMonFlavorRelation(struct Pokemon *mon, u8 a2); +s8 GetFlavorRelationByPersonality(u32 personality, u8 a2); u8 GetItemEffectParamOffset(u16 itemId, u8 effectByte, u8 effectBit); u8 GetDefaultMoveTarget(u8 atkBank); u16 PlayerGenderToFrontTrainerPicId(u8 playerGender); diff --git a/src/battle_message.c b/src/battle_message.c index acdb18699..65ff19741 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -2118,7 +2118,7 @@ static void ExpandBattleTextBuffPlaceholders(const u8 *src, u8 *dst) StringGetEnd10(dst); srcID += 3; break; - case B_BUFF_NEGATIVE_FLAVOUR: // flavour table + case B_BUFF_NEGATIVE_FLAVOR: // flavor table StringAppend(dst, gPokeblockWasTooXStringTable[src[srcID + 1]]); srcID += 2; break; diff --git a/src/battle_util.c b/src/battle_util.c index ed3bdef98..07e6ff654 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -2844,7 +2844,7 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn) if (gBattleMons[bank].hp + gBattleMoveDamage > gBattleMons[bank].maxHP) gBattleMoveDamage = gBattleMons[bank].maxHP - gBattleMons[bank].hp; gBattleMoveDamage *= -1; - if (GetFlavourRelationByPersonality(gBattleMons[bank].personality, FLAVOR_SPICY) < 0) + if (GetFlavorRelationByPersonality(gBattleMons[bank].personality, FLAVOR_SPICY) < 0) BattleScriptExecute(BattleScript_BerryConfuseHealEnd2); else BattleScriptExecute(BattleScript_ItemHealHP_RemoveItem); @@ -2864,7 +2864,7 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn) if (gBattleMons[bank].hp + gBattleMoveDamage > gBattleMons[bank].maxHP) gBattleMoveDamage = gBattleMons[bank].maxHP - gBattleMons[bank].hp; gBattleMoveDamage *= -1; - if (GetFlavourRelationByPersonality(gBattleMons[bank].personality, FLAVOR_DRY) < 0) + if (GetFlavorRelationByPersonality(gBattleMons[bank].personality, FLAVOR_DRY) < 0) BattleScriptExecute(BattleScript_BerryConfuseHealEnd2); else BattleScriptExecute(BattleScript_ItemHealHP_RemoveItem); @@ -2884,7 +2884,7 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn) if (gBattleMons[bank].hp + gBattleMoveDamage > gBattleMons[bank].maxHP) gBattleMoveDamage = gBattleMons[bank].maxHP - gBattleMons[bank].hp; gBattleMoveDamage *= -1; - if (GetFlavourRelationByPersonality(gBattleMons[bank].personality, FLAVOR_SWEET) < 0) + if (GetFlavorRelationByPersonality(gBattleMons[bank].personality, FLAVOR_SWEET) < 0) BattleScriptExecute(BattleScript_BerryConfuseHealEnd2); else BattleScriptExecute(BattleScript_ItemHealHP_RemoveItem); @@ -2904,7 +2904,7 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn) if (gBattleMons[bank].hp + gBattleMoveDamage > gBattleMons[bank].maxHP) gBattleMoveDamage = gBattleMons[bank].maxHP - gBattleMons[bank].hp; gBattleMoveDamage *= -1; - if (GetFlavourRelationByPersonality(gBattleMons[bank].personality, FLAVOR_BITTER) < 0) + if (GetFlavorRelationByPersonality(gBattleMons[bank].personality, FLAVOR_BITTER) < 0) BattleScriptExecute(BattleScript_BerryConfuseHealEnd2); else BattleScriptExecute(BattleScript_ItemHealHP_RemoveItem); @@ -2924,7 +2924,7 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn) if (gBattleMons[bank].hp + gBattleMoveDamage > gBattleMons[bank].maxHP) gBattleMoveDamage = gBattleMons[bank].maxHP - gBattleMons[bank].hp; gBattleMoveDamage *= -1; - if (GetFlavourRelationByPersonality(gBattleMons[bank].personality, FLAVOR_SOUR) < 0) + if (GetFlavorRelationByPersonality(gBattleMons[bank].personality, FLAVOR_SOUR) < 0) BattleScriptExecute(BattleScript_BerryConfuseHealEnd2); else BattleScriptExecute(BattleScript_ItemHealHP_RemoveItem); diff --git a/src/berry_blender.c b/src/berry_blender.c index 869f8b834..aa333ebaf 100644 --- a/src/berry_blender.c +++ b/src/berry_blender.c @@ -48,7 +48,7 @@ struct BlenderBerry { u16 itemId; u8 name[BERRY_NAME_COUNT]; - u8 flavours[FLAVOUR_COUNT]; + u8 flavors[FLAVOR_COUNT]; u8 smoothness; }; @@ -67,7 +67,7 @@ struct BlenderGameBlock struct TvBlenderStruct { u8 name[11]; - u8 pokeblockFlavour; + u8 pokeblockFlavor; u8 pokeblockColor; u8 pokeblockSheen; }; @@ -1046,11 +1046,11 @@ static void Blender_CopyBerryData(struct BlenderBerry* berry, u16 itemId) berry->itemId = itemId; StringCopy(berry->name, berryInfo->name); - berry->flavours[FLAVOUR_SPICY] = berryInfo->spicy; - berry->flavours[FLAVOUR_DRY] = berryInfo->dry; - berry->flavours[FLAVOUR_SWEET] = berryInfo->sweet; - berry->flavours[FLAVOUR_BITTER] = berryInfo->bitter; - berry->flavours[FLAVOUR_SOUR] = berryInfo->sour; + berry->flavors[FLAVOR_SPICY] = berryInfo->spicy; + berry->flavors[FLAVOR_DRY] = berryInfo->dry; + berry->flavors[FLAVOR_SWEET] = berryInfo->sweet; + berry->flavors[FLAVOR_BITTER] = berryInfo->bitter; + berry->flavors[FLAVOR_SOUR] = berryInfo->sour; berry->smoothness = berryInfo->smoothness; } @@ -1260,11 +1260,11 @@ static void sub_8080018(void) SetGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_BG2_ON); sBerryBlenderData->arrowPos += 0x200; sBerryBlenderData->field_11A += 4; - if (sBerryBlenderData->field_11A > 255) + if (sBerryBlenderData->field_11A > 0xFF) { SetGpuRegBits(REG_OFFSET_BG2CNT, 2); sBerryBlenderData->mainState++; - sBerryBlenderData->field_11A = 256; + sBerryBlenderData->field_11A = 0x100; sBerryBlenderData->arrowPos = sUnknown_083399DC[sUnknown_083399E4[sBerryBlenderData->playersNo - 2]]; sBerryBlenderData->framesToWait = 0; PlaySE(SE_TRACK_DOOR); @@ -1349,11 +1349,11 @@ static void sub_8080588(void) static u8 sub_8080624(u16 arrowPos, u8 playerId) { - u32 var1 = (arrowPos / 256) + 24; + u32 var1 = (arrowPos / 0x100) + 0x18; u8 arrID = sBerryBlenderData->field_96[playerId]; u32 var2 = sUnknown_083399E7[arrID]; - if (var1 >= var2 && var1 < var2 + 48) + if (var1 >= var2 && var1 < var2 + 0x30) { if (var1 >= var2 + 20 && var1 < var2 + 28) return 2; @@ -1373,9 +1373,9 @@ static void Blender_SetOpponentsBerryData(u16 playerBerryItemId, u8 playersNum, if (playerBerryItemId == ITEM_ENIGMA_BERRY) { - for (i = 0; i < FLAVOUR_COUNT; i++) + for (i = 0; i < FLAVOR_COUNT; i++) { - if (playerBerry->flavours[opponentSetId] > playerBerry->flavours[i]) + if (playerBerry->flavors[opponentSetId] > playerBerry->flavors[i]) opponentSetId = i; } opponentSetId += 5; @@ -1548,10 +1548,10 @@ static void sub_80808D4(void) SetGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_BG2_ON); sBerryBlenderData->arrowPos += 0x200; sBerryBlenderData->field_11A += 4; - if (sBerryBlenderData->field_11A > 255) + if (sBerryBlenderData->field_11A > 0xFF) { sBerryBlenderData->mainState++; - sBerryBlenderData->field_11A = 256; + sBerryBlenderData->field_11A = 0x100; sBerryBlenderData->arrowPos = sUnknown_083399DC[sUnknown_083399E4[sBerryBlenderData->playersNo - 2]]; SetGpuRegBits(REG_OFFSET_BG2CNT, 2); sBerryBlenderData->framesToWait = 0; @@ -1582,7 +1582,7 @@ static void sub_80808D4(void) break; case 21: sub_8080DF8(); - sBerryBlenderData->field_4C = 128; + sBerryBlenderData->field_4C = 0x80; sBerryBlenderData->gameFrameTime = 0; sBerryBlenderData->field_123 = 0; sBerryBlenderData->field_72 = 0; @@ -1853,7 +1853,7 @@ static void sub_8081370(u16 a0) { case 0x4523: if (sBerryBlenderData->field_4C < 1500) - sBerryBlenderData->field_4C += (384 / sUnknown_08339CC3[sBerryBlenderData->playersNo]); + sBerryBlenderData->field_4C += (0x180 / sUnknown_08339CC3[sBerryBlenderData->playersNo]); else { sBerryBlenderData->field_4C += (128 / sUnknown_08339CC3[sBerryBlenderData->playersNo]); @@ -1863,12 +1863,12 @@ static void sub_8081370(u16 a0) break; case 0x5432: if (sBerryBlenderData->field_4C < 1500) - sBerryBlenderData->field_4C += (256 / sUnknown_08339CC3[sBerryBlenderData->playersNo]); + sBerryBlenderData->field_4C += (0x100 / sUnknown_08339CC3[sBerryBlenderData->playersNo]); break; case 0x2345: - sBerryBlenderData->field_4C -= (256 / sUnknown_08339CC3[sBerryBlenderData->playersNo]); - if (sBerryBlenderData->field_4C < 128) - sBerryBlenderData->field_4C = 128; + sBerryBlenderData->field_4C -= (0x100 / sUnknown_08339CC3[sBerryBlenderData->playersNo]); + if (sBerryBlenderData->field_4C < 0x80) + sBerryBlenderData->field_4C = 0x80; break; } } @@ -1940,7 +1940,7 @@ static void sub_80814F4(void) if (sBerryBlenderData->field_4C > 1500) m4aMPlayTempoControl(&gMPlay_BGM, ((sBerryBlenderData->field_4C - 750) / 20) + 256); else - m4aMPlayTempoControl(&gMPlay_BGM, 256); + m4aMPlayTempoControl(&gMPlay_BGM, 0x100); } } } @@ -2039,11 +2039,11 @@ static bool8 sub_8081964(struct BlenderBerry* berries, u8 index1, u8 index2) { if (berries[index1].itemId != berries[index2].itemId || (StringCompare(berries[index1].name, berries[index2].name) == 0 - && (berries[index1].flavours[FLAVOUR_SPICY] == berries[index2].flavours[FLAVOUR_SPICY] - && berries[index1].flavours[FLAVOUR_DRY] == berries[index2].flavours[FLAVOUR_DRY] - && berries[index1].flavours[FLAVOUR_SWEET] == berries[index2].flavours[FLAVOUR_SWEET] - && berries[index1].flavours[FLAVOUR_BITTER] == berries[index2].flavours[FLAVOUR_BITTER] - && berries[index1].flavours[FLAVOUR_SOUR] == berries[index2].flavours[FLAVOUR_SOUR] + && (berries[index1].flavors[FLAVOR_SPICY] == berries[index2].flavors[FLAVOR_SPICY] + && berries[index1].flavors[FLAVOR_DRY] == berries[index2].flavors[FLAVOR_DRY] + && berries[index1].flavors[FLAVOR_SWEET] == berries[index2].flavors[FLAVOR_SWEET] + && berries[index1].flavors[FLAVOR_BITTER] == berries[index2].flavors[FLAVOR_BITTER] + && berries[index1].flavors[FLAVOR_SOUR] == berries[index2].flavors[FLAVOR_SOUR] && berries[index1].smoothness == berries[index2].smoothness))) return TRUE; else @@ -2160,7 +2160,7 @@ static s16 sub_8081BD4(void) return sUnknown_03000E06; } -static void Blender_CalculatePokeblock(struct BlenderBerry *berries, struct Pokeblock *pokeblock, u8 playersNo, u8 *flavours, u16 maxRPM) +static void Blender_CalculatePokeblock(struct BlenderBerry *berries, struct Pokeblock *pokeblock, u8 playersNo, u8 *flavors, u16 maxRPM) { s32 i, j; s32 multiuseVar, var2; @@ -2172,7 +2172,7 @@ static void Blender_CalculatePokeblock(struct BlenderBerry *berries, struct Poke for (i = 0; i < playersNo; i++) { for (j = 0; j < 6; j++) - sUnknown_03000DE8[j] += berries[i].flavours[j]; + sUnknown_03000DE8[j] += berries[i].flavors[j]; } multiuseVar = sUnknown_03000DE8[0]; @@ -2259,13 +2259,13 @@ static void Blender_CalculatePokeblock(struct BlenderBerry *berries, struct Poke for (i = 0; i < 6; i++) { - flavours[i] = sUnknown_03000DE8[i]; + flavors[i] = sUnknown_03000DE8[i]; } } -static void BlenderDebug_CalculatePokeblock(struct BlenderBerry* berries, struct Pokeblock* pokeblock, u8 playersNo, u8* flavours, u16 a4) +static void BlenderDebug_CalculatePokeblock(struct BlenderBerry* berries, struct Pokeblock* pokeblock, u8 playersNo, u8* flavors, u16 a4) { - Blender_CalculatePokeblock(berries, pokeblock, playersNo, flavours, a4); + Blender_CalculatePokeblock(berries, pokeblock, playersNo, flavors, a4); } static void sub_8081E20(void) @@ -2849,10 +2849,10 @@ static void sub_8082CB4(struct BgAffineSrcData *dest) { struct BgAffineSrcData affineSrc; - affineSrc.texX = 30720; - affineSrc.texY = 20480; - affineSrc.scrX = 120 - sBerryBlenderData->bg_X; - affineSrc.scrY = 80 - sBerryBlenderData->bg_Y; + affineSrc.texX = 0x7800; + affineSrc.texY = 0x5000; + affineSrc.scrX = 0x78 - sBerryBlenderData->bg_X; + affineSrc.scrY = 0x50 - sBerryBlenderData->bg_Y; affineSrc.sx = sBerryBlenderData->field_11A; affineSrc.sy = sBerryBlenderData->field_11A; affineSrc.alpha = sBerryBlenderData->arrowPos; @@ -3185,7 +3185,7 @@ static bool8 Blender_PrintBlendingResults(void) s32 xPos, yPos; struct Pokeblock pokeblock; - u8 flavours[6]; + u8 flavors[6]; u8 text[40]; u16 berryIds[4]; // unused @@ -3292,7 +3292,7 @@ static bool8 Blender_PrintBlendingResults(void) sub_8081E20(); - Blender_CalculatePokeblock(sBerryBlenderData->blendedBerries, &pokeblock, sBerryBlenderData->playersNo, flavours, sBerryBlenderData->max_RPM); + Blender_CalculatePokeblock(sBerryBlenderData->blendedBerries, &pokeblock, sBerryBlenderData->playersNo, flavors, sBerryBlenderData->max_RPM); Blender_PrintMadePokeblockString(&pokeblock, sBerryBlenderData->stringVar); TryAddContestLinkTvShow(&pokeblock, &sBerryBlenderData->tvBlender); @@ -3320,18 +3320,18 @@ static bool8 Blender_PrintBlendingResults(void) static void Blender_PrintMadePokeblockString(struct Pokeblock *pokeblock, u8 *dst) { u8 text[12]; - u8 flavourLvl, feel; + u8 flavorLvl, feel; dst[0] = EOS; StringCopy(dst, gPokeblockNames[pokeblock->color]); StringAppend(dst, sText_WasMade); StringAppend(dst, sText_NewLine); - flavourLvl = GetHighestPokeblocksFlavourLevel(pokeblock); + flavorLvl = GetHighestPokeblocksFlavorLevel(pokeblock); feel = GetPokeblocksFeel(pokeblock); StringAppend(dst, sText_TheLevelIs); - ConvertIntToDecimalStringN(text, flavourLvl, STR_CONV_MODE_LEFT_ALIGN, 3); + ConvertIntToDecimalStringN(text, flavorLvl, STR_CONV_MODE_LEFT_ALIGN, 3); StringAppend(dst, text); StringAppend(dst, sText_TheFeelIs); @@ -3532,8 +3532,8 @@ static void sub_8083F3C(u8 taskId) static bool32 TryAddContestLinkTvShow(struct Pokeblock *pokeblock, struct TvBlenderStruct *tvBlender) { - u8 flavourLevel = GetHighestPokeblocksFlavourLevel(pokeblock); - u16 sheen = (flavourLevel * 10) / GetPokeblocksFeel(pokeblock); + u8 flavorLevel = GetHighestPokeblocksFlavorLevel(pokeblock); + u16 sheen = (flavorLevel * 10) / GetPokeblocksFeel(pokeblock); tvBlender->pokeblockSheen = sheen; tvBlender->pokeblockColor = pokeblock->color; @@ -3544,8 +3544,8 @@ static bool32 TryAddContestLinkTvShow(struct Pokeblock *pokeblock, struct TvBlen if (sBerryBlenderData->field_1A4 == 0 && sheen > 20) { StringCopy(tvBlender->name, gLinkPlayers[sBerryBlenderData->playerPlaces[sBerryBlenderData->playersNo - 1]].name); - tvBlender->pokeblockFlavour = GetPokeblocksFlavour(pokeblock); - if (Put3CheersForPokeblocksOnTheAir(tvBlender->name, tvBlender->pokeblockFlavour, + tvBlender->pokeblockFlavor = GetPokeblocksFlavor(pokeblock); + if (Put3CheersForPokeblocksOnTheAir(tvBlender->name, tvBlender->pokeblockFlavor, tvBlender->pokeblockColor, tvBlender->pokeblockSheen, gLinkPlayers[sBerryBlenderData->playerPlaces[sBerryBlenderData->playersNo - 1]].language)) { @@ -3557,8 +3557,8 @@ static bool32 TryAddContestLinkTvShow(struct Pokeblock *pokeblock, struct TvBlen else if (sBerryBlenderData->field_1A4 == sBerryBlenderData->playersNo - 1 && sheen <= 20) { StringCopy(tvBlender->name, gLinkPlayers[sBerryBlenderData->playerPlaces[0]].name); - tvBlender->pokeblockFlavour = GetPokeblocksFlavour(pokeblock); - if (Put3CheersForPokeblocksOnTheAir(tvBlender->name, tvBlender->pokeblockFlavour, + tvBlender->pokeblockFlavor = GetPokeblocksFlavor(pokeblock); + if (Put3CheersForPokeblocksOnTheAir(tvBlender->name, tvBlender->pokeblockFlavor, tvBlender->pokeblockColor, tvBlender->pokeblockSheen, gLinkPlayers[sBerryBlenderData->playerPlaces[0]].language)) { diff --git a/src/pokemon_3.c b/src/pokemon_3.c index 01dfc954a..1fafee810 100644 --- a/src/pokemon_3.c +++ b/src/pokemon_3.c @@ -1297,13 +1297,13 @@ bool8 IsPokeSpriteNotFlipped(u16 species) return gBaseStats[species].noFlip; } -s8 GetMonFlavourRelation(struct Pokemon *mon, u8 a2) +s8 GetMonFlavorRelation(struct Pokemon *mon, u8 a2) { u8 nature = GetNature(mon); return gPokeblockFlavorCompatibilityTable[nature * 5 + a2]; } -s8 GetFlavourRelationByPersonality(u32 personality, u8 a2) +s8 GetFlavorRelationByPersonality(u32 personality, u8 a2) { u8 nature = GetNatureFromPersonality(personality); return gPokeblockFlavorCompatibilityTable[nature * 5 + a2]; |