diff options
| author | Cleverking2003 <30466983+Cleverking2003@users.noreply.github.com> | 2020-06-16 19:54:54 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-16 19:54:54 +0300 |
| commit | 346d0375181b8cd396c6cb9b6a8247184214402b (patch) | |
| tree | a45851568f899c69cdc596d17de158741848a9fb /include | |
| parent | aa3592778ae6de9f63c4df170393bf37280e591b (diff) | |
| parent | faf26c04c34d9c537901e0e81aa4ee917122a392 (diff) | |
Merge pull request #170 from PikalaxALT/pikalax_work
Decompile move table access routines
Diffstat (limited to 'include')
| -rw-r--r-- | include/constants/moves.h | 2 | ||||
| -rw-r--r-- | include/move_data.h | 23 |
2 files changed, 23 insertions, 2 deletions
diff --git a/include/constants/moves.h b/include/constants/moves.h index e25c16c9..bd658c17 100644 --- a/include/constants/moves.h +++ b/include/constants/moves.h @@ -470,4 +470,6 @@ #define MOVE_OMINOUS_WIND 466 #define MOVE_SHADOW_FORCE 467 +#define NUM_MOVES MOVE_SHADOW_FORCE + #endif //POKEDIAMOND_CONSTANTS_MOVES_H diff --git a/include/move_data.h b/include/move_data.h index 8da864b0..5267bfb1 100644 --- a/include/move_data.h +++ b/include/move_data.h @@ -1,7 +1,26 @@ #ifndef POKEDIAMOND_MOVE_DATA_H #define POKEDIAMOND_MOVE_DATA_H -int FUN_0206AB30(u16 move, u8 ppUp); -u32 FUN_0206AB18(u16 move, u32 attr); +struct WazaTbl +{ + u16 unk0; + u8 unk2; + u8 unk3; + u8 unk4; + u8 unk5; + u8 pp; + u8 unk7; + u16 unk8; + s8 unkA; + u8 unkB; + u8 unkC; + u8 unkD; + u8 padding[2]; +}; + +void LoadAllWazaTbl(struct WazaTbl * dest); +u8 WazaGetMaxPp(u16 move, u8 ppUp); +u32 GetWazaAttr(u16 move, u32 attr); +u32 GetAttrFromWazaTbl(struct WazaTbl * wazaTbl, u32 attr); #endif //POKEDIAMOND_MOVE_DATA_H |