diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/battle_util.h | 2 | ||||
| -rw-r--r-- | include/constants/pokemon.h | 5 | ||||
| -rw-r--r-- | include/pokemon.h | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/include/battle_util.h b/include/battle_util.h index 797f0ef52..d3bd76a01 100644 --- a/include/battle_util.h +++ b/include/battle_util.h @@ -64,7 +64,7 @@ bool8 WasUnableToUseMove(u8 battler); void PrepareStringBattle(u16 stringId, u8 battler); void ResetSentPokesToOpponentValue(void); void sub_8017434(u8 battler); -void sub_80174B8(u8 battler); +void UpdateSentPokesToOpponentValue(u8 battler); void BattleScriptPush(const u8 *bsPtr); void BattleScriptPushCursor(void); void BattleScriptPop(void); diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h index 0371f874f..d2d4c9d86 100644 --- a/include/constants/pokemon.h +++ b/include/constants/pokemon.h @@ -213,4 +213,9 @@ #define UNOWN_FORM_COUNT 28 #define BOX_NAME_LENGTH 8 +#define EVOTRIGGER_LEVEL_UP 0 +#define EVOTRIGGER_TRADE 1 +#define EVOTRIGGER_STONE 2 +#define EVOTRIGGER_STONE_2 3 + #endif // GUARD_CONSTANTS_POKEMON_H diff --git a/include/pokemon.h b/include/pokemon.h index 6ffd286b7..c4e5f409c 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -342,7 +342,7 @@ void CreateMaleMon(struct Pokemon *mon, u16 species, u8 level); void CreateMonWithIVsPersonality(struct Pokemon *mon, u16 species, u8 level, u32 ivs, u32 personality); void CreateMonWithEVSpread(struct Pokemon *mon, u16 species, u8 level, u8 fixedIV, u8 evSpread); void CreateBattleTowerMon(struct Pokemon *mon, struct BattleTowerPokemon *src); -void sub_803E23C(struct Pokemon *mon, struct BattleTowerPokemon *dest); +void ConvertPokemonToBattleTowerPokemon(struct Pokemon *mon, struct BattleTowerPokemon *dest); void CalculateMonStats(struct Pokemon *mon); void BoxMonToMon(struct BoxPokemon *src, struct Pokemon *dest); u8 GetLevelFromBoxMonExp(struct BoxPokemon *boxMon); |