diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/constants/move.h | 4 | ||||
| -rw-r--r-- | include/status_checker.h | 4 | ||||
| -rw-r--r-- | include/status_checker_1.h | 9 |
3 files changed, 6 insertions, 11 deletions
diff --git a/include/constants/move.h b/include/constants/move.h index eb78219..e6f4e70 100644 --- a/include/constants/move.h +++ b/include/constants/move.h @@ -3,7 +3,7 @@ #define STRUGGLE_MOVE_INDEX 4 -enum MoveFlags +enum MoveFlag { MOVE_FLAG_EXISTS = 1 << 0, MOVE_FLAG_LINKED = 1 << 1, // This move is linked with the previous move in the Pokémon's moveset. @@ -13,7 +13,7 @@ enum MoveFlags MOVE_FLAG_DISABLED = 1 << 5 // Disabled by an effect like Taunt. }; -enum MoveFlags2 +enum MoveFlag2 { MOVE_FLAG_SEALED = 1 << 0, MOVE_FLAG_TEMPORARY = 1 << 3, // Used for moves copied by Mimic. diff --git a/include/status_checker.h b/include/status_checker.h index 92fa443..668d16e 100644 --- a/include/status_checker.h +++ b/include/status_checker.h @@ -10,5 +10,9 @@ bool8 CanUseOnSelfWithStatusChecker(struct DungeonEntity *pokemon, struct Pokemo bool8 CanUseOnTargetWithStatusChecker(struct DungeonEntity *user, struct DungeonEntity *target, struct PokemonMove *move); // 0x5D810 bool8 HasDisabledMove(struct PokemonMove *moves); +// 0x5D850 +bool8 LastUsedMoveOutOfPP(struct PokemonMove *moves); +// 0x5D888 +bool8 HasLastUsedMove(struct PokemonMove *moves); #endif diff --git a/include/status_checker_1.h b/include/status_checker_1.h deleted file mode 100644 index 56465d5..0000000 --- a/include/status_checker_1.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef GUARD_STATUS_CHECKER_1_H -#define GUARD_STATUS_CHECKER_1_H - -#include "moves.h" - -// 0x5D888 -bool8 HasLastUsedMove(struct PokemonMove *moves); - -#endif |