diff options
author | Louis Hampton <roastveg@hotmail.co.uk> | 2020-06-20 19:01:00 +0100 |
---|---|---|
committer | Louis Hampton <roastveg@hotmail.co.uk> | 2020-06-20 19:01:00 +0100 |
commit | 3cf5ef0a661c62a94766e2c08025bb7ecb785b2a (patch) | |
tree | 7fa9fc230a0517f65876613318f043f3c14b8f63 /include/move_data.h | |
parent | 59f6bdfa9a7645d3e2e9d1ac0bde5af3ad77e8b2 (diff) | |
parent | 6298426d9ad4c59a875b0a90a0facfa1a3a513cc (diff) |
Merge branch 'master' of https://github.com/roastveg/pokediamond
Diffstat (limited to 'include/move_data.h')
-rw-r--r-- | include/move_data.h | 33 |
1 files changed, 24 insertions, 9 deletions
diff --git a/include/move_data.h b/include/move_data.h index 5267bfb1..a970e1bf 100644 --- a/include/move_data.h +++ b/include/move_data.h @@ -3,24 +3,39 @@ struct WazaTbl { - u16 unk0; + u16 effect; u8 unk2; - u8 unk3; - u8 unk4; - u8 unk5; + u8 power; + u8 type; + u8 accuracy; u8 pp; - u8 unk7; + u8 effectChance; u16 unk8; - s8 unkA; + s8 priority; u8 unkB; u8 unkC; - u8 unkD; + u8 contestType; u8 padding[2]; }; +typedef enum MoveAttr { + MOVEATTR_EFFECT = 0, + MOVEATTR_UNK1, + MOVEATTR_POWER, + MOVEATTR_TYPE, + MOVEATTR_ACCURACY, + MOVEATTR_PP, + MOVEATTR_EFFECT_CHANCE, + MOVEATTR_UNK7, + MOVEATTR_PRIORTY, + MOVEATTR_UNK9, + MOVEATTR_UNK10, + MOVEATTR_CONTEST_TYPE, +} MoveAttr; + void LoadAllWazaTbl(struct WazaTbl * dest); u8 WazaGetMaxPp(u16 move, u8 ppUp); -u32 GetWazaAttr(u16 move, u32 attr); -u32 GetAttrFromWazaTbl(struct WazaTbl * wazaTbl, u32 attr); +u32 GetWazaAttr(u16 move, MoveAttr attr); +u32 GetAttrFromWazaTbl(struct WazaTbl * wazaTbl, MoveAttr attr); #endif //POKEDIAMOND_MOVE_DATA_H |