diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-02-02 13:28:54 -0500 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2020-02-04 12:16:15 -0600 |
| commit | 27c4329e4518a9838476e16c9fbb4cfb6d83a0d7 (patch) | |
| tree | fffa4a6ab7cdee6fd0c171b8381db06f10b32c6d /include | |
| parent | c859fe36066bd420ea37222615aef177a318b5fd (diff) | |
Use friendship event constants
Diffstat (limited to 'include')
| -rw-r--r-- | include/constants/pokemon.h | 19 | ||||
| -rw-r--r-- | include/pokemon.h | 1 |
2 files changed, 10 insertions, 10 deletions
diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h index 97e3f0686..c90e6465e 100644 --- a/include/constants/pokemon.h +++ b/include/constants/pokemon.h @@ -203,15 +203,16 @@ #define MON_FEMALE 0xFE #define MON_GENDERLESS 0xFF -#define FRIENDSHIP_EVENT_GROW_LEVEL 0 -#define FRIENDSHIP_EVENT_VITAMIN 1 // unused -#define FRIENDSHIP_EVENT_BATTLE_ITEM 2 // unused -#define FRIENDSHIP_EVENT_LEAGUE_BATTLE 3 -#define FRIENDSHIP_EVENT_LEARN_TMHM 4 -#define FRIENDSHIP_EVENT_WALKING 5 -#define FRIENDSHIP_EVENT_FAINT_SMALL 6 -#define FRIENDSHIP_EVENT_FAINT_OUTSIDE_BATTLE 7 -#define FRIENDSHIP_EVENT_FAINT_LARGE 8 +// Constants for AdjustFriendship +#define FRIENDSHIP_EVENT_GROW_LEVEL 0 +#define FRIENDSHIP_EVENT_VITAMIN 1 // unused, handled by PokemonUseItemEffects +#define FRIENDSHIP_EVENT_BATTLE_ITEM 2 // unused, handled by PokemonUseItemEffects +#define FRIENDSHIP_EVENT_LEAGUE_BATTLE 3 +#define FRIENDSHIP_EVENT_LEARN_TMHM 4 +#define FRIENDSHIP_EVENT_WALKING 5 +#define FRIENDSHIP_EVENT_FAINT_SMALL 6 +#define FRIENDSHIP_EVENT_FAINT_FIELD_PSN 7 +#define FRIENDSHIP_EVENT_FAINT_LARGE 8 // If opponent was >= 30 levels higher. See AdjustFriendshipOnBattleFaint #define MAX_FRIENDSHIP 0xFF diff --git a/include/pokemon.h b/include/pokemon.h index 2e28ae0f5..7ac65d36b 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -413,7 +413,6 @@ void HandleSetPokedexFlag(u16 nationalNum, u8 caseId, u32 personality); const u8 *GetTrainerClassNameFromId(u16 trainerId); const u8 *GetTrainerNameFromId(u16 trainerId); bool8 HasTwoFramesAnimation(u16 species); -bool8 sub_806F104(void); struct Unknown_806F160_Struct *sub_806F2AC(u8 id, u8 arg1); void sub_806F47C(u8 id); u8 *sub_806F4F8(u8 id, u8 arg1); |