diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/constants/move.h | 2 | ||||
| -rw-r--r-- | include/dungeon_ai.h | 2 | ||||
| -rw-r--r-- | include/dungeon_ai_attack.h | 4 | ||||
| -rw-r--r-- | include/dungeon_ai_attack_1.h | 9 | ||||
| -rw-r--r-- | include/dungeon_capabilities_1.h | 2 | ||||
| -rw-r--r-- | include/dungeon_pokemon_attributes_1.h | 2 | ||||
| -rw-r--r-- | include/moves.h | 5 | ||||
| -rw-r--r-- | include/status_checks.h | 2 |
8 files changed, 24 insertions, 4 deletions
diff --git a/include/constants/move.h b/include/constants/move.h index 4e3396b..8148ab5 100644 --- a/include/constants/move.h +++ b/include/constants/move.h @@ -44,7 +44,7 @@ struct PokemonMove u8 moveFlags; bool8 sealed; u16 moveID; - u8 pp; + u8 PP; u8 powerBoost; // How much the move is boosted by Ginsengs. }; diff --git a/include/dungeon_ai.h b/include/dungeon_ai.h index e02da08..e3f7a37 100644 --- a/include/dungeon_ai.h +++ b/include/dungeon_ai.h @@ -5,5 +5,7 @@ // 0x71494 bool8 ShouldAvoidEnemies(struct DungeonEntity *pokemon); +// 0x71518 +bool8 ShouldAvoidEnemiesAndShowEffect(struct DungeonEntity *pokemon, bool8 showRunAwayEffect); #endif diff --git a/include/dungeon_ai_attack.h b/include/dungeon_ai_attack.h index 75abcab..77b53fc 100644 --- a/include/dungeon_ai_attack.h +++ b/include/dungeon_ai_attack.h @@ -3,7 +3,7 @@ #include "dungeon_entity.h" -// 0x7C9F8 -bool8 IsTargetStraightAhead(struct DungeonEntity *pokemon, struct DungeonEntity *targetPokemon, s32 facingDir, s32 maxRange); +// 0x7BB94 +void DecideAttack(struct DungeonEntity *pokemon); #endif diff --git a/include/dungeon_ai_attack_1.h b/include/dungeon_ai_attack_1.h new file mode 100644 index 0000000..89a1f0d --- /dev/null +++ b/include/dungeon_ai_attack_1.h @@ -0,0 +1,9 @@ +#ifndef GUARD_DUNGEON_AI_ATTACK_1_H +#define GUARD_DUNGEON_AI_ATTACK_1_H + +#include "dungeon_entity.h" + +// 0x7C9F8 +bool8 IsTargetStraightAhead(struct DungeonEntity *pokemon, struct DungeonEntity *targetPokemon, s32 facingDir, s32 maxRange); + +#endif diff --git a/include/dungeon_capabilities_1.h b/include/dungeon_capabilities_1.h index c19391b..1319230 100644 --- a/include/dungeon_capabilities_1.h +++ b/include/dungeon_capabilities_1.h @@ -7,6 +7,8 @@ bool8 CannotUseItems(struct DungeonEntity *pokemon); // 0x70CD0 bool8 CannotAct(struct DungeonEntity *pokemon); +// 0x70d04 +bool8 CannotAttack(struct DungeonEntity *pokemon, bool8 skipSleep); // 0x70D6C bool8 CanMoveInDirection(struct DungeonEntity *pokemon, u32 facingDir); diff --git a/include/dungeon_pokemon_attributes_1.h b/include/dungeon_pokemon_attributes_1.h index cdfa989..c81c4b9 100644 --- a/include/dungeon_pokemon_attributes_1.h +++ b/include/dungeon_pokemon_attributes_1.h @@ -12,7 +12,7 @@ bool8 HasIQSkill(struct DungeonEntity *pokemon, u8 IQSkill); void LoadIQSkills(struct DungeonEntity *pokemon); bool8 CanSeeTeammate(struct DungeonEntity * pokemon); -u8 GetMoveType_2(struct DungeonEntity *pokemon, struct PokemonMove *pokeMove); +u8 GetMoveTypeForPokemon(struct DungeonEntity *pokemon, struct PokemonMove *pokeMove); // 0x71A44 s32 CalculateMovePower(struct DungeonEntity *pokemon, struct PokemonMove *pokeMove); diff --git a/include/moves.h b/include/moves.h index bba50b3..847f167 100644 --- a/include/moves.h +++ b/include/moves.h @@ -3,6 +3,11 @@ #include "constants/move.h" +// 0x92A88 +void InitPokemonMove(struct PokemonMove *move, u16 moveID); +// 0x92B90 +u8 GetMoveWeight(struct PokemonMove *move); +// 0x92BF4 u32 GetMoveMaxPP(struct PokemonMove *move); #endif diff --git a/include/status_checks.h b/include/status_checks.h index 086711d..5bc80eb 100644 --- a/include/status_checks.h +++ b/include/status_checks.h @@ -3,6 +3,8 @@ #include "dungeon_entity.h" +extern const s16 gConfusedAttackChance; + // 0x7001C bool8 HasStatusAffectingActions(struct DungeonEntity *pokemon); |