diff options
| author | Seth Barberee <seth.barberee@gmail.com> | 2022-03-11 10:10:49 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-11 10:10:49 -0800 |
| commit | 30fea2d6f303e0e57b62032f56da86c8223ef1f7 (patch) | |
| tree | 9636ef46bb5f555874dc8ba16c82dc79bc563a12 /include/constants | |
| parent | ea1aa9c0c5c3a4167912d1078fffdd5e69cbbe98 (diff) | |
| parent | cf492fd141b33c21f369dfa7aabebf3c52cb8ec1 (diff) | |
Merge pull request #98 from AnonymousRandomPerson/master
Finished attack AI decomp
Diffstat (limited to 'include/constants')
| -rw-r--r-- | include/constants/move.h | 14 | ||||
| -rw-r--r-- | include/constants/type.h | 2 |
2 files changed, 13 insertions, 3 deletions
diff --git a/include/constants/move.h b/include/constants/move.h index 0601969..e5de485 100644 --- a/include/constants/move.h +++ b/include/constants/move.h @@ -1,7 +1,9 @@ #ifndef GUARD_CONSTANTS_MOVE_H #define GUARD_CONSTANTS_MOVE_H -enum MoveFlags +#define STRUGGLE_MOVE_INDEX 4 + +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. @@ -11,6 +13,13 @@ enum MoveFlags MOVE_FLAG_DISABLED = 1 << 5 // Disabled by an effect like Taunt. }; +enum MoveFlag2 +{ + MOVE_FLAG_SEALED = 1 << 0, + MOVE_FLAG_TEMPORARY = 1 << 3, // Used for moves copied by Mimic. + MOVE_FLAG_REPLACE = 1 << 5 // Used for moves copied by Sketch. +}; + enum AccuracyType { // Accuracy used for all moves. @@ -28,7 +37,6 @@ struct MoveData u8 *namePointer; /* 0x4 */ s16 power; u8 type; - u8 fill7; // Determines the range of moves. /* 0x8 */ u16 targetingFlags[2]; // 0 for player and 1 for AI // The AI consider certain moves to have different range than they actually do. @@ -52,7 +60,7 @@ struct MoveData struct PokemonMove { u8 moveFlags; - bool8 sealed; + u8 moveFlags2; u16 moveID; u8 PP; u8 powerBoost; // How much the move is boosted by Ginsengs. diff --git a/include/constants/type.h b/include/constants/type.h index 6ca9177..c6fab07 100644 --- a/include/constants/type.h +++ b/include/constants/type.h @@ -1,6 +1,8 @@ #ifndef GUARD_CONSTANTS_TYPE_H #define GUARD_CONSTANTS_TYPE_H +#define NUM_TYPES 18 + #define TYPE_NONE 0x0 #define TYPE_NORMAL 0x1 #define TYPE_FIRE 0x2 |