summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/battle_message.h2
-rw-r--r--include/berry.h12
-rw-r--r--include/pokeblock.h4
-rw-r--r--include/pokemon.h4
4 files changed, 11 insertions, 11 deletions
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);