diff options
| author | Cheng Hann Gan <chenghanngan.us@gmail.com> | 2021-10-05 20:09:53 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-05 17:09:53 -0700 |
| commit | 78632822c35c5c8f6f9fb03547bb608ec5e5d223 (patch) | |
| tree | 5bc11d5e3a4c0f92f09d4144a03b208162372a65 /include | |
| parent | c15bd01b90215610a2f38c4ca2e8e3b0a68b8476 (diff) | |
Added move data JSON (#60)
* Added move data JSON
* Fixed typo
* Fixed name of placeholder move
Diffstat (limited to 'include')
| -rw-r--r-- | include/constants/move.h | 23 | ||||
| -rw-r--r-- | include/constants/move_id.h | 7 |
2 files changed, 25 insertions, 5 deletions
diff --git a/include/constants/move.h b/include/constants/move.h index 09e3276..1b23933 100644 --- a/include/constants/move.h +++ b/include/constants/move.h @@ -13,19 +13,32 @@ enum MoveFlags struct MoveData { - u8 fill0[0x8 - 0x0]; + u8 *namePointer; + /* 0x4 */ u8 power; + u8 fill5; + u8 type; + u8 fill7; // Determines the range of moves. /* 0x8 */ u16 targetingFlags; /* 0xA */ u16 aiTargetingFlags; // The AI consider certain moves to have different range than they actually do. /* 0xC */ u8 maxPP; - /* 0xD */ u8 defaultMoveWeight; - u8 fillE[0x10 - 0xE]; + /* 0xD */ u8 weight; + /* 0xE */ u8 accuracy1; + /* 0xF */ u8 accuracy2; // Used by the AI to determine how often to use Spikes. // Values exist for all other moves, though they seem to be unused. - /* 0x10 */ u8 moveUseChance; - u8 fill11[0x17 - 0x11]; + /* 0x10 */ u8 useChance; + /* 0x11 */ u8 hitCount; // Maximum number of times the move will hit. Used for multi-hit moves like Fury Attack. + u8 unk12; + /* 0x13 */ u8 criticalHitChance; + /* 0x14 */ bool8 affectedByMagicCoat; // If true, this move is reflected by Magic Coat. + /* 0x15 */ bool8 targetsUser; + /* 0x16 */ bool8 affectedByMuzzled; // If true, this move can't be used with the Muzzled status. /* 0x17 */ bool8 cannotHitFrozen; // Used by Status Checker to determine if a move can be used on a frozen target. /* 0x18 */ bool8 dealsDirectDamage; + u8 unk19; + u8 *descriptionPointer; + u8 *useText; // The text displayed when this move is used. }; struct PokemonMove diff --git a/include/constants/move_id.h b/include/constants/move_id.h index b0d97b7..15954fe 100644 --- a/include/constants/move_id.h +++ b/include/constants/move_id.h @@ -357,6 +357,10 @@ #define MOVE_AEROBLAST 0x161 #define MOVE_VOLT_TACKLE 0x162 #define MOVE_REGULAR_ATTACK 0x163 +#define MOVE_IS_WATCHING 0x164 +#define MOVE_BIDE_2 0x165 // Unused +#define MOVE_DOLLAR_1 0x166 // Unused +#define MOVE_DOLLAR_2 0x167 // Unused #define MOVE_WIDE_SLASH 0x168 #define MOVE_EXCAVATE 0x169 // Unused #define MOVE_SPIN_SLASH 0x16A // Unused @@ -402,11 +406,14 @@ #define MOVE_TRAPPER 0x191 #define MOVE_POSSESS 0x192 #define MOVE_ITEMIZE 0x193 +#define MOVE_MD1 0x194 // Unused +#define MOVE_PROJECTILE 0x195 #define MOVE_HURL 0x196 #define MOVE_MOBILE 0x197 #define MOVE_ITEM_TOSS 0x198 #define MOVE_SEE_STAIRS 0x199 #define MOVE_LONG_TOSS 0x19A +#define MOVE_MD1_2 0x19B // Unused #define MOVE_PIERCE 0x19C #endif |